-diff -urN XFree86-4.0.1.orig/xc/config/cf/Server.tmpl XFree86-4.0.1/xc/config/cf/Server.tmpl
---- XFree86-4.0.1.orig/xc/config/cf/Server.tmpl Fri Feb 18 17:23:07 2000
-+++ XFree86-4.0.1/xc/config/cf/Server.tmpl Mon Jul 10 04:01:04 2000
+diff -urN XFree86-4.1.0.orig/xc/config/cf/Server.tmpl XFree86-4.1.0/xc/config/cf/Server.tmpl
+--- XFree86-4.1.0.orig/xc/config/cf/Server.tmpl Fri Apr 20 17:51:15 2001
++++ XFree86-4.1.0/xc/config/cf/Server.tmpl Sun Jun 17 20:17:24 2001
@@ -31,8 +31,14 @@
#ifndef MakeDllModules
#define MakeDllModules NO
#endif
/*
-diff -urN XFree86-4.0.1.orig/xc/config/cf/xf86site.def XFree86-4.0.1/xc/config/cf/xf86site.def
---- XFree86-4.0.1.orig/xc/config/cf/xf86site.def Mon Jul 10 03:59:05 2000
-+++ XFree86-4.0.1/xc/config/cf/xf86site.def Mon Jul 10 04:01:04 2000
-@@ -305,13 +305,15 @@
+diff -urN XFree86-4.1.0.orig/xc/config/cf/xf86site.def XFree86-4.1.0/xc/config/cf/xf86site.def
+--- XFree86-4.1.0.orig/xc/config/cf/xf86site.def Sun Jun 17 19:42:08 2001
++++ XFree86-4.1.0/xc/config/cf/xf86site.def Sun Jun 17 20:17:24 2001
+@@ -348,13 +348,15 @@
*/
/*
*/
/*
-diff -urN XFree86-4.0.1.orig/xc/config/cf/xfree86.cf XFree86-4.0.1/xc/config/cf/xfree86.cf
---- XFree86-4.0.1.orig/xc/config/cf/xfree86.cf Mon Jul 10 03:59:05 2000
-+++ XFree86-4.0.1/xc/config/cf/xfree86.cf Mon Jul 10 04:01:04 2000
-@@ -550,12 +550,15 @@
+diff -urN XFree86-4.1.0.orig/xc/config/cf/xfree86.cf XFree86-4.1.0/xc/config/cf/xfree86.cf
+--- XFree86-4.1.0.orig/xc/config/cf/xfree86.cf Sun Jun 17 19:42:08 2001
++++ XFree86-4.1.0/xc/config/cf/xfree86.cf Sun Jun 17 20:17:24 2001
+@@ -720,12 +720,15 @@
#endif
/*
# endif
#endif
-diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/Imakefile XFree86-4.0.1/xc/programs/Xserver/Imakefile
---- XFree86-4.0.1.orig/xc/programs/Xserver/Imakefile Sat Jun 17 20:42:16 2000
-+++ XFree86-4.0.1/xc/programs/Xserver/Imakefile Mon Jul 10 04:01:33 2000
+diff -urN XFree86-4.1.0.orig/xc/programs/Xserver/Imakefile XFree86-4.1.0/xc/programs/Xserver/Imakefile
+--- XFree86-4.1.0.orig/xc/programs/Xserver/Imakefile Fri May 18 19:48:30 2001
++++ XFree86-4.1.0/xc/programs/Xserver/Imakefile Sun Jun 17 20:17:24 2001
@@ -4,11 +4,6 @@
*/
- XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.184 2000/06/17 00:03:10 martin Exp $
+ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.229 2001/05/18 17:48:30 torrey Exp $
-#ifndef InstallXserverSetUID
-#define InstallXserverSetUID NO
#include <Server.tmpl>
#ifdef XFree86Version
-@@ -257,6 +252,7 @@
- SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries DBMLibrary $(USB) \
- $(EXTRASYSLIBS)
- #endif
-+ PAMLIBS = -lpam -lpam_misc -ldl
- CBRT = mi/LibraryTargetName(cbrt)
- STDDIRS = include dix os mi $(XPDDXDIR) $(EXTDIRS)
-
-@@ -1012,6 +1008,11 @@
- $(XVFBLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XVFBSYSLIBS))
- #endif /* XVirtualFramebufferServer */
+@@ -1068,6 +1063,11 @@
+ $(XNESTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XNESTSYSLIBS))
+ #endif /* XnestServer */
+
+#if UseXserverWrapper
+InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS))
+#endif
- CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR)
- IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
-diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
---- XFree86-4.0.1.orig/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c Fri Feb 25 19:28:11 2000
-+++ XFree86-4.0.1/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c Mon Jul 10 04:01:04 2000
-@@ -65,7 +65,10 @@
+ #if XnonServer
+ XCOMM
+diff -urN XFree86-4.1.0.orig/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
+--- XFree86-4.1.0.orig/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c Tue Nov 14 22:59:24 2000
++++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c Sun Jun 17 20:17:24 2001
+@@ -66,7 +66,10 @@
/* check if we're run with euid==0 */
if (geteuid() != 0)
{
}
/*
-diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/os/Imakefile XFree86-4.0.1/xc/programs/Xserver/os/Imakefile
---- XFree86-4.0.1.orig/xc/programs/Xserver/os/Imakefile Fri May 5 19:47:29 2000
-+++ XFree86-4.0.1/xc/programs/Xserver/os/Imakefile Mon Jul 10 04:01:33 2000
-@@ -110,6 +110,7 @@
- ERROR_DEFINES = ServerErrorDefines
- DEFINES = -DXSERV_t -DTRANS_SERVER $(CONNECTION_FLAGS) $(MEM_DEFINES) $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) $(KRB5_DEFINES) $(RGB_DEFINES)
- INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(TOP)/lib/Xau -I../lbx Krb5Includes
-+ EXTRA_DEFINES = -DUSE_PAM
- DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) $(TRANS_INCLUDES) $(CONNECTION_FLAGS)
+diff -urN XFree86-4.1.0.orig/xc/programs/Xserver/os/Imakefile XFree86-4.1.0/xc/programs/Xserver/os/Imakefile
+--- XFree86-4.1.0.orig/xc/programs/Xserver/os/Imakefile Mon Apr 23 18:17:12 2001
++++ XFree86-4.1.0/xc/programs/Xserver/os/Imakefile Sun Jun 17 20:18:35 2001
+@@ -116,6 +116,7 @@
+ INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
+ -I$(SERVERSRC)/Xext -I$(FONTINCSRC) \
+ -I$(TOP)/lib/Xau -I../lbx Krb5Includes
++ EXTRA_DEFINES = -DUSE_PAM
+ DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
+ $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
LINTLIBS = ../dix/llib-ldix.ln
-
-@@ -153,6 +154,14 @@
+@@ -159,6 +160,14 @@
cc -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
#else
SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
#endif
#if HasKrb5
-diff -urN XFree86-4.0.1.orig/xc/programs/Xserver/os/wrapper.c XFree86-4.0.1/xc/programs/Xserver/os/wrapper.c
---- XFree86-4.0.1.orig/xc/programs/Xserver/os/wrapper.c Thu Jan 1 01:00:00 1970
-+++ XFree86-4.0.1/xc/programs/Xserver/os/wrapper.c Mon Jul 10 04:01:33 2000
+diff -urN XFree86-4.1.0.orig/xc/programs/Xserver/os/wrapper.c XFree86-4.1.0/xc/programs/Xserver/os/wrapper.c
+--- XFree86-4.1.0.orig/xc/programs/Xserver/os/wrapper.c Thu Jan 1 01:00:00 1970
++++ XFree86-4.1.0/xc/programs/Xserver/os/wrapper.c Sun Jun 17 20:17:24 2001
@@ -0,0 +1,304 @@
+/*
+ * X server wrapper.
+ exit(1);
+}
+
-diff -urN XFree86-4.0.1.orig/xc/programs/xinit/xinit.c XFree86-4.0.1/xc/programs/xinit/xinit.c
---- XFree86-4.0.1.orig/xc/programs/xinit/xinit.c Wed Apr 5 20:14:08 2000
-+++ XFree86-4.0.1/xc/programs/xinit/xinit.c Mon Jul 10 04:01:04 2000
-@@ -143,6 +143,7 @@
+diff -urN XFree86-4.1.0.orig/xc/programs/xinit/xinit.c XFree86-4.1.0/xc/programs/xinit/xinit.c
+--- XFree86-4.1.0.orig/xc/programs/xinit/xinit.c Mon Apr 16 08:51:46 2001
++++ XFree86-4.1.0/xc/programs/xinit/xinit.c Sun Jun 17 20:17:24 2001
+@@ -148,6 +148,7 @@
#define OK_EXIT 0
#define ERR_EXIT 1
char *default_server = "X";
char *default_display = ":0"; /* choose most efficient */
#ifndef __EMX__
-@@ -312,7 +313,10 @@
+@@ -317,7 +318,10 @@
if (argc == 0 ||
#ifndef __EMX__
(**argv != '/' && **argv != '.')) {
#else
(**argv != '/' && **argv != '\\' && **argv != '.' &&
!(isalpha(**argv) && (*argv)[1]==':'))) {
+--- XFree86-4.2.0/xc/programs/xinit/startx.cpp.orig Fri Nov 30 21:57:48 2001
++++ XFree86-4.2.0/xc/programs/xinit/startx.cpp Sun Mar 3 12:52:13 2002
+@@ -53,7 +53,7 @@
+ sysclientrc=XINITDIR/xinitrc
+ sysserverrc=XINITDIR/xserverrc
+ defaultclient=BINDIR/xterm
+-defaultserver=BINDIR/X
++defaultserver=BINDIR/Xwrapper
+ defaultclientargs=""
+ defaultserverargs=""
+ clientargs=""