Merge ~mkukri/ubuntu/+source/cryptsetup:merge into ubuntu/+source/cryptsetup:ubuntu/devel

[Mate Kukri]

Merge with Debian sid. Rebased the previously split Ubuntu changes.

[Simon Quigley (tsimonq2)]

would you mind also submitting this against debian/sid for a cleaner review?

may be personal preference :)

review: Needs Fixing

Unmerged commits

5092a32... by Mate Kukri on 2024-01-03

changelog

8728b71... by Mate Kukri on 2024-01-03

update-maintainer

4b610e5... by Mate Kukri on 2024-01-03

reconstruct-changelog

3ee1d3e... by Mate Kukri on 2024-01-03

merge-changelogs

10022f1... by Mate Kukri on 2023-11-20

  * Support zstd compressed modules for the self test.

f871147... by Mate Kukri on 2023-11-20

  * Compile-in support for a FIPS mode. LP: #2032659

2824619... by Vladimir Petko on 2023-05-14

Fix cryptroot-unlock for busybox compatibility.

45003f4... by Vladimir Petko on 2023-05-14

Fix warning and error when running on ZFS on root
      - d/functions: Return an empty devno for ZFS devices as they don't have
        major:minor device numbers.
      - d/initramfs/hooks/cryptroot: Ignore and don't print an error message
        when devices don't have a devno.

c537f63... by Vladimir Petko on 2023-05-14

debian/control:
      + Recommend plymouth.
      + Depend on busybox-initramfs instead of busybox | busybox-static.
      + Move cryptsetup-initramfs back to cryptsetup's Recommends.
      + Do not build cryptsetup-suspend binary package on i386.

12d5635... by Vladimir Petko on 2023-05-14

    - Fix cryptroot-* autopkgtests on Ubuntu. (LP: #1983522)
      + debian/tests/utils/mock.pm: return from consume() function if select()
        times out or fails
      + debian/tests/utils/cryptroot-common: fix apt source and kernel package
        names for Ubuntu
      + debian/tests/cryptroot-sysvinit.d: use systemd-sysv init for Ubuntu
        cryptroot-sysvinit package test
      + debian/tests/cryptroot-nested.d: fix cryptsetup-nested test, add
        workaround for LP1831747 by adding a e2fsprogs dependency
      + debian/tests/initramfs-hook: fix test's initramfs layout for Ubuntu and
        allow blowfish test use 64Mb of provisioned space (drop --size)
      + debian/tests/control: disable cryptdisks test

diff --git a/debian/changelog b/debian/changelog
index c02f499..0847ed2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,50 @@
+<<<<<<< debian/changelog
+=======
+cryptsetup (2:2.6.1-6ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Support zstd compressed modules for the self test.
+    - Compile-in support for a FIPS mode. LP #2032659
+    - debian/control:
+      + Recommend plymouth.
+      + Depend on busybox-initramfs instead of busybox | busybox-static.
+      + Move cryptsetup-initramfs back to cryptsetup's Recommends.
+      + Do not build cryptsetup-suspend binary package on i386.
+    - Fix cryptroot-unlock for busybox compatibility.
+    - Fix warning and error when running on ZFS on root
+      + d/functions: Return an empty devno for ZFS devices as they don't have
+        major:minor device numbers.
+      + d/initramfs/hooks/cryptroot: Ignore and don't print an error message
+        when devices don't have a devno.
+    - Fix cryptroot-* autopkgtests on Ubuntu. (LP #1983522)
+      + debian/tests/utils/mock.pm: return from consume() function if select()
+        times out or fails
+      + debian/tests/utils/cryptroot-common: fix apt source and kernel package
+        names for Ubuntu
+      + debian/tests/cryptroot-sysvinit.d: use systemd-sysv init for Ubuntu
+        cryptroot-sysvinit package test
+      + debian/tests/cryptroot-nested.d: fix cryptsetup-nested test, add
+        workaround for LP1831747 by adding a e2fsprogs dependency
+      + debian/tests/initramfs-hook: fix test's initramfs layout for Ubuntu and
+        allow blowfish test use 64Mb of provisioned space (drop --size)
+      + debian/tests/control: disable cryptdisks test
+
+ -- Mate Kukri <[e-mail]>  Wed, 03 Jan 2024 10:38:16 +0000
+
+cryptsetup (2:2.6.1-6) unstable; urgency=medium
+
+  [ Kevin Locke ]
+  * cryptsetup-initramfs: Add support from compressed kernel modules.
+    (Closes: #1036049, #1057441)
+
+  [ Guilhem Moulin ]
+  * d/tests: Replace `passwd --delete` with `busybox passwd -d`.
+  * add_modules(): Change suffix drop logic to match initramfs-tools.
+  * Fix DEP-8 tests with kernels shipping compressed modules.
+
+ -- Guilhem Moulin <[e-mail]>  Tue, 05 Dec 2023 17:48:58 +0100
+
+>>>>>>> debian/changelog
 cryptsetup (2:2.6.1-5ubuntu1) noble; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/initramfs/hooks/cryptroot b/debian/initramfs/hooks/cryptroot
index eda5fdd..87a3589 100644
--- a/debian/initramfs/hooks/cryptroot
+++ b/debian/initramfs/hooks/cryptroot
@@ -268,8 +268,8 @@ populate_CRYPTO_MODULES() {
 add_modules() {
     local glob="$1" found=n
     shift
-    for mod in $(find -H "$@" -name "$glob.ko" -type f -printf '%f\n'); do
-        manual_add_modules "${mod%.ko}"
+    for mod in $(find -H "$@" -name "$glob.ko*" -type f -printf '%f\n'); do
+        manual_add_modules "${mod%%.*}"
         found=y
     done
     [ "$found" = y ] && return 0 || return 1
diff --git a/debian/tests/cryptroot-legacy.d/mock b/debian/tests/cryptroot-legacy.d/mock
index 3cd8f87..b3b7d26 100755
--- a/debian/tests/cryptroot-legacy.d/mock
+++ b/debian/tests/cryptroot-legacy.d/mock
@@ -17,7 +17,7 @@ die unless $out =~ m#^\s{2}[`|]-cryptvg-swap\s+lvm\s+\[SWAP\]\s*$#m;
 
 # assume MODULES=dep won't add too many modules
 # XXX lsinitramfs doesn't work on /initrd.img with COMPRESS=zstd, cf. #1015954
-$out = shell(q{lsinitramfs /boot/initrd.img-`uname -r` | grep -Ec "^(usr/)?lib/modules/.*\.ko$"});
+$out = shell(q{lsinitramfs /boot/initrd.img-`uname -r` | grep -Ec "^(usr/)?lib/modules/.*\.ko(\.[a-z]+)?$"});
 die "$out == 0 or $out > 50" unless $out =~ s/\r?\n\z// and $out =~ /\A([0-9]+)\z/ and $out > 0 and $out <= 50;
 
 # check cipher and key size
diff --git a/debian/tests/utils/init b/debian/tests/utils/init
index 331cd6f..242a0c5 100755
--- a/debian/tests/utils/init
+++ b/debian/tests/utils/init
@@ -192,7 +192,7 @@ EOF
 chroot "$ROOT" grub-install --no-floppy --modules=part_gpt /dev/vda
 chroot "$ROOT" update-grub
 
-chroot "$ROOT" passwd --delete root # make root account passwordless
+chroot "$ROOT" busybox passwd -d root # make root account passwordless
 
 # show some system info right after login to ease troubleshooting
 cat >"$ROOT/root/.profile" <<-EOF
diff --git a/debian/tests/utils/mkinitramfs b/debian/tests/utils/mkinitramfs
index 557bd71..84eeb4b 100755
--- a/debian/tests/utils/mkinitramfs
+++ b/debian/tests/utils/mkinitramfs
@@ -69,14 +69,13 @@ find "$EXTRACT_DIR" -name '*.zst' -exec zstd -d {} \;
 
 depmod -ab "$EXTRACT_DIR" "$KERNEL_VERSION"
 for kmod in virtio_console virtio_blk virtio_pci virtio_rng \
-        "$EXTRACT_DIR/lib/modules/$KERNEL_VERSION"/kernel/arch/*/crypto/*.ko \
-        "$EXTRACT_DIR/lib/modules/$KERNEL_VERSION"/kernel/crypto/*.ko \
+        "$EXTRACT_DIR/lib/modules/$KERNEL_VERSION"/kernel/arch/*/crypto/*.ko* \
+        "$EXTRACT_DIR/lib/modules/$KERNEL_VERSION"/kernel/crypto/*.ko* \
         $MODULES; do
     kmod="${kmod##*/}"
-    modprobe -aid "$EXTRACT_DIR" -S "$KERNEL_VERSION" --show-depends "${kmod%.ko}"
-done | while read -r insmod kmod; do
+    modprobe -aid "$EXTRACT_DIR" -S "$KERNEL_VERSION" --show-depends "${kmod%%.*}"
+done | while read -r insmod kmod _; do
     [ "$insmod" = "insmod" ] || continue
-    [ "$kmod" = "${kmod%.ko *}" ] || kmod="${kmod%.ko *}.ko"
     kmod_rel="${kmod#"$EXTRACT_DIR/lib/modules/$KERNEL_VERSION/"}"
     if [ ! -f "$kmod" ] || [ "${kmod_rel#kernel/}" = "$kmod_rel" ]; then
         echo "Error: Unexpected modprobe output: $insmod $kmod" >&2