Skip to content

Commit 8a0f3f7

Browse files
Merge v1.21 into v1.x (#1807)
2 parents e0440f0 + 930cf0e commit 8a0f3f7

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

config.m4

+4-4
Original file line numberDiff line numberDiff line change
@@ -277,26 +277,26 @@ if test "$PHP_MONGODB" != "no"; then
277277
PHP_MONGODB_MONGOCRYPT_VERSION_STRING="None"
278278

279279
if test "$PHP_MONGODB_SYSTEM_LIBS" != "no"; then
280-
PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.30.1], [
280+
PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.30.3], [
281281
PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
282282
PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
283283
284284
PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_BSON_CFLAGS"
285285
PHP_EVAL_LIBLINE($PHP_MONGODB_BSON_LIBS, MONGODB_SHARED_LIBADD)
286286
AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson])
287287
],[
288-
AC_MSG_ERROR([Could not find system library for libbson >= 1.30.1])
288+
AC_MSG_ERROR([Could not find system library for libbson >= 1.30.3])
289289
])
290290

291-
PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.30.1], [
291+
PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.30.3], [
292292
PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
293293
PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
294294
295295
PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_MONGOC_CFLAGS"
296296
PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOC_LIBS, MONGODB_SHARED_LIBADD)
297297
AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc])
298298
],[
299-
AC_MSG_ERROR(Could not find system library for libmongoc >= 1.30.1)
299+
AC_MSG_ERROR(Could not find system library for libmongoc >= 1.30.3)
300300
])
301301

302302
if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then

sbom.json

+9-10
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,34 @@
1919
"version": "1.12.0"
2020
},
2121
{
22-
"bom-ref": "pkg:github/mongodb/[email protected].1",
22+
"bom-ref": "pkg:github/mongodb/[email protected].3",
2323
"externalReferences": [
2424
{
2525
"type": "distribution",
26-
"url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.30.1.tar.gz"
26+
"url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.30.3.tar.gz"
2727
},
2828
{
2929
"type": "website",
30-
"url": "https://github.com/mongodb/mongo-c-driver/tree/1.30.1"
30+
"url": "https://github.com/mongodb/mongo-c-driver/tree/1.30.3"
3131
}
3232
],
3333
"group": "mongodb",
3434
"name": "mongo-c-driver",
35-
"purl": "pkg:github/mongodb/[email protected].1",
35+
"purl": "pkg:github/mongodb/[email protected].3",
3636
"type": "library",
37-
"version": "1.30.1"
37+
"version": "1.30.3"
3838
}
3939
],
4040
"dependencies": [
4141
{
4242
"ref": "pkg:github/mongodb/[email protected]"
4343
},
4444
{
45-
"ref": "pkg:github/mongodb/[email protected].1"
45+
"ref": "pkg:github/mongodb/[email protected].3"
4646
}
4747
],
4848
"metadata": {
49-
"timestamp": "2025-02-21T15:21:36.741928+00:00",
49+
"timestamp": "2025-04-09T07:40:24.233811+00:00",
5050
"tools": [
5151
{
5252
"externalReferences": [
@@ -90,9 +90,8 @@
9090
]
9191
},
9292
"serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082",
93-
"version": 10,
93+
"version": 11,
9494
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
9595
"bomFormat": "CycloneDX",
96-
"specVersion": "1.5",
97-
"vulnerabilities": []
96+
"specVersion": "1.5"
9897
}

src/LIBMONGOC_VERSION_CURRENT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.30.1
1+
1.30.3

src/libmongoc

Submodule libmongoc updated 77 files

0 commit comments

Comments
 (0)