extra/acf-alpine-baselayout: upgrade to 0.5.0

3 files changed, 13 insertions, 30 deletions

diff --git a/extra/acf-alpine-baselayout/APKBUILD b/extra/acf-alpine-baselayout/APKBUILD
index ad95472d..77625ae0 100644
--- a/extra/acf-alpine-baselayout/APKBUILD
+++ b/extra/acf-alpine-baselayout/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-alpine-baselayout
-pkgver=0.4.12
+pkgver=0.5.0
 pkgrel=0
 pkgdesc="A web-based system administration interface for alpine-baselayout"
-url="http://dev.alpinelinux.org/alpine/acf"
+url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout/"
 license="GPL-2"
 depends="acf-core json4lua lua luaposix"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
@@ -12,4 +12,4 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="9a492c3e2a2491dc2e451286ce297db9  acf-alpine-baselayout-0.4.12.tar.bz2"
+md5sums="5b5c503f3350c5ef9f4cf5be81719e4e  acf-alpine-baselayout-0.5.0.tar.bz2"
diff --git a/extra/djbdns/APKBUILD b/extra/djbdns/APKBUILD
index 10de8797..bf75eca1 100644
--- a/extra/djbdns/APKBUILD
+++ b/extra/djbdns/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=djbdns
 pkgver=1.05
-pkgrel=25
+pkgrel=26
 pkgdesc="Excellent high-performance DNS services"
 url="http://cr.yp.to/djbdns.html"
 license="public-domain"
-depends="uclibc"
+depends=
 subpackages="tinydns dnscache"
 source="http://cr.yp.to/djbdns/$pkgname-$pkgver.tar.gz
 	headtail.patch
@@ -79,7 +79,7 @@ dfd675b2775efcbb604413a84db8bf1a  dnsroots.patch
 c7be73fe2fb4ae02d5096fa2c1f55a68  1.05-errno.patch
 1292500c04baba3995d9753fe40fdc94  1.05-response.patch
 7695bf50559c09798ec852b578ac8698  tinydns.pre-install
-39622a5eaaf9b6c6a461dfb10b7951a3  tinydns.initd
+d21c058c394145c3d8d10038b34ae140  tinydns.initd
 7dcf6674c07d46c736b3c25d9c92384a  tinydns.confd
 e09c3a6ba6917e16f4736ab5c070dbe9  dnscache.pre-install
 e368a86ddc320937d663dd47684ba410  dnscache.initd
diff --git a/extra/djbdns/tinydns.initd b/extra/djbdns/tinydns.initd
index 396b8ab3..a68474c4 100755
--- a/extra/djbdns/tinydns.initd
+++ b/extra/djbdns/tinydns.initd
@@ -5,8 +5,6 @@
 opts="reload"
 
 # -- Statrup variables 
-UID=$( grep tinydns /etc/passwd | cut -f3 -d: )
-GID=$( grep tinydns /etc/group | cut -f3 -d: )
 DAEMON=/usr/bin/tinydns
 COMPILER=/usr/bin/tinydns-data
 
@@ -26,6 +24,9 @@ fi
 # Main program
 reload() {
 	local rc opwd="$opwd"
+	UID=$( grep tinydns /etc/passwd | cut -f3 -d: )
+	GID=$( grep tinydns /etc/group | cut -f3 -d: )
+
 	# Create the $ROOT directory if necessary
 	if [ ! -d "$ROOT" ]; then
 		mkdir -p "$ROOT"
@@ -67,38 +68,20 @@ start() {
 		return 1
 	fi
 	
-	# if its already running, just report it is
-	if [ -e ${VARRUN}.pid ] && [ -d /proc/$( cat ${VARRUN}.pid ) ]; then
-		eend 0
-		return 0
-	fi
-
 	if [ -z "$IP" ]; then
 		eend 1 "IP is not specified in /etc/conf.d/$SVCNAME"
 		return 1
 	fi
 	
-	(
-		export UID GID ROOT IP
-		$DAEMON >/dev/null 2>/dev/null &
-		pid=$!
-		sleep 1
-		# Check if its still running
-		if ! [ -d /proc/$pid ]; then
-			rm ${VARRUN}.pid
-			$DAEMON
-			return 1
-		fi
-		echo $pid > ${VARRUN}.pid
-	)
+	start-stop-daemon --start --env "UID=$UID" --env "GID=$GID" \
+		--env "ROOT=$ROOT" --env "IP=$IP" --pidfile ${VARRUN}.pid \
+		--background --make-pidfile --exec $DAEMON 
 	eend $?
-	return 0
 }
 
 stop() {
 	ebegin "Stopping tinydns"
-	start-stop-daemon --stop --pidfile ${VARRUN}.pid  --oknodo \
-		--exec $DAEMON && rm ${VARRUN}.pid
+	start-stop-daemon --stop --pidfile ${VARRUN}.pid --exec $DAEMON
 	eend $?
 }