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

16 files changed, 320 insertions, 99 deletions

diff --git a/testing/py-docutils/APKBUILD b/main/py-docutils/APKBUILD
index 1206517d4a..a04a62aff3 100644
--- a/testing/py-docutils/APKBUILD
+++ b/main/py-docutils/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-docutils
 _pkgname=docutils
 pkgver=0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Documentation Utilities for Python"
 url="http://docutils.sourceforge.net/"
 arch="noarch"
@@ -28,20 +28,24 @@ build() {
 
 package() {
 	cd "$_builddir"
-	python setup.py install --root "$pkgdir"
+	python setup.py install --root "$pkgdir" || return 1
 }
 
 doc() {
 	cd "$_builddir"
 
-	for docdir in docs licenses; do
-		mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/$docdir
-		cp -R ./$docdir/* "$subpkgdir"/usr/share/doc/$pkgname/$docdir/
-		chmod -R 644 "$subpkgdir"/usr/share/doc/$pkgname/$docdir/
+	for _docdir in docs licenses; do
+		mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/$_docdir \
+			|| return 1
+		cp -R ./$_docdir/* "$subpkgdir"/usr/share/doc/$pkgname/$_docdir/ \
+			|| return 1
+		chmod -R 644 "$subpkgdir"/usr/share/doc/$pkgname/$_docdir/ \
+			|| return 1
 	done
 
-	for doc in BUGS.txt COPYING.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt THANKS.txt; do
-		install -m644 -D $doc "$subpkgdir"/usr/share/doc/$pkgname/
+	for _doc in BUGS.txt COPYING.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt THANKS.txt; do
+		install -m644 -D $_doc "$subpkgdir"/usr/share/doc/$pkgname/ \
+			|| return 1
 	done
 
 	# Fix subdir perms
diff --git a/testing/py-jinja2/APKBUILD b/main/py-jinja2/APKBUILD
index b5d4ffc962..5eaf70cf0f 100644
--- a/testing/py-jinja2/APKBUILD
+++ b/main/py-jinja2/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-jinja2
 _pkgname=Jinja2
 pkgver=2.5.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A small but fast and easy to use stand-alone template engine written in pure python."
 url="http://jinja.pocoo.org/"
 arch="noarch"
@@ -28,34 +28,39 @@ build() {
 
 package() {
 	cd "$_builddir"
-	python setup.py install --root "$pkgdir"
+	python setup.py install --root "$pkgdir" || return 1
 }
 
 doc() {
 	cd "$_builddir"
 
-	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname
+	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname || return 1
 	for _doc in AUTHORS CHANGES LICENSE; do
-		install -Dm644 $_doc "$subpkgdir"/usr/share/doc/$pkgname/$_doc
+		install -Dm644 $_doc "$subpkgdir"/usr/share/doc/$pkgname/$_doc \
+			|| return 1
 	done
 
 	# Note: The documentation in the docs directory needs to be generated
 	# by py-sphinx, however, this package (py-jinja2) is a dependency of
 	# Sphinx itself!
-	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/docs
-	cp -R ./docs/* "$subpkgdir"/usr/share/doc/$pkgname/docs/
-	chmod -R 644 "$subpkgdir"/usr/share/doc/$pkgname/docs/
+	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/docs || return 1
+	cp -R ./docs/* "$subpkgdir"/usr/share/doc/$pkgname/docs/ || return 1
+	chmod -R 644 "$subpkgdir"/usr/share/doc/$pkgname/docs/ || return 1
 
-	mkdir -p "$subpkgdir"/usr/share/$pkgname
+	mkdir -p "$subpkgdir"/usr/share/$pkgname || return 1
 	for _dir in artwork examples ext; do
-		mkdir -p "$subpkgdir"/usr/share/$pkgname/$_dir/
-		cp -R ./$_dir/* "$subpkgdir"/usr/share/$pkgname/$_dir/
-		chmod -R 644 "$subpkgdir"/usr/share/$pkgname/$_dir/
+		mkdir -p "$subpkgdir"/usr/share/$pkgname/$_dir/ || return 1
+		cp -R ./$_dir/* "$subpkgdir"/usr/share/$pkgname/$_dir/ \
+			|| return 1
+		chmod -R 644 "$subpkgdir"/usr/share/$pkgname/$_dir/ \
+			|| return 1
 	done
 
 	# Fix subdir perms
-	find "$subpkgdir"/usr/share/doc/$pkgname/ -type d -exec chmod 755 '{}' \;
-	find "$subpkgdir"/usr/share/$pkgname/ -type d -exec chmod 755 '{}' \;
+	find "$subpkgdir"/usr/share/doc/$pkgname/ -type d \
+		-exec chmod 755 '{}' \; || return 1
+	find "$subpkgdir"/usr/share/$pkgname/ -type d \
+		-exec chmod 755 '{}' \; || return 1
 }
 
 md5sums="83b20c1eeb31f49d8e6392efae91b7d5  Jinja2-2.5.5.tar.gz"
diff --git a/main/py-pygments/APKBUILD b/main/py-pygments/APKBUILD
new file mode 100644
index 0000000000..00d5867353
--- /dev/null
+++ b/main/py-pygments/APKBUILD
@@ -0,0 +1,60 @@
+# Contributor: Matt Smith <mcs@darkregion.net>
+# Maintainer:  Matt Smith <mcs@darkregion.net>
+pkgname=py-pygments
+_pkgname=Pygments
+pkgver=1.4
+pkgrel=1
+pkgdesc="Pygments is a syntax highlighting package written in Python."
+url="http://pygments.org/"
+arch="noarch"
+license="BSD"
+depends="python"
+makedepends="python-dev py-setuptools"
+install=
+subpackages="$pkgname-doc"
+source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+
+_builddir="$srcdir"/$_pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	# apply patches here
+}
+
+build() {
+	cd "$_builddir"
+	python setup.py build || return 1
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --root "$pkgdir" || return 1
+}
+
+doc() {
+	cd "$_builddir"
+
+	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname || return 1
+	for _doc in AUTHORS CHANGES LICENSE TODO; do
+		install -Dm644 $_doc "$subpkgdir"/usr/share/doc/$pkgname/$_doc \
+			|| return 1
+	done
+
+	install -Dm644 docs/pygmentize.1 \
+		"$subpkgdir"/usr/share/man/man1/pygmentize.1 || return 1
+	install -Dm644 docs/generate.py \
+		"$subpkgdir"/usr/share/doc/$pkgname/generate.py || return 1
+	for _dir in build src; do
+		mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/$_dir || return 1
+		cp -R ./docs/$_dir/* \
+			"$subpkgdir"/usr/share/doc/$pkgname/$_dir/ || return 1
+		chmod -R 644 "$subpkgdir"/usr/share/doc/$pkgname/$_dir/ \
+			|| return 1
+	done
+
+	# Fix subdir perms
+	find "$subpkgdir"/usr/share/doc/$pkgname/ -type d \
+		-exec chmod 755 '{}' \; || return 1
+}
+
+md5sums="d77ac8c93a7fb27545f2522abe9cc462  Pygments-1.4.tar.gz"
diff --git a/testing/py-roman/APKBUILD b/main/py-roman/APKBUILD
index 1caffb1d67..2e1cb18bbb 100644
--- a/testing/py-roman/APKBUILD
+++ b/main/py-roman/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-roman
 _pkgname=roman
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Integer to Roman numerals converter"
 url="http://pypi.python.org/pypi/roman"
 arch="noarch"
@@ -28,7 +28,7 @@ build() {
 
 package() {
 	cd "$_builddir"
-	python setup.py install --root "$pkgdir"
+	python setup.py install --root "$pkgdir" || return 1
 }
 
 md5sums="4f8832ed4108174b159c2afb4bd1d1dd  roman-1.4.0.tar.gz"
diff --git a/testing/py-sphinx/APKBUILD b/main/py-sphinx/APKBUILD
index 921a6b743a..c8c1bb5340 100644
--- a/testing/py-sphinx/APKBUILD
+++ b/main/py-sphinx/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=py-sphinx
 _pkgname=Sphinx
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=0
 pkgdesc="Python Documentation Generator"
 url="http://sphinx.pocoo.org/"
@@ -28,27 +28,29 @@ build() {
 
 package() {
 	cd "$_builddir"
-	python setup.py install --root "$pkgdir"
+	python setup.py install --root "$pkgdir" || return 1
 }
 
 doc() {
 	cd "$_builddir"
 
-	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname
-	for doc in AUTHORS CHANGES EXAMPLES LICENSE README TODO; do
-		install -Dm644 $doc "$subpkgdir"/usr/share/doc/$pkgname/
+	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname || return 1
+	for _doc in AUTHORS CHANGES EXAMPLES LICENSE README TODO; do
+		install -Dm644 $_doc "$subpkgdir"/usr/share/doc/$pkgname/ \
+			|| return 1
 	done
 
 	# Note: Documentation in the 'doc' directory (below), needs to be built
 	# with sphinx-build once sphinx is installed (see README for details).
 	#
 	# Leaving as-is; will be up to the individual user that's interested.
-	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/doc/
-	cp -R ./doc/* "$subpkgdir"/usr/share/doc/$pkgname/doc/
-	chmod -R 644 "$subpkgdir"/usr/share/doc/$pkgname/doc/
+	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/doc/ || return 1
+	cp -R ./doc/* "$subpkgdir"/usr/share/doc/$pkgname/doc/ || return 1
+	chmod -R 644 "$subpkgdir"/usr/share/doc/$pkgname/doc/ || return 1
 
 	# Fix subdir perms
-	find "$subpkgdir"/usr/share/doc/$pkgname/ -type d -exec chmod 755 '{}' \;
+	find "$subpkgdir"/usr/share/doc/$pkgname/ -type d \
+		-exec chmod 755 '{}' \; || return 1
 }
 
-md5sums="4cdb86c7bb7fa2498ac12db844784769  Sphinx-1.0.6.tar.gz"
+md5sums="42c722d48e52d4888193965dd473adb5  Sphinx-1.0.7.tar.gz"
diff --git a/testing/py-templayer/APKBUILD b/main/py-templayer/APKBUILD
index eeefd4bb53..e12d05c47e 100644
--- a/testing/py-templayer/APKBUILD
+++ b/main/py-templayer/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py-templayer
 _pkgname=templayer
 pkgver=1.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Templayer is a layered template library for Python and Django"
 url="http://excess.org/templayer/"
 arch="noarch"
@@ -28,15 +28,16 @@ build() {
 
 package() {
         cd "$_builddir"
-        python setup.py install --root "$pkgdir"
+        python setup.py install --root "$pkgdir" || return 1
 }
 
 doc() {
         cd "$_builddir"
 
-        mkdir -p "$subpkgdir"/usr/share/doc/$pkgname
-        for doc in reference.html tutorial.html tutorial_examples.tar.gz; do
-                install -Dm644 ./docs/$doc "$subpkgdir"/usr/share/doc/$pkgname/$doc
+        mkdir -p "$subpkgdir"/usr/share/doc/$pkgname || return 1
+        for _doc in reference.html tutorial.html tutorial_examples.tar.gz; do
+                install -Dm644 ./docs/$_doc \
+			"$subpkgdir"/usr/share/doc/$pkgname/$_doc || return 1
         done
 }
 
diff --git a/testing/duplicity/APKBUILD b/testing/duplicity/APKBUILD
index 4248489a27..2562ee2d40 100644
--- a/testing/duplicity/APKBUILD
+++ b/testing/duplicity/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=duplicity
-pkgver=0.6.11
+pkgver=0.6.12
 pkgrel=0
 pkgdesc="Encrypted bandwidth-efficient backup using the rsync algorithm"
 url="http://duplicity.nongnu.org/"
@@ -30,4 +30,4 @@ package() {
 	python setup.py install --root "$pkgdir"
 }
 
-md5sums="1116be7aababa467336eac2092f66ab7  duplicity-0.6.11.tar.gz"
+md5sums="9b84c984054550bbb2ba29b553567b7b  duplicity-0.6.12.tar.gz"
diff --git a/testing/nsd/APKBUILD b/testing/nsd/APKBUILD
index 3c7f9828c4..758570294c 100644
--- a/testing/nsd/APKBUILD
+++ b/testing/nsd/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Matt Smith <msmith@alpinelinux.org>
-# Maintainer:  Matt Smith <msmith@alpinelinux.org>
+# Contributor: Matt Smith <mcs@darkregion.net>
+# Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=nsd
 pkgver=3.2.7
-pkgrel=0
+pkgrel=1
 pkgdesc="NSD is an authoritative only, high performance, simple and open source name server."
 url="http://www.nlnetlabs.nl/projects/nsd/"
 arch="all"
@@ -54,7 +54,7 @@ package() {
 	install -m644 -D "$srcdir"/$pkgname.confd \
 		"$pkgdir"/etc/conf.d/nsd || return 1
 
-	chown nsd:nsd "$pkgdir"/var/db/nsd
+	chown nsd "$pkgdir"/var/db/nsd || return 1
 }
 
 doc() {
diff --git a/testing/nsd/nsd.pre-install b/testing/nsd/nsd.pre-install
index c7914445ea..daabc70b38 100644
--- a/testing/nsd/nsd.pre-install
+++ b/testing/nsd/nsd.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -H -D -s /bin/false nsd 2>/dev/null
+adduser -S -H -h /var/db/nsd -s /bin/false nsd 2>/dev/null
 exit 0
diff --git a/testing/pdnsd/APKBUILD b/testing/pdnsd/APKBUILD
new file mode 100644
index 0000000000..cdc494cb44
--- /dev/null
+++ b/testing/pdnsd/APKBUILD
@@ -0,0 +1,101 @@
+# Contributor: Matt Smith <mcs@darkregion.net>
+# Maintainer:  Matt Smith <mcs@darkregion.net>
+pkgname=pdnsd
+pkgver=1.2.8
+_realver=$pkgver-par
+pkgrel=0
+pkgdesc="A proxy DNS server with permanent caching"
+url="http://www.phys.uu.nl/~rombouts/pdnsd/"
+arch="all"
+license="GPL"
+depends=
+depends_dev=
+makedepends="$depends_dev"
+install="$pkgname.pre-install $pkgname.post-deinstall"
+subpackages="$pkgname-doc"
+pkgusers="pdnsd"
+pkggroups="pdnsd"
+source="http://www.phys.uu.nl/~rombouts/pdnsd/releases/$pkgname-$_realver.tar.gz
+	pdnsd.initd
+	pdnsd.confd
+	pdnsd.conf
+	"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--enable-ipv6 \
+		--with-random-device=/dev/urandom \
+		--enable-tcp-subseq \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+
+	install -m755 -D "$srcdir"/$pkgname.initd \
+		"$pkgdir"/etc/init.d/$pkgname || return 1
+	install -m644 -D "$srcdir"/$pkgname.confd \
+		"$pkgdir"/etc/conf.d/$pkgname || return 1
+	install -m644 -D "$srcdir"/$pkgname.conf \
+		"$pkgdir"/etc/$pkgname.conf || return 1
+
+	chown -R pdnsd "$pkgdir"/var/cache/pdnsd || return 1
+	sed -ri 's/([    ]*run_as=)"nobody";/\1"pdnsd";/' \
+		"$pkgdir"/etc/pdnsd.conf.sample || return 1
+	sed -ri '/pid_file/d' "$pkgdir"/etc/pdnsd.conf.sample || return 1
+	sed -ri '/query_method/d' "$pkgdir"/etc/pdnsd.conf.sample || return 1
+}
+
+doc() {
+	arch="noarch"
+
+	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/html || return 1
+	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/txt || return 1
+	mkdir -p "$subpkgdir"/usr/share/$pkgname/contrib || return 1
+
+	# /usr/share/{man,doc/$pkgname}
+	cp -a "$pkgdir"/usr/share/ "$subpkgdir"/usr/ || return 1
+	rm -rf "$pkgdir"/usr/share/ || return 1
+	_docs="AUTHORS COPYING COPYING.BSD ChangeLog ChangeLog.old \
+		NEWS README README.par README.par.old THANKS TODO"
+	for _doc in $_docs; do
+		cp "$_builddir"/$_doc "$subpkgdir"/usr/share/doc/$pkgname/ \
+			|| return 1
+	done
+	cp -R "$_builddir"/doc/html/* \
+		"$subpkgdir"/usr/share/doc/$pkgname/html/ || return 1
+	cp -R "$_builddir"/doc/txt/* \
+		"$subpkgdir"/usr/share/doc/$pkgname/txt/ || return 1
+
+	# /usr/share/$pkgname
+	mv "$pkgdir"/etc/pdnsd.conf.sample \
+		"$subpkgdir"/usr/share/$pkgname/ || return 1
+	_contribs="README change_pdnsd_server_ip.pl dhcp2pdnsd pdnsd_dhcp.pl"
+	for _contrib in $_contribs; do
+		cp -a "$_builddir"/contrib/$_contrib \
+			"$subpkgdir"/usr/share/$pkgname/contrib/ || return 1
+	done
+}
+
+md5sums="779c5d19576e561fbf2455de435e5597  pdnsd-1.2.8-par.tar.gz
+14d6c0a1e9e552999cc4efb2c1251d98  pdnsd.initd
+4bced9066febfe33b4a527f28cfb6a48  pdnsd.confd
+f7cf4b9391b67ee421485a0c24aa8a5c  pdnsd.conf"
diff --git a/testing/pdnsd/pdnsd.conf b/testing/pdnsd/pdnsd.conf
new file mode 100644
index 0000000000..f3e6ae4b75
--- /dev/null
+++ b/testing/pdnsd/pdnsd.conf
@@ -0,0 +1,51 @@
+#
+# Default Alpine Linux pdnsd config
+# 
+# See /usr/share/pdnsd/pdnsd.conf.sample and the pdnsd.conf(5) manpage,
+# both available in the pdnsd-doc package.
+#
+# Comments can begin with either '#' or '//', and entire blocks may be
+# commented out with '/*' and '*/'.
+#
+global {
+	perm_cache=2048;
+	cache_dir="/var/cache/pdnsd";
+	run_as="pdnsd";
+	server_ip = any;
+	status_ctl = on;
+#	paranoid=on;       # This option reduces the chance of cache poisoning
+	                   # but may make pdnsd less efficient, unfortunately.
+	min_ttl=15m;       # Retain cached entries at least 15 minutes.
+	max_ttl=1w;        # One week.
+	timeout=10;        # Global timeout option (10 seconds).
+	neg_domain_pol=on;
+}
+
+server {
+	label= "googledns";
+	ip = 8.8.8.8, 8.8.4.4;
+	proxy_only=on;
+	lean_query=on;
+	timeout=4;         # Server timeout; this may be much shorter
+			   # that the global timeout option.
+	uptest=none;
+	interval=10m;      # Check every 10 minutes.
+	purge_cache=off;
+}
+
+/*
+source {
+	owner=localhost;
+#	serve_aliases=on;
+	file="/etc/hosts";
+}
+*/
+
+rr {
+	name=localhost;
+	reverse=on;
+	a=127.0.0.1;
+#	a=::1;
+	owner=localhost;
+	soa=localhost,root.localhost,42,86400,900,86400,86400;
+}
diff --git a/testing/pdnsd/pdnsd.confd b/testing/pdnsd/pdnsd.confd
new file mode 100644
index 0000000000..8f8820c8da
--- /dev/null
+++ b/testing/pdnsd/pdnsd.confd
@@ -0,0 +1,18 @@
+#
+# Specify pdnsd options here.
+#
+# -4 run in IPv4 mode
+# -6 run in IPv6 mode
+# -a autodetects IPv6 supports, falls back to IPv4
+#    NOTE: IPv6 mode seems to have issues.
+# -d run in daemon mode
+# -s enables the status control socket so pdnsd-ctl can be used at run-time
+#    (same as setting  status_ctl=on;  in the config file)
+# -t enables the TCP server thread alongside the UDP server thread
+# -mut sets the query method to 'ut': udp first, fallback to tcp
+# -c specifies the config file
+# -p specifies the pid file
+# -g enables debugging/logging output at /var/cache/pdnsd/pdnsd.debug
+# -vn where n specifies the debugging verbosity level (0-3)
+
+pdnsd_opts="-4 -d -s -t -mut -c /etc/pdnsd.conf -p /var/run/pdnsd.pid"
diff --git a/testing/pdnsd/pdnsd.initd b/testing/pdnsd/pdnsd.initd
new file mode 100644
index 0000000000..355163ce12
--- /dev/null
+++ b/testing/pdnsd/pdnsd.initd
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+
+name=pdnsd
+daemon=/usr/sbin/$name
+
+depend() {
+	need net
+	after firewall
+}
+
+start() {
+	ebegin "Starting ${name}"
+		start-stop-daemon --start --quiet \
+			--pidfile /var/run/${name}.pid \
+			--exec ${daemon} -- ${pdnsd_opts}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${name}"
+		start-stop-daemon --stop --quiet \
+			--pidfile /var/run/$name.pid \
+			--exec ${daemon}
+	eend $?
+}
diff --git a/testing/pdnsd/pdnsd.post-deinstall b/testing/pdnsd/pdnsd.post-deinstall
new file mode 100644
index 0000000000..f5cb9e80cb
--- /dev/null
+++ b/testing/pdnsd/pdnsd.post-deinstall
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+deluser pdnsd 2>/dev/null
+exit 0
diff --git a/testing/pdnsd/pdnsd.pre-install b/testing/pdnsd/pdnsd.pre-install
new file mode 100644
index 0000000000..1ae14a9a5e
--- /dev/null
+++ b/testing/pdnsd/pdnsd.pre-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+adduser -S -H -h /var/cache/pdnsd -s /bin/false pdnsd 2>/dev/null
+exit 0
diff --git a/testing/py-pygments/APKBUILD b/testing/py-pygments/APKBUILD
deleted file mode 100644
index f119ea02e8..0000000000
--- a/testing/py-pygments/APKBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer:  Matt Smith <mcs@darkregion.net>
-pkgname=py-pygments
-_pkgname=Pygments
-pkgver=1.4
-pkgrel=0
-pkgdesc="Pygments is a syntax highlighting package written in Python."
-url="http://pygments.org/"
-arch="noarch"
-license="BSD"
-depends="python"
-makedepends="python-dev py-setuptools"
-install=
-subpackages="$pkgname-doc"
-source="http://pypi.python.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/$_pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-	# apply patches here
-}
-
-build() {
-	cd "$_builddir"
-	python setup.py build || return 1
-}
-
-package() {
-	cd "$_builddir"
-	python setup.py install --root "$pkgdir"
-}
-
-doc() {
-	cd "$_builddir"
-
-	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname
-	for doc in AUTHORS CHANGES LICENSE TODO; do
-		install -Dm644 $doc "$subpkgdir"/usr/share/doc/$pkgname/$doc
-	done
-
-	install -Dm644 docs/pygmentize.1 "$subpkgdir"/usr/share/man/man1/pygmentize.1
-	install -Dm644 docs/generate.py "$subpkgdir"/usr/share/doc/$pkgname/generate.py
-	for dir in build src; do
-		mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/$dir
-		cp -R ./docs/$dir/* "$subpkgdir"/usr/share/doc/$pkgname/$dir/
-		chmod -R 644 "$subpkgdir"/usr/share/doc/$pkgname/$dir/
-	done
-
-	# Fix subdir perms
-	find "$subpkgdir"/usr/share/doc/$pkgname/ -type d -exec chmod 755 '{}' \;
-}
-
-md5sums="d77ac8c93a7fb27545f2522abe9cc462  Pygments-1.4.tar.gz"