Hello community,
here is the log from the commit of package lightdm for openSUSE:Factory checked
in at 2012-04-12 13:25:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-03-29
14:02:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2012-04-12
13:25:10.000000000 +0200
@@ -1,0 +2,16 @@
+Fri Apr 6 22:42:43 UTC 2012 - g...@opensuse.org
+
+- update to version 1.2.0
+ - new major release, please see the included NEWS for a detailed
+ list of changes
+- dropped lightdm-desktop-session-env-pam.patch since
+ DESKTOP_SESSION is now in the PAM environment before
+ pam_open_session() is called
+- dropped lightdm-remove-xauthority-ownership-fix.patch since the
+ code has been removed by upstream
+- dropped lightdm-call-g_thread_init-conditionally.patch since the
+ problem has been fixed by upstream
+- removed lightdm-gtk-greeter and lightdm-qt-greeter which are now
+ separate projects
+
+-------------------------------------------------------------------
Old:
----
lightdm-1.0.10.tar.gz
lightdm-call-g_thread_init-conditionally.patch
lightdm-desktop-session-env-pam.patch
lightdm-remove-xauthority-ownership-fix.patch
New:
----
lightdm-1.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightdm.spec ++++++
--- /var/tmp/diff_new_pack.JRQIbe/_old 2012-04-12 13:25:12.000000000 +0200
+++ /var/tmp/diff_new_pack.JRQIbe/_new 2012-04-12 13:25:12.000000000 +0200
@@ -19,11 +19,11 @@
%define gobject_libname lightdm-gobject-1
%define gobject_lib lib%{gobject_libname}-0
-%define qt_libname lightdm-qt-1
+%define qt_libname lightdm-qt-2
%define qt_lib lib%{qt_libname}-0
Name: lightdm
-Version: 1.0.10
+Version: 1.2.0
Release: 0
Summary: Lightweight, Cross-desktop Display Manager
License: GPL-3.0+
@@ -40,30 +40,26 @@
Patch1: 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
-# PATCH-FEATURE-OPENSUSE lightdm-desktop-session-env-pam.patch
g...@opensuse.org -- Sets a PAM environment variable to let the pam
gnome-keyring module know which session is started
-Patch3: lightdm-desktop-session-env-pam.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
# PATCH-FEATURE-OPENSUSE lightdm-default-configuration.patch g...@opensuse.org
-- Modifies configuration with suitable defaults for openSUSE
Patch5: 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
-# PATCH-FIX-UPSTREAM lightdm-remove-xauthority-ownership-fix.patch
g...@opensuse.org -- Remove the code correcting the ownership of .Xauthority
files, it is still not secure and the buggy LightDM version writing .Xauthority
as root never was in a released openSUSE version anyway
-Patch8: lightdm-remove-xauthority-ownership-fix.patch
-# PATCH-FIX-UPSTREAM lightdm-call-g_thread_init-conditionally.patch
g...@opensuse.org -- call g_thread_init() only on glib < 2.31.0
-Patch10: lightdm-call-g_thread_init-conditionally.patch
BuildRequires: gcc-c++
BuildRequires: gnome-common
BuildRequires: gtk-doc
BuildRequires: intltool
BuildRequires: pam-devel
-BuildRequires: vala
-BuildRequires: pkgconfig(QtGui)
-BuildRequires: pkgconfig(dbus-glib-1)
-BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
-BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(gio-unix-2.0)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(libxklavier)
+BuildRequires: pkgconfig(QtCore)
+BuildRequires: pkgconfig(QtDBus)
+BuildRequires: pkgconfig(QtGui)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xdmcp)
@@ -83,9 +79,8 @@
fast performance. Due to its cross-platform nature greeters can be written in
several toolkits such as Qt and GTK.
-
-
%lang_package
+
%package -n %{gobject_lib}
Summary: LightDM GObject-based Client Library
@@ -96,7 +91,6 @@
A GObject-based library for LightDM clients to use to interface with LightDM.
%package gobject-devel
-
Summary: Development Files for %{gobject_lib}
Group: Development/Libraries/C and C++
Requires: %{gobject_lib} = %{version}
@@ -106,7 +100,6 @@
LightDM clients.
%package -n %{qt_lib}
-
Summary: LightDM Qt-based Client Library
Group: System/Libraries
@@ -114,7 +107,6 @@
A Qt-based library for LightDM clients to use to interface with LightDM.
%package qt-devel
-
Summary: Development Files for %{qt_lib}
Group: Development/Libraries/C and C++
Requires: %{qt_lib} = %{version}
@@ -123,63 +115,15 @@
This package contains development files needed for developing Qt-based
LightDM clients.
-%package gtk-greeter
-
-Summary: GTK-based Greeter for LightDM
-Group: System/X11/Displaymanagers
-Requires(post): update-alternatives
-Requires(postun):update-alternatives
-Recommends: gnome-themes-accessibility
-Requires: %{name} = %{version}
-Requires: %{gobject_lib} = %{version}
-Requires: %{name}-gtk-greeter-branding = %{version}
-Provides: lightdm-greeter = %{version}
-
-%description gtk-greeter
-This is the reference implementation of a LightDM greeter based on the GTK
-toolkit.
-
-%package gtk-greeter-branding-upstream
-
-Summary: Upstream branding of %{name}-gtk-greeter
-Group: System/X11/Displaymanagers
-Requires: %{name}-gtk-greeter = %{version}
-Provides: %{name}-gtk-greeter-branding = %{version}
-Conflicts: otherproviders(%{name}-gtk-greeter-branding)
-Supplements: packageand(%{name}-gtk-greeter:branding-upstream)
-BuildArch: noarch
-#BRAND: /etc/lightdm/lightdm-gtk-greeter.conf: Determines a number of greeter
-#BRAND: settings, in particular the background image.
-
-%description gtk-greeter-branding-upstream
-This package provides the upstream look and feel for the %{name}-gtk-greeter.
-
-%package qt-greeter
-
-Summary: Qt-based Greeter for LightDM
-Group: System/X11/Displaymanagers
-Requires(post): update-alternatives
-Requires(postun):update-alternatives
-Requires: %{name} = %{version}
-Requires: %{qt_lib} = %{version}
-Provides: lightdm-greeter = %{version}
-
-%description qt-greeter
-This is the reference implementation of a LightDM greeter based on the Qt
-toolkit.
-
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch7 -p1
-%patch8 -p1
-%patch10 -p1
-rm -f liblightdm-qt/*_moc.cpp greeters/qt/*_moc.cpp tests/src/*_moc.cpp
+#rm -f liblightdm-qt/*_moc.cpp greeters/qt/*_moc.cpp tests/src/*_moc.cpp
%build
./autogen.sh
@@ -205,6 +149,7 @@
install -d %{buildroot}%{_localstatedir}/log/lightdm
install -d %{buildroot}%{_localstatedir}/run/lightdm
install -d %{buildroot}%{_localstatedir}/lib/lightdm
+install -d %{buildroot}%{_datadir}/xgreeters
%find_lang %{name} %{?no_lang_C}
@@ -225,32 +170,6 @@
%postun -n %{qt_lib} -p /sbin/ldconfig
-%post qt-greeter
-/usr/sbin/update-alternatives --install \
- %{_datadir}/xgreeters/lightdm-default-greeter.desktop \
- lightdm-default-greeter.desktop \
- %{_datadir}/xgreeters/lightdm-qt-greeter.desktop \
- 20
-
-%postun qt-greeter
-if [ $1 -eq 0 ]; then
- /usr/sbin/update-alternatives --remove lightdm-default-greeter.desktop \
- %{_datadir}/xgreeters/lightdm-qt-greeter.desktop
-fi
-
-%post gtk-greeter
-/usr/sbin/update-alternatives --install \
- %{_datadir}/xgreeters/lightdm-default-greeter.desktop \
- lightdm-default-greeter.desktop \
- %{_datadir}/xgreeters/lightdm-gtk-greeter.desktop \
- 20
-
-%postun gtk-greeter
-if [ $1 -eq 0 ]; then
- /usr/sbin/update-alternatives --remove lightdm-default-greeter.desktop \
- %{_datadir}/xgreeters/lightdm-gtk-greeter.desktop
-fi
-
%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog NEWS README
@@ -304,23 +223,4 @@
%{_libdir}/pkgconfig/lib%{qt_libname}.pc
%{_includedir}/%{qt_libname}/
-%files gtk-greeter
-%defattr(-,root,root,-)
-%{_sbindir}/lightdm-gtk-greeter
-%{_datadir}/lightdm-gtk-greeter
-%{_datadir}/xgreeters/lightdm-gtk-greeter.desktop
-%ghost %attr(644,root,root)
%{_datadir}/xgreeters/lightdm-default-greeter.desktop
-%ghost %attr(644,root,root)
%{_sysconfdir}/alternatives/lightdm-default-greeter.desktop
-
-%files gtk-greeter-branding-upstream
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/lightdm/lightdm-gtk-greeter.conf
-
-%files qt-greeter
-%defattr(-,root,root,-)
-%{_sbindir}/lightdm-qt-greeter
-%{_datadir}/xgreeters/lightdm-qt-greeter.desktop
-%ghost %attr(644,root,root)
%{_datadir}/xgreeters/lightdm-default-greeter.desktop
-%ghost %attr(644,root,root)
%{_sysconfdir}/alternatives/lightdm-default-greeter.desktop
-
%changelog
++++++ lightdm-1.0.10.tar.gz -> lightdm-1.2.0.tar.gz ++++++
++++ 33073 lines of diff (skipped)
++++++ lightdm-default-configuration.patch ++++++
--- /var/tmp/diff_new_pack.JRQIbe/_old 2012-04-12 13:25:12.000000000 +0200
+++ /var/tmp/diff_new_pack.JRQIbe/_new 2012-04-12 13:25:12.000000000 +0200
@@ -1,5 +1,3 @@
-# HG changeset patch
-# Parent a5fbc3e2645c335d3936ca62c61b7555468f4da7
openSUSE-specific default configuration
diff --git a/data/lightdm.conf b/data/lightdm.conf
@@ -14,7 +12,7 @@
#guest-account-script=guest-account
#log-directory=/var/log/lightdm
#run-directory=/var/run/lightdm
-@@ -82,7 +82,7 @@
+@@ -84,7 +84,7 @@
# exit-on-failure = True if the daemon should exit if this seat fails
#
[SeatDefaults]
@@ -23,7 +21,7 @@
#xserver-layout=
#xserver-config=
#xserver-allow-tcp=false
-@@ -94,11 +94,11 @@
+@@ -98,11 +98,11 @@
#user-session=default
#allow-guest=true
#guest-session=UNIMPLEMENTED
++++++ lightdm-lock-screen-before-switch.patch ++++++
--- /var/tmp/diff_new_pack.JRQIbe/_old 2012-04-12 13:25:12.000000000 +0200
+++ /var/tmp/diff_new_pack.JRQIbe/_new 2012-04-12 13:25:12.000000000 +0200
@@ -1,5 +1,3 @@
-# HG changeset patch
-# Parent b329fa1badaa454239690c3feb93d53324134915
try to lock the screen before switching users
diff --git a/utils/gdmflexiserver b/utils/gdmflexiserver
++++++ lightdm-set-gdmflexiserver-envvar.patch ++++++
--- /var/tmp/diff_new_pack.JRQIbe/_old 2012-04-12 13:25:12.000000000 +0200
+++ /var/tmp/diff_new_pack.JRQIbe/_new 2012-04-12 13:25:12.000000000 +0200
@@ -1,24 +1,17 @@
-# HG changeset patch
-# Parent aea22cc6a9e4a9e6becbefa3ae7945b5a74d7802
set the GDMFLEXISERVER environment variable for the gdmflexiserver wrapper
-diff --git a/src/session.c b/src/session.c
---- a/src/session.c
-+++ b/src/session.c
-@@ -274,6 +274,7 @@ session_start (Session *session)
- session_set_env (session, "LOGNAME", user_get_name (user));
- session_set_env (session, "HOME", user_get_home_directory (user));
- session_set_env (session, "SHELL", user_get_shell (user));
-+ session_set_env (session, "GDMFLEXISERVER", PKGLIBEXEC_DIR
"/gdmflexiserver");
+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
+ g_free (value);
+ }
- session_set_env (session, "USERNAME", user_get_name (user)); // FIXME: Is
this required?
+- /* Put our tools directory in the path as a hack so we can use the legacy
gdmflexiserver interface */
+- path = pam_getenv (pam_handle, "PATH");
+- if (path)
+- pam_putenv (pam_handle, g_strdup_printf ("PATH=%s:%s",
PKGLIBEXEC_DIR, path));
++ pam_putenv (pam_handle, g_strdup_printf ("GDMFLEXISERVER=%s",
PKGLIBEXEC_DIR "/gdmflexiserver"));
-@@ -458,7 +459,7 @@ session_run (Process *process)
- pam_session_setup (session->priv->authentication);
- set_env_from_authentication (session, session->priv->authentication);
- set_locale (session);
-- insert_utility_path (session);
-+ /* insert_utility_path (session); */
-
- PROCESS_CLASS (session_parent_class)->run (process);
- }
+ /* Catch terminate signal and pass it to the child */
+ signal (SIGTERM, signal_cb);
++++++ lightdm-sysconfig-support.patch ++++++
--- /var/tmp/diff_new_pack.JRQIbe/_old 2012-04-12 13:25:12.000000000 +0200
+++ /var/tmp/diff_new_pack.JRQIbe/_new 2012-04-12 13:25:12.000000000 +0200
@@ -45,13 +45,13 @@
ldm-marshal.h \
+ opensuse-sysconfig.c \
+ opensuse-sysconfig.h \
- pam-session.c \
- pam-session.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
-@@ -881,7 +881,10 @@ static void
+@@ -909,7 +909,10 @@ static void
display_init (Display *display)
{
display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, DISPLAY_TYPE,
DisplayPrivate);
@@ -192,7 +192,7 @@
static void
log_cb (const gchar *log_domain, GLogLevelFlags log_level, const gchar
*message, gpointer data)
{
-@@ -1134,6 +1246,9 @@ main (int argc, char **argv)
+@@ -1047,6 +1159,9 @@ main (int argc, char **argv)
g_mkdir_with_parents (dir, S_IRWXU | S_IXGRP | S_IXOTH);
g_free (dir);
++++++ lightdm-use-pkglibexecdir.patch ++++++
--- /var/tmp/diff_new_pack.JRQIbe/_old 2012-04-12 13:25:12.000000000 +0200
+++ /var/tmp/diff_new_pack.JRQIbe/_new 2012-04-12 13:25:12.000000000 +0200
@@ -1,6 +1,4 @@
-# HG changeset patch
-# Parent 79422a3a63bcacbadbb7c27ced238711d5d318cb
-Use pkglibexecdir instead of libexecdir for helper binaries/scripts
+use pkglibexecdir instead of libexecdir for helper binaries/scripts
diff --git a/data/Makefile.am b/data/Makefile.am
--- a/data/Makefile.am
@@ -26,37 +24,3 @@
#include <abstractions/authentication>
#include <abstractions/nameservice>
#include <abstractions/wutmp>
-diff --git a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -93,7 +93,7 @@ lightdm_LDADD = \
- $(LIGHTDM_LIBS) \
- -lpam
-
--libexec_PROGRAMS = lightdm-guest-session-wrapper
-+pkglibexec_PROGRAMS = lightdm-guest-session-wrapper
-
- lightdm_guest_session_wrapper_SOURCES = lightdm-guest-session-wrapper.c
-
-diff --git a/src/display.c b/src/display.c
---- a/src/display.c
-+++ b/src/display.c
-@@ -474,7 +474,7 @@ create_session (Display *display, PAMSes
- if (display->priv->autologin_guest)
- {
- gchar *t = command;
-- command = g_strdup_printf (LIBEXEC_DIR
"/lightdm-guest-session-wrapper %s", command);
-+ command = g_strdup_printf (PKGLIBEXEC_DIR
"/lightdm-guest-session-wrapper %s", command);
- g_debug("Guest session, running session command through wrapper: %s",
command);
- g_free (t);
- }
-diff --git a/utils/Makefile.am b/utils/Makefile.am
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -1,5 +1,5 @@
- bin_PROGRAMS = dm-tool
--libexec_PROGRAMS = lightdm-set-defaults
-+pkglibexec_PROGRAMS = lightdm-set-defaults
- dist_pkglibexec_SCRIPTS = gdmflexiserver
-
- dm_tool_SOURCES = \
++++++ lightdm-xauthlocalhostname-support.patch ++++++
--- /var/tmp/diff_new_pack.JRQIbe/_old 2012-04-12 13:25:12.000000000 +0200
+++ /var/tmp/diff_new_pack.JRQIbe/_new 2012-04-12 13:25:12.000000000 +0200
@@ -1,11 +1,9 @@
-# HG changeset patch
-# Parent b669b5e753cb447a6591fee03056fe745fa14126
set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the
session in case the hostname changes
diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
-@@ -142,6 +142,7 @@ seat_xlocal_run_script (Seat *seat, Disp
+@@ -141,6 +141,7 @@ seat_xlocal_run_script (Seat *seat, Disp
path = xserver_local_get_authority_file_path (xserver);
process_set_env (script, "DISPLAY", xserver_get_address (XSERVER
(xserver)));
process_set_env (script, "XAUTHORITY", path);
@@ -45,12 +43,12 @@
#include "configuration.h"
#include "privileges.h"
-@@ -59,6 +60,8 @@ xsession_start (Session *session)
- session_set_console_kit_parameter (session, "is-local",
g_variant_new_boolean (FALSE));
- }
+@@ -35,6 +36,8 @@ 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, "XAUTHLOCALHOSTNAME", "localhost");
- session_set_env (session, "DISPLAY", xserver_get_address
(xsession->priv->xserver));
-
- return SESSION_CLASS (xsession_parent_class)->start (session);
++ session_set_env (SESSION (session), "XAUTHLOCALHOSTNAME",
"localhost");
+ 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
