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
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
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
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
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
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
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
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
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
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
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
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
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
0dadf2af04
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
...
* origin/topic/bbannier/bump-spicy:
Bump auxil/spicy to latest development snapshot
2025-09-04 09:04:39 -07:00
Tim Wojtulewicz
7142b9efde
Merge remote-tracking branch 'klemensya/svcparams'
...
* klemensya/svcparams:
Parse SVCB/HTTPS SvcParams list
2025-09-03 15:36:03 -07:00
Tim Wojtulewicz
e3b22cd21f
Merge remote-tracking branch 'origin/topic/vern/emphasize-IDPtrs'
...
* origin/topic/vern/emphasize-IDPtrs:
fixup! fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects
fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects
fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects
fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects
annotate a number of BTests as unsuited for -O gen-C++ testing due to multiple Zeek runs
BTest baseline updates for -O gen-C++ - all minor tweaks
BTest updates for script optimization tracking of BiFs
regression test for former ASAN issue with script optimization of lambdas
shift much of the internal use of ID* identifier pointers over to IDPtr objects
maintenance update for script optimization's knowledge of BiFs
logger fix for interoperability with -O gen-C++ code
2025-09-03 15:33:43 -07:00
Evan Typanski
42f7a2d88c
Merge remote-tracking branch 'origin/topic/vern/field-assign-parsing'
...
* origin/topic/vern/field-assign-parsing:
tightened up parsing of $field=X record constructor expressions
2025-09-03 16:21:24 -04:00
Benjamin Bannier
07dd2a1c6f
Merge branch 'topic/bbannier/test-bittorrent-unnessary-sigs'
2025-09-03 14:51:16 +02:00
Tim Wojtulewicz
5d93254400
Merge remote-tracking branch 'origin/topic/timw/remove-unneeded-binpac-includes'
...
* origin/topic/timw/remove-unneeded-binpac-includes:
Remove some unnecessary #includes from binpac source files
2025-09-02 16:00:27 -07:00
Tim Wojtulewicz
deeca84332
Merge remote-tracking branch 'origin/topic/timw/readability-container-contains'
...
* origin/topic/timw/readability-container-contains:
Fix a few more random clang-tidy findings
Use std::numbers::pi instead of hard-coded value
Use std::scoped_lock instead of std::lock_guard
Use .contains() instead of .find() or .count()
2025-09-02 11:49:29 -07:00
Christian Kreibich
f38ac30418
Merge branch 'topic/christian/management-framework-tls'
...
* topic/christian/management-framework-tls:
Bump zeek-testing-cluster to pull in WebSocket TLS updates
Bump zeek-client to pull in TLS config updates
Management framework: add TLS options for controller's websocket server
2025-08-29 21:53:37 -07:00
Tim Wojtulewicz
d20550f553
Merge remote-tracking branch 'origin/topic/timw/switch-spicy-zeek-builds-to-ubuntu-24'
...
* origin/topic/timw/switch-spicy-zeek-builds-to-ubuntu-24:
Move benchmarking to Ubnutu 24 task, add to normal PR builds
Reorder ubuntu builds so 22.04 comes last
Rename Ubuntu-based tasks to have the full version name
Switch Zeek Spicy builds to Ubuntu 24
2025-08-29 15:08:38 -07:00
Tim Wojtulewicz
273abf3d08
Merge remote-tracking branch 'origin/topic/timw/tools-clang-tidy'
...
* origin/topic/timw/tools-clang-tidy:
gen-zam: Move source files up a directory
bifcl: Fix clang-tidy warnings
bifcl: Run clang-format on c++ code embedded in builtin-func.{l,y}
binpac: Fix a large number of clang-tidy warnings
binpac: Replace delete_list macro uses
binpac: Run clang-format on c++ code embedded in pac_parse.{ll,yy}
2025-08-28 15:20:32 -07:00
Tim Wojtulewicz
2acfa27c2a
Merge remote-tracking branch 'origin/topic/timw/link-prometheus-via-broker-instead-of-directly'
...
* origin/topic/timw/link-prometheus-via-broker-instead-of-directly:
Link Prometheus symbols via Broker instead of directly
2025-08-28 13:06:44 -07:00
Tim Wojtulewicz
cfa73bd512
Merge remote-tracking branch 'origin/topic/timw/reduce-ci-load'
...
* origin/topic/timw/reduce-ci-load:
CI: Rework layout of when each task runs
2025-08-26 14:40:05 -07:00
Tim Wojtulewicz
d7db612b0f
Merge remote-tracking branch 'origin/topic/bbannier/issue-3266'
...
* origin/topic/bbannier/issue-3266:
Fix installation of symlink with `DESTDIR`
2025-08-26 08:59:34 -07:00
Tim Wojtulewicz
84c3619ef6
Merge remote-tracking branch 'origin/topic/awelzel/zeekctl-88-add-metrics-addr-and-document'
...
* origin/topic/awelzel/zeekctl-88-add-metrics-addr-and-document:
Bump zeekctl
2025-08-25 12:29:44 -07:00
Arne Welzel
3e89e6b328
Merge remote-tracking branch 'origin/topic/awelzel/cluster-event-metadata-fixes-for-8.0'
...
* origin/topic/awelzel/cluster-event-metadata-fixes-for-8.0:
cluster/Backend: Fallback to current network time when current event has not timestamp
cluster/serializer/broker: Do not send empty metadata vectors around
2025-08-22 10:13:30 +02:00
Christian Kreibich
2929f1eb17
Merge branch 'topic/christian/news-typos'
...
* topic/christian/news-typos:
Minor fixes to a few NEWS entries.
2025-08-21 17:10:17 -07:00
Arne Welzel
ce7ba36b3c
Merge remote-tracking branch 'origin/topic/awelzel/bye-twitter'
...
* origin/topic/awelzel/bye-twitter:
README.md: Add Mastodon and Bluesky links
README: Drop "Follow us on Twitter"
2025-08-21 17:06:29 +02:00
Evan Typanski
5a1c4fd5fe
Merge remote-tracking branch 'origin/topic/etyp/coverity-attr'
...
* origin/topic/etyp/coverity-attr:
Fix Coverity issue with new `Attributes` ctor
2025-08-20 11:38:43 -04:00
Tim Wojtulewicz
8632d79775
Merge remote-tracking branch 'origin/topic/timw/ci-centos9-newer-python'
...
* origin/topic/timw/ci-centos9-newer-python:
CI: Update CentOS 9 to Python 3.13
2025-08-19 15:08:45 -07:00
Arne Welzel
cf8a54b3df
Merge remote-tracking branch 'origin/topic/awelzel/no-null-strings-in-threading-vals'
...
* origin/topic/awelzel/no-null-strings-in-threading-vals:
logging/Manager: Also pass non-null vector and set
logging/Manager: Non-null strings for empty strings
2025-08-19 20:27:46 +02:00
Tim Wojtulewicz
7514f7c038
Merge remote-tracking branch 'origin/topic/timw/add-missing-cluster-serializer-header'
...
* origin/topic/timw/add-missing-cluster-serializer-header:
Add a missing header for the broker cluster serializer
2025-08-18 14:59:50 -07:00
Tim Wojtulewicz
177a45f71c
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
...
* origin/topic/bbannier/bump-spicy:
Bump auxil/spicy to latest development snapshot
2025-08-18 14:47:14 -07:00
Evan Typanski
59e84e06f6
Merge remote-tracking branch 'origin/topic/etyp/fix-optional-attr-errors'
...
* origin/topic/etyp/fix-optional-attr-errors:
Fix parameter attributes pretending to be records
Only allow `&optional` in records
2025-08-18 14:49:56 -04:00
Tim Wojtulewicz
a4da8d3f7b
Merge remote-tracking branch 'origin/topic/etyp/update-news-record-vec-deprecation'
...
* origin/topic/etyp/update-news-record-vec-deprecation:
Add `record_type_to_vector` deprecation to NEWS
2025-08-18 09:40:50 -07:00
Arne Welzel
9b94e25e67
Merge remote-tracking branch 'origin/topic/awelzel/4754-follow-up'
...
* origin/topic/awelzel/4754-follow-up:
cluster/serializer/broker: Drop unused include
cluster/serializer/broker: fixup inconsistent param comment
2025-08-18 16:44:43 +02:00
Arne Welzel
2c9015d247
Merge branch 'master' of https://github.com/blightzero/zeek
...
* 'master' of https://github.com/blightzero/zeek :
Changed behavior of var-extraction-uri.zeek from policy/protocol/http to extract only the URI parameter names. Do not include the path in the first parameter name. Only extract uri vars if parameters actually exist.
2025-08-18 13:14:34 +02:00
Arne Welzel
e04f725523
Merge remote-tracking branch 'amazing-pp/t/psql-login-no-role'
...
* amazing-pp/t/psql-login-no-role:
Report PostgreSQL login success only after ReadyForQuery
2025-08-18 09:40:22 +02:00
Arne Welzel
c0a863cba0
Merge remote-tracking branch 'origin/topic/vern/stmt-line-numbers'
...
* origin/topic/vern/stmt-line-numbers:
maintenance updates for ZAM BiF-tracking
fix line numbers associated with "if" and initialization statements
2025-08-17 17:29:09 +02:00
Arne Welzel
3d6a064ecc
Merge remote-tracking branch 'origin/topic/awelzel/4754-double-wrapped-broker-data-records'
...
* origin/topic/awelzel/4754-double-wrapped-broker-data-records:
cluster/serializer/broker: Do not special case Broker::Data anymore
broker/Data: Support unwrapping Broker::Data records
2025-08-17 16:57:28 +02:00
Tim Wojtulewicz
a3983cc939
Merge remote-tracking branch 'origin/revert-4746-topic/timw/move-submodules-to-main-repo'
...
* origin/revert-4746-topic/timw/move-submodules-to-main-repo:
Revert "Move BinPAC, bifcl, af_packet, and gen_zam submodules into main zeek repo"
2025-08-15 15:21:12 -07:00