svn commit: r474248 - branches/2018Q3/databases/mongodb34/files

[Michael Gmelin]

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.