1 |
commit: 71f9eaa40d0cca90e45ad49ae78e0ce3767ebb7a |
2 |
Author: Chris PeBenito <pebenito <AT> ieee <DOT> org> |
3 |
AuthorDate: Tue Feb 2 18:32:42 2021 +0000 |
4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 6 21:15:09 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=71f9eaa4 |
7 |
|
8 |
apt, bootloader: Move lines. |
9 |
|
10 |
Signed-off-by: Chris PeBenito <pebenito <AT> ieee.org> |
11 |
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> |
12 |
|
13 |
policy/modules/admin/apt.fc | 6 ++++-- |
14 |
policy/modules/admin/bootloader.te | 5 ++--- |
15 |
2 files changed, 6 insertions(+), 5 deletions(-) |
16 |
|
17 |
diff --git a/policy/modules/admin/apt.fc b/policy/modules/admin/apt.fc |
18 |
index 66fec023..456375f9 100644 |
19 |
--- a/policy/modules/admin/apt.fc |
20 |
+++ b/policy/modules/admin/apt.fc |
21 |
@@ -4,9 +4,11 @@ |
22 |
/usr/bin/apt-get -- gen_context(system_u:object_r:apt_exec_t,s0) |
23 |
/usr/bin/apt-shell -- gen_context(system_u:object_r:apt_exec_t,s0) |
24 |
/usr/bin/aptitude -- gen_context(system_u:object_r:apt_exec_t,s0) |
25 |
+/usr/bin/unattended-upgrade -- gen_context(system_u:object_r:apt_exec_t,s0) |
26 |
+ |
27 |
/usr/sbin/update-apt-xapian-index -- gen_context(system_u:object_r:apt_exec_t,s0) |
28 |
+ |
29 |
/usr/share/unattended-upgrades/unattended-upgrade-shutdown -- gen_context(system_u:object_r:apt_exec_t,s0) |
30 |
-/usr/bin/unattended-upgrade -- gen_context(system_u:object_r:apt_exec_t,s0) |
31 |
|
32 |
ifndef(`distro_redhat',` |
33 |
/usr/sbin/synaptic -- gen_context(system_u:object_r:apt_exec_t,s0) |
34 |
@@ -25,5 +27,5 @@ ifndef(`distro_redhat',` |
35 |
/var/lock/aptitude gen_context(system_u:object_r:apt_lock_t,s0) |
36 |
|
37 |
/var/log/aptitude.* gen_context(system_u:object_r:apt_var_log_t,s0) |
38 |
-/var/log/unattended-upgrades(/.*) gen_context(system_u:object_r:apt_var_log_t,s0) |
39 |
/var/log/apt(/.*)? gen_context(system_u:object_r:apt_var_log_t,s0) |
40 |
+/var/log/unattended-upgrades(/.*) gen_context(system_u:object_r:apt_var_log_t,s0) |
41 |
|
42 |
diff --git a/policy/modules/admin/bootloader.te b/policy/modules/admin/bootloader.te |
43 |
index 78b34125..cbaf65cd 100644 |
44 |
--- a/policy/modules/admin/bootloader.te |
45 |
+++ b/policy/modules/admin/bootloader.te |
46 |
@@ -180,15 +180,14 @@ ifdef(`distro_debian',` |
47 |
|
48 |
libs_relabelto_lib_files(bootloader_t) |
49 |
|
50 |
+ apt_use_fds(bootloader_t) |
51 |
+ apt_use_ptys(bootloader_t) |
52 |
# for apt-cache |
53 |
apt_read_db(bootloader_t) |
54 |
apt_manage_cache(bootloader_t) |
55 |
|
56 |
dpkg_read_db(bootloader_t) |
57 |
dpkg_rw_pipes(bootloader_t) |
58 |
- |
59 |
- apt_use_fds(bootloader_t) |
60 |
- apt_use_ptys(bootloader_t) |
61 |
') |
62 |
|
63 |
ifdef(`distro_redhat',` |