From patchwork Fri Sep 1 15:51:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 808751 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.133; helo=hemlock.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="qQn8V70/"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xkP156kZqz9t3P for ; Sat, 2 Sep 2017 01:53:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 355AF8A2CD; Fri, 1 Sep 2017 15:53:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N29VJssmIsJN; Fri, 1 Sep 2017 15:53:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8B9368A2CE; Fri, 1 Sep 2017 15:53:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 29E1C1C015C for ; Fri, 1 Sep 2017 15:53:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 247A78822A for ; Fri, 1 Sep 2017 15:53:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hSTUF5Dthtkh for ; Fri, 1 Sep 2017 15:53:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 557A188224 for ; Fri, 1 Sep 2017 15:53:37 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id 187so339188wmn.0 for ; Fri, 01 Sep 2017 08:53:37 -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=HpHbeeegA5N7qu0vQCDXy2GiQHAJZ4KLFclBLl4HR3k=; b=qQn8V70/tW2dTSmz71VihMGGCc1WG53R3TpiLlWTqZEUocLlMDoxr+SR75pCLi+r5j DLF/UXVUC3rcr9GuCwcAV3SJ0Wur1IY0a5PqwxOXZZ2HxE1icA4NOzLxzUzKrjZtkMUT PeP/k36qgVjswNzns+yTJ56SfH+42dS3Dyws3QbQZyjDknvK82Nbu2ef8Yg4QuyCGRdE uRyS5YaLkWaM28qa75L/aBUDrqHL56SUxrdq6qm0rRR+4dR1Pfi4pRJWVth2rmAkgBE7 rEEGd4UrwWrzUfN8mSsSXoo0Z2P/BsD4yoBrYg0KrYWz8w+eFPk+yqVz/xhRhOXiVPEb XQQg== 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=HpHbeeegA5N7qu0vQCDXy2GiQHAJZ4KLFclBLl4HR3k=; b=nr5M6UtyeFvMZBwa+9x9/S8Ba4AV+a+e9iDU0tTY8amM1CvQsPys1qrMqmI8fcW6LQ kT3dx5hC9z52vuSP33nXsgxFJlX0A/EPsJndwccgf/SgItIHSWK9m98JA2FRY8CrlcHB MdS1wvl04dtyFpe1d5ExwUZb/2h8h5T+krCzgD8YHZtY7SRV6SGuabem22fNk6Dya2Za JXoGNxW57NLGTM9DEHGIVTMob0oryO3OjMLBDVaIeMbhwbUHfouiHx4svEJCRdc4ojdi 8CckOPQk9AW24wTNZL4TDzMzBg7UfaiMbe9jhJU5v4GfUW6lLG6fojErizyW/VUL7g1R xEZw== X-Gm-Message-State: AHPjjUitC7f3n+yDlw1VnhLhSNEJ10Evzf3DVI+GwZSVWvwv23ry38Y2 E8LPinem2ipN1KsBF9Y= X-Google-Smtp-Source: ADKCNb6m10FkHgxjE+m+r2FBpHfxBuHQ9LOm4jRhjenzLR3IYl4DAVaLgKQfZPkeKihJJQES4gz30Q== X-Received: by 10.28.141.196 with SMTP id p187mr811036wmd.115.1504281215107; Fri, 01 Sep 2017 08:53:35 -0700 (PDT) Received: from localhost.localdomain ([151.47.121.69]) by smtp.gmail.com with ESMTPSA id p105sm486041wrc.64.2017.09.01.08.53.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Sep 2017 08:53:34 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Fri, 1 Sep 2017 17:51:21 +0200 Message-Id: <1504281081-11201-1-git-send-email-angelo.compagnucci@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH] 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 versions of curl, backporting a patch from mainline to fix sysdig until a newer version is released. Signed-off-by: Angelo Compagnucci --- .../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 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..ae406c0 --- /dev/null +++ b/package/sysdig/0001-Don-t-include-curlbuild.h.patch @@ -0,0 +1,56 @@ +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. +--- + 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 +