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 E86211381F3 for ; Wed, 17 Apr 2013 17:50:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F579E0ADA; Wed, 17 Apr 2013 17:50:25 +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 A3DA2E0ADA for ; Wed, 17 Apr 2013 17:50:24 +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 7AD3233DE98 for ; Wed, 17 Apr 2013 17:50:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E18F7E4405 for ; Wed, 17 Apr 2013 17:50:15 +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: <1366220978.ab70dc933b290191eba79cd2916403210779f834.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/consolekit.te policy/modules/contrib/fail2ban.te policy/modules/contrib/irc.te policy/modules/contrib/postfix.te policy/modules/contrib/screen.if policy/modules/contrib/ulogd.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: ab70dc933b290191eba79cd2916403210779f834 X-VCS-Branch: master Date: Wed, 17 Apr 2013 17:50:15 +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: 83ce0887-9158-4aae-871d-19c2d6fc81f5 X-Archives-Hash: 36922a36811da897a63deace546b32e1 commit: ab70dc933b290191eba79cd2916403210779f834 Author: Sven Vermeulen siphos be> AuthorDate: Wed Apr 17 17:49:38 2013 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Wed Apr 17 17:49:38 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=ab70dc93 Merger from upstream so no longer needed in separate distro_gentoo block --- policy/modules/contrib/consolekit.te | 10 ---------- policy/modules/contrib/fail2ban.te | 2 -- policy/modules/contrib/irc.te | 9 --------- policy/modules/contrib/postfix.te | 7 ------- policy/modules/contrib/screen.if | 4 ---- policy/modules/contrib/ulogd.te | 9 --------- 6 files changed, 0 insertions(+), 41 deletions(-) diff --git a/policy/modules/contrib/consolekit.te b/policy/modules/contrib/consolekit.te index bcdef36..826e525 100644 --- a/policy/modules/contrib/consolekit.te +++ b/policy/modules/contrib/consolekit.te @@ -147,13 +147,3 @@ optional_policy(` optional_policy(` unconfined_stream_connect(consolekit_t) ') - -ifdef(`distro_gentoo',` - # consolekit daemon creates /var/run/console for tagfiles - auth_pid_filetrans_pam_var_console(consolekit_t, dir, "console") - auth_create_pam_console_data_dirs(consolekit_t) - - optional_policy(` - dbus_read_lib_files(consolekit_t) - ') -') diff --git a/policy/modules/contrib/fail2ban.te b/policy/modules/contrib/fail2ban.te index 8ca454a..ed55dd0 100644 --- a/policy/modules/contrib/fail2ban.te +++ b/policy/modules/contrib/fail2ban.te @@ -157,8 +157,6 @@ ifdef(`distro_gentoo',` # fail2ban policy # - # FAM support needs this (/proc/self and parent stuff) - read_files_pattern(fail2ban_t, fail2ban_t, fail2ban_t) # Python compilation files_dontaudit_write_usr_dirs(fail2ban_t) ') diff --git a/policy/modules/contrib/irc.te b/policy/modules/contrib/irc.te index 7981a2f..7a977d8 100644 --- a/policy/modules/contrib/irc.te +++ b/policy/modules/contrib/irc.te @@ -138,12 +138,3 @@ tunable_policy(`use_samba_home_dirs',` optional_policy(` seutil_use_newrole_fds(irc_t) ') - -ifdef(`distro_gentoo',` - ############################ - # - # irc local policy - # - - miscfiles_read_generic_certs(irc_t) -') diff --git a/policy/modules/contrib/postfix.te b/policy/modules/contrib/postfix.te index 5baa885..037d231 100644 --- a/policy/modules/contrib/postfix.te +++ b/policy/modules/contrib/postfix.te @@ -800,13 +800,6 @@ userdom_user_home_dir_filetrans_user_home_content(postfix_virtual_t, { file dir ifdef(`distro_gentoo',` ##################################### # - # Local postfix_master_t policy - # - filetrans_pattern(postfix_master_t, postfix_spool_t, postfix_spool_maildrop_t, dir, "defer") - filetrans_pattern(postfix_master_t, postfix_spool_t, postfix_spool_maildrop_t, dir, "deferred") - - ##################################### - # # Local postfix postdrop policy # diff --git a/policy/modules/contrib/screen.if b/policy/modules/contrib/screen.if index c7ffb21..be5cce2 100644 --- a/policy/modules/contrib/screen.if +++ b/policy/modules/contrib/screen.if @@ -87,8 +87,4 @@ template(`screen_role_template',` tunable_policy(`use_nfs_home_dirs',` fs_nfs_domtrans($1_screen_t, $3) ') - - ifdef(`distro_gentoo',` - userdom_user_home_dir_filetrans($3, screen_home_t, file, ".tmux.conf") - ') ') diff --git a/policy/modules/contrib/ulogd.te b/policy/modules/contrib/ulogd.te index 50ece05..42cde84 100644 --- a/policy/modules/contrib/ulogd.te +++ b/policy/modules/contrib/ulogd.te @@ -58,12 +58,3 @@ optional_policy(` postgresql_stream_connect(ulogd_t) postgresql_tcp_connect(ulogd_t) ') - -ifdef(`distro_gentoo',` - ######################################## - # - # Local ulogd policy - # - - allow ulogd_t self:capability { setuid setgid }; -')