Skip to content

Commit

Permalink
chore(deps): align with libs 0.16.0
Browse files Browse the repository at this point in the history
Signed-off-by: Roberto Scolaro <roberto.scolaro21@gmail.com>
  • Loading branch information
therealbobo committed May 2, 2024
1 parent e7fe148 commit d5cc28f
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 60 deletions.
2 changes: 1 addition & 1 deletion cmake/modules/driver-repo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ ExternalProject_Add(
BUILD_COMMAND ""
INSTALL_COMMAND ""
TEST_COMMAND ""
PATCH_COMMAND sh -c "mv ./driver ../driver.tmp && rm -rf ./* && mv ../driver.tmp/* . && patch -p2 <${CMAKE_SOURCE_DIR}/gke_driver.patch"
PATCH_COMMAND sh -c "mv ./driver ../driver.tmp && rm -rf ./* && mv ../driver.tmp/* ."
)
21 changes: 0 additions & 21 deletions cmake/modules/driver-repo/gke_driver.patch

This file was deleted.

4 changes: 2 additions & 2 deletions cmake/modules/driver.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ else()
# In case you want to test against another driver version (or branch, or commit) just pass the variable -
# ie., `cmake -DDRIVER_VERSION=dev ..`
if(NOT DRIVER_VERSION)
set(DRIVER_VERSION "7.0.0+driver")
set(DRIVER_CHECKSUM "SHA256=9f2a0f14827c0d9d1c3d1abe45b8f074dea531ebeca9859363a92f0d2475757e")
set(DRIVER_VERSION "7.1.0+driver")
set(DRIVER_CHECKSUM "SHA256=ec493d549d7dc6d9a5534e91e0350aa06827f91c7119818d88c22e8a2820f416")
endif()

# cd /path/to/build && cmake /path/to/source
Expand Down
17 changes: 0 additions & 17 deletions cmake/modules/falcosecurity-libs-repo/chisel.patch

This file was deleted.

12 changes: 0 additions & 12 deletions cmake/modules/falcosecurity-libs-repo/eof.patch

This file was deleted.

4 changes: 2 additions & 2 deletions cmake/modules/falcosecurity-libs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ else()
# In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable -
# ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..`
if(NOT FALCOSECURITY_LIBS_VERSION)
set(FALCOSECURITY_LIBS_VERSION "0.15.1")
set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=8c2596fec3c25e9718a8b357b0504450cd26efbe653b79afcd66a8405f0dc08c")
set(FALCOSECURITY_LIBS_VERSION "0.16.0")
set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=5b13d6160bc09ea9b56d70951b68db0aaad45bd0171690eddc08c8028e1b7928")
endif()

# cd /path/to/build && cmake /path/to/source
Expand Down
8 changes: 3 additions & 5 deletions userspace/chisel/chisel_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -842,10 +842,10 @@ int lua_cbacks::get_thread_table_int(lua_State *ls, bool include_fds, bool bareb
lua_pushnumber(ls, (uint32_t)tinfo.m_fdlimit);
lua_settable(ls, -3);
lua_pushliteral(ls, "uid");
lua_pushnumber(ls, (uint32_t)tinfo.m_user.uid);
lua_pushnumber(ls, (uint32_t)tinfo.m_user.uid());
lua_settable(ls, -3);
lua_pushliteral(ls, "gid");
lua_pushnumber(ls, (uint32_t)tinfo.m_group.gid);
lua_pushnumber(ls, (uint32_t)tinfo.m_group.gid());
lua_settable(ls, -3);
lua_pushliteral(ls, "nchilds");
lua_pushnumber(ls, (uint32_t)tinfo.get_num_not_leader_threads());
Expand Down Expand Up @@ -873,7 +873,7 @@ int lua_cbacks::get_thread_table_int(lua_State *ls, bool include_fds, bool bareb
// Extract the user name
//
lua_pushliteral(ls, "username");
lua_pushstring(ls, tinfo.m_user.name);
lua_pushstring(ls, tinfo.m_user.name().c_str());
lua_settable(ls, -3);

//
Expand Down Expand Up @@ -1513,8 +1513,6 @@ int lua_cbacks::push_metric(lua_State *ls)
ASSERT(ch);
ASSERT(ch->m_lua_cinfo);

sinsp* inspector = ch->m_inspector;

//
// tags
//
Expand Down

0 comments on commit d5cc28f

Please sign in to comment.