Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2013-01-31 10:27:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm (Old) and /work/SRC/openSUSE:Factory/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2013-01-17 15:11:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2013-01-31 10:27:21.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Jan 30 17:55:18 UTC 2013 - g...@opensuse.org + +- changed lightdm-xauthlocalhostname-support.patch so that + XAUTHLOCALHOSTNAME is set to the current hostname instead of just + "localhost" (see + https://bugzilla.novell.com/show_bug.cgi?id=538064#c25, + bnc#796230) +- added lightdm-use-run-dir.patch in order to use /run instead of + /var/run on >= 12.3 + +------------------------------------------------------------------- New: ---- lightdm-use-run-dir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.zO987c/_old 2013-01-31 10:27:24.000000000 +0100 +++ /var/tmp/diff_new_pack.zO987c/_new 2013-01-31 10:27:24.000000000 +0100 @@ -21,6 +21,11 @@ %define gobject_lib lib%{gobject_libname}-0 %define qt_libname lightdm-qt-2 %define qt_lib lib%{qt_libname}-0 +%if 0%{?suse_version} >= 1230 +%define rundir /run +%else +%define rundir %{_localstatedir}/run +%endif Name: lightdm Version: 1.4.0 @@ -37,7 +42,7 @@ Source100: %{name}-rpmlintrc # PATCH-FEATURE-OPENSUSE lightdm-sysconfig-support.patch g...@opensuse.org -- Adds support for reading configuration options from /etc/sysconfig/displaymanager and /etc/sysconfig/windowmanager Patch0: lightdm-sysconfig-support.patch -# PATCH-FEATURE-OPENSUSE lightdm-xauthlocalhostname-support.patch g...@opensuse.org -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes +# PATCH-FEATURE-OPENSUSE lightdm-xauthlocalhostname-support.patch bnc#796230 g...@opensuse.org -- Set XAUTHLOCALHOSTNAME to the hostname for local logins to avoid issues in the session in case the hostname changes Patch1: lightdm-xauthlocalhostname-support.patch # PATCH-FEATURE-OPENSUSE lightdm-set-gdmflexiserver-envvar.patch g...@opensuse.org -- Sets the GDMFLEXISERVER environment variable for the gdmflexiserver wrapper Patch2: lightdm-set-gdmflexiserver-envvar.patch @@ -53,6 +58,8 @@ Patch7: lightdm-fix-language-setting.patch # PATCH-FIX-OPENSUSE lightdm-do-not-strip-codeset-from-language.patch lp#1074946 g...@opensuse.org -- Do not strip the codeset and be consistent with how the Language setting is retrived from AccountsService Patch8: lightdm-do-not-strip-codeset-from-language.patch +# PATCH-FIX-OPENSUSE lightdm-use-run-dir.patch g...@opensuse.org -- Use /run instead of /var/run +Patch9: lightdm-use-run-dir.patch BuildRequires: gcc-c++ BuildRequires: gnome-common BuildRequires: gtk-doc @@ -148,6 +155,9 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%if 0%{?suse_version} >= 1230 +%patch9 -p1 +%endif %build ./autogen.sh @@ -181,7 +191,7 @@ %endif install -d %{buildroot}%{_localstatedir}/log/lightdm -install -d %{buildroot}%{_localstatedir}/run/lightdm +install -d %{buildroot}%{rundir}/lightdm install -d %{buildroot}%{_localstatedir}/lib/lightdm install -d %{buildroot}%{_localstatedir}/cache/lightdm install -d %{buildroot}%{_datadir}/xgreeters @@ -228,7 +238,7 @@ %if 0%{?suse_version} >= 1230 %{_datadir}/polkit-1/rules.d/lightdm.rules %endif -%ghost %attr(751,lightdm,lightdm) %dir %{_localstatedir}/run/lightdm +%ghost %attr(711,lightdm,lightdm) %dir %{rundir}/lightdm %attr(750,lightdm,lightdm) %dir %{_localstatedir}/log/lightdm %attr(750,lightdm,lightdm) %dir %{_localstatedir}/lib/lightdm %ghost %attr(711,root,root) %dir %{_localstatedir}/cache/lightdm ++++++ lightdm-use-run-dir.patch ++++++ # HG changeset patch # Parent 906eb9b6696bfdb9384e7216707dce5351291fc5 diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -87,7 +87,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\" \ -DREMOTE_SESSIONS_DIR=\"$(pkgdatadir)/remote-sessions\" \ ++++++ lightdm-xauthlocalhostname-support.patch ++++++ --- /var/tmp/diff_new_pack.zO987c/_old 2013-01-31 10:27:24.000000000 +0100 +++ /var/tmp/diff_new_pack.zO987c/_new 2013-01-31 10:27:24.000000000 +0100 @@ -1,54 +1,133 @@ set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes +diff --git a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -50,6 +50,8 @@ lightdm_SOURCES = \ + session.h \ + session-child.c \ + session-child.h \ ++ util.c \ ++ util.h \ + vnc-server.c \ + vnc-server.h \ + vt.c \ diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c --- a/src/seat-xlocal.c +++ b/src/seat-xlocal.c -@@ -141,6 +141,7 @@ seat_xlocal_run_script (Seat *seat, Disp +@@ -16,6 +16,7 @@ + #include "xserver-local.h" + #include "xsession.h" + #include "vt.h" ++#include "util.h" + + G_DEFINE_TYPE (SeatXLocal, seat_xlocal, SEAT_TYPE); + +@@ -134,14 +135,17 @@ seat_xlocal_set_active_display (Seat *se + static void + seat_xlocal_run_script (Seat *seat, Display *display, Process *script) + { +- gchar *path; ++ gchar *path, *hostname; + XServerLocal *xserver; + + xserver = XSERVER_LOCAL (display_get_display_server (display)); 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); -+ process_set_env (script, "XAUTHLOCALHOSTNAME", "localhost"); ++ process_set_env (script, "XAUTHLOCALHOSTNAME", hostname); g_free (path); ++ g_free (hostname); SEAT_CLASS (seat_xlocal_parent_class)->run_script (seat, display, script); + } +diff --git a/src/util.c b/src/util.c +new file mode 100644 +--- /dev/null ++++ b/src/util.c +@@ -0,0 +1,14 @@ ++#include <unistd.h> ++#include <limits.h> ++#include <glib.h> ++ ++gchar * ++lightdm_gethostname (void) ++{ ++ gchar hostname[HOST_NAME_MAX + 1]; ++ ++ if (gethostname (hostname, HOST_NAME_MAX) == 0) ++ return g_strdup (hostname); ++ ++ return g_strdup ("localhost"); ++} +diff --git a/src/util.h b/src/util.h +new file mode 100644 +--- /dev/null ++++ b/src/util.h +@@ -0,0 +1,3 @@ ++#include <glib.h> ++ ++gchar * lightdm_gethostname (void); diff --git a/src/xserver-local.c b/src/xserver-local.c --- a/src/xserver-local.c +++ b/src/xserver-local.c -@@ -397,7 +397,8 @@ xserver_local_start (DisplayServer *disp +@@ -21,6 +21,7 @@ + #include "process.h" + #include "vt.h" + #include "plymouth.h" ++#include "util.h" + + struct XServerLocalPrivate + { +@@ -397,7 +398,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[] = "localhost"; -+ gchar *number; ++ gchar *hostname, *number; GString *command; g_return_val_if_fail (server->priv->xserver_process == NULL, FALSE); -@@ -438,7 +439,6 @@ xserver_local_start (DisplayServer *disp +@@ -438,11 +439,13 @@ xserver_local_start (DisplayServer *disp if (server->priv->layout) g_string_append_printf (command, " -layout %s", server->priv->layout); - 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); ++ g_free (hostname); + write_authority_file (server); + if (server->priv->authority_file) + { diff --git a/src/xsession.c b/src/xsession.c --- a/src/xsession.c +++ b/src/xsession.c -@@ -15,6 +15,7 @@ +@@ -15,8 +15,10 @@ #include <sys/stat.h> #include "xsession.h" +#include "xserver-local.h" #include "configuration.h" #include "privileges.h" ++#include "util.h" -@@ -35,6 +36,8 @@ xsession_new (XServer *xserver) + struct XSessionPrivate + { +@@ -35,6 +37,12 @@ xsession_new (XServer *xserver) session = g_object_new (XSESSION_TYPE, NULL); session->priv->xserver = g_object_ref (xserver); + if (IS_XSERVER_LOCAL (XSESSION (session)->priv->xserver)) -+ session_set_env (SESSION (session), "XAUTHLOCALHOSTNAME", "localhost"); ++ { ++ gchar *hostname = lightdm_gethostname (); ++ session_set_env (SESSION (session), "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)); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
