[apparmor] [patch] ~/.kde/ vs. ~/.kde4/ in abstractions

[Steve Beattie]

On Mon, Jan 16, 2012 at 06:31:22PM +0100, Christian Boltz wrote:
> Update abstractios for KDE4
> 
> (At least) openSUSE uses ~/.kde4 to store KDE4 settings.
> This patch changes ~/.kde/ to ~/.kde{,4} in all abstractions.

This also appears to be true in Ubuntu.

> The patch is mostly from Velery Valery, I only fixed a merge conflict 
> and added the kmail{,2} part in private-files-strict.
> 
> References: https://bugzilla.novell.com/show_bug.cgi?id=741592
> 
> I also nominate this patch for 2.7.1

Acked-By: Steve Beattie <sbeattie at ubuntu.com> for both trunk and 2.7.

Thanks!

> === modified file 'profiles/apparmor.d/abstractions/kde'
> --- profiles/apparmor.d/abstractions/kde	2011-03-23 19:24:11 +0000
> +++ profiles/apparmor.d/abstractions/kde	2012-01-16 17:19:02 +0000
> @@ -25,8 +25,8 @@
>  @{HOME}/.DCOPserver_* r,
>  @{HOME}/.ICEauthority r,
>  @{HOME}/.fonts.* lrw,
> -@{HOME}/.kde/share/config/kdeglobals rw,
> -@{HOME}/.kde/share/config/*.lock rwl,
> +@{HOME}/.kde{,4}/share/config/kdeglobals rw,
> +@{HOME}/.kde{,4}/share/config/*.lock rwl,
>  @{HOME}/.qt/** rw,
>  @{HOME}/.config/Trolltech.conf rwk,
>  
> 
> === modified file 'profiles/apparmor.d/abstractions/private-files'
> --- profiles/apparmor.d/abstractions/private-files	2012-01-10 10:54:12 +0000
> +++ profiles/apparmor.d/abstractions/private-files	2012-01-16 17:23:19 +0000
> @@ -15,8 +15,8 @@
>    # special attention to (potentially) executable files
>    audit deny @{HOME}/bin/** wl,
>    audit deny @{HOME}/.config/autostart/** wl,
> -  audit deny @{HOME}/.kde/Autostart/** wl,
> -  audit deny @{HOME}/.kde/env/** wl,
> +  audit deny @{HOME}/.kde{,4}/Autostart/** wl,
> +  audit deny @{HOME}/.kde{,4}/env/** wl,
>    audit deny @{HOME}/.pki/nssdb/*.so{,.[0-9]*} wl,
>  
>    # don't allow reading/updating of run control files
> 
> === modified file 'profiles/apparmor.d/abstractions/private-files-strict'
> --- profiles/apparmor.d/abstractions/private-files-strict	2012-01-06 16:29:32 +0000
> +++ profiles/apparmor.d/abstractions/private-files-strict	2012-01-16 17:24:41 +0000
> @@ -13,6 +13,6 @@
>    audit deny @{HOME}/.{,mozilla-}thunderbird/** mrwkl,
>    audit deny @{HOME}/.evolution/** mrwkl,
>    audit deny @{HOME}/.config/evolution/** mrwkl,
> -  audit deny @{HOME}/.kde/share/apps/kmail/** mrwkl,
> -  audit deny @{HOME}/.kde/share/apps/kwallet/** mrwkl,
> +  audit deny @{HOME}/.kde{,4}/share/apps/kmail{,2}/** mrwkl,
> +  audit deny @{HOME}/.kde{,4}/share/apps/kwallet/** mrwkl,
>  
> 
> === modified file 'profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files'
> --- profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files	2011-04-19 11:03:35 +0000
> +++ profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files	2012-01-16 17:19:03 +0000
> @@ -11,7 +11,7 @@
>    #include <abstractions/private-files>
>    audit deny @{HOME}/.ssh/** mrwkl,
>    audit deny @{HOME}/.gnome2_private/** mrwkl,
> -  audit deny @{HOME}/.kde/share/apps/kwallet/** mrwkl,
> +  audit deny @{HOME}/.kde{,4}/share/apps/kwallet/** mrwkl,
>  
>    # Comment this out if using gpg plugin/addons
>    audit deny @{HOME}/.gnupg/** mrwkl,
> 

> -- 
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor


-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20120117/a4c58b7d/attachment.pgp>