From patchwork Sun Sep 3 08:19:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 809233 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="idOFel4v"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xlQtV4w4Sz9s7f for ; Sun, 3 Sep 2017 18:21:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 580262D392; Sun, 3 Sep 2017 08:21:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YU6aSpz9s5Fo; Sun, 3 Sep 2017 08:21:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E412626143; Sun, 3 Sep 2017 08:21:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A4F931C0964 for ; Sun, 3 Sep 2017 08:21:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9CFE126143 for ; Sun, 3 Sep 2017 08:21:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NI-X1yVGy34M for ; Sun, 3 Sep 2017 08:21:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by silver.osuosl.org (Postfix) with ESMTPS id 918DB25D7D for ; Sun, 3 Sep 2017 08:21:29 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id x189so3756567wmg.4 for ; Sun, 03 Sep 2017 01:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=0DpnQ1U+Ls1iByx9TTDNTWHy38X6EcHpBgzFKgH0N0s=; b=idOFel4vYmgya3d1pkyRxz4uf4s4v9zYVpncafPsFi8leY22Hz3C0gIX34FJveOdZb L4S97d8JO6CwaUqFfBUDTOh2zz31wpv9xjsQLgukInGb64LxYenevbz1kEskaVzs5lGg p2J2L9CgPxQobfkZaBZx8KKBjBeLYFGFuxsoWXBQGk/7gsjJ5Ask5fzbI3PIuzEk9Inl BhMz+pyzlRpENkQhtzTEiLbVXyWw0XQV7ukx9Dv8ksrJfGI3mSwDtTO6nGJOrt2S6rU6 6xnnI24haOS6ZCj+pBXfBscBh9jBtAzUKMMw5qWw3JSaoWxcL4mBq4+MI0jSTJAW/ZFs QOnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0DpnQ1U+Ls1iByx9TTDNTWHy38X6EcHpBgzFKgH0N0s=; b=tZMLI7p4+JiNvCeZNpEDrSTeU5+263iD+KgICQOfI9WKSZbFLnBbh6C11zZEnJNmSN TF8xc3W0e9OEDM0GfqDEqGuvamzTINy7Pl57DS2E4J3Eb3kMhrCsXOLL70JaHEdb4/35 JF1p9v0iGJh+Zl15gpiHzdgQcEe7tkHdDApeH7WSVSnbw8OX8x05NyuBEu9yXeOihMze 4m7hDxaLAFByJ2YCiunWw4uuG1wXfYSm/BL8S6r3xviqmCzyAmRqFEBLgE1vmg3RW2wi XJhNSWgm0EbJJPAwF75SqES6YfB/8gT0YnJ3LRbRmFDH6cLQgAi0CAr4iTYqVI4NkR/t bKCw== X-Gm-Message-State: AHPjjUi0VWTwilUN7b031XLDHL5WudK/DH0bXB1Nhq/qT9wacaqK0krF lIohaR+h/HR0SpmEfO4= X-Google-Smtp-Source: ADKCNb6OpSm1yd8XiVK/szYwKzLZ8hVYMchrM/ec7IiNjdZx0yDUvve1ZfbTpgukejn9E7o6sPhE2A== X-Received: by 10.28.147.193 with SMTP id v184mr1733269wmd.190.1504426887421; Sun, 03 Sep 2017 01:21:27 -0700 (PDT) Received: from localhost.localdomain ([151.57.142.171]) by smtp.gmail.com with ESMTPSA id p12sm3730290wrd.54.2017.09.03.01.21.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 03 Sep 2017 01:21:26 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Sun, 3 Sep 2017 10:19:20 +0200 Message-Id: <1504426760-14252-1-git-send-email-angelo.compagnucci@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH v2] package/sysdig: fix missing curlbuild include X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" curlbuild.h was removed in recent versinos of curl, backporting a patch from mainline to fix it until a newer version of sysdig is released. Signed-off-by: Angelo Compagnucci --- .../sysdig/0001-Don-t-include-curlbuild.h.patch | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 package/sysdig/0001-Don-t-include-curlbuild.h.patch diff --git a/package/sysdig/0001-Don-t-include-curlbuild.h.patch b/package/sysdig/0001-Don-t-include-curlbuild.h.patch new file mode 100644 index 0000000..5b53bb1 --- /dev/null +++ b/package/sysdig/0001-Don-t-include-curlbuild.h.patch @@ -0,0 +1,58 @@ +From 8a6670ea4b57c0e2bf8588d4534b22d1ea860989 Mon Sep 17 00:00:00 2001 +From: Mark Stemm +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. + +Signed-off-by: Angelo Compagnucci +--- + 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 @@ + + + +- + + + +-- +2.7.4 +