[PR #6070] [MERGED] build: sort.py: use case-sensitive sorting #5815

New issue

Closed

opened 2026-05-05 10:45:25 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 10:45:25 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/6070
Author: @kmk3
Created: 10/27/2023
Status: ✅ Merged
Merged: 11/24/2023
Merged by: @netblue30

Base: master ← Head: sort-py-csort

📝 Commits (1)

98e34c4 build: sort.py: use case-sensitive sorting

📊 Changes

24 files changed (+24 additions, -24 deletions)

View changed files

📝 contrib/sort.py (+1 -1)
📝 etc/profile-a-l/ani-cli.profile (+1 -1)
📝 etc/profile-a-l/discord-canary.profile (+1 -1)
📝 etc/profile-a-l/discord-ptb.profile (+1 -1)
📝 etc/profile-a-l/discord.profile (+1 -1)
📝 etc/profile-a-l/display.profile (+1 -1)
📝 etc/profile-a-l/enpass.profile (+1 -1)
📝 etc/profile-a-l/fbreader.profile (+1 -1)
📝 etc/profile-a-l/fluffychat.profile (+1 -1)
📝 etc/profile-a-l/hugin.profile (+1 -1)
📝 etc/profile-a-l/lobster.profile (+1 -1)
📝 etc/profile-m-z/QMediathekView.profile (+1 -1)
📝 etc/profile-m-z/QOwnNotes.profile (+1 -1)
📝 etc/profile-m-z/Viber.profile (+1 -1)
📝 etc/profile-m-z/XMind.profile (+1 -1)
📝 etc/profile-m-z/mov-cli.profile (+1 -1)
📝 etc/profile-m-z/mutt.profile (+1 -1)
📝 etc/profile-m-z/natron.profile (+1 -1)
📝 etc/profile-m-z/neomutt.profile (+1 -1)
📝 etc/profile-m-z/postman.profile (+1 -1)

...and 4 more files

📄 Description

To match how things are sorted elsewhere, such as with noblacklist /
whitelist lines (vertically) in profiles and in
ci/check/profiles/sort-disable-programs.sh and src/etc-cleanup/main.c.

This makes the order in private-etc always be groups (@group), then
uppercase paths, then lowercase paths. Example from
etc/profile-m-z/softmaker-common.profile:

private-etc @tls-ca,SoftMaker,fstab

Note that this does not affect a significant amount of profiles; most
changes are in private-bin / private-lib lines and in private-etc
lines for newer profiles that do not use groups. This is partly due to
commit 5d0822c52 ("private-etc: big profile changes", 2023-02-05)
replacing X11 with @x11 in private-etc lines and then commit
0f996ea4d ("private-etc: groups modified", 2023-02-05) removing
Trolltech.conf from private-etc lines and using case-sensitive
sorting in them.

Relates to #5610.

_{🔄 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/6070 **Author:** [@kmk3](https://github.com/kmk3) **Created:** 10/27/2023 **Status:** ✅ Merged **Merged:** 11/24/2023 **Merged by:** [@netblue30](https://github.com/netblue30) **Base:** `master` ← **Head:** `sort-py-csort` --- ### 📝 Commits (1) - [`98e34c4`](https://github.com/netblue30/firejail/commit/98e34c444bcf5f826aa7bea9a50acbb475b88f8c) build: sort.py: use case-sensitive sorting ### 📊 Changes **24 files changed** (+24 additions, -24 deletions) <details> <summary>View changed files</summary> 📝 `contrib/sort.py` (+1 -1) 📝 `etc/profile-a-l/ani-cli.profile` (+1 -1) 📝 `etc/profile-a-l/discord-canary.profile` (+1 -1) 📝 `etc/profile-a-l/discord-ptb.profile` (+1 -1) 📝 `etc/profile-a-l/discord.profile` (+1 -1) 📝 `etc/profile-a-l/display.profile` (+1 -1) 📝 `etc/profile-a-l/enpass.profile` (+1 -1) 📝 `etc/profile-a-l/fbreader.profile` (+1 -1) 📝 `etc/profile-a-l/fluffychat.profile` (+1 -1) 📝 `etc/profile-a-l/hugin.profile` (+1 -1) 📝 `etc/profile-a-l/lobster.profile` (+1 -1) 📝 `etc/profile-m-z/QMediathekView.profile` (+1 -1) 📝 `etc/profile-m-z/QOwnNotes.profile` (+1 -1) 📝 `etc/profile-m-z/Viber.profile` (+1 -1) 📝 `etc/profile-m-z/XMind.profile` (+1 -1) 📝 `etc/profile-m-z/mov-cli.profile` (+1 -1) 📝 `etc/profile-m-z/mutt.profile` (+1 -1) 📝 `etc/profile-m-z/natron.profile` (+1 -1) 📝 `etc/profile-m-z/neomutt.profile` (+1 -1) 📝 `etc/profile-m-z/postman.profile` (+1 -1) _...and 4 more files_ </details> ### 📄 Description To match how things are sorted elsewhere, such as with `noblacklist` / `whitelist` lines (vertically) in profiles and in ci/check/profiles/sort-disable-programs.sh and src/etc-cleanup/main.c. This makes the order in `private-etc` always be groups (`@group`), then uppercase paths, then lowercase paths. Example from etc/profile-m-z/softmaker-common.profile: private-etc @tls-ca,SoftMaker,fstab Note that this does not affect a significant amount of profiles; most changes are in `private-bin` / `private-lib` lines and in `private-etc` lines for newer profiles that do not use groups. This is partly due to commit 5d0822c52 ("private-etc: big profile changes", 2023-02-05) replacing `X11` with `@x11` in `private-etc` lines and then commit 0f996ea4d ("private-etc: groups modified", 2023-02-05) removing `Trolltech.conf` from `private-etc` lines and using case-sensitive sorting in them. Relates to #5610. --- <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:45:25 -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#5815

No description provided.

Rows
Columns