* debian/patches/xorg-1.17.patch:

  - Fix xserver-allow-tcp=true option not working with X.org 1.17

diff --git a/debian/changelog b/debian/changelog
index 640b9b21ef5a028248fba818a8ebfa93baccbca1..4e797168294339a9d6e2c1a0a57b8ed91d8d9624 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lightdm (1.17.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * debian/patches/xorg-1.17.patch:
+    - Fix xserver-allow-tcp=true option not working with X.org 1.17
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Mon, 12 Oct 2015 14:57:47 +0100
+
 lightdm (1.16.0-0ubuntu1) wily; urgency=medium
 
   * New upstream release:

diff --git a/debian/patches/series b/debian/patches/series
index d3ba2550a2c08550df7ba0b12a73746f218837a5..7f14c0ad7b1f3876637262c0911958e2b663ddaa 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 04_language_handling.patch
 05_translate_debian_files.patch
 autologin-session-workaround.patch
+xorg-1.17.patch

diff --git a/debian/patches/xorg-1.17.patch b/debian/patches/xorg-1.17.patch
new file mode 100644 (file)
index 0000000..9f7ecfd
--- /dev/null
+++ b/debian/patches/xorg-1.17.patch
@@ -0,0 +1,26 @@
+Description: The X.org X server 1.17 doesn't listen on TCP by default, we need to pass -listen to enable it
+Author: Robert Ancell <robert.ancell@canonical.com>
+Bug: https://bugs.launchpad.net/bugs/1449282
+
+=== modified file 'src/x-server-local.c'
+Index: 1.16/src/x-server-local.c
+===================================================================
+--- 1.16.orig/src/x-server-local.c
++++ 1.16/src/x-server-local.c
+@@ -477,6 +477,7 @@ x_server_local_start (DisplayServer *dis
+     /* Connect to a remote server using XDMCP */
+     if (server->priv->xdmcp_server != NULL)
+     {
++        g_string_append (command, " -listen tcp");
+         if (server->priv->xdmcp_port != 0)
+             g_string_append_printf (command, " -port %d", server->priv->xdmcp_port);
+         g_string_append_printf (command, " -query %s", server->priv->xdmcp_server);
+@@ -485,6 +486,8 @@ x_server_local_start (DisplayServer *dis
+     }
+     else if (!server->priv->allow_tcp)
+         g_string_append (command, " -nolisten tcp");
++    else
++        g_string_append (command, " -listen tcp");
+ 
+     if (server->priv->vt >= 0)
+         g_string_append_printf (command, " vt%d -novtswitch", server->priv->vt);