Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2013-05-03 07:33:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-18 15:00:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2013-05-03 07:33:20.000000000 +0200 @@ -1,0 +2,35 @@ +Thu May 2 12:27:18 UTC 2013 - [email protected] + +- import pam config used by the gdm greeter which includes + common-session that in turn contains pam_systemd and registers + the greeter session allowing suspend/hibernate/reboot/shutdown +- consequently remove lightdm.rules workaround for policykit + +------------------------------------------------------------------- +Thu May 2 10:30:02 UTC 2013 - [email protected] + +- remove support for openSUSE 12.1 +- remove dependency on upower +- amend lightdm.rules with a rule for logind + +------------------------------------------------------------------- +Wed May 1 18:24:04 UTC 2013 - [email protected] + +- Update to version 1.7.0 + - Use logind instead of ConsoleKit if it is available + - Use Q_SLOTS and Q_SIGNALS instead of slots and signals. + - Ignore stale X server locks + - Pass through system locale or set locale from + AccountsService/.dmrc + - Fix bug where seat failure before D-Bus acquired would not + stop daemon +- Dropped patches due to upstream inclusion: + - lightdm-make-sessions-inherit-system-default-locale.patch + - lightdm-fix-language-setting.patch + - lightdm-do-not-strip-codeset-from-language.patch + - lightdm-fix-function-declarations-missing-prototypes.patch + +- Drop Require for ConsoleKit-X11 as that lightdm now supports + systemd + +------------------------------------------------------------------- Old: ---- lightdm-1.6.0.tar.xz lightdm-do-not-strip-codeset-from-language.patch lightdm-fix-function-declarations-missing-prototypes.patch lightdm-fix-language-setting.patch lightdm-make-sessions-inherit-system-default-locale.patch lightdm.rules New: ---- lightdm-1.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.AUpof1/_old 2013-05-03 07:33:22.000000000 +0200 +++ /var/tmp/diff_new_pack.AUpof1/_new 2013-05-03 07:33:22.000000000 +0200 @@ -19,7 +19,7 @@ %define gobject_libname lightdm-gobject-1 %define gobject_lib lib%{gobject_libname}-0 -%define qt_libname lightdm-qt-2 +%define qt_libname lightdm-qt-3 %define qt_lib lib%{qt_libname}-0 %if 0%{?suse_version} >= 1230 %define rundir /run @@ -28,7 +28,7 @@ %endif Name: lightdm -Version: 1.6.0 +Version: 1.7.0 Release: 0 Summary: Lightweight, Cross-desktop Display Manager License: GPL-3.0+ @@ -37,8 +37,6 @@ Source0: https://launchpad.net/lightdm/1.6/%{version}/+download/%{name}-%{version}.tar.xz Source1: %{name}-greeter.pamd Source2: X11-displaymanagers-%{name} -# workaround for bnc#798769 -Source3: %{name}.rules Source100: %{name}-rpmlintrc # PATCH-FEATURE-OPENSUSE lightdm-sysconfig-support.patch [email protected] -- Adds support for reading configuration options from /etc/sysconfig/displaymanager and /etc/sysconfig/windowmanager Patch0: lightdm-sysconfig-support.patch @@ -52,28 +50,14 @@ Patch4: lightdm-lock-screen-before-switch.patch # PATCH-FIX-OPENSUSE lightdm-disable-utmp-handling.patch [email protected] -- Disable utmp handling since this is handled in the Xstartup/Xreset scripts Patch5: lightdm-disable-utmp-handling.patch -# PATCH-FIX-UPSTREAM lightdm-make-sessions-inherit-system-default-locale.patch lp#1073135 bnc#786926 [email protected] -- Make greeter and user sessions inherit the system default locale -Patch6: lightdm-make-sessions-inherit-system-default-locale.patch -# PATCH-FIX-OPENSUSE lightdm-fix-language-setting.patch lp#1068853 lp#1019314 [email protected] -- Fix saving/retrieving of the language setting -Patch7: lightdm-fix-language-setting.patch -# PATCH-FIX-OPENSUSE lightdm-do-not-strip-codeset-from-language.patch lp#1074946 [email protected] -- Do not strip the codeset and be consistent with how the Language setting is retrieved from AccountsService -Patch8: lightdm-do-not-strip-codeset-from-language.patch # PATCH-FIX-OPENSUSE lightdm-use-run-dir.patch [email protected] -- Use /run instead of /var/run -Patch9: lightdm-use-run-dir.patch -# PATCH-FIX-UPSTREAM lightdm-fix-function-declarations-missing-prototypes.patch lp#1168842 [email protected] -- Fix missing prototypes and pre-ANSI C function declarations -Patch10: lightdm-fix-function-declarations-missing-prototypes.patch +Patch6: lightdm-use-run-dir.patch BuildRequires: gcc-c++ BuildRequires: gnome-common BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: pam-devel -# for symlinks to xdm pam configuration files -%if 0%{?suse_version} < 1220 -BuildRequires: xorg-x11 -%else BuildRequires: xdm -%endif -BuildRequires: polkit BuildRequires: libgcrypt-devel BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gio-2.0) @@ -92,15 +76,8 @@ # the same versioning of lightdm Requires: lightdm-greeter # uses pam configuration and relies on scripts provided by xdm -%if 0%{?suse_version} < 1220 -Requires: xorg-x11 -%else Requires: xdm -%endif -Requires: ConsoleKit-x11 -Requires: polkit Requires: gdmflexiserver -Recommends: upower Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -158,13 +135,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 %if 0%{?suse_version} >= 1230 -%patch9 -p1 +%patch6 -p1 %endif -%patch10 -p1 %build bash ./autogen.sh @@ -196,10 +169,6 @@ install -D -m 644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/lightdm-greeter install -D -m 644 -p %{SOURCE2} %{buildroot}%{_libexecdir}/X11/displaymanagers/lightdm -%if 0%{?suse_version} >= 1230 -install -D -m 644 -p %{SOURCE3} %{buildroot}%{_datadir}/polkit-1/rules.d/50-lightdm.rules -%endif - install -d %{buildroot}%{_localstatedir}/log/lightdm install -d %{buildroot}%{rundir}/lightdm install -d %{buildroot}%{_localstatedir}/lib/lightdm @@ -243,9 +212,6 @@ %dir %{_libexecdir}/X11/displaymanagers/ %{_libexecdir}/X11/displaymanagers/lightdm %dir %{_datadir}/xgreeters/ -%if 0%{?suse_version} >= 1230 -%{_datadir}/polkit-1/rules.d/50-lightdm.rules -%endif %ghost %attr(711,lightdm,lightdm) %dir %{rundir}/lightdm %attr(750,lightdm,lightdm) %dir %{_localstatedir}/log/lightdm %attr(750,lightdm,lightdm) %dir %{_localstatedir}/lib/lightdm ++++++ lightdm-1.6.0.tar.xz -> lightdm-1.7.0.tar.xz ++++++ ++++ 6162 lines of diff (skipped) ++++++ lightdm-disable-utmp-handling.patch ++++++ --- /var/tmp/diff_new_pack.AUpof1/_old 2013-05-03 07:33:22.000000000 +0200 +++ /var/tmp/diff_new_pack.AUpof1/_new 2013-05-03 07:33:22.000000000 +0200 @@ -1,11 +1,7 @@ -# HG changeset patch -# Parent a0053176642cac55136462dd2f2a84180c7ac842 -disable utmp handling since this is handled in the Xstartup/Xreset scripts - -diff --git a/src/session-child.c b/src/session-child.c ---- a/src/session-child.c -+++ b/src/session-child.c -@@ -11,7 +11,9 @@ +diff -urNB lightdm-1.5.0/src/session-child.c new/src/session-child.c +--- lightdm-1.5.0/src/session-child.c 2013-01-31 21:28:23.000000000 +0100 ++++ new/src/session-child.c 2013-02-01 14:23:24.518480052 +0100 +@@ -13,7 +13,9 @@ #include <grp.h> #include <glib.h> #include <security/pam_appl.h> @@ -14,8 +10,8 @@ +#endif #include <sys/mman.h> - #include "session-child.h" -@@ -538,6 +540,7 @@ session_child_run (int argc, char **argv + #include "configuration.h" +@@ -545,6 +547,7 @@ /* Wait for the command to complete (blocks) */ if (child_pid > 0) { @@ -23,7 +19,7 @@ /* Log to utmp */ if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0) { -@@ -563,10 +566,10 @@ session_child_run (int argc, char **argv +@@ -570,10 +573,10 @@ g_printerr ("Failed to write utmpx: %s\n", strerror (errno)); endutxent (); } @@ -36,7 +32,7 @@ /* Log to utmp */ if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0) { -@@ -592,6 +595,7 @@ session_child_run (int argc, char **argv +@@ -599,6 +602,7 @@ g_printerr ("Failed to write utmpx: %s\n", strerror (errno)); endutxent (); } ++++++ lightdm-greeter.pamd ++++++ --- /var/tmp/diff_new_pack.AUpof1/_old 2013-05-03 07:33:22.000000000 +0200 +++ /var/tmp/diff_new_pack.AUpof1/_new 2013-05-03 07:33:22.000000000 +0200 @@ -1,5 +1,7 @@ #%PAM-1.0 -auth required pam_permit.so -account required pam_permit.so -password required pam_deny.so -session required pam_unix.so +# LightDM PAM configuration used only for the greeter session +auth required pam_permit.so +account required pam_permit.so +password include common-password +session required pam_loginuid.so +session include common-session ++++++ lightdm-sysconfig-support.patch ++++++ --- /var/tmp/diff_new_pack.AUpof1/_old 2013-05-03 07:33:22.000000000 +0200 +++ /var/tmp/diff_new_pack.AUpof1/_new 2013-05-03 07:33:22.000000000 +0200 @@ -1,8 +1,6 @@ -retrieve configuration seetings from sysconfig files - -diff --git a/data/lightdm.conf b/data/lightdm.conf ---- a/data/lightdm.conf -+++ b/data/lightdm.conf +diff -urNB lightdm-1.5.2/data/lightdm.conf new/data/lightdm.conf +--- lightdm-1.5.2/data/lightdm.conf 2013-03-06 03:40:10.000000000 +0100 ++++ new/data/lightdm.conf 2013-03-27 12:44:12.162028461 +0100 @@ -1,3 +1,32 @@ +# NOTE: settings under /etc/sysconfig take precendence over those below, +# specifically: @@ -36,22 +34,10 @@ # # General configuration # -diff --git a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -28,6 +28,8 @@ lightdm_SOURCES = \ - lightdm.c \ - ldm-marshal.c \ - ldm-marshal.h \ -+ opensuse-sysconfig.c \ -+ opensuse-sysconfig.h \ - plymouth.c \ - plymouth.h \ - privileges.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) +diff -urNB lightdm-1.5.2/src/display.c new/src/display.c +--- lightdm-1.5.2/src/display.c 2013-03-26 23:08:07.000000000 +0100 ++++ new/src/display.c 2013-03-27 12:46:11.734533599 +0100 +@@ -410,7 +410,10 @@ 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 */ @@ -63,7 +49,7 @@ 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); -@@ -788,7 +791,10 @@ display_server_ready_cb (DisplayServer * +@@ -788,7 +791,10 @@ else if (display->priv->select_user_hint && display->priv->select_user_attempt_login) { g_debug ("Logging in user %s", display->priv->select_user_hint); @@ -75,9 +61,9 @@ } /* 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 +diff -urNB lightdm-1.5.2/src/lightdm.c new/src/lightdm.c +--- lightdm-1.5.2/src/lightdm.c 2013-03-07 22:29:53.000000000 +0100 ++++ new/src/lightdm.c 2013-03-27 12:49:39.381937649 +0100 @@ -21,6 +21,7 @@ #include <sys/stat.h> @@ -86,7 +72,7 @@ #include "display-manager.h" #include "xdmcp-server.h" #include "vnc-server.h" -@@ -60,6 +61,117 @@ typedef struct +@@ -60,6 +61,117 @@ #define LIGHTDM_BUS_NAME "org.freedesktop.DisplayManager" @@ -204,7 +190,7 @@ static void log_cb (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer data) { -@@ -1045,6 +1157,9 @@ main (int argc, char **argv) +@@ -1045,6 +1157,9 @@ g_mkdir_with_parents (dir, S_IRWXU | S_IXGRP | S_IXOTH); g_free (dir); @@ -214,10 +200,21 @@ log_init (); g_debug ("Starting Light Display Manager %s, UID=%i PID=%i", VERSION, getuid (), getpid ()); -diff --git a/src/opensuse-sysconfig.c b/src/opensuse-sysconfig.c -new file mode 100644 ---- /dev/null -+++ b/src/opensuse-sysconfig.c +diff -urNB lightdm-1.5.2/src/Makefile.am new/src/Makefile.am +--- lightdm-1.5.2/src/Makefile.am 2013-03-06 03:40:10.000000000 +0100 ++++ new/src/Makefile.am 2013-03-27 12:50:14.660496606 +0100 +@@ -28,6 +28,8 @@ lightdm_SOURCES = \ + lightdm.c \ + ldm-marshal.c \ + ldm-marshal.h \ ++ opensuse-sysconfig.c \ ++ opensuse-sysconfig.h \ + login1.c \ + login1.h \ + plymouth.c \ +diff -urNB lightdm-1.5.2/src/opensuse-sysconfig.c new/src/opensuse-sysconfig.c +--- lightdm-1.5.2/src/opensuse-sysconfig.c 1970-01-01 01:00:00.000000000 +0100 ++++ new/src/opensuse-sysconfig.c 2013-02-01 13:49:53.068382703 +0100 @@ -0,0 +1,380 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -599,10 +596,9 @@ + return boolean_value; +} + -diff --git a/src/opensuse-sysconfig.h b/src/opensuse-sysconfig.h -new file mode 100644 ---- /dev/null -+++ b/src/opensuse-sysconfig.h +diff -urNB lightdm-1.5.2/src/opensuse-sysconfig.h new/src/opensuse-sysconfig.h +--- lightdm-1.5.2/src/opensuse-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 ++++ new/src/opensuse-sysconfig.h 2013-02-01 13:49:53.068382703 +0100 @@ -0,0 +1,50 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
