init script tweaks, bug 43978

5 files changed, 59 insertions, 8 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index c9b4d384cc13..7fbd4051f151 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.23 2004/02/27 20:49:29 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.24 2004/03/09 19:39:54 avenj Exp $
+
+*dnsmasq-2.2-r1 (09 Mar 2004)
+
+  09 Mar 2004; Jon Portnoy <avenj@gentoo.org> dnsmasq-2.2-r1.ebuild,
+  files/dnsmasq-init :
+  init.d tweaks from Seemant (#43978) to make the DHCP daemon work
+  properly.
 
   27 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org> dnsmasq-2.2.ebuild:
   Moving 2.x to stable on sparc, as 1.x is flaky on some boxes
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index e6c44a75da05..294e568182a5 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,8 +1,10 @@
-MD5 0964af480971996b3b34dcebd832b557 ChangeLog 2743
+MD5 1810d51de3259e04992f7fab3665929c ChangeLog 2946
+MD5 4294f79235823494f12f7f14e9926211 dnsmasq-2.2-r1.ebuild 964
 MD5 c1439e462802c578708845e5d52ce834 dnsmasq-1.18.ebuild 854
-MD5 4294f79235823494f12f7f14e9926211 dnsmasq-2.2.ebuild 964
 MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
+MD5 4294f79235823494f12f7f14e9926211 dnsmasq-2.2.ebuild 964
+MD5 479deaff1695c413df3b06cf45d3f610 files/digest-dnsmasq-2.2-r1 62
 MD5 d5e8dd3af7d243913de2c5a9624d6fc2 files/digest-dnsmasq-1.18 63
-MD5 c132959cadc793861366b6b45babcb23 files/dnsmasq-init 558
+MD5 d5d441d206a0f920d2529ec88b6a3063 files/dnsmasq-init 510
 MD5 16d59635b60089542c398b2b76af09de files/dnsmasq.confd 348
 MD5 479deaff1695c413df3b06cf45d3f610 files/digest-dnsmasq-2.2 62
diff --git a/net-dns/dnsmasq/dnsmasq-2.2-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.2-r1.ebuild
new file mode 100644
index 000000000000..59cc13f7bc5f
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.2-r1.ebuild,v 1.1 2004/03/09 19:39:54 avenj Exp $
+
+DESCRIPTION="Small forwarding DNS server for local networks"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
+
+MY_P="${P/_/}"
+MY_PV="${PV/_rc*/}"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc sparc ~ia64 ~amd64 ~mips"
+
+DEPEND="virtual/glibc
+		>=sys-apps/sed-4"
+
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i "s:-O2:\"${CFLAGS}\":" Makefile
+	sed -i "s:-O2:\"${CFLAGS}\":" src/Makefile
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dosbin src/dnsmasq
+	doman dnsmasq.8
+	dodoc CHANGELOG COPYING FAQ
+	dohtml *.html
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/dnsmasq-init dnsmasq
+	insinto /etc/conf.d
+	newins ${FILESDIR}/dnsmasq.confd dnsmasq
+}
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.2-r1 b/net-dns/dnsmasq/files/digest-dnsmasq-2.2-r1
new file mode 100644
index 000000000000..f8f2f1d52232
--- /dev/null
+++ b/net-dns/dnsmasq/files/digest-dnsmasq-2.2-r1
@@ -0,0 +1 @@
+MD5 577852d339f6adfd15a04e31fbd39e55 dnsmasq-2.2.tar.gz 84682
diff --git a/net-dns/dnsmasq/files/dnsmasq-init b/net-dns/dnsmasq/files/dnsmasq-init
index 4b8d6e6c9bb2..aafea0c57a5b 100644
--- a/net-dns/dnsmasq/files/dnsmasq-init
+++ b/net-dns/dnsmasq/files/dnsmasq-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init,v 1.4 2004/03/04 19:17:26 vapier Exp $
+# 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.5 2004/03/09 19:39:54 avenj Exp $
 
 depend() {
 	provide dns
@@ -10,8 +10,7 @@ depend() {
 
 start() {
 	ebegin "Starting dnsmasq"
-	start-stop-daemon --start --quiet --exec /usr/sbin/dnsmasq \
-		-- -x /var/run/dnsmasq.pid ${DNSMASQ_OPTS}
+	/usr/sbin/dnsmasq -x /var/run/dnsmasq.pid ${DNSMASQ_OPTS}
 	eend $?
 }