From owner-svn-ports-all@freebsd.org  Mon Jul  9 09:42:05 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7314910375F1;
 Mon,  9 Jul 2018 09:42:05 +0000 (UTC)
 (envelope-from grembo@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 1FF2E8E533;
 Mon,  9 Jul 2018 09:42:05 +0000 (UTC)
 (envelope-from grembo@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 DB7D213500;
 Mon,  9 Jul 2018 09:42:04 +0000 (UTC)
 (envelope-from grembo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w699g4Yr006808;
 Mon, 9 Jul 2018 09:42:04 GMT (envelope-from grembo@FreeBSD.org)
Received: (from grembo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w699g4PY006428;
 Mon, 9 Jul 2018 09:42:04 GMT (envelope-from grembo@FreeBSD.org)
Message-Id: <201807090942.w699g4PY006428@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: grembo set sender to
 grembo@FreeBSD.org using -f
From: Michael Gmelin <grembo@FreeBSD.org>
Date: Mon, 9 Jul 2018 09:42:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r474248 - branches/2018Q3/databases/mongodb34/files
X-SVN-Group: ports-branches
X-SVN-Commit-Author: grembo
X-SVN-Commit-Paths: branches/2018Q3/databases/mongodb34/files
X-SVN-Commit-Revision: 474248
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.27
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: Mon, 09 Jul 2018 09:42:05 -0000

Author: grembo
Date: Mon Jul  9 09:42:04 2018
New Revision: 474248
URL: https://svnweb.freebsd.org/changeset/ports/474248

Log:
  MFH: r474176
  
  Fix build with LibreSSL 2.7
  
  PR:		229606
  
  Approved by:	ports-secteam (build fix blanket)

Modified:
  branches/2018Q3/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp
  branches/2018Q3/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp
Directory Properties:
  branches/2018Q3/   (props changed)

Modified: branches/2018Q3/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp
==============================================================================
--- branches/2018Q3/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp	Mon Jul  9 09:40:10 2018	(r474247)
+++ branches/2018Q3/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp	Mon Jul  9 09:42:04 2018	(r474248)
@@ -5,7 +5,7 @@
  #include <openssl/hmac.h>
  #include <openssl/sha.h>
 -#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 < 0x2070000fL)
  namespace {
  // Copies of OpenSSL after 1.1.0 define new EVP digest routines. We must
  // polyfill used definitions to interact with older OpenSSL versions.

Modified: branches/2018Q3/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp
==============================================================================
--- branches/2018Q3/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp	Mon Jul  9 09:40:10 2018	(r474247)
+++ branches/2018Q3/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp	Mon Jul  9 09:42:04 2018	(r474248)
@@ -5,7 +5,7 @@
  // clang-format on
  
 -#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 < 0x2070000fL)
  // Copies of OpenSSL after 1.1.0 define new functions for interaction with
  // X509 structure. We must polyfill used definitions to interact with older
  // OpenSSL versions.