Commit graph

219 commits

Author SHA1 Message Date
Jon Siwek
9b9b05f396 Update submodule(s) [nomail] [skip ci] 2021-01-25 12:16:27 -08:00
Jon Siwek
a70de68b55 Update submodule(s) [nomail] 2021-01-21 16:23:12 -08:00
Jon Siwek
8164ea6517 Merge remote-tracking branch 'origin/topic/christian/zeek-install-btest'
* origin/topic/christian/zeek-install-btest:
  Install BTest with Zeek
2021-01-21 13:37:40 -08:00
Tim Wojtulewicz
931a39b0c1 Update submodule(s) [nomail] 2021-01-21 10:29:34 -07:00
Christian Kreibich
a6e086b662 Install BTest with Zeek
Configuring with --disable-btest skips the installation. The main
reason for doing this is that many Zeek packages come with testsuites
that nearly always require btest, so providing btest out of the box
makes sense. Note that zkg's recent additions to its PATH environment
variable management mean that this btest instance is automatically
found also when the Zeek installation's binary folder isn't in the
path.
2021-01-20 13:52:14 -08:00
Jon Siwek
a98012a8fb Merge remote-tracking branch 'origin/topic/christian/osx-macos-renaming'
* origin/topic/christian/osx-macos-renaming:
  Update Cirrus CI naming update for MacOS images
2021-01-19 21:08:28 -08:00
Christian Kreibich
b7b63e889d Update Cirrus CI naming update for MacOS images
The docs on https://cirrus-ci.org/guide/macOS/ changed from
"osx_instance" to "macos_instance", so let's reflect that.
2021-01-19 17:14:44 -08:00
Vern Paxson
7f92a573d2 Remove BroValUnion by hoisting underlying Val subclass values into subclasses 2021-01-14 11:58:59 -07:00
Jon Siwek
50b3012020 Update submodule(s) [nomail] 2021-01-12 20:48:00 -08:00
Jon Siwek
321a027d07 Remove unusable/broken RocksDB code and options
The Broker RockSDB data store backend was previously unusable
and broken, so all code and options related to it are now removed.
2021-01-11 11:12:59 -08:00
Jon Siwek
b543b97d27 Update submodule(s) [nomail] 2021-01-06 21:43:15 -08:00
Jon Siwek
1d24b8a857 Update cmake module to fix ZeekPluginDynamic's find_package(CAF)
Fixes GH-1347
2021-01-06 20:45:44 -08:00
Jon Siwek
eebc80da5e Update submodule(s) [nomail] 2021-01-04 15:42:03 -08:00
Jon Siwek
f5b1d9c519 Update submodule(s) [nomail] 2020-12-23 10:39:01 -08:00
Jon Siwek
b4968de3ea Merge remote-tracking branch 'origin/topic/christian/ci-big-sur-support'
* origin/topic/christian/ci-big-sur-support:
  Add MacOS Big Sur to CI, now that Cirrus supports it
2020-12-21 10:55:37 -08:00
Jon Siwek
ed4afa95d3 Merge remote-tracking branch 'origin/topic/neverlord/cmake-cleanup'
* origin/topic/neverlord/cmake-cleanup:
  Remove explicit use of config mode for finding CAF
2020-12-17 16:11:58 -08:00
Tim Wojtulewicz
819c5c1e0b Update submodules [nomail] 2020-12-17 10:57:47 -07:00
Jon Siwek
4d06ea635f Update submodule(s) [nomail] 2020-12-16 15:07:03 -08:00
Dominik Charousset
1faea1d73d Remove explicit use of config mode for finding CAF 2020-12-15 16:13:53 +01:00
Jon Siwek
a475cc7a29 Update NEWS with 4.1.0 placeholder sections 2020-12-14 21:44:30 -08:00
Jon Siwek
3af403542f Update submodules 2020-12-14 21:23:30 -08:00
Jon Siwek
144ca0f45b Update submodule(s) [nomail] 2020-12-14 10:56:08 -08:00
Jon Siwek
10fd5e9c19 Update submodule(s) [nomail] 2020-12-12 21:33:37 -08:00
Jon Siwek
4470b52f91 Update submodule(s) [nomail] 2020-12-12 21:21:12 -08:00
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