main/dnsmasq: improve runscript and abuild, enable conf-dir

3 files changed, 48 insertions, 48 deletions

diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index ee9c814bbf..9a4ca4fb80 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -1,50 +1,51 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dnsmasq
 pkgver=2.76
-pkgrel=0
-pkgdesc="Small forwarding DNS server"
+pkgrel=1
+pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
 url="http://www.thekelleys.org.uk/dnsmasq/"
 arch="all"
 license="GPL2"
-depends=
+depends=""
 makedepends="linux-headers"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-doc"
 source="http://www.thekelleys.org.uk/dnsmasq/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd
+	uncomment-conf-dir.patch
 	"
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	sed -i -e 's/^AWK.*/AWK = awk/' Makefile
-	make PREFIX=/usr \
-		CFLAGS="$CFLAGS" \
-		DBUS_LIBS= \
-		DBUS_CFLAGS= \
-		DBUS_MINOR= \
-		all || return 1
+	cd "$builddir"
+	make PREFIX=/usr CFLAGS="$CFLAGS" all || return 1
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make PREFIX=/usr \
-		DESTDIR="$pkgdir" \
-		DBUS_LIBS= \
-		DBUS_CFLAGS= \
-		DBUS_MINOR= \
-		install
-	install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-	install dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf
+	cd "$builddir"
+
+	make PREFIX=/usr DESTDIR="$pkgdir" install || return 1
+
+	install -D -m755 "$srcdir"/$pkgname.initd \
+		"$pkgdir"/etc/init.d/$pkgname || return 1
+
+	install -D -m644 "$srcdir"/$pkgname.confd \
+		"$pkgdir"/etc/conf.d/$pkgname || return 1
+
+	install -m644 dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf || return 1
+	install -d -m755 "$pkgdir"/etc/dnsmasq.d
 }
 
 md5sums="6610f8233ca89b15a1bb47c788ffb84f  dnsmasq-2.76.tar.gz
-bfc91bcb341fd6d0f50eaeca1bb31cb0  dnsmasq.initd
-16985abb08c8e11f85e38b37ea3863a4  dnsmasq.confd"
+f8ac1192164af3dfbc06499f53aa4831  dnsmasq.initd
+16985abb08c8e11f85e38b37ea3863a4  dnsmasq.confd
+9a224e79a0be715bee519af93da0a81a  uncomment-conf-dir.patch"
 sha256sums="777c4762d2fee3738a0380401f2d087b47faa41db2317c60660d69ad10a76c32  dnsmasq-2.76.tar.gz
-9105043609236d774c1f502c309b56cbc669ce0b5e39b424789bbf55f0842037  dnsmasq.initd
-51c0672a70d5d6793d295d82db666d372fb081e8627318f67c88e48d08d254b5  dnsmasq.confd"
+deeea140ea362d330fd509755556f3e1322f37b3dbe91f01003c4d1772220264  dnsmasq.initd
+51c0672a70d5d6793d295d82db666d372fb081e8627318f67c88e48d08d254b5  dnsmasq.confd
+c1ec96b6001c5873992eb612a560995b2a8be441fe23ce6bc52119c651b2943c  uncomment-conf-dir.patch"
 sha512sums="c22627a8d864671096d3b3428ec4f879b513e1f1e7f79be3ab89444c56234e748fbfa6b6b4f9e521984fea95d363f4aa2ca6243f0dfc12ffb74bed0648ae21c5  dnsmasq-2.76.tar.gz
-a7c44bd4c7d04d881e561288ee4979378ee0cd72a812a5dc33a040aea40374a2cbcafb1b3b2a6fa07291ee0831b7d421f7a8749289213fe1fb3205163980bfa5  dnsmasq.initd
-9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8  dnsmasq.confd"
+6927ba31be547f02720093c9bbf3c3c978a71882849c7ed779d0239cc7629ca7ea5ed55acd7ef104f2853677ee9c746b6fa2b28bff03430bf8d5cef103b29b96  dnsmasq.initd
+9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8  dnsmasq.confd
+d01077f39e1240041a6700137810f254daf683b2d58dafecb6b162e94d694992e57d45964a57993b298f97c2b589eedcf9fb1506692730a38b7f06b5f55ba8d8  uncomment-conf-dir.patch"
diff --git a/main/dnsmasq/dnsmasq.initd b/main/dnsmasq/dnsmasq.initd
index 0ebcb3cfc6..4e035c2dd9 100644
--- a/main/dnsmasq/dnsmasq.initd
+++ b/main/dnsmasq/dnsmasq.initd
@@ -1,12 +1,15 @@
 #!/sbin/openrc-run
-# Copyright 1999-2011 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-r1,v 1.2 2011/12/04 10:28:47 swegener Exp $
 
-description="Lightweight DNS, TFTP, PXE, router advertisement and DHCP server"
-description_reload="Clear cache and reload hosts files"
+description="A lightweight DNS, DHCP, RA, TFTP and PXE server"
 
 extra_started_commands="reload"
+description_reload="Clear cache and reload hosts files"
+
+command="/usr/sbin/dnsmasq"
+# Tell dnsmasq to not create pidfile, that's responsibility of init system.
+command_args="-k --pid-file= $DNSMASQ_OPTS"
+command_background="yes"
+pidfile="/run/dnsmasq.pid"
 
 depend() {
 	provide dns
@@ -15,24 +18,12 @@ depend() {
 	use logger
 }
 
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/sbin/dnsmasq \
-	    --pidfile /var/run/dnsmasq.pid \
-	    -- -x /var/run/dnsmasq.pid ${DNSMASQ_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/sbin/dnsmasq \
-	    --pidfile /var/run/dnsmasq.pid
-	eend $?
+start_pre() {
+	checkpath -m 0644 -o dnsmasq:dnsmasq -f /var/lib/misc/dnsmasq.leases
 }
 
 reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --stop --oknodo --signal HUP \
-	    --exec /usr/sbin/dnsmasq --pidfile /var/run/dnsmasq.pid
+	ebegin "Reloading $SVCNAME"
+	kill -HUP "$(cat $pidfile)"
 	eend $?
 }
diff --git a/main/dnsmasq/uncomment-conf-dir.patch b/main/dnsmasq/uncomment-conf-dir.patch
new file mode 100644
index 0000000000..612a004732
--- /dev/null
+++ b/main/dnsmasq/uncomment-conf-dir.patch
@@ -0,0 +1,8 @@
+--- a/dnsmasq.conf.example	2016-08-02 11:30:24.207034952 +0200
++++ b/dnsmasq.conf.example	2016-08-02 11:30:34.094695721 +0200
+@@ -663,4 +663,4 @@
+ #conf-dir=/etc/dnsmasq.d,.bak
+ 
+ # Include all files in a directory which end in .conf
+-#conf-dir=/etc/dnsmasq.d/,*.conf
++conf-dir=/etc/dnsmasq.d/,*.conf