Allow guest session processes to signal and ptrace each other

diff --git a/data/apparmor/abstractions/lightdm b/data/apparmor/abstractions/lightdm
index d94edc3e74d9d4cde1884bf66bc3754ef9ca4e4c..b4af497da5031906e7c54b9fdcb0b5381f45d32c 100644 (file)
--- a/data/apparmor/abstractions/lightdm
+++ b/data/apparmor/abstractions/lightdm
@@ -71,6 +71,10 @@
 
   capability ipc_lock,
 
+  # allow processes in the guest session to signal and ptrace each other
+  signal peer=@{profile_name},
+  ptrace peer=@{profile_name},
+
   # silence warnings for stuff that we really don't want to grant
   deny capability dac_override,
   deny capability dac_read_search,

diff --git a/debian/changelog b/debian/changelog
index 12bd846728cdf3a0d8d94d974836d55dc7cc561d..9eabd6f12ddcd07acd3b0d9297fe9573ec1e4925 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lightdm (1.9.14-0ubuntu3) UNRELEASED; urgency=medium
+
+  * debian/patches/06_guest_signal_and_ptrace_aa_rules.patch: Dropped, the fix
+    is upstream
+
+ -- Tyler Hicks <tyhicks@canonical.com>  Mon, 07 Apr 2014 10:33:46 -0500
+
 lightdm (1.9.14-0ubuntu2) trusty; urgency=medium
 
   * debian/patches/06_guest_signal_and_ptrace_aa_rules.patch: Grant

diff --git a/debian/patches/06_guest_signal_and_ptrace_aa_rules.patch b/debian/patches/06_guest_signal_and_ptrace_aa_rules.patch
deleted file mode 100644 (file)
index e992c51..0000000
--- a/debian/patches/06_guest_signal_and_ptrace_aa_rules.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Allow guest session processes to signal and ptrace each other
-Author: Tyler Hicks <tyhicks@canonical.com>
-
-Index: lightdm-1.9.13/data/apparmor/abstractions/lightdm
-===================================================================
---- lightdm-1.9.13.orig/data/apparmor/abstractions/lightdm     2013-10-30 17:34:00.000000000 -0500
-+++ lightdm-1.9.13/data/apparmor/abstractions/lightdm  2014-04-02 13:47:09.651587353 -0500
-@@ -71,6 +71,10 @@
- 
-   capability ipc_lock,
- 
-+  # allow processes in the guest session to signal and ptrace each other
-+  signal peer=@{profile_name},
-+  ptrace peer=@{profile_name},
-+
-   # silence warnings for stuff that we really don't want to grant
-   deny capability dac_override,
-   deny capability dac_read_search,

diff --git a/debian/patches/series b/debian/patches/series
index cb3a047b2e1a1635bfce5ae589192876fa2ce3b4..ac58126382c3dff41fb87a5740afa94c44439e4f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 01_transition_ubuntu2d_ubuntu_desktop.patch
 04_language_handling.patch
 05_translate_guest_session_dialog.patch
-06_guest_signal_and_ptrace_aa_rules.patch
 07_guest_proc_pid_stat_aa_rule.patch