feat(dbus): replace some rule by the new directives.

apparmor.d/groups/freedesktop/accounts-daemon

@@ -23,19 +23,7 @@ profile accounts-daemon @{exec_path} flags=(attach_disconnected) {
 
   ptrace (read) peer=unconfined,
 
-  dbus bind bus=system name=org.freedesktop.Accounts,
+  # dbus: own bus=system name=org.freedesktop.Accounts
-  dbus receive bus=system path=/org/freedesktop/Accounts{,/User@{uid}}
-       interface=org.freedesktop.Accounts*
-       peer=(name=:*),
-  dbus receive bus=system path=/org/freedesktop/Accounts{,/User@{uid}}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*),
-  dbus send bus=system path=/org/freedesktop/Accounts/User@{uid}
-       interface=org.freedesktop.Accounts.User
-       peer=(name=org.freedesktop.DBus),
-  dbus send bus=system path=/org/freedesktop/Accounts/User@{uid}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=org.freedesktop.DBus),
 
   dbus send bus=system path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus

apparmor.d/groups/freedesktop/at-spi2-registryd

@@ -21,42 +21,21 @@ profile at-spi2-registryd @{exec_path} flags=(attach_disconnected) {
   signal (receive) set=(term hup kill) peer=dbus-daemon,
   signal (receive) set=(term hup kill) peer=gdm*,
 
-  dbus bind bus=accessibility name=org.a11y.atspi.Registry,
+  # dbus: own bus=accessibility name=org.a11y.atspi.{R,r}egistry
-
-  dbus send bus=session path=/org/a11y/bus
-       interface=org.a11y.Bus
-       member=GetAddress
-       peer=(name=org.a11y.Bus, label=dbus-daemon),
 
   dbus send bus=accessibility path=/org/a11y/atspi/accessible/root
        interface=org.freedesktop.DBus.Properties
        member=Set
-       peer=(name=:*), # all peer's labels
+       peer=(name=:*),
-
   dbus receive bus=accessibility path=/org/a11y/atspi/accessible/root
        interface=org.a11y.atspi.Socket
        member=Embed
-       peer=(name=:*), # all peer's labels
+       peer=(name=:*),
-
-  dbus receive bus=accessibility path=/org/a11y/atspi/registry
-       interface=org.a11y.atspi.Registry
-       member={GetRegisteredEvents,EventListenerDeregistered}
-       peer=(name=:*), # all peer's labels
-
-  dbus send bus=accessibility path=/org/a11y/atspi/registry
-       interface=org.a11y.atspi.Registry
-       member={GetRegisteredEvents,EventListenerDeregistered}
-       peer=(name=org.freedesktop.DBus), # all peer's labels
 
   dbus receive bus=accessibility path=/org/a11y/atspi/registry/deviceeventcontroller
        interface=org.a11y.atspi.DeviceEventController
        member={GetKeystrokeListeners,GetDeviceEventListeners}
-       peer=(name=:*), # all peer's labels
+       peer=(name=:*),
-
-  dbus send bus=accessibility path=/org/freedesktop/DBus
-       interface=org.freedesktop.DBus
-       member={RequestName,ReleaseName}
-       peer=(name=org.freedesktop.DBus, label=at-spi-bus-launcher),
 
   dbus receive bus=session
        interface=org.freedesktop.DBus.Introspectable

apparmor.d/groups/freedesktop/colord

@@ -17,16 +17,7 @@ profile colord @{exec_path} flags=(attach_disconnected) {
 
   network netlink raw,
 
-  dbus bind bus=system name=org.freedesktop.ColorManager,
+  # dbus: own bus=system name=org.freedesktop.ColorManager
-  dbus receive bus=system path=/org/freedesktop/ColorManager{,/**}
-       interface=org.freedesktop.ColorManager
-       peer=(name=:*),
-  dbus receive bus=system path=/org/freedesktop/ColorManager{,/**}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*),
-  dbus send bus=system path=/org/freedesktop/ColorManager{,/**}
-       interface=org.freedesktop.ColorManager
-       peer=(name=org.freedesktop.DBus),
 
   dbus send bus=system path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus

apparmor.d/groups/freedesktop/geoclue

@@ -24,16 +24,7 @@ profile geoclue @{exec_path} flags=(attach_disconnected) {
   network inet6 stream,
   network netlink raw,
 
-  dbus bind bus=system name=org.freedesktop.GeoClue2,
+  # dbus: own bus=system name=org.freedesktop.GeoClue2
-  dbus send bus=system path=/org/freedesktop/GeoClue2/*
-       interface=org.freedesktop.DBus.Properties
-       peer=(name="{:*,org.freedesktop.DBus}"),
-  dbus receive bus=system path=/org/freedesktop/GeoClue2/*
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*),
-  dbus receive bus=system path=/org/freedesktop/GeoClue2/*
-       interface=org.freedesktop.GeoClue2.Manager
-       peer=(name=:*),
 
   dbus send bus=system path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus

apparmor.d/groups/freedesktop/pipewire

@@ -23,7 +23,7 @@ profile pipewire @{exec_path} flags=(attach_disconnected) {
 
   network netlink raw,
 
-  dbus bind bus=session name=org.pulseaudio.Server,
+  # dbus: own bus=session name=org.pulseaudio.Server
 
   dbus send bus=session path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus

apparmor.d/groups/freedesktop/polkitd

@@ -21,14 +21,7 @@ profile polkitd @{exec_path} flags=(attach_disconnected) {
 
   ptrace (read),
 
-  dbus (bind) bus=system name=org.freedesktop.PolicyKit1,
+  # dbus: own bus=system name=org.freedesktop.PolicyKit1
-
-  dbus (send,receive) bus=system path=/org/freedesktop/PolicyKit1/*
-       interface=org.freedesktop.{DBus.Introspectable,DBus.Properties,PolicyKit1.*}, # all members
-
-  dbus send bus=system path=/org/gnome/PolicyKit1/*
-       interface=org.freedesktop.PolicyKit1.AuthenticationAgent
-       peer=(name=:*), # all members
 
   dbus send bus=system path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus

apparmor.d/groups/freedesktop/upowerd

@@ -17,13 +17,7 @@ profile upowerd @{exec_path} flags=(attach_disconnected) {
 
   network netlink raw,
 
-  dbus bind bus=system name=org.freedesktop.UPower,
+  # dbus: own bus=system name=org.freedesktop.UPower
-  dbus receive bus=system path=/org/freedesktop/UPower{,/**}
-       interface=org.freedesktop.UPower{,.*}
-       peer=(name=:*),
-  dbus receive bus=system path=/org/freedesktop/UPower{,/**}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*),
 
   @{exec_path} mr,
 

apparmor.d/groups/freedesktop/xdg-document-portal

@@ -24,24 +24,13 @@ profile xdg-document-portal @{exec_path} flags=(attach_disconnected) {
 
   unix (send receive) type=stream peer=(label=xdg-document-portal//fusermount),
 
-  dbus receive bus=session path=/org/freedesktop/portal/documents
+  # dbus: own bus=session name=org.freedesktop.portal.Documents path=/org/freedesktop/portal/documents
-       interface=org.freedesktop.portal.Documents
-       member=GetMountPoint
-       peer=(name=:*),
 
   dbus receive bus=session
        interface=org.freedesktop.DBus.Introspectable
        member=Introspect
        peer=(name=:*, label=gnome-shell),
 
-  dbus receive bus=session path=/org/freedesktop/portal/documents
-       interface=org.freedesktop.DBus.Properties
-       member=GetAll
-       peer=(name=:*, label=xdg-desktop-portal),
-
-  dbus bind    bus=session
-       name=org.freedesktop.portal.Documents,
-
   @{exec_path} mr,
 
   @{bin}/flatpak         rPUx,

apparmor.d/groups/gnome/evolution-alarm-notify

@@ -21,7 +21,7 @@ profile evolution-alarm-notify @{exec_path} {
 
   network netlink raw,
 
-  dbus bind bus=session name=org.gnome.Evolution-alarm-notify,
+  # dbus: own bus=session name=org.gnome.Evolution-alarm-notify
 
   dbus (send, receive) bus=session path=/org/gnome/evolution/dataserver/**
        interface=org.gnome.evolution.dataserver.Calendar*

apparmor.d/groups/gnome/gdm

@@ -27,26 +27,9 @@ profile gdm @{exec_path} flags=(attach_disconnected) {
 
   signal (send) set=(term),
 
-  dbus bind bus=system name=org.gnome.DisplayManager,
+  # dbus: own bus=system name=org.gnome.DisplayManager.Manager
-  dbus receive bus=system path=/org/gnome/DisplayManager/Manager
-       interface=org.gnome.DisplayManager.Manager
-       peer=(name=:*, label="{gnome-shell,gdm-*-session}"),
-  dbus receive bus=system path=/org/gnome/DisplayManager/Manager
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*, label=gnome-shell),
 
-  dbus receive bus=system path=/org/freedesktop/login1/seat/seat@{int}
+  # dbus: talk bus=system name=org.freedesktop.login1 label=systemd-logind
-       interface=org.freedesktop.DBus.Properties
-       member={Get,PropertiesChanged}
-       peer=(name=:*, label=systemd-logind),
-  dbus send bus=system path=/org/freedesktop/login1/seat/seat@{int}
-       interface=org.freedesktop.DBus.Properties
-       member=Get
-       peer=(name=:*, label=systemd-logind),
-  dbus send bus=system path=/org/freedesktop/login1
-       interface=org.freedesktop.login1.Manager
-       member={UnlockSession,ActivateSessionOnSeat}
-       peer=(name=org.freedesktop.login1, label=systemd-logind),
 
   dbus send bus=system path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus

apparmor.d/groups/gnome/gjs-console

@@ -32,44 +32,21 @@ profile gjs-console @{exec_path} flags=(attach_disconnected) {
 
   signal (receive) set=(term hup) peer=gdm*,
 
-  dbus bind bus=session name=org.gnome.Shell.Notifications,
+  # dbus: own bus=session name=org.freedesktop.Notifications
+  # dbus: own bus=session name=org.gnome.ScreenSaver
+  # dbus: own bus=session name=org.gnome.Shell.Extensions
+  # dbus: own bus=session name=org.gnome.Shell.Notifications
+  # dbus: own bus=session name=org.gnome.Shell.Screencast
 
-  dbus bind bus=session name=org.gnome.ScreenSaver,
-  dbus receive bus=session path=/org/gnome/ScreenSaver
-       interface=org.gnome.ScreenSaver
-       peer=(name=:*), # all members
-  dbus receive bus=session path=/org/gnome/ScreenSaver
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*), # all members
-  dbus send bus=session path=/org/gnome/ScreenSaver
-       interface=org.gnome.ScreenSaver
-       peer=(name=:*), # all members
-  dbus send bus=session path=/org/gnome/ScreenSaver
-       interface=org.gnome.ScreenSaver
-       peer=(name=org.freedesktop.DBus),
-  dbus send bus=session path=/org/gnome/ScreenSaver
-       interface=org.gnome.ScreenSaver
-       peer=(name=org.gnome.Shell.ScreenShield),
-  dbus send bus=session path=/org/gnome/ScreenSaver
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*), # all members
-
-  dbus bind bus=session name=org.freedesktop.Notifications,
-  dbus receive bus=session path=/org/freedesktop/Notifications
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*), # all members
-  dbus send bus=session path=/org/freedesktop/Notifications
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*), # all members
-
-  dbus bind bus=session name=org.gnome.Shell.Screencast,
-  dbus receive bus=session path=/org/gnome/Shell/Screencast
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*), # all members
   dbus send bus=session path=/org/gnome/Mutter/ScreenCast
        interface=org.freedesktop.DBus.Properties
        peer=(name=:*, label=gnome-shell),
 
+  dbus send bus=session path=/org/gnome/ScreenSaver
+       interface=org.gnome.ScreenSaver
+       member=GetActive
+       peer=(name=org.gnome.Shell.ScreenShield, label=gnome-shell),
+
   @{exec_path} mr,
 
   @{bin}/       r,

apparmor.d/groups/gnome/gnome-disks

@@ -15,7 +15,7 @@ profile gnome-disks @{exec_path} {
   include <abstractions/gnome-strict>
   include <abstractions/user-download-strict>
 
-  dbus bind bus=session name=org.gnome.DiskUtility,
+  # dbus: own bus=session name=org.gnome.DiskUtility
 
   @{exec_path} mr,
 

apparmor.d/groups/gnome/gnome-keyring-daemon

@@ -22,24 +22,8 @@ profile gnome-keyring-daemon @{exec_path} flags=(attach_disconnected) {
   signal (receive) set=(term) peer=gdm,
   signal (send) set=(term) peer=ssh-agent,
 
-  dbus bind bus=session name=org.gnome.keyring,
+  # dbus: own bus=session name=org.gnome.keyring
-  dbus (send, receive) bus=session path=/org/gnome/keyring/daemon
+  # dbus: own bus=session name=org.freedesktop.secrets
-       interface=org.gnome.keyring.Daemon
-       peer=(name="{org.gnome.keyring,:*}", label=@{profile_name}),
-
-  dbus bind bus=session name=org.freedesktop.secrets,
-  dbus receive bus=session path=/org/freedesktop/secrets{,/**}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*),
-  dbus receive bus=session path=/org/freedesktop/secrets{,/**}
-       interface=org.freedesktop.Secret.*
-       peer=(name=:*),
-  dbus send bus=session path=/org/freedesktop/secrets{,/**}
-       interface=org.freedesktop.Secret.Collection
-       peer=(name=org.freedesktop.DBus),
-  dbus send bus=session path=/org/freedesktop/secrets{,/**}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=org.freedesktop.DBus),
 
   dbus receive bus=session
        interface=org.freedesktop.DBus.Introspectable

apparmor.d/groups/gnome/gnome-session-binary

@@ -36,19 +36,7 @@ profile gnome-session-binary @{exec_path} flags=(attach_disconnected) {
   signal (send) set=(term) peer=at-spi-bus-launcher,
   signal (send) set=(term) peer=gsd-*,
 
-  dbus bind bus=session name=org.gnome.SessionManager{,.*},
+  # dbus: own bus=session name=org.gnome.SessionManager
-  dbus receive bus=session path=/org/gnome/SessionManager{,/**}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*),
-  dbus receive bus=session path=/org/gnome/SessionManager{,/**}
-       interface=org.gnome.SessionManager{,.*}
-       peer=(name=:*),
-  dbus send bus=session path=/org/gnome/SessionManager{,/**}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=org.freedesktop.DBus),
-  dbus send bus=session path=/org/gnome/SessionManager{,/**}
-       interface=org.gnome.SessionManager{,.*}
-       peer=(name=org.freedesktop.DBus),
 
   dbus send bus=session path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus
@@ -60,11 +48,6 @@ profile gnome-session-binary @{exec_path} flags=(attach_disconnected) {
        member={CanPowerOff,PowerOff,Reboot}
        peer=(name=:*, label=systemd-logind),
 
-  dbus send bus=system path=/org/freedesktop/login1/session/c1
-       interface=org.freedesktop.login1.Session
-       member=SetIdleHint
-       peer=(name=org.freedesktop.login1, label=systemd-logind),
-
   dbus send bus=session path=/org/freedesktop/systemd1
        interface=org.freedesktop.systemd1.Manager
        peer=(name=org.freedesktop.systemd1, label=@{systemd}),

apparmor.d/groups/gnome/gnome-shell

@@ -84,10 +84,7 @@ profile gnome-shell @{exec_path} flags=(attach_disconnected) {
        interface={org.gnome.*,org.freedesktop.{Application,DBus.Properties,DBus.ObjectManager},org.gtk.{Actions,Application}}
        peer=(name="{:*,org.gnome.*,org.freedesktop.DBus}"),
 
-  dbus bind bus=session name=org.gtk.MountOperationHandler,
+  # dbus: own bus=session name=org.gtk.MountOperationHandler
-  dbus receive bus=session path=/org/gtk/MountOperationHandler
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*),
 
   dbus bind bus=session name=com.canonical.Unity,
   dbus receive bus=session path=/com/canonical/unity/**

apparmor.d/groups/gnome/nautilus

@@ -35,10 +35,7 @@ profile nautilus @{exec_path} flags=(attach_disconnected) {
        interface={org.gnome.Nautilus,org.freedesktop.{Application,DBus.Properties},org.gtk.{Actions,Application}}
        peer=(name="{:*,org.gnome.Nautilus,org.freedesktop.DBus}"),
 
-  dbus bind bus=session name=org.freedesktop.FileManager1,
+  # dbus: own bus=session name=org.freedesktop.FileManager1
-  dbus (send, receive) bus=session path=/org/freedesktop/FileManager1
-       interface=org.freedesktop.DBus.Properties
-       peer=(name="{:*,org.freedesktop.DBus}"),
 
   dbus receive bus=session path=/org/gnome/Nautilus/SearchProvider
        interface=org.gnome.Shell.SearchProvider2

apparmor.d/groups/network/NetworkManager

@@ -42,19 +42,7 @@ profile NetworkManager @{exec_path} flags=(attach_disconnected) {
 
   signal (send) set=(term) peer=dnsmasq,
 
-  dbus bind bus=system name=org.freedesktop.NetworkManager,
+  # dbus: own bus=system name=org.freedesktop.NetworkManager
-  dbus receive bus=system path=/org/freedesktop/NetworkManager{,/**}
-       interface=org.freedesktop.NetworkManager{,.*}
-       peer=(name=:*),
-  dbus receive bus=system path=/org/freedesktop/NetworkManager{,/**}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*),
-  dbus send bus=system path=/org/freedesktop/NetworkManager{,/**}
-       interface=org.freedesktop.NetworkManager
-       peer=(name=org.freedesktop.DBus),
-  dbus send bus=system path=/org/freedesktop/NetworkManager{,/**}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=org.freedesktop.DBus),
 
   dbus receive bus=system path=/org/freedesktop
        interface=org.freedesktop.DBus.ObjectManager

apparmor.d/groups/systemd/systemd-logind

@@ -27,36 +27,13 @@ profile systemd-logind @{exec_path} flags=(attach_disconnected,complain) {
 
   network netlink raw,
 
-  dbus bind bus=system name=org.freedesktop.login1,
+  # dbus: own bus=system name=org.freedesktop.login1
-  dbus (send, receive) bus=system path=/org/freedesktop/login1{,/**}
-       interface=org.freedesktop.login1.*
-       peer=(name=:*),
-  dbus receive bus=system path=/org/freedesktop/login1{,/**}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*),
-  dbus (send, receive) bus=system path=/org/freedesktop/login1{,/**}
-       interface=org.freedesktop.login1.*
-       peer=(name=org.freedesktop.DBus),
-  dbus send bus=system path=/org/freedesktop/login1{,/**}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=org.freedesktop.DBus),
 
-  dbus receive bus=system path=/org/freedesktop/systemd1{,/{unit,job}/**}
+  # dbus: talk bus=system name=org.freedesktop.systemd1 label="@{systemd}"
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*, label="@{systemd}"),
-  dbus send bus=system path=/org/freedesktop/systemd1/{unit,job}/**
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=org.freedesktop.systemd1, label="@{systemd}"),
-  dbus send bus=system path=/org/freedesktop/systemd1/{unit,job}/**
-       interface=org.freedesktop.systemd1.Scope
-       peer=(name=org.freedesktop.systemd1, label="@{systemd}"),
 
   dbus send bus=system path=/org/freedesktop/systemd1
        interface=org.freedesktop.systemd1.Manager
        peer=(name=org.freedesktop.systemd1),
-  dbus receive bus=system path=/org/freedesktop/systemd1
-       interface=org.freedesktop.systemd1.Manager
-       peer=(name=:*, label="@{systemd}"),
 
   dbus send bus=system path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus

apparmor.d/groups/systemd/systemd-machined

@@ -24,33 +24,9 @@ profile systemd-machined @{exec_path} {
   capability sys_chroot,
   capability sys_ptrace,
 
-  dbus bind bus=system name=org.freedesktop.machine1,
+  # dbus: own bus=system name=org.freedesktop.machine1
-  dbus receive bus=system path=/org/freedesktop/machine1{,/**}
-       interface=org.freedesktop.machine1.Manager
-       peer=(name=:*),
-  dbus receive bus=system path=/org/freedesktop/machine1{,/**}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*),
 
-  dbus send bus=system path=/org/freedesktop/systemd1/{,{unit,job}/*}
+  # dbus: talk bus=system name=org.freedesktop.systemd1 label="@{systemd}"
-       interface=org.freedesktop.DBus.Properties
-       member=Get
-       peer=(name=org.freedesktop.systemd1),
-
-  dbus receive bus=system path=/org/freedesktop/systemd1{,/{unit,job}/*}
-       interface=org.freedesktop.DBus.Properties
-       member=PropertiesChanged
-       peer=(name=:*),
-
-  dbus send bus=system path=/org/freedesktop/systemd1
-       interface=org.freedesktop.systemd1.Manager
-       member={StopUnit,UnrefUnit,StartTransientUnit,Subscribe}
-       peer=(name=org.freedesktop.systemd1),
-
-  dbus receive bus=system path=/org/freedesktop/systemd1
-       interface=org.freedesktop.systemd1.Manager
-       member={JobRemoved,UnitRemoved,Reloading}
-       peer=(name=:*),
 
   @{exec_path} mr,
 

apparmor.d/groups/systemd/systemd-networkd

@@ -27,10 +27,7 @@ profile systemd-networkd @{exec_path} flags=(attach_disconnected,complain) {
   network packet dgram,
   network packet raw,
 
-  dbus bind bus=system name=org.freedesktop.network1,
+  # dbus: own bus=system name=org.freedesktop.network1
-  dbus (send, receive) bus=system path=/org/freedesktop/network1{,/**}
-       interface=org.freedesktop.DBus.Properties
-       peer=(name="{:*,org.freedesktop.DBus}"),
 
   @{exec_path} mr,
 

apparmor.d/groups/systemd/systemd-resolved

@@ -30,10 +30,7 @@ profile systemd-resolved @{exec_path} flags=(attach_disconnected) {
   network inet6 stream,
   network netlink raw,
 
-  dbus bind bus=system name=org.freedesktop.resolve1,
+  # dbus: own bus=system name=org.freedesktop.resolve1
-  dbus receive bus=system path=/org/freedesktop/resolve1
-       interface=org.freedesktop.resolve1.Manager
-       peer=(name=:*),
 
   dbus send bus=system path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus

apparmor.d/groups/systemd/systemd-timedated

@@ -15,13 +15,7 @@ profile systemd-timedated @{exec_path} flags=(attach_disconnected) {
 
   capability sys_time,
 
-  dbus bind bus=system name=org.freedesktop.timedate1,
+  # dbus: own bus=system name=org.freedesktop.timedate1
-  dbus receive bus=system path=/org/freedesktop/timedate1
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*),
-  dbus receive bus=system path=/org/freedesktop/timedate1
-       interface=org.freedesktop.timedate1
-       peer=(name=:*),
 
   dbus send bus=system path=/org/freedesktop/systemd1/unit/*
        interface=org.freedesktop.DBus.Properties

apparmor.d/profiles-a-f/boltd

@@ -17,13 +17,7 @@ profile boltd @{exec_path} flags=(attach_disconnected) {
 
   network netlink raw,
 
-  dbus bind bus=system name=org.freedesktop.bolt,
+  # dbus: own bus=system name=org.freedesktop.bolt
-  dbus (send, receive) bus=system path=/org/freedesktop/bolt
-       interface=org.freedesktop.bolt1{,.*}
-       peer=(name=:*),
-  dbus (send, receive) bus=system path=/org/freedesktop/bolt
-       interface=org.freedesktop.DBus.Properties
-       peer=(name=:*),
 
   @{exec_path} mr,
 

apparmor.d/profiles-a-f/fwupd

@@ -33,10 +33,7 @@ profile fwupd @{exec_path} flags=(complain,attach_disconnected) {
 
   network netlink raw,
 
-  dbus bind bus=system name=org.freedesktop.fwupd,
+  # dbus: own bus=system name=org.freedesktop.fwupd path=/
-  dbus (send, receive) bus=system path=/
-       interface={org.freedesktop.fwupd,org.freedesktop.DBus{,.Properties}}
-       peer=(name="{:*,org.freedesktop.fwupd,org.freedesktop.DBus}"),
 
   dbus send bus=system path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus

apparmor.d/profiles-s-z/switcheroo-control

@@ -15,11 +15,7 @@ profile switcheroo-control @{exec_path} flags=(attach_disconnected) {
 
   network netlink raw,
 
-  dbus bind bus=system name=net.hadess.SwitcherooControl,
+  # dbus: own bus=system name=net.hadess.SwitcherooControl
-  dbus receive bus=system path=/net/hadess/SwitcherooControl
-       interface=org.freedesktop.DBus.Properties
-       member=GetAll
-       peer=(name=:*),
 
   @{exec_path} mr,
 

apparmor.d/profiles-s-z/udisksd

@@ -59,19 +59,7 @@ profile udisksd @{exec_path} flags=(attach_disconnected) {
 
   signal (receive) set=(int) peer=@{systemd},
 
-  dbus bind bus=system name=org.freedesktop.UDisks2,
+  # dbus: own bus=system name=org.freedesktop.UDisks2
-  dbus receive bus=system path=/org/freedesktop/UDisks2{,/**}
-       interface=org.freedesktop.UDisks2.*
-       peer=(name="{:*,org.freedesktop.DBus}"),
-  dbus receive bus=system path=/org/freedesktop/UDisks2{,/**}
-       interface=org.freedesktop.DBus.{Properties,ObjectManager}
-       peer=(name="{:*,org.freedesktop.DBus}"),
-  dbus send bus=system path=/org/freedesktop/UDisks2{,/**}
-       interface=org.freedesktop.DBus.{Properties,ObjectManager}
-       peer=(name=org.freedesktop.DBus),
-  dbus send bus=system path=/org/freedesktop/UDisks2{,/**}
-       interface=org.freedesktop.UDisks2.Job
-       peer=(name=org.freedesktop.DBus),
 
   dbus send bus=system path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus