gentoo resync : 19.03.2019

4 files changed, 42 insertions, 98 deletions

diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index b9e31029cab3..f3a9142be8fd 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,5 +1,4 @@
-DIST sysdig-0.24.1.tar.gz 846153 BLAKE2B bc64317e02526d9729c9fb3738f2982f4b425cdb43c64f77944938186cde4ed2d8d2649984efe0055bbaed250b08bda4008272805024e1d8993e17bc93509663 SHA512 a89ce82527b47104161668e134387a04f4a6753adcd881df25410b629603b58fc8f675de6941f4911ad2da42ffbfd46b38f9cc9837c0809c559fee9a739a204a
+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.1.ebuild 1933 BLAKE2B 6dcb3dbf1649629690b257ccb9ead1f44eca5783de68d58e133b0a514d1f052d9e1b2af06f6c5323e87b61a31e2aebe87137116cf66e8522bda39376e28c7342 SHA512 dfc4ddeea7c3f4984a878da9f0a039ca2084232083c94526d9d6be7223acee7a846f39690057a5b31b1c88524d5229cbdbe91ba302fb2ec5b9bc66efa54a6a4e
-EBUILD sysdig-0.24.2.ebuild 1933 BLAKE2B 6dcb3dbf1649629690b257ccb9ead1f44eca5783de68d58e133b0a514d1f052d9e1b2af06f6c5323e87b61a31e2aebe87137116cf66e8522bda39376e28c7342 SHA512 dfc4ddeea7c3f4984a878da9f0a039ca2084232083c94526d9d6be7223acee7a846f39690057a5b31b1c88524d5229cbdbe91ba302fb2ec5b9bc66efa54a6a4e
+EBUILD sysdig-0.24.2.ebuild 2070 BLAKE2B 2dbed3d36ddad0c6ba3646440cc2614f458a71aa7893e9495c632796a9173c0fbe82844def70689aece395d2f3826ae9da277c73328d29458cb19e1486a15885 SHA512 0972247a9975339c162c7fde71f4e0ff7811be67665f6e8fb89658327aec179c89564fd223e493a1e3b936cd070e9dfff6cf3d543633b3ab5b805ffb1a60a204
 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
new file mode 100644
index 000000000000..711eb182751e
--- /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.1.ebuild b/dev-util/sysdig/sysdig-0.24.1.ebuild
deleted file mode 100644
index 3ba452c42e38..000000000000
--- a/dev-util/sysdig/sysdig-0.24.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-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=
-	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:${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.24.2.ebuild b/dev-util/sysdig/sysdig-0.24.2.ebuild
index 3ba452c42e38..abc1676d9a6a 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
 }