gentoo auto-resync : 28:12:2022 - 02:11:45

3 files changed, 37 insertions, 1 deletions

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 64b517add3f6..41d122febc71 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -10,6 +10,7 @@ AUX exim-4.94-localscan_dlopen.patch 9595 BLAKE2B c48eaaf486585890dc4028beaca7a3
 AUX exim-4.94-maildir.patch 316 BLAKE2B fe0b27712e77eba83244434c33372cec47fa317026d159de7a0ac37f2563999a6470df2dc203c1fcda8e7074c949133a0311c2b94c4b48bbc46d64c7c486202c SHA512 13863226883f79dcc781fe8eb3b50ad3c5511af130cf6e41ce40e8543d46832668bd7d746a2cc67842748cdf26144bef4aece49397d3168819215eac93ca1e6e
 AUX exim-4.94-opendmarc-1.4.patch 506 BLAKE2B d8ba66e1165dffb9ba367b997d69090fa8b31aa6ce3cb17d6ade4bd3b3dabf2a2d93223106eeb7f39754397eb17979e66d52de8dc2d524de9019c9598cd89af6 SHA512 6145f07c0b5b4234160fd3480329759a06500b658643523f32bcfa9158258a9b708095725f2e56d5538567f888c5e0e954c4ac51c8f2d16921dc4950241cd2fc
 AUX exim-4.94.2-fix-crash-resolve.patch 809 BLAKE2B cd9d3d923510315f75a3bad8c56b89b59782f9af8523a794845b1163c0bac5682f311a86eda1b8e78396d77c159629ef5186416626ebe627d723e17e3b388afc SHA512 a00960409e835dd067c88b4cb34953bc9343417ddfd448f5042b1597bc127f95937a5d8786d6f3ae347654842344d61ec268c7ed37e0f05c79ef7c530f741a7b
+AUX exim-4.94.2-openssl3.patch 1101 BLAKE2B 5b7b146a21a3f9d725eca200247221cb57d89aab69f365ea252a9dc9ecb53e534e7b49405de18764b9d9038a0d7389785bd719d2ada118c50b417313b94d7286 SHA512 c3971b246c74b13bcd3a3c6bfad88cf3ec275c9ff47399b95056c6cf45a39293cb44be17d321803ac4500a6e01e99b066910d3e3bc79e9316c8ee13a0d1cae28
 AUX exim-4.95-localscan_dlopen.patch 7621 BLAKE2B 6df3c1acb585dc87759e056f7bb44e50219812c3ca41364fff77942cc2d6f7452d8f4c158f17295bc586eeacc8048e24f767bab0464d300a7cb7d357c63bedd9 SHA512 1cf52ac9637a753ff7257c274bc09591a8c761fc6599cbb2cceb213272573c371dbc5db6b028c2f745989013c21af54c45facf5f2bf5c87742e299c12a9b8a1b
 AUX exim-4.96-dmarc_use_after_free.patch 1026 BLAKE2B 6d94bfd5f313afa826d247d7a88a1cbf7a3d2e5124dcd69767b131740030d2793306eca80c5de2206f7d7f683e117ffbbaccace947a2ad726b6adb2b3dcb0fc8 SHA512 c1e61b5d85563265eb14b5ba8c88cd6bc78d0ad3730051f57408fa43d16a2eeeb98d8890d0dc7b36f9aaea284c5b0a890fb8db824666ee31b462084be14a7156
 AUX exim-submission.socket 161 BLAKE2B 409a5a687897af369a6a2ff0c30564096cc6b308dbc5d0afb6742df44d2aa972e45bad9681d2cb72be9731b260d23fdadb80bae644e7b875af5e34e9c8b8b40f SHA512 4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d
@@ -25,7 +26,7 @@ DIST exim-4.96.tar.xz 1879152 BLAKE2B 4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a5
 DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d SHA512 3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
 DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 7f61767f91864c43a3b7b6ca36ec7f41da6ad7029687a38cfa9307c444c2ffbd3eb61d45645ffd20ec16ba64a37e1ff08c02e7e4e36499c7783679af9a399081 SHA512 05e94579631656330d95d237c58bc9fd52229a067c5846e7c3409b4c83040c9216819bcb0090673d9991fd59e2c2025340592b31b241b557c6775782106854d1
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.94.2-r11.ebuild 16180 BLAKE2B a619a8de75342115eb107b1d9e2430718703181a24603097cf532227b801b67a3995902239166e8510ae7f6578f726aa38bab14825cd1521b91c827e7a96cbdd SHA512 8345dbf0b128b39c7cab4ff2e20e196f746bd70176d584cff29640276c5abd6962148d7d93ced58796b144d8386810dc03de1882a6f7d3510031c6cc6ca7629b
+EBUILD exim-4.94.2-r11.ebuild 16251 BLAKE2B 4df92f7a561416a439fbdfc7e0dbbdf2e04d4dbf8a0f205c84f8e01b6ec35199658f38574c91201745de88c907b56e6356cb5bf77922d4842b9da0713300cf00 SHA512 a7a0171592745af6b6cdc5f4ec10b204e341e1f90d20ccc417885b2fc6feaf1e39bd9a6836f1d8a7693f6f872ec69aab7d85fb6a4d3afbd94f268a525e9e43af
 EBUILD exim-4.94.2-r7.ebuild 14840 BLAKE2B beec43c20d547763f805f10531a5cddf46e2339760dbb8545c9715b4031dc6325b16e1f3e79c20be364bfc681bdb652ee316b2653c5ed6ae2eea2dfad5872ba2 SHA512 6598f7597787e1eef199aebae2aba4213c8059d1246b4418ea03c786c24923342285ad4208c076cdfec37645d9781e2aa7573b18dd8e28aefb06af964ef616b0
 EBUILD exim-4.96-r2.ebuild 15788 BLAKE2B c35234d38a5cb58ec4d82bc4eaf20e536f855f783cb4c9f324ad0db3555ecd4d45f2ddfa0d6b05e7c90ac294598a516134d6b8d81d9394b0d7472def7f183871 SHA512 3513a65e2958be49bd6e3e33a3ca093307aa7e1008f70a7d460896e916fb3f2e6a97aba790df9fa562e4b8d01dfe275569bece1f5795b5a0b1d5af9d859557e0
 MISC metadata.xml 2759 BLAKE2B 4f5d0d9fbd244b0836de4bd0d3b84f45376628a12e019c89e49e6dbd7128c19f16281fdfb401d852f57f27f547184351000382cc7333a524f7be280e0799d8d8 SHA512 85a2eaef07eb68d51a1307c6d76bef6620e7311ffda593750ebee5fe84affac2e026c971818500004c0ab9722a8e84c8eb0394fb66bb2ba6cd3465cf7e1f1a73
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?= <jskarvad@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 },