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

8 files changed, 27 insertions, 30 deletions

diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 9ebad089e6..b32a989ea4 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.4.10
+pkgver=6.7.5.6
 _abiver=5
 _pkgver=${pkgver%.*}-${pkgver##*.}
 pkgrel=0
@@ -63,4 +63,4 @@ _cxx() {
 	mv "$pkgdir"/usr/lib/libMagick++.so.* "$subpkgdir"/usr/lib/
 }
 
-md5sums="dfe9c60b7f2e3b0f687dae9253550319  ImageMagick-6.7.4-10.tar.xz"
+md5sums="dc9f1cc4ef2517099d0fbc592a19543f  ImageMagick-6.7.5-6.tar.xz"
diff --git a/main/kmod/APKBUILD b/main/kmod/APKBUILD
index 463953cb94..d18d2f0b32 100644
--- a/main/kmod/APKBUILD
+++ b/main/kmod/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kmod
-pkgver=4
-pkgrel=1
+pkgver=5
+pkgrel=0
 pkgdesc="Linux kernel module management utilities"
 url="http://git.profusion.mobi/cgit.cgi/kmod.git/"
 arch="all"
@@ -48,4 +48,4 @@ libs() {
 	mv "$pkgdir"/lib "$subpkgdir"/
 }
 
-md5sums="e14450a066a48accd0af1995b3c0232d  kmod-4.tar.xz"
+md5sums="b271c2ec54aba1c67bda63c8579d8c15  kmod-5.tar.xz"
diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD
index b52c56e5d3..d2ca4a45d5 100644
--- a/main/llvm/APKBUILD
+++ b/main/llvm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=llvm
 pkgver=2.9
-pkgrel=3
+pkgrel=4
 pkgdesc="low level virtual machine compiler system"
 arch="x86 x86_64"
 url="http://llvm.org/"
@@ -89,4 +89,4 @@ libs() {
 
 md5sums="793138412d2af2c7c7f54615f8943771  llvm-2.9.tgz
 634de18d04b7a4ded19ec4c17d23cfca  clang-2.9.tgz
-9aff59aadf89e56e173fa7be011915f1  clang-2.9-alpine-linux.patch"
+6ca9d6b9706ab4e04d976c25e72952dd  clang-2.9-alpine-linux.patch"
diff --git a/main/llvm/clang-2.9-alpine-linux.patch b/main/llvm/clang-2.9-alpine-linux.patch
index f173994ce7..f53aee4b92 100644
--- a/main/llvm/clang-2.9-alpine-linux.patch
+++ b/main/llvm/clang-2.9-alpine-linux.patch
@@ -38,7 +38,7 @@
    }
  
 -  const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-+  const char* GccVersions[] = {"4.6.1", "4.6.0",
++  const char* GccVersions[] = {"4.6.3", "4.6.2", "4.6.1", "4.6.0",
 +                               "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
                                 "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
                                 "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD
index 66736d2ae2..0fdad05769 100644
--- a/main/lvm2/APKBUILD
+++ b/main/lvm2/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lvm2
-pkgver=2.02.90
+pkgver=2.02.91
 pkgrel=0
 pkgdesc="Logical Volume Manager 2 utilities"
 url="http://sourceware.org/lvm2/"
@@ -58,6 +58,6 @@ libs() {
 	mv "$pkgdir"/lib/liblvm2*.so.* "$subpkgdir"/lib/
 }
 
-md5sums="56ca3f2c818d56dc6563fc36a8b6f1d5  LVM2.2.02.90.tgz
+md5sums="03ed8dc20c3a65079aedcedc0ec33192  LVM2.2.02.91.tgz
 6f65f902cf19f144a42b8d6aceadf395  lvm.initd
 ec36d5fe4561220304e406c5c797e71f  lvm.confd"
diff --git a/main/squark/APKBUILD b/main/squark/APKBUILD
index d854bf473a..68450cd718 100644
--- a/main/squark/APKBUILD
+++ b/main/squark/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=squark
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=0
 pkgdesc="Squark - Squid User Authentication and Rating Kit"
 subpackages=
@@ -35,4 +35,4 @@ package() {
 	make FULL_VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir" install
 }
 
-md5sums="080c09d61784d00aeb414db36b7e37bd  squark-0.4.1.tar.bz2"
+md5sums="92eed4d7e45d0f68895514a076caeaf6  squark-0.4.2.tar.bz2"
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index 0fe61ee06d..0ec727ecf8 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xen
 pkgver=4.1.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Xen hypervisor"
 url="http://www.xen.org/"
 arch="x86 x86_64"
@@ -91,6 +91,6 @@ b973dc1ffcc6872e222b36f3b7b4836b  fix_bswap_blktap2.patch
 a7500c42804abdf68e051dc667e65f93  pygrub_alpine.patch
 fa06495a175571f4aa3b6cb88937953e  librt.patch
 1bea3543ddc712330527b62fd9ff6520  busybox-sed.patch
-4cf88b53f8ca8d99ad52bae419b620a7  xencommons.initd
+62b3c5a7cff38c12df2de89af5d83fa1  xencommons.initd
 b5bfc08b82bc0d21193714719a719798  xend.initd
 86e7923383a906404da321d1814657e9  xendomains.initd"
diff --git a/main/xen/xencommons.initd b/main/xen/xencommons.initd
index 3d3c5da387..7543cae3a5 100644..100755
--- a/main/xen/xencommons.initd
+++ b/main/xen/xencommons.initd
@@ -18,22 +18,6 @@ if ! test -d /proc/xen ; then
 	exit 0
 fi
 
-# mount xenfs in dom0 or domU with a pv_ops kernel
-if test "x$1" = xstart && \
-	! test -f /proc/xen/capabilities && \
-	! grep '^xenfs ' /proc/mounts >/dev/null;
-then
-	mount -t xenfs xenfs /proc/xen
-fi
-
-# run this script only in dom0:
-# no capabilities file in xenlinux domU kernel
-# empty capabilities file in pv_ops domU kernel
-if test -f /proc/xen/capabilities && \
-   ! grep -q "control_d" /proc/xen/capabilities ; then
-	exit 0
-fi
-
 depend() {
 	need udev
 	before xend
@@ -48,6 +32,19 @@ start() {
 	modprobe evtchn 2>/dev/null
 	modprobe gntdev 2>/dev/null
 
+	# mount xenfs in dom0 or domU with a pv_ops kernel
+	if ! test -f /proc/xen/capabilities && \
+	   ! grep '^xenfs ' /proc/mounts >/dev/null;
+	then
+		mount -t xenfs xenfs /proc/xen
+	fi
+
+	# assert we are running in the dom0
+	if test -f /proc/xen/capabilities && \
+	   ! grep -q "control_d" /proc/xen/capabilities ; then
+		exit 0
+	fi
+
 	if ! `xenstore-read -s / >/dev/null 2>&1`
 	then
 		test -z "$XENSTORED_ROOTDIR" || XENSTORED_ROOTDIR="/var/lib/xenstored"