From 936431411ce934315ae10562ba56442177cf7ea9 Mon Sep 17 00:00:00 2001
From: nobodysu <nobodysu@users.noreply.github.com>
Date: Thu, 2 Jun 2022 02:00:16 +0300
Subject: [PATCH] ubuntu2204

---
 .../ubuntu-unity7-base.d/complete             | 13 ++++-----
 apparmor.d/groups/apps/thunderbird            | 27 +++++++++----------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/apparmor.d/abstractions/ubuntu-unity7-base.d/complete b/apparmor.d/abstractions/ubuntu-unity7-base.d/complete
index a89a075ab..a76b37d4a 100644
--- a/apparmor.d/abstractions/ubuntu-unity7-base.d/complete
+++ b/apparmor.d/abstractions/ubuntu-unity7-base.d/complete
@@ -2,13 +2,10 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
   dbus send
-    bus=session
-    path=/org/gtk/vfs/mounttracker
-    interface=org.gtk.vfs.MountTracker
-    member=ListMountableInfo,
+    bus="session" path="/org/gtk/vfs/mounttracker"   interface="org.gtk.vfs.MountTracker" member="ListMountableInfo",
 
   dbus send
-    bus=session
-    path=/org/gtk/vfs/Daemon
-    interface=org.gtk.vfs.Daemon
-    member=ListMonitorImplementations,
+    bus="session" path="/org/gtk/vfs/Daemon"         interface="org.gtk.vfs.Daemon" member="ListMonitorImplementations",
+
+  dbus send
+    bus="session" path="/org/gtk/Settings"           interface="org.freedesktop.DBus.Properties" member="GetAll" peer=(name=":*"),
diff --git a/apparmor.d/groups/apps/thunderbird b/apparmor.d/groups/apps/thunderbird
index 545e576e6..4035c19cc 100644
--- a/apparmor.d/groups/apps/thunderbird
+++ b/apparmor.d/groups/apps/thunderbird
@@ -162,12 +162,14 @@ profile thunderbird @{exec_path} {
         /dev/shm/ r,
   owner /dev/shm/org.chromium.* rw,
   owner /dev/shm/org.mozilla.ipc.@{pid}.[0-9]* rw,
+  owner /dev/shm/wayland.mozilla.ipc.[0-9]* rw,
 
   /etc/fstab r,
-
   /etc/mailcap r,
+  /etc/timezone r,
 
   /usr/share/sounds/freedesktop/stereo/*.oga r,
+  /usr/share/ubuntu/applications/{,*} r,
 
   # Silencer
   deny /{usr/,}lib/thunderbird/** w,
@@ -197,24 +199,19 @@ profile thunderbird @{exec_path} {
 
   # DBus
   dbus send
-    bus=system
-    path=/org/freedesktop/RealtimeKit[0-9]
-    member={Get,MakeThreadHighPriority,MakeThreadRealtime}
-    peer=(name=org.freedesktop.RealtimeKit[0-9]),
+    bus="session" path="/org/freedesktop/DBus" interface="org.freedesktop.DBus" member="RequestName" peer=(name="org.freedesktop.DBus"),
 
   dbus send
-    bus=session
-    path=/ca/desrt/dconf/Writer/user
-    interface=ca.desrt.dconf.Writer
-    member={Change,Notify}
-    peer=(name=ca.desrt.dconf),
+    bus="system" path="/org/freedesktop/RealtimeKit[0-9]*" member="{Get,MakeThreadHighPriority,MakeThreadRealtime}" peer=(name="org.freedesktop.RealtimeKit[0-9]*"),
 
   dbus send
-    bus=system
-    path=/org/freedesktop/UPower
-    interface=org.freedesktop.UPower
-    member=EnumerateDevices
-    peer=(name=org.freedesktop.UPower),
+    bus="system" path="/org/freedesktop/UPower" interface="org.freedesktop.UPower" member="EnumerateDevices" peer=(name="org.freedesktop.UPower"),
+
+  dbus send
+    bus="session" path="/ca/desrt/dconf/Writer/user" interface="ca.desrt.dconf.Writer" member="{Change,Notify}" peer=(name="ca.desrt.dconf"),
+
+  dbus bind
+    bus="session" name="org.mozilla.thunderbird.*",
 
   # dconf write
   owner @{HOME}/.config/dconf/     rw,