From 34f0edd68541e947bfb7a91d240706ec3cd123ba Mon Sep 17 00:00:00 2001
From: corsac <corsac@0c9b3bff-18ee-0310-b944-d1aa2700132f>
Date: Mon, 2 Dec 2013 20:15:38 +0000
Subject: [PATCH] * 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

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@8075 0c9b3bff-18ee-0310-b944-d1aa2700132f
---
 debian/changelog                              | 10 ++++
 ..._allow_libpamsystemd_and_ck_together.patch | 53 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 64 insertions(+)
 create mode 100644 debian/patches/06_allow_libpamsystemd_and_ck_together.patch

diff --git a/debian/changelog b/debian/changelog
index 1e1eb13..cd88cd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@debian.org>  Mon, 02 Dec 2013 21:13:27 +0100
+
 lightdm (1.8.5-1) unstable; urgency=low
 
   * New upstream bugfix release.
diff --git a/debian/patches/06_allow_libpamsystemd_and_ck_together.patch b/debian/patches/06_allow_libpamsystemd_and_ck_together.patch
new file mode 100644
index 0000000..4887560
--- /dev/null
+++ b/debian/patches/06_allow_libpamsystemd_and_ck_together.patch
@@ -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)
diff --git a/debian/patches/series b/debian/patches/series
index 6f698f5..02d38a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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
-- 
2.39.2