summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail-mta/exim/openssl-3.patch32
1 files changed, 26 insertions, 6 deletions
diff --git a/mail-mta/exim/openssl-3.patch b/mail-mta/exim/openssl-3.patch
index abbffe7..3ecb55e 100644
--- a/mail-mta/exim/openssl-3.patch
+++ b/mail-mta/exim/openssl-3.patch
@@ -1,11 +1,31 @@
---- exim-4.95/src/tls-openssl.c~ 2021-09-28 08:24:46.000000000 +0000
-+++ exim-4.95/src/tls-openssl.c 2021-10-06 06:17:24.439990018 +0000
-@@ -232,7 +232,7 @@
+From ff7829398d74e67f1c1f40339a772fd76708e5ac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
+Date: Sat, 27 Nov 2021 21:07:15 +0000
+Subject: [PATCH] Fix build for OpenSSL 3.0.0 . Bug 2810
+
+---
+ src/tls-openssl.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/tls-openssl.c b/src/tls-openssl.c
+index 830978e04..512f5412e 100644
+--- a/src/tls-openssl.c
++++ b/src/tls-openssl.c
+@@ -232,10 +232,14 @@ static exim_openssl_option exim_openssl_options[] = {
{ US"no_tlsv1", SSL_OP_NO_TLSv1 },
#endif
#ifdef SSL_OP_NO_TLSv1_1
-#if SSL_OP_NO_TLSv1_1 == 0x00000400L
-+#if (OPENSSL_VERSION_NUMBER < 0x30000000fL) && (SSL_OP_NO_TLSv1_1 == 0x00000400L)
++# if OPENSSL_VERSION_NUMBER < 0x30000000L
++# if SSL_OP_NO_TLSv1_1 == 0x00000400L
/* Error in chosen value in 1.0.1a; see first item in CHANGES for 1.0.1b */
- #warning OpenSSL 1.0.1a uses a bad value for SSL_OP_NO_TLSv1_1, ignoring
- #else
+-#warning OpenSSL 1.0.1a uses a bad value for SSL_OP_NO_TLSv1_1, ignoring
+-#else
++# warning OpenSSL 1.0.1a uses a bad value for SSL_OP_NO_TLSv1_1, ignoring
++# define NO_SSL_OP_NO_TLSv1_1
++# endif
++# endif
++# ifndef NO_SSL_OP_NO_TLSv1_1
+ { US"no_tlsv1_1", SSL_OP_NO_TLSv1_1 },
+ # endif
+ #endif