Merge branch 'master' of git://git.alpinelinux.org/aports

82 files changed, 176 insertions, 147 deletions

diff --git a/main/arpon/APKBUILD b/main/arpon/APKBUILD
index 5d1e8da0ca..a18f88c3ea 100644
--- a/main/arpon/APKBUILD
+++ b/main/arpon/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=arpon
 pkgver=1.90
-pkgrel=0
+pkgrel=1
 pkgdesc="Arp handler inspectiON is a handler daemon with tools to handle all ARP aspects"
 url="http://arpon.sourceforge.net/"
 license="GPL"
@@ -30,5 +30,5 @@ build() {
 }
 
 md5sums="41671d58190cf829b7c9049ae3fa8cdf  ArpON-1.90.tar.gz
-92e60e8b86f87b772b8e198db3829c09  arpon.initd
+4bf2cb423936b1ca84773fe6b7baaa73  arpon.initd
 26986bed19b28cec66ed08447d22efaf  arpon.confd"
diff --git a/main/arpon/arpon.initd b/main/arpon/arpon.initd
index 8a949a9bf0..5042501d68 100644
--- a/main/arpon/arpon.initd
+++ b/main/arpon/arpon.initd
@@ -5,6 +5,7 @@ DAEMON=/usr/sbin/$NAME
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index ed18e59661..ff97c65b20 100644
--- a/main/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
-# Maintainer: 
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=arpwatch
 pkgver=2.1a15
-pkgrel=0
+pkgrel=1
 pkgdesc="Ethernet monitoring program"
 url="http://www-nrg.ee.lbl.gov/"
 license="GPL"
-depends="uclibc libpcap"
+depends=
 makedepends="libpcap-dev"
 install=
 subpackages=""
@@ -33,4 +33,4 @@ build() {
 
 md5sums="cebfeb99c4a7c2a6cee2564770415fe7  arpwatch.tar.gz
 dc8300ce5f02d6be95899a2982397064  arpwatch.confd
-404226ad0d10ce9b46b76f058e572426  arpwatch.initd"
+51ecada198c4f954ac4d5f5903198ebb  arpwatch.initd"
diff --git a/main/arpwatch/arpwatch.initd b/main/arpwatch/arpwatch.initd
index e039e1db8a..b97c25a9c8 100644
--- a/main/arpwatch/arpwatch.initd
+++ b/main/arpwatch/arpwatch.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index bcb5464a46..657f61714f 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
 pkgver=1.6.0.15
-pkgrel=0
+pkgrel=1
 pkgdesc="Asterisk: A Module Open Source PBX System"
 url="http://www.asterisk.org/"
 license="GPL"
@@ -94,6 +94,6 @@ b00c9d98ce2ad445501248a197c6e436  100-uclibc-daemon.patch
 97b39fd9777a2521d4f9f095482b7ac2  102-gsm-pic.patch
 5008f51c737ec91f5047519bc9f25b85  103-rundir.patch
 57825b74526187075ff7cb6816c55467  201-incomplete.patch
-c618b7fdf4a9edf4cde6d8ccd1e32ee6  asterisk.initd
+0ce3219e05f55af884a7dc6b99c2b276  asterisk.initd
 ed31d7ba37bcf8b0346dcf8593c395f0  asterisk.confd
 3e65172275684373e1a25c8a11224411  asterisk.logrotate"
diff --git a/main/asterisk/asterisk.initd b/main/asterisk/asterisk.initd
index 864a96b3cf..284898ae22 100644
--- a/main/asterisk/asterisk.initd
+++ b/main/asterisk/asterisk.initd
@@ -4,6 +4,7 @@ opts="${opts} forcestop reload"
 
 depend() {
 	need net
+	after firewall
 	use nscd dns zaptel mysql postgresql slapd capi
 }
 
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"
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index a625e6959a..280e110e06 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=chrony
 pkgver=1.23
-pkgrel=3
+pkgrel=4
 pkgdesc="NTP client and server programs"
 url="http://chrony.sunsite.dk/"
 license="GPL-2"
@@ -57,6 +57,6 @@ d47015a34b6b2f9eebca77ef939cec72  chrony-1.21-makefile.diff
 39cbce9f66638b67623e1ee6bb0f943f  chrony-1.23-sources.diff
 caa6589a1a1cd56f64957e312d1ef84c  chrony-1.23-reply-ip.diff
 d5c09be46226774d22c08c5a4c28093a  chronyd.confd
-dac8aa4913d7c323abfa1719ddd7e5e4  chronyd.initd
+348532411bb4b7139a0609676e15da66  chronyd.initd
 468eaf2b5465d60b3ee021ce3f948ab1  chrony.logrotate
 46f42c52953d398ca44d6baa449618d7  chrony.conf"
diff --git a/main/chrony/chronyd.initd b/main/chrony/chronyd.initd
index 49d7526bb5..457c1ef382 100644
--- a/main/chrony/chronyd.initd
+++ b/main/chrony/chronyd.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net
+	after firewall
 	use dns
 }
 
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index a4daebc2ff..79bfb9e8b8 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=clamav
 pkgver=0.95.2
-pkgrel=0
+pkgrel=1
 pkgdesc="An anti-virus toolkit for UNIX"
 url="http://www.clamav.net/"
 license="GPL"
@@ -17,7 +17,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	freshclam.confd
 	clamav-0.95.1-nls.patch
 	clamav.logrotate
-	$install"
+	"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -61,12 +61,9 @@ build() {
 }
 
 md5sums="930362397d30e01ba81b5f24c1046d48  clamav-0.95.2.tar.gz
-adbbfa835f9dea213289719d983f1600  clamd.initd
+d64432c463850663c5041c3097f3e903  clamd.initd
 567bc32b657dd7031b9b7beaa946203a  clamd.confd
-f43b987a0c37e6576face04a830263ac  freshclam.initd
+f4d1f415322905128dc27135566ad136  freshclam.initd
 e48466ddfb56f66c623b83e58777b778  freshclam.confd
 0d08fd29656bd4b018ecf8ce9706ac55  clamav-0.95.1-nls.patch
-dffa5af2e7a563fc00fcd52ec4c02347  clamav.logrotate
-275e05587e2da782781829a1862d57b1  clamav.pre-install
-ec4d600097a15e64dfb714e7739a1804  clamav.post-install
-c9e80578c6e82d6154bc91f18dfd23ea  clamav.pre-upgrade"
+dffa5af2e7a563fc00fcd52ec4c02347  clamav.logrotate"
diff --git a/main/clamav/clamd.initd b/main/clamav/clamd.initd
index d3b9155572..2864267e1e 100644
--- a/main/clamav/clamd.initd
+++ b/main/clamav/clamd.initd
@@ -6,6 +6,7 @@ CONF=/etc/clamav/clamd.conf
 
 depend() {
 	need net
+	after firewall
 	provide antivirus
 }
 
diff --git a/main/clamav/freshclam.initd b/main/clamav/freshclam.initd
index 7961c7f807..f25fec434d 100644
--- a/main/clamav/freshclam.initd
+++ b/main/clamav/freshclam.initd
@@ -8,6 +8,7 @@ CONF=/etc/clamav/freshclam.conf
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/clamsmtp/APKBUILD b/main/clamsmtp/APKBUILD
index 1049f271b5..5fefb2f81f 100644
--- a/main/clamsmtp/APKBUILD
+++ b/main/clamsmtp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=clamsmtp
 pkgver=1.10
-pkgrel=4
+pkgrel=5
 pkgdesc="An SMTP Virus Filter"
 url="http://memberwebs.com/stef/software/clamsmtp/"
 license="as-is"
@@ -13,7 +13,7 @@ subpackages="$pkgname-doc"
 source="http://memberwebs.com/stef/software/clamsmtp/${pkgname}-${pkgver}.tar.gz
 	clamsmtpd.confd
 	clamsmtpd.initd
-	$install"
+	"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -33,6 +33,4 @@ build() {
 
 md5sums="b068ba6e444859782bbdd88f290c1abf  clamsmtp-1.10.tar.gz
 e84205681f64c07af9ec5b6a3dd8bc38  clamsmtpd.confd
-161baf2fb444b67d8a08fbfe4375a12c  clamsmtpd.initd
-32e7b12f3a1f4669d080d8cfdb537e78  clamsmtp.pre-upgrade
-63c7360d9a0a75433bca461fe819bc49  clamsmtp.post-upgrade"
+d34b382f2b4b3bc2497eb05f16cfc1ba  clamsmtpd.initd"
diff --git a/main/clamsmtp/clamsmtpd.initd b/main/clamsmtp/clamsmtpd.initd
index dbd817f370..9be17d0959 100644
--- a/main/clamsmtp/clamsmtpd.initd
+++ b/main/clamsmtp/clamsmtpd.initd
@@ -5,6 +5,7 @@ DAEMON=/usr/sbin/$NAME
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index 5499931419..5ed2b0709e 100644
--- a/main/conntrack-tools/APKBUILD
+++ b/main/conntrack-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=conntrack-tools
 pkgver=0.9.13
-pkgrel=0
+pkgrel=1
 pkgdesc="Connection tracking userspace tools"
 url="http://conntrack-tools.netfilter.org"
 license="GPL-2"
@@ -24,5 +24,5 @@ build() {
 	install -Dm644 doc/stats/conntrackd.conf "$pkgdir"/etc/conntrackd
 }
 md5sums="bd0e2149a1626071db83c4f9714e0556  conntrack-tools-0.9.13.tar.bz2
-144831a8a79561ef184b84ba94f0837b  conntrackd.initd
+a97e0b7f1339d93caf929fb4767141e1  conntrackd.initd
 8ebf3838b69d20e6bb4a173844502039  conntrackd.confd"
diff --git a/main/conntrack-tools/conntrackd.initd b/main/conntrack-tools/conntrackd.initd
index 9394badca1..e307a347ec 100644
--- a/main/conntrack-tools/conntrackd.initd
+++ b/main/conntrack-tools/conntrackd.initd
@@ -9,6 +9,7 @@ CONNTRACKD_LOCK=${CONNTRACKD_LOCK:-/var/lock/conntrack.lock}
 depend() {
 	use logger
 	need net
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 4e9075769a..b50164653d 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cyrus-sasl
 pkgver=2.1.23
-pkgrel=0
+pkgrel=1
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
 url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc libsasl"
-depends="db openssl uclibc libsasl"
+depends=
 makedepends="db-dev openssl-dev"
-#install=libsasl.install
 source="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$pkgname-$pkgver.tar.gz
 	saslauthd.initd
 	cyrus-sasl-2.1.19-checkpw.c.patch
@@ -43,13 +42,13 @@ build ()
 }
 
 libsasl() {
-	depends="uclibc db"	
+	depends=
 	pkgdesc="Cyrus Simple Authentication and Security Layer (SASL) library"
 	mkdir -p "$subpkgdir"/usr
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
 }
 
 md5sums="2eb0e48106f0e9cd8001e654f267ecbc  cyrus-sasl-2.1.23.tar.gz
-9045c1b9c79a6ae0727b31e602d098ad  saslauthd.initd
+ba499a13d8d08d1b97bb0d5cb0b01bcc  saslauthd.initd
 e27ddff076342e7a3041c4759817d04b  cyrus-sasl-2.1.19-checkpw.c.patch
 71a3b7454f4d7cc2966b347bdf03f2fc  db-4.7.patch"
diff --git a/main/cyrus-sasl/saslauthd.initd b/main/cyrus-sasl/saslauthd.initd
index a5e9a44061..f06161eb96 100644
--- a/main/cyrus-sasl/saslauthd.initd
+++ b/main/cyrus-sasl/saslauthd.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/dansguardian/APKBUILD b/main/dansguardian/APKBUILD
index 81505f9463..47fd41688a 100644
--- a/main/dansguardian/APKBUILD
+++ b/main/dansguardian/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dansguardian
 pkgver=2.10.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Web content filter"
 url="http://dansguardian.org"
 license="GPL"
@@ -42,6 +42,6 @@ build() {
 }
 
 md5sums="0987a1c9bfbdf398118386f10279611a  dansguardian-2.10.1.1.tar.gz
-0c04f74cd5db9fc7a8e80b407ec34214  dansguardian.initd
+c307df7e0aba114cb6199bad48a0416a  dansguardian.initd
 85b6de01c9508e8ceff5ebb55752f8d3  dansguardian.logrotate
 475c46026e8553181d293d5a4feaf6d9  ftp-credential.patch"
diff --git a/main/dansguardian/dansguardian.initd b/main/dansguardian/dansguardian.initd
index e8f8e94cc3..565c1632a7 100644
--- a/main/dansguardian/dansguardian.initd
+++ b/main/dansguardian/dansguardian.initd
@@ -7,6 +7,7 @@ opts="{$opts} reload"
 
 depend() {
 	need net
+	after firewall
 	use dns \
 		squid apache2 bfilter mman junkbuster oops polipo privoxy tinyproxy wwwoffled
 }
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 4eba406b9f..dd268479bf 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=dhcp
 pkgver=4.1.0_p1
 _realver=4.1.0p1
-pkgrel=3
+pkgrel=4
 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
 url="https://www.isc.org/"
 license="GPL"
@@ -52,4 +52,4 @@ dhclient() {
 md5sums="325ff8338c5a21f89d5304ac13ffebdf  dhcp-4.1.0p1.tar.gz
 37abf1fb047a353e91b022fafdabf39a  linux_ipv6_discover.patch
 df32707f5bbe5363306420b5dc6e6b40  dhcpd.confd
-6ed5ddba2b445ef60d27a8b7f5a0ee0b  dhcpd.initd"
+be2259371681bd4ab8a577b1b1a989ae  dhcpd.initd"
diff --git a/main/dhcp/dhcpd.initd b/main/dhcp/dhcpd.initd
index 82cb26e779..447578c907 100644
--- a/main/dhcp/dhcpd.initd
+++ b/main/dhcp/dhcpd.initd
@@ -9,6 +9,7 @@ DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpd.conf}
 
 depend() {
 	need net
+	after firewall
 	use logger dns
 }
 
diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD
index 002885ea05..27803991d9 100644
--- a/main/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=distcc
 pkgver=3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A distributed C, C++, Obj C compiler"
 url="http://distcc.org"
 license="GPL-2"
-depends="popt"
-makedepends="popt-dev"
+depends=
+makedepends="popt-dev python-dev"
 source="http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2
 	distcc-3.1-clone.patch
 	distcc-hardened.patch
 	distccd.initd distccd.confd"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-python"
 
 build () 
 { 
@@ -39,8 +39,14 @@ build ()
 	ln -sf /usr/bin/$pkgname "$d"/cpp
 }
 
+python() {
+	pkgdesc="Python bindings to distcc"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
+}
+
 md5sums="a1a9d3853df7133669fffec2a9aab9f3  distcc-3.1.tar.bz2
 29fe296aa2985eea7af7402f421db187  distcc-3.1-clone.patch
 351ca958ff4869f8a2795d8ca6647de1  distcc-hardened.patch
-5cf566965873279fedc16934a2ba6cd0  distccd.initd
+a0dc869866f17054142c964d29925e70  distccd.initd
 e9e0ccc9f5813b9c3c88c8687b2ebc73  distccd.confd"
diff --git a/main/distcc/distccd.initd b/main/distcc/distccd.initd
index c1490fae31..5d90cfb9b9 100644
--- a/main/distcc/distccd.initd
+++ b/main/distcc/distccd.initd
@@ -7,6 +7,7 @@ depend() {
 	[ ${DISTCCD_AVAHI} = yes ] && avahi="avahi-daemon"
 #endif
 	need net ${avahi}
+	after firewall
 	use ypbind
 }
 
diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD
index 5210cb2a21..dd8010c0a5 100644
--- a/main/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=djbdns
 pkgver=1.05
-pkgrel=30
+pkgrel=31
 pkgdesc="Excellent high-performance DNS services"
 url="http://cr.yp.to/djbdns.html"
 license="public-domain"
@@ -74,13 +74,13 @@ dnscache() {
 	
 md5sums="3147c5cd56832aa3b41955c7a51cbeb2  djbdns-1.05.tar.gz
 0d2adaf9f1626043e8702b825cdccdd6  headtail.patch
-dfd675b2775efcbb604413a84db8bf1a  dnsroots.patch
+7565048ebc981238879122c7f88cc143  dnsroots.patch
 6fe7f473233f1c86b76261afd8345bf0  dnstracesort.patch
 c7be73fe2fb4ae02d5096fa2c1f55a68  1.05-errno.patch
 1292500c04baba3995d9753fe40fdc94  1.05-response.patch
 7695bf50559c09798ec852b578ac8698  tinydns.pre-install
-acf2f1689e299320d6670c491f4d4e97  tinydns.initd
+3f4cd61c41f760c3007a8b09a4da091f  tinydns.initd
 7dcf6674c07d46c736b3c25d9c92384a  tinydns.confd
 e09c3a6ba6917e16f4736ab5c070dbe9  dnscache.pre-install
-745220591c11b27cf20df0509e2ae9c8  dnscache.initd
+ec15af30819b9e146f86223753b367a0  dnscache.initd
 e2938593277d7a87806e70e145a90c3f  dnscache.confd"
diff --git a/main/djbdns/dnscache.initd b/main/djbdns/dnscache.initd
index d7415da0f4..3e88e3a426 100755
--- a/main/djbdns/dnscache.initd
+++ b/main/djbdns/dnscache.initd
@@ -9,6 +9,7 @@ PIDFILE=/var/run/dnscache.pid
 
 depend() {
 	need net
+	after firewall
 	provide dns
 }
 
diff --git a/main/djbdns/dnsroots.patch b/main/djbdns/dnsroots.patch
index 5db44ec8f4..1b3045853e 100644
--- a/main/djbdns/dnsroots.patch
+++ b/main/djbdns/dnsroots.patch
@@ -1,5 +1,6 @@
---- djbdns-1.05.old/dnsroots.global.old	Fri May 31 19:42:37 2002
-+++ djbdns-1.05/dnsroots.global	Thu Jan 29 21:41:56 2004
+diff -ur a/dnsroots.global b/dnsroots.global
+--- a/dnsroots.global	2009-09-15 12:31:25.000000000 +0000
++++ b/dnsroots.global	2009-09-15 12:31:51.000000000 +0000
 @@ -1,5 +1,5 @@
  198.41.0.4
 -128.9.0.107
@@ -14,5 +15,6 @@
 -198.41.0.10
 +192.58.128.30
  193.0.14.129
- 198.32.64.12
+-198.32.64.12
++199.7.83.42
  202.12.27.33
diff --git a/main/djbdns/tinydns.initd b/main/djbdns/tinydns.initd
index 8c93ebc01f..ab15ffe37a 100755
--- a/main/djbdns/tinydns.initd
+++ b/main/djbdns/tinydns.initd
@@ -6,6 +6,7 @@ opts="reload"
 
 depend() {
 	need net
+	after firewall
 }
 
 # -- Statrup variables 
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index 7f5d9d9d49..b346ef4d66 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dnsmasq
 pkgver=2.50
-pkgrel=0
+pkgrel=1
 pkgdesc="Small forwarding DNS server"
 url="http://www.thekelleys.org.uk/dnsmasq/"
 license="GPL-2"
@@ -33,5 +33,5 @@ build() {
 	install dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf
 }
 md5sums="f7b1e17c590e493039537434c57c9de7  dnsmasq-2.50.tar.gz
-fbea3f4a794a6a00cc6fe79c6d44606a  dnsmasq.initd
+db46459322a0c7d9ce4f68251fd265c4  dnsmasq.initd
 5990c2d2cb92209feacf8f3a5a7d0831  dnsmasq.confd"
diff --git a/main/dnsmasq/dnsmasq.initd b/main/dnsmasq/dnsmasq.initd
index 44109e9829..3f33d89865 100644
--- a/main/dnsmasq/dnsmasq.initd
+++ b/main/dnsmasq/dnsmasq.initd
@@ -8,7 +8,7 @@ opts="reload"
 depend() {
 	provide dns
 	need localmount net
-	after bootmisc
+	after bootmisc firewall
 }
 
 start() {
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 888a2d499d..dee364b72f 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
 pkgver=1.2.4
-pkgrel=0
+pkgrel=1
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
 license="LGPL-2.1"
@@ -12,7 +12,6 @@ install="dovecot.pre-install"
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://www.dovecot.org/releases/1.2/$pkgname-$pkgver.tar.gz
 	dovecot.initd
-	$install
 	"
 
 build() {
@@ -31,5 +30,4 @@ build() {
 }
 
 md5sums="3e5717d13e3d6b32d3f4b809df397dbf  dovecot-1.2.4.tar.gz
-573e14589a6f8424d55753a2794ab99a  dovecot.initd
-f0f8893411f5e482e14f40a81a177b19  dovecot.pre-install"
+c58b474dca20e6e60fa4f1f5b9c726e1  dovecot.initd"
diff --git a/main/dovecot/dovecot.initd b/main/dovecot/dovecot.initd
index d9799c0dce..7ce07f61cb 100644
--- a/main/dovecot/dovecot.initd
+++ b/main/dovecot/dovecot.initd
@@ -7,7 +7,8 @@ opts="reload"
 
 depend() {
 	need localmount net
-	after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd 
+	after bootmisc firewall ldap mysql ntp-client ntpd postgresql \
+		saslauthd slapd
 	use logger
 }
 
diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index ca4af482cf..53bbdc4e29 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -1,11 +1,12 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dropbear
 pkgver=0.52
-pkgrel=1
+pkgrel=2
 pkgdesc="small SSH 2 client/server designed for small memory environments"
 url="http://matt.ucc.asn.au/dropbear/dropbear.html"
 license='MIT'
-depends="zlib"
+depends=
 makedepends="zlib-dev"
 source="http://matt.ucc.asn.au/dropbear/releases/${pkgname}-${pkgver}.tar.bz2
 dropbear.initd
@@ -33,6 +34,5 @@ build() {
 }
 
 md5sums="a1fc7adf601bca53330a792a9c873439  dropbear-0.52.tar.bz2
-34fea1c967596ebcd6d10d38444f2b92  dropbear.initd
+d181e2234f34ae5b1e45f8ebf5f14e07  dropbear.initd
 af73c487e2be37d65d0e8bf80489357e  dropbear.confd"
-
diff --git a/main/dropbear/dropbear.initd b/main/dropbear/dropbear.initd
index afdee8c6d3..652a5464be 100644
--- a/main/dropbear/dropbear.initd
+++ b/main/dropbear/dropbear.initd
@@ -6,6 +6,7 @@
 depend() {
 	use logger dns
 	need net
+	after firewall
 }
 
 check_config() {
diff --git a/main/ez-ipupdate/APKBUILD b/main/ez-ipupdate/APKBUILD
index 74ef3675f3..33cb03ea17 100644
--- a/main/ez-ipupdate/APKBUILD
+++ b/main/ez-ipupdate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
 pkgname=ez-ipupdate
 pkgver=3.0.10
-pkgrel=0
+pkgrel=1
 pkgdesc="utility for updating your host name for many of the dynamic DNS services (ez-ip.net, dyndns.org, etc)"
 url="http://ez-ipupdate.com/"
 license="GPL"
@@ -33,4 +33,4 @@ build() {
 
 md5sums="6505c9d18ef6b5ce13fe2a668eb5724b  ez-ipupdate-3.0.10.tar.gz
 e6e06780b1896f2250132cc16cd10710  ez-ipupdate.confd
-5ac899387790691156eb4d0ff2b3f480  ez-ipupdate.initd"
+6b9ce71b7b6b739794f003b2ebbf66ed  ez-ipupdate.initd"
diff --git a/main/ez-ipupdate/ez-ipupdate.initd b/main/ez-ipupdate/ez-ipupdate.initd
index b011835975..4ec662694a 100644
--- a/main/ez-ipupdate/ez-ipupdate.initd
+++ b/main/ez-ipupdate/ez-ipupdate.initd
@@ -7,9 +7,6 @@ DAEMON=/usr/bin/$NAME
 DAEMON_GROUP=ipupdate
 DAEMON_USER=ipupdate
 
-# load the config
-. /etc/conf.d/${NAME}
-
 # now convert it into command line options
 OPTS="-d -S ${SERVICE} -h ${HOST} -u \"${USER}:${PASS}\" -i ${IFACE}"
 if [ "$WILDCARD" == 1 ]; then
@@ -22,6 +19,7 @@ OPTS="${OPTS} -t ${TIMEOUT} -M ${MAX_INTERVAL}"
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index 092556638a..f6427fa5ec 100644
--- a/main/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fetchmail
 pkgver=6.3.9
-pkgrel=3
+pkgrel=4
 pkgdesc="A remote-mail retrieval and forwarding utility"
 url="http://fetchmail.berlios.de/"
 license="GPL"
@@ -11,7 +11,6 @@ makedepends="openssl-dev python"
 install="fetchmail.pre-install fetchmail.post-install"
 subpackages="$pkgname-doc fetchmailconf"
 source="http://download.berlios.de/fetchmail/$pkgname-$pkgver.tar.bz2
-	$install
 	fetchmail.initd"
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -39,6 +38,4 @@ fetchmailconf() {
 }
 
 md5sums="72c20ad2b9629f1a109668b05a84d823  fetchmail-6.3.9.tar.bz2
-5a2fc8e8b3115fe2b9bf23503fb8f0a4  fetchmail.pre-install
-4b451d102e92926b6b6c1774f4260310  fetchmail.post-install
-22e9ac1d8385db05da15e01fd5c831e4  fetchmail.initd"
+b27fe01a7c25534d62d175c8ba22fc48  fetchmail.initd"
diff --git a/main/fetchmail/fetchmail.initd b/main/fetchmail/fetchmail.initd
index a1ed1ec837..73286c4e70 100755
--- a/main/fetchmail/fetchmail.initd
+++ b/main/fetchmail/fetchmail.initd
@@ -4,6 +4,7 @@ pidfile=/var/run/fetchmail/fetchmail.pid
 
 depend() {
 	need net
+	after firewall
 	use mta
 }
 
diff --git a/main/gross/APKBUILD b/main/gross/APKBUILD
index 48c4579225..73b587a4db 100644
--- a/main/gross/APKBUILD
+++ b/main/gross/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gross
 pkgver=1.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Greylisting of suspicious sources"
 url="http://code.google.com/p/gross/"
 license="BSD"
@@ -17,7 +17,7 @@ source="http://gross.googlecode.com/files/$pkgname-$pkgver.tar.gz
 	gross-1.0.1-configure.ac.patch
 	gross-1.0.1-default-conf.patch
 	gross-1.0.1-user.patch
-	$install"
+	"
 
 build() {
         cd "$srcdir/$pkgname-$pkgver"
@@ -46,12 +46,8 @@ build() {
 }
 
 md5sums="f8f81b36850dcda30cb81799b9cee3b6  gross-1.0.1.tar.gz
-5c8c2aa3ad8108812850717c6134493c  grossd.initd
+6e8a2626c0c9f0e98e950a67a55a7040  grossd.initd
 5ca1c6e51c3243236e6564480b20279b  grossd.confd
 bb75b119ac96b8f99831ce6df810003f  gross-1.0.1-configure.ac.patch
 7c504b653c71dcf7b192bc487b3516fd  gross-1.0.1-default-conf.patch
-16e184d59d520db565388f010cc75e83  gross-1.0.1-user.patch
-8f6e45b98888dbb9971f7681bf431f6f  gross.pre-install
-4b55d1c5534167946cc11376d1b05c34  gross.post-install
-87e7d76dace9cedf61efc04cdb6a905c  gross.pre-upgrade
-9268f51b276ba00b0f50df322e34434e  gross.post-upgrade"
+16e184d59d520db565388f010cc75e83  gross-1.0.1-user.patch"
diff --git a/main/gross/grossd.initd b/main/gross/grossd.initd
index 4d59b623a9..c300ac4982 100644
--- a/main/gross/grossd.initd
+++ b/main/gross/grossd.initd
@@ -8,6 +8,7 @@ pidfile=/var/run/gross/$NAME.pid
 
 depend() {
 	need net
+	after firewall
 }
 
 check_config() {
diff --git a/main/iaxmodem/APKBUILD b/main/iaxmodem/APKBUILD
index f1f2b21c3a..7393e75454 100644
--- a/main/iaxmodem/APKBUILD
+++ b/main/iaxmodem/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=iaxmodem
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Softmodem for hylafax that connects to VOIP gateway with IAX"
 url="http://iaxmodem.sourceforge.net/"
 license="GPL"
-depends="uclibc tiff"
+depends=
 makedepends="tiff-dev"
 install=
 subpackages="$pkgname-doc"
diff --git a/main/iaxmodem/iaxmodem.initd b/main/iaxmodem/iaxmodem.initd
index d6f2c947ac..7f072e6c26 100644
--- a/main/iaxmodem/iaxmodem.initd
+++ b/main/iaxmodem/iaxmodem.initd
@@ -13,6 +13,7 @@ name="iaxmodem"
 depend() {
 	use asterisk
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/iproute2-qos/APKBUILD b/main/iproute2-qos/APKBUILD
index 7851e63d24..7190d5c761 100644
--- a/main/iproute2-qos/APKBUILD
+++ b/main/iproute2-qos/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ilya Strelkin <iilluzion@gmail.com>
 pkgname=iproute2-qos
 pkgver=0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Scripts to set up quality of service with iproute2"
 url="http://git.alpinelinux.org/cgit/aports"
 license="GPL"
@@ -19,7 +19,7 @@ build() {
 		"$pkgdir"/etc/conf.d/qos.ifb0.sample
 }
 
-md5sums="d4f225300dab94078e0c51f292bf558c  qos.initd
+md5sums="78c8edd233e081a167788b6198560b13  qos.initd
 aeb793e4e1e7219bf245c06e29212048  qos.eth0.sample
 d9bbf66187a62485450397c4e93d1293  qos.ifb0.sample
 785aff5d4284c47038a009797c576e34  setup-qos"
diff --git a/main/iproute2-qos/qos.initd b/main/iproute2-qos/qos.initd
index 825ef07cfd..b2d33f0437 100644
--- a/main/iproute2-qos/qos.initd
+++ b/main/iproute2-qos/qos.initd
@@ -20,6 +20,7 @@ opts="describe compile"
 depend() 
 {
 	need net
+	after firewall
 }
 
 ###########################################################################################################
@@ -445,4 +446,4 @@ describe()
 	checkconfig || return 1
 
 	get_stats
-}
\ No newline at end of file
+}
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
index 1b792b0b48..22d3354d63 100644
--- a/main/ipsec-tools/APKBUILD
+++ b/main/ipsec-tools/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=ipsec-tools
 pkgver=0.8_alpha20090903
 _myver=0.8-alpha20090903
-pkgrel=0
+pkgrel=1
 pkgdesc="User-space IPsec tools for various IPsec implementations"
 url="http://ipsec-tools.sourceforge.net/"
 license="BSD"
@@ -45,7 +45,7 @@ build() {
 }
 
 md5sums="8ec28d4e89c0f5e49ae2caa7463fbcfd  ipsec-tools-0.8-alpha20090903.tar.gz
-fce62b52b598be268e27609f470f8e9b  racoon.initd
+da0d50d9091d8f4e05dbfa7b30f10051  racoon.initd
 2d00250cf72da7f2f559c91b65a48747  racoon.confd
 13bda94a598aabf593280e04ea16065d  50-reverse-connect.patch
 baa13d7f0f48955c792f7fcd42a8587a  60-debug-quick.patch"
diff --git a/main/ipsec-tools/racoon.initd b/main/ipsec-tools/racoon.initd
index 0ed4efe500..f02ed3eec3 100644
--- a/main/ipsec-tools/racoon.initd
+++ b/main/ipsec-tools/racoon.initd
@@ -5,6 +5,7 @@
 depend() {
 	before netmount
 	use net
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/iscsitarget/APKBUILD b/main/iscsitarget/APKBUILD
index 3bdf98ee06..2b46e4aa19 100644
--- a/main/iscsitarget/APKBUILD
+++ b/main/iscsitarget/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname=iscsitarget
 pkgver=0.4.17
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source iSCSI target with professional features - userspace utils"
 url="http://iscsitarget.sourceforge.net/"
 license="GPL-2"
@@ -36,5 +36,5 @@ build() {
 md5sums="e79b437695fc50e7d054631855a16b1b  iscsitarget-0.4.17.tar.gz
 22512c5cf4cb62127730ce53d74ff28f  iscsitarget-0.4.15-isns-set-scn-flag.patch
 c9a9b839b3afcdecd1601511ee48a171  iscsitarget-0.4.17-build.patch
-641513492f58a6cb13247d0028a50906  ietd.initd
+9b0ca79dc47b12024c2b67d828d6d361  ietd.initd
 06ba479d3533d557b8582abe6f182410  ietd.confd"
diff --git a/main/iscsitarget/ietd.initd b/main/iscsitarget/ietd.initd
index 6ea9a4b51e..565b8df3fa 100644
--- a/main/iscsitarget/ietd.initd
+++ b/main/iscsitarget/ietd.initd
@@ -19,8 +19,9 @@ ARGS=""
 
 depend() {
 	use net
-	after modules
+	after firewall modules
 }
+
 checkconfig() {
 	if [ ! -f $CONFIG_FILE ]; then
 		eerror "Config file $CONFIG_FILE does not exist!"
diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index 0abe6dea70..3122d100ef 100644
--- a/main/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lighttpd
 pkgver=1.4.23
-pkgrel=0
+pkgrel=2
 pkgdesc="a secure, fast, compliant and very flexible web-server"
 url="http://www.lighttpd.net/"
 license="custom"
@@ -11,7 +11,6 @@ makedepends="flex pcre-dev openssl-dev zlib-dev bzip2-dev lua-dev pkgconfig"
 source="http://www.$pkgname.net/download/$pkgname-$pkgver.tar.bz2
 	$pkgname.initd
 	$pkgname.confd
-	$install
 	$pkgname.logrotate
 	spawn-fcgi.confd
 	spawn-fcgi.initd
@@ -68,13 +67,11 @@ build() {
 	done
 }
 md5sums="0ab6bb7b17bf0f515ce7dce68e5e215a  lighttpd-1.4.23.tar.bz2
-6910842e8ba496e8aa984ab30a46eb72  lighttpd.initd
+36c4ddbc266017dc193fcb0cdd1d84e1  lighttpd.initd
 0dede109282bfe685bdec6b35f0e4b6b  lighttpd.confd
-e250fe505d07733e920348bea0909c29  lighttpd.pre-install
-6e0e81296d854887e11bc4f8d6f998d7  lighttpd.post-install
 ad091c9157134890499f26d170352c9f  lighttpd.logrotate
 1d925aed297ec4541fb230dd19e11bc1  spawn-fcgi.confd
-78bc6ceac57ecaa47abf4d5df857fe57  spawn-fcgi.initd
+2f177ba0a35fd1c683edef3453c20bc8  spawn-fcgi.initd
 df5b2360ea380d988bf16905ab214286  lighttpd.conf
 fef397e7bcf1b741dea211a555e1803c  mime-types.conf
 9c1407e95f62ed22da66c4ef5f69c3b5  mod_cgi.conf
diff --git a/main/lighttpd/lighttpd.initd b/main/lighttpd/lighttpd.initd
index 80aaacc5e5..6b02bdf43f 100644
--- a/main/lighttpd/lighttpd.initd
+++ b/main/lighttpd/lighttpd.initd
@@ -8,8 +8,7 @@ opts="reload graceful"
 depend() {
 	need net
 	use mysql logger spawn-fcgi ldap slapd
-	after famd
-	after sshd
+	after famd firewall sshd
 }
 
 checkconfig() {
diff --git a/main/lighttpd/spawn-fcgi.initd b/main/lighttpd/spawn-fcgi.initd
index 63daa75081..a4023a2c25 100644
--- a/main/lighttpd/spawn-fcgi.initd
+++ b/main/lighttpd/spawn-fcgi.initd
@@ -7,6 +7,7 @@ SPAWNFCGI_PID="/var/run/spawn-fcgi.pid"
 
 depend() {
         need net
+	after firewall
 }
 
 start() {
@@ -21,7 +22,7 @@ start() {
         # copy the allowed environment variables
         unset E
         for i in ${ALLOWED_ENV}; do
-                E="${E} ${i}=${!i}"
+                eval "E=\"${E} ${i}=\$${i}\""
         done
 
         # clean environment and set up a new one
@@ -49,3 +50,4 @@ stop() {
         fi
         eend 0
 }
+
diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD
index bc98d6e33e..eebed1fb71 100644
--- a/main/mdadm/APKBUILD
+++ b/main/mdadm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=mdadm
 pkgver=2.6.9
-pkgrel=0
+pkgrel=1
 pkgdesc="a tool for managing Linux Software RAID arrays"
 url="http://neil.brown.name/blog/mdadm"
 license="GPL-2"
@@ -28,6 +28,6 @@ build() {
 }
 
 md5sums="beaa0f066288441d9b3ad1ef67fa0237  mdadm-2.6.9.tar.gz
-96b323ba5b778aeb905c119b9547b2a5  mdadm.initd
+ce57e798431f7ab89f9b07a7daaa4852  mdadm.initd
 16d2b8eb2e17184357db503470fdd8eb  mdadm.confd
 cf60ee08fc4fbed0450c5a2d4efc4214  mdadm-raid.initd"
diff --git a/main/mdadm/mdadm.initd b/main/mdadm/mdadm.initd
index 747661e8ee..77384e2658 100644
--- a/main/mdadm/mdadm.initd
+++ b/main/mdadm/mdadm.initd
@@ -7,6 +7,7 @@ DAEMON=/sbin/$NAME
 
 depend() {
 	use logger dns net
+	after firewall
 }
 
 start() {
diff --git a/main/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD
index 6bce99530d..5b733b220e 100644
--- a/main/mini_httpd/APKBUILD
+++ b/main/mini_httpd/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mini_httpd
 pkgver=1.19
-pkgrel=2
+pkgrel=3
 pkgdesc="Small forking webserver with ssl and ipv6 support"
 url="http://www.acme.com/software/mini_httpd/"
 license="BSD"
@@ -43,5 +43,5 @@ build() {
 
 md5sums="7c68293ad265ecfe2edea917912f6f1f  mini_httpd-1.19.tar.gz
 bca5b3b1cdc00cf31f0b54797518b893  mini_httpd.conf.sample
-7cfcf81d75be204ecb60eb18fa4d96a7  mini_httpd.initd
+02a9a415c365aa40c27211afbaa545c7  mini_httpd.initd
 915683e9c7e1cef7ce9b1bbaa31ab680  mini_httpd.logrotate"
diff --git a/main/mini_httpd/mini_httpd.initd b/main/mini_httpd/mini_httpd.initd
index b55340ac5d..ad1917be3e 100644
--- a/main/mini_httpd/mini_httpd.initd
+++ b/main/mini_httpd/mini_httpd.initd
@@ -7,6 +7,7 @@ pidfile=/var/run/mini_httpd/${SVCNAME}.pid
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD
index de03c127da..ea564c225b 100644
--- a/main/mysql/APKBUILD
+++ b/main/mysql/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mysql
 pkgver=5.0.83
-pkgrel=0
+pkgrel=1
 pkgdesc="A fast SQL database server"
 url="http://www.mysql.com/"
 license='GPL'
@@ -66,5 +66,5 @@ client() {
 }
 
 md5sums="051392064a1e32cca5c23a593908b10e  mysql-5.0.83.tar.gz
-3ce9827b22d8fbbb29d83a91cbe98ffc  mysql.initd
+25d08b02bff6aa379dc45859b7a3f28a  mysql.initd
 15a7e3ddd6a40bf5a1eb3a8c69d9c34c  mysql.mycnf"
diff --git a/main/mysql/mysql.initd b/main/mysql/mysql.initd
index 8f841646b8..c55b76121a 100644
--- a/main/mysql/mysql.initd
+++ b/main/mysql/mysql.initd
@@ -5,6 +5,7 @@
 
 depend() {
   need net
+  after firewall
   use dns
 }
 
diff --git a/main/net-snmp/APKBUILD b/main/net-snmp/APKBUILD
index 5456efe95e..19baedc901 100644
--- a/main/net-snmp/APKBUILD
+++ b/main/net-snmp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=net-snmp
 pkgver=5.4.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple Network Management Protocol"
 url="http://www.net-snmp.org/"
 license="GPL"
@@ -59,8 +59,8 @@ tools() {
 
 
 md5sums="984932520143f0c8bf7b7ce1fc9e1da1  net-snmp-5.4.2.1.tar.gz
-941e257218aa773b33696a2c7222a14e  snmpd.initd
+198a4a7b80557fa8112394df5ec9914e  snmpd.initd
 96510a2f3bc9f21648b03f7e8d76c0d3  snmpd.confd
-c5198c350991637849595dba93019bda  snmptrapd.initd
+7ce3e9e880fc6313ae87eb000bae4bda  snmptrapd.initd
 363f7728a76bdfc46e29b7e1f5cf4950  snmptrapd.confd
 e8eac801c76e03bca7e7bf6b267b0d3d  CVE-2008-6123.patch"
diff --git a/main/net-snmp/snmpd.initd b/main/net-snmp/snmpd.initd
index 49beda58d8..f768bb36bf 100644
--- a/main/net-snmp/snmpd.initd
+++ b/main/net-snmp/snmpd.initd
@@ -6,6 +6,7 @@ DAEMON=/usr/sbin/$NAME
 depend() {
 	use logger
 	need net
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/net-snmp/snmptrapd.initd b/main/net-snmp/snmptrapd.initd
index bf56233ab6..bbc592be27 100644
--- a/main/net-snmp/snmptrapd.initd
+++ b/main/net-snmp/snmptrapd.initd
@@ -6,6 +6,7 @@ DAEMON=/usr/sbin/$NAME
 depend() {
 	use logger
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
index b9225f9663..99500506f0 100644
--- a/main/nfs-utils/APKBUILD
+++ b/main/nfs-utils/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nfs-utils
 pkgver=1.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="kernel-mode NFS"
 url="http://nfs.sourceforge.net/"
 license="GPL"
@@ -47,7 +47,7 @@ build() {
 }
 
 md5sums="779cf81044e92cb51ad590960e7b3671  nfs-utils-1.2.0.tar.bz2
-4538f67470c916f8da9c76a17e314906  nfs.initd
+23240b9ab44ef7d6b6c437c0ae34915d  nfs.initd
 09135438d6df50b868bbe5a2260f973c  nfs.confd
 4f1bb7b2412ce5952ecb5ec22d8ed99d  nfs.exports
 5e0963b0889e779ff36af0299d17d6cb  nfs-utils-no-exec.patch
diff --git a/main/nfs-utils/nfs.initd b/main/nfs-utils/nfs.initd
index e9711d914d..ba3920e422 100644
--- a/main/nfs-utils/nfs.initd
+++ b/main/nfs-utils/nfs.initd
@@ -25,7 +25,7 @@ depend() {
 	config /etc/exports
 	need portmap rpc.statd ${myneed}
 	use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
-	after quota
+	after firewall quota
 }
 
 mkdir_nfsdirs() {
diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD
index 2f618a0776..c8f0e1fbab 100644
--- a/main/ngircd/APKBUILD
+++ b/main/ngircd/APKBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ngircd
 pkgver=14.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Next Generation IRC Daemon"
 url="http://ngircd.barton.de/"
 license="GPL"
-makedepends=""
+depends=
 makedepends="openssl-dev zlib-dev"
 install="$pkgname.pre-install"
 source="ftp://ftp.berlios.de/pub/$pkgname/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
-	$install"
+	"
 
 build ()
 {
@@ -32,5 +32,4 @@ build ()
 }
 
 md5sums="eef90855414c35bfb6590d17e24ee06f  ngircd-14.1.tar.gz
-1a91f517ef865b51d67b77ceb28e4261  ngircd.initd
-c8fbedf0690f35ba565e6a1937afd4fb  ngircd.pre-install"
+50d8388540a2e3eb0630e8ac6369f394  ngircd.initd"
diff --git a/main/ngircd/ngircd.initd b/main/ngircd/ngircd.initd
index 807d844e8d..2c87b16696 100644
--- a/main/ngircd/ngircd.initd
+++ b/main/ngircd/ngircd.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net
+	after firewall
 	provide ircd
 }
 
diff --git a/main/oidentd/APKBUILD b/main/oidentd/APKBUILD
index 130283f72a..eda425fbf8 100644
--- a/main/oidentd/APKBUILD
+++ b/main/oidentd/APKBUILD
@@ -1,11 +1,12 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=oidentd
 pkgver=2.0.8
-pkgrel=0
+pkgrel=1
 pkgdesc="Configurable IDENT server that supports NAT/IP masq."
 url="http://dev.ojnk.net/"
 license="GPL"
-depends="uclibc"
+depends=""
 makedepends=""
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/ojnk/$pkgname-$pkgver.tar.gz
@@ -30,5 +31,5 @@ build() {
 
 md5sums="c3d9a56255819ef8904b867284386911  oidentd-2.0.8.tar.gz
 d9c40e4d6a0bde685a359ad49b4eada2  oidentd.conf
-89a027c3b8245f6c5e79930d16d485f7  oidentd.initd
+96c45c9956d357d4ca9f5d474d58451b  oidentd.initd
 05a43d3987754f179f4e31bbe61ff315  oidentd.confd"
diff --git a/main/oidentd/oidentd.initd b/main/oidentd/oidentd.initd
index c40b058dac..f718976f51 100644
--- a/main/oidentd/oidentd.initd
+++ b/main/oidentd/oidentd.initd
@@ -4,7 +4,8 @@
 # $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-misc/oidentd/files/oidentd-2.0.7-init,v 1.4 2007/10/24 11:38:14 uberlord Exp $
 
 depend() {
-    need net
+	need net
+	after firewall
 }
 
 check_config() {
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index bb4db8296e..3f26b8c8e8 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -1,18 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openldap
 pkgver=2.4.16
-pkgrel=1
+pkgrel=2
 pkgdesc="LDAP Server"
 url="http://www.openldap.org/"
 license="custom"
-depends="db openssl uclibc libldap"
+depends=
 makedepends="db-dev openssl-dev groff"
 subpackages="$pkgname-dev $pkgname-doc libldap"
 install="$pkgname.pre-install $pkgname.post-install"
 source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tgz
 	openldap-2.4-ppolicy.patch
 	openldap-2.4.11-libldap_r.patch
-	$install
 	slapd.initd
 	slapd.confd
 	slurpd.initd
@@ -62,8 +61,8 @@ build () {
 }
 
 libldap() {
-	depends="uclibc openssl"
 	pkgdesc="OpenLDAP libraries"
+	depends=
 	install=
 	mkdir -p "$subpkgdir"/usr "$subpkgdir"/etc/openldap
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
@@ -73,8 +72,6 @@ libldap() {
 md5sums="ed5b86e9d2b372d10edfe3bb59fee165  openldap-2.4.16.tgz
 2524e490ba334a760fa57057c16da7a9  openldap-2.4-ppolicy.patch
 d19d0502f046078ecd737e29e7552fa8  openldap-2.4.11-libldap_r.patch
-07b1fae35627ea4216dccce33c0b8c69  openldap.pre-install
-f38a6f1de624c17cc0cb6776a089880b  openldap.post-install
-13d0e57e54df945671e975acdfb48636  slapd.initd
+a729bf553d12b4a9fbda0ff5202a0443  slapd.initd
 b672311fca605c398240cd37a2ae080a  slapd.confd
-ba44f1a0e62cb88c68aa64e4a39847fa  slurpd.initd"
+fa5ce0005ef5f1160b6ff126f97aaa1a  slurpd.initd"
diff --git a/main/openldap/slapd.initd b/main/openldap/slapd.initd
index 1637d3335a..d66af755e6 100644
--- a/main/openldap/slapd.initd
+++ b/main/openldap/slapd.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/openldap/slurpd.initd b/main/openldap/slurpd.initd
index f5aa2ead5a..d90176b3ce 100644
--- a/main/openldap/slurpd.initd
+++ b/main/openldap/slurpd.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index bf33e1b04d..38ae36d69c 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=opennhrp
 pkgver=0.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="NBMA Next Hop Resolution Protocol daemon"
 url="http://sourceforge.net/projects/opennhrp"
 license="GPL-3"
@@ -31,5 +31,5 @@ build() {
 md5sums="9cc1e99de2b132591d685eb5f9d70630  opennhrp-0.11.1.tar.bz2
 f81539fc92800bb79668dda119a97d1d  opennhrp-0.9.3-peer-up-bgp.patch
 0e6defecbb3f54814bc3580bb41b0e3f  opennhrp-0.11.1-fix.patch
-85821b61c02427146b866b7582157cfd  opennhrp.initd
+42b7507d5c0025525fd97cd8951f693b  opennhrp.initd
 8eee86233728dc0d156bbfee6d98f338  opennhrp.confd"
diff --git a/main/opennhrp/opennhrp.initd b/main/opennhrp/opennhrp.initd
index ac7ea6a572..e9304cfcb9 100755
--- a/main/opennhrp/opennhrp.initd
+++ b/main/opennhrp/opennhrp.initd
@@ -8,6 +8,7 @@ PIDFILE=/var/run/opennhrp.pid
 depend() {
 	use logger
 	need net
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index 0282e9693e..f942aab7cd 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=openssh
 pkgver=5.2_p1
 _myver=5.2p1
-pkgrel=2
+pkgrel=3
 pkgdesc="Port of OpenBSD's free SSH release"
 url="http://www.openssh.org/portable.html"
 license="as-is"
@@ -59,5 +59,5 @@ client() {
 }
 
 md5sums="ada79c7328a8551bdf55c95e631e7dad  openssh-5.2p1.tar.gz
-f71564ffab359faead63717920c3086b  sshd.initd
+d993cc91e9fab6c6012390874c28af0a  sshd.initd
 b35e9f3829f4cfca07168fcba98749c7  sshd.confd"
diff --git a/main/openssh/sshd.initd b/main/openssh/sshd.initd
index 2a5d4ae259..34852c4e31 100644
--- a/main/openssh/sshd.initd
+++ b/main/openssh/sshd.initd
@@ -8,6 +8,7 @@ opts="reload"
 depend() {
 	use logger dns
 	need net
+	after firewall
 }
 
 SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh}
diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD
index be48bdf61d..a8f1e18ff2 100644
--- a/main/openvpn/APKBUILD
+++ b/main/openvpn/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openvpn
 pkgver=2.0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
 url="http://openvpn.sourceforge.net/"
 license="custom"
@@ -58,4 +58,4 @@ build() {
 }
 md5sums="60745008b90b7dbe25fe8337c550fec6  openvpn-2.0.9.tar.gz
 a9075ceb8552980519132cc27fda85ac  openvpn-2.0.9-persistent.patch
-10390247d1fdc4fd1ebec1ebae8872be  openvpn.initd"
+793184e36ad09b22cdb19b4294131508  openvpn.initd"
diff --git a/main/openvpn/openvpn.initd b/main/openvpn/openvpn.initd
index a6e4529e1c..89201f9cf6 100644
--- a/main/openvpn/openvpn.initd
+++ b/main/openvpn/openvpn.initd
@@ -13,6 +13,7 @@ VPNCONF="${VPNDIR}/${VPN}.conf"
 
 depend() {
 	need localmount net
+	after firewall
 	before netmount
 	after bootmisc
 }