From f60234d74a3e2ced7a9c2bf5d48b6e382196a110 Mon Sep 17 00:00:00 2001
From: Jeroen Rijken <jeroen.rijken@xs4all.nl>
Date: Mon, 19 Feb 2024 17:03:40 +0100
Subject: [PATCH] Restore libexec

Signed-off-by: Jeroen Rijken <jeroen.rijken@xs4all.nl>
---
 apparmor.d/groups/kde/dolphin          | 1 +
 apparmor.d/groups/kde/kioslave5        | 3 ++-
 apparmor.d/tunables/multiarch.d/system | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apparmor.d/groups/kde/dolphin b/apparmor.d/groups/kde/dolphin
index 0c1d1b2a..6a54f243 100644
--- a/apparmor.d/groups/kde/dolphin
+++ b/apparmor.d/groups/kde/dolphin
@@ -28,6 +28,7 @@ profile dolphin @{exec_path} {
 
   @{bin}/ldd            rix,
   @{lib}/kf5/kioslave5  rPx,
+  @{lib}/@{multiarch}/kf5/kioslave5  rPx,
 
   /usr/share/kf5/kmoretools/{,**} r,
   /usr/share/kio/{,**} r,
diff --git a/apparmor.d/groups/kde/kioslave5 b/apparmor.d/groups/kde/kioslave5
index 7682f6ff..61117960 100644
--- a/apparmor.d/groups/kde/kioslave5
+++ b/apparmor.d/groups/kde/kioslave5
@@ -6,7 +6,8 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{exec_path} = @{lib}/kf5/kioslave5
+@{exec_path} = @{lib}/@{multiarch}/kf5/kioslave5
+@{exec_path} += @{lib}/kf5/kioslave5
 profile kioslave5 @{exec_path} {
   include <abstractions/base>
   include <abstractions/deny-sensitive-home>
diff --git a/apparmor.d/tunables/multiarch.d/system b/apparmor.d/tunables/multiarch.d/system
index 4cfdc5dc..97ef7157 100644
--- a/apparmor.d/tunables/multiarch.d/system
+++ b/apparmor.d/tunables/multiarch.d/system
@@ -55,7 +55,7 @@
 
 # Common places for binaries and libraries across distributions
 @{bin}=/{,usr/}{,s}bin
-@{lib}=/{,usr/}{,@{multiarch}/}lib{,exec,32,64}
+@{lib}=/{,usr/}lib{,exec,32,64}
 
 # Name of the systemd profile: unconfined || systemd
 @{systemd}=unconfined