[arch-commits] Commit in sysdig/repos/community-x86_64 (7 files)

Massimiliano Torromeo mtorromeo at gemini.archlinux.org
Tue Dec 21 22:23:06 UTC 2021


    Date: Tuesday, December 21, 2021 @ 22:23:06
  Author: mtorromeo
Revision: 1082658

archrelease: copy trunk to community-x86_64

Added:
  sysdig/repos/community-x86_64/PKGBUILD
    (from rev 1082657, sysdig/trunk/PKGBUILD)
  sysdig/repos/community-x86_64/bashcomp-location.patch
    (from rev 1082657, sysdig/trunk/bashcomp-location.patch)
  sysdig/repos/community-x86_64/linux-5.6.patch
    (from rev 1082657, sysdig/trunk/linux-5.6.patch)
Deleted:
  sysdig/repos/community-x86_64/PKGBUILD
  sysdig/repos/community-x86_64/bashcomp-location.patch
  sysdig/repos/community-x86_64/filters-fix.patch
  sysdig/repos/community-x86_64/linux-5.6.patch

-------------------------+
 PKGBUILD                |  133 ++++++++++++++++++++++------------------------
 bashcomp-location.patch |   26 ++++----
 filters-fix.patch       |   39 -------------
 linux-5.6.patch         |   70 ++++++++++++------------
 4 files changed, 113 insertions(+), 155 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-21 22:22:57 UTC (rev 1082657)
+++ PKGBUILD	2021-12-21 22:23:06 UTC (rev 1082658)
@@ -1,68 +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.28.0
-pkgrel=2
-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=('817e595d501acf3fe11dc659a154aadbba848dd87ae801f5bf34a42e84979f37'
-            '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
-}

Copied: sysdig/repos/community-x86_64/PKGBUILD (from rev 1082657, sysdig/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-12-21 22:23:06 UTC (rev 1082658)
@@ -0,0 +1,65 @@
+# 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=3
+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")
+sha256sums=('817e595d501acf3fe11dc659a154aadbba848dd87ae801f5bf34a42e84979f37'
+            'aaee8a0ff414a24c5d5a479229324be1667bc5eb70702838f5d617fd986f947b')
+
+prepare() {
+  cd "$srcdir"/$pkgbase-$pkgver
+  patch -p1 -i "$srcdir"/bashcomp-location.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-21 22:22:57 UTC (rev 1082657)
+++ bashcomp-location.patch	2021-12-21 22:23:06 UTC (rev 1082658)
@@ -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 1082657, sysdig/trunk/bashcomp-location.patch)
===================================================================
--- bashcomp-location.patch	                        (rev 0)
+++ bashcomp-location.patch	2021-12-21 22:23:06 UTC (rev 1082658)
@@ -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)

Deleted: filters-fix.patch
===================================================================
--- filters-fix.patch	2021-12-21 22:22:57 UTC (rev 1082657)
+++ filters-fix.patch	2021-12-21 22:23:06 UTC (rev 1082658)
@@ -1,39 +0,0 @@
-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: linux-5.6.patch
===================================================================
--- linux-5.6.patch	2021-12-21 22:22:57 UTC (rev 1082657)
+++ linux-5.6.patch	2021-12-21 22:23:06 UTC (rev 1082658)
@@ -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 1082657, sysdig/trunk/linux-5.6.patch)
===================================================================
--- linux-5.6.patch	                        (rev 0)
+++ linux-5.6.patch	2021-12-21 22:23:06 UTC (rev 1082658)
@@ -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