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 F072F198005 for ; Sun, 10 Mar 2013 11:15:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F07AE0655; Sun, 10 Mar 2013 11:15:13 +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 0FB17E0655 for ; Sun, 10 Mar 2013 11:15:12 +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 DD23E33BECC for ; Sun, 10 Mar 2013 11:15:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 682A9E4079 for ; Sun, 10 Mar 2013 11:15:10 +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: <1362913740.2ed4fdaecfb85c74d7fcb2b04a7b0988c303cdb6.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/mplayer.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 2ed4fdaecfb85c74d7fcb2b04a7b0988c303cdb6 X-VCS-Branch: master Date: Sun, 10 Mar 2013 11:15:10 +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: 73e3457a-81d5-4a3f-a684-c6be2b8e9d27 X-Archives-Hash: 2b7f3058ca78c07f6e7b9e253023f8ee commit: 2ed4fdaecfb85c74d7fcb2b04a7b0988c303cdb6 Author: Sven Vermeulen siphos be> AuthorDate: Sun Mar 10 11:09:00 2013 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Sun Mar 10 11:09:00 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=2ed4fdae Move gentoo-specifics downward --- policy/modules/contrib/mplayer.te | 50 +++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 24 deletions(-) diff --git a/policy/modules/contrib/mplayer.te b/policy/modules/contrib/mplayer.te index aa06187..fb51c30 100644 --- a/policy/modules/contrib/mplayer.te +++ b/policy/modules/contrib/mplayer.te @@ -206,30 +206,6 @@ userdom_use_user_terminals(mplayer_t) xserver_user_x_domain_template(mplayer, mplayer_t, mplayer_tmpfs_t) -ifdef(`distro_gentoo',` - xdg_manage_videos_home(mplayer_t) - - tunable_policy(`mplayer_read_user_content',` - userdom_read_user_home_content_files(mplayer_t) - userdom_read_user_home_content_symlinks(mplayer_t) - ') - - tunable_policy(`mplayer_manage_user_content',` - userdom_manage_user_tmp_dirs(mplayer_t) - userdom_manage_user_tmp_files(mplayer_t) - userdom_user_home_dir_filetrans_user_home_content(mplayer_t, { dir file }) - - userdom_manage_user_home_content_dirs(mplayer_t) - userdom_manage_user_home_content_files(mplayer_t) - - userdom_write_user_tmp_sockets(mplayer_t) - ') - - optional_policy(` - alsa_domain(mplayer_t, mplayer_tmpfs_t) - ') -') - ifndef(`enable_mls',` fs_list_dos(mplayer_t) fs_read_dos_files(mplayer_t) @@ -276,3 +252,29 @@ optional_policy(` optional_policy(` pulseaudio_run(mplayer_t, mplayer_roles) ') + +ifdef(`distro_gentoo',` + xdg_manage_videos_home(mplayer_t) + + tunable_policy(`mplayer_read_user_content',` + userdom_read_user_home_content_files(mplayer_t) + userdom_read_user_home_content_symlinks(mplayer_t) + ') + + tunable_policy(`mplayer_manage_user_content',` + userdom_manage_user_tmp_dirs(mplayer_t) + userdom_manage_user_tmp_files(mplayer_t) + userdom_user_home_dir_filetrans_user_home_content(mplayer_t, { dir file }) + + userdom_manage_user_home_content_dirs(mplayer_t) + userdom_manage_user_home_content_files(mplayer_t) + + userdom_write_user_tmp_sockets(mplayer_t) + ') + + optional_policy(` + alsa_domain(mplayer_t, mplayer_tmpfs_t) + ') +') + +