summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/sysdig/0.11.0-do-not-use-private-jq-api.patch31
-rw-r--r--system/sysdig/sysdig.SlackBuild6
-rw-r--r--system/sysdig/sysdig.info6
3 files changed, 4 insertions, 39 deletions
diff --git a/system/sysdig/0.11.0-do-not-use-private-jq-api.patch b/system/sysdig/0.11.0-do-not-use-private-jq-api.patch
deleted file mode 100644
index 3b5602f13e..0000000000
--- a/system/sysdig/0.11.0-do-not-use-private-jq-api.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Only in sysdig-0.11.0.fix: build
-diff -ru sysdig-0.11.0/userspace/libsinsp/json_query.h sysdig-0.11.0.fix/userspace/libsinsp/json_query.h
---- sysdig-0.11.0/userspace/libsinsp/json_query.h 2016-07-14 10:11:40.000000000 +0200
-+++ sysdig-0.11.0.fix/userspace/libsinsp/json_query.h 2016-07-21 21:50:23.582406170 +0200
-@@ -24,17 +24,9 @@
- // jq is not C++-friendly
- extern "C"
- {
-- #include "compile.h"
- #include "jv.h"
- #include "jq.h"
- //+++ jq C++ compile fixes
-- #ifndef NDEBUG
-- # define NDEBUG
-- # include "jv_alloc.h"
-- # undef NDEBUG
-- #else
-- # include "jv_alloc.h"
-- #endif // NDEBUG
- #ifndef HAVE_MKSTEMP
- # include <stdlib.h>
- # include <fcntl.h>
-@@ -58,8 +50,6 @@
- }
- # define HAVE_MKSTEMP
- #endif // HAVE_MKSTEMP
-- //--- jq C++ compile fix
-- #include "util.h"
- }
-
- #include <string>
diff --git a/system/sysdig/sysdig.SlackBuild b/system/sysdig/sysdig.SlackBuild
index a7f9d85a77..54f65e239a 100644
--- a/system/sysdig/sysdig.SlackBuild
+++ b/system/sysdig/sysdig.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=sysdig
-VERSION=${VERSION:-0.11.0}
+VERSION=${VERSION:-0.12.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -82,10 +82,6 @@ else
sed -i '/sysdig-probe-loader/,$d' scripts/CMakeLists.txt
fi
-# Fix using jq private headers.
-# Source: https://github.com/draios/sysdig/issues/626
-patch -p1 < $CWD/0.11.0-do-not-use-private-jq-api.patch
-
mkdir build
cd build
cmake -G "Unix Makefiles" \
diff --git a/system/sysdig/sysdig.info b/system/sysdig/sysdig.info
index 44fb9111fd..5bb4ad6f6a 100644
--- a/system/sysdig/sysdig.info
+++ b/system/sysdig/sysdig.info
@@ -1,8 +1,8 @@
PRGNAM="sysdig"
-VERSION="0.11.0"
+VERSION="0.12.1"
HOMEPAGE="http://www.sysdig.org"
-DOWNLOAD="https://github.com/draios/sysdig/archive/0.11.0/sysdig-0.11.0.tar.gz"
-MD5SUM="19a42220d97d309744077c38934f9f34"
+DOWNLOAD="https://github.com/draios/sysdig/archive/0.12.1/sysdig-0.12.1.tar.gz"
+MD5SUM="ba82f255e223f3effaba84a6758ed55b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="jsoncpp lua libb64 jq"