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/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 +- 29 files changed, 29 insertions(+), 29 deletions(-) (limited to 'etc/profile-m-z') 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 -- cgit v1.2.3-54-g00ecf