From owner-svn-ports-all@freebsd.org  Sat Aug 13 17:23:14 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
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 92A89BB8B1D;
 Sat, 13 Aug 2016 17:23:14 +0000 (UTC) (envelope-from ume@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 62E8A1172;
 Sat, 13 Aug 2016 17:23:14 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7DHNDqb074368;
 Sat, 13 Aug 2016 17:23:13 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7DHNDm6074367;
 Sat, 13 Aug 2016 17:23:13 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201608131723.u7DHNDm6074367@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Sat, 13 Aug 2016 17:23:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r420163 - head/mail/cyrus-imapd25/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.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Aug 2016 17:23:14 -0000

Author: ume
Date: Sat Aug 13 17:23:13 2016
New Revision: 420163
URL: https://svnweb.freebsd.org/changeset/ports/420163

Log:
  Fix build with recent libressl (2.4.2).
  
  Reported by:	"Dean E. Weimer" <dweimerxi [...] dweimer.net>`

Modified:
  head/mail/cyrus-imapd25/files/patch-imap__tls.c

Modified: head/mail/cyrus-imapd25/files/patch-imap__tls.c
==============================================================================
--- head/mail/cyrus-imapd25/files/patch-imap__tls.c	Sat Aug 13 15:31:43 2016	(r420162)
+++ head/mail/cyrus-imapd25/files/patch-imap__tls.c	Sat Aug 13 17:23:13 2016	(r420163)
@@ -1,6 +1,15 @@
---- imap/tls.c.orig	2015-11-30 06:30:33 UTC
+--- imap/tls.c.orig	2016-07-22 01:55:57 UTC
 +++ imap/tls.c
-@@ -683,7 +683,9 @@ EXPORTED int     tls_init_serverengine(c
+@@ -222,7 +222,7 @@ static RSA *tmp_rsa_cb(SSL * s __attribu
+ }
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ /* replacements for new 1.1 API accessors */
+ /* XXX probably put these somewhere central */
+ static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
+@@ -723,7 +723,9 @@ EXPORTED int     tls_init_serverengine(c
      off |= SSL_OP_ALL;            /* Work around all known bugs */
      off |= SSL_OP_NO_SSLv2;       /* Disable insecure SSLv2 */
      off |= SSL_OP_NO_SSLv3;       /* Disable insecure SSLv3 */
@@ -10,7 +19,7 @@
  
      const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS);
  
-@@ -1399,7 +1401,9 @@ HIDDEN int tls_init_clientengine(int ver
+@@ -1441,7 +1443,9 @@ HIDDEN int tls_init_clientengine(int ver
      off |= SSL_OP_ALL;            /* Work around all known bugs */
      off |= SSL_OP_NO_SSLv2;       /* Disable insecure SSLv2 */
      off |= SSL_OP_NO_SSLv3;       /* Disable insecure SSLv3 */