diff --git a/0001-ldattach-add-ifndef-BOTHER.patch b/0001-ldattach-add-ifndef-BOTHER.patch new file mode 100644 index 0000000..602a518 --- /dev/null +++ b/0001-ldattach-add-ifndef-BOTHER.patch @@ -0,0 +1,29 @@ +From 4d2fc6b99db2f17a2562548af63454134ee910ec Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 24 Jun 2025 11:14:29 +0200 +Subject: [PATCH] ldattach: add ifndef BOTHER + +Signed-off-by: Karel Zak +(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 + diff --git a/util-linux.spec b/util-linux.spec index 59baae4..c6ebe25 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -114,6 +114,9 @@ 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 utilities that are necessary for a Linux system to function. Among