X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XFree86-xdm-fixes.patch;h=4a9fbea4eeeb623f015c6ea7f9bf456239efef25;hb=2bb45ae5a17f7f8d8b20f1fdb09c2f9c17033af3;hp=fc0efb6d52ff70d7ff5b96681c5d002de3eb2026;hpb=b8f1fa46c785da89de576e3033958f4c5cb02bfa;p=packages%2FXFree86.git

diff --git a/XFree86-xdm-fixes.patch b/XFree86-xdm-fixes.patch
index fc0efb6..4a9fbea 100644
--- a/XFree86-xdm-fixes.patch
+++ b/XFree86-xdm-fixes.patch
@@ -1,20 +1,20 @@
-diff -urN xc/programs/xdm~/Imakefile xc/programs/xdm/Imakefile
---- xc/programs/xdm~/Imakefile	Sat Jun 17 13:48:22 2000
-+++ xc/programs/xdm/Imakefile	Thu Sep  7 18:17:08 2000
-@@ -224,9 +224,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="$(XDMDIR)/chooser"' \
+-		  '-DDEF_CHOOSER="$(CHOOSERPATH)"' \
 -		  '-DDEF_AUTH_DIR="$(XDMDIR)"' \
 -		  '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"'
-+		  '-DDEF_CHOOSER="$(BIN)/chooser"' \
++		  '-DDEF_CHOOSER="$(BINDIR)/chooser"' \
 +		  '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \
 +		  '-DDEF_GREETER_LIB="$(USRLIBDIR)/libXdmGreet.so"'
- #endif
  
  ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter)
-@@ -246,7 +246,7 @@
+ LinkConfDirectory(xdm,.,xdm,.)
+@@ -277,7 +277,7 @@
  #if BuildChooser
  SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES))
  NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter)
@@ -23,43 +23,13 @@ diff -urN xc/programs/xdm~/Imakefile xc/programs/xdm/Imakefile
  InstallAppDefaults(Chooser)
  #endif
  #if BuildBoth
-diff -urN xc/programs/xdm~/config/Imakefile xc/programs/xdm/config/Imakefile
---- xc/programs/xdm~/config/Imakefile	Mon Jan 31 14:33:43 2000
-+++ xc/programs/xdm/config/Imakefile	Thu Sep  7 18:17:08 2000
-@@ -25,7 +25,11 @@
- #endif
- 
- CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
--CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter)
-+#ifdef LinuxArchitecture
-+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DXDMVARDIR=$(XDMVARDIR),NullParameter)
-+#else
-+CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR),NullParameter)
-+#endif /* LinuxArchitecture */
- CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
- 
- LinkFile(Xservers,Xservers.$(SERVERSTYPE))
-diff -urN xc/programs/xdm~/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
---- xc/programs/xdm~/config/Xres.cpp	Sat Mar 13 22:22:24 1999
-+++ xc/programs/xdm/config/Xres.cpp	Thu Sep  7 18:23:11 2000
-@@ -5,6 +5,13 @@
- xlogin*login.translations: #override BS
- 	Ctrl<Key>R: abort-display()NLBS
- 	<Key>F1: set-session-argument(failsafe) finish-field()NLBS
-+	<Key>Delete: delete-character()NLBS
-+	<Key>Left: move-backward-character()NLBS
-+	<Key>Right: move-forward-character()NLBS
-+	<Key>Home: move-to-begining()NLBS
-+	<Key>End: move-to-end()NLBS
-+	Ctrl<Key>KP_Enter: set-session-argument(failsafe) finish-field()NLBS
-+	<Key>KP_Enter: set-session-argument() finish-field()NLBS
- 	Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS
- 	<Key>Return: set-session-argument() finish-field()
- #ifndef XPM
-@@ -29,9 +36,7 @@
- /**/#endif
+diff -urN xc.org/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
+--- xc.org/programs/xdm/config/Xres.cpp	2003-11-23 23:32:35.000000000 +0100
++++ xc/programs/xdm/config/Xres.cpp	2003-11-23 23:33:41.000000000 +0100
+@@ -41,9 +41,7 @@
+ XHASHendif
  #endif /* XPM */
- /**/#ifdef COLOR
+ XHASHifdef COLOR
 -#ifndef XPM
 -xlogin*greetColor: CadetBlue
 -#else
@@ -67,45 +37,42 @@ diff -urN xc/programs/xdm~/config/Xres.cpp xc/programs/xdm/config/Xres.cpp
  xlogin*borderWidth: 1
  xlogin*frameWidth: 5
  xlogin*innerFramesWidth: 2
-@@ -40,6 +45,8 @@
+@@ -52,6 +50,8 @@
  xlogin*background: grey
  !xlogin*foreground: darkgreen
  xlogin*greetColor: Blue3
 +#else
-+xlogin*greetColor: CadetBlue
++login*greetColor: CadetBlue
  #endif /* XPM */
  xlogin*failColor: red
  *Foreground: black
-@@ -76,6 +83,6 @@
- Chooser*allowShellResize:	false
- Chooser*viewport.forceBars:	true
- Chooser*label.font:		*-new century schoolbook-bold-i-normal-*-240-*
--Chooser*label.label:		XDMCP Host Menu  from CLIENTHOST
-+Chooser*label.label:		XDMCP Host Menu from CLIENTHOST
- Chooser*list.font:		-*-*-medium-r-normal-*-*-230-*-*-c-*-iso8859-1
- Chooser*Command.font:		*-new century schoolbook-bold-r-normal-*-180-*
-diff -urN xc/programs/xdm~/greeter/Imakefile xc/programs/xdm/greeter/Imakefile
---- xc/programs/xdm~/greeter/Imakefile	Wed Jun 14 14:43:32 2000
-+++ xc/programs/xdm/greeter/Imakefile	Thu Sep  7 18:17:08 2000
-@@ -76,8 +76,6 @@
- INCLUDES = -I.. $(KRBIV_INCLUDES) $(KRB5_INCLUDE)
-  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
---- xc/programs/xdm/config/Imakefile~	Thu Nov  9 23:37:34 2000
-+++ xc/programs/xdm/config/Imakefile	Thu Nov  9 23:38:18 2000
-@@ -5,9 +5,7 @@
+--- xc/programs/xdm/config/Imakefile.orig	2006-01-09 16:01:05.000000000 +0100
++++ xc/programs/xdm/config/Imakefile	2006-06-11 02:49:16.806881792 +0200
+@@ -4,13 +4,7 @@
  
  all:: Xservers.ws xdm-config Xservers Xresources
  
--#if defined(i386Architecture) && (defined(NetBSDArchitecture) || defined(OpenBSDArchitecture))
+-#if (defined(i386Architecture) || defined(AMD64Architecture)) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture))
 -DEFAULTVT=vt05
 -#endif
+-
+-#if defined(LinuxDistribution) && (LinuxDistribution == LinuxDebian)
+-DEFAULTVT=vt7
+-#endif
 +DEFAULTVT=vt9
  
  #ifndef XdmPixmap
  # define XdmPixmap XFree86.xpm
+@@ -36,7 +30,11 @@
+ #endif
+ 
+ CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter)
+-CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter)
++#ifdef LinuxArchitecture
++CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DLINUX=1 -DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMVARDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DXDMVARDIR=$(XDMVARDIR) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
++#else
++CppFileTarget(xdm-config,xdm-conf.cpp,$(XPM_DEFINES) -DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH="$(BINDIR)/chooser",NullParameter)
++#endif /* LinuxArchitecture */
+ CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
+ 
+ LinkFile(Xservers,Xservers.$(SERVERSTYPE))