Hello community,
here is the log from the commit of package lightdm for openSUSE:Factory checked
in at 2012-01-17 11:33:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-01-09
15:19:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2012-01-17
16:11:23.000000000 +0100
@@ -1,0 +2,7 @@
+Sun Jan 8 10:11:16 UTC 2012 - g...@opensuse.org
+
+- added lightdm-call-g_thread_init-conditionally.patch in order to
+ call g_thread_init() only on glib < 2.31.0
+- no need to own %{_libexecdir}/X11/
+
+-------------------------------------------------------------------
New:
----
lightdm-call-g_thread_init-conditionally.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightdm.spec ++++++
--- /var/tmp/diff_new_pack.Em4mdS/_old 2012-01-17 16:11:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Em4mdS/_new 2012-01-17 16:11:25.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package lightdm
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Guido Berhoerster.
#
# All modifications and additions to the file contributed by third parties
@@ -24,10 +24,10 @@
Name: lightdm
Version: 1.0.6
-Release: 1
+Release: 0
Summary: Lightweight, Cross-desktop Display Manager
+License: GPL-3.0+
Group: System/X11/Displaymanagers
-License: GPLv3+
Url: http://www.freedesktop.org/wiki/Software/LightDM
Source0: %{name}-%{version}.tar.gz
Source1: %{name}.pamd
@@ -52,21 +52,23 @@
Patch8: lightdm-remove-xauthority-ownership-fix.patch
# PATCH-FIX-UPSTREAM lightdm-CVE-2011-3153.patch prus...@opensuse.org -- fix
vulnerability when reading .dmrc file
Patch9: lightdm-CVE-2011-3153.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(xcb)
-BuildRequires: pkgconfig(xdmcp)
+BuildRequires: pkgconfig(gobject-introspection-1.0)
+BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libxklavier)
BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(QtGui)
-BuildRequires: pkgconfig(gtk+-3.0)
-BuildRequires: pkgconfig(gobject-introspection-1.0)
-BuildRequires: pkgconfig(dbus-glib-1)
-BuildRequires: gcc-c++
-BuildRequires: vala
-BuildRequires: pam-devel
-BuildRequires: intltool
-BuildRequires: gtk-doc
-BuildRequires: gnome-common
+BuildRequires: pkgconfig(xcb)
+BuildRequires: pkgconfig(xdmcp)
Requires(pre): pwdutils
# 3rd party greeters don't have to follow
# the same versioning of lightdm
@@ -179,6 +181,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
rm -f liblightdm-qt/*_moc.cpp greeters/qt/*_moc.cpp tests/src/*_moc.cpp
%build
@@ -268,7 +271,6 @@
%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
%dir %{_sysconfdir}/apparmor.d/
%{_sysconfdir}/apparmor.d/lightdm-guest-session
-%dir %{_libexecdir}/X11/
%dir %{_libexecdir}/X11/displaymanagers/
%{_libexecdir}/X11/displaymanagers/lightdm
%dir %{_datadir}/xgreeters/
++++++ lightdm-CVE-2011-3153.patch ++++++
--- /var/tmp/diff_new_pack.Em4mdS/_old 2012-01-17 16:11:25.000000000 +0100
+++ /var/tmp/diff_new_pack.Em4mdS/_new 2012-01-17 16:11:25.000000000 +0100
@@ -1,11 +1,10 @@
-Description: drop privileges before reading ~/.dmrc
-Author: Marc Deslauriers <marc.deslauri...@canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/883865
+# HG changeset patch
+# Parent bbfdf2e9683e6399368f8168a01793dedab3130b
+drop privileges before reading ~/.dmrc (CVE-2011-3153)
-Index: lightdm-1.0.6/src/dmrc.c
-===================================================================
---- lightdm-1.0.6.orig/src/dmrc.c
-+++ lightdm-1.0.6/src/dmrc.c
+diff --git a/src/dmrc.c b/src/dmrc.c
+--- a/src/dmrc.c
++++ b/src/dmrc.c
@@ -24,7 +24,7 @@ dmrc_load (const gchar *username)
User *user;
GKeyFile *dmrc_file;
++++++ lightdm-call-g_thread_init-conditionally.patch ++++++
# HG changeset patch
# Parent e49002acbff3cb2ec011437ff6e402345ad1e78f
call g_thread_init() only on glib < 2.31.0
diff --git a/src/lightdm.c b/src/lightdm.c
--- a/src/lightdm.c
+++ b/src/lightdm.c
@@ -1045,8 +1045,10 @@ main (int argc, char **argv)
};
GError *error = NULL;
+ g_type_init ();
+#if !GLIB_CHECK_VERSION (2,31,0)
g_thread_init (NULL);
- g_type_init ();
+#endif /* !GLIB_CHECK_VERSION (2,31,0) */
loop = g_main_loop_new (NULL, FALSE);
g_signal_connect (process_get_current (), "got-signal", G_CALLBACK
(signal_cb), NULL);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
