diff --git a/apparmor.d/groups/gnome/gnome-keyring-daemon b/apparmor.d/groups/gnome/gnome-keyring-daemon index c48004342..9cb2048d9 100644 --- a/apparmor.d/groups/gnome/gnome-keyring-daemon +++ b/apparmor.d/groups/gnome/gnome-keyring-daemon @@ -128,7 +128,7 @@ profile gnome-keyring-daemon @{exec_path} flags=(attach_disconnected) { owner @{HOME}/@{XDG_SSH_DIR}/{,**} r, owner @{HOME}/.local/ w, - owner @{HOME}/.local/share/ w, + owner @{user_share_dirs}/ w, owner @{HOME}/.xsession-errors w, owner @{run}/user/@{uid}/keyring/ rw, diff --git a/apparmor.d/profiles-a-f/dring b/apparmor.d/profiles-a-f/dring index 5afd82753..86504f4bc 100644 --- a/apparmor.d/profiles-a-f/dring +++ b/apparmor.d/profiles-a-f/dring @@ -22,7 +22,7 @@ profile dring @{exec_path} { owner @{user_config_dirs}/ring/ rw, owner @{user_config_dirs}/jami/dring.yml rw, owner @{user_config_dirs}/jami/dring.yml.bak w, - owner @{HOME}/.local/share/jami/ r, + owner @{user_share_dirs}/jami/ r, @{sys}/class/ r, @{sys}/bus/ r, diff --git a/apparmor.d/profiles-g-l/gajim b/apparmor.d/profiles-g-l/gajim index 503ce20de..971c6ca66 100644 --- a/apparmor.d/profiles-g-l/gajim +++ b/apparmor.d/profiles-g-l/gajim @@ -135,7 +135,7 @@ profile gajim @{exec_path} { owner @{HOME}/@{XDG_GPG_DIR}/** rwkl -> @{HOME}/@{XDG_GPG_DIR}/**, owner @{user_share_dirs}/gajim/openpgp/ rw, - owner @{user_share_dirs}/gajim/openpgp/** rwkl -> @{HOME}/.local/share/gajim/openpgp/**, + owner @{user_share_dirs}/gajim/openpgp/** rwkl -> @{user_share_dirs}/gajim/openpgp/**, # "Without owner @{PROC}/@{pid}/fd/ r, diff --git a/apparmor.d/profiles-g-l/jami-gnome b/apparmor.d/profiles-g-l/jami-gnome index 60c8cf409..1a4617ae3 100644 --- a/apparmor.d/profiles-g-l/jami-gnome +++ b/apparmor.d/profiles-g-l/jami-gnome @@ -28,15 +28,15 @@ profile jami-gnome @{exec_path} { owner @{user_cache_dirs}/jami-gnome/ rw, owner @{user_cache_dirs}/jami-gnome/** rw, - owner @{HOME}/.local/share/jami/ rw, - owner @{HOME}/.local/share/jami/** rwkl -> @{HOME}/.local/share/jami/, + owner @{user_share_dirs}/jami/ rw, + owner @{user_share_dirs}/jami/** rwkl -> @{user_share_dirs}/jami/, owner @{user_config_dirs}/autostart/jami-gnome.desktop w, - owner @{HOME}/.local/share/ r, - owner @{HOME}/.local/share/webkitgtk/deviceidhashsalts/1/ r, - owner @{HOME}/.local/share/webkitgtk/databases/indexeddb/v0 w, - owner @{HOME}/.local/share/webkitgtk/databases/indexeddb/v1/ w, + owner @{user_share_dirs}/ r, + owner @{user_share_dirs}/webkitgtk/deviceidhashsalts/1/ r, + owner @{user_share_dirs}/webkitgtk/databases/indexeddb/v0 w, + owner @{user_share_dirs}/webkitgtk/databases/indexeddb/v1/ w, @{lib}/@{multiarch}/webkit2gtk-4.0/WebKitNetworkProcess rix, @{lib}/@{multiarch}/webkit2gtk-4.0/WebKitWebProcess rix, diff --git a/dists/ubuntu/abstractions/trash b/dists/ubuntu/abstractions/trash index 3ca1198a6..4c1473d85 100644 --- a/dists/ubuntu/abstractions/trash +++ b/dists/ubuntu/abstractions/trash @@ -11,16 +11,16 @@ abi , owner @{run}/user/@{uid}/trash.so*.[0-9].slave-socket rwl -> @{run}/user/@{uid}/#[0-9]*[0-9], # Home trash location - owner @{HOME}/.local/share/Trash/ rw, - owner @{HOME}/.local/share/Trash/#[0-9]*[0-9] rw, - owner @{HOME}/.local/share/Trash/directorysizes{,.*} rwl -> @{HOME}/.local/share/Trash/#[0-9]*[0-9], - owner @{HOME}/.local/share/Trash/files/{,**} rw, - owner @{HOME}/.local/share/Trash/info/ rw, - owner @{HOME}/.local/share/Trash/info/*.trashinfo{,.*} rw, - owner @{HOME}/.local/share/Trash/expunged/ rw, - owner @{HOME}/.local/share/Trash/expunged/[0-9]* rw, - owner @{HOME}/.local/share/Trash/expunged/[0-9]*/ rw, - owner @{HOME}/.local/share/Trash/expunged/[0-9]*/** rw, + owner @{user_share_dirs}/Trash/ rw, + owner @{user_share_dirs}/Trash/#[0-9]*[0-9] rw, + owner @{user_share_dirs}/Trash/directorysizes{,.*} rwl -> @{user_share_dirs}/Trash/#[0-9]*[0-9], + owner @{user_share_dirs}/Trash/files/{,**} rw, + owner @{user_share_dirs}/Trash/info/ rw, + owner @{user_share_dirs}/Trash/info/*.trashinfo{,.*} rw, + owner @{user_share_dirs}/Trash/expunged/ rw, + owner @{user_share_dirs}/Trash/expunged/[0-9]* rw, + owner @{user_share_dirs}/Trash/expunged/[0-9]*/ rw, + owner @{user_share_dirs}/Trash/expunged/[0-9]*/** rw, # Partitions' trash location when the admin creates the .Trash/ folder in the top lvl dir owner /media/*/.Trash/ rw,