diff --git a/CHANGES b/CHANGES index 911fa77a1a..433920c96e 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * ZAM documentation updated to reflect finer-grained profiling (Vern Paxson, Corelight) diff --git a/VERSION b/VERSION index 73244201ae..cecc13c130 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.0-dev.92 +7.0.0-dev.94 diff --git a/auxil/spicy b/auxil/spicy index 7b38bd27ff..18a7377024 160000 --- a/auxil/spicy +++ b/auxil/spicy @@ -1 +1 @@ -Subproject commit 7b38bd27fff703f69659b750e3b89ed500340d7c +Subproject commit 18a7377024003040db19c060f67484ec90ba0753 diff --git a/src/spicy/spicyz/glue-compiler.cc b/src/spicy/spicyz/glue-compiler.cc index 72b1de3a0c..c29bc7a10c 100644 --- a/src/spicy/spicyz/glue-compiler.cc +++ b/src/spicy/spicyz/glue-compiler.cc @@ -511,7 +511,7 @@ bool GlueCompiler::loadEvtFile(hilti::rt::filesystem::path& path) { if ( looking_at(*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)); } else