Fixed init scripts to not use s-s-d's deprecated -c/--chuid option anymore

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 33 insertions, 27 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index a048c37ba5c9..eb103c269e10 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.70 2011/12/30 08:26:50 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.71 2011/12/30 09:46:32 polynomial-c Exp $
+
+  30 Dec 2011; Lars Wendler <polynomial-c@gentoo.org>
+  files/1.6.6/init.d/zabbix-agentd, files/1.6.6/init.d/zabbix-proxy,
+  files/1.6.6/init.d/zabbix-server:
+  non-maintainer commit: Fixed init scripts to not use s-s-d's deprecated
+  -c/--chuid option anymore. Acked by bonsaikitten.
 
 *zabbix-1.8.10 (30 Dec 2011)
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 8644d1d4fff0..1c6c98c63211 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -15,9 +15,9 @@ AUX 1.6.5/zabbix_agentd.conf 2515 RMD160 bdf4e66de1355f9b05f8ca228bdae3e592aca5f
 AUX 1.6.5/zabbix_proxy.conf 4509 RMD160 9efacc29f9e592484cfd4e7cf1cb121886f7318b SHA1 1d619d6d7789be4290245b8bdb8bddf0e93b6a80 SHA256 d7f5d87f3ad9860b0dc8fe2175303b9e83464a5a0b51010a87a759f3b6de46e9
 AUX 1.6.5/zabbix_server.conf 3922 RMD160 a38ff076d34a9807d60b67ec3df3a428f03a8095 SHA1 48fbeabd262d0552f0cb86c39b3f645788077a11 SHA256 4210390a0400b86b090945abab6fdbfe91965d6746a46cf92434dacee4dfe3cb
 AUX 1.6.5/zabbix_trapper.conf 755 RMD160 c50714a2b95af303737adb117734872ef2545fea SHA1 4acb5a3d01c797f38c278d903430b5ec13557550 SHA256 76af8f79fa28b02c65107753d959c5404faee67c28219e9bce1b29014fab3ca8
-AUX 1.6.6/init.d/zabbix-agentd 581 RMD160 d0060b9a130c324a521742bebe2558dd1bee5171 SHA1 f5ac53cf685dc40bb92eaed5812b9b73dac6d794 SHA256 c69a7b6bb64633af898bf6ba6fe0f3714249bd1a4b73f08b48eda99a564bfd6c
-AUX 1.6.6/init.d/zabbix-proxy 559 RMD160 35679dcdfb052cc51305aa1830c5dd7835d00dde SHA1 590d1dd38afab985d785e5d166cd0224c7f4f4b3 SHA256 afc0b3a61e001551c049bd3907cf14c67a5d7a5f9fd4c503d7f3e520464c5755
-AUX 1.6.6/init.d/zabbix-server 563 RMD160 1cd0739f7d8fab838a0d60a6a5867936b9fe6480 SHA1 148685244bc8008ddfba2613e7d3091fcaf5aa09 SHA256 daa094a042ed03d6a037d28fe1208a193c407492f79e0128518b3058ca171ee7
+AUX 1.6.6/init.d/zabbix-agentd 586 RMD160 d869a457809d77697faa1077b09fb8d20db9d049 SHA1 8cacb7bf3e90c456eb6f11464a2a3b5affa346ed SHA256 74e502a668f1fd69170d3f6dff67d0bde8a2fd40c003b6cc8243e747c51f7308
+AUX 1.6.6/init.d/zabbix-proxy 564 RMD160 e3633ed8a3fa352a2702cda51e52e58c4992fedf SHA1 4bd6ee13488ec6613b80c59d7be072b62df41e3e SHA256 134f9ea78b0235cc830f1f3fc9cc0dae0db7821a777bb66cbbd86102a2a61fe8
+AUX 1.6.6/init.d/zabbix-server 568 RMD160 1f2f31399c90643e0e918902b8f9e8d4e90e11dd SHA1 4103f0320a90474459449040c29f8293b803957e SHA256 d452c9e33fee0a4c41741fbdeee4c94608026878a0ea2ac72f33f6c01330bd89
 AUX 1.6.6/postinstall-en.txt 147 RMD160 c0aa1d85021eb046f9c92415fa8e95f9296b046d SHA1 cb5e16baa4cc0a1bf728d94a14fe5e0a85aebcf4 SHA256 3855cb33f7ca570a44e42d578894aba9ebe22fd2992f9f009ca954286f4ba38f
 AUX 1.6.6/zabbix_agent.conf 1121 RMD160 09c6842c9846b5506ebeef7bea6f596e875b9a9f SHA1 64a513652d2cd7e764db67a4dde519499e554cd2 SHA256 0bbeabf0a3b9a7a3a2c71d384d785c9c1b9da420e1fb46445a15ce952d6c7790
 AUX 1.6.6/zabbix_agentd.conf 2526 RMD160 0b4a81a0efce31c09423d0f11a674f83c42aba7c SHA1 a6cb66c2b07fd6d4a309bc46e81459260f57fcb2 SHA256 78d16e30d210f7790797312462b3abf713125f7ca18f6ecb39e7458f6e9990ef
@@ -43,22 +43,22 @@ EBUILD zabbix-1.8.9-r1.ebuild 8146 RMD160 de849ef8d0148b65454ed8da957fd381607ae5
 EBUILD zabbix-1.8.9.ebuild 8132 RMD160 59509d08e0c30bffa46d389f356332401eb20acd SHA1 850029d52cf2d41977b7c6151dc1692dc54938ac SHA256 b64f320d25c953a8f86a8e2459eb6a403f32011e80331a954974e48a82253adb
 EBUILD zabbix-1.9.4.ebuild 8091 RMD160 2c66f2c64f31923791ed9e1f5f1306e0f5b97df5 SHA1 b56cbffd741c1f6285c8f3ed626243701b683e3e SHA256 5b5eff01b956a9625b30af16fbea9e812fdc5c628c1219a18837c5b7c13f2749
 EBUILD zabbix-1.9.5.ebuild 8091 RMD160 791e1baa4f8f1fb696f057cc958a60406267ddd1 SHA1 95369c15a6f6219fdd1dcdd7879c1c5014ac1f83 SHA256 a3152587bc62a7b41bdc67dbfe327ddf1d0ebe0509eae418041de3aad0cc3ac1
-MISC ChangeLog 14629 RMD160 528ec6999a15388d6ecf2cea39bb8105d37b48f6 SHA1 19108102bc1e312cca5c96981300f6e4c03d7424 SHA256 663cd27381fd7ccf86fc40a8b79101bc82f1f09e7926ffdae35dbd00f22aca1d
+MISC ChangeLog 14915 RMD160 e0620f3656942dc947ed13b74be1582b7c817ad5 SHA1 e31f4f52a46c90de600a7057ca2558af109e981c SHA256 abd7fa088ddda16bbbef9572f18ce42f4793f9089296ecc1994ec80a6e06bc46
 MISC metadata.xml 990 RMD160 edaffb17a34b9015c48eaf1ae61ef676b9bfdf63 SHA1 1eb2d630b542283f5460a49327dc93fee2de5663 SHA256 b5f00181c6943bf7dc15acf9b7dd21453d7cc0402a55bb2385b3fc0de6520f6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO/XXQAAoJEPiazRVxLXTFPoIP/Rs97fPrEI+NIEPqlP5rFyly
-p+VpML370w6TMRMbuLS+JaFDcb95N9+Tx5+C4qJXYSoGBldnZYK+0Kj1jZwRI9XX
-L5MdK8giEZNuShc5SknSxpoCU0SInRGcWOICIsV3QDWyU5SgHoicmzU5n/N6x5V2
-1RVwJKWwY8rW5e1q6kVnRzT0ChtOTzGvkk/p8IKtM1dAFp3lfgx4coOEMG7S6Zat
-covEfDQ1iZ/Rw5jUfdwZ9PqRkcO5YhPinPDa0Hh42CkJy+VPrC4cQ9Mfkxol7Fbs
-l6qZ1Dh2FcaVzRcfcR7DPPwlkuGsz4UzkBpQvWMW95CVua9mBvKliM2CAji5MDK8
-p9qz9Y8yvKVbs/r0vsAL20ZrVxUms1+Nl5CsTF2D4+WwLDJ4M3GD0aUpjO5Qxia9
-Mb0wkcV84WM1dUM4uBzgcTaC6M3zvoedj1ZGNwf3v9PjmGzz8oC2fDU2eX908JHD
-X5pOsW3+eOSQcBGPap5EFZe1Ga+JrZUk9Pf73F5udjRMY0ZJEG632tMocCf1wd1P
-iisP8flZPnyurfCMbjfflAc3CpL1z8b7dQUPzNlq/rHS8WDn6zxwT0Raag6rY+Ii
-ylouuJT6GXG7OqJ1unwEEPSE+LBm+erYaqYkVvXRvlo1J+q0YhXIBGdY1Hu8u/Ki
-MlmRWoZRZeU5U/W26qLy
-=TBXK
+iQIcBAEBCgAGBQJO/Yh9AAoJEPiazRVxLXTF6IQQANrmNSmSNjoRZMhZ0jwdy6dz
+gLQXNq6OEoMjHXacjl6c6Az+m+BIFJwV+RG7n+/TPPzlM0KfpXBrIOaeH58ipKfm
+m8a/APQ+XN5SXndrg3/++i95bXpG9hsGN4Mc7i/bNudOi5RyGiZGKT8G96OSFSK+
+G7IgAuUknn2uzBzUQL4DERBOb3PSpHuXhG2yVG/BLhnUiOduaIxSQvkA9enilQq2
+BdXApa3MzDpHfiLM5LuGtBQYo4h/tSsaFybmjvD7d1D3WkwRs//NGjIch71lQPnj
+uzjf8Mi8Z3n5wcoxLZqrz2BqKAdUH1PkqT5UVkHUNUthC7XSu1i8T1h4+jJhDi3j
+onjrw3lZVh/ekBhYaADzUlNBwZTarg8wKWtO7GAfd9iH8aIGmsUdjTRihmxKJ7Xm
+F0W3ZDW6MG7X0xwwsZwMWwhoTworyKDLKUUE+Zv3ucoA0voq9yW3RcWMV7UO4ojt
+Da7FkbJb0CBWWafWHdRMN8TN12MkOHpFgB/0RrNPkxOkZDwBMMUMXLDr7ElGO+xE
+FeFca7p6QW+yU0DfPNeikaYn2SHYOSWP0qfsM8lQe0dOUL5luaeayneafbJ9nx+j
+iHGnrfdz0ItqPxb5/74T8nzR7y3ffeO/b3zTv/6KurJ9dQQhQLVmN9tHJoD1KkM3
+1No9GN/6nhSoPZ9bp1lP
+=ekgV
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
index b14b5fe74b31..b77e792bbd30 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
+++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd,v 1.1 2009/10/05 15:55:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd,v 1.2 2011/12/30 09:46:32 polynomial-c Exp $
 
 depend() {
 	need net
@@ -11,7 +11,7 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
+	start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_agentd
 	eend $?
 }
 
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
index 8ac246eccdb1..912a013baf79 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
+++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy,v 1.1 2009/10/06 16:24:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy,v 1.2 2011/12/30 09:46:32 polynomial-c Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix proxy"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_proxy
+	start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_proxy
 	eend $?
 }
 
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
index a661cd233d25..fccab4a1ecd3 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
+++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server,v 1.1 2009/10/05 15:55:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server,v 1.2 2011/12/30 09:46:32 polynomial-c Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
+	start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_server
 	eend $?
 }