new fix for CVE-2005-3964

5 files changed, 599 insertions, 12 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index cebe901642f8..a16d85b14369 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/openmotif
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.117 2005/12/25 01:45:54 ferdy Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.118 2006/02/16 16:01:20 lanius Exp $
+
+*openmotif-2.2.3-r9 (16 Feb 2006)
+
+  16 Feb 2006; Heinrich Wendel <lanius@gentoo.org>
+  +files/openmotif-2.2.3-uil.patch, +openmotif-2.2.3-r9.ebuild:
+  new fix for CVE-2005-3964
 
   25 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org>
   openmotif-2.1.30-r13.ebuild, openmotif-2.2.3-r8.ebuild:
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index bde7dab6b2ae..78ee71d3dc77 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,49 +1,126 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 130ce1ea37855bb6e1463bf2ef4e0d12 ChangeLog 17587
+RMD160 15aeccd5ee3f3a9cf0ce2e12f30b773a8d777707 ChangeLog 17587
+SHA256 668f343ce3a3bff66c197b4dc4767f065d002dce29bc9c9aa58aa656174614d8 ChangeLog 17587
 MD5 b38be118160b49f6b0f9e31d26f01594 files/CAN-2005-0605.patch 1118
+RMD160 56a1a4433bb71d54b6d5df33fab68aca74158730 files/CAN-2005-0605.patch 1118
+SHA256 20517fc5c4b61419528b658422fdcc9ed972762cffd605a844a4cfd1f628a331 files/CAN-2005-0605.patch 1118
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r13 79
+RMD160 f5ef9b4794966fcfbdc6a89061809d1c5cb43d3a files/digest-openmotif-2.1.30-r13 79
+SHA256 ae8228b272976c6cd34cc31b303c3a8f4c5a7986cfd3f3959e5b9b7cd831b230 files/digest-openmotif-2.1.30-r13 79
 MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r9 79
+RMD160 f5ef9b4794966fcfbdc6a89061809d1c5cb43d3a files/digest-openmotif-2.1.30-r9 79
+SHA256 ae8228b272976c6cd34cc31b303c3a8f4c5a7986cfd3f3959e5b9b7cd831b230 files/digest-openmotif-2.1.30-r9 79
 MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r3 68
+RMD160 f20b29068bf8f6b579288535c545e8ea693c9487 files/digest-openmotif-2.2.3-r3 68
+SHA256 c05881215a0fa8f08eb981e3e74b296a7b0bc88255516d94a19ac5d2afa71faa files/digest-openmotif-2.2.3-r3 68
 MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r7 68
+RMD160 f20b29068bf8f6b579288535c545e8ea693c9487 files/digest-openmotif-2.2.3-r7 68
+SHA256 c05881215a0fa8f08eb981e3e74b296a7b0bc88255516d94a19ac5d2afa71faa files/digest-openmotif-2.2.3-r7 68
 MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r8 68
+RMD160 f20b29068bf8f6b579288535c545e8ea693c9487 files/digest-openmotif-2.2.3-r8 68
+SHA256 c05881215a0fa8f08eb981e3e74b296a7b0bc88255516d94a19ac5d2afa71faa files/digest-openmotif-2.2.3-r8 68
+MD5 843f6a0700ae08d17908118bcc778747 files/digest-openmotif-2.2.3-r9 250
+RMD160 d0610ee8ccf7f8450a8744054f984bb28d0dcc73 files/digest-openmotif-2.2.3-r9 250
+SHA256 39a2c0b3de47294c758d0997cf8279de6616ad5e9bcfcda2577a84d65d410219 files/digest-openmotif-2.2.3-r9 250
 MD5 76aa44266e6ebef00c664b2f24822ce9 files/openmotif-2.1.30-CAN-2004-0687-0688.patch.bz2 3274
+RMD160 b42c9d1d9d3c9f3d7d6335006def0b7020f6a25b files/openmotif-2.1.30-CAN-2004-0687-0688.patch.bz2 3274
+SHA256 ed9783a159f68bb19a861c81c23d0f0b365fb62ed66bff8ee4f5df29d73454b4 files/openmotif-2.1.30-CAN-2004-0687-0688.patch.bz2 3274
 MD5 5c49a886f108baeda96fc41f32647cf6 files/openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
+RMD160 308c3f96f6fcc82ce503fd1bb6f3291bd1641d6f files/openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
+SHA256 a693d7c10bf6648b2af5fb260645526e5651b1c4a9cf9a60405a67df8aa349f5 files/openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
 MD5 6e392c40eacd6da7718bc94d55914d32 files/openmotif-2.1.30-CAN-2004-0914.patch.bz2 11702
+RMD160 2517b95e467d470ac77727069fd2d5f449740ee7 files/openmotif-2.1.30-CAN-2004-0914.patch.bz2 11702
+SHA256 661238f9f5090fda82271af4d070863298a6c9ebfdd710772636886cb77e8047 files/openmotif-2.1.30-CAN-2004-0914.patch.bz2 11702
 MD5 62870f12ebc148c6319223ec659c290f files/openmotif-2.1.30-CAN-2004-0914_sec8.patch 471
+RMD160 a0aabad67c15d11b9cf5464ed855ba7f6338f65d files/openmotif-2.1.30-CAN-2004-0914_sec8.patch 471
+SHA256 e79a59ed3fe6f33d783e675cc4113976625ec8b10b42c580b449a678aa0152fd files/openmotif-2.1.30-CAN-2004-0914_sec8.patch 471
 MD5 61fb956ff4bc34bc503cdb2226fd037b files/openmotif-2.1.30-darwin-netbsd.diff 16799
+RMD160 04549c9d18b4a0969cfc6bd9ef5099c76288c612 files/openmotif-2.1.30-darwin-netbsd.diff 16799
+SHA256 76b27d33f134328890ac5bcbd1960d4cff5d68272235ecd70646a7499c1bed25 files/openmotif-2.1.30-darwin-netbsd.diff 16799
 MD5 ed2738dd3cbdc87b0800fe9710092d18 files/openmotif-2.1.30-imake-ansi.patch 6554
+RMD160 7c51aebd40221a8aa89ece890629585ac4711945 files/openmotif-2.1.30-imake-ansi.patch 6554
+SHA256 43575ce2a79e4ffb47f34b5a76175839c71ca85413a625fcc60adf3617c84d20 files/openmotif-2.1.30-imake-ansi.patch 6554
 MD5 28350d5dab901ef8cd0dc92e578e3f45 files/openmotif-2.1.30-imake-tmpdir.patch 1083
+RMD160 2d20d4b4158dc53e1fd77d1265cf0fe5eb8992da files/openmotif-2.1.30-imake-tmpdir.patch 1083
+SHA256 44bba8c4736e865d9238669f55a6ba3d564a24f853802e7ae07e644de777efa9 files/openmotif-2.1.30-imake-tmpdir.patch 1083
 MD5 f586e24ce0a2b3eeea25a82c8ec1d3c4 files/openmotif-2.1.30-uil-bad_grammar_fix.diff 832
+RMD160 870240d7bf6f9fd03e78ce938c9cb6e97c577917 files/openmotif-2.1.30-uil-bad_grammar_fix.diff 832
+SHA256 468d79000604b12a24092d1c0ab1190c79682d66715db471b4322c6325140761 files/openmotif-2.1.30-uil-bad_grammar_fix.diff 832
 MD5 8aaa33844cae66b12fcdce6b58bfe6df files/openmotif-2.1.30-xpm.diff 13134
+RMD160 866179a8dfa6fc4c95d3845c18b47edcb517b224 files/openmotif-2.1.30-xpm.diff 13134
+SHA256 853a994bc4bc5dacf8d8b3104435361657444a1c791a075abc126d5e844175ad files/openmotif-2.1.30-xpm.diff 13134
 MD5 ee3a092a933a6393bf14d5d7e6231934 files/openmotif-2.1.30-xpm2.diff 47085
+RMD160 eb54e254a92f46064eb06b49b3169c436a7c6d5c files/openmotif-2.1.30-xpm2.diff 47085
+SHA256 3e1548daa09e1eafb2561773cd05c73f70e56d7b85fec111fdac5d5d48f9b7c6 files/openmotif-2.1.30-xpm2.diff 47085
 MD5 e408518ff6768e58a409938c473d23ce files/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2 3362
+RMD160 216e0589597307af0398c9264c6e617ee9c02f96 files/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2 3362
+SHA256 10120c158bd90c09ea7bde3e2b4fdaec7f3a798077bb7bb8cace70fcce42cf27 files/openmotif-2.2.3-CAN-2004-0687-0688.patch.bz2 3362
 MD5 a6ffd504c7b34b3c24a2e9f45e864bbe files/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
+RMD160 f04ccc46b82782d53e30c6a08475353ae8a1d4ad files/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
+SHA256 89a44c191d3ffcb09bebc2d2c859560af0c93a56300b502cad77d77801f57cd7 files/openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
 MD5 81bc342197a88eb207901ec3ea8927c7 files/openmotif-2.2.3-CAN-2004-0914.patch.bz2 11770
+RMD160 e0e22a34e4d7d96752d85c375158a50051c415b8 files/openmotif-2.2.3-CAN-2004-0914.patch.bz2 11770
+SHA256 72db53f3623d0664a57eeb792874a7dad275a12c4a4120d08a8871e89781b928 files/openmotif-2.2.3-CAN-2004-0914.patch.bz2 11770
 MD5 db318d4fb05541d70e7e451d46987bd1 files/openmotif-2.2.3-CAN-2004-0914_sec8.patch 491
+RMD160 e48a0bf2c7576f9c641ad1f3ef013d4875e5c736 files/openmotif-2.2.3-CAN-2004-0914_sec8.patch 491
+SHA256 6a2ea6dc149b31b77716fd23a32ea704e8f67a5287a8ef8e8c55624986193236 files/openmotif-2.2.3-CAN-2004-0914_sec8.patch 491
 MD5 307acb8e70d5d1bba7e8035dd043bfbd files/openmotif-2.2.3-CVE-2005-3964.patch 1139
+RMD160 b1d0daba728a102bcf85d7e0eb81376f5e981781 files/openmotif-2.2.3-CVE-2005-3964.patch 1139
+SHA256 fb0d27ad2ddc6c7992b0b110ff7590d145f8969ee13bbe46aa22b11189065574 files/openmotif-2.2.3-CVE-2005-3964.patch 1139
 MD5 aaf04376f7011a2f68b7961100f611fb files/openmotif-2.2.3-Mwm.defaults 536
+RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b files/openmotif-2.2.3-Mwm.defaults 536
+SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250 files/openmotif-2.2.3-Mwm.defaults 536
 MD5 5f3081ba56f381a6c667c4677258d1c0 files/openmotif-2.2.3-XmResizeHashTable.patch 183
+RMD160 19df6e6eed3b9a90797b38852f43e4e1b244be99 files/openmotif-2.2.3-XmResizeHashTable.patch 183
+SHA256 e00db6a657b57259df18f7daa8c944280c41b94381867b34d24521bc58bc3a5d files/openmotif-2.2.3-XmResizeHashTable.patch 183
 MD5 d5f7bbd57d8951fec70fac481f00a83e files/openmotif-2.2.3-automake.patch 275
+RMD160 e4a2e883e43cc80a092691518c9a293281238bf8 files/openmotif-2.2.3-automake.patch 275
+SHA256 dc1a479ad8aafe67fa9e4e673e38bf89ad1ec5d1124acca008125dc01c3af7eb files/openmotif-2.2.3-automake.patch 275
 MD5 644560d15450d90e787bf12ac8e77638 files/openmotif-2.2.3-char_not_supported.patch 1014
+RMD160 dbbcccf576674ded138ab03a478893379a21d68c files/openmotif-2.2.3-char_not_supported.patch 1014
+SHA256 d0ec8c7a46ba400512e942c4cd687ed4b48feb656cf54093c4d7f2a506009e02 files/openmotif-2.2.3-char_not_supported.patch 1014
 MD5 216193f922fae0747195fd851696b580 files/openmotif-2.2.3-mwm-configdir.patch 1549
+RMD160 e42d08b16625b188feadad26ef33b75679d31bbf files/openmotif-2.2.3-mwm-configdir.patch 1549
+SHA256 e917e9dda8ae1a331075206d24f535cdd7d3523c57525a94d1e0b60affd70053 files/openmotif-2.2.3-mwm-configdir.patch 1549
 MD5 ae018b1d050619b521ce52cf1a822ef9 files/openmotif-2.2.3-no_demos.patch 3803
+RMD160 76520548a9a45b7d90eaa675f3b406aad9b4e920 files/openmotif-2.2.3-no_demos.patch 3803
+SHA256 b6ff9b9cfb0a6165ce46f4fb0987bdc87cddd52d84b3fb12166688bfc7e3f6a6 files/openmotif-2.2.3-no_demos.patch 3803
 MD5 339b1b38271b9dfdd8c476429b55787e files/openmotif-2.2.3-pixel_length.patch 450
+RMD160 398b297d6e83cae2865bfdc14eb32204e47eccf9 files/openmotif-2.2.3-pixel_length.patch 450
+SHA256 806d2110c5a87011c476314c916c089572777874fb402da26d4159625c3dec27 files/openmotif-2.2.3-pixel_length.patch 450
 MD5 f89741373660d1834cb1063c06dda8fd files/openmotif-2.2.3-popup_timeout.patch 359
+RMD160 812b804bf85deea3fce7908530fc535ee5242142 files/openmotif-2.2.3-popup_timeout.patch 359
+SHA256 5cb56bbdef8dbb511b259ffdbb9c213abeded8159ed4ca21909e6b8e7cb69322 files/openmotif-2.2.3-popup_timeout.patch 359
+MD5 3d88ee9c10e8b44d8aea01c57f412f09 files/openmotif-2.2.3-uil.patch 10746
+RMD160 7ce99bde4d98bfb8cf023d123e2a41a25166b1d9 files/openmotif-2.2.3-uil.patch 10746
+SHA256 6770e481633c0910ac2f901551962c0e58a59c8a80df70bff1e2378fe8d3e56d files/openmotif-2.2.3-uil.patch 10746
 MD5 214cd8f46dc88caf500e6307658abfbf files/openmotif-2.2.3-utf8.patch 2979
+RMD160 4f362ddd7f4e40233faa4862ef796a1c1a9fe7a0 files/openmotif-2.2.3-utf8.patch 2979
+SHA256 2a024df6a28baf0b0bc03763ecbee512554199bfcf1cee87c0f91da8d8482dcd files/openmotif-2.2.3-utf8.patch 2979
 MD5 7284e10e14cac30429821b824dd2f722 files/site.def 2062
+RMD160 3b39238fde89c523ef4a4f1e72c49de5f901de32 files/site.def 2062
+SHA256 d1136f63ecd9c9779ff3ba5b9ce062a0580cb713d948f3f992d8ff85091c2770 files/site.def 2062
 MD5 7284e10e14cac30429821b824dd2f722 files/site.def.1 2062
+RMD160 3b39238fde89c523ef4a4f1e72c49de5f901de32 files/site.def.1 2062
+SHA256 d1136f63ecd9c9779ff3ba5b9ce062a0580cb713d948f3f992d8ff85091c2770 files/site.def.1 2062
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 metadata.xml 253
+SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976 metadata.xml 253
 MD5 42396ea17f3c272cf7b98359ef1fb73d openmotif-2.1.30-r13.ebuild 5157
+RMD160 7c9e09677e5a5d72f62eba42ba839bf623453560 openmotif-2.1.30-r13.ebuild 5157
+SHA256 66d5a03a56648754e7fde51ef8207406b7aec77813c8d2e62d2f8afb6307b244 openmotif-2.1.30-r13.ebuild 5157
 MD5 cbb60554d94564b84d4960afdbcc2500 openmotif-2.1.30-r9.ebuild 3939
+RMD160 9f48e31e68e115ebd5e418fb5078e413f11044a4 openmotif-2.1.30-r9.ebuild 3939
+SHA256 1d24ee64515cc30096ff93dc7c8dd950b9eab0c4b65c14e390d6d3d40962bc1c openmotif-2.1.30-r9.ebuild 3939
 MD5 820298e14c2fe7aa9d83621eb59a75ad openmotif-2.2.3-r3.ebuild 3239
+RMD160 afb52583d277091014b70de64de476b4103e872b openmotif-2.2.3-r3.ebuild 3239
+SHA256 b9e9655f290c0615eb06a335939e5106af7f1df303e20abeffaf5ff7372a9fb3 openmotif-2.2.3-r3.ebuild 3239
 MD5 0b8526ea0e8fb64a6dafc6108efae24d openmotif-2.2.3-r7.ebuild 3919
+RMD160 d4179eee0775bea90d0a6f1b6c8f814cc035c134 openmotif-2.2.3-r7.ebuild 3919
+SHA256 7960c865b1cdaede2874bc1490dbc1e4d8969740c4c8f5ca7da9b66aec42d79f openmotif-2.2.3-r7.ebuild 3919
 MD5 64b6d594cc5a33b7b616c5cd2b498c15 openmotif-2.2.3-r8.ebuild 3916
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDudNk2+ySkm8kpY0RAkjcAKCVbeRJlUSxanzdaVRQWb6X09WinACfVqsq
-pUTiHA4bAzvIsVA439dl7i8=
-=vZ2E
------END PGP SIGNATURE-----
+RMD160 2e056d3ad4bb85eb67afc36f856409d76921d3dc openmotif-2.2.3-r8.ebuild 3916
+SHA256 aead17f3b07d2af9bc283329ef00ecd8657b1bb552ac0cdac63ab4fbff462311 openmotif-2.2.3-r8.ebuild 3916
+MD5 81ff4d8ea837a8745ad849f7c91b644d openmotif-2.2.3-r9.ebuild 3918
+RMD160 732a07b02d036c6529304f19cf750250a70e406b openmotif-2.2.3-r9.ebuild 3918
+SHA256 5f5ec34ac0553b66b0878c8d2fa95062658753d5979ba3dbe2ed767abbdda3f7 openmotif-2.2.3-r9.ebuild 3918
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r9 b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r9
new file mode 100644
index 000000000000..667c762f991c
--- /dev/null
+++ b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r9
@@ -0,0 +1,3 @@
+MD5 94c96a0f94ee0d5e41d3dba2188b263d openMotif-2.2.3.tar.gz 5149785
+RMD160 b99230d508da57bca72b6920d28fce4187bf5179 openMotif-2.2.3.tar.gz 5149785
+SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 openMotif-2.2.3.tar.gz 5149785
diff --git a/x11-libs/openmotif/files/openmotif-2.2.3-uil.patch b/x11-libs/openmotif/files/openmotif-2.2.3-uil.patch
new file mode 100644
index 000000000000..45e0b8e44aa4
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.2.3-uil.patch
@@ -0,0 +1,350 @@
+--- openMotif-2.2.3/lib/Mrm/Mrmhier.c.UIL	2002-01-11 14:56:24.000000000 +0100
++++ openMotif-2.2.3/lib/Mrm/Mrmhier.c	2005-12-31 07:42:31.485196184 +0100
+@@ -712,7 +712,7 @@
+    *  Local variables
+    */
+   Cardinal		result;		/* function results */
+-  char			dummy[300];	/* file name (unused) */
++  char			*dummy;		/* file name (unused) */
+   char			err_stg[300];
+ 
+   /*
+@@ -764,11 +764,13 @@
+ 
+   if (resolvedname == 0)
+     {
+-      sprintf (err_stg, _MrmMMsg_0031, name) ;
++      snprintf (err_stg, 300, _MrmMMsg_0031, name) ;
+       return Urm__UT_Error ("I18NOpenFile", err_stg, NULL, NULL, MrmNOT_FOUND);
+     }
+ 
++  dummy = XtMalloc(strlen(resolvedname)+1);
+   result = UrmIdbOpenFileRead (resolvedname, os_ext, file_id_return, dummy) ;
++  XtFree(dummy);
+   switch ( result )
+     {
+     case MrmSUCCESS:
+--- openMotif-2.2.3/clients/uil/UilIODef.h.UIL	2002-01-04 22:13:33.000000000 +0100
++++ openMotif-2.2.3/clients/uil/UilIODef.h	2005-12-31 07:42:15.129682600 +0100
+@@ -69,13 +69,18 @@
+ #define NULL 0L
+ #endif
+ 
++#include <X11/Xos.h>
++#ifndef PATH_MAX
++#  define PATH_MAX 256
++#endif
++
+ typedef struct  
+ {
+     FILE	*az_file_ptr;
+     char	*c_buffer;
+     boolean	v_position_before_get;
+     z_key	last_key;
+-    char	expanded_name[ 256 ];
++    char	expanded_name[ PATH_MAX ];
+ } uil_fcb_type;
+ 
+ #endif /* UilIODef_h */
+--- openMotif-2.2.3/clients/uil/UilLstLst.c.UIL	2002-01-10 21:55:43.000000000 +0100
++++ openMotif-2.2.3/clients/uil/UilLstLst.c	2005-12-31 07:42:19.447026264 +0100
+@@ -164,7 +164,7 @@
+     lst_l_page_no = 0;
+     lst_v_listing_open = TRUE;
+ 
+-    sprintf(lst_c_title1, 
++    snprintf(lst_c_title1, 132,
+ 	    "%s %s \t%s\t\t Page ",
+ 	    _host_compiler, _compiler_version,
+ 	    current_time(&ctime_buf));
+@@ -270,6 +270,17 @@
+ {
+     /* place the file name in the expanded_name buffer */
+ 
++    if (strlen(Uil_cmd_z_command.ac_listing_file) >= PATH_MAX)
++    {
++      char *p;
++      int len=0;
++      if((p = rindex(Uil_cmd_z_command.ac_listing_file, '/')) != NULL)
++        len = strlen(++p);
++      if(p == NULL || len >= PATH_MAX)
++        p = "<unknown>";
++      strcpy(az_fcb->expanded_name, p);
++      return src_k_open_error;
++    }
+     strcpy(az_fcb->expanded_name, Uil_cmd_z_command.ac_listing_file);
+ 
+     /* open the file */
+@@ -529,7 +540,7 @@
+ 	char		buffer [132];
+ 
+ 	az_fcb = src_az_source_file_table [i];
+-	sprintf (buffer,
++	snprintf (buffer, 132,
+ 		 "     File (%d)   %s",
+ 		 i, az_fcb->expanded_name );
+ 	lst_output_line( buffer, FALSE );
+@@ -598,7 +609,7 @@
+ 	}
+ 
+ 
+-	sprintf(buffer, "%s (%d) %s", 
++	snprintf(buffer, 132, "%s (%d) %s", 
+ 		diag_get_message_abbrev( az_msg->l_message_number ),
+ 		msg_no, 
+ 		az_msg->c_text);
+--- openMotif-2.2.3/clients/uil/UilP2Out.c.UIL	2002-01-10 21:55:44.000000000 +0100
++++ openMotif-2.2.3/clients/uil/UilP2Out.c	2005-12-31 07:42:23.022482712 +0100
+@@ -189,7 +189,7 @@
+     int				topmost_index;
+     struct
+     {   MrmOsOpenParam	os_param;
+-	char		result_file[256];
++	char		result_file[PATH_MAX];
+     } uid_fcb;
+ 
+ 
+@@ -234,15 +234,20 @@
+     if (sym_az_module_entry->az_version != NULL)
+ 	module_version = sym_az_module_entry->az_version->value.c_value;
+ 
+-    urm_status = UrmIdbOpenFileWrite
+-		  ( Uil_cmd_z_command.ac_resource_file,
+-		    & uid_fcb.os_param,
+-		    _host_compiler,
+-		    _compiler_version,
+-		    module_name,
+-		    module_version,
+-		    &out_az_idbfile_id,
+-		    uid_fcb.result_file );
++    if (strlen(Uil_cmd_z_command.ac_resource_file) < PATH_MAX)
++    {
++        urm_status = UrmIdbOpenFileWrite
++		      ( Uil_cmd_z_command.ac_resource_file,
++		        & uid_fcb.os_param,
++		        _host_compiler,
++		        _compiler_version,
++		        module_name,
++		        module_version,
++		        &out_az_idbfile_id,
++		        uid_fcb.result_file );
++    } else {
++        urm_status = MrmFAILURE;
++    }
+ 
+     if (urm_status != MrmSUCCESS)
+     {
+@@ -2961,7 +2966,7 @@
+ {
+     char    buffer[132];
+ 
+-    sprintf(buffer, "while %s encountered %s", 
++    snprintf(buffer, 132, "while %s encountered %s", 
+ 	    problem, 
+ 	    Urm__UT_LatestErrorMessage());
+ 
+--- openMotif-2.2.3/clients/uil/UilSrcSrc.c.UIL	2002-01-10 21:55:47.000000000 +0100
++++ openMotif-2.2.3/clients/uil/UilSrcSrc.c	2005-12-31 07:42:27.176851152 +0100
+@@ -626,11 +626,15 @@
+     static unsigned short	main_dir_len = 0;
+     boolean			main_file;
+     int				i;  /* loop index through include files */
+-    char			buffer[256];
++    char			buffer[PATH_MAX];
++    int c_file_name_len;
+ 
++    az_fcb->az_file_ptr = NULL;
++    c_file_name_len = strlen(c_file_name);
+ 
+     /* place the file name in the expanded_name buffer */
+-
++    if(c_file_name_len >= PATH_MAX)
++      return src_k_open_error;
+     strcpy(buffer, c_file_name);
+ 
+ /*    Determine if this is the main file or an include file.  */
+@@ -644,7 +648,7 @@
+ 
+ /*    Save the directory info for the main file.    */
+ 
+-	for (len = strlen (c_file_name),
++	for (len = c_file_name_len,
+ 	     ptr = & c_file_name [len - 1];
+ 	     len > 0; len--, ptr--) {
+ 	    if ((* ptr) == '/') {
+@@ -673,9 +677,11 @@
+ 	    }
+ 
+ 	if (!specific_directory) {
++	    if (main_dir_len + c_file_name_len >= PATH_MAX)
++	      goto open_label;
+ 	    _move (buffer, main_fcb -> expanded_name, main_dir_len);
+ 	    _move (& buffer [main_dir_len],
+-		   c_file_name, strlen (c_file_name) + 1);  /* + NULL */
++		   c_file_name, c_file_name_len + 1);  /* + NULL */
+ 	} else {
+ 	    strcpy (buffer, c_file_name);
+ 	}
+@@ -695,16 +701,22 @@
+ 
+ 	for (i = 0; i < Uil_cmd_z_command.include_dir_count; i++) {	     
+ 	    int		inc_dir_len;
++	    int		need_slash=0;
+ 
+ 	    inc_dir_len = strlen (Uil_cmd_z_command.ac_include_dir[i]);
+ 	    if (inc_dir_len == 0) {
+ 		search_user_include = False;
+ 		}
++	    if (Uil_cmd_z_command.ac_include_dir[i][inc_dir_len - 1] != '/')
++		need_slash=1;
++	    if (inc_dir_len + need_slash + c_file_name_len >= PATH_MAX)
++		goto open_label;
++
+ 	    _move (buffer, Uil_cmd_z_command.ac_include_dir[i], inc_dir_len);
+ 
+ 	/*  Add '/' if not specified at end of directory  */
+ 
+-	    if (Uil_cmd_z_command.ac_include_dir[i][inc_dir_len - 1] != '/') {
++	    if (need_slash) {
+ 		buffer [inc_dir_len] = '/';
+ 		inc_dir_len++;
+ 	    };
+@@ -723,9 +735,11 @@
+ 
+ /*    Look in the default include directory.    */
+ 	if (search_user_include) {
++	    if (sizeof(c_include_dir)-1 + c_file_name_len >= PATH_MAX)
++	      goto open_label;
+ 	  _move(buffer, c_include_dir, sizeof c_include_dir - 1); /* no NULL */
+ 	  _move(&buffer[sizeof c_include_dir - 1], 
+-		c_file_name, strlen (c_file_name) + 1);  /* + NULL */
++		c_file_name, c_file_name_len + 1);  /* + NULL */
+ 
+ /*    Open the include file.    */
+ 	  az_fcb->az_file_ptr = fopen (buffer, "r");
+--- openMotif-2.2.3/clients/uil/UilSarMod.c.UIL	2002-01-10 21:55:45.000000000 +0100
++++ openMotif-2.2.3/clients/uil/UilSarMod.c	2005-12-31 07:42:35.593571616 +0100
+@@ -379,7 +379,7 @@
+     */
+ 
+     if (Uil_cmd_z_command.v_listing_file)
+-	sprintf(Uil_lst_c_title2, 
++	snprintf(Uil_lst_c_title2, 132, 
+ 		"Module: %s", 
+ 		name_entry->c_text );
+ 
+@@ -479,7 +479,7 @@
+     */
+ 
+     if (Uil_cmd_z_command.v_listing_file)
+-	sprintf(Uil_lst_c_title2, 
++	snprintf(Uil_lst_c_title2, 132, 
+ 		"Module: %s \t Version: %s", 
+ 		sym_az_module_entry->obj_header.az_name->c_text,
+ 		value_entry->value.c_value );
+--- openMotif-2.2.3/clients/uil/UilDiags.c.UIL	2002-01-10 21:55:42.000000000 +0100
++++ openMotif-2.2.3/clients/uil/UilDiags.c	2005-12-31 07:42:39.273012256 +0100
+@@ -293,12 +293,12 @@
+     va_start(ap, l_start_column);
+ 
+ #ifndef NO_MESSAGE_CATALOG
+-    vsprintf( msg_buffer, 
++    vsnprintf( msg_buffer, 132, 
+ 	      catgets(uil_catd, UIL_SET1, msg_cat_table[ message_number ],
+ 		      diag_rz_msg_table[ message_number ].ac_text), 
+ 	     ap );
+ #else
+-    vsprintf( msg_buffer, 
++    vsnprintf( msg_buffer, 132, 
+ 	      diag_rz_msg_table[ message_number ].ac_text, 
+ 	      ap );
+ #endif
+@@ -317,13 +317,13 @@
+ 	    */
+ 
+ #ifndef NO_MESSAGE_CATALOG
+-	    sprintf( loc_buffer,
++	    snprintf( loc_buffer, 132, 
+ 		     catgets(uil_catd, UIL_SET_MISC,
+ 			     UIL_MISC_0, "\t\t line: %d  file: %s"),
+ 		     az_src_rec->w_line_number,
+ 		     src_get_file_name( az_src_rec ) );
+ #else
+-	    sprintf( loc_buffer,
++	    snprintf( loc_buffer, 132, 
+ 		     "\t\t line: %d  file: %s",
+ 		     az_src_rec->w_line_number,
+ 		     src_get_file_name( az_src_rec ) );
+@@ -371,7 +371,7 @@
+ 
+ 	    if (l_start_column != diag_k_no_column)
+ #ifndef NO_MESSAGE_CATALOG
+-	      sprintf(loc_buffer,
++	      snprintf(loc_buffer, 132, 
+ 		      catgets(uil_catd, UIL_SET_MISC,
+ 			      UIL_MISC_1, 
+ 			      "\t\t line: %d  position: %d  file: %s"),
+@@ -379,7 +379,7 @@
+ 		      l_start_column + 1,
+ 		      src_get_file_name( az_src_rec ) );
+ #else
+-	      sprintf(loc_buffer,
++	      snprintf(loc_buffer, 132, 
+ 		      "\t\t line: %d  position: %d  file: %s",
+ 		      az_src_rec->w_line_number,
+ 		      l_start_column + 1,
+@@ -387,13 +387,13 @@
+ #endif
+ 	    else
+ #ifndef NO_MESSAGE_CATALOG
+-		sprintf( loc_buffer, catgets(uil_catd, UIL_SET_MISC,
++		snprintf( loc_buffer, 132, catgets(uil_catd, UIL_SET_MISC,
+ 					     UIL_MISC_0,
+ 					     "\t\t line: %d  file: %s"),
+ 			 az_src_rec->w_line_number,
+ 			 src_get_file_name( az_src_rec ) );
+ #else
+-		sprintf( loc_buffer,
++		snprintf( loc_buffer, 132, 
+ 			 "\t\t line: %d  file: %s",
+ 			 az_src_rec->w_line_number,
+ 			 src_get_file_name( az_src_rec ) );
+--- openMotif-2.2.3/clients/uil/UilSymDef.h.UIL	2002-01-04 22:13:38.000000000 +0100
++++ openMotif-2.2.3/clients/uil/UilSymDef.h	2005-12-31 07:42:44.106277488 +0100
+@@ -65,6 +65,11 @@
+ 
+ #include <Mrm/MrmPublic.h>
+ #include <Xm/Xm.h>
++#include <X11/Xos.h>
++#ifndef PATH_MAX
++#  define PATH_MAX 256
++#endif
++
+ 
+ /*
+ **  constraint check access macro
+@@ -874,10 +879,10 @@
+     sym_section_entry_type	*sections;
+ 	/* pointer to a section list; this list is all of the sections that */
+ 	/* exist in this include file.					    */
+-    char			file_name[255];
++    char			file_name[PATH_MAX];
+ 	/* the file name as specified in the include statement in the UIL   */
+ 	/* source.							    */
+-    char			full_file_name[255];
++    char			full_file_name[PATH_MAX];
+ 	/* the expanded name for the include file actually opened.	    */
+ } sym_include_file_entry_type;
+ 
+@@ -894,9 +899,9 @@
+ 	/* common header						    */
+     struct _src_source_record_type	*src_record_list;
+ 	/* pointer to a list of source records.				    */
+-    char			file_name[255];
++    char			file_name[PATH_MAX];
+ 	/* the main UIL file name as specified on the command line.	    */
+-    char			full_file_name[255];
++    char			full_file_name[PATH_MAX];
+ 	/* the expanded name for the main UIL file that was actually	    */
+ 	/* opened.							    */
+     sym_section_entry_type	*sections;
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild
new file mode 100644
index 000000000000..3223e9b78beb
--- /dev/null
+++ b/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild,v 1.1 2006/02/16 16:01:20 lanius Exp $
+
+inherit eutils libtool flag-o-matic multilib
+
+MY_P=${P/m/M}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Open Motif"
+HOMEPAGE="http://www.motifzone.org/"
+SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="MOTIF"
+SLOT="2.2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 sh sparc x86"
+IUSE=""
+
+RDEPEND="virtual/libc
+	|| ( ( x11-libs/libXmu
+			x11-libs/libXaw
+			x11-libs/libXp
+		)
+		virtual/x11
+	)
+	>=x11-libs/motif-config-0.9"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	!ppc-macos? ( =sys-devel/automake-1.4* )
+	=sys-devel/autoconf-2.5*
+	|| ( ( x11-proto/printproto
+			x11-proto/xextproto
+			x11-misc/xbitmaps
+		)
+		virtual/x11
+	)"
+
+PROVIDE="virtual/motif"
+
+pkg_setup() {
+	# multilib includes don't work right in this package...
+	[ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# various patches
+	epatch ${FILESDIR}/${P}-mwm-configdir.patch
+	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0914-newer.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
+	epatch ${FILESDIR}/${P}-char_not_supported.patch
+	epatch ${FILESDIR}/${P}-pixel_length.patch
+	epatch ${FILESDIR}/${P}-popup_timeout.patch
+	epatch ${FILESDIR}/${P}-XmResizeHashTable.patch
+	epatch ${FILESDIR}/${P}-utf8.patch
+	epatch ${FILESDIR}/${P}-no_demos.patch
+	epatch ${FILESDIR}/CAN-2005-0605.patch
+	epatch ${FILESDIR}/openmotif-2.2.3-uil.patch
+
+	use ppc-macos && epatch ${FILESDIR}/${P}-automake.patch
+
+	# autotool stuff
+	export WANT_AUTOCONF=2.5
+
+	# Patched Makefile.am to work with version 1.6 on ppc-macos.
+	# Untested elsewhere
+	use ppc-macos || export WANT_AUTOMAKE=1.4
+
+	libtoolize --force --copy
+	aclocal || die
+	AUTOMAKE_OPTS="--foreign"
+	# For some reason ppc-macos complains about missing depcomp and compile
+	# files
+	use ppc-macos && AUTOMAKE_OPTS="-a -c -f ${AUTOMAKE_OPTS}"
+	automake ${AUTOMAKE_OPTS} || die
+	autoconf || die
+}
+
+
+src_compile() {
+	# get around some LANG problems in make (#15119)
+	unset LANG
+
+	# bug #80421
+	filter-flags -ftracer
+
+	econf --with-x || die "configuration failed"
+
+	emake -j1 || die "make failed, if you have lesstif installed removed it, compile openmotif and recompile lesstif"
+}
+
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	# cleanups
+	rm -fR ${D}/usr/$(get_libdir)/X11
+	rm -fR ${D}/usr/$(get_libdir)/X11/bindings
+	rm -fR ${D}/usr/include/X11/
+
+	list="/usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4"
+	for f in $list; do
+		dosed 's:/usr/lib/X11/\(.*system\\&\.mwmrc\):/etc/X11/mwm/\1:g' "$f"
+		dosed 's:/usr/lib/X11/app-defaults:/etc/X11/app-defaults:g' "$f"
+	done
+
+
+	einfo "Fixing binaries"
+	dodir /usr/$(get_libdir)/openmotif-2.2
+	for file in `ls ${D}/usr/bin`
+	do
+		mv ${D}/usr/bin/${file} ${D}/usr/$(get_libdir)/openmotif-2.2/${file}
+	done
+
+	einfo "Fixing libraries"
+	mv ${D}/usr/$(get_libdir)/* ${D}/usr/$(get_libdir)/openmotif-2.2/
+
+	einfo "Fixing includes"
+	dodir /usr/include/openmotif-2.2/
+	mv ${D}/usr/include/* ${D}/usr/include/openmotif-2.2
+
+	einfo "Fixing man pages"
+	mans="1 3 4 5"
+	for man in $mans; do
+		dodir /usr/share/man/man${man}
+		for file in `ls ${D}/usr/share/man/man${man}`
+		do
+			file=${file/.${man}/}
+			mv ${D}/usr/share/man/man$man/${file}.${man} ${D}/usr/share/man/man${man}/${file}-openmotif-2.2.${man}
+		done
+	done
+
+	# install docs
+	dodoc README RELEASE RELNOTES BUGREPORT TODO
+
+	# profile stuff
+	dodir /etc/env.d
+	echo "LDPATH=/usr/lib/openmotif-2.2" > ${D}/etc/env.d/15openmotif-2.2
+	dodir /usr/$(get_libdir)/motif
+	echo "PROFILE=openmotif-2.2" > ${D}/usr/$(get_libdir)/motif/openmotif-2.2
+}
+
+pkg_postinst() {
+	/usr/bin/motif-config -s
+}
+
+pkg_postrm() {
+	/usr/bin/motif-config -s
+}