diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2009-06-05 11:03:14 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-06-05 11:03:14 +0000 |
commit | 4525778374574353c36d99a880c73314308d545c (patch) | |
tree | e9f5fcf3898f0a2eaa3f077c7a480db553b48f91 /extra/djbdns | |
parent | ab05e4a8cd09cac121bf397d2e894dae123e9236 (diff) | |
download | aports-4525778374574353c36d99a880c73314308d545c.tar.bz2 aports-4525778374574353c36d99a880c73314308d545c.tar.xz |
extra/acf-alpine-baselayout: upgrade to 0.5.0
Diffstat (limited to 'extra/djbdns')
-rw-r--r-- | extra/djbdns/APKBUILD | 6 | ||||
-rwxr-xr-x | extra/djbdns/tinydns.initd | 31 |
2 files changed, 10 insertions, 27 deletions
diff --git a/extra/djbdns/APKBUILD b/extra/djbdns/APKBUILD index 10de879793..bf75eca1ec 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 396b8ab33b..a68474c4ec 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 $? } |