* [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/files/, dev-util/sysdig/
@ 2017-09-11 20:16 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2017-09-11 20:16 UTC (permalink / raw
To: gentoo-commits
commit: b22e8f9a974f682f9b35d5a54ed21fc30f8e94e6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 20:13:37 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 20:16:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22e8f9a
dev-util/sysdig: Backport net-misc/curl-7.55.0+ build fix
Closes: https://bugs.gentoo.org/627572
.../sysdig/files/sysdig-0.17.0-curlbuild.h.patch | 53 ++++++++++++++++++++++
...ysdig-0.17.0.ebuild => sysdig-0.17.0-r1.ebuild} | 8 +++-
2 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch b/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch
new file mode 100644
index 00000000000..465be572b1f
--- /dev/null
+++ b/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch
@@ -0,0 +1,53 @@
+From d15be88ccb1b7df9a0b6db2967131521b526918b Mon Sep 17 00:00:00 2001
+From: Mark Stemm <mark.stemm@gmail.com>
+Date: Tue, 15 Aug 2017 17:49:53 -0700
+Subject: [PATCH] Don't include curlbuild.h
+
+It's not required to build and it's not present with some newer versions
+of libcurl, so removing it.
+
+Thanks to https://github.com/hhoffstaette for the tip.
+
+This fixes https://github.com/draios/sysdig/issues/895.
+---
+ userspace/libsinsp/marathon_http.cpp | 1 -
+ userspace/libsinsp/mesos_http.cpp | 1 -
+ userspace/sysdig.project | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/userspace/libsinsp/marathon_http.cpp b/userspace/libsinsp/marathon_http.cpp
+index f7937b681..2e4449ad9 100644
+--- a/userspace/libsinsp/marathon_http.cpp
++++ b/userspace/libsinsp/marathon_http.cpp
+@@ -7,7 +7,6 @@
+ #include "marathon_http.h"
+ #include "curl/curl.h"
+ #include "curl/easy.h"
+-#include "curl/curlbuild.h"
+ #define BUFFERSIZE 512 // b64 needs this macro
+ #include "b64/encode.h"
+ #include "sinsp.h"
+diff --git a/userspace/libsinsp/mesos_http.cpp b/userspace/libsinsp/mesos_http.cpp
+index 18ac9f5b5..c6bfb5810 100644
+--- a/userspace/libsinsp/mesos_http.cpp
++++ b/userspace/libsinsp/mesos_http.cpp
+@@ -7,7 +7,6 @@
+ #include "mesos_http.h"
+ #include "curl/curl.h"
+ #include "curl/easy.h"
+-#include "curl/curlbuild.h"
+ #include "sinsp.h"
+ #include "sinsp_int.h"
+ #include "sinsp_curl.h"
+diff --git a/userspace/sysdig.project b/userspace/sysdig.project
+index 5d00f18f2..76a18f0a8 100644
+--- a/userspace/sysdig.project
++++ b/userspace/sysdig.project
+@@ -752,7 +752,6 @@
+ </VirtualDirectory>
+ <VirtualDirectory Name="include">
+ <VirtualDirectory Name="curl">
+- <File Name="../build/release/curl-prefix/src/curl/include/curl/curlbuild.h"/>
+ <File Name="../build/release/curl-prefix/src/curl/include/curl/easy.h"/>
+ <File Name="../build/release/curl-prefix/src/curl/include/curl/stdcheaders.h"/>
+ <File Name="../build/release/curl-prefix/src/curl/include/curl/curlrules.h"/>
diff --git a/dev-util/sysdig/sysdig-0.17.0.ebuild b/dev-util/sysdig/sysdig-0.17.0-r1.ebuild
similarity index 91%
rename from dev-util/sysdig/sysdig-0.17.0.ebuild
rename to dev-util/sysdig/sysdig-0.17.0-r1.ebuild
index c636a7eb86d..d886e9c22e5 100644
--- a/dev-util/sysdig/sysdig-0.17.0.ebuild
+++ b/dev-util/sysdig/sysdig-0.17.0-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
sys-libs/ncurses:0=
sys-libs/zlib:0=
dev-libs/openssl:0=
- <net-misc/curl-7.55:0="
+ net-misc/curl:0="
DEPEND="${RDEPEND}
app-arch/xz-utils
virtual/os-headers"
@@ -41,6 +41,12 @@ pkg_setup() {
}
src_prepare() {
+ local PATCHES=(
+ # fix building against curl-7.55.0+
+ # https://bugs.gentoo.org/627572
+ "${FILESDIR}"/sysdig-0.17.0-curlbuild.h.patch
+ )
+
sed -i -e 's:-ggdb::' CMakeLists.txt || die
cmake-utils_src_prepare
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/files/, dev-util/sysdig/
@ 2019-03-11 21:44 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-03-11 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 92f620de9364d333a3a8dcd6f529ac3861c673c7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 21:34:41 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 21:44:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f620de
dev-util/sysdig: Backport fix for building with 5.0.0 kernel
Closes: https://bugs.gentoo.org/680084
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch | 34 ++++++++++++++++++++++
dev-util/sysdig/sysdig-0.24.2.ebuild | 7 ++++-
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch b/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch
new file mode 100644
index 00000000000..711eb182751
--- /dev/null
+++ b/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch
@@ -0,0 +1,34 @@
+From 2c8f0263382bf64800faec5fba5cc3e005d9fb1e Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Thu, 31 Jan 2019 10:54:00 +0000
+Subject: [PATCH] Update for change to access_ok in Linux 5.0
+
+Linux 5.0 removed the 1st argument 'type' from the access_ok macro.
+Update the ppm_access_ok() macro to cater for this change for Linux
+5.0
+
+Bug: https://github.com/draios/sysdig/issues/1299
+sysdig-CLA-1.0-signed-off-by: Colin Ian King <colin.king@canonical.com>
+
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+---
+ driver/ppm_events.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/driver/ppm_events.c b/driver/ppm_events.c
+index 717590888..cc3eb98d2 100644
+--- a/driver/ppm_events.c
++++ b/driver/ppm_events.c
+@@ -46,7 +46,11 @@ or GPL2.txt for full copies of the license.
+ #ifdef access_ok_noprefault
+ #define ppm_access_ok access_ok_noprefault
+ #else
+-#define ppm_access_ok access_ok
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
++#define ppm_access_ok(type, addr, size) access_ok(type, addr, size)
++#else
++#define ppm_access_ok(type, addr, size) access_ok(addr, size)
++#endif
+ #endif
+
+ extern bool g_tracers_enabled;
diff --git a/dev-util/sysdig/sysdig-0.24.2.ebuild b/dev-util/sysdig/sysdig-0.24.2.ebuild
index 3ba452c42e3..abc1676d9a6 100644
--- a/dev-util/sysdig/sysdig-0.24.2.ebuild
+++ b/dev-util/sysdig/sysdig-0.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -46,6 +46,11 @@ pkg_setup() {
src_prepare() {
sed -i -e 's:-ggdb::' CMakeLists.txt || die
+ local PATCHES=(
+ # compatibility with kernel 5.0.0
+ # https://bugs.gentoo.org/680084
+ "${FILESDIR}"/sysdig-0.24.2-kernel-5.0.0.patch
+ )
cmake-utils_src_prepare
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/files/, dev-util/sysdig/
@ 2019-05-23 7:13 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-05-23 7:13 UTC (permalink / raw
To: gentoo-commits
commit: c9dace943fcd67bc9ca9ed5a2320cf6148540fb3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 06:12:29 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 23 07:13:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9dace94
dev-util/sysdig: Bump to 0.26.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/sysdig/Manifest | 1 +
.../sysdig/files/sysdig-0.26.0-build-fixes.patch | 52 ++++++++++++
dev-util/sysdig/sysdig-0.26.0.ebuild | 97 ++++++++++++++++++++++
3 files changed, 150 insertions(+)
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 5aa2f3d474b..ea74ad0f5c3 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1 +1,2 @@
DIST sysdig-0.24.2.tar.gz 855317 BLAKE2B d394ac3bd7e405664da2b45d8cfd5d3433e20266a9489f63b7d4c3bb955a60640d13bb33e6dd2057b16b6ce0617afab88cad2ceab58aa50f6b43a64f6a50f45b SHA512 10ec381144733abc2c386f6570d4245ac2c1eec64d0f56800963acbd9cc38eece504f836f1ab0e24224ff44233945c8273b72efc77d7eadce98d7c4fc378740b
+DIST sysdig-0.26.0.tar.gz 892090 BLAKE2B ea80eacfedeca0348c86611d960c8e65eb31c4dfb2386813973d37a92cb186fd0b8b2597305c0617e59c7254b8507ed32c6f1fed37e920929e45a72fffb32cb7 SHA512 8f6ebcd0a0d14586b204b3fa90e27581082390b57d0547e531db258be341fd5e1b77c45c02018267836c867e291d842fcbd05bbe994d3e32a678a2926426e2b6
diff --git a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch
new file mode 100644
index 00000000000..8e0dfd606a1
--- /dev/null
+++ b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch
@@ -0,0 +1,52 @@
+diff --git a/userspace/libscap/scap_fds.c b/userspace/libscap/scap_fds.c
+index 452353a6..6eb7cd16 100644
+--- a/userspace/libscap/scap_fds.c
++++ b/userspace/libscap/scap_fds.c
+@@ -49,6 +49,7 @@ limitations under the License.
+ #include <errno.h>
+ #include <netinet/tcp.h>
+ #if defined(__linux__)
++#include <sys/sysmacros.h>
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
+ //#include <linux/sock_diag.h>
+diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
+index bc851319..ec454de7 100644
+--- a/userspace/libsinsp/CMakeLists.txt
++++ b/userspace/libsinsp/CMakeLists.txt
+@@ -145,7 +145,9 @@ add_library(sinsp STATIC ${SINSP_SOURCES})
+
+ target_link_libraries(sinsp
+ scap
+- "${JSONCPP_LIB}")
++ "${CURL_LIBRARIES}"
++ "${JSONCPP_LIB}"
++ "${TBB_LIB}")
+
+ if(USE_BUNDLED_LUAJIT)
+ add_dependencies(sinsp luajit)
+@@ -157,13 +159,12 @@ if(NOT WIN32)
+ endif()
+ if(USE_BUNDLED_CURL)
+ add_dependencies(sinsp curl)
+- target_link_libraries(sinsp
+- "${CURL_LIBRARIES}")
+ endif()
+ if(USE_BUNDLED_TBB)
+ add_dependencies(sinsp tbb)
+- target_link_libraries(sinsp
+- "${TBB_LIB}")
++ endif()
++ if(USE_BUNDLED_GRPC)
++ add_dependencies(sinsp grpc)
+ endif()
+
+ if(NOT APPLE)
+@@ -177,7 +178,6 @@ if(NOT WIN32)
+ COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --grpc_out=. --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+- add_dependencies(sinsp grpc)
+ target_link_libraries(sinsp
+ "${GRPCPP_LIB}"
+ "${GRPC_LIB}"
diff --git a/dev-util/sysdig/sysdig-0.26.0.ebuild b/dev-util/sysdig/sysdig-0.26.0.ebuild
new file mode 100644
index 00000000000..a6c3bad4d48
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.26.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE=modules
+inherit linux-mod bash-completion-r1 cmake-utils
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://www.sysdig.org/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0
+ modules? ( || ( MIT GPL-2 ) )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +modules"
+
+RDEPEND="
+ app-misc/jq:0=
+ dev-cpp/tbb:0=
+ dev-lang/luajit:2=
+ >=dev-libs/jsoncpp-0.6_pre:0=
+ dev-libs/libb64:0=
+ dev-libs/protobuf:0=
+ net-dns/c-ares:0=
+ net-libs/grpc:0=
+ sys-libs/ncurses:0=
+ sys-libs/zlib:0=
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ net-misc/curl:0="
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/os-headers"
+
+# needed for the kernel module
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+pkg_pretend() {
+ linux-mod_pkg_setup
+}
+
+pkg_setup() {
+ linux-mod_pkg_setup
+}
+
+src_prepare() {
+ sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+ eapply "${FILESDIR}"/sysdig-0.26.0-build-fixes.patch
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ # we will use linux-mod for that
+ -DBUILD_DRIVER=OFF
+ # libscap examples are not installed or really useful
+ -DBUILD_LIBSCAP_EXAMPLES=OFF
+
+ # unbundle the deps
+ -DUSE_BUNDLED_DEPS=OFF
+ )
+
+ cmake-utils_src_configure
+
+ # setup linux-mod ugliness
+ MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
+ BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+ BUILD_TARGETS="all"
+
+ if use modules; then
+ cmake-utils_src_make configure_driver
+
+ cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ linux-mod_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ linux-mod_src_install
+
+ # remove sources
+ rm -r "${ED}"/usr/src || die
+
+ # move bashcomp to the proper location
+ dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+ rm -r "${ED}"/usr/etc || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/files/, dev-util/sysdig/
@ 2019-08-22 6:49 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-08-22 6:49 UTC (permalink / raw
To: gentoo-commits
commit: 53b7db9a742f6f917d3a65994fbdefd22cd89760
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 06:11:56 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 06:49:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b7db9a
dev-util/sysdig: Drop old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-util/sysdig/Manifest | 2 -
.../sysdig/files/sysdig-0.26.0-build-fixes.patch | 52 ------------
dev-util/sysdig/sysdig-0.26.1.ebuild | 97 ----------------------
dev-util/sysdig/sysdig-0.26.2.ebuild | 88 --------------------
4 files changed, 239 deletions(-)
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index c9294446013..1bc4bb1ee5e 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,4 +1,2 @@
-DIST sysdig-0.26.1.tar.gz 892441 BLAKE2B 38302458c54a10719fadaf5e5bb6d29931a262550eaf44350543e99cd33e6a90889d81f49096d2f57fcc903bc9245a1f782b438a48613f9fc9f90273c46f0f39 SHA512 817573dd2945e20094c548a481205d7ae700e8242a12c75bcab41c52330fb6f508214d71f3d3ba4ecc86576e555c8c2a0c155921d61d29a5861bbf982600f6fb
-DIST sysdig-0.26.2.tar.gz 907496 BLAKE2B ce489d7c1a54aa2930599aa7141b1a3d4815c0395b4a444dea565334a1b39a36d339eb2bc9d0c2b3924e8c54f9c3adec6b31278017cfee955fe9ed9d3c29977f SHA512 1a2476060f43559ec89663377361d1fcaace7fe3aa3b472629dca78557e6d5868d8f5cfce3411c46804b501d6a56dcb074f6becf3d8e756b7f7fd943087cd3ae
DIST sysdig-0.26.3.tar.gz 902206 BLAKE2B ec25d0441c69b8c4c4fc431d073d2f93e476ece7add98412e54ce4286bcd7e32d4b1ff89f75dd728dc66c7d77da157bed2182bad85557c0dcec09648f86abb3d SHA512 f700d1ddae687a3474a8bf6816d2fef6c69e963a269a90a8362287dee698ac9799da18f01f383368c906d294ceb046160a8b0792292a72a3b08fc614b5b69d32
DIST sysdig-0.26.4.tar.gz 902181 BLAKE2B a7ac38be2f7a3d7e4f4fdec6a2fbf5305a8224ee27352da70f509139ebefd14616f84c7b8860f50d2546819a94deb1117034bceddd22128fcf25386b835274f2 SHA512 f56f5d0a522b861df4803bfdafcaf8db3fc9c0e751d06c321082757f6828a210cb86bab4550a3b35bf6412f930e44ab0f5cf709a30651c57dd7064a68e273a88
diff --git a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch
deleted file mode 100644
index 8e0dfd606a1..00000000000
--- a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/userspace/libscap/scap_fds.c b/userspace/libscap/scap_fds.c
-index 452353a6..6eb7cd16 100644
---- a/userspace/libscap/scap_fds.c
-+++ b/userspace/libscap/scap_fds.c
-@@ -49,6 +49,7 @@ limitations under the License.
- #include <errno.h>
- #include <netinet/tcp.h>
- #if defined(__linux__)
-+#include <sys/sysmacros.h>
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
- //#include <linux/sock_diag.h>
-diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
-index bc851319..ec454de7 100644
---- a/userspace/libsinsp/CMakeLists.txt
-+++ b/userspace/libsinsp/CMakeLists.txt
-@@ -145,7 +145,9 @@ add_library(sinsp STATIC ${SINSP_SOURCES})
-
- target_link_libraries(sinsp
- scap
-- "${JSONCPP_LIB}")
-+ "${CURL_LIBRARIES}"
-+ "${JSONCPP_LIB}"
-+ "${TBB_LIB}")
-
- if(USE_BUNDLED_LUAJIT)
- add_dependencies(sinsp luajit)
-@@ -157,13 +159,12 @@ if(NOT WIN32)
- endif()
- if(USE_BUNDLED_CURL)
- add_dependencies(sinsp curl)
-- target_link_libraries(sinsp
-- "${CURL_LIBRARIES}")
- endif()
- if(USE_BUNDLED_TBB)
- add_dependencies(sinsp tbb)
-- target_link_libraries(sinsp
-- "${TBB_LIB}")
-+ endif()
-+ if(USE_BUNDLED_GRPC)
-+ add_dependencies(sinsp grpc)
- endif()
-
- if(NOT APPLE)
-@@ -177,7 +178,6 @@ if(NOT WIN32)
- COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --grpc_out=. --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-- add_dependencies(sinsp grpc)
- target_link_libraries(sinsp
- "${GRPCPP_LIB}"
- "${GRPC_LIB}"
diff --git a/dev-util/sysdig/sysdig-0.26.1.ebuild b/dev-util/sysdig/sysdig-0.26.1.ebuild
deleted file mode 100644
index a6c3bad4d48..00000000000
--- a/dev-util/sysdig/sysdig-0.26.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0
- modules? ( || ( MIT GPL-2 ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
- app-misc/jq:0=
- dev-cpp/tbb:0=
- dev-lang/luajit:2=
- >=dev-libs/jsoncpp-0.6_pre:0=
- dev-libs/libb64:0=
- dev-libs/protobuf:0=
- net-dns/c-ares:0=
- net-libs/grpc:0=
- sys-libs/ncurses:0=
- sys-libs/zlib:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- net-misc/curl:0="
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
- linux-mod_pkg_setup
-}
-
-pkg_setup() {
- linux-mod_pkg_setup
-}
-
-src_prepare() {
- sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
- eapply "${FILESDIR}"/sysdig-0.26.0-build-fixes.patch
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- # we will use linux-mod for that
- -DBUILD_DRIVER=OFF
- # libscap examples are not installed or really useful
- -DBUILD_LIBSCAP_EXAMPLES=OFF
-
- # unbundle the deps
- -DUSE_BUNDLED_DEPS=OFF
- )
-
- cmake-utils_src_configure
-
- # setup linux-mod ugliness
- MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
- BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
- BUILD_TARGETS="all"
-
- if use modules; then
- cmake-utils_src_make configure_driver
-
- cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- linux-mod_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
-
- linux-mod_src_install
-
- # remove sources
- rm -r "${ED}"/usr/src || die
-
- # move bashcomp to the proper location
- dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
- rm -r "${ED}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.26.2.ebuild b/dev-util/sysdig/sysdig-0.26.2.ebuild
deleted file mode 100644
index 2d4c0de2f51..00000000000
--- a/dev-util/sysdig/sysdig-0.26.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0
- modules? ( || ( MIT GPL-2 ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
- app-misc/jq:0=
- dev-cpp/tbb:0=
- dev-lang/luajit:2=
- >=dev-libs/jsoncpp-0.6_pre:0=
- dev-libs/libb64:0=
- dev-libs/protobuf:0=
- net-dns/c-ares:0=
- net-libs/grpc:0=
- sys-libs/ncurses:0=
- sys-libs/zlib:0=
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- net-misc/curl:0="
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
- linux-mod_pkg_setup
-}
-
-pkg_setup() {
- linux-mod_pkg_setup
-}
-
-src_prepare() {
- sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- # we will use linux-mod for that
- -DBUILD_DRIVER=OFF
- # libscap examples are not installed or really useful
- -DBUILD_LIBSCAP_EXAMPLES=OFF
-
- # unbundle the deps
- -DUSE_BUNDLED_DEPS=OFF
- )
-
- cmake-utils_src_configure
-
- # setup linux-mod ugliness
- MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)"
- BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
- BUILD_TARGETS="all"
-}
-
-src_compile() {
- cmake-utils_src_compile
- linux-mod_src_compile
-}
-
-src_install() {
- cmake-utils_src_install
- linux-mod_src_install
-
- # remove sources
- rm -r "${ED}"/usr/src || die
-
- # move bashcomp to the proper location
- dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
- rm -r "${ED}"/usr/etc || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/files/, dev-util/sysdig/
@ 2021-12-19 21:30 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-12-19 21:30 UTC (permalink / raw
To: gentoo-commits
commit: 8e3a8191d55fcf173291932c4365da7ed2714367
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 19 21:20:19 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 19 21:30:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e3a8191
dev-util/sysdig: fix build with newer grpc
Closes: https://bugs.gentoo.org/817128
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/sysdig-0.27.1-grpc-absl-sync.patch | 25 ++++++++++++++++++++++
dev-util/sysdig/sysdig-0.27.1-r100.ebuild | 4 ++++
2 files changed, 29 insertions(+)
diff --git a/dev-util/sysdig/files/sysdig-0.27.1-grpc-absl-sync.patch b/dev-util/sysdig/files/sysdig-0.27.1-grpc-absl-sync.patch
new file mode 100644
index 000000000000..eaf689a54d0d
--- /dev/null
+++ b/dev-util/sysdig/files/sysdig-0.27.1-grpc-absl-sync.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/817128
+https://github.com/hhoffstaette/portage/blob/master/dev-util/sysdig/files/0.27.1-grpc-absl-sync.patch
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -552,6 +552,7 @@ if(NOT WIN32 AND NOT APPLE)
+ else()
+ message(FATAL_ERROR "Couldn't find system grpc")
+ endif()
++ find_library(ABSL_SYNC_LIB NAMES absl_synchronization)
+ find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
+ if(NOT GRPC_CPP_PLUGIN)
+ message(FATAL_ERROR "System grpc_cpp_plugin not found")
+--- a/userspace/libsinsp/CMakeLists.txt
++++ b/userspace/libsinsp/CMakeLists.txt
+@@ -214,6 +214,10 @@ if(NOT WIN32)
+ "${JQ_LIB}"
+ "${B64_LIB}")
+
++ if(ABSL_SYNC_LIB)
++ target_link_libraries(sinsp "${ABSL_SYNC_LIB}")
++ endif()
++
+ if(NOT MUSL_OPTIMIZED_BUILD)
+ target_link_libraries(sinsp
+ rt
diff --git a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
index f29cac6fe874..ab9bce5d68b9 100644
--- a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
+++ b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
@@ -39,6 +39,10 @@ DEPEND="${RDEPEND}
PDEPEND="
modules? ( >=dev-util/sysdig-kmod-${PV} )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.27.1-grpc-absl-sync.patch
+)
+
src_prepare() {
sed -i -e 's:-ggdb::' CMakeLists.txt || die
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/files/, dev-util/sysdig/
@ 2023-04-29 6:44 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-04-29 6:44 UTC (permalink / raw
To: gentoo-commits
commit: d983f3ebed360ac08d153655777912f354f3dd2f
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Fri Apr 28 14:52:23 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 06:44:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d983f3eb
dev-util/sysdig: fix build with gcc-13
Closes: https://bugs.gentoo.org/905225
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/30792
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/sysdig/files/0.29.3-libs-gcc13.patch | 28 +++++++++
dev-util/sysdig/sysdig-0.29.3-r1.ebuild | 91 +++++++++++++++++++++++++++
2 files changed, 119 insertions(+)
diff --git a/dev-util/sysdig/files/0.29.3-libs-gcc13.patch b/dev-util/sysdig/files/0.29.3-libs-gcc13.patch
new file mode 100644
index 000000000000..ce1a686cc65c
--- /dev/null
+++ b/dev-util/sysdig/files/0.29.3-libs-gcc13.patch
@@ -0,0 +1,28 @@
+
+Manual backport of the upstream fix at:
+https://github.com/falcosecurity/libs/commit/1406858fa5223d980e66e2a5fb2c1b014c9db5c8
+
+diff --git libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/filter_value.h libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/filter_value.h
+index 47f5367..6cc8b83 100644
+--- libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/filter_value.h
++++ libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/filter_value.h
+@@ -17,6 +17,7 @@ limitations under the License.
+
+ #pragma once
+
++#include <cstdint>
+ #include <string.h>
+ #include <utility>
+
+diff --git libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/sinsp.h libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/sinsp.h
+index c15c13c..f9f9f45 100644
+--- libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/sinsp.h
++++ libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/sinsp.h
+@@ -56,6 +56,7 @@ limitations under the License.
+
+ #define __STDC_FORMAT_MACROS
+
++#include <cstdint>
+ #include <string>
+ #include <unordered_map>
+ #include <map>
diff --git a/dev-util/sysdig/sysdig-0.29.3-r1.ebuild b/dev-util/sysdig/sysdig-0.29.3-r1.ebuild
new file mode 100644
index 000000000000..f114a10d5965
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.29.3-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+
+inherit bash-completion-r1 cmake lua-single
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://sysdig.com/"
+
+# For now we need to bump this version of falcosecurity/libs manually;
+# check the used git revision in <src>/cmake/modules/falcosecurity-libs.cmake
+LIBS_COMMIT="e5c53d648f3c4694385bbe488e7d47eaa36c229a"
+
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/falcosecurity/libs/archive/${LIBS_COMMIT}.tar.gz -> falcosecurity-libs-${LIBS_COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+modules"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+ app-misc/jq
+ dev-cpp/tbb:=
+ dev-cpp/yaml-cpp:=
+ dev-libs/libb64:=
+ dev-libs/openssl:=
+ dev-libs/protobuf:=
+ net-dns/c-ares:=
+ net-libs/grpc:=
+ net-misc/curl
+ sys-libs/ncurses:=
+ sys-libs/zlib:="
+
+DEPEND="${RDEPEND}
+ dev-cpp/nlohmann_json
+ dev-cpp/valijson
+ virtual/os-headers"
+
+# for now pin the driver to the same ebuild version
+PDEPEND="modules? ( =dev-util/scap-driver-${PV}* )"
+
+src_prepare() {
+ # manually apply patch to falcosecurity-libs dependency
+ pushd $WORKDIR && eapply -p0 "${FILESDIR}/${PV}-libs-gcc13.patch" && popd
+
+ sed -i -e 's:-ggdb::' CMakeLists.txt || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ # don't build driver
+ -DBUILD_DRIVER=OFF
+
+ # libscap examples are not installed or really useful
+ -DBUILD_LIBSCAP_EXAMPLES=OFF
+
+ # point to the falcosecurity-libs tree
+ -DFALCOSECURITY_LIBS_SOURCE_DIR="${WORKDIR}"/libs-${LIBS_COMMIT}
+
+ # explicitly set version
+ -DSYSDIG_VERSION=${PV}
+
+ # unbundle the deps
+ -DUSE_BUNDLED_DEPS=OFF
+
+ # add valijson include path to prevent downloading
+ -DVALIJSON_INCLUDE="${ESYSROOT}"/usr/include
+
+ # enable chisels
+ -DWITH_CHISEL=ON
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # remove driver headers
+ rm -r "${ED}"/usr/src || die
+
+ # move bashcomp to the proper location
+ dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+ rm -r "${ED}"/usr/etc || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-04-29 6:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-23 7:13 [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/files/, dev-util/sysdig/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-04-29 6:44 Sam James
2021-12-19 21:30 Sam James
2019-08-22 6:49 Michał Górny
2019-03-11 21:44 Michał Górny
2017-09-11 20:16 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox