aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2021-01-07 14:32:35 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2021-01-07 14:33:57 +0000
commit71eb39add4964c267ebb177cff1d3341d47ad3ba (patch)
treedee75d7f3b574792b8c960b1761d2e865f5bc06b
parent90c1a8a52abd7a7fb4f859c96a33faf0dca0651c (diff)
downloadaports-71eb39add4964c267ebb177cff1d3341d47ad3ba.tar.gz
aports-71eb39add4964c267ebb177cff1d3341d47ad3ba.tar.bz2
aports-71eb39add4964c267ebb177cff1d3341d47ad3ba.tar.xz
main/abuild: upgrade to 3.7.0
-rw-r--r--main/abuild/0001-Revert-set-CARGO_HOME-to-SRCDEST-cargo.patch38
-rw-r--r--main/abuild/0001-abuild-rootbld-disable-real-chown-calls-in-fakeroot.patch36
-rw-r--r--main/abuild/APKBUILD10
3 files changed, 3 insertions, 81 deletions
diff --git a/main/abuild/0001-Revert-set-CARGO_HOME-to-SRCDEST-cargo.patch b/main/abuild/0001-Revert-set-CARGO_HOME-to-SRCDEST-cargo.patch
deleted file mode 100644
index d91e8fc6dc..0000000000
--- a/main/abuild/0001-Revert-set-CARGO_HOME-to-SRCDEST-cargo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 10aa67a0cab480c9df2a050e0d102aca0cf18a02 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 27 Nov 2020 15:16:57 +0000
-Subject: [PATCH] Revert "set CARGO_HOME to $SRCDEST/cargo"
-
-the SRCDEST may be shared by multiple builders and apparently cargo does
-not seem to handle that well. There are also no good way to do clean-up
-of the cache for purging things that is no longer in use.
-
-This reverts commit af0c88e6abbb1e49224759f5c51b3068e6eab28b.
----
- abuild.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index d600e92..eeb5f62 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -2685,7 +2685,6 @@ aportsgit=${APORTSDIR:-${startdir}}
- repo_template=$aportsgit/$repo/.rootbld-repositories
-
- SRCDEST=${SRCDEST:-$startdir}
--CARGO_HOME=$SRCDEST/cargo
-
- BUILD_ROOT=
-
-@@ -2704,7 +2703,7 @@ if [ -z "$REPODEST" ]; then
- fi
-
- # for recursive action
--export REPODEST SRCDEST CARGO_HOME
-+export REPODEST SRCDEST
-
- # add dbg subpackage if its enabled globally
- if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && [ "$arch" != "noarch" ]; then
---
-2.29.2
-
diff --git a/main/abuild/0001-abuild-rootbld-disable-real-chown-calls-in-fakeroot.patch b/main/abuild/0001-abuild-rootbld-disable-real-chown-calls-in-fakeroot.patch
deleted file mode 100644
index 062c866c51..0000000000
--- a/main/abuild/0001-abuild-rootbld-disable-real-chown-calls-in-fakeroot.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 49b5731fb5cd79ca3561b253a90b09fbd2b629fd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 21 Dec 2020 08:00:19 +0100
-Subject: [PATCH] abuild rootbld: disable real chown calls in fakeroot
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-By default, fakeroot forwards chown system calls to the libc and ignores
-EPERM errors. Unfortunately, when fakeroot is used inside a restricted
-bubblewrap environment, bubblewrap intercepts these system calls and
-returns EINVAL. The EINVAL return value is not masked by fakeroot and
-returned to the caller, thereby causing failures of mv(1), install(1),
-chown(1), … which use the chown system calls internally.
-
-Setting the FAKEROOTDONTTRYCHOWN environment variable prevents the chown
-systemcalls to be performed in the first place. This variable is only
-set in the environment created through bubblewrap by abuild rootbld.
-
-Fixes #10021
----
- abuild.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/abuild.in b/abuild.in
-index cc9bc79..1f2b4cc 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -2363,6 +2363,7 @@ rootbld() {
- --hostname "build-$buildhost-$CARCH" \
- --chdir "$startdir" \
- --setenv PATH ${USE_CCACHE:+/usr/lib/ccache/bin:}/bin:/usr/bin:/sbin:/usr/sbin \
-+ --setenv FAKEROOTDONTTRYCHOWN 1 \
- /usr/bin/abuild $force rootbld_actions
- update_abuildrepo_index
- cleanup $CLEANUP
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index db8200c35a..9245e9f9e9 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
-pkgver=3.7.0_rc1
+pkgver=3.7.0
_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-Revert-set-CARGO_HOME-to-SRCDEST-cargo.patch
- 0001-abuild-rootbld-disable-real-chown-calls-in-fakeroot.patch
"
builddir="$srcdir"/abuild-$pkgver
@@ -84,6 +82,4 @@ _rootbld() {
mkdir -p "$subpkgdir"
}
-sha512sums="ff0b7fd5e65b41185c0ec452703ecbcd73d409de75ffa14677ea9ed77919bc70347d53e42c6a3c6b569e260d2fb8bde495b151d9cf42adb097fe6b0764362248 abuild-3.7.0_rc1.tar.xz
-5efb7491ca7097289ab2ebeceaaef0eec79bae1be0e2efc7fbb0b21919c87f3722cf0541285d68cfd1a77d68e3e844837aa830207e06dcd7a7bdcad4a82c2bb2 0001-Revert-set-CARGO_HOME-to-SRCDEST-cargo.patch
-9ed0c32f8dd58a128343f1181b957fbb671ea878347524b9f301e484727f1b38275291c4e32d2e1921cb41a44e280a11c9d08ef0ef09df98926a11a54f0e9c28 0001-abuild-rootbld-disable-real-chown-calls-in-fakeroot.patch"
+sha512sums="455371b11626b67ac96df780dd80d074eabdfd942bccc5736cb4f58e8a55f0cf79edba11792e43fa0608803726aaa902a5718dd8d756a8099a76c4720ea0248f abuild-3.7.0.tar.xz"