From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5E8B7138334 for ; Sun, 24 Jun 2018 08:46:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60C97E09C0; Sun, 24 Jun 2018 08:46:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A423E09B1 for ; Sun, 24 Jun 2018 08:46:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 030E9335C95 for ; Sun, 24 Jun 2018 08:46:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9B9434A for ; Sun, 24 Jun 2018 08:46:44 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1529159745.91800ea6139c694b44466105595954ff72c91fb6.perfinion@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/gpg.te X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 91800ea6139c694b44466105595954ff72c91fb6 X-VCS-Branch: master Date: Sun, 24 Jun 2018 08:46:44 +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: 2e0def65-1d27-444b-b624-d254cc37ce26 X-Archives-Hash: 7dc43c495db6654e0aae72e660e6c10a commit: 91800ea6139c694b44466105595954ff72c91fb6 Author: Jason Zaman perfinion com> AuthorDate: Sat Jun 16 06:43:20 2018 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sat Jun 16 14:35:45 2018 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=91800ea6 gpg: migrate to upstream xdg rules policy/modules/contrib/gpg.te | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/policy/modules/contrib/gpg.te b/policy/modules/contrib/gpg.te index 0e6b6f74..e763b76b 100644 --- a/policy/modules/contrib/gpg.te +++ b/policy/modules/contrib/gpg.te @@ -368,14 +368,6 @@ miscfiles_read_localization(gpg_pinentry_t) userdom_use_user_terminals(gpg_pinentry_t) -ifdef(`distro_gentoo',` - optional_policy(` - mutt_read_home_files(gpg_t) - mutt_read_tmp_files(gpg_t) - mutt_rw_tmp_files(gpg_t) - ') -') - xdg_read_data_files(gpg_pinentry_t) tunable_policy(`use_nfs_home_dirs',` @@ -404,10 +396,9 @@ optional_policy(` ') ifdef(`distro_gentoo',` - ######################################### - # - # gpg_pinentry_t policy - # - - xdg_read_data_home_files(gpg_pinentry_t) + optional_policy(` + mutt_read_home_files(gpg_t) + mutt_read_tmp_files(gpg_t) + mutt_rw_tmp_files(gpg_t) + ') ')