Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 00:58:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
15389 commits 387 branches 195 tags 259 MiB
Commit graph

15389 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arne Welzel
5a9c6d4633 Merge remote-tracking branch 'origin/topic/awelzel/duplicate-plugin-no-debug' 
* origin/topic/awelzel/duplicate-plugin-no-debug:
  plugin/Manager: Warn when plugin with the same name is found
 2023-06-15 18:39:49 +02:00
Arne Welzel
2fddddbf51 Merge remote-tracking branch 'origin/topic/awelzel/3090-propagate-doctest-defines' 
* origin/topic/awelzel/3090-propagate-doctest-defines:
  Options: Do not output full usage on --test error
  CMakeLists: Propagate DOCTEST defines to external plugins
 2023-06-15 18:35:32 +02:00
Arne Welzel
1d6585e1a0 Merge remote-tracking branch 'origin/topic/awelzel/3090-add-back-rapidjson' 
* origin/topic/awelzel/3090-add-back-rapidjson:
  CMakeLists: Add rapidjson/include to zeek_dynamic_plugin_base
 2023-06-15 18:34:31 +02:00
Arne Welzel
2eeba959fe Merge remote-tracking branch 'origin/topic/awelzel/3090-propagate-build-type' 
* origin/topic/awelzel/3090-propagate-build-type:
  ZeekPluginBootstrap: Encode Zeek's CMAKE_BUILD_TYPE
 2023-06-15 18:34:13 +02:00
Robin Sommer
647b2d0446
Add Spicy updates to NEWS for 6.0. 2023-06-15 14:02:36 +02:00
Arne Welzel
55655f5ea1 Options: Do not output full usage on --test error 
...mostly because the usage output is very long and the actual useful
error message scrolls off the screen.
 2023-06-15 13:56:34 +02:00
Arne Welzel
07b869e645 CMakeLists: Propagate DOCTEST defines to external plugins 
If Zeek has not been built with doctest enabled then it's not easy
to run a plugin's tests (and if they really wanted to they could
again undef the DOCTEST_CONFIG_DISABLE and provide their own doctest
main() implementation.

Relates to #3090
 2023-06-15 13:56:32 +02:00
Arne Welzel
2c4b2306fa CMakeLists: Add rapidjson/include to zeek_dynamic_plugin_base 
threading/formatters/JSON.h has a rapidjson include. Extend the
include directories of external plugins so they are setup to find
these in Zeek's install tree.

Relates to #3090
 2023-06-15 12:23:20 +02:00
Arne Welzel
49799b8beb ZeekPluginBootstrap: Encode Zeek's CMAKE_BUILD_TYPE 
...and bump cmake to have plugin's make use of it.

Relates to #3090.
 2023-06-15 10:46:06 +02:00
Vern Paxson
aabf486416 ZAM documentation updates 2023-06-14 17:45:14 -07:00
Vern Paxson
40054e5f77 ZAM bug fix for incorrect management of global variables 2023-06-14 17:44:48 -07:00
Vern Paxson
5722596970 ZAM bug fix (simplification) for nested inline functions that don't do anything 2023-06-14 17:43:55 -07:00
Vern Paxson
d474317958 ZAM support for negative vector indices 2023-06-14 17:43:04 -07:00
Vern Paxson
5165a04ae0 ZAM ignores new "assert" statement 2023-06-14 17:41:41 -07:00
Vern Paxson
2c5b5bb41f fixes for doing "script validation" to check for ZAM compile-ability 2023-06-14 17:39:47 -07:00
Vern Paxson
cae5d30c62 tweak for Broker BTest that needs a delay for ZAM 2023-06-14 17:37:46 -07:00
Vern Paxson
6c9bab29e9 BTest baseline updates for minor Zeek differences (in one case, no difference) 2023-06-14 17:37:07 -07:00
Vern Paxson
40d7e6949a BTest to check for invalid negative vector indices 2023-06-14 17:35:08 -07:00
Tim Wojtulewicz
f64304067b Update docs submodule [nomail] 2023-06-14 10:51:28 -07:00
Tim Wojtulewicz
b5b5df4e2d Merge remote-tracking branch 'origin/topic/timw/remove-6-1-deprecations' 
* origin/topic/timw/remove-6-1-deprecations:
  Update docs submodule [nomail]
  Update external test baselines
  Change table initialization deprecation to error
  Remove 5.2 deprecation we missed
  Remove Supervisor::NodeConfig (6.1 deprecation)
  Remove LogAscii::logdir (6.1 deprecation)
  Make break/next/continue outside loops an error (6.1 deprecation)
  Remove analyzer_confirmation/analyzer_violation events (6.1 deprecation)
  Remove full scripts marked as 6.1 deprecations
  Remove script functions marked as unused (6.1 deprecations)
  Remove deprecations tagged for v6.1
 2023-06-14 10:09:57 -07:00
Tim Wojtulewicz
bd2e6fbbc8 Update docs submodule [nomail] 2023-06-14 10:07:23 -07:00
Tim Wojtulewicz
453c0ff7b5 Update external test baselines 2023-06-14 10:07:23 -07:00
Tim Wojtulewicz
d5b19c61ff Change table initialization deprecation to error 2023-06-14 10:07:23 -07:00
Tim Wojtulewicz
a105b26692 Remove 5.2 deprecation we missed 2023-06-14 10:07:23 -07:00
Tim Wojtulewicz
0d25583049 Remove Supervisor::NodeConfig (6.1 deprecation) 2023-06-14 10:07:22 -07:00
Tim Wojtulewicz
531276cfe0 Remove LogAscii::logdir (6.1 deprecation) 2023-06-14 10:07:22 -07:00
Tim Wojtulewicz
0110c15ee2 Make break/next/continue outside loops an error (6.1 deprecation) 2023-06-14 10:07:22 -07:00
Tim Wojtulewicz
9a79b98a1e Remove analyzer_confirmation/analyzer_violation events (6.1 deprecation) 2023-06-14 10:07:22 -07:00
Tim Wojtulewicz
a55e5e3724 Remove full scripts marked as 6.1 deprecations 2023-06-14 10:07:22 -07:00
Tim Wojtulewicz
7a867d52e2 Remove script functions marked as unused (6.1 deprecations) 2023-06-14 10:07:22 -07:00
Tim Wojtulewicz
4229af6820 Remove deprecations tagged for v6.1 2023-06-14 10:07:22 -07:00
Arne Welzel
84d605602f Merge remote-tracking branch 'origin/topic/awelzel/3115-debian-12' 
* origin/topic/awelzel/3115-debian-12:
  NEWS: Add entry about Debian 12
  docker: Add libnode to enable JavaScript support
  docker: Bump images to Debian 12
 2023-06-14 18:56:00 +02:00
Tim Wojtulewicz
881ea3f699 Merge remote-tracking branch 'origin/topic/timw/make-dist-fixes' 
* origin/topic/timw/make-dist-fixes:
  Fix usage of realpath on macOS, instead preferring grealpath
  Don't generate minimal tarball anymore
 2023-06-14 09:26:18 -07:00
Arne Welzel
fdd6dfd096 plugin/Manager: Warn when plugin with the same name is found 
This was brought up on Slack as a potential source of confusion during
development as it's not visible when plugin directories are ignored outside
of looking into the plugin debug stream. I'd actually prefer to just
FatalError() this, but a warning seems reasonably visible for interactive
usage.
 2023-06-14 17:36:18 +02:00
Arne Welzel
c873857953 NEWS: Fix enumeration in Breaking Changes 2023-06-14 13:16:01 +02:00
Arne Welzel
0fe32715c0 Merge remote-tracking branch 'origin/topic/awelzel/pre-commit-typos' 
* origin/topic/awelzel/pre-commit-typos:
  all: Fix typos identified by typos pre-commit hook
  NEWS typo fixes
  Start with a typos pre-commit file
 2023-06-14 13:06:47 +02:00
Arne Welzel
2f1ea789d1 Merge remote-tracking branch 'origin/topic/awelzel/2285-assert-statement' 
* origin/topic/awelzel/2285-assert-statement:
  NEWS: Small section about assert statement
  Stmt: Rework assertion hooks break semantics
  Stmt: Introduce assert statement and related hooks
  ZeekArgs: Helper for empty arguments
  Reporter: Allow AssertStmt to throw InterpreterException
  Lift backtrace() code into Func.{h,cc}
 2023-06-14 12:51:53 +02:00
Arne Welzel
90ec6582d8 Update cmake submodule [nomail] 2023-06-14 11:06:00 +02:00
zeek-bot
4056d904b7 Update doc submodule [nomail] [skip ci] 2023-06-14 00:20:36 +00:00
Tim Wojtulewicz
05efc0f9df Fix usage of realpath on macOS, instead preferring grealpath 2023-06-13 15:51:47 -07:00
Tim Wojtulewicz
894be5aa2d Don't generate minimal tarball anymore 2023-06-13 15:51:28 -07:00
Tim Wojtulewicz
9f80d62cde Update cmake submodule [nomail] 2023-06-13 14:20:31 -07:00
Tim Wojtulewicz
8175558a56 Merge remote-tracking branch 'origin/topic/bbannier/configure-summary-indention' 
* origin/topic/bbannier/configure-summary-indention:
  Clarify subitem relationship in CMake configure summary.
 2023-06-13 11:29:47 -07:00
Tim Wojtulewicz
9e2e6d0174 Merge remote-tracking branch 'origin/topic/awelzel/3112-log-suffix-left-over-log-rotation-fixup' 
* origin/topic/awelzel/3112-log-suffix-left-over-log-rotation-fixup:
  tests: Do not use archiver_rotation_format_func as postprocessor
 2023-06-13 11:28:34 -07:00
Arne Welzel
f83e96d1a6 NEWS: Add entry about Debian 12 2023-06-13 20:11:38 +02:00
Arne Welzel
e99db077bb docker: Add libnode to enable JavaScript support 2023-06-13 20:11:38 +02:00
Arne Welzel
2fb26c2f15 docker: Bump images to Debian 12 2023-06-13 20:11:34 +02:00
Arne Welzel
e1a81c528c tests: Do not use archiver_rotation_format_func as postprocessor 
This test triggered ubsan by putting a function with the wrong type
as a post-processor into the .shadow file. Don't do that.

Likely Zeek should provide a better error message, but hand-crafting
.shadow files isn't what is normally done and this is to fix the
master build for now.
 2023-06-13 19:17:32 +02:00
Arne Welzel
7a043e5e8f all: Fix typos identified by typos pre-commit hook 2023-06-13 17:57:32 +02:00
Arne Welzel
260c868f26 NEWS typo fixes 2023-06-13 17:57:32 +02:00