Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2015-04-03 14:33:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2015-02-27 11:08:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2015-04-03 14:33:10.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Mar 30 11:22:28 UTC 2015 - [email protected] + +- U_os-XDMCP-options-like-query-etc-should-imply-listen.patch + * Enable listening on tcp when using -query. (bnc#924914) + +------------------------------------------------------------------- New: ---- U_os-XDMCP-options-like-query-etc-should-imply-listen.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.L3cQwP/_old 2015-04-03 14:33:11.000000000 +0200 +++ /var/tmp/diff_new_pack.L3cQwP/_new 2015-04-03 14:33:11.000000000 +0200 @@ -165,6 +165,7 @@ Patch113: u_symbols-Fix-sdksyms.sh-to-cope-with-gcc5.patch Patch114: u_ad-hoc-fix-for-mmap-s-truncated-offset-parameter-on-.patch Patch115: N_Force-swcursor-for-KMS-drivers-without-hw-cursor-sup.patch +Patch116: U_os-XDMCP-options-like-query-etc-should-imply-listen.patch Patch1000: n_xserver-optimus-autoconfig-hack.patch @@ -255,6 +256,7 @@ %patch113 -p1 %patch114 -p1 %patch115 -p1 +%patch116 -p1 %patch1000 -p1 ++++++ U_os-XDMCP-options-like-query-etc-should-imply-listen.patch ++++++ Git-commit: 491cf02e191e70c5ce24c19da880bb79bebfc03c Author: Jon TURNEY <[email protected]> Subject: os: XDMCP options like -query etc. should imply -listen tcp Patch-Mainline: Upstream Signed-off-by: Michal Srb <[email protected]> In X server 1.17, the default configuration is now -nolisten tcp. In this configuration, XDMCP options don't work usefully, as the X server is not listening on the port for the display that it tells the display manager to connect to. Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Alan Coopersmith <[email protected]> Reviewed-by: Colin Harrison <[email protected]> --- os/xdmcp.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/os/xdmcp.c b/os/xdmcp.c index b6e97c9..bc5a707 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -48,6 +48,11 @@ #include <netdir.h> #endif +#define XSERV_t +#define TRANS_SERVER +#define TRANS_REOPEN +#include <X11/Xtrans/Xtrans.h> + #ifdef XDMCP #undef REQUEST @@ -242,6 +247,14 @@ XdmcpUseMsg(void) ErrorF("-displayID display-id manufacturer display ID for request\n"); } +static void +XdmcpDefaultListen(void) +{ + /* Even when configured --disable-listen-tcp, we should listen on tcp in + XDMCP modes */ + _XSERVTransListen("tcp"); +} + int XdmcpOptions(int argc, char **argv, int i) { @@ -249,11 +262,13 @@ XdmcpOptions(int argc, char **argv, int i) get_manager_by_name(argc, argv, i++); XDM_INIT_STATE = XDM_QUERY; AccessUsingXdmcp(); + XdmcpDefaultListen(); return i + 1; } if (strcmp(argv[i], "-broadcast") == 0) { XDM_INIT_STATE = XDM_BROADCAST; AccessUsingXdmcp(); + XdmcpDefaultListen(); return i + 1; } #if defined(IPv6) && defined(AF_INET6) @@ -261,6 +276,7 @@ XdmcpOptions(int argc, char **argv, int i) i = get_mcast_options(argc, argv, ++i); XDM_INIT_STATE = XDM_MULTICAST; AccessUsingXdmcp(); + XdmcpDefaultListen(); return i + 1; } #endif @@ -268,6 +284,7 @@ XdmcpOptions(int argc, char **argv, int i) get_manager_by_name(argc, argv, i++); XDM_INIT_STATE = XDM_INDIRECT; AccessUsingXdmcp(); + XdmcpDefaultListen(); return i + 1; } if (strcmp(argv[i], "-port") == 0) { -- 2.3.3
