-rel 19; fix for CVE-2006-6101 CVE-2006-6102 CVE-2006-6103

[packages/X11.git] / XFree86-GLcore-strip-a-workaround.patch

diff --git a/XFree86-GLcore-strip-a-workaround.patch b/XFree86-GLcore-strip-a-workaround.patch
index 34b35d62d1694e33993fafde248fd63d6563251b..1e584ecdd633ec78372bc16afa52595d85925865 100644 (file)
--- a/XFree86-GLcore-strip-a-workaround.patch
+++ b/XFree86-GLcore-strip-a-workaround.patch
@@ -1,39 +1,24 @@
---- XFree86-4.2.99.901/xc/lib/GL/mesa/src/Imakefile.inc.orig   Thu Nov 14 22:01:16 2002
-+++ XFree86-4.2.99.901/xc/lib/GL/mesa/src/Imakefile.inc        Thu Feb 13 21:02:28 2003
-@@ -76,10 +76,6 @@
- COREMESASRCS = $(COREMESABASESRCS) \
-               $(MESABUILDDIR)array_cache/ac_context.c \
-               $(MESABUILDDIR)array_cache/ac_import.c \
--              $(MESABUILDDIR)math/m_debug_clip.c \
--              $(MESABUILDDIR)math/m_debug_norm.c \
--              $(MESABUILDDIR)math/m_debug_vertex.c \
--              $(MESABUILDDIR)math/m_debug_xform.c \
-               $(MESABUILDDIR)math/m_eval.c \
-               $(MESABUILDDIR)math/m_matrix.c \
-               $(MESABUILDDIR)math/m_translate.c \
---- XFree86-4.2.99.901/xc/lib/GL/mesa/src/math/Imakefile.inc.orig      Thu Nov 14 22:01:17 2002
-+++ XFree86-4.2.99.901/xc/lib/GL/mesa/src/math/Imakefile.inc   Fri Feb 14 08:01:51 2003
-@@ -30,10 +30,7 @@
- LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/math)
+--- xc/lib/GL/mesa/math/Imakefile.inc.orig     2004-04-22 15:58:40.000000000 +0200
++++ xc/lib/GL/mesa/math/Imakefile.inc  2006-06-11 03:29:48.922144072 +0200
+@@ -71,19 +71,13 @@
+  MATH_MESA_UOBJS = $(MESA_MATH_OBJS)
  #endif
  
--  MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_debug_clip.o \
--                 $(MESAMATHBUILDDIR)m_debug_norm.o \
--                 $(MESAMATHBUILDDIR)m_debug_xform.o \
--                 $(MESAMATHBUILDDIR)m_debug_vertex.o \
-+  MESA_MATH_OBJS = \
-                  $(MESAMATHBUILDDIR)m_eval.o \
-                  $(MESAMATHBUILDDIR)m_matrix.o \
-                  $(MESAMATHBUILDDIR)m_translate.o \
-@@ -42,10 +39,7 @@
-                  $(MESAMATHBUILDDIR)m_xform.o
+- MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_debug_clip.o \
+-                 $(MESAMATHBUILDDIR)debugger/m_debug_norm.o \
+-                 $(MESAMATHBUILDDIR)debugger/m_debug_xform.o \
+-                 $(MESAMATHBUILDDIR)debugger/m_eval.o \
++ MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_eval.o \
+                  $(MESAMATHBUILDDIR)debugger/m_matrix.o \
+                  $(MESAMATHBUILDDIR)debugger/m_translate.o \
+                  $(MESAMATHBUILDDIR)debugger/m_vector.o \
+                  $(MESAMATHBUILDDIR)debugger/m_xform.o
  
- #if defined(DoSharedLib) && DoSharedLib
-- MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_debug_clip.o \
--                 $(MESAMATHBUILDDIR)unshared/m_debug_norm.o \
--                 $(MESAMATHBUILDDIR)unshared/m_debug_xform.o \
--                 $(MESAMATHBUILDDIR)unshared/m_debug_vertex.o \
-+ MESA_MATH_UOBJS = \
-                  $(MESAMATHBUILDDIR)unshared/m_eval.o \
-                  $(MESAMATHBUILDDIR)unshared/m_matrix.o \
-                  $(MESAMATHBUILDDIR)unshared/m_translate.o \
+- MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_debug_clip.o \
+-                 $(MESAMATHBUILDDIR)profiled/m_debug_norm.o \
+-                 $(MESAMATHBUILDDIR)profiled/m_debug_xform.o \
+-                 $(MESAMATHBUILDDIR)profiled/m_eval.o \
++ MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_eval.o \
+                  $(MESAMATHBUILDDIR)profiled/m_matrix.o \
+                  $(MESAMATHBUILDDIR)profiled/m_translate.o \
+                  $(MESAMATHBUILDDIR)profiled/m_vector.o \