Skip to content

Commit

Permalink
Merge v1.19 into master (#1603)
Browse files Browse the repository at this point in the history
  • Loading branch information
mongodb-php-bot committed Jul 3, 2024
2 parents ff5423b + b5b6b0d commit 0daf917
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -299,15 +299,15 @@ if test "$PHP_MONGODB" != "no"; then
])

if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then
PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.9.1], [
PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.10.1], [
PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt --modversion`
PHP_MONGODB_MONGOCRYPT_VERSION_STRING="System ($PHP_MONGODB_MONGOCRYPT_VERSION)"
PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_MONGOCRYPT_CFLAGS"
PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOCRYPT_LIBS, MONGODB_SHARED_LIBADD)
AC_DEFINE(HAVE_SYSTEM_LIBMONGOCRYPT, 1, [Use system libmongocrypt])
],[
AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.9.1)
AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.10.1)
])
fi
fi
Expand Down
16 changes: 8 additions & 8 deletions sbom.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"components": [
{
"bom-ref": "pkg:github/mongodb/libmongocrypt@1.10.0",
"bom-ref": "pkg:github/mongodb/libmongocrypt@1.10.1",
"externalReferences": [
{
"type": "distribution",
"url": "https://github.com/mongodb/libmongocrypt/archive/refs/tags/1.10.0.tar.gz"
"url": "https://github.com/mongodb/libmongocrypt/archive/refs/tags/1.10.1.tar.gz"
},
{
"type": "website",
"url": "https://github.com/mongodb/libmongocrypt/tree/1.10.0"
"url": "https://github.com/mongodb/libmongocrypt/tree/1.10.1"
}
],
"group": "mongodb",
"name": "libmongocrypt",
"purl": "pkg:github/mongodb/libmongocrypt@1.10.0",
"purl": "pkg:github/mongodb/libmongocrypt@1.10.1",
"type": "library",
"version": "1.10.0"
"version": "1.10.1"
},
{
"bom-ref": "pkg:github/mongodb/mongo-c-driver@1.27.2",
Expand All @@ -39,14 +39,14 @@
],
"dependencies": [
{
"ref": "pkg:github/mongodb/libmongocrypt@1.10.0"
"ref": "pkg:github/mongodb/libmongocrypt@1.10.1"
},
{
"ref": "pkg:github/mongodb/mongo-c-driver@1.27.2"
}
],
"metadata": {
"timestamp": "2024-06-06T07:13:52.679415+00:00",
"timestamp": "2024-07-03T10:31:03.600797+00:00",
"tools": [
{
"externalReferences": [
Expand Down Expand Up @@ -90,7 +90,7 @@
]
},
"serialNumber": "urn:uuid:acb30d08-ee47-4ff0-b301-d66ef1f54082",
"version": 1,
"version": 3,
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.5"
Expand Down
2 changes: 1 addition & 1 deletion src/LIBMONGOCRYPT_VERSION_CURRENT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.0
1.10.1

0 comments on commit 0daf917

Please sign in to comment.