diff --git a/apparmor.vim b/apparmor.vim index 48e76cd..6d335cf 100644 --- a/apparmor.vim +++ b/apparmor.vim @@ -116,7 +116,7 @@ syn match sdError /^.*$/ contains=sdComment "highlight all non-valid lines as er " TODO: make a separate pattern for variable definitions, then mark sdGlob as contained syn match sdGlob /\v\?|\*|\{.*,.*\}|[[^\]]\+\]|\@\{[a-zA-Z][a-zA-Z0-9_]*\}/ -syn match sdAlias /\v^alias\s+(\/|\@\{\S*\})\S*\s+-\>\s+(\/|\@\{\S*\})\S*\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob,sdComment +syn match sdAlias /\v^\s*alias\s+(\/|\@\{\S*\})\S*\s+-\>\s+(\/|\@\{\S*\})\S*\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob,sdComment " syn match sdComment /#.*/ @@ -189,6 +189,8 @@ syn match sdComment /\s*#.*$/ " NOTE: Comment highlighting still works without contains=sdComment. syn match sdInclude /\s*#include\s<\S*>/ " TODO: doesn't check until $ syn match sdInclude /\s*include\s<\S*>/ " TODO: doesn't check until $ +syn match sdInclude /\s*#include\sif\sexists\s<\S*>/ " TODO: doesn't check until $ +syn match sdInclude /\s*include\sif\sexists\s<\S*>/ " TODO: doesn't check until $ " basic profile block... " \s+ does not work in end=, therefore using \s\s* diff --git a/vim.changes b/vim.changes index c59bb5b..8521a72 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 21 15:16:53 UTC 2020 - Christian Boltz + +- apparmor.vim: update from latest AppArmor 2.13 branch: + - allow alias rules with leading whitespace + - allow 'include if exists' rules + ------------------------------------------------------------------- Thu May 14 15:20:08 UTC 2020 - Ludwig Nussel