build: sort.py: use case-sensitive sorting #6070
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 5d0822c ("private-etc: big profile changes", 2023-02-05)
replacing `X11` with `@x11` in `private-etc` lines and then commit
0f996ea ("private-etc: groups modified", 2023-02-05) removing
`Trolltech.conf` from `private-etc` lines and using case-sensitive
sorting in them.
Relates to netblue30#5610.
glitsj16
approved these changes
Oct 27, 2023
|
All in! |
kmk3
added a commit
to kmk3/firejail
that referenced
this pull request
Nov 25, 2023
It was disabled on commit df6ea88 ("merges, disable sort.py in profile checks temporarely, two more private-etc profiles", 2023-02-14). Currently all profiles are sorted and there are no ongoing `private-etc` changes, so it should be safe to re-enable. Note that the script is useful to catch sorting issues not only in `private-etc` but also in other commands, such as `seccomp`[1] [2]. This is a follow-up to netblue30#6070. Relates to netblue30#5610. [1] netblue30#6066 (comment) [2] netblue30#6067 (comment)
kmk3
added a commit
to kmk3/firejail
that referenced
this pull request
Nov 25, 2023
It was disabled on commit df6ea88 ("merges, disable sort.py in profile checks temporarely, two more private-etc profiles", 2023-02-14). Currently all profiles are sorted and there are no ongoing `private-etc` changes, so it should be safe to re-enable. Note that the script is useful to catch sorting issues not only in `private-etc` but also in other commands, such as `seccomp`[1] [2]. This is a follow-up to netblue30#6070. Relates to netblue30#5610. [1] netblue30#6066 (comment) [2] netblue30#6067 (comment)
Merged
kmk3
added a commit
to kmk3/firejail
that referenced
this pull request
Nov 26, 2023
It was disabled on commit df6ea88 ("merges, disable sort.py in profile checks temporarely, two more private-etc profiles", 2023-02-14). Currently all profiles are sorted and there are no ongoing `private-etc` changes, so it should be safe to re-enable. Note that the script is useful to catch sorting issues not only in `private-etc` but also in other commands, such as `seccomp`[1] [2]. This is a follow-up to netblue30#6070. Relates to netblue30#5610. [1] netblue30#6066 (comment) [2] netblue30#6067 (comment)
kmk3
added a commit
to kmk3/firejail
that referenced
this pull request
Mar 26, 2024
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 netblue30#4462 netblue30#4854 netblue30#6070 netblue30#6289.
This is a follow-up to netblue30#6286.
kmk3
added a commit
that referenced
this pull request
Mar 27, 2024
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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To match how things are sorted elsewhere, such as with
noblacklist/whitelistlines (vertically) in profiles and inci/check/profiles/sort-disable-programs.sh and src/etc-cleanup/main.c.
This makes the order in
private-etcalways be groups (@group), thenuppercase paths, then lowercase paths. Example from
etc/profile-m-z/softmaker-common.profile:
Note that this does not affect a significant amount of profiles; most
changes are in
private-bin/private-liblines and inprivate-etclines for newer profiles that do not use groups. This is partly due to
commit 5d0822c ("private-etc: big profile changes", 2023-02-05)
replacing
X11with@x11inprivate-etclines and then commit0f996ea ("private-etc: groups modified", 2023-02-05) removing
Trolltech.conffromprivate-etclines and using case-sensitivesorting in them.
Relates to #5610.