(#125803) Fix local root vulnerability present in 6.8.99.x and newer. This does NOT affect 6.8.2.

(Portage version: 2.1_pre6-r3)

8 files changed, 22 insertions, 71 deletions

diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.1-r4 b/x11-base/xorg-server/files/digest-xorg-server-1.0.1-r4
deleted file mode 100644
index 6804ff2d5f72..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.1-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009
-RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009
-SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009
-MD5 aa0ccb851ec5f7f9b132581d9a5827e4 xorg-server-1.0.1.tar.bz2 5975199
-RMD160 e8433721dcd71963afa2d5bcbb2764fdc838e524 xorg-server-1.0.1.tar.bz2 5975199
-SHA256 54b1d6ba0df10b8b1a9c962b509e0e95dd76a9742a5adabcff36ee7087f20e5d xorg-server-1.0.1.tar.bz2 5975199
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.2 b/x11-base/xorg-server/files/digest-xorg-server-1.0.2
new file mode 100644
index 000000000000..50f9fbe7144d
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.2
@@ -0,0 +1,6 @@
+MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009
+RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009
+SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009
+MD5 5cd3316f07ed32a05cbd69e73a71bc74 xorg-server-1.0.2.tar.bz2 6006486
+RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 xorg-server-1.0.2.tar.bz2 6006486
+SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba xorg-server-1.0.2.tar.bz2 6006486
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch b/x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch
deleted file mode 100644
index 55177bcfed70..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v
-rcsdiff: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.70
-retrieving revision 1.71
-diff -u -r1.70 -r1.71
---- ../Mesa-6.4.2/src/mesa/main/glheader.h	2006/02/11 02:59:38	1.70
-+++ ../Mesa-6.4.2/src/mesa/main/glheader.h	2006/02/15 21:03:34	1.71
-@@ -46,6 +46,9 @@
- #ifndef GLHEADER_H
- #define GLHEADER_H
- 
-+#ifdef HAVE_DIX_CONFIG_H
-+#include "dix-config.h"
-+#endif
- 
- #if defined(XFree86LOADER) && defined(IN_MODULE) && !defined(NO_LIBCWRAPPER)
- #include "xf86_ansic.h"
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch b/x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch
deleted file mode 100644
index 4c1291b107d2..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v
-rcsdiff: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- ../Mesa-6.4.2/src/glx/x11/indirect_vertex_array.c	2005/08/19 18:53:26	1.6
-+++ ../Mesa-6.4.2/src/glx/x11/indirect_vertex_array.c	2006/02/14 15:04:45	1.7
-@@ -530,7 +530,7 @@
- emit_DrawArrays_header_old( __GLXcontext * gc,
- 			    struct array_state_vector * arrays,
- 			    size_t * elements_per_request,
--			    size_t * total_requests,
-+			    unsigned int * total_requests,
- 			    GLenum mode, GLsizei count )
- {
-     size_t command_size;
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.1-amd64-fix-for-glx.patch b/x11-base/xorg-server/files/xorg-server-1.0.1-amd64-fix-for-glx.patch
deleted file mode 100644
index 23aa89a7f4af..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.0.1-amd64-fix-for-glx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../Mesa-6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c	2005-11-30 02:02:16.000000000 +0300
-+++ ../Mesa-6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c	2006-02-07 10:38:46.000000000 +0300
-@@ -39,6 +39,9 @@
- # include "imports.h"
- # define __glXMemset  memset
- #else
-+# if defined (HAVE_DIX_CONFIG_H)
-+#  include <dix-config.h>
-+# endif
- # include <X11/X.h>
- # include <GL/glx.h>
- # include "GL/glxint.h"
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.1-backtrace.patch b/x11-base/xorg-server/files/xorg-server-1.0.1-backtrace.patch
deleted file mode 100644
index 60b834c463b7..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.0.1-backtrace.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Restore backtrace support.
-
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/include/xorg-config.h.in,v
-rcsdiff: /cvs/xorg/xserver/xorg/include/xorg-config.h.in,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -r1.12 -r1.13
---- xorg-server-1.0.1.orig/xorg/include/xorg-config.h.in	2005/12/02 06:02:44	1.12
-+++ xorg-server-1.0.1/xorg/include/xorg-config.h.in	2006/01/26 00:23:44	1.13
-@@ -106,4 +106,7 @@
- /* System has wscons console */
- #undef WSCONS_SUPPORT
- 
-+/* Has backtrace support */
-+#undef HAVE_BACKTRACE
-+
- #endif /* _XORG_CONFIG_H_ */
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.1-Sbus.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-Sbus.patch
index f9b8e7b3822f..f9b8e7b3822f 100644
--- a/x11-base/xorg-server/files/xorg-server-1.0.1-Sbus.patch
+++ b/x11-base/xorg-server/files/xorg-server-1.0.2-Sbus.patch
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch b/x11-base/xorg-server/files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch
new file mode 100644
index 000000000000..13a66d4efecf
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch
@@ -0,0 +1,16 @@
+===================================================================
+RCS file: /srv/anoncvs.freedesktop.org/cvs/xorg/xserver/xorg/cfb/cfbrrop.h,v
+rcsdiff: /srv/anoncvs.freedesktop.org/cvs/xorg/xserver/xorg/cfb/cfbrrop.h,v: warning: Unknown phrases like `commitid ...;' are present.
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- xorg.orig/xserver/xorg/cfb/cfbrrop.h	2005/07/03 07:01:15	1.4
++++ xorg/xserver/xorg/cfb/cfbrrop.h	2006/03/20 18:43:18	1.5
+@@ -284,6 +284,7 @@
+ #define RROP_UNROLL_CASE4(p,i)    RROP_UNROLL_CASE2(p,(i)+2) RROP_UNROLL_CASE2(p,i)
+ #define RROP_UNROLL_CASE8(p,i)    RROP_UNROLL_CASE4(p,(i)+4) RROP_UNROLL_CASE4(p,i)
+ #define RROP_UNROLL_CASE16(p,i)   RROP_UNROLL_CASE8(p,(i)+8) RROP_UNROLL_CASE8(p,i)
++#define RROP_UNROLL_CASE32(p,i)   RROP_UNROLL_CASE16(p,(i)+16) RROP_UNROLL_CASE16(p,i)
+ #define RROP_UNROLL_CASE3(p)	RROP_UNROLL_CASE2(p,2) RROP_UNROLL_CASE1(p,1)
+ #define RROP_UNROLL_CASE7(p)	RROP_UNROLL_CASE4(p,4) RROP_UNROLL_CASE3(p)
+ #define RROP_UNROLL_CASE15(p)	RROP_UNROLL_CASE8(p,8) RROP_UNROLL_CASE7(p)