Hello community,
here is the log from the commit of package gdm
checked in at Sun Aug 5 11:39:05 CEST 2007.
--------
--- GNOME/gdm/gdm.changes 2007-07-30 16:42:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2007-08-04 04:28:31.956886000 +0200
@@ -1,0 +2,20 @@
+Sat Aug 4 04:17:49 CEST 2007 - hpj@suse.de
+
+- Update to version 2.19.5.
+- Fix up gdm-conf.patch.
+- Fix up gdm-2.19.3-reset-pam.patch.
+- Fix up gdm-2.19.3-token-login.patch.
+- Fix up and enable gdm-language-dialog-size.patch.
+- Fix up and enable gdm-2.8.0.7-bg-4.patch.
+- Fix up and enable gdm-2.8.0.7-domain-entry.patch.
+- Fix up and enable gdm-2.8.0.7-halt-needs-root.patch.
+- Fix up and enable gdm-server-timeout.patch.
+- Fix up and enable gdm-2.8.0.7-some-info-in-dialog.patch.
+- Fix up and enable gdm-2.17.7-vt-fallback.patch.
+- Fix up and enable gdm-2.8.0.0-any-hostname-auth.patch.
+- Remove gdm-2.19.3.diff (upstreamed).
+- Remove gdm-2.13.0.4-audit-login.patch (upstreamed).
+- Remove gdm-logdir.patch (fixed upstream).
+- Remove gdm-bash-profile.patch (obsolete).
+
+-------------------------------------------------------------------
Old:
----
gdm-2.13.0.4-audit-login.patch
gdm-2.19.3.diff
gdm-2.19.3.tar.bz2
gdm-bash-profile.patch
gdm-logdir.patch
New:
----
gdm-2.19.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gdm.spec ++++++
--- /var/tmp/diff_new_pack.c26527/_old 2007-08-05 11:38:15.000000000 +0200
+++ /var/tmp/diff_new_pack.c26527/_new 2007-08-05 11:38:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gdm (Version 2.19.3)
+# spec file for package gdm (Version 2.19.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,8 +21,8 @@
PreReq: %insserv_prereq
License: GPL v2 or later
Group: System/GUI/GNOME
-Version: 2.19.3
-Release: 12
+Version: 2.19.5
+Release: 1
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@@ -32,10 +32,7 @@
Source4: init.earlygdm
Source5: sysconfig.displaymanager-gdm
Patch0: gdm-conf.patch
-Patch1: %{name}-%{version}.diff
-Patch2: gdm-bash-profile.patch
Patch3: gdm-language-dialog-size.patch
-Patch4: gdm-logdir.patch
Patch5: gdm-xdm-sessions.patch
Patch9: gdm-presession-kde-path.patch
Patch12: gdm-gdmsetup-rootonly.patch
@@ -51,7 +48,6 @@
Patch28: gdm-X_SERVER.patch
Patch29: gdm-gdmsetup.patch
Patch30: gdm-conf-custom-sysconfig.patch
-Patch33: gdm-2.13.0.4-audit-login.patch
Patch34: gdm-2.17.7-vt-fallback.patch
Patch35: gdm-2.19.3-reset-pam.patch
Patch36: gdm-2.19.3-dbus-security-tokens.patch
@@ -84,31 +80,25 @@
%setup
gnome-patch-translation-prepare
%patch0 -p1
-%patch1
-#%patch -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4
+%patch3 -p1
%patch5 -p1
%patch9 -p1
%patch12
-#%patch13 -p1
+%patch13 -p1
%patch14 -p1
%patch15 -p1
-#%patch19 -p1
-# %if %suse_version > 1000
-#%patch20 -p1
-# FIXME: this needs to be re-done
-# %patch21 -p1
-# %endif
+%patch19 -p1
+%if %suse_version > 1000
+%patch20 -p1
+%patch21 -p1
+%endif
%patch22 -p1
-#%patch24
-#%patch26 -p1
+%patch24 -p1
+%patch26 -p1
%patch28
%patch29
%patch30
-#%patch33 -p1
-#%patch34 -p1
+%patch34 -p1
%patch35 -p1
%patch36 -p1
%patch37 -p1
@@ -233,6 +223,23 @@
%endif
%changelog
+* Sat Aug 04 2007 - hpj@suse.de
+- Update to version 2.19.5.
+- Fix up gdm-conf.patch.
+- Fix up gdm-2.19.3-reset-pam.patch.
+- Fix up gdm-2.19.3-token-login.patch.
+- Fix up and enable gdm-language-dialog-size.patch.
+- Fix up and enable gdm-2.8.0.7-bg-4.patch.
+- Fix up and enable gdm-2.8.0.7-domain-entry.patch.
+- Fix up and enable gdm-2.8.0.7-halt-needs-root.patch.
+- Fix up and enable gdm-server-timeout.patch.
+- Fix up and enable gdm-2.8.0.7-some-info-in-dialog.patch.
+- Fix up and enable gdm-2.17.7-vt-fallback.patch.
+- Fix up and enable gdm-2.8.0.0-any-hostname-auth.patch.
+- Remove gdm-2.19.3.diff (upstreamed).
+- Remove gdm-2.13.0.4-audit-login.patch (upstreamed).
+- Remove gdm-logdir.patch (fixed upstream).
+- Remove gdm-bash-profile.patch (obsolete).
* Mon Jul 30 2007 - jberkman@novell.com
- use smartcard pam stack when cards are inserted
* Wed Jul 25 2007 - jpr@suse.de
++++++ gdm-2.17.7-vt-fallback.patch ++++++
--- /var/tmp/diff_new_pack.c26527/_old 2007-08-05 11:38:15.000000000 +0200
+++ /var/tmp/diff_new_pack.c26527/_new 2007-08-05 11:38:15.000000000 +0200
@@ -1,7 +1,7 @@
-diff -upr gdm-2.17.7-pre/daemon/getvt.c gdm-2.17.7-post/daemon/getvt.c
---- gdm-2.17.7-pre/daemon/getvt.c 2007-02-11 23:40:19.000000000 -0600
-+++ gdm-2.17.7-post/daemon/getvt.c 2007-03-20 16:25:35.000000000 -0600
-@@ -90,8 +90,10 @@ get_free_vt_linux (int *vtfd)
+diff -upr gdm-2.19.5-pre/daemon/getvt.c gdm-2.19.5-post/daemon/getvt.c
+--- gdm-2.19.5-pre/daemon/getvt.c 2007-07-30 13:51:14.000000000 -0500
++++ gdm-2.19.5-post/daemon/getvt.c 2007-08-03 20:14:13.000000000 -0500
+@@ -181,8 +181,10 @@ get_free_vt_sys (int *vtfd)
int vtno;
unsigned short vtmask;
struct vt_stat vtstat;
@@ -12,7 +12,7 @@
do {
errno = 0;
-@@ -101,26 +103,33 @@ get_free_vt_linux (int *vtfd)
+@@ -193,26 +195,33 @@ get_free_vt_sys (int *vtfd)
#endif
, 0);
} while G_UNLIKELY (errno == EINTR);
@@ -28,12 +28,12 @@
+ else
+ v_state = 0;
-- for (vtno = gdm_get_value_int (GDM_KEY_FIRST_VT), vtmask = 1 << vtno;
+- for (vtno = gdm_daemon_config_get_value_int (GDM_KEY_FIRST_VT), vtmask = 1 << vtno;
- vtstat.v_state & vtmask; vtno++, vtmask <<= 1);
- if (!vtmask) {
- VE_IGNORE_EINTR (close (fd));
- return -1;
-+ for (vtno = gdm_get_value_int (GDM_KEY_FIRST_VT), vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
++ for (vtno = gdm_daemon_config_get_value_int (GDM_KEY_FIRST_VT), vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
+ /* Is this console in use? */
+ if (v_state & vtmask)
+ continue;
@@ -60,3 +60,4 @@
*vtfd = fdv;
return vtno;
}
+Only in gdm-2.19.5-post: error.21177
++++++ gdm-2.19.3-reset-pam.patch ++++++
--- /var/tmp/diff_new_pack.c26527/_old 2007-08-05 11:38:15.000000000 +0200
+++ /var/tmp/diff_new_pack.c26527/_new 2007-08-05 11:38:15.000000000 +0200
@@ -1,38 +1,50 @@
---- gdm-2.16.4/gui/greeter/greeter.c.reset-pam 2006-10-30 15:56:34.000000000 -0500
-+++ gdm-2.16.4/gui/greeter/greeter.c 2006-12-15 11:11:07.000000000 -0500
-@@ -168,7 +168,6 @@
- GtkWidget *dlg;
- char *tmp;
- char *session;
-- GreeterItemInfo *conversation_info;
- static GnomeCanvasItem *disabled_cover = NULL;
- gchar *language;
- gchar *selected_user = NULL;
-@@ -328,16 +327,9 @@
- if (gtk_start_again_button != NULL)
- gtk_widget_set_sensitive (gtk_start_again_button, FALSE);
+diff -upr gdm-2.19.5-pre/daemon/gdm.c gdm-2.19.5-post/daemon/gdm.c
+--- gdm-2.19.5-pre/daemon/gdm.c 2007-07-30 13:51:14.000000000 -0500
++++ gdm-2.19.5-post/daemon/gdm.c 2007-08-03 20:23:38.000000000 -0500
+@@ -4363,6 +4363,14 @@ gdm_handle_user_message (GdmConnection *
+ gdm_connection_write (conn, "OK false\n");
+ } else if (strcmp (msg, GDM_SUP_CLOSE) == 0) {
+ gdm_connection_close (conn);
++ } else if (strcmp (msg, GDM_SOP_CANCEL_LOGIN_REQUESTS) == 0) {
++ GSList *li;
++ for (li = gdm_daemon_config_get_display_list (); li != NULL; li = li->next) {
++ GdmDisplay *d = li->data;
++ if (!d->logged_in) {
++ send_slave_command (d, GDM_NOTIFY_RESET);
++ }
++ }
+ } else {
+ gdm_connection_write (conn, "ERROR 0 Not implemented\n");
+ gdm_connection_close (conn);
+diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config-keys.h gdm-2.19.5-post/daemon/gdm-daemon-config-keys.h
+--- gdm-2.19.5-pre/daemon/gdm-daemon-config-keys.h 2007-08-03 20:20:26.000000000 -0500
++++ gdm-2.19.5-post/daemon/gdm-daemon-config-keys.h 2007-08-03 20:23:38.000000000 -0500
+@@ -233,6 +233,7 @@ G_BEGIN_DECLS
+ #define GDM_NOTIFY_SOFT_RESTART_SERVERS "SOFT_RESTART_SERVERS"
+ #define GDM_NOTIFY_GO "GO"
+ #define GDM_NOTIFY_TWIDDLE_POINTER "TWIDDLE_POINTER"
++#define GDM_NOTIFY_RESET "RESET"
-- conversation_info = greeter_lookup_id ("pam-conversation");
--
-- if (conversation_info)
-- {
-- tmp = ve_locale_to_utf8 (args);
-- g_object_set (G_OBJECT (conversation_info->item),
-- "text", tmp,
-- NULL);
-- g_free (tmp);
-- }
-+ greeter_item_ulist_unset_selected_user ();
-+ greeter_item_pam_prompt ("", PW_ENTRY_SIZE, TRUE);
-+ greeter_item_pam_message ("");
+ G_END_DECLS
- printf ("%c\n", STX);
- fflush (stdout);
---- gdm-2.16.4/daemon/slave.c.reset-pam 2006-12-15 11:03:01.000000000 -0500
-+++ gdm-2.16.4/daemon/slave.c 2006-12-15 11:03:01.000000000 -0500
-@@ -128,6 +128,12 @@
- static int greeter_fd_out = -1;
- static int greeter_fd_in = -1;
+diff -upr gdm-2.19.5-pre/daemon/gdm-socket-protocol.h gdm-2.19.5-post/daemon/gdm-socket-protocol.h
+--- gdm-2.19.5-pre/daemon/gdm-socket-protocol.h 2007-08-03 20:20:26.000000000 -0500
++++ gdm-2.19.5-post/daemon/gdm-socket-protocol.h 2007-08-03 20:23:38.000000000 -0500
+@@ -157,6 +157,8 @@
+ #define GDM_SOP_SHOW_QUESTION_DIALOG "SHOW_QUESTION_DIALOG" /* show the question dialog from daemon */
+ #define GDM_SOP_SHOW_ASKBUTTONS_DIALOG "SHOW_ASKBUTTON_DIALOG" /* show the askbutton dialog from daemon */
+
++/* Reset any in progress authentication conversations */
++#define GDM_SOP_CANCEL_LOGIN_REQUESTS "CANCEL_LOGIN_REQUESTS" /* no arguments */
+
+ /* Ack for a slave message */
+ /* Note that an extra response can follow an 'ack' */
+diff -upr gdm-2.19.5-pre/daemon/slave.c gdm-2.19.5-post/daemon/slave.c
+--- gdm-2.19.5-pre/daemon/slave.c 2007-08-03 20:20:26.000000000 -0500
++++ gdm-2.19.5-post/daemon/slave.c 2007-08-03 20:24:23.000000000 -0500
+@@ -175,6 +175,12 @@ static int gdm_normal_runlevel =
+ static pid_t extra_process = 0;
+ static int extra_status = 0;
+/* a dup of the other side of greeter_fd_in so that
+ * the slave can talk to itself from its sig handler
@@ -43,7 +55,7 @@
#ifdef HAVE_TSOL
static gboolean have_suntsol_extension = FALSE;
#endif
-@@ -620,7 +626,7 @@
+@@ -663,7 +669,7 @@ ignore_xerror_handler (Display *disp, XE
}
static void
@@ -52,7 +64,7 @@
{
if (greeter_fd_out > 0)
VE_IGNORE_EINTR (close (greeter_fd_out));
-@@ -628,6 +634,9 @@
+@@ -671,6 +677,9 @@ whack_greeter_fds (void)
if (greeter_fd_in > 0)
VE_IGNORE_EINTR (close (greeter_fd_in));
greeter_fd_in = -1;
@@ -62,7 +74,7 @@
}
static void
-@@ -1078,7 +1087,7 @@
+@@ -1156,7 +1165,7 @@ gdm_slave_whack_greeter (void)
d->greetpid = 0;
@@ -71,7 +83,7 @@
gdm_slave_send_num (GDM_SOP_GREETPID, 0);
-@@ -1844,7 +1853,7 @@
+@@ -2005,7 +2014,7 @@ restart_the_greeter (void)
d->greetpid = 0;
@@ -80,7 +92,7 @@
gdm_slave_send_num (GDM_SOP_GREETPID, 0);
}
-@@ -2076,6 +2085,12 @@
+@@ -2295,6 +2304,12 @@ gdm_slave_wait_for_login (void)
break;
}
@@ -90,46 +102,23 @@
+ continue;
+ }
+
- if (login == NULL) {
- char *failuresound = gdm_get_value_string (GDM_KEY_SOUND_ON_LOGIN_FAILURE_FILE);
+ if (login_user == NULL) {
+ const char *failuresound = gdm_daemon_config_get_value_string (GDM_KEY_SOUND_ON_LOGIN_FAILURE_FILE);
-@@ -4673,7 +4688,7 @@
- continue;
- }
-
-- whack_greeter_fds ();
-+ whack_greeter_and_slave_fds ();
-
- /* if greet is TRUE, then the greeter died outside of our
- * control really, so clean up and die, something is wrong
-@@ -4816,6 +4831,11 @@
- gdm_wait_for_go = FALSE;
- } else if (strcmp (&s[1], GDM_NOTIFY_TWIDDLE_POINTER) == 0) {
- gdm_twiddle_pointer (d);
-+ } else if (strcmp (&s[1], GDM_NOTIFY_RESET) == 0) {
-+ if (!d->logged_in) {
-+ gdm_fdprintf (slave_fd_out, "%c%c%c\n",
-+ STX, BEL, GDM_INTERRUPT_CANCEL);
-+ }
- }
- }
- }
---- gdm-2.19.3/daemon/slave.c~ 2007-07-18 14:10:20.000000000 -0400
-+++ gdm-2.19.3/daemon/slave.c 2007-07-18 14:12:23.000000000 -0400
-@@ -2877,10 +2877,11 @@ gdm_slave_greeter (void)
+@@ -2908,9 +2923,10 @@ gdm_slave_greeter (void)
default:
VE_IGNORE_EINTR (close (pipe1[0]));
- VE_IGNORE_EINTR (close (pipe2[1]));
- whack_greeter_and_slave_fds ();
-
-+ slave_fd_out = pipe2[1];
+- whack_greeter_fds ();
++ whack_greeter_and_slave_fds ();
+
++ slave_fd_out = pipe2[1];
+
greeter_fd_out = pipe1[1];
greeter_fd_in = pipe2[0];
-
-@@ -4858,7 +4859,7 @@ gdm_slave_child_handler (int sig)
+@@ -5208,7 +5224,7 @@ gdm_slave_child_handler (int sig)
greet = FALSE;
d->greetpid = 0;
@@ -138,30 +127,7 @@
gdm_slave_send_num (GDM_SOP_GREETPID, 0);
do_restart_greeter = TRUE;
---- gdm-2.19.3/daemon/gdm-socket-protocol.h~ 2007-06-17 13:07:39.000000000 -0400
-+++ gdm-2.19.3/daemon/gdm-socket-protocol.h 2007-07-25 14:47:23.000000000 -0400
-@@ -155,6 +155,8 @@
- #define GDM_SOP_SHOW_QUESTION_DIALOG "SHOW_QUESTION_DIALOG" /* show the question dialog from daemon */
- #define GDM_SOP_SHOW_ASKBUTTONS_DIALOG "SHOW_ASKBUTTON_DIALOG" /* show the askbutton dialog from daemon */
-
-+/* Reset any in progress authentication conversations */
-+#define GDM_SOP_CANCEL_LOGIN_REQUESTS "CANCEL_LOGIN_REQUESTS" /* no arguments */
-
- /* Ack for a slave message */
- /* Note that an extra response can follow an 'ack' */
---- gdm-2.19.3/daemon/gdm-daemon-config-keys.h~ 2007-06-17 13:07:38.000000000 -0400
-+++ gdm-2.19.3/daemon/gdm-daemon-config-keys.h 2007-07-25 14:46:49.000000000 -0400
-@@ -226,6 +226,7 @@
- #define GDM_NOTIFY_SOFT_RESTART_SERVERS "SOFT_RESTART_SERVERS"
- #define GDM_NOTIFY_GO "GO"
- #define GDM_NOTIFY_TWIDDLE_POINTER "TWIDDLE_POINTER"
-+#define GDM_NOTIFY_RESET "RESET"
-
- G_END_DECLS
-
---- gdm-2.19.3/daemon/slave.c~ 2007-07-25 15:25:09.000000000 -0400
-+++ gdm-2.19.3/daemon/slave.c 2007-07-25 15:26:22.000000000 -0400
-@@ -4881,7 +4881,7 @@ gdm_slave_child_handler (int sig)
+@@ -5220,7 +5236,7 @@ gdm_slave_child_handler (int sig)
continue;
}
@@ -170,20 +136,48 @@
/* if greet is TRUE, then the greeter died outside of our
* control really, so clean up and die, something is wrong
---- gdm-2.19.3/daemon/gdm.c~ 2007-07-25 15:40:40.000000000 -0400
-+++ gdm-2.19.3/daemon/gdm.c 2007-07-25 15:41:39.000000000 -0400
-@@ -4344,6 +4344,14 @@ gdm_handle_user_message (GdmConnection *
- gdm_connection_write (conn, "OK false\n");
- } else if (strcmp (msg, GDM_SUP_CLOSE) == 0) {
- gdm_connection_close (conn);
-+ } else if (strcmp (msg, GDM_SOP_CANCEL_LOGIN_REQUESTS) == 0) {
-+ GSList *li;
-+ for (li = gdm_daemon_config_get_display_list (); li != NULL; li = li->next) {
-+ GdmDisplay *d = li->data;
-+ if (!d->logged_in) {
-+ send_slave_command (d, GDM_NOTIFY_RESET);
-+ }
-+ }
- } else {
- gdm_connection_write (conn, "ERROR 0 Not implemented\n");
- gdm_connection_close (conn);
+@@ -5363,6 +5379,11 @@ gdm_slave_handle_usr2_message (void)
+ gdm_wait_for_go = FALSE;
+ } else if (strcmp (&s[1], GDM_NOTIFY_TWIDDLE_POINTER) == 0) {
+ gdm_twiddle_pointer (d);
++ } else if (strcmp (&s[1], GDM_NOTIFY_RESET) == 0) {
++ if (!d->logged_in) {
++ gdm_fdprintf (slave_fd_out, "%c%c%c\n",
++ STX, BEL, GDM_INTERRUPT_CANCEL);
++ }
+ }
+ } else if (s[0] == GDM_SLAVE_NOTIFY_RESPONSE) {
+ gdm_got_ack = TRUE;
+Only in gdm-2.19.5-post/daemon: slave.c~
+Only in gdm-2.19.5-post: error.18580
+diff -upr gdm-2.19.5-pre/gui/greeter/greeter.c gdm-2.19.5-post/gui/greeter/greeter.c
+--- gdm-2.19.5-pre/gui/greeter/greeter.c 2007-08-03 20:20:26.000000000 -0500
++++ gdm-2.19.5-post/gui/greeter/greeter.c 2007-08-03 20:23:38.000000000 -0500
+@@ -278,7 +278,6 @@ process_operation (guchar op_code,
+ GtkWidget *dlg;
+ char *tmp;
+ char *session;
+- GreeterItemInfo *conversation_info;
+ static GnomeCanvasItem *disabled_cover = NULL;
+ gint lookup_status = SESSION_LOOKUP_SUCCESS;
+ gchar *firstmsg = NULL;
+@@ -483,16 +482,9 @@ process_operation (guchar op_code,
+
+ first_prompt = TRUE;
+
+- conversation_info = greeter_lookup_id ("pam-conversation");
+-
+- if (conversation_info)
+- {
+- tmp = ve_locale_to_utf8 (args);
+- g_object_set (G_OBJECT (conversation_info->item),
+- "text", tmp,
+- NULL);
+- g_free (tmp);
+- }
++ greeter_item_ulist_unset_selected_user ();
++ greeter_item_pam_prompt ("", PW_ENTRY_SIZE, TRUE);
++ greeter_item_pam_message ("");
+
+ printf ("%c\n", STX);
+ fflush (stdout);
++++++ gdm-2.19.3-token-login.patch ++++++
--- /var/tmp/diff_new_pack.c26527/_old 2007-08-05 11:38:15.000000000 +0200
+++ /var/tmp/diff_new_pack.c26527/_new 2007-08-05 11:38:15.000000000 +0200
@@ -1,83 +1,7 @@
---- gdm-2.19.3/daemon/slave.c~ 2007-07-25 15:00:30.000000000 -0400
-+++ gdm-2.19.3/daemon/slave.c 2007-07-25 15:05:46.000000000 -0400
-@@ -116,6 +116,8 @@ static gboolean do_configurator =
- static gboolean do_cancel = FALSE; /* If this is true, go back to
- username entry & unselect
- face browser (if present) */
-+static gboolean do_token_login = FALSE; /* if true, auth with smart
-+ cards */
- static gboolean do_restart_greeter = FALSE; /* If this is true, whack the
- greeter and try again */
- static gboolean restart_greeter_now = FALSE; /* Restart_greeter_when the
-@@ -2081,11 +2083,14 @@ play_login_sound (const char *sound_file
- static void
- gdm_slave_wait_for_login (void)
- {
-+ gboolean verify_token;
- const char *successsound;
- char *username;
- g_free (login);
- login = NULL;
-
-+ do_token_login = FALSE;
-+
- /* Chat with greeter */
- while (login == NULL) {
- /* init to a sane value */
-@@ -2109,11 +2114,16 @@ gdm_slave_wait_for_login (void)
- gdm_debug ("gdm_slave_wait_for_login: In loop");
- username = d->preset_user;
- d->preset_user = NULL;
-+
-+ verify_token = do_token_login;
-+ do_token_login = FALSE;
-+
- login = gdm_verify_user (d /* the display */,
-- username /* username */,
-+ verify_token ? "" : username /* username */,
- d->name /* display name */,
- d->attached /* display attached? */,
-- TRUE /* allow retry */);
-+ TRUE /* allow retry */,
-+ verify_token);
- g_free (username);
-
- gdm_debug ("gdm_slave_wait_for_login: end verify for '%s'",
-@@ -2162,7 +2172,7 @@ gdm_slave_wait_for_login (void)
- pwent->pw_name,
- d->name,
- d->attached,
-- FALSE);
-+ FALSE, FALSE);
- gdm_daemon_config_set_value_bool (GDM_KEY_ALLOW_ROOT, oldAllowRoot);
-
- /* Clear message */
-@@ -5019,6 +5029,11 @@ gdm_slave_handle_usr2_message (void)
- gdm_fdprintf (slave_fd_out, "%c%c%c\n",
- STX, BEL, GDM_INTERRUPT_CANCEL);
- }
-+ } else if (strcmp (&s[1], GDM_NOTIFY_TOKEN_LOGIN) == 0) {
-+ if (!d->logged_in && d->attached) {
-+ gdm_fdprintf (slave_fd_out, "%c%c%c\n",
-+ STX, BEL, GDM_INTERRUPT_TOKEN_LOGIN);
-+ }
- }
- } else if (s[0] == GDM_SLAVE_NOTIFY_RESPONSE) {
- gdm_got_ack = TRUE;
-@@ -5219,6 +5234,10 @@ check_for_interruption (const char *msg)
- do_restart_greeter = TRUE;
- }
- break;
-+ case GDM_INTERRUPT_TOKEN_LOGIN:
-+ do_token_login = TRUE;
-+ do_cancel = TRUE;
-+ break;
- default:
- break;
- }
---- gdm-2.19.3/daemon/gdm.c~ 2007-07-25 15:00:37.000000000 -0400
-+++ gdm-2.19.3/daemon/gdm.c 2007-07-25 15:08:09.000000000 -0400
-@@ -4359,7 +4359,7 @@ gdm_handle_user_message (GdmConnection *
+diff -upr gdm-2.19.5-pre/daemon/gdm.c gdm-2.19.5-post/daemon/gdm.c
+--- gdm-2.19.5-pre/daemon/gdm.c 2007-08-03 20:26:08.000000000 -0500
++++ gdm-2.19.5-post/daemon/gdm.c 2007-08-03 20:24:56.000000000 -0500
+@@ -4389,7 +4389,7 @@ gdm_handle_user_message (GdmConnection *
}
static void
@@ -86,7 +10,7 @@
{
GSList *li;
-@@ -4367,11 +4367,23 @@ gdm_reset_local_displays (void)
+@@ -4397,11 +4397,23 @@ gdm_reset_local_displays (void)
GdmDisplay *d = li->data;
if (d->attached)
@@ -111,7 +35,7 @@
gdm_watch_for_security_tokens (void)
{
DBusGConnection *conn;
-@@ -4392,7 +4404,7 @@ gdm_watch_for_security_tokens (void)
+@@ -4422,7 +4434,7 @@ gdm_watch_for_security_tokens (void)
MONITOR_INTERFACE);
dbus_g_proxy_add_signal (monitor, "SecurityTokenInserted", G_TYPE_STRING, G_TYPE_INVALID);
@@ -120,27 +44,50 @@
dbus_g_proxy_add_signal (monitor, "SecurityTokenRemoved", G_TYPE_STRING, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (monitor, "SecurityTokenRemoved", G_CALLBACK (gdm_reset_local_displays), NULL, NULL);
---- gdm-2.19.3/daemon/gdm-socket-protocol.h~ 2007-07-25 15:00:30.000000000 -0400
-+++ gdm-2.19.3/daemon/gdm-socket-protocol.h 2007-07-25 15:09:02.000000000 -0400
-@@ -75,6 +75,7 @@
- #define GDM_INTERRUPT_CUSTOM_CMD 'M'
- #define GDM_INTERRUPT_CANCEL 'X'
- #define GDM_INTERRUPT_SELECT_LANG 'O'
-+#define GDM_INTERRUPT_TOKEN_LOGIN '$'
+diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config.c gdm-2.19.5-post/daemon/gdm-daemon-config.c
+--- gdm-2.19.5-pre/daemon/gdm-daemon-config.c 2007-07-30 13:51:14.000000000 -0500
++++ gdm-2.19.5-post/daemon/gdm-daemon-config.c 2007-08-03 20:24:56.000000000 -0500
+@@ -552,7 +552,8 @@ gdm_daemon_config_key_to_string_per_disp
- /* List delimiter for config file lists */
- #define GDM_DELIMITER_MODULES ":"
---- gdm-2.19.3/daemon/gdm-daemon-config-keys.h~ 2007-07-25 15:00:30.000000000 -0400
-+++ gdm-2.19.3/daemon/gdm-daemon-config-keys.h 2007-07-25 15:10:22.000000000 -0400
-@@ -105,6 +105,7 @@ G_BEGIN_DECLS
+ if (strcmp (group, "greeter") == 0 ||
+ strcmp (group, "gui") == 0 ||
+- is_key (keystring, GDM_KEY_PAM_STACK)) {
++ is_key (keystring, GDM_KEY_PAM_STACK) ||
++ is_key (keystring, GDM_KEY_PAM_STACK_SMARTCARD)) {
+ ret = gdm_daemon_config_key_to_string (file, keystring, retval);
+ }
+
+diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config-entries.h gdm-2.19.5-post/daemon/gdm-daemon-config-entries.h
+--- gdm-2.19.5-pre/daemon/gdm-daemon-config-entries.h 2007-08-03 20:26:08.000000000 -0500
++++ gdm-2.19.5-post/daemon/gdm-daemon-config-entries.h 2007-08-03 20:24:56.000000000 -0500
+@@ -212,6 +212,7 @@ typedef enum {
+ GDM_ID_SYSTEM_COMMANDS_IN_MENU,
+ GDM_ID_ALLOW_LOGOUT_ACTIONS,
+ GDM_ID_RBAC_SYSTEM_COMMAND_KEYS,
++ GDM_ID_SMART_CARD_PAM_STACK,
+ GDK_ID_LAST
+ } GdmConfigKey;
+
+@@ -368,6 +369,7 @@ static const GdmConfigEntry gdm_daemon_c
+ { GDM_CONFIG_GROUP_SECURITY, "RetryDelay", GDM_CONFIG_VALUE_INT, "1", GDM_ID_RETRY_DELAY },
+ { GDM_CONFIG_GROUP_SECURITY, "DisallowTCP", GDM_CONFIG_VALUE_BOOL, "true", GDM_ID_DISALLOW_TCP },
+ { GDM_CONFIG_GROUP_SECURITY, "PamStack", GDM_CONFIG_VALUE_STRING, "gdm", GDM_ID_PAM_STACK },
++ { GDM_CONFIG_GROUP_SECURITY, "SmartCardPamStack", GDM_CONFIG_VALUE_STRING, "gdm-smartcard", GDM_ID_SMART_CARD_PAM_STACK },
+
+ { GDM_CONFIG_GROUP_SECURITY, "NeverPlaceCookiesOnNFS", GDM_CONFIG_VALUE_BOOL, "true", GDM_ID_NEVER_PLACE_COOKIES_ON_NFS },
+ { GDM_CONFIG_GROUP_SECURITY, "PasswordRequired", GDM_CONFIG_VALUE_BOOL, "false", GDM_ID_PASSWORD_REQUIRED },
+diff -upr gdm-2.19.5-pre/daemon/gdm-daemon-config-keys.h gdm-2.19.5-post/daemon/gdm-daemon-config-keys.h
+--- gdm-2.19.5-pre/daemon/gdm-daemon-config-keys.h 2007-08-03 20:26:08.000000000 -0500
++++ gdm-2.19.5-post/daemon/gdm-daemon-config-keys.h 2007-08-03 20:24:56.000000000 -0500
+@@ -106,6 +106,7 @@ G_BEGIN_DECLS
#define GDM_KEY_RETRY_DELAY "security/RetryDelay=1"
#define GDM_KEY_DISALLOW_TCP "security/DisallowTCP=true"
#define GDM_KEY_PAM_STACK "security/PamStack=gdm"
+#define GDM_KEY_PAM_STACK_SMARTCARD "security/SmartCardPamStack=gdm-smartcard"
#define GDM_KEY_NEVER_PLACE_COOKIES_ON_NFS "security/NeverPlaceCookiesOnNFS=true"
#define GDM_KEY_PASSWORD_REQUIRED "security/PasswordRequired=false"
- #define GDM_KEY_XDMCP "xdmcp/Enable=false"
-@@ -227,6 +228,7 @@ G_BEGIN_DECLS
+ #define GDM_KEY_UTMP_LINE_ATTACHED "security/UtmpLineAttached="
+@@ -234,6 +235,7 @@ G_BEGIN_DECLS
#define GDM_NOTIFY_GO "GO"
#define GDM_NOTIFY_TWIDDLE_POINTER "TWIDDLE_POINTER"
#define GDM_NOTIFY_RESET "RESET"
@@ -148,93 +95,165 @@
G_END_DECLS
---- gdm-2.19.3/daemon/verify.h~ 2007-06-17 13:07:39.000000000 -0400
-+++ gdm-2.19.3/daemon/verify.h 2007-07-25 15:12:17.000000000 -0400
-@@ -28,7 +28,8 @@ gchar *gdm_verify_user (GdmDisplay *d
- const char *username,
- const gchar *display,
- gboolean local,
-- gboolean allow_retry);
-+ gboolean allow_retry,
-+ gboolean token);
- void gdm_verify_cleanup (GdmDisplay *d);
- void gdm_verify_check (void);
- void gdm_verify_select_user (const char *user);
---- gdm-2.19.3/daemon/verify-pam.c~ 2007-06-17 13:07:38.000000000 -0400
-+++ gdm-2.19.3/daemon/verify-pam.c 2007-07-25 15:11:57.000000000 -0400
-@@ -866,7 +866,8 @@ gdm_verify_user (GdmDisplay *d,
+diff -upr gdm-2.19.5-pre/daemon/gdm-socket-protocol.h gdm-2.19.5-post/daemon/gdm-socket-protocol.h
+--- gdm-2.19.5-pre/daemon/gdm-socket-protocol.h 2007-08-03 20:26:08.000000000 -0500
++++ gdm-2.19.5-post/daemon/gdm-socket-protocol.h 2007-08-03 20:24:56.000000000 -0500
+@@ -77,6 +77,7 @@
+ #define GDM_INTERRUPT_CUSTOM_CMD 'M'
+ #define GDM_INTERRUPT_CANCEL 'X'
+ #define GDM_INTERRUPT_SELECT_LANG 'O'
++#define GDM_INTERRUPT_TOKEN_LOGIN '$'
+
+ /* List delimiter for config file lists */
+ #define GDM_DELIMITER_MODULES ":"
+diff -upr gdm-2.19.5-pre/daemon/slave.c gdm-2.19.5-post/daemon/slave.c
+--- gdm-2.19.5-pre/daemon/slave.c 2007-08-03 20:26:08.000000000 -0500
++++ gdm-2.19.5-post/daemon/slave.c 2007-08-03 20:32:16.000000000 -0500
+@@ -134,6 +134,8 @@ static gboolean do_system_reboot =
+ static gboolean do_cancel = FALSE; /* If this is true, go back to
+ username entry & unselect
+ face browser (if present) */
++static gboolean do_token_login = FALSE; /* if true, auth with smart
++ cards */
+ static gboolean do_restart_greeter = FALSE; /* If this is true, whack the
+ greeter and try again */
+ static gboolean restart_greeter_now = FALSE; /* Restart_greeter_when the
+@@ -2091,6 +2093,7 @@ get_root_auth (const gchar *message, str
+ gdm_slave_greeter_ctl_no_ret (GDM_SETLOGIN, (*pwent)->pw_name);
+ login_user = gdm_verify_user (d,
+ (*pwent)->pw_name,
++ FALSE,
+ FALSE);
+ gdm_daemon_config_set_value_bool (GDM_KEY_ALLOW_ROOT, oldAllowRoot);
+
+@@ -2160,11 +2163,14 @@ get_root_auth (const gchar *message, str
+ static void
+ gdm_slave_wait_for_login (void)
+ {
++ gboolean verify_token;
+ const char *successsound;
+ char *username;
+ g_free (login_user);
+ login_user = NULL;
+
++ do_token_login = FALSE;
++
+ /* Chat with greeter */
+ while (login_user == NULL) {
+ /* init to a sane value */
+@@ -2188,9 +2194,14 @@ gdm_slave_wait_for_login (void)
+ gdm_debug ("gdm_slave_wait_for_login: In loop");
+ username = d->preset_user;
+ d->preset_user = NULL;
++
++ verify_token = do_token_login;
++ do_token_login = FALSE;
++
+ login_user = gdm_verify_user (d /* the display */,
+- username /* username */,
+- TRUE /* allow retry */);
++ verify_token ? "" : username /* username */,
++ TRUE /* allow retry */,
++ verify_token);
+ g_free (username);
+
+ gdm_debug ("gdm_slave_wait_for_login: end verify for '%s'",
+@@ -5384,6 +5395,11 @@ gdm_slave_handle_usr2_message (void)
+ gdm_fdprintf (slave_fd_out, "%c%c%c\n",
+ STX, BEL, GDM_INTERRUPT_CANCEL);
+ }
++ } else if (strcmp (&s[1], GDM_NOTIFY_TOKEN_LOGIN) == 0) {
++ if (!d->logged_in && d->attached) {
++ gdm_fdprintf (slave_fd_out, "%c%c%c\n",
++ STX, BEL, GDM_INTERRUPT_TOKEN_LOGIN);
++ }
+ }
+ } else if (s[0] == GDM_SLAVE_NOTIFY_RESPONSE) {
+ gdm_got_ack = TRUE;
+@@ -5592,6 +5608,10 @@ check_for_interruption (const char *msg)
+ do_restart_greeter = TRUE;
+ }
+ break;
++ case GDM_INTERRUPT_TOKEN_LOGIN:
++ do_token_login = TRUE;
++ do_cancel = TRUE;
++ break;
+ default:
+ break;
+ }
+Only in gdm-2.19.5-post/daemon: slave.c~
+Only in gdm-2.19.5-post/daemon: slave.c.rej
+diff -upr gdm-2.19.5-pre/daemon/verify-crypt.c gdm-2.19.5-post/daemon/verify-crypt.c
+--- gdm-2.19.5-pre/daemon/verify-crypt.c 2007-07-30 13:51:14.000000000 -0500
++++ gdm-2.19.5-post/daemon/verify-crypt.c 2007-08-03 20:29:12.000000000 -0500
+@@ -101,7 +101,8 @@ print_cant_auth_errbox (void)
+ gchar *
+ gdm_verify_user (GdmDisplay *d,
+ const char *username,
+- gboolean allow_retry)
++ gboolean allow_retry,
++ gboolean token)
+ {
+ gchar *login, *passwd, *ppasswd;
+ struct passwd *pwent;
+Only in gdm-2.19.5-post/daemon: verify-crypt.c~
+Only in gdm-2.19.5-post/daemon: verify-crypt.c.rej
+diff -upr gdm-2.19.5-pre/daemon/verify.h gdm-2.19.5-post/daemon/verify.h
+--- gdm-2.19.5-pre/daemon/verify.h 2007-07-30 13:51:14.000000000 -0500
++++ gdm-2.19.5-post/daemon/verify.h 2007-08-03 20:34:40.000000000 -0500
+@@ -26,7 +26,8 @@
+ * the timed login timer */
+ gchar *gdm_verify_user (GdmDisplay *d,
+ const char *username,
+- gboolean allow_retry);
++ gboolean allow_retry,
++ gboolean token);
+ void gdm_verify_cleanup (GdmDisplay *d);
+ void gdm_verify_check (void);
+ void gdm_verify_select_user (const char *user);
+Only in gdm-2.19.5-post/daemon: verify.h~
+Only in gdm-2.19.5-post/daemon: verify.h.rej
+diff -upr gdm-2.19.5-pre/daemon/verify-pam.c gdm-2.19.5-post/daemon/verify-pam.c
+--- gdm-2.19.5-pre/daemon/verify-pam.c 2007-08-03 20:26:08.000000000 -0500
++++ gdm-2.19.5-post/daemon/verify-pam.c 2007-08-03 20:33:44.000000000 -0500
+@@ -887,7 +887,8 @@ log_to_audit_system(const char *login,
+ gchar *
+ gdm_verify_user (GdmDisplay *d,
const char *username,
- const gchar *display,
- gboolean local,
- gboolean allow_retry)
+ gboolean allow_retry,
+ gboolean verify_token)
{
gint pamerr = 0;
struct passwd *pwent = NULL;
-@@ -926,7 +927,10 @@ gdm_verify_user (GdmDisplay *d,
+@@ -947,8 +948,10 @@ gdm_verify_user (GdmDisplay *d,
* PAM Stacks, in case one display should use a different
* authentication mechanism than another display.
*/
-- pam_stack = gdm_daemon_config_get_value_string_per_display (GDM_KEY_PAM_STACK, (char *)display);
-+ pam_stack = gdm_daemon_config_get_value_string_per_display (verify_token
-+ ? GDM_KEY_PAM_STACK_SMARTCARD
-+ : GDM_KEY_PAM_STACK,
-+ (char *)display);
+- pam_stack = gdm_daemon_config_get_value_string_per_display (GDM_KEY_PAM_STACK,
+- (char *)d->name);
++ pam_stack = gdm_daemon_config_get_value_string_per_display (verify_token ?
++ GDM_KEY_PAM_STACK_SMARTCARD :
++ GDM_KEY_PAM_STACK,
++ (char *)d->name);
- if ( ! create_pamh (d, pam_stack, login, &pamc, display, &pamerr)) {
+ if ( ! create_pamh (d, pam_stack, login, &pamc, d->name, &pamerr)) {
if (started_timer)
---- gdm-2.19.3/daemon/verify-shadow.c~ 2007-06-17 13:07:38.000000000 -0400
-+++ gdm-2.19.3/daemon/verify-shadow.c 2007-07-25 15:12:30.000000000 -0400
-@@ -106,7 +106,8 @@ gdm_verify_user (GdmDisplay *d,
+Only in gdm-2.19.5-post/daemon: verify-pam.c~
+Only in gdm-2.19.5-post/daemon: verify-pam.c.rej
+diff -upr gdm-2.19.5-pre/daemon/verify-shadow.c gdm-2.19.5-post/daemon/verify-shadow.c
+--- gdm-2.19.5-pre/daemon/verify-shadow.c 2007-07-30 13:51:14.000000000 -0500
++++ gdm-2.19.5-post/daemon/verify-shadow.c 2007-08-03 20:27:55.000000000 -0500
+@@ -102,7 +102,8 @@ print_cant_auth_errbox (void)
+ gchar *
+ gdm_verify_user (GdmDisplay *d,
const char *username,
- const gchar *display,
- gboolean local,
- gboolean allow_retry)
+ gboolean allow_retry,
+ gboolean token)
{
gchar *login, *passwd, *ppasswd;
struct passwd *pwent;
---- gdm-2.19.3/daemon/verify-crypt.c~ 2007-06-17 13:07:39.000000000 -0400
-+++ gdm-2.19.3/daemon/verify-crypt.c 2007-07-25 15:12:53.000000000 -0400
-@@ -105,7 +105,8 @@ gdm_verify_user (GdmDisplay *d,
- const char *username,
- const gchar *display,
- gboolean local,
-- gboolean allow_retry)
-+ gboolean allow_retry,
-+ gboolean token)
- {
- gchar *login, *passwd, *ppasswd;
- struct passwd *pwent;
---- gdm-2.19.3/daemon/gdm-daemon-config.c~ 2007-06-17 13:07:39.000000000 -0400
-+++ gdm-2.19.3/daemon/gdm-daemon-config.c 2007-07-25 15:17:46.000000000 -0400
-@@ -552,7 +552,8 @@ gdm_daemon_config_key_to_string_per_disp
-
- if (strcmp (group, "greeter") == 0 ||
- strcmp (group, "gui") == 0 ||
-- is_key (keystring, GDM_KEY_PAM_STACK)) {
-+ is_key (keystring, GDM_KEY_PAM_STACK) ||
-+ is_key (keystring, GDM_KEY_PAM_STACK_SMARTCARD)) {
- ret = gdm_daemon_config_key_to_string (file, keystring, retval);
- }
-
---- gdm-2.19.3/daemon/gdm-daemon-config-entries.h~ 2007-06-17 13:07:38.000000000 -0400
-+++ gdm-2.19.3/daemon/gdm-daemon-config-entries.h 2007-07-25 17:12:25.000000000 -0400
-@@ -208,6 +208,7 @@ typedef enum {
- GDM_ID_SYSTEM_COMMANDS_IN_MENU,
- GDM_ID_ALLOW_LOGOUT_ACTIONS,
- GDM_ID_RBAC_SYSTEM_COMMAND_KEYS,
-+ GDM_ID_SMART_CARD_PAM_STACK,
- GDK_ID_LAST
- } GdmConfigKey;
-
-@@ -363,6 +364,7 @@ static const GdmConfigEntry gdm_daemon_c
- { GDM_CONFIG_GROUP_SECURITY, "RetryDelay", GDM_CONFIG_VALUE_INT, "1", GDM_ID_RETRY_DELAY },
- { GDM_CONFIG_GROUP_SECURITY, "DisallowTCP", GDM_CONFIG_VALUE_BOOL, "true", GDM_ID_DISALLOW_TCP },
- { GDM_CONFIG_GROUP_SECURITY, "PamStack", GDM_CONFIG_VALUE_STRING, "gdm", GDM_ID_PAM_STACK },
-+ { GDM_CONFIG_GROUP_SECURITY, "SmartCardPamStack", GDM_CONFIG_VALUE_STRING, "gdm-smartcard", GDM_ID_SMART_CARD_PAM_STACK },
-
- { GDM_CONFIG_GROUP_SECURITY, "NeverPlaceCookiesOnNFS", GDM_CONFIG_VALUE_BOOL, "true", GDM_ID_NEVER_PLACE_COOKIES_ON_NFS },
- { GDM_CONFIG_GROUP_SECURITY, "PasswordRequired", GDM_CONFIG_VALUE_BOOL, "false", GDM_ID_PASSWORD_REQUIRED },
+Only in gdm-2.19.5-post/daemon: verify-shadow.c~
+Only in gdm-2.19.5-post/daemon: verify-shadow.c.rej
+Only in gdm-2.19.5-post: error.19199
++++++ gdm-2.19.3.tar.bz2 -> gdm-2.19.5.tar.bz2 ++++++
++++ 109076 lines of diff (skipped)
++++++ gdm-2.8.0.0-any-hostname-auth.patch ++++++
--- /var/tmp/diff_new_pack.c26527/_old 2007-08-05 11:38:23.000000000 +0200
+++ /var/tmp/diff_new_pack.c26527/_new 2007-08-05 11:38:23.000000000 +0200
@@ -5,9 +5,9 @@
g_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */
+ if (d->hostname != NULL && d->hostname [0] != '\0') {
-+ ve_setenv ("XAUTHLOCALHOSTNAME", d->hostname, TRUE);
++ g_setenv ("XAUTHLOCALHOSTNAME", d->hostname, TRUE);
+ } else {
-+ ve_setenv ("XAUTHLOCALHOSTNAME", "localhost.localdomain", TRUE);
++ g_setenv ("XAUTHLOCALHOSTNAME", "localhost.localdomain", TRUE);
+ }
+
if (d->type == TYPE_STATIC) {
++++++ gdm-2.8.0.7-bg-4.patch ++++++
--- /var/tmp/diff_new_pack.c26527/_old 2007-08-05 11:38:23.000000000 +0200
+++ /var/tmp/diff_new_pack.c26527/_new 2007-08-05 11:38:24.000000000 +0200
@@ -1,16 +1,15 @@
-Index: gdm-2.17.7/gui/greeter/greeter.c
-===================================================================
---- gdm-2.17.7.orig/gui/greeter/greeter.c
-+++ gdm-2.17.7/gui/greeter/greeter.c
-@@ -1163,6 +1163,7 @@ main (int argc, char *argv[])
- guint sid;
+diff -upr gdm-2.19.3-pre/gui/greeter/greeter.c gdm-2.19.3-post/gui/greeter/greeter.c
+--- gdm-2.19.3-pre/gui/greeter/greeter.c 2007-06-17 13:07:26.000000000 -0400
++++ gdm-2.19.3-post/gui/greeter/greeter.c 2007-07-31 21:19:51.000000000 -0400
+@@ -1239,6 +1239,7 @@ main (int argc, char *argv[])
int r;
gint i;
+ gchar *key_string = NULL;
+ GdkColor black = { 0, 0, 0, 0 };
if (g_getenv ("DOING_GDM_DEVELOPMENT") != NULL)
DOING_GDM_DEVELOPMENT = TRUE;
-@@ -1271,6 +1272,7 @@ main (int argc, char *argv[])
+@@ -1348,6 +1349,7 @@ main (int argc, char *argv[])
}
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -18,7 +17,7 @@
if G_UNLIKELY (DOING_GDM_DEVELOPMENT) {
g_signal_connect (G_OBJECT (window), "key_press_event",
-@@ -1287,6 +1289,7 @@ main (int argc, char *argv[])
+@@ -1364,6 +1366,7 @@ main (int argc, char *argv[])
gtk_window_set_default_size (GTK_WINDOW (window),
gdm_wm_screen.width,
gdm_wm_screen.height);
@@ -26,10 +25,9 @@
gtk_container_add (GTK_CONTAINER (window), canvas);
/*
-Index: gdm-2.17.7/gui/greeter/greeter_canvas_item.c
-===================================================================
---- gdm-2.17.7.orig/gui/greeter/greeter_canvas_item.c
-+++ gdm-2.17.7/gui/greeter/greeter_canvas_item.c
+diff -upr gdm-2.19.3-pre/gui/greeter/greeter_canvas_item.c gdm-2.19.3-post/gui/greeter/greeter_canvas_item.c
+--- gdm-2.19.3-pre/gui/greeter/greeter_canvas_item.c 2007-06-17 13:07:26.000000000 -0400
++++ gdm-2.19.3-post/gui/greeter/greeter_canvas_item.c 2007-07-31 21:18:11.000000000 -0400
@@ -24,6 +24,12 @@
#include