Gentoo Archives: gentoo-commits

From: Sven Vermeulen <swift@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/
Date: Mon, 10 Apr 2017 16:59:34
Message-Id: 1491842528.b283816112a221d3ef0381b117b0261f24b1e7f4.swift@gentoo
1 commit: b283816112a221d3ef0381b117b0261f24b1e7f4
2 Author: Chris PeBenito <pebenito <AT> ieee <DOT> org>
3 AuthorDate: Thu Apr 6 20:59:03 2017 +0000
4 Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 10 16:42:08 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=b2838161
7
8 Misc fc changes from Russell Coker.
9
10 policy/modules/contrib/acct.fc | 2 --
11 policy/modules/contrib/acct.te | 2 +-
12 policy/modules/contrib/apache.fc | 1 +
13 policy/modules/contrib/apache.te | 2 +-
14 policy/modules/contrib/apt.fc | 1 +
15 policy/modules/contrib/apt.te | 2 +-
16 policy/modules/contrib/dirmngr.fc | 1 +
17 policy/modules/contrib/dirmngr.te | 2 +-
18 policy/modules/contrib/dpkg.fc | 1 +
19 policy/modules/contrib/dpkg.te | 2 +-
20 10 files changed, 9 insertions(+), 7 deletions(-)
21
22 diff --git a/policy/modules/contrib/acct.fc b/policy/modules/contrib/acct.fc
23 index 8a4f7efd..204e5375 100644
24 --- a/policy/modules/contrib/acct.fc
25 +++ b/policy/modules/contrib/acct.fc
26 @@ -1,5 +1,3 @@
27 -/etc/cron\.(daily|monthly)/acct -- gen_context(system_u:object_r:acct_exec_t,s0)
28 -
29 /etc/rc\.d/init\.d/psacct -- gen_context(system_u:object_r:acct_initrc_exec_t,s0)
30
31 /usr/sbin/accton -- gen_context(system_u:object_r:acct_exec_t,s0)
32
33 diff --git a/policy/modules/contrib/acct.te b/policy/modules/contrib/acct.te
34 index aca9d80b..fb2e1ebe 100644
35 --- a/policy/modules/contrib/acct.te
36 +++ b/policy/modules/contrib/acct.te
37 @@ -1,4 +1,4 @@
38 -policy_module(acct, 1.7.1)
39 +policy_module(acct, 1.7.2)
40
41 ########################################
42 #
43
44 diff --git a/policy/modules/contrib/apache.fc b/policy/modules/contrib/apache.fc
45 index 5fded37a..591c8ad2 100644
46 --- a/policy/modules/contrib/apache.fc
47 +++ b/policy/modules/contrib/apache.fc
48 @@ -85,6 +85,7 @@ ifdef(`distro_suse',`
49 /usr/share/mythtv/data(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
50 /usr/share/ntop/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
51 /usr/share/openca/htdocs(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
52 +/usr/share/postfixadmin/templates_c(/.*)? gen_context(system_u:object_r:httpd_sys_rw_content_t,s0)
53 /usr/share/selinux-policy[^/]*/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0)
54 /usr/share/wordpress/.*\.php -- gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
55 /usr/share/wordpress-mu/wp-config\.php -- gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
56
57 diff --git a/policy/modules/contrib/apache.te b/policy/modules/contrib/apache.te
58 index 1d8b1140..628b4156 100644
59 --- a/policy/modules/contrib/apache.te
60 +++ b/policy/modules/contrib/apache.te
61 @@ -1,4 +1,4 @@
62 -policy_module(apache, 2.12.2)
63 +policy_module(apache, 2.12.3)
64
65 ########################################
66 #
67
68 diff --git a/policy/modules/contrib/apt.fc b/policy/modules/contrib/apt.fc
69 index 7b208016..92db84d6 100644
70 --- a/policy/modules/contrib/apt.fc
71 +++ b/policy/modules/contrib/apt.fc
72 @@ -14,6 +14,7 @@ ifndef(`distro_redhat',`
73
74 /var/lib/apt(/.*)? gen_context(system_u:object_r:apt_var_lib_t,s0)
75 /var/lib/aptitude(/.*)? gen_context(system_u:object_r:apt_var_lib_t,s0)
76 +/var/lib/apt-xapian-inde(x)(/.*)? gen_context(system_u:object_r:apt_var_lib_t,s0)
77
78 /var/lock/aptitude gen_context(system_u:object_r:apt_lock_t,s0)
79
80
81 diff --git a/policy/modules/contrib/apt.te b/policy/modules/contrib/apt.te
82 index 3c7d9b2d..05197c4c 100644
83 --- a/policy/modules/contrib/apt.te
84 +++ b/policy/modules/contrib/apt.te
85 @@ -1,4 +1,4 @@
86 -policy_module(apt, 1.10.0)
87 +policy_module(apt, 1.10.1)
88
89 ########################################
90 #
91
92 diff --git a/policy/modules/contrib/dirmngr.fc b/policy/modules/contrib/dirmngr.fc
93 index 8d97f2e6..a0f261c9 100644
94 --- a/policy/modules/contrib/dirmngr.fc
95 +++ b/policy/modules/contrib/dirmngr.fc
96 @@ -7,6 +7,7 @@
97 /var/log/dirmngr(/.*)? gen_context(system_u:object_r:dirmngr_log_t,s0)
98
99 /var/lib/dirmngr(/.*)? gen_context(system_u:object_r:dirmngr_var_lib_t,s0)
100 +/var/cache/dirmngr(/.*)? gen_context(system_u:object_r:dirmngr_var_lib_t,s0)
101
102 /run/dirmngr\.pid -- gen_context(system_u:object_r:dirmngr_var_run_t,s0)
103
104
105 diff --git a/policy/modules/contrib/dirmngr.te b/policy/modules/contrib/dirmngr.te
106 index df4963bc..23f40456 100644
107 --- a/policy/modules/contrib/dirmngr.te
108 +++ b/policy/modules/contrib/dirmngr.te
109 @@ -1,4 +1,4 @@
110 -policy_module(dirmngr, 1.2.0)
111 +policy_module(dirmngr, 1.2.1)
112
113 ########################################
114 #
115
116 diff --git a/policy/modules/contrib/dpkg.fc b/policy/modules/contrib/dpkg.fc
117 index eec3c487..ad87459f 100644
118 --- a/policy/modules/contrib/dpkg.fc
119 +++ b/policy/modules/contrib/dpkg.fc
120 @@ -4,6 +4,7 @@
121 /usr/bin/dpkg -- gen_context(system_u:object_r:dpkg_exec_t,s0)
122 /usr/bin/dselect -- gen_context(system_u:object_r:dpkg_exec_t,s0)
123
124 +/var/lib/debtags(/.*)? gen_context(system_u:object_r:dpkg_var_lib_t,s0)
125 /var/lib/dpkg(/.*)? gen_context(system_u:object_r:dpkg_var_lib_t,s0)
126 /var/lib/dpkg/(meth)?lock -- gen_context(system_u:object_r:dpkg_lock_t,s0)
127
128
129 diff --git a/policy/modules/contrib/dpkg.te b/policy/modules/contrib/dpkg.te
130 index e7e50372..51ae8c36 100644
131 --- a/policy/modules/contrib/dpkg.te
132 +++ b/policy/modules/contrib/dpkg.te
133 @@ -1,4 +1,4 @@
134 -policy_module(dpkg, 1.11.2)
135 +policy_module(dpkg, 1.11.3)
136
137 ########################################
138 #