diff --git a/CHANGES b/CHANGES index 525e34455e..c6b59410c1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +4.1.0-dev.10 | 2020-12-17 16:11:10 -0800 + + * Remove explicit use of config mode for finding CAF (Dominik Charousset, Corelight) + 4.1.0-dev.7 | 2020-12-16 15:10:04 -0800 * logging/ascii: Atomically create .shadow files using rename() (Arne Welzel, Corelight) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6129b550ab..311c38c799 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -314,11 +314,11 @@ endif () if ( CAF_ROOT OR BROKER_ROOT_DIR ) # TODO: drop < 3.12 compatibility check when raising the minimum CMake version if ( CAF_ROOT AND CMAKE_VERSION VERSION_LESS 3.12 ) - find_package(CAF ${CAF_VERSION_MIN_REQUIRED} REQUIRED CONFIG + find_package(CAF ${CAF_VERSION_MIN_REQUIRED} REQUIRED COMPONENTS openssl test io core PATHS "${CAF_ROOT}") else () - find_package(CAF ${CAF_VERSION_MIN_REQUIRED} REQUIRED CONFIG + find_package(CAF ${CAF_VERSION_MIN_REQUIRED} REQUIRED COMPONENTS openssl test io core) endif () message(STATUS "Using system CAF version ${CAF_VERSION}") diff --git a/VERSION b/VERSION index 84cfe5e1c1..3bf025c9b4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0-dev.7 +4.1.0-dev.10 diff --git a/auxil/bifcl b/auxil/bifcl index d9553a5db6..00f69a62ae 160000 --- a/auxil/bifcl +++ b/auxil/bifcl @@ -1 +1 @@ -Subproject commit d9553a5db66d4d732d5c0b55b216fc3244f3e095 +Subproject commit 00f69a62ae6e755d9655208e601a3a4c29ff8b5a diff --git a/auxil/binpac b/auxil/binpac index 314fd023a7..0622e88cef 160000 --- a/auxil/binpac +++ b/auxil/binpac @@ -1 +1 @@ -Subproject commit 314fd023a7f5913d60d2550cec4cadf1c0b44e02 +Subproject commit 0622e88cef0e4cf9e0843af2a78a039a99ae8744 diff --git a/auxil/broker b/auxil/broker index f3a6f0ea4b..43ce69c1f4 160000 --- a/auxil/broker +++ b/auxil/broker @@ -1 +1 @@ -Subproject commit f3a6f0ea4b5878d5199fb5abca26160161365f66 +Subproject commit 43ce69c1f428f0ec34c53e879dd43651a0b1e5a3 diff --git a/auxil/zeek-aux b/auxil/zeek-aux index 3272300079..7f44a91c40 160000 --- a/auxil/zeek-aux +++ b/auxil/zeek-aux @@ -1 +1 @@ -Subproject commit 32723000792810ea0427ad0413dac2001eaf26dd +Subproject commit 7f44a91c409dec11da94945343888801d99bc856 diff --git a/auxil/zeekctl b/auxil/zeekctl index 90340580cc..132d91817d 160000 --- a/auxil/zeekctl +++ b/auxil/zeekctl @@ -1 +1 @@ -Subproject commit 90340580cc30989384de16daa5cfa84de2fdd9e2 +Subproject commit 132d91817d60d872af094eda55757e3f58716541 diff --git a/cmake b/cmake index 40251ae850..2be5766468 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 40251ae850dee52eae8eb05e552c165e2deef354 +Subproject commit 2be57664680c23dc3b3b140f45c7bc5ab61256b1