Klemens Nanni
54634ae241
OpaqueVal, OCSP, X509: drop outdated LibreSSL guards to fix OpenBSD
...
build
Whatever is used with recent OpenSSL is also available with latest LibreSSL
on OpenBSD 7.8-beta as of today.
Some of these hunks have been in the net/bro port for years, others I
recently added whilst gradually updating from 6.0.5 to 8.0.1.
2025-09-23 01:51:49 +03:00
Tim Wojtulewicz
416d997263
Merge remote-tracking branch 'origin/topic/timw/restore-settype-methods'
...
pre-commit / pre-commit (push) Waiting to run
* origin/topic/timw/restore-settype-methods:
Restore the SetType constructor and destructor
2025-09-22 07:46:06 -07:00
Tim Wojtulewicz
c741e8f489
Merge remote-tracking branch 'origin/topic/timw/update-libkqueue'
...
* origin/topic/timw/update-libkqueue:
Bump libkqueue to latest upstream master
2025-09-22 07:34:03 -07:00
Tim Wojtulewicz
5f8a89ea40
Bump libkqueue to latest upstream master
2025-09-22 07:33:13 -07:00
Tim Wojtulewicz
210737f36e
Restore the SetType constructor and destructor
2025-09-21 17:13:14 +00:00
zeek-bot
d6c7a479e2
Update doc submodule [nomail] [skip ci]
2025-09-20 00:13:40 +00:00
Tim Wojtulewicz
9fb0f5e76d
Fix clang-tidy finding in recent script_opt changes
2025-09-17 16:34:26 -07:00
Tim Wojtulewicz
ef9ffda2ef
Merge remote-tracking branch 'origin/topic/vern/standalone-event-groups'
...
* origin/topic/vern/standalone-event-groups:
tracking of event groups for compilation to standalone-C++
2025-09-17 14:28:44 -07:00
Vern Paxson
973cc00c42
tracking of event groups for compilation to standalone-C++
2025-09-17 14:28:13 -07:00
Tim Wojtulewicz
1567fe8c09
Merge remote-tracking branch 'origin/topic/vern/remove-SetType'
...
* origin/topic/vern/remove-SetType:
Deprecate SetType, as it can be replaced by TableType
2025-09-17 14:26:42 -07:00
Vern Paxson
b442c25389
Deprecate SetType, as it can be replaced by TableType
2025-09-17 14:09:58 -07:00
Tim Wojtulewicz
938073dfed
Merge remote-tracking branch 'origin/topic/timw/4742-skip-storage-thread'
...
* origin/topic/timw/4742-skip-storage-thread:
Avoid starting up storage expiration thread with zero backends
Remove a couple of obsolete TODOs in storage manager
2025-09-17 08:44:55 -07:00
Tim Wojtulewicz
067c257480
Merge remote-tracking branch 'origin/topic/timw/windows-zeromq-support'
...
* origin/topic/timw/windows-zeromq-support:
Reword comment about when ZeroMQ is required for the build
CI: Add label for enabling the Windows build in PRs
Enable building ZeroMQ support on Windows
2025-09-16 13:31:48 -07:00
Tim Wojtulewicz
723b64d81f
Reword comment about when ZeroMQ is required for the build
2025-09-16 13:30:14 -07:00
Tim Wojtulewicz
37cc4999b3
CI: Add label for enabling the Windows build in PRs
2025-09-16 13:30:14 -07:00
Tim Wojtulewicz
4705537002
Enable building ZeroMQ support on Windows
2025-09-16 13:30:14 -07:00
Tim Wojtulewicz
5cc5f2a275
Merge remote-tracking branch 'origin/topic/timw/4285-sqlite-threadsafe-check'
...
* origin/topic/timw/4285-sqlite-threadsafe-check:
Force SQLite to be in thread-safe mode during CMake
2025-09-16 12:42:04 -07:00
Tim Wojtulewicz
dd14e380a1
Force SQLite to be in thread-safe mode during CMake
...
This allows us to remove the need to check for thread-safe mode in the
various SQLite plugins. See https://www.sqlite.org/compile.html#threadsafe
for why `1` is a good choice here.
2025-09-16 12:19:09 -07:00
Tim Wojtulewicz
bd60c6fc15
Merge remote-tracking branch 'origin/topic/vern/gen-C++-global-characteristics'
...
* origin/topic/vern/gen-C++-global-characteristics:
full tracking of the characteristics of globals when compiling scripts to C++
2025-09-16 11:31:13 -07:00
Tim Wojtulewicz
71eca7c9e6
Merge remote-tracking branch 'origin/topic/vern/standalone-CPP-global-attrs'
...
* origin/topic/vern/standalone-CPP-global-attrs:
fix for associating attributes with globals for -O gen-standalone-C++
2025-09-16 11:02:44 -07:00
Tim Wojtulewicz
aebeae8f8a
Merge remote-tracking branch 'origin/topic/vern/standalone-id-tracking-fix'
...
* origin/topic/vern/standalone-id-tracking-fix:
fix for tracking identifiers and aggregates when compiling to standalone-C++
2025-09-16 10:53:11 -07:00
Tim Wojtulewicz
00ba3483bb
Merge remote-tracking branch 'origin/topic/vern/gen-CPP-precedence-fix'
...
* origin/topic/vern/gen-CPP-precedence-fix:
fix for '?' operator precedence when compiling scripts to C++
2025-09-16 10:52:53 -07:00
Vern Paxson
0e5042e451
fix for associating attributes with globals for -O gen-standalone-C++
2025-09-15 14:28:07 -07:00
Vern Paxson
bfc6508dff
full tracking of the characteristics of globals when compiling scripts to C++
2025-09-15 14:21:32 -07:00
Vern Paxson
6a9175da7d
fix for '?' operator precedence when compiling scripts to C++
2025-09-15 14:18:16 -07:00
Tim Wojtulewicz
50581bfd3c
Avoid starting up storage expiration thread with zero backends
2025-09-15 14:18:03 -07:00
Tim Wojtulewicz
8bc849d425
Remove a couple of obsolete TODOs in storage manager
2025-09-15 14:17:41 -07:00
Vern Paxson
18d435ac12
fix for tracking identifiers and aggregates when compiling to standalone-C++
2025-09-15 13:57:35 -07:00
Tim Wojtulewicz
b25a844210
Merge remote-tracking branch 'origin/topic/vern/standalone-skip-fatal'
...
* origin/topic/vern/standalone-skip-fatal:
for -O gen-standalone-C++, make the presence of uncompilable functions fatal unless -O allow-cond is used
2025-09-12 09:24:58 -07:00
Tim Wojtulewicz
489681e0c3
Merge remote-tracking branch 'origin/topic/timw/bump-zeekctl'
...
* origin/topic/timw/bump-zeekctl:
Bump zeekctl for new trace-summary/pysubnettree versions
2025-09-12 09:24:26 -07:00
Tim Wojtulewicz
3750fb11f4
Bump zeekctl for new trace-summary/pysubnettree versions
2025-09-12 09:23:55 -07:00
Vern Paxson
e5210160ea
for -O gen-standalone-C++, make the presence of uncompilable functions fatal unless -O allow-cond is used
2025-09-11 13:30:40 -06:00
Tim Wojtulewicz
e1c8cbe25a
Merge remote-tracking branch 'origin/topic/timw/dns-analyzer-type-consistency'
...
* origin/topic/timw/dns-analyzer-type-consistency:
Clean up initialization of DNS_Interpreter
Switch types used in DNS analyzer to be more consistent
2025-09-11 10:57:29 -07:00
Tim Wojtulewicz
f056df1301
Clean up initialization of DNS_Interpreter
2025-09-11 10:56:57 -07:00
Tim Wojtulewicz
501160c976
Switch types used in DNS analyzer to be more consistent
2025-09-11 10:56:57 -07:00
Tim Wojtulewicz
c6cf1ee3ae
Merge remote-tracking branch 'origin/topic/awelzel/btest-suspend-processing-websocket'
...
* origin/topic/awelzel/btest-suspend-processing-websocket:
btest/core/suspend_processing: Add WebSocket example
2025-09-08 11:19:45 -07:00
Arne Welzel
9e7537044f
btest/core/suspend_processing: Add WebSocket example
...
Add a test/example forwarding all new_connection() events produced during
`zeek -r wikipedia.trace` as my_new_connection() to a WebSocket client.
This is mostly to demonstrate and verify usage of suspend_processing(),
websocket_client_added(), resume_processing(), Pcap::file_done(),
websocket_client_lost() and terminate() together.
2025-09-08 11:11:13 -07:00
Tim Wojtulewicz
dd881d9cde
Merge remote-tracking branch 'origin/topic/etyp/bump-spicy-coverity'
...
* origin/topic/etyp/bump-spicy-coverity:
Bump Spicy for Coverity fixes
2025-09-08 11:02:47 -07:00
Tim Wojtulewicz
76492302ad
Merge remote-tracking branch 'origin/topic/timw/port-doctest-version-include-change-from-upstream'
...
* origin/topic/timw/port-doctest-version-include-change-from-upstream:
Update src/3rdparty submodule for doctest v2.4.12 and include fix
2025-09-08 11:02:16 -07:00
Tim Wojtulewicz
168ff0b8a2
Update src/3rdparty submodule for doctest v2.4.12 and include fix
2025-09-08 10:52:06 -07:00
Evan Typanski
16a43f04bd
Bump Spicy for Coverity fixes
2025-09-08 11:35:58 -04:00
Tim Wojtulewicz
37836d1bb4
Merge remote-tracking branch 'origin/topic/timw/ci-centos-stream-10'
...
* origin/topic/timw/ci-centos-stream-10:
CI: Fix warning about ENV usage in CI dockerfiles
CI: Add centos stream 10 build
2025-09-06 04:26:51 +00:00
Tim Wojtulewicz
7305a79440
CI: Fix warning about ENV usage in CI dockerfiles
...
This also bumps the dates on the DOCKERFILE_VERSION values
2025-09-06 04:26:03 +00:00
Tim Wojtulewicz
9bee00de9c
CI: Add centos stream 10 build
2025-09-06 04:26:03 +00:00
Christian Kreibich
a58323c367
Merge branch 'topic/christian/fix-cluster-testing-get-instances-c2a'
...
* topic/christian/fix-cluster-testing-get-instances-c2a:
Bump zeek-client to pull in more resilient controller I/O
2025-09-05 19:52:57 -07:00
Christian Kreibich
49ef0abd3b
Bump zeek-client to pull in more resilient controller I/O
2025-09-05 16:26:57 -07:00
Tim Wojtulewicz
b7790641ba
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
...
* origin/topic/bbannier/bump-spicy:
Bump auxil/spicy to latest development snapshot
2025-09-05 12:56:33 -07:00
Benjamin Bannier
8fd8309b28
Bump auxil/spicy to latest development snapshot
2025-09-05 17:48:42 +02:00
Tim Wojtulewicz
35ad76c96b
Merge remote-tracking branch 'origin/topic/timw/testing-upstream-libkqueue'
...
* origin/topic/timw/testing-upstream-libkqueue:
libkqueue: Switch to using HEAD from upstream master
2025-09-04 16:22:04 -07:00
Tim Wojtulewicz
d1f34ae546
libkqueue: Switch to using HEAD from upstream master
...
The upstream recently merge Christian's fixes for the fd_map allocations
so that patch doesn't need to be in our fork anymore. I also tested removing
the patch about timers from our fork, and it seems to only matter for Linux
kernels earlier than 5.3. All of our supported platforms are newer than
that.
2025-09-04 16:20:18 -07:00