From 0060b5105b1fc74aecae71b60b473451a8b65020 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Wed, 27 Mar 2024 12:13:47 +0000 Subject: profiles: rename disable-X11.inc to disable-x11.inc (#6294) That is, make "X11" lowercase so that the order of the includes in the disable- section remain the same when sorted with `LC_ALL=C`, as is the case for most of the other sections. That is also likely to be the default in text editors (such as in vim on Arch), so this should make the disable- section more consistent and easier to sort when editing the profile. Also, keep the old include as a redirect to the new one for now to avoid breakage. Commands used to search and replace: git mv etc/inc/disable-X11.inc etc/inc/disable-x11.inc git grep -Ilz 'disable-X11' -- etc | xargs -0 \ perl -pi -e 's/disable-X11/disable-x11/' Relates to #4462 #4854 #6070 #6289. This is a follow-up to #6286. --- etc/inc/disable-X11.inc | 15 ++++----------- etc/inc/disable-x11.inc | 15 +++++++++++++++ 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/build-systems-common.profile | 2 +- etc/profile-a-l/clac.profile | 2 +- etc/profile-a-l/cloneit.profile | 2 +- etc/profile-a-l/cointop.profile | 2 +- etc/profile-a-l/curl.profile | 2 +- etc/profile-a-l/daisy.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 | 2 +- etc/profile-a-l/fdns.profile | 2 +- etc/profile-a-l/ftp.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 | 4 ++-- 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 +- etc/profile-m-z/makepkg.profile | 2 +- etc/profile-m-z/mimetype.profile | 2 +- etc/profile-m-z/mocp.profile | 2 +- etc/profile-m-z/mutt.profile | 2 +- etc/profile-m-z/neomutt.profile | 2 +- etc/profile-m-z/nodejs-common.profile | 2 +- etc/profile-m-z/nslookup.profile | 2 +- etc/profile-m-z/ping.profile | 2 +- etc/profile-m-z/qpdf.profile | 2 +- etc/profile-m-z/rsync-download_only.profile | 2 +- etc/profile-m-z/rtv.profile | 2 +- etc/profile-m-z/seahorse-daemon.profile | 2 +- etc/profile-m-z/server.profile | 2 +- etc/profile-m-z/signal-cli.profile | 2 +- etc/profile-m-z/ssh-agent.profile | 2 +- etc/profile-m-z/ssmtp.profile | 2 +- etc/profile-m-z/statusof.profile | 2 +- etc/profile-m-z/telnet.profile | 2 +- etc/profile-m-z/termshark.profile | 2 +- etc/profile-m-z/tin.profile | 2 +- etc/profile-m-z/tmux.profile | 2 +- etc/profile-m-z/tracker.profile | 2 +- etc/profile-m-z/tshark.profile | 2 +- etc/profile-m-z/tvnamer.profile | 2 +- etc/profile-m-z/unbound.profile | 2 +- etc/profile-m-z/w3m.profile | 2 +- etc/profile-m-z/wget.profile | 2 +- etc/profile-m-z/whois.profile | 2 +- etc/profile-m-z/yt-dlp.profile | 2 +- etc/templates/profile.template | 4 ++-- 62 files changed, 81 insertions(+), 73 deletions(-) create mode 100644 etc/inc/disable-x11.inc diff --git a/etc/inc/disable-X11.inc b/etc/inc/disable-X11.inc index d227c7a0b..9f2bb47ae 100644 --- a/etc/inc/disable-X11.inc +++ b/etc/inc/disable-X11.inc @@ -2,14 +2,7 @@ # Persistent customizations should go in a .local file. include disable-X11.local -blacklist /tmp/.X11-unix -blacklist ${HOME}/.Xauthority -blacklist ${RUNUSER}/gdm/Xauthority -blacklist ${RUNUSER}/.mutter-Xwaylandauth* -blacklist ${RUNUSER}/xauth_* -#blacklist ${RUNUSER}/[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]-[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]-[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]-[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]-[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]] -blacklist /tmp/xauth* -blacklist /tmp/.ICE-unix -blacklist ${RUNUSER}/ICEauthority -rmenv DISPLAY -rmenv XAUTHORITY +# Warning: This file is deprecated; use disable-x11.inc (lowercase) instead. + +# Redirect +include disable-x11.inc diff --git a/etc/inc/disable-x11.inc b/etc/inc/disable-x11.inc new file mode 100644 index 000000000..d78329046 --- /dev/null +++ b/etc/inc/disable-x11.inc @@ -0,0 +1,15 @@ +# This file is overwritten during software install. +# Persistent customizations should go in a .local file. +include disable-x11.local + +blacklist /tmp/.X11-unix +blacklist ${HOME}/.Xauthority +blacklist ${RUNUSER}/gdm/Xauthority +blacklist ${RUNUSER}/.mutter-Xwaylandauth* +blacklist ${RUNUSER}/xauth_* +#blacklist ${RUNUSER}/[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]-[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]-[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]-[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]-[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]] +blacklist /tmp/xauth* +blacklist /tmp/.ICE-unix +blacklist ${RUNUSER}/ICEauthority +rmenv DISPLAY +rmenv XAUTHORITY diff --git a/etc/profile-a-l/agetpkg.profile b/etc/profile-a-l/agetpkg.profile index e455a17db..1bf954e3a 100644 --- a/etc/profile-a-l/agetpkg.profile +++ b/etc/profile-a-l/agetpkg.profile @@ -19,7 +19,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc -include disable-X11.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 2ded32959..7ff2058a5 100644 --- a/etc/profile-a-l/alpine.profile +++ b/etc/profile-a-l/alpine.profile @@ -38,7 +38,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc -include disable-X11.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 0d70cf381..a3add6a4d 100644 --- a/etc/profile-a-l/aria2c.profile +++ b/etc/profile-a-l/aria2c.profile @@ -18,7 +18,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.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 7670f1b4b..d5b723f17 100644 --- a/etc/profile-a-l/bpftop.profile +++ b/etc/profile-a-l/bpftop.profile @@ -17,7 +17,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc include whitelist-common.inc diff --git a/etc/profile-a-l/build-systems-common.profile b/etc/profile-a-l/build-systems-common.profile index 8616996d2..9761efc72 100644 --- a/etc/profile-a-l/build-systems-common.profile +++ b/etc/profile-a-l/build-systems-common.profile @@ -25,7 +25,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc #whitelist ${HOME}/Projects diff --git a/etc/profile-a-l/clac.profile b/etc/profile-a-l/clac.profile index cd2b2522d..7a8104b63 100644 --- a/etc/profile-a-l/clac.profile +++ b/etc/profile-a-l/clac.profile @@ -16,7 +16,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -#include disable-X11.inc # x11 none +#include disable-x11.inc # x11 none include disable-xdg.inc #include whitelist-common.inc # see #903 diff --git a/etc/profile-a-l/cloneit.profile b/etc/profile-a-l/cloneit.profile index 827dd1de2..abbeb9d77 100644 --- a/etc/profile-a-l/cloneit.profile +++ b/etc/profile-a-l/cloneit.profile @@ -17,7 +17,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc include whitelist-run-common.inc diff --git a/etc/profile-a-l/cointop.profile b/etc/profile-a-l/cointop.profile index aa053e2f7..fa30331e1 100644 --- a/etc/profile-a-l/cointop.profile +++ b/etc/profile-a-l/cointop.profile @@ -17,7 +17,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc mkdir ${HOME}/.config/cointop diff --git a/etc/profile-a-l/curl.profile b/etc/profile-a-l/curl.profile index 1d9ec5fa4..9044e9ac0 100644 --- a/etc/profile-a-l/curl.profile +++ b/etc/profile-a-l/curl.profile @@ -25,7 +25,7 @@ blacklist ${RUNUSER} include disable-common.inc include disable-exec.inc include disable-programs.inc -include disable-X11.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/daisy.profile b/etc/profile-a-l/daisy.profile index 40b29a1f5..c6e616414 100644 --- a/etc/profile-a-l/daisy.profile +++ b/etc/profile-a-l/daisy.profile @@ -15,7 +15,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -#include disable-X11.inc # x11 none +#include disable-x11.inc # x11 none include disable-xdg.inc include whitelist-common.inc diff --git a/etc/profile-a-l/dbus-send.profile b/etc/profile-a-l/dbus-send.profile index 3a552b929..b54724aa5 100644 --- a/etc/profile-a-l/dbus-send.profile +++ b/etc/profile-a-l/dbus-send.profile @@ -16,7 +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-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 9b378b455..dd7283ed9 100644 --- a/etc/profile-a-l/deadlink.profile +++ b/etc/profile-a-l/deadlink.profile @@ -22,7 +22,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.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 7d549d745..936aa9f05 100644 --- a/etc/profile-a-l/dexios.profile +++ b/etc/profile-a-l/dexios.profile @@ -17,7 +17,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.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 80eef569c..6a00475f9 100644 --- a/etc/profile-a-l/dig.profile +++ b/etc/profile-a-l/dig.profile @@ -17,7 +17,7 @@ include disable-common.inc include disable-exec.inc #include disable-interpreters.inc include disable-programs.inc -include disable-X11.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 e27fa202b..49d201d76 100644 --- a/etc/profile-a-l/dnscrypt-proxy.profile +++ b/etc/profile-a-l/dnscrypt-proxy.profile @@ -17,7 +17,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.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 b41eff3ae..2ce980cb1 100644 --- a/etc/profile-a-l/dnsmasq.profile +++ b/etc/profile-a-l/dnsmasq.profile @@ -17,7 +17,7 @@ include disable-common.inc include disable-devel.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.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 95e86e5b9..2205f52a0 100644 --- a/etc/profile-a-l/drill.profile +++ b/etc/profile-a-l/drill.profile @@ -16,7 +16,7 @@ include disable-common.inc include disable-exec.inc #include disable-interpreters.inc include disable-programs.inc -include disable-X11.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 8812db35f..654d65ee0 100644 --- a/etc/profile-a-l/editorconfiger.profile +++ b/etc/profile-a-l/editorconfiger.profile @@ -16,7 +16,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.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 d821f5882..e72b75e75 100644 --- a/etc/profile-a-l/erd.profile +++ b/etc/profile-a-l/erd.profile @@ -8,7 +8,7 @@ include erd.local include globals.local include disable-exec.inc -#include disable-X11.inc # x11 none +#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 cacd7025d..2d956f5a4 100644 --- a/etc/profile-a-l/fdns.profile +++ b/etc/profile-a-l/fdns.profile @@ -15,7 +15,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc #include whitelist-usr-share-common.inc diff --git a/etc/profile-a-l/ftp.profile b/etc/profile-a-l/ftp.profile index f448ab932..e133deba2 100644 --- a/etc/profile-a-l/ftp.profile +++ b/etc/profile-a-l/ftp.profile @@ -17,7 +17,7 @@ include disable-proc.inc include disable-programs.inc #include disable-shell.inc include disable-write-mnt.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc apparmor diff --git a/etc/profile-a-l/gget.profile b/etc/profile-a-l/gget.profile index e0268a68c..eff215381 100644 --- a/etc/profile-a-l/gget.profile +++ b/etc/profile-a-l/gget.profile @@ -15,7 +15,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc -include disable-X11.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 c7be8dcc5..4dff73c54 100644 --- a/etc/profile-a-l/gist.profile +++ b/etc/profile-a-l/gist.profile @@ -19,7 +19,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.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 a900e10f3..f2fd63e1b 100644 --- a/etc/profile-a-l/git.profile +++ b/etc/profile-a-l/git.profile @@ -33,7 +33,7 @@ blacklist ${RUNUSER}/wayland-* include disable-common.inc include disable-exec.inc include disable-programs.inc -include disable-X11.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 0370b0472..b8c51991c 100644 --- a/etc/profile-a-l/gnome-keyring-daemon.profile +++ b/etc/profile-a-l/gnome-keyring-daemon.profile @@ -14,8 +14,8 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc -#include disable-X11.inc # x11 none -include disable-X11.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 e1ec5f4b9..823228612 100644 --- a/etc/profile-a-l/googler-common.profile +++ b/etc/profile-a-l/googler-common.profile @@ -22,7 +22,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc -include disable-X11.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 29249cf21..102a4ef24 100644 --- a/etc/profile-a-l/gpg-agent.profile +++ b/etc/profile-a-l/gpg-agent.profile @@ -15,7 +15,7 @@ include disable-common.inc include disable-devel.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.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 02dd3b076..6becc80eb 100644 --- a/etc/profile-a-l/gpg.profile +++ b/etc/profile-a-l/gpg.profile @@ -15,7 +15,7 @@ include disable-common.inc include disable-devel.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.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 4bab6b0cc..fd0aab879 100644 --- a/etc/profile-a-l/links-common.profile +++ b/etc/profile-a-l/links-common.profile @@ -13,7 +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-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 2c61147ec..233bdafb6 100644 --- a/etc/profile-a-l/lynx.profile +++ b/etc/profile-a-l/lynx.profile @@ -13,7 +13,7 @@ include disable-common.inc include disable-devel.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc include whitelist-runuser-common.inc diff --git a/etc/profile-m-z/makepkg.profile b/etc/profile-m-z/makepkg.profile index a8dd3988b..148e06840 100644 --- a/etc/profile-m-z/makepkg.profile +++ b/etc/profile-m-z/makepkg.profile @@ -32,7 +32,7 @@ noblacklist /var/lib/pacman include disable-common.inc include disable-exec.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc caps.drop all ipc-namespace diff --git a/etc/profile-m-z/mimetype.profile b/etc/profile-m-z/mimetype.profile index 4b62624bb..6d9af90cb 100644 --- a/etc/profile-m-z/mimetype.profile +++ b/etc/profile-m-z/mimetype.profile @@ -11,7 +11,7 @@ blacklist ${RUNUSER}/wayland-* include disable-exec.inc include disable-proc.inc -include disable-X11.inc +include disable-x11.inc apparmor caps.drop all diff --git a/etc/profile-m-z/mocp.profile b/etc/profile-m-z/mocp.profile index d80e263b6..18e7331f3 100644 --- a/etc/profile-m-z/mocp.profile +++ b/etc/profile-m-z/mocp.profile @@ -18,7 +18,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-proc.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc mkdir ${HOME}/.moc diff --git a/etc/profile-m-z/mutt.profile b/etc/profile-m-z/mutt.profile index 447301d46..0f43a9335 100644 --- a/etc/profile-m-z/mutt.profile +++ b/etc/profile-m-z/mutt.profile @@ -50,7 +50,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc mkdir ${HOME}/.Mail diff --git a/etc/profile-m-z/neomutt.profile b/etc/profile-m-z/neomutt.profile index 22720422b..4101e74ee 100644 --- a/etc/profile-m-z/neomutt.profile +++ b/etc/profile-m-z/neomutt.profile @@ -48,7 +48,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc mkdir ${HOME}/.Mail diff --git a/etc/profile-m-z/nodejs-common.profile b/etc/profile-m-z/nodejs-common.profile index f301196c6..43fafc3de 100644 --- a/etc/profile-m-z/nodejs-common.profile +++ b/etc/profile-m-z/nodejs-common.profile @@ -39,7 +39,7 @@ include disable-common.inc include disable-exec.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc # If you want whitelisting, change ${HOME}/Projects below to your node projects directory diff --git a/etc/profile-m-z/nslookup.profile b/etc/profile-m-z/nslookup.profile index aae506b0b..5313d2906 100644 --- a/etc/profile-m-z/nslookup.profile +++ b/etc/profile-m-z/nslookup.profile @@ -16,7 +16,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc whitelist ${HOME}/.nslookuprc diff --git a/etc/profile-m-z/ping.profile b/etc/profile-m-z/ping.profile index c3aa0a501..785de68cb 100644 --- a/etc/profile-m-z/ping.profile +++ b/etc/profile-m-z/ping.profile @@ -15,7 +15,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-proc.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc #include whitelist-common.inc # see #903 diff --git a/etc/profile-m-z/qpdf.profile b/etc/profile-m-z/qpdf.profile index edec7cf0a..a5b65aa8e 100644 --- a/etc/profile-m-z/qpdf.profile +++ b/etc/profile-m-z/qpdf.profile @@ -18,7 +18,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc whitelist ${DOCUMENTS} diff --git a/etc/profile-m-z/rsync-download_only.profile b/etc/profile-m-z/rsync-download_only.profile index 52ccb4309..12724a077 100644 --- a/etc/profile-m-z/rsync-download_only.profile +++ b/etc/profile-m-z/rsync-download_only.profile @@ -19,7 +19,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc # Add the next line to your rsync-download_only.local to enable extra hardening. diff --git a/etc/profile-m-z/rtv.profile b/etc/profile-m-z/rtv.profile index e719b0d0d..5219f73f6 100644 --- a/etc/profile-m-z/rtv.profile +++ b/etc/profile-m-z/rtv.profile @@ -27,7 +27,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc mkdir ${HOME}/.config/rtv diff --git a/etc/profile-m-z/seahorse-daemon.profile b/etc/profile-m-z/seahorse-daemon.profile index b3ead7191..f409b1930 100644 --- a/etc/profile-m-z/seahorse-daemon.profile +++ b/etc/profile-m-z/seahorse-daemon.profile @@ -9,7 +9,7 @@ include seahorse-daemon.local #include globals.local blacklist ${RUNUSER}/wayland-* -include disable-X11.inc +include disable-x11.inc memory-deny-write-execute diff --git a/etc/profile-m-z/server.profile b/etc/profile-m-z/server.profile index a77cf7e0b..a2978ab19 100644 --- a/etc/profile-m-z/server.profile +++ b/etc/profile-m-z/server.profile @@ -44,7 +44,7 @@ include disable-common.inc #include disable-interpreters.inc include disable-programs.inc include disable-write-mnt.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc #include whitelist-runuser-common.inc diff --git a/etc/profile-m-z/signal-cli.profile b/etc/profile-m-z/signal-cli.profile index 979d71b33..67bb45141 100644 --- a/etc/profile-m-z/signal-cli.profile +++ b/etc/profile-m-z/signal-cli.profile @@ -17,7 +17,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc mkdir ${HOME}/.local/share/signal-cli diff --git a/etc/profile-m-z/ssh-agent.profile b/etc/profile-m-z/ssh-agent.profile index 6630244be..97ddfd292 100644 --- a/etc/profile-m-z/ssh-agent.profile +++ b/etc/profile-m-z/ssh-agent.profile @@ -13,7 +13,7 @@ blacklist ${RUNUSER}/wayland-* include disable-common.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc include whitelist-usr-share-common.inc diff --git a/etc/profile-m-z/ssmtp.profile b/etc/profile-m-z/ssmtp.profile index 356a732e7..8e2c21498 100644 --- a/etc/profile-m-z/ssmtp.profile +++ b/etc/profile-m-z/ssmtp.profile @@ -24,7 +24,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc mkfile ${HOME}/dead.letter diff --git a/etc/profile-m-z/statusof.profile b/etc/profile-m-z/statusof.profile index 45da84e11..6422f979b 100644 --- a/etc/profile-m-z/statusof.profile +++ b/etc/profile-m-z/statusof.profile @@ -20,7 +20,7 @@ include disable-interpreters.inc include disable-proc.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc include whitelist-common.inc diff --git a/etc/profile-m-z/telnet.profile b/etc/profile-m-z/telnet.profile index 13a47c958..ec27b89a8 100644 --- a/etc/profile-m-z/telnet.profile +++ b/etc/profile-m-z/telnet.profile @@ -17,7 +17,7 @@ include disable-proc.inc include disable-programs.inc #include disable-shell.inc include disable-write-mnt.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc apparmor diff --git a/etc/profile-m-z/termshark.profile b/etc/profile-m-z/termshark.profile index bdee14e64..64f52cf6d 100644 --- a/etc/profile-m-z/termshark.profile +++ b/etc/profile-m-z/termshark.profile @@ -10,7 +10,7 @@ include termshark.local blacklist ${RUNUSER} -include disable-X11.inc +include disable-x11.inc # Redirect include wireshark.profile diff --git a/etc/profile-m-z/tin.profile b/etc/profile-m-z/tin.profile index 7c1d534e9..865735a79 100644 --- a/etc/profile-m-z/tin.profile +++ b/etc/profile-m-z/tin.profile @@ -18,7 +18,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc mkdir ${HOME}/.tin diff --git a/etc/profile-m-z/tmux.profile b/etc/profile-m-z/tmux.profile index 55d84a618..a846b7f02 100644 --- a/etc/profile-m-z/tmux.profile +++ b/etc/profile-m-z/tmux.profile @@ -15,7 +15,7 @@ noblacklist /tmp/tmux-* #include disable-devel.inc #include disable-exec.inc #include disable-programs.inc -include disable-X11.inc +include disable-x11.inc caps.drop all ipc-namespace diff --git a/etc/profile-m-z/tracker.profile b/etc/profile-m-z/tracker.profile index 8a3464496..d7de4310f 100644 --- a/etc/profile-m-z/tracker.profile +++ b/etc/profile-m-z/tracker.profile @@ -15,7 +15,7 @@ include disable-devel.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include whitelist-runuser-common.inc diff --git a/etc/profile-m-z/tshark.profile b/etc/profile-m-z/tshark.profile index fab45a334..8e57de6cb 100644 --- a/etc/profile-m-z/tshark.profile +++ b/etc/profile-m-z/tshark.profile @@ -9,7 +9,7 @@ include tshark.local blacklist ${RUNUSER} -include disable-X11.inc +include disable-x11.inc # Redirect include wireshark.profile diff --git a/etc/profile-m-z/tvnamer.profile b/etc/profile-m-z/tvnamer.profile index 19c94feea..c71434f2a 100644 --- a/etc/profile-m-z/tvnamer.profile +++ b/etc/profile-m-z/tvnamer.profile @@ -23,7 +23,7 @@ include disable-interpreters.inc include disable-programs.inc include disable-proc.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc mkdir ${HOME}/.config/tvnamer diff --git a/etc/profile-m-z/unbound.profile b/etc/profile-m-z/unbound.profile index dfce92e2d..c12054d47 100644 --- a/etc/profile-m-z/unbound.profile +++ b/etc/profile-m-z/unbound.profile @@ -16,7 +16,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc whitelist /usr/share/dns diff --git a/etc/profile-m-z/w3m.profile b/etc/profile-m-z/w3m.profile index 4e2f1bb3e..6c8d84ea4 100644 --- a/etc/profile-m-z/w3m.profile +++ b/etc/profile-m-z/w3m.profile @@ -28,7 +28,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc mkdir ${HOME}/.w3m diff --git a/etc/profile-m-z/wget.profile b/etc/profile-m-z/wget.profile index 90a1d3d7a..dacfd739e 100644 --- a/etc/profile-m-z/wget.profile +++ b/etc/profile-m-z/wget.profile @@ -23,7 +23,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc # Depending on workflow you can add the next line to your wget.local. #include disable-xdg.inc diff --git a/etc/profile-m-z/whois.profile b/etc/profile-m-z/whois.profile index e7f66cf76..42ce3bc5c 100644 --- a/etc/profile-m-z/whois.profile +++ b/etc/profile-m-z/whois.profile @@ -14,7 +14,7 @@ include disable-devel.inc include disable-exec.inc include disable-interpreters.inc include disable-programs.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc include whitelist-usr-share-common.inc diff --git a/etc/profile-m-z/yt-dlp.profile b/etc/profile-m-z/yt-dlp.profile index 6dd9d03a3..41cf907bd 100644 --- a/etc/profile-m-z/yt-dlp.profile +++ b/etc/profile-m-z/yt-dlp.profile @@ -37,7 +37,7 @@ include disable-exec.inc include disable-interpreters.inc include disable-programs.inc include disable-shell.inc -include disable-X11.inc +include disable-x11.inc include disable-xdg.inc include whitelist-usr-share-common.inc diff --git a/etc/templates/profile.template b/etc/templates/profile.template index 29ea55439..347cbeb3c 100644 --- a/etc/templates/profile.template +++ b/etc/templates/profile.template @@ -120,7 +120,7 @@ include globals.local #include disable-programs.inc #include disable-shell.inc #include disable-write-mnt.inc -#include disable-X11.inc +#include disable-x11.inc #include disable-xdg.inc # This section often mirrors noblacklist section above. The idea is @@ -181,7 +181,7 @@ include globals.local #seccomp.block-secondary ##seccomp-error-action log (only for debugging seccomp issues) #tracelog -# Prefer 'x11 none' instead of 'disable-X11.inc' if 'net none' is set +# Prefer 'x11 none' instead of 'disable-x11.inc' if 'net none' is set ##x11 none #disable-mnt -- cgit v1.2.3-54-g00ecf