From 1f61e2123b83dfe8d39f5f677f70675d80a7bc16 Mon Sep 17 00:00:00 2001 From: Joshua Baergen Date: Sat, 13 Jan 2007 17:12:25 +0000 Subject: [PATCH] Fix multiple vulnerabilities in Render and DBE extensions. (Bug #157421) Package-Manager: portage-2.1.2_rc4-r9 --- x11-base/xorg-server/ChangeLog | 12 +- x11-base/xorg-server/Manifest | 30 +- .../xorg-server/files/1.0.2-dbe-render.diff | 180 ++++++ .../xorg-server/files/1.1.1-dbe-render.diff | 183 ++++++ .../files/digest-xorg-server-1.0.2-r8 | 9 + .../files/digest-xorg-server-1.1.1-r4 | 6 + .../xorg-server/xorg-server-1.0.2-r8.ebuild | 209 +++++++ .../xorg-server/xorg-server-1.1.1-r4.ebuild | 554 ++++++++++++++++++ 8 files changed, 1177 insertions(+), 6 deletions(-) create mode 100644 x11-base/xorg-server/files/1.0.2-dbe-render.diff create mode 100644 x11-base/xorg-server/files/1.1.1-dbe-render.diff create mode 100644 x11-base/xorg-server/files/digest-xorg-server-1.0.2-r8 create mode 100644 x11-base/xorg-server/files/digest-xorg-server-1.1.1-r4 create mode 100644 x11-base/xorg-server/xorg-server-1.0.2-r8.ebuild create mode 100644 x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 47fa160ec15b..f935a08f1644 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,14 @@ # 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.205 2006/12/07 16:49:11 joshuabaergen Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.206 2007/01/13 17:12:25 joshuabaergen Exp $ + +*xorg-server-1.1.1-r4 (13 Jan 2007) +*xorg-server-1.0.2-r8 (13 Jan 2007) + + 13 Jan 2007; Joshua Baergen + +files/1.0.2-dbe-render.diff, +files/1.1.1-dbe-render.diff, + +xorg-server-1.0.2-r8.ebuild, +xorg-server-1.1.1-r4.ebuild: + Fix multiple vulnerabilities in Render and DBE extensions. (Bug #157421) 07 Dec 2006; Joshua Baergen xorg-server-1.1.1-r3.ebuild: diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index d4282b5d9c47..26b83045e45b 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -26,6 +26,10 @@ AUX 1.0.2-Xprint-xprintdir.patch 563 RMD160 559a4330ffe34a232e7e60dc9350925801be MD5 177828cd6b8ab3ce98f95bf2363d2036 files/1.0.2-Xprint-xprintdir.patch 563 RMD160 559a4330ffe34a232e7e60dc9350925801beeb9b files/1.0.2-Xprint-xprintdir.patch 563 SHA256 eec3e9eab8fa9ba6f84bd76c0048ffb48f39749f7355bd4d7d1c8423cb34fae1 files/1.0.2-Xprint-xprintdir.patch 563 +AUX 1.0.2-dbe-render.diff 5234 RMD160 878c913134f1ba74054eb2f41b660fdf2e3b170a SHA1 9d03a02ad6060ad48068700402ec79274bc13013 SHA256 b6a8d4b4314305f0998bcf0c62a5571a1b5a9baf1f692726b535c307bdd62a76 +MD5 d71c9106002bcaece8cbf3c4cc287fa8 files/1.0.2-dbe-render.diff 5234 +RMD160 878c913134f1ba74054eb2f41b660fdf2e3b170a files/1.0.2-dbe-render.diff 5234 +SHA256 b6a8d4b4314305f0998bcf0c62a5571a1b5a9baf1f692726b535c307bdd62a76 files/1.0.2-dbe-render.diff 5234 AUX 1.0.2-fix-readKernelMapping-overrun.patch 468 RMD160 6d1f528b14df15b1ff6b658ff611550c39014838 SHA1 67e69a37a74c7e47387769699c207f0a29bfd96d SHA256 28b0502d4e151813455a10a522488d1dddce8671492022433507ff61df277c12 MD5 a8fb013a42270146a12186aeb0651071 files/1.0.2-fix-readKernelMapping-overrun.patch 468 RMD160 6d1f528b14df15b1ff6b658ff611550c39014838 files/1.0.2-fix-readKernelMapping-overrun.patch 468 @@ -46,6 +50,10 @@ AUX 1.0.99.901-Xprint-xprintdir.patch 447 RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f MD5 e4ab51b8df81d9a3be044112dff3736f files/1.0.99.901-Xprint-xprintdir.patch 447 RMD160 7728ad1173bb6e8fcb73ddcfc3ef29f93cdde4f3 files/1.0.99.901-Xprint-xprintdir.patch 447 SHA256 4dcd1bcebfccf0b51956ea6f30bae2f0f9b7b1f62e215d16b63ef19b7433d955 files/1.0.99.901-Xprint-xprintdir.patch 447 +AUX 1.1.1-dbe-render.diff 5323 RMD160 cbddae4efaa558f3c4ea0b256bd14cc005251493 SHA1 67cfe51fdf314db3cf712cb180bdc7635788ffa3 SHA256 0c0e0c6c8e7f1928d595c90cccfa2dacdcdf52656271b2fea52f202597e5d7ab +MD5 cffab2cec60a2af892e2853840cf2659 files/1.1.1-dbe-render.diff 5323 +RMD160 cbddae4efaa558f3c4ea0b256bd14cc005251493 files/1.1.1-dbe-render.diff 5323 +SHA256 0c0e0c6c8e7f1928d595c90cccfa2dacdcdf52656271b2fea52f202597e5d7ab files/1.1.1-dbe-render.diff 5323 AUX 1.1.1-fix-xrandr-zoom-keys.patch 6332 RMD160 cec1b86e0a6ea88e1e65543046fd1b91ab112b04 SHA1 ebaea3bdff2564d898fe0f1bcacdafcbcfe4b9f6 SHA256 b7bb87d2170f2dd369a8b3a496dae0e93792419ccc7c78449e9affc8f07650ac MD5 919801a6a806a9cf93777ee8bb4367bc files/1.1.1-fix-xrandr-zoom-keys.patch 6332 RMD160 cec1b86e0a6ea88e1e65543046fd1b91ab112b04 files/1.1.1-fix-xrandr-zoom-keys.patch 6332 @@ -144,6 +152,10 @@ EBUILD xorg-server-1.0.2-r7.ebuild 6207 RMD160 41dda5f10ca8f78c493ae45f6ac2e9b2c MD5 2d90cbe6238854aa56a67b693a893367 xorg-server-1.0.2-r7.ebuild 6207 RMD160 41dda5f10ca8f78c493ae45f6ac2e9b2c3ebabbc xorg-server-1.0.2-r7.ebuild 6207 SHA256 6aaa82962aea02ed734f0472ef3e34cbed88d5b0c0673bf8bb0e2d5bf2e73c35 xorg-server-1.0.2-r7.ebuild 6207 +EBUILD xorg-server-1.0.2-r8.ebuild 6250 RMD160 ae897d4f3e2a51cedd020d7d9a7d0f1e291f0323 SHA1 a5f841c4996ce4098ac78c72eab64bb7f9363e9e SHA256 67342d189719f58b9cb77bfb6ce707539a92d4c533338a10413c188311a43841 +MD5 f20d66e2e73cc82e38f41fedf1fd4203 xorg-server-1.0.2-r8.ebuild 6250 +RMD160 ae897d4f3e2a51cedd020d7d9a7d0f1e291f0323 xorg-server-1.0.2-r8.ebuild 6250 +SHA256 67342d189719f58b9cb77bfb6ce707539a92d4c533338a10413c188311a43841 xorg-server-1.0.2-r8.ebuild 6250 EBUILD xorg-server-1.1.0-r1.ebuild 24569 RMD160 89333463053a1326e882153cc1aa5b9e81b27eb0 SHA1 24066b45f3409cc7516ce0f34395f408943c69a8 SHA256 8eedd866ec4963ae94241d3ea90a8e80e2aa3f35a0f20fa793fde05e338bb995 MD5 6931e96ed29cdf066cf9bf399c751ad5 xorg-server-1.1.0-r1.ebuild 24569 RMD160 89333463053a1326e882153cc1aa5b9e81b27eb0 xorg-server-1.1.0-r1.ebuild 24569 @@ -160,6 +172,10 @@ EBUILD xorg-server-1.1.1-r3.ebuild 17313 RMD160 72d71c3354cf5dbe311f9b0fd141e131 MD5 845f1194f18874f9ac22d3049ac08823 xorg-server-1.1.1-r3.ebuild 17313 RMD160 72d71c3354cf5dbe311f9b0fd141e1315764dce6 xorg-server-1.1.1-r3.ebuild 17313 SHA256 4315cbac1783b2770ff3e3a17fb99a6feae347f4ea17e74e24d8b8ddf1fae6a8 xorg-server-1.1.1-r3.ebuild 17313 +EBUILD xorg-server-1.1.1-r4.ebuild 17349 RMD160 3731bb298f10374c4b65fb6b92afcf36f18d9954 SHA1 3df477e2efd565d78e4de116600455bb27ea56b0 SHA256 a51ed6332cb159b472459f62886ff5718b0c78d304e3b1c8394e6d2732891410 +MD5 2115abb8c5fd9a7b97cfe2a4fe2bc2c5 xorg-server-1.1.1-r4.ebuild 17349 +RMD160 3731bb298f10374c4b65fb6b92afcf36f18d9954 xorg-server-1.1.1-r4.ebuild 17349 +SHA256 a51ed6332cb159b472459f62886ff5718b0c78d304e3b1c8394e6d2732891410 xorg-server-1.1.1-r4.ebuild 17349 EBUILD xorg-server-1.1.1.ebuild 15382 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac SHA1 527956284fa7c6f68126db52adb3a25ac078d171 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb MD5 9a5fa768a77f72877ec3303f890f614e xorg-server-1.1.1.ebuild 15382 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac xorg-server-1.1.1.ebuild 15382 @@ -172,10 +188,10 @@ EBUILD xorg-server-1.2.99.0.ebuild 16872 RMD160 f6237988fdbc865a570501dac3cbebe6 MD5 cf7a1a9de26daa4e10c2e898537fac3a xorg-server-1.2.99.0.ebuild 16872 RMD160 f6237988fdbc865a570501dac3cbebe64d169c61 xorg-server-1.2.99.0.ebuild 16872 SHA256 d216d96349bb34943c7f92fda6cb1d636fb6a5f912a051a08a74c18be99ab08d xorg-server-1.2.99.0.ebuild 16872 -MISC ChangeLog 42643 RMD160 0a45f6c85d03e474a06f7b1174928ca86323639f SHA1 c2be09ddb4dc7a83257a5649266740eef4ff1b10 SHA256 add5daac5ee8529afbae63d0ad459c5f7e6b7d6b4ce3fb81e659638bd3eb42dc -MD5 9d3a637556b927f9668285105ca523eb ChangeLog 42643 -RMD160 0a45f6c85d03e474a06f7b1174928ca86323639f ChangeLog 42643 -SHA256 add5daac5ee8529afbae63d0ad459c5f7e6b7d6b4ce3fb81e659638bd3eb42dc ChangeLog 42643 +MISC ChangeLog 42974 RMD160 edd6a062ecd098412df273f3515b28132a8f0cd5 SHA1 9fe8bfe90ba15ea578cec245a7d78d955c17d2af SHA256 23e3080240348356e3b9a9570614b05500816fa86ee9ef1b83dafc547a8f4f43 +MD5 f1005d2a934fdedb843daa2d2c58f515 ChangeLog 42974 +RMD160 edd6a062ecd098412df273f3515b28132a8f0cd5 ChangeLog 42974 +SHA256 23e3080240348356e3b9a9570614b05500816fa86ee9ef1b83dafc547a8f4f43 ChangeLog 42974 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 @@ -183,6 +199,9 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r7 771 RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r7 771 SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r7 771 +MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r8 771 +RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r8 771 +SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r8 771 MD5 0b4a5b66471e1dcc4176e5e3eac4e47f files/digest-xorg-server-1.1.0-r1 500 RMD160 5b942d1403fee2bf47c380017eed89ad1bf6121c files/digest-xorg-server-1.1.0-r1 500 SHA256 356da215b18f2bbfa4e1509d15d26e56ba0372f28390d3c1903375f6c2f7abae files/digest-xorg-server-1.1.0-r1 500 @@ -198,6 +217,9 @@ SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/di MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r3 506 RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r3 506 SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r3 506 +MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r4 506 +RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r4 506 +SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r4 506 MD5 8203c18c558952f0a69a3fca15af4f09 files/digest-xorg-server-1.1.99.903-r1 521 RMD160 e2db17a615b6007f008fb44ff9640f087e6879f1 files/digest-xorg-server-1.1.99.903-r1 521 SHA256 1099d4eb491d583a636bd3b40807688de8819b9db392b88cd6bf11947195a71c files/digest-xorg-server-1.1.99.903-r1 521 diff --git a/x11-base/xorg-server/files/1.0.2-dbe-render.diff b/x11-base/xorg-server/files/1.0.2-dbe-render.diff new file mode 100644 index 000000000000..41d5d95cb31b --- /dev/null +++ b/x11-base/xorg-server/files/1.0.2-dbe-render.diff @@ -0,0 +1,180 @@ +--- dbe/dbe.c.old 2007-01-07 09:56:29.000000000 -0700 ++++ dbe/dbe.c 2007-01-07 10:00:13.000000000 -0700 +@@ -41,6 +41,12 @@ + #include + #endif + ++#if HAVE_STDINT_T ++#include ++#elif !defined(UINT32_MAX) ++#define UINT32_MAX 0xffffffffU ++#endif ++ + #include + #include + #include "scrnintstr.h" +@@ -733,11 +739,14 @@ ProcDbeSwapBuffers(client) + return(Success); + } + ++ if (nStuff > UINT32_MAX / sizeof(DbeSwapInfoRec)) ++ return BadAlloc; ++ + /* Get to the swap info appended to the end of the request. */ + dbeSwapInfo = (xDbeSwapInfo *)&stuff[1]; + + /* Allocate array to record swap information. */ +- swapInfo = (DbeSwapInfoPtr)ALLOCATE_LOCAL(nStuff * sizeof(DbeSwapInfoRec)); ++ swapInfo = (DbeSwapInfoPtr)Xalloc(nStuff * sizeof(DbeSwapInfoRec)); + if (swapInfo == NULL) + { + return(BadAlloc); +@@ -752,14 +761,14 @@ ProcDbeSwapBuffers(client) + if (!(pWin = SecurityLookupWindow(dbeSwapInfo[i].window, client, + SecurityWriteAccess))) + { +- DEALLOCATE_LOCAL(swapInfo); ++ Xfree(swapInfo); + return(BadWindow); + } + + /* Each window must be double-buffered - BadMatch. */ + if (DBE_WINDOW_PRIV(pWin) == NULL) + { +- DEALLOCATE_LOCAL(swapInfo); ++ Xfree(swapInfo); + return(BadMatch); + } + +@@ -768,7 +777,7 @@ ProcDbeSwapBuffers(client) + { + if (dbeSwapInfo[i].window == dbeSwapInfo[j].window) + { +- DEALLOCATE_LOCAL(swapInfo); ++ Xfree(swapInfo); + return(BadMatch); + } + } +@@ -779,7 +788,7 @@ ProcDbeSwapBuffers(client) + (dbeSwapInfo[i].swapAction != XdbeUntouched ) && + (dbeSwapInfo[i].swapAction != XdbeCopied )) + { +- DEALLOCATE_LOCAL(swapInfo); ++ Xfree(swapInfo); + return(BadValue); + } + +@@ -809,12 +818,12 @@ ProcDbeSwapBuffers(client) + error = (*pDbeScreenPriv->SwapBuffers)(client, &nStuff, swapInfo); + if (error != Success) + { +- DEALLOCATE_LOCAL(swapInfo); ++ Xfree(swapInfo); + return(error); + } + } + +- DEALLOCATE_LOCAL(swapInfo); ++ Xfree(swapInfo); + return(Success); + + } /* ProcDbeSwapBuffers() */ +@@ -898,10 +907,12 @@ ProcDbeGetVisualInfo(client) + + REQUEST_AT_LEAST_SIZE(xDbeGetVisualInfoReq); + ++ if (stuff->n > UINT32_MAX / sizeof(DrawablePtr)) ++ return BadAlloc; + /* Make sure any specified drawables are valid. */ + if (stuff->n != 0) + { +- if (!(pDrawables = (DrawablePtr *)ALLOCATE_LOCAL(stuff->n * ++ if (!(pDrawables = (DrawablePtr *)Xalloc(stuff->n * + sizeof(DrawablePtr)))) + { + return(BadAlloc); +@@ -914,7 +925,7 @@ ProcDbeGetVisualInfo(client) + if (!(pDrawables[i] = (DrawablePtr)SecurityLookupDrawable( + drawables[i], client, SecurityReadAccess))) + { +- DEALLOCATE_LOCAL(pDrawables); ++ Xfree(pDrawables); + return(BadDrawable); + } + } +@@ -926,7 +937,7 @@ ProcDbeGetVisualInfo(client) + { + if (pDrawables) + { +- DEALLOCATE_LOCAL(pDrawables); ++ Xfree(pDrawables); + } + + return(BadAlloc); +@@ -953,7 +964,7 @@ ProcDbeGetVisualInfo(client) + /* Free pDrawables if we needed to allocate it above. */ + if (pDrawables) + { +- DEALLOCATE_LOCAL(pDrawables); ++ Xfree(pDrawables); + } + + return(BadAlloc); +@@ -1034,7 +1045,7 @@ ProcDbeGetVisualInfo(client) + + if (pDrawables) + { +- DEALLOCATE_LOCAL(pDrawables); ++ Xfree(pDrawables); + } + + return(client->noClientException); +--- render/render.c.old 2007-01-07 09:56:46.000000000 -0700 ++++ render/render.c 2007-01-07 09:58:10.000000000 -0700 +@@ -52,6 +52,12 @@ + #include "xf86_ansic.h" + #endif + ++#if HAVE_STDINT_H ++#include ++#elif !defined(UINT32_MAX) ++#define UINT32_MAX 0xffffffffU ++#endif ++ + static int ProcRenderQueryVersion (ClientPtr pClient); + static int ProcRenderQueryPictFormats (ClientPtr pClient); + static int ProcRenderQueryPictIndexValues (ClientPtr pClient); +@@ -1108,11 +1114,14 @@ ProcRenderAddGlyphs (ClientPtr client) + } + + nglyphs = stuff->nglyphs; ++ if (nglyphs > UINT32_MAX / sizeof(GlyphNewRec)) ++ return BadAlloc; ++ + if (nglyphs <= NLOCALGLYPH) + glyphsBase = glyphsLocal; + else + { +- glyphsBase = (GlyphNewPtr) ALLOCATE_LOCAL (nglyphs * sizeof (GlyphNewRec)); ++ glyphsBase = (GlyphNewPtr) Xalloc (nglyphs * sizeof (GlyphNewRec)); + if (!glyphsBase) + return BadAlloc; + } +@@ -1169,7 +1178,7 @@ ProcRenderAddGlyphs (ClientPtr client) + } + + if (glyphsBase != glyphsLocal) +- DEALLOCATE_LOCAL (glyphsBase); ++ Xfree (glyphsBase); + return client->noClientException; + bail: + while (glyphs != glyphsBase) +@@ -1178,7 +1187,7 @@ bail: + xfree (glyphs->glyph); + } + if (glyphsBase != glyphsLocal) +- DEALLOCATE_LOCAL (glyphsBase); ++ Xfree (glyphsBase); + return err; + } + diff --git a/x11-base/xorg-server/files/1.1.1-dbe-render.diff b/x11-base/xorg-server/files/1.1.1-dbe-render.diff new file mode 100644 index 000000000000..d2f27e5feb62 --- /dev/null +++ b/x11-base/xorg-server/files/1.1.1-dbe-render.diff @@ -0,0 +1,183 @@ +diff --git a/dbe/dbe.c b/dbe/dbe.c +index 5b43dd1..6a2ed6a 100644 +--- a/dbe/dbe.c ++++ b/dbe/dbe.c +@@ -39,6 +39,11 @@ + #endif + + #include ++#if HAVE_STDINT_T ++#include ++#elif !defined(UINT32_MAX) ++#define UINT32_MAX 0xffffffffU ++#endif + + #include + #include +@@ -713,11 +718,14 @@ ProcDbeSwapBuffers(ClientPtr client) + return(Success); + } + ++ if (nStuff > UINT32_MAX / sizeof(DbeSwapInfoRec)) ++ return BadAlloc; ++ + /* Get to the swap info appended to the end of the request. */ + dbeSwapInfo = (xDbeSwapInfo *)&stuff[1]; + + /* Allocate array to record swap information. */ +- swapInfo = (DbeSwapInfoPtr)ALLOCATE_LOCAL(nStuff * sizeof(DbeSwapInfoRec)); ++ swapInfo = (DbeSwapInfoPtr)Xalloc(nStuff * sizeof(DbeSwapInfoRec)); + if (swapInfo == NULL) + { + return(BadAlloc); +@@ -732,14 +740,14 @@ ProcDbeSwapBuffers(ClientPtr client) + if (!(pWin = SecurityLookupWindow(dbeSwapInfo[i].window, client, + SecurityWriteAccess))) + { +- DEALLOCATE_LOCAL(swapInfo); ++ Xfree(swapInfo); + return(BadWindow); + } + + /* Each window must be double-buffered - BadMatch. */ + if (DBE_WINDOW_PRIV(pWin) == NULL) + { +- DEALLOCATE_LOCAL(swapInfo); ++ Xfree(swapInfo); + return(BadMatch); + } + +@@ -748,7 +756,7 @@ ProcDbeSwapBuffers(ClientPtr client) + { + if (dbeSwapInfo[i].window == dbeSwapInfo[j].window) + { +- DEALLOCATE_LOCAL(swapInfo); ++ Xfree(swapInfo); + return(BadMatch); + } + } +@@ -759,7 +767,7 @@ ProcDbeSwapBuffers(ClientPtr client) + (dbeSwapInfo[i].swapAction != XdbeUntouched ) && + (dbeSwapInfo[i].swapAction != XdbeCopied )) + { +- DEALLOCATE_LOCAL(swapInfo); ++ Xfree(swapInfo); + return(BadValue); + } + +@@ -789,12 +797,12 @@ ProcDbeSwapBuffers(ClientPtr client) + error = (*pDbeScreenPriv->SwapBuffers)(client, &nStuff, swapInfo); + if (error != Success) + { +- DEALLOCATE_LOCAL(swapInfo); ++ Xfree(swapInfo); + return(error); + } + } + +- DEALLOCATE_LOCAL(swapInfo); ++ Xfree(swapInfo); + return(Success); + + } /* ProcDbeSwapBuffers() */ +@@ -876,10 +884,12 @@ ProcDbeGetVisualInfo(ClientPtr client) + + REQUEST_AT_LEAST_SIZE(xDbeGetVisualInfoReq); + ++ if (stuff->n > UINT32_MAX / sizeof(DrawablePtr)) ++ return BadAlloc; + /* Make sure any specified drawables are valid. */ + if (stuff->n != 0) + { +- if (!(pDrawables = (DrawablePtr *)ALLOCATE_LOCAL(stuff->n * ++ if (!(pDrawables = (DrawablePtr *)Xalloc(stuff->n * + sizeof(DrawablePtr)))) + { + return(BadAlloc); +@@ -892,7 +902,7 @@ ProcDbeGetVisualInfo(ClientPtr client) + if (!(pDrawables[i] = (DrawablePtr)SecurityLookupDrawable( + drawables[i], client, SecurityReadAccess))) + { +- DEALLOCATE_LOCAL(pDrawables); ++ Xfree(pDrawables); + return(BadDrawable); + } + } +@@ -904,7 +914,7 @@ ProcDbeGetVisualInfo(ClientPtr client) + { + if (pDrawables) + { +- DEALLOCATE_LOCAL(pDrawables); ++ Xfree(pDrawables); + } + + return(BadAlloc); +@@ -931,7 +941,7 @@ ProcDbeGetVisualInfo(ClientPtr client) + /* Free pDrawables if we needed to allocate it above. */ + if (pDrawables) + { +- DEALLOCATE_LOCAL(pDrawables); ++ Xfree(pDrawables); + } + + return(BadAlloc); +@@ -1012,7 +1022,7 @@ ProcDbeGetVisualInfo(ClientPtr client) + + if (pDrawables) + { +- DEALLOCATE_LOCAL(pDrawables); ++ Xfree(pDrawables); + } + + return(client->noClientException); +diff --git a/render/render.c b/render/render.c +index e4d8d6b..55f360a 100644 +--- a/render/render.c ++++ b/render/render.c +@@ -47,6 +47,12 @@ + #include + #include "cursorstr.h" + ++#if HAVE_STDINT_H ++#include ++#elif !defined(UINT32_MAX) ++#define UINT32_MAX 0xffffffffU ++#endif ++ + static int ProcRenderQueryVersion (ClientPtr pClient); + static int ProcRenderQueryPictFormats (ClientPtr pClient); + static int ProcRenderQueryPictIndexValues (ClientPtr pClient); +@@ -1103,11 +1109,14 @@ ProcRenderAddGlyphs (ClientPtr client) + } + + nglyphs = stuff->nglyphs; ++ if (nglyphs > UINT32_MAX / sizeof(GlyphNewRec)) ++ return BadAlloc; ++ + if (nglyphs <= NLOCALGLYPH) + glyphsBase = glyphsLocal; + else + { +- glyphsBase = (GlyphNewPtr) ALLOCATE_LOCAL (nglyphs * sizeof (GlyphNewRec)); ++ glyphsBase = (GlyphNewPtr) Xalloc (nglyphs * sizeof (GlyphNewRec)); + if (!glyphsBase) + return BadAlloc; + } +@@ -1164,7 +1173,7 @@ ProcRenderAddGlyphs (ClientPtr client) + } + + if (glyphsBase != glyphsLocal) +- DEALLOCATE_LOCAL (glyphsBase); ++ Xfree (glyphsBase); + return client->noClientException; + bail: + while (glyphs != glyphsBase) +@@ -1173,7 +1182,7 @@ bail: + xfree (glyphs->glyph); + } + if (glyphsBase != glyphsLocal) +- DEALLOCATE_LOCAL (glyphsBase); ++ Xfree (glyphsBase); + return err; + } + diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r8 b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r8 new file mode 100644 index 000000000000..b2e8218ffcfa --- /dev/null +++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r8 @@ -0,0 +1,9 @@ +MD5 2f35e003812df5817ebec8fc3c6943e8 1.0.2-overlay-window.patch.bz2 6388 +RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 1.0.2-overlay-window.patch.bz2 6388 +SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67 1.0.2-overlay-window.patch.bz2 6388 +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/digest-xorg-server-1.1.1-r4 b/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r4 new file mode 100644 index 000000000000..1330edc82b0a --- /dev/null +++ b/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r4 @@ -0,0 +1,6 @@ +MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257 +RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257 +SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257 +MD5 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103 +RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103 +SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103 diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r8.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r8.ebuild new file mode 100644 index 000000000000..83b395eba23e --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.0.2-r8.ebuild @@ -0,0 +1,209 @@ +# Copyright 1999-2007 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.2-r8.ebuild,v 1.1 2007/01/13 17:12:25 joshuabaergen Exp $ + +# Must be before x-modular eclass is inherited +# Hack to make sure autoreconf gets run +SNAPSHOT="yes" + +inherit flag-o-matic x-modular multilib + +OPENGL_DIR="xorg-x11" + +MESA_PN="Mesa" +MESA_PV="6.4.2" +MESA_P="${MESA_PN}-${MESA_PV}" +MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}" + +PATCHES="${FILESDIR}/${P}-Sbus.patch + ${FILESDIR}/CVE-2006-1526-xrender-mitri.patch + ${FILESDIR}/${P}-sparc64-cfbrrop-fix.patch + ${FILESDIR}/${P}-64bit-fix-indirect-vertex-array.patch + ${FILESDIR}/${P}-64bit-fix-have-dix-config.patch + ${FILESDIR}/${P}-64bit-fix-for-glx.patch + ${FILESDIR}/${P}-Xprt-build.patch + ${FILESDIR}/${P}-xprint-init.patch + ${FILESDIR}/${PV}-Xprint-xprintdir.patch + ${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch + ${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch + ${DISTDIR}/${PV}-overlay-window.patch.bz2 + ${FILESDIR}/${PV}-fix-readKernelMapping-overrun.patch + ${FILESDIR}/${PV}-fix-rom-read-dualhead.patch + ${FILESDIR}/x11r7.0-setuid.diff + ${FILESDIR}/${PV}-dbe-render.diff" + +SRC_URI="${SRC_URI} + mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2 + http://dev.gentoo.org/~spyderous/xorg-x11/1.0.2/1.0.2-overlay-window.patch.bz2" +DESCRIPTION="X.Org X servers" +# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work +RESTRICT="stricter" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="dri ipv6 minimal xprint" +RDEPEND="x11-libs/libXfont + x11-libs/xtrans + x11-libs/libXau + x11-libs/libXext + x11-libs/libX11 + x11-libs/libxkbfile + x11-libs/libXdmcp + x11-libs/libXmu + x11-libs/libXrender + x11-libs/libXi + media-libs/freetype + media-libs/mesa + media-fonts/font-adobe-75dpi + media-fonts/font-misc-misc + media-fonts/font-cursor-misc + x11-misc/xbitmaps + || ( x11-misc/xkeyboard-config x11-misc/xkbdata ) + x11-apps/iceauth + x11-apps/rgb + x11-apps/xauth + x11-apps/xinit + app-admin/eselect-opengl + x11-libs/libXaw + x11-libs/libXpm + x11-libs/libXxf86misc + x11-libs/libXxf86vm + !minimal? ( x11-libs/libdmx + x11-libs/libXtst + x11-libs/libXres ) + >=x11-libs/libxkbui-1.0.2 + x11-libs/liblbxutil" + # Xres is dmx-dependent, xkbui is xorgcfg-dependent + # Xaw is dmx- and xorgcfg-dependent + # Xpm is dmx- and xorgcfg-dependent, pulls in Xt + # Xxf86misc and Xxf86vm are xorgcfg-dependent + # liblbxutil is lbx- dependent +DEPEND="${RDEPEND} + x11-proto/randrproto + x11-proto/renderproto + >=x11-proto/fixesproto-4 + x11-proto/damageproto + x11-proto/xextproto + x11-proto/xproto + x11-proto/xf86dgaproto + x11-proto/xf86miscproto + x11-proto/xf86rushproto + x11-proto/xf86vidmodeproto + x11-proto/xf86bigfontproto + >=x11-proto/compositeproto-0.3 + x11-proto/recordproto + x11-proto/resourceproto + x11-proto/videoproto + x11-proto/scrnsaverproto + x11-proto/evieext + x11-proto/trapproto + >=x11-proto/xineramaproto-1.1-r1 + x11-proto/fontsproto + >=x11-proto/kbproto-1.0-r1 + x11-proto/inputproto + x11-proto/bigreqsproto + x11-proto/xcmiscproto + >=x11-proto/glproto-1.4.1_pre20051013 + !minimal? ( x11-proto/dmxproto ) + dri? ( x11-proto/xf86driproto + >=x11-libs/libdrm-2 ) + xprint? ( x11-proto/printproto + x11-apps/mkfontdir + x11-apps/mkfontscale + x11-apps/xplsprinters )" +LICENSE="${LICENSE} MIT" + +pkg_setup() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + + # --enable-xorg needed because darwin defaults off + # --enable-install-setuid needed because sparcs default off + CONFIGURE_OPTIONS=" + $(use_enable ipv6) + $(use_enable !minimal dmx) + $(use_enable !minimal xvfb) + $(use_enable !minimal xnest) + $(use_enable dri) + $(use_enable xprint) + --with-mesa-source=${WORKDIR}/${MESA_P} + --enable-xorg + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1" + + # (#121394) Causes window corruption + filter-flags -fweb + + # Nothing else provides new enough glxtokens.h + ewarn "Forcing on xorg-x11 for new enough glxtokens.h..." + OLD_IMPLEM="$(eselect opengl show)" + eselect opengl set --impl-headers ${OPENGL_DIR} +} + +src_install() { + x-modular_src_install + + dynamic_libgl_install + + use xprint && xprint_src_install +} + +pkg_postinst() { + switch_opengl_implem +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if ! has_version x11-base/xorg-server; then + if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then + rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules + fi + fi +} + +dynamic_libgl_install() { + # next section is to setup the dynamic libGL stuff + ebegin "Moving GL files for dynamic switching" + dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + local x="" + for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + fi + done + eend 0 +} + +switch_opengl_implem() { + # Switch to the xorg implementation. + # Use new opengl-update that will not reset user selected + # OpenGL interface ... + echo +# eselect opengl set --use-old ${OPENGL_DIR} + eselect opengl set ${OLD_IMPLEM} +} + +xprint_src_install() { + # RH-style init script, we provide a wrapper + exeinto /usr/$(get_libdir)/misc + doexe ${S}/Xprint/etc/init.d/xprint + # Patch init script for fonts location + sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \ + -i ${D}/usr/$(get_libdir)/misc/xprint + # Install the wrapper + newinitd ${FILESDIR}/xprint.init xprint + # Install profile scripts + insinto /etc/profile.d + doins ${S}/Xprint/etc/profile.d/xprint* + insinto /etc/X11/xinit/xinitrc.d + newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \ + 92xprint-xpserverlist.sh + # Patch profile scripts + sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \ + get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \ + ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh + # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo + dodoc ${D}/etc/profile.d/xprint* + rm -f ${D}/etc/profile.d/xprint* +} diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild new file mode 100644 index 000000000000..7abbe7ef1cee --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild @@ -0,0 +1,554 @@ +# Copyright 1999-2007 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.1.1-r4.ebuild,v 1.1 2007/01/13 17:12:25 joshuabaergen Exp $ + +# Must be before x-modular eclass is inherited +SNAPSHOT="yes" + +inherit x-modular multilib + +OPENGL_DIR="xorg-x11" + +MESA_PN="Mesa" +MESA_PV="6.5.1" +MESA_P="${MESA_PN}-${MESA_PV}" +MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}" + +SRC_URI="${SRC_URI} + mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2 + http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2" +DESCRIPTION="X.Org X servers" +# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work +RESTRICT="stricter" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE_INPUT_DEVICES=" + input_devices_acecad + input_devices_aiptek + input_devices_calcomp + input_devices_citron + input_devices_digitaledge + input_devices_dmc + input_devices_dynapro + input_devices_elo2300 + input_devices_elographics + input_devices_evdev + input_devices_fpit + input_devices_hyperpen + input_devices_jamstudio + input_devices_joystick + input_devices_keyboard + input_devices_magellan + input_devices_microtouch + input_devices_mouse + input_devices_mutouch + input_devices_palmax + input_devices_penmount + input_devices_spaceorb + input_devices_summa + input_devices_tek4957 + input_devices_ur98 + input_devices_vmmouse + input_devices_void + + input_devices_synaptics + input_devices_wacom" +IUSE_VIDEO_CARDS=" + video_cards_apm + video_cards_ark + video_cards_chips + video_cards_cirrus + video_cards_cyrix + video_cards_dummy + video_cards_epson + video_cards_fbdev + video_cards_glint + video_cards_i128 + video_cards_i740 + video_cards_i810 + video_cards_impact + video_cards_imstt + video_cards_mach64 + video_cards_mga + video_cards_neomagic + video_cards_newport + video_cards_nsc + video_cards_nv + video_cards_r128 + video_cards_radeon + video_cards_rendition + video_cards_s3 + video_cards_s3virge + video_cards_savage + video_cards_siliconmotion + video_cards_sis + video_cards_sisusb + video_cards_sunbw2 + video_cards_suncg14 + video_cards_suncg3 + video_cards_suncg6 + video_cards_sunffb + video_cards_sunleo + video_cards_suntcx + video_cards_tdfx + video_cards_tga + video_cards_trident + video_cards_tseng + video_cards_v4l + video_cards_vesa + video_cards_vga + video_cards_via + video_cards_vmware + video_cards_voodoo + + video_cards_fglrx + video_cards_nvidia" +IUSE_SERVERS="dmx kdrive xorg" +IUSE="${IUSE_VIDEO_CARDS} + ${IUSE_INPUT_DEVICES} + ${IUSE_SERVERS} + 3dfx + aiglx + dri ipv6 minimal nptl sdl xprint" +RDEPEND="x11-libs/libXfont + x11-libs/xtrans + x11-libs/libXau + x11-libs/libXext + x11-libs/libX11 + x11-libs/libxkbfile + x11-libs/libXdmcp + x11-libs/libXmu + x11-libs/libXrender + x11-libs/libXi + media-libs/freetype + >=media-libs/mesa-6.5-r2 + media-fonts/font-adobe-75dpi + media-fonts/font-misc-misc + media-fonts/font-cursor-misc + x11-misc/xbitmaps + || ( x11-misc/xkeyboard-config x11-misc/xkbdata ) + x11-apps/iceauth + x11-apps/rgb + x11-apps/xauth + x11-apps/xinit + app-admin/eselect-opengl + x11-libs/libXaw + x11-libs/libXpm + x11-libs/libXxf86misc + x11-libs/libXxf86vm + dmx? ( x11-libs/libdmx ) + !minimal? ( x11-libs/libXtst + x11-libs/libXres ) + >=x11-libs/libxkbui-1.0.2 + x11-libs/liblbxutil + kdrive? ( sdl? ( media-libs/libsdl ) )" + # Xres is dmx-dependent, xkbui is xorgcfg-dependent + # Xaw is dmx- and xorgcfg-dependent + # Xpm is dmx- and xorgcfg-dependent, pulls in Xt + # Xxf86misc and Xxf86vm are xorgcfg-dependent + # liblbxutil is lbx- dependent +DEPEND="${RDEPEND} + x11-proto/randrproto + x11-proto/renderproto + >=x11-proto/fixesproto-4 + x11-proto/damageproto + x11-proto/xextproto + x11-proto/xproto + x11-proto/xf86dgaproto + x11-proto/xf86miscproto + x11-proto/xf86rushproto + x11-proto/xf86vidmodeproto + x11-proto/xf86bigfontproto + >=x11-proto/compositeproto-0.3 + x11-proto/recordproto + x11-proto/resourceproto + x11-proto/videoproto + >=x11-proto/scrnsaverproto-1.1.0 + x11-proto/evieext + x11-proto/trapproto + >=x11-proto/xineramaproto-1.1-r1 + x11-proto/fontsproto + >=x11-proto/kbproto-1.0-r1 + x11-proto/inputproto + x11-proto/bigreqsproto + x11-proto/xcmiscproto + >=x11-proto/glproto-1.4.8 + dmx? ( x11-proto/dmxproto ) + dri? ( x11-proto/xf86driproto + >=x11-libs/libdrm-2 ) + xprint? ( x11-proto/printproto + x11-apps/mkfontdir + x11-apps/mkfontscale + x11-apps/xplsprinters )" + +# Drivers +PDEPEND=" + xorg? ( + input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 ) + input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 ) + input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 ) + input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 ) + input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 ) + input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 ) + input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 ) + input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 ) + input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 ) + input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 ) + input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 ) + input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 ) + input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 ) + input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 ) + input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.1.0 ) + input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 ) + input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 ) + input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 ) + input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 ) + input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 ) + input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 ) + input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 ) + input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 ) + input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 ) + input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 ) + input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 ) + input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 ) + + input_devices_synaptics? ( x11-drivers/synaptics ) + input_devices_wacom? ( x11-drivers/linuxwacom ) + + video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 ) + video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 ) + video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 ) + video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 ) + video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 ) + video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 ) + video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 ) + video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 ) + video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 ) + video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 ) + video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 ) + video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 ) + video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 ) + video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 ) + video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 ) + video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 ) + video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 ) + video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 ) + video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 ) + video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 ) + video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 ) + video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 ) + video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 ) + video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 ) + video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 ) + video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 ) + video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 ) + video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 ) + video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 ) + video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 ) + video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 ) + video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 ) + video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 ) + video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 ) + video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 ) + video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 ) + video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 ) + video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 ) + video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 ) + video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 ) + video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 ) + video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 ) + video_cards_via? ( >=x11-drivers/xf86-video-via-0.2.1 ) + video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 ) + video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 ) + + video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) + video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.27.10 ) + video_cards_nvidia? ( || ( + >=x11-drivers/nvidia-drivers-1.0.8774 + >=x11-drivers/nvidia-legacy-drivers-1.0.7184 + ) + ) + )" +LICENSE="${LICENSE} MIT" + +pkg_setup() { + use minimal || ensure_a_server_is_building + + PATCHES="${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch + ${FILESDIR}/${P}-install-libxf86config-headers.patch + ${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch + ${FILESDIR}/${PV}-sparc64-ati-lockups.patch + ${FILESDIR}/xorg-conf-example.patch + ${FILESDIR}/${PV}-fix_acpi_tokenize.patch + ${FILESDIR}/${PV}-dbe-render.diff" + + # Patches required for compiz to work with AIGLX, + # but they slow EXA down (bug #147841). + if use aiglx; then + einfo "AIGLX patches will be applied." + ewarn "These patches are known to cause problems with EXA enabled." + PATCHES="${FILESDIR}/01-no-move-damage.patch + ${FILESDIR}/02-dont-backfill-bg-none.patch + ${FILESDIR}/03-tfp-damage.patch + ${FILESDIR}/04-mesa-copy-sub-buffer.patch + ${FILESDIR}/05-offscreen-pixmaps.patch + ${FILESDIR}/06-aiglx-happy-vt-switch.patch + ${FILESDIR}/${PV}-fix_big_endian_glx.patch + ${PATCHES}" + fi + + # SDL only available in kdrive build + if use kdrive && use sdl; then + conf_opts="${conf_opts} --enable-xsdl" + else + conf_opts="${conf_opts} --disable-xsdl" + fi + + # Only Xorg and Xgl support this, and we won't build Xgl + # until it merges to trunk + if use xorg; then + conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}" + fi + + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + # --enable-install-setuid needed because sparcs default off + CONFIGURE_OPTIONS=" + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable !minimal xvfb) + $(use_enable !minimal xnest) + $(use_enable !minimal xorgcfg) + $(use_enable !minimal install-libxf86config) + $(use_enable dri) + $(use_enable xorg) + $(use_enable xprint) + $(use_enable nptl glx-tls) + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontdir=/usr/share/fonts + ${conf_opts}" + + local diemsg="You must build xorg-server and mesa with the same nptl USE setting." + if built_with_use media-libs/mesa nptl; then + use nptl || die "${diemsg}" + else + use nptl && die "${diemsg}" + fi + + # (#121394) Causes window corruption + filter-flags -fweb + + # Nothing else provides new enough glxtokens.h + ewarn "Forcing on xorg-x11 for new enough glxtokens.h..." + OLD_IMPLEM="$(eselect opengl show)" + eselect opengl set --impl-headers ${OPENGL_DIR} +} + +src_unpack() { + x-modular_specs_check + x-modular_dri_check + x-modular_unpack_source + x-modular_patch_source + + # Set up kdrive servers to build + if use kdrive; then + kdrive_setup + fi + + # Make sure eautoreconf gets run if we need the autoconf/make + # changes. + if [[ ${SNAPSHOT} != "yes" ]]; then + if use kdrive || use xprint; then + eautoreconf + fi + fi + x-modular_reconf_source +} + +src_install() { + x-modular_src_install + + dynamic_libgl_install + + server_based_install + + # Install video mode files for system-config-display + insinto /usr/share/xorg + doins hw/xfree86/common/{extra,vesa}modes \ + || die "couldn't install extra modes" + + # Bug #151421 - this file is not built with USE="minimal" + # Bug #151670 - this file is also not build if USE="-xorg" + if ! use minimal && use xorg; then + # Install xorg.conf.example + insinto /etc/X11 + doins hw/xfree86/xorg.conf.example \ + || die "couldn't install xorg.conf.example" + fi +} + +pkg_postinst() { + switch_opengl_implem + + # Bug #135544 + ewarn "Users of reduced blanking now need:" + ewarn " Option \"ReducedBlanking\"" + ewarn "In the relevant Monitor section(s)." + ewarn "Make sure your reduced blanking modelines are safe!" +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if ! has_version x11-base/xorg-server; then + if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then + rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules + fi + fi +} + +kdrive_setup() { + local card real_card disable_card kdrive_fbdev kdrive_vesa + + einfo "Removing unused kdrive drivers ..." + + # Some kdrive servers require fbdev and vesa + kdrive_fbdev="radeon neomagic sis siliconmotion" + # Some kdrive servers require just vesa + kdrive_vesa="chips mach64 mga nv glint r128 via" + + for card in ${IUSE_VIDEO_CARDS}; do + real_card=${card#video_cards_} + + # Differences between VIDEO_CARDS name and kdrive server name + real_card=${real_card/glint/pm2} + real_card=${real_card/radeon/ati} + real_card=${real_card/%nv/nvidia} + real_card=${real_card/siliconmotion/smi} + real_card=${real_card/%sis/sis300} + + disable_card=0 + + # Check whether it's a valid kdrive server before we waste time + # on the rest of this + if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then + continue + fi + + if ! use ${card}; then + if use x86; then + # Some kdrive servers require fbdev and vesa + for i in ${kdrive_fbdev}; do + if use video_cards_${i}; then + if [[ ${real_card} = fbdev ]] \ + || [[ ${real_card} = vesa ]]; then + continue 2 # Don't disable + fi + fi + done + + # Some kdrive servers require just vesa + for i in ${kdrive_vesa}; do + if use video_cards_${i}; then + if [[ ${real_card} = vesa ]]; then + continue 2 # Don't disable + fi + fi + done + fi + disable_card=1 + # Bug #150052 + # fbdev is the only VIDEO_CARDS setting that works on non-x86 + elif ! use x86 \ + && [[ ${real_card} != fbdev ]]; then + ewarn " $real_card does not work on your architecture; disabling." + disable_card=1 + fi + + if [[ $disable_card = 1 ]]; then + ebegin " ${real_card}" + sed -i \ + -e "s:\b${real_card}\b::g" \ + ${S}/hw/kdrive/Makefile.am \ + || die "sed of ${real_card} failed" + eend + fi + + done + + # smi and via are the only things on line 2. If line 2 ends up blank, + # we need to get rid of the backslash at the end of line 1. + if ! use video_cards_siliconmotion && ! use video_cards_via; then + sed -i \ + -e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \ + ${S}/hw/kdrive/Makefile.am + fi +} + +dynamic_libgl_install() { + # next section is to setup the dynamic libGL stuff + ebegin "Moving GL files for dynamic switching" + dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + local x="" + for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + fi + done + eend 0 +} + +server_based_install() { + use xprint && xprint_src_install + + if ! use xorg; then + rm ${D}/usr/share/man/man1/Xserver.1x \ + ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \ + ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + ${D}/usr/share/man/man1/Xserver.1x + fi +} + +switch_opengl_implem() { + # Switch to the xorg implementation. + # Use new opengl-update that will not reset user selected + # OpenGL interface ... + echo +# eselect opengl set --use-old ${OPENGL_DIR} + eselect opengl set ${OLD_IMPLEM} +} + +xprint_src_install() { + # RH-style init script, we provide a wrapper + exeinto /usr/$(get_libdir)/misc + doexe ${S}/Xprint/etc/init.d/xprint + # Patch init script for fonts location + sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \ + -i ${D}/usr/$(get_libdir)/misc/xprint + # Install the wrapper + newinitd ${FILESDIR}/xprint.init xprint + # Install profile scripts + insinto /etc/profile.d + doins ${S}/Xprint/etc/profile.d/xprint* + insinto /etc/X11/xinit/xinitrc.d + newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \ + 92xprint-xpserverlist.sh + # Patch profile scripts + sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \ + get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \ + ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh + # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo + dodoc ${D}/etc/profile.d/xprint* + rm -f ${D}/etc/profile.d/xprint* +} + +ensure_a_server_is_building() { + for server in ${IUSE_SERVERS}; do + use ${server} && return; + done + eerror "You need to specify at least one server to build." + eerror "Valid servers are: ${IUSE_SERVERS}." + die "No servers were specified to build." +} -- 2.26.2