diff options
-rw-r--r-- | main/bind/APKBUILD | 18 | ||||
-rw-r--r-- | main/bind/bind.initd | 1 | ||||
-rw-r--r-- | main/busybox-initscripts/APKBUILD | 12 | ||||
-rw-r--r-- | main/busybox-initscripts/cron.initd | 4 | ||||
-rw-r--r-- | main/busybox-initscripts/dnsd.initd | 1 | ||||
-rw-r--r-- | main/busybox-initscripts/httpd.initd | 1 | ||||
-rw-r--r-- | main/busybox-initscripts/inetd.initd | 1 | ||||
-rw-r--r-- | main/busybox-initscripts/rdate.initd | 5 |
8 files changed, 26 insertions, 17 deletions
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD index 22a725acb1..18760fbf78 100644 --- a/main/bind/APKBUILD +++ b/main/bind/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bind pkgver=9.6.1_p1 -pkgrel=0 +pkgrel=1 pkgdesc="BIND - Berkeley Internet Name Domain - Name Server and tools" url="http://www.isc.org" license="as-is" @@ -18,7 +18,7 @@ source="http://ftp.isc.org/isc/bind9/9.6.0-P1/bind-9.6.0-P1.tar.gz $pkgname.127.zone $pkgname.localhost.zone $pkgname.named.ca - $install" + " build() { cd "$srcdir/bind-9.6.0-P1" @@ -55,8 +55,6 @@ build() { make || return 1 make DESTDIR="$pkgdir" install - depends="$depends $pkgname-libs" - install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/named || return 1 install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/named || return 1 install -Dm644 "$srcdir"/$pkgname.conf "$pkgdir"/etc/bind/named.conf || return 1 @@ -69,14 +67,14 @@ build() { } libs() { - install="" + install= mkdir -p "$subpkgdir"/usr mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } tools() { - install="" - depends="$pkgname-libs" + install= + depends= mkdir -p "$subpkgdir"/usr/bin for i in dig host nslookup nsupdate; do mv "$pkgdir"/usr/bin/${i} "$subpkgdir"/usr/bin/ || return 1 @@ -85,11 +83,9 @@ tools() { md5sums="886b7eae55cfdc8cd8d2ca74a2f99c6e bind-9.6.0-P1.tar.gz f270a5b0a28ab6e818840c5c368ddbcc bind.so_bsdcompat.patch -3adc904c1c12f81839d9369f7241022b bind.initd +92914193cc603d8d81ef00534ce9c1c9 bind.initd 8b05a287976d66d51c18b73ee7523671 bind.confd be5fd752bdbd59385f2a559d603098d5 bind.conf a7455b009b7fccd74ac6f6eaa6902a00 bind.127.zone c3220168fabfb31a25e8c3a545545e34 bind.localhost.zone -a94e29ac677846f3d4d618c50b7d34f1 bind.named.ca -d3137e2de6f82acfc914d4916999cf2a bind.pre-install -695c957be18ec4f8ea46d0b1ff50b09b bind.post-install" +a94e29ac677846f3d4d618c50b7d34f1 bind.named.ca" diff --git a/main/bind/bind.initd b/main/bind/bind.initd index 6469ee79ac..3284ec853a 100644 --- a/main/bind/bind.initd +++ b/main/bind/bind.initd @@ -5,6 +5,7 @@ DAEMON=/usr/sbin/$NAME depend() { need net + after firewall use logger provide dns } diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD index 980912814d..f9a5d6e684 100644 --- a/main/busybox-initscripts/APKBUILD +++ b/main/busybox-initscripts/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox-initscripts pkgver=2.0 -pkgrel=6 +pkgrel=7 pkgdesc="Init scripts for busybox daemons" url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts" license="GPL-2" @@ -40,14 +40,14 @@ EOF } md5sums="baa44c026a4c9468b01ec2771d76db19 acpid.initd -131e46b2853439f436bc377a5473273f cron.initd -3af526f4de1a607f7932a15f7c8e8eb1 dnsd.initd -f7daf05f9984aa398fdbd3fe02e82678 httpd.initd -dad8e381142dfb42483de324aff4cf28 inetd.initd +90027316d98b5b97cc3bf3a7c7ad3f7c cron.initd +dad20779adfb4b85b57b45c7c903a636 dnsd.initd +4f8f9a7028a429c50740c09fcb2a1871 httpd.initd +32315991b16a03a42a8cdd64f064ccc2 inetd.initd a5f2bb75d70d238bd534ccc57b643e90 klogd.initd 12379687c0cfb5446e0cfc20bd6992bb mdev-mount.initd ef3e93fe17964dd600364b1340654b5b mdev.initd -533288e7df1fdfc029b1048b8e6c770f rdate.initd +c01dc869cbdd68e86e64a35ccc1e885e rdate.initd b5b23dd06cea120bd8d850b54bca0b59 syslog.initd 254186e513ff9fb9ede6a2e92257b247 watchdog.initd 8ddb8d040c9c7a32c63039a2c80ff496 cron.confd diff --git a/main/busybox-initscripts/cron.initd b/main/busybox-initscripts/cron.initd index 0486a3acd3..40d16b640a 100644 --- a/main/busybox-initscripts/cron.initd +++ b/main/busybox-initscripts/cron.initd @@ -1,5 +1,9 @@ #!/sbin/runscript +depend() { + need localmount +} + start() { ebegin "Starting busybox cron" start-stop-daemon --start --exec /usr/sbin/crond -- $CRON_OPTS diff --git a/main/busybox-initscripts/dnsd.initd b/main/busybox-initscripts/dnsd.initd index 8d625f9e5e..e11a73d1d6 100644 --- a/main/busybox-initscripts/dnsd.initd +++ b/main/busybox-initscripts/dnsd.initd @@ -2,6 +2,7 @@ depend() { need net + after firewall } start() { diff --git a/main/busybox-initscripts/httpd.initd b/main/busybox-initscripts/httpd.initd index 7f114e650c..0737cfe19a 100644 --- a/main/busybox-initscripts/httpd.initd +++ b/main/busybox-initscripts/httpd.initd @@ -4,6 +4,7 @@ DAEMON=/usr/sbin/httpd depend() { need net + after firewall } start() { diff --git a/main/busybox-initscripts/inetd.initd b/main/busybox-initscripts/inetd.initd index b5cf9d7d3e..744c393aa8 100644 --- a/main/busybox-initscripts/inetd.initd +++ b/main/busybox-initscripts/inetd.initd @@ -2,6 +2,7 @@ depend() { need net + after firewall } start() { diff --git a/main/busybox-initscripts/rdate.initd b/main/busybox-initscripts/rdate.initd index 3e6c6582c9..3d31de855d 100644 --- a/main/busybox-initscripts/rdate.initd +++ b/main/busybox-initscripts/rdate.initd @@ -1,5 +1,10 @@ #!/sbin/runscript +depend() { + need net + after firewall +} + start() { if [ -z "$NTP_HOST" ] ; then eerror "Please set NTP_HOST in /etc/conf.d/rdate" |