update to 2.3.1HEADmaster

open https://jira.mongodb.org/browse/PHPC-2715 out-of-sources-tree builds
use patch from https://github.com/mongodb/mongo-php-driver/pull/2007

4 files changed, 71 insertions, 4 deletions

diff --git a/2007.patch b/2007.patch
new file mode 100644
index 0000000..9298175
--- /dev/null
+++ b/2007.patch
@@ -0,0 +1,58 @@
+From e5dc035216dc2e83d946682deb154ec839d67df9 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 30 Apr 2026 16:45:39 +0200
+Subject: [PATCH] PHPC-2715: fix out-of-sources-tree builds
+
+---
+ config.m4 | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/config.m4 b/config.m4
+index aa1a2afc9..e325d5f7a 100644
+--- a/config.m4
++++ b/config.m4
+@@ -387,6 +387,7 @@ if test "$PHP_MONGODB" != "no"; then
+     dnl of build layout.  Using $PWD here breaks PHP in-tree builds because $PWD is
+     dnl the PHP source/build root, not the extension's subdirectory within it.
+     php_mongodb_ext_builddir=PHP_EXT_BUILDDIR(mongodb)
++    php_mongodb_ext_srcdir=PHP_EXT_SRCDIR(mongodb)
+ 
+     dnl Add the build directories as include paths so the compiler finds generated
+     dnl config headers (common-config.h, bson/config.h, mongoc-config.h, etc.).
+@@ -419,12 +420,12 @@ if test "$PHP_MONGODB" != "no"; then
+     dnl For standalone out-of-source builds this stays in the build tree; for
+     dnl PHP in-tree builds it lands under ext/mongodb/ rather than the PHP root.
+     AC_CONFIG_FILES([
+-      ${php_mongodb_ext_builddir}/src/libmongoc/src/common/src/common-config.h
+-      ${php_mongodb_ext_builddir}/src/libmongoc/src/libbson/src/bson/config.h
+-      ${php_mongodb_ext_builddir}/src/libmongoc/src/libbson/src/bson/version.h
+-      ${php_mongodb_ext_builddir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h
+-      ${php_mongodb_ext_builddir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config-private.h
+-      ${php_mongodb_ext_builddir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h
++      ${php_mongodb_ext_srcdir}/src/libmongoc/src/common/src/common-config.h
++      ${php_mongodb_ext_srcdir}/src/libmongoc/src/libbson/src/bson/config.h
++      ${php_mongodb_ext_srcdir}/src/libmongoc/src/libbson/src/bson/version.h
++      ${php_mongodb_ext_srcdir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h
++      ${php_mongodb_ext_srcdir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config-private.h
++      ${php_mongodb_ext_srcdir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h
+     ])
+ 
+     if test "x$bundled_utf8proc" = "xyes"; then
+@@ -439,7 +440,7 @@ if test "$PHP_MONGODB" != "no"; then
+       PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/zlib-1.3.1/], $PHP_MONGODB_ZLIB_SOURCES, $PHP_MONGODB_ZLIB_CFLAGS)
+       PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/zlib-1.3.1/])
+       PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/zlib-1.3.1/])
+-      AC_CONFIG_FILES([${php_mongodb_ext_builddir}/src/libmongoc/src/zlib-1.3.1/zconf.h])
++      AC_CONFIG_FILES([${php_mongodb_ext_srcdir}/src/libmongoc/src/zlib-1.3.1/zconf.h])
+     fi
+ 
+     if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" = "yes"; then
+@@ -478,7 +479,7 @@ if test "$PHP_MONGODB" != "no"; then
+       PHP_MONGODB_ADD_BUILD_DIR([src/libmongocrypt/kms-message/src/])
+ 
+       AC_CONFIG_FILES([
+-        ${php_mongodb_ext_builddir}/src/libmongocrypt/src/mongocrypt-config.h
++        ${php_mongodb_ext_srcdir}/src/libmongocrypt/src/mongocrypt-config.h
+       ])
+     fi
+   fi
diff --git a/PHPINFO b/PHPINFO
index 1bed7ca..73a171a 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 mongodb
 
 MongoDB support => enabled
-MongoDB extension version => 2.3.0
+MongoDB extension version => 2.3.1
 MongoDB extension stability => stable
 libbson bundled version => 2.3.0
 libmongoc bundled version => 2.3.0
diff --git a/REFLECTION b/REFLECTION
index bb0a779..b809af1 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #147 mongodb version 2.3.0 ] {
+Extension [ <persistent> extension #148 mongodb version 2.3.1 ] {
 
   - Dependencies {
     Dependency [ date (Required) ]
@@ -14,7 +14,7 @@ Extension [ <persistent> extension #147 mongodb version 2.3.0 ] {
   }
 
   - Constants [2] {
-    Constant [ <persistent> string MONGODB_VERSION ] { 2.3.0 }
+    Constant [ <persistent> string MONGODB_VERSION ] { 2.3.1 }
     Constant [ <persistent> string MONGODB_STABILITY ] { stable }
   }
 
diff --git a/php-pecl-mongodb2.spec b/php-pecl-mongodb2.spec
index a987cec..97de169 100644
--- a/php-pecl-mongodb2.spec
+++ b/php-pecl-mongodb2.spec
@@ -35,7 +35,7 @@
 %global runtime_libcrypt %(pkg-config --silence-errors --modversion libmongocrypt 2>/dev/null || echo %{system_libcrypt})
 %endif
 
-%global upstream_version 2.3.0
+%global upstream_version 2.3.1
 #global upstream_prever  beta1
 #global upstream_lower   ~beta1
 %global sources          %{gh_proj}-%{upstream_version}%{?upstream_prever}
@@ -62,6 +62,8 @@ Source0:        %{sources}.tgz
 # get git snapshot with submodules
 Source1:        makesrc.sh
 
+Patch0:         2007.patch
+
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 8.1
@@ -130,6 +132,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %setup -q -c
 
 pushd %{sources}
+%patch -P0 -p1
+
 # Check our macro values
 cat src/libmongoc/VERSION_CURRENT
 grep -q %{bundled_libmongo} src/libmongoc/VERSION_CURRENT
@@ -264,6 +268,11 @@ OPT="-n"
 
 
 %changelog
+* Thu Apr 30 2026 Remi Collet <remi@remirepo.net> - 2.3.1-1
+- update to 2.3.1
+- open https://jira.mongodb.org/browse/PHPC-2715 out-of-sources-tree builds
+- use patch from https://github.com/mongodb/mongo-php-driver/pull/2007
+
 * Tue Apr 28 2026 Remi Collet <remi@remirepo.net> - 2.3.0-1
 - update to 2.3.0
 - use bundled libbson and libmongc 2.3.0