[Pkg-xfce-commits] r8075 - in /goodies/trunk/lightdm/debian: changelog patches/06_allow_libpamsystemd_and_ck_together.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Mon Dec  2 20:15:38 2013
New Revision: 8075

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8075
Log:
* debian/patches:
  - 06_allow_libpamsystemd_and_ck_together added. Create a ConsoleKit
    session, even if a logind session already exists. That makes transition
    from ConsoleKit to systemd/logind somehow easier, but means some events
    might happen twice.                                       closes: #728361

Added:
    goodies/trunk/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch
Modified:
    goodies/trunk/lightdm/debian/changelog
    goodies/trunk/lightdm/debian/patches/series

Modified: goodies/trunk/lightdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/changelog?rev=8075&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/changelog	(original)
+++ goodies/trunk/lightdm/debian/changelog	Mon Dec  2 20:15:38 2013
@@ -1,3 +1,13 @@
+lightdm (1.8.5-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 06_allow_libpamsystemd_and_ck_together added. Create a ConsoleKit
+      session, even if a logind session already exists. That makes transition
+      from ConsoleKit to systemd/logind somehow easier, but means some events
+      might happen twice.                                       closes: #728361
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 02 Dec 2013 21:13:27 +0100
+
 lightdm (1.8.5-1) unstable; urgency=low
 
   * New upstream bugfix release.

Added: goodies/trunk/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch?rev=8075&op=file
==============================================================================
--- goodies/trunk/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch	(added)
+++ goodies/trunk/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch	Mon Dec  2 20:15:38 2013
@@ -0,0 +1,53 @@
+--- a/src/session.c	2013-10-30 21:41:46.000000000 +0100
++++ b/src/session.c	2013-11-28 19:59:37.218510065 +0100
+@@ -766,8 +766,8 @@
+ 
+     if (login1_is_running ())
+         session->priv->login1_session = read_string_from_child (session);
+-    if (!session->priv->login1_session)
+-        session->priv->console_kit_cookie = read_string_from_child (session);
++
++    session->priv->console_kit_cookie = read_string_from_child (session);
+ }
+ 
+ void
+@@ -778,7 +778,7 @@
+     {
+         if (session->priv->login1_session)
+             login1_lock_session (session->priv->login1_session);
+-        else if (session->priv->console_kit_cookie)
++        if (session->priv->console_kit_cookie)
+             ck_lock_session (session->priv->console_kit_cookie);
+     }
+ }
+@@ -791,7 +791,7 @@
+     {
+         if (session->priv->login1_session)
+             login1_unlock_session (session->priv->login1_session);
+-        else if (session->priv->console_kit_cookie)
++        if (session->priv->console_kit_cookie)
+             ck_unlock_session (session->priv->console_kit_cookie);
+     }
+ }
+--- a/src/session-child.c	2013-11-28 20:24:07.000000000 +0100
++++ b/src/session-child.c	2013-11-28 20:01:55.738515458 +0100
+@@ -476,8 +476,8 @@
+         write_string (login1_session);
+     }
+ 
+-    if (!login1_session)
+-    {
++
++
+         /* Open a Console Kit session */
+         g_variant_builder_init (&ck_parameters, G_VARIANT_TYPE ("(a(sv))"));
+         g_variant_builder_open (&ck_parameters, G_VARIANT_TYPE ("a(sv)"));
+@@ -506,7 +506,7 @@
+             pam_putenv (pam_handle, value);
+             g_free (value);
+         }
+-    }
++
+ 
+     /* Write X authority */
+     if (x_authority)

Modified: goodies/trunk/lightdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm/debian/patches/series?rev=8075&op=diff
==============================================================================
--- goodies/trunk/lightdm/debian/patches/series	(original)
+++ goodies/trunk/lightdm/debian/patches/series	Mon Dec  2 20:15:38 2013
@@ -1,3 +1,4 @@
 01_set-default-path.patch
 04_dont-add-pkglibexecdir-path.patch
 05_debianize-pam-files.patch
+06_allow_libpamsystemd_and_ck_together.patch