Use start-stop-daemon better.

Package-Manager: portage-2.1.2-r10

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 12686fc79bdc22a315b5d69df71e355fe4c4d292..4f819931a623317e2f806e79b18c79c2c36eb207 100644 (file)
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.113 2007/02/20 12:38:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.114 2007/02/23 11:09:41 uberlord Exp $
+
+  23 Feb 2007; Roy Marples <uberlord@gentoo.org> files/dnsmasq-init:
+  Use start-stop-daemon better.
 
   20 Feb 2007; Raúl Porcel <armin76@gentoo.org> dnsmasq-2.34.ebuild:
   x86 stable

diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index cd2d9b7e256ca0add9b2d0743fd9e2dbbea2ee4d..98182900796aabe756f007aaa3f59bd23470cbb0 100644 (file)
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -2,10 +2,10 @@ AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317
 MD5 76c037c6372d10106bfaddc92bc6f898 files/dnsmasq-fbsd-config.patch 451
 RMD160 c9103d329ff429cdadea346db59678815fe3317d files/dnsmasq-fbsd-config.patch 451
 SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359 files/dnsmasq-fbsd-config.patch 451
-AUX dnsmasq-init 612 RMD160 d208b2048fbca19f18949311abbec5fea1080b23 SHA1 9b6a395709a1b2a7e932ab263cfe770b00f95e02 SHA256 6f3503921c6b2448cd7013b4428b633143b00816a3b66fcc8774802e2ff9aa48
-MD5 bd6146f8e6623df5220cd06ceb3d4269 files/dnsmasq-init 612
-RMD160 d208b2048fbca19f18949311abbec5fea1080b23 files/dnsmasq-init 612
-SHA256 6f3503921c6b2448cd7013b4428b633143b00816a3b66fcc8774802e2ff9aa48 files/dnsmasq-init 612
+AUX dnsmasq-init 787 RMD160 bc12d2021610f6fe4ab45d7541859b547c26f9e1 SHA1 2d6b681430b99f2d9892e88100feba8dcd2449a7 SHA256 a96729cbee18797fa40549764b38556d9ffb3f6b7d75ea28fcc804be685b9788
+MD5 e3597915d833379350da1feb1229ce36 files/dnsmasq-init 787
+RMD160 bc12d2021610f6fe4ab45d7541859b547c26f9e1 files/dnsmasq-init 787
+SHA256 a96729cbee18797fa40549764b38556d9ffb3f6b7d75ea28fcc804be685b9788 files/dnsmasq-init 787
 AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461d2964dc3f0db777fc26141b07f6f3f5a762 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746
 MD5 5990c2d2cb92209feacf8f3a5a7d0831 files/dnsmasq.confd 140
 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 files/dnsmasq.confd 140
@@ -29,10 +29,10 @@ EBUILD dnsmasq-2.38.ebuild 1530 RMD160 3c7a3c5fa835bfb08b714acfe892791fdc38aca3
 MD5 a0d009326bd6af028be79d7b6331beb0 dnsmasq-2.38.ebuild 1530
 RMD160 3c7a3c5fa835bfb08b714acfe892791fdc38aca3 dnsmasq-2.38.ebuild 1530
 SHA256 b1e39a8124b5907805259fb44b186f2b5da61201cb86137bbd17ea509bc6e3db dnsmasq-2.38.ebuild 1530
-MISC ChangeLog 13998 RMD160 a9b12230db0dc09ee8a84e77abe4924b18e97875 SHA1 c675f35881a34b0c69b1165d67772f809ef0e140 SHA256 d27b23e7dff73e0605c47a370e1054d231467c1207e4dd750959d3ce60a4d4de
-MD5 e2bea2a7e3a4f227f9d8ff80486e7980 ChangeLog 13998
-RMD160 a9b12230db0dc09ee8a84e77abe4924b18e97875 ChangeLog 13998
-SHA256 d27b23e7dff73e0605c47a370e1054d231467c1207e4dd750959d3ce60a4d4de ChangeLog 13998
+MISC ChangeLog 14101 RMD160 1846dd9266a75eeaebd3d132d9adce9df85a34e1 SHA1 d3e8050fb3c5e8dded034ab60dc407cb5a92cb80 SHA256 d5273afb9aea2ecfc40cd14feb5ccbf4bcdca655dcaad3d4199c196abffa13d8
+MD5 d28943bbbdce42521a213d41b520d23c ChangeLog 14101
+RMD160 1846dd9266a75eeaebd3d132d9adce9df85a34e1 ChangeLog 14101
+SHA256 d5273afb9aea2ecfc40cd14feb5ccbf4bcdca655dcaad3d4199c196abffa13d8 ChangeLog 14101
 MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b
 MD5 f115572f9475ea98b22ceeb627ba07f0 metadata.xml 251
 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 metadata.xml 251

diff --git a/net-dns/dnsmasq/files/dnsmasq-init b/net-dns/dnsmasq/files/dnsmasq-init
index c468537f8782331a27f6bb8890af1d0ecc1342f9..e25d45fe21ab9161854e54f475d5ea89ef88f428 100644 (file)
--- a/net-dns/dnsmasq/files/dnsmasq-init
+++ b/net-dns/dnsmasq/files/dnsmasq-init
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init,v 1.8 2006/01/09 12:21:39 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init,v 1.9 2007/02/23 11:09:41 uberlord Exp $
 
-opts="${opts} reload"
+opts="reload"
 
 depend() {
        provide dns
@@ -12,18 +12,22 @@ depend() {
 
 start() {
        ebegin "Starting dnsmasq"
-       /usr/sbin/dnsmasq -x /var/run/dnsmasq.pid ${DNSMASQ_OPTS}
+       start-stop-daemon --start --exec /usr/sbin/dnsmasq \
+           -- pidfile /var/run/dnsmasq.pid \
+           -- -x /var/run/dnsmasq.pid ${DNSMASQ_OPTS}
        eend $?
 }
 
 stop() {
        ebegin "Stopping dnsmasq"
-       start-stop-daemon --stop --quiet --pidfile /var/run/dnsmasq.pid
+       start-stop-daemon --stop --exec /usr/sbin/dnsmasq \
+           --pidfile /var/run/dnsmasq.pid
        eend $?
 }
 
 reload() {
        ebegin "Reloading dnsmasq"
-       kill -HUP $(< /var/run/dnsmasq.pid)
+       start-stop-daemon --stop --oknodo --signal HUP \
+           --exec /usr/sbin/dnsmasq --pidfile /var/run/dnsmasq.pid
        eend $?
 }