PHPC-2228: Upgrade libmongocrypt to 1.8.1 (#1428)

* Update expected error message for invalid crypt_shared override path

This was changed in mongodb/libmongocrypt@792beee for MONGOCRYPT-576

* Update update-submodule-sources script for zlib 1.2.13

libmongoc 1.24-dev recently bumped zlib from 1.2.12 to 1.2.13 (CDRIVER-4624). This change was applied to config.m4 in 14af5ea but that commit missed the update-submodule-sources script.

Author: jmikola

config.m4

@@ -291,7 +291,7 @@ if test "$PHP_MONGODB" != "no"; then
       AC_MSG_CHECKING(for libmongocrypt)
 
       if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongocrypt; then
-        if $PKG_CONFIG libmongocrypt --atleast-version 1.8.0; then
+        if $PKG_CONFIG libmongocrypt --atleast-version 1.8.1; then
           PHP_MONGODB_MONGOCRYPT_CFLAGS=`$PKG_CONFIG libmongocrypt --cflags`
           PHP_MONGODB_MONGOCRYPT_LIBS=`$PKG_CONFIG libmongocrypt --libs`
           PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt --modversion`
@@ -302,7 +302,7 @@ if test "$PHP_MONGODB" != "no"; then
           PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOCRYPT_LIBS, MONGODB_SHARED_LIBADD)
           AC_DEFINE(HAVE_SYSTEM_LIBMONGOCRYPT, 1, [Use system libmongocrypt])
         elif test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" = "yes"; then
-          AC_MSG_ERROR(system libmongocrypt must be upgraded to version >= 1.8.0)
+          AC_MSG_ERROR(system libmongocrypt must be upgraded to version >= 1.8.1)
         else
           AC_MSG_RESULT([found an older version, compiling without client-side encryption])
         fi

scripts/update-submodule-sources.php

@@ -8,7 +8,7 @@
     'PHP_MONGODB_BSON_SOURCES' => 'src/libmongoc/src/libbson/src/bson',
     'PHP_MONGODB_JSONSL_SOURCES' => 'src/libmongoc/src/libbson/src/jsonsl',
     'PHP_MONGODB_MONGOC_SOURCES' => 'src/libmongoc/src/libmongoc/src/mongoc',
-    'PHP_MONGODB_ZLIB_SOURCES' => 'src/libmongoc/src/zlib-1.2.12',
+    'PHP_MONGODB_ZLIB_SOURCES' => 'src/libmongoc/src/zlib-1.2.13',
     'PHP_MONGODB_MONGOCRYPT_SOURCES' => 'src/libmongocrypt/src',
     'PHP_MONGODB_MONGOCRYPT_CRYPTO_SOURCES' => 'src/libmongocrypt/src/crypto',
     'PHP_MONGODB_MONGOCRYPT_OS_POSIX_SOURCES' => 'src/libmongocrypt/src/os_posix',

src/LIBMONGOCRYPT_VERSION_CURRENT

@@ -1 +1 @@
-1.8.0-alpha0
+1.8.1

src/libmongocrypt

@@ -32,7 +32,7 @@ var_dump(get_module_info('crypt_shared library version'));
 <?php exit(0); ?>
 --EXPECTF--
 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
+A crypt_shared override path was specified [/not/found], but we failed to open a dynamic library at that location%A
 
 OK: Got MongoDB\Driver\Exception\EncryptionException
 Option 'cryptSharedLibRequired' is 'true', but failed to load the crypt_shared runtime library