[gentoo-commits] proj/hardened-refpolicy:bitcoin commit in: policy/modules/roles/

["Sven Vermeulen" <swift@gentoo.org>]

commit:     52b4ccdb7120e7c8259741d0fd35deea08208414
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Sat Nov 22 18:14:02 2014 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Sat Nov 22 18:14:02 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=52b4ccdb

Reshuffle to match upstream

---
 policy/modules/roles/staff.te | 49 ++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te
index 8081d0b..14706de 100644
--- a/policy/modules/roles/staff.te
+++ b/policy/modules/roles/staff.te
@@ -23,10 +23,6 @@ optional_policy(`
 ')
 
 optional_policy(`
-	chromium_role(staff_r, staff_t)
-')
-
-optional_policy(`
 	dbadm_role_change(staff_r)
 ')
 
@@ -109,10 +105,6 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		gorg_role(staff_r, staff_t)
-	')
-
-	optional_policy(`
 		gpg_role(staff_r, staff_t)
 	')
 
@@ -125,10 +117,6 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		links_role(staff_r, staff_t)
-	')
-
-	optional_policy(`
 		lockdev_role(staff_r, staff_t)
 	')
 
@@ -149,14 +137,6 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		mutt_role(staff_r, staff_t)
-	')
-
-	optional_policy(`
-		pan_role(staff_r, staff_t)
-	')
-
-	optional_policy(`
 		pyzor_role(staff_r, staff_t)
 	')
 
@@ -169,10 +149,6 @@ ifndef(`distro_redhat',`
 	')
 
 	optional_policy(`
-		skype_role(staff_r, staff_t)
-	')
-
-	optional_policy(`
 		screen_role_template(staff, staff_r, staff_t)
 	')
 
@@ -210,11 +186,36 @@ ifndef(`distro_redhat',`
 ')
 
 ifdef(`distro_gentoo',`
+
+	optional_policy(`
+		chromium_role(staff_r, staff_t)
+	')
+
 	optional_policy(`
 		googletalk_run_plugin(staff_t, staff_r)
 	')
 
 	optional_policy(`
+		gorg_role(staff_r, staff_t)
+	')
+
+	optional_policy(`
+		links_role(staff_r, staff_t)
+	')
+
+	optional_policy(`
+		mutt_role(staff_r, staff_t)
+	')
+
+	optional_policy(`
+		pan_role(staff_r, staff_t)
+	')
+
+	optional_policy(`
 		pulseaudio_role(staff_r, staff_t)
 	')
+
+	optional_policy(`
+		skype_role(staff_r, staff_t)
+	')
 ')