Date: Mon, 9 Jul 2018 09:40:10 +0000 (UTC) From: Michael Gmelin <grembo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r474247 - branches/2018Q3/databases/mongodb36/files Message-ID: <201807090940.w699eAcL003105@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: grembo Date: Mon Jul 9 09:40:10 2018 New Revision: 474247 URL: https://svnweb.freebsd.org/changeset/ports/474247 Log: MFH: r474192 Fix build with LibreSSL 2.7 PR: 229608 Approved by: ports-secteam (build fix blanket) Added: branches/2018Q3/databases/mongodb36/files/patch-src-mongo-crypto-sha_block_openssl.cpp - copied unchanged from r474192, head/databases/mongodb36/files/patch-src-mongo-crypto-sha_block_openssl.cpp branches/2018Q3/databases/mongodb36/files/patch-src-mongo-util-net-ssl_manager.cpp - copied unchanged from r474192, head/databases/mongodb36/files/patch-src-mongo-util-net-ssl_manager.cpp Modified: Directory Properties: branches/2018Q3/ (props changed) Copied: branches/2018Q3/databases/mongodb36/files/patch-src-mongo-crypto-sha_block_openssl.cpp (from r474192, head/databases/mongodb36/files/patch-src-mongo-crypto-sha_block_openssl.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/databases/mongodb36/files/patch-src-mongo-crypto-sha_block_openssl.cpp Mon Jul 9 09:40:10 2018 (r474247, copy of r474192, head/databases/mongodb36/files/patch-src-mongo-crypto-sha_block_openssl.cpp) @@ -0,0 +1,11 @@ +--- src/mongo/crypto/sha_block_openssl.cpp.orig 2018-07-08 16:42:41.034894000 +0000 ++++ src/mongo/crypto/sha_block_openssl.cpp 2018-07-08 16:42:58.121846000 +0000 +@@ -44,7 +44,7 @@ + #include <openssl/hmac.h> + #include <openssl/sha.h> + +-#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. Copied: branches/2018Q3/databases/mongodb36/files/patch-src-mongo-util-net-ssl_manager.cpp (from r474192, head/databases/mongodb36/files/patch-src-mongo-util-net-ssl_manager.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/databases/mongodb36/files/patch-src-mongo-util-net-ssl_manager.cpp Mon Jul 9 09:40:10 2018 (r474247, copy of r474192, head/databases/mongodb36/files/patch-src-mongo-util-net-ssl_manager.cpp) @@ -0,0 +1,11 @@ +--- src/mongo/util/net/ssl_manager.cpp.orig 2018-07-08 16:33:48.347433000 +0000 ++++ src/mongo/util/net/ssl_manager.cpp 2018-07-08 16:34:49.098494000 +0000 +@@ -237,7 +237,7 @@ + #endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS + // clang-format on + +-#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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807090940.w699eAcL003105>