Date: Tue, 3 Sep 2024 07:24:04 GMT From: Ronald Klop <ronald@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: adc03306916b - main - databases/mongodb70: update to 7.0.14 Message-ID: <202409030724.4837O4lZ002875@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=adc03306916b49eb837e0e2ca24f783179640e19 commit adc03306916b49eb837e0e2ca24f783179640e19 Author: Ronald Klop <ronald@FreeBSD.org> AuthorDate: 2024-08-18 10:08:09 +0000 Commit: Ronald Klop <ronald@FreeBSD.org> CommitDate: 2024-09-03 07:23:46 +0000 databases/mongodb70: update to 7.0.14 Changes: https://www.mongodb.com/docs/manual/release-notes/7.0/#7.0.14---aug-26--2024 NB: 7.0.13 was tagged, but never released. Sync with improvements in mongodb80: from commit b44fe228ca : Removed SSL from OPTIONS. It was inherited from the first versions of databases/mongodb, long before I became maintainer. Currently disabling the SSL option does not disable ssl as ssl is auto-detected and disabling ssl needs explicit --ssl=off which is not implemented in the port. I never had a request for this in years so I decided to just remove the option and have ssl enabled always. from commit 5d8274d264 : Also found some manual pages in the src tree. from commit f2c9ba7c53 : - add pre-configure check if downloaded mozjs version matches get-sources.sh. - change comment to how the upstream project names the open source variant. --- databases/mongodb70/Makefile | 21 +++++++++++++-------- databases/mongodb70/distinfo | 6 +++--- databases/mongodb70/files/make.test.sh | 4 ++-- databases/mongodb70/files/patch-SConstruct | 8 +++----- databases/mongodb70/pkg-descr | 2 ++ databases/mongodb70/pkg-plist | 3 +++ 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile index 917f7e412e63..1c6014f85129 100644 --- a/databases/mongodb70/Makefile +++ b/databases/mongodb70/Makefile @@ -1,11 +1,11 @@ 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 @@ -34,7 +34,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ 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 @@ -56,6 +56,7 @@ MAKE_ARGS= --allocator=system \ --disable-warnings-as-errors \ --libc++ \ --runtime-hardening=on \ + --ssl \ --use-system-libunwind \ --use-system-pcre2 \ --use-system-snappy \ @@ -84,9 +85,9 @@ EXTRACT_AFTER_ARGS= --exclude src/third_party/pcre2 \ 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. @@ -103,9 +104,6 @@ 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 <bsd.port.pre.mk> ALL_TARGET= install-core @@ -131,6 +129,10 @@ post-patch: ${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 @@ -148,6 +150,9 @@ do-install: .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: 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 @@ -18,8 +18,8 @@ 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" 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 @@ -29,12 +29,10 @@ 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')) 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 @@ -5,3 +5,6 @@ bin/mongos %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409030724.4837O4lZ002875>