* debian/patches:

  - really apply 02_fix-apparmor-profile, update it.  (really) closes:#736075

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

diff --git a/debian/changelog b/debian/changelog
index 3384bb805f5f810b770b6717fd6396a41c9a57ff..e5bd64ba4e7dc0d212165a72497dffd9beb3921e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 lightdm (1.10.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * debian/patches:
+    - really apply 02_fix-apparmor-profile, update it.  (really) closes:#736075
 
  -- Yves-Alexis Perez <corsac@debian.org>  Mon, 28 Apr 2014 23:24:23 +0200
 

diff --git a/debian/patches/02_fix-apparmor-profile.patch b/debian/patches/02_fix-apparmor-profile.patch
index b693661b487b8388ca5a21837215b358d31b4f57..83448712ea0f769f9f7435e679051bd45df7795e 100644 (file)
--- a/debian/patches/02_fix-apparmor-profile.patch
+++ b/debian/patches/02_fix-apparmor-profile.patch
@@ -8,3 +8,19 @@
    #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,

diff --git a/debian/patches/series b/debian/patches/series
index cf8297cbd9e9e0221a78d9bb5672abec1ff0451d..ea9e4a51d19dfe2b266bf3dd2b25fa454280467b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_set-default-path.patch
+02_fix-apparmor-profile.patch
 05_debianize-pam-files.patch
 06_allow_libpamsystemd_and_ck_together.patch