[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sysui/desktop

[Olivier Tilloy]

 sysui/desktop/apparmor/program.senddoc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 60119a71e0f712f461b290abb009c7d8e62603b2
Author: Olivier Tilloy <olivier.tilloy at canonical.com>
Date:   Mon Feb 12 19:13:45 2018 +0100

    tdf#115659 Apparmor profile fixes for senddoc
    
    Fix sending the current document by e-mail:
     - fix path to the installed senddoc executable
     - add missing exception for xdg-email
     - add missing include statement for sanitized_helper profile
    
    Change-Id: Ie7c5b112bd6c415036490e9f0f81063ca3ced5a1
    Reviewed-on: https://gerrit.libreoffice.org/49615
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sysui/desktop/apparmor/program.senddoc b/sysui/desktop/apparmor/program.senddoc
index 42c2740f7012..4ee34d01c941 100644
--- a/sysui/desktop/apparmor/program.senddoc
+++ b/sysui/desktop/apparmor/program.senddoc
@@ -12,8 +12,9 @@
 
 #include <tunables/global>
 
-profile libreoffice-senddoc INSTDIR-/usr/lib{,32,64}/libreoffice/program/senddoc {
+profile libreoffice-senddoc INSTDIR-program/senddoc {
   #include <abstractions/base>
+  #include <abstractions/ubuntu-helpers>
 
   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.
@@ -26,6 +27,7 @@ profile libreoffice-senddoc INSTDIR-/usr/lib{,32,64}/libreoffice/program/senddoc
   /bin/grep             rmix,
   /bin/uname            rmix,
   /usr/bin/xdg-open     Cxr -> sanitized_helper,
+  /usr/bin/xdg-email    Cxr -> sanitized_helper,
   /dev/null             rw,
   INSTDIR-program/uri-encode rmpux,
   /usr/share/libreoffice/share/config/* r,