Compare commits
5 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d09fe3cb85 | ||
|
|
8698049432 | ||
|
|
87d3c9659e | ||
|
|
aee7ca0078 | ||
|
|
b901887754 |
4 changed files with 15 additions and 38 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -101,3 +101,6 @@
|
||||||
/util-linux-2.40.4.tar.xz
|
/util-linux-2.40.4.tar.xz
|
||||||
/util-linux-2.41.tar.xz
|
/util-linux-2.41.tar.xz
|
||||||
/util-linux-2.41.1.tar.xz
|
/util-linux-2.41.1.tar.xz
|
||||||
|
/util-linux-2.41.3.tar.xz
|
||||||
|
/util-linux-2.41.4.tar.xz
|
||||||
|
/util-linux-2.41.5.tar.xz
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
||||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
SHA512 (util-linux-2.41.1.tar.xz) = 12cf37ab2d62d0378b16a40e0194ef7131ef1ad06737cca3f169cfc04b9da08a4233076c819b30705e8fb2c3b8d91a1d83aac4f036ce58b9cf5928f545e511a2
|
SHA512 (util-linux-2.41.5.tar.xz) = 25e7e79e0f0a4711a15c16db05357755536cf4dc9c0ee28447d95f9bfc135f23075d434e107269a65148a8c16b37755e913aacbaec03a3bdce171a9e0a46bfe8
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
### Header
|
### Header
|
||||||
Summary: Collection of basic system utilities
|
Summary: Collection of basic system utilities
|
||||||
Name: util-linux
|
Name: util-linux
|
||||||
Version: 2.41.1
|
Version: 2.41.5
|
||||||
# -p -e rc1
|
# -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
|
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
|
URL: https://en.wikipedia.org/wiki/Util-linux
|
||||||
|
|
||||||
|
|
@ -44,7 +44,8 @@ BuildRequires: librtas-devel
|
||||||
#BuildRequires: autoconf
|
#BuildRequires: autoconf
|
||||||
#BuildRequires: automake
|
#BuildRequires: automake
|
||||||
#BuildRequires: libtool
|
#BuildRequires: libtool
|
||||||
#BuildRequires: bison
|
BuildRequires: bison
|
||||||
|
BuildRequires: flex
|
||||||
|
|
||||||
### Sources
|
### Sources
|
||||||
Source0: https://www.kernel.org/pub/linux/utils/util-linux/v%{upstream_major}/util-linux-%{upstream_version}.tar.xz
|
Source0: https://www.kernel.org/pub/linux/utils/util-linux/v%{upstream_major}/util-linux-%{upstream_version}.tar.xz
|
||||||
|
|
@ -114,9 +115,6 @@ Patch1: login-default-motd-file.patch
|
||||||
# 2367956 - EROFS vs. the latest util-linux and kernel
|
# 2367956 - EROFS vs. the latest util-linux and kernel
|
||||||
Patch2: 0001-libmount-disable-EROFS-backing-file-support.patch
|
Patch2: 0001-libmount-disable-EROFS-backing-file-support.patch
|
||||||
|
|
||||||
# Upstream
|
|
||||||
Patch3: 0001-ldattach-add-ifndef-BOTHER.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The util-linux package contains a large variety of low-level system
|
The util-linux package contains a large variety of low-level system
|
||||||
utilities that are necessary for a Linux system to function. Among
|
utilities that are necessary for a Linux system to function. Among
|
||||||
|
|
@ -398,7 +396,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/{pam.d,security/console.apps}
|
||||||
# And a dirs that the makefiles don't create
|
# And a dirs that the makefiles don't create
|
||||||
install -d %{buildroot}%{_rundir}/uuidd
|
install -d %{buildroot}%{_rundir}/uuidd
|
||||||
install -d %{buildroot}%{_sharedstatedir}/libuuid
|
install -d %{buildroot}%{_sharedstatedir}/libuuid
|
||||||
install -d %{buildroot}%{_sharedstatedir}/liblastlog
|
install -d %{buildroot}%{_sharedstatedir}/lastlog
|
||||||
|
|
||||||
# /etc/adjtime
|
# /etc/adjtime
|
||||||
install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/adjtime
|
install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/adjtime
|
||||||
|
|
@ -729,15 +727,19 @@ fi
|
||||||
%{compldir}/addpart
|
%{compldir}/addpart
|
||||||
%{compldir}/blkdiscard
|
%{compldir}/blkdiscard
|
||||||
%{compldir}/blkzone
|
%{compldir}/blkzone
|
||||||
|
%{compldir}/bits
|
||||||
|
%{compldir}/blkpr
|
||||||
%{compldir}/cal
|
%{compldir}/cal
|
||||||
%{compldir}/chcpu
|
%{compldir}/chcpu
|
||||||
%{compldir}/chfn
|
%{compldir}/chfn
|
||||||
%{compldir}/chmem
|
%{compldir}/chmem
|
||||||
%{compldir}/chsh
|
%{compldir}/chsh
|
||||||
%{compldir}/col
|
%{compldir}/col
|
||||||
|
%{compldir}/choom
|
||||||
%{compldir}/colcrt
|
%{compldir}/colcrt
|
||||||
%{compldir}/colrm
|
%{compldir}/colrm
|
||||||
%{compldir}/column
|
%{compldir}/column
|
||||||
|
%{compldir}/coresched
|
||||||
%{compldir}/ctrlaltdel
|
%{compldir}/ctrlaltdel
|
||||||
%{compldir}/delpart
|
%{compldir}/delpart
|
||||||
%{compldir}/eject
|
%{compldir}/eject
|
||||||
|
|
@ -764,6 +766,7 @@ fi
|
||||||
%{compldir}/lsblk
|
%{compldir}/lsblk
|
||||||
%{compldir}/lscpu
|
%{compldir}/lscpu
|
||||||
%{compldir}/lsclocks
|
%{compldir}/lsclocks
|
||||||
|
%{compldir}/lsfd
|
||||||
%{compldir}/lsipc
|
%{compldir}/lsipc
|
||||||
%{compldir}/lsirq
|
%{compldir}/lsirq
|
||||||
%{compldir}/lslocks
|
%{compldir}/lslocks
|
||||||
|
|
@ -970,7 +973,7 @@ fi
|
||||||
|
|
||||||
%files -n liblastlog2
|
%files -n liblastlog2
|
||||||
%license Documentation/licenses/COPYING.BSD-2-Clause
|
%license Documentation/licenses/COPYING.BSD-2-Clause
|
||||||
%dir %{_sharedstatedir}/liblastlog
|
%dir %{_sharedstatedir}/lastlog
|
||||||
%{_libdir}/liblastlog2.so.*
|
%{_libdir}/liblastlog2.so.*
|
||||||
%{_pam_moduledir}/pam_lastlog2.so
|
%{_pam_moduledir}/pam_lastlog2.so
|
||||||
%{_tmpfilesdir}/lastlog2-tmpfiles.conf
|
%{_tmpfilesdir}/lastlog2-tmpfiles.conf
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue