1 diff -urN xhost.orig/Imakefile xhost/Imakefile
2 --- xhost.orig/Imakefile 2003-11-14 16:54:53.000000000 +0100
3 +++ xhost/Imakefile 1970-01-01 01:00:00.000000000 +0100
5 -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:24 cpqbld Exp $
7 -RPC_DEFINES = -DSECURE_RPC
11 -KRB5_DEFINES = Krb5Defines
12 -KRB5_INCLUDE = Krb5Includes
13 - INCLUDES = $(KRB5_INCLUDE)
14 - DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
15 -LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
18 - DEFINES = ConnectionFlags $(SIGNAL_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES)
20 -ComplexProgramTarget(xhost)
21 diff -urN xhost.orig/Makefile.am xhost/Makefile.am
22 --- xhost.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
23 +++ xhost/Makefile.am 2004-08-15 17:43:47.000000000 +0200
26 +# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $
28 +# Copyright © 2003 Keith Packard
30 +# Permission to use, copy, modify, distribute, and sell this software and its
31 +# documentation for any purpose is hereby granted without fee, provided that
32 +# the above copyright notice appear in all copies and that both that
33 +# copyright notice and this permission notice appear in supporting
34 +# documentation, and that the name of Keith Packard not be used in
35 +# advertising or publicity pertaining to distribution of the software without
36 +# specific, written prior permission. Keith Packard makes no
37 +# representations about the suitability of this software for any purpose. It
38 +# is provided "as is" without express or implied warranty.
40 +# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
41 +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
42 +# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
43 +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
44 +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
45 +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
46 +# PERFORMANCE OF THIS SOFTWARE.
49 +AUTOMAKE_OPTIONS = 1.7 foreign
51 +AM_CFLAGS = @XHOST_CFLAGS@
55 +xhost_SOURCES = xhost.c
57 +xhost_LDADD = @XHOST_LIBS@
61 +EXTRA_DIST= $(man5_MANS)
63 +MAINTAINERCLEANFILES = configure \
78 diff -urN xhost.orig/configure.ac xhost/configure.ac
79 --- xhost.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
80 +++ xhost/configure.ac 2004-08-15 17:43:42.000000000 +0200
83 +dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $
85 +dnl Copyright © 2003 Keith Packard
87 +dnl Permission to use, copy, modify, distribute, and sell this software and its
88 +dnl documentation for any purpose is hereby granted without fee, provided that
89 +dnl the above copyright notice appear in all copies and that both that
90 +dnl copyright notice and this permission notice appear in supporting
91 +dnl documentation, and that the name of Keith Packard not be used in
92 +dnl advertising or publicity pertaining to distribution of the software without
93 +dnl specific, written prior permission. Keith Packard makes no
94 +dnl representations about the suitability of this software for any purpose. It
95 +dnl is provided "as is" without express or implied warranty.
97 +dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
98 +dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
99 +dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
100 +dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
101 +dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
102 +dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
103 +dnl PERFORMANCE OF THIS SOFTWARE.
107 +AC_INIT([xhost],4.4.0,[],xhost)
108 +AC_CONFIG_SRCDIR([Makefile.am])
109 +AM_INIT_AUTOMAKE([dist-bzip2])
111 +AM_CONFIG_HEADER(config.h)
116 +AC_LIBTOOL_WIN32_DLL
120 +PKG_CHECK_MODULES(XHOST, xext xmuu x11)
124 +# Transport selection
125 +AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes])
126 +AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes])
127 +AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes])
128 +if test "$UNIXCONN" = "yes"; then
129 + AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
131 +if test "$TCPCONN" = "yes"; then
132 + AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
134 +if test "$IPV6CONN" = "yes"; then
135 + AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections])
138 +AC_OUTPUT([Makefile])
139 diff -urN xhost.orig/xhost.c xhost/xhost.c
140 --- xhost.orig/xhost.c 2003-11-14 16:54:53.000000000 +0100
141 +++ xhost/xhost.c 2004-08-15 17:53:07.000000000 +0200
146 +#ifdef HAVE_CONFIG_H
150 #if defined(TCPCONN) || defined(STREAMSCONN)
154 static int local_xerror();
155 static char *get_hostname();
157 -#ifdef SIGNALRETURNSINT
158 -#define signal_t int
160 -#define signal_t void
162 +#define signal_t RETSIGTYPE
163 static signal_t nameserver_lost();
165 #define NAMESERVER_TIMEOUT 5 /* time to wait for nameserver */