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 8F96B138ACF for ; Sat, 22 Nov 2014 18:24:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13BFAE0958; Sat, 22 Nov 2014 18:24:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7171BE095B for ; Sat, 22 Nov 2014 18:24:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 991DB340577 for ; Sat, 22 Nov 2014 18:24:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4002AAB05 for ; Sat, 22 Nov 2014 18:24:43 +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: <1416680042.52b4ccdb7120e7c8259741d0fd35deea08208414.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/roles/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/roles/staff.te X-VCS-Directories: policy/modules/roles/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 52b4ccdb7120e7c8259741d0fd35deea08208414 X-VCS-Branch: master Date: Sat, 22 Nov 2014 18:24:43 +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: 5f2f77a9-93a0-4b5e-a14e-c43900905910 X-Archives-Hash: 03e2134e8ab453d8371cd34fc5192590 Message-ID: <20141122182443.lnmYPHe6VoFMyj7bMwN9a3nW_yA7wnetpa2anklkaiA@z> commit: 52b4ccdb7120e7c8259741d0fd35deea08208414 Author: Sven Vermeulen siphos be> AuthorDate: Sat Nov 22 18:14:02 2014 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Sat Nov 22 18:14:02 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=52b4ccdb Reshuffle to match upstream --- policy/modules/roles/staff.te | 49 ++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te index 8081d0b..14706de 100644 --- a/policy/modules/roles/staff.te +++ b/policy/modules/roles/staff.te @@ -23,10 +23,6 @@ optional_policy(` ') optional_policy(` - chromium_role(staff_r, staff_t) -') - -optional_policy(` dbadm_role_change(staff_r) ') @@ -109,10 +105,6 @@ ifndef(`distro_redhat',` ') optional_policy(` - gorg_role(staff_r, staff_t) - ') - - optional_policy(` gpg_role(staff_r, staff_t) ') @@ -125,10 +117,6 @@ ifndef(`distro_redhat',` ') optional_policy(` - links_role(staff_r, staff_t) - ') - - optional_policy(` lockdev_role(staff_r, staff_t) ') @@ -149,14 +137,6 @@ ifndef(`distro_redhat',` ') optional_policy(` - mutt_role(staff_r, staff_t) - ') - - optional_policy(` - pan_role(staff_r, staff_t) - ') - - optional_policy(` pyzor_role(staff_r, staff_t) ') @@ -169,10 +149,6 @@ ifndef(`distro_redhat',` ') optional_policy(` - skype_role(staff_r, staff_t) - ') - - optional_policy(` screen_role_template(staff, staff_r, staff_t) ') @@ -210,11 +186,36 @@ ifndef(`distro_redhat',` ') ifdef(`distro_gentoo',` + + optional_policy(` + chromium_role(staff_r, staff_t) + ') + optional_policy(` googletalk_run_plugin(staff_t, staff_r) ') optional_policy(` + gorg_role(staff_r, staff_t) + ') + + optional_policy(` + links_role(staff_r, staff_t) + ') + + optional_policy(` + mutt_role(staff_r, staff_t) + ') + + optional_policy(` + pan_role(staff_r, staff_t) + ') + + optional_policy(` pulseaudio_role(staff_r, staff_t) ') + + optional_policy(` + skype_role(staff_r, staff_t) + ') ')