Merge remote-tracking branch 'origin/topic/jsiwek/rename-files-with-c…

…olons' into master

* origin/topic/jsiwek/rename-files-with-colons:
  GH-1252: rename files with colons for Windows compatibility

CHANGES

@@ -1,3 +1,14 @@
+
+3.3.0-dev.501 | 2020-11-04 10:41:56 -0800
+
+  * GH-1252: rename files with colons for Windows compatibility (Jon Siwek, Corelight)
+
+    A short-term measure so that the Zeek source tree can simply exist on a
+    Windows filesystem.  For true support, the logic that decides/generates
+    the filename format will need to change.
+
+  * Use std::function instead of a function pointer in packet_analysis::Component (Tim Wojtulewicz, Corelight)
+
 3.3.0-dev.495 | 2020-11-02 12:03:52 -0700
 
   * GH-1215: Remove dispatch_map from packet analysis, replace with BIF methods for registering dispatches (Tim Wojtulewicz, Corelight)

VERSION

@@ -1 +1 @@
-3.3.0-dev.495
+3.3.0-dev.501

testing/btest/scripts/base/protocols/conn/contents-default-extract.test

@@ -1,3 +1,11 @@
 # @TEST-EXEC: zeek -b -f "tcp port 21" -r $TRACES/ftp/ipv6.trace base/protocols/conn "Conn::default_extract=T"
-# @TEST-EXEC: btest-diff contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_orig.dat
-# @TEST-EXEC: btest-diff contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_resp.dat
+
+# Note: files renamed to remove colons due to Windows filesystem limitations.
+# Allows one to clone the source tree on Windows for now.  For real Windows
+# runtime compatibility, the original filenames will need a different format.
+
+# @TEST-EXEC: mv contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_orig.dat contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_orig.dat
+# @TEST-EXEC: mv contents_[2001:470:1f11:81f:c999:d94:aa7c:2e3e]:49185-[2001:470:4867:99::21]:21_resp.dat contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_resp.dat
+
+# @TEST-EXEC: btest-diff contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_orig.dat
+# @TEST-EXEC: btest-diff contents_[2001-470-1f11-81f-c999-d94-aa7c-2e3e]-49185-[2001-470-4867-99--21]-21_resp.dat