From 39455b190f81b4143f1cd158da4b748c088afcbb Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 8 Apr 2024 11:14:11 +0200 Subject: [PATCH] upgrade to v2.39.4 --- .gitignore | 1 + ...ibblkid-try-LUKS2-first-when-probing.patch | 43 ------------------- sources | 2 +- util-linux.spec | 11 ++--- 4 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch diff --git a/.gitignore b/.gitignore index 3116b34..210e0bc 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ /util-linux-2.39.1.tar.xz /util-linux-2.39.2.tar.xz /util-linux-2.39.3.tar.xz +/util-linux-2.39.4.tar.xz diff --git a/0001-Revert-libblkid-try-LUKS2-first-when-probing.patch b/0001-Revert-libblkid-try-LUKS2-first-when-probing.patch deleted file mode 100644 index 7325285..0000000 --- a/0001-Revert-libblkid-try-LUKS2-first-when-probing.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 93ba7961779789217a1f814ce3110ff8c040c8c3 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Wed, 12 Jul 2023 15:48:27 +0200 -Subject: [PATCH] Revert "libblkid: try LUKS2 first when probing" - -mdadm superblocks before 1.1 are placed at the end of the device, which -means that the data contained inside the array starts at offset 0. For -LUKS inside MD, blkid falsely detects this as plain LUKS instead of a -linux_raid_member. This causes e.g. dracut to not assemble the array -during boot and system startup fails. - -This reverts commit b8889c0a214aeb3dd47bf1ab280fe5534b64d2aa. ---- - libblkid/src/superblocks/superblocks.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c -index fb0392707..c7789a15b 100644 ---- a/libblkid/src/superblocks/superblocks.c -+++ b/libblkid/src/superblocks/superblocks.c -@@ -94,11 +94,6 @@ static int blkid_probe_set_usage(blkid_probe pr, int usage); - */ - static const struct blkid_idinfo *idinfos[] = - { -- /* In case the volume is locked with OPAL we are going to get -- * an I/O error when reading past the LUKS header, so try it -- * first. */ -- &luks_idinfo, -- - /* RAIDs */ - &linuxraid_idinfo, - &ddfraid_idinfo, -@@ -124,6 +119,7 @@ static const struct blkid_idinfo *idinfos[] = - &snapcow_idinfo, - &verity_hash_idinfo, - &integrity_idinfo, -+ &luks_idinfo, - &vmfs_volume_idinfo, - &ubi_idinfo, - &vdo_idinfo, --- -2.43.0 - diff --git a/sources b/sources index a8b2f3e..10ee2f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (util-linux-2.39.3.tar.xz) = a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa +SHA512 (util-linux-2.39.4.tar.xz) = 94e0282ac9705ca666d3c3864f2656bd1a21d879339164edd2c413ae7665b1cfec01f9c58a83b3148b8c4b4e857653447e5523c3b27230b175dd39f75ac6fae0 diff --git a/util-linux.spec b/util-linux.spec index 61e4a1a..bdeeab1 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,8 +1,8 @@ ### Header Summary: Collection of basic system utilities Name: util-linux -Version: 2.39.3 -Release: 6%{?dist} +Version: 2.39.4 +Release: 1%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://en.wikipedia.org/wiki/Util-linux @@ -100,9 +100,6 @@ Patch1: login-default-motd-file.patch # 2258501 - dnf5 unusable with libsmartcols Patch2: libsmartcols-fix-columns-reduction.patch -# Upstream backports -Patch100: 0001-Revert-libblkid-try-LUKS2-first-when-probing.patch - %description The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. Among @@ -944,6 +941,10 @@ fi %files -n util-linux-i18n -f %{name}.lang %changelog +* Mon Apr 8 2024 Karel Zak - 2.39.4-1 +- upgrade to v2.39.4 + https://kernel.org/pub/linux/utils/util-linux/v2.39/v2.39.4-ReleaseNotes + * Wed Feb 28 2024 Karel Zak - 2.39.3-6 - fix #2262393 - fstrim.timer issues (thanks to Zbigniew Jędrzejewski-Szmek)