From f1d42dbdb8c28a7fbce6384ff0a4f6749c068140 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 13 Sep 2016 11:00:11 +0000
Subject: [PATCH] Update to NeoMutt 20160826

OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=143
---
 COLS-workaround.dif               |  6 +++---
 aw.listreply.diff                 | 16 ++++++++--------
 bug-676388-largefile.patch        |  8 ++++----
 mutt-1.5.15-wrapcolumn.diff       |  4 ++--
 mutt-1.5.20-sendgroupreplyto.diff |  8 ++++----
 mutt-1.6.1-opennfs.dif            | 22 +++++++++++-----------
 mutt-1.6.2.dif                    | 22 +++++++++++-----------
 mutt.changes                      | 21 +++++++++++++++++++++
 mutt.spec                         | 10 +++++-----
 neomutt-distro-20160723.tar.gz    |  3 ---
 neomutt-distro-20160826.tar.gz    |  3 +++
 patch-1.5.24.vk.pgp_verbose_mime  | 16 ++++++++--------
 12 files changed, 80 insertions(+), 59 deletions(-)
 delete mode 100644 neomutt-distro-20160723.tar.gz
 create mode 100644 neomutt-distro-20160826.tar.gz

diff --git a/COLS-workaround.dif b/COLS-workaround.dif
index fa243a7..db9eabc 100644
--- a/COLS-workaround.dif
+++ b/COLS-workaround.dif
@@ -5,8 +5,8 @@ Use professionel VLINE
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 --- sidebar.c
-+++ sidebar.c	2016-07-26 12:32:38.170166748 +0000
-@@ -547,6 +547,7 @@ static int draw_divider (int first_row,
++++ sidebar.c	2016-09-13 10:03:50.282864137 +0000
+@@ -579,6 +579,7 @@ static int draw_divider (int first_row,
  {
    /* Calculate the width of the delimiter in screen cells */
    int delim_len = mutt_strwidth (SidebarDividerChar);
@@ -14,7 +14,7 @@ Use professionel VLINE
  
    if (delim_len < 1)
      return delim_len;
-@@ -557,13 +558,19 @@ static int draw_divider (int first_row,
+@@ -589,13 +590,19 @@ static int draw_divider (int first_row,
    if (delim_len > SidebarWidth)
      return -1;
  
diff --git a/aw.listreply.diff b/aw.listreply.diff
index 45ae8d8..3c638ed 100644
--- a/aw.listreply.diff
+++ b/aw.listreply.diff
@@ -8,14 +8,14 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
  4 files changed, 27 insertions(+)
 
 --- PATCHES
-+++ PATCHES	2016-07-26 12:00:27.319169243 +0000
++++ PATCHES	2016-09-13 10:01:22.837626357 +0000
 @@ -1,3 +1,4 @@
 +patch-1.5.9.aw.listreply.1
- patch-new-mail-neo-git
- patch-lmdb-neo-git
- patch-nntp-neo-git
+ patch-compress-neo-git
+ patch-cond-date-neo-git
+ patch-fmemopen-neo-git
 --- init.h
-+++ init.h	2016-07-26 11:59:58.319724690 +0000
++++ init.h	2016-09-13 10:00:49.794245364 +0000
 @@ -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-07-26 11:59:58.323724614 +0000
-@@ -314,6 +314,7 @@ enum
++++ mutt.h	2016-09-13 10:00:49.794245364 +0000
+@@ -315,6 +315,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-07-26 11:59:58.323724614 +0000
++++ send.c	2016-09-13 10:00:49.794245364 +0000
 @@ -516,6 +516,7 @@ static int include_reply (CONTEXT *ctx,
  static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
  {
diff --git a/bug-676388-largefile.patch b/bug-676388-largefile.patch
index ce7a5dd..61b7377 100644
--- a/bug-676388-largefile.patch
+++ b/bug-676388-largefile.patch
@@ -5,7 +5,7 @@
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 --- crypt-gpgme.c
-+++ crypt-gpgme.c	2016-07-26 11:56:20.223902163 +0000
++++ crypt-gpgme.c	2016-09-13 10:00:08.959010324 +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,7 +16,7 @@
    int err = 0;
    gpgme_data_t data;
 --- mh.c
-+++ mh.c	2016-07-26 11:56:20.223902163 +0000
++++ mh.c	2016-09-13 10:00:08.959010324 +0000
 @@ -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-07-26 11:56:20.223902163 +0000
-@@ -730,7 +730,7 @@ typedef struct body
++++ mutt.h	2016-09-13 10:00:08.959010324 +0000
+@@ -731,7 +731,7 @@ typedef struct body
    PARAMETER *parameter;         /* parameters of the content-type */
    char *description;            /* content-description */
    char *form_name;		/* Content-Disposition form-data name param */
diff --git a/mutt-1.5.15-wrapcolumn.diff b/mutt-1.5.15-wrapcolumn.diff
index bc13775..36c7d79 100644
--- a/mutt-1.5.15-wrapcolumn.diff
+++ b/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-07-26 11:55:23.592986926 +0000
-@@ -4052,7 +4052,8 @@ struct option_t MuttVars[] = {
++++ init.h	2016-09-13 09:58:52.548441749 +0000
+@@ -4047,7 +4047,8 @@ struct option_t MuttVars[] = {
    ** When \fIset\fP, mutt will weed headers when displaying, forwarding,
    ** printing, or replying to messages.
    */
diff --git a/mutt-1.5.20-sendgroupreplyto.diff b/mutt-1.5.20-sendgroupreplyto.diff
index d427e28..94802e8 100644
--- a/mutt-1.5.20-sendgroupreplyto.diff
+++ b/mutt-1.5.20-sendgroupreplyto.diff
@@ -5,7 +5,7 @@
  3 files changed, 16 insertions(+)
 
 --- init.h
-+++ init.h	2016-07-26 11:54:46.725693126 +0000
++++ init.h	2016-09-13 09:58:08.893259601 +0000
 @@ -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-07-26 11:54:46.725693126 +0000
-@@ -482,6 +482,7 @@ enum
++++ mutt.h	2016-09-13 09:58:08.893259601 +0000
+@@ -483,6 +483,7 @@ enum
    OPTSAVEADDRESS,
    OPTSAVEEMPTY,
    OPTSAVENAME,
@@ -31,7 +31,7 @@
  #ifdef USE_SIDEBAR
    OPTSIDEBAR,
 --- send.c
-+++ send.c	2016-07-26 11:54:46.725693126 +0000
++++ send.c	2016-09-13 09:58:08.893259601 +0000
 @@ -624,8 +624,16 @@ int mutt_fetch_recips (ENVELOPE *out, EN
      if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES))
      {
diff --git a/mutt-1.6.1-opennfs.dif b/mutt-1.6.1-opennfs.dif
index e0c62f1..3ebd44c 100644
--- a/mutt-1.6.1-opennfs.dif
+++ b/mutt-1.6.1-opennfs.dif
@@ -10,8 +10,8 @@
  8 files changed, 148 insertions(+), 13 deletions(-)
 
 --- Makefile.am
-+++ Makefile.am	2016-07-26 12:15:17.066117600 +0000
-@@ -32,7 +32,7 @@ mutt_SOURCES = \
++++ Makefile.am	2016-09-13 09:59:28.591766504 +0000
+@@ -28,7 +28,7 @@ mutt_SOURCES = \
  	edit.c enter.c flags.c init.c filter.c from.c \
  	getdomain.c group.c \
  	handler.c hash.c hdrline.c headers.c help.c hook.c keymap.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 \
-@@ -97,7 +97,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
+@@ -93,7 +93,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-07-26 12:15:17.070117523 +0000
++++ Makefile.in	2016-09-13 09:59:28.591766504 +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-07-26 12:16:00.365287507 +0000
++++ lib.c	2016-09-13 09:59:28.591766504 +0000
 @@ -50,6 +50,7 @@
  #define EX_OK 0
  #endif
@@ -123,7 +123,7 @@
    if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
        compare_stat(&osb, &nsb) == -1)
 --- mbox.c
-+++ mbox.c	2016-07-26 12:15:17.070117523 +0000
++++ mbox.c	2016-09-13 09:59:28.591766504 +0000
 @@ -781,7 +781,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
  
    /* Create a temporary file to write the new version of the mailbox in. */
@@ -134,7 +134,7 @@
    {
      if (-1 != i)
 --- mh.c
-+++ mh.c	2016-07-26 12:15:17.070117523 +0000
++++ mh.c	2016-09-13 09:59:28.591766504 +0000
 @@ -358,7 +358,11 @@ static int mh_mkstemp (CONTEXT * dest, F
    {
      snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%" PRIu64,
@@ -161,15 +161,15 @@
        if (errno != EEXIST)
        {
 --- mutt.h
-+++ mutt.h	2016-07-26 12:15:17.070117523 +0000
-@@ -1075,4 +1075,5 @@ typedef struct
++++ mutt.h	2016-09-13 09:59:28.591766504 +0000
+@@ -1076,4 +1076,5 @@ typedef struct
  #include "lib.h"
  #include "globals.h"
  
 +extern int opennfs(const char *, int, int);
  #endif /*MUTT_H*/
 --- opennfs.c
-+++ opennfs.c	2016-07-26 12:15:17.070117523 +0000
++++ opennfs.c	2016-09-13 09:59:28.595766429 +0000
 @@ -0,0 +1,122 @@
 +#include <errno.h>
 +#include <fcntl.h>
@@ -294,7 +294,7 @@
 +    return open(path, flags, mode);
 +}
 --- sendlib.c
-+++ sendlib.c	2016-07-26 12:15:17.070117523 +0000
++++ sendlib.c	2016-09-13 09:59:28.595766429 +0000
 @@ -2260,7 +2260,7 @@ send_msg (const char *path, char **args,
        if (SendmailWait >= 0 && tempfile && *tempfile)
        {
diff --git a/mutt-1.6.2.dif b/mutt-1.6.2.dif
index b319a52..14a1f40 100644
--- a/mutt-1.6.2.dif
+++ b/mutt-1.6.2.dif
@@ -9,8 +9,8 @@
  7 files changed, 112 insertions(+), 30 deletions(-)
 
 --- configure.ac
-+++ configure.ac	2016-07-26 11:50:00.711172022 +0000
-@@ -281,7 +281,7 @@ main ()
++++ configure.ac	2016-09-13 09:57:13.810291522 +0000
+@@ -280,7 +280,7 @@ main ()
                          mutt_cv_slang=$withval
                          if test -d $withval/include/slang; then
                                  CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
@@ -19,7 +19,7 @@
                                  CPPFLAGS="$CPPFLAGS -I${withval}/include"
                          fi
                          LDFLAGS="$LDFLAGS -L${withval}/lib"
-@@ -722,8 +722,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
+@@ -721,8 +721,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
  	  else
              if test "$with_ssl" != "yes"
              then
@@ -32,7 +32,7 @@
              fi
              saved_LIBS="$LIBS"
  
-@@ -802,8 +806,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
+@@ -801,8 +805,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-07-26 11:50:00.711172022 +0000
++++ doc/Makefile.in	2016-09-13 09:57:13.810291522 +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-07-26 11:50:00.711172022 +0000
++++ doc/Muttrc.head	2016-09-13 09:57:13.810291522 +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-07-26 11:50:00.711172022 +0000
++++ doc/Muttrc	2016-09-13 09:57:13.810291522 +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-07-26 11:50:00.711172022 +0000
++++ imap/auth.c	2016-09-13 09:57:13.810291522 +0000
 @@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata)
        dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method));
        authenticator = imap_authenticators;
@@ -295,8 +295,8 @@
  
      FREE (&methods);
 --- init.h
-+++ init.h	2016-07-26 11:50:00.715171945 +0000
-@@ -3601,6 +3601,9 @@ struct option_t MuttVars[] = {
++++ init.h	2016-09-13 09:57:13.814291447 +0000
+@@ -3596,6 +3596,9 @@ struct option_t MuttVars[] = {
    ** the default from the GNUTLS library.
    */
  # endif /* USE_SSL_GNUTLS */
@@ -307,7 +307,7 @@
    /*
    ** .pp
 --- mx.c
-+++ mx.c	2016-07-26 11:50:00.715171945 +0000
++++ mx.c	2016-09-13 09:57:13.814291447 +0000
 @@ -1829,6 +1829,9 @@ void mx_update_context (CONTEXT *ctx, in
    {
      h = ctx->hdrs[msgno];
diff --git a/mutt.changes b/mutt.changes
index 858e88d..d20e3fa 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Sep 13 10:05:16 UTC 2016 - werner@suse.de
+
+- Update to neomutt 20160826 
+  Build:
+    Disable fmemopen until bug is fixed
+  Contrib:
+    Keybase portability improvements Joshua Jordi (@JakkinStewart)
+    Keybase Integration - Joshua Jordi (@JakkinStewart)
+  Bug Fixes:
+    Fix notmuch crash toggling virtual folders
+    Fix display of pager index when sidebar toggled
+    Sidebar's inbox occasionally shows zero/wrong value
+    Fix crash opening a second compressed mailbox
+  Config:
+    Look for /etc/NeoMuttrc and ~/.neomuttrc
+  Docs:
+    Fix broken links, typos
+    Update project link
+    Fix version string in the manual
+
 -------------------------------------------------------------------
 Tue Jul 26 12:36:47 UTC 2016 - werner@suse.de
 
diff --git a/mutt.spec b/mutt.spec
index 8267151..cf6b1ea 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -71,7 +71,7 @@ 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     20160723
+%global	neo     20160826
 Version:        1.6.2
 Release:        0
 Summary:        Mail Program
@@ -121,19 +121,19 @@ however.
 %setup -q -n mutt-%version -a 10
 for p in neomutt-distro-%neo/bugs-common/*.patch
 do
-    patch -p1 --fuzz=%_default_patch_fuzz < $p
+    patch -s -p1 --fuzz=%_default_patch_fuzz < $p
 done
 for p in neomutt-distro-%neo/features-common/*.patch
 do
-    patch -p1 --fuzz=%_default_patch_fuzz < $p
+    patch -s -p1 --fuzz=%_default_patch_fuzz < $p
 done
 for p in neomutt-distro-%neo/features-extra/*.patch
 do
-    patch -p1 --fuzz=%_default_patch_fuzz < $p
+    patch -s -p1 --fuzz=%_default_patch_fuzz < $p
 done
 for p in neomutt-distro-%neo/bugs-neomutt/*.patch
 do
-    patch -p1 --fuzz=%_default_patch_fuzz < $p
+    patch -s -p1 --fuzz=%_default_patch_fuzz < $p
 done
 %patch -p0 -b .p0
 %patch2 -p0 -b .pgpewrap
diff --git a/neomutt-distro-20160723.tar.gz b/neomutt-distro-20160723.tar.gz
deleted file mode 100644
index 4ebc5d0..0000000
--- a/neomutt-distro-20160723.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a9c819c21b43315078458d490b1ddbbd49508e70016962bfaf3173af147617fd
-size 338862
diff --git a/neomutt-distro-20160826.tar.gz b/neomutt-distro-20160826.tar.gz
new file mode 100644
index 0000000..82e2e81
--- /dev/null
+++ b/neomutt-distro-20160826.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3580dc9c8b8b2247ac77f7a1ab9eba01974def8de6e7adfb0eacf2ccb7bb4aca
+size 559148
diff --git a/patch-1.5.24.vk.pgp_verbose_mime b/patch-1.5.24.vk.pgp_verbose_mime
index 5817c81..fbc012f 100644
--- a/patch-1.5.24.vk.pgp_verbose_mime
+++ b/patch-1.5.24.vk.pgp_verbose_mime
@@ -6,15 +6,15 @@
  4 files changed, 17 insertions(+), 1 deletion(-)
 
 --- PATCHES
-+++ PATCHES	2016-07-26 12:01:20.102158263 +0000
++++ PATCHES	2016-09-13 10:02:27.260419491 +0000
 @@ -1,3 +1,4 @@
 +patch-1.5.3.vk.pgp_verbose_mime
  patch-1.5.9.aw.listreply.1
- patch-new-mail-neo-git
- patch-lmdb-neo-git
+ patch-compress-neo-git
+ patch-cond-date-neo-git
 --- globals.h
-+++ globals.h	2016-07-26 12:00:59.278557107 +0000
-@@ -272,6 +272,8 @@ WHERE REGEXP PgpDecryptionOkay;
++++ globals.h	2016-09-13 10:02:12.156702439 +0000
+@@ -271,6 +271,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-07-26 12:00:59.278557107 +0000
-@@ -3210,6 +3210,18 @@ struct option_t MuttVars[] = {
++++ init.h	2016-09-13 10:02:12.156702439 +0000
+@@ -3205,6 +3205,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-07-26 12:00:59.282557030 +0000
++++ pgp.c	2016-09-13 10:02:12.156702439 +0000
 @@ -1261,7 +1261,8 @@ BODY *pgp_sign_message (BODY *a)
    t->disposition = DISPNONE;
    t->encoding = ENC7BIT;