From patchwork Fri Oct 13 02:36:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 825206 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.137; helo=fraxinus.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="JOEyjizA"; 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 3yCsKw6MSrz9sNc for ; Fri, 13 Oct 2017 13:36:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 48BAA878CC; Fri, 13 Oct 2017 02:36:35 +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 tcbYVhI0Y2N2; Fri, 13 Oct 2017 02:36:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 47B4487966; Fri, 13 Oct 2017 02:36:34 +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 522521C2630 for ; Fri, 13 Oct 2017 02:36:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4E8BB8824A for ; Fri, 13 Oct 2017 02:36:29 +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 8zuoi4+3RX-F for ; Fri, 13 Oct 2017 02:36:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by hemlock.osuosl.org (Postfix) with ESMTPS id 0E78D8789E for ; Fri, 13 Oct 2017 02:36:28 +0000 (UTC) Received: by mail-qt0-f194.google.com with SMTP id z19so4050029qtg.2 for ; Thu, 12 Oct 2017 19:36:27 -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=z5QVia9pYh5VpvipS/4KLoQlNqMUlF20sX7GsnIz/DM=; b=JOEyjizAUNdVGuXgozvgTL9ZQLDhr6Lv81JbW5dIztagXT9QJkZAk2IZRKYNO5fq/M kGO77foA7eevhKKMD9s9vfpJjwXAQ6KPczn3HRrUEll7oYNySbsqFPjk5j+S8q9iePnr XXaW0DTcdCmwLooZqXZDAnkdwf79z7wvtXtkElFO8y5sjDo6OuZOOv22Qhb+fMOoWUtw LmggfJnu7kSftUyN+WbrPi932dcBHUHHpQ/+JxtRIvMz73DBqe/laRiY9Bri66QAjA9W o6hdhsEprlqf2B6iYwjF8QUT989rdiRXBIFDotNAW+ta3AhoLT0S9Kh5xG96/L1OobuL C+Cw== 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=z5QVia9pYh5VpvipS/4KLoQlNqMUlF20sX7GsnIz/DM=; b=ZMmZCbEzSZTJfe/8/UiDVLXGzWItHboqAx7wFewZh8qSzi70nLgWG/h76iVLK+Yki0 2HeLYy+bcsf6i5CwFVaGesLxSvOYcT/ufS+eIS6RFjJNnmeZJhHZENaSMVk1oO/2KP75 nJea0vw41IfWiyNgi24UMAbzHDt0Q17PjFoX2KQsjgPQkQ5UWnyXXfmFCgzllnCspYOZ gLhpXaonN0rOHNQBf6SxKHB5XPU6Bg4/T8NdXGeiwSC+mvhd5VDRhCkDXfLCu+zpnwnw ZTmu0dEkU1pWcYfM2hwcq3XR/5oVZms1rNRKaQYa+fvpKKMuMOfzgYF3O68Wigw9G7rG dxvQ== X-Gm-Message-State: AMCzsaVnhwx9+99bQX+AF3dXrqDIRqfQW3HQVK6OyFpaqqHSXoooPAYV WWOWHD6RpYMUGiU7/HzBIMY6xMv3 X-Google-Smtp-Source: AOwi7QD/UVJD424/Plcori6/6pSvMYjlN4ZQV0LXb5kUrWow9BikmbxUG22NTtY3mpM1XmLP/1hUxw== X-Received: by 10.13.213.7 with SMTP id x7mr2960368ywd.185.1507862186905; Thu, 12 Oct 2017 19:36:26 -0700 (PDT) Received: from aduskett.duskett (2600-6c4a-767f-ff91-be5f-f4ff-feef-f9a2.dhcp6.chtrptr.net. [2600:6c4a:767f:ff91:be5f:f4ff:feef:f9a2]) by smtp.gmail.com with ESMTPSA id b129sm9419186ywe.99.2017.10.12.19.36.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Oct 2017 19:36:26 -0700 (PDT) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Thu, 12 Oct 2017 22:36:20 -0400 Message-Id: <20171013023621.4081-4-Adamduskett@outlook.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171013023621.4081-1-Adamduskett@outlook.com> References: <20171013023621.4081-1-Adamduskett@outlook.com> Cc: Adam Duskett Subject: [Buildroot] [PATCH v4 4/5] checkpolicy: 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 remove patch, as it's in this release. Signed-off-by: Adam Duskett --- Changes v1 -> v2: - None Changes v2 -> v3: - None Changes v3 -> v4: - None .../0001-checkpolicy-remove-lfl-from-LDLIBS.patch | 58 ---------------------- package/checkpolicy/checkpolicy.hash | 2 +- package/checkpolicy/checkpolicy.mk | 4 +- 3 files changed, 3 insertions(+), 61 deletions(-) delete mode 100644 package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch diff --git a/package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch b/package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch deleted file mode 100644 index c0b6de8a5a..0000000000 --- a/package/checkpolicy/0001-checkpolicy-remove-lfl-from-LDLIBS.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 4d215a1e8111e14f6074f7abe2559800b6f4838c Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Sat, 20 May 2017 11:01:08 -0400 -Subject: [PATCH] checkpolicy: remove -lfl from LDLIBSlogin - -When building checkpolicy/test, the linker reports the following error: -cc dispol.o -lfl /usr/src/selinux/DESTDIR/usr/lib/libsepol.a --L/usr/src/selinux/DESTDIR/usr/lib -o dispol -/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/../../../../lib/libfl.so: -undefined reference to `yylex' -collect2: error: ld returned 1 exit status - -According to flex documentation -(https://github.com/westes/flex/blob/master/doc/flex.texi), -lfl is used -to provide an implementation for yywrap(). However every flex file now -uses "%option noyywrap", which makes -lfl no longer mandatory. Remove -this option from checkpolicy Makefiles. - - -Backported from: -https://patchwork.kernel.org/patch/9450549/ - -Original author: Nicolas Iooss -Signed-off-by: Adam Duskett ---- - Makefile | 2 +- - test/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 53a3074..875cf00 100644 ---- a/Makefile -+++ b/Makefile -@@ -20,7 +20,7 @@ CHECKOBJS = y.tab.o lex.yy.o queue.o module_compiler.o parse_util.o \ - CHECKPOLOBJS = $(CHECKOBJS) checkpolicy.o - CHECKMODOBJS = $(CHECKOBJS) checkmodule.o - --LDLIBS=$(LIBDIR)/libsepol.a -lfl -+LDLIBS=$(LIBDIR)/libsepol.a - - GENERATED=lex.yy.c y.tab.c y.tab.h - -diff --git a/test/Makefile b/test/Makefile -index c2367e1..e7bd717 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -9,7 +9,7 @@ INCLUDEDIR ?= $(PREFIX)/include - CFLAGS ?= -g -Wall -W -Werror -O2 -pipe - override CFLAGS += -I$(INCLUDEDIR) - --LDLIBS=-lfl $(LIBDIR)/libsepol.a -L$(LIBDIR) -+LDLIBS=$(LIBDIR)/libsepol.a -L$(LIBDIR) - - all: dispol dismod - --- -2.9.3 - diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index 6208d7749c..7397393a76 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,2 +1,2 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 0bebd18688ca8027b1b3b4ff1532c0626f1fe49883ae6cb74d9d385940e74157 checkpolicy-2.6.tar.gz +sha256 5413479f1dcde866c19896b4dbfec315d822aa431606e1d03c944408984c3201 checkpolicy-2.7.tar.gz diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index f0cca593d3..c1fb43da4d 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,8 +4,8 @@ # ################################################################################ -CHECKPOLICY_VERSION = 2.6 -CHECKPOLICY_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 +CHECKPOLICY_VERSION = 2.7 +CHECKPOLICY_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804 CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = COPYING