[gentoo-commits] proj/hardened-refpolicy:master commit in: /

["Jason Zaman" <perfinion@gentoo.org>]

commit:     9edc8b55661f15d3d365f848b55494939bc612a4
Author:     Chris PeBenito <pebenito <AT> ieee <DOT> org>
AuthorDate: Wed Jan  6 18:51:03 2021 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> 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 <pebenito <AT> ieee.org>
Signed-off-by: Jason Zaman <perfinion <AT> 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)
 
 ########################################
 #