@@ -12,31 +12,9 @@ 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
similarity index 97%
rename from meta-networking/recipes-daemons/squid/squid_7.3.bb
rename to meta-networking/recipes-daemons/squid/squid_7.4.bb
@@ -22,10 +22,10 @@ SRC_URI = "https://github.com/squid-cache/${BPN}/releases/download/SQUID_${PV_U}
file://squid.nm \
"
-SRC_URI[sha256sum] = "dadc2a9a3926ce1b3babeaa7a7d7b21cbb089025876daa3f5c19e7eb6391ddcd"
+SRC_URI[sha256sum] = "e31976edd755c295bd5842a349c9c7dad16a683d066337cc09033c1302b4fed4"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://errors/COPYRIGHT;md5=c2a0e15750d3a9743af9109fecc05622 \
+ file://errors/COPYRIGHT;md5=41d117978dbffedc893e8eeca12537d0 \
"
UPSTREAM_CHECK_URI = "https://github.com/squid-cache/${BPN}/releases/"
License-Update: update GPLv2 COPYING document Some terminology and FSF address changes since the GPLv2 https://github.com/squid-cache/squid/commit/4c5fbc7e8db25352722de4ebe7fe1cab904b62b6 Remove lines from patch, which modify not exist code. Changelog: https://github.com/squid-cache/squid/releases/tag/SQUID_7_4 Changes: - Do not create world-readable directories - digest_edirectory_auth: Fix LDAPS memory leaks - snmplib: Improve handling of zero-length ASN OCTET STRINGs - Debug tls_read_method()/tls_write_method() errors - ICMP: Harden echo paths, fix overflows, UB, and leaks - Set SSL_OP_LEGACY_SERVER_CONNECT when peeking at servers - security_file_certgen: Fix OPENSSL_malloc()/free(3) mismatch - Detect FreeBSD ports Heimdal package - Remove SQUID_CHECK_KRB5_HEIMDAL_BROKEN_KRB5_H macro - Remove SQUID_CHECK_KRB5_SOLARIS_BROKEN_KRB5_H macro - ext_kerberos_ldap_group_acl: Do not prohibit all LDFLAGS - negotiate_sspi_auth: Respond with ERR when FormatMessage() fails - ... and some code cleanups - ... and some CI improvements Signed-off-by: Andrej Kozemcak <andrej.kozemcak@siemens.com> --- .../files/Skip-AC_RUN_IFELSE-tests.patch | 22 ------------------- .../squid/{squid_7.3.bb => squid_7.4.bb} | 4 ++-- 2 files changed, 2 insertions(+), 24 deletions(-) rename meta-networking/recipes-daemons/squid/{squid_7.3.bb => squid_7.4.bb} (97%)