Add support for USE=ipv6 #261926, switch to rpcbind over portmap, switch to libtirpc all the time, and make nfs3/nfs4 optional.

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

4 files changed, 130 insertions, 6 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index cda207cab957..bcac3c49ade1 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,18 @@
 # 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.156 2009/05/09 18:28:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.157 2009/05/30 21:47:12 vapier Exp $
+
+  30 May 2009; Mike Frysinger <vapier@gentoo.org>
+  +nfs-utils-1.1.6-r1.ebuild, metadata.xml:
+  Add support for USE=ipv6 #261926, switch to rpcbind over portmap, switch
+  to libtirpc all the time, and make nfs3/nfs4 optional.
+
+*nfs-utils-1.1.6-r1 (30 May 2009)
+
+  30 May 2009; Mike Frysinger <vapier@gentoo.org>
+  +nfs-utils-1.1.6-r1.ebuild:
+  Add support for USE=ipv6 #261926, switch to rpcbind over portmap, switch
+  to libtirpc all the time, and make nfs3/nfs4 optional.
 
 *nfs-utils-1.1.6 (09 May 2009)
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 0ef208a7bce2..beb272e93652 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -19,13 +19,14 @@ DIST nfs-utils-1.1.5.tar.bz2 605790 RMD160 9e50867b29184ebe6b6c4fb8fe35b026630d5
 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.5.ebuild 3087 RMD160 5467abd9880234bb3910477824bc37c9c192ad86 SHA1 89bbab2a638de77faa61fd858db8212a8b4bc1cc SHA256 e1d88e780252335b92b07887f79064399dbc306ae2bea29fc7e981293c89abdf
+EBUILD nfs-utils-1.1.6-r1.ebuild 3085 RMD160 65588b92ec8a5725942e5e59cbadf973ae111703 SHA1 b70d6ef8910745d93281a011fd322f5da9c11cfa SHA256 221a5697b11da8575d171dbedf29999bb04404f1079b20d166f6938e1c7ad03c
 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
+MISC ChangeLog 24477 RMD160 c217da8f99ee34231a6bbac8a7710fcf1b552357 SHA1 a27a40e4fa080830c51d0e167c8b269aad3d80e7 SHA256 96adbf57dd973625ec28b0fa70790771028c1ad6caa3ddbb66ad0c4ce217fc62
+MISC metadata.xml 402 RMD160 10e39caa098663bde1b609727598aefc319eb5c2 SHA1 9180287973e77c950e172f055e19e5f94f446621 SHA256 cf9b23e458d8e57e6b3ec4639d2c486032b3313952da2c92166bc5f40409e3f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoFy1kACgkQn/5bYzqsSmFtggCdF3zMyI5Hh3bg2rJRq7EC7XK4
-rwoAn24NjQwX5NX/P5zAdMd4OX/0M2L1
-=mam/
+iEYEARECAAYFAkohqQ4ACgkQn/5bYzqsSmEbAgCgtD9ePMFkbZVBuwFKS3gvdHL8
+r4AAoIlUXvZggE8iGfdLsBbrDZZLRvLB
+=a8hy
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml
index 88eef66eb7bb..91d9c189da05 100644
--- a/net-fs/nfs-utils/metadata.xml
+++ b/net-fs/nfs-utils/metadata.xml
@@ -4,6 +4,8 @@
 <herd>net-fs</herd>
 	<longdescription>NFS client and server daemons</longdescription>
 	<use>
+		<flag name='nfsv3'>Enable support for NFSv3</flag>
+		<flag name='nfsv4'>Enable support for NFSv4</flag>
 		<flag name='nonfsv4'>Disable support for NFSv4</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..2148e972ebff
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.1.6-r1.ebuild
@@ -0,0 +1,109 @@
+# 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-r1.ebuild,v 1.1 2009/05/30 21:47:12 vapier Exp $
+
+EAPI="1"
+
+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="ipv6 kerberos +nfsv3 +nfsv4 tcpd"
+
+# 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
+	net-nds/rpcbind
+	net-libs/libtirpc
+	nfsv4? (
+		>=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() {
+	econf \
+		--with-statedir=/var/lib/nfs \
+		--enable-tirpc \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable nfsv3) \
+		$(use_enable nfsv4) \
+		$(use_enable ipv6) \
+		$(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
+	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 nfsv4 ; 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
+}