From fe0cb4b48dbbf1dfa962a9a6c0bb4020be66996c Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Wed, 29 Nov 2023 22:58:35 +0000
Subject: [PATCH] feat(profile): some cleanup in thunderbird.

---
 apparmor.d/profiles-s-z/thunderbird | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apparmor.d/profiles-s-z/thunderbird b/apparmor.d/profiles-s-z/thunderbird
index 511343b61..1179c610e 100644
--- a/apparmor.d/profiles-s-z/thunderbird
+++ b/apparmor.d/profiles-s-z/thunderbird
@@ -16,7 +16,7 @@ include <tunables/global>
 profile thunderbird @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/dbus-gtk>
+  include <abstractions/bus/atspi>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
@@ -53,9 +53,9 @@ profile thunderbird @{exec_path} {
        member=RequestName
        peer=(name=org.freedesktop.DBus),
 
-  dbus send bus=system path=/org/freedesktop/RealtimeKit[0-9]*
+  dbus send bus=system path=/org/freedesktop/RealtimeKit1
        member={Get,MakeThreadHighPriority,MakeThreadRealtime}
-       peer=(name=org.freedesktop.RealtimeKit[0-9]*),
+       peer=(name=org.freedesktop.RealtimeKit1*),
 
   dbus send bus=system path=/org/freedesktop/UPower
        interface=org.freedesktop.UPower
@@ -72,8 +72,8 @@ profile thunderbird @{exec_path} {
        member=Read
        peer=(name=:*),
 
-  dbus receive bus=system path=/org/freedesktop/login[0-9]*
-       interface=org.freedesktop.login[0-9]*.Manager
+  dbus receive bus=system path=/org/freedesktop/login1*
+       interface=org.freedesktop.login1*.Manager
        member={UserAdded,UserRemoved}
        peer=(name=:*, label=systemd-logind),
 
@@ -117,18 +117,18 @@ profile thunderbird @{exec_path} {
   @{lib}/firefox{,.sh,-esr,-bin}/firefox{,.sh,-esr,-bin}  rPx,
   /opt/firefox{,.sh,-esr,-bin}/firefox{,.sh,-esr,-bin}    rPx,
 
+  /usr/share/@{name}/{,**} r,
   /usr/share/gvfs/remote-volume-monitors/{,*} r,
   /usr/share/lightning/{,**} r,
   /usr/share/mozilla/extensions/{,**} r,
   /usr/share/qt5ct/** r,
   /usr/share/sounds/freedesktop/stereo/*.oga r,
-  /usr/share/thunderbird/{,**} r,
   /usr/share/xul-ext/kwallet5/* r,
 
+  /etc/@{name}/{,**} r,
   /etc/fstab r,
   /etc/mailcap r,
   /etc/mime.types r,
-  /etc/thunderbird/{,**} r,
   /etc/timezone r,
   /etc/xul-ext/kwallet5.js r,