Fix nfsclient init script when using mounts requiring the rpc.gssd service.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 21 insertions, 14 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 6f16aa75096c..cbc4ca50a8c1 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.259 2014/12/22 19:24:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.260 2014/12/24 18:06:03 radhermit Exp $
+
+*nfs-utils-1.3.1-r1 (24 Dec 2014)
+
+  24 Dec 2014; Tim Harder <radhermit@gentoo.org> -nfs-utils-1.3.1.ebuild,
+  +nfs-utils-1.3.1-r1.ebuild, files/nfsclient.initd:
+  Fix nfsclient init script when using mounts requiring the rpc.gssd service.
 
 *nfs-utils-1.3.1 (22 Dec 2014)
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 06dc2444161f..22546b068d19 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -9,7 +9,7 @@ AUX nfs-utils.conf 74 SHA256 a09f97a40b5c75a3fb65bd60feb4c4b7d2b569ced004464eef4
 AUX nfs.confd 948 SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e SHA512 0981f9ea34d5aaf25b558aa1f4c32f6750b657b450d5d22b999e1556b583207c8d88b83f6f803747c56cc70531556f5a8741589125429f93d0bbc73ae31c137e WHIRLPOOL ff6db7d613126c4fd76a6b99dc432a44f086ea22c78a42e3bcb2df04b95c31e9552cb2c080345b71027c71f97b0b7470fd53ffb81502b3f77bc9bb80a38fe9cc
 AUX nfs.initd 4351 SHA256 1e77bc6fb2ceb266f724818898bd42bec47512a5a7ede6660e0565ea1c58d619 SHA512 32a231fd04a2bb68b235b6d8294eefea4fd3e5eac2d84f3a8a8ec929b21b85788c5548338556f2246180261f82435cc2141c60f8b9c164c1e5ec1897fa18bce6 WHIRLPOOL 72324e4b73be6532d849f24a8d2e97ec43d70231e6cbdf73a5f8b0ae15b9dd9c48df8d3c67628a4445f1379c2201ec662fbcebc41385f90c2b1a6c180995be1e
 AUX nfsclient.confd 327 SHA256 a1ecfb9441052d374b6bc2b77554a3253a4e4c231c76114b3313d2cc68e561b8 SHA512 e9d9b38397b7c0cafa1154e466317884480b804f08793aa2337257ecb9862f6b5f5c7fc3eeb63353104abe47c899194d670d6dcd8680f142a47164d8a296dec6 WHIRLPOOL db3616d469c17c7c6569d2f897392244718b16c2315f21df38cb9a9158e0cc2b7decc76b7340cd1444b02b32a755f70fd8b33dd72e596908842533c932dccb4d
-AUX nfsclient.initd 984 SHA256 a4e26efb4e9e033a98bfb3fdbd9643c6a2fa50282598392142cf350cf0b57d54 SHA512 1ff7f84242650a4489143514cf32869015e6966caf5a204410943a92eb43468e4d3de2e7ed9432d117a47b0992dfb47d7a6b342e6b9f10cb5405a05db9e87ffa WHIRLPOOL 2842d4dacfc3d1d8af3765727d61a608e76a42a79b1b569be6a9bd7d7e8994d657760cb2cedf03f2f3c4d90f820a7f16065a3ec1c8940d0eba92d304eb9f3957
+AUX nfsclient.initd 983 SHA256 8e491bfc7914351e6481b7ea7b4895cb8cec015b2c73bec79bbd1b9f4868e23c SHA512 0b20847c0d97202b786d35cbfb45b058c248469aa32c5cba742a46633b58688dfc688cc8e0c01467f05501d1e796319bcb7568877bffa4ad075a68b268294338 WHIRLPOOL 6ab6ed36fdfc25cf6fb8f85fe995b506b687c632726622df38834acb88adefe1d6200a2ae70c5d11e1199329f940adf3bc28e5ce729bc374886b68dc8765f1fe
 AUX nfsd.service-r1 294 SHA256 b98575ae9803d0e75159a32f8bed61f6666f8ae130bb93069de13e76943f2577 SHA512 256c78317e5af15cca7f10e247d086d1a0b04ca34d93e8afe4f940d841c93a95ddc119c80aba287d777fe87830dfc8b52f9b558a3663de0ee5e05aa64fbbadbb WHIRLPOOL 8f492d40a44658ab8bbee760c29f738c531ea361081cb18ab7ed85d28d3e9736c2d8e040fe91554a19e8f49e1d26d064d73370f2b6e3ad2cd0927597ab09618d
 AUX nfsmount.confd 326 SHA256 b9389e143c2c4f95c11f97a8a379e007f140559016f60011c9d2ff0935758bcb SHA512 6e23897885cc33c49d9c7353b456585a1e0c7300822edba81bc48ba4ccc18297adce137260cc0aa9487aa5ef0aab3eecf931532cfa5bd40fd03bc9e0ddacfb28 WHIRLPOOL 97939b074a9b5717184512088388c9c22a31f37009996b69137023a0f8a97ce6eb41f7cb0a25843ea088f00d37cb45f6b3bd1ba0f801de7cb8f6dc2e5d374dfb
 AUX nfsmount.initd 1126 SHA256 b57637c7eb8e40b5cc1655e8afa69dc0aaecbd3186bdca3301586d1e9b797357 SHA512 e2c4d2bf9690b092d7062d95f4242e2591e3ed0aa8b9b36eae977d5d0350b0d90d339f7e75bdcc794abef27cf1541642a8a6dbbaed90e58cc823db4c92af9336 WHIRLPOOL 54a2bdb24015a6d8184fdde3351b152c5625cb6e4ff17876d592a1600fedec1724081b4ff233711ad9d290ea761827067c40ba8ae21121fc6066ba7ed230e483
@@ -30,17 +30,17 @@ DIST nfs-utils-1.3.0.tar.bz2 780749 SHA256 25f1c974018c944347d74eebe89643e1004c8
 DIST nfs-utils-1.3.1.tar.bz2 785800 SHA256 748c4afbdfd3e92017fe579f1dd3280a10db1306c43228f83cd6b55f0d95aed3 SHA512 304e718aaee1df4decb0711c58c814ac773d55277baca01fd74d275969b9a1cee4bf0c0c20ba3ed72a112bd92b4744d45179f29a2a69a7fc2ca2590762a671c9 WHIRLPOOL 6fe5e9957c4a2775871ede47d1020f1a642e9242501ff3d21b74c4772ae8dfcafba27334e5844a06f9cc3e0fd286d1f90573511c2b198e330cb46c06cdbfc592
 EBUILD nfs-utils-1.2.9-r3.ebuild 4446 SHA256 bfdf40524e42edb4714b33e7edc21c77a316fed63616c2ba21eecb7f9b0aa40e SHA512 8770ccf5cac0348f0513413691c211c88731e964c85dd50eab18b5c0bd9e1196b77213351b0ce01939242c61cde4d4c04bfa79ecfbf1a399afed24bd6dfb4349 WHIRLPOOL 66f9068cbdaaf9998049c99854174cc37bee1e40fdc2a4c9f83761662e4a1997e5a00a15ba654b4a1077364c4561ad6d8855213452113e18533506ca32f64a3f
 EBUILD nfs-utils-1.3.0-r1.ebuild 4849 SHA256 1793141abbe923bfbf6077d90b5da3ac84347c0eed82209f3f71c133b67423e0 SHA512 486e1e0eb287755606ce47595eb2d427f0d24f40abdb5723cd55404e7de6b11fc74c8e7592bd76afd068cb9a0339b4cc9fefec1a8b17b0b30e7fd5bc3654876c WHIRLPOOL 418b1a3d5372198008f94874becc2e92ee4d19d2226e4c94f011cead89acbfe274d4cb71340bcd9006d8116ee86400ea69f2aae1f3e9e6d6dc1283690ca860bf
-EBUILD nfs-utils-1.3.1.ebuild 5036 SHA256 4a0afade29efb4a0ace4d69878dc00f7b584f3df332dfc0da6ba7518506106fb SHA512 22df0fea4650fd68ec56e139da8514b7a53f225d8a98632f148a3fcadc443ff1d36f7d43e0acbe7f3dc7c26d3c72700c96aa8b47d394116367460e6b7e612c84 WHIRLPOOL 3bc094f1bb715d8109dd1beedadc7ebbc03d14b7db1adc2389106a5b12d88e389501e35667c6bc1921114aed4fa1b798793cf70c70a436db8b38d2aef3f06840
-MISC ChangeLog 42167 SHA256 1bdf885f9e76843d6b998dbdab102cf8de4ca0f2b0b5e3a79895ec56a3074e70 SHA512 97f300178af2207aabd3c0a458160655de58f374aaa5117e0999440c0d9d16d6e04c199a66bec6bb89dadf827370427fcaf8333c98cfd14219e28aaa49ac94b4 WHIRLPOOL d9a376039d261310ead13a77e061f41a282ebaf8112df140ba27554d1688af7ef80fc97d780d8a650c268d3797fce2128c71223ea7ce60d115405c3cbda1a847
+EBUILD nfs-utils-1.3.1-r1.ebuild 5039 SHA256 5ccf80cb5a6218d41cac880453461e0f2f8ab7510ccb8747aa87cd0b35a676fb SHA512 ce46ac6671f269905831e7b1411d9464705a69e9a446395a658a25b3e322b1fc4ecb9e91f8dbf725a76ca689ad9fe7c4b5264bc7a7c31713b06b0dbc31cce484 WHIRLPOOL 270f733479767e25637b1bde3bea14d0ffa8d5b32a2be7f6fc4f52810f573f6d4a865b991283166a4d8ff07fea83efb7cd786607304053ed91f39fea5f04f9fd
+MISC ChangeLog 42408 SHA256 b9b0ec347dc6d8fbb0446d4d9e866b553247bb7c97dfeed177c73741fdc17e26 SHA512 bca0ebff597f19a1b651a757f1e9295ebff498fed02b140f42e79b723cbfa3eb0a330033bc23736abbb09a0a8d1ff8962108cef229b39d788a2308a1a0e6ee4b WHIRLPOOL 472a70f66d98b3954d12584a44f2745ecd0482f382e67e767563f528572cbcd9f1c5d328e2c5160bbea5402b2292b9e329a082e6c7f6aac9e28643a37604caea
 MISC metadata.xml 636 SHA256 ff4402edfb8a218effdadb00641459f21335e52d055a0f12d084934f3d1b76cd SHA512 090c74991f655df4c08fd062993a15ea9ce4721622d55325539d415e7b89e0920cd9ac6d5cc29a57e56e68998f03384386751bbd56c999897d1c84d4983ae2cb WHIRLPOOL 5f2e62843e843c615c5b0621740d55bcf37453399ca9727f1b70ce53f899157bece44801320558cf769ac4388617f03f65a0bb6167ac07f47561bbb002d40bc9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUmHABAAoJEEqz6FtPBkyjSFMH/jHQcNXx5P+EYc7PtveJtCAe
-RS3g/unDCK9zWwn7MpyEGA6sjcthYXXm7DTO2v9MKa4bGghobj8ONCbIaVpxksvX
-8h8tf5RGAyGppzmHZ3UcNp+yUzu7IZX62kNB9yAZfVMna0dnOlHV4wgtIYXrnAU8
-kl4pXLfu2paxeVE8V1p4M6evj9u3sRv4FEBXaFAaQb6RTISacPuODxgMvPvg2Afv
-bAWZopGPYP6WhCSZ09+xOspmp3DZF5X/roBtwveJFfZcwim2IZWlALHXu9FDlef+
-+ZQYN6+HZ4vUL1Ozbxc3JHX62ACMjL+xCsBugLH2dHVU3ZSZunbo52JqXHy0C1Y=
-=MfP2
+iQEcBAEBCAAGBQJUmwCYAAoJEEqz6FtPBkyjpzQH/2estdyO1ppIuTrowPgjKxtD
+N4wqb01UtDmvUWM6Gm0k11dndwx97Y6pMvN8NjupnYEF9WURutbwpJ8819CGuHyO
+Rn+G/qyNFZemB5ov8udKLoeaU2lk5OQIZR1qQQw3mk2g8NUdzb0ZhjDgigWXffx5
+uqW2DmXJ2z/sPVdzlF9EmLx1UTRI6VsEmr/x1NudbDKDdWsRJnz7fw6BBvOsGwvf
+vTEUXJhOfH2okdhnXux3LpvIIAKysuejFRwf+/z69U5g0BuY13xLpYHBECtz7oUA
+7nZi91Ii1E7iENarrw43v/lVjlnmxisEdJGPpwiJxInL8oEOR19Ugsr3eJunPpk=
+=L9wz
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfsclient.initd b/net-fs/nfs-utils/files/nfsclient.initd
index e2b93a8dcff5..e31e20000f4c 100644
--- a/net-fs/nfs-utils/files/nfsclient.initd
+++ b/net-fs/nfs-utils/files/nfsclient.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsclient.initd,v 1.1 2014/12/22 19:24:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsclient.initd,v 1.2 2014/12/24 18:06:03 radhermit Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -10,7 +10,8 @@ depend() {
 	if [ -e /etc/fstab ] ; then
 		fstabinfo -t nfs4 -q && myneed="$myneed rpc.idmapd"
 		fstabinfo -t nfs -q && myneed="$myneed rpc.statd"
-		fstabinfo -o -t nfs,nfs4 | while read opts; do
+
+		for opts in $(fstabinfo -o -t nfs,nfs4) ; do
 			case $opts in
 				*sec=krb*|*sec=spkm*) myneed="$myneed rpc.gssd" ;;
 			esac
diff --git a/net-fs/nfs-utils/nfs-utils-1.3.1.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.1-r1.ebuild
index 06323aec387f..f64ec167795f 100644
--- a/net-fs/nfs-utils/nfs-utils-1.3.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.3.1.ebuild,v 1.1 2014/12/22 19:24:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.1-r1.ebuild,v 1.1 2014/12/24 18:06:03 radhermit Exp $
 
 EAPI="5"