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

author: Fabian Affolter <fabian@affolter-engineering.ch> 2012-01-30 02:37:57 +0000
committer: Fabian Affolter <fabian@affolter-engineering.ch> 2012-01-30 02:37:57 +0000
commit: a9bc84bba147c649e2e30f270add42d6c6da0b4e (patch)
tree: e85cb22d969966900b71e0ba4a26e6d600044904 /testing
parent: 9ba6d526aaff5714cb1ad8b9e91c5576e19e0e0b (diff)
parent: 5d7f87f856d5ab5c13148f781a309af5c9ceff02 (diff)
download: aports-a9bc84bba147c649e2e30f270add42d6c6da0b4e.tar.bz2
aports-a9bc84bba147c649e2e30f270add42d6c6da0b4e.tar.xz
85 files changed, 3072 insertions, 360 deletions
diff --git a/testing/apache2-mod-perl/APKBUILD b/testing/apache2-mod-perl/APKBUILD
index badafd0ef..3a9c62d52 100644
--- a/testing/apache2-mod-perl/APKBUILD
+++ b/testing/apache2-mod-perl/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=apache2-mod-perl
 _realname=mod_perl
 pkgver=2.0.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Perl Module for Apache2"
 url="http://perl.apache.org/"
 arch="all"
diff --git a/testing/aria2/APKBUILD b/testing/aria2/APKBUILD
deleted file mode 100644
index 66fff9e8c..000000000
--- a/testing/aria2/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Jeff Bilyk <jbilyk@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=aria2
-pkgver=1.14.1
-pkgrel=1
-pkgdesc="Download utility for HTTP(S), FTP, Bittorrent, and Metalink"
-url="http://aria2.sourceforge.net"
-arch="all"
-license="GPL"
-depends="ca-certificates"
-depends_dev="gnutls-dev expat-dev sqlite-dev c-ares-dev"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/aria2/aria2-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--disable-nls \
-		--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
-		|| return 1
-	make
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="3a23844ab3e1460eb7e6dac9b5dd798c  aria2-1.14.1.tar.bz2"
diff --git a/testing/dovecot-deleted-to-trash-plugin/APKBUILD b/testing/dovecot-deleted-to-trash-plugin/APKBUILD
new file mode 100644
index 000000000..91a8028ef
--- /dev/null
+++ b/testing/dovecot-deleted-to-trash-plugin/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=dovecot-deleted-to-trash-plugin
+pkgver=0.3
+pkgrel=1
+pkgdesc="Copy deleted email to trash for broken IMAP clients (Outlook)"
+url="http://wiki2.dovecot.org/Plugins/deleted-to-trash"
+arch="all"
+license="unknown"
+depends=""
+makedepends="dovecot-dev"
+install=""
+subpackages=""
+source="http://dev.alpinelinux.org/archive/dovecot-deleted-to-trash-plugin/dovecot-deleted-to-trash-plugin-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/dovecot-deleted-to-trash-plugin-$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" \
+		DOVECOT_IMAP_PLUGIN_PATH=/usr/lib/dovecot
+}
+
+md5sums="63bdfa71312abc2dcaae5cfedd1db622  dovecot-deleted-to-trash-plugin-0.3.tar.bz2"
diff --git a/testing/dssi/APKBUILD b/testing/dssi/APKBUILD
new file mode 100644
index 000000000..20ab9e044
--- /dev/null
+++ b/testing/dssi/APKBUILD
@@ -0,0 +1,57 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=dssi
+pkgver=1.1.1
+pkgrel=0
+pkgdesc="Disposable Soft Synth Interface"
+url="http://dssi.sourceforge.net/"
+arch="all"
+license="MIT"
+depends=""
+depends_dev="alsa-lib-dev ladspa-dev"
+makedepends="$depends_dev jack-dev libsamplerate-dev libsndfile-dev liblo-dev"
+install=""
+subpackages="$pkgname-dev $pkgname-doc $pkgname-examples"
+source="http://download.sf.net/sourceforge/dssi/dssi-$pkgver.tar.gz"
+
+_builddir="$srcdir"/dssi-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+
+	# sanity check
+	make -C tests controller && tests/controller
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la \
+		"$pkgdir"/usr/lib/dssi/*.la
+}
+
+examples() {
+	pkgdesc="DSSI plugin examples"
+	mkdir -p "$subpkgdir"/usr/lib/dssi/
+	mv "$pkgdir"/usr/lib/dssi/less_trivial* \
+		"$pkgdir"/usr/lib/dssi/trivial_* \
+		"$pkgdir"/usr/lib/dssi/karplong* \
+		"$subpkgdir"/usr/lib/dssi/
+}
+md5sums="619ab73c883b02dc37ddb37001591f8b  dssi-1.1.1.tar.gz"
diff --git a/testing/ejabberd/APKBUILD b/testing/ejabberd/APKBUILD
index 7adb85805..a53e432f3 100644
--- a/testing/ejabberd/APKBUILD
+++ b/testing/ejabberd/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="An erlang jabber server"
 url="http://www.ejabberd.im"
 arch="x86"
 license="GPL"
-depends=
+depends="erlang"
 depends_dev="erlang-dev expat-dev libiconv-dev openssl-dev zlib-dev"
 makedepends="$depends_dev"
 install="$pkgname.post-install $pkgname.post-upgrade"
diff --git a/testing/evolution-data-server/APKBUILD b/testing/evolution-data-server/APKBUILD
index e7fffe324..74db2d670 100644
--- a/testing/evolution-data-server/APKBUILD
+++ b/testing/evolution-data-server/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=evolution-data-server
-pkgver=2.32.2
-pkgrel=6
+pkgver=2.32.3
+pkgrel=0
 pkgdesc="data server for evolution"
 url="http://projects.gnome.org/evolution"
 arch="all"
@@ -11,8 +11,11 @@ depends=
 depends_dev="gtk+-dev glib-dev libsoup-dev libxml2-dev gconf-dev libgdata-dev db-dev libgweather-dev libgnome-keyring-dev libical-dev nspr-dev nss-dev sqlite-dev"
 makedepends="$depends_dev gperf flex bison"
 install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+source="ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+	g_unicode_canonical_decomposition.patch
+	g_atomic_int_exchange_and_add.patch
+	"
 
 _builddir="${srcdir}/${pkgname}-${pkgver}"
 prepare() {
@@ -33,7 +36,7 @@ build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-scrollkeeper || return 1
+		|| return 1
 	make || return 1
 }
 
@@ -43,4 +46,6 @@ package() {
 	find "$pkgdir" -name '*.la' -delete
 }
 
-md5sums="19d230667c0dfb1c06b8fe951fd552ff  evolution-data-server-2.32.2.tar.bz2"
+md5sums="480bab0702991692f9dee9fecfc49f48  evolution-data-server-2.32.3.tar.bz2
+464467c7a90ca790002356046dae8356  g_unicode_canonical_decomposition.patch
+2578f99935e070bd4db96a08f1bdb819  g_atomic_int_exchange_and_add.patch"
diff --git a/testing/evolution-data-server/g_atomic_int_exchange_and_add.patch b/testing/evolution-data-server/g_atomic_int_exchange_and_add.patch
new file mode 100644
index 000000000..59c114134
--- /dev/null
+++ b/testing/evolution-data-server/g_atomic_int_exchange_and_add.patch
@@ -0,0 +1,45 @@
+From 1886d3d0573388aa5c13af99f714687ba6a66ec6 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 01 Jun 2011 05:22:14 +0000
+Subject: Replace deprecated g_atomic_int_exchange_and_add()
+
+---
+(limited to 'addressbook/libedata-book/e-data-book.c')
+
+diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
+index 9e17703..1a29e4b 100644
+--- a/addressbook/libedata-book/e-data-book.c
++++ b/addressbook/libedata-book/e-data-book.c
+@@ -117,7 +117,7 @@ construct_bookview_path (void)
+ 
+ 	return g_strdup_printf ("/org/gnome/evolution/dataserver/AddressBookView/%d/%d",
+ 				getpid (),
+-				g_atomic_int_exchange_and_add ((int*)&counter, 1));
++				g_atomic_int_add ((int*)&counter, 1));
+ }
+ 
+ static void
+--
+cgit v0.9.0.2
+--- ./addressbook/libedata-book/e-data-book-factory.c.orig
++++ ./addressbook/libedata-book/e-data-book-factory.c
+@@ -229,7 +229,7 @@
+ 
+ 	return g_strdup_printf (
+ 		"/org/gnome/evolution/dataserver/addressbook/%d/%u",
+-		getpid (), g_atomic_int_exchange_and_add (&counter, 1));
++		getpid (), g_atomic_int_add (&counter, 1));
+ }
+ 
+ static gboolean
+--- ./calendar/libedata-cal/e-data-cal-factory.c.orig
++++ ./calendar/libedata-cal/e-data-cal-factory.c
+@@ -245,7 +245,7 @@
+ 
+ 	return g_strdup_printf (
+ 		"/org/gnome/evolution/dataserver/calendar/%d/%u",
+-		getpid (), g_atomic_int_exchange_and_add (&counter, 1));
++		getpid (), g_atomic_int_add (&counter, 1));
+ }
+ 
+ static gboolean
diff --git a/testing/evolution-data-server/g_unicode_canonical_decomposition.patch b/testing/evolution-data-server/g_unicode_canonical_decomposition.patch
new file mode 100644
index 000000000..d00a06ddc
--- /dev/null
+++ b/testing/evolution-data-server/g_unicode_canonical_decomposition.patch
@@ -0,0 +1,57 @@
+From f1c9292caa3b26c890d628e99677dd05d62eba99 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Tue, 06 Sep 2011 14:43:04 +0000
+Subject: Bug #655837 - Avoid use of deprecated g_unicode_canonical_decomposition
+
+---
+(limited to 'libedataserver/e-data-server-util.c')
+
+diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
+index 4c0310a..3f2ff02 100644
+--- a/libedataserver/e-data-server-util.c
++++ b/libedataserver/e-data-server-util.c
+@@ -251,7 +251,12 @@ e_util_utf8_strstrcase (const gchar *haystack,
+ static gunichar
+ stripped_char (gunichar ch)
+ {
+-	gunichar *decomp, retval;
++#if GLIB_CHECK_VERSION(2,29,12)
++	gunichar decomp[4];
++#else
++	gunichar *decomp;
++#endif
++	gunichar retval;
+ 	GUnicodeType utype;
+ 	gsize dlen;
+ 
+@@ -268,11 +273,18 @@ stripped_char (gunichar ch)
+ 		/* Convert to lowercase, fall through */
+ 		ch = g_unichar_tolower (ch);
+ 	case G_UNICODE_LOWERCASE_LETTER:
++#if GLIB_CHECK_VERSION(2,29,12)
++		if ((dlen = g_unichar_fully_decompose (ch, FALSE, decomp, 4))) {
++			retval = decomp[0];
++			return retval;
++		}
++#else
+ 		if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) {
+ 			retval = decomp[0];
+ 			g_free (decomp);
+ 			return retval;
+ 		}
++#endif
+ 		break;
+ 	}
+ 
+--
+cgit v0.9.0.2
+--- ./libedataserver/e-data-server-util.c.orig
++++ ./libedataserver/e-data-server-util.c
+@@ -260,7 +260,6 @@
+ 	case G_UNICODE_CONTROL:
+ 	case G_UNICODE_FORMAT:
+ 	case G_UNICODE_UNASSIGNED:
+-	case G_UNICODE_COMBINING_MARK:
+ 		/* Ignore those */
+ 		return 0;
+ 	default:
diff --git a/testing/exim/APKBUILD b/testing/exim/APKBUILD
index 713500ec0..889b91b53 100644
--- a/testing/exim/APKBUILD
+++ b/testing/exim/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jesse Young <jlyo@jlyo.org>
 pkgname=exim
 pkgver=4.77
-pkgrel=2
+pkgrel=3
 pkgdesc="A Message Transfer Agent"
 url="http://www.exim.org/"
 arch="all"
diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD
new file mode 100644
index 000000000..757ab6f2c
--- /dev/null
+++ b/testing/firefox/APKBUILD
@@ -0,0 +1,122 @@
+# 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
new file mode 100644
index 000000000..1916cb3b8
--- /dev/null
+++ b/testing/firefox/firefox-5.0-asciidel.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000..1538fc674
--- /dev/null
+++ b/testing/firefox/firefox-safe.desktop
@@ -0,0 +1,11 @@
+[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
new file mode 100644
index 000000000..d048ce46c
--- /dev/null
+++ b/testing/firefox/firefox.desktop
@@ -0,0 +1,81 @@
+[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
new file mode 100644
index 000000000..f1b23fae9
--- /dev/null
+++ b/testing/firefox/mozconfig
@@ -0,0 +1,44 @@
+. $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/gnuplot/APKBUILD b/testing/gnuplot/APKBUILD
new file mode 100644
index 000000000..4210219ea
--- /dev/null
+++ b/testing/gnuplot/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer:
+pkgname=gnuplot
+pkgver=4.4.4
+pkgrel=0
+pkgdesc="utility for plotting graphs"
+url="http://www.gnuplot.info/"
+arch="all"
+license="GPL"
+depends=""
+depends_dev="cairo-dev pango-dev gd-dev lua-dev readline-dev libpng-dev jpeg-dev"
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/project/gnuplot/gnuplot/$pkgver/gnuplot-$pkgver.tar.gz"
+
+_builddir="$srcdir"/gnuplot-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-wxwidgets \
+		--disable-qt || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="97a43328e81e57ebed7f135ca0c07e82  gnuplot-4.4.4.tar.gz"
diff --git a/testing/imake/APKBUILD b/testing/imake/APKBUILD
index 64704c637..cf5117efd 100644
--- a/testing/imake/APKBUILD
+++ b/testing/imake/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imake
 pkgver=1.0.4
-pkgrel=0
+pkgrel=1
 pkgdesc="X Windows make utility"
 url="http://www.x.org"
 arch="all"
@@ -10,7 +10,7 @@ depends=
 depends_dev=
 makedepends="xproto util-macros $depends_dev"
 install=""
-#subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-doc"
 source="http://ftp.x.org/pub/individual/util/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -26,14 +26,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure || make || return 1
+	./configure --prefix=/usr \
+		|| return 1
+	make || return 1
 }
 
 package() {
-        echo "PACKAGE stage"
-	echo "pkgdir = $pkgdir"
 	cd "$_builddir"
-	pwd
 	make DESTDIR="$pkgdir" install || return 1
 }
 
diff --git a/testing/ladspa/0001-proper-build.patch b/testing/ladspa/0001-proper-build.patch
new file mode 100644
index 000000000..fa3a6c43e
--- /dev/null
+++ b/testing/ladspa/0001-proper-build.patch
@@ -0,0 +1,111 @@
+From b87125e3eeb3e3446f80566083e5d66e7a667567 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Sat, 4 Feb 2012 21:22:13 +0000
+Subject: [PATCH 1/3] proper build
+
+---
+ src/makefile |   50 +++++++++++++++++++++++++++++---------------------
+ 1 files changed, 29 insertions(+), 21 deletions(-)
+
+diff --git a/src/makefile b/src/makefile
+index 886237f..10ce82d 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -13,10 +13,12 @@ INSTALL_BINARY_DIR	=	/usr/bin/
+ # GENERAL
+ #
+ 
++CFLAGS		?=	-Wall -Werror -O3
++CXXFLAGS	?=	-Wall -Werror -O3
++
+ INCLUDES	=	-I.
+-LIBRARIES	=	-ldl -lm
+-CFLAGS		=	$(INCLUDES) -Wall -Werror -O3 -fPIC
+-CXXFLAGS	=	$(CFLAGS)
++DYNAMIC_LD_LIBS =	-ldl
++LIBRARIES	=	$(DYNAMIC_LD_LIBS) -lm
+ PLUGINS		=	../plugins/amp.so				\
+ 			../plugins/delay.so				\
+ 			../plugins/filter.so				\
+@@ -25,21 +27,27 @@ PLUGINS		=	../plugins/amp.so				\
+ PROGRAMS	=	../bin/analyseplugin				\
+ 			../bin/applyplugin 				\
+ 			../bin/listplugins
+-CC		=	cc
+-CPP		=	c++
++CC		?=	cc
++CXX		?=	c++
++MKDIR_P		?=	mkdir -p
+ 
+ ###############################################################################
+ #
+ # RULES TO BUILD PLUGINS FROM C OR C++ CODE
+ #
+ 
++LDFLAGS_filter	= -lm
++
+ ../plugins/%.so:	plugins/%.c ladspa.h
+-	$(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
+-	$(LD) -o ../plugins/$*.so plugins/$*.o -shared
++	$(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared $(LDFLAGS_$*)
+ 
+ ../plugins/%.so:	plugins/%.cpp ladspa.h
+-	$(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
+-	$(CPP) -o ../plugins/$*.so plugins/$*.o -shared
++	$(CXX) $(CXXFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.cpp
++	$(CXX) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared $(LDFLAGS_$*)
++
++%.o: %.c
++	$(CC) $(CFLAGS) -DPLUGINDIR=\"$(INSTALL_PLUGINS_DIR)\" -c $<
+ 
+ ###############################################################################
+ #
+@@ -59,12 +67,12 @@ test:	/tmp/test.wav ../snd/noise.wav always
+ 	@echo Test complete.
+ 
+ install:	targets
+-	-mkdirhier $(INSTALL_PLUGINS_DIR)
+-	-mkdirhier $(INSTALL_INCLUDE_DIR)
+-	-mkdirhier $(INSTALL_BINARY_DIR)
+-	cp ../plugins/* $(INSTALL_PLUGINS_DIR)
+-	cp ladspa.h $(INSTALL_INCLUDE_DIR)
+-	cp ../bin/* $(INSTALL_BINARY_DIR)
++	-$(MKDIR_P) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
++	-$(MKDIR_P) $(DESTDIR)$(INSTALL_INCLUDE_DIR)
++	-$(MKDIR_P) $(DESTDIR)$(INSTALL_BINARY_DIR)
++	cp ../plugins/* $(DESTDIR)$(INSTALL_PLUGINS_DIR)
++	cp ladspa.h $(DESTDIR)$(INSTALL_INCLUDE_DIR)
++	cp ../bin/* $(DESTDIR)$(INSTALL_BINARY_DIR)
+ 
+ /tmp/test.wav:	targets ../snd/noise.wav
+ 	../bin/listplugins
+@@ -90,19 +98,19 @@ targets:	$(PLUGINS) $(PROGRAMS)
+ #
+ 
+ ../bin/applyplugin:	applyplugin.o load.o default.o
+-	$(CC) $(CFLAGS) $(LIBRARIES)					\
++	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)				\
+ 		-o ../bin/applyplugin					\
+-		applyplugin.o load.o default.o
++		applyplugin.o load.o default.o $(LIBRARIES)
+ 
+ ../bin/analyseplugin:	analyseplugin.o load.o default.o
+-	$(CC) $(CFLAGS) $(LIBRARIES)					\
++	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)				\
+ 		-o ../bin/analyseplugin 				\
+-		analyseplugin.o load.o default.o
++		analyseplugin.o load.o default.o $(LIBRARIES)
+ 
+ ../bin/listplugins:	listplugins.o search.o
+-	$(CC) $(CFLAGS) $(LIBRARIES)					\
++	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)				\
+ 		-o ../bin/listplugins	 				\
+-		listplugins.o search.o
++		listplugins.o search.o $(LIBRARIES)
+ 
+ ###############################################################################
+ #
+-- 
+1.7.9
+
diff --git a/testing/ladspa/0002-plugin-constructor-destructor.patch b/testing/ladspa/0002-plugin-constructor-destructor.patch
new file mode 100644
index 000000000..f0061e823
--- /dev/null
+++ b/testing/ladspa/0002-plugin-constructor-destructor.patch
@@ -0,0 +1,119 @@
+From d281f99e3776027e98f3b9d952fad0d456a75b8a Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Sat, 4 Feb 2012 22:04:33 +0000
+Subject: [PATCH 2/3] plugin constructor destructor
+
+---
+ src/plugins/amp.c    |    8 ++++----
+ src/plugins/delay.c  |    8 ++++----
+ src/plugins/filter.c |    8 ++++----
+ src/plugins/noise.c  |    8 ++++----
+ 4 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/src/plugins/amp.c b/src/plugins/amp.c
+index b6d2345..a447fa1 100644
+--- a/src/plugins/amp.c
++++ b/src/plugins/amp.c
+@@ -152,8 +152,8 @@ LADSPA_Descriptor * g_psStereoDescriptor = NULL;
+ 
+ /* _init() is called automatically when the plugin library is first
+    loaded. */
+-void 
+-_init() {
++void __attribute__ ((constructor))
++my_init() {
+ 
+   char ** pcPortNames;
+   LADSPA_PortDescriptor * piPortDescriptors;
+@@ -335,8 +335,8 @@ deleteDescriptor(LADSPA_Descriptor * psDescriptor) {
+ /*****************************************************************************/
+ 
+ /* _fini() is called automatically when the library is unloaded. */
+-void
+-_fini() {
++void __attribute__ ((destructor))
++my_fini() {
+   deleteDescriptor(g_psMonoDescriptor);
+   deleteDescriptor(g_psStereoDescriptor);
+ }
+diff --git a/src/plugins/delay.c b/src/plugins/delay.c
+index 8b03979..22e477b 100644
+--- a/src/plugins/delay.c
++++ b/src/plugins/delay.c
+@@ -228,8 +228,8 @@ LADSPA_Descriptor * g_psDescriptor = NULL;
+ 
+ /* _init() is called automatically when the plugin library is first
+    loaded. */
+-void 
+-_init() {
++void __attribute__ ((constructor))
++my_init() {
+ 
+   char ** pcPortNames;
+   LADSPA_PortDescriptor * piPortDescriptors;
+@@ -322,8 +322,8 @@ _init() {
+ /*****************************************************************************/
+ 
+ /* _fini() is called automatically when the library is unloaded. */
+-void 
+-_fini() {
++void __attribute__ ((destructor))
++my_fini() {
+   long lIndex;
+   if (g_psDescriptor) {
+     free((char *)g_psDescriptor->Label);
+diff --git a/src/plugins/filter.c b/src/plugins/filter.c
+index 3f50457..06f7bc6 100644
+--- a/src/plugins/filter.c
++++ b/src/plugins/filter.c
+@@ -252,8 +252,8 @@ LADSPA_Descriptor * g_psHPFDescriptor = NULL;
+ 
+ /* _init() is called automatically when the plugin library is first
+    loaded. */
+-void 
+-_init() {
++void __attribute__ ((constructor)) 
++my_init() {
+ 
+   char ** pcPortNames;
+   LADSPA_PortDescriptor * piPortDescriptors;
+@@ -431,8 +431,8 @@ deleteDescriptor(LADSPA_Descriptor * psDescriptor) {
+ /*****************************************************************************/
+ 
+ /* _fini() is called automatically when the library is unloaded. */
+-void
+-_fini() {
++void __attribute__ ((destructor))
++my_fini() {
+   deleteDescriptor(g_psLPFDescriptor);
+   deleteDescriptor(g_psHPFDescriptor);
+ }
+diff --git a/src/plugins/noise.c b/src/plugins/noise.c
+index 0fdd938..de6fc81 100644
+--- a/src/plugins/noise.c
++++ b/src/plugins/noise.c
+@@ -142,8 +142,8 @@ LADSPA_Descriptor * g_psDescriptor;
+ 
+ /* _init() is called automatically when the plugin library is first
+    loaded. */
+-void 
+-_init() {
++void __attribute__ ((constructor))
++my_init() {
+ 
+   char ** pcPortNames;
+   LADSPA_PortDescriptor * piPortDescriptors;
+@@ -219,8 +219,8 @@ _init() {
+ /*****************************************************************************/
+ 
+ /* _fini() is called automatically when the library is unloaded. */
+-void 
+-_fini() {
++void __attribute__ ((destructor)) 
++my_fini() {
+   long lIndex;
+   if (g_psDescriptor) {
+     free((char *)g_psDescriptor->Label);
+-- 
+1.7.9
+
diff --git a/testing/ladspa/0003-plugindir.patch b/testing/ladspa/0003-plugindir.patch
new file mode 100644
index 000000000..bd78ee51f
--- /dev/null
+++ b/testing/ladspa/0003-plugindir.patch
@@ -0,0 +1,42 @@
+From 8e18df685c5fe747c6d250460d265a402f7900b1 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Sat, 4 Feb 2012 22:05:24 +0000
+Subject: [PATCH 3/3] plugindir
+
+---
+ src/load.c   |    2 ++
+ src/search.c |    5 +----
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/load.c b/src/load.c
+index c2a5aa7..e221c10 100644
+--- a/src/load.c
++++ b/src/load.c
+@@ -54,6 +54,8 @@ dlopenLADSPA(const char * pcFilename, int iFlag) {
+        to search. */
+ 
+     pcLADSPAPath = getenv("LADSPA_PATH");
++    if (! pcLADSPAPath)
++      pcLADSPAPath = PLUGINDIR;
+     
+     if (pcLADSPAPath) {
+ 
+diff --git a/src/search.c b/src/search.c
+index 0006712..a6b2e78 100644
+--- a/src/search.c
++++ b/src/search.c
+@@ -99,10 +99,7 @@ LADSPAPluginSearch(LADSPAPluginSearchCallbackFunction fCallbackFunction) {
+ 
+   pcLADSPAPath = getenv("LADSPA_PATH");
+   if (!pcLADSPAPath) {
+-    fprintf(stderr,
+-	    "Warning: You do not have a LADSPA_PATH "
+-	    "environment variable set.\n");
+-    return;
++    pcLADSPAPath = PLUGINDIR;
+   }
+   
+   pcStart = pcLADSPAPath;
+-- 
+1.7.9
+
diff --git a/testing/ladspa/APKBUILD b/testing/ladspa/APKBUILD
new file mode 100644
index 000000000..573bccf9f
--- /dev/null
+++ b/testing/ladspa/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=ladspa
+pkgver=1.13
+pkgrel=0
+pkgdesc="Linux Audio Developer's Simple Plug-in API, examples and tools"
+url="http://www.ladspa.org/"
+arch="all"
+license="LGPLv2+"
+depends=""
+makedepends=""
+install=""
+subpackages="$pkgname-dev"
+source="http://www.ladspa.org/download/ladspa_sdk_$pkgver.tgz
+	0001-proper-build.patch
+	0002-plugin-constructor-destructor.patch
+	0003-plugindir.patch
+	"
+
+_builddir="$srcdir"/ladspa_sdk
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	make -C src targets  || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make -C src install DESTDIR="$pkgdir" || return 1
+}
+
+md5sums="671be3e1021d0722cadc7fb27054628e  ladspa_sdk_1.13.tgz
+0e834af5f341081b772848ed3a753d5d  0001-proper-build.patch
+4b5c8831519e7485f2dacc5663375872  0002-plugin-constructor-destructor.patch
+95943ab38a96051ff4a6caf33182634c  0003-plugindir.patch"
diff --git a/testing/libdvdcss/APKBUILD b/testing/libdvdcss/APKBUILD
new file mode 100644
index 000000000..c9e443b05
--- /dev/null
+++ b/testing/libdvdcss/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Timo Teräs <timo.teras@iki.fi>
+pkgname=libdvdcss
+pkgver=1.2.11
+pkgrel=0
+pkgdesc="a library to access (encrypted) DVDs like a block device"
+url="http://www.videolan.org/developers/libdvdcss.html"
+arch="all"
+license="GPL"
+depends=""
+depends_dev=""
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev"
+source="http://www.videolan.org/pub/libdvdcss/$pkgver/$pkgname-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/libdvdcss-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="d25d906c3f9007ccd91b1efb909f93e7  libdvdcss-1.2.11.tar.bz2"
diff --git a/testing/libdvdnav/APKBUILD b/testing/libdvdnav/APKBUILD
new file mode 100644
index 000000000..e0a9e052a
--- /dev/null
+++ b/testing/libdvdnav/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Timo Teräs <timo.teras@iki.fi>
+pkgname=libdvdnav
+pkgver=4.2.0
+pkgrel=0
+pkgdesc="a library for sophisticated DVD navigation features"
+url="http://dvdnav.mplayerhq.hu/"
+arch="all"
+license="GPL"
+depends=""
+depends_dev="libdvdread-dev"
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev"
+source="http://dvdnav.mplayerhq.hu/releases/$pkgname-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/libdvdnav-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure2 --prefix=/usr --disable-static --disable-debug --enable-shared || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="53be8903f9802e101929a3451203bbf6  libdvdnav-4.2.0.tar.bz2"
diff --git a/testing/libdvdread/APKBUILD b/testing/libdvdread/APKBUILD
new file mode 100644
index 000000000..872c48e52
--- /dev/null
+++ b/testing/libdvdread/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Timo Teräs <timo.teras@iki.fi>
+pkgname=libdvdread
+pkgver=4.2.0
+pkgrel=0
+pkgdesc="a simple foundation for reading DVD video disks"
+url="http://dvdnav.mplayerhq.hu/"
+arch="all"
+license="GPL"
+depends=""
+depends_dev=""
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev"
+source="http://dvdnav.mplayerhq.hu/releases/libdvdread-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/libdvdread-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure2 --prefix=/usr --disable-static --disable-debug --enable-shared || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="ab7a19d3ab1a437ae754ef477d6231a4  libdvdread-4.2.0.tar.bz2"
diff --git a/testing/libebml/APKBUILD b/testing/libebml/APKBUILD
new file mode 100644
index 000000000..4f88ee46e
--- /dev/null
+++ b/testing/libebml/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Timo Teräs <timo.teras@iki.fi>
+pkgname=libebml
+pkgver=1.2.2
+pkgrel=0
+pkgdesc="a C++ library to parse Extensible Binary Meta-Language files"
+url="http://www.matroska.org/"
+arch="all"
+license="LGPL"
+depends=""
+depends_dev=""
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev"
+source="http://dl.matroska.org/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	make -C make/linux
+}
+
+package() {
+	cd "$_builddir"
+	make -C make/linux install prefix="$pkgdir/usr"
+}
+
+md5sums="726cc2bd1a525929ff35ff9854c0ebab  libebml-1.2.2.tar.bz2"
diff --git a/testing/liblo/APKBUILD b/testing/liblo/APKBUILD
new file mode 100644
index 000000000..a7c9c1872
--- /dev/null
+++ b/testing/liblo/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=liblo
+pkgver=0.26
+pkgrel=0
+pkgdesc="Open Sound Control library"
+url="http://liblo.sourceforge.net"
+arch="all"
+license="LGPLv2+"
+depends=""
+makedepends=""
+install=""
+subpackages="$pkgname-dev"
+source="http://download.sf.net/sourceforge/liblo/liblo-$pkgver.tar.gz"
+
+_builddir="$srcdir"/liblo-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--enable-ipv6 \
+		--disable-static \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="5351de14262560e15e7f23865293b16f  liblo-0.26.tar.gz"
diff --git a/testing/liblrdf/APKBUILD b/testing/liblrdf/APKBUILD
new file mode 100644
index 000000000..2f8fa9689
--- /dev/null
+++ b/testing/liblrdf/APKBUILD
@@ -0,0 +1,69 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=liblrdf
+pkgver=0.5.0
+pkgrel=0
+pkgdesc="Library for manipulating RDF files describing LADSPA plugins"
+url="https://github.com/swh/LRDF"
+arch="all"
+license="GPLv2+"
+depends=""
+depends_dev="raptor2-dev openssl-dev"
+makedepends="$depends_dev autoconf automake libtool"
+install=""
+subpackages="$pkgname-dev"
+source="http://dev.alpinelinux.org/archive/liblrdf/liblrdf-$pkgver.tar.gz"
+
+_builddir="$srcdir"/liblrdf-$pkgver
+
+# How to create archive from git:
+#
+#  abuild snapshot
+#
+
+_gitrepo=LRDF.git
+_giturl="git://github.com/swh/$_gitrepo"
+_gittag=$pkgver
+
+snapshot() {
+	local _tarball=$pkgname-$pkgver.tar.gz
+	msg "Creating $_tarball.."
+	mkdir -p "$srcdir"
+	cd "${SRCDEST:-$srcdir}"
+	if ! [ -d "$_gitrepo" ]; then
+		git clone --bare  $_giturl || return 1
+	else
+		git --git-dir=$_gitrepo fetch || return 1
+        fi
+
+        git --git-dir=$_gitrepo archive --prefix=$pkgname-$pkgver/ \
+		-o "$SRCDEST"/$_tarball $_gittag || return 1
+
+	msg "Uploading $_tarball"
+        scp "$SRCDEST"/$_tarball 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"
+	./autogen.sh --prefix=/usr \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make install DESTDIR="$pkgdir" || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="9acf9143da25f2e0c46d24758371ff4b  liblrdf-0.5.0.tar.gz"
diff --git a/testing/libmatroska/APKBUILD b/testing/libmatroska/APKBUILD
new file mode 100644
index 000000000..d0112705d
--- /dev/null
+++ b/testing/libmatroska/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Timo Teräs <timo.teras@iki.fi>
+pkgname=libmatroska
+pkgver=1.3.0
+pkgrel=0
+pkgdesc="a C++ library to parse Matroska files"
+url="http://www.matroska.org/"
+arch="all"
+license="LGPL"
+depends=""
+depends_dev="libebml-dev"
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev"
+source="http://dl.matroska.org/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	make -C make/linux
+}
+
+package() {
+	cd "$_builddir"
+	make -C make/linux install prefix="$pkgdir/usr"
+}
+
+md5sums="f4a8c411f09d39c754eb726efd616043  libmatroska-1.3.0.tar.bz2"
diff --git a/testing/linux-pam/APKBUILD b/testing/linux-pam/APKBUILD
deleted file mode 100644
index dbfb97f19..000000000
--- a/testing/linux-pam/APKBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=linux-pam
-pkgver=1.1.3
-pkgrel=4
-pkgdesc="pluggable authentication modules for linux"
-url="http://www.kernel.org/pub/linux/libs/pam"
-arch="all"
-license="BSD"
-depends=
-depends_dev="gettext-dev"
-makedepends="$depends_dev bison flex"
-install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
-	linux-pam-innetgr.patch
-	base-auth.pamd
-	base-account.pamd
-	base-password.pamd
-	base-session.pamd
-	base-session-noninteractive.pamd
-	other.pamd"
-
-_builddir="$srcdir"/Linux-PAM-$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 \
-		--libdir=/lib \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--disable-nls \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-
-	# do not install pam.d files bundled with the source, they could be broken
-	rm -rf "$pkgdir"/etc/pam.d
-
-	# install our pam.d files
-	mkdir "$pkgdir"/etc/pam.d
-	for i in $source; do
-		case $i in
-		*.pamd)
-			basename=$(echo $i | cut -d. -f1)
-			cp "$srcdir"/$i "$pkgdir"/etc/pam.d/"$basename"
-			;;
-		esac
-	done
-
-	# delete pointless libtool archives.
-	find "$pkgdir" -name *.la -print | xargs rm
-}
-
-md5sums="6db7fcb5db6253350e3a4648ceac40e7  Linux-PAM-1.1.3.tar.bz2
-c309401e103cc86e8b25557ff3eb0b53  linux-pam-innetgr.patch
-aa5bb7c9d8e4687aea1ae69b7447254a  base-auth.pamd
-fafcf29cb9bab788cb4933106be31883  base-account.pamd
-117535e4938f478efced1398b408cf96  base-password.pamd
-baec6808544bf6cebc59e07467f8c213  base-session.pamd
-afbdd8eb4db5c31dfd8e8da35c698b90  base-session-noninteractive.pamd
-b8e839ece64df173f16d28520eb8d66c  other.pamd"
diff --git a/testing/linux-pam/base-account.pamd b/testing/linux-pam/base-account.pamd
deleted file mode 100644
index 591092944..000000000
--- a/testing/linux-pam/base-account.pamd
+++ /dev/null
@@ -1,3 +0,0 @@
-# basic PAM configuration for Alpine.
-
-account		required	pam_unix.so
diff --git a/testing/linux-pam/base-auth.pamd b/testing/linux-pam/base-auth.pamd
deleted file mode 100644
index 012445aa3..000000000
--- a/testing/linux-pam/base-auth.pamd
+++ /dev/null
@@ -1,5 +0,0 @@
-# basic PAM configuration for Alpine.
-
-auth		required	pam_env.so
-auth		required	pam_unix.so	nullok_secure
-auth		required	pam_nologin.so	successok
diff --git a/testing/linux-pam/base-password.pamd b/testing/linux-pam/base-password.pamd
deleted file mode 100644
index a146a93fe..000000000
--- a/testing/linux-pam/base-password.pamd
+++ /dev/null
@@ -1,3 +0,0 @@
-# basic PAM configuration for Alpine.
-
-password	required	pam_unix.so	nullok obscure md5 sha512
diff --git a/testing/linux-pam/base-session-noninteractive.pamd b/testing/linux-pam/base-session-noninteractive.pamd
deleted file mode 100644
index 85e07d594..000000000
--- a/testing/linux-pam/base-session-noninteractive.pamd
+++ /dev/null
@@ -1,4 +0,0 @@
-# basic PAM configuration for Alpine.
-
-session		required	pam_limits.so
-session		required	pam_unix.so
diff --git a/testing/linux-pam/base-session.pamd b/testing/linux-pam/base-session.pamd
deleted file mode 100644
index bf5bcb734..000000000
--- a/testing/linux-pam/base-session.pamd
+++ /dev/null
@@ -1,4 +0,0 @@
-# basic PAM configuration for Alpine.
-
-session		include		base-session-noninteractive
-session		required	pam_motd.so
diff --git a/testing/linux-pam/linux-pam-innetgr.patch b/testing/linux-pam/linux-pam-innetgr.patch
deleted file mode 100644
index a94fa3dae..000000000
--- a/testing/linux-pam/linux-pam-innetgr.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- Linux-PAM-1.1.3.orig/modules/pam_group/pam_group.c
-+++ Linux-PAM-1.1.3/modules/pam_group/pam_group.c
-@@ -658,10 +658,13 @@
- 	    continue;
- 	}
- 	/* If buffer starts with @, we are using netgroups */
-+#ifdef HAVE_INNETGR
- 	if (buffer[0] == '@')
- 	  good &= innetgr (&buffer[1], NULL, user, NULL);
- 	/* otherwise, if the buffer starts with %, it's a UNIX group */
--	else if (buffer[0] == '%')
-+	else
-+#endif
-+	if (buffer[0] == '%')
-           good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]);
- 	else
- 	  good &= logic_field(pamh,user, buffer, count, is_same);
---- Linux-PAM-1.1.3.orig/modules/pam_succeed_if/pam_succeed_if.c
-+++ Linux-PAM-1.1.3/modules/pam_succeed_if/pam_succeed_if.c
-@@ -233,16 +233,20 @@
- static int
- evaluate_innetgr(const char *host, const char *user, const char *group)
- {
-+#ifdef HAVE_INNETGR
- 	if (innetgr(group, host, user, NULL) == 1)
- 		return PAM_SUCCESS;
-+#endif
- 	return PAM_AUTH_ERR;
- }
- /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */
- static int
- evaluate_notinnetgr(const char *host, const char *user, const char *group)
- {
-+#ifdef HAVE_INNETGR
- 	if (innetgr(group, host, user, NULL) == 0)
- 		return PAM_SUCCESS;
-+#endif
- 	return PAM_AUTH_ERR;
- }
- 
---- Linux-PAM-1.1.3.orig/modules/pam_time/pam_time.c
-+++ Linux-PAM-1.1.3/modules/pam_time/pam_time.c
-@@ -554,9 +554,11 @@
- 	       continue;
- 	  }
- 	  /* If buffer starts with @, we are using netgroups */
-+#ifdef HAVE_INNETGR
- 	  if (buffer[0] == '@')
- 	    good &= innetgr (&buffer[1], NULL, user, NULL);
- 	  else
-+#endif
- 	    good &= logic_field(pamh, user, buffer, count, is_same);
- 	  D(("with user: %s", good ? "passes":"fails" ));
- 
diff --git a/testing/linux-pam/other.pamd b/testing/linux-pam/other.pamd
deleted file mode 100644
index 8c9797e71..000000000
--- a/testing/linux-pam/other.pamd
+++ /dev/null
@@ -1,6 +0,0 @@
-# basic PAM configuration for Alpine.
-
-auth		include		base-auth
-account		include		base-account
-password	include		base-password
-session		include		base-session-noninteractive
diff --git a/testing/lua-cyrus-sasl/APKBUILD b/testing/lua-cyrus-sasl/APKBUILD
new file mode 100644
index 000000000..b1d8bd80d
--- /dev/null
+++ b/testing/lua-cyrus-sasl/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Leonardo Arena <larena@alpinelinux.org>
+# Maintainer:
+pkgname=lua-cyrus-sasl
+_realname=lua-cyrussasl
+pkgver=1.0.0
+pkgrel=0
+pkgdesc="Cyrus SASL library for Lua 5.1"
+url="https://github.com/JorjBauer/lua-cyrussasl"
+arch="all"
+license="BSD"
+depends=
+makedepends="cyrus-sasl-dev lua-dev wget"
+install=
+subpackages=
+source="http://dev.alpinelinux.org/archive/lua-cyrussals/lua-cyrussasl-v1.0.0-0.tar.gz
+	lua-cyrussasl-v1.0.0-Makefile.patch"
+#source="http://dev.alpinelinux.org/archive/${_realname}/${_realname}-v${pkgver}-0.tar.gz"
+
+_builddir="$srcdir"/$_realname-v$pkgver
+
+prepare() {
+	cd $_builddir
+	patch -p1 < "$srcdir"/lua-cyrussasl-v1.0.0-Makefile.patch
+}
+
+build() {
+	cd "$_builddir"
+	make
+}
+
+package() {
+	cd "$_builddir"
+	mkdir -p "$pkgdir"/usr/lib/lua/5.1
+	make CPATH="$pkgdir"/usr/lib/lua/5.1 install
+}
+
+md5sums="551c0ad88ca114c7b44c8e5c447a9c34  lua-cyrussasl-v1.0.0-0.tar.gz
+fbcb022f3ce9d5679454edac3b1f8c32  lua-cyrussasl-v1.0.0-Makefile.patch"
diff --git a/testing/lua-cyrus-sasl/lua-cyrussasl-v1.0.0-Makefile.patch b/testing/lua-cyrus-sasl/lua-cyrussasl-v1.0.0-Makefile.patch
new file mode 100644
index 000000000..0d2c63d71
--- /dev/null
+++ b/testing/lua-cyrus-sasl/lua-cyrussasl-v1.0.0-Makefile.patch
@@ -0,0 +1,27 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,15 +1,15 @@
+ # Linux (Debian Lenny)
+-#CFLAGS=-g -O2 -fpic -I/usr/include/lua5.1
+-#LDFLAGS=-O -shared -fpic -lsasl2
+-#LUAPATH=/usr/share/lua/5.1
+-#CPATH=/usr/lib/lua/5.1
++CFLAGS=-g -O2 -fpic -I/usr/include/lua5.1
++LDFLAGS=-O -shared -fpic -lsasl2
++LUAPATH=/usr/share/lua/5.1
++CPATH=/usr/lib/lua/5.1
+ 
+ # MacOS
+-CFLAGS=-g -Wall -O2
+-LDFLAGS=-bundle -undefined dynamic_lookup -lsasl2
+-MACOSX_VERSION=10.5
+-LUAPATH=/usr/local/share/lua/5.1
+-CPATH=/usr/local/lib/lua/5.1
++#CFLAGS=-g -Wall -O2
++#LDFLAGS=-bundle -undefined dynamic_lookup -lsasl2
++#MACOSX_VERSION=10.5
++#LUAPATH=/usr/local/share/lua/5.1
++#CPATH=/usr/local/lib/lua/5.1
+ 
+ #########################################################
+ #
diff --git a/testing/lua-dbi/APKBUILD b/testing/lua-dbi/APKBUILD
new file mode 100644
index 000000000..4455308b4
--- /dev/null
+++ b/testing/lua-dbi/APKBUILD
@@ -0,0 +1,66 @@
+# Contributor: Leonardo Arena <rnarld@alpinelinux.org>
+# Maintainer:
+pkgname=lua-dbi
+_realname=luadbi
+pkgver=0.5
+pkgrel=1
+pkgdesc="A database interface library for Lua"
+url="http://code.google.com/p/luadbi"
+arch="all"
+license="GPL"
+depends=""
+makedepends="lua-dev mysql-dev postgresql-dev sqlite-dev"
+install=""
+subpackages="$pkgname-mysql $pkgname-postgresql $pkgname-sqlite"
+source="http://luadbi.googlecode.com/files/$_realname.$pkgver.tar.gz
+	lua-dbi-postgresql.patch"
+
+_builddir="$srcdir"
+
+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 || return 1
+}
+
+package() {
+	cd "$_builddir"
+	# install -d "$pkgdir"/usr/lib/lua/5.1
+	install -D -m755 "$srcdir"/DBI.lua "$pkgdir"/usr/share/lua/5.1/DBI.lua  || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+_mv_backend() {
+	install -d "$subpkgdir"/usr/lib/lua/5.1
+	mv "$srcdir"/dbd${1}.so "$subpkgdir"/usr/lib/lua/5.1
+}
+
+sqlite() {
+	pkgdesc="lua-dbi SQLite backend"
+	depends="lua-dbi sqlite"
+	_mv_backend sqlite3
+}
+
+mysql() {
+	pkgdesc="lua-dbi MySQL backend"
+	depends="lua-dbi mysql"
+	_mv_backend mysql
+}
+
+postgresql() {
+	pkgdesc="lua-dbi PostgreSQL backend"
+	depends="lua-dbi postgresql"
+	_mv_backend postgresql
+}
+
+md5sums="ede2b003aadddc151aac87050c3d926e  luadbi.0.5.tar.gz
+67fa36ca81d2d7003be5a3f86d35c79c  lua-dbi-postgresql.patch"
diff --git a/testing/lua-dbi/lua-dbi-postgresql.patch b/testing/lua-dbi/lua-dbi-postgresql.patch
new file mode 100644
index 000000000..2d2ba272d
--- /dev/null
+++ b/testing/lua-dbi/lua-dbi-postgresql.patch
@@ -0,0 +1,9 @@
+--- a/dbd/postgresql/dbd_postgresql.h.old	2010-05-01 06:25:12.000000000 +0200
++++ b/dbd/postgresql/dbd_postgresql.h	2011-04-19 16:59:53.364944209 +0200
+@@ -1,5 +1,5 @@
+ #include <libpq-fe.h>
+-#include <postgres_fe.h>
++#include <server/postgres_fe.h>
+ #include <dbd/common.h>
+ 
+ /* 
diff --git a/testing/makedepend/APKBUILD b/testing/makedepend/APKBUILD
new file mode 100644
index 000000000..60252123a
--- /dev/null
+++ b/testing/makedepend/APKBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=makedepend
+pkgver=1.0.3
+pkgrel=0
+pkgdesc="create dependencies in makefiles"
+url="http://www.x.org"
+arch="all"
+license="MIT"
+depends=""
+depends_dev=""
+makedepends="$depends_dev xproto"
+install=""
+subpackages="$pkgname-doc"
+source="http://ftp.x.org/pub/individual/util/makedepend-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/makedepend-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="4e6cb97bbecfbb34f3f644a75e513093  makedepend-1.0.3.tar.bz2"
diff --git a/testing/networkmanager/APKBUILD b/testing/networkmanager/APKBUILD
index ebb430e97..acb03cbe0 100644
--- a/testing/networkmanager/APKBUILD
+++ b/testing/networkmanager/APKBUILD
@@ -1,8 +1,9 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=networkmanager
-pkgver=0.9.0
-pkgrel=2
+pkgver=0.9.2.0
+_ver=0.9
+pkgrel=0
 pkgdesc="network management tool"
 url="http://projects.gnome.org/NetworkManager/"
 arch="all"
@@ -14,7 +15,7 @@ depends_dev="dbus-glib-dev udev-dev libnl-dev util-linux-dev
 makedepends="$depends_dev intltool"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/${pkgver%.*}/NetworkManager-$pkgver.tar.bz2
+source="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$_ver/NetworkManager-$pkgver.tar.bz2
 	networkmanager.initd"
 
 _builddir="$srcdir"/NetworkManager-$pkgver
@@ -55,5 +56,5 @@ package() {
 		"$pkgdir"/usr/lib/pppd/*/nm-pppd-plugin.la
 }
 
-md5sums="f807102109e63ec708d4fd7a7f3f7deb  NetworkManager-0.9.0.tar.bz2
+md5sums="bc0b00b8a187762d93c50a9706b4c5c3  NetworkManager-0.9.2.0.tar.bz2
 c1c4609f415d7288e223d8c99e2d52d3  networkmanager.initd"
diff --git a/testing/nfdump/APKBUILD b/testing/nfdump/APKBUILD
index 9299be6af..55083c8fc 100644
--- a/testing/nfdump/APKBUILD
+++ b/testing/nfdump/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nfdump
 pkgver=1.6.4
-pkgrel=0
+pkgrel=2
 pkgdesc="The nfdump tools collect and process netflow data on the command line."
 url="http://nfdump.sourceforge.net/"
 arch="all"
@@ -12,7 +12,9 @@ depends_dev=""
 makedepends="bison flex $depends_dev"
 install=""
 subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz\
+	nfcapd.confd\
+	nfcapd.initd"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -35,6 +37,13 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	install -D -m755 "$srcdir"/nfcapd.initd \
+		"$pkgdir"/etc/init.d/nfcapd
+
+	install -D -m644 "$srcdir"/nfcapd.confd \
+		"$pkgdir"/etc/conf.d/nfcapd
 }
 
-md5sums="a5ab5657da78f0f57ac7d29f31883949  nfdump-1.6.4.tar.gz"
+md5sums="a5ab5657da78f0f57ac7d29f31883949  nfdump-1.6.4.tar.gz
+d525c691a62a5746c581f5e9776ed866  nfcapd.confd
+d2b60619e18120af68771f3b866177e8  nfcapd.initd"
diff --git a/testing/nfdump/nfcapd.confd b/testing/nfdump/nfcapd.confd
new file mode 100644
index 000000000..fb9afb6e3
--- /dev/null
+++ b/testing/nfdump/nfcapd.confd
@@ -0,0 +1,62 @@
+# Config file for /etc/init.d/nfcapd
+
+# Port we listen on
+PORT=2205
+
+# Hostname/address we bind on - default is any available
+BINDHOST=127.0.0.1
+
+# IPv4 only 
+#IPV4=no
+
+# IPv6 only
+#IPV6=no
+
+# Join a specific Multicast group
+#MULTICASTGROUP=
+
+# Become a packet repeater
+#REPEAT=desthost/port
+
+
+# Ident string, specify the name of the router
+#IDENT=
+
+# Base Directory for output files
+BASEDIR="/var/log/nfcapd"
+
+# Source is one or more sources: Ident,IP,base_directory 
+# If you specificy SOURCE, do not specifiy IDENT or BASEDIR
+#SOURCE="Foo,192.168.1.1,/var/log/nfcapd/foo Bar,192.168.1.2,/var/log/nfcapd/bar"
+
+# Sample Rate - defaults to source
+#SAMPLERATE=
+
+# additional directory sub hierarchy (default none)
+#SUBDIR="%Y/%m/%d"
+
+
+# Extensions to be stored in the netflow data
+#EXTENSIONS="all"
+
+# How often to rotate the files (in seconds)
+#INTERVAL=300
+
+# Do we align rotation with next even interval
+#ALIGN=no
+
+# Run a command at the end of every interval
+#ROTATECMD=""
+
+# Auto expire old files (yes/no)
+#AUTOEXPIRE=no
+
+# User / Group
+UID=nobody
+GID=nobody
+
+# Buffer length in bytes (to reduce lost packets)
+BUFFLEN=1024000
+
+# Compress the flows with LZO (yes/no)
+COMPRESS=yes
diff --git a/testing/nfdump/nfcapd.initd b/testing/nfdump/nfcapd.initd
new file mode 100644
index 000000000..5f8506812
--- /dev/null
+++ b/testing/nfdump/nfcapd.initd
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+# Copyright 2012 N Angelacos - Based on Gentoo Foundation fprobe script
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	after firewall
+}
+
+
+BIN=/usr/bin/nfcapd
+PIDFILE_EXTRA=${SVCNAME#*.}
+if [ -n "${PIDFILE_EXTRA}" ] && [ ${SVCNAME} != "nfcapd" ]; then
+	PIDFILE="/var/run/nfcapd.${PIDFILE_EXTRA}.pid"
+else
+	PIDFILE="/var/run/nfcapd.pid"
+fi
+
+start() {
+	ebegin "Starting nfcapd"
+	local OPTS=""
+	
+	[ -n "${SOURCE}" ] && SOURCE=`echo -n "${SOURCE}" | sed 's/ / -n /g'`
+	[ "${IPV4}"       == "yes" ] && OPTS="${OPTS} -4"
+	[ "${IPV6}"       == "yes" ] && OPTS="${OPTS} -6"
+	[ "${ALIGN}"      == "yes" ] && OPTS="${OPTS} -w"
+	[ "${AUTOEXPIRE}" == "yes" ] && OPTS="${OPTS} -e"
+	[ "${COMPRESS}"   == "yes" ] && OPTS="${OPTS} -z"
+	for optname in p:PORT b:BINDHOST j:MULTICASTGROUP i:IFACE R:REPEAT \
+		I:IDENT l:BASEDIR n:SOURCE s:SAMPLERATE S:SUBDIR \
+		T:EXTENSIONS t:INTERVAL x:ROTATECMD u:UID g:GID \
+		B:BUFFLEN ; do
+	    opt="${optname/:*}"	optvar="${optname/*:}"
+	    eval optvalue="\$$optvar"
+	    [ -n "$optvalue" ] && OPTS="${OPTS} -${opt} ${optvalue}"
+	done
+	OPTS="${OPTS}"
+
+	# Attempt to make the basedir if specified
+	if [ -n "${BASEDIR}" ]; then
+		mkdir -p "${BASEDIR}"
+		chown "${UID}":"${GID}" "${BASEDIR}"
+	fi
+
+
+	start-stop-daemon --start -b --exec $BIN \
+		--pidfile ${PIDFILE} --make-pidfile \
+		-- ${OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping nfcapd"
+	start-stop-daemon --stop --quiet --exec $BIN \
+		--pidfile ${PIDFILE}
+	eend $?
+}
+
+
+
+
+
+
diff --git a/testing/pam-pgsql/APKBUILD b/testing/pam-pgsql/APKBUILD
new file mode 100644
index 000000000..d52b2fca9
--- /dev/null
+++ b/testing/pam-pgsql/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=pam-pgsql
+pkgver=0.7.3.1
+pkgrel=0
+pkgdesc="PAM module to authenticate using a PostgreSQL database"
+url="http://sourceforge.net/projects/pam-pgsql/"
+arch="all"
+license="GPL"
+depends=""
+depends_dev=""
+makedepends="$depends_dev linux-pam-dev postgresql-dev libgcrypt-dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/project/pam-pgsql/pam-pgsql/0.7/pam-pgsql-$pkgver.tar.gz"
+
+_builddir="$srcdir"/pam-pgsql-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la "$pkgdir"/usr/lib/security/*.la \
+		|| return 1
+}
+
+md5sums="16cb40a16ee1f286906a0d5a90254731  pam-pgsql-0.7.3.1.tar.gz"
diff --git a/testing/patchutils/APKBUILD b/testing/patchutils/APKBUILD
new file mode 100644
index 000000000..05a265882
--- /dev/null
+++ b/testing/patchutils/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=patchutils
+pkgver=0.3.2
+pkgrel=0
+pkgdesc="A collection of programs for manipulating patch files"
+url="http://cyberelk.net/tim/patchutils/"
+arch="all"
+license="GPLv2+"
+depends=""
+depends_dev=""
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://cyberelk.net/tim/data/patchutils/stable/patchutils-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/patchutils-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="74607b4a28c9009c6aeeed0e91098917  patchutils-0.3.2.tar.bz2"
diff --git a/testing/perl-net-async-http/APKBUILD b/testing/perl-net-async-http/APKBUILD
index d4f3961aa..0b4c79fac 100644
--- a/testing/perl-net-async-http/APKBUILD
+++ b/testing/perl-net-async-http/APKBUILD
@@ -3,14 +3,14 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 pkgname=perl-net-async-http
 _pkgreal=Net-Async-HTTP
-pkgver=0.13
+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"
+cpanmakedepends="perl-http-cookies perl-test-identity perl-io-async   "
 depends="$cpandepends"
 makedepends="perl-dev $cpanmakedepends"
 subpackages="$pkgname-doc"
@@ -20,12 +20,13 @@ _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}'`
+	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
 	./Build && ./Build test
 }
 
@@ -35,4 +36,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="a624b88a7545cda911e7a983e180e32a  Net-Async-HTTP-0.13.tar.gz"
+md5sums="b0298e8ecf8d74a69281c57d17631225  Net-Async-HTTP-0.15.tar.gz"
diff --git a/testing/poppler-qt4/APKBUILD b/testing/poppler-qt4/APKBUILD
index fae6ef406..804ef42eb 100644
--- a/testing/poppler-qt4/APKBUILD
+++ b/testing/poppler-qt4/APKBUILD
@@ -3,7 +3,7 @@
 # this aport only includes glib/gtk support in order to break the
 # circular make dependency: gtk <- cups <- poppler <- gtk
 
-_ver=0.18.2
+_ver=0.18.3
 # get the pkgver from poppler
 if [ -r ../../main/poppler/APKBUILD ]; then
 	. ../../main/poppler/APKBUILD
@@ -59,4 +59,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
-md5sums="38616927823ef01937aab26872e957e4  poppler-0.18.2.tar.gz"
+md5sums="d70d2d63d8acd29c97185f7e5f09c9b4  poppler-0.18.3.tar.gz"
diff --git a/testing/raptor2/APKBUILD b/testing/raptor2/APKBUILD
new file mode 100644
index 000000000..0ce17bd92
--- /dev/null
+++ b/testing/raptor2/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=raptor2
+pkgver=2.0.6
+pkgrel=0
+pkgdesc="RDF parser toolkit for Redland"
+url="http://www.librdf.org/raptor"
+arch="all"
+license="GPL"
+depends=
+depends_dev="curl-dev libxml2-dev libxslt-dev yajl-dev"
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://download.librdf.org/source/raptor2-$pkgver.tar.gz"
+
+_builddir="$srcdir"/raptor2-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="1f07af81cbe3cf1bf0d1d250b18d9f93  raptor2-2.0.6.tar.gz"
diff --git a/testing/raptor2/raptor-curl.patch b/testing/raptor2/raptor-curl.patch
new file mode 100644
index 000000000..e47a496c4
--- /dev/null
+++ b/testing/raptor2/raptor-curl.patch
@@ -0,0 +1,12 @@
+diff --git a/src/raptor_internal.h b/src/raptor_internal.h
+index f7944db..d9c2068 100644
+--- a/src/raptor_internal.h
++++ b/src/raptor_internal.h
+@@ -852,7 +852,6 @@ int raptor_utf8_is_nfc(const unsigned char *input, size_t length);
+ 
+ #ifdef RAPTOR_WWW_LIBCURL
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+ 
diff --git a/testing/rosegarden/APKBUILD b/testing/rosegarden/APKBUILD
new file mode 100644
index 000000000..4d82fb119
--- /dev/null
+++ b/testing/rosegarden/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=rosegarden
+pkgver=11.11.42
+pkgrel=0
+pkgdesc="MIDI, audio and notation editor"
+url="http://www.rosegardenmusic.com/"
+arch="all"
+license="GPLv2+"
+depends=""
+depends_dev=""
+makedepends="alsa-lib-dev qt-dev libsamplerate-dev libsndfile-dev ladspa-dev
+	jack-dev liblo-dev dssi-dev liblrdf-dev fftw-dev makedepend"
+install=""
+subpackages=""
+source="http://downloads.sourceforge.net/project/rosegarden/rosegarden/11.11/rosegarden-$pkgver.tar.bz2
+	nearbyintf.patch"
+
+_builddir="$srcdir"/rosegarden-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="552a1cad6dd60077573332bc6c650db0  rosegarden-11.11.42.tar.bz2
+622bfa38a28010bbffcaa2a64c8ade92  nearbyintf.patch"
diff --git a/testing/rosegarden/nearbyintf.patch b/testing/rosegarden/nearbyintf.patch
new file mode 100644
index 000000000..d8d2a706e
--- /dev/null
+++ b/testing/rosegarden/nearbyintf.patch
@@ -0,0 +1,13 @@
+uclibc does not have nearbyintf
+
+--- ./src/gui/widgets/Fader.cpp.orig
++++ ./src/gui/widgets/Fader.cpp
+@@ -222,7 +222,7 @@
+     if (m_integral) {
+         float sliderLength = float(m_sliderMax) - float(m_sliderMin);
+         position =
+-            int(nearbyintf(sliderLength * (value - float(m_min)) / float(m_max - m_min) + 0.1));
++            int(nearbyint(sliderLength * (value - float(m_min)) / float(m_max - m_min) + 0.1));
+     } else {
+         position =
+             AudioLevel::dB_to_fader
diff --git a/testing/schedtool/APKBUILD b/testing/schedtool/APKBUILD
new file mode 100644
index 000000000..a6d0e4237
--- /dev/null
+++ b/testing/schedtool/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=schedtool
+pkgver=1.3.0
+pkgrel=0
+pkgdesc="scheduler tool"
+url="http://freequaos.host.sk/schedtool/"
+arch="all"
+license="GPLv2"
+depends=""
+depends_dev=""
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://freequaos.host.sk/schedtool/schedtool-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/schedtool-$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 || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTPREFIX="/usr" DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="0d968f05d3ad7675f1f33ef1f6d0a3fb  schedtool-1.3.0.tar.bz2"
diff --git a/testing/squidguard/APKBUILD b/testing/squidguard/APKBUILD
index 9b781ea22..4187bfb1a 100644
--- a/testing/squidguard/APKBUILD
+++ b/testing/squidguard/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=squidguard
 _realname=squidGuard
 pkgver=1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Squid URL redirector"
 url="http://www.squidguard.org"
 arch="all"
diff --git a/testing/sshguard/APKBUILD b/testing/sshguard/APKBUILD
index 089c5874c..a337bbfc6 100644
--- a/testing/sshguard/APKBUILD
+++ b/testing/sshguard/APKBUILD
@@ -2,19 +2,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sshguard
 pkgver=1.5
-pkgrel=0
+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"
+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"
+	sshguard.confd
+	parser.patch"
 
 _builddir="$srcdir"/sshguard-$pkgver
 prepare() {
@@ -46,4 +47,5 @@ package() {
 
 md5sums="11b9f47f9051e25bdfe84a365c961ec1  sshguard-1.5.tar.bz2
 13eb7c7e7a91cc347dbd6ff111d662c4  sshguard.initd
-02dc914d310ea759a66ebb136f495e4e  sshguard.confd"
+02dc914d310ea759a66ebb136f495e4e  sshguard.confd
+84ff8858abb8d5a673037cf592bb6794  parser.patch"
diff --git a/testing/sshguard/parser.patch b/testing/sshguard/parser.patch
new file mode 100644
index 000000000..51f9915e1
--- /dev/null
+++ b/testing/sshguard/parser.patch
@@ -0,0 +1,11 @@
+--- 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/varnish/APKBUILD b/testing/varnish/APKBUILD
index cc7285b0c..97e1cfcb6 100644
--- a/testing/varnish/APKBUILD
+++ b/testing/varnish/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=varnish
-pkgver=3.0.0
-pkgrel=2
+pkgver=3.0.2
+pkgrel=0
 pkgdesc="High-performance HTTP accelerator"
 url="http://www.varnish-cache.org/"
 arch="all"
@@ -58,7 +58,7 @@ libs() {
 	mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir"/usr/lib/
 }
 
-md5sums="38387bf31a1574f5cd8dec4f0b7caf20  varnish-3.0.0.tar.gz
+md5sums="c8eae0aabbe66b6daabdf3a1f58cd47a  varnish-3.0.2.tar.gz
 a86ece4df03e2643d4d659fb841e1ea6  varnishd.initd
 78bc033e92dc6153656408f44b1d1df8  varnishd.confd
 a6cb8a43c9465699cf956dc992998225  varnishd.logrotate"
diff --git a/testing/vlc/APKBUILD b/testing/vlc/APKBUILD
new file mode 100644
index 000000000..50e6d6797
--- /dev/null
+++ b/testing/vlc/APKBUILD
@@ -0,0 +1,216 @@
+# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=vlc
+pkgver=2.0.0_rc1
+_pkgver=${pkgver/_/-}
+pkgrel=4
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+pkgusers="vlc"
+pkggroups="vlc"
+url="http://www.videolan.org/vlc/"
+arch="all"
+license="GPL-2"
+triggers="$pkgname.trigger=/usr/lib/vlc/plugins"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-xorg $pkgname-daemon"
+#depends="fluidsynth zvbi lirc-utils libdca
+#	libproxy libcddb smbclient
+#	libmpcdec libmodplug"
+depends="ttf-dejavu"
+makedepends="
+	a52dec-dev
+	alsa-lib-dev
+	automake
+	autoconf
+	avahi-dev
+	libtool
+	dbus-dev
+	faad2-dev
+	ffmpeg-dev
+	flac-dev
+	freetype-dev
+	fribidi-dev
+	gtk+-dev
+	libbluray-dev>=0.2.1 libbluray-dev<20100000
+	libdc1394-dev>=2.1.0
+	libdvbpsi-dev
+	libdvdnav-dev
+	libdvdread-dev
+	libgcrypt-dev
+	libice-dev
+	libiconv-dev
+	libmad-dev
+	libmatroska-dev
+	libmpeg2-dev
+	libnotify-dev
+	libogg-dev
+	libraw1394-dev>=2.0.1
+	libshout-dev
+	libsm-dev
+	libtheora-dev
+	libvorbis-dev
+	libx11-dev
+	libxext-dev
+	libxinerama-dev
+	libxpm-dev
+	libxv-dev
+	live-media-dev>=2012.01.26
+	lua-dev
+	ncurses-dev
+	mesa-dev
+	pkgconfig
+	qt-dev
+	sdl-dev
+	speex-dev
+	sysfsutils-dev
+	taglib-dev
+	v4l-utils-dev
+	x264-dev
+	xcb-util-renderutil-dev
+	xcb-util-keysyms-dev
+	"
+source="http://download.videolan.org/pub/videolan/testing/$pkgname-$_pkgver/$pkgname-$_pkgver.tar.xz
+	uclibc-inhibit-spawn.patch
+	uclibc-no-xscreensaver.patch
+	uclibc3.patch
+	vlc.trigger
+	"
+#	uclibc-libcompat.patch
+#	vlc-1.1.7-disable-cache-gen.patch
+
+_builddir="$srcdir"/$pkgname-$_pkgver
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		esac;
+	done
+	sed -i -e "/^libxscreensaver_plugin_la_SOURCES/s/^/#/" modules/misc/Modules.am
+	./bootstrap
+}
+
+build ()
+{
+	cd "$_builddir"
+	sed -i -e 's:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf:' modules/misc/freetype.c
+
+	# -fpermissive is needed due to zlib 1.2.6 changing
+	# void* to gzFile on gz*() functions
+	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
+	export CXXFLAGS="$CXXFLAGS -fpermissive"
+
+	./configure --prefix=/usr \
+		--disable-mmx \
+		--disable-nls \
+		--disable-optimizations \
+		--disable-rpath \
+		--enable-a52 \
+		--enable-avcodec \
+		--enable-avformat \
+		--enable-bluray \
+		--enable-dbus \
+		--enable-dbus-control \
+		--enable-dc1394 \
+		--enable-dvbpsi \
+		--enable-dvdread \
+		--enable-dvdnav \
+		--enable-faad \
+		--enable-flac \
+		--enable-httpd \
+		--enable-live555 \
+		--enable-matroska \
+		--enable-merge-ffmpeg \
+		--enable-ncurses \
+		--enable-qt4 \
+		--enable-realrtsp \
+		--enable-sdl \
+		--enable-shout \
+		--enable-skins2 \
+		--enable-speex \
+		--enable-sout \
+		--enable-taglib \
+		--enable-theora \
+		--enable-v4l2 \
+		--enable-vlm \
+		--enable-vorbis \
+		--enable-wma-fixed \
+		--enable-xvideo \
+		|| return 1
+
+#		--enable-dvb \
+#		--enable-snapshot \
+#		--enable-hal \
+#		--enable-lirc \
+#		--enable-pvr \
+
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+#	for res in 16 32 48 128; do
+#		install -D -m644 share/vlc${res}x${res}.png \
+#			"$pkgdir"/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png || return 1
+#	done
+	# delete cache as it's autocreated by trigger
+	rm -rf "$pkgdir"/usr/lib/vlc/plugins/plugins.dat
+	# delete unneeded mozilla and kde support files
+	rm -rf "$pkgdir"/usr/lib/mozilla
+	rm -rf "$pkgdir"/usr/share/kde4
+	find "$pkgdir" -name '*.la' -delete
+}
+
+_mv() {
+	local dir=${1%/*}
+	mkdir -p "$subpkgdir"/$dir
+	mv "$1" "$subpkgdir"/$dir/
+}
+
+xorg() {
+	pkgdesc="Video LAN X.org support"
+	depends="xdg-utils vlc>=2.0.0_rc1-r4"
+
+	# scan for elf files that directly or indirectly depends on
+	# libX* libraries
+	cd "$pkgdir"
+	for i in $(find -type f ); do
+		if ldd $i 2>/dev/null | grep -E -q "libX|x11|libxcb"; then
+			echo $i | grep libavcodec_plugin.so || _mv "$i" || return 1
+		fi
+	done
+
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/[qs]vlc \
+		"$subpkgdir"/usr/bin
+
+	mkdir -p "$subpkgdir"/usr/share/vlc
+	mv "$pkgdir"/usr/share/applications \
+		"$pkgdir"/usr/share/icons \
+		"$subpkgdir"/usr/share/
+
+	mv "$pkgdir"/usr/share/vlc/skins2 \
+		"$subpkgdir"/usr/share/vlc
+}
+
+daemon() {
+	pkgdesc="Support for running VLC as a daemon"
+	install="vlc-daemon.pre-install"
+	arch="noarch"
+	depends="vlc>=2.0.0_rc1-r0"
+
+	mkdir -p "$subpkgdir"
+	cd "$pkgdir"
+	install -D -m755 ../../vlc.initd $subpkgdir/etc/init.d/vlc
+	install -D -m664 ../../vlc.confd $subpkgdir/etc/conf.d/vlc
+	install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc
+}
+
+md5sums="8c4bfbc5e79ff0bdfff572d53b03a92a  vlc-2.0.0-rc1.tar.xz
+28349b8239fdd6987fbe0ca2c758517f  uclibc-inhibit-spawn.patch
+b84c5a9121440b6a1dcf28792d783eb8  uclibc-no-xscreensaver.patch
+94f11ec8394775018222781a0c875444  uclibc3.patch
+350b30698eb784def7d19446eb1d6c81  vlc.trigger"
diff --git a/testing/vlc/uclibc-inhibit-spawn.patch b/testing/vlc/uclibc-inhibit-spawn.patch
new file mode 100644
index 000000000..c34ebe0f7
--- /dev/null
+++ b/testing/vlc/uclibc-inhibit-spawn.patch
@@ -0,0 +1,76 @@
+diff --git a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c
+index 3f297c6..e16a21e 100644
+--- a/modules/misc/inhibit/xdg.c
++++ b/modules/misc/inhibit/xdg.c
+@@ -27,7 +27,11 @@
+ #include <vlc_inhibit.h>
+ #include <assert.h>
+ #include <signal.h>
+-#include <spawn.h>
++#if !defined(_POSIX_SPAWN)
++# define _POSIX_SPAWN -1
++#else
++# include <spawn.h>
++#endif
+ #include <sys/wait.h>
+ 
+ static int Open (vlc_object_t *);
+@@ -47,7 +51,9 @@ struct vlc_inhibit_sys
+     vlc_thread_t thread;
+     vlc_cond_t update, inactive;
+     vlc_mutex_t lock;
++#if (_POSIX_SPAWN >= 0)
+     posix_spawnattr_t attr;
++#endif
+     bool suspend, suspended;
+ };
+ 
+@@ -67,17 +73,19 @@ static int Open (vlc_object_t *obj)
+     vlc_mutex_init (&p_sys->lock);
+     vlc_cond_init (&p_sys->update);
+     vlc_cond_init (&p_sys->inactive);
+-    posix_spawnattr_init (&p_sys->attr);
+     /* Reset signal handlers to default and clear mask in the child process */
+     {
+         sigset_t set;
+ 
+         sigemptyset (&set);
+-        posix_spawnattr_setsigmask (&p_sys->attr, &set);
+         sigaddset (&set, SIGPIPE);
++#if (_POSIX_SPAWN >= 0)
++        posix_spawnattr_init (&p_sys->attr);
++        posix_spawnattr_setsigmask (&p_sys->attr, &set);
+         posix_spawnattr_setsigdefault (&p_sys->attr, &set);
+         posix_spawnattr_setflags (&p_sys->attr, POSIX_SPAWN_SETSIGDEF
+                                               | POSIX_SPAWN_SETSIGMASK);
++#endif
+     }
+     p_sys->suspend = false;
+     p_sys->suspended = false;
+@@ -106,7 +114,9 @@ static void Close (vlc_object_t *obj)
+ 
+     vlc_cancel (p_sys->thread);
+     vlc_join (p_sys->thread, NULL);
++#if (_POSIX_SPAWN >= 0)
+     posix_spawnattr_destroy (&p_sys->attr);
++#endif
+     vlc_cond_destroy (&p_sys->inactive);
+     vlc_cond_destroy (&p_sys->update);
+     vlc_mutex_destroy (&p_sys->lock);
+@@ -153,8 +163,16 @@ static void *Thread (void *data)
+         pid_t pid;
+ 
+         vlc_mutex_unlock (&p_sys->lock);
++#if (_POSIX_SPAWN >= 0)
+         if (!posix_spawnp (&pid, "xdg-screensaver", NULL, &p_sys->attr,
+                            argv, environ))
++#else
++        pid = fork();
++        if (pid == 0) {
++            execvp("xdg-screensaver", argv);
++            exit(1);
++        } else if (pid > 0)
++#endif
+         {
+             int status;
+ 
diff --git a/testing/vlc/uclibc-no-xscreensaver.patch b/testing/vlc/uclibc-no-xscreensaver.patch
new file mode 100644
index 000000000..b4e1acef6
--- /dev/null
+++ b/testing/vlc/uclibc-no-xscreensaver.patch
@@ -0,0 +1,18 @@
+--- vlc-2.0.0-rc1.orig/modules/misc/Modules.am
++++ vlc-2.0.0-rc1/modules/misc/Modules.am
+@@ -26,14 +26,9 @@
+ libxdg_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
+ libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD)
+ libxdg_screensaver_plugin_la_DEPENDENCIES =
+-libxscreensaver_plugin_la_SOURCES = inhibit/xscreensaver.c
+-libxscreensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
+-libxscreensaver_plugin_la_LIBADD = $(AM_LIBADD)
+-libxscreensaver_plugin_la_DEPENDENCIES =
+ if HAVE_XCB
+ libvlc_LTLIBRARIES += \
+-	libxdg_screensaver_plugin.la \
+-	libxscreensaver_plugin.la
++	libxdg_screensaver_plugin.la
+ endif
+ 
+ libmce_plugin_la_SOURCES = inhibit/mce.c
diff --git a/testing/vlc/uclibc3.patch b/testing/vlc/uclibc3.patch
new file mode 100644
index 000000000..e57d6dd5f
--- /dev/null
+++ b/testing/vlc/uclibc3.patch
@@ -0,0 +1,38 @@
+--- vlc-2.0.0-rc1.orig/src/posix/linux_specific.c
++++ vlc-2.0.0-rc1/src/posix/linux_specific.c
+@@ -83,14 +83,14 @@
+     unsigned refs;
+ } once = { VLC_STATIC_MUTEX, 0 };
+ 
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ # include <gnu/libc-version.h>
+ # include <stdlib.h>
+ #endif
+ 
+ void system_Init (void)
+ {
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+     const char *glcv = gnu_get_libc_version ();
+ 
+     /* gettext in glibc 2.5-2.7 is not thread-safe. LibVLC keeps crashing,
+--- vlc-2.0.0-rc1.orig/src/posix/thread.c
++++ vlc-2.0.0-rc1/src/posix/thread.c
+@@ -1165,6 +1165,16 @@
+     return vlc_atomic_swap (&timer->overruns, 0);
+ }
+ 
++#if defined(HAVE_SCHED_GETAFFINITY) && !defined(CPU_COUNT)
++static unsigned CPU_COUNT(cpu_set_t *cpu)
++{
++    unsigned i, count = 0;
++    for (i = 0; i < CPU_SETSIZE; i++)
++        if (CPU_ISSET(i, cpu))
++            count++;
++    return count;
++}
++#endif
+ 
+ /**
+  * Count CPUs.
diff --git a/testing/vlc/vlc-1.1.7-disable-cache-gen.patch b/testing/vlc/vlc-1.1.7-disable-cache-gen.patch
new file mode 100644
index 000000000..b8a3dd955
--- /dev/null
+++ b/testing/vlc/vlc-1.1.7-disable-cache-gen.patch
@@ -0,0 +1,12 @@
+--- a/modules/Makefile.am
++++ b/modules/Makefile.am
+@@ -63,7 +63,8 @@
+ 
+ stamp-cache:
+ 	$(AM_V_GEN)if test "$(build)" = "$(host)"; then \
+-		../bin/vlc-cache-gen$(EXEEXT) . ; \
++		# ../bin/vlc-cache-gen$(EXEEXT) . ; \
++		echo "FIXME: vlc-cache-gen" ; \
+ 	else \
+ 		echo "Cross-compilation: cache generation skipped!" ; \
+ 	fi
diff --git a/testing/vlc/vlc-daemon.pre-install b/testing/vlc/vlc-daemon.pre-install
new file mode 100644
index 000000000..72ee1b7ff
--- /dev/null
+++ b/testing/vlc/vlc-daemon.pre-install
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+groups="vlc audio video"
+for group in $groups; do
+	addgroup -S $group 2>/dev/null
+done
+adduser -S -h /home/vlc -s /bin/sh -G vlc -D vlc 2>/dev/null
+
+# make sure vlc are in all groups
+for group in $groups; do
+	addgroup vlc $group 2>/dev/null
+done
+exit 0
diff --git a/testing/vlc/vlc.confd b/testing/vlc/vlc.confd
new file mode 100644
index 000000000..c42344b60
--- /dev/null
+++ b/testing/vlc/vlc.confd
@@ -0,0 +1,11 @@
+# Sample vlc params suitable for running as a daemon
+
+## --daemon			detach from prompt
+## --file-logging		enable file logging
+## --logfile			logfile name/path
+## -vvv				verbose logging
+## -I dummy			disable X11 interface
+## --sout PARAMS		encoding parameters
+##				Do NOT quote 'PARAMS' otherwise shell expansions will broke vlc
+
+VLC_OPTS="-vvv -I dummy alsa://hw:0,0 --daemon --file-logging --logfile /var/log/vlc/vlc.log --sout #transcode{acodec=mp3,ab=48,channels=1,samplerate=22050}:std{access=http,mux=ogg,dst=:8080}"
diff --git a/testing/vlc/vlc.initd b/testing/vlc/vlc.initd
new file mode 100755
index 000000000..11567dcd8
--- /dev/null
+++ b/testing/vlc/vlc.initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting VLC"
+	start-stop-daemon --start \
+		--user vlc \
+		--exec /usr/bin/vlc -- ${VLC_OPTS}
+	eend $?
+}
+
+stop () {
+	ebegin "Stopping VLC"
+	start-stop-daemon --stop \
+		--signal KILL \
+		--exec /usr/bin/vlc
+	eend $?
+}
+
diff --git a/testing/vlc/vlc.trigger b/testing/vlc/vlc.trigger
new file mode 100644
index 000000000..d7322fcb1
--- /dev/null
+++ b/testing/vlc/vlc.trigger
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec /usr/lib/vlc/vlc-cache-gen "$@"
+
diff --git a/testing/webalizer/APKBUILD b/testing/webalizer/APKBUILD
index df1047eb0..3f816046b 100644
--- a/testing/webalizer/APKBUILD
+++ b/testing/webalizer/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=webalizer
 pkgver=2.23.05
 _pkgver="2.23-05"
-pkgrel=1
+pkgrel=2
 pkgdesc="A web server log file analysis program producing HTML reports"
 url="http://www.webalizer.com/"
 arch="all"
diff --git a/testing/weechat/APKBUILD b/testing/weechat/APKBUILD
index 6350bbd97..5cfe15fab 100644
--- a/testing/weechat/APKBUILD
+++ b/testing/weechat/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Leonardo Arena <rnalrd@alpine.linux.org>
 pkgname=weechat
 pkgver=0.3.6
-pkgrel=0
+pkgrel=1
 pkgdesc="A fast, light, extensible ncurses-based chat client"
 url="http://www.weechat.org"
 arch="all"
 license="GPL3"
 depends=
-depends_dev="cmake libiconv-dev libintl ncurses-dev"
+depends_dev="cmake libiconv-dev libintl ncurses-dev gnutls-dev lua-dev aspell-dev perl-dev python-dev"
 makedepends="$depends_dev"
 install=
 subpackages="$pkgname-dev $pkgname-doc"
diff --git a/testing/winetricks/APKBUILD b/testing/winetricks/APKBUILD
new file mode 100644
index 000000000..702c20490
--- /dev/null
+++ b/testing/winetricks/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor:
+# Maintainer:
+pkgname=winetricks
+pkgver=20111115
+pkgrel=0
+pkgdesc="manage virtual windows environments using wine"
+url="http://winetricks.org"
+arch="noarch"
+license="LGPL"
+depends="grep cabextract zenity p7zip"
+makedepends=""
+install=""
+subpackages=""
+source="http://winetricks.org/download/releases/winetricks-$pkgver.tgz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+unpack() {
+	# manually unpack, as the tgz does not any paths at all
+	mkdir -p "$_builddir"
+	cd "$_builddir"
+	tar xzvf ../winetricks-$pkgver.tgz
+}
+
+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
+}
+
+package() {
+	cd "$_builddir"
+	mkdir -p "$pkgdir"/usr/bin
+	install -Dm755 winetricks "$pkgdir"/usr/bin
+}
+
+md5sums="79141446df0f98115108e96820bb9c3e  winetricks-20111115.tgz"
diff --git a/testing/xen/APKBUILD b/testing/xen/APKBUILD
index d92bebf7c..c6c120168 100644
--- a/testing/xen/APKBUILD
+++ b/testing/xen/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=xen
 pkgver=4.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Xen hypervisor"
 url="http://www.xen.org"
 arch="x86 x86_64"
@@ -87,7 +87,7 @@ ed3283697cb1ddff066f4087eabf68c6  detect_libiconv.patch
 b973dc1ffcc6872e222b36f3b7b4836b  fix_bswap_blktap2.patch
 10dcf0b6a05691e9f88afc01bd414480  fix_ipxe_no_pie_default.patch
 0bb8a435020a5a49b38b1a447fb69977  define_fsimage_dir.patch
-f64405982218db306c2b5cf3167ff944  pygrub_alpine.patch
+a7500c42804abdf68e051dc667e65f93  pygrub_alpine.patch
 fa06495a175571f4aa3b6cb88937953e  librt.patch
 1bea3543ddc712330527b62fd9ff6520  busybox-sed.patch
 4cf88b53f8ca8d99ad52bae419b620a7  xencommons.initd
diff --git a/testing/xen/pygrub_alpine.patch b/testing/xen/pygrub_alpine.patch
index 9d6ee577a..98d0822c7 100644
--- a/testing/xen/pygrub_alpine.patch
+++ b/testing/xen/pygrub_alpine.patch
@@ -38,7 +38,7 @@ diff -r 3e02aa9670b3 tools/pygrub/src/ExtLinuxConf.py
  
                  # Bypass regular self.commands handling
                  com = None
-+            elif arg.find("initrd="):
++            elif "initrd=" in arg:
 +                # find initrd image in append line
 +                args = arg.strip().split(" ")
 +                for a in args:
diff --git a/testing/xf86-video-xgi/APKBUILD b/testing/xf86-video-xgi/APKBUILD
new file mode 100644
index 000000000..cf5b9e744
--- /dev/null
+++ b/testing/xf86-video-xgi/APKBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xf86-video-xgi
+pkgver=1.6.0
+pkgrel=0
+pkgdesc="X.org XGI video driver"
+url="http://xorg.freedesktop.org/"
+arch="all"
+license="custom"
+subpackages="$pkgname-doc"
+depends=
+makedepends="xorg-server-dev libdrm-dev xf86driproto glproto mesa-dev
+	xf86dgaproto"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+	git-fixes.patch"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	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"
+	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
+
+	./configure --prefix=/usr || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/xorg/modules/drivers/*.la || return 1
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+md5sums="b4ac771ae81b52fca9b6fa68006a258a  xf86-video-xgi-1.6.0.tar.bz2
+bc49f5c3e77eb6355d330a34e1640bca  git-fixes.patch"
diff --git a/testing/xf86-video-xgi/git-fixes.patch b/testing/xf86-video-xgi/git-fixes.patch
new file mode 100644
index 000000000..f15fea88a
--- /dev/null
+++ b/testing/xf86-video-xgi/git-fixes.patch
@@ -0,0 +1,451 @@
+diff --git a/man/xgi.man b/man/xgi.man
+index 19880f2..5699ae4 100644
+--- a/man/xgi.man
++++ b/man/xgi.man
+@@ -1,4 +1,3 @@
+-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/xgi/xgi.man,v 1.14 2003/11/12 16:50:36 twini Exp $
+ .\" shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH XGI __drivermansuffix__ __vendorversion__
+diff --git a/src/vb_init.c b/src/vb_init.c
+index 8338410..50980c4 100755
+--- a/src/vb_init.c
++++ b/src/vb_init.c
+@@ -131,6 +131,8 @@ static void XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO, USHORT,
+ static void XGINew_SetDRAMDefaultRegisterXG45(PXGI_HW_DEVICE_INFO, USHORT, 
+     PVB_DEVICE_INFO);
+ static UCHAR XGINew_Get340DRAMType(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO);
++/* horrible */
++#define XGINew_GetXG20DRAMType XGINew_Get340DRAMType
+ 
+ static int XGINew_SetDDRChannel(int index, UCHAR ChannelNo,
+     UCHAR XGINew_ChannelAB, const USHORT DRAMTYPE_TABLE[][5],
+@@ -1451,7 +1453,7 @@ void XGINew_SetDRAMDefaultRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension ,
+     }
+ 
+     temp3 = 0 ;
+-    for( k = 0 ; k < 4 ; k++ )
++    for( k = 1 ; k < 4 ; k++ )
+     {
+         XGI_SetRegANDOR((XGIIOADDRESS) P3d4 , 0x6E , 0xFC , temp3 ) ;		/* CR6E_D[1:0] select channel */
+         temp2 = 0 ;
+diff --git a/src/vgatypes.h b/src/vgatypes.h
+index 8a60927..7484661 100755
+--- a/src/vgatypes.h
++++ b/src/vgatypes.h
+@@ -1,5 +1,3 @@
+-/* $XFree86$ */
+-/* $XdotOrg$ */
+ /*
+  * General type definitions for universal mode switching modules
+  *
+diff --git a/src/xgi.h b/src/xgi.h
+index 715502f..e818631 100755
+--- a/src/xgi.h
++++ b/src/xgi.h
+@@ -981,6 +981,7 @@ int compute_vclk(int Clock, int *out_n, int *out_dn, int *out_div,
+ void XGI_WaitBeginRetrace(XGIIOADDRESS RelIO);
+ void XGI_WaitEndRetrace(XGIIOADDRESS RelIO);
+ 
++#include <unistd.h>
+ /* 2005/11/21 added by jjtseng */
+ #define DelayS(sec) usleep((sec)*1000000)
+ #define DelayMS(millisec) usleep((millisec)*1000)
+diff --git a/src/xgi_accel.c b/src/xgi_accel.c
+index c072691..4c298ed 100755
+--- a/src/xgi_accel.c
++++ b/src/xgi_accel.c
+@@ -200,20 +200,7 @@ extern int FbDevExist;
+ #endif
+ 
+ #if X_BYTE_ORDER == X_BIG_ENDIAN
+-static CARD32 BE_SWAP32 (CARD32 val)
+-{
+-	PDEBUG(ErrorF("X_BIG_ENDIAN...\n"));
+-    if (CurrentColorDepth == 8)
+-	    return   ((((val) & 0x000000ff) << 24) | \
+-                  (((val) & 0x0000ff00) << 8) |  \
+-                  (((val) & 0x00ff0000) >> 8) |  \
+-                  (((val) & 0xff000000) >> 24));
+-    if (CurrentColorDepth == 24)
+-        return val;
+-    if (CurrentColorDepth == 16)
+-        return ((((val) & 0x0000ffff) << 16) | \
+-		         (((val) & 0xffff0000) >> 16));
+-}    
++#define BE_SWAP32(x) lswapl(x)
+ #else 
+ static CARD32 BE_SWAP32 (CARD32 val)
+ {
+diff --git a/src/xgi_dga.c b/src/xgi_dga.c
+index 04f90aa..8bd84bc 100755
+--- a/src/xgi_dga.c
++++ b/src/xgi_dga.c
+@@ -103,18 +103,18 @@ XGISetupDGAMode(
+ 
+ 	if(pMode->HDisplay != otherPitch) {
+ 
+-	    newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec));
++	    newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec));
+ 	    oneMore  = TRUE;
+ 
+ 	} else {
+ 
+-	    newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec));
++	    newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec));
+ 	    oneMore  = FALSE;
+ 
+ 	}
+ 
+ 	if(!newmodes) {
+-	    xfree(modes);
++	    free(modes);
+ 	    return NULL;
+ 	}
+ 	modes = newmodes;
+diff --git a/src/xgi_dri.c b/src/xgi_dri.c
+index 93687e1..e575c19 100755
+--- a/src/xgi_dri.c
++++ b/src/xgi_dri.c
+@@ -46,7 +46,6 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Priv.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+@@ -145,13 +144,13 @@ XGIInitVisualConfigs(ScreenPtr pScreen)
+     }
+     if (!(pXGIConfigs = (XGIConfigPrivPtr)xnfcalloc(sizeof(XGIConfigPrivRec),
+ 						    numConfigs))) {
+-      xfree(pConfigs);
++      free(pConfigs);
+       return FALSE;
+     }
+     if (!(pXGIConfigPtrs = (XGIConfigPrivPtr*)xnfcalloc(sizeof(XGIConfigPrivPtr),
+ 							  numConfigs))) {
+-      xfree(pConfigs);
+-      xfree(pXGIConfigs);
++      free(pConfigs);
++      free(pXGIConfigs);
+       return FALSE;
+     }
+     for (i=0; i<numConfigs; i++)
+@@ -333,7 +332,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen)
+   pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
+ 
+   if (!DRIScreenInit(pScreen, pDRIInfo, &pXGI->drmSubFD)) {
+-    xfree(pDRIInfo->devPrivate);
++    free(pDRIInfo->devPrivate);
+     pDRIInfo->devPrivate=0;
+     DRIDestroyInfoRec(pXGI->pDRIInfo);
+     pXGI->pDRIInfo=0;
+@@ -537,14 +536,14 @@ XGIDRICloseScreen(ScreenPtr pScreen)
+ 
+   if (pXGI->pDRIInfo) {
+     if (pXGI->pDRIInfo->devPrivate) {
+-      xfree(pXGI->pDRIInfo->devPrivate);
++      free(pXGI->pDRIInfo->devPrivate);
+       pXGI->pDRIInfo->devPrivate=0;
+     }
+     DRIDestroyInfoRec(pXGI->pDRIInfo);
+     pXGI->pDRIInfo=0;
+   }
+-  if (pXGI->pVisualConfigs) xfree(pXGI->pVisualConfigs);
+-  if (pXGI->pVisualConfigsPriv) xfree(pXGI->pVisualConfigsPriv);
++  if (pXGI->pVisualConfigs) free(pXGI->pVisualConfigs);
++  if (pXGI->pVisualConfigsPriv) free(pXGI->pVisualConfigsPriv);
+ 
+   if(pXGI->agpSize){
+ /* ErrorF("Freeing agp memory\n"); */
+diff --git a/src/xgi_driver.c b/src/xgi_driver.c
+index b4f83b8..b8b8679 100755
+--- a/src/xgi_driver.c
++++ b/src/xgi_driver.c
+@@ -54,7 +54,7 @@
+ #include "fb.h"
+ #include "micmap.h"
+ #include "xf86.h"
+-#include "xf86Priv.h"
++#include "xf86Module.h"
+ #include "xf86_OSproc.h"
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
+@@ -106,6 +106,10 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifndef DEFAULT_DPI
++#define DEFAULT_DPI 96
++#endif
++
+ /* Jong 01/22/2009; compiler error; type conflict */
+ /*
+ #include <fcntl.h>
+@@ -556,13 +560,13 @@ XGIFreeRec(ScrnInfoPtr pScrn)
+              * head.
+              */
+             if (pXGIEnt->BIOS)
+-                xfree(pXGIEnt->BIOS);
++                free(pXGIEnt->BIOS);
+             pXGIEnt->BIOS = pXGI->BIOS = NULL;
+             if (pXGIEnt->XGI_Pr)
+-                xfree(pXGIEnt->XGI_Pr);
++                free(pXGIEnt->XGI_Pr);
+             pXGIEnt->XGI_Pr = pXGI->XGI_Pr = NULL;
+             if (pXGIEnt->RenderAccelArray)
+-                xfree(pXGIEnt->RenderAccelArray);
++                free(pXGIEnt->RenderAccelArray);
+             pXGIEnt->RenderAccelArray = pXGI->RenderAccelArray = NULL;
+         }
+         else {
+@@ -573,19 +577,19 @@ XGIFreeRec(ScrnInfoPtr pScrn)
+     }
+     else {
+         if (pXGI->BIOS)
+-            xfree(pXGI->BIOS);
++            free(pXGI->BIOS);
+         pXGI->BIOS = NULL;
+         if (pXGI->XGI_Pr)
+-            xfree(pXGI->XGI_Pr);
++            free(pXGI->XGI_Pr);
+         pXGI->XGI_Pr = NULL;
+         if (pXGI->RenderAccelArray)
+-            xfree(pXGI->RenderAccelArray);
++            free(pXGI->RenderAccelArray);
+         pXGI->RenderAccelArray = NULL;
+     }
+ 
+ #ifdef XGIMERGED
+     if (pXGI->MetaModes)
+-        xfree(pXGI->MetaModes);
++        free(pXGI->MetaModes);
+     pXGI->MetaModes = NULL;
+ 
+     if (pXGI->CRT1Modes) {
+@@ -595,8 +599,8 @@ XGIFreeRec(ScrnInfoPtr pScrn)
+                 do {
+                     DisplayModePtr p = pScrn->currentMode->next;
+                     if (pScrn->currentMode->Private)
+-                        xfree(pScrn->currentMode->Private);
+-                    xfree(pScrn->currentMode);
++                        free(pScrn->currentMode->Private);
++                    free(pScrn->currentMode);
+                     pScrn->currentMode = p;
+                 } while (pScrn->currentMode != pScrn->modes);
+             }
+@@ -612,7 +616,7 @@ XGIFreeRec(ScrnInfoPtr pScrn)
+     pXGI->pVbe = NULL;
+     if (pScrn->driverPrivate == NULL)
+         return;
+-    xfree(pScrn->driverPrivate);
++    free(pScrn->driverPrivate);
+     pScrn->driverPrivate = NULL;
+ }
+ 
+@@ -975,7 +979,7 @@ XGIProbe(DriverPtr drv, int flags)
+                                     numDevSections, drv, &usedChips);
+ 
+     /* Free it since we don't need that list after this */
+-    xfree(devSections);
++    free(devSections);
+     if (numUsed <= 0)
+         return FALSE;
+ 
+@@ -1015,7 +1019,7 @@ XGIProbe(DriverPtr drv, int flags)
+ 
+ #endif
+         }
+-    xfree(usedChips);
++    free(usedChips);
+ 
+     return foundScreen;
+ }
+@@ -1044,11 +1048,11 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
+ 
+ 	ErrorF("XGICopyModeNLink()...Use Virtual Size-1\n");
+ 
+-    if (!((mode = xalloc(sizeof(DisplayModeRec)))))
++    if (!((mode = malloc(sizeof(DisplayModeRec)))))
+         return dest;
+     memcpy(mode, i, sizeof(DisplayModeRec));
+-    if (!((mode->Private = xalloc(sizeof(XGIMergedDisplayModeRec))))) {
+-        xfree(mode);
++    if (!((mode->Private = malloc(sizeof(XGIMergedDisplayModeRec))))) {
++        free(mode);
+         return dest;
+     }
+     ((XGIMergedDisplayModePtr) mode->Private)->CRT1 = i;
+@@ -1125,8 +1129,8 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
+         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                    "Skipped %dx%d, not enough video RAM or beyond hardware specs\n",
+                    mode->HDisplay, mode->VDisplay);
+-        xfree(mode->Private);
+-        xfree(mode);
++        free(mode->Private);
++        free(mode);
+ 
+         return dest;
+     }
+@@ -1559,10 +1563,10 @@ XGIFreeCRT2Structs(XGIPtr pXGI)
+                                    pXGI->CRT2pScrn->monitor->Modes);
+             }
+             if (pXGI->CRT2pScrn->monitor->DDC)
+-                xfree(pXGI->CRT2pScrn->monitor->DDC);
+-            xfree(pXGI->CRT2pScrn->monitor);
++                free(pXGI->CRT2pScrn->monitor->DDC);
++            free(pXGI->CRT2pScrn->monitor);
+         }
+-        xfree(pXGI->CRT2pScrn);
++        free(pXGI->CRT2pScrn);
+         pXGI->CRT2pScrn = NULL;
+     }
+ }
+@@ -2438,7 +2442,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
+ 
+ #ifdef XGIMERGED
+     if (pXGI->MergedFB) {
+-        pXGI->CRT2pScrn->monitor = xalloc(sizeof(MonRec));
++        pXGI->CRT2pScrn->monitor = malloc(sizeof(MonRec));
+         if (pXGI->CRT2pScrn->monitor) {
+             DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL;
+             memcpy(pXGI->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec));
+@@ -2446,11 +2450,11 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
+             pXGI->CRT2pScrn->monitor->Modes = NULL;
+             tempm = pScrn->monitor->Modes;
+             while (tempm) {
+-                if (!(newm = xalloc(sizeof(DisplayModeRec))))
++                if (!(newm = malloc(sizeof(DisplayModeRec))))
+                     break;
+                 memcpy(newm, tempm, sizeof(DisplayModeRec));
+-                if (!(newm->name = xalloc(strlen(tempm->name) + 1))) {
+-                    xfree(newm);
++                if (!(newm->name = malloc(strlen(tempm->name) + 1))) {
++                    free(newm);
+                     break;
+                 }
+                 strcpy(newm->name, tempm->name);
+@@ -2490,7 +2494,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
+                         "Failed to allocate memory for CRT2 monitor, %s.\n",
+                         mergeddisstr);
+             if (pXGI->CRT2pScrn)
+-                xfree(pXGI->CRT2pScrn);
++                free(pXGI->CRT2pScrn);
+             pXGI->CRT2pScrn = NULL;
+             pXGI->MergedFB = FALSE;
+         }
+@@ -3540,7 +3544,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
+         /* Do some MergedFB mode initialisation */
+ #ifdef XGIMERGED
+         if (pXGI->MergedFB) {
+-        pXGI->CRT2pScrn = xalloc(sizeof(ScrnInfoRec));
++        pXGI->CRT2pScrn = malloc(sizeof(ScrnInfoRec));
+         if (!pXGI->CRT2pScrn) {
+             XGIErrorLog(pScrn,
+                         "Failed to allocate memory for 2nd pScrn, %s\n",
+@@ -3586,7 +3590,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
+                     XGIErrorLog(pScrn, mergednocrt1, mergeddisstr);
+                 }
+                 if (pXGI->CRT2pScrn)
+-                    xfree(pXGI->CRT2pScrn);
++                    free(pXGI->CRT2pScrn);
+                 pXGI->CRT2pScrn = NULL;
+                 pXGI->MergedFB = FALSE;
+             }
+@@ -3627,7 +3631,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
+                 XGIErrorLog(pScrn, mergednocrt2, mergeddisstr);
+             }
+             if (pXGI->CRT2pScrn)
+-                xfree(pXGI->CRT2pScrn);
++                free(pXGI->CRT2pScrn);
+             pXGI->CRT2pScrn = NULL;
+             pXGI->MergedFB = FALSE;
+         }
+@@ -4901,7 +4905,7 @@ XGIScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 
+     if (pXGI->ShadowFB) {
+         pXGI->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
+-        pXGI->ShadowPtr = xalloc(pXGI->ShadowPitch * height);
++        pXGI->ShadowPtr = malloc(pXGI->ShadowPitch * height);
+         displayWidth = pXGI->ShadowPitch / (pScrn->bitsPerPixel >> 3);
+         FBStart = pXGI->ShadowPtr;
+     }
+@@ -5777,17 +5781,17 @@ XGICloseScreen(int scrnIndex, ScreenPtr pScreen)
+     }
+ 
+     if (pXGI->ShadowPtr) {
+-        xfree(pXGI->ShadowPtr);
++        free(pXGI->ShadowPtr);
+         pXGI->ShadowPtr = NULL;
+     }
+ 
+     if (pXGI->DGAModes) {
+-        xfree(pXGI->DGAModes);
++        free(pXGI->DGAModes);
+         pXGI->DGAModes = NULL;
+     }
+ 
+     if (pXGI->adaptor) {
+-        xfree(pXGI->adaptor);
++        free(pXGI->adaptor);
+         pXGI->adaptor = NULL;
+         pXGI->ResetXv = pXGI->ResetXvGamma = NULL;
+     }
+diff --git a/src/xgi_opt.c b/src/xgi_opt.c
+index 09346e4..c0608d5 100755
+--- a/src/xgi_opt.c
++++ b/src/xgi_opt.c
+@@ -195,7 +195,7 @@ xgiOptions(ScrnInfoPtr pScrn)
+     xf86CollectOptions(pScrn, NULL);
+ 
+     /* Process the options */
+-    if(!(pXGI->Options = xalloc(sizeof(XGIOptions)))) return;
++    if(!(pXGI->Options = malloc(sizeof(XGIOptions)))) return;
+ 
+     memcpy(pXGI->Options, XGIOptions, sizeof(XGIOptions));
+ 
+diff --git a/src/xgi_setup.c b/src/xgi_setup.c
+index c1d2cdc..6641b09 100755
+--- a/src/xgi_setup.c
++++ b/src/xgi_setup.c
+@@ -678,7 +678,7 @@ bAccessVGAPCIInfo(PXGI_HW_DEVICE_INFO pHwDevInfo, ULONG ulOffset, ULONG ulSet, U
+ 	err = pci_device_cfg_write_u32(pXGI->PciInfo, *pulValue,
+ 				       ulOffset & ~3);
+     } else {
+-	err = pci_device_cfg_write_u32(pXGI->PciInfo, pulValue,
++	err = pci_device_cfg_read_u32(pXGI->PciInfo, pulValue,
+ 				       ulOffset & ~3);
+     }
+ 
+diff --git a/src/xgi_video.c b/src/xgi_video.c
+index 31cffd5..df76d14 100755
+--- a/src/xgi_video.c
++++ b/src/xgi_video.c
+@@ -142,7 +142,7 @@ void XGIInitVideo(ScreenPtr pScreen)
+             adaptors = &newAdaptor;
+         } else {
+             newAdaptors =  /* need to free this someplace */
+-                xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
++                malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+             if(newAdaptors) {
+                 memcpy(newAdaptors, adaptors, num_adaptors *
+                                         sizeof(XF86VideoAdaptorPtr));
+@@ -157,7 +157,7 @@ void XGIInitVideo(ScreenPtr pScreen)
+         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
+ 
+     if(newAdaptors)
+-        xfree(newAdaptors);
++        free(newAdaptors);
+ 
+ }
+ 
+@@ -395,7 +395,7 @@ XGISetupImageVideo(ScreenPtr pScreen)
+     struct v4l2_standard 	standard;
+ # endif//VC    
+ 
+-    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
++    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+                             sizeof(XGIPortPrivRec) +
+                             sizeof(DevUnion))))
+         return NULL;
diff --git a/testing/xl2tpd/APKBUILD b/testing/xl2tpd/APKBUILD
deleted file mode 100644
index a548c72fc..000000000
--- a/testing/xl2tpd/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributor: Danilo Godec <danilo.godec@agenda.si>
-# Maintainer:
-pkgname=xl2tpd
-pkgver=1.3.0
-pkgrel=0
-pkgdesc="Layer 2 Tunnelling Protocol Daemon (RFC 2661)"
-url="http://www.xelerance.com/services/software/xl2tpd/"
-arch="all"
-license="GPL"
-depends=""
-depends_dev="libpcap-dev"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-doc"
-source="http://www.xelerance.com/wp-content/uploads/software/$pkgname/$pkgname-$pkgver.tar.gz xl2tpd.confd xl2tpd.initd options.l2tp"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	make PREFIX=/usr || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make PREFIX=/usr DESTDIR="$pkgdir" install
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-	install -Dm644 examples/xl2tpd.conf "$pkgdir"/etc/xl2tpd/xl2tpd.conf
-	install -Dm755 "$srcdir"/xl2tpd.initd "$pkgdir"/etc/init.d/xl2tpd
-	install -Dm644 "$srcdir"/xl2tpd.confd "$pkgdir"/etc/conf.d/xl2tpd
-	install -Dm644 "$srcdir"/options.l2tp "$pkgdir"/etc/ppp/options.l2tp
-	install -dm755 "$pkgdir"/var/run/xl2tpd
-}
-
-md5sums="28264284552c442b24cf421755a2bb48  xl2tpd-1.3.0.tar.gz
-0032d104bd2d993b8a514c2f898d1dd9  xl2tpd.confd
-77e4364f4e726549b6e74aec2b1ccd39  xl2tpd.initd
-8f1a2896d08b6353424013cf7247dc7d  options.l2tp"
diff --git a/testing/xl2tpd/options.l2tp b/testing/xl2tpd/options.l2tp
deleted file mode 100644
index 425a56e08..000000000
--- a/testing/xl2tpd/options.l2tp
+++ /dev/null
@@ -1,17 +0,0 @@
-ipcp-accept-local
-ipcp-accept-remote
-ms-dns  192.168.1.1
-ms-dns  192.168.1.3
-ms-wins 192.168.1.2
-ms-wins 192.168.1.4
-noccp
-auth
-crtscts
-idle 1800
-mtu 1410
-mru 1410
-nodefaultroute
-debug
-lock
-proxyarp
-connect-delay 5000
diff --git a/testing/xl2tpd/xl2tpd.confd b/testing/xl2tpd/xl2tpd.confd
deleted file mode 100644
index d89a1f3d6..000000000
--- a/testing/xl2tpd/xl2tpd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for /etc/init.d/xl2tpd
-
-# Any extra options you want to pass to xl2tpd
-# on start-up should be put here.
-XL2TPD_OPTS=""
diff --git a/testing/xl2tpd/xl2tpd.initd b/testing/xl2tpd/xl2tpd.initd
deleted file mode 100644
index d56e1671e..000000000
--- a/testing/xl2tpd/xl2tpd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting xl2tpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/xl2tpd -- ${XL2TPD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping xl2tpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/xl2tpd.pid
-	result=$?
-	start-stop-daemon --stop --quiet --exec /usr/sbin/xl2tpd-control
-	result=$(( $result + $? ))
-	eend $result
-}
diff --git a/testing/xulrunner/0002-Use-C99-math-isfinite.patch b/testing/xulrunner/0002-Use-C99-math-isfinite.patch
new file mode 100644
index 000000000..3d85a6928
--- /dev/null
+++ b/testing/xulrunner/0002-Use-C99-math-isfinite.patch
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 000000000..6784b13e7
--- /dev/null
+++ b/testing/xulrunner/0003-xulrunner-jemalloc-aslr.patch
@@ -0,0 +1,67 @@
+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
new file mode 100644
index 000000000..986b183ec
--- /dev/null
+++ b/testing/xulrunner/0004-xulrunner-malloc_usable_size.patch
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 000000000..e5954846f
--- /dev/null
+++ b/testing/xulrunner/APKBUILD
@@ -0,0 +1,112 @@
+# 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
new file mode 100644
index 000000000..4e4297d0e
--- /dev/null
+++ b/testing/xulrunner/ff9-aslr-fix.patch
@@ -0,0 +1,40 @@
+--- ./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
new file mode 100644
index 000000000..2cbb45b7a
--- /dev/null
+++ b/testing/xulrunner/mozconfig
@@ -0,0 +1,38 @@
+. $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
diff --git a/testing/youtube-dl/APKBUILD b/testing/youtube-dl/APKBUILD
new file mode 100644
index 000000000..29516f83e
--- /dev/null
+++ b/testing/youtube-dl/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Timo Teräs <timo.teras@iki.fi>
+pkgname=youtube-dl
+pkgver=2012.01.08b
+pkgrel=0
+pkgdesc="a small command-line program for downloading videos from YouTube.com"
+url="http://rg3.github.com/youtube-dl/"
+arch="noarch"
+license="Public Domain"
+depends="python>=2.5"
+makedepends="wget"
+install=""
+subpackages=""
+source="https://raw.github.com/rg3/$pkgname/$pkgver/youtube-dl"
+
+_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 "$srcdir"
+	mkdir -p "$pkgdir"/usr/bin
+	install -m 0555 youtube-dl "$pkgdir"/usr/bin
+}
+
+md5sums="a445420376d975a21f0292df5ff6e5b9  youtube-dl"
diff --git a/testing/zd1211-firmware/APKBUILD b/testing/zd1211-firmware/APKBUILD
deleted file mode 100644
index f34a08df1..000000000
--- a/testing/zd1211-firmware/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=zd1211-firmware
-pkgver=1.4
-pkgrel=0
-pkgdesc="Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver"
-
-url="http://sourceforge.net/projects/zd1211/"
-arch="noarch"
-license="GPL"
-depends=""
-depends_dev=""
-makedepends=""
-install=""
-subpackages=
-source="http://downloads.sourceforge.net/project/zd1211/zd1211-firmware/$pkgver/zd1211-firmware-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/zd1211-firmware
-
-build() {
-	return 0
-}
-
-package() {
-	cd "$_builddir"
-	mkdir -p "$pkgdir"/lib/firmware/zd1211
-	cp zd1211_ub zd1211_ur zd1211_uphr zd1211b_ub zd1211b_ur zd1211b_uphr \
-		"$pkgdir"/lib/firmware/zd1211/
-}
-
-md5sums="19f28781d76569af8551c9d11294c870  zd1211-firmware-1.4.tar.bz2"
author	Fabian Affolter <fabian@affolter-engineering.ch>	2012-01-30 02:37:57 +0000
committer	Fabian Affolter <fabian@affolter-engineering.ch>	2012-01-30 02:37:57 +0000
commit	a9bc84bba147c649e2e30f270add42d6c6da0b4e (patch)
tree	e85cb22d969966900b71e0ba4a26e6d600044904 /testing
parent	9ba6d526aaff5714cb1ad8b9e91c5576e19e0e0b (diff)
parent	5d7f87f856d5ab5c13148f781a309af5c9ceff02 (diff)
download	aports-a9bc84bba147c649e2e30f270add42d6c6da0b4e.tar.bz2 aports-a9bc84bba147c649e2e30f270add42d6c6da0b4e.tar.xz