diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-14 12:10:50 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-14 12:10:56 +0000 |
commit | a9536b7fe8ae9913163ee78d715a86ba71f90271 (patch) | |
tree | b13cb36e9c801d54f532369344a7a3adee0ee8a5 | |
parent | 59845bc55be775e6aead2ef178a1bee8c9f91166 (diff) | |
download | aports-a9536b7fe8ae9913163ee78d715a86ba71f90271.tar.bz2 aports-a9536b7fe8ae9913163ee78d715a86ba71f90271.tar.xz |
main/abuild: upgrade to 2.27.2
-rw-r--r-- | main/abuild/0001-abuild-fix-apk_up2date-check.patch | 26 | ||||
-rw-r--r-- | main/abuild/APKBUILD | 14 |
2 files changed, 5 insertions, 35 deletions
diff --git a/main/abuild/0001-abuild-fix-apk_up2date-check.patch b/main/abuild/0001-abuild-fix-apk_up2date-check.patch deleted file mode 100644 index 02cef4bfa3..0000000000 --- a/main/abuild/0001-abuild-fix-apk_up2date-check.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 15fedf5f425b562b5793e430ef422b0bbf1050ed Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 May 2016 06:59:47 +0000 -Subject: [PATCH] abuild: fix apk_up2date check - -fix check that all subpackages exists, not only main package ---- - abuild.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/abuild.in b/abuild.in -index d6cdf6c..db82cfd 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -1622,7 +1622,7 @@ apk_up2date() { - local i s - cd "$startdir" - for i in $pkgname $subpackages; do -- [ -f "$PKGDEST/$pkgname-$pkgver-r$pkgrel.apk" ] || return 1 -+ [ -f "$PKGDEST/${i%:*}-$pkgver-r$pkgrel.apk" ] || return 1 - done - [ -n "$keep" ] && return 0 - --- -2.8.2 - diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 1197fa6aad..7b59e8e04d 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=abuild -pkgver=2.27.1 +pkgver=2.27.2 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=0 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -20,7 +20,6 @@ subpackages="apkbuild-cpan:cpan apkbuild-gem-resolver:gems" options="suid" pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz - 0001-abuild-fix-apk_up2date-check.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -65,9 +64,6 @@ gems() { mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/ } -md5sums="7fd3556f17d2ca1d663bdb8259ad1b13 abuild-2.27.1.tar.xz -bca264e091cc2fbda111adeb65a75809 0001-abuild-fix-apk_up2date-check.patch" -sha256sums="fe4edac6ab43de765d9efc009278247ecab0dab1177a61e174a7e427edb6c723 abuild-2.27.1.tar.xz -538241b8c5a86b2bf3b48e20f60995ced90b1bf893385a2e76942b5d4e6ebafe 0001-abuild-fix-apk_up2date-check.patch" -sha512sums="9bad79a2a24f3df0ef7323f2c6fa8f597ebfd93b2cc1a156d559ccd69f0d94958ba3b76febcf553cdd0173bcdd5d8ddf6ab2eca03f5737a523aefc8e6809a9f9 abuild-2.27.1.tar.xz -a5af9fe55bd36db8bcb407826520250e41d2c5b99054ef0a6cfb87d428064286c6cbe8144e269175d361822d0a4a220211302dc16e4342916238bc802bedf309 0001-abuild-fix-apk_up2date-check.patch" +md5sums="cabaec423ced69b85aac19583a11af84 abuild-2.27.2.tar.xz" +sha256sums="8b84207e7588991929570845f6f73c6e3b0fc87ed3823c5096a41d355b331175 abuild-2.27.2.tar.xz" +sha512sums="60f47a0f103c7b7d0f5bd6aea2030971d91dec1ba3d7ffb3ebacd4bba6d5666927ec7e8ecf969ca8acdb345d01cd953a04bab593334b89587b238af603b4d6d5 abuild-2.27.2.tar.xz" |