diff options
| -rw-r--r-- | meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch | 22 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/squid/squid_7.4.bb (renamed from meta-networking/recipes-daemons/squid/squid_7.3.bb) | 4 |
2 files changed, 2 insertions, 24 deletions
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 <Jim.Somerville@windriver.com> | |||
| 12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 12 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
| 13 | 13 | ||
| 14 | --- | 14 | --- |
| 15 | acinclude/krb5.m4 | 10 +++++++++- | ||
| 16 | acinclude/lib-checks.m4 | 8 ++++++-- | 15 | acinclude/lib-checks.m4 | 8 ++++++-- |
| 17 | 2 files changed, 15 insertions(+), 3 deletions(-) | 16 | 2 files changed, 15 insertions(+), 3 deletions(-) |
| 18 | 17 | ||
| 19 | diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4 | ||
| 20 | index e0286fa..b3e4bc7 100644 | ||
| 21 | --- a/acinclude/krb5.m4 | ||
| 22 | +++ b/acinclude/krb5.m4 | ||
| 23 | @@ -98,7 +98,15 @@ main(void) | ||
| 24 | krb5_init_context(&context); | ||
| 25 | return 0; | ||
| 26 | } | ||
| 27 | -]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ]) | ||
| 28 | +]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ], | ||
| 29 | +[ | ||
| 30 | + dnl Can't test in cross compiled env - so assume good | ||
| 31 | + squid_cv_broken_heimdal_krb5_h=no | ||
| 32 | +]) | ||
| 33 | + ], | ||
| 34 | + [ | ||
| 35 | + dnl Can't test in cross compiled env - so assume good | ||
| 36 | + squid_cv_broken_heimdal_krb5_h=no | ||
| 37 | ]) | ||
| 38 | SQUID_STATE_ROLLBACK(squid_krb5_heimdal_test) | ||
| 39 | ]) | ||
| 40 | diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 | 18 | diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 |
| 41 | index 9793b9a..4f2dc83 100644 | 19 | index 9793b9a..4f2dc83 100644 |
| 42 | --- a/acinclude/lib-checks.m4 | 20 | --- 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 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} | |||
| 22 | file://squid.nm \ | 22 | file://squid.nm \ |
| 23 | " | 23 | " |
| 24 | 24 | ||
| 25 | SRC_URI[sha256sum] = "dadc2a9a3926ce1b3babeaa7a7d7b21cbb089025876daa3f5c19e7eb6391ddcd" | 25 | SRC_URI[sha256sum] = "e31976edd755c295bd5842a349c9c7dad16a683d066337cc09033c1302b4fed4" |
| 26 | 26 | ||
| 27 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 27 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 28 | file://errors/COPYRIGHT;md5=c2a0e15750d3a9743af9109fecc05622 \ | 28 | file://errors/COPYRIGHT;md5=41d117978dbffedc893e8eeca12537d0 \ |
| 29 | " | 29 | " |
| 30 | 30 | ||
| 31 | UPSTREAM_CHECK_URI = "https://github.com/squid-cache/${BPN}/releases/" | 31 | UPSTREAM_CHECK_URI = "https://github.com/squid-cache/${BPN}/releases/" |
