main/abuild: backport bugfix for versioned deps

2 files changed, 62 insertions, 3 deletions

diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index ed4d017cf4..07c72a8b91 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,9 +2,10 @@
 pkgdesc="Script to build Alpine Packages"
 pkgname=abuild
 pkgver=2.1
-pkgrel=0
+pkgrel=1
 url=http://git.alpinelinux.org/cgit/abuild/
 source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
+        versioned-deps.patch
         "
 depends="fakeroot file sudo pax-utils openssl apk-tools"
 makedepends="openssl-dev pkgconfig"
@@ -12,10 +13,11 @@ license=GPL-2
 
 build() {
         cd "$srcdir/$pkgname-$pkgver"
-
+        patch -p1 -i "$srcdir"/versioned-deps.patch || return 1
         make
         make install DESTDIR="$pkgdir"
         install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
 }
 
-md5sums="2268fa6147c8088139ef136184cd2ae0  abuild-2.1.tar.bz2"
+md5sums="2268fa6147c8088139ef136184cd2ae0  abuild-2.1.tar.bz2
+9fb2ff2f601a558065f4524c45a94997  versioned-deps.patch"
diff --git a/main/abuild/versioned-deps.patch b/main/abuild/versioned-deps.patch
new file mode 100644
index 0000000000..4c0a20d8ad
--- /dev/null
+++ b/main/abuild/versioned-deps.patch
@@ -0,0 +1,57 @@
+commit 463a87812523b004b94dc56b8edf90d1ed5d1ee0
+Author: Natanael Copa <ncopa@alpinelinux.org>
+Date:   Thu May 6 18:31:36 2010 +0000
+
+    abuild: bugfix for versioned dependencies
+    
+    we need strip all '<>=' chars not only last
+
+diff --git a/abuild.in b/abuild.in
+index e0d726b..2af45e7 100755
+--- a/abuild.in
++++ b/abuild.in
+@@ -726,7 +726,7 @@ depparse_aports() {
+                        case "$j" in
+                                !*) continue;;
+                        esac
+-                       deps="$deps ${j%[<>=]*}"
++                       deps="$deps ${j%%[<>=]*}"
+                done
+                for j in $pkgname $subpackages; do
+                        echo "o ${j%%:*} $dir"
+@@ -747,7 +747,7 @@ deptrace() {
+        local deps= i=
+        # strip versions from deps
+        for i in "$@"; do
+-               deps="$deps ${i%[<>=]*}"
++               deps="$deps ${i%%[<>=]*}"
+        done
+        [ -z "$deps" ] && return 0
+        (       depparse_aports 
+@@ -789,7 +789,7 @@ builddeps() {
+ 
+        # add depends unless it is a subpackage
+        for i in $depends; do
+-               subpackages_has ${i%[<>=]*} || deps="$deps $i"
++               subpackages_has ${i%%[<>=]*} || deps="$deps $i"
+        done
+ 
+        installed_deps=$(apk info -e $deps)
+@@ -820,7 +820,7 @@ builddeps() {
+ 
+        # find dependencies that are installed but missing in repo.
+        for i in $deps; do
+-               local m=$(apk search --repository "$apkcache" ${i%[<>=]*})
++               local m=$(apk search --repository "$apkcache" ${i%%[<>=]*})
+                if [ -z "$m" ]; then
+                        missing="$missing $i"
+                fi
+@@ -903,7 +903,7 @@ deplist_has() {
+        local i
+        shift
+        for i in $@; do
+-               i=${i%[<>=]*}
++               i=${i%%[<>=]*}
+                [ "$needle" = "$i" ] && return 0
+                [ "$needle" = "!$i" ] && return 1
+        done