gentoo resync : 28.04.2019

2 files changed, 27 insertions, 0 deletions

diff --git a/mail-mta/postfix/files/postfix-libressl-certkey.patch b/mail-mta/postfix/files/postfix-libressl-certkey.patch
new file mode 100644
index 000000000000..b6ab8aeb7901
--- /dev/null
+++ b/mail-mta/postfix/files/postfix-libressl-certkey.patch
@@ -0,0 +1,13 @@
+see https://bugs.gentoo.org/678874
+
+--- a/src/tls/tls_certkey.c.orig	2019-03-07 23:57:10 UTC
++++ b/src/tls/tls_certkey.c
+@@ -144,7 +144,7 @@ static void init_pem_load_state(pem_load
+ 
+ /* use_chain - load cert, key and chain into ctx or ssl */
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x1010100fUL
++#if OPENSSL_VERSION_NUMBER >= 0x1010100fUL && !defined(LIBRESSL_VERSION_NUMBER)
+ static int use_chain(pem_load_state_t *st)
+ {
+     int     ret;
diff --git a/mail-mta/postfix/files/postfix-libressl-server.patch b/mail-mta/postfix/files/postfix-libressl-server.patch
new file mode 100644
index 000000000000..8573bb80bb59
--- /dev/null
+++ b/mail-mta/postfix/files/postfix-libressl-server.patch
@@ -0,0 +1,14 @@
+see https://bugs.gentoo.org/678874
+
+--- a/src/tls/tls_server.c.orig	2018-12-26 19:21:49 UTC
++++ b/src/tls/tls_server.c
+@@ -518,7 +518,9 @@ TLS_APPL_STATE *tls_server_init(const TL
+ 	 * ticket decryption callback already (since 2.11) asks OpenSSL to
+ 	 * avoid issuing new tickets when the presented ticket is re-usable.
+ 	 */
++#ifndef LIBRESSL_VERSION_NUMBER
+ 	SSL_CTX_set_num_tickets(server_ctx, 1);
++#endif
+     }
+ #endif
+     if (!ticketable)