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

24 files changed, 281 insertions, 74 deletions

diff --git a/testing/ansible/APKBUILD b/testing/ansible/APKBUILD
new file mode 100644
index 000000000..143fb8267
--- /dev/null
+++ b/testing/ansible/APKBUILD
@@ -0,0 +1,50 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=ansible
+pkgver=0.3.1
+pkgrel=0
+pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
+url="http://ansible.github.com/"
+arch="noarch"
+license="GPL3+"
+depends="python py-yaml py-paramiko py-jinja2"
+depends_dev=""
+makedepends="python-dev"
+install=""
+subpackages="$pkgname-doc"
+source="https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
+_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"
+	python setup.py build || return 1
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+	mkdir -p "$pkgdir"/etc/$pkgname
+	install -m755 -D "$_builddir"/examples/hosts \
+		"$pkgdir"/etc/$pkgname/hosts || return 1
+	mkdir -p "$pkgdir"/usr/share/$pkgname
+	install -m755 -D "$_builddir"/library/* \
+		"$pkgdir"/usr/share/$pkgname/ || return 1
+
+    _manpages="$pkgname-playbook.1 $pkgname.1"
+    for _manpage in $_manpages; do
+		install -m644 -D "$_builddir"/docs/man/man1/$_manpage \
+			"$pkgdir"/usr/share/man/man1/$_manpage || return 1
+	done
+}
+
+md5sums="28c36c5926af878ebfd39c932cb86650  ansible-0.3.1.tar.gz"
diff --git a/testing/corosync/APKBUILD b/testing/corosync/APKBUILD
index 6b3ed8274..8e432b03c 100644
--- a/testing/corosync/APKBUILD
+++ b/testing/corosync/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer:
 pkgname=corosync
-pkgver=1.4.2
+pkgver=1.4.3
 pkgrel=0
 pkgdesc="The Corosync Cluster Engine and Application Programming Interfaces"
 url="http://www.corosync.org/"
@@ -14,7 +14,6 @@ install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="ftp://ftp:downloads@corosync.org/downloads/corosync-$pkgver/corosync-$pkgver.tar.gz
 	$pkgname.initd"
-
 _builddir="$srcdir"/corosync-$pkgver
 
 prepare() {
@@ -60,5 +59,5 @@ libs() {
 		"$subpkgdir"/usr/lib/ || return 1
 }
 
-md5sums="061ee5522097fee69475b38a66bf1d6a  corosync-1.4.2.tar.gz
+md5sums="9e9943a7d9eb90fabd52d12b215c699c  corosync-1.4.3.tar.gz
 4d18555dfdd036b7a48eb5bdfd0ff053  corosync.initd"
diff --git a/testing/dc3dd/APKBUILD b/testing/dc3dd/APKBUILD
index 7a31ce432..0901edb93 100644
--- a/testing/dc3dd/APKBUILD
+++ b/testing/dc3dd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=dc3dd
-pkgver=7.0.0
+pkgver=7.1.614
 pkgrel=0
 pkgdesc="Patched version of GNU dd for use in computer forensics"
 url="http://dc3dd.sourceforge.net/"
@@ -9,9 +9,9 @@ arch="all"
 license="GPL2+ and GPL3+"
 depends=""
 depends_dev=""
-makedepends=""
+makedepends="libiconv-dev"
 install=""
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-lang"
 source="http://downloads.sourceforge.net/dc3dd/dc3dd-$pkgver.tar.gz"
 _builddir="$srcdir"/dc3dd-$pkgver
 
@@ -28,11 +28,13 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
+		--disable-rpath \
 		|| return 1
 	make || return 1
 }
@@ -43,4 +45,4 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="37e00481273b4c4ae2ebb430e5fb80af  dc3dd-7.0.0.tar.gz"
+md5sums="b6c4ec16e7f539b17224d7f334f8396e  dc3dd-7.1.614.tar.gz"
diff --git a/testing/dhex/APKBUILD b/testing/dhex/APKBUILD
index d205c4784..5f6fb193d 100644
--- a/testing/dhex/APKBUILD
+++ b/testing/dhex/APKBUILD
@@ -1,20 +1,20 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhex
-pkgver=0.66
+pkgver=0.67
 pkgrel=0
 pkgdesc="Ncurses hex editor"
 url="http://www.dettus.net/dhex/"
 arch="all"
-license="GPL"
+license="GPL2+"
 depends=""
 makedepends="ncurses-dev"
 install=""
 subpackages="$pkgname-doc"
-source="http://www.dettus.net/dhex/dhex_0.66.tar.gz
-	makefile.patch"
-
+source="http://www.dettus.net/dhex/dhex_$pkgver.tar.gz
+		makefile.patch"
 _builddir="$srcdir"/dhex_$pkgver
+
 prepare() {
 	local i
 	cd "$_builddir"
@@ -27,15 +27,15 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	make
+	make || return 1
 }
 
 package() {
 	cd "$_builddir"
 	make install DESTDIR="$pkgdir" \
 		mandir=/usr/share/man \
-		prefix=/usr/bin
+		prefix=/usr/bin || return 1
 }
 
-md5sums="304a91cfd9481b2ddf418f3a943190e1  dhex_0.66.tar.gz
+md5sums="46d24d11b6e389509fff07404aedabb6  dhex_0.67.tar.gz
 de16e09d3b416650d84ef39235cd2917  makefile.patch"
diff --git a/testing/etherdump/APKBUILD b/testing/etherdump/APKBUILD
index 246ea83ed..fd469552a 100644
--- a/testing/etherdump/APKBUILD
+++ b/testing/etherdump/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=etherdump
-pkgver=2.10
+pkgver=2.11
 pkgrel=0
 pkgdesc="An extremely small packet sniffer"
 url="http://freshmeat.net/projects/etherdump/"
@@ -12,7 +12,7 @@ depends_dev=""
 makedepends=""
 install=""
 subpackages=""
-source="http://sourceforge.net/projects/psydev/files/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
+source="http://psydev.syw4e.info/new/$pkgname/$pkgname-$pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
@@ -25,4 +25,4 @@ package() {
 	install -Dm755 "$pkgname" "$pkgdir"/usr/bin/$pkgname || return 1
 }
 
-md5sums="b207b74a9e1fa945dcd0b55725384c8b  etherdump-2.10.tar.gz"
+md5sums="74013efee212baa8860eda10187aed78  etherdump-2.11.tar.gz"
diff --git a/testing/fabric/APKBUILD b/testing/fabric/APKBUILD
index 5cb182fa7..179641bd6 100644
--- a/testing/fabric/APKBUILD
+++ b/testing/fabric/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=fabric
 _pkgname=Fabric
-pkgver=1.2.2
+pkgver=1.4.2
 pkgrel=0
 pkgdesc="A simple pythonic remote deployment tool"
 url="http://www.fabfile.org"
@@ -26,4 +26,4 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="f234678d3886a0b224945281395fdbda  Fabric-1.2.2.tar.gz"
+md5sums="f438286b245809eb1a452dd4d3456a15  Fabric-1.4.2.tar.gz"
diff --git a/testing/fossil/APKBUILD b/testing/fossil/APKBUILD
index c36ac607e..d539b6540 100644
--- a/testing/fossil/APKBUILD
+++ b/testing/fossil/APKBUILD
@@ -1,21 +1,23 @@
 # Contributor: Paul Onyschuk <blink@bojary.koba.pl>
 # Maintainer:
 pkgname=fossil
-pkgver=1.18
-_pkgver=20110713230341
+pkgver=1.22
+_pkgver=20120317175325
 pkgrel=0
 pkgdesc="Simple, high-reliability, distributed software configuration management"
 url="http://www.fossil-scm.org"
 arch="all"
 license="BSD"
-depends=
+depends=""
 makedepends="openssl-dev zlib-dev"
-source="$url/download/$pkgname-src-$_pkgver.tar.gz"
-
+source="http://www.fossil-scm.org/download/$pkgname-src-$_pkgver.tar.gz"
 _builddir="$srcdir"/$pkgname-src-$_pkgver
 
 build() {
 	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man || return 1
 	make TCC="${CC:-gcc} $CFLAGS" || return 1
 }
 
@@ -24,4 +26,4 @@ package() {
 	install -Dm 755 $pkgname "$pkgdir"/usr/bin/$pkgname || return 1
 }
 
-md5sums="ed916bc0db85f30eadd0de45f6bc95ad  fossil-src-20110713230341.tar.gz"
+md5sums="a7106450722e8477972d230fa535702f  fossil-src-20120317175325.tar.gz"
diff --git a/testing/gnuplot/APKBUILD b/testing/gnuplot/APKBUILD
index 4210219ea..273d236f5 100644
--- a/testing/gnuplot/APKBUILD
+++ b/testing/gnuplot/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer:
 pkgname=gnuplot
-pkgver=4.4.4
+pkgver=4.6.0
 pkgrel=0
-pkgdesc="utility for plotting graphs"
+pkgdesc="Utility for plotting graphs"
 url="http://www.gnuplot.info/"
 arch="all"
-license="GPL"
+license="MIT"
 depends=""
 depends_dev="cairo-dev pango-dev gd-dev lua-dev readline-dev libpng-dev jpeg-dev"
 makedepends="$depends_dev"
@@ -43,4 +43,4 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="97a43328e81e57ebed7f135ca0c07e82  gnuplot-4.4.4.tar.gz"
+md5sums="8e6e92b4596ea0eb75e16a57fc79efec  gnuplot-4.6.0.tar.gz"
diff --git a/testing/libewf/APKBUILD b/testing/libewf/APKBUILD
index 642dbac82..9c26ad3ce 100644
--- a/testing/libewf/APKBUILD
+++ b/testing/libewf/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=libewf
-pkgver=20100226
+pkgver=20120504
 pkgrel=0
 pkgdesc="Library to support the Expert Witness Compression Format"
 url="http://libewf.sourceforge.net"
@@ -40,4 +40,4 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="a697d629bb74df1fa68f22658634fdb9  libewf-20100226.tar.gz"
+md5sums="1b96b845476173353839ca72bca12097  libewf-20120504.tar.gz"
diff --git a/testing/libsieve/APKBUILD b/testing/libsieve/APKBUILD
index 7a74c13b5..34585a99f 100644
--- a/testing/libsieve/APKBUILD
+++ b/testing/libsieve/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="Sieve interpretator lib"
 url="http://libsieve.sourceforge.net/"
 arch="all"
-license="GPL"
+license="LGPL2+"
 depends=
 depends_dev=
 makedepends="$depends_dev flex"
diff --git a/testing/libupnp/APKBUILD b/testing/libupnp/APKBUILD
index ce0ced74e..2c6551766 100644
--- a/testing/libupnp/APKBUILD
+++ b/testing/libupnp/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=libupnp
-pkgver=1.6.13
+pkgver=1.6.17
 pkgrel=1
 pkgdesc="Portable Open Source UPnP Development Kit"
 url="http://pupnp.sourceforge.net/"
@@ -14,6 +14,7 @@ install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2"
 _builddir="$srcdir"/$pkgname-$pkgver
+
 build() {
 	cd "$_builddir"
 	./configure --prefix=/usr
@@ -27,4 +28,4 @@ package() {
 	find "$pkgdir" -name *.la -print | xargs rm
 }
 
-md5sums="71476b1781ad179bfc9bead640be5f54  libupnp-1.6.13.tar.bz2"
+md5sums="efbf0d470ce7157bc0e6ca836e246de5  libupnp-1.6.17.tar.bz2"
diff --git a/testing/liburiparser/APKBUILD b/testing/liburiparser/APKBUILD
index 7130338ba..2d4012154 100644
--- a/testing/liburiparser/APKBUILD
+++ b/testing/liburiparser/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor:
-# Maintainer:
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=liburiparser
-pkgver=0.7.5
+pkgver=0.7.7
 pkgrel=1
 pkgdesc="A strictly RFC 3986 compliant URI parsing and handling library"
 url="http://uriparser.sourceforge.net/"
@@ -12,9 +12,9 @@ depends_dev=
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev"
-source="http://downloads.sourceforge.net/sourceforge/uriparser/uriparser-${pkgver}.tar.gz"
-
+source="http://downloads.sourceforge.net/sourceforge/uriparser/uriparser-${pkgver}.tar.bz2"
 _builddir="${srcdir}"/"uriparser-${pkgver}"
+
 prepare() {
 	local i
 	cd "$_builddir"
@@ -27,14 +27,18 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --disable-test --disable-doc
+	./configure \
+		--prefix=/usr \
+		--disable-test \
+		--disable-doc \
+		--disable-static || return 1
 	make || return 1
 }
 
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" -name *.la -print | xargs rm
+	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
-md5sums="459c2786758929b92bfbd0cee25b5aa0  uriparser-0.7.5.tar.gz"
+md5sums="2da950ef006be5a842dcc383cbbeaa78  uriparser-0.7.7.tar.bz2"
diff --git a/testing/py-libacl/APKBUILD b/testing/py-libacl/APKBUILD
index 975524ea8..c0c1da0c8 100644
--- a/testing/py-libacl/APKBUILD
+++ b/testing/py-libacl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py-libacl
 _pkgname=pylibacl
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=0
 pkgdesc="A python module for manipulating ACLs"
 url="http://pylibacl.sourceforge.net/"
@@ -13,7 +13,7 @@ depends_dev=""
 makedepends="python-dev acl-dev py-setuptools"
 install=""
 subpackages=""
-source="http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.gz"
+source="https://github.com/downloads/iustin/$_pkgname/$_pkgname-$pkgver.tar.gz"
 _builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
@@ -26,4 +26,4 @@ package() {
 	python setup.py install --root="$pkgdir" || return 1
 }
 
-md5sums="b9d34da90e6da0813115071b3a1ab204  pylibacl-0.5.0.tar.gz"
+md5sums="a429256345ffdc2cea57fd24da0d980d  pylibacl-0.5.1.tar.gz"
diff --git a/testing/py-logilab-astng/APKBUILD b/testing/py-logilab-astng/APKBUILD
index 0a8a78882..b53670b56 100644
--- a/testing/py-logilab-astng/APKBUILD
+++ b/testing/py-logilab-astng/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py-logilab-astng
 _realname=logilab-astng
-pkgver=0.21.1
+pkgver=0.23.1
 pkgrel=0
 pkgdesc="Rebuild a new abstract syntax tree from Python's ast"
 url="http://pypi.python.org/pypi/logilab-astng"
@@ -27,4 +27,4 @@ package() {
 	rm -f "$pkgdir"/usr/lib/python2.?/site-packages/logilab/__init__.*
 }
 
-md5sums="f25dd1d92a1b80d07a2f9d5bb4fe9d97  logilab-astng-0.21.1.tar.gz"
+md5sums="db81181b8f4d8acf379acebcf2058e34  logilab-astng-0.23.1.tar.gz"
diff --git a/testing/py-logilab-common/APKBUILD b/testing/py-logilab-common/APKBUILD
index b6cd1cee7..7506da819 100644
--- a/testing/py-logilab-common/APKBUILD
+++ b/testing/py-logilab-common/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py-logilab-common
-_realname=logilab-common
-pkgver=0.56.0
+_pkgname=logilab-common
+pkgver=0.57.1
 pkgrel=0
 pkgdesc="A collection of Python packages and modules used by Logilab projects"
 url="http://www.logilab.org/project/logilab-common"
@@ -13,8 +13,8 @@ depends_dev=""
 makedepends="python-dev"
 install=""
 subpackages="$pkgname-doc"
-source="http://ftp.logilab.org/pub/common/"$_realname"-$pkgver.tar.gz"
-_builddir="$srcdir"/"$_realname"-$pkgver
+source="http://pypi.python.org/packages/source/l/$_pkgname/$_pkgname-$pkgver.tar.gz"
+_builddir="$srcdir"/"$_pkgname"-$pkgver
 
 prepare() {
 	local i
@@ -42,4 +42,4 @@ doc() {
     mv "$_builddir"/doc/*.1 "$subpkgdir"/usr/share/man/man1/ || return 1
 }
 
-md5sums="9737aa6b05758779df201113a9aa592b  logilab-common-0.56.0.tar.gz"
+md5sums="ea33a7a6280757fb9f51bd6808011d51  logilab-common-0.57.1.tar.gz"
diff --git a/testing/py-lxml/APKBUILD b/testing/py-lxml/APKBUILD
index 5830a9348..dc2ccec5e 100644
--- a/testing/py-lxml/APKBUILD
+++ b/testing/py-lxml/APKBUILD
@@ -2,20 +2,29 @@
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=py-lxml
 _pkgname=lxml
-pkgver=2.2.8
+pkgver=2.3.4
 pkgrel=1
 pkgdesc="Python LXML Library"
 url="http://codespeak.net/lxml"
 arch="all"
-license="GPL"
-depends="libxml2 libxslt"
+license="BSD"
+depends=""
 makedepends="libxml2-dev libxslt-dev py-setuptools"
 install=
 source="http://codespeak.net/lxml/$_pkgname-$pkgver.tgz"
+_builddir="$srcdir"/$_pkgname-$pkgver
+
 build() {
-	cd "$srcdir"/$_pkgname-$pkgver
+	cd "$_builddir"
+	python setup.py build || return 1
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 	mkdir -p "$pkgdir"/usr/lib/python2.6/site-packages
-	python setup.py install --root="$pkgdir"
-	echo "/usr/lib/python2.6/site-packages/$_pkgname-$pkgver-py2.6.egg" > "$pkgdir"/usr/lib/python2.6/site-packages/$_pkgname.pth
+	echo "/usr/lib/python2.6/site-packages/$_pkgname-$pkgver-py2.6.egg" > \
+		"$pkgdir"/usr/lib/python2.6/site-packages/$_pkgname.pth
 }
-md5sums="d6c612d63a84d79440912a1b29d3b981  lxml-2.2.8.tgz"
+
+md5sums="61d4ad80726b984b35c9a81aa2510b4d  lxml-2.3.4.tgz"
diff --git a/testing/py-mechanize/APKBUILD b/testing/py-mechanize/APKBUILD
index 0fdad0c25..c7c661a27 100644
--- a/testing/py-mechanize/APKBUILD
+++ b/testing/py-mechanize/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer:
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py-mechanize
 _pkgname=mechanize
-pkgver=0.2.4
+pkgver=0.2.5
 pkgrel=0
 pkgdesc="Stateful programmatic web browsing in Python"
 url="http://wwwsearch.sourceforge.net/mechanize/"
@@ -15,9 +15,16 @@ install=""
 subpackages=""
 source="http://wwwsearch.sourceforge.net/$_pkgname/src/$_pkgname-$pkgver.tar.gz"
 _builddir="$srcdir"/$_pkgname-$pkgver
+
+build() {
+	cd "$_builddir"
+	python setup.py build || return 1
+}
+
 package() {
 	cd "$_builddir"
-	python setup.py install --root=$pkgdir
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 	install -Dm644 COPYING.txt ${pkgdir}/usr/share/licenses/custom/${pkgname}/COPYING.txt
 }
-md5sums="0c1c3cec1c6d7b5d87662a069f04eb8d  mechanize-0.2.4.tar.gz"
+
+md5sums="32657f139fc2fb75bcf193b63b8c60b2  mechanize-0.2.5.tar.gz"
diff --git a/testing/py-zmq/APKBUILD b/testing/py-zmq/APKBUILD
new file mode 100644
index 000000000..c5426615a
--- /dev/null
+++ b/testing/py-zmq/APKBUILD
@@ -0,0 +1,29 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=py-zmq
+_pkgname=pyzmq
+pkgver=2.2.0
+pkgrel=0
+pkgdesc="Python bindings for ZeroMQ"
+url="http://pypi.python.org/pypi/pyzmq"
+arch="all"
+license="LGPL BSD"
+depends=""
+depends_dev=""
+makedepends="python-dev py-setuptools zeromq-dev"
+install=""
+subpackages=""
+source="http://pypi.python.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz"
+_builddir="$srcdir"/$_pkgname-$pkgver
+
+build() {
+	cd "$_builddir"
+	python setup.py build || return 1
+}
+
+package() {
+	cd "$_builddir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+}
+
+md5sums="100b73973d6fb235b8da6adea403566e  pyzmq-2.2.0.tar.gz"
diff --git a/testing/pylint/APKBUILD b/testing/pylint/APKBUILD
index bb524faa5..78b110b34 100644
--- a/testing/pylint/APKBUILD
+++ b/testing/pylint/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=pylint
-pkgver=0.23.0
+pkgver=0.25.1
 pkgrel=0
 pkgdesc="Analyzes Python code looking for bugs and signs of poor quality"
 url="http://pypi.python.org/pypi/pylint"
@@ -31,4 +31,4 @@ doc() {
     mv "$_builddir"/man/*.1 "$subpkgdir"/usr/share/man/man1/ || return 1
 }
 
-md5sums="f010eee3289b1af77cd8e8e45fb72829  pylint-0.23.0.tar.gz"
+md5sums="728bbc2b339bc3749af013709a7f87a5  pylint-0.25.1.tar.gz"
diff --git a/testing/rpmlint/APKBUILD b/testing/rpmlint/APKBUILD
index abb06ad9a..748d39ba1 100644
--- a/testing/rpmlint/APKBUILD
+++ b/testing/rpmlint/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=rpmlint
-pkgver=1.3
+pkgver=1.4
 pkgrel=0
 pkgdesc="A tool for checking common errors in RPM packages"
 url="http://rpmlint.zarb.org"
@@ -22,7 +22,8 @@ build() {
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="afe1b906776d1ab8148888c25fd31006  rpmlint-1.3.tar.xz"
+md5sums="bfbdd78847ca2b253c2e4e65c41f49e2  rpmlint-1.4.tar.xz"
diff --git a/testing/scons/APKBUILD b/testing/scons/APKBUILD
index ef188177b..5aa6abd18 100644
--- a/testing/scons/APKBUILD
+++ b/testing/scons/APKBUILD
@@ -1,22 +1,26 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=scons
-pkgver=2.0.1
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="scons software construction system"
 url="http://www.scons.org/"
+arch="noarch"
 license="MIT"
 depends="python"
 makedepends="python-dev"
 install=
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-arch="noarch"
-
 _builddir="$srcdir"/$pkgname-$pkgver
 
+build() {
+	cd "$_builddir"
+	python setup.py build || return 1
+}
+
 package() {
 	cd "$_builddir"
-	python setup.py install --root="$pkgdir"
+	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="beca648b894cdbf85383fffc79516d18  scons-2.0.1.tar.gz"
+md5sums="47daf989e303a045b76c11236df719df  scons-2.1.0.tar.gz"
diff --git a/testing/sipcrack/APKBUILD b/testing/sipcrack/APKBUILD
new file mode 100644
index 000000000..b8e7e5efb
--- /dev/null
+++ b/testing/sipcrack/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=sipcrack
+pkgver=0.2
+pkgrel=0
+pkgdesc="A SIP protocol login cracker"
+url="http://packages.debian.org/lenny/sipcrack"
+arch="all"
+license="Custom"
+depends=""
+depends_dev=""
+makedepends="libpcap-dev openssl-dev"
+install=""
+subpackages=""
+source="http://ftp.de.debian.org/debian/pool/main/s/$pkgname/"$pkgname"_"$pkgver".orig.tar.gz"
+_builddir="$srcdir"/$pkgname-$pkgver
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	for file in sipcrack sipdump; do
+		install -Dm 0755 $file "$pkgdir"/usr/bin/$file || return 1
+	done
+}
+
+md5sums="b9096c8d537fc231c7d74b759831a4c7  sipcrack_0.2.orig.tar.gz"
diff --git a/testing/sipvicious/APKBUILD b/testing/sipvicious/APKBUILD
new file mode 100644
index 000000000..87b08988a
--- /dev/null
+++ b/testing/sipvicious/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=sipvicious
+pkgver=0.2.7
+pkgrel=0
+pkgdesc="Tools for auditing SIP based VoIP systems"
+url="http://code.google.com/p/sipvicious/"
+arch="noarch"
+license="GPL2"
+depends=""
+depends_dev=""
+makedepends="$depends_dev"
+install=""
+subpackages=""
+source="http://sipvicious.googlecode.com/files/$pkgname-$pkgver.tar.gz"
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	return 0
+}
+
+build() {
+	cd "$_builddir"
+	return 0
+}
+
+package() {
+	cd "$_builddir"
+	for file in *.py; do
+		install -Dm 0755 $file "$pkgdir"/usr/bin/$file || return 1
+	done
+}
+
+md5sums="a30c9865d3eac5518d5fd9ced25424f1  sipvicious-0.2.7.tar.gz"
diff --git a/testing/smap/APKBUILD b/testing/smap/APKBUILD
new file mode 100644
index 000000000..cbeca96b1
--- /dev/null
+++ b/testing/smap/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=smap
+pkgver=20081016
+pkgrel=0
+pkgdesc="A simple scanner for SIP enabled devices"
+url="http://www.wormulon.net/smap"
+arch="all"
+license="BSD"
+depends=""
+depends_dev=""
+makedepends="$depends_dev"
+install=""
+subpackages=""
+source="http://mirror2.openwrt.org/sources/$pkgname-$pkgver.tar.gz"
+_builddir="$srcdir"/$pkgname
+
+prepare() {
+	return 0
+}
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	install -m0755 -D $pkgname "$pkgdir"/usr/bin/$pkgname || return 1
+	install -m0755 -D "$_builddir"/fingerprint.db \
+		"$pkgdir"/usr/share/$pkgname//fingerprint.db || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="814456ccc8fea5688382b7ec55fe44eb  smap-20081016.tar.gz"