upgrade to upstream release v2.41.3

This commit is contained in:
Karel Zak 2025-12-15 17:33:38 +01:00
commit b901887754
4 changed files with 10 additions and 35 deletions

1
.gitignore vendored
View file

@ -101,3 +101,4 @@
/util-linux-2.40.4.tar.xz
/util-linux-2.41.tar.xz
/util-linux-2.41.1.tar.xz
/util-linux-2.41.3.tar.xz

View file

@ -1,29 +0,0 @@
From 4d2fc6b99db2f17a2562548af63454134ee910ec Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 24 Jun 2025 11:14:29 +0200
Subject: [PATCH] ldattach: add ifndef BOTHER
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 5405c3e09057db82ed397e61443effa9614dbc4a)
---
sys-utils/ldattach.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index e06047c71..25903b4eb 100644
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -241,7 +241,9 @@ static int my_cfsetspeed(struct termios *ts, int speed)
* checks for speed and supports Bxxx bit rates only)...
*/
#if _HAVE_STRUCT_TERMIOS_C_ISPEED
-# define BOTHER 0010000 /* non standard rate */
+# ifndef BOTHER
+# define BOTHER 0010000 /* non standard rate */
+# endif
dbg("using non-standard speeds");
ts->c_ospeed = ts->c_ispeed = speed;
ts->c_cflag &= ~CBAUD;
--
2.49.0

View file

@ -1 +1 @@
SHA512 (util-linux-2.41.1.tar.xz) = 12cf37ab2d62d0378b16a40e0194ef7131ef1ad06737cca3f169cfc04b9da08a4233076c819b30705e8fb2c3b8d91a1d83aac4f036ce58b9cf5928f545e511a2
SHA512 (util-linux-2.41.3.tar.xz) = 3d299f0e05a4c982a04dbcbaaeff1222152feedf51c56c5dbdeb75999c68269d652a994f5cdf4c1ee42bb7b28475dd0792192c299fd9bc3b45198c5b153dad00

View file

@ -1,7 +1,7 @@
### Header
Summary: Collection of basic system utilities
Name: util-linux
Version: 2.41.1
Version: 2.41.3
# -p -e rc1
Release: %autorelease -b7
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
@ -114,8 +114,6 @@ Patch1: login-default-motd-file.patch
# 2367956 - EROFS vs. the latest util-linux and kernel
Patch2: 0001-libmount-disable-EROFS-backing-file-support.patch
# Upstream
Patch3: 0001-ldattach-add-ifndef-BOTHER.patch
%description
The util-linux package contains a large variety of low-level system
@ -398,7 +396,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/{pam.d,security/console.apps}
# And a dirs that the makefiles don't create
install -d %{buildroot}%{_rundir}/uuidd
install -d %{buildroot}%{_sharedstatedir}/libuuid
install -d %{buildroot}%{_sharedstatedir}/liblastlog
install -d %{buildroot}%{_sharedstatedir}/lastlog
# /etc/adjtime
install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/adjtime
@ -729,15 +727,19 @@ fi
%{compldir}/addpart
%{compldir}/blkdiscard
%{compldir}/blkzone
%{compldir}/bits
%{compldir}/blkpr
%{compldir}/cal
%{compldir}/chcpu
%{compldir}/chfn
%{compldir}/chmem
%{compldir}/chsh
%{compldir}/col
%{compldir}/choom
%{compldir}/colcrt
%{compldir}/colrm
%{compldir}/column
%{compldir}/coresched
%{compldir}/ctrlaltdel
%{compldir}/delpart
%{compldir}/eject
@ -764,6 +766,7 @@ fi
%{compldir}/lsblk
%{compldir}/lscpu
%{compldir}/lsclocks
%{compldir}/lsfd
%{compldir}/lsipc
%{compldir}/lsirq
%{compldir}/lslocks
@ -970,7 +973,7 @@ fi
%files -n liblastlog2
%license Documentation/licenses/COPYING.BSD-2-Clause
%dir %{_sharedstatedir}/liblastlog
%dir %{_sharedstatedir}/lastlog
%{_libdir}/liblastlog2.so.*
%{_pam_moduledir}/pam_lastlog2.so
%{_tmpfilesdir}/lastlog2-tmpfiles.conf