PHPC-2409: Update to libmongoc 1.27.4 (#1600)

alcaeus · web-flow · commit 337aa35ad451 · 2024-07-03T12:27:57.000+02:00
diff --git a/.evergreen/config/generated/build/build-libmongoc-8.3.yml b/.evergreen/config/generated/build/build-libmongoc-8.3.yml
diff --git a/.evergreen/config/templates/build/build-libmongoc.yml b/.evergreen/config/templates/build/build-libmongoc.yml
@@ -11,7 +11,7 @@ tasks:
       - func: "compile driver"
         vars:
           PHP_VERSION: "%phpVersion%"
-          LIBMONGOC_VERSION: "1.27.2"
+          LIBMONGOC_VERSION: "1.27.4"
       - func: "upload build"
 
   - name: "build-php-%phpVersion%-libmongoc-next-stable"
diff --git a/config.m4 b/config.m4
@@ -276,26 +276,26 @@ if test "$PHP_MONGODB" != "no"; then
   PHP_MONGODB_MONGOCRYPT_VERSION_STRING="None"
 
   if test "$PHP_MONGODB_SYSTEM_LIBS" != "no"; then
-    PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.27.2], [
+    PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.27.4], [
       PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
       PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
 
       PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_BSON_CFLAGS"
       PHP_EVAL_LIBLINE($PHP_MONGODB_BSON_LIBS, MONGODB_SHARED_LIBADD)
       AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson])
     ],[
-      AC_MSG_ERROR([Could not find system library for libbson >= 1.27.2])
+      AC_MSG_ERROR([Could not find system library for libbson >= 1.27.4])
     ])
 
-    PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.27.2], [
+    PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.27.4], [
       PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
       PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
 
       PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_MONGOC_CFLAGS"
       PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOC_LIBS, MONGODB_SHARED_LIBADD)
       AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc])
     ],[
-      AC_MSG_ERROR(Could not find system library for libmongoc >= 1.27.2)
+      AC_MSG_ERROR(Could not find system library for libmongoc >= 1.27.4)
     ])
 
     if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then
diff --git a/sbom.json b/sbom.json
@@ -19,34 +19,34 @@
       "version": "1.10.0"
     },
     {
-      "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.27.2",
+      "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.27.4",
       "externalReferences": [
         {
           "type": "distribution",
-          "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.27.2.tar.gz"
+          "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.27.4.tar.gz"
         },
         {
           "type": "website",
-          "url": "https://github.com/mongodb/mongo-c-driver/tree/1.27.2"
+          "url": "https://github.com/mongodb/mongo-c-driver/tree/1.27.4"
         }
       ],
       "group": "mongodb",
       "name": "mongo-c-driver",
-      "purl": "pkg:github/mongodb/mongo-c-driver@1.27.2",
+      "purl": "pkg:github/mongodb/mongo-c-driver@1.27.4",
       "type": "library",
-      "version": "1.27.2"
+      "version": "1.27.4"
     }
   ],
   "dependencies": [
     {
       "ref": "pkg:github/mongodb/libmongocrypt@1.10.0"
     },
     {
-      "ref": "pkg:github/mongodb/mongo-c-driver@1.27.2"
+      "ref": "pkg:github/mongodb/mongo-c-driver@1.27.4"
     }
   ],
   "metadata": {
-    "timestamp": "2024-06-06T07:13:52.679415+00:00",
+    "timestamp": "2024-07-03T08:46:07.057692+00:00",
     "tools": [
       {
         "externalReferences": [
@@ -90,7 +90,7 @@
     ]
   },
   "serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082",
-  "version": 1,
+  "version": 2,
   "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
   "bomFormat": "CycloneDX",
   "specVersion": "1.5"
diff --git a/src/LIBMONGOC_VERSION_CURRENT b/src/LIBMONGOC_VERSION_CURRENT
@@ -1 +1 @@
-1.27.2
+1.27.4
diff --git a/src/libmongoc b/src/libmongoc
@@ -1 +1 @@
-Subproject commit a08d59d8d3971a02954b6b8e659c656989a15315
+Subproject commit 3d1308b9fbc8411f3f62989bcfffc5790a7c63e4

Original file line number	Diff line number	Diff line change
`@@ -19,34 +19,34 @@`
`19`	`19`	`"version": "1.10.0"`
`20`	`20`	`},`
`21`	`21`	`{`
`22`		`- "bom-ref": "pkg:github/mongodb/[email protected].2",`
	`22`	`+ "bom-ref": "pkg:github/mongodb/[email protected].4",`
`23`	`23`	`"externalReferences": [`
`24`	`24`	`{`
`25`	`25`	`"type": "distribution",`
`26`		`- "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.27.2.tar.gz"`
	`26`	`+ "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.27.4.tar.gz"`
`27`	`27`	`},`
`28`	`28`	`{`
`29`	`29`	`"type": "website",`
`30`		`- "url": "https://github.com/mongodb/mongo-c-driver/tree/1.27.2"`
	`30`	`+ "url": "https://github.com/mongodb/mongo-c-driver/tree/1.27.4"`
`31`	`31`	`}`
`32`	`32`	`],`
`33`	`33`	`"group": "mongodb",`
`34`	`34`	`"name": "mongo-c-driver",`
`35`		`- "purl": "pkg:github/mongodb/[email protected].2",`
	`35`	`+ "purl": "pkg:github/mongodb/[email protected].4",`
`36`	`36`	`"type": "library",`
`37`		`- "version": "1.27.2"`
	`37`	`+ "version": "1.27.4"`
`38`	`38`	`}`
`39`	`39`	`],`
`40`	`40`	`"dependencies": [`
`41`	`41`	`{`
`42`	`42`	`"ref": "pkg:github/mongodb/[email protected]"`
`43`	`43`	`},`
`44`	`44`	`{`
`45`		`- "ref": "pkg:github/mongodb/[email protected].2"`
	`45`	`+ "ref": "pkg:github/mongodb/[email protected].4"`
`46`	`46`	`}`
`47`	`47`	`],`
`48`	`48`	`"metadata": {`
`49`		`- "timestamp": "2024-06-06T07:13:52.679415+00:00",`
	`49`	`+ "timestamp": "2024-07-03T08:46:07.057692+00:00",`
`50`	`50`	`"tools": [`
`51`	`51`	`{`
`52`	`52`	`"externalReferences": [`
`@@ -90,7 +90,7 @@`
`90`	`90`	`]`
`91`	`91`	`},`
`92`	`92`	`"serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082",`
`93`		`- "version": 1,`
	`93`	`+ "version": 2,`
`94`	`94`	`"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",`
`95`	`95`	`"bomFormat": "CycloneDX",`
`96`	`96`	`"specVersion": "1.5"`