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

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 83 insertions, 3 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/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