diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2018-11-26 06:59:17 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2018-11-26 06:59:17 +0000 |
| commit | b193a0d924bf25aea66e79bff4f40e73cdab8e7a (patch) | |
| tree | 28c4430eefe0dfe59efbf1f450b16bf912254d4f /mail | |
| parent | d0ec9facfde4e9cae702a4712207fc2c9a718e93 (diff) | |
| download | ports-b193a0d924bf25aea66e79bff4f40e73cdab8e7a.tar.gz ports-b193a0d924bf25aea66e79bff4f40e73cdab8e7a.zip | |
Notes
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/postfix/Makefile | 2 | ||||
| -rw-r--r-- | mail/postfix/files/patch-src_tls_tls__server.c | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index a10be15c8948..8590de3912c0 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -3,7 +3,7 @@ PORTNAME= postfix DISTVERSION= 3.3.2 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ diff --git a/mail/postfix/files/patch-src_tls_tls__server.c b/mail/postfix/files/patch-src_tls_tls__server.c index b9fb84e87acd..e6cd6188f0fb 100644 --- a/mail/postfix/files/patch-src_tls_tls__server.c +++ b/mail/postfix/files/patch-src_tls_tls__server.c @@ -1,4 +1,4 @@ ---- src/tls/tls_server.c.orig 2016-08-27 20:27:50 UTC +--- src/tls/tls_server.c.orig 2018-11-17 22:33:15 UTC +++ src/tls/tls_server.c @@ -174,7 +174,7 @@ static const char server_session_id_cont #endif /* OPENSSL_VERSION_NUMBER */ @@ -18,7 +18,16 @@ /* * Initialize the OpenSSL library by the book! To start with, we must -@@ -588,7 +588,7 @@ TLS_APPL_STATE *tls_server_init(const TL +@@ -486,7 +486,7 @@ TLS_APPL_STATE *tls_server_init(const TL + * OpenSSL 0.9.8h, while SSL_NO_TICKET was added in 0.9.8f. + */ + #ifdef SSL_OP_NO_TICKET +-#if !defined(OPENSSL_NO_TLSEXT) && OPENSSL_VERSION_NUMBER >= 0x0090808fL ++#if !defined(OPENSSL_NO_TLSEXT) && OPENSSL_VERSION_NUMBER >= 0x0090808fL && !defined(LIBRESSL_VERSION_NUMBER) + ticketable = (*var_tls_tkt_cipher && scache_timeout > 0 + && !(off & SSL_OP_NO_TICKET)); + if (ticketable) { +@@ -595,7 +595,7 @@ TLS_APPL_STATE *tls_server_init(const TL /* * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev */ |