Dominik Charousset
cf2b5f7e05
Migrate to CAF 0.18
2020-12-07 14:56:19 +01:00
Jon Siwek
6323b0a8c2
Remove an extraneous Zeekygen-style comment
2020-12-04 19:20:57 -08:00
Jon Siwek
24bbadcd0a
Update submodule(s) [nomail] [skip ci]
2020-12-04 13:07:34 -08:00
Jon Siwek
27ea03db2e
Update submodule(s) [nomail]
2020-12-04 11:18:44 -08:00
Johanna Amann
aeb98c9285
Merge branch 'master' of github.com:zeek/zeek
2020-12-04 18:50:25 +00:00
Johanna Amann
47ceac2491
Merge remote-tracking branch 'origin/topic/johanna/GH-348'
...
* origin/topic/johanna/GH-348:
Sumstats: allow users to manage epoch manually
Sumstats: epoch_finished was not called under certain circumstances
2020-12-04 18:49:53 +00:00
Jon Siwek
bca830b321
Update submodule(s) [nomail] [skip ci]
2020-12-04 10:39:08 -08:00
Johanna Amann
1a2d48cdd2
Update submodule
...
[nomail]
2020-12-04 11:25:51 +00:00
Jon Siwek
4228fbca0b
Merge remote-tracking branch 'origin/topic/johanna/static-ci'
...
* origin/topic/johanna/static-ci:
Fix cirrus config for static broker test.
Add a test for compiling with static broker/binpac
2020-12-03 18:02:55 -08:00
Jon Siwek
04385ab8b2
Update NEWS
2020-12-03 16:33:07 -08:00
Johanna Amann
d266e5600b
Fix cirrus config for static broker test.
2020-12-03 19:09:54 +00:00
Tim Wojtulewicz
c643ed2fe4
Merge remote-tracking branch 'origin/topic/robin/gh-1179-plugin-loading-fixes'
...
* origin/topic/robin/gh-1179-plugin-loading-fixes:
Fix a couple of life-time issues when plugin loading fails.
2020-12-03 09:36:02 -07:00
Robin Sommer
e147692a43
Fix a couple of life-time issues when plugin loading fails.
...
Reported by Coverity.
Follow-up to #1179 .
2020-12-03 07:55:51 +00:00
zeek-bot
946dfd5d16
Update doc submodule [nomail] [skip ci]
2020-12-03 00:41:58 +00:00
Jon Siwek
71f9340e75
Merge branch 'add-X-to-double' of https://github.com/ynadji/zeek
...
- Minor whitespace/grammar/doc tweaks during merge
* 'add-X-to-double' of https://github.com/ynadji/zeek :
Add `count_to_double` and `int_to_double` bif functions
2020-12-02 12:54:08 -08:00
Jon Siwek
219ed305b4
Update submodule(s) [nomail] [skip ci]
2020-12-02 12:04:34 -08:00
Jon Siwek
05618dc8a8
Merge remote-tracking branch 'origin/topic/jsiwek/update-minimum-cmake'
...
* origin/topic/jsiwek/update-minimum-cmake:
Update minimum required CMake to 3.5
2020-12-02 11:11:45 -08:00
Jon Siwek
3605e04d83
Update minimum required CMake to 3.5
...
Also now uses CMake's ENABLE_EXPORTS target property for the zeek
executable to ensure symbols are visible to plugins. Prior to CMake
3.4, the policy was to export symbols by default for certain platforms,
but later versions need either the explicit target property or policy.
2020-12-01 22:13:52 -08:00
Yacin Nadji
607af85ac1
Add count_to_double
and int_to_double
bif functions
2020-12-01 16:35:49 -05:00
Jon Siwek
4498c52a8b
Update submodule(s) [nomail]
2020-12-01 09:55:50 -08:00
Tim Wojtulewicz
49293c080d
Merge remote-tracking branch 'origin/topic/timw/1184-additional-weird-info'
...
* origin/topic/timw/1184-additional-weird-info:
GH-1184: Add 'source' field to weird log denoting where the weird was reported
2020-12-01 10:18:00 -07:00
Tim Wojtulewicz
e27008ef26
GH-1184: Add 'source' field to weird log denoting where the weird was reported
2020-12-01 09:34:37 -07:00
Robin Sommer
eccbbb4476
Merge remote-tracking branch 'origin/topic/robin/gh-1179-plugin-loading'
...
* origin/topic/robin/gh-1179-plugin-loading:
Retry loading plugins on failure to resolve to dependencies.
Fix use of deprecated functionality in test.
When attempting to activate a plugin, load dynamic libraries first.
Add test creating multiple plugins with load dependencies.
2020-12-01 14:51:49 +00:00
Johanna Amann
7477b3ea09
Add a test for compiling with static broker/binpac
2020-12-01 09:56:02 +00:00
Tim Wojtulewicz
616d29c08d
Merge remote-tracking branch 'origin/topic/bbannier/debug_logger_lookup'
...
* origin/topic/bbannier/debug_logger_lookup:
Find correct zeek namespace in debug logger macros.
2020-11-30 14:07:56 -07:00
Jon Siwek
2cbd9ff905
Update submodule(s) [nomail] [skip ci]
2020-11-30 10:42:02 -08:00
zeek-bot
d0bfce6ff4
Update doc submodule [nomail] [skip ci]
2020-11-27 00:34:49 +00:00
Johanna Amann
f55bd8ebb4
Merge remote-tracking branch 'origin/topic/jsiwek/python2-eol'
...
* origin/topic/jsiwek/python2-eol:
Update CentOS CI Dockerfiles to fix git/diff dependencies
Update CI scripts to remove `python` vs `python3` workarounds
Remove Python 2 compatibility logic in httpd test script
Update Python invocations to explicit `python3`
Update CMake logic to enforce Python >= 3.5
Update documentation for Python >= 3.5 requirement
Update all submodules that have Python 2 EOL changes
2020-11-26 18:17:54 +00:00
Johanna Amann
d82d096f2e
Merge remote-tracking branch 'origin/topic/jsiwek/fedora-31-eol'
...
* origin/topic/jsiwek/fedora-31-eol:
Remove Fedora 31 (EOL) from CI
2020-11-26 17:34:18 +00:00
Johanna Amann
b57a725d24
Update submodule
...
[nomail]
2020-11-26 17:34:00 +00:00
Jon Siwek
acc76a816a
Remove Fedora 31 (EOL) from CI
2020-11-25 17:36:38 -08:00
Jon Siwek
5ff44989c4
Update CentOS CI Dockerfiles to fix git/diff dependencies
2020-11-25 15:19:56 -08:00
Jon Siwek
2b3d216c97
Update CI scripts to remove python
vs python3
workarounds
2020-11-25 14:57:09 -08:00
Jon Siwek
7d68f2ce9d
Remove Python 2 compatibility logic in httpd test script
2020-11-25 14:57:09 -08:00
Jon Siwek
9717c623c2
Update Python invocations to explicit python3
2020-11-25 14:57:09 -08:00
Jon Siwek
eeec219a66
Update CMake logic to enforce Python >= 3.5
2020-11-25 14:57:09 -08:00
Jon Siwek
33a55a04c3
Update documentation for Python >= 3.5 requirement
2020-11-25 14:57:09 -08:00
Jon Siwek
459dc91463
Update all submodules that have Python 2 EOL changes
2020-11-25 14:57:09 -08:00
Robin Sommer
fe45f5335a
Retry loading plugins on failure to resolve to dependencies.
...
Closes #1179 .
2020-11-25 15:07:32 +00:00
Jon Siwek
ea841f32b1
Update submodule(s) [nomail]
2020-11-24 15:43:55 -08:00
Jon Siwek
499cb11dc3
Merge remote-tracking branch 'origin/topic/christian/libdir-improvements'
...
* origin/topic/christian/libdir-improvements:
Update CMakeLists.txt to make portability symlink absolute
Improve support for custom libdir locations
2020-11-24 15:24:14 -08:00
Christian Kreibich
e70b308c16
Update CMakeLists.txt to make portability symlink absolute
...
Co-authored-by: Jon Siwek <jsiwek@corelight.com>
2020-11-24 12:05:03 -08:00
Robin Sommer
b780bc146f
Fix use of deprecated functionality in test.
2020-11-24 17:00:20 +00:00
Robin Sommer
df40e82fd6
When attempting to activate a plugin, load dynamic libraries first.
...
Just moving code. This is so that we can abort if dlopen() fails without
having changed any other state yet.
2020-11-24 16:59:27 +00:00
Robin Sommer
3ebfcdf0ae
Add test creating multiple plugins with load dependencies.
...
If we load plugins purely alphabetically, the 1st Zeek run in the test
will success while the 2nd will fail.
2020-11-24 16:59:11 +00:00
Jon Siwek
f70a7cb4d3
Merge remote-tracking branch 'origin/topic/timw/internal-type-symbols'
...
* origin/topic/timw/internal-type-symbols:
Move implementation of internal_{type,var,etc} methods back into global namespace.
2020-11-23 21:50:47 -08:00
Jon Siwek
08c8b741a9
Merge remote-tracking branch 'origin/topic/neverlord/ubuntu-16-image'
...
* origin/topic/neverlord/ubuntu-16-image:
Simplify CI dependencies and setup
2020-11-23 21:41:55 -08:00
Jon Siwek
3b58b67367
Merge branch 'patch-3' of https://github.com/ottobackwards/zeek
...
* 'patch-3' of https://github.com/ottobackwards/zeek :
Update .gitignore to ignore pyenv .python-version
2020-11-23 21:35:19 -08:00
Dominik Charousset
b8e4931681
Simplify CI dependencies and setup
2020-11-23 17:10:15 +01:00
Benjamin Bannier
b42396340e
Find correct zeek namespace in debug logger macros.
...
These macros forward to functionality in `zeek::detail::debug_logger`
and are not intended for customization. This patch fixes the macros to
always use `::zeek::detail::debug_logger` as without the leading `::`
lookup could happen in any potentially local namespace `zeek` which does
not need to provide this symbol.
This closes zeek/spicy#597 .
2020-11-23 10:58:23 +01:00