CHANGELOG.md

@@ -1,11 +1,3 @@
-1.5.3 (2024-09-13)
-------------------
-
- - tidy up any zombie processes
- - chrootless hurd-i386
- - add --skip=cleanup/reproducible/machine-id
- - m-a-b-q: replace test_installed by dpkg-checkbuilddeps
-
 1.5.2 (2024-06-26)
 ------------------
 

coverage.txt

@@ -430,6 +430,3 @@ Modes: root unshare
 
 Test: skip-tar-in-mknod
 Modes: unshare
-
-Test: zombie-reaping
-Modes: unshare

make_mirror.sh

@@ -453,7 +453,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-static,qemu-user,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
 	if [ ! -e ./mmdebstrap ]; then
 		pkgs="$pkgs,mmdebstrap"
 	fi

tarfilter

@@ -218,11 +218,8 @@ Lastly, shift user id and group id of each entry by the value given by the
         skip = False
         if not hasattr(args, "pathfilter"):
             return False
-        # normalize path and make it absolute by stripping off all leading
-        # dots and slashes and then prepending a slash
-        name = "/" + member.name.lstrip("./")
         for t, r in args.pathfilter:
-            if r.match(name) is not None:
+            if r.match(member.name[1:]) is not None:
                 if t == "path_include":
                     skip = False
                 else:
@@ -233,7 +230,7 @@ Lastly, shift user id and group id of each entry by the value given by the
                     continue
                 prefix = prefix_prog.sub(r"\1", r.pattern)
                 prefix = prefix.rstrip("/")
-                if name.startswith(prefix):
+                if member.name[1:].startswith(prefix):
                     return False
         return skip
 

tests/arm64-without-qemu-support

@@ -5,7 +5,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	echo "this test modifies the system and should only be run inside a container" >&2
 	exit 1
 fi
-apt-get remove --yes qemu-user-binfmt binfmt-support qemu-user
+apt-get remove --yes qemu-user-static binfmt-support qemu-user
 # the following is not necessary anymore since systemd-binfmt
 # successfully disables support upon removal of qemu-user with
 # the upload of src:systemd 251.2-4: https://bugs.debian.org/1012163

tests/i386-which-can-be-executed-without-qemu

@@ -6,7 +6,7 @@ if [ ! -e /mmdebstrap-testenv ]; then
 	exit 1
 fi
 # remove qemu just to be sure
-apt-get remove --yes qemu-user-binfmt binfmt-support qemu-user
+apt-get remove --yes qemu-user-static binfmt-support qemu-user
 {{ CMD }} --mode={{ MODE }} --variant=apt --architectures=i386 {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }}
 # we ignore differences between architectures by ignoring some files
 # and renaming others

tests/mmdebstrap

@@ -14,7 +14,7 @@ case {{ FORMAT }} in tar|squashfs|ext2|ext4) : ;; *) exit 1;; esac
 # https://lore.kernel.org/linux-ext4/171484520952.2626447.2160419274451668597@localhost/T/#t
 mv /tmp/mmdebstrap-{{ DIST }}-{{ VARIANT }}.{{ FORMAT }} ./cache/mmdebstrap-{{ DIST }}-{{ VARIANT }}.{{ FORMAT }}
 if [ "{{ FORMAT }}" = tar ]; then
-	printf 'ustar\0' | cmp --bytes=6 --ignore-initial=257:0 ./cache/mmdebstrap-{{ DIST }}-{{ VARIANT }}.tar -
+	printf 'ustar ' | cmp --bytes=6 --ignore-initial=257:0 ./cache/mmdebstrap-{{ DIST }}-{{ VARIANT }}.tar -
 elif [ "{{ FORMAT }}" = squashfs ]; then
 	printf 'hsqs' | cmp --bytes=4 ./cache/mmdebstrap-{{ DIST }}-{{ VARIANT }}.squashfs -
 elif [ "{{ FORMAT }}" = ext2 ]; then

tests/zombie-reaping

@@ -1,39 +0,0 @@
-#!/bin/sh
-set -eu
-export LC_ALL=C.UTF-8
-export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }}
-
-[ {{ MODE }} = "unshare" ]
-
-trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
-
-prefix=
-if [ "$(id -u)" -eq 0 ] && [ "{{ MODE }}" != "root" ] && [ "{{ MODE }}" != "auto" ]; then
-	if ! id "${SUDO_USER:-user}" >/dev/null 2>&1; then
-		if [ ! -e /mmdebstrap-testenv ]; then
-			echo "this test modifies the system and should only be run inside a container" >&2
-			exit 1
-		fi
-		useradd --home-dir "/home/${SUDO_USER:-user}" --create-home "${SUDO_USER:-user}"
-	fi
-	prefix="runuser -u ${SUDO_USER:-user} --"
-fi
-
-MMTARFILTER=
-[ -x /usr/bin/mmtarfilter ] && MMTARFILTER=/usr/bin/mmtarfilter
-[ -x ./tarfilter ] && MMTARFILTER=./tarfilter
-
-$prefix {{ CMD }} --mode={{ MODE }} --variant=apt \
-	--skip=output/dev \
-	--customize-hook='chroot "$1" sh -c "sleep 1m > /dev/null" &' \
-	{{ DIST }} - {{ MIRROR }} \
-		| "$MMTARFILTER" --path-exclude="/dev" \
-		> /tmp/debian-chroot.tar
-
-origfilter() {
-	< ./cache/mmdebstrap-{{ DIST }}-apt.tar \
-		"$MMTARFILTER" --path-exclude="/dev/*" --path-exclude="/dev"
-}
-
-origfilter | cmp - /tmp/debian-chroot.tar \
-	|| origfilter | diffoscope - /tmp/debian-chroot.tar