- new; CVE-2006-6101 CVE-2006-6102 CVE-2006-6103

[packages/X11.git] / X11-PLD.patch

diff --git a/X11-PLD.patch b/X11-PLD.patch
index aba07e24074de0935966672b294d6708eb5d75dd..73598d15799fdba50ac68fb58e509ef56a2e4131 100644 (file)
--- a/X11-PLD.patch
+++ b/X11-PLD.patch
@@ -98,6 +98,24 @@ diff -ur X11-6.9.0.org/xc/config/cf/site.def X11-6.9.0/xc/config/cf/site.def
 diff -ur X11-6.9.0.org/xc/config/cf/X11.tmpl X11-6.9.0/xc/config/cf/X11.tmpl
 --- X11-6.9.0.org/xc/config/cf/X11.tmpl        2005-12-15 00:41:52.000000000 +0100
 +++ X11-6.9.0/xc/config/cf/X11.tmpl    2005-12-22 10:32:25.830963000 +0100
+@@ -597,7 +597,7 @@
+ #define BuildXF86RushLibrary  (BuildXF86RushExt && !BuildServersOnly)
+ #endif
+ #ifndef BuildDPSLibraries
+-#define BuildDPSLibraries     NO
++#define BuildDPSLibraries     YES
+ #endif
+ #ifndef BuildDPSLibrary
+ #define BuildDPSLibrary               BuildDPSLibraries
+@@ -693,7 +693,7 @@
+ #endif
+ 
+ #ifndef BuildXterm
+-#define BuildXterm            NO
++#define BuildXterm            YES
+ #endif
+ 
+ #ifndef BuildXkbcomp
 @@ -731,7 +731,7 @@
  #endif
  
@@ -138,7 +156,8 @@ diff -ur X11-6.9.0.org/xc/config/cf/X11.tmpl X11-6.9.0/xc/config/cf/X11.tmpl
 +#define FontDir /usr/share/fonts
  #endif
  #ifndef FontEncDir
- #define FontEncDir $(LIBDIR)/fonts/encodings
+-#define FontEncDir $(LIBDIR)/fonts/encodings
++#define FontEncDir /usr/share/fonts/encodings
  #endif
  #ifndef AdmDir
 -#define AdmDir /usr/adm
@@ -400,6 +419,15 @@ diff -ur X11-6.9.0.org/xc/programs/xdm/resource.c X11-6.9.0/xc/programs/xdm/reso
 diff -ur X11-6.9.0.org/xc/programs/xinit/Imakefile X11-6.9.0/xc/programs/xinit/Imakefile
 --- X11-6.9.0.org/xc/programs/xinit/Imakefile  2005-11-15 05:03:10.000000000 +0100
 +++ X11-6.9.0/xc/programs/xinit/Imakefile      2005-12-22 10:37:39.740963000 +0100
+@@ -72,7 +72,7 @@
+ 
+ MakeScriptFromCpp(xinitrc, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR))
+ 
+-MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DLIBDIR=$(LIBDIR))
++MakeScriptFromCpp(startx, -DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) $(COOKIEDEFS) -DSHELL_CMD=$(SHELL_CMD) -DBINDIR=$(BINDIR) -DLIBDIR=$(LIBDIR))
+ 
+ #if defined(SCOArchitecture) || defined(USLArchitecture)
+ ARCHMANDEFS=-D__SCOMAN__
 @@ -88,11 +88,12 @@
  #endif
  InstallManPage(startx,$(MANDIR))