-diff -ruN xc.old/IPv6-README xc/IPv6-README
---- xc.old/IPv6-README Thu Jan 1 01:00:00 1970
-+++ xc/IPv6-README Wed Feb 24 14:33:54 1999
-@@ -0,0 +1,88 @@
-+This patch is fot the INRIA Net/FreeBSD IPv6 code
-+It can also work on KAME IPv6 code. For support see at the end
-+
-+1/ This patch is based on the distribution XFree86 Release 3.3.3 patch 1
-+ It also works on the xsrc distribution provided with NetBSD 1.3.3
-+
-+2/ This patch contains a xc/config/cf/host.def file which sets the compile
-+ option -pipe and suppress the build of the fonts.
-+
-+3/ For FreeBSD3.0, if you use elf format (the default), you should add the
-+ generation of the shared libraries in aout format (legacy format)
-+ To do this, add in the file xc/config/cf/host.def the line:
-+#define BuildAoutLibraries YES
-+
-+4/ In the NetBSD 1.3.3 case some -orig files do not match with the distribution,
-+ but the IPv6 patch compiles and works.
-+
-+==== INSTALL ===
-+To apply the patch on FreeBSD:
-+- Install XFree86 from binary distribution
-+- Get the distributed source archive source/X333src-1.tgz on a XFree86-3.3.3
-+ or XFree86-3.3.3.1 ftp repository
-+ BEWARE: the source distribution is at level 3.3.3, NOT 3.3.3.1
-+- Get the upgrade patch(es) 3.3.3->3.3.3.1 on a XFree86-3.3.3.1 repository
-+ (It should be the file fixes/3.3.3-3.3.3.1.diff.gz) and apply it
-+ (in the source directory containing the xc dir, using:
-+ cd ..../xc/..
-+ patch -p -E < 3.3.3-3.3.3.1.diff
-+ )
-+- Go in the source directory containing the xc dir, expand the IPv6 patch, and
-+ install it by renaming the XX-new files, replacing the original XX file.
-+ cd ..../xc/..
-+ tar zxf X11-990111.tgz
-+ find . -type f -name '*-new' -exec csh -c \
-+ 'set f={}; set f=$f:s/-new//; cp -p ${f}-new $f' \;
-+- Update the xc/config/cf/host.def for aout libraries if needed
-+- make the X11 world and install it
-+ BEWARE : the installation will overrides the installed X server.
-+ Before the install, note the name of the installed X server
-+ (ls -l /usr/X11R6/bin/X) and restore the correct link after the
-+ installation.
-+
-+To apply the patch on NetBSD:
-+- Install X11 from binary distribution
-+- Get the distributed source/sets/xsrc.tgz on a ftp NetBSD repository
-+- Go in the source directory containing the xc dir, expand the IPv6 patch, and
-+ install it by renaming the XX-new files, replacing the original XX file.
-+ cd ..../xc/..
-+ tar zxf X11-990111.tgz
-+ find . -type f -name '*-new' -exec csh -c \
-+ 'set f={}; set f=$f:s/-new//; cp -p ${f}-new $f' \;
-+- Update the xc/config/cf/host.def if needed (e.g. for building fonts)
-+- make the X11 world and install it
-+ BEWARE : the installation may overrides the installed X server.
-+ Before the install, note the name of the installed X server
-+ (ls -l /usr/X11R6/bin/X) and restore the correct link after the
-+ installation.
-+
-+=========
-+KAME support : You need to add -linet6 to library list; For example, add
-+the following lines at the end of the xc/config/cf/host.def file:
-+
-+*** ../src.Free//xc/config/cf/host.def Wed Feb 24 14:29:40 1999
-+--- xc/config/cf/host.def Wed Feb 24 14:28:07 1999
-+***************
-+*** 44,46 ****
-+--- 44,64 ----
-+ # endif
-+ # endif
-+ #endif
-++
-++ /*
-++ * Set KAME library - copied form *BSD.cf, and modified
-++ */
-++ #ifdef AfterVendorCF
-++ # ifdef FreeBSDArchitecture
-++ /* support for multi-byte locales is in libxpg4 rather than libc */
-++ #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
-++ #undef ExtraLibraries
-++ #define ExtraLibraries -lxpg4 -L/usr/local/v6/lib -linet6
-++ #else
-++ #define ExtraLibraries -L/usr/local/v6/lib -linet6
-++ #endif
-++ # endif
-++ # ifdef NetBSDArchitecture
-++ #define ExtraLibraries -L/usr/local/v6/lib -linet6
-++ # endif
-++ #endif
-diff -ruN xc.old/config/cf/host.def xc/config/cf/host.def
---- xc.old/config/cf/host.def Thu Jan 1 01:00:00 1970
-+++ xc/config/cf/host.def Tue Apr 14 15:50:10 1998
-@@ -0,0 +1,28 @@
-+/*
-+ * Do not build fonts: use the binary distrib
-+ */
-+#define BuildFonts NO
-+
-+/*
-+ * Don't build PC98 servers
-+ */
-+#define BuildPC98Servers NO
-+
-+/*
-+ * Set -pipe for XFree86 for NetBSD 1.3 on i386
-+ */
-+#ifdef i386Architecture
-+# define DefaultGcc2i386Opt -O2 -fno-strength-reduce -pipe
-+#endif
-+
-+/*
-+ * Set -pipe for NetBSD 1.3 on sparc
-+ */
-+#ifdef NetBSDArchitecture
-+# ifdef SparcArchitecture
-+# ifdef AfterVendorCF
-+# undef OptimizedCDebugFlags
-+# define OptimizedCDebugFlags -O2 -pipe
-+# endif
-+# endif
-+#endif
-diff -ruN xc.old/lib/SM/sm_genid.c xc/lib/SM/sm_genid.c
---- xc.old/lib/SM/sm_genid.c Sun Oct 4 16:36:38 1998
-+++ xc/lib/SM/sm_genid.c Fri Jan 8 19:37:33 1999
+--- XFree86-3.3.3.1/xc/lib/SM/sm_genid.c.ipv6 Sun Oct 4 16:36:38 1998
++++ XFree86-3.3.3.1/xc/lib/SM/sm_genid.c Thu Jun 24 12:39:44 1999
@@ -64,6 +64,7 @@
#define XOS_USE_NO_LOCKING
#define X_INCLUDE_NETDB_H
inet_addr = inet_ntoa (*(struct in_addr *)(hostp->h_addr));
else
return NULL;
-diff -ruN xc.old/lib/X11/ConnDis.c xc/lib/X11/ConnDis.c
---- xc.old/lib/X11/ConnDis.c Sat Jan 18 07:51:49 1997
-+++ xc/lib/X11/ConnDis.c Tue Mar 17 15:52:29 1998
+--- XFree86-3.3.3.1/xc/lib/X11/ConnDis.c.ipv6 Sat Jan 18 07:51:49 1997
++++ XFree86-3.3.3.1/xc/lib/X11/ConnDis.c Thu Jun 24 12:39:45 1999
@@ -163,7 +163,9 @@
if (!lastc) return NULL; /* must have a colon */
xdmcp_data[j++] = ((char *)addr)[i];
break;
}
-diff -ruN xc.old/lib/X11/Imakefile xc/lib/X11/Imakefile
---- xc.old/lib/X11/Imakefile Fri Nov 6 17:32:30 1998
-+++ xc/lib/X11/Imakefile Fri Jan 8 19:46:58 1999
+--- XFree86-3.3.3.1/xc/lib/X11/Imakefile.ipv6 Fri Nov 6 17:32:30 1998
++++ XFree86-3.3.3.1/xc/lib/X11/Imakefile Thu Jun 24 12:39:46 1999
@@ -947,6 +947,7 @@
InstallLintLibrary(X11,$(LINTLIBDIR))
LinkSourceFile(AuDispose.c,$(XAUTHSRC))
LinkSourceFile(AuGetBest.c,$(XAUTHSRC))
LinkSourceFile(AuFileName.c,$(XAUTHSRC))
-diff -ruN xc.old/lib/Xau/AuGetBest.c xc/lib/Xau/AuGetBest.c
---- xc.old/lib/Xau/AuGetBest.c Sun Dec 22 04:20:12 1996
-+++ xc/lib/Xau/AuGetBest.c Fri Mar 27 16:12:54 1998
+--- XFree86-3.3.3.1/xc/lib/Xau/AuGetBest.c.ipv6 Sun Dec 22 04:20:12 1996
++++ XFree86-3.3.3.1/xc/lib/Xau/AuGetBest.c Thu Jun 24 12:39:46 1999
@@ -49,6 +49,32 @@
return 1;
}
#ifdef hpux
|| (family == FamilyLocal &&
fully_qual_address_length == entry->address_length &&
-diff -ruN xc.old/lib/Xau/Imakefile xc/lib/Xau/Imakefile
---- xc.old/lib/Xau/Imakefile Fri Nov 6 17:32:44 1998
-+++ xc/lib/Xau/Imakefile Fri Jan 8 19:44:33 1999
+--- XFree86-3.3.3.1/xc/lib/Xau/Imakefile.ipv6 Fri Nov 6 17:32:44 1998
++++ XFree86-3.3.3.1/xc/lib/Xau/Imakefile Thu Jun 24 12:39:46 1999
@@ -23,6 +23,9 @@
INCLUDES =
#endif
InstallLinkKitLibrary(Xau,$(LINKKITDIR)/lib)
-diff -ruN xc.old/lib/Xmu/CvtStdSel.c xc/lib/Xmu/CvtStdSel.c
---- xc.old/lib/Xmu/CvtStdSel.c Sat Jan 18 07:52:13 1997
-+++ xc/lib/Xmu/CvtStdSel.c Mon Jul 7 22:19:34 1997
+--- XFree86-3.3.3.1/xc/lib/Xmu/CvtStdSel.c.ipv6 Sat Jan 18 07:52:13 1997
++++ XFree86-3.3.3.1/xc/lib/Xmu/CvtStdSel.c Thu Jun 24 12:39:47 1999
@@ -225,7 +225,9 @@
if ((hostp = _XGethostbyname (hostname,hparams)) == NULL)
return False;
*length = hostp->h_length;
*value = XtMalloc(*length);
(void) memmove (*value, hostp->h_addr, *length);
-diff -ruN xc.old/lib/xtrans/Xtrans.c xc/lib/xtrans/Xtrans.c
---- xc.old/lib/xtrans/Xtrans.c Sun Dec 13 18:12:01 1998
-+++ xc/lib/xtrans/Xtrans.c Fri Jan 8 21:05:29 1999
+--- XFree86-3.3.3.1/xc/lib/xtrans/Xtrans.c.ipv6 Thu Jun 24 12:39:35 1999
++++ XFree86-3.3.3.1/xc/lib/xtrans/Xtrans.c Thu Jun 24 12:39:47 1999
@@ -218,7 +218,9 @@
*
* If the protocol part is missing, then assume INET.
{
*protocol = NULL;
*host = NULL;
-diff -ruN xc.old/lib/xtrans/Xtranssock.c xc/lib/xtrans/Xtranssock.c
---- xc.old/lib/xtrans/Xtranssock.c Fri Dec 18 15:56:11 1998
-+++ xc/lib/xtrans/Xtranssock.c Fri Jan 8 21:06:42 1999
+--- XFree86-3.3.3.1/xc/lib/xtrans/Xtranssock.c.ipv6 Thu Jun 24 12:39:42 1999
++++ XFree86-3.3.3.1/xc/lib/xtrans/Xtranssock.c Thu Jun 24 12:39:47 1999
@@ -70,6 +70,7 @@
#define X_INCLUDE_NETDB_H
#define XOS_USE_NO_LOCKING
if ((status = TRANS(SocketCreateListener) (ciptr,
(struct sockaddr *) &sockname, namelen)) < 0)
-@@ -1089,7 +1095,7 @@
+@@ -1095,7 +1101,7 @@
{
XtransConnInfo newciptr;
int namelen = sizeof(sockname);
PRMSG (2, "SocketINETAccept(%x,%d)\n", ciptr, ciptr->fd, 0);
-@@ -1252,7 +1258,7 @@
+@@ -1258,7 +1264,7 @@
char *port;
{
#if defined(SVR4) || defined(SCO325)
size_t namelen = sizeof sockname;
#else
-@@ -1262,14 +1268,15 @@
+@@ -1268,14 +1274,15 @@
_Xgetservbynameparams sparams;
struct hostent *hostp;
struct servent *servp;
PRMSG (2,"SocketINETConnect(%d,%s,%s)\n", ciptr->fd, host, port);
-@@ -1305,67 +1312,44 @@
+@@ -1311,67 +1318,44 @@
*/
#ifdef BSD44SOCKETS
*/
/* Check for number in the port string */
-@@ -1378,16 +1362,16 @@
+@@ -1384,16 +1368,16 @@
portbuf, 0, 0);
return TRANS_CONNECT_FAILED;
}
/*
* Do the connect()
-@@ -1475,13 +1459,21 @@
+@@ -1481,13 +1465,21 @@
* by TRANS(GetHostname)), then the two hostnames are equivalent,
* and we know that 'host' is really a local host.
*/
scount = 0;
while (hostp->h_addr_list[scount] && scount <= 8)
-@@ -1491,17 +1483,14 @@
+@@ -1497,17 +1489,14 @@
* from the 1st call, so we must save the address list.
*/
return (0);
equiv = 0;
-@@ -1513,14 +1502,9 @@
+@@ -1519,14 +1508,9 @@
while (hostp->h_addr_list[j])
{
{
/* They're equal, so we're done */
-diff -ruN xc.old/lib/xtrans/Xtransutil.c xc/lib/xtrans/Xtransutil.c
---- xc.old/lib/xtrans/Xtransutil.c Mon Dec 23 07:04:18 1996
-+++ xc/lib/xtrans/Xtransutil.c Tue Jul 8 02:11:26 1997
+--- XFree86-3.3.3.1/xc/lib/xtrans/Xtransutil.c.ipv6 Thu Jun 24 12:39:42 1999
++++ XFree86-3.3.3.1/xc/lib/xtrans/Xtransutil.c Thu Jun 24 12:39:47 1999
@@ -84,7 +84,7 @@
/*
* TRANS(ConvertAddress) converts a sockaddr based address to an
break;
}
-diff -ruN xc.old/programs/Xserver/os/access.c xc/programs/Xserver/os/access.c
---- xc.old/programs/Xserver/os/access.c Tue Dec 22 15:23:30 1998
-+++ xc/programs/Xserver/os/access.c Fri Jan 8 21:08:44 1999
+--- XFree86-3.3.3.1/xc/programs/Xserver/os/access.c.ipv6 Thu Jun 24 12:39:34 1999
++++ XFree86-3.3.3.1/xc/programs/Xserver/os/access.c Thu Jun 24 12:39:47 1999
@@ -163,6 +163,7 @@
#else
#if !defined(AMOEBA) && !defined(MINIX)
return FamilyInternet;
#endif
#ifdef DNETCONN
-diff -ruN xc.old/programs/Xserver/os/connection.c xc/programs/Xserver/os/connection.c
---- xc.old/programs/Xserver/os/connection.c Fri Dec 18 15:56:32 1998
-+++ xc/programs/Xserver/os/connection.c Fri Jan 8 21:09:37 1999
+--- XFree86-3.3.3.1/xc/programs/Xserver/os/connection.c.ipv6 Thu Jun 24 12:39:34 1999
++++ XFree86-3.3.3.1/xc/programs/Xserver/os/connection.c Thu Jun 24 12:39:47 1999
@@ -477,6 +477,7 @@
int auth_id;
{
break;
#endif
#ifdef DNETCONN
-diff -ruN xc.old/programs/Xserver/os/k5auth.c xc/programs/Xserver/os/k5auth.c
---- xc.old/programs/Xserver/os/k5auth.c Fri May 10 09:02:15 1996
-+++ xc/programs/Xserver/os/k5auth.c Mon Jul 7 23:00:58 1997
+--- XFree86-3.3.3.1/xc/programs/Xserver/os/k5auth.c.ipv6 Fri May 10 09:02:15 1996
++++ XFree86-3.3.3.1/xc/programs/Xserver/os/k5auth.c Thu Jun 24 12:39:47 1999
@@ -277,7 +277,7 @@
long addrlen;
krb5_error_code retval, retval2;
return(SendConnSetup(client, kerror));
}
}
-diff -ruN xc.old/programs/Xserver/os/utils.c xc/programs/Xserver/os/utils.c
---- xc.old/programs/Xserver/os/utils.c Sun Dec 27 06:01:20 1998
-+++ xc/programs/Xserver/os/utils.c Fri Jan 8 21:10:38 1999
+--- XFree86-3.3.3.1/xc/programs/Xserver/os/utils.c.ipv6 Thu Jun 24 12:39:34 1999
++++ XFree86-3.3.3.1/xc/programs/Xserver/os/utils.c Thu Jun 24 12:39:47 1999
@@ -1112,7 +1112,9 @@
#if defined(TCPCONN) || defined(STREAMSCONN)
gethostname(hname, 1024);
host = gethostbyname(hname);
-diff -ruN xc.old/programs/Xserver/os/xdmcp.c xc/programs/Xserver/os/xdmcp.c
---- xc.old/programs/Xserver/os/xdmcp.c Fri Dec 18 15:56:34 1998
-+++ xc/programs/Xserver/os/xdmcp.c Fri Jan 8 21:11:28 1999
+--- XFree86-3.3.3.1/xc/programs/Xserver/os/xdmcp.c.ipv6 Thu Jun 24 12:39:34 1999
++++ XFree86-3.3.3.1/xc/programs/Xserver/os/xdmcp.c Thu Jun 24 12:39:47 1999
@@ -38,6 +38,8 @@
#endif
#include <netinet/in.h>
}
else
{
-diff -ruN xc.old/programs/lbxproxy/os/connection.c xc/programs/lbxproxy/os/connection.c
---- xc.old/programs/lbxproxy/os/connection.c Thu Nov 5 20:27:57 1998
-+++ xc/programs/lbxproxy/os/connection.c Fri Jan 8 19:56:54 1999
+--- XFree86-3.3.3.1/xc/programs/lbxproxy/os/connection.c.ipv6 Thu Jun 24 12:39:42 1999
++++ XFree86-3.3.3.1/xc/programs/lbxproxy/os/connection.c Thu Jun 24 12:39:47 1999
@@ -231,7 +231,7 @@
int retry; /* boolean - retry if addr busy */
retryCount = retry ? 19 : 0;
-@@ -1730,7 +1731,7 @@
+@@ -1776,7 +1777,7 @@
struct sockaddr_un un;
#endif /* UNIXCONN */
#ifdef TCPCONN
#endif /* TCPCONN */
#ifdef DNETCONN
struct sockaddr_dn dn;
-@@ -1755,7 +1756,9 @@
+@@ -1801,7 +1802,9 @@
fromlen = sizeof (from);
if (!getpeername (newconn, &from.sa, &fromlen))
{
{
int mi = 1;
setsockopt (newconn, IPPROTO_TCP, TCP_NODELAY,
-diff -ruN xc.old/programs/xauth/gethost.c xc/programs/xauth/gethost.c
---- xc.old/programs/xauth/gethost.c Sun Sep 13 15:15:53 1998
-+++ xc/programs/xauth/gethost.c Fri Jan 8 19:58:51 1999
+--- XFree86-3.3.3.1/xc/programs/xauth/gethost.c.ipv6 Sun Sep 13 15:15:53 1998
++++ XFree86-3.3.3.1/xc/programs/xauth/gethost.c Thu Jun 24 12:39:47 1999
@@ -144,15 +144,21 @@
alarm (4);
if (setjmp(env) == 0) {
break;
#else
return NULL;
-diff -ruN xc.old/programs/xauth/parsedpy.c xc/programs/xauth/parsedpy.c
---- xc.old/programs/xauth/parsedpy.c Mon Feb 16 01:43:19 1998
-+++ xc/programs/xauth/parsedpy.c Thu Apr 2 17:24:14 1998
+--- XFree86-3.3.3.1/xc/programs/xauth/parsedpy.c.ipv6 Mon Feb 16 01:43:19 1998
++++ XFree86-3.3.3.1/xc/programs/xauth/parsedpy.c Thu Jun 24 12:39:47 1999
@@ -115,12 +115,18 @@
if (!displayname || !displayname[0]) return False;
/*
-diff -ruN xc.old/programs/xauth/xauth.c xc/programs/xauth/xauth.c
---- xc.old/programs/xauth/xauth.c Wed Apr 27 09:19:54 1994
-+++ xc/programs/xauth/xauth.c Mon Jul 7 23:10:46 1997
+--- XFree86-3.3.3.1/xc/programs/xauth/xauth.c.ipv6 Wed Apr 27 09:19:54 1994
++++ XFree86-3.3.3.1/xc/programs/xauth/xauth.c Thu Jun 24 12:39:47 1999
@@ -32,6 +32,8 @@
#include "xauth.h"
for (i = 1; i < argc; i++) {
char *arg = argv[i];
-diff -ruN xc.old/programs/xdm/access.c xc/programs/xdm/access.c
---- xc.old/programs/xdm/access.c Sat Jan 18 08:02:17 1997
-+++ xc/programs/xdm/access.c Mon Jul 7 23:12:04 1997
+--- XFree86-3.3.3.1/xc/programs/xdm/access.c.ipv6 Sat Jan 18 08:02:17 1997
++++ XFree86-3.3.3.1/xc/programs/xdm/access.c Thu Jun 24 12:39:47 1999
@@ -379,6 +379,11 @@
display->connectionType = FamilyInternet;
break;
#ifdef AF_DECnet
case AF_DECnet:
display->connectionType = FamilyDECnet;
-diff -ruN xc.old/programs/xdm/auth.c xc/programs/xdm/auth.c
---- xc.old/programs/xdm/auth.c Tue Dec 22 15:23:31 1998
-+++ xc/programs/xdm/auth.c Fri Jan 8 21:12:32 1999
+--- XFree86-3.3.3.1/xc/programs/xdm/auth.c.ipv6 Thu Jun 24 12:39:34 1999
++++ XFree86-3.3.3.1/xc/programs/xdm/auth.c Thu Jun 24 12:39:47 1999
@@ -86,8 +86,8 @@
# endif /* ESIX */
#endif /* i386 */
if (family != FamilyLocal)
{
Debug ("writeRemoteAuth: %d, %d, %x\n",
-diff -ruN xc.old/programs/xdm/choose.c xc/programs/xdm/choose.c
---- xc.old/programs/xdm/choose.c Sat Jan 18 08:02:19 1997
-+++ xc/programs/xdm/choose.c Mon Jul 7 23:13:47 1997
+--- XFree86-3.3.3.1/xc/programs/xdm/choose.c.ipv6 Sat Jan 18 08:02:19 1997
++++ XFree86-3.3.3.1/xc/programs/xdm/choose.c Thu Jun 24 12:39:47 1999
@@ -232,6 +232,22 @@
result_len = 8;
}
#ifdef AF_DECnet
case AF_DECnet:
break;
-diff -ruN xc.old/programs/xdm/chooser.c xc/programs/xdm/chooser.c
---- xc.old/programs/xdm/chooser.c Tue Dec 22 15:23:31 1998
-+++ xc/programs/xdm/chooser.c Fri Jan 8 21:13:28 1999
+--- XFree86-3.3.3.1/xc/programs/xdm/chooser.c.ipv6 Thu Jun 24 12:39:34 1999
++++ XFree86-3.3.3.1/xc/programs/xdm/chooser.c Thu Jun 24 12:39:47 1999
@@ -88,6 +88,7 @@
#endif
#include <netinet/in.h>
toplevel = XtInitialize (argv[0], "Chooser", options, XtNumber(options), &argc, argv);
-diff -ruN xc.old/programs/xdm/dm.c xc/programs/xdm/dm.c
---- xc.old/programs/xdm/dm.c Sat Oct 31 21:17:43 1998
-+++ xc/programs/xdm/dm.c Fri Jan 8 20:04:21 1999
+--- XFree86-3.3.3.1/xc/programs/xdm/dm.c.ipv6 Sat Oct 31 21:17:43 1998
++++ XFree86-3.3.3.1/xc/programs/xdm/dm.c Thu Jun 24 12:39:47 1999
@@ -79,6 +79,8 @@
extern int errno;
#endif
/*
* Step 1 - load configuration parameters
-diff -ruN xc.old/programs/xdm/netaddr.c xc/programs/xdm/netaddr.c
---- xc.old/programs/xdm/netaddr.c Sat Jan 18 08:02:21 1997
-+++ xc/programs/xdm/netaddr.c Mon Jul 7 23:15:59 1997
+--- XFree86-3.3.3.1/xc/programs/xdm/netaddr.c.ipv6 Sat Jan 18 08:02:21 1997
++++ XFree86-3.3.3.1/xc/programs/xdm/netaddr.c Thu Jun 24 12:39:47 1999
@@ -65,7 +65,7 @@
#endif
break;
}
#endif
-diff -ruN xc.old/programs/xdm/socket.c xc/programs/xdm/socket.c
---- xc.old/programs/xdm/socket.c Sat Jan 18 08:02:24 1997
-+++ xc/programs/xdm/socket.c Mon Jul 7 23:16:50 1997
+--- XFree86-3.3.3.1/xc/programs/xdm/socket.c.ipv6 Sat Jan 18 08:02:24 1997
++++ XFree86-3.3.3.1/xc/programs/xdm/socket.c Thu Jun 24 12:39:47 1999
@@ -84,7 +84,7 @@
CreateWellKnownSockets ()
{
int len;
len = sizeof in_addr;
-diff -ruN xc.old/programs/xdm/xdmcp.c xc/programs/xdm/xdmcp.c
---- xc.old/programs/xdm/xdmcp.c Sun Feb 1 22:44:04 1998
-+++ xc/programs/xdm/xdmcp.c Thu Apr 2 17:10:26 1998
+--- XFree86-3.3.3.1/xc/programs/xdm/xdmcp.c.ipv6 Sun Feb 1 22:44:04 1998
++++ XFree86-3.3.3.1/xc/programs/xdm/xdmcp.c Thu Jun 24 12:39:47 1999
@@ -66,6 +66,8 @@
#include <net/gen/netdb.h>
#endif /* !MINIX */
/* can't get name, so use emergency fallback */
sprintf(dotted, "%d.%d.%d.%d",
connectionAddress->data[0],
-diff -ruN xc.old/programs/xfs/difs/main.c xc/programs/xfs/difs/main.c
---- xc.old/programs/xfs/difs/main.c Thu Nov 5 20:28:29 1998
-+++ xc/programs/xfs/difs/main.c Fri Jan 8 20:08:42 1999
-@@ -59,6 +59,10 @@
- #include "cache.h"
+--- XFree86-3.3.3.1/xc/programs/xfs/difs/main.c.ipv6 Thu Jun 24 12:39:41 1999
++++ XFree86-3.3.3.1/xc/programs/xfs/difs/main.c Thu Jun 24 12:39:47 1999
+@@ -60,6 +60,10 @@
#include "site.h"
+ #include <unistd.h>
+#include <sys/types.h>
+#include <netinet/in.h>
char *ConnectionInfo;
int ConnInfoLen;
-@@ -93,6 +97,10 @@
+@@ -94,6 +98,10 @@
argcGlobal = argc;
argvGlobal = argv;
configfilename = DEFAULT_CONFIG_FILE;
-diff -ruN xc.old/programs/xfs/os/access.c xc/programs/xfs/os/access.c
---- xc.old/programs/xfs/os/access.c Sat Jan 18 08:02:45 1997
-+++ xc/programs/xfs/os/access.c Mon Jul 7 23:26:42 1997
+--- XFree86-3.3.3.1/xc/programs/xfs/os/access.c.ipv6 Sat Jan 18 08:02:45 1997
++++ XFree86-3.3.3.1/xc/programs/xfs/os/access.c Thu Jun 24 12:39:47 1999
@@ -93,7 +93,7 @@
char hname[64];
struct hostent *hp;
addr->address = (pointer) fsalloc(addr->addr_len);
if (!addr->address)
return FSBadAlloc;
-diff -ruN xc.old/programs/xfwp/xfwp.c xc/programs/xfwp/xfwp.c
---- xc.old/programs/xfwp/xfwp.c Fri Jan 23 00:53:25 1998
-+++ xc/programs/xfwp/xfwp.c Thu Apr 2 17:17:41 1998
+--- XFree86-3.3.3.1/xc/programs/xfwp/xfwp.c.ipv6 Fri Jan 23 00:53:25 1998
++++ XFree86-3.3.3.1/xc/programs/xfwp/xfwp.c Thu Jun 24 14:22:13 1999
@@ -57,6 +57,7 @@
#endif
#include <sys/wait.h>
{
#ifdef DEBUG
fprintf(stderr,"doRemClientSetup: socket() call failed!");
-@@ -599,8 +604,11 @@
+@@ -599,8 +604,10 @@
/*
// set up the rest of the remote client listener
*/
- rem_sockaddr_in.sin_family = AF_INET;
+ bzero((char * ) &rem_sockaddr_in6, sizeof(rem_sockaddr_in6));
+ rem_sockaddr_in6.sin6_family = AF_INET6;
-+ rem_sockaddr_in6.sin6_len = sizeof(rem_sockaddr_in6);
+ rem_sockaddr_in6.sin6_flowinfo = 0;
+ rem_sockaddr_in6.sin6_addr = in6addr_any;
if (setsockopt(server_array[this_server]->client_listen_fd,
SOL_SOCKET, SO_REUSEADDR,
&one, sizeof(one)) < 0)
-@@ -617,10 +625,10 @@
+@@ -617,10 +624,10 @@
}
while (True) {
break;
if (errno != EADDRINUSE)
{
-@@ -1003,7 +1011,7 @@
+@@ -1003,7 +1010,7 @@
int server_reason_len;
int conn_auth_namelen, conn_auth_datalen;
char throw_away[RWBUFFER_SIZE];
enum CONFIG_CHECK server_status;
xConnClientPrefix client;
xConnSetupPrefix prefix;
-@@ -1039,10 +1047,10 @@
+@@ -1039,10 +1046,10 @@
int check_sock_fd;
struct timeval time_val;
struct timezone time_zone;
/*
// start by accepting the connection if you can, use pm_listen_array
// index to index into ICE listen_object list (this is because the
-@@ -1061,17 +1069,17 @@
+@@ -1061,17 +1068,17 @@
// connection; start by using getpeername() to get endpoint info
*/
retval = getpeername(temp_sock_fd,
config_info,
PMGR,
&log_data)) == FAILURE)
-@@ -1302,17 +1310,18 @@
+@@ -1302,17 +1309,18 @@
// configuration, if connection allowed, allocate
// the read/write buffer for this connection;
*/
&temp_sock_len)) < 0)
{
/*
-@@ -1336,7 +1345,7 @@
+@@ -1336,7 +1344,7 @@
if ((server_status =
doServerConnectSetup(server_array[listen_counter]->x_server_hostport,
&server_array[listen_counter]->server_fd,
{
#ifdef DEBUG
fprintf(stderr,
-@@ -1346,7 +1355,7 @@
+@@ -1346,7 +1354,7 @@
}
if ((server_status =
doServerConnect(&server_array[listen_counter]->server_fd,
{
#ifdef DEBUG
fprintf(stderr,
-@@ -1355,15 +1364,18 @@
+@@ -1355,15 +1363,18 @@
return;
}
/*
log_data.config_rule_num = -1;
/*
// do config check on client source and destination (must do
-@@ -1371,8 +1383,8 @@
+@@ -1371,8 +1382,8 @@
// to query and we may not be able to resolve server name
// alone from xfindproxy()
*/
config_info,
CLIENT,
&log_data)) == FAILURE)
-@@ -1454,13 +1466,13 @@
+@@ -1454,13 +1465,13 @@
// server security extension or other loggable events)
*/
client_conn_array[temp_sock_fd]->source =
/*
// allocate a buffer for the X server connection
// and create the association between client and server
-@@ -1959,7 +1971,7 @@
+@@ -1959,7 +1970,7 @@
fprintf(stderr, "Server replied AUTHENTICATE!\n");
#endif
/*
*/
log_data.source =
Malloc(strlen
-@@ -2030,13 +2042,22 @@
+@@ -2030,13 +2041,22 @@
}/* end if client_conn_array != NULL */
}
/*
// look through the config file parse tree for a source IP address
// that matches this request
-@@ -2045,12 +2066,13 @@
+@@ -2045,12 +2065,13 @@
{
if (config_info->config_file_data[line_counter] != NULL)
{
// config file specifies "permit" or "deny" for this host
*/
if (!strcmp(config_info->config_file_data[line_counter]->permit_deny,
-@@ -2065,9 +2087,10 @@
+@@ -2065,9 +2086,10 @@
/*
// compute destination info restrictions
*/
{
/*
// you got a match on the destination, so look at
-@@ -2171,9 +2194,10 @@
+@@ -2171,9 +2193,10 @@
/*
// compute destination info restrictions
*/
{
/*
// you got a match on the destination, so look at
-@@ -2292,7 +2316,7 @@
+@@ -2292,7 +2315,7 @@
if (config_info->config_file_path == NULL)
{
if (printConfigVerify)
/*
// there's no rule match to save
*/
-@@ -2301,7 +2325,7 @@
+@@ -2301,7 +2324,7 @@
}
if (printConfigVerify)
/*
// not in this case either
*/
-@@ -2395,8 +2419,8 @@
+@@ -2395,8 +2418,8 @@
pmGetProxyAddrReplyMsg * pReply;
char * pReplyData;
struct hostent * hostptr;
char * server_name_base;
int config_check;
char * config_failure = "unrecognized server or permission denied";
-@@ -2497,9 +2521,9 @@
+@@ -2497,9 +2520,9 @@
#endif
goto sendFailure;
}
hostptr->h_addr,
hostptr->h_length);
-@@ -2509,11 +2533,11 @@
+@@ -2509,11 +2532,11 @@
// NOTE: source configuration will always match (see XFWP man
// page) unless sysadmin explicitly chooses to deny
*/
global_data.config_info,
FINDPROXY,
&log_data)) == FAILURE)
-@@ -2759,7 +2783,7 @@
+@@ -2759,7 +2782,7 @@
int doServerConnectSetup(char * x_server_hostport,
int * server_connect_fd,
{
struct hostent * hostptr;
char * server_name_base;
-@@ -2796,7 +2820,7 @@
+@@ -2796,7 +2819,7 @@
#endif
return;
}
{
#ifdef DEBUG
fprintf(stderr,
-@@ -2805,20 +2829,21 @@
+@@ -2805,20 +2828,20 @@
#endif
return FAILURE;
}
- memcpy((char *) &server_sockaddr_in->sin_addr,
+ memset(server_sockaddr_in6, 0, sizeof(*server_sockaddr_in6));
+ server_sockaddr_in6->sin6_family = hostptr->h_addrtype;
-+ server_sockaddr_in6->sin6_len = sizeof(*server_sockaddr_in6);
+ memcpy((char *) &server_sockaddr_in6->sin6_addr,
hostptr->h_addr,
hostptr->h_length);
{
#ifdef DEBUG
fprintf(stderr,
-@@ -3122,13 +3147,13 @@
+@@ -3122,13 +3145,13 @@
config_lineP->permit_deny = NULL;
config_lineP->source_hostname = NULL;
config_lineP->operator = NULL;
config_lineP->service = NULL;
-@@ -3200,7 +3225,7 @@
+@@ -3200,7 +3223,7 @@
{
char token[64];
strcpy(token, result);
{
if ((config_file_data[line_number]->source_hostname =
(char *) malloc (strlen(result) + 1)) == NULL)
-@@ -3219,22 +3244,24 @@
+@@ -3219,22 +3242,24 @@
/*
// generate network address format
*/
(char *) malloc (strlen(result) + 1)) == NULL)
{
#ifdef DEBUG
-@@ -3242,14 +3269,18 @@
+@@ -3242,14 +3267,18 @@
#endif
return 0;
}
} else
bad_token = 1;
}
-@@ -3260,7 +3291,7 @@
+@@ -3260,7 +3289,7 @@
{
char token[64];
strcpy(token, result);
{
if ((config_file_data[line_number]->dest_hostname =
(char *) malloc (strlen(result) + 1)) == NULL)
-@@ -3276,21 +3307,23 @@
+@@ -3276,21 +3305,23 @@
"fourth token = %s\n",
config_file_data[line_number]->dest_hostname);
#endif
(char *) malloc (strlen(result) + 1)) == NULL)
{
#ifdef DEBUG
-@@ -3298,14 +3331,18 @@
+@@ -3298,14 +3329,18 @@
#endif
return 0;
}
} else
bad_token = 1;
}
-@@ -3377,9 +3414,9 @@
+@@ -3377,9 +3412,9 @@
((config_file_data[line_number]->permit_deny != NULL) &&
(config_file_data[line_number]->source_hostname == NULL)) ||
((config_file_data[line_number]->source_hostname != NULL) &&
((config_file_data[line_number]->operator != NULL) &&
(config_file_data[line_number]->service == NULL)))
return 1;
-@@ -3388,27 +3425,23 @@
+@@ -3388,27 +3423,23 @@
return 0;
}
}
void BadSyntax(char *msg, int line)
-@@ -3483,8 +3516,8 @@
+@@ -3483,8 +3514,8 @@
struct config_line *ruleP = config_info->config_file_data[line_counter];
fprintf(stderr,"matched: %s %s %s %s %s %s %s\n",
ruleP->permit_deny,
ruleP->operator,
ruleP->service);
}
-diff -ruN xc.old/programs/xfwp/xfwp.h xc/programs/xfwp/xfwp.h
---- xc.old/programs/xfwp/xfwp.h Wed Jun 11 14:09:00 1997
-+++ xc/programs/xfwp/xfwp.h Wed Sep 3 22:53:27 1997
+--- XFree86-3.3.3.1/xc/programs/xfwp/xfwp.h.ipv6 Wed Jun 11 14:09:00 1997
++++ XFree86-3.3.3.1/xc/programs/xfwp/xfwp.h Thu Jun 24 12:39:47 1999
@@ -61,7 +61,7 @@
/* allocate ADD_LINES entries at a time when loading the configuration */
#define ADD_LINES 20
void doInstallIOErrorHandler();
-diff -ruN xc.old/programs/xfwp/xfwp.man xc/programs/xfwp/xfwp.man
---- xc.old/programs/xfwp/xfwp.man Tue Dec 24 11:04:47 1996
-+++ xc/programs/xfwp/xfwp.man Tue Jul 8 00:05:40 1997
+--- XFree86-3.3.3.1/xc/programs/xfwp/xfwp.man.ipv6 Tue Dec 24 11:04:47 1996
++++ XFree86-3.3.3.1/xc/programs/xfwp/xfwp.man Thu Jun 24 12:39:47 1999
@@ -206,7 +206,7 @@
packet-filtering routers. It contains zero or more source-destination
rules of the following form:
.fi
\fP
.PP
-diff -ruN xc.old/programs/xhost/xhost.c xc/programs/xhost/xhost.c
---- xc.old/programs/xhost/xhost.c Sun Sep 13 15:15:59 1998
-+++ xc/programs/xhost/xhost.c Fri Jan 8 20:06:40 1999
+--- XFree86-3.3.3.1/xc/programs/xhost/xhost.c.ipv6 Sun Sep 13 15:15:59 1998
++++ XFree86-3.3.3.1/xc/programs/xhost/xhost.c Thu Jun 24 12:39:47 1999
@@ -75,6 +75,7 @@
#endif
#include <netdb.h>
projects / packages / XFree86.git / blobdiff