Add a patch to fix security bug #138125. Also use autotools.eclass to reconfigure the build framework when needed.

(Portage version: 2.1-r1)

9 files changed, 179 insertions, 22 deletions

diff --git a/mail-client/mutt/files/digest-mutt-1.5.10-r1 b/mail-client/mutt/files/digest-mutt-1.5.10-r1
index d191109f96e7..48b8b3364697 100644
--- a/mail-client/mutt/files/digest-mutt-1.5.10-r1
+++ b/mail-client/mutt/files/digest-mutt-1.5.10-r1
@@ -1,9 +1,27 @@
 MD5 59400d12c6b5b3d122531000e53d1914 mutt-1.5.10i.tar.gz 3156345
-MD5 ba2f45b05aa7ef453dbd3dccddf7baef patch-1.5.10.tt.assumed_charset.1.gz 2565
+RMD160 e6855dd72e41b5e451b17bac9934bea8ca0c5db7 mutt-1.5.10i.tar.gz 3156345
+SHA256 0e6bcfa33ded3e025b253831d68d441f413d5717a9902a173f25f7de40061118 mutt-1.5.10i.tar.gz 3156345
+MD5 b65ec75e68ff9a0b6aca59d40822affc mutt-1.5.4-imap-fcc-status.patch 380
+RMD160 cbeac806b610bcd945bf3b52120a8aa2aba27df3 mutt-1.5.4-imap-fcc-status.patch 380
+SHA256 22cb4e1625ae2d22f94e8d815cb3515db75801f8a4cb9e4f047c4fb4ded8757c mutt-1.5.4-imap-fcc-status.patch 380
+MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
+RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
+SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
 MD5 f6cd5bd6c030d5d691d347a6e9d75b6a patch-1.5.10.rr.compressed.gz 10095
+RMD160 9af76817f36b9f3f63d1c94435e7f78eba4279d3 patch-1.5.10.rr.compressed.gz 10095
+SHA256 07a4ef9ae747c7b37edc5413c632f3d25ad43401e2b60081f9017ab761d9922f patch-1.5.10.rr.compressed.gz 10095
+MD5 ba2f45b05aa7ef453dbd3dccddf7baef patch-1.5.10.tt.assumed_charset.1.gz 2565
+RMD160 7d3fb6d32c266ed35babdb10d13aae731783a64e patch-1.5.10.tt.assumed_charset.1.gz 2565
+SHA256 97cdb63694055e218dff8b85e8c0db8b5e0c7435a91d47479604480319156c6b patch-1.5.10.tt.assumed_charset.1.gz 2565
+MD5 b6c5ba3052ce62173d8773094afacbdf patch-1.5.10.vvv.nntp-gentoo.bz2 72894
+RMD160 b1666655146bcfd346876365aa7fb0f56e9cc322 patch-1.5.10.vvv.nntp-gentoo.bz2 72894
+SHA256 9c71e8cc54122e277efca3ce9b7db7f27597fa63fa0777d3751820b9ae0e29ae patch-1.5.10.vvv.nntp-gentoo.bz2 72894
+MD5 93ea23bda53ca73a724954ee076bcfc3 patch-1.5.4.lpr.collapse_flagged 4790
+RMD160 f8d8ea63c61557321c0afcc2a857a6b53a09629f patch-1.5.4.lpr.collapse_flagged 4790
+SHA256 f0fc39fdad2f7c5ad23ee0ee7f484c2809340ac117a3f7dd8ebad57129a61a4a patch-1.5.4.lpr.collapse_flagged 4790
 MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
+RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
+SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
 MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
-MD5 b65ec75e68ff9a0b6aca59d40822affc mutt-1.5.4-imap-fcc-status.patch 380
-MD5 93ea23bda53ca73a724954ee076bcfc3 patch-1.5.4.lpr.collapse_flagged 4790
-MD5 b6c5ba3052ce62173d8773094afacbdf patch-1.5.10.vvv.nntp-gentoo.bz2 72894
-MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
+RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
+SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/digest-mutt-1.5.11 b/mail-client/mutt/files/digest-mutt-1.5.11
index 288fb3e226c9..f4edcdee3ebb 100644
--- a/mail-client/mutt/files/digest-mutt-1.5.11
+++ b/mail-client/mutt/files/digest-mutt-1.5.11
@@ -1,9 +1,27 @@
 MD5 00e6f8f7c37d4840e5e30583ebee21ce mutt-1.5.11.tar.gz 3187375
+RMD160 812bfa6b1c9bfb1650341f7522298699c7b214a5 mutt-1.5.11.tar.gz 3187375
+SHA256 0ff256a9851952a5f6dfb4b7dccf5dc26db9de5502d035748abc93dec84af474 mutt-1.5.11.tar.gz 3187375
 MD5 b65ec75e68ff9a0b6aca59d40822affc mutt-1.5.4-imap-fcc-status.patch 380
+RMD160 cbeac806b610bcd945bf3b52120a8aa2aba27df3 mutt-1.5.4-imap-fcc-status.patch 380
+SHA256 22cb4e1625ae2d22f94e8d815cb3515db75801f8a4cb9e4f047c4fb4ded8757c mutt-1.5.4-imap-fcc-status.patch 380
 MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
+RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
+SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
 MD5 ba2f45b05aa7ef453dbd3dccddf7baef patch-1.5.10.tt.assumed_charset.1.gz 2565
+RMD160 7d3fb6d32c266ed35babdb10d13aae731783a64e patch-1.5.10.tt.assumed_charset.1.gz 2565
+SHA256 97cdb63694055e218dff8b85e8c0db8b5e0c7435a91d47479604480319156c6b patch-1.5.10.tt.assumed_charset.1.gz 2565
 MD5 95ec112ae0ce2cbd1b67bcc68756bf97 patch-1.5.11.rr.compressed.gz 9995
+RMD160 f19cdeb949389cd3dd8f250ac96178f13ce92f67 patch-1.5.11.rr.compressed.gz 9995
+SHA256 1e2697136e0431508d2447de8b67fb32114d0b08ec043cc929e3ddf07202fcb5 patch-1.5.11.rr.compressed.gz 9995
 MD5 d1ced97761933447ee3b8d8af9b20163 patch-1.5.11.vvv.nntp-gentoo.bz2 44351
+RMD160 e0d0754fd3f11f7a815dc6c64f0d96b13b2f580f patch-1.5.11.vvv.nntp-gentoo.bz2 44351
+SHA256 1e94c9862956c4292f518ead7f66192b6ad56abf5ba8660944393956bb32c723 patch-1.5.11.vvv.nntp-gentoo.bz2 44351
 MD5 93ea23bda53ca73a724954ee076bcfc3 patch-1.5.4.lpr.collapse_flagged 4790
+RMD160 f8d8ea63c61557321c0afcc2a857a6b53a09629f patch-1.5.4.lpr.collapse_flagged 4790
+SHA256 f0fc39fdad2f7c5ad23ee0ee7f484c2809340ac117a3f7dd8ebad57129a61a4a patch-1.5.4.lpr.collapse_flagged 4790
 MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
+RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
+SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
 MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
+RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
+SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/digest-mutt-1.5.11-r1 b/mail-client/mutt/files/digest-mutt-1.5.11-r1
index cf9bd5eb74c9..f4edcdee3ebb 100644
--- a/mail-client/mutt/files/digest-mutt-1.5.11-r1
+++ b/mail-client/mutt/files/digest-mutt-1.5.11-r1
@@ -1,9 +1,27 @@
 MD5 00e6f8f7c37d4840e5e30583ebee21ce mutt-1.5.11.tar.gz 3187375
+RMD160 812bfa6b1c9bfb1650341f7522298699c7b214a5 mutt-1.5.11.tar.gz 3187375
+SHA256 0ff256a9851952a5f6dfb4b7dccf5dc26db9de5502d035748abc93dec84af474 mutt-1.5.11.tar.gz 3187375
+MD5 b65ec75e68ff9a0b6aca59d40822affc mutt-1.5.4-imap-fcc-status.patch 380
+RMD160 cbeac806b610bcd945bf3b52120a8aa2aba27df3 mutt-1.5.4-imap-fcc-status.patch 380
+SHA256 22cb4e1625ae2d22f94e8d815cb3515db75801f8a4cb9e4f047c4fb4ded8757c mutt-1.5.4-imap-fcc-status.patch 380
+MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
+RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
+SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
 MD5 ba2f45b05aa7ef453dbd3dccddf7baef patch-1.5.10.tt.assumed_charset.1.gz 2565
+RMD160 7d3fb6d32c266ed35babdb10d13aae731783a64e patch-1.5.10.tt.assumed_charset.1.gz 2565
+SHA256 97cdb63694055e218dff8b85e8c0db8b5e0c7435a91d47479604480319156c6b patch-1.5.10.tt.assumed_charset.1.gz 2565
 MD5 95ec112ae0ce2cbd1b67bcc68756bf97 patch-1.5.11.rr.compressed.gz 9995
+RMD160 f19cdeb949389cd3dd8f250ac96178f13ce92f67 patch-1.5.11.rr.compressed.gz 9995
+SHA256 1e2697136e0431508d2447de8b67fb32114d0b08ec043cc929e3ddf07202fcb5 patch-1.5.11.rr.compressed.gz 9995
+MD5 d1ced97761933447ee3b8d8af9b20163 patch-1.5.11.vvv.nntp-gentoo.bz2 44351
+RMD160 e0d0754fd3f11f7a815dc6c64f0d96b13b2f580f patch-1.5.11.vvv.nntp-gentoo.bz2 44351
+SHA256 1e94c9862956c4292f518ead7f66192b6ad56abf5ba8660944393956bb32c723 patch-1.5.11.vvv.nntp-gentoo.bz2 44351
+MD5 93ea23bda53ca73a724954ee076bcfc3 patch-1.5.4.lpr.collapse_flagged 4790
+RMD160 f8d8ea63c61557321c0afcc2a857a6b53a09629f patch-1.5.4.lpr.collapse_flagged 4790
+SHA256 f0fc39fdad2f7c5ad23ee0ee7f484c2809340ac117a3f7dd8ebad57129a61a4a patch-1.5.4.lpr.collapse_flagged 4790
 MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
+RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
+SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
 MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
-MD5 b65ec75e68ff9a0b6aca59d40822affc mutt-1.5.4-imap-fcc-status.patch 380
-MD5 93ea23bda53ca73a724954ee076bcfc3 patch-1.5.4.lpr.collapse_flagged 4790
-MD5 d1ced97761933447ee3b8d8af9b20163 patch-1.5.11.vvv.nntp-gentoo.bz2 44351
-MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
+RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
+SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/digest-mutt-1.5.11-r2 b/mail-client/mutt/files/digest-mutt-1.5.11-r2
new file mode 100644
index 000000000000..f4edcdee3ebb
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.11-r2
@@ -0,0 +1,27 @@
+MD5 00e6f8f7c37d4840e5e30583ebee21ce mutt-1.5.11.tar.gz 3187375
+RMD160 812bfa6b1c9bfb1650341f7522298699c7b214a5 mutt-1.5.11.tar.gz 3187375
+SHA256 0ff256a9851952a5f6dfb4b7dccf5dc26db9de5502d035748abc93dec84af474 mutt-1.5.11.tar.gz 3187375
+MD5 b65ec75e68ff9a0b6aca59d40822affc mutt-1.5.4-imap-fcc-status.patch 380
+RMD160 cbeac806b610bcd945bf3b52120a8aa2aba27df3 mutt-1.5.4-imap-fcc-status.patch 380
+SHA256 22cb4e1625ae2d22f94e8d815cb3515db75801f8a4cb9e4f047c4fb4ded8757c mutt-1.5.4-imap-fcc-status.patch 380
+MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
+RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
+SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
+MD5 ba2f45b05aa7ef453dbd3dccddf7baef patch-1.5.10.tt.assumed_charset.1.gz 2565
+RMD160 7d3fb6d32c266ed35babdb10d13aae731783a64e patch-1.5.10.tt.assumed_charset.1.gz 2565
+SHA256 97cdb63694055e218dff8b85e8c0db8b5e0c7435a91d47479604480319156c6b patch-1.5.10.tt.assumed_charset.1.gz 2565
+MD5 95ec112ae0ce2cbd1b67bcc68756bf97 patch-1.5.11.rr.compressed.gz 9995
+RMD160 f19cdeb949389cd3dd8f250ac96178f13ce92f67 patch-1.5.11.rr.compressed.gz 9995
+SHA256 1e2697136e0431508d2447de8b67fb32114d0b08ec043cc929e3ddf07202fcb5 patch-1.5.11.rr.compressed.gz 9995
+MD5 d1ced97761933447ee3b8d8af9b20163 patch-1.5.11.vvv.nntp-gentoo.bz2 44351
+RMD160 e0d0754fd3f11f7a815dc6c64f0d96b13b2f580f patch-1.5.11.vvv.nntp-gentoo.bz2 44351
+SHA256 1e94c9862956c4292f518ead7f66192b6ad56abf5ba8660944393956bb32c723 patch-1.5.11.vvv.nntp-gentoo.bz2 44351
+MD5 93ea23bda53ca73a724954ee076bcfc3 patch-1.5.4.lpr.collapse_flagged 4790
+RMD160 f8d8ea63c61557321c0afcc2a857a6b53a09629f patch-1.5.4.lpr.collapse_flagged 4790
+SHA256 f0fc39fdad2f7c5ad23ee0ee7f484c2809340ac117a3f7dd8ebad57129a61a4a patch-1.5.4.lpr.collapse_flagged 4790
+MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
+RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
+SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
+MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
+RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
+SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/digest-mutt-1.5.11-r30 b/mail-client/mutt/files/digest-mutt-1.5.11-r30
index e512fec3717f..85aa0abf7c2f 100644
--- a/mail-client/mutt/files/digest-mutt-1.5.11-r30
+++ b/mail-client/mutt/files/digest-mutt-1.5.11-r30
@@ -1,2 +1,6 @@
-MD5 7bedbd09180f86f283d9859e77e9d58a mutt-1.5.11-gentoo-patches-nonntp.tar.bz2 20015
+MD5 9319f81db6e0b0b4f350f2ce8be28553 mutt-1.5.11-gentoo-patches-nonntp.tar.bz2 20046
+RMD160 2b023cfa0f941f87c47a1cb57fbd0b1c2f432024 mutt-1.5.11-gentoo-patches-nonntp.tar.bz2 20046
+SHA256 7b70696384eeaa53b17b6a11a2208bfc058f933af1291fd525265a713643eb0f mutt-1.5.11-gentoo-patches-nonntp.tar.bz2 20046
 MD5 00e6f8f7c37d4840e5e30583ebee21ce mutt-1.5.11.tar.gz 3187375
+RMD160 812bfa6b1c9bfb1650341f7522298699c7b214a5 mutt-1.5.11.tar.gz 3187375
+SHA256 0ff256a9851952a5f6dfb4b7dccf5dc26db9de5502d035748abc93dec84af474 mutt-1.5.11.tar.gz 3187375
diff --git a/mail-client/mutt/files/digest-mutt-1.5.8-r1 b/mail-client/mutt/files/digest-mutt-1.5.8-r1
index ce723bdaf641..9bff896b4b4e 100644
--- a/mail-client/mutt/files/digest-mutt-1.5.8-r1
+++ b/mail-client/mutt/files/digest-mutt-1.5.8-r1
@@ -1,8 +1,18 @@
+MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
+RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
+SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
 MD5 9b9bdef4ef7107332f8782b3a910d00e mutt-1.5.8i.tar.gz 3010088
+RMD160 2b941aa12381efb2cbad204ebf5512051909911b mutt-1.5.8i.tar.gz 3010088
+SHA256 3f50f60651a8c2543a8935f6593f7260b392e6207e4fa1d591ae54ba077124e0 mutt-1.5.8i.tar.gz 3010088
+MD5 8bd12eb073ef94712f3a88eb8493f195 mutt-cvs-header-cache.29 5120
+RMD160 b9c84cdc699ca8b053cc1b39cbccb225b5701749 mutt-cvs-header-cache.29 5120
+SHA256 5e7877d41480c07f2b8be146bda18261d78f42f51da5434bc5242362ad761ff0 mutt-cvs-header-cache.29 5120
 MD5 44df2038c3cb03b1f6f5d0b998a64aed patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2 6269
-MD5 994108508f9890329ff4ee07604a374d patch-1.5.8.rr.compressed.gz 10230
 MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
-MD5 80e81a9df998d6c65821b21a864e45ed patch-1.5.8.vvv.nntp-gentoo.bz2 71780
-MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
-MD5 8bd12eb073ef94712f3a88eb8493f195 mutt-cvs-header-cache.29 5120
+RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
+SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
 MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
+RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
+SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
+MD5 994108508f9890329ff4ee07604a374d patch-1.5.8.rr.compressed.gz 10230
+MD5 80e81a9df998d6c65821b21a864e45ed patch-1.5.8.vvv.nntp-gentoo.bz2 71780
diff --git a/mail-client/mutt/files/digest-mutt-1.5.8-r2 b/mail-client/mutt/files/digest-mutt-1.5.8-r2
index e4160ceace06..aea7a6463964 100644
--- a/mail-client/mutt/files/digest-mutt-1.5.8-r2
+++ b/mail-client/mutt/files/digest-mutt-1.5.8-r2
@@ -1,9 +1,21 @@
+MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
+RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
+SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
 MD5 9b9bdef4ef7107332f8782b3a910d00e mutt-1.5.8i.tar.gz 3010088
+RMD160 2b941aa12381efb2cbad204ebf5512051909911b mutt-1.5.8i.tar.gz 3010088
+SHA256 3f50f60651a8c2543a8935f6593f7260b392e6207e4fa1d591ae54ba077124e0 mutt-1.5.8i.tar.gz 3010088
+MD5 8bd12eb073ef94712f3a88eb8493f195 mutt-cvs-header-cache.29 5120
+RMD160 b9c84cdc699ca8b053cc1b39cbccb225b5701749 mutt-cvs-header-cache.29 5120
+SHA256 5e7877d41480c07f2b8be146bda18261d78f42f51da5434bc5242362ad761ff0 mutt-cvs-header-cache.29 5120
 MD5 44df2038c3cb03b1f6f5d0b998a64aed patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r1.bz2 6269
+MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
+RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
+SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
+MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
+RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
+SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
 MD5 c20f30c8cb6002a503aa373c5934f3bb patch-1.5.6.tt.assumed_charset.1.gz 4640
+RMD160 ab9a74d01a13499b0e122a7a1200bf3cbcb35014 patch-1.5.6.tt.assumed_charset.1.gz 4640
+SHA256 b9cafe5c32718ea6f952fa11397a9da72d8cc85d3ba2e9ae552606060d87303b patch-1.5.6.tt.assumed_charset.1.gz 4640
 MD5 994108508f9890329ff4ee07604a374d patch-1.5.8.rr.compressed.gz 10230
-MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
 MD5 fb20d001bb7102cf78f8e1c734eabbdf patch-1.5.8.vvv.nntp-gentoo-r2.bz2 71752
-MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
-MD5 8bd12eb073ef94712f3a88eb8493f195 mutt-cvs-header-cache.29 5120
-MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/digest-mutt-1.5.9 b/mail-client/mutt/files/digest-mutt-1.5.9
index a2baff20e0e9..5d709530b91a 100644
--- a/mail-client/mutt/files/digest-mutt-1.5.9
+++ b/mail-client/mutt/files/digest-mutt-1.5.9
@@ -1,9 +1,21 @@
+MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
+RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
+SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
 MD5 c5318eba3404ebd78a15c680fa1b6056 mutt-1.5.9i.tar.gz 3036003
+RMD160 888848046382b3c4e8b18eacd30af4291a7ed23d mutt-1.5.9i.tar.gz 3036003
+SHA256 d80142bfe7dd2c8ee9c2345c71fedded8b971267a9a29a853d48c562dd0605d4 mutt-1.5.9i.tar.gz 3036003
+MD5 8bd12eb073ef94712f3a88eb8493f195 mutt-cvs-header-cache.29 5120
+RMD160 b9c84cdc699ca8b053cc1b39cbccb225b5701749 mutt-cvs-header-cache.29 5120
+SHA256 5e7877d41480c07f2b8be146bda18261d78f42f51da5434bc5242362ad761ff0 mutt-cvs-header-cache.29 5120
 MD5 82357a1177e6c7de7b2ddcd6d95894ed patch-1.5.5.1.cd.edit_threads.9.5-gentoo-r2.bz2 6288
+MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
+RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
+SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
+MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
+RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
+SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
 MD5 c20f30c8cb6002a503aa373c5934f3bb patch-1.5.6.tt.assumed_charset.1.gz 4640
+RMD160 ab9a74d01a13499b0e122a7a1200bf3cbcb35014 patch-1.5.6.tt.assumed_charset.1.gz 4640
+SHA256 b9cafe5c32718ea6f952fa11397a9da72d8cc85d3ba2e9ae552606060d87303b patch-1.5.6.tt.assumed_charset.1.gz 4640
 MD5 9d9ef4ec0e970f9fc3de2d5c6219a349 patch-1.5.9.rr.compressed.gz 10260
-MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
 MD5 52778aa7e5b9d46a724e1c386f6ef9f9 patch-1.5.9.vvv.nntp-gentoo.bz2 72024
-MD5 404cb8677bb50937405531931629562f mutt-1.5.7-mixmaster+nntp.patch 310
-MD5 8bd12eb073ef94712f3a88eb8493f195 mutt-cvs-header-cache.29 5120
-MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/mutt-1.5.11-imap-browse.patch b/mail-client/mutt/files/mutt-1.5.11-imap-browse.patch
new file mode 100644
index 000000000000..b396e28e6fec
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.11-imap-browse.patch
@@ -0,0 +1,38 @@
+commit 850d4a6b78730344ad7bb1d2a04cfcd35def3fec
+Author: brendan <brendan>
+Date:   Mon Jun 19 18:14:03 2006 +0000
+
+    From: TAKAHASHI Tamotsu <tamo@momonga-linux.org>
+    
+    Fix browse_get_namespace() which could overflow ns[LONG_STRING].
+    (Possible remote vulnerability)
+
+diff --git a/imap/browse.c b/imap/browse.c
+index bc2d036..43463ba 100644
+--- a/imap/browse.c
++++ b/imap/browse.c
+@@ -505,7 +505,7 @@ static int browse_get_namespace (IMAP_DA
+ 	    if (*s == '\"')
+ 	    {
+ 	      s++;
+-	      while (*s && *s != '\"') 
++	      while (*s && *s != '\"' && n < sizeof (ns) - 1) 
+ 	      {
+ 		if (*s == '\\')
+ 		  s++;
+@@ -516,12 +516,14 @@ static int browse_get_namespace (IMAP_DA
+ 		s++;
+ 	    }
+ 	    else
+-	      while (*s && !ISSPACE (*s)) 
++	      while (*s && !ISSPACE (*s) && n < sizeof (ns) - 1)
+ 	      {
+ 		ns[n++] = *s;
+ 		s++;
+ 	      }
+ 	    ns[n] = '\0';
++	    if (n == sizeof (ns) - 1)
++	      dprint (1, (debugfile, "browse_get_namespace: too long: [%s]\n", ns));
+ 	    /* delim? */
+ 	    s = imap_next_word (s);
+ 	    /* delimiter is meaningless if namespace is "". Why does