Merge lp:~ari-tczew/ubuntu/karmic/gdm/lp-574262 into lp:ubuntu/karmic-proposed/gdm

[Artur Rona]

[James Westby (james-w)]

Hello Sebastien,

Could you take a look at this proposed change please?

Thanks,

James

[Sebastien Bacher (seb128)]

the changes to the path variable don't seem revelant to this bug? did you try if the update is working? I don't really have time for sponsoring this week and next week for sponsoring but the scope of change seems ok for a stable update, not sure the changes there are limited to what is required to fix the issue though

=== modified file 'debian/changelog'
--- debian/changelog	2009-12-07 16:30:05 +0000
+++ debian/changelog	2010-05-06 12:03:28 +0000
@@ -1,3 +1,10 @@
+gdm (2.28.1-0ubuntu2.2) karmic-proposed; urgency=low
+
+  * debian/patches/26_echo_variables_postlogin.patch: (LP: #574262)
+    - Fix incorrect variables discarded by echo in /etc/PostLogin/Default
+
+ -- Artur Rona <[e-mail]>  Wed, 05 May 2010 21:33:11 +0200
+
 gdm (2.28.1-0ubuntu2.1) karmic-proposed; urgency=low
 
   * debian/gdm.upstart: Do not fail with exit status !=0 on startup 

=== added file 'debian/patches/26_echo_variables_postlogin.patch'
--- debian/patches/26_echo_variables_postlogin.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/26_echo_variables_postlogin.patch	2010-05-06 12:03:28 +0000
@@ -0,0 +1,69 @@
+# From: Artur Rona <[e-mail]>
+# Description: Cannot catch some variables in echo like $USER, $USERNAME, $LOGNAME in /etc/gdm/PostLogin/Default.
+# Bug: https://launchpad.net/bugs/574262
+# Origin: upstream, http://git.gnome.org/browse/gdm/commit/?id=e33ee9d9b23c103ac25b6fdb53fe8c074de0de53
+#                   http://git.gnome.org/browse/gdm/commit/?id=2ca6e0ec36536968a623bf3f855afab2ee47c5cf
+# Author: Brian Cameron, Christian Boos
+
+diff -pruN -x '*~' gdm-2.28.1.orig/daemon/gdm-simple-slave.c gdm-2.28.1/daemon/gdm-simple-slave.c
+--- gdm-2.28.1.orig/daemon/gdm-simple-slave.c	2009-10-20 00:12:45.000000000 +0200
++++ gdm-2.28.1/daemon/gdm-simple-slave.c	2010-05-05 22:20:25.000000000 +0200
+@@ -334,6 +334,8 @@ try_migrate_session (GdmSimpleSlave *sla
+ static void
+ stop_greeter (GdmSimpleSlave *slave)
+ {
++        char *username;
++
+         g_debug ("GdmSimpleSlave: Stopping greeter");
+ 
+         if (slave->priv->greeter == NULL) {
+@@ -342,7 +344,11 @@ stop_greeter (GdmSimpleSlave *slave)
+         }
+ 
+         /* Run the PostLogin script. gdmslave suspends until script has terminated */
+-        gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/PostLogin", GDM_USERNAME);
++        username = gdm_session_direct_get_username (slave->priv->session);
++
++        if (username != NULL) {
++                gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/PostLogin", username);
++        }
+ 
+         gdm_welcome_session_stop (GDM_WELCOME_SESSION (slave->priv->greeter));
+         gdm_greeter_server_stop (slave->priv->greeter_server);
+diff -pruN -x '*~' gdm-2.28.1.orig/daemon/gdm-slave.c gdm-2.28.1/daemon/gdm-slave.c
+--- gdm-2.28.1.orig/daemon/gdm-slave.c	2009-10-20 00:12:45.000000000 +0200
++++ gdm-2.28.1/daemon/gdm-slave.c	2010-05-05 22:21:16.000000000 +0200
+@@ -234,8 +234,7 @@ get_script_environment (GdmSlave   *slav
+         g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (slave->priv->display_x11_authority_file));
+         g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (slave->priv->display_name));
+ 
+-        /*g_setenv ("PATH", gdm_daemon_config_get_value_string (GDM_KEY_ROOT_PATH), TRUE);*/
+-
++        g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (GDM_SESSION_DEFAULT_PATH));
+         g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
+ 
+         g_hash_table_remove (hash, "MAIL");
+diff -pruN -x '*~' gdm-2.28.1.orig/data/Init.in gdm-2.28.1/data/Init.in
+--- gdm-2.28.1.orig/data/Init.in	2010-05-05 22:14:21.000000000 +0200
++++ gdm-2.28.1/data/Init.in	2010-05-05 22:21:53.000000000 +0200
+@@ -3,7 +3,7 @@
+ # Plus a lot of fun stuff added
+ #  -George
+ 
+-PATH=@X_PATH@:$PATH
++PATH="@X_PATH@:$PATH"
+ OLD_IFS=$IFS
+ 
+ if [ -x '/usr/bin/xsplash' ];
+diff -pruN -x '*~' gdm-2.28.1.orig/data/PreSession.in gdm-2.28.1/data/PreSession.in
+--- gdm-2.28.1.orig/data/PreSession.in	2010-05-05 22:15:08.000000000 +0200
++++ gdm-2.28.1/data/PreSession.in	2010-05-05 22:22:25.000000000 +0200
+@@ -6,7 +6,7 @@
+ #
+ # Note that output goes into the .xsession-errors file for easy debugging
+ #
+-PATH="@X_PATH@:$PATH:/bin:/usr/bin"
++PATH="@X_PATH@:$PATH"
+ 
+ if [ -x '/usr/bin/xsplash' ];
+ then