debootstrap: Update from 1.0.93 to 1.0.97

[termux-packages] / packages / debootstrap / functions.patch

diff --git a/packages/debootstrap/functions.patch b/packages/debootstrap/functions.patch
index 67c7a99..4f91e63 100644 (file)
--- a/packages/debootstrap/functions.patch
+++ b/packages/debootstrap/functions.patch
@@ -1,7 +1,7 @@
-diff -u -r ../debootstrap-1.0.91/functions ./functions
---- ../debootstrap-1.0.91/functions    2017-07-25 05:02:27.000000000 +0200
-+++ ./functions        2017-08-09 23:16:36.589942373 +0200
-@@ -883,7 +883,7 @@
+diff -u -r ../debootstrap-1.0.97/functions ./functions
+--- ../debootstrap-1.0.97/functions    2018-04-17 04:06:32.000000000 +0200
++++ ./functions        2018-04-30 03:18:01.010494588 +0200
+@@ -906,7 +906,7 @@
  extract_dpkg_deb_data () {
        local pkg="$1"
  
@@ -10,15 +10,16 @@ diff -u -r ../debootstrap-1.0.91/functions ./functions
  }
  
  # Raw .deb extractors
-@@ -922,6 +922,7 @@
+@@ -946,7 +946,7 @@
+       esac
  
-       if in_path $cat_cmd; then
-               ar -p "$pkg" "$tarball" | $cat_cmd | tar $EXTRACT_DEB_TAR_OPTIONS -xf -
-+              ar -p "$pkg" "$tarball" | $cat_cmd | proot --link2symlink tar $EXTRACT_DEB_TAR_OPTIONS -xf -
+       if in_path "$cat_cmd"; then
+-              ar -p "$pkg" "$tarball" | "$cat_cmd" | tar $EXTRACT_DEB_TAR_OPTIONS -xf -
++              ar -p "$pkg" "$tarball" | "$cat_cmd" | proot --link2symlink tar $EXTRACT_DEB_TAR_OPTIONS -xf -
        else
                error 1 UNPACKCMDUNVL "Extracting %s requires the %s command, which is not available" "$pkg" "$cat_cmd"
        fi
-@@ -1139,7 +1140,6 @@
+@@ -1171,7 +1171,6 @@
            hurd*)
                ;;
            *)