commit: e44efacab8c0d769cd1b6145e14bba16b109c094 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue Dec 27 20:31:29 2022 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue Dec 27 20:33:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44efaca
mail-mta/exim-4.94.2-r11: backport OpenSSL3 patch from 4.96 Closes: https://bugs.gentoo.org/888619 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> mail-mta/exim/exim-4.94.2-r11.ebuild | 1 + mail-mta/exim/files/exim-4.94.2-openssl3.patch | 34 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/mail-mta/exim/exim-4.94.2-r11.ebuild b/mail-mta/exim/exim-4.94.2-r11.ebuild index c62c296b2534..352ae0cdcd7e 100644 --- a/mail-mta/exim/exim-4.94.2-r11.ebuild +++ b/mail-mta/exim/exim-4.94.2-r11.ebuild @@ -122,6 +122,7 @@ src_prepare() { eapply "${FILESDIR}"/exim-4.94-localscan_dlopen.patch eapply "${FILESDIR}"/exim-4.94.2-fix-crash-resolve.patch # 799368 upstr eapply "${FILESDIR}"/exim-4.94-CVE-2022-3559.patch # 877607 upstr + eapply "${FILESDIR}"/exim-4.94.2-openssl3.patch # 888619 backport # for this reason we have a := dep on opendmarc, they changed their # API in a minor release diff --git a/mail-mta/exim/files/exim-4.94.2-openssl3.patch b/mail-mta/exim/files/exim-4.94.2-openssl3.patch new file mode 100644 index 000000000000..d1102aac8bfa --- /dev/null +++ b/mail-mta/exim/files/exim-4.94.2-openssl3.patch @@ -0,0 +1,34 @@ +Based on original commit, but applied to 4.94.2 tarball. + +From ff7829398d74e67f1c1f40339a772fd76708e5ac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskar...@redhat.com> +Date: Sat, 27 Nov 2021 21:07:15 +0000 +Subject: [PATCH] Fix build for OpenSSL 3.0.0 . Bug 2810 + +--- + src/src/tls-openssl.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -227,12 +227,16 @@ + { 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 + #endif + #ifdef SSL_OP_NO_TLSv1_2 + { US"no_tlsv1_2", SSL_OP_NO_TLSv1_2 },
