MONGOCRYPT-843 update libbson dependency to 2.1.0 (#1068)

rcsanchez97 · web-flow · commit 8ef0dfd00724 · 2025-09-25T15:41:56.000-04:00
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -1337,6 +1337,8 @@ buildvariants:
 - name: rhel-62-64-bit
   display_name: "RHEL 6.2 64-bit"
   run_on: rhel62-small
+  expansions:
+    compile_env: CFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS" ADDITIONAL_CMAKE_FLAGS="-DENABLE_TESTS=OFF -DBUILD_TESTING=OFF"
   tasks:
   - build-and-test-and-upload
   - build-and-test-shared-bson
diff --git a/.evergreen/debian_package_build.sh b/.evergreen/debian_package_build.sh
@@ -83,7 +83,7 @@ sudo chroot ./unstable-chroot /bin/bash -c '(set -o xtrace && \
   LANG=C /bin/bash ./debian/build_snapshot.sh && \
   debc ../*.changes && \
   dpkg -i ../*.deb && \
-  /usr/bin/gcc -I/usr/include/mongocrypt -I/usr/include/libbson-1.0 -o example-state-machine test/example-state-machine.c -lmongocrypt -lbson-1.0 )'
+  /usr/bin/gcc $(pkgconf --cflags mongocrypt bson2) -o example-state-machine test/example-state-machine.c -lmongocrypt -lbson2 )'
 
 [ -e ./unstable-chroot/tmp/libmongocrypt/example-state-machine ] || (echo "Example 'example-state-machine' was not built!" ; exit 1)
 (cd ./unstable-chroot/tmp/ ; tar zcvf ../../deb.tar.gz *.dsc *.orig.tar.gz *.debian.tar.xz *.build *.deb)
diff --git a/.evergreen/linker-tests.sh b/.evergreen/linker-tests.sh
@@ -61,7 +61,7 @@ fi
 run_chdir "$MONGOC_DIR" git apply --ignore-whitespace "$linker_tests_deps_root/bson_patches/libbson1.patch"
 # Apply patches to fix compile on RHEL 6.2. TODO: try to remove once RHEL 6.2 is dropped (MONGOCRYPT-688).
 run_chdir "$MONGOC_DIR" git apply "$LIBMONGOCRYPT_DIR/etc/libbson-remove-GCC-diagnostic-pragma.patch"
-run_chdir "$MONGOC_DIR" git apply "$LIBMONGOCRYPT_DIR/etc/libbson-remove-GCC-diagnostic-in-functions.patch"
+run_chdir "$MONGOC_DIR" git apply "$LIBMONGOCRYPT_DIR/etc/mongo-common-test-harness.patch"
 
 BUILD_PATH="$MONGOC_DIR/cmake-build"
 BSON1_INSTALL_PATH="$linker_tests_root/install/bson1"
@@ -80,7 +80,7 @@ run_chdir "$MONGOC_DIR" git reset --hard
 run_chdir "$MONGOC_DIR" git apply --ignore-whitespace "$linker_tests_deps_root/bson_patches/libbson2.patch"
 # Apply patch to fix compile on RHEL 6.2. TODO: try to remove once RHEL 6.2 is dropped (MONGOCRYPT-688).
 run_chdir "$MONGOC_DIR" git apply "$LIBMONGOCRYPT_DIR/etc/libbson-remove-GCC-diagnostic-pragma.patch"
-run_chdir "$MONGOC_DIR" git apply "$LIBMONGOCRYPT_DIR/etc/libbson-remove-GCC-diagnostic-in-functions.patch"
+run_chdir "$MONGOC_DIR" git apply "$LIBMONGOCRYPT_DIR/etc/mongo-common-test-harness.patch"
 LIBBSON2_SRC_DIR="$MONGOC_DIR"
 echo "Prepare libbson2 ... done"
 
diff --git a/.evergreen/linker_tests_deps/app/CMakeLists.txt b/.evergreen/linker_tests_deps/app/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required (VERSION 3.15...4.0)
 project (app C)
 add_executable (app app.c)
-find_package (bson-1.0 1.11 REQUIRED)
-message ("--   libbson found version \"${bson-1.0_VERSION}\"")
-target_link_libraries (app PRIVATE mongo::bson_static)
+find_package (bson REQUIRED)
+message ("--   libbson found version \"${bson_VERSION}\"")
+target_link_libraries (app PRIVATE bson::static)
 
 find_package (mongocrypt REQUIRED)
 target_link_libraries (app PRIVATE mongo::mongocrypt)
diff --git a/.evergreen/linker_tests_deps/bson_patches/libbson1.patch b/.evergreen/linker_tests_deps/bson_patches/libbson1.patch
@@ -1,10 +1,10 @@
 Adds a printf to bson_malloc0 to test linking scenarios with two forms of libbson.
 See linker-tests.sh. If this patch fails to apply, regenerate from libbson's source.
 
-diff --git a/src/libbson/src/bson/bson-memory.c b/src/libbson/src/bson/bson-memory.c
+diff --git a/src/libbson/src/bson/memory.c b/src/libbson/src/bson/memory.c
 index 0e1523331..aa7112305 100644
---- a/src/libbson/src/bson/bson-memory.c
-+++ b/src/libbson/src/bson/bson-memory.c
+--- a/src/libbson/src/bson/memory.c
++++ b/src/libbson/src/bson/memory.c
 @@ -104,6 +104,7 @@ bson_malloc0 (size_t num_bytes) /* IN */
  {
     void *mem = NULL;
diff --git a/.evergreen/linker_tests_deps/bson_patches/libbson2.patch b/.evergreen/linker_tests_deps/bson_patches/libbson2.patch
@@ -1,10 +1,10 @@
 Adds a printf to bson_malloc0 to test linking scenarios with two forms of libbson.
 See linker-tests.sh. If this patch fails to apply, regenerate from libbson's source.
 
-diff --git a/src/libbson/src/bson/bson-memory.c b/src/libbson/src/bson/bson-memory.c
+diff --git a/src/libbson/src/bson/memory.c b/src/libbson/src/bson/memory.c
 index 0e1523331..aa7112305 100644
---- a/src/libbson/src/bson/bson-memory.c
-+++ b/src/libbson/src/bson/bson-memory.c
+--- a/src/libbson/src/bson/memory.c
++++ b/src/libbson/src/bson/memory.c
 @@ -104,6 +104,7 @@ bson_malloc0 (size_t num_bytes) /* IN */
  {
     void *mem = NULL;
diff --git a/.evergreen/pkgconfig-tests.sh b/.evergreen/pkgconfig-tests.sh
@@ -43,6 +43,10 @@ if is_true USE_NINJA; then
     bash "$EVG_DIR/ensure-ninja.sh"
 fi
 
+# Apply patches to fix compile on RHEL 6.2. TODO: try to remove once RHEL 6.2 is dropped (MONGOCRYPT-688).
+run_chdir "$mongoc_src_dir" git apply "$LIBMONGOCRYPT_DIR/etc/libbson-remove-GCC-diagnostic-pragma.patch"
+run_chdir "$mongoc_src_dir" git apply "$LIBMONGOCRYPT_DIR/etc/mongo-common-test-harness.patch"
+
 echo "Building libbson ..."
 libbson_install_dir="$pkgconfig_tests_root/install/libbson"
 build_dir="$mongoc_src_dir/_build"
@@ -52,7 +56,7 @@ run_cmake -DENABLE_MONGOC=OFF \
        -H"$mongoc_src_dir" \
        -B"$build_dir"
 run_cmake --build "$build_dir" --target install --config RelWithDebInfo
-libbson_pkg_config_path="$(native_path "$(dirname "$(find "$libbson_install_dir" -name libbson-1.0.pc)")")"
+libbson_pkg_config_path="$(native_path "$(dirname "$(find "$libbson_install_dir" -name bson2.pc)")")"
 echo "Building libbson ... done"
 
 echo "Build libmongocrypt, static linking against libbson and configured for the PPA ..."
@@ -79,7 +83,7 @@ pkg-config --debug --print-errors --exists libmongocrypt
 echo "Validating pkg-config scripts ... done"
 
 echo "Build example-state-machine, static linking against libmongocrypt ..."
-gcc $(pkg-config --cflags libmongocrypt-static libbson-static-1.0) \
+gcc $(pkg-config --cflags libmongocrypt-static bson2-static) \
     -o "$pkgconfig_tests_root/example-state-machine" \
     "$LIBMONGOCRYPT_DIR/test/example-state-machine.c" \
     $(pkg-config --libs libmongocrypt-static)
@@ -95,7 +99,7 @@ command "$pkgconfig_tests_root/example-no-bson"
 echo "Build example-no-bson, static linking against libmongocrypt ... done"
 
 echo "Build example-state-machine, dynamic linking against libmongocrypt ..."
-gcc $(pkg-config --cflags libmongocrypt libbson-static-1.0) \
+gcc $(pkg-config --cflags libmongocrypt bson2-static) \
     -o "$pkgconfig_tests_root/example-state-machine" \
     "$LIBMONGOCRYPT_DIR/test/example-state-machine.c" \
     $(pkg-config --libs libmongocrypt)
@@ -127,7 +131,7 @@ run_cmake --build "$build_dir" --target install --config RelWithDebInfo
 echo "Build libmongocrypt, dynamic linking against libbson ... done"
 
 echo "Build example-state-machine, static linking against libmongocrypt ..."
-gcc $(pkg-config --cflags libmongocrypt-static libbson-static-1.0) \
+gcc $(pkg-config --cflags libmongocrypt-static bson2-static) \
     -o "$pkgconfig_tests_root/example-state-machine" \
     "$LIBMONGOCRYPT_DIR/test/example-state-machine.c" \
     $(pkg-config --libs libmongocrypt-static)
@@ -146,7 +150,7 @@ env LD_LIBRARY_PATH="$libbson_install_dir/lib:/$libbson_install_dir/lib64" \
 echo "Build example-no-bson, static linking against libmongocrypt ... done"
 
 echo "Build example-state-machine, dynamic linking against libmongocrypt ..."
-gcc $(pkg-config --cflags libmongocrypt libbson-static-1.0) \
+gcc $(pkg-config --cflags libmongocrypt bson2-static) \
     -o "$pkgconfig_tests_root/example-state-machine" \
     "$LIBMONGOCRYPT_DIR/test/example-state-machine.c" \
     $(pkg-config --libs libmongocrypt)
diff --git a/.evergreen/prep_c_driver_source.sh b/.evergreen/prep_c_driver_source.sh
@@ -3,7 +3,7 @@
 set -euxo pipefail
 
 # Clone mongo-c-driver and check out to a tagged version.
-MONGO_C_DRIVER_VERSION=1.30.3
+MONGO_C_DRIVER_VERSION=2.1.0
 
 # 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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
   - This applies to MongoDB C Driver when `MONGOCRYPT_MONGOC_DIR` is not set to `USE-SYSTEM`.
   - This applies to IntelDFP when `MONGOCRYPT_DFP_DIR` is not set to `USE-SYSTEM`.
   - Note: `FetchContent_Populate()` is still used for CMake versions prior to 3.18 to avoid `add_subdirectory()` behavior.
+- Bump downloaded libbson version from 1.30.3 to 2.1.0.
 
 ## 1.15.2
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -622,11 +622,11 @@ install (
 set (PROJECT_VERSION "${BUILD_VERSION}")
 set (PROJECT_DESCRIPTION "The libmongocrypt client-side field level encryption library.")
 if (NOT ENABLE_BUILD_FOR_PPA)
-   set (PKG_CONFIG_STATIC_REQUIRES "libbson-static-1.0")
+   set (PKG_CONFIG_STATIC_REQUIRES "bson2-static")
 endif ()
 if (USE_SHARED_LIBBSON)
-   set (PKG_CONFIG_REQUIRES "libbson-1.0")
-   set (PKG_CONFIG_STATIC_REQUIRES "libbson-1.0")
+   set (PKG_CONFIG_REQUIRES "bson2")
+   set (PKG_CONFIG_STATIC_REQUIRES "bson2")
 endif ()
 set (PKG_CONFIG_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
 set (PKG_CONFIG_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}/mongocrypt")
diff --git a/cmake/FetchMongoC.cmake b/cmake/FetchMongoC.cmake
@@ -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 "1.30.3" CACHE STRING "The Git tag of mongo-c-driver that will be fetched to obtain libbson")
+set (MONGOC_FETCH_TAG_FOR_LIBBSON "2.1.0" 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)
@@ -18,8 +18,7 @@ make_patch_command (patch_command
     DISABLED "${patch_disabled}"
     PATCHES
         ${PROJECT_SOURCE_DIR}/etc/libbson-remove-GCC-diagnostic-pragma.patch
-        # Fix old GCC error: "#pragma GCC diagnostic not allowed inside functions". Remove patch after libbson 2.0.0:
-        ${PROJECT_SOURCE_DIR}/etc/libbson-remove-GCC-diagnostic-in-functions.patch
+        ${PROJECT_SOURCE_DIR}/etc/mongo-common-test-harness.patch
     )
 
 # Fetch the source archive for the requested tag from GitHub
diff --git a/cmake/ImportBSON.cmake b/cmake/ImportBSON.cmake
@@ -48,42 +48,6 @@
    of USE_SHARED_LIBBSON.
 ]]
 
-include (CheckCSourceCompiles)
-include (CMakePushCheckState)
-
-cmake_push_check_state ()
-   # Even though we aren't going to use the system's libbson, try to detect whether it has
-   # extra-alignment enabled. We want to match that setting as our default, for convenience
-   # purposes only.
-   find_path (SYSTEM_BSON_INCLUDE_DIR bson/bson.h PATH_SUFFIXES libbson-1.0)
-   set (_extra_alignment_default OFF)
-   if (SYSTEM_BSON_INCLUDE_DIR AND NOT DEFINED ENABLE_EXTRA_ALIGNMENT)
-      set (CMAKE_REQUIRED_INCLUDES "${SYSTEM_BSON_INCLUDE_DIR}")
-      check_c_source_compiles ([[
-         #include <bson/bson.h>
-
-         int main() { }
-      ]] HAVE_SYSTEM_LIBBSON)
-
-      if (HAVE_SYSTEM_LIBBSON)
-         # We have a libbson, check for extra alignment
-         check_c_source_compiles ([[
-            #include <bson/bson.h>
-
-            #ifndef BSON_EXTRA_ALIGN
-            #error "Not extra-aligned"
-            #endif
-
-            int main() {}
-         ]] SYSTEM_LIBBSON_IS_EXTRA_ALIGNED)
-         if (SYSTEM_LIBBSON_IS_EXTRA_ALIGNED)
-            # Extra aligned! We'll use extra alignment by default.
-            set (_extra_alignment_default ON)
-         endif ()
-      endif ()
-   endif ()
-cmake_pop_check_state ()
-
 set (init OFF)
 if (DEFINED ENABLED_SHARED_BSON)
    message (STATUS "ENABLE_SHARED_BSON is now named USE_SHARED_LIBBSON")
@@ -109,9 +73,9 @@ endif ()
 function (_import_bson)
    if (MONGOCRYPT_MONGOC_DIR STREQUAL "USE-SYSTEM" AND USE_SHARED_LIBBSON AND NOT ENABLE_ONLINE_TESTS)
       message (STATUS "NOTE: Using system-wide libbson library. This is intended only for package maintainers.")
-      find_library (_MONGOCRYPT_SYSTEM_LIBBSON_SHARED "${CMAKE_SHARED_LIBRARY_PREFIX}bson-1.0${CMAKE_SHARED_LIBRARY_SUFFIX}")
-      find_library (_MONGOCRYPT_SYSTEM_LIBBSON_STATIC "${CMAKE_STATIC_LIBRARY_PREFIX}bson-static-1.0${CMAKE_STATIC_LIBRARY_SUFFIX}")
-      find_path (_MONGOCRYPT_SYSTEM_LIBBSON_INCLUDE_DIR bson/bson.h PATH_SUFFIXES libbson-1.0)
+      find_library (_MONGOCRYPT_SYSTEM_LIBBSON_SHARED "${CMAKE_SHARED_LIBRARY_PREFIX}bson2${CMAKE_SHARED_LIBRARY_SUFFIX}")
+      find_library (_MONGOCRYPT_SYSTEM_LIBBSON_STATIC "${CMAKE_STATIC_LIBRARY_PREFIX}bson2-static${CMAKE_STATIC_LIBRARY_SUFFIX}")
+      find_path (_MONGOCRYPT_SYSTEM_LIBBSON_INCLUDE_DIR bson/bson.h PATH_SUFFIXES bson-2.1.0)
       add_library (bson_shared SHARED IMPORTED)
       add_library (bson_static STATIC IMPORTED)
       set_target_properties (bson_shared bson_static PROPERTIES
@@ -140,8 +104,6 @@ function (_import_bson)
       set (ENABLE_SNAPPY OFF CACHE BOOL "Toggle snappy for the mongoc subproject (not required by libmongocrypt)")
       # Disable deprecated automatic init and cleanup. (May be overridden by the user)
       set (ENABLE_AUTOMATIC_INIT_AND_CLEANUP OFF CACHE BOOL "Enable automatic init and cleanup (GCC only)")
-      # Disable over-alignment of bson types. (May be overridden by the user)
-      set (ENABLE_EXTRA_ALIGNMENT ${_extra_alignment_default} CACHE BOOL "Toggle extra alignment of bson_t")
       # We don't want the subproject to find libmongocrypt
       set (ENABLE_CLIENT_SIDE_ENCRYPTION OFF CACHE BOOL "Disable client-side encryption for the libmongoc subproject")
       # Clear `BUILD_VERSION` so C driver does not use a `BUILD_VERSION` meant for libmongocrypt.
diff --git a/etc/cyclonedx.sbom.json b/etc/cyclonedx.sbom.json
@@ -1,16 +1,16 @@
 {
   "components": [
     {
-      "bom-ref": "pkg:github/mongodb/mongo-c-driver@v1.30.3#src/libbson",
+      "bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.1.0#src/libbson",
       "copyright": "Copyright 2009-present MongoDB, Inc.",
       "externalReferences": [
         {
           "type": "distribution",
-          "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v1.30.3.tar.gz"
+          "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v2.1.0.tar.gz"
         },
         {
           "type": "website",
-          "url": "https://github.com/mongodb/mongo-c-driver/tree/v1.30.3"
+          "url": "https://github.com/mongodb/mongo-c-driver/tree/v2.1.0"
         }
       ],
       "group": "mongodb",
@@ -22,9 +22,9 @@
         }
       ],
       "name": "mongo-c-driver",
-      "purl": "pkg:github/mongodb/mongo-c-driver@v1.30.3#src/libbson",
+      "purl": "pkg:github/mongodb/mongo-c-driver@v2.1.0#src/libbson",
       "type": "library",
-      "version": "v1.30.3"
+      "version": "v2.1.0"
     },
     {
       "bom-ref": "pkg:generic/IntelRDFPMathLib@20U2?download_url=https://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz",
@@ -53,7 +53,7 @@
       "ref": "pkg:generic/IntelRDFPMathLib@20U2?download_url=https://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz"
     },
     {
-      "ref": "pkg:github/mongodb/mongo-c-driver@v1.30.3#src/libbson"
+      "ref": "pkg:github/mongodb/mongo-c-driver@v2.1.0#src/libbson"
     }
   ],
   "metadata": {
diff --git a/etc/libbson-remove-GCC-diagnostic-in-functions.patch b/etc/libbson-remove-GCC-diagnostic-in-functions.patch
diff --git a/etc/libbson-remove-GCC-diagnostic-pragma.patch b/etc/libbson-remove-GCC-diagnostic-pragma.patch
diff --git a/etc/mongo-common-test-harness.patch b/etc/mongo-common-test-harness.patch
diff --git a/etc/purls.txt b/etc/purls.txt
