diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 61af3d9488..0deba84dc7 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 ed2cd1f058f22f682e700c5be408975db62025a14863a5a6700ee93d5927504e glibc-2.41-5-gcb7f20653724029be89224ed3a35d627cc5b4163.tar.gz +sha256 166b6e7637bb45cb9352e4813005f83dd48f03ef634d3e9e94a30aa5a0300fab glibc-2.41-70-g1502c248d58cb99a203731707987a4342926e830.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 29617b9756..239e39a2ba 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.41-5-gcb7f20653724029be89224ed3a35d627cc5b4163 +GLIBC_VERSION = 2.41-70-g1502c248d58cb99a203731707987a4342926e830 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, @@ -25,6 +25,15 @@ GLIBC_CPE_ID_VENDOR = gnu # allow proper matching with the CPE database. GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) +# Fixed by glibc-2.41-57-g84bdbf8a6f2fdafd3661489dbb7f79835a52da82 +GLIBC_IGNORE_CVES += CVE-2025-5745 + +# Fixed by glibc-2.41-60-g0c76c951620f9e12df2a89b2c684878b55bb6795 +GLIBC_IGNORE_CVES += CVE-2025-5702 + +# Fixed by glibc-2.41-64-g1e16d0096d80a6e12d5bfa8e0aafdd13c47efd65 +GLIBC_IGNORE_CVES += CVE-2025-8058 + # All these CVEs are 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 7a6c94bd2f..c76a8d82a0 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.41-5-gcb7f20653724029be89224ed3a35d627cc5b4163 +LOCALEDEF_VERSION = 2.41-70-g1502c248d58cb99a203731707987a4342926e830 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc