Hi, Quoting Sebastian Ramacher (2023-05-20 13:38:20) > > some of the packages uploaded to unstable or experimental are breaking the > > mmdebstrap autopkgtest: > > > > - doc-debian rebuilt with debhelper (>= 13.4) changes the doc-base paths. > > This > > is recorded as #1035913 and the change is intentional. Thus the > > mmdebstrap > > autopkgtest has to be adjusted. The unblock bug for doc-debian was > > #1035710. > > - dash has an upload in experimental which removes its diversions. See bug > > #989632 for details. The unblock bug is #1035745. I also adjusted the > > autopkgtest to cope with those changes. > > - if it is decided for adduser to become Essential:yes or pseudo-essential > > (instead of using Protected:yes) more changes are required. I didn't > > implement those yet, because I'm still hoping that it will be decided to > > use > > Protected:yes (in which case no changes are needed). Please consider > > replying to my idea in #1035654 > > > > All of the needed changes only affect the autopkgtest. Nothing touches the > > functionality shipped by the mmdebstrap binary package and thus, this > > unblock > > cannot break anything (other than autopkgtest results). > > Could you please provide a debdiff of the proposed changes?
this is the debdiff between mmdebstrap in testing and unstable:
diff -Nru mmdebstrap-1.3.5/debian/changelog mmdebstrap-1.3.5/debian/changelog
--- mmdebstrap-1.3.5/debian/changelog 2023-03-20 08:05:19.000000000 +0100
+++ mmdebstrap-1.3.5/debian/changelog 2023-05-11 14:53:04.000000000 +0200
@@ -1,3 +1,29 @@
+mmdebstrap (1.3.5-5) unstable; urgency=medium
+
+ * tests/jessie-or-older: dash 0.5.12-3 dropped diversions
+
+ -- Johannes Schauer Marin Rodrigues <jo...@debian.org> Thu, 11 May 2023
14:53:04 +0200
+
+mmdebstrap (1.3.5-4) unstable; urgency=medium
+
+ * tests/eatmydata-via-hook-dir: dash 0.5.12-3 dropped diversions
+
+ -- Johannes Schauer Marin Rodrigues <jo...@debian.org> Thu, 11 May 2023
06:57:42 +0200
+
+mmdebstrap (1.3.5-3) unstable; urgency=medium
+
+ * fix regex in debian/tests/copy_host_apt_config to first remove
+ non-free-firmware and then non-free or otherwise components like
+ "main-firmware" will be the result
+
+ -- Johannes Schauer Marin Rodrigues <jo...@debian.org> Wed, 10 May 2023
22:41:17 +0200
+
+mmdebstrap (1.3.5-2) unstable; urgency=medium
+
+ * fix for doc-debian 11.0 changing the doc-base paths
+
+ -- Johannes Schauer Marin Rodrigues <jo...@debian.org> Sat, 06 May 2023
19:15:48 +0200
+
mmdebstrap (1.3.5-1) unstable; urgency=medium
* New upstream version 1.3.5
diff -Nru
mmdebstrap-1.3.5/debian/patches/0001-tests-doc-debian-11.0-changed-the-doc-base-paths.patch
mmdebstrap-1.3.5/debian/patches/0001-tests-doc-debian-11.0-changed-the-doc-base-paths.patch
---
mmdebstrap-1.3.5/debian/patches/0001-tests-doc-debian-11.0-changed-the-doc-base-paths.patch
1970-01-01 01:00:00.000000000 +0100
+++
mmdebstrap-1.3.5/debian/patches/0001-tests-doc-debian-11.0-changed-the-doc-base-paths.patch
2023-05-11 14:53:04.000000000 +0200
@@ -0,0 +1,81 @@
+From e27a8d34724673f4df07b5827c921a9b63903095 Mon Sep 17 00:00:00 2001
+From: Johannes Schauer Marin Rodrigues <jo...@mister-muffin.de>
+Date: Sat, 6 May 2023 08:33:15 +0200
+Subject: [PATCH] tests: doc-debian 11.0 changed the doc-base paths
+
+---
+ tests/include | 2 +-
+ tests/install-doc-debian | 2 +-
+ tests/install-doc-debian-and-test-hooks | 2 +-
+ tests/multiple-include | 2 +-
+ tests/unpack-doc-debian | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tests/include b/tests/include
+index 95c9c69..e284b7d 100644
+--- a/tests/include
++++ b/tests/include
+@@ -3,7 +3,7 @@ set -eu
+ export LC_ALL=C.UTF-8
+ trap "rm -rf /tmp/debian-chroot" EXIT INT TERM
+ {{ CMD }} --mode=root --variant=apt --include=doc-debian {{ DIST }}
/tmp/debian-chroot {{ MIRROR }}
+-rm /tmp/debian-chroot/usr/share/doc-base/debian-*
++rm /tmp/debian-chroot/usr/share/doc-base/doc-debian.debian-*
+ rm -r /tmp/debian-chroot/usr/share/doc/debian
+ rm -r /tmp/debian-chroot/usr/share/doc/doc-debian
+ rm /tmp/debian-chroot/var/lib/apt/extended_states
+diff --git a/tests/install-doc-debian b/tests/install-doc-debian
+index 81cb513..27d7f3e 100644
+--- a/tests/install-doc-debian
++++ b/tests/install-doc-debian
+@@ -24,7 +24,7 @@ tar -C /tmp/debian-chroot --owner=0 --group=0
--numeric-owner --sort=name --clam
+ tar tvf /tmp/debian-chroot.tar > doc-debian.tar.list
+ rm /tmp/debian-chroot.tar
+ # delete contents of doc-debian
+-rm /tmp/debian-chroot/usr/share/doc-base/debian-*
++rm /tmp/debian-chroot/usr/share/doc-base/doc-debian.debian-*
+ rm -r /tmp/debian-chroot/usr/share/doc/debian
+ rm -r /tmp/debian-chroot/usr/share/doc/doc-debian
+ # delete real files
+diff --git a/tests/install-doc-debian-and-test-hooks
b/tests/install-doc-debian-and-test-hooks
+index 6ad36eb..e69066c 100644
+--- a/tests/install-doc-debian-and-test-hooks
++++ b/tests/install-doc-debian-and-test-hooks
+@@ -27,7 +27,7 @@ tar -C /tmp/debian-chroot --owner=0 --group=0
--numeric-owner --sort=name --clam
+ tar tvf /tmp/debian-chroot.tar | grep -v ' ./dev' | diff -u
doc-debian.tar.list -
+ rm /tmp/debian-chroot.tar
+ # delete contents of doc-debian
+-rm /tmp/debian-chroot/usr/share/doc-base/debian-*
++rm /tmp/debian-chroot/usr/share/doc-base/doc-debian.debian-*
+ rm -r /tmp/debian-chroot/usr/share/doc/debian
+ rm -r /tmp/debian-chroot/usr/share/doc/doc-debian
+ # delete real files
+diff --git a/tests/multiple-include b/tests/multiple-include
+index 95e03a5..36f53ec 100644
+--- a/tests/multiple-include
++++ b/tests/multiple-include
+@@ -3,7 +3,7 @@ set -eu
+ export LC_ALL=C.UTF-8
+ trap "rm -rf /tmp/debian-chroot" EXIT INT TERM
+ {{ CMD }} --mode=root --variant=apt --include=doc-debian --include=tzdata {{
DIST }} /tmp/debian-chroot {{ MIRROR }}
+-rm /tmp/debian-chroot/usr/share/doc-base/debian-*
++rm /tmp/debian-chroot/usr/share/doc-base/doc-debian.debian-*
+ 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
+diff --git a/tests/unpack-doc-debian b/tests/unpack-doc-debian
+index d3c449e..fe87d13 100644
+--- a/tests/unpack-doc-debian
++++ b/tests/unpack-doc-debian
+@@ -21,7 +21,7 @@ fi
+ [ "{{ MODE }}" = "fakechroot" ] && prefix="$prefix fakechroot fakeroot"
+ $prefix {{ CMD }} --mode={{ MODE }} --variant={{ VARIANT }}
--include=doc-debian {{ DIST }} /tmp/debian-chroot {{ MIRROR }}
+ # delete contents of doc-debian
+-rm /tmp/debian-chroot/usr/share/doc-base/debian-*
++rm /tmp/debian-chroot/usr/share/doc-base/doc-debian.debian-*
+ rm -r /tmp/debian-chroot/usr/share/doc/debian
+ rm -r /tmp/debian-chroot/usr/share/doc/doc-debian
+ # delete real files
+--
+2.40.0
+
diff -Nru
mmdebstrap-1.3.5/debian/patches/0001-tests-eatmydata-via-hook-dir-jessie-or-older-dash-0..patch
mmdebstrap-1.3.5/debian/patches/0001-tests-eatmydata-via-hook-dir-jessie-or-older-dash-0..patch
---
mmdebstrap-1.3.5/debian/patches/0001-tests-eatmydata-via-hook-dir-jessie-or-older-dash-0..patch
1970-01-01 01:00:00.000000000 +0100
+++
mmdebstrap-1.3.5/debian/patches/0001-tests-eatmydata-via-hook-dir-jessie-or-older-dash-0..patch
2023-05-11 14:53:04.000000000 +0200
@@ -0,0 +1,42 @@
+From 14f13c63097ad8bbe22b2d45ae392c9233df1e8d Mon Sep 17 00:00:00 2001
+From: Johannes Schauer Marin Rodrigues <jo...@mister-muffin.de>
+Date: Thu, 11 May 2023 06:55:33 +0200
+Subject: [PATCH] tests/{eatmydata-via-hook-dir,jessie-or-older}: dash 0.5.12-3
+ dropped diversions
+
+---
+ tests/eatmydata-via-hook-dir | 6 +++++-
+ tests/jessie-or-older | 1 +
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tests/eatmydata-via-hook-dir b/tests/eatmydata-via-hook-dir
+index 4ffec71..0df72df 100644
+--- a/tests/eatmydata-via-hook-dir
++++ b/tests/eatmydata-via-hook-dir
+@@ -34,6 +34,10 @@ elfheader="$elfheader\\001\\000"
+ --hook-dir=./hooks/eatmydata \
+ --customize-hook='printf "'"$elfheader"'" | cmp --bytes=8 -
"$1"/usr/bin/dpkg' \
+ {{ DIST }} /tmp/debian-chroot {{ MIRROR }}
+-tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u
tar1.txt -
++ tar -C /tmp/debian-chroot --one-file-system -c . \
++ | tar -t \
++ | sort \
++ | grep -v '^\./var/lib/dpkg/diversions\(-old\)\?$' \
++ | diff -u tar1.txt -
+ rm /tmp/checkeatmydata.sh
+ rm -r /tmp/debian-chroot
+diff --git a/tests/jessie-or-older b/tests/jessie-or-older
+index ddfe7a7..a3a2ace 100644
+--- a/tests/jessie-or-older
++++ b/tests/jessie-or-older
+@@ -29,6 +29,7 @@ filter() {
+ --path-exclude=/var/cache/debconf/config.dat-old \
+ --path-exclude=/var/cache/debconf/templates.dat-old \
+ --path-exclude=/var/lib/dpkg/available \
++ --path-exclude=/var/lib/dpkg/diversions \
+ --path-exclude=/var/lib/dpkg/cmethopt \
+ --path-exclude=/var/lib/dpkg/status-old \
+ --path-exclude=/var/lib/shells.state
+--
+2.40.0
+
diff -Nru mmdebstrap-1.3.5/debian/patches/series
mmdebstrap-1.3.5/debian/patches/series
--- mmdebstrap-1.3.5/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ mmdebstrap-1.3.5/debian/patches/series 2023-05-11 14:53:04.000000000
+0200
@@ -0,0 +1,2 @@
+0001-tests-doc-debian-11.0-changed-the-doc-base-paths.patch
+0001-tests-eatmydata-via-hook-dir-jessie-or-older-dash-0..patch
diff -Nru mmdebstrap-1.3.5/debian/tests/control
mmdebstrap-1.3.5/debian/tests/control
--- mmdebstrap-1.3.5/debian/tests/control 2023-03-20 08:05:19.000000000
+0100
+++ mmdebstrap-1.3.5/debian/tests/control 2023-05-11 14:53:04.000000000
+0200
@@ -8,6 +8,7 @@
debian-archive-keyring,
debootstrap (>= 1.0.128),
diffoscope,
+ doc-debian (>= 11.0),
dpkg-dev,
fakechroot,
fakeroot,
@@ -49,13 +50,17 @@
# - libgdbm-compat4 #1031276
# - tzdata #1031395
# - debian-archive-keyring #1019922
+# - doc-debian #1035913
+# - dash #989632
#
Features: test-name=hint-testsuite-triggers
Test-Command: false
Depends:
cron,
+ dash,
debian-archive-keyring,
debootstrap,
+ doc-debian,
fakeroot,
ifupdown,
kmod,
diff -Nru mmdebstrap-1.3.5/debian/tests/copy_host_apt_config
mmdebstrap-1.3.5/debian/tests/copy_host_apt_config
--- mmdebstrap-1.3.5/debian/tests/copy_host_apt_config 2023-03-20
08:05:19.000000000 +0100
+++ mmdebstrap-1.3.5/debian/tests/copy_host_apt_config 2023-05-11
14:53:04.000000000 +0200
@@ -25,7 +25,7 @@
sed 's/^\(deb\(-src\)\?\)
\(http:\/\/deb[a-z.]\+\)\(\/debian\(-debug\)\?\)
\(\(stable\|testing\|unstable\|experimental\)\(-debug\)\?\) \(.*\)$/\1
http:\/\/127.0.0.1\4 \6 \9/' "$f" \
| grep -v '/debian-debug [^ ]\+-debug ' \
| grep -v '^deb-src ' \
- | sed 's/ contrib//;s/ non-free//;s/ non-free-firmware//' >>
"$1/$f" || :
+ | sed 's/ contrib//;s/ non-free-firmware//;s/ non-free//' >>
"$1/$f" || :
done
# debci filters by suite name like this
signature.asc
Description: signature
