Skip to content

Commit da39d53

Browse files
authored
PHPC-2421, PHPC-2428: Update bundled dependencies (#1622)
* PHPC-2421: Update to libmongocrypt 1.11.0 * Update to latest libmongoc version
1 parent 9bd1244 commit da39d53

File tree

7 files changed

+8
-6
lines changed

7 files changed

+8
-6
lines changed

config.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,15 +299,15 @@ if test "$PHP_MONGODB" != "no"; then
299299
])
300300

301301
if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then
302-
PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.10.1], [
302+
PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.11.0], [
303303
PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt --modversion`
304304
PHP_MONGODB_MONGOCRYPT_VERSION_STRING="System ($PHP_MONGODB_MONGOCRYPT_VERSION)"
305305
306306
PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_MONGOCRYPT_CFLAGS"
307307
PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOCRYPT_LIBS, MONGODB_SHARED_LIBADD)
308308
AC_DEFINE(HAVE_SYSTEM_LIBMONGOCRYPT, 1, [Use system libmongocrypt])
309309
],[
310-
AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.10.1)
310+
AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.11.0)
311311
])
312312
fi
313313
fi

config.w32

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ if (PHP_MONGODB != "no") {
177177
// TODO: Support building with Secure Channel on Windows
178178
MONGOC_ENABLE_SSL_SECURE_CHANNEL: 0,
179179
MONGOC_ENABLE_CRYPTO_CNG: 0,
180+
MONGOC_HAVE_BCRYPT_PBKDF2: 0,
180181
// Secure Transport does not apply to Windows
181182
MONGOC_ENABLE_SSL_SECURE_TRANSPORT: 0,
182183
MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO: 0,

scripts/autotools/libmongoc/CheckSSL.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ AC_MSG_RESULT([$PHP_MONGODB_SSL])
186186
dnl Disable Windows SSL and crypto
187187
AC_SUBST(MONGOC_ENABLE_SSL_SECURE_CHANNEL, 0)
188188
AC_SUBST(MONGOC_ENABLE_CRYPTO_CNG, 0)
189+
AC_SUBST(MONGOC_HAVE_BCRYPT_PBKDF2, 0)
189190

190191
if test "$PHP_MONGODB_SSL" = "openssl" -o "$PHP_MONGODB_SSL" = "libressl" -o "$PHP_MONGODB_SSL" = "darwin"; then
191192
AC_SUBST(MONGOC_ENABLE_SSL, 1)

src/LIBMONGOCRYPT_VERSION_CURRENT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.10.1
1+
1.11.0

src/LIBMONGOC_VERSION_CURRENT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.28.0-20240715+git03e993d856
1+
1.28.0-20240827+git1858014e01

src/libmongoc

Submodule libmongoc updated 164 files

src/libmongocrypt

Submodule libmongocrypt updated 179 files

0 commit comments

Comments
 (0)