diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/abuild/0001-buildrepo-avoid-using-i-as-loop-variable.patch | 52 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 17 |
2 files changed, 6 insertions, 63 deletions
diff --git a/main/abuild/0001-buildrepo-avoid-using-i-as-loop-variable.patch b/main/abuild/0001-buildrepo-avoid-using-i-as-loop-variable.patch deleted file mode 100644 index 0fe58e6110..0000000000 --- a/main/abuild/0001-buildrepo-avoid-using-i-as-loop-variable.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 67e769e605a09338b1234b2a9503305ebd632832 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 26 Apr 2013 21:05:40 +0200 -Subject: [PATCH] buildrepo: avoid using 'i' as loop variable - -some apkbuilds use it in global context ---- - buildrepo.in | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/buildrepo.in b/buildrepo.in -index 7707049..a37ab8d 100755 ---- a/buildrepo.in -+++ b/buildrepo.in -@@ -20,7 +20,7 @@ fi - usage() { - echo "usage: $program [-a APORTSDIR] [-d REPODIR] [-hp] [-l LOGPREFIX ]" - echo " [-r DEPREPO] REPOSITORY..." -- -+ - echo "options:" - echo " -a Set the aports base dir to APORTSDIR instead of $aportsdir" - echo " -d Set destination repository base dir to REPODIR instead of $repodir" -@@ -87,10 +87,10 @@ list_needbuild() { - # first we try copy everything possible and find out which we need - # to rebuild. By doing this we might save us for rebuilding - # needed when running 'abuild -R' -- for i in */APKBUILD; do -- [ -f "$aportsdir/$repo/$i" ] || continue -+ for apkbuild in */APKBUILD; do -+ [ -f "$aportsdir/$repo/$apkbuild" ] || continue - export REPODEST="$repodir" -- cd "$aportsdir/$repo"/${i%/*} || return 1 -+ cd "$aportsdir/$repo"/${apkbuild%/*} || return 1 - pkgname= - pkgver= - pkgrel= -@@ -118,9 +118,9 @@ list_needbuild() { - echo ">>> Copying " $pkgs >&2 - cp -p -l $pkgs "$repodir/$repo/$CARCH"/ 2>/dev/null \ - || cp -p $pkgs "$repodir/$repo/$CARCH"/ \ -- || echo "$i" -+ || echo "$apkbuild" - else -- echo "$i" -+ echo "$apkbuild" - fi - done - } --- -1.8.2.1 - diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index b66acea749..afbdeb86c4 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.14.2 +pkgver=2.14.3 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=0 url=http://git.alpinelinux.org/cgit/abuild/ depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1 abuildhelper curl libc-utils" @@ -13,9 +13,7 @@ subpackages="apkbuild-cpan:cpan" pkggroups="abuild" arch="all" license=GPL-2 -source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$_ver.tar.bz2 - 0001-buildrepo-avoid-using-i-as-loop-variable.patch - " +source="http://dev.alpinelinux.org/archive/abuild/abuild-$pkgver.tar.xz" _builddir="$srcdir/$pkgname-$_ver" prepare() { @@ -52,9 +50,6 @@ cpan() { mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/ } -md5sums="28b88233f7cece810ed9008647f1b0a2 abuild-2.14.2.tar.bz2 -b159d73dfddf2994e7469d749a94ff2a 0001-buildrepo-avoid-using-i-as-loop-variable.patch" -sha256sums="37192e3dbe148620341925059f57188b0f3635a60c74e5614fb7914741cb7d89 abuild-2.14.2.tar.bz2 -276746a44b52cd46cef295dbd993716ddabc9da46e4e2db5e813ee0e900577c8 0001-buildrepo-avoid-using-i-as-loop-variable.patch" -sha512sums="8f9cea29f8d1c8472ef7c4771789b995ce5422ee87f8262aa60c118b7a198b7c7b17c9120e3de98e410f14427fbac020920076a9b387943e638af10859db1648 abuild-2.14.2.tar.bz2 -9b2894e2d5050c532bfb1e4c2ff22f0edd8cf4d4a27c4dd7d60e1269c4ec130d70bd9a04a4f84c697a44d140d98c2ed543e0d99899a26e673a3fd4b642de572b 0001-buildrepo-avoid-using-i-as-loop-variable.patch" +md5sums="38e58e3c22598913d18e25d532f43316 abuild-2.14.3.tar.xz" +sha256sums="581f71bbf1d3de0e016dcbf130ce36061fa15ef890f5ebddb6c9c4b8aa3ba3a5 abuild-2.14.3.tar.xz" +sha512sums="298cf587b18779d733650df442c91fd0b851c54c00f2ffcb6236eda844dde00310e2da1d4a673ac969b3bcf35387e91fd619ce608c4123067477fa9636699034 abuild-2.14.3.tar.xz" |