Bump for patch to fix bug #276101, regarding smtp batching with authentication.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 87 insertions, 6 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 4f7dd0eca2f7..4f363d36531b 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.137 2009/06/29 13:25:08 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.138 2009/07/02 08:44:33 grobian Exp $
+
+*mutt-1.5.20-r1 (02 Jul 2009)
+
+  02 Jul 2009; Fabian Groffen <grobian@gentoo.org>
+  +files/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch,
+  -mutt-1.5.20.ebuild, +mutt-1.5.20-r1.ebuild:
+  Bump for patch to fix bug #276101, regarding smtp batching with authentication.
 
   29 Jun 2009; Fabian Groffen <grobian@gentoo.org>
   +files/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch,
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index fb41ba9ff2c7..3dc5ef5a7f04 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -15,6 +15,7 @@ AUX mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch 567 RMD160 1c32139a95717e16
 AUX mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch 451 RMD160 ce68b1841fa9b05cf2e30a7cb53d3475c674081a SHA1 92e8f2bbcfeb9812f727364759f58a0e3656b4fc SHA256 ed7e9295959fad0c0702550e36d83e786bec5a041a74680c3289d1698d0c8435
 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-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch 2211 RMD160 730cd88c1cfaf83d9eeeb1f2ed7d58b2eb43b85f SHA1 e6ce5e3b0ea1a9885a53ba93fc43ce8a17654287 SHA256 838f9734ba360936f99e06b25eb14425870ea788d97769ee2a0c57bd98e42468
 AUX mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch 920 RMD160 7d34f480255b232c06cb3487cda2c9d0379107c1 SHA1 f4ab33bc6737ff39a8cdd3d1ee1fd597ec0f9c2a SHA256 89a176154634ee5c8278d553e62da6c244078454da04772c90149ef2e57868ea
 AUX mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch 455 RMD160 63b73ed21d42d0849f38ef1098029c64933c47a5 SHA1 9da6a6914d3ae276887efd1a30ed3ea55bc57bcb SHA256 7d44b98e8f7538ce85ddb80877a0caabd1edcfd5e558258896d50691c51a3d0e
 AUX slang.patch 493 RMD160 16dcedee86fe91ecac48ec5be8a6f67798ef7ac0 SHA1 f913e8c717f76186b0edc8856bf02a167d540c70 SHA256 040c8b63b2d805dae800fa9b1826d158b7104641339cee9a404985616b3502c7
@@ -24,7 +25,7 @@ DIST mutt-1.5.16-gentoo-patches-r1.tar.bz2 58021 RMD160 bff5f1c5f0053635419eba6e
 DIST mutt-1.5.16.tar.gz 3534894 RMD160 3b345599aa62a956b9c881994ffd74156a5bf808 SHA1 4aaa82bdc75d5e12acc72df4f61fbbf87fd64fc1 SHA256 825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83
 DIST mutt-1.5.19-gentoo-patches.tar.bz2 62837 RMD160 6f0eb14f7e06440608ffdb73b23884aa14bbb5cd SHA1 5d1a6a5af621453dca768b1070e049ba54a1545a SHA256 dc247df06be57dae2095d4a1494e5cd175b91523a467106e9b99acab4c0423a8
 DIST mutt-1.5.19.tar.gz 3558746 RMD160 dcb8d027593bfccd62eb7aba338007bce3c7e22e SHA1 96e4cc1e1419ba816fcc19d77255978e62c20793 SHA256 b160baedf2676a4c2c1a5c74049e2c63f00fccff43ee2594367087a08bfd63c8
-DIST mutt-1.5.20-gentoo-patches-r1.tar.bz2 61865 RMD160 8f207a9230ee584941716d1f006ab19f12765871 SHA1 33347dec2215f0fdfd3e721ec332a9aab534f9ac SHA256 284ade774df1fd968e02b6130f921feb4c4039b4e0f29ca970c9f1688255b605
+DIST mutt-1.5.20-gentoo-patches-r2.tar.bz2 59753 RMD160 c07c5c58648346bff391d6f3d14613f9429780bb SHA1 e63db8a73222dee474d24445413af89cdfb428de SHA256 2a72a49ce54087fad612233d18b3db2847a7287a96f2dc0538457a04d9bbe81a
 DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb SHA1 d2bec7a33771f128ca49b1723b06b6d248a35d31 SHA256 9579fc079d74ff5c89223ff09df402ef4e508ba8ca925c49e74aa09c02a9a796
 DIST patch-1.5.16.sidebar.20070704.txt 51103 RMD160 a91a1eefe48c15a048231a632fe285cb2360f365 SHA1 0284a09dfa000d279a0f87c9a0a296f473d4509b SHA256 49123e14bebd33d0e8c7733cab319f3e5bfa591d5f5d74a3dd8964b44bf34ae7
 DIST patch-1.5.19.sidebar.20090522.txt 52307 RMD160 116451d59aa746644f269f8c028484360c84e342 SHA1 056c394657c78e054909dcfde0692007cea33fe3 SHA256 64b2282aac88a3374bb48a9a07b6374443fe3c8f5905def9ac3cdc26d9f8355a
@@ -32,6 +33,6 @@ DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cf
 EBUILD mutt-1.5.15-r2.ebuild 4528 RMD160 2359d39b6d5758d977b1cbfce4c320dc0abb0ed7 SHA1 9a34328905989c05c7ebc5892c0e8151433897b0 SHA256 37c613bcdc54cef3d93b013c6cb792deb2be3ca2de85765a937323bae5041264
 EBUILD mutt-1.5.16.ebuild 4989 RMD160 2a9ae3ece8f56692e0077b7b3940e607c79f2a14 SHA1 a79646fbfce1e85ecc2f8aaa4728e3c7303185f0 SHA256 55a70c2bb8f144549e6a12a4ba6bcb8796202d4f7be25fb809fefa2848615368
 EBUILD mutt-1.5.19-r1.ebuild 5933 RMD160 3317bb5ee6c7d076c141fc1dc4998116872a32f8 SHA1 c9786de58bfa87b6ed392fb6190cc0bf69df8464 SHA256 d5c91dc2f7c620a36f690b56560ba8f5122b21c65259310366e245d3a660a692
-EBUILD mutt-1.5.20.ebuild 6946 RMD160 080b1733358cab2a3acd0909ee103ff9614fd1e2 SHA1 fd2c0a5463d9231fd39612f2e2fc90f82cb531cc SHA256 f3e8f0123b2b7d8c1dfd6c8d2f3dfedea2eca95126666760baaa2bd26aedce89
-MISC ChangeLog 31259 RMD160 bb560e7d9eeeb3e074f21a023c3b5bcfb08c6b55 SHA1 1a44a943032e2ee614020e09ed93846aebb76988 SHA256 a69eee2998cbd959e1b24acabf95c79f1268de2cb8ac1f0ebf35ce5710213a11
+EBUILD mutt-1.5.20-r1.ebuild 7031 RMD160 fc5bbe19395e6bc0036960ec2ce806b72d02d539 SHA1 646babb8c9b3e293b3e1262543bdf35a4a83b145 SHA256 e537a4334aa9b2f722df8ce3527337ed74cce55121a35aab8d1921061cf90a5b
+MISC ChangeLog 31541 RMD160 48027b865326b394a75680c89b6451ce18acea29 SHA1 9a5c4001fcfffa9ae2f6f8211b3c981bd0bdbb24 SHA256 ab6b04e42cdac5270864ee2824bd581bea0aa3d5c688749cedde388ad78dab37
 MISC metadata.xml 553 RMD160 39ed7b190e5bf898f53b3ab6e071593ae3327eb8 SHA1 9cd6777e4563f035716b15fcb62dd95393ae7772 SHA256 91c70bd34eda2e3e33dfebd4a92bff235704d9b256f8b84815fdc4e6607c8069
diff --git a/mail-client/mutt/files/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch b/mail-client/mutt/files/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch
new file mode 100644
index 000000000000..af9d6c57e68b
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch
@@ -0,0 +1,72 @@
+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))
diff --git a/mail-client/mutt/mutt-1.5.20.ebuild b/mail-client/mutt/mutt-1.5.20-r1.ebuild
index 384a95a5cfc6..23051bb7b8e3 100644
--- a/mail-client/mutt/mutt-1.5.20.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.ebuild,v 1.3 2009/06/29 13:25:08 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r1.ebuild,v 1.1 2009/07/02 08:44:33 grobian Exp $
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r1"
+PATCHSET_REV="-r2"
 
 # note: latest sidebar patches can be found here:
 # http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
@@ -83,6 +83,7 @@ src_unpack() {
 	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.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch
 
 	if use !vanilla && use !sidebar ; then
 		use nntp || rm "${PATCHDIR}"/06-nntp.patch