File mutt-1.10.0.dif of Package mutt.17615

---
 configure.ac    |   18 +++++++++++++-----
 doc/Muttrc.head |    2 +-
 imap/auth.c     |   22 ++++++++++++++++++++++
 mx.c            |    3 +++
 4 files changed, 39 insertions(+), 6 deletions(-)

--- configure.ac
+++ configure.ac	2018-07-04 11:58:54.469266378 +0000
@@ -257,7 +257,7 @@ main ()
                         mutt_cv_slang=$withval
                         if test -d $withval/include/slang; then
                                 CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
-                        elif test -d $withval/include; then
+                        elif test -d $withval/include && $withval != /usr ; then
                                 CPPFLAGS="$CPPFLAGS -I${withval}/include"
                         fi
                         LDFLAGS="$LDFLAGS -L${withval}/lib"
@@ -700,8 +700,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
 	  else
             if test "$with_ssl" != "yes"
             then
-             LDFLAGS="$LDFLAGS -L$withval/lib"
-             CPPFLAGS="$CPPFLAGS -I$withval/include"
+             case $withval in /usr|/usr/local) ;;
+             *)
+               LDFLAGS="$LDFLAGS -L$withval/lib"
+               CPPFLAGS="$CPPFLAGS -I$withval/include"
+               ;;
+             esac
             fi
             saved_LIBS="$LIBS"
 
@@ -788,8 +792,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
 
           if test "$with_sasl" != "yes"
           then
-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
-            LDFLAGS="$LDFLAGS -L$with_sasl/lib"
+            case $with_sasl in /usr|/usr/local) ;;
+            *)
+              CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
+              LDFLAGS="$LDFLAGS -L$with_sasl/lib"
+              ;;
+            esac
           fi
 
           saved_LIBS="$LIBS"
--- doc/Muttrc.head
+++ doc/Muttrc.head	2018-07-04 11:53:27.427203358 +0000
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
 "call urlview to extract URLs out of a message"
 
 # Show documentation when pressing F1
-macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
+macro generic,index,pager <F1> "<shell-escape> less @docdir@/manual.txt.gz<Enter>" "show Mutt documentation"
 
 # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
 macro index y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
--- imap/auth.c
+++ imap/auth.c	2018-07-04 11:52:06.288675786 +0000
@@ -72,6 +72,25 @@ int imap_authenticate (IMAP_DATA* idata)
       dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method));
       authenticator = imap_authenticators;
 
+#ifdef USE_SASL
+      /* "login" not supported by SASL */
+      if (!ascii_strcasecmp ("login", method))
+      {
+	while (authenticator->authenticate)
+	{
+	  const char *identify = authenticator->method;
+	  if (identify && !ascii_strcasecmp(identify, method))
+	    if ((r = authenticator->authenticate(idata, method)) !=
+		IMAP_AUTH_UNAVAIL)
+	    {
+	      FREE(&methods);
+	      return r;
+	    }
+
+	  authenticator++;
+	}
+      } else {
+#endif
       while (authenticator->authenticate)
       {
 	if (!authenticator->method ||
@@ -85,6 +104,9 @@ int imap_authenticate (IMAP_DATA* idata)
 	
 	authenticator++;
       }
+#ifdef USE_SASL
+      }
+#endif
     }
 
     FREE (&methods);
--- mx.c
+++ mx.c	2018-07-04 11:24:07.179272240 +0000
@@ -1400,6 +1400,9 @@ void mx_update_context (CONTEXT *ctx, in
   {
     h = ctx->hdrs[msgno];
 
+    if (!h)
+      continue;
+
     if (WithCrypto)
     {
       /* NOTE: this _must_ be done before the check for mailcap! */