From owner-svn-ports-all@freebsd.org Mon Nov 26 06:59:19 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 17093114F873; Mon, 26 Nov 2018 06:59:19 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A7AE089EBE; Mon, 26 Nov 2018 06:59:18 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 881A43C1; Mon, 26 Nov 2018 06:59:18 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAQ6xIfU085846; Mon, 26 Nov 2018 06:59:18 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAQ6xIPn085845; Mon, 26 Nov 2018 06:59:18 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201811260659.wAQ6xIPn085845@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 26 Nov 2018 06:59:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485924 - in head/mail/postfix: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ohauer X-SVN-Commit-Paths: in head/mail/postfix: . files X-SVN-Commit-Revision: 485924 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A7AE089EBE X-Spamd-Result: default: False [1.74 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.64)[0.643,0]; NEURAL_SPAM_MEDIUM(0.64)[0.638,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.46)[0.461,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2018 06:59:19 -0000 Author: ohauer Date: Mon Nov 26 06:59:17 2018 New Revision: 485924 URL: https://svnweb.freebsd.org/changeset/ports/485924 Log: - fix build with libressl 2.8.2 PR: 233517 233527 Submitted by: Andrej Ebert Reported by: Herbert J. Skuhra Modified: head/mail/postfix/Makefile head/mail/postfix/files/patch-src_tls_tls__server.c Modified: head/mail/postfix/Makefile ============================================================================== --- head/mail/postfix/Makefile Mon Nov 26 06:44:58 2018 (r485923) +++ head/mail/postfix/Makefile Mon Nov 26 06:59:17 2018 (r485924) @@ -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/ \ Modified: head/mail/postfix/files/patch-src_tls_tls__server.c ============================================================================== --- head/mail/postfix/files/patch-src_tls_tls__server.c Mon Nov 26 06:44:58 2018 (r485923) +++ head/mail/postfix/files/patch-src_tls_tls__server.c Mon Nov 26 06:59:17 2018 (r485924) @@ -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 */