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 1AECC1381F3 for ; Fri, 16 Aug 2013 14:00:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0F93E0ABD; Fri, 16 Aug 2013 13:59:56 +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 3299CE0ABD for ; Fri, 16 Aug 2013 13:59:56 +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 2DBCC33EC00 for ; Fri, 16 Aug 2013 13:59:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9D355E5465 for ; Fri, 16 Aug 2013 13:59:42 +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: <1376661502.38a6ee195e3bb0ab515f23dd2173fea25b082d2b.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/dmidecode.te policy/modules/contrib/squid.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 38a6ee195e3bb0ab515f23dd2173fea25b082d2b X-VCS-Branch: master Date: Fri, 16 Aug 2013 13:59:42 +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: 8f283e9b-6359-4e19-845b-0a064637610d X-Archives-Hash: 130db21e446ebe187fbdb41eb84ee98a commit: 38a6ee195e3bb0ab515f23dd2173fea25b082d2b Author: Sven Vermeulen siphos be> AuthorDate: Fri Aug 16 13:58:22 2013 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Fri Aug 16 13:58:22 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=38a6ee19 Merged with main --- policy/modules/contrib/aide.fc | 2 +- policy/modules/contrib/dmidecode.te | 9 --------- policy/modules/contrib/squid.te | 10 ---------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/policy/modules/contrib/aide.fc b/policy/modules/contrib/aide.fc index 6037ccc..b2f47de 100644 --- a/policy/modules/contrib/aide.fc +++ b/policy/modules/contrib/aide.fc @@ -4,4 +4,4 @@ /var/lib/aide(/.*)? gen_context(system_u:object_r:aide_db_t,mls_systemhigh) /var/log/aide(/.*)? gen_context(system_u:object_r:aide_log_t,mls_systemhigh) -/var/log/aide\.log -- gen_context(system_u:object_r:aide_log_t,mls_systemhigh) +/var/log/aide\.log.* -- gen_context(system_u:object_r:aide_log_t,mls_systemhigh) diff --git a/policy/modules/contrib/dmidecode.te b/policy/modules/contrib/dmidecode.te index ace469c..aa0ef6e 100644 --- a/policy/modules/contrib/dmidecode.te +++ b/policy/modules/contrib/dmidecode.te @@ -32,12 +32,3 @@ mls_file_read_all_levels(dmidecode_t) locallogin_use_fds(dmidecode_t) userdom_use_user_terminals(dmidecode_t) - -ifdef(`distro_gentoo',` - ########################### - # - # Local policy - # - - domain_use_interactive_fds(dmidecode_t) -') diff --git a/policy/modules/contrib/squid.te b/policy/modules/contrib/squid.te index 2251e28..03472ed 100644 --- a/policy/modules/contrib/squid.te +++ b/policy/modules/contrib/squid.te @@ -236,13 +236,3 @@ optional_policy(` optional_policy(` udev_read_db(squid_t) ') - -ifdef(`distro_gentoo',` - ################################### - # - # Local policy - # - - # Instead of append, see bug #466156 - write_files_pattern(squid_t, squid_log_t, squid_log_t) -')