fix init script, fix #390063

Package-Manager: portage-2.1.10.40/cvs/Linux x86_64

3 files changed, 14 insertions, 21 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index cc4852e051ce..68d87b569d69 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.211 2011/10/28 05:41:06 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.212 2011/12/27 16:09:23 ultrabug Exp $
+
+  27 Dec 2011; Ultrabug <ultrabug@gentoo.org> files/3.1/init:
+  Fix 3.1 series init script wrt #390063 thanks to André-Sebastian Liebe.
 
 *distcc-3.2_rc1 (28 Oct 2011)
 
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index c431a6620898..bcea83215f39 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 2.18-r1/conf 1345 RMD160 6921e75f3d71ecebf66ebf4356482655ff1d0a19 SHA1 89aa69c5cc8a645fe3ff11282cd230c3a3dd898a SHA256 c48a04bd789d38682c8e1003f891a4428e5bb457696578afe56a913ec003fdef
 AUX 2.18-r1/init 927 RMD160 11638f1be4f1a55414517e9982b3a2ee508b9b9d SHA1 6456b0af8e63112258fd401afc1abe7b578004cb SHA256 3b7343b659ce864da8b730d2bf2c221de6446d6afc935f7686d85fc8d0983167
@@ -8,7 +8,7 @@ AUX 2.18/init 733 RMD160 935e52d2ddfc6363f26a916666bbbc28b6fdb79b SHA1 737e969b1
 AUX 3.0/conf 1286 RMD160 52f0fb469fc83b2f28f032c81515773d09add0d5 SHA1 4860a6e2eea10d918058b0cdcb76ac196a2d7992 SHA256 28fa9a9ce30c9f979eac3d5be3fc64f199ecffa9d7e38e02f11957019152dc46
 AUX 3.0/distcc-config 3402 RMD160 ef72502f3b69d86884fcc038d84105be46b952f2 SHA1 bbef02b51241439f64a679c72b69428035a8c2a8 SHA256 b37627554a6b55671770dd005c85a68a3db83a0b9a5669517c11064b76086e71
 AUX 3.0/init 846 RMD160 313ba4a8b611254bd333364f54bd7dc73d988283 SHA1 4e4a271486ea78d4d126df5d3ee2a6d38af13b0e SHA256 ca81ef66534013ec10a10e3e58610170938b54fb75ced23e3507ebd166be99cc
-AUX 3.1/init 776 RMD160 a25d940287d0b87d2f9929d5a9f74ba7253124c6 SHA1 405eea7cb18b2c6015e0dada8878bcec2b8d09f7 SHA256 a902eccf102174e1ebb552cf8d078d42105787cfd8d9b11a120143a5131af98b
+AUX 3.1/init 778 RMD160 4f8a3411315663074ef43a70e4ac8bbdebafc4b4 SHA1 87e7ef465be6b2c332c38a7f1c8e4ec5474c7d50 SHA256 f5c66a7212eb91f3dec55287a6c2b703b390c6894a933e51592f2762db7d2f73
 AUX distcc-3.0-fix-fortify.patch 313 RMD160 e5edc96a4bc4fe06a58878011cbb466184946b3e SHA1 386ee72a9d0b620dfc3aa75324060f764ed44e6d SHA256 7b57ae28dcef0c1ecd273a8a10dd1a16fa6a7af618d5438e1fe4398863fa8901
 AUX distcc-3.0-gentoo.patch 1225 RMD160 5c305052c9ee62c7d60377b26e53f69a67438b39 SHA1 7114da1f2ddda38498d19a685782da48a8b37f30 SHA256 ba1895fa906ba18490b722f9eda07a96459949d879412c2aba0218f8854ca7cc
 AUX distcc-3.0-svn617.patch 533 RMD160 64c8712a9290b1fef776ca5517074748a0ec9255 SHA1 7b9b661b21aea2e1a338b3ed890c6bd7dc8064e3 SHA256 902d6715f443fceb7c799bcf4f82d637569db2da900be5e36bb40b57a3e9fa84
@@ -37,22 +37,12 @@ EBUILD distcc-2.18.3-r10.ebuild 5137 RMD160 508cd0415759109afabf5a1808a9f8cb9270
 EBUILD distcc-3.0-r4.ebuild 4593 RMD160 c9919883117733788883069757230bbb108744f4 SHA1 5539be07ad4c3fb49064cb4ee846ce8f80be78f4 SHA256 45780c57a309a9dba22d33514c8b1cc30abf77e19cd0b2744d764ff1fff602c6
 EBUILD distcc-3.1-r5.ebuild 4735 RMD160 06f3e02b81546b3d71ca770f91d11755e2c4b046 SHA1 8fd61ea57b14a57273c124ad3db4bbe03557f8ba SHA256 f23dfa154325a758b56c51906ce972b5dc766e6c4da8cda721c932747d429c1c
 EBUILD distcc-3.2_rc1.ebuild 5798 RMD160 3b6c1f7cf9ddb5df746ef356a81e4736c6490c09 SHA1 756eb9529d3cbd601e46f665a7fdaa02946547c5 SHA256 5325144403f61699c81e19d9379cb31f70afe99c0e042877210d2eb951d7e3ed
-MISC ChangeLog 38274 RMD160 7a2e6ea658fd58bfa07429c7dccbf4450ef377c4 SHA1 8246fd0186ae8fadac5b2706042eb98d9d1cd06c SHA256 63d17d0de8ba9ab827b06fa4955b71fd469218616bc39e4672859e215f42fe45
+MISC ChangeLog 38414 RMD160 87726b791890b9e34b3436904dfeb6d723624adf SHA1 61e270ca27cd30bb734cdef50fe5baac9ba15499 SHA256 663511bd5de07948e443cb3efbd5186273039f3245659506de10f28090da343f
 MISC metadata.xml 546 RMD160 51a7caedb84842f9efa58ce9ec9da75b60e9378d SHA1 0d8767f8e7ca64a5c2c00eb4c20102955c2c12c1 SHA256 e94ab6ea446d8831bc33afa52dc75b25255bef5a05a1c2af22ba5b1ffc8d55d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOqkB6AAoJECaGw+YFKA1pjRsP/0VNWS7sBOBtkmyika8jPBe0
-KBCKkkGlxldAqTS24Jm+sRn36Qkiqf+vwp6WKo6bo0aTA+F027LHJH5BPl4y+T7b
-fGcA2tOnTEH7O6Go8C10P1M1ygYvcrX4+JO+/kNuvIXweZLtPF6z+x81oFbTcP1i
-WzBmFvCkEUwqIaw92+4TbD8W6+b954409KK51g/FqS7Xes/ZIZaT4VsVeHl9Nrlh
-brhP7zF9DmRAI9BqFeZtcrQmlEpGz7dn9wJi68TmTA8rNP3GqarqCGsdHVTRfGEh
-L/HwKrDvGYsKh/D5UxvNrPW48j9unTeia0Jgr9L/r68EXa1SdPFCUZo6w5vQV5Di
-hvQZ3K6dL8gDnruwYKW9qAGguWHQZ/GdtFidKlxH6mab67TCxOiKFrvTRki1WA3j
-FXIGPTZt1VP5aWgnLZ7WY9uY7FHzBmHVpSQ1XdBkN/EbQ2/qd5MUXMTcW8sh48E5
-ts2qM79gz/AdtGG+UDDrXqXPCw7sHQHVBLIrPtVCAz2YX6JN/jIaHrGlQAeLmBoq
-1zt/JL4GziTBusy6WsfaAwM4C6H8wkD493Fo53gxzaGCTZhQ9o01zOqpxkR9WGWm
-TI1T3+Q31n+ld/Q62ZvwcUUbl7lhXyQcX4W9/6rdDV7CHWVjV6M0+JW/S/AbKi0y
-BMYYJWlSN0FYUjHWJMP+
-=iu4A
+iF4EAREIAAYFAk757bwACgkQKiQSS7ZY+hMzlAEAi9TXfEuMrOEgWdyDFZ3GedtN
+6XfrdIfqiNcC0G6Khy4BAOb6Scees5JHhNjk/sJTN/N89zXhf9KU8qhSpjNcrRQh
+=95OL
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/distcc/files/3.1/init b/sys-devel/distcc/files/3.1/init
index 7c4277c5a441..02a9dc25e512 100755
--- a/sys-devel/distcc/files/3.1/init
+++ b/sys-devel/distcc/files/3.1/init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/3.1/init,v 1.1 2009/03/19 17:56:09 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/3.1/init,v 1.2 2011/12/27 16:09:23 ultrabug Exp $
 
 depend() {
 	need net
@@ -19,8 +19,8 @@ start() {
 	# Load PATH and GCC_SPECS from gcc-config, bug #262773
 	eval "$(gcc-config -E)"
 
-	start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" -- \
-		--daemon --pid-file "${DISTCCD_PIDFILE}" --user distcc \
+	start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" --user distcc -- \
+		--daemon --pid-file "${DISTCCD_PIDFILE}" \
 		${DISTCCD_OPTS}
 	eend $?
 }