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

12 files changed, 121 insertions, 46 deletions

diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index c498b6cb2b..5bf145613b 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgdesc="Script to build Alpine Packages"
 pkgname=abuild
-pkgver=2.12.1_git20120919
+pkgver=2.12.1_git20121002
 _ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
 url=http://git.alpinelinux.org/cgit/abuild/
 depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1 uclibc-utils
 	abuildhelper curl"
@@ -52,4 +52,4 @@ cpan() {
 }
 
 md5sums="92348750a3354c3ec7b811716543b8e5  abuild-2.12.1.tar.bz2
-896303f1bf063284ce663f6e506fdacd  abuild-git.patch"
+ec1d71201cad30c5c1a41dca2557d03b  abuild-git.patch"
diff --git a/main/abuild/abuild-git.patch b/main/abuild/abuild-git.patch
index 559be6cf7d..ea158f4132 100644
--- a/main/abuild/abuild-git.patch
+++ b/main/abuild/abuild-git.patch
@@ -1,5 +1,5 @@
 diff --git a/abuild.in b/abuild.in
-index 2780d2e..e885dd9 100755
+index 2780d2e..0bf9d47 100755
 --- a/abuild.in
 +++ b/abuild.in
 @@ -404,6 +404,9 @@ default_unpack() {
@@ -46,26 +46,69 @@ index 2780d2e..e885dd9 100755
  }
  
  # check if dir has arch specific binaries
-@@ -862,7 +862,7 @@ trace_apk_deps() {
+@@ -858,11 +858,15 @@ find_so_files() {
+ 	return 0
+ }
+ 
++subpkg_provides() {
++	grep -q -w "^$1" "$pkgbasedir"/.control.*/.provides-so 2>/dev/null
++}
++
+ trace_apk_deps() {
  	local name="$1"
  	local dir="$2"
- 	local i= j= found= autodeps= deppkgs= missing= so_paths= self_provided=
+-	local i= j= found= autodeps= deppkgs= missing= so_paths= self_provided=
 -	msg "Tracing dependencies for $name..."
++	local i= found= autodeps= deppkgs= missing=
 +	msg "Tracing dependencies..."
  	# add pkgconfig if usr/lib/pkgconfig is found
  	if [ -d "$pkgbasedir"/$name/usr/lib/pkgconfig ] \
  			&& ! grep -q '^depend = pkgconfig' "$dir"/.PKGINFO; then
-@@ -880,7 +880,7 @@ trace_apk_deps() {
- 		found=
- 		# first check if its provide by same apkbuild
- 		for j in "$dir"/../.control.*/.provides-so; do
+@@ -877,18 +881,11 @@ trace_apk_deps() {
+ 		msg "  added libgcc (due to libpthread)"
+ 	fi
+ 	[ -f "$dir"/.needs-so ] && for i in $(cat "$dir"/.needs-so); do
+-		found=
+-		# first check if its provide by same apkbuild
+-		for j in "$dir"/../.control.*/.provides-so; do
 -			grep -w "$i" "$j" >/dev/null || continue
-+			grep -q -w "^$i" "$j" || continue
- 			found=${j%/.provides-so}
- 			found=${found##*/.control.}
- 			break
-@@ -911,26 +911,113 @@ trace_apk_deps() {
+-			found=${j%/.provides-so}
+-			found=${found##*/.control.}
+-			break
+-		done
+-		if [ -n "$found" ]; then
+-			if ! list_has "$found" $self_provided; then
+-				self_provided="$self_provided $found"
+-			fi
++		# first check if its provided by same apkbuild
++		grep -q -w "^$i" "$dir"/.provides-so 2>/dev/null && continue
++
++		if subpkg_provides "$i" || $APK info -q -e "so:$i"; then
++			autodeps="$autodeps so:$i"
+ 		else
+ 			missing="$missing $i"
  		fi
+@@ -896,41 +893,131 @@ trace_apk_deps() {
+ 
+ 	# find all packages that holds the so files
+ 	if [ -f "$dir"/.rpaths ]; then
+-		so_files=$(find_so_files "$dir"/.rpaths $missing) || return 1
++		local so_files=$(find_so_files "$dir"/.rpaths $missing) \
++			|| return 1
+ 		deppkgs=$($APK info -q -W $so_files) || return 1
+ 	fi
+ 
+-	for found in $self_provided $deppkgs; do
++	for found in $deppkgs; do
+ 		if grep -w "^depend = ${found}$" "$dir"/.PKGINFO >/dev/null ; then
+ 			warning "You can remove '$found' from depends"
+ 			continue
+ 		fi
+-		if [ "$found" != "$name" ] && ! list_has "$found" $autodeps; then
+-			autodeps="$autodeps $found"
+-			msg "  added $found"
+-		fi
++		autodeps="$autodeps $found"
  	done
  
 -	[ -z "$autodeps" ] && return 0
@@ -76,10 +119,13 @@ index 2780d2e..e885dd9 100755
 +	fi
 +	[ -z "$autodeps" ] && return 0
  	for i in $autodeps; do
- 		echo "depend = $i" >> "$dir"/.PKGINFO
- 	done
- }
- 
+-		echo "depend = $i" >> "$dir"/.PKGINFO
++		echo "depend = $i"
++	done | sort -u >> "$dir"/.PKGINFO
++	# display all depends
++	sed -n '/^depend =/s/depend = /\t/p' "$dir"/.PKGINFO >&2
++}
++
 +find_scanelf_paths() {
 +	local datadir="$1"
 +	local paths="$datadir/lib:$datadir/usr/lib" i= rpaths=
@@ -97,7 +143,7 @@ index 2780d2e..e885dd9 100755
 +			fi
 +			unset IFS
 +		done < "$rpaths"
-+	done
+ 	done
 +	echo "$paths"
 +}
 +
@@ -135,7 +181,10 @@ index 2780d2e..e885dd9 100755
 +			# filter out sonames with version when file does not
 +			# have version
 +			case "$soname" in
-+			*.so.[0-9]*) continue;;
++			*.so.[0-9]*)
++				if options_has "sover-namecheck"; then
++					continue
++				fi
 +			esac
 +			;;
 +		esac
@@ -151,8 +200,8 @@ index 2780d2e..e885dd9 100755
 +		grep -q -w "^$i" "$controldir"/.provides-so \
 +			|| echo $i
 +	done > "$controldir"/.needs-so
-+}
-+
+ }
+ 
  create_apks() {
 -	local file
 +	local file= dir= name= ver= apk= datadir=
diff --git a/main/flashrom/APKBUILD b/main/flashrom/APKBUILD
index c923507115..8c7735d7d3 100644
--- a/main/flashrom/APKBUILD
+++ b/main/flashrom/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: 
 # Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
 pkgname=flashrom
-pkgver=0.9.5.2
+pkgver=0.9.6.1
 pkgrel=0
 pkgdesc="A utility for identifying, reading, writing, verifying and erasing flash chips"
 url="http://www.flashrom.org/Flashrom"
@@ -30,4 +30,4 @@ package() {
 	make PREFIX="$pkgdir/usr/" install  
 }
 
-md5sums="280f8b1d3ef0533d6ec913b0da857477  flashrom-0.9.5.2.tar.bz2"
+md5sums="407e836c0a2b17ec76583cb6809f65e5  flashrom-0.9.6.1.tar.bz2"
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 2b7b747c96..9a6da11d03 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gcc
-pkgver=4.7.1
+pkgver=4.7.2
 _piepatchver=0.5.3
 _specs_ver=0.2.0
 _specs_gcc_ver=4.4.3
@@ -87,7 +87,7 @@ prepare() {
 	# thanks to Zorry for hard work on those patches
 	for i in "$srcdir"/piepatch/*.patch; do
 		msg "Applying $i"
-		patch -p0 -i $i || patch -p1 -i $i || return 1
+		patch -t -p0 -i $i || patch -t -p1 -i $i || return 1
 	done
 
 	# Gentoo and uclibc patches
@@ -397,7 +397,7 @@ gfortran() {
 		"$subpkgdir"/$gcclibs
 }
 
-md5sums="933e6f15f51c031060af64a9e14149ff  gcc-4.7.1.tar.bz2
+md5sums="cc308a0891e778cfda7a151ab8a6e762  gcc-4.7.2.tar.bz2
 2e1d99664efcdbd86549a40ddf37d405  gcc-4.7.1-piepatches-v0.5.3.tar.bz2
 441c76504e1d97170117c294e65c7a72  gcc-4.4.3-specs-0.2.0.tar.bz2
 d7cd6a27c8801e66cbaa964a039ecfdb  ecj-latest.jar
@@ -413,7 +413,7 @@ f24f07ed008324eaecb0f75417c99116  74_all_gcc47_cloog-dl.patch
 a695d7648509b4f8e18b389a19e6037c  gcc-spec-env.patch
 ab83248e10b2bf4b3d9240de0fefb52b  pt_gnu_eh_frame.patch
 6cc2385c5bbd6d0da6eaedd53c8bf547  uclibc-getipinfo.patch
-3d8131bdfa70e51be4ae186114097173  gcc-4.7-dynamic-linker.patch
+ac11128f201ee00287f8852697cb86a6  gcc-4.7-dynamic-linker.patch
 32e8e4c0e23ed8f5de95a591cb30f1da  gcc-4.6-pr32219.patch
 2c6cb49bb9bfd8b6e690222e66ccc901  boehem-gc-uclibc.patch
 94c36cc724f5c5d6c8cb8650195ee83d  gcc-pure64.patch
diff --git a/main/gcc/gcc-4.7-dynamic-linker.patch b/main/gcc/gcc-4.7-dynamic-linker.patch
index 3dbc4d7e98..7fe57a49ff 100644
--- a/main/gcc/gcc-4.7-dynamic-linker.patch
+++ b/main/gcc/gcc-4.7-dynamic-linker.patch
@@ -161,10 +161,10 @@ index dbbeea5..0147ece 100644
  #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
  #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
  #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
-@@ -104,3 +104,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- /* Whether we have sincos that follows the GNU extension.  */
- #undef TARGET_HAS_SINCOS
- #define TARGET_HAS_SINCOS (OPTION_GLIBC || OPTION_BIONIC)
+@@ -107,3 +107,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ /* Whether we have Bionic libc runtime */
+ #undef TARGET_HAS_BIONIC
+ #define TARGET_HAS_BIONIC (OPTION_BIONIC)
 +
 +#ifdef NOSTDINC
 +#undef STANDARD_INCLUDE_DIR
diff --git a/main/libbluray/APKBUILD b/main/libbluray/APKBUILD
index bcc107623e..78b608d552 100644
--- a/main/libbluray/APKBUILD
+++ b/main/libbluray/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=libbluray
-pkgver=0.2.1
+pkgver=0.2.2
 pkgrel=0
 pkgdesc="a library designed for Blu-Ray Discs playback"
 url="http://www.videolan.org/developers/libbluray.html"
@@ -42,4 +42,4 @@ package() {
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="d4cfcf3f110e9d2afe01d29feb8c842b  libbluray-0.2.1.tar.bz2"
+md5sums="cb3254de43276861ea6b07c603f4651c  libbluray-0.2.2.tar.bz2"
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD
index 06edd5de81..bb0fc08c6a 100644
--- a/main/libc0.9.32/APKBUILD
+++ b/main/libc0.9.32/APKBUILD
@@ -4,18 +4,21 @@ pkgname=libc$_abiver
 _gitver=
 pkgver=0.9.33.2
 _ver=${pkgver/_/-}
-pkgrel=9
+pkgrel=10
 pkgdesc="C library for developing embedded Linux systems"
 url=http://uclibc.org
 license="LGPL-2"
 arch="all"
 options=
 makedepends="linux-headers"
-subpackages="uclibc-dev:dev uclibc-utils:utils libthread_db"
+# libc subpackage must be last
+subpackages="uclibc-dev:dev uclibc-utils:utils libthread_db libpthread libc"
 depends_dev="linux-headers=>2.6.32"
 replaces=uclibc
+depends="libpthread libc"
 options="!strip"
 triggers="uclibc-utils.trigger=/lib:/usr/lib"
+ldpath="/lib"
 
 _snapurl="http://git.uclibc.org/uClibc/snapshot/master.tar.bz2"
 _snapfile="$pkgname-$pkgver.tar.bz2"
@@ -130,6 +133,7 @@ dev() {
 utils() {
 	pkgdesc="uClibc utility programs"
 	replaces="uclibc $pkgname"
+	depends=
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/sbin
 	mv "$pkgdir"/sbin/* "$subpkgdir"/sbin/
 	mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/
@@ -137,10 +141,29 @@ utils() {
 
 libthread_db() {
 	pkgdesc="uClibc thread debugging library"
+	depends=
 	mkdir -p "$subpkgdir"/lib
 	mv "$pkgdir"/lib/libthread_db* "$subpkgdir"/lib/
 }
 
+libpthread() {
+	pkgdesc="uClibc threading and realtime libraries"
+	replaces="libc0.9.32"
+	depends=
+	mkdir -p "$subpkgdir"/lib
+	mv "$pkgdir"/lib/libpthread* \
+		"$pkgdir"/lib/librt* \
+		"$subpkgdir"/lib/
+}
+
+libc() {
+	pkgdesc="uClibc standard C libraries"
+	replaces="libc0.9.32"
+	depends=
+	mkdir -p "$subpkgdir"/lib
+	mv "$pkgdir"/lib/* "$subpkgdir"/lib/
+}
+
 md5sums="73e6fe215648d02246f4d195b25fb17e  uClibc-0.9.33.2.tar.xz
 d4c8fb190eb4327453ed924159ca432e  0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch
 f9c9de09da5eade2fb9dff8f9f8b3fc9  0002-resolv-res_query-for-CNAMEs.patch
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
index 4f03b03ad1..29e644f7b1 100644
--- a/main/libvirt/APKBUILD
+++ b/main/libvirt/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=libvirt
-pkgver=0.10.1
+pkgver=0.10.2
 pkgrel=0
 pkgdesc="A virtualization API for several hypervisor and container systems"
 url="http://libvirt.org/"
@@ -32,7 +32,9 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--libexec=/usr/lib/"$pkgname"
+		--libexec=/usr/lib/"$pkgname" \
+		--without-libxl \
+		|| return 1
 	make || return 1
 }
 
@@ -44,6 +46,6 @@ package() {
 	install -D -m755 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirtd
 }
 
-md5sums="5f628e53437b0b0e78477904ba3310af  libvirt-0.10.1.tar.gz
+md5sums="a5e50860d9da238ba270b528411c4a0d  libvirt-0.10.2.tar.gz
 1c84a7baeafe0a7f4e9d7ae5180311b7  libvirt.confd
 7067215010da2d7282d878ba43070c5d  libvirt.initd"
diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD
index 2478a1286e..3b5647a124 100644
--- a/main/openjdk6/APKBUILD
+++ b/main/openjdk6/APKBUILD
@@ -9,6 +9,7 @@ url="http://icedtea.classpath.org/"
 arch="x86 x86_64"
 license="GPL-2 with Classpath"
 depends="$pkgname-jre"
+options="sover-namecheck"
 makedepends="java-gcj-compat findutils tar zip paxctl gawk pkgconfig util-linux-ng
 	     autoconf automake nss-dev cups-dev jpeg-dev giflib-dev libpng-dev libxt-dev
 	     libxp-dev libxtst-dev libxinerama-dev libiconv-dev
diff --git a/main/pciutils/APKBUILD b/main/pciutils/APKBUILD
index dc5dd5ee9b..78cf546c25 100644
--- a/main/pciutils/APKBUILD
+++ b/main/pciutils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=pciutils
-pkgver=3.1.9
+pkgver=3.1.10
 pkgrel=0
 pkgdesc="PCI bus configuration space access library and tools"
 url="http://mj.ucw.cz/pciutils.html"
@@ -38,4 +38,4 @@ package() {
 
 }
 
-md5sums="11f518d80d764e3e146a6eb92265bcdb  pciutils-3.1.9.tar.gz"
+md5sums="51ded74e4184d4a6c9f2ada95c28c067  pciutils-3.1.10.tar.gz"
diff --git a/main/py-irc/APKBUILD b/main/py-irc/APKBUILD
index 98df495240..d94a16b33a 100644
--- a/main/py-irc/APKBUILD
+++ b/main/py-irc/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=py-irc
-pkgver=2.0.1
+pkgver=3.0.1
 pkgrel=0
 pkgdesc="python irc client library"
 url="http://python-irclib.sourceforge.net/"
@@ -12,7 +12,7 @@ depends_dev="python"
 makedepends="$depends_dev py-hgtools"
 install=""
 subpackages=""
-source="http://downloads.sourceforge.net/project/python-irclib/irc-$pkgver.zip"
+source="http://pypi.python.org/packages/source/i/irc/irc-${pkgver}.zip"
 
 _builddir="$srcdir"/irc-$pkgver
 prepare() {
@@ -35,4 +35,4 @@ package() {
 	python setup.py install --prefix=/usr --root="$pkgdir" || return 1
 }
 
-md5sums="f5db5cfe6508042bb2bb0f393d2f71dd  irc-2.0.1.zip"
+md5sums="d69203c3d92867a99d669339f0ec87cb  irc-3.0.1.zip"
diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD
index bdcd517c52..1340d0f5eb 100644
--- a/main/zlib/APKBUILD
+++ b/main/zlib/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zlib
 pkgver=1.2.7
-pkgrel=0
+pkgrel=1
 pkgdesc="A compression/decompression Library"
 arch="all"
 license=custom:zlib