Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

tools/cmake/Makefile

@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cmake
-PKG_VERSION:=4.3.1
+PKG_VERSION:=4.3.2
 PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION)))
 PKG_RELEASE:=1
 PKG_CPE_ID:=cpe:/a:kitware:cmake
@@ -15,7 +15,7 @@ PKG_CPE_ID:=cpe:/a:kitware:cmake
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \
 		https://cmake.org/files/v$(PKG_VERSION_MAJOR)/
-PKG_HASH:=0798f4be7a1a406a419ac32db90c2956936fecbf50db3057d7af47d69a2d7edb
+PKG_HASH:=b0231eb39b3c3cabdc568c619df78208a7bd95ea10c9b2236d61218bac1b367d
 
 HOST_BUILD_PARALLEL:=1
 HOST_CONFIGURE_PARALLEL:=1

tools/util-linux/Makefile

@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=util-linux
-PKG_VERSION:=2.42
+PKG_VERSION:=2.42.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
 
 include $(INCLUDE_DIR)/host-build.mk

tools/util-linux/patches/0001-pidutils-gracefully-handle-systems-without-sys-vfs.h.patch

@@ -1,44 +0,0 @@
-From 788d3a1926b47a26db7b2db4be40e42acbadd009 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Sat, 11 Apr 2026 19:39:09 +0200
-Subject: [PATCH] pidutils: gracefully handle systems without sys/vfs.h /
- statfs()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
----
- lib/pidfd-utils.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/lib/pidfd-utils.c
-+++ b/lib/pidfd-utils.c
-@@ -6,7 +6,9 @@
-  */
- #include <stdlib.h>
- #include <sys/stat.h>
-+#ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
-+#endif
- #include <sys/types.h>
- #include <errno.h>
- #include <err.h>
-@@ -22,6 +24,7 @@
-  */
- int pfd_is_pidfs(int pidfd)
- {
-+#ifdef HAVE_SYS_VFS_H
- 	struct statfs stfs;
- 	int rc;
- 
-@@ -30,6 +33,9 @@ int pfd_is_pidfs(int pidfd)
- 		return 0;
- 
- 	return F_TYPE_EQUAL(stfs.f_type, STATFS_PIDFS_MAGIC);
-+#else
-+	return 1;
-+#endif
- }
- 
- #ifdef USE_PIDFD_INO_SUPPORT