From 98e34c444bcf5f826aa7bea9a50acbb475b88f8c Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Wed, 25 Oct 2023 22:37:31 -0300 Subject: 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. --- etc/profile-m-z/postman.profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc/profile-m-z/postman.profile') diff --git a/etc/profile-m-z/postman.profile b/etc/profile-m-z/postman.profile index c8f00584d..a74b72695 100644 --- a/etc/profile-m-z/postman.profile +++ b/etc/profile-m-z/postman.profile @@ -17,7 +17,7 @@ include whitelist-run-common.inc protocol unix,inet,inet6,netlink -private-bin electron,electron[0-9],electron[0-9][0-9],locale,node,Postman,postman,sh +private-bin Postman,electron,electron[0-9],electron[0-9][0-9],locale,node,postman,sh private-etc alternatives,ca-certificates,crypto-policies,fonts,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,localtime,nsswitch.conf,pki,resolv.conf,ssl # private-opt breaks file-copy-limit, use a whitelist instead of draining RAM # https://github.com/netblue30/firejail/discussions/5307 -- cgit v1.2.3-70-g09d2