From cd3fb17aa6a2568198d380c6a57a8a47de245dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sat, 8 May 2021 12:32:40 +0100
Subject: [PATCH] Unpack tarballs with --no-same-owner.

---
 sysa/helpers.sh | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/sysa/helpers.sh b/sysa/helpers.sh
index 820b85c..ae63636 100755
--- a/sysa/helpers.sh
+++ b/sysa/helpers.sh
@@ -76,22 +76,29 @@ build () {
 default_src_unpack() {
     src_dir="${base_dir}/src"
 
-    for i in "${src_dir}"/*.tar.gz; do
-        [ -e "${i}" ] || continue
-        tar -xzf "${i}"
-    done
-    for i in "${src_dir}"/*.tar.bz2; do
-        [ -e "${i}" ] || continue
-        tar -xf "${i}" --use-compress-program=bzip2
-    done
-    for i in "${src_dir}"/*.tar.xz; do
-        [ -e "${i}" ] || continue
-        tar -xf "${i}" --use-compress-program=xz
-    done
-    for i in "${src_dir}"/*.tar; do
-        [ -e "${i}" ] || continue
-        tar -xf "${i}"
-    done
+    # Check for new tar
+    if test -e "${PREFIX}/libexec/rmt"; then
+        for i in "${src_dir}"/*; do
+            tar --no-same-owner -xf "${i}"
+        done
+    else
+        for i in "${src_dir}"/*.tar.gz; do
+            [ -e "${i}" ] || continue
+            tar -xzf "${i}"
+        done
+        for i in "${src_dir}"/*.tar.bz2; do
+            [ -e "${i}" ] || continue
+            tar -xf "${i}" --use-compress-program=bzip2
+        done
+        for i in "${src_dir}"/*.tar.xz; do
+            [ -e "${i}" ] || continue
+            tar -xf "${i}" --use-compress-program=xz
+        done
+        for i in "${src_dir}"/*.tar; do
+            [ -e "${i}" ] || continue
+            tar -xf "${i}"
+        done
+    fi
 }
 
 # Default function to prepare source code.