various improvements (#590)

apparmor.d/profiles-m-r/mutt

@@ -62,6 +62,7 @@ profile mutt @{exec_path} {
   owner @{HOME}/.mutthistory rwk,
   owner @{HOME}/.muttrc* r,
   owner @{HOME}/.signature r,  # Mutt signature file
+  owner @{HOME}/ r,
 
   # User mbox
   # Could be a file or dir depending on mbox_type variable
@@ -91,11 +92,14 @@ profile mutt @{exec_path} {
     @{bin}/w3m     mrix,
     @{bin}/lynx    mrix,
 
-    owner @{HOME}/.w3m/* rw,
+    owner @{HOME}/.w3m/{,**} rw,
     owner @{user_mail_dirs}/{,**} r,
     owner @{user_mail_dirs}/tmp/{,**} rw,
     owner /{var/,}tmp/mutt* rw,
 
+    owner /tmp/w3m-@{rand6} rw,
+    owner /tmp/w3m-@{rand6}/{,**} rw,
+
     include if exists <local/mutt_html-renderer>
   }
 

apparmor.d/profiles-m-r/ouch

@@ -15,6 +15,7 @@ profile ouch @{exec_path} {
   @{exec_path} mr,
 
   owner @{HOME}/.tmp@{rand6}/{,**} rw,
+  owner @{HOME}/.tmp-ouch@{rand6}/{,**} rw,
 
   @{sys}/fs/cgroup/user.slice/cpu.max r,
   @{sys}/fs/cgroup/user.slice/user-@{uid}.slice/cpu.max r,

apparmor.d/profiles-m-r/pinentry-curses

@@ -17,6 +17,8 @@ profile pinentry-curses @{exec_path} {
 
   /usr/share/terminfo/** r,
 
+  owner /dev/tty@{int} r,
+
   include if exists <local/pinentry-curses>
 }
 

apparmor.d/profiles-m-r/pinentry-gtk

@@ -7,9 +7,10 @@ abi <abi/4.0>,
 
 include <tunables/global>
 
-@{exec_path} = @{bin}/pinentry-gtk-2
-profile pinentry-gtk-2 @{exec_path} {
+@{exec_path} = @{bin}/pinentry-gtk{,-2}
+profile pinentry-gtk @{exec_path} {
   include <abstractions/base>
+  include <abstractions/consoles>
   include <abstractions/gtk>
   include <abstractions/fonts>
   include <abstractions/fontconfig-cache-read>
@@ -17,11 +18,13 @@ profile pinentry-gtk-2 @{exec_path} {
 
   @{exec_path} mr,
 
-  /usr/share/gtk-2.0/gtkrc r,
+  /usr/share/gtk-@{int}.@{int}/{,**} r,
 
   owner @{run}/user/@{uid}/.mutter-Xwaylandauth.@{rand6} r,
 
-  include if exists <local/pinentry-gtk-2>
+  owner /dev/tty@{int} r,
+
+  include if exists <local/pinentry-gtk>
 }
 
 # vim:syntax=apparmor