aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2021-06-10 14:46:27 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2021-06-10 14:46:43 +0000
commit959a6c02643e96c3c23916fc8e4f48eadc1efebc (patch)
tree9924c9afd60a7046007c39a7ad6da8f0c9177f3f
parent749131fcf6f700fb2cca1204c77c3f8de7351f4e (diff)
downloadaports-959a6c02643e96c3c23916fc8e4f48eadc1efebc.tar.gz
aports-959a6c02643e96c3c23916fc8e4f48eadc1efebc.tar.bz2
aports-959a6c02643e96c3c23916fc8e4f48eadc1efebc.tar.xz
main/abuild: upgrade to 3.8.0_rc4
-rw-r--r--main/abuild/0001-abump-fix-check-for-clean-git-of-APKBUILD.patch25
-rw-r--r--main/abuild/0001-tests-skip-lock-test-on-s390x.patch30
-rw-r--r--main/abuild/APKBUILD10
3 files changed, 3 insertions, 62 deletions
diff --git a/main/abuild/0001-abump-fix-check-for-clean-git-of-APKBUILD.patch b/main/abuild/0001-abump-fix-check-for-clean-git-of-APKBUILD.patch
deleted file mode 100644
index 422b79e822..0000000000
--- a/main/abuild/0001-abump-fix-check-for-clean-git-of-APKBUILD.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b7f0a3f35e6d95ef1f7490a137297991817baba4 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 17 May 2021 14:30:44 +0200
-Subject: [PATCH] abump: fix check for clean git of APKBUILD
-
----
- abump.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/abump.in b/abump.in
-index 80112b6..8358555 100644
---- a/abump.in
-+++ b/abump.in
-@@ -51,7 +51,7 @@ do_bump() {
- || die "APKBUILD has different \$pkgname for $name"
- type package | grep -q function \
- || die "missing package() for $name"
-- if [ "$pkgver" = "$ver" ] && git diff-index --quiet HEAD -- APKBUILD; then
-+ if [ "$pkgver" = "$ver" ] && git diff-index --quiet HEAD -- "$a"; then
- die "version is already $ver"
- fi
-
---
-2.31.1
-
diff --git a/main/abuild/0001-tests-skip-lock-test-on-s390x.patch b/main/abuild/0001-tests-skip-lock-test-on-s390x.patch
deleted file mode 100644
index 3ba3db5ecf..0000000000
--- a/main/abuild/0001-tests-skip-lock-test-on-s390x.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From dee82f764c2d338d33a2fa56db38dddaa5903aa7 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 14 May 2021 12:53:11 +0200
-Subject: [PATCH] tests: skip lock test on s390x
-
-the sleep(0) trick does not appear to work on s390x. which is okish as
-worst case we end up with lock file leftovers. skip the test
----
- tests/abuild-fetch.bats | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/abuild-fetch.bats b/tests/abuild-fetch.bats
-index f3594ce..7f94607 100644
---- a/tests/abuild-fetch.bats
-+++ b/tests/abuild-fetch.bats
-@@ -120,7 +120,10 @@ teardown() {
-
- sleep 0.2
- # the first stamp should not exist, second instance should block the retry
-- [ ! -f "$tmpdir"/stamp1 ]
-+ # skip this test on s390x, due to sleep(0) not working there
-+ if [ "$(uname -m)" != "s390x" ]; then
-+ [ ! -f "$tmpdir"/stamp1 ]
-+ fi
-
- # simulate second download finished
- echo "done fifo2" > "$tmpdir"/fifo2
---
-2.31.1
-
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index f8167089c2..5308962506 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
-pkgver=3.8.0_rc3
+pkgver=3.8.0_rc4
_ver=${pkgver%_git*}
-pkgrel=2
+pkgrel=0
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -27,8 +27,6 @@ subpackages="
options="suid"
pkggroups="abuild"
source="https://git.alpinelinux.org/abuild/snapshot/abuild-$pkgver.tar.xz
- 0001-tests-skip-lock-test-on-s390x.patch
- 0001-abump-fix-check-for-clean-git-of-APKBUILD.patch
"
builddir="$srcdir"/abuild-$pkgver
@@ -86,7 +84,5 @@ _rootbld() {
}
sha512sums="
-57f50f7b037a0e64bf4653b71525b4d4e922438a2a6ad965669b620efdfbfb2855e82a1d59e6c69d59a37e7c61a4998a4686bfc6fa8357551d427e517201236c abuild-3.8.0_rc3.tar.xz
-df31077726d2885d943bd13ee1688ae88ee02a9c59f4fb839b1468374fdca22ce47a2b5a17a28a42388c46e6f704d89d8b388ac9c704c96bc3555b84a1a4c576 0001-tests-skip-lock-test-on-s390x.patch
-ce78a78912f006946313fd1b291c3ae3b8d82763f6bf3c39a0f0dd413319e0d9748b1bda637df8d4c58e5da357372c64181e2f7bb74418787b745d9ee304bc79 0001-abump-fix-check-for-clean-git-of-APKBUILD.patch
+687c21c233570b1e06f1298b24d5bcbf5925dfb9e9e00d0fb1626a7e0983dc6c2079cba96408033210b562c1cf08c2cd149379b22f86e0a255e2dde1c6886d48 abuild-3.8.0_rc4.tar.xz
"