[neon/kde/akonadi/Neon/release-lts] debian/patches: refresh patch

Jonathan Riddell null at kde.org
Wed Oct 7 14:04:42 BST 2020


Git commit a4abfadcda72d11a609fa7bc2048d05ba5025c65 by Jonathan Riddell.
Committed on 07/10/2020 at 13:04.
Pushed by jriddell into branch 'Neon/release-lts'.

refresh patch

M  +6    -6    debian/patches/0001-neon-hack-to-unbreak-apparmor-profile.patch

https://invent.kde.org/neon/kde/akonadi/commit/a4abfadcda72d11a609fa7bc2048d05ba5025c65

diff --git a/debian/patches/0001-neon-hack-to-unbreak-apparmor-profile.patch b/debian/patches/0001-neon-hack-to-unbreak-apparmor-profile.patch
index e786bf2..33de2f4 100644
--- a/debian/patches/0001-neon-hack-to-unbreak-apparmor-profile.patch
+++ b/debian/patches/0001-neon-hack-to-unbreak-apparmor-profile.patch
@@ -17,10 +17,10 @@ reduce conflict complexity
  apparmor/usr.bin.akonadiserver | 21 ++++++++++++++++++++-
  1 file changed, 20 insertions(+), 1 deletion(-)
 
-Index: akonadi/apparmor/usr.bin.akonadiserver
+Index: akonadi-20.08.2/apparmor/usr.bin.akonadiserver
 ===================================================================
---- akonadi.orig/apparmor/usr.bin.akonadiserver
-+++ akonadi/apparmor/usr.bin.akonadiserver
+--- akonadi-20.08.2.orig/apparmor/usr.bin.akonadiserver
++++ akonadi-20.08.2/apparmor/usr.bin.akonadiserver
 @@ -10,9 +10,27 @@
    #include <abstractions/dbus-session-strict>
    #include <abstractions/nameservice>
@@ -49,12 +49,12 @@ Index: akonadi/apparmor/usr.bin.akonadiserver
 +
    signal send set=kill peer=mysqld_akonadi,
    signal send set=term peer=mysqld_akonadi,
- 
-@@ -46,6 +64,7 @@
+   ptrace read peer=mysqld_akonadi,
+@@ -70,6 +88,7 @@
    owner @{xdg_data_home}/akonadi/ rw,
    owner @{xdg_data_home}/akonadi/* rwlk,
    owner @{xdg_data_home}/akonadi/** rwk,
 +  owner /{,var/}run/user/@{uid}/akonadi/** rwk,
    owner @{PROC}/@{pid}/loginuid r,
    owner @{PROC}/@{pid}/mounts r,
-   owner /{,var/}run/user/@{uid}/akonadi** rwk,
+   owner @{PROC}/[0-9]*/stat r,


More information about the Neon-commits mailing list