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

(Portage version: 2.1.10.41/cvs/Linux i686)

4 files changed, 15 insertions, 9 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 26d68a96455d..cef2b47ece24 100644
--- 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/files/init.d.webmin b/app-admin/webmin/files/init.d.webmin
index 4ab582168fcc..3f5d07356742 100644
--- 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
index 4dcc1329a26a..e7749436f727 100644
--- 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
index f9f1e6873632..4096665eff90 100644
--- 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"