Skip to content

MONGOCRYPT-952 update downloaded C driver to 2.3.3 #1202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevinAlbs merged 3 commits into from
Jul 15, 2026
Merged

MONGOCRYPT-952 update downloaded C driver to 2.3.3 #1202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c14910
Revert "MONGOCRYPT-951: Pin cmake to 4.3.4 (#1200)"
kevinAlbs Jul 14, 2026
6b825e2
MONGOCRYPT-952 bump downloaded C driver to 2.3.3
kevinAlbs Jul 14, 2026
8570deb
remove extra "v" prefix in "purls.txt"
kevinAlbs Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .evergreen/install-build-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ install_build_tools() {
fi

if [[ "${rhel7:?}" == "1" ]]; then
uv tool install -q "cmake==4.3.4" || return
uv tool install -q cmake || return
ln -sf /opt/mongodbtoolchain/v4/bin/ninja "${UV_TOOL_BIN_DIR:?}/ninja" || return
elif [[ "${rhel6:?}" == "1" ]]; then
ln -sf /opt/mongodbtoolchain/v4/bin/cmake "${UV_TOOL_BIN_DIR:?}/cmake" || return
Expand All @@ -61,7 +61,7 @@ install_build_tools() {
# PyPI `cmake` requires a sufficiently recent Python version.
uv python install --no-bin -q || uv python install -q || return

uv tool install -q "cmake==4.3.4" || return
uv tool install -q cmake || return

if [[ -f /etc/redhat-release && -x /opt/mongodbtoolchain/v4/bin/ninja ]]; then
# Avoid strange "Could NOT find Threads" CMake configuration error on RHEL when using PyPI CMake, PyPI Ninja, and
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/prep_c_driver_source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -euxo pipefail

# Clone mongo-c-driver and check out to a tagged version.
MONGO_C_DRIVER_VERSION=2.3.0
MONGO_C_DRIVER_VERSION=2.3.3

# Force checkout with lf endings since .sh must have lf, not crlf on Windows
git clone https://github.com/mongodb/mongo-c-driver.git --config core.eol=lf --config core.autocrlf=false --depth=1 --branch $MONGO_C_DRIVER_VERSION
2 changes: 1 addition & 1 deletion cmake/FetchMongoC.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include (FetchContent)

# Set the tag that we will fetch.
# When updating the version of libbson, also update the version in etc/purls.txt and .evergreen/prep_c_driver_source.sh
set (MONGOC_FETCH_TAG_FOR_LIBBSON "2.3.0" CACHE STRING "The Git tag of mongo-c-driver that will be fetched to obtain libbson")
set (MONGOC_FETCH_TAG_FOR_LIBBSON "2.3.3" CACHE STRING "The Git tag of mongo-c-driver that will be fetched to obtain libbson")

# Add an option to disable patching if a patch command is unavailable.
option (LIBBSON_PATCH_ENABLED "Whether to apply patches to the libbson library" ON)
Expand Down
14 changes: 7 additions & 7 deletions etc/cyclonedx.sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"components": [
{
"bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.3.0#src/libbson",
"bom-ref": "pkg:github/mongodb/mongo-c-driver@2.3.3#src/libbson",
"copyright": "Copyright 2009-present MongoDB, Inc.",
"externalReferences": [
{
"type": "distribution",
"url": "https://github.com/mongodb/mongo-c-driver/archive/v2.3.0.tar.gz"
"url": "https://github.com/mongodb/mongo-c-driver/archive/2.3.3.tar.gz"
},
{
"type": "website",
"url": "https://github.com/mongodb/mongo-c-driver/tree/v2.3.0"
"url": "https://github.com/mongodb/mongo-c-driver/tree/2.3.3"
}
],
"group": "mongodb",
Expand All @@ -22,9 +22,9 @@
}
],
"name": "mongo-c-driver",
"purl": "pkg:github/mongodb/mongo-c-driver@v2.3.0#src/libbson",
"purl": "pkg:github/mongodb/mongo-c-driver@2.3.3#src/libbson",
"type": "library",
"version": "v2.3.0"
"version": "2.3.3"
},
{
"bom-ref": "pkg:generic/IntelRDFPMathLib@20U2?download_url=https://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz",
Expand Down Expand Up @@ -53,11 +53,11 @@
"ref": "pkg:generic/IntelRDFPMathLib@20U2?download_url=https://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz"
},
{
"ref": "pkg:github/mongodb/mongo-c-driver@v2.3.0#src/libbson"
"ref": "pkg:github/mongodb/mongo-c-driver@2.3.3#src/libbson"
}
],
"metadata": {
"timestamp": "2026-06-30T14:46:13.184636+00:00",
"timestamp": "2026-07-14T13:56:19.068748+00:00",
"tools": [
{
"externalReferences": [
Expand Down
2 changes: 1 addition & 1 deletion etc/purls.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# `copyright` property. This information can be manually added.

# libbson is obtained via `cmake/FetchMongoC.cmake`.
pkg:github/mongodb/mongo-c-driver@v2.3.0?#src/libbson
pkg:github/mongodb/mongo-c-driver@2.3.3?#src/libbson

# IntelDFP is obtained via `cmake/IntelDFP.cmake`
pkg:generic/IntelRDFPMathLib@20U2?download_url=https://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz