From 883187f2124e3a0eaa845cfbe76e3fe0a2612e84 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 9 Aug 2017 23:18:25 +0200
Subject: [PATCH 1/1] debootstrap: Update from 1.0.90 to 1.0.91

Fixes #1232.
---
 packages/debootstrap/build.sh        |  4 ++--
 packages/debootstrap/functions.patch | 24 +++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/packages/debootstrap/build.sh b/packages/debootstrap/build.sh
index 376b1cb8..fc8e66bc 100644
--- a/packages/debootstrap/build.sh
+++ b/packages/debootstrap/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://wiki.debian.org/Debootstrap
 TERMUX_PKG_DESCRIPTION="Bootstrap a basic Debian system"
-TERMUX_PKG_VERSION=1.0.90
+TERMUX_PKG_VERSION=1.0.91
+TERMUX_PKG_SHA256=65947fd131217867ce774c4b00d16d6d082da21751b4338cfe9270970fdbe011
 TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=4d1f434b093051a27fe9482063e2b09aa88cdcc51877228b04729e302ba9145e
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="wget, proot"
 TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff"
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*)
  		;;
  	    *)
-- 
2.11.0