* debian/patches:

  - 02_fix-apparmor-profile edited, dropped parts unneeded anymore with more
    recent AppArmor.

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@8905 0c9b3bff-18ee-0310-b944-d1aa2700132f

diff --git a/debian/changelog b/debian/changelog
index 2c436c47e1bed7d1549261a3de3aacc27a3829e5..a49f517c8bdde7450164020b680bde9405e6b1ab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 lightdm (1.12.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * debian/patches:
+    - 02_fix-apparmor-profile edited, dropped parts unneeded anymore with more
+      recent AppArmor.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Tue, 10 Mar 2015 13:36:11 +0100
 

diff --git a/debian/patches/02_fix-apparmor-profile.patch b/debian/patches/02_fix-apparmor-profile.patch
index 8223f8c734f35d8fed6e9ae1fa3ee05925f38d03..acf7ca2d95586d739cf28eb8c5bb68596d0c8999 100644 (file)
--- a/debian/patches/02_fix-apparmor-profile.patch
+++ b/debian/patches/02_fix-apparmor-profile.patch
@@ -1,29 +1,3 @@
---- a/data/apparmor/abstractions/lightdm
-+++ b/data/apparmor/abstractions/lightdm
-@@ -11,7 +11,6 @@
-   #include <abstractions/cups-client>
-   #include <abstractions/dbus>
-   #include <abstractions/dbus-session>
--  #include <abstractions/dbus-accessibility>
-   #include <abstractions/nameservice>
-   #include <abstractions/wutmp>
-   /etc/compizconfig/config rw, # bug in compiz https://launchpad.net/bugs/697678
-@@ -74,10 +73,11 @@
-   capability ipc_lock,
- 
-   # allow processes in the guest session to signal and ptrace each other
--  signal peer=@{profile_name},
--  ptrace peer=@{profile_name},
--  # needed when logging out of the guest session
--  signal (receive) peer=unconfined,
-+  # this doesn't work with the current Debian apparmor
-+  #signal peer=@{profile_name},
-+  #ptrace peer=@{profile_name},
-+  ## needed when logging out of the guest session
-+  #signal (receive) peer=unconfined,
- 
-   # silence warnings for stuff that we really don't want to grant
-   deny capability dac_override,
 --- a/data/apparmor/abstractions/lightdm_chromium-browser
 +++ b/data/apparmor/abstractions/lightdm_chromium-browser
 @@ -8,6 +8,7 @@