Hello community, here is the log from the commit of package gdm for openSUSE:Factory checked in at Mon Sep 26 10:30:57 CEST 2011.
-------- --- gdm/gdm.changes 2011-09-16 15:29:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2011-09-26 00:06:03.000000000 +0200 @@ -1,0 +2,37 @@ +Sat Sep 24 14:56:10 UTC 2011 - vu...@opensuse.org + +- Fix syntax in X11-displaymanager-gdm: this syntax error was + causing the use of xdm instead of gdm. + +------------------------------------------------------------------- +Fri Sep 23 06:44:23 UTC 2011 - dims...@opensuse.org + +- Add gdm-unified-auth.patch: Revert 'better unified authentication + compatibility' that was committed upstream as it breaks GDM. See + http://lists.opensuse.org/opensuse-gnome/2011-09/msg00043.html + +------------------------------------------------------------------- +Wed Sep 21 11:38:19 UTC 2011 - vu...@opensuse.org + +- Update to version 3.1.92: + + Leak fixes + + Fix autologin + + Activate keyboard layout explicitly at startup + + Move extensions settings to common code + + Add setting for login screen logo to common code + + Create empty gdm.d dconf subdir tree at install time + + Updated translations. +- Drop gdm-fix-autologin.patch: fixed upstream. +- Update gdm-plymouth.patch: take the latest version from the + Fedora package. +- Move calls to %glib2_gsettings_schema_post(un) from %post/%postun + of the simple-greeter-extensions subpackage to the scriptlets of + the main subpackage, following the move of the file. + +------------------------------------------------------------------- +Tue Sep 20 15:54:37 UTC 2011 - e...@suse.com + +- Install /etc/init.d/xdm integration helper in %{_libexecdir}, not + %{_libdir}. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gdm-3.1.91.tar.bz2 gdm-fix-autologin.patch New: ---- gdm-3.1.92.tar.bz2 gdm-unified-auth.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.teEHgm/_old 2011-09-26 10:30:52.000000000 +0200 +++ /var/tmp/diff_new_pack.teEHgm/_new 2011-09-26 10:30:52.000000000 +0200 @@ -22,7 +22,7 @@ Name: gdm License: GPLv2+ Group: System/GUI/GNOME -Version: 3.1.91 +Version: 3.1.92 Release: 1 Summary: The GNOME Display Manager Url: http://projects.gnome.org/gdm/ @@ -67,10 +67,10 @@ Patch35: gdm-xauthlocalhostname.patch # PATCH-FIX-UPSTREAM gdm-look-at-runlevel.patch bnc540482 bgo599180 vu...@opensuse.org -- Look at the current runlevel before managing the display again, so we don't do this when shutting down or rebooting Patch40: gdm-look-at-runlevel.patch -# PATCH-FIX-UPSTREAM gdm-fix-autologin.patch vu...@opensuse.org -- Fix autologin, taken from git -Patch41: gdm-fix-autologin.patch # PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux Patch60: gdm-selinux.patch +# PATCH-FIX-OPENSUSE gdm-unified-auth.patch dims...@opensuse.org -- Revert "better unified authentication compatibility" +Patch61: gdm-unified-auth.patch BuildRequires: check-devel BuildRequires: dbus-1-glib-devel # needed for directory ownership @@ -236,8 +236,8 @@ %patch34 -p1 %patch35 -p0 %patch40 -p1 -%patch41 -p1 %patch60 +%patch61 -p1 -R #gnome-patch-translation-update %build @@ -296,7 +296,7 @@ mv $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver $RPM_BUILD_ROOT%{_libexecdir}/gdm/gdmflexiserver install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver # Install /etc/xinit.d/xdm integration script -install -D -m 644 %{SOURCE5} %{buildroot}%{_libdir}/X11/displaymanagers/gdm +install -D -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/X11/displaymanagers/gdm # Install other files mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/gdm mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/gdm @@ -336,6 +336,7 @@ fi %post +%glib2_gsettings_schema_post %icon_theme_cache_post %preun -f %{name}.schemas_preun @@ -344,6 +345,7 @@ %postun %insserv_cleanup +%glib2_gsettings_schema_postun %icon_theme_cache_postun %post -n libgdmgreeter1 -p /sbin/ldconfig @@ -354,15 +356,6 @@ %postun -n libgdmsimplegreeter1 -p /sbin/ldconfig -%if %{enable_split_authentication} - -%post simple-greeter-extensions -%glib2_gsettings_schema_post - -%postun simple-greeter-extensions -%glib2_gsettings_schema_postun -%endif - %files -f %{name}.schemas_list %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README @@ -379,6 +372,7 @@ %{_bindir}/gdm %{_bindir}/gdm-screenshot %{_datadir}/gdm/ +%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml %{_datadir}/gnome-session/sessions/gdm-fallback.session %{_datadir}/gnome-session/sessions/gdm-shell.session %{_datadir}/icons/*/*/*/*.* @@ -402,11 +396,13 @@ %config /etc/pam.d/gdm-smartcart %endif %config %{_sysconfdir}/dbus-1/system.d/gdm.conf +%dir %config %{_sysconfdir}/dconf/db/gdm.d +%dir %config %{_sysconfdir}/dconf/db/gdm.d/locks %{_sysconfdir}/dconf/db/gdm %{_sysconfdir}/dconf/profile/gdm # /etc/xinit.d/xdm integration -%dir %{_libdir}/X11/displaymanagers -%{_libdir}/X11/displaymanagers/gdm +%dir %{_libexecdir}/X11/displaymanagers +%{_libexecdir}/X11/displaymanagers/gdm # Exclude simple-greeter extensions %exclude %{_datadir}/gdm/simple-greeter/extensions @@ -439,11 +435,9 @@ # fingerprint %{_datadir}/gdm/simple-greeter/extensions/fingerprint/ %{_libdir}/gdm/simple-greeter/extensions/libfingerprint.so -%{_datadir}/glib-2.0/schemas/org.gnome.display-manager.extensions.fingerprint.gschema.xml # smartcard %{_datadir}/gdm/simple-greeter/extensions/smartcard/ %{_libdir}/gdm/simple-greeter/extensions/libsmartcard.so -%{_datadir}/glib-2.0/schemas/org.gnome.display-manager.extensions.smartcard.gschema.xml %endif %files devel ++++++ X11-displaymanager-gdm ++++++ --- /var/tmp/diff_new_pack.teEHgm/_old 2011-09-26 10:30:52.000000000 +0200 +++ /var/tmp/diff_new_pack.teEHgm/_new 2011-09-26 10:30:52.000000000 +0200 @@ -16,7 +16,6 @@ DISPLAYMANAGER=/usr/sbin/gdm STARTPROC=gdm_start_proc return 0 ;; - ;; *) return 1 ;; esac ++++++ gdm-3.1.91.tar.bz2 -> gdm-3.1.92.tar.bz2 ++++++ ++++ 12981 lines of diff (skipped) ++++++ gdm-plymouth.patch ++++++ ++++ 1054 lines (skipped) ++++ between gdm/gdm-plymouth.patch ++++ and /mounts/work_src_done/STABLE/gdm/gdm-plymouth.patch ++++++ gdm-unified-auth.patch ++++++ >From f91f017071ffa5f5999e6c2e2c0929e290482932 Mon Sep 17 00:00:00 2001 From: Ray Strode <rstr...@redhat.com> Date: Mon, 19 Sep 2011 22:16:25 +0000 Subject: daemon: add better unified authentication compatibility The daemon and fallback greeter support --disable-split-authentication, but the new shiny greeter doesn't. This posed a problem for distributions that want to use the new shiny greeter (in an albeit degraded mode) but don't yet have support at the system level for split authentication. This commit adds a small amount of goo to make the split authentication pam service names translate to the unified pam service name and thus give the shell greeter a level of compatibility with --disable-split-authentication. --- diff --git a/configure.ac b/configure.ac index 6893c26..8d746c8 100644 --- a/configure.ac +++ b/configure.ac @@ -234,6 +234,10 @@ AC_ARG_ENABLE(split-authentication, enable_split_authentication=yes) AM_CONDITIONAL(ENABLE_SPLIT_AUTHENTICATION, test x$enable_split_authentication = xyes) +if test x$enable_split_authentication = xyes; then + AC_DEFINE(ENABLE_SPLIT_AUTHENTICATION, 1, [Define if split authentication is enabled]) +fi + AC_ARG_ENABLE(console-helper, AS_HELP_STRING([--enable-console-helper], [Enable PAM console helper @<:@default=auto@:>@]),, diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c index 4c40a4e..4803bc3 100644 --- a/daemon/gdm-greeter-server.c +++ b/daemon/gdm-greeter-server.c @@ -60,6 +60,8 @@ struct GdmGreeterServerPrivate DBusServer *server; char *server_address; DBusConnection *greeter_connection; + + guint using_legacy_service_name : 1; }; enum { @@ -246,11 +248,42 @@ send_dbus_void_signal (GdmGreeterServer *greeter_server, dbus_message_unref (message); } +static const char * +translate_outgoing_service_name (GdmGreeterServer *greeter_server, + const char *service_name) +{ +#ifndef ENABLE_SPLIT_AUTHENTICATION + if (strcmp (service_name, "gdm") == 0 && greeter_server->priv->using_legacy_service_name) { + return "gdm-password"; + } +#endif + + return service_name; +} + +static const char * +translate_incoming_service_name (GdmGreeterServer *greeter_server, + const char *service_name) +{ +#ifndef ENABLE_SPLIT_AUTHENTICATION + if (strcmp (service_name, "gdm-password") == 0) { + g_debug ("GdmGreeterServer: Adjusting pam service from '%s' to 'gdm' for legacy compatibility", service_name); + service_name = "gdm"; + greeter_server->priv->using_legacy_service_name = TRUE; + } else if (g_str_has_prefix (service_name, "gdm-") == 0 && strcmp (service_name, "gdm-autologin") != 0) { + g_debug ("GdmGreeterServer: Rejecting pam service '%s' for legacy compatibility", service_name); + return NULL; + } +#endif + return service_name; +} + gboolean gdm_greeter_server_info_query (GdmGreeterServer *greeter_server, const char *service_name, const char *text) { + service_name = translate_outgoing_service_name (greeter_server, service_name); send_dbus_string_string_signal (greeter_server, "InfoQuery", service_name, text); return TRUE; @@ -261,6 +294,7 @@ gdm_greeter_server_secret_info_query (GdmGreeterServer *greeter_server, const char *service_name, const char *text) { + service_name = translate_outgoing_service_name (greeter_server, service_name); send_dbus_string_string_signal (greeter_server, "SecretInfoQuery", service_name, text); return TRUE; } @@ -270,6 +304,7 @@ gdm_greeter_server_info (GdmGreeterServer *greeter_server, const char *service_name, const char *text) { + service_name = translate_outgoing_service_name (greeter_server, service_name); send_dbus_string_string_signal (greeter_server, "Info", service_name, text); return TRUE; } @@ -279,6 +314,7 @@ gdm_greeter_server_problem (GdmGreeterServer *greeter_server, const char *service_name, const char *text) { + service_name = translate_outgoing_service_name (greeter_server, service_name); send_dbus_string_string_signal (greeter_server, "Problem", service_name, text); return TRUE; } @@ -287,6 +323,7 @@ gboolean gdm_greeter_server_authentication_failed (GdmGreeterServer *greeter_server, const char *service_name) { + service_name = translate_outgoing_service_name (greeter_server, service_name); send_dbus_string_signal (greeter_server, "AuthenticationFailed", service_name); return TRUE; } @@ -295,6 +332,7 @@ gboolean gdm_greeter_server_service_unavailable (GdmGreeterServer *greeter_server, const char *service_name) { + service_name = translate_outgoing_service_name (greeter_server, service_name); send_dbus_string_signal (greeter_server, "ServiceUnavailable", service_name); return TRUE; } @@ -310,6 +348,7 @@ gboolean gdm_greeter_server_ready (GdmGreeterServer *greeter_server, const char *service_name) { + service_name = translate_outgoing_service_name (greeter_server, service_name); send_dbus_string_signal (greeter_server, "Ready", service_name); return TRUE; } @@ -318,6 +357,7 @@ gboolean gdm_greeter_server_conversation_stopped (GdmGreeterServer *greeter_server, const char *service_name) { + service_name = translate_outgoing_service_name (greeter_server, service_name); send_dbus_string_signal (greeter_server, "ConversationStopped", service_name); return TRUE; } @@ -355,6 +395,7 @@ void gdm_greeter_server_session_opened (GdmGreeterServer *greeter_server, const char *service_name) { + service_name = translate_outgoing_service_name (greeter_server, service_name); send_dbus_string_signal (greeter_server, "SessionOpened", service_name); } @@ -394,6 +435,7 @@ handle_start_conversation (GdmGreeterServer *greeter_server, DBusMessage *reply; DBusError error; const char *service_name; + const char *translated_service_name; dbus_error_init (&error); if (! dbus_message_get_args (message, &error, @@ -409,7 +451,14 @@ handle_start_conversation (GdmGreeterServer *greeter_server, dbus_connection_send (connection, reply, NULL); dbus_message_unref (reply); - g_signal_emit (greeter_server, signals [START_CONVERSATION], 0, service_name); + translated_service_name = translate_incoming_service_name (greeter_server, service_name); + + if (translated_service_name == NULL) { + gdm_greeter_server_service_unavailable (greeter_server, service_name); + return DBUS_HANDLER_RESULT_HANDLED; + } + + g_signal_emit (greeter_server, signals [START_CONVERSATION], 0, translated_service_name); return DBUS_HANDLER_RESULT_HANDLED; } @@ -437,6 +486,7 @@ handle_begin_verification (GdmGreeterServer *greeter_server, dbus_connection_send (connection, reply, NULL); dbus_message_unref (reply); + service_name = translate_outgoing_service_name (greeter_server, service_name); g_signal_emit (greeter_server, signals [BEGIN_VERIFICATION], 0, service_name); return DBUS_HANDLER_RESULT_HANDLED; @@ -494,6 +544,7 @@ handle_begin_verification_for_user (GdmGreeterServer *greeter_server, dbus_connection_send (connection, reply, NULL); dbus_message_unref (reply); + service_name = translate_outgoing_service_name (greeter_server, service_name); g_signal_emit (greeter_server, signals [BEGIN_VERIFICATION_FOR_USER], 0, service_name, text); return DBUS_HANDLER_RESULT_HANDLED; @@ -524,6 +575,7 @@ handle_answer_query (GdmGreeterServer *greeter_server, dbus_connection_send (connection, reply, NULL); dbus_message_unref (reply); + service_name = translate_outgoing_service_name (greeter_server, service_name); g_signal_emit (greeter_server, signals [QUERY_ANSWER], 0, service_name, text); return DBUS_HANDLER_RESULT_HANDLED; @@ -711,6 +763,7 @@ handle_start_session_when_ready (GdmGreeterServer *greeter_server, dbus_connection_send (connection, reply, NULL); dbus_message_unref (reply); + service_name = (char *) translate_outgoing_service_name (greeter_server, service_name); if (should_start_session) { g_signal_emit (greeter_server, signals [START_SESSION_WHEN_READY], 0, service_name); } else { diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 38e7a84..b9165fd 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -1034,10 +1034,11 @@ on_greeter_start_conversation (GdmGreeterServer *greeter_server, const char *service_name, GdmSimpleSlave *slave) { - g_debug ("GdmSimpleSlave: starting conversation with '%s' pam service'", service_name); if (slave->priv->greeter_reset_id > 0) { return; } + + g_debug ("GdmSimpleSlave: starting conversation with '%s' pam service'", service_name); gdm_session_start_conversation (GDM_SESSION (slave->priv->session), service_name); } -- cgit v0.9.0.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
