1 |
commit: b189f4aee23f48a368b7a9478072181ef104c9b2 |
2 |
Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
3 |
AuthorDate: Sat Nov 22 18:23:36 2014 +0000 |
4 |
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 22 18:23:36 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=b189f4ae |
7 |
|
8 |
Reshuffle to match upstream |
9 |
|
10 |
--- |
11 |
policy/modules/roles/unprivuser.te | 57 +++++++++++++++++++------------------- |
12 |
1 file changed, 29 insertions(+), 28 deletions(-) |
13 |
|
14 |
diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te |
15 |
index c0d6204..c171833 100644 |
16 |
--- a/policy/modules/roles/unprivuser.te |
17 |
+++ b/policy/modules/roles/unprivuser.te |
18 |
@@ -17,10 +17,6 @@ optional_policy(` |
19 |
') |
20 |
|
21 |
optional_policy(` |
22 |
- chromium_role(user_r, user_t) |
23 |
-') |
24 |
- |
25 |
-optional_policy(` |
26 |
git_role(user_r, user_t) |
27 |
') |
28 |
|
29 |
@@ -82,10 +78,6 @@ ifndef(`distro_redhat',` |
30 |
') |
31 |
|
32 |
optional_policy(` |
33 |
- gorg_role(user_r, user_t) |
34 |
- ') |
35 |
- |
36 |
- optional_policy(` |
37 |
gpg_role(user_r, user_t) |
38 |
') |
39 |
|
40 |
@@ -102,10 +94,6 @@ ifndef(`distro_redhat',` |
41 |
') |
42 |
|
43 |
optional_policy(` |
44 |
- links_role(user_r, user_t) |
45 |
- ') |
46 |
- |
47 |
- optional_policy(` |
48 |
lockdev_role(user_r, user_t) |
49 |
') |
50 |
|
51 |
@@ -126,14 +114,6 @@ ifndef(`distro_redhat',` |
52 |
') |
53 |
|
54 |
optional_policy(` |
55 |
- mutt_role(user_r, user_t) |
56 |
- ') |
57 |
- |
58 |
- optional_policy(` |
59 |
- pan_role(user_r, user_t) |
60 |
- ') |
61 |
- |
62 |
- optional_policy(` |
63 |
postgresql_role(user_r, user_t) |
64 |
') |
65 |
|
66 |
@@ -150,14 +130,6 @@ ifndef(`distro_redhat',` |
67 |
') |
68 |
|
69 |
optional_policy(` |
70 |
- rtorrent_role(user_r, user_t) |
71 |
- ') |
72 |
- |
73 |
- optional_policy(` |
74 |
- skype_role(user_r, user_t) |
75 |
- ') |
76 |
- |
77 |
- optional_policy(` |
78 |
spamassassin_role(user_r, user_t) |
79 |
') |
80 |
|
81 |
@@ -199,6 +171,11 @@ ifndef(`distro_redhat',` |
82 |
') |
83 |
|
84 |
ifdef(`distro_gentoo',` |
85 |
+ |
86 |
+ optional_policy(` |
87 |
+ chromium_role(user_r, user_t) |
88 |
+ ') |
89 |
+ |
90 |
optional_policy(` |
91 |
dropbox_role(user_r, user_t) |
92 |
') |
93 |
@@ -208,6 +185,30 @@ ifdef(`distro_gentoo',` |
94 |
') |
95 |
|
96 |
optional_policy(` |
97 |
+ gorg_role(user_r, user_t) |
98 |
+ ') |
99 |
+ |
100 |
+ optional_policy(` |
101 |
+ links_role(user_r, user_t) |
102 |
+ ') |
103 |
+ |
104 |
+ optional_policy(` |
105 |
+ mutt_role(user_r, user_t) |
106 |
+ ') |
107 |
+ |
108 |
+ optional_policy(` |
109 |
+ pan_role(user_r, user_t) |
110 |
+ ') |
111 |
+ |
112 |
+ optional_policy(` |
113 |
pulseaudio_role(user_r, user_t) |
114 |
') |
115 |
+ |
116 |
+ optional_policy(` |
117 |
+ rtorrent_role(user_r, user_t) |
118 |
+ ') |
119 |
+ |
120 |
+ optional_policy(` |
121 |
+ skype_role(user_r, user_t) |
122 |
+ ') |
123 |
') |