Skip to content

Commit 2f53e45

Browse files
committed
profiles: rename disable-X11.inc to disable-x11.inc
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 netblue30#4462 netblue30#4854 netblue30#6070 netblue30#6289. This is a follow-up to netblue30#6286.
1 parent e600fd7 commit 2f53e45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+81
-73
lines changed

etc/inc/disable-X11.inc

+4-11
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,7 @@
22
# Persistent customizations should go in a .local file.
33
include disable-X11.local
44

5-
blacklist /tmp/.X11-unix
6-
blacklist ${HOME}/.Xauthority
7-
blacklist ${RUNUSER}/gdm/Xauthority
8-
blacklist ${RUNUSER}/.mutter-Xwaylandauth*
9-
blacklist ${RUNUSER}/xauth_*
10-
#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:]]
11-
blacklist /tmp/xauth*
12-
blacklist /tmp/.ICE-unix
13-
blacklist ${RUNUSER}/ICEauthority
14-
rmenv DISPLAY
15-
rmenv XAUTHORITY
5+
# Warning: This file is deprecated; use disable-x11.inc (lowercase) instead.
6+
7+
# Redirect
8+
include disable-x11.inc

etc/inc/disable-x11.inc

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# This file is overwritten during software install.
2+
# Persistent customizations should go in a .local file.
3+
include disable-x11.local
4+
5+
blacklist /tmp/.X11-unix
6+
blacklist ${HOME}/.Xauthority
7+
blacklist ${RUNUSER}/gdm/Xauthority
8+
blacklist ${RUNUSER}/.mutter-Xwaylandauth*
9+
blacklist ${RUNUSER}/xauth_*
10+
#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:]]
11+
blacklist /tmp/xauth*
12+
blacklist /tmp/.ICE-unix
13+
blacklist ${RUNUSER}/ICEauthority
14+
rmenv DISPLAY
15+
rmenv XAUTHORITY

etc/profile-a-l/agetpkg.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include disable-exec.inc
1919
include disable-interpreters.inc
2020
include disable-programs.inc
2121
include disable-shell.inc
22-
include disable-X11.inc
22+
include disable-x11.inc
2323
include disable-xdg.inc
2424

2525
whitelist ${DOWNLOADS}

etc/profile-a-l/alpine.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ include disable-exec.inc
3838
include disable-interpreters.inc
3939
include disable-programs.inc
4040
include disable-shell.inc
41-
include disable-X11.inc
41+
include disable-x11.inc
4242
include disable-xdg.inc
4343

4444
#whitelist ${DOCUMENTS}

etc/profile-a-l/aria2c.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ include disable-devel.inc
1818
include disable-exec.inc
1919
include disable-interpreters.inc
2020
include disable-programs.inc
21-
include disable-X11.inc
21+
include disable-x11.inc
2222

2323
include whitelist-usr-share-common.inc
2424
include whitelist-var-common.inc

etc/profile-a-l/bpftop.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include disable-interpreters.inc
1717
include disable-proc.inc
1818
include disable-programs.inc
1919
include disable-shell.inc
20-
include disable-X11.inc
20+
include disable-x11.inc
2121
include disable-xdg.inc
2222

2323
include whitelist-common.inc

etc/profile-a-l/build-systems-common.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ include disable-exec.inc
2525
include disable-interpreters.inc
2626
include disable-programs.inc
2727
include disable-shell.inc
28-
include disable-X11.inc
28+
include disable-x11.inc
2929
include disable-xdg.inc
3030

3131
#whitelist ${HOME}/Projects

etc/profile-a-l/clac.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ include disable-interpreters.inc
1616
include disable-proc.inc
1717
include disable-programs.inc
1818
include disable-shell.inc
19-
#include disable-X11.inc # x11 none
19+
#include disable-x11.inc # x11 none
2020
include disable-xdg.inc
2121

2222
#include whitelist-common.inc # see #903

etc/profile-a-l/cloneit.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include disable-interpreters.inc
1717
include disable-proc.inc
1818
include disable-programs.inc
1919
include disable-shell.inc
20-
include disable-X11.inc
20+
include disable-x11.inc
2121
include disable-xdg.inc
2222

2323
include whitelist-run-common.inc

etc/profile-a-l/cointop.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include disable-interpreters.inc
1717
include disable-proc.inc
1818
include disable-programs.inc
1919
include disable-shell.inc
20-
include disable-X11.inc
20+
include disable-x11.inc
2121
include disable-xdg.inc
2222

2323
mkdir ${HOME}/.config/cointop

etc/profile-a-l/curl.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ blacklist ${RUNUSER}
2525
include disable-common.inc
2626
include disable-exec.inc
2727
include disable-programs.inc
28-
include disable-X11.inc
28+
include disable-x11.inc
2929
# Depending on workflow you can add 'include disable-xdg.inc' to your curl.local.
3030
#include disable-xdg.inc
3131

etc/profile-a-l/daisy.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include disable-interpreters.inc
1515
include disable-proc.inc
1616
include disable-programs.inc
1717
include disable-shell.inc
18-
#include disable-X11.inc # x11 none
18+
#include disable-x11.inc # x11 none
1919
include disable-xdg.inc
2020

2121
include whitelist-common.inc

etc/profile-a-l/dbus-send.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ include disable-interpreters.inc
1616
include disable-programs.inc
1717
include disable-shell.inc
1818
include disable-write-mnt.inc
19-
include disable-X11.inc
19+
include disable-x11.inc
2020
include disable-xdg.inc
2121

2222
#include whitelist-common.inc # see #903

etc/profile-a-l/deadlink.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ include disable-interpreters.inc
2222
include disable-proc.inc
2323
include disable-programs.inc
2424
include disable-shell.inc
25-
include disable-X11.inc
25+
include disable-x11.inc
2626
include disable-xdg.inc
2727

2828
include whitelist-run-common.inc

etc/profile-a-l/dexios.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include disable-interpreters.inc
1717
include disable-proc.inc
1818
include disable-programs.inc
1919
include disable-shell.inc
20-
include disable-X11.inc
20+
include disable-x11.inc
2121
include disable-xdg.inc
2222

2323
whitelist ${DOWNLOADS}

etc/profile-a-l/dig.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include disable-common.inc
1717
include disable-exec.inc
1818
#include disable-interpreters.inc
1919
include disable-programs.inc
20-
include disable-X11.inc
20+
include disable-x11.inc
2121
include disable-xdg.inc
2222

2323
#mkfile ${HOME}/.digrc # see #903

etc/profile-a-l/dnscrypt-proxy.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include disable-devel.inc
1717
include disable-exec.inc
1818
include disable-interpreters.inc
1919
include disable-programs.inc
20-
include disable-X11.inc
20+
include disable-x11.inc
2121
include disable-xdg.inc
2222

2323
whitelist /usr/share/dnscrypt-proxy

etc/profile-a-l/dnsmasq.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include disable-common.inc
1717
include disable-devel.inc
1818
include disable-interpreters.inc
1919
include disable-programs.inc
20-
include disable-X11.inc
20+
include disable-x11.inc
2121
include disable-xdg.inc
2222

2323
whitelist /var/lib/libvirt/dnsmasq

etc/profile-a-l/drill.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ include disable-common.inc
1616
include disable-exec.inc
1717
#include disable-interpreters.inc
1818
include disable-programs.inc
19-
include disable-X11.inc
19+
include disable-x11.inc
2020
include disable-xdg.inc
2121

2222
#include whitelist-common.inc # see #903

etc/profile-a-l/editorconfiger.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ include disable-interpreters.inc
1616
include disable-proc.inc
1717
include disable-programs.inc
1818
include disable-shell.inc
19-
include disable-X11.inc
19+
include disable-x11.inc
2020
include disable-xdg.inc
2121

2222
apparmor

etc/profile-a-l/erd.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include erd.local
88
include globals.local
99

1010
include disable-exec.inc
11-
#include disable-X11.inc # x11 none
11+
#include disable-x11.inc # x11 none
1212

1313
apparmor
1414
caps.drop all

etc/profile-a-l/fdns.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include disable-devel.inc
1515
include disable-exec.inc
1616
include disable-interpreters.inc
1717
include disable-programs.inc
18-
include disable-X11.inc
18+
include disable-x11.inc
1919
include disable-xdg.inc
2020

2121
#include whitelist-usr-share-common.inc

etc/profile-a-l/ftp.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include disable-proc.inc
1717
include disable-programs.inc
1818
#include disable-shell.inc
1919
include disable-write-mnt.inc
20-
include disable-X11.inc
20+
include disable-x11.inc
2121
include disable-xdg.inc
2222

2323
apparmor

etc/profile-a-l/gget.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include disable-exec.inc
1515
include disable-interpreters.inc
1616
include disable-programs.inc
1717
include disable-shell.inc
18-
include disable-X11.inc
18+
include disable-x11.inc
1919
include disable-xdg.inc
2020

2121
whitelist ${DOWNLOADS}

etc/profile-a-l/gist.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include disable-devel.inc
1919
include disable-exec.inc
2020
include disable-interpreters.inc
2121
include disable-programs.inc
22-
include disable-X11.inc
22+
include disable-x11.inc
2323
include disable-xdg.inc
2424

2525
mkdir ${HOME}/.gist

etc/profile-a-l/git.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ blacklist ${RUNUSER}/wayland-*
3333
include disable-common.inc
3434
include disable-exec.inc
3535
include disable-programs.inc
36-
include disable-X11.inc
36+
include disable-x11.inc
3737

3838
whitelist /usr/share/git
3939
whitelist /usr/share/git-core

etc/profile-a-l/gnome-keyring-daemon.profile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ include disable-devel.inc
1414
include disable-exec.inc
1515
include disable-interpreters.inc
1616
include disable-programs.inc
17-
#include disable-X11.inc # x11 none
18-
include disable-X11.inc
17+
#include disable-x11.inc # x11 none
18+
include disable-x11.inc
1919
include disable-xdg.inc
2020

2121
whitelist ${RUNUSER}/gnupg

etc/profile-a-l/googler-common.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ include disable-exec.inc
2222
include disable-interpreters.inc
2323
include disable-programs.inc
2424
include disable-shell.inc
25-
include disable-X11.inc
25+
include disable-x11.inc
2626
include disable-xdg.inc
2727

2828
whitelist ${HOME}/.w3m

etc/profile-a-l/gpg-agent.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include disable-common.inc
1515
include disable-devel.inc
1616
include disable-interpreters.inc
1717
include disable-programs.inc
18-
include disable-X11.inc
18+
include disable-x11.inc
1919
include disable-xdg.inc
2020

2121
mkdir ${HOME}/.gnupg

etc/profile-a-l/gpg.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include disable-common.inc
1515
include disable-devel.inc
1616
include disable-interpreters.inc
1717
include disable-programs.inc
18-
include disable-X11.inc
18+
include disable-x11.inc
1919

2020
whitelist ${RUNUSER}/gnupg
2121
whitelist ${RUNUSER}/keyring

etc/profile-a-l/links-common.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ include disable-interpreters.inc
1313
# Additional noblacklist files/directories (blacklisted in disable-programs.inc)
1414
# used as associated programs can be added in your links-common.local.
1515
include disable-programs.inc
16-
include disable-X11.inc
16+
include disable-x11.inc
1717
include disable-xdg.inc
1818

1919
whitelist ${DOWNLOADS}

etc/profile-a-l/lynx.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ include disable-common.inc
1313
include disable-devel.inc
1414
include disable-interpreters.inc
1515
include disable-programs.inc
16-
include disable-X11.inc
16+
include disable-x11.inc
1717
include disable-xdg.inc
1818

1919
include whitelist-runuser-common.inc

etc/profile-m-z/makepkg.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ noblacklist /var/lib/pacman
3232
include disable-common.inc
3333
include disable-exec.inc
3434
include disable-programs.inc
35-
include disable-X11.inc
35+
include disable-x11.inc
3636

3737
caps.drop all
3838
ipc-namespace

etc/profile-m-z/mimetype.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ blacklist ${RUNUSER}/wayland-*
1111

1212
include disable-exec.inc
1313
include disable-proc.inc
14-
include disable-X11.inc
14+
include disable-x11.inc
1515

1616
apparmor
1717
caps.drop all

etc/profile-m-z/mocp.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ include disable-exec.inc
1818
include disable-interpreters.inc
1919
include disable-proc.inc
2020
include disable-programs.inc
21-
include disable-X11.inc
21+
include disable-x11.inc
2222
include disable-xdg.inc
2323

2424
mkdir ${HOME}/.moc

etc/profile-m-z/mutt.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ include disable-devel.inc
5050
include disable-exec.inc
5151
include disable-interpreters.inc
5252
include disable-programs.inc
53-
include disable-X11.inc
53+
include disable-x11.inc
5454
include disable-xdg.inc
5555

5656
mkdir ${HOME}/.Mail

etc/profile-m-z/neomutt.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ include disable-devel.inc
4848
include disable-exec.inc
4949
include disable-interpreters.inc
5050
include disable-programs.inc
51-
include disable-X11.inc
51+
include disable-x11.inc
5252
include disable-xdg.inc
5353

5454
mkdir ${HOME}/.Mail

etc/profile-m-z/nodejs-common.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ include disable-common.inc
3939
include disable-exec.inc
4040
include disable-programs.inc
4141
include disable-shell.inc
42-
include disable-X11.inc
42+
include disable-x11.inc
4343
include disable-xdg.inc
4444

4545
# If you want whitelisting, change ${HOME}/Projects below to your node projects directory

etc/profile-m-z/nslookup.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ include disable-devel.inc
1616
include disable-exec.inc
1717
include disable-interpreters.inc
1818
include disable-programs.inc
19-
include disable-X11.inc
19+
include disable-x11.inc
2020
include disable-xdg.inc
2121

2222
whitelist ${HOME}/.nslookuprc

etc/profile-m-z/ping.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include disable-exec.inc
1515
include disable-interpreters.inc
1616
include disable-proc.inc
1717
include disable-programs.inc
18-
include disable-X11.inc
18+
include disable-x11.inc
1919
include disable-xdg.inc
2020

2121
#include whitelist-common.inc # see #903

etc/profile-m-z/qpdf.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ include disable-interpreters.inc
1818
include disable-proc.inc
1919
include disable-programs.inc
2020
include disable-shell.inc
21-
include disable-X11.inc
21+
include disable-x11.inc
2222
include disable-xdg.inc
2323

2424
whitelist ${DOCUMENTS}

etc/profile-m-z/rsync-download_only.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include disable-exec.inc
1919
include disable-interpreters.inc
2020
include disable-programs.inc
2121
include disable-shell.inc
22-
include disable-X11.inc
22+
include disable-x11.inc
2323
include disable-xdg.inc
2424

2525
# Add the next line to your rsync-download_only.local to enable extra hardening.

0 commit comments

Comments
 (0)