X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/ecb00a9a43a563a72a97a3ab59b7daf0d6b1de5c..HEAD:/packages/debootstrap/debootstrap.patch

diff --git a/packages/debootstrap/debootstrap.patch b/packages/debootstrap/debootstrap.patch
index 4451783f..ca99a08e 100644
--- a/packages/debootstrap/debootstrap.patch
+++ b/packages/debootstrap/debootstrap.patch
@@ -1,8 +1,7 @@
-diff --git a/debootstrap b/debootstrap
-index 4658e0f..1672990 100755
---- a/debootstrap
-+++ b/debootstrap
-@@ -14,7 +14,7 @@ if [ -z "$DEBOOTSTRAP_DIR" ]; then
+diff -u -r ../debootstrap-1.0.97/debootstrap ./debootstrap
+--- ../debootstrap-1.0.97/debootstrap	2018-04-17 04:06:32.000000000 +0200
++++ ./debootstrap	2018-04-30 03:14:32.764728670 +0200
+@@ -14,7 +14,7 @@
  	if [ -x /debootstrap/debootstrap ]; then
  		DEBOOTSTRAP_DIR=/debootstrap
  	else
@@ -10,36 +9,36 @@ index 4658e0f..1672990 100755
 +		DEBOOTSTRAP_DIR=$PREFIX/share/debootstrap
  	fi
  fi
-
-@@ -421,10 +421,10 @@ fi
-
+ 
+@@ -468,10 +468,10 @@
+ 
  if in_path dpkg && \
       dpkg --print-architecture >/dev/null 2>&1; then
--	HOST_ARCH=`/usr/bin/dpkg --print-architecture`
-+	HOST_ARCH=`$PREFIX/bin/dpkg --print-architecture`
+-	HOST_ARCH=$(/usr/bin/dpkg --print-architecture)
++	HOST_ARCH=$($PREFIX/bin/dpkg --print-architecture)
  elif in_path udpkg && \
       udpkg --print-architecture >/dev/null 2>&1; then
--	HOST_ARCH=`/usr/bin/udpkg --print-architecture`
-+	HOST_ARCH=`$PREFIX/bin/udpkg --print-architecture`
- elif [ -e $DEBOOTSTRAP_DIR/arch ]; then
- 	HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`
+-	HOST_ARCH=$(/usr/bin/udpkg --print-architecture)
++	HOST_ARCH=$($PREFIX/bin/udpkg --print-architecture)
+ elif [ -e "$DEBOOTSTRAP_DIR/arch" ]; then
+ 	HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch")
  fi
-@@ -465,7 +465,8 @@ fi
+@@ -512,7 +512,8 @@
  if [ "$TARGET" = "/" ]; then
  	CHROOT_CMD=""
  else
--	CHROOT_CMD="chroot $TARGET"
+-	CHROOT_CMD="chroot \"$TARGET\""
 +	PATH=$PATH:/usr/bin:/bin:/usr/sbin:/sbin
 +	CHROOT_CMD="proot -w /home -b /dev -b /proc --link2symlink -0 -r $TARGET"
  fi
-
- if [ -z "$SHA_SIZE" ]; then
-@@ -478,16 +479,6 @@ DEBOOTSTRAP_CHECKSUM_FIELD="SHA$SHA_SIZE"
-
+ 
+ # fakeroot cannot check /proc/1/environ
+@@ -532,16 +533,6 @@
+ 
  export ARCH SUITE TARGET CHROOT_CMD SHA_SIZE DEBOOTSTRAP_CHECKSUM_FIELD
-
+ 
 -if am_doing_phase first_stage second_stage; then
--	if in_path id && [ `id -u` -ne 0 ]; then
+-	if in_path id && [ "$(id -u)" -ne 0 ]; then
 -		error 1 NEEDROOT "debootstrap can only run as root"
 -	fi
 -	# Ensure that we can create working devices and executables on the target.