diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-10-25 22:37:31 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-10-27 16:40:39 -0300 |
commit | 98e34c444bcf5f826aa7bea9a50acbb475b88f8c (patch) | |
tree | 2cd861e0fe923723c57ae3387d6b3d7a3894e3a4 /etc/profile-a-l/display.profile | |
parent | sort.py: fix missing/duplicated commands in usage (diff) | |
download | firejail-98e34c444bcf5f826aa7bea9a50acbb475b88f8c.tar.gz firejail-98e34c444bcf5f826aa7bea9a50acbb475b88f8c.tar.zst firejail-98e34c444bcf5f826aa7bea9a50acbb475b88f8c.zip |
build: sort.py: use case-sensitive sorting
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.
Diffstat (limited to 'etc/profile-a-l/display.profile')
-rw-r--r-- | etc/profile-a-l/display.profile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/profile-a-l/display.profile b/etc/profile-a-l/display.profile index 40e19dfc3..53ed90e9c 100644 --- a/etc/profile-a-l/display.profile +++ b/etc/profile-a-l/display.profile | |||
@@ -40,7 +40,7 @@ private-bin display,python* | |||
40 | private-dev | 40 | private-dev |
41 | # On Debian-based systems, display is a symlink in /etc/alternatives | 41 | # On Debian-based systems, display is a symlink in /etc/alternatives |
42 | private-etc ImageMagick-6,ImageMagick-7 | 42 | private-etc ImageMagick-6,ImageMagick-7 |
43 | private-lib gcc/*/*/libgcc_s.so.*,gcc/*/*/libgomp.so.*,ImageMagick*,libfreetype.so.*,libltdl.so.*,libMagickWand-*.so.*,libXext.so.* | 43 | private-lib ImageMagick*,gcc/*/*/libgcc_s.so.*,gcc/*/*/libgomp.so.*,libMagickWand-*.so.*,libXext.so.*,libfreetype.so.*,libltdl.so.* |
44 | private-tmp | 44 | private-tmp |
45 | 45 | ||
46 | dbus-user none | 46 | dbus-user none |