1 |
commit: e38740be4ebccc83e4682c8e84d5fb615fafd7e2 |
2 |
Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
3 |
AuthorDate: Fri Nov 2 19:01:33 2012 +0000 |
4 |
Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
5 |
CommitDate: Fri Nov 2 19:01:33 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=e38740be |
7 |
|
8 |
Reshuffle gentoo specific gpg code |
9 |
|
10 |
--- |
11 |
policy/modules/contrib/gpg.te | 14 ++++++++------ |
12 |
1 files changed, 8 insertions(+), 6 deletions(-) |
13 |
|
14 |
diff --git a/policy/modules/contrib/gpg.te b/policy/modules/contrib/gpg.te |
15 |
index 813c93a..50d95e2 100644 |
16 |
--- a/policy/modules/contrib/gpg.te |
17 |
+++ b/policy/modules/contrib/gpg.te |
18 |
@@ -320,6 +320,14 @@ miscfiles_read_localization(gpg_pinentry_t) |
19 |
userdom_read_user_home_content_files(gpg_pinentry_t) |
20 |
userdom_use_user_terminals(gpg_pinentry_t) |
21 |
|
22 |
+ifdef(`distro_gentoo',` |
23 |
+ optional_policy(` |
24 |
+ mutt_read_home_files(gpg_t) |
25 |
+ mutt_read_tmp_files(gpg_t) |
26 |
+ mutt_rw_tmp_files(gpg_t) |
27 |
+ ') |
28 |
+') |
29 |
+ |
30 |
tunable_policy(`use_nfs_home_dirs',` |
31 |
fs_read_nfs_files(gpg_pinentry_t) |
32 |
') |
33 |
@@ -334,12 +342,6 @@ optional_policy(` |
34 |
') |
35 |
|
36 |
optional_policy(` |
37 |
- mutt_read_home_files(gpg_t) |
38 |
- mutt_read_tmp_files(gpg_t) |
39 |
- mutt_rw_tmp_files(gpg_t) |
40 |
-') |
41 |
- |
42 |
-optional_policy(` |
43 |
pulseaudio_exec(gpg_pinentry_t) |
44 |
pulseaudio_rw_home_files(gpg_pinentry_t) |
45 |
pulseaudio_setattr_home_dir(gpg_pinentry_t) |