[arch-commits] Commit in sysdig/repos/community-x86_64 (9 files)
Massimiliano Torromeo
mtorromeo at gemini.archlinux.org
Tue Dec 14 19:49:56 UTC 2021
Date: Tuesday, December 14, 2021 @ 19:49:55
Author: mtorromeo
Revision: 1072839
archrelease: copy trunk to community-x86_64
Added:
sysdig/repos/community-x86_64/PKGBUILD
(from rev 1072838, sysdig/trunk/PKGBUILD)
sysdig/repos/community-x86_64/bashcomp-location.patch
(from rev 1072838, sysdig/trunk/bashcomp-location.patch)
sysdig/repos/community-x86_64/filters-fix.patch
(from rev 1072838, sysdig/trunk/filters-fix.patch)
sysdig/repos/community-x86_64/linux-5.6.patch
(from rev 1072838, sysdig/trunk/linux-5.6.patch)
Deleted:
sysdig/repos/community-x86_64/0.27.1-grpc-absl-sync.patch
sysdig/repos/community-x86_64/PKGBUILD
sysdig/repos/community-x86_64/bashcomp-location.patch
sysdig/repos/community-x86_64/glibc.patch
sysdig/repos/community-x86_64/linux-5.6.patch
-----------------------------+
0.27.1-grpc-absl-sync.patch | 22 ------
PKGBUILD | 139 ++++++++++++++++++++----------------------
bashcomp-location.patch | 26 +++----
filters-fix.patch | 39 +++++++++++
glibc.patch | 12 ---
linux-5.6.patch | 70 ++++++++++-----------
6 files changed, 155 insertions(+), 153 deletions(-)
Deleted: 0.27.1-grpc-absl-sync.patch
===================================================================
--- 0.27.1-grpc-absl-sync.patch 2021-12-14 19:49:39 UTC (rev 1072838)
+++ 0.27.1-grpc-absl-sync.patch 2021-12-14 19:49:55 UTC (rev 1072839)
@@ -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}"
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-14 19:49:39 UTC (rev 1072838)
+++ PKGBUILD 2021-12-14 19:49:55 UTC (rev 1072839)
@@ -1,71 +0,0 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contribuitor: Alfredo Palhares <masterkorp at masterkorp.net>
-# Contribuitor: Christian Babeux <christian.babeux at 0x80.ca>
-
-pkgbase=sysdig
-pkgname=(sysdig sysdig-dkms)
-pkgver=0.27.1
-pkgrel=11
-pkgdesc="Open source system-level exploration and troubleshooting tool"
-arch=('x86_64')
-url="https://www.sysdig.com/"
-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')
-
-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
-}
-
-build() {
- cd "$srcdir"/$pkgbase-$pkgver
- rm -rf build
- mkdir build
- cd build
-
- cmake .. \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${CPPFLAGS} -Wno-deprecated-declarations" \
- -DCMAKE_C_FLAGS="${CFLAGS} ${CPPFLAGS} -Wno-deprecated-declarations" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSDIG_VERSION=$pkgver \
- -DUSE_BUNDLED_DEPS=OFF \
- -DBUILD_DRIVER=OFF \
- -DBUILD_LIBSCAP_EXAMPLES=OFF
- make
-}
-
-package_sysdig() {
- optdepends=('sysdig-dkms: kernel module for live inspection')
- depends=('jsoncpp' 'libjsoncpp.so' 'luajit' 'curl' 'libcurl.so' 'jq' 'libb64' 'intel-tbb' 'grpc' 'libgrpc++_unsecure.so')
-
- cd "$srcdir"/$pkgbase-$pkgver/build
- make install DESTDIR="$pkgdir"
- rm -rf "$pkgdir"/usr/src
-
- install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
- install -m644 "$srcdir"/$pkgbase-$pkgver/{NOTICES,COPYING} "$pkgdir"/usr/share/licenses/$pkgname
-}
-
-package_sysdig-dkms() {
- pkgdesc="DKMS kernel module for sysdig"
- depends=('sysdig' 'dkms')
-
- cd "$srcdir"/$pkgbase-$pkgver/build
- make install DESTDIR="$pkgdir"
- rm -rf "$pkgdir"/usr/{share,bin}
-
- install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
- install -m644 "$srcdir"/$pkgbase-$pkgver/{NOTICES,COPYING} "$pkgdir"/usr/share/licenses/$pkgname
-}
Copied: sysdig/repos/community-x86_64/PKGBUILD (from rev 1072838, sysdig/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-14 19:49:55 UTC (rev 1072839)
@@ -0,0 +1,68 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contribuitor: Alfredo Palhares <masterkorp at masterkorp.net>
+# Contribuitor: Christian Babeux <christian.babeux at 0x80.ca>
+
+pkgbase=sysdig
+pkgname=(sysdig sysdig-dkms)
+pkgver=0.28.0
+pkgrel=1
+pkgdesc="Open source system-level exploration and troubleshooting tool"
+arch=('x86_64')
+url="https://www.sysdig.com/"
+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"
+ "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"/filters-fix.patch
+}
+
+build() {
+ cd "$srcdir"/$pkgbase-$pkgver
+ rm -rf build
+ mkdir build
+ cd build
+
+ cmake .. \
+ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${CPPFLAGS} -Wno-deprecated-declarations" \
+ -DCMAKE_C_FLAGS="${CFLAGS} ${CPPFLAGS} -Wno-deprecated-declarations" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSDIG_VERSION=$pkgver \
+ -DUSE_BUNDLED_DEPS=OFF \
+ -DBUILD_DRIVER=OFF \
+ -DBUILD_LIBSCAP_EXAMPLES=OFF
+ make
+}
+
+package_sysdig() {
+ optdepends=('sysdig-dkms: kernel module for live inspection')
+ depends=('jsoncpp' 'libjsoncpp.so' 'luajit' 'curl' 'libcurl.so' 'jq' 'libb64' 'intel-tbb' 'grpc' 'libgrpc++_unsecure.so')
+
+ cd "$srcdir"/$pkgbase-$pkgver/build
+ make install DESTDIR="$pkgdir"
+ rm -rf "$pkgdir"/usr/src
+
+ install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
+ install -m644 "$srcdir"/$pkgbase-$pkgver/{NOTICES,COPYING} "$pkgdir"/usr/share/licenses/$pkgname
+}
+
+package_sysdig-dkms() {
+ pkgdesc="DKMS kernel module for sysdig"
+ depends=('sysdig' 'dkms')
+
+ cd "$srcdir"/$pkgbase-$pkgver/build
+ make install DESTDIR="$pkgdir"
+ rm -rf "$pkgdir"/usr/{share,bin}
+
+ install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
+ install -m644 "$srcdir"/$pkgbase-$pkgver/{NOTICES,COPYING} "$pkgdir"/usr/share/licenses/$pkgname
+}
Deleted: bashcomp-location.patch
===================================================================
--- bashcomp-location.patch 2021-12-14 19:49:39 UTC (rev 1072838)
+++ bashcomp-location.patch 2021-12-14 19:49:55 UTC (rev 1072839)
@@ -1,13 +0,0 @@
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index ded65e9..fd2a59b 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -2,7 +2,7 @@ configure_file(debian/postinst.in debian/postinst)
- configure_file(debian/prerm.in debian/prerm)
-
- install(FILES completions/bash/sysdig
-- DESTINATION "${DIR_ETC}/bash_completion.d")
-+ DESTINATION "share/bash-completion/completions/")
-
- install(FILES completions/zsh/_sysdig
- DESTINATION share/zsh/vendor-completions)
Copied: sysdig/repos/community-x86_64/bashcomp-location.patch (from rev 1072838, sysdig/trunk/bashcomp-location.patch)
===================================================================
--- bashcomp-location.patch (rev 0)
+++ bashcomp-location.patch 2021-12-14 19:49:55 UTC (rev 1072839)
@@ -0,0 +1,13 @@
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index ded65e9..fd2a59b 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -2,7 +2,7 @@ configure_file(debian/postinst.in debian/postinst)
+ configure_file(debian/prerm.in debian/prerm)
+
+ install(FILES completions/bash/sysdig
+- DESTINATION "${DIR_ETC}/bash_completion.d")
++ DESTINATION "share/bash-completion/completions/")
+
+ install(FILES completions/zsh/_sysdig
+ DESTINATION share/zsh/vendor-completions)
Copied: sysdig/repos/community-x86_64/filters-fix.patch (from rev 1072838, sysdig/trunk/filters-fix.patch)
===================================================================
--- filters-fix.patch (rev 0)
+++ filters-fix.patch 2021-12-14 19:49:55 UTC (rev 1072839)
@@ -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:49:39 UTC (rev 1072838)
+++ glibc.patch 2021-12-14 19:49:55 UTC (rev 1072839)
@@ -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
Deleted: linux-5.6.patch
===================================================================
--- linux-5.6.patch 2021-12-14 19:49:39 UTC (rev 1072838)
+++ linux-5.6.patch 2021-12-14 19:49:55 UTC (rev 1072839)
@@ -1,35 +0,0 @@
-From 55a8525dfffdc18106d981d7a1f70b8bd34d064d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger at applied-asynchrony.com>
-Date: Sat, 4 Apr 2020 17:29:23 +0200
-Subject: [PATCH] Quick fix to compile with kernel 5.6 (#1609)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Intentionally minimalistic in order to reduce the impact on the codebase
-and (for now) to preserve compile-time compatibility with older kernels.
-
-sysdig-CLA-1.0-signed-off-by: Holger Hoffstätte <holger at applied-asynchrony.com>
----
- driver/ppm.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/driver/ppm.h b/driver/ppm.h
-index acd5fa01f..7efc2c3d6 100644
---- a/driver/ppm.h
-+++ b/driver/ppm.h
-@@ -23,6 +23,14 @@ or GPL2.txt for full copies of the license.
-
- #include <linux/time.h>
-
-+#ifndef timespec
-+#define timespec timespec64
-+#define timespec_to_ns timespec64_to_ns
-+#define getnstimeofday ktime_get_real_ts64
-+#define timeval __kernel_old_timeval
-+#define compat_timespec old_timespec32
-+#endif
-+
- /*
- * Global defines
- */
Copied: sysdig/repos/community-x86_64/linux-5.6.patch (from rev 1072838, sysdig/trunk/linux-5.6.patch)
===================================================================
--- linux-5.6.patch (rev 0)
+++ linux-5.6.patch 2021-12-14 19:49:55 UTC (rev 1072839)
@@ -0,0 +1,35 @@
+From 55a8525dfffdc18106d981d7a1f70b8bd34d064d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger at applied-asynchrony.com>
+Date: Sat, 4 Apr 2020 17:29:23 +0200
+Subject: [PATCH] Quick fix to compile with kernel 5.6 (#1609)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Intentionally minimalistic in order to reduce the impact on the codebase
+and (for now) to preserve compile-time compatibility with older kernels.
+
+sysdig-CLA-1.0-signed-off-by: Holger Hoffstätte <holger at applied-asynchrony.com>
+---
+ driver/ppm.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/driver/ppm.h b/driver/ppm.h
+index acd5fa01f..7efc2c3d6 100644
+--- a/driver/ppm.h
++++ b/driver/ppm.h
+@@ -23,6 +23,14 @@ or GPL2.txt for full copies of the license.
+
+ #include <linux/time.h>
+
++#ifndef timespec
++#define timespec timespec64
++#define timespec_to_ns timespec64_to_ns
++#define getnstimeofday ktime_get_real_ts64
++#define timeval __kernel_old_timeval
++#define compat_timespec old_timespec32
++#endif
++
+ /*
+ * Global defines
+ */
More information about the arch-commits
mailing list