From owner-svn-ports-all@freebsd.org Sun Apr 8 02:11:54 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 58EB8F992DB; Sun, 8 Apr 2018 02:11:54 +0000 (UTC) (envelope-from ume@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 08E217CDA5; Sun, 8 Apr 2018 02:11:54 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 02EAC1354; Sun, 8 Apr 2018 02:11:54 +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 w382Br79059131; Sun, 8 Apr 2018 02:11:53 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w382Br06059130; Sun, 8 Apr 2018 02:11:53 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201804080211.w382Br06059130@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Sun, 8 Apr 2018 02:11:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466766 - head/mail/cyrus-imapd25/files X-SVN-Group: ports-head X-SVN-Commit-Author: ume X-SVN-Commit-Paths: head/mail/cyrus-imapd25/files X-SVN-Commit-Revision: 466766 X-SVN-Commit-Repository: ports 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.25 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: Sun, 08 Apr 2018 02:11:54 -0000 Author: ume Date: Sun Apr 8 02:11:53 2018 New Revision: 466766 URL: https://svnweb.freebsd.org/changeset/ports/466766 Log: Fix build with LibreSSL 2.7 PR: 227165 Submitted by: brnrd 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 Apr 7 22:26:56 2018 (r466765) +++ head/mail/cyrus-imapd25/files/patch-imap__tls.c Sun Apr 8 02:11:53 2018 (r466766) @@ -1,15 +1,15 @@ ---- imap/tls.c.orig 2016-07-22 01:55:57 UTC +--- imap/tls.c.orig 2017-05-09 00:40:13 UTC +++ imap/tls.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) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* 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 +@@ -726,7 +726,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 */ @@ -19,7 +19,7 @@ const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS); -@@ -1441,7 +1443,9 @@ HIDDEN int tls_init_clientengine(int ver +@@ -1448,7 +1450,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 */