Merge remote branch 'alpine/master'; fixes for build problems.

Conflicts:
	main/abuild/APKBUILD

5 files changed, 2 insertions, 114 deletions

diff --git a/testing/libowfat/APKBUILD b/testing/libowfat/APKBUILD
deleted file mode 100644
index 8e3ee0eca..000000000
--- a/testing/libowfat/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libowfat
-pkgver=0.28
-pkgrel=0
-pkgdesc="reimplementation of libdjb"
-url="http://www.fefe.de/libowfat/"
-license="GPL"
-depends=
-makedepends=
-install=
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://dl.fefe.de/libowfat-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-}
-
-build() {
-	cd "$_builddir"
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make prefix="$pkgdir"/usr MAN3DIR="$pkgdir"/usr/share/man/man3 install
-	# buffer manpage conflicts with openssl
-	mv "$pkgdir"/usr/share/man/man3/buffer.3 \
-		"$pkgdir"/usr/share/man/man3/owfatbuffer.3
-}
-
-md5sums="6bbee9a86506419657d87123b7a6f2c1  libowfat-0.28.tar.bz2"
diff --git a/testing/opentracker/APKBUILD b/testing/opentracker/APKBUILD
deleted file mode 100644
index 642b0d0b5..000000000
--- a/testing/opentracker/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: 
-# Maintainer: 
-pkgname=opentracker
-pkgver=0_cvs20100625
-pkgrel=0
-pkgdesc="an open and free bittorrent tracker"
-url="http://erdgeist.org/arts/software/opentracker/"
-license="GPL"
-depends=
-makedepends="libowfat-dev"
-install="$pkgname.pre-install"
-subpackages=
-source="http://dev.alpinelinux.org/opentracker/opentracker-$pkgver.tar.gz
-	opentracker.initd"
-
-_builddir="$srcdir"/$pkgname
-prepare() {
-	cd "$_builddir"
-}
-
-build() {
-	cd "$_builddir"
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	install -d "$pkgdir"/usr/bin
-	make BINDIR="$pkgdir"/usr/bin install || return 1
-	install -m644 -D opentracker.conf.sample \
-		"$pkgdir"/etc/opentracker/opentracker.conf
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-}
-
-md5sums="8d02a6f7a241c6b8c98e2dbde086cfcf  opentracker-0_cvs20100625.tar.gz
-1e1e687e78959833463ceb55101a3173  opentracker.initd"
diff --git a/testing/opentracker/opentracker.initd b/testing/opentracker/opentracker.initd
deleted file mode 100644
index 33d281778..000000000
--- a/testing/opentracker/opentracker.initd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-
-# Sample init.d file for alpine linux.
-
-name=opentracker
-daemon=/usr/bin/$name
-conf=${opentracker_conf:-/etc/opentracker/opentracker.conf}
-pidfile=/var/run/opentracker.pid
-
-depend() {
-	need net
-	after firewall
-}
-
-start() {
-	ebegin "Starting ${name}"
-	start-stop-daemon --start --quiet \
-		--make-pidfile \
-		--pidfile ${pidfile} \
-		--background \
-		--stdout /dev/null \
-		--stderr /dev/null \
-		--exec ${daemon} \
-		-- \
-		-d /var/empty \
-		-f $conf \
-		-u ${opentracker_user:-opentracker} \
-		${opentracker_opts}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${name}"
-	start-stop-daemon --stop --quiet --pidfile ${pidfile} \
-		--exec ${daemon}
-	eend $?
-}
-
diff --git a/testing/opentracker/opentracker.pre-install b/testing/opentracker/opentracker.pre-install
deleted file mode 100644
index 942fcd670..000000000
--- a/testing/opentracker/opentracker.pre-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-adduser -D -S -h /var/empty -s /sbin/false opentracker 2>/dev/null
-exit 0
-
diff --git a/testing/py-crypto/APKBUILD b/testing/py-crypto/APKBUILD
index 75f31dd65..a1beecb8f 100644
--- a/testing/py-crypto/APKBUILD
+++ b/testing/py-crypto/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py-crypto
 pkgver=2.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A collection of cryptographic algorithms and protocols, implemented for use from Python."
 url="http://www.amk.ca/python/code/crypto.html"
 license="GPL"
 depends="python"
-makedepends="gmp5-dev python-dev"
+makedepends="gmp-dev python-dev"
 source="http://www.amk.ca/files/python/crypto/pycrypto-$pkgver.tar.gz"
 
 _builddir="$srcdir"/pycrypto-$pkgver