From cc4009f0f3bc5567eb5c7e03782518b607dcf16a Mon Sep 17 00:00:00 2001 From: Christoph Berg Date: Thu, 5 Feb 2009 23:30:32 +0100 Subject: [PATCH] Grab two patches from upstream that should also go into lenny * Grab two patches from upstream that should also go into lenny: + Always sort inode list for accessing header cache. (Closes: #508988) + Delete partially downloaded files in message cache. (Closes: #500016) * Add Antonio Radici to Uploaders. Thanks for the BTS triaging! --- debian/changelog | 6 ++- debian/control | 2 +- debian/patches/series | 5 ++- .../upstream/500016-temp-cache-fix.patch | 29 +++++++++++++ .../patches/upstream/508988-inode-sort.patch | 41 +++++++++++++++++++ 5 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 debian/patches/upstream/500016-temp-cache-fix.patch create mode 100644 debian/patches/upstream/508988-inode-sort.patch diff --git a/debian/changelog b/debian/changelog index 4b12c5d..db2c6ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,12 @@ mutt (1.5.19-2) experimental; urgency=low too many users. * Use upstream's smime.rc file, hereby fixing S/MIME encryption. (Closes: #315319) + * Grab two patches from upstream that should also go into lenny: + + Always sort inode list for accessing header cache. (Closes: #508988) + + Delete partially downloaded files in message cache. (Closes: #500016) + * Add Antonio Radici to Uploaders. Thanks for the BTS triaging! - -- Christoph Berg Tue, 03 Feb 2009 22:08:02 +0100 + -- Christoph Berg Thu, 05 Feb 2009 23:26:41 +0100 mutt (1.5.19-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 541dd1d..b76863b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: mutt Section: mail Priority: standard Maintainer: Christoph Berg -Uploaders: Adeodato Simó +Uploaders: Adeodato Simó , Antonio Radici Build-Depends: debhelper (>> 5), quilt, automake, gawk, gettext, xsltproc, docbook-xml, docbook-xsl, links, libncurses5-dev, libsasl2-dev, libgnutls-dev, libidn11-dev, zlib1g-dev, libncursesw5-dev, libgdbm-dev, libkrb5-dev diff --git a/debian/patches/series b/debian/patches/series index 16a0bd4..e73224c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -24,8 +24,11 @@ debian-specific/document_debian_defaults debian-specific/assumed_charset-compat misc/define-pgp_getkeys_command.diff misc/gpg.rc-paths - misc/smime.rc + +upstream/500016-temp-cache-fix.patch +upstream/508988-inode-sort.patch + mutt.org # extra patches for mutt-patched mutt-patched/sidebar-compat-revert.debian diff --git a/debian/patches/upstream/500016-temp-cache-fix.patch b/debian/patches/upstream/500016-temp-cache-fix.patch new file mode 100644 index 0000000..486f74e --- /dev/null +++ b/debian/patches/upstream/500016-temp-cache-fix.patch @@ -0,0 +1,29 @@ +message cache partially invalid after network problem +fixed by http://dev.mutt.org/trac/ticket/3163 +changeset http://dev.mutt.org/trac/changeset/da94a92c3ba0 +resolves http://bugs.debian.org/500016 + +--- mutt-1.5.19/bcache.c 2009-01-05 19:20:53.000000000 +0000 ++++ mutt-7ddf1d1cc490/bcache.c 2009-01-27 20:58:15.000000000 +0000 +@@ -136,6 +136,13 @@ + snprintf (path, sizeof (path), "%s%s%s", bcache->path, id, + tmp ? ".tmp" : ""); + ++ if ((fp = safe_fopen (path, "w+"))) ++ goto out; ++ ++ if (errno == EEXIST) ++ /* clean up leftover tmp file */ ++ mutt_unlink (path); ++ + s = strchr (path + 1, '/'); + while (!(fp = safe_fopen (path, "w+")) && errno == ENOENT && s) + { +@@ -147,6 +154,7 @@ + s = strchr (s + 1, '/'); + } + ++ out: + dprint (3, (debugfile, "bcache: put: '%s'\n", path)); + + return fp; diff --git a/debian/patches/upstream/508988-inode-sort.patch b/debian/patches/upstream/508988-inode-sort.patch new file mode 100644 index 0000000..64192ad --- /dev/null +++ b/debian/patches/upstream/508988-inode-sort.patch @@ -0,0 +1,41 @@ +fixed by http://dev.mutt.org/trac/ticket/3163 +changeset http://dev.mutt.org/trac/changeset/eb918af802ec +resolves http://bugs.debian.org/508988 + +This commit introduces an unconditional inode-sort to fix the slowness with big +maildirs + +--- mutt-1.5.19/mh.c 2009-01-05 19:20:53.000000000 +0000 ++++ mutt-7ddf1d1cc490/mh.c 2009-01-27 20:58:15.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 1996-2002,2007 Michael R. Elkins ++ * Copyright (C) 1996-2002,2007,2009 Michael R. Elkins + * Copyright (C) 1999-2005 Thomas Roessler + * + * This program is free software; you can redistribute it and/or modify +@@ -1027,13 +1027,14 @@ + if (!ctx->quiet && progress) + mutt_progress_update (progress, count, -1); + ++ DO_SORT(); ++ + snprintf (fn, sizeof (fn), "%s/%s", ctx->path, p->h->path); + + #if USE_HCACHE + if (option(OPTHCACHEVERIFY)) + { +- DO_SORT(); +- ret = stat(fn, &lastchanged); ++ ret = stat(fn, &lastchanged); + } + else + { +@@ -1057,7 +1058,6 @@ + { + #endif /* USE_HCACHE */ + +- DO_SORT(); + if (maildir_parse_message (ctx->magic, fn, p->h->old, p->h)) + { + p->header_parsed = 1; -- 2.43.0