[PR #6294] [MERGED] profiles: rename disable-X11.inc to disable-x11.inc #5940

Closed
opened 2026-05-05 10:47:44 -06:00 by gitea-mirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/6294
Author: @kmk3
Created: 3/26/2024
Status: Merged
Merged: 3/27/2024
Merged by: @kmk3

Base: masterHead: profiles-rename-dx11


📝 Commits (1)

  • 2f53e45 profiles: rename disable-X11.inc to disable-x11.inc

📊 Changes

62 files changed (+81 additions, -73 deletions)

View changed files

📝 etc/inc/disable-X11.inc (+4 -11)
etc/inc/disable-x11.inc (+15 -0)
📝 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/build-systems-common.profile (+1 -1)
📝 etc/profile-a-l/clac.profile (+1 -1)
📝 etc/profile-a-l/cloneit.profile (+1 -1)
📝 etc/profile-a-l/cointop.profile (+1 -1)
📝 etc/profile-a-l/curl.profile (+1 -1)
📝 etc/profile-a-l/daisy.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)

...and 42 more files

📄 Description

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.


🔄 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/6294 **Author:** [@kmk3](https://github.com/kmk3) **Created:** 3/26/2024 **Status:** ✅ Merged **Merged:** 3/27/2024 **Merged by:** [@kmk3](https://github.com/kmk3) **Base:** `master` ← **Head:** `profiles-rename-dx11` --- ### 📝 Commits (1) - [`2f53e45`](https://github.com/netblue30/firejail/commit/2f53e45de784ffbee91507f92924551f13f42b45) profiles: rename disable-X11.inc to disable-x11.inc ### 📊 Changes **62 files changed** (+81 additions, -73 deletions) <details> <summary>View changed files</summary> 📝 `etc/inc/disable-X11.inc` (+4 -11) ➕ `etc/inc/disable-x11.inc` (+15 -0) 📝 `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/build-systems-common.profile` (+1 -1) 📝 `etc/profile-a-l/clac.profile` (+1 -1) 📝 `etc/profile-a-l/cloneit.profile` (+1 -1) 📝 `etc/profile-a-l/cointop.profile` (+1 -1) 📝 `etc/profile-a-l/curl.profile` (+1 -1) 📝 `etc/profile-a-l/daisy.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) _...and 42 more files_ </details> ### 📄 Description 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. --- <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:44 -06:00
Sign in to join this conversation.
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#5940
No description provided.