From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-929593-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2C08313908F for <garchives@archives.gentoo.org>; Sun, 5 Feb 2017 15:13:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D411E0D74; Sun, 5 Feb 2017 15:13:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F83FE0D76 for <gentoo-commits@lists.gentoo.org>; Sun, 5 Feb 2017 15:13:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A40D34161D for <gentoo-commits@lists.gentoo.org>; Sun, 5 Feb 2017 15:13:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 977DF3DC6 for <gentoo-commits@lists.gentoo.org>; Sun, 5 Feb 2017 15:13:41 +0000 (UTC) From: "Jason Zaman" <perfinion@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" <perfinion@gentoo.org> Message-ID: <1486307431.ed34f2a2082007b98285bafc17bc33f110270804.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:usrmerge commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/nut.fc policy/modules/contrib/openrc.fc policy/modules/contrib/resolvconf.fc X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: ed34f2a2082007b98285bafc17bc33f110270804 X-VCS-Branch: usrmerge Date: Sun, 5 Feb 2017 15:13:41 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b62d49d6-3faa-43b3-bfac-41acfbb77e60 X-Archives-Hash: b9e1c908904b7512e8eb4e27e312898c Message-ID: <20170205151341.ZSIxB0ZRg08iieNLoFB27u8soVgSOGsIOYOXw1L3XDM@z> commit: ed34f2a2082007b98285bafc17bc33f110270804 Author: Jason Zaman <jason <AT> perfinion <DOT> com> AuthorDate: Sun Feb 5 08:08:00 2017 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Sun Feb 5 15:10:31 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=ed34f2a2 contrib: usrmerge: Add gentoo-specific /usr fcontexts policy/modules/contrib/nut.fc | 2 +- policy/modules/contrib/openrc.fc | 2 +- policy/modules/contrib/resolvconf.fc | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/policy/modules/contrib/nut.fc b/policy/modules/contrib/nut.fc index 5fa41e6..fdf658f 100644 --- a/policy/modules/contrib/nut.fc +++ b/policy/modules/contrib/nut.fc @@ -19,5 +19,5 @@ /var/www/nut-cgi-bin/upsstats\.cgi -- gen_context(system_u:object_r:httpd_nutups_cgi_script_exec_t,s0) ifdef(`distro_gentoo',` -/lib/nut/upsdrvctl -- gen_context(system_u:object_r:nut_upsdrvctl_exec_t,s0) +/usr/lib/nut/upsdrvctl -- gen_context(system_u:object_r:nut_upsdrvctl_exec_t,s0) ') diff --git a/policy/modules/contrib/openrc.fc b/policy/modules/contrib/openrc.fc index 25c063f..7d62191 100644 --- a/policy/modules/contrib/openrc.fc +++ b/policy/modules/contrib/openrc.fc @@ -1 +1 @@ -/lib/rc/sh/cgroup-release-agent.sh -- gen_context(system_u:object_r:openrc_cgroup_release_exec_t,s0) +/usr/lib/rc/sh/cgroup-release-agent.sh -- gen_context(system_u:object_r:openrc_cgroup_release_exec_t,s0) diff --git a/policy/modules/contrib/resolvconf.fc b/policy/modules/contrib/resolvconf.fc index e6a410f..7db4cb8 100644 --- a/policy/modules/contrib/resolvconf.fc +++ b/policy/modules/contrib/resolvconf.fc @@ -1,8 +1,7 @@ - /etc/resolvconf.conf -- gen_context(system_u:object_r:resolvconf_conf_t,s0) -/lib/resolvconf(/.*)? gen_context(system_u:object_r:bin_t,s0) +/usr/lib/resolvconf(/.*)? gen_context(system_u:object_r:bin_t,s0) -/sbin/resolvconf -- gen_context(system_u:object_r:resolvconf_exec_t,s0) +/usr/sbin/resolvconf -- gen_context(system_u:object_r:resolvconf_exec_t,s0) /var/run/resolvconf(/.*)? gen_context(system_u:object_r:resolvconf_var_run_t,s0)