From: Thomas Weißschuh Date: Thu, 26 Jun 2025 10:54:51 +0000 (+0200) Subject: util-linux: update to v2.41.1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b954b4901eec9919d3cebf29e85f7a710ea0c83;p=thirdparty%2Fopenwrt.git util-linux: update to v2.41.1 Release Notes: https://www.kernel.org/pub/linux/utils/util-linux/v2.41/v2.41.1-ReleaseNotes Remove upstreamed: 0001-meson-add-feature-for-translated-documentation.patch 0001-meson-remove-tinfo-dependency-from-more.patch 0100-include-linux-unistd-h.patch Signed-off-by: Thomas Weißschuh Link: https://github.com/openwrt/openwrt/pull/19236 Signed-off-by: Nick Hainke --- diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 083a60c9eba..68425d0999e 100644 --- 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.41 +PKG_VERSION:=2.41.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.41 -PKG_HASH:=81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6 +PKG_HASH:=be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57 PKG_CPE_ID:=cpe:/a:kernel:util-linux PKG_LICENSE:=GPL-2.0-only diff --git a/package/utils/util-linux/patches/0001-meson-add-feature-for-translated-documentation.patch b/package/utils/util-linux/patches/0001-meson-add-feature-for-translated-documentation.patch deleted file mode 100644 index 8f187c48eac..00000000000 --- a/package/utils/util-linux/patches/0001-meson-add-feature-for-translated-documentation.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cd5038306e6815592fafbd06d406f45af2df3fcc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Mon, 14 Apr 2025 23:32:36 +0200 -Subject: [PATCH] meson: add feature for translated documentation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Translating the documentation is slow. -Add a feature which can be used to disable this step. - -Signed-off-by: Thomas Weißschuh ---- - meson_options.txt | 2 ++ - po-man/meson.build | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -25,6 +25,8 @@ option('sysvinit', type : 'feature', - option('btrfs', type : 'feature') - option('widechar', type : 'feature', - description : 'compile with wide character support') -+option('translate-docs', type : 'feature', -+ description : 'translate documentation') - - # enable building of various programs and features ("build-" prefix) - ---- a/po-man/meson.build -+++ b/po-man/meson.build -@@ -1,6 +1,6 @@ - po4a = find_program('po4a', required : false) - --if not (asciidoctor.found() and po4a.found()) -+if not get_option('translate-docs').require(asciidoctor.found()).require(po4a.found()).allowed() - subdir_done() - endif - diff --git a/package/utils/util-linux/patches/0001-meson-remove-tinfo-dependency-from-more.patch b/package/utils/util-linux/patches/0001-meson-remove-tinfo-dependency-from-more.patch deleted file mode 100644 index 3d195c01dfc..00000000000 --- a/package/utils/util-linux/patches/0001-meson-remove-tinfo-dependency-from-more.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 363e48da01956321fb9337c59d78865c97c711a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Mon, 14 Apr 2025 23:19:06 +0200 -Subject: [PATCH] meson: remove tinfo dependency from 'more' -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The more utility does not need libtinfo and it is not -specified in autotools either. - -Signed-off-by: Thomas Weißschuh ---- - meson.build | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - ---- a/meson.build -+++ b/meson.build -@@ -1387,8 +1387,7 @@ exe = executable( - more_sources, - link_with : [lib_common], - include_directories : includes, -- dependencies : [lib_tinfo, -- curses_libs, -+ dependencies : [curses_libs, - lib_magic], - install : opt, - build_by_default : opt) -@@ -1398,8 +1397,7 @@ exe2 = executable( - link_with : [lib_common], - include_directories : includes, - c_args : '-DTEST_PROGRAM', -- dependencies : [lib_tinfo, -- curses_libs, -+ dependencies : [curses_libs, - lib_magic], - build_by_default : opt and program_tests) - exes += exe diff --git a/package/utils/util-linux/patches/0100-include-linux-unistd-h.patch b/package/utils/util-linux/patches/0100-include-linux-unistd-h.patch deleted file mode 100644 index eddfd96904c..00000000000 --- a/package/utils/util-linux/patches/0100-include-linux-unistd-h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0033f97482a7979e0de71de0a16b583e8d74dbdc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sat, 19 Apr 2025 22:02:11 +0200 -Subject: [PATCH] include/mount-api-utils: include linux/unistd.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If SYS_statmount/SYS_listmount is not provided by the libc, -util-linux will fall back to __NR_statmount/__NR_listmount from the -kernel UAPI headers. -However it is not guaranteed that these symbols are actually visible in -mount-api-utils. - -Include linux/unistd.h which provides syscall numbers. -While this header is specific to Linux, the code is already using -linux/mount.h. - -Signed-off-by: Thomas Weißschuh ---- - include/mount-api-utils.h | 1 + - 1 file changed, 1 insertion(+) - ---- a/include/mount-api-utils.h -+++ b/include/mount-api-utils.h -@@ -8,6 +8,7 @@ - #ifdef HAVE_LINUX_MOUNT_H - #include - #include -+#include - #include - #include -