From fbbd89df30b6f3f2f7dab8802a7b17a9b9f03fe1 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Thu, 14 Dec 2017 23:29:20 +0000 Subject: [PATCH] apparmor-usrmerge Gbp-Pq: Name apparmor-usrmerge.diff --- sysui/desktop/apparmor/program.senddoc | 16 +++++++++------- sysui/desktop/apparmor/program.soffice.bin | 8 +++++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/sysui/desktop/apparmor/program.senddoc b/sysui/desktop/apparmor/program.senddoc index 42c2740f701..0aa284de368 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 +# Authors: Bryan Quigley +# Rene Engelhard # # ------------------------------------------------------------------ @@ -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 7861c9eac9b..7340272b143 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 # Bryan Quigley +# Rene Engelhard # # ------------------------------------------------------------------ @@ -105,9 +107,9 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin flags=(complain) { # 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, -- 2.30.2