FreeBSD Bugzilla – Attachment 208113 Details for
Bug 241078
databases/mongodb34: Update to 3.4.23
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
trivial update of version and distinfo + make makepatch to refresh patches
mongodb34.23.diff (text/plain), 30.74 KB, created by
Ronald Klop
on 2019-10-05 12:25:48 UTC
(
hide
)
Description:
trivial update of version and distinfo + make makepatch to refresh patches
Filename:
MIME Type:
Creator:
Ronald Klop
Created:
2019-10-05 12:25:48 UTC
Size:
30.74 KB
patch
obsolete
>diff -rNu mongodb34.22/Makefile mongodb34.23/Makefile >--- mongodb34.22/Makefile 2019-08-07 13:23:18.630848000 +0200 >+++ mongodb34.23/Makefile 2019-10-05 14:03:38.965921000 +0200 >@@ -2,7 +2,7 @@ > > PORTNAME= mongodb > DISTVERSIONPREFIX= r >-DISTVERSION= 3.4.22 >+DISTVERSION= 3.4.23 > #PORTREVISION= 1 > CATEGORIES= databases net > MASTER_SITES= https://fastdl.mongodb.org/src/ \ >@@ -18,7 +18,7 @@ > LICENSE= AGPLv3 APACHE20 > LICENSE_COMB= multi > >-ONLY_FOR_ARCHS= amd64 aarch64 >+ONLY_FOR_ARCHS= aarch64 amd64 > ONLY_FOR_ARCHS_REASON= "Only supported on amd64 and aarch64 (i386 deprecated in v3)" > > LIB_DEPENDS= libpcre.so:devel/pcre \ >@@ -27,10 +27,11 @@ > TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo@${PY_FLAVOR} > >+USES= compiler:c++14-lang cpe dos2unix python:build scons >+ > CONFLICTS_BUILD= mongo-cxx-driver > CONFLICTS_INSTALL= mongodb36 mongodb40 > >-USES= compiler:c++14-lang cpe dos2unix python:build scons > DOS2UNIX_FILES= src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h > > USE_RC_SUBR= mongod >diff -rNu mongodb34.22/distinfo mongodb34.23/distinfo >--- mongodb34.22/distinfo 2019-08-07 13:23:58.856940000 +0200 >+++ mongodb34.23/distinfo 2019-10-05 05:08:18.377512000 +0200 >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1565177038 >-SHA256 (mongodb-src-r3.4.22.tar.gz) = de46ef5a6cb2fde1889a1c3dfc7b1d4e1f342614c58e93963bde88954cce3fe6 >-SIZE (mongodb-src-r3.4.22.tar.gz) = 40172095 >+TIMESTAMP = 1570244898 >+SHA256 (mongodb-src-r3.4.23.tar.gz) = 8a8bfad7a0c115e6101d9c823ccff76e4fd619367c6f700f1323827063113c9f >+SIZE (mongodb-src-r3.4.23.tar.gz) = 40176687 >diff -rNu mongodb34.22/files/patch-SConstruct mongodb34.23/files/patch-SConstruct >--- mongodb34.22/files/patch-SConstruct 2017-10-03 15:24:11.000000000 +0200 >+++ mongodb34.23/files/patch-SConstruct 2019-10-05 14:05:29.340645000 +0200 >@@ -1,6 +1,6 @@ >---- SConstruct.orig 2017-06-08 16:11:03 UTC >+--- SConstruct.orig 2019-09-04 17:33:32 UTC > +++ SConstruct >-@@ -929,9 +929,9 @@ if has_option('variables-help'): >+@@ -936,9 +936,9 @@ if has_option('variables-help'): > print env_vars.GenerateHelpText(env) > Exit(0) > >@@ -13,7 +13,7 @@ > > def set_config_header_define(env, varname, varval = 1): > env['CONFIG_HEADER_DEFINES'][varname] = varval >-@@ -1550,7 +1550,7 @@ if env.TargetOSIs('posix'): >+@@ -1557,7 +1557,7 @@ if env.TargetOSIs('posix'): > # If runtime hardening is requested, then build anything > # destined for an executable with the necessary flags for PIE. > env.AppendUnique( >@@ -22,7 +22,7 @@ > PROGLINKFLAGS=['-pie'], > ) > >-@@ -1564,7 +1564,7 @@ if env.TargetOSIs('posix'): >+@@ -1571,7 +1571,7 @@ if env.TargetOSIs('posix'): > "-Wno-unknown-pragmas", > "-Winvalid-pch"] ) > # env.Append( " -Wconversion" ) TODO: this doesn't really work yet >@@ -31,7 +31,7 @@ > if not has_option("disable-warnings-as-errors"): > env.Append( CCFLAGS=["-Werror"] ) > >-@@ -1592,19 +1592,19 @@ if env.TargetOSIs('posix'): >+@@ -1599,19 +1599,19 @@ if env.TargetOSIs('posix'): > env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) > env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) > >@@ -61,7 +61,7 @@ > > mmapv1 = False > if get_option('mmapv1') == 'auto': >-@@ -2461,7 +2461,7 @@ def doConfigure(myenv): >+@@ -2468,7 +2468,7 @@ def doConfigure(myenv): > }} > """.format(storage_class) > context.Message('Checking for storage class {0} '.format(storage_class)) >diff -rNu mongodb34.22/files/patch-asio-openssl-1.1.0 mongodb34.23/files/patch-asio-openssl-1.1.0 >--- mongodb34.22/files/patch-asio-openssl-1.1.0 2018-12-23 14:36:54.000000000 +0100 >+++ mongodb34.23/files/patch-asio-openssl-1.1.0 2019-10-05 14:05:29.502630000 +0200 >@@ -1,124 +1,44 @@ >-From 628e3ca9fe7a1bed1ce2308e2df4a1a4ecd1dfe7 Mon Sep 17 00:00:00 2001 >-From: Christopher Kohlhoff <chris@kohlhoff.com> >-Date: Fri, 20 Mar 2015 08:46:51 +1100 >-Subject: [PATCH] ERR_remove_state is deprecated, use ERR_remove_thread_state >- instead. >- >---- >- asio/include/asio/ssl/detail/impl/openssl_init.ipp | 4 ++++ >- 1 file changed, 4 insertions(+) >- >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-index 2c40d40..da66fc1 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-@@ -63,7 +63,11 @@ public: >- ::CRYPTO_set_id_callback(0); >- ::CRYPTO_set_locking_callback(0); >- ::ERR_free_strings(); >-+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) >-+ ::ERR_remove_thread_state(NULL); >-+#else // (OPENSSL_VERSION_NUMBER >= 0x10000000L) >- ::ERR_remove_state(0); >-+#endif // (OPENSSL_VERSION_NUMBER >= 0x10000000L) >- ::EVP_cleanup(); >- ::CRYPTO_cleanup_all_ex_data(); >- ::CONF_modules_unload(1); >-From aa21de0944b4327f998fe161dde5ddaaf38cec5c Mon Sep 17 00:00:00 2001 >-From: Christopher Kohlhoff <chris@kohlhoff.com> >-Date: Sat, 21 Mar 2015 20:52:42 +1100 >-Subject: [PATCH] Remove redundant pointer check in SSL engine. >- >---- >- asio/include/asio/ssl/detail/impl/engine.ipp | 2 +- >- 1 file changed, 1 insertion(+), 1 deletion(-) >- >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp >-index 5504411..2e4a39d 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp >+--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp.orig 2019-10-05 03:09:25 UTC > +++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp >-@@ -206,7 +206,7 @@ const asio::error_code& engine::map_error_code( >+@@ -205,8 +205,10 @@ const asio::error_code& engine::map_error_code( > > // SSL v2 doesn't provide a protocol-level shutdown, so an eof on the > // underlying transport is passed through. >-- if (ssl_ && ssl_->version == SSL2_VERSION) >-+ if (ssl_->version == SSL2_VERSION) >++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >+ if (ssl_->version == SSL2_VERSION) > return ec; >++#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) > > // Otherwise, the peer should have negotiated a proper shutdown. >-From 6c70257e20ef159c581298b54838361bb54bfce4 Mon Sep 17 00:00:00 2001 >-From: Christopher Kohlhoff <chris@kohlhoff.com> >-Date: Thu, 1 Oct 2015 08:44:30 +1000 >-Subject: [PATCH] Use SSL_CTX_clear_chain_certs, if available. >- >---- >- asio/include/asio/ssl/impl/context.ipp | 4 ++++ >- 1 file changed, 4 insertions(+) >- >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp >-index 08705e7..77da84e 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp >-+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp >-@@ -539,11 +539,15 @@ asio::error_code context::use_certificate_chain( >- return ec; >- } >- >-+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) >-+ ::SSL_CTX_clear_chain_certs(handle_); >-+#else >- if (handle_->extra_certs) >- { >- ::sk_X509_pop_free(handle_->extra_certs, X509_free); >- handle_->extra_certs = 0; >- } >-+#endif // (OPENSSL_VERSION_NUMBER >= 0x10002000L) >- >- while (X509* cacert = ::PEM_read_bio_X509(bio.p, 0, >- handle_->default_passwd_callback, >-From 92bfc623e6a71353dd2c783f4c9fef5591ac550d Mon Sep 17 00:00:00 2001 >-From: Christopher Kohlhoff <chris@kohlhoff.com> >-Date: Thu, 19 Nov 2015 10:24:56 +1100 >-Subject: [PATCH] Add new error category and constant for >- ssl::error::stream_truncated. >- >-This error replaces uses of SSL_R_SHORT_READ, and indicates that the >-SSL stream has been shut down abruptly. (I.e. the underlying socket >-has been closed without performing an SSL-layer shutdown.) >---- >- asio/include/asio/ssl/detail/impl/engine.ipp | 8 ++----- >- asio/include/asio/ssl/error.hpp | 34 ++++++++++++++++++++++++++++ >- asio/include/asio/ssl/impl/error.ipp | 33 ++++++++++++++++++++++++++- >- 3 files changed, 68 insertions(+), 7 deletions(-) >- >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp >-index b59cf18..9abe010 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp >-+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp >-@@ -195,9 +195,7 @@ const asio::error_code& engine::map_error_code( >- // If there's data yet to be read, it's an error. >- if (BIO_wpending(ext_bio_)) >- { >-- ec = asio::error_code( >-- ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ), >-- asio::error::get_ssl_category()); >-+ ec = asio::ssl::error::stream_truncated; >- return ec; >- } >- >-@@ -209,9 +207,7 @@ const asio::error_code& engine::map_error_code( >- // Otherwise, the peer should have negotiated a proper shutdown. > if ((::SSL_get_shutdown(ssl_) & SSL_RECEIVED_SHUTDOWN) == 0) >+--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp.orig 2019-10-05 03:09:25 UTC >++++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >+@@ -35,11 +35,11 @@ class openssl_init_base::do_init >+ public: >+ do_init() > { >-- ec = asio::error_code( >-- ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ), >-- asio::error::get_ssl_category()); >-+ ec = asio::ssl::error::stream_truncated; >- } >++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >+ ::SSL_library_init(); >+ ::SSL_load_error_strings(); >+ ::OpenSSL_add_all_algorithms(); > >- return ec; >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/error.hpp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/error.hpp >-index 1385d2a..f044f59 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/error.hpp >+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >+ mutexes_.resize(::CRYPTO_num_locks()); >+ for (size_t i = 0; i < mutexes_.size(); ++i) >+ mutexes_[i].reset(new asio::detail::mutex); >+--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp.orig 2019-09-04 17:33:32 UTC >++++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp >+@@ -21,7 +21,9 @@ >+ #if !defined(OPENSSL_NO_ENGINE) >+ # include <openssl/engine.h> >+ #endif // !defined(OPENSSL_NO_ENGINE) >++#include <openssl/dh.h> >+ #include <openssl/err.h> >++#include <openssl/rsa.h> >+ #include <openssl/x509v3.h> >+ #include "asio/detail/socket_types.hpp" >+ >+--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/error.hpp.orig 2019-09-04 17:33:32 UTC > +++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/error.hpp > @@ -25,6 +25,7 @@ namespace error { > >@@ -128,7 +48,7 @@ > }; > > extern ASIO_DECL >-@@ -34,6 +35,23 @@ static const asio::error_category& ssl_category >+@@ -34,6 +35,23 @@ ASIO_USED_VARIABLE static const asio::error_category& > = asio::error::get_ssl_category(); > > } // namespace error >@@ -152,7 +72,7 @@ > } // namespace asio > > #if defined(ASIO_HAS_STD_SYSTEM_ERROR) >-@@ -44,6 +62,11 @@ template<> struct is_error_code_enum<asio::error::ssl_errors> >+@@ -44,6 +62,11 @@ template<> struct is_error_code_enum<asio::error::ssl_ > static const bool value = true; > }; > >@@ -182,177 +102,7 @@ > } // namespace asio > > #include "asio/detail/pop_options.hpp" >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp >-index 9e76039..8c20e81 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp >-+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp >-@@ -23,7 +23,6 @@ >- >- namespace asio { >- namespace error { >-- >- namespace detail { >- >- class ssl_category : public asio::error_category >-@@ -50,6 +49,38 @@ const asio::error_category& get_ssl_category() >- } >- >- } // namespace error >-+namespace ssl { >-+namespace error { >-+namespace detail { >-+ >-+class stream_category : public asio::error_category >-+{ >-+public: >-+ const char* name() const ASIO_ERROR_CATEGORY_NOEXCEPT >-+ { >-+ return "asio.ssl.stream"; >-+ } >-+ >-+ std::string message(int value) const >-+ { >-+ switch (value) >-+ { >-+ case stream_truncated: return "stream truncated"; >-+ default: return "asio.ssl.stream error"; >-+ } >-+ } >-+}; >-+ >-+} // namespace detail >-+ >-+const asio::error_category& get_stream_category() >-+{ >-+ static detail::stream_category instance; >-+ return instance; >-+} >-+ >-+} // namespace error >-+} // namespace ssl >- } // namespace asio >- >- #include "asio/detail/pop_options.hpp" >-From 5fa80539834c10406611bb02c20cdba2a9171f4a Mon Sep 17 00:00:00 2001 >-From: Christopher Kohlhoff <chris@kohlhoff.com> >-Date: Thu, 19 Nov 2015 10:25:42 +1100 >-Subject: [PATCH] BoringSSL does not provide CONF_modules_unload. >- >---- >- asio/include/asio/ssl/detail/impl/openssl_init.ipp | 2 ++ >- 1 file changed, 2 insertions(+) >- >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-index da66fc1..2a70bf5 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-@@ -70,7 +70,9 @@ public: >- #endif // (OPENSSL_VERSION_NUMBER >= 0x10000000L) >- ::EVP_cleanup(); >- ::CRYPTO_cleanup_all_ex_data(); >-+#if !defined(OPENSSL_IS_BORINGSSL) >- ::CONF_modules_unload(1); >-+#endif // !defined(OPENSSL_IS_BORINGSSL) >- #if !defined(OPENSSL_NO_ENGINE) >- ::ENGINE_cleanup(); >- #endif // !defined(OPENSSL_NO_ENGINE) >-From 062b19c97bb85f4625b46f93ee19b234948ff235 Mon Sep 17 00:00:00 2001 >-From: Marcel Raad <raad@teamviewer.com> >-Date: Fri, 1 Apr 2016 10:46:17 +0200 >-Subject: [PATCH] Add compatibility with OpenSSL 1.1 - SSLv2 has been >- completely removed from OpenSSL, even without OPENSSL_NO_SSL2 - there is a >- new threading API without locking callbacks - struct SSL_CTX has been made >- opaque and must be used via accessor functions - some cleanup functions have >- been removed >- >---- >- asio/include/asio/ssl/detail/impl/engine.ipp | 2 + >- asio/include/asio/ssl/detail/impl/openssl_init.ipp | 20 ++++-- >- asio/include/asio/ssl/impl/context.ipp | 71 +++++++++++++++++----- >- 3 files changed, 72 insertions(+), 21 deletions(-) >- >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp >-index fa5d4b0..22b7cdd 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp >-+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp >-@@ -201,8 +201,10 @@ const asio::error_code& engine::map_error_code( >- >- // SSL v2 doesn't provide a protocol-level shutdown, so an eof on the >- // underlying transport is passed through. >-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >- if (ssl_->version == SSL2_VERSION) >- return ec; >-+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) >- >- // Otherwise, the peer should have negotiated a proper shutdown. >- if ((::SSL_get_shutdown(ssl_) & SSL_RECEIVED_SHUTDOWN) == 0) >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-index 700b678..62a49cd 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-@@ -39,11 +39,13 @@ public: >- ::SSL_load_error_strings(); >- ::OpenSSL_add_all_algorithms(); >- >-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >- mutexes_.resize(::CRYPTO_num_locks()); >- for (size_t i = 0; i < mutexes_.size(); ++i) >- mutexes_[i].reset(new asio::detail::mutex); >- ::CRYPTO_set_locking_callback(&do_init::openssl_locking_func); >- ::CRYPTO_set_id_callback(&do_init::openssl_id_func); >-+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) >- >- #if !defined(SSL_OP_NO_COMPRESSION) \ >- && (OPENSSL_VERSION_NUMBER >= 0x00908000L) >-@@ -60,22 +62,26 @@ public: >- #endif // !defined(SSL_OP_NO_COMPRESSION) >- // && (OPENSSL_VERSION_NUMBER >= 0x00908000L) >- >-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >- ::CRYPTO_set_id_callback(0); >- ::CRYPTO_set_locking_callback(0); >- ::ERR_free_strings(); >--#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) >-- ::ERR_remove_thread_state(NULL); >--#else // (OPENSSL_VERSION_NUMBER >= 0x10000000L) >-- ::ERR_remove_state(0); >--#endif // (OPENSSL_VERSION_NUMBER >= 0x10000000L) >- ::EVP_cleanup(); >- ::CRYPTO_cleanup_all_ex_data(); >-+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) >-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) >-+ ::ERR_remove_state(0); >-+#elif (OPENSSL_VERSION_NUMBER < 0x10100000L) >-+ ::ERR_remove_thread_state(NULL); >-+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L) >- #if !defined(OPENSSL_IS_BORINGSSL) >- ::CONF_modules_unload(1); >- #endif // !defined(OPENSSL_IS_BORINGSSL) >--#if !defined(OPENSSL_NO_ENGINE) >-+#if !defined(OPENSSL_NO_ENGINE) \ >-+ && (OPENSSL_VERSION_NUMBER < 0x10100000L) >- ::ENGINE_cleanup(); >- #endif // !defined(OPENSSL_NO_ENGINE) >-+ // && (OPENSSL_VERSION_NUMBER < 0x10100000L) >- } >- >- #if !defined(SSL_OP_NO_COMPRESSION) \ >-@@ -104,10 +110,12 @@ private: >- static void openssl_locking_func(int mode, int n, >- const char* /*file*/, int /*line*/) >- { >-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >- if (mode & CRYPTO_LOCK) >- instance()->mutexes_[n]->lock(); >- else >- instance()->mutexes_[n]->unlock(); >-+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) >- } >- >- // Mutexes to be used in locking callbacks. >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp >-index 02210d9..fde7709 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp >+--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp.orig 2019-10-05 03:09:25 UTC > +++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp > @@ -66,7 +66,8 @@ context::context(context::method m) > >@@ -405,7 +155,7 @@ > } > > if (SSL_CTX_get_app_data(handle_)) >-@@ -528,10 +540,17 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain( >+@@ -528,10 +540,17 @@ asio::error_code context::use_certificate_chain( > bio_cleanup bio = { make_buffer_bio(chain) }; > if (bio.p) > { >@@ -425,7 +175,7 @@ > if (!cert.p) > { > ec = asio::error_code(ERR_R_PEM_LIB, >-@@ -559,8 +578,8 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain( >+@@ -559,8 +578,8 @@ asio::error_code context::use_certificate_chain( > #endif // (OPENSSL_VERSION_NUMBER >= 0x10002000L) > > while (X509* cacert = ::PEM_read_bio_X509(bio.p, 0, >@@ -436,7 +186,7 @@ > { > if (!::SSL_CTX_add_extra_chain_cert(handle_, cacert)) > { >-@@ -625,6 +644,14 @@ ASIO_SYNC_OP_VOID context::use_private_key( >+@@ -625,6 +644,14 @@ asio::error_code context::use_private_key( > { > ::ERR_clear_error(); > >@@ -451,7 +201,7 @@ > bio_cleanup bio = { make_buffer_bio(private_key) }; > if (bio.p) > { >-@@ -636,8 +663,8 @@ ASIO_SYNC_OP_VOID context::use_private_key( >+@@ -636,8 +663,8 @@ asio::error_code context::use_private_key( > break; > case context_base::pem: > evp_private_key.p = ::PEM_read_bio_PrivateKey( >@@ -462,7 +212,7 @@ > break; > default: > { >-@@ -684,6 +711,14 @@ ASIO_SYNC_OP_VOID context::use_rsa_private_key( >+@@ -684,6 +711,14 @@ asio::error_code context::use_rsa_private_key( > { > ::ERR_clear_error(); > >@@ -477,7 +227,7 @@ > bio_cleanup bio = { make_buffer_bio(private_key) }; > if (bio.p) > { >-@@ -695,8 +730,8 @@ ASIO_SYNC_OP_VOID context::use_rsa_private_key( >+@@ -695,8 +730,8 @@ asio::error_code context::use_rsa_private_key( > break; > case context_base::pem: > rsa_private_key.p = ::PEM_read_bio_RSAPrivateKey( >@@ -488,8 +238,8 @@ > break; > default: > { >-@@ -915,11 +950,17 @@ int context::verify_callback_function(int preverified, X509_STORE_CTX* ctx) >- ASIO_SYNC_OP_VOID context::do_set_password_callback( >+@@ -915,11 +950,17 @@ int context::verify_callback_function(int preverified, >+ asio::error_code context::do_set_password_callback( > detail::password_callback_base* callback, asio::error_code& ec) > { > - if (handle_->default_passwd_callback_userdata) >@@ -510,157 +260,52 @@ > > SSL_CTX_set_default_passwd_cb(handle_, &context::password_callback_function); > >-From 69e44a4cc6eb5ba21ede409779a7b777c0eb3869 Mon Sep 17 00:00:00 2001 >-From: Christopher Kohlhoff <chris@kohlhoff.com> >-Date: Sun, 28 Aug 2016 10:02:08 +1000 >-Subject: [PATCH] Fix errors when OPENSSL_NO_DEPRECATED is defined. >- >---- >- asio/include/asio/ssl/detail/impl/openssl_init.ipp | 23 +++++++++++----------- >- asio/include/asio/ssl/detail/openssl_types.hpp | 2 ++ >- 2 files changed, 13 insertions(+), 12 deletions(-) >- >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-index 62a49cd..4cc9859 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-@@ -44,8 +44,10 @@ public: >- for (size_t i = 0; i < mutexes_.size(); ++i) >- mutexes_[i].reset(new asio::detail::mutex); >- ::CRYPTO_set_locking_callback(&do_init::openssl_locking_func); >-- ::CRYPTO_set_id_callback(&do_init::openssl_id_func); >- #endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) >-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) >-+ ::CRYPTO_set_id_callback(&do_init::openssl_id_func); >-+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L) >+--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp.orig 2019-09-04 17:33:32 UTC >++++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp >+@@ -23,7 +23,6 @@ > >- #if !defined(SSL_OP_NO_COMPRESSION) \ >- && (OPENSSL_VERSION_NUMBER >= 0x00908000L) >-@@ -62,8 +64,10 @@ public: >- #endif // !defined(SSL_OP_NO_COMPRESSION) >- // && (OPENSSL_VERSION_NUMBER >= 0x00908000L) >- >--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) >- ::CRYPTO_set_id_callback(0); >-+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L) >-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >- ::CRYPTO_set_locking_callback(0); >- ::ERR_free_strings(); >- ::EVP_cleanup(); >-@@ -94,38 +98,33 @@ public: >- // && (OPENSSL_VERSION_NUMBER >= 0x00908000L) >- >- private: >-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L) >- static unsigned long openssl_id_func() >- { >- #if defined(ASIO_WINDOWS) || defined(__CYGWIN__) >- return ::GetCurrentThreadId(); >- #else // defined(ASIO_WINDOWS) || defined(__CYGWIN__) >-- void* id = instance()->thread_id_; >-- if (id == 0) >-- instance()->thread_id_ = id = &id; // Ugh. >-+ void* id = &errno; >- ASIO_ASSERT(sizeof(unsigned long) >= sizeof(void*)); >- return reinterpret_cast<unsigned long>(id); >- #endif // defined(ASIO_WINDOWS) || defined(__CYGWIN__) >- } >-+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L) >- >-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >- static void openssl_locking_func(int mode, int n, >- const char* /*file*/, int /*line*/) >- { >--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >- if (mode & CRYPTO_LOCK) >- instance()->mutexes_[n]->lock(); >- else >- instance()->mutexes_[n]->unlock(); >--#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) >- } >- >- // Mutexes to be used in locking callbacks. >- std::vector<asio::detail::shared_ptr< >- asio::detail::mutex> > mutexes_; >+ namespace asio { >+ namespace error { > - >--#if !defined(ASIO_WINDOWS) && !defined(__CYGWIN__) >-- // The thread identifiers to be used by openssl. >-- asio::detail::tss_ptr<void> thread_id_; >--#endif // !defined(ASIO_WINDOWS) && !defined(__CYGWIN__) >-+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) >+ namespace detail { > >- #if !defined(SSL_OP_NO_COMPRESSION) \ >- && (OPENSSL_VERSION_NUMBER >= 0x00908000L) >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp >-index d9cfc71..eda740d 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp >-+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp >-@@ -21,7 +21,9 @@ >- #if !defined(OPENSSL_NO_ENGINE) >- # include <openssl/engine.h> >- #endif // !defined(OPENSSL_NO_ENGINE) >-+#include <openssl/dh.h> >- #include <openssl/err.h> >-+#include <openssl/rsa.h> >- #include <openssl/x509v3.h> >- #include "asio/detail/socket_types.hpp" >+ class ssl_category : public asio::error_category >+@@ -50,6 +49,38 @@ const asio::error_category& get_ssl_category() >+ } > >-From 2cde22623ca0fd9571d8d57c5a8965082d815e1c Mon Sep 17 00:00:00 2001 >-From: Christopher Kohlhoff <chris@kohlhoff.com> >-Date: Tue, 13 Sep 2016 21:59:03 +1000 >-Subject: [PATCH] Call SSL_COMP_free_compression_methods() on ssl cleanup. >- >-This call is needed for OpenSSL >=1.0.2 and <1.1.0. >---- >- asio/include/asio/ssl/detail/impl/openssl_init.ipp | 5 +++++ >- 1 file changed, 5 insertions(+) >- >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-index 4cc9859..392eff9 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-@@ -78,6 +78,11 @@ public: >- #elif (OPENSSL_VERSION_NUMBER < 0x10100000L) >- ::ERR_remove_thread_state(NULL); >- #endif // (OPENSSL_VERSION_NUMBER < 0x10000000L) >-+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) \ >-+ && (OPENSSL_VERSION_NUMBER < 0x10100000L) >-+ ::SSL_COMP_free_compression_methods(); >-+#endif // (OPENSSL_VERSION_NUMBER >= 0x10002000L) >-+ // && (OPENSSL_VERSION_NUMBER < 0x10100000L) >- #if !defined(OPENSSL_IS_BORINGSSL) >- ::CONF_modules_unload(1); >- #endif // !defined(OPENSSL_IS_BORINGSSL) >-From dc2b5b9ac09326ba1e38a28b48170063ca2b1332 Mon Sep 17 00:00:00 2001 >-From: Marcel Raad <MarcelRaad@users.noreply.github.com> >-Date: Mon, 31 Oct 2016 10:32:19 +0100 >-Subject: [PATCH] Fix compilation with OpenSSL 1.1 API >- >-With OPENSSL_API_COMPAT=0x10100000L, SSL_library_init, SSL_load_error_strings, and OpenSSL_add_all_algorithms are removed. >-With OPENSSL_API_COMPAT=0x10000000L, these are function-style macros mapping to OPENSSL_init_ssl, which is called automatically anyway. >- >-References: >-https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html >-https://www.openssl.org/docs/man1.1.0/crypto/OPENSSL_init_crypto.html >---- >- asio/include/asio/ssl/detail/impl/openssl_init.ipp | 2 +- >- 1 file changed, 1 insertion(+), 1 deletion(-) >- >-diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-index 392eff9..5de0caa 100644 >---- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp >-@@ -35,11 +35,11 @@ class openssl_init_base::do_init >- public: >- do_init() >- { >-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >- ::SSL_library_init(); >- ::SSL_load_error_strings(); >- ::OpenSSL_add_all_algorithms(); >+ } // namespace error >++namespace ssl { >++namespace error { >++namespace detail { >++ >++class stream_category : public asio::error_category >++{ >++public: >++ const char* name() const ASIO_ERROR_CATEGORY_NOEXCEPT >++ { >++ return "asio.ssl.stream"; >++ } >++ >++ std::string message(int value) const >++ { >++ switch (value) >++ { >++ case stream_truncated: return "stream truncated"; >++ default: return "asio.ssl.stream error"; >++ } >++ } >++}; >++ >++} // namespace detail >++ >++const asio::error_category& get_stream_category() >++{ >++ static detail::stream_category instance; >++ return instance; >++} >++ >++} // namespace error >++} // namespace ssl >+ } // namespace asio > >--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) >- mutexes_.resize(::CRYPTO_num_locks()); >- for (size_t i = 0; i < mutexes_.size(); ++i) >- mutexes_[i].reset(new asio::detail::mutex); >+ #include "asio/detail/pop_options.hpp" >diff -rNu mongodb34.22/files/patch-src_mongo_db_repl_oplog__fetcher.cpp mongodb34.23/files/patch-src_mongo_db_repl_oplog__fetcher.cpp >--- mongodb34.22/files/patch-src_mongo_db_repl_oplog__fetcher.cpp 2018-02-02 10:55:51.000000000 +0100 >+++ mongodb34.23/files/patch-src_mongo_db_repl_oplog__fetcher.cpp 2019-10-05 14:05:29.381076000 +0200 >@@ -1,9 +1,9 @@ > https://jira.mongodb.org/browse/SERVER-32516 > https://github.com/mongodb/mongo/commit/3c34eda8d8a3 > >---- src/mongo/db/repl/oplog_fetcher.cpp.orig 2017-09-07 19:28:48 UTC >+--- src/mongo/db/repl/oplog_fetcher.cpp.orig 2019-09-04 17:33:32 UTC > +++ src/mongo/db/repl/oplog_fetcher.cpp >-@@ -265,7 +265,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p >+@@ -282,7 +282,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p > if (!metadataResult.isOK()) { > return metadataResult.getStatus(); > } >diff -rNu mongodb34.22/files/patch-src_mongo_util_net_ssl__manager.cpp mongodb34.23/files/patch-src_mongo_util_net_ssl__manager.cpp >--- mongodb34.22/files/patch-src_mongo_util_net_ssl__manager.cpp 2019-02-04 17:20:23.000000000 +0100 >+++ mongodb34.23/files/patch-src_mongo_util_net_ssl__manager.cpp 2019-10-05 14:05:29.394571000 +0200 >@@ -1,6 +1,6 @@ >---- src/mongo/util/net/ssl_manager.cpp.orig 2018-08-29 22:42:21.000000000 +0200 >-+++ src/mongo/util/net/ssl_manager.cpp 2018-12-23 21:05:48.170857000 +0100 >-@@ -158,7 +158,7 @@ >+--- src/mongo/util/net/ssl_manager.cpp.orig 2019-09-04 17:33:32 UTC >++++ src/mongo/util/net/ssl_manager.cpp >+@@ -167,7 +167,7 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(ASN1_SEQUE > #endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS > // clang-format on > >diff -rNu mongodb34.22/files/patch-src_mongo_util_net_ssl__manager.h mongodb34.23/files/patch-src_mongo_util_net_ssl__manager.h >--- mongodb34.22/files/patch-src_mongo_util_net_ssl__manager.h 2019-02-04 17:20:23.000000000 +0100 >+++ mongodb34.23/files/patch-src_mongo_util_net_ssl__manager.h 2019-10-05 14:05:29.408264000 +0200 >@@ -1,6 +1,6 @@ >---- src/mongo/util/net/ssl_manager.h.orig 2019-02-04 15:20:46.451365000 +0100 >-+++ src/mongo/util/net/ssl_manager.h 2019-02-04 15:20:15.688896000 +0100 >-@@ -222,6 +222,7 @@ >+--- src/mongo/util/net/ssl_manager.h.orig 2019-09-04 17:33:32 UTC >++++ src/mongo/util/net/ssl_manager.h >+@@ -222,6 +222,7 @@ enum class TLSVersion { > kTLS10, > kTLS11, > kTLS12,
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=208113">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
ronald-lists
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 241078
:
208113
|
208116