Hello community, here is the log from the commit of package gdm checked in at Wed Nov 8 10:07:54 CET 2006. -------- --- GNOME/gdm/gdm.changes 2006-10-31 16:53:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2006-11-08 08:13:05.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Nov 8 08:08:14 CET 2006 - hpj@suse.de + +- Update and re-enable gdm-bash-profile.patch. +- Update and re-enable gdm-2.8.0.0-setup-no-flicker.patch. +- Drop gdm-2.8.0.0-timed-login-enact.patch (similar fix upstream). +- Update and re-enable gdm-2.8.0.7-domain-entry.patch. +- Update and re-enable gdm-2.8.0.7-hald-needs-root.patch. +- Drop gdm-2.8.0.7-user-must-own-iceauthority (upstream). +- Update gdm-autobuild-warning.patch (conflict with previous patch). + +------------------------------------------------------------------- Old: ---- gdm-2.8.0.0-timed-login-enact.patch gdm-2.8.0.7-user-must-own-iceauthority.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.suyU92/_old 2006-11-08 10:07:38.000000000 +0100 +++ /var/tmp/diff_new_pack.suyU92/_new 2006-11-08 10:07:38.000000000 +0100 @@ -22,7 +22,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 2.16.1 -Release: 16 +Release: 23 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -40,13 +40,11 @@ Patch13: gdm-2.8.0.0-any-hostname-auth.patch Patch14: gdm-2.8.0.0-list-users.patch Patch15: gdm-2.8.0.0-setup-no-flicker.patch -Patch16: gdm-2.8.0.0-timed-login-enact.patch Patch19: gdm-2.8.0.7-bg-4.patch Patch20: gdm-2.8.0.7-domain-entry.patch 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 -Patch25: gdm-2.8.0.7-user-must-own-iceauthority.patch Patch26: gdm-2.8.0.7-some-info-in-dialog.patch Patch27: gdm-autobuild-warning.patch Patch28: gdm-X_SERVER.patch @@ -75,9 +73,9 @@ %prep %setup -#gnome-patch-translation-prepare +gnome-patch-translation-prepare %patch -p1 -#%patch2 -p1 +%patch2 -p1 %patch3 -p1 %patch4 %patch5 -p1 @@ -85,29 +83,26 @@ %patch12 %patch13 -p1 %patch14 -p1 -#%patch15 -p1 -#%patch16 -p1 +%patch15 -p1 %patch19 -p1 %if %suse_version > 1000 -# Uncomment gnome-patch-translation-update after uncommention of patches 20 and 21! -#%patch20 -p1 -#%patch21 -p1 +%patch20 -p1 +%patch21 -p1 %endif %patch22 -p1 %patch24 -#%patch25 -p1 %patch26 -p1 %patch27 %patch28 %patch29 %patch30 -#gnome-patch-translation-update +gnome-patch-translation-update %build libtoolize --force aclocal -I . automake --add-missing -c -autoconf +autoreconf export ac_aux_dir=$RPM_BUILD_DIR/gdm-%{version} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " \ LDFLAGS=-L/usr/%_lib \ @@ -231,6 +226,14 @@ %dir /usr/share/xsessions %changelog -n gdm +* Wed Nov 08 2006 - hpj@suse.de +- Update and re-enable gdm-bash-profile.patch. +- Update and re-enable gdm-2.8.0.0-setup-no-flicker.patch. +- Drop gdm-2.8.0.0-timed-login-enact.patch (similar fix upstream). +- Update and re-enable gdm-2.8.0.7-domain-entry.patch. +- Update and re-enable gdm-2.8.0.7-hald-needs-root.patch. +- Drop gdm-2.8.0.7-user-must-own-iceauthority (upstream). +- Update gdm-autobuild-warning.patch (conflict with previous patch). * Tue Oct 31 2006 - sbrabec@suse.cz - Rewritten SuSEconfig.gdm to work better with new custom.conf (#213037). ++++++ gdm-2.8.0.0-setup-no-flicker.patch ++++++ --- /var/tmp/diff_new_pack.suyU92/_old 2006-11-08 10:07:38.000000000 +0100 +++ /var/tmp/diff_new_pack.suyU92/_new 2006-11-08 10:07:38.000000000 +0100 @@ -1,15 +1,16 @@ ---- gdm-2.8.0.7/gui/gdmsetup.c -+++ gdm-2.8.0.7/gui/gdmsetup.c -@@ -43,6 +43,8 @@ - #include "gdmcomm.h" - #include "gdmuser.h" +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; +#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 -@@ -679,7 +681,7 @@ +@@ -1069,7 +1071,7 @@ combobox_timeout (GtkWidget *combo_box) static void toggle_toggled (GtkWidget *toggle) { @@ -18,16 +19,7 @@ } static void -@@ -702,7 +704,7 @@ - 2); - } - -- run_timeout (toggle, 200, toggle_timeout); -+ run_timeout (toggle, LONG_TIMEOUT, toggle_timeout); - } - - static void -@@ -719,13 +721,13 @@ +@@ -1097,13 +1099,13 @@ list_selection_toggled (GtkWidget *toggl gtk_widget_set_sensitive (widget, FALSE); } @@ -43,17 +35,17 @@ } static void -@@ -784,6 +786,9 @@ - g_object_set_data_full (G_OBJECT (toggle), - "notify_key", g_strdup (notify_key), +@@ -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_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), val); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), val); -@@ -1461,7 +1466,7 @@ +@@ -2252,7 +2257,7 @@ greeter_toggle_timeout (GtkWidget *toggl static void greeter_toggle_toggled (GtkWidget *toggle) { @@ -62,7 +54,7 @@ } static void -@@ -1788,7 +1793,7 @@ +@@ -2595,7 +2600,7 @@ greeter_entry_untranslate_timeout (GtkWi static void greeter_entry_untranslate_changed (GtkWidget *entry) { ++++++ gdm-2.8.0.7-domain-entry.patch ++++++ ++++ 914 lines (skipped) ++++ between GNOME/gdm/gdm-2.8.0.7-domain-entry.patch ++++ and /mounts/work_src_done/STABLE/gdm/gdm-2.8.0.7-domain-entry.patch ++++++ gdm-2.8.0.7-halt-needs-root.patch ++++++ ++++ 1075 lines (skipped) ++++ between GNOME/gdm/gdm-2.8.0.7-halt-needs-root.patch ++++ and /mounts/work_src_done/STABLE/gdm/gdm-2.8.0.7-halt-needs-root.patch ++++++ gdm-autobuild-warning.patch ++++++ --- /var/tmp/diff_new_pack.suyU92/_old 2006-11-08 10:07:38.000000000 +0100 +++ /var/tmp/diff_new_pack.suyU92/_new 2006-11-08 10:07:38.000000000 +0100 @@ -20,13 +20,3 @@ #define LAST_LANGUAGE "Last" #define DEFAULT_LANGUAGE "Default" ---- gui/greeter/greeter_canvas_item.c -+++ gui/greeter/greeter_canvas_item.c -@@ -40,6 +40,7 @@ - #include "greeter_canvas_item.h" - #include "greeter_configuration.h" - #include "greeter_canvas_text.h" -+#include "greeter_parser.h" - - static void - apply_tint (GdkPixbuf *pixbuf, guint32 tint_color) ++++++ gdm-bash-profile.patch ++++++ --- /var/tmp/diff_new_pack.suyU92/_old 2006-11-08 10:07:38.000000000 +0100 +++ /var/tmp/diff_new_pack.suyU92/_new 2006-11-08 10:07:38.000000000 +0100 @@ -1,67 +1,80 @@ ---- gdm-2.8.0.4/daemon/slave.c -+++ gdm-2.8.0.4/daemon/slave.c -@@ -3639,7 +3639,7 @@ - char *exec; - const char *shell = NULL; - VeConfig *dmrc = NULL; -- char *argv[4]; -+ char *argv[6]; +diff -upr gdm-2.16.1-pre/daemon/slave.c gdm-2.16.1-post/daemon/slave.c +--- gdm-2.16.1-pre/daemon/slave.c 2006-08-07 14:49:29.000000000 -0500 ++++ gdm-2.16.1-post/daemon/slave.c 2006-11-07 16:54:20.000000000 -0600 +@@ -3358,7 +3358,7 @@ session_child_run (struct passwd *pwent, + #ifndef HAVE_TSOL + char *argv[4]; + #else +- char *argv[7]; ++ char *argv[9]; + #endif #ifdef CAN_USE_SETPENV - extern char **newenv; -@@ -3855,6 +3855,8 @@ +@@ -3584,10 +3584,12 @@ session_child_run (struct passwd *pwent, argv[1] = NULL; argv[2] = NULL; argv[3] = NULL; -+ argv[4] = NULL; -+ argv[5] = NULL; +-#ifdef HAVE_TSOL + argv[4] = NULL; + argv[5] = NULL; ++#ifdef HAVE_TSOL + argv[6] = NULL; ++ argv[7] = NULL; ++ argv[8] = NULL; + #endif exec = NULL; - if (strcmp (session, GDM_SESSION_FAILSAFE_XTERM) != 0 && -@@ -3893,9 +3895,28 @@ - /* This is where everything is OK, and note that - we really DON'T care about leaks, we are going to - exec in just a bit */ -- argv[0] = GdmXsession; +@@ -3640,11 +3642,27 @@ session_child_run (struct passwd *pwent, + argv[3] = argv[4] = argv[5] = argv[6] = NULL; + } else { + #endif +- argv[0] = basexsession; - argv[1] = exec; - argv[2] = NULL; ++ /* If it looks like we are using bash, then run the Xsession ++ script in a login shell and pass it 'no-fake-login' as its ++ second argument. This keeps Xsession from sourcing .profile or ++ otherwise trying to pretend to be a login shell. */ + -+ /* If it looks like we are using bash, then run the Xsession -+ script in a login shell and pass it 'no-fake-login' as it's -+ second argument. This keeps Xsession from sourcing .profile or -+ otherwise trying to pretend to be a login shell. */ -+ if (strlen (pwent->pw_shell) > 4 -+ && ! strcmp (pwent->pw_shell + strlen (pwent->pw_shell) - 5, "/bash") -+ && g_file_test (pwent->pw_shell, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE)) { -+ argv[0] = pwent->pw_shell; -+ argv[1] = "--login"; -+ argv[2] = GdmXsession; -+ argv[3] = exec; -+ argv[4] = "no-fake-login"; -+ argv[5] = NULL; -+ } else { -+ argv[0] = GdmXsession; -+ argv[1] = exec; -+ argv[2] = NULL; -+ } -+ -+ -+ ++ if (strlen (pwent->pw_shell) > 4 ++ && ! strcmp (pwent->pw_shell + strlen (pwent->pw_shell) - 5, "/bash") ++ && g_file_test (pwent->pw_shell, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE)) { ++ argv[0] = pwent->pw_shell; ++ argv[1] = "--login"; ++ argv[2] = basexsession; ++ argv[3] = exec; ++ argv[4] = "no-fake-login"; ++ argv[5] = NULL; ++ } else { ++ argv[0] = basexsession; ++ argv[1] = exec; ++ argv[2] = NULL; ++ } + #ifdef HAVE_TSOL +- argv[3] = argv[4] = argv[5] = argv[6] = NULL; ++ argv [3] = argv [4] = argv[5] = argv[6] = argv[7] = argv[8] = NULL; + } + #endif } - } - -@@ -3955,10 +3976,13 @@ +@@ -3793,7 +3811,6 @@ session_child_run (struct passwd *pwent, failsafe = TRUE; } -- gdm_debug ("Running %s %s %s for %s on %s", -+ gdm_debug ("Running %s %s %s %s %s %s for %s on %s", +-#ifdef HAVE_TSOL + gdm_debug ("Running %s %s %s %s %s %s for %s on %s", argv[0], ve_sure_string (argv[1]), - ve_sure_string (argv[2]), -+ ve_sure_string (argv[3]), -+ ve_sure_string (argv[4]), -+ ve_sure_string (argv[5]), +@@ -3802,13 +3819,6 @@ session_child_run (struct passwd *pwent, + ve_sure_string (argv[4]), + ve_sure_string (argv[5]), login, d->name); +-#else +- gdm_debug ("Running %s %s %s for %s on %s", +- argv[0], +- ve_sure_string (argv[1]), +- ve_sure_string (argv[2]), +- login, d->name); +-#endif if ( ! ve_string_empty (pwent->pw_shell)) { + shell = pwent->pw_shell; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org