Merging debian version 1.5.1-3.

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

4 files changed, 52 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index d05a6fa..4ca58e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mmdebstrap (1.5.1-3) unstable; urgency=medium
+
+  * cherry-pick patch from upstream fixing tests/empty-sources.list (closes:
+    #1072986)
+  * debian/tests/control: add missing triggers on last essential packages
+    involved in the /usr-move: util-linux, base-files
+
+ -- Johannes Schauer Marin Rodrigues <josch@debian.org>  Tue, 11 Jun 2024 13:52:17 +0200
+
 mmdebstrap (1.5.1-2~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/patches/0001-tests-empty-sources.list-only-write-out-etc-apt-sour.patch b/debian/patches/0001-tests-empty-sources.list-only-write-out-etc-apt-sour.patch
new file mode 100644
index 0000000..522f4ca
--- /dev/null
+++ b/debian/patches/0001-tests-empty-sources.list-only-write-out-etc-apt-sour.patch
@@ -0,0 +1,33 @@
+From 482699f377be9456cf42642e8912d040807c7b0b Mon Sep 17 00:00:00 2001
+From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
+Date: Tue, 11 Jun 2024 12:41:15 +0200
+Subject: [PATCH] tests/empty-sources.list: only write out
+ /etc/apt/sources.list if it doesn't exist yet
+
+In the mmdebstrap autpkgtest, debian/tests/sourcesfilter will write out
+/etc/apt/sources.list before the test's setup-hook is run. Thus, the
+test's setup-hook will overwrite the contents of the sources.list that
+debian/tests/sourcesfilter set up, which will end up pulling in the
+wrong packages.
+
+Thus, only write out our own /etc/apt/sources.list if it does not yet
+exist. If it does exist, nothing needs to be done.
+---
+ tests/empty-sources.list | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/empty-sources.list b/tests/empty-sources.list
+index bf384f3..f9a6a6a 100644
+--- a/tests/empty-sources.list
++++ b/tests/empty-sources.list
+@@ -3,6 +3,6 @@ set -eu
+ export LC_ALL=C.UTF-8
+ trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
+ printf '' | {{ CMD }} --mode={{ MODE }} --variant=apt \
+-	--setup-hook='echo "deb {{ MIRROR }} {{ DIST }} main" > "$1"/etc/apt/sources.list' \
++	--setup-hook='test -e "$1"/etc/apt/sources.list || echo "deb {{ MIRROR }} {{ DIST }} main" > "$1"/etc/apt/sources.list' \
+ 	{{ DIST }} /tmp/debian-chroot.tar -
+ tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt -
+-- 
+2.39.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 39c5319..f54042e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-tests-base-files-now-ships-merged-usr-symlinks.patch
+0001-tests-empty-sources.list-only-write-out-etc-apt-sour.patch
diff --git a/debian/tests/control b/debian/tests/control
index 958a144..e0e44f9 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -36,7 +36,7 @@ Restrictions: needs-root, allow-stderr, skippable
 #      | passwd                 #1004710
 #      | python3                #1010368, #1010366
 #      | man-db                 #1010957
-# 2022 | libc-bin               #1017590
+# 2022 | glibc                  #1017590
 #      | cron                   #1012622, #1020603
 #      | kmod                   #1020605
 #      | ifupdown               #1020604
@@ -53,12 +53,16 @@ Restrictions: needs-root, allow-stderr, skippable
 #      | debianutils            #1050752                     chrootless
 #      | usrmerge               #1050755, #1053671           chrootless-foreign, merged-fakechroot-inside-unmerged-chroot
 # -----+-----------------------------------------------------------------------
-# 2024 | dpkg                   #1059982                     remove-start-stop-daemon-and-policy-rc-d-in-hook
+#      | dpkg                   #1059982                     remove-start-stop-daemon-and-policy-rc-d-in-hook
+#      | findutils              #1072986                     empty-sources.list
+# 2024 | base-files             #1064459                     check-against-debootstrap-dist, eatmydata-via-hook-dir, jessie-or-older, missing-dev-sys-proc-inside-the-chroot, pivot_root
+#      | util-linux             #1064459                     check-against-debootstrap-dist, eatmydata-via-hook-dir, jessie-or-older, missing-dev-sys-proc-inside-the-chroot, pivot_root
 #
 Features: test-name=hint-testsuite-triggers
 Test-Command: false
 Depends:
  adduser,
+ base-files,
  cron,
  dash,
  debian-archive-keyring,
@@ -67,6 +71,7 @@ Depends:
  doc-debian,
  dpkg,
  fakeroot,
+ findutils,
  ifupdown,
  kmod,
  libc-bin,
@@ -77,6 +82,7 @@ Depends:
  python3,
  tzdata,
  usrmerge,
+ util-linux,
 Restrictions: hint-testsuite-triggers
 
 # FIXME: in an ideal world, debci would have enough computational resources
@@ -99,6 +105,7 @@ Restrictions: hint-testsuite-triggers
 ## Since library binary package names change frequently, this list has to be
 ## updated regularly. Use the debian/compute_pkgset.py script to update the
 ## list of dependencies.
+## FIXME: find out why util-linux or libc6 are missing from the list below
 #Features: test-name=hint-testsuite-triggers
 #Test-Command: false
 #Depends: acl, adduser, anacron, apt, apt-listchanges, base-files, base-passwd,