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 3aa08f84da..39392e1cc7 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 @@ -12,31 +12,9 @@ Signed-off-by: Jim Somerville Signed-off-by: Jackie Huang --- - 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 diff --git a/meta-networking/recipes-daemons/squid/squid_7.3.bb b/meta-networking/recipes-daemons/squid/squid_7.4.bb 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 index 8d1d84c04e..6333d1e0f2 100644 --- a/meta-networking/recipes-daemons/squid/squid_7.3.bb +++ b/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/"