From ff32e1e943d15a805615ccdd84ec40e4b540daff Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 20 Feb 2022 22:45:28 -0600
Subject: system/abuild: Update for libarchive 3.6

---
 system/abuild/APKBUILD         |  6 ++++--
 system/abuild/libarchive.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 system/abuild/libarchive.patch

(limited to 'system/abuild')

diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD
index d5c3a55fd..1f70cacf8 100644
--- a/system/abuild/APKBUILD
+++ b/system/abuild/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=abuild
 pkgver=3.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Script to build APK packages"
 url="https://git.adelielinux.org/adelie/abuild"
 arch="all"
@@ -21,6 +21,7 @@ install="$pkgname.pre-install $pkgname.pre-upgrade"
 source="https://distfiles.adelielinux.org/source/abuild-$pkgver.tar.xz
 	inode.patch
 	keyhole.patch
+	libarchive.patch
 	"
 
 # secfixes:
@@ -56,4 +57,5 @@ _rootbld() {
 
 sha512sums="9bdeb31f54879878697b4a5436ec2bc7764e1b9840798e913ba3dd47c344437e362a3067b89440ca8a7940af1efcaa83a24e7c1077187f924bf73fb058f97fbf  abuild-3.4.2.tar.xz
 53b0f2c15da767fbdde5a28b6f428943907e8752490ffae580e4a4198fea76fd71fc253a526c81bbbf17311ce3c72a563649a416ea0fda219a35cee50fcd46d1  inode.patch
-757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d  keyhole.patch"
+757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d  keyhole.patch
+2452a2b2ecf64bb6bfef1e71c35d39f02be1a5930ebd3e4c139156979b6c2249adcd4437c5c49f4af5b478f2a69529807fcbcd31ca01e6be6430165bcad74353  libarchive.patch"
diff --git a/system/abuild/libarchive.patch b/system/abuild/libarchive.patch
new file mode 100644
index 000000000..7f0132971
--- /dev/null
+++ b/system/abuild/libarchive.patch
@@ -0,0 +1,41 @@
+From 70943ead0e226e2db81f20867b11144e449b12c6 Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Sun, 20 Feb 2022 22:38:17 -0600
+Subject: [PATCH] abuild: Fix package building with libarchive >=3.6
+
+Now that we have sparse file support, libarchive wants to use it.
+
+APK doesn't support sparse file entries in tar files, so it fails to
+install any package made in this manner.
+---
+ abuild.in | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/abuild.in b/abuild.in
+index 3e83563..b0c0f9c 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -1503,7 +1503,9 @@ create_apks() {
+ 			touch .dummy
+ 			set -- .dummy
+ 		fi
+-		tar --format pax --xattrs -f - -c "$@" | abuild-tar --hash | $gzip -9 >"$dir"/data.tar.gz
++		tar --no-read-sparse --format pax --xattrs -f - -c "$@" \
++			| abuild-tar --hash \
++			| $gzip -9 >"$dir"/data.tar.gz
+ 
+ 		msg "Create checksum..."
+ 		# append the hash for data.tar.gz
+@@ -1512,7 +1514,8 @@ create_apks() {
+ 
+ 		# control.tar.gz
+ 		cd "$dir"
+-		tar --format pax -f - -c $(cat "$dir"/.metafiles) | abuild-tar --cut \
++		tar --no-read-sparse --format pax -f - -c $(cat "$dir"/.metafiles) \
++			| abuild-tar --cut \
+ 			| $gzip -9 > control.tar.gz
+ 		abuild-sign -q control.tar.gz || exit 1
+ 
+-- 
+2.32.0 (Apple Git-132)
+
-- 
cgit v1.2.3-70-g09d2