Use upstream fix for backgrounding statd so it works for systemd as well.

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

5 files changed, 54 insertions, 14 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 54adbb893e0a..83b4b233339b 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.269 2015/01/31 22:59:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.270 2015/02/02 13:47:41 radhermit Exp $
+
+*nfs-utils-1.3.2-r2 (02 Feb 2015)
+
+  02 Feb 2015; Tim Harder <radhermit@gentoo.org> -nfs-utils-1.3.2-r1.ebuild,
+  +nfs-utils-1.3.2-r2.ebuild, +files/nfs-utils-1.3.2-background-statd.patch,
+  files/rpc.statd.initd:
+  Use upstream fix for backgrounding statd so it works for systemd as well.
 
 *nfs-utils-1.3.2-r1 (31 Jan 2015)
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 4b006a448b1e..611eb43d030f 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -5,6 +5,7 @@ AUX exports 66 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890
 AUX nfs-utils-1.1.4-mtab-sym.patch 1020 SHA256 0232799d085151649a1eb1f31644105de7e5cfba888794354005499a0db277c3 SHA512 1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998 WHIRLPOOL c16ecee3228ad4522cf4ede1d05ca50cece3910955314c96eb88a61cfe07b7f6a95c42bb15a7f7f9fd211fa62cdcbb02925e68702d5066338b4543baf56fb2df
 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-1.3.2-background-statd.patch 870 SHA256 aa61e103910066032b319363e2b521b430933459a00234edb3e2a8304decba23 SHA512 e6931cbfa47b5dbc332e64bd0899de8f99a2af1498ae91a92657ea2b45e7d64ee7af0a37bbc66c8900a48f30d75f9e6255f3bc8237a725abfad1becd34f6ff90 WHIRLPOOL 5e8e133ed608bca82f8a49bc943f9a5294eb61eba8fa71b2875b536b65caf8953998a426c032c88f067945a4e4eb566c6bf6525d784b381395eada9ac5349493
 AUX nfs-utils.conf 74 SHA256 a09f97a40b5c75a3fb65bd60feb4c4b7d2b569ced004464eef4e5136d850ddd6 SHA512 d72c0fbdf12cb1ddf8eaa5885e1ed93a2078c40ca48eb8868836fb72fa456c4865df15273fb7472f70dfe8098167e695b1340ff9a59b55e73b47690baaf977d6 WHIRLPOOL 295e80d0e6f51ad7b89ff40ecc06f56a4f41dec580da40f9fd5c6d7f1c61b39a3676bf2ab5bce230682193b2b23ed34154b9b0ac613eb3b6c24b3d36e35798ef
 AUX nfs.confd 948 SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e SHA512 0981f9ea34d5aaf25b558aa1f4c32f6750b657b450d5d22b999e1556b583207c8d88b83f6f803747c56cc70531556f5a8741589125429f93d0bbc73ae31c137e WHIRLPOOL ff6db7d613126c4fd76a6b99dc432a44f086ea22c78a42e3bcb2df04b95c31e9552cb2c080345b71027c71f97b0b7470fd53ffb81502b3f77bc9bb80a38fe9cc
 AUX nfs.initd 4351 SHA256 1e77bc6fb2ceb266f724818898bd42bec47512a5a7ede6660e0565ea1c58d619 SHA512 32a231fd04a2bb68b235b6d8294eefea4fd3e5eac2d84f3a8a8ec929b21b85788c5548338556f2246180261f82435cc2141c60f8b9c164c1e5ec1897fa18bce6 WHIRLPOOL 72324e4b73be6532d849f24a8d2e97ec43d70231e6cbdf73a5f8b0ae15b9dd9c48df8d3c67628a4445f1379c2201ec662fbcebc41385f90c2b1a6c180995be1e
@@ -22,7 +23,7 @@ AUX rpc-svcgssd.service 259 SHA256 ee585a6448c3f211e431431d547378531eea5137b8968
 AUX rpc.gssd.initd 567 SHA256 00d9c29280a83e8458c33139d04a9b38c6fdba9d7cb9b420ca83bf6b10e6435d SHA512 cd4f763c7cced0eecb03e2d4c8fb1d5fbbddd119a014dee4e9cb881d3750fb01a50daa4475700914785cb1313ceef638b7de4d8dddac90cbab63888cc81938f6 WHIRLPOOL d9f4c381f18b76a2c5b1c0c2adb56b0005264a3230c436d4556c45e13372bea09cf1fc35f02d734cac7081322f72873e46d2b2d451334ad908f14ad7fcd54acc
 AUX rpc.idmapd.initd 595 SHA256 3ce65326859c43983dad25ad2d4731488c488037796e39b6b5eda336e8bf81ef SHA512 624ac8c5a381a0ccc1bb7dfd06c080a9de85a9e94e1d4071a6ef401e1b20f0d05d767be5e85eea374c3a4c29218b3db6013383afa0bdd1a7f61b77260675bfdb WHIRLPOOL f25787957ec201bc97754c7864ada3e2c9be05bda054fc8ebdc29e6ebfa2280419d3dc44f54f71a1adf195f257e6e8292645b55e76006341bff101e5bddec94f
 AUX rpc.pipefs.initd 873 SHA256 ebee63e81fb952474c34b745913e8774b29c9cc65180d363a33d991e478aea2d SHA512 c8857afdd90d625da90b825dcebbccb0eb01cbcca71534df21b503789b0bb11a7cea34e4b7d3d49143801e7ec5386e5f702026feb5dc40023bf0cead6ca75a9d WHIRLPOOL e9c333bd9d4155cedcb6880bb3787b8e00ec0e5cdab9f64834650787087d864ab36d15c9de7430031e81ff98e736fe509f6e08f05812f42194c226737d569223
-AUX rpc.statd.initd 834 SHA256 c228d46adea4cb5156e36cd0fdaf92633cba5ed2f0f63fa07034037c5854028c SHA512 8f00e076c5c1b88b9e57630f137ee623163df6f2f8fef86bd4deee4016443070e03399b524aba5ccea5b48fc1b45d33ed22c1c542ae049dd3315100d4255696b WHIRLPOOL 61b6c99ff84506577d10decb000482db664008adf33800b616cddb14804800e98576c3b54b19d7551e836d7f3c5e6278278c997855d14f0bf43eba6d2abf609d
+AUX rpc.statd.initd 821 SHA256 a5731b8f681111421277c6c1c43b3e1d303790d9f8aebd977a895b0ed7a73bc3 SHA512 20a51b16acaa5cc46bc3ba3aee43a95be62cc21e388427207c459ea73540d9b00019b0bc648bd9cf3ad793e4ba34f5756ac41b5f19b16be263127383e84f2f41 WHIRLPOOL fd9bc9aec211cd2c163261e40e854c5f198c5351609aece3a7f401445220bb193b9c22dcb40eae135353dc6b4ca2a44bb6421dbb030eb5a4964b89024a0cf90c
 AUX rpc.svcgssd.initd 584 SHA256 f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677 SHA512 844e8d41a6a8b632d98585724aca2e9ae596f72c67e17e4e8fb9eb81e6c58eed9e10cf8b2a96896dba8fd1efaa95d846954e712bdf3402a847ae17742dae2157 WHIRLPOOL f1e4a38168c112ce07e40432527a77e17aa80b4a37aeccb8b01a9e655f0437e67e4c12998d62ea7c162319cca956c18edd3cb3c64cfd8e17370782ea30fef677
 AUX var-lib-nfs-rpc_pipefs.mount 111 SHA256 59e05e4e6d6af92d5fafaf2d6b8e87670bcda4de5c9fb748d1be40a21f594500 SHA512 f4502bf53fd3014987e53ffc5d4b9b8678103052289dfe9f9304bb7eab66b6b59d80e3a29c19e3bc794657c2e3dbb25e275f78e09bc25808ed9849cc4a748034 WHIRLPOOL c684e43627f4e9ec4c97f0db28ce28682fc5f17627573c0902bb17946b0012969e070bd9030e0c20b9bd10e140e2901a9c2246a7e70700cf7541d90aa7293c76
 DIST nfs-utils-1.2.9.tar.bz2 774112 SHA256 90b76d5692a520b74273e607a4fd69df4cc35f65e242e22e2bc61b58759722f3 SHA512 c71f986a7e8f38492f8411540b32fef904f689b45b831e0e3c193628085d09742c6352dc42d6d374b8ded12e2b54f8fb3c8de66695a36cf038fc4afa5c29879e WHIRLPOOL 22e86859e9bf7a9a298c91f73a8afea63aa1e39753062ff664a17601d311d62f8f0efed8a0c5271751b53bb46cfc91bf721ca852dc1e744e4bb51f321a34c119
@@ -32,17 +33,17 @@ DIST nfs-utils-1.3.2.tar.bz2 789540 SHA256 5b9c72eef260b86a84619771e11bb013b9943
 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-r1.ebuild 5031 SHA256 98f9598d85a9689ac15ea8a422ee3f58d747b664388c2abbb80ad10c303794c7 SHA512 a590b2934e214461aacf15087f424e3208ad88ffb6f513a08bf0746f7f41ebbfbd16a91f4166197ede426562bc93ab72c2050c96ab84f2b120d4065daad98634 WHIRLPOOL 72cdc0168b4a9fba3a856e2a98e579e84647d031882e4e452c245b80221f010c0b3c9fbf08675c9701539ed1b7420edad0ed081cc3a1fd215b627c2ecd62f8e6
-EBUILD nfs-utils-1.3.2-r1.ebuild 5114 SHA256 497bd7d366bb61eb483114924d6dadc8a68f99691fa08792278d58e5f7514daa SHA512 2e2902cb2730075a1f2c822177c56375b3623842c9656c6825f2a00b3d39df7391a5a7787d137a0e80351d166bcb15739a8ad336e3fc3e315b0758f6fa748569 WHIRLPOOL 62814211aff3f58522bdb0fb35ac836a366d2e8c430d572d3ac32d951b09d97abb3fa1c40711ce618a71b09809fb6f7e53e4ea33246b29c75bd9b4dbc1289921
-MISC ChangeLog 43581 SHA256 e97953584acfcdc5122dc6b895639a6e73886f22647e04f712abb6ceb95238e2 SHA512 fccb684760fd24fabe1576fa9102537d23009d4723470c33c78cdb75944a236073a496af615d9bc28da4198f32483e06c5b0cbc2ba37cc9a7ecf7ef6f62b2605 WHIRLPOOL 5ee3de4c45f5090bfc4ad2841c4075b61a1ac8743e14a0be8242fc805b7926c3a1f769700c8774854b71d99836852a5af4c201696addd06c1cc3bd107e6ea42a
+EBUILD nfs-utils-1.3.2-r2.ebuild 5184 SHA256 299e50fb820d0de7d66131993238e597977974915fc3f449bd069f79ab32a88b SHA512 2ca1ac59362120b8ce86c7108c200e97ba251b5ce18a125dbe16a8d46fbe3b230d42d22d6ea613ec9e85aca847239192f649742245b4bba2e73d85bf1583b713 WHIRLPOOL 199cb7b2f05757fd3952040a139aabb25bd46335620687b11d3624962aa718967dcb31385293e81e08426295eacb17694d36f9058add46c5a5580a3cd3fc472c
+MISC ChangeLog 43872 SHA256 37e653421bf9cb6e310447c6293aa0d671d77358f4b730f4e43f392f47c192ab SHA512 ea257c96c16e6574d5b04715e6712195a0fbaa498154039644fbce2329acdf5493a2825436ddf01cbb84361e18e196ae8e1dfe76fbea62fb6ae3168eb071111f WHIRLPOOL 6443c3a4c02a4432e3a6246c48111628f6c05c269b16a08198063e599901465a65fd7a28691475d403b4d48b71d0481232b7144b1dddfd1de39900127f93f2c4
 MISC metadata.xml 636 SHA256 ff4402edfb8a218effdadb00641459f21335e52d055a0f12d084934f3d1b76cd SHA512 090c74991f655df4c08fd062993a15ea9ce4721622d55325539d415e7b89e0920cd9ac6d5cc29a57e56e68998f03384386751bbd56c999897d1c84d4983ae2cb WHIRLPOOL 5f2e62843e843c615c5b0621740d55bcf37453399ca9727f1b70ce53f899157bece44801320558cf769ac4388617f03f65a0bb6167ac07f47561bbb002d40bc9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUzV5hAAoJEEqz6FtPBkyjMJAH/30oqF3zIQ8ipuBEveKSkdtw
-AEcyZHC0YVz3EDagTO/VEL5w2iQweWgf2tYpOR43eqIN4WlASUwQjg8TrPLeiDiE
-5qQdM7bEcd+E+GTR1Xly7OE9wdcHmdyLOPRAl1G1NmYwRuRMoBXv3AHFBZIGM1e+
-jNx3KtW7PvJlvzEdlWMenxMJya7UuBGfnsV9nf1kPR+5hTGkKyQ4S9s5i4sYNgV3
-hI3FTuJ8nI249ZkzF9JnThwkaa2hXWaa0xFupS+gohCxy4vmUzmaUZFRlFW9OCOB
-NF5WsYIQPO6uPgoAG6l60qLgtI7yNl+lzst2AKWJIUW2RDWRm3Y8pgbGTopGR+Y=
-=jzFY
+iQEcBAEBCAAGBQJUz4AFAAoJEEqz6FtPBkyjCgUH/2DBaM5PyjI3jABTn9CouEjM
+AA7pdc5K0q12HhV18ARoMdGJK820g49QXVG6ZfmYiaCIo2xnBx0QNJWeMhzVAfns
+YghKnvybHkfm3OV+Zddq15+BjTEY8vDhvNtaOVRocpTegadImyXjSKKivrmbyFiB
+/6VmFGXNHTaQvJkFeK/s9xdSJgiMlkxLuY/PnWsJv5TVCZA6H5XeojKg6JlzTC/5
+jeb/VydsI8ROWPTBqG/J2fTmWDjuGzIdjOjtpphJyBI6FSY9Vet+qOaWnQYSmP9+
+7wyVO8xwOyE3R6iXV2a7jr3di131qIYL0Dg74mMXM5qF5N4FVuP0bdl4tuPvCq4=
+=b5HL
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch b/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch
new file mode 100644
index 000000000000..393f70b87a99
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch
@@ -0,0 +1,30 @@
+From 17a3e5bffb7110d46de1bf42b64b90713ff5ea50 Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Sun, 1 Feb 2015 12:03:46 -0500
+Subject: [PATCH] statd: Fix test for foreground mode
+
+daemon_init parameter has the opposite sense
+to code removed in commit 7addf9d
+
+Signed-off-by: Chris Mayo <aklhfex@gmail.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ utils/statd/statd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/statd/statd.c b/utils/statd/statd.c
+index 60ce6d1..2b7a167 100644
+--- a/utils/statd/statd.c
++++ b/utils/statd/statd.c
+@@ -393,7 +393,7 @@ int main (int argc, char **argv)
+ 		simulator (--argc, ++argv);	/* simulator() does exit() */
+ #endif
+ 
+-	daemon_init(!(run_mode & MODE_NODAEMON));
++	daemon_init((run_mode & MODE_NODAEMON));
+ 
+ 	if (run_mode & MODE_LOG_STDERR) {
+ 		xlog_syslog(0);
+-- 
+2.2.2
+
diff --git a/net-fs/nfs-utils/files/rpc.statd.initd b/net-fs/nfs-utils/files/rpc.statd.initd
index 9f27074312cc..c82041a4d203 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-2015 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.8 2015/01/31 22:59:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.9 2015/02/02 13:47:41 radhermit Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -22,7 +22,7 @@ start() {
 	fi
 
 	ebegin "Starting NFS statd"
-	start-stop-daemon --start --background --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD}
+	start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD}
 	eend $?
 }
 
diff --git a/net-fs/nfs-utils/nfs-utils-1.3.2-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.2-r2.ebuild
index 02cc0708345c..737c5a5067dd 100644
--- a/net-fs/nfs-utils/nfs-utils-1.3.2-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.2-r1.ebuild,v 1.1 2015/01/31 22:59:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.2-r2.ebuild,v 1.1 2015/02/02 13:47:41 radhermit Exp $
 
 EAPI="5"
 
@@ -58,11 +58,13 @@ DEPEND="${DEPEND_COMMON}
 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.2-background-statd.patch
 
 	sed \
 		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
 		-i utils/*/Makefile.am || die
 
+	epatch_user
 	eautoreconf
 }