From 7f697c09e590195ee336e3d3d9b5ffeab90a7fcb Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 24 Aug 2023 22:11:47 +0200 Subject: [PATCH] RHEL-9.3: 2.37.4-15 (fix typo in cramfs test) Related: #2133396 --- 0047-tests-improve-cramfs-tests.patch | 22 ++++++++++--------- ...uidd-improve-man-page-for-cont-clock.patch | 2 +- ...dd-enable-cont-clock-in-service-file.patch | 2 +- ...RM-human-readable-names-from-upstrea.patch | 2 +- ...ackport-cache-handling-from-upstream.patch | 2 +- ...-add-hint-about-supported-algorithms.patch | 2 +- ...-fstab-add-hint-about-systemd-reload.patch | 2 +- ...-about-duplicate-UUIDs-when-use-dump.patch | 2 +- ...s-don-t-write-mount-hint-to-terminal.patch | 2 +- util-linux.spec | 5 ++++- 10 files changed, 24 insertions(+), 19 deletions(-) diff --git a/0047-tests-improve-cramfs-tests.patch b/0047-tests-improve-cramfs-tests.patch index 7e1fc74..aacc245 100644 --- a/0047-tests-improve-cramfs-tests.patch +++ b/0047-tests-improve-cramfs-tests.patch @@ -1,4 +1,4 @@ -From c2d04e31f71c4e1ebb4ecb3c7d0fe7017439f98f Mon Sep 17 00:00:00 2001 +From 3dc40e180aaf653bc76fc0097a8bb112f48af5ae Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 2 Mar 2022 11:34:06 +0100 Subject: tests: improve cramfs tests @@ -13,9 +13,9 @@ Addresses: https://github.com/util-linux/util-linux/issues/1613 Signed-off-by: Karel Zak --- tests/ts/cramfs/doubles | 9 ++++++++- - tests/ts/cramfs/fsck-endianness | 2 ++ - tests/ts/cramfs/mkfs-endianness | 2 ++ - 3 files changed, 12 insertions(+), 1 deletion(-) + tests/ts/cramfs/fsck-endianness | 3 +++ + tests/ts/cramfs/mkfs-endianness | 3 +++ + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/ts/cramfs/doubles b/tests/ts/cramfs/doubles index 8a1b7bb88..eb2c7fa0f 100755 @@ -41,27 +41,29 @@ index 8a1b7bb88..eb2c7fa0f 100755 $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 +index bcfb46c90..222ea3fd3 100755 --- a/tests/ts/cramfs/fsck-endianness +++ b/tests/ts/cramfs/fsck-endianness -@@ -27,6 +27,8 @@ ts_check_test_command "$TS_HELPER_MD5" +@@ -27,6 +27,9 @@ ts_check_test_command "$TS_HELPER_MD5" ts_skip_nonroot -+TS_KNOWN_FAIL="yes" /* does not work on s390 */ ++# does not work on s390 ++TS_KNOWN_FAIL="yes" + 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 +index 91d476579..5f0ff714d 100755 --- a/tests/ts/cramfs/mkfs-endianness +++ b/tests/ts/cramfs/mkfs-endianness -@@ -26,6 +26,8 @@ ts_check_test_command "$TS_CMD_HEXDUMP" +@@ -26,6 +26,9 @@ ts_check_test_command "$TS_CMD_HEXDUMP" ts_skip_nonroot -+TS_KNOWN_FAIL="yes" /* does not work on s390 */ ++# does not work on s390 ++TS_KNOWN_FAIL="yes" + 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. diff --git a/0048-uuidd-improve-man-page-for-cont-clock.patch b/0048-uuidd-improve-man-page-for-cont-clock.patch index 4aa61cb..2a1cdaa 100644 --- a/0048-uuidd-improve-man-page-for-cont-clock.patch +++ b/0048-uuidd-improve-man-page-for-cont-clock.patch @@ -1,4 +1,4 @@ -From 534e1705026a17da762d8f7711f62e7b77503814 Mon Sep 17 00:00:00 2001 +From f0f4fe8901462ca335d89267037ffe99096bac72 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 9 Aug 2023 12:56:42 +0200 Subject: uuidd: improve man page for -cont-clock diff --git a/0049-uuidd-enable-cont-clock-in-service-file.patch b/0049-uuidd-enable-cont-clock-in-service-file.patch index 13d3958..ec0fe78 100644 --- a/0049-uuidd-enable-cont-clock-in-service-file.patch +++ b/0049-uuidd-enable-cont-clock-in-service-file.patch @@ -1,4 +1,4 @@ -From 69fdf53a190bf2da78237d4630c11952aae6564a Mon Sep 17 00:00:00 2001 +From 9d5e7c1357b8f4745d28b5a1aa8726b58666ad59 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 9 Aug 2023 13:12:34 +0200 Subject: uuidd: enable cont-clock in service file diff --git a/0050-lscpu-backport-ARM-human-readable-names-from-upstrea.patch b/0050-lscpu-backport-ARM-human-readable-names-from-upstrea.patch index 201d333..8993784 100644 --- a/0050-lscpu-backport-ARM-human-readable-names-from-upstrea.patch +++ b/0050-lscpu-backport-ARM-human-readable-names-from-upstrea.patch @@ -1,4 +1,4 @@ -From d631740ed7222b22646f75921600f369bf685a80 Mon Sep 17 00:00:00 2001 +From 5f44ec9a0096a0c220666d5586618fd718a9a40d Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 9 Aug 2023 13:21:02 +0200 Subject: lscpu: backport ARM human-readable names from upstream diff --git a/0051-libuuid-backport-cache-handling-from-upstream.patch b/0051-libuuid-backport-cache-handling-from-upstream.patch index 5091010..6259bcd 100644 --- a/0051-libuuid-backport-cache-handling-from-upstream.patch +++ b/0051-libuuid-backport-cache-handling-from-upstream.patch @@ -1,4 +1,4 @@ -From f3974b8c3cf3b4b753e8013f24327b5d04073c84 Mon Sep 17 00:00:00 2001 +From 6275861012e63828a3c43b3acacb4dd623af848d Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 9 Aug 2023 13:30:49 +0200 Subject: libuuid: backport cache handling from upstream diff --git a/0052-zramctl-add-hint-about-supported-algorithms.patch b/0052-zramctl-add-hint-about-supported-algorithms.patch index 4f01813..843fd6a 100644 --- a/0052-zramctl-add-hint-about-supported-algorithms.patch +++ b/0052-zramctl-add-hint-about-supported-algorithms.patch @@ -1,4 +1,4 @@ -From af44cc3a5f52b3f12f3f5a686ff43514659158a8 Mon Sep 17 00:00:00 2001 +From 3c494ecb0ed4c49b5843d458c0b487aee5d25963 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 9 Aug 2023 13:39:32 +0200 Subject: zramctl: add hint about supported algorithms diff --git a/0053-fstab-add-hint-about-systemd-reload.patch b/0053-fstab-add-hint-about-systemd-reload.patch index 8eeaf2d..0a83b88 100644 --- a/0053-fstab-add-hint-about-systemd-reload.patch +++ b/0053-fstab-add-hint-about-systemd-reload.patch @@ -1,4 +1,4 @@ -From 93ae260a5d96b0181d4b93be776f30a8f1b8dcc5 Mon Sep 17 00:00:00 2001 +From 71e5eb4208ff6692e6bf93c74f1737ce26ea9ef0 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 23 May 2023 11:34:19 +0200 Subject: fstab: add hint about systemd reload diff --git a/0054-sfdisk-add-hint-about-duplicate-UUIDs-when-use-dump.patch b/0054-sfdisk-add-hint-about-duplicate-UUIDs-when-use-dump.patch index cf91a35..5643361 100644 --- a/0054-sfdisk-add-hint-about-duplicate-UUIDs-when-use-dump.patch +++ b/0054-sfdisk-add-hint-about-duplicate-UUIDs-when-use-dump.patch @@ -1,4 +1,4 @@ -From 54fcf51aadec106f2c94977b227b60abce8c0c72 Mon Sep 17 00:00:00 2001 +From 2ab525d0cf6f4043e49e070040ec2fb67274ffe8 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 9 Aug 2023 13:51:03 +0200 Subject: sfdisk: add hint about duplicate UUIDs when use dump diff --git a/0055-tests-don-t-write-mount-hint-to-terminal.patch b/0055-tests-don-t-write-mount-hint-to-terminal.patch index 1a82f10..a22798a 100644 --- a/0055-tests-don-t-write-mount-hint-to-terminal.patch +++ b/0055-tests-don-t-write-mount-hint-to-terminal.patch @@ -1,4 +1,4 @@ -From c89b3fd791241856ee47d893371032250d55ef0c Mon Sep 17 00:00:00 2001 +From fe0b5c21d440ec00c5cba9b1c862aa189edc4446 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 10 Aug 2023 11:15:29 +0200 Subject: tests: don't write mount hint to terminal diff --git a/util-linux.spec b/util-linux.spec index 7a06f09..3cbf754 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,7 +2,7 @@ Summary: A collection of basic system utilities Name: util-linux Version: 2.37.4 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: http://en.wikipedia.org/wiki/Util-linux @@ -1023,6 +1023,9 @@ fi %{_libdir}/python*/site-packages/libmount/ %changelog +* Thu Aug 24 2023 Karel Zak 2.37.4-15 +- fix typo in patch for #2133396 + * Wed Aug 23 2023 Karel Zak 2.37.4-14 - improve fix #2133396 - Internal testsuite for cramfs fails on s390x