From 67bed8fdd6371931ca031c50abc26c623875cd81 Mon Sep 17 00:00:00 2001
From: valoq <valoq@mailbox.org>
Date: Thu, 30 May 2024 21:59:04 +0200
Subject: [PATCH] cleanup

---
 apparmor.d/profiles-a-f/atool                       | 10 ++++------
 apparmor.d/profiles-a-f/exiftool                    |  7 ++-----
 apparmor.d/profiles-g-l/highlight                   | 13 ++++++-------
 .../{groups/apps => profiles-g-l}/imv-wayland       |  2 +-
 apparmor.d/profiles-m-r/mediainfo                   |  2 +-
 apparmor.d/profiles-m-r/mediainfo-gui               |  2 +-
 apparmor.d/{groups/apps => profiles-s-z}/zathura    |  2 +-
 7 files changed, 16 insertions(+), 22 deletions(-)
 rename apparmor.d/{groups/apps => profiles-g-l}/imv-wayland (90%)
 rename apparmor.d/{groups/apps => profiles-s-z}/zathura (91%)

diff --git a/apparmor.d/profiles-a-f/atool b/apparmor.d/profiles-a-f/atool
index 96a8cda73..3a1177081 100644
--- a/apparmor.d/profiles-a-f/atool
+++ b/apparmor.d/profiles-a-f/atool
@@ -1,6 +1,5 @@
 # apparmor.d - Full set of apparmor profiles
-# Copyright (C) 2019-2021 Mikhail Morfikov
-# Copyright (C) 2023-2024 Alexandre Pujol <alexandre@pujol.io>
+# Copyright (C) 2024 valoq <valoq@mailbox.org>
 # SPDX-License-Identifier: GPL-2.0-only
 
 abi <abi/3.0>,
@@ -8,9 +7,10 @@ abi <abi/3.0>,
 include <tunables/global>
 
 @{exec_path} = @{bin}/atool
-profile atool /{,usr/}{,s}bin/atool {
+profile atool @{exec_path} {
   include <abstractions/base>
-  include <abstractions/user-write>
+  include <abstractions/perl>
+  include <abstractions/user-write-strict>
 
   @{exec_path} mr,
 
@@ -46,7 +46,5 @@ profile atool /{,usr/}{,s}bin/atool {
   @{bin}/xz rix,
   @{bin}/zip rix,
 
-  /usr/share/perl5/{,**} r,
-
   include if exists <local/atool>
 }
diff --git a/apparmor.d/profiles-a-f/exiftool b/apparmor.d/profiles-a-f/exiftool
index c46b8edbb..c22e4e12e 100644
--- a/apparmor.d/profiles-a-f/exiftool
+++ b/apparmor.d/profiles-a-f/exiftool
@@ -1,6 +1,5 @@
 # apparmor.d - Full set of apparmor profiles
-# Copyright (C) 2019-2021 Mikhail Morfikov
-# Copyright (C) 2023-2024 Alexandre Pujol <alexandre@pujol.io>
+# Copyright (C) 2024 valoq <valoq@mailbox.org>
 # SPDX-License-Identifier: GPL-2.0-only
 
 abi <abi/3.0>,
@@ -10,11 +9,9 @@ include <tunables/global>
 @{exec_path} = @{bin}/vendor_perl/exiftool
 profile exiftool @{exec_path} {
   include <abstractions/base>
-  include <abstractions/user-read>
+  include <abstractions/user-read-strict>
 
   @{exec_path} mr,
 
-  /usr/share/perl5/{,**} r,
-
   include if exists <local/exiftool>
 }
diff --git a/apparmor.d/profiles-g-l/highlight b/apparmor.d/profiles-g-l/highlight
index 5fc2cde0f..4a5ef1402 100644
--- a/apparmor.d/profiles-g-l/highlight
+++ b/apparmor.d/profiles-g-l/highlight
@@ -1,23 +1,22 @@
 # apparmor.d - Full set of apparmor profiles
-# Copyright (C) 2019-2021 Mikhail Morfikov
-# Copyright (C) 2023-2024 Alexandre Pujol <alexandre@pujol.io>
+# Copyright (C) 2024 valoq <valoq@mailbox.org>
 # SPDX-License-Identifier: GPL-2.0-only
 
 abi <abi/3.0>,
 
 include <tunables/global>
 
-@{exec_path} = @{bin}/
-profile highlight /{,usr/}{,s}bin/highlight {
+@{exec_path} = @{bin}/highlight
+profile highlight @{exec_path} {
   include <abstractions/base>
   include <abstractions/nameservice-strict>
-  include <abstractions/user-read>
+  include <abstractions/user-read-strict>
+
+  @{exec_path} mr,
 
   /etc/machine-id r,
   /etc/highlight/{,**} r,
   /usr/share/highlight/{,**} r,
 
-  @{exec_path} mr,
-
   include if exists <local/highlight>
 }
diff --git a/apparmor.d/groups/apps/imv-wayland b/apparmor.d/profiles-g-l/imv-wayland
similarity index 90%
rename from apparmor.d/groups/apps/imv-wayland
rename to apparmor.d/profiles-g-l/imv-wayland
index 2479e8bfa..6bac7898b 100644
--- a/apparmor.d/groups/apps/imv-wayland
+++ b/apparmor.d/profiles-g-l/imv-wayland
@@ -1,5 +1,5 @@
 # apparmor.d - Full set of apparmor profiles
-# Copyright (C) 2021-2024 Alexandre Pujol <alexandre@pujol.io>
+# Copyright (C) 2024 valoq <valoq@mailbox.org>
 # SPDX-License-Identifier: GPL-2.0-only
 
 abi <abi/3.0>,
diff --git a/apparmor.d/profiles-m-r/mediainfo b/apparmor.d/profiles-m-r/mediainfo
index 143cda76b..bd1d1e41a 100644
--- a/apparmor.d/profiles-m-r/mediainfo
+++ b/apparmor.d/profiles-m-r/mediainfo
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/mediainfo
 profile mediainfo @{exec_path} {
   include <abstractions/base>
-  include <abstractions/user-read>
+  include <abstractions/user-read-strict>
 
   @{exec_path} mr,
 
diff --git a/apparmor.d/profiles-m-r/mediainfo-gui b/apparmor.d/profiles-m-r/mediainfo-gui
index 6ef4bd5a0..4315a8157 100644
--- a/apparmor.d/profiles-m-r/mediainfo-gui
+++ b/apparmor.d/profiles-m-r/mediainfo-gui
@@ -15,7 +15,7 @@ profile mediainfo-gui @{exec_path} {
   include <abstractions/fonts>
   include <abstractions/freedesktop.org>
   include <abstractions/gtk>
-  include <abstractions/user-read>
+  include <abstractions/user-read-strict>
 
   @{exec_path} mr,
 
diff --git a/apparmor.d/groups/apps/zathura b/apparmor.d/profiles-s-z/zathura
similarity index 91%
rename from apparmor.d/groups/apps/zathura
rename to apparmor.d/profiles-s-z/zathura
index 0c86abdee..98f218e13 100644
--- a/apparmor.d/groups/apps/zathura
+++ b/apparmor.d/profiles-s-z/zathura
@@ -1,5 +1,5 @@
 # apparmor.d - Full set of apparmor profiles
-# Copyright (C) 2021-2024 Alexandre Pujol <alexandre@pujol.io>
+# Copyright (C) 2024 valoq <valoq@mailbox.org>
 # SPDX-License-Identifier: GPL-2.0-only
 
 abi <abi/3.0>,