[PR #6286] [MERGED] profiles: replace x11 socket blacklist with disable-X11.inc #5930

New issue

Closed

opened 2026-05-05 10:47:33 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 10:47:33 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/6286
Author: @kmk3
Created: 3/23/2024
Status: ✅ Merged
Merged: 3/24/2024
Merged by: @kmk3

Base: master ← Head: x11-none-improvements

📝 Commits (2)

5ec7c22 sstmp.profile: sort disable includes
04efbb2 profiles: replace x11 socket blacklist with disable-X11.inc

📊 Changes

49 files changed (+51 additions, -50 deletions)

View changed files

📝 etc/profile-a-l/agetpkg.profile (+1 -1)
📝 etc/profile-a-l/alpine.profile (+1 -1)
📝 etc/profile-a-l/aria2c.profile (+1 -1)
📝 etc/profile-a-l/bpftop.profile (+1 -1)
📝 etc/profile-a-l/cloneit.profile (+1 -1)
📝 etc/profile-a-l/curl.profile (+1 -1)
📝 etc/profile-a-l/dbus-send.profile (+1 -1)
📝 etc/profile-a-l/deadlink.profile (+1 -1)
📝 etc/profile-a-l/dexios.profile (+1 -1)
📝 etc/profile-a-l/dig.profile (+1 -1)
📝 etc/profile-a-l/dnscrypt-proxy.profile (+1 -1)
📝 etc/profile-a-l/dnsmasq.profile (+1 -1)
📝 etc/profile-a-l/drill.profile (+1 -1)
📝 etc/profile-a-l/editorconfiger.profile (+1 -1)
📝 etc/profile-a-l/erd.profile (+1 -2)
📝 etc/profile-a-l/fdns.profile (+1 -1)
📝 etc/profile-a-l/gget.profile (+1 -1)
📝 etc/profile-a-l/gist.profile (+1 -1)
📝 etc/profile-a-l/git.profile (+1 -1)
📝 etc/profile-a-l/gnome-keyring-daemon.profile (+1 -1)

...and 29 more files

📄 Description

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 #5544.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/netblue30/firejail/pull/6286 **Author:** [@kmk3](https://github.com/kmk3) **Created:** 3/23/2024 **Status:** ✅ Merged **Merged:** 3/24/2024 **Merged by:** [@kmk3](https://github.com/kmk3) **Base:** `master` ← **Head:** `x11-none-improvements` --- ### 📝 Commits (2) - [`5ec7c22`](https://github.com/netblue30/firejail/commit/5ec7c2292cac3846b78e30027d615df58922439b) sstmp.profile: sort disable includes - [`04efbb2`](https://github.com/netblue30/firejail/commit/04efbb27631e2f4abb5f1c0a915612e8cc98397c) profiles: replace x11 socket blacklist with disable-X11.inc ### 📊 Changes **49 files changed** (+51 additions, -50 deletions) <details> <summary>View changed files</summary> 📝 `etc/profile-a-l/agetpkg.profile` (+1 -1) 📝 `etc/profile-a-l/alpine.profile` (+1 -1) 📝 `etc/profile-a-l/aria2c.profile` (+1 -1) 📝 `etc/profile-a-l/bpftop.profile` (+1 -1) 📝 `etc/profile-a-l/cloneit.profile` (+1 -1) 📝 `etc/profile-a-l/curl.profile` (+1 -1) 📝 `etc/profile-a-l/dbus-send.profile` (+1 -1) 📝 `etc/profile-a-l/deadlink.profile` (+1 -1) 📝 `etc/profile-a-l/dexios.profile` (+1 -1) 📝 `etc/profile-a-l/dig.profile` (+1 -1) 📝 `etc/profile-a-l/dnscrypt-proxy.profile` (+1 -1) 📝 `etc/profile-a-l/dnsmasq.profile` (+1 -1) 📝 `etc/profile-a-l/drill.profile` (+1 -1) 📝 `etc/profile-a-l/editorconfiger.profile` (+1 -1) 📝 `etc/profile-a-l/erd.profile` (+1 -2) 📝 `etc/profile-a-l/fdns.profile` (+1 -1) 📝 `etc/profile-a-l/gget.profile` (+1 -1) 📝 `etc/profile-a-l/gist.profile` (+1 -1) 📝 `etc/profile-a-l/git.profile` (+1 -1) 📝 `etc/profile-a-l/gnome-keyring-daemon.profile` (+1 -1) _...and 29 more files_ </details> ### 📄 Description 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 #5544. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

gitea-mirror

2026-05-05 10:47:33 -06:00

closed this issue
added the
pull-request
label

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/firejail#5930

No description provided.

Rows
Columns