Index: head/databases/mongodb34/Makefile =================================================================== --- head/databases/mongodb34/Makefile (revision 445167) +++ head/databases/mongodb34/Makefile (revision 445168) @@ -1,85 +1,77 @@ # $FreeBSD$ 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/ \ http://download.mongodb.org/src/ PKGNAMESUFFIX= ${PORTVERSION:R:S/.//} DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION} MAINTAINER= eric@camachat.org COMMENT= Distributed document-oriented "NoSQL" database # mongodb is AGPLv3, C++ driver is APACHE20 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} .endfor ${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample do-test: @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${TEST_TARGET} &&\ ${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 (revision 445167) +++ head/databases/mongodb34/distinfo (revision 445168) @@ -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 (revision 445167) +++ head/databases/mongodb34/files/patch-SConstruct (revision 445168) @@ -1,72 +1,80 @@ ---- 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) Exit(0) -unknown_vars = env_vars.UnknownVariables() -if unknown_vars: - env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys())) +#unknown_vars = env_vars.UnknownVariables() +#if unknown_vars: +# env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys())) def set_config_header_define(env, varname, varval = 1): env['CONFIG_HEADER_DEFINES'][varname] = varval @@ -1550,7 +1550,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( - PROGCCFLAGS=['-fPIE'], + PROGCCFLAGS=['-fpic'], PROGLINKFLAGS=['-pie'], ) @@ -1564,7 +1564,7 @@ if env.TargetOSIs('posix'): "-Wno-unknown-pragmas", "-Winvalid-pch"] ) # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - if env.TargetOSIs('linux', 'osx', 'solaris'): + if env.TargetOSIs('linux', 'osx', 'solaris', 'freebsd'): if not has_option("disable-warnings-as-errors"): env.Append( CCFLAGS=["-Werror"] ) @@ -1592,19 +1592,19 @@ if env.TargetOSIs('posix'): env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) - if optBuild: - env.Append( CCFLAGS=["-O2"] ) - else: - env.Append( CCFLAGS=["-O0"] ) + #if optBuild: + # env.Append( CCFLAGS=["-O2"] ) + #else: + # env.Append( CCFLAGS=["-O0"] ) # Promote linker warnings into errors. We can't yet do this on OS X because its linker considers # noall_load obsolete and warns about it. - if not env.TargetOSIs('osx'): - env.Append( - LINKFLAGS=[ - "-Wl,--fatal-warnings", - ], - ) + #if not env.TargetOSIs('osx'): + # env.Append( + # LINKFLAGS=[ + # "-Wl,--fatal-warnings", + # ], + # ) mmapv1 = False if get_option('mmapv1') == 'auto': @@ -2461,7 +2461,7 @@ def doConfigure(myenv): }} """.format(storage_class) context.Message('Checking for storage class {0} '.format(storage_class)) - ret = context.TryLink(textwrap.dedent(test_body), ".cpp") + ret = context.TryCompile(textwrap.dedent(test_body), ".cpp") 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 (nonexistent) +++ head/databases/mongodb34/files/patch-src_mongo_crypto_crypto__openssl.cpp (revision 445168) @@ -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. Property changes on: head/databases/mongodb34/files/patch-src_mongo_crypto_crypto__openssl.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property 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 (nonexistent) +++ head/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp (revision 445168) @@ -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. Property changes on: head/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property