add own mutt ebuild, allowing sidebar on a non-vanilla tree like e.g. nntp flag

Signed-off-by: Raphaël Marichez <falco@gentoo.org>

19 files changed, 417 insertions, 0 deletions

diff --git a/mail-client/mutt/files/Muttrc b/mail-client/mutt/files/Muttrc
new file mode 100644
index 0000000..6f0d63e
--- /dev/null
+++ b/mail-client/mutt/files/Muttrc
@@ -0,0 +1,19 @@
+# Some minimal Mutt settings, Gentoo-style.  These reflect the Gentoo
+# predilection for maildir folders.
+#
+# Please don't add settings to this file to change other user
+# preferences (such as colors), since those can be hard for a user to
+# undo if their preference doesn't match yours!  For example, it is
+# *impossible* currently in mutt to remove color settings from objects
+# other than the index.
+
+set mbox_type=Maildir
+set folder=~/.maildir
+set spoolfile=~/.maildir/
+set record=~/.maildir-sent/
+set move=no
+
+# Maybe we shouldn't set index_format here, but this is a recommended
+# one for maildir-style folders.
+
+set index_format="%4C %Z %{%b %d} %-16.16L  %s"
diff --git a/mail-client/mutt/files/Muttrc.mbox b/mail-client/mutt/files/Muttrc.mbox
new file mode 100644
index 0000000..1382a37
--- /dev/null
+++ b/mail-client/mutt/files/Muttrc.mbox
@@ -0,0 +1,9 @@
+# Some minimal Mutt settings, Gentoo-style.  Since mutt was installed
+# with USE=mbox, this file doesn't have any changes from the default
+# mutt settings, making it very minimal indeed...
+#
+# Please don't add settings to this file to change other user
+# preferences (such as colors), since those can be hard for a user to
+# undo if their preference doesn't match yours!  For example, it is
+# *impossible* currently in mutt to remove color settings from objects
+# other than the index.
diff --git a/mail-client/mutt/files/digest-mutt-1.5.11-r2 b/mail-client/mutt/files/digest-mutt-1.5.11-r2
new file mode 100644
index 0000000..8a1f3e5
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.11-r2
@@ -0,0 +1,18 @@
+RMD160 812bfa6b1c9bfb1650341f7522298699c7b214a5 mutt-1.5.11.tar.gz 3187375
+SHA256 0ff256a9851952a5f6dfb4b7dccf5dc26db9de5502d035748abc93dec84af474 mutt-1.5.11.tar.gz 3187375
+RMD160 cbeac806b610bcd945bf3b52120a8aa2aba27df3 mutt-1.5.4-imap-fcc-status.patch 380
+SHA256 22cb4e1625ae2d22f94e8d815cb3515db75801f8a4cb9e4f047c4fb4ded8757c mutt-1.5.4-imap-fcc-status.patch 380
+RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 mutt-1.5.7-mixmaster+nntp.patch 310
+SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da mutt-1.5.7-mixmaster+nntp.patch 310
+RMD160 7d3fb6d32c266ed35babdb10d13aae731783a64e patch-1.5.10.tt.assumed_charset.1.gz 2565
+SHA256 97cdb63694055e218dff8b85e8c0db8b5e0c7435a91d47479604480319156c6b patch-1.5.10.tt.assumed_charset.1.gz 2565
+RMD160 f19cdeb949389cd3dd8f250ac96178f13ce92f67 patch-1.5.11.rr.compressed.gz 9995
+SHA256 1e2697136e0431508d2447de8b67fb32114d0b08ec043cc929e3ddf07202fcb5 patch-1.5.11.rr.compressed.gz 9995
+RMD160 e0d0754fd3f11f7a815dc6c64f0d96b13b2f580f patch-1.5.11.vvv.nntp-gentoo.bz2 44351
+SHA256 1e94c9862956c4292f518ead7f66192b6ad56abf5ba8660944393956bb32c723 patch-1.5.11.vvv.nntp-gentoo.bz2 44351
+RMD160 f8d8ea63c61557321c0afcc2a857a6b53a09629f patch-1.5.4.lpr.collapse_flagged 4790
+SHA256 f0fc39fdad2f7c5ad23ee0ee7f484c2809340ac117a3f7dd8ebad57129a61a4a patch-1.5.4.lpr.collapse_flagged 4790
+RMD160 baa6e066fd834720ce02ad335c97d37982bcfab7 patch-1.5.6.dw.mbox-hook.1 6445
+SHA256 eaaa1b8279e358b47dca189721fb7fdcbe63576203b76e879868b30206b6166c patch-1.5.6.dw.mbox-hook.1 6445
+RMD160 2907033013961301e3e356232c6b6cc646750746 patch-1.5.6.dw.pgp-timeout.1 1448
+SHA256 9ec9bcca7afccac1c4138be149ceb623fd9fbf60a31cec914d030ec94cde3f38 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/digest-mutt-1.5.12 b/mail-client/mutt/files/digest-mutt-1.5.12
new file mode 100644
index 0000000..632a0dd
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.12
@@ -0,0 +1,4 @@
+RMD160 419ff2ebd14ad394ea5d34814f17583ee5a439b6 mutt-1.5.12-gentoo-patches.tar.bz2 53435
+SHA256 e285cd217707719ba7a22e912c6cc00319e9873f31580bdef51331d9b6313dff mutt-1.5.12-gentoo-patches.tar.bz2 53435
+RMD160 e68d4c5b099b8148769d138a36fa8561b278969c mutt-1.5.12.tar.gz 3440835
+SHA256 0d0c2ab6cea0d93579bc5490fafdae3bf640070d993490c7b00ccac4fa808b67 mutt-1.5.12.tar.gz 3440835
diff --git a/mail-client/mutt/files/digest-mutt-1.5.13 b/mail-client/mutt/files/digest-mutt-1.5.13
new file mode 100644
index 0000000..2a67c38
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.13
@@ -0,0 +1,4 @@
+RMD160 67274bef651c1c78d1e6878d8bb17316abf9d30e mutt-1.5.13-gentoo-patches.tar.bz2 53418
+SHA256 b0a8737ab8ec42b5f071eb08356a2572c49f98c73c3bf42396fd481c4650ef1d mutt-1.5.13-gentoo-patches.tar.bz2 53418
+RMD160 9327b7f928aad78a20c2395629113ac2519bb945 mutt-1.5.13.tar.gz 3442681
+SHA256 e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9 mutt-1.5.13.tar.gz 3442681
diff --git a/mail-client/mutt/files/digest-mutt-1.5.13-r1 b/mail-client/mutt/files/digest-mutt-1.5.13-r1
new file mode 100644
index 0000000..2a67c38
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.13-r1
@@ -0,0 +1,4 @@
+RMD160 67274bef651c1c78d1e6878d8bb17316abf9d30e mutt-1.5.13-gentoo-patches.tar.bz2 53418
+SHA256 b0a8737ab8ec42b5f071eb08356a2572c49f98c73c3bf42396fd481c4650ef1d mutt-1.5.13-gentoo-patches.tar.bz2 53418
+RMD160 9327b7f928aad78a20c2395629113ac2519bb945 mutt-1.5.13.tar.gz 3442681
+SHA256 e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9 mutt-1.5.13.tar.gz 3442681
diff --git a/mail-client/mutt/files/digest-mutt-1.5.13-r2 b/mail-client/mutt/files/digest-mutt-1.5.13-r2
new file mode 100644
index 0000000..2a67c38
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.13-r2
@@ -0,0 +1,4 @@
+RMD160 67274bef651c1c78d1e6878d8bb17316abf9d30e mutt-1.5.13-gentoo-patches.tar.bz2 53418
+SHA256 b0a8737ab8ec42b5f071eb08356a2572c49f98c73c3bf42396fd481c4650ef1d mutt-1.5.13-gentoo-patches.tar.bz2 53418
+RMD160 9327b7f928aad78a20c2395629113ac2519bb945 mutt-1.5.13.tar.gz 3442681
+SHA256 e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9 mutt-1.5.13.tar.gz 3442681
diff --git a/mail-client/mutt/files/digest-mutt-1.5.14 b/mail-client/mutt/files/digest-mutt-1.5.14
new file mode 100644
index 0000000..0eb4b1f
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.14
@@ -0,0 +1,4 @@
+RMD160 584cdf88e3fd0fea0a672ef5373bee0b95b0623f mutt-1.5.14-gentoo-patches.tar.bz2 53898
+SHA256 e71f0a6c2c62bca41280e64b2b4687ab9c468e4151d3ba3082125710a487a2f9 mutt-1.5.14-gentoo-patches.tar.bz2 53898
+RMD160 ed4eeaf75d37757ed5b370e9763b6f8524df5ca7 mutt-1.5.14.tar.gz 3441678
+SHA256 9dbee28bd48a0f1779ba3b00f98dda74a3f629e8109f1842616d48b85013946a mutt-1.5.14.tar.gz 3441678
diff --git a/mail-client/mutt/files/digest-mutt-1.5.15-r2 b/mail-client/mutt/files/digest-mutt-1.5.15-r2
new file mode 100644
index 0000000..d257cdc
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.15-r2
@@ -0,0 +1,4 @@
+RMD160 c370adb2aaa1ddbfb6fba0b7bb3318e9abeed625 mutt-1.5.15-gentoo-patches-r2.tar.bz2 65582
+SHA256 7b16fb3db479d4d112db3f383e28b4680fd3c435e074b11dee640676039d8987 mutt-1.5.15-gentoo-patches-r2.tar.bz2 65582
+RMD160 0cc084d2fcdabc0bc41632fcff90703c206de3db mutt-1.5.15.tar.gz 3517899
+SHA256 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a mutt-1.5.15.tar.gz 3517899
diff --git a/mail-client/mutt/files/digest-mutt-1.5.16 b/mail-client/mutt/files/digest-mutt-1.5.16
new file mode 100644
index 0000000..a9df139
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.16
@@ -0,0 +1,12 @@
+MD5 ec581c0d4360b0543f4cb1c6f90b8d9a mutt-1.5.16-gentoo-patches-r1.tar.bz2 58021
+RMD160 bff5f1c5f0053635419eba6e46a3b9f729efe162 mutt-1.5.16-gentoo-patches-r1.tar.bz2 58021
+SHA256 2bcee97b6dbb0cae997b6a1bf640520e719aa3c15ce4de67f2e5779a830d4cbd mutt-1.5.16-gentoo-patches-r1.tar.bz2 58021
+MD5 10eff7024dbb7ce1f773d688a69ea9db mutt-1.5.16.tar.gz 3534894
+RMD160 3b345599aa62a956b9c881994ffd74156a5bf808 mutt-1.5.16.tar.gz 3534894
+SHA256 825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83 mutt-1.5.16.tar.gz 3534894
+MD5 27dbb0fb7412d809f38818915416c355 patch-1.5.16.sidebar-nntp.20070704.txt 49242
+RMD160 b4c2b2d8b1a55731e09116578c061b31d1ba53f5 patch-1.5.16.sidebar-nntp.20070704.txt 49242
+SHA256 03ca4455c443be37bcae4aa26b3b6b3029cd33485562d59b5e180c49c265a5b4 patch-1.5.16.sidebar-nntp.20070704.txt 49242
+MD5 e6e1a6e258ec6ce6ee489b0f3ff8e2cf patch-1.5.16.sidebar.20070704.txt 51103
+RMD160 a91a1eefe48c15a048231a632fe285cb2360f365 patch-1.5.16.sidebar.20070704.txt 51103
+SHA256 49123e14bebd33d0e8c7733cab319f3e5bfa591d5f5d74a3dd8964b44bf34ae7 patch-1.5.16.sidebar.20070704.txt 51103
diff --git a/mail-client/mutt/files/mutt-1.5.11-fix-smime.patch b/mail-client/mutt/files/mutt-1.5.11-fix-smime.patch
new file mode 100644
index 0000000..b91fdcc
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.11-fix-smime.patch
@@ -0,0 +1,11 @@
+diff -u -r3.43 -r3.44
+--- mutt/smime.c	2005/09/17 20:46:11	3.43
++++ mutt/smime.c	2005/10/05 19:20:22	3.44
+@@ -1989,7 +1989,6 @@
+ 
+     if ((p = smime_ask_for_key (_("Sign as: "), NULL, 0))) 
+     {
+-      p[mutt_strlen (p)-1] = '\0';
+       mutt_str_replace (&SmimeDefaultKey, p);
+ 	
+       msg->security |= SIGN;
diff --git a/mail-client/mutt/files/mutt-1.5.11-imap-browse.patch b/mail-client/mutt/files/mutt-1.5.11-imap-browse.patch
new file mode 100644
index 0000000..b396e28
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.11-imap-browse.patch
@@ -0,0 +1,38 @@
+commit 850d4a6b78730344ad7bb1d2a04cfcd35def3fec
+Author: brendan <brendan>
+Date:   Mon Jun 19 18:14:03 2006 +0000
+
+    From: TAKAHASHI Tamotsu <tamo@momonga-linux.org>
+    
+    Fix browse_get_namespace() which could overflow ns[LONG_STRING].
+    (Possible remote vulnerability)
+
+diff --git a/imap/browse.c b/imap/browse.c
+index bc2d036..43463ba 100644
+--- a/imap/browse.c
++++ b/imap/browse.c
+@@ -505,7 +505,7 @@ static int browse_get_namespace (IMAP_DA
+ 	    if (*s == '\"')
+ 	    {
+ 	      s++;
+-	      while (*s && *s != '\"') 
++	      while (*s && *s != '\"' && n < sizeof (ns) - 1) 
+ 	      {
+ 		if (*s == '\\')
+ 		  s++;
+@@ -516,12 +516,14 @@ static int browse_get_namespace (IMAP_DA
+ 		s++;
+ 	    }
+ 	    else
+-	      while (*s && !ISSPACE (*s)) 
++	      while (*s && !ISSPACE (*s) && n < sizeof (ns) - 1)
+ 	      {
+ 		ns[n++] = *s;
+ 		s++;
+ 	      }
+ 	    ns[n] = '\0';
++	    if (n == sizeof (ns) - 1)
++	      dprint (1, (debugfile, "browse_get_namespace: too long: [%s]\n", ns));
+ 	    /* delim? */
+ 	    s = imap_next_word (s);
+ 	    /* delimiter is meaningless if namespace is "". Why does
diff --git a/mail-client/mutt/files/mutt-1.5.11-sasl.patch b/mail-client/mutt/files/mutt-1.5.11-sasl.patch
new file mode 100644
index 0000000..5267846
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.11-sasl.patch
@@ -0,0 +1,23 @@
+--- configure.in.old	2005-09-19 22:07:56.000000000 +0200
++++ configure.in	2005-09-19 22:09:00.000000000 +0200
+@@ -600,14 +600,14 @@
+ AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
+ 
+ AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL 2 network security library]),
+-        [
+-        if test "$need_socket" != "yes"
+-        then
+-          AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
+-        fi
+-
++        [	
+         if test "$with_sasl" != "no"
+         then
++          if test "$need_socket" != "yes"
++          then
++            AC_MSG_ERROR([SASL support is only useful with POP or IMAP support])
++          fi
++
+           if test "$with_sasl" != "yes"
+           then
+             CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
diff --git a/mail-client/mutt/files/mutt-1.5.12-fix-pop-c.patch b/mail-client/mutt/files/mutt-1.5.12-fix-pop-c.patch
new file mode 100644
index 0000000..c0bb0a4
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.12-fix-pop-c.patch
@@ -0,0 +1,20 @@
+From: brendan <brendan>
+Date: Wed, 19 Jul 2006 23:29:54 +0000 (+0000)
+Subject: From: Rocco Rutte <pdmef@gmx.net>
+X-Git-Url: http://dev.mutt.org/cgi-bin/gitweb.cgi?p=mutt/.git;a=commitdiff;h=4734283f3a1f3209453f275710313673352fc288
+
+  From: Rocco Rutte <pdmef@gmx.net>
+  
+  Fix linking for body cache without IMAP support.
+---
+
+--- a/configure.in
++++ b/configure.in
+@@ -500,6 +500,7 @@ AC_ARG_ENABLE(pop,  AC_HELP_STRING([--en
+ [       if test x$enableval = xyes ; then
+                 AC_DEFINE(USE_POP,1,[ Define if you want support for the POP3 protocol. ])
+                 MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pop.o pop_lib.o pop_auth.o"
++                need_pop="yes"
+                 need_socket="yes"
+                 need_md5="yes"
+         fi
diff --git a/mail-client/mutt/files/mutt-1.5.13-paranoid-temp-file.patch b/mail-client/mutt/files/mutt-1.5.13-paranoid-temp-file.patch
new file mode 100644
index 0000000..56ed1c2
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.13-paranoid-temp-file.patch
@@ -0,0 +1,100 @@
+commit f8c42c6286f3077fc8762ba2c8323026b736a3e8
+Author: roessler <roessler>
+Date:   Mon Oct 9 13:39:38 2006 +0000
+
+    From: Thomas Roessler <roessler@does-not-exist.org>
+    
+    Even more paranoid temporary file creation.
+
+diff --git a/lib.c b/lib.c
+index aac0742..d672a8a 100644
+--- a/lib.c
++++ b/lib.c
+@@ -481,14 +481,85 @@ int safe_rename (const char *src, const
+   return 0;
+ }
+ 
++/* Create a temporary directory next to a file name */
++
++int mutt_mkwrapdir (const char *path, char *newfile, size_t nflen, 
++		    char *newdir, size_t ndlen)
++{
++  const char *basename;
++  char parent[_POSIX_PATH_MAX];
++  char *p;
++  int rv;
++
++  strfcpy (parent, NONULL (path), sizeof (parent));
++  
++  if ((p = strrchr (parent, '/')))
++  {
++    *p = '\0';
++    basename = p + 1;
++  }
++  else
++  {
++    strfcpy (parent, ".", sizeof (parent));
++    basename = path;
++  }
++
++  do 
++  {
++    snprintf (newdir, ndlen, "%s/%s", parent, ".muttXXXXXX");
++    mktemp (newdir);
++  } 
++  while ((rv = mkdir (newdir, 0700)) == -1 && errno == EEXIST);
++  
++  if (rv == -1)
++    return -1;
++  
++  snprintf (newfile, nflen, "%s/%s", newdir, NONULL(basename));
++  return 0;  
++}
++
++int mutt_put_file_in_place (const char *path, const char *safe_file, const char *safe_dir)
++{
++  int rv;
++  
++  rv = safe_rename (safe_file, path);
++  unlink (safe_file);
++  rmdir (safe_dir);
++  return rv;
++}
++
+ int safe_open (const char *path, int flags)
+ {
+   struct stat osb, nsb;
+   int fd;
+ 
+-  if ((fd = open (path, flags, 0600)) < 0)
+-    return fd;
++  if (flags & O_EXCL) 
++  {
++    char safe_file[_POSIX_PATH_MAX];
++    char safe_dir[_POSIX_PATH_MAX];
+ 
++    if (mutt_mkwrapdir (path, safe_file, sizeof (safe_file),
++			safe_dir, sizeof (safe_dir)) == -1)
++      return -1;
++    
++    if ((fd = open (safe_file, flags, 0600)) < 0)
++    {
++      rmdir (safe_dir);
++      return fd;
++    }
++    
++    if (mutt_put_file_in_place (path, safe_file, safe_dir) == -1)
++    {
++      close (fd);
++      return -1;
++    }
++  }
++  else
++  {
++    if ((fd = open (path, flags, 0600)) < 0)
++      return fd;
++  }
++    
+   /* make sure the file is not symlink */
+   if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
+       compare_stat(&osb, &nsb) == -1)
diff --git a/mail-client/mutt/files/mutt-1.5.13-sasl.patch b/mail-client/mutt/files/mutt-1.5.13-sasl.patch
new file mode 100644
index 0000000..7cefa2e
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.13-sasl.patch
@@ -0,0 +1,74 @@
+
+# HG changeset patch
+# User Brendan Cully <brendan@kublai.com>
+# Date 1157736633 0
+# Node ID 4b8ef24b823e8295d58f599cb1d7014270dec064
+# Parent 6fd5fb51a9dc102a1b39dcda26201c60215ee954
+Don't send protocol garbage to sasl_decode64 during POP authentication.
+Also enable SASL plaintext: $foo_authenticators is a more general solution.
+
+--- a/mutt_sasl.c	Fri Sep 08 15:45:57 2006 +0000
++++ b/mutt_sasl.c	Fri Sep 08 17:30:33 2006 +0000
+@@ -221,15 +221,10 @@ int mutt_sasl_client_new (CONNECTION* co
+     return -1;
+   }
+ 
+-  /* set security properties. We use NOPLAINTEXT globally, since we can
+-   * just fall back to LOGIN in the IMAP case anyway. If that doesn't
+-   * work for POP, we can make it a flag or move this code into
+-   * imap/auth_sasl.c */
+   memset (&secprops, 0, sizeof (secprops));
+   /* Work around a casting bug in the SASL krb4 module */
+   secprops.max_ssf = 0x7fff;
+   secprops.maxbufsize = M_SASL_MAXBUF;
+-  secprops.security_flags |= SASL_SEC_NOPLAINTEXT;
+   if (sasl_setprop (*saslconn, SASL_SEC_PROPS, &secprops) != SASL_OK)
+   {
+     dprint (1, (debugfile,
+--- a/pop_auth.c	Fri Sep 08 15:45:57 2006 +0000
++++ b/pop_auth.c	Fri Sep 08 17:30:33 2006 +0000
+@@ -46,8 +46,7 @@ static pop_auth_res_t pop_auth_sasl (POP
+   char inbuf[LONG_STRING];
+   const char* mech;
+   const char *pc = NULL;
+-  unsigned int len, olen;
+-  unsigned char client_start;
++  unsigned int len, olen, client_start;
+ 
+   if (mutt_sasl_client_new (pop_data->conn, &saslconn) < 0)
+   {
+@@ -74,7 +73,7 @@ static pop_auth_res_t pop_auth_sasl (POP
+     return POP_A_UNAVAIL;
+   }
+ 
+-  client_start = (olen > 0);
++  client_start = olen;
+ 
+   mutt_message _("Authenticating (SASL)...");
+ 
+@@ -93,11 +92,11 @@ static pop_auth_res_t pop_auth_sasl (POP
+       return POP_A_SOCKET;
+     }
+ 
+-    if (rc != SASL_CONTINUE)
++    if (!client_start && rc != SASL_CONTINUE)
+       break;
+ 
+     if (!mutt_strncmp (inbuf, "+ ", 2)
+-        && sasl_decode64 (inbuf, strlen (inbuf), buf, LONG_STRING-1, &len) != SASL_OK)
++        && sasl_decode64 (inbuf+2, strlen (inbuf+2), buf, LONG_STRING-1, &len) != SASL_OK)
+     {
+       dprint (1, (debugfile, "pop_auth_sasl: error base64-decoding server response.\n"));
+       goto bail;
+@@ -112,7 +111,10 @@ static pop_auth_res_t pop_auth_sasl (POP
+ 	mutt_sasl_interact (interaction);
+       }
+     else
++    {
++      olen = client_start;
+       client_start = 0;
++    }
+ 
+     if (rc != SASL_CONTINUE && (olen == 0 || rc != SASL_OK))
+       break;
+
diff --git a/mail-client/mutt/files/mutt-1.5.15-parallel-make.patch b/mail-client/mutt/files/mutt-1.5.15-parallel-make.patch
new file mode 100644
index 0000000..e5026ee
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.15-parallel-make.patch
@@ -0,0 +1,16 @@
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index c151d56..b1b5784 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -130,10 +130,9 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
+ mutt.1: $(srcdir)/mutt.man
+ 	$(EDIT) $(srcdir)/mutt.man > $@
+ 
+-stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
++stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
+                manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
+                $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog
+-	$(MAKE) -j1 ../makedoc$(EXEEXT) # we do not want to rebuild the documentation in tarball builds
+ 	( date=`head -n 1 $(top_srcdir)/ChangeLog | LC_ALL=C cut -d ' ' -f 1` && \
+ 	  sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` ($$date)/" $(srcdir)/manual.xml.head && \
+ 	  $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s && \
diff --git a/mail-client/mutt/files/mutt-1.5.16-parallel-make.patch b/mail-client/mutt/files/mutt-1.5.16-parallel-make.patch
new file mode 100644
index 0000000..9fb39c8
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.16-parallel-make.patch
@@ -0,0 +1,34 @@
+diff --git a/Makefile.am b/Makefile.am
+index 1f36629..20d205e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,14 +2,16 @@
+ ## Use aclocal -I m4; automake --foreign
+ 
+ AUTOMAKE_OPTIONS = 1.6 foreign
+-EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap makedoc
++EXTRA_PROGRAMS = mutt_dotlock pgpring pgpewrap
++
++noinst_PROGRAMS = makedoc
+ 
+ if BUILD_IMAP
+ IMAP_SUBDIR = imap
+ IMAP_INCLUDES = -I$(top_srcdir)/imap
+ endif
+ 
+-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 po intl $(IMAP_SUBDIR) . doc contrib
+ 
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ 
+@@ -37,10 +39,6 @@ mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
+ mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
+ 	$(INTLDEPS)
+ 
+-makedoc_SOURCES = makedoc.c
+-makedoc_LDADD =
+-makedoc_DEPENDENCIES = 
+-
+ # $(makedoc_OBJECTS): $(makedoc_SOURCES)
+ # 	$(HOST_CC) $(DEFS) $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $<
+ 
diff --git a/mail-client/mutt/files/slang.patch b/mail-client/mutt/files/slang.patch
new file mode 100644
index 0000000..f3740bd
--- /dev/null
+++ b/mail-client/mutt/files/slang.patch
@@ -0,0 +1,19 @@
+diff -Naurbd mutt-1.5.6~orig/menu.c mutt-1.5.6/menu.c
+--- mutt-1.5.6~orig/menu.c	2004-02-12 01:00:30.537293896 +0000
++++ mutt-1.5.6/menu.c	2004-02-12 01:00:35.748501672 +0000
+@@ -45,6 +45,7 @@
+   {
+     if (*s < M_TREE_MAX)
+     {
++#ifndef USE_SLANG_CURSES
+       if (do_color)
+       {
+ 	pair_content(PAIR_NUMBER(ColorDefs[MT_COLOR_TREE]), &f1, &b1);
+@@ -52,6 +53,7 @@
+ 	if (b1 == b2)
+ 	  SETCOLOR (MT_COLOR_TREE);
+       }
++#endif
+       while (*s && *s < M_TREE_MAX)
+       {
+ 	switch (*s)