From 337aa35ad4514463b18595a92502bc961acd3c9e Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Wed, 3 Jul 2024 12:27:57 +0200 Subject: [PATCH] PHPC-2409: Update to libmongoc 1.27.4 (#1600) --- .../generated/build/build-libmongoc-8.3.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-8.3.yml b/.evergreen/config/generated/build/build-libmongoc-8.3.yml index 01b2889f4..cb67c6450 100644 --- a/.evergreen/config/generated/build/build-libmongoc-8.3.yml +++ b/.evergreen/config/generated/build/build-libmongoc-8.3.yml @@ -12,7 +12,7 @@ tasks: - func: "compile driver" vars: PHP_VERSION: "8.3" - LIBMONGOC_VERSION: "1.27.2" + LIBMONGOC_VERSION: "1.27.4" - 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 7298165f3..aaa6dd70e 100644 --- a/.evergreen/config/templates/build/build-libmongoc.yml +++ b/.evergreen/config/templates/build/build-libmongoc.yml @@ -11,7 +11,7 @@ tasks: - func: "compile driver" vars: PHP_VERSION: "%phpVersion%" - LIBMONGOC_VERSION: "1.27.2" + LIBMONGOC_VERSION: "1.27.4" - func: "upload build" - name: "build-php-%phpVersion%-libmongoc-next-stable" diff --git a/config.m4 b/config.m4 index 66902e010..99b38740c 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.2], [ + PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.27.4], [ 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.2]) + AC_MSG_ERROR([Could not find system library for libbson >= 1.27.4]) ]) - PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.27.2], [ + PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.27.4], [ 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.2) + AC_MSG_ERROR(Could not find system library for libmongoc >= 1.27.4) ]) if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then diff --git a/sbom.json b/sbom.json index 3c65ffcc8..baf9d4c8f 100644 --- a/sbom.json +++ b/sbom.json @@ -19,22 +19,22 @@ "version": "1.10.0" }, { - "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.27.2", + "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.27.4", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.27.2.tar.gz" + "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.27.4.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/mongo-c-driver/tree/1.27.2" + "url": "https://github.com/mongodb/mongo-c-driver/tree/1.27.4" } ], "group": "mongodb", "name": "mongo-c-driver", - "purl": "pkg:github/mongodb/mongo-c-driver@1.27.2", + "purl": "pkg:github/mongodb/mongo-c-driver@1.27.4", "type": "library", - "version": "1.27.2" + "version": "1.27.4" } ], "dependencies": [ @@ -42,11 +42,11 @@ "ref": "pkg:github/mongodb/libmongocrypt@1.10.0" }, { - "ref": "pkg:github/mongodb/mongo-c-driver@1.27.2" + "ref": "pkg:github/mongodb/mongo-c-driver@1.27.4" } ], "metadata": { - "timestamp": "2024-06-06T07:13:52.679415+00:00", + "timestamp": "2024-07-03T08:46:07.057692+00:00", "tools": [ { "externalReferences": [ @@ -90,7 +90,7 @@ ] }, "serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082", - "version": 1, + "version": 2, "$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 457f03854..d6201580e 100644 --- a/src/LIBMONGOC_VERSION_CURRENT +++ b/src/LIBMONGOC_VERSION_CURRENT @@ -1 +1 @@ -1.27.2 +1.27.4 diff --git a/src/libmongoc b/src/libmongoc index a08d59d8d..3d1308b9f 160000 --- a/src/libmongoc +++ b/src/libmongoc @@ -1 +1 @@ -Subproject commit a08d59d8d3971a02954b6b8e659c656989a15315 +Subproject commit 3d1308b9fbc8411f3f62989bcfffc5790a7c63e4