Merge git://github.com/Barthalion/aports

16 files changed, 118 insertions, 38 deletions

diff --git a/main/bitlbee/APKBUILD b/main/bitlbee/APKBUILD
index 21c46006e..a2e3d9d8c 100644
--- a/main/bitlbee/APKBUILD
+++ b/main/bitlbee/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 pkgname=bitlbee
-pkgver=3.0.5
-pkgrel=1
+pkgver=3.0.6
+pkgrel=0
 pkgdesc="An IRC to other chat networks gateway"
 url="http://www.bitlbee.org/"
 arch="all"
@@ -53,6 +53,6 @@ otr() {
     mv "$pkgdir"/usr/lib/bitlbee "$subpkgdir"/usr/lib
 }
 
-md5sums="9ff97260a2a7f3a7d102db158a8d9887  bitlbee-3.0.5.tar.gz
+md5sums="0ab9c9159bd9bac9210fdb5d2f66448a  bitlbee-3.0.6.tar.gz
 7c3f5a9c5b25b425e87ff38abc44282d  bitlbee.initd
 bf07d39a4b652c63415b411229c5e281  bitlbee.confd"
diff --git a/main/duplicity/APKBUILD b/main/duplicity/APKBUILD
index a918037f7..05f983001 100644
--- a/main/duplicity/APKBUILD
+++ b/main/duplicity/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
 # Maintainer:  Matt Smith <mcs@darkregion.net>
 pkgname=duplicity
-pkgver=0.6.18
+pkgver=0.6.20
 pkgrel=0
 pkgdesc="Encrypted bandwidth-efficient backup using the rsync algorithm"
 url="http://duplicity.nongnu.org/"
@@ -30,4 +30,4 @@ package() {
 	python setup.py install --root "$pkgdir"
 }
 
-md5sums="66b5e64de43e09d3c3ff9890faf9de07  duplicity-0.6.18.tar.gz"
+md5sums="83a56c4c17fc50961c961943867deae4  duplicity-0.6.20.tar.gz"
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index 777e62bb6..2c799afee 100644
--- a/main/ffmpeg/APKBUILD
+++ b/main/ffmpeg/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ffmpeg
-pkgver=1.0
-pkgrel=2
+pkgver=1.0.1
+pkgrel=0
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 url="http://ffmpeg.org/"
 arch="all"
@@ -68,5 +68,5 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
 }
 
-md5sums="3ed526cea20c1bffb5a37f7730f710bd  ffmpeg-1.0.tar.bz2
+md5sums="dbbb88ce5525dea22b24aaa098a9bcc2  ffmpeg-1.0.1.tar.bz2
 2cdc11a99bf97c63c7cca27b073cb47c  configure-dlvsym.patch"
diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD
index ae75d3358..0b1356ac6 100644
--- a/main/icu/APKBUILD
+++ b/main/icu/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=icu
-pkgver=49.1.2
+pkgver=50.1
 
 # convert x.y.z to x_y_z
 _ver=${pkgver//./_}
@@ -62,5 +62,5 @@ libs() {
 	replaces="icu"
 }
 
-md5sums="bbc609fe5237202d7abf016141012a45  icu4c-49_1_2-src.tgz
+md5sums="cf7bf9e56aa6c2057a8b6f464046483e  icu4c-50_1-src.tgz
 70aabd2c1e14477cfa261e729ffd7054  icu-timezone-uclibc.patch"
diff --git a/main/libnice/APKBUILD b/main/libnice/APKBUILD
index 9e4bc2c77..e0f569034 100644
--- a/main/libnice/APKBUILD
+++ b/main/libnice/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnice
-pkgver=0.1.2
+pkgver=0.1.3
 pkgrel=0
 pkgdesc="GLib ICE implementation"
 url="http://nice.freedesktop.org/wiki/"
@@ -43,4 +43,4 @@ package() {
 		"$pkgdir"/usr/lib/gstream*/*.la 
 }
 
-md5sums="1914dd98380dd68632d3d448cc23f1e8  libnice-0.1.2.tar.gz"
+md5sums="1a0907605f852dcda32a3b3daf38d36c  libnice-0.1.3.tar.gz"
diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD
index fb3953a35..b7d76bd0d 100644
--- a/main/mc/APKBUILD
+++ b/main/mc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mc
-pkgver=4.8.1.5
+pkgver=4.8.6
 pkgrel=0
 pkgdesc="A filemanager/shell that emulates Norton Commander"
 url="http://www.ibiblio.org/mc/"
@@ -41,4 +41,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="2294c871aecaf483ad445db290cd1099  mc-4.8.1.5.tar.bz2"
+md5sums="323706aa5e77698bed7b0b6faa7c1530  mc-4.8.6.tar.bz2"
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 2444174a8..e10b4e20c 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=php
-pkgver=5.3.18
+pkgver=5.3.19
 _suhosinver=5.3.9-0.9.10
 pkgrel=0
 pkgdesc="The PHP language runtime engine"
@@ -436,7 +436,7 @@ mssql()		{ _mv_ext mssql; }
 pdo_dblib()	{ _mv_ext pdo_dblib "php-pdo freetds"; }
 wddx()		{ _mv_ext wddx; }
 
-md5sums="52539c19d0f261560af3c030143dfa8f  php-5.3.18.tar.bz2
+md5sums="e1d2a3ec7849d4b3032bd1abf1916aa4  php-5.3.19.tar.bz2
 c099b3d7eac95018ababd41ded7f3066  suhosin-patch-5.3.9-0.9.10.patch.gz
 5111e3be06d391f8772587c675240fab  php-install-pear-xml.patch
 9ab162ff3428511a68aa9801c746e0d5  php-fpm.initd
diff --git a/main/scons/APKBUILD b/main/scons/APKBUILD
index 5aa6abd18..1e0e6184c 100644
--- a/main/scons/APKBUILD
+++ b/main/scons/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=scons
-pkgver=2.1.0
-pkgrel=1
+pkgver=2.2.0
+pkgrel=0
 pkgdesc="scons software construction system"
 url="http://www.scons.org/"
 arch="noarch"
@@ -23,4 +23,4 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="47daf989e303a045b76c11236df719df  scons-2.1.0.tar.gz"
+md5sums="f737f474a02d08156c821bd2d4d4b632  scons-2.2.0.tar.gz"
diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD
index 488f45a2f..e33b724b9 100644
--- a/main/sqlite/APKBUILD
+++ b/main/sqlite/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=sqlite
-pkgver=3.7.14.1
+pkgver=3.7.15
 _a=${pkgver%%.*}
 _b=${pkgver#${_a}.}
 _b=${_b%%.*}
@@ -83,5 +83,5 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
 }
 
-md5sums="4cf3fd434bbb6e50777019ff3507bfa5  sqlite-autoconf-3071401.tar.gz
+md5sums="0d2a2d27b56ac73d49db76dcb6b4619c  sqlite-autoconf-3071500.tar.gz
 c1cdbc5544034d9012e421e75a5e4890  license.txt"
diff --git a/main/swig/APKBUILD b/main/swig/APKBUILD
index c94ed9204..2f9a30b59 100644
--- a/main/swig/APKBUILD
+++ b/main/swig/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=swig
-pkgver=2.0.8
+pkgver=2.0.9
 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/"
@@ -21,4 +21,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 	install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums="69f917e870efc0712c06ab53217b28d1  swig-2.0.8.tar.gz"
+
+md5sums="54d534b14a70badc226129159412ea85  swig-2.0.9.tar.gz"
diff --git a/main/tcl/APKBUILD b/main/tcl/APKBUILD
index fcb7deb81..9a4dec4f1 100644
--- a/main/tcl/APKBUILD
+++ b/main/tcl/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=tcl
-pkgver=8.5.12
+pkgver=8.5.13
 pkgrel=0
 pkgdesc="The Tcl scripting language"
 url="http://tcl.sourceforge.net/"
@@ -35,4 +35,4 @@ package() {
         -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib'," \
         "${pkgdir}"/usr/lib/tclConfig.sh
 }
-md5sums="174b2b4c619ba8f96875d8a051917703  tcl8.5.12-src.tar.gz"
+md5sums="fa3a9bf9b2d6ed2431f1baa46f4058b8  tcl8.5.13-src.tar.gz"
diff --git a/main/varnish/APKBUILD b/main/varnish/APKBUILD
index e2236b1bd..6f61360d9 100644
--- a/main/varnish/APKBUILD
+++ b/main/varnish/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=varnish
-pkgver=3.0.2
-pkgrel=7
+pkgver=3.0.3
+pkgrel=0
 pkgdesc="High-performance HTTP accelerator"
 url="http://www.varnish-cache.org/"
 arch="all"
@@ -15,7 +15,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="http://repo.varnish-cache.org/source/varnish-$pkgver.tar.gz
 	varnishd.initd
 	varnishd.confd
-	varnishd.logrotate"
+	varnishd.logrotate
+	varnish-3.0.3-pthread-uclibc.patch"
 
 _builddir="$srcdir"/varnish-$pkgver
 prepare() {
@@ -59,7 +60,8 @@ libs() {
 	mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir"/usr/lib/
 }
 
-md5sums="c8eae0aabbe66b6daabdf3a1f58cd47a  varnish-3.0.2.tar.gz
+md5sums="714310c83fdbd2061d897dacd3f63d8b  varnish-3.0.3.tar.gz
 4f78964bf3eb6f1fd0fd2d533575982e  varnishd.initd
 6dd289ba81464eacc238109143126d6a  varnishd.confd
-a6cb8a43c9465699cf956dc992998225  varnishd.logrotate"
+a6cb8a43c9465699cf956dc992998225  varnishd.logrotate
+8c5532869bea7f668e2ce5d4585359f8  varnish-3.0.3-pthread-uclibc.patch"
diff --git a/main/varnish/varnish-3.0.3-pthread-uclibc.patch b/main/varnish/varnish-3.0.3-pthread-uclibc.patch
new file mode 100644
index 000000000..93f3da3f8
--- /dev/null
+++ b/main/varnish/varnish-3.0.3-pthread-uclibc.patch
@@ -0,0 +1,35 @@
+Refine header check in bin/varnishd/mgt/mgt.h, mgt_main.c for uClibc
+
+Because of the difference in how uClibc and glibc stack their header
+files, stdio.h indirectly brings in PTHREAD_CANCELED from pthread.h
+on a uClibc system, whereas it does not on a glibc system.  This happens
+in mgt.h and mgt_main.c.  This patch refines the check in those files
+to take this fact into consideration.
+
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/444294
+---
+
+diff --git a/bin/varnishd/mgt.h b/bin/varnishd/mgt.h
+index 905fbcc..5d3ab09 100644
+--- a/bin/varnishd/mgt.h
++++ b/bin/varnishd/mgt.h
+@@ -126,6 +126,6 @@ extern unsigned mgt_vcc_unsafe_path;
+ 		syslog(pri, fmt, __VA_ARGS__);		\
+ 	} while (0)
+ 
+-#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT)
++#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT)
+ #error "Keep pthreads out of in manager process"
+ #endif
+diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c
+index 1b7f1e3..dce42d9 100644
+--- a/bin/varnishd/varnishd.c
++++ b/bin/varnishd/varnishd.c
+@@ -656,6 +656,6 @@ main(int argc, char * const *argv)
+ 	exit(exit_status);
+ }
+ 
+-#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT)
++#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT)
+ #error "Keep pthreads out of in manager process"
+ #endif
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index fa2f03b1a..c588c9226 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vim
-pkgver=7.3.712
+pkgver=7.3.754
 _srcver=${pkgver%.*}
 _patchver=${pkgver##*.}
 pkgrel=0
@@ -773,4 +773,46 @@ c3988f2feac4f893f3a1ec933a504bdf  7.3.709
 2c7895a305d50f2ea640df9bffe73c33  7.3.710
 3536102ddedcc5412bc6bd347dead877  7.3.711
 53e0c374077627a7dc14acfd656e2b8d  7.3.712
+964b33d3a08aca14c308548f7e196d8b  7.3.713
+f073950bc171acde05e46eeff5b1d188  7.3.714
+c30b3382b17a476f8e4515079b821879  7.3.715
+f7175afb792a76dfe637620127254389  7.3.716
+0d5dd059ef01650364638df7fdf71aa6  7.3.717
+b677364d9169cee792d6d1a5ce018f37  7.3.718
+a8cc9678c21aaa3a3df47fa49ea1d19b  7.3.719
+d158ea2c0180c3a2a78e3e4f852259c9  7.3.720
+49e4ee8774f421bd7c686c10b6cdd16b  7.3.721
+d4275057101d6d3d0d7ebf907577d2a2  7.3.722
+a8050ec35042e9fd51475fd1048bf54b  7.3.723
+1c7ba44c19b1775722678a54e008b20c  7.3.724
+1dd2c402290b87d89ee4b130694a8f9c  7.3.725
+585b01a15ed8f8b63d40c62c75b9d5cb  7.3.726
+ab89149d96d541346fafabe621ef4885  7.3.727
+8c98d6b2ecd613c84560a2856051ee91  7.3.728
+0d6e1d700d8aea1cb98d918691395c1e  7.3.729
+6884a0da581af8ca961439fba8d5d01e  7.3.730
+d990f67daf2bff5b87717d98ff0ca00f  7.3.731
+a5000fa5de2a7fecb2953e2449b93d56  7.3.732
+b9ab33bb195ed0ba2ee2417b9d0228d6  7.3.733
+50bdbfc91cd20e75090706b50281d2cf  7.3.734
+72f6e57958c416181e6748a339eef726  7.3.735
+fdfe9a8e4d0c3573238bbee3ec5836ad  7.3.736
+0c16ec0aba22fd3086007b8ebc454f8f  7.3.737
+41a709ad15a1dfb5e1405fb2e618f173  7.3.738
+61d956ac3c674b930675160f69330483  7.3.739
+6775625a4b05ac2b196889aab109480e  7.3.740
+616970ab5f892ae1f51fb5d0978d926e  7.3.741
+d039389c4766620b6044153af4504f8d  7.3.742
+ed6127482dfe469d338e9ee18f891d20  7.3.743
+cb1a7c02db2a2bc3ae96ab16cd888c8f  7.3.744
+b82e0fa1508b03c84c72d3a44dff1237  7.3.745
+fa4a781e41f0fd01350eb9ad49369794  7.3.746
+dc9750b1b3e2d8188dbfb4a1ca145c87  7.3.747
+ad5b7f392d113743b73f5043b92b85e2  7.3.748
+9663888372ff6e9a3959abe4f3d527c3  7.3.749
+adbe0502203063e5d1059563dc8aa429  7.3.750
+8b6104f0f3361f7d5ebb4734c3dc9d7e  7.3.751
+d2851c26bb5efe3f44b0436a4c295e06  7.3.752
+8c22baf96c2fd9db61a87ff3923d02f8  7.3.753
+a091a2e3d05932de13be54442bf6548d  7.3.754
 97aecde2ab504e543a96bec84b3b5638  vimrc"
diff --git a/main/wxgtk/APKBUILD b/main/wxgtk/APKBUILD
index f65866e70..9aa416719 100644
--- a/main/wxgtk/APKBUILD
+++ b/main/wxgtk/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wxgtk
-pkgver=2.8.12
-pkgrel=2
+pkgver=2.8.12.1
+pkgrel=0
 pkgdesc="GTK2 port of the wxWidgets GUI library"
 url="http://www.wxwidgets.org/"
 arch="all"
@@ -13,9 +13,9 @@ depends_dev="gtk+2.0-dev zlib-dev tiff-dev libpng-dev libjpeg-turbo-dev
 makedepends="$depends_dev sdl-dev gst-plugins-base-dev gstreamer-dev gconf-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-lang $pkgname-media wxbase"
-source="http://downloads.sourceforge.net/wxwindows/wxGTK-$pkgver.tar.bz2"
+source="http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2"
 
-_builddir="$srcdir"/wxGTK-$pkgver
+_builddir="$srcdir"/wxPython-src-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
@@ -69,4 +69,4 @@ wxbase() {
 		"$subpkgdir"/usr/lib/
 }
 
-md5sums="08f81ab60647308058f6ce99712b14f8  wxGTK-2.8.12.tar.bz2"
+md5sums="8c06c5941477beee213b4f2fa78be620  wxPython-src-2.8.12.1.tar.bz2"
diff --git a/main/xmlrpc-c/APKBUILD b/main/xmlrpc-c/APKBUILD
index 9a92f6410..75d7b5786 100644
--- a/main/xmlrpc-c/APKBUILD
+++ b/main/xmlrpc-c/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xmlrpc-c
-pkgver=1.16.42
+pkgver=1.16.44
 pkgrel=0
 pkgdesc="This library provides a modular implementation of XML-RPC for C and C++"
 url="http://xmlrpc-c.sourceforge.net/"
@@ -52,5 +52,5 @@ cxx() {
 	mv "$pkgdir"/usr/lib/*++* "$subpkgdir"/usr/lib/
 }
 
-md5sums="b88542b4b9108833e27d6e51efe1f83f  xmlrpc-c-1.16.42.tgz
+md5sums="de3197ef5e1a6dc3265ad407fb1651c6  xmlrpc-c-1.16.44.tgz
 101c2224b2338247097f96b03e206261  xmlrpc-c-curl.patch"