| 1 |
commit: b22e8f9a974f682f9b35d5a54ed21fc30f8e94e6 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 11 20:13:37 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 11 20:16:03 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22e8f9a |
| 7 |
|
| 8 |
dev-util/sysdig: Backport net-misc/curl-7.55.0+ build fix |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/627572 |
| 11 |
|
| 12 |
.../sysdig/files/sysdig-0.17.0-curlbuild.h.patch | 53 ++++++++++++++++++++++ |
| 13 |
...ysdig-0.17.0.ebuild => sysdig-0.17.0-r1.ebuild} | 8 +++- |
| 14 |
2 files changed, 60 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
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 |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..465be572b1f |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch |
| 21 |
@@ -0,0 +1,53 @@ |
| 22 |
+From d15be88ccb1b7df9a0b6db2967131521b526918b Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Mark Stemm <mark.stemm@×××××.com> |
| 24 |
+Date: Tue, 15 Aug 2017 17:49:53 -0700 |
| 25 |
+Subject: [PATCH] Don't include curlbuild.h |
| 26 |
+ |
| 27 |
+It's not required to build and it's not present with some newer versions |
| 28 |
+of libcurl, so removing it. |
| 29 |
+ |
| 30 |
+Thanks to https://github.com/hhoffstaette for the tip. |
| 31 |
+ |
| 32 |
+This fixes https://github.com/draios/sysdig/issues/895. |
| 33 |
+--- |
| 34 |
+ userspace/libsinsp/marathon_http.cpp | 1 - |
| 35 |
+ userspace/libsinsp/mesos_http.cpp | 1 - |
| 36 |
+ userspace/sysdig.project | 1 - |
| 37 |
+ 3 files changed, 3 deletions(-) |
| 38 |
+ |
| 39 |
+diff --git a/userspace/libsinsp/marathon_http.cpp b/userspace/libsinsp/marathon_http.cpp |
| 40 |
+index f7937b681..2e4449ad9 100644 |
| 41 |
+--- a/userspace/libsinsp/marathon_http.cpp |
| 42 |
++++ b/userspace/libsinsp/marathon_http.cpp |
| 43 |
+@@ -7,7 +7,6 @@ |
| 44 |
+ #include "marathon_http.h" |
| 45 |
+ #include "curl/curl.h" |
| 46 |
+ #include "curl/easy.h" |
| 47 |
+-#include "curl/curlbuild.h" |
| 48 |
+ #define BUFFERSIZE 512 // b64 needs this macro |
| 49 |
+ #include "b64/encode.h" |
| 50 |
+ #include "sinsp.h" |
| 51 |
+diff --git a/userspace/libsinsp/mesos_http.cpp b/userspace/libsinsp/mesos_http.cpp |
| 52 |
+index 18ac9f5b5..c6bfb5810 100644 |
| 53 |
+--- a/userspace/libsinsp/mesos_http.cpp |
| 54 |
++++ b/userspace/libsinsp/mesos_http.cpp |
| 55 |
+@@ -7,7 +7,6 @@ |
| 56 |
+ #include "mesos_http.h" |
| 57 |
+ #include "curl/curl.h" |
| 58 |
+ #include "curl/easy.h" |
| 59 |
+-#include "curl/curlbuild.h" |
| 60 |
+ #include "sinsp.h" |
| 61 |
+ #include "sinsp_int.h" |
| 62 |
+ #include "sinsp_curl.h" |
| 63 |
+diff --git a/userspace/sysdig.project b/userspace/sysdig.project |
| 64 |
+index 5d00f18f2..76a18f0a8 100644 |
| 65 |
+--- a/userspace/sysdig.project |
| 66 |
++++ b/userspace/sysdig.project |
| 67 |
+@@ -752,7 +752,6 @@ |
| 68 |
+ </VirtualDirectory> |
| 69 |
+ <VirtualDirectory Name="include"> |
| 70 |
+ <VirtualDirectory Name="curl"> |
| 71 |
+- <File Name="../build/release/curl-prefix/src/curl/include/curl/curlbuild.h"/> |
| 72 |
+ <File Name="../build/release/curl-prefix/src/curl/include/curl/easy.h"/> |
| 73 |
+ <File Name="../build/release/curl-prefix/src/curl/include/curl/stdcheaders.h"/> |
| 74 |
+ <File Name="../build/release/curl-prefix/src/curl/include/curl/curlrules.h"/> |
| 75 |
|
| 76 |
diff --git a/dev-util/sysdig/sysdig-0.17.0.ebuild b/dev-util/sysdig/sysdig-0.17.0-r1.ebuild |
| 77 |
similarity index 91% |
| 78 |
rename from dev-util/sysdig/sysdig-0.17.0.ebuild |
| 79 |
rename to dev-util/sysdig/sysdig-0.17.0-r1.ebuild |
| 80 |
index c636a7eb86d..d886e9c22e5 100644 |
| 81 |
--- a/dev-util/sysdig/sysdig-0.17.0.ebuild |
| 82 |
+++ b/dev-util/sysdig/sysdig-0.17.0-r1.ebuild |
| 83 |
@@ -24,7 +24,7 @@ RDEPEND=" |
| 84 |
sys-libs/ncurses:0= |
| 85 |
sys-libs/zlib:0= |
| 86 |
dev-libs/openssl:0= |
| 87 |
- <net-misc/curl-7.55:0=" |
| 88 |
+ net-misc/curl:0=" |
| 89 |
DEPEND="${RDEPEND} |
| 90 |
app-arch/xz-utils |
| 91 |
virtual/os-headers" |
| 92 |
@@ -41,6 +41,12 @@ pkg_setup() { |
| 93 |
} |
| 94 |
|
| 95 |
src_prepare() { |
| 96 |
+ local PATCHES=( |
| 97 |
+ # fix building against curl-7.55.0+ |
| 98 |
+ # https://bugs.gentoo.org/627572 |
| 99 |
+ "${FILESDIR}"/sysdig-0.17.0-curlbuild.h.patch |
| 100 |
+ ) |
| 101 |
+ |
| 102 |
sed -i -e 's:-ggdb::' CMakeLists.txt || die |
| 103 |
|
| 104 |
cmake-utils_src_prepare |
Archives