[neon/kde/akonadi/Neon/unstable] debian/patches: refresh patches

[Jonathan Riddell]

Git commit 94b5a08a478f99946ce88587bb5d91b0b56eb699 by Jonathan Riddell.
Committed on 01/10/2020 at 11:34.
Pushed by jriddell into branch 'Neon/unstable'.

refresh patches

M  +3    -3    debian/patches/0001-neon-hack-to-unbreak-apparmor-profile.patch
M  +4    -4    debian/patches/postgresql-data-checksums.patch

https://invent.kde.org/neon/kde/akonadi/commit/94b5a08a478f99946ce88587bb5d91b0b56eb699

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..cffde5f 100644
--- a/debian/patches/0001-neon-hack-to-unbreak-apparmor-profile.patch
+++ b/debian/patches/0001-neon-hack-to-unbreak-apparmor-profile.patch
@@ -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,
diff --git a/debian/patches/postgresql-data-checksums.patch b/debian/patches/postgresql-data-checksums.patch
index b8aecae..a67f51a 100644
--- a/debian/patches/postgresql-data-checksums.patch
+++ b/debian/patches/postgresql-data-checksums.patch
@@ -10,11 +10,11 @@ Index: akonadi/src/server/storage/dbconfigpostgresql.cpp
 ===================================================================
 --- akonadi.orig/src/server/storage/dbconfigpostgresql.cpp
 +++ akonadi/src/server/storage/dbconfigpostgresql.cpp
-@@ -294,6 +294,7 @@ bool DbConfigPostgresql::runInitDb(const
+@@ -306,6 +306,7 @@ bool DbConfigPostgresql::runInitDb(const
  
      // call 'initdb --pgdata=/home/user/.local/share/akonadi/data_db'
      return execute(mInitDbPath, { QStringLiteral("--pgdata=%1").arg(newDbPath),
 +                                  QStringLiteral("--data-checksums"),
-                                   QStringLiteral("--locale=en_US.UTF-8") /* TODO: check locale */ }) == 0;
- }
- 
+                                   QStringLiteral("--encoding=UTF8"),
+                                   QStringLiteral("--no-locale")
+                                 }) == 0;