mongodb: use patches from boost.
This commit is contained in:
parent
04ed37792b
commit
9f2f44af19
3 changed files with 66 additions and 68 deletions
|
@ -1,57 +0,0 @@
|
||||||
--- ./src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp 2016-03-31 13:04:25.438868316 +0200
|
|
||||||
+++ ./src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp.orig 2016-03-31 12:59:17.062891396 +0200
|
|
||||||
@@ -85,13 +85,13 @@ context::context(context::method m)
|
|
||||||
break;
|
|
||||||
#endif // defined(OPENSSL_NO_SSL2)
|
|
||||||
case context::sslv3:
|
|
||||||
- handle_ = ::SSL_CTX_new(::SSLv3_method());
|
|
||||||
+ handle_ = ::SSL_CTX_new(::SSLv23_method());
|
|
||||||
break;
|
|
||||||
case context::sslv3_client:
|
|
||||||
- handle_ = ::SSL_CTX_new(::SSLv3_client_method());
|
|
||||||
+ handle_ = ::SSL_CTX_new(::SSLv23_client_method());
|
|
||||||
break;
|
|
||||||
case context::sslv3_server:
|
|
||||||
- handle_ = ::SSL_CTX_new(::SSLv3_server_method());
|
|
||||||
+ handle_ = ::SSL_CTX_new(::SSLv23_server_method());
|
|
||||||
break;
|
|
||||||
case context::tlsv1:
|
|
||||||
handle_ = ::SSL_CTX_new(::TLSv1_method());
|
|
||||||
--- ./src/third_party/boost-1.56.0/boost/asio/ssl/old/detail/openssl_context_service.hpp 2016-03-31 13:04:25.439868316 +0200
|
|
||||||
+++ ./src/third_party/boost-1.56.0/boost/asio/ssl/old/detail/openssl_context_service.hpp.orig 2016-03-31 12:59:25.732890747 +0200
|
|
||||||
@@ -86,13 +86,13 @@ public:
|
|
||||||
break;
|
|
||||||
#endif // defined(OPENSSL_NO_SSL2)
|
|
||||||
case context_base::sslv3:
|
|
||||||
- impl = ::SSL_CTX_new(::SSLv3_method());
|
|
||||||
+ impl = ::SSL_CTX_new(::SSLv23_method());
|
|
||||||
break;
|
|
||||||
case context_base::sslv3_client:
|
|
||||||
- impl = ::SSL_CTX_new(::SSLv3_client_method());
|
|
||||||
+ impl = ::SSL_CTX_new(::SSLv23_client_method());
|
|
||||||
break;
|
|
||||||
case context_base::sslv3_server:
|
|
||||||
- impl = ::SSL_CTX_new(::SSLv3_server_method());
|
|
||||||
+ impl = ::SSL_CTX_new(::SSLv23_server_method());
|
|
||||||
break;
|
|
||||||
case context_base::tlsv1:
|
|
||||||
impl = ::SSL_CTX_new(::TLSv1_method());
|
|
||||||
--- ./src/third_party/boost-1.56.0/boost/asio/ssl/impl/context.ipp 2016-03-31 13:04:25.440868316 +0200
|
|
||||||
+++ ./src/third_party/boost-1.56.0/boost/asio/ssl/impl/context.ipp.orig 2016-03-31 12:59:31.745890297 +0200
|
|
||||||
@@ -88,13 +88,13 @@ context::context(context::method m)
|
|
||||||
break;
|
|
||||||
#endif // defined(OPENSSL_NO_SSL2)
|
|
||||||
case context::sslv3:
|
|
||||||
- handle_ = ::SSL_CTX_new(::SSLv3_method());
|
|
||||||
+ handle_ = ::SSL_CTX_new(::SSLv23_method());
|
|
||||||
break;
|
|
||||||
case context::sslv3_client:
|
|
||||||
- handle_ = ::SSL_CTX_new(::SSLv3_client_method());
|
|
||||||
+ handle_ = ::SSL_CTX_new(::SSLv23_client_method());
|
|
||||||
break;
|
|
||||||
case context::sslv3_server:
|
|
||||||
- handle_ = ::SSL_CTX_new(::SSLv3_server_method());
|
|
||||||
+ handle_ = ::SSL_CTX_new(::SSLv23_server_method());
|
|
||||||
break;
|
|
||||||
case context::tlsv1:
|
|
||||||
handle_ = ::SSL_CTX_new(::TLSv1_method());
|
|
51
srcpkgs/mongodb/patches/libressl-2.3.patch
Normal file
51
srcpkgs/mongodb/patches/libressl-2.3.patch
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
--- ./src/third_party/boost-1.56.0/boost/asio/ssl/impl/context.ipp.orig 2016-03-30 12:59:18.922289572 +0200
|
||||||
|
+++ ./src/third_party/boost-1.56.0/boost/asio/ssl/impl/context.ipp 2016-03-30 13:01:04.776294357 +0200
|
||||||
|
@@ -89,6 +89,14 @@
|
||||||
|
handle_ = ::SSL_CTX_new(::SSLv2_server_method());
|
||||||
|
break;
|
||||||
|
#endif // defined(OPENSSL_NO_SSL2)
|
||||||
|
+#if defined(OPENSSL_NO_SSL3)
|
||||||
|
+ case context::sslv3:
|
||||||
|
+ case context::sslv3_client:
|
||||||
|
+ case context::sslv3_server:
|
||||||
|
+ boost::asio::detail::throw_error(
|
||||||
|
+ boost::asio::error::invalid_argument, "context");
|
||||||
|
+ break;
|
||||||
|
+#else // defined(OPENSSL_NO_SSL3)
|
||||||
|
case context::sslv3:
|
||||||
|
handle_ = ::SSL_CTX_new(::SSLv3_method());
|
||||||
|
break;
|
||||||
|
@@ -98,6 +106,7 @@
|
||||||
|
case context::sslv3_server:
|
||||||
|
handle_ = ::SSL_CTX_new(::SSLv3_server_method());
|
||||||
|
break;
|
||||||
|
+#endif // defined(OPENSSL_NO_SSL3)
|
||||||
|
case context::tlsv1:
|
||||||
|
handle_ = ::SSL_CTX_new(::TLSv1_method());
|
||||||
|
break;
|
||||||
|
--- ./src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp.orig 2016-03-31 22:11:13.174064858 +0200
|
||||||
|
+++ ./src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp 2016-03-31 22:12:35.459058700 +0200
|
||||||
|
@@ -84,6 +84,14 @@ context::context(context::method m)
|
||||||
|
handle_ = ::SSL_CTX_new(::SSLv2_server_method());
|
||||||
|
break;
|
||||||
|
#endif // defined(OPENSSL_NO_SSL2)
|
||||||
|
+#if defined(OPENSSL_NO_SSL3)
|
||||||
|
+ case context::sslv3:
|
||||||
|
+ case context::sslv3_client:
|
||||||
|
+ case context::sslv3_server:
|
||||||
|
+ boost::asio::detail::throw_error(
|
||||||
|
+ boost::asio::error::invalid_argument, "context");
|
||||||
|
+ break;
|
||||||
|
+#else // defined(OPENSSL_NO_SSL3)
|
||||||
|
case context::sslv3:
|
||||||
|
handle_ = ::SSL_CTX_new(::SSLv3_method());
|
||||||
|
break;
|
||||||
|
@@ -93,6 +101,7 @@ context::context(context::method m)
|
||||||
|
case context::sslv3_server:
|
||||||
|
handle_ = ::SSL_CTX_new(::SSLv3_server_method());
|
||||||
|
break;
|
||||||
|
+#endif // defined(OPENSSL_NO_SSL3)
|
||||||
|
case context::tlsv1:
|
||||||
|
handle_ = ::SSL_CTX_new(::TLSv1_method());
|
||||||
|
break;
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
# Template file for 'mongodb'
|
# Template file for 'mongodb'
|
||||||
pkgname=mongodb
|
pkgname=mongodb
|
||||||
version=3.2.4
|
version=3.2.4
|
||||||
revision=2
|
revision=4
|
||||||
hostmakedepends="scons"
|
hostmakedepends="scons"
|
||||||
makedepends="boost-devel pcre-devel snappy-devel libressl-devel libpcap-devel
|
makedepends="boost-devel pcre-devel snappy-devel libressl-devel libpcap-devel
|
||||||
gperftools-devel libsasl-devel yaml-cpp-devel valgrind-devel"
|
gperftools-devel libsasl-devel yaml-cpp-devel valgrind-devel wiredtiger-devel"
|
||||||
conf_files="/etc/mongodb/mongodb.conf"
|
conf_files="/etc/mongodb/mongodb.conf"
|
||||||
system_accounts="mongodb"
|
system_accounts="mongodb"
|
||||||
mongodb_homedir="/var/lib/mongodb"
|
mongodb_homedir="/var/lib/mongodb"
|
||||||
|
@ -18,15 +18,19 @@ make_dirs="
|
||||||
/var/lib/mongodb 0700 mongodb mongodb
|
/var/lib/mongodb 0700 mongodb mongodb
|
||||||
/var/log/mongodb 0750 mongodb mongodb"
|
/var/log/mongodb 0750 mongodb mongodb"
|
||||||
wrksrc="mongodb-src-r${version}"
|
wrksrc="mongodb-src-r${version}"
|
||||||
_scons_args=" --use-system-boost \
|
_scons_args="
|
||||||
--use-system-pcre \
|
--use-system-tcmalloc
|
||||||
--use-system-snappy \
|
--use-system-pcre
|
||||||
--use-system-tcmalloc \
|
--use-system-wiredtiger
|
||||||
--use-system-yaml \
|
--use-system-boost
|
||||||
--use-system-zlib \
|
--use-system-snappy
|
||||||
--use-sasl-client \
|
--use-system-valgrind
|
||||||
--ssl \
|
--use-system-zlib
|
||||||
--nostrip \
|
--use-system-yaml
|
||||||
|
--use-system-intel_decimal128
|
||||||
|
--use-sasl-client
|
||||||
|
--ssl
|
||||||
|
--nostrip
|
||||||
--disable-warnings-as-errors"
|
--disable-warnings-as-errors"
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
x86_64*|aarch64*) _scons_args+=" --wiredtiger=on";;
|
x86_64*|aarch64*) _scons_args+=" --wiredtiger=on";;
|
||||||
|
|
Loading…
Reference in a new issue