Author: rmh
Date: 2003-11-25 17:31:42 -0500 (Tue, 25 Nov 2003)
New Revision: 795
Added:
people/rmh/upstream/
people/rmh/upstream/config.diff
people/rmh/upstream/xdm.diff
people/rmh/upstream/xload.diff
people/rmh/upstream/xserver.diff
people/rmh/upstream/xterm.diff
Log:
people/rmh/upstream: Patches merged into upstream.
Added: people/rmh/upstream/config.diff
===================================================================
--- people/rmh/upstream/config.diff 2003-11-22 20:54:06 UTC (rev 794)
+++ people/rmh/upstream/config.diff 2003-11-25 22:31:42 UTC (rev 795)
@@ -0,0 +1,115 @@
+===================================================================
+RCS file: /xf86/anoncvs/cvs/xc/config/cf/Imake.cf,v
+retrieving revision 3.85
+retrieving revision 3.86
+diff -u -p -r3.85 -r3.86
+--- xc/config/cf/Imake.cf 2003/11/07 23:57:43 3.85
++++ xc/config/cf/Imake.cf 2003/11/24 02:02:26 3.86
+@@ -17,7 +17,7 @@ XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 1
+ *
+ * 4. Create a .cf file with the name given by MacroFile.
+ */
+-XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.84 2003/10/07 20:39:59 herrb Exp $
++XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.85 2003/11/07 23:57:43 dawes Exp $
+
+ #if defined(__APPLE__)
+ # undef __APPLE__
+@@ -177,6 +177,11 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
+ # endif /* __hppa__ */
+ #endif /* OpenBSD */
+
++/* Systems based on kernel of OpenBSD */
++#if defined(__OpenBSD__) || defined(__OpenBSD_kernel__)
++#define KOpenBSDArchitecture
++#endif
++
+ #ifdef __NetBSD__
+ # define MacroIncludeFile <NetBSD.cf>
+ # define MacroFile NetBSD.cf
+@@ -224,6 +229,11 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
+ # endif
+ #endif /* NetBSD */
+
++/* Systems based on kernel of NetBSD */
++#if defined(__NetBSD__) || defined(__NetBSD_kernel__)
++#define KNetBSDArchitecture
++#endif
++
+ #ifdef __FreeBSD__
+ # define MacroIncludeFile <FreeBSD.cf>
+ # define MacroFile FreeBSD.cf
+@@ -254,6 +264,11 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
+ # endif
+ #endif /* __FreeBSD__ */
+
++/* Systems based on kernel of FreeBSD */
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#define KFreeBSDArchitecture
++#endif
++
+ #ifdef AMOEBA
+ /* Should be before the 'sun' entry because we may be cross-compiling */
+ # define MacroIncludeFile <Amoeba.cf>
+@@ -962,10 +977,20 @@ XCOMM Keep cpp from replacing path eleme
+ #define i386Architecture
+ #endif /* minix */
+
+-#ifdef MACH
+-#ifdef __GNU__
++/* Systems with GNU libc and userland */
++#if defined(__GNU__) || defined(__GNU_KFreeBSD__) || \
++ defined(__GNU_KNetBSD__) || defined(__GNU_KOpenBSD__)
++#define GNUArchitecture
+ #define MacroIncludeFile <gnu.cf>
+ #define MacroFile gnu.cf
++#ifdef __i386__
++#define i386Architecture
++#endif
++#endif
++
++#ifdef MACH
++#ifdef __GNU__
++/* Mach-based GNU system */
+ #define GNUMachArchitecture
+ #else
+ #define MacroIncludeFile <mach.cf>
+===================================================================
+RCS file: /xf86/anoncvs/cvs/xc/config/cf/gnu.cf,v
+retrieving revision 1.11
+retrieving revision 1.12
+diff -u -p -r1.11 -r1.12
+--- xc/config/cf/gnu.cf 2001/02/28 18:58:49 1.11
++++ xc/config/cf/gnu.cf 2003/11/24 02:02:26 1.12
+@@ -1,4 +1,4 @@
+-XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.10 2000/11/30 23:29:55
dawes Exp $
++XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.11 2001/02/28 18:58:49
dawes Exp $
+
+ #ifndef OSName
+ #define OSName DefaultOSName
+@@ -26,12 +26,11 @@ XCOMM XXXMB: What about _GNU_SOURCE, see
+
+ #define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
+
+-XCOMM Enable this when we have pthreads.
+-XCOMM #define HasPosixThreads YES
+-XCOMM #define ThreadedX YES
+-XCOMM #define HasThreadSafeAPI YES
+-XCOMM #define ThreadsLibraries -lpthread
+-XCOMM #define SystemMTDefines -D_REENTRANT
++#define HasPosixThreads YES
++#define ThreadedX YES
++#define HasThreadSafeAPI YES
++#define ThreadsLibraries -lpthread
++#define SystemMTDefines -D_REENTRANT
+
+ #ifndef HasLibCrypt
+ #define HasLibCrypt YES
+@@ -134,7 +133,7 @@ XCOMM i386Architecture
+ #define VendorHasX11R6_3libXext YES
+
+ #ifndef StandardDefines
+-#define StandardDefines -D__GNU__ GNUMachineDefines
GNUSourceDefines
++#define StandardDefines GNUMachineDefines GNUSourceDefines
+ #endif
+
+ #define DlLibrary -rdynamic -ldl
Added: people/rmh/upstream/xdm.diff
===================================================================
--- people/rmh/upstream/xdm.diff 2003-11-22 20:54:06 UTC (rev 794)
+++ people/rmh/upstream/xdm.diff 2003-11-25 22:31:42 UTC (rev 795)
@@ -0,0 +1,154 @@
+===================================================================
+RCS file: /xf86/anoncvs/cvs/xc/programs/xdm/util.c,v
+retrieving revision 3.20
+retrieving revision 3.21
+diff -u -p -r3.20 -r3.21
+--- xc/programs/xdm/util.c 2002/05/31 18:46:10 3.20
++++ xc/programs/xdm/util.c 2003/11/22 04:09:26 3.21
+@@ -26,7 +26,7 @@ other dealings in this Software without
+ from The Open Group.
+
+ */
+-/* $XFree86: xc/programs/xdm/util.c,v 3.19 2001/12/14 20:01:24 dawes Exp $ */
++/* $XFree86: xc/programs/xdm/util.c,v 3.20 2002/05/31 18:46:10 dawes Exp $ */
+
+ /*
+ * xdm - display manager daemon
+@@ -55,7 +55,7 @@ from The Open Group.
+ #undef _POSIX_SOURCE
+ #endif
+ #endif
+-#if defined(__osf__) || defined(linux) || defined(__QNXNTO__) ||
defined(__GNU__)
++#if defined(__osf__) || defined(linux) || defined(__QNXNTO__) ||
defined(__GLIBC__)
+ #define setpgrp setpgid
+ #endif
+
+===================================================================
+RCS file: /xf86/anoncvs/cvs/xc/programs/xdm/config/Imakefile,v
+retrieving revision 1.12
+retrieving revision 1.13
+diff -u -p -r1.12 -r1.13
+--- xc/programs/xdm/config/Imakefile 2002/12/07 20:20:16 1.12
++++ xc/programs/xdm/config/Imakefile 2003/11/24 02:02:30 1.13
+@@ -3,13 +3,13 @@ XCOMM $Xorg: Imakefile,v 1.4 2000/08/17
+
+
+
+-XCOMM $XFree86: xc/programs/xdm/config/Imakefile,v 1.11 2002/11/30 19:11:32
herrb Exp $
++XCOMM $XFree86: xc/programs/xdm/config/Imakefile,v 1.12 2002/12/07 20:20:16
herrb Exp $
+
+ SERVERSTYPE = XdmServersType
+
+ all:: Xservers.ws xdm-config Xservers Xresources
+
+-#if defined(i386Architecture) && (defined(NetBSDArchitecture) ||
defined(OpenBSDArchitecture))
++#if defined(i386Architecture) && (defined(KNetBSDArchitecture) ||
defined(KOpenBSDArchitecture))
+ DEFAULTVT=vt05
+ #endif
+
+===================================================================
+RCS file: /xf86/anoncvs/cvs/xc/programs/xdm/chooser.c,v
+retrieving revision 3.26
+retrieving revision 3.27
+diff -u -p -r3.26 -r3.27
+--- xc/programs/xdm/chooser.c 2003/07/18 15:53:28 3.26
++++ xc/programs/xdm/chooser.c 2003/11/23 22:57:31 3.27
+@@ -26,7 +26,7 @@ in this Software without prior written a
+ * Author: Keith Packard, MIT X Consortium
+ */
+
+-/* $XFree86: xc/programs/xdm/chooser.c,v 3.25 2003/07/09 15:27:38 tsi Exp $ */
++/* $XFree86: xc/programs/xdm/chooser.c,v 3.26 2003/07/18 15:53:28 tsi Exp $ */
+
+ /*
+ * Chooser - display a menu of names and let the user select one
+@@ -130,9 +130,7 @@ in this Software without prior written a
+ # include <sync/queue.h>
+ # include <sync/sema.h>
+ #endif
+-#ifndef __GNU__
+-# include <net/if.h>
+-#endif /* __GNU__ */
++#include <net/if.h>
+ #endif /* hpux */
+
+ #include <netdb.h>
+@@ -573,8 +571,6 @@ RegisterHostaddr (struct sockaddr *addr,
+ * addresses on the local host.
+ */
+
+-#if !defined(__GNU__)
+-
+ /* Handle variable length ifreq in BNR2 and later */
+ #ifdef VARIABLE_IFREQ
+ #define ifr_size(p) (sizeof (struct ifreq) + \
+@@ -768,69 +764,6 @@ RegisterHostname (char *name)
+ #endif /* IPv6 */
+ }
+ }
+-#else /* __GNU__ */
+-static void
+-RegisterHostname (char *name)
+-{
+- struct hostent *hostent;
+- struct sockaddr_in in_addr;
+-
+- if (!strcmp (name, BROADCAST_HOSTNAME))
+- {
+- in_addr.sin_addr.s_addr= htonl(0xFFFFFFFF);
+- in_addr.sin_port = htons (XDM_UDP_PORT);
+- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+- BROADCAST_QUERY);
+- }
+- else
+- {
+-
+- /* address as hex string, e.g., "12180022" (deprecated) */
+- if (strlen(name) == 8 &&
+- FromHex(name, (char *)&in_addr.sin_addr, strlen(name)) == 0)
+- {
+- in_addr.sin_family = AF_INET;
+- in_addr.sin_port = htons (XDM_UDP_PORT);
+- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+- QUERY);
+- } else {
+-#if defined(IPv6) && defined(AF_INET6)
+- char sport[8];
+- struct addrinfo *ai, *nai, hints;
+- bzero(&hints,sizeof(hints));
+- hints.ai_socktype = SOCK_DGRAM;
+- sprintf(sport, "%d", XDM_UDP_PORT);
+- if (getaddrinfo(name, sport, &hints, &ai) == 0) {
+- for (nai = ai ; nai != NULL ; nai = nai->ai_next) {
+- if ((nai->ai_family == AF_INET) ||
+- (nai->ai_family == AF_INET6)) {
+- RegisterHostaddr(nai->ai_addr, nai->ai_addrlen, QUERY);
+- }
+- }
+- }
+-#else
+- /* Per RFC 1123, check first for IP address in dotted-decimal form */
+- else if ((in_addr.sin_addr.s_addr = inet_addr(name)) != -1)
+- in_addr.sin_family = AF_INET;
+- else
+- {
+- hostent = gethostbyname (name);
+- if (!hostent)
+- return;
+- if (hostent->h_addrtype != AF_INET || hostent->h_length != 4)
+- return;
+- in_addr.sin_family = hostent->h_addrtype;
+- memmove( &in_addr.sin_addr, hostent->h_addr, 4);
+- }
+- in_addr.sin_port = htons (XDM_UDP_PORT);
+- RegisterHostaddr ((struct sockaddr *)&in_addr, sizeof (in_addr),
+- QUERY);
+-#endif
+- }
+-
+- }
+-}
+-#endif /* __GNU__ */
+
+ static ARRAYofARRAY8 AuthenticationNames;
+
Added: people/rmh/upstream/xload.diff
===================================================================
--- people/rmh/upstream/xload.diff 2003-11-22 20:54:06 UTC (rev 794)
+++ people/rmh/upstream/xload.diff 2003-11-25 22:31:42 UTC (rev 795)
@@ -0,0 +1,23 @@
+===================================================================
+RCS file: /xf86/anoncvs/cvs/xc/programs/xload/get_load.c,v
+retrieving revision 1.19
+retrieving revision 1.20
+diff -u -p -r1.19 -r1.20
+--- xc/programs/xload/get_load.c 2003/11/17 22:20:54 1.19
++++ xc/programs/xload/get_load.c 2003/11/22 04:11:38 1.20
+@@ -1,5 +1,5 @@
+ /* $XConsortium: get_load.c /main/37 1996/03/09 09:38:04 kaleb $ */
+-/* $XFree86: xc/programs/xload/get_load.c,v 1.18 2002/09/18 17:11:57 tsi Exp
$ */
++/* $XFree86: xc/programs/xload/get_load.c,v 1.19 2003/11/17 22:20:54 dawes
Exp $ */
+ /*
+
+ Copyright (c) 1989 X Consortium
+@@ -54,7 +54,7 @@ from the X Consortium.
+ #ifndef macII
+ #ifndef apollo
+ #ifndef LOADSTUB
+-#if !defined(linux) && !defined(__UNIXOS2__) && !defined(__GNU__)
++#if !defined(linux) && !defined(__UNIXOS2__) && !defined(__GLIBC__)
+ #include <nlist.h>
+ #endif /* !linux && ... */
+ #endif /* LOADSTUB */
Added: people/rmh/upstream/xserver.diff
===================================================================
--- people/rmh/upstream/xserver.diff 2003-11-22 20:54:06 UTC (rev 794)
+++ people/rmh/upstream/xserver.diff 2003-11-25 22:31:42 UTC (rev 795)
@@ -0,0 +1,58 @@
+===================================================================
+RCS file:
/xf86/anoncvs/cvs/xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v
+retrieving revision 3.61
+retrieving revision 3.62
+diff -u -p -r3.61 -r3.62
+--- xc/programs/Xserver/hw/xfree86/os-support/Imakefile 2003/11/03
05:11:51 3.61
++++ xc/programs/Xserver/hw/xfree86/os-support/Imakefile 2003/11/24
02:02:29 3.62
+@@ -1,4 +1,4 @@
+-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v 3.60tsi
Exp $
++XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v 3.61
2003/11/03 05:11:51 tsi Exp $
+
+
+
+@@ -12,14 +12,15 @@ XCOMM $XConsortium: Imakefile /main/9 19
+
+ #if defined(i386Architecture) || defined(ia64Architecture) || \
+ (defined(SunArchitecture) && defined(SparcArchitecture)) || \
+- (defined(FreeBSDArchitecture) && defined(AlphaArchitecture)) || \
+- (defined(FreeBSDArchitecture) && defined(Sparc64Architecture)) || \
+- (defined(NetBSDArchitecture) && defined(AlphaArchitecture)) || \
+- (defined(NetBSDArchitecture) && defined(PpcArchitecture)) || \
+- (defined(NetBSDArchitecture) && defined(SparcArchitecture)) || \
+- defined(OpenBSDArchitecture) || defined(SGIArchitecture) || \
++ (defined(KFreeBSDArchitecture) && defined(AlphaArchitecture)) || \
++ (defined(KFreeBSDArchitecture) && defined(Sparc64Architecture)) || \
++ (defined(KNetBSDArchitecture) && defined(AlphaArchitecture)) || \
++ (defined(KNetBSDArchitecture) && defined(PpcArchitecture)) || \
++ (defined(KNetBSDArchitecture) && defined(SparcArchitecture)) || \
++ defined(KOpenBSDArchitecture) || defined(SGIArchitecture) || \
+ (defined(LynxOSArchitecture) && defined(PpcArchitecture)) || \
+- defined(AMD64Architecture) || defined(LinuxArchitecture)
++ defined(AMD64Architecture) || defined(LinuxArchitecture) || \
++ defined(GNUMachArchitecture)
+ BUS_SUBDIR = bus
+ #endif
+
+===================================================================
+RCS file:
/xf86/anoncvs/cvs/xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v
+retrieving revision 3.158
+retrieving revision 3.159
+diff -u -p -r3.158 -r3.159
+--- xc/programs/Xserver/hw/xfree86/common/xf86Events.c 2003/11/03 05:11:02
3.158
++++ xc/programs/Xserver/hw/xfree86/common/xf86Events.c 2003/11/22 04:22:11
3.159
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.157tsi
Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.158
2003/11/03 05:11:02 tsi Exp $ */
+ /*
+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+ *
+@@ -347,7 +347,7 @@ xf86ProcessActionEvent(ActionEvent actio
+ }
+ break;
+ #if !defined(__SOL8__) && !defined(__UNIXOS2__) && !defined(sgi) && \
+- (!defined(sun) || defined(i386))
++ (!defined(sun) || defined(i386)) && defined(VT_ACTIVATE)
+ case ACTION_SWITCHSCREEN:
+ if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) {
+ int vtno = *((int *) arg);
Added: people/rmh/upstream/xterm.diff
===================================================================
--- people/rmh/upstream/xterm.diff 2003-11-22 20:54:06 UTC (rev 794)
+++ people/rmh/upstream/xterm.diff 2003-11-25 22:31:42 UTC (rev 795)
@@ -0,0 +1,53 @@
+===================================================================
+RCS file: /xf86/anoncvs/cvs/xc/programs/xterm/main.c,v
+retrieving revision 3.172
+retrieving revision 3.173
+diff -u -p -r3.172 -r3.173
+--- xc/programs/xterm/main.c 2003/11/13 01:16:38 3.172
++++ xc/programs/xterm/main.c 2003/11/25 01:54:43 3.173
+@@ -89,7 +89,7 @@ SOFTWARE.
+
+ ******************************************************************/
+
+-/* $XFree86: xc/programs/xterm/main.c,v 3.171 2003/11/02 16:44:25 dickey Exp
$ */
++/* $XFree86: xc/programs/xterm/main.c,v 3.172 2003/11/13 01:16:38 dickey Exp
$ */
+
+ /* main.c */
+
+@@ -183,7 +183,7 @@ static Bool IsPts = False;
+ #define _SVID3
+ #endif
+
+-#ifdef __GNU__
++#if defined(__GLIBC__) && !defined(linux)
+ #define USE_SYSV_PGRP
+ #define WTMP
+ #define HAS_BSD_GROUPS
+===================================================================
+RCS file: /xf86/anoncvs/cvs/xc/programs/xterm/xterm_io.h,v
+retrieving revision 1.10
+retrieving revision 1.11
+diff -u -p -r1.10 -r1.11
+--- xc/programs/xterm/xterm_io.h 2003/03/23 02:01:41 1.10
++++ xc/programs/xterm/xterm_io.h 2003/11/23 23:53:15 1.11
+@@ -1,5 +1,5 @@
+ /*
+- * $XFree86: xc/programs/xterm/xterm_io.h,v 1.9 2002/10/05 17:57:14 dickey
Exp $
++ * $XFree86: xc/programs/xterm/xterm_io.h,v 1.10 2003/03/23 02:01:41 dickey
Exp $
+ */
+
+ /*
+@@ -73,8 +73,12 @@
+ #endif
+
+ #ifdef macII
+-#undef SYSV /* pretend to be bsd (sgtty.h) */
++#undef SYSV /* pretend to be bsd (sgtty.h) */
+ #endif /* macII */
++
++#if defined(__GLIBC__) && !defined(linux)
++#define USE_POSIX_TERMIOS /* GNU/Hurd, GNU/KFreeBSD and GNU/KNetBSD */
++#endif
+
+ #ifdef __MVS__
+ #define SVR4
