MD5 e9248d96ffd078829f56f3d8075a5304 files/06-aiglx-happy-vt-switch.patch 6043
RMD160 fce467afaa3988b511b9796af164f36172bf6b7b files/06-aiglx-happy-vt-switch.patch 6043
SHA256 112f1cccc0f3e1af1d76109e845c0e89462b6e95c2fd1cc80ca9370806a617dc files/06-aiglx-happy-vt-switch.patch 6043
-AUX 1.0.2-Xprint-xprintdir.patch 563 RMD160 559a4330ffe34a232e7e60dc9350925801beeb9b SHA1 3565e1fc60e062d0e176e69be00afedf4b08bd0a SHA256 eec3e9eab8fa9ba6f84bd76c0048ffb48f39749f7355bd4d7d1c8423cb34fae1
-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
-SHA256 28b0502d4e151813455a10a522488d1dddce8671492022433507ff61df277c12 files/1.0.2-fix-readKernelMapping-overrun.patch 468
-AUX 1.0.2-fix-rom-read-dualhead.patch 3344 RMD160 8e908ee65c4afdf78d8a8eb35af3a3d7f0288eca SHA1 fa406b2e5027e072d67f63c5b2193b5b0871e5cc SHA256 e7e10432b87a692a9d9e6a69299eaaff4b8ed150508f4df2b1342ee07fc5af5a
-MD5 bfe540b7dff88d33ed771535a7a1dc5b files/1.0.2-fix-rom-read-dualhead.patch 3344
-RMD160 8e908ee65c4afdf78d8a8eb35af3a3d7f0288eca files/1.0.2-fix-rom-read-dualhead.patch 3344
-SHA256 e7e10432b87a692a9d9e6a69299eaaff4b8ed150508f4df2b1342ee07fc5af5a files/1.0.2-fix-rom-read-dualhead.patch 3344
-AUX 1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021 RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d SHA1 838913c520e5fa4a62a06afb9882e9117458e181 SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620
-MD5 6d3ecb7a2b6736047a08447cda7f8ed6 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
-RMD160 5cffbd24fc7d3d817b050de268ce23e64ed83b5d files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
-SHA256 6c32348b9c8460250b2600ae8672c5cadce4b5cca5577b9937a703afbfc57620 files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch 2021
-AUX 1.0.2-try-to-fix-xorgcfg.patch 3420 RMD160 1dae01b97ba89cab4209371aa6de9f92fbb9a0e0 SHA1 1487c444de9f6348e49d150a1cdb0517569030ab SHA256 65193968dffac2127626ef9e05aa8da9ec32d39703e4c3530e89bab059dfed74
-MD5 bf743bd4e1b1c3a6b3d3122f48f8f6a7 files/1.0.2-try-to-fix-xorgcfg.patch 3420
-RMD160 1dae01b97ba89cab4209371aa6de9f92fbb9a0e0 files/1.0.2-try-to-fix-xorgcfg.patch 3420
-SHA256 65193968dffac2127626ef9e05aa8da9ec32d39703e4c3530e89bab059dfed74 files/1.0.2-try-to-fix-xorgcfg.patch 3420
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
MD5 cceefbe34d34bd2d776d95d63851ec51 files/1.2.99.0-fix-sysconfdir-references.patch 421
RMD160 4af58784b1af8c02ebe395530da3e0a3f619c9a9 files/1.2.99.0-fix-sysconfdir-references.patch 421
SHA256 216905a6ac45ae01cbec53c5a8a5ebd53e9c8f647e91d57d926f9109a73cef24 files/1.2.99.0-fix-sysconfdir-references.patch 421
-AUX CVE-2006-1526-xrender-mitri.patch 819 RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b SHA1 fe760840ec4d6023f713f9b79b745c7822a37828 SHA256 1558fcaf5f1f6050c6a38023bc4effd8802320c2c6b3c146f19ceb8beb2d367b
-MD5 c51e1f359e9008bd496173a013866343 files/CVE-2006-1526-xrender-mitri.patch 819
-RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b files/CVE-2006-1526-xrender-mitri.patch 819
-SHA256 1558fcaf5f1f6050c6a38023bc4effd8802320c2c6b3c146f19ceb8beb2d367b files/CVE-2006-1526-xrender-mitri.patch 819
-AUX x11r7.0-setuid.diff 3513 RMD160 a6b7b95e54b748ad2d1892395927a9c681e940ea SHA1 1f46fd5e5938682885c44025a0883a5181859cdc SHA256 8305e689358d5a92c1fae74f520a044677d468d6a617afddc5013af7b37c5db6
-MD5 0411ec21c16bdabd945159476b1c796a files/x11r7.0-setuid.diff 3513
-RMD160 a6b7b95e54b748ad2d1892395927a9c681e940ea files/x11r7.0-setuid.diff 3513
-SHA256 8305e689358d5a92c1fae74f520a044677d468d6a617afddc5013af7b37c5db6 files/x11r7.0-setuid.diff 3513
AUX xorg-conf-example.patch 1924 RMD160 04325d6624ad01ee69702b069be3665b5e96b647 SHA1 2d7b8328c695dc179e4f6e1d0e4609bb449159ee SHA256 ceb0dd0ccc6b02a026b599f1c838fc0a0c3f789f58407e85ee783ddaf9989350
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-64bit-fix-for-glx.patch 414 RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 SHA1 3464a0f714810d36da11424103550e604f93b22f SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4
-MD5 900d8194df467de2c86276d446522062 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
-RMD160 17732b6ebe06e1533ce8f9b97e6ca8d7e4347a88 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
-SHA256 1b2337fa0438c72fc8a17d710133f79ed17d49650efd9bc530bbb97b116427c4 files/xorg-server-1.0.2-64bit-fix-for-glx.patch 414
-AUX xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663 RMD160 ce0868d46d92431db41d474a77fea184f6a61682 SHA1 08db11a8a841415496f5ff8ef8a21b1425d392cd SHA256 3535e137595623f7f5f23b0a8ee8b52d4d5acf7b6dfb534dff5f537e68603c6b
-MD5 1b8b160cdbeaf3a2994f50e83d9fa8d7 files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663
-RMD160 ce0868d46d92431db41d474a77fea184f6a61682 files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663
-SHA256 3535e137595623f7f5f23b0a8ee8b52d4d5acf7b6dfb534dff5f537e68603c6b files/xorg-server-1.0.2-64bit-fix-have-dix-config.patch 663
-AUX xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766 RMD160 595ccef38810f2ec5056999ba1f5ce8f22b29bd0 SHA1 49def422c5b5189dde7581ac295aac1f510bc14d SHA256 1bceddffeacbf67202b2aff6dba27234746b37004a186415560a4cd8896458f1
-MD5 8fa71f7fa2e17a2ccd41532909b153a8 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766
-RMD160 595ccef38810f2ec5056999ba1f5ce8f22b29bd0 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766
-SHA256 1bceddffeacbf67202b2aff6dba27234746b37004a186415560a4cd8896458f1 files/xorg-server-1.0.2-64bit-fix-indirect-vertex-array.patch 766
-AUX xorg-server-1.0.2-Sbus.patch 2388 RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 SHA1 b2f5ca6d167d885282a44cdf700ac51043a92043 SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e
-MD5 912a66d58d73ad9c95c1c7d40c71f679 files/xorg-server-1.0.2-Sbus.patch 2388
-RMD160 f9757cbfed84e0e873f706e7a33ac04216b7dd72 files/xorg-server-1.0.2-Sbus.patch 2388
-SHA256 5e3255a38216599ddd7e3b108eb96c53a9c1d595ceee80ac3c698e1d0af7811e files/xorg-server-1.0.2-Sbus.patch 2388
-AUX xorg-server-1.0.2-Xprt-build.patch 7747 RMD160 ab0e209f517f7e501f473cf8043c8224f0307366 SHA1 2da85693520d1f787d4ee9e3bd52f14261adee9b SHA256 06f275c528e1decac56245c3ad50638fec5fdfe765040c02d3218c1c99210c73
-MD5 fb7fc524e87b10dd3cb506c3398741cf files/xorg-server-1.0.2-Xprt-build.patch 7747
-RMD160 ab0e209f517f7e501f473cf8043c8224f0307366 files/xorg-server-1.0.2-Xprt-build.patch 7747
-SHA256 06f275c528e1decac56245c3ad50638fec5fdfe765040c02d3218c1c99210c73 files/xorg-server-1.0.2-Xprt-build.patch 7747
-AUX xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062 RMD160 ba444145faf16e3bf4e31e07053df064bc07be7f SHA1 957e201d1095ef4cc4ec1c87736897d37c0103d7 SHA256 220bafc2023ef45413713d9463c4f593c5bc390a3bba009b0a20989fd8d3b05b
-MD5 39d2b9cdc89d0882a414d621cb496982 files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
-RMD160 ba444145faf16e3bf4e31e07053df064bc07be7f files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
-SHA256 220bafc2023ef45413713d9463c4f593c5bc390a3bba009b0a20989fd8d3b05b files/xorg-server-1.0.2-sparc64-cfbrrop-fix.patch 1062
-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.1-install-libxf86config-headers.patch 422 RMD160 297df8f5478195a8e0c0589436c9dad457c91539 SHA1 435f5d3c410a7e17b31c27c44a1f36145db626ea SHA256 85de5a76afb5a6c6ab0ac0d0f7d7decad99035cbbc04362e69a1627f04d86269
MD5 f17556037156af0294c22e094172d1f6 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
RMD160 297df8f5478195a8e0c0589436c9dad457c91539 files/xorg-server-1.1.1-install-libxf86config-headers.patch 422
MD5 9bf4e36931c99f405aa6766ff5614e51 files/xprint.init 598
RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e files/xprint.init 598
SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13 files/xprint.init 598
-DIST 1.0.2-overlay-window.patch.bz2 6388 RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 SHA1 1e7e66ca37b0a08df754d060db03a1d5ccf7bc42 SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67
-DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA1 4f042bdf38c9eb62e04660bd18566e7ca50d8640 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86
DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 SHA1 cd3b314808534b0306c7f89e9a72c9c23dbff239 SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0
DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
-DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA1 b2257e984c5111093ca80f1f63a7a9befa20b6c0 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba
DIST xorg-server-1.1.1.tar.bz2 6252103 RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 SHA1 eb29dd4fea9f184321cbb5512f68b674ada4daf7 SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c
DIST xorg-server-1.2.0.tar.bz2 6014596 RMD160 0bbc5ccb5cbbe7627b4f09f17848b188e8be2a50 SHA1 85fa0e8fa7d6bea6f1a73c66a57488ea68dffa17 SHA256 e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
DIST xorg-server-1.2.99.0.tar.bz2 6170605 RMD160 7c478d911c2c38de7e6fa823168a61d649e0251e SHA1 06bee10153da39f0f3cc89ca92bca766e996ebdf SHA256 f45f35d33cc9bb06c7261ecf3d9cc4fee9464224543be3e4de255d65e0d347b0
-EBUILD xorg-server-1.0.2-r8.ebuild 6241 RMD160 bea6093cdb91552bbe4dcd0da3ca89e291f6ba87 SHA1 9fdc7137754cccd1f897d4c993598a6ca0b4e02e SHA256 f8de9a732229e40a659e3044bc1342706a1eb700ef401fe29d6f7978d18f5e26
-MD5 4f35b2183c4ec37d6aef36ffee598a00 xorg-server-1.0.2-r8.ebuild 6241
-RMD160 bea6093cdb91552bbe4dcd0da3ca89e291f6ba87 xorg-server-1.0.2-r8.ebuild 6241
-SHA256 f8de9a732229e40a659e3044bc1342706a1eb700ef401fe29d6f7978d18f5e26 xorg-server-1.0.2-r8.ebuild 6241
EBUILD xorg-server-1.1.1-r1.ebuild 17208 RMD160 e055625b08964f7f4a96e795127eb13a25a01f66 SHA1 84b7d4190468e97ef516a78cdc55fc8edc64d02a SHA256 c79f9f7bb2fb2077480415a2162e4fe7612d9eeccda90e2f4d51e7af8b6aa173
MD5 886496f84d0490fcf63755399a46c378 xorg-server-1.1.1-r1.ebuild 17208
RMD160 e055625b08964f7f4a96e795127eb13a25a01f66 xorg-server-1.1.1-r1.ebuild 17208
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 45124 RMD160 23466042bc90a80f0bf439eabf13eaa34362bcf4 SHA1 53b0bb33707a6cb4099f76771d267907544829db SHA256 93e1ebc5fd69076f75d7fa7156c312e2e8ab80e2d4af3730a06eecc390ccdb4e
-MD5 3215cd1dddc3a330ea3b3c0ca722ba73 ChangeLog 45124
-RMD160 23466042bc90a80f0bf439eabf13eaa34362bcf4 ChangeLog 45124
-SHA256 93e1ebc5fd69076f75d7fa7156c312e2e8ab80e2d4af3730a06eecc390ccdb4e ChangeLog 45124
+MISC ChangeLog 45933 RMD160 42c03fb4204c9bb599d59b545b926bcd85ad8556 SHA1 b7986783571d47ac1f424b21ded22f28c144901c SHA256 67a9e97076ef25b08dae8b3684815c60aa201686ceecfec19bd6e44c8fd2257e
+MD5 dc00da6adac08221455303e64fa14ea2 ChangeLog 45933
+RMD160 42c03fb4204c9bb599d59b545b926bcd85ad8556 ChangeLog 45933
+SHA256 67a9e97076ef25b08dae8b3684815c60aa201686ceecfec19bd6e44c8fd2257e ChangeLog 45933
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-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 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
+++ /dev/null
-diff -urN xorg-server-1.0.2.orig/Xprint/Makefile.am xorg-server-1.0.2/Xprint/Makefile.am
---- xorg-server-1.0.2.orig/Xprint/Makefile.am 2006-04-23 14:26:07.000000000 -0700
-+++ xorg-server-1.0.2/Xprint/Makefile.am 2006-04-23 14:26:23.000000000 -0700
-@@ -4,7 +4,7 @@
-
- Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
- -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \
-- -DXPRINTDIR=\"$(prefix)/lib/X11/xserver\" \
-+ -DXPRINTDIR=\"$(libdir)/X11/xserver\" \
- -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
-
- Xprt_LDFLAGS = -L$(top_srcdir)
+++ /dev/null
---- 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 <dix-config.h>
- #endif
-
-+#if HAVE_STDINT_T
-+#include <stdint.h>
-+#elif !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- #include <X11/X.h>
- #include <X11/Xproto.h>
- #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 <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);
-@@ -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;
- }
-
+++ /dev/null
---- xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c~ 2005-07-03 11:51:16.000000000 +0100
-+++ xorg-server-1.0.1/hw/xfree86/os-support/linux/lnx_KbdMap.c 2006-04-02 17:37:10.000000000 +0100
-@@ -180,7 +180,7 @@ static KeySym linux_to_x[256] = {
- /*
- * Maps the AT keycodes to Linux keycodes
- */
--static unsigned char at2lnx[NUM_KEYCODES] =
-+static unsigned char at2lnx[] =
- {
- 0x01, /* KEY_Escape */ 0x02, /* KEY_1 */
- 0x03, /* KEY_2 */ 0x04, /* KEY_3 */
+++ /dev/null
-https://bugs.freedesktop.org/show_bug.cgi?id=6751
-
-X.org breaks on newer Linux kernels as it re-writes BARs behind the kernels back
-when attempting to read the ROMs, this causes crashes and hangs on dual-card
-systems.
-
---- hw/xfree86/os-support/bus/Pci.c 2005-11-08 11:04:56.000000000 -0800
-+++ hw/xfree86/os-support/bus/Pci.c 2006-06-29 15:48:37.000000000 -0700
-@@ -233,6 +233,8 @@
-
- static pciConfigPtr pci_devp[MAX_PCI_DEVICES + 1] = {NULL, };
-
-+static int (*pciOSHandleBIOS)(PCITAG Tag, int basereg, unsigned char *buf, int len);
-+
- /*
- * Platform specific PCI function pointers.
- *
-@@ -266,6 +268,11 @@
- #endif
- }
-
-+void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len))
-+{
-+ pciOSHandleBIOS = bios_fn;
-+}
-+
- PCITAG
- pciFindFirst(CARD32 id, CARD32 mask)
- {
-@@ -1347,6 +1354,13 @@
- PCITAG *pTag;
- int i;
-
-+ /* fall back to the old code if the OS code fails */
-+ if (pciOSHandleBIOS) {
-+ n = pciOSHandleBIOS(Tag, basereg, func, ptr);
-+ if (n)
-+ return n;
-+ }
-+
- n = handlePciBIOS(Tag,basereg,func,ptr);
- if (n)
- return n;
---- hw/xfree86/os-support/bus/Pci.h 2005-11-08 11:04:56.000000000 -0800
-+++ hw/xfree86/os-support/bus/Pci.h 2006-06-29 15:43:50.000000000 -0700
-@@ -431,6 +431,7 @@
- Bool pciMfDev(int, int);
- ADDRESS pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS);
-
-+extern void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len));
- extern PCITAG (*pciFindFirstFP)(void);
- extern PCITAG (*pciFindNextFP)(void);
-
---- hw/xfree86/os-support/bus/linuxPci.c 2005-11-08 11:04:56.000000000 -0800
-+++ hw/xfree86/os-support/bus/linuxPci.c 2006-06-29 15:43:50.000000000 -0700
-@@ -73,6 +73,7 @@
- static void linuxPciCfgWriteByte(PCITAG tag, int off, CARD8 val);
- static CARD16 linuxPciCfgReadWord(PCITAG tag, int off);
- static void linuxPciCfgWriteWord(PCITAG tag, int off, CARD16 val);
-+static int linuxPciHandleBIOS(PCITAG Tag, int basereg, unsigned char *buf, int len);
-
- static pciBusFuncs_t linuxFuncs0 = {
- /* pciReadLong */ linuxPciCfgRead,
-@@ -125,6 +126,7 @@
- pciBusInfo[0] = &linuxPci0;
- pciFindFirstFP = pciGenFindFirst;
- pciFindNextFP = pciGenFindNext;
-+ pciSetOSBIOSPtr(linuxPciHandleBIOS);
- }
-
- static int
-@@ -892,3 +894,44 @@
- }
-
- #endif /* !INCLUDE_XF86_NO_DOMAIN */
-+
-+int linuxPciHandleBIOS(PCITAG Tag, int basereg, unsigned char *buf, int len)
-+{
-+ unsigned int dom, bus, dev, func;
-+ unsigned int fd;
-+ char file[256];
-+ struct stat st;
-+ int ret;
-+ int sofar = 0;
-+
-+ dom = PCI_DOM_FROM_TAG(Tag);
-+ bus = PCI_BUS_FROM_TAG(Tag);
-+ dev = PCI_DEV_FROM_TAG(Tag);
-+ func = PCI_FUNC_FROM_TAG(Tag);
-+ sprintf(file, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/rom",
-+ dom, bus, dev, func);
-+
-+ if (stat(file, &st) == 0)
-+ {
-+ if ((fd = open(file, O_RDWR)))
-+ basereg = 0x0;
-+
-+ /* enable the ROM first */
-+ write(fd, "1", 2);
-+ lseek(fd, 0, SEEK_SET);
-+ do {
-+ /* copy the ROM until we hit Len, EOF or read error */
-+ ret = read(fd, buf+sofar, len-sofar);
-+ if (ret <= 0)
-+ break;
-+ sofar += ret;
-+ } while (sofar < len);
-+
-+ write(fd, "0", 2);
-+ close(fd);
-+ if (sofar < len)
-+ xf86MsgVerb(X_INFO, 3, "Attempted to read BIOS %dKB from %s: got %dKB\n", len/1024, file, sofar/1024);
-+ return sofar;
-+ }
-+ return 0;
-+}
+++ /dev/null
-Index: xorg/hw/xfree86/utils/xorgconfig/cards.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgconfig/cards.c,v
-retrieving revision 1.4
-diff -u -b -B -r1.4 cards.c
---- xorg/hw/xfree86/utils/xorgconfig/cards.c 1 Jul 2005 22:43:35 -0000 1.4
-+++ xorg/hw/xfree86/utils/xorgconfig/cards.c 23 Mar 2006 07:42:26 -0000
-@@ -19,7 +19,7 @@
-
- /* Some vars to make path names in texts more flexible. */
- #ifndef PROJECTROOT
--# define PROJECTROOT "/usr/X11R6"
-+# define PROJECTROOT "/usr"
- #endif
- #define TREEROOT PROJECTROOT
- #define TREEROOTLX TREEROOT "/lib/X11"
-Index: xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v
-retrieving revision 1.19
-diff -u -b -B -r1.19 xorgconfig.c
---- xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c 8 Nov 2005 06:33:30 -0000 1.19
-+++ xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c 23 Mar 2006 07:42:28 -0000
-@@ -157,11 +157,12 @@
- * may be more irritated than Unix users
- */
- #ifndef PROJECTROOT
--#define PROJECTROOT "/usr/X11R6"
-+#define PROJECTROOT "/usr"
- #endif
- #define TREEROOT PROJECTROOT
- #define TREEROOTLX TREEROOT "/lib/X11"
- #define TREEROOTCFG TREEROOT "/etc/X11"
-+#define TREEROOTSHARE TREEROOT "/share/X11"
- #ifdef XDOCDIR
- # define TREEROOTDOC XDOCDIR
- #else
-@@ -495,7 +496,7 @@
- #elif defined(__FreeBSD__)
- # define DEF_MOUSEDEV "/dev/sysmouse";
- #else
--# define DEF_MOUSEDEV "/dev/mouse";
-+# define DEF_MOUSEDEV "/dev/input/mice";
- #endif
-
- #ifndef __UNIXOS2__
-@@ -1970,7 +1971,7 @@
- "# file minus the extension (like \".txt\" or \".db\"). There is normally\n"
- "# no need to change the default.\n"
- "\n"
--" RgbPath \"" TREEROOTLX "/rgb\"\n"
-+"# RgbPath \"" TREEROOTSHARE "/rgb\"\n"
- "\n"
- "# Multiple FontPath entries are allowed (which are concatenated together),\n"
- "# as well as specifying multiple comma-separated entries in one FontPath\n"
+++ /dev/null
-Index: xorg/hw/xfree86/utils/xorgcfg/interface.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/interface.c,v
-retrieving revision 1.8
-diff -u -b -B -r1.8 interface.c
---- xorg/hw/xfree86/utils/xorgcfg/interface.c 8 Nov 2005 06:33:30 -0000 1.8
-+++ xorg/hw/xfree86/utils/xorgcfg/interface.c 23 Mar 2006 07:42:49 -0000
-@@ -65,7 +65,7 @@
- #ifdef PROJECT_ROOT
- #define DefaultXFree86Dir PROJECT_ROOT
- #else
--#define DefaultXFree86Dir "/usr/X11R6"
-+#define DefaultXFree86Dir "/usr"
- #endif
-
- #define IS_KBDDRIV(S) ((strcasecmp((S),"kbd") == 0) || \
-Index: xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c,v
-retrieving revision 1.5
-diff -u -b -B -r1.5 keyboard-cfg.c
---- xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c 8 Nov 2005 06:33:30 -0000 1.5
-+++ xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c 23 Mar 2006 07:42:51 -0000
-@@ -72,7 +72,7 @@
- */
- static XF86XkbRulesDescInfo **xkb_desc, *xkb_rules;
- static int num_xkb_desc;
--static char *XkbRulesDir = "lib/X11/xkb/rules/";
-+static char *XkbRulesDir = "share/X11/xkb/rules/";
- #ifdef XFREE98_XKB
- static char *XkbRulesFile = "xfree98";
- #else
-Index: xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h,v
-retrieving revision 1.3
-diff -u -b -B -r1.3 keyboard-cfg.h
---- xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h 4 Dec 2004 00:43:11 -0000 1.3
-+++ xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h 23 Mar 2006 07:42:51 -0000
-@@ -38,7 +38,7 @@
- /*
- * All file names are from XProjectRoot or XWINHOME environment variable.
- */
--#define XkbConfigDir "lib/X11/xkb/"
-+#define XkbConfigDir "share/X11/xkb/"
- #define XkbConfigFile "X0-config.keyboard"
-
- /*
-Index: xorg/hw/xfree86/utils/xorgcfg/loader.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/loader.c,v
-retrieving revision 1.5
-diff -u -b -B -r1.5 loader.c
---- xorg/hw/xfree86/utils/xorgcfg/loader.c 8 Dec 2005 17:54:40 -0000 1.5
-+++ xorg/hw/xfree86/utils/xorgcfg/loader.c 23 Mar 2006 07:42:51 -0000
-@@ -55,7 +55,7 @@
- #include <stdarg.h>
-
- #ifndef OPTIONSPATH
--#define OPTIONSPATH "/usr/X11R6/lib/X11"
-+#define OPTIONSPATH "/usr/lib/X11"
- #endif
-
- #ifndef SIGNALRETURNSINT
-Index: xorg/hw/xfree86/utils/xorgcfg/text-mode.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v
-retrieving revision 1.6
-diff -u -b -B -r1.6 text-mode.c
---- xorg/hw/xfree86/utils/xorgcfg/text-mode.c 8 Dec 2005 17:54:40 -0000 1.6
-+++ xorg/hw/xfree86/utils/xorgcfg/text-mode.c 23 Mar 2006 07:42:55 -0000
-@@ -52,12 +52,12 @@
- (strcmp((X), "keyboard") == 0))
-
- #ifndef PROJECT_ROOT
--#define PROJECT_ROOT "/usr/X11R6"
-+#define PROJECT_ROOT "/usr"
- #endif
-
- #ifndef XKB_RULES_DIR
- #ifndef __UNIXOS2__
--#define XKB_RULES_DIR PROJECT_ROOT "/lib/X11/xkb/rules"
-+#define XKB_RULES_DIR PROJECT_ROOT "/share/X11/xkb/rules"
- #else
- #define XKB_RULES_DIR XF86CONFIGDIR "/xkb/rules"
- #endif
-@@ -558,7 +558,7 @@
- #elif defined(__UNIXOS2__)
- str = "mouse$";
- #else
-- str = "/dev/mouse";
-+ str = "/dev/input/mice";
- #endif
-
- ClearScreen();
+++ /dev/null
-Index: render/mitri.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/render/mitri.c,v
-retrieving revision 1.5
-diff -u -r1.5 mitri.c
---- xserver/xorg/render/mitri.c 3 Jul 2005 07:02:08 -0000 1.5
-+++ xserver/xorg/render/mitri.c 18 Apr 2006 22:34:08 -0000
-@@ -145,7 +145,7 @@
- if (npoint < 3)
- return;
- ntri = npoint - 2;
-- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
- if (!tris)
- return;
- for (tri = tris; npoint >= 3; npoint--, points++, tri++)
-@@ -177,7 +177,7 @@
- if (npoint < 3)
- return;
- ntri = npoint - 2;
-- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
- if (!tris)
- return;
- first = points++;
-
+++ /dev/null
-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
+++ /dev/null
-Index: xserver/xorg/hw/xfree86/common/xf86Init.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/common/xf86Init.c,v
-retrieving revision 1.29
-diff -u -u -r1.29 xf86Init.c
---- xserver/xorg/hw/xfree86/common/xf86Init.c 14 Dec 2005 20:11:16 -0000 1.29
-+++ xserver/xorg/hw/xfree86/common/xf86Init.c 20 Jun 2006 07:58:44 -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: xserver/xorg/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.9
-diff -u -u -r1.9 libc_wrapper.c
---- xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c 3 Jul 2005 08:53:48 -0000 1.9
-+++ xserver/xorg/hw/xfree86/os-support/shared/libc_wrapper.c 20 Jun 2006 07:58:45 -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: xserver/xorg/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
---- xserver/xorg/hw/xfree86/parser/write.c 3 Jul 2005 07:01:37 -0000 1.3
-+++ xserver/xorg/hw/xfree86/parser/write.c 20 Jun 2006 07:58:45 -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: xserver/xorg/os/utils.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/os/utils.c,v
-retrieving revision 1.21
-diff -u -u -r1.21 utils.c
---- xserver/xorg/os/utils.c 8 Nov 2005 06:33:30 -0000 1.21
-+++ xserver/xorg/os/utils.c 20 Jun 2006 07:58:47 -0000
-@@ -1718,8 +1718,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 */
-@@ -1770,8 +1772,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 */
-@@ -1845,8 +1849,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 */
+++ /dev/null
---- ../Mesa-6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c 2005-11-30 02:02:16.000000000 +0300
-+++ ../Mesa-6.4.2/src/mesa/drivers/dri/common/glcontextmodes.c 2006-02-07 10:38:46.000000000 +0300
-@@ -39,6 +39,9 @@
- # include "imports.h"
- # define __glXMemset memset
- #else
-+# if defined (HAVE_DIX_CONFIG_H)
-+# include <dix-config.h>
-+# endif
- # include <X11/X.h>
- # include <GL/glx.h>
- # include "GL/glxint.h"
+++ /dev/null
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v
-rcsdiff: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.70
-retrieving revision 1.71
-diff -u -r1.70 -r1.71
---- ../Mesa-6.4.2/src/mesa/main/glheader.h 2006/02/11 02:59:38 1.70
-+++ ../Mesa-6.4.2/src/mesa/main/glheader.h 2006/02/15 21:03:34 1.71
-@@ -46,6 +46,9 @@
- #ifndef GLHEADER_H
- #define GLHEADER_H
-
-+#ifdef HAVE_DIX_CONFIG_H
-+#include "dix-config.h"
-+#endif
-
- #if defined(XFree86LOADER) && defined(IN_MODULE) && !defined(NO_LIBCWRAPPER)
- #include "xf86_ansic.h"
+++ /dev/null
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v
-rcsdiff: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- ../Mesa-6.4.2/src/glx/x11/indirect_vertex_array.c 2005/08/19 18:53:26 1.6
-+++ ../Mesa-6.4.2/src/glx/x11/indirect_vertex_array.c 2006/02/14 15:04:45 1.7
-@@ -530,7 +530,7 @@
- emit_DrawArrays_header_old( __GLXcontext * gc,
- struct array_state_vector * arrays,
- size_t * elements_per_request,
-- size_t * total_requests,
-+ unsigned int * total_requests,
- GLenum mode, GLsizei count )
- {
- size_t command_size;
+++ /dev/null
---- hw/xfree86/os-support/bus/xf86Sbus.h- 2005-12-19 19:30:39.000000000 +0000
-+++ hw/xfree86/os-support/bus/xf86Sbus.h 2005-12-19 19:30:39.000000000 +0000
-@@ -0,0 +1,70 @@
-+/*
-+ * Platform specific SBUS and OpenPROM access declarations.
-+ *
-+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */
-+
-+#ifdef HAVE_XORG_CONFIG_H
-+#include <xorg-config.h>
-+#endif
-+
-+#ifndef _XF86_SBUS_H
-+#define _XF86_SBUS_H
-+
-+#if defined(linux)
-+#include <asm/types.h>
-+#include <linux/fb.h>
-+#include <asm/fbio.h>
-+#include <asm/openpromio.h>
-+#elif defined(SVR4)
-+#include <sys/fbio.h>
-+#include <sys/openpromio.h>
-+#elif defined(__OpenBSD__) && defined(__sparc64__)
-+/* XXX */
-+#elif defined(CSRG_BASED)
-+#if defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/fbio.h>
-+#include <dev/ofw/openpromio.h>
-+#else
-+#include <machine/fbio.h>
-+#endif
-+#else
-+#include <sun/fbio.h>
-+#endif
-+
-+#ifndef FBTYPE_SUNGP3
-+#define FBTYPE_SUNGP3 -1
-+#endif
-+#ifndef FBTYPE_MDICOLOR
-+#define FBTYPE_MDICOLOR -1
-+#endif
-+#ifndef FBTYPE_SUNLEO
-+#define FBTYPE_SUNLEO -1
-+#endif
-+#ifndef FBTYPE_TCXCOLOR
-+#define FBTYPE_TCXCOLOR -1
-+#endif
-+#ifndef FBTYPE_CREATOR
-+#define FBTYPE_CREATOR -1
-+#endif
-+
-+#endif /* _XF86_SBUS_H */
+++ /dev/null
-Index: configure.ac
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
-retrieving revision 1.157
-diff -u -r1.157 configure.ac
---- configure.ac 30 Dec 2005 12:05:47 -0000 1.157
-+++ configure.ac 6 Jan 2006 16:05:21 -0000
-@@ -1632,6 +1632,7 @@
- Xprint/Makefile
- Xprint/doc/Makefile
- Xprint/pcl/Makefile
-+Xprint/pcl-mono/Makefile
- Xprint/raster/Makefile
- Xprint/ps/Makefile
- Xprint/etc/Makefile
-Index: Xprint/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/Xprint/Makefile.am,v
-retrieving revision 1.6
-diff -u -r1.6 Makefile.am
---- Xprint/Makefile.am 2 Dec 2005 06:02:38 -0000 1.6
-+++ Xprint/Makefile.am 6 Jan 2006 16:05:22 -0000
-@@ -1,13 +1,17 @@
--SUBDIRS = doc pcl raster ps etc
-+SUBDIRS = doc pcl pcl-mono raster ps etc
-
- bin_PROGRAMS = Xprt
-
- Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
-- -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \
-- -DXPRINTDIR=\"$(prefix)/X11/xserver\"
-+ -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \
-+ -DXPRINTDIR=\"$(prefix)/lib/X11/xserver\" \
-+ -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX
-
- Xprt_LDFLAGS = -L$(top_srcdir)
--Xprt_LDADD = @XPRINT_LIBS@ pcl/libpcl.la raster/libraster.la
-+Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \
-+ pcl/libpcl.la pcl-mono/libpcl.la \
-+ ../mfb/libmfb.la ../mi/libmi.la \
-+ ../cfb32/libcfb32.la ../cfb/libcfb.la ../Xext/libXext.la
-
- miinitext-wrapper.c:
- echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
-Index: Xprint/ddxInit.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/Xprint/ddxInit.c,v
-retrieving revision 1.7
-diff -u -r1.7 ddxInit.c
---- Xprint/ddxInit.c 3 Jul 2005 07:01:09 -0000 1.7
-+++ Xprint/ddxInit.c 6 Jan 2006 16:05:22 -0000
-@@ -85,6 +85,11 @@
-
- pScreenInfo->numPixmapFormats = 0; /* get them in PrinterInitOutput */
- screenInfo.numVideoScreens = 0;
-+
-+#ifdef PRINT_ONLY_SERVER
-+ PrinterInitOutput(pScreenInfo, argc, argv);
-+#endif
-+
- }
-
- static void
-Index: Xprint/pcl/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/Xprint/pcl/Makefile.am,v
-retrieving revision 1.3
-diff -u -r1.3 Makefile.am
---- Xprint/pcl/Makefile.am 2 Dec 2005 06:02:38 -0000 1.3
-+++ Xprint/pcl/Makefile.am 6 Jan 2006 16:05:22 -0000
-@@ -1,31 +1,6 @@
- noinst_LTLIBRARIES = libpcl.la
-
--INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
-+PCL_DRIVER = -DXP_PCL_COLOR
-
--AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
-- -D_XP_PRINT_SERVER_ -DPSZ=8
-+include ../pcl/Makefile.am.inc
-
--libpcl_la_SOURCES = \
-- PclArc.c \
-- PclArea.c \
-- PclAttr.c \
-- PclAttVal.c \
-- PclColor.c \
-- PclCursor.c \
-- PclDef.h \
-- PclFonts.c \
-- PclGC.c \
-- Pcl.h \
-- PclInit.c \
-- PclLine.c \
-- Pclmap.h \
-- PclMisc.c \
-- PclPixel.c \
-- PclPixmap.c \
-- PclPolygon.c \
-- PclPrint.c \
-- PclSFonts.c \
-- PclSFonts.h \
-- PclSpans.c \
-- PclText.c \
-- PclWindow.c
-Index: cfb/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am,v
-retrieving revision 1.7
-diff -u -r1.7 Makefile.am
---- cfb/Makefile.am 2 Dec 2005 06:02:39 -0000 1.7
-+++ cfb/Makefile.am 6 Jan 2006 16:05:22 -0000
-@@ -9,7 +9,7 @@
-
- libcfb_la_LIBADD = ../mfb/libmfb.la
-
--AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-+AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-
- INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
-
-Index: cfb/Makefile.am.inc
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/cfb/Makefile.am.inc,v
-retrieving revision 1.2
-diff -u -r1.2 Makefile.am.inc
---- cfb/Makefile.am.inc 21 Sep 2005 00:24:10 -0000 1.2
-+++ cfb/Makefile.am.inc 6 Jan 2006 16:05:22 -0000
-@@ -138,3 +138,16 @@
- cfbglrop8.c:
- echo "#define GLYPHROP" > $@
- echo "#include \"$(top_srcdir)/cfb/cfbglblt8.c\"" >> $@
-+
-+
-+if XPRINT
-+
-+PLATFORMDEFS = -DXFREE86
-+
-+cfb8bit.c: compiler.h
-+
-+compiler.h:
-+ echo "#include \"$(top_srcdir)/hw/xfree86/common/compiler.h\"" >> $@
-+
-+endif
-+
-Index: cfb16/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/cfb16/Makefile.am,v
-retrieving revision 1.4
-diff -u -r1.4 Makefile.am
---- cfb16/Makefile.am 2 Dec 2005 06:02:39 -0000 1.4
-+++ cfb16/Makefile.am 6 Jan 2006 16:05:22 -0000
-@@ -6,4 +6,4 @@
-
- INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
-
--AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-+AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-Index: cfb24/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/cfb24/Makefile.am,v
-retrieving revision 1.4
-diff -u -r1.4 Makefile.am
---- cfb24/Makefile.am 2 Dec 2005 06:02:39 -0000 1.4
-+++ cfb24/Makefile.am 6 Jan 2006 16:05:22 -0000
-@@ -6,6 +6,6 @@
-
- EXTRA_DIST = cfbrrop24.h
-
--AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-+AM_CFLAGS = -DPSZ=24 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-
- INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
-Index: cfb32/Makefile.am
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/cfb32/Makefile.am,v
-retrieving revision 1.4
-diff -u -r1.4 Makefile.am
---- cfb32/Makefile.am 2 Dec 2005 06:02:39 -0000 1.4
-+++ cfb32/Makefile.am 6 Jan 2006 16:05:22 -0000
-@@ -6,4 +6,4 @@
-
- INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support
-
--AM_CFLAGS = -DPSZ=32 @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-+AM_CFLAGS = -DPSZ=32 $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
-Index: mi/miinitext.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/mi/miinitext.c,v
-retrieving revision 1.28
-diff -u -r1.28 miinitext.c
---- mi/miinitext.c 29 Dec 2005 00:19:33 -0000 1.28
-+++ mi/miinitext.c 6 Jan 2006 16:05:27 -0000
-@@ -250,7 +250,7 @@
- #include <X11/extensions/lbxstr.h>
- #endif
- #ifdef XPRINT
--#include "Print.h"
-+#include <X11/extensions/Print.h>
- #endif
- #ifdef XAPPGROUP
- #define _XAG_SERVER_
---- Xprint/pcl-mono/Makefile.am 2006/04/13 22:11:44 1.1
-+++ Xprint/pcl-mono/Makefile.am 2006/04/13 22:11:49
-@@ -0,0 +1,5 @@
-+noinst_LTLIBRARIES = libpcl.la
-+
-+PCL_DRIVER = -DXP_PCL_MONO
-+
-+include ../pcl/Makefile.am.inc
---- Xprint/pcl/Makefile.am.inc 2006/04/13 22:11:44 1.1
-+++ Xprint/pcl/Makefile.am.inc 2006/04/13 22:11:49
-@@ -0,0 +1,29 @@
-+INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
-+
-+AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
-+ -D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER)
-+
-+libpcl_la_SOURCES = \
-+ $(srcdir)/../pcl/PclArc.c \
-+ $(srcdir)/../pcl/PclArea.c \
-+ $(srcdir)/../pcl/PclAttr.c \
-+ $(srcdir)/../pcl/PclAttVal.c \
-+ $(srcdir)/../pcl/PclColor.c \
-+ $(srcdir)/../pcl/PclCursor.c \
-+ $(srcdir)/../pcl/PclDef.h \
-+ $(srcdir)/../pcl/PclFonts.c \
-+ $(srcdir)/../pcl/PclGC.c \
-+ $(srcdir)/../pcl/Pcl.h \
-+ $(srcdir)/../pcl/PclInit.c \
-+ $(srcdir)/../pcl/PclLine.c \
-+ $(srcdir)/../pcl/Pclmap.h \
-+ $(srcdir)/../pcl/PclMisc.c \
-+ $(srcdir)/../pcl/PclPixel.c \
-+ $(srcdir)/../pcl/PclPixmap.c \
-+ $(srcdir)/../pcl/PclPolygon.c \
-+ $(srcdir)/../pcl/PclPrint.c \
-+ $(srcdir)/../pcl/PclSFonts.c \
-+ $(srcdir)/../pcl/PclSFonts.h \
-+ $(srcdir)/../pcl/PclSpans.c \
-+ $(srcdir)/../pcl/PclText.c \
-+ $(srcdir)/../pcl/PclWindow.c
+++ /dev/null
-===================================================================
-RCS file: /srv/anoncvs.freedesktop.org/cvs/xorg/xserver/xorg/cfb/cfbrrop.h,v
-rcsdiff: /srv/anoncvs.freedesktop.org/cvs/xorg/xserver/xorg/cfb/cfbrrop.h,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- xorg.orig/xserver/xorg/cfb/cfbrrop.h 2005/07/03 07:01:15 1.4
-+++ xorg/xserver/xorg/cfb/cfbrrop.h 2006/03/20 18:43:18 1.5
-@@ -284,6 +284,7 @@
- #define RROP_UNROLL_CASE4(p,i) RROP_UNROLL_CASE2(p,(i)+2) RROP_UNROLL_CASE2(p,i)
- #define RROP_UNROLL_CASE8(p,i) RROP_UNROLL_CASE4(p,(i)+4) RROP_UNROLL_CASE4(p,i)
- #define RROP_UNROLL_CASE16(p,i) RROP_UNROLL_CASE8(p,(i)+8) RROP_UNROLL_CASE8(p,i)
-+#define RROP_UNROLL_CASE32(p,i) RROP_UNROLL_CASE16(p,(i)+16) RROP_UNROLL_CASE16(p,i)
- #define RROP_UNROLL_CASE3(p) RROP_UNROLL_CASE2(p,2) RROP_UNROLL_CASE1(p,1)
- #define RROP_UNROLL_CASE7(p) RROP_UNROLL_CASE4(p,4) RROP_UNROLL_CASE3(p)
- #define RROP_UNROLL_CASE15(p) RROP_UNROLL_CASE8(p,8) RROP_UNROLL_CASE7(p)
+++ /dev/null
---- 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
+++ /dev/null
-# 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.4 2007/01/22 15:17:01 beandog 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*
-}
projects / gentoo.git / commitdiff