]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 46ce4fd)
Revert "util-linux: Update to version 2.42"
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 8 May 2026 10:05:11 +0000 (10:05 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 8 May 2026 10:08:28 +0000 (10:08 +0000)
This reverts commit 37f8555a366e9471229a665c8e849e499eefa8ce.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/rootfiles/common/aarch64/util-linux patch | blob | blame | history
config/rootfiles/common/riscv64/util-linux patch | blob | blame | history
config/rootfiles/common/x86_64/util-linux patch | blob | blame | history
lfs/util-linux patch | blob | blame | history
src/patches/util-linux-2.41.2-FTBFS-bsearch.patch [new file with mode: 0644] patch | blob

diff --git a/config/rootfiles/common/aarch64/util-linux b/config/rootfiles/common/aarch64/util-linux
index bf418cea52ebb9686296d45f7465ae90d7483e5d..8e9f379ba31f94e67be7d73ed003d50898b32e29 100644 (file)
--- a/config/rootfiles/common/aarch64/util-linux
+++ b/config/rootfiles/common/aarch64/util-linux
@@ -59,7 +59,6 @@ usr/bin/choom
 #usr/bin/colcrt
 #usr/bin/colrm
 #usr/bin/column
-#usr/bin/copyfilerange
 #usr/bin/coresched
 usr/bin/eject
 usr/bin/enosys
@@ -68,7 +67,6 @@ usr/bin/exch
 usr/bin/fallocate
 usr/bin/fincore
 usr/bin/flock
-#usr/bin/getino
 usr/bin/getopt
 usr/bin/hardlink
 usr/bin/hexdump
@@ -151,10 +149,8 @@ usr/sbin/rtcwake
 #usr/share/bash-completion
 #usr/share/bash-completion/completions
 #usr/share/bash-completion/completions/addpart
-#usr/share/bash-completion/completions/bits
 #usr/share/bash-completion/completions/blkdiscard
 #usr/share/bash-completion/completions/blkid
-#usr/share/bash-completion/completions/blkpr
 #usr/share/bash-completion/completions/blkzone
 #usr/share/bash-completion/completions/blockdev
 #usr/share/bash-completion/completions/cal
@@ -167,7 +163,6 @@ usr/sbin/rtcwake
 #usr/share/bash-completion/completions/colcrt
 #usr/share/bash-completion/completions/colrm
 #usr/share/bash-completion/completions/column
-#usr/share/bash-completion/completions/copyfilerange
 #usr/share/bash-completion/completions/coresched
 #usr/share/bash-completion/completions/ctrlaltdel
 #usr/share/bash-completion/completions/delpart
@@ -187,7 +182,6 @@ usr/sbin/rtcwake
 #usr/share/bash-completion/completions/fsck.minix
 #usr/share/bash-completion/completions/fsfreeze
 #usr/share/bash-completion/completions/fstrim
-#usr/share/bash-completion/completions/getino
 #usr/share/bash-completion/completions/getopt
 #usr/share/bash-completion/completions/hardlink
 #usr/share/bash-completion/completions/hexdump
@@ -207,7 +201,6 @@ usr/sbin/rtcwake
 #usr/share/bash-completion/completions/lsblk
 #usr/share/bash-completion/completions/lsclocks
 #usr/share/bash-completion/completions/lscpu
-#usr/share/bash-completion/completions/lsfd
 #usr/share/bash-completion/completions/lsipc
 #usr/share/bash-completion/completions/lsirq
 #usr/share/bash-completion/completions/lslocks
@@ -275,7 +268,6 @@ usr/sbin/rtcwake
 #usr/share/man/man1/colcrt.1
 #usr/share/man/man1/colrm.1
 #usr/share/man/man1/column.1
-#usr/share/man/man1/copyfilerange.1
 #usr/share/man/man1/coresched.1
 #usr/share/man/man1/dmesg.1
 #usr/share/man/man1/eject.1
@@ -285,7 +277,6 @@ usr/sbin/rtcwake
 #usr/share/man/man1/fallocate.1
 #usr/share/man/man1/fincore.1
 #usr/share/man/man1/flock.1
-#usr/share/man/man1/getino.1
 #usr/share/man/man1/getopt.1
 #usr/share/man/man1/hardlink.1
 #usr/share/man/man1/hexdump.1
diff --git a/config/rootfiles/common/riscv64/util-linux b/config/rootfiles/common/riscv64/util-linux
index d88e26fd20a0340f5d422c38facbb9f9619967e0..7a863a01fd1fcff08728b8a72c2160dea07e8231 100644 (file)
--- a/config/rootfiles/common/riscv64/util-linux
+++ b/config/rootfiles/common/riscv64/util-linux
@@ -59,7 +59,6 @@ usr/bin/choom
 #usr/bin/colcrt
 #usr/bin/colrm
 #usr/bin/column
-#usr/bin/copyfilerange
 #usr/bin/coresched
 usr/bin/eject
 usr/bin/enosys
@@ -68,7 +67,6 @@ usr/bin/fadvise
 usr/bin/fallocate
 usr/bin/fincore
 usr/bin/flock
-#usr/bin/getino
 usr/bin/getopt
 usr/bin/hardlink
 usr/bin/hexdump
@@ -151,10 +149,8 @@ usr/sbin/rtcwake
 #usr/share/bash-completion
 #usr/share/bash-completion/completions
 #usr/share/bash-completion/completions/addpart
-#usr/share/bash-completion/completions/bits
 #usr/share/bash-completion/completions/blkdiscard
 #usr/share/bash-completion/completions/blkid
-#usr/share/bash-completion/completions/blkpr
 #usr/share/bash-completion/completions/blkzone
 #usr/share/bash-completion/completions/blockdev
 #usr/share/bash-completion/completions/cal
@@ -167,7 +163,6 @@ usr/sbin/rtcwake
 #usr/share/bash-completion/completions/colcrt
 #usr/share/bash-completion/completions/colrm
 #usr/share/bash-completion/completions/column
-#usr/share/bash-completion/completions/copyfilerange
 #usr/share/bash-completion/completions/coresched
 #usr/share/bash-completion/completions/ctrlaltdel
 #usr/share/bash-completion/completions/delpart
@@ -187,7 +182,6 @@ usr/sbin/rtcwake
 #usr/share/bash-completion/completions/fsck.minix
 #usr/share/bash-completion/completions/fsfreeze
 #usr/share/bash-completion/completions/fstrim
-#usr/share/bash-completion/completions/getino
 #usr/share/bash-completion/completions/getopt
 #usr/share/bash-completion/completions/hardlink
 #usr/share/bash-completion/completions/hexdump
@@ -207,7 +201,6 @@ usr/sbin/rtcwake
 #usr/share/bash-completion/completions/lsblk
 #usr/share/bash-completion/completions/lsclocks
 #usr/share/bash-completion/completions/lscpu
-#usr/share/bash-completion/completions/lsfd
 #usr/share/bash-completion/completions/lsipc
 #usr/share/bash-completion/completions/lsirq
 #usr/share/bash-completion/completions/lslocks
@@ -275,7 +268,6 @@ usr/sbin/rtcwake
 #usr/share/man/man1/colcrt.1
 #usr/share/man/man1/colrm.1
 #usr/share/man/man1/column.1
-#usr/share/man/man1/copyfilerange.1
 #usr/share/man/man1/coresched.1
 #usr/share/man/man1/dmesg.1
 #usr/share/man/man1/eject.1
@@ -285,7 +277,6 @@ usr/sbin/rtcwake
 #usr/share/man/man1/fallocate.1
 #usr/share/man/man1/fincore.1
 #usr/share/man/man1/flock.1
-#usr/share/man/man1/getino.1
 #usr/share/man/man1/getopt.1
 #usr/share/man/man1/hardlink.1
 #usr/share/man/man1/hexdump.1
diff --git a/config/rootfiles/common/x86_64/util-linux b/config/rootfiles/common/x86_64/util-linux
index 38191f1145ca3c369d636768f589110f65be838f..1ec026284a7a79e78902de822661e15d247ac3f5 100644 (file)
--- a/config/rootfiles/common/x86_64/util-linux
+++ b/config/rootfiles/common/x86_64/util-linux
@@ -59,7 +59,6 @@ usr/bin/choom
 #usr/bin/colcrt
 #usr/bin/colrm
 #usr/bin/column
-#usr/bin/copyfilerange
 #usr/bin/coresched
 usr/bin/eject
 usr/bin/enosys
@@ -68,7 +67,6 @@ usr/bin/exch
 usr/bin/fallocate
 usr/bin/fincore
 usr/bin/flock
-#usr/bin/getino
 usr/bin/getopt
 usr/bin/hardlink
 usr/bin/hexdump
@@ -153,10 +151,8 @@ usr/sbin/rtcwake
 #usr/share/bash-completion
 #usr/share/bash-completion/completions
 #usr/share/bash-completion/completions/addpart
-#usr/share/bash-completion/completions/bits
 #usr/share/bash-completion/completions/blkdiscard
 #usr/share/bash-completion/completions/blkid
-#usr/share/bash-completion/completions/blkpr
 #usr/share/bash-completion/completions/blkzone
 #usr/share/bash-completion/completions/blockdev
 #usr/share/bash-completion/completions/cal
@@ -169,7 +165,6 @@ usr/sbin/rtcwake
 #usr/share/bash-completion/completions/colcrt
 #usr/share/bash-completion/completions/colrm
 #usr/share/bash-completion/completions/column
-#usr/share/bash-completion/completions/copyfilerange
 #usr/share/bash-completion/completions/coresched
 #usr/share/bash-completion/completions/ctrlaltdel
 #usr/share/bash-completion/completions/delpart
@@ -189,7 +184,6 @@ usr/sbin/rtcwake
 #usr/share/bash-completion/completions/fsck.minix
 #usr/share/bash-completion/completions/fsfreeze
 #usr/share/bash-completion/completions/fstrim
-#usr/share/bash-completion/completions/getino
 #usr/share/bash-completion/completions/getopt
 #usr/share/bash-completion/completions/hardlink
 #usr/share/bash-completion/completions/hexdump
@@ -209,7 +203,6 @@ usr/sbin/rtcwake
 #usr/share/bash-completion/completions/lsblk
 #usr/share/bash-completion/completions/lsclocks
 #usr/share/bash-completion/completions/lscpu
-#usr/share/bash-completion/completions/lsfd
 #usr/share/bash-completion/completions/lsipc
 #usr/share/bash-completion/completions/lsirq
 #usr/share/bash-completion/completions/lslocks
@@ -277,7 +270,6 @@ usr/sbin/rtcwake
 #usr/share/man/man1/colcrt.1
 #usr/share/man/man1/colrm.1
 #usr/share/man/man1/column.1
-#usr/share/man/man1/copyfilerange.1
 #usr/share/man/man1/coresched.1
 #usr/share/man/man1/dmesg.1
 #usr/share/man/man1/eject.1
@@ -287,7 +279,6 @@ usr/sbin/rtcwake
 #usr/share/man/man1/fallocate.1
 #usr/share/man/man1/fincore.1
 #usr/share/man/man1/flock.1
-#usr/share/man/man1/getino.1
 #usr/share/man/man1/getopt.1
 #usr/share/man/man1/hardlink.1
 #usr/share/man/man1/hexdump.1
diff --git a/lfs/util-linux b/lfs/util-linux
index dfe5bf11b0d5009e5854ce4f7386902ec0842224..ce00f1a391cce8fb6c83e4e0c45b3d63c51dc844 100644 (file)
--- a/lfs/util-linux
+++ b/lfs/util-linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2026  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.42
+VER        = 2.41.2
 #          https://www.kernel.org/pub/linux/utils/util-linux/
 
 THISAPP    = util-linux-$(VER)
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 531b79bbec272cf1007c55ff4042b5e1b14bcc0dc098e54e4b76ea2e70c785fc763f96686ad8cea5ea9c0f7190794f4d828b7742e3aa18a0c3ef506d34e9d465
+$(DL_FILE)_BLAKE2 = 96cf8022a2d727df373f717fcca750e4f3ffd365f50af35cb805fecb7fa39962dea134fab7efdb9dfdc5aa6ac721e758e2ea40254e21d3fd9e9e5e4b2d25aa91
 
 install : $(TARGET)
 
@@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        $(UPDATE_AUTOMAKE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/util-linux-2.41.2-FTBFS-bsearch.patch
        cd $(DIR_APP) && ./configure \
                                --docdir=/usr/share/doc/util-linux \
                                --disable-chfn-chsh \
diff --git a/src/patches/util-linux-2.41.2-FTBFS-bsearch.patch b/src/patches/util-linux-2.41.2-FTBFS-bsearch.patch
new file mode 100644 (file)
index 0000000..979cbf1
--- /dev/null
+++ b/src/patches/util-linux-2.41.2-FTBFS-bsearch.patch
@@ -0,0 +1,40 @@
+From 711bda1441561bfd2eb6d45fe0bc789535c1f1a8 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Cristian=20Rodr=C3=ADguez?= <cristian@rodriguez.im>
+Date: Sat, 22 Nov 2025 10:41:08 -0300
+Subject: [PATCH] lsfd: fix bsearch macro usage with glibc C23
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+C23 requires bsearch to be a const preserving macro, build now fails
+with
+
+../lsfd-cmd/lsfd.c:1879:75: error: macro â\80\98bsearchâ\80\99 passed 6 arguments, but takes just 5
+ 1879 |                                     nfds, sizeof(struct pollfd), pollfdcmp))
+      |                                                                           ^
+In file included from ../include/c.h:17,
+                 from ../lsfd-cmd/lsfd.c:48:
+/usr/include/stdlib.h:987:10: note: macro â\80\98bsearchâ\80\99 defined here
+  987 | # define bsearch(KEY, BASE, NMEMB, SIZE, COMPAR)                        \
+
+  add parenthesis around expression to fix it.
+---
+ lsfd-cmd/lsfd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lsfd-cmd/lsfd.c b/lsfd-cmd/lsfd.c
+index 335594144..4da86c602 100644
+--- a/lsfd-cmd/lsfd.c
++++ b/lsfd-cmd/lsfd.c
+@@ -1875,7 +1875,7 @@ static void mark_poll_fds_as_multiplexed(char *buf,
+               struct file *file = list_entry(f, struct file, files);
+               if (is_opened_file(file) && !file->multiplexed) {
+                       int fd = file->association;
+-                      if (bsearch(&(struct pollfd){.fd = fd,}, local.iov_base,
++                      if (bsearch((&(struct pollfd){.fd = fd,}), local.iov_base,
+                                   nfds, sizeof(struct pollfd), pollfdcmp))
+                               file->multiplexed = 1;
+               }
+-- 
+2.47.3
+
IPFire 2.x development tree