diff --git a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch b/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch deleted file mode 100644 index bba4d54619..0000000000 --- a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch +++ /dev/null @@ -1,80 +0,0 @@ -From bcd11dece7d278bb0b76b138d08dedea80fa8262 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Nov 2023 18:43:57 +0100 -Subject: [PATCH] libuuid/src/gen_uuid.c: fix cs_min declaration - -Define cs_min through a define and not a const int to avoid the -following build failure with -O0 raised since version 2.39 and -https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: - -libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': -libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant - THREAD_LOCAL int cache_size = cs_min; - ^~~~~~ - -For consistency, also use define for cs_max and cs_factor - -Fixes: - - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/util-linux/util-linux/commit/07e5c29d501c19e7af84fecb5915e0f9f94cb49f ---- - libuuid/src/gen_uuid.c | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c -index 619ef0131..db793c374 100644 ---- a/libuuid/src/gen_uuid.c -+++ b/libuuid/src/gen_uuid.c -@@ -518,6 +518,10 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - return __uuid_generate_time_internal(out, num, cont_offset); - } - -+#define CS_MIN (1<<6) -+#define CS_MAX (1<<18) -+#define CS_FACTOR 2 -+ - /* - * Generate time-based UUID and store it to @out - * -@@ -529,11 +533,8 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - static int uuid_generate_time_generic(uuid_t out) { - #ifdef HAVE_TLS - /* thread local cache for uuidd based requests */ -- const int cs_min = (1<<6); -- const int cs_max = (1<<18); -- const int cs_factor = 2; - THREAD_LOCAL int num = 0; -- THREAD_LOCAL int cache_size = cs_min; -+ THREAD_LOCAL int cache_size = CS_MIN; - THREAD_LOCAL int last_used = 0; - THREAD_LOCAL struct uuid uu; - THREAD_LOCAL time_t last_time = 0; -@@ -552,10 +553,10 @@ static int uuid_generate_time_generic(uuid_t out) { - * Start with a small cache size to cover short running applications - * and adjust the cache size over the runntime. - */ -- if ((last_used == cache_size) && (cache_size < cs_max)) -- cache_size *= cs_factor; -- else if ((last_used < (cache_size / cs_factor)) && (cache_size > cs_min)) -- cache_size /= cs_factor; -+ if ((last_used == cache_size) && (cache_size < CS_MAX)) -+ cache_size *= CS_FACTOR; -+ else if ((last_used < (cache_size / CS_FACTOR)) && (cache_size > CS_MIN)) -+ cache_size /= CS_FACTOR; - - num = cache_size; - -@@ -568,7 +569,7 @@ static int uuid_generate_time_generic(uuid_t out) { - } - /* request to daemon failed, reset cache */ - num = 0; -- cache_size = cs_min; -+ cache_size = CS_MIN; - } - if (num > 0) { /* serve uuid from cache */ - uu.time_low++; --- -2.43.0 - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 1638cd9967..d47f47fdba 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,7 +1,7 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/sha256sums.asc -sha256 87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f util-linux-2.39.2.tar.xz +sha256 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f util-linux-2.39.3.tar.xz # License files, locally calculated -sha256 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 README.licensing +sha256 13f0ea46d12d798c095a6ad39d7ddc988e2e4d274c6494115f6b463f7bc4f702 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 72126adb00..a9e5b0bf68 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.39 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 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)