Merge remote-tracking branch 'origin/topic/awelzel/file-analysis-manager-runstate-include'

* origin/topic/awelzel/file-analysis-manager-runstate-include:
  file_analysis/Manager: Remove RunState.h include

CHANGES

@@ -1,3 +1,16 @@
+6.0.0-dev.405 | 2023-04-24 09:23:01 +0200
+
+  * file_analysis/Manager: Remove RunState.h include (Arne Welzel, Corelight)
+
+    The file_analysis/Manager.h header only needs run_state::terminating, so
+    declare just that similar to what Val.h does. This breaks ZBody compilation
+    due to OP_READING_LIVE_TRAFFIC_V and OP_READING_TRACES_V accessing
+    run-state::reading_live and run_state::reading_traces. Add the include to
+    ZBody.cc as a fix.
+
+    This may break external plugins, too, but then they didn't have the
+    right includes setup to begin with.
+
 6.0.0-dev.402 | 2023-04-21 14:04:52 -0700
 
   * Update NEWS to cover cluster framework changes. (Jan Grashoefer, Corelight)

VERSION

@@ -1 +1 @@
-6.0.0-dev.402
+6.0.0-dev.405

src/file_analysis/Manager.h

@@ -7,7 +7,6 @@
 #include <string>
 
 #include "zeek/RuleMatcher.h"
-#include "zeek/RunState.h"
 #include "zeek/Tag.h"
 #include "zeek/file_analysis/Component.h"
 #include "zeek/file_analysis/FileTimer.h"
@@ -19,6 +18,13 @@ namespace zeek
 class TableVal;
 class VectorVal;
 
+namespace run_state
+	{
+
+extern bool terminating;
+
+	} // namespace run_state
+
 namespace analyzer
 	{
 

src/script_opt/ZAM/ZBody.cc

@@ -23,6 +23,9 @@
 #include "zeek/logging/Manager.h"
 #include "zeek/packet_analysis/Manager.h"
 
+// For reading_live and reading_traces
+#include "zeek/RunState.h"
+
 namespace zeek::detail
 	{