diff -Nru quassel-0.13.1/debian/changelog quassel-0.13.1/debian/changelog --- quassel-0.13.1/debian/changelog 2019-02-16 22:56:44.000000000 +0000 +++ quassel-0.13.1/debian/changelog 2020-02-17 18:02:52.000000000 +0000 @@ -1,3 +1,10 @@ +quassel (1:0.13.1-1ubuntu1.19.10.1) eoan; urgency=medium + + * Cherry-pick fix introduced in Debian in revision 1:0.13.1-2 to fix + apparmor profile (LP: #1863664) + + -- Gianfranco Costamagna Mon, 17 Feb 2020 19:02:52 +0100 + quassel (1:0.13.1-1ubuntu1) disco; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru quassel-0.13.1/debian/NEWS quassel-0.13.1/debian/NEWS --- quassel-0.13.1/debian/NEWS 1970-01-01 00:00:00.000000000 +0000 +++ quassel-0.13.1/debian/NEWS 2020-02-17 18:02:34.000000000 +0000 @@ -0,0 +1,11 @@ +quassel (1:0.13.1-2) unstable; urgency=medium + + * This revision of quassel contains an updated apparmor profile for quassel- + core. To load the new profile, use the following command on the server + running the core: + + apparmor_parser -r /etc/apparmor.d/usr.bin.quasselcore + + This only applies to quaseelcore, no action is required for clients. + + -- Scott Kitterman Sat, 11 Jan 2020 14:55:50 -0500 diff -Nru quassel-0.13.1/debian/usr.bin.quasselcore quassel-0.13.1/debian/usr.bin.quasselcore --- quassel-0.13.1/debian/usr.bin.quasselcore 2019-02-16 22:56:42.000000000 +0000 +++ quassel-0.13.1/debian/usr.bin.quasselcore 2020-02-17 18:02:34.000000000 +0000 @@ -13,7 +13,7 @@ #include /var/lib/quassel/ rw, - /var/lib/quassel/** rwk, + /var/lib/quassel/** rwkl, /var/log/quassel/* rw, @@ -22,6 +22,13 @@ /etc/ssl/openssl.cnf r, /usr/lib/ssl/openssl.cnf r, + # QSysInfo::machineUniqueId() + /var/lib/dbus/machine-id r, + /etc/machine-id r, + + # QSysInfo::bootUniqueId() + @{PROC}/sys/kernel/random/boot_id r, + # Site-specific additions and overrides. See local/README for details. #include }