From: Peter Marko <[email protected]> License-Update: copyright year updated
Add patch to fix new build failure from release tarball. Signed-off-by: Peter Marko <[email protected]> Signed-off-by: Khem Raj <[email protected]> (cherry picked from commit 928ef34eadcab1272a2bc3a694873eede05a746d) Signed-off-by: Ankur Tyagi <[email protected]> --- ...e-reference-to-nonexisting-directory.patch | 55 +++++++++++++++++++ .../squid/{squid_6.10.bb => squid_6.12.bb} | 5 +- 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-daemons/squid/files/0001-libltdl-remove-reference-to-nonexisting-directory.patch rename meta-networking/recipes-daemons/squid/{squid_6.10.bb => squid_6.12.bb} (95%) 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 <[email protected]> +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 <[email protected]> +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/squid_6.10.bb b/meta-networking/recipes-daemons/squid/squid_6.12.bb similarity index 95% rename from meta-networking/recipes-daemons/squid/squid_6.10.bb rename to meta-networking/recipes-daemons/squid/squid_6.12.bb index 332390d365..4c00d12900 100644 --- a/meta-networking/recipes-daemons/squid/squid_6.10.bb +++ b/meta-networking/recipes-daemons/squid/squid_6.12.bb @@ -19,14 +19,15 @@ 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 \ file://CVE-2025-59362.patch \ " -SRC_URI[sha256sum] = "0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7" +SRC_URI[sha256sum] = "f3df3abb2603a513266f24a5d4699a9f0d76b9f554d1848b67f9c51cd3b3cb50" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \ + file://errors/COPYRIGHT;md5=6fbb6a2adc362e206da7b4f42846cdec \ " DEPENDS = "libtool"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#121509): https://lists.openembedded.org/g/openembedded-devel/message/121509 Mute This Topic: https://lists.openembedded.org/mt/116235794/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
