diff --git a/CHANGES b/CHANGES index 59cde37742..8f3ed22cca 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +6.1.0-dev.100 | 2023-06-15 21:13:46 -0700 + + * Update external testing hashes for 6.1 deprecation changes (Tim Wojtulewicz, Corelight) + + * Remove leftover baseline files from 6.1 deprecation removal (Tim Wojtulewicz, Corelight) + 6.1.0-dev.96 | 2023-06-15 16:27:36 -0700 * Update dce-rpc constants (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index fd5bc22552..293b2bea8a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.1.0-dev.96 +6.1.0-dev.100 diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.rotate-ascii-logdir-leftover-log-rotation-shadow-files/logs.cat b/testing/btest/Baseline/scripts.base.frameworks.logging.rotate-ascii-logdir-leftover-log-rotation-shadow-files/logs.cat deleted file mode 100644 index 05dd1c9670..0000000000 --- a/testing/btest/Baseline/scripts.base.frameworks.logging.rotate-ascii-logdir-leftover-log-rotation-shadow-files/logs.cat +++ /dev/null @@ -1,3 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -leftover conn log -leftover dns log diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.rotate-ascii-logdir-leftover-log-rotation-shadow-files/out b/testing/btest/Baseline/scripts.base.frameworks.logging.rotate-ascii-logdir-leftover-log-rotation-shadow-files/out deleted file mode 100644 index 823cec2fc1..0000000000 --- a/testing/btest/Baseline/scripts.base.frameworks.logging.rotate-ascii-logdir-leftover-log-rotation-shadow-files/out +++ /dev/null @@ -1,4 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -### NOTE: This file has been sorted with diff-sort. -running my rotation postprocessor for path 'conn' -running my rotation postprocessor for path 'dns' diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.rotate-ascii-logdir-leftover-log-rotation-stale-shadow-files/out b/testing/btest/Baseline/scripts.base.frameworks.logging.rotate-ascii-logdir-leftover-log-rotation-stale-shadow-files/out deleted file mode 100644 index 49d861c74c..0000000000 --- a/testing/btest/Baseline/scripts.base.frameworks.logging.rotate-ascii-logdir-leftover-log-rotation-stale-shadow-files/out +++ /dev/null @@ -1 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. diff --git a/testing/btest/Baseline/scripts.policy.frameworks.files.deprecated-fields-concurrent-range-requests/files.log.deprecated b/testing/btest/Baseline/scripts.policy.frameworks.files.deprecated-fields-concurrent-range-requests/files.log.deprecated deleted file mode 100644 index 9908333d39..0000000000 --- a/testing/btest/Baseline/scripts.policy.frameworks.files.deprecated-fields-concurrent-range-requests/files.log.deprecated +++ /dev/null @@ -1,13 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -#separator \x09 -#set_separator , -#empty_field (empty) -#unset_field - -#path files -#open XXXX-XX-XX-XX-XX-XX -#fields ts fuid uid id.orig_h id.orig_p id.resp_h id.resp_p source depth analyzers mime_type filename duration local_orig is_orig seen_bytes total_bytes missing_bytes overflow_bytes timedout parent_fuid tx_hosts rx_hosts conn_uids -#types time string string addr port addr port string count set[string] string string interval bool bool count count count count bool string set[addr] set[addr] set[string] -XXXXXXXXXX.XXXXXX FaGjhv1ozACeoEnwg5 C4J4Th3PJpwUYZZ6gc 192.168.0.107 58720 88.198.248.254 80 HTTP 0 (empty) - - 0.076646 F F 30003 104857600 179998 0 T - 88.198.248.254 192.168.0.107 C4J4Th3PJpwUYZZ6gc -XXXXXXXXXX.XXXXXX FaGjhv1ozACeoEnwg5 CHhAvVGS1DHFjwGM9 192.168.0.107 58716 88.198.248.254 80 HTTP 0 (empty) - - 0.076646 F F 30003 104857600 179998 0 T - 88.198.248.254 192.168.0.107 CHhAvVGS1DHFjwGM9 -XXXXXXXXXX.XXXXXX FaGjhv1ozACeoEnwg5 ClEkJM2Vm5giqnMf4h 192.168.0.107 58718 88.198.248.254 80 HTTP 0 (empty) - - 0.076646 F F 30003 104857600 179998 0 T - 88.198.248.254 192.168.0.107 ClEkJM2Vm5giqnMf4h -#close XXXX-XX-XX-XX-XX-XX diff --git a/testing/btest/Baseline/scripts.policy.frameworks.files.deprecated-fields-concurrent-range-requests/files.log.new b/testing/btest/Baseline/scripts.policy.frameworks.files.deprecated-fields-concurrent-range-requests/files.log.new deleted file mode 100644 index 6b5f32fd1b..0000000000 --- a/testing/btest/Baseline/scripts.policy.frameworks.files.deprecated-fields-concurrent-range-requests/files.log.new +++ /dev/null @@ -1,13 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -#separator \x09 -#set_separator , -#empty_field (empty) -#unset_field - -#path files -#open XXXX-XX-XX-XX-XX-XX -#fields ts fuid uid id.orig_h id.orig_p id.resp_h id.resp_p source depth analyzers mime_type filename duration local_orig is_orig seen_bytes total_bytes missing_bytes overflow_bytes timedout parent_fuid -#types time string string addr port addr port string count set[string] string string interval bool bool count count count count bool string -XXXXXXXXXX.XXXXXX FaGjhv1ozACeoEnwg5 C4J4Th3PJpwUYZZ6gc 192.168.0.107 58720 88.198.248.254 80 HTTP 0 (empty) - - 0.076646 F F 30003 104857600 179998 0 T - -XXXXXXXXXX.XXXXXX FaGjhv1ozACeoEnwg5 CHhAvVGS1DHFjwGM9 192.168.0.107 58716 88.198.248.254 80 HTTP 0 (empty) - - 0.076646 F F 30003 104857600 179998 0 T - -XXXXXXXXXX.XXXXXX FaGjhv1ozACeoEnwg5 ClEkJM2Vm5giqnMf4h 192.168.0.107 58718 88.198.248.254 80 HTTP 0 (empty) - - 0.076646 F F 30003 104857600 179998 0 T - -#close XXXX-XX-XX-XX-XX-XX diff --git a/testing/btest/Baseline/scripts.policy.frameworks.files.deprecated-fields-concurrent-range-requests/out.deprecated b/testing/btest/Baseline/scripts.policy.frameworks.files.deprecated-fields-concurrent-range-requests/out.deprecated deleted file mode 100644 index 49d861c74c..0000000000 --- a/testing/btest/Baseline/scripts.policy.frameworks.files.deprecated-fields-concurrent-range-requests/out.deprecated +++ /dev/null @@ -1 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. diff --git a/testing/btest/Baseline/scripts.policy.frameworks.files.deprecated-fields-concurrent-range-requests/out.new b/testing/btest/Baseline/scripts.policy.frameworks.files.deprecated-fields-concurrent-range-requests/out.new deleted file mode 100644 index 49d861c74c..0000000000 --- a/testing/btest/Baseline/scripts.policy.frameworks.files.deprecated-fields-concurrent-range-requests/out.new +++ /dev/null @@ -1 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. diff --git a/testing/external/commit-hash.zeek-testing b/testing/external/commit-hash.zeek-testing index d57e1cb4df..8a79b0e32b 100644 --- a/testing/external/commit-hash.zeek-testing +++ b/testing/external/commit-hash.zeek-testing @@ -1 +1 @@ -828845c99306c6d5d6811fa42987de5b16f530b9 +d59caff708b41db11fa0cbfe0b1f95b46c3e700e diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private index c5dd200880..72b4b0a144 100644 --- a/testing/external/commit-hash.zeek-testing-private +++ b/testing/external/commit-hash.zeek-testing-private @@ -1 +1 @@ -b121bfe4d869f1f5e334505b970cd456558ef6a1 +7162c907aa25e155ea841710ef30b65afb578c3f