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

70 files changed, 1416 insertions, 2193 deletions

diff --git a/testing/dhex/APKBUILD b/testing/dhex/APKBUILD
new file mode 100644
index 000000000..d205c4784
--- /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 000000000..9e7788b40
--- /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/firefox/APKBUILD b/testing/firefox/APKBUILD
deleted file mode 100644
index 757ab6f2c..000000000
--- a/testing/firefox/APKBUILD
+++ /dev/null
@@ -1,122 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=firefox
-pkgver=10.0
-_pkgver=$pkgver
-_xulver=10.0
-pkgrel=3
-pkgdesc="firefox web browser"
-url="http://www.firefox.com"
-arch="all"
-license="GPL LGPL MPL"
-depends="xulrunner>=${_xulver}"
-makedepends="xulrunner-dev>=${_xulver}
-
-	     nspr-dev
-	     nss-dev
-	     gtk+-dev
-             mesa-dev
-             dbus-glib-dev
-             alsa-lib-dev
-             libvorbis-dev
-             libogg-dev
-             libtheora-dev
-             wireless-tools-dev
-             libnotify-dev
-             libevent-dev
-	     libvpx-dev
-             libxt-dev
-             jpeg-dev
-             bzip2-dev
-             hunspell-dev
-             startup-notification-dev
-             sqlite-dev
-             libidl-dev
-
-	     autoconf2.13
-
-	     python
-	     zip
-	     yasm
-
-	     autoconf
-	     automake
-	     libtool
-
-	     paxctl"
-install=""
-subpackages=""
-source="http://releases.mozilla.org/pub/mozilla.org/${pkgname}/releases/${pkgver}/source/${pkgname}-${_pkgver}.source.tar.bz2
-	mozconfig
-	firefox-5.0-asciidel.patch
-	firefox.desktop
-	firefox-safe.desktop"
-
-options="!strip"
-
-_builddir="${srcdir}/mozilla-release"
-_mozappdir=/usr/lib/firefox-$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
-
-	cp "${srcdir}/mozconfig" .mozconfig
-	echo "ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)" >> .mozconfig
-	echo "ac_add_options --enable-debug-symbols" >> .mozconfig
-	echo "ac_add_options --disable-install-strip" >>.mozconfig
-}
-
-build() {
-	cd "$_builddir"
-
-	# mozilla's buildsystem is on drugs
-	export CFLAGS="$(echo $CFLAGS | sed -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')"
-	export CXXFLAGS="$CFLAGS"
-
-#	export LDFLAGS="-Wl,-rpath,${_mozappdir}"
-	make -j1 -f client.mk build \
-		STRIP="/bin/true" \
-		MOZ_MAKE_FLAGS="$MAKEOPTS" || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" -f client.mk install || return 1
-
-	install -m755 -d ${pkgdir}/usr/share/applications
-	install -m755 -d ${pkgdir}/usr/share/pixmaps
-	install -m644 "$_builddir"/browser/branding/official/default48.png \
-		${pkgdir}/usr/share/pixmaps/firefox.png || return 1
-	install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/firefox.desktop
-	install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/firefox-safe.desktop
-
-	# firefox currently does not work with mprotect. disable it for now
-	paxctl -c -m "$pkgdir"/$_mozappdir/firefox || return 1
-
-	# xulrunner stub launcher has changed to using a symlink overlay...
-	# go figure
-	ln -sf /usr/lib/xulrunner-${_xulver} ${pkgdir}/$_mozappdir/xulrunner
-
-	# launcher as symlink is broken from firefox-7.0
-	rm "$pkgdir"/usr/bin/firefox || return 1
-	cat > "$pkgdir"/usr/bin/firefox << __EOF__
-#!/bin/sh
-
-exec $_mozappdir/firefox "\$@"
-__EOF__
-	chmod 755 "$pkgdir"/usr/bin/firefox
-}
-
-md5sums="13c61203ccfa583e5a54b4dc22f41233  firefox-10.0.source.tar.bz2
-3ba2cb7cda675e78eb0eeb0652ee3457  mozconfig
-2328df219e042f6aaec361cbf83cf9e9  firefox-5.0-asciidel.patch
-ba96924ece1d77453e462429037a2ce5  firefox.desktop
-6f38a5899034b7786cb1f75ad42032b8  firefox-safe.desktop"
diff --git a/testing/firefox/firefox-5.0-asciidel.patch b/testing/firefox/firefox-5.0-asciidel.patch
deleted file mode 100644
index 1916cb3b8..000000000
--- a/testing/firefox/firefox-5.0-asciidel.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Patch from: Bill Nottingham <notting@redhat.com>
-
-diff -up mozilla-release/browser/base/Makefile.in.fu mozilla-release/browser/base/Makefile.in
---- mozilla-release/browser/base/Makefile.in.fu	2011-06-24 16:50:23.802042086 -0400
-+++ mozilla-release/browser/base/Makefile.in	2011-06-24 16:50:42.324042096 -0400
-@@ -62,7 +62,7 @@ EXTRA_JS_MODULES = \
- 
- include $(topsrcdir)/config/rules.mk
- 
--PRE_RELEASE_SUFFIX := ""
-+PRE_RELEASE_SUFFIX :=
- 
- DEFINES += \
- 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-
diff --git a/testing/firefox/firefox-safe.desktop b/testing/firefox/firefox-safe.desktop
deleted file mode 100644
index 1538fc674..000000000
--- a/testing/firefox/firefox-safe.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=firefox -safe-mode %u
-Icon=firefox
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=Firefox - Safe Mode
-GenericName=Web Browser - Safe Mode
-StartupNotify=false
-Categories=Network;WebBrowser;
diff --git a/testing/firefox/firefox.desktop b/testing/firefox/firefox.desktop
deleted file mode 100644
index d048ce46c..000000000
--- a/testing/firefox/firefox.desktop
+++ /dev/null
@@ -1,81 +0,0 @@
-[Desktop Entry]
-Exec=firefox %u
-Icon=firefox
-Type=Application
-Terminal=false
-Name=Firefox
-Name[bn]=ফায়ারফক্স3
-Name[eo]=Fajrovulpo3
-Name[fi]=Firefox3
-Name[pa]=ਫਾਇਰਫੋਕਸ3
-Name[tg]=Рӯбоҳи оташин3
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html;
-StartupNotify=true
-Categories=Network;WebBrowser;
diff --git a/testing/firefox/mozconfig b/testing/firefox/mozconfig
deleted file mode 100644
index f1b23fae9..000000000
--- a/testing/firefox/mozconfig
+++ /dev/null
@@ -1,44 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-png
-ac_add_options --with-system-libvpx
-ac_add_options --with-pthreads
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --disable-installer
-ac_add_options --enable-xinerama
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-xprint
-ac_add_options --disable-strip
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-startup-notification
-ac_add_options --enable-libxul
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-chrome-format=jar
-ac_add_options --disable-elf-hack
-ac_add_options --enable-libnotify
-ac_add_options --disable-cpp-exceptions
-ac_add_options --enable-url-classifier
-ac_add_options --enable-gio
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-static
-ac_add_options --enable-official-branding
-
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export USE_SHORT_LIBNAME=1
-
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options USE_SHORT_LIBNAME=1
diff --git a/testing/gdnsd/APKBUILD b/testing/gdnsd/APKBUILD
new file mode 100644
index 000000000..e353e12c6
--- /dev/null
+++ b/testing/gdnsd/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gdnsd
+pkgver=1.6.2
+pkgrel=0
+pkgdesc="Geographic Authoritative DNS server"
+url="http://code.google.com/p/gdnsd/"
+arch="all"
+license="GPL-3"
+depends=""
+depends_dev=""
+makedepends="libev-dev libcap-dev"
+install="$pkgname.pre-install"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://gdnsd.googlecode.com/files/gdnsd-$pkgver.tar.xz"
+
+_builddir="$srcdir"/gdnsd-$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 \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la \
+		"$pkgdir"/usr/lib/gdnsd/*.la
+}
+
+md5sums="082f874d24cdc7073950ed6294f8d39b  gdnsd-1.6.2.tar.xz"
diff --git a/testing/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install
new file mode 100644
index 000000000..66de81a2e
--- /dev/null
+++ b/testing/gdnsd/gdnsd.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+addgroup gdnsd 2>/dev/null
+adduser -S -H -h /dev/null -s /bin/false -D -G gdnsd gdnsd 2>/dev/null
+exit 0
diff --git a/testing/gnash/APKBUILD b/testing/gnash/APKBUILD
index 06f7cc694..5b2b407ad 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=0
 pkgdesc="GNU flash player implementation"
 url="http://www.gnashdev.org/"
 arch="all"
@@ -14,8 +14,9 @@ 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
+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"
 
 _builddir="$srcdir"/gnash-$pkgver
@@ -37,6 +38,7 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--enable-media=gst \
+		--without-gconf \
 		|| return 1
 	make || return 1
 }
@@ -44,6 +46,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/gnash/*.la || return 1
 }
 
 sdl() {
@@ -65,5 +68,5 @@ mozilla() {
 	mv "$_builddir"/plugin/npapi/.libs/libgnashplugin.so "$subpkgdir"/usr/lib/mozilla/plugins
 }
 
-md5sums="01d0420932eede07211e368d405aee9c  gnash-0.8.9.tar.gz
+md5sums="63e9f79c41d93d48c5a2fa94856548c4  gnash-0.8.10.tar.bz2
 b324b3fee1e017d8fcc4d991146266f8  gnash-ffmpeg.patch"
diff --git a/testing/kbuild/APKBUILD b/testing/kbuild/APKBUILD
new file mode 100644
index 000000000..5688647e0
--- /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 000000000..e145ed0e5
--- /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 000000000..706c3a7fd
--- /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 000000000..de111867d
--- /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 000000000..42b25bdad
--- /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 000000000..883b2ef3a
--- /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 000000000..cf38529f1
--- /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 000000000..e72c3c1f6
--- /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/lua-microlight/APKBUILD b/testing/lua-microlight/APKBUILD
new file mode 100644
index 000000000..632a65333
--- /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 000000000..2bbb01662
--- /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/perl-async-mergepoint/APKBUILD b/testing/perl-async-mergepoint/APKBUILD
deleted file mode 100644
index 9d9300c86..000000000
--- a/testing/perl-async-mergepoint/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=perl-async-mergepoint
-_pkgreal=Async-MergePoint
-pkgver=0.04
-pkgrel=0
-pkgdesc="resynchronise diverged control flow"
-url="http://search.cpan.org/dist/Async-MergePoint/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="perl-test-fatal"
-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"
-	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="e9055c122e02fd75c8d604bb1dca49ca  Async-MergePoint-0.04.tar.gz"
diff --git a/testing/perl-class-load/APKBUILD b/testing/perl-class-load/APKBUILD
deleted file mode 100644
index c979053cc..000000000
--- a/testing/perl-class-load/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=perl-class-load
-pkgver=0.13
-pkgrel=0
-pkgdesc="Class::Load perl module"
-url="http://search.cpan.org/dist/Class-Load/"
-arch="noarch"
-license="GPLv2 or Artistic"
-depends="perl perl-test-fatal perl-data-optlist perl-module-runtime perl-package-stash"
-makedepends="perl-dev"
-install=""
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Class-Load-$pkgver.tar.gz"
-
-_builddir="$srcdir"/Class-Load-$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"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-md5sums="d26a8c6da4e12d72d9f06a47c89c6a73  Class-Load-0.13.tar.gz"
diff --git a/testing/perl-cps/APKBUILD b/testing/perl-cps/APKBUILD
deleted file mode 100644
index 1b1aaab0a..000000000
--- a/testing/perl-cps/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=perl-cps
-_pkgreal=CPS
-pkgver=0.11
-pkgrel=0
-pkgdesc="manage flow of control in Continuation-Passing Style"
-url="http://search.cpan.org/dist/CPS/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-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"
-	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="e4f36f053f538a6fa1ea4ed1de038f9e  CPS-0.11.tar.gz"
diff --git a/testing/perl-dist-checkconflicts/APKBUILD b/testing/perl-dist-checkconflicts/APKBUILD
deleted file mode 100644
index 90072dcce..000000000
--- a/testing/perl-dist-checkconflicts/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
-pkgname=perl-dist-checkconflicts
-_pkgreal=Dist-CheckConflicts
-pkgver=0.02
-pkgrel=0
-pkgdesc="declare version conflicts for your dist"
-url="http://search.cpan.org/dist/Dist-CheckConflicts/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-list-moreutils perl-sub-exporter perl-test-fatal"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/D/DO/DOY/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	cd "$_builddir"
-	make && make test
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-md5sums="64b8d342ba11336b2969c274a60bbc5f  Dist-CheckConflicts-0.02.tar.gz"
diff --git a/testing/perl-heap/APKBUILD b/testing/perl-heap/APKBUILD
deleted file mode 100644
index 2bcd88ac8..000000000
--- a/testing/perl-heap/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=perl-heap
-_pkgreal=Heap
-pkgver=0.80
-pkgrel=0
-pkgdesc="unknown"
-url="http://search.cpan.org/dist/Heap/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/J/JM/JMM/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	cd "$_builddir"
-	make && make test
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-md5sums="05fed19a7552dadee11c780cd68c0116  Heap-0.80.tar.gz"
diff --git a/testing/perl-io-async/APKBUILD b/testing/perl-io-async/APKBUILD
deleted file mode 100644
index a5e6d1541..000000000
--- a/testing/perl-io-async/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=perl-io-async
-_pkgreal=IO-Async
-pkgver=0.45
-pkgrel=0
-pkgdesc="Asynchronous event-driven programming"
-url="http://search.cpan.org/dist/IO-Async/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-heap perl-async-mergepoint perl-cps"
-cpanmakedepends="perl-test-fatal perl-test-warn perl-test-refcount perl-test-identity"
-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"
-	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="00f4213a413bb1fc431bfe56568c0192  IO-Async-0.45.tar.gz"
diff --git a/testing/perl-module-runtime/APKBUILD b/testing/perl-module-runtime/APKBUILD
deleted file mode 100644
index 26eff5e3c..000000000
--- a/testing/perl-module-runtime/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
-pkgname=perl-module-runtime
-_pkgreal=Module-Runtime
-pkgver=0.011
-pkgrel=0
-pkgdesc="runtime module handling"
-url="http://search.cpan.org/dist/Module-Runtime/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-params-classify"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	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="d0d2ab338c5bb2769a8f7db200cfdb2b  Module-Runtime-0.011.tar.gz"
diff --git a/testing/perl-net-async-http/APKBUILD b/testing/perl-net-async-http/APKBUILD
deleted file mode 100644
index 0b4c79fac..000000000
--- a/testing/perl-net-async-http/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.15
-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-http-message perl-io-async"
-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="b0298e8ecf8d74a69281c57d17631225  Net-Async-HTTP-0.15.tar.gz"
diff --git a/testing/perl-package-deprecationmanager/APKBUILD b/testing/perl-package-deprecationmanager/APKBUILD
deleted file mode 100644
index 78f1b3f86..000000000
--- a/testing/perl-package-deprecationmanager/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
-pkgname=perl-package-deprecationmanager
-_pkgreal=Package-DeprecationManager
-pkgver=0.11
-pkgrel=0
-pkgdesc="Manage deprecation warnings for your distribution"
-url="http://search.cpan.org/dist/Package-DeprecationManager/"
-arch="noarch"
-license="Artistic-2"
-cpandepends="perl-list-moreutils perl-sub-install perl-params-util perl-test-fatal perl-test-requires"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	cd "$_builddir"
-	make && make test
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-md5sums="d09664839b730997c591a5c891a2972b  Package-DeprecationManager-0.11.tar.gz"
diff --git a/testing/perl-package-stash/APKBUILD b/testing/perl-package-stash/APKBUILD
deleted file mode 100644
index 8085e9162..000000000
--- a/testing/perl-package-stash/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
-pkgname=perl-package-stash
-_pkgreal=Package-Stash
-pkgver=0.33
-pkgrel=0
-pkgdesc="routines for manipulating stashes"
-url="http://search.cpan.org/dist/Package-Stash/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-dist-checkconflicts perl-package-deprecationmanager"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/D/DO/DOY/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	cd "$_builddir"
-	make && make test
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-md5sums="fe1f6efa0dbd46f8520903b436f185f1  Package-Stash-0.33.tar.gz"
diff --git a/testing/perl-params-classify/APKBUILD b/testing/perl-params-classify/APKBUILD
deleted file mode 100644
index 2cabc8cdf..000000000
--- a/testing/perl-params-classify/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
-pkgname=perl-params-classify
-_pkgreal=Params-Classify
-pkgver=0.013
-pkgrel=0
-pkgdesc="argument type classification"
-url="http://search.cpan.org/dist/Params-Classify/"
-arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	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="63d24fbec775472ada49d16bce4a9b1f  Params-Classify-0.013.tar.gz"
diff --git a/testing/perl-sub-uplevel/APKBUILD b/testing/perl-sub-uplevel/APKBUILD
deleted file mode 100644
index 3c0628143..000000000
--- a/testing/perl-sub-uplevel/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
-pkgname=perl-sub-uplevel
-_pkgreal=Sub-Uplevel
-pkgver=0.22
-pkgrel=0
-pkgdesc="apparently run a function in a higher stack frame"
-url="http://search.cpan.org/dist/Sub-Uplevel/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	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="c166738a97c0424a0075ebe205d285db  Sub-Uplevel-0.22.tar.gz"
diff --git a/testing/perl-test-fatal/APKBUILD b/testing/perl-test-fatal/APKBUILD
deleted file mode 100644
index 4af1de9b3..000000000
--- a/testing/perl-test-fatal/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=perl-test-fatal
-_pkgreal=Test-Fatal
-pkgver=0.008
-pkgrel=0
-pkgdesc="incredibly simple helpers for testing code with exceptions"
-url="http://search.cpan.org/dist/Test-Fatal/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-try-tiny"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	cd "$_builddir"
-	make && make test
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-md5sums="201c94efbbcbd38b32e3cdc6752a6c07  Test-Fatal-0.008.tar.gz"
diff --git a/testing/perl-test-identity/APKBUILD b/testing/perl-test-identity/APKBUILD
deleted file mode 100644
index a97dddc03..000000000
--- a/testing/perl-test-identity/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=perl-test-identity
-_pkgreal=Test-Identity
-pkgver=0.01
-pkgrel=0
-pkgdesc="assert the referential identity of a reference"
-url="http://search.cpan.org/dist/Test-Identity/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-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"
-	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="ecef85c791cf5847e4c374983cf22a74  Test-Identity-0.01.tar.gz"
diff --git a/testing/perl-test-refcount/APKBUILD b/testing/perl-test-refcount/APKBUILD
deleted file mode 100644
index d4d71f1e7..000000000
--- a/testing/perl-test-refcount/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=perl-test-refcount
-_pkgreal=Test-Refcount
-pkgver=0.07
-pkgrel=0
-pkgdesc="assert reference counts on objects"
-url="http://search.cpan.org/dist/Test-Refcount/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-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"
-	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="0a78c2f25e91c27baf0f71118a970245  Test-Refcount-0.07.tar.gz"
diff --git a/testing/perl-test-warn/APKBUILD b/testing/perl-test-warn/APKBUILD
deleted file mode 100644
index 8b4779281..000000000
--- a/testing/perl-test-warn/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=perl-test-warn
-_pkgreal=Test-Warn
-pkgver=0.23
-pkgrel=0
-pkgdesc="Perl extension to test methods for warnings
"
-url="http://search.cpan.org/dist/Test-Warn/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-tree-dag_node perl-sub-uplevel"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	cd "$_builddir"
-	make && make test
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-md5sums="96e224cba15bf69b7513c08e70496457  Test-Warn-0.23.tar.gz"
diff --git a/testing/perl-tree-dag_node/APKBUILD b/testing/perl-tree-dag_node/APKBUILD
deleted file mode 100644
index dc47d6a2f..000000000
--- a/testing/perl-tree-dag_node/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=perl-tree-dag_node
-_pkgreal=Tree-DAG_Node
-pkgver=1.06
-pkgrel=0
-pkgdesc="(super)class for representing nodes in a tree"
-url="http://search.cpan.org/dist/Tree-DAG_Node/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/C/CO/COGENT/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	cd "$_builddir"
-	make && make test
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-md5sums="3b006f128bd1d8961fc57c466ffa05f2  Tree-DAG_Node-1.06.tar.gz"
diff --git a/testing/perl-try-tiny/APKBUILD b/testing/perl-try-tiny/APKBUILD
deleted file mode 100644
index c8cad7744..000000000
--- a/testing/perl-try-tiny/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=perl-try-tiny
-_pkgreal=Try-Tiny
-pkgver=0.11
-pkgrel=0
-pkgdesc="unknown"
-url="http://search.cpan.org/dist/Try-Tiny/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="http://search.cpan.org/CPAN/authors/id/D/DO/DOY/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	cd "$_builddir"
-	make && make test
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-md5sums="4d2c8ff385ac3513edf4c042dd0eacbe  Try-Tiny-0.11.tar.gz"
diff --git a/testing/py-configobj/APKBUILD b/testing/py-configobj/APKBUILD
new file mode 100644
index 000000000..6e8f0bcbc
--- /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 000000000..299357e2e
--- /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 000000000..de58b1ea5
--- /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 000000000..43c53dba4
--- /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 000000000..886a64521
--- /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 000000000..97ab4238f
--- /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 000000000..da06bc687
--- /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 000000000..9fc136224
--- /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/sshguard/APKBUILD b/testing/sshguard/APKBUILD
deleted file mode 100644
index a337bbfc6..000000000
--- a/testing/sshguard/APKBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=sshguard
-pkgver=1.5
-pkgrel=1
-pkgdesc="Log monitor that blocks with iptables on bad behaviour"
-url="http://www.sshguard.net/"
-arch="all"
-license="BSD"
-depends="iptables"
-depends_dev=""
-makedepends="$depends_dev flex bison"
-install=""
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/project/sshguard/sshguard/sshguard-$pkgver/sshguard-$pkgver.tar.bz2
-	sshguard.initd
-	sshguard.confd
-	parser.patch"
-
-_builddir="$srcdir"/sshguard-$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-firewall=iptables \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm755 "$srcdir"/sshguard.initd \
-		"$pkgdir"/etc/init.d/sshguard || return 1
-	install -Dm755 "$srcdir"/sshguard.confd \
-		"$pkgdir"/etc/conf.d/sshguard || return 1
-}
-
-md5sums="11b9f47f9051e25bdfe84a365c961ec1  sshguard-1.5.tar.bz2
-13eb7c7e7a91cc347dbd6ff111d662c4  sshguard.initd
-02dc914d310ea759a66ebb136f495e4e  sshguard.confd
-84ff8858abb8d5a673037cf592bb6794  parser.patch"
diff --git a/testing/sshguard/parser.patch b/testing/sshguard/parser.patch
deleted file mode 100644
index 51f9915e1..000000000
--- a/testing/sshguard/parser.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sshguard-1.5/src/parser/attack_scanner.l
-+++ sshguard-1.5-mod/src/parser/attack_scanner.l
-@@ -107,7 +107,7 @@
-   */
- 
-  /* handle entries with PID and without PID from processes other than sshguard */
--{TIMESTAMP_SYSLOG}[ ]+([a-zA-Z0-9]|{WORD}|{HOSTADDR})[ ]+{PROCESSNAME}"["{NUMBER}"]: "{SOLARIS_MSGID_TAG}? {
-+{TIMESTAMP_SYSLOG}[ ]+([a-zA-Z0-9]|{WORD}|{HOSTADDR})[ ]+([a-zA-Z0-9]|{WORD}|{HOSTADDR})[ ]+{PROCESSNAME}"["{NUMBER}"]: "{SOLARIS_MSGID_TAG}? {
-         /* extract PID */
-         yylval.num = getsyslogpid(yytext, yyleng);
-         return SYSLOG_BANNER_PID;
diff --git a/testing/sshguard/sshguard.confd b/testing/sshguard/sshguard.confd
deleted file mode 100644
index 050c2f358..000000000
--- a/testing/sshguard/sshguard.confd
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.confd,v 1.3 2011/04/23 16:59:59 jer Exp $
-
-# Config file for /etc/init.d/sshguard
-#   See SSHGUARD(8) for details.
-
-# Initial (empty) options.
-SSHGUARD_OPTS=""
-
-# Files to monitor
-#   -l <source>
-SSHGUARD_OPTS="${SSHGUARD_OPTS} -l /var/log/messages"
-
-# White listing
-#   -w <addr/host/block/file>
-#SSHGUARD_OPTS="${SSHGUARD_OPTS} -w 192.168.0.0/24"
-
-# Define how long in milliseconds start-stop-daemon waits to check that
-# sshguard is still running before calling success or failure.
-# Values lower than the default of 999 are probably not useful.
-SSHGUARD_WAIT="999"
diff --git a/testing/sshguard/sshguard.initd b/testing/sshguard/sshguard.initd
deleted file mode 100644
index 89ec7d592..000000000
--- a/testing/sshguard/sshguard.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.initd,v 1.3 2011/04/25 04:59:43 jer Exp $
-
-depend() {
-	after iptables
-	use logger
-}
-
-SSHGUARD_PIDFILE=${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}
-
-start() {
-	ebegin "Starting sshguard"
-	[[ -z ${SSHGUARD_WAIT} ]] && SSHGUARD_WAIT=999
-	start-stop-daemon --start --wait ${SSHGUARD_WAIT} --background --quiet --exec \
-		/usr/sbin/sshguard -- -i ${SSHGUARD_PIDFILE} ${SSHGUARD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping sshguard"
-	start-stop-daemon --stop -p ${SSHGUARD_PIDFILE}
-	eend $?
-}
diff --git a/testing/targetcli/APKBUILD b/testing/targetcli/APKBUILD
new file mode 100644
index 000000000..5d5285a84
--- /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/xen/APKBUILD b/testing/xen/APKBUILD
deleted file mode 100644
index c6c120168..000000000
--- a/testing/xen/APKBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# Contributor: Roger Pau Monne <roger.pau@entel.upc.edu>
-# Maintainer:
-pkgname=xen
-pkgver=4.1.2
-pkgrel=2
-pkgdesc="Xen hypervisor"
-url="http://www.xen.org"
-arch="x86 x86_64"
-license="GPL"
-depends="udev syslinux bash"
-depends_dev="openssl-dev python-dev e2fsprogs-dev gettext zlib-dev ncurses-dev
-	libiconv-dev dev86 texinfo perl iasl pciutils-dev"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-doc"
-source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
-	blktap2_libvhd_add_iconv.patch
-	detect_libiconv.patch
-	fix_bswap_blktap.patch
-	fix_bswap_blktap2.patch
-	fix_ipxe_no_pie_default.patch
-	define_fsimage_dir.patch
-	pygrub_alpine.patch
-	librt.patch
-	busybox-sed.patch
-	xencommons.initd
-	xend.initd
-	xendomains.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
-
-	# remove all -Werror
-	msg "Eradicating -Werror..."
-	find -name '*.mk' -o -name 'Make*' | xargs sed -i -e 's/-Werror//g'
-
-	echo "LIBLEAFDIR_x86_64=lib" >> .config
-}
-
-build() {
-	cd "$_builddir"
-
-	# Unset CFLAGS and LDFLAGS because the xen build system
-	# doesn't support them. Instead use .config in xen root
-	# folder if necessary.
-	unset CFLAGS
-	unset LDFLAGS
-
-	msg "Running preflight check..."
-        (cd tools/check; ./chk build) || return 1
-
-        msg "Building hypervisor..."
-        make xen || return 1
-
-        msg "Building tools..."
-        make tools || return 1
-
-        msg "Building stub domains..."
-        make -j1 stubdom || return 1
-}
-
-package() {
-	cd "$_builddir"
-
-	unset CFLAGS
-        unset LDFLAGS
-
-        make -j1 DESTDIR="$pkgdir" install-xen install-tools install-stubdom \
-                || return 1
-
-        install -m755 -D "$srcdir"/xencommons.initd "$pkgdir"/etc/init.d/xencommons
-        install -m755 -D "$srcdir"/xend.initd "$pkgdir"/etc/init.d/xend
-        install -m755 -D "$srcdir"/xendomains.initd "$pkgdir"/etc/init.d/xendomains
-}
-
-md5sums="73561faf3c1b5e36ec5c089b5db848ad  xen-4.1.2.tar.gz
-6d4b045ae56be6288733d0e078f591ea  blktap2_libvhd_add_iconv.patch
-ed3283697cb1ddff066f4087eabf68c6  detect_libiconv.patch
-503f0883f4a0b50fe4e37e09ed9a6177  fix_bswap_blktap.patch
-b973dc1ffcc6872e222b36f3b7b4836b  fix_bswap_blktap2.patch
-10dcf0b6a05691e9f88afc01bd414480  fix_ipxe_no_pie_default.patch
-0bb8a435020a5a49b38b1a447fb69977  define_fsimage_dir.patch
-a7500c42804abdf68e051dc667e65f93  pygrub_alpine.patch
-fa06495a175571f4aa3b6cb88937953e  librt.patch
-1bea3543ddc712330527b62fd9ff6520  busybox-sed.patch
-4cf88b53f8ca8d99ad52bae419b620a7  xencommons.initd
-b5bfc08b82bc0d21193714719a719798  xend.initd
-86e7923383a906404da321d1814657e9  xendomains.initd"
diff --git a/testing/xen/blktap2_libvhd_add_iconv.patch b/testing/xen/blktap2_libvhd_add_iconv.patch
deleted file mode 100644
index 2353e38a6..000000000
--- a/testing/xen/blktap2_libvhd_add_iconv.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# HG changeset patch
-# Parent 14e911353a91702b439bc06e2a77d67e8bd5f661
-blktap2/vhd: add -liconv when linking if using libiconv
-
-If libiconv is detected on the system add -liconv when linking the 
-libvhd library.
-
-If -liconv is not added when compiling libvhd with libiconv the 
-following error occours when linking vhd-util and vhd-update:
-
-gcc     -o vhd-util vhd-util.o -Llib -lvhd
-lib/libvhd.so: undefined reference to `libiconv_open'
-lib/libvhd.so: undefined reference to `libiconv_close'
-lib/libvhd.so: undefined reference to `libiconv'
-
-Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
-
-diff -r 14e911353a91 tools/blktap2/vhd/lib/Makefile
---- a/tools/blktap2/vhd/lib/Makefile	Tue Dec 20 02:30:12 2011 +0100
-+++ b/tools/blktap2/vhd/lib/Makefile	Tue Dec 20 02:33:11 2011 +0100
-@@ -23,6 +23,10 @@ ifeq ($(CONFIG_Linux),y)
- LIBS            := -luuid
- endif
- 
-+ifeq ($(CONFIG_LIBICONV),y)
-+LIBS            += -liconv
-+endif
-+
- LIB-SRCS        := libvhd.c
- LIB-SRCS        += libvhd-journal.c
- LIB-SRCS        += vhd-util-coalesce.c
diff --git a/testing/xen/busybox-sed.patch b/testing/xen/busybox-sed.patch
deleted file mode 100644
index e1a953157..000000000
--- a/testing/xen/busybox-sed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./xen/arch/x86/boot/Makefile.orig
-+++ ./xen/arch/x86/boot/Makefile
-@@ -2,7 +2,7 @@
- 
- head.o: reloc.S
- 
--BOOT_TRAMPOLINE := $(shell sed -n 's,^\#define[[:space:]]\{1\,\}BOOT_TRAMPOLINE[[:space:]]\{1\,\},,p' $(BASEDIR)/include/asm-x86/config.h)
-+BOOT_TRAMPOLINE := $(shell sed -n 's,^\#define[[:space:]]\+BOOT_TRAMPOLINE[[:space:]]\+,,p' $(BASEDIR)/include/asm-x86/config.h)
- %.S: %.c
- 	RELOC=$(BOOT_TRAMPOLINE) $(MAKE) -f build32.mk $@
- 
diff --git a/testing/xen/define_fsimage_dir.patch b/testing/xen/define_fsimage_dir.patch
deleted file mode 100644
index 04e4aed2a..000000000
--- a/testing/xen/define_fsimage_dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 2863b2f43a3b tools/libfsimage/common/Makefile
---- a/tools/libfsimage/common/Makefile	Thu Dec 22 14:49:38 2011 +0000
-+++ b/tools/libfsimage/common/Makefile	Tue Dec 27 21:00:54 2011 +0100
-@@ -4,6 +4,8 @@
- MAJOR = 1.0
- MINOR = 0
- 
-+CFLAGS += -DFSIMAGE_FSDIR=\"/usr/lib/fs\"
-+
- LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
- LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
- LDFLAGS = $(LDFLAGS-y)
diff --git a/testing/xen/detect_libiconv.patch b/testing/xen/detect_libiconv.patch
deleted file mode 100644
index 5b2359eb6..000000000
--- a/testing/xen/detect_libiconv.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# Parent 2bc60167b9f8791747d2cea09c5207a9c2d7ef7b
-build: detect is libiconv is present
-
-Detect if libiconv is present in the system, since we will have to
-link against it when using iconv.
-
-Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
-
-diff -r 2bc60167b9f8 Config.mk
---- a/Config.mk	Tue Dec 20 05:25:19 2011 +0100
-+++ b/Config.mk	Tue Dec 20 07:52:38 2011 +0100
-@@ -9,6 +9,10 @@
- XEN_OS              ?= $(shell uname -s)
- 
- CONFIG_$(XEN_OS) := y
-+CONFIG_LIBICONV     := $(shell export OS="`uname -s`"; \
-+                       export CHECK_LIB="$(CHECK_LIB)"; \
-+                       . $(XEN_ROOT)/tools/check/funcs.sh; \
-+                       has_lib libiconv.so && echo 'y' || echo 'n')
- 
- SHELL     ?= /bin/sh
diff --git a/testing/xen/fix_bswap_blktap.patch b/testing/xen/fix_bswap_blktap.patch
deleted file mode 100644
index 71671d9dc..000000000
--- a/testing/xen/fix_bswap_blktap.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-# HG changeset patch
-# Parent d61e6300274bbc6bc464ad340146bd81e91f64f3
-blktap: remove local definitions and include byteswap.h
-
-Use the same approach as tools/blktap2/include/libvhd.h, remove local
-definitions of bswap* and include byteswap.h. Also remove the
-HAVE_BYTESWAP_H ifdef, since it was not defined in this context (it's
-defined by QEMU).
-
-Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
-
-diff -r d61e6300274b tools/blktap/drivers/bswap.h
---- a/tools/blktap/drivers/bswap.h	Tue Dec 20 05:20:02 2011 +0100
-+++ b/tools/blktap/drivers/bswap.h	Tue Dec 20 05:24:16 2011 +0100
-@@ -13,45 +13,9 @@
- #define bswap_16(x) swap16(x)
- #define bswap_32(x) swap32(x)
- #define bswap_64(x) swap64(x)
--#else
-+#elif defined(__linux__)
- 
--#ifdef HAVE_BYTESWAP_H
- #include <byteswap.h>
--#else
--
--#define bswap_16(x) \
--({ \
--	uint16_t __x = (x); \
--	((uint16_t)( \
--		(((uint16_t)(__x) & (uint16_t)0x00ffU) << 8) | \
--		(((uint16_t)(__x) & (uint16_t)0xff00U) >> 8) )); \
--})
--
--#define bswap_32(x) \
--({ \
--	uint32_t __x = (x); \
--	((uint32_t)( \
--		(((uint32_t)(__x) & (uint32_t)0x000000ffUL) << 24) | \
--		(((uint32_t)(__x) & (uint32_t)0x0000ff00UL) <<  8) | \
--		(((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >>  8) | \
--		(((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) )); \
--})
--
--#define bswap_64(x) \
--({ \
--	uint64_t __x = (x); \
--	((uint64_t)( \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0x00000000000000ffULL) << 56) | \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0x000000000000ff00ULL) << 40) | \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0x0000000000ff0000ULL) << 24) | \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0x00000000ff000000ULL) <<  8) | \
--	        (uint64_t)(((uint64_t)(__x) & (uint64_t)0x000000ff00000000ULL) >>  8) | \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0x0000ff0000000000ULL) >> 24) | \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0xff00000000000000ULL) >> 56) )); \
--})
--
--#endif /* !HAVE_BYTESWAP_H */
- 
- static inline uint16_t bswap16(uint16_t x)
- {
diff --git a/testing/xen/fix_bswap_blktap2.patch b/testing/xen/fix_bswap_blktap2.patch
deleted file mode 100644
index 69cd2e369..000000000
--- a/testing/xen/fix_bswap_blktap2.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-# HG changeset patch
-# Parent 00d9ee3844121f4a7f01e42933751e49b0448abb
-blktap2: remove local definitions and include byteswap.h
-
-Use the same approach as tools/blktap2/include/libvhd.h, remove local
-definitions of bswap* and include byteswap.h. Also remove the
-HAVE_BYTESWAP_H ifdef, since it was not defined in this context (it's
-defined by QEMU).
-
-Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
-
-diff -r 00d9ee384412 tools/blktap2/drivers/bswap.h
---- a/tools/blktap2/drivers/bswap.h	Tue Dec 20 05:24:17 2011 +0100
-+++ b/tools/blktap2/drivers/bswap.h	Tue Dec 20 05:25:18 2011 +0100
-@@ -13,45 +13,10 @@
- #define bswap_16(x) swap16(x)
- #define bswap_32(x) swap32(x)
- #define bswap_64(x) swap64(x)
--#else
-+#elif defined(__linux__)
- 
--#ifdef HAVE_BYTESWAP_H
-+#include <endian.h>
- #include <byteswap.h>
--#else
--
--#define bswap_16(x) \
--({ \
--	uint16_t __x = (x); \
--	((uint16_t)( \
--		(((uint16_t)(__x) & (uint16_t)0x00ffU) << 8) | \
--		(((uint16_t)(__x) & (uint16_t)0xff00U) >> 8) )); \
--})
--
--#define bswap_32(x) \
--({ \
--	uint32_t __x = (x); \
--	((uint32_t)( \
--		(((uint32_t)(__x) & (uint32_t)0x000000ffUL) << 24) | \
--		(((uint32_t)(__x) & (uint32_t)0x0000ff00UL) <<  8) | \
--		(((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >>  8) | \
--		(((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) )); \
--})
--
--#define bswap_64(x) \
--({ \
--	uint64_t __x = (x); \
--	((uint64_t)( \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0x00000000000000ffULL) << 56) | \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0x000000000000ff00ULL) << 40) | \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0x0000000000ff0000ULL) << 24) | \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0x00000000ff000000ULL) <<  8) | \
--	        (uint64_t)(((uint64_t)(__x) & (uint64_t)0x000000ff00000000ULL) >>  8) | \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0x0000ff0000000000ULL) >> 24) | \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \
--		(uint64_t)(((uint64_t)(__x) & (uint64_t)0xff00000000000000ULL) >> 56) )); \
--})
--
--#endif /* !HAVE_BYTESWAP_H */
- 
- static inline uint16_t bswap16(uint16_t x)
- {
diff --git a/testing/xen/fix_ipxe_no_pie_default.patch b/testing/xen/fix_ipxe_no_pie_default.patch
deleted file mode 100644
index 3ffb5388c..000000000
--- a/testing/xen/fix_ipxe_no_pie_default.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-# HG changeset patch
-# Parent b60667a56ae085ee2bcea896887d0907fb86af41
-ipxe: fix compilation issues with some gcc versions
-
-Backported some changes from current ipxe, to fix a issue with some 
-new versions of gcc that add -fPIC by default, and compilation fails 
-with the following error:
-
-arch/i386/core/cpu.c: In function 'get_cpuinfo':
-arch/i386/include/bits/cpu.h:79:2: error: inconsistent operand 
-constraints in an 'asm'
-arch/i386/include/bits/cpu.h:79:2: error: inconsistent operand 
-constraints in an 'asm'
-arch/i386/include/bits/cpu.h:79:2: error: inconsistent operand 
-constraints in an 'asm'
-arch/i386/include/bits/cpu.h:79:2: error: inconsistent operand 
-constraints in an 'asm'
-
-Two patches from ipxe git have been added. The problem is reproducible 
-with at least this version of gcc:
-
-Using built-in specs.
-COLLECT_GCC=gcc
-COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-alpine-linux-uclibc/4.6.2/lto-wrapper
-Target: x86_64-alpine-linux-uclibc
-Configured with: 
-/home/buildozer/aports/main/gcc/src/gcc-4.6.2/configure --prefix=/usr 
---mandir=/usr/share/man --infodir=/usr/share/info 
---build=x86_64-alpine-linux-uclibc --host=x86_64-alpine-linux-uclibc 
---target=x86_64-alpine-linux-uclibc --with-pkgversion='Alpine 
-4.6.2-r1' --disable-altivec --disable-checking --disable-fixed-point 
---disable-libssp --disable-libstdcxx-pch --disable-multilib 
---disable-nls --disable-werror --enable-__cxa_atexit --enable-cld 
---enable-esp --enable-cloog-backend 
---enable-languages=c,c++,objc,java,go --enable-shared 
---enable-target-optspace --enable-tls --enable-threads 
---with-dynamic-linker=ld64-uClibc.so.0.9.32 
---with-dynamic-linker-prefix=/lib --with-system-zlib 
---without-system-libunwind
-Thread model: posix
-gcc version 4.6.2 (Alpine 4.6.2-r1) 
-
-Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
-
-diff -r b60667a56ae0 tools/firmware/etherboot/patches/gpxe-git-b8924c1aed51
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/tools/firmware/etherboot/patches/gpxe-git-b8924c1aed51	Fri Dec 16 13:48:49 2011 +0100
-@@ -0,0 +1,72 @@
-+commit b8924c1aed512aa40cf28a43635df383880f771d
-+Author: Michael Brown <mcb30@ipxe.org>
-+Date:   Wed Mar 16 19:30:42 2011 +0000
-+
-+    [build] Allow workaround-specific flags to override default flags
-+    
-+    Signed-off-by: Michael Brown <mcb30@ipxe.org>
-+
-+diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
-+index 709f8de..78e78c9 100644
-+--- a/src/Makefile.housekeeping
-++++ b/src/Makefile.housekeeping
-+@@ -109,6 +109,10 @@ VERYCLEANUP	+= .toolcheck
-+ # Check for various tool workarounds
-+ #
-+ 
-++WORKAROUND_CFLAGS :=
-++WORKAROUND_ASFLAGS :=
-++WORKAROUND_LDFLAGS :=
-++
-+ # Make syntax does not allow use of comma or space in certain places.
-+ # This ugly workaround is suggested in the manual.
-+ #
-+@@ -119,7 +123,7 @@ SPACE	:= $(EMPTY) $(EMPTY)
-+ # Check for an old version of gas (binutils 2.9.1)
-+ #
-+ OLDGAS	:= $(shell $(AS) --version | grep -q '2\.9\.1' && $(ECHO) -DGAS291)
-+-CFLAGS	+= $(OLDGAS)
-++WORKAROUND_CFLAGS += $(OLDGAS)
-+ oldgas :
-+ 	@$(ECHO) $(oldgas)
-+ 
-+@@ -131,7 +135,7 @@ ifeq ($(CCTYPE),gcc)
-+ SP_TEST = $(CC) -fno-stack-protector -x c -c /dev/null \
-+ 		-o /dev/null >/dev/null 2>&1
-+ SP_FLAGS := $(shell $(SP_TEST) && $(ECHO) '-fno-stack-protector')
-+-CFLAGS	+= $(SP_FLAGS)
-++WORKAROUND_CFLAGS += $(SP_FLAGS)
-+ endif
-+ 
-+ # gcc 4.4 generates .eh_frame sections by default, which distort the
-+@@ -141,7 +145,7 @@ ifeq ($(CCTYPE),gcc)
-+ CFI_TEST = $(CC) -fno-dwarf2-cfi-asm -x c -c /dev/null \
-+ 		 -o /dev/null >/dev/null 2>&1
-+ CFI_FLAGS := $(shell $(CFI_TEST) && $(ECHO) '-fno-dwarf2-cfi-asm')
-+-CFLAGS	+= $(CFI_FLAGS)
-++WORKAROUND_CFLAGS += $(CFI_FLAGS)
-+ endif
-+ 
-+ # Some versions of gas choke on division operators, treating them as
-+@@ -150,7 +154,7 @@ endif
-+ #
-+ DIVIDE_TEST = $(AS) --divide /dev/null -o /dev/null 2>/dev/null
-+ DIVIDE_FLAGS := $(shell $(DIVIDE_TEST) && $(ECHO) '--divide')
-+-ASFLAGS	+= $(DIVIDE_FLAGS)
-++WORKAROUND_ASFLAGS += $(DIVIDE_FLAGS)
-+ 
-+ ###############################################################################
-+ #
-+@@ -375,9 +379,9 @@ CFLAGS		+= -diag-disable 1419 # Missing prototypes
-+ CFLAGS		+= -diag-disable 1599 # Hidden variables
-+ CFLAGS		+= -Wall -Wmissing-declarations
-+ endif
-+-CFLAGS		+= $(EXTRA_CFLAGS)
-+-ASFLAGS		+= $(EXTRA_ASFLAGS)
-+-LDFLAGS		+= $(EXTRA_LDFLAGS)
-++CFLAGS		+= $(WORKAROUND_CFLAGS) $(EXTRA_CFLAGS)
-++ASFLAGS		+= $(WORKAROUND_ASFLAGS) $(EXTRA_ASFLAGS)
-++LDFLAGS		+= $(WORKAROUND_LDFLAGS) $(EXTRA_LDFLAGS)
-+ 
-+ # Inhibit -Werror if NO_WERROR is specified on make command line
-+ #
-diff -r b60667a56ae0 tools/firmware/etherboot/patches/gpxe-git-fe61f6de0dd5
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/tools/firmware/etherboot/patches/gpxe-git-fe61f6de0dd5	Fri Dec 16 13:48:49 2011 +0100
-@@ -0,0 +1,32 @@
-+commit fe61f6de0dd5d39ac3de5e8e18742f9bd0aafad7
-+Author: Gilles Espinasse <g.esp@free.fr>
-+Date:   Tue Mar 29 15:30:11 2011 +0100
-+
-+    [build] Fix compilation when gcc is patched to default to -fPIE -Wl,-pie
-+    
-+    Signed-off-by: Gilles Espinasse <g.esp@free.fr>
-+    Modified-by: Michael Brown <mcb30@ipxe.org>
-+    Signed-off-by: Michael Brown <mcb30@ipxe.org>
-+
-+diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
-+index 57e52c0..c184351 100644
-+--- a/src/Makefile.housekeeping
-++++ b/src/Makefile.housekeeping
-+@@ -138,6 +138,17 @@ SP_FLAGS := $(shell $(SP_TEST) && $(ECHO) '-fno-stack-protector')
-+ WORKAROUND_CFLAGS += $(SP_FLAGS)
-+ endif
-+ 
-++# Some widespread patched versions of gcc include -fPIE -Wl,-pie by
-++# default.  Note that gcc will exit *successfully* if it fails to
-++# recognise an option that starts with "no", so we have to test for
-++# output on stderr instead of checking the exit status.
-++#
-++ifeq ($(CCTYPE),gcc)
-++PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
-++PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
-++WORKAROUND_CFLAGS += $(PIE_FLAGS)
-++endif
-++
-+ # gcc 4.4 generates .eh_frame sections by default, which distort the
-+ # output of "size".  Inhibit this.
-+ #
-diff -r b60667a56ae0 tools/firmware/etherboot/patches/series
---- a/tools/firmware/etherboot/patches/series	Fri Dec 16 10:47:18 2011 +0100
-+++ b/tools/firmware/etherboot/patches/series	Fri Dec 16 13:48:49 2011 +0100
-@@ -1,3 +1,5 @@
- boot_prompt_option.patch
- gpxe-git-0edf2405b457
- gpxe-git-a803ef3dfeac
-+gpxe-git-b8924c1aed51
-+gpxe-git-fe61f6de0dd5
diff --git a/testing/xen/librt.patch b/testing/xen/librt.patch
deleted file mode 100644
index cbb52071a..000000000
--- a/testing/xen/librt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./tools/ioemu-qemu-xen/Makefile.target.orig
-+++ ./tools/ioemu-qemu-xen/Makefile.target
-@@ -520,7 +520,7 @@
- OBJS+=block-raw-posix.o
- endif
- 
--LIBS+=-lz
-+LIBS+=-lz -lrt
- ifdef CONFIG_ALSA
- LIBS += -lasound
- endif
diff --git a/testing/xen/pygrub_alpine.patch b/testing/xen/pygrub_alpine.patch
deleted file mode 100644
index 98d0822c7..000000000
--- a/testing/xen/pygrub_alpine.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-# HG changeset patch
-# Parent 3e02aa9670b3265e36bdddbd4760415cd87d047b
-pygrub: fix extlinux parsing
-
-pygrub was unable to parse extlinux config files correctly, exactly
-the ones like:
-
-LABEL grsec
-  KERNEL vmlinuz-3.0.10-grsec
-  APPEND initrd=initramfs-3.0.10-grsec
-root=UUID=cfd4a7b4-8c40-4025-b877-8205f1c622ee
-modules=sd-mod,usb-storage,ext4 xen quiet
-
-This patch fixes it, adding a new case when parsing the "append" line,
-that searches for the initrd image.
-
-Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
-
-diff -r 3e02aa9670b3 tools/pygrub/examples/alpine-linux-2.3.2.extlinux
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/tools/pygrub/examples/alpine-linux-2.3.2.extlinux	Tue Jan 03 13:11:46 2012 +0100
-@@ -0,0 +1,11 @@
-+DEFAULT menu.c32
-+PROMPT 0
-+MENU TITLE Alpine/Linux Boot Menu
-+MENU HIDDEN
-+MENU AUTOBOOT Alpine will be booted automatically in # seconds.
-+TIMEOUT 30
-+LABEL grsec
-+  MENU DEFAULT
-+  MENU LABEL Linux 3.0.10-grsec
-+  KERNEL vmlinuz-3.0.10-grsec
-+  APPEND initrd=initramfs-3.0.10-grsec root=UUID=a97ffe64-430f-4fd3-830e-4736d9a27af0 modules=sd-mod,usb-storage,ext4 quiet
-diff -r 3e02aa9670b3 tools/pygrub/src/ExtLinuxConf.py
---- a/tools/pygrub/src/ExtLinuxConf.py	Thu Dec 15 18:55:46 2011 +0100
-+++ b/tools/pygrub/src/ExtLinuxConf.py	Tue Jan 03 13:11:46 2012 +0100
-@@ -60,6 +60,13 @@ class ExtLinuxImage(object):
- 
-                 # Bypass regular self.commands handling
-                 com = None
-+            elif "initrd=" in arg:
-+                # find initrd image in append line
-+                args = arg.strip().split(" ")
-+                for a in args:
-+                    if a.lower().startswith("initrd="):
-+                        setattr(self, "initrd", a.replace("initrd=", ""))
-+                        arg = arg.replace(a, "")
- 
-         if com is not None and self.commands.has_key(com):
-             if self.commands[com] is not None:
-@@ -86,10 +93,12 @@ class ExtLinuxImage(object):
-         self._args = args
-     def get_kernel(self):
-         return self._kernel
-+    def set_args(self, val):
-+        self._args = val
-     def get_args(self):
-         return self._args
-     kernel = property(get_kernel, set_kernel)
--    args = property(get_args)
-+    args = property(get_args, set_args)
- 
-     def set_initrd(self, val):
-         self._initrd = (None,val)
diff --git a/testing/xen/xencommons.initd b/testing/xen/xencommons.initd
deleted file mode 100644
index 3d3c5da38..000000000
--- a/testing/xen/xencommons.initd
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-if [ -d /etc/sysconfig ]; then
-	xencommons_config=/etc/sysconfig
-else
-	xencommons_config=/etc/default
-fi
-
-test -f $xencommons_config/xencommons && . $xencommons_config/xencommons
-
-XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid
-
-# not running in Xen dom0 or domU
-if ! test -d /proc/xen ; then
-	exit 0
-fi
-
-# mount xenfs in dom0 or domU with a pv_ops kernel
-if test "x$1" = xstart && \
-	! test -f /proc/xen/capabilities && \
-	! grep '^xenfs ' /proc/mounts >/dev/null;
-then
-	mount -t xenfs xenfs /proc/xen
-fi
-
-# run this script only in dom0:
-# no capabilities file in xenlinux domU kernel
-# empty capabilities file in pv_ops domU kernel
-if test -f /proc/xen/capabilities && \
-   ! grep -q "control_d" /proc/xen/capabilities ; then
-	exit 0
-fi
-
-depend() {
-	need udev
-	before xend
-}
-
-start() {
-	local time=0
-	local timeout=30
-
-	modprobe xen-evtchn 2>/dev/null
-	modprobe xen-gntdev 2>/dev/null
-	modprobe evtchn 2>/dev/null
-	modprobe gntdev 2>/dev/null
-
-	if ! `xenstore-read -s / >/dev/null 2>&1`
-	then
-		test -z "$XENSTORED_ROOTDIR" || XENSTORED_ROOTDIR="/var/lib/xenstored"
-		rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null
-		test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log"
-
-		ebegin "Starting xenstored..."
-		xenstored --pid-file=/var/run/xenstored.pid $XENSTORED_ARGS
-
-		# Wait for xenstored to actually come up, timing out after 30 seconds
-		while [ $time -lt $timeout ] && ! `xenstore-read -s / >/dev/null 2>&1` ; do
-			time=$(($time+1))
-			sleep 1
-		done
-
-		# Exit if we timed out
-		if ! [ $time -lt $timeout ] ; then
-			eend 1
-			echo Could not start xenstored
-			exit 1
-		fi
-		eend 0
-
-		ebegin "Setting domain 0 name..."
-		xenstore-write "/local/domain/0/name" "Domain-0"
-		eend $?
-	fi
-
-	ebegin "Starting xenconsoled..."
-	test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE"
-	xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS
-	eend $?
-
-	test -z "$XENBACKENDD_DEBUG" || XENBACKENDD_ARGS="-d"
-	test "`uname`" != "NetBSD" || xenbackendd $XENBACKENDD_ARGS
-}
-
-stop() {
-	ebegin "Stopping xenconsoled"
-	if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then
-		kill $pid
-		while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done
-		rm -f $XENCONSOLED_PIDFILE
-	fi
-	eend 0
-
-	echo WARNING: Not stopping xenstored, as it cannot be restarted.
-}
-
-status() {
-	xenstore-read -s / >/dev/null 2>&1
-}
diff --git a/testing/xen/xend.initd b/testing/xen/xend.initd
deleted file mode 100644
index 398ecd86b..000000000
--- a/testing/xen/xend.initd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need xencommons
-	before xendomains
-}
-
-await_daemons_up() {
-	i=1
-	rets=10
-	/usr/sbin/xend status
-	while [ $? -ne 0 -a $i -lt $rets ]; do
-		sleep 1
-		i=$(($i + 1))
-		/usr/sbin/xend status
-	done
-}
-
-start() {
-	ebegin "Starting Xen daemons"
-	if [ -z "`ps xenconsoled -o pid=`" ]; then
-		eend 1
-		echo "xencommons should be started first."
-		exit 1
-	fi
-	mkdir -p /var/lock
-	if [ -d /var/lock/subsys ]; then
-		touch /var/lock/subsys/xend
-	else
-		touch /var/lock/xend
-	fi
-	/usr/sbin/xend start
-	await_daemons_up
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Xen control daemon"
-	/usr/sbin/xend stop
-	rm -f /var/lock/subsys/xend /var/lock/xend
-	eend $?
-}
-
-restart() {
-	ebegin "Restarting Xen control daemon"
-	/usr/sbin/xend restart
-	await_daemons_up
-	eend $?
-}
-
-status() {
-	/usr/sbin/xend status
-}
diff --git a/testing/xen/xendomains.initd b/testing/xen/xendomains.initd
deleted file mode 100644
index 0f309ef3d..000000000
--- a/testing/xen/xendomains.initd
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/sbin/runscript
-
-CMD=xm
-/usr/sbin/$CMD list &> /dev/null
-if test $? -ne 0
-then
-	CMD=xl
-fi
-
-/usr/sbin/$CMD list &> /dev/null
-if test $? -ne 0
-then
-	eend 1;
-	exit 1;
-fi
-
-# Correct exit code would probably be 5, but it's enough 
-# if xend complains if we're not running as privileged domain
-if ! [ -e /proc/xen/privcmd ]; then
-	eend 1;
-	exit 1;
-fi
-
-# See docs/misc/distro_mapping.txt
-if [ -d /var/lock/subsys ]; then
-	LOCKFILE=/var/lock/subsys/xendomains
-else
-	LOCKFILE=/var/lock/xendomains
-fi
-
-if [ -d /etc/sysconfig ]; then
-	XENDOM_CONFIG=/etc/sysconfig/xendomains
-else
-	XENDOM_CONFIG=/etc/default/xendomains
-fi
-
-if ! [ -r $XENDOM_CONFIG ]; then
-	eend 1;
-	echo "$XENDOM_CONFIG not existing";
-	exit 1;
-fi
-
-. $XENDOM_CONFIG
-
-depend() {
-	need xencommons
-	after net xend
-}
-
-get_domname() {
-	local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alnum:]_\.-]+)\"?\W*;?/\1/p' "${1}" | tail -n 1)
-
-	if [[ -z ${name_from_file} ]] ; then
-		basename "${1}"
-	else
-		echo ${name_from_file}  
-	fi
-}
-
-is_running() {
-	/usr/sbin/$CMD list "${1}" >/dev/null 2>&1
-}
-
-start() {
-	einfo "Starting Xen domains in ${AUTODIR:=/etc/xen/auto}"
-
-	for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do
-		name=$(get_domname ${dom})
-		if ! is_running ${name} ; then
-			ebegin "  Starting domain ${name}"
-			/usr/sbin/$CMD create --quiet --defconfig ${dom}
-			eend $?
-		else
-			einfo "  Not starting ${name} - already running."
-		fi
-	done
-}
-
-stop() {
-	einfo "Stopping Xen domains in ${AUTODIR:=/etc/xen/auto}"
-
-	for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do
-		name=$(get_domname ${dom})
-		if is_running ${name} ; then
-			ebegin "  Sending shutdown signal to ${name}"
-			/usr/sbin/$CMD shutdown ${name} >/dev/null
-			eend $?
-		fi
-	done
-
-	for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do
-		name=$(get_domname ${dom})
-		if is_running ${name} ; then
-			ebegin "  Waiting for domain ${name} to shutdown"
-			/usr/sbin/$CMD shutdown --wait ${name}
-			eend $?
-		else
-			einfo "  Not stopping ${name} - not running."
-		fi
-	done
-}
-
-status() {
-	/usr/sbin/$CMD list
-}
diff --git a/testing/xulrunner/0002-Use-C99-math-isfinite.patch b/testing/xulrunner/0002-Use-C99-math-isfinite.patch
deleted file mode 100644
index 3d85a6928..000000000
--- a/testing/xulrunner/0002-Use-C99-math-isfinite.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cdb9db4c1c593dbe22db4f389a62fce034f31f2d Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 25 Nov 2011 08:30:51 +0000
-Subject: [PATCH 2/4] Use C99 math isfinite
-
----
- js/src/ctypes/CTypes.cpp |    2 +-
- xpcom/ds/nsMathUtils.h   |    6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp
-index 5c0f886..a3b1ae6 100644
---- a/js/src/ctypes/CTypes.cpp
-+++ b/js/src/ctypes/CTypes.cpp
-@@ -467,7 +467,7 @@ static inline bool FloatIsFinite(jsdouble f) {
- #ifdef WIN32
-   return _finite(f) != 0;
- #else
--  return finite(f);
-+  return isfinite(f);
- #endif
- }
- 
-diff --git a/xpcom/ds/nsMathUtils.h b/xpcom/ds/nsMathUtils.h
-index 21ffbec..2e80476 100644
---- a/xpcom/ds/nsMathUtils.h
-+++ b/xpcom/ds/nsMathUtils.h
-@@ -131,7 +131,11 @@ inline NS_HIDDEN_(bool) NS_finite(double d)
-     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
-     return !!_finite(d);
- #else
--    return finite(d);
-+#ifdef _GLIBCXX_CMATH
-+    return std::isfinite(d);
-+#else
-+    return isfinite(d);
-+#endif
- #endif
- }
- 
--- 
-1.7.7.4
-
diff --git a/testing/xulrunner/0003-xulrunner-jemalloc-aslr.patch b/testing/xulrunner/0003-xulrunner-jemalloc-aslr.patch
deleted file mode 100644
index 6784b13e7..000000000
--- a/testing/xulrunner/0003-xulrunner-jemalloc-aslr.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 88bb9f90ec1e4b43fb78596c8ff7577c92592eb4 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 25 Nov 2011 08:36:52 +0000
-Subject: [PATCH 3/4] xulrunner: jemalloc aslr
-
----
- memory/jemalloc/jemalloc.c |   33 ++++++++++++++++++++++-----------
- 1 files changed, 22 insertions(+), 11 deletions(-)
-
-diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
-index ad7c450..91de92c 100644
---- a/memory/jemalloc/jemalloc.c
-+++ b/memory/jemalloc/jemalloc.c
-@@ -410,7 +410,7 @@ void *_mmap(void *addr, size_t length, int prot, int flags,
- 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(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
- #define JEMALLOC_USES_MAP_ALIGN	 /* Required on Solaris 10. Might improve performance elsewhere. */
- #endif
- 
-@@ -2181,20 +2181,31 @@ pages_map_align(size_t size, int pfd, size_t alignment)
- 	 * We don't use MAP_FIXED here, because it can cause the *replacement*
- 	 * of existing mappings, and we only want to create new mappings.
- 	 */
--#ifdef MALLOC_PAGEFILE
--	if (pfd != -1) {
--		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
--		    MAP_NOSYNC | MAP_ALIGN, pfd, 0);
--	} else
--#endif
--	       {
--		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
--		    MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0);
--	}
-+	ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-+		    MAP_NOSYNC| MAP_ANON, -1, 0);
- 	assert(ret != NULL);
- 
- 	if (ret == MAP_FAILED)
- 		ret = NULL;
-+	else {
-+		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;
-+#ifdef MALLOC_PAGEFILE
-+		if (pfd != -1) {
-+			ret = mmap(ret, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-+			    MAP_NOSYNC | MAP_FIXED, pfd, 0);
-+		}
-+		if (ret == MAP_FAILED)
-+			ret = NULL;
-+#endif
-+	}
- 	return (ret);
- }
- #endif
--- 
-1.7.7.4
-
diff --git a/testing/xulrunner/0004-xulrunner-malloc_usable_size.patch b/testing/xulrunner/0004-xulrunner-malloc_usable_size.patch
deleted file mode 100644
index 986b183ec..000000000
--- a/testing/xulrunner/0004-xulrunner-malloc_usable_size.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Timo Teräs <timo.teras@iki.fi>
-
-malloc_usable_size is not defined on uclibc, so workaround
-that in jemalloc. Fix mozalloc linking.
-
---- mozilla-release-old/memory/jemalloc/jemalloc.h
-+++ mozilla-release/memory/jemalloc/jemalloc.h
-@@ -75,8 +75,12 @@
- /* Linux has memalign and malloc_usable_size */
- #if !defined(MOZ_MEMORY_LINUX)
- void	*memalign(size_t alignment, size_t size);
--size_t	malloc_usable_size(const void *ptr);
- #endif /* MOZ_MEMORY_LINUX */
-+
-+#include <features.h>
-+#if defined(__UCLIBC__) || !defined(MOZ_MEMORY_LINUX)
-+size_t	malloc_usable_size(const void *ptr);
-+#endif
- 
- void	jemalloc_stats(jemalloc_stats_t *stats);
- 
---- mozilla-release-old/memory/mozalloc/Makefile.in
-+++ mozilla-release/memory/mozalloc/Makefile.in
-@@ -43,6 +43,10 @@
- 
- include $(DEPTH)/config/autoconf.mk
- 
-+ifdef MOZ_MEMORY
-+SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc)
-+endif
-+
- VISIBILITY_FLAGS=
- STL_FLAGS	=
- ifdef _MSC_VER
diff --git a/testing/xulrunner/APKBUILD b/testing/xulrunner/APKBUILD
deleted file mode 100644
index e5954846f..000000000
--- a/testing/xulrunner/APKBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=xulrunner
-pkgver=10.0
-_ffoxver=10.0
-pkgrel=4
-pkgdesc="runtime environment for xul-based applications"
-url="http://developer.mozilla.org/en/XULRunner"
-arch="all"
-license="GPL LGPL MPL"
-depends=
-depends_dev="nspr-dev
-	     nss-dev
-	     gtk+-dev
-	     dbus-glib-dev
-	     alsa-lib-dev
-	     libvorbis-dev
-	     libogg-dev
-	     libtheora-dev
-	     wireless-tools-dev
-	     libnotify-dev
-	     libevent-dev
-	     libxt-dev
-	     jpeg-dev
-	     bzip2-dev
-	     hunspell-dev
-	     startup-notification-dev
-	     sqlite-dev
-	     libidl-dev
-	     mesa-dev"
-makedepends="$depends_dev 
-
-	     autoconf2.13
-
-	     python
-	     zip
-	     yasm
-
-	     autoconf
-	     automake
-	     libtool"
-install=""
-options=""
-subpackages="$pkgname-dev"
-# http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/${pkgver}/source/${pkgname}-${pkgver}.source.tar.bz2
-source="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2
-
-	mozconfig
-	0002-Use-C99-math-isfinite.patch
-	0003-xulrunner-jemalloc-aslr.patch
-	0004-xulrunner-malloc_usable_size.patch
-	ff9-aslr-fix.patch
-	"
-
-_builddir="${srcdir}/mozilla-release"
-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
-
-	cp "${srcdir}/mozconfig" .mozconfig
-}
-
-build() {
-	cd "$_builddir"
-
-	# mozilla's buildsystem is on drugs, so we just kill our CFLAGS and hope
-	# for the best. --nenolod
-	unset CFLAGS
-	unset CXXFLAGS
-
-	make -j1 -f client.mk build \
-		MOZ_MAKE_FLAGS="$MAKEFLAGS" || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" -f client.mk install || return 1
-
-	# make install does not install xpt.py but its needed by firefox
-	mkdir -p "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin
-	cp xpcom/typelib/xpt/tools/xpt.py \
-		"$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/
-
-	msg "Setting up compatibility symlinks..."
-	ln -sf /usr/lib/xulrunner-${pkgver}/libxul.so "${pkgdir}"/usr/lib/libxul.so
-	ln -sf /usr/lib/xulrunner-${pkgver}/libxpcom.so "${pkgdir}"/usr/lib/libxpcom.so
-	ln -sf /usr/lib/xulrunner-${pkgver}/libmozalloc.so "${pkgdir}"/usr/lib/libmozalloc.so
-}
-
-dev() {
-	replaces="xulrunner"
-	depends="xulrunner"
-
-	mkdir -p "${subpkgdir}"/usr/lib
-	mv "${pkgdir}"/usr/lib/xulrunner-devel-${pkgver} "${subpkgdir}"/usr/lib
-	mv "${pkgdir}"/usr/lib/pkgconfig "${subpkgdir}"/usr/lib
-	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
-}
-
-md5sums="13c61203ccfa583e5a54b4dc22f41233  firefox-10.0.source.tar.bz2
-b0f7d491bc800b69ec718667a4b08acb  mozconfig
-1867db217d10722675c88b655db8c2d7  0002-Use-C99-math-isfinite.patch
-7faa279d64c9ec2e7abc7c0497c7e07e  0003-xulrunner-jemalloc-aslr.patch
-d12e0636e1f9877ef2d1df45d5834c87  0004-xulrunner-malloc_usable_size.patch
-96b40acd003a0a586e408bf09ae5af1d  ff9-aslr-fix.patch"
diff --git a/testing/xulrunner/ff9-aslr-fix.patch b/testing/xulrunner/ff9-aslr-fix.patch
deleted file mode 100644
index 4e4297d0e..000000000
--- a/testing/xulrunner/ff9-aslr-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./js/src/jsgcchunk.cpp        2011-12-22 17:13:21.000000000 +0000

-+++ ./js/src/jsgcchunk.cpp        2011-12-22 17:18:31.000000000 +0000

-@@ -213,7 +213,7 @@

- #elif defined(XP_UNIX)

- 

- /* Required on Solaris 10. Might improve performance elsewhere. */

--# if defined(SOLARIS) && defined(MAP_ALIGN)

-+# if (defined(SOLARIS) && defined(MAP_ALIGN)) || defined(MOZ_MEMORY_LINUX) 

- #  define JS_GC_HAS_MAP_ALIGN

- 

- static void *

---- ./js/src/jsgcchunk.cpp        2011-12-22 17:55:24.000000000 +0000

-+++ ./js/src/jsgcchunk.cpp        2011-12-22 18:02:24.000000000 +0000

-@@ -226,12 +226,24 @@

- #ifdef SOLARIS

-     void *p = mmap((caddr_t) alignment, size, PROT_READ | PROT_WRITE,

-                      MAP_PRIVATE | MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0);

-+    if (p == MAP_FAILED)

-+        return NULL;

- #else

--    void *p = mmap((void *) alignment, size, PROT_READ | PROT_WRITE,

--                     MAP_PRIVATE | MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0);

--#endif

-+    void *p = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE,

-+                     MAP_PRIVATE | MAP_NOSYNC | MAP_ANON, -1, 0);

-     if (p == MAP_FAILED)

-         return NULL;

-+       uintptr_t aligned_ret;

-+       size_t extra_size;

-+

-+       aligned_ret = (uintptr_t)p + alignment - 1;

-+       aligned_ret &= ~(alignment - 1);

-+       extra_size = aligned_ret - (uintptr_t)p;

-+       munmap(p, extra_size);

-+       munmap(p + extra_size + size, alignment - extra_size);

-+       p = (void *)aligned_ret;

-+#endif

-+

-     return p;

- }

diff --git a/testing/xulrunner/mozconfig b/testing/xulrunner/mozconfig
deleted file mode 100644
index 2cbb45b7a..000000000
--- a/testing/xulrunner/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-. $topsrcdir/xulrunner/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-libevent
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-cairo
-ac_add_options --with-pthreads
-ac_add_options --enable-strip
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --disable-javaxpcom
-ac_add_options --disable-crashreporter
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-extensions=default
-ac_add_options --enable-jemalloc
-ac_add_options --disable-elf-hack
-
-# export LIBS="-lubacktrace"
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1