| 1 |
commit: 134760e167ddc61a6b32c6f9e538cbed771b9516 |
| 2 |
Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 3 |
AuthorDate: Tue Nov 27 19:12:06 2012 +0000 |
| 4 |
Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 5 |
CommitDate: Tue Nov 27 19:12:06 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=134760e1 |
| 7 |
|
| 8 |
Things that have been merged upstream |
| 9 |
|
| 10 |
--- |
| 11 |
policy/modules/contrib/asterisk.te | 7 ------- |
| 12 |
policy/modules/contrib/dovecot.fc | 4 ---- |
| 13 |
policy/modules/contrib/openvpn.fc | 4 ---- |
| 14 |
policy/modules/contrib/openvpn.te | 10 ---------- |
| 15 |
4 files changed, 0 insertions(+), 25 deletions(-) |
| 16 |
|
| 17 |
diff --git a/policy/modules/contrib/asterisk.te b/policy/modules/contrib/asterisk.te |
| 18 |
index 9dad905..5439f1c 100644 |
| 19 |
--- a/policy/modules/contrib/asterisk.te |
| 20 |
+++ b/policy/modules/contrib/asterisk.te |
| 21 |
@@ -153,13 +153,6 @@ miscfiles_read_localization(asterisk_t) |
| 22 |
userdom_dontaudit_use_unpriv_user_fds(asterisk_t) |
| 23 |
userdom_dontaudit_search_user_home_dirs(asterisk_t) |
| 24 |
|
| 25 |
-ifdef(`distro_gentoo',` |
| 26 |
- optional_policy(` |
| 27 |
- # Sending voicemail message |
| 28 |
- mta_system_content(asterisk_tmp_t) |
| 29 |
- ') |
| 30 |
-') |
| 31 |
- |
| 32 |
optional_policy(` |
| 33 |
alsa_read_rw_config(asterisk_t) |
| 34 |
') |
| 35 |
|
| 36 |
diff --git a/policy/modules/contrib/dovecot.fc b/policy/modules/contrib/dovecot.fc |
| 37 |
index 2449986..c880070 100644 |
| 38 |
--- a/policy/modules/contrib/dovecot.fc |
| 39 |
+++ b/policy/modules/contrib/dovecot.fc |
| 40 |
@@ -34,7 +34,3 @@ |
| 41 |
/var/log/dovecot\.log.* gen_context(system_u:object_r:dovecot_var_log_t,s0) |
| 42 |
|
| 43 |
/var/spool/dovecot(/.*)? gen_context(system_u:object_r:dovecot_spool_t,s0) |
| 44 |
- |
| 45 |
-ifdef(`distro_gentoo',` |
| 46 |
-/etc/ssl/dovecot(/.*)? gen_context(system_u:object_r:dovecot_cert_t,s0) |
| 47 |
-') |
| 48 |
|
| 49 |
diff --git a/policy/modules/contrib/openvpn.fc b/policy/modules/contrib/openvpn.fc |
| 50 |
index 1d12d94..300213f 100644 |
| 51 |
--- a/policy/modules/contrib/openvpn.fc |
| 52 |
+++ b/policy/modules/contrib/openvpn.fc |
| 53 |
@@ -10,7 +10,3 @@ |
| 54 |
|
| 55 |
/var/run/openvpn(/.*)? gen_context(system_u:object_r:openvpn_var_run_t,s0) |
| 56 |
/var/run/openvpn\.client.* -- gen_context(system_u:object_r:openvpn_var_run_t,s0) |
| 57 |
- |
| 58 |
-ifdef(`distro_gentoo',` |
| 59 |
-/var/log/openvpn-status\.log -- gen_context(system_u:object_r:openvpn_status_t,s0) |
| 60 |
-') |
| 61 |
|
| 62 |
diff --git a/policy/modules/contrib/openvpn.te b/policy/modules/contrib/openvpn.te |
| 63 |
index afce479..9cfb0cf 100644 |
| 64 |
--- a/policy/modules/contrib/openvpn.te |
| 65 |
+++ b/policy/modules/contrib/openvpn.te |
| 66 |
@@ -38,11 +38,6 @@ logging_log_file(openvpn_var_log_t) |
| 67 |
type openvpn_var_run_t; |
| 68 |
files_pid_file(openvpn_var_run_t) |
| 69 |
|
| 70 |
-ifdef(`distro_gentoo',` |
| 71 |
- type openvpn_status_t; |
| 72 |
- logging_log_file(openvpn_status_t) |
| 73 |
-') |
| 74 |
- |
| 75 |
######################################## |
| 76 |
# |
| 77 |
# Local policy |
| 78 |
@@ -136,11 +131,6 @@ sysnet_use_ldap(openvpn_t) |
| 79 |
|
| 80 |
userdom_use_user_terminals(openvpn_t) |
| 81 |
|
| 82 |
-ifdef(`distro_gentoo',` |
| 83 |
- allow openvpn_t openvpn_status_t:file manage_file_perms; |
| 84 |
- logging_log_filetrans(openvpn_t, openvpn_status_t, file, "openvpn-status.log") |
| 85 |
-') |
| 86 |
- |
| 87 |
tunable_policy(`openvpn_enable_homedirs',` |
| 88 |
userdom_read_user_home_content_files(openvpn_t) |
| 89 |
') |
Archives