squid: Update to 6.2

For details see:
https://github.com/squid-cache/squid/commits/v6

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/squid b/lfs/squid
index 26b8249ccd65fc024c44f91cfc7446f1e2c767ee..50ebc4e3a54119b2cb2ddcc2eab82c09e405e1ee 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.1
+VER        = 6.2
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 840ea8b09f8518f6e3b92a22cc6e6d3befc08b9e9650e13a54b607b398a967f1bc2b30e5b52cae5423a49ee02d0cfc13d3488c2b9ece3b3c0d4df689de390adf
+$(DL_FILE)_BLAKE2 = e934371e40093b1570c88c76f9427089087d2fa0b16629e7ca3afabd17f7bc5592b2b65354da54ebc43350ab6732081dd39a39e5db712f70a48246c22b8ae45d
 
 install : $(TARGET)
 

diff --git a/src/patches/squid/01_squid-gcc11.patch b/src/patches/squid/01_squid-gcc11.patch
index c87ade51aa02af74261b0f19bb495fba6be6284b..019da6ff4217d31be5fd975e21816f8d7e68ae16 100644 (file)
--- a/src/patches/squid/01_squid-gcc11.patch
+++ b/src/patches/squid/01_squid-gcc11.patch
@@ -2,8 +2,8 @@ diff --git a/src/acl/ConnMark.cc b/src/acl/ConnMark.cc
 index 1fdae0c..213cf39 100644
 --- a/src/acl/ConnMark.cc
 +++ b/src/acl/ConnMark.cc
-@@ -15,6 +15,7 @@
- #include "Debug.h"
+@@ -16,6 +16,7 @@
+ #include "debug/Stream.h"
  #include "http/Stream.h"
  #include "sbuf/Stream.h"
 +#include <limits>