diff --git a/squid-gcc11.patch b/squid-gcc11.patch new file mode 100644 index 0000000..c87ade5 --- /dev/null +++ b/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 + + 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 + #include "squid.h" + #include "anyp/PortCfg.h" + #include "base/Packable.h" diff --git a/squid.spec b/squid.spec index ad8cf9a..af5875f 100644 --- a/squid.spec +++ b/squid.spec @@ -2,7 +2,7 @@ Name: squid Version: 4.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Squid proxy caching server Epoch: 7 # See CREDITS for breakdown of non GPLv2+ code @@ -33,6 +33,7 @@ Patch202: squid-3.1.0.9-location.patch Patch203: squid-3.0.STABLE1-perlpath.patch Patch204: squid-3.5.9-include-guards.patch Patch205: squid-4.0.21-large-acl.patch +Patch206: squid-gcc11.patch # cache_swap.sh Requires: bash gawk @@ -102,6 +103,7 @@ lookup program (dnsserver), a program for retrieving FTP data %patch203 -p1 -b .perlpath %patch204 -p0 -b .include-guards %patch205 -p1 -b .large_acl +%patch206 -p1 -b .gcc11 # https://bugzilla.redhat.com/show_bug.cgi?id=1679526 # Patch in the vendor documentation and used different location for documentation @@ -297,6 +299,9 @@ fi %changelog +* Sat Oct 17 2020 Jeff Law - 7:4.13-2 +- Fix missing #includes for gcc-11 + * Tue Aug 25 2020 Lubos Uhliarik - 7:4.13-1 - new version 4.13