From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A39CC28B20 for ; Wed, 2 Apr 2025 08:26:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 6B92A80FAF; Wed, 2 Apr 2025 08:26:37 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id aHIbsX39cPLa; Wed, 2 Apr 2025 08:26:36 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org DC58182075 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp1.osuosl.org (Postfix) with ESMTP id DC58182075; Wed, 2 Apr 2025 08:26:35 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists1.osuosl.org (Postfix) with ESMTP id 022BA123 for ; Wed, 2 Apr 2025 08:26:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id F36A76116E for ; Wed, 2 Apr 2025 08:26:33 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id r8mNYR5IV-Ku for ; Wed, 2 Apr 2025 08:26:32 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.221.54; helo=mail-wr1-f54.google.com; envelope-from=thomas.devoogdt@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 41C80610B4 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 41C80610B4 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by smtp3.osuosl.org (Postfix) with ESMTPS id 41C80610B4 for ; Wed, 2 Apr 2025 08:26:32 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3914bc3e01aso3598705f8f.2 for ; Wed, 02 Apr 2025 01:26:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743582390; x=1744187190; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hwqGcmpndfb+k4SLvbhJw5QjZrIlnZOuO89WF0bBaKA=; b=WUTRwlB8DnrgZsHEJ8fYH0JqnEfdylV+AhYKBQvAz9daWi8k18Pn8gslRrjGwvjLX8 dTPRO7QTZBD7bhx32eABwLtIo2CeVbv/JwVhSCiAwRl+WoHN7jrApOiNrNM5Z68t5wSD Uq94kzmgvkBOIxh7KKKhi2mt10NVNYo/NOtDuYyZ4aqOkWLt9l+MQKwekzY3JBInd7sk FbguEObC5APEX2Da17mhU0Md0Iqz1iIJm2PcICNUeErCAj62l4gaV83foiA4N7gJFB0S Liw7Zcal3IWBILoc4TBauCDn94Fhp0koSoRuV0CdJV5UM3/1XfGBU3RGSnKHwzMz+EQp NWIg== X-Gm-Message-State: AOJu0Yz9FicCviH14ptmvzTwFrAi8YHiPTb7MFnX6R6VaRDCOxQvb4OD ilVKqcVQeRWyC5mWWovaj5j03oDJfa0KeeWNF1WSK8PzQaeDjUOxUIABNQ== X-Gm-Gg: ASbGncvsVHw0+FhxUNYXdvQhWLmwFxHRT0olKcLdqKZfEgGbrbc21sanp1xwlWhdQov 7+sscXcdRGAp/mJF4fFxVIjxHOEgDP589/y8w7sKH0qn3gTsTgopTTfUs+6og8MkzWNTI6IoEG3 DVuLt6+vdmDhi4YscvUzQAfU6NZLEXHyIygJf6BbM3j4DkObGFT6cu9jF9iCqrjPNS3qMSo3Mg5 7+oarfiWyVxJJgiCm0NLepm0zEbJrw8pgAN71VZhGrTNVwX6BKwECKd+jtTCKX7JwrXtu/tE3Ui oizkTWDHVBaBZVC7biHT1c4sm11LiEMVQkCKIs1xC+FnNnLv1i4sN8bARl6tivT5BDm9T2aGwMX dr8oBbhi6hmSaG+CclKelWg== X-Google-Smtp-Source: AGHT+IFBMjkSHq/3m8mlyPbpgXSpgiYPUShuFqttkpeBuosUK6cBkH4OpSozsB1mpxgqNwCT4MN1Mg== X-Received: by 2002:a05:6000:43ca:b0:38f:2678:d790 with SMTP id ffacd0b85a97d-39c120e2564mr9199662f8f.33.1743582389796; Wed, 02 Apr 2025 01:26:29 -0700 (PDT) Received: from thomas-Precision-7670.barco.com (d528f5fde.static.telenet.be. [82.143.95.222]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c0b663573sm16734798f8f.33.2025.04.02.01.26.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 01:26:29 -0700 (PDT) From: Thomas Devoogdt To: wbx@openadk.org Cc: buildroot@buildroot.org, thomas.devoogdt@barco.com, thomas@devoogdt.com Date: Wed, 2 Apr 2025 10:26:25 +0200 Message-ID: <20250402082625.599501-1-thomas@devoogdt.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=none (p=none dis=none) header.from=devoogdt.com Subject: [Buildroot] [PATCH v2] package/util-linux: bump to 2.41 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Thomas Devoogdt News: https://lore.kernel.org/util-linux/2cifsg7vkdiivfsmmximhbzybrsopn7zfqgwz2f6hyflh35pjr@ecyicq2cbsro/ Dropped patches which are all upstream. - https://github.com/util-linux/util-linux/pull/3049 - https://github.com/util-linux/util-linux/pull/3383 Added some new patches. (which are also upstream) - https://github.com/util-linux/util-linux/pull/3471 - https://github.com/util-linux/util-linux/pull/3484 Synced all license files. Dropped the AUTORECONF call, since 0001-libmount-ifdef-statx-call.patch is upstream. Signed-off-by: Thomas Devoogdt --- v2: - dropped AUTORECONF - added two compile patches --- .../0001-misc-never-include-wchar.h.patch | 160 ++++++++++++++++++ ...ch.c-fix-build-with-uclibc-ng-1.0.39.patch | 39 ----- .../0002-c.h-consolidate-THREAD_LOCAL.patch | 65 ------- ...ed-reference-to-add_namespace_for_ns.patch | 59 +++++++ ...ine-HAVE_LIBPTHREAD-and-PTHREAD_LIBS.patch | 47 ----- .../0004-meson-add-HAVE_LIBPTHREAD.patch | 27 --- ...non-cached-scenarios-when-lpthread-i.patch | 82 --------- package/util-linux/util-linux.hash | 10 +- package/util-linux/util-linux.mk | 11 +- 9 files changed, 232 insertions(+), 268 deletions(-) create mode 100644 package/util-linux/0001-misc-never-include-wchar.h.patch delete mode 100644 package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch delete mode 100644 package/util-linux/0002-c.h-consolidate-THREAD_LOCAL.patch create mode 100644 package/util-linux/0002-lsns-fix-undefined-reference-to-add_namespace_for_ns.patch delete mode 100644 package/util-linux/0003-autotools-define-HAVE_LIBPTHREAD-and-PTHREAD_LIBS.patch delete mode 100644 package/util-linux/0004-meson-add-HAVE_LIBPTHREAD.patch delete mode 100644 package/util-linux/0005-libuuid-support-non-cached-scenarios-when-lpthread-i.patch diff --git a/package/util-linux/0001-misc-never-include-wchar.h.patch b/package/util-linux/0001-misc-never-include-wchar.h.patch new file mode 100644 index 0000000000..3adfaa2261 --- /dev/null +++ b/package/util-linux/0001-misc-never-include-wchar.h.patch @@ -0,0 +1,160 @@ +From e8205294e329f50bdf465d8cdd15653fd42ec5c0 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 20 Mar 2025 11:57:06 +0100 +Subject: [PATCH] misc: never include wchar.h + +We have a portable "widechar.h" that follows --disable-widechar and +provides portability. It is a bug to directly include libc's wchar.h +or wctype.h. + +Fixes: https://github.com/util-linux/util-linux/issues/3470 +Signed-off-by: Karel Zak +(cherry picked from commit 5c0888dde3cc296d06b8243dcc78248ff90526e5) +Upstream: https://github.com/util-linux/util-linux/pull/3471 +Signed-off-by: Thomas Devoogdt +--- + disk-utils/cfdisk.c | 6 +----- + include/carefulputc.h | 5 +---- + include/fgetwc_or_err.h | 6 +----- + lib/idcache.c | 2 +- + sys-utils/irqtop.c | 7 ++----- + sys-utils/lsns.c | 2 +- + tests/helpers/test_sysinfo.c | 2 +- + 7 files changed, 8 insertions(+), 22 deletions(-) + +diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c +index 4018f4d3d..d4057eedb 100644 +--- a/disk-utils/cfdisk.c ++++ b/disk-utils/cfdisk.c +@@ -52,14 +52,10 @@ + # include + #endif + +-#ifdef HAVE_WIDECHAR +-# include +-# include +-#endif +- + #include "c.h" + #include "closestream.h" + #include "nls.h" ++#include "widechar.h" + #include "strutils.h" + #include "xalloc.h" + #include "mbsalign.h" +diff --git a/include/carefulputc.h b/include/carefulputc.h +index 3cc6f7ff9..c6b778bba 100644 +--- a/include/carefulputc.h ++++ b/include/carefulputc.h +@@ -4,12 +4,9 @@ + #include + #include + #include +-#ifdef HAVE_WIDECHAR +-#include +-#include +-#endif + #include + ++#include "widechar.h" + #include "cctype.h" + + /* +diff --git a/include/fgetwc_or_err.h b/include/fgetwc_or_err.h +index 3cf926283..f6ba71c6b 100644 +--- a/include/fgetwc_or_err.h ++++ b/include/fgetwc_or_err.h +@@ -1,13 +1,9 @@ + #ifndef UTIL_LINUX_FGETWC_OR_ERR_H + #define UTIL_LINUX_FGETWC_OR_ERR_H + +-#include +-#include +-#include +- +-#include "widechar.h" + #include "c.h" + #include "nls.h" ++#include "widechar.h" + + static inline wint_t fgetwc_or_err(FILE *stream) { + wint_t ret; +diff --git a/lib/idcache.c b/lib/idcache.c +index fa77e7b07..7bae76823 100644 +--- a/lib/idcache.c ++++ b/lib/idcache.c +@@ -4,12 +4,12 @@ + * + * Written by Karel Zak + */ +-#include + #include + #include + #include + + #include "c.h" ++#include "widechar.h" + #include "idcache.h" + + struct identry *get_id(struct idcache *ic, unsigned long int id) +diff --git a/sys-utils/irqtop.c b/sys-utils/irqtop.c +index ce6a2ca5b..f05bf6bef 100644 +--- a/sys-utils/irqtop.c ++++ b/sys-utils/irqtop.c +@@ -43,13 +43,10 @@ + # include + #endif + +-#ifdef HAVE_WIDECHAR +-# include +-# include +-#endif +- + #include + ++#include "c.h" ++#include "widechar.h" + #include "closestream.h" + #include "cpuset.h" + #include "monotonic.h" +diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c +index 6b2dcba96..2b613cf71 100644 +--- a/sys-utils/lsns.c ++++ b/sys-utils/lsns.c +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + #include + #include + # include +@@ -43,6 +42,7 @@ + #include "nls.h" + #include "xalloc.h" + #include "c.h" ++#include "widechar.h" + #include "list.h" + #include "closestream.h" + #include "optutils.h" +diff --git a/tests/helpers/test_sysinfo.c b/tests/helpers/test_sysinfo.c +index 1559d471f..95f50f3f6 100644 +--- a/tests/helpers/test_sysinfo.c ++++ b/tests/helpers/test_sysinfo.c +@@ -23,12 +23,12 @@ + #include + #include + #include +-#include + #include + #include + #include + + #include "c.h" ++#include "widechar.h" + + #ifdef __linux__ + # include +-- +2.43.0 + diff --git a/package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch b/package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch deleted file mode 100644 index 12dd119ef3..0000000000 --- a/package/util-linux/0001-sys-utils-setarch.c-fix-build-with-uclibc-ng-1.0.39.patch +++ /dev/null @@ -1,39 +0,0 @@ -From beef18da4de87ca5aaadf2beb14187f35cc4f50f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 15 May 2024 18:22:11 +0200 -Subject: [PATCH] sys-utils/setarch.c: fix build with uclibc-ng < 1.0.39 - -Fix the following build failure with uclibc-ng < 1.0.39 (i.e., without -https://github.com/wbx-github/uclibc-ng/commit/85ac4f04d94e98389a8315e720630d0f95bfdfd6) -raised since version 2.39 and -https://github.com/util-linux/util-linux/commit/03a254f010b08da1175f50a8ae7882e59228f1b4: - -sys-utils/setarch.c:106:7: error: 'PER_LINUX32_3GB' undeclared here (not in a function); did you mean 'PER_LINUX32'? - 106 | X(PER_LINUX32_3GB) \ - | ^~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/fb1feb47f2660882fa53f66bacc63e191fd52175 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/util-linux/util-linux/commit/4647fc6afbf7e99c49531600425df60f1243fcd2 ---- - sys-utils/setarch.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c -index 227bc6b5de..4bcb5e69e6 100644 ---- a/sys-utils/setarch.c -+++ b/sys-utils/setarch.c -@@ -89,6 +89,11 @@ - # define PER_LINUX_FDPIC (PER_LINUX | FDPIC_FUNCPTRS) - #endif - -+/* fallback for old uclibc-headers < 1.0.39 */ -+#ifndef PER_LINUX32_3GB -+# define PER_LINUX32_3GB (PER_LINUX32 | ADDR_LIMIT_3GB) -+#endif -+ - #define ALL_PERSONALITIES \ - X(PER_LINUX) \ - X(PER_LINUX_32BIT) \ diff --git a/package/util-linux/0002-c.h-consolidate-THREAD_LOCAL.patch b/package/util-linux/0002-c.h-consolidate-THREAD_LOCAL.patch deleted file mode 100644 index bb1a63ecc2..0000000000 --- a/package/util-linux/0002-c.h-consolidate-THREAD_LOCAL.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 7b3db914fa9073c667ea482c8b6b4e07fe6202cc Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 27 Jan 2025 13:40:23 +0100 -Subject: [PATCH] c.h: consolidate THREAD_LOCAL. - -Let's define this macro in one place only. - -Upstream: https://github.com/util-linux/util-linux/pull/3383 -Signed-off-by: Karel Zak -Signed-off-by: Julien Olivain ---- - include/c.h | 9 +++++++++ - lib/randutils.c | 5 ----- - libuuid/src/gen_uuid.c | 1 - - 3 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/include/c.h b/include/c.h -index 61b95ab2d..848c48536 100644 ---- a/include/c.h -+++ b/include/c.h -@@ -595,4 +595,13 @@ static inline void *reallocarray(void *ptr, size_t nmemb, size_t size) - } - #endif - -+/* -+ * thread-local storage -+ */ -+#ifdef HAVE_TLS -+# define THREAD_LOCAL static __thread -+#else -+# define THREAD_LOCAL static -+#endif -+ - #endif /* UTIL_LINUX_C_H */ -diff --git a/lib/randutils.c b/lib/randutils.c -index 15c2f7834..4c806e682 100644 ---- a/lib/randutils.c -+++ b/lib/randutils.c -@@ -20,11 +20,6 @@ - #include "randutils.h" - #include "nls.h" - --#ifdef HAVE_TLS --#define THREAD_LOCAL static __thread --#else --#define THREAD_LOCAL static --#endif - - #ifdef HAVE_GETRANDOM - # include -diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c -index 3b76ddc9a..69712267f 100644 ---- a/libuuid/src/gen_uuid.c -+++ b/libuuid/src/gen_uuid.c -@@ -92,7 +92,6 @@ - #include "md5.h" - #include "sha1.h" - --#define THREAD_LOCAL static __thread - - #ifdef _WIN32 - static void gettimeofday (struct timeval *tv, void *dummy) --- -2.48.1 - diff --git a/package/util-linux/0002-lsns-fix-undefined-reference-to-add_namespace_for_ns.patch b/package/util-linux/0002-lsns-fix-undefined-reference-to-add_namespace_for_ns.patch new file mode 100644 index 0000000000..5a53aed8ff --- /dev/null +++ b/package/util-linux/0002-lsns-fix-undefined-reference-to-add_namespace_for_ns.patch @@ -0,0 +1,59 @@ +From 300a66c30c3d0fb04c0f24cf23fde80e1e3bf5e4 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Tue, 25 Mar 2025 11:58:18 +0100 +Subject: [PATCH] lsns: fix undefined reference to add_namespace_for_nsfd #3483 + +Fixes: + +sys-utils/lsns-lsns.o: In function `read_process': +lsns.c:(.text+0x9e8): undefined reference to `add_namespace_for_nsfd' +collect2: error: ld returned 1 exit status + +Signed-off-by: Thomas Devoogdt +(cherry picked from commit 2ced43400f35f7bd45b29364e04166a63a06e16a) +Upstream: https://github.com/util-linux/util-linux/pull/3484 +Signed-off-by: Thomas Devoogdt +--- + sys-utils/lsns.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c +index 2b613cf71..4c49a8b2d 100644 +--- a/sys-utils/lsns.c ++++ b/sys-utils/lsns.c +@@ -587,7 +587,10 @@ static void add_namespace_from_sock(struct lsns *ls, pid_t pid, uint64_t fd) + if (get_namespace(ls, sb.st_ino)) + goto out_nsfd; + ++#ifdef USE_NS_GET_API + add_namespace_for_nsfd(ls, nsfd, sb.st_ino); ++#endif ++ + out_nsfd: + close(nsfd); + out_sk: +@@ -608,6 +611,7 @@ static void add_namespace_from_sock(struct lsns *ls __attribute__((__unused__)), + { + } + #endif /* HAVE_LINUX_NET_NAMESPACE_H */ ++ + /* Read namespaces open(2)ed explicitly by the process specified by `pc'. */ + static void read_opened_namespaces(struct lsns *ls, struct path_cxt *pc, pid_t pid) + { +@@ -627,11 +631,13 @@ static void read_opened_namespaces(struct lsns *ls, struct path_cxt *pc, pid_t p + if (st.st_dev == ls->nsfs_dev) { + if (get_namespace(ls, st.st_ino)) + continue; ++#ifdef USE_NS_GET_API + int fd = ul_path_openf(pc, O_RDONLY, "fd/%ju", (uintmax_t) num); + if (fd >= 0) { + add_namespace_for_nsfd(ls, fd, st.st_ino); + close(fd); + } ++#endif + } else if ((st.st_mode & S_IFMT) == S_IFSOCK) { + add_namespace_from_sock(ls, pid, num); + } +-- +2.43.0 + diff --git a/package/util-linux/0003-autotools-define-HAVE_LIBPTHREAD-and-PTHREAD_LIBS.patch b/package/util-linux/0003-autotools-define-HAVE_LIBPTHREAD-and-PTHREAD_LIBS.patch deleted file mode 100644 index 843253a56a..0000000000 --- a/package/util-linux/0003-autotools-define-HAVE_LIBPTHREAD-and-PTHREAD_LIBS.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0735eb8bc0ed4bc9820ea7e4e600fed246457b18 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 27 Jan 2025 14:01:38 +0100 -Subject: [PATCH] autotools: define HAVE_LIBPTHREAD and PTHREAD_LIBS - -Upstream: https://github.com/util-linux/util-linux/pull/3383 -Signed-off-by: Karel Zak -Signed-off-by: Julien Olivain ---- - configure.ac | 7 +++++++ - libuuid/src/Makemodule.am | 2 +- - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 82d0e4bf9..9a7f260c5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -738,6 +738,13 @@ AS_IF([test x"$have_timer" = xno], [ - ]) - - -+AC_CHECK_LIB([pthread], [pthread_atfork], [ -+ PTHREAD_LIBS="-lpthread" -+ AC_DEFINE([HAVE_LIBPTHREAD], [1], [Define if libpthred exist]) -+]) -+AC_SUBST([PTHREAD_LIBS]) -+ -+ - AC_CHECK_LIB([rtas], [rtas_get_sysparm], [ - RTAS_LIBS="-lrtas" - AC_DEFINE([HAVE_LIBRTAS], [1], [Define if librtas exists]) -diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am -index 867ad7be5..58b64fe9b 100644 ---- a/libuuid/src/Makemodule.am -+++ b/libuuid/src/Makemodule.am -@@ -31,7 +31,7 @@ libuuid_la_SOURCES = \ - EXTRA_libuuid_la_DEPENDENCIES = \ - libuuid/src/libuuid.sym - --libuuid_la_LIBADD = $(LDADD) $(SOCKET_LIBS) -lpthread -+libuuid_la_LIBADD = $(LDADD) $(SOCKET_LIBS) $(PTHREAD_LIBS) - - libuuid_la_CFLAGS = \ - $(AM_CFLAGS) \ --- -2.48.1 - diff --git a/package/util-linux/0004-meson-add-HAVE_LIBPTHREAD.patch b/package/util-linux/0004-meson-add-HAVE_LIBPTHREAD.patch deleted file mode 100644 index 19e0697769..0000000000 --- a/package/util-linux/0004-meson-add-HAVE_LIBPTHREAD.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f540cc6fed7224fb9ca162cb2f33c338260ae1d2 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 27 Jan 2025 14:11:35 +0100 -Subject: [PATCH] meson: add HAVE_LIBPTHREAD - -Upstream: https://github.com/util-linux/util-linux/pull/3383 -Signed-off-by: Karel Zak -Signed-off-by: Julien Olivain ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 6d1f986af..ac5fdd799 100644 ---- a/meson.build -+++ b/meson.build -@@ -748,6 +748,7 @@ endif - conf.set('HAVE_CLOCK_GETTIME', have ? 1 : false) - - thread_libs = dependency('threads') -+conf.set('HAVE_LIBPTHREAD', thread_libs.found() ? 1 : false) - - have = cc.has_function('timer_create') - if not have --- -2.48.1 - diff --git a/package/util-linux/0005-libuuid-support-non-cached-scenarios-when-lpthread-i.patch b/package/util-linux/0005-libuuid-support-non-cached-scenarios-when-lpthread-i.patch deleted file mode 100644 index 0d90f8aec9..0000000000 --- a/package/util-linux/0005-libuuid-support-non-cached-scenarios-when-lpthread-i.patch +++ /dev/null @@ -1,82 +0,0 @@ -From eecaa2c0dda817eba2d493f6ddb42c39cf789fc2 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 27 Jan 2025 14:28:36 +0100 -Subject: [PATCH] libuuid: support non-cached scenarios (when -lpthread is - unavailable) - -This patch makes the dependence on pthread optional for libuuid. In -certain cases, such as Buildroot Linux, uClibc-ng, and very low -resource systems, libpthread may be unavailable. - -If libuuid is compiled without pthread, it will not use a local cache -and will instead request a UUID from uuidd for each call. This may -result in less efficient performance, but the UUIDs generated will -still be unique and reliable. - -On minimalistic systems, it is highly likely that uuidd will not be -installed, making this change important for portability and robust -code. - -Upstream: https://github.com/util-linux/util-linux/pull/3383 -Addresses: https://github.com/util-linux/util-linux/pull/3375 -Signed-off-by: Karel Zak -Signed-off-by: Julien Olivain ---- - libuuid/src/gen_uuid.c | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) - -diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c -index 69712267f..1ed82b46b 100644 ---- a/libuuid/src/gen_uuid.c -+++ b/libuuid/src/gen_uuid.c -@@ -80,7 +80,10 @@ - #if defined(__linux__) && defined(HAVE_SYS_SYSCALL_H) - #include - #endif --#include -+#ifdef HAVE_LIBPTHREAD -+# include -+#endif -+ - #include - - #include "all-io.h" -@@ -580,8 +583,7 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - * If neither of these is possible (e.g. because of insufficient permissions), it generates - * the UUID anyway, but returns -1. Otherwise, returns 0. - */ -- --/* thread local cache for uuidd based requests */ -+#ifdef HAVE_LIBPTHREAD - THREAD_LOCAL struct { - int num; - int cache_size; -@@ -597,8 +599,10 @@ static void reset_uuidd_cache(void) - memset(&uuidd_cache, 0, sizeof(uuidd_cache)); - uuidd_cache.cache_size = CS_MIN; - } -+#endif /* HAVE_LIBPTHREAD */ - - static int uuid_generate_time_generic(uuid_t out) { -+#ifdef HAVE_LIBPTHREAD - static volatile sig_atomic_t atfork_registered; - time_t now; - -@@ -651,6 +655,14 @@ static int uuid_generate_time_generic(uuid_t out) { - return 0; - } - -+#else /* !HAVE_LIBPTHREAD */ -+ { -+ int num = 1; -+ if (get_uuid_via_daemon(UUIDD_OP_TIME_UUID, out, &num) == 0) -+ return 0; -+ } -+#endif /* HAVE_LIBPTHREAD */ -+ - return __uuid_generate_time(out, NULL); - } - --- -2.48.1 - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 317efebcbf..e74aa17c94 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,10 +1,14 @@ -# From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/sha256sums.asc -sha256 d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 util-linux-2.40.2.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.41/sha256sums.asc +sha256 81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6 util-linux-2.41.tar.xz # License files, locally calculated -sha256 27f25514040a401b2ceb7057eae1f46cedb1666664b519b5be7e0960d1b35164 README.licensing +sha256 4c2db318192bda62f3f8fcf71488bb5e602ae4385eba281d711b46cc13a40bb3 README.licensing +sha256 527f738966ca396cd5a68c1509390de2a780c6b614d9ee57f7544a6161938ed1 Documentation/licenses/COPYING.BSD-2-Clause sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC +sha256 6fc9e709ccbfe0d77fbffa2427a983282be2eb88e47b1cdb49f21a83b4d1e665 Documentation/licenses/COPYING.EUPL-1.2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-only sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 Documentation/licenses/COPYING.GPL-3.0-or-later sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63 Documentation/licenses/COPYING.ISC sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Documentation/licenses/COPYING.LGPL-2.1-or-later sha256 8555341619542abb48c102afd954e42d4478e5be16ad3d5af7b0ff71009e7348 Documentation/licenses/COPYING.MIT diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index ed30c0b107..71e458ccc4 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -7,8 +7,8 @@ # When making changes to this file, please check if # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. -UTIL_LINUX_VERSION_MAJOR = 2.40 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION_MAJOR = 2.41 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) @@ -24,18 +24,19 @@ UTIL_LINUX_LICENSE = \ ISC (rfkill) \ MIT (hardlink, flock) UTIL_LINUX_LICENSE_FILES = README.licensing \ + Documentation/licenses/COPYING.BSD-2-Clause \ Documentation/licenses/COPYING.BSD-3-Clause \ Documentation/licenses/COPYING.BSD-4-Clause-UC \ + Documentation/licenses/COPYING.EUPL-1.2 \ + Documentation/licenses/COPYING.GPL-2.0-only \ Documentation/licenses/COPYING.GPL-2.0-or-later \ + Documentation/licenses/COPYING.GPL-3.0-or-later \ Documentation/licenses/COPYING.ISC \ Documentation/licenses/COPYING.LGPL-2.1-or-later \ Documentation/licenses/COPYING.MIT UTIL_LINUX_CPE_ID_VENDOR = kernel -# 0001-libmount-ifdef-statx-call.patch -UTIL_LINUX_AUTORECONF = YES - UTIL_LINUX_INSTALL_STAGING = YES UTIL_LINUX_DEPENDENCIES = \ host-pkgconf \ -- 2.43.0 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot