From 8ba3dbd90f63758a2b89bffd587d7a6897b741e5 Mon Sep 17 00:00:00 2001 From: Alexandre Pujol Date: Sat, 15 Feb 2025 16:09:52 +0100 Subject: [PATCH] refractor: move more profiles to groups. --- apparmor.d/{profiles-a-f => groups/bluetooth}/blueman | 0 apparmor.d/{profiles-a-f => groups/bluetooth}/blueman-mechanism | 0 .../{profiles-a-f => groups/bluetooth}/blueman-rfcomm-watcher | 2 +- apparmor.d/{profiles-a-f => groups/bluetooth}/bluemoon | 0 apparmor.d/{profiles-a-f => groups/bluetooth}/bluetoothctl | 0 apparmor.d/{profiles-a-f => groups/bluetooth}/bluetoothd | 0 .../{profiles-m-r => groups/bluetooth}/obex-folder-listing | 0 apparmor.d/{profiles-m-r => groups/bluetooth}/obexautofs | 0 apparmor.d/{profiles-m-r => groups/bluetooth}/obexctl | 0 apparmor.d/{profiles-m-r => groups/bluetooth}/obexd | 0 apparmor.d/{profiles-m-r => groups/bluetooth}/obexfs | 0 apparmor.d/{profiles-m-r => groups/bluetooth}/obexpush-atd | 0 apparmor.d/{profiles-m-r => groups/bluetooth}/obexpushd | 0 apparmor.d/{profiles-m-r => groups/filesystem}/mke2fs | 0 apparmor.d/{profiles-m-r => groups/filesystem}/mkfs-btrfs | 0 apparmor.d/{profiles-m-r => groups/filesystem}/mkfs-fat | 0 apparmor.d/{profiles-m-r => groups/filesystem}/mkntfs | 0 apparmor.d/{profiles-m-r => groups/filesystem}/mkswap | 0 apparmor.d/{profiles-m-r => groups/filesystem}/mount | 0 apparmor.d/{profiles-m-r => groups/filesystem}/mount-cifs | 0 apparmor.d/{profiles-m-r => groups/filesystem}/mount-nfs | 0 apparmor.d/{profiles-m-r => groups/filesystem}/mount-zfs | 0 apparmor.d/{profiles-a-f => groups/firewall}/firewall-applet | 0 apparmor.d/{profiles-a-f => groups/firewall}/firewall-config | 0 apparmor.d/{profiles-a-f => groups/firewall}/firewalld | 0 apparmor.d/{profiles-m-r => groups/firewall}/nft | 0 apparmor.d/{profiles-s-z => groups/firewall}/ufw | 0 apparmor.d/{profiles-a-f => groups/freedesktop}/boltd | 0 apparmor.d/{profiles-s-z => groups/freedesktop}/wireplumber | 0 apparmor.d/{profiles-g-l => groups/usb}/lsusb | 2 +- apparmor.d/{profiles-s-z => groups/usb}/usb-devices | 1 + apparmor.d/{profiles-s-z => groups/usb}/usbguard | 0 apparmor.d/{profiles-s-z => groups/usb}/usbguard-applet-qt | 0 apparmor.d/{profiles-s-z => groups/usb}/usbguard-daemon | 0 apparmor.d/{profiles-s-z => groups/usb}/usbguard-dbus | 0 apparmor.d/{profiles-s-z => groups/usb}/usbguard-notifier | 0 apparmor.d/{profiles-a-f => groups/utils}/dmesg | 0 apparmor.d/{profiles-s-z => groups/utils}/whereis | 0 38 files changed, 3 insertions(+), 2 deletions(-) rename apparmor.d/{profiles-a-f => groups/bluetooth}/blueman (100%) rename apparmor.d/{profiles-a-f => groups/bluetooth}/blueman-mechanism (100%) rename apparmor.d/{profiles-a-f => groups/bluetooth}/blueman-rfcomm-watcher (86%) rename apparmor.d/{profiles-a-f => groups/bluetooth}/bluemoon (100%) rename apparmor.d/{profiles-a-f => groups/bluetooth}/bluetoothctl (100%) rename apparmor.d/{profiles-a-f => groups/bluetooth}/bluetoothd (100%) rename apparmor.d/{profiles-m-r => groups/bluetooth}/obex-folder-listing (100%) rename apparmor.d/{profiles-m-r => groups/bluetooth}/obexautofs (100%) rename apparmor.d/{profiles-m-r => groups/bluetooth}/obexctl (100%) rename apparmor.d/{profiles-m-r => groups/bluetooth}/obexd (100%) rename apparmor.d/{profiles-m-r => groups/bluetooth}/obexfs (100%) rename apparmor.d/{profiles-m-r => groups/bluetooth}/obexpush-atd (100%) rename apparmor.d/{profiles-m-r => groups/bluetooth}/obexpushd (100%) rename apparmor.d/{profiles-m-r => groups/filesystem}/mke2fs (100%) rename apparmor.d/{profiles-m-r => groups/filesystem}/mkfs-btrfs (100%) rename apparmor.d/{profiles-m-r => groups/filesystem}/mkfs-fat (100%) rename apparmor.d/{profiles-m-r => groups/filesystem}/mkntfs (100%) rename apparmor.d/{profiles-m-r => groups/filesystem}/mkswap (100%) rename apparmor.d/{profiles-m-r => groups/filesystem}/mount (100%) rename apparmor.d/{profiles-m-r => groups/filesystem}/mount-cifs (100%) rename apparmor.d/{profiles-m-r => groups/filesystem}/mount-nfs (100%) rename apparmor.d/{profiles-m-r => groups/filesystem}/mount-zfs (100%) rename apparmor.d/{profiles-a-f => groups/firewall}/firewall-applet (100%) rename apparmor.d/{profiles-a-f => groups/firewall}/firewall-config (100%) rename apparmor.d/{profiles-a-f => groups/firewall}/firewalld (100%) rename apparmor.d/{profiles-m-r => groups/firewall}/nft (100%) rename apparmor.d/{profiles-s-z => groups/firewall}/ufw (100%) rename apparmor.d/{profiles-a-f => groups/freedesktop}/boltd (100%) rename apparmor.d/{profiles-s-z => groups/freedesktop}/wireplumber (100%) rename apparmor.d/{profiles-g-l => groups/usb}/lsusb (92%) rename apparmor.d/{profiles-s-z => groups/usb}/usb-devices (96%) rename apparmor.d/{profiles-s-z => groups/usb}/usbguard (100%) rename apparmor.d/{profiles-s-z => groups/usb}/usbguard-applet-qt (100%) rename apparmor.d/{profiles-s-z => groups/usb}/usbguard-daemon (100%) rename apparmor.d/{profiles-s-z => groups/usb}/usbguard-dbus (100%) rename apparmor.d/{profiles-s-z => groups/usb}/usbguard-notifier (100%) rename apparmor.d/{profiles-a-f => groups/utils}/dmesg (100%) rename apparmor.d/{profiles-s-z => groups/utils}/whereis (100%) diff --git a/apparmor.d/profiles-a-f/blueman b/apparmor.d/groups/bluetooth/blueman similarity index 100% rename from apparmor.d/profiles-a-f/blueman rename to apparmor.d/groups/bluetooth/blueman diff --git a/apparmor.d/profiles-a-f/blueman-mechanism b/apparmor.d/groups/bluetooth/blueman-mechanism similarity index 100% rename from apparmor.d/profiles-a-f/blueman-mechanism rename to apparmor.d/groups/bluetooth/blueman-mechanism diff --git a/apparmor.d/profiles-a-f/blueman-rfcomm-watcher b/apparmor.d/groups/bluetooth/blueman-rfcomm-watcher similarity index 86% rename from apparmor.d/profiles-a-f/blueman-rfcomm-watcher rename to apparmor.d/groups/bluetooth/blueman-rfcomm-watcher index 516f14bd..639e475a 100644 --- a/apparmor.d/profiles-a-f/blueman-rfcomm-watcher +++ b/apparmor.d/groups/bluetooth/blueman-rfcomm-watcher @@ -7,7 +7,7 @@ abi , include -@{exec_path} = @{lib}/blueman-rfcomm-watcher +@{exec_path} = @{lib}/blueman-mechanism @{lib}/blueman/blueman-rfcomm-watcher profile blueman-rfcomm-watcher @{exec_path} { include include diff --git a/apparmor.d/profiles-a-f/bluemoon b/apparmor.d/groups/bluetooth/bluemoon similarity index 100% rename from apparmor.d/profiles-a-f/bluemoon rename to apparmor.d/groups/bluetooth/bluemoon diff --git a/apparmor.d/profiles-a-f/bluetoothctl b/apparmor.d/groups/bluetooth/bluetoothctl similarity index 100% rename from apparmor.d/profiles-a-f/bluetoothctl rename to apparmor.d/groups/bluetooth/bluetoothctl diff --git a/apparmor.d/profiles-a-f/bluetoothd b/apparmor.d/groups/bluetooth/bluetoothd similarity index 100% rename from apparmor.d/profiles-a-f/bluetoothd rename to apparmor.d/groups/bluetooth/bluetoothd diff --git a/apparmor.d/profiles-m-r/obex-folder-listing b/apparmor.d/groups/bluetooth/obex-folder-listing similarity index 100% rename from apparmor.d/profiles-m-r/obex-folder-listing rename to apparmor.d/groups/bluetooth/obex-folder-listing diff --git a/apparmor.d/profiles-m-r/obexautofs b/apparmor.d/groups/bluetooth/obexautofs similarity index 100% rename from apparmor.d/profiles-m-r/obexautofs rename to apparmor.d/groups/bluetooth/obexautofs diff --git a/apparmor.d/profiles-m-r/obexctl b/apparmor.d/groups/bluetooth/obexctl similarity index 100% rename from apparmor.d/profiles-m-r/obexctl rename to apparmor.d/groups/bluetooth/obexctl diff --git a/apparmor.d/profiles-m-r/obexd b/apparmor.d/groups/bluetooth/obexd similarity index 100% rename from apparmor.d/profiles-m-r/obexd rename to apparmor.d/groups/bluetooth/obexd diff --git a/apparmor.d/profiles-m-r/obexfs b/apparmor.d/groups/bluetooth/obexfs similarity index 100% rename from apparmor.d/profiles-m-r/obexfs rename to apparmor.d/groups/bluetooth/obexfs diff --git a/apparmor.d/profiles-m-r/obexpush-atd b/apparmor.d/groups/bluetooth/obexpush-atd similarity index 100% rename from apparmor.d/profiles-m-r/obexpush-atd rename to apparmor.d/groups/bluetooth/obexpush-atd diff --git a/apparmor.d/profiles-m-r/obexpushd b/apparmor.d/groups/bluetooth/obexpushd similarity index 100% rename from apparmor.d/profiles-m-r/obexpushd rename to apparmor.d/groups/bluetooth/obexpushd diff --git a/apparmor.d/profiles-m-r/mke2fs b/apparmor.d/groups/filesystem/mke2fs similarity index 100% rename from apparmor.d/profiles-m-r/mke2fs rename to apparmor.d/groups/filesystem/mke2fs diff --git a/apparmor.d/profiles-m-r/mkfs-btrfs b/apparmor.d/groups/filesystem/mkfs-btrfs similarity index 100% rename from apparmor.d/profiles-m-r/mkfs-btrfs rename to apparmor.d/groups/filesystem/mkfs-btrfs diff --git a/apparmor.d/profiles-m-r/mkfs-fat b/apparmor.d/groups/filesystem/mkfs-fat similarity index 100% rename from apparmor.d/profiles-m-r/mkfs-fat rename to apparmor.d/groups/filesystem/mkfs-fat diff --git a/apparmor.d/profiles-m-r/mkntfs b/apparmor.d/groups/filesystem/mkntfs similarity index 100% rename from apparmor.d/profiles-m-r/mkntfs rename to apparmor.d/groups/filesystem/mkntfs diff --git a/apparmor.d/profiles-m-r/mkswap b/apparmor.d/groups/filesystem/mkswap similarity index 100% rename from apparmor.d/profiles-m-r/mkswap rename to apparmor.d/groups/filesystem/mkswap diff --git a/apparmor.d/profiles-m-r/mount b/apparmor.d/groups/filesystem/mount similarity index 100% rename from apparmor.d/profiles-m-r/mount rename to apparmor.d/groups/filesystem/mount diff --git a/apparmor.d/profiles-m-r/mount-cifs b/apparmor.d/groups/filesystem/mount-cifs similarity index 100% rename from apparmor.d/profiles-m-r/mount-cifs rename to apparmor.d/groups/filesystem/mount-cifs diff --git a/apparmor.d/profiles-m-r/mount-nfs b/apparmor.d/groups/filesystem/mount-nfs similarity index 100% rename from apparmor.d/profiles-m-r/mount-nfs rename to apparmor.d/groups/filesystem/mount-nfs diff --git a/apparmor.d/profiles-m-r/mount-zfs b/apparmor.d/groups/filesystem/mount-zfs similarity index 100% rename from apparmor.d/profiles-m-r/mount-zfs rename to apparmor.d/groups/filesystem/mount-zfs diff --git a/apparmor.d/profiles-a-f/firewall-applet b/apparmor.d/groups/firewall/firewall-applet similarity index 100% rename from apparmor.d/profiles-a-f/firewall-applet rename to apparmor.d/groups/firewall/firewall-applet diff --git a/apparmor.d/profiles-a-f/firewall-config b/apparmor.d/groups/firewall/firewall-config similarity index 100% rename from apparmor.d/profiles-a-f/firewall-config rename to apparmor.d/groups/firewall/firewall-config diff --git a/apparmor.d/profiles-a-f/firewalld b/apparmor.d/groups/firewall/firewalld similarity index 100% rename from apparmor.d/profiles-a-f/firewalld rename to apparmor.d/groups/firewall/firewalld diff --git a/apparmor.d/profiles-m-r/nft b/apparmor.d/groups/firewall/nft similarity index 100% rename from apparmor.d/profiles-m-r/nft rename to apparmor.d/groups/firewall/nft diff --git a/apparmor.d/profiles-s-z/ufw b/apparmor.d/groups/firewall/ufw similarity index 100% rename from apparmor.d/profiles-s-z/ufw rename to apparmor.d/groups/firewall/ufw diff --git a/apparmor.d/profiles-a-f/boltd b/apparmor.d/groups/freedesktop/boltd similarity index 100% rename from apparmor.d/profiles-a-f/boltd rename to apparmor.d/groups/freedesktop/boltd diff --git a/apparmor.d/profiles-s-z/wireplumber b/apparmor.d/groups/freedesktop/wireplumber similarity index 100% rename from apparmor.d/profiles-s-z/wireplumber rename to apparmor.d/groups/freedesktop/wireplumber diff --git a/apparmor.d/profiles-g-l/lsusb b/apparmor.d/groups/usb/lsusb similarity index 92% rename from apparmor.d/profiles-g-l/lsusb rename to apparmor.d/groups/usb/lsusb index 40e902a8..f824343d 100644 --- a/apparmor.d/profiles-g-l/lsusb +++ b/apparmor.d/groups/usb/lsusb @@ -7,7 +7,7 @@ abi , include -@{exec_path} = @{bin}/lsusb +@{exec_path} = @{bin}/lsusb @{bin}/lsusb.py profile lsusb @{exec_path} { include include diff --git a/apparmor.d/profiles-s-z/usb-devices b/apparmor.d/groups/usb/usb-devices similarity index 96% rename from apparmor.d/profiles-s-z/usb-devices rename to apparmor.d/groups/usb/usb-devices index c67b78fa..59ff12fe 100644 --- a/apparmor.d/profiles-s-z/usb-devices +++ b/apparmor.d/groups/usb/usb-devices @@ -22,6 +22,7 @@ profile usb-devices @{exec_path} { @{bin}/{,e}grep rix, @{bin}/basename rix, @{bin}/cat rix, + @{bin}/sed rix, @{bin}/cut rix, @{bin}/find rix, @{bin}/readlink rix, diff --git a/apparmor.d/profiles-s-z/usbguard b/apparmor.d/groups/usb/usbguard similarity index 100% rename from apparmor.d/profiles-s-z/usbguard rename to apparmor.d/groups/usb/usbguard diff --git a/apparmor.d/profiles-s-z/usbguard-applet-qt b/apparmor.d/groups/usb/usbguard-applet-qt similarity index 100% rename from apparmor.d/profiles-s-z/usbguard-applet-qt rename to apparmor.d/groups/usb/usbguard-applet-qt diff --git a/apparmor.d/profiles-s-z/usbguard-daemon b/apparmor.d/groups/usb/usbguard-daemon similarity index 100% rename from apparmor.d/profiles-s-z/usbguard-daemon rename to apparmor.d/groups/usb/usbguard-daemon diff --git a/apparmor.d/profiles-s-z/usbguard-dbus b/apparmor.d/groups/usb/usbguard-dbus similarity index 100% rename from apparmor.d/profiles-s-z/usbguard-dbus rename to apparmor.d/groups/usb/usbguard-dbus diff --git a/apparmor.d/profiles-s-z/usbguard-notifier b/apparmor.d/groups/usb/usbguard-notifier similarity index 100% rename from apparmor.d/profiles-s-z/usbguard-notifier rename to apparmor.d/groups/usb/usbguard-notifier diff --git a/apparmor.d/profiles-a-f/dmesg b/apparmor.d/groups/utils/dmesg similarity index 100% rename from apparmor.d/profiles-a-f/dmesg rename to apparmor.d/groups/utils/dmesg diff --git a/apparmor.d/profiles-s-z/whereis b/apparmor.d/groups/utils/whereis similarity index 100% rename from apparmor.d/profiles-s-z/whereis rename to apparmor.d/groups/utils/whereis