Merge git://dev.alpinelinux.org/aports

105 files changed, 2451 insertions, 1145 deletions

diff --git a/testing/audacity/APKBUILD b/testing/audacity/APKBUILD
index 7b96153490..68a821c2e3 100644
--- a/testing/audacity/APKBUILD
+++ b/testing/audacity/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=audacity
-pkgver=1.3.13
+pkgver=2.0.0
 pkgrel=0
 pkgdesc="Multitrack audio editor"
 url="http://audacity.sourceforge.net"
@@ -14,9 +14,9 @@ makedepends="$depends_dev wxgtk-dev alsa-lib-dev libsndfile-dev flac-dev
 	libid3tag-dev taglib-dev"
 install=""
 subpackages="$pkgname-doc $pkgname-lang"
-source="http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-$pkgver-beta.tar.bz2"
+source="http://downloads.sourceforge.net/audacity/audacity-fullsrc-$pkgver.tar.bz2"
 
-_builddir="$srcdir"/audacity-src-$pkgver-beta
+_builddir="$srcdir"/audacity-src-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
@@ -45,4 +45,4 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="57be7fadb8c8dd17b8462c7ac1561d03  audacity-minsrc-1.3.13-beta.tar.bz2"
+md5sums="286a66b162f5086241e3dc2da725b687  audacity-fullsrc-2.0.0.tar.bz2"
diff --git a/testing/cherokee/APKBUILD b/testing/cherokee/APKBUILD
index 7479996b01..254f174fb1 100644
--- a/testing/cherokee/APKBUILD
+++ b/testing/cherokee/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=cherokee
 pkgver=1.2.101
-pkgrel=0
+pkgrel=1
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 url="http://www.cherokee-project.com/"
 arch="all"
diff --git a/testing/clutter/APKBUILD b/testing/clutter/APKBUILD
index 1add156556..78656ffc85 100644
--- a/testing/clutter/APKBUILD
+++ b/testing/clutter/APKBUILD
@@ -1,18 +1,19 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=clutter
-pkgver=1.6.16
-pkgrel=1
+pkgver=1.6.20
+pkgrel=0
 pkgdesc="library for creating fast, visually-appealing interfaces"
 url="http://www.clutter-project.org/"
 arch="all"
 license="LGPL"
 depends=
-depends_dev="gdk-pixbuf-dev json-glib-dev atk-dev pango-dev mesa-dev libxcomposite-dev cairo-dev"
+depends_dev="gdk-pixbuf-dev json-glib-dev atk-dev pango-dev mesa-dev
+	libxcomposite-dev cairo-dev"
 makedepends="$depends_dev gobject-introspection-dev intltool"
 install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 
 _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
@@ -38,4 +39,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="9c7e9c5356d7e3405b756ce6a91c15f3  clutter-1.6.16.tar.bz2"
+md5sums="e3a91a3998e5544628ffef9e3b08e8cf  clutter-1.6.20.tar.xz"
diff --git a/testing/compiz/APKBUILD b/testing/compiz/APKBUILD
index bb6687604a..f40dad1d17 100644
--- a/testing/compiz/APKBUILD
+++ b/testing/compiz/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=compiz
 pkgver=0.8.8
-pkgrel=2
+pkgrel=3
 pkgdesc="opengl window and composition manager"
 url="http://www.compiz.org/"
 arch="all"
diff --git a/testing/courier-authlib/APKBUILD b/testing/courier-authlib/APKBUILD
new file mode 100644
index 0000000000..dd0cc64f5c
--- /dev/null
+++ b/testing/courier-authlib/APKBUILD
@@ -0,0 +1,56 @@
+# Contributor: Jeff Bilyk <jbilyk@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=courier-authlib
+pkgver=0.63.0
+pkgrel=0
+pkgdesc="Authentication library for courier mailserver"
+url="http://www.courier-mta.org"
+arch="all"
+license="GPL"
+depends=""
+depends_dev="libtool expect gdbm-dev openssl-dev libldap postgresql-dev mysql-dev perl"
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://downloads.sourceforge.net/project/courier/authlib/$pkgver/$pkgname-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--libdir=/usr/lib \
+		--libexecdir=/usr/lib \
+		--with-db=gdbm \
+		--with-mailuser=courier \
+		--with-mailgroup=courier \
+		--with-authpwd \
+		--with-authshadow \
+		--with-authldap \
+		--with-authmysql \
+		--with-authpgsql \
+		--with-authuserdb \
+		--with-authcram \
+		--with-authdaemon \
+		--with-authdaemonvar=/var/run/authdaemon
+	make
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	rm "$pkgdir"/usr/lib/$pkgname/*.la
+}
+
+md5sums="411a927d178f783a1e8fab9964ce0dd2  courier-authlib-0.63.0.tar.bz2"
diff --git a/testing/dhex/APKBUILD b/testing/dhex/APKBUILD
new file mode 100644
index 0000000000..d205c47842
--- /dev/null
+++ b/testing/dhex/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=dhex
+pkgver=0.66
+pkgrel=0
+pkgdesc="Ncurses hex editor"
+url="http://www.dettus.net/dhex/"
+arch="all"
+license="GPL"
+depends=""
+makedepends="ncurses-dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://www.dettus.net/dhex/dhex_0.66.tar.gz
+	makefile.patch"
+
+_builddir="$srcdir"/dhex_$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	make
+}
+
+package() {
+	cd "$_builddir"
+	make install DESTDIR="$pkgdir" \
+		mandir=/usr/share/man \
+		prefix=/usr/bin
+}
+
+md5sums="304a91cfd9481b2ddf418f3a943190e1  dhex_0.66.tar.gz
+de16e09d3b416650d84ef39235cd2917  makefile.patch"
diff --git a/testing/dhex/makefile.patch b/testing/dhex/makefile.patch
new file mode 100644
index 0000000000..9e7788b409
--- /dev/null
+++ b/testing/dhex/makefile.patch
@@ -0,0 +1,49 @@
+--- ./Makefile.orig
++++ ./Makefile
+@@ -1,12 +1,22 @@
+-CC=		gcc
+-LDFLAGS=	-L/usr/lib	-L/usr/local/lib  	-L/usr/lib/ncurses	-L/usr/local/lib/ncurses
++CC?=		gcc
++LDFLAGS?=	-L/usr/lib	-L/usr/local/lib  	-L/usr/lib/ncurses	-L/usr/local/lib/ncurses
+ CPPFLAGS=	-I/usr/include	-I/usr/local/include	-I/usr/include/ncurses	-I/usr/local/include/ncurses
+-CFLAGS=		-O3 -Wall -std=c99 
++CFLAGS?=		-O3 -Wall -std=c99 
+ #CFLAGS+= -ffunction-sections -fdata-sections
+ #LDFLAGS+= --gc-sections 
+ LIBS=		-lncurses
+-DESTDIR=	/usr/local/
+ 
++prefix=		/usr/local
++bindir=		$(prefix)/bin
++mandir=		$(prefix)/man
++man1dir=	$(mandir)/man1
++man5dir=	$(mandir)/man5
++DESTDIR=
++
++MKDIR_P=	install -d
++INSTALL=	install
++
++
+ OFILES=buffers.o \
+ 	configfile.o \
+ 	correlation.o \
+@@ -27,14 +37,11 @@
+ 	$(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
+ 
+ install:all
+-	strip dhex
+-	cp dhex $(DESTDIR)/bin
+-	cp dhex.1 $(DESTDIR)/man/man1
+-	cp dhexrc.5 $(DESTDIR)/man/man5
+-	cp dhex_markers.5 $(DESTDIR)/man/man5
+-	cp dhex_searchlog.5 $(DESTDIR)/man/man5
+-
+-	
++	$(MKDIR_P) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir)
++	$(INSTALL) -m755  dhex $(DESTDIR)$(bindir)
++	$(INSTALL) -m644 dhex.1 $(DESTDIR)$(man1dir)
++	$(INSTALL) -m644 dhexrc.5 dhex_markers.5 dhex_searchlog.5 \
++		$(DESTDIR)$(man5dir)
+ 
+ .c.o:
+ 	$(CC) $< -c -I. $(CPPFLAGS) $(CFLAGS) $(OPTIONS)
diff --git a/testing/dia/APKBUILD b/testing/dia/APKBUILD
new file mode 100644
index 0000000000..c23f67152e
--- /dev/null
+++ b/testing/dia/APKBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=dia
+pkgver=0.97.2
+pkgrel=1
+pkgdesc="a GTK+ based diagram creation program"
+url="http://live.gnome.org/Dia"
+arch="all"
+license="GPL2"
+depends=
+depends_dev=
+makedepends="gtk+-dev libxml2-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://ftp.gnome.org/pub/gnome/sources/dia/${pkgver%.*}/dia-$pkgver.tar.xz
+	isinf.patch
+	isfinite.patch"
+
+_builddir="$srcdir"/dia-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/dia/*.la || return 1
+}
+
+md5sums="1e1180a513fb567709b09bc19f12105e  dia-0.97.2.tar.xz
+cbbc32d417297b855353f86b484b369b  isinf.patch
+eda8e89483e97473d983b048f834861a  isfinite.patch"
diff --git a/testing/dia/isfinite.patch b/testing/dia/isfinite.patch
new file mode 100644
index 0000000000..173b00046a
--- /dev/null
+++ b/testing/dia/isfinite.patch
@@ -0,0 +1,142 @@
+diff --git a/lib/arrows.c b/lib/arrows.c
+index 4371946..5b6cd3a 100644
+--- a/lib/arrows.c
++++ b/lib/arrows.c
+@@ -18,7 +18,7 @@
+ 
+ #include <config.h>
+ 
+-#define _BSD_SOURCE 1 /* to get finite */
++#define _GNU_SOURCE 1 /* to get isfinite */
+ #include <math.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -29,11 +29,7 @@
+ 
+ #ifdef G_OS_WIN32
+ #include <float.h>
+-#define finite(d) _finite(d)
+-#endif
+-
+-#ifdef __EMX__
+-#define finite(d) isfinite(d)
++#define isfinite(d) _finite(d)
+ #endif
+ 
+ #include "arrows.h"
+@@ -421,7 +417,7 @@ draw_one_exactly(DiaRenderer *renderer, Point *to, Point *from,
+   else {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+-  if (!finite(vl.x)) {
++  if (!isfinite(vl.x)) {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+   point_get_perp(&vt,&vl);
+@@ -498,7 +494,7 @@ draw_one_or_none(DiaRenderer *renderer, Point *to, Point *from,
+   else {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+-  if (!finite(vl.x)) {
++  if (!isfinite(vl.x)) {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+   point_get_perp(&vt,&vl);
+@@ -610,7 +606,7 @@ draw_fill_ellipse(DiaRenderer *renderer, Point *to, Point *from,
+   else {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+-  if (!finite(vl.x)) {
++  if (!isfinite(vl.x)) {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+   point_get_perp(&vt,&vl);
+@@ -672,7 +668,7 @@ draw_empty_ellipse(DiaRenderer *renderer, Point *to, Point *from,
+   else {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+-  if (!finite(vl.x)) {
++  if (!isfinite(vl.x)) {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+ 
+@@ -718,7 +714,7 @@ calculate_box (Point *poly, const Point *to, const Point *from,
+   else {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+-  if (!finite(vl.x)) {
++  if (!isfinite(vl.x)) {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+   point_get_perp(&vt,&vl);
+@@ -832,7 +828,7 @@ draw_fill_dot(DiaRenderer *renderer, Point *to, Point *from,
+   else {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+-  if (!finite(vl.x)) {
++  if (!isfinite(vl.x)) {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+   point_get_perp(&vt,&vl);
+@@ -908,7 +904,7 @@ draw_integral(DiaRenderer *renderer, Point *to, Point *from,
+   else {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+-  if (!finite(vl.x)) {
++  if (!isfinite(vl.x)) {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+   point_get_perp(&vt,&vl);
+@@ -946,7 +942,7 @@ calculate_slashed (Point *poly, const Point *to, const Point *from,
+   else {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+-  if (!finite(vl.x)) {
++  if (!isfinite(vl.x)) {
+     vl.x = 1.0; vl.y = 0.0;
+   }
+   point_get_perp(&vt,&vl);
+diff --git a/lib/boundingbox.c b/lib/boundingbox.c
+index 6d2749f..6938537 100644
+--- a/lib/boundingbox.c
++++ b/lib/boundingbox.c
+@@ -21,7 +21,7 @@
+ 
+ #include <config.h>
+ 
+-#define _BSD_SOURCE 1
++#define _GNU_SOURCE 1	/* to get isfinite */
+ #include <math.h>
+ #include <string.h> /* memcmp() */
+ 
+@@ -510,7 +510,7 @@ polybezier_bbox(const BezPoint *pts, int numpoints,
+         real overshoot;
+         Point vovs,pto;
+ 
+-	if (finite(alpha))
++	if (isfinite(alpha))
+ 	  overshoot = extra->middle_trans / sin(alpha/2.0);
+ 	else /* prependicular? */
+ 	  overshoot = extra->middle_trans;
+diff --git a/objects/standard/arc.c b/objects/standard/arc.c
+index 28302a6..80674a3 100644
+--- a/objects/standard/arc.c
++++ b/objects/standard/arc.c
+@@ -21,7 +21,7 @@
+ #endif
+ 
+ #include <assert.h>
+-#define _BSD_SOURCE 1 /* to get finite */
++#define _GNU_SOURCE 1 /* to get finite */
+ #include <math.h>
+ 
+ #include "intl.h"
+@@ -407,7 +407,7 @@ arc_compute_midpoint(Arc *arc, const Point * ep0, const Point * ep1 , Point * mi
+             angle -= -atan2(oep0->y - arc->center.y, oep0->x - arc->center.x); /* minus angle of old */
+             angle += -atan2(ep1->y - arc->center.y, ep1->x - arc->center.x); /* plus angle of new */
+             angle -= -atan2(oep1->y - arc->center.y, oep1->x - arc->center.x); /* minus angle of old */
+-            if (!finite(angle)){
++            if (!isfinite(angle)){
+                     return 0;
+             }
+             if (angle < -1 * M_PI){
diff --git a/testing/dia/isinf.patch b/testing/dia/isinf.patch
new file mode 100644
index 0000000000..4cd4adbc86
--- /dev/null
+++ b/testing/dia/isinf.patch
@@ -0,0 +1,16 @@
+--- ./configure.orig
++++ ./configure
+@@ -17436,11 +17436,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char isinf ();
++#include <math.h>
+ int
+ main ()
+ {
+-return isinf ();
++return isinf (0.0);
+   ;
+   return 0;
+ }
diff --git a/testing/drbd/APKBUILD b/testing/drbd/APKBUILD
index d13ea0edb8..2e735a4b9a 100644
--- a/testing/drbd/APKBUILD
+++ b/testing/drbd/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer:
 pkgname=drbd
-pkgver=8.3.10
-pkgbase=8.3
-pkgrel=1
+pkgver=8.3.12
+pkgbase=${pkgver%.*}
+pkgrel=0
 pkgdesc="Network-based RAID 1"
 url="http://www.drbd.org"
 arch="all"
@@ -55,5 +55,5 @@ pacemaker() {
 	mv "$pkgdir"/usr/lib/ocf "$subpkgdir"/usr/lib
 }
 
-md5sums="7d80edc2da10de5bfffe0ca9e9996fed  drbd-8.3.10.tar.gz
+md5sums="1a555c11d89cc90a8fab5dc76b749036  drbd-8.3.12.tar.gz
 f1c9e2fa7afd249284b7615f5d2c8254  drbd.initd"
diff --git a/testing/drizzle/APKBUILD b/testing/drizzle/APKBUILD
index 974f8e113a..9ade8d14cb 100644
--- a/testing/drizzle/APKBUILD
+++ b/testing/drizzle/APKBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 pkgname=drizzle
 pkgver=2011.03.13
-pkgrel=2
+pkgrel=3
 pkgdesc="A MySQL-derived RDBMS for cloud usage and webapps"
 url="http://launchpad.net/drizzle"
-arch="all"
+arch=""
 license="GPL"
 depends=
 depends_dev="gperf protobuf-dev pcre-dev boost-dev intltool protobuf-dev
@@ -45,7 +45,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
-	rm "$pkgdir"/usr/lib/*.la || return 1
+	rm "$pkgdir"/usr/lib/*.la "$pkgdir"/usr/lib/drizzle7/*.la || return 1
 }
 
 client() {
diff --git a/testing/e_dbus/APKBUILD b/testing/e_dbus/APKBUILD
index 7548950a2b..22ca29334d 100644
--- a/testing/e_dbus/APKBUILD
+++ b/testing/e_dbus/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=e_dbus
-pkgver=1.0.0
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="Enlightenment's (Ecore) integration to DBus"
 url="http://trac.enlightenment.org/e/wiki/E_Dbus"
 arch="all"
 license="BSD"
 depends=
-depends_dev="dbus-dev eina-dev ecore-dev"
+depends_dev="dbus-dev eina-dev ecore-dev udisks-dev"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev"
@@ -42,4 +42,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="4a3031a41e7e33f843cf104bf84cd4ee  e_dbus-1.0.0.tar.gz"
+md5sums="8b8f229f14800521e275a12250e673ca  e_dbus-1.1.0.tar.gz"
diff --git a/testing/ecore/APKBUILD b/testing/ecore/APKBUILD
index cc5d113bf5..39bdb90021 100644
--- a/testing/ecore/APKBUILD
+++ b/testing/ecore/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ecore
-pkgver=1.0.0
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="Enlightenment's core event abstraction layer and OS abstraction layer"
 url="http://trac.enlightenment.org/e/wiki/Ecore"
@@ -32,6 +32,8 @@ build() {
 	./configure --prefix=/usr \
 		--enable-cares \
 		--disable-gnutls \
+		--enable-ecore-evas-software-x11 \
+		--enable-ecore-evas-opengl-x11 \
 		|| return 1
 	make || return 1
 }
@@ -40,6 +42,7 @@ package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
+	rm "$pkgdir"/usr/lib/ecore/immodules/*.la
 }
 
-md5sums="56fa814282f48c346b398e16de81145f  ecore-1.0.0.tar.gz"
+md5sums="4696936f15fd58ed90da9b5556edff3e  ecore-1.1.0.tar.gz"
diff --git a/testing/edje/APKBUILD b/testing/edje/APKBUILD
index cb1793280d..9bea55b9e3 100644
--- a/testing/edje/APKBUILD
+++ b/testing/edje/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=edje
-pkgver=1.0.0
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="Enlightenment's graphical layout and animation library"
 url="http://trac.enlightenment.org/e/wiki/Edje"
@@ -38,4 +38,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="14c33c2b9d1bd36d8507d55597c77991  edje-1.0.0.tar.gz"
+md5sums="0fcbcb9e1098a85527a43e5b4445a5cd  edje-1.1.0.tar.gz"
diff --git a/testing/eet/APKBUILD b/testing/eet/APKBUILD
index bbfa2a516d..d436c173ac 100644
--- a/testing/eet/APKBUILD
+++ b/testing/eet/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=eet
-pkgver=1.4.0
-pkgrel=0
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="Enlightenment's file chunk reading/writing library"
 url="http://trac.enlightenment.org/e/wiki/Eet"
 arch="all"
@@ -38,4 +38,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="5b0f3034d2dcc2ad13049a4ab6100ca6  eet-1.4.0.tar.gz"
+md5sums="f6fd734fbf6a2852abf044a2e1a8cabf  eet-1.5.0.tar.gz"
diff --git a/testing/eeze/APKBUILD b/testing/eeze/APKBUILD
index 3eb881f7bc..9714ed79b9 100644
--- a/testing/eeze/APKBUILD
+++ b/testing/eeze/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=eeze
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="Enlightenment's device library"
 url="http://trac.enlightenment.org/e/wiki/Eeze"
 arch="all"
@@ -42,4 +42,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="e36b5e8ed444c8d13d27fd82d5f71659  eeze-1.0.1.tar.gz"
+md5sums="c97663076aa01d7c43a5bcf415aee06c  eeze-1.1.0.tar.gz"
diff --git a/testing/efreet/APKBUILD b/testing/efreet/APKBUILD
index 2eb73f43f3..21a8597762 100644
--- a/testing/efreet/APKBUILD
+++ b/testing/efreet/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=efreet
-pkgver=1.0.0
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="Enlightenment's library for handling of freedesktop.org specs"
 url="http://trac.enlightenment.org/e/wiki/Efreet"
@@ -42,4 +42,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="ce7dd05138335312c7eb9ac8e5e62467  efreet-1.0.0.tar.gz"
+md5sums="a28eabe66d2a5ffd52597615e233bf04  efreet-1.1.0.tar.gz"
diff --git a/testing/eina/APKBUILD b/testing/eina/APKBUILD
index cf6b73fbb0..98a092b7e8 100644
--- a/testing/eina/APKBUILD
+++ b/testing/eina/APKBUILD
@@ -1,14 +1,15 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=eina
-pkgver=1.0.0
-pkgrel=0
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="Enlightenment's data types library (List, hash, etc) in C"
 url="http://trac.enlightenment.org/e/wiki/Eina"
 arch="all"
 license="LGPLv2.1"
 depends=
-makedepends=
+depends_dev="libiconv-dev"
+makedepends="$depends_dev"
 install=
 subpackages="$pkgname-dev"
 source="http://download.enlightenment.org/releases/eina-$pkgver.tar.gz"
@@ -39,4 +40,4 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="207b64a6549642392c4a0760df78df59  eina-1.0.0.tar.gz"
+md5sums="fedb3814427827c1bb777edea3c86298  eina-1.1.0.tar.gz"
diff --git a/testing/embryo/APKBUILD b/testing/embryo/APKBUILD
index d83b843119..6ab769e0ef 100644
--- a/testing/embryo/APKBUILD
+++ b/testing/embryo/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=embryo
-pkgver=1.0.0
-pkgrel=1
+pkgver=1.1.0
+pkgrel=0
 pkgdesc="Enlightenment's virtual machine engine and bytecode compiler"
 url="http://trac.enlightenment.org/e/wiki/Embryo"
 arch="all"
 license="BSD"
 depends=
-depends_dev=
+depends_dev="eina-dev"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev"
@@ -42,4 +42,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="2d6269c931656d5714197e508b144f18  embryo-1.0.0.tar.gz"
+md5sums="aded5754ee7f586e3a0631e0fa3abcc8  embryo-1.1.0.tar.gz"
diff --git a/testing/enlightenment/APKBUILD b/testing/enlightenment/APKBUILD
new file mode 100644
index 0000000000..9e62629cfe
--- /dev/null
+++ b/testing/enlightenment/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor:
+# Maintainer:
+pkgname=enlightenment
+pkgver=0.16.999.65643
+pkgrel=1
+pkgdesc="Enlightenment Window Manager"
+url="http://trac.enlightenment.org/e/wiki/Enlightenment"
+arch="all"
+license="BSD"
+depends=""
+depends_dev="evas-dev ecore-dev evas-dev eet-dev edje-dev efreet-dev eina-dev e_dbus-dev eeze-dev alsa-lib-dev udisks-dev"
+makedepends="$depends_dev paxctl"
+install=""
+subpackages="$pkgname-dev"
+source="http://download.enlightenment.org/snapshots/2011-11-28/enlightenment-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/enlightenment-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+	# fix a bashims
+	sed -e 's/efm_requires+="/efm_requires="$efm_requires /' -i configure
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir"/usr/lib/ -name "*.la" | xargs rm -f
+	# opengl needs mprotect off for now
+	paxctl -c -m "$pkgdir"/usr/bin/enlightenment
+}
+
+md5sums="9bdb2e6f88c3456b50fe509f05de3b4f  enlightenment-0.16.999.65643.tar.bz2"
diff --git a/testing/etracer/APKBUILD b/testing/etracer/APKBUILD
index d1a208209d..d60dabc37d 100644
--- a/testing/etracer/APKBUILD
+++ b/testing/etracer/APKBUILD
@@ -2,13 +2,14 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=etracer
 pkgver=0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="racing game where you race tux down a mountain"
 url="http://extremetuxracer.com/"
 arch="all"
 license="GPL"
 depends=
-makedepends="sdl-dev mesa-dev sdl_mixer-dev tcl-dev freetype-dev libpng-dev"
+makedepends="sdl-dev mesa-dev sdl_mixer-dev tcl-dev freetype-dev libpng-dev
+	libx11-dev libxext-dev libxmu-dev libxi-dev libxt-dev"
 install=""
 source="http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-${pkgver}.tar.gz
 	etracer-finite.patch
diff --git a/testing/evas/APKBUILD b/testing/evas/APKBUILD
index ad3ce12c38..d200b6c52e 100644
--- a/testing/evas/APKBUILD
+++ b/testing/evas/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=evas
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="hardware-accelerated retained canvas API"
 url="http://trac.enlightenment.org/e/wiki/Evas"
 arch="all"
@@ -10,7 +10,7 @@ license="BSD"
 depends=
 depends_dev="freetype-dev fontconfig-dev fribidi-dev sdl-dev libx11-dev
 	libxcb-dev libxrender-dev eet-dev giflib-dev jpeg-dev libpng-dev
-	tiff-dev librsvg-dev"
+	tiff-dev librsvg-dev mesa-dev"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev"
@@ -30,6 +30,13 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
+		--enable-gl-xlib \
+		--enable-software-16-x11 \
+		--enable-pthreads \
+		--enable-pipe-render \
+		--enable-async-render \
+		--enable-async-events \
+		--enable-async-preload \
 		|| return 1
 	make || return 1
 }
@@ -40,4 +47,4 @@ package() {
 	find "$pkgdir" -name *.la -print | xargs rm
 }
 
-md5sums="528debc5e5c75dbc8c5aa7ce5560cdd5  evas-1.0.1.tar.gz"
+md5sums="3f4e6c3ffc67afc7da10e5117aa41516  evas-1.1.0.tar.gz"
diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD
index 889b91b53d..eb600cef17 100644
--- a/testing/exim/APKBUILD
+++ b/testing/exim/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jesse Young <jlyo@jlyo.org>
 pkgname=exim
 pkgver=4.77
-pkgrel=3
+pkgrel=4
 pkgdesc="A Message Transfer Agent"
 url="http://www.exim.org/"
 arch="all"
diff --git a/testing/freeswitch-sounds-es-mx-maria-44100/APKBUILD b/testing/freeswitch-sounds-es-mx-maria-44100/APKBUILD
index 7e5afb1189..5474fb0461 100644
--- a/testing/freeswitch-sounds-es-mx-maria-44100/APKBUILD
+++ b/testing/freeswitch-sounds-es-mx-maria-44100/APKBUILD
@@ -1,11 +1,11 @@
-# Contributor: 
+# Contributor: Jeff Bilyk <jbilyk@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeswitch-sounds-es-mx-maria-44100
 pkgver="0"
-pkgrel=0
+pkgrel=1
 pkgdesc="Sounds for freeswitch Spanish"
 url="http://files.freeswitch.org/"
-arch="all"
+arch="noarch"
 license="unknown"
 depends=
 makedepends=
@@ -21,7 +21,7 @@ build() {
 
 package() {
 	mkdir -p "$pkgdir"/usr/sounds/
-	cp -ra "$srcdir"/ "$pkgdir"/usr/sounds
+	cp -ra "$srcdir"/es/ "$pkgdir"/usr/sounds
 }
 
 md5sums="a83a2e994741e4085016873d2d1c69a4  freeswitch-sounds-es-mx-maria-44100.tar.gz"
diff --git a/testing/ftgl/APKBUILD b/testing/ftgl/APKBUILD
index 7ee3177ff1..57839d659b 100644
--- a/testing/ftgl/APKBUILD
+++ b/testing/ftgl/APKBUILD
@@ -3,17 +3,22 @@
 pkgname=ftgl
 pkgver=2.1.3_rc5
 _pkgver=2.1.3-rc5
-pkgrel=1
+pkgrel=2
 pkgdesc="freetype OpenGL layer"
 url="http://ftgl.wiki.sourceforge.net/"
 arch="all"
 license="GPL"
 depends=
-depends_dev="mesa-dev freetype-dev freeglut-dev"
-makedepends="$depends_dev"
+depends_dev="mesa-dev freetype-dev freeglut-dev bash"
+makedepends="$depends_dev
+	autoconf automake libtool"
 install=
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-${_pkgver}.tar.bz2"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-${_pkgver}.tar.bz2
+	ftgl-2.1.3-rc5-ldflags.patch
+	ftgl-2.1.3-rc5-ttf_font.patch
+	"
+
 
 _builddir="$srcdir/$pkgname-2.1.3~rc5"
 prepare() {
@@ -24,6 +29,7 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+#	libtoolize --force && aclocal -I m4 && autoconf && automake || return 1
 }
 
 build() {
@@ -38,4 +44,6 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la
 }
-md5sums="c7879018cde844059495b3029b0b6503  ftgl-2.1.3-rc5.tar.bz2"
+md5sums="c7879018cde844059495b3029b0b6503  ftgl-2.1.3-rc5.tar.bz2
+4432b8cda8622fea6608e061289dde22  ftgl-2.1.3-rc5-ldflags.patch
+7fc76e66ac2f6f91d04190417f001031  ftgl-2.1.3-rc5-ttf_font.patch"
diff --git a/testing/ftgl/ftgl-2.1.3-rc5-ldflags.patch b/testing/ftgl/ftgl-2.1.3-rc5-ldflags.patch
new file mode 100644
index 0000000000..be9331d6f5
--- /dev/null
+++ b/testing/ftgl/ftgl-2.1.3-rc5-ldflags.patch
@@ -0,0 +1,118 @@
+diff -up ftgl-2.1.3~rc5/demo/Makefile.am.ldflags ftgl-2.1.3~rc5/demo/Makefile.am
+--- ftgl-2.1.3~rc5/demo/Makefile.am.ldflags	2008-06-02 03:10:10.000000000 +0200
++++ ftgl-2.1.3~rc5/demo/Makefile.am	2010-02-14 15:02:19.670081290 +0100
+@@ -9,14 +9,14 @@ simple_SOURCES = \
+     simple.cpp \
+     $(NULL)
+ simple_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+-simple_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
++simple_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS)
+ simple_LDADD = ../src/libftgl.la
+ 
+ c_demo_SOURCES = \
+     c-demo.c \
+     $(NULL)
+ c_demo_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+-c_demo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
++c_demo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GLUT_LIBS) -lm
+ c_demo_LDADD = ../src/libftgl.la
+ 
+ FTGLDemo_SOURCES = \
+@@ -27,7 +27,7 @@ FTGLDemo_SOURCES = \
+ 	trackball.h \
+ 	$(NULL)
+ FTGLDemo_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+-FTGLDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
++FTGLDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS)
+ FTGLDemo_LDADD = ../src/libftgl.la
+ 
+ FTGLMFontDemo_SOURCES = \
+@@ -38,7 +38,7 @@ FTGLMFontDemo_SOURCES = \
+ 	trackball.h \
+ 	$(NULL)
+ FTGLMFontDemo_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+-FTGLMFontDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
++FTGLMFontDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS)
+ FTGLMFontDemo_LDADD = ../src/libftgl.la
+ 
+ NULL =
+diff -up ftgl-2.1.3~rc5/demo/Makefile.in.ldflags ftgl-2.1.3~rc5/demo/Makefile.in
+--- ftgl-2.1.3~rc5/demo/Makefile.in.ldflags	2008-06-12 16:33:01.000000000 +0200
++++ ftgl-2.1.3~rc5/demo/Makefile.in	2010-02-14 15:02:01.866831398 +0100
+@@ -242,14 +242,14 @@ simple_SOURCES = \
+     $(NULL)
+ 
+ simple_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+-simple_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
++simple_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS)
+ simple_LDADD = ../src/libftgl.la
+ c_demo_SOURCES = \
+     c-demo.c \
+     $(NULL)
+ 
+ c_demo_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+-c_demo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
++c_demo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS) -lm
+ c_demo_LDADD = ../src/libftgl.la
+ FTGLDemo_SOURCES = \
+ 	FTGLDemo.cpp \
+@@ -260,7 +260,7 @@ FTGLDemo_SOURCES = \
+ 	$(NULL)
+ 
+ FTGLDemo_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+-FTGLDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
++FTGLDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS)
+ FTGLDemo_LDADD = ../src/libftgl.la
+ FTGLMFontDemo_SOURCES = \
+ 	FTGLMFontDemo.cpp \
+@@ -271,7 +271,7 @@ FTGLMFontDemo_SOURCES = \
+ 	$(NULL)
+ 
+ FTGLMFontDemo_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+-FTGLMFontDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
++FTGLMFontDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS)
+ FTGLMFontDemo_LDADD = ../src/libftgl.la
+ NULL = 
+ all: all-am
+diff -up ftgl-2.1.3~rc5/test/Makefile.am.ldflags ftgl-2.1.3~rc5/test/Makefile.am
+--- ftgl-2.1.3~rc5/test/Makefile.am.ldflags	2010-02-14 14:43:14.819077822 +0100
++++ ftgl-2.1.3~rc5/test/Makefile.am	2010-02-14 14:43:49.227081230 +0100
+@@ -51,7 +51,7 @@ AM_CPPFLAGS = \
+     $(NULL)
+ 
+ CXXTest_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+-CXXTest_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) -lcppunit
++CXXTest_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS) -lcppunit
+ CXXTest_LDADD = ../src/libftgl.la
+ 
+ CTest_SOURCES = \
+@@ -64,7 +64,7 @@ CTest_CPPFLAGS = \
+     -I$(top_srcdir)/src/FTFont \
+     -I$(top_srcdir)/src/FTLayout
+ CTest_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+-CTest_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
++CTest_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS)
+ CTest_LDADD = ../src/libftgl.la
+ 
+ NULL =
+diff -up ftgl-2.1.3~rc5/test/Makefile.in.ldflags ftgl-2.1.3~rc5/test/Makefile.in
+--- ftgl-2.1.3~rc5/test/Makefile.in.ldflags	2010-02-14 14:43:20.365077958 +0100
++++ ftgl-2.1.3~rc5/test/Makefile.in	2010-02-14 14:44:13.653078013 +0100
+@@ -294,7 +294,7 @@ AM_CPPFLAGS = \
+     $(NULL)
+ 
+ CXXTest_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+-CXXTest_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) -lcppunit
++CXXTest_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS) -lcppunit
+ CXXTest_LDADD = ../src/libftgl.la
+ CTest_SOURCES = \
+     CTest.c \
+@@ -308,7 +308,7 @@ CTest_CPPFLAGS = \
+     -I$(top_srcdir)/src/FTLayout
+ 
+ CTest_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+-CTest_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
++CTest_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS)
+ CTest_LDADD = ../src/libftgl.la
+ NULL = 
+ all: all-am
diff --git a/testing/ftgl/ftgl-2.1.3-rc5-ttf_font.patch b/testing/ftgl/ftgl-2.1.3-rc5-ttf_font.patch
new file mode 100644
index 0000000000..81ae273b30
--- /dev/null
+++ b/testing/ftgl/ftgl-2.1.3-rc5-ttf_font.patch
@@ -0,0 +1,12 @@
+diff -up ftgl-2.1.3~rc5/demo/FTGLDemo.cpp.ttf_font ftgl-2.1.3~rc5/demo/FTGLDemo.cpp
+--- ftgl-2.1.3~rc5/demo/FTGLDemo.cpp.ttf_font	2008-06-08 17:49:10.000000000 +0200
++++ ftgl-2.1.3~rc5/demo/FTGLDemo.cpp	2009-05-21 02:18:42.000000000 +0200
+@@ -48,7 +48,7 @@
+ #       define FONT_FILE "C:\\WINNT\\Fonts\\arial.ttf"
+ #   else
+         // Put your font file here if configure did not find it.
+-#       define FONT_FILE 0
++#       define FONT_FILE "/usr/share/fonts/dejavu/DejaVuSans.ttf"
+ #   endif
+ #endif
+ 
diff --git a/testing/gdnsd/APKBUILD b/testing/gdnsd/APKBUILD
index e353e12c69..c89aae670b 100644
--- a/testing/gdnsd/APKBUILD
+++ b/testing/gdnsd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gdnsd
 pkgver=1.6.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Geographic Authoritative DNS server"
 url="http://code.google.com/p/gdnsd/"
 arch="all"
@@ -28,7 +28,9 @@ prepare() {
 build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
+		--sysconfdir=/etc \
 		--localstatedir=/var \
+		--enable-fast-install \
 		|| return 1
 	make || return 1
 }
diff --git a/testing/gnash/APKBUILD b/testing/gnash/APKBUILD
index 06f7cc6941..9f791462b3 100644
--- a/testing/gnash/APKBUILD
+++ b/testing/gnash/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=gnash
-pkgver=0.8.9
-pkgrel=5
+pkgver=0.8.10
+pkgrel=1
 pkgdesc="GNU flash player implementation"
 url="http://www.gnashdev.org/"
 arch="all"
@@ -14,9 +14,11 @@ depends_dev="agg-dev cairo-dev gstreamer-dev gst-plugins-base-dev
 	curl-dev libxmu-dev libx11-dev"
 makedepends="$depends_dev libtool"
 install=""
-subpackages="$pkgname-doc $pkgname-dev $pkgname-mozilla $pkgname-sdl $pkgname-fb"
-source="http://mirrors.igsobe.com/gnu/gnash/$pkgver/gnash-$pkgver.tar.gz
-	gnash-ffmpeg.patch"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-mozilla $pkgname-sdl
+	$pkgname-fb $pkgname-lang"
+source="http://ftp.gnu.org/pub/gnu/gnash/$pkgver/gnash-$pkgver.tar.bz2
+	gnash-ffmpeg.patch
+	aslr-fix.patch"
 
 _builddir="$srcdir"/gnash-$pkgver
 prepare() {
@@ -37,6 +39,7 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--enable-media=gst \
+		--without-gconf \
 		|| return 1
 	make || return 1
 }
@@ -44,6 +47,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/gnash/*.la || return 1
 }
 
 sdl() {
@@ -65,5 +69,6 @@ mozilla() {
 	mv "$_builddir"/plugin/npapi/.libs/libgnashplugin.so "$subpkgdir"/usr/lib/mozilla/plugins
 }
 
-md5sums="01d0420932eede07211e368d405aee9c  gnash-0.8.9.tar.gz
-b324b3fee1e017d8fcc4d991146266f8  gnash-ffmpeg.patch"
+md5sums="63e9f79c41d93d48c5a2fa94856548c4  gnash-0.8.10.tar.bz2
+b324b3fee1e017d8fcc4d991146266f8  gnash-ffmpeg.patch
+64cea4c0b4963b7fd5308beb1b20fed6  aslr-fix.patch"
diff --git a/testing/gnash/aslr-fix.patch b/testing/gnash/aslr-fix.patch
new file mode 100644
index 0000000000..632443b602
--- /dev/null
+++ b/testing/gnash/aslr-fix.patch
@@ -0,0 +1,52 @@
+diff -Naur gnash-0.8.10.alt/libbase/jemalloc.c gnash-0.8.10/libbase/jemalloc.c
+--- gnash-0.8.10.alt/libbase/jemalloc.c	2012-02-07 09:39:41.000000000 +0100
++++ gnash-0.8.10/libbase/jemalloc.c	2012-02-24 18:36:47.000000000 +0100
+@@ -429,7 +429,7 @@
+ static const bool __isthreaded = true;
+ #endif
+ 
+-#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN)
++#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN) || defined(MOZ_MEMORY_LINUX)
+ #define JEMALLOC_USES_MAP_ALIGN	 /* Required on Solaris 10. Might improve performance elsewhere. */
+ #endif
+ 
+@@ -2238,6 +2238,7 @@
+ 	 * We don't use MAP_FIXED here, because it can cause the *replacement*
+ 	 * of existing mappings, and we only want to create new mappings.
+ 	 */
++#ifndef MOZ_MEMORY_LINUX
+ #ifdef MALLOC_PAGEFILE
+ 	if (pfd != -1) {
+ 		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
+@@ -2252,6 +2253,31 @@
+ 
+ 	if (ret == MAP_FAILED)
+ 		ret = NULL;
++#else /* MOZ_MEMORY_LINUX */
++#ifdef MALLOC_PAGEFILE
++	if (pfd != -1) {
++		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
++		    MAP_NOSYNC, pfd, 0);
++	} else
++#endif
++	       {
++		ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE |
++		    MAP_NOSYNC | MAP_ANON, -1, 0);
++	}
++	assert(ret != NULL);
++
++	if (ret == MAP_FAILED)
++		return NULL;
++	
++	uintptr_t aligned_ret;
++	size_t extra_size;
++	aligned_ret = (uintptr_t)ret + alignment - 1;
++	aligned_ret &= ~(alignment - 1);
++	extra_size = aligned_ret - (uintptr_t)ret;
++	munmap(ret, extra_size);
++	munmap(ret + extra_size + size, alignment - extra_size);
++	ret = (void*)aligned_ret;
++#endif /* ifndef MOZ_MEMORY_LINUX*/
+ 	return (ret);
+ }
+ #endif
diff --git a/testing/gnump3d/APKBUILD b/testing/gnump3d/APKBUILD
index 1fa85b283e..11a2e88a9c 100644
--- a/testing/gnump3d/APKBUILD
+++ b/testing/gnump3d/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=gnump3d
 pkgver=3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A streaming server for MP3, OGG vorbis and other streamable files"
 url="http://www.gnump3d.org/"
 arch="all"
@@ -27,4 +27,4 @@ build() {
 
 md5sums="d2b665c3267253cc8cae29659131b9b4  gnump3d-3.0.tar.gz
 59f0286d4c943226a67ab7b7787547c6  gnump3d.confd
-5202488dff1c7e6c6788fb00fb32f071  gnump3d.initd"
+0fd5435e668ce34e5f9f783f3e0ac8ea  gnump3d.initd"
diff --git a/testing/gnump3d/gnump3d.initd b/testing/gnump3d/gnump3d.initd
index 43290ee30a..ae5e018b35 100644
--- a/testing/gnump3d/gnump3d.initd
+++ b/testing/gnump3d/gnump3d.initd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/media-sound/gnump3d/files/gnump3d.init.d,v 1.4 2008/06/03 14:52:33 beandog Exp $
 
-opts="start stop index"
+extra_commands="index"
 
 depend() {
 	need net
diff --git a/testing/gource/APKBUILD b/testing/gource/APKBUILD
index fd0a2b6c98..890ae4689d 100644
--- a/testing/gource/APKBUILD
+++ b/testing/gource/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer:  Francesco Colista <francesco.colista@gmail.com>
 pkgname=gource
 pkgver=0.35
-pkgrel=0
+pkgrel=2
 pkgdesc="Software version control visualization"
-url="http://code.google.com&p/gource"
+url="http://code.google.com/p/gource"
 arch="all"
 license="GPL3"
 depends=
diff --git a/testing/gpgme/APKBUILD b/testing/gpgme/APKBUILD
deleted file mode 100644
index bda11b1ff3..0000000000
--- a/testing/gpgme/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gpgme
-pkgver=1.3.1
-pkgrel=0
-pkgdesc="gnupg made easy"
-url="http://www.gnupg.org/related_software/gpgme/"
-arch="all"
-license="GPL"
-depends=gnupg
-depends_dev="libgpg-error-dev libassuan-dev"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/gpgme-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm "$pkgdir"/usr/lib/*.la || return 1
-}
-
-md5sums="90afa8436ce2b2683c001c824bd22601  gpgme-1.3.1.tar.bz2"
diff --git a/testing/graphviz/APKBUILD b/testing/graphviz/APKBUILD
index 03b33aaccf..f61da2e8a3 100644
--- a/testing/graphviz/APKBUILD
+++ b/testing/graphviz/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=graphviz
 pkgver=2.28.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Graph Visualization Tools"
 url="http://www.graphviz.org/"
 arch="all"
diff --git a/testing/hardinfo/APKBUILD b/testing/hardinfo/APKBUILD
index 1c721efc2a..96d75b9937 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=4
+pkgrel=5
 pkgdesc="A system information and benchmark tool."
 url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
 arch="all"
diff --git a/testing/hydrogen/APKBUILD b/testing/hydrogen/APKBUILD
index db4ea7708a..9c3a6a51bd 100644
--- a/testing/hydrogen/APKBUILD
+++ b/testing/hydrogen/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=hydrogen
-pkgver=0.9.5
-pkgrel=1
+pkgver=0.9.5.1
+pkgrel=0
 pkgdesc="Advanced drum machine for GNU/Linux"
 url="http://www.hydrogen-music.org/"
 arch="all"
 license="GPLv2+"
 depends=""
 makedepends="qt-dev alsa-lib-dev flac-dev libsndfile-dev scons portaudio-dev
-	libarchive-dev"
+	libarchive-dev jack-dev"
 install=""
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/hydrogen/hydrogen-$pkgver.tar.gz
@@ -32,7 +32,7 @@ build() {
 	export QTDIR=/usr/lib
 	scons -j${JOBS:-2} \
 		prefix=/usr \
-		jack=0 \
+		jack=1 \
 		portaudio=1 \
 		libarchive=1 \
 		portmidi=0 \
@@ -49,5 +49,5 @@ package() {
 	scons -j ${JOBS:-2} install DESTDIR="$pkgdir" || return 1
 }
 
-md5sums="e96f291d60e58f5d62fe616cee577dc0  hydrogen-0.9.5.tar.gz
+md5sums="52f3a528705818c65acf546a3be4c6fb  hydrogen-0.9.5.1.tar.gz
 0d9552ee114f57df67d677263816ec78  hydrogen-docdir.patch"
diff --git a/testing/ipset/APKBUILD b/testing/ipset/APKBUILD
new file mode 100644
index 0000000000..2968393813
--- /dev/null
+++ b/testing/ipset/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Maintainer:
+pkgname=ipset
+pkgver=6.11
+pkgrel=1
+pkgdesc="Manage Linux IP sets"
+url=http://ipset.netfilter.org/
+arch=all
+license=GPL-2
+depends_dev=libmnl-dev
+makedepends="$depends_dev automake autoconf pkgconfig libtool linux-headers"
+subpackages="$pkgname-dev $pkgname-doc"
+source="${url}ipset-$pkgver.tar.bz2 ipset.initd"
+
+_builddir=$srcdir/ipset-$pkgver
+
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --with-kmod=no --prefix=/usr && make
+}
+
+package() {
+	cd "$_builddir"
+	make install DESTDIR=$pkgdir || return
+	rm $pkgdir/usr/lib/*.la
+
+	mkdir -p "$pkgdir/etc/init.d" \
+		"$pkgdir/etc/ipset.d"
+	install -m 755 "$startdir/ipset.initd" "$pkgdir/etc/init.d/ipset"
+}
+
+md5sums="bfcc92e30a0fcf10ae6e7c4affa03c84  ipset-6.11.tar.bz2
+9f2e07dc13cafe456aa9d70fb631f175  ipset.initd"
diff --git a/testing/ipset/ipset.initd b/testing/ipset/ipset.initd
new file mode 100644
index 0000000000..6e3294c8e0
--- /dev/null
+++ b/testing/ipset/ipset.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Init script for ipset
+# Copyright (C) 2012 Kaarle Ritvanen
+# Licensed under the terms of the GPL2
+
+depend() {
+	before iptables ip6tables
+}
+
+start() {
+	if ls /etc/ipset.d/* &> /dev/null; then
+		ebegin "Loading firewall IP sets"
+		for f in /etc/ipset.d/*; do
+			/usr/sbin/ipset restore < $f
+		done
+		eend $?
+	fi
+}
+
+stop() {
+	ebegin "Flushing firewall IP sets"
+	/usr/sbin/ipset destroy
+	eend $?
+}
diff --git a/testing/irrlicht/APKBUILD b/testing/irrlicht/APKBUILD
index 6d1405ba2d..ace42441e7 100644
--- a/testing/irrlicht/APKBUILD
+++ b/testing/irrlicht/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Jeff Bilyk <jbilyk@alpinelinux.org>
 pkgname=irrlicht
-pkgver=1.7.2
+pkgver=1.7.3
 _pkgmajver=1.7
 pkgrel=0
 pkgdesc="3D graphics engine"
@@ -74,4 +74,4 @@ package() {
        install -m755 "$srcdir"/$pkgname-$pkgver/bin/Linux/* "$pkgdir"/usr/share/$pkgname/examples/bin/
 }
 
-md5sums="eb627d4c432bf73f12bc6d9ddc700b07  irrlicht-1.7.2.zip"
+md5sums="cfbdc8c68fbca544c7c8dfb3623ae086  irrlicht-1.7.3.zip"
diff --git a/testing/kbuild/APKBUILD b/testing/kbuild/APKBUILD
new file mode 100644
index 0000000000..5688647e05
--- /dev/null
+++ b/testing/kbuild/APKBUILD
@@ -0,0 +1,68 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=kbuild
+pkgver=0.1.5_p2
+_ver=${pkgver/_/-}
+pkgrel=0
+pkgdesc="A makefile framework for writing simple makefiles for complex tasks"
+url="http://svn.netlabs.org/kbuild/wiki"
+arch="all"
+license="GPL-3"
+depends=""
+depends_dev=""
+makedepends="autoconf automake flex bison"
+install=""
+subpackages="$pkgname-doc"
+source="ftp://ftp.netlabs.org/pub/kbuild/kBuild-$_ver-src.tar.gz
+	kbuild-0.1.5_p2-qa.patch
+	lchmod.patch
+	strlcpy.patch
+	underlinking.patch
+	sys_siglist.patch
+	uclibc.patch"
+
+_builddir="$srcdir"/kBuild-$_ver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+	cd "$_builddir"/src/kmk
+	aclocal -I config && autoheader && autoconf && automake --add-missing \
+		|| return 1
+	cd "$_builddir"/src/sed
+	aclocal -I config && autoheader && autoconf && automake --add-missing \
+		|| return 1
+	
+	# the bootstrap process will create a symlink to the system shell,
+	# which happens to be (/bin/sh) a symlink to /bin/busybox
+	# and busybox will get confused since there are no applet named
+	# kmk_ash.
+	echo '#!/bin/sh' >"$srcdir"/sh
+	echo 'exec /bin/busybox sh "$@"' >> "$srcdir"/sh
+	chmod +x "$srcdir"/sh
+	sed -i -e "s:/bin/sh:$srcdir/sh:" "$_builddir"/bootstrap.gmk
+}
+
+build() {
+	cd "$_builddir"
+	kBuild/env.sh --full make -f bootstrap.gmk AUTORECONF=true \
+		|| return 1
+}
+
+package() {
+	cd "$_builddir"
+	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="$pkgdir" install \
+		|| return 1
+}
+
+md5sums="5e4e2193aa6cb3f095af2f99bf90d01d  kBuild-0.1.5-p2-src.tar.gz
+79d4d445b28f0c50f2a7a8ca12bbed4b  kbuild-0.1.5_p2-qa.patch
+b3dd26cc185c96658d9b554eef2f811c  lchmod.patch
+90cae3b53b4ec6fc5f1c336922083df0  strlcpy.patch
+ca09174d7c885fdea1e3c2dc580d80b3  underlinking.patch
+234e03febb8eb35106ecf85682e9233a  sys_siglist.patch
+4bf9eead328a38059dadb56317e7aaa4  uclibc.patch"
diff --git a/testing/kbuild/getloadavg.patch b/testing/kbuild/getloadavg.patch
new file mode 100644
index 0000000000..e145ed0e5a
--- /dev/null
+++ b/testing/kbuild/getloadavg.patch
@@ -0,0 +1,32 @@
+diff --git a/src/kmk/job.c b/src/kmk/job.c
+index 6d14300..16731fc 100644
+--- a/src/kmk/job.c
++++ b/src/kmk/job.c
+@@ -240,6 +240,27 @@ unsigned long job_counter = 0;
+ 
+ unsigned int jobserver_tokens = 0;
+ 
++#ifdef __UCLIBC__
++int getloadavg(double list[], int nelem)
++{
++        FILE *LOADAVG;
++        double avg[3] = { 0.0, 0.0, 0.0 };
++        int i, res = -1;
++
++        if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
++                fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
++                res = 0;
++                fclose(LOADAVG);
++        }
++
++        for (i = 0; (i < nelem) && (i < 3); i++) {
++                list[i] = avg[i];
++        }
++
++        return res;
++}
++#endif
++
+ #ifdef WINDOWS32
+ /*
+  * The macro which references this function is defined in make.h.
diff --git a/testing/kbuild/kbuild-0.1.5_p2-qa.patch b/testing/kbuild/kbuild-0.1.5_p2-qa.patch
new file mode 100644
index 0000000000..706c3a7fd5
--- /dev/null
+++ b/testing/kbuild/kbuild-0.1.5_p2-qa.patch
@@ -0,0 +1,26 @@
+* warning: implicit declaration of function ‘unlink’
+* warning: too few arguments for format
+--- a/src/sed/lib/utils.c
++++ b/src/sed/lib/utils.c
+@@ -35,6 +35,10 @@
+ # include <stdlib.h>
+ #endif /* HAVE_STDLIB_H */
+ 
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif /* HAVE_UNISTD_H */
++
+ #include "utils.h"
+ 
+ const char *myname;
+--- a/src/kmk/kmkbuiltin/printf.c
++++ b/src/kmk/kmkbuiltin/printf.c
+@@ -206,7 +206,7 @@
+ 
+ 	(void)funcname;
+ 	if (rc != 0)
+-		fatal (NILF, _("$(%s): failure rc=%d\n"), rc);
++		fatal (NILF, _("$(%s): failure rc=%d\n"), funcname, rc);
+ 	return o;
+ }
+ #endif
diff --git a/testing/kbuild/lchmod.patch b/testing/kbuild/lchmod.patch
new file mode 100644
index 0000000000..de111867d4
--- /dev/null
+++ b/testing/kbuild/lchmod.patch
@@ -0,0 +1,27 @@
+--- ./src/kmk/kmkbuiltin/chmod.c.orig
++++ ./src/kmk/kmkbuiltin/chmod.c
+@@ -177,9 +177,9 @@
+ 	} else
+ 		fts_options = hflag ? FTS_PHYSICAL : FTS_LOGICAL;
+ 
+-	if (hflag)
++/*	if (hflag)
+ 		change_mode = lchmod;
+-	else
++	else */
+ 		change_mode = chmod;
+ 
+ 	mode = *argv;
+diff --git a/src/kmk/kmkbuiltin/cp_utils.c b/src/kmk/kmkbuiltin/cp_utils.c
+index 1773815..a1ff924 100644
+--- a/src/kmk/kmkbuiltin/cp_utils.c
++++ b/src/kmk/kmkbuiltin/cp_utils.c
+@@ -359,7 +359,7 @@ setfile(struct stat *fs, int fd)
+ 
+ 	if (!gotstat || fs->st_mode != ts.st_mode)
+ 		if (fdval ? fchmod(fd, fs->st_mode) :
+-		    (islink ? lchmod(to.p_path, fs->st_mode) :
++		    (islink ? chmod(to.p_path, fs->st_mode) :
+ 		    chmod(to.p_path, fs->st_mode))) {
+ 			warn("chmod: %s", to.p_path);
+ 			rval = 1;
diff --git a/testing/kbuild/strlcpy.patch b/testing/kbuild/strlcpy.patch
new file mode 100644
index 0000000000..42b25bdadf
--- /dev/null
+++ b/testing/kbuild/strlcpy.patch
@@ -0,0 +1,26 @@
+diff --git a/src/kmk/kmkbuiltin/cp.c b/src/kmk/kmkbuiltin/cp.c
+index 44b76ab..85fec01 100644
+--- a/src/kmk/kmkbuiltin/cp.c
++++ b/src/kmk/kmkbuiltin/cp.c
+@@ -81,7 +81,7 @@ __FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.50 2004/04/06 20:06:44 markm Exp $");
+ #include "kmkbuiltin.h"
+ #include "kbuild_protection.h"
+ 
+-#if defined(_MSC_VER) || defined(__gnu_linux__) || defined(__linux__)
++#if defined(_MSC_VER) || defined(__gnu_linux__) || defined(__linux__) && !defined(__UCLIBC__)
+ extern char *strlcpy(char *, const char *, size_t);
+ #endif
+ 
+diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk
+index 12b9697..db1deb2 100644
+--- a/src/kmk/Makefile.kmk
++++ b/src/kmk/Makefile.kmk
+@@ -101,7 +101,7 @@ kmkmissing_SOURCES.freebsd = \
+ 	glob/fnmatch.c
+ 
+ kmkmissing_SOURCES.linux += \
+-	kmkbuiltin/strlcpy.c
++	getloadavg.c
+ 
+ kmkmissing_SOURCES.solaris = \
+ 	kmkbuiltin/strlcpy.c \
diff --git a/testing/kbuild/sys_siglist.patch b/testing/kbuild/sys_siglist.patch
new file mode 100644
index 0000000000..883b2ef3ad
--- /dev/null
+++ b/testing/kbuild/sys_siglist.patch
@@ -0,0 +1,15 @@
+diff --git a/src/ash/jobs.c b/src/ash/jobs.c
+index 146326a..cbf0c3e 100644
+--- a/src/ash/jobs.c
++++ b/src/ash/jobs.c
+@@ -463,8 +463,8 @@ showjob(struct output *out, struct job *jp, int mode)
+ #endif
+ 				st = WTERMSIG(ps->status);
+ 			st &= 0x7f;
+-			if (st < NSIG && sys_siglist[st])
+-				scopyn(sys_siglist[st], s + col, 32);
++			if (st < NSIG && strsignal(st))
++				scopyn(strsignal(st), s + col, 32);
+ 			else
+ 				fmtstr(s + col, 16, "Signal %d", st);
+ 			if (WCOREDUMP(ps->status)) {
diff --git a/testing/kbuild/uclibc.patch b/testing/kbuild/uclibc.patch
new file mode 100644
index 0000000000..cf38529f17
--- /dev/null
+++ b/testing/kbuild/uclibc.patch
@@ -0,0 +1,24 @@
+--- ./src/lib/k/kDefs.h.orig
++++ ./src/lib/k/kDefs.h
+@@ -78,7 +78,7 @@
+ #  define K_OS      K_OS_DRAGONFLY
+ # elif defined(__FreeBSD__) /*??*/
+ #  define K_OS      K_OS_FREEBSD
+-# elif defined(__gnu_linux__)
++# elif defined(__gnu_linux__) || defined(__UCLIBC__)
+ #  define K_OS      K_OS_LINUX
+ # elif defined(__NetBSD__) /*??*/
+ #  define K_OS      K_OS_NETBSD
+diff --git a/src/kmk/kmkbuiltin/fts.c b/src/kmk/kmkbuiltin/fts.c
+index f913f17..febb900 100644
+--- a/src/kmk/kmkbuiltin/fts.c
++++ b/src/kmk/kmkbuiltin/fts.c
+@@ -75,7 +75,7 @@ __RCSID("$NetBSD: __fts13.c,v 1.44 2005/01/19 00:59:48 mycroft Exp $");
+ #endif
+ 
+ #if ! HAVE_NBTOOL_CONFIG_H
+-# if !defined(__sun__) && !defined(__gnu_linux__)
++# if !defined(__sun__) && !defined(__gnu_linux__) && !defined(__UCLIBC__)
+ #  define HAVE_STRUCT_DIRENT_D_NAMLEN 1
+ # endif
+ #endif
diff --git a/testing/kbuild/underlinking.patch b/testing/kbuild/underlinking.patch
new file mode 100644
index 0000000000..e72c3c1f69
--- /dev/null
+++ b/testing/kbuild/underlinking.patch
@@ -0,0 +1,13 @@
+diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk
+index db1deb2..00981b8 100644
+--- a/src/kmk/Makefile.kmk
++++ b/src/kmk/Makefile.kmk
+@@ -215,6 +215,8 @@ kmk_SOURCES = \
+ 	vpath.c \
+ 	remote-stub.c
+ 
++kmk_LIBS.linux = pthread
++
+ #kmk_LIBS.solaris = malloc
+ #kmk_DEFS.solaris += HAVE_MALLINFO
+ 
diff --git a/testing/libdvdnav/APKBUILD b/testing/libdvdnav/APKBUILD
deleted file mode 100644
index e0a9e052a2..0000000000
--- a/testing/libdvdnav/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: Timo Teräs <timo.teras@iki.fi>
-# Maintainer: Timo Teräs <timo.teras@iki.fi>
-pkgname=libdvdnav
-pkgver=4.2.0
-pkgrel=0
-pkgdesc="a library for sophisticated DVD navigation features"
-url="http://dvdnav.mplayerhq.hu/"
-arch="all"
-license="GPL"
-depends=""
-depends_dev="libdvdread-dev"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev"
-source="http://dvdnav.mplayerhq.hu/releases/$pkgname-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/libdvdnav-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure2 --prefix=/usr --disable-static --disable-debug --enable-shared || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/*.la
-}
-
-md5sums="53be8903f9802e101929a3451203bbf6  libdvdnav-4.2.0.tar.bz2"
diff --git a/testing/libdvdread/APKBUILD b/testing/libdvdread/APKBUILD
deleted file mode 100644
index 872c48e523..0000000000
--- a/testing/libdvdread/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: Timo Teräs <timo.teras@iki.fi>
-# Maintainer: Timo Teräs <timo.teras@iki.fi>
-pkgname=libdvdread
-pkgver=4.2.0
-pkgrel=0
-pkgdesc="a simple foundation for reading DVD video disks"
-url="http://dvdnav.mplayerhq.hu/"
-arch="all"
-license="GPL"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev"
-source="http://dvdnav.mplayerhq.hu/releases/libdvdread-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/libdvdread-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure2 --prefix=/usr --disable-static --disable-debug --enable-shared || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/*.la
-}
-
-md5sums="ab7a19d3ab1a437ae754ef477d6231a4  libdvdread-4.2.0.tar.bz2"
diff --git a/testing/libebml/APKBUILD b/testing/libebml/APKBUILD
deleted file mode 100644
index 4f88ee46e9..0000000000
--- a/testing/libebml/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Timo Teräs <timo.teras@iki.fi>
-# Maintainer: Timo Teräs <timo.teras@iki.fi>
-pkgname=libebml
-pkgver=1.2.2
-pkgrel=0
-pkgdesc="a C++ library to parse Extensible Binary Meta-Language files"
-url="http://www.matroska.org/"
-arch="all"
-license="LGPL"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev"
-source="http://dl.matroska.org/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	make -C make/linux
-}
-
-package() {
-	cd "$_builddir"
-	make -C make/linux install prefix="$pkgdir/usr"
-}
-
-md5sums="726cc2bd1a525929ff35ff9854c0ebab  libebml-1.2.2.tar.bz2"
diff --git a/testing/libmatroska/APKBUILD b/testing/libmatroska/APKBUILD
deleted file mode 100644
index d0112705d7..0000000000
--- a/testing/libmatroska/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Timo Teräs <timo.teras@iki.fi>
-# Maintainer: Timo Teräs <timo.teras@iki.fi>
-pkgname=libmatroska
-pkgver=1.3.0
-pkgrel=0
-pkgdesc="a C++ library to parse Matroska files"
-url="http://www.matroska.org/"
-arch="all"
-license="LGPL"
-depends=""
-depends_dev="libebml-dev"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev"
-source="http://dl.matroska.org/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	make -C make/linux
-}
-
-package() {
-	cd "$_builddir"
-	make -C make/linux install prefix="$pkgdir/usr"
-}
-
-md5sums="f4a8c411f09d39c754eb726efd616043  libmatroska-1.3.0.tar.bz2"
diff --git a/testing/libmp3splt/APKBUILD b/testing/libmp3splt/APKBUILD
deleted file mode 100644
index 997af85906..0000000000
--- a/testing/libmp3splt/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libmp3splt
-pkgver=0.7
-pkgrel=1
-pkgdesc="Library to split mp3 and ogg files without decoding"
-url="http://mp3splt.sourceforge.net/"
-arch="all"
-license="GPLv2"
-depends=""
-depends_dev="pcre-dev libogg-dev libmad-dev libvorbis-dev libid3tag-dev libtool"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev"
-source="http://prdownloads.sourceforge.net/mp3splt/libmp3splt-$pkgver.tar.gz"
-
-_builddir="$srcdir"/libmp3splt-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--enable-ogg \
-		--enable-mp3 \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/*.la \
-		"$pkgdir"/usr/lib/libmp3splt/*.la
-}
-
-md5sums="dadb166361e2a28955032a1b9f10ed38  libmp3splt-0.7.tar.gz"
diff --git a/testing/libprojectm/APKBUILD b/testing/libprojectm/APKBUILD
index bbd10f1c2c..27d6b5b6e5 100644
--- a/testing/libprojectm/APKBUILD
+++ b/testing/libprojectm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=libprojectm
 pkgver=2.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="milkdrop-like music visualizer using opengl"
 url="http://projectm.sourceforge.net/"
 arch="all"
diff --git a/testing/lua-microlight/APKBUILD b/testing/lua-microlight/APKBUILD
new file mode 100644
index 0000000000..632a653339
--- /dev/null
+++ b/testing/lua-microlight/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=lua-microlight
+pkgver=0_git20120215
+pkgrel=0
+pkgdesc="a really compact set of general Lua functions"
+url="http://stevedonovan.github.com/microlight/"
+arch="noarch"
+license="MIT"
+depends="lua"
+makedepends="wget"
+install=""
+subpackages=""
+source="https://raw.github.com/gist/1834789/2bbb01662de1d83af93d2bd2990fee229b473d54/ml.lua"
+
+_builddir=
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+}
+
+package() {
+	cd "$_builddir"
+	install -Dm644 "$srcdir"/ml.lua "$pkgdir"/usr/share/lua/5.1/ml.lua
+}
+
+md5sums="0a1e55c9babf6c093aa24f391c07cfd7  ml.lua"
diff --git a/testing/lua-microlight/ml.lua b/testing/lua-microlight/ml.lua
new file mode 100644
index 0000000000..2bbb01662d
--- /dev/null
+++ b/testing/lua-microlight/ml.lua
@@ -0,0 +1,543 @@
+-----------------
+-- Microlight - a very compact Lua utilities module
+--
+-- Steve Donovan, 2012; License MIT
+-- @module ml
+
+local ml = {}
+
+--- String utilties.
+-- @section string
+
+--- split a string into a list of strings separated by a delimiter.
+-- @param s The input string
+-- @param re A Lua string pattern; defaults to '%s+'
+-- @param n optional maximum number of splits
+-- @return a list
+function ml.split(s,re,n)
+    local find,sub,append = string.find, string.sub, table.insert
+    local i1,ls = 1,{}
+    if not re then re = '%s+' end
+    if re == '' then return {s} end
+    while true do
+        local i2,i3 = find(s,re,i1)
+        if not i2 then
+            local last = sub(s,i1)
+            if last ~= '' then append(ls,last) end
+            if #ls == 1 and ls[1] == '' then
+                return {}
+            else
+                return ls
+            end
+        end
+        append(ls,sub(s,i1,i2-1))
+        if n and #ls == n then
+            ls[#ls] = sub(s,i1)
+            return ls
+        end
+        i1 = i3+1
+    end
+end
+
+--- escape any 'magic' characters in a string
+-- @param s The input string
+-- @return an escaped string
+function ml.escape(s)
+    return (s:gsub('[%-%.%+%[%]%(%)%$%^%%%?%*]','%%%1'))
+end
+
+--- expand a string containing any ${var} or $var.
+-- @param s the string
+-- @param subst either a table or a function (as in `string.gsub`)
+-- @return expanded string
+function ml.expand (s,subst)
+    local res = s:gsub('%${([%w_]+)}',subst)
+    return (res:gsub('%$([%w_]+)',subst))
+end
+
+--- return the contents of a file as a string
+-- @param filename The file path
+-- @param is_bin open in binary mode, default false
+-- @return file contents
+function ml.readfile(filename,is_bin)
+    local mode = is_bin and 'b' or ''
+    local f,err = io.open(filename,'r'..mode)
+    if not f then return nil,err end
+    local res,err = f:read('*a')
+    f:close()
+    if not res then return nil,err end
+    return res
+end
+
+--- File and Path functions
+-- @section file
+
+--~ exists(filename)
+--- Does a file exist?
+-- @param filename a file path
+-- @return the file path, otherwise nil
+-- @usage exists 'readme' or exists 'readme.txt' or exists 'readme.md'
+function ml.exists (filename)
+    local f = io.open(filename)
+    if not f then
+        return nil
+    else
+        f:close()
+        return filename
+    end
+end
+
+local sep, other_sep = package.config:sub(1,1),'/'
+
+
+--- split a file path.
+-- if there's no directory part, the first value will be the empty string
+-- @param P A file path
+-- @return the directory part
+-- @return the file part
+function ml.splitpath(P)
+    local i = #P
+    local ch = P:sub(i,i)
+    while i > 0 and ch ~= sep and ch ~= other_sep do
+        i = i - 1
+        ch = P:sub(i,i)
+    end
+    if i == 0 then
+        return '',P
+    else
+        return P:sub(1,i-1), P:sub(i+1)
+    end
+end
+
+--- given a path, return the root part and the extension part.
+-- if there's no extension part, the second value will be empty
+-- @param P A file path
+-- @return the name part
+-- @return the extension
+function ml.splitext(P)
+    local i = #P
+    local ch = P:sub(i,i)
+    while i > 0 and ch ~= '.' do
+        if ch == sep or ch == other_sep then
+            return P,''
+        end
+        i = i - 1
+        ch = P:sub(i,i)
+    end
+    if i == 0 then
+        return P,''
+    else
+        return P:sub(1,i-1),P:sub(i)
+    end
+end
+
+--- Extended table functions.
+-- 'list' here is shorthand for 'list-like table'; these functions
+-- only operate over the numeric `1..#t` range of a table and are
+-- particularly efficient for this purpose.
+-- @section table
+
+local function quote (v)
+    if type(v) == 'string' then
+        return ('%q'):format(v)
+    else
+        return tostring(v)
+    end
+end
+
+local tbuff
+function tbuff (t,buff,k)
+    buff[k] = "{"
+    k = k + 1
+    for key,value in pairs(t) do
+        key = quote(key)
+        if type(value) ~= 'table' then
+            value = quote(value)
+            buff[k] = ('[%s]=%s'):format(key,value)
+            k = k + 1
+            if buff.limit and k > buff.limit then
+                buff[k] = "..."
+                error("buffer overrun")
+            end
+        else
+            if not buff.tables then buff.tables = {} end
+            if not buff.tables[value] then
+                k = tbuff(value,buff,k)
+                buff.tables[value] = true
+            else
+                buff[k] = "<cycle>"
+                k = k + 1
+            end
+        end
+        buff[k] = ","
+        k = k + 1
+    end
+    if buff[k-1] == "," then k = k - 1 end
+    buff[k] = "}"
+    k = k + 1
+    return k
+end
+
+--- return a string representation of a Lua table.
+-- Cycles are detected, and a limit on number of items can be imposed.
+-- @param t the table
+-- @param limit the limit on items, default 1000
+-- @return a string
+function ml.tstring (t,limit)
+    local buff = {limit = limit or 1000}
+    pcall(tbuff,t,buff,1)
+    return table.concat(buff)
+end
+
+--- dump a Lua table to a file object.
+-- @param t the table
+-- @param f the file object (anything supporting f.write)
+function ml.tdump(t,...)
+    local f = select('#',...) > 0 and select(1,...) or io.stdout
+    f:write(ml.tstring(t),'\n')
+end
+
+--- map a function over a list.
+-- The output must always be the same length as the input, so
+-- any `nil` values are mapped to `false`.
+-- @param f a function of one or more arguments
+-- @param t the table
+-- @param ... any extra arguments to the function
+-- @return a list with elements `f(t[i])`
+function ml.imap(f,t,...)
+    f = ml.function_arg(f)
+    local res = {}
+    for i = 1,#t do
+        local val = f(t[i],...)
+        if val == nil then val = false end
+        res[i] = val
+    end
+    return res
+end
+
+--- filter a list using a predicate.
+-- @param t a table
+-- @param pred the predicate function
+-- @param ... any extra arguments to the predicate
+-- @return a list such that `pred(t[i])` is true
+function ml.ifilter(t,pred,...)
+    local res,k = {},1
+    pred = ml.function_arg(pred)
+    for i = 1,#t do
+        if pred(t[i],...) then
+            res[k] = t[i]
+            k = k + 1
+        end
+    end
+    return res
+end
+
+--- find an item in a list using a predicate.
+-- @param t the list
+-- @param pred a function of at least one argument
+-- @param ... any extra arguments
+-- @return the item value
+function ml.ifind(t,pred,...)
+    pred = ml.function_arg(pred)
+    for i = 1,#t do
+        if pred(t[i],...) then
+            return t[i]
+        end
+    end
+end
+
+--- return the index of an item in a list.
+-- @param t the list
+-- @param value item value
+-- @return index, otherwise `nil`
+function ml.index (t,value)
+    for i = 1,#t do
+        if t[i] == value then return i end
+    end
+end
+
+--- return a slice of a list.
+-- Like string.sub, the end index may be negative.
+-- @param t the list
+-- @param i1 the start index
+-- @param i2 the end index, default #t
+function ml.sub(t,i1,i2)
+    if not i2 or i2 > #t then
+        i2 = #t
+    elseif i2 < 0 then
+        i2 = #t + i2 + 1
+    end
+    local res,k = {},1
+    for i = i1,i2 do
+        res[k] = t[i]
+        k = k + 1
+    end
+    return res
+end
+
+--- map a function over a Lua table.
+-- @param f a function of one or more arguments
+-- @param t the table
+-- @param ... any optional arguments to the function
+function ml.tmap(f,t,...)
+    f = ml.function_arg(f)
+    local res = {}
+    for k,v in pairs(t) do
+        res[k] = f(v,...)
+    end
+    return res
+end
+
+--- filter a table using a predicate.
+-- @param t a table
+-- @param pred the predicate function
+-- @param ... any extra arguments to the predicate
+-- @usage tfilter({a=1,b='boo'},tonumber) == {a=1}
+function ml.tfilter (t,pred,...)
+    local res = {}
+    pred = ml.function_arg(pred)
+    for k,v in pairs(t) do
+        if pred(v,...) then
+            res[k] = v
+        end
+    end
+    return res
+end
+
+--- add the key/value pairs of `other` to `t`.
+-- For sets, this is their union. For the same keys,
+-- the values from the first table will be overwritten
+-- @param t table to be updated
+-- @param other table
+-- @return the updated table
+function ml.update(t,other)
+    for k,v in pairs(other) do
+        t[k] = v
+    end
+    return t
+end
+
+--- extend a list using values from another.
+-- @param t the list to be extended
+-- @param other a list
+-- @return the extended list
+function ml.extend(t,other)
+    local n = #t
+    for i = 1,#other do
+        t[n+i] = other[i]
+    end
+    return t
+end
+
+--- make a set from a list.
+-- @param t a list of values
+-- @return a table where the keys are the values
+-- @usage set{'one','two'} == {one=true,two=true}
+function ml.set(t)
+    local res = {}
+    for i = 1,#t do
+        res[t[i]] = true
+    end
+    return res
+end
+
+--- extract the keys of a table as a list.
+-- This is the opposite operation to tset
+-- @param t a table
+-- @param a list of keys
+function ml.keys(t)
+    local res,k = {},1
+    for key in pairs(t) do
+        res[k] = key
+        k = k + 1
+    end
+    return res
+end
+
+--- is `other` a subset of `t`?
+-- @param t a set
+-- @param other a possible subset
+-- @return true or false
+function ml.subset(t,other)
+    for k,v in pairs(other) do
+        if t[k] ~= v then return false end
+    end
+    return true
+end
+
+--- are these two tables equal?
+-- This is shallow equality.
+-- @param t a table
+-- @param other a table
+-- @return true or false
+function ml.tequal(t,other)
+    return ml.subset(t,other) and ml.subset(other,t)
+end
+
+--- the intersection of two tables.
+-- Works as expected for sets, otherwise note that the first
+-- table's values are preseved
+-- @param t a table
+-- @param other a table
+-- @return the intersection of the tables
+function ml.intersect(t,other)
+    local res = {}
+    for k,v in pairs(t) do
+        if other[k] then
+            res[k] = v
+        end
+    end
+    return res
+end
+
+--- collect the values of an iterator into a list.
+-- @param iter a single or double-valued iterator
+-- @param count an optional number of values to collect
+-- @return a list of values.
+-- @usage collect(ipairs{10,20}) == {{1,10},{2,20}}
+function ml.collect (iter, count)
+    local res,k = {},1
+    local v1,v2 = iter()
+    local dbl = v2 ~= nil
+    while v1 do
+        if dbl then v1 = {v1,v2} end
+        res[k] = v1
+        k = k + 1
+        if count and k > count then break end
+        v1,v2 = iter()
+    end
+    return res
+end
+
+--- Functional helpers.
+-- @section function
+
+--- create a function which will throw an error on failure.
+-- @param f a function that returns nil,err if it fails
+-- @return an equivalent function that raises an error
+function ml.throw(f)
+    f = ml.function_arg(f)
+    return function(...)
+        local res,err = f(...)
+        if err then error(err) end
+        return res
+    end
+end
+
+--- create a function which will never throw an error.
+-- This is the opposite situation to throw; if the
+-- original function throws an error e, then this
+-- function will return nil,e.
+-- @param f a function which can throw an error
+-- @return a function which returns nil,error when it fails
+function ml.safe(f)
+    f = ml.function_arg(f)
+    return function(...)
+        local ok,r1,r2,r3 = pcall(f,...)
+        if ok then return r1,r2,r3
+        else
+            return nil,r1
+        end
+    end
+end
+--memoize(f)
+
+--- bind the value `v` to the first argument of function `f`.
+-- @param f a function of at least one argument
+-- @param v a value
+-- @return a function of one less argument
+-- @usage (bind1(string.match,'hello')('^hell') == 'hell'
+function ml.bind1(f,v)
+    f = ml.function_arg(f)
+    return function(...)
+        return f(v,...)
+    end
+end
+
+--- compose two functions.
+-- For instance, `printf` can be defined as `compose(io.write,string.format)`
+-- @param f1 a function
+-- @param f2 a function
+-- @return f1(f2(...))
+function ml.compose(f1,f2)
+    f1 = ml.function_arg(f1)
+    f2 = ml.function_arg(f2)
+    return function(...)
+        return f1(f2(...))
+    end
+end
+
+--- is the object either a function or a callable object?.
+-- @param obj Object to check.
+-- @return true if callable
+function ml.callable (obj)
+    return type(obj) == 'function' or getmetatable(obj) and getmetatable(obj).__call
+end
+
+function ml.function_arg(f)
+    assert(ml.callable(f),"expecting a function or callable object")
+    return f
+end
+
+--- Classes.
+-- @section class
+
+--- create a class with an optional base class.
+-- The resulting table has a new() function for invoking
+-- the constructor, which must be named `_init`. If the base
+-- class has a constructor, you can call it as the `super()` method.
+-- The `__tostring` metamethod is also inherited, but others need
+-- to be brought in explicitly.
+-- @param base optional base class
+-- @return the metatable representing the class
+function ml.class(base)
+    local klass, base_ctor = {}
+    klass.__index = klass
+    if base then
+        setmetatable(klass,base)
+        klass._base = base
+        base_ctor = rawget(base,'_init')
+        klass.__tostring = base.__tostring
+    end
+    function klass.new(...)
+        local self = setmetatable({},klass)
+        if rawget(klass,'_init') then
+            klass.super = base_ctor -- make super available for ctor
+            klass._init(self,...)
+        elseif base_ctor then -- call base ctor automatically
+            base_ctor(self,...)
+        end
+        return self
+    end
+    return klass
+end
+
+--- is an object derived from a class?
+-- @param self the object
+-- @param klass a class created with `class`
+-- @return true or false
+function ml.is_a(self,klass)
+    local m = getmetatable(self)
+    if not m then return false end --*can't be an object!
+    while m do
+        if m == klass then return true end
+        m = rawget(m,'_base')
+    end
+    return false
+end
+
+local _type = type
+
+--- extended type of an object.
+-- The type of a table is its metatable, otherwise works like standard type()
+-- @param obj a value
+-- @return the type, either a string or the metatable
+function ml.type (obj)
+    if _type(obj) == 'table' then
+        return getmetatable(obj) or 'table'
+    else
+        return _type(obj)
+    end
+end
+
+return ml
diff --git a/testing/mediaproxy/APKBUILD b/testing/mediaproxy/APKBUILD
index 169fc2e093..6b5fc54db7 100644
--- a/testing/mediaproxy/APKBUILD
+++ b/testing/mediaproxy/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mediaproxy
 pkgver=2.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="MediaProxy"
 url="http://www.ag-projects.com/MediaProxy/"
 pkgusers="kamailio"
diff --git a/testing/minidlna/APKBUILD b/testing/minidlna/APKBUILD
index 03f3ae5132..9589baaad1 100644
--- a/testing/minidlna/APKBUILD
+++ b/testing/minidlna/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=minidlna
-pkgver=1.0.22
+pkgver=1.0.24
 pkgrel=0
 pkgdesc="A small dlna server"
 url="http://sourceforge.net/projects/minidlna/"
@@ -43,6 +43,6 @@ package() {
 	install -m644 -D "$srcdir/$pkgname.confd" "$pkgdir/etc/conf.d/$pkgname"
 }
 
-md5sums="3de2f6b54f43bb998dfad3c8fa75cef3  minidlna_1.0.22_src.tar.gz
+md5sums="be9b4c91e3fcde592dc3f9828098ca0f  minidlna_1.0.24_src.tar.gz
 c9965792baec8d2dc6953c7e28eda8bd  minidlna.initd
 6dc0cf1e59e0d53b910f306f81cb7e7f  minidlna.confd"
diff --git a/testing/mp3splt-gtk/APKBUILD b/testing/mp3splt-gtk/APKBUILD
deleted file mode 100644
index f8b83a6de5..0000000000
--- a/testing/mp3splt-gtk/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=mp3splt-gtk
-pkgver=0.7
-pkgrel=0
-pkgdesc="Gtk frontend for mp3splt"
-url="http://mp3splt.sourceforge.net/"
-arch="all"
-license="GPLv2"
-depends=""
-makedepends="gtk+-dev gst-plugins-base-dev gnome-doc-utils libmp3splt-dev
-	audacious-dev"
-install=""
-subpackages="$pkgname-doc $pkgname-lang"
-source="http://prdownloads.sourceforge.net/mp3splt/mp3splt-gtk-$pkgver.tar.gz"
-
-_builddir="$srcdir"/mp3splt-gtk-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--disable-gnome \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/*.la
-}
-
-md5sums="a1cefffb7ea78ae7c07c8d3ba7a2630b  mp3splt-gtk-0.7.tar.gz"
diff --git a/testing/mp3splt/APKBUILD b/testing/mp3splt/APKBUILD
deleted file mode 100644
index b411ffee05..0000000000
--- a/testing/mp3splt/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=mp3splt
-pkgver=2.4
-pkgrel=0
-pkgdesc="A command-line, AlbumWrap and mp3wrap file exctractor"
-url="http://mp3splt.sourceforge.net/"
-arch="all"
-license="GPLv2"
-depends=""
-makedepends="libmp3splt-dev"
-install=""
-subpackages="$pkgname-doc"
-source="http://prdownloads.sourceforge.net/mp3splt/mp3splt-$pkgver.tar.gz"
-
-_builddir="$srcdir"/mp3splt-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--with-mp3splt-includes=/usr/include/libmp3splt \
-		--enable-oggsplt_symlink \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/*.la
-}
-
-md5sums="aa4dc3de6e789961c71d8b3daaac0623  mp3splt-2.4.tar.gz"
diff --git a/testing/mplayer2/APKBUILD b/testing/mplayer2/APKBUILD
index b02c14ba06..747e3e87cb 100644
--- a/testing/mplayer2/APKBUILD
+++ b/testing/mplayer2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mplayer2
 pkgver=2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="advanced general-purpose video player"
 url="http://www.mplayer2.org/"
 arch="all"
diff --git a/testing/mutter/APKBUILD b/testing/mutter/APKBUILD
index d11454b56f..2bb75bef1d 100644
--- a/testing/mutter/APKBUILD
+++ b/testing/mutter/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=mutter
 pkgver=2.31.5
-pkgrel=4
+pkgrel=5
 pkgdesc="clutter-based window manager for GNOME"
 url="http://www.gnome.org/"
 arch="all"
@@ -11,7 +11,7 @@ depends="zenity"
 depends_dev="clutter-dev libcanberra-dev gconf-dev startup-notification-dev python-dev"
 makedepends="$depends_dev gobject-introspection-dev intltool gnome-doc-utils"
 install="$pkgname.pre-deinstall $pkgname.post-install $pkgname.post-upgrade"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
 	mutter-gtk2.patch"
 
@@ -31,6 +31,7 @@ build() {
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
+		--enable-compile-warnings=no \
 		--disable-static || return 1
 	make || return 1
 }
diff --git a/testing/nettle/APKBUILD b/testing/nettle/APKBUILD
deleted file mode 100644
index 5fe4356b99..0000000000
--- a/testing/nettle/APKBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch
-pkgname=nettle
-pkgver=2.4
-pkgrel=0
-pkgdesc="A low-level cryptographic library"
-url="http://www.lysator.liu.se/~nisse/nettle/"
-arch="all"
-license="LGPL2+"
-depends=""
-depends_dev="gmp-dev m4"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz
-	nettle-2.4-makefile.patch"
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--enable-shared \
-		--disable-openssl \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/lib/*.la
-}
-
-md5sums="450be8c4886d46c09f49f568ad6fa013  nettle-2.4.tar.gz
-b3a89964557b9fca040a84e9217b4b01  nettle-2.4-makefile.patch"
diff --git a/testing/nettle/nettle-2.4-makefile.patch b/testing/nettle/nettle-2.4-makefile.patch
deleted file mode 100644
index c216365a11..0000000000
--- a/testing/nettle/nettle-2.4-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nettle-2.4/Makefile.in.orig
-+++ nettle-2.4/Makefile.in
-@@ -14,7 +14,7 @@
- INSTALL_STRIP_PROGRAM = $(INSTALL_PROGRAM) -s
- MKDIR_P = @MKDIR_P@
- 
--SUBDIRS = tools testsuite examples
-+SUBDIRS = tools testsuite
- 
- include config.make
- 
diff --git a/testing/networkmanager/APKBUILD b/testing/networkmanager/APKBUILD
index acb03cbe02..7e39723e3e 100644
--- a/testing/networkmanager/APKBUILD
+++ b/testing/networkmanager/APKBUILD
@@ -3,12 +3,12 @@
 pkgname=networkmanager
 pkgver=0.9.2.0
 _ver=0.9
-pkgrel=0
+pkgrel=1
 pkgdesc="network management tool"
 url="http://projects.gnome.org/NetworkManager/"
 arch="all"
 license="GPL"
-depends="dhcpcd iptables"
+depends="dhcpcd iptables dbus"
 depends_dev="dbus-glib-dev udev-dev libnl-dev util-linux-dev 
 	polkit-dev ppp-dev zlib-dev libiconv-dev wireless-tools-dev
 	nss-dev nspr-dev"
diff --git a/testing/nfdump/APKBUILD b/testing/nfdump/APKBUILD
deleted file mode 100644
index 55083c8fcf..0000000000
--- a/testing/nfdump/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Contributor:
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=nfdump
-pkgver=1.6.4
-pkgrel=2
-pkgdesc="The nfdump tools collect and process netflow data on the command line."
-url="http://nfdump.sourceforge.net/"
-arch="all"
-license="BSD"
-depends=""
-depends_dev=""
-makedepends="bison flex $depends_dev"
-install=""
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz\
-	nfcapd.confd\
-	nfcapd.initd"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m755 "$srcdir"/nfcapd.initd \
-		"$pkgdir"/etc/init.d/nfcapd
-
-	install -D -m644 "$srcdir"/nfcapd.confd \
-		"$pkgdir"/etc/conf.d/nfcapd
-}
-
-md5sums="a5ab5657da78f0f57ac7d29f31883949  nfdump-1.6.4.tar.gz
-d525c691a62a5746c581f5e9776ed866  nfcapd.confd
-d2b60619e18120af68771f3b866177e8  nfcapd.initd"
diff --git a/testing/nfdump/nfcapd.confd b/testing/nfdump/nfcapd.confd
deleted file mode 100644
index fb9afb6e32..0000000000
--- a/testing/nfdump/nfcapd.confd
+++ /dev/null
@@ -1,62 +0,0 @@
-# Config file for /etc/init.d/nfcapd
-
-# Port we listen on
-PORT=2205
-
-# Hostname/address we bind on - default is any available
-BINDHOST=127.0.0.1
-
-# IPv4 only 
-#IPV4=no
-
-# IPv6 only
-#IPV6=no
-
-# Join a specific Multicast group
-#MULTICASTGROUP=
-
-# Become a packet repeater
-#REPEAT=desthost/port
-
-
-# Ident string, specify the name of the router
-#IDENT=
-
-# Base Directory for output files
-BASEDIR="/var/log/nfcapd"
-
-# Source is one or more sources: Ident,IP,base_directory 
-# If you specificy SOURCE, do not specifiy IDENT or BASEDIR
-#SOURCE="Foo,192.168.1.1,/var/log/nfcapd/foo Bar,192.168.1.2,/var/log/nfcapd/bar"
-
-# Sample Rate - defaults to source
-#SAMPLERATE=
-
-# additional directory sub hierarchy (default none)
-#SUBDIR="%Y/%m/%d"
-
-
-# Extensions to be stored in the netflow data
-#EXTENSIONS="all"
-
-# How often to rotate the files (in seconds)
-#INTERVAL=300
-
-# Do we align rotation with next even interval
-#ALIGN=no
-
-# Run a command at the end of every interval
-#ROTATECMD=""
-
-# Auto expire old files (yes/no)
-#AUTOEXPIRE=no
-
-# User / Group
-UID=nobody
-GID=nobody
-
-# Buffer length in bytes (to reduce lost packets)
-BUFFLEN=1024000
-
-# Compress the flows with LZO (yes/no)
-COMPRESS=yes
diff --git a/testing/nfdump/nfcapd.initd b/testing/nfdump/nfcapd.initd
deleted file mode 100644
index 5f8506812d..0000000000
--- a/testing/nfdump/nfcapd.initd
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 2012 N Angelacos - Based on Gentoo Foundation fprobe script
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	after firewall
-}
-
-
-BIN=/usr/bin/nfcapd
-PIDFILE_EXTRA=${SVCNAME#*.}
-if [ -n "${PIDFILE_EXTRA}" ] && [ ${SVCNAME} != "nfcapd" ]; then
-	PIDFILE="/var/run/nfcapd.${PIDFILE_EXTRA}.pid"
-else
-	PIDFILE="/var/run/nfcapd.pid"
-fi
-
-start() {
-	ebegin "Starting nfcapd"
-	local OPTS=""
-	
-	[ -n "${SOURCE}" ] && SOURCE=`echo -n "${SOURCE}" | sed 's/ / -n /g'`
-	[ "${IPV4}"       == "yes" ] && OPTS="${OPTS} -4"
-	[ "${IPV6}"       == "yes" ] && OPTS="${OPTS} -6"
-	[ "${ALIGN}"      == "yes" ] && OPTS="${OPTS} -w"
-	[ "${AUTOEXPIRE}" == "yes" ] && OPTS="${OPTS} -e"
-	[ "${COMPRESS}"   == "yes" ] && OPTS="${OPTS} -z"
-	for optname in p:PORT b:BINDHOST j:MULTICASTGROUP i:IFACE R:REPEAT \
-		I:IDENT l:BASEDIR n:SOURCE s:SAMPLERATE S:SUBDIR \
-		T:EXTENSIONS t:INTERVAL x:ROTATECMD u:UID g:GID \
-		B:BUFFLEN ; do
-	    opt="${optname/:*}"	optvar="${optname/*:}"
-	    eval optvalue="\$$optvar"
-	    [ -n "$optvalue" ] && OPTS="${OPTS} -${opt} ${optvalue}"
-	done
-	OPTS="${OPTS}"
-
-	# Attempt to make the basedir if specified
-	if [ -n "${BASEDIR}" ]; then
-		mkdir -p "${BASEDIR}"
-		chown "${UID}":"${GID}" "${BASEDIR}"
-	fi
-
-
-	start-stop-daemon --start -b --exec $BIN \
-		--pidfile ${PIDFILE} --make-pidfile \
-		-- ${OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping nfcapd"
-	start-stop-daemon --stop --quiet --exec $BIN \
-		--pidfile ${PIDFILE}
-	eend $?
-}
-
-
-
-
-
-
diff --git a/testing/openvcp/APKBUILD b/testing/openvcp/APKBUILD
index 2afdc16959..919ef68502 100644
--- a/testing/openvcp/APKBUILD
+++ b/testing/openvcp/APKBUILD
@@ -4,7 +4,7 @@ pkgname=openvcp
 _pkgname=openvcpd
 pkgver=0.5
 _pkgver=0.5rc3
-pkgrel=4
+pkgrel=5
 pkgdesc="Control Panel for VServer instances"
 url="http://www.openvcp.org"
 arch="all"
@@ -45,5 +45,5 @@ package() {
 }
 
 md5sums="9c65d706133ea48553c90236997f1b8b  openvcpd-0.5rc3.tar.gz
-bf034b4507f79f635596f1c78f5f7e3f  system-libiptc.patch
+107345e8fc8ddaa2cf06dbb94fe13a47  system-libiptc.patch
 1c3e0df6937b2a73b49850a81de15365  openvcp.initd"
diff --git a/testing/openvcp/system-libiptc.patch b/testing/openvcp/system-libiptc.patch
index cfbe7296ea..961805fb55 100644
--- a/testing/openvcp/system-libiptc.patch
+++ b/testing/openvcp/system-libiptc.patch
@@ -5,7 +5,7 @@
  CFLAGS=@CFLAGS@ @DEFS@ -DOPENVCP_CONFIG=\"$(sysconfdir)/openvcpd.conf\" -DOPENVCP_DATA=\"$(datadir)/openvcpd\" -Ilib/ -Isrc/ -rdynamic -DREVISION=\"$(REV)\" `python-config --cflags`
  LDFLAGS=@LDFLAGS@ 
 -LIBS=@LIBS@ `python-config --ldflags`
-+LIBS=@LIBS@ `python-config --ldflags` -liptc
++LIBS=@LIBS@ `python-config --ldflags` -liptc -lip4tc
  
 -OBJECTS = lib/libiptc/libip6tc.o lib/libiptc/libip4tc.o src/modules.o src/misc.o src/node.o src/traffic.o src/logtraffic.o src/setup.o src/set.o src/parseconfig.o src/get.o src/request.o lib/fs.o lib/strings.o lib/ovcpxml.o src/filter.o src/bandwidth.o src/trafficlimit.o src/userbackup.o src/task.o
 +OBJECTS = src/modules.o src/misc.o src/node.o src/traffic.o src/logtraffic.o src/setup.o src/set.o src/parseconfig.o src/get.o src/request.o lib/fs.o lib/strings.o lib/ovcpxml.o src/filter.o src/bandwidth.o src/trafficlimit.o src/userbackup.o src/task.o
diff --git a/testing/openxcap/APKBUILD b/testing/openxcap/APKBUILD
index 4ee40c4019..dd50b55b7f 100644
--- a/testing/openxcap/APKBUILD
+++ b/testing/openxcap/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=openxcap
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source fully featured XCAP server "
 url="http://openxcap.org"
 pkgusers="openxcap"
diff --git a/testing/pdns/APKBUILD b/testing/pdns/APKBUILD
index 482a57b312..04dfb62bb2 100644
--- a/testing/pdns/APKBUILD
+++ b/testing/pdns/APKBUILD
@@ -4,7 +4,7 @@ pkgname=pdns
 pkgver=3.0
 _extver=rc1
 _realver=$pkgver-$_extver
-pkgrel=0
+pkgrel=2
 pkgdesc="PowerDNS Authoritative Server"
 url="http://www.powerdns.com/"
 arch="all"
@@ -61,6 +61,8 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/pdns/*.la || return 1
+	
 
 	install -m755 -D "$srcdir"/$pkgname.initd \
 		"$pkgdir"/etc/init.d/$pkgname || return 1
@@ -102,11 +104,9 @@ _mv_backend() {
 	mkdir -p "$subpkgdir"/usr/lib/pdns || return 1
 	mv "$pkgdir"/usr/lib/pdns/lib${backend}backend.so \
 		"$subpkgdir"/usr/lib/pdns/ || return 1
-	mv "$pkgdir"/usr/lib/pdns/lib${backend}backend.la \
-		"$subpkgdir"/usr/lib/pdns/ || return 1
 }
 
 md5sums="99a457688dcc246faa43dfb64c65c424  pdns-3.0-rc1.tar.gz
 fd4d14c30bae793072ba7f3fa6cca80e  0010-disable-execinfo.patch
-3c4789e9a7330579d1882344bc10b27c  pdns.initd
+db146742b8f5bd91494690ee01f29862  pdns.initd
 351bac7f784a1a40e768466d9e6f1a79  pdns.conf"
diff --git a/testing/pdns/pdns.initd b/testing/pdns/pdns.initd
index 593d56347b..25d17ced80 100644
--- a/testing/pdns/pdns.initd
+++ b/testing/pdns/pdns.initd
@@ -6,7 +6,9 @@
 name=pdns
 daemon=/usr/sbin/pdns_server
 pdns_control=/usr/bin/pdns_control
-opts="reload monitor dump"
+
+extra_started_commands="dump reload"
+extra_commands="monitor"
 
 PDNS_INSTANCE="${SVCNAME#pdns[.-]}"
 PDNS_CONFIG=""
diff --git a/testing/perl-net-async-http/APKBUILD b/testing/perl-net-async-http/APKBUILD
new file mode 100644
index 0000000000..bc2d2ec3ed
--- /dev/null
+++ b/testing/perl-net-async-http/APKBUILD
@@ -0,0 +1,39 @@
+# Automatically generated by apkbuild-cpan, template 1
+# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+pkgname=perl-net-async-http
+_pkgreal=Net-Async-HTTP
+pkgver=0.16
+pkgrel=0
+pkgdesc="use HTTP with C<IO::Async>"
+url="http://search.cpan.org/dist/Net-Async-HTTP/"
+arch="noarch"
+license="GPL PerlArtistic"
+cpandepends="perl-uri perl-io-async perl-http-message"
+cpanmakedepends="perl-http-cookies perl-test-identity perl-io-async   "
+depends="$cpandepends"
+makedepends="perl-dev $cpanmakedepends"
+subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_pkgreal-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	perl Build.PL installdirs=vendor || return 1
+}
+
+build() {
+	cd "$_builddir"
+	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	./Build && ./Build test
+}
+
+package() {
+	cd "$_builddir"
+	./Build install destdir="$pkgdir" || return 1
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+md5sums="d1b430e4a04452368d61b8aa4bd5d2c0  Net-Async-HTTP-0.16.tar.gz"
diff --git a/testing/perl-parser-mgc/APKBUILD b/testing/perl-parser-mgc/APKBUILD
new file mode 100644
index 0000000000..5504d52203
--- /dev/null
+++ b/testing/perl-parser-mgc/APKBUILD
@@ -0,0 +1,39 @@
+# Automatically generated by apkbuild-cpan, template 1
+# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+pkgname=perl-parser-mgc
+_pkgreal=Parser-MGC
+pkgver=0.10
+pkgrel=0
+pkgdesc="build simple recursive-descent parsers"
+url="http://search.cpan.org/dist/Parser-MGC/"
+arch="noarch"
+license="GPL PerlArtistic"
+cpandepends="perl-file-slurp"
+cpanmakedepends="   "
+depends="$cpandepends"
+makedepends="perl-dev $cpanmakedepends"
+subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_pkgreal-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	perl Build.PL installdirs=vendor || return 1
+}
+
+build() {
+	cd "$_builddir"
+	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	./Build && ./Build test
+}
+
+package() {
+	cd "$_builddir"
+	./Build install destdir="$pkgdir" || return 1
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+md5sums="a0bfd2b152bbcf59e08fa9892ad4a960  Parser-MGC-0.10.tar.gz"
diff --git a/testing/perl-strictures/APKBUILD b/testing/perl-strictures/APKBUILD
index 4e4b3a449a..dfc692c23c 100644
--- a/testing/perl-strictures/APKBUILD
+++ b/testing/perl-strictures/APKBUILD
@@ -1,6 +1,6 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 pkgname=perl-strictures
 _pkgreal=strictures
 pkgver=1.002002
@@ -10,7 +10,7 @@ url="http://search.cpan.org/dist/strictures/"
 arch="noarch"
 license="GPL PerlArtistic"
 cpandepends=""
-cpanmakedepends=""
+cpanmakedepends="   "
 depends="$cpandepends"
 makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
@@ -20,11 +20,13 @@ _builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	cd "$_builddir"
+	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
 	cd "$_builddir"
+	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
 	make && make test
 }
 
diff --git a/testing/poppler-qt4/APKBUILD b/testing/poppler-qt4/APKBUILD
index 804ef42ebd..9f7ec8559a 100644
--- a/testing/poppler-qt4/APKBUILD
+++ b/testing/poppler-qt4/APKBUILD
@@ -3,7 +3,7 @@
 # this aport only includes glib/gtk support in order to break the
 # circular make dependency: gtk <- cups <- poppler <- gtk
 
-_ver=0.18.3
+_ver=0.18.4
 # get the pkgver from poppler
 if [ -r ../../main/poppler/APKBUILD ]; then
 	. ../../main/poppler/APKBUILD
@@ -14,8 +14,8 @@ fi
 
 pkgname=poppler-qt4
 _realname=poppler
-pkgver=$pkgver
-pkgrel=1
+pkgver=$_ver
+pkgrel=0
 pkgdesc="PDF rendering library based on xpdf 3.0"
 url="http://poppler.freedesktop.org/"
 arch="all"
@@ -59,4 +59,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
-md5sums="d70d2d63d8acd29c97185f7e5f09c9b4  poppler-0.18.3.tar.gz"
+md5sums="12658f3308597e57f3faff538cc73baf  poppler-0.18.4.tar.gz"
diff --git a/testing/postfixadmin/APKBUILD b/testing/postfixadmin/APKBUILD
deleted file mode 100644
index 8043f1a0d5..0000000000
--- a/testing/postfixadmin/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=postfixadmin
-pkgver=2.3.3
-pkgrel=0
-pkgdesc="Web Based Management tool for Postfix"
-url="http://postfixadmin.com/"
-arch="noarch"
-license="GPL"
-depends="php postfix"
-makedepends=""
-install=""
-subpackages=""
-source="http://downloads.sourceforge.net/project/postfixadmin/postfixadmin/postfixadmin-$pkgver/postfixadmin-$pkgver.tar.gz"
-
-_builddir="$srcdir"/postfixadmin-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-}
-
-package() {
-	cd "$_builddir"
-	mkdir -p "$pkgdir"/usr/share/webapps/postfixadmin \
-		"$pkgdir"/etc/postfixadmin
-	cp -r * "$pkgdir"/usr/share/webapps/postfixadmin/
-
-	# move config to /etc/postfixadmin and create symlink
-	mv "$pkgdir"/usr/share/webapps/postfixadmin/config.inc.php \
-		"$pkgdir"/etc/postfixadmin/
-	ln -s /etc/postfixadmin/config.inc.php \
-		"$pkgdir"/usr/share/webapps/postfixadmin/config.inc.php
-}
-
-md5sums="0dfcd8a4535e00aced45c82dbcedf859  postfixadmin-2.3.3.tar.gz"
diff --git a/testing/py-configobj/APKBUILD b/testing/py-configobj/APKBUILD
new file mode 100644
index 0000000000..6e8f0bcbc1
--- /dev/null
+++ b/testing/py-configobj/APKBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
+pkgname=py-configobj
+_realname=configobj
+pkgver=0_hg78
+_ver=0_hg
+pkgrel=1
+pkgdesc="Python library for reading and writing of configuration files (ini)"
+url="http://code.google.com/p/configobj/"
+arch="noarch"
+license="GPL"
+depends="python"
+depends_dev="mercurial"
+makedepends="$depends_dev"
+install=
+subpackages=
+source="http://dev.alpinelinux.org/archive/configobj/$_realname-$pkgver.tar.gz"
+
+_mercurial_url="https://code.google.com/p/configobj/"
+
+_builddir="$srcdir"/$_realname
+
+snapshot() {
+	mkdir -p "$srcdir"
+	cd "${SRCDEST:-$srcdir}"
+	if ! [ -d $_realname ]; then
+		hg clone $_mercurial_url || return 1
+		cd $_realname
+		_mercurial_revision=$(cd ${SRCDEST:-$srcdir}/$_realname && hg tip | grep changeset | egrep -o '[0-9]+:' | tr -d ":")
+		_mercurial_commit=$(hg identify ${SRCDEST:-$srcdir}/$_realname | awk '{ print $1 }')
+	else
+		cd $_realname
+		hg pull
+		_mercurial_revision=$(cd ${SRCDEST:-$srcdir}/$_realname && hg tip | grep changeset | egrep -o '[0-9]+:' | tr -d ":")
+		_mercurial_commit=$(hg identify ${SRCDEST:-$srcdir}/$_realname | awk '{ print $1 }')
+	fi
+
+	hg archive --prefix=$_realname/ "$SRCDEST"/${_realname}-${_ver}${_mercurial_revision}.tar.gz
+	scp "$SRCDEST"/${_realname}-${_ver}${_mercurial_revision}.tar.gz dev.alpinelinux.org:/archive/$_realname/
+}
+
+prepare() {
+	cd "$_builddir"
+	return 0
+}
+
+build() {
+	cd "$_builddir"
+	return 0
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --root="$pkgdir"
+}
+
+md5sums="5a796359bffe586dff2f86d3a182f693  configobj-0_hg78.tar.gz"
diff --git a/testing/py-configshell/APKBUILD b/testing/py-configshell/APKBUILD
new file mode 100644
index 0000000000..299357e2ee
--- /dev/null
+++ b/testing/py-configshell/APKBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
+pkgname=py-configshell
+_realname=configshell
+pkgver=1.1_p4
+_ver=${pkgver/_rc/rc}
+_ver=${_ver/_p/.fb}
+pkgrel=2
+pkgdesc="Python library that provides a framework for building simple but nice CLI-based applications"
+url="https://github.com/agrover/configshell-fb"
+arch="noarch"
+license="AGPLv3"
+depends="python"
+depends_dev="python-dev py-simpleparse py-urwid"
+makedepends="$depends_dev"
+install=""
+subpackages=
+source="http://dev.alpinelinux.org/archive/configshell/$_realname-$_ver.tar.gz"
+
+_giturl="https://github.com/agrover/configshell-fb"
+_gittag=v$_ver
+
+_builddir="$srcdir"/$_realname
+
+snapshot() {
+	mkdir -p "$srcdir"
+	cd "${SRCDEST:-$srcdir}"
+	if ! [ -d $_realname-fb.git ]; then
+		git clone --bare  $_giturl || return 1
+		cd $_realname-fb.git
+	else
+		cd $_realname-fb.git
+		git fetch || return 1
+	fi
+	
+	git archive --prefix=$_realname/ -o "$SRCDEST"/$_realname-$_ver.tar.gz $_gittag
+	scp "$SRCDEST"/$_realname-$_ver.tar.gz dev.alpinelinux.org:/archive/$_realname/
+}
+
+
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	python setup.py build
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --skip-build --root="$pkgdir"
+}
+
+md5sums="69abc1134f16a14d481518a5378cf1b1  configshell-1.1.fb4.tar.gz"
diff --git a/testing/py-ethtool/APKBUILD b/testing/py-ethtool/APKBUILD
new file mode 100644
index 0000000000..de58b1ea59
--- /dev/null
+++ b/testing/py-ethtool/APKBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
+pkgname=py-ethtool
+_realname=python-ethtool
+pkgver=0.7
+pkgrel=0
+pkgdesc="Python library for the ethtool kernel interface"
+url="http://www.ohloh.net/p/python-ethtool"
+arch="all"
+license="GPL"
+depends=
+depends_dev="libnl-dev pkgconfig python-dev"
+makedepends="$depends_dev"
+install=
+subpackages=
+source="http://dsommers.fedorapeople.org/python-ethtool/$_realname-$pkgver.tar.bz2
+	python-ethtool-libnl-1.0-support.patch"
+
+
+_builddir="$srcdir"/$_realname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+        local i
+        cd "$_builddir"
+        for i in $source; do
+                case $i in
+                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+                esac
+        done	
+}
+
+build() {
+	cd "$_builddir"
+	return 0
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	# python setup.py install --root="$pkgdir"
+}
+
+md5sums="2d13e2412948344b8375f5af4ced1c20  python-ethtool-0.7.tar.bz2
+188f260534eb838193e0e8c249b6a33c  python-ethtool-libnl-1.0-support.patch"
diff --git a/testing/py-ethtool/python-ethtool-libnl-1.0-support.patch b/testing/py-ethtool/python-ethtool-libnl-1.0-support.patch
new file mode 100644
index 0000000000..43c53dba4e
--- /dev/null
+++ b/testing/py-ethtool/python-ethtool-libnl-1.0-support.patch
@@ -0,0 +1,71 @@
+diff --git a/python-ethtool/etherinfo.c b/python-ethtool/etherinfo.c
+index 3d2072b..23f03c6 100644
+--- a/python-ethtool/etherinfo.c
++++ b/python-ethtool/etherinfo.c
+@@ -30,6 +30,52 @@
+ #include "etherinfo_struct.h"
+ #include "etherinfo.h"
+ 
++#ifdef LIBNL_1_0
++#define NLHDR_COMMON                            \
++        int                     ce_refcnt;      \
++        struct nl_object_ops *  ce_ops;         \
++        struct nl_cache *       ce_cache;       \
++        struct nl_list_head     ce_list;        \
++        int                     ce_msgtype;     \
++        int                     ce_flags;       \
++        uint32_t                ce_mask;
++
++struct nl_cache
++{
++        struct nl_list_head     c_items;
++        int                     c_nitems;
++        int                     c_iarg1;
++        int                     c_iarg2;
++        struct nl_cache_ops *   c_ops;
++};
++
++struct nl_object
++{
++        NLHDR_COMMON
++};
++
++void nl_cache_free(struct nl_cache *cache)
++{
++        struct nl_object *obj, *tmp;
++
++        if( !cache )
++                return;
++
++        nl_list_for_each_entry_safe(obj, tmp, &cache->c_items, ce_list) {
++                struct nl_cache *cache = obj->ce_cache;
++                if( !cache ) {
++                        break;
++                }
++
++                nl_list_del(&obj->ce_list);
++                obj->ce_cache = NULL;
++                nl_object_put(obj);
++                cache->c_nitems--;
++        }
++        free(cache);
++}
++#endif
++
+ /*
+  *
+  *   Internal functions for working with struct etherinfo
+diff --git a/setup.py b/setup.py
+index bde04dc..9adff64 100644
+--- a/setup.py
++++ b/setup.py
+@@ -67,7 +67,8 @@ setup(name='ethtool',
+             include_dirs = libnl['include'],
+             library_dirs = libnl['libdirs'],
+             libraries = libnl['libs'],
+-            define_macros = [('VERSION', '"%s"' % version)]
++            define_macros = [('VERSION', '"%s"' % version),
++                             ('LIBNL_1_0', None)]
+             )
+         ]
+ )
diff --git a/testing/py-ipaddr/APKBUILD b/testing/py-ipaddr/APKBUILD
new file mode 100644
index 0000000000..886a645218
--- /dev/null
+++ b/testing/py-ipaddr/APKBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
+pkgname=py-ipaddr
+_realname=ipaddr
+pkgver=2.1.10
+pkgrel=0
+pkgdesc="Python IP address manipulation library"
+url="http://code.google.com/p/ipaddr-py"
+arch="noarch"
+license="GPL"
+depends="python"
+depends_dev=
+makedepends="$depends_dev"
+install=
+subpackages=
+source="http://ipaddr-py.googlecode.com/files/$_realname-$pkgver.tar.gz"
+
+
+_builddir="$srcdir"/$_realname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	return 0
+}
+
+build() {
+	cd "$_builddir"
+	return 0
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --root="$pkgdir"
+}
+
+md5sums="f315ac829218e9735c5d772d59a3e0e7  ipaddr-2.1.10.tar.gz"
diff --git a/testing/py-rtslib/APKBUILD b/testing/py-rtslib/APKBUILD
new file mode 100644
index 0000000000..97ab4238fb
--- /dev/null
+++ b/testing/py-rtslib/APKBUILD
@@ -0,0 +1,61 @@
+# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=py-rtslib
+_realname=rtslib
+pkgver=2.1_p9
+_ver=${pkgver/_rc/rc}
+_ver=${_ver/_p/.fb}
+pkgrel=1
+pkgdesc="Python library that provides an object API to RisingTide Systems generic SCSI Target"
+url="https://github.com/agrover/rtslib-fb"
+arch="noarch"
+license="AGPLv3"
+depends="python"
+depends_dev="py-configobj py-ethtool py-ipaddr"
+makedepends="$depends_dev"
+install=""
+subpackages=
+source="http://dev.alpinelinux.org/archive/rtslib/$_realname-$_ver.tar.gz"
+
+_giturl="https://github.com/agrover/rtslib-fb.git"
+_gittag=v$_ver
+
+_builddir="$srcdir"/$_realname
+
+snapshot() {
+	mkdir -p "$srcdir"
+	cd "${SRCDEST:-$srcdir}"
+	if ! [ -d $_realname-fb.git ]; then
+		git clone --bare  $_giturl || return 1
+		cd $_realname-fb.git
+	else
+		cd $_realname-fb.git
+		git fetch || return 1
+	fi
+	
+	git archive --prefix=$_realname/ -o "$SRCDEST"/$_realname-$_ver.tar.gz $_gittag
+	scp "$SRCDEST"/$_realname-$_ver.tar.gz dev.alpinelinux.org:/archive/$_realname
+}
+
+
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	return 0
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --root="$pkgdir"
+}
+
+md5sums="3c7632404c4a39d8517f0144ffbd32c6  rtslib-2.1.fb9.tar.gz"
diff --git a/testing/py-simpleparse/APKBUILD b/testing/py-simpleparse/APKBUILD
new file mode 100644
index 0000000000..da06bc6879
--- /dev/null
+++ b/testing/py-simpleparse/APKBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
+pkgname=py-simpleparse
+_realname=SimpleParse
+pkgver=2.1.1
+pkgrel=1
+pkgdesc="Python library providing simple and fast parser generator"
+url="http://launchpad.net/simpleparse"
+arch="all"
+license="BSD"
+depends="python"
+depends_dev="python-dev"
+makedepends="$depends_dev"
+install=
+subpackages=
+source="http://pypi.python.org/packages/source/S/$_realname/$_realname-$pkgver.zip
+	py-simpleparse-eols.patch"
+
+
+_builddir="$srcdir"/$_realname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	return 0
+}
+
+build() {
+	cd "$_builddir"
+	python setup.py build
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --skip-build --root="$pkgdir"
+}
+
+md5sums="e58600b0db786664855cbd49dbc0e4e5  SimpleParse-2.1.1.zip
+b980d7400e2d5a97769330c5c2d927b3  py-simpleparse-eols.patch"
diff --git a/testing/py-simpleparse/py-simpleparse-eols.patch b/testing/py-simpleparse/py-simpleparse-eols.patch
new file mode 100644
index 0000000000..9fc1362243
--- /dev/null
+++ b/testing/py-simpleparse/py-simpleparse-eols.patch
@@ -0,0 +1,33 @@
+=== modified file 'examples/__init__.py'
+--- examples/__init__.py	2008-11-09 22:58:29 +0000
++++ examples/__init__.py	2011-08-17 18:31:28 +0000
+@@ -4,4 +4,4 @@
+ well as a demonstration of using "pre-built"
+ parser nodes (particularly one based on the re
+ module).
+-'''
+\ No newline at end of file
++'''
+
+=== modified file 'examples/simpleexample2_2.py'
+--- examples/simpleexample2_2.py	2008-11-09 22:58:29 +0000
++++ examples/simpleexample2_2.py	2011-08-17 20:06:58 +0000
+@@ -34,4 +34,4 @@
+ 	for testData in testEquality:
+ 		success, children, nextcharacter = parser.parse( testData, production=production)
+ 		assert success and nextcharacter==len(testData), """Wasn't able to parse %s as a %s (%s chars parsed of %s), returned value was %s"""%( repr(testData), production, nextcharacter, len(testData), (success, children, nextcharacter))
+-	
+\ No newline at end of file
++
+
+=== modified file 'examples/vrml.py'
+--- examples/vrml.py	2008-11-09 22:58:29 +0000
++++ examples/vrml.py	2011-08-17 20:07:12 +0000
+@@ -57,4 +57,4 @@
+ 		success, tags, next = parser.parse( data)
+ 		d = time.time()-t
+ 		print "parsed %s characters of %s in %s seconds (%scps)"%( next, len(data), d, next/(d or 0.000000001) )
+-	
+\ No newline at end of file
++
+
diff --git a/testing/rsyslog/APKBUILD b/testing/rsyslog/APKBUILD
index d0e0deb214..e985abbb82 100644
--- a/testing/rsyslog/APKBUILD
+++ b/testing/rsyslog/APKBUILD
@@ -2,12 +2,13 @@
 # Maintainer: cbanta@gmail.com
 pkgname=rsyslog
 pkgver=5.8.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Enhanced multi-threaded syslogd with database support and more."
 url="http://www.rsyslog.com/"
 arch="all"
 license="GPLv3 LGPL-3"
-makedepends="zlib-dev gnutls-dev mysql-dev postgresql-dev net-snmp-dev libnet-dev"
+makedepends="zlib-dev gnutls-dev mysql-dev postgresql-dev net-snmp-dev
+	libnet-dev libgcrypt-dev"
 subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-tls $pkgname-snmp"
 source="http://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
diff --git a/testing/targetcli/APKBUILD b/testing/targetcli/APKBUILD
new file mode 100644
index 0000000000..5d5285a848
--- /dev/null
+++ b/testing/targetcli/APKBUILD
@@ -0,0 +1,63 @@
+# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=targetcli
+pkgver=2.0_rc1_p7
+_ver=${pkgver/_rc/rc}
+_ver=${_ver/_p/.fb}
+pkgrel=1
+pkgdesc="An administration shell for storage targets"
+url="https://github.com/agrover/targetcli-fb"
+arch="noarch"
+license="AGPLv3"
+depends="python py-configobj py-configshell py-ethtool py-ipaddr py-rtslib
+        py-simpleparse"
+depends_dev=
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://dev.alpinelinux.org/archive/targetcli/$pkgname-$_ver.tar.gz"
+
+_giturl="git://github.com/agrover/targetcli-fb.git"
+_gittag=v$_ver
+
+_builddir="$srcdir"/$pkgname
+
+snapshot() {
+	mkdir -p "$srcdir"
+	cd "${SRCDEST:-$srcdir}"
+	if ! [ -d targetcli-fb.git ]; then
+		git clone --bare  $_giturl || return 1
+		cd targetcli-fb.git
+	else
+		cd targetcli-fb.git
+		git fetch || return 1
+	fi
+	
+	git archive --prefix=$pkgname/ -o "$SRCDEST"/$pkgname-$_ver.tar.gz $_gittag
+	scp "$SRCDEST"/$pkgname-$_ver.tar.gz dev.alpinelinux.org:/archive/$pkgname/
+}
+
+
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	python setup.py build
+	gzip targetcli.8
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --root="$pkgdir"
+	install -D -m644 targetcli.8.gz "$pkgdir"/usr/share/man/man8/targetcli.8.gz
+}
+
+md5sums="70952d94edd866d071ab208d95acde48  targetcli-2.0rc1.fb7.tar.gz"
diff --git a/testing/usb-modeswitch/APKBUILD b/testing/usb-modeswitch/APKBUILD
index b237e86c59..e5e86a513c 100644
--- a/testing/usb-modeswitch/APKBUILD
+++ b/testing/usb-modeswitch/APKBUILD
@@ -1,35 +1,30 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=usb-modeswitch
-pkgver=1.1.7
-pkgrel=2
-_pkgdata=20110227
+pkgver=1.2.3
+pkgrel=0
+_pkgdata=20120120
 pkgdesc="A mode switching tool for controlling flip flop (multiple device) USB gear"
 url="http://www.draisberghof.de/usb_modeswitch/"
 arch="all"
 license="GPL"
 depends="tcl"
-makedepends="libusb-compat-dev"
+makedepends="libusb-compat-dev coreutils"
 install=
 subpackages="$pkgname-doc"
 source="http://www.draisberghof.de/usb_modeswitch/${pkgname}-${pkgver}.tar.bz2
 	http://www.draisberghof.de/usb_modeswitch/${pkgname}-data-${_pkgdata}.tar.bz2
-	usb_modeswitch.setup
-	Makefile.patch"
+	usb_modeswitch.setup"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
-	mkdir -p $pkgdir/lib/udev/usb_modeswitch || return 1
-	mkdir -p $pkgdir/etc || return 1
-	mkdir -p $pkgdir/usr/share/man/man1 || return 1
 	make clean || return 1
 	sed -i -e 's/--mode=/-m/' Makefile || return 1
 	
 	cd ../${pkgname}-data-${_pkgdata}
 #	sed -i -e 's%install -m644 -t $(PREFIX)/share/usb_modeswitch ./usb_modeswitch.d/*%cp -R $(PREFIX)/share/usb_modeswitch/* ./usb_modeswitch.d/%' Makefile || return 1
 	sed -i -e 's/--mode=/-m/' Makefile || return 1
-	patch -p1 < ../Makefile.patch
 }
 
 build() {
@@ -54,7 +49,6 @@ package() {
 	cp $srcdir/usb_modeswitch.setup $pkgdir/etc/ || return 1
 }
 
-md5sums="b75e42b7b2d30e9d4cbd5c159f925247  usb-modeswitch-1.1.7.tar.bz2
-2f5e5bfa21a97b705a22f95bec367793  usb-modeswitch-data-20110227.tar.bz2
-9a25756669937ac86774bb55733f09cd  usb_modeswitch.setup
-84de2517de202c22801b678f49a07e37  Makefile.patch"
+md5sums="9b29e8b0d93d7604a9e5efc4696d37a3  usb-modeswitch-1.2.3.tar.bz2
+c899cc9c71bb35f3ec600b7cd1455c65  usb-modeswitch-data-20120120.tar.bz2
+9a25756669937ac86774bb55733f09cd  usb_modeswitch.setup"
diff --git a/testing/varnish/APKBUILD b/testing/varnish/APKBUILD
index 97e1cfcb69..c6b111cf6c 100644
--- a/testing/varnish/APKBUILD
+++ b/testing/varnish/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=varnish
 pkgver=3.0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="High-performance HTTP accelerator"
 url="http://www.varnish-cache.org/"
 arch="all"
diff --git a/testing/vlc/APKBUILD b/testing/vlc/APKBUILD
deleted file mode 100644
index 50e6d67972..0000000000
--- a/testing/vlc/APKBUILD
+++ /dev/null
@@ -1,216 +0,0 @@
-# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=vlc
-pkgver=2.0.0_rc1
-_pkgver=${pkgver/_/-}
-pkgrel=4
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-pkgusers="vlc"
-pkggroups="vlc"
-url="http://www.videolan.org/vlc/"
-arch="all"
-license="GPL-2"
-triggers="$pkgname.trigger=/usr/lib/vlc/plugins"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-xorg $pkgname-daemon"
-#depends="fluidsynth zvbi lirc-utils libdca
-#	libproxy libcddb smbclient
-#	libmpcdec libmodplug"
-depends="ttf-dejavu"
-makedepends="
-	a52dec-dev
-	alsa-lib-dev
-	automake
-	autoconf
-	avahi-dev
-	libtool
-	dbus-dev
-	faad2-dev
-	ffmpeg-dev
-	flac-dev
-	freetype-dev
-	fribidi-dev
-	gtk+-dev
-	libbluray-dev>=0.2.1 libbluray-dev<20100000
-	libdc1394-dev>=2.1.0
-	libdvbpsi-dev
-	libdvdnav-dev
-	libdvdread-dev
-	libgcrypt-dev
-	libice-dev
-	libiconv-dev
-	libmad-dev
-	libmatroska-dev
-	libmpeg2-dev
-	libnotify-dev
-	libogg-dev
-	libraw1394-dev>=2.0.1
-	libshout-dev
-	libsm-dev
-	libtheora-dev
-	libvorbis-dev
-	libx11-dev
-	libxext-dev
-	libxinerama-dev
-	libxpm-dev
-	libxv-dev
-	live-media-dev>=2012.01.26
-	lua-dev
-	ncurses-dev
-	mesa-dev
-	pkgconfig
-	qt-dev
-	sdl-dev
-	speex-dev
-	sysfsutils-dev
-	taglib-dev
-	v4l-utils-dev
-	x264-dev
-	xcb-util-renderutil-dev
-	xcb-util-keysyms-dev
-	"
-source="http://download.videolan.org/pub/videolan/testing/$pkgname-$_pkgver/$pkgname-$_pkgver.tar.xz
-	uclibc-inhibit-spawn.patch
-	uclibc-no-xscreensaver.patch
-	uclibc3.patch
-	vlc.trigger
-	"
-#	uclibc-libcompat.patch
-#	vlc-1.1.7-disable-cache-gen.patch
-
-_builddir="$srcdir"/$pkgname-$_pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || return 1
-			;;
-		esac;
-	done
-	sed -i -e "/^libxscreensaver_plugin_la_SOURCES/s/^/#/" modules/misc/Modules.am
-	./bootstrap
-}
-
-build ()
-{
-	cd "$_builddir"
-	sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c
-
-	# -fpermissive is needed due to zlib 1.2.6 changing
-	# void* to gzFile on gz*() functions
-	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
-	export CXXFLAGS="$CXXFLAGS -fpermissive"
-
-	./configure --prefix=/usr \
-		--disable-mmx \
-		--disable-nls \
-		--disable-optimizations \
-		--disable-rpath \
-		--enable-a52 \
-		--enable-avcodec \
-		--enable-avformat \
-		--enable-bluray \
-		--enable-dbus \
-		--enable-dbus-control \
-		--enable-dc1394 \
-		--enable-dvbpsi \
-		--enable-dvdread \
-		--enable-dvdnav \
-		--enable-faad \
-		--enable-flac \
-		--enable-httpd \
-		--enable-live555 \
-		--enable-matroska \
-		--enable-merge-ffmpeg \
-		--enable-ncurses \
-		--enable-qt4 \
-		--enable-realrtsp \
-		--enable-sdl \
-		--enable-shout \
-		--enable-skins2 \
-		--enable-speex \
-		--enable-sout \
-		--enable-taglib \
-		--enable-theora \
-		--enable-v4l2 \
-		--enable-vlm \
-		--enable-vorbis \
-		--enable-wma-fixed \
-		--enable-xvideo \
-		|| return 1
-
-#		--enable-dvb \
-#		--enable-snapshot \
-#		--enable-hal \
-#		--enable-lirc \
-#		--enable-pvr \
-
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	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
-	# delete cache as it's autocreated by trigger
-	rm -rf "$pkgdir"/usr/lib/vlc/plugins/plugins.dat
-	# delete unneeded mozilla and kde support files
-	rm -rf "$pkgdir"/usr/lib/mozilla
-	rm -rf "$pkgdir"/usr/share/kde4
-	find "$pkgdir" -name '*.la' -delete
-}
-
-_mv() {
-	local dir=${1%/*}
-	mkdir -p "$subpkgdir"/$dir
-	mv "$1" "$subpkgdir"/$dir/
-}
-
-xorg() {
-	pkgdesc="Video LAN X.org support"
-	depends="xdg-utils vlc>=2.0.0_rc1-r4"
-
-	# scan for elf files that directly or indirectly depends on
-	# libX* libraries
-	cd "$pkgdir"
-	for i in $(find -type f ); do
-		if ldd $i 2>/dev/null | grep -E -q "libX|x11|libxcb"; then
-			echo $i | grep libavcodec_plugin.so || _mv "$i" || return 1
-		fi
-	done
-
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/[qs]vlc \
-		"$subpkgdir"/usr/bin
-
-	mkdir -p "$subpkgdir"/usr/share/vlc
-	mv "$pkgdir"/usr/share/applications \
-		"$pkgdir"/usr/share/icons \
-		"$subpkgdir"/usr/share/
-
-	mv "$pkgdir"/usr/share/vlc/skins2 \
-		"$subpkgdir"/usr/share/vlc
-}
-
-daemon() {
-	pkgdesc="Support for running VLC as a daemon"
-	install="vlc-daemon.pre-install"
-	arch="noarch"
-	depends="vlc>=2.0.0_rc1-r0"
-
-	mkdir -p "$subpkgdir"
-	cd "$pkgdir"
-	install -D -m755 ../../vlc.initd $subpkgdir/etc/init.d/vlc
-	install -D -m664 ../../vlc.confd $subpkgdir/etc/conf.d/vlc
-	install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc
-}
-
-md5sums="8c4bfbc5e79ff0bdfff572d53b03a92a  vlc-2.0.0-rc1.tar.xz
-28349b8239fdd6987fbe0ca2c758517f  uclibc-inhibit-spawn.patch
-b84c5a9121440b6a1dcf28792d783eb8  uclibc-no-xscreensaver.patch
-94f11ec8394775018222781a0c875444  uclibc3.patch
-350b30698eb784def7d19446eb1d6c81  vlc.trigger"
diff --git a/testing/vlc/uclibc-inhibit-spawn.patch b/testing/vlc/uclibc-inhibit-spawn.patch
deleted file mode 100644
index c34ebe0f7b..0000000000
--- a/testing/vlc/uclibc-inhibit-spawn.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c
-index 3f297c6..e16a21e 100644
---- a/modules/misc/inhibit/xdg.c
-+++ b/modules/misc/inhibit/xdg.c
-@@ -27,7 +27,11 @@
- #include <vlc_inhibit.h>
- #include <assert.h>
- #include <signal.h>
--#include <spawn.h>
-+#if !defined(_POSIX_SPAWN)
-+# define _POSIX_SPAWN -1
-+#else
-+# include <spawn.h>
-+#endif
- #include <sys/wait.h>
- 
- static int Open (vlc_object_t *);
-@@ -47,7 +51,9 @@ struct vlc_inhibit_sys
-     vlc_thread_t thread;
-     vlc_cond_t update, inactive;
-     vlc_mutex_t lock;
-+#if (_POSIX_SPAWN >= 0)
-     posix_spawnattr_t attr;
-+#endif
-     bool suspend, suspended;
- };
- 
-@@ -67,17 +73,19 @@ static int Open (vlc_object_t *obj)
-     vlc_mutex_init (&p_sys->lock);
-     vlc_cond_init (&p_sys->update);
-     vlc_cond_init (&p_sys->inactive);
--    posix_spawnattr_init (&p_sys->attr);
-     /* Reset signal handlers to default and clear mask in the child process */
-     {
-         sigset_t set;
- 
-         sigemptyset (&set);
--        posix_spawnattr_setsigmask (&p_sys->attr, &set);
-         sigaddset (&set, SIGPIPE);
-+#if (_POSIX_SPAWN >= 0)
-+        posix_spawnattr_init (&p_sys->attr);
-+        posix_spawnattr_setsigmask (&p_sys->attr, &set);
-         posix_spawnattr_setsigdefault (&p_sys->attr, &set);
-         posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF
-                                               | POSIX_SPAWN_SETSIGMASK);
-+#endif
-     }
-     p_sys->suspend = false;
-     p_sys->suspended = false;
-@@ -106,7 +114,9 @@ static void Close (vlc_object_t *obj)
- 
-     vlc_cancel (p_sys->thread);
-     vlc_join (p_sys->thread, NULL);
-+#if (_POSIX_SPAWN >= 0)
-     posix_spawnattr_destroy (&p_sys->attr);
-+#endif
-     vlc_cond_destroy (&p_sys->inactive);
-     vlc_cond_destroy (&p_sys->update);
-     vlc_mutex_destroy (&p_sys->lock);
-@@ -153,8 +163,16 @@ static void *Thread (void *data)
-         pid_t pid;
- 
-         vlc_mutex_unlock (&p_sys->lock);
-+#if (_POSIX_SPAWN >= 0)
-         if (!posix_spawnp (&pid, "xdg-screensaver", NULL, &p_sys->attr,
-                            argv, environ))
-+#else
-+        pid = fork();
-+        if (pid == 0) {
-+            execvp("xdg-screensaver", argv);
-+            exit(1);
-+        } else if (pid > 0)
-+#endif
-         {
-             int status;
- 
diff --git a/testing/vlc/uclibc-no-xscreensaver.patch b/testing/vlc/uclibc-no-xscreensaver.patch
deleted file mode 100644
index b4e1acef6e..0000000000
--- a/testing/vlc/uclibc-no-xscreensaver.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- vlc-2.0.0-rc1.orig/modules/misc/Modules.am
-+++ vlc-2.0.0-rc1/modules/misc/Modules.am
-@@ -26,14 +26,9 @@
- libxdg_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
- libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD)
- libxdg_screensaver_plugin_la_DEPENDENCIES =
--libxscreensaver_plugin_la_SOURCES = inhibit/xscreensaver.c
--libxscreensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
--libxscreensaver_plugin_la_LIBADD = $(AM_LIBADD)
--libxscreensaver_plugin_la_DEPENDENCIES =
- if HAVE_XCB
- libvlc_LTLIBRARIES += \
--	libxdg_screensaver_plugin.la \
--	libxscreensaver_plugin.la
-+	libxdg_screensaver_plugin.la
- endif
- 
- libmce_plugin_la_SOURCES = inhibit/mce.c
diff --git a/testing/vlc/uclibc3.patch b/testing/vlc/uclibc3.patch
deleted file mode 100644
index e57d6dd5f0..0000000000
--- a/testing/vlc/uclibc3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- vlc-2.0.0-rc1.orig/src/posix/linux_specific.c
-+++ vlc-2.0.0-rc1/src/posix/linux_specific.c
-@@ -83,14 +83,14 @@
-     unsigned refs;
- } once = { VLC_STATIC_MUTEX, 0 };
- 
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- # include <gnu/libc-version.h>
- # include <stdlib.h>
- #endif
- 
- void system_Init (void)
- {
--#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,
---- vlc-2.0.0-rc1.orig/src/posix/thread.c
-+++ vlc-2.0.0-rc1/src/posix/thread.c
-@@ -1165,6 +1165,16 @@
-     return vlc_atomic_swap (&timer->overruns, 0);
- }
- 
-+#if defined(HAVE_SCHED_GETAFFINITY) && !defined(CPU_COUNT)
-+static unsigned CPU_COUNT(cpu_set_t *cpu)
-+{
-+    unsigned i, count = 0;
-+    for (i = 0; i < CPU_SETSIZE; i++)
-+        if (CPU_ISSET(i, cpu))
-+            count++;
-+    return count;
-+}
-+#endif
- 
- /**
-  * Count CPUs.
diff --git a/testing/vlc/vlc-1.1.7-disable-cache-gen.patch b/testing/vlc/vlc-1.1.7-disable-cache-gen.patch
deleted file mode 100644
index b8a3dd9551..0000000000
--- a/testing/vlc/vlc-1.1.7-disable-cache-gen.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/modules/Makefile.am
-+++ b/modules/Makefile.am
-@@ -63,7 +63,8 @@
- 
- stamp-cache:
- 	$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
--		../bin/vlc-cache-gen$(EXEEXT) . ; \
-+		# ../bin/vlc-cache-gen$(EXEEXT) . ; \
-+		echo "FIXME: vlc-cache-gen" ; \
- 	else \
- 		echo "Cross-compilation: cache generation skipped!" ; \
- 	fi
diff --git a/testing/vlc/vlc-daemon.pre-install b/testing/vlc/vlc-daemon.pre-install
deleted file mode 100644
index 72ee1b7ff8..0000000000
--- a/testing/vlc/vlc-daemon.pre-install
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-groups="vlc audio video"
-for group in $groups; do
-	addgroup -S $group 2>/dev/null
-done
-adduser -S -h /home/vlc -s /bin/sh -G vlc -D vlc 2>/dev/null
-
-# make sure vlc are in all groups
-for group in $groups; do
-	addgroup vlc $group 2>/dev/null
-done
-exit 0
diff --git a/testing/vlc/vlc.confd b/testing/vlc/vlc.confd
deleted file mode 100644
index c42344b606..0000000000
--- a/testing/vlc/vlc.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Sample vlc params suitable for running as a daemon
-
-## --daemon			detach from prompt
-## --file-logging		enable file logging
-## --logfile			logfile name/path
-## -vvv				verbose logging
-## -I dummy			disable X11 interface
-## --sout PARAMS		encoding parameters
-##				Do NOT quote 'PARAMS' otherwise shell expansions will broke vlc
-
-VLC_OPTS="-vvv -I dummy alsa://hw:0,0 --daemon --file-logging --logfile /var/log/vlc/vlc.log --sout #transcode{acodec=mp3,ab=48,channels=1,samplerate=22050}:std{access=http,mux=ogg,dst=:8080}"
diff --git a/testing/vlc/vlc.initd b/testing/vlc/vlc.initd
deleted file mode 100755
index 11567dcd86..0000000000
--- a/testing/vlc/vlc.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting VLC"
-	start-stop-daemon --start \
-		--user vlc \
-		--exec /usr/bin/vlc -- ${VLC_OPTS}
-	eend $?
-}
-
-stop () {
-	ebegin "Stopping VLC"
-	start-stop-daemon --stop \
-		--signal KILL \
-		--exec /usr/bin/vlc
-	eend $?
-}
-
diff --git a/testing/vlc/vlc.trigger b/testing/vlc/vlc.trigger
deleted file mode 100644
index d7322fcb16..0000000000
--- a/testing/vlc/vlc.trigger
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec /usr/lib/vlc/vlc-cache-gen "$@"
-
diff --git a/testing/wanpipe-grsec/APKBUILD b/testing/wanpipe-grsec/APKBUILD
new file mode 100644
index 0000000000..2a249eb390
--- /dev/null
+++ b/testing/wanpipe-grsec/APKBUILD
@@ -0,0 +1,67 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+_flavor=${FLAVOR:-grsec}
+_realname=wanpipe
+_name=$_realname-$_flavor
+
+_kver=3.2.11
+_kpkgrel=0
+
+# source the kernel version
+if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
+	. ../../main/linux-$_flavor/APKBUILD
+	[ "$_kver" != "$pkgver" ] && die "$_name: Please update _kver to $pkgver"
+	[ "$_kpkgrel" != "$pkgrel" ] && die "$_name: Please update _kpkgrel to $pkgrel"
+fi
+
+_kernelver=$_kver-r$_kpkgrel
+_abi_release=$_kver-${_flavor}
+
+pkgname=$_name
+pkgver=$_kver
+_realver=3.5.25
+_mypkgrel=0
+pkgrel=$(($_kpkgrel + $_mypkgrel))
+pkgdesc="Sangoma Wanpipe drivers for $_flavor kernel"
+url="http://wiki.sangoma.com/wanpipe-linux-drivers"
+arch="all"
+license="GPL"
+depends="linux-${_flavor}=${_kernelver}"
+makedepends="linux-${_flavor}-dev=${_kernelver} bison libtool flex bash
+	dahdi-linux-dev autoconf"
+install=
+install_if="linux-$_flavor=$_kernelver $_realname"
+subpackages=
+source="ftp://ftp.sangoma.com/linux/current_wanpipe/wanpipe-$_realver.tgz
+	constify.patch"
+
+# override kernel's prepare()
+prepare() {
+	cd "$srcdir/$_realname-$_realver"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$srcdir/$_realname-$_realver"
+	export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
+
+	make CC="${CC:-gcc}" \
+		KVER=$_abi_release \
+		DAHDI_DIR=/usr/src/dahdi-headers-$_abi_release \
+		all_kmod_dahdi || return 1
+}
+
+package() {
+	cd "$srcdir/$_realname-$_realver"
+	make CC="${CC:-gcc}" \
+		KVER=$_abi_release \
+		DAHDI_DIR=/usr/src/dahdi-headers-$_abi_release \
+		DESTDIR="$pkgdir" \
+		install_kmod || return 1
+}
+
+md5sums="96700bece0d358bb12af9491d2730304  wanpipe-3.5.25.tgz
+c05de38644472046f63985e03228205d  constify.patch"
diff --git a/testing/wanpipe-grsec/constify.patch b/testing/wanpipe-grsec/constify.patch
new file mode 100644
index 0000000000..dfd78eca7d
--- /dev/null
+++ b/testing/wanpipe-grsec/constify.patch
@@ -0,0 +1,134 @@
+diff --git a/patches/kdrivers/include/if_wanpipe_common.h b/patches/kdrivers/include/if_wanpipe_common.h
+index e7f4fca..1bf0c1b 100644
+--- a/patches/kdrivers/include/if_wanpipe_common.h
++++ b/patches/kdrivers/include/if_wanpipe_common.h
+@@ -49,7 +49,7 @@ typedef struct {
+ #if defined (__LINUX__)
+        int     (*change_mtu)(netdevice_t *dev, int new_mtu);
+ #endif
+-} wanpipe_common_iface_t;
++} __no_const wanpipe_common_iface_t;
+ 
+ typedef struct wanpipe_common {
+ #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+diff --git a/patches/kdrivers/include/sdla_front_end.h b/patches/kdrivers/include/sdla_front_end.h
+index 11d7f3c..61bb8a2 100644
+--- a/patches/kdrivers/include/sdla_front_end.h
++++ b/patches/kdrivers/include/sdla_front_end.h
+@@ -630,7 +630,7 @@ typedef struct {
+ 	/* Enable/Disable Clock recovery from the line */
+ 	int		(*clock_ctrl)(sdla_fe_t*, u_int8_t /* WANOPT_NO/WANOPT_YES */);
+ 	u_int32_t 	(*read_tx_alarm)(sdla_fe_t *fe, int);
+-} sdla_fe_iface_t;
++} __no_const sdla_fe_iface_t;
+ 
+ /* 
+ ** Sangoma Front-End interface structure (new version)
+diff --git a/patches/kdrivers/include/sdladrv.h b/patches/kdrivers/include/sdladrv.h
+index 4398f4c..5e34811 100644
+--- a/patches/kdrivers/include/sdladrv.h
++++ b/patches/kdrivers/include/sdladrv.h
+@@ -743,7 +743,7 @@ typedef struct sdlahw_iface
+ 	int		(*usb_flush_err_stats)(void *phw);
+ 	void		(*reset_fe)(void*);            
+ 
+-} sdlahw_iface_t;
++} __no_const sdlahw_iface_t;
+ 
+ typedef struct sdla_hw_type_cnt
+ {
+@@ -772,7 +772,7 @@ typedef struct sdla_hw_type_cnt
+ typedef struct sdladrv_callback_ {
+ 	int (*add_device)(void);
+ 	int (*delete_device)(char*);
+-} sdladrv_callback_t;
++} __no_const sdladrv_callback_t;
+ 
+ #if defined(SDLADRV_HW_IFACE)
+ typedef struct sdladrv_hw_probe_iface {
+diff --git a/patches/kdrivers/include/wanpipe_cdev_iface.h b/patches/kdrivers/include/wanpipe_cdev_iface.h
+index bccf2e2..486572e 100644
+--- a/patches/kdrivers/include/wanpipe_cdev_iface.h
++++ b/patches/kdrivers/include/wanpipe_cdev_iface.h
+@@ -32,7 +32,7 @@ typedef struct wanpipe_cdev_ops
+ 	/* handle transmission time out */
+ 	int (*tx_timeout)(void* dev_ptr);
+ 
+-}wanpipe_cdev_ops_t;
++} __no_const wanpipe_cdev_ops_t;
+ 
+ 
+ 
+diff --git a/patches/kdrivers/include/wanpipe_defines.h b/patches/kdrivers/include/wanpipe_defines.h
+index 9c62b8d..5269262 100644
+--- a/patches/kdrivers/include/wanpipe_defines.h
++++ b/patches/kdrivers/include/wanpipe_defines.h
+@@ -895,7 +895,7 @@ typedef struct wan_rtp_pkt {
+ 
+ #if defined(HAVE_NET_DEVICE_OPS) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
+ 
+-#define WAN_DECLARE_NETDEV_OPS(_ops_name) static struct net_device_ops _ops_name = {0};
++#define WAN_DECLARE_NETDEV_OPS(_ops_name) static net_device_ops_no_const _ops_name = {0};
+ 
+ #define WAN_NETDEV_OPS_BIND(dev,_ops_name)  dev->netdev_ops = &_ops_name
+ 
+diff --git a/patches/kdrivers/include/wanpipe_wanrouter.h b/patches/kdrivers/include/wanpipe_wanrouter.h
+index 7b2a919..4a05fa5 100644
+--- a/patches/kdrivers/include/wanpipe_wanrouter.h
++++ b/patches/kdrivers/include/wanpipe_wanrouter.h
+@@ -362,7 +362,7 @@ typedef struct wan_device
+ 		void	(*ringdetect) (void* card_id, wan_event_t*);	
+ 		void	(*linkstatus) (void* card_id, wan_event_t*);
+ 		void	(*polarityreverse) (void* card_id, wan_event_t*);
+-	} event_callback;
++	} __no_const event_callback;
+ 	
+ 	unsigned char 		ignore_front_end_status;
+ 	unsigned char		line_idle;
+diff --git a/patches/kdrivers/src/net/sdladrv.c b/patches/kdrivers/src/net/sdladrv.c
+index 22d4b4f..d5b9fbb 100644
+--- a/patches/kdrivers/src/net/sdladrv.c
++++ b/patches/kdrivers/src/net/sdladrv.c
+@@ -343,12 +343,12 @@ static unsigned	sdla_test_memregion (sdlahw_t* hw, unsigned len);
+ static unsigned short sdla_checksum (unsigned char* buf, unsigned len);
+ static int sdla_init_pci_slot(sdlahw_t *);
+ 
+-static sdlahw_card_t* sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, char*);
++static sdlahw_card_t* sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, const char*);
+ static int sdla_card_unregister (sdlahw_card_t*);
+-static sdlahw_card_t* sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, char*);
++static sdlahw_card_t* sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, const char*);
+ static int sdla_card_info(sdlahw_card_t*);
+ 
+-sdlahw_cpu_t* sdla_hwcpu_search(u8, int, int, int, int, char*);
++sdlahw_cpu_t* sdla_hwcpu_search(u8, int, int, int, int, const char*);
+ static sdlahw_cpu_t* sdla_hwcpu_register(sdlahw_card_t*, int, int, void*);
+ static int sdla_hwcpu_unregister(sdlahw_cpu_t*);
+ static int sdla_hwcpu_info(sdlahw_cpu_t*);
+@@ -4339,7 +4339,7 @@ static int sdla_card_info(sdlahw_card_t *hwcard)
+ }
+ 
+ static sdlahw_card_t*
+-sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, char *bus_id)
++sdla_card_register(u8 hw_type, int bus_no, int slot_no, int ioport, const char *bus_id)
+ {
+ 	sdlahw_card_t	*new_hwcard, *last_hwcard;
+ 
+@@ -4408,7 +4408,7 @@ sdla_card_unregister(sdlahw_card_t* hwcard)
+ }
+ 
+ static sdlahw_card_t*
+-sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, char *bus_id)
++sdla_card_search(u8 hw_type, int bus_no, int slot_no, int ioport, const char *bus_id)
+ {
+ 	sdlahw_card_t*	tmp;
+ 	
+@@ -4547,7 +4547,7 @@ static int sdla_hwcpu_unregister(sdlahw_cpu_t *hwcpu)
+ }
+ 
+ sdlahw_cpu_t*
+-sdla_hwcpu_search(u8 hw_type, int bus_no, int slot_no, int ioport, int cpu_no, char *bus_id)
++sdla_hwcpu_search(u8 hw_type, int bus_no, int slot_no, int ioport, int cpu_no, const char *bus_id)
+ {
+ 	sdlahw_cpu_t*	tmp;
+ 	
diff --git a/testing/xf86-video-openchrome/APKBUILD b/testing/xf86-video-openchrome/APKBUILD
new file mode 100644
index 0000000000..569a89e28e
--- /dev/null
+++ b/testing/xf86-video-openchrome/APKBUILD
@@ -0,0 +1,58 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xf86-video-openchrome
+pkgver=0.3.0_pre20120306
+_ver=${pkgver/_/-}
+pkgrel=0
+pkgdesc="X.Org driver for VIA/S3G cards"
+url="http://xorg.freedesktop.org/"
+arch="all"
+license="custom"
+subpackages="$pkgname-doc"
+depends=
+makedepends="pkgconfig xorg-server-dev libxi-dev libxvmc-dev fontsproto glproto
+	randrproto videoproto renderproto xf86driproto mesa-dev util-macros
+	autoconf automake libtool
+	"
+
+source="http://www.infradead.org/~jsimmons/xf86-video-openchrome-$_ver.tbz
+	openchrome.xinf
+	"
+
+_builddir="$srcdir"/xf86-video-openchrome-$_ver
+unpack() {
+	cd "$srcdir"
+	for i in $source; do
+		case $i in
+		*.tbz) tar -jxf "$srcdir"/${i##*/} || return 1;;
+		esac
+	done
+}
+
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p0 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+	./autogen.sh
+}
+	
+build() {
+	cd "$_builddir"
+	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
+	./configure --prefix=/usr || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" -name '*.la' -delete
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+	install -Dm644 "$srcdir"/openchrome.xinf \
+		"$pkgdir"/usr/share/hwdata/videoaliases/openchrome.xinf
+}
+
+md5sums="9b085ca54974f14b454bdeaf8dc1c089  xf86-video-openchrome-0.3.0-pre20120306.tbz
+d6906087f0e93ea2d98e553f4dfbcc97  openchrome.xinf"
diff --git a/testing/xf86-video-openchrome/openchrome.xinf b/testing/xf86-video-openchrome/openchrome.xinf
new file mode 100644
index 0000000000..7b15c911a9
--- /dev/null
+++ b/testing/xf86-video-openchrome/openchrome.xinf
@@ -0,0 +1,39 @@
+# NOTE: Comments in openchrome 0.2.1 driver source indicate this device does not
+# exist in the wild, so it has been disabled for now.
+#alias pcivideo:v00001106d00003022sv*sd*bc*sc*i* openchrome
+
+# 1106:3108 - K8M800 (PCI_CHIP_VT3204)
+alias pcivideo:v00001106d00003108sv*sd*bc*sc*i* openchrome
+
+# 1106:3118 - PM800/PM880/CN400 (PCI_CHIP_VT3259)
+alias pcivideo:v00001106d00003118sv*sd*bc*sc*i* openchrome
+
+# 1106:3122 - CLE266 (PCI_CHIP_CLE3122)
+alias pcivideo:v00001106d00003122sv*sd*bc*sc*i* openchrome
+
+# 1106:7205 - KM400/KN400 (PCI_CHIP_VT3205)
+alias pcivideo:v00001106d00007205sv*sd*bc*sc*i* openchrome
+
+# 1106:3344 - VM800 (PCI_CHIP_VT3314)
+alias pcivideo:v00001106d00003344sv*sd*bc*sc*i* openchrome
+
+# 1106:3157 - CX700 (PCI_CHIP_VT3324)
+alias pcivideo:v00001106d00003157sv*sd*bc*sc*i* openchrome
+
+# 1106:3343 - P4M890 (PCI_CHIP_VT3327)
+alias pcivideo:v00001106d00003343sv*sd*bc*sc*i* openchrome
+
+# 1106:3230 - K8M890 (PCI_CHIP_VT3336)
+alias pcivideo:v00001106d00003230sv*sd*bc*sc*i* openchrome
+
+# 1106:3371 - P4M900 (PCI_CHIP_VT3364)
+alias pcivideo:v00001106d00003371sv*sd*bc*sc*i* openchrome
+
+# 1106:1122 - VX800 (PCI_CHIP_VT3353)
+alias pcivideo:v00001106d00001122sv*sd*bc*sc*i* openchrome
+
+# 1106:5122 - VX855 (PCI_CHIP_VT3409)
+alias pcivideo:v00001106d00005122sv*sd*bc*sc*i* openchrome
+
+# 1106:7122 - VX855 (PCI_CHIP_VT3410)
+alias pcivideo:v00001106d00007122sv*sd*bc*sc*i* openchrome
diff --git a/testing/xmlrpc-c/APKBUILD b/testing/xmlrpc-c/APKBUILD
index b328130a90..5be55ac008 100644
--- a/testing/xmlrpc-c/APKBUILD
+++ b/testing/xmlrpc-c/APKBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xmlrpc-c
-pkgver=1.16.35
-pkgrel=1
+pkgver=1.16.40
+pkgrel=0
 pkgdesc="This library provides a modular implementation of XML-RPC for C and C++"
 url="http://xmlrpc-c.sourceforge.net/"
-arch="x86"
+arch="all"
 license="custom:xmlrpc-c"
 depends=
 makedepends="libtool curl-dev libxml2-dev zlib-dev"
@@ -52,5 +52,5 @@ cxx() {
 	mv "$pkgdir"/usr/lib/*++* "$subpkgdir"/usr/lib/
 }
 
-md5sums="eed7ef8078800e4822d753bac9d2fa1c  xmlrpc-c-1.16.35.tgz
+md5sums="0b5c026d48c21937261d90bdadda7248  xmlrpc-c-1.16.40.tgz
 101c2224b2338247097f96b03e206261  xmlrpc-c-curl.patch"