From 4002862b85dc715aa424d38081baedb1179b8868 Mon Sep 17 00:00:00 2001 From: Roberto Scolaro Date: Wed, 22 Jan 2025 18:31:30 +0000 Subject: [PATCH 1/3] fix(release-draft): don't use container Signed-off-by: Roberto Scolaro --- .github/workflows/release-draft.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release-draft.yaml b/.github/workflows/release-draft.yaml index f88ff30890..0f52f655b6 100644 --- a/.github/workflows/release-draft.yaml +++ b/.github/workflows/release-draft.yaml @@ -135,8 +135,6 @@ jobs: push-container-image: runs-on: ubuntu-24.04${{ matrix.platform == 'arm64' && '-arm' || '' }} - container: - image: ubuntu:22.04 strategy: matrix: platform: From cba377fd6d6ff1d8e4fc58663e6fb4646a404ea1 Mon Sep 17 00:00:00 2001 From: Roberto Scolaro Date: Mon, 20 Jan 2025 14:05:18 +0000 Subject: [PATCH 2/3] update(deps): bump libs to 0.20.0 and driver to 8.0.0 Signed-off-by: Roberto Scolaro --- cmake/modules/driver.cmake | 4 ++-- cmake/modules/falcosecurity-libs.cmake | 4 ++-- userspace/chisel/chisel_api.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/modules/driver.cmake b/cmake/modules/driver.cmake index 1777133b2d..9b9bc24c9d 100644 --- a/cmake/modules/driver.cmake +++ b/cmake/modules/driver.cmake @@ -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.3.0+driver") - set(DRIVER_CHECKSUM "SHA256=8f572d9a83feda635a3fa53b859d61e37af127c241e35068aadee3bc50d212c0") + set(DRIVER_VERSION "8.0.0+driver") + set(DRIVER_CHECKSUM "SHA256=f35990d6a1087a908fe94e1390027b9580d4636032c0f2b80bf945219474fd6b") endif() # cd /path/to/build && cmake /path/to/source diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake index e2bf368de8..61782da69c 100644 --- a/cmake/modules/falcosecurity-libs.cmake +++ b/cmake/modules/falcosecurity-libs.cmake @@ -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.19.0") - set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=77c38b45c8b29c4da4f8ce49da68278b347a403ff1075307ff0cf540596303ac") + set(FALCOSECURITY_LIBS_VERSION "0.20.0") + set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=4ae6ddb42a1012bacd88c63abdaa7bd27ca0143c4721338a22c45597e63bc99d") endif() # cd /path/to/build && cmake /path/to/source diff --git a/userspace/chisel/chisel_api.cpp b/userspace/chisel/chisel_api.cpp index 04fcb60bee..b8e2f02e29 100644 --- a/userspace/chisel/chisel_api.cpp +++ b/userspace/chisel/chisel_api.cpp @@ -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.get_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.get_group()->gid); lua_settable(ls, -3); lua_pushliteral(ls, "nchilds"); lua_pushnumber(ls, (uint32_t)tinfo.get_num_not_leader_threads()); @@ -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().c_str()); + lua_pushstring(ls, tinfo.get_user()->name); lua_settable(ls, -3); // From f7f3c24ffc7e7004e13df1aed5f37060a14c336f Mon Sep 17 00:00:00 2001 From: Roberto Scolaro Date: Wed, 22 Jan 2025 19:03:10 +0000 Subject: [PATCH 3/3] fix(cmake): windows build Signed-off-by: Roberto Scolaro --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e8850dbed..b1cbd02ccd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,12 @@ endif() set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_EXTENSIONS OFF) if(MSVC OR WIN32) - add_compile_definitions(_HAS_STD_BYTE=0) + add_compile_definitions( + _HAS_STD_BYTE=0 + WIN32_LEAN_AND_MEAN + _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR + NOMINMAX + ) endif() include(falcosecurity-libs)