Skip to content

Commit afc6762

Browse files
committed
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.
1 parent 5ec7c22 commit afc6762

Some content is hidden

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

48 files changed

+50
-49
lines changed

etc/profile-a-l/agetpkg.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ include agetpkg.local
77
# Persistent global definitions
88
include globals.local
99

10-
blacklist /tmp/.X11-unix
1110
blacklist ${RUNUSER}/wayland-*
1211

1312
# Allow python (blacklisted by disable-interpreters.inc)
@@ -20,6 +19,7 @@ include disable-exec.inc
2019
include disable-interpreters.inc
2120
include disable-programs.inc
2221
include disable-shell.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
@@ -30,7 +30,6 @@ noblacklist ${HOME}/.pinercex
3030
noblacklist ${HOME}/.signature
3131
noblacklist ${HOME}/mail
3232

33-
blacklist /tmp/.X11-unix
3433
blacklist ${RUNUSER}/wayland-*
3534

3635
include disable-common.inc
@@ -39,6 +38,7 @@ include disable-exec.inc
3938
include disable-interpreters.inc
4039
include disable-programs.inc
4140
include disable-shell.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
@@ -11,14 +11,14 @@ noblacklist ${HOME}/.cache/winetricks # XXX: See #5238
1111
noblacklist ${HOME}/.config/aria2
1212
noblacklist ${HOME}/.netrc
1313

14-
blacklist /tmp/.X11-unix
1514
blacklist ${RUNUSER}/wayland-*
1615

1716
include disable-common.inc
1817
include disable-devel.inc
1918
include disable-exec.inc
2019
include disable-interpreters.inc
2120
include disable-programs.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
@@ -7,7 +7,6 @@ include bpftop.local
77
# Persistent global definitions
88
include globals.local
99

10-
blacklist /tmp/.X11-unix
1110
blacklist /usr/libexec
1211
blacklist ${RUNUSER}
1312

@@ -18,6 +17,7 @@ include disable-interpreters.inc
1817
include disable-proc.inc
1918
include disable-programs.inc
2019
include disable-shell.inc
20+
include disable-X11.inc
2121
include disable-xdg.inc
2222

2323
include whitelist-common.inc

etc/profile-a-l/cloneit.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ include cloneit.local
77
# Persistent global definitions
88
include globals.local
99

10-
blacklist /tmp/.X11-unix
1110
blacklist /usr/libexec
1211
blacklist ${RUNUSER}
1312

@@ -18,6 +17,7 @@ include disable-interpreters.inc
1817
include disable-proc.inc
1918
include disable-programs.inc
2019
include disable-shell.inc
20+
include disable-X11.inc
2121
include disable-xdg.inc
2222

2323
include whitelist-run-common.inc

etc/profile-a-l/curl.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ noblacklist ${HOME}/.config/curlrc # since curl 7.73.0
1616
noblacklist ${HOME}/.curl-hsts
1717
noblacklist ${HOME}/.curlrc
1818

19-
blacklist /tmp/.X11-unix
2019
blacklist ${RUNUSER}
2120

2221
# If you use nvm, add the below lines to your curl.local
@@ -26,6 +25,7 @@ blacklist ${RUNUSER}
2625
include disable-common.inc
2726
include disable-exec.inc
2827
include disable-programs.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/dbus-send.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ include dbus-send.local
77
# Persistent global definitions
88
include globals.local
99

10-
blacklist /tmp/.X11-unix
1110
blacklist ${RUNUSER}/wayland-*
1211

1312
include disable-common.inc
@@ -17,6 +16,7 @@ include disable-interpreters.inc
1716
include disable-programs.inc
1817
include disable-shell.inc
1918
include disable-write-mnt.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
@@ -6,7 +6,6 @@ include deadlink.local
66
# Persistent global definitions
77
include globals.local
88

9-
blacklist /tmp/.X11-unix
109
blacklist /usr/libexec
1110
blacklist ${RUNUSER}
1211

@@ -23,6 +22,7 @@ include disable-interpreters.inc
2322
include disable-proc.inc
2423
include disable-programs.inc
2524
include disable-shell.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
@@ -7,7 +7,6 @@ include dexios.local
77
# Persistent global definitions
88
include globals.local
99

10-
blacklist /tmp/.X11-unix
1110
blacklist /usr/libexec
1211
blacklist ${RUNUSER}
1312

@@ -18,6 +17,7 @@ include disable-interpreters.inc
1817
include disable-proc.inc
1918
include disable-programs.inc
2019
include disable-shell.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
@@ -10,14 +10,14 @@ include globals.local
1010
noblacklist ${HOME}/.digrc
1111
noblacklist ${PATH}/dig
1212

13-
blacklist /tmp/.X11-unix
1413
blacklist ${RUNUSER}
1514

1615
include disable-common.inc
1716
#include disable-devel.inc
1817
include disable-exec.inc
1918
#include disable-interpreters.inc
2019
include disable-programs.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
@@ -7,7 +7,6 @@ include dnscrypt-proxy.local
77
# Persistent global definitions
88
include globals.local
99

10-
blacklist /tmp/.X11-unix
1110
blacklist ${RUNUSER}/wayland-*
1211

1312
noblacklist /sbin
@@ -18,6 +17,7 @@ include disable-devel.inc
1817
include disable-exec.inc
1918
include disable-interpreters.inc
2019
include disable-programs.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
@@ -11,13 +11,13 @@ noblacklist /sbin
1111
noblacklist /usr/sbin
1212
noblacklist /var/lib/libvirt
1313

14-
blacklist /tmp/.X11-unix
1514
blacklist ${RUNUSER}
1615

1716
include disable-common.inc
1817
include disable-devel.inc
1918
include disable-interpreters.inc
2019
include disable-programs.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
@@ -9,14 +9,14 @@ include globals.local
99

1010
noblacklist ${PATH}/drill
1111

12-
blacklist /tmp/.X11-unix
1312
blacklist ${RUNUSER}
1413

1514
include disable-common.inc
1615
#include disable-devel.inc
1716
include disable-exec.inc
1817
#include disable-interpreters.inc
1918
include disable-programs.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
@@ -6,7 +6,6 @@ include editorconfiger.local
66
# Persistent global definitions
77
include globals.local
88

9-
blacklist /tmp/.X11-unix
109
blacklist /usr/libexec
1110
blacklist ${RUNUSER}
1211

@@ -17,6 +16,7 @@ include disable-interpreters.inc
1716
include disable-proc.inc
1817
include disable-programs.inc
1918
include disable-shell.inc
19+
include disable-X11.inc
2020
include disable-xdg.inc
2121

2222
apparmor

etc/profile-a-l/erd.profile

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ include erd.local
77
# Persistent global definitions
88
include globals.local
99

10-
blacklist /tmp/.X11-unix
11-
1210
include disable-exec.inc
11+
#include disable-X11.inc # x11 none
1312

1413
apparmor
1514
caps.drop all

etc/profile-a-l/fdns.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ include globals.local
88
noblacklist /sbin
99
noblacklist /usr/sbin
1010

11-
blacklist /tmp/.X11-unix
1211
blacklist ${RUNUSER}/wayland-*
1312

1413
include disable-common.inc
1514
include disable-devel.inc
1615
include disable-exec.inc
1716
include disable-interpreters.inc
1817
include disable-programs.inc
18+
include disable-X11.inc
1919
include disable-xdg.inc
2020

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

etc/profile-a-l/gget.profile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ include gget.local
77
# Persistent global definitions
88
include globals.local
99

10-
blacklist /tmp/.X11-unix
1110
blacklist ${RUNUSER}
1211

1312
include disable-common.inc
@@ -16,6 +15,7 @@ include disable-exec.inc
1615
include disable-interpreters.inc
1716
include disable-programs.inc
1817
include disable-shell.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
@@ -7,7 +7,6 @@ include gist.local
77
# Persistent global definitions
88
include globals.local
99

10-
blacklist /tmp/.X11-unix
1110
blacklist ${RUNUSER}/wayland-*
1211

1312
noblacklist ${HOME}/.gist
@@ -20,6 +19,7 @@ include disable-devel.inc
2019
include disable-exec.inc
2120
include disable-interpreters.inc
2221
include disable-programs.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
@@ -28,12 +28,12 @@ ignore rmenv GITHUB_ENTERPRISE_TOKEN
2828
# Allow ssh (blacklisted by disable-common.inc)
2929
include allow-ssh.inc
3030

31-
blacklist /tmp/.X11-unix
3231
blacklist ${RUNUSER}/wayland-*
3332

3433
include disable-common.inc
3534
include disable-exec.inc
3635
include disable-programs.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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ include gnome-keyring-daemon.local
77
# Persistent global definitions
88
include globals.local
99

10-
blacklist /tmp/.X11-unix
1110
blacklist ${RUNUSER}/wayland-*
1211

1312
include disable-common.inc
@@ -16,6 +15,7 @@ include disable-exec.inc
1615
include disable-interpreters.inc
1716
include disable-programs.inc
1817
#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
@@ -7,7 +7,6 @@ include googler-common.local
77
# added by caller profile
88
#include globals.local
99

10-
blacklist /tmp/.X11-unix
1110
blacklist ${RUNUSER}
1211

1312
noblacklist ${HOME}/.w3m
@@ -23,6 +22,7 @@ include disable-exec.inc
2322
include disable-interpreters.inc
2423
include disable-programs.inc
2524
include disable-shell.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
@@ -9,13 +9,13 @@ include globals.local
99

1010
noblacklist ${HOME}/.gnupg
1111

12-
blacklist /tmp/.X11-unix
1312
blacklist ${RUNUSER}/wayland-*
1413

1514
include disable-common.inc
1615
include disable-devel.inc
1716
include disable-interpreters.inc
1817
include disable-programs.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
@@ -9,13 +9,13 @@ include globals.local
99

1010
noblacklist ${HOME}/.gnupg
1111

12-
blacklist /tmp/.X11-unix
1312
blacklist ${RUNUSER}/wayland-*
1413

1514
include disable-common.inc
1615
include disable-devel.inc
1716
include disable-interpreters.inc
1817
include disable-programs.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
@@ -4,7 +4,6 @@ include links-common.local
44

55
# common profile for links browsers
66

7-
blacklist /tmp/.X11-unix
87
blacklist ${RUNUSER}/wayland-*
98

109
include disable-common.inc
@@ -14,6 +13,7 @@ include disable-interpreters.inc
1413
# Additional noblacklist files/directories (blacklisted in disable-programs.inc)
1514
# used as associated programs can be added in your links-common.local.
1615
include disable-programs.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
@@ -7,13 +7,13 @@ include lynx.local
77
# Persistent global definitions
88
include globals.local
99

10-
blacklist /tmp/.X11-unix
1110
blacklist ${RUNUSER}/wayland-*
1211

1312
include disable-common.inc
1413
include disable-devel.inc
1514
include disable-interpreters.inc
1615
include disable-programs.inc
16+
include disable-X11.inc
1717
include disable-xdg.inc
1818

1919
include whitelist-runuser-common.inc

0 commit comments

Comments
 (0)