+ ctx->realpath = ctx->path;
+
+ /* Uncompress to /tmp */
-+ mutt_mktemp (tmppath);
++ mutt_mktemp (tmppath, sizeof(tmppath));
+ ctx->path = safe_malloc (strlen (tmppath) + 1);
+ strcpy (ctx->path, tmppath);
+}
diff -udprP mutt-1.5.19.orig/configure.ac mutt-1.5.19/configure.ac
--- mutt-1.5.19.orig/configure.ac 2008-11-17 22:15:26.000000000 +0200
+++ mutt-1.5.19/configure.ac 2009-01-06 19:16:04.000000000 +0200
-@@ -789,6 +789,11 @@ AC_ARG_ENABLE(mailtool, AC_HELP_STRING([
+@@ -807,6 +807,11 @@ AC_ARG_ENABLE(mailtool, AC_HELP_STRING([
AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ])
fi])
+ AC_DEFINE(USE_COMPRESSED,1,[ Define to enable compressed folders support. ])
+ fi])
+
- AC_ARG_ENABLE(locales-fix, AC_HELP_STRING([--enable-locales-fix], [The result of isprint() is unreliable]),
+ AC_ARG_ENABLE(locales-fix, AS_HELP_STRING([--enable-locales-fix],[The result of isprint() is unreliable]),
[if test x$enableval = xyes; then
AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
diff -udprP mutt-1.5.19.orig/curs_main.c mutt-1.5.19/curs_main.c
mutt_str_replace (&LastFolder, Context->path);
oldcount = Context ? Context->msgcount : 0;
-diff -udprP mutt-1.5.19.orig/doc/Makefile.am mutt-1.5.19/doc/Makefile.am
---- mutt-1.5.19.orig/doc/Makefile.am 2009-01-05 21:20:53.000000000 +0200
-+++ mutt-1.5.19/doc/Makefile.am 2009-01-06 19:16:04.000000000 +0200
-@@ -31,7 +31,8 @@ EXTRA_DIST = dotlock.man \
+--- mutt-1.5.20.b/doc/Makefile.am 2009-06-01 04:23:14.000000000 +0200
++++ mutt-1.5.20/doc/Makefile.am 2009-07-14 12:36:06.000000000 +0200
+@@ -31,7 +31,8 @@
- HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \
+ CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \
configuration.html mimesupport.html advancedusage.html \
-- optionalfeatures.html tuning.html reference.html miscellany.html
-+ optionalfeatures.html tuning.html reference.html miscellany.html \
+- optionalfeatures.html security.html tuning.html reference.html miscellany.html
++ optionalfeatures.html security.html tuning.html reference.html miscellany.html \
+ compressed-folders.html
- BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES)
+ HTML_DOCFILES = manual.html $(CHUNKED_DOCFILES)
-diff -udprP mutt-1.5.19.orig/doc/Makefile.in mutt-1.5.19/doc/Makefile.in
---- mutt-1.5.19.orig/doc/Makefile.in 2009-01-05 21:24:14.000000000 +0200
-+++ mutt-1.5.19/doc/Makefile.in 2009-01-06 19:16:04.000000000 +0200
-@@ -234,7 +234,8 @@ EXTRA_DIST = dotlock.man \
+--- mutt-1.5.20.b/doc/Makefile.in 2009-06-09 08:50:43.000000000 +0200
++++ mutt-1.5.20/doc/Makefile.in 2009-07-14 12:36:53.000000000 +0200
+@@ -235,7 +235,8 @@
- HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \
+ CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \
configuration.html mimesupport.html advancedusage.html \
-- optionalfeatures.html tuning.html reference.html miscellany.html
-+ optionalfeatures.html tuning.html reference.html miscellany.html \
+- optionalfeatures.html security.html tuning.html reference.html miscellany.html
++ optionalfeatures.html security.html tuning.html reference.html miscellany.html \
+ compressed-folders.html
+ HTML_DOCFILES = manual.html $(CHUNKED_DOCFILES)
BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES)
- srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt \
diff -udprP mutt-1.5.19.orig/doc/manual.xml.head mutt-1.5.19/doc/manual.xml.head
--- mutt-1.5.19.orig/doc/manual.xml.head 2009-01-05 21:20:53.000000000 +0200
+++ mutt-1.5.19/doc/manual.xml.head 2009-01-06 19:35:41.000000000 +0200
+
+<listitem>
+<cmdsynopsis>
- <command><link linkend="auto-view">auto-view</link></command>
+ <command><link linkend="auto-view">auto_view</link></command>
<arg choice="plain">
<replaceable>mimetype</replaceable>
@@ -7007,6 +7285,18 @@ The following are the commands understoo
diff -udprP mutt-1.5.19.orig/doc/Muttrc.head mutt-1.5.19/doc/Muttrc.head
--- mutt-1.5.19.orig/doc/Muttrc.head 2008-06-14 03:08:43.000000000 +0300
+++ mutt-1.5.19/doc/Muttrc.head 2009-01-06 19:16:04.000000000 +0200
-@@ -29,6 +29,11 @@ macro generic,pager <F1> "<shell-escape>
+@@ -29,6 +29,17 @@ macro generic,pager <F1> "<shell-escape>
macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
bind browser y exit
+# Use folders which match on \\.gz$ as gzipped folders:
-+# open-hook \\.gz$ "gzip -cd %f > %t"
-+# close-hook \\.gz$ "gzip -c %t > %f"
-+# append-hook \\.gz$ "gzip -c %t >> %f"
++open-hook \\.gz$ "gzip -cd %f > %t"
++close-hook \\.gz$ "gzip -c %t > %f"
++append-hook \\.gz$ "gzip -c %t >> %f"
++open-hook \\.bz2$ "bzip2 -cd %f > %t"
++close-hook \\.bz2$ "bzip2 -c %t > %f"
++append-hook \\.bz2$ "bzip2 -c %t >> %f"
++open-hook \\.xz$ "xz -cd %f > %t"
++close-hook \\.xz$ "xz -c %t > %f"
++append-hook \\.xz$ "xz -c %t >> %f"
+
# If Mutt is unable to determine your site's domain name correctly, you can
# set the default here.
--- mutt-1.5.19.orig/doc/muttrc.man.head 2008-11-26 20:48:48.000000000 +0200
+++ mutt-1.5.19/doc/muttrc.man.head 2009-01-06 19:16:04.000000000 +0200
@@ -345,6 +345,24 @@ specify the ID of the public key to be u
- to a certain recipient. The meaning of "key ID" is to be taken
- broadly: This can be a different e-mail address, a numerical key ID,
- or even just an arbitrary search string.
+ \fBcrypt-hook\fPs result in the use of multiple \fIkey-id\fPs for
+ a recipient.
+
+.PP
+.nf
+\fBopen-hook\fP \fIregexp\fP "\fIcommand\fP"
+ { "close-hook", mutt_parse_hook, M_CLOSEHOOK },
+ { "append-hook", mutt_parse_hook, M_APPENDHOOK },
+#endif
- { "group", parse_group, 0 },
- { "ungroup", parse_ungroup, 0 },
+ { "group", parse_group, M_GROUP },
+ { "ungroup", parse_ungroup, M_UNGROUP },
{ "hdr_order", parse_list, UL &HeaderOrderList },
diff -udprP mutt-1.5.19.orig/main.c mutt-1.5.19/main.c
--- mutt-1.5.19.orig/main.c 2009-01-04 01:27:10.000000000 +0200
--- mutt-1.5.19.orig/mx.h 2008-03-19 22:07:06.000000000 +0200
+++ mutt-1.5.19/mx.h 2009-01-06 19:16:04.000000000 +0200
@@ -40,6 +40,9 @@ enum
- #ifdef USE_POP
- , M_POP
- #endif
+ M_MAILDIR,
+ M_IMAP,
+ M_POP
+#ifdef USE_COMPRESSED
+ , M_COMPRESSED
+#endif