sysdig: update to 0.18.0.

This commit is contained in:
Leah Neukirchen 2017-09-25 12:12:02 +02:00
parent 2b2a554111
commit b69fa80b5e
2 changed files with 3 additions and 56 deletions

View File

@ -1,53 +0,0 @@
From a744139634cca0d9f62c45e42b60ae0a081a1e0a Mon Sep 17 00:00:00 2001
From: Mark Stemm <mark.stemm@sysdig.com>
Date: Wed, 16 Aug 2017 11:40:26 -0700
Subject: [PATCH] Don't include curlbuild.h (#911)
It's not required to build and it's not present with some newer versions
of libcurl, so removing it.
Thanks to https://github.com/hhoffstaette for the tip.
This fixes https://github.com/draios/sysdig/issues/895.
---
userspace/libsinsp/marathon_http.cpp | 1 -
userspace/libsinsp/mesos_http.cpp | 1 -
userspace/sysdig.project | 1 -
3 files changed, 3 deletions(-)
diff --git a/userspace/libsinsp/marathon_http.cpp b/userspace/libsinsp/marathon_http.cpp
index f7937b681..2e4449ad9 100644
--- userspace/libsinsp/marathon_http.cpp
+++ userspace/libsinsp/marathon_http.cpp
@@ -7,7 +7,6 @@
#include "marathon_http.h"
#include "curl/curl.h"
#include "curl/easy.h"
-#include "curl/curlbuild.h"
#define BUFFERSIZE 512 // b64 needs this macro
#include "b64/encode.h"
#include "sinsp.h"
diff --git a/userspace/libsinsp/mesos_http.cpp b/userspace/libsinsp/mesos_http.cpp
index 18ac9f5b5..c6bfb5810 100644
--- userspace/libsinsp/mesos_http.cpp
+++ userspace/libsinsp/mesos_http.cpp
@@ -7,7 +7,6 @@
#include "mesos_http.h"
#include "curl/curl.h"
#include "curl/easy.h"
-#include "curl/curlbuild.h"
#include "sinsp.h"
#include "sinsp_int.h"
#include "sinsp_curl.h"
diff --git a/userspace/sysdig.project b/userspace/sysdig.project
index 5d00f18f2..76a18f0a8 100644
--- userspace/sysdig.project
+++ userspace/sysdig.project
@@ -752,7 +752,6 @@
</VirtualDirectory>
<VirtualDirectory Name="include">
<VirtualDirectory Name="curl">
- <File Name="../build/release/curl-prefix/src/curl/include/curl/curlbuild.h"/>
<File Name="../build/release/curl-prefix/src/curl/include/curl/easy.h"/>
<File Name="../build/release/curl-prefix/src/curl/include/curl/stdcheaders.h"/>
<File Name="../build/release/curl-prefix/src/curl/include/curl/curlrules.h"/>

View File

@ -1,7 +1,7 @@
# Template file for 'sysdig'
pkgname=sysdig
version=0.17.0
revision=2
version=0.18.0
revision=1
build_style=cmake
configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
-DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF"
@ -17,7 +17,7 @@ license="GPL-2"
homepage="http://www.sysdig.org/"
_changelog="https://github.com/draios/sysdig/releases"
distfiles="https://github.com/draios/${pkgname}/archive/${version}.tar.gz"
checksum=f009acc32f2b15fcb0d2267bde6f6de9b3445179003c979ba61a8836abdb78f9
checksum=9caab6b4ef4a6d9f9ded8f79b1fcbe34a918c61b6f3b5a15d803f0f25e73497a
nocross=yes
disable_parallel_build=yes
only_for_archs="i686 x86_64"