Skip to content

Commit

Permalink
PHPC-2409: Update to libmongoc 1.27.4 (#1600)
Browse files Browse the repository at this point in the history
  • Loading branch information
alcaeus authored Jul 3, 2024
1 parent c7df0f7 commit 337aa35
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .evergreen/config/generated/build/build-libmongoc-8.3.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .evergreen/config/templates/build/build-libmongoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions sbom.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,34 @@
"version": "1.10.0"
},
{
"bom-ref": "pkg:github/mongodb/[email protected].2",
"bom-ref": "pkg:github/mongodb/[email protected].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/[email protected].2",
"purl": "pkg:github/mongodb/[email protected].4",
"type": "library",
"version": "1.27.2"
"version": "1.27.4"
}
],
"dependencies": [
{
"ref": "pkg:github/mongodb/[email protected]"
},
{
"ref": "pkg:github/mongodb/[email protected].2"
"ref": "pkg:github/mongodb/[email protected].4"
}
],
"metadata": {
"timestamp": "2024-06-06T07:13:52.679415+00:00",
"timestamp": "2024-07-03T08:46:07.057692+00:00",
"tools": [
{
"externalReferences": [
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/LIBMONGOC_VERSION_CURRENT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.27.2
1.27.4
2 changes: 1 addition & 1 deletion src/libmongoc
Submodule libmongoc updated 77 files
+42 −28 .evergreen/config_generator/components/earthly.py
+36 −0 .evergreen/config_generator/components/misc.py
+4 −1 .evergreen/etc/mongo-c-driver.spec
+2 −2 .evergreen/etc/spec.patch
+24 −0 .evergreen/generated_configs/tasks.yml
+4 −0 .evergreen/generated_configs/variants.yml
+3 −0 .gitignore
+15 −15 CMakeLists.txt
+51 −0 Earthfile
+34 −0 NEWS
+1 −1 VERSION_CURRENT
+3 −3 build/sphinx/mongoc_common.py
+172 −0 etc/cyclonedx.sbom.json
+18 −0 etc/purls.txt
+52 −0 etc/third_party_vulnerabilities.md
+2 −2 src/CMakeLists.txt
+29 −1 src/libbson/NEWS
+25 −21 src/libbson/src/bson/bson-oid.c
+4 −4 src/libmongoc/CMakeLists.txt
+ src/libmongoc/doc/includes/libbson.inv
+12 −7 src/libmongoc/src/mongoc/mongoc-client-pool.c
+4 −1 src/libmongoc/src/mongoc/mongoc-cluster-private.h
+74 −61 src/libmongoc/src/mongoc/mongoc-cluster.c
+1 −1 src/libmongoc/src/mongoc/mongoc-cmd-private.h
+1 −1 src/libmongoc/src/mongoc/mongoc-cmd.c
+30 −37 src/libmongoc/src/mongoc/mongoc-collection.c
+6 −2 src/libmongoc/src/mongoc/mongoc-host-list.c
+1 −1 src/libmongoc/src/mongoc/mongoc-topology-background-monitoring.c
+21 −8 src/libmongoc/src/mongoc/mongoc-topology-private.h
+13 −19 src/libmongoc/src/mongoc/mongoc-topology.c
+ src/zlib-1.2.13/zlib.3.pdf
+0 −152 src/zlib-1.2.13/zlib2ansi
+25 −20 src/zlib-1.3.1/CMakeLists.txt
+29 −1 src/zlib-1.3.1/ChangeLog
+2 −3 src/zlib-1.3.1/FAQ
+0 −0 src/zlib-1.3.1/INDEX
+22 −0 src/zlib-1.3.1/LICENSE
+5 −0 src/zlib-1.3.1/Makefile
+14 −8 src/zlib-1.3.1/Makefile.in
+9 −10 src/zlib-1.3.1/README
+5 −27 src/zlib-1.3.1/adler32.c
+5 −16 src/zlib-1.3.1/compress.c
+19 −12 src/zlib-1.3.1/configure
+86 −162 src/zlib-1.3.1/crc32.c
+0 −0 src/zlib-1.3.1/crc32.h
+267 −345 src/zlib-1.3.1/deflate.c
+41 −10 src/zlib-1.3.1/deflate.h
+1 −3 src/zlib-1.3.1/gzclose.c
+13 −18 src/zlib-1.3.1/gzguts.h
+28 −85 src/zlib-1.3.1/gzlib.c
+20 −68 src/zlib-1.3.1/gzread.c
+19 −65 src/zlib-1.3.1/gzwrite.c
+7 −23 src/zlib-1.3.1/infback.c
+1 −4 src/zlib-1.3.1/inffast.c
+1 −1 src/zlib-1.3.1/inffast.h
+0 −0 src/zlib-1.3.1/inffixed.h
+31 −100 src/zlib-1.3.1/inflate.c
+0 −0 src/zlib-1.3.1/inflate.h
+6 −11 src/zlib-1.3.1/inftrees.c
+5 −5 src/zlib-1.3.1/inftrees.h
+0 −0 src/zlib-1.3.1/make_vms.com
+2 −2 src/zlib-1.3.1/treebuild.xml
+239 −303 src/zlib-1.3.1/trees.c
+0 −0 src/zlib-1.3.1/trees.h
+4 −12 src/zlib-1.3.1/uncompr.c
+543 −0 src/zlib-1.3.1/zconf.h
+7 −11 src/zlib-1.3.1/zconf.h.cmakein
+7 −11 src/zlib-1.3.1/zconf.h.in
+3 −3 src/zlib-1.3.1/zlib.3
+ src/zlib-1.3.1/zlib.3.pdf
+197 −194 src/zlib-1.3.1/zlib.h
+100 −100 src/zlib-1.3.1/zlib.map
+0 −0 src/zlib-1.3.1/zlib.pc.cmakein
+0 −0 src/zlib-1.3.1/zlib.pc.in
+16 −44 src/zlib-1.3.1/zutil.c
+13 −34 src/zlib-1.3.1/zutil.h
+211 −0 tools/create-silk-asset-group.py

0 comments on commit 337aa35

Please sign in to comment.