3 files changed, 70 insertions, 8 deletions

diff --git a/meta-networking/recipes-daemons/squid/files/0001-libltdl-remove-reference-to-nonexisting-directory.patch b/meta-networking/recipes-daemons/squid/files/0001-libltdl-remove-reference-to-nonexisting-directory.patch
new file mode 100644
index 0000000000..9babcfb24d
--- /dev/null
+++ b/meta-networking/recipes-daemons/squid/files/0001-libltdl-remove-reference-to-nonexisting-directory.patch
@@ -0,0 +1,55 @@
+From a6638a007a42917fea4b03e5c30d9b7208c634c4 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Thu, 7 Nov 2024 22:04:40 +0100
+Subject: [PATCH] libltdl: remove reference to nonexisting directory
+
+Commit [1] removed directory libltdl/m4 from release tarball by merging
+all those files into libltdl/aclocal.m4, however makefiles still
+reference it causing following error in do_configure:
+
+| autoreconf: Entering directory 'libltdl'
+| autoreconf: configure.ac: not using Gettext
+| autoreconf: running: aclocal --system-acdir=WORKDIR/recipe-sysroot/usr/share/aclocal/ -I WORKDIR/squid-6.12/acinclude/ -I WORKDIR/recipe-sysroot-native/usr/share/aclocal/ --force -I m4
+| aclocal: error: couldn't open directory 'm4': No such file or directory
+| autoreconf: error: aclocal failed with exit status: 1
+
+Remove these invalid references.
+
+[1] https://github.com/squid-cache/squid/commit/b4addc2262e5bee37543f8d1ab9dd98337bafba3
+
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+Upstream-Status: Inappropriate [upstream ticket https://lists.squid-cache.org/pipermail/squid-users/2024-November/027244.html]
+---
+ libltdl/Makefile.am | 2 +-
+ libltdl/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
+index aad98e2..8a9539b 100644
+--- a/libltdl/Makefile.am
++++ b/libltdl/Makefile.am
+@@ -29,7 +29,7 @@
+ ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #####
+ 
+-ACLOCAL_AMFLAGS = -I m4
++ACLOCAL_AMFLAGS =
+ AUTOMAKE_OPTIONS = foreign
+ AM_CPPFLAGS =
+ AM_LDFLAGS =
+diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in
+index 9929557..c77df2e 100644
+--- a/libltdl/Makefile.in
++++ b/libltdl/Makefile.in
+@@ -448,7 +448,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-ACLOCAL_AMFLAGS = -I m4
++ACLOCAL_AMFLAGS =
+ AUTOMAKE_OPTIONS = foreign
+ 
+ # -I$(srcdir) is needed for user that built libltdl with a sub-Automake
+-- 
+2.30.2
+
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 <jackie.huang@windriver.com>
    ])
 --- 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.12.bb
index f0663a5e04..87144fb049 100644
--- a/meta-networking/recipes-daemons/squid/squid_6.9.bb
+++ b/meta-networking/recipes-daemons/squid/squid_6.12.bb
@@ -19,13 +19,14 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://run-ptest \
            file://volatiles.03_squid \
            file://0002-squid-make-squid-conf-tests-run-on-target-device.patch \
+           file://0001-libltdl-remove-reference-to-nonexisting-directory.patch \
            file://squid.nm \
            "
 
-SRC_URI[sha256sum] = "1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882"
+SRC_URI[sha256sum] = "f3df3abb2603a513266f24a5d4699a9f0d76b9f554d1848b67f9c51cd3b3cb50"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \
+                    file://errors/COPYRIGHT;md5=6fbb6a2adc362e206da7b4f42846cdec \
                     "
 DEPENDS = "libtool"
 
@@ -47,7 +48,6 @@ PACKAGECONFIG ??= "auth url-rewrite-helpers \
 PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking,"
-PACKAGECONFIG[esi] = "--enable-esi,--disable-esi,expat libxml2"
 PACKAGECONFIG[ssl] = "--with-openssl=yes,--with-openssl=no,openssl"
 PACKAGECONFIG[auth] = "--enable-auth-basic='${BASIC_AUTH}',--disable-auth --disable-auth-basic,krb5 openldap db cyrus-sasl"
 PACKAGECONFIG[url-rewrite-helpers] = "--enable-url-rewrite-helpers,--disable-url-rewrite-helpers,"
@@ -66,9 +66,16 @@ BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}"
 EXTRA_OECONF += "--with-default-user=squid \
                  --sysconfdir=${sysconfdir}/${BPN} \
                  --with-logdir=${localstatedir}/log/${BPN} \
-                 'PERL=${USRBINPATH}/env perl'"
+                 'PERL=${USRBINPATH}/env perl' \
+                 --disable-esi \
+"
+
+# Workaround a build failure when using a native compiler that need -std=c++17
+# with a cross-compiler that doesn't.
+# Upstream issue closed as invalid : https://bugs.squid-cache.org/show_bug.cgi?id=5376
+BUILD_CXXFLAGS += "-std=c++17"
 
-export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
+export BUILDCXXFLAGS = "${BUILD_CXXFLAGS}"
 
 TESTDIR = "test-suite"
 
@@ -117,7 +124,7 @@ do_install:append() {
     fi
 
     install -d ${D}${sysconfdir}/default/volatiles
-    install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid
+    install -m 0644 ${UNPACKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid
 
     rmdir "${D}${localstatedir}/run/${BPN}"
     rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run"
@@ -127,7 +134,7 @@ do_install:append() {
 
     # Install NetworkManager dispatcher reload hooks
     install -d ${D}${libdir}/NetworkManager/dispatcher.d
-    install -m 0755 ${WORKDIR}/squid.nm ${D}${libdir}/NetworkManager/dispatcher.d/20-squid
+    install -m 0755 ${UNPACKDIR}/squid.nm ${D}${libdir}/NetworkManager/dispatcher.d/20-squid
 }
 
 SYSTEMD_AUTO_ENABLE = "disable"