[PATCH] core202: Ship util-linux

public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed

* [PATCH] core202: Ship util-linux
@ 2026-04-08  9:22 Adolf Belka
  2026-04-08  9:22 ` [PATCH] util-linux: Update to version 2.42 Adolf Belka
  0 siblings, 1 reply; 2+ messages in thread
From: Adolf Belka @ 2026-04-08  9:22 UTC (permalink / raw)
  To: development; +Cc: Adolf Belka

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/core/202/filelists/aarch64/util-linux | 1 +
 config/rootfiles/core/202/filelists/riscv64/util-linux | 1 +
 config/rootfiles/core/202/filelists/x86_64/util-linux  | 1 +
 3 files changed, 3 insertions(+)
 create mode 120000 config/rootfiles/core/202/filelists/aarch64/util-linux
 create mode 120000 config/rootfiles/core/202/filelists/riscv64/util-linux
 create mode 120000 config/rootfiles/core/202/filelists/x86_64/util-linux

diff --git a/config/rootfiles/core/202/filelists/aarch64/util-linux b/config/rootfiles/core/202/filelists/aarch64/util-linux
new file mode 120000
index 000000000..9c253c689
--- /dev/null
+++ b/config/rootfiles/core/202/filelists/aarch64/util-linux
@@ -0,0 +1 @@
+../../../../common/aarch64/util-linux
\ No newline at end of file
diff --git a/config/rootfiles/core/202/filelists/riscv64/util-linux b/config/rootfiles/core/202/filelists/riscv64/util-linux
new file mode 120000
index 000000000..f8e680205
--- /dev/null
+++ b/config/rootfiles/core/202/filelists/riscv64/util-linux
@@ -0,0 +1 @@
+../../../../common/riscv64/util-linux
\ No newline at end of file
diff --git a/config/rootfiles/core/202/filelists/x86_64/util-linux b/config/rootfiles/core/202/filelists/x86_64/util-linux
new file mode 120000
index 000000000..7b5558d2c
--- /dev/null
+++ b/config/rootfiles/core/202/filelists/x86_64/util-linux
@@ -0,0 +1 @@
+../../../../common/x86_64/util-linux
\ No newline at end of file
-- 
2.53.0



^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH] util-linux: Update to version 2.42
  2026-04-08  9:22 [PATCH] core202: Ship util-linux Adolf Belka
@ 2026-04-08  9:22 ` Adolf Belka
  0 siblings, 0 replies; 2+ messages in thread
From: Adolf Belka @ 2026-04-08  9:22 UTC (permalink / raw)
  To: development; +Cc: Adolf Belka

- Update from version 2.41.2 to 2.42
- Update of rootfiles for all architectures
- Changelog
    2.42
	Two security fixes applied - one for a CVE and the other for a CWE. These were
	 also applied at version 2.41.4
	The changelog for 2.42 is way too long to inlcude here (~1700 lines)
	 The details can be found in the tarball in
	 /Documentation/releases/v2.42-ReleaseNotes
    2.41.4
Security fixes:
	 CVE-2026-27456 - mount(8) TOCTOU symlink attack via loop device.
	   The SUID mount follows symlinks when resolving loop backing file
	   paths. On systems where non-root users are permitted to mount loop
	   devices (via 'user' option in fstab), this allows access to
	   arbitrary files.
	 CWE-190 - Integer overflow in libblkid parse_dos_extended().
	   A crafted MBR disk image can cause uint32_t wraparound in EBR
	   chain processing, causing reported partitions to not match the
	   on-disk layout. Tools like udisks may then register a partition
	   at logical sector 0.
Changes:
	blkid:
	    - Drop const from blkid_partitions_get_name() (by Daan De Meyer)
	build-sys:
	    - (gcc) ignore -Wunused-but-set-variable for bison (by Christian Goeschel Ndjomouo)
	disk-utils:
	    - fix typo in fdisk.c (by Christian Kirbach)
	libblkid:
	    - dos: validate EBR data and links within extended partition (by Karel Zak)
	libfdisk:
	    - dos: validate EBR link within extended partition bounds (by Karel Zak)
	loopdev:
	    - add LOOPDEV_FL_NOFOLLOW to prevent symlink attacks (by Karel Zak)
	tools:
	    - update git-version-next from master (by Karel Zak)
    2.41.3
	bash-completion:
	    - (mount) add missing options (by Christian Goeschel Ndjomouo)
	    - add lsfd (by Karel Zak)
	    - add blkpr (by Karel Zak)
	    - add bits to dist tarball (by Karel Zak)
	dmesg:
	    - fix const qualifier warnings in parse_callerid (by Karel Zak)
	eject:
	    - fix const qualifier warning in read_speed (by Karel Zak)
	enosys:
	    - fix const qualifier warning in parse_block (by Karel Zak)
	libblkid:
	    - fix const qualifier warning in blkid_parse_tag_string (by Karel Zak)
	    - use snprintf() instead of sprintf() (by Karel Zak)
	libfdisk:
	    - (dos) fix off-by-one in maximum last sector calculation (by Karel Zak)
	liblastlog2:
	    - fix operator precedence in conditional assignments (by Karel Zak)
	lib, lscpu:
	    - fix const qualifier discarded warnings in bsearch (by Karel Zak)
	libmount:
	    - fix const qualifier warning in mnt_parse_mountinfo_line (by Karel Zak)
	    - fix const qualifier warnings for C23 (by Karel Zak)
	logger:
	    - fix const qualifier warnings for C23 (by Karel Zak)
	login-utils:
	    - fix setpwnam() buffer use [CVE-2025-14104] (by Karel Zak)
	losetup:
	    - sort 'O' correctly for the mutual-exclusive check to work (by Benno Schulenberg)
	lscpu:
	    - use maximum CPU speed from DMI, avoid duplicate version string (by Karel Zak)
	    - Add a few missing Arm CPU identifiers (by Jonathan Thackray)
	lsfd:
	    - fix memory leak related to stat_error_class (by Masatake YAMATO)
	    - (bugfix) use PRIu32 for prining lport of netlink socket (by Masatake YAMATO)
	    - fix const qualifier warning in strnrstr (by Karel Zak)
	    - fix const qualifier warning in new_counter_spec (by Karel Zak)
	    - fix bsearch macro usage with glibc C23 (by Cristian Rodríguez)
	lsns:
	    - fix const qualifier warnings for C23 (by Karel Zak)
	namei:
	    - fix const qualifier warning in readlink_to_namei (by Karel Zak)
	partx:
	    - fix const qualifier warning in get_max_partno (by Karel Zak)
	po:
	    - update sr.po (from translationproject.org) (by Мирослав Николић)
	po-man:
	    - merge changes (by Karel Zak)
	    - update sr.po (from translationproject.org) (by Мирослав Николић)
	umount:
	    - consider helper return status for success message (by Christian Goeschel Ndjomouo)
	wdctl:
	    - remove -d option leftover (by Munehisa Kamata)
	whereis:
	    - fix const qualifier warnings for C23 (by Karel Zak)
	Misc:
	    - Fix memory leak in setpwnam() (by yao zhang)

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/aarch64/util-linux    |  9 +++++
 config/rootfiles/common/riscv64/util-linux    |  9 +++++
 config/rootfiles/common/x86_64/util-linux     |  9 +++++
 lfs/util-linux                                |  7 ++--
 .../util-linux-2.41.2-FTBFS-bsearch.patch     | 40 -------------------
 5 files changed, 30 insertions(+), 44 deletions(-)
 delete mode 100644 src/patches/util-linux-2.41.2-FTBFS-bsearch.patch

diff --git a/config/rootfiles/common/aarch64/util-linux b/config/rootfiles/common/aarch64/util-linux
index 8e9f379ba..bf418cea5 100644
--- a/config/rootfiles/common/aarch64/util-linux
+++ b/config/rootfiles/common/aarch64/util-linux
@@ -59,6 +59,7 @@ usr/bin/choom
 #usr/bin/colcrt
 #usr/bin/colrm
 #usr/bin/column
+#usr/bin/copyfilerange
 #usr/bin/coresched
 usr/bin/eject
 usr/bin/enosys
@@ -67,6 +68,7 @@ usr/bin/exch
 usr/bin/fallocate
 usr/bin/fincore
 usr/bin/flock
+#usr/bin/getino
 usr/bin/getopt
 usr/bin/hardlink
 usr/bin/hexdump
@@ -149,8 +151,10 @@ 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
@@ -163,6 +167,7 @@ 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
@@ -182,6 +187,7 @@ 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
@@ -201,6 +207,7 @@ 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
@@ -268,6 +275,7 @@ 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
@@ -277,6 +285,7 @@ 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 7a863a01f..d88e26fd2 100644
--- a/config/rootfiles/common/riscv64/util-linux
+++ b/config/rootfiles/common/riscv64/util-linux
@@ -59,6 +59,7 @@ usr/bin/choom
 #usr/bin/colcrt
 #usr/bin/colrm
 #usr/bin/column
+#usr/bin/copyfilerange
 #usr/bin/coresched
 usr/bin/eject
 usr/bin/enosys
@@ -67,6 +68,7 @@ usr/bin/fadvise
 usr/bin/fallocate
 usr/bin/fincore
 usr/bin/flock
+#usr/bin/getino
 usr/bin/getopt
 usr/bin/hardlink
 usr/bin/hexdump
@@ -149,8 +151,10 @@ 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
@@ -163,6 +167,7 @@ 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
@@ -182,6 +187,7 @@ 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
@@ -201,6 +207,7 @@ 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
@@ -268,6 +275,7 @@ 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
@@ -277,6 +285,7 @@ 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 1ec026284..38191f114 100644
--- a/config/rootfiles/common/x86_64/util-linux
+++ b/config/rootfiles/common/x86_64/util-linux
@@ -59,6 +59,7 @@ usr/bin/choom
 #usr/bin/colcrt
 #usr/bin/colrm
 #usr/bin/column
+#usr/bin/copyfilerange
 #usr/bin/coresched
 usr/bin/eject
 usr/bin/enosys
@@ -67,6 +68,7 @@ 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,8 +153,10 @@ 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
@@ -165,6 +169,7 @@ 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
@@ -184,6 +189,7 @@ 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
@@ -203,6 +209,7 @@ 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
@@ -270,6 +277,7 @@ 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
@@ -279,6 +287,7 @@ 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 ce00f1a39..dfe5bf11b 100644
--- a/lfs/util-linux
+++ b/lfs/util-linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2026  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.41.2
+VER        = 2.42
 #          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 = 96cf8022a2d727df373f717fcca750e4f3ffd365f50af35cb805fecb7fa39962dea134fab7efdb9dfdc5aa6ac721e758e2ea40254e21d3fd9e9e5e4b2d25aa91
+$(DL_FILE)_BLAKE2 = 531b79bbec272cf1007c55ff4042b5e1b14bcc0dc098e54e4b76ea2e70c785fc763f96686ad8cea5ea9c0f7190794f4d828b7742e3aa18a0c3ef506d34e9d465
 
 install : $(TARGET)
 
@@ -74,7 +74,6 @@ $(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
deleted file mode 100644
index 979cbf16a..000000000
--- a/src/patches/util-linux-2.41.2-FTBFS-bsearch.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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 â€˜bsearchâ€™ 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 â€˜bsearchâ€™ 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
-
-- 
2.53.0



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-04-08  9:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-04-08  9:22 [PATCH] core202: Ship util-linux Adolf Belka
2026-04-08  9:22 ` [PATCH] util-linux: Update to version 2.42 Adolf Belka

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