diff options
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/xorg-server/ChangeLog | 16 | ||||
-rw-r--r-- | x11-base/xorg-server/Manifest | 33 | ||||
-rw-r--r-- | x11-base/xorg-server/files/digest-xorg-server-1.0.1-r4 | 6 | ||||
-rw-r--r-- | x11-base/xorg-server/files/digest-xorg-server-1.0.2 | 6 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch | 18 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch | 17 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.0.1-amd64-fix-for-glx.patch | 12 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.0.1-backtrace.patch | 18 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.0.2-Sbus.patch (renamed from x11-base/xorg-server/files/xorg-server-1.0.1-Sbus.patch) | 0 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch | 16 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.0.2.ebuild (renamed from x11-base/xorg-server/xorg-server-1.0.1-r4.ebuild) | 7 |
11 files changed, 51 insertions, 98 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index c78b07a0e852..4f13499d9fd3 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.88 2006/02/19 03:54:56 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.89 2006/03/21 06:16:26 spyderous Exp $ + +*xorg-server-1.0.2 (21 Mar 2006) + + 21 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>; + -files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch, + -files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch, + -files/xorg-server-1.0.1-Sbus.patch, + -files/xorg-server-1.0.1-amd64-fix-for-glx.patch, + -files/xorg-server-1.0.1-backtrace.patch, + +files/xorg-server-1.0.2-Sbus.patch, + +files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch, + -xorg-server-1.0.1-r4.ebuild, +xorg-server-1.0.2.ebuild: + (#125803) Fix local root vulnerability present in 6.8.99.x and newer. This + does NOT affect 6.8.2. *xorg-server-1.0.1-r4 (19 Feb 2006) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 557cc09ded53..f16910a4d340 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,27 +1,18 @@ MD5 aaa75aa89086e496d9725756b1afc201 ChangeLog 17685 RMD160 e712c8500911bfe730c69c9085201faa6249b472 ChangeLog 17685 SHA256 bfeb5d9c18c506bf906e85442ffbbffbcb9fd08e3c0f72ff9ab4711a1f1d68ab ChangeLog 17685 -MD5 86320440e484d8e90b27370ab2519e56 files/digest-xorg-server-1.0.1-r4 506 -RMD160 6e633c70f3e3b764f2d868d18b30bf0b5e007cc2 files/digest-xorg-server-1.0.1-r4 506 -SHA256 c0f208ece5b8014af656dbc7587ed2c363785a60f7c165dd60d32537ac744b88 files/digest-xorg-server-1.0.1-r4 506 -MD5 1b8b160cdbeaf3a2994f50e83d9fa8d7 files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch 663 -RMD160 ce0868d46d92431db41d474a77fea184f6a61682 files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch 663 -SHA256 3535e137595623f7f5f23b0a8ee8b52d4d5acf7b6dfb534dff5f537e68603c6b files/xorg-server-1.0.1-64bit-fix-have-dix-config.patch 663 -MD5 8fa71f7fa2e17a2ccd41532909b153a8 files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch 766 -RMD160 595ccef38810f2ec5056999ba1f5ce8f22b29bd0 files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch 766 -SHA256 1bceddffeacbf67202b2aff6dba27234746b37004a186415560a4cd8896458f1 files/xorg-server-1.0.1-64bit-fix-indirect-vertex-array.patch 766 -MD5 912a66d58d73ad9c95c1c7d40c71f679 files/xorg-server-1.0.1-Sbus.patch 2388 -RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 files/xorg-server-1.0.1-Sbus.patch 2388 -SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e files/xorg-server-1.0.1-Sbus.patch 2388 -MD5 900d8194df467de2c86276d446522062 files/xorg-server-1.0.1-amd64-fix-for-glx.patch 414 -RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 files/xorg-server-1.0.1-amd64-fix-for-glx.patch 414 -SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4 files/xorg-server-1.0.1-amd64-fix-for-glx.patch 414 -MD5 21e8ec19796104d0b0136766513c2ed7 files/xorg-server-1.0.1-backtrace.patch 668 -RMD160 481b146703a9ada524c7ce69cffa1f16cb7d62cd files/xorg-server-1.0.1-backtrace.patch 668 -SHA256 f27b5e39557bf1c628ace760166e78a6781bfc6a45c12316895d360e2e208915 files/xorg-server-1.0.1-backtrace.patch 668 +MD5 28ef3356bae2a3111683df5b09d957af files/digest-xorg-server-1.0.2 506 +RMD160 a79839e89938026d9d530cde5c04938c24991f8f files/digest-xorg-server-1.0.2 506 +SHA256 f51c5d0915b168cc810ab564ef88b854d97a461f83dbb60f0c018856582b9ca7 files/digest-xorg-server-1.0.2 506 +MD5 912a66d58d73ad9c95c1c7d40c71f679 files/xorg-server-1.0.2-Sbus.patch 2388 +RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 files/xorg-server-1.0.2-Sbus.patch 2388 +SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e files/xorg-server-1.0.2-Sbus.patch 2388 +MD5 39d2b9cdc89d0882a414d621cb496982 files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062 +RMD160 ba444145faf16e3bf4e31e07053df064bc07be7f files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062 +SHA256 220bafc2023ef45413713d9463c4f593c5bc390a3bba009b0a20989fd8d3b05b files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156 -MD5 f3ba53d6a63062ee0ea0bf0585b029cc xorg-server-1.0.1-r4.ebuild 4363 -RMD160 f746917fea93e067de91da91a439e089008fd073 xorg-server-1.0.1-r4.ebuild 4363 -SHA256 ea49a1a54dc633672006381be169d2ac3493ca4fabdabf61ca7a1ada4fe49b3e xorg-server-1.0.1-r4.ebuild 4363 +MD5 f11c2bed6ad50c49e1dad2782c5d2fc0 xorg-server-1.0.2.ebuild 4225 +RMD160 e6784c67b8766e65b01588f9ba1ce903b199f918 xorg-server-1.0.2.ebuild 4225 +SHA256 ccb603e5418394dc741575b1f51aa677b608d3f9e6f87ad13018e547a6f5a00c xorg-server-1.0.2.ebuild 4225 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) diff --git a/x11-base/xorg-server/xorg-server-1.0.1-r4.ebuild b/x11-base/xorg-server/xorg-server-1.0.2.ebuild index 564e61365f5e..8842e8c30fc4 100644 --- a/x11-base/xorg-server/xorg-server-1.0.1-r4.ebuild +++ b/x11-base/xorg-server/xorg-server-1.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.1-r4.ebuild,v 1.1 2006/02/19 03:54:56 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.2.ebuild,v 1.1 2006/03/21 06:16:26 spyderous Exp $ # Must be before x-modular eclass is inherited # Hack to make sure autoreconf gets run @@ -16,10 +16,7 @@ MESA_P="${MESA_PN}-${MESA_PV}" MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}" PATCHES="${FILESDIR}/${P}-Sbus.patch - ${FILESDIR}/${P}-backtrace.patch - ${FILESDIR}/${P}-amd64-fix-for-glx.patch - ${FILESDIR}/${P}-64bit-fix-have-dix-config.patch - ${FILESDIR}/${P}-64bit-fix-indirect-vertex-array.patch" + ${FILESDIR}/${P}-sparc64-cfbrrop-fix.patch" SRC_URI="${SRC_URI} mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2" |