refractor(dbus): use the new bus-{systemd,session} abstractions.

2023-12-06 21:56:59 +00:00 · 2023-12-06 21:56:59 +00:00 · 1cf268b770
commit 1cf268b770
parent 9861f005d4
187 changed files with 288 additions and 287 deletions
--- a/apparmor.d/profiles-a-f/aa-notify
+++ b/apparmor.d/profiles-a-f/aa-notify
@ -9,7 +9,7 @@ include <tunables/global>
@{exec_path} = @{bin}/aa-notify
 profile aa-notify @{exec_path} {
  include <abstractions/base>
-  include <abstractions/dbus-session-strict>
+  include <abstractions/bus-session>
  include <abstractions/nameservice-strict>
  include <abstractions/python>

--- a/apparmor.d/profiles-a-f/atril
+++ b/apparmor.d/profiles-a-f/atril
@ -10,10 +10,10 @@ include <tunables/global>
@{exec_path} = @{bin}/atril{,-*}
 profile atril @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-accessibility>
+  include <abstractions/bus-session>
  include <abstractions/bus/org.a11y>
  include <abstractions/bus/org.gtk.vfs.MountTracker>
-  include <abstractions/dbus-accessibility-strict>
-  include <abstractions/dbus-session-strict>
  include <abstractions/dconf-write>
  include <abstractions/fontconfig-cache-read>
  include <abstractions/fonts>
--- a/apparmor.d/profiles-a-f/atrild
+++ b/apparmor.d/profiles-a-f/atrild
@ -9,7 +9,7 @@ include <tunables/global>
@{exec_path} = @{lib}/atril/atrild
 profile atrild @{exec_path} {
  include <abstractions/base>
-  include <abstractions/dbus-session-strict>
+  include <abstractions/bus-session>

  dbus bind bus=session name=org.mate.atril.Daemon,

--- a/apparmor.d/profiles-a-f/bluetoothd
+++ b/apparmor.d/profiles-a-f/bluetoothd
@ -10,7 +10,7 @@ include <tunables/global>
@{exec_path} = @{lib}/bluetooth/bluetoothd
 profile bluetoothd @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
-  include <abstractions/dbus-strict>
+  include <abstractions/bus-system>

  # Needed for configuring HCI interfaces
  capability net_admin,
--- a/apparmor.d/profiles-a-f/boltd
+++ b/apparmor.d/profiles-a-f/boltd
@ -9,8 +9,8 @@ include <tunables/global>
@{exec_path} = @{lib}/boltd
 profile boltd @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.PolicyKit1>
-  include <abstractions/dbus-strict>
  include <abstractions/nameservice-strict>

  capability net_admin,
--- a/apparmor.d/profiles-a-f/cups-browsed
+++ b/apparmor.d/profiles-a-f/cups-browsed
@ -9,10 +9,10 @@ include <tunables/global>
@{exec_path} = @{bin}/cups-browsed
 profile cups-browsed @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.Avahi>
  include <abstractions/bus/org.freedesktop.NetworkManager>
  include <abstractions/cups-client>
-  include <abstractions/dbus-strict>
  include <abstractions/nameservice-strict>
  include <abstractions/p11-kit>

--- a/apparmor.d/profiles-a-f/cups-pk-helper-mechanism
+++ b/apparmor.d/profiles-a-f/cups-pk-helper-mechanism
@ -10,8 +10,8 @@ include <tunables/global>
@{exec_path} += @{lib}/@{multiarch}/cups-pk-helper-mechanism
 profile cups-pk-helper-mechanism @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.PolicyKit1>
-  include <abstractions/dbus-strict>
  include <abstractions/nameservice-strict>

  capability dac_read_search,
--- a/apparmor.d/profiles-a-f/engrampa
+++ b/apparmor.d/profiles-a-f/engrampa
@ -10,10 +10,10 @@ include <tunables/global>
@{exec_path} = @{bin}/engrampa
 profile engrampa @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-accessibility>
+  include <abstractions/bus-session>
  include <abstractions/bus/org.a11y>
  include <abstractions/bus/org.gtk.vfs.MountTracker>
-  include <abstractions/dbus-accessibility-strict>
-  include <abstractions/dbus-session-strict>
  include <abstractions/dconf-write>
  include <abstractions/fontconfig-cache-read>
  include <abstractions/fonts>
--- a/apparmor.d/profiles-a-f/evince
+++ b/apparmor.d/profiles-a-f/evince
@ -9,10 +9,10 @@ include <tunables/global>
@{exec_path} = @{bin}/evince @{lib}/evinced
 profile evince @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-accessibility>
+  include <abstractions/bus-session>
  include <abstractions/bus/org.a11y>
  include <abstractions/bus/org.freedesktop.portal.Desktop>
-  include <abstractions/dbus-accessibility-strict>
-  include <abstractions/dbus-session-strict>
  include <abstractions/dconf-write>
  include <abstractions/gnome>
  include <abstractions/ibus>
--- a/apparmor.d/profiles-a-f/evince-previewer
+++ b/apparmor.d/profiles-a-f/evince-previewer
@ -9,8 +9,8 @@ include <tunables/global>
@{exec_path} = @{bin}/evince-previewer
 profile evince-previewer @{exec_path} {
  include <abstractions/base>
-  include <abstractions/dbus-accessibility-strict>
-  include <abstractions/dbus-session-strict>
+  include <abstractions/bus-accessibility>
+  include <abstractions/bus-session>
  include <abstractions/dconf-write>
  include <abstractions/freedesktop.org>
  include <abstractions/X-strict>
--- a/apparmor.d/profiles-a-f/exim4
+++ b/apparmor.d/profiles-a-f/exim4
@ -10,8 +10,8 @@ include <tunables/global>
@{exec_path} = @{bin}/exim4
 profile exim4 @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/consoles>
-  include <abstractions/dbus-strict>
  include <abstractions/nameservice-strict>
  include <abstractions/ssl_certs>

--- a/apparmor.d/profiles-a-f/file-roller
+++ b/apparmor.d/profiles-a-f/file-roller
@ -9,8 +9,8 @@ include <tunables/global>
@{exec_path} = @{bin}/file-roller
 profile file-roller @{exec_path} {
  include <abstractions/base>
-  include <abstractions/dbus-accessibility-strict>
-  include <abstractions/dbus-session-strict>
+  include <abstractions/bus-accessibility>
+  include <abstractions/bus-session>
  include <abstractions/dconf-write>
  include <abstractions/fonts>
  include <abstractions/freedesktop.org>
--- a/apparmor.d/profiles-a-f/fprintd
+++ b/apparmor.d/profiles-a-f/fprintd
@ -9,8 +9,8 @@ include <tunables/global>
@{exec_path} = @{lib}/fprintd
 profile fprintd @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.login1>
-  include <abstractions/dbus-strict>
  include <abstractions/devices-usb>
  include <abstractions/nameservice-strict>

--- a/apparmor.d/profiles-a-f/fwupd
+++ b/apparmor.d/profiles-a-f/fwupd
@ -10,12 +10,12 @@ include <tunables/global>
@{exec_path} = @{lib}/{,fwupd/}fwupd
 profile fwupd @{exec_path} flags=(complain,attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.ModemManager1>
  include <abstractions/bus/org.freedesktop.PolicyKit1>
  include <abstractions/bus/org.freedesktop.UDisks2>
  include <abstractions/bus/org.freedesktop.UPower>
  include <abstractions/consoles>
-  include <abstractions/dbus-strict>
  include <abstractions/disks-read>
  include <abstractions/fonts>
  include <abstractions/nameservice-strict>
--- a/apparmor.d/profiles-a-f/fwupdmgr
+++ b/apparmor.d/profiles-a-f/fwupdmgr
@ -10,7 +10,7 @@ include <tunables/global>
@{exec_path} = @{bin}/fwupdmgr
 profile fwupdmgr @{exec_path} flags=(attach_disconnected,complain) {
  include <abstractions/base>
-  include <abstractions/dbus-strict>
+  include <abstractions/bus-system>
  include <abstractions/dconf-write>
  include <abstractions/nameservice-strict>
  include <abstractions/openssl>