svn commit: r474176 - head/databases/mongodb34/files

[Michael Gmelin]

Author: grembo
Date: Sun Jul  8 14:29:28 2018
New Revision: 474176
URL: https://svnweb.freebsd.org/changeset/ports/474176

Log:
  Fix build with LibreSSL 2.7
  
  PR:		229606
  Approved by:	SSL blanket

Modified:
  head/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp
  head/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp

Modified: head/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp
==============================================================================
--- head/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp	Sun Jul  8 12:34:14 2018	(r474175)
+++ head/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp	Sun Jul  8 14:29:28 2018	(r474176)
@@ -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: head/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp
==============================================================================
--- head/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp	Sun Jul  8 12:34:14 2018	(r474175)
+++ head/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp	Sun Jul  8 14:29:28 2018	(r474176)
@@ -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.