Commit 229cbf9b authored by Rex Dieter's avatar Rex Dieter
Browse files

use upstream listen.patch instead

parent a8b8bca1
diff -up lightdm-1.10.5/src/x-server-local.c.listen lightdm-1.10.5/src/x-server-local.c
--- lightdm-1.10.5/src/x-server-local.c.listen 2014-09-10 20:07:11.000000000 -0500
+++ lightdm-1.10.5/src/x-server-local.c 2015-08-28 09:31:23.198260337 -0500
@@ -498,6 +498,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);
......@@ -5,7 +5,7 @@
Name: lightdm
Summary: A cross-desktop Display Manager
Version: 1.10.5
Release: 6%{?dist}
Release: 7%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
......@@ -31,7 +31,7 @@ Patch12: lightdm-1.9.8-no_dmrc_save.patch
Patch51: lightdm-1.10.5-qtchooser.patch
# Lightdm runs without -nolisten but X not listening
# https://bugzilla.redhat.com/show_bug.cgi?id=1255743
Patch52: lightdm-1.10.5-listen.patch
Patch52: http://bazaar.launchpad.net/~lightdm-team/lightdm/1.16/download/head:/xorg1.17.patch-20151012135626-yzkrgqadvrj86uh2-1/xorg-1.17.patch
# patch51
BuildRequires: gettext
......@@ -139,6 +139,7 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
%patch12 -p1 -b .no_dmrc_save
%patch51 -p1 -b .qtchooser
# apply only when xorg-x11-server-1.17 (or newer) is used (currently means f22+)
%if 0%{?fedora} > 21
%patch52 -p1 -b .listen
%endif
......@@ -287,6 +288,9 @@ exit 0
%changelog
* Mon Oct 12 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.5-7
- use upstream listen.patch instead
* Tue Oct 06 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.5-6
- drop listen.patch for < f22 (#1269247)
......
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);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment