Attachment 27300 Details for Bug 22583 – patch to make xdmcp optional

[patch] patch to make xdmcp optional

libX11-1.2.1-xdmcp.patch (text/plain), 1.27 KB, created by Paul Bender on 2009-07-01 08:47:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Bender

Created: 2009-07-01 08:47:43 UTC

Size: 1.27 KB

patch

obsolete

>diff -Naur libX11-1.2.1-old/configure.ac libX11-1.2.1-new/configure.ac
>--- libX11-1.2.1-old/configure.ac	2009-04-07 15:18:30.000000000 -0700
>+++ libX11-1.2.1-new/configure.ac	2009-06-18 06:52:08.000000000 -0700
>@@ -49,9 +49,18 @@
> case "$ac_cv_use_xcb" in
> no)
> 	X11_REQUIRES="xau xcmiscproto bigreqsproto"
>-	X11_EXTRA_DEPS="xau xdmcp"
>-	PKG_CHECK_MODULES(XDMCP, xdmcp)
>-	AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS])
>+ 	X11_EXTRA_DEPS="xau"
>+ 	PKG_CHECK_MODULES(XDMCP, xdmcp,
>+ 		AC_CHECK_LIB(Xdmcp, XdmcpWrap,
>+ 			[
>+ 	        	AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS])
>+ 	        	X11_EXTRA_DEPS="$X11_EXTRA_DEPS xdmcp"
>+ 			],
>+ 			[
>+ 			XDMCP_CFLAGS=
>+ 			XDMCP_LIBS=
>+ 			], [$XDMCP_LIBS]),
>+ 		[AC_MSG_RESULT(no)])
> 	AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation])
> 	;;
> *)
>diff -Naur libX11-1.2.1-old/src/ConnDis.c libX11-1.2.1-new/src/ConnDis.c
>--- libX11-1.2.1-old/src/ConnDis.c	2008-11-18 22:42:01.000000000 -0800
>+++ libX11-1.2.1-new/src/ConnDis.c	2009-06-18 06:51:40.000000000 -0700
>@@ -39,7 +39,9 @@
> #include <X11/Xlibint.h>
> #include <X11/Xtrans/Xtrans.h>
> #include <X11/Xauth.h>
>+#ifdef HASXDMAUTH
> #include <X11/Xdmcp.h>
>+#endif
> #include <stdio.h>
> #include <ctype.h>
> #include <unistd.h>

Actions: View | Splinter Review

Attachments on bug 22583: 27300

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.