commit fe8a5ca931dccf005e0a0df4f947e29545c9b079
Author: Jan Rękorajski <[email protected]>
Date: Sat Mar 9 23:12:45 2019 +0100
- up to 0.24.2, doesn't build with kernel 5.0
buildflags.patch | 13 -------
kernel-4.17.patch | 104 ------------------------------------------------------
sysdig.spec | 10 ++----
3 files changed, 3 insertions(+), 124 deletions(-)
---
diff --git a/sysdig.spec b/sysdig.spec
index 7cfd0b8..dab66a3 100644
--- a/sysdig.spec
+++ b/sysdig.spec
@@ -22,20 +22,18 @@ exit 1
%undefine with_luajit
%endif
-%define rel 3
+%define rel 0.1
%define pname sysdig
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.21.0
+Version: 0.24.2
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: e59a49be21e32f2245dbf44aeb53d654
-Patch0: buildflags.patch
-Patch1: kernel-4.17.patch
+# Source0-md5: ea98fc19fea18f02651a7955d069dcf1
URL: http://www.sysdig.org/
BuildRequires: rpmbuild(macros) >= 1.701
BuildRequires: cmake >= 2.8.2
@@ -161,8 +159,6 @@ 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/buildflags.patch b/buildflags.patch
deleted file mode 100644
index 0e2e5cd..0000000
--- a/buildflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- sysdig-0.1.101/CMakeLists.txt~ 2015-06-03 21:58:51.000000000 +0300
-+++ sysdig-0.1.101/CMakeLists.txt 2015-07-26 19:54:44.060408718 +0300
-@@ -37,8 +37,8 @@
-
- set(SYSDIG_DEBUG_FLAGS "-D_DEBUG")
-
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -ggdb")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -ggdb --std=c++0x")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall --std=c++0x")
-
- set(CMAKE_C_FLAGS_DEBUG "${SYSDIG_DEBUG_FLAGS}")
- set(CMAKE_CXX_FLAGS_DEBUG "${SYSDIG_DEBUG_FLAGS}")
diff --git a/kernel-4.17.patch b/kernel-4.17.patch
deleted file mode 100644
index fc9a064..0000000
--- a/kernel-4.17.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- 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/fe8a5ca931dccf005e0a0df4f947e29545c9b079
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
