Arne Welzel
8550c691bd
Stmt/Assert: Use std::move() for backtrace element
2023-06-16 12:45:39 +02:00
Arne Welzel
e22b1f85aa
Update cmake submodule [nomail]
2023-06-16 09:36:28 +02:00
Tim Wojtulewicz
77689b202f
Merge remote-tracking branch 'origin/topic/timw/btest-updates'
...
* origin/topic/timw/btest-updates:
Update external testing hashes for 6.1 deprecation changes
Remove leftover baseline files from 6.1 deprecation removal
2023-06-15 21:14:04 -07:00
Tim Wojtulewicz
24f184fd8a
Update external testing hashes for 6.1 deprecation changes
2023-06-15 19:45:05 -07:00
Tim Wojtulewicz
c45015bcb7
Remove leftover baseline files from 6.1 deprecation removal
2023-06-15 19:45:05 -07:00
zeek-bot
65e09f579a
Update doc submodule [nomail] [skip ci]
2023-06-16 00:40:00 +00:00
Tim Wojtulewicz
e804561856
Merge remote-tracking branch 'origin/topic/timw/dce-rpc-updates'
...
* origin/topic/timw/dce-rpc-updates:
Update dce-rpc constants
2023-06-15 16:27:50 -07:00
Tim Wojtulewicz
3ad0bee7a2
Update external testing repo hashes to current master commits
2023-06-15 16:27:17 -07:00
Tim Wojtulewicz
38a3385daa
Merge remote-tracking branch 'origin/topic/vern/CPP-Jun23-maint'
...
* origin/topic/vern/CPP-Jun23-maint:
-O gen-C++ refinements for BiF failures, negative vector indices, boolean vector operations
2023-06-15 16:25:58 -07:00
Tim Wojtulewicz
1be1b1e6de
Update dce-rpc constants
2023-06-15 15:08:56 -07:00
Vern Paxson
18be4ba91b
-O gen-C++ refinements for BiF failures, negative vector indices, boolean vector operations
2023-06-15 15:07:18 -07:00
Tim Wojtulewicz
c0a0f719d1
Merge remote-tracking branch 'origin/topic/vern/ZAM-Jun23-maint'
...
* origin/topic/vern/ZAM-Jun23-maint:
ZAM documentation updates
ZAM bug fix for incorrect management of global variables
ZAM bug fix (simplification) for nested inline functions that don't do anything
ZAM support for negative vector indices
ZAM ignores new "assert" statement
fixes for doing "script validation" to check for ZAM compile-ability
tweak for Broker BTest that needs a delay for ZAM
BTest baseline updates for minor Zeek differences (in one case, no difference)
BTest to check for invalid negative vector indices
2023-06-15 14:21:26 -07:00
Tim Wojtulewicz
aff1ea0814
Update docs submodule [nomail] [skip ci]
2023-06-15 12:27:35 -07:00
Tim Wojtulewicz
48af56c00b
Merge remote-tracking branch 'origin/topic/timw/force-std-c++-17'
...
* origin/topic/timw/force-std-c++-17:
Force -std=c++17 mode for plugin targets, remove use of RequireCXX17.cmake
2023-06-15 12:15:44 -07:00
Tim Wojtulewicz
62382e6cb9
Force -std=c++17 mode for plugin targets, remove use of RequireCXX17.cmake
2023-06-15 09:51:32 -07:00
Arne Welzel
f3b306a2ec
Merge remote-tracking branch 'origin/topic/robin/spicy-news'
...
* origin/topic/robin/spicy-news:
Add Spicy updates to NEWS for 6.0.
2023-06-15 18:42:44 +02:00
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