Update abstractions to use new XDG_*_DIR values.
-- Jamie Strandboge http://www.ubuntu.com/
=== modified file 'profiles/apparmor.d/abstractions/user-download'
--- profiles/apparmor.d/abstractions/user-download 2010-12-22 22:52:13 +0000
+++ profiles/apparmor.d/abstractions/user-download 2014-02-14 21:09:01 +0000
@@ -1,6 +1,7 @@
# ------------------------------------------------------------------
#
# Copyright (C) 2002-2006 Novell/SUSE
+# Copyright (C) 2014 Canonical Ltd.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of version 2 of the GNU General Public
@@ -15,7 +16,7 @@
owner @{HOME}/[dD]ownload{,s}/ r,
owner @{HOME}/[dD]ownload{,s}/** rwl,
owner @{HOME}/[a-zA-Z0-9]* rwl,
- owner @{HOME}/Desktop/ r,
- owner @{HOME}/Desktop/* rwl,
+ owner @{HOME}/@{XDG_DESKTOP_DIR}/ r,
+ owner @{HOME}/@{XDG_DESKTOP_DIR}/* rwl,
owner "@{HOME}/My Downloads/" r,
owner "@{HOME}/My Downloads/**" rwl,
=== modified file 'profiles/apparmor.d/abstractions/user-write'
--- profiles/apparmor.d/abstractions/user-write 2010-12-22 22:54:40 +0000
+++ profiles/apparmor.d/abstractions/user-write 2014-02-14 21:08:02 +0000
@@ -1,6 +1,7 @@
# ------------------------------------------------------------------
#
# Copyright (C) 2002-2006 Novell/SUSE
+# Copyright (C) 2014 Canonical Ltd.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of version 2 of the GNU General Public
@@ -9,12 +10,12 @@
# ------------------------------------------------------------------
# per-user write directories
- owner @{HOME}/ r,
- owner @{HOME}/Desktop/ r,
- owner @{HOME}/Documents/ r,
- owner @{HOME}/Public/ r,
- owner @{HOME}/[a-zA-Z0-9]*/ rw,
- owner @{HOME}/[a-zA-Z0-9]* rwl,
- owner @{HOME}/Desktop/** rwl,
- owner @{HOME}/Documents/** rwl,
- owner @{HOME}/Public/** rwl,
+ owner @{HOME}/ r,
+ owner @{HOME}/@{XDG_DESKTOP_DIR}/ r,
+ owner @{HOME}/@{XDG_DOCUMENTS_DIR}/ r,
+ owner @{HOME}/@{XDG_PUBLICSHARE_DIR}/ r,
+ owner @{HOME}/[a-zA-Z0-9]*/ rw,
+ owner @{HOME}/[a-zA-Z0-9]* rwl,
+ owner @{HOME}/@{XDG_DESKTOP_DIR}/** rwl,
+ owner @{HOME}/@{XDG_DOCUMENTS_DIR}/** rwl,
+ owner @{HOME}/@{XDG_PUBLICSHARE_DIR}/** rwl,
signature.asc
Description: OpenPGP digital signature
-- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
