From 9f17f48c6e4712b71551f6323ca0af074f70202f Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Sun, 4 Apr 2021 21:28:20 +0100
Subject: [PATCH] xwayland: small fixes.

---
 apparmor.d/groups/desktop/xwayland | 2 +-
 apparmor.d/profiles-m-z/xkbcomp    | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apparmor.d/groups/desktop/xwayland b/apparmor.d/groups/desktop/xwayland
index 6cd2396e7..4875c4700 100644
--- a/apparmor.d/groups/desktop/xwayland
+++ b/apparmor.d/groups/desktop/xwayland
@@ -25,7 +25,7 @@ profile xwayland @{exec_path} flags=(attach_disconnected) {
   /dev/dri/renderD[0-9]* rw,
 
   # TMP files
-  owner /tmp/server-[0-9].xkm rwk,
+  owner /tmp/server-[0-9]*.xkm rwk,
 
   # Display Xserver on a specific TTY
   /dev/tty[0-9]* rw,
diff --git a/apparmor.d/profiles-m-z/xkbcomp b/apparmor.d/profiles-m-z/xkbcomp
index d20f88e25..d6eb0eb77 100644
--- a/apparmor.d/profiles-m-z/xkbcomp
+++ b/apparmor.d/profiles-m-z/xkbcomp
@@ -7,7 +7,7 @@ abi <abi/3.0>,
 include <tunables/global>
 
 @{exec_path} = /{usr/,}bin/xkbcomp
-profile xkbcomp @{exec_path} {
+profile xkbcomp @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/deny-root-dir-access>
 
@@ -21,7 +21,7 @@ profile xkbcomp @{exec_path} {
 
   owner @{HOME}/*.{xkb,xkm} rw,
 
-  owner /tmp/server-[0-9].xkm rwk,
+  owner /tmp/server-[0-9]*.xkm rwk,
 
   # file_inherit
   owner /dev/tty[0-9]* rw,
@@ -31,5 +31,8 @@ profile xkbcomp @{exec_path} {
   owner /var/log/lightdm/x-[0-9]*.log w,
   /dev/dri/card[0-9]* rw,
 
+  /dev/tty[0-9]* rw,
+  /dev/tty rw,
+
   include if exists <local/xkbcomp>
 }