From a551e366fcc0ef4d80dfded6865bd0979dc911ca Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 3 May 2019 16:41:48 +0200 Subject: [PATCH] sysdig: update to 0.25. --- srcpkgs/sysdig/patches/c-ares.patch | 11 +++++++++++ srcpkgs/sysdig/patches/grpc.patch | 11 +++++++++++ srcpkgs/sysdig/template | 12 +++++++----- 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/sysdig/patches/c-ares.patch create mode 100644 srcpkgs/sysdig/patches/grpc.patch diff --git a/srcpkgs/sysdig/patches/c-ares.patch b/srcpkgs/sysdig/patches/c-ares.patch new file mode 100644 index 00000000000..50c37c27786 --- /dev/null +++ b/srcpkgs/sysdig/patches/c-ares.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt 2019-03-27 18:30:07.000000000 +0100 ++++ CMakeLists.txt 2019-05-03 15:31:41.838936214 +0200 +@@ -422,7 +422,7 @@ + if(NOT WIN32 AND NOT APPLE) + option(USE_BUNDLED_CARES "Enable building of the bundled c-ares" ${USE_BUNDLED_DEPS}) + if(NOT USE_BUNDLED_CARES) +- find_path(CARES_INCLUDE NAMES cares/ares.h) ++ find_path(CARES_INCLUDE NAMES ares.h) + find_library(CARES_LIB NAMES libcares.a) + if(CARES_INCLUDE AND CARES_LIB) + message(STATUS "Found c-ares: include: ${CARES_INCLUDE}, lib: ${CARES_LIB}") diff --git a/srcpkgs/sysdig/patches/grpc.patch b/srcpkgs/sysdig/patches/grpc.patch new file mode 100644 index 00000000000..c8075b03c6e --- /dev/null +++ b/srcpkgs/sysdig/patches/grpc.patch @@ -0,0 +1,11 @@ +--- userspace/libsinsp/CMakeLists.txt.orig ++++ userspace/libsinsp/CMakeLists.txt +@@ -162,7 +162,7 @@ + COMMENT "Generate CRI grpc code" + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto + COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --cpp_out=. ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto +- COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --grpc_out=. --plugin=protoc-gen-grpc=${GRPC_SRC}/bins/opt/grpc_cpp_plugin ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto ++ COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --grpc_out=. --plugin=protoc-gen-grpc=/usr/bin/grpc_cpp_plugin ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + + add_dependencies(sinsp grpc) diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index 2b008325bc4..fae9b3a99b5 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -1,14 +1,15 @@ # Template file for 'sysdig' pkgname=sysdig -version=0.24.2 +version=0.25 revision=1 archs="i686 x86_64 ppc64le" build_style=cmake configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF" -hostmakedepends="wget" -makedepends="LuaJIT-devel elfutils-devel jsoncpp-devel libcurl-devel - libressl-devel ncurses-devel tbb-devel zlib-devel" +hostmakedepends="wget pkg-config protobuf" +makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel + libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel + tbb-devel zlib-devel" depends="dkms" short_desc="Open source system-level exploration and troubleshooting tool" maintainer="Leah Neukirchen " @@ -16,7 +17,7 @@ license="Apache-2.0, MIT, GPL-2.0-only" homepage="http://www.sysdig.org/" changelog="https://github.com/draios/sysdig/releases" distfiles="https://github.com/draios/${pkgname}/archive/${version}.tar.gz" -checksum=cd925afd2fb0a26728611666e017d480afd49158c2d70714c7461a97c8820807 +checksum=038e274b624e2d4d21b4535a672e205e40a1a08b203a9e8d967f10a49b6d14a9 disable_parallel_build=yes dkms_modules="sysdig ${version}" nocross=yes @@ -29,4 +30,5 @@ post_extract() { post_install() { rm -rf ${DESTDIR}/usr/share/zsh/vendor-completions vlicense COPYING + vlicense NOTICES }