From patchwork Wed Jun 6 20:33:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 926045 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bvg9agz6"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 411L4Z3FPKz9rxs for ; Thu, 7 Jun 2018 06:34:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6D2D387B45; Wed, 6 Jun 2018 20:34:20 +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 wlbg_7n22n67; Wed, 6 Jun 2018 20:34:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 771AD87B4F; Wed, 6 Jun 2018 20:34:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0818B1C3F94 for ; Wed, 6 Jun 2018 20:34:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5B23A836CE for ; Wed, 6 Jun 2018 20:34:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BzVeFa-LP3HX for ; Wed, 6 Jun 2018 20:34:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id 64125836CC for ; Wed, 6 Jun 2018 20:34:15 +0000 (UTC) Received: by mail-wm0-f41.google.com with SMTP id e16-v6so13825941wmd.0 for ; Wed, 06 Jun 2018 13:34:15 -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=h2Zqxutb83kSwOq5P3g90FyApkYY4SJ9/+7WZfxg58M=; b=bvg9agz6iQbWBzHoV2oKCFjT8kOlEAl8yAEI3huyOgjBfXubDZOthEsZXDOc/jmzYQ vu6ebOAPuYuLvA8w5ZOsHRoUOeviroOAZOHArz1I9Yy1RAEtdGPV3vSr3wVFxZY1caqW Zkqe6Vv2TSSfm37+5gKLxSV+OylqGS3BFT5oXo/vgJTMSjrrrda0ooyPv0AXboZ+FNNi JmwClqLtrVjUOaTSSL2OUm4cgZ+viKwVPaZ4v0esnjOd+DoqSi9R5UpB3MHKA1VJwjiq o3S7FdPIgRL4EEoi+iP6HqzDQhPxONc1dK26+aImvGCbvT4CiWCQ77n3LNIwvohTAl9K TLsA== 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=h2Zqxutb83kSwOq5P3g90FyApkYY4SJ9/+7WZfxg58M=; b=FuCtEJV46u0ouCjtfs7CpdVdat7kPcnZVPZePwcauoqQxuC0+m+ZF/dgOFgYhJ+cAC eqP7lXxX0DV4DtKIukx+UpVrNcKCX0jDqIHALHSllFpgQZyFTdMgag7ZB7YpGJElI0Gu dFgAYyN1kDOAUW3X2GJlmvFQgDtgwPka+RCbuyI6+lbnPE445OYPcPCfBC8jnKJ2AIgN p8XzpoLnDFrfMt0cZnN3JaEViW3COKO4Zgjg2cndiYTM8C+DQLHC8CuecBPB1p7KuqXQ Bz/GViJou2vFlupfFNFrHVjfN6b+bWt5U3yEbog/jW3+cFgyYxjPS3TDf1rsBhP7DcCU m1ug== X-Gm-Message-State: APt69E2CBItjTY1rxDtNit7ojQPz8pZTfvgxhFjl3XsIsU+ZW4wIk6ZH WeOmmNis8rxYv0ckvdiFGZgJqg== X-Google-Smtp-Source: ADUXVKKnINuxqTdhTd6jEX5SkHw/ZqFfBqczmuvQxqo6yfc2k5o4RyDoTOvPgWcG9YUzu/OeSY5JHA== X-Received: by 2002:a1c:ec0a:: with SMTP id k10-v6mr2561766wmh.4.1528317253634; Wed, 06 Jun 2018 13:34:13 -0700 (PDT) Received: from fabrice-VirtualBox.home (ARennes-656-1-358-130.w86-214.abo.wanadoo.fr. [86.214.198.130]) by smtp.gmail.com with ESMTPSA id e2-v6sm10608141wro.97.2018.06.06.13.34.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jun 2018 13:34:12 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 6 Jun 2018 22:33:55 +0200 Message-Id: <20180606203355.17461-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] libseccomp: bump to version 2.3.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Update patch and sent it upstream - Remove LIBSECCOMP_FIXUP_M4_DIR (not needed anymore) - Add hash for license file Signed-off-by: Fabrice Fontaine --- package/libseccomp/0001-remove-static.patch | 41 +++++++++++++++++------------ package/libseccomp/libseccomp.hash | 3 ++- package/libseccomp/libseccomp.mk | 8 +----- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/package/libseccomp/0001-remove-static.patch b/package/libseccomp/0001-remove-static.patch index 6fd81f96d5..9f0ac210c7 100644 --- a/package/libseccomp/0001-remove-static.patch +++ b/package/libseccomp/0001-remove-static.patch @@ -1,24 +1,28 @@ -Do not force static link, it breaks build with -# BR2_STATIC_LIBS is not set +From 8632287cf6863b580340f846ac14adf2609abdb0 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 2 Jun 2018 13:45:22 +0200 +Subject: [PATCH] remove static + +Do not force static link of tools, it breaks build with: BR2_SHARED_LIBS=y +Patch retrieved from +https://git.buildroot.net/buildroot/tree/package/libseccomp/0001-remove-static.patch +and slighly updated to work with 2.3.3 + +[Upstream status: https://github.com/seccomp/libseccomp/pull/121] + Signed-off-by: Bernd Kuhls +Signed-off-by: Fabrice Fontaine +--- + tools/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) -diff -uNr libseccomp-2.2.0.org/tests/Makefile.am libseccomp-2.2.0/tests/Makefile.am ---- libseccomp-2.2.0.org/tests/Makefile.am 2015-02-11 21:57:11.000000000 +0100 -+++ libseccomp-2.2.0/tests/Makefile.am 2015-03-29 16:03:49.668946652 +0200 -@@ -16,7 +16,6 @@ - # along with this library; if not, see . - # - --AM_LDFLAGS = -static - LDADD = util.la ../src/libseccomp.la - - check_LTLIBRARIES = util.la -diff -uNr libseccomp-2.2.0.org/tools/Makefile.am libseccomp-2.2.0/tools/Makefile.am ---- libseccomp-2.2.0.org/tools/Makefile.am 2015-02-11 21:57:11.000000000 +0100 -+++ libseccomp-2.2.0/tools/Makefile.am 2015-03-29 16:03:46.164992302 +0200 -@@ -33,8 +33,6 @@ +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 70b4aed..ef74270 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -35,8 +35,6 @@ scmp_bpf_disasm_SOURCES = scmp_bpf_disasm.c bpf.h util.h scmp_bpf_sim_SOURCES = scmp_bpf_sim.c bpf.h util.h scmp_sys_resolver_LDADD = ../src/libseccomp.la @@ -27,3 +31,6 @@ diff -uNr libseccomp-2.2.0.org/tools/Makefile.am libseccomp-2.2.0/tools/Makefile -scmp_arch_detect_LDFLAGS = -static scmp_bpf_disasm_LDADD = util.la scmp_bpf_sim_LDADD = util.la +-- +2.14.1 + diff --git a/package/libseccomp/libseccomp.hash b/package/libseccomp/libseccomp.hash index ef390ff562..0362ce9ba4 100644 --- a/package/libseccomp/libseccomp.hash +++ b/package/libseccomp/libseccomp.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 09864282ae579c34bd5ef75ef3487200adfecaa51f5cffc7c7ad1ed2f89f5d6c libseccomp-v2.3.1.tar.gz +sha256 5a52495207f00d1254707f11226e17c16ec53f5038d65bbabf1892873fa2fe5b libseccomp-v2.3.3.tar.gz +sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b LICENSE diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk index 9a241a5513..afa2d36122 100644 --- a/package/libseccomp/libseccomp.mk +++ b/package/libseccomp/libseccomp.mk @@ -4,17 +4,11 @@ # ################################################################################ -LIBSECCOMP_VERSION = v2.3.1 +LIBSECCOMP_VERSION = v2.3.3 LIBSECCOMP_SITE = $(call github,seccomp,libseccomp,$(LIBSECCOMP_VERSION)) LIBSECCOMP_LICENSE = LGPL-2.1 LIBSECCOMP_LICENSE_FILES = LICENSE LIBSECCOMP_INSTALL_STAGING = YES LIBSECCOMP_AUTORECONF = YES -# Needed for autoreconf to work properly, see ./autogen.sh -define LIBSECCOMP_FIXUP_M4_DIR - mkdir $(@D)/m4 -endef -LIBSECCOMP_POST_EXTRACT_HOOKS += LIBSECCOMP_FIXUP_M4_DIR - $(eval $(autotools-package))