diff --git a/CMakeLists.txt b/CMakeLists.txt index 241fe8d5..58e86772 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,8 +148,8 @@ set(LUAJIT_INCLUDE "${LUAJIT_SRC}") set(LUAJIT_LIB "${LUAJIT_SRC}/libluajit.a") ExternalProject_Add( luajit - URL "https://github.com/LuaJIT/LuaJIT/archive/v2.0.3.tar.gz" - URL_HASH "SHA256=8da3d984495a11ba1bce9a833ba60e18b532ca0641e7d90d97fafe85ff014baa" + GIT_REPOSITORY "https://github.com/moonjit/moonjit" + GIT_TAG "2.1.2" CONFIGURE_COMMAND "" BUILD_COMMAND ${CMD_MAKE} BUILD_IN_SOURCE 1 diff --git a/cmake/modules/sysdig.cmake b/cmake/modules/sysdig.cmake index 199e028d..e273326a 100644 --- a/cmake/modules/sysdig.cmake +++ b/cmake/modules/sysdig.cmake @@ -29,8 +29,8 @@ file(MAKE_DIRECTORY ${SYSDIG_CMAKE_WORKING_DIR}) # default below In case you want to test against another sysdig version just pass the variable - ie., `cmake # -DSYSDIG_VERSION=dev ..` if(NOT SYSDIG_VERSION) - set(SYSDIG_VERSION "2aa88dcf6243982697811df4c1b484bcbe9488a2") - set(SYSDIG_CHECKSUM "SHA256=a737077543a6f3473ab306b424bcf7385d788149829ed1538252661b0f20d0f6") + set(SYSDIG_VERSION "06dc8471840ce39ea6c30bb69dfefb1a942b1684") + set(SYSDIG_CHECKSUM "SHA256=9ffdae1719c055e3761bf8b6285246f1a2dd919018ef500e78cf1b1222c155d1") endif() set(PROBE_VERSION "${SYSDIG_VERSION}") diff --git a/userspace/engine/formats.cpp b/userspace/engine/formats.cpp index 2de2b2a7..3a8d3889 100644 --- a/userspace/engine/formats.cpp +++ b/userspace/engine/formats.cpp @@ -26,7 +26,7 @@ bool falco_formats::s_json_output = false; bool falco_formats::s_json_include_output_property = true; std::unique_ptr falco_formats::s_formatters = NULL; -const static struct luaL_reg ll_falco[] = +const static struct luaL_Reg ll_falco[] = { {"formatter", &falco_formats::lua_formatter}, {"free_formatter", &falco_formats::lua_free_formatter}, diff --git a/userspace/engine/rules.cpp b/userspace/engine/rules.cpp index 79e0485e..97394e09 100644 --- a/userspace/engine/rules.cpp +++ b/userspace/engine/rules.cpp @@ -26,15 +26,14 @@ extern "C" { #include "falco_engine.h" #include "banned.h" // This raises a compilation error when certain functions are used -const static struct luaL_reg ll_falco_rules [] = -{ - {"clear_filters", &falco_rules::clear_filters}, - {"add_filter", &falco_rules::add_filter}, - {"add_k8s_audit_filter", &falco_rules::add_k8s_audit_filter}, - {"enable_rule", &falco_rules::enable_rule}, - {"engine_version", &falco_rules::engine_version}, - {NULL,NULL} -}; +const static struct luaL_Reg ll_falco_rules[] = + { + {"clear_filters", &falco_rules::clear_filters}, + {"add_filter", &falco_rules::add_filter}, + {"add_k8s_audit_filter", &falco_rules::add_k8s_audit_filter}, + {"enable_rule", &falco_rules::enable_rule}, + {"engine_version", &falco_rules::engine_version}, + {NULL, NULL}}; falco_rules::falco_rules(sinsp* inspector, falco_engine *engine,