From 04cf3d38509e47a1872902cf08de045abda38cf6 Mon Sep 17 00:00:00 2001
From: Jeroen Rijken <jeroen.rijken@xs4all.nl>
Date: Thu, 22 Feb 2024 15:01:21 +0100
Subject: [PATCH] Various fixes

Signed-off-by: Jeroen Rijken <jeroen.rijken@xs4all.nl>
---
 apparmor.d/groups/browsers/brave        | 2 +-
 apparmor.d/profiles-a-f/bluetoothd      | 2 +-
 apparmor.d/profiles-a-f/boltd           | 4 ++--
 apparmor.d/profiles-s-z/usbguard-daemon | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apparmor.d/groups/browsers/brave b/apparmor.d/groups/browsers/brave
index a45b53b1..d393904a 100644
--- a/apparmor.d/groups/browsers/brave
+++ b/apparmor.d/groups/browsers/brave
@@ -18,7 +18,7 @@ profile brave @{exec_path} {
   include <abstractions/base>
   include <abstractions/chromium>
 
-  unix (send, receive) type=stream peer=brave-crashpad-handler,
+  unix (send, receive) type=stream peer=(label=brave-crashpad-handler),
 
   @{exec_path} mrix,
 
diff --git a/apparmor.d/profiles-a-f/bluetoothd b/apparmor.d/profiles-a-f/bluetoothd
index 8b51d762..683316f1 100644
--- a/apparmor.d/profiles-a-f/bluetoothd
+++ b/apparmor.d/profiles-a-f/bluetoothd
@@ -48,7 +48,7 @@ profile bluetoothd @{exec_path} flags=(attach_disconnected) {
   dbus send bus=system path=/
        interface=org.freedesktop.DBus.ObjectManager
        member=InterfacesRemoved
-       peer=(name=org.freedesktop.DBus, label={fwupd,NetworkManager,pulseaudio,upowerd),
+       peer=(name=org.freedesktop.DBus, label={fwupd,NetworkManager,pulseaudio,upowerd}),
 
   @{exec_path} mr,
 
diff --git a/apparmor.d/profiles-a-f/boltd b/apparmor.d/profiles-a-f/boltd
index 8bc010bc..5b0086d1 100644
--- a/apparmor.d/profiles-a-f/boltd
+++ b/apparmor.d/profiles-a-f/boltd
@@ -22,7 +22,7 @@ profile boltd @{exec_path} flags=(attach_disconnected) {
   dbus receive bus=system path=/org/freedesktop/bolt
        interface=org.freedesktop.bolt1.Manager
        member=ListDevices
-       peer(name=:*, label=kded5),
+       peer=(name=:*, label=kded5),
 
   dbus (send,receive) bus=system path=/org/freedesktop/bolt{,/**}
        interface=org.freedesktop.DBus.Properties
@@ -42,7 +42,7 @@ profile boltd @{exec_path} flags=(attach_disconnected) {
   @{sys}/bus/thunderbolt/devices/ r,
   @{sys}/bus/wmi/devices/ r,
   @{sys}/class/ r,
-  @{sys}/devices/@{pci}/device  r,
+  @{sys}/devices/@{pci}/device r,
   @{sys}/devices/@{pci}/domain[0-9]*/boot_acl rw,
   @{sys}/devices/@{pci}/domain@{int}/{security,uevent} r,
   @{sys}/devices/@{pci}/domain@{int}/**/ r,
diff --git a/apparmor.d/profiles-s-z/usbguard-daemon b/apparmor.d/profiles-s-z/usbguard-daemon
index fe1b666b..520203a1 100644
--- a/apparmor.d/profiles-s-z/usbguard-daemon
+++ b/apparmor.d/profiles-s-z/usbguard-daemon
@@ -20,7 +20,7 @@ profile usbguard-daemon @{exec_path} flags=(attach_disconnected) {
   network netlink dgram,
 
   unix (bind, listen) type=stream,
-  unix (bind, connect, listen) type=stream peer=(name=usbguard-dbus, addr=none),
+  unix (bind, connect, listen) type=stream peer=(label=usbguard-dbus, addr=none),
 
   @{exec_path} mr,