diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bf258ae..772e726b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,12 +110,12 @@ set(CMD_MAKE make) include(ExternalProject) -# LuaJIT -include(luajit) - # libs include(falcosecurity-libs) +# LuaJit provided by libs +include(luajit) + # jq include(jq) diff --git a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt index 9506c70f..bbcfe456 100644 --- a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt +++ b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt @@ -25,4 +25,4 @@ ExternalProject_Add( BUILD_COMMAND "" INSTALL_COMMAND "" TEST_COMMAND "" - PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/libscap.patch && patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/luajit.patch) + PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch/libscap.patch) diff --git a/cmake/modules/falcosecurity-libs-repo/patch/luajit.patch b/cmake/modules/falcosecurity-libs-repo/patch/luajit.patch deleted file mode 100644 index dc406de0..00000000 --- a/cmake/modules/falcosecurity-libs-repo/patch/luajit.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/userspace/chisel/chisel.cpp b/userspace/chisel/chisel.cpp -index 0a6e3cf8..0c2e255a 100644 ---- a/userspace/chisel/chisel.cpp -+++ b/userspace/chisel/chisel.cpp -@@ -98,7 +98,7 @@ void lua_stackdump(lua_State *L) - // Lua callbacks - /////////////////////////////////////////////////////////////////////////////// - #ifdef HAS_LUA_CHISELS --const static struct luaL_reg ll_sysdig [] = -+const static struct luaL_Reg ll_sysdig [] = - { - {"set_filter", &lua_cbacks::set_global_filter}, - {"set_snaplen", &lua_cbacks::set_snaplen}, -@@ -134,7 +134,7 @@ const static struct luaL_reg ll_sysdig [] = - {NULL,NULL} - }; - --const static struct luaL_reg ll_chisel [] = -+const static struct luaL_Reg ll_chisel [] = - { - {"request_field", &lua_cbacks::request_field}, - {"set_filter", &lua_cbacks::set_filter}, -@@ -146,7 +146,7 @@ const static struct luaL_reg ll_chisel [] = - {NULL,NULL} - }; - --const static struct luaL_reg ll_evt [] = -+const static struct luaL_Reg ll_evt [] = - { - {"field", &lua_cbacks::field}, - {"get_num", &lua_cbacks::get_num}, -diff --git a/userspace/chisel/lua_parser.cpp b/userspace/chisel/lua_parser.cpp -index 0e26617d..78810d96 100644 ---- a/userspace/chisel/lua_parser.cpp -+++ b/userspace/chisel/lua_parser.cpp -@@ -32,7 +32,7 @@ extern "C" { - #include "lauxlib.h" - } - --const static struct luaL_reg ll_filter [] = -+const static struct luaL_Reg ll_filter [] = - { - {"rel_expr", &lua_parser_cbacks::rel_expr}, - {"bool_op", &lua_parser_cbacks::bool_op}, -diff --git a/userspace/chisel/lua_parser_api.cpp b/userspace/chisel/lua_parser_api.cpp -index c89e9126..c3d8008a 100644 ---- a/userspace/chisel/lua_parser_api.cpp -+++ b/userspace/chisel/lua_parser_api.cpp -@@ -266,7 +266,7 @@ int lua_parser_cbacks::rel_expr(lua_State *ls) - string err = "Got non-table as in-expression operand\n"; - throw sinsp_exception("parser API error"); - } -- int n = luaL_getn(ls, 4); /* get size of table */ -+ int n = lua_objlen (ls, 4); /* get size of table */ - for (i=1; i<=n; i++) - { - lua_rawgeti(ls, 4, i); diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake index 7970c3de..9bcdb996 100644 --- a/cmake/modules/falcosecurity-libs.cmake +++ b/cmake/modules/falcosecurity-libs.cmake @@ -20,8 +20,8 @@ file(MAKE_DIRECTORY ${FALCOSECURITY_LIBS_CMAKE_WORKING_DIR}) # default below In case you want to test against another falcosecurity/libs version just pass the variable - ie., `cmake # -DFALCOSECURITY_LIBS_VERSION=dev ..` if(NOT FALCOSECURITY_LIBS_VERSION) - set(FALCOSECURITY_LIBS_VERSION "c5a8d93162e0b1803226187a2c1adddd859877f5") - set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=575d569f8b1f9c3a1202a380129e61a3db39569fe6d70a48cfc34962b1d05139") + set(FALCOSECURITY_LIBS_VERSION "60fdac76626617fa5c88209e585d09fa517fad64") + #set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=75b04026ce4090e944df22cfb9ebfa1fc32955222b10339097105ea9db1b3d49") endif() # cd /path/to/build && cmake /path/to/source diff --git a/cmake/modules/luajit.cmake b/cmake/modules/luajit.cmake deleted file mode 100644 index 4bd78736..00000000 --- a/cmake/modules/luajit.cmake +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2020 The Falco Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -# specific language governing permissions and limitations under the License. -# - -if(NOT LUAJIT_INCLUDE) - set(LUAJIT_SRC "${PROJECT_BINARY_DIR}/luajit-prefix/src/luajit/src") - message(STATUS "Using bundled LuaJIT in '${LUAJIT_SRC}'") - set(LUAJIT_INCLUDE "${LUAJIT_SRC}") - set(LUAJIT_LIB "${LUAJIT_SRC}/libluajit.a") - externalproject_add( - luajit - GIT_REPOSITORY "https://github.com/LuaJIT/LuaJIT" - GIT_TAG "1d8b747c161db457e032a023ebbff511f5de5ec2" - CONFIGURE_COMMAND "" - BUILD_COMMAND ${CMD_MAKE} - BUILD_IN_SOURCE 1 - BUILD_BYPRODUCTS ${LUAJIT_LIB} - INSTALL_COMMAND "" - ) -endif() -include_directories("${LUAJIT_INCLUDE}")