From patchwork Tue Nov 3 07:22:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1392686 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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.a=rsa-sha256 header.s=20161025 header.b=bHN8cg86; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CQLq81hyRz9sTR for ; Tue, 3 Nov 2020 18:23:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2FA8A85F0E; Tue, 3 Nov 2020 07:23:09 +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 cSQ85Kv9i1m4; Tue, 3 Nov 2020 07:23:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 70EA085F10; Tue, 3 Nov 2020 07:23:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 2DB111BF2F5 for ; Tue, 3 Nov 2020 07:23:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 27A0A87224 for ; Tue, 3 Nov 2020 07:23:07 +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 8SAI05e8EoeE for ; Tue, 3 Nov 2020 07:23:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by hemlock.osuosl.org (Postfix) with ESMTPS id 2492387218 for ; Tue, 3 Nov 2020 07:23:06 +0000 (UTC) Received: by mail-wm1-f54.google.com with SMTP id e2so11718343wme.1 for ; Mon, 02 Nov 2020 23:23:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aHoBZybJyxsI9HNyQuQLnUrYbHwJpr4j5U/nAGFSG74=; b=bHN8cg86WCHJgKAe0HLA7MGPmxbpH39F4D2q+mG/jruZiACHbtF2UKv4kU6vGxLloj u9pFadVJ7JvhpjcasR20X3vGCzC81kP+F4mDEqaDnIOcPRVPAdzr77cCRUSNTm6IwivD J/VZydXXj5Oc7Vnxo8EF7ekVV6g2s0KTc13Til8LDkoN3AgyxmNRgmPdG04zesXLOdqN eRXf7E9dl+j+jGwQ+U0wlagNOJraykZADsuXPBOa6DoJYJwYQ1h6Xxr78+JL3DS0WVEj CHHJSGYTvriP9BOnktoaC6PP7jz32nwx0np3sg6gduZJdvNK8t+P7SHLR5gj4hRe8mk7 cTeQ== 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:mime-version :content-transfer-encoding; bh=aHoBZybJyxsI9HNyQuQLnUrYbHwJpr4j5U/nAGFSG74=; b=Xb19Nff2NmqKC4Jv7hagxuL+2oymP5VpoZlgYmrzDWsimEbNzy2EezJYPAGeSzKUsh UetxZuVLRT446rnM+ZtAUl541E0jvfKtbo5FJWSOlvhUiT/fPYsw/EvkerAsZ0n3J0/a dt9jUhy6/GxF8ONAcmF/PL/DXLkgUwkydwg/FGxT6Bpow2MzBs9wJwGYF9PW99flhzNn vZ/nlxIlSVNoUrXXqQ/Jkin367WoMMxpv/2FSpwxCyHk1WH3X0Yrsjatb4y6iLml4J2/ KS5RHMHzqSdaNrgwiUdMuZayKFB7/SAENfOz5Ax7PobRqxeTPHpLYooXCPPqIO5O9prQ bodg== X-Gm-Message-State: AOAM532CnSURSIPRQYWK2ZB4vRVI/pqLnNPgASrvtEMR4SaBlyy2Ub51 3r77EW/eYu0rdc2qzi69I7NbhfeDTv+aWQ== X-Google-Smtp-Source: ABdhPJyxxAljJ6yvriPUzssnaQ0MBiprRZiq0/6Z7RRCQuLfTWaFmw3bc/WvpcD8rbOrwR28WobY/g== X-Received: by 2002:a7b:c341:: with SMTP id l1mr2050946wmj.80.1604388184170; Mon, 02 Nov 2020 23:23:04 -0800 (PST) Received: from t450s.fritz.box (ip1f1312b9.dynamic.kabel-deutschland.de. [31.19.18.185]) by smtp.gmail.com with ESMTPSA id u81sm2047625wmb.27.2020.11.02.23.23.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 23:23:03 -0800 (PST) From: Heiko Thiery To: buildroot@buildroot.org Date: Tue, 3 Nov 2020 08:22:49 +0100 Message-Id: <20201103072249.24058-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/libcap: bump version to 2.45 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Thiery , Fabrice Fontaine , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This libcap release is now able to build on environments w/o thread support. - add PTHREADS make arg to allow building without thread support - add SHARED make arg (replace of DYNAMIC) - remove patch that function is now in upstream (SHARED) Fixes: http://autobuild.buildroot.net/results/fc1e7573327c7412dfa45b45a96966d993c7fc86/ Cc: Thomas Petazzoni CC: Fabrice Fontaine Signed-off-by: Heiko Thiery --- ...disable-building-installing-shared-l.patch | 38 ------------------- package/libcap/libcap.hash | 2 +- package/libcap/libcap.mk | 5 ++- 3 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 package/libcap/0001-libcap-Makefile-disable-building-installing-shared-l.patch diff --git a/package/libcap/0001-libcap-Makefile-disable-building-installing-shared-l.patch b/package/libcap/0001-libcap-Makefile-disable-building-installing-shared-l.patch deleted file mode 100644 index 6d49f235a9..0000000000 --- a/package/libcap/0001-libcap-Makefile-disable-building-installing-shared-l.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b7ca9dd97bbd9657c541f749ea6baf1f45b7c98a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 9 Sep 2020 22:22:18 +0200 -Subject: [PATCH] libcap/Makefile: disable building/installing shared - library when DYNAMIC is empty - -Signed-off-by: Thomas Petazzoni -[slightly manual modifications that patch still applies for libcap 2.44] -Signed-off-by: Heiko Thiery ---- - libcap/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libcap/Makefile b/libcap/Makefile -index 81b089e..dfd4dea 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -22,7 +22,7 @@ MAJLIBNAME=$(LIBNAME).$(VERSION) - MINLIBNAME=$(MAJLIBNAME).$(MINOR) - GPERF_OUTPUT = _caps_output.gperf - --all: $(MINLIBNAME) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME) -+all: $(if $(DYNAMIC),$(MINLIBNAME)) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME) - - pcs: libcap.pc libpsx.pc - -@@ -93,7 +93,7 @@ cap_test: cap_test.c libcap.h - test: cap_test - ./cap_test - --install: install-static install-shared -+install: $(if $(DYNAMIC),install-shared) install-static - - install-common: pcs - mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys --- -2.26.2 - diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index 8850da0b32..32986a41df 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 92188359cd5be86e8e5bd3f6483ac6ce582264f912398937ef763def2205c8e1 libcap-2.44.tar.xz +sha256 d66639f765c0e10557666b00f519caf0bd07a95f867dddaee131cd284fac3286 libcap-2.45.tar.xz # Hash for license file: sha256 088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index e09bc1a624..2b80a3cb7d 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.44 +LIBCAP_VERSION = 2.45 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause @@ -19,7 +19,8 @@ LIBCAP_MAKE_FLAGS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ BUILD_CC="$(HOSTCC)" \ BUILD_CFLAGS="$(HOST_CFLAGS)" \ - DYNAMIC=$(if $(BR2_STATIC_LIBS),,yes) + SHARED=$(if $(BR2_STATIC_LIBS),,yes) \ + PTHREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,) LIBCAP_MAKE_DIRS = libcap