From 29a26243a3aee6602efcfea24738478a682bedea Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Tue, 23 Jan 2024 22:22:58 -0500 Subject: [PATCH] Bump libmongoc to 1.26-dev This pulls in CDRIVER-4754, which is needed for PHPLIB-1297 --- .evergreen/config/generated/build/build-libmongoc-8.2.yml | 5 +++-- .evergreen/config/templates/build/build-libmongoc.yml | 5 +++-- config.m4 | 8 ++++---- src/libmongoc | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.evergreen/config/generated/build/build-libmongoc-8.2.yml b/.evergreen/config/generated/build/build-libmongoc-8.2.yml index 657efe6c5..b4f0abfa6 100644 --- a/.evergreen/config/generated/build/build-libmongoc-8.2.yml +++ b/.evergreen/config/generated/build/build-libmongoc-8.2.yml @@ -12,7 +12,7 @@ tasks: - func: "compile driver" vars: PHP_VERSION: "8.2" - LIBMONGOC_VERSION: "1.25.2" + LIBMONGOC_VERSION: "1eacb5d46f39c5404586e5d3d32e4bf9e6670bd2" - func: "upload build" - name: "build-php-8.2-libmongoc-next-stable" @@ -21,7 +21,8 @@ tasks: - func: "compile driver" vars: PHP_VERSION: "8.2" - LIBMONGOC_VERSION: "r1.25" + # TODO: change to r1.26 once 1.26.0 is released + LIBMONGOC_VERSION: "1eacb5d46f39c5404586e5d3d32e4bf9e6670bd2" - func: "upload build" - name: "build-php-8.2-libmongoc-latest" diff --git a/.evergreen/config/templates/build/build-libmongoc.yml b/.evergreen/config/templates/build/build-libmongoc.yml index 98bda2cae..31ef25847 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.25.2" + LIBMONGOC_VERSION: "1eacb5d46f39c5404586e5d3d32e4bf9e6670bd2" - func: "upload build" - name: "build-php-%phpVersion%-libmongoc-next-stable" @@ -20,7 +20,8 @@ tasks: - func: "compile driver" vars: PHP_VERSION: "%phpVersion%" - LIBMONGOC_VERSION: "r1.25" + # TODO: change to r1.26 once 1.26.0 is released + LIBMONGOC_VERSION: "1eacb5d46f39c5404586e5d3d32e4bf9e6670bd2" - func: "upload build" - name: "build-php-%phpVersion%-libmongoc-latest" diff --git a/config.m4 b/config.m4 index c634707fc..71b88b341 100644 --- a/config.m4 +++ b/config.m4 @@ -270,7 +270,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.25.2], [ + PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.26.0], [ PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion` PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)" @@ -278,10 +278,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.25.2]) + AC_MSG_ERROR([Could not find system library for libbson >= 1.26.0]) ]) - PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.25.2], [ + PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.26.0], [ PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion` PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)" @@ -289,7 +289,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.25.2) + AC_MSG_ERROR(Could not find system library for libmongoc >= 1.26.0) ]) if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then diff --git a/src/libmongoc b/src/libmongoc index 3fa62f352..1eacb5d46 160000 --- a/src/libmongoc +++ b/src/libmongoc @@ -1 +1 @@ -Subproject commit 3fa62f35243445c9dbca283f762712a38a705dc5 +Subproject commit 1eacb5d46f39c5404586e5d3d32e4bf9e6670bd2