Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2013-07-23 22:22:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm (Old) and /work/SRC/openSUSE:Factory/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2013-05-06 10:10:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2013-07-23 22:22:59.000000000 +0200 @@ -1,0 +2,47 @@ +Tue Jul 23 08:45:14 UTC 2013 - g...@opensuse.org + +- update to version 1.7.7 + - Fix uninitialized pointer introduced in 1.7.3 + - Enable compile warnings and fix code generating warnings + +------------------------------------------------------------------- +Mon Jul 22 14:54:36 UTC 2013 - g...@opensuse.org + +- update to version 1.7.6 + - Restore greeter hints that were regressed in 1.7.5. + - Don't run greeters through session wrapper - regression + in 1.7.5 + - Quit Plymouth correctly when using the unity seat type + - Release the VT when the system compositor fails to start + - Load sessions and greeters from /usr/share/lightdm/sessions and + /usr/share/lightdm/greeters. The existing directories are + checked if the sessions are not in these directories. + - Refactor the Display class so that it merges with the Seat + class + - Support running the greeter and session in different display + servers instead of re-using the same one during a login. + - Add more regression tests + - Documentation fixes + - Set XDG_SEAT and XDG_VTNR environment variables. + - Add initial support for Unity (i.e. Mir based) seats. + - Add a greeter wrapper option. + - Load configuration from /etc/lightdm/lightdm.conf.d. + - Fix compile warnings + - Fix tests not running from install directory inside checkout. + - Fix incorrectly distributed guest-session apparmor data + - Fix .pc file for liblightdm-qt5-3 + - Add a new option "autologin-in-background" which lets an + autologin happen in a second display while still showing the + greeter. + - Stop if fail to create default seat + - Add option to set seat type in lightdm-set-defaults + - Stop using g_file_set_contents - it can leave intermediate + files around + - Make tests work without installing them + - Fix distcheck +- dropped obsolete lightdm-fix-pkgconfig.patch +- added lightdm-fix-session-setup-script-env.patch in order to put + user information in the environment when running + session-setup-script + +------------------------------------------------------------------- Old: ---- lightdm-1.7.0.tar.xz lightdm-fix-pkgconfig.patch New: ---- lightdm-1.7.7.tar.xz lightdm-fix-session-setup-script-env.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.FeXWzW/_old 2013-07-23 22:23:00.000000000 +0200 +++ /var/tmp/diff_new_pack.FeXWzW/_new 2013-07-23 22:23:00.000000000 +0200 @@ -28,13 +28,13 @@ %endif Name: lightdm -Version: 1.7.0 +Version: 1.7.7 Release: 0 Summary: Lightweight, Cross-desktop Display Manager License: GPL-3.0+ Group: System/X11/Displaymanagers Url: http://www.freedesktop.org/wiki/Software/LightDM -Source0: https://launchpad.net/lightdm/1.6/%{version}/+download/%{name}-%{version}.tar.xz +Source0: https://launchpad.net/lightdm/1.8/%{version}/+download/%{name}-%{version}.tar.xz Source1: %{name}-greeter.pamd Source2: X11-displaymanagers-%{name} Source100: %{name}-rpmlintrc @@ -52,8 +52,8 @@ Patch5: lightdm-disable-utmp-handling.patch # PATCH-FIX-OPENSUSE lightdm-use-run-dir.patch g...@opensuse.org -- Use /run instead of /var/run Patch6: lightdm-use-run-dir.patch -# PATCH-FIX-UPSTREAM lightdm-fix-pkgconfig.patch hrvoje.sen...@gmail.com -- Adjust pc file for new libqlightdm version -Patch7: lightdm-fix-pkgconfig.patch +# PATCH-FIX-UPSTREAM lightdm-fix-session-setup-script-env.patch g...@opensuse.org -- Put user information in the environment when running session-setup-script +Patch7: lightdm-fix-session-setup-script-env.patch BuildRequires: gcc-c++ BuildRequires: gnome-common BuildRequires: gtk-doc @@ -172,11 +172,14 @@ install -D -m 644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/lightdm-greeter install -D -m 644 -p %{SOURCE2} %{buildroot}%{_libexecdir}/X11/displaymanagers/lightdm +install -d %{buildroot}%{_datadir}/lightdm/greeters +install -d %{buildroot}%{_datadir}/xgreeters +install -d %{buildroot}%{_datadir}/lightdm/sessions +install -d %{buildroot}%{_datadir}/lightdm/remote-sessions install -d %{buildroot}%{_localstatedir}/log/lightdm install -d %{buildroot}%{rundir}/lightdm install -d %{buildroot}%{_localstatedir}/lib/lightdm install -d %{buildroot}%{_localstatedir}/cache/lightdm -install -d %{buildroot}%{_datadir}/xgreeters %find_lang %{name} %{?no_lang_C} @@ -214,6 +217,7 @@ %config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf %dir %{_libexecdir}/X11/displaymanagers/ %{_libexecdir}/X11/displaymanagers/lightdm +%{_datadir}/lightdm %dir %{_datadir}/xgreeters/ %ghost %attr(711,lightdm,lightdm) %dir %{rundir}/lightdm %attr(750,lightdm,lightdm) %dir %{_localstatedir}/log/lightdm ++++++ lightdm-1.7.0.tar.xz -> lightdm-1.7.7.tar.xz ++++++ ++++ 54433 lines of diff (skipped) ++++++ lightdm-default-configuration.patch ++++++ --- /var/tmp/diff_new_pack.FeXWzW/_old 2013-07-23 22:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.FeXWzW/_new 2013-07-23 22:23:01.000000000 +0200 @@ -3,7 +3,7 @@ diff --git a/data/lightdm.conf b/data/lightdm.conf --- a/data/lightdm.conf +++ b/data/lightdm.conf -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #minimum-display-number=0 #minimum-vt=7 #lock-memory=true @@ -12,7 +12,7 @@ #guest-account-script=guest-account #log-directory=/var/log/lightdm #run-directory=/var/run/lightdm -@@ -92,6 +92,7 @@ +@@ -99,6 +99,7 @@ [SeatDefaults] #type=xlocal #xserver-command=X @@ -20,12 +20,13 @@ #xserver-layout= #xserver-config= #xserver-allow-tcp=false -@@ -106,11 +107,11 @@ +@@ -116,12 +117,12 @@ #user-session=default #allow-guest=true #guest-session=UNIMPLEMENTED -#session-wrapper=lightdm-session +session-wrapper=/etc/X11/xdm/Xsession + #greeter-wrapper= #display-setup-script= -#greeter-setup-script= -#session-setup-script= ++++++ lightdm-disable-utmp-handling.patch ++++++ --- /var/tmp/diff_new_pack.FeXWzW/_old 2013-07-23 22:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.FeXWzW/_new 2013-07-23 22:23:01.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 2544ba70bcb3588f9564f8ae079020ce76a9240b +# Parent c18913422e9ec2e8e85e5d15ca040fe457e340a8 disable utmp handling since this is handled in the Xstartup/Xreset scripts diff --git a/src/session-child.c b/src/session-child.c @@ -15,7 +15,7 @@ #include <sys/mman.h> #include "configuration.h" -@@ -578,6 +580,7 @@ session_child_run (int argc, char **argv +@@ -597,6 +599,7 @@ session_child_run (int argc, char **argv /* Wait for the command to complete (blocks) */ if (child_pid > 0) { @@ -23,7 +23,7 @@ /* Log to utmp */ if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0) { -@@ -603,10 +606,10 @@ session_child_run (int argc, char **argv +@@ -622,10 +625,10 @@ session_child_run (int argc, char **argv g_printerr ("Failed to write utmpx: %s\n", strerror (errno)); endutxent (); } @@ -36,7 +36,7 @@ /* Log to utmp */ if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0) { -@@ -632,6 +635,7 @@ session_child_run (int argc, char **argv +@@ -651,6 +654,7 @@ session_child_run (int argc, char **argv g_printerr ("Failed to write utmpx: %s\n", strerror (errno)); endutxent (); } ++++++ lightdm-fix-session-setup-script-env.patch ++++++ # HG changeset patch # Parent 30de00ae97cd4d8e2707c6525fb78bc54de16226 Put user information in the environment when running session-setup-script diff --git a/src/seat.c b/src/seat.c --- a/src/seat.c +++ b/src/seat.c @@ -414,12 +414,16 @@ static void run_session (Seat *seat, Session *session) { const gchar *script; + User *user = NULL; if (IS_GREETER (session)) script = seat_get_string_property (seat, "greeter-setup-script"); else + { script = seat_get_string_property (seat, "session-setup-script"); - if (script && !run_script (seat, session_get_display_server (session), script, NULL)) + user = session_get_user (session); + } + if (script && !run_script (seat, session_get_display_server (session), script, user)) { g_debug ("Switching to greeter due to failed setup script"); switch_to_greeter_from_failed_session (seat, session); ++++++ lightdm-set-gdmflexiserver-envvar.patch ++++++ --- /var/tmp/diff_new_pack.FeXWzW/_old 2013-07-23 22:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.FeXWzW/_new 2013-07-23 22:23:01.000000000 +0200 @@ -3,7 +3,7 @@ diff --git a/src/session-child.c b/src/session-child.c --- a/src/session-child.c +++ b/src/session-child.c -@@ -512,10 +512,7 @@ session_child_run (int argc, char **argv +@@ -531,10 +531,7 @@ session_child_run (int argc, char **argv g_free (value); } ++++++ lightdm-sysconfig-support.patch ++++++ --- /var/tmp/diff_new_pack.FeXWzW/_old 2013-07-23 22:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.FeXWzW/_new 2013-07-23 22:23:01.000000000 +0200 @@ -39,54 +39,27 @@ diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -28,6 +28,8 @@ lightdm_SOURCES = \ +@@ -18,6 +18,8 @@ lightdm_SOURCES = \ + guest-account.c \ + guest-account.h \ lightdm.c \ - ldm-marshal.c \ - ldm-marshal.h \ + opensuse-sysconfig.c \ + opensuse-sysconfig.h \ login1.c \ login1.h \ plymouth.c \ -diff --git a/src/display.c b/src/display.c ---- a/src/display.c -+++ b/src/display.c -@@ -410,7 +410,10 @@ start_greeter (Display *display) - g_signal_connect (display->priv->session, "authentication-complete", G_CALLBACK (greeter_authentication_complete_cb), display); - - /* Make communication link to greeter that will run on this session */ -- display->priv->greeter = greeter_new (display->priv->session, USER_SERVICE, AUTOLOGIN_SERVICE); -+ if (config_get_boolean (config_get_instance (), "LightDM", "password-less-login")) -+ display->priv->greeter = greeter_new (display->priv->session, AUTOLOGIN_SERVICE, AUTOLOGIN_SERVICE); -+ else -+ display->priv->greeter = greeter_new (display->priv->session, USER_SERVICE, AUTOLOGIN_SERVICE); - g_signal_connect (G_OBJECT (display->priv->greeter), "connected", G_CALLBACK (greeter_connected_cb), display); - g_signal_connect (G_OBJECT (display->priv->greeter), "start-authentication", G_CALLBACK (greeter_start_authentication_cb), display); - g_signal_connect (G_OBJECT (display->priv->greeter), "start-session", G_CALLBACK (greeter_start_session_cb), display); -@@ -797,7 +800,10 @@ display_server_ready_cb (DisplayServer * - else if (display->priv->select_user_hint && display->priv->select_user_attempt_login) - { - g_debug ("Logging in user %s", display->priv->select_user_hint); -- result = autologin (display, display->priv->select_user_hint, USER_SERVICE, TRUE, FALSE); -+ if (config_get_boolean (config_get_instance (), "LightDM", "password-less-login")) -+ result = autologin (display, display->priv->select_user_hint, AUTOLOGIN_SERVICE, TRUE, FALSE); -+ else -+ result = autologin (display, display->priv->select_user_hint, USER_SERVICE, TRUE, FALSE); - } - - /* If no session started, start a greeter */ diff --git a/src/lightdm.c b/src/lightdm.c --- a/src/lightdm.c +++ b/src/lightdm.c -@@ -21,6 +21,7 @@ - #include <sys/stat.h> +@@ -22,6 +22,7 @@ + #include <errno.h> #include "configuration.h" +#include "opensuse-sysconfig.h" #include "display-manager.h" #include "xdmcp-server.h" #include "vnc-server.h" -@@ -60,6 +61,117 @@ typedef struct +@@ -61,6 +62,117 @@ typedef struct #define LIGHTDM_BUS_NAME "org.freedesktop.DisplayManager" @@ -204,8 +177,8 @@ static void log_cb (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer data) { -@@ -1046,6 +1158,9 @@ main (int argc, char **argv) - g_mkdir_with_parents (dir, S_IRWXU | S_IXGRP | S_IXOTH); +@@ -1135,6 +1247,9 @@ main (int argc, char **argv) + g_warning ("Failed to make cache directory %s: %s", dir, strerror (errno)); g_free (dir); + /* Load sysconfig settings */ @@ -213,7 +186,7 @@ + log_init (); - g_debug ("Starting Light Display Manager %s, UID=%i PID=%i", VERSION, getuid (), getpid ()); + /* Show queued messages once logging is complete */ diff --git a/src/opensuse-sysconfig.c b/src/opensuse-sysconfig.c new file mode 100644 --- /dev/null @@ -654,3 +627,30 @@ +G_END_DECLS + +#endif /* __OPENSUSE_SYSCONFIG_H */ +diff --git a/src/seat.c b/src/seat.c +--- a/src/seat.c ++++ b/src/seat.c +@@ -956,7 +956,10 @@ create_greeter_session (Seat *seat) + g_free (greeter_user); + session_set_argv (SESSION (greeter_session), argv); + +- greeter_set_pam_services (greeter_session, USER_SERVICE, AUTOLOGIN_SERVICE); ++ if (config_get_boolean (config_get_instance (), "LightDM", "password-less-login")) ++ greeter_set_pam_services (greeter_session, AUTOLOGIN_SERVICE, AUTOLOGIN_SERVICE); ++ else ++ greeter_set_pam_services (greeter_session, USER_SERVICE, AUTOLOGIN_SERVICE); + g_signal_connect (greeter_session, "create-session", G_CALLBACK (greeter_create_session_cb), seat); + g_signal_connect (greeter_session, "start-session", G_CALLBACK (greeter_start_session_cb), seat); + +@@ -1118,7 +1121,10 @@ seat_switch_to_user (Seat *seat, const g + if (seat->priv->session_to_activate) + g_object_unref (seat->priv->session_to_activate); + seat->priv->session_to_activate = g_object_ref (session); +- session_set_pam_service (session, USER_SERVICE); ++ if (config_get_boolean (config_get_instance (), "LightDM", "password-less-login")) ++ session_set_pam_service (session, AUTOLOGIN_SERVICE); ++ else ++ session_set_pam_service (session, USER_SERVICE); + + display_server = create_display_server (seat); + session_set_display_server (session, display_server); ++++++ lightdm-use-run-dir.patch ++++++ --- /var/tmp/diff_new_pack.FeXWzW/_old 2013-07-23 22:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.FeXWzW/_new 2013-07-23 22:23:01.000000000 +0200 @@ -1,16 +1,16 @@ # HG changeset patch -# Parent eef396cf8403d166680c9a19ce719d3bc28d128d +# Parent 0ed9dac465d5e5fba66246f1c07407fb24cc9523 Use /run instead of localstatedir/run/lightdm diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -89,7 +89,7 @@ lightdm_CFLAGS = \ +@@ -79,7 +79,7 @@ lightdm_CFLAGS = \ -DSBIN_DIR=\"$(sbindir)\" \ -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \ -DLOG_DIR=\"$(localstatedir)/log/lightdm\" \ - -DRUN_DIR=\"$(localstatedir)/run/lightdm\" \ + -DRUN_DIR=\"/run/lightdm\" \ -DCACHE_DIR=\"$(localstatedir)/cache/lightdm\" \ - -DXSESSIONS_DIR=\"$(datadir)/xsessions\" \ + -DSESSIONS_DIR=\"$(pkgdatadir)/sessions:$(datadir)/xsessions\" \ -DREMOTE_SESSIONS_DIR=\"$(pkgdatadir)/remote-sessions\" \ ++++++ lightdm-xauthlocalhostname-support.patch ++++++ --- /var/tmp/diff_new_pack.FeXWzW/_old 2013-07-23 22:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.FeXWzW/_new 2013-07-23 22:23:01.000000000 +0200 @@ -3,7 +3,7 @@ diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -52,6 +52,8 @@ lightdm_SOURCES = \ +@@ -44,6 +44,8 @@ lightdm_SOURCES = \ session.h \ session-child.c \ session-child.h \ @@ -15,30 +15,30 @@ diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c --- a/src/seat-xlocal.c +++ b/src/seat-xlocal.c -@@ -16,6 +16,7 @@ - #include "xserver-local.h" +@@ -17,6 +17,7 @@ + #include "xgreeter.h" #include "xsession.h" #include "vt.h" +#include "util.h" G_DEFINE_TYPE (SeatXLocal, seat_xlocal, SEAT_TYPE); -@@ -158,12 +159,16 @@ static void - seat_xlocal_run_script (Seat *seat, Display *display, Process *script) +@@ -162,12 +163,16 @@ static void + seat_xlocal_run_script (Seat *seat, DisplayServer *display_server, Process *script) { const gchar *path; + gchar *hostname; XServerLocal *xserver; - xserver = XSERVER_LOCAL (display_get_display_server (display)); + xserver = XSERVER_LOCAL (display_server); path = xserver_local_get_authority_file_path (xserver); -+ hostname = lightdm_gethostname (); process_set_env (script, "DISPLAY", xserver_get_address (XSERVER (xserver))); process_set_env (script, "XAUTHORITY", path); ++ hostname = lightdm_gethostname (); + process_set_env (script, "XAUTHLOCALHOSTNAME", hostname); + g_free (hostname); - SEAT_CLASS (seat_xlocal_parent_class)->run_script (seat, display, script); + SEAT_CLASS (seat_xlocal_parent_class)->run_script (seat, display_server, script); } diff --git a/src/util.c b/src/util.c new file mode 100644 @@ -79,54 +79,45 @@ struct XServerLocalPrivate { -@@ -407,7 +408,7 @@ xserver_local_start (DisplayServer *disp - XServerLocal *server = XSERVER_LOCAL (display_server); - gboolean result; - gchar *filename, *dir, *absolute_command; -- gchar hostname[1024], *number; -+ gchar *hostname, *number; - GString *command; - - g_return_val_if_fail (server->priv->xserver_process == NULL, FALSE); -@@ -448,11 +449,13 @@ xserver_local_start (DisplayServer *disp - if (server->priv->layout) - g_string_append_printf (command, " -layout %s", server->priv->layout); +@@ -152,13 +153,14 @@ XServerLocal * + xserver_local_new (void) + { + XServerLocal *self = g_object_new (XSERVER_LOCAL_TYPE, NULL); +- gchar hostname[1024], *number, *name; ++ gchar *hostname, *number, *name; + + xserver_set_display_number (XSERVER (self), xserver_local_get_unused_display_number ()); - gethostname (hostname, 1024); + hostname = lightdm_gethostname (); -+ - number = g_strdup_printf ("%d", xserver_get_display_number (XSERVER (server))); - if (!server->priv->xdmcp_key) - xserver_set_authority (XSERVER (server), xauth_new_cookie (XAUTH_FAMILY_LOCAL, (guint8*) hostname, strlen (hostname), number)); - g_free (number); + number = g_strdup_printf ("%d", xserver_get_display_number (XSERVER (self))); + xserver_set_authority (XSERVER (self), xauth_new_cookie (XAUTH_FAMILY_LOCAL, (guint8*) hostname, strlen (hostname), number)); + g_free (hostname); - write_authority_file (server); - if (server->priv->authority_file) - g_string_append_printf (command, " -auth %s", server->priv->authority_file); + g_free (number); + + name = g_strdup_printf ("x-%d", xserver_get_display_number (XSERVER (self))); diff --git a/src/xsession.c b/src/xsession.c --- a/src/xsession.c +++ b/src/xsession.c -@@ -15,8 +15,10 @@ - #include <sys/stat.h> - +@@ -17,6 +17,8 @@ #include "xsession.h" -+#include "xserver-local.h" + #include "xserver.h" #include "configuration.h" - #include "privileges.h" ++#include "xserver-local.h" +#include "util.h" - struct XSessionPrivate - { -@@ -35,6 +37,12 @@ xsession_new (XServer *xserver) - session = g_object_new (XSESSION_TYPE, NULL); - session->priv->xserver = g_object_ref (xserver); + G_DEFINE_TYPE (XSession, xsession, SESSION_TYPE); + +@@ -53,6 +55,12 @@ setup_env (XSession *xsession) + g_free (t); + } -+ if (IS_XSERVER_LOCAL (XSESSION (session)->priv->xserver)) ++ if (IS_XSERVER_LOCAL (display_server)) + { + gchar *hostname = lightdm_gethostname (); -+ session_set_env (SESSION (session), "XAUTHLOCALHOSTNAME", hostname); ++ session_set_env (SESSION (xsession), "XAUTHLOCALHOSTNAME", hostname); + g_free (hostname); + } - session_set_env (SESSION (session), "DISPLAY", xserver_get_address (xserver)); - session_set_tty (SESSION (session), xserver_get_address (xserver)); - session_set_xdisplay (SESSION (session), xserver_get_address (xserver)); + session_set_env (SESSION (xsession), "DISPLAY", xserver_get_address (XSERVER (display_server))); + session_set_tty (SESSION (xsession), xserver_get_address (XSERVER (display_server))); + session_set_xdisplay (SESSION (xsession), xserver_get_address (XSERVER (display_server))); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
