From 21935e2cca17f690449dac51f678a87289e8836e Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 4 Sep 2024 14:33:12 +0200 Subject: [PATCH] Update to libmongoc 1.27.6 (#1627) --- .../config/generated/build/build-libmongoc.yml | 2 +- .../config/templates/build/build-libmongoc.yml | 2 +- config.m4 | 8 ++++---- sbom.json | 16 ++++++++-------- src/LIBMONGOC_VERSION_CURRENT | 2 +- src/libmongoc | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.evergreen/config/generated/build/build-libmongoc.yml b/.evergreen/config/generated/build/build-libmongoc.yml index 1b25b6fd0..b5ede4855 100644 --- a/.evergreen/config/generated/build/build-libmongoc.yml +++ b/.evergreen/config/generated/build/build-libmongoc.yml @@ -12,7 +12,7 @@ tasks: - func: "compile driver" vars: PHP_VERSION: "8.3" - LIBMONGOC_VERSION: "1.27.4" + LIBMONGOC_VERSION: "1.27.6" - func: "upload build" - name: "build-php-8.3-libmongoc-next-stable" diff --git a/.evergreen/config/templates/build/build-libmongoc.yml b/.evergreen/config/templates/build/build-libmongoc.yml index 3a32b2f89..f34a91484 100644 --- a/.evergreen/config/templates/build/build-libmongoc.yml +++ b/.evergreen/config/templates/build/build-libmongoc.yml @@ -10,7 +10,7 @@ - func: "compile driver" vars: PHP_VERSION: "%phpVersion%" - LIBMONGOC_VERSION: "1.27.4" + LIBMONGOC_VERSION: "1.27.6" - func: "upload build" - name: "build-php-%phpVersion%-libmongoc-next-stable" diff --git a/config.m4 b/config.m4 index b4e16c8fa..8d4c2393d 100644 --- a/config.m4 +++ b/config.m4 @@ -276,7 +276,7 @@ if test "$PHP_MONGODB" != "no"; then PHP_MONGODB_MONGOCRYPT_VERSION_STRING="None" if test "$PHP_MONGODB_SYSTEM_LIBS" != "no"; then - PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.27.4], [ + PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.27.6], [ PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion` PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)" @@ -284,10 +284,10 @@ if test "$PHP_MONGODB" != "no"; then PHP_EVAL_LIBLINE($PHP_MONGODB_BSON_LIBS, MONGODB_SHARED_LIBADD) AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson]) ],[ - AC_MSG_ERROR([Could not find system library for libbson >= 1.27.4]) + AC_MSG_ERROR([Could not find system library for libbson >= 1.27.6]) ]) - PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.27.4], [ + PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.27.6], [ PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion` PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)" @@ -295,7 +295,7 @@ if test "$PHP_MONGODB" != "no"; then PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOC_LIBS, MONGODB_SHARED_LIBADD) AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc]) ],[ - AC_MSG_ERROR(Could not find system library for libmongoc >= 1.27.4) + AC_MSG_ERROR(Could not find system library for libmongoc >= 1.27.6) ]) if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then diff --git a/sbom.json b/sbom.json index 64c7ebdee..9ccc49991 100644 --- a/sbom.json +++ b/sbom.json @@ -19,22 +19,22 @@ "version": "1.10.1" }, { - "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.27.4", + "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.27.6", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.27.4.tar.gz" + "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.27.6.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/mongo-c-driver/tree/1.27.4" + "url": "https://github.com/mongodb/mongo-c-driver/tree/1.27.6" } ], "group": "mongodb", "name": "mongo-c-driver", - "purl": "pkg:github/mongodb/mongo-c-driver@1.27.4", + "purl": "pkg:github/mongodb/mongo-c-driver@1.27.6", "type": "library", - "version": "1.27.4" + "version": "1.27.6" } ], "dependencies": [ @@ -42,11 +42,11 @@ "ref": "pkg:github/mongodb/libmongocrypt@1.10.1" }, { - "ref": "pkg:github/mongodb/mongo-c-driver@1.27.4" + "ref": "pkg:github/mongodb/mongo-c-driver@1.27.6" } ], "metadata": { - "timestamp": "2024-07-03T10:31:03.600797+00:00", + "timestamp": "2024-09-04T08:11:03.863506+00:00", "tools": [ { "externalReferences": [ @@ -90,7 +90,7 @@ ] }, "serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082", - "version": 3, + "version": 4, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.5" diff --git a/src/LIBMONGOC_VERSION_CURRENT b/src/LIBMONGOC_VERSION_CURRENT index bd9c63786..2a5aed46b 100644 --- a/src/LIBMONGOC_VERSION_CURRENT +++ b/src/LIBMONGOC_VERSION_CURRENT @@ -1 +1 @@ -1.27.5 +1.27.6 diff --git a/src/libmongoc b/src/libmongoc index 01decf26c..32898b16f 160000 --- a/src/libmongoc +++ b/src/libmongoc @@ -1 +1 @@ -Subproject commit 01decf26c18b1b89d97d3b55317910a3460741ae +Subproject commit 32898b16f8236470ad5610bf0f0b0071bee6a1b4