orangefs: update to stable snapshot r9510

This fixes kernel deadlock in pvfs2-client.

3 files changed, 250 insertions, 1 deletions

diff --git a/sys-cluster/orangefs/ChangeLog b/sys-cluster/orangefs/ChangeLog
index 469011f..849c78a 100644
--- a/sys-cluster/orangefs/ChangeLog
+++ b/sys-cluster/orangefs/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*orangefs-2.8.6-r4 (03 Oct 2012)
+
+  03 Oct 2012; Andrew Savchenko <bircoph@gmail.com> +orangefs-2.8.6-r4.ebuild:
+  Update stable snapshot to r9510. This should fix kernel deadlock in
+  pvfs2-client introduced in -r3.
+
   12 Sep 2012; Andrew Savchenko <bircoph@gmail.com> orangefs-2.8.6-r3.ebuild,
   files/README.Gentoo:
   Aware of terribly buggy kernel module.
diff --git a/sys-cluster/orangefs/Manifest b/sys-cluster/orangefs/Manifest
index 6973c75..93bd504 100644
--- a/sys-cluster/orangefs/Manifest
+++ b/sys-cluster/orangefs/Manifest
@@ -16,9 +16,11 @@ AUX pvfs2-server-init.d 4484 SHA256 644dbe0e7a276e383a79c9ce2fea1a3cd69bedd96232
 DIST orangefs-2.8.5.tar.gz 10163182 SHA256 00dd5bf1fea76573e0203aaad206dfe4ef087cdbfcfda1e7fd0969dafd16a0d3 SHA512 8a71d192130db022a862402bd57b3769b221e423b3d7e321d7fe9c2ec192718365455d25cee1be23d2ea8ae861ec84f02e9cf192ea3734a388fbabc111eeef8f WHIRLPOOL d6cfbaae8c9277f0973eb7a284b0b56c7494f33b292d1f34d05e77cabc29b20da0d200d518180781cdeb7b986a1f323159b38974de50391ed670dd27d34aaa8f
 DIST orangefs-2.8.6-r9468.patch.xz 49744 SHA256 cba7cd39ab9a85516db570f3ab6d2e588730366e3b55857376b378fe1ced885c SHA512 95eb10060c85e966a35d066c6a9768c989619c87195a0e305bf9feba04d9e882627fa3ae8a6df57d81c6e40459a2b822188b8616f4b59f287ec46ea1f27196f6 WHIRLPOOL 997256942ac7b3a054691c2bec3877d5e4f9b0d329442d97fa7db4ccb25a01aa510d1abc1d0da3a48dcd82690eeb15dd81f4d9f4dc056890dfb003ee127b2850
 DIST orangefs-2.8.6-r9483.patch.xz 51516 SHA256 1612c812c2f38d53a30fb30b8dd62719e71e5471c845cf4b841facaf82dd9b4d SHA512 f27544e7e73370ca26b3ef507a1c38826130689d3ab2391ab1a423d94939412b153631c47296c337dd90afbde9bc2a550e4f307176855b558ff82aa348c0a8c7 WHIRLPOOL c8c956525e187e92039d485c9a09055c15e782d1d09dc2702674e1f550afbf651ad30e1cd0a05242707b52c296eb842f12ccd1b35b14fe491206422f25ba289c
+DIST orangefs-2.8.6-r9510.patch.xz 96440 SHA256 d47663f44cc92fafdf77fcf4d2a71a2e4311a651f6764408dc76ab211f39d26b SHA512 25ef9bd1ed36b5e723858e6005d439ab9a3ab5f6c8fb6f9b736dcdccc85c4737a7044a453e322aaf3911f62e7059b001b1da69b5daae3c79c16a36109103745f WHIRLPOOL 38f3d20f0c8fff93fc520ecbf58fc03e9f2540c181c27f562d1ef0c12e0e130f863084531b3acae6a34f82f72d0b1f9d8c02c184614e89f32fde39acfcf5d9f4
 DIST orangefs-2.8.6.tar.gz 2778466 SHA256 cc2a9df9750abe6ea97c9e6259083a45d22d8cbf56bc4a8c35376940ba8108f8 SHA512 0eb22b217fdfc4bd1384551bbe4c946223eba09db1dae361204cc3624abc0c681a1b99265f7b2c01034fbdcb3d52a5366f43e941639ef7ee5c2ce0bccc140697 WHIRLPOOL f8ac9dccc0bd7f76978173f501e58ed92d75d280198e1426bdd3fa8953821c9dc47dbd088ea5d5b546bee7c330e8e3edb55d2829ee61e04980e58cbd8122fdc5
 EBUILD orangefs-2.8.5-r1.ebuild 7496 SHA256 fd21bf129cd2e0a9a3c04826724c2e87234d78736e2db6acebb290398d5fbfdc SHA512 c12e251cdae702e2064b767b88355d51ac171ad573e9e2afae62e2ef48abbaa51d882bf2342ed5b8bb14d436d57e453a9b9c5cd38b53724a671c4237205622b1 WHIRLPOOL 4ea24fd0964117ac3b68420697232c2003008f4eea942f4ffe372f12f3ac8f489b464ffc811eb7e8bfa1e3abe5e5d6f2d0cfad03067df680a52ca16c28d31b50
 EBUILD orangefs-2.8.6-r2.ebuild 7422 SHA256 fd99968ac7b15c1485d98b74c4a7aeaeca45c32dfa9fdfdc33206b35c64319df SHA512 d314e74b951a9479f816c44a630990de67523e7e371b181bdeab1303b776e0fe60004a322db205431eb3493e1c20ffadd7c2341b5167aebd69aa43571acf91ae WHIRLPOOL 6dd71e380729ebaf47aba1788b563041a33163fbb41854050e32a4b600f496e9c1ad12785b601c4eb38849da139c7a07d1d379b6c5f9c1d5303cad8e63128f1a
 EBUILD orangefs-2.8.6-r3.ebuild 7476 SHA256 416e84bc74028916689d0bac611095949e99d54257360c07c552d8485582b71f SHA512 4a5e3eb08c136c763cca3918ddb771b8d0871b188f7c2e34948530e9314c0dd7e6931a507435b7fe4ff98c00cdbbe67b9027f794d88a766a0e7458aa0900d6f0 WHIRLPOOL c753d7e7aeddaf50c1f1e5a9fcf2f2fde04403e9d47d0616dd3c7a2eb1f28965f72fc23545fee233ff7f3fef2e587caf486d6d805a9d3fbba91e3cfac3bfb6fc
-MISC ChangeLog 7611 SHA256 75c9e95bf92d9c9aa8908c6a1b268603bedf1c4c174411a3095af92c6ba7560f SHA512 389f09ad2aa3444df428e7f343f25eaf7c1e9baa42a21e3d57a869ac5bbbf0e0820e5f32106345b53d3d045aa26e3a9a3ed8c7d887f7527189c49c370cf72323 WHIRLPOOL c07b86972030091a6b33470618b5f2c59995845db379b8c211e6a6f1a1488d379e6a3c52bdf32d57fe456da1fb360531905eb70e09fe7c8de05f279d9582e429
+EBUILD orangefs-2.8.6-r4.ebuild 7476 SHA256 cdd12d5f2e95d9def55a9cd94ab100740cc16fd17cbc9c124bcf47ad172b64af SHA512 6fe7c5091c5a7ab264ceb8d617beb097eb37fa12c55b884ac8c870706dc4b7b8a88dbaff0b7b33345df5ca599e10ef1f2b27ab9fd1adad2a7c33ae0d093f3bf0 WHIRLPOOL 37e7bda0c8f6fc3ac71427a9e0439fbae988f31118bf75c22195f6c4b35c60941b1a4763f09c74a65ca2589efb26850423abe1fd15972421993f2cf52a3780b0
+MISC ChangeLog 7829 SHA256 0b13635044bfea3a2dd41ddc15540f0d8e72b5e0cce4cb9db82a983a3351bad8 SHA512 778bba21b12852bcde8f5b1edcc2f1787f1a9be4d10f3ae5d3bdd35e1062dae1133d5eb330b29805cb0867ccc0a9dabd32c0104d029f95b4d0b7935b961d94d4 WHIRLPOOL a8b0b7368b6ec828938d4ad84bae5a9a8e3e24d3d8ae5cc9296801437da389ee48cb4bfdf7581a8c0ce62d5b7e60f3d1cdc44362c31f004e5751c5077b75627d
 MISC metadata.xml 1981 SHA256 748a22a5347c060acc9aa5a09f3c36efc78aecccefcbdab1a6e65bba2bd10e12 SHA512 8a9247e9f21ff51de8739b5830c827fa97b3ba14c60751f9d1ab105ef731332743514b28d3cf4638b09d2913c56bcc4935069f9925f06f0b9c400cd786254bf4 WHIRLPOOL 7107788a3522ff9fa8000ab963cc217aa397d5ef31fa778798ff9832df59280268415160cd293c8474d91ca405f744f0073afdf48331dd466cb819ae14f17794
diff --git a/sys-cluster/orangefs/orangefs-2.8.6-r4.ebuild b/sys-cluster/orangefs/orangefs-2.8.6-r4.ebuild
new file mode 100644
index 0000000..2e67960
--- /dev/null
+++ b/sys-cluster/orangefs/orangefs-2.8.6-r4.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/Attic/pvfs2-2.7.1-r1.ebuild,v 1.3 2011/07/15 13:57:08 xarthisius dead $
+
+EAPI=4
+inherit autotools linux-info linux-mod toolchain-funcs
+
+REV="9510"
+DESCRIPTION="OrangeFS is a branch of PVFS2 cluster filesystem"
+HOMEPAGE="http://www.orangefs.org/"
+SRC_URI="http://orangefs.org/downloads/${PV}/source/${P}.tar.gz
+		 ftp://mirror.mephi.ru/projects/${PN}/${P}-r${REV}.patch.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+aio apidocs debug doc examples fuse gtk infiniband kmod-threads memtrace
++mmap +modules open-mx reset-file-pos secure sendfile +server ssl static
+static-libs +tcp +threads +usrint usrint-cache +usrint-cwd usrint-kmount
+valgrind"
+
+CDEPEND="
+	dev-lang/perl
+	>=sys-libs/db-4.8.30
+	virtual/perl-Math-BigInt
+	fuse? ( sys-fs/fuse )
+	gtk? ( x11-libs/gtk+:2 )
+	infiniband? ( sys-infiniband/ofed )
+	open-mx? ( sys-cluster/open-mx[static-libs?] )
+	ssl? ( dev-libs/openssl[static-libs?] )
+	valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${CDEPEND}
+	modules? ( virtual/modutils )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.59
+	sys-devel/bison
+	sys-devel/flex
+	apidocs? ( app-doc/doxygen )
+	doc? ( dev-tex/latex2html )
+	modules? ( virtual/linux-sources )
+"
+
+# aio and sendfile are only meaningful for kernel module;
+# apidocs needs docs to be build first;
+# kernel threads obviously needs kernel module and threads
+# memtrace and valgrind witout debug info will be a pain;
+# if both Myrinet and TCP interfaces are enabled in BMI, 5 sec delays will
+# occur, though, at lest one of them must be enabled;
+# static flag affects only server, so it must depend on it;
+REQUIRED_USE="
+	aio? ( modules )
+	apidocs? ( doc )
+	kmod-threads? ( modules threads )
+	memtrace? ( debug )
+	reset-file-pos? ( modules )
+	sendfile? ( modules )
+	static? ( server static-libs )
+	tcp? ( !infiniband !open-mx )
+	usrint-cache? ( usrint )
+	usrint-cwd? ( usrint )
+	usrint-kmount? ( usrint )
+	valgrind? ( debug )
+	|| ( infiniband open-mx tcp )
+"
+
+BUILD_TARGETS="just_kmod"
+MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.6)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	if use modules && kernel_is -ge 3 3; then
+		eerror "Sorry, linux kernels >= 3.3 are not support yet."
+		eerror "You may disable modules use flag and use fuse client to mount filesystem."
+		eerror "PVFS2 server and ROMIO I/O API are still available too."
+		return 1
+	fi
+	if use modules && kernel_is -ge 2 6 38; then
+		ewarn "Kernel module for >= 2.6.38 kernels is terribly buggy, use on your own risk!"
+	fi
+}
+
+src_prepare() {
+	# Latest stable patches (kernel module fix, ucached installation fix)
+	epatch "${DISTDIR}"/${P}-r${REV}.patch.xz
+
+	# Upstream doesn't seem to want to apply this which makes
+	# sense as it probably only matters to us.  Simple patch
+	# to split the installation of the module (which we use
+	# the eclass for) and the installation of the kernapps.
+	epatch "${FILESDIR}"/${PN}-2.8.5-split-kernapps.patch
+
+	# Allow data layout control (proposed by upstream)
+	epatch "${FILESDIR}"/${P}-layout.patch
+
+	# Change defalt server logfile location to more appropriate value
+	# used by init script.
+	sed -i "s%/tmp/pvfs2-server.log%/var/log/pvfs2/server.log%g" \
+	src/apps/admin/pvfs2-genconfig || die "sed on pvfs2-genconfig failed"
+
+	AT_M4DIR=./maint/config eautoreconf
+}
+
+src_configure() {
+	# VIS build is broken at this moment.
+	# Please add SDL dependency on reenable.
+
+	local myconf=""
+
+	use threads && use aio || myconf+=" --disable-aio-threaded-callbacks"
+
+	# fast mode disables optimizations
+	use debug && myconf+=" --disable-fast --with-berkdb-debug" \
+			  || myconf+=" --enable-fast  --without-berkdb-debug"
+
+	use modules && myconf+=" --with-kernel=${KV_DIR}"
+
+	# ARCH is used to define linux header path, should be not set.
+	unset ARCH
+	econf \
+		--disable-nptl-workaround \
+		--disable-redhat24 \
+		--enable-epoll \
+	    --enable-shared \
+		--enable-verbose-build \
+	    --sysconfdir="${EPREFIX}"/etc/pvfs2 \
+	    $(use_enable aio kernel-aio) \
+	    $(use_enable debug perf-counters) \
+	    $(use_enable debug segv-backtrace) \
+	    $(use_enable fuse) \
+	    $(use_enable gtk karma) \
+	    $(use_enable mmap mmap-racache) \
+	    $(use_enable kmod-threads threaded-kmod-helper) \
+	    $(use_enable reset-file-pos) \
+	    $(use_enable secure trusted-connections) \
+	    $(use_enable sendfile kernel-sendfile) \
+	    $(use_enable server) \
+	    $(use_enable static static-server) \
+	    $(use_enable static-libs static) \
+	    $(use_enable usrint) \
+	    $(use_enable usrint-cache ucache) \
+	    $(use_enable usrint-cwd) \
+	    $(use_enable usrint-kmount) \
+	    $(use_with infiniband openib "${EPREFIX}"/usr/) \
+	    $(use_with memtrace mtrace) \
+	    $(use_with open-mx mx "${EPREFIX}"/usr/) \
+	    $(use_with ssl openssl "${EPREFIX}"/usr/) \
+	    $(use_with tcp bmi-tcp) \
+	    $(use_with valgrind) \
+		${myconf}
+}
+
+src_compile() {
+	emake all
+	if use modules; then
+		linux-mod_src_compile || die "kernel module compilation failed"
+		emake kernapps
+	fi
+
+	use doc && emake docs
+	if use apidocs; then
+		cd "${S}"/doc
+		doxygen doxygen/pvfs2-doxygen.conf || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	if use modules; then
+		linux-mod_src_install || die
+		emake DESTDIR="${D}" kernapps_install
+
+		newinitd "${FILESDIR}"/pvfs2-client-init.d pvfs2-client
+		newconfd "${FILESDIR}"/pvfs2-client-conf.d pvfs2-client
+	fi
+
+	if use server; then
+	    newinitd "${FILESDIR}"/pvfs2-server-init.d pvfs2-server
+	    newconfd "${FILESDIR}"/pvfs2-server-conf.d pvfs2-server
+	fi
+
+	keepdir /var/log/pvfs2
+
+	dodoc AUTHORS CREDITS ChangeLog INSTALL README "${FILESDIR}/README.Gentoo"
+
+	if use doc; then
+		dodoc doc/{coding/,}*.{pdf,txt} doc/random/*.pdf \
+			doc/{coding/valgrind,add-client-syscall,add-server-req,REFERENCES.bib}
+
+	    if use apidocs; then
+	        dohtml -A map -A md5 doc/doxygen/html/*
+	    fi
+
+		docinto design
+		dodoc doc/design/*.{pdf,txt}
+	fi
+	if use examples; then
+	    docinto examples
+	    dodoc -r examples/heartbeat examples/fs.conf
+	fi
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst || die
+
+	ewarn "Plese read ${ROOT}usr/share/doc/${PF}/README.Gentoo documentation carefully!"
+	ewarn "It contains very important usage information and known issues."
+	if ! use modules; then
+		ewarn
+		ewarn "Without modules support you wouldn't be able to use pvfs2-client and mount"
+		ewarn "partitions using kernel VFS. Though, you are still able to use libpvfs2,"
+		ewarn "ROMIO interface, and FUSE client (if fuse use flag is enabled)."
+	fi
+	if use modules && kernel_is -ge 3 1; then
+		ewarn
+		ewarn "ACL support for 3.1 and 3.2 kernels is known to have bugs."
+	fi
+	if use sendfile; then
+		ewarn
+		ewarn "With sendfile enabled performance will be degraded for small access patterns."
+	fi
+}
+
+pkg_config() {
+	local s
+	local f="$(source "${ROOT}"etc/conf.d/pvfs2-server; echo ${PVFS2_FS_CONF})"
+	[[ -z "${f}" ]] && f="${ROOT}etc/pvfs2/fs.conf"
+	if [[ -f "${f}" ]]; then
+		ewarn "Previous install detected."
+		ewarn "We're about to wipe out ${f} and replace it with"
+		ewarn "the file generated by running pvfs2-genconfig.  If this is what"
+		ewarn "you want to do, hit any key to continue.  Otherwise hit ctrl+C"
+		ewarn "to abort."
+		read s
+	fi
+	einfo "Creating unified configuration file"
+	[ ! -d "${ROOT}$(dirname "${f}")" ] && mkdir -p "${ROOT}$(dirname "${f}")"
+	"${ROOT}"usr/bin/pvfs2-genconfig "${f}"
+}