From 40db8463dfcfa790d112752961217c21d74e5edb Mon Sep 17 00:00:00 2001 From: Johanna Amann Date: Thu, 12 Sep 2024 08:52:02 +0200 Subject: [PATCH] Merge remote-tracking branch 'origin/topic/timw/remove-negative-timestamp-test' * origin/topic/timw/remove-negative-timestamp-test: Remove core.negative-time btest (cherry picked from commit 899f7297d7b8c83ef2640e7cf40d3f230e42cc6b) --- CHANGES | 44 ++++++++++++++++++ VERSION | 2 +- .../Baseline/core.negative-time/weird.log | 11 ----- testing/btest/Traces/negative-time.pcap | Bin 260 -> 0 bytes testing/btest/core/negative-time.test | 2 - 5 files changed, 45 insertions(+), 14 deletions(-) delete mode 100644 testing/btest/Baseline/core.negative-time/weird.log delete mode 100644 testing/btest/Traces/negative-time.pcap delete mode 100644 testing/btest/core/negative-time.test diff --git a/CHANGES b/CHANGES index a124a7824b..0e32b999ec 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,47 @@ +7.0.1-6 | 2024-09-23 10:01:55 -0700 + + * Remove core.negative-time btest (Tim Wojtulewicz, Corelight) + + This test is failing with libpcap libpcap 1.10.5; for more information + see https://github.com/zeek/zeek/issues/3921 + + (cherry picked from commit 899f7297d7b8c83ef2640e7cf40d3f230e42cc6b) + + * Update broker submodule (Arne Welzel, Corelight) + + ...to pin prometheus to 1.2.4 + + (cherry picked from commit f24bc1ee882b3b266ca9dc325a1b5584addb155e) + + * telemetry: Move callbacks to Zeek (Arne Welzel, Corelight) + + Now that we run callbacks on the main loop, we can move callback support + for Counter and Gauge instances directly into Zeek and don't need to patch + prometheus-cpp anymore. + + (cherry picked from commit f24bc1ee882b3b266ca9dc325a1b5584addb155e) + + * auxil/prometheus-cpp: Pin to 1.2.4 (Arne Welzel, Corelight) + + (cherry picked from commit f24bc1ee882b3b266ca9dc325a1b5584addb155e) + + * btest/ldap: Add regression test for #3919 (Arne Welzel, Corelight) + + This works as expected in master, it's just that we forgot to backport + PR #3845 to 7.0.1. Add the PCAP from Martin anyhow. + + (cherry picked from commit a339cfa4c007762c6fbb16a35576220851fe4a82) + + * GH-3853: ldap: Recognize SASL+SPNEGO+NTLMSSP (Arne Welzel, Corelight) + + The ctu-sme-11-win7ad-1-ldap-tcp-50041.pcap file was harvested + from the CTU-SME-11 (Experiment-VM-Microsoft-Windows7AD-1) dataset + at https://zenodo.org/records/7958259 (DOI 10.5281/zenodo.7958258). + + (cherry picked from commit 152bbbd680e6c329255dc28d57cd506e7d2c09ff) + + * Bump auxil/spicy to latest release (Benjamin Bannier, Corelight) + 7.0.1 | 2024-09-03 13:04:23 -0700 * Update CHANGES, VERSION, and NEWS for 7.0.1 release (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index 9fe9ff9d99..73e224f839 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.1 +7.0.1-6 diff --git a/testing/btest/Baseline/core.negative-time/weird.log b/testing/btest/Baseline/core.negative-time/weird.log deleted file mode 100644 index 49c7011a3b..0000000000 --- a/testing/btest/Baseline/core.negative-time/weird.log +++ /dev/null @@ -1,11 +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 weird -#open XXXX-XX-XX-XX-XX-XX -#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p name addl notice peer source -#types time string addr port addr port string string bool string string -XXXXXXXXXX.XXXXXX - - - - - negative_packet_timestamp - F zeek - -#close XXXX-XX-XX-XX-XX-XX diff --git a/testing/btest/Traces/negative-time.pcap b/testing/btest/Traces/negative-time.pcap deleted file mode 100644 index a216f1eb6ebf278c46a8a1ee6aa8d0af47d09b3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 260 zcmca|c+)~A1{MYw`2U}Qff2}Q=>HVLXU)bC0Az#kiR+R@vhp!MEv5$Na4@(sFgUdw zVqkC(EMPdWf@wMsGoF~mV9KEPpni}MK)`4Lf$W)ix``<%MJ$O$1&Is{JPeFL z^H;BRVPmKPssdq%$q-w>=H~%T2b#ZS8pv#r9So*G8=}4yFWS}E05l(L18(yV@PKS# mU