[arch-commits] Commit in sysdig/trunk (3 files)

[Massimiliano Torromeo]

    Date: Thursday, March 24, 2022 @ 09:58:52
  Author: mtorromeo
Revision: 1173902

upgpkg: sysdig 0.28.0-5: grpc rebuild + patched for luajit 2.1

Added:
  sysdig/trunk/falcosecurity-liblua-2.1.patch
  sysdig/trunk/falcosecurity-libs-nodownload.patch
Modified:
  sysdig/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |   22 ++++++++++++++++++----
 falcosecurity-liblua-2.1.patch      |   13 +++++++++++++
 falcosecurity-libs-nodownload.patch |   14 ++++++++++++++
 3 files changed, 45 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-24 09:58:15 UTC (rev 1173901)
+++ PKGBUILD	2022-03-24 09:58:52 UTC (rev 1173902)
@@ -5,7 +5,11 @@
 pkgbase=sysdig
 pkgname=(sysdig sysdig-dkms)
 pkgver=0.28.0
-pkgrel=4
+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/"
@@ -12,13 +16,23 @@
 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")
+        "https://github.com/falcosecurity/libs/archive/$_falcover.tar.gz"
+        "bashcomp-location.patch"
+        "falcosecurity-libs-nodownload.patch"
+        "falcosecurity-liblua-2.1.patch")
 sha256sums=('817e595d501acf3fe11dc659a154aadbba848dd87ae801f5bf34a42e84979f37'
-            'aaee8a0ff414a24c5d5a479229324be1667bc5eb70702838f5d617fd986f947b')
+            'f84edc4f7490064a0e2264594013c01c205bc5fc968376bfb0ecc17582e5e112'
+            'aaee8a0ff414a24c5d5a479229324be1667bc5eb70702838f5d617fd986f947b'
+            'b8cedef6766c691a8a92810eb459593d80070f0cf5dfc32cae2a80ec00639429'
+            '11863751dc555a2a406e5276bbafa9185f1031d6f12c4cb051ac7097e7467889')
 
 prepare() {
-  cd "$srcdir"/$pkgbase-$pkgver
+  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() {

Added: falcosecurity-liblua-2.1.patch
===================================================================
--- falcosecurity-liblua-2.1.patch	                        (rev 0)
+++ falcosecurity-liblua-2.1.patch	2022-03-24 09:58:52 UTC (rev 1173902)
@@ -0,0 +1,13 @@
+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}")

Added: falcosecurity-libs-nodownload.patch
===================================================================
--- falcosecurity-libs-nodownload.patch	                        (rev 0)
+++ falcosecurity-libs-nodownload.patch	2022-03-24 09:58:52 UTC (rev 1173902)
@@ -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 ""