also allow /usr/bin/dash (etc.) for merged-/usr-scenario

Change-Id: Ic139e67b0931a4648bac147398970aa80a331c34

sysui/desktop/apparmor/program.senddoc

 # ------------------------------------------------------------------
 #
 #    Copyright (C) 2016 Canonical Ltd.
+#    Copyright (C) 2017 Software in the Public Interest, Inc.
 #
 #    This Source Code Form is subject to the terms of the Mozilla Public
 #    License, v. 2.0. If a copy of the MPL was not distributed with this
 #    file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-#    Author: Bryan Quigley <bryan.quigley@canonical.com>
+#    Authors: Bryan Quigley <bryan.quigley@canonical.com>
+#             Rene Engelhard <rene@debian.org>
 #
 # ------------------------------------------------------------------
 
@@ -17,14 +19,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,

sysui/desktop/apparmor/program.soffice.bin

 # ------------------------------------------------------------------
 #
 #    Copyright (C) 2016 Canonical Ltd.
+#    Copyright (C) 2017 Software in the Public Interest, Inc.
 #
 #    This Source Code Form is subject to the terms of the Mozilla Public
 #    License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,6 +9,7 @@
 #
 #    Authors: Jonathan Davies <jonathan.davies@canonical.com>
 #             Bryan Quigley <bryan.quigley@canonical.com>
+#             Rene Engelhard <rene@debian.org>
 #
 # ------------------------------------------------------------------
 
@@ -60,7 +62,7 @@
 
 #include <tunables/global>
 
-profile libreoffice-soffice INSTDIR-program/soffice.bin {
+profile libreoffice-soffice INSTDIR-program/soffice.bin flags=(complain) {
   #include <abstractions/private-files-strict>
 
   #include <abstractions/audio>
@@ -105,9 +107,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,