diff --git a/apparmor.d/abstractions/thumbnails-cache-write b/apparmor.d/abstractions/thumbnails-cache-write index 172072e1f..e136d08de 100644 --- a/apparmor.d/abstractions/thumbnails-cache-write +++ b/apparmor.d/abstractions/thumbnails-cache-write @@ -7,7 +7,7 @@ owner @{HOME}/thumbnails/ rw, owner @{HOME}/thumbnails/{large,normal}/ rw, owner @{HOME}/thumbnails/{large,normal}/#[0-9]*[0-9] rw, - owner @{HOME}/thumbnails/{large,normal}/[a-f0-9]*.png rwl -> @{HOME}/.cache/thumbnails/{large,normal}/#[0-9]*[0-9], + owner @{HOME}/thumbnails/{large,normal}/[a-f0-9]*.png rwl -> @{user_cache_dirs}/thumbnails/{large,normal}/#[0-9]*[0-9], owner @{user_cache_dirs}/thumbnails/ rw, owner @{user_cache_dirs}/thumbnails/{large,normal}/ rw, diff --git a/apparmor.d/groups/apps/discord b/apparmor.d/groups/apps/discord index bd6a50e72..1c930fde6 100644 --- a/apparmor.d/groups/apps/discord +++ b/apparmor.d/groups/apps/discord @@ -10,7 +10,7 @@ include @{DISCORD_LIBDIR} += /usr/share/discord-ptb /opt/discord @{DISCORD_HOMEDIR} = @{user_config_dirs}/discord @{DISCORD_HOMEDIR} += @{user_config_dirs}/discordptb -@{DISCORD_CACHEDIR} = @{HOME}/.cache/discord +@{DISCORD_CACHEDIR} = @{user_cache_dirs}/discord @{exec_path} = @{DISCORD_LIBDIR}/Discord{,PTB} @{bin}/discord{,-ptb} profile discord @{exec_path} { diff --git a/apparmor.d/groups/freedesktop/xdg-desktop-portal-kde b/apparmor.d/groups/freedesktop/xdg-desktop-portal-kde index f695815b0..30cafbd2f 100644 --- a/apparmor.d/groups/freedesktop/xdg-desktop-portal-kde +++ b/apparmor.d/groups/freedesktop/xdg-desktop-portal-kde @@ -34,7 +34,7 @@ profile xdg-desktop-portal-kde @{exec_path} { /etc/xdg/kwinrc r, owner @{HOME}/.Xauthority r, - owner @{HOME}/.cache/*.kcache r, + owner @{user_cache_dirs}/*.kcache r, owner @{user_cache_dirs}/icon-cache.kcache rw, diff --git a/apparmor.d/profiles-a-f/anki b/apparmor.d/profiles-a-f/anki index 66a821bd9..32b085032 100644 --- a/apparmor.d/profiles-a-f/anki +++ b/apparmor.d/profiles-a-f/anki @@ -70,7 +70,7 @@ profile anki @{exec_path} { owner @{user_share_dirs}/Anki{,2}/** rwk, owner @{HOME}/ r, - owner @{HOME}/.cache/ rw, + owner @{user_cache_dirs}/ rw, # To remove the following error: # Error initializing NSS with a persistent database diff --git a/apparmor.d/profiles-a-f/fuseiso b/apparmor.d/profiles-a-f/fuseiso index fa121ff7c..66cbd6545 100644 --- a/apparmor.d/profiles-a-f/fuseiso +++ b/apparmor.d/profiles-a-f/fuseiso @@ -15,7 +15,7 @@ profile fuseiso @{exec_path} { # Be able to mount ISO images mount fstype=fuse.fuseiso -> @{HOME}/*/, mount fstype=fuse.fuseiso -> @{HOME}/*/*/, - mount fstype=fuse.fuseiso -> @{HOME}/.cache/**/, + mount fstype=fuse.fuseiso -> @{user_cache_dirs}/**/, @{exec_path} mr, @@ -24,7 +24,7 @@ profile fuseiso @{exec_path} { # Where to mount ISO files owner @{HOME}/*/ rw, owner @{HOME}/*/*/ rw, - owner @{HOME}/.cache/**/ r, + owner @{user_cache_dirs}/**/ r, owner @{HOME}/.mtab.fuseiso rwk, owner @{HOME}/.mtab.fuseiso.new rw, @@ -45,7 +45,7 @@ profile fuseiso @{exec_path} { mount fstype={fuse,fuse.fuseiso} -> @{HOME}/*/, mount fstype={fuse,fuse.fuseiso} -> @{HOME}/*/*/, - mount fstype={fuse,fuse.fuseiso} -> @{HOME}/.cache/**/, + mount fstype={fuse,fuse.fuseiso} -> @{user_cache_dirs}/**/, @{bin}/fusermount{,3} mr, diff --git a/apparmor.d/profiles-a-f/fusermount b/apparmor.d/profiles-a-f/fusermount index 55cfa6f51..19b14fe66 100644 --- a/apparmor.d/profiles-a-f/fusermount +++ b/apparmor.d/profiles-a-f/fusermount @@ -30,7 +30,7 @@ profile fusermount @{exec_path} { # Be able to mount ISO images mount fstype={fuse,fuse.*} -> @{HOME}/*/, mount fstype={fuse,fuse.*} -> @{HOME}/*/*/, - mount fstype={fuse,fuse.*} -> @{HOME}/.cache/**/, + mount fstype={fuse,fuse.*} -> @{user_cache_dirs}/**/, mount fstype={fuse,fuse.*} -> @{MOUNTS}/*/, mount fstype={fuse,fuse.*} -> @{MOUNTS}/*/*/, mount fstype={fuse,fuse.*} -> @{run}/user/@{uid}/*/, @@ -38,7 +38,7 @@ profile fusermount @{exec_path} { umount @{HOME}/*/, umount @{HOME}/*/*/, - umount @{HOME}/.cache/**/, + umount @{user_cache_dirs}/**/, umount @{MOUNTS}/*/, umount @{MOUNTS}/*/*/, umount /tmp/.mount_*/, diff --git a/apparmor.d/profiles-g-l/gajim b/apparmor.d/profiles-g-l/gajim index 1c36d11ba..503ce20de 100644 --- a/apparmor.d/profiles-g-l/gajim +++ b/apparmor.d/profiles-g-l/gajim @@ -72,8 +72,8 @@ profile gajim @{exec_path} { owner @{user_cache_dirs}/gajim/ rw, owner @{user_cache_dirs}/gajim/** rwk, - owner @{HOME}/.cache/farstream/ rw, - owner @{HOME}/.cache/farstream/codecs.audio.x86_64.cache{,.tmp*} rw, + owner @{user_cache_dirs}/farstream/ rw, + owner @{user_cache_dirs}/farstream/codecs.audio.x86_64.cache{,.tmp*} rw, owner @{PROC}/@{pid}/fd/ r, owner @{PROC}/@{pid}/mounts r, diff --git a/apparmor.d/profiles-g-l/jami-gnome b/apparmor.d/profiles-g-l/jami-gnome index ee2296042..60c8cf409 100644 --- a/apparmor.d/profiles-g-l/jami-gnome +++ b/apparmor.d/profiles-g-l/jami-gnome @@ -24,9 +24,9 @@ profile jami-gnome @{exec_path} { @{exec_path} mr, - owner @{HOME}/.cache/ rw, - owner @{HOME}/.cache/jami-gnome/ rw, - owner @{HOME}/.cache/jami-gnome/** rw, + owner @{user_cache_dirs}/ rw, + 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/, diff --git a/apparmor.d/profiles-g-l/jmtpfs b/apparmor.d/profiles-g-l/jmtpfs index bb3b0e295..3de4f8ea7 100644 --- a/apparmor.d/profiles-g-l/jmtpfs +++ b/apparmor.d/profiles-g-l/jmtpfs @@ -24,11 +24,11 @@ profile jmtpfs @{exec_path} { owner @{HOME}/*/ r, owner @{HOME}/*/*/ r, - owner @{HOME}/.cache/*/mtp{,-[0-9]*}/ rw, + owner @{user_cache_dirs}/*/mtp{,-[0-9]*}/ rw, mount fstype={fuse,fuse.jmtpfs} -> @{HOME}/*/, mount fstype={fuse,fuse.jmtpfs} -> @{HOME}/*/*/, - mount fstype={fuse,fuse.jmtpfs} -> @{HOME}/.cache/*/*/, + mount fstype={fuse,fuse.jmtpfs} -> @{user_cache_dirs}/*/*/, /etc/magic r, @@ -49,7 +49,7 @@ profile jmtpfs @{exec_path} { mount fstype={fuse,fuse.jmtpfs} -> @{HOME}/*/, mount fstype={fuse,fuse.jmtpfs} -> @{HOME}/*/*/, - mount fstype={fuse,fuse.jmtpfs} -> @{HOME}/.cache/*/*/, + mount fstype={fuse,fuse.jmtpfs} -> @{user_cache_dirs}/*/*/, /etc/fuse.conf r, diff --git a/apparmor.d/profiles-s-z/transmission-qt b/apparmor.d/profiles-s-z/transmission-qt index d9f2e6e54..08bd18de1 100644 --- a/apparmor.d/profiles-s-z/transmission-qt +++ b/apparmor.d/profiles-s-z/transmission-qt @@ -40,9 +40,9 @@ profile transmission-qt @{exec_path} { owner @{user_config_dirs}/transmission/ rw, owner @{user_config_dirs}/transmission/** rwk, - owner @{HOME}/.cache/ rw, - owner @{HOME}/.cache/transmission/ rw, - owner @{HOME}/.cache/transmission/** rwk, + owner @{user_cache_dirs}/ rw, + owner @{user_cache_dirs}/transmission/ rw, + owner @{user_cache_dirs}/transmission/** rwk, owner /tmp/tr_session_id_* rwk, diff --git a/apparmor.d/profiles-s-z/umount b/apparmor.d/profiles-s-z/umount index 12c8efd8c..25b23b6aa 100644 --- a/apparmor.d/profiles-s-z/umount +++ b/apparmor.d/profiles-s-z/umount @@ -34,7 +34,7 @@ profile umount @{exec_path} { @{HOME}/ r, @{HOME}/*/ r, @{HOME}/*/*/ r, - @{HOME}/.cache/*/*/ r, + @{user_cache_dirs}/*/*/ r, @{MOUNTS}/*/ r, @{MOUNTS}/*/*/ r, diff --git a/apparmor.d/profiles-s-z/yt-dlp b/apparmor.d/profiles-s-z/yt-dlp index 48b3337fb..2c5b6610d 100644 --- a/apparmor.d/profiles-s-z/yt-dlp +++ b/apparmor.d/profiles-s-z/yt-dlp @@ -37,9 +37,9 @@ profile yt-dlp @{exec_path} { owner @{user_music_dirs}/{,**} rwk, owner @{user_videos_dirs}/{,**} rwk, - owner @{HOME}/.cache/ rw, - owner @{HOME}/.cache/yt-dlp/ rw, - owner @{HOME}/.cache/yt-dlp/** rw, + owner @{user_cache_dirs}/ rw, + owner @{user_cache_dirs}/yt-dlp/ rw, + owner @{user_cache_dirs}/yt-dlp/** rw, owner @{PROC}/@{pid}/fd/ r,