Introduce two new patches that revert the conflicting part of the

maildir-mtime patch before applying the sidebar patch, and afterwards
re-apply the relevant bits. This mitigates the chance of bugs being
introduced when manually resolving conflicts with new versions of the
sidebar patch. This fixes new mail detection in the mutt-patched package.
(Closes: #484537, #484538)

diff --git a/debian/changelog b/debian/changelog
index 1f95f47b9797f5784d4e052282acf8aa27bdcc57..e35deff2ea5fe0245c7a06fce9a5eba5987fd1b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,14 @@ mutt (1.5.18-4) unstable; urgency=low
 
   * In order to evade a conflict with the sidebar patch, move the set_xterm_*
     prototypes from pager.c to mutt_menu.h. No functional change.
 
   * In order to evade a conflict with the sidebar patch, move the set_xterm_*
     prototypes from pager.c to mutt_menu.h. No functional change.

-
- -- Christoph Berg <myon@debian.org>  Sun, 03 Aug 2008 00:28:59 +0200
+  * Introduce two new patches that revert the conflicting part of the
+    maildir-mtime patch before applying the sidebar patch, and afterwards
+    re-apply the relevant bits. This mitigates the chance of bugs being
+    introduced when manually resolving conflicts with new versions of the
+    sidebar patch. This fixes new mail detection in the mutt-patched package.
+    (Closes: #484537, #484538)
+
+ -- Christoph Berg <myon@debian.org>  Sun, 03 Aug 2008 00:51:58 +0200

 
 mutt (1.5.18-3) unstable; urgency=low
 
 
 mutt (1.5.18-3) unstable; urgency=low
 

diff --git a/debian/patches/mutt-patched/sidebar b/debian/patches/mutt-patched/sidebar
index 0c155cd8b35a8673b831df7c91e761cf3aafe0df..94de9cf98314a0fa44b2e3f507399a724fe18821 100644 (file)
--- a/debian/patches/mutt-patched/sidebar
+++ b/debian/patches/mutt-patched/sidebar
@@ -27,7 +27,8 @@ in the "mutt-patched" package.
   - http://lunar-linux.org/~tchan/mutt/patch-1.5.18.sidebar.20080611.txt
 
 * Changes made:
   - http://lunar-linux.org/~tchan/mutt/patch-1.5.18.sidebar.20080611.txt
 
 * Changes made:

-  - Fixed conflict with maildir-mtime patch [myon]
+  - 2008-08-02 myon: Refreshed patch using quilt push -f to remove hunks we do
+    not need (Makefile.in).

 
 == END PATCH
 --- a/buffy.c
 
 == END PATCH
 --- a/buffy.c


@@ -50,7 +51,7 @@ in the "mutt-patched" package.
  #ifdef USE_IMAP
      if (tmp->magic != M_IMAP)
  #endif
  #ifdef USE_IMAP
      if (tmp->magic != M_IMAP)
  #endif

-@@ -353,10 +355,27 @@ int mutt_buffy_check (int force)
+@@ -353,48 +355,112 @@ int mutt_buffy_check (int force)

        case M_MBOX:
        case M_MMDF:
  
        case M_MBOX:
        case M_MMDF:
  


@@ -81,13 +82,19 @@ in the "mutt-patched" package.
        }
        else if (option(OPTCHECKMBOXSIZE))
        {
        }
        else if (option(OPTCHECKMBOXSIZE))
        {

-@@ -366,17 +385,21 @@ int mutt_buffy_check (int force)
-       if (tmp->newly_created &&
-           (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
-         tmp->newly_created = 0;
+         /* some other program has deleted mail from the folder */
+         tmp->size = (long) sb.st_size;
+       }
+-      if (tmp->newly_created &&
+-          (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
+-        tmp->newly_created = 0;

 -
 -

+-      break;
++        if (tmp->newly_created &&
++            (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
++          tmp->newly_created = 0;

 +        }
 +        }

-       break;
++        break;

  
        case M_MAILDIR:
  
  
        case M_MAILDIR:
  


@@ -104,16 +111,13 @@ in the "mutt-patched" package.
        while ((de = readdir (dirp)) != NULL)
        {
          char *p;
        while ((de = readdir (dirp)) != NULL)
        {
          char *p;

-@@ -385,12 +408,36 @@ int mutt_buffy_check (int force)
+         if (*de->d_name != '.' && 
+             (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))

          {
          {

-           if (!tmp->new)
-           {
--            /* one new and undeleted message is enough */
--            BuffyCount++;
--            tmp->new = 1;
--
--            if (! option (OPTMAILDIRMTIME)) /* prevent stat calls */
--              break;
+-          /* one new and undeleted message is enough */
+-          BuffyCount++;
+-          tmp->new = 1;
+-          break;

 +          tmp->has_new = tmp->new = 1;
 +            tmp->msgcount++;
 +            tmp->msg_unread++;
 +          tmp->has_new = tmp->new = 1;
 +            tmp->msgcount++;
 +            tmp->msg_unread++;


@@ -144,10 +148,9 @@ in the "mutt-patched" package.
 +             if (p && strchr(p + 3, 'F')) {
 +               tmp->msg_flagged++;
 +             }
 +             if (p && strchr(p + 3, 'F')) {
 +               tmp->msg_flagged++;
 +             }

-           }
-           snprintf (path, sizeof (path), "%s/new/%s", tmp->path, de->d_name);
-           if (!stat (path, &smd) && smd.st_mtime > tmp->mtime)
-@@ -403,8 +450,25 @@ int mutt_buffy_check (int force)
+         }
+       }
+       closedir (dirp);

        break;
  
        case M_MH:
        break;
  
        case M_MH:


@@ -177,12 +180,11 @@ in the "mutt-patched" package.
      }
 --- a/buffy.h
 +++ b/buffy.h
      }
 --- a/buffy.h
 +++ b/buffy.h

-@@ -25,8 +25,13 @@ typedef struct buffy_t
+@@ -25,7 +25,12 @@ typedef struct buffy_t

    char *path;
    long size;
    struct buffy_t *next;
 +  struct buffy_t *prev;
    char *path;
    long size;
    struct buffy_t *next;
 +  struct buffy_t *prev;

-   time_t mtime;                       /* for maildirs...time of newest entry */

    short new;                  /* mailbox has new mail */
 +  short has_new;              /* set it new if new and not read */
 +  int msgcount;                       /* total number of messages */
    short new;                  /* mailbox has new mail */
 +  short has_new;              /* set it new if new and not read */
 +  int msgcount;                       /* total number of messages */


@@ -832,10 +834,10 @@ in the "mutt-patched" package.
  #include "attach.h"
  #include "mbyte.h"
 +#include "sidebar.h"
  #include "attach.h"
  #include "mbyte.h"
 +#include "sidebar.h"

- void set_xterm_title_bar(char *title);
- void set_xterm_icon_name(char *name);

  
  

-@@ -1069,6 +1070,8 @@ static int format_line (struct line_t **
+ #include "mx.h"
+ 
+@@ -1067,6 +1068,8 @@ static int format_line (struct line_t **

    mbstate_t mbstate;
  
    int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap);
    mbstate_t mbstate;
  
    int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap);


@@ -844,7 +846,7 @@ in the "mutt-patched" package.
    
    /* FIXME: this should come from lineInfo */
    memset(&mbstate, 0, sizeof(mbstate));
    
    /* FIXME: this should come from lineInfo */
    memset(&mbstate, 0, sizeof(mbstate));

-@@ -1702,7 +1705,7 @@ mutt_pager (const char *banner, const ch
+@@ -1700,7 +1703,7 @@ mutt_pager (const char *banner, const ch

      if ((redraw & REDRAW_BODY) || topline != oldtopline)
      {
        do {
      if ((redraw & REDRAW_BODY) || topline != oldtopline)
      {
        do {


@@ -853,7 +855,7 @@ in the "mutt-patched" package.
        curline = oldtopline = topline;
        lines = 0;
        force_redraw = 0;
        curline = oldtopline = topline;
        lines = 0;
        force_redraw = 0;

-@@ -1715,6 +1718,7 @@ mutt_pager (const char *banner, const ch
+@@ -1713,6 +1716,7 @@ mutt_pager (const char *banner, const ch

                            &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
            lines++;
          curline++;
                            &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
            lines++;
          curline++;


@@ -861,7 +863,7 @@ in the "mutt-patched" package.
        }
        last_offset = lineInfo[curline].offset;
        } while (force_redraw);
        }
        last_offset = lineInfo[curline].offset;
        } while (force_redraw);

-@@ -1728,6 +1732,7 @@ mutt_pager (const char *banner, const ch
+@@ -1726,6 +1730,7 @@ mutt_pager (const char *banner, const ch

          addch ('~');
        addch ('\n');
        lines++;
          addch ('~');
        addch ('\n');
        lines++;


@@ -869,7 +871,7 @@ in the "mutt-patched" package.
        }
        /* We are going to update the pager status bar, so it isn't
         * necessary to reset to normal color now. */
        }
        /* We are going to update the pager status bar, so it isn't
         * necessary to reset to normal color now. */

-@@ -1751,22 +1756,22 @@ mutt_pager (const char *banner, const ch
+@@ -1749,22 +1754,22 @@ mutt_pager (const char *banner, const ch

        /* print out the pager status bar */
        SETCOLOR (MT_COLOR_STATUS);
        BKGDSET (MT_COLOR_STATUS);
        /* print out the pager status bar */
        SETCOLOR (MT_COLOR_STATUS);
        BKGDSET (MT_COLOR_STATUS);


@@ -896,7 +898,7 @@ in the "mutt-patched" package.
        BKGDSET (MT_COLOR_NORMAL);
        SETCOLOR (MT_COLOR_NORMAL);
        if (option(OPTXTERMSETTITLES))
        BKGDSET (MT_COLOR_NORMAL);
        SETCOLOR (MT_COLOR_NORMAL);
        if (option(OPTXTERMSETTITLES))

-@@ -1783,18 +1788,23 @@ mutt_pager (const char *banner, const ch
+@@ -1781,18 +1786,23 @@ mutt_pager (const char *banner, const ch

        /* redraw the pager_index indicator, because the
         * flags for this message might have changed. */
        menu_redraw_current (index);
        /* redraw the pager_index indicator, because the
         * flags for this message might have changed. */
        menu_redraw_current (index);


@@ -922,7 +924,7 @@ in the "mutt-patched" package.
      redraw = 0;
  
      if (option(OPTBRAILLEFRIENDLY)) {
      redraw = 0;
  
      if (option(OPTBRAILLEFRIENDLY)) {

-@@ -2673,6 +2683,13 @@ search_next:
+@@ -2671,6 +2681,13 @@ search_next:

          redraw = REDRAW_FULL;
          break;
  
          redraw = REDRAW_FULL;
          break;
  


@@ -1370,4 +1372,4 @@ in the "mutt-patched" package.
 --- a/PATCHES
 +++ b/PATCHES
 @@ -0,0 +1 @@
 --- a/PATCHES
 +++ b/PATCHES
 @@ -0,0 +1 @@

-+patch-1.5.18.sidebar.20080517.txt
++patch-1.5.18.sidebar.20080611.txt

diff --git a/debian/patches/mutt-patched/sidebar-compat-apply.debian b/debian/patches/mutt-patched/sidebar-compat-apply.debian
new file mode 100644 (file)
index 0000000..c3ec129
--- /dev/null
+++ b/debian/patches/mutt-patched/sidebar-compat-apply.debian
@@ -0,0 +1,30 @@
+# vim:ft=diff:
+[continued from sidebar-compat-revert]
+
+After having applied the sidebar patch, we now re-apply the relevant part of
+the maildir-mtime patch. The hunk is considerably shorter as we are always
+counting messages; the if..break part has been dropped.
+--- a/buffy.c
++++ b/buffy.c
+@@ -409,6 +409,11 @@ int mutt_buffy_check (int force)
+           tmp->has_new = tmp->new = 1;
+             tmp->msgcount++;
+             tmp->msg_unread++;
++          snprintf (path, sizeof (path), "%s/new/%s", tmp->path, de->d_name);
++          if (!stat (path, &smd) && smd.st_mtime > tmp->mtime)
++          {
++            tmp->mtime = smd.st_mtime;
++          }
+         }
+       }
+         if(tmp->msg_unread)
+--- a/buffy.h
++++ b/buffy.h
+@@ -26,6 +26,7 @@ typedef struct buffy_t
+   long size;
+   struct buffy_t *next;
+   struct buffy_t *prev;
++  time_t mtime;                       /* for maildirs...time of newest entry */
+   short new;                  /* mailbox has new mail */
+   short has_new;              /* set it new if new and not read */
+   int msgcount;                       /* total number of messages */

diff --git a/debian/patches/mutt-patched/sidebar-compat-revert.debian b/debian/patches/mutt-patched/sidebar-compat-revert.debian
new file mode 100644 (file)
index 0000000..cabd8a2
--- /dev/null
+++ b/debian/patches/mutt-patched/sidebar-compat-revert.debian
@@ -0,0 +1,48 @@
+# vim:ft=diff:
+The sidebar and maildir-mtime patches touch the same part of buffy.c and
+generate a non-trivial conflict. This patch reverts the affected hunk from the
+maildir-mtime patch so we can cleanly apply the sidebar patch from the patch
+upstream site. While we are at it, we also revert the trivial buffy.h change.
+
+Previously, the mutt maintainer would manually re-resolve the conflict for each
+new sidebar patch version which turned out to be too error-prone.
+(cf. #484537, #484538)
+
+[see sidebar-compat-apply for part 2]
+--- a/buffy.c
++++ b/buffy.c
+@@ -383,20 +383,10 @@ int mutt_buffy_check (int force)
+         if (*de->d_name != '.' && 
+             (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
+         {
+-          if (!tmp->new)
+-          {
+-            /* one new and undeleted message is enough */
+-            BuffyCount++;
+-            tmp->new = 1;
+-
+-            if (! option (OPTMAILDIRMTIME)) /* prevent stat calls */
+-              break;
+-          }
+-          snprintf (path, sizeof (path), "%s/new/%s", tmp->path, de->d_name);
+-          if (!stat (path, &smd) && smd.st_mtime > tmp->mtime)
+-          {
+-            tmp->mtime = smd.st_mtime;
+-          }
++          /* one new and undeleted message is enough */
++          BuffyCount++;
++          tmp->new = 1;
++          break;
+         }
+       }
+       closedir (dirp);
+--- a/buffy.h
++++ b/buffy.h
+@@ -25,7 +25,6 @@ typedef struct buffy_t
+   char *path;
+   long size;
+   struct buffy_t *next;
+-  time_t mtime;                       /* for maildirs...time of newest entry */
+   short new;                  /* mailbox has new mail */
+   short notified;             /* user has been notified */
+   short magic;                        /* mailbox type */

diff --git a/debian/patches/series b/debian/patches/series
index 0ff072938f1d4f4f4a518671da62e32867b63951..3cee92af6ab7e74cdf215f80e93ed2b3e4f76bd6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,7 +30,9 @@ upstream/489283-multipart-decoding
 
 mutt.org
 # extra patches for mutt-patched
 
 mutt.org
 # extra patches for mutt-patched

+mutt-patched/sidebar-compat-revert.debian

 mutt-patched/sidebar
 mutt-patched/sidebar

+mutt-patched/sidebar-compat-apply.debian

 
 # unapplied patches for custom packages
 # not-applied/chdir
 
 # unapplied patches for custom packages
 # not-applied/chdir