[packages/sysdig] - up to 0.21.0

[baggins]

commit 632a7d9c615655312f4801ae06f676c60e0e7fbc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jun 18 20:49:07 2018 +0200

    - up to 0.21.0

 kernel-4.17.patch | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sysdig.spec       |   6 ++--
 2 files changed, 108 insertions(+), 2 deletions(-)
---
diff --git a/sysdig.spec b/sysdig.spec
index 8b81609..b96f23a 100644
--- a/sysdig.spec
+++ b/sysdig.spec
@@ -27,14 +27,15 @@ exit 1
 Summary:	sysdig, a system-level exploration and troubleshooting tool
 Summary(pl.UTF-8):	sysdig - narzędzie do przeglądu i rozwiązywania problemów na poziomie systemowym
 Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:	0.20.0
+Version:	0.21.0
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	GPL v2
 Group:		Applications/System
 #Source0Download: https://github.com/draios/sysdig/releases
 Source0:	https://github.com/draios/sysdig/archive/%{version}/%{pname}-%{version}.tar.gz
-# Source0-md5:	0e91d3858a3094be5298370c505ad02d
+# Source0-md5:	e59a49be21e32f2245dbf44aeb53d654
 Patch0:		buildflags.patch
+Patch1:		kernel-4.17.patch
 URL:		http://www.sysdig.org/
 BuildRequires:	rpmbuild(macros) >= 1.701
 BuildRequires:	cmake >= 2.8.2
@@ -161,6 +162,7 @@ Ten pakiet zawiera moduł sysdig-probe for jądra Linuksa.\
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
diff --git a/kernel-4.17.patch b/kernel-4.17.patch
new file mode 100644
index 0000000..fc9a064
--- /dev/null
+++ b/kernel-4.17.patch
@@ -0,0 +1,104 @@
+--- sysdig-0.21.0/driver/ppm_events.c~	2018-03-29 22:00:53.000000000 +0200
++++ sysdig-0.21.0/driver/ppm_events.c	2018-06-18 20:45:33.813297584 +0200
+@@ -234,7 +234,11 @@
+ 	if (sock) {
+ 
+ 		if (sock->sk) {
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
+ 			err = sock->ops->getname(sock, (struct sockaddr *)&sock_address, &sock_address_len, 0);
++#else
++			err = sock->ops->getname(sock, (struct sockaddr *)&sock_address, 0);
++#endif
+ 
+ 			if (err == 0) {
+ 				if(args->event_type == PPME_SOCKET_SENDTO_X)
+@@ -255,7 +259,11 @@
+ 						/*
+ 						 * Suppose is a connected socket, fall back to fd
+ 						 */
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
+ 						err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
++#else
++						err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
++#endif
+ 					} else {
+ 						/*
+ 						 * Get the address len
+@@ -275,7 +283,11 @@
+ 							/*
+ 							 * This case should be very rare, fallback again to sock
+ 							 */
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
+ 							err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
++#else
++							err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
++#endif
+ 						}
+ 					}
+ 				} else if (args->event_type == PPME_SOCKET_SENDMSG_X) {
+@@ -328,9 +340,17 @@
+ 						/*
+ 						 * Suppose it is a connected socket, fall back to fd
+ 						 */
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
+ 						err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
++#else
++						err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
++#endif
+ 				} else
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
+ 					err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
++#else
++					err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
++#endif
+ 
+ 				if (err == 0) {
+ 					family = sock->sk->sk_family;
+@@ -982,7 +1002,11 @@
+ 		return 0;
+ 	}
+ 
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
+ 	err = sock->ops->getname(sock, (struct sockaddr *)&sock_address, &sock_address_len, 0);
++#else
++	err = sock->ops->getname(sock, (struct sockaddr *)&sock_address, 0);
++#endif
+ 	ASSERT(err == 0);
+ 
+ 	family = sock->sk->sk_family;
+@@ -993,7 +1017,11 @@
+ 	switch (family) {
+ 	case AF_INET:
+ 		if (!use_userdata) {
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
+ 			err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
++#else
++			err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
++#endif
+ 			if (err == 0) {
+ 				if (is_inbound) {
+ 					sip = ((struct sockaddr_in *) &peer_address)->sin_addr.s_addr;
+@@ -1045,7 +1073,11 @@
+ 		break;
+ 	case AF_INET6:
+ 		if (!use_userdata) {
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
+ 			err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
++#else
++			err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
++#endif
+ 			ASSERT(err == 0);
+ 
+ 			if (is_inbound) {
+@@ -1120,7 +1152,11 @@
+ 			if (is_inbound) {
+ 				us_name = ((struct sockaddr_un *) &sock_address)->sun_path;
+ 			} else {
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
+ 				err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
++#else
++				err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
++#endif
+ 				ASSERT(err == 0);
+ 
+ 				us_name = ((struct sockaddr_un *) &peer_address)->sun_path;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sysdig.git/commitdiff/632a7d9c615655312f4801ae06f676c60e0e7fbc