From fa5b43366407bc0e5b0a919ed374decd9022b2f9 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 7 Oct 2025 16:37:48 +0200 Subject: [PATCH 1/3] PHPC-2637: Update to libmongoc 1.30.6 (#1882) --- .../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 2f847e620..991353007 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.30.5" + LIBMONGOC_VERSION: "1.30.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 cb555f80b..54d5a813a 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.30.5" + LIBMONGOC_VERSION: "1.30.6" - func: "upload build" - name: "build-php-%phpVersion%-libmongoc-next-stable" diff --git a/config.m4 b/config.m4 index a8626c5a1..bf4da3e09 100644 --- a/config.m4 +++ b/config.m4 @@ -277,7 +277,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.30.5], [ + PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.30.6], [ PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion` PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)" @@ -285,10 +285,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.30.5]) + AC_MSG_ERROR([Could not find system library for libbson >= 1.30.6]) ]) - PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.30.5], [ + PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.30.6], [ PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion` PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)" @@ -296,7 +296,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.30.5) + AC_MSG_ERROR(Could not find system library for libmongoc >= 1.30.6) ]) if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then diff --git a/sbom.json b/sbom.json index df00c4693..0e72977bf 100644 --- a/sbom.json +++ b/sbom.json @@ -19,22 +19,22 @@ "version": "1.12.0" }, { - "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.30.5", + "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.30.6", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.30.5.tar.gz" + "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.30.6.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/mongo-c-driver/tree/1.30.5" + "url": "https://github.com/mongodb/mongo-c-driver/tree/1.30.6" } ], "group": "mongodb", "name": "mongo-c-driver", - "purl": "pkg:github/mongodb/mongo-c-driver@1.30.5", + "purl": "pkg:github/mongodb/mongo-c-driver@1.30.6", "type": "library", - "version": "1.30.5" + "version": "1.30.6" } ], "dependencies": [ @@ -42,11 +42,11 @@ "ref": "pkg:github/mongodb/libmongocrypt@1.12.0" }, { - "ref": "pkg:github/mongodb/mongo-c-driver@1.30.5" + "ref": "pkg:github/mongodb/mongo-c-driver@1.30.6" } ], "metadata": { - "timestamp": "2025-06-10T10:24:13.960044+00:00", + "timestamp": "2025-10-07T14:08:41.389820+00:00", "tools": [ { "externalReferences": [ @@ -90,7 +90,7 @@ ] }, "serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082", - "version": 12, + "version": 13, "$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 ff592d353..8eead96fe 100644 --- a/src/LIBMONGOC_VERSION_CURRENT +++ b/src/LIBMONGOC_VERSION_CURRENT @@ -1 +1 @@ -1.30.5 +1.30.6 diff --git a/src/libmongoc b/src/libmongoc index 252989c31..0106ff90b 160000 --- a/src/libmongoc +++ b/src/libmongoc @@ -1 +1 @@ -Subproject commit 252989c310f7a326230f66311630ba259e34e4b3 +Subproject commit 0106ff90b108bbf312db122fec7d263543028355 From d62861079f1346d5d3426a910ab2abd6e6a8a2e4 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Tue, 7 Oct 2025 14:54:14 +0000 Subject: [PATCH 2/3] Package 1.21.2 Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- phongo_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phongo_version.h b/phongo_version.h index 210bd7f2c..872ef0cf9 100644 --- a/phongo_version.h +++ b/phongo_version.h @@ -22,8 +22,8 @@ * publishing a release. */ /* clang-format off */ -#define PHP_MONGODB_VERSION "1.21.2dev" -#define PHP_MONGODB_STABILITY "devel" +#define PHP_MONGODB_VERSION "1.21.2" +#define PHP_MONGODB_STABILITY "stable" #define PHP_MONGODB_VERSION_DESC 1,21,2,0 /* clang-format on */ From 06c085704b7c5ba98b0b69d7b6fc5a465d2cb459 Mon Sep 17 00:00:00 2001 From: "mongodb-dbx-release-bot[bot]" <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> Date: Tue, 7 Oct 2025 14:54:17 +0000 Subject: [PATCH 3/3] Back to -dev Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com> --- phongo_version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phongo_version.h b/phongo_version.h index 872ef0cf9..3b889cf13 100644 --- a/phongo_version.h +++ b/phongo_version.h @@ -22,9 +22,9 @@ * publishing a release. */ /* clang-format off */ -#define PHP_MONGODB_VERSION "1.21.2" -#define PHP_MONGODB_STABILITY "stable" -#define PHP_MONGODB_VERSION_DESC 1,21,2,0 +#define PHP_MONGODB_VERSION "1.21.3dev" +#define PHP_MONGODB_STABILITY "devel" +#define PHP_MONGODB_VERSION_DESC 1,21,3,0 /* clang-format on */ #endif /* PHONGO_VERSION_H */