main/abuild: fix abuild -A

10 files changed, 32 insertions, 277 deletions

diff --git a/main/abuild/0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch b/main/abuild/0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch
deleted file mode 100644
index 8f7351d4e8..0000000000
--- a/main/abuild/0001-abuild-add-missing-triplet-definitions-for-ppc-and-p.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ac5dbfca7f72144e1030c8c52200345ba8b50239 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Tue, 24 Jan 2017 01:20:34 +0000
-Subject: [PATCH] abuild: add missing triplet definitions for ppc and ppc64
- architectures
-
----
- functions.sh.in | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/functions.sh.in b/functions.sh.in
-index d8e12a5..58567d6 100644
---- a/functions.sh.in
-+++ b/functions.sh.in
-@@ -8,5 +8,7 @@ arch_to_hostspec() {
- 	aarch64)	echo "aarch64-alpine-linux-musl" ;;
- 	armhf)		echo "armhf-alpine-linux-muslgnueabihf" ;;
- 	armv7)		echo "armv7-alpine-linux-musleabihf" ;;
-+	ppc)		echo "powerpc-alpine-linux-musl" ;;
-+	ppc64)		echo "powerpc64-alpine-linux-musl" ;;
- 	s390x)		echo "s390x-alpine-linux-musl" ;;
- 	x86)		echo "i586-alpine-linux-musl" ;;
-@@ -23,5 +25,7 @@ hostspec_to_arch() {
- 	armv6*-*-*-*eabihf)	echo "armhf" ;;
- 	armv7*-*-*-*eabihf)	echo "armv7" ;;
- 	i[0-9]86-*-*-*)		echo "x86" ;;
-+	powerpc-*-*-*)		echo "ppc" ;;
-+	powerpc64-*-*-*)	echo "ppc64" ;;
- 	s390x-*-*-*)		echo "s390x" ;;
- 	x86_64-*-*-*)		echo "x86_64" ;;
--- 
-2.11.0
-
diff --git a/main/abuild/0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch b/main/abuild/0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch
deleted file mode 100644
index 6270d6cce6..0000000000
--- a/main/abuild/0001-abuild-pass-arch-to-apk-whenever-sysroot-is-used.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 971504f0ecfa59a03f30f9abe1b582c35a589590 Mon Sep 17 00:00:00 2001
-From: xentec <xentec@aix0.eu>
-Date: Wed, 21 Dec 2016 10:01:29 +0000
-Subject: [PATCH] abuild: pass --arch to apk whenever sysroot is used
-
-so we can crosscompile for different architectures
----
- abuild.in | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index f56ac03..b7e3dcc 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -1048,7 +1048,7 @@ trace_apk_deps() {
- 
- 	case "$parch" in
- 	$CBUILD_ARCH) ;;
--	$CARCH | $CTARGET_ARCH) apkroot="--root $CBUILDROOT" ;;
-+	$CARCH | $CTARGET_ARCH) apkroot="--root $CBUILDROOT --arch $CTARGET_ARCH" ;;
- 	esac
- 
- 	msg "Tracing dependencies..."
-@@ -1810,7 +1810,7 @@ builddeps() {
- 	calcdeps "$BUILD_BASE"
- 
- 	installed_builddeps=$($APK info --installed $builddeps)
--	[ -n "$CBUILDROOT" -a -n "$hostdeps" ] && installed_hostdeps=$($APK info --root "$CBUILDROOT" --installed $hostdeps)
-+	[ -n "$CBUILDROOT" -a -n "$hostdeps" ] && installed_hostdeps=$($APK info --root "$CBUILDROOT" --arch "$CTARGET_ARCH" --installed $hostdeps)
- 
- 	# find which deps are missing
- 	for i in $builddeps; do
-@@ -1825,7 +1825,7 @@ builddeps() {
- 	done
- 	for i in $hostdeps; do
- 		if [ "${i#\!}" != "$i" ]; then
--			if $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then
-+			if $APK info --quiet --installed --root "$CBUILDROOT" --arch "$CTARGET_ARCH" "${i#\!}"; then
- 				error "Conflicting package installed: ${i#\!}"
- 				return 1
- 			fi
-@@ -2039,7 +2039,7 @@ deps() {
- 		|| return 1
- 	if [ -n "$CBUILDROOT" ]; then
- 		[ -z "$_quiet" ] && msg "Installing for host:$hostdeps"
--		$SUDO_APK add $_quiet --root "$CBUILDROOT" --repository "$REPODEST/$repo" $apk_opt_wait \
-+		$SUDO_APK add $_quiet --root "$CBUILDROOT" --arch "$CTARGET_ARCH" --repository "$REPODEST/$repo" $apk_opt_wait \
- 			--no-scripts --virtual .makedepends-$pkgname $hostdeps || return 1
- 	fi
- }
-@@ -2048,7 +2048,7 @@ undeps() {
- 	local _quiet="$@"
- 	$SUDO_APK del $_quiet $apk_opt_wait .makedepends-$pkgname
- 	if [ -n "$CBUILDROOT" ]; then
--		$SUDO_APK del $_quiet --root "$CBUILDROOT" $apk_opt_wait \
-+		$SUDO_APK del $_quiet --root "$CBUILDROOT" --arch "$CTARGET_ARCH" $apk_opt_wait \
- 			--no-scripts .makedepends-$pkgname
- 	fi
- 	return 0
--- 
-2.11.0
-
diff --git a/main/abuild/0001-abuild-preserve-xattrs-when-creating-dbg.patch b/main/abuild/0001-abuild-preserve-xattrs-when-creating-dbg.patch
deleted file mode 100644
index 4fd1058bf4..0000000000
--- a/main/abuild/0001-abuild-preserve-xattrs-when-creating-dbg.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9d2567f1e6ff75bb5c9dc34b354bdb3d1f02b343 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 9 Feb 2017 11:30:03 +0000
-Subject: [PATCH] abuild: preserve xattrs when creating -dbg
-
----
- abuild.in | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index a71a2dd..19dedda 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -1532,10 +1532,12 @@ default_dbg() {
- 			mkdir -p $dstdir
- 		fi
- 		cd $srcdir
-+		local XATTR=$(getfattr --match="" --dump "${srcfile}")
- 		${CROSS_COMPILE}objcopy --only-keep-debug $srcfile $dstfile
- 		${CROSS_COMPILE}objcopy --add-gnu-debuglink=$dstfile $srcdir/$srcfile
- 		mv $dstfile $dstdir
- 		${CROSS_COMPILE}strip $srcfile
-+		[ -n "$XATTR" ] && { echo "$XATTR" | setfattr --restore=-; }
- 	done
- 	return 0
- }
-@@ -1978,9 +1980,9 @@ stripbin() {
- 	scanelf --recursive --nobanner --etype "ET_DYN,ET_EXEC" . \
- 		| sed -e 's:^ET_DYN ::' -e 's:^ET_EXEC ::' \
- 		| while read filename; do
--		XATTR=$(getfattr --match="" --dump "${filename}")
-+		local XATTR=$(getfattr --match="" --dump "${filename}")
- 		"${stripcmd}" "${filename}"
--		[ -n "$XATTR" ] && (echo "$XATTR" | setfattr --restore=-)
-+		[ -n "$XATTR" ] && { echo "$XATTR" | setfattr --restore=-; }
- 	done
- }
- 
--- 
-2.11.1
-
diff --git a/main/abuild/0001-abuild-properly-detect-failure-of-dependency-install.patch b/main/abuild/0001-abuild-properly-detect-failure-of-dependency-install.patch
deleted file mode 100644
index a55bc4cd57..0000000000
--- a/main/abuild/0001-abuild-properly-detect-failure-of-dependency-install.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e18d6228e7fc1e7601b4c793ef889cfd3e36fc36 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 31 Oct 2016 15:49:29 +0200
-Subject: [PATCH] abuild: properly detect failure of dependency installation
-
----
- abuild.in | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index 35b7995..8b6d8dd 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -1889,7 +1889,8 @@ builddeps() {
- 	done
- 	$SUDO_APK add --upgrade --repository "$REPODEST/$repo" \
- 		$apk_opt_wait \
--		--virtual .makedepends-$pkgname $builddeps
-+		--virtual .makedepends-$pkgname $builddeps \
-+		|| return 1
- }
- 
- # replace the md5sums in the APKBUILD
-@@ -2034,7 +2035,8 @@ deps() {
- 	[ -z "$_quiet" ] && msg "Installing for build:$builddeps"
- 	$SUDO_APK add $_quiet $apk_opt_wait --repository "$REPODEST/$repo" \
- 		--virtual .makedepends-$pkgname \
--		$builddeps
-+		$builddeps \
-+		|| return 1
- 	if [ -n "$CBUILDROOT" ]; then
- 		[ -z "$_quiet" ] && msg "Installing for host:$hostdeps"
- 		$SUDO_APK add $_quiet --root "$CBUILDROOT" --repository "$REPODEST/$repo" $apk_opt_wait \
--- 
-2.10.1
-
diff --git a/main/abuild/0001-abuild-properly-detect-package-size-on-filesystems.patch b/main/abuild/0001-abuild-properly-detect-package-size-on-filesystems.patch
deleted file mode 100644
index 2aab1b1c93..0000000000
--- a/main/abuild/0001-abuild-properly-detect-package-size-on-filesystems.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/abuild.in b/abuild.in
-index 35b7995572..2d1d9e644d 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -812,6 +812,13 @@ prepare_metafiles() {
- 	cd "$dir"
- 	mkdir -p "$controldir"
- 	local builddate=$(date -u "+%s")
-+
-+	# Fix package size on several filesystems
-+	case "$(df -PT . | awk 'END {print $2}')" in
-+		btrfs|ecryptfs|zfs)
-+		sync;;
-+	esac
-+
- 	local size=$(du -sk | awk '{print $1 * 1024}')
- 
- 	if [ "$arch" != "$apkbuild_arch" ]; then
diff --git a/main/abuild/0001-abuild-unset-md5-and-sha256-sums-when-updating-check.patch b/main/abuild/0001-abuild-unset-md5-and-sha256-sums-when-updating-check.patch
deleted file mode 100644
index f3c954e0f2..0000000000
--- a/main/abuild/0001-abuild-unset-md5-and-sha256-sums-when-updating-check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2c1aaa5536d601c4203c4ba451141578beeeee16 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 17 Feb 2017 11:07:15 +0100
-Subject: [PATCH] abuild: unset md5 and sha256 sums when updating checksum
-
-this fixes problem with abump
----
- abuild.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/abuild.in b/abuild.in
-index 6c57cf0..6d93e1f 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -1960,6 +1960,8 @@ checksum() {
- 	done
- 
- 	msg "Updating the sha512sums in APKBUILD..."
-+	md5sums=
-+	sha256sums=
- 	sha512sums="$(cd "$srcdir" && sha512sum $files)" \
- 		|| die "sha512sum failed"
- 	echo "sha512sums=\"$sha512sums\"" >>"$APKBUILD"
--- 
-2.11.1
-
diff --git a/main/abuild/0001-abuild-use-only-sha512sum.patch b/main/abuild/0001-abuild-use-only-sha512sum.patch
deleted file mode 100644
index 3c670e047e..0000000000
--- a/main/abuild/0001-abuild-use-only-sha512sum.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0ff2cf73f5070d5dd4f9df11d8d87b594cc0be7b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 26 Jan 2017 13:57:18 +0200
-Subject: [PATCH] abuild: use only sha512sum
-
-use only the strongest hash. this simplifies apkbuilds a bit.
----
- abuild.in | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/abuild.in b/abuild.in
-index ecd6fcc..ce42c5a 100644
---- a/abuild.in
-+++ b/abuild.in
-@@ -1907,16 +1907,6 @@ checksum() {
- 		files="$files $(filename_from_uri $s)"
- 	done
- 
--	# for compatibility/backporting reasons we still add md5sum
--	msg "Updating the md5sums in APKBUILD..."
--	md5sums="$(cd "$srcdir" && md5sum $files)" || die "md5sum failed"
--	echo "md5sums=\"$md5sums\"" >>"$APKBUILD"
--
--	msg "Updating the sha256sums in APKBUILD..."
--	sha256sums="$(cd "$srcdir" && sha256sum $files)" \
--		|| die "sha256sum failed"
--	echo "sha256sums=\"$sha256sums\"" >>"$APKBUILD"
--
- 	msg "Updating the sha512sums in APKBUILD..."
- 	sha512sums="$(cd "$srcdir" && sha512sum $files)" \
- 		|| die "sha512sum failed"
--- 
-2.11.0
-
diff --git a/main/abuild/0001-functions-fix-abuild-A.patch b/main/abuild/0001-functions-fix-abuild-A.patch
new file mode 100644
index 0000000000..77245901e4
--- /dev/null
+++ b/main/abuild/0001-functions-fix-abuild-A.patch
@@ -0,0 +1,28 @@
+From 9c1595dc423970cf86ef371dd15df9b27d9baf81 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 20 Mar 2017 16:13:07 +0000
+Subject: [PATCH] functions: fix abuild -A
+
+fix so abuild -A does not exit with error if gitbase fails
+
+this was introduced with the set -e
+---
+ functions.sh.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/functions.sh.in b/functions.sh.in
+index 3e1840c..925dc43 100644
+--- a/functions.sh.in
++++ b/functions.sh.in
+@@ -71,7 +71,7 @@ readconfig() {
+ 	[ -f "$ABUILD_CONF" ] && . "$ABUILD_CONF"
+ 	[ -f "$ABUILD_USERCONF" ] && . "$ABUILD_USERCONF"
+ 	APORTSDIR=${_APORTSDIR-$APORTSDIR}
+-	gitbase=$(git rev-parse --show-toplevel 2>/dev/null) # already is -P
++	gitbase=$(git rev-parse --show-toplevel 2>/dev/null) || true # already is -P
+ 	if [ -d "$APORTSDIR" ]; then
+ 		APORTSDIR=$(cd "$APORTSDIR"; pwd -P)
+ 	elif [ -z "$APORTSDIR" ] && [ -d "$HOME/aports" ]; then
+-- 
+2.11.1
+
diff --git a/main/abuild/0001-functions-fix-cross-compile-triplet-for-armhf-archit.patch b/main/abuild/0001-functions-fix-cross-compile-triplet-for-armhf-archit.patch
deleted file mode 100644
index f2dddd54b7..0000000000
--- a/main/abuild/0001-functions-fix-cross-compile-triplet-for-armhf-archit.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a7f9bff0f73dba6a82af6ccc60fdd2fab73a6566 Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Tue, 14 Feb 2017 05:52:54 +0000
-Subject: [PATCH] functions: fix cross-compile triplet for armhf architecture
-
----
- functions.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/functions.sh.in b/functions.sh.in
-index 58567d6..d04c776 100644
---- a/functions.sh.in
-+++ b/functions.sh.in
-@@ -6,7 +6,7 @@ program=${0##*/}
- arch_to_hostspec() {
- 	case "$1" in
- 	aarch64)	echo "aarch64-alpine-linux-musl" ;;
--	armhf)		echo "armhf-alpine-linux-muslgnueabihf" ;;
-+	armhf)		echo "armv6-alpine-linux-muslgnueabihf" ;;
- 	armv7)		echo "armv7-alpine-linux-musleabihf" ;;
- 	ppc)		echo "powerpc-alpine-linux-musl" ;;
- 	ppc64)		echo "powerpc64-alpine-linux-musl" ;;
--- 
-2.11.1
-
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 7de8a6fbe8..8df61aba20 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=abuild
 pkgver=3.0.0_rc1
 _ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
 pkgdesc="Script to build Alpine Packages"
 url="http://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -20,6 +20,7 @@ subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch"
 options="suid"
 pkggroups="abuild"
 source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
+	0001-functions-fix-abuild-A.patch
 	"
 
 builddir="$srcdir/$pkgname-$_ver"
@@ -62,4 +63,5 @@ gems() {
 	mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/
 }
 
-sha512sums="48f33e791805d9ec0f1fcfc28d9d2e58c84dc168b1a64e52733eefdc9daf2450c0cea20f9cdf3a61755d7344cc24f801ef0e9954b30881a713885d935a59dc36  abuild-3.0.0_rc1.tar.xz"
+sha512sums="48f33e791805d9ec0f1fcfc28d9d2e58c84dc168b1a64e52733eefdc9daf2450c0cea20f9cdf3a61755d7344cc24f801ef0e9954b30881a713885d935a59dc36  abuild-3.0.0_rc1.tar.xz
+eaec95123f4c67fce84ccd190d1de47f27406acd1f600495100bf553b48eb9bf2a91b833a2c0d37c15306014e6972ea5a25134c35fd29be7a8f8574168cbb5a9  0001-functions-fix-abuild-A.patch"