commit 6dcdee9382c12e765a5f46d1263b41aeca90f9ee
Author: Jakub Bogusz <[email protected]>
Date: Sat Dec 30 21:39:35 2023 +0100
- updated to 0.14.0, more .pc file fixes
falcosecurity-libs-link.patch | 63 ++++++++++++++++++++++++++-------------
falcosecurity-libs-syscalls.patch | 12 ++++----
falcosecurity-libs.spec | 39 +++++++++++++-----------
3 files changed, 69 insertions(+), 45 deletions(-)
---
diff --git a/falcosecurity-libs.spec b/falcosecurity-libs.spec
index 75e2195..9bcc128 100644
--- a/falcosecurity-libs.spec
+++ b/falcosecurity-libs.spec
@@ -11,13 +11,13 @@
Summary: Falco foundation libraries
Summary(pl.UTF-8): Biblioteki podstawowe Falco
Name: falcosecurity-libs
-Version: 0.13.4
+Version: 0.14.0
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: 1dcb3f6ffbd91e60a2087b816c5d6425
+# Source0-md5: 06501d3dde9861d7287bb333c1b6e772
Source1:
https://raw.githubusercontent.com/istio/proxy/1.18.2/extensions/common/wasm/base64.h
# Source1-md5: 71299190977eb7c1971333fd53c70281
Patch0: %{name}-syscalls.patch
@@ -48,7 +48,7 @@ BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# missing symbols from libscap and libsinsp
-%define skip_post_check_so libscap_engine_kmod.so.*
libscap_engine_udig.so.*
+%define skip_post_check_so libscap_engine_kmod.so.*
%description
This package contains libsinsp, libscap and the eBPF probes.
@@ -128,24 +128,27 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc NOTICES README.md
-%dir %{_libdir}/falcosecurity
-%attr(755,root,root) %{_libdir}/falcosecurity/libscap.so.*
-%attr(755,root,root) %{_libdir}/falcosecurity/libscap_engine_bpf.so.*
-%attr(755,root,root) %{_libdir}/falcosecurity/libscap_engine_kmod.so.*
-%attr(755,root,root) %{_libdir}/falcosecurity/libscap_engine_nodriver.so.*
-%attr(755,root,root) %{_libdir}/falcosecurity/libscap_engine_source_plugin.so.*
-%attr(755,root,root) %{_libdir}/falcosecurity/libscap_engine_udig.so.*
-%attr(755,root,root) %{_libdir}/falcosecurity/libsinsp.so.*
+%attr(755,root,root) %{_libdir}/libscap.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libscap.so.0
+%attr(755,root,root) %{_libdir}/libscap_engine_bpf.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libscap_engine_bpf.so.0
+%attr(755,root,root) %{_libdir}/libscap_engine_kmod.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libscap_engine_kmod.so.0
+%attr(755,root,root) %{_libdir}/libscap_engine_nodriver.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libscap_engine_nodriver.so.0
+%attr(755,root,root) %{_libdir}/libscap_engine_source_plugin.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libscap_engine_source_plugin.so.0
+%attr(755,root,root) %{_libdir}/libsinsp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsinsp.so.0
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/falcosecurity/libscap.so
-%attr(755,root,root) %{_libdir}/falcosecurity/libscap_engine_bpf.so
-%attr(755,root,root) %{_libdir}/falcosecurity/libscap_engine_kmod.so
-%attr(755,root,root) %{_libdir}/falcosecurity/libscap_engine_nodriver.so
-%attr(755,root,root) %{_libdir}/falcosecurity/libscap_engine_source_plugin.so
-%attr(755,root,root) %{_libdir}/falcosecurity/libscap_engine_udig.so
-%attr(755,root,root) %{_libdir}/falcosecurity/libsinsp.so
+%attr(755,root,root) %{_libdir}/libscap.so
+%attr(755,root,root) %{_libdir}/libscap_engine_bpf.so
+%attr(755,root,root) %{_libdir}/libscap_engine_kmod.so
+%attr(755,root,root) %{_libdir}/libscap_engine_nodriver.so
+%attr(755,root,root) %{_libdir}/libscap_engine_source_plugin.so
+%attr(755,root,root) %{_libdir}/libsinsp.so
%{_includedir}/falcosecurity
%{_pkgconfigdir}/libscap.pc
%{_pkgconfigdir}/libsinsp.pc
diff --git a/falcosecurity-libs-link.patch b/falcosecurity-libs-link.patch
index 8e20e5e..b1ddcba 100644
--- a/falcosecurity-libs-link.patch
+++ b/falcosecurity-libs-link.patch
@@ -1,14 +1,6 @@
---- libs-0.13.4/userspace/libsinsp/CMakeLists.txt.orig 2023-10-26
18:38:45.000000000 +0200
-+++ libs-0.13.4/userspace/libsinsp/CMakeLists.txt 2023-11-19
22:17:18.968902364 +0100
-@@ -201,7 +201,6 @@ set_sinsp_target_properties(sinsp)
-
- target_link_libraries(sinsp
- PUBLIC scap
-- INTERFACE
- "${CURL_LIBRARIES}"
- "${JSONCPP_LIB}"
- "${RE2_LIB}"
-@@ -216,7 +215,7 @@ set(SINSP_PKGCONFIG_LIBRARIES
+--- 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
if(NOT EMSCRIPTEN)
target_link_libraries(sinsp
@@ -17,18 +9,18 @@
"${CARES_LIB}"
PRIVATE
"${TBB_LIB}"
-@@ -277,7 +276,7 @@ if(NOT WIN32)
+@@ -264,7 +264,7 @@ if(NOT WIN32)
PRIVATE
- "cri_v1alpha2"
- "cri_v1"
+ cri_v1alpha2
+ cri_v1
- INTERFACE
+ PUBLIC
"${GRPC_LIBRARIES}"
"${GRPCPP_LIB}"
"${GRPC_LIB}"
-@@ -286,17 +285,16 @@ if(NOT WIN32)
+@@ -273,45 +273,44 @@ if(NOT WIN32)
"${CARES_LIB}"
- "${JQ_LIB}")
+ )
list(APPEND SINSP_PKGCONFIG_LIBRARIES
- "${GRPC_LIBRARIES}"
- "${GRPCPP_LIB}"
@@ -39,18 +31,20 @@
+ "-lgpr"
"${PROTOBUF_LIB}"
"${CARES_LIB}"
- "${JQ_LIB}")
+ )
if(NOT MUSL_OPTIMIZED_BUILD)
- target_link_libraries(sinsp INTERFACE rt anl)
- list(APPEND SINSP_PKGCONFIG_LIBRARIES rt anl)
-+ target_link_libraries(sinsp INTERFACE rt)
++ target_link_libraries(sinsp PUBLIC rt)
+ list(APPEND SINSP_PKGCONFIG_LIBRARIES rt)
endif()
else()
-@@ -312,11 +310,11 @@ if(NOT WIN32)
- endif()
+- target_link_libraries(sinsp INTERFACE rt)
++ target_link_libraries(sinsp PUBLIC rt)
+ list(APPEND SINSP_PKGCONFIG_LIBRARIES rt)
+ endif() # NOT MINIMAL_BUILD
endif() # NOT APPLE
- target_link_libraries(sinsp INTERFACE "${OPENSSL_LIBRARIES}")
@@ -62,4 +56,31 @@
+ 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)
+
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
+- target_link_libraries(sinsp INTERFACE stdc++fs)
++ target_link_libraries(sinsp PUBLIC stdc++fs)
+ 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
+ # 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})
+- get_filename_component(sinsp_lib_base ${sinsp_lib} NAME_WE)
++ get_filename_component(sinsp_lib_base ${sinsp_lib} NAME_WLE)
+ string(REGEX REPLACE "^lib" "" sinsp_lib_base ${sinsp_lib_base})
+ list(APPEND SINSP_PKG_CONFIG_LIBS -l${sinsp_lib_base})
+ elseif(${sinsp_lib} STREQUAL "scap")
diff --git a/falcosecurity-libs-syscalls.patch
b/falcosecurity-libs-syscalls.patch
index 59ea9f5..62a08a6 100644
--- a/falcosecurity-libs-syscalls.patch
+++ b/falcosecurity-libs-syscalls.patch
@@ -1,9 +1,9 @@
---- libs-0.13.4/driver/syscall_table64.c.orig 2023-10-26 18:38:45.000000000
+0200
-+++ libs-0.13.4/driver/syscall_table64.c 2023-11-19 10:03:55.040625438
+0100
-@@ -23,8 +23,10 @@ or GPL2.txt for full copies of the licen
- #include "syscall_compat_aarch64.h"
- #elif defined(__s390x__)
- #include "syscall_compat_s390x.h"
+--- 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)
+ #include "syscall_compat_riscv64.h"
+#else // fake
+#include "syscall_compat_x86_64.h"
#endif /* __x86_64__ */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/falcosecurity-libs.git/commitdiff/6dcdee9382c12e765a5f46d1263b41aeca90f9ee
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
