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

12 files changed, 84 insertions, 27 deletions

diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index b7fb7cb58f..82ffa8345e 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=curl
-pkgver=7.26.0
+pkgver=7.27.0
 pkgrel=0
 pkgdesc="An URL retrival utility and library"
 url="http://curl.haxx.se"
@@ -39,4 +39,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
-md5sums="bfa80f01b3d300359cfb4d409b6136a3  curl-7.26.0.tar.bz2"
+md5sums="11fcbfc0de9c12512e607e7d72d500a0  curl-7.27.0.tar.bz2"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 5c455f1481..180c782803 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
-pkgver=2.1.8
+pkgver=2.1.9
 pkgrel=0
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
@@ -116,7 +116,7 @@ config() {
 	mkdir -p "$subpkgdir"/etc/dovecot/conf.d
 }
 
-md5sums="c6d962653b0a7f2ab8d892b53ddf0101  dovecot-2.1.8.tar.gz
+md5sums="3cb45a55c011a2f8599ad70ccfaaf8f5  dovecot-2.1.9.tar.gz
 aec5cc797ab2acf72ce3b6bb1030345f  dovecot.logrotate
 59f210c712284a82e3a65b4126ddd99c  dovecot.initd
 95cf57ecc835882228bbbb019ce3abf8  dovecot-sample-config.post-install"
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 8a923cb964..a6d4db215c 100644
--- a/main/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imagemagick
-pkgver=6.7.8.6
+pkgver=6.7.8.7
 _abiver=5
 _pkgver=${pkgver%.*}-${pkgver##*.}
 pkgrel=0
@@ -63,4 +63,4 @@ _cxx() {
 	mv "$pkgdir"/usr/lib/libMagick++.so.* "$subpkgdir"/usr/lib/
 }
 
-md5sums="1dc4fb3febd1db7e0ab47c877f66eb09  ImageMagick-6.7.8-6.tar.xz"
+md5sums="c12aa1fafac9ebdca42464ba872fac86  ImageMagick-6.7.8-7.tar.xz"
diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD
index 874a34991a..af6177d5e4 100644
--- a/main/iptables/APKBUILD
+++ b/main/iptables/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 pkgname=iptables
-pkgver=1.4.14
+pkgver=1.4.15
 pkgrel=0
 pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
 url="http://www.iptables.org/"
@@ -78,7 +78,7 @@ ip6tables() {
 	install -m644 "$startdir"/ip6tables.confd "$subpkgdir"/etc/conf.d/ip6tables
 }
 
-md5sums="5ab24ad683f76689cfe7e0c73f44855d  iptables-1.4.14.tar.bz2
+md5sums="8bf564ea8348522fc1db727868828def  iptables-1.4.15.tar.bz2
 ec3e80a1b0ea3e13e4e60824b7ebd1b9  iptables-1.4.2-include-in.patch
 f73fb9a0b9fe42a19d1109b415d86c9c  iptables.initd
 c91286c54f8fe0de6ed8950f375cb7a5  iptables.confd
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index df42270073..7485da2b36 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
 pkgver=8.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Mesa DRI OpenGL library"
 url="http://www.mesa3d.org"
 arch="all"
@@ -56,11 +56,6 @@ prepare() {
 	aclocal && automake --add-missing && autoreconf || return 1
 }
 
-dev() {
-	default_dev;
-	depends="$depends_dev mesa mesa-egl mesa-gl mesa-glu mesa-gles"
-}
-
 build() {
 	cd "$_builddir"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index b62bfbdd9b..ad4e4c0085 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openldap
-pkgver=2.4.31
-pkgrel=3
+pkgver=2.4.32
+pkgrel=0
 pkgdesc="LDAP Server"
 url="http://www.openldap.org/"
 arch="all"
@@ -116,7 +116,7 @@ meta() {	_backend meta; }
 monitor() {	_backend monitor; }
 
 
-md5sums="804c6cb5698db30b75ad0ff1c25baefd  openldap-2.4.31.tgz
+md5sums="6a3e85cf61860ca5e8a1eba6753dd9d0  openldap-2.4.32.tgz
 2524e490ba334a760fa57057c16da7a9  openldap-2.4-ppolicy.patch
 d19d0502f046078ecd737e29e7552fa8  openldap-2.4.11-libldap_r.patch
 c47e20f041e4b352e662d5bd677c0a38  slapd.initd
diff --git a/main/pingu/0001-pingu_route-allow-default-routes-that-has-no-via-add.patch b/main/pingu/0001-pingu_route-allow-default-routes-that-has-no-via-add.patch
new file mode 100644
index 0000000000..013fae46cc
--- /dev/null
+++ b/main/pingu/0001-pingu_route-allow-default-routes-that-has-no-via-add.patch
@@ -0,0 +1,60 @@
+From f63ef90aefd8142c7b2ea2e3cd1abae375fc46b5 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 1 Aug 2012 12:03:05 +0000
+Subject: [PATCH] pingu_route: allow default routes that has no via address
+
+This fixes load-balancing with ppp0
+
+We also make the via address family (ipv4/ipv6) agnostic.
+---
+ pingu_netlink.c | 10 ++++++----
+ pingu_route.c   |  3 +--
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/pingu_netlink.c b/pingu_netlink.c
+index e3afbf6..dc4a2ed 100644
+--- a/pingu_netlink.c
++++ b/pingu_netlink.c
+@@ -138,7 +138,7 @@ static int netlink_add_subrtattr_l(struct rtattr *rta, int maxlen, int type,
+         subrta->rta_len = len;
+         memcpy(RTA_DATA(subrta), data, alen);
+         rta->rta_len = NLMSG_ALIGN(rta->rta_len) + RTA_ALIGN(len);
+-        return TRUE;
++        return alen;
+ }
+ 
+ static int netlink_add_subrtattr_addr_any(struct rtattr *rta, int maxlen,
+@@ -346,11 +346,13 @@ static int add_one_nh(struct rtattr *rta, struct rtnexthop *rtnh,
+ 		      struct pingu_iface *iface,
+ 		      struct pingu_route *route)
+ {
++	int addr_size;
+ 	if (route == NULL)
+ 		return 0;
+-	netlink_add_subrtattr_addr_any(rta, 1024, RTA_GATEWAY,
+-					&route->gw_addr);
+-	rtnh->rtnh_len += sizeof(struct rtattr) + 4; // TODO: support ipv6
++	addr_size = netlink_add_subrtattr_addr_any(rta, 1024, RTA_GATEWAY,
++						&route->gw_addr);
++	if (addr_size > 0)
++		rtnh->rtnh_len += sizeof(struct rtattr) + addr_size;
+ 	if (iface->balance_weight)
+ 		rtnh->rtnh_hops = iface->balance_weight - 1;
+ 	rtnh->rtnh_ifindex = iface->index;
+diff --git a/pingu_route.c b/pingu_route.c
+index 3a82f70..a2462c1 100644
+--- a/pingu_route.c
++++ b/pingu_route.c
+@@ -126,8 +126,7 @@ int is_default_gw(struct pingu_route *route)
+ {
+ 	switch (route->dest.sa.sa_family) {
+ 	case AF_INET:
+-		return ((route->dest.sin.sin_addr.s_addr == 0) 
+-			 && (route->gw_addr.sin.sin_addr.s_addr != 0));
++		return (route->dest.sin.sin_addr.s_addr == 0);
+ 		break;
+ 	case AF_INET6:
+ 		log_debug("TODO: ipv6");
+-- 
+1.7.11.2
+
diff --git a/main/pingu/APKBUILD b/main/pingu/APKBUILD
index 7b3118941d..6ccad9a8c9 100644
--- a/main/pingu/APKBUILD
+++ b/main/pingu/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pingu
 pkgver=1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Small daemon that pings hosts and executes a script when status change"
 url="http://git.alpinelinux.org/cgit/pingu"
 arch="all"
@@ -11,6 +11,7 @@ makedepends="libev-dev lua-dev"
 depends=
 subpackages="$pkgname-doc lua-pingu:_lua mtu"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+	0001-pingu_route-allow-default-routes-that-has-no-via-add.patch
 	pingu.initd
 	"
 
@@ -41,4 +42,5 @@ _lua() {
 }
 
 md5sums="a874d852ae0d8e10f8c22e0008d1b529  pingu-1.2.tar.bz2
+dbd6e66d4c9c694fd0436e91555bf750  0001-pingu_route-allow-default-routes-that-has-no-via-add.patch
 70f56b0f506e1c2e725d0ec062667c32  pingu.initd"
diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD
index a3fa1abd74..0d92bc915e 100644
--- a/main/postfix/APKBUILD
+++ b/main/postfix/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postfix
-pkgver=2.9.3
-pkgrel=1
+pkgver=2.9.4
+pkgrel=0
 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)"
 url="http://www.postfix.org/"
 arch="all"
@@ -160,7 +160,7 @@ pcre()  { _mv_dict pcre ; }
 pgsql() { _mv_dict pgsql ; }
 sqlite() { _mv_dict sqlite ; }
 
-md5sums="72cd4656d251fe635d9b8b065d6cc729  postfix-2.9.3.tar.gz
+md5sums="230bc3c00c051946eccd850058d75f6c  postfix-2.9.4.tar.gz
 d773f01dcc965d219a8a37b88f89c5bf  postfix.initd
 8de3f108639eda995162c590053a1278  dynamic-maps3.patch
 442efd1a95b0c061dfb8ab75456e0f24  dynamicmaps.cf
diff --git a/main/sems/APKBUILD b/main/sems/APKBUILD
index e89caaedcf..cfffe12a03 100644
--- a/main/sems/APKBUILD
+++ b/main/sems/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Francesco Colista <francesco.colista@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sems
-pkgver=1.4.3
+pkgver=1.5.0
 pkgrel=0
 pkgdesc="SIP Express Media Server, an extensible SIP media server"
 url="http://iptel.org/sems/"
@@ -195,7 +195,7 @@ xmlrpc2di() {
 }
 
 
-md5sums="1f193eacc9ca6685fc69938d62b85d72  sems-1.4.3.tar.gz
+md5sums="ec0a88f9081679b3b4ab9d06e84ea759  sems-1.5.0.tar.gz
 5b2fded836b44bda33f39adc37de4de7  sems-0001-Force-to-use-system-wide-GSM-includes.patch
 b8efd1a6415afa08f7c676f6976fca36  sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
 331e7529833c906b4738006f32a65fde  sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD
index d4a6279e80..0dbf40aa57 100644
--- a/main/wine/APKBUILD
+++ b/main/wine/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wine
-pkgver=1.5.9
+pkgver=1.5.10
 _ver=${pkgver/_/-}
 pkgrel=0
 pkgdesc="A compatibility layer for running Windows programs"
@@ -49,4 +49,4 @@ package() {
 		"$pkgdir"/usr/bin/wine
 }
 
-md5sums="65a98308d60f878462f4c404d2d013b2  wine-1.5.9.tar.bz2"
+md5sums="7bf0345d31e23111ab6ae69e153bc961  wine-1.5.10.tar.bz2"
diff --git a/main/xf86-video-vesa/APKBUILD b/main/xf86-video-vesa/APKBUILD
index e677cdf2d9..e7aa5ab5f3 100644
--- a/main/xf86-video-vesa/APKBUILD
+++ b/main/xf86-video-vesa/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-vesa
-pkgver=2.3.1
+pkgver=2.3.2
 pkgrel=0
 pkgdesc="X.org vesa video driver"
 url="http://xorg.freedesktop.org/"
@@ -26,4 +26,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="02e6eacc2d1e07ac893b62481905d6f0  xf86-video-vesa-2.3.1.tar.bz2"
+md5sums="3eddd393fba79550e012d717499d58ad  xf86-video-vesa-2.3.2.tar.bz2"