Index: head/databases/mongodb34/Makefile =================================================================== --- head/databases/mongodb34/Makefile +++ head/databases/mongodb34/Makefile @@ -2,8 +2,7 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 3.4.4 -PORTREVISION= 1 +DISTVERSION= 3.4.5 CATEGORIES= databases net MASTER_SITES= https://fastdl.mongodb.org/src/ \ http://fastdl.mongodb.org/src/ \ @@ -18,54 +17,51 @@ LICENSE= AGPLv3 APACHE20 LICENSE_COMB= multi +ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS_REASON= "Only supported on amd64 (i386 deprecated in v3)" + LIB_DEPENDS= libpcre.so:devel/pcre \ libsnappy.so:archivers/snappy \ libboost_system.so:devel/boost-libs TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo -CHOSEN_COMPILER_TYPE= clang - -ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= "Only supported on amd64 (i386 deprecated in v3)" - CONFLICTS_BUILD= mongo-cxx-driver -OPTIONS_DEFINE= SASL SSL -OPTIONS_DEFAULT= SASL SSL -SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASL_MAKE_ARGS= --use-sasl-client +CHOSEN_COMPILER_TYPE= clang -SSL_USE= yes -SSL_MAKE_ARGS= --ssl - USES= compiler:c++14-lang cpe execinfo python:build scons +USE_RC_SUBR= mongod -WITH_DEBUG=yes MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \ --use-system-pcre --use-system-snappy \ --use-system-boost --use-system-zlib \ --cxx-std=14 --libc++ \ --runtime-hardening=on \ - --disable-warnings-as-errors \ - VERBOSE=on + --disable-warnings-as-errors \ + VERBOSE=on -USERS= mongodb -GROUPS= mongodb +WITH_DEBUG= yes -USE_RC_SUBR= mongod +USERS= mongodb +GROUPS= mongodb +OPTIONS_DEFINE= SASL SSL +OPTIONS_DEFAULT= SASL SSL + +SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 +SASL_MAKE_ARGS= --use-sasl-client + +SSL_USES= ssl +SSL_MAKE_ARGS= --ssl + ALL_TARGET= core TEST_TARGET= unittests -.include +PORTSCOUT= limitw:1,even -.if ${PORT_OPTIONS:MSSL} -USES+= ssl -.endif +CPE_PRODUCT= mongodb -.include - post-install: .for f in mongo mongod mongoperf mongos ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} @@ -78,8 +74,4 @@ ${PYTHON_CMD} ${BUILD_WRKSRC}/buildscripts/resmoke.py\ --suites=unittests --jobs=${MAKE_JOBS_NUMBER} -PORTSCOUT= limitw:1,even - -CPE_PRODUCT= mongodb - -.include +.include Index: head/databases/mongodb34/distinfo =================================================================== --- head/databases/mongodb34/distinfo +++ head/databases/mongodb34/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1493043221 -SHA256 (mongodb-src-r3.4.4.tar.gz) = 09e962bf3428474b9790bbd464cb6176817f9da6121c30e096240dbb4d51c9f6 -SIZE (mongodb-src-r3.4.4.tar.gz) = 39867133 +TIMESTAMP = 1498771362 +SHA256 (mongodb-src-r3.4.5.tar.gz) = 84806e5496a1a0a8fe9a59d6eab0acfab0e68476437e94e2772f898677bb21f0 +SIZE (mongodb-src-r3.4.5.tar.gz) = 39905053 Index: head/databases/mongodb34/files/patch-SConstruct =================================================================== --- head/databases/mongodb34/files/patch-SConstruct +++ head/databases/mongodb34/files/patch-SConstruct @@ -1,4 +1,4 @@ ---- SConstruct.orig 2017-04-20 21:43:42 UTC +--- SConstruct.orig 2017-06-08 16:11:03 UTC +++ SConstruct @@ -929,9 +929,9 @@ if has_option('variables-help'): print env_vars.GenerateHelpText(env) @@ -70,3 +70,11 @@ context.Result(ret) return ret +@@ -2645,6 +2645,7 @@ def doConfigure(myenv): + + conf = Configure(myenv, custom_tests = { + 'CheckPThreadSetNameNP': CheckPThreadSetNameNP, ++ 'CheckBoostMinVersion': CheckBoostMinVersion, + }) + + if conf.CheckPThreadSetNameNP(): Index: head/databases/mongodb34/files/patch-src_mongo_crypto_crypto__openssl.cpp =================================================================== --- head/databases/mongodb34/files/patch-src_mongo_crypto_crypto__openssl.cpp +++ head/databases/mongodb34/files/patch-src_mongo_crypto_crypto__openssl.cpp @@ -0,0 +1,11 @@ +--- src/mongo/crypto/crypto_openssl.cpp.orig 2017-06-08 16:11:03 UTC ++++ src/mongo/crypto/crypto_openssl.cpp +@@ -41,7 +41,7 @@ + #include + #include + #include +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) + 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: head/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp =================================================================== --- head/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp +++ head/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp @@ -0,0 +1,11 @@ +--- src/mongo/util/net/ssl_manager.cpp.orig 2017-06-08 16:11:03 UTC ++++ src/mongo/util/net/ssl_manager.cpp +@@ -125,7 +125,7 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(ASN1_SEQUE + #endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS + // clang-format on + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + // 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.