Date: Sunday, March 14, 2021 @ 03:35:18 Author: felixonmars Revision: 890821
archrelease: copy trunk to community-staging-x86_64 Added: sysdig/repos/community-staging-x86_64/ sysdig/repos/community-staging-x86_64/PKGBUILD (from rev 890819, sysdig/trunk/PKGBUILD) sysdig/repos/community-staging-x86_64/bashcomp-location.patch (from rev 890819, sysdig/trunk/bashcomp-location.patch) sysdig/repos/community-staging-x86_64/glibc.patch (from rev 890819, sysdig/trunk/glibc.patch) sysdig/repos/community-staging-x86_64/linux-5.6.patch (from rev 890820, sysdig/trunk/linux-5.6.patch) -------------------------+ PKGBUILD | 54 ++++++++++++++++++++++++++++++++++++++++++++++ bashcomp-location.patch | 13 +++++++++++ glibc.patch | 12 ++++++++++ linux-5.6.patch | 35 +++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+) Copied: sysdig/repos/community-staging-x86_64/PKGBUILD (from rev 890819, sysdig/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2021-03-14 03:35:18 UTC (rev 890821) @@ -0,0 +1,54 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contribuitor: Alfredo Palhares <masterk...@masterkorp.net> +# Contribuitor: Christian Babeux <christian.bab...@0x80.ca> + +pkgname=sysdig +pkgver=0.27.1 +pkgrel=3 +pkgdesc="Open source system-level exploration and troubleshooting tool" +arch=('x86_64') +url="https://www.sysdig.com/" +license=('GPL2' 'Apache' 'MIT') +depends=('dkms' 'jsoncpp' 'libjsoncpp.so' 'luajit' 'curl' 'libcurl.so' 'jq' 'libb64' 'intel-tbb' 'grpc') +makedepends=('cmake' 'pandoc' 'gtest') +source=("https://github.com/draios/sysdig/archive/$pkgver/$pkgname-$pkgver.tar.gz" + "bashcomp-location.patch" + "glibc.patch") +sha256sums=('b9d05854493d245a7a7e75f77fc654508f720aab5e5e8a3a932bd8eb54e49bda' + 'aaee8a0ff414a24c5d5a479229324be1667bc5eb70702838f5d617fd986f947b' + '9d9ee715500cb5c3709cf6a77e95421edaaae5f15dbb1c7c8ad2147cc9637939') + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + patch -p1 -i "$srcdir"/bashcomp-location.patch + patch -p1 -i "$srcdir"/glibc.patch +} + +build() { + cd "$srcdir"/$pkgname-$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() { + cd "$srcdir"/$pkgname-$pkgver + + install -dm755 "$pkgdir"/usr/share/licenses/$pkgname + install -m644 NOTICES COPYING "$pkgdir"/usr/share/licenses/$pkgname + + cd build + make install DESTDIR="$pkgdir" +} Copied: sysdig/repos/community-staging-x86_64/bashcomp-location.patch (from rev 890819, sysdig/trunk/bashcomp-location.patch) =================================================================== --- community-staging-x86_64/bashcomp-location.patch (rev 0) +++ community-staging-x86_64/bashcomp-location.patch 2021-03-14 03:35:18 UTC (rev 890821) @@ -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-staging-x86_64/glibc.patch (from rev 890819, sysdig/trunk/glibc.patch) =================================================================== --- community-staging-x86_64/glibc.patch (rev 0) +++ community-staging-x86_64/glibc.patch 2021-03-14 03:35:18 UTC (rev 890821) @@ -0,0 +1,12 @@ +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 Copied: sysdig/repos/community-staging-x86_64/linux-5.6.patch (from rev 890820, sysdig/trunk/linux-5.6.patch) =================================================================== --- community-staging-x86_64/linux-5.6.patch (rev 0) +++ community-staging-x86_64/linux-5.6.patch 2021-03-14 03:35:18 UTC (rev 890821) @@ -0,0 +1,35 @@ +From 55a8525dfffdc18106d981d7a1f70b8bd34d064d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <hol...@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 <hol...@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 + */