Merge branch 'master' of git://git.alpinelinux.org/aports

14 files changed, 32 insertions, 54 deletions

diff --git a/main/apr/APKBUILD b/main/apr/APKBUILD
index 15f412e44d..097cd35e00 100644
--- a/main/apr/APKBUILD
+++ b/main/apr/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apr
-pkgver=1.3.8
+pkgver=1.3.9
 pkgrel=0
 pkgdesc="The Apache Portable Runtime"
 url="http://apr.apache.org/"
@@ -32,4 +32,4 @@ dev() {
 	return 0
 }
 
-md5sums="3c7e3a39ae3d3573f49cb74e2dbf87a2  apr-1.3.8.tar.bz2"
+md5sums="7138ac64d4458eeeaa9b9aefa4e6e51b  apr-1.3.9.tar.bz2"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 87291ec771..0fe38ff91e 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=1.2.5
+pkgver=1.2.6
 pkgrel=0
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
@@ -29,5 +29,5 @@ build() {
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-md5sums="8b057903d6a527dac964b51c5638c625  dovecot-1.2.5.tar.gz
+md5sums="807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 c58b474dca20e6e60fa4f1f5b9c726e1  dovecot.initd"
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index 49f092220b..5b5b53cc02 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fakeroot
-pkgver=1.13
+pkgver=1.13.1
 pkgrel=0
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 license='GPL'
@@ -18,5 +18,5 @@ build() {
   make DESTDIR="$pkgdir" install
 }
 
-md5sums="e0cbeceb066cc678c9fe1d6d35d24ceb  fakeroot_1.13.tar.gz
+md5sums="f96aa2b0050892d118e74af43d8ed748  fakeroot_1.13.1.tar.gz
 ea7b7e3065090d72804cdf4719dd5832  busybox-compat.patch"
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index ce08a46aa2..dbf5a3c2e8 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=git
-pkgver=1.6.4.4
+pkgver=1.6.5
 pkgrel=0
 pkgdesc="GIT - the stupid content tracker"
 url="http://git.or.cz/"
@@ -39,5 +39,5 @@ perl() {
 }
 
 
-md5sums="b150352782998ca1f84185e6af53ec26  git-1.6.4.4.tar.bz2
+md5sums="da86c1736c55edb9f446828581137b51  git-1.6.5.tar.bz2
 04e1bdf76a0bac568f8488daad07dce7  bb-tar.patch"
diff --git a/main/gzip/APKBUILD b/main/gzip/APKBUILD
index eb06884d6d..6d7a0874f0 100644
--- a/main/gzip/APKBUILD
+++ b/main/gzip/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gzip
-pkgver=1.3.12
-pkgrel=2
+pkgver=1.3.13
+pkgrel=0
 pkgdesc="A popular data compression program"
 subpackages="$pkgname-doc"
 url="http://www.gnu.org/software/gzip/"
@@ -10,8 +10,7 @@ license="GPL2"
 depends=
 makedepends=
 install="$pkgname.post-deinstall"
-source="http://ftp.gnu.org/gnu/gzip/gzip-1.3.12.tar.gz
-	$install"
+source="http://ftp.gnu.org/gnu/gzip/gzip-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -30,5 +29,4 @@ build() {
 	ln -s /bin/gzip "$pkgdir"/usr/bin/gzip
 	ln -s /bin/gunzip "$pkgdir"/usr/bin/gunzip
 }
-md5sums="b5bac2d21840ae077e0217bc5e4845b1  gzip-1.3.12.tar.gz
-b84506d253e04db3c5af9016fead45a3  gzip.post-deinstall"
+md5sums="c54a31b93e865f6a4410b2dc64662706  gzip-1.3.13.tar.gz"
diff --git a/main/libcap/APKBUILD b/main/libcap/APKBUILD
index 731729c03a..666de86ce7 100644
--- a/main/libcap/APKBUILD
+++ b/main/libcap/APKBUILD
@@ -1,23 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libcap
-pkgver=2.16
-pkgrel=1
+pkgver=2.17
+pkgrel=0
 pkgdesc="POSIX 1003.1e capabilities"
 license="GPL"
 url="http://www.friedhoff.org/posixfilecaps.html"
 depends=
 makedepends="perl"
 source="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$pkgname-$pkgver.tar.gz
-	include-order.patch
 	"
 subpackages="$pkgname-doc $pkgname-dev"
 
 build ()
 {
 	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 < ../include-order.patch || return 1
-
 	make lib=/lib prefix=/usr LIBATTR=no DESTDIR="$pkgdir" install
 }
-md5sums="9e075fda242c4070ba76407064c13302  libcap-2.16.tar.gz
-db5c78e0ab579bb6723fff5ebb2fd530  include-order.patch"
+md5sums="fa8c3841ce491b379de316a195e65da2  libcap-2.17.tar.gz"
diff --git a/main/libcap/include-order.patch b/main/libcap/include-order.patch
deleted file mode 100644
index 88c5fcc6c8..0000000000
--- a/main/libcap/include-order.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur a/progs/capsh.c b/progs/capsh.c
---- a/progs/capsh.c	2009-07-24 07:14:03.000000000 +0000
-+++ b/progs/capsh.c	2009-07-24 07:14:19.000000000 +0000
-@@ -12,11 +12,11 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <sys/wait.h>
- #include <sys/prctl.h>
- #include <sys/capability.h>
- #include <unistd.h>
- #include <errno.h>
--#include <sys/wait.h>
- 
- /* prctl based API for altering character of current process */
- #define PR_GET_KEEPCAPS    7
diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD
index 77cafba2bb..c6f277c44a 100644
--- a/main/man-pages/APKBUILD
+++ b/main/man-pages/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=man-pages
-pkgver=3.22
+pkgver=3.23
 _posixver=2003-a
 pkgrel=0
 pkgdesc="Linux man pages"
@@ -24,5 +24,5 @@ build ()
 	done
 	make prefix="$pkgdir"/usr install || return 1
 }
-md5sums="409e7325188d8734a63c823fd58c7dce  man-pages-3.22.tar.gz
+md5sums="4d0263bded9ad02a123ce11114ef76ac  man-pages-3.23.tar.gz
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2"
diff --git a/main/popt/APKBUILD b/main/popt/APKBUILD
index a46f218c2e..469b65bd8d 100644
--- a/main/popt/APKBUILD
+++ b/main/popt/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=popt
-pkgver=1.14
+pkgver=1.15
 pkgrel=0
 pkgdesc="A commandline option parser"
 url="http://rpm5.org"
@@ -16,4 +16,4 @@ build ()
 	make || return 1
 	make DESTDIR=$pkgdir install || return 1
 }
-md5sums="4f90a07316eb825604dd10ae4f9f3f04  popt-1.14.tar.gz"
+md5sums="c61ef795fa450eb692602a661ec8d7f1  popt-1.15.tar.gz"
diff --git a/main/python/APKBUILD b/main/python/APKBUILD
index d5d38b99ca..daefac1ae8 100644
--- a/main/python/APKBUILD
+++ b/main/python/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=python
-pkgver=2.6.2
-pkgrel=1
+pkgver=2.6.3
+pkgrel=0
 pkgdesc="A high-level scripting language"
 url="http://www.python.org"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="db expat openssl zlib ncurses uclibc"
+depends=
 makedepends="db-dev expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev !gettext"
 source="http://www.$pkgname.org/ftp/$pkgname/$pkgver/Python-$pkgver.tar.bz2
 	$pkgname-2.6-internal-expat.patch
@@ -29,5 +29,5 @@ build() {
 	make DESTDIR="$pkgdir" install
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums="245db9f1e0f09ab7e0faaa0cf7301011  Python-2.6.2.tar.bz2
+md5sums="8755fc03075b1701ca3f13932e6ade9f  Python-2.6.3.tar.bz2
 9d64df5e0a6aed149a792c7bff16e3d9  python-2.6-internal-expat.patch"
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 473b3d7192..439f24b390 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
-pkgver=3.3.7
-pkgrel=4
+pkgver=3.3.8
+pkgrel=0
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 license="GPL3"
@@ -104,7 +104,7 @@ tdb() {
 		usr/bin/tdb*
 }
 
-md5sums="bc7228cc686986353df67ff42b1b2b1e  samba-3.3.7.tar.gz
+md5sums="f4563c7dfca803c6d56a4948f0af05a8  samba-3.3.8.tar.gz
 c8a7f6ac5df2f73dbf023e25ea39927b  samba.initd
 c150433426e18261e6e3eed3930e1a76  samba.confd
 b7cafabfb4fa5b3ab5f2e857d8d1c733  samba.logrotate"
diff --git a/main/swig/APKBUILD b/main/swig/APKBUILD
index 21587995c5..3a2d470e5b 100644
--- a/main/swig/APKBUILD
+++ b/main/swig/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=swig
-pkgver=1.3.39
+pkgver=1.3.40
 pkgrel=0
 pkgdesc="SWIG is a compiler that makes it easy to integrate C and C++ code with scripting languages"
 url="http://www.swig.org/"
@@ -17,4 +17,4 @@ build ()
 	make DESTDIR="$pkgdir" install
 	install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums="ac201d1b87f8659584534f9540d7ad24  swig-1.3.39.tar.gz"
+md5sums="2df766c9e03e02811b1ab4bba1c7b9cc  swig-1.3.40.tar.gz"
diff --git a/main/sysstat/APKBUILD b/main/sysstat/APKBUILD
index 90a81b3c6b..1d3039d4aa 100644
--- a/main/sysstat/APKBUILD
+++ b/main/sysstat/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sysstat
-pkgver=9.0.4
+pkgver=9.0.5
 pkgrel=0
 pkgdesc="Performance monitoring tools for Linux"
 url="http://pagesperso-orange.fr/sebastien.godard/"
@@ -24,4 +24,4 @@ build() {
 
 }
 
-md5sums="961ff56564c1fbf9db9baa5aa4ad0ea5  sysstat-9.0.4.tar.gz"
+md5sums="767f4424f4e014c78ebeb3a6a3d4ea12  sysstat-9.0.5.tar.gz"
diff --git a/main/taglib/APKBUILD b/main/taglib/APKBUILD
index ff03066ef9..044649eafb 100644
--- a/main/taglib/APKBUILD
+++ b/main/taglib/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=taglib
-pkgver=1.5
+pkgver=1.6
 pkgrel=0
 pkgdesc="library for reading and editing the meta-data of several popular audio formats."
 url="http://ktown.kde.org/~wheeler/taglib.html"
@@ -17,4 +17,4 @@ build ()
 	make VERBOSE=1 || return 1
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz"
+md5sums="5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz"