---- XFree86-4.2.1/xc/programs/xterm/XTerm.ad~ Thu Sep 5 10:05:48 2002
-+++ XFree86-4.2.1/xc/programs/xterm/XTerm.ad Thu Sep 5 10:05:48 2002
-@@ -5,115 +5,115 @@
- !
- ! $XFree86: xc/programs/xterm/XTerm.ad,v 3.22 2002/01/05 22:05:02 dickey Exp $
-
--XTerm.JoinSession:False
-+XTerm.JoinSession: False
-
--*SimpleMenu*BackingStore: NotUseful
--*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
--*SimpleMenu*menuLabel.vertSpace: 100
--*SimpleMenu*HorizontalMargins: 16
--*SimpleMenu*Sme.height: 16
--
--*SimpleMenu*Cursor: left_ptr
--
--*mainMenu.Label: Main Options
--*mainMenu*securekbd*Label: Secure Keyboard
--*mainMenu*allowsends*Label: Allow SendEvents
--*mainMenu*logging*Label: Log to File
--*mainMenu*print*Label: Print Window
--*mainMenu*redraw*Label: Redraw Window
--*mainMenu*8-bit control*Label: 8-Bit Controls
--*mainMenu*backarrow key*Label: Backarrow Key (BS/DEL)
--*mainMenu*num-lock*Label: Alt/NumLock Modifiers
--*mainMenu*meta-esc*Label: Meta Sends Escape
--*mainMenu*delete-is-del*Label: Delete is DEL
--*mainMenu*oldFunctionKeys*Label: Old Function-Keys
--*mainMenu*sunFunctionKeys*Label: Sun Function-Keys
--*mainMenu*sunKeyboard*Label: VT220 Keyboard
--*mainMenu*hpFunctionKeys*Label: HP Function-Keys
--*mainMenu*scoFunctionKeys*Label: SCO Function-Keys
--*mainMenu*suspend*Label: Send STOP Signal
--*mainMenu*continue*Label: Send CONT Signal
--*mainMenu*interrupt*Label: Send INT Signal
--*mainMenu*hangup*Label: Send HUP Signal
--*mainMenu*terminate*Label: Send TERM Signal
--*mainMenu*kill*Label: Send KILL Signal
--*mainMenu*quit*Label: Quit
--
--*vtMenu.Label: VT Options
--*vtMenu*scrollbar*Label: Enable Scrollbar
--*vtMenu*jumpscroll*Label: Enable Jump Scroll
--*vtMenu*reversevideo*Label: Enable Reverse Video
--*vtMenu*autowrap*Label: Enable Auto Wraparound
--*vtMenu*reversewrap*Label: Enable Reverse Wraparound
--*vtMenu*autolinefeed*Label: Enable Auto Linefeed
--*vtMenu*appcursor*Label: Enable Application Cursor Keys
--*vtMenu*appkeypad*Label: Enable Application Keypad
--*vtMenu*scrollkey*Label: Scroll to Bottom on Key Press
--*vtMenu*scrollttyoutput*Label: Scroll to Bottom on Tty Output
--*vtMenu*allow132*Label: Allow 80/132 Column Switching
--*vtMenu*cursesemul*Label: Enable Curses Emulation
--*vtMenu*visualbell*Label: Enable Visual Bell
--*vtMenu*poponbell*Label: Enable Pop on Bell
--*vtMenu*marginbell*Label: Enable Margin Bell
--*vtMenu*cursorblink*Label: Enable Blinking Cursor
--*vtMenu*titeInhibit*Label: Enable Alternate Screen Switching
--*vtMenu*activeicon*Label: Enable Active Icon
--*vtMenu*softreset*Label: Do Soft Reset
--*vtMenu*hardreset*Label: Do Full Reset
--*vtMenu*clearsavedlines*Label: Reset and Clear Saved Lines
--*vtMenu*tekshow*Label: Show Tek Window
--*vtMenu*tekmode*Label: Switch to Tek Mode
--*vtMenu*vthide*Label: Hide VT Window
--*vtMenu*altscreen*Label: Show Alternate Screen
--
--*fontMenu.Label: VT Fonts
--*fontMenu*fontdefault*Label: Default
--*fontMenu*font1*Label: Unreadable
--*VT100*font1: nil2
--*IconFont: nil2
--*fontMenu*font2*Label: Tiny
--*VT100*font2: 5x7
--*fontMenu*font3*Label: Small
--*VT100*font3: 6x10
--*fontMenu*font4*Label: Medium
--*VT100*font4: 7x13
--*fontMenu*font5*Label: Large
--*VT100*font5: 9x15
--*fontMenu*font6*Label: Huge
--*VT100*font6: 10x20
--*fontMenu*fontescape*Label: Escape Sequence
-+*SimpleMenu*BackingStore: NotUseful
-+*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
-+*SimpleMenu*menuLabel.vertSpace: 100
-+*SimpleMenu*HorizontalMargins: 16
-+*SimpleMenu*Sme.height: 16
-+
-+*SimpleMenu*Cursor: left_ptr
-+
-+*mainMenu.Label: Main Options
-+*mainMenu*securekbd*Label: Secure Keyboard
-+*mainMenu*allowsends*Label: Allow SendEvents
-+*mainMenu*logging*Label: Log to File
-+*mainMenu*print*Label: Print Window
-+*mainMenu*redraw*Label: Redraw Window
-+*mainMenu*8-bit control*Label 8-Bit Controls
-+*mainMenu*backarrow key*Label: Backarrow Key (BS/DEL)
-+*mainMenu*num-lock*Label: Alt/NumLock Modifiers
-+*mainMenu*meta-esc*Label: Meta Sends Escape
-+*mainMenu*delete-is-del*Label: Delete is DEL
-+*mainMenu*oldFunctionKeys*Label: Old Function-Keys
-+*mainMenu*sunFunctionKeys*Label: Sun Function-Keys
-+*mainMenu*sunKeyboard*Label: VT220 Keyboard
-+*mainMenu*hpFunctionKeys*Label: HP Function-Keys
-+*mainMenu*scoFunctionKeys*Label: SCO Function-Keys
-+*mainMenu*suspend*Label: Send STOP Signal
-+*mainMenu*continue*Label: Send CONT Signal
-+*mainMenu*interrupt*Label: Send INT Signal
-+*mainMenu*hangup*Label: Send HUP Signal
-+*mainMenu*terminate*Label: Send TERM Signal
-+*mainMenu*kill*Label: Send KILL Signal
-+*mainMenu*quit*Label: Quit
-+
-+*vtMenu.Label: VT Options
-+*vtMenu*scrollbar*Label: Enable Scrollbar
-+*vtMenu*jumpscroll*Label: Enable Jump Scroll
-+*vtMenu*reversevideo*Label: Enable Reverse Video
-+*vtMenu*autowrap*Label: Enable Auto Wraparound
-+*vtMenu*reversewrap*Label: Enable Reverse Wraparound
-+*vtMenu*autolinefeed*Label: Enable Auto Linefeed
-+*vtMenu*appcursor*Label: Enable Application Cursor Keys
-+*vtMenu*appkeypad*Label: Enable Application Keypad
-+*vtMenu*scrollkey*Label: Scroll to Bottom on Key Press
-+*vtMenu*scrollttyoutput*Label: Scroll to Bottom on Tty Output
-+*vtMenu*allow132*Label: Allow 80/132 Column Switching
-+*vtMenu*cursesemul*Label: Enable Curses Emulation
-+*vtMenu*visualbell*Label: Enable Visual Bell
-+*vtMenu*poponbell*Label: Enable Pop on Bell
-+*vtMenu*marginbell*Label: Enable Margin Bell
-+*vtMenu*cursorblink*Label: Enable Blinking Cursor
-+*vtMenu*titeInhibit*Label: Enable Alternate Screen Switching
-+*vtMenu*activeicon*Label: Enable Active Icon
-+*vtMenu*softreset*Label: Do Soft Reset
-+*vtMenu*hardreset*Label: Do Full Reset
-+*vtMenu*clearsavedlines*Label: Reset and Clear Saved Lines
-+*vtMenu*tekshow*Label: Show Tek Window
-+*vtMenu*tekmode*Label: Switch to Tek Mode
-+*vtMenu*vthide*Label: Hide VT Window
-+*vtMenu*altscreen*Label: Show Alternate Screen
-+
-+*fontMenu.Label: VT Fonts
-+*fontMenu*fontdefault*Label: Default
-+*fontMenu*font1*Label: Unreadable
-+*VT100*font1: nil2
-+*IconFont: nil2
-+*fontMenu*font2*Label: Tiny
-+*VT100*font2: 5x7
-+*fontMenu*font3*Label: Small
-+*VT100*font3: 6x10
-+*fontMenu*font4*Label: Medium
-+*VT100*font4: 7x13
-+*fontMenu*font5*Label: Large
-+*VT100*font5: 9x15
-+*fontMenu*font6*Label: Huge
-+*VT100*font6: 10x20
-+*fontMenu*fontescape*Label: Escape Sequence
- *fontMenu*fontsel*Label: Selection
- !fontescape and fontsel overridden by application
--*fontMenu*font-linedrawing*Label: Line-Drawing Characters
--*fontMenu*font-doublesize*Label: Doublesized Characters
--*fontMenu*font-loadable*Label: VT220 Soft Fonts
--
--*tekMenu.Label: Tek Options
--*tekMenu*tektextlarge*Label: Large Characters
--*tekMenu*tektext2*Label: #2 Size Characters
--*tekMenu*tektext3*Label: #3 Size Characters
--*tekMenu*tektextsmall*Label: Small Characters
--*tekMenu*tekpage*Label: PAGE
--*tekMenu*tekreset*Label: RESET
--*tekMenu*tekcopy*Label: COPY
--*tekMenu*vtshow*Label: Show VT Window
--*tekMenu*vtmode*Label: Switch to VT Mode
--*tekMenu*tekhide*Label: Hide Tek Window
--
--*tek4014*fontLarge: 9x15
--*tek4014*font2: 8x13
--*tek4014*font3: 6x13
--*tek4014*fontSmall: 6x10
-+*fontMenu*font-linedrawing*Label: Line-Drawing Characters
-+*fontMenu*font-doublesize*Label: Doublesized Characters
-+*fontMenu*font-loadable*Label: VT220 Soft Fonts
-+
-+*tekMenu.Label: Tek Options
-+*tekMenu*tektextlarge*Label: Large Characters
-+*tekMenu*tektext2*Label: #2 Size Characters
-+*tekMenu*tektext3*Label: #3 Size Characters
-+*tekMenu*tektextsmall*Label: Small Characters
-+*tekMenu*tekpage*Label: PAGE
-+*tekMenu*tekreset*Label: RESET
-+*tekMenu*tekcopy*Label: COPY
-+*tekMenu*vtshow*Label: Show VT Window
-+*tekMenu*vtmode*Label: Switch to VT Mode
-+*tekMenu*tekhide*Label: Hide Tek Window
-+
-+*tek4014*fontLarge: 9x15
-+*tek4014*font2: 8x13
-+*tek4014*font3: 6x13
-+*tek4014*fontSmall: 6x10
-
- ! Enable Colour by default.
--
--*VT100*colorMode: on
--*VT100*boldColors: on
--*VT100*dynamicColors: on
-+*VT100*colorMode: on
-+*VT100*boldColors: on
-+*VT100*dynamicColors: on
+diff -urN xc.orig/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad
+--- xc.orig/programs/xterm/XTerm.ad Mon Dec 30 15:54:16 2002
++++ xc/programs/xterm/XTerm.ad Mon Dec 30 20:05:06 2002
+@@ -115,8 +115,8 @@
+ *VT100*dynamicColors: on
! Uncomment this to use color for underline attribute
-!*VT100*colorULMode: on
-!*VT100*underLine: off
-+*VT100*colorULMode: on
-+*VT100*colorULMode: on
-+*VT100*underLine: on
++*VT100*colorULMode: on
++*VT100*underLine: on
! Uncomment this to use color for the bold attribute
!*VT100*colorBDMode: on
-@@ -121,21 +121,177 @@
- ! Uncomment this to use the bold/underline colors in preference to other colors
- !*VT100*colorAttrMode: on
-
--*VT100*color0: black
--*VT100*color1: red3
--*VT100*color2: green3
--*VT100*color3: yellow3
--*VT100*color4: blue3
--*VT100*color5: magenta3
--*VT100*color6: cyan3
--*VT100*color7: gray90
--*VT100*color8: gray30
--*VT100*color9: red
--*VT100*color10: green
--*VT100*color11: yellow
--*VT100*color12: blue
--*VT100*color13: magenta
--*VT100*color14: cyan
--*VT100*color15: white
--*VT100*colorUL: yellow
--*VT100*colorBD: white
-+*VT100*color0: black
-+*VT100*color1: red3
-+*VT100*color2: green3
-+*VT100*color3: yellow3
-+*VT100*color4: blue3
-+*VT100*color5: magenta3
-+*VT100*color6: cyan3
-+*VT100*color7: gray90
-+*VT100*color8: gray30
-+*VT100*color9: red
-+*VT100*color10: green
-+*VT100*color11: yellow
-+*VT100*color12: blue
-+*VT100*color13: magenta
-+*VT100*color14: cyan
-+*VT100*color15: white
-+*VT100*colorBD: white
-+*VT100*colorUL: green
+@@ -142,3 +142,159 @@
+ *VT100*color15: white
+ *VT100*colorUL: yellow
+ *VT100*colorBD: white
+
+! This file causes when loaded using xrdb correct behaviour of xterm
+! is you are using enclosed xterm.tcap and xterm.ti.
-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
+diff -urN xc.orig/config/cf/Server.tmpl xc/config/cf/Server.tmpl
+--- xc.orig/config/cf/Server.tmpl Mon Dec 30 15:52:30 2002
++++ xc/config/cf/Server.tmpl Mon Dec 30 17:31:51 2002
+@@ -25,8 +25,14 @@
+ #ifndef DoThreadedServer
+ #define DoThreadedServer NO
#endif
+#ifndef XserverNeedsSetUID
+#define XserverNeedsSetUID NO
+#define InstallServerSetUID (XserverNeedsSetUID && !UseXserverWrapper)
#endif
- /*
-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 @@
+ #ifdef CrossCompileDir
+diff -urN xc.orig/config/cf/xf86site.def xc/config/cf/xf86site.def
+--- xc.orig/config/cf/xf86site.def Mon Dec 30 15:52:31 2002
++++ xc/config/cf/xf86site.def Mon Dec 30 17:37:06 2002
+@@ -69,14 +69,15 @@
*/
/*
- * If you only run the X server under xdm the X servers don't need to be
- * installed SetUID, and you may comment out the lines below. If you run
- * the servers by hand (with xinit or startx), then they do need to be
-- * installed SetUID on most OSs.
-- * Consult your system administrator before making the X server setuid.
+- * installed SetUID on most platforms.
+ * The X servers need to run as root on most OSs. We're now using a
+ * wrapper in that case, but we still need to make it known that the
+ * servers need SetUID. When only using xdm, this (and the wrapper)
+ * are not required. Disabling this automatically disables use of the
+ * wrapper.
*
--#define InstallXserverSetUID NO
+- * Consult your system administrator before making the X server setuid.
+ * If you're only starting the Xservers with xdm set this to NO
-+ *
-+#define XserverNeedsSetUID NO
+ *
+-#define InstallXserverSetUID NO
++#define XserverNeedsSetUID NO
*/
- /*
-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 @@
+
+diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
+--- xc.orig/config/cf/xfree86.cf Mon Dec 30 15:52:31 2002
++++ xc/config/cf/xfree86.cf Mon Dec 30 17:31:51 2002
+@@ -1104,12 +1104,15 @@
#endif
/*
# endif
#endif
-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
+diff -urN xc.orig/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
+--- xc.orig/programs/Xserver/Imakefile Mon Dec 30 15:53:22 2002
++++ xc/programs/Xserver/Imakefile Mon Dec 30 17:31:51 2002
@@ -4,11 +4,6 @@
*/
- XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.229 2001/05/18 17:48:30 torrey Exp $
+ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.275 2002/12/21 00:19:11 torrey Exp $
-#ifndef InstallXserverSetUID
-#define InstallXserverSetUID NO
#include <Server.tmpl>
#ifdef XFree86Version
-@@ -1068,6 +1063,11 @@
- $(XNESTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XNESTSYSLIBS))
+@@ -1146,6 +1141,11 @@
#endif /* XnestServer */
-+
+
+#if UseXserverWrapper
+SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(PAMLIBS),NullParameter)
+InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS))
+#endif
-
- #if XnonServer
++
+ #if defined(XnonServer) && 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
+ XCOMM non server, just compile sources for build test
+diff -urN xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
+--- xc.orig/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c Mon Dec 30 15:53:52 2002
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c Mon Dec 30 17:31:51 2002
@@ -66,7 +66,10 @@
/* check if we're run with euid==0 */
if (geteuid() != 0)
}
/*
-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 @@
+diff -urN xc.orig/programs/Xserver/os/Imakefile xc/programs/Xserver/os/Imakefile
+--- xc.orig/programs/Xserver/os/Imakefile Mon Dec 30 15:53:58 2002
++++ xc/programs/Xserver/os/Imakefile Mon Dec 30 17:31:52 2002
+@@ -120,6 +120,7 @@
INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
- -I$(SERVERSRC)/Xext -I$(FONTINCSRC) \
+ -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
-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
-@@ -159,6 +160,14 @@
- cc -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
- #else
+@@ -166,6 +167,14 @@
SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
-+#endif
-+
+ #endif
+
+#if UseXserverWrapper
+AllTarget(wrapper.o)
+
+ WRAPPER_DEFINES = -DXSERVER_PATH=\"/etc/X11/X\"
+
+SpecialCObjectRule(wrapper,NullParameter,$(WRAPPER_DEFINES))
- #endif
-
++#endif
++
#if HasKrb5
-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
+ LinkSourceFile(k5encode.c,$(XAUTHSRC))
+ #endif
+diff -urN xc.orig/programs/Xserver/os/wrapper.c xc/programs/Xserver/os/wrapper.c
+--- xc.orig/programs/Xserver/os/wrapper.c Thu Jan 1 01:00:00 1970
++++ xc/programs/Xserver/os/wrapper.c Mon Dec 30 17:31:52 2002
@@ -0,0 +1,304 @@
+/*
+ * X server wrapper.
+ exit(1);
+}
+
-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 @@
+diff -urN xc.orig/programs/xinit/startx.cpp xc/programs/xinit/startx.cpp
+--- xc.orig/programs/xinit/startx.cpp Mon Dec 30 15:54:10 2002
++++ xc/programs/xinit/startx.cpp Mon Dec 30 17:31:52 2002
+@@ -53,7 +53,7 @@
+ sysclientrc=XINITDIR/xinitrc
+ sysserverrc=XINITDIR/xserverrc
+ defaultclient=BINDIR/xterm
+-defaultserver=BINDIR/X
++defaultserver=BINDIR/Xwrapper
+ defaultclientargs=""
+ defaultserverargs=""
+ clientargs=""
+diff -urN xc.orig/programs/xinit/xinit.c xc/programs/xinit/xinit.c
+--- xc.orig/programs/xinit/xinit.c Mon Dec 30 15:54:10 2002
++++ xc/programs/xinit/xinit.c Mon Dec 30 17:31:52 2002
+@@ -146,6 +146,7 @@
#define OK_EXIT 0
#define ERR_EXIT 1
+char *default_wrapper = BINDIR "/Xwrapper";
char *default_server = "X";
char *default_display = ":0"; /* choose most efficient */
- #ifndef __EMX__
-@@ -317,7 +318,10 @@
+ char *default_client[] = {"xterm", "-geometry", "+1+1", "-n", "login", NULL};
+@@ -332,7 +333,10 @@
if (argc == 0 ||
- #ifndef __EMX__
+ #ifndef __UNIXOS2__
(**argv != '/' && **argv != '.')) {
- *sptr++ = default_server;
+ if (access(default_wrapper, X_OK) == 0)
#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=""
---- xc/config/cf/xfree86.cf~ Wed Oct 2 12:24:39 2002
-+++ xc/config/cf/xfree86.cf Wed Oct 2 12:22:43 2002
-@@ -308,7 +308,7 @@
+diff -urN xc.orig/config/cf/xfree86.cf xc/config/cf/xfree86.cf
+--- xc.orig/config/cf/xfree86.cf Mon Dec 30 15:52:31 2002
++++ xc/config/cf/xfree86.cf Mon Dec 30 21:56:41 2002
+@@ -343,7 +343,7 @@
# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \
- neomagic i740 savage \
+ neomagic i740 tdfx savage \
cirrus vmware tseng trident chips apm \
-- GlideDriver fbdev i128 \
-+ fbdev i128 \
- ati AgpGartDrivers DevelDrivers ark cyrix \
- siliconmotion \
- vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
+- GlideDriver fbdev i128 nsc \
++ fbdev i128 nsc \
+ ati i810 AgpGartDrivers DevelDrivers ark \
+ cyrix siliconmotion \
+ vesa vga \
---- XFree86-4.0.1Z/xc/config/cf/Library.tmpl.pic Wed Dec 13 16:19:03 2000
-+++ XFree86-4.0.1Z/xc/config/cf/Library.tmpl Wed Dec 13 16:19:28 2000
-@@ -147,8 +147,8 @@
- # define _NormalCleanDir() LibCleanDir(unshared)
- # else
- # define _NormalLibMkdir() $(_NULLCMD_)
--# define _NormalObjCompile(options) NormalLibObjCompile(options)
+diff -urN xc.orig/config/cf/Library.tmpl xc/config/cf/Library.tmpl
+--- xc.orig/config/cf/Library.tmpl Mon Dec 30 15:52:30 2002
++++ xc/config/cf/Library.tmpl Mon Dec 30 19:33:30 2002
+@@ -212,9 +212,9 @@
+ # if !DoSharedLib && defined(IncludeNormalLibInSharedObject)
+ # define _NormalObjCompile(options) NormalRelocLibObjCompile(options)
+ # else
+-# define _NormalObjCompile(options) NormalLibObjCompile(options)
++# define _NormalObjCompile(options) NormalLibObjCompile(options $(PICFLAGS))
+ # endif
-# define _NormalObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options)
-+# define _NormalObjCompile(options) NormalLibObjCompile(options $(PICFLAGS))
+# define _NormalObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options $(PICFLAGS))
# define _NormalCleanDir() $(_NULLCMD_)
# endif
#endif
+@@ -227,8 +227,8 @@
+ # define _SharedObjCompile(options) NormalSharedLibObjCompile(options)
+ # define _SharedObjCplusplusCompile(options) NormalSharedLibObjCplusplusCompile(options)
+ #else
+-# define _SharedObjCompile(options) NormalLibObjCompile(options)
+-# define _SharedObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options)
++# define _SharedObjCompile(options) NormalLibObjCompile(options $(PICFLAGS))
++# define _SharedObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options $(PICFLAGS))
+ #endif
+ #endif
+
-diff -Nur XFree86-4.0.2.org/xc/programs/xdm/Imakefile XFree86-4.0.2/xc/programs/xdm/Imakefile
---- XFree86-4.0.2.org/xc/programs/xdm/Imakefile Wed Nov 29 17:46:07 2000
-+++ XFree86-4.0.2/xc/programs/xdm/Imakefile Thu Dec 21 13:10:37 2000
-@@ -225,9 +225,9 @@
+diff -urN xc.orig/programs/xdm/Imakefile xc/programs/xdm/Imakefile
+--- xc.orig/programs/xdm/Imakefile Mon Dec 30 15:54:06 2002
++++ xc/programs/xdm/Imakefile Mon Dec 30 18:33:35 2002
+@@ -256,9 +256,9 @@
'-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \
'-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
'-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \
+ '-DDEF_CHOOSER="$(BINDIR)/chooser"' \
+ '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \
+ '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"'
- #endif
ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
-@@ -247,7 +247,7 @@
+ LinkConfDirectory(xdm,.,xdm,.)
+@@ -277,7 +277,7 @@
#if BuildChooser
SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES))
NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
InstallAppDefaults(Chooser)
#endif
#if BuildBoth
-diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Imakefile XFree86-4.0.2/xc/programs/xdm/config/Imakefile
---- XFree86-4.0.2.org/xc/programs/xdm/config/Imakefile Mon Jan 31 20:33:43 2000
-+++ XFree86-4.0.2/xc/programs/xdm/config/Imakefile Thu Dec 21 13:20:54 2000
-@@ -5,9 +5,7 @@
+diff -urN xc.orig/programs/xdm/config/Imakefile xc/programs/xdm/config/Imakefile
+--- xc.orig/programs/xdm/config/Imakefile Mon Dec 30 15:54:07 2002
++++ xc/programs/xdm/config/Imakefile Mon Dec 30 18:38:58 2002
+@@ -9,13 +9,7 @@
all:: Xservers.ws xdm-config Xservers Xresources
-#if defined(i386Architecture) && (defined(NetBSDArchitecture) || defined(OpenBSDArchitecture))
-DEFAULTVT=vt05
-#endif
+-
+-#if defined(LinuxDistribution) && (LinuxDistribution == LinuxDebian)
+-DEFAULTVT=vt7
+-#endif
+DEFAULTVT=vt9
#ifndef XdmPixmap
# define XdmPixmap XFree86.xpm
-@@ -25,7 +23,11 @@
+@@ -39,7 +33,11 @@
#endif
CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
LinkFile(Xservers,Xservers.$(SERVERSTYPE))
-diff -Nur XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp
---- XFree86-4.0.2.org/xc/programs/xdm/config/Xres.cpp Thu Dec 21 13:06:17 2000
-+++ XFree86-4.0.2/xc/programs/xdm/config/Xres.cpp Thu Dec 21 13:19:25 2000
-@@ -36,9 +36,7 @@
+diff -urN xc.orig/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
+--- xc.orig/programs/xdm/config/Xres.cpp Mon Dec 30 15:54:07 2002
++++ xc/programs/xdm/config/Xres.cpp Mon Dec 30 18:41:24 2002
+@@ -41,9 +41,7 @@
/**/#endif
#endif /* XPM */
/**/#ifdef COLOR
xlogin*borderWidth: 1
xlogin*frameWidth: 5
xlogin*innerFramesWidth: 2
-@@ -47,6 +45,8 @@
+@@ -52,6 +50,8 @@
xlogin*background: grey
!xlogin*foreground: darkgreen
xlogin*greetColor: Blue3
#endif /* XPM */
xlogin*failColor: red
*Foreground: black
-diff -Nur XFree86-4.0.2.org/xc/programs/xdm/greeter/Imakefile XFree86-4.0.2/xc/programs/xdm/greeter/Imakefile
---- XFree86-4.0.2.org/xc/programs/xdm/greeter/Imakefile Wed Jun 14 21:43:32 2000
-+++ XFree86-4.0.2/xc/programs/xdm/greeter/Imakefile Thu Dec 21 13:20:13 2000
-@@ -77,8 +77,6 @@
- DEFINES = $(GREETER_DEFINES) $(XDMAUTH_DEFINES) $(RPC_DEFINES) \
- $(KRBIV_DEFINES) $(KRB5_DEFINES) $(PWD_DEFINES) $(PAM_DEFINES)
-
--SHLIBDIR = $(XDMDIR)
--
- SRCS = greet.c verify.c Login.c
- OBJS = greet.o verify.o Login.o
-
-diff -urN XFree86-4.1.0.orig/xc/programs/xman/vendor.h XFree86-4.1.0/xc/programs/xman/vendor.h
---- XFree86-4.1.0.orig/xc/programs/xman/vendor.h Thu Apr 19 21:54:51 2001
-+++ XFree86-4.1.0/xc/programs/xman/vendor.h Sun Jun 17 22:42:16 2001
-@@ -62,7 +62,7 @@
- #if defined(MANCONFIGSTYLE_FreeBSD)
- # define MANCONF "/etc/manpath.config"
- #elif defined(MANCONFIGSTYLE_Linux) || defined(MANCONFIGSTYLE_OpenBSD) || defined(MANCONFIGSTYLE_BSD)
--# define MANCONF "/etc/man.conf"
-+# define MANCONF "/etc/man.config"
- #endif
-
- /*
-diff -urN XFree86-4.1.0.orig/xc/programs/xman/xman.man XFree86-4.1.0/xc/programs/xman/xman.man
---- XFree86-4.1.0.orig/xc/programs/xman/xman.man Sat Jan 27 19:21:18 2001
-+++ XFree86-4.1.0/xc/programs/xman/xman.man Sun Jun 17 22:41:25 2001
+diff -urN xc.orig/programs/xman/Imakefile xc/programs/xman/Imakefile
+--- xc.orig/programs/xman/Imakefile Mon Dec 30 15:54:14 2002
++++ xc/programs/xman/Imakefile Mon Dec 30 18:21:38 2002
+@@ -26,7 +26,7 @@
+ # if defined(LinuxDistribution) && (LinuxDistribution == LinuxRedHat)
+ MANCONF = -DMANCONF=\"/etc/man.config\"
+ # else
+- MANCONF = -DMANCONF=\"/etc/man.conf\"
++ MANCONF = -DMANCONF=\"/etc/man.config\"
+ # endif
+ #elif defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || \
+ defined(DarwinArchitecture)
+diff -urN xc.orig/programs/xman/xman.man xc/programs/xman/xman.man
+--- xc.orig/programs/xman/xman.man Mon Dec 30 15:54:14 2002
++++ xc/programs/xman/xman.man Mon Dec 30 18:12:17 2002
@@ -93,8 +93,8 @@
.SH "BSD AND LINUX SYSTEMS"
.PP
projects / packages / X11.git / commitdiff