util-linux: update to 2.42.1

Release notes:
https://www.kernel.org/pub/linux/utils/util-linux/v2.42/v2.42.1-ReleaseNotes

Upstreamed:
0001-meson-test-for-statx-stx_mnt_id-in-sys-stat.h.patch
0001-nsenter-Fix-AT_HANDLE_FID-on-musl.patch

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
Link: https://github.com/openwrt/openwrt/pull/23432
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index 65bfc1d884844a22637212dc4d4a1d7b96759eba..aee0235f2146015fed95dc7ce8175272781d7b80 100644 (file)
--- a/package/utils/util-linux/Makefile
+++ b/package/utils/util-linux/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux
-PKG_VERSION:=2.42
+PKG_VERSION:=2.42.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.42
-PKG_HASH:=3452b260bbaa775d6e749ac3bb22111785003fc1f444970025c8da26dfa758e9
+PKG_HASH:=82e9158eb12a9b0b569d84e1687fed9dd18fe89ccd8ef5ac3427218a7c0d7f7f
 PKG_CPE_ID:=cpe:/a:kernel:util-linux
 
 PKG_INSTALL:=1

diff --git a/package/utils/util-linux/patches/0001-meson-test-for-statx-stx_mnt_id-in-sys-stat.h.patch b/package/utils/util-linux/patches/0001-meson-test-for-statx-stx_mnt_id-in-sys-stat.h.patch
deleted file mode 100644 (file)
index fe4c987..0000000
--- a/package/utils/util-linux/patches/0001-meson-test-for-statx-stx_mnt_id-in-sys-stat.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From af6168533cb011489bd0b4b1a2fbbaaeec6859b2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Fri, 10 Apr 2026 18:04:58 +0200
-Subject: [PATCH] meson: test for statx::stx_mnt_id in sys/stat.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Both the check for the general availability of 'struct statx' and the
-code actual code use sys/stat.h and not linux/stat.h.
-
-The test for stx_mnt_id also needs to test in sys/stat.h as otherwise
-the detection result is wrong.
-
-Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/meson.build
-+++ b/meson.build
-@@ -111,7 +111,7 @@ conf.set('HAVE_MOUNTFD_API', have_mountf
- have_struct_statx = cc.has_type('struct statx', args : '-D_GNU_SOURCE', prefix : '#include <sys/stat.h>')
- conf.set('HAVE_STRUCT_STATX', have_struct_statx ? 1 : false)
- have = cc.has_member('struct statx', 'stx_mnt_id',
--                     prefix : '#include <linux/stat.h>')
-+                     prefix : '#include <sys/stat.h>')
- conf.set('HAVE_STRUCT_STATX_STX_MNT_ID', have ? 1 : false)
- 
- 

diff --git a/package/utils/util-linux/patches/0001-nsenter-Fix-AT_HANDLE_FID-on-musl.patch b/package/utils/util-linux/patches/0001-nsenter-Fix-AT_HANDLE_FID-on-musl.patch
deleted file mode 100644 (file)
index f33ad25..0000000
--- a/package/utils/util-linux/patches/0001-nsenter-Fix-AT_HANDLE_FID-on-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5452239f6e69d2d3aaa427d2d2253247cfb7cb7b Mon Sep 17 00:00:00 2001
-From: Aleksi Hannula <ahannula4+nixgit@gmail.com>
-Date: Tue, 7 Apr 2026 14:52:16 +0300
-Subject: [PATCH] nsenter: Fix AT_HANDLE_FID on musl
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Aleksi Hannula <ahannula4+nixgit@gmail.com>
----
- sys-utils/nsenter.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
-index e10ba9cf90ab..98507958c0f1 100644
---- a/sys-utils/nsenter.c
-+++ b/sys-utils/nsenter.c
-@@ -29,6 +29,9 @@
- #ifdef HAVE_LINUX_NSFS_H
- # include <linux/nsfs.h>
- #endif
-+#ifndef AT_HANDLE_FID
-+# define AT_HANDLE_FID 0x200
-+#endif
- #ifndef NS_GET_USERNS
- # define NS_GET_USERNS           _IO(0xb7, 0x1)
- #endif
--- 
-2.53.0
-