From: Nick Hainke Date: Tue, 1 Aug 2023 21:43:12 +0000 (+0200) Subject: util-linux: update to 2.39.2 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=67e465b32ea236225924f43b9cf64faad9594be7;p=openwrt%2Fstaging%2Fjow.git util-linux: update to 2.39.2 Changelog: 4d3079ad4 build-sys: release++ (v2.39.2) 9dc7d9808 docs: update v2.39.2-ReleaseNotes 4ffb7ac7c docs: update AUTHORS file 20781132f po-man: merge changes 76228ce1c po: merge changes 86c851c27 po-man: update sr.po (from translationproject.org) c695dce97 po: update sr.po (from translationproject.org) b168eef36 po: update ja.po (from translationproject.org) 83557da34 po: update hr.po (from translationproject.org) 5495eeb64 po: update es.po (from translationproject.org) 7de55c1ea setarch: add PER_LINUX_FDPIC fallback b101de3d0 libblkid: fix topology chain types mismatch 131098cc8 uuidd: improve man page for -cont-clock 112d2245e zramctl: add hint about supported algorithms f5b01cd95 meson: check for HAVE_STRUCT_STATX_STX_MNT_ID a1f803340 include: define pidfd syscalls if needed 032c502d5 wall: do not error for ttys that do not exist 140404e1f column: fix -l 1632bd6d4 lscpu: Even more Arm part numbers (early 2023) fc0a64480 chrt: (man) add note about --sched-period lower limit 073d02941 meson: add check for struct statx 9d54f7c99 meson: add check for linux/mount.h d14d39cbd libmount: improve EPERM interpretation ce266c9e1 libmount: ifdef statx() call a64cec15a libmount: check for struct statx 396798d6b libmount: check for linux/mount.h 03435a7c6 libmount: (utils) fix statx fallback 993581379 libmount: cleanup --fake mode 501227232 libmount: (python): work around python 3.12 bug 8950e9852 build-sys: add AX_COMPARE_VERSION 1e05167df libmount: update documentation for MNT_ERR_APPLYFLAGS e7c34902f libmount: fix typo e5858dbb6 libmount: use some MS_* flags as superblock flags f1875239b libmount: use mount(2) for remount on Linux < 5.14 58cb00c63 github: check apt-cache in more robust way 0a9bf6166 libmount: handle failure to apply flags as part of a mount operation e98ef85a8 build-sys: release++ (v2.39.1) 12169133e docs: update v2.39.1-ReleaseNotes 508e25110 docs: update AUTHORS file 6b865e1b0 po-man: merge changes aa4f94cb5 po: merge changes cad75b635 po-man: add ro.po (from translationproject.org) 8acfe93b7 po-man: add ko.po (from translationproject.org) 5f31e774c po-man: update uk.po (from translationproject.org) 29626b095 po: update hr.po (from translationproject.org) 90835e74a cal: fix long option name for -c 7826c3ebe cal: fix error message for bad -c argument 07e6b9a12 lib/strutils: fix typo cc99bfd06 build-sys: don't call pkg-config --static if unnecessary 3b59942da logger: initialize socket credentials contol union 4746cf936 unshare: fix error message for unexpected time offsets a34e6aced losetup: deduplicate find_unused() logic 423d9efab lib/loopdev: consistently return error values from loopcxt_find_unused() 8feec98a8 lib/loopdev: document function return values 36ce0c250 tests: (run.sh) detect builddir from working directory 1943ad6cd hardlink: (man) add missing comma 1a4522541 libmount: fix sync options between context and fs structs 3aba3fb95 tests: (lsfd) add a case for verifying ENDPOINTS column output in JSON mode c289c152a lsfd: use ARRAY_STRING for ENDPOINTS column in JSON output mode 665e28c30 lsfd: (filter) weakly support ARRAY_STRING and ARRAY_NUMBER json types d9fca2b62 sfdisk: add hint about duplicate UUIDs when use dump d84ee5a46 lib: remove pager.c from libcommon c50da4b07 lib/ include/: cleanup license headers d5adeed7a lib/color-names: fix license header 868f7f10c tests: fix update special mount test output 2278e2f91 tests: backport special mount script d8a4e680f libmount: always ignore user= 22d0a6557 meson: check for _NL_TIME_WEEK_1STDAY in langinfo.h 205e88e51 meson: conditionalize waitpid aebfa97d5 meson: add conditionalization for test progs bbe24d5b1 meson: implement HAVE_PTY bc58e3b35 meson: install write setgid f5a411883 meson: install wall setgid 64e67f720 meson: install umount setuid 4c3c05006 meson: install mount setuid 58c107277 meson: install newgrp setuid 8549017af meson: install su setuid fa818dc8d meson: install chsh setuid 1e9fc724e meson: install chfn setuid 53ff0fcda libmount: introduce LIBMOUNT_FORCE_MOUNT2={always,never,auto} 61307a950 libmount: (optlist) correctly detect ro status 8c85b0805 tests: backport mount_setattr test 5004732d8 libblkid: jfs - avoid undefined shift c082e6182 build-sys: fix typo in waitpid check b04446bfd Update fsck.8.adoc 9429cc72b dmesg: make kmsg read() buffer big enough for kernel 198fd3fb2 Fix Blizzard-M2-Max 20c04a509 Add recent Apple ARM cores 9d4d768f2 libmount: don't call hooks after mount. helper 98ed3edf8 meson: install symlink for vigr man page f25cc3372 meson: include bash-completion for write 760c01641 meson: include bash-completion for newgrp ddf48064f libmount: cleanup enosys returns from mount hoop 230459358 libmount: don't call mount. helper with usernames 6fa034d0a libmount: fix options prepend/insert and merging f8c9ef62e libmount: check for availability of mount_setattr 9422991c9 libmount: don't pass option "defaults" to helper 2806759b5 build-sys: add --disable-waitpid 01e3ec515 mesg.1 cleanups/updates 00a19fb8c libblkid: (bcache) also calculate checksum over journal buckets 158639a2a libblkid: (bcache) extend superblock definition 43926e0b0 ci: prevent prompts during installation 01bb5d12d tools: (asciidoctor) explicitly require extensions module da22c179c build-sys: only pass --failure-level if supported 1bfc285fa lsfd: (tests) fix typo 66fac3e71 blkzone: don't take address of struct blk_zone d2e3ac959 enosys: add support for loongarch a369feacc meson: require 0.57 f084562c3 enosys: split audit arch detection into dedicated header 88f76e37a enosys: add support for sparc f65c49002 waitpid: only build when pidfd_open is available ddf9b36ea libsmartcols: (samples): fix format truncation warning 0d0766fbe test_uuidd: make pthread_t formatting more robust 873a896e0 mkfs.minix: handle 64bit time on 32bit system 69d8400e4 enosys: add support for MIPS, PowerPC and ARC 0ee8ac065 test_enosys: fix build on old kernels Remove upstreamed patches: - 0001-test_enosys-add-support-for-mips.patch - 200-meson-no-po.patch Backport patch: - 001-meson-properly-handle-gettext-non-existence.patch Signed-off-by: Nick Hainke --- diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 90724eb3f6..2ab72a2d2c 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.39 -PKG_RELEASE:=2 +PKG_VERSION:=2.39.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.39 -PKG_HASH:=32b30a336cda903182ed61feb3e9b908b762a5e66fe14e43efb88d37162075cb +PKG_HASH:=87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f PKG_CPE_ID:=cpe:/a:kernel:util-linux PKG_LICENSE:=GPL-2.0-only diff --git a/package/utils/util-linux/patches/0001-test_enosys-add-support-for-mips.patch b/package/utils/util-linux/patches/0001-test_enosys-add-support-for-mips.patch deleted file mode 100644 index f8c8f851ec..0000000000 --- a/package/utils/util-linux/patches/0001-test_enosys-add-support-for-mips.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2558932c65524d953e4c86d7fda2282a582aa5ec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Wed, 17 May 2023 16:50:47 +0200 -Subject: [PATCH] test_enosys: add support for mips, powerpc and arc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Thomas Weißschuh ---- - tests/helpers/test_enosys.c | 14 ++ - 1 file changed, 2 insertions(+) - ---- a/tests/helpers/test_enosys.c -+++ b/tests/helpers/test_enosys.c -@@ -53,6 +53,20 @@ - # else - # define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PPC64LE - # endif -+#elif __powerpc__ -+# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PPC -+#elif __mips__ -+# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -+# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_MIPS -+# else -+# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_MIPSEL -+# endif -+#elif __arc__ -+# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -+# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_ARCV2BE -+# else -+# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_ARCV2 -+# endif - #else - # error Unknown target architecture - #endif diff --git a/package/utils/util-linux/patches/001-meson-properly-handle-gettext-non-existence.patch b/package/utils/util-linux/patches/001-meson-properly-handle-gettext-non-existence.patch new file mode 100644 index 0000000000..f3d49d8d2d --- /dev/null +++ b/package/utils/util-linux/patches/001-meson-properly-handle-gettext-non-existence.patch @@ -0,0 +1,28 @@ +From b8bed37a1493b913bf5bda938487ae0c06c11ce7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Sat, 5 Aug 2023 08:57:28 +0200 +Subject: [PATCH] meson: properly handle gettext non-existence +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit e91a49c9747f ("meson: don't build po if no gettext") +tried to add the possibility to build util-linux without gettext. + +Unfortunately by default the call to find_program() would abort the +build if the program is not found. +Avoid aborting the build. + +Signed-off-by: Thomas Weißschuh +--- + po/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/po/meson.build ++++ b/po/meson.build +@@ -1,4 +1,4 @@ +-if not find_program('gettext').found() ++if not find_program('gettext', required : false).found() + subdir_done() + endif + diff --git a/package/utils/util-linux/patches/200-meson-no-po.patch b/package/utils/util-linux/patches/200-meson-no-po.patch deleted file mode 100644 index 4d94f6b89a..0000000000 --- a/package/utils/util-linux/patches/200-meson-no-po.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -874,7 +874,6 @@ subdir('disk-utils') - subdir('misc-utils') - subdir('text-utils') - subdir('term-utils') --subdir('po') - - includes = [dir_include, - dir_libblkid,