diff options
Diffstat (limited to 'recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysvinit.patch')
-rw-r--r-- | recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysvinit.patch | 70 |
1 files changed, 32 insertions, 38 deletions
diff --git a/recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysvinit.patch b/recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysvinit.patch index 0c09825..81fe141 100644 --- a/recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysvinit.patch +++ b/recipes-security/refpolicy/refpolicy-git/poky-fc-update-alternatives_sysvinit.patch | |||
@@ -6,51 +6,45 @@ Subject: [PATCH 1/4] fix update-alternatives for sysvinit | |||
6 | Upstream-Status: Inappropriate [only for Poky] | 6 | Upstream-Status: Inappropriate [only for Poky] |
7 | 7 | ||
8 | Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> | 8 | Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> |
9 | Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> | ||
9 | --- | 10 | --- |
10 | policy/modules/contrib/shutdown.fc | 1 + | 11 | policy/modules/contrib/shutdown.fc | 1 + |
11 | policy/modules/kernel/corecommands.fc | 1 + | 12 | policy/modules/kernel/corecommands.fc | 1 + |
12 | policy/modules/system/init.fc | 1 + | 13 | policy/modules/system/init.fc | 1 + |
13 | 3 files changed, 3 insertions(+) | 14 | 3 files changed, 3 insertions(+) |
14 | 15 | ||
15 | --- a/policy/modules/contrib/shutdown.fc | 16 | Index: refpolicy/policy/modules/contrib/shutdown.fc |
16 | +++ b/policy/modules/contrib/shutdown.fc | 17 | =================================================================== |
17 | @@ -1,10 +1,11 @@ | 18 | --- refpolicy.orig/policy/modules/contrib/shutdown.fc |
18 | /etc/nologin -- gen_context(system_u:object_r:shutdown_etc_t,s0) | 19 | +++ refpolicy/policy/modules/contrib/shutdown.fc |
19 | 20 | @@ -3,5 +3,6 @@ | |
20 | /lib/upstart/shutdown -- gen_context(system_u:object_r:shutdown_exec_t,s0) | ||
21 | |||
22 | /sbin/shutdown -- gen_context(system_u:object_r:shutdown_exec_t,s0) | ||
23 | +/sbin/shutdown\.sysvinit -- gen_context(system_u:object_r:shutdown_exec_t,s0) | ||
24 | |||
25 | /usr/lib/upstart/shutdown -- gen_context(system_u:object_r:shutdown_exec_t,s0) | 21 | /usr/lib/upstart/shutdown -- gen_context(system_u:object_r:shutdown_exec_t,s0) |
26 | 22 | ||
27 | /usr/sbin/shutdown -- gen_context(system_u:object_r:shutdown_exec_t,s0) | 23 | /usr/sbin/shutdown -- gen_context(system_u:object_r:shutdown_exec_t,s0) |
24 | +/usr/sbin/shutdown\.sysvinit -- gen_context(system_u:object_r:shutdown_exec_t,s0) | ||
25 | |||
26 | /run/shutdown\.pid -- gen_context(system_u:object_r:shutdown_var_run_t,s0) | ||
27 | Index: refpolicy/policy/modules/kernel/corecommands.fc | ||
28 | =================================================================== | ||
29 | --- refpolicy.orig/policy/modules/kernel/corecommands.fc | ||
30 | +++ refpolicy/policy/modules/kernel/corecommands.fc | ||
31 | @@ -144,6 +144,7 @@ ifdef(`distro_gentoo',` | ||
32 | /usr/bin/ksh.* -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
33 | /usr/bin/mksh -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
34 | /usr/bin/mountpoint -- gen_context(system_u:object_r:bin_t,s0) | ||
35 | +/usr/bin/mountpoint\.sysvinit -- gen_context(system_u:object_r:bin_t,s0) | ||
36 | /usr/bin/sash -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
37 | /usr/bin/scponly -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
38 | /usr/bin/tcsh -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
39 | Index: refpolicy/policy/modules/system/init.fc | ||
40 | =================================================================== | ||
41 | --- refpolicy.orig/policy/modules/system/init.fc | ||
42 | +++ refpolicy/policy/modules/system/init.fc | ||
43 | @@ -39,6 +39,7 @@ ifdef(`distro_gentoo', ` | ||
44 | /usr/libexec/dcc/stop-.* -- gen_context(system_u:object_r:initrc_exec_t,s0) | ||
45 | |||
46 | /usr/sbin/init(ng)? -- gen_context(system_u:object_r:init_exec_t,s0) | ||
47 | +/usr/sbin/init\.sysvinit -- gen_context(system_u:object_r:init_exec_t,s0) | ||
48 | /usr/sbin/open_init_pty -- gen_context(system_u:object_r:initrc_exec_t,s0) | ||
49 | /usr/sbin/upstart -- gen_context(system_u:object_r:init_exec_t,s0) | ||
28 | 50 | ||
29 | --- a/policy/modules/kernel/corecommands.fc | ||
30 | +++ b/policy/modules/kernel/corecommands.fc | ||
31 | @@ -8,10 +8,11 @@ | ||
32 | /bin/bash2 -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
33 | /bin/fish -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
34 | /bin/ksh.* -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
35 | /bin/mksh -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
36 | /bin/mountpoint -- gen_context(system_u:object_r:bin_t,s0) | ||
37 | +/bin/mountpoint\.sysvinit -- gen_context(system_u:object_r:bin_t,s0) | ||
38 | /bin/sash -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
39 | /bin/tcsh -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
40 | /bin/yash -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
41 | /bin/zsh.* -- gen_context(system_u:object_r:shell_exec_t,s0) | ||
42 | |||
43 | --- a/policy/modules/system/init.fc | ||
44 | +++ b/policy/modules/system/init.fc | ||
45 | @@ -30,10 +30,11 @@ ifdef(`distro_gentoo', ` | ||
46 | |||
47 | # | ||
48 | # /sbin | ||
49 | # | ||
50 | /sbin/init(ng)? -- gen_context(system_u:object_r:init_exec_t,s0) | ||
51 | +/sbin/init\.sysvinit -- gen_context(system_u:object_r:init_exec_t,s0) | ||
52 | # because nowadays, /sbin/init is often a symlink to /sbin/upstart | ||
53 | /sbin/upstart -- gen_context(system_u:object_r:init_exec_t,s0) | ||
54 | |||
55 | ifdef(`distro_gentoo', ` | ||
56 | /sbin/rc -- gen_context(system_u:object_r:rc_exec_t,s0) | ||