diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-07 13:09:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-07 16:46:16 +0000 |
| commit | 54b3bea757deafa6c7fc09bb1fa6a1ed973767bc (patch) | |
| tree | 84db16e6ab5bc05a9f61d2ec33a0892227f420c7 /testing/mongo-c-driver/libressl-2.7.patch | |
| parent | c887d7741921890f1e05a1b7fd6ac7c6092d1ce0 (diff) | |
| download | aports-54b3bea757deafa6c7fc09bb1fa6a1ed973767bc.tar.bz2 aports-54b3bea757deafa6c7fc09bb1fa6a1ed973767bc.tar.xz | |
testing/mongo-c-driver: upgrade to 1.13.0
libbson is merged into mongo-c-driver upstream so we provide libbson
from mongo-c-driver.
Diffstat (limited to 'testing/mongo-c-driver/libressl-2.7.patch')
| -rw-r--r-- | testing/mongo-c-driver/libressl-2.7.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/testing/mongo-c-driver/libressl-2.7.patch b/testing/mongo-c-driver/libressl-2.7.patch deleted file mode 100644 index 0839350ae6..0000000000 --- a/testing/mongo-c-driver/libressl-2.7.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/src/mongoc/mongoc-stream-tls-openssl-bio.c b/src/mongoc/mongoc-stream-tls-openssl-bio.c -index 053439b..0379a5d 100644 ---- a/src/mongoc/mongoc-stream-tls-openssl-bio.c -+++ b/src/mongoc/mongoc-stream-tls-openssl-bio.c -@@ -39,7 +39,7 @@ - #define MONGOC_LOG_DOMAIN "stream-tls-openssl-bio" - - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - - /* Magic vtable to make our BIO shim */ - static BIO_METHOD gMongocStreamTlsOpenSslRawMethods = { -diff --git a/src/mongoc/mongoc-stream-tls-openssl.c b/src/mongoc/mongoc-stream-tls-openssl.c -index fd1800b..bccae22 100644 ---- a/src/mongoc/mongoc-stream-tls-openssl.c -+++ b/src/mongoc/mongoc-stream-tls-openssl.c -@@ -45,7 +45,7 @@ - - #define MONGOC_STREAM_TLS_OPENSSL_BUFFER_SIZE 4096 - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - static void - BIO_meth_free (BIO_METHOD *meth) - { -diff --git a/build/autotools/CheckSSL.m4 b/build/autotools/CheckSSL.m4 -index 95979c7..03576f5 100644 ---- a/build/autotools/CheckSSL.m4 -+++ b/build/autotools/CheckSSL.m4 -@@ -34,7 +34,7 @@ AS_IF([test "$enable_ssl" != "no"],[ - ]) - ]) - AS_IF([test "$enable_ssl" = "libressl"],[ -- PKG_CHECK_MODULES(SSL, [libtls], [enable_ssl=libressl], [ -+ PKG_CHECK_MODULES(SSL, [libtls libcrypto], [enable_ssl=libressl], [ - AC_CHECK_LIB([tls],[tls_init],[ - SSL_LIBS="-ltls -lcrypto" - enable_ssl=libressl -diff --git a/src/mongoc/mongoc-crypto-openssl.c b/src/mongoc/mongoc-crypto-openssl.c -index 1b2552c..0e248e7 100644 ---- a/src/mongoc/mongoc-crypto-openssl.c -+++ b/src/mongoc/mongoc-crypto-openssl.c -@@ -38,7 +38,7 @@ mongoc_crypto_openssl_hmac_sha1 (mongoc_crypto_t *crypto, - HMAC (EVP_sha1 (), key, key_len, d, n, md, NULL); - } - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - EVP_MD_CTX * - EVP_MD_CTX_new (void) - { |