From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-972188-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 177691396D0
for <garchives@archives.gentoo.org>; Mon, 11 Sep 2017 20:16:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6424C1FC03F;
Mon, 11 Sep 2017 20:16:14 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 36D881FC03F
for <gentoo-commits@lists.gentoo.org>; Mon, 11 Sep 2017 20:16:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id F164D3416A9
for <gentoo-commits@lists.gentoo.org>; Mon, 11 Sep 2017 20:16:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id ADB7F8E5B
for <gentoo-commits@lists.gentoo.org>; Mon, 11 Sep 2017 20:16:10 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1505160963.b22e8f9a974f682f9b35d5a54ed21fc30f8e94e6.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/sysdig/files/, dev-util/sysdig/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch dev-util/sysdig/sysdig-0.17.0-r1.ebuild dev-util/sysdig/sysdig-0.17.0.ebuild
X-VCS-Directories: dev-util/sysdig/ dev-util/sysdig/files/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: b22e8f9a974f682f9b35d5a54ed21fc30f8e94e6
X-VCS-Branch: master
Date: Mon, 11 Sep 2017 20:16:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 9aec7239-75e9-47e2-882c-ce77cb850214
X-Archives-Hash: 201ef1d662b8f6f0b42ad2927a37bd88
commit: b22e8f9a974f682f9b35d5a54ed21fc30f8e94e6
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 20:13:37 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 20:16:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22e8f9a
dev-util/sysdig: Backport net-misc/curl-7.55.0+ build fix
Closes: https://bugs.gentoo.org/627572
.../sysdig/files/sysdig-0.17.0-curlbuild.h.patch | 53 ++++++++++++++++++++++
...ysdig-0.17.0.ebuild => sysdig-0.17.0-r1.ebuild} | 8 +++-
2 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch b/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch
new file mode 100644
index 00000000000..465be572b1f
--- /dev/null
+++ b/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch
@@ -0,0 +1,53 @@
+From d15be88ccb1b7df9a0b6db2967131521b526918b Mon Sep 17 00:00:00 2001
+From: Mark Stemm <mark.stemm@gmail.com>
+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"/>
diff --git a/dev-util/sysdig/sysdig-0.17.0.ebuild b/dev-util/sysdig/sysdig-0.17.0-r1.ebuild
similarity index 91%
rename from dev-util/sysdig/sysdig-0.17.0.ebuild
rename to dev-util/sysdig/sysdig-0.17.0-r1.ebuild
index c636a7eb86d..d886e9c22e5 100644
--- a/dev-util/sysdig/sysdig-0.17.0.ebuild
+++ b/dev-util/sysdig/sysdig-0.17.0-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
sys-libs/ncurses:0=
sys-libs/zlib:0=
dev-libs/openssl:0=
- <net-misc/curl-7.55:0="
+ net-misc/curl:0="
DEPEND="${RDEPEND}
app-arch/xz-utils
virtual/os-headers"
@@ -41,6 +41,12 @@ pkg_setup() {
}
src_prepare() {
+ local PATCHES=(
+ # fix building against curl-7.55.0+
+ # https://bugs.gentoo.org/627572
+ "${FILESDIR}"/sysdig-0.17.0-curlbuild.h.patch
+ )
+
sed -i -e 's:-ggdb::' CMakeLists.txt || die
cmake-utils_src_prepare