Package: guix-patches;
Reported by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Date: Thu, 23 Jan 2025 07:29:01 UTC
Severity: normal
Tags: patch
Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 75777 in the body.
You can then email your comments to 75777 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
sharlatanus <at> gmail.com, guix-patches <at> gnu.org:bug#75777; Package guix-patches.
(Thu, 23 Jan 2025 07:29:01 GMT) Full text and rfc822 format available.Maxim Cournoyer <maxim.cournoyer <at> gmail.com>:sharlatanus <at> gmail.com, guix-patches <at> gnu.org.
(Thu, 23 Jan 2025 07:29:01 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: guix-patches <at> gnu.org Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Subject: [PATCH 0/2] Update sysdig and falcosecurity-libs. Date: Thu, 23 Jan 2025 16:28:24 +0900
Maxim Cournoyer (2): gnu: falcosecurity-libs: Update to 0.20.0. gnu: sysdig: Update to 0.40.0-alpha2. gnu/local.mk | 9 +- gnu/packages/admin.scm | 77 +++-- gnu/packages/linux.scm | 33 +-- .../falcosecurity-libs-install-pman.patch | 14 - .../falcosecurity-libs-libscap-pc.patch | 16 - ...lcosecurity-libs-libsinsp-pkg-config.patch | 155 ---------- .../falcosecurity-libs-pkg-config.patch | 23 -- .../falcosecurity-libs-shared-build.patch | 280 ++++++++++++++++++ ...alcosecurity-libs-shared-library-fix.patch | 50 ---- .../sysdig-falcosecurity-libs-0.20.patch | 52 ++++ .../sysdig-shared-falcosecurity-libs.patch | 34 +-- 11 files changed, 401 insertions(+), 342 deletions(-) delete mode 100644 gnu/packages/patches/falcosecurity-libs-install-pman.patch delete mode 100644 gnu/packages/patches/falcosecurity-libs-libscap-pc.patch delete mode 100644 gnu/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch delete mode 100644 gnu/packages/patches/falcosecurity-libs-pkg-config.patch create mode 100644 gnu/packages/patches/falcosecurity-libs-shared-build.patch delete mode 100644 gnu/packages/patches/falcosecurity-libs-shared-library-fix.patch create mode 100644 gnu/packages/patches/sysdig-falcosecurity-libs-0.20.patch base-commit: 4241a5a4688e8a118b2f66423abd3ef8baae98fc -- 2.47.1
leo <at> famulari.name, w <at> wmeyer.eu, guix-patches <at> gnu.org:bug#75777; Package guix-patches.
(Thu, 23 Jan 2025 07:34:02 GMT) Full text and rfc822 format available.Message #8 received at 75777 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: 75777 <at> debbugs.gnu.org Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Subject: [PATCH 1/2] gnu: falcosecurity-libs: Update to 0.20.0. Date: Thu, 23 Jan 2025 16:33:18 +0900
* gnu/packages/linux.scm (falcosecurity-libs): Update to 0.20.0.
[source]: Update patches and combine into a single one.
[native-inputs]: Replace clang (13) with clang-14.
[inputs]: Move libbpf and libelf to...
[propagated-inputs]: ... here.
* gnu/packages/patches/falcosecurity-libs-shared-build.patch: New file.
* gnu/packages/patches/falcosecurity-libs-install-pman.patch
* gnu/packages/patches/falcosecurity-libs-libscap-pc.patch
* gnu/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch
* gnu/packages/patches/falcosecurity-libs-pkg-config.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Update accordingly.
Change-Id: I58b5d207da27ab4f52556e5c804d8e545e7e3974
---
gnu/local.mk | 8 +-
gnu/packages/linux.scm | 33 +--
.../falcosecurity-libs-install-pman.patch | 14 -
.../falcosecurity-libs-libscap-pc.patch | 16 -
...lcosecurity-libs-libsinsp-pkg-config.patch | 155 ----------
.../falcosecurity-libs-pkg-config.patch | 23 --
.../falcosecurity-libs-shared-build.patch | 280 ++++++++++++++++++
...alcosecurity-libs-shared-library-fix.patch | 50 ----
8 files changed, 297 insertions(+), 282 deletions(-)
delete mode 100644 gnu/packages/patches/falcosecurity-libs-install-pman.patch
delete mode 100644 gnu/packages/patches/falcosecurity-libs-libscap-pc.patch
delete mode 100644 gnu/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch
delete mode 100644 gnu/packages/patches/falcosecurity-libs-pkg-config.patch
create mode 100644 gnu/packages/patches/falcosecurity-libs-shared-build.patch
delete mode 100644 gnu/packages/patches/falcosecurity-libs-shared-library-fix.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 5091f93eb8..de2e42cd79 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -19,7 +19,7 @@
# Copyright © 2018 Amirouche Boubekki <amirouche <at> hypermove.net>
# Copyright © 2018, 2019, 2020, 2021, 2022, 2024 Oleg Pykhalov <go.wigust <at> gmail.com>
# Copyright © 2018 Stefan Stefanović <stefanx2ovic <at> gmail.com>
-# Copyright © 2018, 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+# Copyright © 2018, 2020-2025 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
# Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant <glv <at> posteo.net>
# Copyright © 2019, 2020 John Soo <jsoo1 <at> asu.edu>
# Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
@@ -1252,11 +1252,7 @@ dist_patch_DATA = \
%D%/packages/patches/fail2ban-python310-server-action.patch \
%D%/packages/patches/fail2ban-python310-server-actions.patch \
%D%/packages/patches/fail2ban-python310-server-jails.patch \
- %D%/packages/patches/falcosecurity-libs-install-pman.patch \
- %D%/packages/patches/falcosecurity-libs-libscap-pc.patch \
- %D%/packages/patches/falcosecurity-libs-pkg-config.patch \
- %D%/packages/patches/falcosecurity-libs-shared-library-fix.patch \
- %D%/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch \
+ %D%/packages/patches/falcosecurity-libs-shared-build.patch \
%D%/packages/patches/farstream-gupnp.patch \
%D%/packages/patches/farstream-make.patch \
%D%/packages/patches/fastcap-mulGlobal.patch \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 172797f97d..46be9f3a37 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -34,7 +34,7 @@
;;; Copyright © 2018 Vasile Dumitrascu <va511e <at> yahoo.com>
;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen <at> yahoo.de>
;;; Copyright © 2019 mikadoZero <mikadozero <at> yandex.com>
-;;; Copyright © 2019, 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2019-2025 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
;;; Copyright © 2019 Stefan Stefanović <stefanx2ovic <at> gmail.com>
;;; Copyright © 2019-2022 Brice Waegeneire <brice <at> waegenei.re>
;;; Copyright © 2019 Kei Kebreau <kkebreau <at> posteo.net>
@@ -9884,7 +9884,7 @@ (define-public fakechroot
(define-public falcosecurity-libs
(package
(name "falcosecurity-libs")
- (version "0.16.0")
+ (version "0.20.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -9893,14 +9893,10 @@ (define-public falcosecurity-libs
(file-name (git-file-name name version))
(sha256
(base32
- "1vzymzkfipb3bnjjd9m8ykzj0l94fm8mnpcxfm8mpxz3jbd8xnv9"))
+ "041ir9wk44v7isidwl7fzxrjvs85j637wcr7xirasd8ysxa0r4qv"))
(patches
(search-patches
- "falcosecurity-libs-pkg-config.patch"
- "falcosecurity-libs-install-pman.patch"
- "falcosecurity-libs-libscap-pc.patch"
- "falcosecurity-libs-shared-library-fix.patch"
- "falcosecurity-libs-libsinsp-pkg-config.patch"))))
+ "falcosecurity-libs-shared-build.patch"))))
(build-system cmake-build-system)
(arguments
(list
@@ -9928,21 +9924,22 @@ (define-public falcosecurity-libs
(lambda _
(delete-file-recursively
(string-append #$output "/src")))))))
- (native-inputs (list bpftool
- clang
- googletest
- pkg-config
- valijson)) ;header-only library
+ (native-inputs
+ (list bpftool
+ clang-14 ;avoid stack limit exceeded build error
+ googletest
+ pkg-config
+ valijson)) ;header-only library
(inputs
- (list elfutils
- libbpf
- libelf))
+ (list elfutils))
(propagated-inputs
- ;; The following inputs are in the 'Requires' field of libscap.pc and
- ;; libsinp.pc.
+ ;; The following inputs are in the 'Requires' field of libscap.pc,
+ ;; libsinp.pc or libpman.pc.
(list c-ares
grpc
jsoncpp
+ libbpf
+ libelf
openssl
protobuf
uthash ;included in libscap headers
diff --git a/gnu/packages/patches/falcosecurity-libs-install-pman.patch b/gnu/packages/patches/falcosecurity-libs-install-pman.patch
deleted file mode 100644
index 38dcc0c4b8..0000000000
--- a/gnu/packages/patches/falcosecurity-libs-install-pman.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Install the pman library and its header.
-Upstream status: https://github.com/falcosecurity/libs/pull/1842
-
-diff --git a/userspace/libpman/CMakeLists.txt b/userspace/libpman/CMakeLists.txt
-index da92e9f27..4b57365fe 100644
---- a/userspace/libpman/CMakeLists.txt
-+++ b/userspace/libpman/CMakeLists.txt
-@@ -58,3 +58,6 @@ endif()
- if(USE_BUNDLED_LIBBPF)
- add_dependencies(pman libbpf)
- endif()
-+
-+install(TARGETS pman LIBRARY ARCHIVE FRAMEWORK)
-+install(FILES include/libpman.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/gnu/packages/patches/falcosecurity-libs-libscap-pc.patch b/gnu/packages/patches/falcosecurity-libs-libscap-pc.patch
deleted file mode 100644
index ff650942ff..0000000000
--- a/gnu/packages/patches/falcosecurity-libs-libscap-pc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-libscap: Guard against install_lib_link_libraries-NOTFOUND.
-Upstream status: https://github.com/falcosecurity/libs/pull/1842
-
-diff --git a/cmake/modules/libscap.cmake b/cmake/modules/libscap.cmake
-index 81ad2d28d..8b6b4197e 100644
---- a/cmake/modules/libscap.cmake
-+++ b/cmake/modules/libscap.cmake
-@@ -95,7 +95,7 @@ foreach(libscap_install_lib ${LIBSCAP_INSTALL_LIBS})
- list(APPEND libscap_link_libraries ${libscap_install_lib})
- get_target_property(install_lib_link_libraries ${libscap_install_lib} LINK_LIBRARIES)
- foreach (install_lib_link_library ${install_lib_link_libraries})
-- if (NOT ${install_lib_link_library} IN_LIST libscap_subdir_targets)
-+ if (${install_lib_link_library} AND (NOT ${install_lib_link_library} IN_LIST libscap_subdir_targets))
- if(${install_lib_link_library} MATCHES "/")
- # We have a path. Convert it to -L<dir> + -l<lib>.
- get_filename_component(scap_lib_dir ${install_lib_link_library} DIRECTORY)
diff --git a/gnu/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch b/gnu/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch
deleted file mode 100644
index b2d38e42e0..0000000000
--- a/gnu/packages/patches/falcosecurity-libs-libsinsp-pkg-config.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-libsinsp: Refine pkg-config file generation.
-Upstream status: https://github.com/falcosecurity/libs/pull/1842
-
-diff --git a/userspace/libscap/libscap.pc.in b/userspace/libscap/libscap.pc.in
-index c5948489f..829bcd19b 100644
---- a/userspace/libscap/libscap.pc.in
-+++ b/userspace/libscap/libscap.pc.in
-@@ -1,4 +1,4 @@
--prefix=${pcfiledir}/../..
-+prefix=@CMAKE_INSTALL_PREFIX@
- libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
- includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-
-@@ -6,5 +6,6 @@ Name: libscap
- Description: lib for System CAPture
- Version: @FALCOSECURITY_LIBS_VERSION@
-
--Libs: -L${libdir} @LIBSCAP_LINK_LIBDIRS_FLAGS@ @LIBSCAP_LINK_LIBRARIES_FLAGS@
-+Requires: zlib
-+Libs: -L${libdir} -L{libdir}/@LIBS_PACKAGE_NAME@/libscap @LIBSCAP_LINK_LIBDIRS_FLAGS@ @LIBSCAP_LINK_LIBRARIES_FLAGS@
- Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libscap -I${includedir}/@LIBS_PACKAGE_NAME@/driver -I${includedir}/@LIBS_PACKAGE_NAME@ -I <at> UTHASH_INCLUDE@
-diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
-index 6104603e8..832f86067 100644
---- a/userspace/libsinsp/CMakeLists.txt
-+++ b/userspace/libsinsp/CMakeLists.txt
-@@ -169,13 +169,9 @@ target_link_libraries(sinsp
- "${RE2_LIB}"
- )
-
--set(SINSP_PKGCONFIG_LIBRARIES
-- scap
-- "${ZLIB_LIB}"
-- "${CURL_LIBRARIES}"
-- "${JSONCPP_LIB}"
-- "${RE2_LIB}"
--)
-+set(SINSP_PKGCONFIG_LIBRARIES)
-+set(SINSP_PKGCONFIG_REQUIRES jsoncpp)
-+set(SINSP_PKGCONFIG_REQUIRES_PRIVATE libcurl re2)
-
- if(NOT EMSCRIPTEN)
- target_link_libraries(sinsp
-@@ -184,7 +180,8 @@ if(NOT EMSCRIPTEN)
- PRIVATE
- "${TBB_LIB}"
- )
-- list(APPEND SINSP_PKGCONFIG_LIBRARIES "${CARES_LIB}")
-+ list(APPEND SINSP_PKGCONFIG_REQUIRES libcares)
-+ list(APPEND SINSP_PKGCONFIG_REQUIRES_PRIVATE tbb)
- endif()
-
- if(USE_BUNDLED_VALIJSON)
-@@ -248,14 +245,12 @@ if(NOT WIN32)
- "${PROTOBUF_LIB}"
- "${CARES_LIB}"
- )
-- list(APPEND SINSP_PKGCONFIG_LIBRARIES
-- "${GRPC_LIBRARIES}"
-- "${GRPCPP_LIB}"
-- "${GRPC_LIB}"
-- "${GPR_LIB}"
-- "${PROTOBUF_LIB}"
-- "${CARES_LIB}"
-- )
-+ list(APPEND SINSP_PKGCONFIG_REQUIRES
-+ gpr
-+ grpc
-+ grpc++
-+ protobuf
-+ libcares)
-
- if(NOT MUSL_OPTIMIZED_BUILD)
- target_link_libraries(sinsp INTERFACE rt anl)
-@@ -269,7 +264,7 @@ if(NOT WIN32)
- endif() # NOT APPLE
-
- target_link_libraries(sinsp INTERFACE "${OPENSSL_LIBRARIES}")
-- list(APPEND SINSP_PKGCONFIG_LIBRARIES "${OPENSSL_LIBRARIES}")
-+ list(APPEND SINSP_PKGCONFIG_REQUIRES libcrypto libssl)
-
- target_link_libraries(sinsp INTERFACE dl pthread)
- list(APPEND SINSP_PKGCONFIG_LIBRARIES dl pthread)
-@@ -306,41 +301,17 @@ if(NOT DEFINED SINSP_AGENT_CGROUP_MEM_PATH_ENV_VAR)
- endif()
- add_definitions(-DSINSP_AGENT_CGROUP_MEM_PATH_ENV_VAR="${SINSP_AGENT_CGROUP_MEM_PATH_ENV_VAR}")
-
--# Build our pkg-config "Libs:" flags. For now, loop over SINSP_PKGCONFIG_LIBRARIES. If
--# we ever start using pkg_search_module or pkg_check_modules in cmake/modules
--# we could add each module to our "Requires:" line instead. We might need to
--# expand this to use some of the techniques in
--# https://github.com/curl/curl/blob/curl-7_84_0/CMakeLists.txt#L1539
--set(SINSP_PKG_CONFIG_LIBS)
--set(SINSP_PKG_CONFIG_LIBDIRS "")
--foreach(sinsp_lib ${SINSP_PKGCONFIG_LIBRARIES})
-- if(${sinsp_lib} MATCHES "^-")
-- # We have a flag. Pass it through unchanged.
-- list(APPEND SINSP_PKG_CONFIG_LIBS ${sinsp_lib})
-- elseif(${sinsp_lib} MATCHES "/")
-- # 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)
-- 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")
-- # We require libscap.pc, so skip it.
-- else()
-- # Assume we have a plain library name. Prefix it with "-l".
-- list(APPEND SINSP_PKG_CONFIG_LIBS -l${sinsp_lib})
-- endif()
--endforeach()
-+list(REMOVE_DUPLICATES SINSP_PKGCONFIG_LIBRARIES)
-+list(REMOVE_DUPLICATES SINSP_PKGCONFIG_REQUIRES)
-+list(REMOVE_DUPLICATES SINSP_PKGCONFIG_REQUIRES_PRIVATE)
-
--# Build our pkg-config "Cflags:" flags.
--set(SINSP_PKG_CONFIG_INCLUDES "")
--foreach(sinsp_include_directory ${LIBSINSP_INCLUDE_DIRS})
-- list(APPEND SINSP_PKG_CONFIG_INCLUDES -I${sinsp_include_directory})
-+set(SINSP_LINK_FLAGS)
-+foreach(sinsp_link_library ${SINSP_PKGCONFIG_LIBRARIES})
-+ list(APPEND SINSP_LINK_FLAGS "-l${sinsp_link_library}")
- endforeach()
-
--string(REPLACE ";" " " SINSP_PKG_CONFIG_LIBS "${SINSP_PKG_CONFIG_LIBS}")
--list(REMOVE_DUPLICATES SINSP_PKG_CONFIG_LIBDIRS)
--string(REPLACE ";" " " SINSP_PKG_CONFIG_LIBDIRS "${SINSP_PKG_CONFIG_LIBDIRS}")
--list(REMOVE_DUPLICATES SINSP_PKG_CONFIG_INCLUDES)
--string(REPLACE ";" " " SINSP_PKG_CONFIG_INCLUDES "${SINSP_PKG_CONFIG_INCLUDES}")
-+string(REPLACE ";" " " LIBSINSP_LINK_FLAGS "${SINSP_LINK_FLAGS}")
-+string(REPLACE ";" " " LIBSINSP_REQUIRES "${SINSP_PKGCONFIG_REQUIRES}")
-+string(REPLACE ";" " " LIBSINSP_REQUIRES_PRIVATE "${SINSP_PKGCONFIG_REQUIRES_PRIVATE}")
-+
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libsinsp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libsinsp.pc @ONLY)
-diff --git a/userspace/libsinsp/libsinsp.pc.in b/userspace/libsinsp/libsinsp.pc.in
-index 9292e73ce..f20da76b3 100644
---- a/userspace/libsinsp/libsinsp.pc.in
-+++ b/userspace/libsinsp/libsinsp.pc.in
-@@ -1,4 +1,4 @@
--prefix=${pcfiledir}/../..
-+prefix=@CMAKE_INSTALL_PREFIX@
- libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
- includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-
-@@ -6,6 +6,7 @@ Name: libsinsp
- Description: lib for System INSPection
- Version: @FALCOSECURITY_LIBS_VERSION@
-
--Requires: libscap
--Libs: -L${libdir} -lsinsp @SINSP_PKG_CONFIG_LIBDIRS@ @SINSP_PKG_CONFIG_LIBS@
--Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libsinsp -I${includedir}/@LIBS_PACKAGE_NAME@/driver -I${includedir}/@LIBS_PACKAGE_NAME@ @SINSP_PKG_CONFIG_INCLUDES@
-+Requires: libscap @LIBSINSP_REQUIRES@
-+Requires.private: @LIBSINSP_REQUIRES_PRIVATE@
-+Libs: -L${libdir} -lsinsp @LIBSINSP_LINK_FLAGS@
-+Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libsinsp -I${includedir}/@LIBS_PACKAGE_NAME@/driver -I${includedir}/@LIBS_PACKAGE_NAME@
diff --git a/gnu/packages/patches/falcosecurity-libs-pkg-config.patch b/gnu/packages/patches/falcosecurity-libs-pkg-config.patch
deleted file mode 100644
index f686cec3f7..0000000000
--- a/gnu/packages/patches/falcosecurity-libs-pkg-config.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-userspace: Extend CFLAGS of libscap.pc and libsinsp.pc.
-Upstream status: https://github.com/falcosecurity/libs/pull/1842
-
-diff --git a/userspace/libscap/libscap.pc.in b/userspace/libscap/libscap.pc.in
-index 40b6e96ed..c5948489f 100644
---- a/userspace/libscap/libscap.pc.in
-+++ b/userspace/libscap/libscap.pc.in
-@@ -7,4 +7,4 @@ Description: lib for System CAPture
- Version: @FALCOSECURITY_LIBS_VERSION@
-
- Libs: -L${libdir} @LIBSCAP_LINK_LIBDIRS_FLAGS@ @LIBSCAP_LINK_LIBRARIES_FLAGS@
--Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libscap
-+Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libscap -I${includedir}/@LIBS_PACKAGE_NAME@/driver -I${includedir}/@LIBS_PACKAGE_NAME@ -I <at> UTHASH_INCLUDE@
-diff --git a/userspace/libsinsp/libsinsp.pc.in b/userspace/libsinsp/libsinsp.pc.in
-index c1cc4a1e2..9292e73ce 100644
---- a/userspace/libsinsp/libsinsp.pc.in
-+++ b/userspace/libsinsp/libsinsp.pc.in
-@@ -8,4 +8,4 @@ Version: @FALCOSECURITY_LIBS_VERSION@
-
- Requires: libscap
- Libs: -L${libdir} -lsinsp @SINSP_PKG_CONFIG_LIBDIRS@ @SINSP_PKG_CONFIG_LIBS@
--Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libsinsp @SINSP_PKG_CONFIG_INCLUDES@
-+Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/libsinsp -I${includedir}/@LIBS_PACKAGE_NAME@/driver -I${includedir}/@LIBS_PACKAGE_NAME@ @SINSP_PKG_CONFIG_INCLUDES@
diff --git a/gnu/packages/patches/falcosecurity-libs-shared-build.patch b/gnu/packages/patches/falcosecurity-libs-shared-build.patch
new file mode 100644
index 0000000000..08d547272c
--- /dev/null
+++ b/gnu/packages/patches/falcosecurity-libs-shared-build.patch
@@ -0,0 +1,280 @@
+Upstream-status: https://github.com/falcosecurity/libs/pull/1842
+
+diff --git a/cmake/modules/BuildPkgConfigDependencies.cmake b/cmake/modules/BuildPkgConfigDependencies.cmake
+index a597f18ac..2129bffac 100644
+--- a/cmake/modules/BuildPkgConfigDependencies.cmake
++++ b/cmake/modules/BuildPkgConfigDependencies.cmake
+@@ -3,6 +3,7 @@
+ # libsinsp.pc (which requires libscap.pc and pulls them in that way)
+ function(add_pkgconfig_library LIBDIRS_VAR LIBS_VAR lib ignored)
+
++ message(DEBUG "[add_pkgconfig_library] processing lib \"${lib}\"")
+ # if it's not a target, it doesn't have dependencies we know or care about
+ if(NOT TARGET ${lib})
+ return()
+@@ -14,14 +15,25 @@ function(add_pkgconfig_library LIBDIRS_VAR LIBS_VAR lib ignored)
+ return()
+ endif()
+
++ message(DEBUG "[add_pkgconfig_library] LINK_LIBRARIES property: \"${PKGCONFIG_LIBRARIES}\"")
++
+ get_property(
+ target_type
+ TARGET ${lib}
+ PROPERTY TYPE
+ )
++ message(DEBUG "[add_pkgconfig_library] ignored list: \"${ignored}\"")
+ foreach(dep ${PKGCONFIG_LIBRARIES})
+- # ignore dependencies in the list ${ignored}
+- if(${dep} IN_LIST "${ignored}")
++ # XXX: We use a (very) loose match as we are potentially
++ # comparing absolute library file names (dep) to pkg-config
++ # library names to be ignored. The only alternative I can
++ # think of would be to maintain a map associating pkg-config
++ # names to their library file name.
++ get_filename_component(dep_base ${dep} NAME_WE)
++ string(REGEX REPLACE "^lib" "" dep_name ${dep_base})
++ message(DEBUG "[add_pkgconfig_library] processing dep ${dep}")
++ if("${ignored}" MATCHES "${dep_name}")
++ message(DEBUG "[add_pkgconfig_library] \"${dep}\" ignored")
+ continue()
+ endif()
+
+diff --git a/cmake/modules/libscap.cmake b/cmake/modules/libscap.cmake
+index 346ac51b1..045a4564c 100644
+--- a/cmake/modules/libscap.cmake
++++ b/cmake/modules/libscap.cmake
+@@ -93,7 +93,11 @@ if(NOT HAVE_LIBSCAP)
+
+ set(libscap_link_flags)
+ set(libscap_link_libdirs "")
+- add_pkgconfig_dependency(libscap_link_libdirs libscap_link_flags scap "")
++ add_pkgconfig_dependency(libscap_link_libdirs libscap_link_flags scap
++ # Avoid using these in libscap.pc Libs field, as they are
++ # already listed in Requires. lbpf is transitively required
++ # via libpman.pc.
++ "jsoncpp;libelf;libpman;protobuf;zlib")
+
+ string(REPLACE ";" " " LIBSCAP_LINK_LIBRARIES_FLAGS "${libscap_link_flags}")
+ string(REPLACE ";" " " LIBSCAP_LINK_LIBDIRS_FLAGS "${libscap_link_libdirs}")
+diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
+index 94f37ee2a..fc844da7b 100644
+--- a/driver/CMakeLists.txt
++++ b/driver/CMakeLists.txt
+@@ -158,6 +158,11 @@ set(DRIVER_SOURCES
+ ppm_consumer.h
+ capture_macro.h
+ socketcall_to_syscall.h
++ syscall_compat_loongarch64.h
++ syscall_compat_ppc64le.h
++ syscall_compat_riscv64.h
++ syscall_compat_s390x.h
++ syscall_compat_x86_64.h
+ syscall_ia32_64_map.c
+ )
+
+diff --git a/test/libscap/CMakeLists.txt b/test/libscap/CMakeLists.txt
+index ebac7e968..eeb99ca2f 100644
+--- a/test/libscap/CMakeLists.txt
++++ b/test/libscap/CMakeLists.txt
+@@ -39,7 +39,13 @@ set(LIBSCAP_TESTS_INCLUDE
+ # Needed by gtest
+ find_package(Threads)
+
+-set(LIBSCAP_TESTS_LIBRARIES "${GTEST_LIB}" "${GTEST_MAIN_LIB}" "${CMAKE_THREAD_LIBS_INIT}" scap)
++set(LIBSCAP_TESTS_LIBRARIES
++ "${GTEST_LIB}"
++ "${GTEST_MAIN_LIB}"
++ "${CMAKE_THREAD_LIBS_INIT}"
++ "${PROTOBUF_LIB}"
++ scap
++)
+
+ set(LIBSCAP_TESTS_DEPENDENCIES gtest scap)
+
+diff --git a/userspace/libpman/CMakeLists.txt b/userspace/libpman/CMakeLists.txt
+index b5d982b0d..72b7ec2c1 100644
+--- a/userspace/libpman/CMakeLists.txt
++++ b/userspace/libpman/CMakeLists.txt
+@@ -53,3 +53,11 @@ install(
+ COMPONENT "scap"
+ OPTIONAL
+ )
++
++install(FILES include/libpman.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++configure_file(
++ ${CMAKE_CURRENT_SOURCE_DIR}/libpman.pc.in
++ ${PROJECT_BINARY_DIR}/libpman.pc @ONLY)
++
++install(FILES ${PROJECT_BINARY_DIR}/libpman.pc
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+diff --git a/userspace/libpman/libpman.pc.in b/userspace/libpman/libpman.pc.in
+new file mode 100644
+index 000000000..e5373e87d
+--- /dev/null
++++ b/userspace/libpman/libpman.pc.in
+@@ -0,0 +1,11 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
++
++Name: libpman
++Description: Utility library for BPF probes
++Version: @FALCOSECURITY_LIBS_VERSION@
++
++Requires: libbpf zlib
++Libs: -L${libdir} -lpman -lscap_event_schema -lscap_platform
++Cflags: -I${includedir}
+diff --git a/userspace/libscap/CMakeLists.txt b/userspace/libscap/CMakeLists.txt
+index 20ac14cdf..c92cf9021 100644
+--- a/userspace/libscap/CMakeLists.txt
++++ b/userspace/libscap/CMakeLists.txt
+@@ -90,8 +90,7 @@ target_include_directories(
+
+ target_link_libraries(scap PRIVATE scap_error "${ZLIB_LIB}")
+
+-add_library(
+- scap_event_schema STATIC
++add_library(scap_event_schema
+ scap_event.c
+ ppm_sc_names.c
+ scap_print_event.c
+diff --git a/userspace/libscap/libscap.pc.in b/userspace/libscap/libscap.pc.in
+index 520020691..e5876b03c 100644
+--- a/userspace/libscap/libscap.pc.in
++++ b/userspace/libscap/libscap.pc.in
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@LIBS_PACKAGE_NAME@
+
+@@ -6,5 +6,10 @@ Name: libscap
+ Description: lib for System CAPture
+ Version: @FALCOSECURITY_LIBS_VERSION@
+
++# Note: jsoncpp and protobuf are required by scap_engine_gvisor, which
++# currently lacks its own pkg-config file. Similarly, libelf is
++# required by scap_engine_bpf.
++Requires: jsoncpp libelf libpman protobuf
++Requires.private: zlib
+ Libs: -L${libdir} @LIBSCAP_LINK_LIBDIRS_FLAGS@ @LIBSCAP_LINK_LIBRARIES_FLAGS@
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${includedir}/libscap -I${includedir}/driver -I <at> UTHASH_INCLUDE@
+diff --git a/userspace/libscap/linux/CMakeLists.txt b/userspace/libscap/linux/CMakeLists.txt
+index 435c8546c..4047d5430 100644
+--- a/userspace/libscap/linux/CMakeLists.txt
++++ b/userspace/libscap/linux/CMakeLists.txt
+@@ -12,8 +12,7 @@
+ # or implied. See the License for the specific language governing permissions and limitations under
+ # the License.
+ #
+-add_library(
+- scap_platform STATIC
++add_library(scap_platform
+ scap_linux_platform.c
+ scap_linux_hostinfo_platform.c
+ scap_procs.c
+diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
+index f58b00962..2f963d448 100644
+--- a/userspace/libsinsp/CMakeLists.txt
++++ b/userspace/libsinsp/CMakeLists.txt
+@@ -177,12 +177,17 @@ target_link_libraries(
+ PRIVATE "${CURL_LIBRARIES}" "${JSONCPP_LIB}" "${RE2_LIB}"
+ )
+
++set(SINSP_PKGCONFIG_REQUIRES jsoncpp)
++set(SINSP_PKGCONFIG_REQUIRES_PRIVATE libcurl re2)
++
+ if(NOT EMSCRIPTEN)
+ target_link_libraries(
+ sinsp
+ INTERFACE "${CARES_LIB}"
+ PRIVATE "${TBB_LIB}"
+ )
++ list(APPEND SINSP_PKGCONFIG_REQUIRES libcares)
++ list(APPEND SINSP_PKGCONFIG_REQUIRES_PRIVATE tbb)
+ endif()
+
+ if(USE_BUNDLED_VALIJSON)
+@@ -275,6 +280,12 @@ if(NOT WIN32)
+ )
+
+ target_link_libraries(sinsp PRIVATE cri_v1alpha2 cri_v1 containerd_interface)
++ list(APPEND SINSP_PKGCONFIG_REQUIRES
++ gpr
++ grpc
++ grpc++
++ protobuf
++ libcares)
+
+ if(NOT MUSL_OPTIMIZED_BUILD)
+ find_library(LIB_ANL anl)
+@@ -290,6 +301,8 @@ if(NOT WIN32)
+ endif() # NOT MINIMAL_BUILD
+ endif() # NOT APPLE
+
++ list(APPEND SINSP_PKGCONFIG_REQUIRES libcrypto libssl)
++
+ target_link_libraries(sinsp INTERFACE dl pthread)
+
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+@@ -329,7 +342,8 @@ add_definitions(-DSINSP_AGENT_CGROUP_MEM_PATH_ENV_VAR="${SINSP_AGENT_CGROUP_MEM_
+ # https://github.com/curl/curl/blob/curl-7_84_0/CMakeLists.txt#L1539
+ set(SINSP_PKG_CONFIG_LIBS)
+ set(SINSP_PKG_CONFIG_LIBDIRS "")
+-add_pkgconfig_dependency(SINSP_PKG_CONFIG_LIBDIRS SINSP_PKG_CONFIG_LIBS sinsp scap)
++add_pkgconfig_dependency(SINSP_PKG_CONFIG_LIBDIRS SINSP_PKG_CONFIG_LIBS sinsp
++ "scap;${SINSP_PKGCONFIG_REQUIRES};${SINSP_PKGCONFIG_REQUIRES_PRIVATE}")
+
+ # Build our pkg-config "Cflags:" flags.
+ set(SINSP_PKG_CONFIG_INCLUDES "")
+@@ -337,6 +351,8 @@ foreach(sinsp_include_directory ${LIBSINSP_INCLUDE_DIRS})
+ list(APPEND SINSP_PKG_CONFIG_INCLUDES -I${sinsp_include_directory})
+ endforeach()
+
++string(REPLACE ";" " " LIBSINSP_REQUIRES "${SINSP_PKGCONFIG_REQUIRES}")
++string(REPLACE ";" " " LIBSINSP_REQUIRES_PRIVATE "${SINSP_PKGCONFIG_REQUIRES_PRIVATE}")
+ string(REPLACE ";" " " SINSP_PKG_CONFIG_LIBS "${SINSP_PKG_CONFIG_LIBS}")
+ list(REMOVE_DUPLICATES SINSP_PKG_CONFIG_LIBDIRS)
+ string(REPLACE ";" " " SINSP_PKG_CONFIG_LIBDIRS "${SINSP_PKG_CONFIG_LIBDIRS}")
+diff --git a/userspace/libsinsp/libsinsp.pc.in b/userspace/libsinsp/libsinsp.pc.in
+index 38e8e4e0d..9ab103ee1 100644
+--- a/userspace/libsinsp/libsinsp.pc.in
++++ b/userspace/libsinsp/libsinsp.pc.in
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@LIBS_PACKAGE_NAME@
+
+@@ -6,6 +6,7 @@ Name: libsinsp
+ Description: lib for System INSPection
+ Version: @FALCOSECURITY_LIBS_VERSION@
+
+-Requires: libscap
+-Libs: -L${libdir} -lsinsp @SINSP_PKG_CONFIG_LIBDIRS@ @SINSP_PKG_CONFIG_LIBS@
+-Cflags: -I${includedir} @SINSP_PKG_CONFIG_INCLUDES@
++Requires: libscap @LIBSINSP_REQUIRES@
++Requires.private: @LIBSINSP_REQUIRES_PRIVATE@
++Libs: -L${libdir} @SINSP_PKG_CONFIG_LIBDIRS@ @SINSP_PKG_CONFIG_LIBS@
++Cflags: -I${includedir} -I${includedir}/libsinsp -I${includedir}/driver @SINSP_PKG_CONFIG_INCLUDES@
+diff --git a/userspace/libsinsp/test/CMakeLists.txt b/userspace/libsinsp/test/CMakeLists.txt
+index fb8c46754..be6420672 100644
+--- a/userspace/libsinsp/test/CMakeLists.txt
++++ b/userspace/libsinsp/test/CMakeLists.txt
+@@ -191,7 +191,13 @@ target_include_directories(
+ )
+
+ target_link_libraries(
+- unit-test-libsinsp sinsp "${GTEST_LIB}" "${GTEST_MAIN_LIB}" "${TBB_LIB}" "${JSONCPP_LIB}"
++ unit-test-libsinsp
++ sinsp
++ "${GRPCPP_LIB}"
++ "${GTEST_LIB}"
++ "${GTEST_MAIN_LIB}"
++ "${TBB_LIB}"
++ "${JSONCPP_LIB}"
+ )
+
+ # Add some additional include directories associated with `ADDITIONAL_SINSP_TESTS_SUITE`
diff --git a/gnu/packages/patches/falcosecurity-libs-shared-library-fix.patch b/gnu/packages/patches/falcosecurity-libs-shared-library-fix.patch
deleted file mode 100644
index 3334a89516..0000000000
--- a/gnu/packages/patches/falcosecurity-libs-shared-library-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Fix shared library build.
-Upstream status: https://github.com/falcosecurity/libs/pull/1842
-
-diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
-index 80229cc03..70c9ba65b 100644
---- a/driver/CMakeLists.txt
-+++ b/driver/CMakeLists.txt
-@@ -152,6 +152,11 @@ set(DRIVER_SOURCES
- ppm_consumer.h
- capture_macro.h
- socketcall_to_syscall.h
-+ syscall_compat_loongarch64.h
-+ syscall_compat_ppc64le.h
-+ syscall_compat_riscv64.h
-+ syscall_compat_s390x.h
-+ syscall_compat_x86_64.h
- syscall_ia32_64_map.c
- )
-
-diff --git a/test/libscap/CMakeLists.txt b/test/libscap/CMakeLists.txt
-index e88603ebd..fa26ba7ee 100644
---- a/test/libscap/CMakeLists.txt
-+++ b/test/libscap/CMakeLists.txt
-@@ -45,6 +45,7 @@ set(LIBSCAP_TESTS_LIBRARIES
- "${GTEST_LIB}"
- "${GTEST_MAIN_LIB}"
- "${CMAKE_THREAD_LIBS_INIT}"
-+ "${PROTOBUF_LIB}"
- scap
- )
-
-diff --git a/userspace/libscap/engine/gvisor/CMakeLists.txt b/userspace/libscap/engine/gvisor/CMakeLists.txt
-index 6dfbafb14..875847b5d 100644
---- a/userspace/libscap/engine/gvisor/CMakeLists.txt
-+++ b/userspace/libscap/engine/gvisor/CMakeLists.txt
-@@ -76,6 +76,14 @@ if (BUILD_SHARED_LIBS)
- add_dependencies(scap_engine_gvisor_o uthash)
- add_dependencies(scap scap_engine_gvisor_o)
- target_sources(scap PRIVATE $<TARGET_OBJECTS:scap_engine_gvisor_o>)
-+
-+ target_include_directories(scap_engine_gvisor_o
-+ PRIVATE
-+ ${CMAKE_BINARY_DIR}
-+ ${CMAKE_CURRENT_BINARY_DIR}
-+ ${CMAKE_SOURCE_DIR}
-+ ${CMAKE_SOURCE_DIR}/userspace
-+ )
- else()
- add_library(scap_engine_gvisor
- ${scap_engine_gvisor_sources}
--
2.47.1
sharlatanus <at> gmail.com, guix-patches <at> gnu.org:bug#75777; Package guix-patches.
(Thu, 23 Jan 2025 07:34:02 GMT) Full text and rfc822 format available.Message #11 received at 75777 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: 75777 <at> debbugs.gnu.org Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Subject: [PATCH 2/2] gnu: sysdig: Update to 0.40.0-alpha2. Date: Thu, 23 Jan 2025 16:33:19 +0900
(Also add the missing 2024 copyright year).
* gnu/packages/admin.scm (sysdig): Update to 0.40.0-alpha2.
* gnu/packages/patches/sysdig-shared-falcosecurity-libs.patch: Rebase patch.
* gnu/packages/patches/sysdig-falcosecurity-libs-0.20.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
Change-Id: I2fc91baf52aebf283615a8989e841687c6033602
---
gnu/local.mk | 1 +
gnu/packages/admin.scm | 77 +++++++++----------
.../sysdig-falcosecurity-libs-0.20.patch | 54 +++++++++++++
.../sysdig-shared-falcosecurity-libs.patch | 34 ++++----
4 files changed, 106 insertions(+), 60 deletions(-)
create mode 100644 gnu/packages/patches/sysdig-falcosecurity-libs-0.20.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index de2e42cd79..f93b61a346 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2238,6 +2238,7 @@ dist_patch_DATA = \
%D%/packages/patches/slim-display.patch \
%D%/packages/patches/slurm-23-salloc-fallback-shell.patch \
%D%/packages/patches/stex-copy-from-immutable-store.patch \
+ %D%/packages/patches/sysdig-falcosecurity-libs-0.20.patch \
%D%/packages/patches/sysdig-shared-falcosecurity-libs.patch \
%D%/packages/patches/syslinux-gcc10.patch \
%D%/packages/patches/syslinux-strip-gnu-property.patch \
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 89879bf486..a789c5c47b 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -35,7 +35,7 @@
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike <at> rohleder.de>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll <at> gmail.com>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith <at> outlook.com>
-;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2021-2025 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
;;; Copyright © 2021, 2023, 2024 Zheng Junjie <873216071 <at> qq.com>
;;; Copyright © 2021 Stefan Reichör <stefan <at> xsteve.at>
;;; Copyright © 2021 qblade <qblade <at> protonmail.com>
@@ -5990,44 +5990,41 @@ (define-public seatd
(license license:expat)))
(define-public sysdig
- ;; Use the latest commit for now, as the latest 0.36.1 release does not yet
- ;; support the falcosecurity-libs 0.16 API.
- (let ((commit "598ad292b659425e475e5814d9e92c3c29188480")
- (revision "0"))
- (package
- (name "sysdig")
- (version (git-version "0.36.1" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/draios/sysdig")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0yyins3rb286dfibadfwwp2gwmdj7fsz3pdkpdvx05yvdqfkqds7"))
- (patches
- (search-patches "sysdig-shared-falcosecurity-libs.patch"))))
- (build-system cmake-build-system)
- (arguments
- (list #:tests? #f ;no test suite
- #:configure-flags
- #~(list "-DUSE_BUNDLED_DEPS=OFF"
- ;; Already built and part of falcosecurity-libs, but
- ;; needed for the 'HAS_MODERN_BPF' define.
- "-DBUILD_SYSDIG_MODERN_BPF=ON"
- #$(string-append "-DSYSDIG_VERSION=" version))))
- (native-inputs (list pkg-config))
- (inputs
- (list falcosecurity-libs
- luajit
- ncurses
- nlohmann-json
- yaml-cpp
- zlib))
- (home-page "https://github.com/draios/sysdig")
- (synopsis "System exploration and troubleshooting tool")
- (description "Sysdig is a simple tool for deep system visibility, with
+ (package
+ (name "sysdig")
+ (version "0.40.0-alpha2") ;for the 0.20 patch to apply
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/draios/sysdig")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "071xbyp9ykjb6wh9n7c8qw3iq0r8wz58xkf1r8p3x84mn674ibm6"))
+ (patches
+ (search-patches "sysdig-shared-falcosecurity-libs.patch"
+ "sysdig-falcosecurity-libs-0.20.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:tests? #f ;no test suite
+ #:configure-flags
+ #~(list "-DUSE_BUNDLED_DEPS=OFF"
+ ;; Already built and part of falcosecurity-libs, but
+ ;; needed for the 'HAS_MODERN_BPF' define.
+ "-DBUILD_SYSDIG_MODERN_BPF=ON"
+ #$(string-append "-DSYSDIG_VERSION=" version))))
+ (native-inputs (list pkg-config))
+ (inputs
+ (list falcosecurity-libs
+ luajit
+ ncurses
+ nlohmann-json
+ yaml-cpp
+ zlib))
+ (home-page "https://github.com/draios/sysdig")
+ (synopsis "System exploration and troubleshooting tool")
+ (description "Sysdig is a simple tool for deep system visibility, with
native support for containers. It combines features of multiple system
administration tools such as the @command{strace}, @command{tcpdump},
@command{htop}, @command{iftop} and @command{lsof} into a single interface.
@@ -6045,7 +6042,7 @@ (define-public sysdig
alias sysdig=sudo sysdig --modern-bpf
alias cysdig=sudo csysdig --modern-bpf
") ;XXX no @example Texinfo support
- (license license:asl2.0))))
+ (license license:asl2.0)))
(define-public fail2ban
(package
diff --git a/gnu/packages/patches/sysdig-falcosecurity-libs-0.20.patch b/gnu/packages/patches/sysdig-falcosecurity-libs-0.20.patch
new file mode 100644
index 0000000000..cba7b4afe1
--- /dev/null
+++ b/gnu/packages/patches/sysdig-falcosecurity-libs-0.20.patch
@@ -0,0 +1,54 @@
+Upstream-status: Merged but not yet released.
+
+diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake
+index 64d387477..c4db6037a 100644
+--- a/cmake/modules/falcosecurity-libs.cmake
++++ b/cmake/modules/falcosecurity-libs.cmake
+@@ -22,7 +22,7 @@ option(USE_BUNDLED_FALCOSECURITY_LIBS
+
+ if(NOT USE_BUNDLED_FALCOSECURITY_LIBS)
+ find_package(PkgConfig REQUIRED)
+- pkg_check_modules(LIBSINSP REQUIRED IMPORTED_TARGET libsinsp)
++ pkg_check_modules(LIBSINSP REQUIRED IMPORTED_TARGET libsinsp>=0.20.0)
+ message(STATUS "Found libsinsp:
+ include: ${LIBSINSP_INCLUDE_DIRS}
+ lib: ${LIBSINSP_LIBRARIES}
+@@ -47,8 +47,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 04fcb60be..53c02e3f5 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.m_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_gid);
+ lua_settable(ls, -3);
+ lua_pushliteral(ls, "nchilds");
+ lua_pushnumber(ls, (uint32_t)tinfo.get_num_not_leader_threads());
+@@ -872,8 +872,9 @@ int lua_cbacks::get_thread_table_int(lua_State *ls, bool include_fds, bool bareb
+ //
+ // Extract the user name
+ //
++ auto user = tinfo.get_user();
+ lua_pushliteral(ls, "username");
+- lua_pushstring(ls, tinfo.m_user.name().c_str());
++ lua_pushstring(ls, user->name);
+ lua_settable(ls, -3);
+
+ //
diff --git a/gnu/packages/patches/sysdig-shared-falcosecurity-libs.patch b/gnu/packages/patches/sysdig-shared-falcosecurity-libs.patch
index 5d0fd4d1fb..1fa331ad0d 100644
--- a/gnu/packages/patches/sysdig-shared-falcosecurity-libs.patch
+++ b/gnu/packages/patches/sysdig-shared-falcosecurity-libs.patch
@@ -1,14 +1,16 @@
Upstream status: https://github.com/draios/sysdig/pull/2093
diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake
-index 7cee8a3c4..dd59c1b32 100644
+index 61782da69..14b13ce24 100644
--- a/cmake/modules/falcosecurity-libs.cmake
+++ b/cmake/modules/falcosecurity-libs.cmake
-@@ -16,6 +16,19 @@
+@@ -16,6 +16,21 @@
# limitations under the License.
#
-+option(USE_BUNDLED_FALCOSECURITY_LIBS "Enable building of the bundled falcosecurity libraries" ${USE_BUNDLED_DEPS})
++option(USE_BUNDLED_FALCOSECURITY_LIBS
++ "Enable building of the bundled falcosecurity libraries"
++ ${USE_BUNDLED_DEPS})
+
+if(NOT USE_BUNDLED_FALCOSECURITY_LIBS)
+ find_package(PkgConfig REQUIRED)
@@ -25,18 +27,10 @@ index 7cee8a3c4..dd59c1b32 100644
set(FALCOSECURITY_LIBS_CMAKE_WORKING_DIR "${CMAKE_BINARY_DIR}/falcosecurity-libs-repo")
diff --git a/userspace/sysdig/CMakeLists.txt b/userspace/sysdig/CMakeLists.txt
-index 60f8072ad..0cb179ccc 100644
+index c1602d543..cd2e08f4c 100644
--- a/userspace/sysdig/CMakeLists.txt
+++ b/userspace/sysdig/CMakeLists.txt
-@@ -20,7 +20,6 @@ if(NOT WIN32)
- include(ncurses)
- endif() # NOT WIN32
-
--include(zlib)
- include(luajit)
-
- include_directories("${PROJECT_BINARY_DIR}/userspace/sinspui")
-@@ -84,6 +83,12 @@ if(USE_BUNDLED_DEPS)
+@@ -84,6 +84,12 @@ if(USE_BUNDLED_DEPS)
add_dependencies(csysdig luajit)
endif()
@@ -49,16 +43,16 @@ index 60f8072ad..0cb179ccc 100644
target_include_directories(
sysdig
PUBLIC
-@@ -108,7 +113,7 @@ if(NOT WIN32)
+@@ -106,7 +112,7 @@ if(NOT WIN32)
include_directories(${PROJECT_BINARY_DIR}/driver/src)
target_link_libraries(sysdig
- sinsp
+ "${SINSP_LIB}"
"${LUAJIT_LIB}"
- "${YAMLCPP_LIB}")
+ yaml-cpp)
-@@ -117,7 +122,7 @@ if(NOT WIN32)
+@@ -115,7 +121,7 @@ if(NOT WIN32)
endif()
target_link_libraries(csysdig
@@ -66,19 +60,19 @@ index 60f8072ad..0cb179ccc 100644
+ "${SINSP_LIB}"
"${LUAJIT_LIB}"
"${CURSES_LIBRARIES}"
- "${YAMLCPP_LIB}")
-@@ -140,12 +145,12 @@ else()
+ yaml-cpp)
+@@ -138,12 +144,12 @@ else()
add_definitions(-DNOCURSESUI)
target_link_libraries(sysdig
- sinsp
+ "${SINSP_LIB}"
"${LUAJIT_LIB}"
- "${YAMLCPP_LIB}")
+ yaml-cpp)
target_link_libraries(csysdig
- sinsp
+ "${SINSP_LIB}"
"${LUAJIT_LIB}"
- "${YAMLCPP_LIB}")
+ yaml-cpp)
--
2.47.1
Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
to control <at> debbugs.gnu.org.
(Thu, 13 Feb 2025 02:21:04 GMT) Full text and rfc822 format available.Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Thu, 13 Mar 2025 11:24:26 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.