[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Unblock request for mutt/1.5.18-4


mutt/1.5.18-4 fixes a critical regression in the mutt-patched package;
new-mail detection was broken (#484537, #484538).

Before a fix was known, I had decided to downgrade the severity to
important as the main mutt binary package was not affected, and I had
rather released without mutt-patched at all, than without any changes
from the last upload which these bugs had prevented from going into
testing. In short, #484537, #484538 are RC for mutt-patched, so I'd
very much like to see them fixed in lenny. The change doesn't affect
the main mutt package (except for a move of 2 prototypes, see below),
so it should be safe for unblocking.

The diff is a bit nasty to read as it is blown up by context changes
in debian/patches/*, my excuses to any reviewers.

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.
  * 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

The changes in detail:

 6 files changed, 166 insertions(+), 81 deletions(-)
 mutt-1.5.18/debian/changelog                             |   13 ++

Desipte the big diff, this is just moving 2 lines of function
prototypes from a .c file to the proper place in a .h: (this is the
only part that affects anything outside mutt-patched)

 mutt-1.5.18/debian/patches/features/xtitles              |   88 ++++++---------

Now for the important bits:

The sidebar patch is now used unchanged from the patch's upstream
website: (modulo a refresh to wipe automake stuff)

 mutt-1.5.18/debian/patches/mutt-patched/sidebar          |   66 +++++------

The bits that were previously patched by me in the sidebar patch are
now in two new patches that get applied before and after the sidebar
patch. This is where the actual bug was, the conflict between the
maildir-mtime and the sidebar patches had been resolved incorrectly by
me. More documentation is in the patch files.

 debian/patches/mutt-patched/sidebar-compat-apply.debian  |   30 +++++
 debian/patches/mutt-patched/sidebar-compat-revert.debian |   48 ++++++++
 mutt-1.5.18/debian/patches/series                        |    2 

Thanks for considering,
cb@df7cb.de | http://www.df7cb.de/

Attachment: signature.asc
Description: Digital signature

Reply to: