main/abuild: upgrade to 3.6.0

3 files changed, 5 insertions, 74 deletions

diff --git a/main/abuild/0001-abuild.conf-enable-PIE-binaries-by-default-for-go-as.patch b/main/abuild/0001-abuild.conf-enable-PIE-binaries-by-default-for-go-as.patch
deleted file mode 100644
index a3c2643d14..0000000000
--- a/main/abuild/0001-abuild.conf-enable-PIE-binaries-by-default-for-go-as.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 828b826662638b78834332f9cf72f18ac1fbf86f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 17 Mar 2019 17:03:59 +0100
-Subject: [PATCH] abuild.conf: enable PIE binaries by default for go as well
-
-From `go help environment`:
-
-        GOFLAGS
-                A space-separated list of -flag=value settings to apply
-                to go commands by default, when the given flag is known by
-                the current command. Flags listed on the command-line
-                are applied after this list and therefore override it.
-
-And from `go help build`:
-
-        -buildmode mode
-                build mode to use. See 'go help buildmode' for more.
-
-Setting this environment variable in /etc/abuild.conf allows us to build
-all go binaries on the builders as PIE without needing to patch the go
-compiler itself.
----
- abuild.conf | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/abuild.conf b/abuild.conf
-index 6721e7f..c00e31b 100644
---- a/abuild.conf
-+++ b/abuild.conf
-@@ -2,6 +2,7 @@ export CFLAGS="-Os -fomit-frame-pointer"
- export CXXFLAGS="$CFLAGS"
- export CPPFLAGS="$CFLAGS"
- export LDFLAGS="-Wl,--as-needed"
-+export GOFLAGS="-buildmode=pie"
- 
- export JOBS=2
- export MAKEFLAGS=-j$JOBS
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
deleted file mode 100644
index 2402b2db6d..0000000000
--- a/main/abuild/0002-Revert-abuild-include-pkgname-in-temporary-rootbld-d.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 6bd10e3c71..d6fdc9b5e6 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=abuild
-pkgver=3.6.0_rc1
+pkgver=3.6.0
 _ver=${pkgver%_git*}
-pkgrel=2
+pkgrel=0
 pkgdesc="Script to build Alpine Packages"
 url="https://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -24,10 +24,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
-        0002-Revert-abuild-include-pkgname-in-temporary-rootbld-d.patch"
-builddir="$srcdir"/abuild-v$pkgver
+source="https://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.bz2"
+builddir="$srcdir"/abuild-$pkgver
 
 prepare() {
         default_prepare
@@ -68,6 +66,4 @@ _rootbld() {
         mkdir -p "$subpkgdir"
 }
 
-sha512sums="28a17439156462e487c47970691943c5a0df13a27a515093a192b29c9bc18dfe489900cfc8f3972be08c8e310439109660b55f6e3b6ce5f64f014ab76f0e4988  abuild-3.6.0_rc1.tar.xz
-1f1e4fd291b6e52d7628d43b5b29db4aa0762f3dc8b87827aafc7052b752057026d15594d142dda96e149815f4352f98c10379bdea75b032e303a9351027ef9d  0001-abuild.conf-enable-PIE-binaries-by-default-for-go-as.patch
-635c7a8e741eb3af04f5ec606251266676940b3cce0644108825003115a45d79b6469cf9ced1e1c8c3327995e459d493de93ebb4a3dd6a50eac3b4bd745d91cd  0002-Revert-abuild-include-pkgname-in-temporary-rootbld-d.patch"
+sha512sums="fd5b8326171c9ab8f975e147995520990e7e1210929662ce4687267dad68812721ee9eb019bf7430f01abebc9278e6be1c0358d5b9bb2918bc96ccd5e2f1b3df  abuild-3.6.0.tar.bz2"