From patchwork Mon Oct 9 22:27:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 823560 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.133; helo=hemlock.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="tVPsX1pN"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y9vy76nJKz9sBZ for ; Tue, 10 Oct 2017 09:27:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8952E87E37; Mon, 9 Oct 2017 22:27:41 +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 3VIUmCdHs682; Mon, 9 Oct 2017 22:27:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9017C87F30; Mon, 9 Oct 2017 22:27:38 +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 86A031C024B for ; Mon, 9 Oct 2017 22:27:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 81AE82CAA5 for ; Mon, 9 Oct 2017 22:27:37 +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 H3D+ayJ24yxN for ; Mon, 9 Oct 2017 22:27:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by silver.osuosl.org (Postfix) with ESMTPS id 3C41B273A1 for ; Mon, 9 Oct 2017 22:27:36 +0000 (UTC) Received: by mail-qt0-f195.google.com with SMTP id 24so2757870qts.3 for ; Mon, 09 Oct 2017 15:27:36 -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; bh=hIz25vqzSekM30cVIuxY/ESzEcwR5zguQiw7uK1QTMA=; b=tVPsX1pNXVcm+yWGe2o8goIVB5ZzjWHBXOvshC7FT2seHmmMJx82pV+fbghbiborKd e8Vr96tEXkTiSt5e4bZ60sXaU0VEvTua8TKt3rAaKZMyIFMAFPkBwPlpp/Eu9w5fWOMq zO7lK2E5Bm7GaAc3gdj1xF5eVAR5SW88v2xpbVbmIFhu3HlPxGWWOvUKs/wopNKsDC7Q b8lYZoJXZ3jybmE2lHSRDhRIWhhgg6eekLzJCCU87jsBSH7KXQfSx4yShFqtZhSN7lgp Lkz/ISJHTtC4qkHcma4FcqkK/TXm7Dcd7QamjPbb4RY6KNvhselxERanI216ZC1g0Phj tPGA== 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; bh=hIz25vqzSekM30cVIuxY/ESzEcwR5zguQiw7uK1QTMA=; b=tXyWaw97mVLCsZ6CfW/5Upt2/MgoFwPKCbmR3F8E2IL01YwtTt5CmzL18mbQAwCSwm yv2e+d2iiB4Z6xQ2Zh1XrzROnbABxPhz0AxKyZ56c9oLAKdNYSv4aiVGmgT4cxb6b+za 7H3YsVSRbfmes73/APb5KNeFS9HLSU1Fl8/7a9lqMXAfEyBTjUu6B7BFt29QKAVRNc5j 98Jjswroi4V7OyE6yxGF7HwbEEr9SKuHUiHa/rqyIDYvnv5TCFVCbQlEob+uq/4A2iCB P5+GrcXNKv/PEJrIWa9vsQdMm4zv0aIRVUdmnwbc5D0ZKbaJdoSCWAezik2BDQykEgUZ oNyQ== X-Gm-Message-State: AMCzsaWVwCg7CYu85NkguaKnrfhdlO7/ijuuIIC3v1xtKcFwn04dE6K6 thQOH/cvm+Ewnq4OI9WKNGTJFVNV X-Google-Smtp-Source: AOwi7QCASsszfYC53a7OrX/HiGZ4le0L27vRMpBmq/0RWl93Zcf8XwSnIzKPZJzCf7z3Rs8ifQSKBQ== X-Received: by 10.37.35.137 with SMTP id j131mr826248ybj.287.1507588054913; Mon, 09 Oct 2017 15:27:34 -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 o126sm3589115ywb.8.2017.10.09.15.27.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2017 15:27:34 -0700 (PDT) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Mon, 9 Oct 2017 18:27:24 -0400 Message-Id: <20171009222731.15119-1-Adamduskett@outlook.com> X-Mailer: git-send-email 2.13.6 Cc: Adam Duskett Subject: [Buildroot] [PATCH 1/8] libselinux: 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" remove patch as it's in this release. Signed-off-by: Adam Duskett --- ...src-regex.c-support-old-compilers-for-the.patch | 47 ---------------------- package/libselinux/libselinux.hash | 4 +- package/libselinux/libselinux.mk | 4 +- 3 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 package/libselinux/0001-libselinux-src-regex.c-support-old-compilers-for-the.patch diff --git a/package/libselinux/0001-libselinux-src-regex.c-support-old-compilers-for-the.patch b/package/libselinux/0001-libselinux-src-regex.c-support-old-compilers-for-the.patch deleted file mode 100644 index 3bda607512..0000000000 --- a/package/libselinux/0001-libselinux-src-regex.c-support-old-compilers-for-the.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e0803c0bdbb1abf06b6b5bb1b52fdb733505b8f7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 25 Jan 2017 22:41:02 +1300 -Subject: [PATCH] src/regex.c: support old compilers for the endian - check - -libselinux 2.6 has added some code in regex.c that uses __BYTE_ORDER__ -to determine the system endianness. Unfortunately, this definition -provided directly by the compiler doesn't exist in older gcc versions -such as gcc 4.4. - -In order to address this, this commit extends the logic to use - definitions if __BYTE_ORDER__ is not provided by the -compiler. This allows libselinux to build properly with gcc 4.4. - -Signed-off-by: Thomas Petazzoni ---- - src/regex.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/regex.c b/src/regex.c -index a3b427b..0c5ad27 100644 ---- a/src/regex.c -+++ b/src/regex.c -@@ -13,7 +13,18 @@ - #endif - - #ifndef __BYTE_ORDER__ --#error __BYTE_ORDER__ not defined. Unable to determine endianness. -+ -+/* If the compiler doesn't define __BYTE_ORDER__, try to use the C -+ * library header definitions. */ -+#include -+#ifndef __BYTE_ORDER -+#error Neither __BYTE_ORDER__ nor __BYTE_ORDER defined. Unable to determine endianness. -+#endif -+ -+#define __ORDER_LITTLE_ENDIAN __LITTLE_ENDIAN -+#define __ORDER_BIG_ENDIAN __BIG_ENDIAN -+#define __BYTE_ORDER__ __BYTE_ORDER -+ - #endif - - #ifdef USE_PCRE2 --- -2.7.4 - diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index 76130b2dc0..3c60d5111d 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,2 +1,2 @@ -# Locally computed -sha256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a libselinux-2.6.tar.gz +# From: https://github.com/SELinuxProject/selinux/wiki/Releases +sha256 d0fec0769b3ad60aa7baf9b9a4b7a056827769dc2dadda0dc0eb59b3d1c18c57 libselinux-2.7.tar.gz diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index f23eea4962..8ac8000de5 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSELINUX_VERSION = 2.6 -LIBSELINUX_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 +LIBSELINUX_VERSION = 2.7 +LIBSELINUX_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804 LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE From patchwork Mon Oct 9 22:27:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 823561 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="HbsOTcZL"; 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 3y9vyC3jJ4z9sBZ for ; Tue, 10 Oct 2017 09:27:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id ED4C487169; Mon, 9 Oct 2017 22:27:42 +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 kCuyozwP-Hnd; Mon, 9 Oct 2017 22:27:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id F2B1587070; Mon, 9 Oct 2017 22:27:40 +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 559F81C024B for ; Mon, 9 Oct 2017 22:27:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4A26E87F30 for ; Mon, 9 Oct 2017 22:27:38 +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 Zzzj+dbi-L7k for ; Mon, 9 Oct 2017 22:27:37 +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 261C187E37 for ; Mon, 9 Oct 2017 22:27:37 +0000 (UTC) Received: by mail-qt0-f194.google.com with SMTP id y45so4301810qty.1 for ; Mon, 09 Oct 2017 15:27:37 -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=x+jR2ejHdDAShBh76GtGd59D5R3XXDqCIFvtwnMdL/Y=; b=HbsOTcZLNN4S8awbF35nTf+mE6UKMr85YZ07HjxFcST0mRPlZ+Eq3Vi5UUcrHsDL0K GIS2pjzInTPnmBMCVxwqxWH4A+/L5L+eLCzxGfVjrHYJaatMFC472dAYPH6PQk1LR96P JYnmJMD0PHXvYw0LOqM91vdtE1pRzyvLZI/OOAnKbkvnasKRGjM3HrdYXf9RyCoGHZna bvQIw/jQ6pK64HcTxFx0CHOZOd6mftjEJIMGTfE4LPA0SZ0uW/G0egaS5S32TRVLTIf7 9RBHaAW7lUPpqtKKUH/vFm+eEdwJsW85KO9KFKf9U83L26Z319Ni92ZpGSXmocWFUWU5 6dkQ== 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=x+jR2ejHdDAShBh76GtGd59D5R3XXDqCIFvtwnMdL/Y=; b=J/HRlDJj0XOkJmS7comFbJl5nxZj8co5yckKXtVCrqpPq2g4upq2Tz9q62P0p89rcR QRBAOUmQ0GDZMEjhcbTyZHREfiP0weOjAXFef+t2gvfRIT9pIvXJvszt0HwAyD1z5Bjf YfA8jx7p8rFjN3lQzLsoIhpE/LLuyJFyhExUTpjZr8HNceU6lmP3ggLpOo0Tks0GWkKg b24yAQitoLV3rFIKc1AKP2zebBPx37+MXLV4GhPZuqP5szUUaggshZxrCA5LMtx4C8mQ 1rY0elpUxh4ztGNiQldGaN90pcoYxATO9CxV54TKYi5ML6Qru0YS1oQY2di18NYovFq6 EMOg== X-Gm-Message-State: AMCzsaWnGnCKPxD1Ni4SKOgFU8qmTlqXsGR6Q4ep3o05HghunC72xvr2 8XmgBOF3YChev9Cg9ECDMUAR5Ahn X-Google-Smtp-Source: AOwi7QBF0/IdtZ3OzNtxhJ+eSPKp181ue+M8PQSdElL8nnjIox8LO4v4g5S+7QTwOWzPIWoCwf/q/A== X-Received: by 10.37.204.14 with SMTP id l14mr825065ybf.447.1507588055950; Mon, 09 Oct 2017 15:27:35 -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 o126sm3589115ywb.8.2017.10.09.15.27.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2017 15:27:35 -0700 (PDT) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Mon, 9 Oct 2017 18:27:25 -0400 Message-Id: <20171009222731.15119-2-Adamduskett@outlook.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171009222731.15119-1-Adamduskett@outlook.com> References: <20171009222731.15119-1-Adamduskett@outlook.com> Cc: Adam Duskett Subject: [Buildroot] [PATCH 2/8] libsemanage: 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" Signed-off-by: Adam Duskett --- package/libsemanage/libsemanage.hash | 4 ++-- package/libsemanage/libsemanage.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 62f4d833a5..c386571591 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,2 +1,2 @@ -# Locally computed -sha256 4f81541047290b751f2ffb926fcd381c186f22db18d9fe671b0b4a6a54e8cfce libsemanage-2.6.tar.gz +# From: https://github.com/SELinuxProject/selinux/wiki/Releases +sha256 07e9477714ce6a4557a1fe924ea4cb06501b62d0fa0e3c0dc32a2cf47cb8d476 libsemanage-2.7.tar.gz diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index 2964c56f96..829409f527 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 2.6 -LIBSEMANAGE_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 +LIBSEMANAGE_VERSION = 2.7 +LIBSEMANAGE_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804 LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux ustr bzip2 From patchwork Mon Oct 9 22:27:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 823562 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="RV7o/fzf"; 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 3y9vyD2Nn9z9t5R for ; Tue, 10 Oct 2017 09:27:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 61B0388682; Mon, 9 Oct 2017 22:27:44 +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 TKuS96x4rbgs; Mon, 9 Oct 2017 22:27:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1055587B3B; Mon, 9 Oct 2017 22:27:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 18DB11C024B for ; Mon, 9 Oct 2017 22:27:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 13D2C87B3B for ; Mon, 9 Oct 2017 22:27:39 +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 e3hlyxvN2StO for ; Mon, 9 Oct 2017 22:27:38 +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 whitealder.osuosl.org (Postfix) with ESMTPS id 2CE11876D3 for ; Mon, 9 Oct 2017 22:27:38 +0000 (UTC) Received: by mail-qt0-f194.google.com with SMTP id x54so13889779qth.0 for ; Mon, 09 Oct 2017 15:27: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=mb+IA5o19CvwIZX+OAxsicB3Rf8WHDt2+s+73POw6Kw=; b=RV7o/fzf3pj2xq3Is95gVT1l3qjG3w3t46FCg8PmpM2yRL71eBMFg4V5GdDGtASNTl 4ouu/EAuH0kDIxTjPRoU3EK2jbkOOBAlOOXLUYo2Ne217ZWAiNJysgnnuqOP1qNwIJxf Z3KNhGNJEeNaDNfTMQtH2OJBRkHbfXgHOO0yRQ2k8eSBcOz2M8i2qxxC1GW+1T4AF+Oj NOWYyQaDQjwAh8pE/9QTw8wPgzCtwc/XK6OuXKtvgwPX6LkMX+LfLySCvQRqh9tclcWJ LbCWULKGn0wK18q4GOZPwB22LcphOmu7wuKvHD7VyX6qvzrf5fx07gvP+KKv3MpUzobN 78Mg== 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=mb+IA5o19CvwIZX+OAxsicB3Rf8WHDt2+s+73POw6Kw=; b=CA7KUcbUflJUHvVgqtDgQT1eZKsKkj7t7KzQZlmCFXo9MZYucCGGughwgcM9UUBxnE czJZDV+RerFuZzaTASsvGUUmJkDCprAWvJZzgFVNXnfXtV5JyOkJ1CJOr5fcDeNuKosx Pjr4RWRMEZ1G9O+wXMfS2lUspkuwi+WwyPpjmyQRwvdJ/wJU5oyB/FCfwkvpEd6XUhie 6TSrdfAq2JwT+zvobhvrsmPBg5kQeSUkPzETLfS1mpl61QlX5zFZ7+c6hlDyMoKcl2tc SEaiWl/jRto4HApNF5TX8KAO9HemTP0LifUt/85CjgMPwudoIyZqYL4tXQ4khDgXOlUq YVQA== X-Gm-Message-State: AMCzsaW7xAEwuo5ux9Xj/5X2NOnRSp5hjHCxm4w0iU9JQ1HwuU7UJcVs FD8K5aN2OKT7j0bzvp3aNjpidh8I X-Google-Smtp-Source: AOwi7QBBEQ+wbV+l5PJsKxMXDg6SFabqUZ0A6Shdle2v3zgo/0HM5fn5u10NPEzTCq2351hvdxQYxg== X-Received: by 10.37.178.30 with SMTP id i30mr849426ybj.284.1507588056883; Mon, 09 Oct 2017 15:27:36 -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 o126sm3589115ywb.8.2017.10.09.15.27.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2017 15:27:36 -0700 (PDT) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Mon, 9 Oct 2017 18:27:26 -0400 Message-Id: <20171009222731.15119-3-Adamduskett@outlook.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171009222731.15119-1-Adamduskett@outlook.com> References: <20171009222731.15119-1-Adamduskett@outlook.com> Cc: Adam Duskett Subject: [Buildroot] [PATCH 3/8] 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 --- 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 From patchwork Mon Oct 9 22:27:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 823565 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="CpGagAKs"; 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 3y9vyK65hnz9t5R for ; Tue, 10 Oct 2017 09:27:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E008B8867A; Mon, 9 Oct 2017 22:27:49 +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 1yIEz4cpD5wP; Mon, 9 Oct 2017 22:27:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id EDF6088505; Mon, 9 Oct 2017 22:27:42 +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 6F27A1C024B for ; Mon, 9 Oct 2017 22:27:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6117D2CAA5 for ; Mon, 9 Oct 2017 22:27:40 +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 6yPEw1GJ6lQz for ; Mon, 9 Oct 2017 22:27:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by silver.osuosl.org (Postfix) with ESMTPS id 713CD273A1 for ; Mon, 9 Oct 2017 22:27:39 +0000 (UTC) Received: by mail-qt0-f195.google.com with SMTP id k31so4093622qta.5 for ; Mon, 09 Oct 2017 15:27:39 -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=U4yoQ+dQDs3KTGsT6lZhr3mZcFfjRUdLRJIxhhdLhig=; b=CpGagAKsaJQkD3fOuxAaMXm4RxU673n3mU+HDeGKgMfM2U90CVGOEc0rbG8Cs5gjVo mvFVBY3xo1Q1f42xPo1kE22YUHOaa0yvfq1bx+R8xQRn/cpKVlhyVSGHdzZApGY4wU20 lLqub/NASrK3CPGGeTbOycjR74+diLvUJpHiPHTANK+KheJjacLe0xieaoS0DNJJC+EI mQeXOOPxvtzIxmYRZa2Hi4lnyj1KRJU3lozxK6yYmu2HKJVFeN7m2mJAwS1pXr12LIkY 1Kwr7ZcAzwuS7Z2j8x9i8zVVblfo0YhOY83C8wbm4zsCGlj1AkuowMUJQChwvwlQnqg5 bqnw== 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=U4yoQ+dQDs3KTGsT6lZhr3mZcFfjRUdLRJIxhhdLhig=; b=q2viFSvExGMN6eQVewzIOrs1tjib/uZMrAp4PmrYrVnkyePiVLf7xUXdCZpj6o5rzK 4oQvtO4qMLXwhMGnlHP6GiTviT9Q+fCnamr7GABCcJzOEJP49jLp5wcG8Eb7gUbNkBbH iIC81JS00uonmhcf2sm4p5vn/Sbq0IWKk4p8szEyPv0RwQa8ezQgFehBqw3j/l+eFCQS 6HpwwQSP5Oyecq5Rl7vU86+YllB2yhwbJOwot3ylq38yg/AnPbIWiScNUzaAx6Fpfb1+ oiGzFflrffxWI0P5rizTJEpHo5DTLGOsnbni8zKATNBY93yrhAljZ8q5snkqv5il7F1p UugA== X-Gm-Message-State: AMCzsaXMh5faPJrmj+N/70w7ro+MrGbN9iO1JJdGlAvgFPmYHpAN1h8F zxocqB2qPUuD+Nt1c+w+/sT/SnvF X-Google-Smtp-Source: AOwi7QBgGRV5FW5P+Gdi3D09uLuelnzoKUzwiBPfLuv3Ha7Eu4gV3UaGOs9nHLIUbW4f29VGr8Qe7g== X-Received: by 10.37.83.66 with SMTP id h63mr808146ybb.397.1507588057871; Mon, 09 Oct 2017 15:27:37 -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 o126sm3589115ywb.8.2017.10.09.15.27.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2017 15:27:37 -0700 (PDT) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Mon, 9 Oct 2017 18:27:27 -0400 Message-Id: <20171009222731.15119-4-Adamduskett@outlook.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171009222731.15119-1-Adamduskett@outlook.com> References: <20171009222731.15119-1-Adamduskett@outlook.com> Cc: Adam Duskett Subject: [Buildroot] [PATCH 4/8] 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 --- .../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 From patchwork Mon Oct 9 22:27:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 823564 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="Pu8MEI98"; 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 3y9vyJ6887z9sBZ for ; Tue, 10 Oct 2017 09:27:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6270E87070; Mon, 9 Oct 2017 22:27:50 +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 mbaEtkXr5AXY; Mon, 9 Oct 2017 22:27:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id F4003870D2; Mon, 9 Oct 2017 22:27:47 +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 42E1F1C024B for ; Mon, 9 Oct 2017 22:27:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3D7BF2CAA5 for ; Mon, 9 Oct 2017 22:27:42 +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 5v+kiJEbmn2I for ; Mon, 9 Oct 2017 22:27:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by silver.osuosl.org (Postfix) with ESMTPS id 7E6ED273A1 for ; Mon, 9 Oct 2017 22:27:40 +0000 (UTC) Received: by mail-qt0-f195.google.com with SMTP id x54so13889899qth.0 for ; Mon, 09 Oct 2017 15:27:40 -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=P/tThgq8vkmbNNixv/jvpU2kmoWzOrThiD6xWEAWtJ4=; b=Pu8MEI986VaJC0p/2IlgE53J4Gm7e6ajnl3ZjvrSeVjhvXqr84em9bll4866k8XOW7 qOyBz7z/GpX4HQIvu7zj0LLyMLotv4kchdHdxg1/F3pFCNxNDS8FLwY1NSawXxdaNChP kl8SWzMBcXDfZy+P09r3mppqo15dXPUiiUAeqM89HxwZMm97xSaEHc4GMrnMSbnUEr9Z +y9eOyGdDZ+B7jrg2mE0Bu0Jk6f+ag8s81ucNiO08LJgHUZTEFdrzprHE5tbmufCIqdf AGMXBBoR+7KQky26p+t1I5Chtud+HYzayaLN+SIm1soCF4fgZsrDl16b5tRSGLgom8p1 d28A== 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=P/tThgq8vkmbNNixv/jvpU2kmoWzOrThiD6xWEAWtJ4=; b=GSYJ8ujBLdEV2Q0ybtRexasAcjmhh5A0OfkeauSjV71fNJYB2UM3t1ZZRCoNO5s5Vq zl69bvOog5ODi+WQ8A3CzBVIXzmJIe+panbP2X+yk36cYpWrx1XVuYO/pTwMCkNTCvkA qkGsTKs5xuuTF8jUGJOC4ta5aXTIh/PzLJmRpimQvNTAqcc/Ljc+OjOeS9HWzsGdzgEX 48fuN9st7FE4KhnWHBNvpUnBFEctNK63CqsyRYr5eVB8EnmLQ2IBfDKoxMF3cx7VTd3H XtmtF8j+/rlnwOXa5aZKEjhPHc+2KaL+GOcfBlHtUyL2AUj58ool5LLTWCD0lb4h8u4K lnJQ== X-Gm-Message-State: AMCzsaU7kEA0FU19EZ1Bo/SNBiz45ljJklWDSnIxbA/sCpiLJc1HuqQG pawt81JQ3Esb9MfRrU+DjpGyLzb0 X-Google-Smtp-Source: AOwi7QBxiIbGS6KaQ8/LDQHrgO2+v2PQ32DfD8wssQE8f9h+qI4D9DzVmS9GLy8wcdgdprQh+8yuoQ== X-Received: by 10.13.251.3 with SMTP id l3mr802515ywf.371.1507588058893; Mon, 09 Oct 2017 15:27:38 -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 o126sm3589115ywb.8.2017.10.09.15.27.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2017 15:27:38 -0700 (PDT) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Mon, 9 Oct 2017 18:27:28 -0400 Message-Id: <20171009222731.15119-5-Adamduskett@outlook.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171009222731.15119-1-Adamduskett@outlook.com> References: <20171009222731.15119-1-Adamduskett@outlook.com> Cc: Adam Duskett Subject: [Buildroot] [PATCH 5/8] policycoreutils: 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" Policycoreutils was broken up into several packages, as such several changes needed to happen for this patch to work: - Remove patches 3, 4, and 5 as they no longer apply. - Refresh patches 1 and 2 to work with version 2.7 - Remove semodule_${deps,expand,link,package} and sestatus from the makedirs in the mk file. - Remove restorecond from the make and config file. (Seperate package) - Remove Audit2allow from the make and config file. (In a different package) Signed-off-by: Adam Duskett --- ...IR-to-all-paths-that-use-an-absolute-path.patch | 121 ++----------- .../0002-Add-PREFIX-to-host-paths.patch | 200 ++++----------------- .../0003-Remove-hardcoded-arch-variable.patch | 43 ----- ...licy-python-install-arguments-to-be-a-var.patch | 42 ----- .../0005-Check-to-see-if-DBUS-is-enabled.patch | 56 ------ package/policycoreutils/Config.in | 43 ----- package/policycoreutils/policycoreutils.hash | 2 +- package/policycoreutils/policycoreutils.mk | 35 +--- 8 files changed, 51 insertions(+), 491 deletions(-) delete mode 100644 package/policycoreutils/0003-Remove-hardcoded-arch-variable.patch delete mode 100644 package/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch delete mode 100644 package/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch diff --git a/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch b/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch index bbd6895e7f..3c1610f7a2 100644 --- a/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch +++ b/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch @@ -1,3 +1,8 @@ +From 85763549c53b2907dab094163f1404b2233f8029 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Mon, 9 Oct 2017 16:51:20 -0400 +Subject: [PATCH] Add DESTDIR to setfiles + The addition of this patch makes the use of DESTDIR mandatory as there are conditional checks which would fail if it's not defined. @@ -9,123 +14,25 @@ Signed-off-by: Clayton Shotwell Signed-off-by: Niranjan Reddy Signed-off-by: Adam Duskett Signed-off-by: Adam Duskett +refresh for 2.7 +Signed-off-by: Adam Duskett --- - policycoreutils/Makefile | 2 +- - policycoreutils/newrole/Makefile | 4 ++-- - policycoreutils/restorecond/Makefile | 5 +++-- - policycoreutils/run_init/Makefile | 4 ++-- - policycoreutils/sepolicy/Makefile | 2 +- - policycoreutils/sestatus/Makefile | 2 +- - policycoreutils/setfiles/Makefile | 4 ++-- - 7 files changed, 12 insertions(+), 11 deletions(-) + setfiles/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile b/Makefile -index 962ac12..0634a2a 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll - --INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) -+INOTIFYH = $(shell ls $(DESTDIR)/usr/include/sys/inotify.h 2>/dev/null) - - ifeq (${INOTIFYH}, /usr/include/sys/inotify.h) - SUBDIRS += restorecond -diff --git a/newrole/Makefile b/newrole/Makefile -index 646cd4d..f124a6a 100644 ---- a/newrole/Makefile -+++ b/newrole/Makefile -@@ -4,8 +4,8 @@ BINDIR ?= $(PREFIX)/bin - MANDIR ?= $(PREFIX)/share/man - ETCDIR ?= $(DESTDIR)/etc - LOCALEDIR = /usr/share/locale --PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null) --AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) -+PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null) -+AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) - # Enable capabilities to permit newrole to generate audit records. - # This will make newrole a setuid root program. - # The capabilities used are: CAP_AUDIT_WRITE. -diff --git a/restorecond/Makefile b/restorecond/Makefile -index f99e1e7..92a4a4d 100644 ---- a/restorecond/Makefile -+++ b/restorecond/Makefile -@@ -11,11 +11,12 @@ autostart_DATA = sealertauto.desktop - INITDIR ?= $(DESTDIR)/etc/rc.d/init.d - SELINUXDIR = $(DESTDIR)/etc/selinux - --DBUSFLAGS = -DHAVE_DBUS -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/lib/dbus-1.0/include -+DBUSFLAGS = -DHAVE_DBUS -I$(DESTDIR)/usr/include/dbus-1.0 -I$(DESTDIR)/usr/lib64/dbus-1.0/include -I$(DESTDIR)/usr/lib/dbus-1.0/include - DBUSLIB = -ldbus-glib-1 -ldbus-1 - - CFLAGS ?= -g -Werror -Wall -W --override CFLAGS += -I$(PREFIX)/include $(DBUSFLAGS) -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/lib/glib-2.0/include -+override CFLAGS += -I$(DESTDIR)/usr/include $(DBUSFLAGS) -I$(DESTDIR)/usr/include/glib-2.0 \ -+-I$(DESTDIR)/usr/lib64/glib-2.0/include -I$(DESTDIR)/usr/lib/glib-2.0/include - - LDLIBS += -lselinux $(DBUSLIB) -lglib-2.0 -L$(LIBDIR) - -diff --git a/run_init/Makefile b/run_init/Makefile -index 5815a08..c81179b 100644 ---- a/run_init/Makefile -+++ b/run_init/Makefile -@@ -5,8 +5,8 @@ SBINDIR ?= $(PREFIX)/sbin - MANDIR ?= $(PREFIX)/share/man - ETCDIR ?= $(DESTDIR)/etc - LOCALEDIR ?= /usr/share/locale --PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null) --AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) -+PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null) -+AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) - - CFLAGS ?= -Werror -Wall -W - override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -diff --git a/sepolicy/Makefile b/sepolicy/Makefile -index 39d46e8..6624373 100644 ---- a/sepolicy/Makefile -+++ b/sepolicy/Makefile -@@ -12,7 +12,7 @@ LOCALEDIR ?= /usr/share/locale - BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions - SHAREDIR ?= $(PREFIX)/share/sandbox - CFLAGS ?= -Wall -Werror -Wextra -W --override CFLAGS += -I$(PREFIX)/include -DPACKAGE="policycoreutils" -DSHARED -shared -+override CFLAGS = $(LDFLAGS) -I$(DESTDIR)/usr/include -DPACKAGE="policycoreutils" -Wall -Werror -Wextra -W -DSHARED -shared - - BASHCOMPLETIONS=sepolicy-bash-completion.sh - -diff --git a/sestatus/Makefile b/sestatus/Makefile -index c04ff00..e10c32c 100644 ---- a/sestatus/Makefile -+++ b/sestatus/Makefile -@@ -6,7 +6,7 @@ ETCDIR ?= $(DESTDIR)/etc - LIBDIR ?= $(PREFIX)/lib - - CFLAGS ?= -Werror -Wall -W --override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64 -+override CFLAGS += -I$(DESTDIR)/usr/include -D_FILE_OFFSET_BITS=64 - LDLIBS = -lselinux -L$(LIBDIR) - - all: sestatus diff --git a/setfiles/Makefile b/setfiles/Makefile -index 98f4f7d..eb26ed0 100644 +index c08e2dd..36c0638 100644 --- a/setfiles/Makefile +++ b/setfiles/Makefile -@@ -3,13 +3,13 @@ PREFIX ?= $(DESTDIR)/usr +@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr SBINDIR ?= $(DESTDIR)/sbin MANDIR = $(PREFIX)/share/man LIBDIR ?= $(PREFIX)/lib --AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) -+AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) +-AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y) ++AUDITH ?= $(shell test -f $(DESTDIR)/include/libaudit.h && echo y) - PROGRESS_STEP=$(shell grep "^\#define STAR_COUNT" restore.h | awk -S '{ print $$3 }') ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }') - CFLAGS ?= -g -Werror -Wall -W --override CFLAGS += -I$(PREFIX)/include -+override CFLAGS += -I$(DESTDIR)/usr/include - LDLIBS = -lselinux -lsepol -L$(LIBDIR) - - ifeq ($(AUDITH), /usr/include/libaudit.h) -- -2.7.4 +2.13.6 diff --git a/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch b/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch index 56aae74ba0..440923dd58 100644 --- a/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch +++ b/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch @@ -1,6 +1,6 @@ -From 7f99a727cdb8160d49bb0d0554fc88787980c971 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 14 Jul 2016 13:16:03 -0400 +From a221304344b3f9db7e86d928cf97d77542bcf456 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Mon, 9 Oct 2017 16:47:19 -0400 Subject: [PATCH] Add PREFIX to host paths Updates the remaining hardcoded host paths used in the build to be @@ -11,201 +11,61 @@ Updated to work with version 2.5 Signed-off-by: Clayton Shotwell Signed-off-by: Niranjan Reddy Signed-off-by: Adam Duskett -Signed-off-by: Adam Duskett +refresh for 2.7 +Signed-off-by: Adam Duskett --- - policycoreutils/Makefile | 4 +++- - policycoreutils/audit2allow/Makefile | 2 +- - policycoreutils/load_policy/Makefile | 2 +- - policycoreutils/mcstrans/src/Makefile | 17 +++++++++-------- - policycoreutils/newrole/Makefile | 8 ++++---- - policycoreutils/run_init/Makefile | 8 ++++---- - policycoreutils/sepolicy/Makefile | 2 +- - policycoreutils/setfiles/Makefile | 4 ++-- - 8 files changed, 25 insertions(+), 22 deletions(-) + load_policy/Makefile | 2 +- + newrole/Makefile | 6 +++--- + run_init/Makefile | 6 +++--- + 3 files changed, 7 insertions(+), 7 deletions(-) -diff --git a/Makefile b/Makefile -index 0634a2a..bd99b1c 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,10 @@ -+PREFIX ?= $(DESTDIR)/usr -+ - SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll - - INOTIFYH = $(shell ls $(DESTDIR)/usr/include/sys/inotify.h 2>/dev/null) - --ifeq (${INOTIFYH}, /usr/include/sys/inotify.h) -+ifeq (${INOTIFYH}, $(PREFIX)/include/sys/inotify.h) - SUBDIRS += restorecond - endif - -diff --git a/audit2allow/Makefile b/audit2allow/Makefile -index 87d2502..d4108fe 100644 ---- a/audit2allow/Makefile -+++ b/audit2allow/Makefile -@@ -5,7 +5,7 @@ PREFIX ?= $(DESTDIR)/usr - BINDIR ?= $(PREFIX)/bin - LIBDIR ?= $(PREFIX)/lib - MANDIR ?= $(PREFIX)/share/man --LOCALEDIR ?= /usr/share/locale -+LOCALEDIR ?= $(PREFIX)/share/locale - - all: audit2why - diff --git a/load_policy/Makefile b/load_policy/Makefile -index 7c5bab0..5cd0bbb 100644 +index b85833c..6a45f31 100644 --- a/load_policy/Makefile +++ b/load_policy/Makefile -@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr +@@ -2,7 +2,7 @@ + PREFIX ?= $(DESTDIR)/usr SBINDIR ?= $(DESTDIR)/sbin - USRSBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man -LOCALEDIR ?= /usr/share/locale +LOCALEDIR ?= $(PREFIX)/share/locale CFLAGS ?= -Werror -Wall -W - override CFLAGS += $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -diff --git a/mcstrans/src/Makefile b/mcstrans/src/Makefile -index 907a1f1..6fda57e 100644 ---- a/mcstrans/src/Makefile -+++ b/mcstrans/src/Makefile -@@ -1,23 +1,24 @@ - ARCH = $(shell uname -i) -+# Installation directories. -+PREFIX ?= $(DESTDIR)/usr -+SBINDIR ?= $(DESTDIR)/sbin -+INITDIR ?= $(DESTDIR)/etc/rc.d/init.d -+SYSTEMDDIR ?= $(DESTDIR)/usr/lib/systemd -+ - ifeq "$(ARCH)" "x86_64" - # In case of 64 bit system, use these lines -- LIBDIR=/usr/lib64 -+ LIBDIR=$(PREFIX)/lib64 - else - ifeq "$(ARCH)" "i686" - # In case of 32 bit system, use these lines -- LIBDIR=/usr/lib -+ LIBDIR=$(PREFIX)/lib - else - ifeq "$(ARCH)" "i386" - # In case of 32 bit system, use these lines -- LIBDIR=/usr/lib -+ LIBDIR=$(PREFIX)/lib - endif - endif - endif --# Installation directories. --PREFIX ?= $(DESTDIR)/usr --SBINDIR ?= $(DESTDIR)/sbin --INITDIR ?= $(DESTDIR)/etc/rc.d/init.d --SYSTEMDDIR ?= $(DESTDIR)/usr/lib/systemd - - PROG_SRC=mcstrans.c mcscolor.c mcstransd.c mls_level.c - PROG_OBJS= $(patsubst %.c,%.o,$(PROG_SRC)) + override CFLAGS += $(LDFLAGS) -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" diff --git a/newrole/Makefile b/newrole/Makefile -index f124a6a..b687a09 100644 +index 196af92..896708f 100644 --- a/newrole/Makefile +++ b/newrole/Makefile -@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr +@@ -3,9 +3,9 @@ PREFIX ?= $(DESTDIR)/usr BINDIR ?= $(PREFIX)/bin MANDIR ?= $(PREFIX)/share/man ETCDIR ?= $(DESTDIR)/etc -LOCALEDIR = /usr/share/locale -+LOCALEDIR = $(PREFIX)/share/locale - PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null) - AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) +-PAMH ?= $(shell test -f /usr/include/security/pam_appl.h && echo y) +-AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y) ++LOCALEDIR = $(PREFIX)/share/locale ++PAMH ?= $(shell test -f $(PREFIX)/include/security/pam_appl.h && echo y) ++AUDITH ?= $(shell test -f $(PREFIX)/include/libaudit.h && echo y) # Enable capabilities to permit newrole to generate audit records. -@@ -24,7 +24,7 @@ CFLAGS ?= -Werror -Wall -W - EXTRA_OBJS = - override CFLAGS += -DVERSION=\"$(VERSION)\" $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" - LDLIBS += -lselinux -L$(PREFIX)/lib --ifeq ($(PAMH), /usr/include/security/pam_appl.h) -+ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h) - override CFLAGS += -DUSE_PAM - EXTRA_OBJS += hashtab.o - LDLIBS += -lpam -lpam_misc -@@ -32,7 +32,7 @@ else - override CFLAGS += -D_XOPEN_SOURCE=500 - LDLIBS += -lcrypt - endif --ifeq ($(AUDITH), /usr/include/libaudit.h) -+ifeq ($(AUDITH), $(PREFIX)/include/libaudit.h) - override CFLAGS += -DUSE_AUDIT - LDLIBS += -laudit - endif -@@ -66,7 +66,7 @@ install: all - test -d $(MANDIR)/man1 || install -m 755 -d $(MANDIR)/man1 - install -m $(MODE) newrole $(BINDIR) - install -m 644 newrole.1 $(MANDIR)/man1/ --ifeq ($(PAMH), /usr/include/security/pam_appl.h) -+ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h) - test -d $(ETCDIR)/pam.d || install -m 755 -d $(ETCDIR)/pam.d - ifeq ($(LSPP_PRIV),y) - install -m 644 newrole-lspp.pamd $(ETCDIR)/pam.d/newrole + # This will make newrole a setuid root program. + # The capabilities used are: CAP_AUDIT_WRITE. diff --git a/run_init/Makefile b/run_init/Makefile -index c81179b..ce0df9f 100644 +index 921f0b0..e1566fc 100644 --- a/run_init/Makefile +++ b/run_init/Makefile -@@ -4,21 +4,21 @@ PREFIX ?= $(DESTDIR)/usr +@@ -4,9 +4,9 @@ PREFIX ?= $(DESTDIR)/usr SBINDIR ?= $(PREFIX)/sbin MANDIR ?= $(PREFIX)/share/man ETCDIR ?= $(DESTDIR)/etc -LOCALEDIR ?= /usr/share/locale +-PAMH ?= $(shell test -f /usr/include/security/pam_appl.h && echo y) +-AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y) +LOCALEDIR ?= $(PREFIX)/share/locale - PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null) - AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) ++PAMH ?= $(shell test -f $(PREFIX)/include/security/pam_appl.h && echo y) ++AUDITH ?= $(shell test -f $(PREFIX)/include/libaudit.h && echo y) CFLAGS ?= -Werror -Wall -W - override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" - LDLIBS += -lselinux -L$(PREFIX)/lib --ifeq ($(PAMH), /usr/include/security/pam_appl.h) -+ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h) - override CFLAGS += -DUSE_PAM - LDLIBS += -lpam -lpam_misc - else - override CFLAGS += -D_XOPEN_SOURCE=500 - LDLIBS += -lcrypt - endif --ifeq ($(AUDITH), /usr/include/libaudit.h) -+ifeq ($(AUDITH), $(PREFIX)/include/libaudit.h) - override CFLAGS += -DUSE_AUDIT - LDLIBS += -laudit - endif -@@ -38,7 +38,7 @@ install: all - install -m 755 open_init_pty $(SBINDIR) - install -m 644 run_init.8 $(MANDIR)/man8/ - install -m 644 open_init_pty.8 $(MANDIR)/man8/ --ifeq ($(PAMH), /usr/include/security/pam_appl.h) -+ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h) - install -m 644 run_init.pamd $(ETCDIR)/pam.d/run_init - endif - -diff --git a/sepolicy/Makefile b/sepolicy/Makefile -index 6624373..a16f8de 100644 ---- a/sepolicy/Makefile -+++ b/sepolicy/Makefile -@@ -8,7 +8,7 @@ BINDIR ?= $(PREFIX)/bin - SBINDIR ?= $(PREFIX)/sbin - DATADIR ?= $(PREFIX)/share - MANDIR ?= $(PREFIX)/share/man --LOCALEDIR ?= /usr/share/locale -+LOCALEDIR ?= $(PREFIX)/share/locale - BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions - SHAREDIR ?= $(PREFIX)/share/sandbox - CFLAGS ?= -Wall -Werror -Wextra -W -diff --git a/setfiles/Makefile b/setfiles/Makefile -index eb26ed0..3c6b80d 100644 ---- a/setfiles/Makefile -+++ b/setfiles/Makefile -@@ -12,7 +12,7 @@ CFLAGS ?= -g -Werror -Wall -W - override CFLAGS += -I$(DESTDIR)/usr/include - LDLIBS = -lselinux -lsepol -L$(LIBDIR) - --ifeq ($(AUDITH), /usr/include/libaudit.h) -+ifeq ($(AUDITH), $(PREFIX)/include/libaudit.h) - override CFLAGS += -DUSE_AUDIT - LDLIBS += -laudit - endif + override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -- -2.7.4 +2.13.6 diff --git a/package/policycoreutils/0003-Remove-hardcoded-arch-variable.patch b/package/policycoreutils/0003-Remove-hardcoded-arch-variable.patch deleted file mode 100644 index 375fb577f7..0000000000 --- a/package/policycoreutils/0003-Remove-hardcoded-arch-variable.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7424f2bea0cb412e96202f596ad8077131589f40 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 14 Jul 2016 13:18:24 -0400 -Subject: [PATCH] Remove hardcoded arch variable. - -Allow the ARCH value to be passed in as original configuration was -solely based on host architecture. - -This patch was updated to work with version 2.5 - -Signed-off-by: Clayton Shotwell -Signed-off-by: Niranjan Reddy -Signed-off-by: Adam Duskett -Signed-off-by: Adam Duskett ---- - policycoreutils/mcstrans/src/Makefile | 1 - - policycoreutils/mcstrans/utils/Makefile | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/mcstrans/src/Makefile b/mcstrans/src/Makefile -index 6fda57e..7b4489f 100644 ---- a/mcstrans/src/Makefile -+++ b/mcstrans/src/Makefile -@@ -1,4 +1,3 @@ --ARCH = $(shell uname -i) - # Installation directories. - PREFIX ?= $(DESTDIR)/usr - SBINDIR ?= $(DESTDIR)/sbin -diff --git a/mcstrans/utils/Makefile b/mcstrans/utils/Makefile -index 1ffb027..912fe12 100644 ---- a/mcstrans/utils/Makefile -+++ b/mcstrans/utils/Makefile -@@ -2,7 +2,6 @@ - PREFIX ?= $(DESTDIR)/usr - BINDIR ?= $(PREFIX)/sbin - --ARCH = $(shell uname -i) - ifeq "$(ARCH)" "x86_64" - # In case of 64 bit system, use these lines - LIBDIR=/usr/lib64 --- -2.7.4 - diff --git a/package/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch b/package/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch deleted file mode 100644 index 636b722b70..0000000000 --- a/package/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 27fd1c85ca95b5d66ab0241a08242a75b60b375c Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 14 Jul 2016 13:22:57 -0400 -Subject: [PATCH] Change sepolicy python install arguments to be a variable - -To allow the python install arguments to be overwritten, change the -arguments to be a variable. This also cleans up the DESTDIR detection a -little bit. - -Updated to work with version 2.5 - -Signed-off-by: Clayton Shotwell -Signed-off-by: Adam Duskett -Signed-off-by: Adam Duskett ---- - policycoreutils/sepolicy/Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/sepolicy/Makefile b/sepolicy/Makefile -index a16f8de..2013301 100644 ---- a/sepolicy/Makefile -+++ b/sepolicy/Makefile -@@ -1,4 +1,7 @@ - PYTHON ?= python -+ifneq ($(DESTDIR),) -+PYTHON_INSTALL_ARGS ?= --root $(DESTDIR) -+endif - - # Installation directories. - PREFIX ?= $(DESTDIR)/usr -@@ -32,7 +35,7 @@ test: - @$(PYTHON) test_sepolicy.py -v - - install: -- $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` -+ $(PYTHON) setup.py install $(PYTHON_INSTALL_ARGS) - [ -d $(BINDIR) ] || mkdir -p $(BINDIR) - install -m 755 sepolicy.py $(BINDIR)/sepolicy - (cd $(BINDIR); ln -sf sepolicy sepolgen) --- -2.7.4 - diff --git a/package/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch b/package/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch deleted file mode 100644 index 37ffac8de8..0000000000 --- a/package/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch +++ /dev/null @@ -1,56 +0,0 @@ -From d1bc28c5b2efe60a0ee04d9c171928d0f3475654 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 14 Jul 2016 13:26:23 -0400 -Subject: [PATCH] Check to see if DBUS is enabled. - -Adds a condition to prevent linking against dbus when at build time -dbus has not been enabled. - -Updated for 2.5. - -Signed-off-by: Matthew Weber -Signed-off-by: Adam Duskett -Signed-off-by: Adam Duskett ---- - policycoreutils/restorecond/Makefile | 2 ++ - policycoreutils/restorecond/user.c | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/restorecond/Makefile b/restorecond/Makefile -index 92a4a4d..95f38a6 100644 ---- a/restorecond/Makefile -+++ b/restorecond/Makefile -@@ -11,8 +11,10 @@ autostart_DATA = sealertauto.desktop - INITDIR ?= $(DESTDIR)/etc/rc.d/init.d - SELINUXDIR = $(DESTDIR)/etc/selinux - -+ifdef ENABLE_DBUS - DBUSFLAGS = -DHAVE_DBUS -I$(DESTDIR)/usr/include/dbus-1.0 -I$(DESTDIR)/usr/lib64/dbus-1.0/include -I$(DESTDIR)/usr/lib/dbus-1.0/include - DBUSLIB = -ldbus-glib-1 -ldbus-1 -+endif - - CFLAGS ?= -g -Werror -Wall -W - override CFLAGS += -I$(DESTDIR)/usr/include $(DBUSFLAGS) -I$(DESTDIR)/usr/include/glib-2.0 \ -diff --git a/restorecond/user.c b/restorecond/user.c -index 714aae7..a04cddb 100644 ---- a/restorecond/user.c -+++ b/restorecond/user.c -@@ -54,7 +54,6 @@ static const char *PATH="/org/selinux/Restorecond"; - static const char *INTERFACE="org.selinux.RestorecondIface"; - static const char *RULE="type='signal',interface='org.selinux.RestorecondIface'"; - --static int local_lock_fd = -1; - - static DBusHandlerResult - signal_filter (DBusConnection *connection __attribute__ ((__unused__)), DBusMessage *message, void *user_data) -@@ -101,6 +100,7 @@ static int dbus_server(GMainLoop *loop) { - #include - #include - -+static int local_lock_fd = -1; - /* size of the event structure, not counting name */ - #define EVENT_SIZE (sizeof (struct inotify_event)) - /* reasonable guess as to size of 1024 events */ --- -2.7.4 - diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in index 6b58d6ea33..0d69fb51a5 100644 --- a/package/policycoreutils/Config.in +++ b/package/policycoreutils/Config.in @@ -28,54 +28,11 @@ config BR2_PACKAGE_POLICYCOREUTILS The base package will install the following utilities: load_policy newrole - restorecond run_init secon semodule - semodule_deps - semodule_expand - semodule_link - semodule_package - sepolgen-ifgen sestatus setfiles setsebool http://selinuxproject.org/page/Main_Page - -if BR2_PACKAGE_POLICYCOREUTILS - -config BR2_PACKAGE_POLICYCOREUTILS_AUDIT2ALLOW - bool "audit2allow" - depends on BR2_USE_WCHAR # python3, sepolgen - depends on BR2_USE_MMU # python3, sepolgen - depends on BR2_TOOLCHAIN_HAS_THREADS # python3, sepolgen, checkpolicy - depends on !BR2_STATIC_LIBS # python3, sepolgen - depends on BR2_TOOLCHAIN_USES_GLIBC # checkpolicy - depends on !BR2_arc # checkpolicy - select BR2_PACKAGE_SEPOLGEN - select BR2_PACKAGE_CHECKPOLICY - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON - help - Enable audit2allow to be built - -comment "audit2allow needs a glibc toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_arc - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - -config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND - bool "restorecond" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - Enable restorecond to be built - -comment "restorecond needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -endif diff --git a/package/policycoreutils/policycoreutils.hash b/package/policycoreutils/policycoreutils.hash index 999a7788d2..9ec47c394b 100644 --- a/package/policycoreutils/policycoreutils.hash +++ b/package/policycoreutils/policycoreutils.hash @@ -1,2 +1,2 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 68891b376f5048edc53c6ccb2fca44da3dc7f4563f4b6894e201d70c04a05a29 policycoreutils-2.6.tar.gz +sha256 0a1b8a4a323b854981c6755ff025fe98a0f1cff307f109abb260f0490f13e4f4 policycoreutils-2.7.tar.gz diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 6fec4afb25..7979d23171 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -4,8 +4,8 @@ # ################################################################################ -POLICYCOREUTILS_VERSION = 2.6 -POLICYCOREUTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 +POLICYCOREUTILS_VERSION = 2.7 +POLICYCOREUTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804 POLICYCOREUTILS_LICENSE = GPL-2.0 POLICYCOREUTILS_LICENSE_FILES = COPYING @@ -41,28 +41,8 @@ POLICYCOREUTILS_MAKE_OPTS += \ POLICYCOREUTILS_MAKE_DIRS = \ load_policy newrole run_init \ - secon semodule semodule_deps \ - semodule_expand semodule_link \ - semodule_package sepolgen-ifgen \ - sestatus setfiles setsebool - -ifeq ($(BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND),y) -POLICYCOREUTILS_MAKE_DIRS += restorecond -POLICYCOREUTILS_DEPENDENCIES += libglib2 -endif - -ifeq ($(BR2_PACKAGE_POLICYCOREUTILS_AUDIT2ALLOW),y) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -POLICYCOREUTILS_DEPENDENCIES += python3 -POLICYCOREUTILS_MAKE_OPTS += PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" -else -POLICYCOREUTILS_DEPENDENCIES += python -POLICYCOREUTILS_MAKE_OPTS += PYLIBVER="python$(PYTHON_VERSION_MAJOR)" -endif - -POLICYCOREUTILS_DEPENDENCIES += sepolgen checkpolicy -POLICYCOREUTILS_MAKE_DIRS += audit2allow -endif + secon semodule sestatus setfiles \ + setsebool # We need to pass DESTDIR at build time because it's used by # policycoreutils build system to find headers and libraries. @@ -112,10 +92,8 @@ endif # Note: We are only building the programs required by the refpolicy build HOST_POLICYCOREUTILS_MAKE_DIRS = \ - load_policy semodule semodule_deps \ - semodule_expand semodule_link \ - semodule_package setfiles restorecond \ - audit2allow scripts semanage sepolicy + load_policy semodule setfiles \ + scripts semanage sepolicy define HOST_POLICYCOREUTILS_BUILD_CMDS $(foreach d,$(HOST_POLICYCOREUTILS_MAKE_DIRS), @@ -128,7 +106,6 @@ define HOST_POLICYCOREUTILS_INSTALL_CMDS $(MAKE) -C $(@D)/$(d) $(HOST_POLICYCOREUTILS_MAKE_OPTS) install ) # Fix python paths - $(SED) 's%/usr/bin/%$(HOST_DIR)/bin/%g' $(HOST_DIR)/bin/audit2allow $(SED) 's%/usr/bin/%$(HOST_DIR)/bin/%g' $(HOST_DIR)/bin/sepolgen-ifgen $(SED) 's%/usr/bin/%$(HOST_DIR)/bin/%g' $(HOST_DIR)/bin/sepolicy endef From patchwork Mon Oct 9 22:27:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 823563 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.136; helo=silver.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="EJiTjGIH"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y9vyH6Wl6z9t5R for ; Tue, 10 Oct 2017 09:27:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9A7D02FE73; Mon, 9 Oct 2017 22:27:48 +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 DYVQP9LNwsQV; Mon, 9 Oct 2017 22:27:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id EC8012CD69; Mon, 9 Oct 2017 22:27:46 +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 9EDB21C024B for ; Mon, 9 Oct 2017 22:27:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 97EFA87A81 for ; Mon, 9 Oct 2017 22:27:41 +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 eLpx2crQ60Aj for ; Mon, 9 Oct 2017 22:27:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id CA47986DDB for ; Mon, 9 Oct 2017 22:27:40 +0000 (UTC) Received: by mail-qt0-f193.google.com with SMTP id y45so4302012qty.1 for ; Mon, 09 Oct 2017 15:27:40 -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=0QeLS1Nki5Nc8iT31x1sFRw60l1wqfby6uRE42PGkBg=; b=EJiTjGIHE5d1wLn9nYmk+WC8Y3k1KQGV4ui/YxRUp20MyIHjPIx/EsgvCa8thB8OIl HWle9IVGagHSKyK1Jtpd/anYdEYN0gKqtSmHPzjvavCb88HR2Qis0EkyOTblB/QEP5Ti BmD73alxNNVA+OEsEMWJiupe2lkz5fbuyDWV9IkxbXf5ObU7v/NrjobyAnlHgUOGLLfy ueGHR+KfpcLJjYE+w87UBylNVkLGbX8o6KtMyEa4ltFoVsC4F5fTeOpTDOTnhm67SH8+ SaeX2ItyS+aEtvwyX0/0fvONzAQuFRymA0xaJyjtw129SkvY7aLNRx1jSP1lN0yNxc2j 57yQ== 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=0QeLS1Nki5Nc8iT31x1sFRw60l1wqfby6uRE42PGkBg=; b=F7HICuksJQ2wsC8Xcz7FWJK3YtWaSNtgxYsBNo//pB56ls2Tq8FtDagL2Sk15crQwf /qjaskB3uDNdAqzNAfMGmj5n4o1QIy02hEojG0Khi1spjVuUlYMmAFGNmbMrUXT6IYU9 WoQlXYsIX3Jm3lL80rfYxPRloYl8+zpR5Act/SPiSmGAfLf0g/weL8vj/90U8pS6caBF 9L/MegfhWz/gB+SEWLpc/5R1qUsjQBOvAxvnuy4IzrMX+Ud1YrkocHV2coUY1oO+yY6L gMv5AN/jVUQ/MlSu6a7pu4226OboACveUiA7N5rxBjzaObEOUsC+rORNYtoG30zy+Ia8 L1yw== X-Gm-Message-State: AMCzsaUnH9/YKNg3fbEA1kbV3jOoObP+h80KnEcGoZXDKhPz2xtsYZcf 9CCntus8GXzJrYVvsm0S3fX+MuDY X-Google-Smtp-Source: AOwi7QBVsevKeXLRvCXxv2Ro6NGFlwQMy5VbKvrWMrA9k7UWhb8jUaomRPR0jlOtkUJgtlFbTHlvNg== X-Received: by 10.129.200.65 with SMTP id k1mr874360ywl.328.1507588059569; Mon, 09 Oct 2017 15:27:39 -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 o126sm3589115ywb.8.2017.10.09.15.27.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2017 15:27:39 -0700 (PDT) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Mon, 9 Oct 2017 18:27:29 -0400 Message-Id: <20171009222731.15119-6-Adamduskett@outlook.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171009222731.15119-1-Adamduskett@outlook.com> References: <20171009222731.15119-1-Adamduskett@outlook.com> Cc: Adam Duskett Subject: [Buildroot] [PATCH 6/8] sepolgen: Remove package 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" sepolgen has been consolidated into the selinux-python package for version 2.7. Signed-off-by: Adam Duskett --- package/Config.in | 1 - package/sepolgen/Config.in | 19 ---------------- package/sepolgen/sepolgen.hash | 2 -- package/sepolgen/sepolgen.mk | 49 ------------------------------------------ 4 files changed, 71 deletions(-) delete mode 100644 package/sepolgen/Config.in delete mode 100644 package/sepolgen/sepolgen.hash delete mode 100644 package/sepolgen/sepolgen.mk diff --git a/package/Config.in b/package/Config.in index 6f8564334d..b9c62de1f3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1840,7 +1840,6 @@ menu "Security" source "package/paxtest/Config.in" source "package/policycoreutils/Config.in" source "package/refpolicy/Config.in" - source "package/sepolgen/Config.in" source "package/setools/Config.in" endmenu diff --git a/package/sepolgen/Config.in b/package/sepolgen/Config.in deleted file mode 100644 index 8dd90388c8..0000000000 --- a/package/sepolgen/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_SEPOLGEN - bool "sepolgen" - depends on BR2_USE_WCHAR # python3 - depends on BR2_USE_MMU # python3 - depends on BR2_TOOLCHAIN_HAS_THREADS # python3 - depends on !BR2_STATIC_LIBS # python3 - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON - help - This package contains a Python module that forms the core of - the modern audit2allow (which is a part of the package - policycoreutils). It contains infrastructure for parsing - SELinux related messages as produced by the audit system. - It has facilities for generating policy based on required - access. - -comment "sepolgen needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package/sepolgen/sepolgen.hash b/package/sepolgen/sepolgen.hash deleted file mode 100644 index b338a7019f..0000000000 --- a/package/sepolgen/sepolgen.hash +++ /dev/null @@ -1,2 +0,0 @@ -# https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 6a327b1576d914e57ad796a541a7a9bcceefb14c445355559993de0fdb8e7a60 sepolgen-2.6.tar.gz diff --git a/package/sepolgen/sepolgen.mk b/package/sepolgen/sepolgen.mk deleted file mode 100644 index ab7f18d857..0000000000 --- a/package/sepolgen/sepolgen.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# sepolgen -# -################################################################################ - -SEPOLGEN_VERSION = 2.6 -SEPOLGEN_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 -SEPOLGEN_LICENSE = GPL-2.0 -SEPOLGEN_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -SEPOLGEN_DEPENDENCIES = python3 -SEPOLGEN_MAKE_CMDS = $(TARGET_CONFIGURE_OPTS) \ - PYTHONLIBDIR=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -else -SEPOLGEN_DEPENDENCIES = python -SEPOLGEN_MAKE_CMDS = $(TARGET_CONFIGURE_OPTS) \ - PYTHONLIBDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -endif - -define SEPOLGEN_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_SEPOLGEN_MAKE_CMDS) DESTDIR=$(TARGET_DIR) -endef - -define SEPOLGEN_INSTALL_TARGET_CMDS - $(MAKE_ENV) $(MAKE) -C $(@D) $(SEPOLGEN_MAKE_CMDS) DESTDIR=$(TARGET_DIR) install -endef - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_SEPOLGEN_DEPENDENCIES = host-python3 -HOST_SEPOLGEN_MAKE_CMDS = $(HOST_CONFIGURE_OPTS) \ - PYTHONLIBDIR=lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -else -HOST_SEPOLGEN_DEPENDENCIES = host-python -HOST_SEPOLGEN_MAKE_CMDS = $(HOST_CONFIGURE_OPTS) \ - PYTHONLIBDIR=lib/python$(PYTHON_VERSION_MAJOR)/site-packages -endif - -define HOST_SEPOLGEN_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_SEPOLGEN_MAKE_CMDS) DESTDIR=$(HOST_DIR) -endef - -define HOST_SEPOLGEN_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_SEPOLGEN_MAKE_CMDS) DESTDIR=$(HOST_DIR) install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) From patchwork Mon Oct 9 22:27:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 823566 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="r6DinxWk"; 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 3y9vyQ02Czz9t5R for ; Tue, 10 Oct 2017 09:27:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 52A7A886B6; Mon, 9 Oct 2017 22:27:56 +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 i1ZH1eqQ3tEL; Mon, 9 Oct 2017 22:27:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id F269C886C2; Mon, 9 Oct 2017 22:27:48 +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 131651C024B for ; Mon, 9 Oct 2017 22:27:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DE14D87B94 for ; Mon, 9 Oct 2017 22:27:42 +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 GO7Hti_rUw71 for ; Mon, 9 Oct 2017 22:27:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id BB8E387051 for ; Mon, 9 Oct 2017 22:27:41 +0000 (UTC) Received: by mail-qt0-f196.google.com with SMTP id z19so4884957qtg.2 for ; Mon, 09 Oct 2017 15:27:41 -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=1nyMAq754XqaC1/wXgujMO1hgVZTD1XmRLgiGeZo14c=; b=r6DinxWkRV+96xA13y98KPiHv8jiCKT1Fa/HE1GOkd0oHZVeVdj9bV/OlVqUgcGufz Tlsoz8DWBasVT+vLONkgXXgBqbcl0e0rFF4v/oVbk3ClZhyY7uCZEs7iPSYZylaJ16VW BpOLlaiE5WHrd4xk+vx3nVe9jaN+c+fEsx2eQIOH1ztV8DjWaxLOfMhOqy39gi+PPDTJ ryJqaqQeJU7+Blo3SL4zXKTZcXrm9HCZFgaMNIt2ZBMUUwJZfYjvl2gS4IKBfmw1BfAr a9Ekp5gNpdOXwlCfQapIFbyX9yfGQ1SlGiFjqj7BNne5VkDugXfsQh23++17H+osmjvb OHhg== 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=1nyMAq754XqaC1/wXgujMO1hgVZTD1XmRLgiGeZo14c=; b=dk1+391wfiLzBSuITDCb+5a3Skw/2uas+xk7HCAFJDvx/BfllCJR7lDZJ0qrXQo6x4 nGuX8NXs4hlya6XgHRG+m0ByYJ5xbJpjsD06ApXV1efGx6EwWZncKYR1SzTT+csS1d3f ZiofyGW0EfH0c8ehcxHkuJC67UMJ0jxT1cysUHCzdUKgFR/rbTgpWBDrNJkB+/T4giGG n/ZyEMBSOhpl9wKKFtVyBQe/94tcEbblTAoAgcf2ZI3Fy+DW49AeZioj06mOzgGKilwU 3enLsz/wrgLNvOXkbqn3Zy7msbNLwe+JtRuAmgvw2NHgys2bMypr+Lhwh6w+Bne0ha7W lC6w== X-Gm-Message-State: AMCzsaUI/UapRN7ffMXHVTvvvrZUl3Sry47TU3WOyZBe9qp+XzHRDNQc jGcbaB8zUoiK9nI09eQ1EImEbkU6 X-Google-Smtp-Source: AOwi7QC2lSjo/bKnFMdD47Tks1MiNUoQB0oZ9XF+/cU9jVRVCpky8sY30r2811/StljT+fYOqf1ovg== X-Received: by 10.129.98.213 with SMTP id w204mr825967ywb.247.1507588060490; Mon, 09 Oct 2017 15:27:40 -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 o126sm3589115ywb.8.2017.10.09.15.27.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2017 15:27:39 -0700 (PDT) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Mon, 9 Oct 2017 18:27:30 -0400 Message-Id: <20171009222731.15119-7-Adamduskett@outlook.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171009222731.15119-1-Adamduskett@outlook.com> References: <20171009222731.15119-1-Adamduskett@outlook.com> Cc: Adam Duskett Subject: [Buildroot] [PATCH 7/8] restorecond: new package 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" restorecond is now a seperate package released by the SELinux maintainers. restorecond is a daemon that watches for file creation and then sets the default SELinux file context for that file. Signed-off-by: Adam Duskett --- DEVELOPERS | 1 + package/Config.in | 1 + package/restorecond/Config.in | 12 +++++++++ package/restorecond/restorecond.hash | 2 ++ package/restorecond/restorecond.mk | 48 ++++++++++++++++++++++++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 package/restorecond/Config.in create mode 100644 package/restorecond/restorecond.hash create mode 100644 package/restorecond/restorecond.mk diff --git a/DEVELOPERS b/DEVELOPERS index f35d6f3688..18e878d8d5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -41,6 +41,7 @@ F: package/libsepol/ F: package/nginx-naxsi/ F: package/policycoreutils/ F: package/python-mutagen/ +F: package/restorecond/ F: package/refpolicy/ F: package/sepolgen/ F: package/setools/ diff --git a/package/Config.in b/package/Config.in index b9c62de1f3..c9677a460c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1840,6 +1840,7 @@ menu "Security" source "package/paxtest/Config.in" source "package/policycoreutils/Config.in" source "package/refpolicy/Config.in" + source "package/restorecond/Config.in" source "package/setools/Config.in" endmenu diff --git a/package/restorecond/Config.in b/package/restorecond/Config.in new file mode 100644 index 0000000000..f9c3ebe6ba --- /dev/null +++ b/package/restorecond/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_RESTORECOND + bool "restorecond" + depends on BR2_PACKAGE_DBUS # dbus-glib + depends on BR2_USE_WCHAR # glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_USE_MMU # glib2 + select BR2_PACKAGE_LIBSELINUX + select BR2_PACKAGE_DBUS_GLIB + select BR2_PACKAGE_LIBGLIB2 + help + restorecond is a daemon that watches for file creation and then sets the + default SELinux file context for that file. diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash new file mode 100644 index 0000000000..f52bbd2161 --- /dev/null +++ b/package/restorecond/restorecond.hash @@ -0,0 +1,2 @@ +# https://github.com/SELinuxProject/selinux/wiki/Releases +sha256 cb8e0a8d706cb2c1f105125f3514dffffefcbcfb49199183a7f91ab0bdf1f24d restorecond-2.7.tar.gz diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk new file mode 100644 index 0000000000..98ae3e7314 --- /dev/null +++ b/package/restorecond/restorecond.mk @@ -0,0 +1,48 @@ +################################################################################ +# +# restorecond +# +################################################################################ + +RESTORECOND_VERSION = 2.7 +RESTORECOND_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804 +RESTORECOND_LICENSE = GPL-2.0 +RESTORECOND_LICENSE_FILES = COPYING + +RESTORECOND_DEPENDENCIES = libglib2 libselinux dbus-glib + +RESTORECOND_MAKE_OPTS += \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ + CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" \ + ARCH="$(BR2_ARCH)" + +# We need to pass DESTDIR at build time because it's used by +# RESTORECOND build system to find headers and libraries. +define RESTORECOND_BUILD_CMDS + $(MAKE) -C $(@D) $(RESTORECOND_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all +endef + +define RESTORECOND_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D $(@D)/restorecond.init \ + $(TARGET_DIR)/etc/init.d/restorecond +endef + +define RESTORECOND_INSTALL_INIT_SYSTEMD + $(INSTALL) -m 0644 -D $(@D)/restorecond.service \ + $(TARGET_DIR)/usr/lib/systemd/system/restorecond.service + + $(INSTALL) -m 0600 -D $(@D)/org.selinux.Restorecond.service \ + $(TARGET_DIR)/etc/systemd/system/org.selinux.Restorecond.service +endef + +define RESTORECOND_INSTALL_TARGET_CMDS + $(INSTALL) -m 0644 -D $(@D)/restorecond.conf $(TARGET_DIR)/etc/selinux + $(INSTALL) -m 0644 -D $(@D)/restorecond_user.conf $(TARGET_DIR)/etc/selinux + $(INSTALL) -m 0755 -D $(@D)/restorecond $(TARGET_DIR)/usr/sbin +endef + + + +$(eval $(generic-package)) +$(eval $(host-generic-package)) From patchwork Mon Oct 9 22:27:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 823567 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.133; helo=hemlock.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="NFuitjxL"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y9vyQ5wCSz9t5l for ; Tue, 10 Oct 2017 09:27:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C92A1885C8; Mon, 9 Oct 2017 22:27:56 +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 mHDT1f3ez3P4; Mon, 9 Oct 2017 22:27:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id F329F881D7; Mon, 9 Oct 2017 22:27:51 +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 729761C024B for ; Mon, 9 Oct 2017 22:27:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6D89887070 for ; Mon, 9 Oct 2017 22:27:43 +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 kUte-s5sqBc2 for ; Mon, 9 Oct 2017 22:27:42 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id ADD01870D2 for ; Mon, 9 Oct 2017 22:27:42 +0000 (UTC) Received: by mail-qt0-f194.google.com with SMTP id 24so2758172qts.3 for ; Mon, 09 Oct 2017 15:27:42 -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=r71KxzKE/12vxLpg5gP0Z20ZbFpmxAD2jpbXgdssxg8=; b=NFuitjxLgqvmIDahRM7vJdJ6aYkXr4oCio1JY90Y8USgBpqcPJEQ6UK5MU1Qzetm6L lDXLbc6k+a41QbhwKWlbQ+arn9cgbZOQcLs63V1+8IDbW8nqNjUtU63lPlyrAtUivjuX /4LL2LnqypdlQGt8gTmsH4GgwUr6IFSIQYSw2co1O6LXqX6KjCc+nlmu5lGHHc3selP6 2NhGZYE9NfeCC5keBqAnted5Sa34THy2WMtdIsBKug9zYR2Em9d1oVFtIW/8IHgop+AN +HMvdekdhdNh+h5VS/p/qLIKzrUgX/3sZ4jIeB0M9yZ/JP+Wz0KiAefLO+4z5H4MJGuS K7xQ== 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=r71KxzKE/12vxLpg5gP0Z20ZbFpmxAD2jpbXgdssxg8=; b=oVRpSoe5X9nyuIN3E+zZQiaTwFG97qeW3a5sdLY/CkZ1JCAJeV+mzszHG51p0U6Npd /mK1wBIibSdZEgeFz4mTUJiovqc9kx31C/r3Sun1siVPeo0ikMlldedw3Gafe2f40Mj1 L5C/6YU140wH6O45nnN5q/KhxrlvbKOJCiPU4/syr+quJma1IKcAidFErVH7TezEgUHq Bw1Guuij7Rl69fzShLQRmbjx8B2EW742+HcTSOW52orb69/5eWd3QLtytRY4gvQKR1Bv yEVbf7a68ribj1jK32ZTkwY/gCIX+Fax2PqxdfZp+OtE5l04oEafU1YAts6XCuP7HjLD NUnQ== X-Gm-Message-State: AMCzsaVTHFqIM8rHqTnm/S2bmGP7iHMpfcv9nTMfUypFm7LmDMIt1hCA 8oek8EReF8Cv6Z2YNYVYSDwY4zju X-Google-Smtp-Source: AOwi7QAVrLNu2c/8I0n1dpK8sR1k5R3ONxWgwn5uW00dgIJw8yEwKP+pv7lvdMwsH1q1egma6/CQuQ== X-Received: by 10.129.118.17 with SMTP id r17mr881862ywc.320.1507588061591; Mon, 09 Oct 2017 15:27:41 -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 o126sm3589115ywb.8.2017.10.09.15.27.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2017 15:27:40 -0700 (PDT) From: Adam Duskett X-Google-Original-From: Adam Duskett To: buildroot@buildroot.org Date: Mon, 9 Oct 2017 18:27:31 -0400 Message-Id: <20171009222731.15119-8-Adamduskett@outlook.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171009222731.15119-1-Adamduskett@outlook.com> References: <20171009222731.15119-1-Adamduskett@outlook.com> Cc: Adam Duskett Subject: [Buildroot] [PATCH 8/8] selinux-python: new package 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" The python utilities that were previously in policycoreutils are now maintained in a seperate package called selinux-python. This package includes: - audit2allow - chcat - semanage - sepolgen - sepolicy Currently, only audit2allow and sepolgen are selectable. Signed-off-by: Adam Duskett --- DEVELOPERS | 1 + package/Config.in | 1 + package/selinux-python/Config.in | 47 ++++++++++++++++++++++++++ package/selinux-python/selinux-python.hash | 2 ++ package/selinux-python/selinux-python.mk | 53 ++++++++++++++++++++++++++++++ 5 files changed, 104 insertions(+) create mode 100644 package/selinux-python/Config.in create mode 100644 package/selinux-python/selinux-python.hash create mode 100644 package/selinux-python/selinux-python.mk diff --git a/DEVELOPERS b/DEVELOPERS index 18e878d8d5..a44f87e47b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -43,6 +43,7 @@ F: package/policycoreutils/ F: package/python-mutagen/ F: package/restorecond/ F: package/refpolicy/ +F: package/selinux-python/ F: package/sepolgen/ F: package/setools/ F: package/sngrep/ diff --git a/package/Config.in b/package/Config.in index c9677a460c..0c7ed44177 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1841,6 +1841,7 @@ menu "Security" source "package/policycoreutils/Config.in" source "package/refpolicy/Config.in" source "package/restorecond/Config.in" + source "package/selinux-python/Config.in" source "package/setools/Config.in" endmenu diff --git a/package/selinux-python/Config.in b/package/selinux-python/Config.in new file mode 100644 index 0000000000..1078c4e792 --- /dev/null +++ b/package/selinux-python/Config.in @@ -0,0 +1,47 @@ +menuconfig BR2_PACKAGE_SELINUX_PYTHON + bool "SELinux Python packages" + help + A set of SELinux tools written in python that help with + managing a system with SELinux enabled. + + https://github.com/SELinuxProject/selinux/wiki + +if BR2_PACKAGE_SELINUX_PYTHON + +comment "packages" + +config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW + bool "audit2allow" + depends on BR2_USE_WCHAR # python3, sepolgen + depends on BR2_USE_MMU # python3, sepolgen + depends on BR2_TOOLCHAIN_HAS_THREADS # python3, sepolgen, checkpolicy + depends on !BR2_STATIC_LIBS # python3, sepolgen + depends on BR2_TOOLCHAIN_USES_GLIBC # checkpolicy + depends on !BR2_arc # checkpolicy + select BR2_PACKAGE_SEPOLGEN + select BR2_PACKAGE_CHECKPOLICY + select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + help + Enable audit2allow to be built + +config BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN + bool "sepolgen" + depends on BR2_USE_WCHAR # python3 + depends on BR2_USE_MMU # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 + select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + help + This package contains a Python module that forms the core of + the modern audit2allow (which is a part of the package + policycoreutils). It contains infrastructure for parsing + SELinux related messages as produced by the audit system. + It has facilities for generating policy based on required + access. + +comment "sepolgen needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS + +endif diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash new file mode 100644 index 0000000000..42fe575e7b --- /dev/null +++ b/package/selinux-python/selinux-python.hash @@ -0,0 +1,2 @@ +# https://github.com/SELinuxProject/selinux/wiki/Releases +sha256 4217cb965ecda96c91e15ffcc2e7ddd13ecc2bf5631100f3cd072a7616f140ed selinux-python-2.7.tar.gz diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk new file mode 100644 index 0000000000..2a141be9ab --- /dev/null +++ b/package/selinux-python/selinux-python.mk @@ -0,0 +1,53 @@ +################################################################################ +# +# selinux-python +# +################################################################################ + +SELINUX_PYTHON_VERSION = 2.7 +SELINUX_PYTHON_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804 +SELINUX_PYTHON_LICENSE = GPL-2.0 +SELINUX_PYTHON_LICENSE_FILES = COPYING + +SELINUX_PYTHON_MAKE_OPTS += \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="$(TARGET_CPPFLAGS)" \ + ARCH="$(BR2_ARCH)" \ + LIBDIR="$(STAGING_DIR)/usr/lib" + +ifeq ($(BR2_PACKAGE_PYTHON3),y) +HOST_SELINUX_PYTHON_DEPENDENCIES += host-python3 +HOST_SELINUX_PYTHON_MAKE_OPTS += \ + PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" +else +HOST_SELINUX_PYTHON_DEPENDENCIES += host-python +HOST_SELINUX_PYTHON_MAKE_OPTS += \ + PYLIBVER="python$(PYTHON_VERSION_MAJOR)" +endif + +ifeq ($(BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW),y) +SELINUX_PYTHON_DEPENDENCIES += checkpolicy +SELINUX_PYTHON_MAKE_DIRS += audit2allow + +endif + +ifeq ($(BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN),y) +SELINUX_PYTHON_MAKE_DIRS += sepolgen/src/sepolgen +endif + +define SELINUX_PYTHON_BUILD_CMDS + $(foreach d,$(SELINUX_PYTHON_MAKE_DIRS), + $(MAKE) -C $(@D)/$(d) $(SELINUX_PYTHON_MAKE_OPTS) \ + DESTDIR=$(STAGING_DIR) all + ) +endef + +define SELINUX_PYTHON_INSTALL_TARGET_CMDS + $(foreach d,$(SELINUX_PYTHON_MAKE_DIRS), + $(MAKE) -C $(@D)/$(d) $(SELINUX_PYTHON_MAKE_OPTS) \ + DESTDIR=$(TARGET_DIR) install + ) +endef + +$(eval $(generic-package))