Merged from Alpine main repository.

Merge

Conflicts:
	main/abuild/APKBUILD
	main/cramfs/APKBUILD
	main/curl/APKBUILD
	main/dialog/APKBUILD
	main/libconfig/APKBUILD
	main/snort/APKBUILD
	main/syslinux/APKBUILD

122 files changed, 1471 insertions, 1135 deletions

diff --git a/testing/alsa-utils/APKBUILD b/testing/alsa-utils/APKBUILD
index ffa912174f..8894a9cb72 100644
--- a/testing/alsa-utils/APKBUILD
+++ b/testing/alsa-utils/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alsa-utils
-pkgver=1.0.22
+pkgver=1.0.23
 pkgrel=0
 pkgdesc="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 url="http://www.alsa-project.org"
@@ -33,7 +33,7 @@ package() {
 	install -D -m755 ../alsa.initd "$pkgdir"/etc/init.d/alsa
 	install -D -m644 ../alsa.confd "$pkgdir"/etc/conf.d/alsa
 }
-md5sums="f7180316188552ee1e6759a03f1fe98d  alsa-utils-1.0.22.tar.bz2
+md5sums="cb0cf46029ac9549cf3a31bff6a4f4e1  alsa-utils-1.0.23.tar.bz2
 5e65f278b5a77e3ee2821ad955c4cd91  alsaconf.patch
 4a66dad46d5366e05098cde97f3d37b5  alsa.initd
 85b1f1e759fe5953eca329237f4ac256  alsa.confd"
diff --git a/testing/atomic-ops/APKBUILD b/testing/atomic-ops/APKBUILD
index aff442f512..7c9dc2cf2f 100644
--- a/testing/atomic-ops/APKBUILD
+++ b/testing/atomic-ops/APKBUILD
@@ -1,8 +1,10 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=atomic-ops
-pkgver=1.2_p20080819
-_realver=1.2+cvs20080819
+_ver=7.2
+_suff=alpha4
+pkgver=${_ver}_${_suff}
+_realver=${_ver}${_suff}
 pkgrel=0
 pkgdesc="A library for atomic operations"
 url="http://www.hpl.hp.com/research/linux/atomic_ops/download.php4"
@@ -11,17 +13,22 @@ depends=""
 makedepends=""
 install=
 subpackages=
-source="http://ftp.de.debian.org/debian/pool/main/liba/libatomic-ops/libatomic-ops_$_realver.orig.tar.gz"
+source="http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-$_realver.tar.gz"
 
+_builddir="$srcdir"/libatomic_ops-${_realver}
 build() {
-	cd "$srcdir"/libatomic_ops-${pkgver%_p*}
-
+	cd "$_builddir"
+	chmod +x install-sh
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="bf26c062f28796e3daaab586a38abec1  libatomic-ops_1.2+cvs20080819.orig.tar.gz"
+md5sums="e82723a24fd846fe37bd6a03728776e1  libatomic_ops-7.2alpha4.tar.gz"
diff --git a/testing/bacula-client/APKBUILD b/testing/bacula-client/APKBUILD
index 998d5cc3e5..b3921077e4 100644
--- a/testing/bacula-client/APKBUILD
+++ b/testing/bacula-client/APKBUILD
@@ -3,7 +3,7 @@
 pkgname="bacula-client"
 _realname="bacula"
 pkgver=5.0.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Client (File Daemon) of Bacula, a network based backup program"
 url="http://www.bacula.org"
 license="GPL2"
diff --git a/testing/bacula/APKBUILD b/testing/bacula/APKBUILD
index ecb9dbe238..ff4161ea1c 100644
--- a/testing/bacula/APKBUILD
+++ b/testing/bacula/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname="bacula"
 pkgver=5.0.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Enterprise ready, network based backup program"
 url="http://www.bacula.org"
 license="GPL2"
diff --git a/testing/bluez-firmware/APKBUILD b/testing/bluez-firmware/APKBUILD
new file mode 100644
index 0000000000..95e03ae5c5
--- /dev/null
+++ b/testing/bluez-firmware/APKBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=bluez-firmware
+pkgver=1.2
+pkgrel=0
+pkgdesc="Firmware for Broadcom BCM203x Blutonium devices"
+url="http://www.bluez.org/"
+license="GPL2"
+depends=""
+makedepends=""
+source="http://bluez.sf.net/download/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	./configure --libdir=/lib || return 1
+	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="1cc3cefad872e937e05de5a0a2b390dd  bluez-firmware-1.2.tar.gz"
diff --git a/testing/bluez-hcidump/APKBUILD b/testing/bluez-hcidump/APKBUILD
new file mode 100644
index 0000000000..0ee37d683d
--- /dev/null
+++ b/testing/bluez-hcidump/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=bluez-hcidump
+pkgver=1.42
+pkgrel=0
+pkgdesc="Bluetooth HCI package analyzer"
+url="http://www.bluez.org/"
+license="GPL2"
+depends=
+makedepends="bluez-dev"
+subpackages="$pkgname-doc"
+source="http://bluez.sf.net/download/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" install || return 1
+}
+md5sums="5704737aaf72104eeaf77335218a1827  bluez-hcidump-1.42.tar.gz"
diff --git a/testing/bluez/APKBUILD b/testing/bluez/APKBUILD
new file mode 100644
index 0000000000..b8a18a350e
--- /dev/null
+++ b/testing/bluez/APKBUILD
@@ -0,0 +1,77 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=bluez
+pkgver=4.64
+pkgrel=1
+pkgdesc="Tools for the Bluetooth protocol stack"
+url="http://www.bluez.org/"
+license="GPL2"
+depends=
+makedepends="dbus-dev gstreamer-dev alsa-lib-dev libusb-dev libnl-dev"
+subpackages="$pkgname-dev $pkgname-doc libbluetooth $pkgname-alsa $pkgname-cups
+	$pkgname-netlink"
+source="http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2
+	bluetooth.initd
+	bluetooth.confd
+	"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--libexecdir=/lib \
+		--mandir=/usr/share/man \
+		--enable-gstreamer \
+		--enable-alsa \
+		--enable-usb \
+		--enable-netlink \
+		--enable-tools \
+		--enable-bccmd \
+		--enable-hid2hci \
+		--enable-dfutool \
+		--enable-hidd \
+		--enable-pand \
+		--enable-dund \
+		--enable-cups \
+		--enable-configfiles \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make install DESTDIR="$pkgdir"
+	install -Dm755 "$srcdir"/bluetooth.initd "$pkgdir"/etc/init.d/bluetooth
+	install -Dm644 "$srcdir"/bluetooth.confd "$pkgdir"/etc/conf.d/bluetooth
+}
+
+libbluetooth() {
+	pkgdesc="Libraries for Bluetooth protocol stack"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libbluetooth.so.* "$subpkgdir"/usr/lib/
+}
+
+alsa() {
+	pkgdesc="Bluez plugin for ALSA"
+	mkdir -p "$subpkgdir"/etc "$subpkgdir"/usr/lib
+	mv "$pkgdir"/etc/alsa* "$subpkgdir"/etc/
+	mv "$pkgdir"/usr/lib/alsa* "$subpkgdir"/usr/lib/
+}
+
+cups() {
+	pkgdesc="Bluez backend for CUPS"
+	mkdir -p "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/cups "$subpkgdir"/usr/lib/
+}
+
+netlink() {
+	pkgdesc="Bluez netlink plugin"
+	mkdir -p "$subpkgdir"/usr/lib/bluetooth/plugins
+	mv "$pkgdir"/usr/lib/bluetooth/plugins/netlink.so \
+		"$subpkgdir"/usr/lib/bluetooth/plugins
+}
+
+md5sums="d6e60bad937fe72b0bc77e327ee470b0  bluez-4.64.tar.bz2
+66408fb89b05e7ce7e61c4c3c356d2c6  bluetooth.initd
+a159d897a057f4675548327329c4cc22  bluetooth.confd"
diff --git a/testing/bluez/bluetooth-conf.d b/testing/bluez/bluetooth-conf.d
new file mode 100644
index 0000000000..b0cc744415
--- /dev/null
+++ b/testing/bluez/bluetooth-conf.d
@@ -0,0 +1,7 @@
+# Bluetooth configuraton file
+
+# Bind rfcomm devices (allowed values are "true" and "false")
+RFCOMM_ENABLE=true
+
+# Config file for rfcomm
+RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
diff --git a/testing/bluez/bluetooth-init.d b/testing/bluez/bluetooth-init.d
new file mode 100644
index 0000000000..111902aaeb
--- /dev/null
+++ b/testing/bluez/bluetooth-init.d
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.60/bluetooth-init.d,v 1.1 2010/02/01 19:47:46 pacho Exp $
+
+depend() {
+	after coldplug
+	need dbus localmount
+}
+
+start() {
+   	ebegin "Starting Bluetooth"
+
+	udevadm trigger --subsystem-match=bluetooth
+	eend $?
+
+	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
+		if [ -f "${RFCOMM_CONFIG}" ]; then
+			ebegin "    Starting rfcomm"
+			/usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all
+			eend $?
+		else
+			ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"
+		fi
+	fi
+}
+
+stop() {
+	ebegin "Shutting down Bluetooth"
+	eend 0
+}
diff --git a/testing/bluez/bluetooth.confd b/testing/bluez/bluetooth.confd
new file mode 100644
index 0000000000..b0cc744415
--- /dev/null
+++ b/testing/bluez/bluetooth.confd
@@ -0,0 +1,7 @@
+# Bluetooth configuraton file
+
+# Bind rfcomm devices (allowed values are "true" and "false")
+RFCOMM_ENABLE=true
+
+# Config file for rfcomm
+RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
diff --git a/testing/bluez/bluetooth.initd b/testing/bluez/bluetooth.initd
new file mode 100644
index 0000000000..9ec58e97c4
--- /dev/null
+++ b/testing/bluez/bluetooth.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.60/bluetooth-init.d,v 1.1 2010/02/01 19:47:46 pacho Exp $
+
+depend() {
+	after coldplug
+	need dbus localmount
+}
+
+start() {
+   	ebegin "Starting Bluetooth"
+
+	if [ -x /sbin/udevadm ]; then
+		udevadm trigger --subsystem-match=bluetooth
+		eend $?
+	fi
+
+	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
+		if [ -f "${RFCOMM_CONFIG}" ]; then
+			/usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all
+		else
+			ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"
+		fi
+	fi
+	eend $?
+}
+
+stop() {
+	ebegin "Shutting down Bluetooth"
+	eend 0
+}
diff --git a/testing/cdparanoia/APKBUILD b/testing/cdparanoia/APKBUILD
index 7080bfc8ca..e31d894f80 100644
--- a/testing/cdparanoia/APKBUILD
+++ b/testing/cdparanoia/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=cdparanoia
 pkgver=10.2
-pkgrel=0
+pkgrel=1
 pkgdesc="An audio CD extraction application"
 url="http://www.xiph.org/paranoia"
 license="GPL"
-depends="uclibc"
+depends=
 makedepends="libtool autoconf automake"
 install=
 subpackages="$pkgname-dev"
@@ -26,7 +26,10 @@ build() {
 		--infodir=/usr/share/info
 	make || return 1
 	#make DESTDIR="$pkgdir" install
+}
 
+package() {
+	cd "$srcdir/$pkgname-III-$pkgver"
 	install -m755 -D "$srcdir"/"$pkgname-III-$pkgver"/cdparanoia "$pkgdir"/usr/bin/cdparanoia
 	install -m644 -D "$srcdir"/"$pkgname-III-$pkgver"/interface/libcdda_interface.a "$pkgdir"/usr/lib/libcdda_interface.a
 	install -m755 -D "$srcdir"/"$pkgname-III-$pkgver"/interface/libcdda_interface.so.0."$pkgver" "$pkgdir"/usr/lib/libcdda_interface.so.0."$pkgver"
diff --git a/testing/cherokee/APKBUILD b/testing/cherokee/APKBUILD
index 47a7d43aba..7705d87ce4 100644
--- a/testing/cherokee/APKBUILD
+++ b/testing/cherokee/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Mika Havela <mika.havela@gmail.com>
 pkgname=cherokee
 pkgver=0.99.41
-pkgrel=0
+pkgrel=2
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 url="http://www.cherokee-project.com/"
 license="GPL2"
diff --git a/testing/collectd/APKBUILD b/testing/collectd/APKBUILD
index e145a79fd8..2905922a6d 100644
--- a/testing/collectd/APKBUILD
+++ b/testing/collectd/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: 
 pkgname=collectd
 pkgver=4.9.1
-pkgrel=0
+pkgrel=2
 pkgdesc="The system statistics collection daemon"
 url="http://collectd.org"
 license="GPL"
 depends=
 makedepends="pkgconfig curl-dev net-snmp-dev postgresql-dev perl-dev
-	libgcrypt-dev mysql-dev zlib-dev"
+	libgcrypt-dev mysql-dev zlib-dev openssl-dev"
 install=
 subpackages="$pkgname-dev $pkgname-doc $pkgname-perl $pkgname-snmp $pkgname-curl
 	$pkgname-write_http $pkgname-nginx $pkgname-apache $pkgname-postgresql
diff --git a/testing/coova-chilli/APKBUILD b/testing/coova-chilli/APKBUILD
index 256475ba6b..ab84e37318 100644
--- a/testing/coova-chilli/APKBUILD
+++ b/testing/coova-chilli/APKBUILD
@@ -5,7 +5,7 @@
 
 pkgname=coova-chilli
 pkgver=1.0.14
-pkgrel=0
+pkgrel=2
 pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
 url="http://www.coova.org/"
 license="GPL"
@@ -31,6 +31,10 @@ build() {
 		--sysconfdir=/etc \
 		--with-openssl
 	make -j1  || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/testing/cryptsetup/APKBUILD b/testing/cryptsetup/APKBUILD
index 4d7d4c983b..2f6fed11db 100644
--- a/testing/cryptsetup/APKBUILD
+++ b/testing/cryptsetup/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cryptsetup
 pkgver=1.0.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
 url="http://code.google.com/p/cryptsetup/"
 license="GPL"
diff --git a/testing/daemontools/APKBUILD b/testing/daemontools/APKBUILD
index 98bf995230..84ed1ded7f 100644
--- a/testing/daemontools/APKBUILD
+++ b/testing/daemontools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=daemontools
 pkgver=0.76
-pkgrel=0
+pkgrel=1
 pkgdesc="Collection of tools for managing UNIX services"
 url="http://cr.yp.to/daemontools.html"
 license="public-domain"
diff --git a/testing/dspam/APKBUILD b/testing/dspam/APKBUILD
index 1d049cfbe7..fb27610861 100644
--- a/testing/dspam/APKBUILD
+++ b/testing/dspam/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=dspam
 pkgver=3.9.0_rc2
 _ver=3.9.0-RC2
-pkgrel=0
+pkgrel=1
 pkgdesc="A statistical-algorithmic hybrid anti-spam filter"
 url="http://dspam.nuclearelephant.com/"
 pkgusers="dspam"
diff --git a/testing/ebtables/APKBUILD b/testing/ebtables/APKBUILD
index 4bdc882e5e..aedc6e8a48 100644
--- a/testing/ebtables/APKBUILD
+++ b/testing/ebtables/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=ebtables
 pkgver=2.0.9.1
 _realver=v2.0.9-1
-pkgrel=0
+pkgrel=1
 pkgdesc="Ethernet bridge tables - Linux Ethernet filter for the Linux bridge."
 url="http://ebtables.sourceforge.net/"
 license="GPL"
diff --git a/testing/freeradius/APKBUILD b/testing/freeradius/APKBUILD
index 5163359104..8d5caa8ba3 100644
--- a/testing/freeradius/APKBUILD
+++ b/testing/freeradius/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: 
 pkgname=freeradius
 pkgver=2.1.7
-pkgrel=0
+pkgrel=2
 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
 url="http://freeradius.org/"
 license="GPL"
diff --git a/testing/freeswitch/APKBUILD b/testing/freeswitch/APKBUILD
deleted file mode 100644
index 7b1a4ea909..0000000000
--- a/testing/freeswitch/APKBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-pkgname=freeswitch
-pkgver=1.0.4
-pkgrel=2
-pkgdesc="A communications platform written in C from the ground up"
-url="http://www.freeswitch.org"
-license="GPL"
-depends=""
-makedepends="curl-dev unixodbc-dev zlib-dev openssl-dev
-	autoconf automake libtool"
-install=
-subpackages="$pkgname-dev"
-source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz
-	modules.conf
-	freeswitch.confd
-	freeswitch.initd
-	freeswitch.post-install
-	freeswitch.pre-install
-	freeswitch.post-deinstall
-	"
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	cp -f "$srcdir/modules.conf" modules.conf || return 1
-
-	# 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
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc/freeswitch \
-		--with-modinstdir=/usr/lib/freeswitch \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-
-	# check how/when parallel builds are fixed here:
-	# http://jira.freeswitch.org/browse/FSBUILD-6
-
-	# build the libs and prerequisites in parallel first
-	make libs/apr/libapr-1.la \
-		libs/apr-util/libaprutil-1.la \
-		libs/speex/libspeex/libspeexdsp.la \
-		libs/sqlite/libsqlite3.la \
-		libs/pcre/libpcre.la \
-		libs/srtp/libsrtp.la \
-		src/include/switch_version.h
-
-	# then the rest should build in parallel too
-	make || return 1
-}
-package(){
-	cd "$srcdir/$pkgname-$pkgver"
-	make -j1 DESTDIR="$pkgdir" install
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-}
-
-md5sums="86e34bdd8cc027d71772cb0dc51388da  freeswitch-1.0.4.tar.gz
-c05f2356be159e99b3845f5260a33599  modules.conf
-c608cca8ad773acebf201f581438c7e7  freeswitch.confd
-dd3a6535c54fc6ed8399d6bb57d88369  freeswitch.initd
-c0d7ad55063b1f62c9a2fcfa37b2fc0a  freeswitch.post-install
-a34305ba1f8a8e7e6dbb9c678cc442b9  freeswitch.pre-install
-a7188703019a74fd7f128d165b3ecf42  freeswitch.post-deinstall"
diff --git a/testing/freeswitch/freeswitch.confd b/testing/freeswitch/freeswitch.confd
deleted file mode 100644
index 378e4b41f4..0000000000
--- a/testing/freeswitch/freeswitch.confd
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# FreeSWITCH startup configuration
-#
-
-# freeswitch will be running with this userid
-FREESWITCH_USER="freeswitch"
-
-
-# optional: group the freeswitch process should be running with
-#
-# (note: without this option freeswitch will be using all groups
-#  the user in FREESWITCH_USER is a member of)
-#
-#FREESWITCH_GROUP="freeswitch"
-
-
-
-# optional: other options, e.g.
-#
-# -hp	Use realtime priority and protect freeswitch
-#       process from being swapped to disk
-#       (warning: dangerous on machines with little ram!)
-#
-#FREESWITCH_OPTS=""
-
diff --git a/testing/freeswitch/freeswitch.initd b/testing/freeswitch/freeswitch.initd
deleted file mode 100755
index 84381d7711..0000000000
--- a/testing/freeswitch/freeswitch.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: $
-
-depend() {
-    need net
-}
-
-start() {
-    local OPTS
-
-    [ -n "${FREESWITCH_USER}" ] && \
-        OPTS="${OPTS} -u ${FREESWITCH_USER}" 
-
-    [ -n "${FREESWITCH_GROUP}" ] && \
-        OPTS="${OPTS} -g ${FREESWITCH_GROUP}" 
-
-    [ -n "${FREESWITCH_OPTS}" ] && \
-        OPTS="${OPTS} ${FREESWITCH_OPTS}" 
-
-    ebegin "Starting Freeswitch" 
-    start-stop-daemon --start --quiet --exec /usr/bin/freeswitch \
-        --pidfile /var/run/freeswitch.pid -- -nc ${OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping Freeswitch" 
-    start-stop-daemon --stop --quiet --pidfile /var/run/freeswitch.pid
-    eend $?
-}
-
diff --git a/testing/freeswitch/freeswitch.post-deinstall b/testing/freeswitch/freeswitch.post-deinstall
deleted file mode 100755
index 5ec871cb12..0000000000
--- a/testing/freeswitch/freeswitch.post-deinstall
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-deluser freeswitch
-delgroup freeswitch
diff --git a/testing/freeswitch/freeswitch.post-install b/testing/freeswitch/freeswitch.post-install
deleted file mode 100755
index 3b1c414c6b..0000000000
--- a/testing/freeswitch/freeswitch.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-chown -R freeswitch:freeswitch /etc/freeswitch/
-chown -R freeswitch:freeswitch /var/run/freeswitch/
-
diff --git a/testing/freeswitch/freeswitch.pre-install b/testing/freeswitch/freeswitch.pre-install
deleted file mode 100755
index b8065b52b6..0000000000
--- a/testing/freeswitch/freeswitch.pre-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-adduser -h /dev/null -s /bin/false -D freeswitch 2>/dev/null
-mkdir /var/run/freeswitch
diff --git a/testing/freeswitch/modules.conf b/testing/freeswitch/modules.conf
deleted file mode 100644
index c6f5a05de8..0000000000
--- a/testing/freeswitch/modules.conf
+++ /dev/null
@@ -1,75 +0,0 @@
-loggers/mod_console
-loggers/mod_logfile
-loggers/mod_syslog
-applications/mod_commands
-applications/mod_conference
-applications/mod_dptools
-applications/mod_enum
-applications/mod_fifo
-#applications/mod_fax
-applications/mod_voicemail
-#applications/mod_lcr
-applications/mod_limit
-applications/mod_expr
-applications/mod_esf
-#applications/mod_easyroute
-applications/mod_fsv
-#applications/mod_soundtouch
-#applications/mod_rss
-#applications/mod_snom
-#applications/mod_vmd
-#asr_tts/mod_flite
-#asr_tts/mod_pocketsphinx
-#asr_tts/mod_cepstral
-codecs/mod_g723_1
-codecs/mod_amr
-#codecs/mod_amrwb
-codecs/mod_g729
-codecs/mod_h26x
-codecs/mod_voipcodecs
-codecs/mod_ilbc
-codecs/mod_speex
-#codecs/mod_siren
-#codecs/mod_celt
-#codecs/mod_dahdi_codec
-#dialplans/mod_dialplan_directory
-dialplans/mod_dialplan_xml
-dialplans/mod_dialplan_asterisk
-#directories/mod_ldap
-#endpoints/mod_dingaling
-endpoints/mod_iax
-#endpoints/mod_portaudio
-endpoints/mod_sofia
-endpoints/mod_loopback
-#endpoints/mod_alsa
-#endpoints/mod_opal
-#../../libs/openzap/mod_openzap
-#event_handlers/mod_event_multicast
-event_handlers/mod_event_socket
-event_handlers/mod_cdr_csv
-#event_handlers/mod_radius_cdr
-formats/mod_native_file
-formats/mod_sndfile
-#formats/mod_shout
-formats/mod_local_stream
-formats/mod_tone_stream
-#languages/mod_python
-#languages/mod_spidermonkey
-#languages/mod_spidermonkey_teletone
-#languages/mod_spidermonkey_core_db
-#languages/mod_spidermonkey_socket
-#languages/mod_spidermonkey_odbc
-languages/mod_lua
-#languages/mod_perl
-#languages/mod_yaml
-#xml_int/mod_xml_rpc
-#xml_int/mod_xml_curl
-#xml_int/mod_xml_cdr
-#xml_int/mod_xml_ldap
-say/mod_say_en
-#say/mod_say_de
-#say/mod_say_es
-#say/mod_say_fr
-#say/mod_say_it
-#say/mod_say_nl
-#say/mod_say_zh
diff --git a/testing/fuse/APKBUILD b/testing/fuse/APKBUILD
index 52cf280bba..5f2d4eb61e 100644
--- a/testing/fuse/APKBUILD
+++ b/testing/fuse/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fuse
 pkgver=2.8.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 url="http://fuse.sourceforge.net/"
 license="GPL2"
diff --git a/testing/gnumeric/APKBUILD b/testing/gnumeric/APKBUILD
new file mode 100644
index 0000000000..ef7d620a46
--- /dev/null
+++ b/testing/gnumeric/APKBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gnumeric
+pkgver=1.10.3
+pkgrel=0
+pkgdesc="A GNOME Spreadsheet Program"
+url="http://www.gnome.org/projects/gnumeric/"
+license="GPL"
+makedepends="gtk+-dev intltool desktop-file-utils libglade-dev goffice-dev
+	rarian"
+install=
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.10/$pkgname-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-schemas-install \
+		--disable-static \
+		--enable-ssindex || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make -j1 DESTDIR="$pkgdir" install || return 1
+}
+md5sums="7da8b0acac1395c6fb049d5be7da37ef  gnumeric-1.10.3.tar.bz2"
diff --git a/testing/gtksourceview/APKBUILD b/testing/gtksourceview/APKBUILD
index c4ed809a6d..78f48202d7 100644
--- a/testing/gtksourceview/APKBUILD
+++ b/testing/gtksourceview/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtksourceview
 pkgver=2.8.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 url="http://live.gnome.org/GtkSourceView"
 license="GPL"
diff --git a/testing/hardinfo/APKBUILD b/testing/hardinfo/APKBUILD
index ac60f1dd1f..30b5794916 100644
--- a/testing/hardinfo/APKBUILD
+++ b/testing/hardinfo/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=hardinfo
 pkgver=0.5.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A system information and benchmark tool."
 url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
 license="GPL-2"
@@ -14,6 +14,8 @@ _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
 	patch -p1 < "$srcdir"/fixsensors.patch || return 1
+	# configure scrip says bash but bb ash works just fine
+	sed -i -e '1,1s/bash/sh/' configure
 }
 
 build() { 
diff --git a/testing/hdparm/APKBUILD b/testing/hdparm/APKBUILD
index f9fb4bf9b4..4b69192d1f 100644
--- a/testing/hdparm/APKBUILD
+++ b/testing/hdparm/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=hdparm
 pkgver=9.27
-pkgrel=1
+pkgrel=2
 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters"
 url="http://sourceforge.net/projects/hdparm/"
 license="BSD"
diff --git a/testing/hping3/APKBUILD b/testing/hping3/APKBUILD
index f55e1168b9..2479d74b6c 100644
--- a/testing/hping3/APKBUILD
+++ b/testing/hping3/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=hping3
 pkgver=20051105
-pkgrel=0
+pkgrel=1
 pkgdesc="A ping-like TCP/IP packet assembler/analyzer"
 url="http://www.hping.org"
 license="GPL"
diff --git a/testing/icecast/APKBUILD b/testing/icecast/APKBUILD
index 0e7c70e7d9..33bffd7325 100644
--- a/testing/icecast/APKBUILD
+++ b/testing/icecast/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: 
 pkgname=icecast
 pkgver=2.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source media server"
 url="http://www.icecast.org"
 license="GPL"
diff --git a/testing/iproute2/APKBUILD b/testing/iproute2/APKBUILD
index 1ef20dde09..71773e5336 100644
--- a/testing/iproute2/APKBUILD
+++ b/testing/iproute2/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=iproute2
 pkgver=2.6.31
 _realver=2.6.31
-pkgrel=0
+pkgrel=1
 pkgdesc="IP Routing Utilities"
 url="http://www.linux-foundation.org/en/Net:Iproute2"
 license="GPL2"
diff --git a/testing/ircii/APKBUILD b/testing/ircii/APKBUILD
index 221568ba40..1c16d509aa 100644
--- a/testing/ircii/APKBUILD
+++ b/testing/ircii/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=ircii
 pkgver=20080314
-pkgrel=0
+pkgrel=1
 pkgdesc="Universal IRC for Unix systems"
 url="http://www.eterna.com.au/ircii/"
 license="GPL"
diff --git a/testing/ircservices/APKBUILD b/testing/ircservices/APKBUILD
index 96b9db48a2..57d36e7099 100644
--- a/testing/ircservices/APKBUILD
+++ b/testing/ircservices/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ircservices
 pkgver=5.1.21
-pkgrel=0
+pkgrel=1
 pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)"
 url="http://www.ircservices.za.net/"
 license="GPL"
diff --git a/testing/iscsi-scst-grsec/APKBUILD b/testing/iscsi-scst-grsec/APKBUILD
new file mode 100644
index 0000000000..c8c95c158e
--- /dev/null
+++ b/testing/iscsi-scst-grsec/APKBUILD
@@ -0,0 +1,60 @@
+# Contributor: Carlo Landmeter
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+
+_flavor=${FLAVOR:-grsec}
+_realname=iscsi-scst
+# source the kernel version
+if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
+        . ../../main/linux-$_flavor/APKBUILD
+fi
+_kver=$pkgver
+_kernelver=$pkgver-r$pkgrel
+_abi_release=$pkgver-${_flavor}
+_kpkgrel=$pkgrel
+
+_realver=1.0.1.1
+pkgname=${_realname}-${_flavor}
+pkgver=$_kver
+_mypkgrel=0
+pkgrel=$(($_kpkgrel + $_mypkgrel))
+pkgdesc="$_flavor ISCSI for SCST $_realver"
+url="http://scst.sourceforge.net/"
+license="GPL-2"
+depends="linux-${_flavor}=${_kernelver}"
+install=
+makedepends="linux-${_flavor}-dev=${_kernelver} scst-grsec-dev"
+subpackages=
+source="http://downloads.sourceforge.net/scst/$_realname-$_realver.tar.gz
+        config.c.patch
+        "
+_ksrc=/usr/src/linux-headers-${_abi_release}
+
+_builddir="$srcdir"/$_realname-$_realver
+prepare() {
+        cd "$_builddir"
+        for i in "$srcdir"/*.patch; do
+                [ -f "$i" ] || continue
+                msg "Applying $i"
+                patch -p1 -i $i || return 1
+        done
+	# to build mods we need the headre file. fix dependency in makefile
+	sed -i -e 's/^\(mods: .*\)/\1 include\/iscsi_scst_itf_ver.h/' Makefile
+}
+
+build() {
+        cd "$_builddir"
+        unset ARCH
+        make mods \
+		KDIR="$_ksrc" \
+	        SCST_INC_DIR=/usr/include/scst \
+	        || return 1
+}
+
+package() {
+        cd "$_builddir"
+	install -D -m 644 kernel/iscsi-scst.ko \
+	        "$pkgdir"/lib/modules/$_abi_release/extra/iscsi-scst.ko
+}
+
+md5sums="56109c01e3d4421a36d6f47efa1fb0d5  iscsi-scst-1.0.1.1.tar.gz
+48e21e3466fd819418f29e3b2487f052  config.c.patch"
diff --git a/testing/iscsi-scst-grsec/config.c.patch b/testing/iscsi-scst-grsec/config.c.patch
new file mode 100644
index 0000000000..e3b1523218
--- /dev/null
+++ b/testing/iscsi-scst-grsec/config.c.patch
@@ -0,0 +1,12 @@
+--- iscsi-scst/kernel/config.c	2009/05/11 17:24:51	841
++++ iscsi-scst/kernel/config.c	2009/07/08 17:27:30	938
+@@ -203,7 +203,9 @@
+ 		goto out;
+ 	}
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
+ 	proc_iscsi_dir->owner = THIS_MODULE;
++#endif
+ 
+ 	err = iscsi_proc_log_entry_build(&iscsi_template);
+ 	if (err < 0)
diff --git a/testing/iscsi-scst/APKBUILD b/testing/iscsi-scst/APKBUILD
new file mode 100644
index 0000000000..1624175deb
--- /dev/null
+++ b/testing/iscsi-scst/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Carlo Landmeter
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+
+pkgname=iscsi-scst
+pkgver=1.0.1.1
+pkgrel=2
+pkgdesc="ISCSI target for SCST - userspace tools"
+url="http://iscsi-scst.sourceforge.net/"
+license="GPL-2"
+depends=
+install=
+makedepends="openssl-dev"
+subpackages=
+source="http://downloads.sourceforge.net/scst/$pkgname-$pkgver.tar.gz
+	iscsi-scst.initd
+        "
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+        cd "$_builddir"
+	# we need the headre file. fix dependency in makefile
+	sed -i -e 's/^\(progs:.*\)/\1 include\/iscsi_scst_itf_ver.h/' Makefile
+}
+
+build() {
+        cd "$_builddir"
+        make progs
+}
+
+package() {
+        cd "$_builddir"
+	# make install is broken
+	install -D usr/iscsi-scstd "$pkgdir"/usr/sbin/iscsi-scstd
+	install -D usr/iscsi-scst-adm "$pkgdir"/iscsi-scst-adm
+	install -D -m 755 "$srcdir"/iscsi-scst.initd "$pkgdir"/etc/init.d/iscsi-scst
+}
+
+md5sums="56109c01e3d4421a36d6f47efa1fb0d5  iscsi-scst-1.0.1.1.tar.gz
+3132fae1ec2f9bcc72476d9e9f36d326  iscsi-scst.initd"
diff --git a/testing/iscsi-scst/iscsi-scst.initd b/testing/iscsi-scst/iscsi-scst.initd
new file mode 100644
index 0000000000..4d4cd76b59
--- /dev/null
+++ b/testing/iscsi-scst/iscsi-scst.initd
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+#
+# Start the iSCSI-SCST Target.
+#
+
+depend() {
+	need net
+	afer firewall
+}
+
+start() {
+	modprobe -q crc32c
+	modprobe -q iscsi-scst
+	ebegin "Starting iscsi-scstd"
+	start-stop-daemon --start --exec /usr/sbin/iscsi-scstd
+	eend 0
+}
+
+stop() {
+	ebegin "Stopping iscsi-scstd"
+	start-stop-daemon --stop --exec /usr/sbin/iscsi-scstd
+	eend 0
+}
diff --git a/testing/kamailio/APKBUILD b/testing/kamailio/APKBUILD
index 5e3a0c6393..604796d546 100644
--- a/testing/kamailio/APKBUILD
+++ b/testing/kamailio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kamailio
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
diff --git a/testing/libelf/APKBUILD b/testing/libelf/APKBUILD
new file mode 100644
index 0000000000..88a52258bc
--- /dev/null
+++ b/testing/libelf/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libelf
+pkgver=0.8.13
+pkgrel=0
+pkgdesc="libelf is a free ELF object file access library"
+url="http://www.mr511.de/software/"
+license="GPL"
+depends=
+makedepends=
+subpackages="$pkgname-dev"
+source="http://www.mr511.de/software/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--enable-shared \
+		--enable-gnu-names \
+		--enable-compat || return 1
+	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make install prefix="$pkgdir"/usr || return 1
+}
+md5sums="4136d7b4c04df68b686570afa26988ac  libelf-0.8.13.tar.gz"
diff --git a/testing/libgssglue/APKBUILD b/testing/libgssglue/APKBUILD
index 48e22d001e..4701c765cf 100644
--- a/testing/libgssglue/APKBUILD
+++ b/testing/libgssglue/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libgssglue
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="exports a gssapi interface which calls other random gssapi libraries"
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
 license="BSD"
diff --git a/testing/libical/APKBUILD b/testing/libical/APKBUILD
new file mode 100644
index 0000000000..22ef967848
--- /dev/null
+++ b/testing/libical/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libical
+pkgver=0.44
+pkgrel=0
+pkgdesc="An open source reference implementation of the icalendar data type and serialization format"
+url="http://sourceforge.net/projects/freeassociation/"
+license="LGPL MPL"
+depends=
+makedepends="perl"
+subpackages="$pkgname-dev"
+source="http://downloads.sourceforge.net/freeassociation/$pkgname-$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--enable-shared \
+		--disable-static \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
+}
+md5sums="e0403c31e1ed82569325685f8c15959c  libical-0.44.tar.gz"
diff --git a/testing/libtirpc/APKBUILD b/testing/libtirpc/APKBUILD
index cbe2b64240..d77553d5b2 100644
--- a/testing/libtirpc/APKBUILD
+++ b/testing/libtirpc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libtirpc
 pkgver=0.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Transport Independent RPC library (SunRPC replacement)"
 url="http://libtirpc.sourceforge.net/"
 license="GPL2"
@@ -17,6 +17,8 @@ prepare() {
 	# uclibc does not provide nis.h so provide our own
 	mkdir src/rpcsvc
 	cp "$srcdir"/nis.h src/rpcsvc/
+	# we dont have nsl
+	sed -i -e "/^libtirpc_la_LDFLAGS/s/-lnsl//" src/Makefile.in
 }
 
 build() {
diff --git a/testing/libunique/APKBUILD b/testing/libunique/APKBUILD
index 29ed8abb40..59bd45083f 100644
--- a/testing/libunique/APKBUILD
+++ b/testing/libunique/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libunique
 pkgver=1.1.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Library for writing single instance applications"
 url="http://live.gnome.org/LibUnique"
 license="LGPL"
diff --git a/testing/libwmf/APKBUILD b/testing/libwmf/APKBUILD
index 3f41087959..024795bd46 100644
--- a/testing/libwmf/APKBUILD
+++ b/testing/libwmf/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libwmf
 pkgver=0.2.8.4
-pkgrel=0
+pkgrel=1
 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)."
 url="http://wvware.sourceforge.net/libwmf.html"
 license="LGPL"
diff --git a/testing/live-media/APKBUILD b/testing/live-media/APKBUILD
index 7f06135f37..0bd0e16714 100644
--- a/testing/live-media/APKBUILD
+++ b/testing/live-media/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=live-media
 pkgver=2010.01.22
-pkgrel=0
+pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 url="http://live555.com/liveMedia"
 license="LGPL"
diff --git a/testing/ltrace/APKBUILD b/testing/ltrace/APKBUILD
new file mode 100644
index 0000000000..145c2a5454
--- /dev/null
+++ b/testing/ltrace/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=ltrace
+pkgver=0.5.3
+pkgrel=0
+pkgdesc="Tracks runtime library calls in dynamically linked programs"
+url="http://ltrace.alioth.debian.org/"
+license="GPL"
+depends=
+makedepends="libelf-dev"
+subpackages="$pkgname-doc"
+source="http://ftp.debian.org/debian/pool/main/l/$pkgname/${pkgname}_$pkgver.orig.tar.gz"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		|| return 1
+	make
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make install DESTDIR="$pkgdir" || return 1
+}
+md5sums="3fa7fe715ab879db08bd06d1d59fd90f  ltrace_0.5.3.orig.tar.gz"
diff --git a/testing/lua-crypto/APKBUILD b/testing/lua-crypto/APKBUILD
index 0aa67ec51c..027affb396 100644
--- a/testing/lua-crypto/APKBUILD
+++ b/testing/lua-crypto/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: 
 pkgname=lua-crypto
 pkgver=0.2.0
-pkgrel=0
+pkgrel=2
 pkgdesc="a Lua frontend to the OpenSSL cryptographic library"
 url="http://luacrypto.luaforge.net/"
 license="MIT/X11"
diff --git a/testing/lua-curl/APKBUILD b/testing/lua-curl/APKBUILD
index 4440e83649..0db7be957e 100644
--- a/testing/lua-curl/APKBUILD
+++ b/testing/lua-curl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-curl
 pkgver=0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Lua bindings to cURL library"
 url="http://lua-curl.luaforge.net/"
 license="MIT/X11"
diff --git a/testing/lua-filesystem/APKBUILD b/testing/lua-filesystem/APKBUILD
index cf07eb5ad4..4c6d6d7b15 100644
--- a/testing/lua-filesystem/APKBUILD
+++ b/testing/lua-filesystem/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: 
 pkgname=lua-filesystem
 pkgver=1.4.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Lua library to complement the set of functions related to file systems"
 url="http://www.keplerproject.org/luafilesystem/"
 license="GPL"
diff --git a/testing/lua-nixio/APKBUILD b/testing/lua-nixio/APKBUILD
index 6e84e8c136..9a900dfb08 100644
--- a/testing/lua-nixio/APKBUILD
+++ b/testing/lua-nixio/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=lua-nixio
 _name=nixio
 pkgver=0.3
-pkgrel=0
+pkgrel=2
 pkgdesc="General POSIX IO library for Lua"
 url="http://dev.luci.freifunk-halle.net/nixio/doc/"
 license="Apache"
diff --git a/testing/lua-rexlib/APKBUILD b/testing/lua-rexlib/APKBUILD
index aed976bb17..4f7bce0891 100644
--- a/testing/lua-rexlib/APKBUILD
+++ b/testing/lua-rexlib/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: 
 pkgname=lua-rex
 pkgver=2.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Lua bindings to regular expression library pcre and posix"
 url="http://lrexlib.luaforge.net/"
 license="MIT"
diff --git a/testing/madplay/APKBUILD b/testing/madplay/APKBUILD
deleted file mode 100644
index 8d2807b773..0000000000
--- a/testing/madplay/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=madplay
-pkgver=0.15.2b
-pkgrel=0
-pkgdesc="The MAD audio player"
-url="http://www.underbit.com/products/mad/"
-license="GPL-2"
-depends=""
-makedepends="alsa-lib-dev libmad-dev libid3tag-dev"
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/mad/madplay-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--disable-nls \
-		--with-alsa \
-		|| return 1
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="6814b47ceaa99880c754c5195aa1aac1  madplay-0.15.2b.tar.gz"
diff --git a/testing/madwimax/APKBUILD b/testing/madwimax/APKBUILD
index 70367a6756..6973265ba8 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=1
+pkgrel=2
 pkgdesc="WiMAX driver for the Samsung SWC-U200 and similar USB modems"
 url="http://code.google.com/p/madwimax/"
 license="GPL-2"
diff --git a/testing/mediaproxy/APKBUILD b/testing/mediaproxy/APKBUILD
index b8077fe871..6702781dde 100644
--- a/testing/mediaproxy/APKBUILD
+++ b/testing/mediaproxy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: 
 pkgname=mediaproxy
 pkgver=2.3.8
-pkgrel=2
+pkgrel=3
 pkgdesc="MediaProxy"
 url="http://www.ag-projects.com/MediaProxy/"
 pkgusers="kamailio"
diff --git a/testing/mp3info/APKBUILD b/testing/mp3info/APKBUILD
index 6a52c3b6be..92aee7238a 100644
--- a/testing/mp3info/APKBUILD
+++ b/testing/mp3info/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="An MP3 technical info viewer and ID3 1.x tag editor"
 url="http://www.ibiblio.org/mp3info/"
 license="GPL"
-depends="uclibc ncurses"
+depends=
 makedepends="ncurses-dev"
 subpackages=""
 source="ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/mp3info-0.8.5a.tgz
@@ -18,6 +18,10 @@ build() {
 	patch -p1 -i "$srcdir"/escape_chars.patch || return 1
 
 	make mp3info || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	install -Dm755 mp3info "$pkgdir"/usr/bin/mp3info
 	install -Dm644 mp3info.1 "$pkgdir"/usr/share/man/man1/mp3info.1
 
diff --git a/testing/mplayer/APKBUILD b/testing/mplayer/APKBUILD
deleted file mode 100644
index 24136a4a4a..0000000000
--- a/testing/mplayer/APKBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=mplayer
-pkgver=1.0_rc4_p20091124
-_svnver=SVN-r29964
-pkgrel=4
-pkgdesc="A movie player for linux"
-url="http://www.mplayerhq.hu/"
-license="GPL"
-depends=
-subpackages="$pkgname-doc"
-makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev
-	libtheora-dev xvidcore-dev zlib-dev sdl-dev freetype-dev
-	x264-dev faac-dev ttf-dejavu libxvmc-dev alsa-lib-dev live-media-dev"
-
-# cdparanoia libcaca lirc-utils libgl-dev smbclient-dev 
-# aalib-dev jack-audio-connection-kit libmng-dev libxss-dev
-
-source="http://mirrors.kernel.org/gentoo/distfiles/$pkgname-$pkgver.tbz2"
-
-unpack() {
-	default_unpack
-	cd "$srcdir"
-	for i in in $source; do
-		case $i in
-			*.tbz2)	tar -jxf  ${i##*/};;
-		esac
-	done
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	sed -i "s/UNKNOWN/$_svnver/" version.sh
-
-	export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
-	./configure --prefix=/usr \
-		--disable-gui \
-		--disable-gif \
-		--disable-arts \
-		--enable-x11 \
-		--enable-runtime-cpudetection \
-		--confdir=/etc/mplayer \
-		--disable-nas \
-		--disable-gl \
-		--enable-tv-v4l1 \
-		--enable-tv-v4l2 \
-		--enable-largefiles \
-		--disable-liblzo \
-		--disable-speex \
-		--disable-openal \
-		--disable-fribidi \
-		--disable-libdv \
-		--disable-musepack \
-		--language=all\
-		--disable-esd \
-		--disable-mga \
-		--disable-lirc \
-		--enable-debug \
-		--enable-radio \
-		--enable-radio-capture \
-		--extra-cflags="-I/usr/lib/live-media -O2" \
-		--disable-nemesi \
-		--enable-freetype \
-		--enable-xvmc \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" install || return 1
-	install -Dm644 etc/codecs.conf etc/input.conf etc/example.conf \
-		"$pkgdir"/etc/mplayer/ || return 1
-	install -dm755 "$pkgdir"/usr/share/mplayer/
-	ln -s /usr/share/fonts/TTF/DejaVuSans.ttf \
-		"$pkgdir"/usr/share/mplayer/subfont.ttf || return 1
-	rm -rf "$pkgdir"/usr/share/mplayer/font
-}
-md5sums="3ef3c9bdd85004f099552592a97f069c  mplayer-1.0_rc4_p20091124.tbz2"
diff --git a/testing/mplayer/liba52_gcc_bug.patch b/testing/mplayer/liba52_gcc_bug.patch
deleted file mode 100644
index c0d42f876f..0000000000
--- a/testing/mplayer/liba52_gcc_bug.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mplayer/configure.old	2009-04-16 12:02:10.000000000 +0200
-+++ mplayer/configure	2009-05-22 15:23:38.000000000 +0200
-@@ -6410,6 +6410,7 @@
- def_liba52='#undef CONFIG_LIBA52'
- def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL"
- if test "$_liba52_internal" = yes ; then
-+	test "$cc_vendor" = gnu && test "$cc_version" = 4.4.0 && CFLAGS=$(echo $CFLAGS|sed "s/ *-O4 */ -O2 /")
-   _liba52=yes
-   def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1"
-   _res_comment="internal"
diff --git a/testing/mplayer/mplayer/configure.orig b/testing/mplayer/mplayer/configure.orig
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testing/mplayer/mplayer/configure.orig
+++ /dev/null
diff --git a/testing/mplayer/mplayer/configure.rej b/testing/mplayer/mplayer/configure.rej
deleted file mode 100644
index c0d42f876f..0000000000
--- a/testing/mplayer/mplayer/configure.rej
+++ /dev/null
@@ -1,10 +0,0 @@
---- mplayer/configure.old	2009-04-16 12:02:10.000000000 +0200
-+++ mplayer/configure	2009-05-22 15:23:38.000000000 +0200
-@@ -6410,6 +6410,7 @@
- def_liba52='#undef CONFIG_LIBA52'
- def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL"
- if test "$_liba52_internal" = yes ; then
-+	test "$cc_vendor" = gnu && test "$cc_version" = 4.4.0 && CFLAGS=$(echo $CFLAGS|sed "s/ *-O4 */ -O2 /")
-   _liba52=yes
-   def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1"
-   _res_comment="internal"
diff --git a/testing/mtx/APKBUILD b/testing/mtx/APKBUILD
index 5d706bc40d..f0997c6ec0 100644
--- a/testing/mtx/APKBUILD
+++ b/testing/mtx/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname="mtx"
 pkgver=1.3.12
-pkgrel=0
+pkgrel=1
 pkgdesc="SCSI Media Changer and Backup Device Control"
 url="http://mtx.opensource-sw.net/"
 license="GPL2"
diff --git a/testing/needbump b/testing/needbump
new file mode 100644
index 0000000000..66f21c4703
--- /dev/null
+++ b/testing/needbump
@@ -0,0 +1,57 @@
+alsa-utils
+bacula
+bacula-client
+cherokee
+collectd
+cryptsetup
+daemontools
+dspam
+ebtables
+fuse
+gtksourceview
+hardinfo
+hdparm
+hping3
+icecast
+iproute2
+ircii
+ircservices
+iscsi-scst
+kamailio
+libgssglue
+libtirpc
+libunique
+libwmf
+live-media
+lua-crypto
+lua-curl
+lua-filesystem
+lua-nixio
+lua-rexlib
+madplay
+madwimax
+mediaproxy
+mplayer
+mtx
+open-iscsi
+osmo
+pmacct
+pptpclient
+prosody
+psqlodbc
+python-cjson
+python-gnutls
+qemu
+rrdbot
+rtapd
+rtnppd
+sems
+sircbot
+sisctrl
+smartmontools
+swish-e
+ucspi-tcp
+udev
+umix
+wine
+
diff --git a/testing/obexd/APKBUILD b/testing/obexd/APKBUILD
new file mode 100644
index 0000000000..d6533e8941
--- /dev/null
+++ b/testing/obexd/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=obexd
+pkgver=0.25
+pkgrel=0
+pkgdesc="D-Bus service providing high-level OBEX client and server side functionality"
+url="http://www.bluez.org/"
+license="GPL2"
+depends=
+makedepends="dbus-glib-dev openobex-dev glib-dev bluez-dev libical-dev"
+source="http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2"
+
+build () 
+{ 
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--libexecdir=/usr/lib/obexd \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" install
+}
+md5sums="d3f7d7bd77564dfb8cda906566ab2638  obexd-0.25.tar.bz2"
diff --git a/testing/open-iscsi/APKBUILD b/testing/open-iscsi/APKBUILD
index c74cf2692c..0f4076e21d 100644
--- a/testing/open-iscsi/APKBUILD
+++ b/testing/open-iscsi/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=open-iscsi
 pkgver=2.0.871
 _realver=2.0-871
-pkgrel=0
+pkgrel=2
 pkgdesc="High performance, transport independent, multi-platform iSCSI initiator"
 url="http://www.open-iscsi.org"
 license="GPL-2"
@@ -12,7 +12,8 @@ install=""
 subpackages="$pkgname-doc"
 source="http://www.open-iscsi.org/bits/$pkgname-$_realver.tar.gz
 	CVE-2009-1297.patch
-	open-iscsi-2.0.871-makefile-cleanup.patch"
+	open-iscsi-2.0.871-makefile-cleanup.patch
+	iscsid.initd"
 
 _builddir="$srcdir"/$pkgname-$_realver
 
@@ -36,9 +37,10 @@ package() {
 	mv $pkgdir/sbin/iscsi_discovery $pkgdir/usr/bin
 	mv $pkgdir/sbin/iscsiadm $pkgdir/usr/bin
 	mv $pkgdir/sbin/iscsid $pkgdir/usr/sbin
-	install -Dm755 ../../iscsid-2.0.871-r1.init.d "$pkgdir"/etc/init.d/iscsid
+	install -Dm755 ../../iscsid.initd "$pkgdir"/etc/init.d/iscsid
 }
 
 md5sums="0c403e8c9ad41607571ba0e6e8ff196e  open-iscsi-2.0-871.tar.gz
 d1584790b4e12f087e60089880b53d2b  CVE-2009-1297.patch
-734300d7b7590dc9ae9b2fb7f5b51bf0  open-iscsi-2.0.871-makefile-cleanup.patch"
+734300d7b7590dc9ae9b2fb7f5b51bf0  open-iscsi-2.0.871-makefile-cleanup.patch
+3e89cb86395756dafebc4f1490f0de10  iscsid.initd"
diff --git a/testing/open-iscsi/iscsid-2.0.871-r1.init.d b/testing/open-iscsi/iscsid.initd
index 060eb9b596..572b0a6ae5 100644
--- a/testing/open-iscsi/iscsid-2.0.871-r1.init.d
+++ b/testing/open-iscsi/iscsid.initd
@@ -1,7 +1,4 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/sys-block/open-iscsi/files/iscsid-2.0.871-r1.init.d,v 1.1 2009/11/12 09:29:48 robbat2 Exp $
 
 opts="${opts} starttargets stoptargets restarttargets"
 
@@ -37,7 +34,7 @@ do_modules() {
 	modopts="$@"
 	for m in ${modules}
 	do
-		if [ -n "$(modprobe -l | grep ${m})" ]
+		if [ -n "$(find /lib/modules/`uname -r` | grep ${m})" ]
 		then
 			ebegin "${msg} ${m}"
 			modprobe ${modopts} ${m}
diff --git a/testing/openobex/APKBUILD b/testing/openobex/APKBUILD
new file mode 100644
index 0000000000..4c83330cd6
--- /dev/null
+++ b/testing/openobex/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=openobex
+pkgver=1.5
+pkgrel=0
+pkgdesc="Implementation of the OBject EXchange (OBEX) protocol"
+url="http://dev.zuckschwerdt.org/openobex/"
+license="GPL LGPL"
+depends=
+makedepends="bluez-dev libusb-dev"
+subpackages="$pkgname-dev libopenobex"
+source="http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	./configure --prefix=/usr \
+		--enable-apps \
+		--enable-irda \
+		--enable-bluetooth \
+		--enable-usb \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+libopenobex() {
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libopenobex.so.* "$subpkgdir"/usr/lib/
+}
+
+md5sums="fce1b82eafb74bde54fe117372393ba8  openobex-1.5.tar.bz2"
diff --git a/testing/opensips-cp/APKBUILD b/testing/opensips-cp/APKBUILD
index 3d7ea8c72f..58ad2d9db2 100644
--- a/testing/opensips-cp/APKBUILD
+++ b/testing/opensips-cp/APKBUILD
@@ -14,8 +14,12 @@ options="!strip"
 source="http://downloads.sourceforge.net/$pkgname/${pkgname}_$pkgver.tgz"
 
 build() {
+	return 0
+}
+
+package() {
 	mkdir -p "$pkgdir"/usr/share/webapps
 	cp -r "$srcdir"/$pkgname "$pkgdir"/usr/share/webapps/$pkgname
 }
 
-md5sums="c9b4f4476e231e0d64682c2b07c66965  opensips-cp_2.0.tgz"
+md5sums="a9c3b142c7f74eb0201ae2ab0b252c32  opensips-cp_2.0.tgz"
diff --git a/testing/opensips/APKBUILD b/testing/opensips/APKBUILD
index d54b3dec28..c148ce22a7 100644
--- a/testing/opensips/APKBUILD
+++ b/testing/opensips/APKBUILD
@@ -2,16 +2,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=opensips
 pkgver=1.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Flexible and customizable sip routing engine"
 url="http://www.opensips.org/"
 license="GPL"
-depends="uclibc expat"
+depends=
 makedepends="bison flex expat-dev coreutils"
 install="$pkgname.pre-install $pkgname.post-install"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-notls_src.tar.gz
-	$install
 	$pkgname.initd"
 
 build() {
@@ -25,6 +24,10 @@ build() {
 	cd ..
 
 	make prefix=/usr || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver-notls"
 	make prefix=/usr basedir="$pkgdir" install
 	chmod 750 "$pkgdir"/etc/opensips/opensips.cfg
 	install -d "$pkgdir"/var/run/opensips
@@ -32,6 +35,4 @@ build() {
 }
 
 md5sums="ba99592a6e42e8b4dc2d38964420dfec  opensips-1.5.0-notls_src.tar.gz
-3a8a5d3c4c23ce9f2fc60b449ad61820  opensips.pre-install
-d9b551148d2b60466c05b4295b935091  opensips.post-install
 7fb51d35517f7f10cfe6e89139f7060a  opensips.initd"
diff --git a/testing/osmo/APKBUILD b/testing/osmo/APKBUILD
index 75a2f25ded..489874e360 100644
--- a/testing/osmo/APKBUILD
+++ b/testing/osmo/APKBUILD
@@ -1,24 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=osmo
-pkgver=0.2.8
+pkgver=0.2.10
 pkgrel=0
 pkgdesc="A handy personal organizer"
 url="http://clayo.org/osmo/"
 license="GPL"
-makedepends="gtk+-dev libnotify-dev libxml2-dev"
+makedepends="gtk+-dev libnotify-dev libxml2-dev autoconf automake"
 install=
 subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname-pim/$pkgname-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/$pkgname-pim/$pkgname-$pkgver.tar.gz
+	osmo-0.2.10-build-mo.patch
+	"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+	for i in "$srcdir"/*.patch; do
+		msg "Applying ${i##*/}"
+		patch -p1 -i "$i" || return 1
+	done
+	aclocal && autoconf && automake
+}
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure --prefix=/usr || return 1
 	make || return 1
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$_builddir"
+	make -j1 DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="7fa83efd27cd3ecc54e73f0ec4e91d81  osmo-0.2.8.tar.gz"
+md5sums="a774db748228efee96186158d553ade9  osmo-0.2.10.tar.gz
+6c9939fd4df9d25e1a220585e6875c78  osmo-0.2.10-build-mo.patch"
diff --git a/testing/osmo/osmo-0.2.10-build-mo.patch b/testing/osmo/osmo-0.2.10-build-mo.patch
new file mode 100644
index 0000000000..ac1b9aa235
--- /dev/null
+++ b/testing/osmo/osmo-0.2.10-build-mo.patch
@@ -0,0 +1,20 @@
+diff --git a/po/Makefile.am b/po/Makefile.am
+index b3c904a..f0ee467 100644
+--- a/po/Makefile.am
++++ b/po/Makefile.am
+@@ -16,8 +16,8 @@ all: $(MOFILES)
+ 
+ update-po: $(DOMAIN).pot $(POFILES) $(MOFILES)
+ 
+-%.mo: skip
+-	@po=$(@:.mo=.po); if test $$po -nt $@ ; then $(MSGFMT) -c --statistics $$po -o $@; echo "$@ updated."; fi
++%.mo: %.po
++	@$(MSGFMT) -c --statistics $^ -o $@; echo "$@ updated."
+ 
+ %.po: $(DOMAIN).pot
+ 	$(MSGMERGE) $@ $< -o $@.in && mv $@.in $@
+@@ -41,4 +41,3 @@ uninstall-local:
+ clean-local:
+ 	rm -rf *.mo
+ 
+-skip:
diff --git a/testing/perl-carp-clan/APKBUILD b/testing/perl-carp-clan/APKBUILD
new file mode 100644
index 0000000000..e26e5d931d
--- /dev/null
+++ b/testing/perl-carp-clan/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=perl-carp-clan
+_realname=Carp-Clan
+pkgver=6.04
+pkgrel=0
+pkgdesc="Perl - Report errors from perspective of caller of a 'clan' of modules"
+url="http://search.cpan.org/~stbey/$_realname-$pkgver/"
+license="Artistic GPL"
+depends="perl perl-test-exception"
+makedepends="perl-dev"
+install=
+#subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/$_realname-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_realname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make || return 1
+	make test || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	# creates file collision among perl modules
+	find "$pkgdir" -name perllocal.pod -delete
+}
+
+md5sums="b6316bc51bb530d994f2784615939fb2  Carp-Clan-6.04.tar.gz"
diff --git a/testing/perl-date-format/APKBUILD b/testing/perl-date-format/APKBUILD
new file mode 100644
index 0000000000..6615a97fbc
--- /dev/null
+++ b/testing/perl-date-format/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=perl-date-format
+_realname=TimeDate
+pkgver=1.20
+pkgrel=0
+pkgdesc="Perl - Date formating subroutines"
+url="http://search.cpan.org/~gbarr/$_realname-$pkgver/"
+license="Artistic GPL"
+depends="perl"
+makedepends="perl-dev"
+install=
+#subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/$_realname-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_realname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make || return 1
+	make test || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	# creates file collision among perl modules
+	find "$pkgdir" -name perllocal.pod -delete
+}
+
+md5sums="7da7452bce4c684e4238e6d09b390200  TimeDate-1.20.tar.gz"
diff --git a/testing/perl-date-manip/APKBUILD b/testing/perl-date-manip/APKBUILD
new file mode 100644
index 0000000000..34a15d9f1e
--- /dev/null
+++ b/testing/perl-date-manip/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=perl-date-manip
+_realname=Date-Manip
+pkgver=6.11
+pkgrel=0
+pkgdesc="Perl - Date manipulation routines"
+url="http://search.cpan.org/~sbeck/$_realname-$pkgver/"
+license="Artistic GPL"
+depends="perl perl-test-pod perl-test-inter perl-yaml-syck perl-test-pod-coverage"
+makedepends="perl-dev"
+#subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/$_realname-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_realname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	perl Build.PL || return 1
+	./Build test || return 1
+}
+
+package() {
+	cd "$_builddir"
+	./Build destdir="$pkgdir" install
+	# creates file collision among perl modules
+	find "$pkgdir" -name perllocal.pod -delete
+}
+
+md5sums="7880db506f14080635972eb5607fa79d  Date-Manip-6.11.tar.gz"
diff --git a/testing/perl-devel-symdump/APKBUILD b/testing/perl-devel-symdump/APKBUILD
new file mode 100644
index 0000000000..16038e9a30
--- /dev/null
+++ b/testing/perl-devel-symdump/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=perl-devel-symdump
+_realname=Devel-Symdump
+pkgver=2.08
+pkgrel=0
+pkgdesc="Perl - Dump symbol names or the symbol table"
+url="http://search.cpan.org/~andk/$_realname-$pkgver/"
+license="Artistic GPL"
+depends="perl perl-test-pod"
+makedepends="perl-dev"
+install=
+#subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/$_realname-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_realname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make || return 1
+	make test || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	# creates file collision among perl modules
+	find "$pkgdir" -name perllocal.pod -delete
+}
+
+md5sums="68e3a2f2f989bff295ee63aed5a2a1e5  Devel-Symdump-2.08.tar.gz"
diff --git a/testing/perl-file-tail/APKBUILD b/testing/perl-file-tail/APKBUILD
new file mode 100644
index 0000000000..9623737437
--- /dev/null
+++ b/testing/perl-file-tail/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=perl-file-tail
+_realname=File-Tail
+pkgver=0.99.3
+pkgrel=0
+pkgdesc="Perl - Extension for reading from continously updated files"
+url="http://search.cpan.org/~mgrabnar/$_realname-$pkgver/"
+license="Artistic GPL"
+depends="perl"
+makedepends="perl-dev"
+install=
+#subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/M/MG/MGRABNAR/$_realname-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_realname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make || return 1
+	make test || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	# creates file collision among perl modules
+	find "$pkgdir" -name perllocal.pod -delete
+}
+
+md5sums="ef0fb7bcb4181ba593f4a09940f61d1c  File-Tail-0.99.3.tar.gz"
diff --git a/testing/perl-pod-coverage/APKBUILD b/testing/perl-pod-coverage/APKBUILD
new file mode 100644
index 0000000000..cb17f5292c
--- /dev/null
+++ b/testing/perl-pod-coverage/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=perl-pod-coverage
+_realname=Pod-Coverage
+pkgver=0.20
+pkgrel=0
+pkgdesc="Perl - Checks if the documentation of a module is comprehensive"
+url="http://search.cpan.org/~rclamp/$_realname-$pkgver/"
+license="Artistic GPL"
+depends="perl perl-devel-symdump perl-test-pod"
+makedepends="perl-dev"
+install=
+#subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/R/RC/RCLAMP/$_realname-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_realname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make || return 1
+	make test || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	# creates file collision among perl modules
+	find "$pkgdir" -name perllocal.pod -delete
+}
+
+md5sums="292a5b8d3a93597af441d3e6467b8ad6  Pod-Coverage-0.20.tar.gz"
diff --git a/testing/perl-sub-uplevel/APKBUILD b/testing/perl-sub-uplevel/APKBUILD
new file mode 100644
index 0000000000..10e4a49ac3
--- /dev/null
+++ b/testing/perl-sub-uplevel/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=perl-sub-uplevel
+_realname=Sub-Uplevel
+pkgver=0.22
+pkgrel=0
+pkgdesc="Perl - Apparently run a function in a higher stack frame"
+url="http://search.cpan.org/~dagolden/$_realname-$pkgver/"
+license="Artistic GPL"
+depends="perl "
+makedepends="perl-dev"
+#subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/$_realname-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_realname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make || return 1
+	make test || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	# creates file collision among perl modules
+	find "$pkgdir" -name perllocal.pod -delete
+}
+
+md5sums="c166738a97c0424a0075ebe205d285db  Sub-Uplevel-0.22.tar.gz"
diff --git a/testing/perl-test-exception/APKBUILD b/testing/perl-test-exception/APKBUILD
new file mode 100644
index 0000000000..7b276c63dd
--- /dev/null
+++ b/testing/perl-test-exception/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=perl-test-exception
+_realname=Test-Exception
+pkgver=0.29
+pkgrel=0
+pkgdesc="Perl - Test exception based code"
+url="http://search.cpan.org/~adie/$_realname-$pkgver/"
+license="Artistic GPL"
+depends="perl perl-sub-uplevel"
+makedepends="perl-dev"
+#subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/A/AD/ADIE/$_realname-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_realname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make || return 1
+	make test || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	# creates file collision among perl modules
+	find "$pkgdir" -name perllocal.pod -delete
+}
+
+md5sums="9aea475db531d4fd4ce40cf25a0acd14  Test-Exception-0.29.tar.gz"
diff --git a/testing/perl-test-inter/APKBUILD b/testing/perl-test-inter/APKBUILD
new file mode 100644
index 0000000000..29bdf21905
--- /dev/null
+++ b/testing/perl-test-inter/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=perl-test-inter
+_realname=Test-Inter
+pkgver=1.01
+pkgrel=0
+pkgdesc="Perl - Framework for more readable interactive test scripts"
+url="http://search.cpan.org/~sbeck/$_realname-$pkgver/"
+license="Artistic GPL"
+depends="perl perl-test-pod perl-pod-coverage perl-test-pod-coverage"
+makedepends="perl-dev"
+install=
+#subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/$_realname-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_realname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make || return 1
+	make test || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	# creates file collision among perl modules
+	find "$pkgdir" -name perllocal.pod -delete
+}
+
+md5sums="445166a7472e609b96e4474d95552827  Test-Inter-1.01.tar.gz"
diff --git a/testing/perl-test-pod-coverage/APKBUILD b/testing/perl-test-pod-coverage/APKBUILD
new file mode 100644
index 0000000000..9a885e0be7
--- /dev/null
+++ b/testing/perl-test-pod-coverage/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=perl-test-pod-coverage
+_realname=Test-Pod-Coverage
+pkgver=1.08
+pkgrel=0
+pkgdesc="Perl - Check for pod coverage in your distribution."
+url="http://search.cpan.org/~petdance/$_realname-$pkgver/"
+license="Artistic GPL"
+depends="perl perl-pod-coverage perl-test-pod perl-devel-symdump"
+makedepends="perl-dev"
+install=
+#subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/$_realname-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_realname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make || return 1
+	make test || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	# creates file collision among perl modules
+	find "$pkgdir" -name perllocal.pod -delete
+}
+
+md5sums="33405cca7c75b7b89c06ba30eea66692  Test-Pod-Coverage-1.08.tar.gz"
diff --git a/testing/perl-yaml-syck/APKBUILD b/testing/perl-yaml-syck/APKBUILD
new file mode 100644
index 0000000000..d1c628054d
--- /dev/null
+++ b/testing/perl-yaml-syck/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=perl-yaml-syck
+_realname=YAML-Syck
+pkgver=1.07
+pkgrel=0
+pkgdesc="Perl - Fast, lightweight YAML loader and dumper"
+url="http://search.cpan.org/~audreyt/$_realname-$pkgver/"
+license="Artistic GPL"
+depends="perl"
+makedepends="perl-dev"
+install=
+#subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/A/AU/AUDREYT/$_realname-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_realname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+	make || return 1
+	make test || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	# creates file collision among perl modules
+	find "$pkgdir" -name perllocal.pod -delete
+}
+
+md5sums="410ef7e24185de2a04390e0543876cad  YAML-Syck-1.07.tar.gz"
diff --git a/testing/pmacct/APKBUILD b/testing/pmacct/APKBUILD
index 9a8a05ea87..d536e264db 100644
--- a/testing/pmacct/APKBUILD
+++ b/testing/pmacct/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=pmacct
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Measure, account, classify, aggregate and export IPv4 and IPv6 traffic"
 url="http://www.pmacct.net/"
 license="GPL"
diff --git a/testing/pptpclient/APKBUILD b/testing/pptpclient/APKBUILD
index acdc734ab7..31adae3ce8 100644
--- a/testing/pptpclient/APKBUILD
+++ b/testing/pptpclient/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pptpclient
 pkgver=1.7.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP."
 url="http://pptpclient.sourceforge.net/"
 license="GPL"
diff --git a/testing/prosody/APKBUILD b/testing/prosody/APKBUILD
index 4f778f2e19..05996f9a06 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=2
+pkgrel=4
 pkgdesc="Lua based Jabber/XMPP server"
 url="http://prosody.im/"
 license="MIT"
diff --git a/testing/psqlodbc/APKBUILD b/testing/psqlodbc/APKBUILD
deleted file mode 100644
index 6139d96eaa..0000000000
--- a/testing/psqlodbc/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=psqlodbc
-pkgver=08.04.0200
-pkgrel=0
-pkgdesc="PostgreSQL ODBC driver"
-url="http://www.postgresql.org"
-license="GPL"
-depends=
-makedepends="postgresql-dev unixodbc-dev openssl-dev"
-subpackages="$pkgname-dev"
-source="ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr
-	make || return 1
-}
-
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-}
-md5sums="8296be11d24e3111319826fbaf034066  psqlodbc-08.04.0200.tar.gz"
diff --git a/testing/pycrypto/APKBUILD b/testing/pycrypto/APKBUILD
index 1ed827ca9d..f5a48e75c3 100644
--- a/testing/pycrypto/APKBUILD
+++ b/testing/pycrypto/APKBUILD
@@ -1,17 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pycrypto
 pkgver=2.0.1
-pkgrel=0
+pkgrel=2
 pkgdesc="A collection of cryptographic algorithms and protocols, implemented for use from Python."
 url="http://www.amk.ca/python/code/crypto.html"
 license="GPL"
 depends="python"
-makedepends="gmp-dev python-dev"
+makedepends="gmp5-dev python-dev"
 source="http://www.amk.ca/files/python/crypto/$pkgname-$pkgver.tar.gz"
 
 build ()
 {
 	cd "$srcdir"/$pkgname-$pkgver
-	python setup.py build install --root="$pkgdir"
+	python setup.py build 
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	python setup.py install --root="$pkgdir"
 }
 md5sums="4d5674f3898a573691ffb335e8d749cd  pycrypto-2.0.1.tar.gz"
diff --git a/testing/python-cjson/APKBUILD b/testing/python-cjson/APKBUILD
index c6df3c178b..f3274d5fd8 100644
--- a/testing/python-cjson/APKBUILD
+++ b/testing/python-cjson/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=python-cjson
 pkgver=1.0.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Fast JSON encoder/decoder for Python"
 url="http://pypi.python.org/pypi/python-gnutls"
 license="PSF"
diff --git a/testing/python-gnutls/APKBUILD b/testing/python-gnutls/APKBUILD
index 943d06aae9..df19c12397 100644
--- a/testing/python-gnutls/APKBUILD
+++ b/testing/python-gnutls/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=python-gnutls
 pkgver=1.1.9
-pkgrel=0
+pkgrel=1
 pkgdesc="Python wrapper for the GNUTLS library"
 url="http://pypi.python.org/pypi/python-gnutls"
 license="PSF"
diff --git a/testing/qemu/APKBUILD b/testing/qemu/APKBUILD
index 6361ee46bb..4d3d7100bd 100644
--- a/testing/qemu/APKBUILD
+++ b/testing/qemu/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qemu
-pkgver=0.11.1
+pkgver=0.12.4
 pkgrel=0
 pkgdesc="QEMU is a generic machine emulator and virtualizer"
 url="http://www.nongnu.org/qemu/"
@@ -8,6 +8,24 @@ license="GPL-2 LGPL-2"
 makedepends="zlib-dev sdl-dev alsa-lib-dev gnutls-dev ncurses-dev"
 depends=
 install="qemu.pre-install"
+subpackages="
+$pkgname-arm
+$pkgname-cris
+$pkgname-m68k
+$pkgname-microblaze
+$pkgname-mips
+$pkgname-mips64
+$pkgname-mips64el
+$pkgname-mipsel
+$pkgname-ppc
+$pkgname-ppc64
+$pkgname-ppcemb
+$pkgname-sh4
+$pkgname-sh4eb
+$pkgname-sparc
+$pkgname-sparc64
+$pkgname-x86_64
+"
 source="http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz
 	kqemu.patch
 	"
@@ -23,7 +41,7 @@ prepare() {
 		Makefile Makefile.target tests/Makefile
 	sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
 		Makefile.target
-	patch -p1 -i ../kqemu.patch || return 1
+#	patch -p1 -i ../kqemu.patch || return 1
 }
 
 build() {
@@ -33,8 +51,8 @@ build() {
 		--audio-card-list=ac97,sb16,es1370,adlib \
 		--disable-darwin-user \
 		--disable-bsd-user \
-		--disable-nptl \
-		--cc="$CC"
+		--disable-linux-user \
+		--cc="${CC:-gcc}"
 
 	make || return 1
 }
@@ -44,5 +62,29 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="193285b0bcf655a7f7577d05ffcb82b1  qemu-0.11.1.tar.gz
+_subsys() {
+	pkgdesc="Qemu $1 system emulator"
+	depend="qemu"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/qemu-system-$1 "$subpkgdir"/usr/bin/
+}
+
+arm() { _subsys arm; }
+cris() { _subsys cris; }
+m68k() { _subsys m68k; }
+microblaze() { _subsys microblaze; }
+mips() { _subsys mips; }
+mips64() { _subsys mips64; }
+mips64el() { _subsys mips64el; }
+mipsel() { _subsys mipsel; }
+ppc() { _subsys ppc; }
+ppc64() { _subsys ppc64; }
+ppcemb() { _subsys ppcemb; }
+sh4() { _subsys sh4; }
+sh4eb() { _subsys sh4eb; }
+sparc() { _subsys sparc; }
+sparc64() { _subsys sparc64; }
+x86_64() { _subsys x86_64; }
+
+md5sums="93e6b134dff89b2799f57b7d9e0e0fc5  qemu-0.12.4.tar.gz
 f63f7412f016d8ccddabfd02ea28e748  kqemu.patch"
diff --git a/testing/rrdbot/APKBUILD b/testing/rrdbot/APKBUILD
index d1f1e17d33..e9698a13d1 100644
--- a/testing/rrdbot/APKBUILD
+++ b/testing/rrdbot/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rrdbot
 pkgver=0.9.6
-pkgrel=0
+pkgrel=1
 pkgdesc="an SNMP polling daemon which writes the polled values to an RRD database"
 url="http://memberwebs.com/stef/software/rrdbot/"
 license="BSD"
diff --git a/testing/rrdcollect/APKBUILD b/testing/rrdcollect/APKBUILD
index cf4c623d08..c0ffb9774a 100644
--- a/testing/rrdcollect/APKBUILD
+++ b/testing/rrdcollect/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=rrdcollect
 pkgver=0.2.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Read system statistical data and feed it to RRDtool"
 url="http://rrdcollect.sourceforge.net/"
 license="GPL"
-depends="uclibc libpcap rrdtool"
+depends="rrdtool"
 makedepends="libpcap-dev"
 install=
 subpackages="$pkgname-doc" 
@@ -20,6 +20,10 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 
 }
diff --git a/testing/rtapd/APKBUILD b/testing/rtapd/APKBUILD
index f568fb7601..88db672311 100644
--- a/testing/rtapd/APKBUILD
+++ b/testing/rtapd/APKBUILD
@@ -4,7 +4,7 @@ pkgname=rtapd
 _altpkgname="rtnppd"
 _builddir="$pkgname"
 pkgver=1.7
-pkgrel=0
+pkgrel=1
 pkgdesc="daemon for routing packets to rtnppd"
 url="http://sourceforge.net/projects/rtnppd/"
 license="GPL"
diff --git a/testing/rtnppd/APKBUILD b/testing/rtnppd/APKBUILD
index f608ec7fcf..b2725b8ab5 100644
--- a/testing/rtnppd/APKBUILD
+++ b/testing/rtnppd/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=rtnppd
 _builddir="$pkgname"
 pkgver=1.7b
-pkgrel=0
+pkgrel=1
 pkgdesc="A program route TNPP 3.8 (Telocator Network Paging Protocol) packets between serial and other links"
 url="http://sourceforge.net/projects/rtnppd/"
 license="GPL"
diff --git a/testing/scst-grsec/APKBUILD b/testing/scst-grsec/APKBUILD
new file mode 100644
index 0000000000..144cfc07fe
--- /dev/null
+++ b/testing/scst-grsec/APKBUILD
@@ -0,0 +1,62 @@
+# Contributor: Carlo Landmeter
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+
+_flavor=${FLAVOR:-grsec}
+_realname=scst
+# source the kernel version
+if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
+	. ../../main/linux-$_flavor/APKBUILD
+fi
+_kver=$pkgver
+_kernelver=$pkgver-r$pkgrel
+_abi_release=$pkgver-${_flavor}
+_kpkgrel=$pkgrel
+
+_realver=1.0.1.1
+pkgname=${_realname}-${_flavor}
+pkgver=$_kver
+_mypkgrel=0
+pkgrel=$(($_kpkgrel + $_mypkgrel))
+pkgdesc="$_flavor kernel modules for SCST $_realver"
+url="http://scst.sourceforge.net/"
+license="GPL-2"
+depends="linux-${_flavor}=${_kernelver}"
+install=
+makedepends="linux-${_flavor}-dev=${_kernelver}"
+subpackages="$pkgname-dev"
+source="http://downloads.sourceforge.net/$_realname/$_realname-$_realver.tar.gz
+	scst-kernel-2.6.32.patch
+	"
+_ksrc=/usr/src/linux-headers-${_abi_release}
+
+_builddir="$srcdir"/$_realname-$_realver
+prepare() {
+	cd "$_builddir"
+	for i in "$srcdir"/*.patch; do
+		[ -f "$i" ] || continue
+		msg "Applying $i"
+		patch -p1 -i $i || return 1
+	done
+}
+
+build() {
+	cd "$_builddir"
+	unset ARCH
+	make KDIR="$_ksrc" || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make KDIR="$_ksrc" \
+		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_DIR_H="$pkgdir"/usr/include/scst \
+		install || return 1
+}
+
+# we sourced kernel apkbuild above so we need to override the dev() func
+dev() {
+	default_dev
+}
+
+md5sums="38abb5f10325911ff1374535a30a02ad  scst-1.0.1.1.tar.gz
+a87b844b57f997c15c8e0099a313a98e  scst-kernel-2.6.32.patch"
diff --git a/testing/scst-grsec/scst-kernel-2.6.32.patch b/testing/scst-grsec/scst-kernel-2.6.32.patch
new file mode 100644
index 0000000000..80fc8610aa
--- /dev/null
+++ b/testing/scst-grsec/scst-kernel-2.6.32.patch
@@ -0,0 +1,17 @@
+--- scst-1.0.1.1/src/dev_handlers/scst_vdisk.c.orig
++++ scst-1.0.1.1/src/dev_handlers/scst_vdisk.c
+@@ -2071,9 +2071,13 @@
+ 	inode = file->f_dentry->d_inode;
+ 	mapping = file->f_mapping;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
+ 	res = sync_page_range(inode, mapping, loff, len);
++#else
++	res = filemap_write_and_wait_range(file->f_mapping, loff, len);
++#endif
+ 	if (unlikely(res != 0)) {
+-		PRINT_ERROR("sync_page_range() failed (%d)", res);
++		PRINT_ERROR("sync range failed (%d)", res);
+ 		if (cmd != NULL) {
+ 			scst_set_cmd_error(cmd,
+ 				SCST_LOAD_SENSE(scst_sense_write_error));
diff --git a/testing/sems/0001-makefile-fail-on-errors.patch b/testing/sems/0001-makefile-fail-on-errors.patch
deleted file mode 100644
index 9dcbb23015..0000000000
--- a/testing/sems/0001-makefile-fail-on-errors.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 7773c850b91d5c78679606065402caac29219dd8 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 18 Dec 2009 08:57:27 +0000
-Subject: [PATCH 1/2] makefile fail on errors
-
----
- Makefile                         |    8 ++++----
- apps/Makefile                    |   12 ++++++------
- core/Makefile                    |    2 +-
- core/plug-in/Makefile            |   14 +++++++-------
- core/plug-in/Makefile.app_module |    4 ++--
- 5 files changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 7dd01de..c210761 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,21 +28,21 @@ clean:
- 
- .PHONY: modules
- modules:
--	-@for r in $(modules) "" ; do \
-+	@for r in $(modules) "" ; do \
- 		if [ -n "$$r" ]; then \
- 			echo  "" ; \
- 			echo  "" ; \
--			$(MAKE) -C $$r all; \
-+			$(MAKE) -C $$r all || exit 1; \
- 		fi ; \
- 	done 
- 
- .PHONY: install
- install:
--	-@for r in $(imodules) "" ; do \
-+	@for r in $(imodules) "" ; do \
- 		if [ -n "$$r" ]; then \
- 			echo "" ; \
- 			echo "" ; \
--			$(MAKE) -C $$r install; \
-+			$(MAKE) -C $$r install || exit 1; \
- 		fi ; \
- 	done
- 	-@if [ -d ser-0.9.6-sems ]; then \
-diff --git a/apps/Makefile b/apps/Makefile
-index 23c6437..57df618 100644
---- a/apps/Makefile
-+++ b/apps/Makefile
-@@ -30,11 +30,11 @@ clean:
- 
- .PHONY: modules
- modules:
--	-@for r in $(modules) "" ; do \
-+	@for r in $(modules) "" ; do \
- 		if [ -n "$$r" ]; then \
- 			echo  "" ; \
- 			echo  "" ; \
--			COREPATH=../$(COREPATH) $(MAKE) -C $$r all; \
-+			COREPATH=../$(COREPATH) $(MAKE) -C $$r all || exit 1; \
- 		fi ; \
- 	done 
- 
-@@ -43,20 +43,20 @@ install: install-bin install-cfg
- 
- .PHONY: install-bin
- install-bin:
--	-@for r in $(modules) "" ; do \
-+	@for r in $(modules) "" ; do \
- 		if [ -n "$$r" ]; then \
- 			echo "" ; \
- 			echo "" ; \
--			COREPATH=../$(COREPATH) $(MAKE) -C $$r install; \
-+			COREPATH=../$(COREPATH) $(MAKE) -C $$r install || exit 1; \
- 		fi ; \
- 	done
- 
- .PHONY: install-cfg
- install-cfg: $(DESTDIR)$(cfg-target)
--	-@for r in $(modules) "" ; do \
-+	@for r in $(modules) "" ; do \
- 		if [ -n "$$r" ]; then \
- 			echo "" ; \
- 			echo "" ; \
--			COREPATH=../$(COREPATH) $(MAKE) -C $$r install-cfg; \
-+			COREPATH=../$(COREPATH) $(MAKE) -C $$r install-cfg || exit 1; \
- 		fi ; \
- 	done
-diff --git a/core/Makefile b/core/Makefile
-index e3734d5..e1fe274 100644
---- a/core/Makefile
-+++ b/core/Makefile
-@@ -11,7 +11,7 @@ AUDIO_FILES=$(notdir $(wildcard wav/*.wav))
- 
- .PHONY: all
- all: ../Makefile.defs
--	-@$(MAKE) deps    && \
-+	@$(MAKE) deps    && \
- 	  $(MAKE) $(NAME) && \
- 	  $(MAKE) modules
- 
-diff --git a/core/plug-in/Makefile b/core/plug-in/Makefile
-index e7d988c..cc38e2f 100644
---- a/core/plug-in/Makefile
-+++ b/core/plug-in/Makefile
-@@ -1,6 +1,6 @@
- include ../../Makefile.defs
- 
--exclude_modules ?= g722
-+exclude_modules ?= g722 speex
- #echo
- 
- modules = $(filter-out $(subst ;, ,$(exclude_modules)) \
-@@ -25,30 +25,30 @@ clean:
- 
- .PHONY: modules
- modules:
--	-@for r in $(modules) "" ; do \
-+	@for r in $(modules) "" ; do \
- 		if [ -n "$$r" ]; then \
- 			echo  "" ; \
- 			echo  "" ; \
--			$(MAKE) -C $$r all; \
-+			$(MAKE) -C $$r all || exit 1; \
- 		fi ; \
- 	done 
- 
- .PHONY: install
- install:
--	-@for r in $(modules) "" ; do \
-+	@for r in $(modules) "" ; do \
- 		if [ -n "$$r" ]; then \
- 			echo "" ; \
- 			echo "" ; \
--			$(MAKE) -C $$r install; \
-+			$(MAKE) -C $$r install || exit 1; \
- 		fi ; \
- 	done
- 
- .PHONY: install-cfg
- install-cfg: $(DESTDIR)$(cfg-target)
--	-@for r in $(modules) "" ; do \
-+	@for r in $(modules) "" ; do \
- 		if [ -n "$$r" ]; then \
- 			echo "" ; \
- 			echo "" ; \
--			COREPATH=../$(COREPATH) $(MAKE) -C $$r install-cfg; \
-+			COREPATH=../$(COREPATH) $(MAKE) -C $$r install-cfg || exit 1; \
- 		fi ; \
- 	done
-diff --git a/core/plug-in/Makefile.app_module b/core/plug-in/Makefile.app_module
-index 8b7acaa..a6e1ef2 100644
---- a/core/plug-in/Makefile.app_module
-+++ b/core/plug-in/Makefile.app_module
-@@ -27,12 +27,12 @@ depends  = $(srcs:.cpp=.d)
- 
- .PHONY: all
- all: $(extra_target)
--	-@$(MAKE) deps    && \
-+	@$(MAKE) deps    && \
- 	  $(MAKE) $(lib_full_name)
- 
- .PHONY: module_package
- module_package: $(extra_target)
--	-@$(MAKE) deps    && \
-+	@$(MAKE) deps    && \
- 	  $(MAKE) $(lib_name)
- 
- 
--- 
-1.6.5.6
-
diff --git a/testing/sems/0002-include-headers.patch b/testing/sems/0002-include-headers.patch
deleted file mode 100644
index 5e9a2477ae..0000000000
--- a/testing/sems/0002-include-headers.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 43faa45d0455c5bb53a0f992ffc7bdf92c94c945 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 18 Dec 2009 08:58:18 +0000
-Subject: [PATCH 2/2] include headers
-
----
- apps/annrecorder/AnnRecorder.cpp          |    2 ++
- apps/callback/CallBack.cpp                |    1 +
- apps/diameter_client/ServerConnection.cpp |    1 +
- apps/diameter_client/ServerConnection.h   |    1 +
- core/AmMediaProcessor.cpp                 |    1 +
- core/AmRtpReceiver.cpp                    |    1 +
- core/plug-in/sipctrl/udp_trsp.cpp         |    1 +
- core/plug-in/stats/query_stats.cxx        |    1 +
- 8 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/apps/annrecorder/AnnRecorder.cpp b/apps/annrecorder/AnnRecorder.cpp
-index b32cd58..7ba9639 100644
---- a/apps/annrecorder/AnnRecorder.cpp
-+++ b/apps/annrecorder/AnnRecorder.cpp
-@@ -25,6 +25,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+#include <unistd.h>
-+
- #include "AnnRecorder.h"
- #include "AmConfig.h"
- #include "AmUtils.h"
-diff --git a/apps/callback/CallBack.cpp b/apps/callback/CallBack.cpp
-index 360e698..6019705 100644
---- a/apps/callback/CallBack.cpp
-+++ b/apps/callback/CallBack.cpp
-@@ -32,6 +32,7 @@
- #include "AmPlugIn.h"
- 
- #include <stdlib.h>
-+#include <unistd.h>
- 
- EXPORT_SESSION_FACTORY(CallBackFactory,MOD_NAME);
- string CallBackFactory::gw_user;
-diff --git a/apps/diameter_client/ServerConnection.cpp b/apps/diameter_client/ServerConnection.cpp
-index 4157304..3e2a14f 100644
---- a/apps/diameter_client/ServerConnection.cpp
-+++ b/apps/diameter_client/ServerConnection.cpp
-@@ -30,6 +30,7 @@
- #include "ampi/DiameterClientAPI.h"
- #include "diameter_client.h"
- 
-+#include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
- #include "log.h"
-diff --git a/apps/diameter_client/ServerConnection.h b/apps/diameter_client/ServerConnection.h
-index d797d15..0af146a 100644
---- a/apps/diameter_client/ServerConnection.h
-+++ b/apps/diameter_client/ServerConnection.h
-@@ -38,6 +38,7 @@
- #include <vector>
- #include <map>
- #include <utility>
-+#include <stdint.h>
- using std::string;
- using std::vector;
- using std::map;
-diff --git a/core/AmMediaProcessor.cpp b/core/AmMediaProcessor.cpp
-index 9650c91..0da86b0 100644
---- a/core/AmMediaProcessor.cpp
-+++ b/core/AmMediaProcessor.cpp
-@@ -29,6 +29,7 @@
- #include "AmSession.h"
- #include "AmRtpStream.h"
- 
-+#include <unistd.h>
- #include <assert.h>
- #include <sys/time.h>
- #include <signal.h>
-diff --git a/core/AmRtpReceiver.cpp b/core/AmRtpReceiver.cpp
-index 5216b15..7f7fb4a 100644
---- a/core/AmRtpReceiver.cpp
-+++ b/core/AmRtpReceiver.cpp
-@@ -37,6 +37,7 @@
- #include <strings.h>
- #endif
- 
-+#include <unistd.h>
- #include <sys/time.h>
- #include <sys/poll.h>
- 
-diff --git a/core/plug-in/sipctrl/udp_trsp.cpp b/core/plug-in/sipctrl/udp_trsp.cpp
-index 49a8358..74f00ae 100644
---- a/core/plug-in/sipctrl/udp_trsp.cpp
-+++ b/core/plug-in/sipctrl/udp_trsp.cpp
-@@ -36,6 +36,7 @@
- #include <sys/param.h>
- #include <arpa/inet.h>
- 
-+#include <unistd.h>
- #include <errno.h>
- #include <string.h>
- 
-diff --git a/core/plug-in/stats/query_stats.cxx b/core/plug-in/stats/query_stats.cxx
-index 674f16c..10c498a 100644
---- a/core/plug-in/stats/query_stats.cxx
-+++ b/core/plug-in/stats/query_stats.cxx
-@@ -7,6 +7,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <stdlib.h>
-+#include <unistd.h>
- 
- #include <map>
- #include <string>
--- 
-1.6.5.6
-
diff --git a/testing/sems/APKBUILD b/testing/sems/APKBUILD
index 51c3a0444d..2f1e6ee055 100644
--- a/testing/sems/APKBUILD
+++ b/testing/sems/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=sems
-pkgver=1.1.1
-pkgrel=1
+pkgver=1.2.1
+pkgrel=0
 pkgdesc="High performance, extensible media server for SIP (RFC3261) based VoIP  services"
 url="http://iptel.org/sems/"
 license="GPL-2"
@@ -10,9 +10,7 @@ depends="kamailio"
 makedepends="python-dev openssl-dev lame-dev"
 install=
 subpackages=
-source="http://ftp.iptel.org/pub/$pkgname/1.1/$pkgver/src/$pkgname-$pkgver.tar.gz
-	0001-makefile-fail-on-errors.patch
-	0002-include-headers.patch
+source="http://ftp.iptel.org/pub/sems/sems-$pkgver.tar.gz
 	0003-cc-and-cflags.patch
 	"
 
@@ -20,6 +18,7 @@ prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
 	for i in "$srcdir"/*.patch; do
 		[ -f "$i" ] || continue
+		msg "Applying $i"
 		patch -p1 -i $i || return 1
 	done
 
@@ -55,7 +54,5 @@ package() {
 #	 install -m644 -D "$srcdir"//$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-md5sums="4a6422d09ddadaf9eacd8cae8f0848d5  sems-1.1.1.tar.gz
-f893ceef9295b593d2b1837a538b315a  0001-makefile-fail-on-errors.patch
-3d217a6d217fa8704d108f23815d4b97  0002-include-headers.patch
+md5sums="f0545c0708849e1a723d453244c2a79e  sems-1.2.1.tar.gz
 0054e6ed7e11393e71204876179d3199  0003-cc-and-cflags.patch"
diff --git a/testing/sircbot/APKBUILD b/testing/sircbot/APKBUILD
index 136c2b7e9c..85035fc4f1 100644
--- a/testing/sircbot/APKBUILD
+++ b/testing/sircbot/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: 
 pkgname=sircbot
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Minimalistic IRC bot"
 url="http://git.alpinelinux.org/cgit/sircbot/"
 license="GPL-2"
diff --git a/testing/sisctrl/APKBUILD b/testing/sisctrl/APKBUILD
index 59fb485da5..926a663e70 100644
--- a/testing/sisctrl/APKBUILD
+++ b/testing/sisctrl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sisctrl
 pkgver=0.0.20051202
-pkgrel=2
+pkgrel=3
 pkgdesc="SiSCtrl is Display Control Panel for XFree86/X.org SiS driver"
 url="http://www.winischhofer.net/linuxsisvga.shtml"
 license="GPL"
diff --git a/testing/smartmontools/APKBUILD b/testing/smartmontools/APKBUILD
index 8ba05087af..9650683ce4 100644
--- a/testing/smartmontools/APKBUILD
+++ b/testing/smartmontools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=smartmontools
 pkgver=5.38
-pkgrel=0
+pkgrel=1
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives."
 url="http://smartmontools.sourceforge.net"
 license="GPL"
diff --git a/testing/spandsp/APKBUILD b/testing/spandsp/APKBUILD
index dd1f227a39..bcb5818d11 100644
--- a/testing/spandsp/APKBUILD
+++ b/testing/spandsp/APKBUILD
@@ -1,28 +1,31 @@
 # Contributor: 
 # Maintainer: 
 pkgname=spandsp
-pkgver=0.0.5_pre4
-_ver=0.0.5pre4
+pkgver=0.0.5
 pkgrel=0
 pkgdesc="library to use DSP functions for telephony"
 url="http://www.soft-switch.org/"
 license="GPL"
-depends="uclibc tiff"
+depends=
 makedepends="tiff-dev"
 install=
 subpackages="$pkgname-dev"
-source="http://www.soft-switch.org/downloads/spandsp/$pkgname-$_ver.tgz"
+source="http://www.soft-switch.org/downloads/spandsp/$pkgname-$pkgver.tgz"
 
+_builddir="$srcdir/$pkgname-$pkgver"
 build() {
-	cd "$srcdir/$pkgname-0.0.5"
-
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install
 
 }
 
-md5sums="fe83ed37a7831f0dd38e7ef4e7e6fd9e  spandsp-0.0.5pre4.tgz"
+md5sums="fe83ed37a7831f0dd38e7ef4e7e6fd9e  spandsp-0.0.5.tgz"
diff --git a/testing/swatch/APKBUILD b/testing/swatch/APKBUILD
new file mode 100644
index 0000000000..9d06df638e
--- /dev/null
+++ b/testing/swatch/APKBUILD
@@ -0,0 +1,58 @@
+# Contributor: Mika Havela <mika.havela@gmail.com>
+# Maintainer: Mika Havela <mika.havela@gmail.com>
+pkgname=swatch
+pkgver=3.2.3
+pkgrel=0
+pkgdesc="Logfile monitoring tool"
+url="http://sourceforge.net/projects/swatch/"
+license="GPL"
+depends="perl perl-date-calc perl-date-format perl-date-manip perl-file-tail perl-carp-clan"
+makedepends="perl-dev"
+install=
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	swatch.initd
+	swatch.confd
+	swatchrc"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+        make || return 1
+        make test || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+        make realclean || return 1
+
+	# remove perllocal.pod and .packlist
+	find "$pkgdir" -name perllocal.pod -delete
+	find "$pkgdir" -name .packlist -delete
+
+
+#echo "pkdir= $pkgdir"
+#echo "srcdir= $srcdir"
+
+	mkdir -p "$pkgdir"/etc/init.d/
+	mkdir -p "$pkgdir"/etc/conf.d/
+	mkdir -p "$pkgdir"/etc/$pkgname/
+
+	cp "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	cp "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+	cp "$srcdir"/${pkgname}rc "$pkgdir"/etc/$pkgname/${pkgname}rc
+
+	chmod 755 "$pkgdir"/etc/init.d/$pkgname
+}
+
+md5sums="1162f1024cf07fc750ed4960d61ac4e8  swatch-3.2.3.tar.gz
+cc99f0831b4a069f90fdedee82495523  swatch.initd
+a02a10a0266781a1ce16cc3b5e84968c  swatch.confd
+8a92d37f96982030e0283dc7fe706da8  swatchrc"
diff --git a/testing/swatch/swatch.confd b/testing/swatch/swatch.confd
new file mode 100644
index 0000000000..5cbdc0a205
--- /dev/null
+++ b/testing/swatch/swatch.confd
@@ -0,0 +1,8 @@
+## tail-args
+#   Arguments for tail program
+tailargs="-n 0 -F"
+
+## script-dir
+#   This switch causes the temporary watcher script to be written to a file in the specified directory rather than the user's home directory.
+#   It is highly advised that you do NOT use directories that are writable by others such as /tmp.
+scriptdir="/tmp/swatch"
diff --git a/testing/swatch/swatch.initd b/testing/swatch/swatch.initd
new file mode 100755
index 0000000000..ec625e4026
--- /dev/null
+++ b/testing/swatch/swatch.initd
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+
+# swatch init.d file for alpine linux.
+
+name=swatch
+daemon=/usr/bin/$name
+configfile=/etc/${name}/swatchrc
+tailfile=/var/log/messages
+
+SVC="${SVCNAME#*.}"
+if [ -n "${SVC}" ] && [ "${SVCNAME}" != "${name}" ]; then
+	SVCPID="${name}.${SVC}.pid"
+	configfile="${configfile}.${SVC}"
+	tailfile=$(find /var/log -name "${SVC}" | head -1)
+	[ ! "${tailfile}" ] && tailfile="/var/log/${SVC}"
+else
+	SVCPID="${name}.pid"
+fi
+
+depend() {
+#	need net
+	after syslog
+}
+
+start() {
+	ebegin "Starting ${name}"
+		einfo "Preparing to monitor ${tailfile}"
+		if [ ! -e "${tailfile}" ]; then
+			eerror "${tailfile} does not exist"
+			return 1
+		fi
+		if [ ! -e "${configfile}" ]; then
+			eerror "Configfile ${configfile} is missing"
+			return 1
+		fi
+		mkdir -p "${scriptdir}"
+		start-stop-daemon --start --quiet --background \
+			--make-pidfile --pidfile /var/run/${SVCPID} \
+			--exec ${daemon} -- \
+			--config-file="${configfile}" --script-dir="${scriptdir}" \
+			--tail-file="${tailfile}" --tail-args="${tailargs}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${name}"
+		kill $(ps | grep .swatch_script.$(cat /var/run/${SVCPID}) | grep -v 'grep' | awk '{ print $1}')
+	eend $?
+}
+
diff --git a/testing/swatch/swatchrc b/testing/swatch/swatchrc
new file mode 100644
index 0000000000..3ea2615a94
--- /dev/null
+++ b/testing/swatch/swatchrc
@@ -0,0 +1,103 @@
+###############################################################################
+### Swatch example config
+#
+# The configuration file is used by the swatch(8) program to determine what
+# types of expression patterns to look for and what type of action(s) should be
+# taken when a pattern is matched.
+# Each line should contain a keyword and a, sometimes optional, value for that
+# keyword. The keyword and value are separated by a space or an equal (=) sign.
+#
+# watchfor regex
+# ignore regex
+#
+# echo [modes]
+#    Echo the matched line. The text mode may be normal, bold, underscore,
+#    blink, inverse, black, red, green, yellow, blue, magenta, cyan, white,
+#    black_h, red_h, green_h, yellow_h, blue_h, magenta_h, cyan_h,
+#    and/or white_h. The _h colors specify a highlighting color. The other
+#    colors are assigned to the letters. Some modes may not work on some
+#    terminals. Normal is the default.
+# bell [N]
+#    Echo the matched line, and send a bell N times (default = 1).
+# exec command
+#    Execute command. The command may contain variables which are substituted
+#    with fields from the matched line. A $N will be replaced by the Nth field
+#    in the line. A $0 or $* will be replaced by the entire line.
+# mail [addresses=address:address:...][,subject=your_text_here]
+#    Send mail to address(es) containing the matched lines as they appear
+#    (default address is the user who is running the program).
+# pipe command[,keep_open]
+#    Pipe matched lines into command. Use the keep_open option to force the
+#    pipe to stay open until a different pipe action is run or until swatch
+#    exits.
+# write [user:user:...]
+#    Use write(1) to send matched lines to user(s).
+# threshold track_by=key, type=<limit|threshold|both, count=number, seconds=number>
+#    Thresholding can be done for the complete watchfor block and/or for
+#    individual actions. Add ``threshold=on'' as an option along with the other
+#    threshold options when thresholding an individual action.
+#        track_by
+#            The value of this should be something that is unique to the
+#            watchfor regular expression. Tip: enclose unique parts of the
+#            regular expression in parentheses, then use the sub matches as
+#            part of the value (e.g. track_by=``$2:$4'').
+#        type
+#            There are three types of thresholding. They are as follows:
+#                limit
+#                    Perform action(s) for the first "count`` matches during
+#                    the time interval specified by ''seconds", then ignore
+#                    events for the rest of the time interval (kind of like
+#                    throttle)
+#                threshold
+#                    Perform action(s) on each match for up to count matches 
+#                    during the time interval specified by seconds
+#                both
+#                    Perform actions(s) once per time interval after "count``
+#                    matches occur, then ignore additional matches during the
+#                    time interval specified by ''seconds"
+# continue
+#    Use this action to cause swatch to continue to try to match other
+#    pattern/action groups after it is done with the current pattern/action
+#    block.
+# quit
+#    Use this action to cause swatch to clean up and quit immediately. 
+###############################################################################
+
+## Successful SSH Login Attempts
+watchfor        /sshd.*(: [aA]ccepted)(.*)( from )(.*)( port .*)$/
+		threshold track_by=$4,type=limit,count=1,seconds=60
+		echo bold green
+		#mail='receiver@foo.bar',SUBJECT=sshd: Accepted connection,MAILER=sendmail -t -S smtp.foo.bar -f sender\@foo.bar
+
+## Invalid SSH Login Attempts
+watchfor	/sshd.*(: [iI]nvalid [uU]ser )(.*)( from )(.*)$/
+		threshold track_by=$4,type=both,count=3,seconds=60
+		echo bold red
+
+## Failed SSH Login Attempts
+watchfor	/sshd.*(: [fF]ailed password for )(.*)( from )(.*)( port )(.*)$/
+		threshold track_by=$4,type=both,count=3,seconds=60
+		echo bold red
+
+## Failed SSH Login Attempts
+watchfor	/([aA]uthentication [fF]ailure for [iI]llegal [uU]ser )(.*)( from )(.*)$/
+        	threshold track_by=$4,type=both,count)3,seconds=60
+		echo bold red
+
+
+## Invalid sudo commands 
+watchfor        /sudo:.*[Cc]ommand not allowed/
+                echo bold red
+
+## File system full
+watchfor	/file system full/
+		echo bold blue
+
+## System crashes and halts
+watchfor	/(panic|halt)/
+		echo bold red
+
+## File system errors
+watchfor	/[Mm]edia [Ee]rror/
+		echo bold yellow
+
diff --git a/testing/swish-e/APKBUILD b/testing/swish-e/APKBUILD
index 76ff7bb768..758d775512 100644
--- a/testing/swish-e/APKBUILD
+++ b/testing/swish-e/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=swish-e
 pkgver=2.4.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple Web Indexing System for Humans - Enhanced"
 url="http://www.swish-e.org/"
 license="GPL"
diff --git a/testing/twisted/APKBUILD b/testing/twisted/APKBUILD
index 684db09762..5c6d8541a5 100644
--- a/testing/twisted/APKBUILD
+++ b/testing/twisted/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=twisted
 pkgver=8.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Asynchronous networking framework written in Python."
 url="http://twistedmatrix.com/"
 license="MIT"
diff --git a/testing/ucspi-tcp/APKBUILD b/testing/ucspi-tcp/APKBUILD
index 9cdca87524..9b6f578a45 100644
--- a/testing/ucspi-tcp/APKBUILD
+++ b/testing/ucspi-tcp/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ucspi-tcp
 pkgver=0.88
-pkgrel=0
+pkgrel=1
 pkgdesc="Easy-to-use command-line tools for building TCP client-server applications."
 url="http://cr.yp.to/ucspi-tcp.html"
 license="public-domain"
diff --git a/testing/udev/APKBUILD b/testing/udev/APKBUILD
index d25b5faa49..0d55e6fd65 100644
--- a/testing/udev/APKBUILD
+++ b/testing/udev/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=udev
 pkgver=142
-pkgrel=0
+pkgrel=1
 pkgdesc="The userspace dev tools (udev)"
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 license="GPL"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="uclibc"
+depends=
 makedepends=""
 install=
 source="http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
diff --git a/testing/ulogd/APKBUILD b/testing/ulogd/APKBUILD
index 6dad6b8deb..52ba2dd030 100644
--- a/testing/ulogd/APKBUILD
+++ b/testing/ulogd/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=ulogd
 pkgver=2.0.0_beta3
 _pkgver=2.0.0beta3
-pkgrel=1
+pkgrel=2
 pkgdesc="A userspace logging daemon for netfilter/iptables related logging"
 url="http://netfilter.org/projects/ulogd/index.html"
 license="GPL"
@@ -21,6 +21,10 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$_pkgver"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 ulogd.conf "$pkgdir"/etc/ulogd.conf
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
diff --git a/testing/umix/APKBUILD b/testing/umix/APKBUILD
index 7eb262f7f1..d057b39081 100644
--- a/testing/umix/APKBUILD
+++ b/testing/umix/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com> 
 pkgname=umix
 pkgver=1.0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Program for adjusting soundcard volumes"
 url="http://umix.sf.net"
 license="GPL"
diff --git a/testing/vlc/APKBUILD b/testing/vlc/APKBUILD
deleted file mode 100644
index d28ddf074c..0000000000
--- a/testing/vlc/APKBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=vlc
-pkgver=1.0.0
-pkgrel=0
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-url="http://www.videolan.org/vlc/"
-license="GPL-2"
-subpackages="$pkgname-dev $pkgname-doc"
-#depends="libnotify a52dec fluidsynth zvbi libdvbpsi lirc-utils libdca hal 
-#	libproxy sdl_image libdvdnav>=4.1.3 lua libxv libv4l libcddb smbclient
-#	libmatroska taglib sysfsutils libmpcdec ffmpeg>=0.5 libshout libmad
-#	qt fribidi libmpeg2 libmodplug avahi ttf-dejavu"
-depends="ttf-dejavu"
-makedepends="
-	a52dec-dev
-	alsa-lib-dev
-	dbus-dev
-	ffmpeg-dev
-	fribidi-dev
-	gtk+-dev
-	libgcrypt-dev
-	libice-dev
-	libiconv-dev
-	libmad-dev
-	libmpeg2-dev
-	libnotify-dev
-	libogg-dev
-	libsm-dev
-	libx11-dev
-	libxext-dev
-	libxv-dev
-	lua-dev
-	mesa-dev
-	pkgconfig
-	sdl-dev
-	sysfsutils-dev
-	x264-dev
-	"
-source="http://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
-	uclibc.patch
-	"
-
-build ()
-{
-	cd "$srcdir"/$pkgname-$pkgver
-	sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c
-
-	patch -p1 < ../uclibc.patch || return 1
-	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
-
-	./configure --prefix=/usr \
-		--disable-mmx \
-		--disable-nls \
-		--disable-optimizations \
-		--disable-qt4 --disable-skins2 \
-		--disable-rpath \
-		--enable-httpd \
-		--enable-realrtsp \
-		--enable-sout \
-		--enable-vlm \
-		|| return 1
-
-#		--enable-dvdread \
-#		--enable-dvdnav \
-#		--enable-qt4 \
-#		--enable-faad \
-#		--enable-skins2 \
-#		--enable-dvb \
-#		--enable-v4l \
-#		--enable-theora \
-#		--enable-flac \
-#		--enable-snapshot \
-#		--enable-hal \
-#		--enable-dbus \
-#		--enable-dbus-control \
-#		--enable-lirc \
-#		--enable-shout \
-#		--enable-pvr \
-
-	make || return 1
-	make DESTDIR="$pkgdir"/ install || return 1
-	for res in 16 32 48 128; do
-		install -D -m644 share/vlc${res}x${res}.png \
-			"$pkgdir"/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png || return 1
-	done
-	rm -rf "$pkgdir"/usr/lib/mozilla
-}
-
-md5sums="fc78904ab5fa73f518d8fe4e852e7f67  vlc-1.0.0.tar.bz2
-2a16bf6c14a94f41490872aa189db755  uclibc.patch"
diff --git a/testing/vlc/uclibc.patch b/testing/vlc/uclibc.patch
deleted file mode 100644
index f71b189a4c..0000000000
--- a/testing/vlc/uclibc.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/src/misc/linux_specific.c	2009-07-08 09:29:41.000000000 +0000
-+++ b/src/misc/linux_specific.c	2009-07-08 09:30:47.000000000 +0000
-@@ -72,14 +72,14 @@
- }
- #endif
- 
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- # include <gnu/libc-version.h>
- # include <stdlib.h>
- #endif
- 
- void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[])
- {
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
-     const char *glcv = gnu_get_libc_version ();
- 
-     /* gettext in glibc 2.5-2.7 is not thread-safe. LibVLC keeps crashing,
---- a/src/control/vlm.c	2009-07-09 09:21:55.000000000 +0000
-+++ b/src/control/vlm.c	2009-07-09 09:22:24.000000000 +0000
-@@ -21,6 +21,10 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
-  *****************************************************************************/
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <vlc/libvlc.h>
- #include <vlc/libvlc_vlm.h>
- #include <vlc_es.h>
---- a/src/misc/mtime.c	2009-07-09 11:57:46.000000000 +0000
-+++ b/src/misc/mtime.c	2009-07-09 13:48:16.000000000 +0000
-@@ -78,7 +78,7 @@
- #  define _POSIX_CLOCK_SELECTION (-1)
- #endif
- 
--# if (_POSIX_CLOCK_SELECTION < 0)
-+# if (_POSIX_CLOCK_SELECTION < 0) || defined(__UCLIBC__)
- /*
-  * We cannot use the monotonic clock is clock selection is not available,
-  * as it would screw vlc_cond_timedwait() completely. Instead, we have to
---- a/src/misc/threads.c	2009-07-09 13:54:08.000000000 +0000
-+++ b/src/misc/threads.c	2009-07-09 13:54:32.000000000 +0000
-@@ -474,7 +474,7 @@
-    /* Fairly outdated POSIX support (that was defined in 2001) */
- #  define _POSIX_CLOCK_SELECTION (-1)
- # endif
--# if (_POSIX_CLOCK_SELECTION >= 0)
-+# if (_POSIX_CLOCK_SELECTION >= 0) && !defined(__UCLIBC__)
-     /* NOTE: This must be the same clock as the one in mtime.c */
-     pthread_condattr_setclock (&attr, CLOCK_MONOTONIC);
- # endif
---- a/modules/stream_filter/decomp.c	2009-07-09 14:10:09.000000000 +0000
-+++ b/modules/stream_filter/decomp.c	2009-07-09 14:11:37.000000000 +0000
-@@ -28,7 +28,7 @@
- #include <vlc_network.h>
- #include <assert.h>
- #include <unistd.h>
--#ifndef _POSIX_SPAWN
-+#if !defined(_POSIX_SPAWN) || defined(__UCLIBC__)
- # define _POSIX_SPAWN (-1)
- #endif
- #include <fcntl.h>
diff --git a/testing/wine/APKBUILD b/testing/wine/APKBUILD
deleted file mode 100644
index 35ae36341e..0000000000
--- a/testing/wine/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=wine
-pkgver=1.1.38
-pkgrel=0
-pkgdesc="A compatibility layer for running Windows programs"
-url="http://www.winehq.com"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev
-	libxcursor-dev libxrandr-dev libxdamage-dev mesa-dev flex bison
-	libpng-dev jpeg-dev freetype-dev"
-# lcms
-source="http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$pkgver.tar.bz2
-	libpng14.patch"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	patch -p1 -i "$srcdir"/libpng14.patch
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--with-x
-	make depend && make 
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make prefix="$pkgdir"/usr install || return 1
-	mkdir -p "$pkgdir"/etc/wine
-}
-md5sums="ef5947bcb9667b75b8de4a2ce16d0ec2  wine-1.1.38.tar.bz2
-51f78b18168d5abd78411e9e66458d55  libpng14.patch"
diff --git a/testing/wine/libpng14.patch b/testing/wine/libpng14.patch
deleted file mode 100644
index 14f6ddc079..0000000000
--- a/testing/wine/libpng14.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
-index e14fe81..62165f6 100644
---- a/programs/winemenubuilder/winemenubuilder.c
-+++ b/programs/winemenubuilder/winemenubuilder.c
-@@ -188,8 +188,10 @@ static void *libpng_handle;
- MAKE_FUNCPTR(png_create_info_struct);
- MAKE_FUNCPTR(png_create_write_struct);
- MAKE_FUNCPTR(png_destroy_write_struct);
-+MAKE_FUNCPTR(png_get_error_ptr);
- MAKE_FUNCPTR(png_init_io);
- MAKE_FUNCPTR(png_set_bgr);
-+MAKE_FUNCPTR(png_set_error_fn);
- MAKE_FUNCPTR(png_set_text);
- MAKE_FUNCPTR(png_set_IHDR);
- MAKE_FUNCPTR(png_write_end);
-@@ -209,8 +211,10 @@ static void *load_libpng(void)
-         LOAD_FUNCPTR(png_create_info_struct);
-         LOAD_FUNCPTR(png_create_write_struct);
-         LOAD_FUNCPTR(png_destroy_write_struct);
-+        LOAD_FUNCPTR(png_get_error_ptr);
-         LOAD_FUNCPTR(png_init_io);
-         LOAD_FUNCPTR(png_set_bgr);
-+        LOAD_FUNCPTR(png_set_error_fn);
-         LOAD_FUNCPTR(png_set_IHDR);
-         LOAD_FUNCPTR(png_set_text);
-         LOAD_FUNCPTR(png_write_end);
-@@ -221,6 +225,23 @@ static void *load_libpng(void)
-     return libpng_handle;
- }
- 
-+static void user_error_fn(png_structp png_ptr, png_const_charp error_message)
-+{
-+    jmp_buf *pjmpbuf;
-+
-+    /* This uses setjmp/longjmp just like the default. We can't use the
-+     * default because there's no way to access the jmp buffer in the png_struct
-+     * that works in 1.2 and 1.4 and allows us to dynamically load libpng. */
-+    WINE_ERR("PNG error: %s\n", wine_dbgstr_an(error_message, -1));
-+    pjmpbuf = ppng_get_error_ptr(png_ptr);
-+    longjmp(*pjmpbuf, 1);
-+}
-+
-+static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message)
-+{
-+    WINE_WARN("PNG warning: %s\n", wine_dbgstr_an(warning_message, -1));
-+}
-+
- static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, LPCWSTR commentW)
- {
-     static const char comment_key[] = "Created from";
-@@ -234,6 +255,7 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename,
-     int nWidth  = pIcon->bmiHeader.biWidth;
-     int nHeight = pIcon->bmiHeader.biHeight;
-     int nBpp    = pIcon->bmiHeader.biBitCount;
-+    jmp_buf jmpbuf;
- 
-     switch (nBpp)
-     {
-@@ -306,12 +328,12 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename,
-         !(info_ptr = ppng_create_info_struct(png_ptr)))
-         goto error;
- 
--    if (setjmp(png_jmpbuf(png_ptr)))
-+    if (setjmp(jmpbuf))
-     {
-         /* All future errors jump here */
--        WINE_ERR("png error\n");
-         goto error;
-     }
-+    ppng_set_error_fn(png_ptr, &jmpbuf, user_error_fn, user_warning_fn);
- 
-     ppng_init_io(png_ptr, fp);
-     ppng_set_IHDR(png_ptr, info_ptr, nWidth, nHeight, 8,
--- 
-1.6.3.3
-
diff --git a/testing/wzdftpd/APKBUILD b/testing/wzdftpd/APKBUILD
deleted file mode 100644
index b9b4626564..0000000000
--- a/testing/wzdftpd/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# This is an example APKBUILD file. Use this as a start to creating your own,
-# and remove these comments.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# Contributor: Your Name <youremail@domain.com>
-pkgname=wzdftpd-svn
-pkgver=2040
-pkgrel=2
-pkgdesc="A portable, modular, small, and efficient FTP server"
-url="http://www.wzdftpd.net"
-license='GPL'
-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"
-subpackages="$pkgname-doc"
-
-build() {
-        mkdir "$srcdir/${pkgname}"
-        mv "$srcdir/wzdftpd-src" "$srcdir/${pkgname}/"
-        cd "$srcdir/${pkgname}/"
-        cmake \
-        -D CMAKE_INSTALL_PREFIX:PATH=/usr \
-        -D WITH_DUPECHECK:BOOL=ON \
-        -D WITH_SFV:BOOL=ON \
-        -D BUILD_TESTING:BOOL=OFF \
-        -D WITH_Zeroconf:BOOL=ON \
-        -D TCL_LIBRARY:FILEPATH=/usr/lib/libtcl8.5.so \
-        -D WITH_PAM:BOOL=OFF \
-        -D WITH_PerlDev:BOOL=OFF \
-        -D CONF_INSTALL_PATH:PATH=/etc/wzdftpd \
-        ./wzdftpd-src || return 1
-        make || return 1
-        make DESTDIR="$pkgdir/" install
-        mv $pkgdir/usr/var $pkgdir/
-        sed -i -e 's|usr/var|var|' \
-        -e 's|usr/etc|etc|' \
-        -e 's|usr//etc|etc|' \
-	-e 's|#pid_file|pid_file|' \
-        $pkgdir/etc/wzdftpd/wzd.cfg.sample
-	install -Dm 755 "$startdir"/$pkgname.initd $pkgdir/etc/init.d/wzdftpd
-}
-
-md5sums="4bdb2fcaa4ca316261e9f77380818769  wzdftpd-svn2040.tar.gz
-ae2b7497cc7729bfaf346ba0d3b607d2  wzdftpd-svn.initd"
diff --git a/testing/wzdftpd/wzdftpd-svn.initd b/testing/wzdftpd/wzdftpd-svn.initd
deleted file mode 100644
index 25f4da6f47..0000000000
--- a/testing/wzdftpd/wzdftpd-svn.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-	after firewall
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f /etc/wzdftpd/wzd.cfg ] ; then
-		eerror "No /etc/wzdftpd/wzd.cnf file exists!"
-		return 1
-	fi
-	if [ ! -d /var/run/wzdftpd ] ; then
-		install -dD -o ftp -g ftp /var/run/wzdftpd
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting wzdftpd"
-	/usr/sbin/wzdftpd >/dev/null 2>&1 &
-	eend $?
-}
-
-stop () {
-	ebegin "Stopping wzdftpd"
-	start-stop-daemon --stop --quiet \
-		--pidfile=/var/run/wzdftpd/wzdftpd.pid --retry 20
-	eend $?
-}
-
diff --git a/testing/xf86-video-openchrome-svn/APKBUILD b/testing/xf86-video-openchrome-svn/APKBUILD
deleted file mode 100644
index 692af749da..0000000000
--- a/testing/xf86-video-openchrome-svn/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-openchrome-svn
-pkgver=811
-pkgrel=0
-pkgdesc="X.Org driver for VIA/S3G cards"
-url="http://xorg.freedesktop.org/"
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pkgconfig xorg-server-dev libxi-dev libxvmc-dev fontsproto glproto
-	randrproto videoproto renderproto xf86driproto mesa-dev subversion
-	automake autoconf libtool"
-
-source=
-
-build ()
-{
-	cd "$srcdir"
-	if [ -d openchrome ]; then
-		cd openchrome
-		svn up
-	else
-		svn co -r $pkgver http://svn.openchrome.org/svn/trunk openchrome 
-		cd openchrome
-	fi
-	export GCC_SPECS=/usr/share/gcc/hardenednoznow.specs
-
-	./autogen.sh 
-	./configure --prefix=/usr || return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}