From 99cf250b97c1e5af3808749bb00ee99315c91b960c3b363adb085c8b71c28023 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 11 Mar 2022 10:43:21 +0000 Subject: [PATCH] Update apparmor locations OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=298 --- 0001-Apparmor-Also-look-in-usr-libexec.patch | 27 ++++++++++++++++++++ akonadi-server.changes | 6 +++++ akonadi-server.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 0001-Apparmor-Also-look-in-usr-libexec.patch diff --git a/0001-Apparmor-Also-look-in-usr-libexec.patch b/0001-Apparmor-Also-look-in-usr-libexec.patch new file mode 100644 index 0000000..df35fcb --- /dev/null +++ b/0001-Apparmor-Also-look-in-usr-libexec.patch @@ -0,0 +1,27 @@ +From 2ce37b8cbe37772dde28ee510a0050e5444edc67 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Fri, 11 Mar 2022 11:33:41 +0100 +Subject: [PATCH] Apparmor: Also look in /usr/libexec + +FHS 3.0 states that executables not intended to be executed by users shall be under /usr/libexec [1] + +[1] https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html +--- + apparmor/usr.bin.akonadiserver | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/apparmor/usr.bin.akonadiserver b/apparmor/usr.bin.akonadiserver +index a8e20045b..83b654abd 100644 +--- a/apparmor/usr.bin.akonadiserver ++++ b/apparmor/usr.bin.akonadiserver +@@ -42,6 +42,7 @@ abi , + /usr/bin/akonadiserver mr, + /usr/lib/x86_64-linux-gnu/libexec/drkonqi PUx, + /usr/lib{,64}/libexec/drkonqi PUx, ++ /usr/libexec/drkonqi PUx, + /usr/bin/mariadb-admin PUx -> mariadbd_akonadi, + /usr/bin/mariadb-check PUx -> mariadbd_akonadi, + /usr/bin/mariadb-install-db PUx -> mariaddbd_akonadi, +-- +2.35.1 + diff --git a/akonadi-server.changes b/akonadi-server.changes index 5cf39de..cbecba7 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 10:38:21 UTC 2022 - Christophe Giboudeaux + +- Add patch: + * 0001-Apparmor-Also-look-in-usr-libexec.patch + ------------------------------------------------------------------- Tue Mar 1 09:56:28 UTC 2022 - Christophe Giboudeaux diff --git a/akonadi-server.spec b/akonadi-server.spec index 6480360..a3f5cd6 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -34,6 +34,8 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/% Source2: applications.keyring %endif Source99: akonadi-server-rpmlintrc +# PATCH-FIX-UPSTREAM +Patch0: 0001-Apparmor-Also-look-in-usr-libexec.patch BuildRequires: apparmor-abstractions BuildRequires: apparmor-rpm-macros BuildRequires: extra-cmake-modules >= %{kf5_version}