squid: upgrade 4.14 -> 4.15

Changes are found at: http://www.squid-cache.org/Versions/v4/changesets

Signed-off-by: Andrej Kozemcak <andrej.kozemcak@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andrej Kozemcak 2021-05-21 09:50:14 +02:00 committed by Khem Raj
parent a6d1ddf7a9
commit 77e6147545
2 changed files with 2 additions and 25 deletions

View File

@ -11,10 +11,8 @@ Upstream-Status: Backport [https://github.com/kraj/squid/commit/1f8b5f0e1cc27634
src/Makefile.am | 4 ++++
src/ip/QosConfig.cc | 1 +
src/ipc/mem/PageStack.cc | 1 +
src/proxyp/Parser.cc | 1 +
src/security/ServerOptions.cc | 2 ++
src/ssl/helper.cc | 2 ++
6 files changed, 11 insertions(+)
4 files changed, 8 insertions(+)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -70,17 +68,6 @@ Upstream-Status: Backport [https://github.com/kraj/squid/commit/1f8b5f0e1cc27634
/// used to mark a stack slot available for storing free page offsets
const Ipc::Mem::PageStack::Value Writable = 0;
--- 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) {
--- a/src/ssl/helper.cc
+++ b/src/ssl/helper.cc
@@ -19,6 +19,8 @@
@ -92,14 +79,4 @@ Upstream-Status: Backport [https://github.com/kraj/squid/commit/1f8b5f0e1cc27634
Ssl::CertValidationHelper::LruCache *Ssl::CertValidationHelper::HelperCache = nullptr;
#if USE_SSL_CRTD
--- a/src/acl/ConnMark.cc
+++ b/src/acl/ConnMark.cc
@@ -16,6 +16,8 @@
#include "http/Stream.h"
#include "sbuf/Stream.h"
+#include <limits>
+
bool
Acl::ConnMark::empty() const
{

View File

@ -29,7 +29,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2
SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch"
SRC_URI[sha256sum] = "4ad08884f065f8e1dac166aa13db6a872cde419a1717dff4c82c2c5337ee5756"
SRC_URI[sha256sum] = "71635811e766ce8b155225a9e3c7757cfc7ff93df26b28d82e5e6fc021b9a605"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://errors/COPYRIGHT;md5=0e03cd976052c45697ad5d96e7dff8dc \