[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.0] 2 commits: readd a new apparmor-fixes.diff, backporting 35ad7482af49ab80d348b619b6d420ee170d3e5d from master

Rene Engelhard rene at debian.org
Thu Jan 18 23:07:44 UTC 2018


Rene Engelhard pushed to branch debian-experimental-6.0 at Debian LibreOffice Maintainers / libreoffice / libreoffice


Commits:
db60fab4 by Rene Engelhard at 2018-01-17T18:38:35+01:00
readd a new apparmor-fixes.diff, backporting 35ad7482af49ab80d348b619b6d420ee170d3e5d from master

- - - - -
eee0097a by Rene Engelhard at 2018-01-18T23:36:57+01:00
add more apparmor fixes/updates (closes: #887593)

- - - - -


5 changed files:

- changelog
- patches/apparmor-complain.diff
- + patches/apparmor-fixes.diff
- + patches/apparmor-updates.diff
- patches/series


Changes:

=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libreoffice (1:6.0.0~rc2-2) UNRELEASED; urgency=medium
+
+  * debian/patches/apparmor-fixes.diff: add patch from master with syntax
+    fixes. Also include X abstractions and allow .mozilla/firefox/** reading
+  * debian/patches/apparmor-updates.diff: more gpg stuff: gpg(sm), .gnupg/*
+  (both together closes: #887593)
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 11 Jan 2018 23:05:44 +0100
+
 libreoffice (1:6.0.0~rc2-1) experimental; urgency=medium
 
   * New upstream release candidate


=====================================
patches/apparmor-complain.diff
=====================================
--- a/patches/apparmor-complain.diff
+++ b/patches/apparmor-complain.diff
@@ -9,8 +9,8 @@ index fef54b7ee384..9dde31a63615 100644
 -profile libreoffice-oopslash INSTDIR-program/oosplash {
 +profile libreoffice-oopslash INSTDIR-program/oosplash flags=(complain) {
    #include <abstractions/base>
+   #include <abstractions/X>
  
-   /etc/libreoffice/                     r,
 diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
 index b4baeab8f5ee..7861c9eac9bd 100644
 --- a/sysui/desktop/apparmor/program.soffice.bin


=====================================
patches/apparmor-fixes.diff
=====================================
--- /dev/null
+++ b/patches/apparmor-fixes.diff
@@ -0,0 +1,48 @@
+diff --git a/sysui/desktop/apparmor/program.oosplash b/sysui/desktop/apparmor/program.oosplash
+index fef54b7ee384..333c0617aa86 100644
+--- a/sysui/desktop/apparmor/program.oosplash
++++ b/sysui/desktop/apparmor/program.oosplash
+@@ -1,19 +1,22 @@
+ # ------------------------------------------------------------------
+ #
+ #    Copyright (C) 2016 Canonical Ltd.
++#    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
+ #    file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ #
+ #    Author: Bryan Quigley <bryan.quigley at canonical.com>
++#            Rene Engelhard <rene at debian.org>
+ #
+ # ------------------------------------------------------------------
+ 
+ #include <tunables/global>
+ 
+-profile libreoffice-oopslash INSTDIR-program/oosplash {
++profile libreoffice-oopslash INSTDIR-program/oosplash {
+   #include <abstractions/base>
++  #include <abstractions/X>
+ 
+   /etc/libreoffice/                     r,
+   /etc/libreoffice/**                   r,
+diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
+index 9c7ec3c2a3f7..cbed1b69d4a2 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
+@@ -164,4 +168,6 @@ 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,
++
++  owner @{HOME}/.mozilla/firefox/** r,
+ }


=====================================
patches/apparmor-updates.diff
=====================================
--- /dev/null
+++ b/patches/apparmor-updates.diff
@@ -0,0 +1,29 @@
+diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
+index 9c7ec3c2a3f7..cbed1b69d4a2 100644
+--- a/sysui/desktop/apparmor/program.soffice.bin
++++ b/sysui/desktop/apparmor/program.soffice.bin
+@@ -84,6 +84,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>
+ 
+@@ -124,6 +126,8 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+   /usr/bin/lpr                          rmPUx,
+   /usr/bin/paperconf                    rmix,
+   /usr/bin/gpgconf                      rmix,
++  /usr/bin/gpg                          rmix,
++  /usr/bin/gpgsm                        rmix,
+ 
+   /dev/tty                              rw,
+ 
+@@ -156,4 +156,6 @@
+   /usr/share/fonts-config/conf.avail/*.conf r,
+ 
+   owner @{HOME}/.mozilla/firefox/** r,
++  # there is abstractions/gnupg but that's just for gpg1...
++  owner @{HOME}/.gnupg/* r,
+ }


=====================================
patches/series
=====================================
--- a/patches/series
+++ b/patches/series
@@ -32,8 +32,10 @@ cppunit-optional.diff
 disable-unused-test-programs.diff
 disable-tests-somehow-needing-more-fonts.diff
 tdf108963-test.diff
-apparmor-complain.diff
 sal-fix-kfreebsd-build.diff
 apparmor-usrmerge.diff
 revert-bd260a59cfdd050db3aa9a641ef0fa09efcedf5b.diff
 poppler-0.62.diff
+apparmor-fixes.diff
+apparmor-updates.diff
+apparmor-complain.diff



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/c25cd3d47ed19f9ad111801a22cbcc1ed20750cb...eee0097af8d8db48627ef34c68b9b928d6381f08

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/c25cd3d47ed19f9ad111801a22cbcc1ed20750cb...eee0097af8d8db48627ef34c68b9b928d6381f08
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180118/636f750d/attachment-0001.html>


More information about the Pkg-openoffice-commits mailing list