- security fix. (XFree86 Font Information File Buffer Overflow

[packages/XFree86.git] / XFree86-xdm-fixes.patch

diff --git a/XFree86-xdm-fixes.patch b/XFree86-xdm-fixes.patch
index f50bf0cc827d8c2988c7453d3ac4d13604c9d2e7..fb3e841ecdee033b5d6cdc0924fbd409124c05df 100644 (file)
--- a/XFree86-xdm-fixes.patch
+++ b/XFree86-xdm-fixes.patch
@@ -30,7 +30,7 @@ diff -urN xc.orig/programs/xdm/config/Imakefile xc/programs/xdm/config/Imakefile
  
  all:: Xservers.ws xdm-config Xservers Xresources
  
--#if defined(i386Architecture) && (defined(NetBSDArchitecture) || defined(OpenBSDArchitecture))
+-#if defined(i386Architecture) && (defined(KNetBSDArchitecture) || defined(KOpenBSDArchitecture))
 -DEFAULTVT=vt05
 -#endif
 -
@@ -54,13 +54,13 @@ diff -urN xc.orig/programs/xdm/config/Imakefile xc/programs/xdm/config/Imakefile
  CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter)
  
  LinkFile(Xservers,Xservers.$(SERVERSTYPE))
-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
+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 @@
- /**/#endif
+ XHASHendif
  #endif /* XPM */
- /**/#ifdef COLOR
+ XHASHifdef COLOR
 -#ifndef XPM
 -xlogin*greetColor: CadetBlue
 -#else