.

OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=120

aw.listreply.diff

@@ -7,15 +7,16 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
  send.c  |   18 ++++++++++++++++++
  4 files changed, 27 insertions(+)
 
---- mutt-1.5.23/PATCHES
+--- PATCHES
-+++ mutt-1.5.23/PATCHES	2015-01-26 15:34:40.133518493 +0000
++++ PATCHES	2015-01-26 15:34:40.133518493 +0000
-@@ -1,2 +1,3 @@
+@@ -1,3 +1,4 @@
 +patch-1.5.9.aw.listreply.1
- patch-1.6.0.sidebar.20160404.txt
  rr.compressed
---- mutt-1.5.23/init.h
+ patch-quasi-delete-neo-20160502
-+++ mutt-1.5.23/init.h	2012-06-21 09:48:22.000000000 +0000
+ patch-progress-neo-20160502
-@@ -1340,6 +1340,13 @@ struct option_t MuttVars[] = {
+--- init.h
++++ init.h	2012-06-21 09:48:22.000000000 +0000
+@@ -1396,6 +1396,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.
    */
@@ -29,9 +30,9 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
    { "mail_check",	DT_NUM,  R_NONE, UL &BuffyTimeout, 5 },
    /*
    ** .pp
---- mutt-1.5.23/mutt.h
+--- mutt.h
-+++ mutt-1.5.23/mutt.h	2012-06-21 09:48:22.000000000 +0000
++++ mutt.h	2012-06-21 09:48:22.000000000 +0000
-@@ -288,6 +288,7 @@ enum
+@@ -309,6 +309,7 @@ enum
  #endif
    OPT_SUBJECT,
    OPT_VERIFYSIG,      /* verify PGP signatures */
@@ -39,9 +40,9 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
      
    /* THIS MUST BE THE LAST VALUE. */
    OPT_MAX
---- mutt-1.5.23/send.c
+--- send.c
-+++ mutt-1.5.23/send.c	2012-06-21 09:48:22.000000000 +0000
++++ send.c	2012-06-21 09:48:22.000000000 +0000
-@@ -452,6 +452,7 @@ static int include_reply (CONTEXT *ctx,
+@@ -455,6 +455,7 @@ static int include_reply (CONTEXT *ctx,
  static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
  {
    char prompt[STRING];
@@ -49,7 +50,7 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
  
    if (flags && env->mail_followup_to && hmfupto == M_YES) 
    {
-@@ -465,6 +466,23 @@ static int default_to (ADDRESS **to, ENV
+@@ -468,6 +469,23 @@ static int default_to (ADDRESS **to, ENV
    if (flags & SENDLISTREPLY)
      return 0;
  

bsc907453-CVE-2014-9116-jessie.patch

@@ -16,9 +16,9 @@ Index: mutt/lib.c
  lib.c |    3 +++
  1 file changed, 3 insertions(+)
 
---- mutt/lib.c
+--- lib.c
-+++ mutt/lib.c	2015-01-26 00:00:00.000000000 +0000
++++ lib.c	2015-01-26 00:00:00.000000000 +0000
-@@ -820,6 +820,9 @@ char *mutt_substrdup (const char *begin,
+@@ -824,6 +824,9 @@ char *mutt_substrdup (const char *begin,
    size_t len;
    char *p;
  

bug-676388-largefile.patch

@@ -4,9 +4,9 @@
  mutt.h        |    2 +-
  3 files changed, 5 insertions(+), 5 deletions(-)
 
---- mutt-1.5.23/crypt-gpgme.c
+--- crypt-gpgme.c
-+++ mutt-1.5.23/crypt-gpgme.c	2011-03-02 17:18:01.000000000 +0000
++++ crypt-gpgme.c	2011-03-02 17:18:01.000000000 +0000
-@@ -450,7 +450,7 @@ static gpgme_data_t body_to_data_object
+@@ -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
     file. */
@@ -15,9 +15,9 @@
  {
    int err = 0;
    gpgme_data_t data;
---- mutt-1.5.23/mh.c
+--- mh.c
-+++ mutt-1.5.23/mh.c	2011-03-02 17:48:36.000000000 +0000
++++ mh.c	2011-03-02 17:48:36.000000000 +0000
-@@ -1579,9 +1579,9 @@ static int mh_rewrite_message (CONTEXT *
+@@ -1620,9 +1620,9 @@ static int mh_rewrite_message (CONTEXT *
    char newpath[_POSIX_PATH_MAX];
    char partpath[_POSIX_PATH_MAX];
  
@@ -30,9 +30,9 @@
  
    if ((dest = mx_open_new_message (ctx, h, 0)) == NULL)
      return -1;
---- mutt-1.5.23/mutt.h
+--- mutt.h
-+++ mutt-1.5.23/mutt.h	2011-03-02 16:52:03.000000000 +0000
++++ mutt.h	2011-03-02 16:52:03.000000000 +0000
-@@ -638,7 +638,7 @@ typedef struct body
+@@ -681,7 +681,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

@@ -1,8 +1,12 @@
 Index: init.h
 ===================================================================
---- init.h.orig
+---
-+++ init.h
+ init.h |    3 ++-
-@@ -3308,7 +3308,8 @@ struct option_t MuttVars[] = {
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- init.h
++++ init.h	2016-05-12 12:31:41.287171877 +0000
+@@ -3783,7 +3783,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

@@ -1,6 +1,12 @@
---- mutt-1.5.20/init.h
+---
-+++ mutt-1.5.20/init.h	2009-06-26 00:00:00.000000000 +0200
+ init.h |    7 +++++++
-@@ -2399,6 +2399,13 @@ struct option_t MuttVars[] = {
+ mutt.h |    1 +
+ send.c |    8 ++++++++
+ 3 files changed, 16 insertions(+)
+
+--- init.h
++++ init.h	2009-06-25 22:00:00.000000000 +0000
+@@ -2645,6 +2645,13 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Also see the $$force_name variable.
    */
@@ -14,19 +20,19 @@
    { "score", 		DT_BOOL, R_NONE, OPTSCORE, 1 },
    /*
    ** .pp
---- mutt-1.5.20/mutt.h
+--- mutt.h
-+++ mutt-1.5.20/mutt.h	2009-06-26 00:00:00.000000000 +0200
++++ mutt.h	2009-06-25 22:00:00.000000000 +0000
-@@ -417,6 +417,7 @@ enum
+@@ -457,6 +457,7 @@ enum
    OPTSAVEADDRESS,
    OPTSAVEEMPTY,
    OPTSAVENAME,
 +  OPTSENDGROUPREPLYTO,
    OPTSCORE,
-   OPTSIGDASHES,
+ #ifdef USE_SIDEBAR
-   OPTSIGONTOP,
+   OPTSIDEBAR,
---- mutt-1.5.20/send.c
+--- send.c
-+++ mutt-1.5.20/send.c	2009-06-26 12:24:12.832816460 +0200
++++ send.c	2009-06-26 10:24:12.832816460 +0000
-@@ -558,8 +558,16 @@ int mutt_fetch_recips (ENVELOPE *out, EN
+@@ -563,8 +563,16 @@ int mutt_fetch_recips (ENVELOPE *out, EN
      if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES))
      {
        /* if(!mutt_addr_is_user(in->to)) */

mutt-1.5.21-mailcap.diff

@@ -3,9 +3,13 @@ set some useful defaults specifically for mutt. For example
 text/html
 Index: mutt-1.5.21/init.c
 ===================================================================
---- mutt-1.5.21.orig/init.c
+---
-+++ mutt-1.5.21/init.c
+ init.c |    4 ++--
-@@ -3011,8 +3011,8 @@ void mutt_init (int skip_sys_rc, LIST *c
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- init.c
++++ init.c	2016-05-12 13:43:29.484251262 +0000
+@@ -3300,8 +3300,8 @@ void mutt_init (int skip_sys_rc, LIST *c
      MailcapPath = safe_strdup (p);
    else
    {

mutt-1.5.21-tinfo.dif

@@ -1,6 +1,10 @@
+---
+ configure.ac  |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
 --- configure.ac
 +++ configure.ac	2011-11-22 12:48:52.319147493 +0000
-@@ -274,9 +274,14 @@ main ()
+@@ -313,9 +313,14 @@ main ()
  	do
  		AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
  	done

mutt-1.5.23-cariage-return.path

@@ -7,7 +7,7 @@
 
 --- lib.c
 +++ lib.c	2013-05-29 09:31:53.000000000 +0000
-@@ -876,6 +876,18 @@ int mutt_strcmp(const char *a, const cha
+@@ -880,6 +880,18 @@ int mutt_strcmp(const char *a, const cha
    return strcmp(NONULL(a), NONULL(b));
  }
  
@@ -38,7 +38,7 @@
  int mutt_strcoll (const char *, const char *);
 --- pager.c
 +++ pager.c	2013-05-29 09:31:53.000000000 +0000
-@@ -771,7 +771,7 @@ resolve_types (char *buf, char *raw, str
+@@ -774,7 +774,7 @@ resolve_types (char *buf, char *raw, str
    else if (check_attachment_marker ((char *) raw) == 0)
      lineInfo[n].type = MT_COLOR_ATTACHMENT;
  #endif
@@ -49,7 +49,7 @@
  
 --- pgp.c
 +++ pgp.c	2015-01-26 15:48:02.361518080 +0000
-@@ -219,7 +219,7 @@ static void pgp_copy_clearsigned (FILE *
+@@ -302,7 +302,7 @@ static void pgp_copy_clearsigned (FILE *
        continue;
      }
  
@@ -58,7 +58,7 @@
        break;
      
      if (armor_header)
-@@ -285,14 +285,14 @@ int pgp_application_pgp_handler (BODY *m
+@@ -368,14 +368,14 @@ int pgp_application_pgp_handler (BODY *m
      {
        clearsign = 0;
  
@@ -76,7 +76,7 @@
        {
          needpass = 0;
          pgp_keyblock = 1;
-@@ -325,10 +325,10 @@ int pgp_application_pgp_handler (BODY *m
+@@ -408,10 +408,10 @@ int pgp_application_pgp_handler (BODY *m
  	
  	fputs (buf, tmpfp);
  
@@ -90,7 +90,7 @@
  	  break;
  	/* remember optional Charset: armor header as defined by RfC4880 */
  	if (mutt_strncmp ("Charset: ", buf, 9) == 0)
-@@ -550,11 +550,11 @@ static int pgp_check_traditional_one_bod
+@@ -645,11 +645,11 @@ static int pgp_check_traditional_one_bod
    {
      if (mutt_strncmp ("-----BEGIN PGP ", buf, 15) == 0)
      {
@@ -105,7 +105,7 @@
  	key = 1;
      }
    }
-@@ -1063,9 +1063,9 @@ BODY *pgp_sign_message (BODY *a)
+@@ -1197,9 +1197,9 @@ BODY *pgp_sign_message (BODY *a)
     */
    while (fgets (buffer, sizeof (buffer) - 1, pgpout) != NULL)
    {

mutt-1.5.9i-pgpewrap.diff

@@ -1,6 +1,10 @@
+---
+ pgpewrap.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 --- pgpewrap.c
-+++ pgpewrap.c
++++ pgpewrap.c	2016-05-12 11:48:02.259503685 +0000
-@@ -47,6 +47,10 @@
+@@ -58,6 +58,10 @@ int main(int argc, char **argv) {
  	}
  	*opt = NULL;
  

mutt-1.6.1-opennfs.dif

@@ -19,8 +19,8 @@
 +	main.c mbox.c menu.c mh.c mx.c opennfs.c pager.c parse.c pattern.c \
  	postpone.c query.c recvattach.c recvcmd.c \
  	rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
- 	sidebar.c \
+ 	score.c send.c sendlib.c signal.c sort.c \
-@@ -84,7 +84,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
+@@ -99,7 +99,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
  mutt_dotlock_LDADD = $(LIBOBJS)
  mutt_dotlock_DEPENDENCIES = $(LIBOBJS)
  
@@ -40,7 +40,7 @@
  	postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \
  	recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \
  	rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \
-@@ -159,7 +159,7 @@ pgpewrap_LDADD = $(LDADD)
+@@ -157,7 +157,7 @@ pgpewrap_LDADD = $(LDADD)
  pgpewrap_DEPENDENCIES = $(LIBOBJS) $(am__DEPENDENCIES_1)
  am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \
  	lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \
@@ -49,7 +49,7 @@
  pgpring_OBJECTS = $(am_pgpring_OBJECTS)
  am_txt2c_OBJECTS = txt2c.$(OBJEXT)
  txt2c_OBJECTS = $(am_txt2c_OBJECTS)
-@@ -486,7 +486,7 @@ mutt_SOURCES = \
+@@ -484,7 +484,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 \
@@ -68,7 +68,7 @@
  #include "lib.h"
  
  
-@@ -633,6 +634,10 @@ int safe_open (const char *path, int fla
+@@ -637,6 +638,10 @@ int safe_open (const char *path, int fla
    struct stat osb, nsb;
    int fd;
  
@@ -79,7 +79,7 @@
    if (flags & O_EXCL) 
    {
      char safe_file[_POSIX_PATH_MAX];
-@@ -656,7 +661,7 @@ int safe_open (const char *path, int fla
+@@ -660,7 +665,7 @@ int safe_open (const char *path, int fla
  
    if ((fd = open (path, flags & ~O_EXCL, 0600)) < 0)
      return fd;
@@ -90,7 +90,7 @@
        compare_stat(&osb, &nsb) == -1)
 --- mbox.c
 +++ mbox.c	2016-04-11 11:23:21.414301183 +0000
-@@ -781,7 +781,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
+@@ -785,7 +785,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,11 +100,11 @@
    {
      if (-1 != i)
 --- mh.c
-+++ mh.c	2016-04-11 11:23:21.414301183 +0000
++++ mh.c	2016-05-12 12:34:49.099410561 +0000
-@@ -332,7 +332,11 @@ static int mh_mkstemp (CONTEXT * dest, F
+@@ -353,7 +353,11 @@ static int mh_mkstemp (CONTEXT * dest, F
    {
-     snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%d",
+     snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%" PRIu64,
- 	      dest->path, NONULL (Hostname), (int) getpid (), Counter++);
+ 	      dest->path, NONULL (Hostname), (int) getpid (), mutt_rand64());
 +#if defined(__linux__)
 +    if ((fd = opennfs (path, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1)
 +#else
@@ -113,7 +113,7 @@
      {
        if (errno != EEXIST)
        {
-@@ -1345,8 +1349,11 @@ int maildir_open_new_message (MESSAGE *
+@@ -1377,8 +1381,11 @@ int maildir_open_new_message (MESSAGE *
  
      dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
  		path));
@@ -128,7 +128,7 @@
        {
 --- mutt.h
 +++ mutt.h	2016-04-11 11:23:21.414301183 +0000
-@@ -987,4 +987,5 @@ typedef struct
+@@ -1029,4 +1029,5 @@ typedef struct
  #include "lib.h"
  #include "globals.h"
  
@@ -261,7 +261,7 @@
 +}
 --- sendlib.c
 +++ sendlib.c	2016-04-11 11:23:21.414301183 +0000
-@@ -2223,7 +2223,7 @@ send_msg (const char *path, char **args,
+@@ -2217,7 +2217,7 @@ send_msg (const char *path, char **args,
        if (SendmailWait >= 0 && tempfile && *tempfile)
        {
  	/* *tempfile will be opened as stdout */

mutt-1.6.1.dif

@@ -10,7 +10,7 @@
 
 --- configure.ac
 +++ configure.ac	2016-04-11 11:09:41.997377315 +0000
-@@ -240,7 +240,7 @@ main ()
+@@ -274,7 +274,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"
-@@ -669,8 +669,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
+@@ -704,8 +704,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
  	  else
              if test "$with_ssl" != "yes"
              then
@@ -32,7 +32,7 @@
              fi
              saved_LIBS="$LIBS"
  
-@@ -749,8 +753,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
+@@ -784,8 +788,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
  
            if test "$with_sasl" != "yes"
            then
@@ -45,6 +45,30 @@
            fi
  
            saved_LIBS="$LIBS"
+--- init.h
++++ init.h	2016-04-11 11:09:41.997377315 +0000
+@@ -3332,6 +3332,9 @@ struct option_t MuttVars[] = {
+   ** the default from the GNUTLS library.
+   */
+ # endif /* USE_SSL_GNUTLS */
++#if defined(USE_IMAP) && defined(SUSE_IMAP_FORCE_SSL)
++  { "imap_force_ssl",	DT_SYN,	R_NONE, UL "ssl_force_tls", 0 },
++#endif
+   { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES },
+   /*
+   ** .pp
+--- mx.c
++++ mx.c	2016-04-11 11:09:42.001377242 +0000
+@@ -1714,6 +1714,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! */
 --- doc/Makefile.in
 +++ doc/Makefile.in	2016-04-11 11:09:41.997377315 +0000
 @@ -697,7 +697,7 @@ uninstall-local:
@@ -56,17 +80,6 @@
  	LC_ALL=C w3m -dump manual.html > $@ || \
  	LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
  
---- doc/Muttrc.head
-+++ doc/Muttrc.head	2016-04-11 11:09:41.997377315 +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 -iM @docdir@/manual.txt<Enter>" "show Mutt documentation"
- 
- # 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-04-11 11:07:05.472260646 +0000
 @@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
@@ -258,6 +271,17 @@
  # set write_inc=10
  #
  # Name: write_inc
+--- doc/Muttrc.head
++++ doc/Muttrc.head	2016-04-11 11:09:41.997377315 +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 -iM @docdir@/manual.txt<Enter>" "show Mutt documentation"
+ 
+ # 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"
 --- imap/auth.c
 +++ imap/auth.c	2016-04-11 11:09:41.997377315 +0000
 @@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata)
@@ -294,27 +318,3 @@
      }
  
      FREE (&methods);
---- init.h
-+++ init.h	2016-04-11 11:09:41.997377315 +0000
-@@ -3122,6 +3122,9 @@ struct option_t MuttVars[] = {
-   ** the default from the GNUTLS library.
-   */
- # endif /* USE_SSL_GNUTLS */
-+#if defined(USE_IMAP) && defined(SUSE_IMAP_FORCE_SSL)
-+  { "imap_force_ssl",	DT_SYN,	R_NONE, UL "ssl_force_tls", 0 },
-+#endif
-   { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES },
-   /*
-   ** .pp
---- mx.c
-+++ mx.c	2016-04-11 11:09:42.001377242 +0000
-@@ -1544,6 +1544,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! */

mutt-1.6.1.tar.gz

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

mutt.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Thu May 12 13:50:14 UTC 2016 - werner@suse.de
+
+- Update to mutt version 1.6.1 (2016-05-01):
+  ! Bug fix release.  No features were modified or added.
+- Add and use neomutt-patches-20160502.tar.gz from
+  http://www.neomutt.org/
+- Modify the patches
+   aw.listreply.diff
+   bsc907453-CVE-2014-9116-jessie.patch
+   bug-676388-largefile.patch
+   mutt-1.5.15-wrapcolumn.diff
+   mutt-1.5.20-sendgroupreplyto.diff
+   mutt-1.5.21-mailcap.diff
+   mutt-1.5.21-tinfo.dif
+   mutt-1.5.23-cariage-return.path
+   mutt-1.5.9i-pgpewrap.diff
+   patch-1.5.24.vk.pgp_verbose_mime
+   widechar.sidebar.dif
+- Modify and rename the patches
+   mutt-1.6.0-opennfs.dif becomes mutt-1.6.1-opennfs.dif
+   mutt-1.6.0.dif becomes mutt-1.6.1.dif
+   patch-1.6.0.rr.compressed.bz2 becomes patch-1.6.1.rr.compressed.bz2
+- Remove the patches
+   patch-1.6.0.sidebar.20160411.patch
+   nion.sidebar-color.diff
+  now upstream or part of neomutt patch collection
+
 -------------------------------------------------------------------
 Mon Apr 11 12:04:29 UTC 2016 - werner@suse.de
 

mutt.spec

@@ -67,8 +67,9 @@ Requires(postun): shared-mime-info
 Requires:       perl(Expect)
 # NOTE: We don't want this dependency and desktop-data-SuSE is in all
 # desktop selections.
-#Requires:    desktop-data-SuSE
+#Requires:      desktop-data-SuSE
-Version:        1.6.0
+%global	neo     20160502
+Version:        1.6.1
 Release:        0
 Summary:        Mail Program
 License:        GPL-2.0+
@@ -84,21 +85,20 @@ 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
 Patch:          %name-%version.dif
 # http://www.spinnaker.de/mutt/compressed/
-Patch1:         patch-%version.rr.compressed.bz2
+Patch1:         patch-1.6.1.rr.compressed.bz2
 Patch2:         %name-1.5.9i-pgpewrap.diff
 Patch3:         %name-1.5.20-sendgroupreplyto.diff
 Patch4:         %name-1.5.15-wrapcolumn.diff
-# http://www.lunar-linux.org/mutt-sidebar/
+Patch7:         mutt-1.6.1-opennfs.dif
-Patch6:         patch-1.6.0.sidebar.20160411.patch
-Patch7:         mutt-1.6.0-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
-Patch14:        nion.sidebar-color.diff
 # PATCH-FIX-OPENSUSE: bnc#813498 - mutt crashes in fgetwc in text_enriched_handler
 Patch15:        widechar.sidebar.dif
 # PATCH-FIX-OPENSUSE: Be able to read signed/encrypted messsages even with CRLF
@@ -116,28 +116,29 @@ highlighting, threading, and PGP. It takes some time to get used to,
 however.
 
 %prep
-%setup -q -n mutt-%version -b 8
+%setup -q -n mutt-%version -b 8 -b 10
 for p in ../%name-%version-patches/*; do
     test -e $p || break
     echo Patch $p
     patch -s -p1 < $p
 done
+patch -s -p1 < ../neomutt-patches-%{neo}/neomutt-%{neo}.patch
 %patch
 %patch1 -p0 -b .compressed
 %patch2 -p0 -b .pgpewrap
-%patch3 -p1 -b .sendgroupreplyto
+%patch3 -p0 -b .sendgroupreplyto
 %patch4 -p0 -b .wrapcolumn
-%patch6 -p1 -b .sidebar
 %patch7 -p0 -b .opennfs
-%patch9 -p1 -b .largefile
+%patch9 -p0 -b .largefile
 %patch10 -p0 -b .tinfo
-%patch11 -p1 -b .listreply
+%patch11 -p0 -b .listreply
 %patch12 -p0 -b .pgp_verbose_mtime
-%patch14 -p1 -b .sidebar.color
+%patch15 -p0 -b .widechar.sidebar
-%patch15 -p1 -b .widechar.sidebar
 %patch16 -p0 -b .crlf
-%patch18 -p1 -b .mailcap
+%patch18 -p0 -b .mailcap
-%patch19 -p1 -b .cvw2014.9116
+%patch19 -p0 -b .cvw2014.9116
+rm -vf README*.orig
+rm -vf PATCHES*.orig
 
 cp doc/Muttrc Muttrc.SuSE
 cp %{S:2} .

neomutt-patches-20160502.tar.gz

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

nion.sidebar-color.diff

@@ -1,73 +0,0 @@
-
-
-diff --git a/color.c b/color.c
-index d6f9198..37786bc 100644
---- a/color.c
-+++ b/color.c
-@@ -96,6 +96,7 @@ static const struct mapping_t Fields[] =
-   { "prompt",		MT_COLOR_PROMPT },
-   { "sidebar_new",	MT_COLOR_NEW },
-   { "sidebar_flagged",	MT_COLOR_FLAGGED },
-+  { "sidebar",          MT_COLOR_SIDEBAR },
-   { NULL,		0 }
- };
- 
-@@ -145,6 +146,7 @@ void ci_start_color (void)
- 
-   /* set some defaults */
-   ColorDefs[MT_COLOR_STATUS] = A_REVERSE;
-+  ColorDefs[MT_COLOR_SIDEBAR] = A_REVERSE;
-   ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE;
-   ColorDefs[MT_COLOR_SEARCH] = A_REVERSE;
-   ColorDefs[MT_COLOR_MARKERS] = A_REVERSE;
-diff --git a/mutt_curses.h b/mutt_curses.h
-index ef9884e..b2e88c8 100644
---- a/mutt_curses.h
-+++ b/mutt_curses.h
-@@ -119,6 +119,7 @@ enum
-   MT_COLOR_ATTACHMENT,
-   MT_COLOR_SEARCH,
-   MT_COLOR_BOLD,
-+  MT_COLOR_SIDEBAR,
-   MT_COLOR_UNDERLINE,
-   MT_COLOR_INDEX,
-   MT_COLOR_PROMPT,
-diff --git a/sidebar.c b/sidebar.c
-index e9d9eba..8b46bff 100644
---- a/sidebar.c
-+++ b/sidebar.c
-@@ -254,13 +254,14 @@ int draw_sidebar(int menu) {
-     }
- 
-         /* get attributes for divider */
--	SETCOLOR(MT_COLOR_STATUS);
-+	SETCOLOR(MT_COLOR_SIDEBAR);
- #ifndef USE_SLANG_CURSES
-         attr_get(&attrs, &color_pair, 0);
- #else
-         color_pair = attr_get();
- #endif
- 	SETCOLOR(MT_COLOR_NORMAL);
-+  /* SETCOLOR(MT_COLOR_SIDEBAR); */
- 
- 	/* draw the divider */
- 
-@@ -270,10 +271,14 @@ int draw_sidebar(int menu) {
- 
- 	for ( ; lines < SidebarHeight; lines++ ) {
- 		move(lines, SidebarWidth - delim_len);
--		addstr(NONULL(SidebarDelim));
--#ifndef USE_SLANG_CURSES
--                mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL);
--#endif
-+		if (option (OPTASCIICHARS))
-+			addstr (NONULL (SidebarDelim));
-+		else if (!option (OPTASCIICHARS) && !strcmp (NONULL(SidebarDelim), "|"))
-+			addch (ACS_VLINE);
-+		else if ((Charset_is_utf8) && !strcmp (NONULL(SidebarDelim), "|"))
-+			addstr ("\342\224\202");
-+		else
-+			addstr (NONULL (SidebarDelim));
- 	}
- 
- 	if ( Incoming == 0 ) return 0;

patch-1.5.24.vk.pgp_verbose_mime

@@ -10,11 +10,11 @@
 @@ -1,3 +1,4 @@
 +patch-1.5.3.vk.pgp_verbose_mime
  patch-1.5.9.aw.listreply.1
- patch-1.6.0.sidebar.20160404.txt
  rr.compressed
+ patch-quasi-delete-neo-20160502
 --- globals.h
 +++ globals.h	2012-04-11 04:52:45.000000000 +0000
-@@ -239,6 +239,8 @@ WHERE REGEXP PgpGoodSign;
+@@ -253,6 +253,8 @@ WHERE REGEXP PgpDecryptionOkay;
  WHERE char *PgpSignAs;
  WHERE short PgpTimeout;
  WHERE char *PgpEntryFormat;
@@ -25,7 +25,7 @@
  WHERE char *PgpVerifyCommand;
 --- init.h
 +++ init.h	2012-04-11 04:52:45.000000000 +0000
-@@ -2719,6 +2719,18 @@ struct option_t MuttVars[] = {
+@@ -2947,6 +2947,18 @@ struct option_t MuttVars[] = {
    ** a line quoted text if it also matches $$smileys. This mostly
    ** happens at the beginning of a line.
    */
@@ -46,7 +46,7 @@
  
 --- pgp.c
 +++ pgp.c	2015-09-11 14:47:19.817518523 +0000
-@@ -1213,7 +1213,8 @@ BODY *pgp_sign_message (BODY *a)
+@@ -1261,7 +1261,8 @@ BODY *pgp_sign_message (BODY *a)
    t->disposition = DISPNONE;
    t->encoding = ENC7BIT;
    t->unlink = 1; /* ok to remove this file after sending. */

patch-1.6.0.rr.compressed.bz2

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

patch-1.6.1.rr.compressed.bz2

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

widechar.sidebar.dif

@@ -1,12 +1,10 @@
 ---
- handler.c | 14 ++++++++------
+ handler.c |   11 ++++++-----
- 1 file changed, 8 insertions(+), 6 deletions(-)
+ 1 file changed, 6 insertions(+), 5 deletions(-)
 
-diff --git a/handler.c b/handler.c
+--- handler.c
-index 8c3b699..6f8d77c 100644
++++ handler.c	2016-05-12 13:39:27.157097136 +0000
---- a/handler.c
+@@ -780,7 +780,7 @@ static void enriched_set_flags (const wc
-+++ b/handler.c
-@@ -780,7 +780,7 @@ static void enriched_set_flags (const wchar_t *tag, struct enriched_state *stte)
  static int text_enriched_handler (BODY *a, STATE *s)
  {
    enum {
@@ -15,7 +13,7 @@ index 8c3b699..6f8d77c 100644
    } state = TEXT;
  
    long bytes = a->length;
-@@ -809,7 +809,7 @@ static int text_enriched_handler (BODY *a, STATE *s)
+@@ -809,7 +809,7 @@ static int text_enriched_handler (BODY *
    {
      if (state != ST_EOF)
      {
@@ -24,7 +22,7 @@ index 8c3b699..6f8d77c 100644
  	state = ST_EOF;
        else
  	bytes--;
-@@ -817,6 +817,8 @@ static int text_enriched_handler (BODY *a, STATE *s)
+@@ -817,6 +817,8 @@ static int text_enriched_handler (BODY *
  
      switch (state)
      {
@@ -33,7 +31,7 @@ index 8c3b699..6f8d77c 100644
        case TEXT :
  	switch (wc)
  	{
-@@ -877,9 +879,8 @@ static int text_enriched_handler (BODY *a, STATE *s)
+@@ -877,9 +879,8 @@ static int text_enriched_handler (BODY *
  	  enriched_flush (&stte, 1);
  	else
  	{
@@ -44,7 +42,7 @@ index 8c3b699..6f8d77c 100644
  	}
  	break;
  
-@@ -1567,7 +1568,7 @@ void mutt_decode_attachment (BODY *b, STATE *s)
+@@ -1567,7 +1568,7 @@ void mutt_decode_attachment (BODY *b, ST
   * strip all trailing spaces to improve interoperability;
   * if $text_flowed is unset, simply verbatim copy input
   */
@@ -53,23 +51,3 @@ index 8c3b699..6f8d77c 100644
  {
    char *buf = NULL;
    size_t l = 0, sz = 0;
-@@ -1595,7 +1596,6 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
-   int origType;
-   char *savePrefix = NULL;
-   FILE *fp = NULL;
--  char tempfile[_POSIX_PATH_MAX];
-   size_t tmplength = 0;
-   LOFF_T tmpoffset = 0;
-   int decode = 0;
-@@ -1606,6 +1606,8 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
- #ifdef HAVE_FMEMOPEN
-   char *temp;
-   size_t tempsize;
-+#else
-+  char tempfile[_POSIX_PATH_MAX];
- #endif
- 
-   /* see if we need to decode this part before processing it */
--- 
-2.6.2
-