From: uhliarik <luhliari@redhat.com>
Date: Thu, 18 Feb 2021 01:08:40 +0000 (+0000)
Subject: Fix build on Fedora Rawhide (#772)
X-Git-Tag: 4.15-20210522-snapshot~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f8b5f0e1cc27634a7310be4c9674112f919d974;p=thirdparty%2Fsquid.git

Fix build on Fedora Rawhide (#772)

* add SYSTEMD_LIBS to all binaries using client_side.cc, fixing linking
* add `<limits>` to all sources using std::numeric_limits, fixing gcc-11
  builds
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 04632e7936..ba6825adaa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2074,6 +2074,7 @@ tests_test_http_range_LDADD = \
 	$(SSLLIB) \
 	$(KRB5LIBS) \
 	$(LIBCPPUNIT_LIBS) \
+	$(SYSTEMD_LIBS) \
 	$(COMPAT_LIB) \
 	$(XTRA_LIBS)
 tests_test_http_range_LDFLAGS = $(LIBADD_DL)
@@ -2465,6 +2466,7 @@ tests_testHttpRequest_LDADD = \
 	$(SSLLIB) \
 	$(KRB5LIBS) \
 	$(LIBCPPUNIT_LIBS) \
+	$(SYSTEMD_LIBS) \
 	$(COMPAT_LIB) \
 	$(XTRA_LIBS)
 tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
@@ -2771,6 +2773,7 @@ tests_testCacheManager_LDADD = \
 	$(SSLLIB) \
 	$(KRB5LIBS) \
 	$(LIBCPPUNIT_LIBS) \
+	$(SYSTEMD_LIBS) \
 	$(COMPAT_LIB) \
 	$(XTRA_LIBS)
 tests_testCacheManager_LDFLAGS = $(LIBADD_DL)
@@ -3093,6 +3096,7 @@ tests_testEvent_LDADD = \
 	$(SSLLIB) \
 	$(KRB5LIBS) \
 	$(LIBCPPUNIT_LIBS) \
+	$(SYSTEMD_LIBS) \
 	$(COMPAT_LIB) \
 	$(XTRA_LIBS)
 tests_testEvent_LDFLAGS = $(LIBADD_DL)
diff --git a/src/ip/QosConfig.cc b/src/ip/QosConfig.cc
index 2fa1c055a2..09b3e87291 100644
--- a/src/ip/QosConfig.cc
+++ b/src/ip/QosConfig.cc
@@ -20,6 +20,7 @@
 #include "Parsing.h"
 
 #include <cerrno>
+#include <limits>
 
 CBDATA_CLASS_INIT(acl_tos);
 
diff --git a/src/ipc/mem/PageStack.cc b/src/ipc/mem/PageStack.cc
index d0ea201a20..e11d287aea 100644
--- a/src/ipc/mem/PageStack.cc
+++ b/src/ipc/mem/PageStack.cc
@@ -16,6 +16,7 @@
 
 #include <cmath>
 #include <algorithm>
+#include <limits>
 
 /*
 
diff --git a/src/proxyp/Parser.cc b/src/proxyp/Parser.cc
index c9ef588062..3a25d44128 100644
--- a/src/proxyp/Parser.cc
+++ b/src/proxyp/Parser.cc
@@ -15,6 +15,7 @@
 #include "sbuf/Stream.h"
 
 #include <algorithm>
+#include <limits>
 
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
diff --git a/src/security/ServerOptions.cc b/src/security/ServerOptions.cc
index f9da3ea4e9..b9e259efc6 100644
--- a/src/security/ServerOptions.cc
+++ b/src/security/ServerOptions.cc
@@ -24,6 +24,8 @@
 #endif
 #endif
 
+#include <limits>
+
 Security::ServerOptions &
 Security::ServerOptions::operator =(const Security::ServerOptions &old) {
     if (this != &old) {
diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc
index 07213ec4dc..ef3f8a664b 100644
--- a/src/ssl/helper.cc
+++ b/src/ssl/helper.cc
@@ -22,6 +22,8 @@
 #include "ssl/helper.h"
 #include "wordlist.h"
 
+#include <limits>
+
 Ssl::CertValidationHelper::CacheType *Ssl::CertValidationHelper::HelperCache = nullptr;
 
 #if USE_SSL_CRTD