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

8 files changed, 21 insertions, 19 deletions

diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD
index e75e3e2461..7cf93cbf9d 100644
--- a/main/dahdi-linux-vserver/APKBUILD
+++ b/main/dahdi-linux-vserver/APKBUILD
@@ -4,7 +4,8 @@
 _flavor=${FLAVOR:-vserver}
 _realname=dahdi-linux
 _name=$_realname-$_flavor
-_kver=3.6.3
+_kpkg=linux-$_flavor
+_kver=3.6.4
 _kpkgrel=0
 _myvsver=vs2.3.4.3-noxfs-nocow
 
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index 0229d5820c..72f0114ff1 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=3.6.3
+pkgver=3.6.4
 pkgrel=0
 _vsver=vs2.3.4.3-noxfs-nocow
 
@@ -136,7 +136,7 @@ dev() {
 }
 
 md5sums="1a1760420eac802c541a20ab51a093d1  linux-3.6.tar.xz
-96701113d37ef4f9b785206ab8bcc71e  patch-3.6.3.xz
-a7c1fa5d1c41a97a9453a63de5eadb88  patch-3.6.3-vs2.3.4.3-noxfs-nocow.diff
+d7efab4da2682c44662b684026b059f7  patch-3.6.4.xz
+000ac741af5c678ad80b333a22306a7b  patch-3.6.4-vs2.3.4.3-noxfs-nocow.diff
 a2f41b951b1923e2520ef610f37ec55b  kernelconfig.x86
 a7ae4e8a88d495109b63354cfa8e4fcd  kernelconfig.x86_64"
diff --git a/main/linux-vserver/patch-3.6.3-vs2.3.4.3-noxfs-nocow.diff b/main/linux-vserver/patch-3.6.4-vs2.3.4.3-noxfs-nocow.diff
index 6c8630df04..60c747cc24 100644
--- a/main/linux-vserver/patch-3.6.3-vs2.3.4.3-noxfs-nocow.diff
+++ b/main/linux-vserver/patch-3.6.4-vs2.3.4.3-noxfs-nocow.diff
@@ -162,7 +162,7 @@ diff -NurpP --minimal linux-3.6/Makefile linux-3.6-vs2.3.4.3-noxfs-nocow/Makefil
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 6
- SUBLEVEL = 3
+ SUBLEVEL = 4
 -EXTRAVERSION =
 +EXTRAVERSION = -vs2.3.4.3-noxfs-nocow
  NAME = Terrified Chipmunk
diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD
index 873074ddc6..174f323f1b 100644
--- a/main/open-vm-tools-vserver/APKBUILD
+++ b/main/open-vm-tools-vserver/APKBUILD
@@ -3,10 +3,11 @@
 _flavor=vserver
 _realname=open-vm-tools
 _name=$_realname-$_flavor
-_kver=3.6.3
+_kpkg=linux-$_flavor
+_kver=3.6.4
 _kpkgrel=0
 _myvsver=vs2.3.4.3-noxfs-nocow
-_mypkgrel=1
+_mypkgrel=0
 
 _realver=9.2.0_p799703
 _ver=${_realver/_p/-}
diff --git a/testing/raptor2/APKBUILD b/testing/raptor2/APKBUILD
index 0ce17bd92d..5b9086c191 100644
--- a/testing/raptor2/APKBUILD
+++ b/testing/raptor2/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=raptor2
-pkgver=2.0.6
+pkgver=2.0.8
 pkgrel=0
 pkgdesc="RDF parser toolkit for Redland"
 url="http://www.librdf.org/raptor"
@@ -42,4 +42,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="1f07af81cbe3cf1bf0d1d250b18d9f93  raptor2-2.0.6.tar.gz"
+md5sums="ac60858b875aab8fa7917f21a1237aa9  raptor2-2.0.8.tar.gz"
diff --git a/testing/rasqal/APKBUILD b/testing/rasqal/APKBUILD
index 8b28695980..1c60cb92f4 100644
--- a/testing/rasqal/APKBUILD
+++ b/testing/rasqal/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rasqal
-pkgver=0.9.21
+pkgver=0.9.29
 pkgrel=0
 pkgdesc="RDF query library"
 url="http://www.librdf.org/"
 arch="all"
 license="GPL"
 depends=
-depends_dev="raptor-dev"
+depends_dev="raptor2-dev"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
@@ -42,4 +42,4 @@ package() {
 	rm "$pkgdir"/usr/lib/*.la
 }
 
-md5sums="55b67ec92a059ef8979d46486b00a032  rasqal-0.9.21.tar.gz"
+md5sums="49e4b75a0c67465edf55dd20606715fa  rasqal-0.9.29.tar.gz"
diff --git a/testing/redland/APKBUILD b/testing/redland/APKBUILD
index 616a742bd9..a7e7387458 100644
--- a/testing/redland/APKBUILD
+++ b/testing/redland/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=redland
-pkgver=1.0.10
-pkgrel=2
+pkgver=1.0.15
+pkgrel=0
 pkgdesc="high-level RDF library"
 url="http://www.librdf.org/"
 arch="all"
 license="GPL"
 depends=
-depends_dev="raptor-dev rasqal-dev sqlite-dev"
+depends_dev="raptor2-dev rasqal-dev sqlite-dev"
 makedepends="$depends_dev perl"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
@@ -39,7 +39,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
-	rm "$pkgdir"/usr/lib/*.la
+	rm "$pkgdir"/usr/lib/*.la "$pkgdir"/usr/lib/redland/*.la
 }
 
-md5sums="bdbb9b8dc614fc09a14cd646079619e1  redland-1.0.10.tar.gz"
+md5sums="b0deb87f3c7d3237a3d587c1e0f2f266  redland-1.0.15.tar.gz"
diff --git a/testing/soprano/APKBUILD b/testing/soprano/APKBUILD
index 020a47f902..ffcda3cd99 100644
--- a/testing/soprano/APKBUILD
+++ b/testing/soprano/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer:
 pkgname=soprano
 pkgver=2.6.0
-pkgrel=4
+pkgrel=5
 pkgdesc="KDE RDF framework"
 url="http://soprano.sourceforge.net/"
 arch="all"
 license="LGPL"
 depends="shared-desktop-ontologies"
-depends_dev="qt-dev raptor-dev rasqal-dev redland-dev"
+depends_dev="qt-dev raptor2-dev rasqal-dev redland-dev"
 makedepends="$depends_dev cmake automoc4 doxygen"
 install=""
 subpackages="$pkgname-dev"