(#172575) Security bump. CVE 2007-1351: bdf font parsing integer overflow and CVE...

Package-Manager: portage-2.1.2.3

diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 07c01a515e839c9ebc2b801c386109e70f90d4a5..5a9ed75f74cc0820ed46e2d0a94a208707dfe798 100644 (file)
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -10,6 +10,10 @@ AUX libX11-1.0.1-setuid.diff 420 RMD160 ef71b233e75c840f3a9a8c6ae94518bd085b878c
 MD5 4b14554b64e4a8b1ec3c2b85cb5199b6 files/libX11-1.0.1-setuid.diff 420
 RMD160 ef71b233e75c840f3a9a8c6ae94518bd085b878c files/libX11-1.0.1-setuid.diff 420
 SHA256 449fea81081687314061e465ce6586ad0f41d8dd5b0370dc0ab1ef318407a903 files/libX11-1.0.1-setuid.diff 420
+AUX xorg-libX11-1.1.1-xinitimage.diff 2683 RMD160 d649c60d66c14ff0315f56bd58b9122e8646f895 SHA1 a0f904115ad9dc441bebcf2f8267f9751322b727 SHA256 2286e63908e3ea6e4eff0455b147d72fe66dd8e1b8cbc21c3dfc0c1fdfc49e68
+MD5 d52da02163cd401b99b6e3a08d7ff068 files/xorg-libX11-1.1.1-xinitimage.diff 2683
+RMD160 d649c60d66c14ff0315f56bd58b9122e8646f895 files/xorg-libX11-1.1.1-xinitimage.diff 2683
+SHA256 2286e63908e3ea6e4eff0455b147d72fe66dd8e1b8cbc21c3dfc0c1fdfc49e68 files/xorg-libX11-1.1.1-xinitimage.diff 2683
 DIST libX11-1.0.1.tar.bz2 1419629 RMD160 a4a2a1c7499ceeb29efa4357aa5b4529416e732d SHA1 af207d7eaa59c08d2e9bd8313ebc906b203c26d5 SHA256 f99e4ce6d8e3b8833957978fe22223897b0e636c83580f2b07eff0388eb75294
 DIST libX11-1.0.3.tar.bz2 1449835 RMD160 285a878a8ec9ecbd86e67897ca15ce96c994f38a SHA1 ec0493d3669862a9a4f9955532e3bd73b0806be1 SHA256 fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac
 DIST libX11-1.0.99.2.tar.bz2 1421714 RMD160 1c9d280cc3f0b5f08f26bedecd9875e4d0a74981 SHA1 fac2945814988defec2a7213270f1ff07f5c9510 SHA256 8d9f00f627bf70e835e191e2e0403d2420ec0482cbead4ea96acabce6c340bda
@@ -22,6 +26,10 @@ EBUILD libX11-1.0.3-r1.ebuild 1039 RMD160 7cfe1aea0b4fd934fe4f290682243548a2936c
 MD5 e17fb5f067a94c5e5252d7741d8439fd libX11-1.0.3-r1.ebuild 1039
 RMD160 7cfe1aea0b4fd934fe4f290682243548a2936cb0 libX11-1.0.3-r1.ebuild 1039
 SHA256 d1aff9abc9416878eafd26ea54f647c2cbec0be5d013853b30ed404a3fc9ab79 libX11-1.0.3-r1.ebuild 1039
+EBUILD libX11-1.0.3-r2.ebuild 1082 RMD160 b33ebfeab1e22158e6a8c68e873de336c112fbc2 SHA1 941c4bd1dd693ae34d34c335235c4ef855c8c361 SHA256 ec213772a16731e6d81ab9a544c7208b1e1de3a50aa6a247c406cb56137f3d58
+MD5 f927ac746a953bef91b367e6a28dbd6b libX11-1.0.3-r2.ebuild 1082
+RMD160 b33ebfeab1e22158e6a8c68e873de336c112fbc2 libX11-1.0.3-r2.ebuild 1082
+SHA256 ec213772a16731e6d81ab9a544c7208b1e1de3a50aa6a247c406cb56137f3d58 libX11-1.0.3-r2.ebuild 1082
 EBUILD libX11-1.0.3.ebuild 981 RMD160 d5eb308ce6500a33e4e353c1fe1457f8d71e9e24 SHA1 2977b089b7e82951f508b463f2f478de2cfa5f21 SHA256 d24e48ac1c1e77b3e79b5ddb5a9c0cdecd447eb21e8194be915e4538f79eaead
 MD5 670d8d104a8da81a9fd4a173afac6820 libX11-1.0.3.ebuild 981
 RMD160 d5eb308ce6500a33e4e353c1fe1457f8d71e9e24 libX11-1.0.3.ebuild 981
@@ -30,14 +38,18 @@ EBUILD libX11-1.0.99.2-r1.ebuild 1012 RMD160 d616263699f0497668f1055c0cfa0b19e45
 MD5 b7574119fd74eb4d2466425aa54b0101 libX11-1.0.99.2-r1.ebuild 1012
 RMD160 d616263699f0497668f1055c0cfa0b19e45f34cf libX11-1.0.99.2-r1.ebuild 1012
 SHA256 6b4a58dbae7b2a2bdfebc033c659b037dd0afad27bffe369ba84c8716d80d9f6 libX11-1.0.99.2-r1.ebuild 1012
+EBUILD libX11-1.1.1-r1.ebuild 967 RMD160 64382010832207b9c24eb0c6afe4b75a8c5422ee SHA1 4241d3b0cda6f7819404512a798d67f297f02f6b SHA256 d1882c29b44c35fc29f197ec5218713ca2832b6f17ac564e7d5e67b960f9de5c
+MD5 8b49a8670f8ba13660d92116c1b5175f libX11-1.1.1-r1.ebuild 967
+RMD160 64382010832207b9c24eb0c6afe4b75a8c5422ee libX11-1.1.1-r1.ebuild 967
+SHA256 d1882c29b44c35fc29f197ec5218713ca2832b6f17ac564e7d5e67b960f9de5c libX11-1.1.1-r1.ebuild 967
 EBUILD libX11-1.1.1.ebuild 911 RMD160 0bc7469f928198ab1b588be202aaf2ce609e014f SHA1 a0995a72e426257adf37788040116a4ecc466b28 SHA256 87468bce82ee8eb7607f745679ca94fec8dda5dde42927b1de83bb593651da8a
 MD5 e0f2b85f099b63aa7851b755d3ed1e5d libX11-1.1.1.ebuild 911
 RMD160 0bc7469f928198ab1b588be202aaf2ce609e014f libX11-1.1.1.ebuild 911
 SHA256 87468bce82ee8eb7607f745679ca94fec8dda5dde42927b1de83bb593651da8a libX11-1.1.1.ebuild 911
-MISC ChangeLog 9299 RMD160 bf2967ece807b2370b1558cd6cd021d70481b0a3 SHA1 4845364990e267c3613b55da2f165974f487ce73 SHA256 e5b8ebb353d0c7f803a882d19c0e986f03f3218c37fd86b4661dd3d4fdb88ceb
-MD5 b643b38fef40f9e2251d5fbeac943711 ChangeLog 9299
-RMD160 bf2967ece807b2370b1558cd6cd021d70481b0a3 ChangeLog 9299
-SHA256 e5b8ebb353d0c7f803a882d19c0e986f03f3218c37fd86b4661dd3d4fdb88ceb ChangeLog 9299
+MISC ChangeLog 9588 RMD160 d23557985673610b27c0188ced9793333bf342bb SHA1 7936028c04e0cedc80bff80603e631d6ea0c5045 SHA256 ca216aa5bc149b22b5bdba0a8b0d75b1f8f434ba386457f37440cd9480deb59e
+MD5 a145f8936cf1424f3806fe218f1423f8 ChangeLog 9588
+RMD160 d23557985673610b27c0188ced9793333bf342bb ChangeLog 9588
+SHA256 ca216aa5bc149b22b5bdba0a8b0d75b1f8f434ba386457f37440cd9480deb59e ChangeLog 9588
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -51,9 +63,15 @@ SHA256 01a16adda21f478b9664fa0c138e6bcce7e0fbbe8e27237874f7f340f7b3ee7b files/di
 MD5 c2605996befd61bca63d1e5086050b82 files/digest-libX11-1.0.3-r1 244
 RMD160 94a7b21c7a2ee6f64f727e6717fee436c2c488f0 files/digest-libX11-1.0.3-r1 244
 SHA256 01a16adda21f478b9664fa0c138e6bcce7e0fbbe8e27237874f7f340f7b3ee7b files/digest-libX11-1.0.3-r1 244
+MD5 c2605996befd61bca63d1e5086050b82 files/digest-libX11-1.0.3-r2 244
+RMD160 94a7b21c7a2ee6f64f727e6717fee436c2c488f0 files/digest-libX11-1.0.3-r2 244
+SHA256 01a16adda21f478b9664fa0c138e6bcce7e0fbbe8e27237874f7f340f7b3ee7b files/digest-libX11-1.0.3-r2 244
 MD5 f94e6f7863fd048cce1fe982fe34df22 files/digest-libX11-1.0.99.2-r1 253
 RMD160 cf40e3ce2692d730428cea7414511fcb7c333f0a files/digest-libX11-1.0.99.2-r1 253
 SHA256 1524eb41051b8b2dcfaec0d330463c4fc86ddc61e6a451225a6a9dfa86d2f971 files/digest-libX11-1.0.99.2-r1 253
 MD5 d32676747b5bb4e0ae7ef4a537d0e17f files/digest-libX11-1.1.1 244
 RMD160 3775747c2fde16b45d885c270789c54007ac12c2 files/digest-libX11-1.1.1 244
 SHA256 6c878f66e2414c792ad843566368dc2f088cd534c0789572df5a4fdd65c883f5 files/digest-libX11-1.1.1 244
+MD5 d32676747b5bb4e0ae7ef4a537d0e17f files/digest-libX11-1.1.1-r1 244
+RMD160 3775747c2fde16b45d885c270789c54007ac12c2 files/digest-libX11-1.1.1-r1 244
+SHA256 6c878f66e2414c792ad843566368dc2f088cd534c0789572df5a4fdd65c883f5 files/digest-libX11-1.1.1-r1 244

diff --git a/x11-libs/libXfont/ChangeLog b/x11-libs/libXfont/ChangeLog
index f09b975c51c2f35815e8076aacc4452d3ff76be2..b3634e6c52a6d7a0092c68331146d11585f67d9c 100644 (file)
--- a/x11-libs/libXfont/ChangeLog
+++ b/x11-libs/libXfont/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/libXfont
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.57 2007/01/28 21:05:32 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.58 2007/04/05 06:51:21 dberkholz Exp $
+
+*libXfont-1.2.7-r1 (05 Apr 2007)
+*libXfont-1.2.2-r1 (05 Apr 2007)
+
+  05 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xorg-libXfont-1.2.7-bdf-fontdir.diff, +libXfont-1.2.2-r1.ebuild,
+  +libXfont-1.2.7-r1.ebuild:
+  (#172575) Security bump. CVE 2007-1351: bdf font parsing integer overflow
+  and CVE 2007-1352: fonts.dir file parsing integer overflow.
 
   28 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   -files/1.2.0-pcfread-git.diff, -libXfont-1.1.0-r1.ebuild,

diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index c86a8f8900f7575aaa1ae1c67c6fa9212a37c80b..ce1a76671888e4bb042eb2fa0024c736bbc2a67d 100644 (file)
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1,6 +1,14 @@
+AUX xorg-libXfont-1.2.7-bdf-fontdir.diff 1445 RMD160 cb92f5a8de08bbd5f4566770dddc0d4be21572c7 SHA1 3e57aca6215e1212e53b1a3b1d243916ac7fa703 SHA256 5fd9a663f637a8cc7984f010d1082d96da977be1afb1f69a39cfe62c299049d2
+MD5 76e3330c9bace76318e096b3c2182101 files/xorg-libXfont-1.2.7-bdf-fontdir.diff 1445
+RMD160 cb92f5a8de08bbd5f4566770dddc0d4be21572c7 files/xorg-libXfont-1.2.7-bdf-fontdir.diff 1445
+SHA256 5fd9a663f637a8cc7984f010d1082d96da977be1afb1f69a39cfe62c299049d2 files/xorg-libXfont-1.2.7-bdf-fontdir.diff 1445
 DIST libXfont-1.2.2.tar.bz2 597652 RMD160 dacca74fe5cd882bcd6cceac4963f8cd8b4938d6 SHA1 87493c319e1f4b79de7154dd6e2de5baadce3465 SHA256 fb2f8c2ec321b4e38a65df4eaabffa1192ed8e19408e81be20cdcfc3e98b7487
 DIST libXfont-1.2.6.tar.bz2 582191 RMD160 2bf77e7c9bdb5aa0aa67e3ee2d05f3cf79722646 SHA1 db1e027f15a92192fd5c20ec000eea02a8bf7705 SHA256 9337670709697046e5071d028fb0c72e0e8b01b6890e952b8bd1021d7cd4fe9a
 DIST libXfont-1.2.7.tar.bz2 573915 RMD160 33e2688d1e3490d8b588ca2304b3d4068568dcae SHA1 60deba746e544785ca05c7c68ccfbd5d71370a29 SHA256 2f8c004c0b914d460e6fd2b48d8b425cf4778d415467fc1f1d938b200462d18b
+EBUILD libXfont-1.2.2-r1.ebuild 948 RMD160 e9a2633e8251d6786e071664e781cea009388969 SHA1 a6007afb02924016fef576056e3ae744fb8b345b SHA256 9528fc65624ca82fb8376f0cdb452298e18818505ad2318be95418ddd4ee57d3
+MD5 dbcc78f421a193a021d1157b90f57ed1 libXfont-1.2.2-r1.ebuild 948
+RMD160 e9a2633e8251d6786e071664e781cea009388969 libXfont-1.2.2-r1.ebuild 948
+SHA256 9528fc65624ca82fb8376f0cdb452298e18818505ad2318be95418ddd4ee57d3 libXfont-1.2.2-r1.ebuild 948
 EBUILD libXfont-1.2.2.ebuild 884 RMD160 825852d3660deaa07a0194c4188e9c62ae2a07e4 SHA1 760ea4b2b5b9da7c2003521d4af5ad42264c6c5f SHA256 2319390f0c91570423f72cc3473ed7b627daa4bece927de1091ff5850d1c87ea
 MD5 cd7739e76fa0fc6e379c6b693005a490 libXfont-1.2.2.ebuild 884
 RMD160 825852d3660deaa07a0194c4188e9c62ae2a07e4 libXfont-1.2.2.ebuild 884
@@ -9,14 +17,18 @@ EBUILD libXfont-1.2.6.ebuild 905 RMD160 e44fa53f7fb95d889daf5aafb6bc9786fa66e93d
 MD5 891fe22367a6ab5374791ec6ea3d1481 libXfont-1.2.6.ebuild 905
 RMD160 e44fa53f7fb95d889daf5aafb6bc9786fa66e93d libXfont-1.2.6.ebuild 905
 SHA256 f89e4520fbe388a8107593f621dfa6119c7b4e97de63803f3b81bffe842ed3e1 libXfont-1.2.6.ebuild 905
+EBUILD libXfont-1.2.7-r1.ebuild 954 RMD160 184a05593a3213730fe92df45b26780f08891d5f SHA1 7c0006ea67e2a0d9ae293797086c1d8206d5e626 SHA256 b2abc7eb01840ced693a2956b06c12c8dffe9287bf2ce86c9e6e6ba2644229ab
+MD5 c05885cd356bae5b813fca61f9a7ad53 libXfont-1.2.7-r1.ebuild 954
+RMD160 184a05593a3213730fe92df45b26780f08891d5f libXfont-1.2.7-r1.ebuild 954
+SHA256 b2abc7eb01840ced693a2956b06c12c8dffe9287bf2ce86c9e6e6ba2644229ab libXfont-1.2.7-r1.ebuild 954
 EBUILD libXfont-1.2.7.ebuild 901 RMD160 93fcfb7aeae0803d3fa8653cf3bec81208f0604b SHA1 afb26b99b862ecb8d0d36eab9d3ee8a4881b1405 SHA256 5c802d24096c6950b162cdc3d6e3bd8f289dd67baec2d5c0589d2cce6aad412c
 MD5 c6c01138e709f2542388160f56719536 libXfont-1.2.7.ebuild 901
 RMD160 93fcfb7aeae0803d3fa8653cf3bec81208f0604b libXfont-1.2.7.ebuild 901
 SHA256 5c802d24096c6950b162cdc3d6e3bd8f289dd67baec2d5c0589d2cce6aad412c libXfont-1.2.7.ebuild 901
-MISC ChangeLog 8789 RMD160 b8b19a236f7e9c00692e8ca42969d95495d89f54 SHA1 133013e6bf2e9c2a895db59bb7aae5a77e750676 SHA256 510e08d61820fc18e53ed36bd5debdc5abb1906d5b0aa9515b741d90ffb03d7a
-MD5 a6a1c85a9a7dffd9e6609b14bd629f76 ChangeLog 8789
-RMD160 b8b19a236f7e9c00692e8ca42969d95495d89f54 ChangeLog 8789
-SHA256 510e08d61820fc18e53ed36bd5debdc5abb1906d5b0aa9515b741d90ffb03d7a ChangeLog 8789
+MISC ChangeLog 9153 RMD160 247a0e701fe615c894a8e6974e9a630532d65241 SHA1 037d3a73581fd2777b0be7036bea446ae49eba32 SHA256 28b8c7029e4f7a8075668d38317237dbb180a0d6c96fa748c8251b5841ccc93e
+MD5 07c67b549a0efc32e2973a8b175d9931 ChangeLog 9153
+RMD160 247a0e701fe615c894a8e6974e9a630532d65241 ChangeLog 9153
+SHA256 28b8c7029e4f7a8075668d38317237dbb180a0d6c96fa748c8251b5841ccc93e ChangeLog 9153
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -24,9 +36,15 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 MD5 8c84f32500abfd3298b1e59586273dc8 files/digest-libXfont-1.2.2 247
 RMD160 48f204bb2e1f54eb46948db9b05bf74321eb4c56 files/digest-libXfont-1.2.2 247
 SHA256 518a7a98a5bd5a481a5db86b4facd7864aa7c71674b1c8fb6eb5808d54e0a8d0 files/digest-libXfont-1.2.2 247
+MD5 8c84f32500abfd3298b1e59586273dc8 files/digest-libXfont-1.2.2-r1 247
+RMD160 48f204bb2e1f54eb46948db9b05bf74321eb4c56 files/digest-libXfont-1.2.2-r1 247
+SHA256 518a7a98a5bd5a481a5db86b4facd7864aa7c71674b1c8fb6eb5808d54e0a8d0 files/digest-libXfont-1.2.2-r1 247
 MD5 6c8272e24d2a6b2b153af59331124bbf files/digest-libXfont-1.2.6 247
 RMD160 fe272a760aa1a1c650ac0b2ada26eb77e2a42e17 files/digest-libXfont-1.2.6 247
 SHA256 aa6690162cf79b9add5f74998160876999f3c0092a70326a5eabc79b4cba3265 files/digest-libXfont-1.2.6 247
 MD5 2d518c39f448c545c6dcb091a59bfe1b files/digest-libXfont-1.2.7 247
 RMD160 fd70eb958eabf7e7e9f02da63481015046594cd9 files/digest-libXfont-1.2.7 247
 SHA256 0edd43f442689799d119592a55940936869c4e0b62e29d71f47febd4fb673059 files/digest-libXfont-1.2.7 247
+MD5 2d518c39f448c545c6dcb091a59bfe1b files/digest-libXfont-1.2.7-r1 247
+RMD160 fd70eb958eabf7e7e9f02da63481015046594cd9 files/digest-libXfont-1.2.7-r1 247
+SHA256 0edd43f442689799d119592a55940936869c4e0b62e29d71f47febd4fb673059 files/digest-libXfont-1.2.7-r1 247

diff --git a/x11-libs/libXfont/files/digest-libXfont-1.2.2-r1 b/x11-libs/libXfont/files/digest-libXfont-1.2.2-r1
new file mode 100644 (file)
index 0000000..dd8a1cc
--- /dev/null
+++ b/x11-libs/libXfont/files/digest-libXfont-1.2.2-r1
@@ -0,0 +1,3 @@
+MD5 ea2bf3d122e4491ba589e8fd3576f0a1 libXfont-1.2.2.tar.bz2 597652
+RMD160 dacca74fe5cd882bcd6cceac4963f8cd8b4938d6 libXfont-1.2.2.tar.bz2 597652
+SHA256 fb2f8c2ec321b4e38a65df4eaabffa1192ed8e19408e81be20cdcfc3e98b7487 libXfont-1.2.2.tar.bz2 597652

diff --git a/x11-libs/libXfont/files/digest-libXfont-1.2.7-r1 b/x11-libs/libXfont/files/digest-libXfont-1.2.7-r1
new file mode 100644 (file)
index 0000000..22da72b
--- /dev/null
+++ b/x11-libs/libXfont/files/digest-libXfont-1.2.7-r1
@@ -0,0 +1,3 @@
+MD5 2f2085310f75900044d9dcd469637d26 libXfont-1.2.7.tar.bz2 573915
+RMD160 33e2688d1e3490d8b588ca2304b3d4068568dcae libXfont-1.2.7.tar.bz2 573915
+SHA256 2f8c004c0b914d460e6fd2b48d8b425cf4778d415467fc1f1d938b200462d18b libXfont-1.2.7.tar.bz2 573915

diff --git a/x11-libs/libXfont/files/xorg-libXfont-1.2.7-bdf-fontdir.diff b/x11-libs/libXfont/files/xorg-libXfont-1.2.7-bdf-fontdir.diff
new file mode 100644 (file)
index 0000000..6894406
--- /dev/null
+++ b/x11-libs/libXfont/files/xorg-libXfont-1.2.7-bdf-fontdir.diff
@@ -0,0 +1,51 @@
+diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c
+index acb77e9..a6f0c1e 100644
+--- a/src/bitmap/bdfread.c
++++ b/src/bitmap/bdfread.c
+@@ -65,6 +65,12 @@ #include <X11/fonts/fontutil.h>
+ #include <X11/fonts/bitmap.h>
+ #include <X11/fonts/bdfint.h>
+ 
++#if HAVE_STDINT_H
++#include <stdint.h>
++#elif !defined(INT32_MAX)
++#define INT32_MAX 0x7fffffff
++#endif
++
+ #define INDICES 256
+ #define MAXENCODING 0xFFFF
+ #define BDFLINELEN  1024
+@@ -288,6 +294,11 @@ bdfReadCharacters(FontFilePtr file, Font
+       bdfError("invalid number of CHARS in BDF file\n");
+       return (FALSE);
+     }
++    if (nchars > INT32_MAX / sizeof(CharInfoRec)) {
++      bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
++               sizeof(CharInfoRec));
++      goto BAILOUT;
++    }
+     ci = (CharInfoPtr) xalloc(nchars * sizeof(CharInfoRec));
+     if (!ci) {
+       bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
+diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
+index aae1f2e..cf68a54 100644
+--- a/src/fontfile/fontdir.c
++++ b/src/fontfile/fontdir.c
+@@ -38,9 +38,17 @@ #endif
+ #include    <X11/fonts/fntfilst.h>
+ #include    <X11/keysym.h>
+ 
++#if HAVE_STDINT_H
++#include <stdint.h>
++#elif !defined(INT32_MAX)
++#define INT32_MAX 0x7fffffff
++#endif
++
+ Bool
+ FontFileInitTable (FontTablePtr table, int size)
+ {
++    if (size < 0 || (size > INT32_MAX/sizeof(FontEntryRec))) 
++      return FALSE;
+     if (size)
+     {
+       table->entries = (FontEntryPtr) xalloc(sizeof(FontEntryRec) * size);

diff --git a/x11-libs/libXfont/libXfont-1.2.2-r1.ebuild b/x11-libs/libXfont/libXfont-1.2.2-r1.ebuild
new file mode 100644 (file)
index 0000000..f8c8145
--- /dev/null
+++ b/x11-libs/libXfont/libXfont-1.2.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.2.2-r1.ebuild,v 1.1 2007/04/05 06:51:21 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+# SNAPSHOT="yes"
+
+inherit x-modular flag-o-matic
+
+DESCRIPTION="X.Org Xfont library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/xtrans
+       x11-libs/libfontenc
+       x11-proto/xproto
+       x11-proto/fontsproto
+       >=media-libs/freetype-2"
+DEPEND="${RDEPEND}
+       x11-proto/fontcacheproto"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)
+       --with-encodingsdir=/usr/share/fonts/encodings"
+
+PATCHES="${FILESDIR}/xorg-${PN}-1.2.7-bdf-fontdir.diff"
+
+pkg_setup() {
+       # No such function yet
+       # x-modular_pkg_setup
+
+       # (#125465) Broken with Bdirect support
+       filter-flags -Wl,-Bdirect
+       filter-ldflags -Bdirect
+       filter-ldflags -Wl,-Bdirect
+}

diff --git a/x11-libs/libXfont/libXfont-1.2.7-r1.ebuild b/x11-libs/libXfont/libXfont-1.2.7-r1.ebuild
new file mode 100644 (file)
index 0000000..0f46230
--- /dev/null
+++ b/x11-libs/libXfont/libXfont-1.2.7-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.2.7-r1.ebuild,v 1.1 2007/04/05 06:51:21 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+# SNAPSHOT="yes"
+
+inherit x-modular flag-o-matic
+
+DESCRIPTION="X.Org Xfont library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/xtrans
+       x11-libs/libfontenc
+       x11-proto/xproto
+       x11-proto/fontsproto
+       >=media-libs/freetype-2"
+DEPEND="${RDEPEND}
+       x11-proto/fontcacheproto"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)
+       --with-encodingsdir=/usr/share/fonts/encodings"
+
+PATCHES="${FILESDIR}/xorg-${P}-bdf-fontdir.diff"
+
+pkg_setup() {
+       # No such function yet
+       # x-modular_pkg_setup
+
+       # (#125465) Broken with Bdirect support
+       filter-flags -Wl,-Bdirect
+       filter-ldflags -Bdirect
+       filter-ldflags -Wl,-Bdirect
+}