Attachment 194955 Details for Bug 229606 – Fix build for LibreSSL >= 2.7

[patch] Fix build for LibreSSL >= 2.7

mongodb-libressl-2.7.diff (text/plain), 1.56 KB, created by Michael Gmelin on 2018-07-08 14:25:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Gmelin

Created: 2018-07-08 14:25:02 UTC

Size: 1.56 KB

patch

obsolete

>Index: databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp
>===================================================================
>--- databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp	(revision 474174)
>+++ databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp	(working copy)
>@@ -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.
>Index: databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp
>===================================================================
>--- databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp	(revision 474174)
>+++ databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp	(working copy)
>@@ -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.

Actions: View | Diff

Attachments on bug 229606: 194955