diff options
| author | Rene Engelhard <rene@debian.org> | 2017-12-11 17:51:20 +0000 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2017-12-11 17:56:33 +0000 |
| commit | 0ea1e508041511233d40b8a2f56517fc2a28b221 (patch) | |
| tree | da745ba6cd6753b9cd68fa80f748720a98756304 /sysui | |
| parent | f6b2349e880afa82f9267087fb48b6e4f8a9aa05 (diff) | |
also allow /usr/bin/dash (etc.) for merged-/usr-scenario
Change-Id: Ic139e67b0931a4648bac147398970aa80a331c34
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/desktop/apparmor/program.senddoc | 16 | ||||
| -rw-r--r-- | sysui/desktop/apparmor/program.soffice.bin | 10 |
2 files changed, 15 insertions, 11 deletions
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@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, 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@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, |