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

57 files changed, 444 insertions, 61 deletions

diff --git a/main/acf-jquery/APKBUILD b/main/acf-jquery/APKBUILD
index 32b5fc20f..5d7f602dd 100644
--- a/main/acf-jquery/APKBUILD
+++ b/main/acf-jquery/APKBUILD
@@ -2,11 +2,12 @@
 # Developer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-jquery
 pkgver=0.1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="jquery libraries for ACF"
 url="http://git.alpinelinux.org/cgit/acf-jquery"
 license="GPL-2"
 depends=""
+replaces="acf-core"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
 
 build() {
diff --git a/testing/cciss_vol_status/APKBUILD b/main/cciss_vol_status/APKBUILD
index 589184502..589184502 100644
--- a/testing/cciss_vol_status/APKBUILD
+++ b/main/cciss_vol_status/APKBUILD
diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 8f00df036..d3cb48c91 100644
--- a/main/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=coreutils
-pkgver=7.6
+pkgver=8.2
 pkgrel=0
 pkgdesc="The basic file, shell and text manipulation utilities"
 url="http://www.gnu.org/software/coreutils/"
@@ -11,9 +11,9 @@ makedepends=
 install="$pkgname.post-deinstall $pkgname.post-upgrade"
 subpackages="$pkgname-doc"
 source="http://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.gz"
+
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -21,8 +21,11 @@ build() {
 		--disable-nls \
 		--without-gmp
 	make || return 1
-	make DESTDIR="$pkgdir" install
+}
 
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
 }
 
-md5sums="3d82f979229365f880da750642e67cf3  coreutils-7.6.tar.gz"
+md5sums="dfb0d3dbc5f555386339f4f74621cda0  coreutils-8.2.tar.gz"
diff --git a/testing/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD
index 3d7542cb0..3d7542cb0 100644
--- a/testing/dahdi-linux-vserver/APKBUILD
+++ b/main/dahdi-linux-vserver/APKBUILD
diff --git a/testing/dahdi-linux-vserver/dahdi-2.2.0.2-driver_data-2.6.32.patch b/main/dahdi-linux-vserver/dahdi-2.2.0.2-driver_data-2.6.32.patch
index 3085218c0..3085218c0 100644
--- a/testing/dahdi-linux-vserver/dahdi-2.2.0.2-driver_data-2.6.32.patch
+++ b/main/dahdi-linux-vserver/dahdi-2.2.0.2-driver_data-2.6.32.patch
diff --git a/testing/dahdi-linux-vserver/dahdi-2.2.0.2-gcc44-hack.patch b/main/dahdi-linux-vserver/dahdi-2.2.0.2-gcc44-hack.patch
index d647a1f9b..d647a1f9b 100644
--- a/testing/dahdi-linux-vserver/dahdi-2.2.0.2-gcc44-hack.patch
+++ b/main/dahdi-linux-vserver/dahdi-2.2.0.2-gcc44-hack.patch
diff --git a/testing/dahdi-linux-vserver/dahdi-2.2.0.2-includes.patch b/main/dahdi-linux-vserver/dahdi-2.2.0.2-includes.patch
index 5451bc691..5451bc691 100644
--- a/testing/dahdi-linux-vserver/dahdi-2.2.0.2-includes.patch
+++ b/main/dahdi-linux-vserver/dahdi-2.2.0.2-includes.patch
diff --git a/testing/dahdi-linux-vserver/dahdi-2.6.31.patch b/main/dahdi-linux-vserver/dahdi-2.6.31.patch
index 35fe4383e..35fe4383e 100644
--- a/testing/dahdi-linux-vserver/dahdi-2.6.31.patch
+++ b/main/dahdi-linux-vserver/dahdi-2.6.31.patch
diff --git a/testing/dahdi-linux-vserver/dahdi-bri_dchan.patch b/main/dahdi-linux-vserver/dahdi-bri_dchan.patch
index d7a3fe859..d7a3fe859 100644
--- a/testing/dahdi-linux-vserver/dahdi-bri_dchan.patch
+++ b/main/dahdi-linux-vserver/dahdi-bri_dchan.patch
diff --git a/testing/dahdi-linux-vserver/dahdi-depmod.patch b/main/dahdi-linux-vserver/dahdi-depmod.patch
index 289aad403..289aad403 100644
--- a/testing/dahdi-linux-vserver/dahdi-depmod.patch
+++ b/main/dahdi-linux-vserver/dahdi-depmod.patch
diff --git a/testing/dahdi-linux-vserver/dahdi-linux-2.2.0-hfc-4s.patch b/main/dahdi-linux-vserver/dahdi-linux-2.2.0-hfc-4s.patch
index 67857e2f7..67857e2f7 100644
--- a/testing/dahdi-linux-vserver/dahdi-linux-2.2.0-hfc-4s.patch
+++ b/main/dahdi-linux-vserver/dahdi-linux-2.2.0-hfc-4s.patch
diff --git a/testing/dahdi-linux-vserver/dahdi-zaphfc.patch b/main/dahdi-linux-vserver/dahdi-zaphfc.patch
index 735d1c5a3..735d1c5a3 100644
--- a/testing/dahdi-linux-vserver/dahdi-zaphfc.patch
+++ b/main/dahdi-linux-vserver/dahdi-zaphfc.patch
diff --git a/testing/dahdi-linux-vserver/zaphfc-dahdi-flortz.diff b/main/dahdi-linux-vserver/zaphfc-dahdi-flortz.diff
index 719accdc6..719accdc6 100644
--- a/testing/dahdi-linux-vserver/zaphfc-dahdi-flortz.diff
+++ b/main/dahdi-linux-vserver/zaphfc-dahdi-flortz.diff
diff --git a/main/iptraf/APKBUILD b/main/iptraf/APKBUILD
index d4e4b2339..e8f0c496e 100644
--- a/main/iptraf/APKBUILD
+++ b/main/iptraf/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=iptraf
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="IP Network Monitoring Software"
 url="http://iptraf.seoul.org"
 license="GPL"
@@ -11,7 +11,9 @@ makedepends="ncurses-dev"
 install=
 subpackages="$pkgname-doc"
 source="ftp://iptraf.seul.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
-	iptraf-3.0.0-vlan.patch"
+	iptraf-3.0.0-vlan.patch
+	iptraf-3.0.0-interface.patch
+	"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver/src"
@@ -37,4 +39,5 @@ build() {
 }
 
 md5sums="377371c28ee3c21a76f7024920649ea8  iptraf-3.0.0.tar.gz
-4136483b9e41c8789c629c42f9a67d07  iptraf-3.0.0-vlan.patch"
+4136483b9e41c8789c629c42f9a67d07  iptraf-3.0.0-vlan.patch
+667def7e433fe95823fec8faeb3cd8b9  iptraf-3.0.0-interface.patch"
diff --git a/main/iptraf/iptraf-3.0.0-interface.patch b/main/iptraf/iptraf-3.0.0-interface.patch
new file mode 100644
index 000000000..d64c96381
--- /dev/null
+++ b/main/iptraf/iptraf-3.0.0-interface.patch
@@ -0,0 +1,68 @@
+--- iptraf-3.0.0/src/packet.c.interface	2005-09-13 08:42:54.000000000 +0200
++++ iptraf-3.0.0/src/packet.c	2008-04-22 15:27:30.000000000 +0200
+@@ -102,11 +102,19 @@ unsigned short getlinktype(unsigned shor
+         else if (strncmp(ifname, "tun", 3) == 0)
+             result = LINK_ETHERNET;
+         else if (strncmp(ifname, "vlan", 3) == 0)
+-            result = LINK_VLAN;
++            result = LINK_ETHERNET;
++        else if (strncmp(ifname, "bond", 4) == 0)
++            result = LINK_ETHERNET;
+         else if (strncmp(ifname, "brg", 3) == 0)
+             result = LINK_ETHERNET;
+         else if (strncmp(ifname, "tap", 3) == 0)
+             result = LINK_ETHERNET;
++        else if (strncmp(ifname, "ctc", 3) == 0)
++            result = LINK_ETHERNET;
++        else if (strncmp(ifname, "hsi", 3) == 0)
++            result = LINK_ETHERNET;
++        else if (strncmp(ifname, "ath", 3) == 0)
++            result = LINK_ETHERNET;
+         else if ((strncmp(ifname, "isdn", 4) == 0) && (isdn_fd != -1)) {
+             isdnent = isdn_table_lookup(isdnlist, ifname, isdn_fd);
+ 
+@@ -235,6 +243,7 @@ void adjustpacket(char *tpacket, unsigne
+          */
+         memmove(aligned_buf, *packet, min(SNAPSHOT_LEN, *readlen));
+         *packet = aligned_buf;
++	break;
+     default:
+         *packet = (char *) NULL;        /* return a NULL packet to signal */
+         break;                  /* an unrecognized link protocol */
+@@ -344,9 +353,14 @@ int processpacket(char *tpacket, char **
+      * Get IPTraf link type based on returned information and move past
+      * data link header.
+      */
+-    *linktype =
+-        getlinktype(fromaddr->sll_hatype, ifname, isdnfd, &isdntable);
+     fromaddr->sll_protocol = ntohs(fromaddr->sll_protocol);
++    if (fromaddr->sll_protocol != ETH_P_8021Q)
++        *linktype =
++            getlinktype(fromaddr->sll_hatype, ifname, isdnfd, &isdntable);
++    else {
++        *linktype = LINK_VLAN;
++        fromaddr->sll_protocol = ntohs(*((unsigned short*)(tpacket+ETH_HLEN+2)));
++    }
+     adjustpacket(tpacket, *linktype, packet, aligned_buf, br);
+ 
+     if (*packet == NULL)
+--- iptraf-3.0.0/src/ifaces.c.interface	2005-09-13 08:42:54.000000000 +0200
++++ iptraf-3.0.0/src/ifaces.c	2008-04-22 15:35:40.000000000 +0200
+@@ -32,14 +32,15 @@ details.
+ #include "error.h"
+ 
+ extern int accept_unsupported_interfaces;
+-#define NUM_SUPPORTED_IFACES 26
++#define NUM_SUPPORTED_IFACES 30
+ 
+ extern int daemonized;
+ 
+ char ifaces[][6] =
+     { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
+     "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
+-    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan"
++    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "hsi",
++    "ctc", "ath", "bond"
+ };
+ 
+ char *ltrim(char *buf)
diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD
index e1b4bc790..ffd61ae0f 100644
--- a/main/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
@@ -1,21 +1,19 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=lftp
-pkgver=3.7.15
+pkgver=4.0.5
 pkgrel=0
 pkgdesc="LFTP is sophisticated ftp/http client"
 url="http://lftp.yar.ru/"
 license="GPL"
 depends=
-makedepends="openssl-dev uclibc++-dev readline-dev ncurses-dev gettext-dev"
+makedepends="openssl-dev readline-dev ncurses-dev gettext-dev"
 subpackages="$pkgname-doc"
 source="http://ftp.yars.free.net/pub/source/lftp/lftp-${pkgver}.tar.bz2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	export CXX=g++-uc
-
 	./configure --prefix=/usr \
 		--sysconfdir=/etc/lftp \
 		--mandir=/usr/share/man \
@@ -24,8 +22,11 @@ build() {
 		--disable-nls \
 		--with-openssl
 	make || return 1
-	make -j1 DESTDIR="$pkgdir" install
+}
 
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make -j1 DESTDIR="$pkgdir" install
 }
 
-md5sums="bb2e116d2fcf3544805efd4b6463316e  lftp-3.7.15.tar.bz2"
+md5sums="5400cad5f91e131ac2ded7c24aea594c  lftp-4.0.5.tar.bz2"
diff --git a/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD
index 66f3851f0..2dce29014 100644
--- a/main/linux-headers/APKBUILD
+++ b/main/linux-headers/APKBUILD
@@ -1,15 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=linux-headers
-pkgver=2.6.30.5
-_kernver=2.6.30
-pkgrel=0
+pkgver=2.6.32.2
+_kernver=2.6.32
+pkgrel=1
 pkgdesc="Linux system headers"
 url="http://kernel.org"
 license='GPL-2'
 makedepends="perl"
+replaces="uclibc-dev"
 options="!strip !tracedeps"
 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
+	scsi.patch
 	"
 
 build() {
@@ -17,6 +19,7 @@ build() {
 	if [ "$_kernver" != "$pkgver" ]; then
 		bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 || return 1
 	fi
+	patch -p1 -i "$srcdir"/scsi.patch || return 1
 
 	mkdir -p "$pkgdir/usr"
 	make headers_install INSTALL_HDR_PATH="$pkgdir/usr" 
@@ -28,5 +31,6 @@ build() {
 	rm -rf "$pkgdir"/usr/include/drm
 }
 
-md5sums="7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-47841c7ff5c81a7b349a79f2fa8e9138  patch-2.6.30.5.bz2"
+md5sums="260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
+924b7aa0fcd6e54c12ecc9b3c3082f59  patch-2.6.32.2.bz2
+b6d05566fcfe07770d9386f0588f8758  scsi.patch"
diff --git a/main/linux-headers/scsi.patch b/main/linux-headers/scsi.patch
new file mode 100644
index 000000000..f85a3b750
--- /dev/null
+++ b/main/linux-headers/scsi.patch
@@ -0,0 +1,42 @@
+diff -Naur linux-2.6.32-old/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h
+--- linux-2.6.32-old/include/scsi/scsi.h	2009-12-03 13:51:21.000000000 +1000
++++ linux-2.6.32/include/scsi/scsi.h	2009-12-12 10:43:11.000000000 +1000
+@@ -145,14 +145,15 @@
+ 
+ /* defined in T10 SCSI Primary Commands-2 (SPC2) */
+ struct scsi_varlen_cdb_hdr {
+-	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
+-	u8 control;
+-	u8 misc[5];
+-	u8 additional_cdb_length;         /* total cdb length - 8 */
++	__u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
++	__u8 control;
++	__u8 misc[5];
++	__u8 additional_cdb_length;         /* total cdb length - 8 */
+ 	__be16 service_action;
+ 	/* service specific data follows */
+ };
+ 
++#ifdef __KERNEL__
+ static inline unsigned
+ scsi_varlen_cdb_length(const void *hdr)
+ {
+@@ -168,6 +169,7 @@
+ 	return (cmnd[0] == VARIABLE_LENGTH_CMD) ?
+ 		scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
+ }
++#endif
+ 
+ /*
+  *  SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
+@@ -284,8 +286,10 @@
+ 	SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
+ };
+ 
++#ifdef __KERNEL__
+ /* Returns a human-readable name for the device */
+ extern const char * scsi_device_type(unsigned type);
++#endif
+ 
+ /*
+  * standard mode-select header prepended to all mode-select commands
diff --git a/testing/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index 089e9e45b..34901d7e0 100644
--- a/testing/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=2.6.32.1
+pkgver=2.6.32.2
 _kernver=2.6.32
 pkgrel=0
 pkgdesc="Linux kernel with vserver"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
 install=
 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
-	http://vserver.13thfloor.at/Experimental/patch-2.6.32.1-vs2.3.0.36.27.diff
+	http://vserver.13thfloor.at/Experimental/patch-2.6.32.2-vs2.3.0.36.28.diff
 	kernelconfig.x86
 	"
 subpackages="$pkgname-dev"
@@ -114,6 +114,6 @@ dev() {
 }
 
 md5sums="260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
-abc24a9beb8431a75301dd3884b37a3c  patch-2.6.32.1.bz2
-c1f98ed3fef90a66f4b007a965c73276  patch-2.6.32.1-vs2.3.0.36.27.diff
+924b7aa0fcd6e54c12ecc9b3c3082f59  patch-2.6.32.2.bz2
+9427ad984e951ddecf57bd1a1ff1e1f1  patch-2.6.32.2-vs2.3.0.36.28.diff
 86d5988d01198848fdad6f663fdbb39d  kernelconfig.x86"
diff --git a/testing/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86
index 2fb20c409..2fb20c409 100644
--- a/testing/linux-vserver/kernelconfig.x86
+++ b/main/linux-vserver/kernelconfig.x86
diff --git a/testing/luaexpat/APKBUILD b/main/luaexpat/APKBUILD
index e11ba1075..4223edad7 100644
--- a/testing/luaexpat/APKBUILD
+++ b/main/luaexpat/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="LuaExpat is a SAX XML parser based on the Expat library. LuaExpat is free software and uses the same license as Lua 5.0."
 url="http://luaforge.net/projects/luaexpat/"
 license="MIT"
-depends="lua expat uclibc"
+depends="lua"
 makedepends="lua-dev expat-dev"
 install=
 source="http://luaforge.net/frs/download.php/2469/$pkgname-$pkgver.tar.gz
@@ -17,6 +17,10 @@ build() {
 	mv ../newconfig ./config
 
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	make LUA_DIR="$pkgdir"/usr/share/lua/5.1 LUA_LIBDIR="$pkgdir"/usr/lib/lua/5.1 install
 
 }
diff --git a/testing/luaexpat/newconfig b/main/luaexpat/newconfig
index 7d8d6331f..7d8d6331f 100644
--- a/testing/luaexpat/newconfig
+++ b/main/luaexpat/newconfig
diff --git a/testing/luasocket/APKBUILD b/main/luasocket/APKBUILD
index c42a6229f..b5edf4595 100644
--- a/testing/luasocket/APKBUILD
+++ b/main/luasocket/APKBUILD
@@ -13,8 +13,11 @@ source="http://luaforge.net/frs/download.php/2664/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	make INSTALL_TOP_SHARE="$pkgdir/usr/share/lua/5.1" INSTALL_TOP_LIB="$pkgdir/usr/lib/lua/5.1" install
 
 }
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD
index 0312d4663..95f8e5e5c 100644
--- a/main/mysql/APKBUILD
+++ b/main/mysql/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mysql
-pkgver=5.1.41
+pkgver=5.1.42
 pkgrel=0
 pkgdesc="A fast SQL database server"
 url="http://www.mysql.com/"
@@ -72,6 +72,6 @@ client() {
 	done
 }
 
-md5sums="b5d39e8789174753f3c782959729e68c  mysql-5.1.41.tar.gz
+md5sums="b644b219e130b7c6bca81948f75d72d7  mysql-5.1.42.tar.gz
 25d08b02bff6aa379dc45859b7a3f28a  mysql.initd
 15a7e3ddd6a40bf5a1eb3a8c69d9c34c  mysql.mycnf"
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index e1b6c99d3..88cab44d7 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openrc
-pkgver=0.5.0
-pkgrel=13
+pkgver=0.6.0
+pkgrel=0
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="http://roy.marples.name/openrc"
 license='BSD-2'
@@ -9,10 +9,7 @@ depends=""
 subpackages="$pkgname-doc $pkgname-dev"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2
-	dont-provide-ourself.patch
-	command-line-size-fix.patch
 	openrc-0.4.3-mkmntdirs.patch
-	openrc-hwclock.patch
 	localmount.patch
 	hostname.initd
 	hwdrivers.initd
@@ -23,19 +20,27 @@ source="http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2
 	local.start
 	"
 
-build() {
+prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
 	for i in ../*.patch; do
 		msg "Applying $i..."
 		patch -p1 < $i || return 1
 	done
+}
 
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir/" install
 
 	# we cannot have anything turned on by default
 	rm -f "$pkgdir"/etc/runlevels/*/*
 
+	# we still use our ifup/ifdown based net config
 	rm -f "$pkgdir"/etc/conf.d/network "$pkgdir"/etc/init.d/network
 
 	# we override some of the scripts
@@ -47,11 +52,8 @@ build() {
 	install -Dm644 ../local.start "$pkgdir"/etc/conf.d/local.start
 }
 
-md5sums="9ec7f8425e12abbbd0f7a962aae3fa3c  openrc-0.5.0.tar.bz2
-1bb9c2aec9243a781191efcfc68df8c9  dont-provide-ourself.patch
-396b1cbd399403ba0448402afc6f9220  command-line-size-fix.patch
+md5sums="2b30959bc68595cdf389cb9f62105ec6  openrc-0.6.0.tar.bz2
 8c2c1c2ee0509b63966b7187a2079f4b  openrc-0.4.3-mkmntdirs.patch
-f462c976b04cfbb35b2335be15eee7f6  openrc-hwclock.patch
 fa1809cd59cc0559a163bc6adc7398f6  localmount.patch
 c32e15b0858eef708497e7ee6355a055  hostname.initd
 b1e64885f301166df30be3e3cf5338ff  hwdrivers.initd
diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index 17d884279..35af54e96 100644
--- a/main/ssmtp/APKBUILD
+++ b/main/ssmtp/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ssmtp
 pkgver=2.64
-pkgrel=0
+pkgrel=1
 pkgdesc="Extremely simple MTA to get mail off the system to a mail hub"
 subpackages="$pkgname-doc"
 arch=""
@@ -34,6 +34,8 @@ package() {
 		etcdir="$pkgdir"/etc \
 		mandir="$pkgdir"/usr/share/man \
 		install
+	ln -s ssmtp "$pkgdir"/usr/sbin/sendmail
 }
+
 md5sums="65b4e0df4934a6cd08c506cabcbe584f  ssmtp_2.64.orig.tar.bz2
 c70c395fe71589ca8b10b666455d5071  generate_config.patch"
diff --git a/main/uclibc/APKBUILD b/main/uclibc/APKBUILD
index ca217c064..8463c9815 100644
--- a/main/uclibc/APKBUILD
+++ b/main/uclibc/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=uclibc
 pkgver=0.9.30.1
-pkgrel=18
+pkgrel=19
 pkgdesc="C library for developing embedded Linux systems"
 url=http://uclibc.org
 license="LGPL-2"
 _mynamever=uClibc-$pkgver
 
 subpackages="$pkgname-dev"
-depends_dev="linux-headers"
+depends_dev="linux-headers=>2.6.32"
 
 source="http://uclibc.org/downloads/$_mynamever.tar.bz2
 	$pkgname-0.9.30.1-resolv.patch
@@ -25,7 +25,7 @@ source="http://uclibc.org/downloads/$_mynamever.tar.bz2
 	uclibc-fork-hidden.diff
 	uclibc-fork-hook.diff
 	uclibc-getaddrinfo-netlink.diff
-	uclibcconfig
+	uclibcconfig.x86
 	"
 # backport openat funcs
 source="$source
@@ -34,7 +34,10 @@ source="$source
 	0003-remove-libc_hidden_def-mknodat.patch
 	"
 
-_prepare() {
+_config="$srcdir"/uclibcconfig.${ARCH:-x86}
+
+
+prepare() {
 	local i gcc_major
 	cd "$srcdir/$_mynamever/"
 	# patches goes here
@@ -44,23 +47,21 @@ _prepare() {
 	done
 }
 
-_compile() {
+build() {
 	cd "$srcdir/$_mynamever/"
-	cp ../uclibcconfig .config
+	cp "$_config" .config
 	make silentoldconfig
 	# this is a hack to get uclibc-i386-floating-stacks.diff working
 	touch libc/sysdeps/linux/i386/sysdep.h
 	make || return 1
 }
 
-_install() {
+package() {
 	cd "$srcdir/$_mynamever/"
 	make install DESTDIR="$pkgdir" install_utils
 	install -Dm755 extra/scripts/getent "$pkgdir"/usr/bin/getent
-}
-
-build() {
-	_prepare && _compile && _install
+	# provided by linux-headers
+	rm -f "$pkgdir"/usr/include/scsi/scsi.h
 }
 
 md5sums="1a4b84e5536ad8170563ffa88c34679c  uClibc-0.9.30.1.tar.bz2
@@ -78,7 +79,7 @@ bbb8475963e791f596c34c81ef5583d7  uclibc-resolv-cname-fix.diff
 220260c979eca4558827d0e7ec8aa8b6  uclibc-fork-hidden.diff
 55bb709f5efd937df323f0d39a202cfd  uclibc-fork-hook.diff
 a7310494a8073ebd43e1d437657532ef  uclibc-getaddrinfo-netlink.diff
-36b28777f4c49af39268920fbade41b1  uclibcconfig
+36b28777f4c49af39268920fbade41b1  uclibcconfig.x86
 329b92fec717c8808c3fa9ffd68f2dfb  0001-first-pass-at-implementing-at-funcs.patch
 7ffa41082d9de2bc512b4bed9577bdf9  0002-add-hidden-aliases-for-openat-funcs.patch
 e12c647716eef19dd4ad08602dcc435b  0003-remove-libc_hidden_def-mknodat.patch"
diff --git a/main/uclibc/uclibcconfig b/main/uclibc/uclibcconfig.x86
index 78835525f..78835525f 100644
--- a/main/uclibc/uclibcconfig
+++ b/main/uclibc/uclibcconfig.x86
diff --git a/main/util-linux-ng/APKBUILD b/main/util-linux-ng/APKBUILD
index 2125de239..6426f291c 100644
--- a/main/util-linux-ng/APKBUILD
+++ b/main/util-linux-ng/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=util-linux-ng
-pkgver=2.16
-pkgrel=2
+pkgver=2.16.2
+pkgrel=0
 pkgdesc="Random collection of Linux utilities"
 arch=""
 url="http://kernel.org/~kzak/util-linux-ng/"
@@ -74,4 +74,4 @@ cfdisk() {
 	mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/
 }
 
-md5sums="f6aba93a43b7736782d7aaa3718c45e3  util-linux-ng-2.16.tar.gz"
+md5sums="7fdefce7904d2d4b4a1e16735b733f2f  util-linux-ng-2.16.2.tar.gz"
diff --git a/testing/util-vserver/APKBUILD b/main/util-vserver/APKBUILD
index 030994d9f..24d8150ae 100644
--- a/testing/util-vserver/APKBUILD
+++ b/main/util-vserver/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=util-vserver
-pkgver=0.30.216_pre2849
-_realver=0.30.216-pre2849
+pkgver=0.30.216_pre2864
+_realver=0.30.216-pre2864
 pkgrel=5
 pkgdesc="Linux-VServer admin utilities"
 url="http://www.nongnu.org/util-vserver/"
@@ -57,7 +57,7 @@ package() {
 	install -Dm755 ../setup-vs-guest "$pkgdir"/usr/sbin/setup-vs-guest
 }
 
-md5sums="af4c22b420320bdd94a1756f3c90de20  util-vserver-0.30.216-pre2849.tar.bz2
+md5sums="f686d72b39399fba96bbabd7debab549  util-vserver-0.30.216-pre2864.tar.bz2
 62b7b9bbe5902b95f4614272af003dfd  busybox.patch
 73c7437dea6937a57cf38d166ef83c09  chmod.patch
 ff8f561f672524eb46fe633f584ef60e  ensc_pathprog.patch
diff --git a/testing/util-vserver/alpine.patch b/main/util-vserver/alpine.patch
index eacc2cb62..eacc2cb62 100644
--- a/testing/util-vserver/alpine.patch
+++ b/main/util-vserver/alpine.patch
diff --git a/testing/util-vserver/busybox.patch b/main/util-vserver/busybox.patch
index cc471cc4e..cc471cc4e 100644
--- a/testing/util-vserver/busybox.patch
+++ b/main/util-vserver/busybox.patch
diff --git a/testing/util-vserver/chmod.patch b/main/util-vserver/chmod.patch
index 53861e893..53861e893 100644
--- a/testing/util-vserver/chmod.patch
+++ b/main/util-vserver/chmod.patch
diff --git a/testing/util-vserver/ensc_pathprog.patch b/main/util-vserver/ensc_pathprog.patch
index e14c1f6da..e14c1f6da 100644
--- a/testing/util-vserver/ensc_pathprog.patch
+++ b/main/util-vserver/ensc_pathprog.patch
diff --git a/testing/util-vserver/setup-vs-guest b/main/util-vserver/setup-vs-guest
index dffd3c880..dffd3c880 100644
--- a/testing/util-vserver/setup-vs-guest
+++ b/main/util-vserver/setup-vs-guest
diff --git a/testing/util-vserver/setup-vs-template b/main/util-vserver/setup-vs-template
index 8ad7f3fae..8ad7f3fae 100644
--- a/testing/util-vserver/setup-vs-template
+++ b/main/util-vserver/setup-vs-template
diff --git a/testing/util-vserver/util-vserver.post-install b/main/util-vserver/util-vserver.post-install
index 9c8aad1e4..9c8aad1e4 100644
--- a/testing/util-vserver/util-vserver.post-install
+++ b/main/util-vserver/util-vserver.post-install
diff --git a/testing/util-vserver/util-vserver.post-upgrade b/main/util-vserver/util-vserver.post-upgrade
index c5db4163f..c5db4163f 120000
--- a/testing/util-vserver/util-vserver.post-upgrade
+++ b/main/util-vserver/util-vserver.post-upgrade
diff --git a/testing/util-vserver/validate.patch b/main/util-vserver/validate.patch
index 081dce5a3..081dce5a3 100644
--- a/testing/util-vserver/validate.patch
+++ b/main/util-vserver/validate.patch
diff --git a/testing/wireless-tools/APKBUILD b/main/wireless-tools/APKBUILD
index b4c726bd0..b4c726bd0 100644
--- a/testing/wireless-tools/APKBUILD
+++ b/main/wireless-tools/APKBUILD
diff --git a/testing/wireless-tools/wireless-tools-29-asneeded.patch b/main/wireless-tools/wireless-tools-29-asneeded.patch
index 04f2d869b..04f2d869b 100644
--- a/testing/wireless-tools/wireless-tools-29-asneeded.patch
+++ b/main/wireless-tools/wireless-tools-29-asneeded.patch
diff --git a/testing/alsa-utils/APKBUILD b/testing/alsa-utils/APKBUILD
index d045fa350..ffa912174 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.21
+pkgver=1.0.22
 pkgrel=0
 pkgdesc="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 url="http://www.alsa-project.org"
@@ -14,9 +14,13 @@ source="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$pkgver.tar.bz2
 	alsa.confd
 	"
 
-build() { 
+prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
 	patch -Np1 -i ../alsaconf.patch || return 1
+}
+
+build() { 
+	cd "$srcdir"/$pkgname-$pkgver
 	./configure --prefix=/usr \
 		--disable-xmlto \
 		|| return 1
@@ -29,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="3672287c2608040d111ce45495ba7602  alsa-utils-1.0.21.tar.bz2
+md5sums="f7180316188552ee1e6759a03f1fe98d  alsa-utils-1.0.22.tar.bz2
 5e65f278b5a77e3ee2821ad955c4cd91  alsaconf.patch
 4a66dad46d5366e05098cde97f3d37b5  alsa.initd
 85b1f1e759fe5953eca329237f4ac256  alsa.confd"
diff --git a/testing/cherokee/APKBUILD b/testing/cherokee/APKBUILD
index abc0da30e..83e04bd25 100644
--- a/testing/cherokee/APKBUILD
+++ b/testing/cherokee/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Mika Havela <mika.havela@gmail.com> 
 # Maintainer: Mika Havela <mika.havela@gmail.com>
 pkgname=cherokee
-pkgver=0.99.38
+pkgver=0.99.39
 pkgrel=0
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 url="http://www.cherokee-project.com/"
@@ -29,6 +29,6 @@ build() {
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-md5sums="67be28eda0673598fbb5b1cbd70de455  cherokee-0.99.38.tar.gz
+md5sums="2e9694268eda387489b10b2e237e291a  cherokee-0.99.39.tar.gz
 4180dbb6701f928054079aa1e3bd5ebc  cherokee.initd
 bd6a840f72c630ce1eaabe058097584f  cherokee.confd"
diff --git a/testing/dspam/0001-Support-for-parallell-builds.patch b/testing/dspam/0001-Support-for-parallell-builds.patch
new file mode 100644
index 000000000..7044d5f6e
--- /dev/null
+++ b/testing/dspam/0001-Support-for-parallell-builds.patch
@@ -0,0 +1,77 @@
+From 80f81670323a09025ffb7d030be56e47aec5492c Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 6 Jan 2010 12:34:15 +0000
+Subject: [PATCH] Support for parallell builds
+
+---
+ src/Makefile.am |   12 +++++++-----
+ 1 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6e8a774..49d6b16 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -134,7 +134,7 @@ libmysql_drv_la_LIBADD = $(libmysql_drv_libs) -L. -ldspam
+ libmysql_drv_la_CPPFLAGS = $(libmysql_drv_cppflags)
+ libmysql_drv_la_LDFLAGS = $(libmysql_drv_ldflags)
+ libmysql_drv_la_LDFLAGS += -rpath '$(pkglibdir)' -version-info $(libversion) 
+-libmysql_drv_la_DEPENDENCIES =
++libmysql_drv_la_DEPENDENCIES = libdspam.la
+ 
+ libpgsql_drv_la_SOURCES = \
+ 	pgsql_drv.c pgsql_drv.h 
+@@ -142,7 +142,7 @@ libpgsql_drv_la_LIBADD = $(libpgsql_drv_libs) -L. -ldspam
+ libpgsql_drv_la_CPPFLAGS = $(libpgsql_drv_cppflags)
+ libpgsql_drv_la_LDFLAGS = $(libpgsql_drv_ldflags)
+ libpgsql_drv_la_LDFLAGS += -rpath '$(pkglibdir)' -version-info $(libversion)
+-libpgsql_drv_la_DEPENDENCIES =
++libpgsql_drv_la_DEPENDENCIES = libdspam.la
+ 
+ libsqlite_drv_la_SOURCES = \
+ 	sqlite_drv.c sqlite_drv.h 
+@@ -150,7 +150,7 @@ libsqlite_drv_la_LIBADD = $(libsqlite_drv_libs) -L. -ldspam
+ libsqlite_drv_la_CPPFLAGS = $(libsqlite_drv_cppflags)
+ libsqlite_drv_la_LDFLAGS = $(libsqlite_drv_ldflags)
+ libsqlite_drv_la_LDFLAGS += -rpath '$(pkglibdir)' -version-info $(libversion)
+-libsqlite_drv_la_DEPENDENCIES =
++libsqlite_drv_la_DEPENDENCIES = libdspam.la
+ 
+ libsqlite3_drv_la_SOURCES = \
+ 	sqlite3_drv.c sqlite3_drv.h 
+@@ -158,7 +158,7 @@ libsqlite3_drv_la_LIBADD = $(libsqlite3_drv_libs) -L. -ldspam
+ libsqlite3_drv_la_CPPFLAGS = $(libsqlite3_drv_cppflags)
+ libsqlite3_drv_la_LDFLAGS = $(libsqlite3_drv_ldflags)
+ libsqlite3_drv_la_LDFLAGS += -rpath '$(pkglibdir)' -version-info $(libversion)
+-libsqlite3_drv_la_DEPENDENCIES =
++libsqlite3_drv_la_DEPENDENCIES = libdspam.la
+ 
+ libhash_drv_la_SOURCES = \
+ 	hash_drv.c hash_drv.h
+@@ -166,7 +166,7 @@ libhash_drv_la_LIBADD = $(libhash_drv_libs) -L. -ldspam
+ libhash_drv_la_CPPFLAGS = $(libhash_drv_cppflags)
+ libhash_drv_la_LDFLAGS = $(libhash_drv_ldflags)
+ libhash_drv_la_LDFLAGS += -rpath '$(pkglibdir)' -version-info $(libversion)
+-libhash_drv_la_DEPENDENCIES =
++libhash_drv_la_DEPENDENCIES = libdspam.la
+ 
+ endif
+ 
+@@ -181,6 +181,7 @@ dspam_SOURCES = \
+ 	agent_shared.c agent_shared.h
+ 
+ dspam_LDADD = -lm pref.o libdspam.la
++dspam_DEPENDENCIES = pref.o libdspam.la
+ 
+ dspamc_SOURCES = \
+ 	config.h language.h \
+@@ -192,6 +193,7 @@ dspamc_SOURCES = \
+ 
+ dspamc_LDADD = -lm buffer.o config_shared.o error.o read_config.o pref.o nodetree.o util.o $(NETLIBS)
+ dspamc_LDFLAGS = 
++dspamc_DEPENDENCIES = buffer.o config_shared.o error.o read_config.o pref.o nodetree.o util.o 
+ 
+ # Failing of chgrp is expected and normal case when someone do
+ #   make install DESTDIR=...
+-- 
+1.6.6
+
diff --git a/testing/dspam/APKBUILD b/testing/dspam/APKBUILD
new file mode 100644
index 000000000..1d049cfbe
--- /dev/null
+++ b/testing/dspam/APKBUILD
@@ -0,0 +1,78 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=dspam
+pkgver=3.9.0_rc2
+_ver=3.9.0-RC2
+pkgrel=0
+pkgdesc="A statistical-algorithmic hybrid anti-spam filter"
+url="http://dspam.nuclearelephant.com/"
+pkgusers="dspam"
+pkggroups="dspam"
+license="GPL-2"
+depends=
+install="$pkgname.pre-install"
+makedepends="postgresql-dev sqlite-dev mysql-dev autoconf automake libtool"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-mysql
+	$pkgname-sqlite"
+
+install= #dspam.install
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$_ver.tar.gz
+	0001-Support-for-parallell-builds.patch
+	dspam.logrotate
+	dspam.initd"
+
+
+prepare() {
+	cd "$srcdir"/$pkgname-$_ver
+	for i in "$srcdir"/*.patch; do
+		[ -f "$i" ] || continue
+		msg "Applying $i"
+		patch -p1 -i "$i" || return 1
+	done
+	aclocal -I m4 && libtoolize && autoconf && automake
+}
+
+build() {
+	cd "$srcdir"/$pkgname-$_ver
+	./configure --prefix=/usr \
+		--sysconfdir=/etc/dspam \
+		--with-dspam-home=/var/lib/dspam \
+		--enable-virtual-users \
+		--enable-preferences-extension \
+		--enable-daemon \
+		--with-storage-driver="hash_drv,sqlite3_drv,pgsql_drv,mysql_drv" \
+		--with-mysql-includes=/usr/include/mysql \
+		--with-mysql-libraries=/usr/lib/mysql \
+		|| return 1
+	make
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$_ver
+	make install DESTDIR="$pkgdir"
+	install -Dm755 "$srcdir"/dspam.initd "$pkgdir"/etc/init.d/dspam
+	install -Dm644 "$srcdir"/dspam.logrotate "$pkgdir"/etc/logrotate.d/dspam
+
+}
+
+pgsql() {
+	pkgdesc="dspam postgresql driver"
+	install -d "$subpkgdir"/usr/lib/dspam
+	mv "$pkgdir"/usr/lib/dspam/*pgsql* "$subpkgdir"/usr/lib/dspam/
+}
+
+mysql() {
+	pkgdesc="dspam mysql driver"
+	install -d "$subpkgdir"/usr/lib/dspam
+	mv "$pkgdir"/usr/lib/dspam/*mysql* "$subpkgdir"/usr/lib/dspam/
+}
+
+sqlite() {
+	pkgdesc="dspam sqlite driver"
+	install -d "$subpkgdir"/usr/lib/dspam
+	mv "$pkgdir"/usr/lib/dspam/*sqlite* "$subpkgdir"/usr/lib/dspam/
+}
+
+md5sums="013dc6700f7c5a757b7a656626b36248  dspam-3.9.0-RC2.tar.gz
+0f9f6b32cab7b8e3ad342daad119535d  0001-Support-for-parallell-builds.patch
+a798e9a6e2d5c30724f84d004bb96339  dspam.logrotate
+7d1fb0820f4a23f593f22186ef77d02a  dspam.initd"
diff --git a/testing/dspam/dspam.initd b/testing/dspam/dspam.initd
new file mode 100644
index 000000000..d91fefeb8
--- /dev/null
+++ b/testing/dspam/dspam.initd
@@ -0,0 +1,46 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/files/dspam.rc,v 1.1 2005/03/21 00:10:30 st_lim Exp $
+
+conf=/etc/dspam/dspam.conf
+
+depend() {
+	use logger
+	need net
+	before mta
+	after pg_autovacuum postgresql mysql
+}
+
+checkconfig() {
+	if [ ! -f "$conf" ]
+	then
+		eerror "You need a DSPAM configuration in $conf"
+		return 1
+	fi
+	if (! grep -q "^ServerPID" $conf); then
+		eerror "ServerPID missing in DSPAM configuration $conf"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting DSPAM"
+	start-stop-daemon --start --quiet --background \
+		--exec /usr/bin/dspam -- --daemon
+	eend ${?}
+}
+
+stop() {
+	checkconfig || return 1
+
+	local DSPAM_PID="$(grep "^ServerPID" $conf)"
+	DSPAM_PID="${DSPAM_PID/ServerPID/}"
+
+	ebegin "Stopping DSPAM"
+	start-stop-daemon --stop --quiet --pidfile ${DSPAM_PID}
+	eend ${?}
+}
+
diff --git a/testing/dspam/dspam.logrotate b/testing/dspam/dspam.logrotate
new file mode 100644
index 000000000..1fb3e04cc
--- /dev/null
+++ b/testing/dspam/dspam.logrotate
@@ -0,0 +1,6 @@
+/var/log/dspam/sql.errors /var/log/dspam/dspam.log /var/log/dspam/dspam.debug /var/log/dspam/dspam.messages {
+	weekly
+	compress
+	missingok
+	copytruncate
+}
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
new file mode 100644
index 000000000..9a6cc6f1e
--- /dev/null
+++ b/testing/dspam/dspam.pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+adduser -h /var/lib/dspam -s /bin/false -D dspam 2>/dev/null
+chown dspam:dspam /var/lib/dspam
+exit 0
+
diff --git a/testing/lua-openrc/APKBUILD b/testing/lua-openrc/APKBUILD
new file mode 100644
index 000000000..56578c400
--- /dev/null
+++ b/testing/lua-openrc/APKBUILD
@@ -0,0 +1,32 @@
+# Contributor: 
+# Maintainer: 
+pkgname=lua-openrc
+pkgver=0.1
+pkgrel=0
+pkgdesc="Lua module for OpenRC"
+url="http://git.alpinelinux.org/cgit/lua-openrc/"
+license="GPL"
+depends=lua
+makedepends="lua-dev openrc-dev"
+install=
+subpackages=
+source="http://git.alpinelinux.org/cgit/lua-openrc/snapshot/lua-openrc-$pkgver.tar.bz2"
+
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	install -Dm755 rc.so "$pkgdir"/usr/lib/lua/5.1/rc.so
+}
+
+md5sums="9a9ace6b5567179852b1ee04196a0ec3  lua-openrc-0.1.tar.bz2"
diff --git a/main/udev/APKBUILD b/testing/udev/APKBUILD
index d25b5faa4..d25b5faa4 100644
--- a/main/udev/APKBUILD
+++ b/testing/udev/APKBUILD
diff --git a/main/udev/move_tmp_persistent_rules.sh b/testing/udev/move_tmp_persistent_rules.sh
index 1a0259798..1a0259798 100755
--- a/main/udev/move_tmp_persistent_rules.sh
+++ b/testing/udev/move_tmp_persistent_rules.sh
diff --git a/main/udev/udev-mount.initd b/testing/udev/udev-mount.initd
index 839565a5b..839565a5b 100755
--- a/main/udev/udev-mount.initd
+++ b/testing/udev/udev-mount.initd
diff --git a/main/udev/udev-postmount.initd b/testing/udev/udev-postmount.initd
index 96beb845b..96beb845b 100755
--- a/main/udev/udev-postmount.initd
+++ b/testing/udev/udev-postmount.initd
diff --git a/main/udev/udev-start.sh b/testing/udev/udev-start.sh
index 87c3a6ac9..87c3a6ac9 100644
--- a/main/udev/udev-start.sh
+++ b/testing/udev/udev-start.sh
diff --git a/main/udev/udev.initd b/testing/udev/udev.initd
index 26774ab4a..26774ab4a 100755
--- a/main/udev/udev.initd
+++ b/testing/udev/udev.initd
diff --git a/main/udev/write_root_link_rule b/testing/udev/write_root_link_rule
index 8eaea1176..8eaea1176 100755
--- a/main/udev/write_root_link_rule
+++ b/testing/udev/write_root_link_rule
diff --git a/testing/kqemu-vserver/APKBUILD b/unstable/kqemu-vserver/APKBUILD
index 8f88148f0..8f88148f0 100644
--- a/testing/kqemu-vserver/APKBUILD
+++ b/unstable/kqemu-vserver/APKBUILD