kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- fix build with libressl 2.8.2

Browse source 
PR:             233517 233527
Submitted by:   Andrej Ebert
Reported by:	Herbert J. Skuhra
This commit is contained in:
Olli Hauer 2018-11-26 06:59:17 +00:00
parent d0ec9facfd
commit b193a0d924
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=485924
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mail/postfix/Makefile
View file

@ -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/ \

13
mail/postfix/files/patch-src_tls_tls__server.c
View file

@ -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
*/