From ec25a155db5657ae3a6ba95ffd0e5d8edd6d5896 Mon Sep 17 00:00:00 2001
From: curiosityseeker <60518106+curiosityseeker@users.noreply.github.com>
Date: Fri, 7 Jun 2024 20:26:39 +0200
Subject: [PATCH] Chromium based browsers: add stacking for chrashpad handler
 (#366)

* Update chromium abs: remove crashpad-handler

* Update brave: add stacking for chrashpad-handler

* Update chrome: add stacking for crashpad-handler

* Update chromium: add stacking for crashpad-handler

* Update msedge: add stacking for crashpad-handler

* Rename msedge-crashpad-handlers to msedge-crashpad-handler
---
 apparmor.d/abstractions/app/chromium                            | 1 -
 apparmor.d/groups/browsers/brave                                | 2 ++
 apparmor.d/groups/browsers/chrome                               | 1 +
 apparmor.d/groups/browsers/chromium                             | 2 ++
 apparmor.d/groups/browsers/msedge                               | 2 +-
 .../{msedge-crashpad-handlers => msedge-crashpad-handler}       | 0
 6 files changed, 6 insertions(+), 2 deletions(-)
 rename apparmor.d/groups/browsers/{msedge-crashpad-handlers => msedge-crashpad-handler} (100%)

diff --git a/apparmor.d/abstractions/app/chromium b/apparmor.d/abstractions/app/chromium
index d00fb331b..c4359cc9c 100644
--- a/apparmor.d/abstractions/app/chromium
+++ b/apparmor.d/abstractions/app/chromium
@@ -70,7 +70,6 @@
 
   @{lib_dirs}/{,**} r,
   @{lib_dirs}/*.so* mr,
-  @{lib_dirs}/chrome_crashpad_handler  rPx,
   @{lib_dirs}/chrome-sandbox           rPx,
 
   # Desktop integration
diff --git a/apparmor.d/groups/browsers/brave b/apparmor.d/groups/browsers/brave
index 41b6c19b3..f8ce7d8cb 100644
--- a/apparmor.d/groups/browsers/brave
+++ b/apparmor.d/groups/browsers/brave
@@ -26,6 +26,8 @@ profile brave @{exec_path} {
 
   @{bin}/man  rPUx, #  For "brave --help"
 
+  @{lib_dirs}/chrome_crashpad_handler  rPx -> brave//&brave-crashpad-handler,
+
   /usr/share/chromium/extensions/ r,
 
   /etc/opt/chrome/ r,
diff --git a/apparmor.d/groups/browsers/chrome b/apparmor.d/groups/browsers/chrome
index 22a4ebf0a..2a462592b 100644
--- a/apparmor.d/groups/browsers/chrome
+++ b/apparmor.d/groups/browsers/chrome
@@ -24,6 +24,7 @@ profile chrome @{exec_path} {
 
   @{bin}/man  rPUx, #  For "chrome --help"
 
+  @{lib_dirs}/chrome_crashpad_handler  rPx -> chrome//&chrome-crashpad-handler,
   @{lib_dirs}/google-@{name}  rPx,
 
   @{lib_dirs}/nacl_helper    rix,
diff --git a/apparmor.d/groups/browsers/chromium b/apparmor.d/groups/browsers/chromium
index 6ec3e3f97..c078e1131 100644
--- a/apparmor.d/groups/browsers/chromium
+++ b/apparmor.d/groups/browsers/chromium
@@ -22,5 +22,7 @@ profile chromium @{exec_path} {
 
   @{exec_path} mrix,
 
+  @{lib_dirs}/chrome_crashpad_handler  rPx -> chromium//&chromium-crashpad-handler,
+
   include if exists <local/chromium>
 }
diff --git a/apparmor.d/groups/browsers/msedge b/apparmor.d/groups/browsers/msedge
index 36c818c4d..bba1ac4fb 100644
--- a/apparmor.d/groups/browsers/msedge
+++ b/apparmor.d/groups/browsers/msedge
@@ -28,7 +28,7 @@ profile msedge @{exec_path} {
   @{lib_dirs}/xdg-settings   rix, #-> xdg-settings,
  
   @{lib_dirs}/microsoft-edge{,beta,-dev}  rPx,
-  @{lib_dirs}/msedge_crashpad_handler     rPx,
+  @{lib_dirs}/chrome_crashpad_handler  rPx -> msedge//&msedge-crashpad-handler,
 
   @{lib_dirs}/*.so* mr,
   @{lib_dirs}/WidevineCdm/_platform_specific/linux_*/libwidevinecdm.so mr,
diff --git a/apparmor.d/groups/browsers/msedge-crashpad-handlers b/apparmor.d/groups/browsers/msedge-crashpad-handler
similarity index 100%
rename from apparmor.d/groups/browsers/msedge-crashpad-handlers
rename to apparmor.d/groups/browsers/msedge-crashpad-handler