Date: Thursday, November 10, 2022 @ 11:10:58
Author: mtorromeo
Revision: 1346400
upgpkg: sysdig 0.30.1-1
Modified:
sysdig/trunk/PKGBUILD
sysdig/trunk/bashcomp-location.patch
Deleted:
sysdig/trunk/linux-5.6.patch
sysdig/trunk/sme.patch
-------------------------+
PKGBUILD | 34 +++++++++++++-------------
bashcomp-location.patch | 12 ++++-----
linux-5.6.patch | 35 ---------------------------
sme.patch | 59 ----------------------------------------------
4 files changed, 23 insertions(+), 117 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-10 11:04:05 UTC (rev 1346399)
+++ PKGBUILD 2022-11-10 11:10:58 UTC (rev 1346400)
@@ -4,11 +4,11 @@
pkgbase=sysdig
pkgname=(sysdig sysdig-dkms)
-pkgver=0.29.3
-pkgrel=3
+pkgver=0.30.1
+pkgrel=1
# from src/sysdig-*/cmake/modules/falcosecurity-libs.cmake
-_falcover=e5c53d648f3c4694385bbe488e7d47eaa36c229a
+_falcover=0.9.1
pkgdesc="Open source system-level exploration and troubleshooting tool"
arch=('x86_64')
@@ -18,13 +18,11 @@
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"
- "sme.patch")
-sha256sums=('6b96797859002ab69a2bed4fdba1c7fe8064ecf8661621ae7d8fbf8599ffa636'
- '80903bc57b7f9c5f24298ecf1531cf66ef571681b4bd1e05f6e4db704ffb380b'
- 'aaee8a0ff414a24c5d5a479229324be1667bc5eb70702838f5d617fd986f947b'
- 'b8cedef6766c691a8a92810eb459593d80070f0cf5dfc32cae2a80ec00639429'
- 'eac65420a1f564b2336336b22a2717e5fb5c15928f859995152d00e2e4ed90d5')
+ "falcosecurity-libs-nodownload.patch")
+sha256sums=('34f78113873983a4d6e8db22ba2cdc3731bf53cb3fcbf1ad14cf28a87ba0f214'
+ 'b1591cdf4604312a876efebf0f133f1b34bbb1e9951075d8bab8de2f91f2dff8'
+ '3b659326176c314eee9115adac39a249dc4b9530511b344ea6a2b23236bb8386'
+ 'b8cedef6766c691a8a92810eb459593d80070f0cf5dfc32cae2a80ec00639429')
prepare() {
cd "$srcdir/$pkgbase-$pkgver"
@@ -32,9 +30,6 @@
patch -p1 -i "$srcdir"/falcosecurity-libs-nodownload.patch
sed s/USE_BUNDLED_DEPS/USE_BUNDLED_NJSON/ -i
cmake/modules/nlohmann-json.cmake
-
- cd "$srcdir/libs-$_falcover"
- patch -p1 -i "$srcdir"/sme.patch
}
build() {
@@ -51,9 +46,14 @@
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSDIG_VERSION=$pkgver \
-DUSE_BUNDLED_DEPS=OFF \
+ -DUSE_BUNDLED_TBB=OFF \
+ -DUSE_BUNDLED_B64=OFF \
+ -DUSE_BUNDLED_JSONCPP=OFF \
+ -DUSE_BUNDLED_RE2=OFF \
+ -DUSE_BUNDLED_VALIJSON=ON \
+ -DUSE_BUNDLED_NJSON=ON \
-DBUILD_DRIVER=OFF \
- -DBUILD_LIBSCAP_EXAMPLES=OFF \
- -DUSE_BUNDLED_NJSON=ON
+ -DBUILD_LIBSCAP_EXAMPLES=OFF
make
}
@@ -63,7 +63,7 @@
cd "$srcdir"/$pkgbase-$pkgver/build
make install DESTDIR="$pkgdir"
- rm -rf "$pkgdir"/usr/src
+ rm -rf "$pkgdir"/usr/src "$pkgdir"/sysdig
install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
install -m644 "$srcdir"/$pkgbase-$pkgver/{NOTICES,COPYING}
"$pkgdir"/usr/share/licenses/$pkgname
@@ -75,7 +75,7 @@
cd "$srcdir"/$pkgbase-$pkgver/build
make install DESTDIR="$pkgdir"
- rm -rf "$pkgdir"/usr/{share,bin}
+ rm -rf "$pkgdir"/usr/{share,bin} "$pkgdir"/sysdig
install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
install -m644 "$srcdir"/$pkgbase-$pkgver/{NOTICES,COPYING}
"$pkgdir"/usr/share/licenses/$pkgname
Modified: bashcomp-location.patch
===================================================================
--- bashcomp-location.patch 2022-11-10 11:04:05 UTC (rev 1346399)
+++ bashcomp-location.patch 2022-11-10 11:10:58 UTC (rev 1346400)
@@ -1,13 +1,13 @@
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index ded65e9..fd2a59b 100644
+index 74bf591..f866384 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)
+@@ -25,7 +25,7 @@ configure_file(rpm/preuninstall.in rpm/preuninstall)
+ configure_file(scap-driver-loader.in scap-driver-loader @ONLY)
install(FILES completions/bash/sysdig
-- DESTINATION "${DIR_ETC}/bash_completion.d")
-+ DESTINATION "share/bash-completion/completions/")
+- DESTINATION "${DIR_ETC}/bash_completion.d" COMPONENT
"${SYSDIG_COMPONENT_NAME}")
++ DESTINATION "share/bash-completion/completions/" COMPONENT
"${SYSDIG_COMPONENT_NAME}")
install(FILES completions/zsh/_sysdig
- DESTINATION share/zsh/vendor-completions)
+ DESTINATION share/zsh/vendor-completions COMPONENT
"${SYSDIG_COMPONENT_NAME}")
Deleted: linux-5.6.patch
===================================================================
--- linux-5.6.patch 2022-11-10 11:04:05 UTC (rev 1346399)
+++ linux-5.6.patch 2022-11-10 11:10:58 UTC (rev 1346400)
@@ -1,35 +0,0 @@
-From 55a8525dfffdc18106d981d7a1f70b8bd34d064d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <[email protected]>
-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 <[email protected]>
----
- 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
- */
Deleted: sme.patch
===================================================================
--- sme.patch 2022-11-10 11:04:05 UTC (rev 1346399)
+++ sme.patch 2022-11-10 11:10:58 UTC (rev 1346400)
@@ -1,59 +0,0 @@
-From 36e945af4feb31c8b875f7d4624592b0c1ff929d Mon Sep 17 00:00:00 2001
-From: Federico Di Pierro <[email protected]>
-Date: Mon, 20 Jun 2022 14:26:39 +0200
-Subject: [PATCH] fix(driver): fixed kmod build on linux kernels >= 5.18.
-
-Signed-off-by: Federico Di Pierro <[email protected]>
----
- driver/main.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/driver/main.c b/driver/main.c
-index 6b5ae461a7..e606cc2f80 100644
---- a/driver/main.c
-+++ b/driver/main.c
-@@ -70,8 +70,9 @@ MODULE_AUTHOR("the Falco authors");
- #define TRACEPOINT_PROBE(probe, args...) static void probe(void *__data,
args)
- #endif
-
--#ifndef pgprot_encrypted
--#define pgprot_encrypted(x) (x)
-+// Allow build even on arch where PAGE_ENC is not implemented
-+#ifndef _PAGE_ENC
-+#define _PAGE_ENC 0
- #endif
-
- struct ppm_device {
-@@ -1217,8 +1218,9 @@ static int ppm_mmap(struct file *filp, struct
vm_area_struct *vma)
-
- pfn = vmalloc_to_pfn(vmalloc_area_ptr);
-
-+ pgprot_val(vma->vm_page_prot) = pgprot_val(PAGE_SHARED)
| _PAGE_ENC;
- ret = remap_pfn_range(vma, useraddr, pfn,
-- PAGE_SIZE,
pgprot_encrypted(PAGE_SHARED));
-+ PAGE_SIZE, vma->vm_page_prot);
- if (ret < 0) {
- pr_err("remap_pfn_range failed (1)\n");
- goto cleanup_mmap;
-@@ -1255,8 +1257,9 @@ static int ppm_mmap(struct file *filp, struct
vm_area_struct *vma)
- while (mlength > 0) {
- pfn = vmalloc_to_pfn(vmalloc_area_ptr);
-
-+ pgprot_val(vma->vm_page_prot) =
pgprot_val(PAGE_SHARED) | _PAGE_ENC;
- ret = remap_pfn_range(vma, useraddr, pfn,
-- PAGE_SIZE,
pgprot_encrypted(PAGE_SHARED));
-+ PAGE_SIZE,
vma->vm_page_prot);
- if (ret < 0) {
- pr_err("remap_pfn_range failed (1)\n");
- goto cleanup_mmap;
-@@ -1277,8 +1280,9 @@ static int ppm_mmap(struct file *filp, struct
vm_area_struct *vma)
- while (mlength > 0) {
- pfn = vmalloc_to_pfn(vmalloc_area_ptr);
-
-+ pgprot_val(vma->vm_page_prot) =
pgprot_val(PAGE_SHARED) | _PAGE_ENC;
- ret = remap_pfn_range(vma, useraddr, pfn,
-- PAGE_SIZE,
pgprot_encrypted(PAGE_SHARED));
-+ PAGE_SIZE,
vma->vm_page_prot);
- if (ret < 0) {
- pr_err("remap_pfn_range failed (1)\n");
- goto cleanup_mmap;
