← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/init.patch

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2010-04-22 17:10:43 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100422171043-khrw2m21gser7icb
Tags: 0.2.20091117-0ubuntu1
https://launchpad.net/bugs/568744
* New upstream release, converted to source format 3.
* Updated Ubuntu-specific patches thanks to Steve Lawrence (LP: #568744).
* Extracted Makefile change to debian/patches/bashisms.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/init.patch
1
 
---
2
 
 policy/modules/system/init.fc |    2 ++
3
 
 policy/modules/system/init.if |    8 ++++++++
4
 
 policy/modules/system/init.te |   11 +++++++++++
5
 
 3 files changed, 21 insertions(+)
6
 
 
7
 
Index: refpolicy-ubuntu-0.2.20090730/policy/modules/system/init.fc
 
1
Index: refpolicy-ubuntu-0.2.20091117/policy/modules/system/init.fc
8
2
===================================================================
9
 
--- refpolicy-ubuntu-0.2.20090730.orig/policy/modules/system/init.fc
10
 
+++ refpolicy-ubuntu-0.2.20090730/policy/modules/system/init.fc
11
 
@@ -42,6 +42,8 @@ ifdef(`distro_gentoo', `
 
3
--- refpolicy-ubuntu-0.2.20091117.orig/policy/modules/system/init.fc    2010-04-22 17:31:46.990652591 -0700
 
4
+++ refpolicy-ubuntu-0.2.20091117/policy/modules/system/init.fc 2010-04-22 17:45:08.380705030 -0700
 
5
@@ -42,6 +42,8 @@
12
6
 /usr/libexec/dcc/start-.* --   gen_context(system_u:object_r:initrc_exec_t,s0)
13
7
 /usr/libexec/dcc/stop-.* --    gen_context(system_u:object_r:initrc_exec_t,s0)
14
8
 
17
11
 /usr/sbin/apachectl    --      gen_context(system_u:object_r:initrc_exec_t,s0)
18
12
 /usr/sbin/open_init_pty        --      gen_context(system_u:object_r:initrc_exec_t,s0)
19
13
 
20
 
Index: refpolicy-ubuntu-0.2.20090730/policy/modules/system/init.if
 
14
Index: refpolicy-ubuntu-0.2.20091117/policy/modules/system/init.if
21
15
===================================================================
22
 
--- refpolicy-ubuntu-0.2.20090730.orig/policy/modules/system/init.if
23
 
+++ refpolicy-ubuntu-0.2.20090730/policy/modules/system/init.if
24
 
@@ -205,6 +205,10 @@ interface(`init_daemon_domain',`
 
16
--- refpolicy-ubuntu-0.2.20091117.orig/policy/modules/system/init.if    2010-04-22 17:31:46.970725122 -0700
 
17
+++ refpolicy-ubuntu-0.2.20091117/policy/modules/system/init.if 2010-04-22 17:45:08.380705030 -0700
 
18
@@ -205,6 +205,10 @@
25
19
        optional_policy(`
26
20
                nscd_socket_use($1)
27
21
        ')
32
26
 ')
33
27
 
34
28
 ########################################
35
 
@@ -280,6 +284,10 @@ interface(`init_system_domain',`
 
29
@@ -280,6 +284,10 @@
36
30
                        kernel_dontaudit_use_fds($1)
37
31
                ')
38
32
        ')
43
37
 ')
44
38
 
45
39
 ########################################
46
 
Index: refpolicy-ubuntu-0.2.20090730/policy/modules/system/init.te
 
40
Index: refpolicy-ubuntu-0.2.20091117/policy/modules/system/init.te
47
41
===================================================================
48
 
--- refpolicy-ubuntu-0.2.20090730.orig/policy/modules/system/init.te
49
 
+++ refpolicy-ubuntu-0.2.20090730/policy/modules/system/init.te
50
 
@@ -196,6 +196,10 @@ optional_policy(`
 
42
--- refpolicy-ubuntu-0.2.20091117.orig/policy/modules/system/init.te    2010-04-22 17:31:46.970725122 -0700
 
43
+++ refpolicy-ubuntu-0.2.20091117/policy/modules/system/init.te 2010-04-22 17:45:08.420434305 -0700
 
44
@@ -196,6 +196,10 @@
51
45
        unconfined_domain(init_t)
52
46
 ')
53
47
 
58
52
 ########################################
59
53
 #
60
54
 # Init script local policy
61
 
@@ -281,6 +285,9 @@ dev_manage_generic_files(initrc_t)
 
55
@@ -283,6 +287,9 @@
62
56
 # Wants to remove udev.tbl:
63
57
 dev_delete_generic_symlinks(initrc_t)
64
58
 
65
59
+# usplash needs this
66
60
+domain_mmap_low(initrc_t)
67
61
+
68
 
 fs_register_binary_executable_type(initrc_t)
69
 
 # rhgb-console writes to ramfs
70
 
 fs_write_ramfs_pipes(initrc_t)
71
 
@@ -680,6 +687,10 @@ optional_policy(`
 
62
 domain_kill_all_domains(initrc_t)
 
63
 domain_signal_all_domains(initrc_t)
 
64
 domain_signull_all_domains(initrc_t)
 
65
@@ -679,6 +686,10 @@
72
66
 ')
73
67
 
74
68
 optional_policy(`
75
 
+       polkit_dbus_chat(initrc_t)
 
69
+       policykit_dbus_chat(initrc_t)
76
70
+')
77
71
+
78
72
+optional_policy(`