@@ -1,4 +1,4 @@
-From a6638a007a42917fea4b03e5c30d9b7208c634c4 Mon Sep 17 00:00:00 2001
+From 9c3718bce43146f219dec3c3cd47e57a6b418a19 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
@@ -50,6 +50,3 @@ index 9929557..c77df2e 100644
AUTOMAKE_OPTIONS = foreign
# -I$(srcdir) is needed for user that built libltdl with a sub-Automake
-2.30.2
-
@@ -1,4 +1,4 @@
-From cd8bf8a4bf881f84c23a5fc1f48bb716efa51512 Mon Sep 17 00:00:00 2001
+From 9f6eb086ee1d525cf404189893fccfb8a03235bb Mon Sep 17 00:00:00 2001
From: Patrick Wicki <patrick.wicki@siemens.com>
Date: Wed, 22 Nov 2023 15:35:44 +0100
Subject: [PATCH] squid: make squid-conf-tests run on target device
@@ -20,7 +20,7 @@ Signed-off-by: Peter Marko <peter.marko@siemens.com>
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/TestHeaders.am b/src/TestHeaders.am
-index 0ed5f56..d668876 100644
+index 4562d28..bc57e4c 100644
--- a/src/TestHeaders.am
+++ b/src/TestHeaders.am
@@ -14,8 +14,8 @@ EXCLUDE_FROM_HDR_TESTING =
@@ -42,7 +42,7 @@ index 0ed5f56..d668876 100644
+#TESTS += testHeaders
CLEANFILES += testHeaders
diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
-index 0da5844..0bc381a 100644
+index 1a7d91d..f51bf92 100644
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/src/Common.am
@@ -105,7 +105,7 @@ index 0da5844..0bc381a 100644
+ /var/log/squid-stderr.log.next \
+ /var/log/squid-stderr.log.unmatched
diff --git a/test-suite/test-squid-conf.sh b/test-suite/test-squid-conf.sh
-index 413a927..f678c5a 100755
+index 7d88ea5..bb5d76f 100755
--- a/test-suite/test-squid-conf.sh
+++ b/test-suite/test-squid-conf.sh
@@ -76,7 +76,7 @@ expectMessages()
@@ -124,5 +124,5 @@ index 413a927..f678c5a 100755
-errorLog="squid-stderr.log"
+errorLog="/var/log/squid-stderr.log"
- $sbindir/squid -k parse -f $configFile 2> $errorLog
- result=$?
+ # Start `$sbindir/squid` from $configFile's directory, so that Squid can find files included by $configFile.
+ # If we decide to support relative `$sbindir` paths, we will add a portable realpath replacement.
@@ -1,4 +1,4 @@
-From c0be3192f608037682464bcb728e97f9d9b543aa Mon Sep 17 00:00:00 2001
+From 19c82bff799611303f2985a2d317662b0529b24d Mon Sep 17 00:00:00 2001
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Wed, 16 Oct 2013 16:41:03 -0400
Subject: [PATCH] Set up for cross compilation
@@ -8,16 +8,14 @@ Message-Id: <17e5a28667f667859c48bee25e575a072d39ee1b.1381956170.git.Jim.Somervi
Set the host compiler to BUILD_CXX so
proper cross compilation can occur.
+Upstream-Status: Pending
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
-
---
-Upstream-Status: Pending
-
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
-index c7312d8..3b0e9e2 100644
+index cd7fbfd..850fdaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,7 @@ m4_include([acinclude/lib-checks.m4])
@@ -1,4 +1,4 @@
-From 050f8ab275a7a5f3d94045da6b15a2b63dfbeb3f Mon Sep 17 00:00:00 2001
+From 822fd6630617040a713df5eb876d68051a716a0f Mon Sep 17 00:00:00 2001
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 14 Oct 2014 02:56:08 -0400
Subject: [PATCH] Skip AC_RUN_IFELSE tests
@@ -10,13 +10,12 @@ environment. Choose sane defaults.
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
-
---
- acinclude/lib-checks.m4 | 8 ++++++--
- 2 files changed, 15 insertions(+), 3 deletions(-)
+ acinclude/lib-checks.m4 | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4
-index 9793b9a..4f2dc83 100644
+index 573ca17..f9c4666 100644
--- a/acinclude/lib-checks.m4
+++ b/acinclude/lib-checks.m4
@@ -207,7 +207,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[
@@ -1,4 +1,4 @@
-From 3d881c112bba765731d581194aae95651819b715 Mon Sep 17 00:00:00 2001
+From 5ce613e9f0c4725aaa82d9a62f76c809e375fe49 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Tue, 19 Jul 2016 01:56:23 -0400
Subject: [PATCH] squid: use serial-tests config needed by ptest
@@ -9,13 +9,12 @@ serial-tests is required to generate those targets.
Upstream-Status: Inappropriate [default automake behavior incompatible with ptest]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
-
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 3b0e9e2..c730212 100644
+index 850fdaf..10968b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.61)
similarity index 98%
rename from meta-networking/recipes-daemons/squid/squid_7.6.bb
rename to meta-networking/recipes-daemons/squid/squid_7.7.bb
@@ -22,7 +22,7 @@ SRC_URI = "https://github.com/squid-cache/${BPN}/releases/download/SQUID_${PV_U}
file://squid.nm \
"
-SRC_URI[sha256sum] = "852178fdc37c5b0786a934fc990c7d2fffc82acf19b2284be209b96431d25992"
+SRC_URI[sha256sum] = "e3bd613b91b1c498ec2992276063342a85cd6edddd5521294e04f44bc055da9b"
LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce \
file://errors/COPYRIGHT;md5=41d117978dbffedc893e8eeca12537d0 \