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

[Sven Vermeulen]

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

Reshuffle to match upstream

---
 policy/modules/roles/unprivuser.te | 57 +++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/policy/modules/roles/unprivuser.te 
b/policy/modules/roles/unprivuser.te
index c0d6204..c171833 100644
--- a/policy/modules/roles/unprivuser.te
+++ b/policy/modules/roles/unprivuser.te
@@ -17,10 +17,6 @@ optional_policy(`
 ')
 
 optional_policy(`
-       chromium_role(user_r, user_t)
-')
-
-optional_policy(`
        git_role(user_r, user_t)
 ')
 
@@ -82,10 +78,6 @@ ifndef(`distro_redhat',`
        ')
 
        optional_policy(`
-               gorg_role(user_r, user_t)
-       ')
-
-       optional_policy(`
                gpg_role(user_r, user_t)
        ')
 
@@ -102,10 +94,6 @@ ifndef(`distro_redhat',`
        ')
 
        optional_policy(`
-               links_role(user_r, user_t)
-       ')
-
-       optional_policy(`
                lockdev_role(user_r, user_t)
        ')
 
@@ -126,14 +114,6 @@ ifndef(`distro_redhat',`
        ')
 
        optional_policy(`
-               mutt_role(user_r, user_t)
-       ')
-
-       optional_policy(`
-               pan_role(user_r, user_t)
-       ')
-
-       optional_policy(`
                postgresql_role(user_r, user_t)
        ')
 
@@ -150,14 +130,6 @@ ifndef(`distro_redhat',`
        ')
 
        optional_policy(`
-               rtorrent_role(user_r, user_t)
-       ')
-
-       optional_policy(`
-               skype_role(user_r, user_t)
-       ')
-
-       optional_policy(`
                spamassassin_role(user_r, user_t)
        ')
 
@@ -199,6 +171,11 @@ ifndef(`distro_redhat',`
 ')
 
 ifdef(`distro_gentoo',`
+
+       optional_policy(`
+               chromium_role(user_r, user_t)
+       ')
+
        optional_policy(`
                dropbox_role(user_r, user_t)
        ')
@@ -208,6 +185,30 @@ ifdef(`distro_gentoo',`
        ')
 
        optional_policy(`
+               gorg_role(user_r, user_t)
+       ')
+
+       optional_policy(`
+               links_role(user_r, user_t)
+       ')
+
+       optional_policy(`
+               mutt_role(user_r, user_t)
+       ')
+
+       optional_policy(`
+               pan_role(user_r, user_t)
+       ')
+
+       optional_policy(`
                pulseaudio_role(user_r, user_t)
        ')
+
+       optional_policy(`
+               rtorrent_role(user_r, user_t)
+       ')
+
+       optional_policy(`
+               skype_role(user_r, user_t)
+       ')
 ')