Attachment #199456 for bug #230698

Lines 56-61 Link Here

(-)/home/builder/mongodb34/Makefile (+1 lines)
56		56
57	SSL_USES= ssl	57	SSL_USES= ssl
58	SSL_MAKE_ARGS= --ssl	58	SSL_MAKE_ARGS= --ssl
		59	SSL_CXXFLAGS+= -DOPENSSL_NO_SSL2
59		60
60	.include <bsd.port.options.mk>	61	.include <bsd.port.options.mk>
61		62




--- SConstruct.orig	2018-07-02 04:44:42 UTC
+++ SConstruct
@@ -936,9 +936,9 @@ if has_option('variables-help'):
     print env_vars.GenerateHelpText(env)
     Exit(0)
 

 
 def set_config_header_define(env, varname, varval = 1):
     env['CONFIG_HEADER_DEFINES'][varname] = varval
@@ -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(

                 PROGLINKFLAGS=['-pie'],
             )
 
@@ -1571,7 +1571,7 @@ if env.TargetOSIs('posix'):
                          "-Wno-unknown-pragmas",
                          "-Winvalid-pch"] )
     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet

         if not has_option("disable-warnings-as-errors"):
             env.Append( CCFLAGS=["-Werror"] )
 
@@ -1599,19 +1599,19 @@ if env.TargetOSIs('posix'):
         env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
         env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
 

 
 mmapv1 = False
 if get_option('mmapv1') == 'auto':
@@ -2468,7 +2468,7 @@ def doConfigure(myenv):
         }}
         """.format(storage_class)
         context.Message('Checking for storage class {0} '.format(storage_class))

Lines 1-9 Link Here

(-)/home/builder/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp (-2 / +2 lines)
1	https://jira.mongodb.org/browse/SERVER-32516	1	https://jira.mongodb.org/browse/SERVER-32516
2	https://github.com/mongodb/mongo/commit/3c34eda8d8a3	2	https://github.com/mongodb/mongo/commit/3c34eda8d8a3
3		3
4	--- src/mongo/db/repl/oplog_fetcher.cpp.orig 2017-09-07 19:28:48 UTC	4	--- src/mongo/db/repl/oplog_fetcher.cpp.orig 2018-07-02 04:44:42 UTC
5	+++ src/mongo/db/repl/oplog_fetcher.cpp	5	+++ src/mongo/db/repl/oplog_fetcher.cpp
6	@@ -265,7 +265,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p	6	@@ -275,7 +275,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p
7	if (!metadataResult.isOK()) {	7	if (!metadataResult.isOK()) {
8	return metadataResult.getStatus();	8	return metadataResult.getStatus();
9	}	9	}

Lines 1-6 Link Here

(-)/home/builder/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp (-2 / +2 lines)
1	--- src/mongo/util/net/ssl_manager.cpp.orig 2017-06-08 16:11:03 UTC	1	--- src/mongo/util/net/ssl_manager.cpp.orig 2018-07-02 04:44:42 UTC
2	+++ src/mongo/util/net/ssl_manager.cpp	2	+++ src/mongo/util/net/ssl_manager.cpp
3	@@ -125,7 +125,7 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(ASN1_SEQUE	3	@@ -152,7 +152,7 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(ASN1_SEQUE
4	#endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS	4	#endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS
5	// clang-format on	5	// clang-format on
6		6




--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp.orig	2018-11-22 19:29:49 UTC
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp
@@ -198,23 +198,37 @@ 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_))
   {
+#ifdef SSL_R_SHORT_READ
     ec = asio::error_code(
         ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ),
         asio::error::get_ssl_category());
+#else
+    int sys_error = static_cast<int>(::ERR_get_error());
+    ec = asio::error_code(
+        sys_error,
+        asio::error::get_ssl_category());
+#endif
     return ec;
   }
 
   // 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_ && SSL_version(ssl_) == SSL2_VERSION)
     return ec;
 
   // Otherwise, the peer should have negotiated a proper shutdown.
   if ((::SSL_get_shutdown(ssl_) & SSL_RECEIVED_SHUTDOWN) == 0)
   {
+#ifdef SSL_R_SHORT_READ
     ec = asio::error_code(
         ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ),
         asio::error::get_ssl_category());
+#else
+    int sys_error = static_cast<int>(::ERR_get_error());
+    ec = asio::error_code(
+        sys_error,
+        asio::error::get_ssl_category());
+#endif
   }
 
   return ec;




--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp.orig	2018-11-22 19:30:49 UTC
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp
@@ -192,13 +192,13 @@ context::~context()
 {
   if (handle_)
   {
-    if (handle_->default_passwd_callback_userdata)
+    if (SSL_CTX_get_default_passwd_cb_userdata(handle_))
     {
       detail::password_callback_base* callback =
         static_cast<detail::password_callback_base*>(
-            handle_->default_passwd_callback_userdata);
+            SSL_CTX_get_default_passwd_cb_userdata(handle_));
       delete callback;
-      handle_->default_passwd_callback_userdata = 0;
+      SSL_CTX_set_default_passwd_cb_userdata(handle_, 0);
     }
 
     if (SSL_CTX_get_app_data(handle_))
@@ -530,8 +530,8 @@ asio::error_code context::use_certificate_chain(
   {
     x509_cleanup cert = {
       ::PEM_read_bio_X509_AUX(bio.p, 0,
-          handle_->default_passwd_callback,
-          handle_->default_passwd_callback_userdata) };
+          SSL_CTX_get_default_passwd_cb(handle_),
+          SSL_CTX_get_default_passwd_cb_userdata(handle_)) };
     if (!cert.p)
     {
       ec = asio::error_code(ERR_R_PEM_LIB,
@@ -548,15 +548,17 @@ asio::error_code context::use_certificate_chain(
       return ec;
     }
 
-    if (handle_->extra_certs)
+    STACK_OF(X509) *extra_certs;
+    SSL_CTX_get_extra_chain_certs_only(handle_, &extra_certs);
+    if (extra_certs)
     {
-      ::sk_X509_pop_free(handle_->extra_certs, X509_free);
-      handle_->extra_certs = 0;
+      ::sk_X509_pop_free(extra_certs, X509_free);
+      SSL_CTX_clear_extra_chain_certs(handle_);
     }
 
     while (X509* cacert = ::PEM_read_bio_X509(bio.p, 0,
-          handle_->default_passwd_callback,
-          handle_->default_passwd_callback_userdata))
+          SSL_CTX_get_default_passwd_cb(handle_),
+          SSL_CTX_get_default_passwd_cb_userdata(handle_)))
     {
       if (!::SSL_CTX_add_extra_chain_cert(handle_, cacert))
       {
@@ -632,8 +634,8 @@ asio::error_code context::use_private_key(
       break;
     case context_base::pem:
       evp_private_key.p = ::PEM_read_bio_PrivateKey(
-          bio.p, 0, handle_->default_passwd_callback,
-          handle_->default_passwd_callback_userdata);
+          bio.p, 0, SSL_CTX_get_default_passwd_cb(handle_),
+          SSL_CTX_get_default_passwd_cb_userdata(handle_));
       break;
     default:
       {
@@ -691,8 +693,8 @@ asio::error_code context::use_rsa_private_key(
       break;
     case context_base::pem:
       rsa_private_key.p = ::PEM_read_bio_RSAPrivateKey(
-          bio.p, 0, handle_->default_passwd_callback,
-          handle_->default_passwd_callback_userdata);
+          bio.p, 0, SSL_CTX_get_default_passwd_cb(handle_),
+          SSL_CTX_get_default_passwd_cb_userdata(handle_));
       break;
     default:
       {
@@ -911,11 +913,11 @@ 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)
+  if (SSL_CTX_get_default_passwd_cb_userdata(handle_))
     delete static_cast<detail::password_callback_base*>(
-        handle_->default_passwd_callback_userdata);
+        SSL_CTX_get_default_passwd_cb_userdata(handle_));
 
-  handle_->default_passwd_callback_userdata = callback;
+  SSL_CTX_set_default_passwd_cb_userdata(handle_, callback);
 
   SSL_CTX_set_default_passwd_cb(handle_, &context::password_callback_function);
 




In file included from src/third_party/yaml-cpp-0.5.3/src/convert.cpp:3:
In file included from src/third_party/yaml-cpp-0.5.3/include/yaml-cpp/node/convert.h:17:
In file included from src/third_party/yaml-cpp-0.5.3/include/yaml-cpp/node/impl.h:11:
In file included from src/third_party/yaml-cpp-0.5.3/include/yaml-cpp/node/iterator.h:13:
src/third_party/yaml-cpp-0.5.3/include/yaml-cpp/node/detail/iterator.h:48:54: error: no member named 'next' in namespace 'boost'
  void increment() { this->base_reference() = boost::next(this->base()); }
                                              ~~~~~~~^

--- src/third_party/yaml-cpp-0.5.3/include/yaml-cpp/node/detail/iterator.h.orig	2018-07-02 04:44:42 UTC
+++ src/third_party/yaml-cpp-0.5.3/include/yaml-cpp/node/detail/iterator.h
@@ -11,7 +11,13 @@
 #include "yaml-cpp/node/ptr.h"
 #include "yaml-cpp/node/detail/node_iterator.h"
 #include <boost/iterator/iterator_adaptor.hpp>
+
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106700
 #include <boost/utility.hpp>
+#else
+#include <boost/next_prior.hpp>
+#endif
 
 namespace YAML {
 namespace detail {

Return to bug 230698

Lines 1-6 Link Here

(-)/home/builder/mongodb34/files/patch-SConstruct (-6 / +6 lines)
1	--- SConstruct.orig 2017-06-08 16:11:03 UTC	1	--- SConstruct.orig 2018-07-02 04:44:42 UTC
2	+++ SConstruct	2	+++ SConstruct
3	@@ -929,9 +929,9 @@ if has_option('variables-help'):	3	@@ -936,9 +936,9 @@ if has_option('variables-help'):
4	print env_vars.GenerateHelpText(env)	4	print env_vars.GenerateHelpText(env)
5	Exit(0)	5	Exit(0)
6		6
Lines 13-19 Link Here
13		13
14	def set_config_header_define(env, varname, varval = 1):	14	def set_config_header_define(env, varname, varval = 1):
15	env['CONFIG_HEADER_DEFINES'][varname] = varval	15	env['CONFIG_HEADER_DEFINES'][varname] = varval
16	@@ -1550,7 +1550,7 @@ if env.TargetOSIs('posix'):	16	@@ -1557,7 +1557,7 @@ if env.TargetOSIs('posix'):
17	# If runtime hardening is requested, then build anything	17	# If runtime hardening is requested, then build anything
18	# destined for an executable with the necessary flags for PIE.	18	# destined for an executable with the necessary flags for PIE.
19	env.AppendUnique(	19	env.AppendUnique(
Lines 22-28 Link Here
22	PROGLINKFLAGS=['-pie'],	22	PROGLINKFLAGS=['-pie'],
23	)	23	)
24		24
25	@@ -1564,7 +1564,7 @@ if env.TargetOSIs('posix'):	25	@@ -1571,7 +1571,7 @@ if env.TargetOSIs('posix'):
26	"-Wno-unknown-pragmas",	26	"-Wno-unknown-pragmas",
27	"-Winvalid-pch"] )	27	"-Winvalid-pch"] )
28	# env.Append( " -Wconversion" ) TODO: this doesn't really work yet	28	# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
Lines 31-37 Link Here
31	if not has_option("disable-warnings-as-errors"):	31	if not has_option("disable-warnings-as-errors"):
32	env.Append( CCFLAGS=["-Werror"] )	32	env.Append( CCFLAGS=["-Werror"] )
33		33
34	@@ -1592,19 +1592,19 @@ if env.TargetOSIs('posix'):	34	@@ -1599,19 +1599,19 @@ if env.TargetOSIs('posix'):
35	env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] )	35	env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
36	env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )	36	env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
37		37
Lines 61-67 Link Here
61		61
62	mmapv1 = False	62	mmapv1 = False
63	if get_option('mmapv1') == 'auto':	63	if get_option('mmapv1') == 'auto':
64	@@ -2461,7 +2461,7 @@ def doConfigure(myenv):	64	@@ -2468,7 +2468,7 @@ def doConfigure(myenv):
65	}}	65	}}
66	""".format(storage_class)	66	""".format(storage_class)
67	context.Message('Checking for storage class {0} '.format(storage_class))	67	context.Message('Checking for storage class {0} '.format(storage_class))

Line 0 Link Here

(-)/home/builder/mongodb34/files/patch-src_third__party_asio-asio-1-11-0_asio_include_asio_ssl_detail_impl_engine.ipp (+41 lines)
	1	--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp.orig 2018-11-22 19:29:49 UTC
	2	+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp
	3	@@ -198,23 +198,37 @@ const asio::error_code& engine::map_error_code(
	4	// If there's data yet to be read, it's an error.
	5	if (BIO_wpending(ext_bio_))
	6	{
	7	+#ifdef SSL_R_SHORT_READ
	8	ec = asio::error_code(
	9	ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ),
	10	asio::error::get_ssl_category());
	11	+#else
	12	+ int sys_error = static_cast<int>(::ERR_get_error());
	13	+ ec = asio::error_code(
	14	+ sys_error,
	15	+ asio::error::get_ssl_category());
	16	+#endif
	17	return ec;
	18	}
	19
	20	// SSL v2 doesn't provide a protocol-level shutdown, so an eof on the
	21	// underlying transport is passed through.
	22	- if (ssl_ && ssl_->version == SSL2_VERSION)
	23	+ if (ssl_ && SSL_version(ssl_) == SSL2_VERSION)
	24	return ec;
	25
	26	// Otherwise, the peer should have negotiated a proper shutdown.
	27	if ((::SSL_get_shutdown(ssl_) & SSL_RECEIVED_SHUTDOWN) == 0)
	28	{
	29	+#ifdef SSL_R_SHORT_READ
	30	ec = asio::error_code(
	31	ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ),
	32	asio::error::get_ssl_category());
	33	+#else
	34	+ int sys_error = static_cast<int>(::ERR_get_error());
	35	+ ec = asio::error_code(
	36	+ sys_error,
	37	+ asio::error::get_ssl_category());
	38	+#endif
	39	}
	40
	41	return ec;

Line 0 Link Here

(-)/home/builder/mongodb34/files/patch-src_third__party_yaml-cpp-0.5.3_include_yaml-cpp_node_detail_iterator.h (+24 lines)
	1	In file included from src/third_party/yaml-cpp-0.5.3/src/convert.cpp:3:
	2	In file included from src/third_party/yaml-cpp-0.5.3/include/yaml-cpp/node/convert.h:17:
	3	In file included from src/third_party/yaml-cpp-0.5.3/include/yaml-cpp/node/impl.h:11:
	4	In file included from src/third_party/yaml-cpp-0.5.3/include/yaml-cpp/node/iterator.h:13:
	5	src/third_party/yaml-cpp-0.5.3/include/yaml-cpp/node/detail/iterator.h:48:54: error: no member named 'next' in namespace 'boost'
	6	void increment() { this->base_reference() = boost::next(this->base()); }
	7	~~~~~~~^
	8
	9	--- src/third_party/yaml-cpp-0.5.3/include/yaml-cpp/node/detail/iterator.h.orig 2018-07-02 04:44:42 UTC
	10	+++ src/third_party/yaml-cpp-0.5.3/include/yaml-cpp/node/detail/iterator.h
	11	@@ -11,7 +11,13 @@
	12	#include "yaml-cpp/node/ptr.h"
	13	#include "yaml-cpp/node/detail/node_iterator.h"
	14	#include <boost/iterator/iterator_adaptor.hpp>
	15	+
	16	+#include <boost/version.hpp>
	17	+#if BOOST_VERSION < 106700
	18	#include <boost/utility.hpp>
	19	+#else
	20	+#include <boost/next_prior.hpp>
	21	+#endif
	22
	23	namespace YAML {
	24	namespace detail {