diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
commit | bb6a14e2f317abf60677c6ad8de9c33d5760bf36 (patch) | |
tree | 00457d3677e86437cec25fd7dab6c4513a53b1a4 /meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch | |
parent | defdca82c107f46e980c84bffb1b2c1263522fa0 (diff) | |
parent | cf6fd27dbd8e2d1b507f8c3752b85801b2c6ef57 (diff) | |
download | openbmc-bb6a14e2f317abf60677c6ad8de9c33d5760bf36.tar.xz |
Merge tag '0.63' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch index 28a410c26..ff51f5344 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-Fix-build-on-Fedora-Rawhide-772.patch @@ -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 - { |