Merge branch 'master' into zfs

3 files changed, 64 insertions, 12 deletions

diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD
index 30428a27c..53d53a818 100644
--- a/system/abuild/APKBUILD
+++ b/system/abuild/APKBUILD
@@ -1,11 +1,13 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=abuild
-pkgver=3.3.1
+pkgver=3.4.1
 pkgrel=2
 pkgdesc="Script to build APK packages"
 url="https://code.foxkit.us/adelie/abuild"
 arch="all"
+options="suid !check"
 license="GPL-2.0-only"
+pkggroups="abuild"
 depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 libc-utils
 	attr libarchive-tools pkgconf patch lzip"
 if [ "$CBUILD" = "$CHOST" ]; then
@@ -14,14 +16,13 @@ fi
 makedepends_build="pkgconfig"
 makedepends_host="openssl-dev zlib-dev"
 makedepends="$makedepends_host $makedepends_build"
-install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="abuild-rootbld:_rootbld:noarch $pkgname-doc"
-options="suid !check"
-pkggroups="abuild"
-source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz
+install="$pkgname.pre-install $pkgname.pre-upgrade"
+source="https://distfiles.adelielinux.org/source/abuild-$pkgver.tar.xz
+	apkpath.patch
+	fix-apk-invocation.patch
 	keyhole.patch
 	"
-builddir="$srcdir/$pkgname-$pkgver+adelie"
 
 # secfixes:
 #   3.3.1-r1:
@@ -29,19 +30,14 @@ builddir="$srcdir/$pkgname-$pkgver+adelie"
 
 prepare() {
 	default_prepare
-
-	cd "$builddir"
 	sed -i -e "/^CHOST=/s/=.*/=$CHOST/" abuild.conf
 }
 
 build() {
-	cd "$builddir"
 	make VERSION="$pkgver-r$pkgrel"
 }
 
 package() {
-	cd "$builddir"
-
 	make install VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir"
 
 	install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
@@ -59,5 +55,7 @@ _rootbld() {
 	mkdir -p "$subpkgdir"
 }
 
-sha512sums="c358f84d198527eeeac1a1aacc101174e18f9f34f692b12a4e4deb6b32d5f3ebdc703c90de6a6f81f195a81eebb90a11f9bfea13ef5db531d9b5d5ae6ecd6a66  abuild-3.3.1+adelie.tar.xz
+sha512sums="6446171cc68d8341b5267816e7a05e0dc7b8a4e89c8c8410ae61e9501b163cc32db888476b14f032c16ef15bdd4dd4844e087394c2d061db8281f7bdfb34d450  abuild-3.4.1.tar.xz
+bc373c93344d498a48675256bb26cf9bebac74f54d8e53a09c0975e3047c481ee35c6b88e5de392efd2d0ce2a8de23ebbf0822e1a093ee01ea99349f238c62f7  apkpath.patch
+4ae8a0d7efb94e8390250c2c43294ba40afcf27409257cccffb9315f00e887972e29573ddbfb830a82eab473c6d292fe7a1bf30fb9761b6fa24b8fe8c0940c79  fix-apk-invocation.patch
 757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d  keyhole.patch"
diff --git a/system/abuild/apkpath.patch b/system/abuild/apkpath.patch
new file mode 100644
index 000000000..4390fe0b0
--- /dev/null
+++ b/system/abuild/apkpath.patch
@@ -0,0 +1,25 @@
+From d9811dee71cfafde1fe6d596a2b9922b60dd0c4f Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Fri, 21 Feb 2020 19:28:36 -0600
+Subject: [PATCH] abuild: Solve, once and for all, 'apk: not found'
+
+---
+ abuild.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/abuild.in b/abuild.in
+index 1b8898b..2212789 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -23,7 +23,7 @@ fi
+ # defaults
+ : ${FAKEROOT:="fakeroot"}
+ : ${SUDO_APK:="abuild-apk"}
+-: ${APK:="apk"}
++: ${APK:="/sbin/apk"}
+ : ${ADDUSER:="abuild-adduser"}
+ : ${ADDGROUP:="abuild-addgroup"}
+ 
+-- 
+2.25.0
+
diff --git a/system/abuild/fix-apk-invocation.patch b/system/abuild/fix-apk-invocation.patch
new file mode 100644
index 000000000..71bc3d1c9
--- /dev/null
+++ b/system/abuild/fix-apk-invocation.patch
@@ -0,0 +1,29 @@
+From 9f703d3222a6a8d52ac560035fb1a988d2f9bff7 Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Thu, 27 Feb 2020 04:41:04 -0600
+Subject: [PATCH] abuild: Use $APK instead of apk
+
+This is the only appearance of `apk` in the source.  Appears accidental.
+
+Fixes: 41343329 ("abuild: fix dependency tracing for cross builds")
+Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
+---
+ abuild.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/abuild.in b/abuild.in
+index 2212789..7daa366 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -1255,7 +1255,7 @@ trace_apk_deps() {
+ 			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")"
++			local provider="$($APK $apkroot search --quiet "pc:$i")"
+ 			if list_has "$provider" $depends_dev; then
+ 				warning "$provider should be removed from depends_dev"
+ 			fi
+-- 
+2.25.1
+