main/abuild: upgrade to 3.2.0_rc1

4 files changed, 3 insertions, 120 deletions

diff --git a/main/abuild/0001-abuild-add-env-option-to-require-tests.patch b/main/abuild/0001-abuild-add-env-option-to-require-tests.patch
deleted file mode 100644
index 49497421b8..0000000000
--- a/main/abuild/0001-abuild-add-env-option-to-require-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d85a92478fc8a95bdcb4bf84c30c20ca935abc08 Mon Sep 17 00:00:00 2001
-From: Carlo Landmeter <clandmeter@gmail.com>
-Date: Tue, 24 Oct 2017 14:48:52 +0200
-Subject: [PATCH] abuild: add env option to require tests
-
-This adds an env option REQUIRE_CHECK to require testsuites to
-be run. This does not clutter getopts so it can be safely removed
-afterwards when we enforce tests globally. This will allow our CI
-infrastructure to enforce testsuites where possible.
----
- abuild.in | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/abuild.in b/abuild.in
-index 41b465d..7e3c818 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -226,6 +226,12 @@ default_sanitycheck() {
- 	check_secfixes_comment || return 1
- 
- 	makedepends_has 'g++' && ! options_has toolchain && warning "g++ should not be in makedepends"
-+        
-+	if ! options_has "!check" && [ -n "$REQUIRE_CHECK" ]; then
-+		(unset check; . "$APKBUILD"; type check >/dev/null 2>&1) || \
-+			die "Testsuites (abuild check) are required or needs to be explicitly disabled!"
-+	fi
-+
- 	return 0
- }
- 
--- 
-2.14.2
-
diff --git a/main/abuild/0001-abuild-add-support-for-provider_priority.patch b/main/abuild/0001-abuild-add-support-for-provider_priority.patch
deleted file mode 100644
index a094c69ca4..0000000000
--- a/main/abuild/0001-abuild-add-support-for-provider_priority.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4b24af9e9f3524550a4b8f5666c10315a45dfe05 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Thu, 2 Nov 2017 04:51:51 +0000
-Subject: [PATCH] abuild: add support for provider_priority
-
-provider_priority is a number which determines what priority a package should be
-given when solving a dependency graph using a provides entry instead of a direct
-package, in the event of conflicts.
----
- abuild.in | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/abuild.in b/abuild.in
-index 3f083b2..87aeb66 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -139,6 +139,12 @@ default_sanitycheck() {
- 		&& ! echo $replaces_priority | egrep -q '^[0-9]+$'; then
- 		die "replaces_priority must be a number"
- 	fi
-+
-+	if [ -n "$provider_priority" ] \
-+		&& ! echo $provider_priority | egrep -q '^[0-9]+$'; then
-+		die "provider_priority must be a number"
-+	fi
-+
- 	# check so no package names starts with -
- 	for i in $pkgname $subpackages; do
- 		case $i in
-@@ -927,6 +933,10 @@ prepare_metafiles() {
- 		echo "replaces_priority = $replaces_priority" >> "$pkginfo"
- 	fi
- 
-+	if [ -n "$provider_priority" ]; then
-+		echo "provider_priority = $provider_priority" >> "$pkginfo"
-+	fi
-+
- 	echo "license = $license" >> "$pkginfo"
- 	for i in $replaces; do
- 		echo "replaces = $i" >> "$pkginfo"
diff --git a/main/abuild/0001-abuild-rootbld-run-testsuites-if-requested-also-hand.patch b/main/abuild/0001-abuild-rootbld-run-testsuites-if-requested-also-hand.patch
deleted file mode 100644
index 04fd0eef55..0000000000
--- a/main/abuild/0001-abuild-rootbld-run-testsuites-if-requested-also-hand.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f7b19c3454c56c25bc13a8ffbbcc544a9337cca7 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Fri, 10 Nov 2017 21:34:27 +0000
-Subject: [PATCH] abuild: rootbld: run testsuites if requested, also handle
- package() only builds
-
----
- abuild.in | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index 521d530..bcf3994 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -2074,8 +2074,18 @@ checksum() {
- }
- 
- rootbld_actions() {
--	local part
--	for part in symlinksrc unpack prepare build rootpkg; do
-+	local part _build=build _check=check_fakeroot
-+	if ! is_function package; then
-+		# if package() is missing then build is called from rootpkg
-+		_build=true
-+	fi
-+	if options_has "!checkroot"; then
-+		_check=check
-+	fi
-+	if ! want_check; then
-+		_check=true
-+	fi
-+	for part in symlinksrc unpack prepare $_build $_check rootpkg; do
- 		runpart $part
- 	done
- }
--- 
-2.14.2
-
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 2e68f94edf..2d84a6299e 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=abuild
-pkgver=3.1.0
+pkgver=3.2.0_rc1
 _ver=${pkgver%_git*}
-pkgrel=5
+pkgrel=0
 pkgdesc="Script to build Alpine Packages"
 url="https://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -21,9 +21,6 @@ subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch
 options="suid !check"
 pkggroups="abuild"
 source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
-	0001-abuild-add-env-option-to-require-tests.patch
-	0001-abuild-rootbld-run-testsuites-if-requested-also-hand.patch
-	0001-abuild-add-support-for-provider_priority.patch
 	"
 builddir="$srcdir/$pkgname-$_ver"
 
@@ -70,7 +67,4 @@ _rootbld() {
 	mkdir -p "$subpkgdir"
 }
 
-sha512sums="bb9093d67942e3a63e4e053692c0bca30940cae05955518206cd9f7029211a188b7f442456ae126e61cbdca224eddb31e967d5cf0637e16893163cc963871a52  abuild-3.1.0.tar.xz
-e02cc44c8ad9dd61c9b80684b8cf5b64477a6fd6221cde9efea2a7594c6e7ce01a51f8bd4b80d72f82f7caf93217979fb0b354c420983891fa93f34c4252a035  0001-abuild-add-env-option-to-require-tests.patch
-5d196f302715f5f12ca13b70baea59f49bf3180e35e7a15849e9f9bc24b42a13666ee96666eae02bd31d54f227bb7c1fd5ae2e06dcfe1d7eb41ecfd6b9b3d28e  0001-abuild-rootbld-run-testsuites-if-requested-also-hand.patch
-1d452e85d2677b91001033441ac275318db2a7f699461aaf2a9ea37d260864fed6f1cea4798c6e2c84010ba534808fae16a3a9b15056fe74ee33c5e23f8cfffa  0001-abuild-add-support-for-provider_priority.patch"
+sha512sums="97f5ca9e2c36d06e0201ad3c31330378b57b760ece63e96c2db01b665e260d7201030fdb827399f5a046d13c68367b4c8a9bc1a04575df07915184fc3b129cbf  abuild-3.2.0_rc1.tar.xz"