Commit graph

195 commits

Author SHA1 Message Date
Jon Siwek
d1c659faa8 Merge remote-tracking branch 'origin/topic/christian/zkg-inclusion'
* origin/topic/christian/zkg-inclusion:
  Install zkg as part of the Zeek distribution.
2020-12-12 20:25:59 -08:00
Christian Kreibich
d1d218b5cc Install zkg as part of the Zeek distribution.
- Add auxil/package-manager submodule as an optional build
  source. When the submodule is present, zkg gets installed into the
  Zeek installation's bin directory, its config file into etc/zkg, and
  its state into var/lib/zkg. Like zeekctl, zkg finds its own module
  independently of any PYTHONPATH. Installation via pip remains
  supported. You can skip zkg explicitly via --disable-zkg. See the
  NEWS update for details.

- Establish a "zeek/python" subdirectory under libdir as the common place
  for Python modules in the Zeek distribution. This now separates out
  the Broker Python bindings, ZeekControl, and zkg's Python module.

- Add configure flags to allow customizing this Python folder, in
  three ways: --python-dir, --python-prefix, and --python-home. These
  differ in the logic they automatically add to the path, and build on
  the logic already used in Broker.

- Include a (comented-out) @load for zkg's packages folder in
  local.zeek.

- Bump zeekctl to move to this new location.

- Bump doc to include installation instructions

- Update NEWS accordingly.
2020-12-11 18:43:47 -08:00
Jon Siwek
bb11ce47a0 Merge remote-tracking branch 'origin/topic/neverlord/caf-migration'
Merge adjustments:
- Fix the `--with-caf=` option from emitting messages about a variable
  having an unset value.
- Fix the `zeek-config --caf_root` option

* origin/topic/neverlord/caf-migration:
  Update submodule(s)
  Fix message ordering of Broker messages
  Fix UB in shutdown of Broker manager
  Preserve string output of Broker errors
  Migrate to CAF 0.18
2020-12-10 14:14:38 -08:00
Johanna Amann
e85621020d Update submodule
[nomail]
2020-12-10 15:45:50 +00:00
Jon Siwek
2e6ef02750 Update submodule(s) [nomail] 2020-12-09 17:29:17 -08:00
Dominik Charousset
27730aabfb Update submodule(s) 2020-12-08 13:41:29 +01:00
Jon Siwek
bb928f0a30 Update submodule(s) [nomail] 2020-12-07 15:08:07 -08:00
Dominik Charousset
25fef3da1b Fix message ordering of Broker messages
Using two separate Broker subscribers for status events and regular
messages introduces a race on the two objects. Even if Broker sends all
messages in a particular (deterministic) order, Zeek may still process
them in a different order as a result. Since several tests rely on a
strict ordering of Broker events, these tests could fail sporadically.

Using only a single subscriber for all Broker messages makes sure that
Zeek observes all messages in the same order as Broker emits them.
2020-12-07 21:40:46 +01:00
Johanna Amann
3c2fac9e87 Update submodule
[nomail]
2020-12-07 18:27:07 +00:00
Johanna Amann
8955e6c060 Merge branch 'master' of github.com:zeek/zeek 2020-12-07 18:23:18 +00:00
Johanna Amann
c85d6d6112 Merge remote-tracking branch 'origin/topic/christian/gh-1307-baseline-refresh'
* origin/topic/christian/gh-1307-baseline-refresh:
  Additional use of btest-diff --binary
  Update btest-diff calls on binary files to using "--binary"
  Switch to btest-diff with --binary support
  Update external baseline commit hashes
  Fix binary baseline & line-end problem
  Fix diff-remove-abspath on OSX
  Bump submodules for btest 0.64 update
  Canonifier improvements for the scripts.base.frameworks.logging.ascii-double test
  Baseline refresh to reflect btest 0.64
  Make diff-remove-abspath canonifier match on non-whitespace paths only
  Harden diff-remove-timestamps canonifier
2020-12-07 18:12:29 +00:00
Dominik Charousset
cf2b5f7e05 Migrate to CAF 0.18 2020-12-07 14:56:19 +01:00
Christian Kreibich
c5fd520c96 Switch to btest-diff with --binary support
(Preliminary commit to be updated later)
2020-12-06 20:19:52 -08:00
Christian Kreibich
f3482efb1d Bump submodules for btest 0.64 update 2020-12-06 20:19:52 -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
1a2d48cdd2 Update submodule
[nomail]
2020-12-04 11:25:51 +00: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
Jon Siwek
4498c52a8b Update submodule(s) [nomail] 2020-12-01 09:55:50 -08: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
Jon Siwek
459dc91463 Update all submodules that have Python 2 EOL changes 2020-11-25 14:57:09 -08: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
ec76b2510a Improve support for custom libdir locations
- Remove hardwiring of $ZEEK_ROOT/lib throughout the three and
  defaults the name of Zeek's library directory to the default on the
  given platform (e.g. lib64), via GNUInstallDirs.

- Consistently use that lib directory, instead of two lib folders
  resulting when using a custom libdir.

- Remove the old lib directory in the installation prefix, if one exists

- Add --lib_dir to zeek-config (and sort its options a bit).

- Bump submodules for corresponding changes
2020-11-19 23:27:10 -08:00
Jon Siwek
e4df60c51d Update submodule(s) [nomail] 2020-10-21 15:38:39 -07:00
Robin Sommer
fc427035a4 Bump BTest to 0.64.
Previous version had a problem with canonification.
2020-10-20 14:03:00 +00:00
Robin Sommer
df48b7ea57 Update BTest to 0.63.
New baselines will now be store canonified.

Also setting new MinVersion option in btest.cfg.
2020-10-20 09:01:11 +00:00
Jon Siwek
399badfb51 Update submodule(s) [nomail] 2020-10-13 15:32:44 -07:00
Tim Wojtulewicz
1a8bb30127 Update submodule(s) [nomail] 2020-10-13 15:25:39 -07:00
Tim Wojtulewicz
a608015338 GH-1063: Update libkqueue to fix pf_ring-zc failures 2020-10-13 13:47:56 -07:00
Jon Siwek
a2577891e0 Merge remote-tracking branch 'origin/topic/jsiwek/gh-1180-include-external-headers'
* origin/topic/jsiwek/gh-1180-include-external-headers:
  Add external dependency include paths to `zeek-config --include_dir`
2020-10-02 10:50:14 -07:00
Jon Siwek
168da19e9a Update submodule(s) [nomail] 2020-09-24 07:48:25 -07:00
Jon Siwek
75b3ff7da4 Merge remote-tracking branch 'origin/topic/jsiwek/gh-927-when-condition-eval-order' into master
* origin/topic/jsiwek/gh-927-when-condition-eval-order:
  GH-927: Fix circumvention of evaluation order in 'when' conditions
2020-09-22 11:09:51 -07:00
Jon Siwek
98c8b67333 Update submodule(s) [nomail] 2020-09-21 13:37:15 -07:00
Jon Siwek
0771dbcec6 Update submodule(s) [nomail]
Closes https://github.com/zeek/zeek/issues/1102
2020-09-14 13:40:02 -07:00
Jon Siwek
2a8de33c63 Merge remote-tracking branch 'origin/topic/jsiwek/gh-1122'
* origin/topic/jsiwek/gh-1122:
  GH-165: Fix global initializations that indirectly use builtin types
  Improve how primary/top-level BIFs get initialized
  GH-1122: Allow initializing globals with calls to subdir BIFs
  GH-1122: Improve error for global record initialization exceptions
2020-09-04 17:24:50 -07:00
Jon Siwek
5ab20dfcb9 Simplify a broker btest
The explicit sorting function definition was a temporary stability
workaround with a better fix now being available via
https://github.com/zeek/btest/pull/25
2020-08-31 15:01:23 -07:00
Jon Siwek
1bbae2368d GH-1122: Allow initializing globals with calls to subdir BIFs 2020-08-27 12:20:37 -07:00
Jon Siwek
ff0aa6b050 Merge remote-tracking branch 'origin/topic/timw/rename-binpac_bro'
* origin/topic/timw/rename-binpac_bro:
  Rename bro-bif.h to zeek-bif.h
  Fix uses of bro.pac to use zeek.pac
  Rename the bro-related binpac files to zeek
2020-08-26 11:21:17 -07:00
Jon Siwek
99d9a3a48c Fix closing timestamp of rotated log files in supervised-cluster mode 2020-08-25 17:06:10 -07:00
Tim Wojtulewicz
391f4aca4c Rename bro-bif.h to zeek-bif.h 2020-08-25 17:03:23 -07:00
Jon Siwek
099797ae0f Update submodule(s)
[nomail]
2020-08-21 11:41:35 -07:00
Tim Wojtulewicz
c322bc249d Update submodule(s)
[nomail]
2020-08-21 08:42:45 -07:00
Tim Wojtulewicz
81c70df62c Move __RegisterBif from zeek::detail::plugin to zeek::plugin::detail 2020-08-20 16:11:46 -07:00
Tim Wojtulewicz
ddf48d7529 Move a few of the zeek::util methods and variables to zeek::util::detail 2020-08-20 16:11:44 -07:00
Jon Siwek
69cbeb7a1b Update docs for configuring CI email notifications
Secrets are now stored organization-wide rather than per-repository.
2020-08-19 11:51:27 -07:00
Jon Siwek
868004bd00 Update submodule(s)
[nomail]
2020-08-19 10:56:53 -07:00
Tim Wojtulewicz
bd983bec8f Update submodule(s)
[nomail]
2020-08-01 09:23:00 -07:00