Date: Tuesday, December 14, 2021 @ 19:49:39
Author: mtorromeo
Revision: 1072838
upgpkg: sysdig 0.28.0-1
Added:
sysdig/trunk/filters-fix.patch
Modified:
sysdig/trunk/PKGBUILD
Deleted:
sysdig/trunk/0.27.1-grpc-absl-sync.patch
sysdig/trunk/glibc.patch
-----------------------------+
0.27.1-grpc-absl-sync.patch | 22 ----------------------
PKGBUILD | 19 ++++++++-----------
filters-fix.patch | 39 +++++++++++++++++++++++++++++++++++++++
glibc.patch | 12 ------------
4 files changed, 47 insertions(+), 45 deletions(-)
Deleted: 0.27.1-grpc-absl-sync.patch
===================================================================
--- 0.27.1-grpc-absl-sync.patch 2021-12-14 19:32:25 UTC (rev 1072837)
+++ 0.27.1-grpc-absl-sync.patch 2021-12-14 19:49:39 UTC (rev 1072838)
@@ -1,22 +0,0 @@
-diff -rup sysdig-0.27.1/CMakeLists.txt sysdig-0.27.1-grpc-1.41/CMakeLists.txt
---- sysdig-0.27.1/CMakeLists.txt 2020-09-30 16:21:52.000000000 +0200
-+++ sysdig-0.27.1-grpc-1.41/CMakeLists.txt 2021-10-08 23:46:51.058659662
+0200
-@@ -552,6 +552,7 @@ if(NOT WIN32 AND NOT APPLE)
- else()
- message(FATAL_ERROR "Couldn't find system grpc")
- endif()
-+ find_library(ABSL_SYNC_LIB NAMES absl_synchronization)
- find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
- if(NOT GRPC_CPP_PLUGIN)
- message(FATAL_ERROR "System grpc_cpp_plugin not
found")
-diff -rup sysdig-0.27.1/userspace/libsinsp/CMakeLists.txt
sysdig-0.27.1-grpc-1.41/userspace/libsinsp/CMakeLists.txt
---- sysdig-0.27.1/userspace/libsinsp/CMakeLists.txt 2020-09-30
16:21:52.000000000 +0200
-+++ sysdig-0.27.1-grpc-1.41/userspace/libsinsp/CMakeLists.txt 2021-10-08
23:46:35.785353019 +0200
-@@ -209,6 +209,7 @@ if(NOT WIN32)
- target_link_libraries(sinsp
- "${GRPCPP_LIB}"
- "${GRPC_LIB}"
-+ "${ABSL_SYNC_LIB}"
- "${PROTOBUF_LIB}"
- "${CARES_LIB}"
- "${JQ_LIB}"
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-14 19:32:25 UTC (rev 1072837)
+++ PKGBUILD 2021-12-14 19:49:39 UTC (rev 1072838)
@@ -4,8 +4,8 @@
pkgbase=sysdig
pkgname=(sysdig sysdig-dkms)
-pkgver=0.27.1
-pkgrel=11
+pkgver=0.28.0
+pkgrel=1
pkgdesc="Open source system-level exploration and troubleshooting tool"
arch=('x86_64')
url="https://www.sysdig.com/";
@@ -12,19 +12,16 @@
license=('GPL2' 'Apache' 'MIT')
makedepends=('cmake' 'pandoc' 'gtest' 'jsoncpp' 'libjsoncpp.so' 'luajit'
'curl' 'libcurl.so' 'jq' 'libb64' 'intel-tbb' 'grpc' 'libgrpc++_unsecure.so')
source=("https://github.com/draios/sysdig/archive/$pkgver/$pkgbase-$pkgver.tar.gz";
- "bashcomp-location.patch"
- "glibc.patch"
- "0.27.1-grpc-absl-sync.patch")
-sha256sums=('b9d05854493d245a7a7e75f77fc654508f720aab5e5e8a3a932bd8eb54e49bda'
- 'aaee8a0ff414a24c5d5a479229324be1667bc5eb70702838f5d617fd986f947b'
- '9d9ee715500cb5c3709cf6a77e95421edaaae5f15dbb1c7c8ad2147cc9637939'
- '9390c4c2d8aef6110aae63835aab07585bbe9856c820020750e0ba678e4da653')
+ "filters-fix.patch"
+ "bashcomp-location.patch")
+sha256sums=('227eea9ffb65829c079fed379f4830fcb3b3a1ae597aa10d639fb49273afb18c'
+ '36ec117b4556dfed08313d25f5124b22d0f73f7aeb7df68da9a99f987f929eda'
+ 'aaee8a0ff414a24c5d5a479229324be1667bc5eb70702838f5d617fd986f947b')
prepare() {
cd "$srcdir"/$pkgbase-$pkgver
patch -p1 -i "$srcdir"/bashcomp-location.patch
- patch -p1 -i "$srcdir"/glibc.patch
- patch -p1 -i "$srcdir"/0.27.1-grpc-absl-sync.patch
+ patch -p1 -i "$srcdir"/filters-fix.patch
}
build() {
Added: filters-fix.patch
===================================================================
--- filters-fix.patch (rev 0)
+++ filters-fix.patch 2021-12-14 19:49:39 UTC (rev 1072838)
@@ -0,0 +1,39 @@
+diff --git a/userspace/sysdig/chisels/v_connections.lua
b/userspace/sysdig/chisels/v_connections.lua
+index 6de7a24..55364e6 100644
+--- a/userspace/sysdig/chisels/v_connections.lua
++++ b/userspace/sysdig/chisels/v_connections.lua
+@@ -26,7 +26,7 @@ view_info =
+ tags = {"Default", "wsysdig"},
+ view_type = "table",
+ applies_to = {"", "container.id", "proc.pid", "thread.nametid",
"proc.name", "thread.tid", "fd.sport", "fd.sproto", "fd.dport", "fd.dproto",
"fd.port", "fd.proto", "fd.lport", "fd.rport", "evt.res", "k8s.pod.id",
"k8s.rc.id", "k8s.rs.id", "k8s.svc.id", "k8s.ns.id", "marathon.app.id",
"marathon.group.name", "mesos.task.id", "mesos.framework.name"},
+- filter = "fd.type=ipv4 or fd.type=ipv6 and fd.name!=''",
++ filter = "(fd.type=ipv4 or fd.type=ipv6) and fd.name!=''",
+ use_defaults = true,
+ drilldown_target = "incoming_connections",
+ columns =
+diff --git a/userspace/sysdig/chisels/v_directories.lua
b/userspace/sysdig/chisels/v_directories.lua
+index 89993ca..b13c570 100644
+--- a/userspace/sysdig/chisels/v_directories.lua
++++ b/userspace/sysdig/chisels/v_directories.lua
+@@ -26,7 +26,7 @@ view_info =
+ tags = {"Default", "wsysdig"},
+ view_type = "table",
+ applies_to = {"", "container.id", "proc.pid", "thread.nametid",
"proc.name", "thread.tid", "fd.sport", "fd.sproto", "evt.res", "k8s.pod.id",
"k8s.rc.id", "k8s.rs.id", "k8s.svc.id", "k8s.ns.id", "marathon.app.id",
"marathon.group.name", "mesos.task.id", "mesos.framework.name"},
+- filter = "fd.type=file or fd.type=directory and fd.name!=''",
++ filter = "(fd.type=file or fd.type=directory) and fd.name!=''",
+ use_defaults = true,
+ drilldown_target = "files",
+ columns =
+diff --git a/userspace/sysdig/chisels/v_files.lua
b/userspace/sysdig/chisels/v_files.lua
+index d56f45d..b8e8622 100644
+--- a/userspace/sysdig/chisels/v_files.lua
++++ b/userspace/sysdig/chisels/v_files.lua
+@@ -26,7 +26,7 @@ view_info =
+ tags = {"Default", "wsysdig"},
+ view_type = "table",
+ applies_to = {"", "container.id", "proc.pid", "thread.nametid",
"proc.name", "thread.tid", "fd.sport", "fd.sproto", "fd.directory",
"fd.containerdirectory", "fd.containerdirectory", "evt.res", "k8s.pod.id",
"k8s.rc.id", "k8s.rs.id", "k8s.svc.id", "k8s.ns.id", "marathon.app.id",
"marathon.group.name", "mesos.task.id", "mesos.framework.name"},
+- filter = "fd.type=file or fd.type=directory and fd.name!=''",
++ filter = "(fd.type=file or fd.type=directory) and fd.name!=''",
+ use_defaults = true,
+ drilldown_target = "procs",
+ columns =
Deleted: glibc.patch
===================================================================
--- glibc.patch 2021-12-14 19:32:25 UTC (rev 1072837)
+++ glibc.patch 2021-12-14 19:49:39 UTC (rev 1072838)
@@ -1,12 +0,0 @@
-diff --git a/userspace/libscap/scap_fds.c b/userspace/libscap/scap_fds.c
-index 452353a..c1e38b1 100644
---- a/userspace/libscap/scap_fds.c
-+++ b/userspace/libscap/scap_fds.c
-@@ -25,6 +25,7 @@ limitations under the License.
- #include "scap_savefile.h"
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <fcntl.h>
- #include "uthash.h"
- #ifdef _WIN32
