aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-03-03 07:43:14 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-03-03 10:10:39 -0300
commit908e5a1a437bb7907f78fac8cfecdfa92e26bad0 (patch)
tree98a64c43953f14b3ce8e88c4a5067d004b091444
parentRELNOTES: add feature and build items (diff)
downloadfirejail-908e5a1a437bb7907f78fac8cfecdfa92e26bad0.tar.gz
firejail-908e5a1a437bb7907f78fac8cfecdfa92e26bad0.tar.zst
firejail-908e5a1a437bb7907f78fac8cfecdfa92e26bad0.zip
build: sort.py: filter empty and duplicate items
Note: This seems to already be done for `protocol` lines. Before: $ ./contrib/sort.py test.profile sort.py: checking 1 profile(s)... test.profile:1:-private-etc ,,bar,,foo,,bar,,, test.profile:1:+private-etc ,,,,,,,bar,bar,foo test.profile:2:-protocol ,,unix,,bluetooth,,unix,,inet,,, test.profile:2:+protocol unix,inet,bluetooth [ Fixed ] test.profile After: $ ./contrib/sort.py test.profile sort.py: checking 1 profile(s)... test.profile:1:-private-etc ,,bar,,foo,,bar,,, test.profile:1:+private-etc bar,foo test.profile:2:-protocol ,,unix,,bluetooth,,unix,,inet,,, test.profile:2:+protocol unix,inet,bluetooth [ Fixed ] test.profile
-rwxr-xr-xcontrib/sort.py3
-rw-r--r--etc/profile-a-l/dnscrypt-proxy.profile2
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/sort.py b/contrib/sort.py
index b70f83e6c..7a4f57da4 100755
--- a/contrib/sort.py
+++ b/contrib/sort.py
@@ -38,7 +38,8 @@ Exit Codes:
38 38
39def sort_alphabetical(original_items): 39def sort_alphabetical(original_items):
40 items = original_items.split(",") 40 items = original_items.split(",")
41 items.sort() 41 items = filter(None, set(items))
42 items = sorted(items)
42 return ",".join(items) 43 return ",".join(items)
43 44
44 45
diff --git a/etc/profile-a-l/dnscrypt-proxy.profile b/etc/profile-a-l/dnscrypt-proxy.profile
index 0d52805b7..50b56fb2d 100644
--- a/etc/profile-a-l/dnscrypt-proxy.profile
+++ b/etc/profile-a-l/dnscrypt-proxy.profile
@@ -38,7 +38,7 @@ notv
38nou2f 38nou2f
39novideo 39novideo
40protocol inet,inet6 40protocol inet,inet6
41seccomp.drop _sysctl,acct,add_key,adjtimex,clock_adjtime,delete_module,fanotify_init,finit_module,get_mempolicy,init_module,io_cancel,io_destroy,io_getevents,io_setup,io_submit,ioperm,iopl,kcmp,kexec_file_load,kexec_load,keyctl,lookup_dcookie,mbind,migrate_pages,modify_ldt,mount,move_pages,open_by_handle_at,perf_event_open,perf_event_open,pivot_root,process_vm_readv,process_vm_writev,ptrace,remap_file_pages,request_key,set_mempolicy,swapoff,swapon,sysfs,syslog,umount2,uselib,vmsplice 41seccomp.drop _sysctl,acct,add_key,adjtimex,clock_adjtime,delete_module,fanotify_init,finit_module,get_mempolicy,init_module,io_cancel,io_destroy,io_getevents,io_setup,io_submit,ioperm,iopl,kcmp,kexec_file_load,kexec_load,keyctl,lookup_dcookie,mbind,migrate_pages,modify_ldt,mount,move_pages,open_by_handle_at,perf_event_open,pivot_root,process_vm_readv,process_vm_writev,ptrace,remap_file_pages,request_key,set_mempolicy,swapoff,swapon,sysfs,syslog,umount2,uselib,vmsplice
42tracelog 42tracelog
43 43
44disable-mnt 44disable-mnt