Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/robin/bump-spicy'

Browse source 
* origin/topic/robin/bump-spicy:
  Bump Spicy to current `main`.
This commit is contained in:
Robin Sommer 2024-03-25 11:25:47 +01:00
commit c4499d8552
No known key found for this signature in database
GPG key ID: D8187293B3FFE5D0
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
7.0.0-dev.94 | 2024-03-25 11:25:47 +0100
* Bump Spicy to current `main`. (Robin Sommer, Corelight)
7.0.0-dev.92 | 2024-03-19 14:39:26 -0700 7.0.0-dev.92 | 2024-03-19 14:39:26 -0700
* ZAM documentation updated to reflect finer-grained profiling (Vern Paxson, Corelight) * ZAM documentation updated to reflect finer-grained profiling (Vern Paxson, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.0.0-dev.92 7.0.0-dev.94

2
auxil/spicy

@ -1 +1 @@
Subproject commit 7b38bd27fff703f69659b750e3b89ed500340d7c Subproject commit 18a7377024003040db19c060f67484ec90ba0753

2
src/spicy/spicyz/glue-compiler.cc
View file

@ -511,7 +511,7 @@ bool GlueCompiler::loadEvtFile(hilti::rt::filesystem::path& path) {
if ( looking_at(*chunk, i, "from") ) { if ( looking_at(*chunk, i, "from") ) {
eat_token(*chunk, &i, "from"); eat_token(*chunk, &i, "from");
scope = hilti::ID(extract_path(*chunk, &i)); scope = hilti::ID(extract_path(*chunk, &i).native());
SPICY_DEBUG(hilti::util::fmt(" Got module %s to import from scope %s", module, scope)); SPICY_DEBUG(hilti::util::fmt(" Got module %s to import from scope %s", module, scope));
} }
else else