Resolves: #1953505 - squid: Port to OpenSSL 3.0
This commit is contained in:
parent
6f864dc05b
commit
7788d071d1
17
squid-5.0.6-openssl3.patch
Normal file
17
squid-5.0.6-openssl3.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff --git a/src/ssl/support.cc b/src/ssl/support.cc
|
||||
index 3ad135d..73912ce 100644
|
||||
--- a/src/ssl/support.cc
|
||||
+++ b/src/ssl/support.cc
|
||||
@@ -557,7 +557,11 @@ Ssl::VerifyCallbackParameters::At(Security::Connection &sconn)
|
||||
}
|
||||
|
||||
// "dup" function for SSL_get_ex_new_index("cert_err_check")
|
||||
-#if SQUID_USE_CONST_CRYPTO_EX_DATA_DUP
|
||||
+#if OPENSSL_VERSION_MAJOR >= 3
|
||||
+static int
|
||||
+ssl_dupAclChecklist(CRYPTO_EX_DATA *, const CRYPTO_EX_DATA *, void **,
|
||||
+ int, long, void *)
|
||||
+#elif SQUID_USE_CONST_CRYPTO_EX_DATA_DUP
|
||||
static int
|
||||
ssl_dupAclChecklist(CRYPTO_EX_DATA *, const CRYPTO_EX_DATA *, void *,
|
||||
int, long, void *)
|
@ -2,7 +2,7 @@
|
||||
|
||||
Name: squid
|
||||
Version: 5.0.6
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: The Squid proxy caching server
|
||||
Epoch: 7
|
||||
# See CREDITS for breakdown of non GPLv2+ code
|
||||
@ -35,6 +35,8 @@ Patch204: squid-3.5.9-include-guards.patch
|
||||
# revert this upstream patch - https://bugzilla.redhat.com/show_bug.cgi?id=1936422
|
||||
# workaround for #1934919
|
||||
Patch205: squid-5.0.5-symlink-lang-err.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1953505
|
||||
Patch206: squid-5.0.6-openssl3.patch
|
||||
|
||||
# cache_swap.sh
|
||||
Requires: bash gawk
|
||||
@ -105,6 +107,7 @@ lookup program (dnsserver), a program for retrieving FTP data
|
||||
%patch203 -p1 -b .perlpath
|
||||
%patch204 -p0 -b .include-guards
|
||||
%patch205 -p1 -R -b .symlink-lang-err
|
||||
%patch206 -p1 -b .openssl3
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1679526
|
||||
# Patch in the vendor documentation and used different location for documentation
|
||||
@ -339,6 +342,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon May 17 2021 Lubos Uhliarik <luhliari@redhat.com> - 7:5.0.6-2
|
||||
- Resolves: #1953505 - squid: Port to OpenSSL 3.0
|
||||
|
||||
* 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
|
||||
|
Loading…
Reference in New Issue
Block a user