Date: Mon, 26 Nov 2018 05:11:04 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485913 - in head/mail/postfix-current: . files Message-ID: <201811260511.wAQ5B4dO032827@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Mon Nov 26 05:11:03 2018 New Revision: 485913 URL: https://svnweb.freebsd.org/changeset/ports/485913 Log: - fix build with libressl 2.8.2 PR: 233517 Submitted by: Andrej Ebert Modified: head/mail/postfix-current/Makefile head/mail/postfix-current/files/patch-src_tls_tls__server.c Modified: head/mail/postfix-current/Makefile ============================================================================== --- head/mail/postfix-current/Makefile Mon Nov 26 02:28:26 2018 (r485912) +++ head/mail/postfix-current/Makefile Mon Nov 26 05:11:03 2018 (r485913) @@ -3,7 +3,7 @@ PORTNAME= postfix DISTVERSION= 3.4-20181123 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 5 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ Modified: head/mail/postfix-current/files/patch-src_tls_tls__server.c ============================================================================== --- head/mail/postfix-current/files/patch-src_tls_tls__server.c Mon Nov 26 02:28:26 2018 (r485912) +++ head/mail/postfix-current/files/patch-src_tls_tls__server.c Mon Nov 26 05:11:03 2018 (r485913) @@ -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 14:59:22 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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811260511.wAQ5B4dO032827>