Add some fixes from Debian and push out init.d fixes.

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

6 files changed, 211 insertions, 5 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 3c4f0bc7e058..daf62ace470c 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,14 @@
 # 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.144 2009/01/31 22:19:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.145 2009/01/31 22:20:24 vapier Exp $
+
+*nfs-utils-1.1.4-r1 (31 Jan 2009)
+
+  31 Jan 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/nfs-utils-1.1.4-ascii-man.patch,
+  +files/nfs-utils-1.1.4-mtab-sym.patch,
+  +files/nfs-utils-1.1.4-no-exec.patch, +nfs-utils-1.1.4-r1.ebuild:
+  Add some fixes from Debian and push out init.d fixes.
 
   31 Jan 2009; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
   Also use rpc.nfsd to try to shutdown nfsd #228127 by Maurice Volaski.
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 8b66ecf16615..1f716a02e26f 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,17 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX exports 66 RMD160 0a61ad40dc321be39fb54d5b9fe717caa714e878 SHA1 52ed6b74643e084cfc17ff4638c2e06c86602034 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5
 AUX nfs 6879 RMD160 2016eebfaaa69337eee02e2b2a973f7b7e5798ad SHA1 c2d35305c9a4d6d47c5f2611324cfa0fe33e741d SHA256 25d6f28b67b4c90f0fa1b9a2cbff54240d527f83a1c61faac9d8f8dcbd72d680
 AUX nfs-utils-1.0.12-mountd-memleak.patch 548 RMD160 c4b9c3ad1c857d4389cb727356de0a5eda74030e SHA1 2d1dddeb135a70b50b242d12c1a8167458aa0017 SHA256 d9ae3561bbb7067a833891139107b2e54565dbb36104268289e35e1e18e3da92
 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
+AUX nfs-utils-1.1.4-no-exec.patch 297 RMD160 59e6f4bf2c782c0c107cd135589c4abcba1a5978 SHA1 aa7239b22cf73abb1790bb9a88407cea8fd56779 SHA256 f66af9d046a3524ae8920f8e4b5d0fa206de31d4e7747bfc716a10ac86537b0f
 AUX nfs.confd 630 RMD160 3628b5df5589c700905afc8054d1ee22fb5be0b9 SHA1 b5e8e37f3611008626f3f1fc633202fbefb8c101 SHA256 9ca3b7dfbac5bedd818a3637805380f4e873ef8e809c21c26f410c86ac16e03e
 AUX nfs.confd.old 533 RMD160 bad552a256a86bc374cd7ff3d685afa4ff5d816e SHA1 43fbdfba5a61ad79375265c120fb4784da7b1462 SHA256 a9b8395590b8d15b52eee8cb637fdc23afce007de42442ef4448e76f2ac899fd
-AUX nfs.initd 3969 RMD160 a038b0993d6d0eac9d7145cf4b8ad35afc4a0232 SHA1 d3bad329f68e69fc029e0a9cd568659907ce1097 SHA256 56a66815ea2dcde011911fc3a62c4ed2c41b5d56af3de474063e606e0b6b5582
+AUX nfs.initd 4156 RMD160 890dbf2a500f7233e30c36baba38254c5a841179 SHA1 0ac8869e1a432e406ed59264e1cf9c5dcdcb1531 SHA256 8df5f673c2d1dc14f160b5ad77dbccf29326fce4f0c7d3d663895754d55ecf91
 AUX nfsmount 1131 RMD160 f67431f36e702c50c67ff799d96c8bd37fbe847f SHA1 c88b592db4304f4d19798c1c2346ea688c9acde2 SHA256 8c1b12047327d707743bc579151ff7e3800696cc46cfcaea1c58a93fbc11f9e7
-AUX nfsmount.initd 1084 RMD160 e17f7b09c91c67e6574a278427c9fc1276d5e6b2 SHA1 cec1feb78babf8c3cba8cd5160f8052088575323 SHA256 13a99f1bdbe8c7ac3b333c353d1fdfb81c9b9af19e4ceef9857ad1016f033fb6
+AUX nfsmount.initd 1084 RMD160 7da20dd19d9d6fe8734691eb3219e6bd011737eb SHA1 521a3e95158c76800c396fbe54ef558e01520177 SHA256 f2f5b54fef59f24a1fc6a8b814dfe2cfdeeb02fd0d5041cff31650e626fe4b75
 AUX rpc.gssd.initd 567 RMD160 26d42451b9fc0e90297b5e0381d2632a57dc4c51 SHA1 041e59d915a0ab183a3e0b50abbf58394d2e89b9 SHA256 00d9c29280a83e8458c33139d04a9b38c6fdba9d7cb9b420ca83bf6b10e6435d
 AUX rpc.idmapd.initd 552 RMD160 805c4be056f382982b84c9541e86cc74927a80e8 SHA1 c3a70da6a9185296d73c91fa748e5333bf0bb87c SHA256 a3154c48e83b25fbb812076068442fceb26c42be5411b663db4f93293ff6d314
 AUX rpc.pipefs.initd 788 RMD160 9ed8a4511e7ce05c67bc3a4c3c9d81ef0cfb6e45 SHA1 c184ab0c0df8b480e6f2e23dbe8360b99d1411a9 SHA256 d651ad9099ea443282476fcedf52c00f0a274eb6a9e4b58a5838780369206973
-AUX rpc.statd.initd 858 RMD160 bb8cce615ce75ab478b034e32ebd571e01f03296 SHA1 4e282980452400a11eeff64db2f6988a25316ac2 SHA256 85f6bb77f8fc4ffabf1b2a111c631f0bd2e603e8f80170bf8bd0db074c10fcb0
+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.0.12.tar.gz 778576 RMD160 a00dbdae386acf3f969714a1571749182c5a19a8 SHA1 477e3eb387b0ccde2eaeb8e67c6437cc0d2668e3 SHA256 67d81a53d84777c733ff8a5cf5f3eed9ecda17fb9f949bc65727c1a3427af8ac
 DIST nfs-utils-1.1.0.tar.gz 781661 RMD160 6751ad3c9e98f96204cc94c837ea9e5d3dcefa05 SHA1 4c07aaf51fad09d6e2b0c6208ff426401f1985aa SHA256 fb42cc0f79ab76c3ab786a207685d30bae42663a31cc8edd113753caa106a682
@@ -29,6 +35,14 @@ EBUILD nfs-utils-1.1.1.ebuild 3484 RMD160 2c9a6c8fa8b0a3fc6c97a05a4cdf4a9effc4b4
 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
+EBUILD nfs-utils-1.1.4-r1.ebuild 3166 RMD160 d39a02f7d8628681cfef468aeb406d7784fb2235 SHA1 24eb04600529700f6a47b765bcd5edcc4cd3a90e SHA256 beb253c736ed45acbd4cd7425fe878297be110ff2c067df0e6cbe4a1f92c7c1a
 EBUILD nfs-utils-1.1.4.ebuild 3022 RMD160 ae0f25f852fda512be5bbcc1adfde438012be916 SHA1 70e585a2a5d0113bed948500f265742a48a5ace4 SHA256 62ef9e41c90c48a4e040eb05f4879a607eb462d37e61951c3dbf182ed2d573d6
-MISC ChangeLog 21831 RMD160 8697190ca9bba7ffe8acd8e32c52fa009b1f3fe3 SHA1 92f939d9d0293fefa01082b564dc3f099b4e179e SHA256 5a83dcd241b463c79ad620e378cae41dde80c7e4acbce28f75f2705c5e270457
+MISC ChangeLog 22679 RMD160 4522a3defa3cc56a2c5821c0175bdfd01ef7d341 SHA1 a589ad7113f50c71d637539f9ebe51963843beb4 SHA256 bbfe64fcb9ac53fee2b2438aa0f5f3c7b1f3810bedd1399796b6d44ddb6feb7f
 MISC metadata.xml 296 RMD160 3c08b9e49e01eef339346151cae5628ef8a3e83a SHA1 54f3c34e813ba5d719625f04dea92362e1f3bc5b SHA256 52b4e52a61e49ae0f11388b538e0f32b772d568e1361c858c533bc629da734f7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmEzq8ACgkQn/5bYzqsSmGFXQCfZPUV4uPeoZj0oLpo+/O2IgIS
+ZpkAniCE1vUS21YLPID9tjKQTvmAYswU
+=IKVC
+-----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch
new file mode 100644
index 000000000000..83ed4aa42661
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.1.4-ascii-man.patch
@@ -0,0 +1,16 @@
+ripped from Debian
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493659
+patch by nbreen@ofb.net (Nicholas Breen)
+
+--- nfs-utils-1.1.3/utils/mount/nfs.man
++++ nfs-utils-1.1.3/utils/mount/nfs.man
+@@ -799,7 +799,7 @@
+ and server load.
+ .P
+ However, UDP can be quite effective in specialized settings where  
+-the network’s MTU is large relative to NFS’s data transfer size (such  
++the network's MTU is large relative to NFS's data transfer size (such  
+ as network environments that enable jumbo Ethernet frames).  In such  
+ environments, trimming the 
+ .B rsize 
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch
new file mode 100644
index 000000000000..c9e60afc74d2
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch
@@ -0,0 +1,39 @@
+ripped from Debian
+
+--- nfs-utils-1.1.4/utils/mount/fstab.c
++++ nfs-utils-1.1.4/utils/mount/fstab.c
+@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
+ 	return var_mtab_does_not_exist;
+ }
+ 
+-static int
++int
+ mtab_is_a_symlink(void) {
+         get_mtab_info();
+         return var_mtab_is_a_symlink;
+--- nfs-utils-1.1.4/utils/mount/fstab.h
++++ nfs-utils-1.1.4/utils/mount/fstab.h
+@@ -7,6 +7,7 @@
+ #define _PATH_FSTAB "/etc/fstab"
+ #endif
+ 
++int mtab_is_a_symlink(void);
+ int mtab_is_writable(void);
+ int mtab_does_not_exist(void);
+ void reset_mtab_info(void);
+--- nfs-utils-1.1.4/utils/mount/mount.c
++++ nfs-utils-1.1.4/utils/mount/mount.c
+@@ -230,6 +230,13 @@ create_mtab (void) {
+ 	int flags;
+ 	mntFILE *mfp;
+ 
++	/* Avoid writing if the mtab is a symlink to /proc/mounts, since
++	   that would create a file /proc/mounts in case the proc filesystem
++	   is not mounted, and the fchmod below would also fail. */
++	if (mtab_is_a_symlink()) {
++		return EX_SUCCESS;
++	}
++
+ 	lock_mtab();
+ 
+ 	mfp = nfs_setmntent (MOUNTED, "a+");
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch
new file mode 100644
index 000000000000..ea50a21d85dc
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.1.4-no-exec.patch
@@ -0,0 +1,15 @@
+ripped from Debian
+
+--- nfs-utils-1.1.2/utils/mount/mount.c
++++ nfs-utils-1.1.2/utils/mount/mount.c
+@@ -381,10 +381,6 @@
+ 		mount_error(NULL, mount_point, ENOTDIR);
+ 		return 1;
+ 	}
+-	if (access(mount_point, X_OK) < 0) {
+-		mount_error(NULL, mount_point, errno);
+-		return 1;
+-	}
+ 
+ 	return 0;
+ }
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..8da65189feac
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.1.4-r1.ebuild
@@ -0,0 +1,114 @@
+# 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.4-r1.ebuild,v 1.1 2009/01/31 22:20:24 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 \
+		--mandir=/usr/share/man \
+		--with-statedir=/var/lib/nfs \
+		--disable-rquotad \
+		--enable-nfsv3 \
+		--enable-secure-statd \
+		$(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
+}