From patchwork Fri Mar 11 18:04:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 596442 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id C716D14076E for ; Sat, 12 Mar 2016 05:05:02 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=yaDHOw1/; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 106459246C; Fri, 11 Mar 2016 18:05:02 +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 PMPY0BSjW-f7; Fri, 11 Mar 2016 18:04:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9A99792486; Fri, 11 Mar 2016 18:04:56 +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 3C1521CF508 for ; Fri, 11 Mar 2016 18:04:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3421033BDD for ; Fri, 11 Mar 2016 18:04:55 +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 tqOMHXVQaZM1 for ; Fri, 11 Mar 2016 18:04:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by silver.osuosl.org (Postfix) with ESMTPS id 027FA33665 for ; Fri, 11 Mar 2016 18:04:52 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id l68so3798422wml.3 for ; Fri, 11 Mar 2016 10:04:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=PqBVJ3TDPjxcV5ge6lEa7oGisIf+03VhkPox40YG26k=; b=yaDHOw1/JhSAQCibapzD26VBpsjMtA+1JuP33bTTPQVoMTIrTECiXFQjmlLZVlnU6U 2W8/6rwDi4baWLzFDZ8YdPCr7SDrx2FwONAfxD+ZlXanEs8L7HbyV/5CT2VKMZ2vwPTO SwyiPen36SglYEta/7CczPNmNEqTvi1xtnMlkrIZnr6PuP0FJH4MYTJl/kxW7t/DcLnT wNgZx2TB938c68hmdqzQVueiH5r21ju2KjKH1Mt6YwM8J2TAcREPPRJ7XlBZ4aLUie69 izp2ceEJUaG3j6U/FTICQJAXPpV1iM7kYeRwkyLs5o9WKKa0WSgKdb5v4q868v7Fe7LT Srtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=PqBVJ3TDPjxcV5ge6lEa7oGisIf+03VhkPox40YG26k=; b=fZa4NVCtf4lIsY9oyn7qu5nRkqHIVbeX03LtbLKAKjlDu9F2RNhcZXCMw6YYbAd5/n VzdJspP5Zc0kCSTOZHAqn+81bgwr0MklX6erMCLV/DknYXIwMllXyPJzUKi+N2txNJx6 4aczdTab/lDBmpUaHWHEbMoW+TfGZLBix4a1drQ6yfdPZjaEPP4agoOaC8/1CcpTYsQI GM5wrTrWOb4ZMYkuRwjvjEEhfSYUDeyzE25RA8e+lcFaqAThDDl909AGItns8YO1ADv1 tGjgJ0duuYXVSaammxwzPCajyCvlgAcUMtADAwZSR6Ecm+YwL3g0o8Vd4PGXpgHZhxUJ chzA== X-Gm-Message-State: AD7BkJKC6oh6I2e0EAv0Jnke2rxPZKIfS/G4rk8cZBDqBN5KGM+bg32f+HRmuoewcrrnSw== X-Received: by 10.194.189.231 with SMTP id gl7mr11096768wjc.162.1457719491581; Fri, 11 Mar 2016 10:04:51 -0800 (PST) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id k124sm3351797wmb.11.2016.03.11.10.04.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Mar 2016 10:04:50 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 11 Mar 2016 19:04:46 +0100 Message-Id: <1d03ae088a9b2990e6355f69ef3de103166b2db3.1457719347.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 2/2 v2] package/libcap: bump version 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" attr is no longer a dependency, not even optional. Refresh our patches, and drop the backport from upstream. Signed-off-by: "Yann E. MORIN" Cc: Gustavo Zacarias --- Changes v1 -> v2: - drop the attr dependency, it's no longer needed (Gustavo) --- ...-build-system-fixes-for-cross-compilation.patch | 26 ++++-------- ...t-install-into-install-shared-install-sta.patch | 32 +++++++-------- ...nge-the-location-we-include-linux-xattr.h.patch | 46 ---------------------- package/libcap/libcap.hash | 2 +- package/libcap/libcap.mk | 18 +++------ 5 files changed, 29 insertions(+), 95 deletions(-) delete mode 100644 package/libcap/0003-Change-the-location-we-include-linux-xattr.h.patch diff --git a/package/libcap/0001-build-system-fixes-for-cross-compilation.patch b/package/libcap/0001-build-system-fixes-for-cross-compilation.patch index 705bbc7..de24090 100644 --- a/package/libcap/0001-build-system-fixes-for-cross-compilation.patch +++ b/package/libcap/0001-build-system-fixes-for-cross-compilation.patch @@ -1,19 +1,19 @@ -From 7f48413ef1688df0d7fc25e477f4e6c0c55edfac Mon Sep 17 00:00:00 2001 +From d8d70559a279706c206761dfaf665d2197934123 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 6 Mar 2016 22:52:02 +0100 Subject: [PATCH] build-system: fixes for cross-compilation Avoid the libcap buildsys forcing CC/CFLAGS/LDFLAGS/AR/RANLIB -Also install the shared lib +x Signed-off-by: Gustavo Zacarias +[yann.morin.1998@free.fr: dont chmod +x the shared lib] Signed-off-by: "Yann E. MORIN" diff --git a/Make.Rules b/Make.Rules -index ec1c474..8a8fc50 100644 +index 8347b26..8a07a3f 100644 --- a/Make.Rules +++ b/Make.Rules -@@ -48,25 +48,25 @@ MINOR=24 +@@ -48,26 +48,26 @@ MINOR=25 KERNEL_HEADERS := $(topdir)/libcap/include/uapi IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include @@ -37,6 +37,7 @@ index ec1c474..8a8fc50 100644 LD=$(CC) -Wl,-x -shared -LDFLAGS := #-g +LDFLAGS ?= #-g + BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) SYSTEM_HEADERS = /usr/include INCS=$(topdir)/libcap/include/sys/capability.h @@ -44,22 +45,9 @@ index ec1c474..8a8fc50 100644 CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) -PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) +PAM_CAP = no - INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) + INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) - LIBATTR := yes -diff --git a/libcap/Makefile b/libcap/Makefile -index 20ab00f..97fea3f 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -75,7 +75,7 @@ install: all - install -m 0644 include/sys/capability.h $(INCDIR)/sys - mkdir -p -m 0755 $(LIBDIR) - install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME) -- install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME) -+ install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME) - ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME) - ifeq ($(FAKEROOT),) + -- 1.9.1 diff --git a/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch b/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch index a7a9d13..a8579b7 100644 --- a/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch +++ b/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch @@ -1,4 +1,4 @@ -From 8d7339169b9a5df2082731fe5468923be4be39af Mon Sep 17 00:00:00 2001 +From af21635665ab568f3333ff9fe8b474f4950e5acb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 6 Mar 2016 22:53:24 +0100 Subject: [PATCH] libcap: split install into install-shared/install-static @@ -11,10 +11,10 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" diff --git a/libcap/Makefile b/libcap/Makefile -index 97fea3f..7ac45dd 100644 +index d189777..44ddb27 100644 --- a/libcap/Makefile +++ b/libcap/Makefile -@@ -70,19 +70,25 @@ $(MINLIBNAME): $(OBJS) +@@ -62,19 +62,25 @@ $(MINLIBNAME): $(OBJS) cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ @@ -22,24 +22,24 @@ index 97fea3f..7ac45dd 100644 +install: install-shared install-static + +install-common: - mkdir -p -m 0755 $(INCDIR)/sys - install -m 0644 include/sys/capability.h $(INCDIR)/sys -+ mkdir -p -m 0755 $(PKGCONFIGDIR) -+ install -m 0644 libcap.pc $(PKGCONFIGDIR)/libcap.pc - mkdir -p -m 0755 $(LIBDIR) + mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys + install -m 0644 include/sys/capability.h $(FAKEROOT)$(INCDIR)/sys ++ mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR) ++ install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc + -+install-static: install-common - install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME) ++install-static: $(STALIBNAME) install-common + mkdir -p -m 0755 $(FAKEROOT)$(LIBDIR) + install -m 0644 $(STALIBNAME) $(FAKEROOT)$(LIBDIR)/$(STALIBNAME) + -+install-shared: install-common - install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME) - ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME) ++install-shared: $(MINLIBNAME) install-common + install -m 0644 $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MINLIBNAME) + ln -sf $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MAJLIBNAME) + ln -sf $(MAJLIBNAME) $(FAKEROOT)$(LIBDIR)/$(LIBNAME) ifeq ($(FAKEROOT),) -/sbin/ldconfig endif -- mkdir -p -m 0755 $(PKGCONFIGDIR) -- install -m 0644 libcap.pc $(PKGCONFIGDIR)/libcap.pc +- mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR) +- install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc clean: $(LOCALCLEAN) diff --git a/package/libcap/0003-Change-the-location-we-include-linux-xattr.h.patch b/package/libcap/0003-Change-the-location-we-include-linux-xattr.h.patch deleted file mode 100644 index 7858780..0000000 --- a/package/libcap/0003-Change-the-location-we-include-linux-xattr.h.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 84fb6007dcc7f6b6da9f6dab77a487c22b6c7beb Mon Sep 17 00:00:00 2001 -From: Andrew G Morgan -Date: Sun, 9 Mar 2014 16:33:15 -0700 -Subject: [PATCH] Change the location we include linux/xattr.h - -This header stuff seems a bit fragile, but Serge reports including -it in sys/capability.h was causing a lot of trouble building dependent -app packages. - -From the perspective of libcap, this API is only needed internally in -cap_file.c so we put an include there. - -Status: upstream. - -Signed-off-by: Andrew G Morgan -Signed-off-by: Gustavo Zacarias ---- - -diff --git a/libcap/cap_file.c b/libcap/cap_file.c -index d3dc1d0..553c2d2 100644 ---- a/libcap/cap_file.c -+++ b/libcap/cap_file.c -@@ -10,6 +10,8 @@ - #include - #include - -+#include -+ - #define XATTR_SECURITY_PREFIX "security." - - #include "libcap.h" -diff --git a/libcap/include/sys/capability.h b/libcap/include/sys/capability.h -index 64ac50e..dddc75b 100644 ---- a/libcap/include/sys/capability.h -+++ b/libcap/include/sys/capability.h -@@ -27,7 +27,6 @@ extern "C" { - #define __user - #endif - #include --#include - - /* - * POSIX capability types --- -2.0.4 - diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index 75822e5..a1dcd62 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,2 +1,2 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65 libcap-2.24.tar.xz +sha256 693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162 libcap-2.25.tar.xz diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 8625139..bcb5d8c 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,23 +4,16 @@ # ################################################################################ -LIBCAP_VERSION = 2.24 +LIBCAP_VERSION = 2.25 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPLv2 or BSD-3c LIBCAP_LICENSE_FILES = License -LIBCAP_DEPENDENCIES = host-libcap +LIBCAP_DEPENDENCIES = host-libcap host-gperf LIBCAP_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_ATTR),y) -LIBCAP_DEPENDENCIES += attr -LIBCAP_HAVE_LIBATTR = yes -else -LIBCAP_HAVE_LIBATTR = no -endif - -HOST_LIBCAP_DEPENDENCIES = host-attr +HOST_LIBCAP_DEPENDENCIES = host-gperf ifeq ($(BR2_STATIC_LIBS),y) LIBCAP_MAKE_TARGET = libcap.a libcap.pc @@ -31,7 +24,6 @@ LIBCAP_MAKE_INSTALL_TARGET = install endif LIBCAP_MAKE_FLAGS = \ - LIBATTR=$(LIBCAP_HAVE_LIBATTR) \ BUILD_CC="$(HOSTCC)" \ BUILD_CFLAGS="$(HOST_CFLAGS)" @@ -67,12 +59,12 @@ endef define HOST_LIBCAP_BUILD_CMDS $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)\ - LIBATTR=yes RAISE_SETFCAP=no + RAISE_SETFCAP=no endef define HOST_LIBCAP_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \ - LIBATTR=yes RAISE_SETFCAP=no prefix=/usr lib=lib install + RAISE_SETFCAP=no prefix=/usr lib=lib install endef $(eval $(generic-package))