On Sun, Jul 14, 2019 at 06:31:13PM +0200, Matthieu Herrb wrote: > Hi, > > the patch below updates libxtrans to version 1.4.0. Since there is one > removed in a generated file used by other libs, there are also libX11 > and libICE major bumps.
Ping. In particular, how is the schedule wrt major bumps ? I'd like to commit this (and the other libs updates) tomorrow (CET) if possible. > > comments, oks ? > > Index: lib/libICE/Makefile.bsd-wrapper > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libICE/Makefile.bsd-wrapper,v > retrieving revision 1.3 > diff -u -p -u -r1.3 Makefile.bsd-wrapper > --- lib/libICE/Makefile.bsd-wrapper 13 Aug 2013 07:07:12 -0000 1.3 > +++ lib/libICE/Makefile.bsd-wrapper 14 Jul 2019 15:36:48 -0000 > @@ -1,5 +1,5 @@ > # $OpenBSD: Makefile.bsd-wrapper,v 1.3 2013/08/13 07:07:12 guenther Exp $ > > -SHARED_LIBS= ICE 10.0 > +SHARED_LIBS= ICE 11.0 > > .include <bsd.xorg.mk> > Index: lib/libX11/Makefile.bsd-wrapper > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libX11/Makefile.bsd-wrapper,v > retrieving revision 1.24 > diff -u -p -u -r1.24 Makefile.bsd-wrapper > --- lib/libX11/Makefile.bsd-wrapper 11 Mar 2016 13:09:42 -0000 1.24 > +++ lib/libX11/Makefile.bsd-wrapper 14 Jul 2019 15:36:49 -0000 > @@ -1,7 +1,7 @@ > # $OpenBSD: Makefile.bsd-wrapper,v 1.24 2016/03/11 13:09:42 okan Exp $ > .include <bsd.xconf.mk> > > -SHARED_LIBS= X11 16.1 X11_xcb 2.0 > +SHARED_LIBS= X11 17.0 X11_xcb 2.0 > > CONFIGURE_ARGS= --enable-tcp-transport --enable-unix-transport --enable-ipv6 > \ > --disable-composecache \ > Index: lib/libxtrans/ChangeLog > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/ChangeLog,v > retrieving revision 1.8 > diff -u -p -u -r1.8 ChangeLog > --- lib/libxtrans/ChangeLog 28 Sep 2014 16:56:06 -0000 1.8 > +++ lib/libxtrans/ChangeLog 14 Jul 2019 15:37:04 -0000 > @@ -1,3 +1,213 @@ > +commit c4262efc9688e495261d8b23a12f956ab38e006f > +Author: Alan Coopersmith <[email protected]> > +Date: Sat Mar 16 14:25:35 2019 -0700 > + > + xtrans 1.4.0 > + > + Signed-off-by: Alan Coopersmith <[email protected]> > + > +commit faa42207a0653535ab80825b0acb50b417702ec4 > +Author: Alan Coopersmith <[email protected]> > +Date: Fri Dec 7 19:52:43 2018 -0800 > + > + Update configure.ac bug URL for gitlab migration > + > + Signed-off-by: Alan Coopersmith <[email protected]> > + > +commit cd22de616c77328da3410b1eaab541c2d331ffdb > +Author: Alan Coopersmith <[email protected]> > +Date: Mon Nov 19 23:12:07 2018 -0800 > + > + Update README for gitlab migration > + > + Signed-off-by: Alan Coopersmith <[email protected]> > + > +commit 06cfa80fb3d03ca03fd92f9687a77958338e012c > +Author: Alan Coopersmith <[email protected]> > +Date: Sun Sep 30 17:04:51 2018 -0700 > + > + Use fchmod() instead of chmod() when creating named pipes > + > + Signed-off-by: Alan Coopersmith <[email protected]> > + > +commit 7bd504f7ab7799ab77ad50eb39f6afdbaf2f9e50 > +Author: Alan Coopersmith <[email protected]> > +Date: Sat Aug 25 11:18:52 2018 -0700 > + > + Use strcasecmp if it's available, instead of lowercasing strings > + > + Signed-off-by: Alan Coopersmith <[email protected]> > + > +commit 941cfa50bc2d45f20943fd21bab98e2eceeeb259 > +Author: Alan Coopersmith <[email protected]> > +Date: Sat Aug 25 10:45:04 2018 -0700 > + > + Set freeXLOCAL to NULL after freeing it to prevent double frees > + > + We shouldn't be calling the LocalEndTransports routine twice, but > + just make sure if we do, we don't call free twice on the same pointer. > + > + Signed-off-by: Alan Coopersmith <[email protected]> > + > +commit a97e5fc6e4f294294d75500068892aea11952773 > +Author: Rin Okuyama <[email protected]> > +Date: Tue Feb 21 06:18:37 2017 +0000 > + > + avoid -Wformat errors from clang > + > + https://bugs.freedesktop.org/show_bug.cgi?id=99882 > + > + Reviewed-by: Alan Coopersmith <[email protected]> > + Signed-off-by: Alan Coopersmith <[email protected]> > + > +commit 28366676effaa512e43bfd2276a317389a992511 > +Author: Emil Velikov <[email protected]> > +Date: Mon Mar 9 12:00:52 2015 +0000 > + > + autogen.sh: use quoted string variables > + > + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent > + fall-outs, when they contain space. > + > + Signed-off-by: Emil Velikov <[email protected]> > + Reviewed-by: Peter Hutterer <[email protected]> > + Signed-off-by: Peter Hutterer <[email protected]> > + > +commit 8554cf05262ab6ad6e8da5f11022e5dc2a452e38 > +Author: Peter Hutterer <[email protected]> > +Date: Tue Jan 24 10:32:07 2017 +1000 > + > + autogen.sh: use exec instead of waiting for configure to finish > + > + Syncs the invocation of configure with the one from the server. > + > + Signed-off-by: Peter Hutterer <[email protected]> > + Reviewed-by: Emil Velikov <[email protected]> > + > +commit 560d7550e23e9b14056b4a9b2569c2f256015f8a > +Author: Jeremy Huddleston Sequoia <[email protected]> > +Date: Sat Sep 10 22:09:51 2016 -0700 > + > + Update strlcpy macro check to also check HAVE_STRLCPY > + > + xorg-server moved from HAS_STRLCPY to HAVE_STRLCPY in 2011 > + > + cf-xserver: d829a7c5cb42c979b58f3547136df5b05d906423 > + > + Signed-off-by: Jeremy Huddleston Sequoia <[email protected]> > + > +commit 2e4c338eda8ec6996b7bacc1d0c7dfe7de925864 > +Author: Adam Jackson <[email protected]> > +Date: Thu Sep 1 09:28:58 2016 -0400 > + > + Revert "Make FreeConnInfo static" > + > + <anholt> ajax: 75419e6b6d985ea8796f05d1acb5e154b065c9b9 of xtrans also > + seems to have broken xtest. > + > + And indeed it does, xts5 knows a fair amount about xlib internals for > + some reason. Whether that's cromulent or not, we want to be able to run > + automatic tests from top-of-tree, so we can't leave this broken. > + > + This reverts commit 75419e6b6d985ea8796f05d1acb5e154b065c9b9. > + > + Signed-off-by: Adam Jackson <[email protected]> > + > +commit 3810e026323210df6ec6cf818f01832a63e9fbb9 > +Author: Adam Jackson <[email protected]> > +Date: Wed May 18 12:58:31 2016 -0400 > + > + Remove GetMyAddr > + > + Again, pre-xcb libX11 was the only consumer. > + > + Reviewed-by: Keith Packard <[email protected]> > + Signed-off-by: Adam Jackson <[email protected]> > + > +commit 75419e6b6d985ea8796f05d1acb5e154b065c9b9 > +Author: Adam Jackson <[email protected]> > +Date: Wed May 18 12:50:48 2016 -0400 > + > + Make FreeConnInfo static > + > + libX11 used to need this in the XOpenDisplay code, but hasn't since xcb > + became mandatory. > + > + Reviewed-by: Keith Packard <[email protected]> > + Signed-off-by: Adam Jackson <[email protected]> > + > +commit 0794b1b712a90b40e2b019c9edc6f96874493c52 > +Author: Adam Jackson <[email protected]> > +Date: Wed May 18 12:41:41 2016 -0400 > + > + unifdef LBXPROXY_t and TEST_t > + > + LBX is dead, and TEST_t is unused. > + > + Reviewed-by: Keith Packard <[email protected]> > + Signed-off-by: Adam Jackson <[email protected]> > + > +commit 473e77563b16fa7c42db9403c1382e9483e3666c > +Author: Adam Jackson <[email protected]> > +Date: Wed May 18 12:38:02 2016 -0400 > + > + Remove CLTS code > + > + Never been used, as far as I can tell. > + > + Reviewed-by: Keith Packard <[email protected]> > + Signed-off-by: Adam Jackson <[email protected]> > + > +commit b167145a51153eccc16a3e43f7ed0faea7e6c762 > +Author: Adam Jackson <[email protected]> > +Date: Wed May 18 15:19:50 2016 -0400 > + > + autogen: Add a default patch prefix > + > + Signed-off-by: Adam Jackson <[email protected]> > + > +commit cc29fbc1fe86ae4dfe2f4eaae7352ea86aa4acac > +Author: Alan Coopersmith <[email protected]> > +Date: Sat Nov 28 13:04:21 2015 -0800 > + > + Remove support for SysV on x86 platforms other than Solaris & SCO > + > + No other x86 SysV platforms have ever been supported in the modular > + build systems, so we don't need to keep carrying around a bunch of > + ifdef's for them. > + > + Signed-off-by: Alan Coopersmith <[email protected]> > + Reviewed-by: Mark Kettenis <[email protected]> > + > +commit 3ba0b7a37b9053662ff42f0b4caa856856098475 > +Author: Richard PALO <[email protected]> > +Date: Tue Nov 17 07:02:27 2015 +0100 > + > + Replace 'sun' with '__sun' > + > + Globally replace #ifdef and #if defined usage of 'sun' with '__sun' such > + that strict ISO compiler modes such as -ansi or -std=c99 can be used. > + > + Signed-off-by: Richard PALO <[email protected]> > + Reviewed-by: Alan Coopersmith <[email protected]> > + Signed-off-by: Alan Coopersmith <[email protected]> > + > +commit 1d31b87e8045f3fc89b1914187a9a13861d35f2d > +Author: Julien Cristau <[email protected]> > +Date: Wed Jul 29 20:36:13 2015 +0200 > + > + Make sure LONG64 is defined in Xtrans.h > + > + Xtrans.h defines BytesReadable_t as int or long depending on whether > + LONG64 is defined. We need to make sure Xmd.h is included so our idea > + of BytesReadable_t is consistent across compilation units. > + > + Debian bug#749120 > + > + Reported-by: Michael Tautschnig <[email protected]> > + Signed-off-by: Julien Cristau <[email protected]> > + Reviewed-by: Alan Coopersmith <[email protected]> > + > commit 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03 > Author: Keith Packard <[email protected]> > Date: Sat Sep 20 10:02:05 2014 -0700 > Index: lib/libxtrans/Makefile.am > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/Makefile.am,v > retrieving revision 1.6 > diff -u -p -u -r1.6 Makefile.am > --- lib/libxtrans/Makefile.am 13 Apr 2014 11:57:04 -0000 1.6 > +++ lib/libxtrans/Makefile.am 14 Jul 2019 15:37:04 -0000 > @@ -17,7 +17,7 @@ pkgconfigdir = $(libdir)/pkgconfig > pkgconfig_DATA = xtrans.pc > > MAINTAINERCLEANFILES = ChangeLog INSTALL > -EXTRA_DIST = ${aclocal_DATA} > +EXTRA_DIST = ${aclocal_DATA} README.md > > .PHONY: ChangeLog INSTALL > > Index: lib/libxtrans/Makefile.in > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/Makefile.in,v > retrieving revision 1.10 > diff -u -p -u -r1.10 Makefile.in > --- lib/libxtrans/Makefile.in 11 Oct 2016 22:15:43 -0000 1.10 > +++ lib/libxtrans/Makefile.in 14 Jul 2019 15:37:04 -0000 > @@ -52,7 +52,7 @@ POST_UNINSTALL = : > build_triplet = @build@ > host_triplet = @host@ > subdir = . > -DIST_COMMON = README $(Xtransinclude_HEADERS) $(am__configure_deps) \ > +DIST_COMMON = $(Xtransinclude_HEADERS) $(am__configure_deps) \ > $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ > $(srcdir)/xtrans.pc.in $(top_srcdir)/configure AUTHORS COPYING \ > ChangeLog INSTALL compile config.guess config.sub install-sh \ > @@ -317,7 +317,7 @@ aclocal_DATA = xtrans.m4 > pkgconfigdir = $(libdir)/pkgconfig > pkgconfig_DATA = xtrans.pc > MAINTAINERCLEANFILES = ChangeLog INSTALL > -EXTRA_DIST = ${aclocal_DATA} > +EXTRA_DIST = ${aclocal_DATA} README.md > all: all-recursive > > .SUFFIXES: > Index: lib/libxtrans/README > =================================================================== > RCS file: lib/libxtrans/README > diff -N lib/libxtrans/README > --- lib/libxtrans/README 11 Nov 2010 10:34:28 -0000 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,37 +0,0 @@ > -xtrans is a library of code that is shared among various X packages to > -handle network protocol transport in a modular fashion, allowing a > -single place to add new transport types. It is used by the X server, > -libX11, libICE, the X font server, and related components. > - > -It is however, *NOT* a shared library, but code which each consumer > -includes and builds it's own copy of with various #ifdef flags to make > -each copy slightly different. To support this in the modular build > -system, this package simply installs the C source files into > -$(prefix)/include/X11/Xtrans and installs a pkg-config file and an > -autoconf m4 macro file with the flags needed to use it. > - > -Documentation of the xtrans API can be found in the included xtrans.xml > -file in DocBook XML format. If 'xmlto' is installed, you can generate text, > -html, postscript or pdf versions of the documentation by configuring > -the build with --enable-docs, which is the default. > - > -Please submit bugs & patches to the Xorg bugzilla: > - > - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg > - > -under the component "Lib/xtrans". > - > -All questions regarding this software should be directed at the > -Xorg mailing list: > - > - http://lists.freedesktop.org/mailman/listinfo/xorg > - > -The master development code repository can be found at: > - > - git://anongit.freedesktop.org/git/xorg/lib/libxtrans > - > - http://cgit.freedesktop.org/xorg/lib/libxtrans > - > -For more information on the git code manager, see: > - > - http://wiki.x.org/wiki/GitPage > Index: lib/libxtrans/README.md > =================================================================== > RCS file: lib/libxtrans/README.md > diff -N lib/libxtrans/README.md > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ lib/libxtrans/README.md 14 Jul 2019 15:37:04 -0000 > @@ -0,0 +1,36 @@ > +xtrans - X Network Transport layer shared code > +---------------------------------------------- > + > +xtrans is a library of code that is shared among various X packages to > +handle network protocol transport in a modular fashion, allowing a > +single place to add new transport types. It is used by the X server, > +libX11, libICE, the X font server, and related components. > + > +It is however, *NOT* a shared library, but code which each consumer > +includes and builds it's own copy of with various #ifdef flags to make > +each copy slightly different. To support this in the modular build > +system, this package simply installs the C source files into > +$(prefix)/include/X11/Xtrans and installs a pkg-config file and an > +autoconf m4 macro file with the flags needed to use it. > + > +Documentation of the xtrans API can be found in the included xtrans.xml > +file in DocBook XML format. If 'xmlto' is installed, you can generate text, > +html, postscript or pdf versions of the documentation by configuring > +the build with --enable-docs, which is the default. > + > + -------------------------------------------------------------------------- > + > +All questions regarding this software should be directed at the > +Xorg mailing list: > + > + https://lists.x.org/mailman/listinfo/xorg > + > +The master development code repository can be found at: > + > + https://gitlab.freedesktop.org/xorg/lib/libxtrans > + > +Please submit bug reports and requests to merge patches there. > + > +For patch submission instructions, see: > + > + https://www.x.org/wiki/Development/Documentation/SubmittingPatches > Index: lib/libxtrans/Xtrans.c > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/Xtrans.c,v > retrieving revision 1.9 > diff -u -p -u -r1.9 Xtrans.c > --- lib/libxtrans/Xtrans.c 28 Sep 2014 16:56:06 -0000 1.9 > +++ lib/libxtrans/Xtrans.c 14 Jul 2019 15:37:04 -0000 > @@ -100,15 +100,15 @@ Xtransport_table Xtransports[] = { > #endif /* UNIXCONN */ > #if defined(LOCALCONN) > { &TRANS(LocalFuncs), TRANS_LOCAL_LOCAL_INDEX }, > -#ifndef sun > +#ifndef __sun > { &TRANS(PTSFuncs), TRANS_LOCAL_PTS_INDEX }, > -#endif /* sun */ > +#endif /* __sun */ > #if defined(SVR4) || defined(__SVR4) > { &TRANS(NAMEDFuncs), TRANS_LOCAL_NAMED_INDEX }, > #endif > -#ifdef sun > +#ifdef __sun > { &TRANS(PIPEFuncs), TRANS_LOCAL_PIPE_INDEX }, > -#endif /* sun */ > +#endif /* __sun */ > #if defined(__SCO__) || defined(__UNIXWARE__) > { &TRANS(SCOFuncs), TRANS_LOCAL_SCO_INDEX }, > #endif /* __SCO__ || __UNIXWARE__ */ > @@ -153,11 +153,14 @@ static Xtransport * > TRANS(SelectTransport) (const char *protocol) > > { > +#ifndef HAVE_STRCASECMP > char protobuf[PROTOBUFSIZE]; > +#endif > int i; > > prmsg (3,"SelectTransport(%s)\n", protocol); > > +#ifndef HAVE_STRCASECMP > /* > * Force Protocol to be lowercase as a way of doing > * a case insensitive match. > @@ -169,12 +172,17 @@ TRANS(SelectTransport) (const char *prot > for (i = 0; i < PROTOBUFSIZE && protobuf[i] != '\0'; i++) > if (isupper ((unsigned char)protobuf[i])) > protobuf[i] = tolower ((unsigned char)protobuf[i]); > +#endif > > /* Look at all of the configured protocols */ > > for (i = 0; i < NUMTRANS; i++) > { > +#ifndef HAVE_STRCASECMP > if (!strcmp (protobuf, Xtransports[i].transport->TransName)) > +#else > + if (!strcasecmp (protocol, Xtransports[i].transport->TransName)) > +#endif > return Xtransports[i].transport; > } > > @@ -444,16 +452,6 @@ TRANS(Open) (int type, const char *addre > ciptr = thistrans->OpenCOTSServer(thistrans, protocol, host, port); > #endif /* TRANS_SERVER */ > break; > - case XTRANS_OPEN_CLTS_CLIENT: > -#ifdef TRANS_CLIENT > - ciptr = thistrans->OpenCLTSClient(thistrans, protocol, host, port); > -#endif /* TRANS_CLIENT */ > - break; > - case XTRANS_OPEN_CLTS_SERVER: > -#ifdef TRANS_SERVER > - ciptr = thistrans->OpenCLTSServer(thistrans, protocol, host, port); > -#endif /* TRANS_SERVER */ > - break; > default: > prmsg (1,"Open: Unknown Open type %d\n", type); > } > @@ -531,9 +529,6 @@ TRANS(Reopen) (int type, int trans_id, i > case XTRANS_OPEN_COTS_SERVER: > ciptr = thistrans->ReopenCOTSServer(thistrans, fd, port); > break; > - case XTRANS_OPEN_CLTS_SERVER: > - ciptr = thistrans->ReopenCLTSServer(thistrans, fd, port); > - break; > default: > prmsg (1,"Reopen: Bad Open type %d\n", type); > } > @@ -587,32 +582,6 @@ TRANS(OpenCOTSServer) (const char *addre > #endif /* TRANS_SERVER */ > > > -#ifdef TRANS_CLIENT > - > -XtransConnInfo > -TRANS(OpenCLTSClient) (const char *address) > - > -{ > - prmsg (2,"OpenCLTSClient(%s)\n", address); > - return TRANS(Open) (XTRANS_OPEN_CLTS_CLIENT, address); > -} > - > -#endif /* TRANS_CLIENT */ > - > - > -#ifdef TRANS_SERVER > - > -XtransConnInfo > -TRANS(OpenCLTSServer) (const char *address) > - > -{ > - prmsg (2,"OpenCLTSServer(%s)\n", address); > - return TRANS(Open) (XTRANS_OPEN_CLTS_SERVER, address); > -} > - > -#endif /* TRANS_SERVER */ > - > - > #ifdef TRANS_REOPEN > > XtransConnInfo > @@ -623,15 +592,6 @@ TRANS(ReopenCOTSServer) (int trans_id, i > return TRANS(Reopen) (XTRANS_OPEN_COTS_SERVER, trans_id, fd, port); > } > > -XtransConnInfo > -TRANS(ReopenCLTSServer) (int trans_id, int fd, const char *port) > - > -{ > - prmsg (2,"ReopenCLTSServer(%d, %d, %s)\n", trans_id, fd, port); > - return TRANS(Reopen) (XTRANS_OPEN_CLTS_SERVER, trans_id, fd, port); > -} > - > - > int > TRANS(GetReopenInfo) (XtransConnInfo ciptr, > int *trans_id, int *fd, char **port) > @@ -1012,27 +972,6 @@ TRANS(IsLocal) (XtransConnInfo ciptr) > return (ciptr->family == AF_UNIX); > } > > - > -int > -TRANS(GetMyAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp, > - Xtransaddr **addrp) > - > -{ > - prmsg (2,"GetMyAddr(%d)\n", ciptr->fd); > - > - *familyp = ciptr->family; > - *addrlenp = ciptr->addrlen; > - > - if ((*addrp = malloc (ciptr->addrlen)) == NULL) > - { > - prmsg (1,"GetMyAddr: malloc failed\n"); > - return -1; > - } > - memcpy(*addrp, ciptr->addr, ciptr->addrlen); > - > - return 0; > -} > - > int > TRANS(GetPeerAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp, > Xtransaddr **addrp) > @@ -1307,104 +1246,6 @@ TRANS(MakeAllCOTSServerListeners) (const > return 0; > } > > -int > -TRANS(MakeAllCLTSServerListeners) (const char *port, int *partial, > - int *count_ret, XtransConnInfo > **ciptrs_ret) > - > -{ > - char buffer[256]; /* ??? What size ?? */ > - XtransConnInfo ciptr, temp_ciptrs[NUMTRANS]; > - int status, i, j; > - > - prmsg (2,"MakeAllCLTSServerListeners(%s,%p)\n", > - port ? port : "NULL", ciptrs_ret); > - > - *count_ret = 0; > - > - for (i = 0; i < NUMTRANS; i++) > - { > - Xtransport *trans = Xtransports[i].transport; > - > - if (trans->flags&TRANS_ALIAS || trans->flags&TRANS_NOLISTEN) > - continue; > - > - snprintf(buffer, sizeof(buffer), "%s/:%s", > - trans->TransName, port ? port : ""); > - > - prmsg (5,"MakeAllCLTSServerListeners: opening %s\n", > - buffer); > - > - if ((ciptr = TRANS(OpenCLTSServer (buffer))) == NULL) > - { > - prmsg (1, > - "MakeAllCLTSServerListeners: failed to open listener for %s\n", > - trans->TransName); > - continue; > - } > - > - if ((status = TRANS(CreateListener (ciptr, port, 0))) < 0) > - { > - if (status == TRANS_ADDR_IN_USE) > - { > - /* > - * We failed to bind to the specified address because the > - * address is in use. It must be that a server is already > - * running at this address, and this function should fail. > - */ > - > - prmsg (1, > - "MakeAllCLTSServerListeners: server already running\n"); > - > - for (j = 0; j < *count_ret; j++) > - TRANS(Close) (temp_ciptrs[j]); > - > - *count_ret = 0; > - *ciptrs_ret = NULL; > - *partial = 0; > - return -1; > - } > - else > - { > - prmsg (1, > - "MakeAllCLTSServerListeners: failed to create listener for %s\n", > - trans->TransName); > - > - continue; > - } > - } > - > - prmsg (5, > - "MakeAllCLTSServerListeners: opened listener for %s, %d\n", > - trans->TransName, ciptr->fd); > - temp_ciptrs[*count_ret] = ciptr; > - (*count_ret)++; > - } > - > - *partial = (*count_ret < complete_network_count()); > - > - prmsg (5, > - "MakeAllCLTSServerListeners: partial=%d, actual=%d, complete=%d \n", > - *partial, *count_ret, complete_network_count()); > - > - if (*count_ret > 0) > - { > - if ((*ciptrs_ret = malloc ( > - *count_ret * sizeof (XtransConnInfo))) == NULL) > - { > - return -1; > - } > - > - for (i = 0; i < *count_ret; i++) > - { > - (*ciptrs_ret)[i] = temp_ciptrs[i]; > - } > - } > - else > - *ciptrs_ret = NULL; > - > - return 0; > -} > - > #endif /* TRANS_SERVER */ > > > @@ -1415,7 +1256,7 @@ TRANS(MakeAllCLTSServerListeners) (const > */ > > > -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) > || defined(WIN32) > +#ifdef WIN32 > > /* > * emulate readv > @@ -1445,9 +1286,6 @@ static int TRANS(ReadV) (XtransConnInfo > return total; > } > > -#endif /* SYSV && __i386__ || WIN32 || __sxg__ */ > - > -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) > || defined(WIN32) > > /* > * emulate writev > @@ -1477,7 +1315,7 @@ static int TRANS(WriteV) (XtransConnInfo > return total; > } > > -#endif /* SYSV && __i386__ || WIN32 || __sxg__ */ > +#endif /* WIN32 */ > > > #if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || > defined(__SVR4) || defined(__SCO__) > Index: lib/libxtrans/Xtrans.h > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/Xtrans.h,v > retrieving revision 1.6 > diff -u -p -u -r1.6 Xtrans.h > --- lib/libxtrans/Xtrans.h 28 Sep 2014 16:56:06 -0000 1.6 > +++ lib/libxtrans/Xtrans.h 14 Jul 2019 15:37:04 -0000 > @@ -52,6 +52,7 @@ from The Open Group. > > #include <X11/Xfuncproto.h> > #include <X11/Xos.h> > +#include <X11/Xmd.h> > > #ifndef WIN32 > #include <sys/socket.h> > @@ -110,21 +111,6 @@ static const char *__xtransname = "_IceT > #endif > #endif /* ICE_t */ > > -#ifdef TEST_t > -#define TRANS(func) _TESTTrans##func > -#ifdef XTRANSDEBUG > -static const char *__xtransname = "_TESTTrans"; > -#endif > -#endif /* TEST_t */ > - > -#ifdef LBXPROXY_t > -#define TRANS(func) _LBXPROXYTrans##func > -#define X11_t /* The server defines this - so should the LBX > proxy */ > -#ifdef XTRANSDEBUG > -static const char *__xtransname = "_LBXPROXYTrans"; > -#endif > -#endif /* LBXPROXY_t */ > - > #if !defined(TRANS) > #define TRANS(func) _XTrans##func > #ifdef XTRANSDEBUG > @@ -249,22 +235,6 @@ XtransConnInfo TRANS(OpenCOTSServer)( > > #endif /* TRANS_SERVER */ > > -#ifdef TRANS_CLIENT > - > -XtransConnInfo TRANS(OpenCLTSClient)( > - const char * /* address */ > -); > - > -#endif /* TRANS_CLIENT */ > - > -#ifdef TRANS_SERVER > - > -XtransConnInfo TRANS(OpenCLTSServer)( > - const char * /* address */ > -); > - > -#endif /* TRANS_SERVER */ > - > #ifdef TRANS_REOPEN > > XtransConnInfo TRANS(ReopenCOTSServer)( > @@ -273,12 +243,6 @@ XtransConnInfo TRANS(ReopenCOTSServer)( > const char * /* port */ > ); > > -XtransConnInfo TRANS(ReopenCLTSServer)( > - int, /* trans_id */ > - int, /* fd */ > - const char * /* port */ > -); > - > int TRANS(GetReopenInfo)( > XtransConnInfo, /* ciptr */ > int *, /* trans_id */ > @@ -388,13 +352,6 @@ int TRANS(IsLocal)( > XtransConnInfo /* ciptr */ > ); > > -int TRANS(GetMyAddr)( > - XtransConnInfo, /* ciptr */ > - int *, /* familyp */ > - int *, /* addrlenp */ > - Xtransaddr ** /* addrp */ > -); > - > int TRANS(GetPeerAddr)( > XtransConnInfo, /* ciptr */ > int *, /* familyp */ > @@ -409,13 +366,6 @@ int TRANS(GetConnectionNumber)( > #ifdef TRANS_SERVER > > int TRANS(MakeAllCOTSServerListeners)( > - const char *, /* port */ > - int *, /* partial */ > - int *, /* count_ret */ > - XtransConnInfo ** /* ciptrs_ret */ > -); > - > -int TRANS(MakeAllCLTSServerListeners)( > const char *, /* port */ > int *, /* partial */ > int *, /* count_ret */ > Index: lib/libxtrans/Xtransint.h > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/Xtransint.h,v > retrieving revision 1.8 > diff -u -p -u -r1.8 Xtransint.h > --- lib/libxtrans/Xtransint.h 28 Sep 2014 16:56:06 -0000 1.8 > +++ lib/libxtrans/Xtransint.h 14 Jul 2019 15:37:04 -0000 > @@ -151,9 +151,6 @@ struct _XtransConnInfo { > > #define XTRANS_OPEN_COTS_CLIENT 1 > #define XTRANS_OPEN_COTS_SERVER 2 > -#define XTRANS_OPEN_CLTS_CLIENT 3 > -#define XTRANS_OPEN_CLTS_SERVER 4 > - > > typedef struct _Xtransport { > const char *TransName; > @@ -181,29 +178,6 @@ typedef struct _Xtransport { > > #endif /* TRANS_SERVER */ > > -#ifdef TRANS_CLIENT > - > - XtransConnInfo (*OpenCLTSClient)( > - struct _Xtransport *, /* transport */ > - const char *, /* protocol */ > - const char *, /* host */ > - const char * /* port */ > - ); > - > -#endif /* TRANS_CLIENT */ > - > -#ifdef TRANS_SERVER > - > - XtransConnInfo (*OpenCLTSServer)( > - struct _Xtransport *, /* transport */ > - const char *, /* protocol */ > - const char *, /* host */ > - const char * /* port */ > - ); > - > -#endif /* TRANS_SERVER */ > - > - > #ifdef TRANS_REOPEN > > XtransConnInfo (*ReopenCOTSServer)( > @@ -212,12 +186,6 @@ typedef struct _Xtransport { > const char * /* port */ > ); > > - XtransConnInfo (*ReopenCLTSServer)( > - struct _Xtransport *, /* transport */ > - int, /* fd */ > - const char * /* port */ > - ); > - > #endif /* TRANS_REOPEN */ > > > @@ -350,7 +318,7 @@ typedef struct _Xtransport_table { > * systems, so they may be emulated. > */ > > -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) > || defined(WIN32) > +#ifdef WIN32 > > #define READV(ciptr, iov, iovcnt) TRANS(ReadV)(ciptr, iov, iovcnt) > > @@ -364,10 +332,10 @@ static int TRANS(ReadV)( > > #define READV(ciptr, iov, iovcnt) readv(ciptr->fd, iov, iovcnt) > > -#endif /* CRAY || (SYSV && __i386__) || WIN32 || __sxg__ || */ > +#endif /* WIN32 */ > > > -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) > || defined(WIN32) > +#ifdef WIN32 > > #define WRITEV(ciptr, iov, iovcnt) TRANS(WriteV)(ciptr, iov, iovcnt) > > @@ -381,7 +349,7 @@ static int TRANS(WriteV)( > > #define WRITEV(ciptr, iov, iovcnt) writev(ciptr->fd, iov, iovcnt) > > -#endif /* CRAY || WIN32 || __sxg__ */ > +#endif /* WIN32 */ > > > static int is_numeric ( > Index: lib/libxtrans/Xtranslcl.c > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/Xtranslcl.c,v > retrieving revision 1.8 > diff -u -p -u -r1.8 Xtranslcl.c > --- lib/libxtrans/Xtranslcl.c 28 Sep 2014 16:56:06 -0000 1.8 > +++ lib/libxtrans/Xtranslcl.c 14 Jul 2019 15:37:04 -0000 > @@ -78,7 +78,7 @@ from The Open Group. > #if defined(SVR4) || defined(__SVR4) > #include <sys/filio.h> > #endif > -#ifdef sun > +#ifdef __sun > # include <stropts.h> > #else > # include <sys/stropts.h> > @@ -104,7 +104,7 @@ from The Open Group. > * - named pipes > * - SCO > */ > -#if !defined(sun) > +#if !defined(__sun) > # define LOCAL_TRANS_PTS > #endif > #if defined(SVR4) || defined(__SVR4) > @@ -243,7 +243,7 @@ static void _dummy(int sig _X_UNUSED) > } > #endif /* LOCAL_TRANS_PTS */ > > -#ifndef sun > +#ifndef __sun > #define X_STREAMS_DIR "/dev/X" > #define DEV_SPX "/dev/spx" > #else > @@ -259,17 +259,17 @@ static void _dummy(int sig _X_UNUSED) > #if defined(X11_t) > > #define PTSNODENAME "/dev/X/server." > -#ifdef sun > +#ifdef __sun > #define NAMEDNODENAME "/tmp/.X11-pipe/X" > #else > #define NAMEDNODENAME "/dev/X/Nserver." > > #define SCORNODENAME "/dev/X%1sR" > #define SCOSNODENAME "/dev/X%1sS" > -#endif /* !sun */ > +#endif /* !__sun */ > #endif > #if defined(XIM_t) > -#ifdef sun > +#ifdef __sun > #define NAMEDNODENAME "/tmp/.XIM-pipe/XIM" > #else > #define PTSNODENAME "/dev/X/XIM." > @@ -279,7 +279,7 @@ static void _dummy(int sig _X_UNUSED) > #endif > #endif > #if defined(FS_t) || defined (FONT_t) > -#ifdef sun > +#ifdef __sun > #define NAMEDNODENAME "/tmp/.font-pipe/fs" > #else > /* > @@ -293,7 +293,7 @@ static void _dummy(int sig _X_UNUSED) > #endif > #endif > #if defined(ICE_t) > -#ifdef sun > +#ifdef __sun > #define NAMEDNODENAME "/tmp/.ICE-pipe/" > #else > #define PTSNODENAME "/dev/X/ICE." > @@ -303,7 +303,7 @@ static void _dummy(int sig _X_UNUSED) > #endif > #endif > #if defined(TEST_t) > -#ifdef sun > +#ifdef __sun > #define NAMEDNODENAME "/tmp/.Test-unix/test" > #endif > #define PTSNODENAME "/dev/X/transtest." > @@ -678,7 +678,7 @@ TRANS(NAMEDOpenClient)(XtransConnInfo ci > int fd; > char server_path[64]; > struct stat filestat; > -# ifndef sun > +# ifndef __sun > extern int isastream(int); > # endif > #endif > @@ -773,11 +773,12 @@ TRANS(NAMEDOpenPipe)(const char *server_ > prmsg(1, "NAMEDOpenPipe: Can't open %s\n", server_path); > return(-1); > } > - close(fd); > - if (chmod(server_path, (mode_t)0666) < 0) { > - prmsg(1, "NAMEDOpenPipe: Can't open %s\n", server_path); > + if (fchmod(fd, (mode_t)0666) < 0) { > + prmsg(1, "NAMEDOpenPipe: Can't chmod %s\n", server_path); > + close(fd); > return(-1); > } > + close(fd); > } else { > prmsg(1, "NAMEDOpenPipe: stat on %s failed\n", server_path); > return(-1); > @@ -1610,7 +1611,7 @@ static LOCALtrans2dev LOCALtrans2devtab[ > #endif /* TRANS_SERVER */ > }, > > -#ifdef sun /* Alias "pipe" to named, since that's what Solaris called it */ > +#ifdef __sun /* Alias "pipe" to named, since that's what Solaris called it */ > {"pipe", > #ifdef TRANS_CLIENT > TRANS(NAMEDOpenClient), > @@ -1633,7 +1634,7 @@ static LOCALtrans2dev LOCALtrans2devtab[ > TRANS(NAMEDAccept) > #endif /* TRANS_SERVER */ > }, > -#endif /* sun */ > +#endif /* __sun */ > #endif /* LOCAL_TRANS_NAMED */ > > > @@ -1673,7 +1674,7 @@ static char *freeXLOCAL=NULL; > #define DEF_XLOCAL "SCO:UNIX:PTS" > #elif defined(__UNIXWARE__) > #define DEF_XLOCAL "UNIX:PTS:NAMED:SCO" > -#elif defined(sun) > +#elif defined(__sun) > #define DEF_XLOCAL "UNIX:NAMED" > #else > #define DEF_XLOCAL "UNIX:PTS:NAMED:SCO" > @@ -1703,6 +1704,7 @@ TRANS(LocalEndTransports)(void) > { > prmsg(3,"LocalEndTransports()\n"); > free(freeXLOCAL); > + freeXLOCAL = NULL; > } > > #define TYPEBUFSIZE 32 > @@ -1713,9 +1715,8 @@ static LOCALtrans2dev * > TRANS(LocalGetNextTransport)(void) > > { > - int i,j; > + int i; > char *typetocheck; > - char typebuf[TYPEBUFSIZE]; > prmsg(3,"LocalGetNextTransport()\n"); > > while(1) > @@ -1730,6 +1731,9 @@ TRANS(LocalGetNextTransport)(void) > > for(i=0;i<NUMTRANSPORTS;i++) > { > +#ifndef HAVE_STRCASECMP > + int j; > + char typebuf[TYPEBUFSIZE]; > /* > * This is equivalent to a case insensitive strcmp(), > * but should be more portable. > @@ -1741,6 +1745,9 @@ TRANS(LocalGetNextTransport)(void) > > /* Now, see if they match */ > if(!strcmp(LOCALtrans2devtab[i].transname,typebuf)) > +#else > + if(!strcasecmp(LOCALtrans2devtab[i].transname,typetocheck)) > +#endif > return &LOCALtrans2devtab[i]; > } > } > @@ -1848,11 +1855,7 @@ TRANS(LocalOpenClient)(int type, const c > case XTRANS_OPEN_COTS_CLIENT: > ciptr->fd=transptr->devcotsopenclient(ciptr,port); > break; > - case XTRANS_OPEN_CLTS_CLIENT: > - ciptr->fd=transptr->devcltsopenclient(ciptr,port); > - break; > case XTRANS_OPEN_COTS_SERVER: > - case XTRANS_OPEN_CLTS_SERVER: > prmsg(1, > "LocalOpenClient: Should not be opening a server with this > function\n"); > break; > @@ -1917,16 +1920,12 @@ TRANS(LocalOpenServer)(int type, const c > switch( type ) > { > case XTRANS_OPEN_COTS_CLIENT: > - case XTRANS_OPEN_CLTS_CLIENT: > prmsg(1, > "LocalOpenServer: Should not be opening a client with this > function\n"); > break; > case XTRANS_OPEN_COTS_SERVER: > ciptr->fd=LOCALtrans2devtab[i].devcotsopenserver(ciptr,port); > break; > - case XTRANS_OPEN_CLTS_SERVER: > - ciptr->fd=LOCALtrans2devtab[i].devcltsopenserver(ciptr,port); > - break; > default: > prmsg(1,"LocalOpenServer: Unknown Open type %d\n", > type ); > @@ -1971,9 +1970,6 @@ TRANS(LocalReopenServer)(int type, int i > case XTRANS_OPEN_COTS_SERVER: > stat = LOCALtrans2devtab[index].devcotsreopenserver(ciptr,fd,port); > break; > - case XTRANS_OPEN_CLTS_SERVER: > - stat = LOCALtrans2devtab[index].devcltsreopenserver(ciptr,fd,port); > - break; > default: > prmsg(1,"LocalReopenServer: Unknown Open type %d\n", > type ); > @@ -2022,7 +2018,6 @@ TRANS(LocalOpenCOTSServer)(Xtransport *t > { > char *typetocheck = NULL; > int found = 0; > - char typebuf[TYPEBUFSIZE]; > > prmsg(2,"LocalOpenCOTSServer(%s,%s,%s)\n",protocol,host,port); > > @@ -2030,16 +2025,23 @@ TRANS(LocalOpenCOTSServer)(Xtransport *t > TRANS(LocalInitTransports)("local"); > typetocheck = workingXLOCAL; > while (typetocheck && !found) { > +#ifndef HAVE_STRCASECMP > int j; > + char typebuf[TYPEBUFSIZE]; > +#endif > > workingXLOCAL = strchr(workingXLOCAL, ':'); > if (workingXLOCAL && *workingXLOCAL) > *workingXLOCAL++ = '\0'; > +#ifndef HAVE_STRCASECMP > strncpy(typebuf, typetocheck, TYPEBUFSIZE); > for (j = 0; j < TYPEBUFSIZE; j++) > if (isupper(typebuf[j])) > typebuf[j] = tolower(typebuf[j]); > if (!strcmp(thistrans->TransName, typebuf)) > +#else > + if (!strcasecmp(thistrans->TransName, typetocheck)) > +#endif > found = 1; > typetocheck = workingXLOCAL; > } > @@ -2056,37 +2058,6 @@ TRANS(LocalOpenCOTSServer)(Xtransport *t > > #endif /* TRANS_SERVER */ > > - > -#ifdef TRANS_CLIENT > - > -static XtransConnInfo > -TRANS(LocalOpenCLTSClient)(Xtransport *thistrans _X_UNUSED, const char > *protocol, > - const char *host, const char *port) > - > -{ > - prmsg(2,"LocalOpenCLTSClient(%s,%s,%s)\n",protocol,host,port); > - > - return TRANS(LocalOpenClient)(XTRANS_OPEN_CLTS_CLIENT, protocol, host, > port); > -} > - > -#endif /* TRANS_CLIENT */ > - > - > -#ifdef TRANS_SERVER > - > -static XtransConnInfo > -TRANS(LocalOpenCLTSServer)(Xtransport *thistrans _X_UNUSED, const char > *protocol, > - const char *host, const char *port) > - > -{ > - prmsg(2,"LocalOpenCLTSServer(%s,%s,%s)\n",protocol,host,port); > - > - return TRANS(LocalOpenServer)(XTRANS_OPEN_CLTS_SERVER, protocol, host, > port); > -} > - > -#endif /* TRANS_SERVER */ > - > - > #ifdef TRANS_REOPEN > > static XtransConnInfo > @@ -2113,30 +2084,6 @@ TRANS(LocalReopenCOTSServer)(Xtransport > index, fd, port); > } > > -static XtransConnInfo > -TRANS(LocalReopenCLTSServer)(Xtransport *thistrans, int fd, const char *port) > - > -{ > - int index; > - > - prmsg(2,"LocalReopenCLTSServer(%d,%s)\n", fd, port); > - > - for(index=1;index<NUMTRANSPORTS;index++) > - { > - if( strcmp(thistrans->TransName, > - LOCALtrans2devtab[index].transname) == 0 ) > - break; > - } > - > - if (index >= NUMTRANSPORTS) > - { > - return (NULL); > - } > - > - return TRANS(LocalReopenServer)(XTRANS_OPEN_CLTS_SERVER, > - index, fd, port); > -} > - > #endif /* TRANS_REOPEN */ > > > @@ -2345,7 +2292,7 @@ static const char * local_aliases[] = { > "pts", > # endif > "named", > -# ifdef sun > +# ifdef __sun > "pipe", /* compatibility with Solaris Xlib */ > # endif > # ifdef LOCAL_TRANS_SCO > @@ -2365,15 +2312,8 @@ Xtransport TRANS(LocalFuncs) = { > local_aliases, > TRANS(LocalOpenCOTSServer), > #endif /* TRANS_SERVER */ > -#ifdef TRANS_CLIENT > - TRANS(LocalOpenCLTSClient), > -#endif /* TRANS_CLIENT */ > -#ifdef TRANS_SERVER > - TRANS(LocalOpenCLTSServer), > -#endif /* TRANS_SERVER */ > #ifdef TRANS_REOPEN > TRANS(LocalReopenCOTSServer), > - TRANS(LocalReopenCLTSServer), > #endif > TRANS(LocalSetOption), > #ifdef TRANS_SERVER > @@ -2411,15 +2351,8 @@ Xtransport TRANS(PTSFuncs) = { > NULL, > TRANS(LocalOpenCOTSServer), > #endif /* TRANS_SERVER */ > -#ifdef TRANS_CLIENT > - TRANS(LocalOpenCLTSClient), > -#endif /* TRANS_CLIENT */ > -#ifdef TRANS_SERVER > - TRANS(LocalOpenCLTSServer), > -#endif /* TRANS_SERVER */ > #ifdef TRANS_REOPEN > TRANS(LocalReopenCOTSServer), > - TRANS(LocalReopenCLTSServer), > #endif > TRANS(LocalSetOption), > #ifdef TRANS_SERVER > @@ -2459,15 +2392,8 @@ Xtransport TRANS(NAMEDFuncs) = { > NULL, > TRANS(LocalOpenCOTSServer), > #endif /* TRANS_SERVER */ > -#ifdef TRANS_CLIENT > - TRANS(LocalOpenCLTSClient), > -#endif /* TRANS_CLIENT */ > -#ifdef TRANS_SERVER > - TRANS(LocalOpenCLTSServer), > -#endif /* TRANS_SERVER */ > #ifdef TRANS_REOPEN > TRANS(LocalReopenCOTSServer), > - TRANS(LocalReopenCLTSServer), > #endif > TRANS(LocalSetOption), > #ifdef TRANS_SERVER > @@ -2492,7 +2418,7 @@ Xtransport TRANS(NAMEDFuncs) = { > TRANS(LocalCloseForCloning), > }; > > -#ifdef sun > +#ifdef __sun > Xtransport TRANS(PIPEFuncs) = { > /* Local Interface */ > "pipe", > @@ -2504,15 +2430,8 @@ Xtransport TRANS(PIPEFuncs) = { > NULL, > TRANS(LocalOpenCOTSServer), > #endif /* TRANS_SERVER */ > -#ifdef TRANS_CLIENT > - TRANS(LocalOpenCLTSClient), > -#endif /* TRANS_CLIENT */ > -#ifdef TRANS_SERVER > - TRANS(LocalOpenCLTSServer), > -#endif /* TRANS_SERVER */ > #ifdef TRANS_REOPEN > TRANS(LocalReopenCOTSServer), > - TRANS(LocalReopenCLTSServer), > #endif > TRANS(LocalSetOption), > #ifdef TRANS_SERVER > @@ -2536,7 +2455,7 @@ Xtransport TRANS(PIPEFuncs) = { > TRANS(LocalClose), > TRANS(LocalCloseForCloning), > }; > -#endif /* sun */ > +#endif /* __sun */ > #endif /* LOCAL_TRANS_NAMED */ > > > @@ -2552,15 +2471,8 @@ Xtransport TRANS(SCOFuncs) = { > NULL, > TRANS(LocalOpenCOTSServer), > #endif /* TRANS_SERVER */ > -#ifdef TRANS_CLIENT > - TRANS(LocalOpenCLTSClient), > -#endif /* TRANS_CLIENT */ > -#ifdef TRANS_SERVER > - TRANS(LocalOpenCLTSServer), > -#endif /* TRANS_SERVER */ > #ifdef TRANS_REOPEN > TRANS(LocalReopenCOTSServer), > - TRANS(LocalReopenCLTSServer), > #endif > TRANS(LocalSetOption), > #ifdef TRANS_SERVER > Index: lib/libxtrans/Xtranssock.c > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/Xtranssock.c,v > retrieving revision 1.10 > diff -u -p -u -r1.10 Xtranssock.c > --- lib/libxtrans/Xtranssock.c 28 Sep 2014 16:56:06 -0000 1.10 > +++ lib/libxtrans/Xtranssock.c 14 Jul 2019 15:37:04 -0000 > @@ -112,14 +112,6 @@ from the copyright holders. > #include <sys/filio.h> > #endif > > -#if (defined(__i386__) && defined(SYSV)) && !defined(SCO325) && !defined(sun) > -#include <net/errno.h> > -#endif > - > -#if defined(__i386__) && defined(SYSV) > -#include <sys/stropts.h> > -#endif > - > #include <unistd.h> > > #else /* !WIN32 */ > @@ -223,14 +215,6 @@ static int TRANS(SocketINETClose) (Xtran > #define UNIX_PATH "/tmp/.ICE-unix/" > #define UNIX_DIR "/tmp/.ICE-unix" > #endif /* ICE_t */ > -#if defined(TEST_t) > -#define UNIX_PATH "/tmp/.Test-unix/test" > -#define UNIX_DIR "/tmp/.Test-unix" > -#endif > -#if defined(LBXPROXY_t) > -#define UNIX_PATH "/tmp/.X11-unix/X" > -#define UNIX_DIR "/tmp/.X11-unix" > -#endif > > > #endif /* UNIXCONN */ > @@ -533,7 +517,7 @@ TRANS(SocketReopen) (int i _X_UNUSED, in > addr->sa_len = addrlen; > #endif > addr->sa_family = AF_UNIX; > -#ifdef HAS_STRLCPY > +#if defined(HAVE_STRLCPY) || defined(HAS_STRLCPY) > strlcpy(addr->sa_data, port, portlen); > #else > strncpy(addr->sa_data, port, portlen); > @@ -674,91 +658,6 @@ TRANS(SocketOpenCOTSServer) (Xtransport > #endif /* TRANS_SERVER */ > > > -#ifdef TRANS_CLIENT > - > -static XtransConnInfo > -TRANS(SocketOpenCLTSClient) (Xtransport *thistrans, const char *protocol, > - const char *host, const char *port) > - > -{ > - XtransConnInfo ciptr; > - int i = -1; > - > - prmsg (2,"SocketOpenCLTSClient(%s,%s,%s)\n", protocol, host, port); > - > - SocketInitOnce(); > - > - while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) { > - if ((ciptr = TRANS(SocketOpen) ( > - i, Sockettrans2devtab[i].devcotsname)) != NULL) > - break; > - } > - if (i < 0) { > - if (i == -1) > - prmsg (1,"SocketOpenCLTSClient: Unable to open socket for %s\n", > - thistrans->TransName); > - else > - prmsg (1,"SocketOpenCLTSClient: Unable to determine socket type for > %s\n", > - thistrans->TransName); > - return NULL; > - } > - > - /* Save the index for later use */ > - > - ciptr->index = i; > - > - return ciptr; > -} > - > -#endif /* TRANS_CLIENT */ > - > - > -#ifdef TRANS_SERVER > - > -static XtransConnInfo > -TRANS(SocketOpenCLTSServer) (Xtransport *thistrans, const char *protocol, > - const char *host, const char *port) > - > -{ > - XtransConnInfo ciptr; > - int i = -1; > - > - prmsg (2,"SocketOpenCLTSServer(%s,%s,%s)\n", protocol, host, port); > - > - SocketInitOnce(); > - > - while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) { > - if ((ciptr = TRANS(SocketOpen) ( > - i, Sockettrans2devtab[i].devcotsname)) != NULL) > - break; > - } > - if (i < 0) { > - if (i == -1) > - prmsg (1,"SocketOpenCLTSServer: Unable to open socket for %s\n", > - thistrans->TransName); > - else > - prmsg (1,"SocketOpenCLTSServer: Unable to determine socket type for > %s\n", > - thistrans->TransName); > - return NULL; > - } > - > -#ifdef IPV6_V6ONLY > - if (Sockettrans2devtab[i].family == AF_INET6) > - { > - int one = 1; > - setsockopt(ciptr->fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(int)); > - } > -#endif > - /* Save the index for later use */ > - > - ciptr->index = i; > - > - return ciptr; > -} > - > -#endif /* TRANS_SERVER */ > - > - > #ifdef TRANS_REOPEN > > static XtransConnInfo > @@ -795,40 +694,6 @@ TRANS(SocketReopenCOTSServer) (Xtranspor > return ciptr; > } > > -static XtransConnInfo > -TRANS(SocketReopenCLTSServer) (Xtransport *thistrans, int fd, const char > *port) > - > -{ > - XtransConnInfo ciptr; > - int i = -1; > - > - prmsg (2, > - "SocketReopenCLTSServer(%d, %s)\n", fd, port); > - > - SocketInitOnce(); > - > - while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) { > - if ((ciptr = TRANS(SocketReopen) ( > - i, Sockettrans2devtab[i].devcotsname, fd, port)) != NULL) > - break; > - } > - if (i < 0) { > - if (i == -1) > - prmsg (1,"SocketReopenCLTSServer: Unable to open socket for %s\n", > - thistrans->TransName); > - else > - prmsg (1,"SocketReopenCLTSServer: Unable to determine socket type > for %s\n", > - thistrans->TransName); > - return NULL; > - } > - > - /* Save the index for later use */ > - > - ciptr->index = i; > - > - return ciptr; > -} > - > #endif /* TRANS_REOPEN */ > > > @@ -1654,7 +1519,7 @@ TRANS(SocketINETConnect) (XtransConnInfo > tmpaddr = INADDR_NONE; > } > > - prmsg (4,"SocketINETConnect() inet_addr(%s) = %x\n", host, tmpaddr); > + prmsg (4,"SocketINETConnect() inet_addr(%s) = %lx\n", host, tmpaddr); > > if (tmpaddr == INADDR_NONE) { > if ((hostp = _XGethostbyname(host,hparams)) == NULL) { > @@ -2113,11 +1978,7 @@ TRANS(SocketBytesReadable) (XtransConnIn > return ret; > } > #else > -#if defined(__i386__) && defined(SYSV) && !defined(SCO325) > - return ioctl (ciptr->fd, I_NREAD, (char *) pend); > -#else > return ioctl (ciptr->fd, FIONREAD, (char *) pend); > -#endif /* __i386__ && SYSV || _SEQUENT_ && _SOCKET_VERSION == 1 */ > #endif /* WIN32 */ > } > > @@ -2514,15 +2375,8 @@ Xtransport TRANS(SocketTCPFuncs) = { > tcp_nolisten, > TRANS(SocketOpenCOTSServer), > #endif /* TRANS_SERVER */ > -#ifdef TRANS_CLIENT > - TRANS(SocketOpenCLTSClient), > -#endif /* TRANS_CLIENT */ > -#ifdef TRANS_SERVER > - TRANS(SocketOpenCLTSServer), > -#endif /* TRANS_SERVER */ > #ifdef TRANS_REOPEN > TRANS(SocketReopenCOTSServer), > - TRANS(SocketReopenCLTSServer), > #endif > TRANS(SocketSetOption), > #ifdef TRANS_SERVER > @@ -2558,15 +2412,8 @@ Xtransport TRANS(SocketINETFuncs) = { > NULL, > TRANS(SocketOpenCOTSServer), > #endif /* TRANS_SERVER */ > -#ifdef TRANS_CLIENT > - TRANS(SocketOpenCLTSClient), > -#endif /* TRANS_CLIENT */ > -#ifdef TRANS_SERVER > - TRANS(SocketOpenCLTSServer), > -#endif /* TRANS_SERVER */ > #ifdef TRANS_REOPEN > TRANS(SocketReopenCOTSServer), > - TRANS(SocketReopenCLTSServer), > #endif > TRANS(SocketSetOption), > #ifdef TRANS_SERVER > @@ -2603,15 +2450,8 @@ Xtransport TRANS(SocketINET6Funcs) = > NULL, > TRANS(SocketOpenCOTSServer), > #endif /* TRANS_SERVER */ > -#ifdef TRANS_CLIENT > - TRANS(SocketOpenCLTSClient), > -#endif /* TRANS_CLIENT */ > -#ifdef TRANS_SERVER > - TRANS(SocketOpenCLTSServer), > -#endif /* TRANS_SERVER */ > #ifdef TRANS_REOPEN > TRANS(SocketReopenCOTSServer), > - TRANS(SocketReopenCLTSServer), > #endif > TRANS(SocketSetOption), > #ifdef TRANS_SERVER > @@ -2655,15 +2495,8 @@ Xtransport TRANS(SocketLocalFuncs) = { > NULL, > TRANS(SocketOpenCOTSServer), > #endif /* TRANS_SERVER */ > -#ifdef TRANS_CLIENT > - TRANS(SocketOpenCLTSClient), > -#endif /* TRANS_CLIENT */ > -#ifdef TRANS_SERVER > - TRANS(SocketOpenCLTSServer), > -#endif /* TRANS_SERVER */ > #ifdef TRANS_REOPEN > TRANS(SocketReopenCOTSServer), > - TRANS(SocketReopenCLTSServer), > #endif > TRANS(SocketSetOption), > #ifdef TRANS_SERVER > @@ -2713,15 +2546,8 @@ Xtransport TRANS(SocketUNIXFuncs) = { > #endif > TRANS(SocketOpenCOTSServer), > #endif /* TRANS_SERVER */ > -#ifdef TRANS_CLIENT > - TRANS(SocketOpenCLTSClient), > -#endif /* TRANS_CLIENT */ > -#ifdef TRANS_SERVER > - TRANS(SocketOpenCLTSServer), > -#endif /* TRANS_SERVER */ > #ifdef TRANS_REOPEN > TRANS(SocketReopenCOTSServer), > - TRANS(SocketReopenCLTSServer), > #endif > TRANS(SocketSetOption), > #ifdef TRANS_SERVER > Index: lib/libxtrans/aclocal.m4 > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/aclocal.m4,v > retrieving revision 1.12 > diff -u -p -u -r1.12 aclocal.m4 > --- lib/libxtrans/aclocal.m4 11 Oct 2016 22:15:43 -0000 1.12 > +++ lib/libxtrans/aclocal.m4 14 Jul 2019 15:37:04 -0000 > @@ -19,32 +19,63 @@ You have another version of autoconf. I > If you have problems, you may need to regenerate the build system entirely. > To do so, use the procedure documented by the package, typically > 'autoreconf'.])]) > > -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf > -*- > -# serial 1 (pkg-config-0.24) > -# > -# Copyright © 2004 Scott James Remnant <[email protected]>. > -# > -# This program is free software; you can redistribute it and/or modify > -# it under the terms of the GNU General Public License as published by > -# the Free Software Foundation; either version 2 of the License, or > -# (at your option) any later version. > -# > -# This program is distributed in the hope that it will be useful, but > -# WITHOUT ANY WARRANTY; without even the implied warranty of > -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > -# General Public License for more details. > -# > -# You should have received a copy of the GNU General Public License > -# along with this program; if not, write to the Free Software > -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > -# > -# As a special exception to the GNU General Public License, if you > -# distribute this file as part of a program that contains a > -# configuration script generated by Autoconf, you may include it under > -# the same distribution terms that you use for the rest of that program. > - > -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) > -# ---------------------------------- > +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- > +dnl serial 11 (pkg-config-0.29.1) > +dnl > +dnl Copyright © 2004 Scott James Remnant <[email protected]>. > +dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> > +dnl > +dnl This program is free software; you can redistribute it and/or modify > +dnl it under the terms of the GNU General Public License as published by > +dnl the Free Software Foundation; either version 2 of the License, or > +dnl (at your option) any later version. > +dnl > +dnl This program is distributed in the hope that it will be useful, but > +dnl WITHOUT ANY WARRANTY; without even the implied warranty of > +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +dnl General Public License for more details. > +dnl > +dnl You should have received a copy of the GNU General Public License > +dnl along with this program; if not, write to the Free Software > +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA > +dnl 02111-1307, USA. > +dnl > +dnl As a special exception to the GNU General Public License, if you > +dnl distribute this file as part of a program that contains a > +dnl configuration script generated by Autoconf, you may include it under > +dnl the same distribution terms that you use for the rest of that > +dnl program. > + > +dnl PKG_PREREQ(MIN-VERSION) > +dnl ----------------------- > +dnl Since: 0.29 > +dnl > +dnl Verify that the version of the pkg-config macros are at least > +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's > +dnl installed version of pkg-config, this checks the developer's version > +dnl of pkg.m4 when generating configure. > +dnl > +dnl To ensure that this macro is defined, also add: > +dnl m4_ifndef([PKG_PREREQ], > +dnl [m4_fatal([must install pkg-config 0.29 or later before running > autoconf/autogen])]) > +dnl > +dnl See the "Since" comment for each macro you use to see what version > +dnl of the macros you require. > +m4_defun([PKG_PREREQ], > +[m4_define([PKG_MACROS_VERSION], [0.29.1]) > +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, > + [m4_fatal([pkg.m4 version $1 or higher is required but > ]PKG_MACROS_VERSION[ found])]) > +])dnl PKG_PREREQ > + > +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) > +dnl ---------------------------------- > +dnl Since: 0.16 > +dnl > +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to > +dnl first found in the path. Checks that the version of pkg-config found > +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is > +dnl used since that's the first version where most current features of > +dnl pkg-config existed. > AC_DEFUN([PKG_PROG_PKG_CONFIG], > [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) > > m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) > @@ -66,18 +97,19 @@ if test -n "$PKG_CONFIG"; then > PKG_CONFIG="" > fi > fi[]dnl > -])# PKG_PROG_PKG_CONFIG > +])dnl PKG_PROG_PKG_CONFIG > > -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) > -# > -# Check to see whether a particular set of modules exists. Similar > -# to PKG_CHECK_MODULES(), but does not set variables or print errors. > -# > -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) > -# only at the first occurence in configure.ac, so if the first place > -# it's called might be skipped (such as if it is within an "if", you > -# have to call PKG_CHECK_EXISTS manually > -# -------------------------------------------------------------- > +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) > +dnl ------------------------------------------------------------------- > +dnl Since: 0.18 > +dnl > +dnl Check to see whether a particular set of modules exists. Similar to > +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. > +dnl > +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) > +dnl only at the first occurence in configure.ac, so if the first place > +dnl it's called might be skipped (such as if it is within an "if", you > +dnl have to call PKG_CHECK_EXISTS manually > AC_DEFUN([PKG_CHECK_EXISTS], > [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl > if test -n "$PKG_CONFIG" && \ > @@ -87,8 +119,10 @@ m4_ifvaln([$3], [else > $3])dnl > fi]) > > -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) > -# --------------------------------------------- > +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) > +dnl --------------------------------------------- > +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting > +dnl pkg_failed based on the result. > m4_define([_PKG_CONFIG], > [if test -n "$$1"; then > pkg_cv_[]$1="$$1" > @@ -100,10 +134,11 @@ m4_define([_PKG_CONFIG], > else > pkg_failed=untried > fi[]dnl > -])# _PKG_CONFIG > +])dnl _PKG_CONFIG > > -# _PKG_SHORT_ERRORS_SUPPORTED > -# ----------------------------- > +dnl _PKG_SHORT_ERRORS_SUPPORTED > +dnl --------------------------- > +dnl Internal check to see if pkg-config supports short errors. > AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], > [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) > if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then > @@ -111,19 +146,17 @@ if $PKG_CONFIG --atleast-pkgconfig-versi > else > _pkg_short_errors_supported=no > fi[]dnl > -])# _PKG_SHORT_ERRORS_SUPPORTED > +])dnl _PKG_SHORT_ERRORS_SUPPORTED > > > -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], > -# [ACTION-IF-NOT-FOUND]) > -# > -# > -# Note that if there is a possibility the first call to > -# PKG_CHECK_MODULES might not happen, you should be sure to include an > -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac > -# > -# > -# -------------------------------------------------------------- > +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], > +dnl [ACTION-IF-NOT-FOUND]) > +dnl -------------------------------------------------------------- > +dnl Since: 0.4.0 > +dnl > +dnl Note that if there is a possibility the first call to > +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an > +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac > AC_DEFUN([PKG_CHECK_MODULES], > [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl > AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding > pkg-config])dnl > @@ -177,16 +210,40 @@ else > AC_MSG_RESULT([yes]) > $3 > fi[]dnl > -])# PKG_CHECK_MODULES > +])dnl PKG_CHECK_MODULES > > > -# PKG_INSTALLDIR(DIRECTORY) > -# ------------------------- > -# Substitutes the variable pkgconfigdir as the location where a module > -# should install pkg-config .pc files. By default the directory is > -# $libdir/pkgconfig, but the default can be changed by passing > -# DIRECTORY. The user can override through the --with-pkgconfigdir > -# parameter. > +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], > +dnl [ACTION-IF-NOT-FOUND]) > +dnl --------------------------------------------------------------------- > +dnl Since: 0.29 > +dnl > +dnl Checks for existence of MODULES and gathers its build flags with > +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags > +dnl and VARIABLE-PREFIX_LIBS from --libs. > +dnl > +dnl Note that if there is a possibility the first call to > +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to > +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your > +dnl configure.ac. > +AC_DEFUN([PKG_CHECK_MODULES_STATIC], > +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl > +_save_PKG_CONFIG=$PKG_CONFIG > +PKG_CONFIG="$PKG_CONFIG --static" > +PKG_CHECK_MODULES($@) > +PKG_CONFIG=$_save_PKG_CONFIG[]dnl > +])dnl PKG_CHECK_MODULES_STATIC > + > + > +dnl PKG_INSTALLDIR([DIRECTORY]) > +dnl ------------------------- > +dnl Since: 0.27 > +dnl > +dnl Substitutes the variable pkgconfigdir as the location where a module > +dnl should install pkg-config .pc files. By default the directory is > +dnl $libdir/pkgconfig, but the default can be changed by passing > +dnl DIRECTORY. The user can override through the --with-pkgconfigdir > +dnl parameter. > AC_DEFUN([PKG_INSTALLDIR], > [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) > m4_pushdef([pkg_description], > @@ -197,16 +254,18 @@ AC_ARG_WITH([pkgconfigdir], > AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) > m4_popdef([pkg_default]) > m4_popdef([pkg_description]) > -]) dnl PKG_INSTALLDIR > +])dnl PKG_INSTALLDIR > > > -# PKG_NOARCH_INSTALLDIR(DIRECTORY) > -# ------------------------- > -# Substitutes the variable noarch_pkgconfigdir as the location where a > -# module should install arch-independent pkg-config .pc files. By > -# default the directory is $datadir/pkgconfig, but the default can be > -# changed by passing DIRECTORY. The user can override through the > -# --with-noarch-pkgconfigdir parameter. > +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) > +dnl -------------------------------- > +dnl Since: 0.27 > +dnl > +dnl Substitutes the variable noarch_pkgconfigdir as the location where a > +dnl module should install arch-independent pkg-config .pc files. By > +dnl default the directory is $datadir/pkgconfig, but the default can be > +dnl changed by passing DIRECTORY. The user can override through the > +dnl --with-noarch-pkgconfigdir parameter. > AC_DEFUN([PKG_NOARCH_INSTALLDIR], > [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) > m4_pushdef([pkg_description], > @@ -217,7 +276,24 @@ AC_ARG_WITH([noarch-pkgconfigdir], > AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) > m4_popdef([pkg_default]) > m4_popdef([pkg_description]) > -]) dnl PKG_NOARCH_INSTALLDIR > +])dnl PKG_NOARCH_INSTALLDIR > + > + > +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, > +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) > +dnl ------------------------------------------- > +dnl Since: 0.28 > +dnl > +dnl Retrieves the value of the pkg-config variable for the given module. > +AC_DEFUN([PKG_CHECK_VAR], > +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl > +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl > + > +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) > +AS_VAR_COPY([$1], [pkg_cv_][$1]) > + > +AS_VAR_IF([$1], [""], [$5], [$4])dnl > +])dnl PKG_CHECK_VAR > > # Copyright (C) 2002-2012 Free Software Foundation, Inc. > # > @@ -1242,7 +1318,7 @@ AC_SUBST([am__untar]) > > dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by > configure. > dnl > -dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights > reserved. > +dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights > reserved. > dnl > dnl Permission is hereby granted, free of charge, to any person obtaining a > dnl copy of this software and associated documentation files (the > "Software"), > @@ -1279,7 +1355,7 @@ dnl DEALINGS IN THE SOFTWARE. > # See the "minimum version" comment for each macro you use to see what > # version you require. > m4_defun([XORG_MACROS_VERSION],[ > -m4_define([vers_have], [1.19.0]) > +m4_define([vers_have], [1.19.2]) > m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) > m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) > m4_if(m4_cmp(maj_have, maj_needed), 0,, > @@ -1357,6 +1433,17 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[ > AC_REQUIRE([AC_CANONICAL_HOST]) > AC_REQUIRE([AC_PROG_SED]) > > +case $host_os in > + solaris*) > + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we > + # check for a man page file found in later versions that use > + # traditional section numbers instead > + AC_CHECK_FILE([/usr/share/man/man7/attributes.7], > + [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true]) > + ;; > + *) SYSV_MAN_SECTIONS=false ;; > +esac > + > if test x$APP_MAN_SUFFIX = x ; then > APP_MAN_SUFFIX=1 > fi > @@ -1372,9 +1459,9 @@ if test x$LIB_MAN_DIR = x ; then > fi > > if test x$FILE_MAN_SUFFIX = x ; then > - case $host_os in > - solaris*) FILE_MAN_SUFFIX=4 ;; > - *) FILE_MAN_SUFFIX=5 ;; > + case $SYSV_MAN_SECTIONS in > + true) FILE_MAN_SUFFIX=4 ;; > + *) FILE_MAN_SUFFIX=5 ;; > esac > fi > if test x$FILE_MAN_DIR = x ; then > @@ -1382,9 +1469,9 @@ if test x$FILE_MAN_DIR = x ; then > fi > > if test x$MISC_MAN_SUFFIX = x ; then > - case $host_os in > - solaris*) MISC_MAN_SUFFIX=5 ;; > - *) MISC_MAN_SUFFIX=7 ;; > + case $SYSV_MAN_SECTIONS in > + true) MISC_MAN_SUFFIX=5 ;; > + *) MISC_MAN_SUFFIX=7 ;; > esac > fi > if test x$MISC_MAN_DIR = x ; then > @@ -1392,9 +1479,9 @@ if test x$MISC_MAN_DIR = x ; then > fi > > if test x$DRIVER_MAN_SUFFIX = x ; then > - case $host_os in > - solaris*) DRIVER_MAN_SUFFIX=7 ;; > - *) DRIVER_MAN_SUFFIX=4 ;; > + case $SYSV_MAN_SECTIONS in > + true) DRIVER_MAN_SUFFIX=7 ;; > + *) DRIVER_MAN_SUFFIX=4 ;; > esac > fi > if test x$DRIVER_MAN_DIR = x ; then > @@ -1402,9 +1489,9 @@ if test x$DRIVER_MAN_DIR = x ; then > fi > > if test x$ADMIN_MAN_SUFFIX = x ; then > - case $host_os in > - solaris*) ADMIN_MAN_SUFFIX=1m ;; > - *) ADMIN_MAN_SUFFIX=8 ;; > + case $SYSV_MAN_SECTIONS in > + true) ADMIN_MAN_SUFFIX=1m ;; > + *) ADMIN_MAN_SUFFIX=8 ;; > esac > fi > if test x$ADMIN_MAN_DIR = x ; then > @@ -1665,13 +1752,24 @@ m4_ifval([$1], > fi]) > > # Test for the ability of xmlto to generate a text target > +# > +# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the > +# following test for empty XML docbook files. > +# For compatibility reasons use the following empty XML docbook file and if > +# it fails try it again with a non-empty XML file. > have_xmlto_text=no > cat > conftest.xml << "EOF" > EOF > AS_IF([test "$have_xmlto" = yes], > [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], > [have_xmlto_text=yes], > - [AC_MSG_WARN([xmlto cannot generate text format, this format > skipped])])]) > + [# Try it again with a non-empty XML file. > + cat > conftest.xml << "EOF" > +<x></x> > +EOF > + AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null > 2>&1], > + [have_xmlto_text=yes], > + [AC_MSG_WARN([xmlto cannot generate text format, this > format skipped])])])]) > rm -f conftest.xml > AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) > AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) > @@ -3067,8 +3165,9 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) > macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` > INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && > \ > mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ > -|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ > -echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing > possibly empty INSTALL.' >&2)" > +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ > +touch \$(top_srcdir)/INSTALL; \ > +echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' > >&2))" > AC_SUBST([INSTALL_CMD]) > ]) # XORG_INSTALL > dnl Copyright 2005 Red Hat, Inc > @@ -3129,10 +3228,11 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ > # > # > AC_DEFUN([XORG_CHANGELOG], [ > -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > > \$(top_srcdir)/.changelog.tmp && \ > +CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ > mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ > -|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ > -echo 'git directory not found: installing possibly empty changelog.' >&2)" > +|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || > ( \ > +touch \$(top_srcdir)/ChangeLog; \ > +echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" > AC_SUBST([CHANGELOG_CMD]) > ]) # XORG_CHANGELOG > > Index: lib/libxtrans/compile > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/compile,v > retrieving revision 1.1 > diff -u -p -u -r1.1 compile > --- lib/libxtrans/compile 13 Apr 2014 11:57:04 -0000 1.1 > +++ lib/libxtrans/compile 14 Jul 2019 15:37:04 -0000 > @@ -3,7 +3,7 @@ > > scriptversion=2012-10-14.11; # UTC > > -# Copyright (C) 1999-2013 Free Software Foundation, Inc. > +# Copyright (C) 1999-2014 Free Software Foundation, Inc. > # Written by Tom Tromey <[email protected]>. > # > # This program is free software; you can redistribute it and/or modify > Index: lib/libxtrans/configure > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/configure,v > retrieving revision 1.12 > diff -u -p -u -r1.12 configure > --- lib/libxtrans/configure 11 Oct 2016 22:15:43 -0000 1.12 > +++ lib/libxtrans/configure 14 Jul 2019 15:37:04 -0000 > @@ -1,8 +1,8 @@ > #! /bin/sh > # Guess values for system-dependent variables and create Makefiles. > -# Generated by GNU Autoconf 2.69 for xtrans 1.3.5. > +# Generated by GNU Autoconf 2.69 for xtrans 1.4.0. > # > -# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. > +# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxtrans/issues>. > # > # > # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. > @@ -267,7 +267,7 @@ fi > $as_echo "$0: be upgraded to zsh 4.3.4 or later." > else > $as_echo "$0: Please tell [email protected] and > -$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg > +$0: https://gitlab.freedesktop.org/xorg/lib/libxtrans/issues > $0: about your system, including any error possibly output > $0: before this message. Then install a modern shell, or > $0: manually run the script under such a shell if you do > @@ -641,9 +641,9 @@ MAKEFLAGS= > # Identity of this package. > PACKAGE_NAME='xtrans' > PACKAGE_TARNAME='xtrans' > -PACKAGE_VERSION='1.3.5' > -PACKAGE_STRING='xtrans 1.3.5' > -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' > +PACKAGE_VERSION='1.4.0' > +PACKAGE_STRING='xtrans 1.4.0' > +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libxtrans/issues' > PACKAGE_URL='' > > ac_unique_file="Makefile.am" > @@ -1394,7 +1394,7 @@ if test "$ac_init_help" = "long"; then > # Omit some internal or obsolete options to make the list less imposing. > # This message is too long to be a string in the A/UX 3.1 sh. > cat <<_ACEOF > -\`configure' configures xtrans 1.3.5 to adapt to many kinds of systems. > +\`configure' configures xtrans 1.4.0 to adapt to many kinds of systems. > > Usage: $0 [OPTION]... [VAR=VALUE]... > > @@ -1464,7 +1464,7 @@ fi > > if test -n "$ac_init_help"; then > case $ac_init_help in > - short | recursive ) echo "Configuration of xtrans 1.3.5:";; > + short | recursive ) echo "Configuration of xtrans 1.4.0:";; > esac > cat <<\_ACEOF > > @@ -1519,7 +1519,7 @@ Some influential environment variables: > Use these variables to override the choices made by `configure' or to help > it to find libraries and programs with nonstandard names/locations. > > -Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. > +Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxtrans/issues>. > _ACEOF > ac_status=$? > fi > @@ -1582,7 +1582,7 @@ fi > test -n "$ac_init_help" && exit $ac_status > if $ac_init_version; then > cat <<\_ACEOF > -xtrans configure 1.3.5 > +xtrans configure 1.4.0 > generated by GNU Autoconf 2.69 > > Copyright (C) 2012 Free Software Foundation, Inc. > @@ -1906,7 +1906,7 @@ cat >config.log <<_ACEOF > This file contains any messages produced by compilers while > running configure, to aid debugging if configure makes a mistake. > > -It was created by xtrans $as_me 1.3.5, which was > +It was created by xtrans $as_me 1.4.0, which was > generated by GNU Autoconf 2.69. Invocation command line was > > $ $0 $@ > @@ -2733,7 +2733,7 @@ fi > > # Define the identity of the package. > PACKAGE='xtrans' > - VERSION='1.3.5' > + VERSION='1.4.0' > > > cat >>confdefs.h <<_ACEOF > @@ -10400,10 +10400,11 @@ _ACEOF > > > > -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > > \$(top_srcdir)/.changelog.tmp && \ > +CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ > mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ > -|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ > -echo 'git directory not found: installing possibly empty changelog.' >&2)" > +|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || > ( \ > +touch \$(top_srcdir)/ChangeLog; \ > +echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" > > > > @@ -10411,14 +10412,45 @@ echo 'git directory not found: installin > macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` > INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && > \ > mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ > -|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ > -echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing > possibly empty INSTALL.' >&2)" > +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ > +touch \$(top_srcdir)/INSTALL; \ > +echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' > >&2))" > > > > > > > +case $host_os in > + solaris*) > + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we > + # check for a man page file found in later versions that use > + # traditional section numbers instead > + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for > /usr/share/man/man7/attributes.7" >&5 > +$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } > +if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : > + $as_echo_n "(cached) " >&6 > +else > + test "$cross_compiling" = yes && > + as_fn_error $? "cannot check for file existence when cross compiling" > "$LINENO" 5 > +if test -r "/usr/share/man/man7/attributes.7"; then > + ac_cv_file__usr_share_man_man7_attributes_7=yes > +else > + ac_cv_file__usr_share_man_man7_attributes_7=no > +fi > +fi > +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: > $ac_cv_file__usr_share_man_man7_attributes_7" >&5 > +$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } > +if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : > + SYSV_MAN_SECTIONS=false > +else > + SYSV_MAN_SECTIONS=true > +fi > + > + ;; > + *) SYSV_MAN_SECTIONS=false ;; > +esac > + > if test x$APP_MAN_SUFFIX = x ; then > APP_MAN_SUFFIX=1 > fi > @@ -10434,9 +10466,9 @@ if test x$LIB_MAN_DIR = x ; then > fi > > if test x$FILE_MAN_SUFFIX = x ; then > - case $host_os in > - solaris*) FILE_MAN_SUFFIX=4 ;; > - *) FILE_MAN_SUFFIX=5 ;; > + case $SYSV_MAN_SECTIONS in > + true) FILE_MAN_SUFFIX=4 ;; > + *) FILE_MAN_SUFFIX=5 ;; > esac > fi > if test x$FILE_MAN_DIR = x ; then > @@ -10444,9 +10476,9 @@ if test x$FILE_MAN_DIR = x ; then > fi > > if test x$MISC_MAN_SUFFIX = x ; then > - case $host_os in > - solaris*) MISC_MAN_SUFFIX=5 ;; > - *) MISC_MAN_SUFFIX=7 ;; > + case $SYSV_MAN_SECTIONS in > + true) MISC_MAN_SUFFIX=5 ;; > + *) MISC_MAN_SUFFIX=7 ;; > esac > fi > if test x$MISC_MAN_DIR = x ; then > @@ -10454,9 +10486,9 @@ if test x$MISC_MAN_DIR = x ; then > fi > > if test x$DRIVER_MAN_SUFFIX = x ; then > - case $host_os in > - solaris*) DRIVER_MAN_SUFFIX=7 ;; > - *) DRIVER_MAN_SUFFIX=4 ;; > + case $SYSV_MAN_SECTIONS in > + true) DRIVER_MAN_SUFFIX=7 ;; > + *) DRIVER_MAN_SUFFIX=4 ;; > esac > fi > if test x$DRIVER_MAN_DIR = x ; then > @@ -10464,9 +10496,9 @@ if test x$DRIVER_MAN_DIR = x ; then > fi > > if test x$ADMIN_MAN_SUFFIX = x ; then > - case $host_os in > - solaris*) ADMIN_MAN_SUFFIX=1m ;; > - *) ADMIN_MAN_SUFFIX=8 ;; > + case $SYSV_MAN_SECTIONS in > + true) ADMIN_MAN_SUFFIX=1m ;; > + *) ADMIN_MAN_SUFFIX=8 ;; > esac > fi > if test x$ADMIN_MAN_DIR = x ; then > @@ -10714,6 +10746,11 @@ esac > fi > > # Test for the ability of xmlto to generate a text target > +# > +# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the > +# following test for empty XML docbook files. > +# For compatibility reasons use the following empty XML docbook file and if > +# it fails try it again with a non-empty XML file. > have_xmlto_text=no > cat > conftest.xml << "EOF" > EOF > @@ -10721,10 +10758,18 @@ if test "$have_xmlto" = yes; then : > if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then : > have_xmlto_text=yes > else > + # Try it again with a non-empty XML file. > + cat > conftest.xml << "EOF" > +<x></x> > +EOF > + if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; > then : > + have_xmlto_text=yes > +else > { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto cannot generate > text format, this format skipped" >&5 > $as_echo "$as_me: WARNING: xmlto cannot generate text format, this format > skipped" >&2;} > fi > fi > +fi > rm -f conftest.xml > if test $have_xmlto_text = yes; then > HAVE_XMLTO_TEXT_TRUE= > @@ -11662,7 +11707,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri > # report actual input values of CONFIG_FILES etc. instead of their > # values after options handling. > ac_log=" > -This file was extended by xtrans $as_me 1.3.5, which was > +This file was extended by xtrans $as_me 1.4.0, which was > generated by GNU Autoconf 2.69. Invocation command line was > > CONFIG_FILES = $CONFIG_FILES > @@ -11713,13 +11758,13 @@ $config_files > Configuration commands: > $config_commands > > -Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>." > +Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxtrans/issues>." > > _ACEOF > cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 > ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; > s/[\\""\`\$]/\\\\&/g'`" > ac_cs_version="\\ > -xtrans config.status 1.3.5 > +xtrans config.status 1.4.0 > configured by $0, generated by GNU Autoconf 2.69, > with options \\"\$ac_cs_config\\" > > Index: lib/libxtrans/configure.ac > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/configure.ac,v > retrieving revision 1.8 > diff -u -p -u -r1.8 configure.ac > --- lib/libxtrans/configure.ac 28 Sep 2014 16:56:06 -0000 1.8 > +++ lib/libxtrans/configure.ac 14 Jul 2019 15:37:04 -0000 > @@ -21,8 +21,8 @@ > > # Initialize Autoconf > AC_PREREQ([2.60]) > -AC_INIT([xtrans], [1.3.5], > - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xtrans]) > +AC_INIT([xtrans], [1.4.0], > + [https://gitlab.freedesktop.org/xorg/lib/libxtrans/issues], [xtrans]) > AC_CONFIG_SRCDIR([Makefile.am]) > > # Initialize Automake > Index: lib/libxtrans/xtrans.m4 > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/xtrans.m4,v > retrieving revision 1.7 > diff -u -p -u -r1.7 xtrans.m4 > --- lib/libxtrans/xtrans.m4 13 Apr 2014 11:57:04 -0000 1.7 > +++ lib/libxtrans/xtrans.m4 14 Jul 2019 15:37:04 -0000 > @@ -134,6 +134,9 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],[ > AC_DEFINE(LOCALCONN,1,[Support os-specific local connections]) > fi > > + # Other functions Xtrans may need > + AC_CHECK_FUNCS([strcasecmp strlcpy]) > + > ]) # XTRANS_CONNECTION_FLAGS > > > Index: lib/libxtrans/doc/xtrans.xml > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/lib/libxtrans/doc/xtrans.xml,v > retrieving revision 1.4 > diff -u -p -u -r1.4 xtrans.xml > --- lib/libxtrans/doc/xtrans.xml 28 Sep 2014 16:56:06 -0000 1.4 > +++ lib/libxtrans/doc/xtrans.xml 14 Jul 2019 15:37:04 -0000 > @@ -204,20 +204,6 @@ typedef struct _Xtransport { > const char * /* port */ > ); > > - XtransConnInfo (*OpenCLTSClient)( > - struct _Xtransport *, /* transport */ > - const char *, /* protocol */ > - const char *, /* host */ > - const char * /* port */ > - ); > - > - XtransConnInfo (*OpenCLTSServer)( > - struct _Xtransport *, /* transport */ > - const char *, /* protocol */ > - const char *, /* host */ > - const char * /* port */ > - ); > - > int (*SetOption)( > XtransConnInfo, /* connection */ > int, /* option */ > @@ -420,36 +406,6 @@ on failure. > </para> > </listitem> > <listitem> > - <funcsynopsis id='TRANSOpenCLTSClient'> > - <funcprototype> > - <funcdef>XtransConnInfo > <function>TRANS(OpenCLTSClient)</function></funcdef> > - <paramdef>const char *<parameter>address</parameter></paramdef> > - </funcprototype> > - </funcsynopsis> > - <para> > -This function creates a Connection-Less Transport that is suitable for > -use by a client. The parameter <parameter>address</parameter> contains the > -full address of the server to which this endpoint will be connected. This > -function returns an opaque transport connection object on success, or > -<constant>NULL</constant> on failure. > - </para> > - </listitem> > - <listitem> > - <funcsynopsis id='TRANSOpenCLTSServer'> > - <funcprototype> > - <funcdef>XtransConnInfo > <function>TRANS(OpenCLTSServer)</function></funcdef> > - <paramdef>const char *<parameter>address</parameter></paramdef> > - </funcprototype> > - </funcsynopsis> > - <para> > -This function creates a Connection-Less Transport that is suitable for > -use by a server. The parameter <parameter>address</parameter> contains the > -full address to which this server will be bound. This function returns an > -opaque transport connection object on success, or <constant>NULL</constant> > -on failure. > - </para> > - </listitem> > - <listitem> > <funcsynopsis id='TRANSSetOption'> > <funcprototype> > <funcdef>int <function>TRANS(SetOption)</function></funcdef> > @@ -487,8 +443,7 @@ Based on current usage, the complimentar > <para> > This function sets up the server endpoint for listening. The parameter > <parameter>connection</parameter> is an endpoint that was obtained from > -<function>TRANS(OpenCOTSServer)()</function> or > -<function>TRANS(OpenCLTSServer)()</function>. The parameter > +<function>TRANS(OpenCOTSServer)()</function>. The parameter > <parameter>port</parameter> specifies the port to which this endpoint > should be bound for listening. If port is <constant>NULL</constant>, > then the transport may attempt to allocate any available TSAP for this > @@ -578,8 +533,7 @@ This function provides the same function > </funcsynopsis> > <para> > This function will return the number of bytes requested on a COTS > -connection, and will return the minimum of the number bytes requested or > -the size of the incoming packet on a CLTS connection. > +connection, and will return the minimum of the number bytes requested. > </para> > </listitem> > <listitem> > @@ -593,7 +547,7 @@ the size of the incoming packet on a CLT > </funcsynopsis> > <para> > This function will write the requested number of bytes on a COTS > -connection, and will send a packet of the requested size on a CLTS > connection. > +connection. > </para> > </listitem> > <listitem> > @@ -727,25 +681,6 @@ the number of transports returned, and < > is the list of transports. > </para> > </listitem> > - <listitem> > - <funcsynopsis id='TRANSMakeAllCLTSServerListeners'> > - <funcprototype> > - <funcdef>int > <function>TRANS(MakeAllCLTSServerListeners)</function></funcdef> > - <paramdef>const char *<parameter>port</parameter></paramdef> > - <paramdef>int *<parameter>partial_ret</parameter></paramdef> > - <paramdef>int *<parameter>count_ret</parameter></paramdef> > - <paramdef>XtransConnInfo > **<parameter>connections_ret</parameter></paramdef> > - </funcprototype> > - </funcsynopsis> > - <para> > -This function should be used by most servers. It will try to establish a > -CLTS server endpoint for each transport listed in the transport table. > -<parameter>partial_ret</parameter> will be set to <symbol>True</symbol> if > -only a partial network could be created. <parameter>count_ret</parameter> is > -the number of transports returned, and <parameter>connections_ret</parameter> > -is the list of transports. > - </para> > - </listitem> > </itemizedlist> > </sect1> > > @@ -865,52 +800,6 @@ strings containing the corresponding par > This function must allocate and initialize the contents of the > XtransConnInfo structure that is returned by this function. This function > will open the transport. > - </para> > - </listitem> > - <listitem> > - <funcsynopsis id='OpenCLTSClient'> > - <funcprototype> > - <funcdef>XtransConnInfo > *<function>OpenCLTSClient</function></funcdef> > - <paramdef>struct _Xtransport > *<parameter>thistrans</parameter></paramdef> > - <paramdef>const char *<parameter>protocol</parameter></paramdef> > - <paramdef>const char *<parameter>host</parameter></paramdef> > - <paramdef>const char *<parameter>port</parameter></paramdef> > - </funcprototype> > - </funcsynopsis> > - <para> > -This function creates a Connection-Less Transport. The parameter > -<parameter>thistrans</parameter> points to an Xtransport entry in the > -transport table. The parameters <parameter>protocol</parameter>, > -<parameter>host</parameter>, and <parameter>port</parameter> point to strings > -containing the corresponding parts of the address that was passed into > -<link > linkend='TRANSOpenCLTSClient'><function>TRANS(OpenCLTSClient)()</function></link>. > -This function must allocate and initialize the contents of the XtransConnInfo > -structure that is returned by this function. This function will open the > -transport, and bind it into the transport namespace if applicable. The > -local address portion of the XtransConnInfo structure will also be filled > -in by this function. > - </para> > - </listitem> > - <listitem> > - <funcsynopsis id='OpenCLTSServer'> > - <funcprototype> > - <funcdef>XtransConnInfo > *<function>OpenCLTSServer</function></funcdef> > - <paramdef>struct _Xtransport > *<parameter>thistrans</parameter></paramdef> > - <paramdef>const char *<parameter>protocol</parameter></paramdef> > - <paramdef>const char *<parameter>host</parameter></paramdef> > - <paramdef>const char *<parameter>port</parameter></paramdef> > - </funcprototype> > - </funcsynopsis> > - <para> > -This function creates a Connection-Less Transport. The parameter > -<parameter>thistrans</parameter> points to an Xtransport entry in the > -transport table. The parameters <parameter>protocol</parameter>, > -<parameter>host</parameter>, and <parameter>port</parameter> point to strings > -containing the corresponding parts of the address that was passed into > -<link > linkend='TRANSOpenCLTSServer'><function>TRANS(OpenCLTSServer)()</function></link>. > -This function must allocate and initialize the contents of the > -XtransConnInfo structure that is returned by this function. This > -function will open the transport. > </para> > </listitem> > <listitem> > > -- > Matthieu Herrb > -- Matthieu Herrb
