Hello community,
here is the log from the commit of package lightdm for openSUSE:Factory checked
in at 2012-10-18 21:54:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2012-04-23
09:15:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2012-10-18
21:55:00.000000000 +0200
@@ -1,0 +2,23 @@
+Wed Oct 17 09:07:03 UTC 2012 - g...@opensuse.org
+
+- re-use xdm PAM configuration which is identical and there already
+ is a de-facto dependency due to the use of xdm init and session
+ scripts
+- recommend upower which is needed for hibernate/suspend to work
+
+-------------------------------------------------------------------
+Sun Oct 7 08:52:41 UTC 2012 - g...@opensuse.org
+
+- provide %{_bindir}/gdmflexiserver for openSUSE > 12.2 since
+ gdmflexiserver was dropped from gdm >= 3.6
+
+-------------------------------------------------------------------
+Fri Oct 5 10:50:05 UTC 2012 - g...@opensuse.org
+
+- update to version 1.4.0
+ - new major release, please see the included NEWS for a detailed
+ list of changes
+- added lightdm-disable-utmp-handling.patch which disables utmp
+ handling since this is handled in the Xstartup/Xreset scripts
+
+-------------------------------------------------------------------
Old:
----
lightdm-1.2.2.tar.gz
lightdm-autologin.pamd
lightdm.pamd
New:
----
lightdm-1.4.0.tar.gz
lightdm-disable-utmp-handling.patch
lightdm-greeter.pamd
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightdm.spec ++++++
--- /var/tmp/diff_new_pack.pbqoxJ/_old 2012-10-18 21:55:01.000000000 +0200
+++ /var/tmp/diff_new_pack.pbqoxJ/_new 2012-10-18 21:55:01.000000000 +0200
@@ -23,32 +23,39 @@
%define qt_lib lib%{qt_libname}-0
Name: lightdm
-Version: 1.2.2
+Version: 1.4.0
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: %{name}-%{version}.tar.gz
-Source1: %{name}.pamd
-Source2: %{name}-autologin.pamd
-Source3: X11-displaymanagers-%{name}
+Source1: %{name}-greeter.pamd
+Source2: X11-displaymanagers-%{name}
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
-Patch1: lightdm-sysconfig-support.patch
+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
-Patch2: lightdm-xauthlocalhostname-support.patch
+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
-Patch4: lightdm-set-gdmflexiserver-envvar.patch
+Patch2: lightdm-set-gdmflexiserver-envvar.patch
# PATCH-FEATURE-OPENSUSE lightdm-default-configuration.patch g...@opensuse.org
-- Modifies configuration with suitable defaults for openSUSE
-Patch5: lightdm-default-configuration.patch
+Patch3: lightdm-default-configuration.patch
# PATCH-FIX-UPSTREAM lightdm-lock-screen-before-switch.patch g...@opensuse.org
-- Try to lock the screen before switching users
-Patch7: lightdm-lock-screen-before-switch.patch
+Patch4: lightdm-lock-screen-before-switch.patch
+# PATCH-FIX-OPENSUSE lightdm-disable-utmp-handling.patch g...@opensuse.org --
Disable utmp handling since this is handled in the Xstartup/Xreset scripts
+Patch5: lightdm-disable-utmp-handling.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: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
@@ -65,8 +72,20 @@
# 3rd party greeters don't have to follow
# 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
+%if 0%{?suse_version} <= 1220
Requires: gdmflexiserver
+%else
+# temporarily conflict to avoid issues with gdm < 3.6
+Conflicts: gdmflexiserver
+%endif
+Recommends: upower
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -115,11 +134,12 @@
%prep
%setup -q
+%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch7 -p1
%build
./autogen.sh
@@ -136,11 +156,22 @@
%make_install
rm -f %{buildroot}%{_libdir}/*.la
+
+# upstart configuration is not needed
rm -rf %{buildroot}%{_sysconfdir}/init/
-install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/lightdm
-install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
-install -D -m 644 %{SOURCE3}
%{buildroot}%{_libexecdir}/X11/displaymanagers/lightdm
+# these are useless stubs for now
+rm -rf %{buildroot}%{_datadir}/help/
+
+%if 0%{?suse_version} > 1220
+ln -s %{_libexecdir}/%{name}/gdmflexiserver \
+ %{buildroot}%{_bindir}/gdmflexiserver
+%endif
+
+ln -sf %{_sysconfdir}/pam.d/xdm %{buildroot}%{_sysconfdir}/pam.d/lightdm
+ln -sf %{_sysconfdir}/pam.d/xdm-np
%{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
+install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/lightdm-greeter
+install -D -m 644 %{SOURCE2}
%{buildroot}%{_libexecdir}/X11/displaymanagers/lightdm
install -d %{buildroot}%{_localstatedir}/log/lightdm
install -d %{buildroot}%{_localstatedir}/run/lightdm
@@ -170,11 +201,14 @@
%defattr(-,root,root,-)
%doc COPYING ChangeLog NEWS README
%{_bindir}/dm-tool
+%if 0%{?suse_version} > 1220
+%{_bindir}/gdmflexiserver
+%endif
%{_sbindir}/lightdm
%dir %{_libexecdir}/lightdm/
%{_libexecdir}/%{name}/lightdm-set-defaults
-%{_libexecdir}/%{name}/gdmflexiserver
%{_libexecdir}/%{name}/lightdm-guest-session-wrapper
+%{_libexecdir}/%{name}/gdmflexiserver
%dir %{_sysconfdir}/lightdm/
%config %{_sysconfdir}/lightdm/lightdm.conf
%config %{_sysconfdir}/lightdm/users.conf
++++++ lightdm-1.2.2.tar.gz -> lightdm-1.4.0.tar.gz ++++++
++++ 9389 lines of diff (skipped)
++++++ lightdm-default-configuration.patch ++++++
--- /var/tmp/diff_new_pack.pbqoxJ/_old 2012-10-18 21:55:01.000000000 +0200
+++ /var/tmp/diff_new_pack.pbqoxJ/_new 2012-10-18 21:55:01.000000000 +0200
@@ -3,25 +3,24 @@
diff --git a/data/lightdm.conf b/data/lightdm.conf
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
-@@ -47,7 +47,7 @@
- #greeter-user=lightdm
+@@ -50,7 +50,7 @@
#minimum-display-number=0
#minimum-vt=7
+ #lock-memory=true
-#user-authority-in-system-dir=false
+user-authority-in-system-dir=true
#guest-account-script=guest-account
#log-directory=/var/log/lightdm
#run-directory=/var/run/lightdm
-@@ -84,7 +84,7 @@
- # exit-on-failure = True if the daemon should exit if this seat fails
- #
+@@ -92,6 +92,7 @@
[SeatDefaults]
--#xserver-command=X
+ #type=xlocal
+ #xserver-command=X
+xserver-command=/usr/bin/X
#xserver-layout=
#xserver-config=
#xserver-allow-tcp=false
-@@ -98,11 +98,11 @@
+@@ -106,11 +107,11 @@
#user-session=default
#allow-guest=true
#guest-session=UNIMPLEMENTED
++++++ lightdm-disable-utmp-handling.patch ++++++
# HG changeset patch
# Parent f1d31c63d810bec712b3afc90771bbb42d47bacb
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 @@
#include <grp.h>
#include <glib.h>
#include <security/pam_appl.h>
+#if 0
#include <utmpx.h>
+#endif
#include "session-child.h"
#include "session.h"
@@ -525,6 +527,7 @@ session_child_run (int argc, char **argv
/* Wait for the command to complete (blocks) */
if (child_pid > 0)
{
+#if 0
/* Log to utmp */
if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0)
{
@@ -550,10 +553,10 @@ session_child_run (int argc, char **argv
g_printerr ("Failed to write utmpx: %s\n", strerror (errno));
endutxent ();
}
-
+#endif
waitpid (child_pid, &return_code, 0);
child_pid = 0;
-
+#if 0
/* Log to utmp */
if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0)
{
@@ -579,6 +582,7 @@ session_child_run (int argc, char **argv
g_printerr ("Failed to write utmpx: %s\n", strerror (errno));
endutxent ();
}
+#endif
}
/* Remove X authority */
++++++ lightdm-greeter.pamd ++++++
#%PAM-1.0
auth required pam_permit.so
account required pam_permit.so
password required pam_deny.so
session required pam_unix.so
++++++ lightdm-set-gdmflexiserver-envvar.patch ++++++
--- /var/tmp/diff_new_pack.pbqoxJ/_old 2012-10-18 21:55:01.000000000 +0200
+++ /var/tmp/diff_new_pack.pbqoxJ/_new 2012-10-18 21:55: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
-@@ -453,10 +453,7 @@ session_child_run (int argc, char **argv
+@@ -459,10 +459,7 @@ session_child_run (int argc, char **argv
g_free (value);
}
++++++ lightdm-sysconfig-support.patch ++++++
--- /var/tmp/diff_new_pack.pbqoxJ/_old 2012-10-18 21:55:02.000000000 +0200
+++ /var/tmp/diff_new_pack.pbqoxJ/_new 2012-10-18 21:55:02.000000000 +0200
@@ -51,30 +51,42 @@
diff --git a/src/display.c b/src/display.c
--- a/src/display.c
+++ b/src/display.c
-@@ -909,7 +909,10 @@ static void
- display_init (Display *display)
- {
- display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, DISPLAY_TYPE,
DisplayPrivate);
-- display->priv->pam_service = g_strdup ("lightdm");
+@@ -405,7 +405,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->pam_service = g_strdup ("lightdm-autologin");
++ display->priv->greeter = greeter_new (display->priv->session,
AUTOLOGIN_SERVICE, AUTOLOGIN_SERVICE);
+ else
-+ display->priv->pam_service = g_strdup ("lightdm");
- display->priv->pam_autologin_service = g_strdup ("lightdm-autologin");
- }
++ 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);
+@@ -791,7 +794,10 @@ display_server_ready_cb (DisplayServer *
+ else if (display->priv->select_user_hint)
+ {
+ 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 <sys/mman.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"
@@ -192,7 +204,7 @@
static void
log_cb (const gchar *log_domain, GLogLevelFlags log_level, const gchar
*message, gpointer data)
{
-@@ -1047,6 +1159,9 @@ main (int argc, char **argv)
+@@ -1062,6 +1174,9 @@ main (int argc, char **argv)
g_mkdir_with_parents (dir, S_IRWXU | S_IXGRP | S_IXOTH);
g_free (dir);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
