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

[Rene Engelhard]

 sysui/desktop/apparmor/program.soffice.bin |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

New commits:
commit c7d88cb4c2981fcfab709755c9dac03ee09a6195
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jan 18 23:11:54 2018 +0100

    deb#887593 apparmor: updates for gpg
    
    This squashes
    
    commit 24702687433842a6e9e8a1070ead46c035192bf3
    Author: Rene Engelhard <rene at debian.org>
    Date:   Sat Jan 20 15:54:43 2018 +0100
    
        deb#887593 use child profile for gpg
    
    add gpg and gpgsm to soffice.bin apparmor profile
    
    parts of
    
    commit c6a19889e91f2585453636667e3d5779b153ab86
    Author: Rene Engelhard <rene at debian.org>
    Date:   Thu Jan 18 23:12:03 2018 +0100
    
        deb#887593 apparmor: allow soffice.bin reading .mozilla/firefox and .gnupg
    
    and
    
    commit e64e7da9b222cebfdff270059f5182e71b667796
    Author: Rene Engelhard <rene at debian.org>
    Date:   Thu Jan 18 23:11:54 2018 +0100
    
        deb#887593 add gpg and gpgsm to soffice.bin apparmor profile
    
    and parts of
    
        and parts of
    
        commit d4440ce6b5964d08be1e5841ed301112b260823d
        Author: Rene Engelhard <rene at debian.org>
        Date:   Thu Jan 18 23:19:46 2018 +0100
    
            update copyright years
    
            Change-Id: I634c1132265295f90f624a53b93dddb2b18eabd5
    
    and
    
    Author: Rene Engelhard <rene at debian.org>
    Date:   Sat Jan 20 23:25:07 2018 +0100
    
        deb#887593 make gpg child profile really work
    
        now I can see my testkey and sign. Thanks Christian Bolz
    
    and
    
    commit cae52b77d48916d819e788675f40da5fe4f7c99c
    Author: Rene Engelhard <rene at debian.org>
    Date:   Sat Jan 20 23:28:51 2018 +0100
    
        readd lost comment
    
    Change-Id: I15dfc46acec9487bf3550d208d79257527cd6791
    Reviewed-on: https://gerrit.libreoffice.org/48241
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index a365f6297781..cf967ba89a77 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -1,7 +1,7 @@
 # ------------------------------------------------------------------
 #
 #    Copyright (C) 2016 Canonical Ltd.
-#    Copyright (C) 2017 Software in the Public Interest, Inc.
+#    Copyright (C) 2018 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
@@ -74,6 +74,8 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
   #include <abstractions/ibus>
   #include <abstractions/nameservice>
   #include <abstractions/gnome>
+# GnuPG1 only...
+# #include <abstractions/gnupg>
   #include <abstractions/python>
   #include <abstractions/p11-kit>
 
@@ -114,6 +116,8 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
   /usr/bin/lpr                          rmPUx,
   /usr/bin/paperconf                    rmix,
   /usr/bin/gpgconf                      rmix,
+  /usr/bin/gpg                          rmCx -> gpg,
+  /usr/bin/gpgsm                        rmCx -> gpg,
 
   /dev/tty                              rw,
 
@@ -154,4 +158,15 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
   owner @{HOME}/.icons/*/cursors/*      r,
   /usr/share/*-fonts/conf.avail/*.conf  r,
   /usr/share/fonts-config/conf.avail/*.conf r,
+
+  # there is abstractions/gnupg but that's just for gpg1...
+  profile gpg {
+    #include <abstractions/base>
+
+   /usr/bin/gpgconf rm,
+   /usr/bin/gpg rm,
+   /usr/bin/gpgsm rm,
+
+    owner @{HOME}/.gnupg/* r,
+  }
 }