Merge remote branch 'ncopa/master'

29 files changed, 709 insertions, 230 deletions

diff --git a/testing/acf-fetch-crl/APKBUILD b/testing/acf-fetch-crl/APKBUILD
index 5b6473732..8e2e23e5a 100644
--- a/testing/acf-fetch-crl/APKBUILD
+++ b/testing/acf-fetch-crl/APKBUILD
@@ -1,10 +1,10 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 pkgname=acf-fetch-crl
 pkgver=0.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A web-based system administration interface for fetch-crl"
 url="http://git.alpinelinux.org/cgit/$pkgname"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL-2"
 depends="acf-core lua fetch-crl"
 makedepends=""
diff --git a/testing/audacious-plugins/APKBUILD b/testing/audacious-plugins/APKBUILD
deleted file mode 100644
index 84e8910c8..000000000
--- a/testing/audacious-plugins/APKBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=audacious-plugins
-pkgver=2.4.2
-pkgrel=3
-pkgdesc="playlist-oriented media player with multiple interfaces (plugins)"
-url="http://audacious-media-player.org/"
-arch="all"
-license="ISC"
-depends=audacious
-#_want_ffmpeg="ffmpeg-dev"
-makedepends="libmowgli-dev
-	     libmcs-dev
-             libguess-dev
-             gtk+-dev
-             dbus-glib-dev
-             audacious-dev
-             libxml2-dev
-
-	     libxcomposite-dev
-	     libsamplerate-dev
-	     libcue-dev
-	     libmms-dev
-	     libsndfile-dev
-
-	     libogg-dev
-             libvorbis-dev
-
-	     $_want_ffmpeg
-
-             alsa-lib-dev
-	     faad2-dev
-             neon-dev
-             curl-dev
-             wavpack-dev
-	     lame-dev
-	     flac-dev"
-install=
-subpackages=
-source="http://distfiles.atheme.org/$pkgname-$pkgver.tgz"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-
-	for i in $source; do
-		case $i in
-		*.patch)
-			msg "Applying $i..."
-			patch -s -p1 -N -i "$srcdir"/$i || return 1
-			;;
-		esac
-	done
-
-	# workaround bug in busybox
-	sed -e "/touch/s/0001010000/200001010000/g" \
-		-i configure
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--enable-chardet
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="c33d0ea67e8fb8d6ed3891d464d5009b  audacious-plugins-2.4.2.tgz"
diff --git a/testing/audacious/APKBUILD b/testing/audacious/APKBUILD
deleted file mode 100644
index b92bc582a..000000000
--- a/testing/audacious/APKBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=audacious
-pkgver=2.4.2
-pkgrel=0
-pkgdesc="playlist-oriented media player with multiple interfaces"
-url="http://audacious-media-player.org/"
-arch="all"
-license="ISC"
-depends=
-makedepends="libmowgli-dev libmcs-dev libguess-dev gtk+-dev dbus-glib-dev libxml2-dev"
-install=
-subpackages="$pkgname-dev"
-source="http://distfiles.atheme.org/$pkgname-$pkgver.tgz
-	uclibc-execinfo.patch"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-
-	for i in $source; do
-		case $i in
-		*.patch)
-			msg "Applying $i..."
-			patch -s -p1 -N -i "$srcdir"/$i || return 1
-			;;
-		esac
-	done
-
-	# workaround bug in busybox
-	sed -e "/touch/s/0001010000/200001010000/g" \
-		-i configure
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--enable-chardet
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-
-	# bleah...
-	mkdir $pkgdir/usr/bin
-
-	make DESTDIR="$pkgdir" install
-}
-
-md5sums="bffdee15653595a7e9126246dee444e5  audacious-2.4.2.tgz
-b200db2ce2f3949deb4fdfa98f0b193d  uclibc-execinfo.patch"
diff --git a/testing/audacious/uclibc-execinfo.patch b/testing/audacious/uclibc-execinfo.patch
deleted file mode 100644
index 803f273ef..000000000
--- a/testing/audacious/uclibc-execinfo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- audacious-2.4.2.orig/src/libaudcore/audstrings.c
-+++ audacious-2.4.2/src/libaudcore/audstrings.c
-@@ -230,9 +230,8 @@
-     return dirname;
- }
- 
--#if defined(__GLIBC__) && (__GLIBC__ >= 2)
--#define HAVE_EXECINFO 1
--#include <execinfo.h>
-+#ifdef HAVE_EXECINFO_H
-+# include <execinfo.h>
- #endif
- 
- /**
-@@ -258,7 +257,7 @@
- 
-     /* already UTF-8? */
-     if (!g_utf8_validate(str, -1, NULL)) {
--#ifdef HAVE_EXECINFO
-+#ifdef HAVE_EXECINFO_H
- 		gint i, nsymbols;
- 		const gint nsymmax = 50;
- 		void *addrbuf[nsymmax];
diff --git a/testing/consolekit/APKBUILD b/testing/consolekit/APKBUILD
index dfae9cbc4..84150679d 100644
--- a/testing/consolekit/APKBUILD
+++ b/testing/consolekit/APKBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=consolekit
-pkgver=0.4.2
-pkgrel=0
+pkgver=0.4.3
+pkgrel=1
 pkgdesc="Framework for defining and tracking users, login sessions, and seats"
 url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
-arch="x86 x86_64"
+arch="all"
 license="GPL-2"
 depends=
 makedepends="polkit-dev zlib-dev libx11-dev dbus-glib-dev"
@@ -25,13 +25,15 @@ build() {
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
 	make || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="285acb35bfcb2b8dc21c6071e6f6e116  ConsoleKit-0.4.2.tar.bz2"
+md5sums="4c39c6eacc75334b890f21eead1d2945  ConsoleKit-0.4.3.tar.bz2"
diff --git a/testing/fotoxx/APKBUILD b/testing/fotoxx/APKBUILD
new file mode 100644
index 000000000..78f35a58a
--- /dev/null
+++ b/testing/fotoxx/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=fotoxx
+pkgver=10.11.2
+pkgrel=0
+pkgdesc="Photo editing and collection management"
+url="http://kornelix.squarespace.com/fotoxx"
+arch="all"
+license="GPL-3"
+depends="xdg-utils"
+makedepends="gtk+-dev tiff-dev"
+install=
+subpackages="$pkgname-doc"
+source="http://kornelix.squarespace.com/storage/downloads/fotoxx-$pkgver.tar.gz
+	no-execinfo.patch"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+	sed -e 's:/bin/bash:/bin/sh:' -i dependencies.sh
+}
+
+build() {
+	cd "$_builddir"
+	make PREFIX=/usr LDFLAGS="$LFDLAGS" CXXFLAGS="$CFLAGS" || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make PREFIX=/usr DESTDIR="$pkgdir" install
+}
+
+md5sums="644d7a6675272ce47785de61ba22890c  fotoxx-10.11.2.tar.gz
+2651f3e1a422f5dbfe2d09eb789af783  no-execinfo.patch"
diff --git a/testing/fotoxx/no-execinfo.patch b/testing/fotoxx/no-execinfo.patch
new file mode 100644
index 000000000..2c8195c9e
--- /dev/null
+++ b/testing/fotoxx/no-execinfo.patch
@@ -0,0 +1,65 @@
+diff --git a/zfuncs.cc b/zfuncs.cc
+index 0427f99..686b75a 100644
+--- a/zfuncs.cc
++++ b/zfuncs.cc
+@@ -45,12 +45,14 @@ void appcrash(cchar *pMess, ... )
+    va_end(arglist);
+    
+    printf("appcrash: \n %s \n",message);
+-   
++#ifndef __UCLIBC__ 
+    nstack = backtrace(stacklist,nstack);                                   //  good for g++ -rdynamic
+    stackents = backtrace_symbols(stacklist,nstack);
+    for (ii = 0; ii < nstack; ii++) 
+       printf(" %s \n",stackents[ii]);
+-
++#else
++   printf("backtrace not available\n");
++#endif
+    abort();                                                                //  good for gdb backtrace
+ }
+ 
+@@ -105,11 +107,13 @@ void zappcrash(cchar *pMess, ... )                                         //  v
+ 
+    printf("zappcrash: \n %s \n",message);                                  //  stdout message      v.3.7
+ 
++#ifndef __UCLIBC__
+    nstack = backtrace(stacklist,nstack);                                   //  get traceback data
+    stackents = backtrace_symbols(stacklist,nstack);
+ 
+    for (ii = 0; ii < nstack; ii++)                                         //  stdout backtrace
+       printf(" %s \n",stackents[ii]);
++#endif
+ 
+    fid1 = fopen("zappcrash","w");                                          //  text file for backtrace
+ 
+@@ -118,6 +122,7 @@ void zappcrash(cchar *pMess, ... )                                         //  v
+    cc = readlink("/proc/self/exe",progexe,300);                            //  get own program path
+    progexe[cc] = 0;
+ 
++#ifndef __UCLIBC__
+    for (ii = 0; ii < nstack; ii++)                                         //  output backtrace
+    {
+       pfunc = 0;
+@@ -137,6 +142,7 @@ void zappcrash(cchar *pMess, ... )                                         //  v
+ 
+       fprintf(fid1," %s %s \n",stackents[ii],pfunc);                       //  write to text file
+    }
++#endif
+ 
+    fclose(fid1);
+    
+diff --git a/zfuncs.h b/zfuncs.h
+index 9ec9a6b..76b7b44 100644
+--- a/zfuncs.h
++++ b/zfuncs.h
+@@ -34,7 +34,9 @@
+ #include <pthread.h>
+ #include <errno.h>
+ #include <signal.h>
++#ifndef __UCLIBC__
+ #include <execinfo.h>
++#endif
+ #include <locale.h>
+ #include <sys/inotify.h>
+ 
diff --git a/testing/keepalived/APKBUILD b/testing/keepalived/APKBUILD
new file mode 100644
index 000000000..fb85a5f5a
--- /dev/null
+++ b/testing/keepalived/APKBUILD
@@ -0,0 +1,62 @@
+# Contributor: Pablo Castorino <pcastorino@mendoza-conicet.gob.ar>
+# Maintainer: Pablo Castorino <pcastorino@mendoza-conicet.gob.ar>
+pkgname=keepalived
+pkgver=1.1.20
+pkgrel=0
+pkgdesc="Health Checking for Linux Virtual Server & High-Availability"
+url="http://www.keepalived.org/"
+arch="all"
+license="GPL"
+depends=
+makedepends="openssl-dev popt-dev linux-headers"
+install=
+subpackages="$pkgname-doc $pkgname-sample-config:samples"
+source="http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz
+	keepalived-1.1.20-ipvs_haeader_check.patch
+	$pkgname.initd
+	$pkgname.confd
+	"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	# apply patches here
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--with-kernel-dir=/usr/include/linux \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+}
+
+samples() {
+	pkgdesc="Sample configuration for keepalived"
+	mkdir -p "$subpkgdir"/etc/keepalived/
+	mv "$pkgdir"/etc/keepalived/samples "$subpkgdir"/etc/keepalived/
+}
+
+md5sums="6c3065c94bb9e2187c4b5a80f6d8be31  keepalived-1.1.20.tar.gz
+78c19e15f649e353c2fba44e1f70b1e1  keepalived-1.1.20-ipvs_haeader_check.patch
+d20faa8d55b8a41b8ddb71bb00a6bead  keepalived.initd
+56ff68ad19e973826c2dbc42c892939f  keepalived.confd"
diff --git a/testing/keepalived/keepalived-1.1.20-ipvs_haeader_check.patch b/testing/keepalived/keepalived-1.1.20-ipvs_haeader_check.patch
new file mode 100644
index 000000000..d5220fe4c
--- /dev/null
+++ b/testing/keepalived/keepalived-1.1.20-ipvs_haeader_check.patch
@@ -0,0 +1,68 @@
+--- old/configure
++++ new/configure
+@@ -3849,8 +3889,8 @@
+ 
+ IPVS_SUPPORT="_WITHOUT_LVS_"
+ if test "$enable_lvs" != "no"; then
+-  ac_fn_c_check_header_mongrel "$LINENO" "net/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default"
+-if test "x$ac_cv_header_net_ip_vs_h" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "linux/ip_vs.h" "ac_cv_header_linux_ip_vs_h" "$ac_includes_default"
++if test "x$ac_cv_header_linux_ip_vs_h" = xyes; then :
+   IPVS_SUPPORT="_WITH_LVS_"
+ else
+ 
+--- old/configure.in
++++ new/configure.in
+@@ -113,7 +113,7 @@
+ dnl ----[ Checks for LVS and VRRP support ]----
+ IPVS_SUPPORT="_WITHOUT_LVS_"
+ if test "$enable_lvs" != "no"; then
+-  AC_CHECK_HEADER([net/ip_vs.h],
++  AC_CHECK_HEADER([linux/ip_vs.h],
+     [IPVS_SUPPORT="_WITH_LVS_"],
+     [
+       IPVS_SUPPORT="_WITHOUT_LVS_"
+--- keepalived-1.1.20-orig/keepalived/include/check_data.h
++++ keepalived-1.1.20/keepalived/include/check_data.h
+@@ -33,7 +33,7 @@
+ 
+ #ifdef _WITH_LVS_
+   #define SCHED_MAX_LENGTH IP_VS_SCHEDNAME_MAXLEN
+-  #include <net/ip_vs.h>
++  #include <linux/ip_vs.h>
+ #else
+   #define SCHED_MAX_LENGTH   1
+ #endif
+--- keepalived-1.1.20-orig/keepalived/include/ipvswrapper.h
++++ keepalived-1.1.20/keepalived/include/ipvswrapper.h
+@@ -43,7 +43,7 @@
+ #elif _KRNL_2_6_
+   #include "../libipvs-2.6/libipvs.h"
+ #endif
+-  #include <net/ip_vs.h>
++  #include <linux/ip_vs.h>
+ #endif
+ 
+ #ifndef IP_VS_TEMPLATE_TIMEOUT
+--- keepalived-1.1.20-orig/keepalived/libipvs-2.4/libipvs.h
++++ keepalived-1.1.20/keepalived/libipvs-2.4/libipvs.h
+@@ -10,7 +10,7 @@
+ #ifndef _LIBIPVS_H
+ #define _LIBIPVS_H
+ 
+-#include <net/ip_vs.h>
++#include <linux/ip_vs.h>
+ 
+ /*
+  * The default IPVS_SVC_PERSISTENT_TIMEOUT is a little larger than average
+--- keepalived-1.1.20-orig/keepalived/libipvs-2.6/libipvs.h
++++ keepalived-1.1.20/keepalived/libipvs-2.6/libipvs.h
+@@ -10,7 +10,7 @@
+ #ifndef _LIBIPVS_H
+ #define _LIBIPVS_H
+ 
+-#include <net/ip_vs.h>
++#include <linux/ip_vs.h>
+ 
+ #define MINIMUM_IPVS_VERSION_MAJOR      1
+ #define MINIMUM_IPVS_VERSION_MINOR      1
diff --git a/testing/keepalived/keepalived.confd b/testing/keepalived/keepalived.confd
new file mode 100644
index 000000000..87094b355
--- /dev/null
+++ b/testing/keepalived/keepalived.confd
@@ -0,0 +1,7 @@
+# keepalived config file
+# default: /etc/keepalived/keepalived.conf
+#KEEPALIVED_CFG=/etc/keepalived
+
+# extra options for keepalived
+#KEEPALIVED_OPTS="" # you must NOT use -f here!
+
diff --git a/testing/keepalived/keepalived.initd b/testing/keepalived/keepalived.initd
new file mode 100755
index 000000000..a5b2bb9f9
--- /dev/null
+++ b/testing/keepalived/keepalived.initd
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+KEEPALIVED_BIN="/usr/sbin/keepalived"
+KEEPALIVED_CFG=${KEEPALIVED_CFG:-/etc/keepalived/keepalived.conf}
+
+depend() {
+	use logger
+	need net
+	after firewall
+}
+
+start() {
+	ebegin "Starting keepalived"
+	start-stop-daemon --start --exec "${KEEPALIVED_BIN}" \
+		-- -f "${KEEPALIVED_CFG}" ${KEEPALIVED_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping keepalived"
+	start-stop-daemon --stop --exec "${KEEPALIVED_BIN}"
+	eend $?
+}
diff --git a/testing/lxdm/APKBUILD b/testing/lxdm/APKBUILD
index de51ddad7..05f9931dc 100644
--- a/testing/lxdm/APKBUILD
+++ b/testing/lxdm/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=lxdm
 pkgver=0.3.0
-pkgrel=0
+pkgrel=2
 pkgdesc="LXDE desktop login manager"
 url="http://wiki.lxde.org/en/LXDM"
 license="GPL"
-depends=
+depends="bash"
 makedepends="autoconf automake gtk+-dev consolekit-dev"
 install=
 source="http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
@@ -50,6 +50,6 @@ package() {
 }
 
 md5sums="1d0688e088edab7c3c563263eb2f9654  lxdm-0.3.0.tar.gz
-27f8ef5c16ae1234365ab318e2c9001c  lxdm.initd
+d6455d172d5d897f6bfcefe9a1a632c7  lxdm.initd
 045da38f5bb183ccacc489ea7e50e927  lxdm-execinfo.patch
 0d44e8cd97894fd680e3f09e680c3481  lxdm-nopam.patch"
diff --git a/testing/lxdm/lxdm.initd b/testing/lxdm/lxdm.initd
index 274c4afe9..d0f17a24f 100755
--- a/testing/lxdm/lxdm.initd
+++ b/testing/lxdm/lxdm.initd
@@ -4,15 +4,9 @@ depends() {
 	needs localmount
 }
 
-start() {
-	ebegin "Starting lxdm"
-	start-stop-daemon --start --quiet --exec /usr/bin/lxdm -- -d
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping lxdm"
-	start-stop-daemon --stop --quiet --exec /usr/bin/lxdm
-	eend $?
-}
+description="Lightweight Login Manager"
+command="/usr/sbin/lxdm"
+command_args="-d"
+pidfile="/var/run/lxdm.pid"
 
+# uses the openrc templates for start()/stop()
diff --git a/testing/pllua/APKBUILD b/testing/pllua/APKBUILD
deleted file mode 100644
index 913f99bbd..000000000
--- a/testing/pllua/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Michael Mason <ms13sp@gmail.com>
-pkgname=pllua
-pkgver=0.3.1
-pkgrel=0
-pkgdesc="Procedural language for PostgreSQL using Lua"
-url="http://pgfoundry.org/projects/pllua"
-arch="x86 x86_64"
-license="GPL"
-depends="postgresql"
-makedepends="postgresql-dev lua-dev ccache"
-install=
-subpackages=""
-source="http://pgfoundry.org/frs/download.php/1722/$pkgname-$pkgver.tar.gz
-	pllua-01-0.3.1-include.patch"
-
-# append extra dependencies to -dev subpackage
-# remove if not used.
-# depends_dev="somepackage-dev"
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	for i in "$srcdir"/*.patch; do
-       		msg "Applying ${i}"
-                patch -p1 -i $i || return 1
-        done
-              
-	make || return 1
-	make DESTDIR="$pkgdir" install
-
-	# remove the 2 lines below (and this) if there is no init.d script
-	# install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	# install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-}
-
-md5sums="e57385bdf2d533ac73cd02401795cea8  pllua-0.3.1.tar.gz
-a47387e64b7dba8d58237c7dad0e2d61  pllua-01-0.3.1-include.patch"
diff --git a/testing/pllua/pllua-01-0.3.1-include.patch b/testing/pllua/pllua-01-0.3.1-include.patch
deleted file mode 100644
index afbf8a984..000000000
--- a/testing/pllua/pllua-01-0.3.1-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-#most of fix from here http://postgis.refractions.net/pipermail/postgis-devel/2009-February/004879.html
---- pllua-0.3.1/plluaapi.c.orig	Thu Sep 17 15:34:07 2009
-+++ pllua-0.3.1/plluaapi.c	Thu Sep 17 15:34:18 2009
-@@ -7,6 +7,10 @@
- 
- #include "pllua.h"
- #include "rowstamp.h"
-+#include "utils/guc.h"
-+extern Datum textout (PG_FUNCTION_ARGS);
-+extern Datum bpcharout(PG_FUNCTION_ARGS);
-+extern Datum varcharout(PG_FUNCTION_ARGS);
- 
- /* extended function info */
- typedef struct luaP_Info {
diff --git a/testing/polkit-gnome/APKBUILD b/testing/polkit-gnome/APKBUILD
new file mode 100644
index 000000000..0f62123d0
--- /dev/null
+++ b/testing/polkit-gnome/APKBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=polkit-gnome
+pkgver=0.99
+pkgrel=0
+pkgdesc="PolicyKit integration for the GNOME desktop"
+url="http://www.freedesktop.org/wiki/Software/PolicyKit"
+arch="all"
+license="LGPL"
+depends=""
+makedepends="polkit-dev gtk+-dev gobject-introspection"
+subpackages="$pkgname-dev"
+source="http://hal.freedesktop.org/releases/polkit-gnome-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+	sed -i -e 's/OnlyShowIn=GNOME/NotShowIn=KDE/' \
+		src/polkit-gnome-authentication-agent-1.desktop.in.in
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--libexecdir=/usr/lib/polkit-gnome \
+		--disable-static \
+		--disable-introspection \
+		|| return 1
+	make
+}
+
+package() {
+	cd "$_builddir"
+	make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="f1a2565083266bc8c05c60aa7d8a0f6a  polkit-gnome-0.99.tar.bz2"
diff --git a/testing/thunar-volman/APKBUILD b/testing/thunar-volman/APKBUILD
index 818034077..0d9bd9a41 100644
--- a/testing/thunar-volman/APKBUILD
+++ b/testing/thunar-volman/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=thunar-volman
 pkgver=0.5.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Thunar extension for volumes management"
 url="http://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
 arch="x86 x86_64"
 license="GPL"
 depends=
-makedepends="thunar-dev exo-dev udev-dev libxfce4ui-dev"
+makedepends="thunar-dev exo-dev udev-dev libxfce4ui-dev libnotify-dev"
 install=
 subpackages=
 source="http://archive.xfce.org/src/apps/thunar-volman/${pkgver%.*}/thunar-volman-$pkgver.tar.bz2"
diff --git a/testing/upower/APKBUILD b/testing/upower/APKBUILD
new file mode 100644
index 000000000..3f66d09d6
--- /dev/null
+++ b/testing/upower/APKBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=upower
+pkgver=0.9.7
+pkgrel=0
+pkgdesc="Power Management Services"
+url="http://upower.freedesktop.org"
+arch="all"
+license="GPL"
+depends=""
+subpackages="$pkgname-dev $pkgname-doc"
+makedepends="gtk+-dev udev-dev libusb-dev polkit-dev dbus-glib-dev libxslt
+	docbook-xsl"
+source="http://upower.freedesktop.org/releases/upower-$pkgver.tar.bz2"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--libexecdir=/usr/lib/upower \
+		--disable-static
+	make
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="d300a4bb4131cb88c9e06abe888f379f  upower-0.9.7.tar.bz2"
diff --git a/testing/xdg-utils/APKBUILD b/testing/xdg-utils/APKBUILD
new file mode 100644
index 000000000..70b268c23
--- /dev/null
+++ b/testing/xdg-utils/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xdg-utils
+pkgver=1.0.2
+pkgrel=0
+pkgdesc="Basic desktop integration functions"
+url="http://portland.freedesktop.org/wiki/"
+arch="all"
+license="MIT"
+depends=
+makedepends=
+install=
+subpackages="$pkgname-doc"
+source="http://portland.freedesktop.org/download/xdg-utils-$pkgver.tgz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="348a5b91dc66426505022c74a64b2940  xdg-utils-1.0.2.tgz"
diff --git a/testing/xen/APKBUILD b/testing/xen/APKBUILD
new file mode 100644
index 000000000..3b36e1271
--- /dev/null
+++ b/testing/xen/APKBUILD
@@ -0,0 +1,78 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=xen
+pkgver=4.0.1
+pkgrel=1
+pkgdesc="Xen hypervisor"
+url="http://www.xen.org/"
+license="GPL"
+depends=
+makedepends="coreutils python sed gawk libgcrypt-dev gnutls-dev pciutils-dev
+	texinfo git wget mesa-dev sdl-dev zlib-dev openssl-dev
+	util-linux-ng-dev python-dev sed"
+install=
+subpackages="$pkgname-doc"
+source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
+	xen-blktap-uclibc.patch
+	xen-blktap2-uclibc.patch
+	xen-disable-firmware.patch
+	xen-disable-fsback.patch
+	xen-disable-werror.patch
+	xen-dont-use-lib64.patch
+	xend.initd
+	xendomains.initd"
+arch=""
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i..."
+			patch -s -p1 -N -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+
+	# We unset $CFLAGS and $LDFLAGS because Xen's buildsystem does not
+	# like these values being set.  Arguably this is a bug but I can't be
+	# bothered to track it down.  --nenolod
+	unset CFLAGS
+	unset LDFLAGS
+
+	# If we provide no parameters it tries to build a kernel image.  We
+	# definitely don't want that.
+	make xen tools stubdom || return 1
+}
+
+package() {
+	cd "$_builddir"
+
+	# We unset $CFLAGS and $LDFLAGS because Xen's buildsystem does not
+	# like these values being set.  Arguably this is a bug but I can't be
+	# bothered to track it down.  --nenolod
+	unset CFLAGS
+	unset LDFLAGS
+
+	make DESTDIR="$pkgdir" install-xen install-tools install-stubdom
+
+	install -m755 -D "$srcdir"/xend.initd "$pkgdir"/etc/init.d/xend
+	install -m755 -D "$srcdir"/xendomains.initd "$pkgdir"/etc/init.d/xendomains
+}
+
+md5sums="d197afad975ab2396a67323d57388c27  xen-4.0.1.tar.gz
+edb5c3e7fba8214702fac709f0e53124  xen-blktap-uclibc.patch
+1f7f847ae0baa915c7b52d0ed5869fe6  xen-blktap2-uclibc.patch
+a569f16a7e3c832ba3fab6154f657244  xen-disable-firmware.patch
+03d1fff892e627b812bba4e6c56d696a  xen-disable-fsback.patch
+949d0d3bc1e8f300a849279b60760c6a  xen-disable-werror.patch
+b6599060e22b61dabee0fe460b4a0c9d  xen-dont-use-lib64.patch
+1d81b04f8c8b919879a73f0e3d2fe80f  xend.initd
+a2b5234483f1b5892d22e9315d9c307f  xendomains.initd"
diff --git a/testing/xen/xen-blktap-uclibc.patch b/testing/xen/xen-blktap-uclibc.patch
new file mode 100644
index 000000000..d8668ec19
--- /dev/null
+++ b/testing/xen/xen-blktap-uclibc.patch
@@ -0,0 +1,11 @@
+--- xen-4.0.1/tools/blktap/drivers/bswap.h
++++ xen-4.0.1.mod/tools/blktap/drivers/bswap.h
+@@ -15,6 +15,8 @@
+ #define bswap_64(x) swap64(x)
+ #else
+ 
++#define HAVE_BYTESWAP_H
++
+ #ifdef HAVE_BYTESWAP_H
+ #include <byteswap.h>
+ #else
diff --git a/testing/xen/xen-blktap2-uclibc.patch b/testing/xen/xen-blktap2-uclibc.patch
new file mode 100644
index 000000000..7ce1dc0cf
--- /dev/null
+++ b/testing/xen/xen-blktap2-uclibc.patch
@@ -0,0 +1,22 @@
+--- xen-4.0.1/tools/blktap2/drivers/bswap.h
++++ xen-4.0.1.mod/tools/blktap2/drivers/bswap.h
+@@ -15,6 +15,8 @@
+ #define bswap_64(x) swap64(x)
+ #else
+ 
++#define HAVE_BYTESWAP_H
++
+ #ifdef HAVE_BYTESWAP_H
+ #include <byteswap.h>
+ #else
+--- xen-4.0.1/tools/blktap2/vhd/lib/Makefile
++++ xen-4.0.1.mod/tools/blktap2/vhd/lib/Makefile
+@@ -23,6 +23,8 @@
+ LIBS            := -luuid
+ endif
+ 
++LIBS		+= -liconv
++
+ # Get gcc to generate the dependencies for us.
+ CFLAGS          += -Wp,-MD,.$(@F).d
+ DEPS             = .*.d
diff --git a/testing/xen/xen-disable-firmware.patch b/testing/xen/xen-disable-firmware.patch
new file mode 100644
index 000000000..06e43d41c
--- /dev/null
+++ b/testing/xen/xen-disable-firmware.patch
@@ -0,0 +1,10 @@
+--- xen-4.0.1/tools/Makefile
++++ xen-4.0.1.mod/tools/Makefile
+@@ -13,7 +13,6 @@
+ SUBDIRS-y += hotplug
+ SUBDIRS-y += xentrace
+ SUBDIRS-$(CONFIG_XCUTILS) += xcutils
+-SUBDIRS-$(CONFIG_X86) += firmware
+ SUBDIRS-$(ACM_SECURITY) += security
+ SUBDIRS-y += console
+ SUBDIRS-y += xenmon
diff --git a/testing/xen/xen-disable-fsback.patch b/testing/xen/xen-disable-fsback.patch
new file mode 100644
index 000000000..d0ae91b12
--- /dev/null
+++ b/testing/xen/xen-disable-fsback.patch
@@ -0,0 +1,10 @@
+--- xen-4.0.1/tools/Makefile
++++ xen-4.0.1.mod/tools/Makefile
+@@ -29,7 +28,6 @@
+ SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
+ SUBDIRS-y += libfsimage
+ SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
+-SUBDIRS-$(CONFIG_Linux) += fs-back
+ SUBDIRS-$(CONFIG_NetBSD) += fs-back
+ SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
+ SUBDIRS-y += xenpmd
diff --git a/testing/xen/xen-disable-werror.patch b/testing/xen/xen-disable-werror.patch
new file mode 100644
index 000000000..c2c551245
--- /dev/null
+++ b/testing/xen/xen-disable-werror.patch
@@ -0,0 +1,33 @@
+--- xen-4.0.1/Config.mk
++++ xen-4.0.1.mod/Config.mk
+@@ -14,7 +14,7 @@
+ 
+ # Tools to run on system hosting the build
+ HOSTCC      = gcc
+-HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
++HOSTCFLAGS  = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+ HOSTCFLAGS += -fno-strict-aliasing
+ 
+ DISTDIR     ?= $(XEN_ROOT)/dist
+--- xen-4.0.1/extras/mini-os/minios.mk
++++ xen-4.0.1.mod/extras/mini-os/minios.mk
+@@ -6,7 +6,7 @@
+ 
+ # Define some default flags.
+ # NB. '-Wcast-qual' is nasty, so I omitted it.
+-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
++DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
+ DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
+ DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
+ DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
+--- xen-4.0.1/tools/libxc/Makefile
++++ xen-4.0.1.mod/tools/libxc/Makefile
+@@ -57,7 +57,7 @@
+ 
+ -include $(XEN_TARGET_ARCH)/Makefile
+ 
+-CFLAGS   += -Werror -Wmissing-prototypes
++CFLAGS   += -Wmissing-prototypes
+ CFLAGS   += $(INCLUDES) -I. -I../xenstore -I../include
+ 
+ # Needed for posix_fadvise64() in xc_linux.c
diff --git a/testing/xen/xen-dont-use-lib64.patch b/testing/xen/xen-dont-use-lib64.patch
new file mode 100644
index 000000000..a22f13902
--- /dev/null
+++ b/testing/xen/xen-dont-use-lib64.patch
@@ -0,0 +1,11 @@
+--- xen-4.0.1/config/StdGNU.mk
++++ xen-4.0.1.mod/config/StdGNU.mk
+@@ -28,7 +28,7 @@
+ INCLUDEDIR = $(PREFIX)/include
+ LIBLEAFDIR = lib
+ LIBLEAFDIR_x86_32 = lib
+-LIBLEAFDIR_x86_64 = lib64
++LIBLEAFDIR_x86_64 = lib
+ LIBDIR = $(PREFIX)/$(LIBLEAFDIR)
+ LIBDIR_x86_32 = $(PREFIX)/$(LIBLEAFDIR_x86_32)
+ LIBDIR_x86_64 = $(PREFIX)/$(LIBLEAFDIR_x86_64)
diff --git a/testing/xen/xend.initd b/testing/xen/xend.initd
new file mode 100644
index 000000000..6958c0479
--- /dev/null
+++ b/testing/xen/xend.initd
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+	before xendomains sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
+}
+
+is_privileged_domain() {
+	grep -qsE '^control_d$' /proc/xen/capabilities
+	return $?
+}
+
+start() {
+	if is_privileged_domain ; then
+		ebegin "Starting Xen daemons"
+		/usr/sbin/xend start
+		eend $?
+	else
+		eerror "Can't start xend - not a privileged domain"
+		return 1
+	fi
+}
+
+stop() {
+	ebegin "Stopping Xen control daemon"
+	/usr/sbin/xend stop
+	eend $?
+}
+
+restart() {
+	ebegin "Restarting Xen control daemon"
+	/usr/sbin/xend restart
+	eend $?
+}
+
+status() {
+	is_privileged_domain && /usr/sbin/xend status
+}
diff --git a/testing/xen/xendomains.initd b/testing/xen/xendomains.initd
new file mode 100644
index 000000000..d12577c2b
--- /dev/null
+++ b/testing/xen/xendomains.initd
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+
+depend() {
+	need xend
+	after dhcp
+}
+
+get_domname() {
+        local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alnum:]_\.-]+)\"?\W*;?/\1/p' "${1}" | tail -n 1)
+
+        if [[ -z ${name_from_file} ]] ; then
+                basename "${1}"
+        else
+                echo ${name_from_file}  
+        fi
+}
+
+is_running() {
+        /usr/sbin/xm list "${1}" >/dev/null 2>&1
+}
+
+start() {
+	einfo "Starting Xen domains in ${AUTODIR:=/etc/xen/auto}"
+
+	for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do
+		name=$(get_domname ${dom})
+		if ! is_running ${name} ; then
+			ebegin "  Starting domain ${name}"
+				xm create --quiet ${dom}
+			eend $?
+		else
+			einfo "  Not starting ${name} - already running."
+		fi
+	done
+}
+
+stop() {
+	einfo "Stopping Xen domains in ${AUTODIR:=/etc/xen/auto}"
+
+	for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do
+		name=$(get_domname ${dom})
+		if is_running ${name} ; then
+			ebegin "  Sending shutdown signal to ${name}"
+				xm shutdown ${name} >/dev/null
+			eend $?
+		fi
+	done
+
+	for dom in $(ls "${AUTODIR:=/etc/xen/auto}/"* 2>/dev/null | sort); do
+		name=$(get_domname ${dom})
+		if is_running ${name} ; then
+			ebegin "  Waiting for domain ${name} to shutdown"
+				xm shutdown --wait ${name}
+			eend $?
+		else
+			einfo "  Not stopping ${name} - not running."
+		fi
+	done
+}
+
+status() {
+	/usr/sbin/xm list
+}
diff --git a/testing/xscreensaver/APKBUILD b/testing/xscreensaver/APKBUILD
new file mode 100644
index 000000000..bdcabc488
--- /dev/null
+++ b/testing/xscreensaver/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=xscreensaver
+pkgver=5.12
+pkgrel=0
+pkgdesc="screensavers for X11 environment"
+url="http://www.jwz.org/xscreensaver/"
+license="GPL"
+depends="bc"
+makedepends="gtk+-dev jpeg-dev mesa-dev gettext-dev libxmu-dev perl-dev
+	libxml2-dev libglade-dev"
+install=
+subpackages="$pkgname-doc"
+source="http://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.gz"
+arch="all"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+}
+
+build() {
+	cd "$_builddir"
+	export LIBS="-lintl"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--with-gtk \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make install_prefix="$pkgdir" install
+}
+
+md5sums="0345c1acb9280729de05c5ca44b401e3  xscreensaver-5.12.tar.gz"