From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4D1D41382C5 for ; Mon, 11 Jan 2021 01:27:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2EA7E0ADB; Mon, 11 Jan 2021 01:27:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB930E0ADB for ; Mon, 11 Jan 2021 01:27:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 021DA34104E for ; Mon, 11 Jan 2021 01:27:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D1C54AC for ; Mon, 11 Jan 2021 01:27:07 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1610315537.9edc8b55661f15d3d365f848b55494939bc612a4.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: / X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: INSTALL Makefile X-VCS-Directories: / X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 9edc8b55661f15d3d365f848b55494939bc612a4 X-VCS-Branch: master Date: Mon, 11 Jan 2021 01:27:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 83131ed9-da96-4e6a-a212-5e3f6b76def0 X-Archives-Hash: eb42cf0b813b1f3e3a9dd44b18a849a3 commit: 9edc8b55661f15d3d365f848b55494939bc612a4 Author: Chris PeBenito ieee org> AuthorDate: Wed Jan 6 18:51:03 2021 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sun Jan 10 21:52:17 2021 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=9edc8b55 Makefile: Add -E to setfiles labeling targets. This will cause setfiles to error if there are conflicting labeling specifications for files due to hardlinks. closes #218 Signed-off-by: Chris PeBenito ieee.org> Signed-off-by: Jason Zaman gentoo.org> INSTALL | 4 ++-- Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index ca7d7b19..3df5c167 100644 --- a/INSTALL +++ b/INSTALL @@ -2,8 +2,8 @@ Reference Policy has the following runtime requirements: * Linux kernel >= 2.6.33 Reference Policy has the following build requirements: - * SELinux userspace 2.8 - * Python >= 3.4 + * SELinux userspace 3.0 + * Python >= 3.5 When developing a policy, running scripts from directory testing/ requires: * Python >= 3.6 diff --git a/Makefile b/Makefile index a080759c..eae365e5 100644 --- a/Makefile +++ b/Makefile @@ -616,7 +616,7 @@ checklabels: echo "No filesystems with extended attributes found!" ;\ false ;\ fi - $(verbose) $(SETFILES) -v -n $(fcpath) $(filesystems) + $(verbose) $(SETFILES) -E -v -n $(fcpath) $(filesystems) restorelabels: @echo "Restoring labels on filesystem types: $(fs_names)" @@ -624,7 +624,7 @@ restorelabels: echo "No filesystems with extended attributes found!" ;\ false ;\ fi - $(verbose) $(SETFILES) -v $(fcpath) $(filesystems) + $(verbose) $(SETFILES) -E -v $(fcpath) $(filesystems) relabel: @echo "Relabeling filesystem types: $(fs_names)" @@ -632,7 +632,7 @@ relabel: echo "No filesystems with extended attributes found!" ;\ false ;\ fi - $(verbose) $(SETFILES) $(fcpath) $(filesystems) + $(verbose) $(SETFILES) -E $(fcpath) $(filesystems) resetlabels: @echo "Resetting labels on filesystem types: $(fs_names)" @@ -640,7 +640,7 @@ resetlabels: echo "No filesystems with extended attributes found!" ;\ false ;\ fi - $(verbose) $(SETFILES) -F $(fcpath) $(filesystems) + $(verbose) $(SETFILES) -E -F $(fcpath) $(filesystems) ######################################## #