[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.0] make the apparmor patches apply (again)...

[Rene Engelhard]

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


Commits:
b184b516 by Rene Engelhard at 2018-01-22T20:06:13+01:00
make the apparmor patches apply (again)...

- - - - -


3 changed files:

- patches/apparmor-complain.diff
- patches/apparmor-fixes.diff
- patches/apparmor-updates.diff


Changes:

=====================================
patches/apparmor-complain.diff
=====================================
--- a/patches/apparmor-complain.diff
+++ b/patches/apparmor-complain.diff
@@ -21,6 +21,6 @@ index b4baeab8f5ee..7861c9eac9bd 100644
  
 -profile libreoffice-soffice INSTDIR-program/soffice.bin {
 +profile libreoffice-soffice INSTDIR-program/soffice.bin flags=(complain) {
-   #include <abstractions/private-files-strict>
+   #include <abstractions/private-files>
  
    #include <abstractions/audio>


=====================================
patches/apparmor-fixes.diff
=====================================
--- a/patches/apparmor-fixes.diff
+++ b/patches/apparmor-fixes.diff
@@ -27,7 +27,7 @@ index fef54b7ee384..333c0617aa86 100644
    /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
+index a365f6297781..d3df2163d1f6 100644
 --- a/sysui/desktop/apparmor/program.soffice.bin
 +++ b/sysui/desktop/apparmor/program.soffice.bin
 @@ -1,7 +1,7 @@
@@ -48,13 +48,12 @@ index 9c7ec3c2a3f7..cbed1b69d4a2 100644
  
    #include <abstractions/audio>
    #include <abstractions/bash>
-@@ -163,6 +163,9 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+@@ -154,4 +154,8 @@ 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/profiles.ini r,
 +  owner @{HOME}/.mozilla/firefox/*/secmod.db r,
 +  owner @{HOME}/.mozilla/firefox/*/cert8.db r,
-   # there is abstractions/gnupg but that's just for gpg1...
-   profile gpg {
-     #include <abstractions/base>
+ }


=====================================
patches/apparmor-updates.diff
=====================================
--- a/patches/apparmor-updates.diff
+++ b/patches/apparmor-updates.diff
@@ -25,9 +25,9 @@ index 9c7ec3c2a3f7..cbed1b69d4a2 100644
    /dev/tty                              rw,
  
 @@ -156,4 +156,14 @@
-   /usr/share/fonts-config/conf.avail/*.conf r,
- 
-   owner @{HOME}/.mozilla/firefox/** r,
+   owner @{HOME}/.mozilla/firefox/profiles.ini r,
+   owner @{HOME}/.mozilla/firefox/*/secmod.db r,
+   owner @{HOME}/.mozilla/firefox/*/cert8.db r,
 +  # there is abstractions/gnupg but that's just for gpg1...
 +  profile gpg {
 +    #include <abstractions/base>



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/b184b5167e609f0489cdcf8302ec05a451b40e3b

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/b184b5167e609f0489cdcf8302ec05a451b40e3b
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/20180122/fd077ab0/attachment-0001.html>