Add patch to fix bug #146416, thanks to ed@catmur.co.uk.

(Portage version: 2.1.2_pre2)
 (Unsigned Manifest commit)

2 files changed, 27 insertions, 43 deletions

diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 041cf9fe1dee..3f8ca20108e7 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -2,21 +2,21 @@ AUX dillo-asneeded.patch 1894 RMD160 892d979625bb338802d038c370422c33d9501edb SH
 MD5 c0fe8343a4c0bdc3458eb61a783bfcdb files/dillo-asneeded.patch 1894
 RMD160 892d979625bb338802d038c370422c33d9501edb files/dillo-asneeded.patch 1894
 SHA256 36069751fe0fd5ecc9e60b387217a7c30da5000ecadc0379f6b39255d7c5f633 files/dillo-asneeded.patch 1894
-AUX dillo-format-string-vulnerability.diff 787 RMD160 daae19ee05e691e7cd26b810143582dd84226a7f SHA1 e92ed5a6ac1dd6d8471c7b24e5d10b92c2b232b8 SHA256 2ee975a907eff1824d10ba3773f612298c3310af08295dcf655286055691fa73
-MD5 7750091e1346c986eeb58aef81297fd0 files/dillo-format-string-vulnerability.diff 787
-RMD160 daae19ee05e691e7cd26b810143582dd84226a7f files/dillo-format-string-vulnerability.diff 787
-SHA256 2ee975a907eff1824d10ba3773f612298c3310af08295dcf655286055691fa73 files/dillo-format-string-vulnerability.diff 787
-DIST dillo-0.8.5-i18n-misc-20050620.diff.bz2 244152
+AUX dillo-build-fix.patch 631 RMD160 06930ca452554bd4dcc140eb85a9cc9016c4107b SHA1 2eb478e3b05de223c574de925be9d9f1de71f6df SHA256 a6ae597926744dcb48e670da5ee24daade11631ddbca728bc8b2775af9277571
+MD5 2dd0bbb8fa8c6bcaae1ae2687402e8a9 files/dillo-build-fix.patch 631
+RMD160 06930ca452554bd4dcc140eb85a9cc9016c4107b files/dillo-build-fix.patch 631
+SHA256 a6ae597926744dcb48e670da5ee24daade11631ddbca728bc8b2775af9277571 files/dillo-build-fix.patch 631
+DIST dillo-0.8.5-i18n-misc-20050620.diff.bz2 244152 RMD160 b52c919d5515f133f4d8ceeb81d005f2df6807c5 SHA1 5220e7da6f4bd1022b357a9a6680cb38e3f085ae SHA256 31c70acda93f7da8755e5e860c1f640154ba172c5557ca93573b7a29597189f4
 DIST dillo-0.8.5-i18n-misc-20051010.diff.bz2 247058
 DIST dillo-0.8.5-i18n-misc-20060104.diff.bz2 248425
-DIST dillo-0.8.5.tar.bz2 424795
+DIST dillo-0.8.5.tar.bz2 424795 RMD160 9d8b99a25b00542aa11afa4652f4766c2f91653f SHA1 c0a716f12787649a2f37a222c439c8a9b7f9ec89 SHA256 980ccd8e0c0a85e37478e33b5f4f59d2cfda5c16d30af3acad259626d387cd1a
 DIST dillo-0.8.6-i18n-misc-20060625.diff.bz2 258290 RMD160 b158236c62f80d7df1273863ef958704fdd7e340 SHA1 c9aabf6b5c0e4f3d3d963b0471b66724f8e00c20 SHA256 872accdc2828eb564f4e30d9471e0c52ce48d957a196d1671cd3067b7a454de3
 DIST dillo-0.8.6.tar.bz2 441739 RMD160 062cff85b330a5b443ddc81a356e81f930677cbb SHA1 ee03b11ba6b75d3180ca906d8275bd35e8765995 SHA256 47e695a5d370eb656f5e41eeb917ad6281b1559bf60172c9eca89b5518a9f9b9
 DIST dillo-gentoo-extras-patch4.tar.bz2 98800 RMD160 2c04bf1b7f2763e748e2fc4d6848e0d82f680525 SHA1 7011f67113b1f811d94aa88e5185cbd1daf8bd8d SHA256 25871b318ffc046eebe9be100f5d1027e649b94dd4d3e0bfb36ec6d139cded05
-EBUILD dillo-0.8.5-r1.ebuild 3606 RMD160 eff995642def8cea32f52f6006ba068d5fc03747 SHA1 521e1941b2f86632ec2d419463a5ca2f48c83fb2 SHA256 863c7881b607932e0f05d0aca9bdc7bd0d3ac3a30473c23688318a0b8c5f3e44
-MD5 d59c047c502094e1882c0c09422b385a dillo-0.8.5-r1.ebuild 3606
-RMD160 eff995642def8cea32f52f6006ba068d5fc03747 dillo-0.8.5-r1.ebuild 3606
-SHA256 863c7881b607932e0f05d0aca9bdc7bd0d3ac3a30473c23688318a0b8c5f3e44 dillo-0.8.5-r1.ebuild 3606
+EBUILD dillo-0.8.5-r1.ebuild 3647 RMD160 d0e9b41cbbd093f163d5e850439cb2bc3be9aa98 SHA1 9d76cf4166cc3b2972737bb73fe32053ec194d54 SHA256 e4cfbe3ebe93b8277659b875dc567a2868507aa7ea26276e13822dd7dbc01421
+MD5 593bc6ab6f9c1341358b31abe90bd2fd dillo-0.8.5-r1.ebuild 3647
+RMD160 d0e9b41cbbd093f163d5e850439cb2bc3be9aa98 dillo-0.8.5-r1.ebuild 3647
+SHA256 e4cfbe3ebe93b8277659b875dc567a2868507aa7ea26276e13822dd7dbc01421 dillo-0.8.5-r1.ebuild 3647
 EBUILD dillo-0.8.5-r2.ebuild 3612 RMD160 011755f92841869a1e9a40034b0048040bd42c9f SHA1 b9e087b41c5baf25bf0d4c9ed83fcc141c37af4a SHA256 aa5b10064b572ae9cb2d64a07905d7e8097be134c6aa87d7aef29ad81936923b
 MD5 1909f58b5dde32ddaf2c2fede0c7b8f1 dillo-0.8.5-r2.ebuild 3612
 RMD160 011755f92841869a1e9a40034b0048040bd42c9f dillo-0.8.5-r2.ebuild 3612
@@ -25,27 +25,27 @@ EBUILD dillo-0.8.5-r3.ebuild 3612 RMD160 ccf59c44d276c4470e2104cf2a5e1ac86d83461
 MD5 fcb743f02194742567f19c69109ca9b2 dillo-0.8.5-r3.ebuild 3612
 RMD160 ccf59c44d276c4470e2104cf2a5e1ac86d834617 dillo-0.8.5-r3.ebuild 3612
 SHA256 07ddf9e2beaa923168cce168332b4f3497d66be157fc2195b2feb67eb76506df dillo-0.8.5-r3.ebuild 3612
-EBUILD dillo-0.8.6.ebuild 3688 RMD160 788ac84896e2c9bbd18ac40d7580b0e2916d658f SHA1 49fee10613eb485092fbcab1a355e12eaaf68edc SHA256 ef243f0e245c4b803e6bee8fa86ed4b5b7991644af9a61accd9b38c310602541
-MD5 3358d28190a209ad39943f89c9b6b30e dillo-0.8.6.ebuild 3688
-RMD160 788ac84896e2c9bbd18ac40d7580b0e2916d658f dillo-0.8.6.ebuild 3688
-SHA256 ef243f0e245c4b803e6bee8fa86ed4b5b7991644af9a61accd9b38c310602541 dillo-0.8.6.ebuild 3688
-MISC ChangeLog 13773 RMD160 8a3b54175de2212d05f3ab1959d5edc096e19252 SHA1 b451ee1198427d8a1edab91a47b1c78e72da543f SHA256 a47328a49399c9106900315f73e3711e63ef141c319f4be72b356f008a642db6
-MD5 d70c22b6363d179f623afe62b55d0584 ChangeLog 13773
-RMD160 8a3b54175de2212d05f3ab1959d5edc096e19252 ChangeLog 13773
-SHA256 a47328a49399c9106900315f73e3711e63ef141c319f4be72b356f008a642db6 ChangeLog 13773
+EBUILD dillo-0.8.6.ebuild 3732 RMD160 c8d7b30710364d45be875eaa98cb06d72359043c SHA1 6b3976ecba22ca9c17e56311106d07338f855b73 SHA256 5288e30bfdbda8bdf6c6ac21165e0107cad07e064d6bfec42a1b4325e9cebdbd
+MD5 941a778e887a6b238abc554e338a27b5 dillo-0.8.6.ebuild 3732
+RMD160 c8d7b30710364d45be875eaa98cb06d72359043c dillo-0.8.6.ebuild 3732
+SHA256 5288e30bfdbda8bdf6c6ac21165e0107cad07e064d6bfec42a1b4325e9cebdbd dillo-0.8.6.ebuild 3732
+MISC ChangeLog 14010 RMD160 8c78a0b12a2425434bcbd8832a97ee4f8b7d272c SHA1 d6a630acb1dff4852a527b5a998894cb99704fee SHA256 cb478b6dd0f4b8edaaf9a7b9efeb8094bbdc60240bc8a4718d318c590ee3204b
+MD5 6fa4bd38259309bb971ee49bae229672 ChangeLog 14010
+RMD160 8c78a0b12a2425434bcbd8832a97ee4f8b7d272c ChangeLog 14010
+SHA256 cb478b6dd0f4b8edaaf9a7b9efeb8094bbdc60240bc8a4718d318c590ee3204b ChangeLog 14010
 MISC metadata.xml 221 RMD160 b72d8e0df2b2daece5fcb2c5f684e90e10370f2f SHA1 58771ce3377eeee2ebf1bb8acdeaa0ba169e9342 SHA256 d253ce582fe350599cd2fa44bea0a00410ab63bf68129dafdb4cdfdf7a180ecf
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
 RMD160 b72d8e0df2b2daece5fcb2c5f684e90e10370f2f metadata.xml 221
 SHA256 d253ce582fe350599cd2fa44bea0a00410ab63bf68129dafdb4cdfdf7a180ecf metadata.xml 221
-MD5 8a9cdc6d29ca7e039bd6fef1fc2dd8c0 files/digest-dillo-0.8.5-r1 428
-RMD160 7972fc38bae8dc91dc459487af5396db7ab53948 files/digest-dillo-0.8.5-r1 428
-SHA256 327feb7b69b2e01f759271d326c53a1a042ff8f23a0cf1ea4eb28c49f4be9e1a files/digest-dillo-0.8.5-r1 428
-MD5 6c6392a67ccf99748a0d6117d216884a files/digest-dillo-0.8.5-r2 428
-RMD160 fbe6165f2fa9de9325580cbf33d8868a4d0c7eed files/digest-dillo-0.8.5-r2 428
-SHA256 a4ace08074a3cf27f876b04a291b260ad10ea4022fa97735ef01dcc29abe2236 files/digest-dillo-0.8.5-r2 428
-MD5 a0b5278f2986a2deb94405bd899d4c86 files/digest-dillo-0.8.5-r3 428
-RMD160 81e24be3a5fb0b62496dfd12b74753d149b47909 files/digest-dillo-0.8.5-r3 428
-SHA256 42daca7617bf5dfc7de096d3bdd894d3b427ee62934919383186edd7d10390fb files/digest-dillo-0.8.5-r3 428
+MD5 b217d5280c0bcb99a614236b06fba3a9 files/digest-dillo-0.8.5-r1 816
+RMD160 2428eb04876b80d105589dfb4be172f27499cc58 files/digest-dillo-0.8.5-r1 816
+SHA256 d45ce2ce79ed21f17f3fc02df68d51c7eadcaff0b58e7de9b23714e0718b6bc8 files/digest-dillo-0.8.5-r1 816
+MD5 9a0463ebf9e862f9552a5f4301652a18 files/digest-dillo-0.8.5-r2 602
+RMD160 f0ef30d341e06e3c1eb6744955a675ba8898d7dd files/digest-dillo-0.8.5-r2 602
+SHA256 00e1c970603a011437dfb0432e2038c1517a13ea113b389559b44cf0c868e7ec files/digest-dillo-0.8.5-r2 602
+MD5 1658c0b17495a433fe394320a85317bc files/digest-dillo-0.8.5-r3 602
+RMD160 019c5425e8b79bff2fd3288e71c768149c325614 files/digest-dillo-0.8.5-r3 602
+SHA256 d3ce1108d59979cc8cf4559c9c34350f2043b7b8e55934f9346ffd3b837e277f files/digest-dillo-0.8.5-r3 602
 MD5 97b9877fba1b3a992cecc53da28a3674 files/digest-dillo-0.8.6 816
 RMD160 fc663e293f98bf0b64bea6a41aac1e401982c43d files/digest-dillo-0.8.6 816
 SHA256 ac403826c624ccb4e772642ec599d994c23d0635372bdf8be4f2ba3c2dd842d4 files/digest-dillo-0.8.6 816
diff --git a/www-client/dillo/files/dillo-format-string-vulnerability.diff b/www-client/dillo/files/dillo-format-string-vulnerability.diff
deleted file mode 100644
index f36473b1eaa4..000000000000
--- a/www-client/dillo/files/dillo-format-string-vulnerability.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/capi.c.orig	2005-01-04 21:59:52.239250240 +0000
-+++ src/capi.c	2005-01-04 22:00:34.828775648 +0000
-@@ -497,11 +497,11 @@
- 
-             } else if (strcmp(Data2, "send_status_message") == 0) {
- 			   gchar *Data1_enc = a_I18n_locale_to_DILLO_CHARSET(Data1);
--               a_Interface_msg(conn->dd->bw, Data1_enc);
-+               a_Interface_msg(conn->dd->bw, "%s", Data1_enc);
- 			   g_free(Data1_enc);
-             } else if (strcmp(Data2, "chat") == 0) {
- 			   gchar *Data1_enc = a_I18n_locale_to_DILLO_CHARSET(Data1);
--               a_Interface_msg(conn->dd->bw, Data1);
-+               a_Interface_msg(conn->dd->bw, "%s", Data1);
-                  a_Bookmarks_chat_add(NULL, NULL, Data1);
- 			   g_free(Data1_enc);
-             } else if (strcmp(Data2, "dialog") == 0) {