From fd590e9199cce0c27e70dbed5b7d4cde76e0d220 Mon Sep 17 00:00:00 2001
From: Jose Maldonado aka Yukiteru <josemald89@gmail.com>
Date: Mon, 29 Apr 2024 15:12:43 -0400
Subject: [PATCH] Fix exec_path in profiles for Edge and copyright headers

---
 apparmor.d/profiles-m-r/msedge                   | 4 ++--
 apparmor.d/profiles-m-r/msedge-crashpad-handlers | 4 ++--
 apparmor.d/profiles-m-r/msedge-sandbox           | 4 ++--
 apparmor.d/profiles-m-r/msedge-wrapper           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apparmor.d/profiles-m-r/msedge b/apparmor.d/profiles-m-r/msedge
index a45f0b0a..6c92c17c 100644
--- a/apparmor.d/profiles-m-r/msedge
+++ b/apparmor.d/profiles-m-r/msedge
@@ -1,6 +1,6 @@
 # apparmor.d - Full set of apparmor profiles
-# Copyright (C) 2018-2021 Mikhail Morfikov
 # Copyright (C) 2022-2024 Alexandre Pujol <alexandre@pujol.io>
+# Copyright (C) 2022-2024 Jose Maldonado <josemald89@gmail.com>
 # SPDX-License-Identifier: GPL-2.0-only
 
 abi <abi/3.0>,
@@ -14,7 +14,7 @@ include <tunables/global>
 @{cache_dirs} = @{user_cache_dirs}/microsoft-edge{,-beta,-dev}
 
 @{exec_path} = @{lib_dirs}/@{name}
-profile msedge /opt/microsoft/msedge{,-beta,-dev}/msedge{,-beta,-dev} {
+profile msedge @{exec_path} {
   include <abstractions/base>
   include <abstractions/app/chromium>
 
diff --git a/apparmor.d/profiles-m-r/msedge-crashpad-handlers b/apparmor.d/profiles-m-r/msedge-crashpad-handlers
index c9572f50..6f453c65 100644
--- a/apparmor.d/profiles-m-r/msedge-crashpad-handlers
+++ b/apparmor.d/profiles-m-r/msedge-crashpad-handlers
@@ -1,6 +1,6 @@
 # apparmor.d - Full set of apparmor profiles
-# Copyright (C) 2018-2022 Mikhail Morfikov
 # Copyright (C) 2022-2024 Alexandre Pujol <alexandre@pujol.io>
+# Copyright (C) 2022-2024 Jose Maldonado <josemald89@gmail.com>
 # SPDX-License-Identifier: GPL-2.0-only
 
 abi <abi/3.0>,
@@ -11,7 +11,7 @@ include <tunables/global>
 @{config_dirs} = @{user_config_dirs}/microsoft-edge{,-beta,-dev}
 
 @{exec_path} = @{lib_dirs}/msedge_crashpad_handler
-profile msedge-crashpad-handler /opt/microsoft/msedge{,-beta,-dev}/msedge_crashpad_handler {
+profile msedge-crashpad-handler @{exec_path} {
   include <abstractions/base>
 
   capability sys_ptrace,
diff --git a/apparmor.d/profiles-m-r/msedge-sandbox b/apparmor.d/profiles-m-r/msedge-sandbox
index e113c586..f8192145 100644
--- a/apparmor.d/profiles-m-r/msedge-sandbox
+++ b/apparmor.d/profiles-m-r/msedge-sandbox
@@ -1,6 +1,6 @@
 # apparmor.d - Full set of apparmor profiles
-# Copyright (C) 2018-2021 Mikhail Morfikov
 # Copyright (C) 2022-2024 Alexandre Pujol <alexandre@pujol.io>
+# Copyright (C) 2022-2024 Jose Maldonado <josemald89@gmail.com>
 # SPDX-License-Identifier: GPL-2.0-only
 
 abi <abi/3.0>,
@@ -10,7 +10,7 @@ include <tunables/global>
 @{lib_dirs} = /opt/microsoft/msedge{,-beta,-dev}
 
 @{exec_path} = @{lib_dirs}/msedge-sandbox
-profile msedge-sandbox /opt/microsoft/msedge{,-beta,-dev}/msedge-sandbox {
+profile msedge-sandbox @{exec_path} {
   include <abstractions/base>
 
   capability setgid,
diff --git a/apparmor.d/profiles-m-r/msedge-wrapper b/apparmor.d/profiles-m-r/msedge-wrapper
index 3b90f399..b35fbdd3 100644
--- a/apparmor.d/profiles-m-r/msedge-wrapper
+++ b/apparmor.d/profiles-m-r/msedge-wrapper
@@ -1,6 +1,6 @@
 # apparmor.d - Full set of apparmor profiles
-# Copyright (C) 2018-2021 Mikhail Morfikov
 # Copyright (C) 2022-2024 Alexandre Pujol <alexandre@pujol.io>
+# Copyright (C) 2022-2024 Jose Maldonado <josemald89@gmail.com>
 # SPDX-License-Identifier: GPL-2.0-only
 
 abi <abi/3.0>,
@@ -10,7 +10,7 @@ include <tunables/global>
 @{lib_dirs} = /opt/microsoft/msedge{,-beta,-dev}
 
 @{exec_path} = @{lib_dirs}/microsoft-edge{,-beta,-dev}
-profile msedge-wrapper /opt/microsoft/msedge{,-beta,-dev}/microsoft-edge{,-beta,-dev} flags=(attach_disconnected) {
+profile msedge-wrapper @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/consoles>