Accepting request 350312 from home:vmiklos:branches:server:mail

Update sidebar patch to 20151111

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

aw.listreply.diff

@@ -11,7 +11,7 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
 +++ mutt-1.5.23/PATCHES	2015-01-26 15:34:40.133518493 +0000
 @@ -1,2 +1,3 @@
 +patch-1.5.9.aw.listreply.1
- patch-1.5.23.sidebar.20140412.txt
+ patch-1.5.24.sidebar.20151111.txt
  rr.compressed
 --- mutt-1.5.23/init.h
 +++ mutt-1.5.23/init.h	2012-06-21 09:48:22.000000000 +0000

mutt.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Dec 22 09:44:55 UTC 2015 - vmiklos@collabora.co.uk
+
+- Update patch-1.5.24.sidebar.20140412.patch to
+  patch-1.5.24.sidebar.20151111.patch
+  + Updated patch for pristine mutt-1.5.24 source package.
+  + Corrected the version info in PATCHES for mutt-1.5.24 and added two small
+    patches courtesy of mutt user flatcap. The patch makes %S optional in
+    sidebar_format_str and the other patch fixes a problem with viewing an imap
+    folder that gets deleted by another user which causes a mutt crash.
+- Modified patches
+  + aw.listreply.diff
+  + nion.sidebar-color.diff
+  + patch-1.5.24.vk.pgp_verbose_mime
+  + widechar.sidebar.dif
+
 -------------------------------------------------------------------
 Fri Sep 11 15:14:48 UTC 2015 - werner@suse.de
 

mutt.spec

@@ -90,7 +90,7 @@ Patch2:         %name-1.5.9i-pgpewrap.diff
 Patch3:         %name-1.5.20-sendgroupreplyto.diff
 Patch4:         %name-1.5.15-wrapcolumn.diff
 # http://lunar-linux.org/mutt-sidebar
-Patch6:         patch-1.5.24.sidebar.20140412.patch
+Patch6:         patch-1.5.24.sidebar.20151111.patch
 Patch7:         mutt-1.5.24-opennfs.dif
 Patch9:         bug-676388-largefile.patch
 Patch10:        mutt-1.5.21-tinfo.dif
@@ -126,14 +126,14 @@ done
 %patch2 -p0 -b .pgpewrap
 %patch3 -p1 -b .sendgroupreplyto
 %patch4 -p0 -b .wrapcolumn
-%patch6 -p0 -b .sidebar
+%patch6 -p1 -b .sidebar
 %patch7 -p0 -b .opennfs
 %patch9 -p1 -b .largefile
 %patch10 -p0 -b .tinfo
 %patch11 -p1 -b .listreply
 %patch12 -p0 -b .pgp_verbose_mtime
-%patch14 -p2 -b .sidebar.color
+%patch14 -p1 -b .sidebar.color
-%patch15 -p0 -b .widechar.sidebar
+%patch15 -p1 -b .widechar.sidebar
 %patch16 -p0 -b .crlf
 %patch18 -p1 -b .mailcap
 %patch19 -p1 -b .cvw2014.9116

nion.sidebar-color.diff

@@ -1,16 +1,17 @@
 
 
-diff --git a/mutt-1.5.24/color.c b/mutt-1.5.24/color.c
+diff --git a/color.c b/color.c
---- a/mutt-1.5.24/color.c
+index d6f9198..37786bc 100644
-+++ b/mutt-1.5.24/color.c
+--- a/color.c
-@@ -95,6 +95,7 @@ static const struct mapping_t Fields[] =
++++ b/color.c
-   { "index",		MT_COLOR_INDEX },
+@@ -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 },
++  { "sidebar",          MT_COLOR_SIDEBAR },
-   { "prompt",		MT_COLOR_PROMPT },
    { NULL,		0 }
  };
+ 
 @@ -145,6 +146,7 @@ void ci_start_color (void)
  
    /* set some defaults */
@@ -19,9 +20,10 @@ diff --git a/mutt-1.5.24/color.c b/mutt-1.5.24/color.c
    ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE;
    ColorDefs[MT_COLOR_SEARCH] = A_REVERSE;
    ColorDefs[MT_COLOR_MARKERS] = A_REVERSE;
-diff --git a/mutt-1.5.24/mutt_curses.h b/mutt-1.5.24/mutt_curses.h
+diff --git a/mutt_curses.h b/mutt_curses.h
---- a/mutt-1.5.24/mutt_curses.h
+index ef9884e..b2e88c8 100644
-+++ b/mutt-1.5.24/mutt_curses.h
+--- a/mutt_curses.h
++++ b/mutt_curses.h
 @@ -119,6 +119,7 @@ enum
    MT_COLOR_ATTACHMENT,
    MT_COLOR_SEARCH,
@@ -29,11 +31,12 @@ diff --git a/mutt-1.5.24/mutt_curses.h b/mutt-1.5.24/mutt_curses.h
 +  MT_COLOR_SIDEBAR,
    MT_COLOR_UNDERLINE,
    MT_COLOR_INDEX,
-   MT_COLOR_NEW,
+   MT_COLOR_PROMPT,
-diff --git a/mutt-1.5.24/sidebar.c b/mutt-1.5.24/sidebar.c
+diff --git a/sidebar.c b/sidebar.c
---- a/mutt-1.5.24/sidebar.c
+index e9d9eba..8b46bff 100644
-+++ b/mutt-1.5.24/sidebar.c
+--- a/sidebar.c
-@@ -250,13 +250,14 @@ int draw_sidebar(int menu) {
++++ b/sidebar.c
+@@ -254,13 +254,14 @@ int draw_sidebar(int menu) {
      }
  
          /* get attributes for divider */
@@ -49,7 +52,7 @@ diff --git a/mutt-1.5.24/sidebar.c b/mutt-1.5.24/sidebar.c
  
  	/* draw the divider */
  
-@@ -266,10 +267,14 @@ int draw_sidebar(int menu) {
+@@ -270,10 +271,14 @@ int draw_sidebar(int menu) {
  
  	for ( ; lines < SidebarHeight; lines++ ) {
  		move(lines, SidebarWidth - delim_len);
@@ -57,14 +60,14 @@ diff --git a/mutt-1.5.24/sidebar.c b/mutt-1.5.24/sidebar.c
 -#ifndef USE_SLANG_CURSES
 -                mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL);
 -#endif
-+        if (option (OPTASCIICHARS))
++		if (option (OPTASCIICHARS))
-+	      addstr (NONULL (SidebarDelim));
++			addstr (NONULL (SidebarDelim));
-+	    else if (!option (OPTASCIICHARS) && !strcmp (NONULL(SidebarDelim), "|"))
++		else if (!option (OPTASCIICHARS) && !strcmp (NONULL(SidebarDelim), "|"))
-+	      addch (ACS_VLINE);
++			addch (ACS_VLINE);
-+	    else if ((Charset_is_utf8) && !strcmp (NONULL(SidebarDelim), "|"))
++		else if ((Charset_is_utf8) && !strcmp (NONULL(SidebarDelim), "|"))
-+	      addstr ("\342\224\202");
++			addstr ("\342\224\202");
-+      	    else
++		else
-+              addstr (NONULL (SidebarDelim));
++			addstr (NONULL (SidebarDelim));
  	}
  
  	if ( Incoming == 0 ) return 0;

patch-1.5.24.vk.pgp_verbose_mime

@@ -10,7 +10,7 @@
 @@ -1,3 +1,4 @@
 +patch-1.5.3.vk.pgp_verbose_mime
  patch-1.5.9.aw.listreply.1
- patch-1.5.23.sidebar.20140412.txt
+ patch-1.5.24.sidebar.20151111.txt
  rr.compressed
 --- globals.h
 +++ globals.h	2012-04-11 04:52:45.000000000 +0000

widechar.sidebar.dif

@@ -1,10 +1,12 @@
 ---
- handler.c |   14 ++++++++------
+ handler.c | 14 ++++++++------
  1 file changed, 8 insertions(+), 6 deletions(-)
 
---- handler.c
+diff --git a/handler.c b/handler.c
-+++ handler.c	2015-09-11 14:52:40.778018507 +0000
+index 8c3b699..6f8d77c 100644
-@@ -780,7 +780,7 @@ static void enriched_set_flags (const wc
+--- a/handler.c
++++ 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 {
@@ -13,7 +15,7 @@
    } state = TEXT;
  
    long bytes = a->length;
-@@ -809,7 +809,7 @@ static int text_enriched_handler (BODY *
+@@ -809,7 +809,7 @@ static int text_enriched_handler (BODY *a, STATE *s)
    {
      if (state != ST_EOF)
      {
@@ -22,16 +24,16 @@
  	state = ST_EOF;
        else
  	bytes--;
-@@ -817,6 +817,8 @@ static int text_enriched_handler (BODY *
+@@ -817,6 +817,8 @@ static int text_enriched_handler (BODY *a, STATE *s)
  
      switch (state)
      {
 +      case TEXT_GOTWC:
-+	state = TEXT;
++       state = TEXT;
        case TEXT :
  	switch (wc)
  	{
-@@ -877,9 +879,8 @@ static int text_enriched_handler (BODY *
+@@ -877,9 +879,8 @@ static int text_enriched_handler (BODY *a, STATE *s)
  	  enriched_flush (&stte, 1);
  	else
  	{
@@ -42,7 +44,7 @@
  	}
  	break;
  
-@@ -1567,7 +1568,7 @@ void mutt_decode_attachment (BODY *b, ST
+@@ -1567,7 +1568,7 @@ void mutt_decode_attachment (BODY *b, STATE *s)
   * strip all trailing spaces to improve interoperability;
   * if $text_flowed is unset, simply verbatim copy input
   */
@@ -51,7 +53,7 @@
  {
    char *buf = NULL;
    size_t l = 0, sz = 0;
-@@ -1595,7 +1596,6 @@ static int run_decode_and_handler (BODY
+@@ -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;
@@ -59,7 +61,7 @@
    size_t tmplength = 0;
    LOFF_T tmpoffset = 0;
    int decode = 0;
-@@ -1604,6 +1604,8 @@ static int run_decode_and_handler (BODY
+@@ -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;
@@ -67,4 +69,7 @@
 +  char tempfile[_POSIX_PATH_MAX];
  #endif
  
-   fseeko (s->fpin, b->offset, 0);
+   /* see if we need to decode this part before processing it */
+-- 
+2.6.2
+