Version bump #197336 by Francisco Javier. Tweak nfs init.d needs based on exportfs #172431. Only mount nfsd fs in nfs init.d script. Mount rpc_pipefs in rpc.idmapd and rpc.gssd after making sure the dir exists #180425 by Maurice Volaski.

Package-Manager: portage-2.1.4_rc11

8 files changed, 187 insertions, 101 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 6ba602a764b9..0a195c2579c3 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.110 2007/12/29 06:57:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.111 2007/12/29 09:33:27 vapier Exp $
+
+*nfs-utils-1.1.1 (29 Dec 2007)
+
+  29 Dec 2007; Mike Frysinger <vapier@gentoo.org> files/nfs.initd,
+  files/rpc.gssd.initd, files/rpc.idmapd.initd, files/rpc.statd.initd,
+  +nfs-utils-1.1.1.ebuild:
+  Version bump #197336 by Francisco Javier. Tweak nfs init.d needs based on
+  exportfs #172431. Only mount nfsd fs in nfs init.d script. Mount rpc_pipefs
+  in rpc.idmapd and rpc.gssd after making sure the dir exists #180425 by
+  Maurice Volaski.
 
   29 Dec 2007; Mike Frysinger <vapier@gentoo.org> files/rpc.statd.initd:
   Look up the full path of rpc.statd to avoid matching the init.d script
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 2bbe3aafa6bb..d270561cfb78 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -21,10 +21,10 @@ AUX nfs.confd.old 533 RMD160 bad552a256a86bc374cd7ff3d685afa4ff5d816e SHA1 43fbd
 MD5 fc332370f9517304bc251f505b17abf2 files/nfs.confd.old 533
 RMD160 bad552a256a86bc374cd7ff3d685afa4ff5d816e files/nfs.confd.old 533
 SHA256 a9b8395590b8d15b52eee8cb637fdc23afce007de42442ef4448e76f2ac899fd files/nfs.confd.old 533
-AUX nfs.initd 3996 RMD160 82ca143e22ce82f4879a864bda9d12845c59189b SHA1 351a2aa51cceac3c8a8ad95cfed67176dcb6afdd SHA256 83dfc104e2af47dbbe5bd3afa528e4848ece45eb9db60e941f216716dce6d4f6
-MD5 d18214b14b8ad8902a9da762a5b379c8 files/nfs.initd 3996
-RMD160 82ca143e22ce82f4879a864bda9d12845c59189b files/nfs.initd 3996
-SHA256 83dfc104e2af47dbbe5bd3afa528e4848ece45eb9db60e941f216716dce6d4f6 files/nfs.initd 3996
+AUX nfs.initd 3906 RMD160 95690f3e0dd90393af6a9f08b2333d39d42fb356 SHA1 fd1e6ccb5282675a911195fe52f451dc29de4010 SHA256 4b8a7752aac554a5b2db5c80d1484c7d953a6f6228d731baf5df426fe252d9f3
+MD5 1fcb2d18b537c9a2db0cb5ba43fcf2d6 files/nfs.initd 3906
+RMD160 95690f3e0dd90393af6a9f08b2333d39d42fb356 files/nfs.initd 3906
+SHA256 4b8a7752aac554a5b2db5c80d1484c7d953a6f6228d731baf5df426fe252d9f3 files/nfs.initd 3906
 AUX nfsmount 1131 RMD160 f67431f36e702c50c67ff799d96c8bd37fbe847f SHA1 c88b592db4304f4d19798c1c2346ea688c9acde2 SHA256 8c1b12047327d707743bc579151ff7e3800696cc46cfcaea1c58a93fbc11f9e7
 MD5 2af8106db3fdcb3d5ddf22ea5fffb105 files/nfsmount 1131
 RMD160 f67431f36e702c50c67ff799d96c8bd37fbe847f files/nfsmount 1131
@@ -33,20 +33,23 @@ AUX nfsmount.initd 1021 RMD160 ca3ada53d56118221bef64e37e78012381609e10 SHA1 4b4
 MD5 994b00b4dde2cdcde52283fdd279f128 files/nfsmount.initd 1021
 RMD160 ca3ada53d56118221bef64e37e78012381609e10 files/nfsmount.initd 1021
 SHA256 e1405c2760f743fc7569812350ad687397a47d5ca5956944c3fded6d8fa71d8f files/nfsmount.initd 1021
-AUX rpc.gssd.initd 1279 RMD160 8ec94a0ec9062e1b5c3ee5ead60ad62f8e4a2d9c SHA1 04f5f05c96f8fe6fab2443f71be21c76abdacd00 SHA256 9a66fbd5d2bd2717af9a36c867a1e56d732a2b4747fa9f3fa3f6db14f6d2613d
-MD5 6eef39d5479c0f46e969c897b60f950b files/rpc.gssd.initd 1279
-RMD160 8ec94a0ec9062e1b5c3ee5ead60ad62f8e4a2d9c files/rpc.gssd.initd 1279
-SHA256 9a66fbd5d2bd2717af9a36c867a1e56d732a2b4747fa9f3fa3f6db14f6d2613d files/rpc.gssd.initd 1279
-AUX rpc.idmapd.initd 1835 RMD160 b14edfec996d7d5a6fddd863c05b5409499e343a SHA1 86189b013a6b4e97ef0d37f06f1c9a19be312904 SHA256 131d49eeb4557e6ea3566b4477af5f3ac61276a66acb707778fdce16b7567272
-MD5 47eb5e0c76404522bd3561175a5e87b0 files/rpc.idmapd.initd 1835
-RMD160 b14edfec996d7d5a6fddd863c05b5409499e343a files/rpc.idmapd.initd 1835
-SHA256 131d49eeb4557e6ea3566b4477af5f3ac61276a66acb707778fdce16b7567272 files/rpc.idmapd.initd 1835
-AUX rpc.statd.initd 1338 RMD160 ff01b8f08f063284161337678309e43f5f8e2133 SHA1 ab5851165fb8eb71a7c8b0c41114b4758dc33bf4 SHA256 6e68879767f53edb403097686b6af1177f547fef95019aed8b944ebfe0426d04
-MD5 2825f29c4e7189a91d55cc20e36c1362 files/rpc.statd.initd 1338
-RMD160 ff01b8f08f063284161337678309e43f5f8e2133 files/rpc.statd.initd 1338
-SHA256 6e68879767f53edb403097686b6af1177f547fef95019aed8b944ebfe0426d04 files/rpc.statd.initd 1338
+AUX rpc.gssd.initd 1106 RMD160 75af3525935d319cb822a57ee7441e3579ac9d6d SHA1 4da6054e65843262246fb314b3b06051e3929b51 SHA256 8f80988fd6572bd251d1feaf75004cd7b02814d1541385a1fc82bbb05022c97c
+MD5 0214d11900ca8ec925e476f35e1a1602 files/rpc.gssd.initd 1106
+RMD160 75af3525935d319cb822a57ee7441e3579ac9d6d files/rpc.gssd.initd 1106
+SHA256 8f80988fd6572bd251d1feaf75004cd7b02814d1541385a1fc82bbb05022c97c files/rpc.gssd.initd 1106
+AUX rpc.idmapd.initd 1101 RMD160 2f7e3c42bf46d3e49dcbd75b1464010b39984c4f SHA1 c7db0e42a7cdf91239ecc71815d6a504d7e49723 SHA256 fe6d11ea28ee49d3d8d0f5b060d18f703f9048cb8b1a10a53412c08eff11ab46
+MD5 5c02fc782d3705618cef0c75ee1a030b files/rpc.idmapd.initd 1101
+RMD160 2f7e3c42bf46d3e49dcbd75b1464010b39984c4f files/rpc.idmapd.initd 1101
+SHA256 fe6d11ea28ee49d3d8d0f5b060d18f703f9048cb8b1a10a53412c08eff11ab46 files/rpc.idmapd.initd 1101
+AUX rpc.statd.initd 874 RMD160 992a7a29973fde4ca9421647856917cd0cabe191 SHA1 e0d73101168430fe5dae45776afb972b03d8ec56 SHA256 7dfd7af9107d75a4b1a810662c3dc818da9164e01710972e1e5d6f95a6d0b7ad
+MD5 0d5469efdf7acaa5bc32e83d57cb329c files/rpc.statd.initd 874
+RMD160 992a7a29973fde4ca9421647856917cd0cabe191 files/rpc.statd.initd 874
+SHA256 7dfd7af9107d75a4b1a810662c3dc818da9164e01710972e1e5d6f95a6d0b7ad files/rpc.statd.initd 874
 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
+DIST nfs-utils-1.1.1-001-xlog_segfault_fix.dif 1222 RMD160 5635abdd46e0b24a23fd54748d1c42dc32171a21 SHA1 5fb2085073a3ecdf102599696c4b8bdde3bcd1a7 SHA256 dc1aecf7f989ac0564e51c6b75827429a8407402f87b594ff6d413d41b318dcb
+DIST nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif 6533 RMD160 a37d368c230c6e680d44978b17c807ff9c2a72eb SHA1 c16b09a341694e74605fe917ebb07d4eb6337da8 SHA256 41011ec373d0ca628857738b633068681d569d547b1c80f3c448730eea518af5
+DIST nfs-utils-1.1.1.tar.gz 803906 RMD160 e56bd8f06ad116a48e79cb819dcc693ae0dc7cdd SHA1 9051a34be0987ffb3fce19df1acd8c4deddd7df2 SHA256 3d642d5adaf91f047396b873394f50fa8bb976e7f067a027ccebd1b319194429
 EBUILD nfs-utils-1.0.12-r1.ebuild 2853 RMD160 c85a60d376630bf9f1bbb31b4f1f0b1a894f9e12 SHA1 d509ac4c7a91df4bdd73d06ca24d4be4e7367e13 SHA256 79421617f5ba0c4fa790fa2ec001e391b7db5d465351950a2d94ad79702ef069
 MD5 c793801049fdae76d80046f7efa54431 nfs-utils-1.0.12-r1.ebuild 2853
 RMD160 c85a60d376630bf9f1bbb31b4f1f0b1a894f9e12 nfs-utils-1.0.12-r1.ebuild 2853
@@ -55,14 +58,18 @@ EBUILD nfs-utils-1.0.12-r5.ebuild 3069 RMD160 19926271be7634c6bd4494bf8cd7f05b54
 MD5 5b164d75aa3ab4ab31a8f4660301e7bf nfs-utils-1.0.12-r5.ebuild 3069
 RMD160 19926271be7634c6bd4494bf8cd7f05b5497b4f5 nfs-utils-1.0.12-r5.ebuild 3069
 SHA256 f8d1f87a679d0263be717a2a0d8f397d3f777f16f8b317492fe7d5b996a8868d nfs-utils-1.0.12-r5.ebuild 3069
-EBUILD nfs-utils-1.1.0-r1.ebuild 3107 RMD160 4d7e179157f0bc9eca7806b436752308fbfe24f8 SHA1 140fd53a438415ec5ce426fa03edaadfbb4cc681 SHA256 f09f9c3d06893fc39ccaf595caaca36200b1a5900cae591ab85650d693dd4750
-MD5 7b34fff0b78b38ae86e6a1c58ed04a0b nfs-utils-1.1.0-r1.ebuild 3107
-RMD160 4d7e179157f0bc9eca7806b436752308fbfe24f8 nfs-utils-1.1.0-r1.ebuild 3107
-SHA256 f09f9c3d06893fc39ccaf595caaca36200b1a5900cae591ab85650d693dd4750 nfs-utils-1.1.0-r1.ebuild 3107
-MISC ChangeLog 16372 RMD160 42636ab11258d49e3407857f3d4388001a28b497 SHA1 dc8faf5181f95c90595eac1253bd35a85800f0e2 SHA256 dc8b1ac8bc1706f6f5f990684ef2d938f858e232adc9f8f094b30045e0842d9d
-MD5 8be693612f91fa83c4fd23610e2e4548 ChangeLog 16372
-RMD160 42636ab11258d49e3407857f3d4388001a28b497 ChangeLog 16372
-SHA256 dc8b1ac8bc1706f6f5f990684ef2d938f858e232adc9f8f094b30045e0842d9d ChangeLog 16372
+EBUILD nfs-utils-1.1.0-r1.ebuild 3103 RMD160 080e415f40644c1f5363aff2597aac0ccc45dfc0 SHA1 bb7f9981eac4ff37d7c0a9254f8552028ccb9905 SHA256 163951c7c0c6edb27017942c30e3e61e8292f08384d6ec8a314238d197521391
+MD5 0814dffdb40a53487887006c1fb6536c nfs-utils-1.1.0-r1.ebuild 3103
+RMD160 080e415f40644c1f5363aff2597aac0ccc45dfc0 nfs-utils-1.1.0-r1.ebuild 3103
+SHA256 163951c7c0c6edb27017942c30e3e61e8292f08384d6ec8a314238d197521391 nfs-utils-1.1.0-r1.ebuild 3103
+EBUILD nfs-utils-1.1.1.ebuild 3427 RMD160 f7de6685b55a98f7bf9d278406a1b0576a95c338 SHA1 73c73a361ffd1fe33829210dcf61b398f79f44cf SHA256 8c9f6fb84710beecd856dcdd8a01f5f39d14212ef42f4d68032bf04ae1795341
+MD5 8a02fd7cef8d12a8ef621a9ceb588653 nfs-utils-1.1.1.ebuild 3427
+RMD160 f7de6685b55a98f7bf9d278406a1b0576a95c338 nfs-utils-1.1.1.ebuild 3427
+SHA256 8c9f6fb84710beecd856dcdd8a01f5f39d14212ef42f4d68032bf04ae1795341 nfs-utils-1.1.1.ebuild 3427
+MISC ChangeLog 16816 RMD160 f760e31295b11f88630907ff63c78a09a4f19312 SHA1 b6529d4315d0543f572fa78324d8f3a51d5dd2cf SHA256 19468d1eebb0470cd28679d5eea72d99b0f20706e1543b0490e39c5c047dc4c7
+MD5 630dfc1078475f4f3c4c639b2da40721 ChangeLog 16816
+RMD160 f760e31295b11f88630907ff63c78a09a4f19312 ChangeLog 16816
+SHA256 19468d1eebb0470cd28679d5eea72d99b0f20706e1543b0490e39c5c047dc4c7 ChangeLog 16816
 MISC metadata.xml 225 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a SHA1 02c4f79d48d465ad7bca76f706d0f7cb7dd039df SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a metadata.xml 225
@@ -76,10 +83,13 @@ SHA256 e7414116811bdf30fbef9735564ea69ed25aee0da8e28059d8913b2f9fbeeebd files/di
 MD5 ef19dd36db8d8e298f780f15bca59200 files/digest-nfs-utils-1.1.0-r1 247
 RMD160 993bcc8082e0d13dc0df0e72488028249719d80a files/digest-nfs-utils-1.1.0-r1 247
 SHA256 403defb82328204e1cf27e79abb76b72bf87103f1889968594f29cecf9a5b8da files/digest-nfs-utils-1.1.0-r1 247
+MD5 50c35536a391d9decc8e0008b82719c8 files/digest-nfs-utils-1.1.1 888
+RMD160 1e74cda36b5da2c3aad664d057b6ddab356f0fdd files/digest-nfs-utils-1.1.1 888
+SHA256 eab4b638df3a5fcbf1b0840aaaf2caa54a3ccbd990cca6d8dcddc69d77eef1c8 files/digest-nfs-utils-1.1.1 888
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd177UACgkQj9hvisErhMJQgQCfS/CrHhjbi+WOmtfB9DGwhyiy
-Xu8AmQG2zAYbVKvD+mSH3Mt0ve9APyvn
-=pHlq
+iEYEARECAAYFAkd2FEcACgkQj9hvisErhMKIsgCfRSOKWDkJDcw1HAyqbuW7sfgF
+oVwAn27H2pWz9hMHYOj9CPlyMljMCO8+
+=yxjm
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.1.1 b/net-fs/nfs-utils/files/digest-nfs-utils-1.1.1
new file mode 100644
index 000000000000..432ca9909e3a
--- /dev/null
+++ b/net-fs/nfs-utils/files/digest-nfs-utils-1.1.1
@@ -0,0 +1,9 @@
+MD5 d1bc62def760c79f6f77925ed2937b0b nfs-utils-1.1.1-001-xlog_segfault_fix.dif 1222
+RMD160 5635abdd46e0b24a23fd54748d1c42dc32171a21 nfs-utils-1.1.1-001-xlog_segfault_fix.dif 1222
+SHA256 dc1aecf7f989ac0564e51c6b75827429a8407402f87b594ff6d413d41b318dcb nfs-utils-1.1.1-001-xlog_segfault_fix.dif 1222
+MD5 c8dc8379fb32c8044e3c1f20dd86793d nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif 6533
+RMD160 a37d368c230c6e680d44978b17c807ff9c2a72eb nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif 6533
+SHA256 41011ec373d0ca628857738b633068681d569d547b1c80f3c448730eea518af5 nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif 6533
+MD5 407785488241f9db67b1874e3f36370e nfs-utils-1.1.1.tar.gz 803906
+RMD160 e56bd8f06ad116a48e79cb819dcc693ae0dc7cdd nfs-utils-1.1.1.tar.gz 803906
+SHA256 3d642d5adaf91f047396b873394f50fa8bb976e7f067a027ccebd1b319194429 nfs-utils-1.1.1.tar.gz 803906
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 0c10f385415c..886119fc620c 100755
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.6 2007/08/16 23:35:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.7 2007/12/29 09:33:28 vapier Exp $
 
 opts="reload"
 
@@ -17,10 +17,9 @@ smnotify=/usr/sbin/sm-notify
 
 depend() {
 	local myneed=""
-	awk '!/^[[:space:]]*#/ && $3 == "nfs4" { exit ($4 ~ /sec=krb/ ? 1 : 2) }' /etc/fstab
-	local ret=$?
-	[ ${ret} -ne 0 ] && myneed="${myneed} rpc.idmapd"
-	[ ${ret} -eq 1 ] && myneed="${myneed} rpc.gssd"
+	if ! awk '!/^[[:space:]]*#/ && $2 ~ /sec=/ { exit 1 }' /etc/exports ; then
+		myneed="${myneed} rpc.gssd"
+	fi
 	need portmap rpc.statd ${myneed}
 	use ypbind net dns rpc.rquotad rpc.idmapd rpc.gssd
 	after quota
diff --git a/net-fs/nfs-utils/files/rpc.gssd.initd b/net-fs/nfs-utils/files/rpc.gssd.initd
index 955f54c7bbdd..43dae5ab16c3 100755
--- a/net-fs/nfs-utils/files/rpc.gssd.initd
+++ b/net-fs/nfs-utils/files/rpc.gssd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.4 2007/05/12 11:27:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.5 2007/12/29 09:33:28 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -14,17 +14,12 @@ depend() {
 	after quota
 }
 
-mount_nfsd() {
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] && ! grep -qs nfsd /proc/filesystems ; then
-		modprobe nfsd &> /dev/null
-	fi
-
-	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -qs nfsd /proc/filesystems ; then
-		if ! grep -qs "nfsd /proc/fs/nfs" /proc/mounts ; then
-			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfs
+mount_pipefs() {
+	if grep -qs rpc_pipefs /proc/filesystems ; then
+		if ! grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
+			mkdir -p /var/lib/nfs/rpc_pipefs
+			ebegin "Mounting RPC pipefs"
+			mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
 			eend $?
 		fi
 	fi
@@ -38,7 +33,7 @@ start_it() {
 	ret=$((ret + $?))
 }
 start() {
-	mount_nfsd
+	mount_pipefs
 
 	local ret=0
 	start_it gssd ${gssd} ${OPTS_RPC_GSSD}
diff --git a/net-fs/nfs-utils/files/rpc.idmapd.initd b/net-fs/nfs-utils/files/rpc.idmapd.initd
index 5bb00ee95195..6f5c5da52295 100755
--- a/net-fs/nfs-utils/files/rpc.idmapd.initd
+++ b/net-fs/nfs-utils/files/rpc.idmapd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v 1.3 2007/05/12 11:27:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v 1.4 2007/12/29 09:33:28 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -21,6 +21,7 @@ depend() {
 mount_pipefs() {
 	if grep -qs rpc_pipefs /proc/filesystems ; then
 		if ! grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
+			mkdir -p /var/lib/nfs/rpc_pipefs
 			ebegin "Mounting RPC pipefs"
 			mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
 			eend $?
@@ -28,33 +29,7 @@ mount_pipefs() {
 	fi
 }
 
-umount_pipefs() {
-	[ "${restarting}" = "yes" -o "${RC_CMD}" = "restart" ] && return 0
-	if grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
-		ebegin "Unmounting RPC pipefs"
-		umount /var/lib/nfs/rpc_pipefs
-		eend $?
-	fi
-}
-
-mount_nfsd() {
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] && ! grep -qs nfsd /proc/filesystems ; then
-		modprobe nfsd &> /dev/null
-	fi
-
-	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -qs nfsd /proc/filesystems ; then
-		if ! grep -qs "nfsd /proc/fs/nfs" /proc/mounts ; then
-			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfs
-			eend $?
-		fi
-	fi
-}
-
 start() {
-	mount_nfsd
 	mount_pipefs
 
 	ebegin "Starting idmapd"
@@ -63,16 +38,9 @@ start() {
 }
 
 stop() {
-	local ret
-
 	ebegin "Stopping idmapd"
 	start-stop-daemon --stop --quiet --exec ${rpc_bin}
-	ret=$?
-	eend ${ret}
-
-	umount_pipefs
-
-	return ${ret}
+	eend $?
 }
 
 restart() {
diff --git a/net-fs/nfs-utils/files/rpc.statd.initd b/net-fs/nfs-utils/files/rpc.statd.initd
index 00b4f426d3f7..8a5d236e50b5 100755
--- a/net-fs/nfs-utils/files/rpc.statd.initd
+++ b/net-fs/nfs-utils/files/rpc.statd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.4 2007/12/29 06:57:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.5 2007/12/29 09:33:28 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -14,22 +14,6 @@ depend() {
 	after quota
 }
 
-mount_nfsd() {
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] && ! grep -qs nfsd /proc/filesystems ; then
-		modprobe nfsd &> /dev/null
-	fi
-
-	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -qs nfsd /proc/filesystems ; then
-		if ! grep -qs "nfsd /proc/fs/nfs" /proc/mounts ; then
-			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfs
-			eend $?
-		fi
-	fi
-}
-
 is_running() {
 	# Don't start rpc.statd if already started by someone else ...
 	# Don't try and kill it if it's already dead ...
@@ -37,11 +21,9 @@ is_running() {
 }
 
 start() {
-	mount_nfsd
-
 	is_running && return 0
 	ebegin "Starting NFS statd"
-	start-stop-daemon --start --quiet --exec ${rpc_bin} -- ${OPTS_RPC_STATD}
+	start-stop-daemon --start --quiet --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD}
 	eend $?
 }
 
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild
new file mode 100644
index 000000000000..85ce10a82958
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2007 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.1.ebuild,v 1.1 2007/12/29 09:33:27 vapier Exp $
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://nfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nfs/${P}.tar.gz
+	http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.1.1-1/nfs-utils-1.1.1-001-xlog_segfault_fix.dif
+	http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.1.1-1/nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif"
+
+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 )
+	>=net-nds/portmap-5b-r6
+	!nonfsv4? (
+		>=dev-libs/libevent-1.0b
+		>=net-libs/libnfsidmap-0.16
+	)
+	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 ${P}.tar.gz
+	cd "${S}"
+	epatch "${DISTDIR}"/nfs-utils-1.1.1-001-xlog_segfault_fix.dif "${DISTDIR}"/nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif
+	sed -i \
+		-e 's:libgssapi >= 0\.11:libgssglue >= 0.1:' \
+		-e 's:-lgssapi:-lgssglue:' \
+		configure #191746
+}
+
+src_compile() {
+	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) \
+		$(use_enable kerberos gss) \
+		|| 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=""
+	use !nonfsv4 && list="${list} rpc.idmapd"
+	use kerberos && list="${list} rpc.gssd"
+	for f in nfs nfsmount rpc.statd ${list} ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
+	done
+	newconfd "${FILESDIR}"/nfs.confd nfs
+	use !nonfsv4 && doins utils/idmapd/idmapd.conf
+
+	# 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_preinst() {
+	[[ -s ${ROOT}/etc/exports ]] && rm -f "${D}"/etc/exports
+}
+
+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
+}