diff options
Diffstat (limited to 'hardened/xorg/x11-base')
17 files changed, 335 insertions, 1978 deletions
diff --git a/hardened/xorg/x11-base/xorg-server/Manifest b/hardened/xorg/x11-base/xorg-server/Manifest index 2ecda42..15bd260 100644 --- a/hardened/xorg/x11-base/xorg-server/Manifest +++ b/hardened/xorg/x11-base/xorg-server/Manifest @@ -26,6 +26,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 @@ -34,6 +38,18 @@ AUX 1.1.1-fix_acpi_tokenize.patch 737 RMD160 23e67ce9e8122c163b9baa78ee517abd382 MD5 8753388aa11cec9eab4123a0803aaf66 files/1.1.1-fix_acpi_tokenize.patch 737 RMD160 23e67ce9e8122c163b9baa78ee517abd382e46a9 files/1.1.1-fix_acpi_tokenize.patch 737 SHA256 f3ed429b3b5c36f0efa06c11ddbd1dfbf929f031ec6365c5f47a75f7a182367b files/1.1.1-fix_acpi_tokenize.patch 737 +AUX 1.1.1-fix_big_endian_glx.patch 655 RMD160 aa6377a33c015af994053add2c5571a13bd0658a SHA1 9133c745ebe3b1dd39518b245c4836c9a53f40d6 SHA256 2b9f53f31fe9f4e36db01fcbf74745fddfa70a28e41614da608c53af81993dbf +MD5 87c7bd720ae0573bf5ed8d5879bd781b files/1.1.1-fix_big_endian_glx.patch 655 +RMD160 aa6377a33c015af994053add2c5571a13bd0658a files/1.1.1-fix_big_endian_glx.patch 655 +SHA256 2b9f53f31fe9f4e36db01fcbf74745fddfa70a28e41614da608c53af81993dbf files/1.1.1-fix_big_endian_glx.patch 655 +AUX 1.1.1-fixdualhead.patch 625 RMD160 2b91d2feb1605c7fb7731e888f391e07ac6d6c67 SHA1 364b7d6ec0bb55547d81ff3ccbd84b41f5b537dd SHA256 e16f498897e470dbefb6ac38f73393b091b9bdd2f306f0441502eaaaa0d3bd61 +MD5 1b43b231253a92ff4c82565b94cb7158 files/1.1.1-fixdualhead.patch 625 +RMD160 2b91d2feb1605c7fb7731e888f391e07ac6d6c67 files/1.1.1-fixdualhead.patch 625 +SHA256 e16f498897e470dbefb6ac38f73393b091b9bdd2f306f0441502eaaaa0d3bd61 files/1.1.1-fixdualhead.patch 625 +AUX 1.1.1-sparc-includes.patch 1216 RMD160 fcfe14696821581f316413564c6a3f787dae3937 SHA1 55270574dbbc95cac7d8102a7a855e5c8800439f SHA256 1b80656cf450f0df3d25cda3e57909ff71834ad489d6033f9d16e2d6d76e34d4 +MD5 0600d155724d1a1c64ee02bfffca20ff files/1.1.1-sparc-includes.patch 1216 +RMD160 fcfe14696821581f316413564c6a3f787dae3937 files/1.1.1-sparc-includes.patch 1216 +SHA256 1b80656cf450f0df3d25cda3e57909ff71834ad489d6033f9d16e2d6d76e34d4 files/1.1.1-sparc-includes.patch 1216 AUX 1.1.1-sparc64-ati-lockups.patch 652 RMD160 7d642aa1c0153a4c48b8d2338b1afafdbc130852 SHA1 31f3b422d4dc621a7638cf4f9b388ce6a5cccec4 SHA256 0db8886c157b253449057865c938b63aa8a4f11d746e5df4ed2a12b75d718c51 MD5 b20d4cd92f74e0722b9cf2e5f0704655 files/1.1.1-sparc64-ati-lockups.patch 652 RMD160 7d642aa1c0153a4c48b8d2338b1afafdbc130852 files/1.1.1-sparc64-ati-lockups.patch 652 @@ -42,10 +58,6 @@ AUX xorg-conf-example.patch 1924 RMD160 04325d6624ad01ee69702b069be3665b5e96b647 MD5 f2c08e04fd4d36bf1e9e5fd25102c243 files/xorg-conf-example.patch 1924 RMD160 04325d6624ad01ee69702b069be3665b5e96b647 files/xorg-conf-example.patch 1924 SHA256 ceb0dd0ccc6b02a026b599f1c838fc0a0c3f789f58407e85ee783ddaf9989350 files/xorg-conf-example.patch 1924 -AUX xorg-server-1.0.2-xprint-init.patch 417 RMD160 e29f58581c421724adf09f1df3e991092f89a017 SHA1 7d2a4eb212cc770cc22a496df2696a0bca1f7774 SHA256 89c8e2253b374b2152908dd4514a19ff302b753d6a7c8be272999ad192edc905 -MD5 5106c724275e86950e5f4c88913198a1 files/xorg-server-1.0.2-xprint-init.patch 417 -RMD160 e29f58581c421724adf09f1df3e991092f89a017 files/xorg-server-1.0.2-xprint-init.patch 417 -SHA256 89c8e2253b374b2152908dd4514a19ff302b753d6a7c8be272999ad192edc905 files/xorg-server-1.0.2-xprint-init.patch 417 AUX xorg-server-1.1.0-dri-weak-glx.patch 2498 RMD160 4e1a9bd048295787c8cee75995bc576355a7a267 SHA1 059e1f1a2e2a7c62cc82d5b523cc96745f2d0454 SHA256 e93adb6f000cdcdb90c43e16834047286ceb498da6c2c88046fbd7cd46e10f5b MD5 81a13cf41cca4414931b7b59e882e04c files/xorg-server-1.1.0-dri-weak-glx.patch 2498 RMD160 4e1a9bd048295787c8cee75995bc576355a7a267 files/xorg-server-1.1.0-dri-weak-glx.patch 2498 @@ -54,14 +66,6 @@ AUX xorg-server-1.1.0-glx-needs-GLcore.patch 327 RMD160 afd6be3ca3f0c1f1fd1d7370 MD5 46cd3277ababede150f8c61b9822b91c files/xorg-server-1.1.0-glx-needs-GLcore.patch 327 RMD160 afd6be3ca3f0c1f1fd1d7370d21e9bf8aaddb6e2 files/xorg-server-1.1.0-glx-needs-GLcore.patch 327 SHA256 340d0a699fdefe2afa5ec205f09982b7fc3dce83b271f8b94bb4e55e6c41c787 files/xorg-server-1.1.0-glx-needs-GLcore.patch 327 -AUX xorg-server-1.1.0-lazy-glx.patch 433 RMD160 f7e49d0a2d72758dab82d8121ad2f66cc3f60a96 SHA1 2b89f5666e9f64a0cb9f289d0d2237e1e20cdd72 SHA256 02308a75797eed6c55a96dd1ae6ad7a9e64c32c0c7b39d3bcb4c2b11e5c04925 -MD5 6d6dffa929b756f2b392be59e451732a files/xorg-server-1.1.0-lazy-glx.patch 433 -RMD160 f7e49d0a2d72758dab82d8121ad2f66cc3f60a96 files/xorg-server-1.1.0-lazy-glx.patch 433 -SHA256 02308a75797eed6c55a96dd1ae6ad7a9e64c32c0c7b39d3bcb4c2b11e5c04925 files/xorg-server-1.1.0-lazy-glx.patch 433 -AUX xorg-server-1.1.0-setuid.diff 3373 RMD160 5d9c1e6696ed5eaa9de9425633c0bfee493e6973 SHA1 256aa1ef94425f461c97a6e42b282aaf401fcd14 SHA256 af678fea5e624eb20a232b3db1a0f168085b780d8e627739fd8d088f033c2fd9 -MD5 d806558d64462780cbd1512ab6dc4dd7 files/xorg-server-1.1.0-setuid.diff 3373 -RMD160 5d9c1e6696ed5eaa9de9425633c0bfee493e6973 files/xorg-server-1.1.0-setuid.diff 3373 -SHA256 af678fea5e624eb20a232b3db1a0f168085b780d8e627739fd8d088f033c2fd9 files/xorg-server-1.1.0-setuid.diff 3373 AUX xorg-server-1.1.1-dri-weak-glx.patch 2498 RMD160 4e1a9bd048295787c8cee75995bc576355a7a267 SHA1 059e1f1a2e2a7c62cc82d5b523cc96745f2d0454 SHA256 e93adb6f000cdcdb90c43e16834047286ceb498da6c2c88046fbd7cd46e10f5b MD5 81a13cf41cca4414931b7b59e882e04c files/xorg-server-1.1.1-dri-weak-glx.patch 2498 RMD160 4e1a9bd048295787c8cee75995bc576355a7a267 files/xorg-server-1.1.1-dri-weak-glx.patch 2498 @@ -78,42 +82,23 @@ AUX xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684 RMD160 8a6142a781d0ee626b4569f23 MD5 f6f3f09436867be5b09782fed580b6f3 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684 RMD160 8a6142a781d0ee626b4569f2324c6884234c7856 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684 SHA256 8428c09c0bd11e7db9fbf0807754312cfb7c2659b2c203f8ad9741fc35c356c0 files/xorg-x11-server-1.1.1-mesa-6.5.1.patch 1684 +AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 +MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598 +RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598 +SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xprint.init 598 DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 SHA1 cd3b314808534b0306c7f89e9a72c9c23dbff239 SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 -DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd -DIST xorg-server-1.1.0.tar.bz2 6322751 RMD160 282007ba280b84701df05ef7b8d03e3f1275f8f0 SHA1 564fbe8ac534c2a0b995f88e919f0eac8dcd5224 SHA256 da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461 DIST xorg-server-1.1.1.tar.bz2 6252103 RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 SHA1 eb29dd4fea9f184321cbb5512f68b674ada4daf7 SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c -EBUILD xorg-server-1.1.0-r1.ebuild 24647 RMD160 eadee75a2d626bb05db0ea242f15188f651c0ce4 SHA1 666754946d8a6117c8e47764202f0b8e2b6cf31f SHA256 d3a96d224c32fea8e09efe0cb71db8b6c1aaccf62d5a97653e808e7a2654713a -MD5 f8b04e5c78672d6bcbf1cb9e9206f96d xorg-server-1.1.0-r1.ebuild 24647 -RMD160 eadee75a2d626bb05db0ea242f15188f651c0ce4 xorg-server-1.1.0-r1.ebuild 24647 -SHA256 d3a96d224c32fea8e09efe0cb71db8b6c1aaccf62d5a97653e808e7a2654713a xorg-server-1.1.0-r1.ebuild 24647 EBUILD xorg-server-1.1.1-r1.ebuild 17327 RMD160 0e945ee583bb516a2f42f12047198e9cbf021caa SHA1 37b5661946a941be8dacd9ac940c7293fbf09ae9 SHA256 224ad66e56e90d7f4841a596713a1b8b83dca51c68d42184b584545c3bfca18c MD5 fc52d7a51415583429b0576efbb02b61 xorg-server-1.1.1-r1.ebuild 17327 RMD160 0e945ee583bb516a2f42f12047198e9cbf021caa xorg-server-1.1.1-r1.ebuild 17327 SHA256 224ad66e56e90d7f4841a596713a1b8b83dca51c68d42184b584545c3bfca18c xorg-server-1.1.1-r1.ebuild 17327 -EBUILD xorg-server-1.1.1-r2.ebuild 17978 RMD160 81bf27d440cf0d7f5f0bf2e6c3eb0e57a283f8ab SHA1 14a51210aa2c83e7e9c4e1b4ae2422899edbc64b SHA256 acb3348d760ba1aad21a4a530eae7f161310f6a2094edeb390460cb1f7f4856f -MD5 b11050d92075361b15d900c0a450c338 xorg-server-1.1.1-r2.ebuild 17978 -RMD160 81bf27d440cf0d7f5f0bf2e6c3eb0e57a283f8ab xorg-server-1.1.1-r2.ebuild 17978 -SHA256 acb3348d760ba1aad21a4a530eae7f161310f6a2094edeb390460cb1f7f4856f xorg-server-1.1.1-r2.ebuild 17978 -EBUILD xorg-server-1.1.1-r3.ebuild 18024 RMD160 6c1bd18c083806fe7798da2f35a3a1c447d19cd6 SHA1 92ddc5376bc7ff8714fd3ed43840e36ad4e267b1 SHA256 182112a824ea0aeb24aeb214b3c1ad263da6c04f9190b182621deab1733c0277 -MD5 093f8cd9299b3ac59cd9048d7c636b38 xorg-server-1.1.1-r3.ebuild 18024 -RMD160 6c1bd18c083806fe7798da2f35a3a1c447d19cd6 xorg-server-1.1.1-r3.ebuild 18024 -SHA256 182112a824ea0aeb24aeb214b3c1ad263da6c04f9190b182621deab1733c0277 xorg-server-1.1.1-r3.ebuild 18024 -EBUILD xorg-server-1.1.1.ebuild 15460 RMD160 5116ebb0442e7f87877295a91e3cc010b86730dc SHA1 566d47782cb94bc67b217f3329354052b6dbb9ef SHA256 0da556bad9059a78c2f485c077adf1ca32b4711da36cccfcb1e8a23490ad404c -MD5 ab70149e251e924831f0eaee88e0eb4a xorg-server-1.1.1.ebuild 15460 -RMD160 5116ebb0442e7f87877295a91e3cc010b86730dc xorg-server-1.1.1.ebuild 15460 -SHA256 0da556bad9059a78c2f485c077adf1ca32b4711da36cccfcb1e8a23490ad404c xorg-server-1.1.1.ebuild 15460 -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 -MD5 5bbe7de7ebbf30c9991b3fd800b1f219 files/digest-xorg-server-1.1.1 500 -RMD160 0a5b1d758ab4077ac728b7ec6cc7f06fb49ce273 files/digest-xorg-server-1.1.1 500 -SHA256 1bea059c9ffe1dee3634293efe79b0a429d52ca18eda558e2e7b9e0605b0504a files/digest-xorg-server-1.1.1 500 +EBUILD xorg-server-1.1.1-r4.ebuild 17622 RMD160 1a901dcb51deb474029204d79e04f6a281ae560e SHA1 95c32d8b5ccd57f68f1ba0cca5eb8bb33eb7a60c SHA256 7860bbeca535a7914910b1eefa0f3c084d2a3c5bbe189b24764723676c29acf3 +MD5 e3f2cb5180a1818f010ec89d87610dd3 xorg-server-1.1.1-r4.ebuild 17622 +RMD160 1a901dcb51deb474029204d79e04f6a281ae560e xorg-server-1.1.1-r4.ebuild 17622 +SHA256 7860bbeca535a7914910b1eefa0f3c084d2a3c5bbe189b24764723676c29acf3 xorg-server-1.1.1-r4.ebuild 17622 MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r1 506 RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r1 506 SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r1 506 -MD5 08a18214630142f3409a9ac0467c29b5 files/digest-xorg-server-1.1.1-r2 506 -RMD160 b782fed9f834cabd0293533c4820a1564c0e58ab files/digest-xorg-server-1.1.1-r2 506 -SHA256 64c42412d824c7523b5fc70a87b0624f8c18a9980e27b1bf6208103e164a508a files/digest-xorg-server-1.1.1-r2 506 -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 diff --git a/hardened/xorg/x11-base/xorg-server/files/1.1.1-dbe-render.diff b/hardened/xorg/x11-base/xorg-server/files/1.1.1-dbe-render.diff new file mode 100644 index 0000000..d2f27e5 --- /dev/null +++ b/hardened/xorg/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 <string.h> ++#if HAVE_STDINT_T ++#include <stdint.h> ++#elif !defined(UINT32_MAX) ++#define UINT32_MAX 0xffffffffU ++#endif + + #include <X11/X.h> + #include <X11/Xproto.h> +@@ -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 <X11/Xfuncproto.h> + #include "cursorstr.h" + ++#if HAVE_STDINT_H ++#include <stdint.h> ++#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/hardened/xorg/x11-base/xorg-server/files/1.1.1-fix_big_endian_glx.patch b/hardened/xorg/x11-base/xorg-server/files/1.1.1-fix_big_endian_glx.patch new file mode 100644 index 0000000..5bc902b --- /dev/null +++ b/hardened/xorg/x11-base/xorg-server/files/1.1.1-fix_big_endian_glx.patch @@ -0,0 +1,24 @@ +commit 3ad1642f1bbaa5f96558cdf3384b40f7122f8781 +Author: Michel Dänzer <michel@tungstengraphics.com> +Date: Sun Oct 15 16:57:09 2006 +0200 + + Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms. + +diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c +index b572304..170662c 100644 +--- a/GL/glx/glxdri.c ++++ b/GL/glx/glxdri.c +@@ -359,7 +359,12 @@ __glXDRIbindTexImage(__GLXcontext *baseC + if (pixmap->drawable.depth >= 24) { + bpp = 4; + format = GL_BGRA; +- type = GL_UNSIGNED_BYTE; ++ type = ++#if X_BYTE_ORDER == X_LITTLE_ENDIAN ++ GL_UNSIGNED_BYTE; ++#else ++ GL_UNSIGNED_INT_8_8_8_8_REV; ++#endif + } else { + bpp = 2; + format = GL_RGB; diff --git a/hardened/xorg/x11-base/xorg-server/files/1.1.1-fixdualhead.patch b/hardened/xorg/x11-base/xorg-server/files/1.1.1-fixdualhead.patch new file mode 100644 index 0000000..7b0513d --- /dev/null +++ b/hardened/xorg/x11-base/xorg-server/files/1.1.1-fixdualhead.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/show_bug.cgi?id=159375 + +diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c +index 4935b0a..9c3cac0 100644 +--- a/GL/glx/glxdri.c ++++ b/GL/glx/glxdri.c +@@ -121,19 +121,13 @@ static const char CREATE_NEW_SCREEN_FUNC + static void + __glXDRIleaveServer(void) + { +- int i; +- +- for (i = 0; i < screenInfo.numScreens; i++) +- DRIDoBlockHandler(i, NULL, NULL, NULL); ++ DRIBlockHandler(NULL, NULL, NULL); + } + + static void + __glXDRIenterServer(void) + { +- int i; +- +- for (i = 0; i < screenInfo.numScreens; i++) +- DRIDoWakeupHandler(i, NULL, 0, NULL); ++ DRIWakeupHandler(NULL, 0, NULL); + } + + static void diff --git a/hardened/xorg/x11-base/xorg-server/files/1.1.1-sparc-includes.patch b/hardened/xorg/x11-base/xorg-server/files/1.1.1-sparc-includes.patch new file mode 100644 index 0000000..3408d20 --- /dev/null +++ b/hardened/xorg/x11-base/xorg-server/files/1.1.1-sparc-includes.patch @@ -0,0 +1,28 @@ +diff -Nura xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_io.c xorg-server-1.1.1.sparc/hw/xfree86/os-support/linux/lnx_io.c +--- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_io.c 2006-07-05 15:31:41.000000000 -0300 ++++ xorg-server-1.1.1.sparc/hw/xfree86/os-support/linux/lnx_io.c 2007-01-18 14:43:53.000000000 -0300 +@@ -72,10 +72,6 @@ + + #include <linux/kd.h> + #include <linux/version.h> +-#ifdef __sparc__ +-#include <asm/param.h> +-#include <asm/kbio.h> +-#endif + + /* Deal with spurious kernel header change in struct kbd_repeat. + We undo this define after the routine using that struct is over, +diff -Nura xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_kbd.c xorg-server-1.1.1.sparc/hw/xfree86/os-support/linux/lnx_kbd.c +--- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_kbd.c 2006-07-05 15:31:41.000000000 -0300 ++++ xorg-server-1.1.1.sparc/hw/xfree86/os-support/linux/lnx_kbd.c 2007-01-18 14:44:55.000000000 -0300 +@@ -102,10 +102,6 @@ + + #include <linux/kd.h> + #include <linux/version.h> +-#ifdef __sparc__ +-#include <asm/param.h> +-#include <asm/kbio.h> +-#endif + + /* Deal with spurious kernel header change in struct kbd_repeat. + We undo this define after the routine using that struct is over, diff --git a/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.0-r1 b/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.0-r1 deleted file mode 100644 index 33bc255..0000000 --- a/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.0-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363 -RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363 -SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363 -MD5 d070c58a598fb52c5cb86344725c4ad6 xorg-server-1.1.0.tar.bz2 6322751 -RMD160 282007ba280b84701df05ef7b8d03e3f1275f8f0 xorg-server-1.1.0.tar.bz2 6322751 -SHA256 da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461 xorg-server-1.1.0.tar.bz2 6322751 diff --git a/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1 b/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1 deleted file mode 100644 index 740e340..0000000 --- a/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363 -RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363 -SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363 -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/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r3 b/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r3 deleted file mode 100644 index 1330edc..0000000 --- a/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r3 +++ /dev/null @@ -1,6 +0,0 @@ -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/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r2 b/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r4 index 1330edc..1330edc 100644 --- a/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r2 +++ b/hardened/xorg/x11-base/xorg-server/files/digest-xorg-server-1.1.1-r4 diff --git a/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch b/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch deleted file mode 100644 index a4783ab..0000000 --- a/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.0.2-xprint-init.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Xprint/etc/init.d/Makefile.am 2006/04/14 04:47:28 1.1 -+++ Xprint/etc/init.d/Makefile.am 2006/04/14 05:26:42 -@@ -1 +1,12 @@ -+include $(top_srcdir)/cpprules.in -+ -+noinst_PRE = xprint -+BUILT_SOURCES = $(noinst_PRE) -+CLEANFILES = $(noinst_PRE) xprint.pre -+ -+CPP_FILES_FLAGS = -DProjectRoot='"$(PROJECTROOT)"' -DOS_LINUX -+ -+xprint.pre: xprint.cpp -+ $(SED) -e 's/^\(\s\+\)#/\1XCOMM/' $< > $@ -+ - EXTRA_DIST = xprint.cpp diff --git a/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.1.0-lazy-glx.patch b/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.1.0-lazy-glx.patch deleted file mode 100644 index 1f97e60..0000000 --- a/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.1.0-lazy-glx.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hw/xfree86/dixmods/Makefile.am.orig 2006-06-30 12:47:17.000000000 +0200 -+++ hw/xfree86/dixmods/Makefile.am.lazy 2006-06-30 12:50:02.000000000 +0200 -@@ -72,7 +72,7 @@ - libfb_la_LIBADD = $(top_builddir)/fb/libfb.la - libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c - --libglx_la_LDFLAGS = -avoid-version -+libglx_la_LDFLAGS = -avoid-version -Wl,-z,lazy - if AIGLX - GLXDRI_LIBRARY = $(top_builddir)/GL/glx/libglxdri.la - endif diff --git a/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff b/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff deleted file mode 100644 index 96d2d0a..0000000 --- a/hardened/xorg/x11-base/xorg-server/files/xorg-server-1.1.0-setuid.diff +++ /dev/null @@ -1,104 +0,0 @@ -Index: hw/xfree86/common/xf86Init.c -=================================================================== -RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/common/xf86Init.c,v -retrieving revision 1.33.2.2 -diff -u -u -r1.33.2.2 xf86Init.c ---- hw/xfree86/common/xf86Init.c 9 May 2006 18:04:19 -0000 1.33.2.2 -+++ hw/xfree86/common/xf86Init.c 20 Jun 2006 08:33:03 -0000 -@@ -1905,7 +1905,11 @@ - FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno)); - break; - case 0: /* child */ -- setuid(getuid()); -+ if (setuid(getuid()) == -1) { -+ xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n", -+ strerror(errno)); -+ exit(255); -+ } - /* set stdin, stdout to the consoleFd */ - for (i = 0; i < 2; i++) { - if (xf86Info.consoleFd != i) { -Index: hw/xfree86/os-support/shared/libc_wrapper.c -=================================================================== -RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c,v -retrieving revision 1.11 -diff -u -u -r1.11 libc_wrapper.c ---- hw/xfree86/os-support/shared/libc_wrapper.c 25 Mar 2006 19:52:04 -0000 1.11 -+++ hw/xfree86/os-support/shared/libc_wrapper.c 20 Jun 2006 08:33:03 -0000 -@@ -1270,7 +1270,10 @@ - #ifndef SELF_CONTAINED_WRAPPER - xf86DisableIO(); - #endif -- setuid(getuid()); -+ if (setuid(getuid()) == -1) { -+ ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno)); -+ exit(255); -+ } - #if !defined(SELF_CONTAINED_WRAPPER) - /* set stdin, stdout to the consoleFD, and leave stderr alone */ - for (i = 0; i < 2; i++) -Index: hw/xfree86/parser/write.c -=================================================================== -RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/parser/write.c,v -retrieving revision 1.3 -diff -u -u -r1.3 write.c ---- hw/xfree86/parser/write.c 3 Jul 2005 07:01:37 -0000 1.3 -+++ hw/xfree86/parser/write.c 20 Jun 2006 08:33:03 -0000 -@@ -170,7 +170,10 @@ - strerror(errno)); - return 0; - case 0: /* child */ -- setuid(getuid()); -+ if (setuid(getuid()) == -1) -+ FatalError("xf86writeConfigFile(): " -+ "setuid failed(%s)\n", -+ strerror(errno)); - ret = doWriteConfigFile(filename, cptr); - exit(ret); - break; -Index: os/utils.c -=================================================================== -RCS file: /cvs/xorg/xserver/xorg/os/utils.c,v -retrieving revision 1.25 -diff -u -u -r1.25 utils.c ---- os/utils.c 25 Mar 2006 19:52:05 -0000 1.25 -+++ os/utils.c 20 Jun 2006 08:33:04 -0000 -@@ -1721,8 +1721,10 @@ - case -1: /* error */ - p = -1; - case 0: /* child */ -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ _exit(127); -+ if (setuid(getuid()) == -1) -+ _exit(127); - execl("/bin/sh", "sh", "-c", command, (char *)NULL); - _exit(127); - default: /* parent */ -@@ -1773,8 +1775,10 @@ - xfree(cur); - return NULL; - case 0: /* child */ -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ _exit(127); -+ if (setuid(getuid()) == -1) -+ _exit(127); - if (*type == 'r') { - if (pdes[1] != 1) { - /* stdout */ -@@ -1848,8 +1852,10 @@ - xfree(cur); - return NULL; - case 0: /* child */ -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ _exit(127); -+ if (setuid(getuid()) == -1) -+ _exit(127); - if (*type == 'r') { - if (pdes[1] != 1) { - /* stdout */ diff --git a/hardened/xorg/x11-base/xorg-server/files/xprint.init b/hardened/xorg/x11-base/xorg-server/files/xprint.init new file mode 100644 index 0000000..e5fed1b --- /dev/null +++ b/hardened/xorg/x11-base/xorg-server/files/xprint.init @@ -0,0 +1,30 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xprint.init,v 1.1 2006/03/24 18:45:00 spyderous Exp $ + +opts="${opts} get_xpserverlist lsprinters" + +depend() { + use cupsd +} + +start() { + ebegin "Starting xprint" + /usr/lib/misc/xprint start > /dev/null + eend $? +} + +get_xpserverlist() { + /usr/lib/misc/xprint get_xpserverlist +} + +lsprinters() { + /usr/lib/misc/xprint lsprinters +} + +stop() { + ebegin "Stopping xprint" + /usr/lib/misc/xprint stop > /dev/null + eend $? +} diff --git a/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild deleted file mode 100644 index da68b10..0000000 --- a/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild +++ /dev/null @@ -1,709 +0,0 @@ -# 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.1.0-r1.ebuild,v 1.22 2006/10/06 21:57:29 wolf31o2 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" -MESA_P="${MESA_PN}-${MESA_PV}" -MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}" - -PATCHES="${FILESDIR}/${PN}-1.0.2-xprint-init.patch - ${FILESDIR}/1.0.99.901-Xprint-xprintdir.patch - ${FILESDIR}/${P}-glx-needs-GLcore.patch - ${FILESDIR}/${P}-dri-weak-glx.patch - ${FILESDIR}/${P}-setuid.diff" - -SRC_URI="${SRC_URI} - mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2 - http://xorg.freedesktop.org/snapshots/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 - 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.6 - 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 -############################################################################### -############################################################################### -## ## -## REMEMBER TO EDIT USE.MASK FILES IF CHANGING ARCHITECTURE DEPENDENCIES ## -## ## -############################################################################### -############################################################################### -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 ) - ) - !minimal? ( - >=x11-drivers/xf86-input-acecad-1.1.0 - >=x11-drivers/xf86-input-calcomp-1.1.0 - >=x11-drivers/xf86-input-citron-2.2.0 - >=x11-drivers/xf86-input-digitaledge-1.1.0 - >=x11-drivers/xf86-input-dmc-1.1.0 - >=x11-drivers/xf86-input-dynapro-1.1.0 - >=x11-drivers/xf86-input-elo2300-1.1.0 - >=x11-drivers/xf86-input-elographics-1.1.0 - >=x11-drivers/xf86-input-fpit-1.1.0 - >=x11-drivers/xf86-input-hyperpen-1.1.0 - >=x11-drivers/xf86-input-jamstudio-1.1.0 - >=x11-drivers/xf86-input-joystick-1.1.0 - >=x11-drivers/xf86-input-keyboard-1.1.0 - >=x11-drivers/xf86-input-magellan-1.1.0 - >=x11-drivers/xf86-input-microtouch-1.1.0 - >=x11-drivers/xf86-input-mouse-1.1.0 - >=x11-drivers/xf86-input-mutouch-1.1.0 - >=x11-drivers/xf86-input-palmax-1.1.0 - >=x11-drivers/xf86-input-penmount-1.1.0 - >=x11-drivers/xf86-input-spaceorb-1.1.0 - >=x11-drivers/xf86-input-summa-1.1.0 - >=x11-drivers/xf86-input-tek4957-1.1.0 - >=x11-drivers/xf86-input-void-1.1.0 - - kernel_linux? ( - >=x11-drivers/xf86-input-aiptek-1.0.1 - >=x11-drivers/xf86-input-evdev-1.1.1 - >=x11-drivers/xf86-input-ur98-1.1.0 - ) - - x86? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 - x11-drivers/synaptics - x11-drivers/linuxwacom - ) - x86-fbsd? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 ) - amd64? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 - x11-drivers/synaptics - x11-drivers/linuxwacom - ) - ppc? ( x11-drivers/synaptics - x11-drivers/linuxwacom - ) - ppc64? ( x11-drivers/synaptics - x11-drivers/linuxwacom - ) - ) - ) - input_devices_synaptics? ( >=x11-drivers/synaptics-0.14.4-r2 ) - || ( - ( - 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 - ) - ) - ) - !minimal? ( - >=x11-drivers/xf86-video-dummy-0.2.0 - >=x11-drivers/xf86-video-fbdev-0.2.0 - - !hppa? ( - kernel_linux? ( >=x11-drivers/xf86-video-v4l-0.1.1 ) - ) - - 3dfx? ( >=media-libs/glide-v3-3.10 ) - - alpha? ( >=x11-drivers/xf86-video-cirrus-1.1.0 - >=x11-drivers/xf86-video-ati-6.6.0 - >=x11-drivers/xf86-video-glint-1.1.1 - >=x11-drivers/xf86-video-mga-1.4.1 - >=x11-drivers/xf86-video-nv-1.1.1 - >=x11-drivers/xf86-video-rendition-4.1.0 - >=x11-drivers/xf86-video-s3-0.4.1 - >=x11-drivers/xf86-video-s3virge-1.9.1 - >=x11-drivers/xf86-video-savage-2.1.1 - >=x11-drivers/xf86-video-siliconmotion-1.4.1 - >=x11-drivers/xf86-video-sisusb-0.8.1 - >=x11-drivers/xf86-video-tdfx-1.2.1 - >=x11-drivers/xf86-video-tga-1.1.0 - >=x11-drivers/xf86-video-vga-4.1.0 - >=x11-drivers/xf86-video-voodoo-1.1.0 ) - amd64? ( >=x11-drivers/xf86-video-apm-1.1.1 - >=x11-drivers/xf86-video-ark-0.6.0 - >=x11-drivers/xf86-video-ati-6.6.0 - >=x11-drivers/xf86-video-chips-1.1.1 - >=x11-drivers/xf86-video-cirrus-1.1.0 - >=x11-drivers/xf86-video-cyrix-1.1.0 - >=x11-drivers/xf86-video-glint-1.1.1 - >=x11-drivers/xf86-video-i128-1.2.0 - >=x11-drivers/xf86-video-i810-1.6.0 - >=x11-drivers/xf86-video-mga-1.4.1 - >=x11-drivers/xf86-video-neomagic-1.1.1 - >=x11-drivers/xf86-video-nv-1.1.1 - >=x11-drivers/xf86-video-rendition-4.1.0 - >=x11-drivers/xf86-video-s3-0.4.1 - >=x11-drivers/xf86-video-s3virge-1.9.1 - >=x11-drivers/xf86-video-savage-2.1.1 - >=x11-drivers/xf86-video-siliconmotion-1.4.1 - >=x11-drivers/xf86-video-sis-0.9.1 - >=x11-drivers/xf86-video-sisusb-0.8.1 - >=x11-drivers/xf86-video-tdfx-1.2.1 - >=x11-drivers/xf86-video-tga-1.1.0 - >=x11-drivers/xf86-video-trident-1.2.1 - >=x11-drivers/xf86-video-tseng-1.1.0 - >=x11-drivers/xf86-video-vesa-1.1.0 - >=x11-drivers/xf86-video-vga-4.1.0 - >=x11-drivers/xf86-video-via-0.2.1 - >=x11-drivers/xf86-video-vmware-10.13.0 - >=x11-drivers/xf86-video-voodoo-1.1.0 ) - arm? ( >=x11-drivers/xf86-video-ati-6.6.0 - >=x11-drivers/xf86-video-chips-1.1.1 - >=x11-drivers/xf86-video-glint-1.1.1 - >=x11-drivers/xf86-video-mga-1.4.1 - >=x11-drivers/xf86-video-nv-1.1.1 - >=x11-drivers/xf86-video-s3-0.4.1 - >=x11-drivers/xf86-video-s3virge-1.9.1 - >=x11-drivers/xf86-video-savage-2.1.1 - >=x11-drivers/xf86-video-sis-0.9.1 - >=x11-drivers/xf86-video-sisusb-0.8.1 - >=x11-drivers/xf86-video-tdfx-1.2.1 - >=x11-drivers/xf86-video-trident-1.2.1 - >=x11-drivers/xf86-video-vga-4.1.0 - >=x11-drivers/xf86-video-voodoo-1.1.0 ) - ia64? ( >=x11-drivers/xf86-video-apm-1.1.1 - >=x11-drivers/xf86-video-ark-0.6.0 - >=x11-drivers/xf86-video-ati-6.6.0 - >=x11-drivers/xf86-video-chips-1.1.1 - >=x11-drivers/xf86-video-cirrus-1.1.0 - >=x11-drivers/xf86-video-cyrix-1.1.0 - >=x11-drivers/xf86-video-glint-1.1.1 - >=x11-drivers/xf86-video-i128-1.2.0 - >=x11-drivers/xf86-video-i740-1.1.0 - >=x11-drivers/xf86-video-i810-1.6.0 - >=x11-drivers/xf86-video-imstt-1.1.0 - >=x11-drivers/xf86-video-mga-1.4.1 - >=x11-drivers/xf86-video-neomagic-1.1.1 - >=x11-drivers/xf86-video-nv-1.1.1 - >=x11-drivers/xf86-video-rendition-4.1.0 - >=x11-drivers/xf86-video-s3-0.4.1 - >=x11-drivers/xf86-video-s3virge-1.9.1 - >=x11-drivers/xf86-video-savage-2.1.1 - >=x11-drivers/xf86-video-siliconmotion-1.4.1 - >=x11-drivers/xf86-video-sis-0.9.1 - >=x11-drivers/xf86-video-sisusb-0.8.1 - >=x11-drivers/xf86-video-tdfx-1.2.1 - >=x11-drivers/xf86-video-tga-1.1.0 - >=x11-drivers/xf86-video-trident-1.2.1 - >=x11-drivers/xf86-video-tseng-1.1.0 - >=x11-drivers/xf86-video-vesa-1.1.0 - >=x11-drivers/xf86-video-vga-4.1.0 - >=x11-drivers/xf86-video-via-0.2.1 - >=x11-drivers/xf86-video-voodoo-1.1.0 ) - mips? ( >=x11-drivers/xf86-video-impact-0.2.0 - >=x11-drivers/xf86-video-newport-0.2.0 ) - ppc? ( >=x11-drivers/xf86-video-ati-6.6.0 - >=x11-drivers/xf86-video-chips-1.1.1 - >=x11-drivers/xf86-video-glint-1.1.1 - >=x11-drivers/xf86-video-imstt-1.1.0 - >=x11-drivers/xf86-video-mga-1.4.1 - >=x11-drivers/xf86-video-nv-1.1.1 - >=x11-drivers/xf86-video-s3-0.4.1 - >=x11-drivers/xf86-video-s3virge-1.9.1 - >=x11-drivers/xf86-video-savage-2.1.1 - >=x11-drivers/xf86-video-sis-0.9.1 - >=x11-drivers/xf86-video-sisusb-0.8.1 - >=x11-drivers/xf86-video-tdfx-1.2.1 - >=x11-drivers/xf86-video-trident-1.2.1 - >=x11-drivers/xf86-video-vga-4.1.0 - >=x11-drivers/xf86-video-voodoo-1.1.0 ) - ppc64? ( >=x11-drivers/xf86-video-ati-6.6.0 - >=x11-drivers/xf86-video-mga-1.4.1 - >=x11-drivers/xf86-video-nv-1.1.1 - >=x11-drivers/xf86-video-sisusb-0.8.1 ) - sparc? ( >=x11-drivers/xf86-video-ati-6.6.0 - >=x11-drivers/xf86-video-glint-1.1.1 - >=x11-drivers/xf86-video-mga-1.4.1 - >=x11-drivers/xf86-video-savage-2.1.1 - >=x11-drivers/xf86-video-sisusb-0.8.1 - >=x11-drivers/xf86-video-sunbw2-1.1.0 - >=x11-drivers/xf86-video-suncg14-1.1.0 - >=x11-drivers/xf86-video-suncg3-1.1.0 - >=x11-drivers/xf86-video-suncg6-1.1.0 - >=x11-drivers/xf86-video-sunffb-1.1.0 - >=x11-drivers/xf86-video-sunleo-1.1.0 - >=x11-drivers/xf86-video-suntcx-1.1.0 - >=x11-drivers/xf86-video-tdfx-1.2.1 - >=x11-drivers/xf86-video-voodoo-1.1.0 ) - x86? ( >=x11-drivers/xf86-video-apm-1.1.1 - >=x11-drivers/xf86-video-ark-0.6.0 - >=x11-drivers/xf86-video-ati-6.6.0 - >=x11-drivers/xf86-video-chips-1.1.1 - >=x11-drivers/xf86-video-cirrus-1.1.0 - >=x11-drivers/xf86-video-cyrix-1.1.0 - >=x11-drivers/xf86-video-glint-1.1.1 - >=x11-drivers/xf86-video-i128-1.2.0 - >=x11-drivers/xf86-video-i740-1.1.0 - >=x11-drivers/xf86-video-i810-1.6.0 - >=x11-drivers/xf86-video-imstt-1.1.0 - >=x11-drivers/xf86-video-mga-1.4.1 - >=x11-drivers/xf86-video-neomagic-1.1.1 - >=x11-drivers/xf86-video-nsc-2.8.1 - >=x11-drivers/xf86-video-nv-1.1.1 - >=x11-drivers/xf86-video-rendition-4.1.0 - >=x11-drivers/xf86-video-s3-0.4.1 - >=x11-drivers/xf86-video-s3virge-1.9.1 - >=x11-drivers/xf86-video-savage-2.1.1 - >=x11-drivers/xf86-video-siliconmotion-1.4.1 - >=x11-drivers/xf86-video-sis-0.9.1 - >=x11-drivers/xf86-video-sisusb-0.8.1 - >=x11-drivers/xf86-video-tdfx-1.2.1 - >=x11-drivers/xf86-video-tga-1.1.0 - >=x11-drivers/xf86-video-trident-1.2.1 - >=x11-drivers/xf86-video-tseng-1.1.0 - >=x11-drivers/xf86-video-vesa-1.1.0 - >=x11-drivers/xf86-video-vga-4.1.0 - >=x11-drivers/xf86-video-via-0.2.1 - >=x11-drivers/xf86-video-vmware-10.13.0 - >=x11-drivers/xf86-video-voodoo-1.1.0 ) - x86-fbsd? ( - >=x11-drivers/xf86-video-vmware-10.13.0 ) - ) - ) )" -LICENSE="${LICENSE} MIT" - -pkg_setup() { - use minimal || ensure_a_server_is_building - - # Bug #145274 - anything that uses vm86.h is broken on AMD64 - if use kdrive && use amd64 && use video_cards_vesa; then - eerror "kdrive's VESA driver does not build on AMD64 because it uses" - eerror "vm86.h. Please build kdrive without VIDEO_CARDS=\"vesa\"." - die "kdrive's VESA driver does not build on AMD64." - 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 dri) - $(use_enable xorg) - $(use_enable xprint) - $(use_enable nptl glx-tls) - --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 - ${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 - einfo "Removing unused kdrive drivers ..." - for card in ${IUSE_VIDEO_CARDS}; do - # (bug #136370) Radeon needs fbdev and vesa - if use video_cards_radeon; then - if [[ ${card} = video_cards_fbdev ]] \ - || [[ ${card} = video_cards_vesa ]]; then - continue - fi - fi - - 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} - if ! use ${card}; 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 - 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 -} - -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 -} - -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." -} diff --git a/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1-r2.ebuild b/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1-r2.ebuild deleted file mode 100644 index 0e7526a..0000000 --- a/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1-r2.ebuild +++ /dev/null @@ -1,572 +0,0 @@ -# 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.1.1-r2.ebuild,v 1.1 2006/11/09 16:05:49 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" - - # For hardened, patch so that XOrg can be BIND_NOW. - # Also affected are the video drivers for cirrus and ati. - if use hardened; then - PATCHES="${PATCHES} - ${FILESDIR}/${P}-glx-needs-GLcore.patch - ${FILESDIR}/${P}-dri-weak-glx.patch" - else - # Ensure toolchain won't force BIND_NOW - append-ldflags -Wl,-z,lazy - filter-ldflags -Wl,-z,now - fi - - # 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 - ${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!" - - if use hardened; then - ewarn "HARDENED USERS ATTENTION!" - ewarn "Hardened patches have be applied, and XOrg has been built BIND_NOW." - ewarn "For this to work, xorg.conf must explicitly load all modules in" - ewarn "reverse order. See http://www.gentoo.org/proj/en/hardened/" - ewarn "for more details, or ask on the gentoo-hardened@g.o mailing list." - fi -} - -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." -} diff --git a/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild b/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild index 4ceb264..03c3acc 100644 --- a/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild +++ b/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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-r3.ebuild,v 1.2 2006/12/07 16:49:11 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r4.ebuild,v 1.11 2007/02/11 10:54:48 vapier Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -20,7 +20,7 @@ SRC_URI="${SRC_URI} 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" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" IUSE_INPUT_DEVICES=" input_devices_acecad input_devices_aiptek @@ -278,19 +278,10 @@ pkg_setup() { ${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch ${FILESDIR}/${PV}-sparc64-ati-lockups.patch ${FILESDIR}/xorg-conf-example.patch - ${FILESDIR}/${PV}-fix_acpi_tokenize.patch" - - # For hardened, patch so that XOrg can be BIND_NOW. - # Also affected are the video drivers for cirrus and ati. - if use hardened; then - PATCHES="${PATCHES} - ${FILESDIR}/${P}-glx-needs-GLcore.patch - ${FILESDIR}/${P}-dri-weak-glx.patch" - else - # Ensure toolchain won't force BIND_NOW - append-ldflags -Wl,-z,lazy - filter-ldflags -Wl,-z,now - fi + ${FILESDIR}/${PV}-fix_acpi_tokenize.patch + ${FILESDIR}/${PV}-fixdualhead.patch + ${FILESDIR}/${PV}-sparc-includes.patch + ${FILESDIR}/${PV}-dbe-render.diff" # Patches required for compiz to work with AIGLX, # but they slow EXA down (bug #147841). @@ -307,6 +298,14 @@ pkg_setup() { ${PATCHES}" fi + if use hardened; then + # Patches to make it bind-now + einfo "Hardened patches will be applied." + PATCHES="${FILESDIR}/${P}-glx-needs-GLcore.patch + ${FILESDIR}/${P}-dri-weak-glx.patch + ${PATCHES}" + fi + # SDL only available in kdrive build if use kdrive && use sdl; then conf_opts="${conf_opts} --enable-xsdl" @@ -409,14 +408,6 @@ pkg_postinst() { ewarn " Option \"ReducedBlanking\"" ewarn "In the relevant Monitor section(s)." ewarn "Make sure your reduced blanking modelines are safe!" - - if use hardened; then - ewarn "HARDENED USERS ATTENTION!" - ewarn "Hardened patches have be applied, and XOrg has been built BIND_NOW." - ewarn "For this to work, xorg.conf must explicitly load all modules in" - ewarn "reverse order. See http://www.gentoo.org/proj/en/hardened/" - ewarn "for more details, or ask on the gentoo-hardened@g.o mailing list." - fi } pkg_postrm() { diff --git a/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1.ebuild b/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1.ebuild deleted file mode 100644 index 350b87d..0000000 --- a/hardened/xorg/x11-base/xorg-server/xorg-server-1.1.1.ebuild +++ /dev/null @@ -1,483 +0,0 @@ -# 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.1.1.ebuild,v 1.21 2006/10/06 21:57:29 wolf31o2 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" -MESA_P="${MESA_PN}-${MESA_PV}" -MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}" - -PATCHES="${FILESDIR}/${P}-glx-needs-GLcore.patch - ${FILESDIR}/${P}-dri-weak-glx.patch - ${FILESDIR}/${PV}-sparc64-ati-lockups.patch" - -SRC_URI="${SRC_URI} - mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2 - http://xorg.freedesktop.org/snapshots/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 - 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.6 - 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 - - # Bug #145274 - anything that uses vm86.h is broken on AMD64 - if use kdrive && use amd64 && use video_cards_vesa; then - eerror "kdrive's VESA driver does not build on AMD64 because it uses" - eerror "vm86.h. Please build kdrive without VIDEO_CARDS=\"vesa\"." - die "kdrive's VESA driver does not build on AMD64." - 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 dri) - $(use_enable xorg) - $(use_enable xprint) - $(use_enable nptl glx-tls) - --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 - ${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 - einfo "Removing unused kdrive drivers ..." - for card in ${IUSE_VIDEO_CARDS}; do - # (bug #136370) Radeon needs fbdev and vesa - if use video_cards_radeon; then - if [[ ${card} = video_cards_fbdev ]] \ - || [[ ${card} = video_cards_vesa ]]; then - continue - fi - fi - - 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} - if ! use ${card}; 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 - 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 -} - -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 -} - -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." -} |