diff --git a/packages/debootstrap/build.sh b/packages/debootstrap/build.sh index 9806d5a05..6befc0438 100644 --- a/packages/debootstrap/build.sh +++ b/packages/debootstrap/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://wiki.debian.org/Debootstrap TERMUX_PKG_DESCRIPTION="Bootstrap a basic Debian system" -TERMUX_PKG_VERSION=1.0.106 -TERMUX_PKG_SHA256=4ffcd12477540cbccdbed7c254f77797b886228ca94e749414d0380eab62c26e +TERMUX_PKG_VERSION=1.0.108 +TERMUX_PKG_SHA256=2e41b2ed540e1144a1f50f3b1fc04f300c3008096d6983c21afd4d5d4d34d7fd TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="wget, proot, perl" diff --git a/packages/debootstrap/debootstrap.patch b/packages/debootstrap/debootstrap.patch index fb2b2c53f..7454873c3 100644 --- a/packages/debootstrap/debootstrap.patch +++ b/packages/debootstrap/debootstrap.patch @@ -1,6 +1,6 @@ -diff -uNr debootstrap-1.0.106/debootstrap debootstrap-1.0.106.mod/debootstrap ---- debootstrap-1.0.106/debootstrap 2018-07-05 11:48:22.000000000 +0300 -+++ debootstrap-1.0.106.mod/debootstrap 2018-07-10 17:32:34.599933159 +0300 +diff -u -r ../debootstrap-1.0.108/debootstrap ./debootstrap +--- ../debootstrap-1.0.108/debootstrap 2018-08-12 08:58:37.000000000 +0000 ++++ ./debootstrap 2018-08-27 19:44:25.479843110 +0000 @@ -3,7 +3,7 @@ VERSION='@VERSION@' @@ -19,7 +19,7 @@ diff -uNr debootstrap-1.0.106/debootstrap debootstrap-1.0.106.mod/debootstrap fi fi -@@ -483,10 +483,10 @@ +@@ -500,14 +500,31 @@ if in_path dpkg && \ dpkg --print-architecture >/dev/null 2>&1; then @@ -32,7 +32,28 @@ diff -uNr debootstrap-1.0.106/debootstrap debootstrap-1.0.106.mod/debootstrap elif [ -e "$DEBOOTSTRAP_DIR/arch" ]; then HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch") fi -@@ -527,12 +527,8 @@ + HOST_OS="$HOST_ARCH" ++ ++# Translate Termux arch names to those of Debian: ++case $HOST_ARCH in ++ arm) ++ HOST_ARCH=armel ++ ;; ++ aarch64) ++ HOST_ARCH=arm64 ++ ;; ++ i686) ++ HOST_ARCH=i386 ++ ;; ++ x86_64) ++ HOST_ARCH=amd64 ++ ;; ++esac ++ + # basic host OS guessing for non-Debian systems + if [ -z "$HOST_OS" ]; then + case $(uname) in +@@ -544,12 +561,8 @@ if [ "$TARGET" = "/" ]; then CHROOT_CMD="" else @@ -47,7 +68,7 @@ diff -uNr debootstrap-1.0.106/debootstrap debootstrap-1.0.106.mod/debootstrap fi if [ -z "$SHA_SIZE" ]; then -@@ -546,16 +542,6 @@ +@@ -563,16 +576,6 @@ export ARCH SUITE TARGET CHROOT_CMD SHA_SIZE DEBOOTSTRAP_CHECKSUM_FIELD diff --git a/packages/debootstrap/functions.patch b/packages/debootstrap/functions.patch index 736028afc..b56a68f78 100644 --- a/packages/debootstrap/functions.patch +++ b/packages/debootstrap/functions.patch @@ -1,7 +1,7 @@ -diff -uNr debootstrap-1.0.106/functions debootstrap-1.0.106.mod/functions ---- debootstrap-1.0.106/functions 2018-07-05 11:48:22.000000000 +0300 -+++ debootstrap-1.0.106.mod/functions 2018-07-10 17:20:18.985640585 +0300 -@@ -220,17 +220,7 @@ +diff -u -r ../debootstrap-1.0.108/functions ./functions +--- ../debootstrap-1.0.108/functions 2018-08-12 08:58:37.000000000 +0000 ++++ ./functions 2018-08-27 19:32:04.844265965 +0000 +@@ -230,17 +230,7 @@ } detect_container () { @@ -20,16 +20,16 @@ diff -uNr debootstrap-1.0.106/functions debootstrap-1.0.106.mod/functions } ########################################################## variant handling -@@ -924,7 +914,7 @@ +@@ -945,7 +935,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 - +- dpkg-deb --fsys-tarfile "$pkg" | tar $EXTRACT_DEB_TAR_OPTIONS -xf - || error 1 FILEEXIST "Tried to extract package, but file already exists. Exit..." ++ dpkg-deb --fsys-tarfile "$pkg" | proot --link2symlink tar $EXTRACT_DEB_TAR_OPTIONS -xf - || error 1 FILEEXIST "Tried to extract package, but file already exists. Exit..." } # Raw .deb extractors -@@ -964,7 +954,7 @@ +@@ -985,7 +975,7 @@ esac if in_path "$cat_cmd"; then @@ -38,7 +38,7 @@ diff -uNr debootstrap-1.0.106/functions debootstrap-1.0.106.mod/functions else error 1 UNPACKCMDUNVL "Extracting %s requires the %s command, which is not available" "$pkg" "$cat_cmd" fi -@@ -1020,7 +1010,7 @@ +@@ -1041,7 +1031,7 @@ ); } in_target_nofail () { @@ -47,7 +47,7 @@ diff -uNr debootstrap-1.0.106/functions debootstrap-1.0.106.mod/functions true fi return 0 -@@ -1032,7 +1022,7 @@ +@@ -1053,7 +1043,7 @@ msg="$2" arg="$3" shift; shift; shift @@ -56,7 +56,7 @@ diff -uNr debootstrap-1.0.106/functions debootstrap-1.0.106.mod/functions warning "$code" "$msg" "$arg" # Try to point user at actual failing package. msg="See %s for details" -@@ -1184,7 +1174,6 @@ +@@ -1209,7 +1199,6 @@ return 0 fi