From c6d33375cc34e4e5e527ab43c219adfbc8848c62 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Fri, 11 Aug 2023 05:26:05 -0300 Subject: 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. --- etc/profile-m-z/wireshark.profile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'etc/profile-m-z/wireshark.profile') diff --git a/etc/profile-m-z/wireshark.profile b/etc/profile-m-z/wireshark.profile index dedb78d11..7caac217f 100644 --- a/etc/profile-m-z/wireshark.profile +++ b/etc/profile-m-z/wireshark.profile @@ -25,14 +25,14 @@ include whitelist-usr-share-common.inc include whitelist-var-common.inc apparmor -# caps.drop all +#caps.drop all caps.keep dac_override,dac_read_search,net_admin,net_raw netfilter no3d -# nogroups - breaks network traffic capture for unprivileged users +#nogroups # breaks network traffic capture for unprivileged users noinput -# nonewprivs - breaks network traffic capture for unprivileged users -# noroot +#nonewprivs # breaks network traffic capture for unprivileged users +#noroot nodvd nosound notv @@ -43,12 +43,12 @@ novideo #seccomp tracelog -# private-bin wireshark +#private-bin wireshark private-cache # private-dev prevents (some) interfaces from being shown. # Add the below line to your wirehsark.local if you only want to inspect pcap files. #private-dev -# private-etc alternatives,ca-certificates,crypto-policies,fonts,group,hosts,machine-id,passwd,pki,resolv.conf,ssl +#private-etc alternatives,ca-certificates,crypto-policies,fonts,group,hosts,machine-id,passwd,pki,resolv.conf,ssl private-tmp dbus-user none -- cgit v1.2.3-70-g09d2