diff --git a/apparmor.vim b/apparmor.vim index fa5c501..f8bfdbe 100644 --- a/apparmor.vim +++ b/apparmor.vim @@ -188,6 +188,8 @@ syn match sdEntryPXe /\v^\s*(audit\s+)?(deny\s+)?(owner\s+)?(\/|\@\{\S*\})\S*\s syn match sdEntryIX /\v^\s*(audit\s+)?(deny\s+)?(owner\s+)?(\/|\@\{\S*\})\S*\s+(r|m|k|ix)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude " mr - mmap with PROT_EXEC syn match sdEntryM /\v^\s*(audit\s+)?(deny\s+)?(owner\s+)?(\/|\@\{\S*\})\S*\s+(r|m|k)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude +" special case: deny x is allowed (doesn't need to be ix, px, ux or cx) +syn match sdEntryM /\v^\s*(audit\s+)?deny\s+(owner\s+)?(\/|\@\{\S*\})\S*\s+(r|m|k|x)+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude " if we've got u or i without x, it's an error " rule is superfluous because of the '/.*/ is an error' rule ;-) diff --git a/vim.changes b/vim.changes index cfe6d42..af44384 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 16 17:53:21 UTC 2011 - opensuse@cboltz.de + +- apparmor.vim update + - support "deny $filename x" rules + - apparmor.vim generated from AppArmor 2.7 beta2 + ------------------------------------------------------------------- Wed Aug 31 09:22:53 UTC 2011 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 12185c9..5cb92b2 100644 --- a/vim.spec +++ b/vim.spec @@ -130,7 +130,6 @@ environment install additionally vim-data. %package data - Summary: Vi IMproved Group: Productivity/Editors/Vi PreReq: %{vim_prereq} @@ -154,7 +153,6 @@ Package vim-data contains the runtime files. %package base - Summary: Vi IMproved Group: Productivity/Editors/Vi PreReq: %{vim_prereq} @@ -179,7 +177,6 @@ want to install the vim-data package. %package enhanced - Summary: A version of the VIM editor which includes recent enhancements Group: Productivity/Editors/Vi PreReq: %{vim_prereq} @@ -204,7 +201,6 @@ graphical features of vim, you might want to install package gvim too. %package -n gvim-base - Summary: dummy package for a subpackage only build in the buildservice Group: Productivity/Editors/Vi PreReq: %{vim_prereq} @@ -216,7 +212,6 @@ dummy package for a subpackage only build in the buildservice %package -n gvim-enhanced - Summary: dummy package for a subpackage only build in the buildservice Group: Productivity/Editors/Vi PreReq: %{gvim_prereq} @@ -232,7 +227,6 @@ dummy package for a subpackage only build in the buildservice %package -n gvim - Summary: A GUI for Vi Group: Productivity/Editors/Vi PreReq: %{gvim_prereq}