diff -Nru lightdm-1.9.14/configure.ac lightdm-1.10.0/configure.ac --- lightdm-1.9.14/configure.ac 2014-04-02 20:06:49.000000000 +0000 +++ lightdm-1.10.0/configure.ac 2014-04-08 04:00:27.000000000 +0000 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm, 1.9.14) +AC_INIT(lightdm, 1.10.0) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) diff -Nru lightdm-1.9.14/data/apparmor/abstractions/lightdm lightdm-1.10.0/data/apparmor/abstractions/lightdm --- lightdm-1.9.14/data/apparmor/abstractions/lightdm 2013-10-30 22:34:00.000000000 +0000 +++ lightdm-1.10.0/data/apparmor/abstractions/lightdm 2014-04-07 21:38:18.000000000 +0000 @@ -47,6 +47,8 @@ owner @{PROC}/** rm, # needed for gnome-keyring-daemon @{PROC}/*/status r, + # needed for bamfdaemon and utilities such as ps and killall + @{PROC}/*/stat r, /sbin/ r, /sbin/** rmixk, /sys/ r, @@ -71,6 +73,12 @@ 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, + # silence warnings for stuff that we really don't want to grant deny capability dac_override, deny capability dac_read_search, diff -Nru lightdm-1.9.14/debian/changelog lightdm-1.10.0/debian/changelog --- lightdm-1.9.14/debian/changelog 2014-04-08 04:41:13.000000000 +0000 +++ lightdm-1.10.0/debian/changelog 2014-04-08 04:13:03.000000000 +0000 @@ -1,3 +1,19 @@ +lightdm (1.10.0-0ubuntu1) trusty; urgency=medium + + * New upstream release: + - Fix return value for Vala bindings to Greeter.start_session_sync + - Fix logging when failing to find session + + -- Robert Ancell Tue, 08 Apr 2014 16:12:46 +1200 + +lightdm (1.9.15-0ubuntu1) trusty; urgency=medium + + * debian/patches/06_guest_signal_and_ptrace_aa_rules.patch, + debian/patches/07_guest_proc_pid_stat_aa_rule.patch: Dropped, the fixes + are upstream + + -- Tyler Hicks 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 -Nru lightdm-1.9.14/debian/patches/06_guest_signal_and_ptrace_aa_rules.patch lightdm-1.10.0/debian/patches/06_guest_signal_and_ptrace_aa_rules.patch --- lightdm-1.9.14/debian/patches/06_guest_signal_and_ptrace_aa_rules.patch 2014-04-08 04:41:13.000000000 +0000 +++ lightdm-1.10.0/debian/patches/06_guest_signal_and_ptrace_aa_rules.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: Allow guest session processes to signal and ptrace each other -Author: Tyler Hicks - -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 -Nru lightdm-1.9.14/debian/patches/07_guest_proc_pid_stat_aa_rule.patch lightdm-1.10.0/debian/patches/07_guest_proc_pid_stat_aa_rule.patch --- lightdm-1.9.14/debian/patches/07_guest_proc_pid_stat_aa_rule.patch 2014-04-08 04:41:13.000000000 +0000 +++ lightdm-1.10.0/debian/patches/07_guest_proc_pid_stat_aa_rule.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: Allow guest session processes to read /proc//stat -Author: Tyler Hicks - -Index: lightdm-1.9.13/data/apparmor/abstractions/lightdm -=================================================================== ---- lightdm-1.9.13.orig/data/apparmor/abstractions/lightdm 2014-04-02 16:43:27.946041262 -0500 -+++ lightdm-1.9.13/data/apparmor/abstractions/lightdm 2014-04-02 16:44:54.350039489 -0500 -@@ -47,6 +47,8 @@ - owner @{PROC}/** rm, - # needed for gnome-keyring-daemon - @{PROC}/*/status r, -+ # needed for bamfdaemon and utilities such as ps and killall -+ @{PROC}/*/stat r, - /sbin/ r, - /sbin/** rmixk, - /sys/ r, diff -Nru lightdm-1.9.14/debian/patches/series lightdm-1.10.0/debian/patches/series --- lightdm-1.9.14/debian/patches/series 2014-04-08 04:41:13.000000000 +0000 +++ lightdm-1.10.0/debian/patches/series 2014-02-05 10:21:22.000000000 +0000 @@ -1,5 +1,3 @@ 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 diff -Nru lightdm-1.9.14/liblightdm-gobject/liblightdm-gobject-1.vapi lightdm-1.10.0/liblightdm-gobject/liblightdm-gobject-1.vapi --- lightdm-1.9.14/liblightdm-gobject/liblightdm-gobject-1.vapi 2013-07-30 14:09:28.000000000 +0000 +++ lightdm-1.10.0/liblightdm-gobject/liblightdm-gobject-1.vapi 2014-04-08 01:08:46.000000000 +0000 @@ -47,7 +47,7 @@ public bool in_authentication { get; } public bool is_authenticated { get; } public unowned string? authentication_user { get; } - public void start_session_sync (string? session = null) throws GLib.Error; + public bool start_session_sync (string? session = null) throws GLib.Error; } [CCode (has_type_id = false)] public enum MessageType { diff -Nru lightdm-1.9.14/NEWS lightdm-1.10.0/NEWS --- lightdm-1.9.14/NEWS 2014-04-02 20:08:01.000000000 +0000 +++ lightdm-1.10.0/NEWS 2014-04-08 04:12:59.000000000 +0000 @@ -1,3 +1,14 @@ +Overview of changes in lightdm 1.10.0 + + * Fix return value for Vala bindings to Greeter.start_session_sync + * Fix logging when failing to find session + +Overview of changes in lightdm 1.9.15 + + * Update the lightdm AppArmor abstraction to allow the guest session to + start when AppArmor is mediating signals and ptrace and fix a minor, but + noisy, denial when applications attempt to read /proc//stat. + Overview of changes in lightdm 1.9.14 * Pass --enable-hardware-greeter to unity-system-compositor for Mir sessions diff -Nru lightdm-1.9.14/src/seat.c lightdm-1.10.0/src/seat.c --- lightdm-1.9.14/src/seat.c 2014-03-17 21:43:38.000000000 +0000 +++ lightdm-1.10.0/src/seat.c 2014-04-08 01:08:46.000000000 +0000 @@ -912,7 +912,7 @@ g_object_unref (session_config); } else - l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session")); + l_debug (seat, "Can't find session '%s'", session_name); g_object_unref (user); @@ -953,7 +953,7 @@ g_free (sessions_dir); if (!session_config) { - l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session")); + l_debug (seat, "Can't find session '%s'", session_name); return NULL; } @@ -1044,7 +1044,7 @@ g_free (sessions_dir); if (!session_config) { - l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session")); + l_debug (seat, "Can't find session '%s'", session_name); return FALSE; }