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

79 files changed, 150 insertions, 147 deletions

diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index ece0398c4c..4c52e5235c 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -14,6 +14,7 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	./configure --prefix=/usr \
 		--with-apr=/usr \
+		--without-iconv \
 		--without-pgsql \
 		--without-mysql \
 		--without-sqlite2 \
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index f380cb9921..de64376228 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openrc
 pkgver=0.5.0
-pkgrel=9
+pkgrel=10
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="http://roy.marples.name/openrc"
 license='BSD-2'
@@ -34,7 +34,7 @@ build() {
 	# we cannot have anything turned on by default
 	rm -f "$pkgdir"/etc/runlevels/*/*
 
-	#rm -f "$pkgdir"/lib/rc/net/* "$pkgdir"/etc/init.d/net.lo
+	rm -f "$pkgdir"/etc/conf.d/network "$pkgdir"/etc/init.d/network
 
 	# we override some of the scripts
 	for i in ../*.initd; do
diff --git a/main/pgcluster/APKBUILD b/main/pgcluster/APKBUILD
index 9d92b9b65b..c45aecfce2 100644
--- a/main/pgcluster/APKBUILD
+++ b/main/pgcluster/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=pgcluster
 pkgver=1.9.0_rc5
 _myver=1.9.0rc5
-pkgrel=1
+pkgrel=2
 pkgdesc="PostgreSQL with multi-master cluster/replication patch"
 url="http://pgfoundry.org/projects/pgcluster/"
 license="BSD"
@@ -47,5 +47,5 @@ client() {
 
 
 md5sums="d2fe705e25a01c19c8f8daa1fbcc55d1  pgcluster-1.9.0rc5.tar.gz
-ad21a30c7fd5ce9de1290c317492a0e5  pgcluster.initd
+594be4c70a80fdd2d315d78793ef4421  pgcluster.initd
 503f94824fc7a385a831d7e55b74f9a0  pgcluster.confd"
diff --git a/main/pgcluster/pgcluster.initd b/main/pgcluster/pgcluster.initd
index fb5cdfdf35..28606a5815 100644
--- a/main/pgcluster/pgcluster.initd
+++ b/main/pgcluster/pgcluster.initd
@@ -7,6 +7,7 @@ opts="${opts} reload setup"
 
 depend() {
 	use net
+	after firewall
 	provide postgresql
 }
 
diff --git a/main/pgpool/APKBUILD b/main/pgpool/APKBUILD
index 980b3019a8..5bfb6b32ce 100644
--- a/main/pgpool/APKBUILD
+++ b/main/pgpool/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=pgpool
 _opkgname=pgpool-II
 pkgver=2.2.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Pgpool II is a connection pooling/replication server for PostgreSQL."
 url="http://pgfoundry.org/projects/pgpool/"
 license="BSD"
@@ -26,4 +26,4 @@ build() {
 }
 
 md5sums="6f14514ed4ed5368ad3ab7e2d4c5136b  pgpool-II-2.2.2.tar.gz
-21573def15ffd08a07221569ef54c149  pgpool.initd"
+6317aee51feaf9c5facb7765cddeec6b  pgpool.initd"
diff --git a/main/pgpool/commit-queue b/main/pgpool/commit-queue
new file mode 100644
index 0000000000..96a68e3506
--- /dev/null
+++ b/main/pgpool/commit-queue
@@ -0,0 +1 @@
+pgpool
diff --git a/main/pgpool/pgpool.initd b/main/pgpool/pgpool.initd
index d577cf9e16..95ab0cd6bb 100644
--- a/main/pgpool/pgpool.initd
+++ b/main/pgpool/pgpool.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net
+	after firewall
 	use postgresql
 }
 
diff --git a/main/pingu/APKBUILD b/main/pingu/APKBUILD
index fdd91972ab..83d08b1410 100644
--- a/main/pingu/APKBUILD
+++ b/main/pingu/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pingu
 pkgver=0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Small daemon that pings hosts and executes a script when status change"
 url="http://git.alpinelinux.org/cgit/pingu"
 license="GPL"
@@ -20,4 +20,4 @@ build() {
 }
 
 md5sums="59f9c927a80c71d85f2363e314a25197  pingu-0.3.tar.bz2
-d2162d9c02a66691bb6360f4f2d9d701  pingu.initd"
+f54029d096d6b40870af027082c4f547  pingu.initd"
diff --git a/main/pingu/commit-queue b/main/pingu/commit-queue
new file mode 100644
index 0000000000..d4bd0e4128
--- /dev/null
+++ b/main/pingu/commit-queue
@@ -0,0 +1 @@
+pingu
diff --git a/main/pingu/pingu.initd b/main/pingu/pingu.initd
index 39301f80e4..93aaebe10c 100644
--- a/main/pingu/pingu.initd
+++ b/main/pingu/pingu.initd
@@ -7,6 +7,7 @@ DAEMON=/usr/bin/$NAME
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/portmap/APKBUILD b/main/portmap/APKBUILD
index 7539f314aa..afdb114ace 100644
--- a/main/portmap/APKBUILD
+++ b/main/portmap/APKBUILD
@@ -1,17 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=portmap
 pkgver=6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="RPC connection manager"
 url="http://neil.brown.name/portmap/"
 license="GPL"
-depends="uclibc"
+depends=
 makedepends=""
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc"
 source="http://neil.brown.name/$pkgname/$pkgname-$pkgver.tgz
 	$pkgname-6.0-tcpd.patch
-	$install
 	$pkgname.confd
 	$pkgname.initd"
 
@@ -34,6 +33,5 @@ build ()
 
 md5sums="ac108ab68bf0f34477f8317791aaf1ff  portmap-6.0.tgz
 bdcd217a0d459c75116d0b5aa90a372b  portmap-6.0-tcpd.patch
-b726a64e91b47244a7539288338c6bbd  portmap.pre-install
 56b0f47cda2003f3394ef7c37ec4cdff  portmap.confd
-2944aa0387aba4ed6219d7856e5e8fb0  portmap.initd"
+b03305a6fc0bfb621e76e75a300acc4e  portmap.initd"
diff --git a/main/portmap/commit-queue b/main/portmap/commit-queue
new file mode 100644
index 0000000000..186b45adac
--- /dev/null
+++ b/main/portmap/commit-queue
@@ -0,0 +1 @@
+portmap
diff --git a/main/portmap/portmap.initd b/main/portmap/portmap.initd
index 65d23d7484..67ce7cf95d 100644
--- a/main/portmap/portmap.initd
+++ b/main/portmap/portmap.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	use net
+	after firewall
 	before inetd
 	before xinetd
 }
diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD
index 71a9199c07..956a3a0549 100644
--- a/main/postfix/APKBUILD
+++ b/main/postfix/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postfix
 pkgver=2.6.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)"
 url="http://www.postfix.org/"
 license="IPL-1"
@@ -12,7 +12,6 @@ subpackages="$pkgname-doc $pkgname-ldap $pkgname-mysql $pkgname-pcre
 	$pkgname-pgsql"
 source="ftp://ftp.porcupine.org/mirrors/$pkgname-release/official/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
-	$install
 	postfix-2.6.1-dynamicmaps.patch
 	dynamicmaps.cf
 	postfix-ldap.post-install
@@ -140,9 +139,7 @@ pcre()  { _mv_dict pcre ; }
 pgsql() { _mv_dict pgsql ; }
 
 md5sums="1f0edbd521d2b0473626f4d61e8bb4eb  postfix-2.6.2.tar.gz
-8416354d402f3be288fa98b60af86240  postfix.initd
-2bfc3864183694e5484ac073bb0cb7ef  postfix.pre-install
-0064d45c2c8a46c374b55c4abc46cfb2  postfix.post-install
+6bbabcd041aefaf40e1f3ee1fc1d6d7e  postfix.initd
 d45552cfdcd911d0934c0cb7816c4011  postfix-2.6.1-dynamicmaps.patch
 442efd1a95b0c061dfb8ab75456e0f24  dynamicmaps.cf
 2ebe51a882eb9d6d7866583eb6af3969  postfix-ldap.post-install
diff --git a/main/postfix/postfix.initd b/main/postfix/postfix.initd
index b2396b3aea..45f1b49ce0 100644
--- a/main/postfix/postfix.initd
+++ b/main/postfix/postfix.initd
@@ -19,7 +19,9 @@ fi
 opts="${opts} reload"
 
 depend() {
-	use logger dns ypbind amavisd mysql postgresql antivirus postfix_greylist net saslauthd
+	use logger dns ypbind amavisd mysql postgresql antivirus \
+		postfix_greylist net saslauthd
+	after firewall
 	if [ "${SVCNAME}" = "postfix" ]; then
 		provide mta
 	fi
diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD
index 2c3266bc09..a5b20b5b09 100644
--- a/main/postgresql/APKBUILD
+++ b/main/postgresql/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postgresql
 pkgver=8.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A sophisticated object-relational DBMS"
 url="http://www.postgresql.org/"
 license="BSD"
@@ -47,5 +47,5 @@ client() {
 
 
 md5sums="1f172d5f60326e972837f58fa5acd130  postgresql-8.4.0.tar.bz2
-6dd7bd7c97252312357a255237115b38  postgresql.initd
+e4b13053dcbebdf2e59450b94bc27705  postgresql.initd
 6218755fde294b7d17b77d280a9c9106  postgresql.confd"
diff --git a/main/postgresql/postgresql.initd b/main/postgresql/postgresql.initd
index 3863a49aa4..48b95b3eae 100644
--- a/main/postgresql/postgresql.initd
+++ b/main/postgresql/postgresql.initd
@@ -7,6 +7,7 @@ opts="${opts} reload setup"
 
 depend() {
 	use net
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD
index 51497f0653..0b28d992ec 100644
--- a/main/quagga/APKBUILD
+++ b/main/quagga/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=quagga
 pkgver=0.99.13
-pkgrel=1
+pkgrel=2
 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP."
 url="http://quagga.net/"
 license="GPL-2"
@@ -23,7 +23,6 @@ source="http://www.quagga.net/download/$pkgname-$pkgver.tar.gz
 	ripngd.initd
 	zebra.initd
 	zebra.confd
-	$install
 	"
 
 build() {
@@ -68,12 +67,10 @@ md5sums="55a7d2dcf016580a7c7412b3518cd942  quagga-0.99.13.tar.gz
 1cbcf60a637b2577dee4d6df711e1247  quagga-0.99.11-del-routes.patch
 ce345725f2e7240cebe0fd5ac2b2fc48  quagga-0.99.11-zombie.patch
 e2391e19b542ec1743776ca9e36ac11a  quagga-0.99.11-fd-leak.patch
-cc109a746273bc0d6aee9d758e7524ab  bgpd.initd
-44547b687343ebfed7524cebc5626067  ospf6d.initd
-89b0cf4e70172bfcd195b2869cae28da  ospfd.initd
-39b8cb21b55de53af38c94c2f5d85917  ripd.initd
-120ab1b53975ec86e78266f31e935ab6  ripngd.initd
-6d51e9fca8d206a6d9d1d9fde793b48f  zebra.initd
-34e06a1d2bc602ce691abc9ed169dd15  zebra.confd
-44b4c3684e4c7300665bf90fa4520af9  quagga.pre-install
-d2181a6401280478b8700cfcee32794e  quagga.post-install"
+c4c3b174b1e3400a143407fcc3d27cf5  bgpd.initd
+92aba039c049050c48abf984c2db7e2b  ospf6d.initd
+878328ead225e6eb5f5f77f05ab39106  ospfd.initd
+5945863133a0db33898c5c39ef23663c  ripd.initd
+cda4115283d9f4a8304fec1b6881a7eb  ripngd.initd
+be935134c5e3400989b427d7c114e634  zebra.initd
+34e06a1d2bc602ce691abc9ed169dd15  zebra.confd"
diff --git a/main/quagga/bgpd.initd b/main/quagga/bgpd.initd
index b6104235c3..af9e2435ae 100644
--- a/main/quagga/bgpd.initd
+++ b/main/quagga/bgpd.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net zebra
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/quagga/ospf6d.initd b/main/quagga/ospf6d.initd
index 6edafe5f74..884a7e9818 100644
--- a/main/quagga/ospf6d.initd
+++ b/main/quagga/ospf6d.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net zebra
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/quagga/ospfd.initd b/main/quagga/ospfd.initd
index f67ca2c154..5eeb44677f 100644
--- a/main/quagga/ospfd.initd
+++ b/main/quagga/ospfd.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net zebra
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/quagga/ripd.initd b/main/quagga/ripd.initd
index 987d6ec4b6..54458c7238 100644
--- a/main/quagga/ripd.initd
+++ b/main/quagga/ripd.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net zebra
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/quagga/ripngd.initd b/main/quagga/ripngd.initd
index 9bf2ff2a87..00820e5250 100644
--- a/main/quagga/ripngd.initd
+++ b/main/quagga/ripngd.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net zebra
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/quagga/zebra.initd b/main/quagga/zebra.initd
index 5ca8ef58c0..df817540cf 100644
--- a/main/quagga/zebra.initd
+++ b/main/quagga/zebra.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD
index 4b0e8f1205..ca54188424 100644
--- a/main/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rsync
 pkgver=3.0.6
-pkgrel=0
+pkgrel=1
 pkgdesc="A file transfer program to keep remote files in sync"
 url="http://samba.anu.edu.au/rsync/"
 license="GPL3"
-depends="uclibc"
+depends=
 source="http://$pkgname.samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz
 	rsyncd.initd
 	rsyncd.confd
@@ -30,7 +30,7 @@ build() {
 }
 
 md5sums="e9865d093a18e4668b9d31b635dc8e99  rsync-3.0.6.tar.gz
-492d13dbba49a9e7c77c89d01b4f617a  rsyncd.initd
+8c525f7c4222f90b3f01bb7f6a2684ab  rsyncd.initd
 e5e62e8cef29e09c22e8ba8152ec1751  rsyncd.confd
 a99211a14af1766ba849035241cd5bb2  rsyncd.conf
 169cafc6907a4c3787bb0462e9d6a5c2  rsyncd.logrotate"
diff --git a/main/rsync/rsyncd.initd b/main/rsync/rsyncd.initd
index 1b20282296..13d56733fc 100644
--- a/main/rsync/rsyncd.initd
+++ b/main/rsync/rsyncd.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	use net
+	after firewall
 }
 
 start() {
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 19555f8513..473b3d7192 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
 pkgver=3.3.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 license="GPL3"
@@ -105,6 +105,6 @@ tdb() {
 }
 
 md5sums="bc7228cc686986353df67ff42b1b2b1e  samba-3.3.7.tar.gz
-1b701fdb22c52c63b3af0e4a286a9329  samba.initd
+c8a7f6ac5df2f73dbf023e25ea39927b  samba.initd
 c150433426e18261e6e3eed3930e1a76  samba.confd
 b7cafabfb4fa5b3ab5f2e857d8d1c733  samba.logrotate"
diff --git a/main/samba/samba.initd b/main/samba/samba.initd
index d2d395a989..f7290173f8 100644
--- a/main/samba/samba.initd
+++ b/main/samba/samba.initd
@@ -9,6 +9,7 @@ fi
 
 depend() {
 	need net
+	after firewall
 }
 
 start_smbd() {
diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD
index 35b4820651..8b42689e27 100644
--- a/main/snort/APKBUILD
+++ b/main/snort/APKBUILD
@@ -1,24 +1,22 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainter: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=snort
 pkgver=2.8.4
-pkgrel=0
+pkgrel=1
 pkgdesc="An open source network intrusion prevention and detection system"
 url="http://www.snort.org/"
 license="GPL"
-depends="uclibc libpcap libnet"
+depends=
 makedepends="pcre-dev libpcap-dev libnet-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://www.snort.org/dl/$pkgname-$pkgver.tar.gz
-	nocxx.patch
         snort.initd
         snort.confd
-        $install
         "
 
 build() {
         cd "$srcdir/$pkgname-$pkgver"
-	patch configure < ../nocxx.patch || return 1
 
         ./configure --prefix=/usr \
                 --sysconfdir=/etc \
@@ -34,7 +32,5 @@ build() {
 }
 
 md5sums="193179da8db8aac5ee6b0a751ce7b76d  snort-2.8.4.tar.gz
-28513788ba4d556ccd538867dc6205ab  nocxx.patch
-b3207150805e7b948d958c6f86e70a5b  snort.initd
-446f8d2b3435b8a6be738da978670605  snort.confd
-b9473b349cc9d21faf7b91b591f497d6  snort.pre-install"
+ffda56f7c20f5cea1c37c971e0f1d6c9  snort.initd
+446f8d2b3435b8a6be738da978670605  snort.confd"
diff --git a/main/snort/nocxx.patch b/main/snort/nocxx.patch
deleted file mode 100644
index beb1ab9006..0000000000
--- a/main/snort/nocxx.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure	2004-12-07 21:34:23.205172545 +0000
-+++ b/configure	2004-12-07 21:37:17.726654782 +0000
-@@ -5148,10 +5148,8 @@
-   :
- else
-   { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&5
--echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+See \`config.log' for more details." >&5;}
-+   { echo "C++ sucks, ignoring ..." >&5; }; }
- fi
- 
- ac_ext=cc
diff --git a/main/snort/snort.initd b/main/snort/snort.initd
index a5c2b05c47..baed2dff2e 100644
--- a/main/snort/snort.initd
+++ b/main/snort/snort.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/sntpc/APKBUILD b/main/sntpc/APKBUILD
index 6df6a6efd0..b821d56934 100644
--- a/main/sntpc/APKBUILD
+++ b/main/sntpc/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sntpc
 pkgver=0.9
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple NTP client"
 url="http://git.alpinelinux.org/cgit/sntpc"
 license="GPL-2"
-depends="uclibc"
+depends=
 source="http://git.alpinelinux.org/cgit/sntpc/snapshot/sntpc-$pkgver.tar.bz2
 	sntpc.initd
 	sntpc.confd
@@ -22,5 +22,5 @@ build() {
 }
 
 md5sums="60c64d975daa3a6f371e9e81538e38db  sntpc-0.9.tar.bz2
-c5018237685af2cddb0b4ede1751bee1  sntpc.initd
+1e542e12cf6eeff7140ddbd9dde1066a  sntpc.initd
 4ea1ceee01f94080be86188bde8f9adc  sntpc.confd"
diff --git a/main/sntpc/sntpc.initd b/main/sntpc/sntpc.initd
index a97e51bdbd..a62c6d3527 100644
--- a/main/sntpc/sntpc.initd
+++ b/main/sntpc/sntpc.initd
@@ -5,6 +5,7 @@ DAEMON=/usr/sbin/$NAME
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 2219ae4cae..dd4b80c76a 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=squid
 pkgver=2.7.6
 _ver=2.7.STABLE6
-pkgrel=10
+pkgrel=11
 pkgdesc="A full-featured Web proxy cache server."
 url="http://www.squid-cache.org"
 install="squid.pre-install squid.pre-upgrade squid.post-install"
@@ -279,7 +279,7 @@ errors_ukrainian_utf8() {
 
 
 md5sums="6de3a6a7a56a7ecae092f2d31a04f039  squid-2.7.STABLE6.tar.bz2
-d7f3f823f5648dae74cb68a3b2c2f70e  squid.initd
+1f65e9dad473a027773c1f9a3eaf04b5  squid.initd
 44b052db7910f386ef88ddcf69c9ba4e  squid.confd
 3827f71d940b47eb385a1a1d92a51d66  squid-2.7-gentoo.patch
 58823e0b86bc2dc71d270208b7b284b4  squid.logrotate"
diff --git a/main/squid/squid.initd b/main/squid/squid.initd
index 4242b216ec..beaea0b17a 100644
--- a/main/squid/squid.initd
+++ b/main/squid/squid.initd
@@ -9,6 +9,7 @@ conf=/etc/squid/squid.conf
 
 depend() {
 	need net
+	after firewall
 }
 
 # Try to increase the # of filedescriptors we can open.
diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD
index 2fbea82647..e00a6b1ebc 100644
--- a/main/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=subversion
 pkgver=1.6.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 url="http://subversion.tigris.org/"
 license="apache bsd"
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="http://subversion.tigris.org/downloads/subversion-$pkgver.tar.bz2
 	svnserve.confd
 	svnserve.initd
-	$install
 	"
 
 build() {
@@ -34,5 +33,4 @@ build() {
 }
 md5sums="1a53a0e72bee0bf814f4da83a9b6a636  subversion-1.6.5.tar.bz2
 d084a7558053784886bc858b94fa9186  svnserve.confd
-06cf9328f63a935654971052a2c3594a  svnserve.initd
-bfd0d890c07830f1a6010891dd25fa5c  subversion.pre-install"
+22c274fafb4817e31126f60f9d84039f  svnserve.initd"
diff --git a/main/subversion/svnserve.initd b/main/subversion/svnserve.initd
index 036d0187e7..f539a4e2c7 100644
--- a/main/subversion/svnserve.initd
+++ b/main/subversion/svnserve.initd
@@ -7,6 +7,7 @@ opts="$opts setup"
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/main/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD
index f1a7dc2e72..6d98e04fc9 100644
--- a/main/tinyproxy/APKBUILD
+++ b/main/tinyproxy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=tinyproxy
 pkgver=1.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight HTTP proxy"
 pkgusers="tinyproxy"
 pkggroups="tinyproxy"
@@ -37,4 +37,4 @@ build() {
 }
 
 md5sums="bd14d029b12621bcfd7ee71b2f4893da  tinyproxy-1.6.3.tar.gz
-554da6fc363fbe251f081b342541bef4  tinyproxy.initd"
+ce2b2e3c79fa0e8491fe625bbb15710a  tinyproxy.initd"
diff --git a/main/tinyproxy/tinyproxy.initd b/main/tinyproxy/tinyproxy.initd
index bee5d041fb..1037f9c288 100644
--- a/main/tinyproxy/tinyproxy.initd
+++ b/main/tinyproxy/tinyproxy.initd
@@ -8,6 +8,7 @@ CONFFILE="/etc/tinyproxy/${SVCNAME}.conf"
 depend() {
 	use logger dns
 	need net
+	after firewall
 }
 
 checkconfig() {
diff --git a/main/vsftpd/APKBUILD b/main/vsftpd/APKBUILD
index fef929cad6..260268540e 100644
--- a/main/vsftpd/APKBUILD
+++ b/main/vsftpd/APKBUILD
@@ -1,11 +1,11 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=vsftpd
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Very secure ftpd"
 url="http://vsftpd.beasts.org"
 license="GPL"
-depends="openssl"
+depends=
 makedepends="openssl-dev !libcap-dev"
 subpackages="$pkgname-doc"
 source="ftp://vsftpd.beasts.org/users/cevans/vsftpd-${pkgver}.tar.gz
@@ -32,5 +32,5 @@ build() {
 
 md5sums="7890b54e7ffa6106ffbdfda53f47fa41  vsftpd-2.1.0.tar.gz
 f3cbaf364cd3c46a2a03b00de9d7e184  vsftpd-enable-ssl.patch
-7edf5990c9f5dda983e918c55c92078e  vsftpd.initd
+1a56bcc7698dba6490f0007f37c75e9b  vsftpd.initd
 431dfe7403323e247a88b97beade5d78  vsftpd.confd"
diff --git a/main/vsftpd/vsftpd.initd b/main/vsftpd/vsftpd.initd
index 9e8b124b00..52b6238779 100644
--- a/main/vsftpd/vsftpd.initd
+++ b/main/vsftpd/vsftpd.initd
@@ -5,6 +5,7 @@ DAEMON=/usr/sbin/$NAME
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/non-free/3dm2/3dm2.initd b/non-free/3dm2/3dm2.initd
index bf09e9754d..1bbb7da77a 100644
--- a/non-free/3dm2/3dm2.initd
+++ b/non-free/3dm2/3dm2.initd
@@ -5,6 +5,7 @@ DAEMON=/usr/sbin/$NAME
 
 depend() {
         need net
+	after firewall
 }
 
 start() {
diff --git a/non-free/3dm2/APKBUILD b/non-free/3dm2/APKBUILD
index 6c383f9723..d0b6af87b4 100644
--- a/non-free/3dm2/APKBUILD
+++ b/non-free/3dm2/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=3dm2
 pkgver=9.5.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="3ware's RAID Management software tool"
 url="http://www.3ware.com"
 license="closed"
-depends="uclibc"
-makedepends=""
+depends=
+makedepends=
 subpackages="$pkgname-doc"
 source="http://alpine.nethq.org/clandmeter/src/3ware-${pkgname}-bin-${pkgver}-x86.tar.bz2
 $pkgname.initd
@@ -23,5 +23,5 @@ build() {
 }
 
 md5sums="7b5fb1ca268915e22a8c4a40ca1af772  3ware-3dm2-bin-9.5.1.1-x86.tar.bz2
-922d168a36a615ef06941f73d0d44d40  3dm2.initd
+5f5ca470b780348f18f525a16d2a309e  3dm2.initd
 e84205681f64c07af9ec5b6a3dd8bc38  3dm2.confd"
diff --git a/testing/asterisk/APKBUILD b/testing/asterisk/APKBUILD
index b3f290bd58..e78482729b 100644
--- a/testing/asterisk/APKBUILD
+++ b/testing/asterisk/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=asterisk
 pkgver=1.6.3.0_pre20090623
 _basever=1.6.2.0-beta3
-pkgrel=2
+pkgrel=3
 pkgdesc="Asterisk: A Module Open Source PBX System"
 url="http://www.asterisk.org/"
 license="GPL"
@@ -22,8 +22,6 @@ source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$_basever.tar
 	asterisk-05-1.6.1-glob-uclibc.patch
 	asterisk-06-overlapped-enum.patch
 	asterisk-07-issue14068.patch
-	asterisk.pre-install
-	asterisk.post-install
 	asterisk.initd
 	asterisk.confd"
 
@@ -100,7 +98,5 @@ b00c9d98ce2ad445501248a197c6e436  asterisk-02-uclibc-daemon.patch
 c37928e95ebef36aad097accfdbbfcb8  asterisk-05-1.6.1-glob-uclibc.patch
 1b49f980e56dc7ce493a046eadff3545  asterisk-06-overlapped-enum.patch
 cc6a11b73f3ba7e98a621540c8e71542  asterisk-07-issue14068.patch
-b4a97cb1ec3cc3f71a10ce8c067ab430  asterisk.pre-install
-62ecffc90b6714b85f377d1fac73c58b  asterisk.post-install
-c618b7fdf4a9edf4cde6d8ccd1e32ee6  asterisk.initd
+0ce3219e05f55af884a7dc6b99c2b276  asterisk.initd
 ed31d7ba37bcf8b0346dcf8593c395f0  asterisk.confd"
diff --git a/testing/asterisk/asterisk.initd b/testing/asterisk/asterisk.initd
index 864a96b3cf..284898ae22 100644
--- a/testing/asterisk/asterisk.initd
+++ b/testing/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/testing/fprobe/APKBUILD b/testing/fprobe/APKBUILD
index 6005359936..ea6faea284 100644
--- a/testing/fprobe/APKBUILD
+++ b/testing/fprobe/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=fprobe
 pkgver=1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="libpcap-based tool that collect network traffic"
 url="http://fprobe.sourceforge.net/"
 license="GPL"
-depends="uclibc"
+depends=
 makedepends="libpcap-dev"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
@@ -28,5 +28,5 @@ build() {
 }
 
 md5sums="65850d0470078269b33eee58cba77ac2  fprobe-1.1.tar.bz2
-a682fef5ba72855db5d67b62c88ffaf0  fprobe.initd
+41810a73503624de2c27809e34ed80b4  fprobe.initd
 ba9c9327456e4db897b60481705df282  fprobe.confd"
diff --git a/testing/fprobe/fprobe.initd b/testing/fprobe/fprobe.initd
index b2ee6ded84..a14f1e6bcc 100644
--- a/testing/fprobe/fprobe.initd
+++ b/testing/fprobe/fprobe.initd
@@ -4,6 +4,7 @@
 
 depend() {
 	need net
+	after firewall
 }
 
 BIN=/usr/sbin/fprobe
diff --git a/testing/gross-svn/APKBUILD b/testing/gross-svn/APKBUILD
index adba8d1372..58389f55b6 100644
--- a/testing/gross-svn/APKBUILD
+++ b/testing/gross-svn/APKBUILD
@@ -2,18 +2,17 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=gross-svn
 pkgver=511
-pkgrel=1
+pkgrel=2
 pkgdesc="Greylisting of suspicious sources"
 url="http://code.google.com/p/gross/"
 license="BSD"
-depends="uclibc c-ares"
+depends=
 makedepends="c-ares-dev"
 install="$pkgname.post-install $pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://alpine.nethq.org/clandmeter/src/${pkgname}-${pkgver}.tar.bz2
 $pkgname.initd
-$pkgname.confd
-$install"
+$pkgname.confd"
 
 build() {
         cd "$srcdir/$pkgname-$pkgver"
@@ -31,7 +30,5 @@ build() {
 }
 
 md5sums="f2488ced5b47f359c3a1127d9ba3453c  gross-svn-511.tar.bz2
-37b83bd0d94f66c733d5562c0327b70f  gross-svn.initd
-5ca1c6e51c3243236e6564480b20279b  gross-svn.confd
-4b55d1c5534167946cc11376d1b05c34  gross-svn.post-install
-8f6e45b98888dbb9971f7681bf431f6f  gross-svn.pre-install"
+e8d7c8ce4760f8443ab13c3a4af80db0  gross-svn.initd
+5ca1c6e51c3243236e6564480b20279b  gross-svn.confd"
diff --git a/testing/gross-svn/gross-svn.initd b/testing/gross-svn/gross-svn.initd
index c67293e17f..00ee33e560 100644
--- a/testing/gross-svn/gross-svn.initd
+++ b/testing/gross-svn/gross-svn.initd
@@ -7,6 +7,7 @@ GROUP="gross"
 
 depend() {
 	need net
+	after firewall
 }
 
 check_config() {
diff --git a/testing/haproxy/APKBUILD b/testing/haproxy/APKBUILD
index d37caf880b..eadcabd1e0 100644
--- a/testing/haproxy/APKBUILD
+++ b/testing/haproxy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=haproxy
 pkgver=1.3.20
-pkgrel=0
+pkgrel=1
 pkgdesc="A TCP/HTTP reverse proxy for high availability environments"
 url="http://haproxy.1wt.eu"
 license="GPL"
@@ -24,4 +24,4 @@ build() {
 }
 
 md5sums="e37046e0cb2f407d92c41d7731d1dd10  haproxy-1.3.20.tar.gz
-a7c6178dc4078fa233084ee36c8b440c  haproxy.initd"
+7d26095c6f899b0ef00bedecaca58864  haproxy.initd"
diff --git a/testing/haproxy/haproxy.initd b/testing/haproxy/haproxy.initd
index 10466144b1..82a1067591 100644
--- a/testing/haproxy/haproxy.initd
+++ b/testing/haproxy/haproxy.initd
@@ -18,6 +18,7 @@ checkconfig() {
 
 depend() {
 	need net
+	after firewall
 	use dns logger
 }
 
diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD
index a5d6bfe482..676087f3cc 100644
--- a/testing/kamailio/APKBUILD
+++ b/testing/kamailio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kamailio
 pkgver=1.5.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
@@ -96,6 +96,6 @@ presence() {
 }
 
 md5sums="6c6f4ed6fbcb4d008b8ac3de5b99ce99  kamailio-1.5.2-notls_src.tar.gz
-84f3c403b65a8fca9df4b71f51224e21  kamailio.initd
+c098f34b3e3ad704b18d4b2c6da6488b  kamailio.initd
 c646af2dd31f5c4289a2f802c873d98f  kamailio.pre-install
 3fbaf633ff1620d0d526fc4047c7bed9  kamailio.post-install"
diff --git a/testing/kamailio/kamailio.initd b/testing/kamailio/kamailio.initd
index afe9cb0824..51c8c511cf 100644
--- a/testing/kamailio/kamailio.initd
+++ b/testing/kamailio/kamailio.initd
@@ -5,6 +5,7 @@ pidfile=/var/run/kamailio/kamailio.pid
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/testing/knock/APKBUILD b/testing/knock/APKBUILD
index 6456b51a57..8804dac34c 100644
--- a/testing/knock/APKBUILD
+++ b/testing/knock/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=knock
 pkgver=0.5
-pkgrel=0
+pkgrel=1
 pkgdesc="A simple port-knocking daemon"
 url="http://www.zeroflux.org/projects/knock"
 license="GPL"
-depends="uclibc iptables libpcap"
+depends="iptables"
 makedepends="libpcap-dev"
 install=
 subpackages="$pkgname-doc"
@@ -29,5 +29,5 @@ build() {
 }
 
 md5sums="ca09d61458974cff90a700aba6120891  knock-0.5.tar.gz
-eb19ce993158eb3d15e1b19326256807  knock.initd
+5f05196d700c04287523d184226e2dc2  knock.initd
 8067d3b8401a0b5d513c44d3ff436032  knock.confd"
diff --git a/testing/knock/knock.initd b/testing/knock/knock.initd
index 18a6177eaa..b83c5c7415 100644
--- a/testing/knock/knock.initd
+++ b/testing/knock/knock.initd
@@ -5,6 +5,7 @@
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/testing/mpd/APKBUILD b/testing/mpd/APKBUILD
index c52e1c2deb..eff2091cec 100644
--- a/testing/mpd/APKBUILD
+++ b/testing/mpd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <natanael.copa@gmail.com>
 pkgname=mpd
 pkgver=0.15.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
 url="http://musicpd.org"
 pkgusers="mpd"
@@ -44,5 +44,5 @@ build() {
 		"$pkgdir"/var/lib/mpd/music
 }
 md5sums="869779fdf592ac45d067c7dec228cb51  mpd-0.15.2.tar.bz2
-338857abd41efd08b2d2b5399a07a87f  mpd.initd
+31d1515232d688d610d1664a0fb2a6a0  mpd.initd
 dbd301041953a5cf9c2b9de8f23eb6bb  mpd.confd"
diff --git a/testing/mpd/mpd.initd b/testing/mpd/mpd.initd
index e840357601..10601dc47d 100644
--- a/testing/mpd/mpd.initd
+++ b/testing/mpd/mpd.initd
@@ -9,6 +9,7 @@ CONF=/etc/mpd.conf
 depend() {
 	need localmount
 	use net netmount nfsmount esound pulseaudio
+	after firewall
 } 
 
 checkconfig() {
diff --git a/testing/nagios/APKBUILD b/testing/nagios/APKBUILD
index ede82bbde4..0234cac1be 100644
--- a/testing/nagios/APKBUILD
+++ b/testing/nagios/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=nagios
 pkgver=3.1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Popular monitoring tool"
 url="http://www.nagios.org/"
 license="GPL-2"
-depends="gd perl"
+depends="perl"
 makedepends="gd-dev pkgconfig perl-dev"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 nagios.confd
@@ -51,5 +51,5 @@ web() {
 
 md5sums="02d3b0e13f772481d0ac9e00bdc3e979  nagios-3.1.0.tar.gz
 431dfe7403323e247a88b97beade5d78  nagios.confd
-73fe73c8e31b8a59b5f3206bc90a74e8  nagios.initd
+2ead8695b32222abe922692664aa9de1  nagios.initd
 d63c36f47d26f1f71ae2faf272eec640  lighttpd-nagios.conf"
diff --git a/testing/nagios/nagios.initd b/testing/nagios/nagios.initd
index ce4410305c..e0b3bcf0c3 100644
--- a/testing/nagios/nagios.initd
+++ b/testing/nagios/nagios.initd
@@ -7,6 +7,7 @@ DAEMON=/usr/sbin/$NAME
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/testing/opensips/APKBUILD b/testing/opensips/APKBUILD
index ab98d4ba6e..d54b3dec28 100644
--- a/testing/opensips/APKBUILD
+++ b/testing/opensips/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=opensips
 pkgver=1.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Flexible and customizable sip routing engine"
 url="http://www.opensips.org/"
 license="GPL"
@@ -34,4 +34,4 @@ build() {
 md5sums="ba99592a6e42e8b4dc2d38964420dfec  opensips-1.5.0-notls_src.tar.gz
 3a8a5d3c4c23ce9f2fc60b449ad61820  opensips.pre-install
 d9b551148d2b60466c05b4295b935091  opensips.post-install
-6606574b4872cbc5114e490f962ca096  opensips.initd"
+7fb51d35517f7f10cfe6e89139f7060a  opensips.initd"
diff --git a/testing/opensips/opensips.initd b/testing/opensips/opensips.initd
index 5805908f05..09c03fd5d1 100644
--- a/testing/opensips/opensips.initd
+++ b/testing/opensips/opensips.initd
@@ -5,6 +5,7 @@ pidfile=/var/run/opensips/opensips.pid
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/testing/openvpn/APKBUILD b/testing/openvpn/APKBUILD
index 2c38df4c84..365b639352 100644
--- a/testing/openvpn/APKBUILD
+++ b/testing/openvpn/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openvpn
 pkgver=2.1_rc19
-pkgrel=0
+pkgrel=1
 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
 url="http://openvpn.sourceforge.net/"
 license="custom"
@@ -52,4 +52,4 @@ build() {
 
 }
 md5sums="ba2ee667a8b7606b125b7d32f47ca578  openvpn-2.1_rc19.tar.gz
-10390247d1fdc4fd1ebec1ebae8872be  openvpn.initd"
+020376f1e7ed6b4adbe20cf5ff774856  openvpn.initd"
diff --git a/testing/openvpn/openvpn.initd b/testing/openvpn/openvpn.initd
index a6e4529e1c..7e0e3eb9ef 100644
--- a/testing/openvpn/openvpn.initd
+++ b/testing/openvpn/openvpn.initd
@@ -14,7 +14,7 @@ VPNCONF="${VPNDIR}/${VPN}.conf"
 depend() {
 	need localmount net
 	before netmount
-	after bootmisc
+	after bootmisc firewall
 }
 
 checktundevice() {
diff --git a/testing/postgrey/APKBUILD b/testing/postgrey/APKBUILD
index 71dc8c5865..7568114388 100644
--- a/testing/postgrey/APKBUILD
+++ b/testing/postgrey/APKBUILD
@@ -2,18 +2,17 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=postgrey
 pkgver=1.32
-pkgrel=0
+pkgrel=1
 pkgdesc="Postfix policy server implementing greylisting"
 url="http://postgrey.schweikert.ch/"
 license="GPL"
 depends="perl perl-db perl-net-dns perl-net-server"
 makedepends=""
-install=
+install=postgrey.pre-install
 subpackages=""
 source="http://postgrey.schweikert.ch/pub/$pkgname-$pkgver.tar.gz
 	postgrey.confd
-	postgrey.initd
-	postgrey.pre-install"
+	postgrey.initd"
 #still need PERL-IO Multiplex and PERL-PARSE-SYSLOG and NET-RBLClient
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -31,5 +30,4 @@ build() {
 
 md5sums="524a4e165bf997996f3bccade394712f  postgrey-1.32.tar.gz
 caaad5770ab07fb5af3bbd522a05b84f  postgrey.confd
-3bf81886c02d2879c1310bf1027e9c07  postgrey.initd
-4231489e2cfbbb4b0a354826cbe40695  postgrey.pre-install"
+d0611b244202c77ad7ad79862721a738  postgrey.initd"
diff --git a/testing/postgrey/postgrey.initd b/testing/postgrey/postgrey.initd
index d38538de17..c9e51ceba9 100644
--- a/testing/postgrey/postgrey.initd
+++ b/testing/postgrey/postgrey.initd
@@ -9,6 +9,7 @@ opts="${opts} reload"
 
 depend() {
 	need net
+	after firewall
 	before postfix
 	provide postfix_greylist
 }
diff --git a/testing/prosody/APKBUILD b/testing/prosody/APKBUILD
index f4ef1476ed..bfaacffac7 100644
--- a/testing/prosody/APKBUILD
+++ b/testing/prosody/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Mika Havela <mika.havela@gmail.com>
 pkgname=prosody
 pkgver=0.4.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Lua based Jabber/XMPP server"
 url="http://prosody.im/"
 license="MIT"
@@ -13,7 +13,6 @@ subpackages=""
 source="http://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz
 	$pkgname.cfg.lua
 	$pkgname.initd
-	$install
 	Makefile-0.4.2.patch
 	"
 
@@ -40,7 +39,5 @@ build() {
 
 md5sums="2669478311b3a67522669acdf03cf85c  prosody-0.4.2.tar.gz
 f42039e5a342fe62cd7e491546338aaa  prosody.cfg.lua
-c161a875295b45241229eb6db65211e8  prosody.initd
-08484f183ba39233337d3fbc92cffadc  prosody.pre-install
-8202a40bf6de7cbacbaf76f2985aa220  prosody.post-install
+c0e647e872e30f71fa03faab189ae287  prosody.initd
 684d033dac42399a245c061c9a374e1b  Makefile-0.4.2.patch"
diff --git a/testing/prosody/prosody.initd b/testing/prosody/prosody.initd
index 1c88672bce..2749d09cf7 100644
--- a/testing/prosody/prosody.initd
+++ b/testing/prosody/prosody.initd
@@ -7,6 +7,7 @@ DAEMON=/usr/bin/$NAME
 
 depend() {
 	need net
+	after firewall
 }
 
 start() {
diff --git a/testing/ulogd/APKBUILD b/testing/ulogd/APKBUILD
index cc36f0ce7a..6dad6b8deb 100644
--- a/testing/ulogd/APKBUILD
+++ b/testing/ulogd/APKBUILD
@@ -2,11 +2,11 @@
 pkgname=ulogd
 pkgver=2.0.0_beta3
 _pkgver=2.0.0beta3
-pkgrel=0
+pkgrel=1
 pkgdesc="A userspace logging daemon for netfilter/iptables related logging"
 url="http://netfilter.org/projects/ulogd/index.html"
 license="GPL"
-depends="libnfnetlink libnetfilter_conntrack libnetfilter_log"
+depends=
 makedepends="sqlite-dev mysql-dev postgresql-dev libpcap-dev libnfnetlink-dev
 libnetfilter_conntrack-dev libnetfilter_log-dev pkgconfig openssl-dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-sqlite $pkgname-pgsql $pkgname-mysql"
@@ -46,4 +46,4 @@ mysql() {
 
 
 md5sums="be8137d3b7ae70ebbce7ca8852b9e901  ulogd-2.0.0beta3.tar.bz2
-5f5eb551b60591aed49376ed2fa149be  ulogd.initd"
+5eedaae6102a4e90b3b89f051f54fbf1  ulogd.initd"
diff --git a/testing/ulogd/ulogd.initd b/testing/ulogd/ulogd.initd
index 792e4eb438..4413327baf 100644
--- a/testing/ulogd/ulogd.initd
+++ b/testing/ulogd/ulogd.initd
@@ -7,6 +7,7 @@ opts="reload"
 
 depend() {
 	need net
+	after firewall
 }
 
 checkconfig() {
diff --git a/testing/wzdftpd/APKBUILD b/testing/wzdftpd/APKBUILD
index dbcf9ca88a..b9b4626564 100644
--- a/testing/wzdftpd/APKBUILD
+++ b/testing/wzdftpd/APKBUILD
@@ -6,11 +6,11 @@
 # Contributor: Your Name <youremail@domain.com>
 pkgname=wzdftpd-svn
 pkgver=2040
-pkgrel=1
+pkgrel=2
 pkgdesc="A portable, modular, small, and efficient FTP server"
 url="http://www.wzdftpd.net"
 license='GPL'
-depends="openssl"
+depends=
 makedepends="cmake mysql-dev sqlite-dev tcl-dev openssl-dev flex"
 source="http://alpine.nethq.org/clandmeter/src/wzdftpd-svn2040.tar.gz
 wzdftpd-svn.initd"
@@ -43,4 +43,4 @@ build() {
 }
 
 md5sums="4bdb2fcaa4ca316261e9f77380818769  wzdftpd-svn2040.tar.gz
-991306944cc375b71ba9022a5e95aaf8  wzdftpd-svn.initd"
+ae2b7497cc7729bfaf346ba0d3b607d2  wzdftpd-svn.initd"
diff --git a/testing/wzdftpd/wzdftpd-svn.initd b/testing/wzdftpd/wzdftpd-svn.initd
index 4dc8d5098e..25f4da6f47 100644
--- a/testing/wzdftpd/wzdftpd-svn.initd
+++ b/testing/wzdftpd/wzdftpd-svn.initd
@@ -2,6 +2,7 @@
 
 depend() {
 	need net
+	after firewall
 	use dns
 }
 
diff --git a/unstable/apcupsd/APKBUILD b/unstable/apcupsd/APKBUILD
index e0fdfdd7ee..5be90f9c96 100644
--- a/unstable/apcupsd/APKBUILD
+++ b/unstable/apcupsd/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=apcupsd
 pkgver=3.14.6
-pkgrel=0
+pkgrel=1
 pkgdesc="A Daemon to control APC UPSes"
 subpackages="$pkgname-doc"
 url="http://www.apcupsd.org"
@@ -23,4 +23,4 @@ build() {
 }
 
 md5sums="7df2dbe325a6b1822763cbf6a9fa8263  apcupsd-3.14.6.tar.gz
-d276b567fd8dfb9e2a74e533b25de031  apcupsd.initd"
+0798cd407de6f199d4c267036ec54c5b  apcupsd.initd"
diff --git a/unstable/apcupsd/apcupsd.initd b/unstable/apcupsd/apcupsd.initd
index 43868f75dd..5265347f41 100644
--- a/unstable/apcupsd/apcupsd.initd
+++ b/unstable/apcupsd/apcupsd.initd
@@ -10,6 +10,7 @@ fi
 
 depend() {
 	use net
+	after firewall
 }
 
 start() {
diff --git a/unstable/freeradius/APKBUILD b/unstable/freeradius/APKBUILD
index 33d0e019db..f6a527390f 100644
--- a/unstable/freeradius/APKBUILD
+++ b/unstable/freeradius/APKBUILD
@@ -2,18 +2,18 @@
 # Maintainer: 
 pkgname=freeradius
 pkgver=2.1.3
-pkgrel=0
+pkgrel=1
 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
 url="http://freeradius.org/"
 license="GPL"
-depends="uclibc openssl pth"
-makedepends="openssl-dev pth-dev"
+depends=
+makedepends="openssl-dev pth-dev mysql-dev postgresql-dev gdbm-dev"
 install="freeradius.pre-install"
 subpackages="$pkgname-doc $pkgname-dev"
 source="ftp://ftp.freeradius.org/pub/freeradius/$pkgname-server-$pkgver.tar.gz
 	freeradius.confd
 	freeradius.initd
-	$install"
+	"
 
 build() {
 	cd "$srcdir/$pkgname-server-$pkgver"
@@ -21,7 +21,9 @@ build() {
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		--without-threads \
+		--disable-tls 
 	make -j1 || return 1
 	make -j1 DESTDIR="$pkgdir" install
 
@@ -31,5 +33,4 @@ build() {
 
 md5sums="017ebe7dd2e261caee448c64ccd4584d  freeradius-server-2.1.3.tar.gz
 fc6693f3df5a0694610110287a28568a  freeradius.confd
-2c281944a8edebc98a799d628875d371  freeradius.initd
-263208b5db70e1229252d6c9828ad048  freeradius.pre-install"
+b22092fcdcb61d7f0b8e13a007c444c5  freeradius.initd"
diff --git a/unstable/freeradius/freeradius.initd b/unstable/freeradius/freeradius.initd
index 31ca4bfae3..86909adef9 100644
--- a/unstable/freeradius/freeradius.initd
+++ b/unstable/freeradius/freeradius.initd
@@ -4,6 +4,7 @@ opts="${opts} reload"
 
 depend() {
 	need net
+	after firewall
 	use dns
 }
 
diff --git a/unstable/jabberd14/APKBUILD b/unstable/jabberd14/APKBUILD
index c1b189cf14..ac499e289b 100644
--- a/unstable/jabberd14/APKBUILD
+++ b/unstable/jabberd14/APKBUILD
@@ -1,12 +1,13 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 pkgname=jabberd14
 pkgver=1.6.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Jabber server or XMPP"
 url="http://jabberd.org/"
 license="GPL"
-depends="uclibc uclibc++ gnutls libidn popt expat pth"
-makedepends="uclibc-dev automake pkgconfig gnutls-dev libidn-dev libtool uclibc++-dev popt-dev pth-dev expat-dev libgcrypt-dev"
+depends=
+makedepends="uclibc-dev automake pkgconfig gnutls-dev libidn-dev libtool
+	uclibc++-dev popt-dev pth-dev expat-dev libgcrypt-dev"
 install=
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://download.jabberd.org/jabberd14/$pkgname-$pkgver.tar.gz
@@ -14,7 +15,7 @@ source="http://download.jabberd.org/jabberd14/$pkgname-$pkgver.tar.gz
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	export CXX=g++-uc
+	export CXX=${CXX_UC:-g++-uc}
 	
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
@@ -28,4 +29,4 @@ build() {
 }
 
 md5sums="597c7ee14518ba22b1cee883b4737d87  jabberd14-1.6.1.1.tar.gz
-95f4bc715f24d37e37d2c05580dd3649  jabberd14.initd"
+aa6ec7b00e05aedcc1db49da0029242b  jabberd14.initd"
diff --git a/unstable/jabberd14/jabberd14.initd b/unstable/jabberd14/jabberd14.initd
index 3b8179174e..6c1b7126fc 100644
--- a/unstable/jabberd14/jabberd14.initd
+++ b/unstable/jabberd14/jabberd14.initd
@@ -4,8 +4,8 @@
 # $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-im/jabberd/files/jabberd-1.6.1.1.init,v 1.1 2008/06/18 12:24:56 nelchael Exp $
 
 depend() {
-
 	need net
+	after firewall
 	provide jabber-server
 
 }
diff --git a/x11/transmission/APKBUILD b/x11/transmission/APKBUILD
index e1a52ebcab..7bd64c5efa 100644
--- a/x11/transmission/APKBUILD
+++ b/x11/transmission/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer:Carlo Landmeter
 pkgname=transmission
 pkgver=1.74
-pkgel=0
+pkgel=1
 pkgdesc="Lightweight GTK BitTorrent client"
 url="http://www.tansmissionbt.com"
 install="$pkgname.pre-install"
@@ -43,5 +43,5 @@ cli() {
 }
 
 md5sums="6b1080800c62308179cfc7a691c82d63  transmission-1.74.tar.bz2
-b3b921242bdc3b33a8ac05fc30653b6c  transmission-daemon.initd
+f65b8ae46f8ac89b35844109b3aa0c18  transmission-daemon.initd
 89478a70fcd93463e1dd8d751da994da  transmission-daemon.confd"
diff --git a/x11/transmission/transmission-daemon.initd b/x11/transmission/transmission-daemon.initd
index af9461cc60..ecf3bdafef 100644
--- a/x11/transmission/transmission-daemon.initd
+++ b/x11/transmission/transmission-daemon.initd
@@ -2,6 +2,7 @@
 
 depend() {
         need net
+	after firewall
 }
 
 start() {