From patchwork Tue Apr 14 15:25:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 1270434 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rockwellcollins.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 491q7V4k6mz9sSq for ; Wed, 15 Apr 2020 01:25:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B07DC86BAD; Tue, 14 Apr 2020 15:25:38 +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 y1gfS3CIVEdq; Tue, 14 Apr 2020 15:25:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8E99286C02; Tue, 14 Apr 2020 15:25:36 +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 BCA071BF995 for ; Tue, 14 Apr 2020 15:25:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B20BF87A80 for ; Tue, 14 Apr 2020 15:25:31 +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 Q1Nr3LY1qDhN for ; Tue, 14 Apr 2020 15:25:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs05.rockwellcollins.com (da1vs05.rockwellcollins.com [205.175.227.130]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9BD8487834 for ; Tue, 14 Apr 2020 15:25:30 +0000 (UTC) IronPort-SDR: TUZD29OrW+/1Kx76h6iAz7bUrIrnwpHlLrXDc8cXBR0OJvI7ejLpRGwPkm6/TNxNarRImqfFZb mtChyZrYVCZ99Tnt1EPeg+3nv2jkwtELb0AC1tg6Vv4nAINplyLK41maxql/K6fNpLm2oMWr0d BbmG1RqeYBo+b0sdNRzDd7T6MZH42c6au6ZSN+ejx88lPeZPS2p0KIN8VQ8PUXa/8y+QQoVU0F WEbKzzHoYMYADsgZ7GPWBCvUIj3DoP+wWhLPy9ZHBVRMSw2DBAjLpfSK4sebwl6ZjZIc8J9QLY A2U= Received: from ofwda1n02.rockwellcollins.com (HELO dtulimr01.rockwellcollins.com) ([205.175.227.14]) by da1vs05.rockwellcollins.com with ESMTP; 14 Apr 2020 10:25:30 -0500 X-Received: from biscuits.rockwellcollins.lab (biscuits.rockwellcollins.lab [10.148.119.137]) by dtulimr01.rockwellcollins.com (Postfix) with ESMTP id B1FB1603B5; Tue, 14 Apr 2020 10:25:29 -0500 (CDT) From: Matt Weber To: buildroot@buildroot.org Date: Tue, 14 Apr 2020 10:25:23 -0500 Message-Id: <20200414152528.20758-4-matthew.weber@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200414152528.20758-1-matthew.weber@rockwellcollins.com> References: <20200414152528.20758-1-matthew.weber@rockwellcollins.com> Subject: [Buildroot] [PATCH v3 3/8] package/libsepol: bump version to 3.0 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: Matt Weber , Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Other changes: - Add policy version 32 as a default version of toolchains build with kernel headers 5.5 or later. - Add Help text for the above. Signed-off-by: Adam Duskett Signed-off-by: Matt Weber --- Changes v2 -> v3 - Matt switched over the versioning to use dates --- package/libsepol/0001-support-static-only.patch | 6 +++--- package/libsepol/Config.in | 3 ++- package/libsepol/libsepol.hash | 9 ++++----- package/libsepol/libsepol.mk | 8 +++++--- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/package/libsepol/0001-support-static-only.patch b/package/libsepol/0001-support-static-only.patch index b3eb608f7b..f7051ee03e 100644 --- a/package/libsepol/0001-support-static-only.patch +++ b/package/libsepol/0001-support-static-only.patch @@ -17,9 +17,9 @@ Signed-off-by: Fabrice Fontaine src/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -diff -durNw libsepol-2.7.orig/src/Makefile libsepol-2.7/src/Makefile ---- libsepol-2.7.orig/src/Makefile 2018-01-15 21:07:51.285183415 +0100 -+++ libsepol-2.7/src/Makefile 2018-01-15 21:08:56.515182717 +0100 +diff -durNw libsepol-2.7.orig/libsepol/src/Makefile libsepol-2.7/libsepol/src/Makefile +--- libsepol-2.7.orig/libsepol/src/Makefile 2018-01-15 21:07:51.285183415 +0100 ++++ libsepol-2.7/libsepol/src/Makefile 2018-01-15 21:08:56.515182717 +0100 @@ -39,7 +39,12 @@ LN=gln endif diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in index 21d4d7865c..52c12bf290 100644 --- a/package/libsepol/Config.in +++ b/package/libsepol/Config.in @@ -11,6 +11,7 @@ if BR2_PACKAGE_LIBSEPOL config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION int "Policy version" + default 32 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 default 31 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 default 30 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 default 29 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 @@ -27,7 +28,7 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION > 3.5 <= 3.14 28 (27 and 28 were added at the same time) > 3.14 <= 4.3 29 > 4.3 <= 4.13 30 - > 4.13 31 + > 4.13 <= 5.5 31 endif diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index 83eb63213e..b58cdb5c2a 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,4 @@ -# From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 a34b12b038d121e3e459b1cbaca3c9202e983137819c16baf63658390e3f1d5d libsepol-2.9.tar.gz - -# Hash for license file -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING +# Generated locally as upstream releases in artifact +# files under a overall YYYYMMDD dated selinux release +sha256 4cc134210d8cca6c410b7b8c91993e10c6d5b077102ed27e6976bb6d9e483f0d libsepol-20191204.tar.gz +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libsepol/COPYING diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index 62b0744aa3..6d0ef867d0 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,15 +4,17 @@ # ################################################################################ -LIBSEPOL_VERSION = 2.9 -LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315 +LIBSEPOL_VERSION = $(LIBSELINUX_VERSION) +LIBSEPOL_SITE = $(LIBSELINUX_SITE) LIBSEPOL_LICENSE = LGPL-2.1+ -LIBSEPOL_LICENSE_FILES = COPYING +LIBSEPOL_LICENSE_FILES = $(LIBSEPOL_NAME)/COPYING LIBSEPOL_INSTALL_STAGING = YES LIBSEPOL_DEPENDENCIES = host-flex HOST_LIBSEPOL_DEPENDENCIES = $(BR2_COREUTILS_HOST_DEPENDENCY) host-flex +LIBSEPOL_SUBDIR = $(@D)/$(LIBSEPOL_NAME) + LIBSEPOL_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS) ifeq ($(BR2_STATIC_LIBS),y)