Version bump #506760 by Nenad Peric. Run keepdir on /etc/exports.d #470102 by Alon Bar-Lev.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 241 insertions, 16 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 57b1f2c22dea..e9fb5fbb3dc1 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.246 2014/06/20 06:21:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.247 2014/06/20 06:24:27 vapier Exp $
+
+*nfs-utils-1.3.0 (20 Jun 2014)
+
+  20 Jun 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/nfs-utils-1.3.0-gcc-4.9.patch, +nfs-utils-1.3.0.ebuild:
+  Version bump #506760 by Nenad Peric.  Run keepdir on /etc/exports.d #470102 by
+  Alon Bar-Lev.
 
   20 Jun 2014; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
   Drop rpc_pipefs creation as the rpc.pipefs.initd takes care of it.
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 86e845c128ab..ab32c2bf2482 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -23,9 +23,10 @@ AUX nfs-utils-1.2.6-osd-install.patch 1726 SHA256 04ee2915fcba7c9d459b0f1b701314
 AUX nfs-utils-1.2.7-libio.patch 1601 SHA256 788b6bcca6ec03a8690b5cbabef06ad325211ab79a332b33d17708e8b0b63093 SHA512 a9643fd3689c95bf82c28a6aa5a82540459e0e6eafbb1a774ff74ad69b4f3f28bc0624f84913a78405cbdcb3321a02f912ace2407bb5534c292f5fdd930b68c3 WHIRLPOOL cb382521d1bbfb2ab823d5d44f788f1e9f1a608f7cdd632f84c046787920237569bd57fda8f298ed255254e6bdb56ef8a845cf3013ba1766e9636ce71e63c788
 AUX nfs-utils-1.2.7-nfsiostat-python3.patch 11260 SHA256 c71f3d53c3b076e609ba2de1a1565deacc7a797a2b8c8325341bd6c5b08de6ac SHA512 778640c90ab5a751b9613c02a13a4332e994620c4ff2301bd141edd563bed00ebd1fed7d850adc9d72b3eb3a64d44d7791fef4501fbe0772e7aeb0b14d7d1daa WHIRLPOOL 7c89f6152fe6e1f20c1c57168f98d872cfb55ad34ea8940b5a737c57f21adddf0be5be9a696141e3f45a5848a29c5990a02dba25c804b472848d24b944fc4fc6
 AUX nfs-utils-1.2.8-cross-build.patch 1323 SHA256 281ae4f2af4d28adc936be961c2ab4aa4f77c4fb74ba08f2cef1038c6e03b30e SHA512 42a41411d0de384b66a2875fa9ea15e4b854150b5f75ba2db54ad7785fd147ee329eb8867d24a26b2b1d9ef89bd887caeaf0b5a59cdda15f5a11c47888882b9a WHIRLPOOL 52f5704ec8b88eeb3fab37e4aa9a7ca64ca76f0665c66347ab663624cb3b70309a262d86b21882dc5f687741c73974dc6efbc01d6c386e3ea607bbdb89619edb
+AUX nfs-utils-1.3.0-gcc-4.9.patch 1821 SHA256 44a566b56ee6471b5da9531eea0e610a58e03457bd68f72c9ffa0bc8389838f8 SHA512 39f7fcf57836e38bdd7a7646c535afedc77a724933c2b3b0b7a50a8882374bc44fce0dc92fd85a0aa5831716bd915a5994f8d2c7c8a5e821ffd1875840849819 WHIRLPOOL 87ec15b374f78466ee9ccb81b3d390451ee3f5c75a88ea4fa76eb7ec4dd38fea70384506ce7395387e22caa6dbce7de7c125b4681a220078f1aa727b68a28336
 AUX nfs-utils.conf 74 SHA256 a09f97a40b5c75a3fb65bd60feb4c4b7d2b569ced004464eef4e5136d850ddd6 SHA512 d72c0fbdf12cb1ddf8eaa5885e1ed93a2078c40ca48eb8868836fb72fa456c4865df15273fb7472f70dfe8098167e695b1340ff9a59b55e73b47690baaf977d6 WHIRLPOOL 295e80d0e6f51ad7b89ff40ecc06f56a4f41dec580da40f9fd5c6d7f1c61b39a3676bf2ab5bce230682193b2b23ed34154b9b0ac613eb3b6c24b3d36e35798ef
 AUX nfs.confd 948 SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e SHA512 0981f9ea34d5aaf25b558aa1f4c32f6750b657b450d5d22b999e1556b583207c8d88b83f6f803747c56cc70531556f5a8741589125429f93d0bbc73ae31c137e WHIRLPOOL ff6db7d613126c4fd76a6b99dc432a44f086ea22c78a42e3bcb2df04b95c31e9552cb2c080345b71027c71f97b0b7470fd53ffb81502b3f77bc9bb80a38fe9cc
-AUX nfs.initd 4378 SHA256 8df22f253770a24c6a53ce332d821ab680d0ede18d0e968c1c5d8b3796cb74be SHA512 1577a43b47ebf12261504dd1c9ae564e19d80edc424c4b1e308ac46b12907f6684242284f18a6cd2edafec88c815debf895b6c29d13b9bca59d6d7c883bc1f38 WHIRLPOOL da3762c3467af7d46aef1890aa9c95a85e759c6cab09a5590a00c8f6a37b600a6cf3d4c17b1593a3bc7556ad25bfe001ccabcad70bdc1a2848aa9f842e349d48
+AUX nfs.initd 4351 SHA256 1e77bc6fb2ceb266f724818898bd42bec47512a5a7ede6660e0565ea1c58d619 SHA512 32a231fd04a2bb68b235b6d8294eefea4fd3e5eac2d84f3a8a8ec929b21b85788c5548338556f2246180261f82435cc2141c60f8b9c164c1e5ec1897fa18bce6 WHIRLPOOL 72324e4b73be6532d849f24a8d2e97ec43d70231e6cbdf73a5f8b0ae15b9dd9c48df8d3c67628a4445f1379c2201ec662fbcebc41385f90c2b1a6c180995be1e
 AUX nfsd.service 339 SHA256 fada3d017779466e28a6b84c5adda1d9ef7c9b9e9458884f4456efc7e85a87c7 SHA512 4accd4aa77b3f91b1472b24ba5303cb5442aee1ecc1b813605bb4815320144cfe6505265659f8ec79ba6259c8e41ee968462d67b71981cc46dd830764fe786eb WHIRLPOOL 3fca5f83bf62f4d06854066940592cad2a3d636adf6a20e103c6344f8f3abdedfc94aeed280fa285b195b461f78674a07a334215048f83655c1f1bd17bbfc55a
 AUX nfsd.service-r1 294 SHA256 b98575ae9803d0e75159a32f8bed61f6666f8ae130bb93069de13e76943f2577 SHA512 256c78317e5af15cca7f10e247d086d1a0b04ca34d93e8afe4f940d841c93a95ddc119c80aba287d777fe87830dfc8b52f9b558a3663de0ee5e05aa64fbbadbb WHIRLPOOL 8f492d40a44658ab8bbee760c29f738c531ea361081cb18ab7ed85d28d3e9736c2d8e040fe91554a19e8f49e1d26d064d73370f2b6e3ad2cd0927597ab09618d
 AUX nfsmount.confd 326 SHA256 b9389e143c2c4f95c11f97a8a379e007f140559016f60011c9d2ff0935758bcb SHA512 6e23897885cc33c49d9c7353b456585a1e0c7300822edba81bc48ba4ccc18297adce137260cc0aa9487aa5ef0aab3eecf931532cfa5bd40fd03bc9e0ddacfb28 WHIRLPOOL 97939b074a9b5717184512088388c9c22a31f37009996b69137023a0f8a97ce6eb41f7cb0a25843ea088f00d37cb45f6b3bd1ba0f801de7cb8f6dc2e5d374dfb
@@ -58,6 +59,7 @@ DIST nfs-utils-1.2.6.tar.bz2 755305 SHA256 70267288500408495085b7c54a667c4e8cfde
 DIST nfs-utils-1.2.7.tar.bz2 2902130 SHA256 7ef8e0a8b22cd7ff33f3afd28e770d45643fae303468a180640c2967833fe75e SHA512 c63b28be8e7b9cbc3ccb4950f31fd30f3ddc9c8707dcad4c3f2ee78fb464df9e0f1f58dc0c47e530c5afaa604712b4dc5e15af795810374e833c09a19dfd32e1 WHIRLPOOL 785511e2eb03649027977d81f11d7a5b1f960d4fdc57b790af5a3d441aa63858d8c2876e851049ea1b799a93796b209c9a3d22837f3aa3744ba17395a4fc8dbc
 DIST nfs-utils-1.2.8.tar.bz2 2747577 SHA256 1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6 SHA512 abe13f37dccb40258ac2f654143e540b9ac8c41ca10fe88f104ebb558334d41c0e31220dbae0122836e43236cac763fbcfc1d5bd708aca3b282152ac3ac7213b WHIRLPOOL 95bc97e572aebae4b99d20b67845e081d75f4126fc74e9f081a6bc1a913796f5370befb5a21c7626668bd430b8671c4732ddfbf319e6a2ef8df8e15f4ef213a1
 DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119
+DIST nfs-utils-1.3.0.tar.bz2 780749 SHA256 25f1c974018c944347d74eebe89643e1004c822a6145153136b192d1acfaf60d SHA512 9cb9efa26d2b1bd6ae3e0c516ac50b17b4c7993366ae36c7786da734dc8ea4dd7a05f0d6fabb6fba6df36ead8642341a095f1972cb46b400840705356d410a6a WHIRLPOOL c4e6f7aecaa94808a2827297ce0ed8f1b97d88171d37a201a6a217ee2c69e8cf172ac751939fb95ea6c8022a344e04921ee45c6f46dd16057cc679caf8563882
 EBUILD nfs-utils-1.1.4-r1.ebuild 3167 SHA256 c0f3eedc4f31424c7788e55f504980bb530464d1bed49ed0cc0e431eef633403 SHA512 2173b772ffba0f6ffc361e846ed58a78247eedf1b7beb2b87a37fe71c654d65681e666d32e73f3ed767f9a421e65c228b9242022c02cde7aa7a31383469b88d4 WHIRLPOOL 300ceb5299d93ae8539c6e154dba43da535c39b6318f4979b635c1d0d25c9fba8761f8ea25988e793a2bd23613e2a4e2b24182291e92530aa2120a50b0f8b3e7
 EBUILD nfs-utils-1.1.5.ebuild 3098 SHA256 35a23dde75f23c921c1731f4bce5bfd6a9ab4aa66416e73864b7c8909e89a964 SHA512 f25708af1eb291a2d4df9ac795c396a9d3b0e844d9478f23567e0d90cbd33414d9a3d250135c801536ce6ed4f4de2d364a7f90d70ee7d1daab2a248f304c88ad WHIRLPOOL b9fb0cfb27a52cb71eb95e4c266e8077b0fabfcbafcb3d5a891c5350f04d604bfa2a6314179f07755eb28c1a24ff23f84e64ac8cc34e79e42169b774407950cc
 EBUILD nfs-utils-1.1.6-r1.ebuild 3212 SHA256 02ecf4976fd1e54ff1440a8e7b6eb2333b7e4ff2392f082c34b5b41c493f809c SHA512 df5022cdb232cfa672495d4185ce4a669ba4133e4077f5e412a0f44abd83fac2fb2a52c0fbf78e5004de1fc4c65dbbf10f6cff2f38778bf3b70cb561f2b67e42 WHIRLPOOL 7eb6753f41c8972d83330f12aa0c24bc0a46d8167912e9d698926945294c1f87ef56b25ec35017ec2057d5ebdfdb53c380141c80dc6f0323069a729ae18dff36
@@ -76,22 +78,23 @@ EBUILD nfs-utils-1.2.9-r1.ebuild 4068 SHA256 41d9d9f2580dc1554afecb787f657036800
 EBUILD nfs-utils-1.2.9-r2.ebuild 4367 SHA256 eac06d8f714370e8b5f7be317bc7eb9f2fc4394dbb0631e4e7ed010ad5e929e8 SHA512 e4cfc841eec2e993deb1c352eb306eb96e9e6aab5d9d4c7ca2b01c16cb2c467813a6cde2999f1e81eeaa55199e1901cd07d36b185b44c944f6640e74b7da543f WHIRLPOOL 62cca1460fb134eff41a9b882bc752ca3522c86d5e1b2b2a1c131e5ae5855caf159843ce3015b2176b387b35a8cc53a73f4236482795f694af87cdfd9d432016
 EBUILD nfs-utils-1.2.9-r3.ebuild 4455 SHA256 f323aa2791bd33f1a24a96b3aaee6a775ea4e98bc28eed6bc471971a7c64da69 SHA512 453afdbf85c536de08b62dcceec04ef7a02822e80e7b91d2cd8110be6e03e2ffabfebd8b608abdbd51cf8445af9c578a6734c940e463c128f6acff948411fa33 WHIRLPOOL 420a105cf9feb150d18a1b53dd2a9365215420448fd4dd0ea079525363ba47e155f4301479d29cebd3a0b14d8b0ddb45f314188922e081d18b853d0c9b11ed3b
 EBUILD nfs-utils-1.2.9.ebuild 4029 SHA256 0739c6faff846ab605635750fcb1a3ebdf24271833fa572a76217e8b7d79189b SHA512 3cca8936433fdfb0b2aa7cf23b0e92daeef1e094a3f9192e8bd61e6f92dbdf7c6544670828ae707a146044dd828074eac704fb58989e4f9a3b879f876502ab94 WHIRLPOOL 212d9f84f923b234e84238d7b0b9ddc1f6fa8f2f5c7cd47fe512e8173e603dd0a2dfa0e4a6dd8884c2026162cf1130fcfe07abbd53a9e12d24a92bd576f3c546
-MISC ChangeLog 38628 SHA256 560ef158a07531a2f5111b1cf92600c8a124559a68051fb11ba893c9fa23e8d5 SHA512 378167e9b828e1a1e987d99d27ebcbc2aa499fd117cd68225bba42ec5ec0bbbeeb026215781035c1e6a2a88929db45157ad40ec33a402b29e623511204e484b6 WHIRLPOOL 1f10a50d3e7c947ddaaf5aeb249508b4ab1d87eda0258e92795212712ba6bd79b74051957dc026638fd5a0b9c31e76cf5b14ed894b3ecef9332978773aa302cb
+EBUILD nfs-utils-1.3.0.ebuild 4347 SHA256 c545533de6b57d82f1aedc9d39cdb2d315c9d14cd70e64495a71ff10345c0897 SHA512 541603e2bba85d11c455ee66382cb0acbf211fdf11d7816b6c03055f769e5a747c5ad9a6c2fca834582ee8a1ad262f078f2958bf1294d782a5018e2715b6cbf0 WHIRLPOOL 49049147b065ce83abd2f88c3d2e863239ce53aad8a3f6cb852c7add9a2d35755091c370924d4d721048280e0e0a4407fac4cb47d6bfe809eb34cd16627cc81f
+MISC ChangeLog 39069 SHA256 e63be3131bc7607cff8211b39d9d1e49f44b938a3bba5130b4ae17835734d8a1 SHA512 de601c1d89fffad36288fdfd0eb45613005cad5d3e447b2ae61341623384166499d448209e27f04e1f1ea1e15ac86f77792815186fb8aa28bcf8fe373d34c400 WHIRLPOOL b05260690297071734cb37a6ef9cc01c219ce1577266982ff701f1589a2fa641ed625847ec836d9faca8032f8fc2d9f5e7c095e79472e4e39a23780d3765b4c4
 MISC metadata.xml 749 SHA256 aa6af1c43f6adcc82d29502f5945eb417485d609036983f9adda8b2529d66644 SHA512 aae31fb1933fa3b10e7e2c712cae0437929e183b009853adaaca94a95ea6902b0f9d67dfe0295df795b75b7f6d1d7e8b8e891a4543a51873bbfeaaffd90375ea WHIRLPOOL 2a4afdbb93a76c5b7fb4d3d7b72068cab8bed4e68c30d82dbffeea4fc778b7f695223d77d768f0ba01ebfc47b59b803e0bed71307c7474d051600aa8b9b61f33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTo7m9AAoJEPGu1DbS6WIAM3AP/R4dcjWlpJNfnpsLgLOqJunT
-ZsqTg+GqmxKtBFJYLJ5sk8JfiKiM2hQKY/N7zoW06izMY14JZCfX1FLh1Nz0cOTu
-dfqURnYJEdgkdOpbjwA0jdqhLrc2XIk77cl0QwrNo+tsjJN8bA3jih6CtVPVADWA
-J70US96C9vOBo8qzZYzOyQ0vMPsLJf0EPGz7vX5gNc6PBe725I/RzQA7NnQc8Kh9
-iVaxaSd5R5oZ7MqmsLDT2D+D1j1jrS5ilMf2NYTkLdb51fgxWm5AXOzvMhew7jyA
-iCYerT6Ke5nb8NixlS1ZrK/2wbHeDgHGvdMu+Plo9LRr1jKvIGGZJRATIZEP1HEH
-Fhl00/KZlA79X3G/U9mkz47gNRRkgj7MIzv2SGjLUDaLLP/YCXwX29BVVNXuk5EQ
-8oXXnuu6rL0xLvPMyfALhrAS0lLHX0/yl4cavIK7ZbZrjsfu7WmlNJBjrgLEZP24
-YrKNJYFbVCLu+RdZ++F4mq4/zU+byZ8bZ6QXRNnlrheoOVEb4aE/Q6v0cVfbajkZ
-eELR2w1RrKGvd7pG2OyAfHzH2zhQTfVBB5xHyYUEV855ujaHp0rKuZ0y0hS75RMc
-uJZzpyi+1RrF3zRxa73LBwedtQm462WalZ/9wA2f7g4cbBW9VoHRnE36FUhEal41
-vi4k7H9JUoAL1QNXyAYn
-=DjIm
+iQIcBAEBCAAGBQJTo9OjAAoJEPGu1DbS6WIADnIP/1Z0jusyTALT+j5CRGDvAPmL
+CYil7AEvf6cFDly2Uup/FnWJHlCbPPG8LiGwW/vJ1INtx1eR3Rt4yEBqmq7fJYHq
+RIR0DQCvWqudflDiXgf9CV4fNFfqGjXlv2Erh9hMQPQRxoUwKpK7983ZcGf0nYp7
+Eaa5IavJ6LTjm1KO9wsyrWJIigx/myOjVdBzZrudEj9Zs85gjJsnbAnqfuBBEKhM
+BI/Mdco4bvEIBvC0lamFJBhvC4Kmh8ip8jpTKRd9G1Ka3UrzIybTZ0Dl2xGCT8Qn
+X2TJnHsecYqVTVcngTuFQFzR5CNbQmmBs7G7ccLvHVfH3usiQy6U57qdzPdshvQc
+4dl/cpAyn7P+dA1Yl/hGHpOO849gKIpaK3OusTElDBXn4A662ogeXxwt4JeUe+Ft
+Ran7DXABF6ACk9hKy3HLRPw5wSyndFBek5Zcr75DaO5WsmOFY2ubJkzIb5VhtkUk
+prIN19XGI2vXQuzrVWo6OgZpuxrqMfVygfuBecTArJnyuYSjn+kYy5J2ZySdNd19
+QpwQgWV17BELER91DSGo4mSw2JaRR0yUhCQbgsJSrs0ZkfMGFr0ci56ylxZnegEI
+ueBGVmEJ77k3w5A0QwPj5u0cgfNZY6EpaEkaf7PLU2Eq1rxj8TZv4fEozJuY0Yc5
+UmvMYfENDZi0ME6Xk01S
+=8XnO
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.3.0-gcc-4.9.patch b/net-fs/nfs-utils/files/nfs-utils-1.3.0-gcc-4.9.patch
new file mode 100644
index 000000000000..e2d98b517e32
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.3.0-gcc-4.9.patch
@@ -0,0 +1,62 @@
+From 25e83c2270b2d2966c992885faed0b79be09f474 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@poochiereds.net>
+Date: Thu, 1 May 2014 11:15:16 -0400
+Subject: [PATCH [nfs-utils]] mountd: fix segfault in add_name with newer gcc
+ compilers
+
+I hit a segfault in add_name with a mountd built with gcc-4.9.0. Some
+NULL pointer checks got reordered such that a pointer was dereferenced
+before checking to see whether it was NULL. The problem was due to
+nfs-utils relying on undefined behavior, which tricked gcc into assuming
+that the pointer would never be NULL.
+
+At first I assumed that this was a compiler bug, but Jakub Jelinek and
+Jeff Law pointed out:
+
+"If old is NULL, then:
+
+	strncpy(new, old, cp-old);
+
+is undefined behavior (even when cp == old == NULL in that case),
+therefore gcc assumes that old is never NULL, as otherwise it would be
+invalid.
+
+Just guard
+	strncpy(new, old, cp-old);
+	new[cp-old] = 0;
+with if (old) { ... }."
+
+This patch does that. If old is NULL though, then we still need to
+ensure that new is NULL terminated, lest the subsequent strcats walk off
+the end of it.
+
+Cc: Jeff Law <law@redhat.com>
+Cc: Jakub Jelinek <jakub@redhat.com>
+Signed-off-by: Jeff Layton <jlayton@poochiereds.net>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ support/export/client.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/support/export/client.c b/support/export/client.c
+index dbf47b9..f85e11c 100644
+--- a/support/export/client.c
++++ b/support/export/client.c
+@@ -482,8 +482,12 @@ add_name(char *old, const char *add)
+ 		else
+ 			cp = cp + strlen(cp);
+ 	}
+-	strncpy(new, old, cp-old);
+-	new[cp-old] = 0;
++	if (old) {
++		strncpy(new, old, cp-old);
++		new[cp-old] = 0;
++	} else {
++		new[0] = 0;
++	}
+ 	if (cp != old && !*cp)
+ 		strcat(new, ",");
+ 	strcat(new, add);
+-- 
+2.0.0
+
diff --git a/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild
new file mode 100644
index 000000000000..836d676ade2c
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild
@@ -0,0 +1,153 @@
+# 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.0.ebuild,v 1.1 2014/06/20 06:24:27 vapier Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic multilib autotools systemd
+
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+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-0.2.0-r1
+	net-libs/libtirpc
+	libmount? ( sys-apps/util-linux )
+	nfsdcld? ( >=dev-db/sqlite-3.3 )
+	nfsv4? (
+		>=dev-libs/libevent-1.0b
+		>=net-libs/libnfsidmap-0.21-r1
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+		nfsidmap? (
+			>=net-libs/libnfsidmap-0.24
+			>=sys-apps/keyutils-1.5.9
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
+	epatch "${FILESDIR}"/${PN}-1.3.0-gcc-4.9.patch
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+	econf \
+		--with-statedir="${EPREFIX}"/var/lib/nfs \
+		--enable-tirpc \
+		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \
+		$(use_enable libmount libmount-mount) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable nfsdcld nfsdcltrack) \
+		$(use_enable nfsv4) \
+		$(use_enable nfsv41) \
+		$(use_enable ipv6) \
+		$(use_enable caps) \
+		$(use_enable uuid) \
+		$(use_enable kerberos gss) \
+		--without-gssglue
+}
+
+src_compile(){
+	# remove compiled files bundled in the tarball
+	emake clean
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# 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 "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsmount rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	for f in nfs nfsmount ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED}"/etc/conf.d/nfs || die #234132
+
+	systemd_dounit systemd/*.{mount,service,target}
+	if ! use nfsv4 || ! use kerberos ; then
+		rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
+	fi
+	sed -i \
+		-e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
+		"${D}$(systemd_get_unitdir)"/* || die
+}
+
+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 "${EROOT}"/var/lib/nfs #368505
+	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+	done
+}