--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: pkg-kde-talk@alioth-lists.debian.net
Please unblock package akonadi
[ Reason ]
Akonadi ships AppArmor profiles and those should be extendable for
users. To do so there is a local folder for every AppArmor profile to
modify the existing AppArmor profiles. With -1 Akonadi ignores those
local modified AppArmor profiles.
[ Impact ]
Users cannot modifiy their AppArmor pofiles without much work when
upgrading.
[ Tests ]
The patch exist now for more than 20 days in unstable without any issue.
with -2 i got fast reply that I missed to mark mariadb_akonadi as
AppAromr profile, that also shows, that users are testing Akonadi and
AppArmor together. Also run it on my own machine successfully.
[ Risks ]
The code is very simple and there are no side effects.
[ Checklist ]
[ x ] all changes are documented in the d/changelog
[ x ] I reviewed all changes and I approve them
[ x ] attach debdiff against the package in testing
unblock akonadi/4:20.08.3-3
diff -Nru akonadi-20.08.3/debian/changelog akonadi-20.08.3/debian/changelog
--- akonadi-20.08.3/debian/changelog 2020-12-16 01:38:46.000000000 +0100
+++ akonadi-20.08.3/debian/changelog 2021-04-13 22:30:46.000000000 +0200
@@ -1,3 +1,15 @@
+akonadi (4:20.08.3-3) unstable; urgency=medium
+
+ * Handle mariadbd_akonadi with dh_apparmor (Closes: #986635).
+
+ -- Sandro Knauß <hefee@debian.org> Tue, 13 Apr 2021 22:30:46 +0200
+
+akonadi (4:20.08.3-2) unstable; urgency=medium
+
+ * Add patch to load local apparmor rules (Closes: #985080).
+
+ -- Sandro Knauß <hefee@debian.org> Mon, 05 Apr 2021 13:09:40 +0200
+
akonadi (4:20.08.3-1) unstable; urgency=medium
[ Sandro Knauß ]
diff -Nru akonadi-20.08.3/debian/patches/load_local_apparmor_rules.diff akonadi-20.08.3/debian/patches/load_local_apparmor_rules.diff
--- akonadi-20.08.3/debian/patches/load_local_apparmor_rules.diff 1970-01-01 01:00:00.000000000 +0100
+++ akonadi-20.08.3/debian/patches/load_local_apparmor_rules.diff 2021-04-13 22:29:58.000000000 +0200
@@ -0,0 +1,51 @@
+Description: Load Apparmor site-specific additions and overrides.
+ Debian allows users to add site-specific additions and overrides via local
+ apparmor rule files. Those local rule files are created and handled by
+ dh_apparmor.
+Author: Hefee <hefee@debian.org>
+Origin: Debian
+Bug-Debian: https://bugs.debian.org/985080
+Last-Update: 2021-04-13
+Forwarded: Not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/apparmor/mariadbd_akonadi
++++ b/apparmor/mariadbd_akonadi
+@@ -36,4 +36,7 @@ profile mariadbd_akonadi {
+ owner @{xdg_data_home}/akonadi/** rwk,
+ owner @{PROC}/@{pid}/loginuid r,
+ owner /{,var/}run/user/@{uid}/akonadi** rwk,
++
++ # Site-specific additions and overrides. See local/README for details.
++ #include <local/mariadbd_akonadi>
+ }
+--- a/apparmor/mysqld_akonadi
++++ b/apparmor/mysqld_akonadi
+@@ -36,4 +36,7 @@ profile mysqld_akonadi {
+ owner @{xdg_data_home}/akonadi/** rwk,
+ owner @{PROC}/@{pid}/loginuid r,
+ owner /{,var/}run/user/@{uid}/akonadi** rwk,
++
++ # Site-specific additions and overrides. See local/README for details.
++ #include <local/mysqld_akonadi>
+ }
+--- a/apparmor/postgresql_akonadi
++++ b/apparmor/postgresql_akonadi
+@@ -38,4 +38,7 @@ profile postgresql_akonadi {
+ /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/psql mrix,
+ /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_restore mrix,
+ /{usr/,}bin/cp mrix,
++
++ # Site-specific additions and overrides. See local/README for details.
++ #include <local/postgresql_akonadi>
+ }
+--- a/apparmor/usr.bin.akonadiserver
++++ b/apparmor/usr.bin.akonadiserver
+@@ -77,4 +77,7 @@
+ owner /{,var/}run/user/@{uid}/kdeinit** rwk,
+ owner /{,var/}run/user/@{uid}/kcrash** rwk,
+ owner /tmp/#[0-9]* m,
++
++ # Site-specific additions and overrides. See local/README for details.
++ #include <local/usr.bin.akonadiserver>
+ }
diff -Nru akonadi-20.08.3/debian/patches/series akonadi-20.08.3/debian/patches/series
--- akonadi-20.08.3/debian/patches/series 2020-10-19 23:54:01.000000000 +0200
+++ akonadi-20.08.3/debian/patches/series 2021-04-05 13:07:39.000000000 +0200
@@ -1,3 +1,4 @@
enable_debianabimanager.diff
postgresql-data-checksums.patch
disable_secure_file_priv_check.diff
+load_local_apparmor_rules.diff
diff -Nru akonadi-20.08.3/debian/rules akonadi-20.08.3/debian/rules
--- akonadi-20.08.3/debian/rules 2020-10-13 19:45:34.000000000 +0200
+++ akonadi-20.08.3/debian/rules 2021-04-13 22:10:12.000000000 +0200
@@ -22,6 +22,7 @@
-DBUILD_DESIGNERPLUGIN=ON
execute_after_dh_install:
+ dh_apparmor -pakonadi-server --profile-name=mariadbd_akonadi
dh_apparmor -pakonadi-server --profile-name=mysqld_akonadi
dh_apparmor -pakonadi-server --profile-name=postgresql_akonadi
dh_apparmor -pakonadi-server --profile-name=usr.bin.akonadiserver
--- End Message ---