diff options
author | 2023-08-11 05:26:05 -0300 | |
---|---|---|
committer | 2023-09-08 04:57:37 -0300 | |
commit | c6d33375cc34e4e5e527ab43c219adfbc8848c62 (patch) | |
tree | 0ccf4359f9b8ab8a5c4e37bd042fbf19314f12a8 /etc/profile-a-l/kmail.profile | |
parent | profiles: fix some comments (diff) | |
download | firejail-c6d33375cc34e4e5e527ab43c219adfbc8848c62.tar.gz firejail-c6d33375cc34e4e5e527ab43c219adfbc8848c62.tar.zst firejail-c6d33375cc34e4e5e527ab43c219adfbc8848c62.zip |
profiles: fix commented code and eol comments
Main changes:
* Remove the space after `#` for commented code lines to distinguish
them from normal comments
* Use `#` instead of `-` for comments at the end of the line so that
commented code lines work after being uncommented
Commands used to search and replace:
arg0="$(cat contrib/syntax/lists/profile_commands_arg0.list |
LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')"
arg1="$(cat contrib/syntax/lists/profile_commands_arg1.list |
LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')"
git ls-files -z -- etc/inc etc/profile* | xargs -0 -I '{}' \
sh -c "printf '%s\n' \"\$(sed -E \
-e 's/^# ($arg0)( [#-]-? .*)?\$/#\\1\\2/' \
-e 's/^# ($arg1)( [^ ]*)?( [#-]-? .*)?\$/#\\1\\2\\3/' \
-e 's/^# (whitelist \\$)/#\\1/' \
-e 's/^(#[^ ].+) --? /\\1 # /' \
'{}')\" >'{}'"
Commands used to check for leftover entries:
arg0="$(cat contrib/syntax/lists/profile_commands_arg0.list |
LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')"
arg1="$(cat contrib/syntax/lists/profile_commands_arg1.list |
LC_ALL=C sort -u | tr '\n' '|' | sed -e 's/|$//' -e 's/\./\\./g')"
git grep -E "^# ($arg0|$arg1)( +|$)" -- etc/inc etc/profile*
See also commit 30f9ad908 ("build: improve comments in firecfg.config",
2023-08-05) / PR #5942.
Diffstat (limited to 'etc/profile-a-l/kmail.profile')
-rw-r--r-- | etc/profile-a-l/kmail.profile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/profile-a-l/kmail.profile b/etc/profile-a-l/kmail.profile index 9724f4963..20d2c01d6 100644 --- a/etc/profile-a-l/kmail.profile +++ b/etc/profile-a-l/kmail.profile | |||
@@ -41,7 +41,7 @@ include disable-programs.inc | |||
41 | include whitelist-run-common.inc | 41 | include whitelist-run-common.inc |
42 | include whitelist-var-common.inc | 42 | include whitelist-var-common.inc |
43 | 43 | ||
44 | # apparmor | 44 | #apparmor |
45 | caps.drop all | 45 | caps.drop all |
46 | netfilter | 46 | netfilter |
47 | nodvd | 47 | nodvd |
@@ -56,11 +56,11 @@ novideo | |||
56 | protocol unix,inet,inet6,netlink | 56 | protocol unix,inet,inet6,netlink |
57 | # we need to allow chroot, io_getevents, ioprio_set, io_setup, io_submit system calls | 57 | # we need to allow chroot, io_getevents, ioprio_set, io_setup, io_submit system calls |
58 | seccomp !chroot,!io_getevents,!io_setup,!io_submit,!ioprio_set | 58 | seccomp !chroot,!io_getevents,!io_setup,!io_submit,!ioprio_set |
59 | # tracelog | 59 | #tracelog |
60 | 60 | ||
61 | private-dev | 61 | private-dev |
62 | # private-tmp - interrupts connection to akonadi, breaks opening of email attachments | 62 | #private-tmp # interrupts connection to akonadi, breaks opening of email attachments |
63 | # writable-run-user is needed for signing and encrypting emails | 63 | # writable-run-user is needed for signing and encrypting emails |
64 | writable-run-user | 64 | writable-run-user |
65 | 65 | ||
66 | # restrict-namespaces | 66 | #restrict-namespaces |