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

9 files changed, 167 insertions, 18 deletions

diff --git a/testing/ansible/APKBUILD b/testing/ansible/APKBUILD
index 0e599f3425..ae9d307128 100644
--- a/testing/ansible/APKBUILD
+++ b/testing/ansible/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=ansible
-pkgver=0.7.1
+pkgver=0.9
 pkgrel=0
 pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
 url="http://ansible.github.com/"
@@ -47,4 +47,4 @@ package() {
 	done
 }
 
-md5sums="cbbbc92ace678fcfb7081fd9517a5a93  ansible-0.7.1.tar.gz"
+md5sums="bbabdb7d934218de8fce0148eadce7e1  ansible-0.9.tar.gz"
diff --git a/testing/bannergrab/APKBUILD b/testing/bannergrab/APKBUILD
new file mode 100644
index 0000000000..95f08b7813
--- /dev/null
+++ b/testing/bannergrab/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=bannergrab
+pkgver=3.5
+pkgrel=0
+pkgdesc="A banner grabbing tool"
+url="http://sourceforge.net/projects/bannergrab"
+arch="all"
+license="GPL3+"
+depends=""
+depends_dev=""
+makedepends="openssl-dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz"
+
+_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 CFLAGS="-lcrypto"  || return 1
+}
+
+package() {
+	cd "$_builddir"
+	install -m755 -D "$_builddir"/$pkgname \
+		"$pkgdir"/usr/sbin/$pkgname  || return 1
+	install -m644 -D "$_builddir"/$pkgname.1 \
+		"$pkgdir"/usr/share/man/man1/$pkgname.1  || return 1
+}
+
+md5sums="654a0bbda23baafbf7a12e4073659171  bannergrab-3.5.tgz"
diff --git a/testing/hping3/APKBUILD b/testing/hping3/APKBUILD
index c58c0e4a01..c1eb402527 100644
--- a/testing/hping3/APKBUILD
+++ b/testing/hping3/APKBUILD
@@ -6,38 +6,34 @@ pkgrel=2
 pkgdesc="A ping-like TCP/IP packet assembler/analyzer"
 url="http://www.hping.org"
 arch="all"
-license="GPL"
+license="GPL2"
 depends=""
 makedepends="libpcap-dev"
-install=
+install=""
 subpackages="$pkgname-doc"
 source="http://www.hping.org/$pkgname-$pkgver.tar.gz
-	hping3-bytesex.patch"
+	    hping3-bytesex.patch"
 
 _builddir="$srcdir/$pkgname-$pkgver"
-
 prepare() {
 	cd "$_builddir"
 	sed -i -e 's:net/bpf.h:pcap/bpf.h:' libpcap_stuff.c script.c || return 1
-
 	patch -p0 < "$srcdir"/hping3-bytesex.patch
 }
 
 build() {
 	cd "$_builddir"
-
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--no-tcl
-
+		--no-tcl  || return 1
 	make || return 1
 }
 
 package() {
 	cd "$_builddir"
-
 	install -m755 -D hping3 "$pkgdir"/usr/sbin/hping3
 	ln -s hping3 "$pkgdir"/usr/sbin/hping
 	ln -s hping3 "$pkgdir"/usr/sbin/hping2
diff --git a/testing/py-logilab-astng/APKBUILD b/testing/py-logilab-astng/APKBUILD
index 812a712ca1..b74b989a48 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.24.0
+pkgver=0.24.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="295bdb2165657ad4b973b3fae1c95f12  logilab-astng-0.24.0.tar.gz"
+md5sums="ddaf66e4d85714d9c47a46d4bed406de  logilab-astng-0.24.1.tar.gz"
diff --git a/testing/py-logilab-common/APKBUILD b/testing/py-logilab-common/APKBUILD
index 3ba5f5377b..e409420dce 100644
--- a/testing/py-logilab-common/APKBUILD
+++ b/testing/py-logilab-common/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py-logilab-common
 _pkgname=logilab-common
-pkgver=0.58.2
+pkgver=0.58.3
 pkgrel=0
 pkgdesc="A collection of Python packages and modules used by Logilab projects"
 url="http://www.logilab.org/project/logilab-common"
@@ -42,4 +42,4 @@ doc() {
     mv "$_builddir"/doc/*.1 "$subpkgdir"/usr/share/man/man1/ || return 1
 }
 
-md5sums="a745888475d988300a76b0c87a5f4381  logilab-common-0.58.2.tar.gz"
+md5sums="d6ea36a311381de92b7d7de3ec69e018  logilab-common-0.58.3.tar.gz"
diff --git a/testing/pylint/APKBUILD b/testing/pylint/APKBUILD
index f15ca9011f..b43167567f 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.25.2
+pkgver=0.26.0
 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="d878d7688a4f5290dc5b53a836872400  pylint-0.25.2.tar.gz"
+md5sums="f396314b60bd62cd9f8e771890364ac9  pylint-0.26.0.tar.gz"
diff --git a/testing/slowhttptest/APKBUILD b/testing/slowhttptest/APKBUILD
new file mode 100644
index 0000000000..cd33d5c44b
--- /dev/null
+++ b/testing/slowhttptest/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=slowhttptest
+pkgver=1.5
+pkgrel=0
+pkgdesc="An application Layer DoS attack simulator"
+url="http://code.google.com/p/slowhttptest"
+arch="all"
+license="Apache2"
+depends=""
+depends_dev=""
+makedepends="openssl-dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://slowhttptest.googlecode.com/files/$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"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="1437fdac96e99305f765a7f0b075b006  slowhttptest-1.5.tar.gz"
diff --git a/testing/sslscan/APKBUILD b/testing/sslscan/APKBUILD
new file mode 100644
index 0000000000..30271216e9
--- /dev/null
+++ b/testing/sslscan/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=sslscan
+pkgver=1.8.2
+pkgrel=0
+pkgdesc="Security assessment tool for SSL"
+url="https://www.titania-security.com/labs/sslscan"
+arch="all"
+license="GPL3+"
+depends=""
+depends_dev=""
+makedepends="openssl-dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz
+        sslscan-makefile.patch"
+
+_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 || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="1a890d031996ab252efb535511bd58db  sslscan-1.8.2.tgz
+1aaacf4df3a6208a9aadafa1938c7126  sslscan-makefile.patch"
diff --git a/testing/sslscan/sslscan-makefile.patch b/testing/sslscan/sslscan-makefile.patch
new file mode 100644
index 0000000000..c41eb230b1
--- /dev/null
+++ b/testing/sslscan/sslscan-makefile.patch
@@ -0,0 +1,28 @@
+diff -ru sslscan-1.8.2/Makefile sslscan-1.8.2.fc12/Makefile
+--- sslscan-1.8.2/Makefile	2010-01-16 20:33:16.000000000 +0100
++++ sslscan-1.8.2.fc12/Makefile	2010-01-16 20:41:10.000000000 +0100
+@@ -1,17 +1,17 @@
+ SRCS = sslscan.c
+-BINPATH = /usr/bin/
+-MANPATH = /usr/share/man/
++BINPATH ?= /usr/bin/
++MANPATH ?= /usr/share/man/
+ 
+ all:
+-	gcc -g -Wall -lssl -o sslscan $(SRCS) $(LDFLAGS) $(CFLAGS)
++	gcc -g -Wall -lssl -lcrypto -o sslscan $(SRCS) $(LDFLAGS) $(CFLAGS)
+ 
+ install:
+-	cp sslscan $(BINPATH)
+-	cp sslscan.1 $(MANPATH)man1
++	install -D -m 755 sslscan $(DESTDIR)$(BINPATH)sslscan
++	install -D -m 644 sslscan.1 $(DESTDIR)$(MANPATH)man1/sslscan.1
+ 
+ uninstall:
+-	rm -f $(BINPATH)sslscan
+-	rm -f $(MANPATH)man1/sslscan.1
++	rm -f $(DESTDIR)$(BINPATH)sslscan
++	rm -f $(DESTDIR)$(MANPATH)man1/sslscan.1
+ 
+ clean:
+ 	rm -f sslscan