Version bump #293523 by Florian Manschwetus and update kerberos depends #274793 by Andrew Savchenko.

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

3 files changed, 124 insertions, 6 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 59f0154fcd84..050e3fe45c4a 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.161 2009/09/11 07:36:58 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.162 2009/11/22 17:53:14 vapier Exp $
+
+*nfs-utils-1.2.1 (22 Nov 2009)
+
+  22 Nov 2009; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.1.ebuild:
+  Version bump #293523 by Florian Manschwetus and update kerberos depends
+  #274793 by Andrew Savchenko.
 
   11 Sep 2009; Zac Medico <zmedico@gentoo.org> nfs-utils-1.2.0.ebuild:
   Move !net-nds/portmap out of DEPEND, as per bug #108449, comment #4.
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 058ccc9520b9..0cf79c1b7b50 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -18,17 +18,19 @@ DIST nfs-utils-1.1.4.tar.bz2 588368 RMD160 72d6f9cbadfc30feca9c5fcb8ff8e73145d20
 DIST nfs-utils-1.1.5.tar.bz2 605790 RMD160 9e50867b29184ebe6b6c4fb8fe35b026630d5d73 SHA1 b9d2bfe9045157af78d498ed2292eff976a78127 SHA256 9a5da7cd85dc9087222ab348ce82577c38547177d5d4dc7fccc9e939c97d47dc
 DIST nfs-utils-1.1.6.tar.bz2 598584 RMD160 bb3535325d4a98a7d3b83eb59c3dc9061a4c1457 SHA1 63c0ed078f231a65e3e29a21da094ad2326a0294 SHA256 9c7b4ba94cad4751604c31b9e428b0233b944fcb8ba89eebbd50e78cff73a5d5
 DIST nfs-utils-1.2.0.tar.bz2 609908 RMD160 0a20d86c218a54dd00cadc7a5eca788fb30680e7 SHA1 44edfc809e383bd72d481f1823d138877ff039aa SHA256 cb39468b3acd0bf3870cde4bbb06fe01a88e7cf0c81cff87fa7794cab871a1d1
+DIST nfs-utils-1.2.1.tar.bz2 685942 RMD160 63442bb0d94c458e061f8124a6a62e42d895c5a0 SHA1 f8227b11657006ff839090acf879ed23111aecc4 SHA256 f4fc8fd71f562564de051d681997be3dd7753fb93f8a3a0eb7c5835f0f04fa6d
 EBUILD nfs-utils-1.1.4-r1.ebuild 3155 RMD160 fcdf8feb4bae735c2de197ef9f948cd581e7089f SHA1 cb2afc5b6c17012f904a7dd32c652da53c268a5a SHA256 e9c98edbc79acac767546f13395fe39ddace9395b78804ec7bfc525f48e3d72d
 EBUILD nfs-utils-1.1.5.ebuild 3087 RMD160 c9b2d889aa009de9bd89e149622b32c5342a40ac SHA1 4bbe1ddc0958f31859dfa1892c1f997979549441 SHA256 6dc10d862ad83acf890e05b4fcb59cc563c6b96ce63d37e6e79eaa830d046e20
 EBUILD nfs-utils-1.1.6-r1.ebuild 3201 RMD160 027dca80256777c5972d7eb868639850d71aacdf SHA1 32c7fd588f826bfe0a7e35c1666eb07baa633e7d SHA256 bd7db2fcc15c4db8c46a5864690cbf0326a5c895c15a189a82f7681297ad7c88
 EBUILD nfs-utils-1.1.6.ebuild 3087 RMD160 bd4f1f823763af51d854fc8b66822bed022060ec SHA1 0d351d28c4e3b867a48a84458ca60d11428160c6 SHA256 a0339756c42dff2f5dea6847b6668b8f5791facccb9ffaf204ea1a860779a8cd
 EBUILD nfs-utils-1.2.0.ebuild 3184 RMD160 c8a3858cb184fa438ea762a891b14339a077a13e SHA1 90ef4d718e4c4b8e110a85fede029388549b180f SHA256 7b65dfc3206be33e9dca51f59bbd5d68a484d44e9920fc6c60dce5a81a5388cf
-MISC ChangeLog 25292 RMD160 1261349458f40b745920c2d76f17a6c42e197353 SHA1 51ea29065f4a92dae0dcacc7d009a1244ae864cd SHA256 55a35ebbbe6edbb892c1b9df33578610c956972facc4e87fce74cb43bdb04269
+EBUILD nfs-utils-1.2.1.ebuild 3164 RMD160 5df02db8d8c8e590733e58a9e73cfc65a4b77c88 SHA1 d738d62445b2d597147344dfae44493ec64bc6d4 SHA256 76bc7c9ab1b753010ee32113148005cbf1b857ba659866666581dbdf189b7fe9
+MISC ChangeLog 25504 RMD160 098c37cbd956d3f899ce7e1d6446897ef547d4ed SHA1 f13d1fa8a389ded81ac2d09431b3234578b1348a SHA256 649ea9786c0216fb76f45d7c4d72b9c24ee315d70dcb909c4458c59cafaf44d7
 MISC metadata.xml 402 RMD160 10e39caa098663bde1b609727598aefc319eb5c2 SHA1 9180287973e77c950e172f055e19e5f94f446621 SHA256 cf9b23e458d8e57e6b3ec4639d2c486032b3313952da2c92166bc5f40409e3f6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkqp/iAACgkQ/ejvha5XGaOtrwCgsPzi1xYFJCacQZvqRbLPkLX5
-KZQAoI7Onpv4LQSsQf6GHtlaJzfuyf0N
-=Y8sI
+iEYEARECAAYFAksJe2oACgkQlPl3HsVfCDq1egCfXHKlF3ByMUtMIvvXyFNEh+R1
+0jYAmgLrGBHutNfwCjrfkzQEei3cLfFR
+=Gq6x
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.1.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.1.ebuild
new file mode 100644
index 000000000000..0781c76a277e
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.2.1.ebuild
@@ -0,0 +1,110 @@
+# 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.2.1.ebuild,v 1.1 2009/11/22 17:53:14 vapier Exp $
+
+EAPI="2"
+
+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)
+DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
+	sys-libs/e2fsprogs-libs
+	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
+			net-libs/libtirpc[kerberos]
+			app-crypt/mit-krb5
+		)
+	)"
+RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
+# util-linux dep is to prevent man-page collision
+DEPEND="${DEPEND_COMMON}
+	>=sys-apps/util-linux-2.12r-r7"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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="" opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		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
+	dosed "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" /etc/conf.d/nfs #234132
+
+	# 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
+}