From 8378bbb950c224be87a4b5b7b59623d907a1ee4f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 8 Nov 2022 22:36:31 -0500
Subject: [PATCH 1/2] common/hooks/do-extract/00-distfiles.sh: support deb
 files

---
 common/hooks/do-extract/00-distfiles.sh | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/common/hooks/do-extract/00-distfiles.sh b/common/hooks/do-extract/00-distfiles.sh
index c173fe2af1ea..309504d657c0 100644
--- a/common/hooks/do-extract/00-distfiles.sh
+++ b/common/hooks/do-extract/00-distfiles.sh
@@ -3,7 +3,7 @@
 
 hook() {
 	local srcdir="$XBPS_SRCDISTDIR/$pkgname-$version"
-	local f j curfile found extractdir innerdir num_dirs
+	local f j curfile found extractdir innerdir innerfile num_dirs
 	local TAR_CMD
 
 	if [ -z "$distfiles" -a -z "$checksum" ]; then
@@ -62,6 +62,7 @@ hook() {
 		*.tar)        cursufx="tar";;
 		*.zip)        cursufx="zip";;
 		*.rpm)        cursufx="rpm";;
+		*.deb)        cursufx="deb";;
 		*.patch)      cursufx="txt";;
 		*.diff)       cursufx="txt";;
 		*.txt)        cursufx="txt";;
@@ -84,7 +85,7 @@ hook() {
 			cd "$extractdir"
 			case ${cursufx} in
 			gz)
-				 gunzip -f $curfile
+				gunzip -f $curfile
 				;;
 			bz2)
 				bunzip2 -f $curfile
@@ -120,6 +121,23 @@ hook() {
 				msg_error "$pkgver: cannot find rpmextract for extraction.\n"
 			fi
 			;;
+		deb)
+			cd "$extractdir"
+			innerfile="$(ar t $srcdir/$curfile | grep '^data\.tar')"
+			if [ $? -ne 0 ]; then
+				msg_error "$pkgver: unable to find data archive inside $curfile.\n"
+			fi
+			ar x "$srcdir/$curfile" "$innerfile"
+			if [ $? -ne 0 ]; then
+				msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
+			fi
+			mkdir -p "${curfile%.deb}"
+			$TAR_CMD -x --no-same-permissions --no-same-owner -f "${innerfile}" -C "${curfile%.deb}"
+			if [ $? -ne 0 ]; then
+				msg_error "$pkgver: extracting $innerfile from $curfile into $XBPS_BUILDDIR.\n"
+			fi
+			rm "${innerfile}"
+			;;
 		txt)
 			cp -f $srcdir/$curfile "$extractdir"
 			;;

From 0332e51da989cab1555077335ea649f48351729f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 9 Nov 2022 18:11:09 +0700
Subject: [PATCH 2/2] fixup! common/hooks/do-extract/00-distfiles.sh: support
 deb files

---
 common/hooks/do-extract/00-distfiles.sh | 34 +++++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/common/hooks/do-extract/00-distfiles.sh b/common/hooks/do-extract/00-distfiles.sh
index 309504d657c0..b666825fb29f 100644
--- a/common/hooks/do-extract/00-distfiles.sh
+++ b/common/hooks/do-extract/00-distfiles.sh
@@ -122,21 +122,27 @@ hook() {
 			fi
 			;;
 		deb)
-			cd "$extractdir"
-			innerfile="$(ar t $srcdir/$curfile | grep '^data\.tar')"
-			if [ $? -ne 0 ]; then
-				msg_error "$pkgver: unable to find data archive inside $curfile.\n"
-			fi
-			ar x "$srcdir/$curfile" "$innerfile"
-			if [ $? -ne 0 ]; then
-				msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
-			fi
-			mkdir -p "${curfile%.deb}"
-			$TAR_CMD -x --no-same-permissions --no-same-owner -f "${innerfile}" -C "${curfile%.deb}"
-			if [ $? -ne 0 ]; then
-				msg_error "$pkgver: extracting $innerfile from $curfile into $XBPS_BUILDDIR.\n"
+			if command -v bsdtar &>/dev/null; then
+				bsdtar -x -O -f "$srcdir/$curfile" "data.tar.*" |
+				bsdtar -C "$extractdir" -x --no-same-permissions --no-same-owner
+				if [ $? -ne 0 ]; then
+					msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
+				fi
+			else
+			(
+				cd "$extractdir"
+				if innerfile="$(ar t $srcdir/$curfile | grep '^data\.tar')"; then
+					msg_error "$pkgver: unable to find data archive inside $curfile.\n"
+				fi
+				if ! ar x "$srcdir/$curfile" "$innerfile"; then
+					msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
+				fi
+				if ! $TAR_CMD -x --no-same-permissions --no-same-owner -f "${innerfile}"; then
+					msg_error "$pkgver: extracting $innerfile from $curfile into $XBPS_BUILDDIR.\n"
+				fi
+				rm "${innerfile}"
+			)
 			fi
-			rm "${innerfile}"
 			;;
 		txt)
 			cp -f $srcdir/$curfile "$extractdir"