Merge branch 'main' into f34

new version 5.1
new version 5.0.6
2021-10-05 14:32:56 +02:00 · 2021-08-05 21:44:57 +02:00 · 2021-05-17 16:40:56 +02:00 · 2021-04-23 15:24:45 +02:00 · 2021-03-31 20:41:52 +02:00 · 2021-03-31 20:31:04 +02:00
1 changed files with 0 additions and 116 deletions
--- 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
Author	SHA1	Message	Date
Luboš Uhliarik	2c3fd4335e	Merge branch 'main' into f34	2021-10-05 14:32:56 +02:00
Luboš Uhliarik	598a247d29	new version 5.1	2021-08-05 21:44:57 +02:00
Lubos Uhliarik	0914664092	new version 5.0.6	2021-05-17 16:40:56 +02:00
Lubos Uhliarik	d3c8c11930	Merge branch 'rawhide' into f34	2021-04-23 15:24:45 +02:00
Lubos Uhliarik	815e336e38	- fix perlpath patch	2021-03-31 20:41:52 +02:00
Lubos Uhliarik	72c3581ea5	new version 4.14 Resolves: #1939927 - CVE-2020-25097 squid: improper input validation may allow a trusted client to perform HTTP Request Smuggling	2021-03-31 20:31:04 +02:00