RHEL-9.3: 2.37.4-14 (refresh cramfs test)

Note the patches are generated from git, so all after 0047 have a new checksums.

Related: #2133396

0047-tests-cramfs-make-GID-and-mode-use-more-robust.patch

@@ -1,40 +0,0 @@
-From f32865ea0f9979b8efd0d1aa748061cac8d842b5 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Wed, 2 Mar 2022 11:34:06 +0100
-Subject: tests: (cramfs) make GID and mode use more robust
-
-We already use the same in tests/ts/cramfs/mkfs.
-
-Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2133396
-Addresses: https://github.com/util-linux/util-linux/issues/1613
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- tests/ts/cramfs/doubles | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/tests/ts/cramfs/doubles b/tests/ts/cramfs/doubles
-index 8a1b7bb88..eb2c7fa0f 100755
---- a/tests/ts/cramfs/doubles
-+++ b/tests/ts/cramfs/doubles
-@@ -36,10 +36,17 @@ IMAGE_SRC="$TS_OUTDIR/${TS_TESTNAME}-data"
- ts_log "create mountpoint dir"
- [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
- 
--mkdir -p $IMAGE_SRC
-+rm -rf "$IMAGE_SRC"
-+mkdir -m 755 -p $IMAGE_SRC
-+
-+umask 133
-+
- echo hello > $IMAGE_SRC/a
- echo hello > $IMAGE_SRC/b
- 
-+# sudo may use whatever group
-+chgrp -R 0 "$IMAGE_SRC"
-+
- ts_log "create cramfs image"
- $TS_CMD_MKCRAMFS $IMAGE_SRC $IMAGE_PATH >> $TS_OUTPUT 2>> $TS_ERRLOG
- [ -s "$IMAGE_PATH" ] || ts_die "Cannot create $IMAGE_PATH"
--- 
-2.40.1
-

0047-tests-improve-cramfs-tests.patch

@@ -0,0 +1,71 @@
+From c2d04e31f71c4e1ebb4ecb3c7d0fe7017439f98f Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Wed, 2 Mar 2022 11:34:06 +0100
+Subject: tests: improve cramfs tests
+
+* make GID and mode use more robust (already used in tests/ts/cramfs/mkfs)
+
+* mark cramfs fsck/mkfs tests as TS_KNOWN_FAIL, the tests are based on
+  image checksums and it produces a different binary image on s390
+
+Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2133396
+Addresses: https://github.com/util-linux/util-linux/issues/1613
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ tests/ts/cramfs/doubles         | 9 ++++++++-
+ tests/ts/cramfs/fsck-endianness | 2 ++
+ tests/ts/cramfs/mkfs-endianness | 2 ++
+ 3 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/tests/ts/cramfs/doubles b/tests/ts/cramfs/doubles
+index 8a1b7bb88..eb2c7fa0f 100755
+--- a/tests/ts/cramfs/doubles
++++ b/tests/ts/cramfs/doubles
+@@ -36,10 +36,17 @@ IMAGE_SRC="$TS_OUTDIR/${TS_TESTNAME}-data"
+ ts_log "create mountpoint dir"
+ [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
+ 
+-mkdir -p $IMAGE_SRC
++rm -rf "$IMAGE_SRC"
++mkdir -m 755 -p $IMAGE_SRC
++
++umask 133
++
+ echo hello > $IMAGE_SRC/a
+ echo hello > $IMAGE_SRC/b
+ 
++# sudo may use whatever group
++chgrp -R 0 "$IMAGE_SRC"
++
+ ts_log "create cramfs image"
+ $TS_CMD_MKCRAMFS $IMAGE_SRC $IMAGE_PATH >> $TS_OUTPUT 2>> $TS_ERRLOG
+ [ -s "$IMAGE_PATH" ] || ts_die "Cannot create $IMAGE_PATH"
+diff --git a/tests/ts/cramfs/fsck-endianness b/tests/ts/cramfs/fsck-endianness
+index bcfb46c90..5d212d28e 100755
+--- a/tests/ts/cramfs/fsck-endianness
++++ b/tests/ts/cramfs/fsck-endianness
+@@ -27,6 +27,8 @@ ts_check_test_command "$TS_HELPER_MD5"
+ 
+ ts_skip_nonroot
+ 
++TS_KNOWN_FAIL="yes"	/* does not work on s390 */
++
+ IMAGE_LITTLE="$TS_SELF/cramfs-little.img"	#Known good little endian image
+ IMAGE_BIG="$TS_SELF/cramfs-big.img"		#Known good big endian image
+ 
+diff --git a/tests/ts/cramfs/mkfs-endianness b/tests/ts/cramfs/mkfs-endianness
+index 91d476579..cc5b2a475 100755
+--- a/tests/ts/cramfs/mkfs-endianness
++++ b/tests/ts/cramfs/mkfs-endianness
+@@ -26,6 +26,8 @@ ts_check_test_command "$TS_CMD_HEXDUMP"
+ 
+ ts_skip_nonroot
+ 
++TS_KNOWN_FAIL="yes"     /* does not work on s390 */
++
+ IMAGE_DATA="$TS_OUTDIR/${TS_TESTNAME}-data"
+ IMAGE_CREATED="$TS_OUTDIR/${TS_TESTNAME}-cramfs.img"	#Image created during the test and compared against the known images.
+ 
+-- 
+2.40.1
+

0048-uuidd-improve-man-page-for-cont-clock.patch

@@ -1,4 +1,4 @@
-From a0e0d88c4ab74cd53fe4a4c329edbdd40c0499c0 Mon Sep 17 00:00:00 2001
+From 534e1705026a17da762d8f7711f62e7b77503814 Mon Sep 17 00:00:00 2001
 From: Karel Zak <kzak@redhat.com>
 Date: Wed, 9 Aug 2023 12:56:42 +0200
 Subject: uuidd: improve man page for -cont-clock

0049-uuidd-enable-cont-clock-in-service-file.patch

@@ -1,4 +1,4 @@
-From 6900f8d68ac30a71e0f8265ce9652b4116be6fb6 Mon Sep 17 00:00:00 2001
+From 69fdf53a190bf2da78237d4630c11952aae6564a Mon Sep 17 00:00:00 2001
 From: Karel Zak <kzak@redhat.com>
 Date: Wed, 9 Aug 2023 13:12:34 +0200
 Subject: uuidd: enable cont-clock in service file

0050-lscpu-backport-ARM-human-readable-names-from-upstrea.patch

@@ -1,4 +1,4 @@
-From 52ebc01eb364b553730155d03a3f6cfd6e0e6b6c Mon Sep 17 00:00:00 2001
+From d631740ed7222b22646f75921600f369bf685a80 Mon Sep 17 00:00:00 2001
 From: Karel Zak <kzak@redhat.com>
 Date: Wed, 9 Aug 2023 13:21:02 +0200
 Subject: lscpu: backport ARM human-readable names from upstream

0051-libuuid-backport-cache-handling-from-upstream.patch

@@ -1,4 +1,4 @@
-From 7b3f270acde5f1ec960a90a73b05e8570053b301 Mon Sep 17 00:00:00 2001
+From f3974b8c3cf3b4b753e8013f24327b5d04073c84 Mon Sep 17 00:00:00 2001
 From: Karel Zak <kzak@redhat.com>
 Date: Wed, 9 Aug 2023 13:30:49 +0200
 Subject: libuuid: backport cache handling from upstream

0052-zramctl-add-hint-about-supported-algorithms.patch

@@ -1,4 +1,4 @@
-From c16421a093d2b6678f6c66eefaac75b67c6a423e Mon Sep 17 00:00:00 2001
+From af44cc3a5f52b3f12f3f5a686ff43514659158a8 Mon Sep 17 00:00:00 2001
 From: Karel Zak <kzak@redhat.com>
 Date: Wed, 9 Aug 2023 13:39:32 +0200
 Subject: zramctl: add hint about supported algorithms

0053-fstab-add-hint-about-systemd-reload.patch

@@ -1,4 +1,4 @@
-From aa25709fb5810f9143ee7592b23fc11b37f1d89c Mon Sep 17 00:00:00 2001
+From 93ae260a5d96b0181d4b93be776f30a8f1b8dcc5 Mon Sep 17 00:00:00 2001
 From: Karel Zak <kzak@redhat.com>
 Date: Tue, 23 May 2023 11:34:19 +0200
 Subject: fstab: add hint about systemd reload

0054-sfdisk-add-hint-about-duplicate-UUIDs-when-use-dump.patch

@@ -1,4 +1,4 @@
-From bf4fe551ca480da360e535f171dcf8a9c1510202 Mon Sep 17 00:00:00 2001
+From 54fcf51aadec106f2c94977b227b60abce8c0c72 Mon Sep 17 00:00:00 2001
 From: Karel Zak <kzak@redhat.com>
 Date: Wed, 9 Aug 2023 13:51:03 +0200
 Subject: sfdisk: add hint about duplicate UUIDs when use dump

0055-tests-don-t-write-mount-hint-to-terminal.patch

@@ -1,4 +1,4 @@
-From 3d9d53e5d66c2455de055284c38158f25977af67 Mon Sep 17 00:00:00 2001
+From c89b3fd791241856ee47d893371032250d55ef0c Mon Sep 17 00:00:00 2001
 From: Karel Zak <kzak@redhat.com>
 Date: Thu, 10 Aug 2023 11:15:29 +0200
 Subject: tests: don't write mount hint to terminal

util-linux.spec

@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux
 Version: 2.37.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 URL: http://en.wikipedia.org/wiki/Util-linux
 
@@ -172,7 +172,7 @@ Patch44: 0044-last-use-snprintf-rather-than-sprintf.patch
 Patch45: 0045-include-c-add-cmp_timespec-and-cmp_stat_mtime.patch
 Patch46: 0046-mount-add-hint-about-systemctl-daemon-reload.patch
 # 2133396 - Internal testsuite for cramfs fails on s390x
-Patch47: 0047-tests-cramfs-make-GID-and-mode-use-more-robust.patch
+Patch47: 0047-tests-improve-cramfs-tests.patch
 # 2174748 - enable uuidd cont-clock by default
 Patch48: 0048-uuidd-improve-man-page-for-cont-clock.patch
 Patch49: 0049-uuidd-enable-cont-clock-in-service-file.patch
@@ -1023,6 +1023,9 @@ fi
 %{_libdir}/python*/site-packages/libmount/
 
 %changelog
+* Wed Aug 23 2023 Karel Zak <kzak@redhat.com> 2.37.4-14
+- improve fix #2133396 - Internal testsuite for cramfs fails on s390x
+
 * Thu Aug 10 2023 Karel Zak <kzak@redhat.com> 2.37.4-13
 - improve fix #2180414 - Backport hint about systemd daemon-reload