From: Vincas Dargis <vindrg@gmail.com>
Date: Sat, 4 Aug 2018 14:40:05 +0000 (+0300)
Subject: [PATCH] apparmor: use dri-enumerate abstraction
X-Git-Tag: archive/raspbian/1%6.1.5-3+rpi1+deb10u7^2~28
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e0a38a2860adc4934c39d560dcaf1008d6f3d571;p=libreoffice.git

[PATCH] apparmor: use dri-enumerate abstraction

Remove backported rule and use new dri-enumerate abstraction instead.
dri-enumerate is available in AppArmor 2.13, which recently migrated
into Debian Buster.

Change-Id: I64919edc1882f7bc1e65cfb94686464c5350f699

Gbp-Pq: Name apparmor-cleanups.diff
---

diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index 76d4f1c94d4..9d8158b4c86 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -86,6 +86,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin flags=(complain) {
   #include <abstractions/dbus>
   #include <abstractions/dbus-session>
   #include <abstractions/dbus-accessibility>
+  #include <abstractions/dri-enumerate>
   #include <abstractions/ibus>
   #include <abstractions/nameservice>
   #include <abstractions/gnome>
@@ -189,7 +190,6 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin flags=(complain) {
   #Likely moving to abstractions in the future
   owner @{HOME}/.icons/*/cursors/*      r,
   /etc/fstab r, # Solid::DeviceNotifier::instance() TODO: deny?
-  /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,
   /{,var/}run/udev/data/+usb:* r, # Solid::Device::listFromQuery()