Revbump. Don't use deprecated start-stop-daemon options, bug 377843 and bug 381895.

Package-Manager: portage-2.1.10.41/cvs/Linux i686

diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 0eedb8720bf8a8a34e899c4f11a0981c6973f4e5..a4bbb766d597e964beb769cd07581287cf386182 100644 (file)
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -7,13 +7,13 @@ AUX abrt-2.0.6-format-security.patch 911 RMD160 e1b545edc5ddf903fde7c32c1019a6d3
 AUX abrt-2.0.6-gentoo.patch 8192 RMD160 a7cd1c4fb38c0670df4922b6275c08aa5c117263 SHA1 6c3fd4dad4ee5b89296744183a7706eae762b50e SHA256 47ab22b09079fa9420d5dd179ade4fd78ff68373170b925be2d084ff8d377200
 AUX abrt-2.0.6-glib-2.31.patch 2388 RMD160 5a58a75acdacb2c7a253422b2782ccd6c81eec8d SHA1 b10c0f5920d7c26fc5aeb1c185e2aeeebfdc1ccd SHA256 89b3bd2abb06f3eae45f1252a32ff88223e42cf980e30cb5fa7af36d22df70be
 DIST abrt-2.0.6.tar.gz 996676 RMD160 a3a048e9223cbe9bbecca9469937812debafd43f SHA1 5f3863b4ea10a23f813f439213c3379a228c5063 SHA256 0413a6b6143d0e667bb9c2c34a8ddfdb82d0dff04050acd254eb86943dd181a1
-EBUILD abrt-2.0.6.ebuild 2997 RMD160 5d31fde4a59618c9e9013b0c5f7a9074ff0c35fa SHA1 db6c91bc705046505ca07c87edf9557a3ef10b2f SHA256 c1a589e8bb60c7dc831a47972265b3e72e15e05994fcf0d87e0a1e16b4ca1956
-MISC ChangeLog 829 RMD160 0e165b6b17f4380bae57381ac42edd8621d45ceb SHA1 579638c23f11ea7403adc3bba3267124e6d0994a SHA256 0a6cbe584c41b7b8728872c9afe573d526231c4ac1c3cdc2c6e2b82c38843375
+EBUILD abrt-2.0.6.ebuild 2983 RMD160 5a5dd6f98113cb8888226a1d58b4aa28a91b5201 SHA1 ee1553b7a2c8bb64d1aff365a5c483a5005c43ae SHA256 90a88df86e96baf0b965b4ff35541d5bc53c02fca1a19fa1287cf3ab3bdca77e
+MISC ChangeLog 935 RMD160 3ae2ae549213bdcba489a8bddabb4f179a0487d2 SHA1 cd0fe49247644944a266f8068726ff14a1e7cc7b SHA256 0d3260b9a18f99695a6d8136c7b5610b49a4c4044b15dd1e2782922ba9930d6b
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7/NlQACgkQdjK8w9WeBnD4qgD+K77zys6HSndqWXSohx8NY7JR
-LF732iUFXtsbeJFOx10A/3f7ARW/0GFsu1jYF8oPAklKjfSIyBirMMXg+I3+JFG9
-=TvEb
+iF4EAREIAAYFAk7/VgsACgkQdjK8w9WeBnBElgEAr7maUbHye8WDK8ssDga7yBnU
+bJjOm5ZdCqzVb8sHg2cBAJB1Iio/5pQMIP+/TLMGRI+esfXfrvqpJiKjmX3FmJdB
+=elmM
 -----END PGP SIGNATURE-----

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 26d68a96455dc62c911619953121e6fb74ed892e..cef2b47ece242cc0084eb2328cbde370917a35a4 100644 (file)
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.192 2011/10/12 21:10:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.193 2011/12/31 18:33:39 idl0r Exp $
+
+*webmin-1.570-r1 (31 Dec 2011)
+*webmin-1.560-r1 (31 Dec 2011)
+
+  31 Dec 2011; Christian Ruppert <idl0r@gentoo.org> -webmin-1.560.ebuild,
+  +webmin-1.560-r1.ebuild, -webmin-1.570.ebuild, +webmin-1.570-r1.ebuild,
+  files/init.d.webmin:
+  Revbump. Don't use deprecated start-stop-daemon options, bug 377843 and bug
+  381895.
 
 *webmin-1.570 (12 Oct 2011)
 

diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 79a7a16879899bc2b2872687f784ce173dc927c2..c2b704fd3ce53ee06255cab480ee3c1e9ee048d0 100644 (file)
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,30 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX gentoo-setup 11154 RMD160 2ec596c45e052a075b18d8c977e6e92ae177fc5f SHA1 9d709aadd3532a27d83649b63d794efea74ebf0a SHA256 136c2955e6c380e2e8cc8ad8991f4d8d6a404c386fb7846ca8b269921fef534f
-AUX init.d.webmin 2307 RMD160 ca520b1dd4ff2da32bfc37645bddf215b56f18c7 SHA1 f9761880e4edb4372edb3ad2aca22724743e1d94 SHA256 139f4271e5be956693ccdacfad3c6a972b136dd105f9fe8535e1845308a9a7a4
+AUX init.d.webmin 2250 RMD160 1cd6b5f55ae63a456ef240dd8d111f0cc8fef803 SHA1 88517993239528f562e27a8c922931247a1943ae SHA256 20b752220f19a364f7dfa1604129803b7c1664c8766f2d7fc4aa10b6b45c7e47
 DIST webmin-1.560-minimal.tar.gz 1856121 RMD160 83df64d056952fef757ba4e7ef3b470636f45b02 SHA1 40315e666eacb00bf85df93e22ba5597536c5e0a SHA256 9957928222547a62a05d6c03b6c571e91c53a5ee55552b0960af431d5e8a6df7
 DIST webmin-1.560.tar.gz 15152937 RMD160 1ee7c172baffc6e13a213a7bd61fa8ddc7814d54 SHA1 02ae664b0f01a8214aac018c74fd34447336ed5d SHA256 4370abe32f04012328e2afa93e1c00fd1353963a34d8f644604f9e36d00b6e55
 DIST webmin-1.570-minimal.tar.gz 1873041 RMD160 95fc2bca6b7132179cbe23c2007e2f0eaa5b67df SHA1 a4c89e452aff56ac7ee4e4ecdd04279d98b33213 SHA256 898c03f136ddc63f6486f287ec38bf2ce8773109e80d1e8a6566fa11381d855e
 DIST webmin-1.570.tar.gz 15200156 RMD160 13f61f03c1aa5b2a47aa8bf37ffdb0b754d0002a SHA1 b4728a2c74ca81973064f7801566ba09ef9ff717 SHA256 3b8ad51dee0e61e330c8137b3d8cff91a00cf31d710b68e272fe02db25baaf54
-EBUILD webmin-1.560.ebuild 8977 RMD160 c8c00fb32d1b38457868647d8d9e8bc26a12dccf SHA1 8fec30dc0cfad44d4018122a43f40e437007a3a9 SHA256 9487336079c00fa57dc215b4a179717dc2db8510b6f4ac288a070782ecbfc3eb
-EBUILD webmin-1.570.ebuild 8977 RMD160 ccdb92e102408cd6aa53bad1c743aa668308f4f8 SHA1 296cc2327806024b43067916a9a87ca7e6cfbe80 SHA256 eb60a2b11924ef702c80cdc10d8404f82c81c93aba55fea26e4728879c6732d7
-MISC ChangeLog 700 RMD160 a3d6b4abfd269723b176cf28dc77779621f838d9 SHA1 51b5a7da2151af3c3927f84b6776b724c478ed73 SHA256 0aa41f8410c878f5eb6bc5c67ea9fe4aa563f4475cee9532430eeb77a59d2eec
+EBUILD webmin-1.560-r1.ebuild 8977 RMD160 a1c7425e41541e3f2e2de64de6987741f109dec0 SHA1 863ca7f8a67dbfd54e8244ec60353b04e82715da SHA256 68bbbf1905c5a95498504ec9ead4e0f431c018d8fce658a6b0b7f2be73d69721
+EBUILD webmin-1.570-r1.ebuild 8977 RMD160 684187cf50c14723ee2a9da8a6e36c2bb0d51a69 SHA1 8c5e2bdb6aa988ad787ce56983a366620dd757eb SHA256 8eec171c20d8317f26d9d49830763d54529d44739e6060f16b81075a5d71669b
+MISC ChangeLog 1020 RMD160 975b06cdb6db9d1736d7703e495e344392e2bcb1 SHA1 aaeec8ac3ed792eefc9f1c9ea8a54641d9d352ed SHA256 5ec89ba7704c8ada0516e62c9a96ee3702d7910ee3d7cfd22354fa0e7288d551
 MISC metadata.xml 496 RMD160 1d3e1e14cb2ef169f8899df66e3ebdf8d5e43a5c SHA1 5accb49047740e0374c3e9a3309f08dbde96632d SHA256 ae874cee0c2bc4eb921cd7dfa1f9b3f390e86feaab5ffd5194283f89d2ded5e3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOlgJHAAoJEPqDWhW0r/LCs2AP/2HDY10I2u/D7oiQIF1F/f3N
-0E5LZXlplvpmKZRNET3yu9re8/s72Bq6xCATHZH8PQKZd93NC5bZiw5+IxwF1xn8
-z6FJIaNjzFVYeBD7XWwc/BncdzgA7tF/aQWZSJD3/QMkvCKBzBHd1kbXNz2WJT/x
-5e+9Tk4Sr1TpXsUjFW1mA/9rijGmhzD5krBtHBCJGjAtioVp/VDYx1znL9OZO2+p
-754cRsgR6T0wlX27/FdOUI/uZR9Jr4q+ac43MCyKVLJLlXJkqKS+h9hdXd3HPZBN
-1bKwXJqza06hQGvRGB5AFsibTR0OJt1M5Em4NtPiBP5HEJu4M6db/Lm3ERKN/od8
-hzulsdYzN1+gIaRVM9mP4YycEFj7hK5xATQsUd8EBhYbGzYphihBhOwjOeAsstdz
-0fJ4+oKpCROkCCzNd2nlfiWEY3/36H41uezgbIMKS3VyqnRx7NZ5p5czSQfLWCgq
-DhR3hxdkyQvLsJkeOfXij4OxTmg4kZPu56aIPsb11Uh2Ine1tBtckLAkVcepFE2D
-0Rs5rPFx56fVxD40bAYGxotijCrmqEQzugBnT8rjTteYAiExp28O94HZDWFCyK2I
-ASuT6b9rXiH79hBCAQcrG+F4+YpnlhrnCVPRwwDAmz0uG1oKDcrdVyiYKtGQDft3
-REKF1CJt/mJ6+WgSxBTR
-=DUAy
------END PGP SIGNATURE-----

diff --git a/app-admin/webmin/files/init.d.webmin b/app-admin/webmin/files/init.d.webmin
index 4ab582168fcce3766279db2d64db9572a5112caa..3f5d073567426813fb589751a3a5a1c8b13c9b34 100644 (file)
--- a/app-admin/webmin/files/init.d.webmin
+++ b/app-admin/webmin/files/init.d.webmin
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/files/init.d.webmin,v 1.8 2011/09/18 09:56:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/files/init.d.webmin,v 1.9 2011/12/31 18:33:40 idl0r Exp $
 
 
 # We do not give a choice to user for configuring these 'cause it will mess up
@@ -10,7 +10,7 @@ WEBMIN_EXE="%exe%"
 WEBMIN_PID="%pid%"
 WEBMIN_CONF="%conf%"
 
-opts="${opts} reload"
+extra_started_commands="reload"
 
 depend() {
        use net logger
@@ -55,10 +55,7 @@ reload() {
        checkconfig || return 1
 
        ebegin "Reloading Webmin's configuration files"
-       start-stop-daemon --oknodo --stop  --interpreted \
-               --signal USR1 \
-               --exec "$WEBMIN_EXE" \
-               --pidfile "$WEBMIN_PID"
+       start-stop-daemon --signal USR1 --pidfile "$WEBMIN_PID"
        eend $?
 }
 

diff --git a/app-admin/webmin/webmin-1.560.ebuild b/app-admin/webmin/webmin-1.560-r1.ebuild
similarity index 99%
rename from app-admin/webmin/webmin-1.560.ebuild
rename to app-admin/webmin/webmin-1.560-r1.ebuild
index 4dcc1329a26a688ac5fa81b8bdbad4abc77edff2..e7749436f727dcb4c17ff2373afe442a3a510864 100644 (file)
--- a/app-admin/webmin/webmin-1.560.ebuild
+++ b/app-admin/webmin/webmin-1.560-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.560.ebuild,v 1.1 2011/09/18 09:56:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.560-r1.ebuild,v 1.1 2011/12/31 18:33:39 idl0r Exp $
 
 EAPI="3"
 

diff --git a/app-admin/webmin/webmin-1.570.ebuild b/app-admin/webmin/webmin-1.570-r1.ebuild
similarity index 99%
rename from app-admin/webmin/webmin-1.570.ebuild
rename to app-admin/webmin/webmin-1.570-r1.ebuild
index f9f1e68736328c841a6d0692a152f550ce967676..4096665eff90593625a7da22186c96b7e53c4317 100644 (file)
--- a/app-admin/webmin/webmin-1.570.ebuild
+++ b/app-admin/webmin/webmin-1.570-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.570.ebuild,v 1.1 2011/10/12 21:10:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.570-r1.ebuild,v 1.1 2011/12/31 18:33:39 idl0r Exp $
 
 EAPI="3"