diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index 040fc793b1..0130613936 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.39/master" PV = "2.39+git" -SRCREV_glibc ?= "3463100f2d47f2897a24ba8023a5c7aaf2d26550" +SRCREV_glibc ?= "06a70769fd0b2e1f2a3085ad50ab620282bd77b3" SRCREV_localedef ?= "fab74f31b3811df543e24b6de47efdf45b538abc" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https" diff --git a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch index 9bdfa76318..411ca55d9f 100644 --- a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +++ b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch @@ -14,6 +14,7 @@ Signed-off-by: Khem Raj sysdeps/aarch64/bits/wordsize.h | 11 +++++++++-- sysdeps/arm/bits/wordsize.h | 22 +--------------------- 2 files changed, 10 insertions(+), 23 deletions(-) + mode change 100644 => 120000 sysdeps/arm/bits/wordsize.h diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h index 118e59172d..ff86359fe8 100644 diff --git a/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch b/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch index b527ddffc8..9e27a51e41 100644 --- a/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch +++ b/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch @@ -17,7 +17,7 @@ diff --git a/support/Makefile b/support/Makefile index 362a51f882..56d2b37058 100644 --- a/support/Makefile +++ b/support/Makefile -@@ -228,9 +228,9 @@ libsupport-inhibit-o += .o +@@ -229,9 +229,9 @@ libsupport-inhibit-o += .o endif CFLAGS-support_paths.c = \ diff --git a/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch b/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch index c0a467fcec..7c44acb013 100644 --- a/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch +++ b/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch @@ -22,16 +22,16 @@ diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefil tst-sigtimedwait \ tst-sync_file_range \ tst-sysconf-iov_max \ -@@ -233,6 +232,8 @@ +@@ -234,6 +233,8 @@ tests += \ tst-timerfd \ tst-ttyname-direct \ tst-ttyname-namespace \ + # Skip this test to avoid stale qemu process + # tst-scm_rights \ # tests - + # process_madvise requires CAP_SYS_ADMIN. -@@ -270,9 +271,10 @@ +@@ -271,9 +272,10 @@ tests-time64 += \ tst-ntp_gettimex-time64 \ tst-ppoll-time64 \ tst-prctl-time64 \ @@ -41,5 +41,5 @@ diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefil + # Skip this test to avoid stale qemu process + # tst-scm_rights-time64 \ # tests-time64 - + tests-clone-internal = \ diff --git a/meta/recipes-core/glibc/glibc_2.39.bb b/meta/recipes-core/glibc/glibc_2.39.bb index e4e2a766d7..c87eb76f41 100644 --- a/meta/recipes-core/glibc/glibc_2.39.bb +++ b/meta/recipes-core/glibc/glibc_2.39.bb @@ -17,7 +17,8 @@ Allows for ASLR bypass so can bypass some hardening, not an exploit in itself, m easier access for another. 'ASLR bypass itself is not a vulnerability.'" CVE_STATUS_GROUPS += "CVE_STATUS_STABLE_BACKPORTS" -CVE_STATUS_STABLE_BACKPORTS = "CVE-2024-2961 CVE-2024-33599 CVE-2024-33600 CVE-2024-33601 CVE-2024-33602 CVE-2025-0395" +CVE_STATUS_STABLE_BACKPORTS = "CVE-2024-2961 CVE-2024-33599 CVE-2024-33600 CVE-2024-33601 CVE-2024-33602 CVE-2025-0395 \ + CVE-2025-4802 CVE-2025-5702" CVE_STATUS_STABLE_BACKPORTS[status] = "cpe-stable-backport: fix available in used git hash" DEPENDS += "gperf-native bison-native"