| 1 |
commit: 52b4ccdb7120e7c8259741d0fd35deea08208414 |
| 2 |
Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 3 |
AuthorDate: Sat Nov 22 18:14:02 2014 +0000 |
| 4 |
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 22 18:14:02 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=52b4ccdb |
| 7 |
|
| 8 |
Reshuffle to match upstream |
| 9 |
|
| 10 |
--- |
| 11 |
policy/modules/roles/staff.te | 49 ++++++++++++++++++++++--------------------- |
| 12 |
1 file changed, 25 insertions(+), 24 deletions(-) |
| 13 |
|
| 14 |
diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te |
| 15 |
index 8081d0b..14706de 100644 |
| 16 |
--- a/policy/modules/roles/staff.te |
| 17 |
+++ b/policy/modules/roles/staff.te |
| 18 |
@@ -23,10 +23,6 @@ optional_policy(` |
| 19 |
') |
| 20 |
|
| 21 |
optional_policy(` |
| 22 |
- chromium_role(staff_r, staff_t) |
| 23 |
-') |
| 24 |
- |
| 25 |
-optional_policy(` |
| 26 |
dbadm_role_change(staff_r) |
| 27 |
') |
| 28 |
|
| 29 |
@@ -109,10 +105,6 @@ ifndef(`distro_redhat',` |
| 30 |
') |
| 31 |
|
| 32 |
optional_policy(` |
| 33 |
- gorg_role(staff_r, staff_t) |
| 34 |
- ') |
| 35 |
- |
| 36 |
- optional_policy(` |
| 37 |
gpg_role(staff_r, staff_t) |
| 38 |
') |
| 39 |
|
| 40 |
@@ -125,10 +117,6 @@ ifndef(`distro_redhat',` |
| 41 |
') |
| 42 |
|
| 43 |
optional_policy(` |
| 44 |
- links_role(staff_r, staff_t) |
| 45 |
- ') |
| 46 |
- |
| 47 |
- optional_policy(` |
| 48 |
lockdev_role(staff_r, staff_t) |
| 49 |
') |
| 50 |
|
| 51 |
@@ -149,14 +137,6 @@ ifndef(`distro_redhat',` |
| 52 |
') |
| 53 |
|
| 54 |
optional_policy(` |
| 55 |
- mutt_role(staff_r, staff_t) |
| 56 |
- ') |
| 57 |
- |
| 58 |
- optional_policy(` |
| 59 |
- pan_role(staff_r, staff_t) |
| 60 |
- ') |
| 61 |
- |
| 62 |
- optional_policy(` |
| 63 |
pyzor_role(staff_r, staff_t) |
| 64 |
') |
| 65 |
|
| 66 |
@@ -169,10 +149,6 @@ ifndef(`distro_redhat',` |
| 67 |
') |
| 68 |
|
| 69 |
optional_policy(` |
| 70 |
- skype_role(staff_r, staff_t) |
| 71 |
- ') |
| 72 |
- |
| 73 |
- optional_policy(` |
| 74 |
screen_role_template(staff, staff_r, staff_t) |
| 75 |
') |
| 76 |
|
| 77 |
@@ -210,11 +186,36 @@ ifndef(`distro_redhat',` |
| 78 |
') |
| 79 |
|
| 80 |
ifdef(`distro_gentoo',` |
| 81 |
+ |
| 82 |
+ optional_policy(` |
| 83 |
+ chromium_role(staff_r, staff_t) |
| 84 |
+ ') |
| 85 |
+ |
| 86 |
optional_policy(` |
| 87 |
googletalk_run_plugin(staff_t, staff_r) |
| 88 |
') |
| 89 |
|
| 90 |
optional_policy(` |
| 91 |
+ gorg_role(staff_r, staff_t) |
| 92 |
+ ') |
| 93 |
+ |
| 94 |
+ optional_policy(` |
| 95 |
+ links_role(staff_r, staff_t) |
| 96 |
+ ') |
| 97 |
+ |
| 98 |
+ optional_policy(` |
| 99 |
+ mutt_role(staff_r, staff_t) |
| 100 |
+ ') |
| 101 |
+ |
| 102 |
+ optional_policy(` |
| 103 |
+ pan_role(staff_r, staff_t) |
| 104 |
+ ') |
| 105 |
+ |
| 106 |
+ optional_policy(` |
| 107 |
pulseaudio_role(staff_r, staff_t) |
| 108 |
') |
| 109 |
+ |
| 110 |
+ optional_policy(` |
| 111 |
+ skype_role(staff_r, staff_t) |
| 112 |
+ ') |
| 113 |
') |
Archives