[arch-commits] Commit in sysdig/repos/community-x86_64 (9 files)
Massimiliano Torromeo
mtorromeo at gemini.archlinux.org
Fri Apr 1 14:11:18 UTC 2022
Date: Friday, April 1, 2022 @ 14:11:17
Author: mtorromeo
Revision: 1179778
archrelease: copy trunk to community-x86_64
Added:
sysdig/repos/community-x86_64/PKGBUILD
(from rev 1179777, sysdig/trunk/PKGBUILD)
sysdig/repos/community-x86_64/bashcomp-location.patch
(from rev 1179777, sysdig/trunk/bashcomp-location.patch)
sysdig/repos/community-x86_64/falcosecurity-libs-nodownload.patch
(from rev 1179777, sysdig/trunk/falcosecurity-libs-nodownload.patch)
sysdig/repos/community-x86_64/linux-5.6.patch
(from rev 1179777, 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/falcosecurity-liblua-2.1.patch
sysdig/repos/community-x86_64/falcosecurity-libs-nodownload.patch
sysdig/repos/community-x86_64/linux-5.6.patch
-------------------------------------+
PKGBUILD | 153 ++++++++++++++++------------------
bashcomp-location.patch | 26 ++---
falcosecurity-liblua-2.1.patch | 13 --
falcosecurity-libs-nodownload.patch | 28 +++---
linux-5.6.patch | 70 +++++++--------
5 files changed, 136 insertions(+), 154 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-01 14:11:07 UTC (rev 1179777)
+++ PKGBUILD 2022-04-01 14:11:17 UTC (rev 1179778)
@@ -1,79 +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=5
-
-# from src/sysdig-*/cmake/modules/falcosecurity-libs.cmake
-_falcover=2160111cd088aea9ae2235d3385ecb0b1ab6623c
-
-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"
- "https://github.com/falcosecurity/libs/archive/$_falcover.tar.gz"
- "bashcomp-location.patch"
- "falcosecurity-libs-nodownload.patch"
- "falcosecurity-liblua-2.1.patch")
-sha256sums=('817e595d501acf3fe11dc659a154aadbba848dd87ae801f5bf34a42e84979f37'
- 'f84edc4f7490064a0e2264594013c01c205bc5fc968376bfb0ecc17582e5e112'
- 'aaee8a0ff414a24c5d5a479229324be1667bc5eb70702838f5d617fd986f947b'
- 'b8cedef6766c691a8a92810eb459593d80070f0cf5dfc32cae2a80ec00639429'
- '11863751dc555a2a406e5276bbafa9185f1031d6f12c4cb051ac7097e7467889')
-
-prepare() {
- cd "$srcdir/$pkgbase-$pkgver"
- patch -p1 -i "$srcdir"/bashcomp-location.patch
- patch -p1 -i "$srcdir"/falcosecurity-libs-nodownload.patch
-
- cd "$srcdir/libs-$_falcover"
- patch -p1 -i "$srcdir"/falcosecurity-liblua-2.1.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 1179777, sysdig/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-01 14:11:17 UTC (rev 1179778)
@@ -0,0 +1,74 @@
+# 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.29.1
+pkgrel=1
+
+# from src/sysdig-*/cmake/modules/falcosecurity-libs.cmake
+_falcover=e5c53d648f3c4694385bbe488e7d47eaa36c229a
+
+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' 'yaml-cpp')
+source=("https://github.com/draios/sysdig/archive/$pkgver/$pkgbase-$pkgver.tar.gz"
+ "falcosecurity-libs-$_falcover.tar.gz::https://github.com/falcosecurity/libs/archive/$_falcover.tar.gz"
+ "bashcomp-location.patch"
+ "falcosecurity-libs-nodownload.patch")
+sha256sums=('3721c97f0da43c1a68d2962d30363525d8532ab5f2534dfefc86d175e17e423e'
+ '80903bc57b7f9c5f24298ecf1531cf66ef571681b4bd1e05f6e4db704ffb380b'
+ 'aaee8a0ff414a24c5d5a479229324be1667bc5eb70702838f5d617fd986f947b'
+ 'b8cedef6766c691a8a92810eb459593d80070f0cf5dfc32cae2a80ec00639429')
+
+prepare() {
+ cd "$srcdir/$pkgbase-$pkgver"
+ patch -p1 -i "$srcdir"/bashcomp-location.patch
+ patch -p1 -i "$srcdir"/falcosecurity-libs-nodownload.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' 'yaml-cpp')
+
+ 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 2022-04-01 14:11:07 UTC (rev 1179777)
+++ bashcomp-location.patch 2022-04-01 14:11:17 UTC (rev 1179778)
@@ -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 1179777, sysdig/trunk/bashcomp-location.patch)
===================================================================
--- bashcomp-location.patch (rev 0)
+++ bashcomp-location.patch 2022-04-01 14:11:17 UTC (rev 1179778)
@@ -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: falcosecurity-liblua-2.1.patch
===================================================================
--- falcosecurity-liblua-2.1.patch 2022-04-01 14:11:07 UTC (rev 1179777)
+++ falcosecurity-liblua-2.1.patch 2022-04-01 14:11:17 UTC (rev 1179778)
@@ -1,13 +0,0 @@
-diff --git a/cmake/modules/luajit.cmake b/cmake/modules/luajit.cmake
-index 382dd1d..3009b92 100644
---- a/cmake/modules/luajit.cmake
-+++ b/cmake/modules/luajit.cmake
-@@ -6,7 +6,7 @@ option(USE_BUNDLED_LUAJIT "Enable building of the bundled LuaJIT" ${USE_BUNDLED_
- if(LUAJIT_INCLUDE)
- # we already have luajit
- elseif(NOT USE_BUNDLED_LUAJIT)
-- find_path(LUAJIT_INCLUDE luajit.h PATH_SUFFIXES luajit-2.0 luajit)
-+ find_path(LUAJIT_INCLUDE luajit.h PATH_SUFFIXES luajit-2.1 luajit)
- find_library(LUAJIT_LIB NAMES luajit luajit-5.1)
- if(LUAJIT_INCLUDE AND LUAJIT_LIB)
- message(STATUS "Found LuaJIT: include: ${LUAJIT_INCLUDE}, lib: ${LUAJIT_LIB}")
Deleted: falcosecurity-libs-nodownload.patch
===================================================================
--- falcosecurity-libs-nodownload.patch 2022-04-01 14:11:07 UTC (rev 1179777)
+++ falcosecurity-libs-nodownload.patch 2022-04-01 14:11:17 UTC (rev 1179778)
@@ -1,14 +0,0 @@
-diff --git a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
-index 712dd8c..98166cd 100644
---- a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
-+++ b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
-@@ -25,8 +25,7 @@ message(STATUS "Driver version: ${FALCOSECURITY_LIBS_VERSION}")
-
- ExternalProject_Add(
- falcosecurity-libs
-- URL "https://github.com/falcosecurity/libs/archive/${FALCOSECURITY_LIBS_VERSION}.tar.gz"
-- URL_HASH "${FALCOSECURITY_LIBS_CHECKSUM}"
-+ URL "${CMAKE_CURRENT_SOURCE_DIR}/../../../../libs-${FALCOSECURITY_LIBS_VERSION}"
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND ""
Copied: sysdig/repos/community-x86_64/falcosecurity-libs-nodownload.patch (from rev 1179777, sysdig/trunk/falcosecurity-libs-nodownload.patch)
===================================================================
--- falcosecurity-libs-nodownload.patch (rev 0)
+++ falcosecurity-libs-nodownload.patch 2022-04-01 14:11:17 UTC (rev 1179778)
@@ -0,0 +1,14 @@
+diff --git a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
+index 712dd8c..98166cd 100644
+--- a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
++++ b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
+@@ -25,8 +25,7 @@ message(STATUS "Driver version: ${FALCOSECURITY_LIBS_VERSION}")
+
+ ExternalProject_Add(
+ falcosecurity-libs
+- URL "https://github.com/falcosecurity/libs/archive/${FALCOSECURITY_LIBS_VERSION}.tar.gz"
+- URL_HASH "${FALCOSECURITY_LIBS_CHECKSUM}"
++ URL "${CMAKE_CURRENT_SOURCE_DIR}/../../../../libs-${FALCOSECURITY_LIBS_VERSION}"
+ CONFIGURE_COMMAND ""
+ BUILD_COMMAND ""
+ INSTALL_COMMAND ""
Deleted: linux-5.6.patch
===================================================================
--- linux-5.6.patch 2022-04-01 14:11:07 UTC (rev 1179777)
+++ linux-5.6.patch 2022-04-01 14:11:17 UTC (rev 1179778)
@@ -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 1179777, sysdig/trunk/linux-5.6.patch)
===================================================================
--- linux-5.6.patch (rev 0)
+++ linux-5.6.patch 2022-04-01 14:11:17 UTC (rev 1179778)
@@ -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