package/sysdig: fix missing curlbuild include
PATCH 1/1 package/sysdig: fix missing curlbuild include
curlbuild.h was removed in recent versions of curl, backporting a patch from mainline to fix sysdig until a newer version is released.
--- .../sysdig/0001-Don-t-include-curlbuild.h.patch | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/sysdig/0001-Don-t-include-curlbuild.h.patch
package/sysdig/0001-Don-t-include-curlbuild.h.patch new file +56 -0
@@ -0,0 +1,56 @@ +From 8a6670ea4b57c0e2bf8588d4534b22d1ea860989 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 f7937b6..2e4449a 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 18ac9f5..c6bfb58 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 5d00f18..76a18f0 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"/> +-- +2.7.4 +
Signature · 1 line
2.7.4
PATCH 1/1 package/sysdig: fix missing curlbuild include
Hello,
Quoted 5 lines · Angelo Compagnucci
curlbuild.hwas removed in recent versions of curl, backporting a patch from mainline to fix sysdig until a newer version is released.Signed-off-by Angelo Compagnucci <[email protected]>
Thanks a lot, looks good, except...
Quoted 12 lines
--- .../sysdig/0001-Don-t-include-curlbuild.h.patch | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/sysdig/0001-Don-t-include-curlbuild.h.patchpackage/sysdig/0001-Don-t-include-curlbuild.h.patch new file +1
-0@@ -0,0 +1,56 @@ +From 8a6670ea4b57c0e2bf8588d4534b22d1ea860989 Mon Sep 17 00:00:00 2001
package/sysdig/0001-Don-t-include-curlbuild.h.patch line 11
Quoted 10 lines
package/sysdig/0001-Don-t-include-curlbuild.h.patch new file +10
-0+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.
You must add your Signed-off-by here.
Could you resend with this fixed ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
A message that is not in the archive (sent off-list or not yet received): CA+TH9Vkr+B6-1f0QUWP98UJxbnP+c-V=htKy9byKwF8-gzzZGA@mail.gmail.com
PATCH 1/1 package/sysdig: fix missing curlbuild include
Hello,
Please keep the mailing list in Cc.
Quoted 2 lines · Angelo Compagnucci
Also if the patch is not mine? It's backported directly from the mainline source code.
Signed-off-by does not mean "I am the author of the patch", but "I am passing the patch". From the Linux kernel Submitting Patches documentation:
Developer's Certificate of Origin 1.1
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or
(b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or
(c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it.
(d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved.
then you just add a line saying::
You are in case (c), and the chain of Signed-off-by allows to trace how the code ended up in Buildroot.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com