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/agetpkg.profile | 2 +- etc/profile-a-l/alpine.profile | 2 +- etc/profile-a-l/aria2c.profile | 2 +- etc/profile-a-l/bpftop.profile | 2 +- etc/profile-a-l/cloneit.profile | 2 +- etc/profile-a-l/curl.profile | 2 +- etc/profile-a-l/dbus-send.profile | 2 +- etc/profile-a-l/deadlink.profile | 2 +- etc/profile-a-l/dexios.profile | 2 +- etc/profile-a-l/dig.profile | 2 +- etc/profile-a-l/dnscrypt-proxy.profile | 2 +- etc/profile-a-l/dnsmasq.profile | 2 +- etc/profile-a-l/drill.profile | 2 +- etc/profile-a-l/editorconfiger.profile | 2 +- etc/profile-a-l/erd.profile | 3 +-- etc/profile-a-l/fdns.profile | 2 +- etc/profile-a-l/gget.profile | 2 +- etc/profile-a-l/gist.profile | 2 +- etc/profile-a-l/git.profile | 2 +- etc/profile-a-l/gnome-keyring-daemon.profile | 2 +- etc/profile-a-l/googler-common.profile | 2 +- etc/profile-a-l/gpg-agent.profile | 2 +- etc/profile-a-l/gpg.profile | 2 +- etc/profile-a-l/links-common.profile | 2 +- etc/profile-a-l/lynx.profile | 2 +- 25 files changed, 25 insertions(+), 26 deletions(-) (limited to 'etc/profile-a-l') diff --git a/etc/profile-a-l/agetpkg.profile b/etc/profile-a-l/agetpkg.profile index 9ebbf1cb0..e455a17db 100644 --- a/etc/profile-a-l/agetpkg.profile +++ b/etc/profile-a-l/agetpkg.profile @@ -7,7 +7,6 @@ include agetpkg.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* # Allow python (blacklisted by disable-interpreters.inc) @@ -20,6 +19,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc +include disable-X11.inc include disable-xdg.inc whitelist ${DOWNLOADS} diff --git a/etc/profile-a-l/alpine.profile b/etc/profile-a-l/alpine.profile index 5ccb9896f..2ded32959 100644 --- a/etc/profile-a-l/alpine.profile +++ b/etc/profile-a-l/alpine.profile @@ -30,7 +30,6 @@ noblacklist ${HOME}/.pinercex noblacklist ${HOME}/.signature noblacklist ${HOME}/mail -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* include disable-common.inc @@ -39,6 +38,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc +include disable-X11.inc include disable-xdg.inc #whitelist ${DOCUMENTS} diff --git a/etc/profile-a-l/aria2c.profile b/etc/profile-a-l/aria2c.profile index 65ffdfa1b..0d70cf381 100644 --- a/etc/profile-a-l/aria2c.profile +++ b/etc/profile-a-l/aria2c.profile @@ -11,7 +11,6 @@ noblacklist ${HOME}/.cache/winetricks # XXX: See #5238 noblacklist ${HOME}/.config/aria2 noblacklist ${HOME}/.netrc -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* include disable-common.inc @@ -19,6 +18,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc +include disable-X11.inc include whitelist-usr-share-common.inc include whitelist-var-common.inc diff --git a/etc/profile-a-l/bpftop.profile b/etc/profile-a-l/bpftop.profile index 1bcfce06c..8c64a77c6 100644 --- a/etc/profile-a-l/bpftop.profile +++ b/etc/profile-a-l/bpftop.profile @@ -7,7 +7,6 @@ include bpftop.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix blacklist /usr/libexec blacklist ${RUNUSER} @@ -18,6 +17,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc +include disable-X11.inc include disable-xdg.inc include whitelist-common.inc diff --git a/etc/profile-a-l/cloneit.profile b/etc/profile-a-l/cloneit.profile index b5328a807..445ef4890 100644 --- a/etc/profile-a-l/cloneit.profile +++ b/etc/profile-a-l/cloneit.profile @@ -7,7 +7,6 @@ include cloneit.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix blacklist /usr/libexec blacklist ${RUNUSER} @@ -18,6 +17,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc +include disable-X11.inc include disable-xdg.inc include whitelist-run-common.inc diff --git a/etc/profile-a-l/curl.profile b/etc/profile-a-l/curl.profile index 417abcc91..1d9ec5fa4 100644 --- a/etc/profile-a-l/curl.profile +++ b/etc/profile-a-l/curl.profile @@ -16,7 +16,6 @@ noblacklist ${HOME}/.config/curlrc # since curl 7.73.0 noblacklist ${HOME}/.curl-hsts noblacklist ${HOME}/.curlrc -blacklist /tmp/.X11-unix blacklist ${RUNUSER} # If you use nvm, add the below lines to your curl.local @@ -26,6 +25,7 @@ blacklist ${RUNUSER} include disable-common.inc include disable-exec.inc include disable-programs.inc +include disable-X11.inc # Depending on workflow you can add 'include disable-xdg.inc' to your curl.local. #include disable-xdg.inc diff --git a/etc/profile-a-l/dbus-send.profile b/etc/profile-a-l/dbus-send.profile index 70bd7370d..3a552b929 100644 --- a/etc/profile-a-l/dbus-send.profile +++ b/etc/profile-a-l/dbus-send.profile @@ -7,7 +7,6 @@ include dbus-send.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* include disable-common.inc @@ -17,6 +16,7 @@ include disable-interpreters.inc include disable-programs.inc include disable-shell.inc include disable-write-mnt.inc +include disable-X11.inc include disable-xdg.inc #include whitelist-common.inc # see #903 diff --git a/etc/profile-a-l/deadlink.profile b/etc/profile-a-l/deadlink.profile index 2e3fe9e0c..f7535c597 100644 --- a/etc/profile-a-l/deadlink.profile +++ b/etc/profile-a-l/deadlink.profile @@ -6,7 +6,6 @@ include deadlink.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix blacklist /usr/libexec blacklist ${RUNUSER} @@ -23,6 +22,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc +include disable-X11.inc include disable-xdg.inc include whitelist-run-common.inc diff --git a/etc/profile-a-l/dexios.profile b/etc/profile-a-l/dexios.profile index 4dfccd685..55d6c83ce 100644 --- a/etc/profile-a-l/dexios.profile +++ b/etc/profile-a-l/dexios.profile @@ -7,7 +7,6 @@ include dexios.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix blacklist /usr/libexec blacklist ${RUNUSER} @@ -18,6 +17,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc +include disable-X11.inc include disable-xdg.inc whitelist ${DOWNLOADS} diff --git a/etc/profile-a-l/dig.profile b/etc/profile-a-l/dig.profile index 781dfdcbc..80eef569c 100644 --- a/etc/profile-a-l/dig.profile +++ b/etc/profile-a-l/dig.profile @@ -10,7 +10,6 @@ include globals.local noblacklist ${HOME}/.digrc noblacklist ${PATH}/dig -blacklist /tmp/.X11-unix blacklist ${RUNUSER} include disable-common.inc @@ -18,6 +17,7 @@ include disable-common.inc include disable-exec.inc #include disable-interpreters.inc include disable-programs.inc +include disable-X11.inc include disable-xdg.inc #mkfile ${HOME}/.digrc # see #903 diff --git a/etc/profile-a-l/dnscrypt-proxy.profile b/etc/profile-a-l/dnscrypt-proxy.profile index 50b56fb2d..e27fa202b 100644 --- a/etc/profile-a-l/dnscrypt-proxy.profile +++ b/etc/profile-a-l/dnscrypt-proxy.profile @@ -7,7 +7,6 @@ include dnscrypt-proxy.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* noblacklist /sbin @@ -18,6 +17,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc +include disable-X11.inc include disable-xdg.inc whitelist /usr/share/dnscrypt-proxy diff --git a/etc/profile-a-l/dnsmasq.profile b/etc/profile-a-l/dnsmasq.profile index 40ccab8c7..b41eff3ae 100644 --- a/etc/profile-a-l/dnsmasq.profile +++ b/etc/profile-a-l/dnsmasq.profile @@ -11,13 +11,13 @@ noblacklist /sbin noblacklist /usr/sbin noblacklist /var/lib/libvirt -blacklist /tmp/.X11-unix blacklist ${RUNUSER} include disable-common.inc include disable-devel.inc include disable-interpreters.inc include disable-programs.inc +include disable-X11.inc include disable-xdg.inc whitelist /var/lib/libvirt/dnsmasq diff --git a/etc/profile-a-l/drill.profile b/etc/profile-a-l/drill.profile index 63dfd6c0d..95e86e5b9 100644 --- a/etc/profile-a-l/drill.profile +++ b/etc/profile-a-l/drill.profile @@ -9,7 +9,6 @@ include globals.local noblacklist ${PATH}/drill -blacklist /tmp/.X11-unix blacklist ${RUNUSER} include disable-common.inc @@ -17,6 +16,7 @@ include disable-common.inc include disable-exec.inc #include disable-interpreters.inc include disable-programs.inc +include disable-X11.inc include disable-xdg.inc #include whitelist-common.inc # see #903 diff --git a/etc/profile-a-l/editorconfiger.profile b/etc/profile-a-l/editorconfiger.profile index 452ca7e6e..a921ae2d5 100644 --- a/etc/profile-a-l/editorconfiger.profile +++ b/etc/profile-a-l/editorconfiger.profile @@ -6,7 +6,6 @@ include editorconfiger.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix blacklist /usr/libexec blacklist ${RUNUSER} @@ -17,6 +16,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc +include disable-X11.inc include disable-xdg.inc apparmor 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 diff --git a/etc/profile-a-l/fdns.profile b/etc/profile-a-l/fdns.profile index e9d5709ec..cacd7025d 100644 --- a/etc/profile-a-l/fdns.profile +++ b/etc/profile-a-l/fdns.profile @@ -8,7 +8,6 @@ include globals.local noblacklist /sbin noblacklist /usr/sbin -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* include disable-common.inc @@ -16,6 +15,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc +include disable-X11.inc include disable-xdg.inc #include whitelist-usr-share-common.inc diff --git a/etc/profile-a-l/gget.profile b/etc/profile-a-l/gget.profile index 11d5f620c..e0268a68c 100644 --- a/etc/profile-a-l/gget.profile +++ b/etc/profile-a-l/gget.profile @@ -7,7 +7,6 @@ include gget.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix blacklist ${RUNUSER} include disable-common.inc @@ -16,6 +15,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc +include disable-X11.inc include disable-xdg.inc whitelist ${DOWNLOADS} diff --git a/etc/profile-a-l/gist.profile b/etc/profile-a-l/gist.profile index 6eea076f7..c7be8dcc5 100644 --- a/etc/profile-a-l/gist.profile +++ b/etc/profile-a-l/gist.profile @@ -7,7 +7,6 @@ include gist.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* noblacklist ${HOME}/.gist @@ -20,6 +19,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc +include disable-X11.inc include disable-xdg.inc mkdir ${HOME}/.gist diff --git a/etc/profile-a-l/git.profile b/etc/profile-a-l/git.profile index 78d6cb2a1..a900e10f3 100644 --- a/etc/profile-a-l/git.profile +++ b/etc/profile-a-l/git.profile @@ -28,12 +28,12 @@ ignore rmenv GITHUB_ENTERPRISE_TOKEN # Allow ssh (blacklisted by disable-common.inc) include allow-ssh.inc -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* include disable-common.inc include disable-exec.inc include disable-programs.inc +include disable-X11.inc whitelist /usr/share/git whitelist /usr/share/git-core diff --git a/etc/profile-a-l/gnome-keyring-daemon.profile b/etc/profile-a-l/gnome-keyring-daemon.profile index 41ea136a6..0370b0472 100644 --- a/etc/profile-a-l/gnome-keyring-daemon.profile +++ b/etc/profile-a-l/gnome-keyring-daemon.profile @@ -7,7 +7,6 @@ include gnome-keyring-daemon.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* include disable-common.inc @@ -16,6 +15,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc #include disable-X11.inc # x11 none +include disable-X11.inc include disable-xdg.inc whitelist ${RUNUSER}/gnupg diff --git a/etc/profile-a-l/googler-common.profile b/etc/profile-a-l/googler-common.profile index 58769643a..e1ec5f4b9 100644 --- a/etc/profile-a-l/googler-common.profile +++ b/etc/profile-a-l/googler-common.profile @@ -7,7 +7,6 @@ include googler-common.local # added by caller profile #include globals.local -blacklist /tmp/.X11-unix blacklist ${RUNUSER} noblacklist ${HOME}/.w3m @@ -23,6 +22,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc +include disable-X11.inc include disable-xdg.inc whitelist ${HOME}/.w3m diff --git a/etc/profile-a-l/gpg-agent.profile b/etc/profile-a-l/gpg-agent.profile index 3b623a338..29249cf21 100644 --- a/etc/profile-a-l/gpg-agent.profile +++ b/etc/profile-a-l/gpg-agent.profile @@ -9,13 +9,13 @@ include globals.local noblacklist ${HOME}/.gnupg -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* include disable-common.inc include disable-devel.inc include disable-interpreters.inc include disable-programs.inc +include disable-X11.inc include disable-xdg.inc mkdir ${HOME}/.gnupg diff --git a/etc/profile-a-l/gpg.profile b/etc/profile-a-l/gpg.profile index bf4a1c60b..02dd3b076 100644 --- a/etc/profile-a-l/gpg.profile +++ b/etc/profile-a-l/gpg.profile @@ -9,13 +9,13 @@ include globals.local noblacklist ${HOME}/.gnupg -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* include disable-common.inc include disable-devel.inc include disable-interpreters.inc include disable-programs.inc +include disable-X11.inc whitelist ${RUNUSER}/gnupg whitelist ${RUNUSER}/keyring diff --git a/etc/profile-a-l/links-common.profile b/etc/profile-a-l/links-common.profile index 636560789..4bab6b0cc 100644 --- a/etc/profile-a-l/links-common.profile +++ b/etc/profile-a-l/links-common.profile @@ -4,7 +4,6 @@ include links-common.local # common profile for links browsers -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* include disable-common.inc @@ -14,6 +13,7 @@ include disable-interpreters.inc # Additional noblacklist files/directories (blacklisted in disable-programs.inc) # used as associated programs can be added in your links-common.local. include disable-programs.inc +include disable-X11.inc include disable-xdg.inc whitelist ${DOWNLOADS} diff --git a/etc/profile-a-l/lynx.profile b/etc/profile-a-l/lynx.profile index 248061b3f..2c61147ec 100644 --- a/etc/profile-a-l/lynx.profile +++ b/etc/profile-a-l/lynx.profile @@ -7,13 +7,13 @@ include lynx.local # Persistent global definitions include globals.local -blacklist /tmp/.X11-unix blacklist ${RUNUSER}/wayland-* include disable-common.inc include disable-devel.inc include disable-interpreters.inc include disable-programs.inc +include disable-X11.inc include disable-xdg.inc include whitelist-runuser-common.inc -- cgit v1.2.3-54-g00ecf