feat(profiles): general update.

apparmor.d/groups/freedesktop/xhost

@@ -10,20 +10,14 @@ include <tunables/global>
 profile xhost @{exec_path} {
   include <abstractions/base>
   include <abstractions/nameservice-strict>
-
-  unix (send, receive, connect) type=stream peer=(addr=@/tmp/.X11-unix/*, label=xorg),
+  include <abstractions/X-strict>
 
   @{exec_path} mr,
 
-  owner @{HOME}/.Xauthority r,
-  owner @{run}/user/@{uid}/gdm/Xauthority r,
-
-  /tmp/.X11-unix/* rw,
-
-  # file_inherit
-  /dev/tty@{int} rw,
   owner @{HOME}/.xsession-errors w,
 
+  /dev/tty@{int} rw,
+
   # Silencer
   deny @{user_share_dirs}/gvfs-metadata/* r,
 

apparmor.d/groups/freedesktop/xkbcomp

@@ -10,11 +10,10 @@ include <tunables/global>
 @{exec_path} = @{bin}/xkbcomp
 profile xkbcomp @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
+  include <abstractions/X-strict>
 
-  unix (connect, receive, send) type=stream peer=(addr="@/tmp/.X11-unix/X[0-9]*"),
   unix (send,receive) type=stream addr=none peer=(label=gnome-shell),
   unix (send,receive) type=stream addr=none peer=(label=xwayland),
-  unix (send,receive) type=stream addr=@/tmp/.X11-unix/X[0-9]* peer=(label=gsd-xsettings),
 
   @{exec_path} mr,
 
@@ -23,7 +22,6 @@ profile xkbcomp @{exec_path} flags=(attach_disconnected) {
   /var/lib/xkb/server-@{int}.xkm w,
   /var/lib/xkb/compiled/server-@{int}.xkm rw,
 
-  owner @{HOME}/.Xauthority r,
   owner @{HOME}/*.{xkb,xkm} rw,
 
   owner @{user_share_dirs}/xorg/Xorg.@{int}.log w,

apparmor.d/groups/freedesktop/xrdb

@@ -14,11 +14,11 @@ profile xrdb @{exec_path} {
 
   @{exec_path} mr,
 
-  @{bin}/{,*-}cpp-[0-9]*             rix,
-  @{bin}/{,ba,da}sh                  rix,
-  @{bin}/cpp                         rix,
-  @{lib}/gcc/*/@{int}/cc1            rix,
-  @{lib}/llvm-[0-9]*/bin/clang       rix,
+  @{bin}/{,*-}cpp-[0-9]*               rix,
+  @{bin}/{,ba,da}sh                    rix,
+  @{bin}/cpp                           rix,
+  @{lib}/gcc/@{multiarch}/@{int}*/cc1  rix,
+  @{lib}/llvm-[0-9]*/bin/clang         rix,
 
   /usr/include/stdc-predef.h r,
   /usr/etc/X11/xdm/Xresources r,
@@ -37,7 +37,7 @@ profile xrdb @{exec_path} {
   owner /tmp/plasma-apply-lookandfeel.* r,
   owner /tmp/runtime-*/xauth_@{rand6} r,
   owner /tmp/startplasma-x11.@{rand6} r,
-  owner /tmp/xauth-[0-9]*-_[0-9] r,
+  owner /tmp/xauth-@{int}-_[0-9] r,
 
   @{run}/sddm/\{@{uuid}\} r,
   @{run}/sddm/xauth_@{rand6} r,

apparmor.d/groups/freedesktop/xwayland

@@ -18,6 +18,7 @@ profile xwayland @{exec_path} flags=(attach_disconnected) {
 
   signal (receive) set=(term hup) peer=gdm*,
   signal (receive) set=(term hup) peer=gnome-shell,
+  signal (receive) set=(term hup) peer=kwin_wayland,
   signal (receive) set=(term hup) peer=login,
 
   unix (send,receive) type=stream addr="@/tmp/.X11-unix/X[0-9]*",