new version 5.0.6

Resolves: #1961253 - Rebase squid to 5.0.6
2021-05-17 17:06:14 +00:00 · 2021-05-17 17:06:14 +00:00 · 6f864dc05b
parent 41bd311305
commit 6f864dc05b
3 changed files with 10 additions and 124 deletions
--- a/4
+++ b/4
@ -1,3 +1,3 @@
-SHA512 (squid-5.0.5.tar.xz) = e0f816296d9d32fc97b98249dde077b321651dac70c212fe8eb9566003ce04f13a83665e387531e06bffbab1ec21277e3e0549a16caee426b6a749e18bf77991
-SHA512 (squid-5.0.5.tar.xz.asc) = ca1b170bef9cca5afe1108e8a439282f3a19bea48d2dba42847acd1cf039d38ccc8c714e27fc9e49fe9e3027963f64e9ab19e6a358e6e038c78f85cc77657a3b
+SHA512 (squid-5.0.6.tar.xz) = 97300844145ea5488a88a531fc0fbbf3c96051169eb20f8b95ba9a4c37f73edfbbedb69ee446e81f45b663e5c7c9a82e2978239c2613da7e5da2365fdaeceb6e
+SHA512 (squid-5.0.6.tar.xz.asc) = 5caafb63926356813a0409f3c6a303c70e938f71cdd4cbc8bbbbbbb4a858b1aa91d59edcca4b63e1452ca95c18da46963c43b9e8f63f2e459342e447a02f2107
 SHA512 (pgp.asc) = 09f7012030d68831dfc083d67ca63ee54ed851482ca8d0e9505b444ee3e7ddeed62369b53f2917c9b2e0e57cc0533fce46e8cafd2ebcd1c6cb186b516efd0ad2
--- a/squid-5.0.5-build-errors.patch
+++ b/squid-5.0.5-build-errors.patch
@ -1,116 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 81403a7..5e2a493 100644
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2477,6 +2477,7 @@ tests_testHttpRequest_LDADD = \
- 	$(SSLLIB) \
- 	$(KRB5LIBS) \
- 	$(LIBCPPUNIT_LIBS) \
-+	$(SYSTEMD_LIBS) \
- 	$(COMPAT_LIB) \
- 	$(XTRA_LIBS)
- tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
-@@ -2781,6 +2782,7 @@ tests_testCacheManager_LDADD = \
- 	$(SSLLIB) \
- 	$(KRB5LIBS) \
- 	$(LIBCPPUNIT_LIBS) \
-+	$(SYSTEMD_LIBS) \
- 	$(COMPAT_LIB) \
- 	$(XTRA_LIBS)
- tests_testCacheManager_LDFLAGS = $(LIBADD_DL)
-@@ -3101,6 +3103,7 @@ tests_testEvent_LDADD = \
- 	$(SSLLIB) \
- 	$(KRB5LIBS) \
- 	$(LIBCPPUNIT_LIBS) \
-+	$(SYSTEMD_LIBS) \
- 	$(COMPAT_LIB) \
- 	$(XTRA_LIBS)
- tests_testEvent_LDFLAGS = $(LIBADD_DL)
-@@ -3339,6 +3342,7 @@ tests_testEventLoop_LDADD = \
- 	$(SSLLIB) \
- 	$(KRB5LIBS) \
- 	$(LIBCPPUNIT_LIBS) \
-+	$(SYSTEMD_LIBS) \
- 	$(COMPAT_LIB) \
- 	$(XTRA_LIBS)
- tests_testEventLoop_LDFLAGS = $(LIBADD_DL)
-diff --git a/src/Makefile.in b/src/Makefile.in
-index fda6de6..4e047cc 100644
--- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -4581,6 +4581,7 @@ tests_test_http_range_LDADD = \
- 	$(SSLLIB) \
- 	$(KRB5LIBS) \
- 	$(LIBCPPUNIT_LIBS) \
-+	$(SYSTEMD_LIBS) \
- 	$(COMPAT_LIB) \
- 	$(XTRA_LIBS)
- 
-@@ -4972,6 +4973,7 @@ tests_testHttpRequest_LDADD = \
- 	$(SSLLIB) \
- 	$(KRB5LIBS) \
- 	$(LIBCPPUNIT_LIBS) \
-+	$(SYSTEMD_LIBS) \
- 	$(COMPAT_LIB) \
- 	$(XTRA_LIBS)
- 
-@@ -5274,6 +5276,7 @@ tests_testCacheManager_LDADD = \
- 	$(SSLLIB) \
- 	$(KRB5LIBS) \
- 	$(LIBCPPUNIT_LIBS) \
-+	$(SYSTEMD_LIBS) \
- 	$(COMPAT_LIB) \
- 	$(XTRA_LIBS)
- 
-@@ -5593,6 +5596,7 @@ tests_testEvent_LDADD = \
- 	$(SSLLIB) \
- 	$(KRB5LIBS) \
- 	$(LIBCPPUNIT_LIBS) \
-+	$(SYSTEMD_LIBS) \
- 	$(COMPAT_LIB) \
- 	$(XTRA_LIBS)
- 
-@@ -5832,6 +5836,7 @@ tests_testEventLoop_LDADD = \
- 	$(SSLLIB) \
- 	$(KRB5LIBS) \
- 	$(LIBCPPUNIT_LIBS) \
-+	$(SYSTEMD_LIBS) \
- 	$(COMPAT_LIB) \
- 	$(XTRA_LIBS)
- 
-diff --git a/src/proxyp/Parser.cc b/src/proxyp/Parser.cc
-index 328d207..2f358a7 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 e114ed8..22bce84 100644
--- a/src/security/ServerOptions.cc
-+++ b/src/security/ServerOptions.cc
-@@ -18,6 +18,7 @@
- #if USE_OPENSSL
- #include "compat/openssl.h"
- #include "ssl/support.h"
-+#include <limits>
- 
- #if HAVE_OPENSSL_ERR_H
- #include <openssl/err.h>
-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
--- a/squid.spec
+++ b/squid.spec
@ -1,8 +1,8 @@
 %define __perl_requires %{SOURCE98}

 Name:     squid
-Version:  5.0.5
-Release:  2%{?dist}
+Version:  5.0.6
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@ -32,10 +32,9 @@ Patch201: squid-4.0.11-config.patch
 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-5.0.5-build-errors.patch
 # revert this upstream patch - https://bugzilla.redhat.com/show_bug.cgi?id=1936422
 # workaround for #1934919
-Patch206: squid-5.0.5-symlink-lang-err.patch
+Patch205: squid-5.0.5-symlink-lang-err.patch

 # cache_swap.sh
 Requires: bash gawk
@ -105,8 +104,7 @@ lookup program (dnsserver), a program for retrieving FTP data
 %patch202 -p1 -b .location
 %patch203 -p1 -b .perlpath
 %patch204 -p0 -b .include-guards
-%patch205 -p1 -b .build-errors
-%patch206 -p1 -R -b .symlink-lang-err
+%patch205 -p1 -R -b .symlink-lang-err

 # https://bugzilla.redhat.com/show_bug.cgi?id=1679526
 # Patch in the vendor documentation and used different location for documentation
@ -341,6 +339,10 @@ fi


 %changelog
+* Mon May 17 2021 Lubos Uhliarik <luhliari@redhat.com> - 7:5.0.6-1
+- new version 5.0.6
+- Resolves: #1961253 - Rebase squid to 5.0.6
+
 * Fri Apr 23 2021 Lubos Uhliarik <luhliari@redhat.com> - 7:5.0.5-2
 - new version 5.0.5
 - Resolves: #1952896 - Rebase squid to >= 5.0.5