squid: Fix build with GCC 11

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/squid b/lfs/squid
index 38675f3f3e354fba4010006e72e1d4ce5f861f23..f9fc1e3a1ef5d4f68bb65d038f8faab0bb4daf71 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -81,6 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
 
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid-gcc11.patch
        cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP)/libltdl && autoreconf -vfi
 

diff --git a/src/patches/squid-gcc11.patch b/src/patches/squid-gcc11.patch
new file mode 100644 (file)
index 0000000..c87ade5
--- /dev/null
+++ b/src/patches/squid-gcc11.patch
@@ -0,0 +1,24 @@
+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"
+ #include "http/Stream.h"
+ #include "sbuf/Stream.h"
++#include <limits>
+ 
+ bool
+ Acl::ConnMark::empty() const
+diff --git a/src/security/ServerOptions.cc b/src/security/ServerOptions.cc
+index 5cd81ab..3f73892 100644
+--- a/src/security/ServerOptions.cc
++++ b/src/security/ServerOptions.cc
+@@ -6,6 +6,7 @@
+  * Please see the COPYING and CONTRIBUTORS files for details.
+  */
+ 
++#include <limits>
+ #include "squid.h"
+ #include "anyp/PortCfg.h"
+ #include "base/Packable.h"