[arch-commits] Commit in sysdig/trunk (PKGBUILD falcosecurity-liblua-2.1.patch)

[Massimiliano Torromeo]

    Date: Friday, April 1, 2022 @ 14:11:07
  Author: mtorromeo
Revision: 1179777

upgpkg: sysdig 0.29.1-1

Modified:
  sysdig/trunk/PKGBUILD
Deleted:
  sysdig/trunk/falcosecurity-liblua-2.1.patch

--------------------------------+
 PKGBUILD                       |   25 ++++++++++---------------
 falcosecurity-liblua-2.1.patch |   13 -------------
 2 files changed, 10 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-01 13:05:19 UTC (rev 1179776)
+++ PKGBUILD	2022-04-01 14:11:07 UTC (rev 1179777)
@@ -4,35 +4,30 @@
 
 pkgbase=sysdig
 pkgname=(sysdig sysdig-dkms)
-pkgver=0.28.0
-pkgrel=5
+pkgver=0.29.1
+pkgrel=1
 
 # from src/sysdig-*/cmake/modules/falcosecurity-libs.cmake
-_falcover=2160111cd088aea9ae2235d3385ecb0b1ab6623c
+_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')
+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"
-        "https://github.com/falcosecurity/libs/archive/$_falcover.tar.gz"
+        "falcosecurity-libs-$_falcover.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'
+        "falcosecurity-libs-nodownload.patch")
+sha256sums=('3721c97f0da43c1a68d2962d30363525d8532ab5f2534dfefc86d175e17e423e'
+            '80903bc57b7f9c5f24298ecf1531cf66ef571681b4bd1e05f6e4db704ffb380b'
             'aaee8a0ff414a24c5d5a479229324be1667bc5eb70702838f5d617fd986f947b'
-            'b8cedef6766c691a8a92810eb459593d80070f0cf5dfc32cae2a80ec00639429'
-            '11863751dc555a2a406e5276bbafa9185f1031d6f12c4cb051ac7097e7467889')
+            'b8cedef6766c691a8a92810eb459593d80070f0cf5dfc32cae2a80ec00639429')
 
 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() {
@@ -56,7 +51,7 @@
 
 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')
+  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"

Deleted: falcosecurity-liblua-2.1.patch
===================================================================
--- falcosecurity-liblua-2.1.patch	2022-04-01 13:05:19 UTC (rev 1179776)
+++ falcosecurity-liblua-2.1.patch	2022-04-01 14:11:07 UTC (rev 1179777)
@@ -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}")