Accepting request 415277 from server:mail

- Update to mutt version 1.6.2 (2016-07-01):
  * send.c: Check $pgp_autoinline and $pgp_replyinline if oppenc is set.
    (closes #3846)
  * The first oppenc call takes place after the initial checks of
    $pgp_autoline and $pgp_replyinline, and doesn't go through the pgp
    menu.
  * Therefore, check for $pgp_autoline and $pgp_replyinline if oppenc is
    set too, to avoid oppenc enabling encryption without INLINE being
    set in those cases.
  * a6a4d6ed0f19 previously cleaned things up so that it is safe to set
    INLINE even if encryption isn't enabled.
  * keymap.c: Fix infinite loop when help is bound to a named key
    combination.
  * Commit a07e8215a0ef introduced a bug in km_error_key, which is
    called when an unbound key is pressed.
  * If help is bound to a sequence containing named keys (e.g. <esc>),
    the raw (untokenized) string would be pushed back into the unget
    buffer. This could lead to an infinite loop of unbound key presses
    triggering more unbound keys being put into the unget buffer.
  * Change km_error_key to tokenize the string before putting it in the
    unget buffer.
  * Much thanks to Jiri Bohac for his bug report, analysis, and initial
    patch!
- Update to neomutt 20160723
  New Features
    New Mail Command - Execute a command on receipt of new mail
    vim-keybindings - Mutt config for vim users
    LMDB - In-memory header caching database
    SMIME Encrypt to Self - Secure storage of sensitive email
  Bug Fixes

OBS-URL: https://build.opensuse.org/request/show/415277
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=72

COLS-workaround.dif

@@ -1,33 +1,12 @@
-Current neomutt sidebar patch does change COLS which does
+Use professionel VLINE 
-not work with threadsafe ncurses6. Beside this: do not
-bother other non-sidebar users as well make sidebar delimeter
-look well.
 
 ---
- configure.ac |    8 ++++++++
+ sidebar.c |    9 ++++++++-
- sidebar.c    |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
- 2 files changed, 16 insertions(+), 1 deletion(-)
 
---- configure.ac
-+++ configure.ac	2016-06-13 09:03:34.248832759 +0000
-@@ -312,6 +312,14 @@ main ()
-                 if test x$mutt_cv_curses != x/usr; then
-                         LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib"
-                         CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include"
-+                fi
-+                if test -d /usr/include/ncurses5 ; then
-+                        if test -d /usr/lib64/ncurses5 ; then
-+                            LDFLAGS="$LDFLAGS -L/usr/lib64/ncurses5"
-+                        else
-+                            LDFLAGS="$LDFLAGS -L/usr/lib/ncurses5"
-+                        fi
-+                        CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses5"
-                 fi])
- 
- 	AC_CHECK_FUNC(initscr,,[
 --- sidebar.c
-+++ sidebar.c	2016-06-13 09:10:18.201095164 +0000
++++ sidebar.c	2016-07-26 12:32:38.170166748 +0000
-@@ -651,6 +651,7 @@ static int draw_divider (int first_row,
+@@ -547,6 +547,7 @@ static int draw_divider (int first_row,
  {
    /* Calculate the width of the delimiter in screen cells */
    int delim_len = mutt_strwidth (SidebarDividerChar);
@@ -35,7 +14,7 @@ look well.
  
    if (delim_len < 1)
      return delim_len;
-@@ -661,13 +662,19 @@ static int draw_divider (int first_row,
+@@ -557,13 +558,19 @@ static int draw_divider (int first_row,
    if (delim_len > SidebarWidth)
      return -1;
  

aw.listreply.diff

@@ -8,15 +8,15 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
  4 files changed, 27 insertions(+)
 
 --- PATCHES
-+++ PATCHES	2016-06-13 09:01:38.147057961 +0000
++++ PATCHES	2016-07-26 12:00:27.319169243 +0000
 @@ -1,3 +1,4 @@
 +patch-1.5.9.aw.listreply.1
- patch-quasi-delete-neo-20160612
+ patch-new-mail-neo-git
- patch-progress-neo-20160612
+ patch-lmdb-neo-git
- patch-status-color-neo-20160612
+ patch-nntp-neo-git
 --- init.h
-+++ init.h	2016-06-13 09:00:11.228724235 +0000
++++ init.h	2016-07-26 11:59:58.319724690 +0000
-@@ -1492,6 +1492,13 @@ struct option_t MuttVars[] = {
+@@ -1501,6 +1501,13 @@ struct option_t MuttVars[] = {
    ** The locale used by \fCstrftime(3)\fP to format dates. Legal values are
    ** the strings your system accepts for the locale environment variable \fC$$$LC_TIME\fP.
    */
@@ -31,8 +31,8 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
    /*
    ** .pp
 --- mutt.h
-+++ mutt.h	2016-06-13 09:00:11.228724235 +0000
++++ mutt.h	2016-07-26 11:59:58.323724614 +0000
-@@ -313,6 +313,7 @@ enum
+@@ -314,6 +314,7 @@ enum
  #endif
    OPT_SUBJECT,
    OPT_VERIFYSIG,      /* verify PGP signatures */
@@ -41,7 +41,7 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
    OPT_TOMODERATED,
    OPT_CATCHUP,
 --- send.c
-+++ send.c	2016-06-13 09:00:11.228724235 +0000
++++ send.c	2016-07-26 11:59:58.323724614 +0000
 @@ -516,6 +516,7 @@ static int include_reply (CONTEXT *ctx,
  static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
  {

bug-676388-largefile.patch

@@ -5,7 +5,7 @@
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 --- crypt-gpgme.c
-+++ crypt-gpgme.c	2016-06-13 08:59:27.309566323 +0000
++++ crypt-gpgme.c	2016-07-26 11:56:20.223902163 +0000
 @@ -496,7 +496,7 @@ static gpgme_data_t body_to_data_object
  /* Create a GPGME data object from the stream FP but limit the object
     to LENGTH bytes starting at OFFSET bytes from the beginning of the
@@ -16,8 +16,8 @@
    int err = 0;
    gpgme_data_t data;
 --- mh.c
-+++ mh.c	2016-06-13 08:59:27.309566323 +0000
++++ mh.c	2016-07-26 11:56:20.223902163 +0000
-@@ -1619,9 +1619,9 @@ static int mh_rewrite_message (CONTEXT *
+@@ -1625,9 +1625,9 @@ static int mh_rewrite_message (CONTEXT *
    char newpath[_POSIX_PATH_MAX];
    char partpath[_POSIX_PATH_MAX];
  
@@ -31,8 +31,8 @@
    if ((dest = mx_open_new_message (ctx, h, 0)) == NULL)
      return -1;
 --- mutt.h
-+++ mutt.h	2016-06-13 08:59:27.309566323 +0000
++++ mutt.h	2016-07-26 11:56:20.223902163 +0000
-@@ -729,7 +729,7 @@ typedef struct body
+@@ -730,7 +730,7 @@ typedef struct body
    PARAMETER *parameter;         /* parameters of the content-type */
    char *description;            /* content-description */
    char *form_name;		/* Content-Disposition form-data name param */

mutt-1.5.15-wrapcolumn.diff

@@ -5,8 +5,8 @@ Index: init.h
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 --- init.h
-+++ init.h	2016-05-31 11:13:06.686215217 +0000
++++ init.h	2016-07-26 11:55:23.592986926 +0000
-@@ -4020,7 +4020,8 @@ struct option_t MuttVars[] = {
+@@ -4052,7 +4052,8 @@ struct option_t MuttVars[] = {
    ** When \fIset\fP, mutt will weed headers when displaying, forwarding,
    ** printing, or replying to messages.
    */

mutt-1.5.20-sendgroupreplyto.diff

@@ -5,8 +5,8 @@
  3 files changed, 16 insertions(+)
 
 --- init.h
-+++ init.h	2016-05-31 11:12:26.410983323 +0000
++++ init.h	2016-07-26 11:54:46.725693126 +0000
-@@ -2860,6 +2860,13 @@ struct option_t MuttVars[] = {
+@@ -2885,6 +2885,13 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Also see the $$force_name variable.
    */
@@ -21,8 +21,8 @@
    /*
    ** .pp
 --- mutt.h
-+++ mutt.h	2016-05-31 11:12:26.410983323 +0000
++++ mutt.h	2016-07-26 11:54:46.725693126 +0000
-@@ -480,6 +480,7 @@ enum
+@@ -482,6 +482,7 @@ enum
    OPTSAVEADDRESS,
    OPTSAVEEMPTY,
    OPTSAVENAME,
@@ -31,7 +31,7 @@
  #ifdef USE_SIDEBAR
    OPTSIDEBAR,
 --- send.c
-+++ send.c	2016-05-31 11:12:26.414983246 +0000
++++ send.c	2016-07-26 11:54:46.725693126 +0000
 @@ -624,8 +624,16 @@ int mutt_fetch_recips (ENVELOPE *out, EN
      if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES))
      {

mutt-1.5.21-mailcap.diff

@@ -8,8 +8,8 @@ Index: mutt-1.5.21/init.c
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- init.c
-+++ init.c	2016-05-31 11:15:25.291571898 +0000
++++ init.c	2016-07-26 12:03:14.963958298 +0000
-@@ -3322,8 +3322,8 @@ void mutt_init (int skip_sys_rc, LIST *c
+@@ -3330,8 +3330,8 @@ void mutt_init (int skip_sys_rc, LIST *c
      MailcapPath = safe_strdup (p);
    else
    {

mutt-1.5.21-tinfo.dif

@@ -1,23 +0,0 @@
----
- configure.ac |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
---- configure.ac
-+++ configure.ac	2016-06-13 09:00:11.224724311 +0000
-@@ -320,9 +320,14 @@ main ()
- 	do
- 		AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
- 	done
-+	cf_tinfo=""
-+	AC_CHECK_LIB(tinfo, tgetent, [cf_tinfo="tinfo"])
-         AC_CHECK_LIB($cf_ncurses, initscr,
--                [MUTTLIBS="$MUTTLIBS -l$cf_ncurses"
--		
-+                [if test x$cf_tinfo = x ; then
-+			MUTTLIBS="$MUTTLIBS -l$cf_ncurses"
-+		else
-+			MUTTLIBS="$MUTTLIBS -l$cf_ncurses -l$cf_tinfo"
-+		fi
-                 if test "$cf_ncurses" = ncursesw; then
- 			AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"])
- 		else

mutt-1.6.1-opennfs.dif

@@ -1,16 +1,16 @@
 ---
  Makefile.am |    4 -
  Makefile.in |    6 +-
- lib.c       |    7 ++-
+ lib.c       |   15 ++++---
  mbox.c      |    2 
  mh.c        |    9 +++-
  mutt.h      |    1 
  opennfs.c   |  122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  sendlib.c   |    2 
- 8 files changed, 144 insertions(+), 9 deletions(-)
+ 8 files changed, 148 insertions(+), 13 deletions(-)
 
 --- Makefile.am
-+++ Makefile.am	2016-06-13 08:58:36.526540129 +0000
++++ Makefile.am	2016-07-26 12:15:17.066117600 +0000
 @@ -32,7 +32,7 @@ mutt_SOURCES = \
  	edit.c enter.c flags.c init.c filter.c from.c \
  	getdomain.c group.c \
@@ -20,7 +20,7 @@
  	postpone.c query.c recvattach.c recvcmd.c \
  	rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
  	score.c send.c sendlib.c signal.c sort.c \
-@@ -96,7 +96,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
+@@ -97,7 +97,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
  mutt_dotlock_LDADD = $(LIBOBJS)
  mutt_dotlock_DEPENDENCIES = $(LIBOBJS)
  
@@ -30,7 +30,7 @@
  pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS)
  
 --- Makefile.in
-+++ Makefile.in	2016-06-13 08:58:36.526540129 +0000
++++ Makefile.in	2016-07-26 12:15:17.070117523 +0000
 @@ -125,7 +125,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
  	hash.$(OBJEXT) hdrline.$(OBJEXT) headers.$(OBJEXT) \
  	help.$(OBJEXT) hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) \
@@ -59,7 +59,7 @@
  	rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
  	score.c send.c sendlib.c signal.c sort.c \
 --- lib.c
-+++ lib.c	2016-06-13 08:58:36.526540129 +0000
++++ lib.c	2016-07-26 12:16:00.365287507 +0000
 @@ -50,6 +50,7 @@
  #define EX_OK 0
  #endif
@@ -68,7 +68,41 @@
  #include "lib.h"
  
  
-@@ -637,6 +638,10 @@ int safe_open (const char *path, int fla
+@@ -545,7 +546,7 @@ int safe_rename (const char *src, const
+ 
+ 
+ /* Create a temporary directory next to a file name */
+-
++#if defined(__linux__)
+ static int mutt_mkwrapdir (const char *path, char *newfile, size_t nflen, 
+ 		    char *newdir, size_t ndlen)
+ {
+@@ -581,7 +582,7 @@ static int mutt_mkwrapdir (const char *p
+   }
+   return 0;  
+ }
+-
++#endif
+ /* remove a directory and everything under it */
+ int mutt_rmtree (const char* path)
+ {
+@@ -621,7 +622,7 @@ int mutt_rmtree (const char* path)
+ 
+   return rc;
+ }
+-
++#if defined(__linux__)
+ static int mutt_put_file_in_place (const char *path, const char *safe_file, const char *safe_dir)
+ {
+   int rv;
+@@ -631,12 +632,16 @@ static int mutt_put_file_in_place (const
+   rmdir (safe_dir);
+   return rv;
+ }
+-
++#endif
+ int safe_open (const char *path, int flags)
+ {
    struct stat osb, nsb;
    int fd;
  
@@ -89,8 +123,8 @@
    if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
        compare_stat(&osb, &nsb) == -1)
 --- mbox.c
-+++ mbox.c	2016-06-13 08:58:36.526540129 +0000
++++ mbox.c	2016-07-26 12:15:17.070117523 +0000
-@@ -785,7 +785,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
+@@ -781,7 +781,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
  
    /* Create a temporary file to write the new version of the mailbox in. */
    mutt_mktemp (tempfile, sizeof (tempfile));
@@ -100,8 +134,8 @@
    {
      if (-1 != i)
 --- mh.c
-+++ mh.c	2016-06-13 08:58:36.526540129 +0000
++++ mh.c	2016-07-26 12:15:17.070117523 +0000
-@@ -352,7 +352,11 @@ static int mh_mkstemp (CONTEXT * dest, F
+@@ -358,7 +358,11 @@ static int mh_mkstemp (CONTEXT * dest, F
    {
      snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%" PRIu64,
  	      dest->path, NONULL (Hostname), (int) getpid (), mutt_rand64());
@@ -113,7 +147,7 @@
      {
        if (errno != EEXIST)
        {
-@@ -1376,8 +1380,11 @@ int maildir_open_new_message (MESSAGE *
+@@ -1382,8 +1386,11 @@ int maildir_open_new_message (MESSAGE *
  
      dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
  		path));
@@ -127,15 +161,15 @@
        if (errno != EEXIST)
        {
 --- mutt.h
-+++ mutt.h	2016-06-13 08:58:36.526540129 +0000
++++ mutt.h	2016-07-26 12:15:17.070117523 +0000
-@@ -1078,4 +1078,5 @@ typedef struct
+@@ -1075,4 +1075,5 @@ typedef struct
  #include "lib.h"
  #include "globals.h"
  
 +extern int opennfs(const char *, int, int);
  #endif /*MUTT_H*/
 --- opennfs.c
-+++ opennfs.c	2016-06-13 08:58:36.526540129 +0000
++++ opennfs.c	2016-07-26 12:15:17.070117523 +0000
 @@ -0,0 +1,122 @@
 +#include <errno.h>
 +#include <fcntl.h>
@@ -260,7 +294,7 @@
 +    return open(path, flags, mode);
 +}
 --- sendlib.c
-+++ sendlib.c	2016-06-13 08:58:36.526540129 +0000
++++ sendlib.c	2016-07-26 12:15:17.070117523 +0000
 @@ -2260,7 +2260,7 @@ send_msg (const char *path, char **args,
        if (SendmailWait >= 0 && tempfile && *tempfile)
        {

mutt-1.6.1-patches.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e0e55cb6809db0943ef6d9c0add765eef67d08c66891d00423b033f607dd0e7
-size 251

mutt-1.6.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20
-size 3956840

mutt-1.6.2.dif

@@ -9,7 +9,7 @@
  7 files changed, 112 insertions(+), 30 deletions(-)
 
 --- configure.ac
-+++ configure.ac	2016-06-13 08:57:37.543671328 +0000
++++ configure.ac	2016-07-26 11:50:00.711172022 +0000
 @@ -281,7 +281,7 @@ main ()
                          mutt_cv_slang=$withval
                          if test -d $withval/include/slang; then
@@ -19,7 +19,7 @@
                                  CPPFLAGS="$CPPFLAGS -I${withval}/include"
                          fi
                          LDFLAGS="$LDFLAGS -L${withval}/lib"
-@@ -720,8 +720,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
+@@ -722,8 +722,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
  	  else
              if test "$with_ssl" != "yes"
              then
@@ -32,7 +32,7 @@
              fi
              saved_LIBS="$LIBS"
  
-@@ -800,8 +804,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
+@@ -802,8 +806,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
  
            if test "$with_sasl" != "yes"
            then
@@ -46,7 +46,7 @@
  
            saved_LIBS="$LIBS"
 --- doc/Makefile.in
-+++ doc/Makefile.in	2016-06-13 08:57:37.543671328 +0000
++++ doc/Makefile.in	2016-07-26 11:50:00.711172022 +0000
 @@ -697,7 +697,7 @@ uninstall-local:
  
  check:
@@ -57,7 +57,7 @@
  	LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
  
 --- doc/Muttrc.head
-+++ doc/Muttrc.head	2016-06-13 08:57:37.543671328 +0000
++++ doc/Muttrc.head	2016-07-26 11:50:00.711172022 +0000
 @@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
  "call urlview to extract URLs out of a message"
  
@@ -68,7 +68,7 @@
  # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
 --- doc/Muttrc
-+++ doc/Muttrc	2016-06-13 08:57:37.547671252 +0000
++++ doc/Muttrc	2016-07-26 11:50:00.711172022 +0000
 @@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
  "call urlview to extract URLs out of a message"
  
@@ -259,7 +259,7 @@
  #
  # Name: write_inc
 --- imap/auth.c
-+++ imap/auth.c	2016-06-13 08:57:37.547671252 +0000
++++ imap/auth.c	2016-07-26 11:50:00.711172022 +0000
 @@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata)
        dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method));
        authenticator = imap_authenticators;
@@ -270,7 +270,7 @@
 +      {
 +	while (authenticator->authenticate)
 +	{
-+	  char* identify = authenticator->method;
++	  const char *identify = authenticator->method;
 +	  if (identify && !ascii_strcasecmp(identify, method))
 +	    if ((r = authenticator->authenticate(idata, method)) != IMAP_AUTH_UNAVAIL)
 +	    {
@@ -295,8 +295,8 @@
  
      FREE (&methods);
 --- init.h
-+++ init.h	2016-06-13 08:57:37.547671252 +0000
++++ init.h	2016-07-26 11:50:00.715171945 +0000
-@@ -3570,6 +3570,9 @@ struct option_t MuttVars[] = {
+@@ -3601,6 +3601,9 @@ struct option_t MuttVars[] = {
    ** the default from the GNUTLS library.
    */
  # endif /* USE_SSL_GNUTLS */
@@ -307,8 +307,8 @@
    /*
    ** .pp
 --- mx.c
-+++ mx.c	2016-06-13 08:57:37.547671252 +0000
++++ mx.c	2016-07-26 11:50:00.715171945 +0000
-@@ -1832,6 +1832,9 @@ void mx_update_context (CONTEXT *ctx, in
+@@ -1829,6 +1829,9 @@ void mx_update_context (CONTEXT *ctx, in
    {
      h = ctx->hdrs[msgno];
  

mutt-1.6.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e
+size 3956745

mutt.changes

@@ -1,3 +1,65 @@
+-------------------------------------------------------------------
+Tue Jul 26 12:36:47 UTC 2016 - werner@suse.de
+
+- Update to mutt version 1.6.2 (2016-07-01):
+  * send.c: Check $pgp_autoinline and $pgp_replyinline if oppenc is set.
+    (closes #3846)
+  * The first oppenc call takes place after the initial checks of
+    $pgp_autoline and $pgp_replyinline, and doesn't go through the pgp
+    menu.
+  * Therefore, check for $pgp_autoline and $pgp_replyinline if oppenc is
+    set too, to avoid oppenc enabling encryption without INLINE being
+    set in those cases.
+  * a6a4d6ed0f19 previously cleaned things up so that it is safe to set
+    INLINE even if encryption isn't enabled.
+  * keymap.c: Fix infinite loop when help is bound to a named key
+    combination.
+  * Commit a07e8215a0ef introduced a bug in km_error_key, which is
+    called when an unbound key is pressed.
+  * If help is bound to a sequence containing named keys (e.g. <esc>),
+    the raw (untokenized) string would be pushed back into the unget
+    buffer. This could lead to an infinite loop of unbound key presses
+    triggering more unbound keys being put into the unget buffer.
+  * Change km_error_key to tokenize the string before putting it in the
+    unget buffer.
+  * Much thanks to Jiri Bohac for his bug report, analysis, and initial
+    patch!
+- Update to neomutt 20160723
+  New Features
+    New Mail Command - Execute a command on receipt of new mail
+    vim-keybindings - Mutt config for vim users
+    LMDB - In-memory header caching database
+    SMIME Encrypt to Self - Secure storage of sensitive email
+  Bug Fixes
+    rework mutt_draw_statusline()
+    fix cursor position after sidebar redraw
+    Add sidebar_format flag ‘%n’ to display ‘N’ on new mail.
+    fix index_format truncation problem
+    Fix compiler warnings due to always true condition
+    Change sidebar next/prev-new to look at buffy->new too.
+    Change the default for sidebar_format to use %n.
+    sidebar “unsorted” order to match Buffy list order.
+    Include ncurses tinfo library if found.
+    Sidebar width problem
+    sidebar crash for non-existent mailbox
+    Temporary compatibility workaround
+    Reset buffy->new for the current mailbox in IMAP.
+    version.sh regression
+    crash when notmuch tries to read a message (boo#986534)
+    status line wrapping
+- Modify patches
+  * COLS-workaround.dif
+  * aw.listreply.diff
+  * bug-676388-largefile.patch
+  * mutt-1.5.15-wrapcolumn.diff
+  * mutt-1.5.20-sendgroupreplyto.diff
+  * mutt-1.5.21-mailcap.diff
+  * mutt-1.6.1-opennfs.dif
+  * patch-1.5.24.vk.pgp_verbose_mime
+  * widechar.sidebar.dif
+- Rename patch mutt-1.6.1.dif to mutt-1.6.2.dif
+- Delete patch mutt-1.5.21-tinfo.dif
+
 -------------------------------------------------------------------
 Mon Jun 13 09:27:36 UTC 2016 - werner@suse.de
 

mutt.spec

@@ -71,8 +71,8 @@ Requires:       perl(Expect)
 # NOTE: We don't want this dependency and desktop-data-SuSE is in all
 # desktop selections.
 #Requires:      desktop-data-SuSE
-%global	neo     20160611
+%global	neo     20160723
-Version:        1.6.1
+Version:        1.6.2
 Release:        0
 Summary:        Mail Program
 License:        GPL-2.0+
@@ -86,10 +86,9 @@ Source4:        mutt.desktop
 Source5:        skel.muttrc
 Source6:        krb5-config
 Source7:        mutt-1.5.21.de.po
-Source8:        %name-%version-patches.tar.bz2
 Source9:        mutt.mailcap
 # http://www.neomutt.org/
-Source10:       neomutt-patches-%{neo}.tar.gz
+Source10:       neomutt-distro-%neo.tar.gz
 Patch:          %name-%version.dif
 # http://www.spinnaker.de/mutt/compressed/
 Patch2:         %name-1.5.9i-pgpewrap.diff
@@ -97,7 +96,6 @@ Patch3:         %name-1.5.20-sendgroupreplyto.diff
 Patch4:         %name-1.5.15-wrapcolumn.diff
 Patch7:         mutt-1.6.1-opennfs.dif
 Patch9:         bug-676388-largefile.patch
-Patch10:        mutt-1.5.21-tinfo.dif
 # http://www.wolfermann.org/mutt.html
 Patch11:        aw.listreply.diff
 Patch12:        patch-1.5.24.vk.pgp_verbose_mime
@@ -120,20 +118,29 @@ highlighting, threading, and PGP. It takes some time to get used to,
 however.
 
 %prep
-%setup -q -n mutt-%version -b 8 -b 10
+%setup -q -n mutt-%version -a 10
-for p in ../%name-%version-patches/*; do
+for p in neomutt-distro-%neo/bugs-common/*.patch
-    test -e $p || break
+do
-    echo Patch $p
+    patch -p1 --fuzz=%_default_patch_fuzz < $p
-    patch -s -p1 < $p
+done
+for p in neomutt-distro-%neo/features-common/*.patch
+do
+    patch -p1 --fuzz=%_default_patch_fuzz < $p
+done
+for p in neomutt-distro-%neo/features-extra/*.patch
+do
+    patch -p1 --fuzz=%_default_patch_fuzz < $p
+done
+for p in neomutt-distro-%neo/bugs-neomutt/*.patch
+do
+    patch -p1 --fuzz=%_default_patch_fuzz < $p
 done
-patch -s -p1 < ../neomutt-patches-%{neo}/mutt-%{version}/neomutt-%{neo}.patch
 %patch -p0 -b .p0
 %patch2 -p0 -b .pgpewrap
 %patch3 -p0 -b .sendgroupreplyto
 %patch4 -p0 -b .wrapcolumn
 %patch7 -p0 -b .opennfs
 %patch9 -p0 -b .largefile
-%patch10 -p0 -b .tinfo
 %patch11 -p0 -b .listreply
 %patch12 -p0 -b .pgp_verbose_mtime
 %patch15 -p0 -b .widechar.sidebar

neomutt-distro-20160723.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9c819c21b43315078458d490b1ddbbd49508e70016962bfaf3173af147617fd
+size 338862

neomutt-patches-20160611.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:495e136435091ac470bce75e607dffdb9a60f304a5e77f6e84dc530671637ffd
-size 449051

patch-1.5.24.vk.pgp_verbose_mime

@@ -6,15 +6,15 @@
  4 files changed, 17 insertions(+), 1 deletion(-)
 
 --- PATCHES
-+++ PATCHES	2016-06-13 09:02:59.501498661 +0000
++++ PATCHES	2016-07-26 12:01:20.102158263 +0000
 @@ -1,3 +1,4 @@
 +patch-1.5.3.vk.pgp_verbose_mime
  patch-1.5.9.aw.listreply.1
- patch-quasi-delete-neo-20160612
+ patch-new-mail-neo-git
- patch-progress-neo-20160612
+ patch-lmdb-neo-git
 --- globals.h
-+++ globals.h	2016-06-13 09:02:33.338000098 +0000
++++ globals.h	2016-07-26 12:00:59.278557107 +0000
-@@ -274,6 +274,8 @@ WHERE REGEXP PgpDecryptionOkay;
+@@ -272,6 +272,8 @@ WHERE REGEXP PgpDecryptionOkay;
  WHERE char *PgpSignAs;
  WHERE short PgpTimeout;
  WHERE char *PgpEntryFormat;
@@ -24,8 +24,8 @@
  WHERE char *PgpDecodeCommand;
  WHERE char *PgpVerifyCommand;
 --- init.h
-+++ init.h	2016-06-13 09:02:33.338000098 +0000
++++ init.h	2016-07-26 12:00:59.278557107 +0000
-@@ -3185,6 +3185,18 @@ struct option_t MuttVars[] = {
+@@ -3210,6 +3210,18 @@ struct option_t MuttVars[] = {
    ** a line quoted text if it also matches $$smileys. This mostly
    ** happens at the beginning of a line.
    */
@@ -45,7 +45,7 @@
  
  
 --- pgp.c
-+++ pgp.c	2016-06-13 09:02:33.338000098 +0000
++++ pgp.c	2016-07-26 12:00:59.282557030 +0000
 @@ -1261,7 +1261,8 @@ BODY *pgp_sign_message (BODY *a)
    t->disposition = DISPNONE;
    t->encoding = ENC7BIT;

widechar.sidebar.dif

@@ -3,7 +3,7 @@
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 --- handler.c
-+++ handler.c	2016-05-12 13:39:27.157097136 +0000
++++ handler.c	2016-07-26 12:01:48.801608572 +0000
 @@ -780,7 +780,7 @@ static void enriched_set_flags (const wc
  static int text_enriched_handler (BODY *a, STATE *s)
  {