From owner-svn-ports-all@freebsd.org Sat May 20 18:34:57 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 36D40D76EBD; Sat, 20 May 2017 18:34:57 +0000 (UTC) (envelope-from brnrd@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 mx1.freebsd.org (Postfix) with ESMTPS id D6206127A; Sat, 20 May 2017 18:34:56 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4KIYtfZ056502; Sat, 20 May 2017 18:34:55 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4KIYt1Y056500; Sat, 20 May 2017 18:34:55 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201705201834.v4KIYt1Y056500@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 20 May 2017 18:34:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441329 - head/mail/postfix/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 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: Sat, 20 May 2017 18:34:57 -0000 Author: brnrd Date: Sat May 20 18:34:55 2017 New Revision: 441329 URL: https://svnweb.freebsd.org/changeset/ports/441329 Log: mail/postfix: Fix x25519 kex with LibreSSL PR: 216790 Obtained from: OpenBSD ports Approved by: ohauer (maintainer) Added: head/mail/postfix/files/patch-src_tls_tls__dh.c (contents, props changed) Modified: head/mail/postfix/files/patch-src_tls_tls.h Modified: head/mail/postfix/files/patch-src_tls_tls.h ============================================================================== --- head/mail/postfix/files/patch-src_tls_tls.h Sat May 20 18:29:27 2017 (r441328) +++ head/mail/postfix/files/patch-src_tls_tls.h Sat May 20 18:34:55 2017 (r441329) @@ -1,7 +1,8 @@ -# fix build against LibreSSL -# Obtained from: http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/mail/postfix/stable/patches/ -# ---- src/tls/tls.h.orig 2016-02-06 20:09:41 UTC +$OpenBSD: patch-src_tls_tls_h,v 1.2 2017/03/04 22:09:43 sthen Exp $ + +Fix building with LibreSSL + +--- src/tls/tls.h.orig 2017-01-01 22:22:13 UTC +++ src/tls/tls.h @@ -89,7 +89,7 @@ extern const char *str_tls_level(int); #endif @@ -12,3 +13,13 @@ #define OpenSSL_version_num SSLeay #define OpenSSL_version SSLeay_version #define OPENSSL_VERSION SSLEAY_VERSION +@@ -104,6 +104,9 @@ extern const char *str_tls_level(int); + #define ASN1_STRING_get0_data ASN1_STRING_data + #define X509_getm_notBefore X509_get_notBefore + #define X509_getm_notAfter X509_get_notAfter ++#endif ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + #define TLS_method SSLv23_method + #define TLS_client_method SSLv23_client_method + #define TLS_server_method SSLv23_server_method Added: head/mail/postfix/files/patch-src_tls_tls__dh.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/postfix/files/patch-src_tls_tls__dh.c Sat May 20 18:34:55 2017 (r441329) @@ -0,0 +1,15 @@ +$OpenBSD: patch-src_tls_tls_dh_c,v 1.1 2017/03/04 22:09:43 sthen Exp $ + +Fix building with LibreSSL + +--- src/tls/tls_dh.c.orig 2016-12-26 23:47:24 UTC ++++ src/tls/tls_dh.c +@@ -314,7 +314,7 @@ void tls_auto_eecdh_curves(SSL_CTX *c + * This is a NOP in OpenSSL 1.1.0 and later, where curves are always + * auto-negotiated. + */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000UL ++#if OPENSSL_VERSION_NUMBER < 0x10100000UL || defined(LIBRESSL_VERSION_NUMBER) + if (SSL_CTX_set_ecdh_auto(ctx, 1) <= 0) { + msg_warn("failed to enable automatic ECDHE curve selection"); + tls_print_errors();