public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/util-linux] f44: upgrade to upstream release v2.41.5
@ 2026-06-16 13:09 Karel Zak
  0 siblings, 0 replies; only message in thread
From: Karel Zak @ 2026-06-16 13:09 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/util-linux
Branch : f44
Commit : 4689efd541f651ca293fb6b59b0883b34d351779
Author : Karel Zak <kzak@redhat.com>
Date   : 2026-06-16T15:08:47+02:00
Stats  : +4/-115 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/util-linux/c/4689efd541f651ca293fb6b59b0883b34d351779?branch=f44

Log:
upgrade to upstream release v2.41.5

---
diff --git a/.gitignore b/.gitignore
index bb0efc1..df1391b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,3 +104,4 @@
 /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

diff --git a/0003-pam_lastlog2-fix-libpam-linking-in-autotools-build.patch b/0003-pam_lastlog2-fix-libpam-linking-in-autotools-build.patch
deleted file mode 100644
index 27cdc74..0000000
--- a/0003-pam_lastlog2-fix-libpam-linking-in-autotools-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c8d0af0421f6491ab1cb2301d2e197315289d34c Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 19 May 2026 10:54:57 +0200
-Subject: [PATCH] pam_lastlog2: fix libpam linking in autotools build
-
-Add -lpam to LIBADD. Without it pam_lastlog2.so is missing libpam.so
-in its ELF NEEDED entries and fails to load with dlopen() if the
-calling process does not itself link against libpam (e.g., systemd
-in Fedora 44+):
-
-  PAM unable to dlopen(pam_lastlog2.so): undefined symbol: pam_syslog
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2453457
-Signed-off-by: Karel Zak <kzak@redhat.com>
-(cherry picked from commit 5683ed6320e00205146cbb3d0c76462733530eca)
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 1234567..abcdefg 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -7439,7 +7439,7 @@
- @BUILD_PAM_LASTLOG2_TRUE@	 $(SOLIB_CFLAGS) \
- @BUILD_PAM_LASTLOG2_TRUE@	 -I$(ul_liblastlog2_incdir)
-
--@BUILD_PAM_LASTLOG2_TRUE@pam_lastlog2_la_LIBADD = liblastlog2.la
-+@BUILD_PAM_LASTLOG2_TRUE@pam_lastlog2_la_LIBADD = liblastlog2.la -lpam
- @BUILD_PAM_LASTLOG2_TRUE@pam_lastlog2_la_LDFLAGS = $(SOLIB_LDFLAGS) \
- @BUILD_PAM_LASTLOG2_TRUE@	-module -avoid-version -shared \
- @BUILD_PAM_LASTLOG2_TRUE@	$(am__append_608)
---
-2.52.0
-

diff --git a/0004-liblastlog2-wait-on-busy-SQLite-connections.patch b/0004-liblastlog2-wait-on-busy-SQLite-connections.patch
deleted file mode 100644
index eff2b10..0000000
--- a/0004-liblastlog2-wait-on-busy-SQLite-connections.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 1e4b0ec69d4a017436278a204b27224a8e07fd9e Mon Sep 17 00:00:00 2001
-From: WanBingjiang <wanbingjiang@webray.com.cn>
-Date: Mon, 30 Mar 2026 16:28:24 +0800
-Subject: [PATCH] liblastlog2: wait on busy SQLite connections
-
-Avoiding 'SQL error: database is locked' when lastlog2 writes lastlog2
-databese.
-
-Addresses: https://github.com/util-linux/util-linux/issues/4157
-Signed-off-by: WanBingjiang <wanbingjiang@webray.com.cn>
-(cherry picked from commit fff8c59c75355d365a69f86719e7bd7818c1daf4)
----
- liblastlog2/src/lastlog2.c | 31 +++++++++++++++++++++++++++++++
- 1 file changed, 31 insertions(+)
-
-diff --git a/liblastlog2/src/lastlog2.c b/liblastlog2/src/lastlog2.c
-index f285dddb4..ce1c6c68a 100644
---- a/liblastlog2/src/lastlog2.c
-+++ b/liblastlog2/src/lastlog2.c
-@@ -39,6 +39,23 @@
- #include "lastlog2P.h"
- #include "strutils.h"
- 
-+#define LASTLOG2_BUSY_TIMEOUT 3000
-+
-+static int
-+set_busy_timeout(sqlite3 *db, const char *path, char **error)
-+{
-+	int ret = 0;
-+
-+	if (sqlite3_busy_timeout(db, LASTLOG2_BUSY_TIMEOUT) != SQLITE_OK) {
-+		ret = -1;
-+		if (error && asprintf(error, "Cannot set busy timeout (%s): %s",
-+				     path, sqlite3_errmsg(db)) < 0)
-+			ret = -ENOMEM;
-+	}
-+
-+	return ret;
-+}
-+
- /* Sets the ll2 context/environment. */
- /* Returns the context or NULL if an error has happened. */
- extern struct ll2_context * ll2_new_context(const char *db_path)
-@@ -87,6 +104,13 @@ open_database_ro(struct ll2_context *context, sqlite3 **db, char **error)
- 				ret = -ENOMEM;
- 
- 		sqlite3_close(*db);
-+		return ret;
-+	}
-+
-+	ret = set_busy_timeout(*db, path, error);
-+	if (ret != 0) {
-+		sqlite3_close(*db);
-+		return ret;
- 	}
- 
- 	return ret;
-@@ -110,6 +134,13 @@ open_database_rw(struct ll2_context *context,  sqlite3 **db, char **error)
- 				ret = -ENOMEM;
- 
- 		sqlite3_close(*db);
-+		return ret;
-+	}
-+
-+	ret = set_busy_timeout(*db, path, error);
-+	if (ret != 0) {
-+		sqlite3_close(*db);
-+		return ret;
- 	}
- 
- 	return ret;
--- 
-2.52.0
-

diff --git a/sources b/sources
index 0e6509d..bfafc86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (util-linux-2.41.4.tar.xz) = c21ad77b787ab5892169c80cbec1ba46ed6bba36c1db278f2d1cd8712ae237f5cd25bfd20f2dc638334d1c47c5ff6102703147147d42f71c995bd397e735691a
+SHA512 (util-linux-2.41.5.tar.xz) = 25e7e79e0f0a4711a15c16db05357755536cf4dc9c0ee28447d95f9bfc135f23075d434e107269a65148a8c16b37755e913aacbaec03a3bdce171a9e0a46bfe8

diff --git a/util-linux.spec b/util-linux.spec
index 51ee390..2a7bb7f 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,9 +1,9 @@
 ### Header
 Summary: Collection of basic system utilities
 Name: util-linux
-Version: 2.41.4
+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,9 +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
 
-### Backported fixes
-Patch3: 0003-pam_lastlog2-fix-libpam-linking-in-autotools-build.patch
-Patch4: 0004-liblastlog2-wait-on-busy-SQLite-connections.patch
 
 %description
 The util-linux package contains a large variety of low-level system

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-16 13:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-16 13:09 [rpms/util-linux] f44: upgrade to upstream release v2.41.5 Karel Zak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox