Compare commits

...
Sign in to create a new pull request.

9 commits

Author SHA1 Message Date
Python Maint
a0317f94b5 Rebuilt for Python 3.15.0b4 ABI change 2026-07-22 10:16:14 +02:00
Fedora Release Engineering
9213a0ec8f Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:18:23 +00:00
Karel Zak
d3c879ee06 upgrade to upstream release v2.42.2 2026-06-16 14:56:23 +02:00
Python Maint
e20697608b Rebuilt for Python 3.15 2026-06-03 17:43:18 +02:00
Karel Zak
62e94b8fcb revert util-linux-i18n noarch (rhbz#2453891) 2026-05-20 11:07:37 +02:00
Karel Zak
49c5ecdbfb make util-linux-i18n noarch (rhbz#2453891) 2026-05-20 10:28:46 +02:00
Karel Zak
ad160404f2 fix pam_lastlog2 patch to modify only Makefile.in 2026-05-19 13:49:26 +02:00
Karel Zak
f891325268 upgrade to upstream release v2.42.1
- fix pam_lastlog2 libpam linking (rhbz#2453457)
2026-05-19 13:29:13 +02:00
Karel Zak
da7125e4bb upgrade to upstream release v2.42 2026-04-02 14:26:48 +02:00
6 changed files with 14 additions and 207 deletions

3
.gitignore vendored
View file

@ -103,3 +103,6 @@
/util-linux-2.41.1.tar.xz
/util-linux-2.41.2.tar.xz
/util-linux-2.41.3.tar.xz
/util-linux-2.42.tar.xz
/util-linux-2.42.1.tar.xz
/util-linux-2.42.2.tar.xz

View file

@ -1,89 +0,0 @@
From 93a62761843ff76187bd542fe717fa0c9b8f73a7 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 24 Jun 2025 10:56:58 +0200
Subject: libmount: disable EROFS backing file support
Let's temporarily use the old reliable loop devices rather than directly
mounting EROFS images. It seems some tools need to adapt to the change.
See https://github.com/dracut-ng/dracut-ng/issues/1384
Signed-off-by: Karel Zak <kzak@redhat.com>
---
libmount/src/context_mount.c | 35 -----------------------------------
libmount/src/hook_loopdev.c | 7 -------
2 files changed, 42 deletions(-)
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index ee3eadb05..e1d06a61e 100644
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -961,24 +961,6 @@ int mnt_context_finalize_mount(struct libmnt_context *cxt)
return rc;
}
-static int is_erofs_regfile(struct libmnt_context *cxt)
-{
- const char *type = mnt_fs_get_fstype(cxt->fs);
- const char *src = mnt_fs_get_srcpath(cxt->fs);
- unsigned long flags = 0;
- struct stat st;
-
- if (!type || strcmp(type, "erofs") != 0)
- return 0;
- if (mnt_context_get_user_mflags(cxt, &flags))
- return 0;
- if (flags & (MNT_MS_LOOP | MNT_MS_OFFSET | MNT_MS_SIZELIMIT))
- return 0; /* it's already loopdev */
- if (!src || stat(src, &st) != 0 || !S_ISREG(st.st_mode))
- return 0;
- return 1;
-}
-
/**
* mnt_context_mount:
* @cxt: mount context
@@ -1083,23 +1065,6 @@ again:
}
}
- /*
- * Try mount EROFS image again with loop device.
- * See hook_loopdev.c:is_loopdev_required() for more details.
- */
- if (rc && mnt_context_get_syscall_errno(cxt) == ENOTBLK
- && is_erofs_regfile(cxt)) {
- struct libmnt_optlist *ol = mnt_context_get_optlist(cxt);
-
- mnt_context_reset_status(cxt);
- DBG(CXT, ul_debugobj(cxt, "enabling loop= for EROFS"));
- mnt_optlist_append_flags(ol, MNT_MS_LOOP, cxt->map_userspace);
-
- rc = mnt_context_call_hooks(cxt, MNT_STAGE_PREP_SOURCE);
- if (!rc)
- goto again;
- }
-
if (rc == 0)
rc = mnt_context_call_hooks(cxt, MNT_STAGE_POST);
diff --git a/libmount/src/hook_loopdev.c b/libmount/src/hook_loopdev.c
index 444d69d6f..29e181fe8 100644
--- a/libmount/src/hook_loopdev.c
+++ b/libmount/src/hook_loopdev.c
@@ -468,13 +468,6 @@ static int is_loopdev_required(struct libmnt_context *cxt, struct libmnt_optlist
}
}
- /* The EROFS kernel driver can be compiled with EROFS_FS_BACKED_BY_FILE,
- * allowing for the mounting of a regular file as a filesystem without
- * a loop device.
- */
- if (type && strcmp(type, "erofs") == 0)
- return 0;
-
/* Note that there is no restriction (on kernel side) that would
* prevent a regular file as a mount(2) source argument. A filesystem
* that is able to mount regular files could be implemented. For this
--
2.51.1

View file

@ -1,63 +0,0 @@
From b3e1a72d0272c8dc26db8c11c61cd4fed6a6b95f Mon Sep 17 00:00:00 2001
From: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>
Date: Tue, 6 Jan 2026 10:43:45 -0500
Subject: build-sys: (gcc) ignore -Wunused-but-set-variable for bison
[kzak@redhat.com: - merge two Christian's patches to make it more portable]
Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit db9047892a45c06bceb5768e7bb8c887289b9859)
(cherry picked from commit 718e4a76dd1262ce97f83dbc0c0fe9f97564ecbb)
---
libsmartcols/src/filter-parser.y | 11 +++++++----
sys-utils/hwclock-parse-date.y | 11 +++++++----
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/libsmartcols/src/filter-parser.y b/libsmartcols/src/filter-parser.y
index a7d41408e..23b05df33 100644
--- a/libsmartcols/src/filter-parser.y
+++ b/libsmartcols/src/filter-parser.y
@@ -1,9 +1,12 @@
%{
-#ifdef __clang__
-/* clang detects yynerrs as unused.
- * Will be fixed in future versions of bison.
+/*
+ * Compilers detect yynerrs as unused. Let's hope it will be fixed in future
+ * versions of Bison.
*/
-#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+#if defined(__GNUC__) && !defined(__clang__)
+# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#elif defined(__clang__)
+# pragma clang diagnostic ignored "-Wunused-but-set-variable"
#endif
#include <stdio.h>
diff --git a/sys-utils/hwclock-parse-date.y b/sys-utils/hwclock-parse-date.y
index 0d996cc87..7d6c38268 100644
--- a/sys-utils/hwclock-parse-date.y
+++ b/sys-utils/hwclock-parse-date.y
@@ -34,11 +34,14 @@
* TZ strings in dates.
*/
-#ifdef __clang__
-/* clang 15 detects yynerrs as unused.
- * Will be fixed in future versions of bison.
+/*
+ * Compilers detect yynerrs as unused. Let's hope it will be fixed in future
+ * versions of Bison.
*/
-#pragma clang diagnostic ignored "-Wunused-but-set-variable"
+#if defined(__GNUC__) && !defined(__clang__)
+# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#elif defined(__clang__)
+# pragma clang diagnostic ignored "-Wunused-but-set-variable"
#endif
/**
--
2.52.0

View file

@ -1,44 +0,0 @@
From b994886e18307ef3002a63679fba4a6177f476cf Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 26 Nov 2025 15:08:25 +0100
Subject: blkid: Drop const from blkid_partitions_get_name()
const for idx is useless as the value is copied anyway, so drop the
const. AFAIK this doesn't change ABI.
(cherry picked from commit b243de928aab8565e264f4af1d776cc860689f64)
(cherry picked from commit 479133958af89a2afda442e158107b465301dfbb)
---
libblkid/src/blkid.h.in | 2 +-
libblkid/src/partitions/partitions.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libblkid/src/blkid.h.in b/libblkid/src/blkid.h.in
index 91fc3b0be..031650dbc 100644
--- a/libblkid/src/blkid.h.in
+++ b/libblkid/src/blkid.h.in
@@ -340,7 +340,7 @@ extern uint64_t blkid_topology_get_diskseq(blkid_topology tp)
* partitions probing
*/
extern int blkid_known_pttype(const char *pttype);
-extern int blkid_partitions_get_name(const size_t idx, const char **name);
+extern int blkid_partitions_get_name(size_t idx, const char **name);
extern int blkid_probe_enable_partitions(blkid_probe pr, int enable)
__ul_attribute__((nonnull));
diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c
index 9df813c92..e838b3db1 100644
--- a/libblkid/src/partitions/partitions.c
+++ b/libblkid/src/partitions/partitions.c
@@ -907,7 +907,7 @@ int blkid_known_pttype(const char *pttype)
*
* Returns: -1 if @idx is out of range, or 0 on success.
*/
-int blkid_partitions_get_name(const size_t idx, const char **name)
+int blkid_partitions_get_name(size_t idx, const char **name)
{
if (idx < ARRAY_SIZE(idinfos)) {
*name = idinfos[idx]->name;
--
2.52.0

View file

@ -1 +1 @@
SHA512 (util-linux-2.41.3.tar.xz) = 3d299f0e05a4c982a04dbcbaaeff1222152feedf51c56c5dbdeb75999c68269d652a994f5cdf4c1ee42bb7b28475dd0792192c299fd9bc3b45198c5b153dad00
SHA512 (util-linux-2.42.2.tar.xz) = 7415add0be2930654e322830808dde03ff6d511bd357f0679e6b6287a13ca79fe58ce4ac05edef86b76fb381b3a36ca2da9d3c31b5dc0a1d889c203156a57277

View file

@ -1,9 +1,9 @@
### Header
Summary: Collection of basic system utilities
Name: util-linux
Version: 2.41.3
Version: 2.42.2
# -p -e rc1
Release: %autorelease -b7
Release: %autorelease
License: GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause-UC AND LicenseRef-Fedora-Public-Domain
URL: https://en.wikipedia.org/wiki/Util-linux
@ -107,14 +107,6 @@ Provides: /usr/sbin/sfdisk
Patch0: 0000-login-use-O_CREAT-on-lastlog.patch
Patch1: 0001-login-add-run-motd.d-to-the-hardcoded-MOTD_FILE.patch
### Temporary dracut workaround
Patch2: 0002-libmount-disable-EROFS-backing-file-support.patch
# Upstream backports
Patch3: 0003-build-sys-gcc-ignore-Wunused-but-set-variable-for-bi.patch
Patch4: 0004-blkid-Drop-const-from-blkid_partitions_get_name.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
@ -561,6 +553,7 @@ fi
%{_bindir}/colcrt
%{_bindir}/colrm
%{_bindir}/column
%{_bindir}/copyfilerange
%{_bindir}/coresched
%{_bindir}/eject
%{_bindir}/enosys
@ -568,6 +561,7 @@ fi
%{_bindir}/fallocate
%{_bindir}/fincore
%{_bindir}/fadvise
%{_bindir}/getino
%{_bindir}/getopt
%{_bindir}/hexdump
%{_bindir}/irqtop
@ -617,6 +611,7 @@ fi
%{_mandir}/man1/colcrt.1*
%{_mandir}/man1/colrm.1*
%{_mandir}/man1/column.1*
%{_mandir}/man1/copyfilerange.1*
%{_mandir}/man1/coresched.1.*
%{_mandir}/man1/eject.1*
%{_mandir}/man1/enosys.1*
@ -624,6 +619,7 @@ fi
%{_mandir}/man1/fadvise.1*
%{_mandir}/man1/fallocate.1*
%{_mandir}/man1/fincore.1*
%{_mandir}/man1/getino.1*
%{_mandir}/man1/getopt.1*
%{_mandir}/man1/hexdump.1*
%{_mandir}/man1/irqtop.1*
@ -739,6 +735,7 @@ fi
%{compldir}/colcrt
%{compldir}/colrm
%{compldir}/column
%{compldir}/copyfilerange
%{compldir}/coresched
%{compldir}/ctrlaltdel
%{compldir}/delpart
@ -754,6 +751,7 @@ fi
%{compldir}/fsck.minix
%{compldir}/fsfreeze
%{compldir}/fstrim
%{compldir}/getino
%{compldir}/getopt
%{compldir}/hexdump
%{compldir}/irqtop
@ -987,10 +985,12 @@ fi
%{_libdir}/pkgconfig/lastlog2.pc
%{_mandir}/man3/lastlog2.3.*
%{_mandir}/man3/ll2_import_lastlog.3*
%{_mandir}/man3/ll2_new_context.3*
%{_mandir}/man3/ll2_read_all.3*
%{_mandir}/man3/ll2_read_entry.3*
%{_mandir}/man3/ll2_remove_entry.3*
%{_mandir}/man3/ll2_rename_user.3*
%{_mandir}/man3/ll2_unref_context.3*
%{_mandir}/man3/ll2_update_login_time.3*
%{_mandir}/man3/ll2_write_entry.3*