Compare commits

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

3 commits

Author SHA1 Message Date
Karel Zak
4689efd541 upgrade to upstream release v2.41.5 2026-06-16 15:08:47 +02:00
Karel Zak
83269f896e backport lastlog2 fixes from upstream
- fix pam_lastlog2 libpam linking (rhbz#2453457)
- wait on busy SQLite connections (rhbz#2419509)
2026-05-20 10:47:01 +02:00
Karel Zak
81358f5edd upgrade to upstream release v2.41.4 2026-04-01 14:51:29 +02:00
5 changed files with 5 additions and 114 deletions

2
.gitignore vendored
View file

@ -103,3 +103,5 @@
/util-linux-2.41.1.tar.xz
/util-linux-2.41.2.tar.xz
/util-linux-2.41.3.tar.xz
/util-linux-2.41.4.tar.xz
/util-linux-2.41.5.tar.xz

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.41.5.tar.xz) = 25e7e79e0f0a4711a15c16db05357755536cf4dc9c0ee28447d95f9bfc135f23075d434e107269a65148a8c16b37755e913aacbaec03a3bdce171a9e0a46bfe8

View file

@ -1,9 +1,9 @@
### Header
Summary: Collection of basic system utilities
Name: util-linux
Version: 2.41.3
Version: 2.41.5
# -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
@ -110,10 +110,6 @@ 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