From 7f3b713efb789d7869162ec12d7dedde0e6e8c36 Mon Sep 17 00:00:00 2001 From: wuxl Date: Sat, 1 Nov 2025 04:07:26 +0800 Subject: [PATCH] malloc: Make set_init_malloc_par static to fix linknamespace test failures --- glibc.spec | 6 ++++- ...alloc_par-static-to-fix-tst-failures.patch | 25 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 make-set_init_malloc_par-static-to-fix-tst-failures.patch diff --git a/glibc.spec b/glibc.spec index 6f76f5a..7d459e2 100644 --- a/glibc.spec +++ b/glibc.spec @@ -62,7 +62,7 @@ ############################################################################## Name: glibc Version: 2.28 -Release: 120 +Release: 121 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -190,6 +190,7 @@ Patch103: nscd-avoid-assertion-failure-during-persistent-db-ch.patch Patch104: libio-Disable-vtable-validation-for-pre-2.1-interpos-handles.patch Patch105: x86-Assume-enable-cet-if-GCC-defaults-to-CET.patch Patch106: string-Define__CORRECT_ISO_CPP_STRING_H_PROTO-for-C.patch +Patch107: make-set_init_malloc_par-static-to-fix-tst-failures.patch Provides: ldconfig rtld(GNU_HASH) bundled(gnulib) @@ -1309,6 +1310,9 @@ fi %endif %changelog +* Tue Nov 04 2025 wuxiaolei - 2.28-121 +- malloc: make set_init_malloc_par static to fix linknamespace test failures + * Tue Oct 28 2025 panzhe - 2.28-120 - sync from glibc upstream for fix bugs - libio: Disable vtable validation for pre-2.1 interposed handles [BZ #25203] diff --git a/make-set_init_malloc_par-static-to-fix-tst-failures.patch b/make-set_init_malloc_par-static-to-fix-tst-failures.patch new file mode 100644 index 0000000..5bdfb78 --- /dev/null +++ b/make-set_init_malloc_par-static-to-fix-tst-failures.patch @@ -0,0 +1,25 @@ +From 08883071baf11ce00ffa0ef5cb8a4735d1276c75 Mon Sep 17 00:00:00 2001 +From: wuxl +Date: Sat, 1 Nov 2025 03:57:26 +0800 +Subject: [PATCH] Make set_init_malloc_par static to fix linknamespace failures + +--- + malloc/malloc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 2479b824..ca64872e 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -1781,7 +1781,7 @@ static struct malloc_par mp_ = + #endif + }; + +-int set_init_malloc_par = 0; ++static int set_init_malloc_par = 0; + static void init_malloc_par(void) + { + if (set_init_malloc_par) +-- +2.43.0 + -- Gitee