release 1.5.5

Usually running dpkg-preconfigure is not a problem unless in in
chrootless mode, which apt-extracttemplates does not and can not support
because it cannot know that this is a chrootless installation.  We
always turn it off for equivalent behavior in all modes. Running
dpkg-preconfigure should not be needed as we also have set
DEBIAN_FRONTEND=noninteractive and DEBCONF_NONINTERACTIVE_SEEN=true and
should thus never see debconf prompts.

Debian-Bug: #1091442

CHANGELOG.md

@@ -1,3 +1,9 @@
+1.5.5 (2025-01-09)
+------------------
+
+ - do not run dpkg-preconfigure via DPkg::Pre-Install-Pkgs hook
+ - m-a-b-q: support passing args to mmdebstrap
+
 1.5.4 (2024-10-28)
 ------------------
 

make_mirror.sh

@@ -226,13 +226,14 @@ END
       --or --field=Priority important --or --field=Priority standard \
       \))
 
-  pkgs="$pkgs build-essential busybox gpg eatmydata fakechroot fakeroot"
+  pkgs="$pkgs build-essential busybox eatmydata fakechroot fakeroot"
 
   # we need usr-is-merged to simulate debootstrap behaviour for all dists
   # starting from Debian 12 (Bullseye)
   case "$dist" in
-    oldstable) : ;;
-    *) pkgs="$pkgs usr-is-merged usrmerge" ;;
+    oldstable) pkgs="$pkgs gpg" ;;
+    stable) pkgs="$pkgs gpg usr-is-merged usrmerge" ;;
+    testing | unstable) pkgs="$pkgs gpg-from-sq" ;;
   esac
 
   # shellcheck disable=SC2086
@@ -459,7 +460,7 @@ if [ "$HAVE_QEMU" = "yes" ]; then
   tmpdir="$(mktemp -d)"
   trap 'kill "$PROXYPID" || :;cleanuptmpdir; cleanup_newcachedir' EXIT INT TERM
 
-  pkgs=perl-doc,systemd-sysv,perl,arch-test,fakechroot,fakeroot,mount,uidmap,qemu-user-binfmt,dpkg-dev,mini-httpd,libdevel-cover-perl,libtemplate-perl,debootstrap,procps,apt-cudf,aspcud,python3,libcap2-bin,gpg,debootstrap,distro-info-data,iproute2,ubuntu-keyring,apt-utils,squashfs-tools-ng,genext2fs,linux-image-generic,passwd,e2fsprogs,uuid-runtime
+  pkgs=perl-doc,systemd-sysv,perl,arch-test,fakechroot,fakeroot,mount,uidmap,qemu-user-binfmt,dpkg-dev,mini-httpd,libdevel-cover-perl,libtemplate-perl,debootstrap,procps,apt-cudf,aspcud,python3,libcap2-bin,gpg-from-sq,debootstrap,distro-info-data,iproute2,ubuntu-keyring,apt-utils,squashfs-tools-ng,genext2fs,linux-image-generic,passwd,e2fsprogs,uuid-runtime
   if [ ! -e ./mmdebstrap ]; then
     pkgs="$pkgs,mmdebstrap"
   fi

mmdebstrap

@@ -23,7 +23,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '1.5.4';
+our $VERSION = '1.5.5';
 
 use English;
 use Getopt::Long;
@@ -3101,6 +3101,14 @@ sub run_setup() {
     # don't have a good way to figure out whether apt is using an external
     # solver or not short of parsing the --aptopt options.
     print $conf "pkgCacheGen::ForceEssential \",\";\n";
+    # Avoid running dpkg-preconfigure. This is not a problem unless in in
+    # chrootless mode, which apt-extracttemplates does not and can not
+    # support because it cannot know that this is a chrootless installation.
+    # We always turn it off for equivalent behavior in all modes. Running
+    # dpkg-preconfigure should not be needed as we also have set
+    # DEBIAN_FRONTEND=noninteractive and DEBCONF_NONINTERACTIVE_SEEN=true and
+    # should thus never see debconf prompts. See #1091442 for details.
+    print $conf "#clear DPkg::Pre-Install-Pkgs;\n";
 
     close $conf;
 

mmdebstrap-autopkgtest-build-qemu

@@ -222,6 +222,10 @@ while test "$#" -gt 0; do
     --efi)
       opt_boot efi
       ;;
+    --)
+      shift
+      break
+      ;;
     --*)
       usage_error "unrecognized argument $1"
       ;;
@@ -324,7 +328,8 @@ set -- \
   --mode=unshare \
   --format=tar \
   --variant=important \
-  --architecture="$ARCHITECTURE"
+  --architecture="$ARCHITECTURE" \
+  "$@"
 
 case $MIRROR in http://snapshot.debian.org/archive/* | https://snapshot.debian.org/archive/*)
   set -- "$@" --aptopt='Acquire::Check-Valid-Until "false"'

tests/check-against-debootstrap-dist

@@ -12,7 +12,7 @@ echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH"
 # we cannot use useradd because passwd is not Essential:yes
 {{ CMD }} --variant={{ VARIANT }} --mode={{ MODE }} \
   --essential-hook='[ {{ DIST }} = oldstable ] && [ {{ VARIANT }} = - ] && echo _apt:*:100:65534::/nonexistent:/usr/sbin/nologin >> "$1"/etc/passwd || :' \
-  "$(if [ {{ DIST }} = oldstable ]; then echo --merged-usr; else echo --hook-dir=./hooks/merged-usr; fi)" \
+  "$(case {{ DIST }} in stable) echo --hook-dir=./hooks/merged-usr ;; *) echo --no-merged-usr ;; esac)" \
   "$(case {{ DIST }} in oldstable) echo --include=e2fsprogs,mount,tzdata,gcc-9-base ;; stable) echo --include=e2fsprogs,mount,tzdata ;; *) echo --include=base-files ;; esac)" \
   {{ DIST }} /tmp/debian-{{ DIST }}-mm.tar {{ MIRROR }}
 

tests/chrootless

@@ -3,11 +3,9 @@ set -eu
 export LC_ALL=C.UTF-8
 export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }}
 trap "rm -f /tmp/chrootless.tar /tmp/root.tar" EXIT INT TERM
-# we need --hook-dir=./hooks/merged-usr because usrmerge does not understand
-# DPKG_ROOT
 for INCLUDE in '' 'apt' 'apt,build-essential' 'systemd-sysv'; do
   for MODE in root chrootless; do
-    {{ CMD }} --mode=$MODE --variant={{ VARIANT }} --hook-dir=./hooks/merged-usr \
+    {{ CMD }} --mode=$MODE --variant={{ VARIANT }} \
       ${INCLUDE:+--include="$INCLUDE"} --skip=check/chrootless \
       {{ DIST }} "/tmp/$MODE.tar" {{ MIRROR }}
   done

tests/chrootless-fakeroot

@@ -22,18 +22,16 @@ MMTARFILTER=
 [ -x /usr/bin/mmtarfilter ] && MMTARFILTER=/usr/bin/mmtarfilter
 [ -x ./tarfilter ] && MMTARFILTER=./tarfilter
 
-# we need --hook-dir=./hooks/merged-usr because usrmerge does not understand
-# DPKG_ROOT
 # permissions drwxr-sr-x and extended attributes of ./var/log/journal/ cannot
 # be preserved under fakeroot
 # this applies to 'z' lines in files in /usr/lib/tmpfiles.d/
 for INCLUDE in '' 'apt' 'apt,build-essential' 'systemd-sysv'; do
-  {{ CMD }} --variant={{ VARIANT }} --hook-dir=./hooks/merged-usr \
+  {{ CMD }} --variant={{ VARIANT }} \
     ${INCLUDE:+--include="$INCLUDE"} \
     {{ DIST }} - {{ MIRROR }} \
     | "$MMTARFILTER" --path-exclude="/var/log/journal" --path-exclude="/etc/credstore*" \
       >/tmp/root.tar
-  $prefix fakeroot {{ CMD }} --mode={{ MODE }} --variant={{ VARIANT }} --hook-dir=./hooks/merged-usr \
+  $prefix fakeroot {{ CMD }} --mode={{ MODE }} --variant={{ VARIANT }} \
     ${INCLUDE:+--include="$INCLUDE"} \
     {{ DIST }} - {{ MIRROR }} \
     | "$MMTARFILTER" --path-exclude="/var/log/journal" --path-exclude="/etc/credstore*" \

tests/chrootless-foreign

@@ -26,9 +26,6 @@ fi
 [ "$(id -u)" -eq 0 ]
 [ -e "/proc/sys/fs/binfmt_misc/qemu-$(deb2qemu "$arch")" ]
 
-# we need --hook-dir=./hooks/merged-usr because usrmerge does not understand
-# DPKG_ROOT
-#
 # dpkg is unable to install architecture arch:all packages with a
 # dependency on an arch:any package (perl-modules-5.34 in this case)
 # inside foreign architecture chrootless chroots, because dpkg will use
@@ -38,12 +35,12 @@ for INCLUDE in '' 'apt' 'systemd-sysv'; do
   echo 1 >"/proc/sys/fs/binfmt_misc/qemu-$(deb2qemu "$arch")"
   arch-test "$arch"
   {{ CMD }} --mode=root --architecture="$arch" --variant={{ VARIANT }} \
-    --hook-dir=./hooks/merged-usr ${INCLUDE:+--include="$INCLUDE"} \
+    ${INCLUDE:+--include="$INCLUDE"} \
     {{ DIST }} "/tmp/root.tar" {{ MIRROR }}
   echo 0 >"/proc/sys/fs/binfmt_misc/qemu-$(deb2qemu "$arch")"
   arch-test "$arch" && exit 1
   {{ CMD }} --mode=chrootless --architecture="$arch" --variant={{ VARIANT }} \
-    --hook-dir=./hooks/merged-usr ${INCLUDE:+--include="$INCLUDE"} \
+    ${INCLUDE:+--include="$INCLUDE"} \
     --skip=check/chrootless {{ DIST }} "/tmp/chrootless.tar" {{ MIRROR }}
   # when creating a foreign architecture chroot, the tarballs are not
   # bit-by-bit identical but contain a few remaining differences:

tests/create-foreign-tarball

@@ -50,6 +50,7 @@ $prefix {{ CMD }} --mode={{ MODE }} --variant=apt --architectures="$foreign_arch
     | grep -v "^\\./usr/lib/$foreign_gnu/ld-linux-x86-64\\.so\\.2$" \
     | grep -v "^\\./usr/lib/$foreign_gnu/perl/5\\.[0-9][.0-9]\\+/.*\\.ph$" \
     | grep -v "^\\./usr/lib/$foreign_gnu/libmvec\\.so\\.1$" \
+    | grep -v "^\\./usr/lib/$foreign_gnu/engines-3/padlock\\.so$" \
     | grep -v "^\\./usr/share/doc/[^/]\\+/changelog\\(\\.Debian\\)\\?\\.$foreign_arch\\.gz$" \
     | grep -v '^\./usr/share/man/man8/i386\.8\.gz$' \
     | grep -v '^\./usr/share/man/man8/x86_64\.8\.gz$' \

tests/multiple-include

@@ -8,7 +8,8 @@ rm -r /tmp/debian-chroot/usr/share/doc/debian
 rm -r /tmp/debian-chroot/usr/share/doc/doc-debian
 rm /tmp/debian-chroot/usr/share/lintian/overrides/tzdata
 rm /tmp/debian-chroot/etc/localtime
-rm /tmp/debian-chroot/etc/timezone
+# tzdata 2024b-5 does not create /etc/timezone anymore #822733
+case {{ DIST }} in oldstable | stable) rm /tmp/debian-chroot/etc/timezone ;; esac
 rm -r /tmp/debian-chroot/usr/share/doc/tzdata
 rm -r /tmp/debian-chroot/usr/share/zoneinfo
 for p in doc-debian tzdata; do