Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 May 2026 11:55:25 +0000
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: 286b4a2b4054 - main - databases/mongodb70: 7.0.32
Message-ID:  <6a03152d.45b6e.7013be97@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by ronald:

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

commit 286b4a2b4054db13feb2abe307a1b45a04b73404
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2026-05-01 07:21:09 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2026-05-12 11:54:24 +0000

    databases/mongodb70: 7.0.32
    
    Announcement:
    https://www.mongodb.com/community/forums/t/mongodb-7-0-32-is-released/338938?u=r_k
    
    Changes:
    https://www.mongodb.com/docs/manual/release-notes/7.0/#7.0.32---apr-29--2026
    
    Upstream includes the patch from commit ee241417e61c22eaea29ed504821fc773bde6aee (python 3.14).
    
    Security:       CVE-2026-6914
    Security:       CVE-2026-6915
---
 databases/mongodb70/Makefile                       |  7 +-
 databases/mongodb70/distinfo                       | 10 +--
 .../d497aa4f770ca02f6083e93b94996a8fe32c2ff4.patch | 78 ----------------------
 3 files changed, 7 insertions(+), 88 deletions(-)

diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile
index 97213b2e6437..4ba010153a1f 100644
--- a/databases/mongodb70/Makefile
+++ b/databases/mongodb70/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	7.0.31
-PORTREVISION=	4
+DISTVERSION=	7.0.32
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 
@@ -50,7 +49,7 @@ 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
@@ -158,8 +157,6 @@ post-patch:
 	${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
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 <mh+mozilla@glandium.org>
-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))


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a03152d.45b6e.7013be97>