main/abuild: upgrade to 3.3.1

3 files changed, 3 insertions, 105 deletions

diff --git a/main/abuild/0001-Allow-forcing-of-colored-output.patch b/main/abuild/0001-Allow-forcing-of-colored-output.patch
deleted file mode 100644
index 0606dcff85..0000000000
--- a/main/abuild/0001-Allow-forcing-of-colored-output.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0a79fc62c9d0aa30eb42ff4251701eee2368309d Mon Sep 17 00:00:00 2001
-From: Carlo Landmeter <clandmeter@alpinelinux.org>
-Date: Mon, 25 Feb 2019 23:02:09 +0000
-Subject: [PATCH] Allow forcing of colored output
-
-In some cases (ie drone ci) there is no tty available but its still
-possible to display colors in the webui.
----
- functions.sh.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/functions.sh.in b/functions.sh.in
-index 4f2c023..ea21f25 100644
---- a/functions.sh.in
-+++ b/functions.sh.in
-@@ -243,7 +243,9 @@ enable_colors() {
- 	BLUE="\033[1;34m"
- }
- 
--if [ -n "$USE_COLORS" ] && [ -t 1 ]; then
-+if [ "$USE_COLORS" = force ]; then
-+	enable_colors
-+elif [ -n "$USE_COLORS" ] && [ -t 1 ]; then
- 	enable_colors
- else
- 	disable_colors
--- 
-2.21.0
-
diff --git a/main/abuild/0001-abuild-add-support-for-pkg-config-prefix-pcprefix.patch b/main/abuild/0001-abuild-add-support-for-pkg-config-prefix-pcprefix.patch
deleted file mode 100644
index f043421bca..0000000000
--- a/main/abuild/0001-abuild-add-support-for-pkg-config-prefix-pcprefix.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 376ccc5bd695e792768a679409fbb428defe0770 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 22 Feb 2019 13:57:08 +0000
-Subject: [PATCH] abuild: add support for pkg-config prefix pcprefix
-
-Fix issue when two -dev packages provides same pkg-config wil but with
-different versions. For example libressl-dev and openssl-dev both ships
-libssl.pc and libcrypto.pc, which resulted in automatic provides of
-pc:libssl and pc:libcrypto.
-
-apk would end up picking libressl-dev over openssl-dev for packages that
-had automatic pc:libssl depends (for example libssl2-dev), when
-openssl-dev was the one that was used during build.
-
-To fix this we add support for a pcprefix so we can set
-pcprefix="libressl:" in libressl APKBUILD which makes libressl-dev
-provide pc:libressl:libssl. This is similar to what we do with
-sonameprefix.
-
-We do not yet automatically detect when the prefixed variant should be
-used so for now we will have to explicitly add libressl-dev.
-
-ref #9959
----
- abuild.in | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index cd3383b..d03e35f 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -1067,7 +1067,7 @@ prepare_pkgconfig_provides() {
- 		local f=${i##*/}
- 		local v=$(PKG_CONFIG_PATH="$dir"/usr/lib/pkgconfig PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH=1 pkg-config \
- 			--modversion ${f%.pc})
--		echo "${f%.pc}=${v:-0}" >> "$controldir"/.provides-pc
-+		echo "$pcprefix${f%.pc}=${v:-0}" >> "$controldir"/.provides-pc
- 	done
- }
- 
-@@ -1175,6 +1175,11 @@ subpkg_provides_so() {
- 	grep -q -w "^$1" "$pkgbasedir"/.control.*/.provides-so 2>/dev/null
- }
- 
-+subpkg_provides_prefixed_pc() {
-+	[ -n "$pcprefix" ] && grep -q -w "^$pcprefix$1" \
-+		"$pkgbasedir"/.control.*/.provides-pc 2>/dev/null
-+}
-+
- subpkg_provides_pc() {
- 	grep -q -w "^${1%%[<>=]*}" "$pkgbasedir"/.control.*/.provides-pc \
- 		2>/dev/null
-@@ -1243,7 +1248,12 @@ trace_apk_deps() {
- 
- 	# pkg-config depends
- 	for i in $(sort -u "$dir"/.needs-pc 2>/dev/null); do
--		if subpkg_provides_pc "$i" \
-+		# first check if its provided by same apkbuild
-+		grep -q -w "^$pcprefix$i" "$dir"/.provides-pc 2>/dev/null && continue
-+
-+		if subpkg_provides_prefixed_pc "$i"; then
-+			autodeps="$autodeps pc:$pcprefix$i"
-+		elif subpkg_provides_pc "$i" \
- 				|| $APK $apkroot info --quiet --installed "pc:$i"; then
- 			local provider=$(apk $apkroot search --quiet "pc:$i")
- 			if list_has "$provider" $depends_dev; then
--- 
-2.20.1
-
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index b7adce8cf7..6e6167a2aa 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=abuild
-pkgver=3.3.0
+pkgver=3.3.1
 _ver=${pkgver%_git*}
-pkgrel=2
+pkgrel=0
 pkgdesc="Script to build Alpine Packages"
 url="https://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -21,8 +21,6 @@ subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch
 options="suid !check"
 pkggroups="abuild"
 source="https://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
-	0001-abuild-add-support-for-pkg-config-prefix-pcprefix.patch
-	0001-Allow-forcing-of-colored-output.patch
 	"
 
 builddir="$srcdir/$pkgname-$_ver"
@@ -70,6 +68,4 @@ _rootbld() {
 	mkdir -p "$subpkgdir"
 }
 
-sha512sums="c109a63107a0816117d781c1d3e664dd8d36648b0dc46a9e61d720c9813d50134cd8db4b282a8d27e546b5bd544296088c6d1b6996b230304d5db009f4ba4d52  abuild-3.3.0.tar.xz
-fc33c946b969b6f862c85582f7ec63cea2fa47d1d13dd10374c7376f297926bea2e0864509235b1c7118d6dc759ca5cfc6487612877f97568f9294e6c67fb86c  0001-abuild-add-support-for-pkg-config-prefix-pcprefix.patch
-0a64bec454b076f2db1667f9812ee454d1c2d94ef0171d5bc2f3e324557bdc50dadca28710a3b76d557c585ec0f2d5f3e0b96f0320d99505542ca5ad6b004a72  0001-Allow-forcing-of-colored-output.patch"
+sha512sums="8949cee2411cd9538ed4ce89af909a44cc329aca5be56fc8cfaa17652086bc55b59ea4ab1c4081d0db3860aec59126df2e8ad8ff8f8bb3d0abcd615955ec9af1  abuild-3.3.1.tar.xz"