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

[Libreoffice Gerrit user]

 sysui/desktop/apparmor/program.soffice.bin |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a826cb4f9655ab8b994c4da258835f5f6ddb5a5f
Author:     Vincas Dargis <vindrg at gmail.com>
AuthorDate: Tue Aug 14 20:49:31 2018 +0300
Commit:     Rene Engelhard <rene at debian.org>
CommitDate: Wed Aug 15 08:51:44 2018 +0200

    apparmor: fix access to /etc/xml/catalog
    
    Exporting document to .xhtml produces AppArmor deny log entry. Add
    AppArmor rule for accessing /etc/xml/catalog as it is needed by libxml2.
    
    Change-Id: If62046059c4e1d458cca895f14f7d1e3f537c527
    Reviewed-on: https://gerrit.libreoffice.org/59005
    Tested-by: Jenkins
    Reviewed-by: Rene Engelhard <rene at debian.org>

diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index 642548420f5b..45252291938e 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -107,6 +107,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
   /etc/libreoffice/**                   r,
 
   /etc/cups/ppd/*.ppd                   r,
+  /etc/xml/catalog                      r, #exporting to .xhtml, for libxml2
   /proc/*/status                        r,
 
   owner @{HOME}/.config/libreoffice{,dev}/** rwk,
commit 8d1f307c2fb1fa6b0402b88954269a0b0442d02f
Author:     Vincas Dargis <vindrg at gmail.com>
AuthorDate: Tue Aug 14 20:19:00 2018 +0300
Commit:     Rene Engelhard <rene at debian.org>
CommitDate: Wed Aug 15 08:51:31 2018 +0200

    apparmor: allow writing .epub files
    
    Currently, exporting document to .epub fails if AppArmor profile is
    enabled. This patch fixes it by registering .epub extension within
    AppArmor profile.
    
    Change-Id: I5075ac803ffd9157c2f2cc6546895149b0fdd5f2
    Reviewed-on: https://gerrit.libreoffice.org/59004
    Tested-by: Jenkins
    Reviewed-by: Rene Engelhard <rene at debian.org>

diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index cf6fd4b2eac9..642548420f5b 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -35,6 +35,8 @@
 @{libreoffice_ext} += [uU][oO][fFtTsSpP]
 #(x)htm(l)
 @{libreoffice_ext} += {,x,X}[hH][tT][mM]{,l,L}
+#.epub
+@{libreoffice_ext} += [eE][pP][uU][bB]
 
 #Images
 @{libreoffice_ext} += [jJ][pP][gG]