From 7c23cf73df3d782519e86f9f8232105e3a899c54 Mon Sep 17 00:00:00 2001 From: Miroslav Grepl Date: Mar 17 2011 16:01:12 +0000 Subject: Fix multiple specification for boot.log --- diff --git a/policy-F15.patch b/policy-F15.patch index 73343e7..b7ffee0 100644 --- a/policy-F15.patch +++ b/policy-F15.patch @@ -33141,7 +33141,7 @@ index 0000000..cdd0339 + +sysnet_read_config(piranha_domain) diff --git a/policy/modules/services/plymouthd.fc b/policy/modules/services/plymouthd.fc -index 5702ca4..5df5316 100644 +index 5702ca4..08528da 100644 --- a/policy/modules/services/plymouthd.fc +++ b/policy/modules/services/plymouthd.fc @@ -5,3 +5,5 @@ @@ -33149,7 +33149,7 @@ index 5702ca4..5df5316 100644 /var/run/plymouth(/.*)? gen_context(system_u:object_r:plymouthd_var_run_t,s0) /var/spool/plymouth(/.*)? gen_context(system_u:object_r:plymouthd_spool_t,s0) + -+/var/log/boot\.log -- gen_context(system_u:object_r:plymouthd_var_log_t,s0) ++#/var/log/boot\.log -- gen_context(system_u:object_r:plymouthd_var_log_t,s0) diff --git a/policy/modules/services/plymouthd.if b/policy/modules/services/plymouthd.if index 9759ed8..48a5431 100644 --- a/policy/modules/services/plymouthd.if @@ -49363,7 +49363,7 @@ index 2b7e5f3..76b4ce1 100644 - nscd_socket_use(sulogin_t) -') diff --git a/policy/modules/system/logging.fc b/policy/modules/system/logging.fc -index 571599b..8a12739 100644 +index 571599b..4906577 100644 --- a/policy/modules/system/logging.fc +++ b/policy/modules/system/logging.fc @@ -17,6 +17,11 @@ @@ -49390,7 +49390,7 @@ index 571599b..8a12739 100644 /var/log -d gen_context(system_u:object_r:var_log_t,s0-mls_systemhigh) /var/log/.* gen_context(system_u:object_r:var_log_t,s0) -+/var/log/boot\.log gen_context(system_u:object_r:var_log_t,mls_systemhigh) ++/var/log/boot\.log -- gen_context(system_u:object_r:var_log_t,mls_systemhigh) /var/log/messages[^/]* gen_context(system_u:object_r:var_log_t,mls_systemhigh) /var/log/secure[^/]* gen_context(system_u:object_r:var_log_t,mls_systemhigh) /var/log/cron[^/]* gen_context(system_u:object_r:var_log_t,mls_systemhigh) diff --git a/selinux-policy.spec b/selinux-policy.spec index 7f00daf..7f3d287 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -473,6 +473,7 @@ exit 0 %changelog * Thu Mar 17 2011 Miroslav Grepl 3.9.16-5 +- Fix multiple specification for boot.log - devicekit leaks file descriptors to setfiles_t - Change all all_nodes to generic_node and all_if to generic_if - Should not use deprecated interface