[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.0] backport patch from master to allow reading device information

Rene Engelhard rene at debian.org
Thu Jan 25 22:10:51 UTC 2018


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


Commits:
3eab389a by Rene Engelhard at 2018-01-24T21:43:05+01:00
backport patch from master to allow reading device information

- - - - -


1 changed file:

- patches/apparmor-fixes.diff


Changes:

=====================================
patches/apparmor-fixes.diff
=====================================
--- a/patches/apparmor-fixes.diff
+++ b/patches/apparmor-fixes.diff
@@ -57,3 +57,53 @@ index a365f6297781..d3df2163d1f6 100644
 +  owner @{HOME}/.mozilla/firefox/*/secmod.db r,
 +  owner @{HOME}/.mozilla/firefox/*/cert8.db r,
  }
+
+From 19181fd45735005aad7cb910ca1bf3dd7fb687fb Mon Sep 17 00:00:00 2001
+From: Vincas Dargis <vindrg at gmail.com>
+Date: Sun, 21 Jan 2018 16:16:43 +0200
+Subject: deb#887593 apparmor: allow reading device information
+
+* Add file read rule for paths like
+/sys/devices/virtual/block/dm-0/queue/rotational
+used by isRotational() in desktop/unx/source/pagenin.c.
+* Add file read rule for paths like
+/sys/dev/char/226:128/device/uevent
+used by libdrm.
+
+Change-Id: Ic41365b478c817b6766e25adadd6761fa03ff055
+Reviewed-on: https://gerrit.libreoffice.org/48265
+Tested-by: Rene Engelhard <rene at debian.org>
+Reviewed-by: Rene Engelhard <rene at debian.org>
+Tested-by: Jenkins <ci at libreoffice.org>
+---
+ sysui/desktop/apparmor/program.oosplash    | 1 +
+ sysui/desktop/apparmor/program.soffice.bin | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/sysui/desktop/apparmor/program.oosplash b/sysui/desktop/apparmor/program.oosplash
+index e044c1a..bcc0691 100644
+--- a/sysui/desktop/apparmor/program.oosplash
++++ b/sysui/desktop/apparmor/program.oosplash
+@@ -23,6 +23,7 @@ profile libreoffice-oopslash INSTDIR-program/oosplash {
+   /etc/passwd                           r,
+   /etc/nsswitch.conf                    r,
+   /run/nscd/passwd                      r,
++  /sys/devices/{virtual,pci[0-9]*}/**/queue/rotational  r, # for isRotational() in desktop/unx/source/pagein.c
+   /usr/lib{,32,64}/ure/bin/javaldx      rmpux,
+   /usr/share/libreoffice/program/*      r,
+   INSTDIR-program/** 			r,
+diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
+index ecc2498..113562c 100644
+--- a/sysui/desktop/apparmor/program.soffice.bin
++++ b/sysui/desktop/apparmor/program.soffice.bin
+@@ -170,6 +170,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+ 
+   #Likely moving to abstractions in the future
+   owner @{HOME}/.icons/*/cursors/*      r,
++  /sys/devices/pci[0-9]*/**/{device,subsystem_device,subsystem_vendor,uevent,vendor} r, # for libdrm
+   /usr/share/*-fonts/conf.avail/*.conf  r,
+   /usr/share/fonts-config/conf.avail/*.conf r,
+ 
+-- 
+cgit v1.1
+



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

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/3eab389a46256fcacc8ca2f49458586c07a27f86
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/20180125/92372c05/attachment-0001.html>


More information about the Pkg-openoffice-commits mailing list