Merge v1.x into v2.x (#1780)

Author: mongodb-php-bot

.github/workflows/tests.yml

@@ -53,6 +53,10 @@ jobs:
  with:
  submodules: true
 
+ - uses: actions/setup-python@v5
+ with:
+ python-version: '3.13'
+
  - id: setup-mongodb
  uses: mongodb-labs/drivers-evergreen-tools@master
  with:

config.m4

@@ -298,7 +298,6 @@ if test "$PHP_MONGODB" != "no"; then
  m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/CheckHost.m4)
  m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/PlatformFlags.m4)
 
- m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libbson/CheckAtomics.m4)
  m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libbson/CheckHeaders.m4)
  m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libbson/Endian.m4)
  m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libbson/FindDependencies.m4)
@@ -312,7 +311,6 @@ if test "$PHP_MONGODB" != "no"; then
  m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libmongoc/Endian.m4)
  m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libmongoc/FindDependencies.m4)
  m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libmongoc/Versions.m4)
- m4_include(PHP_MONGODB_BASEDIR/scripts/autotools/libmongoc/WeakSymbols.m4)
 
  dnl This include modifies the value of $PHP_MONGODB_CLIENT_SIDE_ENCRYPTION to "yes"
  dnl or "no" depending on whether dependencies for libmongocrypt are fulfilled

config.w32

@@ -130,28 +130,16 @@ if (PHP_MONGODB != "no") {
  BSON_OS: 2,
  BSON_HAVE_STDBOOL_H: 0,
  BSON_HAVE_STRINGS_H: 0,
- BSON_HAVE_ATOMIC_32_ADD_AND_FETCH: 0,
- BSON_HAVE_ATOMIC_64_ADD_AND_FETCH: 0,
- BSON_PTHREAD_ONCE_INIT_NEEDS_BRACES: 0,
  BSON_HAVE_CLOCK_GETTIME: 0,
  BSON_HAVE_STRNLEN: 0,
  BSON_HAVE_SNPRINTF: 0,
  BSON_HAVE_STRLCPY: 0,
- BSON_HAVE_REALLOCF: 0,
- BSON_NEEDS_SET_OUTPUT_FORMAT: 0,
  BSON_HAVE_TIMESPEC: 0,
  BSON_EXTRA_ALIGN: 0,
- BSON_HAVE_SYSCALL_TID: 0,
- BSON_HAVE_DECIMAL128: 0,
  BSON_HAVE_GMTIME_R: 0,
- BSON_HAVE_RAND_R: 0,
- BSON_HAVE_ARC4RANDOM_BUF: 0
+ BSON_HAVE_RAND_R: 0
  };
 
- if (CHECK_FUNC_IN_HEADER("stdio.h", "_set_output_format")) {
- bson_opts.BSON_NEEDS_SET_OUTPUT_FORMAT = 1;
- }
-
  mongodb_generate_header(
  configure_module_dirname + "/src/libmongoc/src/libbson/src/bson/bson-config.h.in",
  configure_module_dirname + "/src/libmongoc/src/libbson/src/bson/bson-config.h",
@@ -187,7 +175,6 @@ if (PHP_MONGODB != "no") {
  MONGOC_ENABLE_MONGODB_AWS_AUTH: 0,
  MONGOC_ENABLE_SASL: 0,
  MONGOC_ENABLE_SASL_CYRUS: 0,
- MONGOC_ENABLE_SASL_GSSAPI: 0,
  MONGOC_ENABLE_SASL_SSPI: 0,
  MONGOC_ENABLE_SRV: 0,
  MONGOC_ENABLE_RDTSCP: 0,
@@ -196,7 +183,6 @@ if (PHP_MONGODB != "no") {
  MONGOC_HAVE_SASL_CLIENT_DONE: 0,
  MONGOC_HAVE_SCHED_GETCPU: 0,
  MONGOC_HAVE_SOCKLEN: 1,
- MONGOC_HAVE_WEAK_SYMBOLS: 0,
  MONGOC_NO_AUTOMATIC_GLOBALS: 1,
  MONGOC_SOCKET_ARG2: "struct sockaddr",
  MONGOC_SOCKET_ARG3: "socklen_t",
@@ -253,6 +239,10 @@ if (PHP_MONGODB != "no") {
  CHECK_HEADER_ADD_INCLUDE("sasl/sasl.h", "CFLAGS_MONGODB")) {
  mongoc_opts.MONGOC_ENABLE_SASL = 1;
  mongoc_opts.MONGOC_ENABLE_SASL_CYRUS = 1;
+
+ // Referenced by _mongoc_cyrus_verifyfile_cb in mongoc-cyrus.c on Windows
+ ADD_FLAG("CFLAGS_MONGODB", "/D MONGOC_CYRUS_PLUGIN_PATH_PREFIX=NULL");
+
  if (CHECK_FUNC_IN_HEADER("sasl/sasl.h", "sasl_client_done")) {
  mongoc_opts.MONGOC_HAVE_SASL_CLIENT_DONE = 1;
  }

sbom.json

@@ -19,34 +19,34 @@
  "version": "1.12.0"
  },
  {
- "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.29.0",
+ "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.29.2",
  "externalReferences": [
  {
  "type": "distribution",
- "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.29.0.tar.gz"
+ "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.29.2.tar.gz"
  },
  {
  "type": "website",
- "url": "https://github.com/mongodb/mongo-c-driver/tree/1.29.0"
+ "url": "https://github.com/mongodb/mongo-c-driver/tree/1.29.2"
  }
  ],
  "group": "mongodb",
  "name": "mongo-c-driver",
- "purl": "pkg:github/mongodb/mongo-c-driver@1.29.0",
+ "purl": "pkg:github/mongodb/mongo-c-driver@1.29.2",
  "type": "library",
- "version": "1.29.0"
+ "version": "1.29.2"
  }
  ],
  "dependencies": [
  {
  "ref": "pkg:github/mongodb/libmongocrypt@1.12.0"
  },
  {
- "ref": "pkg:github/mongodb/mongo-c-driver@1.29.0"
+ "ref": "pkg:github/mongodb/mongo-c-driver@1.29.2"
  }
  ],
  "metadata": {
- "timestamp": "2024-11-12T18:00:38.546484+00:00",
+ "timestamp": "2025-01-14T14:24:24.250261+00:00",
  "tools": [
  {
  "externalReferences": [
@@ -90,7 +90,7 @@
  ]
  },
  "serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082",
- "version": 7,
+ "version": 8,
  "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
  "bomFormat": "CycloneDX",
  "specVersion": "1.5",

scripts/autotools/libbson/CheckAtomics.m4

@@ -13,46 +13,6 @@ if test "$bson_cv_have_strnlen" = yes; then
  AC_SUBST(BSON_HAVE_STRNLEN, 1)
 fi
 
-# Check for reallocf() (BSD/Darwin)
-AC_SUBST(BSON_HAVE_REALLOCF, 0)
-AC_CACHE_CHECK([for reallocf],
- bson_cv_have_reallocf,
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <stdlib.h>
-int reallocf () { return 0; }
-]])],
- [bson_cv_have_reallocf=no],
- [bson_cv_have_reallocf=yes])])
-if test "$bson_cv_have_reallocf" = yes; then
- AC_SUBST(BSON_HAVE_REALLOCF, 1)
-fi
-
-# Check for syscall()
-AC_SUBST(BSON_HAVE_SYSCALL_TID, 0)
-AC_CACHE_CHECK([for syscall],
- bson_cv_have_syscall_tid,
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <unistd.h>
-#include <sys/syscall.h>
-int syscall () { return 0; }
-]])],
- [bson_cv_have_syscall_tid=no],
- [bson_cv_have_syscall_tid=yes])])
-if test "$bson_cv_have_syscall_tid" = yes -a "$os_darwin" != "yes"; then
- AC_CACHE_CHECK([for SYS_gettid],
- bson_cv_have_sys_gettid_tid,
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <unistd.h>
-#include <sys/syscall.h>
-int gettid () { return SYS_gettid; }
- ]])],
- [bson_cv_have_sys_gettid_tid=yes],
- [bson_cv_have_sys_gettid_tid=no])])
- if test "$bson_cv_have_sys_gettid_tid" = yes; then
- AC_SUBST(BSON_HAVE_SYSCALL_TID, 1)
- fi
-fi
-
 # Check for snprintf()
 AC_SUBST(BSON_HAVE_SNPRINTF, 0)
 AC_CHECK_FUNC(snprintf, [AC_SUBST(BSON_HAVE_SNPRINTF, 1)])
@@ -79,10 +39,6 @@ AC_CHECK_FUNC(gmtime_r, [AC_SUBST(BSON_HAVE_GMTIME_R, 1)])
 AC_SUBST(BSON_HAVE_RAND_R, 0)
 AC_CHECK_FUNC(rand_r, [AC_SUBST(BSON_HAVE_RAND_R, 1)])
 
-# Check for arc4random_buf()
-AC_SUBST(BSON_HAVE_ARC4RANDOM_BUF, 0)
-AC_CHECK_FUNC(arc4random_buf, [AC_SUBST(BSON_HAVE_ARC4RANDOM_BUF, 1)])
-
 # Check for pthreads. We might need to make this better to handle mingw,
 # but I actually think it is okay to just check for it even though we will
 # use win32 primatives.
@@ -96,26 +52,3 @@ AX_PTHREAD([
 ],[
  AC_MSG_ERROR([libbson requires pthreads on non-Windows platforms.])
 ])
-
-
-# The following is borrowed from the guile configure script.
-#
-# On past versions of Solaris, believe 8 through 10 at least, you
-# had to write "pthread_once_t foo = { PTHREAD_ONCE_INIT };".
-# This is contrary to POSIX:
-# http://www.opengroup.org/onlinepubs/000095399/functions/pthread_once.html
-# Check here if this style is required.
-#
-# glibc (2.3.6 at least) works both with or without braces, so the
-# test checks whether it works without.
-#
-AC_SUBST(BSON_PTHREAD_ONCE_INIT_NEEDS_BRACES, 0)
-AC_CACHE_CHECK([whether PTHREAD_ONCE_INIT needs braces],
- bson_cv_need_braces_on_pthread_once_init,
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>
- pthread_once_t foo = PTHREAD_ONCE_INIT;]])],
- [bson_cv_need_braces_on_pthread_once_init=no],
- [bson_cv_need_braces_on_pthread_once_init=yes])])
-if test "$bson_cv_need_braces_on_pthread_once_init" = yes; then
- AC_SUBST(BSON_PTHREAD_ONCE_INIT_NEEDS_BRACES, 1)
-fi

scripts/autotools/libbson/FindDependencies.m4

@@ -1 +1 @@
-1.29.0
+1.29.2

scripts/autotools/libmongoc/WeakSymbols.m4

@@ -92,6 +92,8 @@ zval* php_phongo_prep_legacy_option(zval* options, const char* key, bool* alloca
 Z_ADDREF_P(options);
 *allocated = true;
 
+php_error_docref(NULL, E_DEPRECATED, "Passing the \"%s\" option directly is deprecated and will be removed in ext-mongodb 2.0", key);
+
 return new_options;
 }