# ChangeLog for mail-client/mutt
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.181 2010/03/11 20:18:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.182 2010/04/11 19:17:46 grobian Exp $
+
+*mutt-1.5.20-r14 (11 Apr 2010)
+
+ 11 Apr 2010; Fabian Groffen <grobian@gentoo.org>
+ -files/mutt-1.5.19-libgnutls-test-15c662a95b91.patch,
+ -files/mutt-1.5.19-mutt-gnutls-7d0583e0315d-0b13183e40e0.patch,
+ -files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch,
+ -mutt-1.5.20-r4.ebuild, mutt-1.5.20-r6.ebuild, mutt-1.5.20-r10.ebuild,
+ -mutt-1.5.20-r12.ebuild, mutt-1.5.20-r13.ebuild, +mutt-1.5.20-r14.ebuild,
+ -files/mutt-1.5.20-abort-prompt-ctrlc-c837ab790d2e.patch,
+ -files/mutt-1.5.20-copy-From-to-imap-b2b97c7a2ae6.patch,
+ -files/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch,
+ -files/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch,
+ -files/mutt-1.5.20-gpgme-case-insensitive-domain-2c78b28027cc.patch,
+ -files/mutt-1.5.20-gpgme-keys-d41e043fa775.patch,
+ -files/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch,
+ -files/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch,
+ -files/mutt-1.5.20-header-weeding-f40de578e8ed.patch,
+ -files/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch,
+ -files/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch,
+ -files/mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch,
+ -files/mutt-1.5.20-mailbox-save-message-double-free-57124ea5592e.patch,
+ -files/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch,
+ -files/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch,
+ -files/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch,
+ -files/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch,
+ -files/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch,
+ -files/mutt-1.5.20-null-dptr-use-data-817c60d5da7d.patch,
+ -files/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch,
+ -files/mutt-1.5.20-pop-port-in-url-6b057dc52222.patch,
+ -files/mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch,
+ +files/mutt-1.5.20-realpath-slowness.patch,
+ -files/mutt-1.5.20-regexp-fail-crash-05cec973f0d9.patch,
+ -files/mutt-1.5.20-rfc-2047-decode-before-dequote-2a4ca6917fd0.patch,
+ -files/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch,
+ -files/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch,
+ -files/mutt-1.5.20-ssl-CVE-2009-3765-dc09812e63a3.patch,
+ -files/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch,
+ -files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch,
+ -files/mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patc
+ h, -files/mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch,
+ -files/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch,
+ -files/mutt-1.5.20-yes-no-non-ascii-a6fddecdc5f5.patch:
+ - Drop unused ebuilds
+ - Drop keywords from mutt-1.5.20-r6: it is the last version for mips
+ - Drop HG patches from filesdir, all moved to jumbo patches from the
+ patchball
+ - Added mutt-1.5.20-r14 with latest fixes from upstream
*mutt-1.5.20-r13 (11 Mar 2010)
AUX mutt-1.5.18-bdb-prefix.patch 956 RMD160 510a65fba0d17bd9184b23730dd18e64c7d2a163 SHA1 f7ec35f6b3049949f4ca98b46401d85c6fc271a1 SHA256 b9dc46feab0b10f03dec44e1ff4ecf023d3bd06e4d509d9a35590779220f6995
AUX mutt-1.5.18-interix.patch 663 RMD160 7fe8c230167f9635d08873be5de9189f38e13183 SHA1 3d3532255df8eef9f6b4ea21f2664c139933956f SHA256 0d82f617a4d354451469c7afdb23e4626ed008879dbb0aec1077a93703730065
AUX mutt-1.5.18-solaris-ncurses-chars.patch 1926 RMD160 dc8c17c88f66d4ed94d885ba67517bbfd566d78d SHA1 2d977d180e434aee9a15be44187d96056da203ca SHA256 1f141c49c2c9f10654fc7453991d8017954358bfee80d93c98af57870258351b
-AUX mutt-1.5.19-libgnutls-test-15c662a95b91.patch 9187 RMD160 b5d981c5aeb66f9fc1212c74884bfd91914a97c7 SHA1 76cdfe28610aa68eec2506aeab53324de9dbf57e SHA256 7fe0edbfb2ee862bfef0fd3c53e19cf589a908c52299206db72c1c701e7fb6c8
-AUX mutt-1.5.19-mutt-gnutls-7d0583e0315d-0b13183e40e0.patch 12414 RMD160 6759b26ee028fc9d5a0f5d6b7d56fd4c1c879a04 SHA1 819146a1650035ee2a9016f01f0e2d11b8c11896 SHA256 92033adfb057818a7dcae8b02b91df8a62e7d52c339268caa4a38149ac28bc45
-AUX mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch 6968 RMD160 ea63c5149d78d2790bfbfbb9a5d2499e179c8ae1 SHA1 d23cab55003763d79475ef4eb95c10504dad323f SHA256 54da63a9ce41c3704a3b96288de7b8d24ef1305a9b27306c8178e900a81f196b
-AUX mutt-1.5.20-abort-prompt-ctrlc-c837ab790d2e.patch 426 RMD160 77717c265d7a4219df7e3c17c1b3bfcf71d5b18d SHA1 5f29ceb508bcb5363403ff619202fcf7535fbd82 SHA256 2a15715554fe0148aae7599ad561934cf868156934b9e5841f2193572a6dadf5
-AUX mutt-1.5.20-copy-From-to-imap-b2b97c7a2ae6.patch 2536 RMD160 e53c4b69ae8564b2e7b6a67df900307e7f3af560 SHA1 5ed1bfc7a9deba17977792b84dbf2fd44c8f0b18 SHA256 5ea8a9d6bd47b6e996e0f3b690554fac0541a0feaede4711b5a169d4a2e7f620
-AUX mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch 1197 RMD160 59f3df7d7f299e90e4c0080d1cc98dcc3a82abfb SHA1 8deb3b88ff64f31ed1ce027de74e76be5a485147 SHA256 4790449de5476f570e95ebdec9db59afd50dd7507485d22d3848ad7bd1327b20
AUX mutt-1.5.20-dont-reveal-bbc.patch 4027 RMD160 0295eb2ed6ae7d3b39c5b101d519d13f45d64c80 SHA1 c7ac97ec879c070eb3a24184ce41b199eec89840 SHA256 88b313f8baea81eec814d03acbe9aa5cf4a249de120426608893c1c53a8a3596
-AUX mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch 484 RMD160 444125b0ec6c56a90bd23586ffd28b96108c0b28 SHA1 0f1fb90b5cfa0d29e04bdd00273de7c90d425241 SHA256 9cf9b6d5410e82d83b650c9568cf9c2428ae580001b512e12c5a3482468c86fb
AUX mutt-1.5.20-gpgme-1.2.0.patch 623 RMD160 0387025c571723f9ebde284789c65464cf0c2da4 SHA1 230af7e00e06a41f0024b8c6e19bd9d5b208511c SHA256 9e69e53cb3013a379f85e6dcea0550c4ec8582ea1f36a83c6a0ad95828164551
-AUX mutt-1.5.20-gpgme-case-insensitive-domain-2c78b28027cc.patch 2790 RMD160 c9f728ddec1496acad916e4d0a91ffdc08beb997 SHA1 176afdf1a6f1320a0e00685ccbf8b6ab1735caf8 SHA256 77e263f68458ac5c4881527df9c98c69d38f183eec661191648389ba5b2e7dd7
-AUX mutt-1.5.20-gpgme-keys-d41e043fa775.patch 589 RMD160 99b4b44459952afa55db43c5e30f204b3cae797e SHA1 432938b1876fdb95c1bfbd0ab79f6ae8430fe5e9 SHA256 9ea0850343eb54be14f58532bf4bf2a6e5ad970c43ece56e185d693eb50966e8
-AUX mutt-1.5.20-hcache-restore-address-848f08512bf3.patch 1150 RMD160 2df8927ac9b470fa6be814a66ef1dcfcb8cbdf9c SHA1 1423af5422eda09c7c7d5590f19318f7721d9e1d SHA256 86d983f4b61a4449ae148a24dc7ba1749a4b0b5848556dee5de87589a6e39cc3
-AUX mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch 2498 RMD160 54e0d35609ab7282a689820da70aa9075ecb5cdc SHA1 df926f3a59775c14e054f6b61aa23255ace10fff SHA256 b2757e9db1b92562999fcfd5a7c5e84b5447958d8eaeb5e704b0d51155e71eea
-AUX mutt-1.5.20-header-weeding-f40de578e8ed.patch 619 RMD160 3f6e4b734f6857d0ccef60df0a1b3d21e86584ae SHA1 76487cf18f0d7ff43441e70a6902298990c2cd3a SHA256 f06b539879b4bf7cf511f7ca03d02bb4ff8dd28a864ad7dc7cf498416c20d17c
-AUX mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch 567 RMD160 1c32139a95717e1675dca18f1f5a7baeb2c9dbaa SHA1 422621d233b5414987b2153ea81037622ed3158c SHA256 d2042d4b7ba37bfcf3173af243368a2b05f5db51a09cdbe11c3f225491d84fd0
-AUX mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch 451 RMD160 ce68b1841fa9b05cf2e30a7cb53d3475c674081a SHA1 92e8f2bbcfeb9812f727364759f58a0e3656b4fc SHA256 ed7e9295959fad0c0702550e36d83e786bec5a041a74680c3289d1698d0c8435
-AUX mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch 2209 RMD160 e5cd50a5b7c981851f1e742af4f5cdd7db39b43b SHA1 4c95287f7be617fd8a33759869cc01a5aded266c SHA256 e3893f10940789c9d85646f35af989509ce6f35e49bed21e1cdee92ae7fc827d
-AUX mutt-1.5.20-mailbox-save-message-double-free-57124ea5592e.patch 673 RMD160 f6e7aa7d0d3b3e615e4ace8301776e2de8e43a4a SHA1 635c3a4884bce31996d6861aaae5193daa9e63f6 SHA256 b774ea094e8c5a22101634800e22837f7346b9286254c754daafeb593d05e245
-AUX mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch 2324 RMD160 a71d7fdebcb409947f664b96f1e7d808974f5101 SHA1 035cfaa9290121b3c6c7e57fbda94495239162d3 SHA256 adc78114cc72efb181f20050b24358d2b3959bd78b8795c8245d6049e00ab5fa
-AUX mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch 1502 RMD160 bf7503b9c10fc903b31f85ee3f38efe57fa5489a SHA1 de44ba3e404bb44ea57a663938b91a0c9c51fb5b SHA256 701fd49be77c97ca53b1cfcf9e6a2c0afb37793a3827d453d45c4587cdd4ba41
-AUX mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch 436 RMD160 26a2be74db7ec3ac72ab579fe42709ecae9b28e1 SHA1 1a87cb97e744911bb862a7e12f0c00295a0a1666 SHA256 d27054521019fb938fadd0d292bc6c4be094823683ea4735bf4c43c238e919f4
-AUX mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch 791 RMD160 b4e91bb9b82be8768f738fbb0d7a8a49ef1d23b1 SHA1 4bb8b95dc810e6de81c2b80a1bf137015f29ab02 SHA256 a2ab67cf1ce9086e8ba1cc7c6fc674fee3992fb468f78712a066b98530a2dc4f
-AUX mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch 650 RMD160 881de8faf57ff714e0f8190f80a381d198aff698 SHA1 ce2fdb98108c9eb2e5722a2ee9bc6795603160e8 SHA256 7bd951ca19197ddea5b07ec39bfade83ade4bea67c5c47d9c07b1ce6e71dc028
-AUX mutt-1.5.20-null-dptr-use-data-817c60d5da7d.patch 658 RMD160 1c1cfde5477c6d9375a25175f395cbfe2aeb0eee SHA1 9a1ec899ac004668bd69c7ba6971185bcdf39925 SHA256 71af7c303d577baaa13840236f7c6c9539bc8f7faf538ccb0d62a4965131d13b
-AUX mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch 807 RMD160 d86732756ed0c7ae3bb49625bec9f482e016c5e2 SHA1 268ae8d44099248dbe78225113333424b4e5ffa3 SHA256 cb44ce263b3bcf1f4687bfd7728958ec961f16f047e59bda7486e6228801588a
-AUX mutt-1.5.20-pop-port-in-url-6b057dc52222.patch 1116 RMD160 20c2a67af483a433330832426d23b904c8034259 SHA1 926cee7890a473f11865127623e979e7760f807b SHA256 d9e0164f77a98df708d4fac83f4dca8d62327cfdeb7542ee126627890dd1a027
-AUX mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch 725 RMD160 9125bf147ba4be50821d38301af361844e176b2e SHA1 6f11d93ac397b15d01fe6ede010a29998743356f SHA256 633cbff8666d49e1a02c348e27f7cec1046460581d3af1f5c73905ba6ff4a564
-AUX mutt-1.5.20-regexp-fail-crash-05cec973f0d9.patch 1202 RMD160 ef925836618c1816a4832812247bbb1a19abf790 SHA1 5554aead681cb5a5fabd4545fddd674f1eed0543 SHA256 0c2eec3aa40f708f8b5662d17b0a16626e992b5387ab95541228fa8c0a6e9e59
-AUX mutt-1.5.20-rfc-2047-decode-before-dequote-2a4ca6917fd0.patch 3156 RMD160 214df9ac13915485de9cd26582a923f0ced4741b SHA1 710ff1e91d9a549d8fb5cd2c39872376e634c784 SHA256 edc2df5a6ecbdb0e4eb3e5292ffa7d52ae552eee09313063ba2066c5dfad5ea0
-AUX mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch 634 RMD160 c7eb6d6977b8b43b5ef84cb5dede58bb5018a02c SHA1 381bca1965f0fe2a13429f68872901dfcfe5f07f SHA256 b25f814ec615e5240fc2d449b0b41e3d20d6c862d0131bcc1d0e3d876244470b
-AUX mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch 2211 RMD160 730cd88c1cfaf83d9eeeb1f2ed7d58b2eb43b85f SHA1 e6ce5e3b0ea1a9885a53ba93fc43ce8a17654287 SHA256 838f9734ba360936f99e06b25eb14425870ea788d97769ee2a0c57bd98e42468
-AUX mutt-1.5.20-ssl-CVE-2009-3765-dc09812e63a3.patch 860 RMD160 c7a4a69194fd735a992c470bae0b1e21f5346fc0 SHA1 a151b6424f261a1988f72f9f9df00d17f44b7726 SHA256 c16df7b212806867ae134837dafdc7aff9e36084a493238adfd8f80b3935d370
-AUX mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch 549 RMD160 4a12ab918d4fe97a80061ef2bbbd2ab6c41ec093 SHA1 43d1a28aae183e94d522c546a686f61a4e006046 SHA256 077a9a9ce029545d2a4f0dde308f8c341a82cbe68e39150fc5ab0492d42ae8b8
-AUX mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch 801 RMD160 3ac604ea054f471c3d00c2816aeedda1ba550b81 SHA1 d33dab2db973a70215607d3c074ecfd6ae4fcf32 SHA256 31e5348c352a4307e3ae3159ecac1ba6cadce6d55d46e833d34dc2329511a724
-AUX mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch 1131 RMD160 5286dc8809747291e31e1c1a3801ad5efbdc285b SHA1 fe3cc48c0592b5f7775db8f46a5fccfff4a68895 SHA256 8cec9af4bc073faacfec09331fc928ddb9c0b98be11da5c5022fc1af2bdece5f
-AUX mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch 14089 RMD160 e26623f79a4ecf5d7a84cd94159e01ad8bfb8b42 SHA1 2f3811d9f85ac2764c33cd1aa4f852dc1b56d017 SHA256 830bb141fbfe42226f12af508d6f4d7fa2904213386695967c488a8a89f8b8ab
-AUX mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch 455 RMD160 63b73ed21d42d0849f38ef1098029c64933c47a5 SHA1 9da6a6914d3ae276887efd1a30ed3ea55bc57bcb SHA256 7d44b98e8f7538ce85ddb80877a0caabd1edcfd5e558258896d50691c51a3d0e
-AUX mutt-1.5.20-yes-no-non-ascii-a6fddecdc5f5.patch 669 RMD160 6ab26e91c24846b8b1a9878dcf2c2dedf3c46ab0 SHA1 333f8d682ea0a1c84665bfaf91bda0c74df995ea SHA256 f29fa78554662e528009b319136f6915ea73ae05e62a85807e0189138f139dd5
-DIST mutt-1.5.20-gentoo-patches-r3.tar.bz2 59753 RMD160 9660c73602e97364ae5a732e60506544f9d6909f SHA1 64cc200fdb79999ee92b61a1364ee289a2a8ea5d SHA256 35f5fbf22d8df9f67ba73440a36cc4f71f91d72cdf8931c90325b7b9aa4648f4
-DIST mutt-1.5.20-gentoo-patches-r4.tar.bz2 59836 RMD160 b323f50c65aba7ec2e29fd5c372428e55c38a00c SHA1 6a986efa6eb682a9b4f8da1ecbab1fad4a0e5c85 SHA256 1407cb4b2dd572dae4b628490741540521e1f2570c993a075677baf4e23e9512
+AUX mutt-1.5.20-realpath-slowness.patch 676 RMD160 7e658134eabeec3f67c4de161bd9996e0096f240 SHA1 e189eb03f2488ad158bdd8ec93fed0f7e6762746 SHA256 a8d15cb9e5fb130b6fc28d9b323afe62e2dbe33f1b86f707de20053f2b9a9a3a
+DIST mutt-1.5.20-gentoo-patches-r5.tar.bz2 78270 RMD160 27fcfe0739c6faa9b5b3326310303b60078336e7 SHA1 38fa1b1743776e0bb8aa5b48d93dd421f15e56ec SHA256 224ad87a763bd08e4cd34b2e515c69a36f7090c38ac6a97775237d9824c31aac
+DIST mutt-1.5.20-gentoo-patches-r6.tar.bz2 78025 RMD160 7f16db9be306d99c05685557a2d89ebbaadfee6c SHA1 03ae43a5f4952372e773e8d2d973330f43d67c7b SHA256 b40a2af026a7e8ef177e04e7f0f07374d0e69af652d3c96b098c21210af4f5f4
DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb SHA1 d2bec7a33771f128ca49b1723b06b6d248a35d31 SHA256 9579fc079d74ff5c89223ff09df402ef4e508ba8ca925c49e74aa09c02a9a796
DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cff63d9f6cfb3f SHA1 d72355e39674bb4f892e4af3b84fe49c94415487 SHA256 6e925319adbfa0ba7f120f0ef4ddc62f99b1dc8f6a8b5bdc31dd8a0040aded1b
-EBUILD mutt-1.5.20-r10.ebuild 9558 RMD160 220455449b02f3720b8ec55b5c4d47174a671ebc SHA1 9694c5896b303bcf7f3edbe97c2080f4b1120bb9 SHA256 f7fa796181988b95a816ad0be00ee3852555eeb52e8ec220f98d53c37591248a
-EBUILD mutt-1.5.20-r12.ebuild 9708 RMD160 b2e6d2f742d0f4754ad29fb285432634149d233a SHA1 bf8469965b36915817a16bc004fa7e559712c547 SHA256 5ac3a707c7579300aa9415eee084604917b472076eed7763cc5ce431af5f488b
-EBUILD mutt-1.5.20-r13.ebuild 9989 RMD160 e01e43416e78342e3328e64b6cf94f7db0a1b822 SHA1 907b41fd8201a25b40187f98d8095a175c453b83 SHA256 87b54e1ca9ecbf2be754f67ed31f185ce39f59c2ad5eaf465b550b337435507a
-EBUILD mutt-1.5.20-r4.ebuild 8442 RMD160 b8e5a90fa48cb236f31e69dddb63ba7078f2dd5d SHA1 88f66d53c60f431173ac86c7c1ca5888879e9e7c SHA256 ddfda6ec2a6649f05b36e492b5237feaf64546c758e1c8bfd0a600af8b25ee80
-EBUILD mutt-1.5.20-r6.ebuild 8728 RMD160 eaa1fe9cca6954c0d4dbfb92596b42741c2c6198 SHA1 5563d95b4f885f47bd3f9d1c29493f754bbfadc3 SHA256 795bff0f6a9ed1a9725702d2a281600804188d4b02c2d3e2a82702e4a4946df5
-MISC ChangeLog 40028 RMD160 3b9c1a189e99a05111d501305a0582b4c926bf21 SHA1 5197a0bb622b0bf44ed4e455f5de7704ed870590 SHA256 392a3452a6d89d30394673ce900e40c35c6ece983ff6138f74fb83b2cbf28c80
+EBUILD mutt-1.5.20-r10.ebuild 7956 RMD160 2e132515fe6fa4ebf178f09a09650272d8ca23a0 SHA1 cb1d70b06b9ad23bd2c8acd592b0481d259f47bf SHA256 f69188511d58a4d2f4fc9255e7bcc95a18e135f773550d9f8126c622d651f187
+EBUILD mutt-1.5.20-r13.ebuild 7708 RMD160 46030c076857011f954bd2ff732d76c81cb59f32 SHA1 1f2b5ef61c6a0bbbf275e5872606eb18e3d576a3 SHA256 254122fcdbaa55a43155bbbb1b9285330282ee9d5e2a9d34bfba4926a4427e12
+EBUILD mutt-1.5.20-r14.ebuild 7766 RMD160 27f9059d4da66a38ef6181b2daf1b732b5d673d1 SHA1 4fd711aa168bae2e0c503d04d1ea4bd6cafaa13c SHA256 5feca9be731c229f5f8ccd525e998e871036371f3616ec575008576f86a47d95
+EBUILD mutt-1.5.20-r6.ebuild 7278 RMD160 13f7c5b0a8ce9af13b3c04d0e258bf1ac568bbc9 SHA1 8df8afbd9326c0d66453dddd0a833557dd070ad2 SHA256 bddd72973cb7c74b0528fb1e5bc75be8eeb2833b92f4d3cd0f45f277f847d7b6
+MISC ChangeLog 42791 RMD160 4de6ab875b87e692c6b616a20eb3e2f77cbf4c04 SHA1 4da0dbf1a7db628497ad747bdcd4f492a8cb54e8 SHA256 1c83daf09aad3a8481d0a4f84c0cac16daeba271641f50562377e74cd5fcd994
MISC metadata.xml 650 RMD160 499b30bbf757e578b8546c72c9d22e033bad1fd0 SHA1 0ad0c9dc1d2a2a1b9da1e32d2f3e056e5b0e6d98 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320
+++ /dev/null
-http://dev.mutt.org/trac/changeset/15c662a95b91
-
-Index: configure.ac
-===================================================================
---- configure.ac (revision 5862:16592f0dfdaf)
-+++ configure.ac (revision 5865:15c662a95b91)
-@@ -650,5 +650,5 @@
- dnl -- end imap dependencies --
-
--AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl@<:@=PFX@:>@], [Compile in SSL support for POP/IMAP/SMTP using OpenSSL]),
-+AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl@<:@=PFX@:>@], [Enable TLS support using OpenSSL]),
- [ if test "$with_ssl" != "no"
- then
-@@ -683,5 +683,5 @@
- ])
-
--AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls@<:@=PFX@:>@], [Compile in SSL support for POP/IMAP/SMTP using gnutls]),
-+AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls@<:@=PFX@:>@], [enable TLS support using gnutls]),
- [gnutls_prefix="$withval"], [gnutls_prefix="no"])
- if test "$gnutls_prefix" != "no" && test x"$need_ssl" != xyes
-@@ -691,19 +691,28 @@
- AC_MSG_WARN([SSL support is only useful with POP, IMAP or SMTP support])
- else
-- MUTT_AM_PATH_GNUTLS([$gnutls_prefix],
-+ if test "$gnutls_prefix" != "yes"
-+ then
-+ LDFLAGS="$LDFLAGS -L$gnutls_prefix/lib"
-+ CPPFLAGS="$CPPFLAGS -I$gnutls_prefix/include"
-+ fi
-+ saved_LIBS="$LIBS"
-+
-+ AC_CHECK_LIB(gnutls, gnutls_check_version,
- [dnl GNUTLS found
-- CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
-- MUTTLIBS="$MUTTLIBS $LIBGNUTLS_LIBS"
--
-- AC_DEFINE(USE_SSL,1,[ Define if you want support for SSL. ])
-- AC_DEFINE(USE_SSL_GNUTLS,1,[ Define if you want support for SSL via GNUTLS. ])
-+ AC_CHECK_DECLS([GNUTLS_VERIFY_DISABLE_TIME_CHECKS], [], [],
-+ [[#include <gnutls/x509.h>]])
-+
-+ LIBS="$saved_LIBS"
-+ MUTTLIBS="$MUTTLIBS -lgnutls"
-+
-+ AC_DEFINE(USE_SSL, 1, [ Define if you want support for SSL. ])
-+ AC_DEFINE(USE_SSL_GNUTLS, 1, [ Define if you want support for SSL via GNUTLS. ])
-
- MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_gnutls.o"
- need_ssl=yes],
-- [dnl GNUTLS not found
-- AC_MSG_ERROR([could not find libgnutls])
-- ])
-+ [AC_MSG_ERROR([could not find libgnutls])])
- fi
- fi
-+
- AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
-
-Index: 4/libgnutls.m4
-===================================================================
---- m4/libgnutls.m4 (revision 3891:edccac2079c8)
-+++ (revision )
-@@ -1,162 +1,0 @@
--dnl Autoconf macros for libgnutls
--dnl $id$
--
--# Modified for mutt 20050210 Brendan Cully
--# Modified for LIBGNUTLS -- nmav
--# Configure paths for LIBGCRYPT
--# Shamelessly stolen from the one of XDELTA by Owen Taylor
--# Werner Koch 99-12-09
--
--dnl MUTT_AM_PATH_GNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
--dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
--dnl
--AC_DEFUN([MUTT_AM_PATH_GNUTLS],
--[dnl
--dnl Get the cflags and libraries from the libgnutls-config script
--dnl
-- libgnutls_config_prefix=$1
-- min_libgnutls_version=0.1.0
--
-- if test x$libgnutls_config_prefix != x ; then
-- if test x${LIBGNUTLS_CONFIG+set} != xset ; then
-- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
-- fi
-- fi
--
-- AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
-- AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
-- no_libgnutls=""
-- if test "$LIBGNUTLS_CONFIG" = "no" ; then
-- no_libgnutls=yes
-- else
-- LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
-- LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
-- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
--
--
-- ac_save_CFLAGS="$CFLAGS"
-- ac_save_LIBS="$LIBS"
-- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-- LIBS="$LIBS $LIBGNUTLS_LIBS"
--
--dnl
--dnl Now check if the installed libgnutls is sufficiently new. Also sanity
--dnl checks the results of libgnutls-config to some extent
--dnl
-- rm -f conf.libgnutlstest
-- AC_TRY_RUN([
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <gnutls/gnutls.h>
--
--int
--main ()
--{
-- system ("touch conf.libgnutlstest");
--
-- if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
-- {
-- printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
-- "$libgnutls_config_version", gnutls_check_version(NULL) );
-- printf("*** was found! If libgnutls-config was correct, then it is best\n");
-- printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
-- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-- printf("*** required on your system.\n");
-- printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
-- printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
-- printf("*** before re-running configure\n");
-- }
-- else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
-- {
-- printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
-- printf("*** library (version %s)\n", gnutls_check_version(NULL) );
-- }
-- else
-- {
-- if ( gnutls_check_version( "$min_libgnutls_version" ) )
-- {
-- return 0;
-- }
-- else
-- {
-- printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
-- gnutls_check_version(NULL) );
-- printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
-- "$min_libgnutls_version" );
-- printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
-- printf("*** \n");
-- printf("*** If you have already installed a sufficiently new version, this error\n");
-- printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
-- printf("*** being found. The easiest way to fix this is to remove the old version\n");
-- printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
-- printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
-- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-- printf("*** so that the correct libraries are found at run-time))\n");
-- }
-- }
-- return 1;
--}
--],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-- CFLAGS="$ac_save_CFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
--
-- if test "x$no_libgnutls" = x ; then
-- AC_MSG_RESULT(yes)
-- dnl some openssl compatibility code was moved in gnutls 1.2
-- AC_CHECK_HEADERS([gnutls/openssl.h])
-- ifelse([$2], , :, [$2])
-- else
-- if test -f conf.libgnutlstest ; then
-- :
-- else
-- AC_MSG_RESULT(no)
-- fi
-- if test "$LIBGNUTLS_CONFIG" = "no" ; then
-- echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
-- echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
-- echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
-- echo "*** full path to libgnutls-config."
-- else
-- if test -f conf.libgnutlstest ; then
-- :
-- else
-- echo "*** Could not run libgnutls test program, checking why..."
-- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
-- LIBS="$LIBS $LIBGNUTLS_LIBS"
-- AC_TRY_LINK([
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <gnutls/gnutls.h>
--], [ return !!gnutls_check_version(NULL); ],
-- [ echo "*** The test program compiled, but did not run. This usually means"
-- echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
-- echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
-- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-- echo "*** to the installed location Also, make sure you have run ldconfig if that"
-- echo "*** is required on your system"
-- echo "***"
-- echo "*** If you have an old version installed, it is best to remove it, although"
-- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-- echo "***" ],
-- [ echo "*** The test program failed to compile or link. See the file config.log for the"
-- echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
-- echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
-- echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
-- CFLAGS="$ac_save_CFLAGS"
-- LIBS="$ac_save_LIBS"
-- fi
-- fi
-- LIBGNUTLS_CFLAGS=""
-- LIBGNUTLS_LIBS=""
-- ifelse([$3], , :, [$3])
-- fi
-- rm -f conf.libgnutlstest
-- AC_SUBST(LIBGNUTLS_CFLAGS)
-- AC_SUBST(LIBGNUTLS_LIBS)
--])
--
--dnl *-*wedit:notab*-* Please keep this as the last line.
+++ /dev/null
-http://thread.gmane.org/gmane.comp.security.oss.general/1847
-http://bugs.gentoo.org/show_bug.cgi?id=274488
-
-whitespace-only hunks removed
-removed mutt_read_line change hunk, thanks Martin Jansa (bug #274603)
-
-Index: mutt_ssl_gnutls.c
-===================================================================
---- mutt_ssl_gnutls.c (revision 5623:7d0583e0315d)
-+++ mutt_ssl_gnutls.c (revision 5853:0b13183e40e0)
-@@ -34,4 +34,13 @@
- #include "mutt_regex.h"
-
-+/* certificate error bitmap values */
-+#define CERTERR_VALID 0
-+#define CERTERR_EXPIRED 1
-+#define CERTERR_NOTYETVALID 2
-+#define CERTERR_REVOKED 4
-+#define CERTERR_NOTTRUSTED 8
-+#define CERTERR_HOSTNAME 16
-+#define CERTERR_SIGNERNOTCA 32
-+
- typedef struct _tlssockdata
- {
-@@ -409,5 +418,5 @@
-
- b64_data.size = fread(b64_data.data, 1, b64_data.size, fd1);
-- fclose(fd1);
-+ safe_fclose (&fd1);
-
- do {
-@@ -518,5 +527,5 @@
- regfree(&preg);
- FREE(&linestr);
-- fclose(fp);
-+ safe_fclose (&fp);
- return 1;
- }
-@@ -526,9 +535,113 @@
-
- regfree(&preg);
-- fclose(fp);
-+ safe_fclose (&fp);
- }
-
- /* not found a matching name */
- return 0;
-+}
-+
-+static int tls_check_preauth (const gnutls_datum_t *certdata,
-+ gnutls_certificate_status certstat,
-+ const char *hostname, int chainidx, int* certerr,
-+ int* savedcert)
-+{
-+ gnutls_x509_crt cert;
-+
-+ *certerr = CERTERR_VALID;
-+ *savedcert = 0;
-+
-+ if (gnutls_x509_crt_init (&cert) < 0)
-+ {
-+ mutt_error (_("Error initialising gnutls certificate data"));
-+ mutt_sleep (2);
-+ return -1;
-+ }
-+
-+ if (gnutls_x509_crt_import (cert, certdata, GNUTLS_X509_FMT_DER) < 0)
-+ {
-+ mutt_error (_("Error processing certificate data"));
-+ mutt_sleep (2);
-+ gnutls_x509_crt_deinit (cert);
-+ return -1;
-+ }
-+
-+ if (option (OPTSSLVERIFYDATES) != M_NO)
-+ {
-+ if (gnutls_x509_crt_get_expiration_time (cert) < time(NULL))
-+ *certerr |= CERTERR_EXPIRED;
-+ if (gnutls_x509_crt_get_activation_time (cert) > time(NULL))
-+ *certerr |= CERTERR_NOTYETVALID;
-+ }
-+
-+ if (chainidx == 0 && option (OPTSSLVERIFYHOST) != M_NO
-+ && !gnutls_x509_crt_check_hostname (cert, hostname)
-+ && !tls_check_stored_hostname (certdata, hostname))
-+ *certerr |= CERTERR_HOSTNAME;
-+
-+ /* see whether certificate is in our cache (certificates file) */
-+ if (tls_compare_certificates (certdata))
-+ {
-+ *savedcert = 1;
-+
-+ if (chainidx == 0 && certstat & GNUTLS_CERT_INVALID)
-+ {
-+ /* doesn't matter - have decided is valid because server
-+ certificate is in our trusted cache */
-+ certstat ^= GNUTLS_CERT_INVALID;
-+ }
-+
-+ if (chainidx == 0 && certstat & GNUTLS_CERT_SIGNER_NOT_FOUND)
-+ {
-+ /* doesn't matter that we haven't found the signer, since
-+ certificate is in our trusted cache */
-+ certstat ^= GNUTLS_CERT_SIGNER_NOT_FOUND;
-+ }
-+
-+ if (chainidx <= 1 && certstat & GNUTLS_CERT_SIGNER_NOT_CA)
-+ {
-+ /* Hmm. Not really sure how to handle this, but let's say
-+ that we don't care if the CA certificate hasn't got the
-+ correct X.509 basic constraints if server or first signer
-+ certificate is in our cache. */
-+ certstat ^= GNUTLS_CERT_SIGNER_NOT_CA;
-+ }
-+ }
-+
-+ if (certstat & GNUTLS_CERT_REVOKED)
-+ {
-+ *certerr |= CERTERR_REVOKED;
-+ certstat ^= GNUTLS_CERT_REVOKED;
-+ }
-+
-+ if (certstat & GNUTLS_CERT_INVALID)
-+ {
-+ *certerr |= CERTERR_NOTTRUSTED;
-+ certstat ^= GNUTLS_CERT_INVALID;
-+ }
-+
-+ if (certstat & GNUTLS_CERT_SIGNER_NOT_FOUND)
-+ {
-+ /* NB: already cleared if cert in cache */
-+ *certerr |= CERTERR_NOTTRUSTED;
-+ certstat ^= GNUTLS_CERT_SIGNER_NOT_FOUND;
-+ }
-+
-+ if (certstat & GNUTLS_CERT_SIGNER_NOT_CA)
-+ {
-+ /* NB: already cleared if cert in cache */
-+ *certerr |= CERTERR_SIGNERNOTCA;
-+ certstat ^= GNUTLS_CERT_SIGNER_NOT_CA;
-+ }
-+
-+ gnutls_x509_crt_deinit (cert);
-+
-+ /* we've been zeroing the interesting bits in certstat -
-+ don't return OK if there are any unhandled bits we don't
-+ understand */
-+ if (*certerr == CERTERR_VALID && certstat == 0)
-+ return 0;
-+
-+ return -1;
- }
-
-@@ -537,11 +650,6 @@
- const char* hostname, int idx, int len)
- {
-+ int certerr, savedcert;
- gnutls_x509_crt cert;
-- int certerr_hostname = 0;
-- int certerr_expired = 0;
-- int certerr_notyetvalid = 0;
-- int certerr_nottrusted = 0;
-- int certerr_revoked = 0;
-- int certerr_signernotca = 0;
- char buf[SHORT_STRING];
- char fpbuf[SHORT_STRING];
-@@ -563,4 +671,9 @@
- int i, row, done, ret;
-
-+ if (!tls_check_preauth (certdata, certstat, hostname, idx, &certerr,
-+ &savedcert))
-+ return 1;
-+
-+ /* interactive check from user */
- if (gnutls_x509_crt_init (&cert) < 0)
- {
-@@ -569,5 +682,5 @@
- return 0;
- }
--
-+
- if (gnutls_x509_crt_import (cert, certdata, GNUTLS_X509_FMT_DER) < 0)
- {
-@@ -577,82 +690,5 @@
- return -1;
- }
--
-- if (gnutls_x509_crt_get_expiration_time (cert) < time(NULL))
-- certerr_expired = 1;
-- if (gnutls_x509_crt_get_activation_time (cert) > time(NULL))
-- certerr_notyetvalid = 1;
--
-- if (!idx)
-- {
-- if (!gnutls_x509_crt_check_hostname (cert, hostname) &&
-- !tls_check_stored_hostname (certdata, hostname))
-- certerr_hostname = 1;
-- }
--
-- /* see whether certificate is in our cache (certificates file) */
-- if (tls_compare_certificates (certdata))
-- {
-- if (certstat & GNUTLS_CERT_INVALID)
-- {
-- /* doesn't matter - have decided is valid because server
-- certificate is in our trusted cache */
-- certstat ^= GNUTLS_CERT_INVALID;
-- }
--
-- if (certstat & GNUTLS_CERT_SIGNER_NOT_FOUND)
-- {
-- /* doesn't matter that we haven't found the signer, since
-- certificate is in our trusted cache */
-- certstat ^= GNUTLS_CERT_SIGNER_NOT_FOUND;
-- }
--
-- if (certstat & GNUTLS_CERT_SIGNER_NOT_CA)
-- {
-- /* Hmm. Not really sure how to handle this, but let's say
-- that we don't care if the CA certificate hasn't got the
-- correct X.509 basic constraints if server certificate is
-- in our cache. */
-- certstat ^= GNUTLS_CERT_SIGNER_NOT_CA;
-- }
-- }
--
-- if (certstat & GNUTLS_CERT_REVOKED)
-- {
-- certerr_revoked = 1;
-- certstat ^= GNUTLS_CERT_REVOKED;
-- }
--
-- if (certstat & GNUTLS_CERT_INVALID)
-- {
-- certerr_nottrusted = 1;
-- certstat ^= GNUTLS_CERT_INVALID;
-- }
--
-- if (certstat & GNUTLS_CERT_SIGNER_NOT_FOUND)
-- {
-- /* NB: already cleared if cert in cache */
-- certerr_nottrusted = 1;
-- certstat ^= GNUTLS_CERT_SIGNER_NOT_FOUND;
-- }
--
-- if (certstat & GNUTLS_CERT_SIGNER_NOT_CA)
-- {
-- /* NB: already cleared if cert in cache */
-- certerr_signernotca = 1;
-- certstat ^= GNUTLS_CERT_SIGNER_NOT_CA;
-- }
--
-- /* OK if signed by (or is) a trusted certificate */
-- /* we've been zeroing the interesting bits in certstat -
-- don't return OK if there are any unhandled bits we don't
-- understand */
-- if (!(certerr_expired || certerr_notyetvalid ||
-- certerr_hostname || certerr_nottrusted) && certstat == 0)
-- {
-- gnutls_x509_crt_deinit (cert);
-- return 1;
-- }
--
-- /* interactive check from user */
-+
- menu = mutt_new_menu (-1);
- menu->max = 25;
-@@ -756,26 +792,26 @@
- tls_fingerprint (GNUTLS_DIG_MD5, fpbuf, sizeof (fpbuf), certdata);
- snprintf (menu->dialog[row++], SHORT_STRING, _("MD5 Fingerprint: %s"), fpbuf);
--
-- if (certerr_notyetvalid)
-+
-+ if (certerr & CERTERR_NOTYETVALID)
- {
- row++;
- strfcpy (menu->dialog[row], _("WARNING: Server certificate is not yet valid"), SHORT_STRING);
- }
-- if (certerr_expired)
-+ if (certerr & CERTERR_EXPIRED)
- {
- row++;
- strfcpy (menu->dialog[row], _("WARNING: Server certificate has expired"), SHORT_STRING);
- }
-- if (certerr_revoked)
-+ if (certerr & CERTERR_REVOKED)
- {
- row++;
- strfcpy (menu->dialog[row], _("WARNING: Server certificate has been revoked"), SHORT_STRING);
- }
-- if (certerr_hostname)
-+ if (certerr & CERTERR_HOSTNAME)
- {
- row++;
- strfcpy (menu->dialog[row], _("WARNING: Server hostname does not match certificate"), SHORT_STRING);
- }
-- if (certerr_signernotca)
-+ if (certerr & CERTERR_SIGNERNOTCA)
- {
- row++;
-@@ -789,5 +825,7 @@
- /* certificates with bad dates, or that are revoked, must be
- accepted manually each and every time */
-- if (SslCertFile && !certerr_expired && !certerr_notyetvalid && !certerr_revoked)
-+ if (SslCertFile && !savedcert
-+ && !(certerr & (CERTERR_EXPIRED | CERTERR_NOTYETVALID
-+ | CERTERR_REVOKED)))
- {
- menu->prompt = _("(r)eject, accept (o)nce, (a)ccept always");
-@@ -823,10 +861,10 @@
- {
- /* save hostname if necessary */
-- if (certerr_hostname)
-+ if (certerr & CERTERR_HOSTNAME)
- {
- fprintf(fp, "#H %s %s\n", hostname, fpbuf);
- done = 1;
- }
-- if (certerr_nottrusted)
-+ if (certerr & CERTERR_NOTTRUSTED)
- {
- done = 0;
-@@ -842,5 +880,5 @@
- }
- }
-- fclose (fp);
-+ safe_fclose (&fp);
- }
- if (!done)
-@@ -867,4 +905,38 @@
- }
-
-+/* sanity-checking wrapper for gnutls_certificate_verify_peers */
-+static gnutls_certificate_status tls_verify_peers (gnutls_session tlsstate)
-+{
-+ gnutls_certificate_status certstat;
-+
-+ certstat = gnutls_certificate_verify_peers (tlsstate);
-+ if (!certstat)
-+ return certstat;
-+
-+ if (certstat == GNUTLS_E_NO_CERTIFICATE_FOUND)
-+ {
-+ mutt_error (_("Unable to get certificate from peer"));
-+ mutt_sleep (2);
-+ return 0;
-+ }
-+ if (certstat < 0)
-+ {
-+ mutt_error (_("Certificate verification error (%s)"),
-+ gnutls_strerror (certstat));
-+ mutt_sleep (2);
-+ return 0;
-+ }
-+
-+ /* We only support X.509 certificates (not OpenPGP) at the moment */
-+ if (gnutls_certificate_type_get (tlsstate) != GNUTLS_CRT_X509)
-+ {
-+ mutt_error (_("Certificate is not X.509"));
-+ mutt_sleep (2);
-+ return 0;
-+ }
-+
-+ return certstat;
-+}
-+
- static int tls_check_certificate (CONNECTION* conn)
- {
-@@ -874,5 +946,5 @@
- unsigned int cert_list_size = 0;
- gnutls_certificate_status certstat;
-- int i, rc;
-+ int certerr, i, preauthrc, savedcert, rc = 0;
-
- if (gnutls_auth_get_type (state) != GNUTLS_CRD_CERTIFICATE)
-@@ -883,27 +955,5 @@
- }
-
-- certstat = gnutls_certificate_verify_peers (state);
--
-- if (certstat == GNUTLS_E_NO_CERTIFICATE_FOUND)
-- {
-- mutt_error (_("Unable to get certificate from peer"));
-- mutt_sleep (2);
-- return 0;
-- }
-- if (certstat < 0)
-- {
-- mutt_error (_("Certificate verification error (%s)"),
-- gnutls_strerror (certstat));
-- mutt_sleep (2);
-- return 0;
-- }
--
-- /* We only support X.509 certificates (not OpenPGP) at the moment */
-- if (gnutls_certificate_type_get (state) != GNUTLS_CRT_X509)
-- {
-- mutt_error (_("Certificate is not X.509"));
-- mutt_sleep (2);
-- return 0;
-- }
-+ certstat = tls_verify_peers (state);
-
- cert_list = gnutls_certificate_get_peers (state, &cert_list_size);
-@@ -915,12 +965,41 @@
- }
-
-+ /* tls_verify_peers doesn't check hostname or expiration, so walk
-+ * from most specific to least checking these. If we see a saved certificate,
-+ * its status short-circuits the remaining checks. */
-+ preauthrc = 0;
-+ for (i = 0; i < cert_list_size; i++) {
-+ rc = tls_check_preauth(&cert_list[i], certstat, conn->account.host, i,
-+ &certerr, &savedcert);
-+ preauthrc += rc;
-+
-+ if (savedcert)
-+ {
-+ if (!preauthrc)
-+ return 1;
-+ else
-+ break;
-+ }
-+ }
-+
-+ /* then check interactively, starting from chain root */
- for (i = cert_list_size - 1; i >= 0; i--)
- {
- rc = tls_check_one_certificate (&cert_list[i], certstat, conn->account.host,
- i, cert_list_size);
-- if (rc)
-- return rc;
-- }
--
-- return 0;
--}
-+
-+ /* add signers to trust set, then reverify */
-+ if (i && rc) {
-+ rc = gnutls_certificate_set_x509_trust_mem (data->xcred, &cert_list[i],
-+ GNUTLS_X509_FMT_DER);
-+ if (rc != 1)
-+ dprint (1, (debugfile, "error trusting certificate %d: %d\n", i, rc));
-+
-+ certstat = tls_verify_peers (state);
-+ if (!certstat)
-+ return 1;
-+ }
-+ }
-+
-+ return rc;
-+}
+++ /dev/null
-http://thread.gmane.org/gmane.comp.security.oss.general/1847
-http://bugs.gentoo.org/show_bug.cgi?id=274488
-
-whitespace-only hunks removed
-
-Index: init.h
-===================================================================
---- init.h (revision 5639:e3af935cdb1a)
-+++ init.h (revision 5665:b6b37a6a7f72)
-@@ -2145,4 +2145,20 @@
- ** advertising the capability. When \fIunset\fP, mutt will not attempt to
- ** use \fCSTARTTLS\fP regardless of the server's capabilities.
-+ */
-+ { "ssl_verify_dates", DT_BOOL, R_NONE, OPTSSLVERIFYDATES, M_YES },
-+ /*
-+ ** .pp
-+ ** If \fIset\fP (the default), mutt will not automatically accept a server
-+ ** certificate that is either not yet valid or already expired. You should
-+ ** only unset this for particular known hosts, using the
-+ ** \fC$<account-hook>\fP function.
-+ */
-+ { "ssl_verify_host", DT_BOOL, R_NONE, OPTSSLVERIFYHOST, M_YES },
-+ /*
-+ ** .pp
-+ ** If \fIset\fP (the default), mutt will not automatically accept a server
-+ ** certificate whose host name does not match the host used in your folder
-+ ** URL. You should only unset this for particular known hosts, using
-+ ** the \fC$<account-hook>\fP function.
- */
- { "certificate_file", DT_PATH, R_NONE, UL &SslCertFile, UL "~/.mutt_certificates" },
-Index: mutt.h
-===================================================================
---- mutt.h (revision 5535:2050b44407bf)
-+++ mutt.h (revision 5665:b6b37a6a7f72)
-@@ -371,4 +371,6 @@
- OPTTLSV1,
- OPTSSLFORCETLS,
-+ OPTSSLVERIFYDATES,
-+ OPTSSLVERIFYHOST,
- #endif /* defined(USE_SSL) */
- OPTIMPLICITAUTOVIEW,
-Index: mutt_ssl.c
-===================================================================
---- mutt_ssl.c (revision 5622:3af7e8af1983)
-+++ mutt_ssl.c (revision 5870:dc9ec900c657)
-@@ -565,17 +565,20 @@
-
- /* expiration check */
-- if (X509_cmp_current_time (X509_get_notBefore (peercert)) >= 0)
-- {
-- dprint (2, (debugfile, "Server certificate is not yet valid\n"));
-- mutt_error (_("Server certificate is not yet valid"));
-- mutt_sleep (2);
-- return 0;
-- }
-- if (X509_cmp_current_time (X509_get_notAfter (peercert)) <= 0)
-- {
-- dprint (2, (debugfile, "Server certificate has expired"));
-- mutt_error (_("Server certificate has expired"));
-- mutt_sleep (2);
-- return 0;
-+ if (option (OPTSSLVERIFYDATES) != M_NO)
-+ {
-+ if (X509_cmp_current_time (X509_get_notBefore (peercert)) >= 0)
-+ {
-+ dprint (2, (debugfile, "Server certificate is not yet valid\n"));
-+ mutt_error (_("Server certificate is not yet valid"));
-+ mutt_sleep (2);
-+ return 0;
-+ }
-+ if (X509_cmp_current_time (X509_get_notAfter (peercert)) <= 0)
-+ {
-+ dprint (2, (debugfile, "Server certificate has expired"));
-+ mutt_error (_("Server certificate has expired"));
-+ mutt_sleep (2);
-+ return 0;
-+ }
- }
-
-@@ -585,5 +588,5 @@
- if (!X509_digest (peercert, EVP_sha1(), peermd, &peermdlen))
- {
-- fclose (fp);
-+ safe_fclose (&fp);
- return 0;
- }
-@@ -592,10 +595,10 @@
- {
- pass = compare_certificates (cert, peercert, peermd, peermdlen) ? 0 : 1;
--
-+
- if (pass)
- break;
- }
- X509_free (cert);
-- fclose (fp);
-+ safe_fclose (&fp);
-
- return pass;
-@@ -737,6 +740,8 @@
- }
-
--/* check whether cert is preauthorized */
--static int ssl_check_preauth (X509 *cert, CONNECTION *conn)
-+/* check whether cert is preauthorized. If host is not null, verify that
-+ * it matches the certificate.
-+ * Return > 0: authorized, < 0: problems, 0: unknown validity */
-+static int ssl_check_preauth (X509 *cert, const char* host)
- {
- char buf[SHORT_STRING];
-@@ -750,11 +755,14 @@
-
- buf[0] = 0;
-- if (!check_host (cert, conn->account.host, buf, sizeof (buf)))
-- {
-- mutt_error (_("Certificate host check failed: %s"), buf);
-- mutt_sleep (2);
-- return -1;
-- }
-- dprint (2, (debugfile, "ssl_check_preauth: hostname check passed\n"));
-+ if (host && option (OPTSSLVERIFYHOST) != M_NO)
-+ {
-+ if (!check_host (cert, host, buf, sizeof (buf)))
-+ {
-+ mutt_error (_("Certificate host check failed: %s"), buf);
-+ mutt_sleep (2);
-+ return -1;
-+ }
-+ dprint (2, (debugfile, "ssl_check_preauth: hostname check passed\n"));
-+ }
-
- if (check_certificate_by_signer (cert))
-@@ -780,42 +788,28 @@
- X509 *cert;
-
-- if ((preauthrc = ssl_check_preauth (data->cert, conn)) > 0)
-+ if ((preauthrc = ssl_check_preauth (data->cert, conn->account.host)) > 0)
- return preauthrc;
-
- chain = SSL_get_peer_cert_chain (data->ssl);
- chain_len = sk_X509_num (chain);
-- if (!chain || (chain_len < 1))
-+ /* negative preauthrc means the certificate won't be accepted without
-+ * manual override. */
-+ if (preauthrc < 0 || !chain || (chain_len <= 1))
- return interactive_check_cert (data->cert, 0, 0);
-
-- /* check the chain from root to peer */
-+ /* check the chain from root to peer. */
- for (i = chain_len-1; i >= 0; i--)
- {
- cert = sk_X509_value (chain, i);
-- if (check_certificate_cache (cert))
-- dprint (2, (debugfile, "ssl chain: already cached: %s\n", cert->name));
-- else if (i /* 0 is the peer */ || !preauthrc)
-- {
-- if (check_certificate_by_signer (cert))
-- {
-- dprint (2, (debugfile, "ssl chain: checked by signer: %s\n", cert->name));
-- ssl_cache_trusted_cert (cert);
-+
-+ /* if the certificate validates or is manually accepted, then add it to
-+ * the trusted set and recheck the peer certificate */
-+ if (ssl_check_preauth (cert, NULL)
-+ || interactive_check_cert (cert, i, chain_len))
-+ {
-+ ssl_cache_trusted_cert (cert);
-+ if (ssl_check_preauth (data->cert, conn->account.host))
- return 1;
-- }
-- else if (SslCertFile && check_certificate_by_digest (cert))
-- {
-- dprint (2, (debugfile, "ssl chain: trusted with file: %s\n", cert->name));
-- ssl_cache_trusted_cert (cert);
-- return 1;
-- }
-- else /* allow users to shoot their foot */
-- {
-- dprint (2, (debugfile, "ssl chain: check failed: %s\n", cert->name));
-- if (interactive_check_cert (cert, i, chain_len))
-- return 1;
-- }
-- }
-- else /* highly suspicious because (i==0 && preauthrc < 0) */
-- if (interactive_check_cert (cert, i, chain_len))
-- return 1;
-+ }
- }
-
-@@ -882,6 +876,8 @@
- len - idx, len);
- menu->title = title;
-- if (SslCertFile && X509_cmp_current_time (X509_get_notAfter (cert)) >= 0
-- && X509_cmp_current_time (X509_get_notBefore (cert)) < 0)
-+ if (SslCertFile
-+ && (option (OPTSSLVERIFYDATES) == M_NO
-+ || (X509_cmp_current_time (X509_get_notAfter (cert)) >= 0
-+ && X509_cmp_current_time (X509_get_notBefore (cert)) < 0)))
- {
- menu->prompt = _("(r)eject, accept (o)nce, (a)ccept always");
-@@ -893,5 +889,5 @@
- menu->keys = _("ro");
- }
--
-+
- helpstr[0] = '\0';
- mutt_make_help (buf, sizeof (buf), _("Exit "), MENU_GENERIC, OP_EXIT);
-@@ -918,5 +914,5 @@
- if (PEM_write_X509 (fp, cert))
- done = 1;
-- fclose (fp);
-+ safe_fclose (&fp);
- }
- if (!done)
+++ /dev/null
-http://dev.mutt.org/trac/changeset/c837ab790d2e
-http://dev.mutt.org/trac/ticket/1860
-
-Abort prompt on ^C, as was the case prior to 12a6de725483
-
-
-Index: curs_lib.c
-===================================================================
---- curs_lib.c (revision 5981:cff8e8ce4327)
-+++ curs_lib.c (revision 6010:c837ab790d2e)
-@@ -99,5 +99,8 @@
-
- if (SigInt)
-+ {
- mutt_query_exit ();
-+ return err;
-+ }
-
- if(ch == ERR)
+++ /dev/null
-http://dev.mutt.org/trac/changeset/b2b97c7a2ae6
-http://dev.mutt.org/trac/ticket/3381
-
-Set internaldate of messages appended to IMAP mailboxes
-
-
-Index: imap/imap_private.h
-===================================================================
---- imap/imap_private.h (revision 5661:b1488cf4f14c)
-+++ imap/imap_private.h (revision 5949:b2b97c7a2ae6)
-@@ -70,4 +70,7 @@
- #define IMAP_CMD_PASS (1<<1)
- #define IMAP_CMD_QUEUE (1<<2)
-+
-+/* length of "DD-MMM-YYYY HH:MM:SS +ZZzz" (null-terminated) */
-+#define IMAP_DATELEN 27
-
- enum
-@@ -282,4 +285,5 @@
- char* imap_next_word (char* s);
- time_t imap_parse_date (char* s);
-+void imap_make_date (char* buf, time_t timestamp);
- void imap_qualify_path (char *dest, size_t len, IMAP_MBOX *mx, char* path);
- void imap_quote_string (char* dest, size_t slen, const char* src);
-Index: imap/message.c
-===================================================================
---- imap/message.c (revision 5930:ed7eb5de7536)
-+++ imap/message.c (revision 5949:b2b97c7a2ae6)
-@@ -595,4 +595,5 @@
- char mbox[LONG_STRING];
- char mailbox[LONG_STRING];
-+ char internaldate[IMAP_DATELEN];
- size_t len;
- progress_t progressbar;
-@@ -636,5 +637,6 @@
-
- imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
-- snprintf (buf, sizeof (buf), "APPEND %s (%s%s%s%s%s) {%lu}", mbox,
-+ imap_make_date (internaldate, msg->received);
-+ snprintf (buf, sizeof (buf), "APPEND %s (%s%s%s%s%s) \"%s\" {%lu}", mbox,
- msg->flags.read ? "\\Seen" : "",
- msg->flags.read && (msg->flags.replied || msg->flags.flagged) ? " " : "",
-@@ -642,4 +644,5 @@
- msg->flags.replied && msg->flags.flagged ? " " : "",
- msg->flags.flagged ? "\\Flagged" : "",
-+ internaldate,
- (unsigned long) len);
-
-Index: imap/util.c
-===================================================================
---- imap/util.c (revision 5867:0fb94d6eee38)
-+++ imap/util.c (revision 5949:b2b97c7a2ae6)
-@@ -578,4 +578,19 @@
- }
-
-+/* format date in IMAP style: DD-MMM-YYYY HH:MM:SS +ZZzz.
-+ * Caller should provide a buffer of IMAP_DATELEN bytes */
-+void imap_make_date (char *buf, time_t timestamp)
-+{
-+ struct tm* tm = localtime (×tamp);
-+ time_t tz = mutt_local_tz (timestamp);
-+
-+ tz /= 60;
-+
-+ snprintf (buf, IMAP_DATELEN, "%02d-%s-%d %02d:%02d:%02d %+03d%02d",
-+ tm->tm_mday, Months[tm->tm_mon], tm->tm_year + 1900,
-+ tm->tm_hour, tm->tm_min, tm->tm_sec,
-+ (int) tz / 60, (int) abs (tz) % 60);
-+}
-+
- /* imap_qualify_path: make an absolute IMAP folder target, given IMAP_MBOX
- * and relative path. */
+++ /dev/null
-http://dev.mutt.org/trac/changeset/5908%3A7f37d0a57d83?format=diff&new=5908:7f37d0a57d83
-
-Display unsigned part of traditional PGP messages.
-Unbreaks [e2780a423d96], closes #3269
-
-Index: crypt-gpgme.c
-===================================================================
---- crypt-gpgme.c (revision 5801:19e62bd1549b)
-+++ crypt-gpgme.c (revision 5908:7f37d0a57d83)
-@@ -2372,8 +2372,7 @@
- }
- }
--#if 0
- else
- {
-- /* why would we want to display this at all? */
-+ /* A traditional PGP part may mix signed and unsigned content */
- /* XXX - we may wish to recode here */
- if (s->prefix)
-@@ -2381,5 +2380,4 @@
- state_puts (buf, s);
- }
--#endif
- }
-
-Index: pgp.c
-===================================================================
---- pgp.c (revision 5827:776ef9dbe4d2)
-+++ pgp.c (revision 5908:7f37d0a57d83)
-@@ -483,8 +483,7 @@
- }
- }
--#if 0
- else
- {
-- /* why would we want to display this at all? */
-+ /* A traditional PGP part may mix signed and unsigned content */
- /* XXX - we may wish to recode here */
- if (s->prefix)
-@@ -492,5 +491,4 @@
- state_puts (buf, s);
- }
--#endif
- }
-
+++ /dev/null
-http://dev.mutt.org/trac/ticket/3312
-http://dev.mutt.org/trac/changeset/14bb498c6a1c
-
-Fix MH parsing, fixes [0698e8195545]. Closes #3312
-
-Index: mh.c
-===================================================================
---- mh.c (revision 5999:2fc9348684fe)
-+++ mh.c (revision 6005:14bb498c6a1c)
-@@ -147,5 +147,5 @@
- {
- *p++ = '\0';
-- if (mutt_atoi (t, first) < 0 || mutt_atoi (t, last) < 0)
-+ if (mutt_atoi (t, first) < 0 || mutt_atoi (p, last) < 0)
- return -1;
- }
+++ /dev/null
-http://dev.mutt.org/trac/changeset/2c78b28027cc
-http://dev.mutt.org/trac/ticket/2180
-
-GPGME: Sender verification should be canse-insensitive for domain names.
-Closes #2180
-
-Index: crypt-gpgme.c
-===================================================================
---- crypt-gpgme.c (revision 5935:f5849c72a274)
-+++ crypt-gpgme.c (revision 6047:2c78b28027cc)
-@@ -4483,35 +4483,64 @@
-
- if (sender)
-- {
-- if (signature_key)
-+ {
-+ if (signature_key)
-+ {
-+ gpgme_key_t key = signature_key;
-+ gpgme_user_id_t uid = NULL;
-+ int sender_length = 0;
-+ int uid_length = 0;
-+
-+ sender_length = strlen (sender->mailbox);
-+ for (uid = key->uids; uid && ret; uid = uid->next)
-+ {
-+ uid_length = strlen (uid->email);
-+ if (1
-+ && (uid->email[0] == '<')
-+ && (uid->email[uid_length - 1] == '>')
-+ && (uid_length == sender_length + 2))
- {
-- gpgme_key_t key = signature_key;
-- gpgme_user_id_t uid = NULL;
-- int sender_length = 0;
-- int uid_length = 0;
--
-- sender_length = strlen (sender->mailbox);
-- for (uid = key->uids; uid && ret; uid = uid->next)
-- {
-- uid_length = strlen (uid->email);
-- if (1
-- && (uid->email[0] == '<')
-- && (uid->email[uid_length - 1] == '>')
-- && (uid_length == sender_length + 2)
-- && (! strncmp (uid->email + 1, sender->mailbox, sender_length)))
-- ret = 0;
-- }
-+ const char* at_sign = strchr(uid->email + 1, '@');
-+ if (at_sign == NULL)
-+ {
-+ if (! strncmp (uid->email + 1, sender->mailbox, sender_length))
-+ ret = 0;
-+ }
-+ else
-+ {
-+ /*
-+ * Assume address is 'mailbox@domainname'.
-+ * The mailbox part is case-sensitive,
-+ * the domainname is not. (RFC 2821)
-+ */
-+ const char* tmp_email = uid->email + 1;
-+ const char* tmp_sender = sender->mailbox;
-+ /* length of mailbox part including '@' */
-+ int mailbox_length = at_sign - tmp_email + 1;
-+ int domainname_length = sender_length - mailbox_length;
-+ int mailbox_match, domainname_match;
-+
-+ mailbox_match = (! strncmp (tmp_email, tmp_sender,
-+ mailbox_length));
-+ tmp_email += mailbox_length;
-+ tmp_sender += mailbox_length;
-+ domainname_match = (! strncasecmp (tmp_email, tmp_sender,
-+ domainname_length));
-+ if (mailbox_match && domainname_match)
-+ ret = 0;
-+ }
- }
-- else
-- mutt_any_key_to_continue (_("Failed to verify sender"));
-- }
-+ }
-+ }
-+ else
-+ mutt_any_key_to_continue (_("Failed to verify sender"));
-+ }
- else
- mutt_any_key_to_continue (_("Failed to figure out sender"));
-
- if (signature_key)
-- {
-- gpgme_key_release (signature_key);
-- signature_key = NULL;
-- }
-+ {
-+ gpgme_key_release (signature_key);
-+ signature_key = NULL;
-+ }
-
- return ret;
+++ /dev/null
-# HG changeset patch
-# User Fabian Groffen <grobian@gentoo.org>
-# Date 1248269159 -7200
-# Node ID d41e043fa7751bc0c82ecb767d756aa228f56db9
-# Parent 848f08512bf303292a8068d3fa074fda73edacd6
-Use CRYPT_BACKEND_GPGME instead of non-existent HAVE_GPGME
-
---- a/keymap.c Wed Jul 22 14:43:48 2009 +0200
-+++ b/keymap.c Wed Jul 22 15:25:59 2009 +0200
-@@ -47,7 +47,7 @@
- { "postpone", MENU_POST },
- { "pgp", MENU_PGP },
- { "smime", MENU_SMIME },
--#ifdef HAVE_GPGME
-+#ifdef CRYPT_BACKEND_GPGME
- { "key_select_pgp", MENU_KEY_SELECT_PGP },
- { "key_select_smime", MENU_KEY_SELECT_SMIME },
- #endif
-
+++ /dev/null
-http://dev.mutt.org/trac/changeset/848f08512bf3
-http://dev.mutt.org/trac/ticket/3302
-
-Properly restore addresses from hcache using rfc822_new_address().
-Closes #3302. (valgrind complaining about ADDRESS.idn_checked)
-
-Index: hcache.c
-===================================================================
---- hcache.c (revision 5977:f161c2f00d84)
-+++ hcache.c (revision 5986:848f08512bf3)
-@@ -46,4 +46,5 @@
- #include "lib.h"
- #include "md5.h"
-+#include "rfc822.h"
-
- #if HAVE_QDBM
-@@ -232,5 +233,5 @@
- while (counter)
- {
-- *a = safe_malloc(sizeof (ADDRESS));
-+ *a = rfc822_new_address();
- #ifdef EXACT_ADDRESS
- restore_char(&(*a)->val, d, off, convert);
-Index: rfc822.h
-===================================================================
---- rfc822.h (revision 5801:19e62bd1549b)
-+++ rfc822.h (revision 5986:848f08512bf3)
-@@ -19,4 +19,6 @@
- #ifndef rfc822_h
- #define rfc822_h
-+
-+#include "lib.h"
-
- /* possible values for RFC822Error */
-@@ -61,5 +63,5 @@
-
- #define rfc822_error(x) RFC822Errors[x]
--#define rfc822_new_address() calloc(1,sizeof(ADDRESS))
-+#define rfc822_new_address() safe_calloc(1,sizeof(ADDRESS))
-
- #endif /* rfc822_h */
+++ /dev/null
-http://dev.mutt.org/trac/changeset/a2a4286491b4
-http://dev.mutt.org/trac/ticket/3296
-
-Harmonize hcache uidvalidity size to unsigned int (per IMAP RFC).
-Closes #3296.
-
-
-Index: hcache.c
-===================================================================
---- hcache.c (revision 5986:848f08512bf3)
-+++ hcache.c (revision 6002:a2a4286491b4)
-@@ -87,5 +87,5 @@
- {
- struct timeval timeval;
-- unsigned long uid_validity;
-+ unsigned int uidvalidity;
- } validate;
-
-@@ -590,5 +590,5 @@
- static void *
- mutt_hcache_dump(header_cache_t *h, HEADER * header, int *off,
-- unsigned long uid_validity)
-+ unsigned int uidvalidity)
- {
- unsigned char *d = NULL;
-@@ -599,6 +599,6 @@
- d = lazy_malloc(sizeof (validate));
-
-- if (uid_validity)
-- memcpy(d, &uid_validity, sizeof (unsigned long));
-+ if (uidvalidity)
-+ memcpy(d, &uidvalidity, sizeof (uidvalidity));
- else
- {
-@@ -759,5 +759,5 @@
- int
- mutt_hcache_store(header_cache_t *h, const char *filename, HEADER * header,
-- unsigned long uid_validity,
-+ unsigned int uidvalidity,
- size_t(*keylen) (const char *fn))
- {
-@@ -769,5 +769,5 @@
- return -1;
-
-- data = mutt_hcache_dump(h, header, &dlen, uid_validity);
-+ data = mutt_hcache_dump(h, header, &dlen, uidvalidity);
- ret = mutt_hcache_store_raw (h, filename, data, dlen, keylen);
-
-Index: hcache.h
-===================================================================
---- hcache.h (revision 5224:010084b62288)
-+++ hcache.h (revision 6002:a2a4286491b4)
-@@ -34,6 +34,7 @@
- void *mutt_hcache_fetch_raw (header_cache_t *h, const char *filename,
- size_t (*keylen)(const char *fn));
-+/* uidvalidity is an IMAP-specific unsigned 32 bit number */
- int mutt_hcache_store(header_cache_t *h, const char *filename, HEADER *header,
-- unsigned long uid_validity, size_t (*keylen)(const char *fn));
-+ unsigned int uidvalidity, size_t (*keylen)(const char *fn));
- int mutt_hcache_store_raw (header_cache_t *h, const char* filename, void* data,
- size_t dlen, size_t(*keylen) (const char* fn));
-Index: imap/util.c
-===================================================================
---- imap/util.c (revision 5957:ecea9568202f)
-+++ imap/util.c (revision 6002:a2a4286491b4)
-@@ -130,4 +130,6 @@
- if (*uv == idata->uid_validity)
- h = mutt_hcache_restore ((unsigned char*)uv, NULL);
-+ else
-+ dprint (3, (debugfile, "hcache uidvalidity mismatch: %u", *uv));
- FREE (&uv);
- }
+++ /dev/null
-http://dev.mutt.org/trac/changeset/5904%3Af40de578e8ed
-
-Unbreak header weeding for message/rfc822 parts. Closes #3265.
-
-Index: handler.c
-===================================================================
---- handler.c (revision 5882:536771b4e085)
-+++ handler.c (revision 5904:f40de578e8ed)
-@@ -1091,5 +1091,5 @@
- (((s->flags & M_WEED) || ((s->flags & (M_DISPLAY|M_PRINTING)) && option (OPTWEED))) ? (CH_WEED | CH_REORDER) : 0) |
- (s->prefix ? CH_PREFIX : 0) | CH_DECODE | CH_FROM |
-- (s->flags & M_DISPLAY) ? CH_DISPLAY : 0, s->prefix);
-+ ((s->flags & M_DISPLAY) ? CH_DISPLAY : 0), s->prefix);
-
- if (s->prefix)
+++ /dev/null
-http://dev.mutt.org/trac/changeset/5899%3Ad6f88fbf8387
-
-Don't parse URL port as signed short, but to int and cast to unsigned
-short. Closes #3264.
-
-Index: url.c
-===================================================================
---- url.c (revision 5845:0698e8195545)
-+++ url.c (revision 5899:d6f88fbf8387)
-@@ -144,7 +144,9 @@
- if ((p = strchr (t, ':')))
- {
-+ int t;
- *p++ = '\0';
-- if (mutt_atos (p, (short*) &ciss->port) < 0)
-+ if (mutt_atoi (p, &t) < 0 || t < 0 || t > 0xffff)
- return NULL;
-+ ciss->port = (unsigned short)t;
- }
- else
+++ /dev/null
-http://dev.mutt.org/trac/changeset/fe30f394cbe6
-
-Not being able to start an IMAP command is a fatal error.
-Closes #3155.
-
-Index: imap/command.c
-===================================================================
---- imap/command.c (revision 5651:aac0c04727c0)
-+++ imap/command.c (revision 5955:fe30f394cbe6)
-@@ -234,7 +234,4 @@
-
- if ((rc = cmd_start (idata, cmdstr, flags)) < 0)
-- return rc;
--
-- if (rc < 0)
- {
- cmd_handle_fatal (idata);
+++ /dev/null
-http://dev.mutt.org/trac/changeset/118b8fef8aae
-http://dev.mutt.org/trac/ticket/3290
-
-Suppress new mail notification from mailbox just left. Closes #3290.
-
-
-Index: buffy.c
-===================================================================
---- buffy.c (revision 5914:25e46aad362b)
-+++ buffy.c (revision 5973:118b8fef8aae)
-@@ -45,4 +45,6 @@
- static short BuffyCount = 0; /* how many boxes with new mail */
- static short BuffyNotify = 0; /* # of unnotified new boxes */
-+
-+static BUFFY* buffy_get (const char *path);
-
- /* Find the last message in the file.
-@@ -498,4 +500,15 @@
- }
-
-+void mutt_buffy_setnotified (const char *path)
-+{
-+ BUFFY *buffy;
-+
-+ buffy = buffy_get(path);
-+ if (!buffy)
-+ return;
-+
-+ buffy->notified = 1;
-+}
-+
- int mutt_buffy_notify (void)
- {
-@@ -542,2 +555,29 @@
- *s = '\0';
- }
-+
-+/* fetch buffy object for given path, if present */
-+static BUFFY* buffy_get (const char *path)
-+{
-+ BUFFY *cur;
-+ char *epath;
-+
-+ if (!path)
-+ return NULL;
-+
-+ epath = safe_strdup(path);
-+ mutt_expand_path(epath, mutt_strlen(epath));
-+
-+ for (cur = Incoming; cur; cur = cur->next)
-+ {
-+ /* must be done late because e.g. IMAP delimiter may change */
-+ mutt_expand_path (cur->path, sizeof (cur->path));
-+ if (!mutt_strcmp(cur->path, path))
-+ {
-+ FREE (&epath);
-+ return cur;
-+ }
-+ }
-+
-+ FREE (&epath);
-+ return NULL;
-+}
-Index: buffy.h
-===================================================================
---- buffy.h (revision 5779:7bc332ddd8fc)
-+++ buffy.h (revision 5973:118b8fef8aae)
-@@ -44,2 +44,5 @@
- according to stat() info taken before a modification */
- void mutt_buffy_cleanup (const char *buf, struct stat *st);
-+
-+/* mark mailbox just left as already notified */
-+void mutt_buffy_setnotified (const char *path);
-Index: mx.c
-===================================================================
---- mx.c (revision 5930:ed7eb5de7536)
-+++ mx.c (revision 5973:118b8fef8aae)
-@@ -706,4 +706,8 @@
- return;
-
-+ /* never announce that a mailbox we've just left has new mail. #3290
-+ * XXX: really belongs in mx_close_mailbox, but this is a nice hook point */
-+ mutt_buffy_setnotified(ctx->path);
-+
- if (ctx->mx_close)
- ctx->mx_close (ctx);
+++ /dev/null
-
-# HG changeset patch
-# User Brendan Cully <brendan@kublai.com>
-# Date 1266957745 28800
-# Node ID 57124ea5592ee350af277b543bfedf04d3cd0ace
-# Parent f17302c1022979c654170a0ca0f5a4cc8ffd9eb5
-Don't use freed ctx.path when updating utime of target mailbox in save-message.
-Thanks to Sean Boudreau for the bug report.
-
-diff -r f17302c10229 -r 57124ea5592e commands.c
---- a/commands.c Mon Feb 22 23:01:39 2010 -0800
-+++ b/commands.c Tue Feb 23 12:42:25 2010 -0800
-@@ -863,7 +863,7 @@
- mx_close_mailbox (&ctx, NULL);
-
- if (need_buffy_cleanup)
-- mutt_buffy_cleanup (ctx.path, &st);
-+ mutt_buffy_cleanup (buf, &st);
-
- mutt_clear_error ();
- return (0);
-
+++ /dev/null
-http://dev.mutt.org/trac/changeset/bd59be56c6b0
-
-Don't mangle atime/mtime for mbox folders without new mail upon sync.
-Closes #1362, #3271.
-
-Index: mbox.c
-===================================================================
---- mbox.c (revision 5916:508bfe4a2e23)
-+++ mbox.c (revision 5921:bd59be56c6b0)
-@@ -682,20 +682,28 @@
- /* if mailbox has at least 1 new message, sets mtime > atime of mailbox
- * so buffy check reports new mail */
--static void reset_atime (CONTEXT *ctx)
-+static void reset_atime (CONTEXT *ctx, struct stat *st)
- {
- struct utimbuf utimebuf;
-- int i;
-- time_t now = time (NULL);
--
-- for (i = 0; i < ctx->msgcount; i++)
-- {
-+ int i, found = 0;
-+ struct stat _st;
-+
-+ if (!st)
-+ {
-+ if (stat (ctx->path, &_st) < 0)
-+ return;
-+ st = &_st;
-+ }
-+
-+ utimebuf.actime = st->st_atime;
-+ utimebuf.modtime = st->st_mtime;
-+
-+ for (i = 0; !found && i < ctx->msgcount; i++)
- if (!ctx->hdrs[i]->deleted && !ctx->hdrs[i]->read && !ctx->hdrs[i]->old)
-- {
-- utimebuf.actime = now - 1;
-- utimebuf.modtime = now;
-- utime (ctx->path, &utimebuf);
-- return;
-- }
-- }
-+ found = 1;
-+
-+ if (found && utimebuf.actime >= utimebuf.modtime)
-+ utimebuf.actime = utimebuf.modtime - 1;
-+
-+ utime (ctx->path, &utimebuf);
- }
-
-@@ -713,4 +721,5 @@
- int first = -1; /* first message to be written */
- LOFF_T offset; /* location in mailbox to write changed messages */
-+ struct stat statbuf;
- struct m_update_t *newOffset = NULL;
- struct m_update_t *oldOffset = NULL;
-@@ -904,4 +913,13 @@
- fp = NULL;
-
-+ /* Save the state of this folder. */
-+ if (stat (ctx->path, &statbuf) == -1)
-+ {
-+ mutt_perror (ctx->path);
-+ mutt_sleep (5);
-+ unlink (tempfile);
-+ goto bail;
-+ }
-+
- if ((fp = fopen (tempfile, "r")) == NULL)
- {
-@@ -973,4 +991,7 @@
- }
-
-+ /* Restore the previous access/modification times */
-+ reset_atime (ctx, &statbuf);
-+
- /* reopen the mailbox in read-only mode */
- if ((ctx->fp = fopen (ctx->path, "r")) == NULL)
-@@ -998,9 +1019,4 @@
- unlink (tempfile); /* remove partial copy of the mailbox */
- mutt_unblock_signals ();
--
-- /* if mailbox has new mail, mangle atime+mtime to make buffy check
-- * report new mail for it */
-- if (!option (OPTCHECKMBOXSIZE))
-- reset_atime (ctx);
-
- return (0); /* signal success */
+++ /dev/null
-http://dev.mutt.org/trac/changeset/9ae13dedb5ed
-
-Fixup atime for mbox/mmdf also when mailbox is unchanged but has new
-mail. See #1362.
-
-Index: mbox.c
-===================================================================
---- mbox.c (revision 5921:bd59be56c6b0)
-+++ mbox.c (revision 5922:9ae13dedb5ed)
-@@ -682,5 +682,5 @@
- /* if mailbox has at least 1 new message, sets mtime > atime of mailbox
- * so buffy check reports new mail */
--static void reset_atime (CONTEXT *ctx, struct stat *st)
-+void mbox_reset_atime (CONTEXT *ctx, struct stat *st)
- {
- struct utimbuf utimebuf;
-@@ -992,5 +992,5 @@
-
- /* Restore the previous access/modification times */
-- reset_atime (ctx, &statbuf);
-+ mbox_reset_atime (ctx, &statbuf);
-
- /* reopen the mailbox in read-only mode */
-Index: mx.c
-===================================================================
---- mx.c (revision 5907:a2a868fc40ea)
-+++ mx.c (revision 5922:9ae13dedb5ed)
-@@ -927,4 +927,6 @@
- if (!ctx->quiet)
- mutt_message _("Mailbox is unchanged.");
-+ if (ctx->magic == M_MBOX || ctx->magic == M_MMDF)
-+ mbox_reset_atime (ctx, NULL);
- mx_fastclose_mailbox (ctx);
- return 0;
-Index: mx.h
-===================================================================
---- mx.h (revision 4343:2bccf51eedac)
-+++ mx.h (revision 5922:9ae13dedb5ed)
-@@ -57,4 +57,5 @@
- void mbox_unlock_mailbox (CONTEXT *);
- int mbox_check_empty (const char *);
-+void mbox_reset_atime (CONTEXT *, struct stat *);
-
- int mh_read_dir (CONTEXT *, const char *);
+++ /dev/null
-http://dev.mutt.org/trac/changeset/9f3053f75f27\r
-http://dev.mutt.org/trac/ticket/3303\r
-\r
-Don't leak mhs flags in mh_buffy(). Closes #3303.\r
-\r
-\r
-Index: mh.c\r
-===================================================================\r
---- mh.c (revision 5847:82a581c24f1a)\r
-+++ mh.c (revision 5985:9f3053f75f27)\r
-@@ -239,4 +239,5 @@\r
- if (mhs_check (&mhs, i) & MH_SEQ_UNSEEN)\r
- r = 1;\r
-+ mhs_free_sequences (&mhs);\r
- return r;\r
- }\r
+++ /dev/null
-http://dev.mutt.org/trac/ticket/3315
-http://dev.mutt.org/trac/changeset/6a08a5244d60
-
-Clear last search pattern if it's invalid. Closes #3315.
-
-We keep both, the string version and compiled version around
-for search-next; however, in case of parsing errors we dropped
-only the compiled version and not the string one making the
-code attempting to perform a search using a NULL pattern.
-
-Index: pattern.c
-===================================================================
---- pattern.c (revision 6018:053ef7bbaa72)
-+++ pattern.c (revision 6019:6a08a5244d60)
-@@ -1437,6 +1437,7 @@
- err.dsize = sizeof (error);
- if ((SearchPattern = mutt_pattern_comp (temp, M_FULL_MSG, &err)) == NULL)
-- {
-+ {
- mutt_error ("%s", error);
-+ LastSearch[0] = '\0';
- return (-1);
- }
+++ /dev/null
-http://dev.mutt.org/hg/mutt/rev/b7d2cb7c7ce1
-
-# HG changeset patch
-# User Daniel Jacobowitz <dan@debian.org>
-# Date 1260514342 28800
-# Node ID b7d2cb7c7ce19e67444412d0bc840a4e7ddf303f
-# Parent 1cf34ea1f12864efa1c3f4481fc409ed6c8e11eb
-Do not store header color in hcache.
-If the color directive is removed from muttrc, the cached value from
-the last directive would otherwise still be in effect.
-
---- a/hcache.c Mon Dec 07 23:08:47 2009 -0800
-+++ b/hcache.c Thu Dec 10 22:52:22 2009 -0800
-@@ -624,6 +624,7 @@
- nh.limited = 0;
- nh.num_hidden = 0;
- nh.recipient = 0;
-+ nh.pair = 0;
- nh.attach_valid = 0;
- nh.path = NULL;
- nh.tree = NULL;
-
+++ /dev/null
-http://dev.mutt.org/hg/mutt/rev/817c60d5da7d
-
-# HG changeset patch
-# User Brendan Cully <brendan@kublai.com>
-# Date 1268089116 28800
-# Node ID 817c60d5da7dae3376a6ad683091ae24d7cf2ed2
-# Parent 8ec606f6cafb55299bec617d7d743deceb8d9e2d
-mutt_buffer_printf: NULL dptr means use data
-
-diff -r 8ec606f6cafb -r 817c60d5da7d muttlib.c
---- a/muttlib.c Mon Mar 08 14:52:17 2010 -0800
-+++ b/muttlib.c Mon Mar 08 14:58:36 2010 -0800
-@@ -1675,6 +1675,9 @@
- va_start (ap, fmt);
- va_copy (ap_retry, ap);
-
-+ if (!buf->dptr)
-+ buf->dptr = buf->data;
-+
- doff = buf->dptr - buf->data;
- blen = buf->dsize - doff;
- /* solaris 9 vsnprintf barfs when blen is 0 */
-
+++ /dev/null
-http://dev.mutt.org/trac/changeset/736b6af3c5f1
-http://dev.mutt.org/trac/ticket/3362
-
-Fix off-by-one errors in mailcap parser. Closes #3362
-
-
-Index: rfc1524.c
-===================================================================
---- rfc1524.c (revision 5827:776ef9dbe4d2)
-+++ rfc1524.c (revision 6033:736b6af3c5f1)
-@@ -69,7 +69,8 @@
- mutt_sanitize_filename (type, 0);
-
-- while (command[x] && x<clen && y<sizeof(buf))
-- {
-- if (command[x] == '\\') {
-+ while (x < clen && command[x] && y < sizeof (buf) - 1)
-+ {
-+ if (command[x] == '\\')
-+ {
- x++;
- buf[y++] = command[x++];
-@@ -86,5 +87,5 @@
-
- x++;
-- while (command[x] && command[x] != '}' && z<sizeof(param))
-+ while (command[x] && command[x] != '}' && z < sizeof (param) - 1)
- param[z++] = command[x++];
- param[z] = '\0';
+++ /dev/null
-http://dev.mutt.org/trac/changeset/6b057dc52222
-http://dev.mutt.org/trac/ticket/3322
-
-# HG changeset patch
-# User Antonio Radici <antonio@dyne.org>
-# Date 1267406350 28800
-# Node ID 6b057dc522224530f8d3146ce5efef747c60d1dc
-# Parent 2c78b28027cc59762d8c10097196b3aa855e185a
-pop: allow user-specified port to override default in URL.
-Closes #3322.
-
-diff -r 2c78b28027cc -r 6b057dc52222 pop_lib.c
---- a/pop_lib.c Sun Feb 28 17:00:33 2010 -0800
-+++ b/pop_lib.c Sun Feb 28 17:19:10 2010 -0800
-@@ -43,6 +43,7 @@
- /* Defaults */
- acct->flags = 0;
- acct->type = M_ACCT_TYPE_POP;
-+ acct->port = 0;
-
- c = safe_strdup (path);
- url_parse_ciss (&url, c);
-@@ -60,10 +61,12 @@
- acct->flags |= M_ACCT_SSL;
-
- service = getservbyname (url.scheme == U_POP ? "pop3" : "pop3s", "tcp");
-- if (service)
-- acct->port = ntohs (service->s_port);
-- else
-- acct->port = url.scheme == U_POP ? POP_PORT : POP_SSL_PORT;;
-+ if (!acct->port) {
-+ if (service)
-+ acct->port = ntohs (service->s_port);
-+ else
-+ acct->port = url.scheme == U_POP ? POP_PORT : POP_SSL_PORT;;
-+ }
-
- FREE (&c);
- return 0;
-
+++ /dev/null
-http://dev.mutt.org/trac/changeset/2fc9348684fe
-http://dev.mutt.org/trac/ticket/3308
-
-Properly propagate mh_read_sequences result. Closes #3308.
-
-
-Index: mh.c
-===================================================================
---- mh.c (revision 5985:9f3053f75f27)
-+++ mh.c (revision 5999:2fc9348684fe)
-@@ -168,5 +168,5 @@
-
- short f;
-- int first, last, rc;
-+ int first, last, rc = 0;
-
- char pathname[_POSIX_PATH_MAX];
-@@ -208,5 +208,5 @@
- FREE (&buff);
- safe_fclose (&fp);
-- return 0;
-+ return rc;
- }
-
-@@ -1157,5 +1157,5 @@
- if (ctx->magic == M_MH)
- {
-- if (mh_read_sequences (&mhs, ctx->path) >= 0)
-+ if (mh_read_sequences (&mhs, ctx->path) < 0)
- return -1;
- mh_update_maildir (md, &mhs);
--- /dev/null
+--- buffy.c.orig 2010-04-09 08:47:36.000000000 +0200
++++ buffy.c 2010-04-09 08:51:38.000000000 +0200
+@@ -223,10 +223,18 @@
+ if(!*buf) continue;
+
+ /* avoid duplicates */
+- p = realpath (buf, f1);
++#ifdef USE_IMAP
++ p = q = NULL;
++ if (!mx_is_imap (buf))
++#endif
++ p = realpath (buf, f1);
++
+ for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next))
+ {
+- q = realpath ((*tmp)->path, f2);
++#ifdef USE_IMAP
++ if (!mx_is_imap ((*tmp)->path))
++#endif
++ q = realpath ((*tmp)->path, f2);
+ if (mutt_strcmp (p ? p : buf, q ? q : (*tmp)->path) == 0)
+ {
+ dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path));
+++ /dev/null
-http://dev.mutt.org/hg/mutt/rev/05cec973f0d9
-http://dev.mutt.org/hg/mutt/rev/8ec606f6cafb
-
-# HG changeset patch
-# User Brendan Cully <brendan@kublai.com>
-# Date 1268089247 28800
-# Node ID 05cec973f0d97065709f2ec55a42b39797995eff
-# Parent 817c60d5da7dae3376a6ad683091ae24d7cf2ed2
-When regexp compilation fails, report actual pattern along with error.
-
-diff -r 817c60d5da7d -r 05cec973f0d9 pattern.c
---- a/pattern.c Mon Mar 08 14:58:36 2010 -0800
-+++ b/pattern.c Mon Mar 08 15:00:47 2010 -0800
-@@ -254,6 +254,7 @@
- static int eat_regexp (pattern_t *pat, BUFFER *s, BUFFER *err)
- {
- BUFFER buf;
-+ char errmsg[STRING];
- int r;
-
- memset (&buf, 0, sizeof (buf));
-@@ -290,14 +291,15 @@
- {
- pat->p.rx = safe_malloc (sizeof (regex_t));
- r = REGCOMP (pat->p.rx, buf.data, REG_NEWLINE | REG_NOSUB | mutt_which_case (buf.data));
-- FREE (&buf.data);
- if (r)
- {
-- regerror (r, pat->p.rx, err->data, err->dsize);
-- regfree (pat->p.rx);
-+ regerror (r, pat->p.rx, errmsg, sizeof (errmsg));
-+ mutt_buffer_printf (err, "'%s': %s", buf.data, errmsg);
-+ FREE (&buf.data);
- FREE (&pat->p.rx);
- return (-1);
- }
-+ FREE (&buf.data);
- }
-
- return 0;
+++ /dev/null
-http://dev.mutt.org/trac/ticket/2014
-http://dev.mutt.org/hg/mutt/rev/165b998920e4
-http://dev.mutt.org/hg/mutt/rev/cc02f079b1b9
-http://dev.mutt.org/hg/mutt/rev/41cf44ddbb4c
-http://dev.mutt.org/hg/mutt/rev/fec2720ff6ef
-
-# HG changeset patch
-# User Brendan Cully <brendan@kublai.com>
-# Date 1267511730 28800
-# Node ID 165b998920e45655aef33c74b76fe39b9ec9dc0b
-# Parent 86d93280e5b32af477502f124f5b12f65f879e53
-Another attempt to dequote RFC2047-encoded address comments (see #2014)
-
-diff -r 86d93280e5b3 -r 165b998920e4 copy.c
---- a/copy.c Mon Mar 01 16:14:57 2010 -0800
-+++ b/copy.c Mon Mar 01 22:35:30 2010 -0800
-@@ -868,6 +868,7 @@
- int l, rp = 0;
-
- ADDRESS *a = NULL;
-+ ADDRESS *cur = NULL;
-
- switch (tolower ((unsigned char) *s))
- {
-@@ -937,6 +938,9 @@
-
- mutt_addrlist_to_local (a);
- rfc2047_decode_adrlist (a);
-+ for (cur = a; cur; cur = cur->next)
-+ if (cur->personal)
-+ rfc822_dequote_comment (cur->personal);
-
- /* angle brackets for return path are mandated by RfC5322,
- * so leave Return-Path as-is */
-diff -r 86d93280e5b3 -r 165b998920e4 rfc822.c
---- a/rfc822.c Mon Mar 01 16:14:57 2010 -0800
-+++ b/rfc822.c Mon Mar 01 22:35:30 2010 -0800
-@@ -60,7 +60,7 @@
- "bad address spec"
- };
-
--static void rfc822_dequote_comment (char *s)
-+void rfc822_dequote_comment (char *s)
- {
- char *w = s;
-
-@@ -177,17 +177,10 @@
- static const char *
- parse_quote (const char *s, char *token, size_t *tokenlen, size_t tokenmax)
- {
-- if (*tokenlen < tokenmax)
-- token[(*tokenlen)++] = '"';
- while (*s)
- {
- if (*tokenlen < tokenmax)
- token[*tokenlen] = *s;
-- if (*s == '"')
-- {
-- (*tokenlen)++;
-- return (s + 1);
-- }
- if (*s == '\\')
- {
- if (!*++s)
-@@ -196,6 +189,8 @@
- if (*tokenlen < tokenmax)
- token[*tokenlen] = *s;
- }
-+ else if (*s == '"')
-+ return (s + 1);
- (*tokenlen)++;
- s++;
- }
-@@ -431,6 +426,17 @@
- }
- s = ps;
- }
-+ else if (*s == '"')
-+ {
-+ if (phraselen && phraselen < sizeof (phrase) - 1)
-+ phrase[phraselen++] = ' ';
-+ if ((ps = parse_quote (s + 1, phrase, &phraselen, sizeof (phrase) - 1)) == NULL)
-+ {
-+ rfc822_free_address (&top);
-+ return NULL;
-+ }
-+ s = ps;
-+ }
- else if (*s == ':')
- {
- cur = rfc822_new_address ();
-@@ -490,13 +496,7 @@
- terminate_buffer (phrase, phraselen);
- cur = rfc822_new_address ();
- if (phraselen)
-- {
-- if (cur->personal)
-- FREE (&cur->personal);
-- /* if we get something like "Michael R. Elkins" remove the quotes */
-- rfc822_dequote_comment (phrase);
- cur->personal = safe_strdup (phrase);
-- }
- if ((ps = parse_route_addr (s + 1, comment, &commentlen, sizeof (comment) - 1, cur)) == NULL)
- {
- rfc822_free_address (&top);
-diff -r 86d93280e5b3 -r 165b998920e4 rfc822.h
---- a/rfc822.h Mon Mar 01 16:14:57 2010 -0800
-+++ b/rfc822.h Mon Mar 01 22:35:30 2010 -0800
-@@ -46,6 +46,7 @@
- }
- ADDRESS;
-
-+void rfc822_dequote_comment (char *s);
- void rfc822_free_address (ADDRESS **);
- void rfc822_qualify (ADDRESS *, const char *);
- ADDRESS *rfc822_parse_adrlist (ADDRESS *, const char *s);
+++ /dev/null
-http://dev.mutt.org/trac/ticket/3314
-http://dev.mutt.org/trac/changeset/053ef7bbaa72
-
-Bail on missing pattern modifiers at end of pattern. Closes #3314.
-
-Index: pattern.c
-===================================================================
---- pattern.c (revision 5989:77ac8b5c2be6)
-+++ pattern.c (revision 6018:053ef7bbaa72)
-@@ -824,5 +824,11 @@
- case '=':
- case '~':
-- if (*(ps.dptr + 1) == '(')
-+ if (!*(ps.dptr + 1))
-+ {
-+ snprintf (err->data, err->dsize, _("missing pattern: %s"), ps.dptr);
-+ mutt_pattern_free (&curlist);
-+ return NULL;
-+ }
-+ if (*(ps.dptr + 1) == '(')
- {
- ps.dptr ++; /* skip ~ */
+++ /dev/null
-http://dev.mutt.org/trac/changeset/0a3de4d9a009
-
-SMTP: use $smtp_pass in batch mode. Closes #3289.
-
-mutt_account_getpass() copying the password from $smtp_pass into the
-account structure is only called from the SASL callback we only use if
-we're sure we don't need curses (i.e. have the pass already).
-
-http://dev.mutt.org/trac/changeset/f6c6066a5925
-
-Make getuser/pass abort if input is required in batch mode.
-Replaces [0a3de4d9a009]. See #3289.
-
-
-Index: account.c
-===================================================================
---- account.c (revision 5557:6c58b678d360)
-+++ account.c (revision 5965:f6c6066a5925)
-@@ -156,4 +156,6 @@
- strfcpy (account->user, PopUser, sizeof (account->user));
- #endif
-+ else if (option (OPTNOCURSES))
-+ return -1;
- /* prompt (defaults to unix username), copy into account->user */
- else
-@@ -216,4 +218,6 @@
- strfcpy (account->pass, SmtpPass, sizeof (account->pass));
- #endif
-+ else if (option (OPTNOCURSES))
-+ return -1;
- else
- {
-Index: mutt_sasl.c
-===================================================================
---- mutt_sasl.c (revision 5711:6fac57b97bf1)
-+++ mutt_sasl.c (revision 5965:f6c6066a5925)
-@@ -305,5 +305,5 @@
- snprintf (prompt, sizeof (prompt), "%s: ", interaction->prompt);
- resp[0] = '\0';
-- if (mutt_get_field (prompt, resp, sizeof (resp), 0))
-+ if (option (OPTNOCURSES) || mutt_get_field (prompt, resp, sizeof (resp), 0))
- return SASL_FAIL;
-
-Index: smtp.c
-===================================================================
---- smtp.c (revision 5963:0a3de4d9a009)
-+++ smtp.c (revision 5965:f6c6066a5925)
-@@ -173,5 +173,5 @@
- struct stat st;
- int r, term = 0;
-- size_t buflen;
-+ size_t buflen = 0;
-
- fp = fopen (msgfile, "r");
-@@ -461,10 +455,4 @@
-
- #ifdef USE_SASL
-- if (!(conn->account.flags & M_ACCT_PASS) && option (OPTNOCURSES))
-- {
-- mutt_error (_("Interactive SMTP authentication not supported"));
-- mutt_sleep (1);
-- return -1;
-- }
- return smtp_auth (conn);
- #else
-@@ -610,5 +598,5 @@
- }
- strfcpy (buf + len, "\r\n", sizeof (buf) - len);
-- } while (rc == smtp_ready);
-+ } while (rc == smtp_ready && saslrc != SASL_FAIL);
-
- if (smtp_success (rc))
+++ /dev/null
-http://bugs.gentoo.org/show_bug.cgi?id=290660
-http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2009-3765
-http://dev.mutt.org/trac/changeset/6016:dc09812e63a3/mutt_ssl.c
-
-Index: mutt_ssl.c
-===================================================================
---- mutt_ssl.c (revision 5870:dc9ec900c657)
-+++ mutt_ssl.c (revision 6016:dc09812e63a3)
-@@ -682,5 +682,6 @@
- if (subj_alt_name->type == GEN_DNS)
- {
-- if ((match_found = hostname_match(hostname_ascii,
-+ if (mutt_strlen(subj_alt_name) == subj_alt_name->d.ia5->length &&
-+ (match_found = hostname_match(hostname_ascii,
- (char *)(subj_alt_name->d.ia5->data))))
- {
-@@ -712,5 +713,7 @@
- goto out;
- }
-- match_found = hostname_match(hostname_ascii, buf);
-+ if (mutt_strlen(buf) == bufsize - 1) {
-+ match_found = hostname_match(hostname_ascii, buf);
-+ }
- }
-
+++ /dev/null
-http://dev.mutt.org/trac/changeset/1cf34ea1f128
-http://dev.mutt.org/trac/ticket/3356
-
-STACK* is not defined with newer SSL, use STACK_OF instead.
-Closes #3356.
-
-Index: mutt_ssl.c
-===================================================================
---- mutt_ssl.c (revision 6016:dc09812e63a3)
-+++ mutt_ssl.c (revision 6031:1cf34ea1f128)
-@@ -653,5 +653,5 @@
- int bufsize;
- /* needed to get the DNS subjectAltNames: */
-- STACK *subj_alt_names;
-+ STACK_OF(GENERAL_NAME) *subj_alt_names;
- int subj_alt_names_count;
- GENERAL_NAME *subj_alt_name;
+++ /dev/null
-http://dev.mutt.org/trac/ticket/3364
-http://dev.mutt.org/trac/changeset/31881f38ca1e
-
-Hack mutt_wstr_trunc to treat M_TREE characters as 1 cell.
-Closes #3364.
-
-Index: curs_lib.c
-===================================================================
---- curs_lib.c (revision 6010:c837ab790d2e)
-+++ curs_lib.c (revision 6035:31881f38ca1e)
-@@ -884,5 +884,5 @@
- wchar_t wc;
- int w = 0, l = 0, cl;
-- size_t cw, n;
-+ int cw, n;
- mbstate_t mbstate;
-
-@@ -898,5 +898,11 @@
- cw = cl = 1;
- else
-+ {
- cw = wcwidth (wc);
-+ /* hack because M_TREE symbols aren't turned into characters
-+ * until rendered by print_enriched_string (#3364) */
-+ if (cw < 0 && cl == 1 && src[0] && src[0] < M_TREE_MAX)
-+ cw = 1;
-+ }
- if (cl + l > maxlen || cw + w > maxwid)
- break;
+++ /dev/null
-http://dev.mutt.org/trac/changeset/298194c414f0
-
-Allow tabs in index subject. Closes #3270.
-
-http://dev.mutt.org/trac/changeset/cff8e8ce4327
-
-Render blanks to spaces in index, fixes [298194c414f0]
-
-wcwidth(<tab>) returns -1 so 'foo<tab>bar' was rendered to 'foobar',
-and now to 'foo bar'. Closes #3270 again.
-
-
-Index: configure.ac
-===================================================================
---- configure.ac (revision 5939:199b126a7623)
-+++ configure.ac (revision 5958:298194c414f0)
-@@ -1216,5 +1216,5 @@
-
- AC_CHECK_HEADERS(wctype.h)
--AC_CHECK_FUNCS(iswalnum iswalpha iswcntrl iswdigit)
-+AC_CHECK_FUNCS(iswalnum iswalpha iswblank iswcntrl iswdigit)
- AC_CHECK_FUNCS(iswgraph iswlower iswprint iswpunct iswspace iswupper)
- AC_CHECK_FUNCS(iswxdigit towupper towlower)
-Index: curs_lib.c
-===================================================================
---- curs_lib.c (revision 5936:642987450d83)
-+++ curs_lib.c (revision 5958:cff8e8ce4327)
-@@ -726,5 +726,10 @@
- else
- {
-+#ifdef HAVE_ISWBLANK
-+ if (iswblank (wc))
-+ wc = ' ';
-+ else
-+#endif
- if (!IsWPrint (wc))
- wc = '?';
- w = wcwidth (wc);
+++ /dev/null
-http://dev.mutt.org/trac/changeset/77ac8b5c2be6
-http://dev.mutt.org/trac/ticket/3304
-
-Implement ungroup command. Closes #3304.
-
-requires 7c4484ba9e4b (patch added)
-Move remove_from_rx_list() to muttlib.c, name it mutt_remove_from_rx_list()
-
-
-Index: group.c
-===================================================================
---- group.c (revision 5801:19e62bd1549b)
-+++ group.c (revision 5989:77ac8b5c2be6)
-@@ -49,6 +50,42 @@
- hash_insert (Groups, p->name, p, 0);
- }
--
-+
- return p;
-+}
-+
-+static void group_free (void *p)
-+{
-+ group_t *g = (group_t *)p;
-+
-+ if (!g)
-+ return;
-+ FREE(&g->name);
-+ rfc822_free_address (&g->as);
-+ mutt_free_rx_list (&g->rs);
-+ FREE(&g);
-+}
-+
-+int mutt_group_remove (group_t * g, BUFFER * err)
-+{
-+ int h;
-+
-+ if (!g)
-+ return -1;
-+ h = Groups->hash_string ((const unsigned char *)g->name, Groups->nelem);
-+ if (!hash_find_hash (Groups, h, g->name))
-+ {
-+ if (err)
-+ snprintf (err->data, err->dsize, _("No such group: %s"), g->name);
-+ return -1;
-+ }
-+ hash_delete_hash (Groups, h, g->name, g, group_free);
-+ return 0;
-+}
-+
-+static int empty_group (group_t *g)
-+{
-+ if (!g)
-+ return -1;
-+ return !g->as && !g->rs;
- }
-
-@@ -92,7 +129,27 @@
- }
-
-+static int mutt_group_remove_adrlist (group_t *g, ADDRESS *a)
-+{
-+ ADDRESS *p;
-+
-+ if (!g)
-+ return -1;
-+ if (!a)
-+ return -1;
-+
-+ for (p = a; p; p = p->next)
-+ rfc822_remove_from_adrlist (&g->as, p->mailbox);
-+
-+ return 0;
-+}
-+
- static int mutt_group_add_rx (group_t *g, const char *s, int flags, BUFFER *err)
- {
- return mutt_add_to_rx_list (&g->rs, s, flags, err);
-+}
-+
-+static int mutt_group_remove_rx (group_t *g, const char *s)
-+{
-+ return mutt_remove_from_rx_list (&g->rs, s);
- }
-
-@@ -103,8 +160,22 @@
- }
-
-+int mutt_group_context_remove_adrlist (group_context_t *ctx, ADDRESS * a)
-+{
-+ int rv = 0;
-+
-+ for (; (!rv) && ctx; ctx = ctx->next)
-+ {
-+ rv = mutt_group_remove_adrlist (ctx->g, a);
-+ if (empty_group (ctx->g))
-+ mutt_group_remove (ctx->g, NULL);
-+ }
-+
-+ return rv;
-+}
-+
- int mutt_group_context_add_rx (group_context_t *ctx, const char *s, int flags, BUFFER *err)
- {
- int rv = 0;
--
-+
- for (; (!rv) && ctx; ctx = ctx->next)
- rv = mutt_group_add_rx (ctx->g, s, flags, err);
-@@ -113,8 +184,22 @@
- }
-
-+int mutt_group_context_remove_rx (group_context_t *ctx, const char *s)
-+{
-+ int rv = 0;
-+
-+ for (; (!rv) && ctx; ctx = ctx->next)
-+ {
-+ rv = mutt_group_remove_rx (ctx->g, s);
-+ if (empty_group (ctx->g))
-+ mutt_group_remove (ctx->g, NULL);
-+ }
-+
-+ return rv;
-+}
-+
- int mutt_group_match (group_t *g, const char *s)
- {
- ADDRESS *ap;
--
-+
- if (s && g)
- {
-Index: group.h
-===================================================================
---- group.h (revision 5989:77ac8b5c2be6)
-+++ group.h (revision 5989:77ac8b5c2be6)
-@@ -0,0 +1,39 @@
-+/*
-+ * Copyright (C) 2006 Thomas Roessler <roessler@does-not-exist.org>
-+ * Copyright (C) 2009 Rocco Rutte <pdmef@gmx.net>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#ifndef _MUTT_GROUP_H_
-+#define _MUTT_GROUP_H_ 1
-+
-+#define M_GROUP 0
-+#define M_UNGROUP 1
-+
-+void mutt_group_add_adrlist (group_t *g, ADDRESS *a);
-+
-+void mutt_group_context_add (group_context_t **ctx, group_t *group);
-+void mutt_group_context_destroy (group_context_t **ctx);
-+void mutt_group_context_add_adrlist (group_context_t *ctx, ADDRESS *a);
-+int mutt_group_context_add_rx (group_context_t *ctx, const char *s, int flags, BUFFER *err);
-+
-+int mutt_group_match (group_t *g, const char *s);
-+
-+int mutt_group_remove (group_t *, BUFFER *);
-+int mutt_group_context_remove_rx (group_context_t *ctx, const char *s);
-+int mutt_group_context_remove_adrlist (group_context_t *ctx, ADDRESS *);
-+
-+#endif /* _MUTT_GROUP_H_ */
-Index: init.c
-===================================================================
---- init.c (revision 5988:7c4484ba9e4b)
-+++ init.c (revision 5989:77ac8b5c2be6)
-@@ -32,4 +32,5 @@
- #include "mutt_crypt.h"
- #include "mutt_idna.h"
-+#include "group.h"
-
- #if defined(USE_SSL)
-@@ -834,38 +835,53 @@
- ADDRESS *addr = NULL;
- char *estr = NULL;
--
-- do
-+
-+ do
- {
- mutt_extract_token (buf, s, 0);
- if (parse_group_context (&gc, buf, s, data, err) == -1)
- goto bail;
--
-+
-+ if (data == M_UNGROUP && !mutt_strcasecmp (buf->data, "*"))
-+ {
-+ if (mutt_group_remove (gc->g, err) < 0)
-+ goto bail;
-+ goto out;
-+ }
-+
- if (!mutt_strcasecmp (buf->data, "-rx"))
- state = RX;
- else if (!mutt_strcasecmp (buf->data, "-addr"))
- state = ADDR;
-- else
-- {
-- switch (state)
-+ else
-+ {
-+ switch (state)
- {
- case NONE:
-- strfcpy (err->data, _("Missing -rx or -addr."), err->dsize);
-+ snprintf (err->data, err->dsize, _("%sgroup: missing -rx or -addr."),
-+ data == M_UNGROUP ? "un" : "");
- goto bail;
--
-+
- case RX:
-- if (mutt_group_context_add_rx (gc, buf->data, REG_ICASE, err) != 0)
-+ if (data == M_GROUP &&
-+ mutt_group_context_add_rx (gc, buf->data, REG_ICASE, err) != 0)
-+ goto bail;
-+ else if (data == M_UNGROUP &&
-+ mutt_group_context_remove_rx (gc, buf->data) < 0)
- goto bail;
- break;
--
-+
- case ADDR:
- if ((addr = mutt_parse_adrlist (NULL, buf->data)) == NULL)
- goto bail;
-- if (mutt_addrlist_to_idna (addr, &estr))
-- {
-- snprintf (err->data, err->dsize, _("Warning: Bad IDN '%s'.\n"),
-- estr);
-+ if (mutt_addrlist_to_idna (addr, &estr))
-+ {
-+ snprintf (err->data, err->dsize, _("%sgroup: warning: bad IDN '%s'.\n"),
-+ data == 1 ? "un" : "", estr);
- goto bail;
- }
-- mutt_group_context_add_adrlist (gc, addr);
-+ if (data == M_GROUP)
-+ mutt_group_context_add_adrlist (gc, addr);
-+ else if (data == M_UNGROUP)
-+ mutt_group_context_remove_adrlist (gc, addr);
- rfc822_free_address (&addr);
- break;
-@@ -874,15 +890,10 @@
- } while (MoreArgs (s));
-
-+out:
- mutt_group_context_destroy (&gc);
- return 0;
-
-- bail:
-+bail:
- mutt_group_context_destroy (&gc);
-- return -1;
--}
--
--static int parse_ungroup (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
--{
-- strfcpy (err->data, "not implemented", err->dsize);
- return -1;
- }
-Index: init.h
-===================================================================
---- init.h (revision 5976:376545d6909c)
-+++ init.h (revision 5989:77ac8b5c2be6)
-@@ -3420,5 +3420,4 @@
-
- static int parse_group (BUFFER *, BUFFER *, unsigned long, BUFFER *);
--static int parse_ungroup (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-
- static int parse_lists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-@@ -3473,6 +3472,6 @@
- { "fcc-save-hook", mutt_parse_hook, M_FCCHOOK | M_SAVEHOOK },
- { "folder-hook", mutt_parse_hook, M_FOLDERHOOK },
-- { "group", parse_group, 0 },
-- { "ungroup", parse_ungroup, 0 },
-+ { "group", parse_group, M_GROUP },
-+ { "ungroup", parse_group, M_UNGROUP },
- { "hdr_order", parse_list, UL &HeaderOrderList },
- #ifdef HAVE_ICONV
-Index: pattern.c
-===================================================================
---- pattern.c (revision 5930:ed7eb5de7536)
-+++ pattern.c (revision 5989:77ac8b5c2be6)
-@@ -36,4 +36,5 @@
- #include "mutt_crypt.h"
- #include "mutt_curses.h"
-+#include "group.h"
-
- #ifdef USE_IMAP
-Index: protos.h
-===================================================================
---- protos.h (revision 5977:f161c2f00d84)
-+++ protos.h (revision 5989:77ac8b5c2be6)
-@@ -76,9 +76,4 @@
- void mutt_parse_content_type (char *, BODY *);
- void mutt_generate_boundary (PARAMETER **);
--void mutt_group_add_adrlist (group_t *, ADDRESS *);
--void mutt_group_context_add (group_context_t **ctx, group_t *group);
--void mutt_group_context_destroy (group_context_t **ctx);
--void mutt_group_add_adrlist (group_t *g, ADDRESS *a);
--void mutt_group_context_add_adrlist (group_context_t *ctx, ADDRESS *a);
- void mutt_delete_parameter (const char *attribute, PARAMETER **p);
- void mutt_set_parameter (const char *, const char *, PARAMETER **);
-@@ -312,6 +307,4 @@
- int mutt_get_postponed (CONTEXT *, HEADER *, HEADER **, char *, size_t);
- int mutt_get_tmp_attachment (BODY *);
--int mutt_group_match (group_t *g, const char *s);
--int mutt_group_context_add_rx (group_context_t *ctx, const char *s, int flags, BUFFER *err);
- int mutt_index_menu (void);
- int mutt_invoke_sendmail (ADDRESS *, ADDRESS *, ADDRESS *, ADDRESS *, const char *, int);
-Index: rfc822.c
-===================================================================
---- rfc822.c (revision 5923:ee3d174297bb)
-+++ rfc822.c (revision 5989:77ac8b5c2be6)
-@@ -81,4 +81,43 @@
- }
- *w = 0;
-+}
-+
-+static void free_address (ADDRESS *a)
-+{
-+ FREE(&a->personal);
-+ FREE(&a->mailbox);
-+#ifdef EXACT_ADDRESS
-+ FREE(&a->val);
-+#endif
-+}
-+
-+int rfc822_remove_from_adrlist (ADDRESS **a, const char *mailbox)
-+{
-+ ADDRESS *p, *last = NULL, *t;
-+ int rv = -1;
-+
-+ p = *a;
-+ last = NULL;
-+ while (p)
-+ {
-+ if (ascii_strcasecmp (mailbox, p->mailbox) == 0)
-+ {
-+ if (last)
-+ last->next = p->next;
-+ else
-+ (*a) = p->next;
-+ t = p;
-+ p = p->next;
-+ free_address (t);
-+ rv = 0;
-+ }
-+ else
-+ {
-+ last = p;
-+ p = p->next;
-+ }
-+ }
-+
-+ return (rv);
- }
-
-Index: rfc822.h
-===================================================================
---- rfc822.h (revision 5986:848f08512bf3)
-+++ rfc822.h (revision 5989:77ac8b5c2be6)
-@@ -58,4 +58,5 @@
- void rfc822_cat (char *, size_t, const char *, const char *);
- int rfc822_valid_msgid (const char *msgid);
-+int rfc822_remove_from_adrlist (ADDRESS **a, const char *mailbox);
-
- extern int RFC822Error;
-
-
-
-Index: init.c
-===================================================================
---- init.c (revision 5903:b5ed5d96c775)
-+++ init.c (revision 5988:7c4484ba9e4b)
-@@ -600,40 +600,4 @@
- }
-
--static int remove_from_rx_list (RX_LIST **l, const char *str)
--{
-- RX_LIST *p, *last = NULL;
-- int rv = -1;
--
-- if (mutt_strcmp ("*", str) == 0)
-- {
-- mutt_free_rx_list (l); /* ``unCMD *'' means delete all current entries */
-- rv = 0;
-- }
-- else
-- {
-- p = *l;
-- last = NULL;
-- while (p)
-- {
-- if (ascii_strcasecmp (str, p->rx->pattern) == 0)
-- {
-- mutt_free_regexp (&p->rx);
-- if (last)
-- last->next = p->next;
-- else
-- (*l) = p->next;
-- FREE (&p);
-- rv = 0;
-- }
-- else
-- {
-- last = p;
-- p = p->next;
-- }
-- }
-- }
-- return (rv);
--}
--
- static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
- {
-@@ -701,5 +665,5 @@
- goto bail;
-
-- remove_from_rx_list (&UnAlternates, buf->data);
-+ mutt_remove_from_rx_list (&UnAlternates, buf->data);
-
- if (mutt_add_to_rx_list (&Alternates, buf->data, REG_ICASE, err) != 0)
-@@ -725,5 +689,5 @@
- {
- mutt_extract_token (buf, s, 0);
-- remove_from_rx_list (&Alternates, buf->data);
-+ mutt_remove_from_rx_list (&Alternates, buf->data);
-
- if (mutt_strcmp (buf->data, "*") &&
-@@ -775,5 +739,5 @@
- else
- {
-- remove_from_rx_list(&NoSpamList, buf->data);
-+ mutt_remove_from_rx_list(&NoSpamList, buf->data);
- }
-
-@@ -842,5 +806,5 @@
- goto bail;
-
-- remove_from_rx_list (&UnMailLists, buf->data);
-+ mutt_remove_from_rx_list (&UnMailLists, buf->data);
-
- if (mutt_add_to_rx_list (&MailLists, buf->data, REG_ICASE, err) != 0)
-@@ -1194,6 +1158,6 @@
- {
- mutt_extract_token (buf, s, 0);
-- remove_from_rx_list (&SubscribedLists, buf->data);
-- remove_from_rx_list (&MailLists, buf->data);
-+ mutt_remove_from_rx_list (&SubscribedLists, buf->data);
-+ mutt_remove_from_rx_list (&MailLists, buf->data);
-
- if (mutt_strcmp (buf->data, "*") &&
-@@ -1217,6 +1181,6 @@
- goto bail;
-
-- remove_from_rx_list (&UnMailLists, buf->data);
-- remove_from_rx_list (&UnSubscribedLists, buf->data);
-+ mutt_remove_from_rx_list (&UnMailLists, buf->data);
-+ mutt_remove_from_rx_list (&UnSubscribedLists, buf->data);
-
- if (mutt_add_to_rx_list (&MailLists, buf->data, REG_ICASE, err) != 0)
-@@ -1242,5 +1206,5 @@
- {
- mutt_extract_token (buf, s, 0);
-- remove_from_rx_list (&SubscribedLists, buf->data);
-+ mutt_remove_from_rx_list (&SubscribedLists, buf->data);
-
- if (mutt_strcmp (buf->data, "*") &&
-Index: mutt.h
-===================================================================
---- mutt.h (revision 5956:ef6523d11f24)
-+++ mutt.h (revision 5988:7c4484ba9e4b)
-@@ -555,4 +555,5 @@
- LIST *mutt_add_list_n (LIST*, const void *, size_t);
- LIST *mutt_find_list (LIST *, const char *);
-+int mutt_remove_from_rx_list (RX_LIST **l, const char *str);
-
- void mutt_init (int, LIST *);
-Index: muttlib.c
-===================================================================
---- muttlib.c (revision 5977:f161c2f00d84)
-+++ muttlib.c (revision 5988:7c4484ba9e4b)
-@@ -266,4 +266,40 @@
- }
- return NULL;
-+}
-+
-+int mutt_remove_from_rx_list (RX_LIST **l, const char *str)
-+{
-+ RX_LIST *p, *last = NULL;
-+ int rv = -1;
-+
-+ if (mutt_strcmp ("*", str) == 0)
-+ {
-+ mutt_free_rx_list (l); /* ``unCMD *'' means delete all current entries */
-+ rv = 0;
-+ }
-+ else
-+ {
-+ p = *l;
-+ last = NULL;
-+ while (p)
-+ {
-+ if (ascii_strcasecmp (str, p->rx->pattern) == 0)
-+ {
-+ mutt_free_regexp (&p->rx);
-+ if (last)
-+ last->next = p->next;
-+ else
-+ (*l) = p->next;
-+ FREE (&p);
-+ rv = 0;
-+ }
-+ else
-+ {
-+ last = p;
-+ p = p->next;
-+ }
-+ }
-+ }
-+ return (rv);
- }
-
+++ /dev/null
-http://dev.mutt.org/trac/changeset/25e46aad362b#file0
-
-Do not free statically-allocated buffy buffer.
-Unbreaks unmailboxes, closes #3273.
-
-Index: buffy.c
-===================================================================
---- buffy.c (revision 5851:8b2af5b64981)
-+++ buffy.c (revision 5914:25e46aad362b)
-@@ -237,5 +237,4 @@
- if(*tmp)
- {
-- FREE (&((*tmp)->path));
- tmp1=(*tmp)->next;
- FREE (tmp); /* __FREE_CHECKED__ */
+++ /dev/null
-http://dev.mutt.org/trac/ticket/3352
-http://dev.mutt.org/trac/changeset/a6fddecdc5f5
-
-Make mutt_yesorno use mutt_message to print query. Closes #3352.
-
-
-Index: curs_lib.c
-===================================================================
---- curs_lib.c (revision 6035:31881f38ca1e)
-+++ curs_lib.c (revision 6043:a6fddecdc5f5)
-@@ -224,5 +224,5 @@
- snprintf (answer_string, COLS + 1, " ([%s]/%s): ", def == M_YES ? yes : no, def == M_YES ? no : yes);
- answer_string_len = strlen (answer_string);
-- printw ("%.*s%s", COLS - answer_string_len, msg, answer_string);
-+ mutt_message ("%.*s%s", COLS - answer_string_len, msg, answer_string);
- FREE (&answer_string);
-
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r10.ebuild,v 1.7 2010/02/01 19:50:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r10.ebuild,v 1.8 2010/04/11 19:17:46 grobian Exp $
inherit eutils flag-o-matic autotools
-PATCHSET_REV="-r4"
+PATCHSET_REV="-r5"
# note: latest sidebar patches can be found here:
# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
# post-release hot-fixes
- epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch
- epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch
- epatch "${FILESDIR}"/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch
- epatch "${FILESDIR}"/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
- epatch "${FILESDIR}"/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch
- epatch "${FILESDIR}"/mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch
- epatch "${FILESDIR}"/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch
- epatch "${FILESDIR}"/mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch
- epatch "${FILESDIR}"/mutt-1.5.20-gpgme-keys-d41e043fa775.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch
- epatch "${FILESDIR}"/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch
- epatch "${FILESDIR}"/mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch
- epatch "${FILESDIR}"/mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch
- epatch "${FILESDIR}"/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch
- epatch "${FILESDIR}"/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch
- epatch "${FILESDIR}"/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch
- epatch "${FILESDIR}"/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch
- epatch "${FILESDIR}"/mutt-1.5.20-ssl-CVE-2009-3765-dc09812e63a3.patch
- epatch "${FILESDIR}"/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch
- epatch "${FILESDIR}"/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch
- epatch "${FILESDIR}"/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch
- epatch "${FILESDIR}"/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch
+ for rev in $(eval echo {0..${PR#r}}) ; do
+ local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+ [[ -e ${revpatch} ]] && \
+ epatch "${revpatch}"
+ done
# patch version string for bug reports
sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
if use !vanilla && use !sidebar ; then
use nntp || rm "${PATCHDIR}"/06-nntp.patch
- for p in "${PATCHDIR}"/*.patch ; do
+ for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
epatch "${p}"
done
fi
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r13.ebuild,v 1.1 2010/03/11 20:18:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r13.ebuild,v 1.2 2010/04/11 19:17:46 grobian Exp $
EAPI="3"
inherit eutils flag-o-matic autotools
-PATCHSET_REV="-r4"
+PATCHSET_REV="-r5"
# note: latest sidebar patches can be found here:
# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
# post-release hot-fixes
- epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch
- epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch
- epatch "${FILESDIR}"/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch
- epatch "${FILESDIR}"/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
- epatch "${FILESDIR}"/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch
- epatch "${FILESDIR}"/mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch
- epatch "${FILESDIR}"/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch
- epatch "${FILESDIR}"/mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch
- epatch "${FILESDIR}"/mutt-1.5.20-gpgme-keys-d41e043fa775.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch
- epatch "${FILESDIR}"/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch
- epatch "${FILESDIR}"/mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch
- epatch "${FILESDIR}"/mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch
- epatch "${FILESDIR}"/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch
- epatch "${FILESDIR}"/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch
- epatch "${FILESDIR}"/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch
- epatch "${FILESDIR}"/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch
- epatch "${FILESDIR}"/mutt-1.5.20-ssl-CVE-2009-3765-dc09812e63a3.patch
- epatch "${FILESDIR}"/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch
- epatch "${FILESDIR}"/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch
- epatch "${FILESDIR}"/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch
- epatch "${FILESDIR}"/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch
- epatch "${FILESDIR}"/mutt-1.5.20-copy-From-to-imap-b2b97c7a2ae6.patch
- epatch "${FILESDIR}"/mutt-1.5.20-yes-no-non-ascii-a6fddecdc5f5.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mailbox-save-message-double-free-57124ea5592e.patch
- epatch "${FILESDIR}"/mutt-1.5.20-gpgme-case-insensitive-domain-2c78b28027cc.patch
- epatch "${FILESDIR}"/mutt-1.5.20-pop-port-in-url-6b057dc52222.patch
- epatch "${FILESDIR}"/mutt-1.5.20-rfc-2047-decode-before-dequote-2a4ca6917fd0.patch
- epatch "${FILESDIR}"/mutt-1.5.20-abort-prompt-ctrlc-c837ab790d2e.patch
- epatch "${FILESDIR}"/mutt-1.5.20-null-dptr-use-data-817c60d5da7d.patch
- epatch "${FILESDIR}"/mutt-1.5.20-regexp-fail-crash-05cec973f0d9.patch
+ for rev in $(eval echo {0..${PR#r}}) ; do
+ local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+ [[ -e ${revpatch} ]] && \
+ epatch "${revpatch}"
+ done
# patch version string for bug reports
sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
if use !vanilla && use !sidebar ; then
use nntp || rm "${PATCHDIR}"/06-nntp.patch
- for p in "${PATCHDIR}"/*.patch ; do
+ for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
epatch "${p}"
done
fi
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r12.ebuild,v 1.1 2010/02/22 08:07:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r14.ebuild,v 1.1 2010/04/11 19:17:46 grobian Exp $
+
+EAPI="3"
inherit eutils flag-o-matic autotools
-PATCHSET_REV="-r4"
+PATCHSET_REV="-r6"
# note: latest sidebar patches can be found here:
# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
src_unpack() {
unpack ${A//${SIDEBAR_PATCH_N}}
- cd "${S}"
+}
+src_prepare() {
# this patch is non-generic and only works because we use a sysconfdir
# different from the one used by the mailbase ebuild
use prefix && epatch "${FILESDIR}"/mutt-1.5.13-prefix-mailcap.patch
epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
+ epatch "${FILESDIR}"/mutt-1.5.20-realpath-slowness.patch
# post-release hot-fixes
- epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch
- epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch
- epatch "${FILESDIR}"/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch
- epatch "${FILESDIR}"/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
- epatch "${FILESDIR}"/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch
- epatch "${FILESDIR}"/mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch
- epatch "${FILESDIR}"/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch
- epatch "${FILESDIR}"/mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch
- epatch "${FILESDIR}"/mutt-1.5.20-gpgme-keys-d41e043fa775.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch
- epatch "${FILESDIR}"/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch
- epatch "${FILESDIR}"/mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch
- epatch "${FILESDIR}"/mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch
- epatch "${FILESDIR}"/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch
- epatch "${FILESDIR}"/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch
- epatch "${FILESDIR}"/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch
- epatch "${FILESDIR}"/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch
- epatch "${FILESDIR}"/mutt-1.5.20-ssl-CVE-2009-3765-dc09812e63a3.patch
- epatch "${FILESDIR}"/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch
- epatch "${FILESDIR}"/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch
- epatch "${FILESDIR}"/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch
- epatch "${FILESDIR}"/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch
- epatch "${FILESDIR}"/mutt-1.5.20-copy-From-to-imap-b2b97c7a2ae6.patch
- epatch "${FILESDIR}"/mutt-1.5.20-yes-no-non-ascii-a6fddecdc5f5.patch
+ for rev in $(eval echo {0..${PR#r}}) ; do
+ local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+ [[ -e ${revpatch} ]] && \
+ epatch "${revpatch}"
+ done
# patch version string for bug reports
sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
if use !vanilla && use !sidebar ; then
use nntp || rm "${PATCHDIR}"/06-nntp.patch
- for p in "${PATCHDIR}"/*.patch ; do
+ for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
epatch "${p}"
done
fi
fi
}
-src_compile() {
+src_configure() {
declare myconf="
$(use_enable nls) \
$(use_enable gpg gpgme) \
--with-exec-shell=${EPREFIX}/bin/sh"
case $CHOST in
- *-darwin7)
- # locales are broken on Panther
- myconf="${myconf} --enable-locales-fix --without-wc-funcs"
- myconf="${myconf} --disable-fcntl --enable-flock"
- ;;
*-solaris*)
# Solaris has no flock in the standard headers
myconf="${myconf} --enable-fcntl --disable-flock"
;;
esac
- # See Bug #22787
- unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
# mutt prioritizes gdbm over bdb, so we will too.
# hcache feature requires at least one database is in USE.
if use tokyocabinet; then
fi
econf ${myconf} || die "configure failed"
- emake || die "make failed"
}
src_install() {
- local ED=${ED-${D}}
make DESTDIR="${D}" install || die "install failed"
find "${ED}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
if use mbox; then
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r4.ebuild,v 1.12 2009/09/15 23:49:30 josejx Exp $
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r3"
-
-# note: latest sidebar patches can be found here:
-# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
-SIDEBAR_PATCH_N="patch-1.5.20.sidebar.20090619.txt"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
- !vanilla? (
- !sidebar? (
- mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
- http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
- )
- )
- sidebar? (
- http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
- )"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl vanilla"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RDEPEND=">=sys-libs/ncurses-5.2
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
- smime? ( >=dev-libs/openssl-0.9.6 )
- app-misc/mime-types"
-DEPEND="${RDEPEND}
- net-mail/mailbase
- doc? (
- dev-libs/libxml2
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- || ( www-client/lynx www-client/w3m www-client/elinks )
- )"
-
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_unpack() {
- unpack ${A//${SIDEBAR_PATCH_N}}
- cd "${S}"
-
- # this patch is non-generic and only works because we use a sysconfdir
- # different from the one used by the mailbase ebuild
- use prefix && epatch "${FILESDIR}"/mutt-1.5.13-prefix-mailcap.patch
-
- epatch "${FILESDIR}"/mutt-1.5.18-bdb-prefix.patch # fix bdb detection
- epatch "${FILESDIR}"/mutt-1.5.18-interix.patch
- built_with_use sys-libs/ncurses unicode && \
- epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
- epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
- # post-release hot-fixes
- epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch
- epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch
- epatch "${FILESDIR}"/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch
- epatch "${FILESDIR}"/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
- epatch "${FILESDIR}"/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch
- epatch "${FILESDIR}"/mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch
- epatch "${FILESDIR}"/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch
- epatch "${FILESDIR}"/mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch
- epatch "${FILESDIR}"/mutt-1.5.20-gpgme-keys-d41e043fa775.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch
- epatch "${FILESDIR}"/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch
- epatch "${FILESDIR}"/mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch
- epatch "${FILESDIR}"/mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch
- epatch "${FILESDIR}"/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch
-
- # patch version string for bug reports
- sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
- muttlib.c || die "failed patching in Gentoo version"
-
- if use !vanilla && use !sidebar ; then
- use nntp || rm "${PATCHDIR}"/06-nntp.patch
- for p in "${PATCHDIR}"/*.patch ; do
- epatch "${p}"
- done
- fi
-
- if use sidebar ; then
- use vanilla || \
- ewarn "The sidebar patch is only applied to a vanilla mutt tree."
- epatch "${DISTDIR}"/${SIDEBAR_PATCH_N}
- fi
-
- AT_M4DIR="m4" eautoreconf
-
- # the configure script contains some "cleverness" whether or not to setgid
- # the dotlock program, resulting in bugs like #278332
- sed -i -e 's/@DOTLOCK_GROUP@//' \
- Makefile.in || die "sed failed"
-
- # don't just build documentation (lengthy process, with big dependencies)
- if use !doc ; then
- sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
- fi
-}
-
-src_compile() {
- declare myconf="
- $(use_enable nls) \
- $(use_enable gpg gpgme) \
- $(use_enable imap) \
- $(use_enable pop) \
- $(use_enable smtp) \
- $(use_enable crypt pgp) \
- $(use_enable smime) \
- $(use_enable debug) \
- $(use_with idn) \
- --with-curses \
- --sysconfdir="${EPREFIX}"/etc/${PN} \
- --with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
- --with-regex \
- --enable-nfs-fix --enable-external-dotlock \
- $(use_with !nntp mixmaster) \
- --with-exec-shell=${EPREFIX}/bin/sh"
-
- case $CHOST in
- *-darwin7)
- # locales are broken on Panther
- myconf="${myconf} --enable-locales-fix --without-wc-funcs"
- myconf="${myconf} --disable-fcntl --enable-flock"
- ;;
- *-solaris*)
- # Solaris has no flock in the standard headers
- myconf="${myconf} --enable-fcntl --disable-flock"
- ;;
- *)
- myconf="${myconf} --disable-fcntl --enable-flock"
- ;;
- esac
-
- # See Bug #22787
- unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- if use qdbm; then
- myconf="${myconf} --enable-hcache \
- --with-qdbm --without-gdbm --without-bdb"
- elif use gdbm ; then
- myconf="${myconf} --enable-hcache \
- --without-qdbm --with-gdbm --without-bdb"
- elif use berkdb; then
- myconf="${myconf} --enable-hcache \
- --without-gdbm --without-qdbm --with-bdb"
- else
- myconf="${myconf} --disable-hcache \
- --without-qdbm --without-gdbm --without-bdb"
- fi
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf="${myconf} --with-gnutls"
- elif use ssl; then
- myconf="${myconf} --with-ssl"
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf="${myconf} $(use_with sasl)"
- else
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
- fi
-
- if use mbox; then
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
- else
- myconf="${myconf} --with-homespool=Maildir"
- fi
-
- if use !vanilla && use !sidebar ; then
- # rr.compressed patch
- myconf="${myconf} --enable-compressed"
-
- # nntp patch applied conditionally, so avoid QA warning when doing
- # --disable-nntp while patch not being applied, bug #262069
- use nntp && myconf="${myconf} --enable-nntp"
- fi
-
- econf ${myconf} || die "configure failed"
- emake || die "make failed"
-}
-
-src_install() {
- local ED=${ED-${D}}
- make DESTDIR="${D}" install || die "install failed"
- find "${ED}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
- if use mbox; then
- insinto /etc/mutt
- newins "${FILESDIR}"/Muttrc.mbox Muttrc
- else
- insinto /etc/mutt
- doins "${FILESDIR}"/Muttrc
- fi
-
- # A newer file is provided by app-misc/mime-types. So we link it.
- rm "${ED}"/etc/${PN}/mime.types
- dosym /etc/mime.types /etc/${PN}/mime.types
-
- # A man-page is always handy
- if use !doc; then
- cp doc/mutt.man mutt.1
- cp doc/muttbug.man flea.1
- doman mutt.1 flea.1
- fi
-
- if use !prefix ; then
- fowners root:mail /usr/bin/mutt_dotlock
- fperms g+s /usr/bin/mutt_dotlock
- fi
-
- dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_setup() {
- if ! use gpg &&
- has_version "<${CATEGORY}/${PN}-1.5.20-r2" &&
- built_with_use ${CATEGORY}/${PN} gpgme ;
- then
- ewarn 'The "gpgme" USE-flag has been changed into "gpg". You'
- ewarn 'previously had "gpgme" set, and you most likely want to'
- ewarn 'enable "gpg" instead, right now, to obtain equivalent behaviour.'
- fi
-}
-
-pkg_postinst() {
- echo
- elog "If you are new to mutt you may want to take a look at"
- elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
- elog " http://www.gentoo.org/doc/en/guide-to-mutt.xml"
- echo
-}
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r6.ebuild,v 1.4 2009/12/17 11:38:25 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r6.ebuild,v 1.5 2010/04/11 19:17:46 grobian Exp $
inherit eutils flag-o-matic autotools
-PATCHSET_REV="-r4"
+PATCHSET_REV="-r5"
# note: latest sidebar patches can be found here:
# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl vanilla"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~mips"
RDEPEND=">=sys-libs/ncurses-5.2
qdbm? ( dev-db/qdbm )
!qdbm? (
built_with_use sys-libs/ncurses unicode && \
epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
- # post-release hot-fixes
- epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch
- epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch
- epatch "${FILESDIR}"/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch
- epatch "${FILESDIR}"/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
- epatch "${FILESDIR}"/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch
- epatch "${FILESDIR}"/mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch
- epatch "${FILESDIR}"/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch
- epatch "${FILESDIR}"/mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch
- epatch "${FILESDIR}"/mutt-1.5.20-gpgme-keys-d41e043fa775.patch
- epatch "${FILESDIR}"/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch
- epatch "${FILESDIR}"/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch
- epatch "${FILESDIR}"/mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch
- epatch "${FILESDIR}"/mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch
- epatch "${FILESDIR}"/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch
- epatch "${FILESDIR}"/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch
- epatch "${FILESDIR}"/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch
- epatch "${FILESDIR}"/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch
epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
+ # post-release hot-fixes
+ for rev in $(eval echo {0..${PR#r}}) ; do
+ local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+ [[ -e ${revpatch} ]] && \
+ epatch "${revpatch}"
+ done
+
# patch version string for bug reports
sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
muttlib.c || die "failed patching in Gentoo version"
if use !vanilla && use !sidebar ; then
use nntp || rm "${PATCHDIR}"/06-nntp.patch
- for p in "${PATCHDIR}"/*.patch ; do
+ for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
epatch "${p}"
done
fi
projects / gentoo.git / commitdiff