From 1963cbeacea7a04af823376a87f8dbfcacdd150d Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Tue, 18 Nov 2025 17:06:58 +0000 Subject: [PATCH] bump(main/debootstrap): 1.0.142 --- packages/debootstrap/build.sh | 4 ++-- packages/debootstrap/fix-keyring-paths.patch | 14 ++++++++++---- packages/debootstrap/scripts-debian-common.patch | 12 ++++++------ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/packages/debootstrap/build.sh b/packages/debootstrap/build.sh index 8914b4deb0..415f226409 100644 --- a/packages/debootstrap/build.sh +++ b/packages/debootstrap/build.sh @@ -3,9 +3,9 @@ TERMUX_PKG_DESCRIPTION="Bootstrap a basic Debian system" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_LICENSE_FILE="debian/copyright" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="1.0.141" +TERMUX_PKG_VERSION="1.0.142" TERMUX_PKG_SRCURL=https://deb.debian.org/debian/pool/main/d/debootstrap/debootstrap_${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=232ec755f4b1f445f829996885846abba6f1b6fd55d049476ab26ddd8c4b4e1b +TERMUX_PKG_SHA256=334b188c2bab5c1aa6f858a044274631d342f07f5ddec1bad870d728f02fd652 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="binutils | binutils-is-llvm, perl, proot, sed, wget" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/debootstrap/fix-keyring-paths.patch b/packages/debootstrap/fix-keyring-paths.patch index fcc204e4af..115c4827cc 100644 --- a/packages/debootstrap/fix-keyring-paths.patch +++ b/packages/debootstrap/fix-keyring-paths.patch @@ -77,15 +77,21 @@ diff -uNr debootstrap/scripts/sarge debootstrap.mod/scripts/sarge diff -uNr debootstrap/scripts/sid debootstrap.mod/scripts/sid --- debootstrap/scripts/sid 2018-11-20 20:55:53.000000000 +0200 +++ debootstrap.mod/scripts/sid 2019-01-19 00:02:00.832801917 +0200 -@@ -2,7 +2,7 @@ +@@ -3,11 +3,11 @@ download_style apt finddebs_style from-indices variants - buildd fakechroot minbase --keyring /usr/share/keyrings/debian-archive-keyring.gpg -+keyring @TERMUX_PREFIX@/share/keyrings/debian-archive-keyring.gpg +-if [ -e /usr/share/keyrings/debian-archive-keyring.pgp ]; then ++if [ -e @TERMUX_PREFIX@/share/keyrings/debian-archive-keyring.pgp ]; then + # Starting with Debian 13 (trixie). +- keyring /usr/share/keyrings/debian-archive-keyring.pgp ++ keyring @TERMUX_PREFIX@/share/keyrings/debian-archive-keyring.pgp + else +- keyring /usr/share/keyrings/debian-archive-keyring.gpg ++ keyring @TERMUX_PREFIX@/share/keyrings/debian-archive-keyring.gpg + fi # include common settings - if [ -e "$DEBOOTSTRAP_DIR/scripts/debian-common" ]; then diff -uNr debootstrap/scripts/woody debootstrap.mod/scripts/woody --- debootstrap/scripts/woody 2018-11-20 20:55:53.000000000 +0200 +++ debootstrap.mod/scripts/woody 2019-01-19 00:02:06.079513823 +0200 diff --git a/packages/debootstrap/scripts-debian-common.patch b/packages/debootstrap/scripts-debian-common.patch index b7371ce8d7..ae33495452 100644 --- a/packages/debootstrap/scripts-debian-common.patch +++ b/packages/debootstrap/scripts-debian-common.patch @@ -1,16 +1,16 @@ diff -uNr debootstrap-1.0.106/scripts/debian-common debootstrap-1.0.106.mod/scripts/debian-common --- debootstrap-1.0.106/scripts/debian-common 2018-07-05 11:48:22.000000000 +0300 +++ debootstrap-1.0.106.mod/scripts/debian-common 2018-07-10 15:33:41.289906934 +0300 -@@ -60,7 +60,7 @@ - setup_etc - if [ ! -e "$TARGET/etc/fstab" ]; then - echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" +@@ -130,7 +130,7 @@ + # + # + EOF - chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" + chmod 644 "$TARGET/etc/fstab" fi setup_devices -@@ -102,7 +102,6 @@ +@@ -172,7 +172,6 @@ } if ! doing_variant fakechroot; then @@ -18,7 +18,7 @@ diff -uNr debootstrap-1.0.106/scripts/debian-common debootstrap-1.0.106.mod/scri in_target /sbin/ldconfig fi -@@ -172,6 +171,20 @@ +@@ -242,6 +241,20 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" chmod 755 "$TARGET/sbin/start-stop-daemon"