From 77f37e84eb75404c666a307880ce8eda2a5f44e8 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 19 Jan 2012 15:20:28 +0100 Subject: [PATCH] Update abstractios for KDE4 (At least) openSUSE uses ~/.kde4 to store KDE4 settings. This patch changes ~/.kde/ to ~/.kde{,4} in all abstractions. 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 Acked-By: Steve Beattie for both trunk and 2.7. --- profiles/apparmor.d/abstractions/kde | 4 ++-- profiles/apparmor.d/abstractions/private-files | 4 ++-- profiles/apparmor.d/abstractions/private-files-strict | 4 ++-- profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/profiles/apparmor.d/abstractions/kde b/profiles/apparmor.d/abstractions/kde index 1ecdeba1e..00119b350 100644 --- a/profiles/apparmor.d/abstractions/kde +++ b/profiles/apparmor.d/abstractions/kde @@ -26,8 +26,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, diff --git a/profiles/apparmor.d/abstractions/private-files b/profiles/apparmor.d/abstractions/private-files index fc2400667..8702c907b 100644 --- a/profiles/apparmor.d/abstractions/private-files +++ b/profiles/apparmor.d/abstractions/private-files @@ -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 diff --git a/profiles/apparmor.d/abstractions/private-files-strict b/profiles/apparmor.d/abstractions/private-files-strict index c813a8339..7e0f71f63 100644 --- a/profiles/apparmor.d/abstractions/private-files-strict +++ b/profiles/apparmor.d/abstractions/private-files-strict @@ -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, diff --git a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files index 823f94522..b9afde7a7 100644 --- a/profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files +++ b/profiles/apparmor.d/abstractions/ubuntu-browsers.d/user-files @@ -11,7 +11,7 @@ #include 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,