diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2020-04-17 12:23:24 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2020-04-17 12:25:57 +0200 |
| commit | 8618fd571525c3cd8c3b6129b6a939d0b9e359f9 (patch) | |
| tree | 74f8c615cec4dcceda498c6850487ec499c3f3e9 /main/abuild | |
| parent | 2e2488cdb8b971d033be0f17755b688077a532fd (diff) | |
| download | aports-8618fd571525c3cd8c3b6129b6a939d0b9e359f9.tar.bz2 aports-8618fd571525c3cd8c3b6129b6a939d0b9e359f9.tar.xz | |
main/abuild: backport fix for abuild-rmtemp
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/0002-Revert-abuild-include-pkgname-in-temporary-rootbld-d.patch | 28 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 8 |
2 files changed, 33 insertions, 3 deletions
diff --git a/main/abuild/0002-Revert-abuild-include-pkgname-in-temporary-rootbld-d.patch b/main/abuild/0002-Revert-abuild-include-pkgname-in-temporary-rootbld-d.patch new file mode 100644 index 0000000000..2402b2db6d --- /dev/null +++ b/main/abuild/0002-Revert-abuild-include-pkgname-in-temporary-rootbld-d.patch @@ -0,0 +1,28 @@ +From 5177936a2bd4aa9e0badea94e48aee1a939e467a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> +Date: Fri, 17 Apr 2020 12:21:48 +0200 +Subject: [PATCH] Revert "abuild: include $pkgname in temporary rootbld + directory" + +This commit broke abuild-rmtemp which has a prefix check to ensure it +doesn't remove non-abuild directory. Revert the commit instead of +adjusting the prefix check for now. + +This reverts commit d0828c06557773f252b645618500699a941bd091. +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index 2af9452..fbe2fbd 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -2257,7 +2257,7 @@ rootbld() { + + mkusers + +- BUILD_ROOT=$(mktemp -d "/var/tmp/abuild-$pkgname.XXXXXXXXXX") ++ BUILD_ROOT=$(mktemp -d /var/tmp/abuild.XXXXXXXXXX) + + mkdir -p "$BUILD_ROOT/proc" "$BUILD_ROOT/etc/apk/keys" \ + "$BUILD_ROOT/$HOME/.abuild" "$BUILD_ROOT/$aportsgit" \ diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 365ef73dde..971d735654 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=3.6.0_rc1 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Script to build Alpine Packages" url="https://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -25,7 +25,8 @@ subpackages=" options="suid !check" pkggroups="abuild" source="https://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz - 0001-abuild.conf-enable-PIE-binaries-by-default-for-go-as.patch" + 0001-abuild.conf-enable-PIE-binaries-by-default-for-go-as.patch + 0002-Revert-abuild-include-pkgname-in-temporary-rootbld-d.patch" builddir="$srcdir"/abuild-v$pkgver prepare() { @@ -68,4 +69,5 @@ _rootbld() { } sha512sums="28a17439156462e487c47970691943c5a0df13a27a515093a192b29c9bc18dfe489900cfc8f3972be08c8e310439109660b55f6e3b6ce5f64f014ab76f0e4988 abuild-3.6.0_rc1.tar.xz -1f1e4fd291b6e52d7628d43b5b29db4aa0762f3dc8b87827aafc7052b752057026d15594d142dda96e149815f4352f98c10379bdea75b032e303a9351027ef9d 0001-abuild.conf-enable-PIE-binaries-by-default-for-go-as.patch" +1f1e4fd291b6e52d7628d43b5b29db4aa0762f3dc8b87827aafc7052b752057026d15594d142dda96e149815f4352f98c10379bdea75b032e303a9351027ef9d 0001-abuild.conf-enable-PIE-binaries-by-default-for-go-as.patch +635c7a8e741eb3af04f5ec606251266676940b3cce0644108825003115a45d79b6469cf9ced1e1c8c3327995e459d493de93ebb4a3dd6a50eac3b4bd745d91cd 0002-Revert-abuild-include-pkgname-in-temporary-rootbld-d.patch" |