← Back to branch summary

~ubuntu-branches/ubuntu/natty/refpolicy-ubuntu/natty

« back to all changes in this revision

Viewing changes to debian/patches/avahi.patch

  • Committer: Bazaar Package Importer
  • Author(s): Caleb Case
  • Date: 2009-10-19 01:48:39 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20091019014839-0rpi67ygkrjya30k
Tags: 0.2.20090730-0ubuntu1
https://launchpad.net/bugs/434084
* Updated to upstream release 2.20090730
* Handle Upstart direct execution of daemons.
* Pre-depend on selinux to ensure that the trigger is handled (LP: #434084).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/avahi.patch
6
6
---
7
7
---
8
8
 policy/modules/services/avahi.fc |    1 +
9
 
 policy/modules/services/avahi.te |    8 +++++++-
10
 
 2 files changed, 8 insertions(+), 1 deletion(-)
 
9
 policy/modules/services/avahi.te |    7 ++++++-
 
10
 2 files changed, 7 insertions(+), 1 deletion(-)
11
11
 
12
 
Index: b/policy/modules/services/avahi.fc
 
12
Index: refpolicy-ubuntu-0.2.20090730/policy/modules/services/avahi.fc
13
13
===================================================================
14
 
--- a/policy/modules/services/avahi.fc
15
 
+++ b/policy/modules/services/avahi.fc
 
14
--- refpolicy-ubuntu-0.2.20090730.orig/policy/modules/services/avahi.fc
 
15
+++ refpolicy-ubuntu-0.2.20090730/policy/modules/services/avahi.fc
16
16
@@ -6,4 +6,5 @@
17
17
 
18
18
 /var/run/avahi-daemon(/.*)?            gen_context(system_u:object_r:avahi_var_run_t,s0)
19
19
 
20
20
+/usr/lib/avahi/avahi-daemon-check-dns\.sh      --      gen_context(system_u:object_r:avahi_exec_t,s0)
21
21
 /usr/lib/avahi-autoipd(/.*)            gen_context(system_u:object_r:avahi_var_lib_t,s0)
22
 
Index: b/policy/modules/services/avahi.te
 
22
Index: refpolicy-ubuntu-0.2.20090730/policy/modules/services/avahi.te
23
23
===================================================================
24
 
--- a/policy/modules/services/avahi.te
25
 
+++ b/policy/modules/services/avahi.te
26
 
@@ -37,13 +37,15 @@ manage_dirs_pattern(avahi_t, avahi_var_l
27
 
 manage_files_pattern(avahi_t, avahi_var_lib_t, avahi_var_lib_t)
28
 
 files_var_lib_filetrans(avahi_t, avahi_var_lib_t, { dir file })
29
 
 
30
 
+manage_dirs_pattern(avahi_t, avahi_var_run_t, avahi_var_run_t)
 
24
--- refpolicy-ubuntu-0.2.20090730.orig/policy/modules/services/avahi.te
 
25
+++ refpolicy-ubuntu-0.2.20090730/policy/modules/services/avahi.te
 
26
@@ -40,12 +40,13 @@ files_var_lib_filetrans(avahi_t, avahi_v
31
27
 manage_files_pattern(avahi_t, avahi_var_run_t, avahi_var_run_t)
32
28
 manage_sock_files_pattern(avahi_t, avahi_var_run_t, avahi_var_run_t)
33
29
 allow avahi_t avahi_var_run_t:dir setattr;
34
 
-files_pid_filetrans(avahi_t,avahi_var_run_t,file)
35
 
+files_pid_filetrans(avahi_t,avahi_var_run_t,{ file dir })
 
30
-files_pid_filetrans(avahi_t, avahi_var_run_t, file)
 
31
+files_pid_filetrans(avahi_t, avahi_var_run_t, { file dir })
36
32
 
37
33
 kernel_read_kernel_sysctls(avahi_t)
38
34
 kernel_list_proc(avahi_t)
39
 
+kernel_read_system_state(avahi_t)
40
35
 kernel_read_proc_symlinks(avahi_t)
41
36
 kernel_read_network_state(avahi_t)
 
37
+kernel_read_system_state(avahi_t)
42
38
 
43
 
@@ -77,6 +79,8 @@ files_read_usr_files(avahi_t)
 
39
 corenet_all_recvfrom_unlabeled(avahi_t)
 
40
 corenet_all_recvfrom_netlabel(avahi_t)
 
41
@@ -77,6 +78,8 @@ files_read_usr_files(avahi_t)
44
42
 
45
43
 auth_use_nsswitch(avahi_t)
46
44
 
49
47
 init_signal_script(avahi_t)
50
48
 init_signull_script(avahi_t)
51
49
 
52
 
@@ -85,6 +89,8 @@ logging_send_syslog_msg(avahi_t)
 
50
@@ -85,6 +88,8 @@ logging_send_syslog_msg(avahi_t)
53
51
 miscfiles_read_localization(avahi_t)
54
52
 miscfiles_read_certs(avahi_t)
55
53