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

55 files changed, 528 insertions, 828 deletions

diff --git a/main/acct/APKBUILD b/main/acct/APKBUILD
index 29657feed..c4a68c67b 100644
--- a/main/acct/APKBUILD
+++ b/main/acct/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acct
-pkgver=6.3.2
-pkgrel=1
+pkgver=6.5.3
+pkgrel=0
 pkgdesc="The GNU Accounting Utilities"
 url="http://www.gnu.org/software/acct/"
 license="GPL"
@@ -18,10 +18,15 @@ build() {
 	# seems like this makefile does not respect DESTDIR
 	./configure --prefix=/usr \
 		--mandir="$pkgdir"/usr/share/man \
-		--infodir="$pkgdir"/usr/share/info
+		--infodir="$pkgdir"/usr/share/info \
+		--enable-linux-multiformat
 
-	make || return 1
+	make LDADD="-lm lib/libgnu.la"	|| return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	make prefix="$pkgdir/usr" install
 }
 
-md5sums="da0055b254f7da8b8920db83ef1ebba1  acct-6.3.2.tar.gz"
+md5sums="0d4121b4ca76792b17d76042577c04ce  acct-6.5.3.tar.gz"
diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index 5dcad94ab..953c13297 100644
--- a/main/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-openssh
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=0
 pkgdesc="A web-based system administration interface for openssh"
 url="http://git.alpinelinux.org/cgit/acf-openssh"
@@ -12,4 +12,4 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="e3b747b7057960adaac1631eee017641  acf-openssh-0.4.0.tar.bz2"
+md5sums="85b8541cb0c53ac719ca0c8fea553a11  acf-openssh-0.4.1.tar.bz2"
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 4aceb88b7..263b41569 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhcpcd
-pkgver=5.1.4
+pkgver=5.1.5
 pkgrel=0
 pkgdesc="RFC2131 compliant DHCP client"
 url="http://roy.marples.name/projects/dhcpcd/"
@@ -25,4 +25,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="d18afc66efbea9a28e541e9b10fd284f  dhcpcd-5.1.4.tar.bz2"
+md5sums="a0b917dfd03b6416386bca06dd219d9b  dhcpcd-5.1.5.tar.bz2"
diff --git a/testing/fprobe/APKBUILD b/main/fprobe/APKBUILD
index ea6faea28..824129afe 100644
--- a/testing/fprobe/APKBUILD
+++ b/main/fprobe/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=fprobe
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="libpcap-based tool that collect network traffic"
 url="http://fprobe.sourceforge.net/"
 license="GPL"
@@ -13,14 +13,18 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 $pkgname.initd
 $pkgname.confd"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
diff --git a/testing/fprobe/fprobe.confd b/main/fprobe/fprobe.confd
index 1c444f554..1c444f554 100644
--- a/testing/fprobe/fprobe.confd
+++ b/main/fprobe/fprobe.confd
diff --git a/testing/fprobe/fprobe.initd b/main/fprobe/fprobe.initd
index a14f1e6bc..a14f1e6bc 100644
--- a/testing/fprobe/fprobe.initd
+++ b/main/fprobe/fprobe.initd
diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD
index 911b05f00..139539e19 100644
--- a/main/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=heimdal
 pkgver=1.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An implementation of Kerberos 5"
 url="http://www.h5l.org/"
 license="BSD"
@@ -77,7 +77,6 @@ package() {
 	install -m755 -D ../../heimdal-kdc.init ${pkgdir}/etc/init.d/heimdal-kdc
 	install -m755 -D ../../heimdal-kpasswdd.init ${pkgdir}/etc/init.d/heimdal-kpasswdd
 
-	rm -f "$pkgdir"/usr/bin/compile_et "$pkgdir"/usr/share/man/man1/compile_et.1
 	# Remove editline, we use libreadline
 	#rm ${pkgdir}/usr/lib/libeditline.* || return 1
 	#rm ${pkgdir}/usr/include/editline.h || return 1
@@ -96,20 +95,35 @@ package() {
 		fi
 		mv ${pkgdir}/usr/bin/${i} ${pkgdir}/usr/bin/k${i} || return 1
 	done
-	rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8}
+	for i in 1 3 5 8; do
+		rm -rf "$pkgdir"/usr/share/man/cat$i
+	done
 
 	# Remove conflicts 
-	rm ${pkgdir}/usr/share/man/man5/ftpusers.5*
+	# e2fsprogs
+	rm -f "$pkgdir"/usr/bin/compile_et \
+		"$pkgdir"/usr/share/man/man1/compile_et.1
+	# man-page
+	rm "$pkgdir"/usr/share/man/man5/ftpusers.5*
+	# openssl
+	rm "$pkgdir"/usr/share/man/man3/DES*
+	rm "$pkgdir"/usr/share/man/man3/DH*
+	rm "$pkgdir"/usr/share/man/man3/EVP*
+	rm "$pkgdir"/usr/share/man/man3/OpenSSL*
+	rm "$pkgdir"/usr/share/man/man3/RAND*
+	rm "$pkgdir"/usr/share/man/man3/RSA*
+	# erlang
+  	rm "$pkgdir"/usr/share/man/man3/os.3*
 
 	# Compress info pages
 	for page in heimdal hx509; do
-		gzip -9 ${pkgdir}/usr/share/info/${page}.info
+		gzip -9 "$pkgdir"/usr/share/info/${page}.info
 	done
 
 	# Install the license
-	install -d ${pkgdir}/usr/share/licenses/${pkgname}
-	install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \
-	${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+	install -d "$pkgdir"/usr/share/licenses/$pkgname
+	install -D -m644 "$srcdir"/$pkgname-$pkgver/LICENSE \
+		"$pkgdir"/usr/share/licenses/$pkgname/ || return 1
 }
 
 ftp() {
diff --git a/testing/hostapd/APKBUILD b/main/hostapd/APKBUILD
index 0c1c8c918..0c1c8c918 100644
--- a/testing/hostapd/APKBUILD
+++ b/main/hostapd/APKBUILD
diff --git a/testing/hostapd/hostapd.confd b/main/hostapd/hostapd.confd
index 60381153a..60381153a 100644
--- a/testing/hostapd/hostapd.confd
+++ b/main/hostapd/hostapd.confd
diff --git a/testing/hostapd/hostapd.initd b/main/hostapd/hostapd.initd
index cbf962d8d..cbf962d8d 100644
--- a/testing/hostapd/hostapd.initd
+++ b/main/hostapd/hostapd.initd
diff --git a/testing/lua-openrc/APKBUILD b/main/lua-openrc/APKBUILD
index 56578c400..56578c400 100644
--- a/testing/lua-openrc/APKBUILD
+++ b/main/lua-openrc/APKBUILD
diff --git a/testing/lua-zlib/APKBUILD b/main/lua-zlib/APKBUILD
index 6f319b486..6f319b486 100644
--- a/testing/lua-zlib/APKBUILD
+++ b/main/lua-zlib/APKBUILD
diff --git a/testing/minicom/APKBUILD b/main/minicom/APKBUILD
index 5d0c638e8..c419a9dc8 100644
--- a/testing/minicom/APKBUILD
+++ b/main/minicom/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=minicom
 pkgver=2.3
-pkgrel=0
+pkgrel=1
 pkgdesc="menu driven communications program for terminals"
 url="http://alioth.debian.org/projects/minicom"
 license="GPL"
@@ -12,17 +12,20 @@ install=
 subpackages="$pkgname-doc"
 source="http://alioth.debian.org/frs/download.php/2332/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--without-libintl-prefix 
 	make || return 1
-	make DESTDIR="$pkgdir" install
+}
 
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
 }
 
 md5sums="0ebe7a91898384ca906787cc4e2c3f25  minicom-2.3.tar.gz"
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD
index 95f8e5e5c..c5e170a64 100644
--- a/main/mysql/APKBUILD
+++ b/main/mysql/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mysql
-pkgver=5.1.42
+pkgver=5.1.43
 pkgrel=0
 pkgdesc="A fast SQL database server"
 url="http://www.mysql.com/"
@@ -72,6 +72,6 @@ client() {
 	done
 }
 
-md5sums="b644b219e130b7c6bca81948f75d72d7  mysql-5.1.42.tar.gz
+md5sums="451fd3e8c55eecdf4c3ed109dce62f01  mysql-5.1.43.tar.gz
 25d08b02bff6aa379dc45859b7a3f28a  mysql.initd
 15a7e3ddd6a40bf5a1eb3a8c69d9c34c  mysql.mycnf"
diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index 0196168b5..d97acd7a7 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=nmap 
-pkgver=5.20
-pkgrel=1
+pkgver=5.21
+pkgrel=0
 pkgdesc="A network exploration tool and security/port scanner"
 url="http:/nmap.org"
 license="custom:GPL"
@@ -34,12 +34,4 @@ package() {
 	install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
  
-nse() {
-	pkgdesc="nmap scripting engine"
-	mkdir -p "$subpkgdir"/usr/share/$pkgname
-	mv "$pkgdir"/usr/share/$pkgname/nselib \
-		"$pkgdir"/usr/share/$pkgname/scripts \
-		"$subpkgdir"/usr/share/$pkgname/
-}
-
-md5sums="ed8567c898c6b8f285fb7bebae449a1c  nmap-5.20.tgz"
+md5sums="8ce773d70a65007452161e0bde32990c  nmap-5.21.tgz"
diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD
index a8f1e18ff..bd751f311 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=2
+pkgver=2.1.1
+pkgrel=0
 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
 url="http://openvpn.sourceforge.net/"
 license="custom"
@@ -10,17 +10,12 @@ depends="iproute2"
 makedepends="openssl-dev lzo-dev"
 install=
 source="http://$pkgname.net/release/$pkgname-$pkgver.tar.gz
-	openvpn-2.0.9-persistent.patch
 	openvpn.initd
 	"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 build() { 
-	cd "$srcdir"/$pkgname-$pkgver
-	for i in ../*.patch; do
-		msg "Applying $i..."
-		patch -p1 < $i || return 1
-	done
-
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-ssl \
@@ -29,10 +24,13 @@ build() {
 		--enable-iproute2
 
 	make || return 1
-
 	cd plugin/down-root
 	make || return 1
 	cd ../..
+}
+
+package() {
+	cd "$_builddir"
 
 	make DESTDIR="$pkgdir" install || return 1
 
@@ -54,8 +52,6 @@ build() {
 
 	# install init.d
 	install -Dm755 ../openvpn.initd "$pkgdir"/etc/init.d/openvpn
-
 }
-md5sums="60745008b90b7dbe25fe8337c550fec6  openvpn-2.0.9.tar.gz
-a9075ceb8552980519132cc27fda85ac  openvpn-2.0.9-persistent.patch
-793184e36ad09b22cdb19b4294131508  openvpn.initd"
+md5sums="b273ed2b5ec8616fb9834cde8634bce7  openvpn-2.1.1.tar.gz
+020376f1e7ed6b4adbe20cf5ff774856  openvpn.initd"
diff --git a/main/openvpn/openvpn-2.0.9-persistent.patch b/main/openvpn/openvpn-2.0.9-persistent.patch
deleted file mode 100644
index e042124ea..000000000
--- a/main/openvpn/openvpn-2.0.9-persistent.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ru openvpn-2.0.9~/init.c openvpn-2.0.9/init.c
---- openvpn-2.0.9~/init.c	2008-05-13 23:21:30.000000000 +0200
-+++ openvpn-2.0.9/init.c	2008-05-13 23:22:51.000000000 +0200
-@@ -347,7 +347,8 @@
- 	msg (M_FATAL|M_OPTERR,
- 	     "options --mktun or --rmtun should only be used together with --dev");
-       tuncfg (options->dev, options->dev_type, options->dev_node,
--	      options->tun_ipv6, options->persist_mode);
-+	      options->tun_ipv6, options->persist_mode,
-+	      &options->tuntap_options);
-       return true;
-     }
- #endif
-diff -ru openvpn-2.0.9~/tun.c openvpn-2.0.9/tun.c
---- openvpn-2.0.9~/tun.c	2008-05-13 23:21:30.000000000 +0200
-+++ openvpn-2.0.9/tun.c	2008-05-13 23:22:51.000000000 +0200
-@@ -1095,13 +1095,14 @@
- #ifdef TUNSETPERSIST
- 
- void
--tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode)
-+tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode, const struct tuntap_options *options)
- {
-   struct tuntap *tt;
- 
-   ALLOC_OBJ (tt, struct tuntap);
-   clear_tuntap (tt);
-   tt->type = dev_type_enum (dev, dev_type);
-+  tt->options = *options;
-   open_tun (dev, dev_type, dev_node, ipv6, tt);
-   if (ioctl (tt->fd, TUNSETPERSIST, persist_mode) < 0)
-     msg (M_ERR, "Cannot ioctl TUNSETPERSIST(%d) %s", persist_mode, dev);
-diff -ru openvpn-2.0.9~/tun.h openvpn-2.0.9/tun.h
---- openvpn-2.0.9~/tun.h	2008-05-13 23:21:30.000000000 +0200
-+++ openvpn-2.0.9/tun.h	2008-05-13 23:22:51.000000000 +0200
-@@ -194,7 +194,7 @@
- int read_tun (struct tuntap* tt, uint8_t *buf, int len);
- 
- void tuncfg (const char *dev, const char *dev_type, const char *dev_node,
--	     bool ipv6, int persist_mode);
-+	     bool ipv6, int persist_mode, const struct tuntap_options *options);
- 
- const char *guess_tuntap_dev (const char *dev,
- 			      const char *dev_type,
diff --git a/main/openvpn/openvpn.initd b/main/openvpn/openvpn.initd
index 89201f9cf..7e0e3eb9e 100644
--- a/main/openvpn/openvpn.initd
+++ b/main/openvpn/openvpn.initd
@@ -13,9 +13,8 @@ VPNCONF="${VPNDIR}/${VPN}.conf"
 
 depend() {
 	need localmount net
-	after firewall
 	before netmount
-	after bootmisc
+	after bootmisc firewall
 }
 
 checktundevice() {
diff --git a/main/parted/APKBUILD b/main/parted/APKBUILD
index a606b7579..5e1721375 100644
--- a/main/parted/APKBUILD
+++ b/main/parted/APKBUILD
@@ -1,27 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=parted
-pkgver=1.8.8
-pkgrel=1
+pkgver=2.1
+pkgrel=0
 pkgdesc="Utility to create, destroy, resize, check and copy partitions"
 url="http://www.gnu.org/software/parted/parted.html"
 license="GPL3"
 subpackages="$pkgname-dev $pkgname-doc"
 depends=
-makedepends="pkgconfig e2fsprogs-dev readline-dev ncurses-dev"
-source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
-	nocxx.patch"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	patch configure < ../nocxx.patch || return 1
+makedepends="pkgconfig e2fsprogs-dev readline-dev ncurses-dev lvm2-dev"
+source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 
+_builddir="$srcdir"/$pkgname-$pkgver
+build() {
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--disable-debug \
 		--disable-nls \
 		--disable-Werror
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="0d494591731082ec57cc18627728124a  parted-1.8.8.tar.gz
-28513788ba4d556ccd538867dc6205ab  nocxx.patch"
+md5sums="c0fd26f12fefb013d77cc5160722ec03  parted-2.1.tar.gz"
diff --git a/main/perl-digest-hmac/APKBUILD b/main/perl-digest-hmac/APKBUILD
index f9538dc04..70717b732 100644
--- a/main/perl-digest-hmac/APKBUILD
+++ b/main/perl-digest-hmac/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-digest-hmac
 _realname=Digest-HMAC
-pkgver=1.01
+pkgver=1.02
 pkgrel=0
 pkgdesc="Keyed-Hashing for Message Authentication Perl module"
 url="http://search.cpan.org/~gaas/Digest-HMAC-1.01/"
@@ -12,14 +12,18 @@ install=
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
 
+_builddir="$srcdir"/$_realname-$pkgver
 build() {
-	cd "$srcdir/$_realname-$pkgver"
-
+	cd "$_builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-md5sums="32dc54c765100c638b5d7f7ff4c5c626  Digest-HMAC-1.01.tar.gz"
+md5sums="64c4b247d83cd64ec32aa22bf58a709b  Digest-HMAC-1.02.tar.gz"
diff --git a/main/perl-error/APKBUILD b/main/perl-error/APKBUILD
index f0926e0bd..9d04d4ee3 100644
--- a/main/perl-error/APKBUILD
+++ b/main/perl-error/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Leonardo Arena <rnalrd@gmail.com>
 pkgname=perl-error
 _realname=Error
-pkgver=0.17015
+pkgver=0.17016
 pkgrel=0
 pkgdesc="Perl module error/exception handling in an OO-ish way"
 url="http://search.cpan.org/~shlomif/Error-$pkgver/"
@@ -13,14 +13,18 @@ install=
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/$_realname-$pkgver.tar.gz"
 
+_builddir="$srcdir"/$_realname-$pkgver
 build() {
-	cd "$srcdir/$_realname-$pkgver"
-
+	cd "$_builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-md5sums="203bc410ae5040e7b647a52aa0fabafe  Error-0.17015.tar.gz"
+md5sums="eedcd3c6970568dd32092b5334328eff  Error-0.17016.tar.gz"
diff --git a/main/perl-mail-spamassassin/APKBUILD b/main/perl-mail-spamassassin/APKBUILD
index 6a3c88461..a86c014fd 100644
--- a/main/perl-mail-spamassassin/APKBUILD
+++ b/main/perl-mail-spamassassin/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=perl-mail-spamassassin
 _realname=Mail-SpamAssassin
 pkgver=3.2.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Spam detector and markup engine"
 url="http://search.cpan.org/~jmason/Mail-SpamAssassin-3.2.5/"
 license="unknown"
@@ -12,14 +12,21 @@ perl-mail-spf razor"
 makedepends="perl-dev zlib-dev"
 install=
 subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/J/JM/JMASON/$_realname-$pkgver.tar.gz"
+source="http://search.cpan.org/CPAN/authors/id/J/JM/JMASON/$_realname-$pkgver.tar.gz
+	spamassassin-3.2.5-DESTDIR.patch
+	"
 
 build() {
 	cd "$srcdir/$_realname-$pkgver"
-
+	patch -p1 -i ../spamassassin-3.2.5-DESTDIR.patch || return 1
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	make
+}
+
+package() {
+	cd "$srcdir/$_realname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="7fdc1651d0371c4a7f95ac9ae6f828a6  Mail-SpamAssassin-3.2.5.tar.gz"
+md5sums="7fdc1651d0371c4a7f95ac9ae6f828a6  Mail-SpamAssassin-3.2.5.tar.gz
+45885134199c9427add4d9bcb46311cf  spamassassin-3.2.5-DESTDIR.patch"
diff --git a/main/perl-mail-spamassassin/spamassassin-3.2.5-DESTDIR.patch b/main/perl-mail-spamassassin/spamassassin-3.2.5-DESTDIR.patch
new file mode 100644
index 000000000..a9765fc55
--- /dev/null
+++ b/main/perl-mail-spamassassin/spamassassin-3.2.5-DESTDIR.patch
@@ -0,0 +1,273 @@
+--- Mail-SpamAssassin-3.2.5/Makefile.PL.old	2009-10-21 23:25:18.000000000 +0200
++++ Mail-SpamAssassin-3.2.5/Makefile.PL	2009-10-21 23:31:28.000000000 +0200
+@@ -12,12 +12,12 @@
+ 
+ # avoid stupid 'Argument "6.30_01" isn't numeric in numeric ge (>=)' warnings;
+ # strip off the beta subversion noise that causes the trouble.
+ $mm_version =~ s/_\S+$//;      # "6.30_01" => "6.30"
+ 
+-if ($mm_version+0 < 5.45) {
+-  die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v5.45";
++if ($mm_version < 6.17) {
++  die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v6.17";
+ }
+ 
+ use constant RUNNING_ON_WINDOWS => ($^O =~ /^(mswin|dos|os2)/oi);
+ use constant HAS_DBI => eval { require DBI; };
+ 
+@@ -82,11 +82,10 @@
+ );
+ 
+ 
+ sub parse_arg {
+   my($val, $name) = (@_);
+-
+   if ($val =~ /^($name)=["']?(.*?)["']?$/) {
+     return $2;
+   } else {
+     return undef;
+   }
+@@ -107,53 +106,27 @@
+   return 'yes' if bool($val, $def);
+   return 'no';
+ }
+ 
+ 
+-
+ my %opt = (
+-  'build_spamc'        => undef,
++  'build_spamc'     => undef,
+   'enable_ssl'      => undef,
+   'contact_address' => undef,
+   'destdir'         => undef,
+ );
+ ARGV: foreach (@ARGV) {
+   foreach my $key (keys %opt) {
+-    my $val;
+-
+-    $val = parse_arg($_, uc($key));
++    my $val = parse_arg($_, uc($key));
+     if (defined $val) {
+       $opt{$key} = $val;
+       next ARGV;
+     }
+   }
+ }
+ 
+ 
+-# Gather some information about what EU::MM offers and/or needs
+-my(
+-  $mm_knows_destdir,
+-  $mm_has_destdir,
+-  $mm_has_good_destdir,
+-  $mm_needs_destdir,
+-);
+-
+-# MakeMaker prior to 6.11 doesn't support DESTDIR which is needed for
+-# packaging with builddir!=destdir. See bug 2388.
+-$mm_knows_destdir    = $ExtUtils::MakeMaker::Recognized_Att_Keys{DESTDIR};
+-$mm_has_good_destdir = $mm_version >= 6.11;
+-# Add DESTDIR hack only if it's requested (and necessary)
+-$mm_needs_destdir    = $opt{'destdir'} && !$mm_has_good_destdir;
+-$mm_has_destdir      = $mm_knows_destdir || $mm_needs_destdir;
+-push(@ATT_KEYS, 'DESTDIR') if $mm_needs_destdir;
+-
+-# Now make EU::MM understand our extended vars
+-foreach my $key (@ATT_KEYS) {
+-  $ExtUtils::MakeMaker::Recognized_Att_Keys{$key} = 1;
+-}
+-
+-
+ # Gather the rules files in the range 00-69; we do this in perl because
+ # it's more portable.  Also, plugin .pm files.
+ my @datafiles = map { s,^rules/,,; $_ }
+                 grep { -f $_ } (<rules/*.cf>, <rules/*.pm>);
+ my $datafiles = join(' ', (grep 
+@@ -270,75 +243,27 @@
+ 
+     # We have only this Makefile.PL and this option keeps MakeMaker from
+     # asking all questions twice after a 'make dist*'.
+     'NORECURS' => 1,
+ 
+-    # bug 5074: perl 5.6.1 (with ExtUtils::MakeMaker 5.45) attempts to
+-    # recurse anyway unless this is explicitly specified
+-    'DIR' => [ ],
+-
+     # Don't add META.yml to the MANIFEST for god's sake!
+     'NO_META' => 1,
+ );
+ 
+ # rules/72_active.cf is built from "rulesrc", but *must* exist before
+ # WriteMakefile() is called due to shortcomings in MakeMaker.
+ my @FILES_THAT_MUST_EXIST = qw(
+         rules/72_active.cf
+     );
+ 
+-# That META.yml stuff was introduced with Perl 6.06_03, see
+-# <http://archive.develooper.com/makemaker@perl.org/msg00922.html>
+-# <http://archive.develooper.com/makemaker@perl.org/msg00984.html>
+-delete $makefile{'NO_META'} if $mm_version < 6.06_03;
+-
+ # make sure certain optional modules are up-to-date if they are installed
+ # also see PREREQ_PM above
+ my %CURRENT_PM = (
+     'Net::DNS' => (RUNNING_ON_WINDOWS ? 0.46 : 0.34),
+     'Razor2::Client::Agent' => 2.40,
+ );
+ 
+-if ($mm_needs_destdir) {
+-  my $error = <<DESTDIR_HACK;
+-
+-    ***********************************************************************
+-    ExtUtils::MakeMaker ${mm_version} doesn't include support for DESTDIR,
+-    so if you want to be on the safe side, you might want to upgrade your
+-    ExtUtils::MakeMaker to version 6.11 or later. It is available via CPAN.
+-
+-    You can use either the CPAN shell or go to
+-      <http://search.cpan.org/search?module=ExtUtils::MakeMaker>
+-    to get an up-to-date version.
+-
+-    This should only be necessary if you are creating binary packages.
+-    ***********************************************************************
+-
+-DESTDIR_HACK
+-  $error =~ s/^ {4}//gm;
+-  warn $error;
+-}
+-elsif ($opt{'destdir'} and !$mm_has_good_destdir) {
+-  my $error = <<DESTDIR_BUG;
+-
+-    ***********************************************************************
+-    ExtUtils::MakeMaker ${mm_version} contains bugs that may cause problems
+-    in the \"make\" process.  It is recommended that you upgrade
+-    ExtUtils::MakeMaker to version 6.11 or later. It is available via CPAN.
+-
+-    You can use either the CPAN shell or go to
+-      <http://search.cpan.org/search?module=ExtUtils::MakeMaker>
+-    to get an up-to-date version.
+-
+-    This should only be necessary if you are creating binary packages.
+-    ***********************************************************************
+-
+-DESTDIR_BUG
+-  $error =~ s/^ {4}//gm;
+-  warn $error;
+-}
+-
+ 
+ # All the $(*MAN1*) stuff is empty/zero if Perl was Configured with -Dman1dir=none;
+ # however, support site/vendor man1 dirs (bug 5338)
+ unless($Config{installman1dir}
+     || $Config{installsiteman1dir}
+@@ -405,22 +330,19 @@
+ 
+ # Now finish the meta hash and dump the Makefile
+ $makefile{EXE_FILES} = [ values %{$makefile{EXE_FILES}} ];
+ $makefile{AUTHOR} =~ s/(<.+) at (.+>)/$1\@$2/;
+ WriteMakefile(%makefile);
+-print "Makefile written by ExtUtils::MakeMaker ${mm_version}\n";
++print "Makefile written by ExtUtils::MakeMaker $mm_version\n";
+ 
+ #######################################################################
+ 
+ package MY;
+ 
+-
+ use vars qw(
+   $MY_GLOBALS_ARE_SANE
+-
+   $RUNNING_ON_WINDOWS
+-
+   @REPOSITORIES
+ 
+   $MACRO_RE
+   $EQ_RE
+   $EQ
+@@ -906,19 +828,10 @@
+   init_MY_globals($self);
+ 
+   foreach (@code) {
+     # Add our install targets as a dependency to all top-level install targets
+     s/^(install(?:_[a-z]+)?\s*::?\s*.*)$/$1 conf__install data__install/;
+-
+-    # Now do the DESTDIR hack, if necessary.
+-    next if !$mm_needs_destdir;
+-    # Write the correct path to perllocal.pod
+-    next if /installed into/;
+-
+-    # Replace all other $(INSTALL*) vars (except $(INSTALLDIRS) of course)
+-    # with their $(DESTINSTALL*) counterparts
+-    s/\Q$(\E(INSTALL(?!DIRS)${MACRO_RE})\Q)\E/\$(DEST$1)/g;
+   }
+ 
+   clean_MY_globals($self);
+   return join("\n", @code);
+ }
+@@ -956,32 +869,10 @@
+           set_macro($rprefix, macro_ref('PREFIX'));
+           $line .= "\n" . macro_def($rprefix);
+         }
+       }
+     }
+-
+-    if (line_has_macro_def($line, 'MM_VERSION')) {
+-      # These macros are just for debugging purposes.
+-      $line = join("\n", $line,
+-         macro_def(MM_HAS_DESTDIR      => ::yesno($mm_has_destdir)),
+-         macro_def(MM_HAS_GOOD_DESTDIR => ::yesno($mm_has_good_destdir)),
+-         macro_def(MM_KNOWS_DESTDIR    => ::yesno($mm_knows_destdir)),
+-         macro_def(MM_NEEDS_DESTDIR    => ::yesno($mm_needs_destdir)),
+-       );
+-    }
+-
+-    # Add DESTDIR support if necessary
+-    if ($mm_needs_destdir) {
+-      if (line_has_macro_def($line, 'INSTALLDIRS')) {
+-        $line .= "\n" . macro_def('DESTDIR');
+-      }
+-      elsif (line_has_macro_def($line, qr/INSTALL${MACRO_RE}/)) {
+-        my $macro = get_macro_name_from_line($line);
+-        $line .= "\n" . macro_def('DEST' . $macro,
+-                          macro_ref('DESTDIR') . macro_ref($macro));
+-      }
+-    }
+   }
+   push(@code, qq{});
+ 
+   # Add some additional target dirs
+   {
+@@ -1015,13 +906,11 @@
+       foreach my $r (@REPOSITORIES) {
+         my $macro = 'INSTALL' . repository($r) . $m;
+         # The INSTALL* macros.
+         push(@code, macro_def($macro));
+         # The DESTINSTALL* macros.
+-        push(@code, macro_def('DEST' . $macro,
+-                      macro_ref('DESTDIR') . macro_ref($macro)))
+-          if $mm_has_destdir;
++        push(@code, macro_def('DEST' . $macro, macro_ref('DESTDIR') . macro_ref($macro)));
+       }
+     }
+   }
+ 
+   # Set the PERL_* stuff
+@@ -1068,17 +957,12 @@
+     # SCRIPT macro is the same for all repositories.
+     foreach my $macro (qw(SCRIPT DATA CONF LIB)) {
+       push(@code, macro_def('I_' . $macro . 'DIR',
+                     macro_ref('INSTALL' . repository($repository, $macro eq 'SCRIPT') . $macro)));
+ 
+-      if ($mm_has_destdir) {
+-        push(@code, macro_def('B_' . $macro . 'DIR',
+-                      macro_ref('DESTINSTALL' . repository($repository, $macro eq 'SCRIPT') . $macro)));
+-      } else {
+-        push(@code, macro_def('B_' . $macro . 'DIR',
+-                      macro_ref('I_' . $macro . 'DIR')));
+-      }
++      push(@code, macro_def('B_' . $macro . 'DIR',
++                    macro_ref('DESTINSTALL' . repository($repository, $macro eq 'SCRIPT') . $macro)));
+     }
+   }
+ 
+   clean_MY_globals($self);
+   return join("\n", @code);
diff --git a/main/perl-mail-spf/APKBUILD b/main/perl-mail-spf/APKBUILD
index 83842478e..eec71b18b 100644
--- a/main/perl-mail-spf/APKBUILD
+++ b/main/perl-mail-spf/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer:  Leonardo Arena <rnalrd@gmail.com>
 pkgname=perl-mail-spf
 _realname=Mail-SPF
-pkgver=2.006
-pkgrel=1
+pkgver=2.007
+pkgrel=0
 pkgdesc="An object-oriented implementation of Sender Policy Framework"
 url="http://search.cpan.org/~jmehnle/Mail-SPF-v2.006/"
 license="GPL PerlArtistic"
@@ -13,12 +13,16 @@ install=
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/J/JM/JMEHNLE/mail-spf/$_realname-v$pkgver.tar.gz"
 
+_builddir="$srcdir/$_realname-v$pkgver"
 build() {
-	cd "$srcdir/$_realname-v$pkgver"
-
+	cd "$_builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="4da41591b612560627ddbc6026b047a3  Mail-SPF-v2.006.tar.gz"
+md5sums="67dccdc91e3264679a0e17d493d3cc30  Mail-SPF-v2.007.tar.gz"
diff --git a/main/perl-net-dns/APKBUILD b/main/perl-net-dns/APKBUILD
index a9eef71bf..d87821b69 100644
--- a/main/perl-net-dns/APKBUILD
+++ b/main/perl-net-dns/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Leonardo Arena <rnalrd@gmail.com>
 pkgname=perl-net-dns
 _realname=Net-DNS
-pkgver=0.65
+pkgver=0.66
 pkgrel=0
 pkgdesc="Perl interface to the DNS resolver"
 url="http://search.cpan.org/dist/Archive-Zip/"
@@ -13,14 +13,18 @@ install=
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/O/OL/OLAF/$_realname-$pkgver.tar.gz"
 
+_builddir="$srcdir/$_realname-$pkgver"
 build() {
-	cd "$srcdir/$_realname-$pkgver"
-
+	cd "$_builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
         # creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-md5sums="54e5a12a20de39b954a93723927ac789  Net-DNS-0.65.tar.gz"
+md5sums="1635d876324e3c2f6e277d5778bfe94c  Net-DNS-0.66.tar.gz"
diff --git a/testing/perl-net-rblcient/APKBUILD b/main/perl-net-rblclient/APKBUILD
index e68eaae29..e68eaae29 100644
--- a/testing/perl-net-rblcient/APKBUILD
+++ b/main/perl-net-rblclient/APKBUILD
diff --git a/testing/perl-parse-syslog/APKBUILD b/main/perl-parse-syslog/APKBUILD
index af6da0fed..af6da0fed 100644
--- a/testing/perl-parse-syslog/APKBUILD
+++ b/main/perl-parse-syslog/APKBUILD
diff --git a/main/postgrey/APKBUILD b/main/postgrey/APKBUILD
index b7ce04f1c..83afce3c6 100644
--- a/main/postgrey/APKBUILD
+++ b/main/postgrey/APKBUILD
@@ -1,30 +1,36 @@
-# Maintainer: Leonardo Arena <rnalrg@gmail.com>
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=postgrey
 pkgver=1.32
-pkgrel=0
-pkgdesc="Postfix Greylisting Policy Server"
+pkgrel=2
+pkgdesc="Postfix policy server implementing greylisting"
 url="http://postgrey.schweikert.ch/"
-license="GPL-2"
-depends="perl-net-server perl-io-multiplex perl-db postfix"
+license="GPL"
+depends="perl perl-db perl-net-dns perl-net-server perl-io-multiplex
+	perl-net-rblclient perl-parse-syslog"
+pkgusers="postgrey"
+pkggroups="postgrey"
 makedepends=""
-install="$pkgname.pre-install"
-subpackages="$pkgname-doc"
-source="http://postgrey.schweikert.ch/pub/$pkgname-$pkgver.tar.gz"
+install=postgrey.pre-install
+subpackages=""
+source="http://postgrey.schweikert.ch/pub/$pkgname-$pkgver.tar.gz
+	postgrey.confd
+	postgrey.initd"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	mkdir -p -m0770 $pkgdir/var/spool/postfix/postgrey
-	chown postgrey.postgrey $pkgdir/var/spool/postfix/postgrey
-	install -m755 -D postgrey $pkgdir/usr/sbin/postgrey
-	install -m755 -D policy-test $pkgdir/usr/bin/policy-test
-	install -m755 -D contrib/postgreyreport $pkgdir/usr/bin/postgreyreport
-	install -m644 -D postgrey_whitelist_recipients $pkgdir/etc/postfix/postgrey_whitelist_recipients
-	install -m644 -D postgrey_whitelist_clients $pkgdir/etc/postfix/postgrey_whitelist_clients
-	install -m644 -D README $pkgdir/usr/share/doc/$pkgname/README
-	install -m644 -D Changes $pkgdir/usr/share/doc/$pkgname/Changes
-	install -m644 -D COPYING $pkgdir/usr/share/doc/$pkgname/COPYING
-	install -m755 -D ../../postgrey.init $pkgdir/etc/init.d/postgrey
-	install -m644 -D ../../postgrey.conf $pkgdir/etc/conf.d/postgrey
+	
+	install -m755 -D $pkgname  "$pkgdir"/usr/sbin/$pkgname
+	mkdir -p "$pkgdir"/var/spool/postfix/$pkgname
+	chown postgrey:postgrey "$pkgdir"/var/spool/postfix/$pkgname
+	chmod 770 "$pkgdir"/var/spool/postfix/$pkgname
+	install -m755 -D contrib/postgreyreport "$pkgdir"/usr/bin/postgreyreport
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -m644 -D postgrey_whitelist_clients "$pkgdir"/etc/postfix/postgrey_whitelist_clients
+	install -m644 -D postgrey_whitelist_recipients "$pkgdir"/etc/postfix/postgrey_whitelist_recipients
+	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-md5sums="524a4e165bf997996f3bccade394712f  postgrey-1.32.tar.gz"
+md5sums="524a4e165bf997996f3bccade394712f  postgrey-1.32.tar.gz
+caaad5770ab07fb5af3bbd522a05b84f  postgrey.confd
+d0611b244202c77ad7ad79862721a738  postgrey.initd"
diff --git a/main/postgrey/postgrey.conf b/main/postgrey/postgrey.conf
deleted file mode 100644
index 0baa871a8..000000000
--- a/main/postgrey/postgrey.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-# Config file for /etc/init.d/postgrey
-
-# LISTEN TYPE
-#  Set to 'inet' if you want to use a TCP socket.
-#  Set to 'unix' if you want to use an UNIX socket.
-POSTGREY_TYPE="inet"
-
-# HOST
-#  What IP should postgrey bind to?
-#  Leave unchanged unless you know what you are doing.
-#  (ignored if POSTGREY_TYPE is set to 'unix')
-POSTGREY_HOST="127.0.0.1"
-
-# PORT
-#  What TCP port should postgrey listen on?
-#  (ignored if POSTGREY_TYPE is set to 'unix')
-POSTGREY_PORT="10030"
-
-# SOCKET
-#  Unix socket to listen on, if POSTGREY_TYPE is set to 'unix'.
-#  Leave unchanged unless you know what you are doing.
-#  (ignored if POSTGREY_TYPE is set to 'inet')
-POSTGREY_SOCKET="/var/spool/postfix/private/postgrey"
-
-# PID
-#  Postgrey pid file.
-#  Do not change, if you don't know what this is!
-POSTGREY_PID="/var/run/postgrey.pid"
-
-# DELAY
-#  How long to delay mail that is greylisted in seconds.
-POSTGREY_DELAY=60
-
-# TEXT
-#  The response we'll send back with delayed mail.
-POSTGREY_TEXT="Greylisted for %s seconds"
-
-# Additional Postgrey options
-#
-# -v, --verbose			increase verbosity level
-# --max-age=N			delete entries older than N days since the last time
-#				that they have been seen (default: 30)
-# --retry-window=N		allow only N days for the first retrial (default: 2)
-#				append 'h' if you want to specify it in hours
-# --greylist-action=A		if greylisted, return A to Postfix (default: DEFER_IF_PERMIT)
-# --lookup-by-subnet		strip the last 8 bits from IP addresses (default)
-# --lookup-by-host		do not strip the last 8 bits from IP addresses
-# --whitelist-clients=FILE	default: /etc/postfix/postgrey_whitelist_clients
-# --whitelist-recipients=FILE	default: /etc/postfix/postgrey_whitelist_recipients
-#
-# Note that the --whitelist-x options can be specified multiple times, and that
-# per default /etc/postfix/postgrey_whitelist_clients.local is also read, so
-# that you can put there local entries.
-#
-POSTGREY_OPTS=""
diff --git a/testing/postgrey/postgrey.confd b/main/postgrey/postgrey.confd
index 7a6deb587..7a6deb587 100644
--- a/testing/postgrey/postgrey.confd
+++ b/main/postgrey/postgrey.confd
diff --git a/main/postgrey/postgrey.init b/main/postgrey/postgrey.init
deleted file mode 100644
index d38538de1..000000000
--- a/main/postgrey/postgrey.init
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/mail-filter/postgrey/files/postgrey.rc.new,v 1.10 2008/05/21 18:45:44 dertobi123 Exp $
-
-conf="/etc/conf.d/postgrey"
-
-opts="${opts} reload"
-
-depend() {
-	need net
-	before postfix
-	provide postfix_greylist
-}
-
-conf_error() {
-	eerror "You need to setup ${conf} first"
-	return 1
-}
-
-checkconfig() {
-if [ -z "${POSTGREY_TYPE}" ]
-	then
-		einfo "You need to choose the server type you want"
-		einfo "by setting the POSTGREY_TYPE variable in ${conf}."
-	else
-	if [ "x${POSTGREY_TYPE}" = "xinet" ]
-		then
-			if [ -z "${POSTGREY_PORT}" ] || [ -z "${POSTGREY_HOST}" ]
-				then
-					einfo "The following entries are missing in ${conf}:"
-					[ -z "${POSTGREY_HOST}" ] && einfo "  - POSTGREY_HOST"
-					[ -z "${POSTGREY_PORT}" ] && einfo "  - POSTGREY_PORT"
-					conf_error
-			fi
-			POSTGREY_ADDR="${POSTGREY_TYPE}=${POSTGREY_HOST}:${POSTGREY_PORT}"
-		else
-			if [ -z "${POSTGREY_SOCKET}" ]
-			then
-				einfo "The following entries are missing in ${conf}:"
-				[ -z "${POSTGREY_SOCKET}" ] && einfo "  - POSTGREY_SOCKET"
-				conf_error
-			fi
-			POSTGREY_ADDR="${POSTGREY_TYPE}=${POSTGREY_SOCKET}"
-	fi
-fi
-
-	if [ -z "${POSTGREY_PID}" ]
-		then
-		einfo "The following entries are missing in ${conf}:"
-		[ -z "${POSTGREY_PID}" ] && einfo "  - POSTGREY_PID"
-		conf_error
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting Postgrey"
-	
-	# HACK -- start a subshell and corrects perms on the socket...
-	( if [ "x${POSTGREY_TYPE}" = "xunix" ]; then
-	rm -f ${POSTGREY_SOCKET};
-	while ! test -S ${POSTGREY_SOCKET}; do sleep 1; done;
-	chmod a+rw,a-x ${POSTGREY_SOCKET}; fi ) &
-
-	if [ -z ${POSTGREY_DELAY} ] ; then
-		POSTGREY_DELAY_ARG=""
-	else
-		POSTGREY_DELAY_ARG="--delay=${POSTGREY_DELAY}"
-	fi
-
-	if [ -z "${POSTGREY_TEXT}" ] ; then
-		POSTGREY_TEXT_ARG=""
-	else
-		POSTGREY_TEXT_ARG="--greylist-text=${POSTGREY_TEXT}"
-	fi
-
-	start-stop-daemon --start --quiet --background \
-		--pidfile=${POSTGREY_PID} \
-		--name postgrey \
-		--exec /usr/sbin/postgrey -- \
-		--${POSTGREY_ADDR} \
-		--daemonize \
-		--pidfile=${POSTGREY_PID} \
-		${POSTGREY_DELAY_ARG} \
-		${POSTGREY_OPTS} \
-		"${POSTGREY_TEXT_ARG}"
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping Postgrey"
-	start-stop-daemon --stop --quiet --pidfile ${POSTGREY_PID}
-	eend ${?}
-}
-
-reload() {
-	ebegin "Reloading Postgrey"
-	start-stop-daemon --stop --signal HUP --oknodo --pidfile ${POSTGREY_PID}
-	eend $?
-}
diff --git a/testing/postgrey/postgrey.initd b/main/postgrey/postgrey.initd
index c9e51ceba..c9e51ceba 100644
--- a/testing/postgrey/postgrey.initd
+++ b/main/postgrey/postgrey.initd
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index e37a27f7d..3c34c3fd5 100755..100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
@@ -1,2 +1,6 @@
 #!/bin/sh
-adduser -h /var/spool/postfix/postgrey -g postgrey -s /bin/false -D postgrey &>/dev/null
+
+addgroup postgrey 2>/dev/null
+adduser -H -h /dev/null -s /bin/false -D postgrey  2>/dev/null
+
+exit 0
diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD
index 33126d3f3..8cd7aa0f6 100644
--- a/main/wireshark/APKBUILD
+++ b/main/wireshark/APKBUILD
@@ -1,19 +1,20 @@
 # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
 # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
 pkgname=wireshark
-pkgver=1.2.4
+pkgver=1.2.6
 pkgrel=0
-pkgdesc="A free network protocol analyzer for Unix/Linux and Windows formerly known as Ethereal"
+pkgdesc="network protocol analyzer - GTK version"
 url="http://www.wireshark.org"
 license="GPLv2"
-depends="gnutls bash heimdal"
-makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev"
+depends="bash"
+makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev
+	gtk+-dev c-ares-dev pcre-dev openssl-dev"
 install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark"
+source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2
+	wireshark.desktop
+	wireshark.png"
 
-# append extra dependencies to -dev subpackage
-# remove if not used.
 # depends_dev="somepackage-dev"
 
 build() {
@@ -23,9 +24,7 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-wireshark \
-		--disable-editcap \
-		--disable-mergecap \
+		--with-ssl \
 		--disable-text2pcap \
 		--disable-idl2wrs \
 		--disable-dftest \
@@ -35,7 +34,36 @@ build() {
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" install
+	install -Dm644 "$srcdir"/wireshark.png \
+		"$pkgdir"/usr/share/icons/wireshark.png
+	install -Dm644 "$srcdir"/wireshark.desktop \
+		"$pkgdir"/usr/share/applications/wireshark.desktop
 }
 
-md5sums="ae4533da7d0e54c236e1eed966c42163  wireshark-1.2.4.tar.bz2"
+common() {
+	local i
+	pkgdesc="network protoccol analyzer - common files"
+	mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/share \
+		"$subpkgdir"/usr/bin
+	mv "$pkgdir"/etc "$subpkgdir"/
+	mv "$pkgdir"/usr/share/wireshark "$subpkgdir"/usr/share/
+	mv "$pkgdir"/usr/lib/* "$subpkgdir"/usr/lib/
+	# move all bins except wireshark
+	for i in "$pkgdir"/usr/bin/*; do
+		case "$i" in
+			*/tshark|*/wireshark) continue;;
+		esac
+		mv "$i" "$subpkgdir"/usr/bin/
+	done
+}
+
+tshark() {
+	pkgdesc="network protoccol analyzer - console version"
+	install -d "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark
+}
+
+md5sums="f3e0917ed393366bbf96c53b58cb0931  wireshark-1.2.6.tar.bz2
+504ede44c02b2a52f6cbd3bffdf93b8d  wireshark.desktop
+e771800a8c977fe223583a453bc27397  wireshark.png"
diff --git a/main/wireshark/wireshark.desktop b/main/wireshark/wireshark.desktop
new file mode 100644
index 000000000..f4317f6d0
--- /dev/null
+++ b/main/wireshark/wireshark.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+GenericName=Wireshark
+Comment=Network protocol analyzer
+Name=wireshark
+Exec=wireshark
+Icon=/usr/share/icons/wireshark.png
+Type=Application
+Terminal=false
+Categories=Application;Network;
diff --git a/main/wireshark/wireshark.png b/main/wireshark/wireshark.png
new file mode 100644
index 000000000..4e4026304
--- /dev/null
+++ b/main/wireshark/wireshark.png
diff --git a/testing/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD
index f90441589..f90441589 100644
--- a/testing/wpa_supplicant/APKBUILD
+++ b/main/wpa_supplicant/APKBUILD
diff --git a/main/wv/APKBUILD b/main/wv/APKBUILD
index c66ff3b11..b3b48ff42 100644
--- a/main/wv/APKBUILD
+++ b/main/wv/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wv
 pkgver=1.2.4
-pkgrel=0
+pkgrel=1
 pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats"
 url="http://sourceforge.net/projects/wvware"
 license="GPL"
diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD
index 83d31e03f..638c4b72f 100644
--- a/main/xfsprogs/APKBUILD
+++ b/main/xfsprogs/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfsprogs
-pkgver=3.1.0
+pkgver=3.1.1
 pkgrel=0
 pkgdesc="XFS filesystem utilities"
 url="http://oss.sgi.com/projects/xfs/"
@@ -9,17 +9,13 @@ depends="e2fsprogs"
 makedepends="e2fsprogs-dev bash"
 subpackages="$pkgname-dev $pkgname-doc"
 source="ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-$pkgver.tar.gz
-	xfsprogs-3.0.0-gzip.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
-	for i in ../*.patch; do
-		msg "Applying $i..."
-		patch -p1 < $i || return 1
-	done
+	sed -i -e 's/--best//' Makefile doc/Makefile
 }
 	
 build() {
@@ -40,5 +36,4 @@ package() {
 	cd "$_builddir"
 	make -j1 DIST_ROOT="$pkgdir" install install-dev
 }
-md5sums="07c1ff6a4a44b58ee5ffdabca33a4493  xfsprogs-3.1.0.tar.gz
-c72865de30f55343e843dd4fd49a91c5  xfsprogs-3.0.0-gzip.patch"
+md5sums="c2308b46ee707597ac50aae418d321b8  xfsprogs-3.1.1.tar.gz"
diff --git a/main/xfsprogs/xfsprogs-3.0.0-gzip.patch b/main/xfsprogs/xfsprogs-3.0.0-gzip.patch
deleted file mode 100644
index 40f80023d..000000000
--- a/main/xfsprogs/xfsprogs-3.0.0-gzip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru xfsprogs-3.0.0.orig/doc/Makefile xfsprogs-3.0.0/doc/Makefile
---- xfsprogs-3.0.0.orig/doc/Makefile	2009-02-18 13:42:47.000000000 +0000
-+++ xfsprogs-3.0.0/doc/Makefile	2009-02-18 13:43:10.000000000 +0000
-@@ -13,7 +13,7 @@
- include $(BUILDRULES)
- 
- CHANGES.gz:
--	$(ZIP) --best -c < CHANGES > $@
-+	$(ZIP) -c < CHANGES > $@
- 
- install: default
- 	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
-diff -ru xfsprogs-3.0.0.orig/include/buildmacros xfsprogs-3.0.0/include/buildmacros
---- xfsprogs-3.0.0.orig/include/buildmacros	2009-02-18 13:42:47.000000000 +0000
-+++ xfsprogs-3.0.0/include/buildmacros	2009-02-18 13:43:46.000000000 +0000
-@@ -128,7 +128,7 @@
- MAN_MAKERULE = \
- 	@for f in *.[12345678] ""; do \
- 		if test ! -z "$$f"; then \
--			$(ZIP) --best -c < $$f > $$f.gz; \
-+			$(ZIP) -c < $$f > $$f.gz; \
- 		fi; \
- 	done
- 
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index 4b9796e36..062e456d1 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xorg-server
-pkgver=1.7.3.902
+pkgver=1.7.4.901
 pkgrel=0
 pkgdesc="X.Org X servers"
 url="http://xorg.freedesktop.org"
@@ -133,5 +133,5 @@ xephyr() {
 	mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/
 }
 
-md5sums="5806bd9d1ed734a60db2e32473a720b4  xorg-server-1.7.3.902.tar.bz2
+md5sums="e1656bd2fd362299dc7bae489525a9da  xorg-server-1.7.4.901.tar.bz2
 222de594206d1148a90eddfda4f7a11a  xorg-redhat-die-ugly-pattern-die-die-die.patch"
diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD
index b9d1f799b..11f1f87e9 100644
--- a/main/zlib/APKBUILD
+++ b/main/zlib/APKBUILD
@@ -1,25 +1,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zlib
-pkgver=1.2.3.4
+pkgver=1.2.3.7
 pkgrel=1
 pkgdesc="A compression/decompression Library"
 license=custom:zlib
 url="http://www.gzip.org/zlib"
 depends=
-source="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
+source="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz
+	gzflush.patch"
 subpackages="$pkgname-dev $pkgname-doc"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+prepare() {
+	cd "$_builddir"
+	patch -p1 -i "$srcdir"/gzflush.patch
+}
+
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	./configure --prefix=/usr --libdir=/lib --shared
 	make || return 1
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	make install \
 		pkgconfigdir="/usr/lib/pkgconfig" \
-		LIBS="libz.so.1.2.3.4 libz.a" \
 		DESTDIR="$pkgdir" || return 1
 }
 
@@ -29,4 +35,5 @@ dev() {
 	mv "$pkgdir"/lib/libz.a "$subpkgdir"/lib/libz.a
 }
 
-md5sums="70cad33163abe3c234939a5c63bf95ea  zlib-1.2.3.4.tar.gz"
+md5sums="323e45f54f321116a34950e8fbf5b6e7  zlib-1.2.3.7.tar.gz
+36746b916479fcf14b7a4393bee2f2d6  gzflush.patch"
diff --git a/main/zlib/gzflush.patch b/main/zlib/gzflush.patch
new file mode 100644
index 000000000..5e97e6573
--- /dev/null
+++ b/main/zlib/gzflush.patch
@@ -0,0 +1,12 @@
+--- a/gzwrite.c	2010-01-18 21:18:27.000000000 +0100
++++ b/gzwrite.c	2010-01-28 04:37:20.330530306 +0100
+@@ -435,7 +435,8 @@
+     state = (gz_statep)file;
+ 
+     /* check that we're writing and that there's no error */
+-    if (state->mode != GZ_WRITE|| state->err != Z_OK)
++    if (state->mode != GZ_WRITE || state->err != Z_OK)
++        return Z_STREAM_ERROR;
+ 
+     /* check flush parameter */
+     if (flush < 0 || flush > Z_FINISH)
diff --git a/unstable/freeswitch/APKBUILD b/testing/freeswitch/APKBUILD
index df048f605..293678c7d 100644
--- a/unstable/freeswitch/APKBUILD
+++ b/testing/freeswitch/APKBUILD
@@ -1,36 +1,23 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 pkgname=freeswitch
-pkgver=1.0.3
-pkgrel=1
+pkgver=1.0.4
+pkgrel=0
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
 license="GPL"
 depends=""
-makedepends="uclibc++-dev curl-dev unixodbc-dev zlib-dev openssl-dev
+makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev
 	autoconf automake libtool"
 install=
 subpackages="$pkgname-dev"
-source="http://files.freeswitch.org/freeswitch-1.0.3.tar.gz
+source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz
 	modules.conf
-	freeswitch-1.0.3-libtool22-2.patch
-	freeswitch-1.0.3-parallel-build.patch
 	"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	for i in ../*.patch; do
-		msg "Appling $i..."
-		patch -p1 < $i || return 1
-	done
 	cp -f "$srcdir/modules.conf" modules.conf || return 1
 
-	aclocal || return 1
-	autoconf || return 1
-	automake --add-missing || return 1
-	autoheader || return 1
-	libtoolize || return 1
-
-	export CXX=g++-uc
 	# i think our max cmd len is 32768
 	# by specifying it here we save our selves from some CPU cycles
 	export lt_cv_sys_max_cmd_len=8192
@@ -62,7 +49,5 @@ build() {
 	# install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-md5sums="9352e159b6067ce15afe50ba45c40df7  freeswitch-1.0.3.tar.gz
-c05f2356be159e99b3845f5260a33599  modules.conf
-c9dc93ce5cf13b4bc9ca620131709671  freeswitch-1.0.3-libtool22-2.patch
-5bd0c33cbd2a0a0ea4c12c0e1083e3a2  freeswitch-1.0.3-parallel-build.patch"
+md5sums="86e34bdd8cc027d71772cb0dc51388da  freeswitch-1.0.4.tar.gz
+c05f2356be159e99b3845f5260a33599  modules.conf"
diff --git a/unstable/freeswitch/freeswitch.initd b/testing/freeswitch/freeswitch.initd
index 34f441390..34f441390 100644
--- a/unstable/freeswitch/freeswitch.initd
+++ b/testing/freeswitch/freeswitch.initd
diff --git a/unstable/freeswitch/freeswitch.install b/testing/freeswitch/freeswitch.install
index 0507fe532..0507fe532 100755
--- a/unstable/freeswitch/freeswitch.install
+++ b/testing/freeswitch/freeswitch.install
diff --git a/unstable/freeswitch/modules.conf b/testing/freeswitch/modules.conf
index c6f5a05de..c6f5a05de 100644
--- a/unstable/freeswitch/modules.conf
+++ b/testing/freeswitch/modules.conf
diff --git a/testing/madwimax/APKBUILD b/testing/madwimax/APKBUILD
index 251ff801a..70367a675 100644
--- a/testing/madwimax/APKBUILD
+++ b/testing/madwimax/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=madwimax
 pkgver=0.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="WiMAX driver for the Samsung SWC-U200 and similar USB modems"
 url="http://code.google.com/p/madwimax/"
 license="GPL-2"
@@ -12,15 +12,19 @@ install=
 subpackages="$pkgname-doc"
 source="http://madwimax.googlecode.com/files/madwimax-0.1.1.tar.gz"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 build() {
-         cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--without-man-pages \
+		|| return 1
+	make || return 1
+}
 
-         ./configure --prefix=/usr \
-                 --sysconfdir=/etc \
-		 --without-man-pages \
-		 || return 1
-         make || return 1
-         make DESTDIR="$pkgdir" install
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
 
 #2009-10-07,SP: you can start it simply by /usr/sbin/madwimax -d
 #, so no init.d script so far...
diff --git a/testing/openvpn/APKBUILD b/testing/openvpn/APKBUILD
deleted file mode 100644
index bd751f311..000000000
--- a/testing/openvpn/APKBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=openvpn
-pkgver=2.1.1
-pkgrel=0
-pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
-url="http://openvpn.sourceforge.net/"
-license="custom"
-subpackages="$pkgname-doc"
-depends="iproute2"
-makedepends="openssl-dev lzo-dev"
-install=
-source="http://$pkgname.net/release/$pkgname-$pkgver.tar.gz
-	openvpn.initd
-	"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-build() { 
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-ssl \
-		--enable-crypto \
-		--disable-threads \
-		--enable-iproute2
-
-	make || return 1
-	cd plugin/down-root
-	make || return 1
-	cd ../..
-}
-
-package() {
-	cd "$_builddir"
-
-	make DESTDIR="$pkgdir" install || return 1
-
-	# install plugins
-	install -d "$pkgdir"/usr/lib/$pkgname
-	cp plugin/*/*.so "$pkgdir"/usr/lib/$pkgname
-
-	# install easy-rsa
-	sed -i -e 's/--directory/-d/g; s/--mode=/-m/g' easy-rsa/2.0/Makefile
-	sed -i -e '1s|#!/bin/bash|#!/bin/sh|' easy-rsa/2.0/*
-	make -C easy-rsa/2.0 DESTDIR="$pkgdir" \
-		PREFIX=etc/openvpn/easy-rsa \
-		install
-
-	# install examples
-	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/examples
-	cp -a sample-config-files "$pkgdir"/usr/share/doc/$pkgname/examples
-	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-
-	# install init.d
-	install -Dm755 ../openvpn.initd "$pkgdir"/etc/init.d/openvpn
-}
-md5sums="b273ed2b5ec8616fb9834cde8634bce7  openvpn-2.1.1.tar.gz
-020376f1e7ed6b4adbe20cf5ff774856  openvpn.initd"
diff --git a/testing/openvpn/openvpn.initd b/testing/openvpn/openvpn.initd
deleted file mode 100644
index 7e0e3eb9e..000000000
--- a/testing/openvpn/openvpn.initd
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VPNDIR="/etc/openvpn"
-VPN="${SVCNAME#*.}"
-if [ -n "${VPN}" ] && [ "${SVCNAME}" != "openvpn" ]; then
-	VPNPID="/var/run/openvpn.${VPN}.pid"
-else
-	VPNPID="/var/run/openvpn.pid"
-fi
-VPNCONF="${VPNDIR}/${VPN}.conf"
-
-depend() {
-	need localmount net
-	before netmount
-	after bootmisc firewall
-}
-
-checktundevice() {
-	if [ ! -e /dev/net/tun ]; then
-		if ! modprobe tun ; then
-			eerror "TUN/TAP support is not available in this kernel"
-			return 1
-		fi
-	fi
-	if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
-		ebegin "Detected broken /dev/net/tun symlink, fixing..."
-		rm -f /dev/net/tun
-		ln -s /dev/misc/net/tun /dev/net/tun
-		eend $?
-	fi
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	checktundevice || return 1
-
-	if [ ! -e "${VPNCONF}" ]; then
-		eend 1 "${VPNCONF} does not exist"
-		return 1
-	fi
-
-	local args=""
-	# If the config file does not specify the cd option, we do
-	# But if we specify it, we override the config option which we do not want
-	if ! grep -q "^[ \t]*cd[ \t].*" "${VPNCONF}" ; then
-		args="${args} --cd ${VPNDIR}"
-	fi
-
-	start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \
-		-- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon ${args}
-	eend $? "Check your logs to see why startup failed"
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/sbin/openvpn --pidfile "${VPNPID}"
-	eend $?
-}
-
-# vim: ts=4
diff --git a/testing/perl-io-multiplex/APKBUILD b/testing/perl-io-multiplex/APKBUILD
deleted file mode 100644
index e5d9bc065..000000000
--- a/testing/perl-io-multiplex/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer:  Michael Mason <ms13sp@gmail.com>
-pkgname=perl-io-multiplex
-_realname=IO-Multiplex
-pkgver=1.10
-pkgrel=0
-pkgdesc="Manage IO on many file handles"
-url="http://search.cpan.org/dist/IO-Multiplex/"
-license="unknown"
-depends="perl"
-makedepends="perl-dev"
-install=
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/B/BB/BBB/$_realname-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir/$_realname-$pkgver"
-
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install
-	# creates file collision among perl modules
-	find "$pkgdir" -name perllocal.pod -delete
-}
-
-md5sums="ce230ee0a4afbff59da66f0c42e0340b  IO-Multiplex-1.10.tar.gz"
diff --git a/testing/postgrey/APKBUILD b/testing/postgrey/APKBUILD
deleted file mode 100644
index 756811438..000000000
--- a/testing/postgrey/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Michael Mason <ms13sp@gmail.com>
-pkgname=postgrey
-pkgver=1.32
-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=postgrey.pre-install
-subpackages=""
-source="http://postgrey.schweikert.ch/pub/$pkgname-$pkgver.tar.gz
-	postgrey.confd
-	postgrey.initd"
-#still need PERL-IO Multiplex and PERL-PARSE-SYSLOG and NET-RBLClient
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	
-	install -m755 -D $pkgname  "$pkgdir"/usr/sbin/$pkgname
-	mkdir -p "$pkgdir"/var/spool/postfix/$pkgname
-	chown postgrey:postgrey "$pkgdir"/var/spool/postfix/$pkgname
-	chmod 770 "$pkgdir"/var/spool/postfix/$pkgname
-	install -m755 -D contrib/postgreyreport "$pkgdir"/usr/bin/postgreyreport
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -m644 -D postgrey_whitelist_clients "$pkgdir"/etc/postfix/postgrey_whitelist_clients
-	install -m644 -D postgrey_whitelist_recipients "$pkgdir"/etc/postfix/postgrey_whitelist_recipients
-	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-}
-
-md5sums="524a4e165bf997996f3bccade394712f  postgrey-1.32.tar.gz
-caaad5770ab07fb5af3bbd522a05b84f  postgrey.confd
-d0611b244202c77ad7ad79862721a738  postgrey.initd"
diff --git a/testing/postgrey/postgrey.pre-install b/testing/postgrey/postgrey.pre-install
deleted file mode 100644
index 3c34c3fd5..000000000
--- a/testing/postgrey/postgrey.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup postgrey 2>/dev/null
-adduser -H -h /dev/null -s /bin/false -D postgrey  2>/dev/null
-
-exit 0
diff --git a/unstable/freeswitch/freeswitch-1.0.3-libtool22-2.patch b/unstable/freeswitch/freeswitch-1.0.3-libtool22-2.patch
deleted file mode 100644
index f36fa45f6..000000000
--- a/unstable/freeswitch/freeswitch-1.0.3-libtool22-2.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-This is cooked version of:
-5. Text File  fs-r11674-libtool22-2.patch (14 kB)
-http://jira.freeswitch.org/browse/FSBUILD-82
-
-Index: libs/apr/build/config.sub
-===================================================================
---- a/libs/apr/build/config.sub	(revision 11675)
-+++ b/libs/apr/build/config.sub	(working copy)
-@@ -1,10 +1,9 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--#   Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- 
--timestamp='2006-07-02'
-+timestamp='2005-12-11'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -241,7 +240,7 @@
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
--	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
- 	| bfin \
- 	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
-@@ -249,8 +248,7 @@
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
- 	| ip2k | iq2000 \
--	| m32c | m32r | m32rle | m68000 | m68k | m88k \
--	| maxq | mb | microblaze | mcore \
-+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
- 	| mips64 | mips64el \
-@@ -270,17 +268,16 @@
- 	| mn10200 | mn10300 \
- 	| mt \
- 	| msp430 \
--	| nios | nios2 \
- 	| ns16k | ns32k \
- 	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
--	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
--	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
--	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
--	| spu | strongarm \
-+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b \
-+	| strongarm \
- 	| tahoe | thumb | tic4x | tic80 | tron \
- 	| v850 | v850e \
- 	| we32k \
-@@ -288,6 +285,9 @@
- 	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
-+	m32c)
-+		basic_machine=$basic_machine-unknown
-+		;;
- 	m6811 | m68hc11 | m6812 | m68hc12)
- 		# Motorola 68HC11/12.
- 		basic_machine=$basic_machine-unknown
-@@ -317,7 +317,7 @@
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
--	| avr-* | avr32-* \
-+	| avr-* \
- 	| bfin-* | bs2000-* \
- 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- 	| clipper-* | craynv-* | cydra-* \
-@@ -328,7 +328,7 @@
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- 	| i*86-* | i860-* | i960-* | ia64-* \
- 	| ip2k-* | iq2000-* \
--	| m32c-* | m32r-* | m32rle-* \
-+	| m32r-* | m32rle-* \
- 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- 	| m88110-* | m88k-* | maxq-* | mcore-* \
- 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-@@ -350,18 +350,17 @@
- 	| mmix-* \
- 	| mt-* \
- 	| msp430-* \
--	| nios-* | nios2-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
- 	| orion-* \
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
- 	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
--	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
--	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
- 	| tahoe-* | thumb-* \
- 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- 	| tron-* \
-@@ -372,6 +371,8 @@
- 	| ymp-* \
- 	| z8k-*)
- 		;;
-+	m32c-*)
-+		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
- 	386bsd)
-@@ -817,12 +818,6 @@
- 	pc532 | pc532-*)
- 		basic_machine=ns32k-pc532
- 		;;
--	pc98)
--		basic_machine=i386-pc
--		;;
--	pc98-*)
--		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
--		;;
- 	pentium | p5 | k5 | k6 | nexgen | viac3)
- 		basic_machine=i586-pc
- 		;;
-@@ -1125,7 +1120,7 @@
- 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
--	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-+	sparc | sparcv8 | sparcv9 | sparcv9b)
- 		basic_machine=sparc-sun
- 		;;
- 	cydra)
-@@ -1198,8 +1193,7 @@
- 	      | -aos* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
--	      | -openbsd* | -solidbsd* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
- 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-@@ -1214,7 +1208,7 @@
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos* | -toppers*)
-+	      | -skyos* | -haiku* | -rdos*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1366,9 +1360,6 @@
- # system, and we'll never get to this point.
- 
- case $basic_machine in
--        spu-*)
--		os=-elf
--		;;
- 	*-acorn)
- 		os=-riscix1.2
- 		;;
-@@ -1378,9 +1369,9 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
--        c4x-* | tic4x-*)
--        	os=-coff
--		;;
-+    c4x-* | tic4x-*)
-+        os=-coff
-+        ;;
- 	# This must come before the *-dec entry.
- 	pdp10-*)
- 		os=-tops20
-Index: build/modmake.rules.in
-===================================================================
---- a/build/modmake.rules.in	(revision 11675)
-+++ b/build/modmake.rules.in	(working copy)
-@@ -10,7 +10,7 @@
- INSTALL=@INSTALL@
- GETLIB=@GETLIB@
- LIBTOOL=@LIBTOOL@
--LTINSTALL=$(LIBTOOL) --mode=install $(INSTALL)
-+LTINSTALL=$(LIBTOOL) --quiet --mode=install $(INSTALL) 
- LTUNINSTALL=$(LIBTOOL) --mode=uninstall rm -f 
- CCLD = $(CC)
- CXXLD = $(CXX)
-@@ -29,7 +29,8 @@
- DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH
- LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH
- OSARCH=`uname -s`
--DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@
-+DYNAMIC_LIB_EXTEN = la
-+#DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@
- SOLINK = @SOLINK@
- 
- LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS)
-@@ -39,11 +40,11 @@
- 
- COMPILE      = $(CC) $(ALL_CFLAGS) $(DEFS)
- LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@
- 
- CXXCOMPILE = $(CXX) $(ALL_CXXFLAGS) $(DEFS)
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXXCOMPILE)
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@
- 
- CSOURCEFILE=$(MODNAME).c
- CXXSOURCEFILE=$(MODNAME).cpp
-@@ -107,14 +108,14 @@
- 			  exit 1 ;\
- 			 fi 
- 
--$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(SOURCEFILE) $(MODNAME).o 
-+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(LIBS) $(LOCAL_LIBADD) $(OUR_DEPS) $(LOCAL_OBJS) $(OUR_OBJS) $(SOURCEFILE) $(MODNAME).lo 
- 	@echo Creating $@...
- 	@test -d .libs || mkdir .libs
- 	@error="";\
- 	if test -f $(CSOURCEFILE); then \
--	$(LINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\
-+	$(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\
- 	else \
--	$(CXXLINK) $(SOLINK) $(MODNAME).o $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\
-+	$(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LINK_OUTPUT_REDIR) ;\
- 	fi;
- 
- mod_clean:
diff --git a/unstable/freeswitch/freeswitch-1.0.3-parallel-build.patch b/unstable/freeswitch/freeswitch-1.0.3-parallel-build.patch
deleted file mode 100644
index 1e9524393..000000000
--- a/unstable/freeswitch/freeswitch-1.0.3-parallel-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- freeswitch-1.0.3/build/modmake.rules.in.orig	2009-03-04 12:58:46.000000000 +0000
-+++ freeswitch-1.0.3/build/modmake.rules.in	2009-03-04 12:59:10.000000000 +0000
-@@ -57,7 +57,7 @@
- RECURSE_OUR_DEPS=`test -z "$(WANT_CURL)" || if test ! -z "$(LIBCURL_DEPS)"; then echo $(CURLLA); fi `
- RECURSE_OUR_CFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL_CPPFLAGS) ; $(LOCAL_INSERT_CFLAGS) `
- RECURSE_OUR_LDFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL) ; $(LOCAL_INSERT_LDFLAGS) `
--RECURSE_MAKE=modname="$(RECURSE_MODNAME)" ; \
-+RECURSE_MAKE=+modname="$(RECURSE_MODNAME)" ; \
- 		sourcefile="$(RECURSE_SOURCEFILE)" ; \
- 		osarch=`uname -s` ; \
- 		ourdefs="$(RECURSE_OUR_DEPS)" ; \