* debian/patches

  - 05_debianize-pam-files added, disable autologin by default for root user
    (as with GDM3).
  - 07-Remove-unused-unititialized-file-descriptors-could-c added,
    cherry-picked from upstream. Avoid closing stdin which triggers a bug in
    dbus preventing dbus-daemon to start.                     closes: #829557

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@9455 0c9b3bff-18ee-0310-b944-d1aa2700132f

diff --git a/debian/changelog b/debian/changelog
index 49dd4eb401c624053cd3d7a067ede7eef2c60a21..70fe7c33fe7940199149c916d5a2931d695bd124 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 lightdm (1.18.2-2) UNRELEASED; urgency=medium
 
-  * debian/patches/05_debianize-pam-files.patch:
-    - disable autologin by default for root user (as with GDM3).
+  * debian/patches
+    - 05_debianize-pam-files added, disable autologin by default for root user
+      (as with GDM3).
+    - 07-Remove-unused-unititialized-file-descriptors-could-c added,
+      cherry-picked from upstream. Avoid closing stdin which triggers a bug in
+      dbus preventing dbus-daemon to start.                     closes: #829557
   * debian/01_debian.conf:
     - update section name from SeatDefaults to Seat:*.
 

diff --git a/debian/patches/07-Remove-unused-unititialized-file-descriptors-could-c.patch b/debian/patches/07-Remove-unused-unititialized-file-descriptors-could-c.patch
new file mode 100644 (file)
index 0000000..5ccb9a3
--- /dev/null
+++ b/debian/patches/07-Remove-unused-unititialized-file-descriptors-could-c.patch
@@ -0,0 +1,37 @@
+From 3bdea09e14cbb1cbfc234679d09e2188ff30b9cd Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.ancell@canonical.com>
+Date: Wed, 29 Jun 2016 15:16:05 +1200
+Subject: [PATCH] Remove unused unititialized file descriptors - could cause
+ stdin to be closed
+
+---
+ src/greeter-session.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/greeter-session.c b/src/greeter-session.c
+index 862253a..8ebac6f 100644
+--- a/src/greeter-session.c
++++ b/src/greeter-session.c
+@@ -21,10 +21,6 @@ struct GreeterSessionPrivate
+ {
+     /* Greeter running inside this session */
+     Greeter *greeter;
+-
+-    /* Communication channels to communicate with */
+-    int to_greeter_input;
+-    int from_greeter_output;
+ };
+ 
+ G_DEFINE_TYPE (GreeterSession, greeter_session, SESSION_TYPE);
+@@ -108,8 +104,6 @@ greeter_session_finalize (GObject *object)
+     GreeterSession *self = GREETER_SESSION (object);
+ 
+     g_clear_object (&self->priv->greeter);
+-    close (self->priv->to_greeter_input);
+-    close (self->priv->from_greeter_output);
+ 
+     G_OBJECT_CLASS (greeter_session_parent_class)->finalize (object);
+ }
+-- 
+2.8.1
+

diff --git a/debian/patches/series b/debian/patches/series
index c9f9a5488f2c4fcdbc808110b25b1c421affe7cf..3b3f7e73d8b65cbb45c2a8d74119088580196527 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_fix-apparmor-profile.patch
 05_debianize-pam-files.patch
 06_change-user-dirs.patch
+07-Remove-unused-unititialized-file-descriptors-could-c.patch