From 5b095e0e1ee648b824c909c306db2d7d241d06e4 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Mon, 22 Dec 2025 14:58:13 +0100 Subject: [PATCH] PHPC-2649: Update to libmongocrypt 1.17.0 --- .github/workflows/tests.yml | 2 +- config.m4 | 4 ++-- sbom.json | 16 ++++++++-------- src/LIBMONGOCRYPT_VERSION_CURRENT | 2 +- src/libmongocrypt | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6bcabfa78..524b764a1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -146,7 +146,7 @@ jobs: env: PHP_VERSION: "8.3" # Note: omit the patch version when referring to the libmongocrypt package - LIBMONGOCRYPT_VERSION: "1.16" + LIBMONGOCRYPT_VERSION: "1.17" # Note: include the patch version when referring to a libmongoc release tarball LIBMONGOC_VERSION: "2.2.1" SERVER_VERSION: "8.0" diff --git a/config.m4 b/config.m4 index 58a7f544f..ed6e722b9 100644 --- a/config.m4 +++ b/config.m4 @@ -266,7 +266,7 @@ if test "$PHP_MONGODB" != "no"; then ]) if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then - PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.16.0], [ + PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.17.0], [ PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt --modversion` PHP_MONGODB_MONGOCRYPT_VERSION_STRING="System ($PHP_MONGODB_MONGOCRYPT_VERSION)" @@ -274,7 +274,7 @@ if test "$PHP_MONGODB" != "no"; then PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOCRYPT_LIBS, MONGODB_SHARED_LIBADD) AC_DEFINE(HAVE_SYSTEM_LIBMONGOCRYPT, 1, [Use system libmongocrypt]) ],[ - AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.16.0) + AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.17.0) ]) fi fi diff --git a/sbom.json b/sbom.json index b7bfdb5bf..7a4dc8b90 100644 --- a/sbom.json +++ b/sbom.json @@ -1,22 +1,22 @@ { "components": [ { - "bom-ref": "pkg:github/mongodb/libmongocrypt@1.16.0", + "bom-ref": "pkg:github/mongodb/libmongocrypt@1.17.0", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/libmongocrypt/archive/refs/tags/1.16.0.tar.gz" + "url": "https://github.com/mongodb/libmongocrypt/archive/refs/tags/1.17.0.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/libmongocrypt/tree/1.16.0" + "url": "https://github.com/mongodb/libmongocrypt/tree/1.17.0" } ], "group": "mongodb", "name": "libmongocrypt", - "purl": "pkg:github/mongodb/libmongocrypt@1.16.0", + "purl": "pkg:github/mongodb/libmongocrypt@1.17.0", "type": "library", - "version": "1.16.0" + "version": "1.17.0" }, { "bom-ref": "pkg:github/mongodb/mongo-c-driver@2.2.1", @@ -39,14 +39,14 @@ ], "dependencies": [ { - "ref": "pkg:github/mongodb/libmongocrypt@1.16.0" + "ref": "pkg:github/mongodb/libmongocrypt@1.17.0" }, { "ref": "pkg:github/mongodb/mongo-c-driver@2.2.1" } ], "metadata": { - "timestamp": "2025-12-10T09:26:19.253727+00:00", + "timestamp": "2025-12-22T13:55:40.012464+00:00", "tools": [ { "externalReferences": [ @@ -90,7 +90,7 @@ ] }, "serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082", - "version": 19, + "version": 20, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.5", diff --git a/src/LIBMONGOCRYPT_VERSION_CURRENT b/src/LIBMONGOCRYPT_VERSION_CURRENT index 15b989e39..092afa15d 100644 --- a/src/LIBMONGOCRYPT_VERSION_CURRENT +++ b/src/LIBMONGOCRYPT_VERSION_CURRENT @@ -1 +1 @@ -1.16.0 +1.17.0 diff --git a/src/libmongocrypt b/src/libmongocrypt index f2e5939ba..37dcf0985 160000 --- a/src/libmongocrypt +++ b/src/libmongocrypt @@ -1 +1 @@ -Subproject commit f2e5939ba89a8e3806bb4144a4aef8a583c5dbde +Subproject commit 37dcf0985fb6c34f62d625df747aabbfcc034221