summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan.goodliffe@octal.co.uk>2023-01-03 10:42:20 +0000
committerDan Goodliffe <dan.goodliffe@octal.co.uk>2023-01-03 10:42:20 +0000
commit0a87cd00a1a3024bf1acbd9adb7ee1f737c20a48 (patch)
tree1e8fea1afd46b11b587e38767b576674db1a505e
parentDifferent temporary patch to fix Exim compile with openssl-3 (diff)
downloadpatches-0a87cd00a1a3024bf1acbd9adb7ee1f737c20a48.tar.bz2
patches-0a87cd00a1a3024bf1acbd9adb7ee1f737c20a48.tar.xz
patches-0a87cd00a1a3024bf1acbd9adb7ee1f737c20a48.zip
OpenSSL 3 patch is now upstream
-rw-r--r--mail-mta/exim/openssl-3.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/mail-mta/exim/openssl-3.patch b/mail-mta/exim/openssl-3.patch
deleted file mode 100644
index 3ecb55e..0000000
--- a/mail-mta/exim/openssl-3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 < 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
-+# 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