Merging upstream version 1.0.135.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

45 files changed, 42 insertions, 92 deletions

diff --git a/debootstrap b/debootstrap
index a29d289..552c8d6 100755
--- a/debootstrap
+++ b/debootstrap
@@ -50,7 +50,6 @@ CACHE_DIR=""
 INRELEASE_PATH=""
 
 DEF_MIRROR="http://deb.debian.org/debian"
-DEF_HTTPS_MIRROR="https://deb.debian.org/debian"
 
 # set $CONTAINER
 detect_container
@@ -463,7 +462,7 @@ if ! doing_variant fakechroot && command -v apt-config >/dev/null; then
     fi
     if [ -z "${http_proxy+x}" ] && [ -x "$AUTOPROXY" ]; then
         http_proxy="$($AUTOPROXY)"
-        if [ -n "$http_proxy" ]; then
+        if [ -n "$http_proxy" ] && [ "$http_proxy" != "DIRECT" ]; then
             info AUTOPROXY "Using auto-detected proxy: $http_proxy"
             export http_proxy
         fi
@@ -514,6 +513,13 @@ else
 	fi
 
 	SCRIPT="$DEBOOTSTRAP_DIR/scripts/$1"
+	if ! [ -e "$SCRIPT" ] && [ $(which distro-info 2>/dev/null) ]; then
+		if debian-distro-info --series "$1" >/dev/null 2>&1; then
+			SCRIPT="$DEBOOTSTRAP_DIR/scripts/sid"
+		elif ubuntu-distro-info --series "$1" >/dev/null 2>&1; then
+			SCRIPT="$DEBOOTSTRAP_DIR/scripts/gutsy"
+		fi
+	fi
 	if [ -n "$VARIANT" ] && [ -e "${SCRIPT}.${VARIANT}" ]; then
 		SCRIPT="${SCRIPT}.${VARIANT}"
 		SUPPORTED_VARIANTS="$VARIANT"
@@ -613,7 +619,7 @@ if am_doing_phase first_stage second_stage; then
 	fi
 	# Ensure that we can create working devices and executables on the target.
 	if ! check_sane_mount "$TARGET"; then
-		error 1 NOEXEC "Cannot install into target '$TARGET' mounted with noexec or nodev"
+		error 1 NOEXEC "Cannot install into target '$TARGET' mounted with noexec"
 	fi
 fi
 
diff --git a/functions b/functions
index 00c82fa..3c81524 100644
--- a/functions
+++ b/functions
@@ -217,9 +217,9 @@ keyring () {
 		if [ -e "$1" ]; then
 			KEYRING="$1"
 		elif [ -z "$DISABLE_KEYRING" ]; then
-			if [ -n "$DEF_HTTPS_MIRROR" ] && [ -z "$USER_MIRROR" ] && [ -z "$FORCE_KEYRING" ]; then
-				info KEYRING "Keyring file not available at %s; switching to https mirror %s" "$1" "$DEF_HTTPS_MIRROR"
-				USER_MIRROR="$DEF_HTTPS_MIRROR"
+			if [ -z "$USER_MIRROR" ] && [ -z "$FORCE_KEYRING" ]; then
+				info KEYRING "Keyring file not available at %s; switching to https mirror %s" "$1" "https://${DEF_MIRROR#http://}"
+				USER_MIRROR="https://${DEF_MIRROR#http://}"
 			else
 				warning KEYRING "Cannot check Release signature; keyring file not available %s" "$1"
 				if [ -n "$FORCE_KEYRING" ]; then
@@ -1306,7 +1306,8 @@ setup_devices () {
 		touch "$TARGET/dev/console"
 		;;
 	    *)
-		if ! setup_devices_simple; then
+		if ! setup_devices_simple ||
+		   !  sh -c ': >"$1"' -- "$TARGET/dev/null" 2>/dev/null; then
 			setup_devices_bind
 		fi
 		;;
@@ -1673,7 +1674,7 @@ while (read STDIN, $x, 1) {
 }' "$@"
 		elif [ "$1" = "GETDEPS" ]; then
 			local pkgdest="$2"; shift; shift
-LC_ALL=C grep "$gropt" '^$|^Package:|^Depends:|^Pre-Depends:'  $pkgdest | perl -e '
+LC_ALL=C grep "$gropt" '^$|^Package:|^Depends:|^Pre-Depends:' "${pkgdest}" | perl -e '
 %seen = map { $_ => 1 } @ARGV;
 while (<STDIN>) {
 	if (/^Package: (.*)$/) {
@@ -1836,13 +1837,10 @@ check_sane_mount () {
 		  lxc|lxc-libvirt|mmdebstrap-unshare)
 		    ;;
 		  *)
-		    if mknod "$1/test-dev-null" c 1 3 2>/dev/null; then
-			if ! echo test > "$1/test-dev-null"; then
-			    rm -f "$1/test-dev-null"
-			    return 1
-			fi
-		    else
-			# mknod failed. Try if bind-mounting works
+		    if ! mknod "$1/test-dev-null" c 1 3 2>/dev/null ||
+		       ! echo test > "$1/test-dev-null"; then
+			# mknod failed (e.g. user namespace) or writing failed
+			# (e.g. nodev). Try if bind-mounting works
 			touch "$1/test-dev-null"
 			if ! mount -o bind /dev/null "$1/test-dev-null"; then
 			    rm -f "$1/test-dev-null"
diff --git a/scripts/artful b/scripts/artful
deleted file mode 120000
index 3840936..0000000
--- a/scripts/artful
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/bionic b/scripts/bionic
deleted file mode 120000
index 3840936..0000000
--- a/scripts/bionic
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/bookworm b/scripts/bookworm
deleted file mode 120000
index 9a63c96..0000000
--- a/scripts/bookworm
+++ /dev/null
@@ -1 +0,0 @@
-sid
\ No newline at end of file
diff --git a/scripts/bullseye b/scripts/bullseye
deleted file mode 120000
index 9a63c96..0000000
--- a/scripts/bullseye
+++ /dev/null
@@ -1 +0,0 @@
-sid
\ No newline at end of file
diff --git a/scripts/buster b/scripts/buster
deleted file mode 120000
index 9a63c96..0000000
--- a/scripts/buster
+++ /dev/null
@@ -1 +0,0 @@
-sid
\ No newline at end of file
diff --git a/scripts/cosmic b/scripts/cosmic
deleted file mode 120000
index 3840936..0000000
--- a/scripts/cosmic
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/disco b/scripts/disco
deleted file mode 120000
index 3840936..0000000
--- a/scripts/disco
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/eoan b/scripts/eoan
deleted file mode 120000
index 3840936..0000000
--- a/scripts/eoan
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/focal b/scripts/focal
deleted file mode 120000
index 3840936..0000000
--- a/scripts/focal
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/groovy b/scripts/groovy
deleted file mode 120000
index 3840936..0000000
--- a/scripts/groovy
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/gutsy b/scripts/gutsy
index 10750a8..6f23476 100644
--- a/scripts/gutsy
+++ b/scripts/gutsy
@@ -1,33 +1,24 @@
-case $ARCH in
-  amd64|i386)
-	case $SUITE in
-	  gutsy|hardy|intrepid|jaunty|karmic|lucid|maverick|natty|oneiric|precise|quantal|raring|saucy|utopic|vivid|wily|yakkety|zesty)
-	default_mirror http://old-releases.ubuntu.com/ubuntu
-	  ;;
-	  *)
-	default_mirror http://archive.ubuntu.com/ubuntu
-	;;
+if ubuntu-distro-info --supported | grep "$SUITE" >/dev/null 2>&1; then
+	case "$ARCH" in
+		amd64|i386)
+			default_mirror http://archive.ubuntu.com/ubuntu
+		;;
+		*)
+			default_mirror http://ports.ubuntu.com/ubuntu-ports
+		;;
 	esac
-	;;
-  sparc)
-	case $SUITE in
-	  gutsy)
+	keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
+else
 	default_mirror http://old-releases.ubuntu.com/ubuntu
-	;;
-	  *)
-	default_mirror http://ports.ubuntu.com/ubuntu-ports
-	;;
-	esac
-	;;
-  *)
-	default_mirror http://ports.ubuntu.com/ubuntu-ports
-	;;
-esac
+	keyring /usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+fi
+# Note: The "removed keys" does not automatically tally with unsupported releases.
+# In this case the user will need to use the --keyring= switch.
+
 mirror_style release
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase
-keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -40,17 +31,14 @@ case $ARCH in
 	*)          LIBC="libc6" ;;
 esac
 
-case $SUITE in
-	gutsy|hardy|intrepid|jaunty|karmic|lucid|maverick|natty|oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid|wily|xenial|yakkety|zesty|artful|bionic|cosmic|disco|eoan|focal|groovy|hirsute) ;;
-	*)
-		# impish+ will use zstd compression, check if supported
-		dpkg_zstd="$(dpkg-deb --help 2>/dev/null | grep ' zstd,' || :)"
-		if [ -z "$EXTRACTOR_OVERRIDE" ] && [ -z "$dpkg_zstd" ]; then
-			info CHOSENEXTRACTOR "%s uses zstd compression, setting --extractor=ar option" "$SUITE"
-			export EXTRACTOR_OVERRIDE=ar
-		fi
-	;;
-esac
+# impish+ will use zstd compression, check if supported
+if [ $(ubuntu-distro-info -r --series "$1" | cut -d. -f1) -gt 20 ]; then
+	dpkg_zstd="$(dpkg-deb --help 2>/dev/null | grep ' zstd,' || :)"
+	if [ -z "$EXTRACTOR_OVERRIDE" ] && [ -z "$dpkg_zstd" ]; then
+		info CHOSENEXTRACTOR "%s uses zstd compression, setting --extractor=ar option" "$SUITE"
+		export EXTRACTOR_OVERRIDE=ar
+	fi
+fi
 
 work_out_debs () {
 	required="$(get_debs Priority: required)"
diff --git a/scripts/hardy b/scripts/hardy
deleted file mode 120000
index 3840936..0000000
--- a/scripts/hardy
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/hirsute b/scripts/hirsute
deleted file mode 120000
index 4c4810d..0000000
--- a/scripts/hirsute
+++ /dev/null
@@ -1 +0,0 @@
-groovy
\ No newline at end of file
diff --git a/scripts/impish b/scripts/impish
deleted file mode 120000
index 3840936..0000000
--- a/scripts/impish
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/intrepid b/scripts/intrepid
deleted file mode 120000
index 3840936..0000000
--- a/scripts/intrepid
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/jammy b/scripts/jammy
deleted file mode 120000
index 3840936..0000000
--- a/scripts/jammy
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/jaunty b/scripts/jaunty
deleted file mode 120000
index 3840936..0000000
--- a/scripts/jaunty
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/jessie b/scripts/jessie
deleted file mode 120000
index 9a63c96..0000000
--- a/scripts/jessie
+++ /dev/null
@@ -1 +0,0 @@
-sid
\ No newline at end of file
diff --git a/scripts/karmic b/scripts/karmic
deleted file mode 120000
index 3840936..0000000
--- a/scripts/karmic
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/kinetic b/scripts/kinetic
deleted file mode 120000
index 3840936..0000000
--- a/scripts/kinetic
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/lenny b/scripts/lenny
deleted file mode 120000
index 190cf35..0000000
--- a/scripts/lenny
+++ /dev/null
@@ -1 +0,0 @@
-etch
\ No newline at end of file
diff --git a/scripts/lucid b/scripts/lucid
deleted file mode 120000
index 3840936..0000000
--- a/scripts/lucid
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/lunar b/scripts/lunar
deleted file mode 120000
index 3840936..0000000
--- a/scripts/lunar
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/mantic b/scripts/mantic
deleted file mode 120000
index 3840936..0000000
--- a/scripts/mantic
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/maverick b/scripts/maverick
deleted file mode 120000
index 3840936..0000000
--- a/scripts/maverick
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/natty b/scripts/natty
deleted file mode 120000
index 3840936..0000000
--- a/scripts/natty
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/noble b/scripts/noble
deleted file mode 120000
index 3840936..0000000
--- a/scripts/noble
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/oneiric b/scripts/oneiric
deleted file mode 120000
index 3840936..0000000
--- a/scripts/oneiric
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/precise b/scripts/precise
deleted file mode 120000
index 3840936..0000000
--- a/scripts/precise
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/quantal b/scripts/quantal
deleted file mode 120000
index 3840936..0000000
--- a/scripts/quantal
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/raring b/scripts/raring
deleted file mode 120000
index 3840936..0000000
--- a/scripts/raring
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/saucy b/scripts/saucy
deleted file mode 120000
index 3840936..0000000
--- a/scripts/saucy
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/squeeze b/scripts/squeeze
deleted file mode 120000
index 190cf35..0000000
--- a/scripts/squeeze
+++ /dev/null
@@ -1 +0,0 @@
-etch
\ No newline at end of file
diff --git a/scripts/stretch b/scripts/stretch
deleted file mode 120000
index 9a63c96..0000000
--- a/scripts/stretch
+++ /dev/null
@@ -1 +0,0 @@
-sid
\ No newline at end of file
diff --git a/scripts/trixie b/scripts/trixie
deleted file mode 120000
index 9a63c96..0000000
--- a/scripts/trixie
+++ /dev/null
@@ -1 +0,0 @@
-sid
\ No newline at end of file
diff --git a/scripts/trusty b/scripts/trusty
deleted file mode 120000
index 3840936..0000000
--- a/scripts/trusty
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/utopic b/scripts/utopic
deleted file mode 120000
index 3840936..0000000
--- a/scripts/utopic
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/vivid b/scripts/vivid
deleted file mode 120000
index 3840936..0000000
--- a/scripts/vivid
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/wheezy b/scripts/wheezy
deleted file mode 120000
index 9a63c96..0000000
--- a/scripts/wheezy
+++ /dev/null
@@ -1 +0,0 @@
-sid
\ No newline at end of file
diff --git a/scripts/wily b/scripts/wily
deleted file mode 120000
index 3840936..0000000
--- a/scripts/wily
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/xenial b/scripts/xenial
deleted file mode 120000
index 3840936..0000000
--- a/scripts/xenial
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/yakkety b/scripts/yakkety
deleted file mode 120000
index 3840936..0000000
--- a/scripts/yakkety
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file
diff --git a/scripts/zesty b/scripts/zesty
deleted file mode 120000
index 3840936..0000000
--- a/scripts/zesty
+++ /dev/null
@@ -1 +0,0 @@
-gutsy
\ No newline at end of file