Hello community, here is the log from the commit of package gdm checked in at Fri Sep 14 16:10:00 CEST 2007. -------- --- GNOME/gdm/gdm.changes 2007-09-13 10:43:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2007-09-14 09:27:49.536168000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 14 09:26:58 CEST 2007 - hpj@suse.de + +- Update gdm-2.8.0.7-halt-needs-root.patch to fix Novell bug + #306418. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.q27644/_old 2007-09-14 16:08:34.000000000 +0200 +++ /var/tmp/diff_new_pack.q27644/_new 2007-09-14 16:08:34.000000000 +0200 @@ -22,7 +22,7 @@ License: GPL v2 or later Group: System/GUI/GNOME Version: 2.19.7 -Release: 12 +Release: 13 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -57,9 +57,9 @@ Patch40: gdm-XKeepsCrashing-SaX2.patch Patch41: gdm-2.19.7-vncxauth.patch Patch42: fix-desktop-files.diff -URL: http://www.gnome.org/ +Url: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Docdir: %{_defaultdocdir} +DocDir: %{_defaultdocdir} Provides: gdm2 Obsoletes: gdm2 %if %suse_version <= 1020 @@ -163,7 +163,6 @@ %find_lang %{name} ln -s ../sbin/gdm $RPM_BUILD_ROOT%{_bindir}/gdm rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a - %fdupes $RPM_BUILD_ROOT %clean @@ -248,6 +247,9 @@ %files lang -f %{name}.lang %changelog +* Fri Sep 14 2007 - hpj@suse.de +- Update gdm-2.8.0.7-halt-needs-root.patch to fix Novell bug + [#306418]. * Thu Sep 13 2007 - stbinner@suse.de - '%%suse_update_desktop_file -G "" foo' doesn't seem to work anymore * Wed Sep 12 2007 - jberkman@novell.com ++++++ gdm-2.8.0.7-halt-needs-root.patch ++++++ --- /var/tmp/diff_new_pack.q27644/_old 2007-09-14 16:08:34.000000000 +0200 +++ /var/tmp/diff_new_pack.q27644/_new 2007-09-14 16:08:34.000000000 +0200 @@ -1,6 +1,6 @@ -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-07-30 13:51:14.000000000 -0500 -+++ gdm-2.19.5-post/daemon/gdm-daemon-config-entries.h 2007-08-03 19:21:37.000000000 -0500 +diff -upr gdm-2.19.7-pre/daemon/gdm-daemon-config-entries.h gdm-2.19.7-post/daemon/gdm-daemon-config-entries.h +--- gdm-2.19.7-pre/daemon/gdm-daemon-config-entries.h 2007-09-14 00:07:36.000000000 -0500 ++++ gdm-2.19.7-post/daemon/gdm-daemon-config-entries.h 2007-09-14 00:07:32.000000000 -0500 @@ -110,6 +110,7 @@ typedef enum { GDM_ID_ALLOW_ROOT, GDM_ID_ALLOW_REMOTE_ROOT, @@ -9,7 +9,7 @@ GDM_ID_USER_MAX_FILE, GDM_ID_RELAX_PERM, GDM_ID_CHECK_DIR_OWNER, -@@ -359,6 +360,7 @@ static const GdmConfigEntry gdm_daemon_c +@@ -360,6 +361,7 @@ static const GdmConfigEntry gdm_daemon_c { GDM_CONFIG_GROUP_SECURITY, "AllowRoot", GDM_CONFIG_VALUE_BOOL, "true", GDM_ID_ALLOW_ROOT }, { GDM_CONFIG_GROUP_SECURITY, "AllowRemoteRoot", GDM_CONFIG_VALUE_BOOL, "false", GDM_ID_ALLOW_REMOTE_ROOT }, { GDM_CONFIG_GROUP_SECURITY, "AllowRemoteAutoLogin", GDM_CONFIG_VALUE_BOOL, "false", GDM_ID_ALLOW_REMOTE_AUTOLOGIN }, @@ -17,9 +17,9 @@ { GDM_CONFIG_GROUP_SECURITY, "UserMaxFile", GDM_CONFIG_VALUE_INT, "65536", GDM_ID_USER_MAX_FILE }, { GDM_CONFIG_GROUP_SECURITY, "RelaxPermissions", GDM_CONFIG_VALUE_INT, "0", GDM_ID_RELAX_PERM }, { GDM_CONFIG_GROUP_SECURITY, "CheckDirOwner", GDM_CONFIG_VALUE_BOOL, "true", GDM_ID_CHECK_DIR_OWNER }, -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 17:56:58.000000000 -0500 -+++ gdm-2.19.5-post/daemon/gdm-daemon-config-keys.h 2007-08-03 18:59:38.000000000 -0500 +diff -upr gdm-2.19.7-pre/daemon/gdm-daemon-config-keys.h gdm-2.19.7-post/daemon/gdm-daemon-config-keys.h +--- gdm-2.19.7-pre/daemon/gdm-daemon-config-keys.h 2007-09-14 00:07:36.000000000 -0500 ++++ gdm-2.19.7-post/daemon/gdm-daemon-config-keys.h 2007-09-14 00:07:32.000000000 -0500 @@ -98,6 +98,7 @@ G_BEGIN_DECLS #define GDM_KEY_ALLOW_ROOT "security/AllowRoot=true" #define GDM_KEY_ALLOW_REMOTE_ROOT "security/AllowRemoteRoot=false" @@ -36,10 +36,9 @@ #define GDM_NOTIFY_SYSTEM_MENU "SystemMenu" /* <true/false as int> */ #define GDM_NOTIFY_CONFIG_AVAILABLE "ConfigAvailable" /* <true/false as int> */ #define GDM_NOTIFY_CHOOSER_BUTTON "ChooserButton" /* <true/false as int> */ -Only in gdm-2.19.5-post/daemon: gdm.h.rej -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-07-30 13:51:14.000000000 -0500 -+++ gdm-2.19.5-post/daemon/gdm-socket-protocol.h 2007-08-03 18:57:43.000000000 -0500 +diff -upr gdm-2.19.7-pre/daemon/gdm-socket-protocol.h gdm-2.19.7-post/daemon/gdm-socket-protocol.h +--- gdm-2.19.7-pre/daemon/gdm-socket-protocol.h 2007-08-27 11:08:20.000000000 -0500 ++++ gdm-2.19.7-post/daemon/gdm-socket-protocol.h 2007-09-14 00:07:32.000000000 -0500 @@ -68,6 +68,8 @@ /* Different login interruptions */ #define GDM_INTERRUPT_TIMED_LOGIN 'T' @@ -49,10 +48,10 @@ #define GDM_INTERRUPT_SUSPEND 'S' #define GDM_INTERRUPT_SELECT_USER 'U' #define GDM_INTERRUPT_LOGIN_SOUND 'L' -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 17:56:58.000000000 -0500 -+++ gdm-2.19.5-post/daemon/slave.c 2007-08-03 19:10:15.000000000 -0500 -@@ -129,6 +129,8 @@ static gboolean do_timed_login = +diff -upr gdm-2.19.7-pre/daemon/slave.c gdm-2.19.7-post/daemon/slave.c +--- gdm-2.19.7-pre/daemon/slave.c 2007-09-14 00:07:36.000000000 -0500 ++++ gdm-2.19.7-post/daemon/slave.c 2007-09-14 00:08:08.000000000 -0500 +@@ -140,6 +140,8 @@ static gboolean do_timed_login = static gboolean do_configurator = FALSE; /* If this is true, login as * root and start the * configurator */ @@ -61,7 +60,7 @@ static gboolean do_cancel = FALSE; /* If this is true, go back to username entry & unselect face browser (if present) */ -@@ -2056,6 +2058,96 @@ play_login_sound (const char *sound_file +@@ -2067,6 +2069,96 @@ play_login_sound (const char *sound_file return TRUE; } @@ -158,7 +157,7 @@ static void gdm_slave_wait_for_login (void) { -@@ -2116,86 +2208,12 @@ gdm_slave_wait_for_login (void) +@@ -2127,86 +2219,14 @@ gdm_slave_wait_for_login (void) do_configurator = FALSE; g_free (login_user); login_user = NULL; @@ -208,7 +207,7 @@ - /* Wipe the login */ - g_free (login_user); - login_user = NULL; -- + - /* Note that this can still fall through to - * the timed login if the user doesn't type in the - * password fast enough and there is timed login @@ -216,12 +215,15 @@ - if (do_timed_login) { - break; - } -- ++ if (!get_root_auth (_("You must authenticate as root to run configuration."), &pwent)) { ++ if (do_timed_login) ++ break; + - if G_UNLIKELY (do_configurator) { - do_configurator = FALSE; - gdm_slave_greeter_ctl_no_ret (GDM_RESET, ""); -- continue; -- } + continue; + } - /* Now running as root */ - @@ -233,11 +235,8 @@ - * since we logged in, but I'm paranoid */ - gdm_slave_greeter_ctl_no_ret (GDM_RESET, ""); - continue; -+ if (!get_root_auth (_("You must authenticate as root to run configuration."), &pwent)) { -+ if (do_timed_login) -+ break; - } - +- } +- - d->logged_in = TRUE; - logged_in_uid = 0; - logged_in_gid = 0; @@ -248,7 +247,7 @@ /* Disable the login screen, we don't want people to * log in in the meantime */ gdm_slave_greeter_ctl_no_ret (GDM_DISABLE, ""); -@@ -2234,6 +2252,43 @@ gdm_slave_wait_for_login (void) +@@ -2245,6 +2265,43 @@ gdm_slave_wait_for_login (void) continue; } @@ -292,7 +291,7 @@ /* The user timed out into a timed login during the * conversation */ if (do_timed_login) { -@@ -5453,6 +5508,14 @@ check_for_interruption (const char *msg) +@@ -5519,6 +5576,14 @@ check_for_interruption (const char *msg) /* Not interrupted, continue reading input, * just proxy this to the master server */ return TRUE; @@ -307,7 +306,7 @@ case GDM_INTERRUPT_LOGIN_SOUND: if (d->attached && ! play_login_sound (gdm_daemon_config_get_value_string (GDM_KEY_SOUND_ON_LOGIN_FILE))) { -@@ -5909,6 +5972,8 @@ gdm_slave_action_pending (void) +@@ -5975,6 +6040,8 @@ gdm_slave_action_pending (void) { if (do_timed_login || do_configurator || @@ -316,7 +315,7 @@ do_restart_greeter || do_cancel) return FALSE; -@@ -6192,6 +6257,8 @@ gdm_slave_handle_notify (const char *msg +@@ -6258,6 +6325,8 @@ gdm_slave_handle_notify (const char *msg remanage_asap = TRUE; } } @@ -325,10 +324,9 @@ } } -Only in gdm-2.19.5-post: error.17751 -diff -upr gdm-2.19.5-pre/gui/gdmlogin.c gdm-2.19.5-post/gui/gdmlogin.c ---- gdm-2.19.5-pre/gui/gdmlogin.c 2007-08-03 17:56:58.000000000 -0500 -+++ gdm-2.19.5-post/gui/gdmlogin.c 2007-08-03 19:24:09.000000000 -0500 +diff -upr gdm-2.19.7-pre/gui/gdmlogin.c gdm-2.19.7-post/gui/gdmlogin.c +--- gdm-2.19.7-pre/gui/gdmlogin.c 2007-09-14 00:07:36.000000000 -0500 ++++ gdm-2.19.7-post/gui/gdmlogin.c 2007-09-14 00:07:32.000000000 -0500 @@ -692,12 +692,15 @@ gdm_run_gdmconfig (GtkWidget *w, gpointe static void gdm_login_restart_handler (void) @@ -393,7 +391,7 @@ printf ("%c%c%c\n", STX, BEL, GDM_INTERRUPT_SUSPEND); fflush (stdout); } -@@ -2911,6 +2920,7 @@ gdm_read_config (void) +@@ -2913,6 +2922,7 @@ gdm_read_config (void) gdm_config_get_bool (GDM_KEY_TITLE_BAR); gdm_config_get_bool (GDM_KEY_ADD_GTK_MODULES); gdm_config_get_bool (GDM_KEY_SHOW_DOMAIN); @@ -401,7 +399,7 @@ /* Keys not to include in reread_config */ gdm_config_get_bool (GDM_KEY_LOCK_POSITION); -@@ -2994,6 +3004,7 @@ gdm_reread_config (int sig, gpointer dat +@@ -2996,6 +3006,7 @@ gdm_reread_config (int sig, gpointer dat gdm_config_reload_bool (GDM_KEY_TIMED_LOGIN_ENABLE) || gdm_config_reload_bool (GDM_KEY_TITLE_BAR) || gdm_config_reload_bool (GDM_KEY_SHOW_DOMAIN) || @@ -409,10 +407,9 @@ gdm_config_reload_bool (GDM_KEY_ADD_GTK_MODULES)) { /* Set busy cursor */ -Only in gdm-2.19.5-post/gui: gdmlogin.c~ -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 17:56:58.000000000 -0500 -+++ gdm-2.19.5-post/gui/greeter/greeter.c 2007-08-03 19:25:02.000000000 -0500 +diff -upr gdm-2.19.7-pre/gui/greeter/greeter.c gdm-2.19.7-post/gui/greeter/greeter.c +--- gdm-2.19.7-pre/gui/greeter/greeter.c 2007-09-14 00:07:36.000000000 -0500 ++++ gdm-2.19.7-post/gui/greeter/greeter.c 2007-09-14 00:07:32.000000000 -0500 @@ -982,6 +982,7 @@ gdm_read_config (void) gdm_config_get_bool (GDM_KEY_SHOW_DOMAIN); gdm_config_get_bool (GDM_KEY_ADD_GTK_MODULES); @@ -429,10 +426,9 @@ gdm_config_reload_bool (GDM_KEY_BROWSER)) { /* Set busy cursor */ -Only in gdm-2.19.5-post/gui/greeter: greeter.c~ -diff -upr gdm-2.19.5-pre/gui/greeter/greeter_item.c gdm-2.19.5-post/gui/greeter/greeter_item.c ---- gdm-2.19.5-pre/gui/greeter/greeter_item.c 2007-08-03 17:56:58.000000000 -0500 -+++ gdm-2.19.5-post/gui/greeter/greeter_item.c 2007-08-03 19:02:29.000000000 -0500 +diff -upr gdm-2.19.7-pre/gui/greeter/greeter_item.c gdm-2.19.7-post/gui/greeter/greeter_item.c +--- gdm-2.19.7-pre/gui/greeter/greeter_item.c 2007-09-14 00:07:36.000000000 -0500 ++++ gdm-2.19.7-post/gui/greeter/greeter_item.c 2007-09-14 00:07:32.000000000 -0500 @@ -214,15 +214,15 @@ greeter_item_is_visible (GreeterItemInfo strcmp (info->show_type, "system") == 0) return FALSE; @@ -452,10 +448,9 @@ (info->show_type != NULL && strcmp (info->show_type, "suspend") == 0)) return FALSE; -Only in gdm-2.19.5-post/gui/greeter: greeter_item.c~ -diff -upr gdm-2.19.5-pre/gui/greeter/greeter_system.c gdm-2.19.5-post/gui/greeter/greeter_system.c ---- gdm-2.19.5-pre/gui/greeter/greeter_system.c 2007-07-30 13:51:01.000000000 -0500 -+++ gdm-2.19.5-post/gui/greeter/greeter_system.c 2007-08-03 18:41:02.000000000 -0500 +diff -upr gdm-2.19.7-pre/gui/greeter/greeter_system.c gdm-2.19.7-post/gui/greeter/greeter_system.c +--- gdm-2.19.7-pre/gui/greeter/greeter_system.c 2007-08-27 11:07:52.000000000 -0500 ++++ gdm-2.19.7-post/gui/greeter/greeter_system.c 2007-09-14 00:07:32.000000000 -0500 @@ -77,10 +77,15 @@ bin_exists (const char *command) static void query_greeter_restart_handler (void) @@ -571,4 +566,3 @@ if (group_radio != NULL) radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (group_radio)); suspend_radio = gtk_radio_button_new_with_mnemonic (radio_group, -Only in gdm-2.19.5-post/gui/greeter: greeter_system.c~ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org