Skip to content

Commit 70c01c3

Browse files
authored
CDRIVER-5903 raise required libmongocrypt to 1.13.0 (#1968)
1 parent 8726a85 commit 70c01c3

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

.evergreen/scripts/compile-libmongocrypt.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,15 @@ compile_libmongocrypt() {
1010
# `.evergreen/scripts/kms-divergence-check.sh` to ensure that there is no
1111
# divergence in the copied files.
1212

13-
# Clone libmongocrypt and check-out commit for MONGOCRYPT-723.
14-
# TODO: once libmongocrypt 1.13.0 is released, updated to:
15-
# git clone -q --depth=1 https://github.com/mongodb/libmongocrypt --branch 1.13.0 || return
16-
git clone -q https://github.com/mongodb/libmongocrypt || return
17-
cd libmongocrypt
18-
git checkout 33fdf65cce5a0c0cdd293c64ed40e4a8205c3ce0
19-
cd ..
13+
# Clone libmongocrypt and check-out 1.13.0.
14+
git clone -q --depth=1 https://github.com/mongodb/libmongocrypt --branch 1.13.0 || return
2015

2116
declare -a crypt_cmake_flags=(
2217
"-DMONGOCRYPT_MONGOC_DIR=${mongoc_dir}"
2318
"-DBUILD_TESTING=OFF"
2419
"-DENABLE_ONLINE_TESTS=OFF"
2520
"-DENABLE_MONGOC=OFF"
26-
"-DBUILD_VERSION=1.13.0-pre"
21+
"-DBUILD_VERSION=1.13.0"
2722
)
2823

2924
. "$(dirname "${BASH_SOURCE[0]}")/find-ccache.sh"

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ New Features:
2323
Unreleased (2.0.0)
2424
==================
2525

26+
## Notes
27+
28+
* Raise required version of libmongocrypt to 1.13.0 to support In-Use Encryption (corresponds to the CMake option: `ENABLE_CLIENT_SIDE_ENCRYPTION`).
29+
2630
## Changes
2731

2832
* Passing `batchSize:0` as an option to `mongoc_client_watch`, `mongoc_database_watch`, or `mongoc_collection_watch`

src/libmongoc/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,10 +489,10 @@ elseif (NOT ENABLE_CLIENT_SIDE_ENCRYPTION STREQUAL OFF)
489489
find_package (mongocrypt QUIET)
490490
endif ()
491491

492-
if (mongocrypt_FOUND AND "${mongocrypt_VERSION}" VERSION_LESS 1.12.0)
492+
if (mongocrypt_FOUND AND "${mongocrypt_VERSION}" VERSION_LESS 1.13.0)
493493
message (STATUS " libmongocrypt found at ${mongocrypt_DIR}")
494494
message (STATUS " libmongocrypt version ${mongocrypt_VERSION} found")
495-
message (STATUS " libmongocrypt version 1.12.0 is required to enable In-Use Encryption Support.")
495+
message (STATUS " libmongocrypt version 1.13.0 is required to enable In-Use Encryption Support.")
496496
set (REQUIRED_MONGOCRYPT_VERSION_FOUND OFF)
497497
elseif (mongocrypt_FOUND)
498498
set (REQUIRED_MONGOCRYPT_VERSION_FOUND ON)

0 commit comments

Comments
 (0)