| 1 |
commit: ed34f2a2082007b98285bafc17bc33f110270804 |
| 2 |
Author: Jason Zaman <jason <AT> perfinion <DOT> com> |
| 3 |
AuthorDate: Sun Feb 5 08:08:00 2017 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 5 15:10:31 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=ed34f2a2 |
| 7 |
|
| 8 |
contrib: usrmerge: Add gentoo-specific /usr fcontexts |
| 9 |
|
| 10 |
policy/modules/contrib/nut.fc | 2 +- |
| 11 |
policy/modules/contrib/openrc.fc | 2 +- |
| 12 |
policy/modules/contrib/resolvconf.fc | 5 ++--- |
| 13 |
3 files changed, 4 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/policy/modules/contrib/nut.fc b/policy/modules/contrib/nut.fc |
| 16 |
index 5fa41e6..fdf658f 100644 |
| 17 |
--- a/policy/modules/contrib/nut.fc |
| 18 |
+++ b/policy/modules/contrib/nut.fc |
| 19 |
@@ -19,5 +19,5 @@ |
| 20 |
/var/www/nut-cgi-bin/upsstats\.cgi -- gen_context(system_u:object_r:httpd_nutups_cgi_script_exec_t,s0) |
| 21 |
|
| 22 |
ifdef(`distro_gentoo',` |
| 23 |
-/lib/nut/upsdrvctl -- gen_context(system_u:object_r:nut_upsdrvctl_exec_t,s0) |
| 24 |
+/usr/lib/nut/upsdrvctl -- gen_context(system_u:object_r:nut_upsdrvctl_exec_t,s0) |
| 25 |
') |
| 26 |
|
| 27 |
diff --git a/policy/modules/contrib/openrc.fc b/policy/modules/contrib/openrc.fc |
| 28 |
index 25c063f..7d62191 100644 |
| 29 |
--- a/policy/modules/contrib/openrc.fc |
| 30 |
+++ b/policy/modules/contrib/openrc.fc |
| 31 |
@@ -1 +1 @@ |
| 32 |
-/lib/rc/sh/cgroup-release-agent.sh -- gen_context(system_u:object_r:openrc_cgroup_release_exec_t,s0) |
| 33 |
+/usr/lib/rc/sh/cgroup-release-agent.sh -- gen_context(system_u:object_r:openrc_cgroup_release_exec_t,s0) |
| 34 |
|
| 35 |
diff --git a/policy/modules/contrib/resolvconf.fc b/policy/modules/contrib/resolvconf.fc |
| 36 |
index e6a410f..7db4cb8 100644 |
| 37 |
--- a/policy/modules/contrib/resolvconf.fc |
| 38 |
+++ b/policy/modules/contrib/resolvconf.fc |
| 39 |
@@ -1,8 +1,7 @@ |
| 40 |
- |
| 41 |
/etc/resolvconf.conf -- gen_context(system_u:object_r:resolvconf_conf_t,s0) |
| 42 |
|
| 43 |
-/lib/resolvconf(/.*)? gen_context(system_u:object_r:bin_t,s0) |
| 44 |
+/usr/lib/resolvconf(/.*)? gen_context(system_u:object_r:bin_t,s0) |
| 45 |
|
| 46 |
-/sbin/resolvconf -- gen_context(system_u:object_r:resolvconf_exec_t,s0) |
| 47 |
+/usr/sbin/resolvconf -- gen_context(system_u:object_r:resolvconf_exec_t,s0) |
| 48 |
|
| 49 |
/var/run/resolvconf(/.*)? gen_context(system_u:object_r:resolvconf_var_run_t,s0) |
Archives