diff --git a/gdm-2.16.1.tar.bz2 b/gdm-2.16.1.tar.bz2 deleted file mode 100644 index 50f013c..0000000 --- a/gdm-2.16.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9733a12aacf6995dc630daf108c357c5d906fdda30de05cd9b5c26a83cf3d5f6 -size 3130299 diff --git a/gdm-2.17.7.tar.bz2 b/gdm-2.17.7.tar.bz2 new file mode 100644 index 0000000..1ce82d8 --- /dev/null +++ b/gdm-2.17.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8377abb7adc0a2a0fb9eeb1bd8256a9ec907506d22359a9a8b28d3e56b5ab222 +size 3322848 diff --git a/gdm-2.8.0.0-setup-no-flicker.patch b/gdm-2.8.0.0-setup-no-flicker.patch index 249834e..7ee4753 100644 --- a/gdm-2.8.0.0-setup-no-flicker.patch +++ b/gdm-2.8.0.0-setup-no-flicker.patch @@ -1,16 +1,17 @@ -diff -upr gdm-2.16.1-pre/gui/gdmsetup.c gdm-2.16.1-post/gui/gdmsetup.c ---- gdm-2.16.1-pre/gui/gdmsetup.c 2006-09-27 17:02:46.000000000 -0500 -+++ gdm-2.16.1-post/gui/gdmsetup.c 2006-11-07 18:27:08.000000000 -0600 -@@ -60,6 +60,8 @@ static gboolean GdmAllowRoot; - static gboolean GdmAllowRemoteRoot; - static gboolean GdmUserChangesUnsaved; +Index: gdm-2.17.7/gui/gdmsetup.c +=================================================================== +--- gdm-2.17.7.orig/gui/gdmsetup.c ++++ gdm-2.17.7/gui/gdmsetup.c +@@ -60,6 +60,8 @@ static gboolean GdmUserChangesUnsaved; + static gboolean GdmRandomFromSelectedChangesWarn; + static gint last_selected_command; +#define LONG_TIMEOUT G_MAXINT + /* set the DOING_GDM_DEVELOPMENT env variable if you want to * search for the glade file in the current dir and not the system * install dir, better then something you have to change -@@ -1069,7 +1071,7 @@ combobox_timeout (GtkWidget *combo_box) +@@ -1575,7 +1577,7 @@ combobox_timeout (GtkWidget *combo_box) static void toggle_toggled (GtkWidget *toggle) { @@ -19,7 +20,7 @@ diff -upr gdm-2.16.1-pre/gui/gdmsetup.c gdm-2.16.1-post/gui/gdmsetup.c } static void -@@ -1097,13 +1099,13 @@ list_selection_toggled (GtkWidget *toggl +@@ -1615,13 +1617,13 @@ list_selection_toggled (GtkWidget *toggl gtk_widget_set_sensitive (widget, FALSE); } @@ -35,17 +36,7 @@ diff -upr gdm-2.16.1-pre/gui/gdmsetup.c gdm-2.16.1-post/gui/gdmsetup.c } static void -@@ -1668,6 +1670,9 @@ setup_intspin (const char *name, - g_object_set_data_full (G_OBJECT (spin), - "key", g_strdup (key), - (GDestroyNotify) g_free); -+ g_object_set_data_full (G_OBJECT (toggle), -+ "notify_key", g_strdup (key), -+ (GDestroyNotify) g_free); - - gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), val); - -@@ -2252,7 +2257,7 @@ greeter_toggle_timeout (GtkWidget *toggl +@@ -3270,7 +3272,7 @@ greeter_toggle_timeout (GtkWidget *toggl static void greeter_toggle_toggled (GtkWidget *toggle) { @@ -54,7 +45,7 @@ diff -upr gdm-2.16.1-pre/gui/gdmsetup.c gdm-2.16.1-post/gui/gdmsetup.c } static void -@@ -2595,7 +2600,7 @@ greeter_entry_untranslate_timeout (GtkWi +@@ -3614,7 +3616,7 @@ greeter_entry_untranslate_timeout (GtkWi static void greeter_entry_untranslate_changed (GtkWidget *entry) { diff --git a/gdm-2.8.0.7-bg-4.patch b/gdm-2.8.0.7-bg-4.patch index 122374c..601eed6 100644 --- a/gdm-2.8.0.7-bg-4.patch +++ b/gdm-2.8.0.7-bg-4.patch @@ -1,14 +1,16 @@ ---- gdm-2.16.1/gui/greeter/greeter.c -+++ gdm-2.16.1/gui/greeter/greeter.c -@@ -1025,6 +1025,7 @@ - const char *gdm_gtk_theme; +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; int r; + gint i; + GdkColor black = { 0, 0, 0, 0 }; if (g_getenv ("DOING_GDM_DEVELOPMENT") != NULL) DOING_GDM_DEVELOPMENT = TRUE; -@@ -1123,6 +1124,7 @@ +@@ -1271,6 +1272,7 @@ main (int argc, char *argv[]) } window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -16,7 +18,7 @@ if G_UNLIKELY (DOING_GDM_DEVELOPMENT) { g_signal_connect (G_OBJECT (window), "key_press_event", -@@ -1139,6 +1141,7 @@ +@@ -1287,6 +1289,7 @@ main (int argc, char *argv[]) gtk_window_set_default_size (GTK_WINDOW (window), gdm_wm_screen.width, gdm_wm_screen.height); @@ -24,8 +26,10 @@ gtk_container_add (GTK_CONTAINER (window), canvas); /* ---- gdm-2.16.1/gui/greeter/greeter_canvas_item.c -+++ gdm-2.16.1/gui/greeter/greeter_canvas_item.c +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 @@ -24,6 +24,12 @@ #include #include @@ -39,7 +43,7 @@ #include "gdm.h" #include "gdmcommon.h" #include "gdmconfig.h" -@@ -249,6 +255,127 @@ +@@ -254,6 +260,127 @@ greeter_item_run_button_action_callback gtk_widget_grab_focus (entry); } @@ -167,7 +171,7 @@ void greeter_item_create_canvas_item (GreeterItemInfo *item) { -@@ -346,12 +473,53 @@ +@@ -351,12 +478,53 @@ greeter_item_create_canvas_item (Greeter } if (item->data.pixmap.pixbufs[GREETER_ITEM_STATE_NORMAL] != NULL) diff --git a/gdm-2.8.0.7-domain-entry.patch b/gdm-2.8.0.7-domain-entry.patch index 85a08da..2443c36 100644 --- a/gdm-2.8.0.7-domain-entry.patch +++ b/gdm-2.8.0.7-domain-entry.patch @@ -1,7 +1,8 @@ -diff -upr gdm-2.16.1-pre/config/gdm.conf.in gdm-2.16.1-post/config/gdm.conf.in ---- gdm-2.16.1-pre/config/gdm.conf.in 2006-11-08 00:02:48.000000000 -0600 -+++ gdm-2.16.1-post/config/gdm.conf.in 2006-11-08 00:02:57.000000000 -0600 -@@ -498,6 +498,9 @@ SoundOnLogin=false +Index: gdm-2.17.7/config/gdm.conf.in +=================================================================== +--- gdm-2.17.7.orig/config/gdm.conf.in ++++ gdm-2.17.7/config/gdm.conf.in +@@ -499,6 +499,9 @@ SoundOnLogin=false # list of libraries, one per line, and load each library in the file. PreFetchProgram=@GDMPREFETCHCMD@ @@ -11,170 +12,11 @@ diff -upr gdm-2.16.1-pre/config/gdm.conf.in gdm-2.16.1-post/config/gdm.conf.in # The chooser is what's displayed when a user wants an indirect XDMCP session, # or selects Run XDMCP chooser from the system menu [chooser] -diff -upr gdm-2.16.1-pre/config/gdm.conf.in.orig gdm-2.16.1-post/config/gdm.conf.in.orig ---- gdm-2.16.1-pre/config/gdm.conf.in.orig 2006-08-03 12:36:26.000000000 -0500 -+++ gdm-2.16.1-post/config/gdm.conf.in.orig 2006-11-08 00:02:57.000000000 -0600 -@@ -67,11 +67,11 @@ TimedLoginDelay=30 - - # The greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to - # get the new graphical greeter. --#Greeter=@libexecdir@/gdmlogin -+Greeter=@libexecdir@/gdmgreeter - - # The greeter for xdmcp logins, usually you want a less graphically intensive - # greeter here so it's better to leave this with gdmlogin --#RemoteGreeter=@libexecdir@/gdmlogin -+RemoteGreeter=@libexecdir@/gdmgreeter - - # Launch the greeter with an additional list of colon separated GTK+ modules. - # This is useful for enabling additional feature support e.g. GNOME -@@ -85,10 +85,12 @@ TimedLoginDelay=30 - # This value will be overridden with the value from /etc/default/login if it - # contains "ROOT=". - #DefaultPath=@GDM_USER_PATH@ -+DefaultPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/var/lib/dosemu:/usr/games:/opt/bin:/opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin - # Default path for root. The profile scripts will likely override this value. - # This value will be overridden with the value from /etc/default/login if it - # contains "SUROOT=". - #RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@ -+RootPath=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/var/lib/dosemu:/usr/games:/opt/bin:/opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/openwin/bin:/opt/cross/bin - - # If you are having trouble with using a single server for a long time and want - # GDM to kill/restart the server, turn this on. On Solaris, this value is -@@ -127,6 +129,9 @@ XKeepsCrashing=@gdmconfdir@/XKeepsCrashi - #RebootCommand=@REBOOT_COMMAND@ - #HaltCommand=@HALT_COMMAND@ - #SuspendCommand=@SUSPEND_COMMAND@ -+RebootCommand=/sbin/shutdown -r now -+HaltCommand=/sbin/shutdown -h now -+SuspendCommand=/usr/bin/powersave --suspend-to-disk - # Probably should not touch the below this is the standard setup. - ServAuthDir=@authdir@ - # This is our standard startup script. A bit different from a normal X -@@ -137,7 +142,7 @@ BaseXsession=@gdmconfdir@/Xsession - # really a PATH style variable since 2.4.4.2 to allow actual interoperability - # with KDM. Note that /Sessions is there for backwards - # compatibility reasons with 2.4.4.x. --#SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/ -+SessionDesktopDir=/usr/share/xsessions/:@EXPANDED_SYSCONFDIR@/dm/Sessions/:@EXPANDED_DATADIR@/gdm/BuiltInSessions/ - # This is the default .desktop session. One of the ones in SessionDesktopDir - #DefaultSession=gnome.desktop - # Better leave this blank and HOME will be used. You can use syntax ~/ below -@@ -220,7 +225,7 @@ RelaxPermissions=0 - # example, home directories owned by some other user. - CheckDirOwner=true - # Number of seconds to wait after a failed login --#RetryDelay=1 -+RetryDelay=1 - # Maximum size of a file we wish to read. This makes it hard for a user to DoS - # us by using a large file. - #UserMaxFile=65536 -@@ -281,17 +286,18 @@ Enable=false - #PingIntervalSeconds=15 - # The port. 177 is the standard port so better keep it that way. - #Port=177 --# Willing script, none is shipped and by default we'll send hostname system id. --# But if you supply something here, the output of this script will be sent as --# status of this host so that the chooser can display it. You could for --# example send load, or mail details for some user, or some such. --#Willing=@gdmconfdir@/Xwilling -+#Willing script, none is shipped, X11's one is used by default. If -+# none is present we'll send hostname system id. But if you supply -+# something here, the output of this script will be sent as status of -+# this host so that the chooser can display it. You could for example -+# send load, or mail details for some user, or some such. -+Willing=/etc/X11/xdm/Xwilling - - [gui] - # The specific gtkrc file we use. It should be the full path to the gtkrc that - # we need. Unless you need a specific gtkrc that doesn't correspond to a - # specific theme, then just use the GtkTheme key. --#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc -+GtkRC=@datadir@/themes/Industrial/gtk-2.0/gtkrc - - # The GTK+ theme to use for the GUI. - #GtkTheme=Default -@@ -318,7 +324,7 @@ Enable=false - #TitleBar=true - # Don't allow user to move the standard login window. Only makes sense if - # TitleBar is on. --#LockPosition=false -+LockPosition=true - # Set a position for the standard login window rather then just centering the - # window. If you enter negative values for the position it is taken as an - # offset from the right or bottom edge. -@@ -339,7 +345,7 @@ Browser=false - # User ID's less than the MinimalUID value will not be included in the face - # browser or in the gdmselection list for Automatic/Timed login. They will not - # be displayed regardless of the settings for Include and Exclude. --#MinimalUID=100 -+MinimalUID=500 - # Users listed in Include will be included in the face browser and in the - # gdmsetup selection list for Automatic/Timed login. Users should be separated - # by commas. -@@ -356,7 +362,7 @@ Browser=false - # large numbers of users and this feature should not be used in such - # environments. The setting of IncludeAll does nothing if Include is set to a - # non-empty value. --#IncludeAll=false -+IncludeAll=true - # If user or user.png exists in this dir it will be used as his picture. - #GlobalFaceDir=@datadir@/pixmaps/faces/ - -@@ -370,7 +376,7 @@ Browser=false - #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png - # The standard greeter should shake if a user entered the wrong username or - # password. Kind of cool looking --#Quiver=true -+Quiver=false - - # The Actions menu (formerly system menu) is shown in the greeter, this is the - # menu that contains reboot, shutdown, suspend, config and chooser. None of -@@ -407,12 +413,12 @@ DefaultRemoteWelcome=true - # Background settings for the standard greeter: - # Type can be 0=None, 1=Image & Color, 2=Color, 3=Image - #BackgroundType=2 --#BackgroundImage= -+BackgroundImage=0 - #BackgroundScaleToFit=true - # The Standard greeter (gdmlogin) uses BackgroundColor as the background - # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor - # as the background color. --BackgroundColor=#76848F -+BackgroundColor=#000000 - GraphicalThemedColor=#76848F - # XDMCP session should only get a color, this is the sanest setting since you - # don't want to take up too much bandwidth -@@ -454,7 +460,7 @@ GraphicalThemedColor=#76848F - # list then provide a list that is delimited by /: to the GraphicalThemes - # key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme - # and specify just one theme. --#GraphicalTheme=circles -+GraphicalTheme=GDM-SuSE - #GraphicalThemes=circles/:happygnome - GraphicalThemeDir=@datadir@/gdm/themes/ - GraphicalThemeRand=false -@@ -471,6 +477,7 @@ GraphicalThemeRand=false - # executable (see daemon/SoundProgram) it will play that file instead of just - # beeping. - #SoundOnLogin=true -+SoundOnLogin=false - #SoundOnLoginFile= - # If SoundOnLoginSuccess, then the greeter will play a sound (as above) when a - # user successfully logs in. -@@ -558,7 +565,7 @@ Gestures=false - # Definition of the standard X server. - [server-Standard] - name=Standard server --command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ -+command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ -br - flexible=true - # Indicates that the X server should be started at a different process - # priority. Values can be any integer value accepted by the setpriority C -diff -upr gdm-2.16.1-pre/configure.ac gdm-2.16.1-post/configure.ac ---- gdm-2.16.1-pre/configure.ac 2006-11-08 00:02:48.000000000 -0600 -+++ gdm-2.16.1-post/configure.ac 2006-11-08 00:02:57.000000000 -0600 -@@ -844,6 +844,9 @@ AC_SUBST(GDMPREFETCH) +Index: gdm-2.17.7/configure.ac +=================================================================== +--- gdm-2.17.7.orig/configure.ac ++++ gdm-2.17.7/configure.ac +@@ -875,6 +875,9 @@ AC_SUBST(GDMPREFETCH) AC_SUBST(GDMPREFETCHLIST) AC_SUBST(GDMPREFETCHCMD) @@ -184,10 +26,11 @@ diff -upr gdm-2.16.1-pre/configure.ac gdm-2.16.1-post/configure.ac AC_ARG_ENABLE(secureremote, [ --enable-secureremote=[yes/no] Enable to offer a secure X connection through ssh [default=no]],, enable_secureremote=no) -diff -upr gdm-2.16.1-pre/daemon/gdmconfig.c gdm-2.16.1-post/daemon/gdmconfig.c ---- gdm-2.16.1-pre/daemon/gdmconfig.c 2006-07-17 13:43:51.000000000 -0500 -+++ gdm-2.16.1-post/daemon/gdmconfig.c 2006-11-08 00:04:46.000000000 -0600 -@@ -231,6 +231,7 @@ static gint GdmFlexiReapDelayMinutes; +Index: gdm-2.17.7/daemon/gdmconfig.c +=================================================================== +--- gdm-2.17.7.orig/daemon/gdmconfig.c ++++ gdm-2.17.7/daemon/gdmconfig.c +@@ -233,6 +233,7 @@ static gint GdmFlexiReapDelayMinutes; static gint GdmBackgroundProgramInitialDelay = 30; static gint GdmBackgroundProgramRestartDelay = 30; @@ -195,7 +38,7 @@ diff -upr gdm-2.16.1-pre/daemon/gdmconfig.c gdm-2.16.1-post/daemon/gdmconfig.c static gboolean GdmAllowGtkThemeChange; static gboolean GdmTitleBar; static gboolean GdmIncludeAll; -@@ -348,6 +349,7 @@ gdm_config_init (void) +@@ -353,6 +354,7 @@ gdm_config_init (void) realkey_hash = g_hash_table_new (g_str_hash, g_str_equal); /* boolean values */ @@ -203,10 +46,11 @@ diff -upr gdm-2.16.1-pre/daemon/gdmconfig.c gdm-2.16.1-post/daemon/gdmconfig.c gdm_config_add_hash (GDM_KEY_ALLOW_REMOTE_ROOT, &GdmAllowRemoteRoot, &bool_type); gdm_config_add_hash (GDM_KEY_ALLOW_ROOT, &GdmAllowRoot, &bool_type); gdm_config_add_hash (GDM_KEY_ALLOW_REMOTE_AUTOLOGIN, -diff -upr gdm-2.16.1-pre/daemon/gdm.h gdm-2.16.1-post/daemon/gdm.h ---- gdm-2.16.1-pre/daemon/gdm.h 2006-08-23 22:47:43.000000000 -0500 -+++ gdm-2.16.1-post/daemon/gdm.h 2006-11-08 00:02:57.000000000 -0600 -@@ -384,6 +384,8 @@ enum { +Index: gdm-2.17.7/daemon/gdm.h +=================================================================== +--- gdm-2.17.7.orig/daemon/gdm.h ++++ gdm-2.17.7/daemon/gdm.h +@@ -393,6 +393,8 @@ enum { #define GDM_KEY_GRAPHICAL_THEME_DIR "greeter/GraphicalThemeDir=" DATADIR "/gdm/themes/" #define GDM_KEY_GRAPHICAL_THEMED_COLOR "greeter/GraphicalThemedColor=#76848F" @@ -215,7 +59,7 @@ diff -upr gdm-2.16.1-pre/daemon/gdm.h gdm-2.16.1-post/daemon/gdm.h #define GDM_KEY_INFO_MSG_FILE "greeter/InfoMsgFile=" #define GDM_KEY_INFO_MSG_FONT "greeter/InfoMsgFont=" -@@ -725,6 +727,7 @@ void gdm_final_cleanup (void); +@@ -764,6 +766,7 @@ void gdm_final_cleanup (void); #define GDM_NOTIFY_TIMED_LOGIN_DELAY "TimedLoginDelay" /* */ #define GDM_NOTIFY_TIMED_LOGIN_ENABLE "TimedLoginEnable" /* */ #define GDM_NOTIFY_DISALLOW_TCP "DisallowTCP" /* */ @@ -223,10 +67,11 @@ diff -upr gdm-2.16.1-pre/daemon/gdm.h gdm-2.16.1-post/daemon/gdm.h #define GDM_NOTIFY_SOUND_ON_LOGIN_FILE "SoundOnLoginFile" /* */ #define GDM_NOTIFY_SOUND_ON_LOGIN_SUCCESS_FILE "SoundOnLoginSuccessFile" /* */ #define GDM_NOTIFY_SOUND_ON_LOGIN_FAILURE_FILE "SoundOnLoginFailureFile" /* */ -diff -upr gdm-2.16.1-pre/daemon/verify-pam.c gdm-2.16.1-post/daemon/verify-pam.c ---- gdm-2.16.1-pre/daemon/verify-pam.c 2006-06-09 16:07:41.000000000 -0500 -+++ gdm-2.16.1-post/daemon/verify-pam.c 2006-11-08 00:02:57.000000000 -0600 -@@ -57,6 +57,8 @@ static char *tmp_PAM_USER = NULL; +Index: gdm-2.17.7/daemon/verify-pam.c +=================================================================== +--- gdm-2.17.7.orig/daemon/verify-pam.c ++++ gdm-2.17.7/daemon/verify-pam.c +@@ -60,6 +60,8 @@ static unsigned auth_retries; /* this is another hack */ static gboolean did_we_ask_for_password = FALSE; @@ -235,7 +80,7 @@ diff -upr gdm-2.16.1-pre/daemon/verify-pam.c gdm-2.16.1-post/daemon/verify-pam.c static char *selected_user = NULL; -@@ -430,6 +432,7 @@ perhaps_translate_message (const char *m +@@ -449,6 +451,7 @@ perhaps_translate_message (const char *m g_hash_table_insert (hash, "You are required to change your password immediately (password aged)", _("You are required to change your password immediately (password aged)")); g_hash_table_insert (hash, "You are required to change your password immediately (root enforced)", _("You are required to change your password immediately (root enforced)")); g_hash_table_insert (hash, "Your account has expired; please contact your system administrator", _("Your account has expired; please contact your system administrator")); @@ -243,19 +88,19 @@ diff -upr gdm-2.16.1-pre/daemon/verify-pam.c gdm-2.16.1-post/daemon/verify-pam.c g_hash_table_insert (hash, "No password supplied", _("No password supplied")); g_hash_table_insert (hash, "Password unchanged", _("Password unchanged")); g_hash_table_insert (hash, "Can not get username", _("Can not get username")); -@@ -502,8 +505,9 @@ gdm_verify_pam_conv (int num_msg, struct +@@ -517,8 +520,9 @@ gdm_verify_pam_conv (int num_msg, struct + openlog ("gdm", LOG_PID, LOG_DAEMON); for (replies = 0; replies < num_msg; replies++) { - gboolean islogin = FALSE; -- const char *m = msg[replies]->msg; +- const char *m = (*msg)[replies].msg; - m = perhaps_translate_message (m); -+ const char *m_untranslated = msg[replies]->msg; -+ const char *m; ++ const char *m_untranslated = (*msg)[replies].msg; ++ const char *m; + m = perhaps_translate_message (m_untranslated); - switch (msg[replies]->msg_style) { + switch ((*msg)[replies].msg_style) { -@@ -589,6 +593,12 @@ gdm_verify_pam_conv (int num_msg, struct +@@ -574,6 +578,12 @@ gdm_verify_pam_conv (int num_msg, struct case PAM_ERROR_MSG: /* PAM sent a message that should displayed to the user */ @@ -268,7 +113,7 @@ diff -upr gdm-2.16.1-pre/daemon/verify-pam.c gdm-2.16.1-post/daemon/verify-pam.c gdm_slave_greeter_ctl_no_ret (GDM_ERRDLG, m); reply[replies].resp_retcode = PAM_SUCCESS; reply[replies].resp = NULL; -@@ -1125,7 +1135,11 @@ authenticate_again: +@@ -1180,7 +1190,11 @@ authenticate_again: /* Only give this message if we actually asked for password, otherwise it would be silly to say that the password may have been wrong */ @@ -281,7 +126,7 @@ diff -upr gdm-2.16.1-pre/daemon/verify-pam.c gdm-2.16.1-post/daemon/verify-pam.c basemsg = _("\nIncorrect username or password. " "Letters must be typed in the correct " "case."); -@@ -1134,7 +1148,7 @@ authenticate_again: +@@ -1189,7 +1203,7 @@ authenticate_again: "Letters must be typed in the correct " "case."); } @@ -290,7 +135,7 @@ diff -upr gdm-2.16.1-pre/daemon/verify-pam.c gdm-2.16.1-post/daemon/verify-pam.c msg = g_strconcat (basemsg, " ", _("Caps Lock is on."), NULL); -@@ -1250,6 +1264,8 @@ gdm_verify_setup_user (GdmDisplay *d, co +@@ -1302,6 +1316,8 @@ gdm_verify_setup_user (GdmDisplay *d, co /* Start authentication session */ did_we_ask_for_password = FALSE; @@ -299,10 +144,11 @@ diff -upr gdm-2.16.1-pre/daemon/verify-pam.c gdm-2.16.1-post/daemon/verify-pam.c if ((pamerr = pam_authenticate (pamh, null_tok)) != PAM_SUCCESS) { if (gdm_slave_action_pending ()) { gdm_error (_("Couldn't authenticate user")); -diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greeter.c ---- gdm-2.16.1-pre/gui/greeter/greeter.c 2006-11-08 00:02:48.000000000 -0600 -+++ gdm-2.16.1-post/gui/greeter/greeter.c 2006-11-08 00:02:57.000000000 -0600 -@@ -121,6 +121,53 @@ get_random_theme () +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 +@@ -126,6 +126,53 @@ get_random_theme () return theme; } @@ -356,7 +202,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greet static gboolean greeter_ctrl_handler (GIOChannel *source, GIOCondition cond, -@@ -184,6 +231,8 @@ process_operation (guchar op_code, +@@ -192,6 +239,8 @@ process_operation (guchar op_code, break; case GDM_PROMPT: @@ -365,7 +211,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greet tmp = ve_locale_to_utf8 (args); if (tmp != NULL && strcmp (tmp, _("Username:")) == 0) { gdm_common_login_sound (gdm_config_get_string (GDM_KEY_SOUND_PROGRAM), -@@ -205,6 +254,8 @@ process_operation (guchar op_code, +@@ -214,6 +263,8 @@ process_operation (guchar op_code, break; case GDM_NOECHO: @@ -373,8 +219,8 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greet + tmp = ve_locale_to_utf8 (args); - if (tmp != NULL && strcmp (tmp, _("Password:")) == 0) -@@ -217,6 +268,8 @@ process_operation (guchar op_code, + greeter_probably_login_prompt = FALSE; +@@ -233,6 +284,8 @@ process_operation (guchar op_code, break; case GDM_MSG: @@ -383,7 +229,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greet tmp = ve_locale_to_utf8 (args); greeter_item_pam_message (tmp); g_free (tmp); -@@ -225,6 +278,8 @@ process_operation (guchar op_code, +@@ -241,6 +294,8 @@ process_operation (guchar op_code, break; case GDM_ERRBOX: @@ -392,7 +238,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greet tmp = ve_locale_to_utf8 (args); greeter_item_pam_error (tmp); g_free (tmp); -@@ -234,30 +289,17 @@ process_operation (guchar op_code, +@@ -250,30 +305,17 @@ process_operation (guchar op_code, break; case GDM_ERRDLG: @@ -424,9 +270,9 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greet + show_errdlg_messages (); + tmp = ve_locale_to_utf8 (args); - session = gdm_session_lookup (tmp); - g_free (tmp); -@@ -274,6 +316,8 @@ process_operation (guchar op_code, + session = gdm_session_lookup (tmp, &lookup_status); + if (lookup_status != SESSION_LOOKUP_SUCCESS) { +@@ -341,6 +383,8 @@ process_operation (guchar op_code, break; case GDM_LANG: @@ -435,7 +281,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greet language = greeter_language_get_language (args); if (greeter_language_get_save_language () == GTK_RESPONSE_CANCEL) printf ("%c%s\n", STX, GDM_RESPONSE_CANCEL); -@@ -284,6 +328,8 @@ process_operation (guchar op_code, +@@ -351,6 +395,8 @@ process_operation (guchar op_code, break; case GDM_SSESS: @@ -444,7 +290,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greet if (gdm_get_save_session () == GTK_RESPONSE_YES) printf ("%cY\n", STX); else -@@ -293,6 +339,8 @@ process_operation (guchar op_code, +@@ -360,6 +406,8 @@ process_operation (guchar op_code, break; case GDM_SLANG: @@ -453,7 +299,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greet if (greeter_language_get_save_language () == GTK_RESPONSE_YES) printf ("%cY\n", STX); else -@@ -325,6 +373,8 @@ process_operation (guchar op_code, +@@ -399,6 +447,8 @@ process_operation (guchar op_code, break; case GDM_QUIT: @@ -462,7 +308,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greet greeter_item_timed_stop (); if (require_quarter) { -@@ -429,6 +479,8 @@ process_operation (guchar op_code, +@@ -503,6 +553,8 @@ process_operation (guchar op_code, break; case GDM_SAVEDIE: @@ -471,7 +317,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greet /* Set busy cursor */ gdm_common_setup_cursor (GDK_WATCH); -@@ -448,6 +500,8 @@ process_operation (guchar op_code, +@@ -522,6 +574,8 @@ process_operation (guchar op_code, break; default: @@ -480,27 +326,26 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.c gdm-2.16.1-post/gui/greeter/greet gdm_common_fail_greeter ("Unexpected greeter command received: '%c'", op_code); break; } -@@ -773,6 +827,7 @@ gdm_read_config (void) +@@ -849,6 +903,7 @@ gdm_read_config (void) gdm_config_get_bool (GDM_KEY_SOUND_ON_LOGIN); gdm_config_get_bool (GDM_KEY_DEFAULT_WELCOME); gdm_config_get_bool (GDM_KEY_DEFAULT_REMOTE_WELCOME); -+ gdm_config_get_bool (GDM_KEY_SHOW_DOMAIN); ++ gdm_config_get_bool (GDM_KEY_SHOW_DOMAIN); + gdm_config_get_bool (GDM_KEY_ADD_GTK_MODULES); - /* Keys not to include in reread_config */ - gdm_config_get_string (GDM_KEY_SESSION_DESKTOP_DIR); -@@ -832,7 +887,8 @@ greeter_reread_config (int sig, gpointer - gdm_config_reload_bool (GDM_KEY_GRAPHICAL_THEME_RAND) || + /* Keys for custom commands */ +@@ -934,6 +989,7 @@ greeter_reread_config (int sig, gpointer gdm_config_reload_bool (GDM_KEY_SHOW_LAST_SESSION) || gdm_config_reload_bool (GDM_KEY_ALLOW_ROOT) || -- gdm_config_reload_bool (GDM_KEY_ALLOW_REMOTE_ROOT)) { -+ gdm_config_reload_bool (GDM_KEY_ALLOW_REMOTE_ROOT) || -+ gdm_config_reload_bool (GDM_KEY_SHOW_DOMAIN)) { + gdm_config_reload_bool (GDM_KEY_ALLOW_REMOTE_ROOT) || ++ gdm_config_reload_bool (GDM_KEY_SHOW_DOMAIN) || + gdm_config_reload_bool (GDM_KEY_ADD_GTK_MODULES)) { /* Set busy cursor */ - gdm_common_setup_cursor (GDK_WATCH); -diff -upr gdm-2.16.1-pre/gui/greeter/greeter_canvas_item.c gdm-2.16.1-post/gui/greeter/greeter_canvas_item.c ---- gdm-2.16.1-pre/gui/greeter/greeter_canvas_item.c 2006-11-08 00:02:48.000000000 -0600 -+++ gdm-2.16.1-post/gui/greeter/greeter_canvas_item.c 2006-11-08 00:02:57.000000000 -0600 +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 @@ -20,6 +20,8 @@ #include @@ -510,18 +355,17 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_canvas_item.c gdm-2.16.1-post/gui/g #include #include #include -@@ -40,6 +42,10 @@ - #include "greeter_canvas_item.h" - #include "greeter_configuration.h" +@@ -42,6 +44,9 @@ #include "greeter_canvas_text.h" -+#include "greeter_parser.h" -+ + #include "greeter_parser.h" + +#define WBINFO_DOMAINS_MAX 64 +#define WBINFO_READ_MAX 256 - - static void - apply_tint (GdkPixbuf *pixbuf, guint32 tint_color) -@@ -376,6 +382,189 @@ set_root_pixmap (GdkPixmap *pixmap) ++ + /* Keep track of buttons so they can be set sensitive/insensitive */ + GtkButton *gtk_ok_button = NULL; + GtkButton *gtk_start_again_button = NULL; +@@ -381,6 +386,189 @@ set_root_pixmap (GdkPixmap *pixmap) return FALSE; } @@ -711,7 +555,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_canvas_item.c gdm-2.16.1-post/gui/g void greeter_item_create_canvas_item (GreeterItemInfo *item) { -@@ -661,6 +850,48 @@ greeter_item_create_canvas_item (Greeter +@@ -672,6 +860,48 @@ greeter_item_create_canvas_item (Greeter break; @@ -760,11 +604,11 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_canvas_item.c gdm-2.16.1-post/gui/g case GREETER_ITEM_TYPE_LIST: /* Note a list type must be setup later and we will add the list store * to it then, depending on the type. Likely userlist is the -Only in gdm-2.16.1-post/gui/greeter: greeter_canvas_item.c.orig -diff -upr gdm-2.16.1-pre/gui/greeter/greeter_configuration.h gdm-2.16.1-post/gui/greeter/greeter_configuration.h ---- gdm-2.16.1-pre/gui/greeter/greeter_configuration.h 2005-04-18 21:57:56.000000000 -0500 -+++ gdm-2.16.1-post/gui/greeter/greeter_configuration.h 2006-11-08 00:02:57.000000000 -0600 -@@ -62,6 +62,7 @@ extern gchar *GdmSoundOnLoginFailureFile +Index: gdm-2.17.7/gui/greeter/greeter_configuration.h +=================================================================== +--- gdm-2.17.7.orig/gui/greeter/greeter_configuration.h ++++ gdm-2.17.7/gui/greeter/greeter_configuration.h +@@ -65,6 +65,7 @@ extern gchar *GdmSoundOnLoginFailureFile extern gboolean GdmSoundOnLoginReady; extern gboolean GdmSoundOnLoginSuccess; extern gboolean GdmSoundOnLoginFailure; @@ -772,9 +616,10 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_configuration.h gdm-2.16.1-post/gui extern gboolean GDM_IS_LOCAL; extern gboolean DOING_GDM_DEVELOPMENT; -diff -upr gdm-2.16.1-pre/gui/greeter/greeter.h gdm-2.16.1-post/gui/greeter/greeter.h ---- gdm-2.16.1-pre/gui/greeter/greeter.h 2005-10-06 16:30:26.000000000 -0500 -+++ gdm-2.16.1-post/gui/greeter/greeter.h 2006-11-08 00:02:57.000000000 -0600 +Index: gdm-2.17.7/gui/greeter/greeter.h +=================================================================== +--- gdm-2.17.7.orig/gui/greeter/greeter.h ++++ gdm-2.17.7/gui/greeter/greeter.h @@ -27,6 +27,9 @@ extern GtkWidget *window; extern gboolean greeter_probably_login_prompt; @@ -785,23 +630,25 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter.h gdm-2.16.1-post/gui/greeter/greet void greeter_ignore_buttons (gboolean val); #endif -diff -upr gdm-2.16.1-pre/gui/greeter/greeter_item.c gdm-2.16.1-post/gui/greeter/greeter_item.c ---- gdm-2.16.1-pre/gui/greeter/greeter_item.c 2006-04-26 21:10:16.000000000 -0500 -+++ gdm-2.16.1-post/gui/greeter/greeter_item.c 2006-11-08 00:02:57.000000000 -0600 -@@ -209,6 +209,10 @@ greeter_item_is_visible (GreeterItemInfo - strcmp (info->show_type, "suspend") == 0)) - return FALSE; +Index: gdm-2.17.7/gui/greeter/greeter_item.c +=================================================================== +--- gdm-2.17.7.orig/gui/greeter/greeter_item.c ++++ gdm-2.17.7/gui/greeter/greeter_item.c +@@ -223,6 +223,10 @@ greeter_item_is_visible (GreeterItemInfo + g_free (key_string); + } + if ( ! gdm_config_get_bool (GDM_KEY_SHOW_DOMAIN) && + g_str_has_prefix (info->show_type, "domain")) + return FALSE; + if (( ! gdm_config_get_bool (GDM_KEY_TIMED_LOGIN_ENABLE) || - ve_string_empty (gdm_config_get_string (GDM_KEY_TIMED_LOGIN))) && - (info->show_type != NULL && -diff -upr gdm-2.16.1-pre/gui/greeter/greeter_item.h gdm-2.16.1-post/gui/greeter/greeter_item.h ---- gdm-2.16.1-pre/gui/greeter/greeter_item.h 2006-04-26 21:10:16.000000000 -0500 -+++ gdm-2.16.1-post/gui/greeter/greeter_item.h 2006-11-08 00:02:57.000000000 -0600 + ve_string_empty (gdm_config_get_string (GDM_KEY_TIMED_LOGIN)) || + NULL == g_getenv("GDM_TIMED_LOGIN_OK")) && +Index: gdm-2.17.7/gui/greeter/greeter_item.h +=================================================================== +--- gdm-2.17.7.orig/gui/greeter/greeter_item.h ++++ gdm-2.17.7/gui/greeter/greeter_item.h @@ -47,7 +47,8 @@ enum _GreeterItemType { GREETER_ITEM_TYPE_LABEL, GREETER_ITEM_TYPE_ENTRY, @@ -814,16 +661,17 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_item.h gdm-2.16.1-post/gui/greeter/ /* Make sure to adjust the bitfield in the structure if @@ -147,7 +148,7 @@ struct _GreeterItemInfo { union { - /* Note: we want to have alphas, colors and have_color coincide for all types - that have it */ + /* Note: we want to have alphas, colors and have_color coincide for + * all types that have it */ -#define GREETER_ITEM_TYPE_IS_TEXT(info) ((info)->item_type == GREETER_ITEM_TYPE_LABEL || (info)->item_type == GREETER_ITEM_TYPE_ENTRY) +#define GREETER_ITEM_TYPE_IS_TEXT(info) ((info)->item_type == GREETER_ITEM_TYPE_LABEL || (info)->item_type == GREETER_ITEM_TYPE_ENTRY || (info)->item_type == GREETER_ITEM_TYPE_COMBO_BOX_ENTRY) struct { guint8 alphas[GREETER_ITEM_STATE_MAX]; guint32 colors[GREETER_ITEM_STATE_MAX]; -diff -upr gdm-2.16.1-pre/gui/greeter/greeter_item_pam.c gdm-2.16.1-post/gui/greeter/greeter_item_pam.c ---- gdm-2.16.1-pre/gui/greeter/greeter_item_pam.c 2006-06-09 16:07:42.000000000 -0500 -+++ gdm-2.16.1-post/gui/greeter/greeter_item_pam.c 2006-11-08 00:02:57.000000000 -0600 +Index: gdm-2.17.7/gui/greeter/greeter_item_pam.c +=================================================================== +--- gdm-2.17.7.orig/gui/greeter/greeter_item_pam.c ++++ gdm-2.17.7/gui/greeter/greeter_item_pam.c @@ -36,6 +36,7 @@ #include "gdm.h" #include "gdmwm.h" @@ -832,7 +680,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_item_pam.c gdm-2.16.1-post/gui/gree static gboolean messages_to_give = FALSE; static gboolean replace_msg = TRUE; -@@ -115,11 +116,29 @@ set_text (GreeterItemInfo *info, const c +@@ -117,11 +118,29 @@ set_text (GreeterItemInfo *info, const c info->item); } @@ -862,8 +710,8 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_item_pam.c gdm-2.16.1-post/gui/gree + char *tmp, *tmp2; GreeterItemInfo *error_info; - greeter_ignore_buttons (TRUE); -@@ -146,6 +165,7 @@ greeter_item_pam_login (GtkEntry *entry, + if (gtk_ok_button != NULL) +@@ -153,6 +172,7 @@ greeter_item_pam_login (GtkEntry *entry, } gtk_widget_set_sensitive (GTK_WIDGET (entry), FALSE); @@ -871,7 +719,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_item_pam.c gdm-2.16.1-post/gui/gree /* clear the err_box */ if (err_box_clear_handler > 0) -@@ -160,6 +180,33 @@ greeter_item_pam_login (GtkEntry *entry, +@@ -167,6 +187,33 @@ greeter_item_pam_login (GtkEntry *entry, } tmp = ve_locale_from_utf8 (str); @@ -905,7 +753,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_item_pam.c gdm-2.16.1-post/gui/gree printf ("%c%s\n", STX, tmp); fflush (stdout); g_free (tmp); -@@ -213,6 +260,7 @@ greeter_item_pam_setup (void) +@@ -233,6 +280,7 @@ greeter_item_pam_setup (void) /* initially insensitive */ gtk_widget_set_sensitive (entry, FALSE); @@ -913,7 +761,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_item_pam.c gdm-2.16.1-post/gui/gree } g_signal_connect (entry, "activate", -@@ -252,6 +300,9 @@ greeter_item_pam_prompt (const char *mes +@@ -272,6 +320,9 @@ greeter_item_pam_prompt (const char *mes gtk_entry_set_max_length (GTK_ENTRY (entry), entry_len); gtk_entry_set_text (GTK_ENTRY (entry), ""); gtk_widget_grab_focus (entry); @@ -923,10 +771,11 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_item_pam.c gdm-2.16.1-post/gui/gree } messages_to_give = FALSE; -diff -upr gdm-2.16.1-pre/gui/greeter/greeter_parser.c gdm-2.16.1-post/gui/greeter/greeter_parser.c ---- gdm-2.16.1-pre/gui/greeter/greeter_parser.c 2006-08-02 21:32:39.000000000 -0500 -+++ gdm-2.16.1-post/gui/greeter/greeter_parser.c 2006-11-08 00:02:57.000000000 -0600 -@@ -394,6 +394,11 @@ parse_stock (xmlNodePtr node, +Index: gdm-2.17.7/gui/greeter/greeter_parser.c +=================================================================== +--- gdm-2.17.7.orig/gui/greeter/greeter_parser.c ++++ gdm-2.17.7/gui/greeter/greeter_parser.c +@@ -395,6 +395,11 @@ parse_stock (xmlNodePtr node, g_free (*translated_text); *translated_text = g_strdup (_("Username:")); } @@ -938,7 +787,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_parser.c gdm-2.16.1-post/gui/greete else if (g_ascii_strcasecmp ((char *) prop, "ok") == 0) { g_free (*translated_text); -@@ -1552,6 +1557,15 @@ parse_entry (xmlNodePtr node, +@@ -1633,6 +1638,15 @@ parse_entry (xmlNodePtr node, } static gboolean @@ -954,7 +803,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_parser.c gdm-2.16.1-post/gui/greete parse_items (xmlNodePtr node, GList **items_out, GreeterItemInfo *parent, -@@ -1606,6 +1620,8 @@ parse_items (xmlNodePtr node, +@@ -1687,6 +1701,8 @@ parse_items (xmlNodePtr node, item_type = GREETER_ITEM_TYPE_LIST; else if (strcmp ((char *) type, "button") == 0) item_type = GREETER_ITEM_TYPE_BUTTON; @@ -963,7 +812,7 @@ diff -upr gdm-2.16.1-pre/gui/greeter/greeter_parser.c gdm-2.16.1-post/gui/greete else { g_set_error (error, -@@ -1650,6 +1666,9 @@ parse_items (xmlNodePtr node, +@@ -1733,6 +1749,9 @@ parse_items (xmlNodePtr node, case GREETER_ITEM_TYPE_BUTTON: res = parse_gtkbutton (child, info, error); break; diff --git a/gdm-autobuild-warning.patch b/gdm-autobuild-warning.patch deleted file mode 100644 index d8084b9..0000000 --- a/gdm-autobuild-warning.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gui/gdmchooser.c -+++ gui/gdmchooser.c -@@ -1798,6 +1798,9 @@ - gdm_config_get_bool (GDM_KEY_MULTICAST); - - gdmcomm_comm_bulk_stop (); -+ -+ return TRUE; -+ - } - - static gboolean ---- gui/greeter/greeter_action_language.c -+++ gui/greeter/greeter_action_language.c -@@ -31,6 +31,7 @@ - #include "greeter_configuration.h" - #include "greeter_item_pam.h" - #include "greeter_action_language.h" -+#include "greeter_parser.h" - - #define LAST_LANGUAGE "Last" - #define DEFAULT_LANGUAGE "Default" diff --git a/gdm-bufferoverrun.patch b/gdm-bufferoverrun.patch deleted file mode 100644 index b8ee816..0000000 --- a/gdm-bufferoverrun.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gdm-2.17.3/vicious-extensions/ve-miscui.c-orig 2006-12-05 16:28:27.460459000 -0600 -+++ gdm-2.17.3/vicious-extensions/ve-miscui.c 2006-12-05 16:28:38.677749000 -0600 -@@ -76,10 +76,10 @@ ve_hig_dialog_new (GtkWindow *paren - GTK_DIALOG_DESTROY_WITH_PARENT, - type, - buttons, -- primary_message); -+ "%s", primary_message); - - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), -- secondary_message); -+ "%s", secondary_message); - - gtk_window_set_title (GTK_WINDOW (dialog), ""); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); diff --git a/gdm-gdmsetup.patch b/gdm-gdmsetup.patch index 5818d2f..b365c71 100644 --- a/gdm-gdmsetup.patch +++ b/gdm-gdmsetup.patch @@ -1,9 +1,11 @@ ---- gui/gdmsetup.desktop.in.in +Index: gui/gdmsetup.desktop.in.in +=================================================================== +--- gui/gdmsetup.desktop.in.in.orig +++ gui/gdmsetup.desktop.in.in -@@ -3,7 +3,7 @@ +@@ -2,7 +2,7 @@ + Encoding=UTF-8 _Name=Login Window - _GenericName=Login Window Preferences - _Comment=Configure the login window (GNOME Display Manager) + _Comment=Configure GDM login window appearance and behavior -TryExec=@sbindir@/gdmsetup +TryExec=gdmsetup Exec=gdmsetup diff --git a/gdm-language-dialog-size.patch b/gdm-language-dialog-size.patch index 4845144..75f5d2e 100644 --- a/gdm-language-dialog-size.patch +++ b/gdm-language-dialog-size.patch @@ -1,29 +1,32 @@ ---- gdm-2.8.0.4/gui/greeter/greeter_action_language.c -+++ gdm-2.8.0.4/gui/greeter/greeter_action_language.c -@@ -212,6 +212,7 @@ +Index: gdm-2.17.7/gui/greeter/greeter_action_language.c +=================================================================== +--- gdm-2.17.7.orig/gui/greeter/greeter_action_language.c ++++ gdm-2.17.7/gui/greeter/greeter_action_language.c +@@ -220,6 +220,7 @@ greeter_language_setup_treeview (void) GtkWidget *swindow; GtkWidget *label; char *s; + int y_size; - dialog = gtk_dialog_new_with_buttons (_("Select a language"), + dialog = gtk_dialog_new_with_buttons (_("Select a Language"), #ifdef TODO -@@ -264,9 +265,17 @@ - gtk_container_add (GTK_CONTAINER (swindow), view); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), +@@ -286,9 +287,17 @@ greeter_language_setup_treeview (void) + gtk_container_add (GTK_CONTAINER (swindow), tv); + gtk_box_pack_start (GTK_BOX (main_vbox), swindow, TRUE, TRUE, 0); + + y_size = gdm_wm_screen.height; + /* If our screen has any sort of reasonable y-resolution, -+ don't make the dialog as tall as the screen. This is a -+ silly hack, but does make things a bit prettier. */ ++ don't make the dialog as tall as the screen. This is a ++ silly hack, but does make things a bit prettier. */ + if (y_size > 600) -+ y_size = 8 * y_size / 10; ++ y_size = 8 * y_size / 10; + gtk_window_set_default_size (GTK_WINDOW (dialog), - MIN (400, gdm_wm_screen.width), +- MIN (400, gdm_wm_screen.width), - MIN (600, gdm_wm_screen.height)); -+ y_size); - g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (view))), ++ MIN (400, gdm_wm_screen.width), ++ y_size); + g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (tv))), "changed", (GCallback) selection_changed, diff --git a/gdm-xdm-sessions.patch b/gdm-xdm-sessions.patch index 4edf153..90d35c0 100644 --- a/gdm-xdm-sessions.patch +++ b/gdm-xdm-sessions.patch @@ -1,6 +1,8 @@ ---- gdm-2.16.1/config/Xsession.in -+++ gdm-2.16.1/config/Xsession.in -@@ -1,247 +1,3 @@ +Index: gdm-2.17.7/config/Xsession.in +=================================================================== +--- gdm-2.17.7.orig/config/Xsession.in ++++ gdm-2.17.7/config/Xsession.in +@@ -1,251 +1,3 @@ #!@XSESSION_SHELL@ -# -# This is SORT OF LIKE an X session, but not quite. You get a command as the @@ -82,7 +84,7 @@ - -if [ x"$command" = xfailsafe ] ; then - if [ -n "$zenity" ] ; then -- disptext=`gettextfunc "This is the failsafe xterm session. Windows now have focus only if you have your cursor above them. To get out of this mode type 'exit' in the window in the upper left corner"` +- disptext=`gettextfunc "This is the failsafe xterm session. Windows now have focus only if you have your cursor above them. To get out of this mode type 'exit' in the window."` - "$zenity" --info --text "$disptext" - else - echo "$0: Starting the failsafe xterm session." @@ -222,9 +224,13 @@ - elif [ -x /etc/X11/Xclients ]; then - command="/etc/X11/Xclients" - else -- echo "$0: Cannot find Xclients" -- # FIXME: kind of an evil failsafe -- command="xsm" +- if [ -n "$zenity" ] ; then +- disptext=`gettextfunc "System has no Xclients file, so starting a failsafe xterm session. Windows will have focus only if the mouse pointer is above them. To get out of this mode type 'exit' in the window."` +- "$zenity" --info --text "$disptext" +- else +- echo "$0: Cannot find Xclients" +- fi +- exec xterm -geometry 80x24+0+0 - fi -fi - @@ -243,9 +249,10 @@ -echo "$0: Executing $command failed, will run xterm" - -if [ -n "$zenity" ] ; then -- disptext=`gettextfunc "Failed to start the session, so starting a failsafe xterm session. Windows will have focus only if the mouse pointer is above them. To get out of this mode type 'exit' in the window in the upper left corner"` +- disptext=`gettextfunc "Failed to start the session, so starting a failsafe xterm session. Windows will have focus only if the mouse pointer is above them. To get out of this mode type 'exit' in the window."` - "$zenity" --info --text "$disptext" -fi - -exec xterm -geometry 80x24+0+0 +exec /etc/X11/xdm/Xsession $1 $GDM_LANG +\ No newline at end of file diff --git a/gdm.changes b/gdm.changes index 6cbb81d..afcfb2f 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 13 17:42:14 CST 2007 - maw@suse.de + +- Update to version 2.17.7 +- Removeupstreamed gdm-autobuild-warning.patch, + gdm-bufferoverrun.patch +- Bug fixes, including bugzilla.gnome.org #335786, #400793, + #400698, #399486, #352263, #395790, #394421. + ------------------------------------------------------------------- Fri Mar 2 14:53:59 CET 2007 - sbrabec@suse.cz diff --git a/gdm.spec b/gdm.spec index 416228a..01cbc19 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.16.1) +# spec file for package gdm (Version 2.17.7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -24,8 +24,8 @@ PreReq: %insserv_prereq License: GNU General Public License (GPL) Group: System/GUI/GNOME Autoreqprov: on -Version: 2.16.1 -Release: 60 +Version: 2.17.7 +Release: 1 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -50,11 +50,9 @@ Patch21: gdm-2.8.0.7-halt-needs-root.patch Patch22: gdm-2.8.0.7-onlyshow-in-gnome.diff Patch24: gdm-server-timeout.patch Patch26: gdm-2.8.0.7-some-info-in-dialog.patch -Patch27: gdm-autobuild-warning.patch Patch28: gdm-X_SERVER.patch Patch29: gdm-gdmsetup.patch Patch30: gdm-conf-custom-sysconfig.patch -Patch31: gdm-bufferoverrun.patch Patch32: gdm-trunk-string-literal-cmp.patch Patch33: gdm-2.13.0.4-audit-login.patch URL: http://www.gnome.org/ @@ -95,18 +93,17 @@ gnome-patch-translation-prepare %patch14 -p1 %patch15 -p1 %patch19 -p1 -%if %suse_version > 1000 +# %if %suse_version > 1000 %patch20 -p1 -%patch21 -p1 -%endif +# FIXME: this needs to be re-done +# %patch21 -p1 +# %endif %patch22 -p1 %patch24 %patch26 -p1 -%patch27 %patch28 %patch29 %patch30 -%patch31 -p1 %patch32 %patch33 -p1 gnome-patch-translation-update @@ -165,7 +162,7 @@ ln -s ../sbin/gdm $RPM_BUILD_ROOT%{_bindir}/gdm rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a %clean -rm -rf $RPM_BUILD_ROOT +# rm -rf $RPM_BUILD_ROOT %pre # Remove old logs (#56205). @@ -233,6 +230,12 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i %endif %changelog +* Tue Mar 13 2007 - maw@suse.de +- Update to version 2.17.7 +- Removeupstreamed gdm-autobuild-warning.patch, + gdm-bufferoverrun.patch +- Bug fixes, including bugzilla.gnome.org #335786, #400793, + [#400698], #399486, #352263, #395790, #394421. * Fri Mar 02 2007 - sbrabec@suse.cz - Do not own /usr/share/xsessions (#229172). * Tue Feb 27 2007 - hpj@suse.de