[ioquake3] 02/04: Use <abstractions/wayland> from apparmor (>= 2.10.95-5) instead of reinventing it

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 3aebbd7cd2280fc564e697ca639b2f92a8ff962b
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jan 11 09:49:51 2018 +0000

    Use <abstractions/wayland> from apparmor (>= 2.10.95-5) instead of reinventing it
---
 debian/apparmor.d/usr.lib.ioquake3.ioquake3 | 6 ++----
 debian/changelog                            | 2 ++
 debian/control                              | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/apparmor.d/usr.lib.ioquake3.ioquake3 b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
index 51b611d..b2705f6 100644
--- a/debian/apparmor.d/usr.lib.ioquake3.ioquake3
+++ b/debian/apparmor.d/usr.lib.ioquake3.ioquake3
@@ -13,6 +13,7 @@
   #include <abstractions/nameservice>
   #include <abstractions/nvidia>
   #include <abstractions/private-files-strict>
+  #include <abstractions/wayland>
 
   network inet dgram,
   network inet stream,
@@ -56,14 +57,13 @@
   /sys/devices/pci*/**/uevent r,
   /sys/devices/pci*/**/vendor r,
 
-  # Shared memory buffers used in Wayland
-  owner /run/user/*/{mesa,mutter,sdl,weston,xwayland}-shared-* rw,
 
   profile popup (complain) {
     #include <abstractions/X>
     #include <abstractions/base>
     #include <abstractions/fonts>
     #include <abstractions/freedesktop.org>
+    #include <abstractions/wayland>
 
     /etc/X11/app-defaults/Xmessage-color r,
     /usr/bin/kdialog mr,
@@ -73,8 +73,6 @@
     /usr/share/themes/** r,
     /usr/share/zenity/** r,
     owner @{HOME}/.config/gtk-3.0/settings.ini r,
-
-    owner /run/user/*/{mesa,mutter,sdl,weston,xwayland}-shared-* rw,
   }
 
   # Site-specific additions and overrides. See local/README for details.
diff --git a/debian/changelog b/debian/changelog
index f3a965f..476ba25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ioquake3 (1.36+u20180108~dfsg-2) UNRELEASED; urgency=medium
 
   * Add reference to #885839 in previous changelog entry
+  * Use <abstractions/wayland> from apparmor (>= 2.10.95-5) instead
+    of reinventing it
 
  -- Simon McVittie <smcv at debian.org>  Thu, 11 Jan 2018 09:48:07 +0000
 
diff --git a/debian/control b/debian/control
index 3f59625..a5ea91d 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Depends:
 Recommends:
  x11-utils | zenity | kdialog,
 Breaks:
+ apparmor (<< 2.10.95-5~),
  openarena (<< 0.8.8-9~),
 Description: Game engine for 3D first person shooter games
  This package installs a modified version of the ioQuake3 game engine,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git