- outdated

[packages/XFree86.git] / XFree86-rhxdm.patch

--- XFree86-3.3.3.1/xc/programs/xdm/config/Xsession.rhxdm	Wed Jan  3 02:36:27 1996
+++ XFree86-3.3.3.1/xc/programs/xdm/config/Xsession	Mon Apr 12 19:26:02 1999
@@ -1,5 +1,23 @@
-#!/bin/sh
-# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
+#!/bin/sh -l
+# Xsession for Red Hat Linux 6.0
+# Copyright (c) 1999 Red Hat Software, Inc.
+
+# clean up after xbanner
+if [ -f /usr/X11R6/bin/freetemp ]; then
+  freetemp
+fi
+
+# clear screen to some sane color
+/usr/X11R6/bin/xsetroot -solid "#356390"
+
+case $# in
+1)
+	case $1 in
+	failsafe)
+		exec xterm -geometry 80x24-0-0
+		;;
+	esac
+esac
 
 # redirect errors to a file in user's home directory if we can
 for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
@@ -12,20 +30,15 @@
 	fi
 done
 
-case $# in
-1)
-	case $1 in
-	failsafe)
-		exec xterm -geometry 80x24-0-0
-		;;
-	esac
-esac
-
 startup=$HOME/.xsession
 resources=$HOME/.Xresources
 
-if [ -f "$startup" ]; then
+if [ -x "$startup" ]; then
 	exec "$startup"
+elif [ -x "$HOME/.Xclients" ]; then
+	exec "$HOME/.Xclients"
+elif [ -x /etc/X11/xinit/Xclients ]; then
+	exec /etc/X11/xinit/Xclients
 else
 	if [ -f "$resources" ]; then
 		xrdb -load "$resources"
--- XFree86-3.3.3.1/xc/programs/xdm/config/Xsetup_0.rhxdm	Wed Apr 27 03:20:03 1994
+++ XFree86-3.3.3.1/xc/programs/xdm/config/Xsetup_0	Mon Apr 12 19:26:02 1999
@@ -1,3 +1,6 @@
 #!/bin/sh
-# $XConsortium: Xsetup_0,v 1.3 93/09/28 14:30:31 gildea Exp $
-xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
+# Xsetup for Red Hat Linux 6.0
+# Copyright (c) 1999 Red Hat Software, Inc.
+/usr/X11R6/bin/xsetroot -solid "#356390"
+/usr/bin/xsri -geometry +5+5 -avoid 300x250 -keep-aspect \
+	/usr/share/pixmaps/redhat/redhat-transparent.png
--- XFree86-3.3.3.1/xc/programs/xdm/config/xdm-conf.cpp.rhxdm	Sat Feb 10 00:46:54 1996
+++ XFree86-3.3.3.1/xc/programs/xdm/config/xdm-conf.cpp	Mon Apr 12 19:26:02 1999
@@ -1,19 +1,19 @@
 ! $XConsortium: xdm-conf.cpp /main/3 1996/01/15 15:17:26 gildea $
-DisplayManager.errorLogFile:	XDMDIR/xdm-errors
-DisplayManager.pidFile:		XDMDIR/xdm-pid
-DisplayManager.keyFile:		XDMDIR/xdm-keys
-DisplayManager.servers:		XDMDIR/Xservers
-DisplayManager.accessFile:	XDMDIR/Xaccess
+DisplayManager.errorLogFile:	/var/log/xdm-error.log
+DisplayManager.pidFile:		/var/run/xdm.pid
+DisplayManager.keyFile:		/etc/X11/xdm/xdm-keys
+DisplayManager.servers:		/etc/X11/xdm/Xservers
+DisplayManager.accessFile:	/etc/X11/xdm/Xaccess
 ! All displays should use authorization, but we cannot be sure
 ! X terminals will be configured that way, so by default
 ! use authorization only for local displays :0, :1, etc.
 DisplayManager._0.authorize:	true
 DisplayManager._1.authorize:	true
 ! The following three resources set up display :0 as the console.
-DisplayManager._0.setup:	XDMDIR/Xsetup_0
-DisplayManager._0.startup:	XDMDIR/GiveConsole
-DisplayManager._0.reset:	XDMDIR/TakeConsole
+DisplayManager._0.setup:	/etc/X11/xdm/Xsetup_0
+DisplayManager._0.startup:	/etc/X11/xdm/GiveConsole
+DisplayManager._0.reset:	/etc/X11/xdm/TakeConsole
 !
-DisplayManager*resources:	XDMDIR/Xresources
-DisplayManager*session:		XDMDIR/Xsession
+DisplayManager*resources:	/etc/X11/xdm/Xresources
+DisplayManager*session:		/etc/X11/xdm/Xsession
 DisplayManager*authComplain:	false
--- XFree86-3.3.3.1/xc/programs/xdm/config/GiveConsole.rhxdm	Mon Apr 12 19:33:09 1999
+++ XFree86-3.3.3.1/xc/programs/xdm/config/GiveConsole	Mon Apr 12 19:34:11 1999
@@ -8,3 +8,5 @@
 # causing serious grief.
 #
 chown $USER /dev/console
+/usr/X11R6/bin/sessreg  -a -w "/var/log/wtmp" -u "/var/run/utmp" \
+	-x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
--- XFree86-3.3.3.1/xc/programs/xdm/config/TakeConsole.rhxdm	Mon Apr 12 19:33:13 1999
+++ XFree86-3.3.3.1/xc/programs/xdm/config/TakeConsole	Mon Apr 12 19:34:45 1999
@@ -5,3 +5,5 @@
 #
 chmod 622 /dev/console
 chown root /dev/console
+/usr/X11R6/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \
+	-x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER