gentoo resync : 02.06.2019

4 files changed, 63 insertions, 47 deletions

diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index f3a9142be8fd..04faedf739c7 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,4 +1,4 @@
-AUX sysdig-0.24.2-kernel-5.0.0.patch 1181 BLAKE2B 4d58160740ef2751947148850253add6962049ca7e9036854f9f1800addb9d81a05c815f93a294a418568edf55200aa0f782633cdee4bf9e161b5278e31360c2 SHA512 ff0c365de5213c68ea4cae153d949f97e7abe72c632d5142f06d46b159305076396637723e09b7ce361c7778a60b2c583b02ed8f45fa39c4b5a1989c4b0e3b8e
-DIST sysdig-0.24.2.tar.gz 855317 BLAKE2B d394ac3bd7e405664da2b45d8cfd5d3433e20266a9489f63b7d4c3bb955a60640d13bb33e6dd2057b16b6ce0617afab88cad2ceab58aa50f6b43a64f6a50f45b SHA512 10ec381144733abc2c386f6570d4245ac2c1eec64d0f56800963acbd9cc38eece504f836f1ab0e24224ff44233945c8273b72efc77d7eadce98d7c4fc378740b
-EBUILD sysdig-0.24.2.ebuild 2070 BLAKE2B 2dbed3d36ddad0c6ba3646440cc2614f458a71aa7893e9495c632796a9173c0fbe82844def70689aece395d2f3826ae9da277c73328d29458cb19e1486a15885 SHA512 0972247a9975339c162c7fde71f4e0ff7811be67665f6e8fb89658327aec179c89564fd223e493a1e3b936cd070e9dfff6cf3d543633b3ab5b805ffb1a60a204
+AUX sysdig-0.26.0-build-fixes.patch 1545 BLAKE2B f182cf721180ee624deeefafff54a48fc4e5024cff00e26f178960d9f7a3d7e8a481dee028fe1dac789f77ec8ba772cc5da82c4d0ebc388f1aa711824d42a2d1 SHA512 2d34ab81da7d3a07e9c7116dc1d25e6db93b5faf2be2a4fe1710efba43293892255591284bc1d2c39953c4cf73ebcacb73b5626cc2d649a0505e351165c9b8d7
+DIST sysdig-0.26.1.tar.gz 892441 BLAKE2B 38302458c54a10719fadaf5e5bb6d29931a262550eaf44350543e99cd33e6a90889d81f49096d2f57fcc903bc9245a1f782b438a48613f9fc9f90273c46f0f39 SHA512 817573dd2945e20094c548a481205d7ae700e8242a12c75bcab41c52330fb6f508214d71f3d3ba4ecc86576e555c8c2a0c155921d61d29a5861bbf982600f6fb
+EBUILD sysdig-0.26.1.ebuild 1998 BLAKE2B 52ae3ad4e180a6640c613d6d5adba3e11d0485e7ee235f79eeadd19291e1291927fb6666c66555b0239d9015de9c56dcbca5f9a922a37422d155dd88e48f5097 SHA512 e6299a6be79367693680df3f2a5bc2555731ffad9dba8c333a1a4553120705a62be74127f0163c41343bf8b63d74c73d6b895a173812c57df394b64f1941368a
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
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
deleted file mode 100644
index 711eb182751e..000000000000
--- a/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/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 000000000000..8e0dfd606a16
--- /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.24.2.ebuild b/dev-util/sysdig/sysdig-0.26.1.ebuild
index abc1676d9a6a..a6c3bad4d48f 100644
--- a/dev-util/sysdig/sysdig-0.24.2.ebuild
+++ b/dev-util/sysdig/sysdig-0.26.1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 MODULES_OPTIONAL_USE=modules
 inherit linux-mod bash-completion-r1 cmake-utils
 
@@ -23,6 +22,9 @@ RDEPEND="
 	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= )
@@ -46,11 +48,7 @@ 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
-	)
+	eapply "${FILESDIR}"/sysdig-0.26.0-build-fixes.patch
 	cmake-utils_src_prepare
 }
 
@@ -91,9 +89,9 @@ src_install() {
 	linux-mod_src_install
 
 	# remove sources
-	rm -r "${ED%/}"/usr/src || die
+	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
+	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED}"/usr/etc || die
 }