aboutsummaryrefslogtreecommitdiffstats
path: root/etc/profile-a-l/git.profile
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-03-22 13:44:53 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-03-24 03:42:59 -0300
commit04efbb27631e2f4abb5f1c0a915612e8cc98397c (patch)
tree3b0c5d360a796880024a1c14e251522fb36ea5d7 /etc/profile-a-l/git.profile
parentsstmp.profile: sort disable includes (diff)
downloadfirejail-04efbb27631e2f4abb5f1c0a915612e8cc98397c.tar.gz
firejail-04efbb27631e2f4abb5f1c0a915612e8cc98397c.tar.zst
firejail-04efbb27631e2f4abb5f1c0a915612e8cc98397c.zip
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.
Diffstat (limited to 'etc/profile-a-l/git.profile')
-rw-r--r--etc/profile-a-l/git.profile2
1 files changed, 1 insertions, 1 deletions
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
28# Allow ssh (blacklisted by disable-common.inc) 28# Allow ssh (blacklisted by disable-common.inc)
29include allow-ssh.inc 29include allow-ssh.inc
30 30
31blacklist /tmp/.X11-unix
32blacklist ${RUNUSER}/wayland-* 31blacklist ${RUNUSER}/wayland-*
33 32
34include disable-common.inc 33include disable-common.inc
35include disable-exec.inc 34include disable-exec.inc
36include disable-programs.inc 35include disable-programs.inc
36include disable-X11.inc
37 37
38whitelist /usr/share/git 38whitelist /usr/share/git
39whitelist /usr/share/git-core 39whitelist /usr/share/git-core