mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 17:41:21 +00:00
c1c5a5ade4
Handles CVE-2025-62168. Remove CVE patch included in this release. Refresh remaining patches. Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
From 050f8ab275a7a5f3d94045da6b15a2b63dfbeb3f Mon Sep 17 00:00:00 2001
|
|
From: Jim Somerville <Jim.Somerville@windriver.com>
|
|
Date: Tue, 14 Oct 2014 02:56:08 -0400
|
|
Subject: [PATCH] Skip AC_RUN_IFELSE tests
|
|
|
|
Upstream-Status: Inappropriate [cross compiling specific]
|
|
|
|
Such tests are not supported in a cross compile
|
|
environment. Choose sane defaults.
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|
|
|
---
|
|
acinclude/krb5.m4 | 10 +++++++++-
|
|
acinclude/lib-checks.m4 | 8 ++++++--
|
|
2 files changed, 15 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4
|
|
index e0286fa..b3e4bc7 100644
|
|
--- a/acinclude/krb5.m4
|
|
+++ b/acinclude/krb5.m4
|
|
@@ -98,7 +98,15 @@ main(void)
|
|
krb5_init_context(&context);
|
|
return 0;
|
|
}
|
|
-]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ])
|
|
+]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ],
|
|
+[
|
|
+ dnl Can't test in cross compiled env - so assume good
|
|
+ squid_cv_broken_heimdal_krb5_h=no
|
|
+])
|
|
+ ],
|
|
+ [
|
|
+ dnl Can't test in cross compiled env - so assume good
|
|
+ squid_cv_broken_heimdal_krb5_h=no
|
|
])
|
|
SQUID_STATE_ROLLBACK(squid_krb5_heimdal_test)
|
|
])
|
|
diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4
|
|
index 9793b9a..4f2dc83 100644
|
|
--- a/acinclude/lib-checks.m4
|
|
+++ b/acinclude/lib-checks.m4
|
|
@@ -207,7 +207,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[
|
|
[
|
|
AC_MSG_RESULT([no])
|
|
],
|
|
- [])
|
|
+ [
|
|
+ AC_MSG_RESULT([skipped - can't test in cross-compiled env])
|
|
+ ])
|
|
|
|
SQUID_STATE_ROLLBACK(check_const_SSL_METHOD)
|
|
])
|
|
@@ -349,7 +351,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_TXTDB],[
|
|
],[
|
|
AC_MSG_RESULT([yes])
|
|
AC_DEFINE(SQUID_USE_SSLLHASH_HACK, 1)
|
|
- ],[])
|
|
+ ],[
|
|
+ AC_MSG_RESULT([skipped - can't test in cross-compiled env])
|
|
+ ])
|
|
|
|
SQUID_STATE_ROLLBACK(check_TXTDB)
|
|
])
|