[Libreoffice-commits] core.git: 2 commits - sysui/desktop

[Rene Engelhard]

 sysui/desktop/apparmor/program.senddoc     |   16 +++++++++-------
 sysui/desktop/apparmor/program.soffice.bin |   11 +++++++----
 2 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 2a74249d058e8642b057d22c7480b29c88e6ac96
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 11 17:54:44 2017 +0000

    sysui/desktop/apparmor/program.soffice.bin: allow /usr/bin/gpgconf
    
    Change-Id: I762ed3961d929204fdb97a3272fc9ca73f7d0234

diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index 7340272b1432..b0e8737bd707 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -113,6 +113,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin flags=(complain) {
   /usr/bin/bluetooth-sendto             rmPUx,
   /usr/bin/lpr                          rmPUx,
   /usr/bin/paperconf                    rmix,
+  /usr/bin/gpgconf                      rmix,
 
   /dev/tty                              rw,
 
commit 0ea1e508041511233d40b8a2f56517fc2a28b221
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 11 17:51:20 2017 +0000

    also allow /usr/bin/dash (etc.) for merged-/usr-scenario
    
    Change-Id: Ic139e67b0931a4648bac147398970aa80a331c34

diff --git a/sysui/desktop/apparmor/program.senddoc b/sysui/desktop/apparmor/program.senddoc
index 42c2740f7012..0aa284de3684 100644
--- a/sysui/desktop/apparmor/program.senddoc
+++ b/sysui/desktop/apparmor/program.senddoc
@@ -1,12 +1,14 @@
 # ------------------------------------------------------------------
 #
 #    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 at canonical.com>
+#    Authors: Bryan Quigley <bryan.quigley at canonical.com>
+#             Rene Engelhard <rene at 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,
diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index b4baeab8f5ee..7340272b1432 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -1,6 +1,7 @@
 # ------------------------------------------------------------------
 #
 #    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 at canonical.com>
 #             Bryan Quigley <bryan.quigley at canonical.com>
+#             Rene Engelhard <rene at 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,