apparmor-usrmerge

Gbp-Pq: Name apparmor-usrmerge.diff

diff --git a/sysui/desktop/apparmor/program.senddoc b/sysui/desktop/apparmor/program.senddoc
index 42c2740f7012ddf6b7ed991a87e9aa516575928d..06a74f19dbd9dd4755ed82bd8f3e4fba1ba180c6 100644 (file)
--- a/sysui/desktop/apparmor/program.senddoc
+++ b/sysui/desktop/apparmor/program.senddoc
@@ -17,14 +17,14 @@ profile libreoffice-senddoc INSTDIR-/usr/lib{,32,64}/libreoffice/program/senddoc
 
   owner /tmp/lu**       rw,    #makes files like luRRRRR.tmp/lubRRRR.tmp where R is random
                                #Note, usually it's lub or luc, don't know why.
-  /bin/sh               rmix,
-  /bin/dash             rmix,
-  /bin/bash             rmix,
-  /bin/sed              rmix,
+  /{usr/,}bin/sh        rmix,
+  /{usr/,}bin/bash      rmix,
+  /{usr/,}bin/dash      rmix,
+  /{usr/,}bin/sed       rmix,
   /usr/bin/dirname      rmix,
   /usr/bin/basename     rmix,
-  /bin/grep             rmix,
-  /bin/uname            rmix,
+  /{usr/,}bin/grep      rmix,
+  /{usr/,}bin/uname     rmix,
   /usr/bin/xdg-open     Cxr -> sanitized_helper,
   /dev/null             rw,
   INSTDIR-program/uri-encode rmpux,

diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index 74320a6ff5eec8cf3f7392d0dac5d169abad7f0a..ea3483e83070634227ee89bc417d590a6e76d3fc 100644 (file)
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -109,9 +109,9 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
   # bluetooth send to
   network bluetooth,
 
-  /bin/sh                               rmix,
-  /bin/bash                             rmix,
-  /bin/dash                             rmix,
+  /{usr/,}bin/sh                        rmix,
+  /{usr/,}bin/bash                      rmix,
+  /{usr/,}bin/dash                      rmix,
   /usr/bin/bluetooth-sendto             rmPUx,
   /usr/bin/lpr                          rmPUx,
   /usr/bin/paperconf                    rmix,