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

main/abuild/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgdesc="Script to build Alpine Packages"
 pkgname=abuild
-pkgver=2.7.4
+pkgver=2.8.2
 pkgrel=0
 url=http://git.alpinelinux.org/cgit/abuild/
 source="http://git.alpinelinux.org/cgit/abuild.git/snapshot/abuild-$pkgver.tar.bz2
@@ -37,4 +37,4 @@ package() {
 	install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles
 }
 
-md5sums="b39a68e836b8873307cf6617f1bfeb23  abuild-2.7.4.tar.bz2"
+md5sums="77208071fdeb879cd17ec62a81bdd680  abuild-2.8.2.tar.bz2"

main/acf-alpine-baselayout/APKBUILD

 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-alpine-baselayout
-pkgver=0.8.1
+pkgver=0.8.2
 pkgrel=0
 pkgdesc="A web-based system administration interface for alpine-baselayout"
 url="http://git.alpinelinux.org/cgit/acf-alpine-baselayout"
@@ -15,4 +15,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="b5db0e519b6254c3120efeec4175f0fd  acf-alpine-baselayout-0.8.1.tar.bz2"
+md5sums="3c621d2dfbafc11224139083c8be2bdc  acf-alpine-baselayout-0.8.2.tar.bz2"

main/acf-asterisk/APKBUILD

 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-asterisk
-pkgver=0.2.3
-pkgrel=2
+pkgver=0.3.0
+pkgrel=0
 pkgdesc="A web-based system administration interface for asterisk"
 url="http://git.alpinelinux.org/cgit/acf-asterisk"
 arch="noarch"
@@ -20,4 +20,4 @@ package() {
 
 }
 
-md5sums="7ad426d23385b6bcc295a330526dcb69  acf-asterisk-0.2.3.tar.bz2"
+md5sums="961ce238956562b60d264fdb45355e9f  acf-asterisk-0.3.0.tar.bz2"

main/acf-core/APKBUILD

 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-core
-pkgver=0.12.0
-pkgrel=2
+pkgver=0.13.0
+pkgrel=0
 pkgdesc="A web-based system administration interface framework"
 url="http://git.alpinelinux.org/cgit/acf-core"
 arch="noarch"
@@ -15,4 +15,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="f44c74e0ceebdc953553c6dc7386f3a7  acf-core-0.12.0.tar.bz2"
+md5sums="a8b37ce56333d783c1b30561c5b78027  acf-core-0.13.0.tar.bz2"

main/acf-dansguardian/APKBUILD

 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dansguardian
-pkgver=0.3.3
-pkgrel=2
+pkgver=0.4.0
+pkgrel=0
 pkgdesc="A web-based system administration interface for dansguardian"
 url="http://git.alpinelinux.org/cgit/acf-dansguardian"
 arch="noarch"
@@ -20,4 +20,4 @@ package() {
 
 }
 
-md5sums="2a6eae287f2e9315bd822b6a41bf41ed  acf-dansguardian-0.3.3.tar.bz2"
+md5sums="864ac9cbf48ad1658ca2c1c6ce471799  acf-dansguardian-0.4.0.tar.bz2"

main/acf-dnscache/APKBUILD

 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dnscache
-pkgver=0.2.2
-pkgrel=3
+pkgver=0.3.0
+pkgrel=0
 pkgdesc="A web-based system administration interface for dnscache"
 url="http://git.alpinelinux.org/cgit/acf-dnscache"
 arch="noarch"
@@ -14,4 +14,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="fca9c93b1ed06e1391c44fe783056a46  acf-dnscache-0.2.2.tar.bz2"
+md5sums="eec8af4eb887448613626d8b08cdc456  acf-dnscache-0.3.0.tar.bz2"

main/acf-dnsmasq/APKBUILD

 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dnsmasq
-pkgver=0.2.2
-pkgrel=2
+pkgver=0.3.0
+pkgrel=0
 pkgdesc="A web-based system administration interface for dnsmasq"
 url="http://git.alpinelinux.org/cgit/acf-dnsmasq"
 arch="noarch"
@@ -14,4 +14,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="ab84c2ebab6dae6628326c8f7aefcfa6  acf-dnsmasq-0.2.2.tar.bz2"
+md5sums="5c1843623c805fbf9be4dcde32049206  acf-dnsmasq-0.3.0.tar.bz2"

main/acf-fetchmail/APKBUILD

 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-fetchmail
-pkgver=0.4.2
-pkgrel=2
+pkgver=0.5.0
+pkgrel=0
 pkgdesc="A web-based system administration interface for fetchmail"
 url="http://git.alpinelinux.org/cgit/acf-fetchmail"
 arch="noarch"
@@ -20,4 +20,4 @@ package() {
 
 }
 
-md5sums="bfa66c719cfbc6075e4773311730318b  acf-fetchmail-0.4.2.tar.bz2"
+md5sums="41ae8840c5d4cdceb5b21fc9e8debf1b  acf-fetchmail-0.5.0.tar.bz2"

main/acf-ipsec-tools/APKBUILD

 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-ipsec-tools
-pkgver=0.6.1
-pkgrel=2
+pkgver=0.7.0
+pkgrel=0
 pkgdesc="A web-based system administration interface for ipsec-tools"
 url="http://git.alpinelinux.org/cgit/acf-ipsec-tools"
 arch="noarch"
@@ -14,4 +14,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="eb1c906a3691789178e118ca8809af47  acf-ipsec-tools-0.6.1.tar.bz2"
+md5sums="819f891066ca94640d5b7ef3dd985296  acf-ipsec-tools-0.7.0.tar.bz2"

main/acf-shorewall/APKBUILD

 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-shorewall
-pkgver=0.6.2
-pkgrel=2
+pkgver=0.7.0
+pkgrel=0
 pkgdesc="A web-based system administration interface for shorewall"
 url="http://git.alpinelinux.org/cgit/acf-shorewall"
 arch="noarch"
@@ -14,4 +14,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="d92c0f4ebdbe52dff156a13c08055cf9  acf-shorewall-0.6.2.tar.bz2"
+md5sums="190a278c301d0b20afc512b9585148c0  acf-shorewall-0.7.0.tar.bz2"

main/acf-tinydns/APKBUILD

 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-tinydns
-pkgver=0.6.0
-pkgrel=2
+pkgver=0.7.0
+pkgrel=0
 pkgdesc="A web-based system administration interface for tinydns"
 url="http://git.alpinelinux.org/cgit/acf-tinydns"
 arch="noarch"
@@ -14,4 +14,4 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="7cb568e6960b1e13da492827d47c1fbd  acf-tinydns-0.6.0.tar.bz2"
+md5sums="20597fd493bd37414247abd4b1ae10ed  acf-tinydns-0.7.0.tar.bz2"

main/doxygen/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=doxygen
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=0
 pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
 url="http://www.doxygen.org/"
@@ -43,4 +43,4 @@ package() {
 	make DESTDIR="$pkgdir" MAN1DIR=share/man/man1 install
 }
 
-md5sums="6cc5ad566dbec5cf843dc600b1162808  doxygen-1.7.3.src.tar.gz"
+md5sums="ff908759ff7cd9464424b04ae6c68e48  doxygen-1.7.4.src.tar.gz"

main/imagemagick/APKBUILD

 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imagemagick
-pkgver=6.6.8.7
+pkgver=6.6.9.1
 _pkgver=${pkgver%.*}-${pkgver##*.}
 pkgrel=0
 pkgdesc="A collection of tools and libraries for many image formats"
@@ -48,4 +48,4 @@ dev() {
 		"$pkgdir"/usr/lib/ImageMagick-$_v/modules-Q16/filters/
 }
 
-md5sums="f719a8e814dd926b1c9ddd7b9ebd6e3a  ImageMagick-6.6.8-7.tar.gz"
+md5sums="560dbda9acb7c95672caf3cccadc8a0f  ImageMagick-6.6.9-1.tar.gz"

main/ipsec-tools/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ipsec-tools
 pkgver=0.8.0
-pkgrel=0
+pkgrel=2
 pkgdesc="User-space IPsec tools for various IPsec implementations"
 url="http://ipsec-tools.sourceforge.net/"
 arch="all"
@@ -58,7 +58,7 @@ package() {
 md5sums="c9a318cdbc0946f4e51464866d529739  ipsec-tools-0.8.0.tar.gz
 74f12ed04ed273a738229c0bfbf829cc  racoon.initd
 2d00250cf72da7f2f559c91b65a48747  racoon.confd
-64a859d51f57206a11e52f6ad4830ec5  20-grekey-support.patch
+79b919ab23080f54dc3e7686877ca6bd  20-grekey-support.patch
 f97205eea3dc68d2437a2ad8720f4520  50-reverse-connect.patch
 94773c94233e14cdce0fa02ff780a43e  70-defer-isakmp-ident-handling.patch
 2d5d24c4a3684a38584f88720f71c7d6  75-racoonctl-rcvbuf.patch"

main/lua/APKBUILD

@@ -2,18 +2,19 @@
 pkgname=lua
 pkgver=5.1.4_p3
 _ver=${pkgver%_p*}
-pkgrel=0
+pkgrel=1
 pkgdesc="A powerful light-weight programming language designed for extending applications."
 url="http://www.lua.org/"
 arch="all"
 license="MIT"
 depends=
-makedepends="readline-dev libtool"
+makedepends="libtool"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.$pkgname.org/ftp/$pkgname-$_ver.tar.gz
 	http://www.lua.org/ftp/patch-lua-5.1.4-${pkgver#*_p}
 	lua-5.1-make.patch
 	lua-5.1-module_paths.patch
+	lua-5.1-readline.patch
 	"
 
 _builddir="$srcdir"/lua-$_ver
@@ -38,7 +39,6 @@ build ()
 	cd src
 	make CFLAGS=" -DLUA_USE_LINUX $CFLAGS" \
 		RPATH="/usr/lib" \
-		LUA_LIBS="-lreadline" \
 		LIB_LIBS="-lpthread -lm -ldl" \
 		V=$pkgver \
 		gentoo_all || return 1
@@ -56,4 +56,5 @@ package() {
 md5sums="d0870f2de55d59c1c8419f36e8fac150  lua-5.1.4.tar.gz
 998ef7886183f61d3a5ca891a9ce6a79  patch-lua-5.1.4-3
 0145ff6036eb6bfdab427dc8f0c3f3c0  lua-5.1-make.patch
-e60ef15deefb72a5930c498f1184aced  lua-5.1-module_paths.patch"
+e60ef15deefb72a5930c498f1184aced  lua-5.1-module_paths.patch
+f2205b897edb31292a1f597a7fd638cb  lua-5.1-readline.patch"

main/lua/lua-5.1-readline.patch

+--- lua-5.1.1.orig/src/luaconf.h	2006-04-10 20:27:23.000000000 +0200
++++ lua-5.1.1/src/luaconf.h	2006-11-15 14:53:07.000000000 +0100
+@@ -36,7 +36,6 @@
+ #if defined(LUA_USE_LINUX)
+ #define LUA_USE_POSIX
+ #define LUA_USE_DLOPEN		/* needs an extra library: -ldl */
+-#define LUA_USE_READLINE	/* needs some extra libraries */
+ #endif
+ 
+ #if defined(LUA_USE_MACOSX)

main/m4/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=m4
-pkgver=1.4.15
+pkgver=1.4.16
 pkgrel=0
 pkgdesc="GNU macro processor"
 url="http://www.gnu.org/software/m4"
@@ -9,12 +9,11 @@ arch="all"
 license="GPL"
 subpackages="m4-doc"
 source="ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz
-	gnulib-uclibc.patch"
+	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
-	patch -p1 -i "$srcdir"/gnulib-uclibc.patch
 }
 
 build() {
@@ -28,5 +27,4 @@ package() {
 	make install DESTDIR="$pkgdir"
 }
 
-md5sums="5649a2e593b6c639deae9e72ede777dd  m4-1.4.15.tar.gz
-20a7dedec0e9e0ee7107e33e798ffdbe  gnulib-uclibc.patch"
+md5sums="a5dfb4f2b7370e9d34293d23fd09b280  m4-1.4.16.tar.gz"

main/m4/gnulib-uclibc.patch

-diff --git a/lib/spawn.in.h b/lib/spawn.in.h
-index 84ba93c..6df4599 100644
---- a/lib/spawn.in.h
-+++ b/lib/spawn.in.h
-@@ -31,7 +31,7 @@
- 
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
-    But avoid namespace pollution on glibc systems.  */
--#ifndef __GLIBC__
-+#if !defined(__GLIBC__) || defined(__UCLIBC__)
- # include <sched.h>
- # include <signal.h>
- #endif

main/opennhrp/0001-netlink-ignore-kernel-routes-for-GRE-interfaces.patch

+From 7747c86253114ed9702346a93587e4e6cac444aa Mon Sep 17 00:00:00 2001
+From: David Ward <david.ward@ll.mit.edu>
+Date: Tue, 29 Mar 2011 22:43:03 -0400
+Subject: [PATCH] netlink: ignore kernel routes for GRE interfaces
+
+The kernel route should not be added as a peer, except on shortcut-
+destination interfaces. It can prevent NHRP resolution requests from
+being routed correctly to a statically-configured next hop server.
+
+Signed-off-by: David Ward <david.ward@ll.mit.edu>
+---
+ nhrp/sysdep_netlink.c |    9 ++++-----
+ 1 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/nhrp/sysdep_netlink.c b/nhrp/sysdep_netlink.c
+index a76acc2..e3e588b 100644
+--- a/nhrp/sysdep_netlink.c
++++ b/nhrp/sysdep_netlink.c
+@@ -691,7 +691,8 @@ static void netlink_route_new(struct nlmsghdr *msg)
+ 	} else if (iface->flags & NHRP_INTERFACE_FLAG_CONFIGURED) {
+ 		/* Routes which might get additional outbound
+ 		 * shortcuts */
+-		 if (rtm->rtm_table != iface->route_table)
++		if (rtm->rtm_table != iface->route_table ||
++		    rtm->rtm_protocol == RTPROT_KERNEL)
+ 			return;
+ 		type = NHRP_PEER_TYPE_LOCAL_ROUTE;
+ 	}
+@@ -728,12 +729,9 @@ static void netlink_route_del(struct nlmsghdr *msg)
+ 	if (rta[RTA_OIF] == NULL || rta[RTA_DST] == NULL)
+ 		return;
+ 
+-	/* Consider only routes from main table */
+ 	if (rtm->rtm_family != PF_INET)
+ 		return;
+ 
+-	/* Only consider routes for local interfaces that accept
+-	 * shortcut connections */
+ 	iface = nhrp_interface_get_by_index(*(int*)RTA_DATA(rta[RTA_OIF]),
+ 					    FALSE);
+ 	if (iface == NULL)
+@@ -747,7 +745,8 @@ static void netlink_route_del(struct nlmsghdr *msg)
+ 	} else if (iface->flags & NHRP_INTERFACE_FLAG_CONFIGURED) {
+ 		/* Routes which might get additional outbound
+ 		 * shortcuts */
+-		 if (rtm->rtm_table != iface->route_table)
++		if (rtm->rtm_table != iface->route_table ||
++		    rtm->rtm_protocol == RTPROT_KERNEL)
+ 			return;
+ 		type = NHRP_PEER_TYPE_LOCAL_ROUTE;
+ 	}
+-- 
+1.7.1
+

main/opennhrp/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=opennhrp
 pkgver=0.12.1
-pkgrel=0
+pkgrel=1
 pkgdesc="NBMA Next Hop Resolution Protocol daemon"
 url="http://sourceforge.net/projects/opennhrp"
 arch="all"
@@ -10,6 +10,7 @@ depends=
 makedepends="c-ares-dev"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+	0001-netlink-ignore-kernel-routes-for-GRE-interfaces.patch
 	opennhrp-0.9.3-peer-up-bgp.patch
 	$pkgname.initd
 	$pkgname.confd
@@ -33,6 +34,7 @@ package() {
 	install -Dm644 "$srcdir"/opennhrp.confd "$pkgdir"/etc/conf.d/opennhrp
 }
 md5sums="31ada6dede3c62dac491002624d34778  opennhrp-0.12.1.tar.bz2
+d6dbf1ac009615cea63e0ede894133a0  0001-netlink-ignore-kernel-routes-for-GRE-interfaces.patch
 f81539fc92800bb79668dda119a97d1d  opennhrp-0.9.3-peer-up-bgp.patch
 ae65f88ccf849ef882669a8b4f0c7fc0  opennhrp.initd
 8eee86233728dc0d156bbfee6d98f338  opennhrp.confd"

main/polkit/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=polkit
 _pkgname=PolicyKit
-pkgver=0.100
+pkgver=0.101
 pkgrel=0
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 url="http://www.freedesktop.org/wiki/Software/PolicyKit"
@@ -10,7 +10,7 @@ arch="all"
 license="LGPL"
 depends=
 makedepends="expat-dev glib-dev eggdbus-dev intltool dbus-glib-dev autoconf
-	libtool automake gtk-doc"
+	libtool automake gtk-doc gobject-introspection"
 depends_dev="eggdbus-dev dbus-glib-dev"
 install=
 subpackages="$pkgname-dev $pkgname-doc"
@@ -34,6 +34,7 @@ build() {
 		--disable-nls \
 		--disable-introspection \
 		--with-authfw=shadow \
+		--with-os-type=alpine \
 		--disable-gtk-doc \
 		--disable-gtk-doc-html \
 		--disable-gtk-doc-pdf
@@ -46,4 +47,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="42a28c061d870d19308cb31197d8a7f5  PolicyKit-0.100.tar.bz2"
+md5sums="dcacd0c68fc62d0199bd39e437ab4baf  PolicyKit-0.101.tar.bz2"

main/ppp/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ppp
 pkgver=2.4.5
-pkgrel=4
+pkgrel=6
 pkgdesc="A daemon which implements the PPP protocol for dial-up networking"
 url="http://www.samba.org/ppp/"
 arch="all"
@@ -21,6 +21,23 @@ source="ftp://ftp.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
 _builddir="$srcdir"/$pkgname-$pkgver
 build () { 
 	cd "$_builddir"
+
+	# fix CFLAGS
+	# -D_GNU_SOURCE is needed for IPv6 to work apparently
+	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
+	sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux
+	sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux
+	sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux
+	sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux
+	sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux
+	# enable active filter
+	sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux
+	# enable ipv6 support
+	sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux
+	# Enable Microsoft proprietary Callback Control Protocol
+	sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux
+	# Fix build error with recent kernels
+	rm include/linux/if_pppol2tp.h
 	./configure --prefix=/usr
 	make COPTS="$CFLAGS" || return 1
 }

main/readline/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=readline
-pkgver=6.1.002
+pkgver=6.2.001
 _myver=${pkgver%.*}
 _patchver=${pkgver##*.}
 _suff=${_myver%.*}${_myver#*.}
-pkgrel=2
+pkgrel=0
 pkgdesc="GNU readline library"
 url="ftp://ftp.cwru.edu/pub/bash/"