git: b7b41198f5f5 - main - databases/mongodb70: 7.0.35

From: Ronald Klop <ronald_at_FreeBSD.org>
Date: Wed, 17 Jun 2026 20:13:41 UTC
The branch main has been updated by ronald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b7b41198f5f563e7e78d3fd55c8e66a398cfdc3a

commit b7b41198f5f563e7e78d3fd55c8e66a398cfdc3a
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2026-06-17 19:39:11 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2026-06-17 20:13:30 +0000

    databases/mongodb70: 7.0.35
    
    Release notes:
    https://www.mongodb.com/docs/manual/release-notes/7.0/#7.0.35---june-9--2026
    
    - gen-config.sh is move to scripts/gen-config.sh
    - Patch added to circumvent these errors:
    src/mongo/util/net/openssl_init.cpp:247:51: error: no member named 'opensslPrimaryDRBGReseedMaxRequests' in namespace 'mongo::crypto'
    src/mongo/util/net/openssl_init.cpp:249:45: error: no member named 'opensslPrimaryDRBGReseedMaxTime' in namespace 'mongo::crypto'
    - disabled PATCH_FILE for python3.12, didn't apply
    - other patches just got a refresh
    
    Security:       CVE-2026-9740
    Security:       CVE-2026-9741
    Security:       CVE-2026-9746
    Security:       CVE-2026-9747
    Security:       CVE-2026-9748
    Security:       CVE-2026-9749
    Security:       CVE-2026-9750
    Security:       CVE-2026-9751
    Security:       CVE-2026-9752
    Security:       CVE-2026-9753
---
 databases/mongodb70/Makefile                       | 19 +++++-----
 databases/mongodb70/distinfo                       | 10 +++---
 .../extrapatch-src_third__party_mozjs_SConscript   |  8 ++---
 databases/mongodb70/files/patch-SConstruct         |  4 +--
 .../patch-src_mongo_util_net_openssl__init.cpp     | 40 ++++++++++++++++++++++
 ...h-src_third__party_mozjs_scripts_gen-config.sh} |  4 +--
 6 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile
index 90e59327216b..2429fdb96534 100644
--- a/databases/mongodb70/Makefile
+++ b/databases/mongodb70/Makefile
@@ -1,14 +1,13 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	7.0.34
-PORTREVISION=	2
+DISTVERSION=	7.0.35
 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
+#PATCHFILES+=	0877732109589e441cbf234dce17ec0e7b614902.patch:-p1
 
 MAINTAINER=	ronald@FreeBSD.org
 COMMENT=	MongoDB Community Edition (7.0.x Branch)
@@ -30,7 +29,7 @@ BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${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 used while running ${WRKSRC}/src/third_party/mozjs/scripts/gen-config.sh
 BUILD_DEPENDS+=	gm4:devel/m4 \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libcurl.so:ftp/curl \
@@ -45,12 +44,12 @@ 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
+# gmake is used while running ${WRKSRC}/src/third_party/mozjs/scripts/gen-config.sh
 USES+=		gmake pkgconfig
 CPE_PRODUCT=	mongodb
 
-# mozjs tag comes from ${WRKSRC}/src/third_party/mozjs/get-sources.sh
-MOZJS_TAG=	692674d55f1c4acfae4316efab0f79cd67250341
+# mozjs tag comes from ${WRKSRC}/src/third_party/mozjs/scripts/import.sh
+MOZJS_TAG=	dd4a007275927572d0b10857d3f11b28550d0095
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb mongodb-forks:mozjs
@@ -62,7 +61,7 @@ SHEBANG_FILES=	buildscripts/scons.py
 python_OLD_CMD=	@python_interpreter@
 
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	gen-config.sh
+CONFIGURE_SCRIPT=	scripts/gen-config.sh
 CONFIGURE_ARGS=		${MOZJS_ARCH} \
 			freebsd
 CONFIGURE_ENV+=		PYTHON3="${PYTHON_CMD}"
@@ -150,7 +149,7 @@ MOZJS_ARCH=	${ARCH}
 
 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}\""
+	${SH} -xc "test \"X`grep -E '^LIB_GIT_REVISION=' ${MOZJS_WRKSRC}/scripts/import.sh`\" = \"XLIB_GIT_REVISION=${MOZJS_TAG}\""
 	${PATCH} -d ${WRKDIR}/spidermonkey-${MOZJS_TAG} -p1 < ${PATCHDIR}/d497aa4f770ca02f6083e93b94996a8fe32c2ff4.patch
 
 post-patch:
@@ -161,7 +160,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/action/process_define_files.py
 
 pre-configure:
-# Replacement of ${WRKSRC}/src/third_party/mozjs/get-sources.sh
+# Replacement of ${WRKSRC}/src/third_party/mozjs/scripts/import.sh
 	${LN} -sF ${WRKDIR}/spidermonkey-${MOZJS_TAG} ${MOZJS_WRKSRC}/mozilla-release
 
 do-build:
diff --git a/databases/mongodb70/distinfo b/databases/mongodb70/distinfo
index 5666eb3a7ca2..42bf8f64dc43 100644
--- a/databases/mongodb70/distinfo
+++ b/databases/mongodb70/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1778755802
-SHA256 (mongodb-mongo-r7.0.34_GH0.tar.gz) = d98f8904d1a0a5683ffd29b320fd1f3615f6090f6bd9447fd016b428e674a8a1
-SIZE (mongodb-mongo-r7.0.34_GH0.tar.gz) = 91412914
-SHA256 (mongodb-forks-spidermonkey-692674d55f1c4acfae4316efab0f79cd67250341_GH0.tar.gz) = 4fe01d2b3152763ddb2cc01a35b4dc2b55b58204d26d6fcf7c201d440535b711
-SIZE (mongodb-forks-spidermonkey-692674d55f1c4acfae4316efab0f79cd67250341_GH0.tar.gz) = 392214331
+TIMESTAMP = 1781638348
+SHA256 (mongodb-mongo-r7.0.35_GH0.tar.gz) = f4805dd606153f31415392864da585f986a84c8555924a946d3db8f73f215d62
+SIZE (mongodb-mongo-r7.0.35_GH0.tar.gz) = 91496228
+SHA256 (mongodb-forks-spidermonkey-dd4a007275927572d0b10857d3f11b28550d0095_GH0.tar.gz) = 6d5b5172734d0b53b1d05f528b50249970fef8757750fb2df2d0ebdbaea367e8
+SIZE (mongodb-forks-spidermonkey-dd4a007275927572d0b10857d3f11b28550d0095_GH0.tar.gz) = 392330689
 SHA256 (0877732109589e441cbf234dce17ec0e7b614902.patch) = 96bcf70f8ee66424b5601632fb91dbcbb6b14df0553f59f36cd10325bfce7105
 SIZE (0877732109589e441cbf234dce17ec0e7b614902.patch) = 1770
diff --git a/databases/mongodb70/files/extrapatch-src_third__party_mozjs_SConscript b/databases/mongodb70/files/extrapatch-src_third__party_mozjs_SConscript
index 4370f13323a4..a28f759601d6 100644
--- a/databases/mongodb70/files/extrapatch-src_third__party_mozjs_SConscript
+++ b/databases/mongodb70/files/extrapatch-src_third__party_mozjs_SConscript
@@ -1,8 +1,8 @@
---- src/third_party/mozjs/SConscript.orig	2024-08-14 20:38:09 UTC
+--- src/third_party/mozjs/SConscript.orig	2026-06-16 06:40:34 UTC
 +++ src/third_party/mozjs/SConscript
-@@ -144,7 +145,7 @@ sources = [
-     "extract/js/src/wasm/WasmCode-platform.cpp",
- ]
+@@ -157,7 +157,7 @@ if get_option('spider-monkey-dbg') == "on":
+ if get_option('spider-monkey-dbg') == "on":
+     sources.append("extract/js/src/util/Utility.cpp")
  
 -if env['TARGET_ARCH'] == 'x86_64' and not env.TargetOSIs('windows'):
 +if False and env['TARGET_ARCH'] == 'x86_64' and not env.TargetOSIs('windows'):
diff --git a/databases/mongodb70/files/patch-SConstruct b/databases/mongodb70/files/patch-SConstruct
index bb82275bafdc..360def2fa356 100644
--- a/databases/mongodb70/files/patch-SConstruct
+++ b/databases/mongodb70/files/patch-SConstruct
@@ -1,6 +1,6 @@
---- SConstruct.orig	2025-11-03 12:58:46 UTC
+--- SConstruct.orig	2026-06-16 06:40:34 UTC
 +++ SConstruct
-@@ -1798,7 +1798,7 @@ if unknown_vars:
+@@ -1840,7 +1840,7 @@ if unknown_vars:
  
  unknown_vars = env_vars.UnknownVariables()
  if unknown_vars:
diff --git a/databases/mongodb70/files/patch-src_mongo_util_net_openssl__init.cpp b/databases/mongodb70/files/patch-src_mongo_util_net_openssl__init.cpp
new file mode 100644
index 000000000000..8306c2e4985c
--- /dev/null
+++ b/databases/mongodb70/files/patch-src_mongo_util_net_openssl__init.cpp
@@ -0,0 +1,40 @@
+--- src/mongo/util/net/openssl_init.cpp.orig	2026-06-17 14:19:16 UTC
++++ src/mongo/util/net/openssl_init.cpp
+@@ -230,37 +230,9 @@ MONGO_INITIALIZER_GENERAL(SetupOpenSSL, ("default"), (
+         setupFIPS();
+     } else {
+ #if OPENSSL_VERSION_NUMBER > 0x30000000L
+-        // When the OpenSSL 3 FIPS provider is disabled, OpenSSL uses a primary DRBG
+-        // to seed per-thread DRBGs. The primary DRBG relies on the system entropy source for
+-        // seeding and reseeding. In highly concurrent environments where many threads are
+-        // being spawned at once, the primary DRBG will receive many generate requests to
+-        // seed all the new threads. Both the reseed request and
+-        // the time intervals can be tuned via startup server parameters in response to
+-        // observed performance regressions.
+-        EVP_RAND_CTX* primary = RAND_get0_primary(NULL /* default OSSL_LIB_CTX */);
+-        if (primary == NULL) {
+             LOGV2_WARNING(12549200,
+                           "Unable to fetch primary DRBG to adjust reseed parameters, continuing "
+                           "with OpenSSL defaults");
+-        } else {
+-            auto primaryReseedRequestsInterval =
+-                static_cast<unsigned int>(crypto::opensslPrimaryDRBGReseedMaxRequests);
+-            auto primaryReseedTimeInterval =
+-                static_cast<time_t>(crypto::opensslPrimaryDRBGReseedMaxTime);
+-            OSSL_PARAM params[3] = {
+-                OSSL_PARAM_construct_uint(OSSL_DRBG_PARAM_RESEED_REQUESTS,
+-                                          &primaryReseedRequestsInterval),
+-                OSSL_PARAM_construct_time_t(OSSL_DRBG_PARAM_RESEED_TIME_INTERVAL,
+-                                            &primaryReseedTimeInterval),
+-                OSSL_PARAM_END};
+-            if (!EVP_RAND_CTX_set_params(primary, params)) {
+-                LOGV2_WARNING(12549201,
+-                              "Unable to reset primary DRBG reseed parameters, continuing with "
+-                              "OpenSSL defaults",
+-                              "error"_attr =
+-                                  SSLManagerInterface::getSSLErrorMessage(ERR_get_error()));
+-            }
+-        }
+ #endif
+     }
+ 
diff --git a/databases/mongodb70/files/patch-src_third__party_mozjs_gen-config.sh b/databases/mongodb70/files/patch-src_third__party_mozjs_scripts_gen-config.sh
similarity index 89%
rename from databases/mongodb70/files/patch-src_third__party_mozjs_gen-config.sh
rename to databases/mongodb70/files/patch-src_third__party_mozjs_scripts_gen-config.sh
index 441f53fff97d..0a7182d85854 100644
--- a/databases/mongodb70/files/patch-src_third__party_mozjs_gen-config.sh
+++ b/databases/mongodb70/files/patch-src_third__party_mozjs_scripts_gen-config.sh
@@ -1,5 +1,5 @@
---- src/third_party/mozjs/gen-config.sh.orig	2025-12-22 19:50:59 UTC
-+++ src/third_party/mozjs/gen-config.sh
+--- src/third_party/mozjs/scripts/gen-config.sh.orig	2026-06-16 06:40:34 UTC
++++ src/third_party/mozjs/scripts/gen-config.sh
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh