Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 130 insertions, 9 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 68c8d7845e42..cda207cab957 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.155 2009/03/25 18:46:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.156 2009/05/09 18:28:35 vapier Exp $
+
+*nfs-utils-1.1.6 (09 May 2009)
+
+  09 May 2009; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.1.6.ebuild:
+  Version bump.
 
   25 Mar 2009; Raúl Porcel <armin76@gentoo.org> nfs-utils-1.1.4-r1.ebuild:
   arm/ia64/s390/sh/sparc stable wrt #261334
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 502018edc6f7..0ef208a7bce2 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,5 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX exports 66 RMD160 0a61ad40dc321be39fb54d5b9fe717caa714e878 SHA1 52ed6b74643e084cfc17ff4638c2e06c86602034 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5
-AUX nfs-utils-1.1.2-mount-eacces.patch 1007 RMD160 675e073787f7b2ca17eb68e48cfcb655c53ef035 SHA1 7b7ce2b86de20aec00f9fd1eb9199114f9d09c81 SHA256 1fd11442bea901505ee32bc1ed043adf65297caf86d6082c0fcf278f50f44daf
 AUX nfs-utils-1.1.2-rpcgen-ioctl.patch 398 RMD160 1ff3225a3d4f3dd3e21a9d34f9839e266ee3a8fa SHA1 2f8da1c38ae4f93c600e0710d002d94f036fa09c SHA256 b769bfe5f47f1556ded750ba3cf4c0ab210d1296ce3f575b69b18b7173f4f298
 AUX nfs-utils-1.1.4-ascii-man.patch 571 RMD160 614759d4a361db8ab6ee8c8ee87fc8a93a5e6052 SHA1 745322de9b26acec667d7acf8764f12388e3a046 SHA256 5f1cd9789b4963df22df914f61a33412d61d3c8fdde9b71b8c9dd4c2506852f7
 AUX nfs-utils-1.1.4-mtab-sym.patch 1020 RMD160 72c6ebb9d02ec544b5b2d7ad3ad0c8035d248eb1 SHA1 50db1976ac25607faf8f003573f9d8529e5b4de6 SHA256 0232799d085151649a1eb1f31644105de7e5cfba888794354005499a0db277c3
@@ -12,15 +14,18 @@ AUX rpc.idmapd.initd 595 RMD160 45f3e7c83555113052a302b66ba160171f90400a SHA1 4c
 AUX rpc.pipefs.initd 788 RMD160 9ed8a4511e7ce05c67bc3a4c3c9d81ef0cfb6e45 SHA1 c184ab0c0df8b480e6f2e23dbe8360b99d1411a9 SHA256 d651ad9099ea443282476fcedf52c00f0a274eb6a9e4b58a5838780369206973
 AUX rpc.statd.initd 818 RMD160 d87fc8aed1638955444b587fc5404db671d5a8fb SHA1 bd73058b722d2f51a67bbbdec8ed029094fb9683 SHA256 0c7bd35a14da6c0c2577f09ae82a41ddb693a88157eeaf80684616f79be6c304
 AUX rpc.svcgssd.initd 584 RMD160 9488050225453f6b083be78ed3de1b042d02cfb8 SHA1 3dc09a20ca1cefd902b8709b094a4e0c0e9a407c SHA256 f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677
-DIST nfs-utils-1.1.2.tar.gz 797386 RMD160 645fd24a56323799b32c213da6ec4631ee9b3c59 SHA1 8fed426cb5a990322d0a8a3fd5ef8e97e5357b11 SHA256 1d09b1c133e4eed9d2df07ead4eba813e6993875c39e66d7b4081287029d4033
-DIST nfs-utils-1.1.3.tar.gz 811360 RMD160 45c9311208b93ac658f1d063c62fcdb5c0426a70 SHA1 cb1d717962c8c1901d10aece3275eb6c0fe52428 SHA256 57f6418960f3c2c946d02f1cdbf30c5dfc92cfce3ca2496fc4720ef20f31c260
 DIST nfs-utils-1.1.4.tar.bz2 588368 RMD160 72d6f9cbadfc30feca9c5fcb8ff8e73145d20e89 SHA1 560a063c681239b022f05e2c815402425ede01a6 SHA256 27704e3637b5e0ae141b56d5395272b685c4ca844ea0a20c777626bbfc52a94f
 DIST nfs-utils-1.1.5.tar.bz2 605790 RMD160 9e50867b29184ebe6b6c4fb8fe35b026630d5d73 SHA1 b9d2bfe9045157af78d498ed2292eff976a78127 SHA256 9a5da7cd85dc9087222ab348ce82577c38547177d5d4dc7fccc9e939c97d47dc
-EBUILD nfs-utils-1.1.2-r1.ebuild 3167 RMD160 9b5b4e813ead4a64e856a523f9e86ffbd285e990 SHA1 7d8404fb2a311c9225b135f7cb9b66ad3626edf9 SHA256 25fab1c9b6c992e425d68e82b738a7ce1372039bc179912c86b6b5cf96e3b9c5
-EBUILD nfs-utils-1.1.2.ebuild 3110 RMD160 1d380226a870ec3635c5e83756d5ce20142536aa SHA1 784f4baa1e7a8594d1ee609f378b57525433ee02 SHA256 9957a59b058ddba5cce6ae4907cd3a176670e492835cabb0024e7ebbf141fe6d
-EBUILD nfs-utils-1.1.3.ebuild 3134 RMD160 61adfe04521c059e29cd5cdb76bd1f122dbcf302 SHA1 ad740c7fc8909fe95908dd747a8816ca3440accc SHA256 cc219a59e326ddc068577d24a8019b733d55992be356685f869ad9bd04c2893d
+DIST nfs-utils-1.1.6.tar.bz2 598584 RMD160 bb3535325d4a98a7d3b83eb59c3dc9061a4c1457 SHA1 63c0ed078f231a65e3e29a21da094ad2326a0294 SHA256 9c7b4ba94cad4751604c31b9e428b0233b944fcb8ba89eebbd50e78cff73a5d5
 EBUILD nfs-utils-1.1.4-r1.ebuild 3156 RMD160 330c1fe7c37bef31fe1c6b9a22318f52bbf345c2 SHA1 5991452fb4cec1a3e7916ea83b417a78c188dcae SHA256 7887a1a2cab72d7831aa8833ef174f08abe2946cb38ca8b7999c3ffe672caa96
-EBUILD nfs-utils-1.1.4.ebuild 3022 RMD160 ae0f25f852fda512be5bbcc1adfde438012be916 SHA1 70e585a2a5d0113bed948500f265742a48a5ace4 SHA256 62ef9e41c90c48a4e040eb05f4879a607eb462d37e61951c3dbf182ed2d573d6
 EBUILD nfs-utils-1.1.5.ebuild 3087 RMD160 5467abd9880234bb3910477824bc37c9c192ad86 SHA1 89bbab2a638de77faa61fd858db8212a8b4bc1cc SHA256 e1d88e780252335b92b07887f79064399dbc306ae2bea29fc7e981293c89abdf
-MISC ChangeLog 23879 RMD160 e476b382b01a1075a7885e4ede6fd178d629d165 SHA1 d91c6b812a29cd00fbbf602caa193f8986107114 SHA256 6b754480242b6856e036c807fb5db2fe92849af416de811662e90b98b07a9151
+EBUILD nfs-utils-1.1.6.ebuild 3087 RMD160 de1cd2012bb0ed960bd9f750026ecf68130ce36b SHA1 44c2f8eb0996b4cafae86310c62c86ef32cb0605 SHA256 e6c4be88d00595818a2a1c3b03e3b8d696cb64c0be267e4e7de584f9ee854599
+MISC ChangeLog 24002 RMD160 6ef79a179762c9a4f7453fda85c4f4b3bd2d612b SHA1 a27c013ce99ec8a26910be15ad4429e582d04763 SHA256 675b75bcc8eda6d2dea8400799ac8042e7cf40cd18f93f0ef0224b6e2c440d9d
 MISC metadata.xml 296 RMD160 3c08b9e49e01eef339346151cae5628ef8a3e83a SHA1 54f3c34e813ba5d719625f04dea92362e1f3bc5b SHA256 52b4e52a61e49ae0f11388b538e0f32b772d568e1361c858c533bc629da734f7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoFy1kACgkQn/5bYzqsSmFtggCdF3zMyI5Hh3bg2rJRq7EC7XK4
+rwoAn24NjQwX5NX/P5zAdMd4OX/0M2L1
+=mam/
+-----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild
new file mode 100644
index 000000000000..eb99605c5b53
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.6.ebuild,v 1.1 2009/05/09 18:28:35 vapier Exp $
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nonfsv4 tcpd kerberos"
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	sys-libs/e2fsprogs-libs
+	>=net-nds/portmap-5b-r6
+	!nonfsv4? (
+		>=dev-libs/libevent-1.0b
+		>=net-libs/libnfsidmap-0.21-r1
+		kerberos? (
+			net-libs/librpcsecgss
+			net-libs/libgssglue
+			app-crypt/mit-krb5
+		)
+	)"
+# util-linux dep is to prevent man-page collision
+DEPEND="${RDEPEND}
+	>=sys-apps/util-linux-2.12r-r7"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.1.2-rpcgen-ioctl.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-ascii-man.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	epatch "${FILESDIR}"/${PN}-1.1.4-no-exec.patch
+}
+
+src_compile() {
+	local myconf
+	if use nonfsv4 ; then
+		myconf="--disable-gss"
+	else
+		myconf="$(use_enable kerberos gss)"
+	fi
+
+	econf \
+		--with-statedir=/var/lib/nfs \
+		--enable-nfsv3 \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable !nonfsv4 nfsv4) \
+		${myconf} \
+		|| die "Configure failed"
+	emake || die "Failed to compile"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	dodir /usr/lib/nfs
+	keepdir /var/lib/nfs/{sm,sm.bak}
+	mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs
+	keepdir /var/lib/nfs
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die
+
+	dodoc ChangeLog README
+	docinto linux-nfs ; dodoc linux-nfs/*
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+
+	local f list=""
+	if use !nonfsv4 ; then
+		list="${list} rpc.idmapd rpc.pipefs"
+		use kerberos && list="${list} rpc.gssd rpc.svcgssd"
+	fi
+	for f in nfs nfsmount rpc.statd ${list} ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
+	done
+	newconfd "${FILESDIR}"/nfs.confd nfs
+
+	# uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
+	if ! use elibc_glibc ; then
+		dobin tools/rpcgen/rpcgen || die "rpcgen"
+		newdoc tools/rpcgen/README README.rpcgen
+	fi
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.
+	# In src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  This fixes
+	# bug 30486
+	local f
+	for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
+		cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
+	done
+}