From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9E99B1381F3 for ; Mon, 30 Sep 2013 19:03:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31A5EE0B1F; Mon, 30 Sep 2013 19:03:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 396F6E0B7E for ; Mon, 30 Sep 2013 19:03:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23D2633DEE1 for ; Mon, 30 Sep 2013 19:03:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id ECF35E546D for ; Mon, 30 Sep 2013 19:03:39 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1380567770.dbba0b6ab4505e103c539802dab362c9e695d9dd.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/aide.fc policy/modules/contrib/amtu.fc policy/modules/contrib/cron.fc policy/modules/contrib/finger.fc policy/modules/contrib/inetd.fc policy/modules/contrib/ircd.fc policy/modules/contrib/nagios.fc policy/modules/contrib/networkmanager.fc policy/modules/contrib/puppet.fc policy/modules/contrib/snort.fc policy/modules/contrib/tftp.fc policy/modules/contrib/tor.fc X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: dbba0b6ab4505e103c539802dab362c9e695d9dd X-VCS-Branch: master Date: Mon, 30 Sep 2013 19:03:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 09dfd24a-83f6-4970-9134-5510988cdfdd X-Archives-Hash: dbe2c6bf5ad729f822dfc4be2751427b commit: dbba0b6ab4505e103c539802dab362c9e695d9dd Author: Dominick Grift gmail com> AuthorDate: Thu Sep 26 21:36:48 2013 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Mon Sep 30 19:02:50 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=dbba0b6a revert regular expressions Signed-off-by: Dominick Grift gmail.com> --- policy/modules/contrib/aide.fc | 2 +- policy/modules/contrib/amtu.fc | 2 +- policy/modules/contrib/cron.fc | 2 +- policy/modules/contrib/finger.fc | 4 ++-- policy/modules/contrib/inetd.fc | 6 +++--- policy/modules/contrib/ircd.fc | 2 +- policy/modules/contrib/nagios.fc | 4 ++-- policy/modules/contrib/networkmanager.fc | 10 +++++----- policy/modules/contrib/puppet.fc | 6 +++--- policy/modules/contrib/snort.fc | 2 +- policy/modules/contrib/tftp.fc | 2 +- policy/modules/contrib/tor.fc | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/policy/modules/contrib/aide.fc b/policy/modules/contrib/aide.fc index 15eb282..06f050f 100644 --- a/policy/modules/contrib/aide.fc +++ b/policy/modules/contrib/aide.fc @@ -1,4 +1,4 @@ -/usr/s?bin/aide -- gen_context(system_u:object_r:aide_exec_t,mls_systemhigh) +/usr/(s)?bin/aide -- gen_context(system_u:object_r:aide_exec_t,mls_systemhigh) /var/lib/aide(/.*)? gen_context(system_u:object_r:aide_db_t,mls_systemhigh) diff --git a/policy/modules/contrib/amtu.fc b/policy/modules/contrib/amtu.fc index 6392306..305a1a0 100644 --- a/policy/modules/contrib/amtu.fc +++ b/policy/modules/contrib/amtu.fc @@ -1,3 +1,3 @@ /etc/rc\.d/init\.d/amtu -- gen_context(system_u:object_r:amtu_initrc_exec_t,s0) -/usr/s?bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) +/usr/(s)?bin/amtu -- gen_context(system_u:object_r:amtu_exec_t,s0) diff --git a/policy/modules/contrib/cron.fc b/policy/modules/contrib/cron.fc index 3d06fed..266a439 100644 --- a/policy/modules/contrib/cron.fc +++ b/policy/modules/contrib/cron.fc @@ -4,7 +4,7 @@ /etc/crontab -- gen_context(system_u:object_r:system_cron_spool_t,s0) -/usr/bin/f?crontab -- gen_context(system_u:object_r:crontab_exec_t,s0) +/usr/bin/(f)?crontab -- gen_context(system_u:object_r:crontab_exec_t,s0) /usr/libexec/fcron -- gen_context(system_u:object_r:crond_exec_t,s0) /usr/libexec/fcronsighup -- gen_context(system_u:object_r:crontab_exec_t,s0) diff --git a/policy/modules/contrib/finger.fc b/policy/modules/contrib/finger.fc index 5df3720..843940b 100644 --- a/policy/modules/contrib/finger.fc +++ b/policy/modules/contrib/finger.fc @@ -1,8 +1,8 @@ /etc/cfingerd(/.*)? gen_context(system_u:object_r:fingerd_etc_t,s0) -/etc/cron\.weekly/c?fingerd -- gen_context(system_u:object_r:fingerd_exec_t,s0) +/etc/cron\.weekly/(c)?fingerd -- gen_context(system_u:object_r:fingerd_exec_t,s0) -/usr/sbin/in\.x?fingerd -- gen_context(system_u:object_r:fingerd_exec_t,s0) +/usr/sbin/in\.(x)?fingerd -- gen_context(system_u:object_r:fingerd_exec_t,s0) /usr/sbin/[cef]fingerd -- gen_context(system_u:object_r:fingerd_exec_t,s0) /var/log/cfingerd\.log.* -- gen_context(system_u:object_r:fingerd_log_t,s0) diff --git a/policy/modules/contrib/inetd.fc b/policy/modules/contrib/inetd.fc index d00440b..0374509 100644 --- a/policy/modules/contrib/inetd.fc +++ b/policy/modules/contrib/inetd.fc @@ -6,8 +6,8 @@ /usr/sbin/in\..*d -- gen_context(system_u:object_r:inetd_child_exec_t,s0) /usr/sbin/rlinetd -- gen_context(system_u:object_r:inetd_exec_t,s0) -/usr/sbin/x?inetd -- gen_context(system_u:object_r:inetd_exec_t,s0) +/usr/sbin/(x)?inetd -- gen_context(system_u:object_r:inetd_exec_t,s0) -/var/log/x?inetd\.log.* -- gen_context(system_u:object_r:inetd_log_t,s0) +/var/log/(x)?inetd\.log.* -- gen_context(system_u:object_r:inetd_log_t,s0) -/var/run/x?inetd\.pid -- gen_context(system_u:object_r:inetd_var_run_t,s0) +/var/run/(x)?inetd\.pid -- gen_context(system_u:object_r:inetd_var_run_t,s0) diff --git a/policy/modules/contrib/ircd.fc b/policy/modules/contrib/ircd.fc index 0f0e648..8060f08 100644 --- a/policy/modules/contrib/ircd.fc +++ b/policy/modules/contrib/ircd.fc @@ -6,7 +6,7 @@ /etc/rc\.d/init\.d/((ircd)|(ngircd)|(dancer-ircd)) -- gen_context(system_u:object_r:ircd_initrc_exec_t,s0) /usr/sbin/dancer-ircd -- gen_context(system_u:object_r:ircd_exec_t,s0) -/usr/s?bin/ircd -- gen_context(system_u:object_r:ircd_exec_t,s0) +/usr/(s)?bin/ircd -- gen_context(system_u:object_r:ircd_exec_t,s0) /usr/sbin/ngircd -- gen_context(system_u:object_r:ircd_exec_t,s0) /var/lib/dancer-ircd(/.*)? gen_context(system_u:object_r:ircd_var_lib_t,s0) diff --git a/policy/modules/contrib/nagios.fc b/policy/modules/contrib/nagios.fc index 431ce38..5e47e3f 100644 --- a/policy/modules/contrib/nagios.fc +++ b/policy/modules/contrib/nagios.fc @@ -4,8 +4,8 @@ /etc/rc\.d/init\.d/nagios -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0) /etc/rc\.d/init\.d/nrpe -- gen_context(system_u:object_r:nagios_initrc_exec_t,s0) -/usr/s?bin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0) -/usr/s?bin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0) +/usr/(s)?bin/nagios -- gen_context(system_u:object_r:nagios_exec_t,s0) +/usr/(s)?bin/nrpe -- gen_context(system_u:object_r:nrpe_exec_t,s0) /usr/lib/cgi-bin/nagios(/.*)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0) /usr/lib/cgi-bin/netsaint(/.*)? gen_context(system_u:object_r:httpd_nagios_script_exec_t,s0) diff --git a/policy/modules/contrib/networkmanager.fc b/policy/modules/contrib/networkmanager.fc index 4751a7b..a697d60 100644 --- a/policy/modules/contrib/networkmanager.fc +++ b/policy/modules/contrib/networkmanager.fc @@ -16,15 +16,15 @@ /usr/lib/NetworkManager/nm-dispatcher\.action -- gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0) /usr/libexec/nm-dispatcher\.action -- gen_context(system_u:object_r:NetworkManager_initrc_exec_t,s0) -/s?bin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) -/s?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) +/(s)?bin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) +/(s)?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) -/usr/s?bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) +/usr/(s)?bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) /usr/sbin/NetworkManagerDispatcher -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) /usr/sbin/nm-system-settings -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) /usr/sbin/wicd -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) -/usr/s?bin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) -/usr/s?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) +/usr/(s)?bin/wpa_cli -- gen_context(system_u:object_r:wpa_cli_exec_t,s0) +/usr/(s)?bin/wpa_supplicant -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) /var/lib/wicd(/.*)? gen_context(system_u:object_r:NetworkManager_var_lib_t,s0) /var/lib/NetworkManager(/.*)? gen_context(system_u:object_r:NetworkManager_var_lib_t,s0) diff --git a/policy/modules/contrib/puppet.fc b/policy/modules/contrib/puppet.fc index 9468048..5a6da67 100644 --- a/policy/modules/contrib/puppet.fc +++ b/policy/modules/contrib/puppet.fc @@ -3,9 +3,9 @@ /etc/rc\.d/init\.d/puppet -- gen_context(system_u:object_r:puppet_initrc_exec_t,s0) /etc/rc\.d/init\.d/puppetmaster -- gen_context(system_u:object_r:puppetmaster_initrc_exec_t,s0) -/usr/s?bin/puppetca -- gen_context(system_u:object_r:puppetca_exec_t,s0) -/usr/s?bin/puppetd -- gen_context(system_u:object_r:puppet_exec_t,s0) -/usr/s?bin/puppetmasterd -- gen_context(system_u:object_r:puppetmaster_exec_t,s0) +/usr/(s)?bin/puppetca -- gen_context(system_u:object_r:puppetca_exec_t,s0) +/usr/(s)?bin/puppetd -- gen_context(system_u:object_r:puppet_exec_t,s0) +/usr/(s)?bin/puppetmasterd -- gen_context(system_u:object_r:puppetmaster_exec_t,s0) /var/lib/puppet(/.*)? gen_context(system_u:object_r:puppet_var_lib_t,s0) diff --git a/policy/modules/contrib/snort.fc b/policy/modules/contrib/snort.fc index f85247b..aae25d9 100644 --- a/policy/modules/contrib/snort.fc +++ b/policy/modules/contrib/snort.fc @@ -2,7 +2,7 @@ /etc/snort(/.*)? gen_context(system_u:object_r:snort_etc_t,s0) -/usr/s?bin/snort -- gen_context(system_u:object_r:snort_exec_t,s0) +/usr/(s)?bin/snort -- gen_context(system_u:object_r:snort_exec_t,s0) /usr/sbin/snort-plain -- gen_context(system_u:object_r:snort_exec_t,s0) /var/log/snort(/.*)? gen_context(system_u:object_r:snort_log_t,s0) diff --git a/policy/modules/contrib/tftp.fc b/policy/modules/contrib/tftp.fc index cd569af..3dd87da 100644 --- a/policy/modules/contrib/tftp.fc +++ b/policy/modules/contrib/tftp.fc @@ -1,4 +1,4 @@ -/etc/x?inetd\.d/tftp -- gen_context(system_u:object_r:tftpd_conf_t,s0) +/etc/(x)?inetd\.d/tftp -- gen_context(system_u:object_r:tftpd_conf_t,s0) /usr/sbin/atftpd -- gen_context(system_u:object_r:tftpd_exec_t,s0) /usr/sbin/in\.tftpd -- gen_context(system_u:object_r:tftpd_exec_t,s0) diff --git a/policy/modules/contrib/tor.fc b/policy/modules/contrib/tor.fc index 420a5ee..14a355a 100644 --- a/policy/modules/contrib/tor.fc +++ b/policy/modules/contrib/tor.fc @@ -2,7 +2,7 @@ /etc/rc\.d/init\.d/tor -- gen_context(system_u:object_r:tor_initrc_exec_t,s0) -/usr/s?bin/tor -- gen_context(system_u:object_r:tor_exec_t,s0) +/usr/(s)?bin/tor -- gen_context(system_u:object_r:tor_exec_t,s0) /var/lib/tor(/.*)? gen_context(system_u:object_r:tor_var_lib_t,s0) /var/lib/tor-data(/.*)? gen_context(system_u:object_r:tor_var_lib_t,s0)