From 04efbb27631e2f4abb5f1c0a915612e8cc98397c Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Fri, 22 Mar 2024 13:44:53 -0300 Subject: profiles: replace x11 socket blacklist with disable-X11.inc Replace all occurrences of `blacklist /tmp/.X11-unix` with `include disable-X11.inc`, which blacklists more X11-related files. Commands used to search and replace: $ git grep -Ilz '^blacklist /tmp/.X11-unix' -- \ etc/profile*/*.profile | xargs -0 perl -0 -pi -e '\ s/\nblacklist \/tmp\/.X11-unix\n/\n/; \ s/(\ninclude disable-xdg.inc\n)/\ninclude disable-X11.inc$1/; \ s/(\ninclude disable-[^Xx\n]+\n)(\n|# )/$1include disable-X11.inc\n$2/' Note: The following files were also edited manually: * etc/profile-a-l/erd.profile * etc/profile-a-l/links-common.profile * etc/profile-m-z/termshark.profile * etc/profile-m-z/tmux.profile * etc/profile-m-z/tshark.profile Relates to #4462 #4854. --- etc/profile-a-l/erd.profile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'etc/profile-a-l/erd.profile') diff --git a/etc/profile-a-l/erd.profile b/etc/profile-a-l/erd.profile index 8ab145016..d821f5882 100644 --- a/etc/profile-a-l/erd.profile +++ b/etc/profile-a-l/erd.profile @@ -7,9 +7,8 @@ include erd.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix - include disable-exec.inc +#include disable-X11.inc # x11 none apparmor caps.drop all -- cgit v1.2.3-54-g00ecf