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

Proposed by Artur Rona on 2010-05-06
Status: Merged
Merged at revision: 2
Proposed branch: lp:~ari-tczew/ubuntu/karmic/gdm/lp-574262
Merge into: lp:ubuntu/karmic-proposed/gdm
Diff against target: 88 lines (+76/-0)
2 files modified
debian/changelog (+7/-0)
debian/patches/26_echo_variables_postlogin.patch (+69/-0)
To merge this branch: bzr merge lp:~ari-tczew/ubuntu/karmic/gdm/lp-574262
Reviewer Review Type Date Requested Status
Sebastien Bacher 2010-05-06 Pending
Ubuntu Stable Release Updates Team 2010-05-06 Pending
Review via email: mp+24817@code.launchpad.net
To post a comment you must log in.
James Westby (james-w) wrote :

Hello Sebastien,

Could you take a look at this proposed change please?

Thanks,

James

Sebastien Bacher (seb128) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-12-07 16:30:05 +0000
3+++ debian/changelog 2010-05-06 12:03:28 +0000
4@@ -1,3 +1,10 @@
5+gdm (2.28.1-0ubuntu2.2) karmic-proposed; urgency=low
6+
7+ * debian/patches/26_echo_variables_postlogin.patch: (LP: #574262)
8+ - Fix incorrect variables discarded by echo in /etc/PostLogin/Default
9+
10+ -- Artur Rona <ari-tczew@tlen.pl> Wed, 05 May 2010 21:33:11 +0200
11+
12 gdm (2.28.1-0ubuntu2.1) karmic-proposed; urgency=low
13
14 * debian/gdm.upstart: Do not fail with exit status !=0 on startup
15
16=== added file 'debian/patches/26_echo_variables_postlogin.patch'
17--- debian/patches/26_echo_variables_postlogin.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/26_echo_variables_postlogin.patch 2010-05-06 12:03:28 +0000
19@@ -0,0 +1,69 @@
20+# From: Artur Rona <ari-tczew@tlen.pl>
21+# Description: Cannot catch some variables in echo like $USER, $USERNAME, $LOGNAME in /etc/gdm/PostLogin/Default.
22+# Bug: https://launchpad.net/bugs/574262
23+# Origin: upstream, http://git.gnome.org/browse/gdm/commit/?id=e33ee9d9b23c103ac25b6fdb53fe8c074de0de53
24+# http://git.gnome.org/browse/gdm/commit/?id=2ca6e0ec36536968a623bf3f855afab2ee47c5cf
25+# Author: Brian Cameron, Christian Boos
26+
27+diff -pruN -x '*~' gdm-2.28.1.orig/daemon/gdm-simple-slave.c gdm-2.28.1/daemon/gdm-simple-slave.c
28+--- gdm-2.28.1.orig/daemon/gdm-simple-slave.c 2009-10-20 00:12:45.000000000 +0200
29++++ gdm-2.28.1/daemon/gdm-simple-slave.c 2010-05-05 22:20:25.000000000 +0200
30+@@ -334,6 +334,8 @@ try_migrate_session (GdmSimpleSlave *sla
31+ static void
32+ stop_greeter (GdmSimpleSlave *slave)
33+ {
34++ char *username;
35++
36+ g_debug ("GdmSimpleSlave: Stopping greeter");
37+
38+ if (slave->priv->greeter == NULL) {
39+@@ -342,7 +344,11 @@ stop_greeter (GdmSimpleSlave *slave)
40+ }
41+
42+ /* Run the PostLogin script. gdmslave suspends until script has terminated */
43+- gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/PostLogin", GDM_USERNAME);
44++ username = gdm_session_direct_get_username (slave->priv->session);
45++
46++ if (username != NULL) {
47++ gdm_slave_run_script (GDM_SLAVE (slave), GDMCONFDIR "/PostLogin", username);
48++ }
49+
50+ gdm_welcome_session_stop (GDM_WELCOME_SESSION (slave->priv->greeter));
51+ gdm_greeter_server_stop (slave->priv->greeter_server);
52+diff -pruN -x '*~' gdm-2.28.1.orig/daemon/gdm-slave.c gdm-2.28.1/daemon/gdm-slave.c
53+--- gdm-2.28.1.orig/daemon/gdm-slave.c 2009-10-20 00:12:45.000000000 +0200
54++++ gdm-2.28.1/daemon/gdm-slave.c 2010-05-05 22:21:16.000000000 +0200
55+@@ -234,8 +234,7 @@ get_script_environment (GdmSlave *slav
56+ g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (slave->priv->display_x11_authority_file));
57+ g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (slave->priv->display_name));
58+
59+- /*g_setenv ("PATH", gdm_daemon_config_get_value_string (GDM_KEY_ROOT_PATH), TRUE);*/
60+-
61++ g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (GDM_SESSION_DEFAULT_PATH));
62+ g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
63+
64+ g_hash_table_remove (hash, "MAIL");
65+diff -pruN -x '*~' gdm-2.28.1.orig/data/Init.in gdm-2.28.1/data/Init.in
66+--- gdm-2.28.1.orig/data/Init.in 2010-05-05 22:14:21.000000000 +0200
67++++ gdm-2.28.1/data/Init.in 2010-05-05 22:21:53.000000000 +0200
68+@@ -3,7 +3,7 @@
69+ # Plus a lot of fun stuff added
70+ # -George
71+
72+-PATH=@X_PATH@:$PATH
73++PATH="@X_PATH@:$PATH"
74+ OLD_IFS=$IFS
75+
76+ if [ -x '/usr/bin/xsplash' ];
77+diff -pruN -x '*~' gdm-2.28.1.orig/data/PreSession.in gdm-2.28.1/data/PreSession.in
78+--- gdm-2.28.1.orig/data/PreSession.in 2010-05-05 22:15:08.000000000 +0200
79++++ gdm-2.28.1/data/PreSession.in 2010-05-05 22:22:25.000000000 +0200
80+@@ -6,7 +6,7 @@
81+ #
82+ # Note that output goes into the .xsession-errors file for easy debugging
83+ #
84+-PATH="@X_PATH@:$PATH:/bin:/usr/bin"
85++PATH="@X_PATH@:$PATH"
86+
87+ if [ -x '/usr/bin/xsplash' ];
88+ then

Subscribers

People subscribed via source and target branches

to all changes: