diff --git a/autotests/reference/usr.bin.apparmor-profile-test.ref b/autotests/reference/usr.bin.apparmor-profile-test.ref --- a/autotests/reference/usr.bin.apparmor-profile-test.ref +++ b/autotests/reference/usr.bin.apparmor-profile-test.ref @@ -21,16 +21,16 @@
/{,**/} r,# Read only directories

- owner /{home,media,mnt,srv,net}/** r,
- owner @{USER_DIR}/** rw,
- audit deny owner /**/* mx,
+ owner /{home,media,mnt,srv,net}/** r,
+ owner @{USER_DIR}/** rw,
+ audit deny owner /**/* mx,
/**.[tT][xX][tT] r, # txt

- owner file @{HOME}/.local/share/foo/{,**} rwkl,
- owner @{HOME}/.config/foo/{,**} rwk,
- owner @{HOME}/.config/* rw,
- owner @{HOME}/.config/*.[a-zA-Z0-9]* rwk,
- owner @{HOME}/.cache/foo/{,**} rwk,
+ owner file @{HOME}/.local/share/foo/{,**} rwkl,
+ owner @{HOME}/.config/foo/{,**} rwk,
+ owner @{HOME}/.config/* rw,
+ owner @{HOME}/.config/*.[a-zA-Z0-9]* rwk,
+ owner @{HOME}/.cache/foo/{,**} rwk,

"/usr/share/**" r,
"/var/lib/flatpak/exports/share/**" r,
@@ -44,7 +44,7 @@ deny /etc/xdg/{autostart,systemd}/** r,
deny /boot/** rwlkmx,

- owner @{PROC}/@{pid}/{cmdline,mountinfo,mounts,stat,status,vmstat} r,
+ owner @{PROC}/@{pid}/{cmdline,mountinfo,mounts,stat,status,vmstat} r,
/sys/devices/**/uevent r,

/usr/bin/foo ixr,
diff --git a/data/syntax/apparmor.xml b/data/syntax/apparmor.xml --- a/data/syntax/apparmor.xml +++ b/data/syntax/apparmor.xml @@ -37,6 +37,8 @@ http://manpages.ubuntu.com/manpages/artful/en/man5/apparmor.d.5.html Change log: + * Version 5 [31-Jan-2018, by Nibaldo González]: + - Fix 'itemDatas' and end-of-rules keywords. * Version 4 [25-Jan-2018, by Nibaldo González]: (AppArmor 2.12.0) - New keywords: network and mount rules, default abstractions, variables and others. - Improvements in the highlighting of Include rules, variables, rlimit rules, @@ -53,7 +55,7 @@ --> - + @@ -1166,28 +1168,27 @@ - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + - - + + @@ -1306,46 +1307,49 @@ - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + + - - - - - + + + + + +