From 42e51b1e590ee273575a3dc45e7b04ba30060968 Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Tue, 11 Nov 2025 22:37:20 +1300 Subject: [PATCH] squid: Upgrade to 6.10 Solves CVE-2024-37894 Signed-off-by: Peter Marko Signed-off-by: Khem Raj (cherry picked from commit c393973c8516d56d547297902ef27c02d16a54b1) Signed-off-by: Ankur Tyagi Signed-off-by: Anuj Mittal --- .../recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch | 2 +- .../recipes-daemons/squid/{squid_6.9.bb => squid_6.10.bb} | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) rename meta-networking/recipes-daemons/squid/{squid_6.9.bb => squid_6.10.bb} (97%) diff --git a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch index e0d002c68c..489850e3bd 100644 --- a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch +++ b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch @@ -37,7 +37,7 @@ Signed-off-by: Jackie Huang ]) --- a/acinclude/lib-checks.m4 +++ b/acinclude/lib-checks.m4 -@@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_ +@@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[ [ AC_MSG_RESULT([no]) ], diff --git a/meta-networking/recipes-daemons/squid/squid_6.9.bb b/meta-networking/recipes-daemons/squid/squid_6.10.bb similarity index 97% rename from meta-networking/recipes-daemons/squid/squid_6.9.bb rename to meta-networking/recipes-daemons/squid/squid_6.10.bb index 490a5401c3..332390d365 100644 --- a/meta-networking/recipes-daemons/squid/squid_6.9.bb +++ b/meta-networking/recipes-daemons/squid/squid_6.10.bb @@ -20,11 +20,10 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://volatiles.03_squid \ file://0002-squid-make-squid-conf-tests-run-on-target-device.patch \ file://squid.nm \ - file://CVE-2024-37894.patch \ file://CVE-2025-59362.patch \ " -SRC_URI[sha256sum] = "1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882" +SRC_URI[sha256sum] = "0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \