Version bump #373651 by teidakankan.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

5 files changed, 225 insertions, 3 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index c03fc138e95f..59a8e3210aa6 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.184 2011/09/01 15:18:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.185 2011/09/01 15:19:35 vapier Exp $
+
+*nfs-utils-1.2.4 (01 Sep 2011)
+
+  01 Sep 2011; Mike Frysinger <vapier@gentoo.org> +nfs-utils-1.2.4.ebuild,
+  +files/nfs-utils-1.2.4-exportfs-skip-dir.patch,
+  +files/nfs-utils-1.2.4-exportfs-xlog.patch:
+  Version bump #373651 by teidakankan.
 
   01 Sep 2011; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
   Drop --oknodo usage #377765 by Michael Mair-Keimberger.
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index c1f87a712b42..9b7be97768da 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX exports 66 RMD160 0a61ad40dc321be39fb54d5b9fe717caa714e878 SHA1 52ed6b74643e084cfc17ff4638c2e06c86602034 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5
 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
@@ -6,8 +9,10 @@ AUX nfs-utils-1.1.4-rpcgen-ioctl.patch 414 RMD160 f07264e24f374d6a65dbc8c2b1dfed
 AUX nfs-utils-1.2.2-nfsv4.patch 479 RMD160 2715fbde5c36a4e34af0d79b8760329bd2b185a8 SHA1 74377ed796f2c0e8e2734d1ac8f2c6fc9622fdb7 SHA256 ce601318e17f108c9fffcef9963430a01e2cb7dffb5189e4ca6de53413bb153f
 AUX nfs-utils-1.2.2-optional-libcap.patch 2213 RMD160 7182147365404bc6f4caa676018bfc45b90570ad SHA1 99f09ff9b5590346ef367ee9683bc94272eac2ce SHA256 75135cc2c90aacc7adb43c6ced308099ac5b2d9c8cfcc74d395ead4dc583a75a
 AUX nfs-utils-1.2.3-ti-rpc-static-ports.patch 10290 RMD160 079daaf913c61b1ff6dac7bef0d3522c377c37ef SHA1 386f76c3e957ef61706db4708423a96b39557374 SHA256 8f188be765d5aa41eaa9d15df7cf0dc6b7ba29413866e8ada6c54973b0a942e9
+AUX nfs-utils-1.2.4-exportfs-skip-dir.patch 1079 RMD160 062c6897c9d939df8b4b6bb12da55712e41e2baa SHA1 f6e974c4cf03a35e143ff838e9e531ce4d6a9524 SHA256 16476adcec288a302fded2c8e1dbfc8012a57f98a6710a182623c45c889f85e4
+AUX nfs-utils-1.2.4-exportfs-xlog.patch 1757 RMD160 0da3208e243bcd794faa9e189fbd983dd949fa3f SHA1 9081b7b193d3e54ef246c5dc96b6d650699a536d SHA256 b9a7bcb4c4f619dee1b4a7faabbeb07875ff0e8ba04a97a77cd4cd2dbaac51ce
 AUX nfs.confd 948 RMD160 eee237aeb641e823d3b505371faf8c4a33582a51 SHA1 bf296a1ea20478d729307496b2d34299a493168c SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e
-AUX nfs.initd 4446 RMD160 b64aa4302e544da40a9096adf18f3d6ab2d1610e SHA1 f93cfbc8f23f35fc6d70a1d96a6cb1c4f81d3273 SHA256 d2886191e7fb2d9dd798b7a16ddd612deda4367226b56cc55785d07aa5c2294f
+AUX nfs.initd 4319 RMD160 97cf92cb69f2c94fc1ff46d8ff4e9bd8b2a5a00d SHA1 40c555547ab519c2078cf49f4dfcf7445d49d57d SHA256 e82f20b3c770c90c4cd883d64e012144ce5832f2678a8188611f0481169a3bcc
 AUX nfsmount.initd 1130 RMD160 7ac01f228fcd9539e11cf200a0ba2ed82987a91b SHA1 1f4bfd0155489b6ce2e044f34d057c222202b1bb SHA256 4d6965abb56b72bdcd18cbf900b6e1614d12da6b92b1a5b18727c36eaa131d37
 AUX rpc.gssd.initd 567 RMD160 26d42451b9fc0e90297b5e0381d2632a57dc4c51 SHA1 041e59d915a0ab183a3e0b50abbf58394d2e89b9 SHA256 00d9c29280a83e8458c33139d04a9b38c6fdba9d7cb9b420ca83bf6b10e6435d
 AUX rpc.idmapd.initd 595 RMD160 45f3e7c83555113052a302b66ba160171f90400a SHA1 4c387d27dd11dcfe896dd937c69cd391c1936123 SHA256 3ce65326859c43983dad25ad2d4731488c488037796e39b6b5eda336e8bf81ef
@@ -21,6 +26,7 @@ DIST nfs-utils-1.2.0.tar.bz2 609908 RMD160 0a20d86c218a54dd00cadc7a5eca788fb3068
 DIST nfs-utils-1.2.1.tar.bz2 685942 RMD160 63442bb0d94c458e061f8124a6a62e42d895c5a0 SHA1 f8227b11657006ff839090acf879ed23111aecc4 SHA256 f4fc8fd71f562564de051d681997be3dd7753fb93f8a3a0eb7c5835f0f04fa6d
 DIST nfs-utils-1.2.2.tar.bz2 721051 RMD160 fe855f89c5f93888b6c50682d353a9b475e0db21 SHA1 bf823cb85844de3ff3bf07601698aaa1cfdd8a28 SHA256 fd47277666968cf1f6bf3fe4df91a0dd45122bcdf0e24403ea84c5a2dbc9d01e
 DIST nfs-utils-1.2.3.tar.bz2 672759 RMD160 dad6fe83fa60c4854849e36d2128208c4e3234ab SHA1 da70a29191b07056d71b6e427a87d5cfd8628523 SHA256 5575ece941097cbfa67fbe0d220dfa11b73f5e6d991e7939c9339bd72259ff19
+DIST nfs-utils-1.2.4.tar.bz2 664358 RMD160 5da35351dd39f91ea96b22a9d26678bc10d06921 SHA1 dcd6d2f55976df574005c40dded43078544e5664 SHA256 6ff1c702b1d61dc6e8c69cd977f79ab7d662dc870337ef89ca6d1b41bad026c0
 EBUILD nfs-utils-1.1.4-r1.ebuild 3167 RMD160 8378aed25dfc49f16c7f67b4f1f044259533d7b3 SHA1 57dced084df3b73fc613c8efefe93324e9088160 SHA256 c0f3eedc4f31424c7788e55f504980bb530464d1bed49ed0cc0e431eef633403
 EBUILD nfs-utils-1.1.5.ebuild 3098 RMD160 1a1db2ab16f016511e799f5843d3b2b404173edc SHA1 a72f47b8d67fb539842ba3113f8365f4c3ae31ca SHA256 35a23dde75f23c921c1731f4bce5bfd6a9ab4aa66416e73864b7c8909e89a964
 EBUILD nfs-utils-1.1.6-r1.ebuild 3212 RMD160 128bea36284b28408aa6e10dfcc1b33061573b96 SHA1 56df20069859675ae6d37ecd88c136b2b78a7550 SHA256 02ecf4976fd1e54ff1440a8e7b6eb2333b7e4ff2392f082c34b5b41c493f809c
@@ -29,5 +35,13 @@ EBUILD nfs-utils-1.2.1.ebuild 3120 RMD160 c97608ea950bb115875d1c2058112b67e50015
 EBUILD nfs-utils-1.2.2-r2.ebuild 3387 RMD160 957cda2a26635d233322f2ca62a4466bbe2ad537 SHA1 bd0fc823c4e79d0c5a0025f31f9a416a3411da78 SHA256 9dd1368b530d093538f6adb4715ec6634fe050e664b6ae0b004f65a8fae9c4f4
 EBUILD nfs-utils-1.2.3-r1.ebuild 3243 RMD160 fd7ff6d183dab514a48bb361d52d6e7aaf88f66a SHA1 0622a8f2007e56295f5090e02f75550ce59f59f4 SHA256 5660e204ebd82df18a3ea663115dd821bc73828192e9e54862b5bb01121c81b0
 EBUILD nfs-utils-1.2.3.ebuild 3150 RMD160 03ce5a05c2bc11e3d0fa87c86faf590329307531 SHA1 2293dc44577dd9d4c91f0e234e22301989810d12 SHA256 b1c484e0cc4b032cd44ff66d9e73866e0dfcea87c22917994f2aa6312db1bcba
-MISC ChangeLog 28962 RMD160 9ca4d90813e7a9741d4ec587ab170c08ce7950dd SHA1 80fa4f3faffd84bbc59f9287740d226ef6c28999 SHA256 7d24641754332762d7332c6323d16daf26ed755b5c0006b0ecc816b9ad211279
+EBUILD nfs-utils-1.2.4.ebuild 3254 RMD160 6f4518e4624cfc513e796232568c4406d40f5140 SHA1 ec9bd6bc84f0cfc2874e78eaa1aaad7900067aad SHA256 a1e78a0bb40d2edef564669001fb21eb57fe2b70c32f9cb1ef087a5eb48a77b6
+MISC ChangeLog 29331 RMD160 3ffe9e09019d196b317ef1c462059fffd2ea6fb1 SHA1 467caecae5b65d5045244552d5b848b43e3e91f8 SHA256 b400e5982d39b7bdb74a4c76f613a4d4a0f12424296d729befe615b5dd3f7359
 MISC metadata.xml 402 RMD160 10e39caa098663bde1b609727598aefc319eb5c2 SHA1 9180287973e77c950e172f055e19e5f94f446621 SHA256 cf9b23e458d8e57e6b3ec4639d2c486032b3313952da2c92166bc5f40409e3f6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk5foo4ACgkQaC/OocHi7JaSDwD/dkslHz11At49hrBSu03RDqrp
+JaFsaKSvpAza8/cZWpsA/jZOOM4MCGWV5t/cNGCdPvAbOBK9jipb2U8od0wZ07nl
+=QUhD
+-----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch
new file mode 100644
index 000000000000..af14ab66aafb
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-skip-dir.patch
@@ -0,0 +1,36 @@
+From 5dc4c89b6935fcfe327b77681362319e6fd407e0 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 1 Sep 2011 11:08:04 -0400
+Subject: [PATCH] exportfs: do not warn if /etc/exports.d/ does not exist
+
+It isn't uncommon for /etc/exports.d/ to not exist, and imo, it's not
+that big of a deal as often times, a simple /etc/exports is sufficient.
+So silently skip the case where the dir is missing.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ utils/exportfs/exportfs.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
+index 986a272..7432a65 100644
+--- a/utils/exportfs/exportfs.c
++++ b/utils/exportfs/exportfs.c
+@@ -529,9 +529,12 @@ export_d_read(const char *dname)
+ 
+ 
+ 	n = scandir(dname, &namelist, NULL, versionsort);
+-	if (n < 0)
++	if (n < 0) {
++		if (errno == ENOENT)
++			/* Silently return */
++			return;
+ 		xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
+-	else if (n == 0)
++	} else if (n == 0)
+ 		return;
+ 
+ 	for (i = 0; i < n; i++) {
+-- 
+1.7.6
+
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch
new file mode 100644
index 000000000000..0e17e9538b08
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.4-exportfs-xlog.patch
@@ -0,0 +1,56 @@
+From aacec6914549f5bf4f5fb2aed0925a8a7e57b50c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 1 Sep 2011 11:00:39 -0400
+Subject: [PATCH] exportfs: drop extra newline in xlog
+
+Since xlog() itself appends a newline, we don't want to add our own
+otherwise we get extra in the output.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ utils/exportfs/exportfs.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
+index 12e8bf1..986a272 100644
+--- a/utils/exportfs/exportfs.c
++++ b/utils/exportfs/exportfs.c
+@@ -401,7 +401,7 @@ validate_export(nfs_export *exp)
+ 	int fs_has_fsid = 0;
+ 
+ 	if (stat(path, &stb) < 0) {
+-		xlog(L_ERROR, "Failed to stat %s: %m \n", path);
++		xlog(L_ERROR, "Failed to stat %s: %m", path);
+ 		return;
+ 	}
+ 	if (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) {
+@@ -530,7 +530,7 @@ export_d_read(const char *dname)
+ 
+ 	n = scandir(dname, &namelist, NULL, versionsort);
+ 	if (n < 0)
+-		xlog(L_NOTICE, "scandir %s: %s\n", dname, strerror(errno));
++		xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
+ 	else if (n == 0)
+ 		return;
+ 
+@@ -558,7 +558,7 @@ export_d_read(const char *dname)
+ 
+ 		fname_len = snprintf(fname, PATH_MAX +1, "%s/%s", dname, d->d_name);
+ 		if (fname_len > PATH_MAX) {
+-			xlog(L_WARNING, "Too long file name: %s in %s\n", d->d_name, dname);
++			xlog(L_WARNING, "Too long file name: %s in %s", d->d_name, dname);
+ 			continue;
+ 		}
+ 
+@@ -672,7 +672,7 @@ dump(int verbose)
+ static void
+ error(nfs_export *exp, int err)
+ {
+-	xlog(L_ERROR, "%s:%s: %s\n", exp->m_client->m_hostname,
++	xlog(L_ERROR, "%s:%s: %s", exp->m_client->m_hostname,
+ 		exp->m_export.e_path, strerror(err));
+ }
+ 
+-- 
+1.7.6
+
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild
new file mode 100644
index 000000000000..7ba8bbf98550
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2011 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.4.ebuild,v 1.1 2011/09/01 15:19:35 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="caps ipv6 kerberos +nfsv3 +nfsv4 tcpd elibc_glibc"
+RESTRICT="test" #315573
+
+# 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 )
+	caps? ( sys-libs/libcap )
+	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_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	epatch "${FILESDIR}"/${PN}-1.2.4-exportfs-xlog.patch
+	epatch "${FILESDIR}"/${PN}-1.2.4-exportfs-skip-dir.patch
+}
+
+src_configure() {
+	econf \
+		--with-statedir=/var/lib/nfs \
+		--enable-tirpc \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable nfsv3) \
+		$(use_enable nfsv4) \
+		$(use_enable ipv6) \
+		$(use_enable caps) \
+		$(use nfsv4 && use_enable kerberos gss || echo "--disable-gss")
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${D}"/var/lib "${D}"/usr/$(get_libdir) || die
+
+	# 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.  #30486
+	local f
+	mkdir -p "${ROOT}"/var/lib/nfs #368505
+	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
+}