diff --git a/CHANGES b/CHANGES index 6008de7624..cb9ee66456 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,11 @@ +3.2.0-dev.142 | 2020-02-25 19:27:28 -0800 + + * Updates to Broker to build CAF as sub-project (Dominik Charousset, Corelight) + + The embedded CAF now builds directly as a CMake subdirectory rather + than an external project. + 3.2.0-dev.137 | 2020-02-24 20:41:43 -0800 * parse.y: fix memory leak in FieldAssignExpr call (Max Kellermann) diff --git a/VERSION b/VERSION index 6daa8b5721..e9c28c4e07 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.0-dev.137 +3.2.0-dev.142 diff --git a/aux/bifcl b/aux/bifcl index e52a094221..6ac8c9f10e 160000 --- a/aux/bifcl +++ b/aux/bifcl @@ -1 +1 @@ -Subproject commit e52a094221830c25c5c4b51b9282a0248f8ad45d +Subproject commit 6ac8c9f10ebfe47e2d7c72bf4da157e8b73de567 diff --git a/aux/binpac b/aux/binpac index 75aa6b59aa..2254f897c6 160000 --- a/aux/binpac +++ b/aux/binpac @@ -1 +1 @@ -Subproject commit 75aa6b59aac27a0be2fe7ca5ccc5a3da556fe6b7 +Subproject commit 2254f897c64c1b3ffc4d4822abd8f3f55f94d509 diff --git a/aux/broker b/aux/broker index 897a13f956..706d96bea1 160000 --- a/aux/broker +++ b/aux/broker @@ -1 +1 @@ -Subproject commit 897a13f95661dd2c67121eba4f00124db0b9b715 +Subproject commit 706d96bea15e924e5499b51828d290b65797ec9a diff --git a/aux/zeek-aux b/aux/zeek-aux index 08e9286750..f4026f5162 160000 --- a/aux/zeek-aux +++ b/aux/zeek-aux @@ -1 +1 @@ -Subproject commit 08e9286750edabb616dcaddc796aa1e5cdb98180 +Subproject commit f4026f51620a3c885da94b992d86db85e769be0c diff --git a/aux/zeekctl b/aux/zeekctl index aa2d64b839..126eaade40 160000 --- a/aux/zeekctl +++ b/aux/zeekctl @@ -1 +1 @@ -Subproject commit aa2d64b83972646ad7725c0f9837ce8bdac72655 +Subproject commit 126eaade40b3fff9916b5baa917d273f904e5bfc diff --git a/src/3rdparty b/src/3rdparty index 1e939893b3..cbec6f55a2 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 1e939893b3e01a11cbfde3c624013804cf5400e9 +Subproject commit cbec6f55a2b516d82b88eb1530276a5cb9abd087