diff --git a/package/glibc/0001-Rename-__unused-fields-to-__glibc_reserved.patch b/package/glibc/0001-Rename-__unused-fields-to-__glibc_reserved.patch deleted file mode 100644 index ae832a6035..0000000000 --- a/package/glibc/0001-Rename-__unused-fields-to-__glibc_reserved.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 243bdfec8f7cd4a85a8ce6e4e9a5a5accd3ce1aa Mon Sep 17 00:00:00 2001 -From: Jakub Jelinek -Date: Tue, 17 Feb 2026 17:06:48 +0100 -Subject: [PATCH] Rename __unused fields to __glibc_reserved. - -__unused is often defined to __attribute__((unused)) in BSD -sources and furthermore libstdc++ testsuite uses it as a macro -to verify libstdc++ headers don't use __unused identifiers. -In ~2012 glibc headers have been cleaned up, but some new -uses of __unused have reappeared (s390 fenv.h already many -years ago, the rest last November). - -Reviewed-by: Florian Weimer - -Upstream: https://sourceware.org/git/?p=glibc.git;a=commit;h=18b97b03b7442d8ba0860e43145f8724c9e77b17 - -Signed-off-by: Bernd Kuhls ---- - sysdeps/powerpc/nptl/bits/struct_mutex.h | 2 +- - sysdeps/s390/fpu/bits/fenv.h | 8 ++++---- - sysdeps/s390/nptl/bits/struct_mutex.h | 2 +- - sysdeps/x86/nptl/bits/struct_mutex.h | 2 +- - 4 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/sysdeps/powerpc/nptl/bits/struct_mutex.h b/sysdeps/powerpc/nptl/bits/struct_mutex.h -index 1472af21f7..ebf2d50922 100644 ---- a/sysdeps/powerpc/nptl/bits/struct_mutex.h -+++ b/sysdeps/powerpc/nptl/bits/struct_mutex.h -@@ -32,7 +32,7 @@ struct __pthread_mutex_s - int __kind; - #if __WORDSIZE == 64 - short __spins; -- short __unused; -+ short __glibc_reserved; - __pthread_list_t __list; - # define __PTHREAD_MUTEX_HAVE_PREV 1 - #else -diff --git a/sysdeps/s390/fpu/bits/fenv.h b/sysdeps/s390/fpu/bits/fenv.h -index b9e844e393..33e88fbe9d 100644 ---- a/sysdeps/s390/fpu/bits/fenv.h -+++ b/sysdeps/s390/fpu/bits/fenv.h -@@ -76,10 +76,10 @@ typedef unsigned int fexcept_t; /* size of fpc */ - typedef struct - { - fexcept_t __fpc; -- void *__unused; -- /* The field __unused (formerly __ieee_instruction_pointer) is a relict from -- commit "Remove PTRACE_PEEKUSER" (87b9b50f0d4b92248905e95a06a13c513dc45e59) -- and isn't used anymore. */ -+ void *__glibc_reserved; -+ /* The field __glibc_reserved (formerly __ieee_instruction_pointer) is a -+ relict from commit "Remove PTRACE_PEEKUSER" -+ (87b9b50f0d4b92248905e95a06a13c513dc45e59) and isn't used anymore. */ - } fenv_t; - - /* If the default argument is used we use this value. */ -diff --git a/sysdeps/s390/nptl/bits/struct_mutex.h b/sysdeps/s390/nptl/bits/struct_mutex.h -index d069b485d1..571265267c 100644 ---- a/sysdeps/s390/nptl/bits/struct_mutex.h -+++ b/sysdeps/s390/nptl/bits/struct_mutex.h -@@ -32,7 +32,7 @@ struct __pthread_mutex_s - int __kind; - #if __WORDSIZE == 64 - short __spins; -- short __unused; -+ short __glibc_reserved; - __pthread_list_t __list; - # define __PTHREAD_MUTEX_HAVE_PREV 1 - #else -diff --git a/sysdeps/x86/nptl/bits/struct_mutex.h b/sysdeps/x86/nptl/bits/struct_mutex.h -index 9c19dff660..13c9894ad4 100644 ---- a/sysdeps/x86/nptl/bits/struct_mutex.h -+++ b/sysdeps/x86/nptl/bits/struct_mutex.h -@@ -32,7 +32,7 @@ struct __pthread_mutex_s - int __kind; - #ifdef __x86_64__ - short __spins; -- short __unused; -+ short __glibc_reserved; - __pthread_list_t __list; - # define __PTHREAD_MUTEX_HAVE_PREV 1 - #else --- -2.47.3 - diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index a6e6874e1f..97862aef14 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from git) -sha256 668f890b45fd8d32bb73783ad3b75fe1f396c5c3aa3c3832e616b4c3f0c6066b glibc-2.43-27-g4070d808bea1c077eb7e7d52b52b91cae98205d5-git4.tar.gz +sha256 647325cc2e9f2c6260f3c48d0385ac5e30cb60d2ec2e5afd649555c518c9bf60 glibc-2.43-45-gdae425b554207f7c4599c7fac707ad4c08545674-git4.tar.gz # Hashes for license files sha256 edaef632cbb643e4e7a221717a6c441a4c1a7c918e6e4d56debc3d8739b233f6 COPYINGv2 diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 4a6bc94634..5aa2ef5f99 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.43-27-g4070d808bea1c077eb7e7d52b52b91cae98205d5 +GLIBC_VERSION = 2.43-45-gdae425b554207f7c4599c7fac707ad4c08545674 GLIBC_SITE = https://sourceware.org/git/glibc.git GLIBC_SITE_METHOD = git @@ -46,6 +46,15 @@ GLIBC_IGNORE_CVES += CVE-2026-5928 # Fixed by glibc-2.43-27-g4070d808bea1c077eb7e7d52b52b91cae98205d5 GLIBC_IGNORE_CVES += CVE-2026-5450 +# Fixed by glibc-2.43-42-ge64ae5a591f0604b7504df4df631857bb11cc78b +GLIBC_IGNORE_CVES += CVE-2026-5435 + +# Fixed by glibc-2.43-43-g3a418da6a3938756763980541e440dbdd46900fb +GLIBC_IGNORE_CVES += CVE-2026-6238 + +# Fixed by glibc-2.43-45-gdae425b554207f7c4599c7fac707ad4c08545674 +GLIBC_IGNORE_CVES += CVE-2026-6791 + # This CVE is considered as not being security issues by # upstream glibc: # https://security-tracker.debian.org/tracker/CVE-2010-4756 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 4890e095e3..732ed6d4ad 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.43-27-g4070d808bea1c077eb7e7d52b52b91cae98205d5 +LOCALEDEF_VERSION = 2.43-45-gdae425b554207f7c4599c7fac707ad4c08545674 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION)$(BR_FMT_VERSION_git).tar.gz LOCALEDEF_SITE = https://sourceware.org/git/glibc.git LOCALEDEF_SITE_METHOD = git