Hello community,
here is the log from the commit of package lightdm for openSUSE:Factory checked
in at 2016-03-07 13:27:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2016-01-08
15:23:52.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2016-03-07
13:29:17.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Mar 4 18:04:51 UTC 2016 - mimi...@gmail.com
+
+- update to 1.17.5
+* Set XDG_RUNTIME_DIR for ConsoleKit sessions. This is a recent change in
+ ConsoleKit2.
+* Add support for g_autoptr and liblightdm-gobject
+* Fix dm-tool add-local-seat not working because LightDM is trying to
+ connect with TCP/IP
+
+-------------------------------------------------------------------
Old:
----
lightdm-1.17.3.tar.xz
New:
----
lightdm-1.17.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightdm.spec ++++++
--- /var/tmp/diff_new_pack.0S7FSz/_old 2016-03-07 13:29:18.000000000 +0100
+++ /var/tmp/diff_new_pack.0S7FSz/_new 2016-03-07 13:29:18.000000000 +0100
@@ -26,7 +26,7 @@
%define typelibname typelib-1_0-LightDM-1
%define rundir /run
Name: lightdm
-Version: 1.17.3
+Version: 1.17.5
Release: 0
Summary: Lightweight, Cross-desktop Display Manager
License: GPL-3.0+
++++++ lightdm-1.17.3.tar.xz -> lightdm-1.17.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/NEWS new/lightdm-1.17.5/NEWS
--- old/lightdm-1.17.3/NEWS 2015-12-17 01:12:42.000000000 +0100
+++ new/lightdm-1.17.5/NEWS 2016-02-03 00:56:45.000000000 +0100
@@ -1,3 +1,14 @@
+Overview of changes in lightdm 1.17.5
+
+ * Set XDG_RUNTIME_DIR for ConsoleKit sessions. This is a recent change in
+ ConsoleKit2.
+
+Overview of changes in lightdm 1.17.4
+
+ * Add support for g_autoptr and liblightdm-gobject
+ * Fix dm-tool add-local-seat not working because LightDM is trying to
+ connect with TCP/IP
+
Overview of changes in lightdm 1.17.3
* Don't enable the hardware cursor in Unity System Compositor anymore.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/aclocal.m4
new/lightdm-1.17.5/aclocal.m4
--- old/lightdm-1.17.3/aclocal.m4 2015-12-17 01:14:09.000000000 +0100
+++ new/lightdm-1.17.5/aclocal.m4 2016-02-03 00:57:11.000000000 +0100
@@ -27,13 +27,13 @@
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
dnl License but which still want to provide support for the GNU gettext
dnl functionality.
dnl Please note that the actual code of the GNU gettext library is covered
dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
dnl They are *not* in the public domain.
dnl Authors:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/configure new/lightdm-1.17.5/configure
--- old/lightdm-1.17.3/configure 2015-12-17 01:14:10.000000000 +0100
+++ new/lightdm-1.17.5/configure 2016-02-03 00:57:12.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for lightdm 1.17.3.
+# Generated by GNU Autoconf 2.69 for lightdm 1.17.5.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='lightdm'
PACKAGE_TARNAME='lightdm'
-PACKAGE_VERSION='1.17.3'
-PACKAGE_STRING='lightdm 1.17.3'
+PACKAGE_VERSION='1.17.5'
+PACKAGE_STRING='lightdm 1.17.5'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1484,7 +1484,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures lightdm 1.17.3 to adapt to many kinds of systems.
+\`configure' configures lightdm 1.17.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1555,7 +1555,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of lightdm 1.17.3:";;
+ short | recursive ) echo "Configuration of lightdm 1.17.5:";;
esac
cat <<\_ACEOF
@@ -1728,7 +1728,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-lightdm configure 1.17.3
+lightdm configure 1.17.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2214,7 +2214,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by lightdm $as_me 1.17.3, which was
+It was created by lightdm $as_me 1.17.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3080,7 +3080,7 @@
# Define the identity of the package.
PACKAGE='lightdm'
- VERSION='1.17.3'
+ VERSION='1.17.5'
cat >>confdefs.h <<_ACEOF
@@ -19252,7 +19252,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by lightdm $as_me 1.17.3, which was
+This file was extended by lightdm $as_me 1.17.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19318,7 +19318,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-lightdm config.status 1.17.3
+lightdm config.status 1.17.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/configure.ac
new/lightdm-1.17.5/configure.ac
--- old/lightdm-1.17.3/configure.ac 2015-12-17 01:13:54.000000000 +0100
+++ new/lightdm-1.17.5/configure.ac 2016-02-03 00:56:55.000000000 +0100
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(lightdm, 1.17.3)
+AC_INIT(lightdm, 1.17.5)
AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/liblightdm-gobject/lightdm/greeter.h
new/lightdm-1.17.5/liblightdm-gobject/lightdm/greeter.h
--- old/lightdm-1.17.3/liblightdm-gobject/lightdm/greeter.h 2015-08-10
01:30:00.000000000 +0200
+++ new/lightdm-1.17.5/liblightdm-gobject/lightdm/greeter.h 2016-01-25
02:12:20.000000000 +0100
@@ -79,6 +79,14 @@
void (*reserved4) (void);
} LightDMGreeterClass;
+#ifdef GLIB_VERSION_2_44
+typedef LightDMGreeter *LightDMGreeter_autoptr;
+static inline void glib_autoptr_cleanup_LightDMGreeter (LightDMGreeter **_ptr)
+{
+ glib_autoptr_cleanup_GObject ((GObject **) _ptr);
+}
+#endif
+
GType lightdm_greeter_get_type (void);
LightDMGreeter *lightdm_greeter_new (void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/liblightdm-gobject/lightdm/language.h
new/lightdm-1.17.5/liblightdm-gobject/lightdm/language.h
--- old/lightdm-1.17.3/liblightdm-gobject/lightdm/language.h 2015-08-10
01:30:00.000000000 +0200
+++ new/lightdm-1.17.5/liblightdm-gobject/lightdm/language.h 2016-01-25
02:12:02.000000000 +0100
@@ -40,6 +40,14 @@
void (*reserved6) (void);
} LightDMLanguageClass;
+#ifdef GLIB_VERSION_2_44
+typedef LightDMLanguage *LightDMLanguage_autoptr;
+static inline void glib_autoptr_cleanup_LightDMLanguage (LightDMLanguage
**_ptr)
+{
+ glib_autoptr_cleanup_GObject ((GObject **) _ptr);
+}
+#endif
+
GType lightdm_language_get_type (void);
GList *lightdm_get_languages (void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/liblightdm-gobject/lightdm/layout.h
new/lightdm-1.17.5/liblightdm-gobject/lightdm/layout.h
--- old/lightdm-1.17.3/liblightdm-gobject/lightdm/layout.h 2015-08-10
01:30:00.000000000 +0200
+++ new/lightdm-1.17.5/liblightdm-gobject/lightdm/layout.h 2016-01-25
02:12:32.000000000 +0100
@@ -40,6 +40,14 @@
void (*reserved6) (void);
} LightDMLayoutClass;
+#ifdef GLIB_VERSION_2_44
+typedef LightDMLayout *LightDMLayout_autoptr;
+static inline void glib_autoptr_cleanup_LightDMLayout (LightDMLayout **_ptr)
+{
+ glib_autoptr_cleanup_GObject ((GObject **) _ptr);
+}
+#endif
+
GType lightdm_layout_get_type (void);
GList *lightdm_get_layouts (void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/liblightdm-gobject/lightdm/session.h
new/lightdm-1.17.5/liblightdm-gobject/lightdm/session.h
--- old/lightdm-1.17.3/liblightdm-gobject/lightdm/session.h 2015-08-10
01:30:00.000000000 +0200
+++ new/lightdm-1.17.5/liblightdm-gobject/lightdm/session.h 2016-01-25
02:12:51.000000000 +0100
@@ -40,6 +40,14 @@
void (*reserved6) (void);
} LightDMSessionClass;
+#ifdef GLIB_VERSION_2_44
+typedef LightDMSession *LightDMSession_autoptr;
+static inline void glib_autoptr_cleanup_LightDMSession (LightDMSession **_ptr)
+{
+ glib_autoptr_cleanup_GObject ((GObject **) _ptr);
+}
+#endif
+
GType lightdm_session_get_type (void);
GList *lightdm_get_sessions (void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/liblightdm-gobject/lightdm/user.h
new/lightdm-1.17.5/liblightdm-gobject/lightdm/user.h
--- old/lightdm-1.17.3/liblightdm-gobject/lightdm/user.h 2015-08-10
01:30:00.000000000 +0200
+++ new/lightdm-1.17.5/liblightdm-gobject/lightdm/user.h 2016-01-25
02:13:27.000000000 +0100
@@ -76,6 +76,19 @@
void (*reserved6) (void);
} LightDMUserListClass;
+#ifdef GLIB_VERSION_2_44
+typedef LightDMUser *LightDMUser_autoptr;
+static inline void glib_autoptr_cleanup_LightDMUser (LightDMUser **_ptr)
+{
+ glib_autoptr_cleanup_GObject ((GObject **) _ptr);
+}
+typedef LightDMUserList *LightDMUserList_autoptr;
+static inline void glib_autoptr_cleanup_LightDMUserList (LightDMUserList
**_ptr)
+{
+ glib_autoptr_cleanup_GObject ((GObject **) _ptr);
+}
+#endif
+
GType lightdm_user_list_get_type (void);
GType lightdm_user_get_type (void);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/src/console-kit.c
new/lightdm-1.17.5/src/console-kit.c
--- old/lightdm-1.17.3/src/console-kit.c 2015-08-10 01:30:00.000000000
+0200
+++ new/lightdm-1.17.5/src/console-kit.c 2016-01-26 04:05:46.000000000
+0100
@@ -260,3 +260,54 @@
if (!is_closed)
g_warning ("ConsoleKit.Manager.CloseSession() returned false");
}
+
+gchar *
+ck_get_xdg_runtime_dir (const gchar *cookie)
+{
+ GDBusConnection *bus;
+ gchar *session_path;
+ gchar *runtime_dir = NULL;
+ GError *error = NULL;
+
+ g_return_val_if_fail (cookie != NULL, NULL);
+
+ g_debug ("Getting XDG_RUNTIME_DIR from ConsoleKit for session %s", cookie);
+
+ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
+ if (error)
+ g_warning ("Failed to get system bus: %s", error->message);
+ g_clear_error (&error);
+ if (!bus)
+ return NULL;
+
+ session_path = get_ck_session (bus, cookie);
+ if (session_path)
+ {
+ GVariant *result;
+
+ result = g_dbus_connection_call_sync (bus,
+ "org.freedesktop.ConsoleKit",
+ session_path,
+
"org.freedesktop.ConsoleKit.Session",
+ "GetXDGRuntimeDir",
+ g_variant_new ("()"),
+ G_VARIANT_TYPE ("(s)"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ &error);
+ if (error)
+ g_warning ("Error getting XDG_RUNTIME_DIR from ConsoleKit: %s",
error->message);
+ g_clear_error (&error);
+ if (!result)
+ return NULL;
+
+ g_variant_get (result, "(s)", &runtime_dir);
+ g_variant_unref (result);
+ g_debug ("ConsoleKit XDG_RUNTIME_DIR is %s", runtime_dir);
+ }
+
+ g_object_unref (bus);
+
+ return runtime_dir;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/src/console-kit.h
new/lightdm-1.17.5/src/console-kit.h
--- old/lightdm-1.17.3/src/console-kit.h 2015-08-10 01:30:00.000000000
+0200
+++ new/lightdm-1.17.5/src/console-kit.h 2016-01-26 04:03:01.000000000
+0100
@@ -26,6 +26,8 @@
void ck_close_session (const gchar *cookie);
+gchar *ck_get_xdg_runtime_dir (const gchar *cookie);
+
G_END_DECLS
#endif /* CONSOLE_KIT_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/src/seat-xremote.c
new/lightdm-1.17.5/src/seat-xremote.c
--- old/lightdm-1.17.3/src/seat-xremote.c 2015-08-10 01:30:00.000000000
+0200
+++ new/lightdm-1.17.5/src/seat-xremote.c 2016-01-25 04:45:15.000000000
+0100
@@ -40,11 +40,9 @@
}
hostname = seat_get_string_property (seat, "xserver-hostname");
- if (!hostname)
- hostname = "127.0.0.1";
number = seat_get_integer_property (seat, "xserver-display-number");
- l_debug (seat, "Starting remote X display %s:%d", hostname, number);
+ l_debug (seat, "Starting remote X display %s:%d", hostname ? hostname :
"", number);
x_server = x_server_remote_new (hostname, number, NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/src/session-child.c
new/lightdm-1.17.5/src/session-child.c
--- old/lightdm-1.17.3/src/session-child.c 2015-11-02 04:25:10.000000000
+0100
+++ new/lightdm-1.17.5/src/session-child.c 2016-01-26 04:03:01.000000000
+0100
@@ -621,9 +621,20 @@
if (console_kit_cookie)
{
gchar *value;
+ gchar *runtime_dir;
value = g_strdup_printf ("XDG_SESSION_COOKIE=%s",
console_kit_cookie);
pam_putenv (pam_handle, value);
g_free (value);
+
+ runtime_dir = ck_get_xdg_runtime_dir (console_kit_cookie);
+ if (runtime_dir)
+ {
+ gchar *value;
+ value = g_strdup_printf ("XDG_RUNTIME_DIR=%s", runtime_dir);
+ pam_putenv (pam_handle, value);
+ g_free (value);
+ g_free (runtime_dir);
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/tests/Makefile.am
new/lightdm-1.17.5/tests/Makefile.am
--- old/lightdm-1.17.3/tests/Makefile.am 2015-11-20 01:32:38.000000000
+0100
+++ new/lightdm-1.17.5/tests/Makefile.am 2016-01-26 04:18:36.000000000
+0100
@@ -199,6 +199,7 @@
test-audit-autologin \
test-no-accounts-service \
test-console-kit \
+ test-console-kit-no-xdg-runtime \
test-no-console-kit \
test-no-login1 \
test-no-console-kit-or-login1 \
@@ -208,6 +209,7 @@
test-power-no-services-gobject \
test-open-file-descriptors \
test-xdmcp-server-open-file-descriptors \
+ test-add-local-x-seat \
test-multi-seat \
test-multi-seat-seat0-non-graphical \
test-multi-seat-seat0-non-graphical-disabled \
@@ -386,6 +388,7 @@
data/sessions/wayland.desktop \
scripts/0-additional.conf \
scripts/1-additional.conf \
+ scripts/add-local-x-seat.conf \
scripts/additional-config.conf \
scripts/additional-config-priority.conf \
scripts/additional-system-config.conf \
@@ -420,6 +423,7 @@
scripts/change-authentication.conf \
scripts/cancel-authentication.conf \
scripts/console-kit.conf \
+ scripts/console-kit-no-xdg-runtime.conf \
scripts/corrupt-xauthority.conf \
scripts/crash-authenticate.conf \
scripts/cred-error.conf \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/tests/Makefile.in
new/lightdm-1.17.5/tests/Makefile.in
--- old/lightdm-1.17.3/tests/Makefile.in 2015-12-17 01:14:11.000000000
+0100
+++ new/lightdm-1.17.5/tests/Makefile.in 2016-02-03 00:57:13.000000000
+0100
@@ -776,12 +776,13 @@
test-xdmcp-server-request-invalid-authorization \
test-utmp-login test-utmp-autologin test-utmp-wrong-password \
test-audit-autologin test-no-accounts-service test-console-kit \
- test-no-console-kit test-no-login1 \
- test-no-console-kit-or-login1 test-power-gobject \
- test-power-no-console-kit-gobject test-power-no-login1-gobject \
- test-power-no-services-gobject test-open-file-descriptors \
- test-xdmcp-server-open-file-descriptors test-multi-seat \
- test-multi-seat-seat0-non-graphical \
+ test-console-kit-no-xdg-runtime test-no-console-kit \
+ test-no-login1 test-no-console-kit-or-login1 \
+ test-power-gobject test-power-no-console-kit-gobject \
+ test-power-no-login1-gobject test-power-no-services-gobject \
+ test-open-file-descriptors \
+ test-xdmcp-server-open-file-descriptors test-add-local-x-seat \
+ test-multi-seat test-multi-seat-seat0-non-graphical \
test-multi-seat-seat0-non-graphical-disabled \
test-multi-seat-non-graphical \
test-multi-seat-non-graphical-disabled \
@@ -849,6 +850,7 @@
data/sessions/wayland.desktop \
scripts/0-additional.conf \
scripts/1-additional.conf \
+ scripts/add-local-x-seat.conf \
scripts/additional-config.conf \
scripts/additional-config-priority.conf \
scripts/additional-system-config.conf \
@@ -883,6 +885,7 @@
scripts/change-authentication.conf \
scripts/cancel-authentication.conf \
scripts/console-kit.conf \
+ scripts/console-kit-no-xdg-runtime.conf \
scripts/corrupt-xauthority.conf \
scripts/crash-authenticate.conf \
scripts/cred-error.conf \
@@ -2764,6 +2767,13 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS)
-- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-console-kit-no-xdg-runtime.log: test-console-kit-no-xdg-runtime
+ @p='test-console-kit-no-xdg-runtime'; \
+ b='test-console-kit-no-xdg-runtime'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS)
-- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
test-no-console-kit.log: test-no-console-kit
@p='test-no-console-kit'; \
b='test-no-console-kit'; \
@@ -2826,6 +2836,13 @@
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS)
-- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+test-add-local-x-seat.log: test-add-local-x-seat
+ @p='test-add-local-x-seat'; \
+ b='test-add-local-x-seat'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS)
-- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
test-multi-seat.log: test-multi-seat
@p='test-multi-seat'; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/tests/scripts/add-local-x-seat.conf
new/lightdm-1.17.5/tests/scripts/add-local-x-seat.conf
--- old/lightdm-1.17.3/tests/scripts/add-local-x-seat.conf 1970-01-01
01:00:00.000000000 +0100
+++ new/lightdm-1.17.5/tests/scripts/add-local-x-seat.conf 2016-01-25
04:55:08.000000000 +0100
@@ -0,0 +1,47 @@
+#
+# Check can run a local X server on demand
+#
+
+# Start a remote X server to use
+#?*START-XSERVER ARGS=":98"
+#?XSERVER-98 START
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Register the local X server with LightDM
+#?*ADD-LOCAL-X-SEAT DISPLAY=98
+
+# LightDM connects to X server
+#?XSERVER-98 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-98 START XDG_SEAT=xremote0 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?XSERVER-98 ACCEPT-CONNECT
+#?GREETER-X-98 CONNECT-XSERVER
+#?GREETER-X-98 CONNECT-TO-DAEMON
+#?GREETER-X-98 CONNECTED-TO-DAEMON
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?GREETER-X-98 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lightdm-1.17.3/tests/scripts/console-kit-no-xdg-runtime.conf
new/lightdm-1.17.5/tests/scripts/console-kit-no-xdg-runtime.conf
--- old/lightdm-1.17.3/tests/scripts/console-kit-no-xdg-runtime.conf
1970-01-01 01:00:00.000000000 +0100
+++ new/lightdm-1.17.5/tests/scripts/console-kit-no-xdg-runtime.conf
2016-01-26 04:19:27.000000000 +0100
@@ -0,0 +1,38 @@
+#
+# Check ConsoleKit works when GetXDGRuntime is not supported
+#
+
+[test-runner-config]
+disable-login1=true
+ck-no-xdg-runtime=true
+
+[Seat:*]
+autologin-user=have-password1
+user-session=default
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0
XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
+#?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Check XDG_RUNTIME_DIR is NOT set
+#?*SESSION-X-0 READ-ENV NAME=XDG_RUNTIME_DIR
+#?SESSION-X-0 READ-ENV NAME=XDG_RUNTIME_DIR VALUE=
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/tests/scripts/console-kit.conf
new/lightdm-1.17.5/tests/scripts/console-kit.conf
--- old/lightdm-1.17.3/tests/scripts/console-kit.conf 2015-08-10
01:30:00.000000000 +0200
+++ new/lightdm-1.17.5/tests/scripts/console-kit.conf 2016-01-26
04:14:15.000000000 +0100
@@ -26,6 +26,10 @@
#?XSERVER-0 ACCEPT-CONNECT
#?SESSION-X-0 CONNECT-XSERVER
+# Check XDG_RUNTIME_DIR is set
+#?*SESSION-X-0 READ-ENV NAME=XDG_RUNTIME_DIR
+#?SESSION-X-0 READ-ENV NAME=XDG_RUNTIME_DIR VALUE=/run/console-kit
+
# Cleanup
#?*STOP-DAEMON
#?SESSION-X-0 TERMINATE SIGNAL=15
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/tests/scripts/xremote-autologin.conf
new/lightdm-1.17.5/tests/scripts/xremote-autologin.conf
--- old/lightdm-1.17.3/tests/scripts/xremote-autologin.conf 2015-11-16
23:47:00.000000000 +0100
+++ new/lightdm-1.17.5/tests/scripts/xremote-autologin.conf 2016-01-25
04:50:23.000000000 +0100
@@ -6,6 +6,7 @@
type=xremote
autologin-user=have-password1
user-session=default
+xserver-hostname=127.0.0.1
xserver-display-number=98
# Start a remote X server to use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/tests/scripts/xremote-login.conf
new/lightdm-1.17.5/tests/scripts/xremote-login.conf
--- old/lightdm-1.17.3/tests/scripts/xremote-login.conf 2015-11-16
23:47:12.000000000 +0100
+++ new/lightdm-1.17.5/tests/scripts/xremote-login.conf 2016-01-25
04:50:26.000000000 +0100
@@ -5,6 +5,7 @@
[Seat:*]
type=xremote
user-session=default
+xserver-hostname=127.0.0.1
xserver-display-number=98
# Start a remote X server to use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/tests/src/test-runner.c
new/lightdm-1.17.5/tests/src/test-runner.c
--- old/lightdm-1.17.3/tests/src/test-runner.c 2015-11-19 00:18:43.000000000
+0100
+++ new/lightdm-1.17.5/tests/src/test-runner.c 2016-01-26 04:22:41.000000000
+0100
@@ -557,6 +557,25 @@
if (v)
seat->can_multi_session = strcmp (v, "TRUE") == 0;
}
+ else if (strcmp (name, "ADD-LOCAL-X-SEAT") == 0)
+ {
+ GVariant *result;
+ const gchar *v;
+
+ v = g_hash_table_lookup (params, "DISPLAY");
+ result = g_dbus_connection_call_sync (g_bus_get_sync
(G_BUS_TYPE_SYSTEM, NULL, NULL),
+ "org.freedesktop.DisplayManager",
+
"/org/freedesktop/DisplayManager",
+ "org.freedesktop.DisplayManager",
+ "AddLocalXSeat",
+ g_variant_new ("(i)", v ? atoi
(v) : -1),
+ G_VARIANT_TYPE ("(o)"),
+ G_DBUS_CALL_FLAGS_NONE,
+ G_MAXINT,
+ NULL,
+ NULL);
+ g_variant_unref (result);
+ }
else if (strcmp (name, "UPDATE-SEAT") == 0)
{
Login1Seat *seat;
@@ -1376,7 +1395,11 @@
{
CKSession *session = user_data;
- if (strcmp (method_name, "Lock") == 0)
+ if (strcmp (method_name, "GetXDGRuntimeDir") == 0 &&
!g_key_file_get_boolean (config, "test-runner-config", "ck-no-xdg-runtime",
NULL))
+ {
+ g_dbus_method_invocation_return_value (invocation, g_variant_new
("(s)", "/run/console-kit"));
+ }
+ else if (strcmp (method_name, "Lock") == 0)
{
if (!session->locked)
check_status ("CONSOLE-KIT LOCK-SESSION");
@@ -1445,9 +1468,20 @@
{
handle_ck_call,
};
+ const gchar *ck_session_interface_old =
+ "<node>"
+ " <interface name='org.freedesktop.ConsoleKit.Session'>"
+ " <method name='Lock'/>"
+ " <method name='Unlock'/>"
+ " <method name='Activate'/>"
+ " </interface>"
+ "</node>";
const gchar *ck_session_interface =
"<node>"
" <interface name='org.freedesktop.ConsoleKit.Session'>"
+ " <method name='GetXDGRuntimeDir'>"
+ " <arg name='dir' direction='out' type='s'/>"
+ " </method>"
" <method name='Lock'/>"
" <method name='Unlock'/>"
" <method name='Activate'/>"
@@ -1462,7 +1496,10 @@
g_clear_error (&error);
if (!ck_info)
return;
- ck_session_info = g_dbus_node_info_new_for_xml (ck_session_interface,
&error);
+ if (g_key_file_get_boolean (config, "test-runner-config",
"ck-no-xdg-runtime", NULL))
+ ck_session_info = g_dbus_node_info_new_for_xml
(ck_session_interface_old, &error);
+ else
+ ck_session_info = g_dbus_node_info_new_for_xml (ck_session_interface,
&error);
if (error)
g_warning ("Failed to parse D-Bus interface: %s", error->message);
g_clear_error (&error);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/tests/test-add-local-x-seat
new/lightdm-1.17.5/tests/test-add-local-x-seat
--- old/lightdm-1.17.3/tests/test-add-local-x-seat 1970-01-01
01:00:00.000000000 +0100
+++ new/lightdm-1.17.5/tests/test-add-local-x-seat 2016-01-25
03:36:40.000000000 +0100
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner add-local-x-seat test-gobject-greeter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lightdm-1.17.3/tests/test-console-kit-no-xdg-runtime
new/lightdm-1.17.5/tests/test-console-kit-no-xdg-runtime
--- old/lightdm-1.17.3/tests/test-console-kit-no-xdg-runtime 1970-01-01
01:00:00.000000000 +0100
+++ new/lightdm-1.17.5/tests/test-console-kit-no-xdg-runtime 2016-01-26
04:17:41.000000000 +0100
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner console-kit-no-xdg-runtime
test-gobject-greeter
