commit 5f4cc7d4131566cd4b551f32f30b6cf69f6cf5f1
Author: Jakub Bogusz <[email protected]>
Date: Sun Aug 25 14:49:27 2024 +0200
- updated to 0.17.3
falcosecurity-libs-link.patch | 25 ++++++-------------------
falcosecurity-libs-syscalls.patch | 18 +++++++-----------
falcosecurity-libs.spec | 24 +++++-------------------
3 files changed, 18 insertions(+), 49 deletions(-)
---
diff --git a/falcosecurity-libs.spec b/falcosecurity-libs.spec
index 9f8b18e..0b5001e 100644
--- a/falcosecurity-libs.spec
+++ b/falcosecurity-libs.spec
@@ -2,24 +2,18 @@
#
# Conditional build:
%bcond_without apidocs # API documentation
-%bcond_without luajit # stock Lua 5.1 instead of LuaJIT
%bcond_without static_libs # static libraries
#
-%ifnarch %{ix86} %{x8664} %{arm} mips ppc
-%undefine with_luajit
-%endif
Summary: Falco foundation libraries
Summary(pl.UTF-8): Biblioteki podstawowe Falco
Name: falcosecurity-libs
-Version: 0.14.0
-Release: 2
+Version: 0.17.3
+Release: 1
License: Apache v2.0
Group: Libraries
#Source0Download: https://github.com/falcosecurity/libs/releases
Source0:
https://github.com/falcosecurity/libs/archive/%{version}/libs-%{version}.tar.gz
-# Source0-md5: 06501d3dde9861d7287bb333c1b6e772
-Source1:
https://raw.githubusercontent.com/istio/proxy/1.18.2/extensions/common/wasm/base64.h
-# Source1-md5: 71299190977eb7c1971333fd53c70281
+# Source0-md5: 603e6404f2895a1fdcd19f019f254176
Patch0: %{name}-syscalls.patch
Patch1: %{name}-link.patch
URL: https://github.com/falcosecurity/libs
@@ -32,12 +26,6 @@ BuildRequires: grpc-devel
BuildRequires: gtest-devel
BuildRequires: jq-devel
BuildRequires: jsoncpp-devel
-%if %{with luajit}
-BuildRequires: luajit-devel
-%else
-BuildRequires: lua51-devel >= 5.1
-BuildConflicts: luajit-devel
-%endif
BuildRequires: openssl-devel
BuildRequires: protobuf-devel
BuildRequires: re2-devel
@@ -93,11 +81,10 @@ Statyczna biblioteka %{name}.
%patch0 -p1
%patch1 -p1
-install -d build/b64
-cp -p %{SOURCE1} build/b64/base64.h
cp -p /usr/include/uthash.h userspace/libscap/uthash.h
%build
+install -d build
cd build
%cmake .. \
-DBUILD_DRIVER=OFF \
@@ -108,8 +95,7 @@ cd build
-DCMAKE_INSTALL_LIBDIR=%{_lib} \
-DCREATE_TEST_TARGETS=OFF \
-DENABLE_DKMS=OFF \
- -DUSE_BUNDLED_DEPS=OFF \
- -DWITH_CHISEL=ON
+ -DUSE_BUNDLED_DEPS=OFF
%{__make}
diff --git a/falcosecurity-libs-link.patch b/falcosecurity-libs-link.patch
index b1ddcba..86882b4 100644
--- a/falcosecurity-libs-link.patch
+++ b/falcosecurity-libs-link.patch
@@ -1,6 +1,6 @@
---- libs-0.14.0/userspace/libsinsp/CMakeLists.txt.orig 2023-12-19
16:06:08.000000000 +0100
-+++ libs-0.14.0/userspace/libsinsp/CMakeLists.txt 2023-12-30
18:19:56.916336146 +0100
-@@ -202,7 +202,7 @@ set(SINSP_PKGCONFIG_LIBRARIES
+--- libs-0.17.3/userspace/libsinsp/CMakeLists.txt.orig 2024-08-07
10:36:46.000000000 +0200
++++ libs-0.17.3/userspace/libsinsp/CMakeLists.txt 2024-08-25
12:34:45.385155574 +0200
+@@ -179,7 +179,7 @@ set(SINSP_PKGCONFIG_LIBRARIES
if(NOT EMSCRIPTEN)
target_link_libraries(sinsp
@@ -9,7 +9,7 @@
"${CARES_LIB}"
PRIVATE
"${TBB_LIB}"
-@@ -264,7 +264,7 @@ if(NOT WIN32)
+@@ -240,7 +240,7 @@ if(NOT WIN32)
PRIVATE
cri_v1alpha2
cri_v1
@@ -18,7 +18,7 @@
"${GRPC_LIBRARIES}"
"${GRPCPP_LIB}"
"${GRPC_LIB}"
-@@ -273,45 +273,44 @@ if(NOT WIN32)
+@@ -249,34 +249,33 @@ if(NOT WIN32)
"${CARES_LIB}"
)
list(APPEND SINSP_PKGCONFIG_LIBRARIES
@@ -51,12 +51,6 @@
+ target_link_libraries(sinsp PUBLIC "${OPENSSL_LIBRARIES}")
list(APPEND SINSP_PKGCONFIG_LIBRARIES "${OPENSSL_LIBRARIES}")
- if(WITH_CHISEL)
-- target_link_libraries(sinsp INTERFACE "${LUAJIT_LIB}")
-+ target_link_libraries(sinsp PUBLIC "${LUAJIT_LIB}")
- list(APPEND SINSP_PKGCONFIG_LIBRARIES "${LUAJIT_LIB}")
- endif()
-
- target_link_libraries(sinsp INTERFACE dl pthread)
+ target_link_libraries(sinsp PUBLIC dl pthread)
list(APPEND SINSP_PKGCONFIG_LIBRARIES dl pthread)
@@ -68,14 +62,7 @@
list(APPEND SINSP_PKGCONFIG_LIBRARIES stdc++fs)
endif()
endif()
- else()
- if(WITH_CHISEL)
-- target_link_libraries(sinsp INTERFACE "${LUAJIT_LIB}")
-+ target_link_libraries(sinsp PUBLIC "${LUAJIT_LIB}")
- list(APPEND SINSP_PKGCONFIG_LIBRARIES "${LUAJIT_LIB}")
- endif()
- endif() # NOT WIN32
-@@ -354,7 +354,7 @@ foreach(sinsp_lib ${SINSP_PKGCONFIG_LIBR
+@@ -321,7 +320,7 @@ foreach(sinsp_lib ${SINSP_PKGCONFIG_LIBR
# We have a path. Convert it to -L<dir> + -l<lib>.
get_filename_component(sinsp_lib_dir ${sinsp_lib} DIRECTORY)
list(APPEND SINSP_PKG_CONFIG_LIBDIRS -L${sinsp_lib_dir})
diff --git a/falcosecurity-libs-syscalls.patch
b/falcosecurity-libs-syscalls.patch
index 62a08a6..f2d2796 100644
--- a/falcosecurity-libs-syscalls.patch
+++ b/falcosecurity-libs-syscalls.patch
@@ -1,14 +1,10 @@
---- libs-0.14.0/driver/syscall_table64.c.orig 2023-12-30 17:45:48.120768757
+0100
-+++ libs-0.14.0/driver/syscall_table64.c 2023-12-30 17:47:41.180156262
+0100
-@@ -28,8 +28,10 @@ or GPL2.txt for full copies of the licen
- #include "syscall_compat_ppc64le.h"
- #elif defined(__riscv)
+--- libs-0.17.3/driver/syscall_compat.h.orig 2024-08-07 10:36:46.000000000
+0200
++++ libs-0.17.3/driver/syscall_compat.h 2024-08-25 13:48:10.397958252
+0200
+@@ -12,4 +12,7 @@
#include "syscall_compat_riscv64.h"
-+#else // fake
+ #elif defined(__loongarch__)
+ #include "syscall_compat_loongarch64.h"
++#else
++// fake
+#include "syscall_compat_x86_64.h"
#endif /* __x86_64__ */
--#elif defined(_MSC_VER) || defined(__EMSCRIPTEN__)
-+#else
- // these are Linux syscall numbers and obviously meaningless for Windows/macOS
- // but we need *some* definition so that we have a mapping for scap_ppm_sc.c
- #include "syscall_compat_x86_64.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/falcosecurity-libs.git/commitdiff/5f4cc7d4131566cd4b551f32f30b6cf69f6cf5f1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
