From c719be47554426b6d960174d578f931d921a6e17 Mon Sep 17 00:00:00 2001
From: nobody43 <nobody43@users.noreply.github.com>
Date: Sat, 20 Jan 2024 02:31:51 +0000
Subject: [PATCH] adjust xorg display number

---
 apparmor.d/abstractions/X-strict           |  2 +-
 apparmor.d/groups/freedesktop/xorg         | 12 ++++++------
 apparmor.d/groups/kde/kwin_wayland_wrapper |  2 +-
 apparmor.d/profiles-g-l/labwc              |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apparmor.d/abstractions/X-strict b/apparmor.d/abstractions/X-strict
index add846194..088d5c912 100644
--- a/apparmor.d/abstractions/X-strict
+++ b/apparmor.d/abstractions/X-strict
@@ -17,7 +17,7 @@
   owner @{HOME}/.Xauthority r,  # Xauthority files required for X connections, per user
  
         /tmp/.ICE-unix/* rw,
-        /tmp/.X{0,1}-lock rw,
+        /tmp/.X@{int}-lock rw,
         /tmp/.X11-unix/* rw,
   owner /tmp/xauth_@{rand6} rl -> /tmp/#@{int},
 
diff --git a/apparmor.d/groups/freedesktop/xorg b/apparmor.d/groups/freedesktop/xorg
index fb0a8b114..40b431dc2 100644
--- a/apparmor.d/groups/freedesktop/xorg
+++ b/apparmor.d/groups/freedesktop/xorg
@@ -65,15 +65,15 @@ profile xorg @{exec_path} flags=(attach_disconnected) {
   owner @{HOME}/.xsession-errors w,
 
   owner @{user_share_dirs}/xorg/ rw,
-  owner @{user_share_dirs}/xorg/Xorg.[0-9].log{,.old} rw,
+  owner @{user_share_dirs}/xorg/Xorg.@{int}.log{,.old} rw,
   owner @{user_share_dirs}/xorg/Xorg.pid-@{pid}.log{,.old} rw,
 
   owner /var/log/lightdm/x-*.log* rw,
-  owner /var/log/Xorg.[0-9].log{,.old} rw,
+  owner /var/log/Xorg.@{int}.log{,.old} rw,
   owner /var/log/Xorg.pid-@{pid}.log{,.old} rw,
 
   /var/lib/gdm{3,}/.local/share/xorg/ rw,
-  /var/lib/gdm{3,}/.local/share/xorg/Xorg.[0-9].log{,.old} rw,
+  /var/lib/gdm{3,}/.local/share/xorg/Xorg.@{int}.log{,.old} rw,
   /var/lib/gdm{3,}/.local/share/xorg/Xorg.pid-@{pid}.log{,.old} rw,
   /var/lib/gdm{3,}/.cache/mesa_shader_cache/index rw,
 
@@ -82,9 +82,9 @@ profile xorg @{exec_path} flags=(attach_disconnected) {
   @{run}/lightdm/{,**} rw,
 
         /tmp/ r,
-        /tmp/server-[0-9].xkm rw,
-  owner /tmp/.tX[0-9]-lock rwk,
-  owner /tmp/.X[0-9]-lock rwkl -> /tmp/.tX[0-9]-lock,
+        /tmp/server-@{int}.xkm rw,
+  owner /tmp/.tX@{int}-lock rwk,
+  owner /tmp/.X@{int}-lock rwkl -> /tmp/.tX@{int}-lock,
   owner /tmp/server-* rwk,
   owner /tmp/serverauth.* r,
 
diff --git a/apparmor.d/groups/kde/kwin_wayland_wrapper b/apparmor.d/groups/kde/kwin_wayland_wrapper
index a3b9ceed9..8b3a31e19 100644
--- a/apparmor.d/groups/kde/kwin_wayland_wrapper
+++ b/apparmor.d/groups/kde/kwin_wayland_wrapper
@@ -21,7 +21,7 @@ profile kwin_wayland_wrapper @{exec_path} {
   owner @{run}/user/@{uid}/#@{int} rw,
   owner @{run}/user/@{uid}/xauth_@{rand6} w,
 
-  owner /tmp/.X1-lock rw,
+  owner /tmp/.X@{int}-lock rw,
 
   include if exists <local/kwin_wayland_wrapper>
 }
diff --git a/apparmor.d/profiles-g-l/labwc b/apparmor.d/profiles-g-l/labwc
index 8b6ad5602..157a1cebb 100644
--- a/apparmor.d/profiles-g-l/labwc
+++ b/apparmor.d/profiles-g-l/labwc
@@ -60,9 +60,9 @@ profile labwc @{exec_path} flags=(attach_disconnected) {
 
   owner @{PROC}/@{pid}/fd/ r,
 
-  owner /tmp/.X[0-9]*-lock rw,
+  owner /tmp/.X@{int}-lock rw,
   owner /tmp/.X11-unix/ rw,
-  owner /tmp/.X11-unix/X[0-9]* rw,
+  owner /tmp/.X11-unix/X@{int} rw,
 
   include if exists <local/labwc>
 }