File:  [cvs.NetBSD.org] / pkgsrc / sysutils / sandboxctl / patches / patch-sandbox.subr.in
Revision 1.1: download - view: text, annotated - select for diffs
Fri Sep 20 22:31:30 2019 UTC (5 years, 7 months ago) by maya
Branches: MAIN
CVS tags: pkgsrc-2025Q1-base, pkgsrc-2025Q1, pkgsrc-2024Q4-base, pkgsrc-2024Q4, pkgsrc-2024Q3-base, pkgsrc-2024Q3, pkgsrc-2024Q2-base, pkgsrc-2024Q2, pkgsrc-2024Q1-base, pkgsrc-2024Q1, pkgsrc-2023Q4-base, pkgsrc-2023Q4, pkgsrc-2023Q3-base, pkgsrc-2023Q3, pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1, pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, HEAD
sandboxctl: don't use tar -e on netbsd. it's not supported by the newly
default libarchive tar.

From Robert Nestor on pkgsrc-users.
bump PKGREVISION

$NetBSD: patch-sandbox.subr.in,v 1.1 2019/09/20 22:31:30 maya Exp $

Don't use tar -e on netbsd. It's not supported by libarchive tar,
the default since NetBSD 9.x.

--- sandbox.subr.in.orig	2019-01-14 02:17:11.000000000 +0000
+++ sandbox.subr.in
@@ -366,19 +366,12 @@ sandbox_extract() {
         *) shtk_cli_error "Cannot determine compression format for ${file}"
     esac
 
-    local tar_extra_flags=
-    case "$(uname -s)" in
-        NetBSD)
-            tar_extra_flags=e  # Stop on first error.
-            ;;
-    esac
-
     if shtk_cli_log_level debug && which progress >/dev/null 2>&1 \
         && [ "${format}" = z ]; then
-        progress -zf "${file}" tar "-${tar_extra_flags}xp" -C "${dir}" \
+        progress -zf "${file}" tar "-xp" -C "${dir}" \
             -f - "${@}"  || shtk_cli_error "Extraction of ${file} failed"
     else
-        tar "-${tar_extra_flags}x${format}p" -f "${file}" -C "${dir}" "${@}" \
+        tar "-x${format}p" -f "${file}" -C "${dir}" "${@}" \
             || shtk_cli_error "Extraction of ${file} failed"
     fi
 }

CVSweb <webmaster@jp.NetBSD.org>