From patchwork Tue Oct 10 19:52:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 824039 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.138; helo=whitealder.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="KiyDVYCr"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yBSSy6c4xz9t61 for ; Wed, 11 Oct 2017 06:52:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8642D88F65; Tue, 10 Oct 2017 19:52:46 +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 SXvC8uzwZXRW; Tue, 10 Oct 2017 19:52:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8096B88EBC; Tue, 10 Oct 2017 19:52:43 +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 A925C1C2B5C for ; Tue, 10 Oct 2017 19:52:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A02B288178 for ; Tue, 10 Oct 2017 19:52:39 +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 u8EroAiDhmgy for ; Tue, 10 Oct 2017 19:52:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A075388174 for ; Tue, 10 Oct 2017 19:52:38 +0000 (UTC) Received: by mail-io0-f194.google.com with SMTP id j201so35421ioj.0 for ; Tue, 10 Oct 2017 12:52:38 -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:in-reply-to:references; bh=mBoxGLOhYb7HsBrBPZH1sfINRA3CVurYUHBX9GBBJfI=; b=KiyDVYCr7CgCV940arcwUDqOpgs59C65LkqVd51H3lHW8dekFnx5tTA6jdpJ9Z4N9B t2np80Z9BwwKa5LGfIi17+j1UUYx6riADyYvtKceOMR0iv9EbSCzQ1ac9qlbJ3BqunSZ r9pa25rqeHz/lkZ8UAmeKSZuSr/F6CqqDcRivOSqGHfhxFWmLSnonfBygZOuloEpZQ67 Dy6x9dRYU64eceSECsGfSpDzjLXiH/nlKAL+NMTC2E5Pwpik8FJSdMVbSFvUk23a6EZN AaGqm1l9Yq0wqRwCKVjuWgcUi9nWCxVMCZwqU8bYV3CYvV5ZPOTnpioLqBBk0P0sO9D7 O2kA== 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:in-reply-to :references; bh=mBoxGLOhYb7HsBrBPZH1sfINRA3CVurYUHBX9GBBJfI=; b=mqw+CAQ34zVZUXk5anBiWItHfTayCQ6JC0Q5+rA7ls9oH6neNxXdH/TVc1yXR4OW1Z Mxzq9XB4vpGEzn0GGrPTgnIz37raatYNtrksBUmqPnFivhK5L3Tnj1biqKQ6+uIqLCub ezwc3Z6apKSAy3DBpLHrGL7ZaTo9pILiv7roYl+CslOO/PMmqjo9fIsqrQbsyQT2MmMH rbrphpalpeuHRUofBjQmvgAgBuofYK8Tt3ag/bXn33gszPN71+L77MjXMB7ii4uESMyH wDbKTT/O2RhdpVA9/Nod4RPtUInr21tqGxZclbCi7GsJg6OgHP1aFKUPl0S1afXv4qZy zE9g== X-Gm-Message-State: AMCzsaXEdbC70BerX6UdN7OtxeQ6wkRab02C6ZN9ooURhPwG6OClkXKk emWPiFe5IBY+f3QlKp1HIKCVF/Q5 X-Google-Smtp-Source: AOwi7QBmlXFA4e9bjdVvwKHf+Wb+bv6vlOELRqF5FI1TA1CjLM4OzcCB12+M0JqiVguUqO4Exu8SDg== X-Received: by 10.107.53.89 with SMTP id c86mr17756257ioa.34.1507665157637; Tue, 10 Oct 2017 12:52:37 -0700 (PDT) Received: from localhost.localdomain (mail.codeblue.com. [65.183.183.198]) by smtp.gmail.com with ESMTPSA id w14sm5335454iod.40.2017.10.10.12.52.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Oct 2017 12:52:36 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 10 Oct 2017 15:52:07 -0400 Message-Id: <20171010195209.24074-3-aduskett@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171010195209.24074-1-aduskett@gmail.com> References: <20171010195209.24074-1-aduskett@gmail.com> Cc: Adam Duskett Subject: [Buildroot] [PATCH v2 3/5] libsepol: bump to 2.7 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" Also refresh patches to work with new version. Signed-off-by: Adam Duskett --- Changes v1 -> v2: - None package/libsepol/0001-support-static-only.patch | 32 +++++++++++++++---------- package/libsepol/0003-revert-ln-relative.patch | 18 ++++++++++---- package/libsepol/libsepol.hash | 4 ++-- package/libsepol/libsepol.mk | 4 ++-- 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/package/libsepol/0001-support-static-only.patch b/package/libsepol/0001-support-static-only.patch index 3e6d555e96..185a5641de 100644 --- a/package/libsepol/0001-support-static-only.patch +++ b/package/libsepol/0001-support-static-only.patch @@ -1,4 +1,7 @@ -Add support for static-only build +From 2140db697c7f1da2a0a3f7bbcb14c1a0dade84e5 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Mon, 9 Oct 2017 16:28:12 -0400 +Subject: [PATCH] Add support for static-only build Instead of unconditionally building shared libraries, this patch improves the libsepol build system with a "STATIC" variable, which @@ -7,30 +10,30 @@ libraries. It allows to support cases where the target architecture does not have support for shared libraries. Signed-off-by: Thomas Petazzoni -Signed-off-by: Adam Duskett - -Index: b/src/Makefile -=================================================================== +Signed-off-by: Adam Duskett +--- + src/Makefile | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile -index db6c2ba..0006285 100644 +index 819d261..040921d 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -30,8 +30,12 @@ LOBJS += $(sort $(patsubst %.c,%.lo,$(wildcard $(CILDIR)/src/*.c) $(CIL_GENERATE - override CFLAGS += -I$(CILDIR)/include +@@ -40,7 +40,12 @@ LDFLAGS += -undefined dynamic_lookup + LN=gln endif +-all: $(LIBA) $(LIBSO) $(LIBPC) +ALL_TARGETS = $(LIBA) $(LIBPC) +ifeq ($(STATIC),) +ALL_TARGETS += $(LIBSO) +endif - --all: $(LIBA) $(LIBSO) $(LIBPC) ++ +all: $(ALL_TARGETS) - + $(LIBA): $(OBJS) -@@ -66,11 +70,13 @@ +@@ -82,11 +87,13 @@ endif install: all test -d $(LIBDIR) || install -m 755 -d $(LIBDIR) install -m 644 $(LIBA) $(LIBDIR) @@ -41,8 +44,11 @@ index db6c2ba..0006285 100644 +ifeq ($(STATIC),) + test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) + install -m 755 $(LIBSO) $(SHLIBDIR) - ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET) + $(LN) -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET) +endif relabel: /sbin/restorecon $(SHLIBDIR)/$(LIBSO) +-- +2.13.6 + diff --git a/package/libsepol/0003-revert-ln-relative.patch b/package/libsepol/0003-revert-ln-relative.patch index 0902d8d40e..488a9abea0 100644 --- a/package/libsepol/0003-revert-ln-relative.patch +++ b/package/libsepol/0003-revert-ln-relative.patch @@ -1,4 +1,7 @@ -Makefile: revert libsepol: use ln --relative to create .so symlinks +From 16b2b0e21e10727065042a1baabd1a887757c65c Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Mon, 9 Oct 2017 16:29:36 -0400 +Subject: [PATCH] Makefile: revert libsepol: use ln --relative to create .so symlinks This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998 @@ -9,16 +12,23 @@ they are maintained (up to 10 years in some cases?). For the sake of Buildroot, revert the upstream patch. Signed-off-by: "Yann E. MORIN" +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff -durN a/src/Makefile b/src/Makefile +diff --git a/src/Makefile b/src/Makefile +index 040921d..e811c9e 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -77,7 +77,7 @@ +@@ -92,7 +92,7 @@ install: all ifeq ($(STATIC),) test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) install -m 755 $(LIBSO) $(SHLIBDIR) -- ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET) +- $(LN) -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET) + cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) endif relabel: +-- +2.13.6 + diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index 6c705067a2..08e2bf97a4 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,2 +1,2 @@ -# From https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 d856d6506054f52abeaa3543ea2f2344595a3dc05d0d873ed7f724f7a16b1874 libsepol-2.6.tar.gz +# From: https://github.com/SELinuxProject/selinux/wiki/Releases +sha256 d69d3bd8ec901a3bd5adf2be2fb47fb1a685ed73066ab482e7e505371a48f9e7 libsepol-2.7.tar.gz diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 21ca419c74..c54c3bfc42 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSEPOL_VERSION = 2.6 -LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 +LIBSEPOL_VERSION = 2.7 +LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804 LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = COPYING