diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile index 917f7e412e63..1c6014f85129 100644 --- a/databases/mongodb70/Makefile +++ b/databases/mongodb70/Makefile @@ -1,156 +1,161 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 7.0.12 +DISTVERSION= 7.0.14 CATEGORIES= databases net PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} MAINTAINER= ronald@FreeBSD.org -COMMENT= Distributed document-oriented "NoSQL" database (7.0.x Branch) +COMMENT= MongoDB Community Edition (7.0.x Branch) WWW= https://www.mongodb.com/docs/v7.0/ LICENSE= APACHE20 SSPLv1 # mongodb is SSPLv1, C++ driver is APACHE20 LICENSE_COMB= multi LICENSE_NAME_SSPLv1= Server Side Public License Version 1 LICENSE_FILE_SSPLv1= ${WRKSRC}/LICENSE-Community.txt LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept ONLY_FOR_ARCHS= aarch64 amd64 powerpc64le ONLY_FOR_ARCHS_REASON= only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64 BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/py-pymongo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=3.11:devel/py-pyyaml@${PY_FLAVOR} # build depends used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh BUILD_DEPENDS+= gm4:devel/m4 \ gsed:textproc/gsed LIB_DEPENDS= libcurl.so:ftp/curl \ libpcre2-8.so:devel/pcre2 \ libsnappy.so:archivers/snappy \ libstemmer.so:textproc/snowballstemmer \ libunwind.so:devel/libunwind \ libyaml-cpp.so:devel/yaml-cpp \ libzstd.so:archivers/zstd -USES= compiler:c++20-lang cpe python:build scons shebangfix +USES= compiler:c++20-lang cpe python:build scons shebangfix ssl # gmake is used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh USES+= gmake pkgconfig # mozjs tag comes from ${WRKSRC}/src/third_party/mozjs/get-sources.sh MOZJS_TAG= 22954e1ce6bf72c7cf36f3a29ef030fff4ff6d33 USE_GITHUB= yes GH_ACCOUNT= mongodb mongodb-forks:mozjs GH_PROJECT= mongo spidermonkey:mozjs GH_TAGNAME= ${MOZJS_TAG}:mozjs USE_RC_SUBR= mongod SHEBANG_FILES= buildscripts/scons.py python_OLD_CMD= @python_interpreter@ CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 MAKE_ARGS= --allocator=system \ --cxx-std=20 \ --disable-warnings-as-errors \ --libc++ \ --runtime-hardening=on \ + --ssl \ --use-system-libunwind \ --use-system-pcre2 \ --use-system-snappy \ --use-system-stemmer \ --use-system-yaml \ --use-system-zlib \ --use-system-zstd \ -j${MAKE_JOBS_NUMBER} \ AR=llvm-ar \ MONGO_VERSION=${DISTVERSION} \ VERBOSE=on CFLAGS+= -DBOOST_NO_CXX98_FUNCTION_BASE CONFLICTS_INSTALL= mongodb[0-9][0-9] EXTRACT_AFTER_ARGS= --exclude src/third_party/pcre2 \ --exclude src/third_party/snappy-* \ --exclude src/third_party/libstemmer_c \ --exclude src/third_party/unwind \ --exclude src/third_party/yaml-cpp \ --exclude src/third_party/zlib-* \ --exclude src/third_party/zstandard \ --no-same-owner --no-same-permissions USERS= mongodb GROUPS= mongodb -OPTIONS_DEFINE= LTO NOAVX SASL SSL +OPTIONS_DEFINE= LTO NOAVX SASL OPTIONS_DEFINE_aarch64= ARMV80A -OPTIONS_DEFAULT= NOAVX SASL SSL +OPTIONS_DEFAULT= NOAVX SASL # MongoDB on non-LSE ARM cpu like Raspberry Pi can work but is unsupported upstream. # Can give corruption on high concurrency. # Please read https://jira.mongodb.org/browse/SERVER-71772. ARMV80A_DESC= Enable non-LSE ARM64 CPUs like RPI4. NOAVX_DESC= "Disable AVX instructions on amd64 (Sandybridge+)" ARMV80A_EXTRA_PATCHES= ${FILESDIR}/extrapatch-SConstruct LTO_MAKE_ARGS= --lto=on NOAVX_MAKE_ARGS= --experimental-optimization="-sandybridge" SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_MAKE_ARGS= --use-sasl-client -SSL_USES= ssl -SSL_MAKE_ARGS= --ssl - .include ALL_TARGET= install-core # This ports is only following the Major Release. # https://docs.mongodb.com/manual/reference/versioning/ PORTSCOUT= limit:^7\.0\. CPE_PRODUCT= mongodb .if ${ARCH} == amd64 MOZJS_ARCH= x86_64 .elif ${ARCH} == powerpc64le MOZJS_ARCH= ppc64le .elif ${ARCH} == aarch64 MOZJS_ARCH= ${ARCH} .endif post-patch: # fix build with python-3.11 ${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/util.py ${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/preprocessor.py ${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/backend/base.py ${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/action/process_define_files.py +pre-configure: + # Verify we downloaded the proper mozjs git tag. + sh -c "test \"X`grep -E '^LIB_GIT_REVISION=' ${WRKSRC}/src/third_party/mozjs/get-sources.sh`\" = \"XLIB_GIT_REVISION=${MOZJS_TAG}\"" + do-configure: # Replacement of ${WRKSRC}/src/third_party/mozjs/get-sources.sh ${LN} -sF ${WRKDIR}/spidermonkey-${MOZJS_TAG} ${WRKSRC}/src/third_party/mozjs/mozilla-release cd ${WRKSRC}/src/third_party/mozjs && PYTHON3="${PYTHON_CMD}" ${SH} ./gen-config.sh ${MOZJS_ARCH} freebsd do-build: ${WRKSRC}/buildscripts/scons.py -C ${WRKSRC} ${MAKE_ARGS} do-install: .for f in mongod mongos ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor ${INSTALL_DATA} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in LICENSE-Community.txt MPL-2 README THIRD-PARTY-NOTICES ${MV} ${STAGEDIR}${PREFIX}/${doc} ${STAGEDIR}${DOCSDIR}/ .endfor + ${INSTALL_MAN} ${WRKSRC}/debian/mongod.1 ${STAGEDIR}${PREFIX}/share/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/debian/mongos.1 ${STAGEDIR}${PREFIX}/share/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/debian/mongodb-parameters.5 ${STAGEDIR}${PREFIX}/share/man/man5/ ${RM} ${STAGEDIR}${PREFIX}/bin/resmoke.py do-test: ${SH} ${FILESDIR}/make.test.sh "${STAGEDIR}${PREFIX}/bin" .include diff --git a/databases/mongodb70/distinfo b/databases/mongodb70/distinfo index ee12ec55c045..e0c4b06e48a4 100644 --- a/databases/mongodb70/distinfo +++ b/databases/mongodb70/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1720045558 -SHA256 (mongodb-mongo-r7.0.12_GH0.tar.gz) = 267a396bd8ab6a114c932e9cb2c65565d3556852473015c88ffddda3693b25c3 -SIZE (mongodb-mongo-r7.0.12_GH0.tar.gz) = 86343146 +TIMESTAMP = 1724225814 +SHA256 (mongodb-mongo-r7.0.14_GH0.tar.gz) = 94b49d6e52f03aea83d2a7abcd03aca63044f99c1fc393bbccc2a94385869420 +SIZE (mongodb-mongo-r7.0.14_GH0.tar.gz) = 87128519 SHA256 (mongodb-forks-spidermonkey-22954e1ce6bf72c7cf36f3a29ef030fff4ff6d33_GH0.tar.gz) = b0ba41c3cb2f387afaef9fd8771b1250176680cbc7625836e545e0dec436e85d SIZE (mongodb-forks-spidermonkey-22954e1ce6bf72c7cf36f3a29ef030fff4ff6d33_GH0.tar.gz) = 164690006 diff --git a/databases/mongodb70/files/make.test.sh b/databases/mongodb70/files/make.test.sh index 3d74258a446a..c42bb1973e6b 100755 --- a/databases/mongodb70/files/make.test.sh +++ b/databases/mongodb70/files/make.test.sh @@ -1,31 +1,31 @@ #! /bin/sh set -e usage() { echo "Usage: $0 " echo " path to the executables" } test "$#" -eq 1 || ( usage && exit 1 ) set -x PATH="$1:$PATH" DBDIR=$( mktemp -d -t tmp.mongodb ) trap 'rm -rf "$DBDIR"' EXIT # Trivial check if the binaries execute at all. -mongod -version -mongos -version +mongod --version +mongos --version # Check if an empty database can be created. mkdir "$DBDIR/db" tail -F "$DBDIR/log" | ( grep -qFe "Waiting for connections" && kill $(cat "$DBDIR/pid") ) & script -eF "$DBDIR/log" \ timeout -s TERM -k 30s 60s \ mongod --dbpath "$DBDIR/db" --pidfilepath "$DBDIR/pid" echo "Test successful" diff --git a/databases/mongodb70/files/patch-SConstruct b/databases/mongodb70/files/patch-SConstruct index 816aa6946300..4ccd299adcaf 100644 --- a/databases/mongodb70/files/patch-SConstruct +++ b/databases/mongodb70/files/patch-SConstruct @@ -1,57 +1,55 @@ --- SConstruct.orig 2024-06-19 03:26:19 UTC +++ SConstruct @@ -23,7 +23,6 @@ import SCons.Script import SCons import SCons.Script -from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics from site_scons.mongo import build_profiles # This must be first, even before EnsureSConsVersion, if @@ -1653,16 +1652,6 @@ env.AddMethod(lambda env, name, **kwargs: add_option(n del envDict env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption') -# The placement of this is intentional. Here we setup an atexit method to store tooling metrics. -# We should only register this function after env, env_vars and the parser have been properly initialized. -SConsToolingMetrics.register_metrics( - utc_starttime=datetime.utcnow(), - artifact_dir=env.Dir('$BUILD_DIR').get_abspath(), - env_vars=env_vars, - env=env, - parser=_parser, -) - if get_option('build-metrics'): env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR' env.Tool('build_metrics') @@ -1799,9 +1788,9 @@ if has_option('variables-help'): print(env_vars.GenerateHelpText(env)) Exit(0) --unknown_vars = env_vars.UnknownVariables() --if unknown_vars: + unknown_vars = env_vars.UnknownVariables() + if unknown_vars: - env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) -+#unknown_vars = env_vars.UnknownVariables() -+#if unknown_vars: -+# env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) ++ print("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys()))) install_actions.setup(env, get_option('install-action')) @@ -3024,7 +3013,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'], ) @@ -3032,7 +3021,6 @@ if env.TargetOSIs('posix'): env.Append( CCFLAGS=[ "-fasynchronous-unwind-tables", - "-g2" if not env.TargetOSIs('emscripten') else "-g", "-Wall", "-Wsign-compare", "-Wno-unknown-pragmas", diff --git a/databases/mongodb70/pkg-descr b/databases/mongodb70/pkg-descr index 59930ca8f679..5bf5a965fd47 100644 --- a/databases/mongodb70/pkg-descr +++ b/databases/mongodb70/pkg-descr @@ -1,3 +1,5 @@ +Distributed document-oriented "NoSQL" database. + Mongo (from "humongous") is a high-performance, open source, schema-free, document-oriented database. A common name in the "NOSQL" community. diff --git a/databases/mongodb70/pkg-plist b/databases/mongodb70/pkg-plist index feaf3313657d..46587b510b14 100644 --- a/databases/mongodb70/pkg-plist +++ b/databases/mongodb70/pkg-plist @@ -1,7 +1,10 @@ bin/mongod bin/mongos @sample etc/mongodb.conf.sample %%DOCSDIR%%/LICENSE-Community.txt %%DOCSDIR%%/MPL-2 %%DOCSDIR%%/README %%DOCSDIR%%/THIRD-PARTY-NOTICES +share/man/man1/mongod.1.gz +share/man/man1/mongos.1.gz +share/man/man5/mongodb-parameters.5.gz