X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e9795f20dea9c57d459a3dceacce1aae6f795636..883187f2124e3a0eaa845cfbe76e3fe0a2612e84:/packages/debootstrap/functions.patch

diff --git a/packages/debootstrap/functions.patch b/packages/debootstrap/functions.patch
index 3ade3339..67c7a994 100644
--- a/packages/debootstrap/functions.patch
+++ b/packages/debootstrap/functions.patch
@@ -1,26 +1,24 @@
-diff --git a/functions b/functions
-index e22d4a0..ce731b6 100644
---- a/functions
-+++ b/functions
-@@ -883,7 +883,7 @@ extract_dpkg_deb_field () {
+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 @@
  extract_dpkg_deb_data () {
  	local pkg="$1"
-
+ 
 -	dpkg-deb --fsys-tarfile "$pkg" | tar $EXTRACT_DEB_TAR_OPTIONS -xf -
 +	dpkg-deb --fsys-tarfile "$pkg" | proot --link2symlink tar $EXTRACT_DEB_TAR_OPTIONS -xf -
  }
-
+ 
  # Raw .deb extractors
-@@ -921,7 +921,7 @@ extract_ar_deb_data () {
- 	esac
-
- 	if type $cat_cmd >/dev/null 2>&1; then
--		ar -p "$pkg" "$tarball" | $cat_cmd | tar $EXTRACT_DEB_TAR_OPTIONS -xf -
+@@ -922,6 +922,7 @@
+ 
+ 	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 +1139,6 @@ setup_devices () {
+@@ -1139,7 +1140,6 @@
  	    hurd*)
  		;;
  	    *)