- cd.signatures, keep_to, smime.rc, xface patches updated to 1.11.0

[packages/mutt.git] / mutt-rr.compressed.patch

diff --git a/mutt-rr.compressed.patch b/mutt-rr.compressed.patch
index 1528e40a255817bd523313c7583a40293f0fa606..46ba156fecc22c93bb74719b08e679d5800451b0 100644 (file)
--- a/mutt-rr.compressed.patch
+++ b/mutt-rr.compressed.patch
@@ -142,7 +142,7 @@ diff -udprP mutt-1.5.19.orig/compress.c mutt-1.5.19/compress.c
 +  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);
 +}
@@ -569,7 +569,7 @@ diff -udprP mutt-1.5.19.orig/configure mutt-1.5.19/configure
 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])
  
@@ -578,7 +578,7 @@ diff -udprP mutt-1.5.19.orig/configure.ac mutt-1.5.19/configure.ac
 +                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
@@ -919,7 +919,7 @@ diff -udprP mutt-1.5.19.orig/doc/manual.xml.head mutt-1.5.19/doc/manual.xml.head
 +
 +<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
@@ -985,9 +985,9 @@ diff -udprP mutt-1.5.19.orig/doc/muttrc.man.head mutt-1.5.19/doc/muttrc.man.head
 --- 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"
@@ -1052,8 +1052,8 @@ diff -udprP mutt-1.5.19.orig/init.h mutt-1.5.19/init.h
 +  { "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
@@ -1262,9 +1262,9 @@ diff -udprP mutt-1.5.19.orig/mx.h mutt-1.5.19/mx.h
 --- 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