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

Conflicts:
	testing/openxcap/APKBUILD

13 files changed, 101 insertions, 50 deletions

diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index b820e6643f..fe976bb2b1 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
-pkgver=2.0.8
+pkgver=2.0.9
 pkgrel=0
 pkgdesc="Alpine Package Keeper - package manager for alpine"
 subpackages="$pkgname-static"
@@ -48,4 +48,4 @@ static() {
 		"$subpkgdir"/sbin/apk.static
 }
 
-md5sums="6d6f1728aef13888a246b134b0231e3c  apk-tools-2.0.8.tar.bz2"
+md5sums="3c9c114ffc01bf5752d28b3213484563  apk-tools-2.0.9.tar.bz2"
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 8ad19f27dc..b4146be14d 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -74,16 +74,25 @@ source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
 	$install
 	"
 
-_extdir="/usr/lib/php/20090626"
+_apiver="20090626"
+_extdir="/usr/lib/php/$_apiver"
+_srcdir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_srcdir"
 	# beat the pear installer into using xml.so
 	patch -p1 -i "$srcdir"/php-install-pear-xml.patch || return 1
 	patch -p1 -i "$srcdir"/php-uclibc.patch || return 1
 
 	# apply suhosin patch
 	patch -p1 -i "${srcdir}"/suhosin-patch-${_suhosinver}.patch || return 1
+
+	# safty check for api changes
+	local vapi=$(sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h)
+	if [ "$vapi" != "$_apiver" ]; then
+		error "Upstreram API version is now $vapi. Expecting $_vapi"
+		return 1
+	fi
 }
 
 build() {
diff --git a/testing/altermime/APKBUILD b/testing/altermime/APKBUILD
new file mode 100644
index 0000000000..1e4667716b
--- /dev/null
+++ b/testing/altermime/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=altermime
+pkgver=0.3.10
+pkgrel=0
+pkgdesc="program alter mime-encoded mailpacks"
+url="http://www.pldaniels.com/altermime/"
+arch="all"
+license="Sendmail"
+depends=
+makedepends=
+install=
+subpackages=
+source="http://www.pldaniels.com/altermime/altermime-$pkgver.tar.gz
+	makefile-flags.patch"
+
+_builddir="$srcdir"/altermime-$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"
+	install -Dm755 altermime "$pkgdir"/usr/bin/altermime
+}
+
+md5sums="aaf0ad8029958a2dc6da3abb4dc178c2  altermime-0.3.10.tar.gz
+604775894fa4f8ddd9d44761ce2be2ea  makefile-flags.patch"
diff --git a/testing/altermime/makefile-flags.patch b/testing/altermime/makefile-flags.patch
new file mode 100644
index 0000000000..71a399051e
--- /dev/null
+++ b/testing/altermime/makefile-flags.patch
@@ -0,0 +1,21 @@
+--- ./Makefile.orig
++++ ./Makefile
+@@ -9,7 +9,8 @@
+ #								opposite of a disclaimer.
+ #ALTERMIME_OPTIONS=-DALTERMIME_PRETEXT
+ ALTERMIME_OPTIONS=
+-CFLAGS=-Wall -Werror -g -I. -O2 $(ALTERMIME_OPTIONS)
++CFLAGS?=-Wall -Werror -g -I. -O2
++CFLAGS+=$(ALTERMIME_OPTIONS)
+ OBJS= strstack.o mime_alter.o ffget.o pldstr.o filename-filters.o logger.o MIME_headers.o libmime-decoders.o boundary-stack.o qpe.o
+ 
+ 
+@@ -19,7 +20,7 @@
+ all: altermime
+ 
+ altermime: altermime.c ${OBJS}
+-	${CC} ${CFLAGS} altermime.c ${OBJS} -o altermime
++	${CC} ${CFLAGS} altermime.c ${OBJS} ${LDFLAGS} -o altermime
+ 
+ 
+ # Build Install
diff --git a/testing/expect/APKBUILD b/testing/expect/APKBUILD
index ab37b50cf0..5ece406663 100644
--- a/testing/expect/APKBUILD
+++ b/testing/expect/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-dev"
 source="http://downloads.sourceforge.net/project/expect/Expect/$pkgver/$pkgname$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname$pkgver
-
 build() {
 	cd "$_builddir"
 	./configure --prefix=/usr
@@ -26,7 +25,6 @@ build() {
 		--disable-rpath
 	make || return 1
 }
-
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
diff --git a/testing/ngrep/APKBUILD b/testing/ngrep/APKBUILD
index cdc056ddb5..67d6253d1e 100644
--- a/testing/ngrep/APKBUILD
+++ b/testing/ngrep/APKBUILD
@@ -8,14 +8,12 @@ url="http://ngrep.sourceforge.net/"
 arch="all"
 license="custom"
 depends=
-depends_dev=
-makedepends="libpcap-dev"
+depends_dev="libpcap-dev"
+makedepends="$depends_dev"
 install=""
 subpackages=""
 source="http://downloads.sourceforge.net/sourceforge/ngrep/$pkgname-$pkgver.tar.bz2"
-
 _builddir="$srcdir"/$pkgname-$pkgver
-
 build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
diff --git a/testing/openvcp/APKBUILD b/testing/openvcp/APKBUILD
index 72fdd6f581..ed2ab667f9 100644
--- a/testing/openvcp/APKBUILD
+++ b/testing/openvcp/APKBUILD
@@ -19,16 +19,6 @@ source="http://files.openvcp.org/$_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 \
@@ -36,7 +26,6 @@ build() {
 		--with-gnutls
 	make || return 1
 }
-
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
@@ -44,4 +33,4 @@ package() {
 }
 
 md5sums="9c65d706133ea48553c90236997f1b8b  openvcpd-0.5rc3.tar.gz
-db8efb9c086673fd2e3e2532294c7a2f  openvcp.initd"
+08cef22e3abc5824133733e17aa4e607  openvcp.initd"
diff --git a/testing/openxcap/APKBUILD b/testing/openxcap/APKBUILD
index 25811d4ae0..812c6d16de 100644
--- a/testing/openxcap/APKBUILD
+++ b/testing/openxcap/APKBUILD
@@ -31,4 +31,4 @@ build() {
 
 md5sums="155b1ee85dd3217e5647ad3ac9f72cf6  openxcap-2.0.0.tar.gz
 7a18872843586717eaf3879444cc13d2  config.ini
-5bebac590cb06b0eacaf040116bc354e  openxcap.initd"
+0043d28e9e6e51e03661755d12080a28  openxcap.initd"
diff --git a/testing/openxcap/openxcap.initd b/testing/openxcap/openxcap.initd
index 69108afd8a..03286cce3d 100644
--- a/testing/openxcap/openxcap.initd
+++ b/testing/openxcap/openxcap.initd
@@ -1,23 +1,31 @@
 #!/sbin/runscript
-#
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
-daemon=/usr/bin/openxcap
-pidfile=/var/run/openxcap/openxcap.pid
+INSTALL_DIR="/usr/bin"
+RUNTIME_DIR="/var/run/openxcap"
+DEFAULTS="/etc/default/openxcap"
+SERVER="$INSTALL_DIR/openxcap"
+PID="$RUNTIME_DIR/openxcap.pid"
+OPTIONS=""
+NAME="openxcap"
+DESC="OpenXCAP server"
 
 depend() {
-	 need net
-	 after firewall
+    need net
+    after firewall
 }
 
 start() {
-    	ebegin "Starting OpenXCAP Presence Server"
-	start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon
-	eend $?
+    ebegin "Starting $DESC: $NAME "
+    start-stop-daemon --start --quiet --pidfile $PID --exec $SERVER -- $OPTIONS
+    eend $?
 }
 
-stop() {
-   	ebegin "Stopping OpenXCAP Presence Server"
-	start-stop-daemon --stop --quiet --signal 15 --pidfile $pidfile
-	eend $?
+stop () {
+    ebegin -n "Stopping $DESC: $NAME "
+    start-stop-daemon --stop --quiet --oknodo --signal 15 --pidfile $PID
+    eend $?
 }
 
+exit 0
+
diff --git a/testing/perl-control-x10/APKBUILD b/testing/perl-control-x10/APKBUILD
index 616b0c16cd..10e91ee6cf 100644
--- a/testing/perl-control-x10/APKBUILD
+++ b/testing/perl-control-x10/APKBUILD
@@ -13,20 +13,16 @@ makedepends="perl-dev"
 install=
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/B/BB/BBIRTH/$_realname-$pkgver.tar.gz"
-
 _builddir="$srcdir/$_realname-$pkgver"
-
 build() {
 	cd $_builddir
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
 	make || return 1
 }
-
 package() {
 	cd $_builddir
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
-
 md5sums="b59c85e92eae2c14ffa63af7ac0a1d9a  ControlX10-CM11-2.09.tar.gz"
diff --git a/testing/perl-php-serialization/APKBUILD b/testing/perl-php-serialization/APKBUILD
index 1fcf599cdc..9565691bb5 100644
--- a/testing/perl-php-serialization/APKBUILD
+++ b/testing/perl-php-serialization/APKBUILD
@@ -5,7 +5,7 @@ _realname=PHP-Serialization
 pkgver=0.34
 pkgrel=0
 pkgdesc="Simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa."
-url="http://search.cpan.org/~bobtfish/PHP-Serialization-0.34/"
+url="http://search.cpan.org/~bobtfish/PHP-Serialization-$pkgver"
 arch="noarch"
 license="GPL PerlArtistic"
 depends="perl"
diff --git a/testing/perl-sys-mmap/APKBUILD b/testing/perl-sys-mmap/APKBUILD
index e0906944ac..841f71035d 100644
--- a/testing/perl-sys-mmap/APKBUILD
+++ b/testing/perl-sys-mmap/APKBUILD
@@ -15,18 +15,15 @@ subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/$_realname-$pkgver.tar.gz"
 
 _builddir="$srcdir/$_realname-$pkgver"
-
 build() {
 	cd $_builddir
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
 	make || return 1
 }
-
 package() {
 	cd $_builddir
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
-
 md5sums="f3a1115b7632ca015532e8ca7134918b  Sys-Mmap-0.14.tar.gz"
diff --git a/testing/qpage/APKBUILD b/testing/qpage/APKBUILD
index c93b542c2c..63adae631a 100644
--- a/testing/qpage/APKBUILD
+++ b/testing/qpage/APKBUILD
@@ -7,18 +7,16 @@ pkgdesc="Sends messages to an alphanumeric pager via TAP protocol."
 url="http://www.qpage.org/"
 arch="all"
 license="Custom"
-depends=
+depends=""
 depends_dev=
-makedepends=
+makedepends="$depends_dev"
 install="$pkgname.pre-install $pkgname.post-install"
 source="saveas-http://archive.debian.org/debian/pool/non-free/q/$pkgname/"$pkgname"_3.3final.orig.tar.gz/$pkgname-$pkgver.tar.gz
 	config.input
 	qpage.initd
 	qpage.patch
 	"
-
 _builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
 	cd "$_builddir"
 	for i in $source; do
@@ -27,7 +25,6 @@ prepare() {
 		esac
 	done
 }
-
 build() {
 	cd "$_builddir"
 	cp -f "$srcdir"/config.input "$_builddir" || return 1
@@ -36,15 +33,14 @@ build() {
                     --localstatedir=/var
        make || return 1
 }
-
 package() {
 	mkdir -p "$pkgdir"/usr/bin
 	mkdir -p "$pkgdir"/etc/qpage
 	install -m755 "$_builddir"/$pkgname "$pkgdir"/usr/bin/"$pkgname"
 	install -m644 -D "$_builddir"/example.cf "$pkgdir"/etc/qpage/qpage.conf.example
 	install -m644 -D "$_builddir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
-
 md5sums="eb98faaa51f89db68ecf7668f5294309  qpage-3.3.tar.gz
 3ac8c6e2aede9e195eba2555eb3b4645  config.input
 f439315da04ebdd1e1cc2840171d45d3  qpage.initd