Merge branch 'v1.14'

v1.14 pointed to libmongoc 1.14.2, which was released some time after the submodule target in the master branch (a dev commit before libmongoc 1.23.0). To resolve this conflict, the libmongoc submodule has been bumped to 1.23.0.

Note: a libmongoc 1.23.1 tag also exists, but that bump can be done in a subsequent PHPC ticket related to the libmongoc changes therein.

This also adds a section to CONTRIBUTING.md to provide guidance on resolving submodule merge conflicts.

Author: jmikola

.evergreen/config.yml

@@ -1154,9 +1154,9 @@ axes:
     display_name: libmongoc version
     values:
       - id: "lowest-supported"
-        display_name: "1.22.1"
+        display_name: "1.23.0"
         variables:
-          LIBMONGOC_VERSION: "1.22.1"
+          LIBMONGOC_VERSION: "1.23.0"
       - id: "upcoming-stable"
         display_name: "1.23-dev"
         variables:

CONTRIBUTING.md

@@ -151,6 +151,23 @@ libmongoc, libbson, and libmongocrypt. If a new version of either library is
 available, the submodule and build configuration will need to be updated to
 reflect the new sources and/or package version.
 
+### Resolving Submodule Conflicts When Merging Maintenance Branches
+
+When merging a maintenance branch up to master, it is quite possible for there
+to be a submodule conflict (and in related files). Resolving a merge conflict
+should never result in downgrading a submodule to an older version. Rather, the
+submodule should be conservatively advanced and satisfy any requirements for
+incoming changes from the maintenance branch.
+
+For example, the 1.14.2 release bumped libmongoc from 1.22.1 to 1.22.2. When
+merging v1.14 into master (1.15-dev), a conflict arose because the libmongoc
+submodule in master pointed to a 1.23-dev commit (before the 1.23.0 release).
+In this case, there were no particular requirements for incoming changes from
+the v1.14 branch and the libmongoc submodule was bumped to 1.23.0 even though
+a 1.23.1 tag also existed at the time. The bump to libmongoc 1.23.1 was left to
+another PHPC ticket in the 1.15.0 milestone, which actually depended on the
+libmongoc changes therein.
+
 ### Updating libmongoc and libbson
 
 #### Update libmongoc submodule

config.m4

@@ -243,14 +243,14 @@ if test "$PHP_MONGODB" != "no"; then
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
     AC_MSG_CHECKING(for libbson)
     if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libbson-1.0; then
-      if $PKG_CONFIG libbson-1.0 --atleast-version 1.22.1; then
+      if $PKG_CONFIG libbson-1.0 --atleast-version 1.23.0; then
         PHP_MONGODB_BSON_CFLAGS=`$PKG_CONFIG libbson-1.0 --cflags`
         PHP_MONGODB_BSON_LIBS=`$PKG_CONFIG libbson-1.0 --libs`
         PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
         PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
         AC_MSG_RESULT(version $PHP_MONGODB_BSON_VERSION found)
       else
-        AC_MSG_ERROR(system libbson must be upgraded to version >= 1.22.1)
+        AC_MSG_ERROR(system libbson must be upgraded to version >= 1.23.0)
       fi
     else
       AC_MSG_ERROR(pkgconfig and libbson must be installed)
@@ -261,14 +261,14 @@ if test "$PHP_MONGODB" != "no"; then
 
     AC_MSG_CHECKING(for libmongoc)
     if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongoc-1.0; then
-      if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.22.1; then
+      if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.23.0; then
         PHP_MONGODB_MONGOC_CFLAGS=`$PKG_CONFIG libmongoc-1.0 --cflags`
         PHP_MONGODB_MONGOC_LIBS=`$PKG_CONFIG libmongoc-1.0 --libs`
         PHP_MONGODB_MONGOC_VERSION=`$PKG_CONFIG libmongoc-1.0 --modversion`
         PHP_MONGODB_MONGOC_VERSION_STRING="System ($PHP_MONGODB_MONGOC_VERSION)"
         AC_MSG_RESULT(version $PHP_MONGODB_MONGOC_VERSION found)
       else
-        AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.22.1)
+        AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.23.0)
       fi
     else
       AC_MSG_ERROR(pkgconfig and libmongoc must be installed)

scripts/autotools/libmongoc/CheckResolv.m4

@@ -1,11 +1,12 @@
 dnl Disable Windows DNSAPI
 AC_SUBST(MONGOC_HAVE_DNSAPI, 0)
 
-need_libresolv="no"
+found_resolv="no"
 
 old_LIBS="$LIBS"
-dnl On AIX, resolv functions are in libc.
-if test "x$os_aix" = "xno"; then
+
+dnl Link libresolv for detection (note: on AIX, resolv functions are in libc)
+if test "$os_aix" != "yes"; then
   LIBS="$LIBS -lresolv"
 fi
 
@@ -28,6 +29,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
    AC_SUBST(MONGOC_HAVE_RES_SEARCH, 0)
    AC_SUBST(MONGOC_HAVE_RES_NSEARCH, 1)
 
+   found_resolv="yes"
+
    dnl We have res_nsearch. Call res_ndestroy (BSD/Mac) or res_nclose (Linux)?
    AC_MSG_CHECKING([for res_ndestroy])
    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@ -82,9 +85,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
    ]])], [
       AC_MSG_RESULT([yes])
       AC_SUBST(MONGOC_HAVE_RES_SEARCH, 1)
-      if test "x$os_aix" = "xno"; then
-        need_libresolv="yes"
-      fi
+
+      found_resolv="yes"
    ], [
       AC_MSG_RESULT([no])
       AC_SUBST(MONGOC_HAVE_RES_SEARCH, 0)
@@ -93,6 +95,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 
 LIBS="$old_LIBS"
 
-AS_IF([test "$need_libresolv" = "yes"],[
+dnl Link libresolv if needed (note: on AIX, resolv functions are in libc)
+AS_IF([test "$found_resolv" = "yes" -a "$os_aix" != "yes"],[
   PHP_ADD_LIBRARY([resolv],,[MONGODB_SHARED_LIBADD])
 ])

src/LIBMONGOC_VERSION_CURRENT

@@ -1 +1 @@
-1.11.1-20220829+git623d659f00
+1.23.0

src/libmongoc

@@ -35,7 +35,7 @@ OK: Got MongoDB\Driver\Exception\EncryptionException
 A crypt_shared override path was specified [/not/found], but we failed to open a dynamic library at that location
 
 OK: Got MongoDB\Driver\Exception\EncryptionException
-Option 'cryptSharedLibRequired' is 'true', but failed to load the crypt_shared runtime lib%r(r?)%rary
+Option 'cryptSharedLibRequired' is 'true', but failed to load the crypt_shared runtime library
 
 string(7) "unknown"
 ===DONE===