From c8e473f23c936026414f8ce8b9bf980efde53796 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 28 Nov 2020 17:46:44 +0100
Subject: [PATCH] debootstrap: use bsdtar instead of ar + more robust archs

---
 srcpkgs/debootstrap/template | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template
index 0f642ca4ebd..f1be3ccca07 100644
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@@ -1,7 +1,7 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
 version=1.0.123
-revision=1
+revision=2
 build_style=fetch
 depends="binutils gnupg gzip tar wget xz"
 short_desc="Bootstrap a basic Debian system"
@@ -13,20 +13,24 @@ distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb
 checksum="0ab37218fa9719517fccee68b552545f17a5336bbf5801c6d565213ca1aa014e
  9cefd8917f3d97a999c136aa87f04a3024408b5bc1de470de7d6dfa5e4bd4361"
 
+case "$XBPS_TARGET_MACHINE" in
+	armv5*l*) _debarch=armel;;
+	arm*l*) _debarch=armhf;;
+	aarch64*) _debarch=arm64;;
+	x86_64*) _debarch=amd64;;
+	i686*) _debarch=i386;;
+	ppc64le*) _debarch=ppc64el;;
+	ppc64*) _debarch=ppc64;;
+	ppc*) _debarch=powerpc;;
+	*) broken="please add your architecture";;
+esac
+
 do_install() {
-	ar p ${pkgname}_${version}_all.deb data.tar.gz | bsdtar xvzf - -C ${DESTDIR}
-	ar p debian-archive-keyring_2019.1_all.deb data.tar.xz | bsdtar xvJf - -C ${DESTDIR} ./usr/share/keyrings/debian-archive-keyring.gpg
+	bsdtar xOf ${pkgname}_${version}_all.deb data.tar.gz | bsdtar xvzf - -C ${DESTDIR}
+	bsdtar xOf debian-archive-keyring_2019.1_all.deb data.tar.xz | bsdtar xvJf - -C ${DESTDIR} ./usr/share/keyrings/debian-archive-keyring.gpg
 	mv ${DESTDIR}/usr/sbin ${DESTDIR}/usr/bin
 	sed -i 's|export PATH|export PATH="/usr/sbin:/sbin:/usr/bin:/bin"|' ${DESTDIR}/usr/bin/debootstrap
 	vlicense ${DESTDIR}/usr/share/doc/debootstrap/copyright LICENSE
 	rm ${DESTDIR}/usr/share/doc/debootstrap/copyright
-	case "$XBPS_TARGET_MACHINE" in
-		arm*) echo armhf;;
-		i686*) echo i386;;
-		x86_64*) echo amd64;;
-		aarch64*) echo arm64;;
-		ppc64le*) echo ppc64el;;
-		ppc64*) echo ppc64;;
-		*) uname -m;;
-	esac >${DESTDIR}/usr/share/debootstrap/arch
+	echo ${_debarch} >${DESTDIR}/usr/share/debootstrap/arch
 }