diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile index 97213b2e6437..4ba010153a1f 100644 --- a/databases/mongodb70/Makefile +++ b/databases/mongodb70/Makefile @@ -1,188 +1,185 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 7.0.31 -PORTREVISION= 4 +DISTVERSION= 7.0.32 CATEGORIES= databases net PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ # https://github.com/mongodb/mongo/pull/1619/ # "Modernize dynamic module loading to work with Python3.12" PATCHFILES+= 0877732109589e441cbf234dce17ec0e7b614902.patch:-p1 MAINTAINER= ronald@FreeBSD.org 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} \ rust-cbindgen>0:devel/rust-cbindgen # 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 \ libsnappy.so:archivers/snappy \ libstemmer.so:textproc/snowballstemmer \ libunwind.so:devel/libunwind \ libyaml-cpp.so:devel/yaml-cpp \ libzstd.so:archivers/zstd FLAVORS= default armv80a armv80a_PKGNAMESUFFIX= ${DISTVERSION:R:S/.//}-armv80a 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 CPE_PRODUCT= mongodb # mozjs tag comes from ${WRKSRC}/src/third_party/mozjs/get-sources.sh -MOZJS_TAG= 5acd3be6c9563ad3e7ca6182285c69a38de47bab +MOZJS_TAG= 692674d55f1c4acfae4316efab0f79cd67250341 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@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= gen-config.sh CONFIGURE_ARGS= ${MOZJS_ARCH} \ freebsd CONFIGURE_ENV+= PYTHON3="${PYTHON_CMD}" MAKE_ARGS= --allocator=system \ --cxx-std=20 \ --disable-warnings-as-errors \ --libc++ \ --runtime-hardening=on \ --ssl \ --use-system-libunwind \ --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 ALL_TARGET= install-core CFLAGS+= -DBOOST_NO_CXX98_FUNCTION_BASE CONFLICTS_INSTALL= mongodb[0-9][0-9] EXTRACT_AFTER_ARGS= --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 # This ports is only following the Major Release. # https://docs.mongodb.com/manual/reference/versioning/ PORTSCOUT= limit:^7\.0\. CONFIGURE_WRKSRC= ${MOZJS_WRKSRC} USERS= mongodb GROUPS= mongodb OPTIONS_DEFINE= LTO NOAVX SASL OPTIONS_DEFINE_aarch64= ARMV80A 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" NOAVX_EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_third__party_mozjs_SConscript \ ${FILESDIR}/extrapatch-src_third__party_mozjs_extract_mozglue_misc_SIMD.cpp SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_MAKE_ARGS= --use-sasl-client MOZJS_WRKSRC= ${WRKSRC}/src/third_party/mozjs .if ${FLAVOR:U} == armv80a OPTIONS_SET+= ARMV80A MAKE_JOBS_UNSAFE= yes .endif .include .if ${FLAVOR:U} == armv80a && ${ARCH} != aarch64 IGNORE= flavor armv80a is only valid on aarch64 .endif .if ${ARCH} == amd64 MOZJS_ARCH= x86_64 .elif ${ARCH} == powerpc64le MOZJS_ARCH= ppc64le .elif ${ARCH} == aarch64 MOZJS_ARCH= ${ARCH} .endif post-extract: # Verify we downloaded the proper mozjs git tag. ${SH} -xc "test \"X`grep -E '^LIB_GIT_REVISION=' ${MOZJS_WRKSRC}/get-sources.sh`\" = \"XLIB_GIT_REVISION=${MOZJS_TAG}\"" 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 -# fix build with python-3.14 - ${PATCH} -d ${WRKDIR}/spidermonkey-${MOZJS_TAG} -p1 < ${PATCHDIR}/d497aa4f770ca02f6083e93b94996a8fe32c2ff4.patch pre-configure: # Replacement of ${WRKSRC}/src/third_party/mozjs/get-sources.sh ${LN} -sF ${WRKDIR}/spidermonkey-${MOZJS_TAG} ${MOZJS_WRKSRC}/mozilla-release 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 afda3e41b895..601b7486a961 100644 --- a/databases/mongodb70/distinfo +++ b/databases/mongodb70/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1773825748 -SHA256 (mongodb-mongo-r7.0.31_GH0.tar.gz) = d2c836e8930b82ca1f0566f6e65219110ee1f4bf5a378a1cd66b6938861b3550 -SIZE (mongodb-mongo-r7.0.31_GH0.tar.gz) = 90951317 -SHA256 (mongodb-forks-spidermonkey-5acd3be6c9563ad3e7ca6182285c69a38de47bab_GH0.tar.gz) = 1420533e23970171ff7a420e3ded1ea493e1976fb8896a5fd6f35e5b2d75733b -SIZE (mongodb-forks-spidermonkey-5acd3be6c9563ad3e7ca6182285c69a38de47bab_GH0.tar.gz) = 280439685 +TIMESTAMP = 1777619164 +SHA256 (mongodb-mongo-r7.0.32_GH0.tar.gz) = 6c398af97698257790ff4cd884f638c7e5a11c4f1ea6b71b62ba368bd0952292 +SIZE (mongodb-mongo-r7.0.32_GH0.tar.gz) = 91472087 +SHA256 (mongodb-forks-spidermonkey-692674d55f1c4acfae4316efab0f79cd67250341_GH0.tar.gz) = 4fe01d2b3152763ddb2cc01a35b4dc2b55b58204d26d6fcf7c201d440535b711 +SIZE (mongodb-forks-spidermonkey-692674d55f1c4acfae4316efab0f79cd67250341_GH0.tar.gz) = 392214331 SHA256 (0877732109589e441cbf234dce17ec0e7b614902.patch) = 96bcf70f8ee66424b5601632fb91dbcbb6b14df0553f59f36cd10325bfce7105 SIZE (0877732109589e441cbf234dce17ec0e7b614902.patch) = 1770 diff --git a/databases/mongodb70/files/d497aa4f770ca02f6083e93b94996a8fe32c2ff4.patch b/databases/mongodb70/files/d497aa4f770ca02f6083e93b94996a8fe32c2ff4.patch deleted file mode 100644 index 50247ed22425..000000000000 --- a/databases/mongodb70/files/d497aa4f770ca02f6083e93b94996a8fe32c2ff4.patch +++ /dev/null @@ -1,78 +0,0 @@ -From d497aa4f770ca02f6083e93b94996a8fe32c2ff4 Mon Sep 17 00:00:00 2001 -From: Mike Hommey -Date: Tue, 19 Aug 2025 05:09:09 +0000 -Subject: [PATCH] Bug 1969769 - Change uses of ast.Str with ast.Constant. - r=firefox-build-system-reviewers,ahochheiden - -ast.Str was deprecated in python 3.12 and removed in 3.14. It inherited -from ast.Constant, `Str.s` was equivalent to `Constant.value`, so we can -use the latter on both old and newer python versions. - -Differential Revision: https://phabricator.services.mozilla.com/D261512 ---- - python/mozbuild/mozbuild/frontend/reader.py | 14 +++++++------- - .../mozbuild/mozbuild/vendor/rewrite_mozbuild.py | 6 ++---- - 2 files changed, 9 insertions(+), 11 deletions(-) - -diff --git a/python/mozbuild/mozbuild/frontend/reader.py b/python/mozbuild/mozbuild/frontend/reader.py -index 9f6292cb909de..89bf9995c1768 100644 ---- a/python/mozbuild/mozbuild/frontend/reader.py -+++ b/python/mozbuild/mozbuild/frontend/reader.py -@@ -470,7 +470,7 @@ - return c( - ast.Subscript( - value=c(ast.Name(id=self._global_name, ctx=ast.Load())), -- slice=c(ast.Index(value=c(ast.Str(s=node.id)))), -+ slice=c(ast.Index(value=c(ast.Constant(value=node.id)))), - ctx=node.ctx, - ) - ) -@@ -1035,8 +1035,8 @@ - else: - # Others - assert isinstance(target.slice, ast.Index) -- assert isinstance(target.slice.value, ast.Str) -- key = target.slice.value.s -+ assert isinstance(target.slice.value, ast.Constant) -+ key = target.slice.value.value - - return name, key - -@@ -1044,11 +1044,11 @@ - value = node.value - if isinstance(value, ast.List): - for v in value.elts: -- assert isinstance(v, ast.Str) -- yield v.s -+ assert isinstance(v, ast.Constant) -+ yield v.value - else: -- assert isinstance(value, ast.Str) -- yield value.s -+ assert isinstance(value, ast.Constant) -+ yield value.value - - assignments = [] - -diff --git a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py -index cfcc0f18b9a9a..de06b58819b6a 100644 ---- a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py 2026-04-26 13:55:23.117672000 -0500 -+++ a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py 2026-04-26 13:55:54.618049000 -0500 -@@ -327,15 +327,13 @@ - """ - if isinstance(node.value, ast.List) and "elts" in node.value._fields: - for f in node.value.elts: -- if not isinstance(f, ast.Constant) and not isinstance(f, ast.Str): -+ if not isinstance(f, ast.Constant): - log( - "Found non-constant source file name in list: ", - ast_get_source_segment(code, f), - ) - return [] -- return [ -- f.value if isinstance(f, ast.Constant) else f.s for f in node.value.elts -- ] -+ return [f.value for f in node.value.elts] - elif isinstance(node.value, ast.ListComp): - # SOURCES += [f for f in foo if blah] - log("Could not find the files for " + ast_get_source_segment(code, node.value))