Bug#905011: man-db: Adapt apparmor profile for usrmerge

[Dimitri John Ledkov]

Package: man-db
Version: 2.8.4-1
Severity: normal
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Dear Maintainer,

apparmor profile need to be adjusted to account for systems with
usrmerge package installed.

Please see the attached patch.

Regards,

Dimitri.

-----BEGIN PGP SIGNATURE-----

iQFEBAEBCgAuFiEEdzyZ69ChEXIhenw/ysLYuc0spfkFAltfEkMQHHhub3hAdWJ1
bnR1LmNvbQAKCRDKwti5zSyl+aCICACqtoUXWxvkXp2dRp3teVvE99NlfXXOF1Rs
3IIQ+qYRXvwIjc5iiBq1WlwEcD4HjShY6p6u2I8UkxydPA3OMibAuKvSvw+yh1Q6
xchiJ/uipG0SDJTdxjEi1S1OMd6V647iHXFJM7gNeO9hK335m+22P8soogg2wumw
A1FgKw0bbt1M7IE0iS5bJ/K06PiQiCorCceI0+KB6dLJ6O4mwGntcuaNDBGOgTzx
noMcXTVwKgk4hQRhe1v7ie+2i0okFssaynjbwR+RFEa/iXyHZ+9rlhApuTd8ImZQ
4mR/k49k+6bgV7jIUbdLx56D7NeASPLLEzjGH3PtaPWMcVQHrO0Y
=Zlkp
-----END PGP SIGNATURE-----

diff -Nru man-db-2.8.4/debian/apparmor/usr.bin.man 
man-db-2.8.4/debian/apparmor/usr.bin.man
--- man-db-2.8.4/debian/apparmor/usr.bin.man    2018-07-27 12:05:54.000000000 
+0100
+++ man-db-2.8.4/debian/apparmor/usr.bin.man    2018-07-30 14:23:11.000000000 
+0100
@@ -20,8 +20,8 @@
 
   # Similarly, use a special profile when man calls decompressors and other
   # simple filters.
-  /bin/bzip2 rmCx -> &man_filter,
-  /bin/gzip rmCx -> &man_filter,
+  /{,usr/}bin/bzip2 rmCx -> &man_filter,
+  /{,usr/}bin/gzip rmCx -> &man_filter,
   /usr/bin/col rmCx -> &man_filter,
   /usr/bin/compress rmCx -> &man_filter,
   /usr/bin/iconv rmCx -> &man_filter,
@@ -77,8 +77,8 @@
   # open FDs before execve.
   #include <abstractions/consoles>
 
-  /bin/bzip2 rm,
-  /bin/gzip rm,
+  /{,usr/}bin/bzip2 rm,
+  /{,usr/}bin/gzip rm,
   /usr/bin/col rm,
   /usr/bin/compress rm,
   /usr/bin/iconv rm,
diff -Nru man-db-2.8.4/debian/changelog man-db-2.8.4/debian/changelog
--- man-db-2.8.4/debian/changelog       2018-07-27 12:31:12.000000000 +0100
+++ man-db-2.8.4/debian/changelog       2018-07-30 14:23:24.000000000 +0100
@@ -1,3 +1,9 @@
+man-db (2.8.4-2) UNRELEASED; urgency=medium
+
+  * Adapt apparmor profile for usrmerge. LP: #1784023
+
+ -- Dimitri John Ledkov <x...@ubuntu.com>  Mon, 30 Jul 2018 14:23:24 +0100
+
 man-db (2.8.4-1) unstable; urgency=medium
 
   * New upstream release: