commit:     91800ea6139c694b44466105595954ff72c91fb6
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sat Jun 16 06:43:20 2018 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> 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)
+       ')
 ')

Reply via email to