Hello community, here is the log from the commit of package sysdig for openSUSE:Factory checked in at 2017-09-05 15:19:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysdig (Old) and /work/SRC/openSUSE:Factory/.sysdig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysdig" Tue Sep 5 15:19:50 2017 rev:16 rq:521023 version:0.17.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sysdig/sysdig.changes 2017-08-01 09:26:11.544821649 +0200 +++ /work/SRC/openSUSE:Factory/.sysdig.new/sysdig.changes 2017-09-05 15:19:51.758083590 +0200 @@ -1,0 +2,6 @@ +Tue Sep 5 08:17:42 UTC 2017 - [email protected] + +- Fix building with recent curl (gh#draios/sysdig#895): + * sysdig-curlbuild.patch + +------------------------------------------------------------------- New: ---- sysdig-curlbuild.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysdig.spec ++++++ --- /var/tmp/diff_new_pack.vxlmzH/_old 2017-09-05 15:19:52.833932364 +0200 +++ /var/tmp/diff_new_pack.vxlmzH/_new 2017-09-05 15:19:52.837931802 +0200 @@ -24,6 +24,8 @@ Group: System/Monitoring Url: http://www.sysdig.org/ Source0: https://github.com/draios/%{name}/archive/%{version}/sysdig-%{version}.tar.gz +# PATCH-FIX-UPSTREAM gsysdig-curlbuild.patch gh#draios/sysdig#895 +Patch0: sysdig-curlbuild.patch BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: cmake BuildRequires: fdupes @@ -49,6 +51,7 @@ %prep %setup -q +%patch0 -p1 %build export SYSDIG_CHISEL_DIR=%{_datadir}%{name}/chisels ++++++ sysdig-curlbuild.patch ++++++ >From d15be88ccb1b7df9a0b6db2967131521b526918b Mon Sep 17 00:00:00 2001 From: Mark Stemm <[email protected]> Date: Tue, 15 Aug 2017 17:49:53 -0700 Subject: [PATCH] Don't include curlbuild.h 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 --- a/userspace/libsinsp/marathon_http.cpp +++ b/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 --- a/userspace/libsinsp/mesos_http.cpp +++ b/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 --- a/userspace/sysdig.project +++ b/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"/>
