Use --user option instead of deprecated --chuid option for start-stop-daemon, reported by ago.

Package-Manager: portage-2.2.0_alpha78-r1/cvs/Linux x86_64

4 files changed, 28 insertions, 17 deletions

diff --git a/net-irc/ircservices/ChangeLog b/net-irc/ircservices/ChangeLog
index 66e8b2cc7078..f9cf448e1ebe 100644
--- a/net-irc/ircservices/ChangeLog
+++ b/net-irc/ircservices/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/ircservices
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ChangeLog,v 1.49 2011/12/15 15:19:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ChangeLog,v 1.50 2011/12/17 04:41:25 binki Exp $
+
+  17 Dec 2011; Nathan Phillip Brink <binki@gentoo.org>
+  files/ircservices.init.d, files/ircservices.initd:
+  Use --user option instead of deprecated --chuid option for start-stop-daemon,
+  reported by ago.
 
   15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> ircservices-5.1.24.ebuild:
   Stable for AMD64, wrt bug #394487
diff --git a/net-irc/ircservices/Manifest b/net-irc/ircservices/Manifest
index 4fabc6454aa1..cbcb4d70a589 100644
--- a/net-irc/ircservices/Manifest
+++ b/net-irc/ircservices/Manifest
@@ -12,24 +12,30 @@ AUX ircservices-5.1.24-ldflags.patch 479 RMD160 7cb97dca262e481db9a738e42fd7e292
 AUX ircservices-5.1.24-parallel-make.patch 736 RMD160 66793c669ed14b035c365f5512561ccf11f58c42 SHA1 da5f3baf004797abe1e997fcb18c77dbc9f59524 SHA256 54104cc06087db860e1933363071fa7077a914eaf7efbaeea001e611182af6ce
 AUX ircservices.conf.d 327 RMD160 584b51f9cc583920cd12646cfa84489fae99fab5 SHA1 178a5649edcb3f3075b6d8c0e9192081e1d42276 SHA256 e6fd7cacb1b44e6ddbf7d1c9831480eeed4d0e4a6b2f21188327971a073240a0
 AUX ircservices.confd 487 RMD160 76baf4978ec01ca71ed3c345fc7ddd3121729c38 SHA1 eae014947594f91677c55b1a453421b980edc635 SHA256 cbbd130e360f6d4191baf99d3943f3a5e09f32b016f94803660365879e0c02b7
-AUX ircservices.init.d 764 RMD160 e54f5a09c99c9aea230013afe01b02080aa793b4 SHA1 e86f4706db823029ba65954845d3d080034f2855 SHA256 9dacabf713916d88b6c03af21c0a449f527e9c19d1e9f1c56aeeeeb68586bdbd
-AUX ircservices.initd 876 RMD160 800ce2c041d2e8f648d0dd744e3b68bb6ea65c7d SHA1 c13fe473b4e90eb7c5971242b6c999f97b3a6f80 SHA256 56122b2c54fe1ee68cd5300108c2d4ecbeb1b66a7b7c2363581c0c7bb4b8670b
+AUX ircservices.init.d 760 RMD160 15cc345a366fba21cbd6c4f5d0d2ae601a034489 SHA1 150d3c15a6ff6f3c32a6441e6fc48d6860c78375 SHA256 5f0d245462bf581424e8e10c14db889c132551b18511f3f464d78ed7d7c7fc7e
+AUX ircservices.initd 875 RMD160 be7e8af0de078d8fb720873cc46d45476be056df SHA1 492a1a6ea99c26673524c44d36037f9802391552 SHA256 60df6508955c61dff5647a3354d5559990917c0532fc05af9abb45be08347f32
 DIST ircservices-5.0.63.tar.gz 1167436 RMD160 d61d5bf3dc28ac38a391b3918289d74ce2106ace SHA1 5c08af0d56bc99f9dc8f331eae9963beb3e28dad SHA256 7cf68b2dc956c25da694e1650b3871a9a55feac191292062d3d568d377be6ce3
 DIST ircservices-5.1.17.tar.gz 1529495 RMD160 0704e7c487ca0f47ebf1e97db59e5889fa279403 SHA1 f486405a5887bd11d07fb50808ddfc576307f6d5 SHA256 faba759b4d9faf39784a6ce109364ce2c7808e3d681b4c2728f2cc29fa042590
 DIST ircservices-5.1.24.tar.gz 1516612 RMD160 d30ed9e2d5dc25945cb20d3dec4e18318efcf037 SHA1 221bef1139aa3845d4015d71828ac8677c279de4 SHA256 63c88b84ddcd12f3636ca9c69987a06e4055156ae3ebe2ff4f22205c66c2a365
 EBUILD ircservices-5.0.63.ebuild 3420 RMD160 1e846339e0ecec52b2fa0f63017d5147c9ac1191 SHA1 fb183478e7867059f9eb42d8ae307f131f9ba9af SHA256 f3c30d41f9a96103a660658ac9d699c27f106281287367c7d07667488e62cbf8
 EBUILD ircservices-5.1.17.ebuild 3408 RMD160 3594428aa287ce42afc66cf5f8a265ba74d012cf SHA1 7749a399988d0e98be8378e3c3fdaa71357e2b57 SHA256 917443fbf0943223614ecf4b4ba91c210342d6f4f40b2d44f243ddd59bad9c06
 EBUILD ircservices-5.1.24.ebuild 3259 RMD160 32b0ca417d311732370cfbcf07be9aebea8f7f98 SHA1 44c72d955557d0f5b32112bf8e36667ae1068177 SHA256 38472a58fef3786be0c50d3702404657701804f611fdb4d2cb05d9fd74e92968
-MISC ChangeLog 8280 RMD160 bdae2a5347eaddcf2abcf3f35a78bd6dfbd32270 SHA1 279ce240828a8f1cefae349f74c1bacf8ef68274 SHA256 3c405d161198034eb0fe4ceb3ef4a3471f288070b83a4e40067088a20ff14ba3
+MISC ChangeLog 8490 RMD160 95e81fe648d7f2aacb09efd3dd2f020c9016b923 SHA1 543eaab9889c889b0c26821e7a2f955e18f498e9 SHA256 93fad7a0b91b8912b02bc6fb014b1013aa05081f7c6ca6138b0cbb99a5f35887
 MISC metadata.xml 267 RMD160 6c1df58375f4a1410db23bc639e1d2a278edfeb8 SHA1 a9324f1d3ca9746fe1ab419901d9c6556803dc4b SHA256 e143475a8cdddede06c25d62f39b853951fe13af9739fae4969f2aec483256dc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO6hAEAAoJEOTDgjZ80txdX64H/AqfG2L3r60MK1896/1L1Rhh
-wAGbC0687RGQd+2R7j27p9pzt9W6nhfPav3DvtYWFmhRmTsos0IskYaKyBZ+/Hbk
-EwQkyjUgH5nDAosS1Qck0UUhITo5D2gIelA27RlkzkdH8Lv4oCSQ42jMvPvlDeXv
-L0XARZxSs9JRJd+TvqvjX0zzXBQ0ee6pKkuErZHaHg5v723qWoPSKhIuHGMQMCjc
-YlwIYvZMmpRBK2ooMKxk0XBWQmkx+Ip12LZSxtbRgctiN1K3Ni3UASRZ30B5zEZS
-ePmg1OMOWpF84HO0xMQI5/U454lp6gBcjEzLHC6mtjwykfbQAaKNOW4RCihBimA=
-=hySz
+iQIcBAEBCgAGBQJO7B1wAAoJEHQ6UuhrqBBQxdEP/2ybzdgImKGEW7QDzYDb3/NW
+hSNdtF6GxAYe98Njk0uV4MvfvksnWL4Nw4ETQwZ7FqbFR2dxvAIwCluEmt+z39KH
+dp2jPZrJEvXPd7r0/jgbxpeJ+BX2dHdodJ3xmnR9RKuRks4c+KiH1D/f5hASynwU
+4v3mu1998FFJFvzVGKpWiMT9S1WidP/+GGOvJgoMA5U4O+HWLF1Cv1n2Hy3qBMbT
+Di8eqc/kWM5Fh79nW9ClHj9PD9skAcGGqHnJGdJG/502WiDPSG3iAu/EQDRrZmBq
+i59nwlLOcrYJUwMt9PkUv/piC+212tN8ixbYfGD8/fogwbikiN7kMFAvVunIu+Un
+oswwtIthQKxpCKii4PL8tl5iJY3Mg51QGj/rGtf6otyoxNzSQU8eoMeehHIjQX8i
+KLIQ9rgtIprtV1N+y0GUyxw2ESlvydb4NsEtkvh9ay23U7YOF8kmpUJrnzVAGUT6
+qctL/zr4x6nyq3Pna1m3/ygwqhIVp00YMG9uuitwTQ91kzoEPnLgh/2RdN5WgE+E
+OylewZ1MvNvs+2eqrkncUlmWerv/BG9bkZDgwJvvkJJTgf/OR+Rr/qw2EfhLuWGi
+Zs9PNrLSIF5XOvWJvNOtcOpyrgCl1ARszSsT8nn54WleI1tn37iuv2p7uGiFOndB
+vU6HSi14CpoIrckZTV9B
+=Xn5q
 -----END PGP SIGNATURE-----
diff --git a/net-irc/ircservices/files/ircservices.init.d b/net-irc/ircservices/files/ircservices.init.d
index 4eddbf16360f..352af6435235 100644
--- a/net-irc/ircservices/files/ircservices.init.d
+++ b/net-irc/ircservices/files/ircservices.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.init.d,v 1.5 2006/11/05 22:23:08 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.init.d,v 1.6 2011/12/17 04:41:25 binki Exp $
 
 depend() {
 	if [[ ${LOCALIRCD} = true ]]
@@ -15,7 +15,7 @@ depend() {
 
 start() {
 	ebegin "Starting IRC Services"
-	start-stop-daemon --start --quiet --chuid ircservices --exec /usr/bin/ircservices -- \
+	start-stop-daemon --start --quiet --user ircservices --exec /usr/bin/ircservices -- \
 		-dir=/var/lib/ircservices \
 		-log=/var/log/ircservices/ircservices.log \
 		&>/dev/null
diff --git a/net-irc/ircservices/files/ircservices.initd b/net-irc/ircservices/files/ircservices.initd
index 0bc561c7203c..4df0fa0d84c4 100644
--- a/net-irc/ircservices/files/ircservices.initd
+++ b/net-irc/ircservices/files/ircservices.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.initd,v 1.1 2011/06/27 23:55:00 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.initd,v 1.2 2011/12/17 04:41:25 binki Exp $
 
 depend() {
 	need net
@@ -18,7 +18,7 @@ start() {
 	fi
 
 	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --chuid ircservices --exec /usr/bin/ircservices -- \
+	start-stop-daemon --start --user ircservices --exec /usr/bin/ircservices -- \
 		-dir=/var/lib/ircservices \
 		-log=/var/log/ircservices/ircservices.log
 	eend $?