X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/4c13acfc45a942f5f481ce6a3dfcea461da505ad..9039efff71e58683a07dc3eee8ca706ce789716a:/upstream/extra-patches/compressed-folders

diff --git a/upstream/extra-patches/compressed-folders b/upstream/extra-patches/compressed-folders
index f12621e..3a5c3ae 100644
--- a/upstream/extra-patches/compressed-folders
+++ b/upstream/extra-patches/compressed-folders
@@ -7,19 +7,18 @@ The home page for this patch is:
   http://www.spinnaker.de/mutt/compressed/
 
 * Patch last synced with upstream:
-  - Date: 2005-03-10
-  - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.8.rr.compressed.1.gz
+  - Date: 2005-08-14
+  - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.10.rr.compressed.1.gz
 
 * Changes made:
   - filterdiff -p1 \
-    $(for f in Makefile.in config.h.in configure Muttrc doc/manual.txt \
+    $(for f in Makefile.in config.h.in configure 'Muttrc*' doc/manual.txt \
       doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done)
-  - 2005-03-10: fix configure.in to match latest CVS.
 
 == END PATCH
-diff -urN mutt-1.5.8/compress.c mutt-1.5.8-ro/compress.c
---- mutt-1.5.8/compress.c	1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.5.8-ro/compress.c	2005-02-13 18:54:39.000000000 +0100
+diff -urN mutt-1.5.10/compress.c mutt-1.5.10-ro/compress.c
+--- mutt-1.5.10/compress.c	1970-01-01 01:00:00.000000000 +0100
++++ mutt-1.5.10-ro/compress.c	2005-08-14 12:10:21.000000000 +0200
 @@ -0,0 +1,487 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
@@ -508,9 +507,9 @@ diff -urN mutt-1.5.8/compress.c mutt-1.5.8-ro/compress.c
 +}
 +
 +#endif /* USE_COMPRESSED */
-diff -urN mutt-1.5.8/compress.h mutt-1.5.8-ro/compress.h
---- mutt-1.5.8/compress.h	1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.5.8-ro/compress.h	2005-02-13 18:54:39.000000000 +0100
+diff -urN mutt-1.5.10/compress.h mutt-1.5.10-ro/compress.h
+--- mutt-1.5.10/compress.h	1970-01-01 01:00:00.000000000 +0100
++++ mutt-1.5.10-ro/compress.h	2005-08-14 12:10:21.000000000 +0200
 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
@@ -539,12 +538,12 @@ diff -urN mutt-1.5.8/compress.h mutt-1.5.8-ro/compress.h
 +int mutt_test_compress_command (const char *);
 +int mutt_check_mailbox_compressed (CONTEXT *);
 +void mutt_fast_close_compressed (CONTEXT *);
-diff -urN mutt-1.5.8/config.h.in mutt-1.5.8-ro/config.h.in
-diff -urN mutt-1.5.8/configure mutt-1.5.8-ro/configure
-diff -urN mutt-1.5.8/configure.in mutt-1.5.8-ro/configure.in
---- mutt-1.5.8/configure.in	2005-02-12 21:57:16.000000000 +0100
-+++ mutt-1.5.8-ro/configure.in	2005-02-13 18:54:39.000000000 +0100
-@@ -776,6 +776,11 @@
+diff -urN mutt-1.5.10/config.h.in mutt-1.5.10-ro/config.h.in
+diff -urN mutt-1.5.10/configure mutt-1.5.10-ro/configure
+diff -urN mutt-1.5.10/configure.in mutt-1.5.10-ro/configure.in
+--- mutt-1.5.10/configure.in	2005-08-11 23:49:24.000000000 +0200
++++ mutt-1.5.10-ro/configure.in	2005-08-14 12:10:21.000000000 +0200
+@@ -753,6 +753,11 @@
                  AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
          fi])
  
@@ -556,10 +555,10 @@ diff -urN mutt-1.5.8/configure.in mutt-1.5.8-ro/configure.in
  AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]),
          [if test $withval != yes; then
                  AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
-diff -urN mutt-1.5.8/curs_main.c mutt-1.5.8-ro/curs_main.c
---- mutt-1.5.8/curs_main.c	2005-02-12 20:22:15.000000000 +0100
-+++ mutt-1.5.8-ro/curs_main.c	2005-02-13 18:54:39.000000000 +0100
-@@ -1076,6 +1076,11 @@
+diff -urN mutt-1.5.10/curs_main.c mutt-1.5.10-ro/curs_main.c
+--- mutt-1.5.10/curs_main.c	2005-08-11 21:37:01.000000000 +0200
++++ mutt-1.5.10-ro/curs_main.c	2005-08-14 12:10:21.000000000 +0200
+@@ -1087,6 +1087,11 @@
          {
  	  int check;
  
@@ -571,222 +570,16 @@ diff -urN mutt-1.5.8/curs_main.c mutt-1.5.8-ro/curs_main.c
  	  mutt_str_replace (&LastFolder, Context->path);
  	  oldcount = Context ? Context->msgcount : 0;
  
-diff -urN mutt-1.5.8/doc/manual-4.html mutt-1.5.8-ro/doc/manual-4.html
-diff -urN mutt-1.5.8/doc/manual-6.html mutt-1.5.8-ro/doc/manual-6.html
-diff -urN mutt-1.5.8/doc/manual.html mutt-1.5.8-ro/doc/manual.html
-diff -urN mutt-1.5.8/doc/manual.sgml mutt-1.5.8-ro/doc/manual.sgml
-diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head
---- mutt-1.5.8/doc/manual.sgml.head	2005-02-12 20:41:36.000000000 +0100
-+++ mutt-1.5.8-ro/doc/manual.sgml.head	2005-02-13 18:54:39.000000000 +0100
-@@ -2537,6 +2537,176 @@
- macro pager \cb |urlview\n
- </verb></tscreen>
- 
-+<sect1>Compressed folders Support (OPTIONAL)
-+<p>
-+
-+If Mutt was compiled with compressed folders support (by running the
-+<em/configure/ script with the <em/--enable-compressed/ flag), Mutt
-+can open folders stored in an arbitrary format, provided that the user
-+has a script to convert from/to this format to one of the accepted.
-+
-+The most common use is to open compressed archived folders e.g. with
-+gzip.
-+
-+In addition, the user can provide a script that gets a folder in an
-+accepted format and appends its context to the folder in the
-+user-defined format, which may be faster than converting the entire
-+folder to the accepted format, appending to it and converting back to
-+the user-defined format.
-+
-+There are three hooks defined (<ref id="open-hook" name="open-hook">,
-+<ref id="close-hook" name="close-hook"> and <ref id="append-hook"
-+name="append-hook">) which define commands to uncompress and compress
-+a folder and to append messages to an existing compressed folder 
-+respectively.
-+
-+For example:
-+
-+<tscreen><verb>
-+open-hook \\.gz$ "gzip -cd %f &gt; %t" 
-+close-hook \\.gz$ "gzip -c %t &gt; %f"
-+append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" 
-+</verb></tscreen>
-+
-+You do not have to specify all of the commands. If you omit <ref
-+id="append-hook" name="append-hook">, the folder will be open and
-+closed again each time you will add to it. If you omit <ref
-+id="close-hook" name="close-hook"> (or give empty command) , the
-+folder will be open in the  mode. If you specify <ref
-+id="append-hook" name="append-hook"> though you'll be able to append
-+to the folder.
-+
-+Note that Mutt will only try to use hooks if the file is not in one of
-+the accepted formats. In particular, if the file is empty, mutt
-+supposes it is not compressed. This is important because it allows the
-+use of programs that do not have well defined extensions. Just use
-+&dquot;.&dquot; as a regexp. But this may be surprising if your
-+compressing script produces empty files. In this situation, unset <ref
-+id="save_empty" name="&dollar;save&lowbar;empty">, so that the compressed file
-+will be removed if you delete all of the messages.
-+
-+<sect2>Open a compressed mailbox for reading<label id="open-hook">
-+<p>
-+Usage: <tt/open-hook/ <em/regexp/ &dquot;<em/command/&dquot;
-+
-+The <em/command/ is the command that can be used for opening the
-+folders whose names match <em/regexp/.
-+
-+The <em/command/ string is the printf-like format string, and it
-+should accept two parameters: &percnt;f, which is replaced with the
-+(compressed) folder name, and &percnt;t which is replaced with the
-+name of the temporary folder to which to write.
-+
-+&percnt;f and &percnt;t can be repeated any number of times in the
-+command string, and all of the entries are replaced with the
-+appropriate folder name. In addition, &percnt;&percnt; is replaced by
-+&percnt;, as in printf, and any other &percnt;anything is left as is.
-+
-+The <em/command/ should <bf/not/ remove the original compressed file.
-+The <em/command/ should return non-zero exit status if it fails, so
-+mutt knows something's wrong.
-+
-+Example:
-+
-+<tscreen><verb>
-+open-hook \\.gz$ "gzip -cd %f &gt; %t" 
-+</verb></tscreen>
-+
-+If the <em/command/ is empty, this operation is disabled for this file
-+type.
-+
-+<sect2>Write a compressed mailbox<label id="close-hook">
-+<p>
-+Usage: <tt/close-hook/ <em/regexp/ &dquot;<em/command/&dquot;
-+
-+This is used to close the folder that was open with the <ref id="open-hook" 
-+name="open-hook"> command after some changes were made to it.
-+
-+The <em/command/ string is the command that can be used for closing the
-+folders whose names match <em/regexp/. It has the same format as in 
-+the <ref id="open-hook" name="open-hook"> command. Temporary folder
-+in this case is the folder previously produced by the <ref id="open-hook"
-+name="open-hook"> command.
-+
-+The <em/command/ should <bf/not/ remove the decompressed file. The
-+<em/command/ should return non-zero exit status if it fails, so mutt
-+knows something's wrong.
-+
-+Example:
-+
-+<tscreen><verb>
-+close-hook \\.gz$ "gzip -c %t &gt; %f"
-+</verb></tscreen>
-+
-+If the <em/command/ is empty, this operation is disabled for this file
-+type, and the file can only be open in the read-only mode.
-+
-+<ref id="close-hook" name ="close-hook"> is not called when you exit
-+from the folder if the folder was not changed.
-+
-+<sect2>Append a message to a compressed mailbox<label id="append-hook">
-+<p>
-+Usage: <tt/append-hook/ <em/regexp/ &dquot;<em/command/&dquot;
-+
-+This command is used for saving to an existing compressed folder.
-+The <em/command/ is the command that can be used for appending to the
-+folders whose names match <em/regexp/. It has the same format as in 
-+ the <ref id="open-hook" name="open-hook"> command.
-+The temporary folder in this case contains the messages that are being
-+appended. 
-+
-+The <em/command/ should <bf/not/ remove the decompressed file. The
-+<em/command/ should return non-zero exit status if it fails, so mutt
-+knows something's wrong.
-+
-+Example:
-+
-+<tscreen><verb>
-+append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" 
-+</verb></tscreen>
-+
-+When <ref id="append-hook" name="append-hook"> is used, the folder is
-+not opened, which saves time, but this means that we can not find out
-+what the folder type is. Thus the default (<ref id="mbox_type"
-+name="&dollar;mbox&lowbar;type">) type is always supposed (i.e.
-+this is the format used for the temporary folder).
-+
-+If the file does not exist when you save to it, <ref id="close-hook"
-+name="close-hook"> is called, and not <ref id="append-hook"
-+name="append-hook">. <ref id="append-hook" name="append-hook"> is only
-+for appending to existing folders.
-+
-+If the <em/command/ is empty, this operation is disabled for this file
-+type. In this case, the folder will be open and closed again (using
-+<ref id="open-hook" name="open-hook"> and <ref id="close-hook" 
-+name="close-hook">respectively) each time you will add to it.
-+
-+<sect2>Encrypted folders
-+<p>
-+The compressed folders support can also be used to handle encrypted
-+folders. If you want to encrypt a folder with PGP, you may want to use
-+the following hooks:
-+
-+<tscreen><verb>
-+open-hook  \\.pgp$ "pgp -f &lt; %f &gt; %t"
-+close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"
-+</verb></tscreen>
-+
-+Please note, that PGP does not support appending to an encrypted
-+folder, so there is no append-hook defined.
-+
-+If you are using GnuPG instead of PGP, you may use the following hooks
-+instead:
-+
-+<tscreen><verb>
-+open-hook  \\.gpg$ "gpg --decrypt &lt; %f &gt; %t"
-+close-hook \\.gpg$ "gpg --encrypt --recipient YourGpgUserIdOrKeyId &lt; %t &gt; %f"
-+</verb></tscreen>
-+
-+<bf/Note:/ the folder is temporary stored decrypted in the /tmp
-+directory, where it can be read by your system administrator. So think
-+about the security aspects of this.
-+
- <sect>Mutt's MIME Support
- <p>
- Quite a bit of effort has been made to make Mutt the premier text-mode
-@@ -3116,6 +3286,8 @@
- <item>
- <tt><ref id="alternative_order" name="unalternative&lowbar;order"></tt> <em/mimetype/ &lsqb; <em/mimetype/ ... &rsqb;
- <item>
-+<tt><ref id="append-hook" name="append-hook"></tt> <em/regexp/ &dquot;<em/command/&dquot;
-+<item>
- <tt><ref id="auto_view" name="auto&lowbar;view"></tt> <em/mimetype/ &lsqb; <em/mimetype/ ... &rsqb;
- <item>
- <tt><ref id="auto_view" name="unauto&lowbar;view"></tt> <em/mimetype/ &lsqb; <em/mimetype/ ... &rsqb;
-@@ -3124,6 +3296,8 @@
- <item>
- <tt><ref id="charset-hook" name="charset-hook"></tt> <em/alias/ <em/charset/
- <item>
-+<tt><ref id="close-hook" name="close-hook"></tt> <em/regexp/ &dquot;<em/command/&dquot;
-+<item>
- <tt><ref id="color" name="color"></tt> <em/object/ <em/foreground/ <em/background/ &lsqb; <em/regexp/ &rsqb;
- <item>
- <tt><ref id="color" name="uncolor"></tt> <em/index/ <em/pattern/ &lsqb; <em/pattern/ ... &rsqb;
-@@ -3170,6 +3344,8 @@
- <item>
- <tt><ref id="my_hdr" name="unmy&lowbar;hdr"></tt> <em/field/ &lsqb; <em/field/ ... &rsqb;
- <item>
-+<tt><ref id="open-hook" name="open-hook"></tt> <em/regexp/ &dquot;<em/command/&dquot;
-+<item>
- <tt><ref id="crypt-hook" name="crypt-hook"></tt> <em/pattern/ <em/key-id/
- <item>
- <tt><ref id="push" name="push"></tt> <em/string/
-diff -urN mutt-1.5.8/doc/manual.txt mutt-1.5.8-ro/doc/manual.txt
-diff -urN mutt-1.5.8/doc/muttrc.man mutt-1.5.8-ro/doc/muttrc.man
-diff -urN mutt-1.5.8/doc/muttrc.man.head mutt-1.5.8-ro/doc/muttrc.man.head
---- mutt-1.5.8/doc/muttrc.man.head	2005-01-15 10:42:45.000000000 +0100
-+++ mutt-1.5.8-ro/doc/muttrc.man.head	2005-02-13 18:54:39.000000000 +0100
+diff -urN mutt-1.5.10/doc/manual-4.html mutt-1.5.10-ro/doc/manual-4.html
+diff -urN mutt-1.5.10/doc/manual-6.html mutt-1.5.10-ro/doc/manual-6.html
+diff -urN mutt-1.5.10/doc/manual.html mutt-1.5.10-ro/doc/manual.html
+diff -urN mutt-1.5.10/doc/manual.sgml mutt-1.5.10-ro/doc/manual.sgml
+diff -urN mutt-1.5.10/doc/manual.sgml.head mutt-1.5.10-ro/doc/manual.sgml.head
+diff -urN mutt-1.5.10/doc/manual.txt mutt-1.5.10-ro/doc/manual.txt
+diff -urN mutt-1.5.10/doc/muttrc.man mutt-1.5.10-ro/doc/muttrc.man
+diff -urN mutt-1.5.10/doc/muttrc.man.head mutt-1.5.10-ro/doc/muttrc.man.head
+--- mutt-1.5.10/doc/muttrc.man.head	2005-01-15 10:42:45.000000000 +0100
++++ mutt-1.5.10-ro/doc/muttrc.man.head	2005-08-14 12:10:21.000000000 +0200
 @@ -316,6 +316,24 @@
  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,
@@ -812,9 +605,9 @@ diff -urN mutt-1.5.8/doc/muttrc.man.head mutt-1.5.8-ro/doc/muttrc.man.head
  .TP
  \fBpush\fP \fIstring\fP
  This command adds the named \fIstring\fP to the keyboard buffer.
-diff -urN mutt-1.5.8/hook.c mutt-1.5.8-ro/hook.c
---- mutt-1.5.8/hook.c	2005-02-03 19:47:52.000000000 +0100
-+++ mutt-1.5.8-ro/hook.c	2005-02-13 18:54:39.000000000 +0100
+diff -urN mutt-1.5.10/hook.c mutt-1.5.10-ro/hook.c
+--- mutt-1.5.10/hook.c	2005-02-03 19:47:52.000000000 +0100
++++ mutt-1.5.10-ro/hook.c	2005-08-14 12:10:21.000000000 +0200
 @@ -24,6 +24,10 @@
  #include "mailbox.h"
  #include "mutt_crypt.h"
@@ -843,10 +636,10 @@ diff -urN mutt-1.5.8/hook.c mutt-1.5.8-ro/hook.c
    else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
             && (!WithCrypto || !(data & M_CRYPTHOOK))
        )
-diff -urN mutt-1.5.8/init.h mutt-1.5.8-ro/init.h
---- mutt-1.5.8/init.h	2005-02-12 21:01:10.000000000 +0100
-+++ mutt-1.5.8-ro/init.h	2005-02-13 18:54:39.000000000 +0100
-@@ -2926,6 +2926,11 @@
+diff -urN mutt-1.5.10/init.h mutt-1.5.10-ro/init.h
+--- mutt-1.5.10/init.h	2005-08-11 21:37:01.000000000 +0200
++++ mutt-1.5.10-ro/init.h	2005-08-14 12:10:21.000000000 +0200
+@@ -2979,6 +2979,11 @@
    { "fcc-hook",		mutt_parse_hook,	M_FCCHOOK },
    { "fcc-save-hook",	mutt_parse_hook,	M_FCCHOOK | M_SAVEHOOK },
    { "folder-hook",	mutt_parse_hook,	M_FOLDERHOOK },
@@ -858,10 +651,10 @@ diff -urN mutt-1.5.8/init.h mutt-1.5.8-ro/init.h
    { "hdr_order",	parse_list,		UL &HeaderOrderList },
  #ifdef HAVE_ICONV
    { "iconv-hook",	mutt_parse_hook,	M_ICONVHOOK }, 
-diff -urN mutt-1.5.8/main.c mutt-1.5.8-ro/main.c
---- mutt-1.5.8/main.c	2005-02-12 20:41:32.000000000 +0100
-+++ mutt-1.5.8-ro/main.c	2005-02-13 18:54:40.000000000 +0100
-@@ -376,6 +376,12 @@
+diff -urN mutt-1.5.10/main.c mutt-1.5.10-ro/main.c
+--- mutt-1.5.10/main.c	2005-08-11 21:37:01.000000000 +0200
++++ mutt-1.5.10-ro/main.c	2005-08-14 12:10:21.000000000 +0200
+@@ -382,6 +382,12 @@
  #else
  	"-LOCALES_HACK  "
  #endif
@@ -874,9 +667,9 @@ diff -urN mutt-1.5.8/main.c mutt-1.5.8-ro/main.c
  	      
  #ifdef HAVE_WC_FUNCS
  	"+HAVE_WC_FUNCS  "
-diff -urN mutt-1.5.8/Makefile.am mutt-1.5.8-ro/Makefile.am
---- mutt-1.5.8/Makefile.am	2005-02-12 21:54:39.000000000 +0100
-+++ mutt-1.5.8-ro/Makefile.am	2005-02-13 18:54:40.000000000 +0100
+diff -urN mutt-1.5.10/Makefile.am mutt-1.5.10-ro/Makefile.am
+--- mutt-1.5.10/Makefile.am	2005-08-11 23:27:28.000000000 +0200
++++ mutt-1.5.10-ro/Makefile.am	2005-08-14 12:10:21.000000000 +0200
 @@ -18,7 +18,7 @@
  bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
  mutt_SOURCES = $(BUILT_SOURCES) \
@@ -895,10 +688,10 @@ diff -urN mutt-1.5.8/Makefile.am mutt-1.5.8-ro/Makefile.am
  	attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \
  	globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
  	mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
-diff -urN mutt-1.5.8/Makefile.in mutt-1.5.8-ro/Makefile.in
-diff -urN mutt-1.5.8/mbox.c mutt-1.5.8-ro/mbox.c
---- mutt-1.5.8/mbox.c	2005-02-03 19:47:53.000000000 +0100
-+++ mutt-1.5.8-ro/mbox.c	2005-02-13 18:54:40.000000000 +0100
+diff -urN mutt-1.5.10/Makefile.in mutt-1.5.10-ro/Makefile.in
+diff -urN mutt-1.5.10/mbox.c mutt-1.5.10-ro/mbox.c
+--- mutt-1.5.10/mbox.c	2005-08-02 09:08:00.000000000 +0200
++++ mutt-1.5.10-ro/mbox.c	2005-08-14 12:10:21.000000000 +0200
 @@ -28,6 +28,10 @@
  #include "sort.h"
  #include "copy.h"
@@ -910,7 +703,7 @@ diff -urN mutt-1.5.8/mbox.c mutt-1.5.8-ro/mbox.c
  #include <sys/stat.h>
  #include <dirent.h>
  #include <string.h>
-@@ -1020,6 +1024,12 @@
+@@ -1014,6 +1018,12 @@
  int mbox_close_mailbox (CONTEXT *ctx)
  {
    mx_unlock_file (ctx->path, fileno (ctx->fp), 1);
@@ -923,10 +716,10 @@ diff -urN mutt-1.5.8/mbox.c mutt-1.5.8-ro/mbox.c
    mutt_unblock_signals ();
    mx_fastclose_mailbox (ctx);
    return 0;
-diff -urN mutt-1.5.8/mutt.h mutt-1.5.8-ro/mutt.h
---- mutt-1.5.8/mutt.h	2005-02-12 21:01:20.000000000 +0100
-+++ mutt-1.5.8-ro/mutt.h	2005-02-13 18:54:40.000000000 +0100
-@@ -159,6 +159,11 @@
+diff -urN mutt-1.5.10/mutt.h mutt-1.5.10-ro/mutt.h
+--- mutt-1.5.10/mutt.h	2005-08-11 21:37:23.000000000 +0200
++++ mutt-1.5.10-ro/mutt.h	2005-08-14 12:10:21.000000000 +0200
+@@ -161,6 +161,11 @@
  #define M_ACCOUNTHOOK	(1<<9)
  #define M_REPLYHOOK	(1<<10)
  #define M_SEND2HOOK     (1<<11)
@@ -938,7 +731,7 @@ diff -urN mutt-1.5.8/mutt.h mutt-1.5.8-ro/mutt.h
  
  /* tree characters for linearize_tree and print_enriched_string */
  #define M_TREE_LLCORNER		1
-@@ -823,6 +828,11 @@
+@@ -829,6 +834,11 @@
    void *data;			/* driver specific data */
  #endif /* USE_IMAP */
  
@@ -950,40 +743,12 @@ diff -urN mutt-1.5.8/mutt.h mutt-1.5.8-ro/mutt.h
    short magic;			/* mailbox type */
  
    unsigned int locked : 1;	/* is the mailbox locked? */
-diff -urN mutt-1.5.8/Muttrc mutt-1.5.8-ro/Muttrc
-diff -urN mutt-1.5.8/Muttrc.head mutt-1.5.8-ro/Muttrc.head
---- mutt-1.5.8/Muttrc.head	2005-02-12 21:57:45.000000000 +0100
-+++ mutt-1.5.8-ro/Muttrc.head	2005-02-13 18:54:40.000000000 +0100
-@@ -19,6 +19,11 @@
- macro index   <f1> "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation"
- macro pager   <f1> "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation"
- 
-+# 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"
-+
- # If Mutt is unable to determine your site's domain name correctly, you can
- # set the default here.
- #
-diff -urN mutt-1.5.8/Muttrc.head.in mutt-1.5.8-ro/Muttrc.head.in
---- mutt-1.5.8/Muttrc.head.in	2002-01-24 13:10:47.000000000 +0100
-+++ mutt-1.5.8-ro/Muttrc.head.in	2005-02-13 18:54:40.000000000 +0100
-@@ -19,6 +19,11 @@
- macro index   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
- macro pager   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
- 
-+# 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"
-+
- # If Mutt is unable to determine your site's domain name correctly, you can
- # set the default here.
- #
-diff -urN mutt-1.5.8/mx.c mutt-1.5.8-ro/mx.c
---- mutt-1.5.8/mx.c	2005-02-03 19:47:53.000000000 +0100
-+++ mutt-1.5.8-ro/mx.c	2005-02-13 18:54:40.000000000 +0100
+diff -urN mutt-1.5.10/Muttrc mutt-1.5.10-ro/Muttrc
+diff -urN mutt-1.5.10/Muttrc.head mutt-1.5.10-ro/Muttrc.head
+diff -urN mutt-1.5.10/Muttrc.head.in mutt-1.5.10-ro/Muttrc.head.in
+diff -urN mutt-1.5.10/mx.c mutt-1.5.10-ro/mx.c
+--- mutt-1.5.10/mx.c	2005-08-02 09:08:01.000000000 +0200
++++ mutt-1.5.10-ro/mx.c	2005-08-14 12:10:21.000000000 +0200
 @@ -30,6 +30,10 @@
  #include "keymap.h"
  #include "url.h"
@@ -1070,7 +835,7 @@ diff -urN mutt-1.5.8/mx.c mutt-1.5.8-ro/mx.c
    mx_fastclose_mailbox (ctx);
  
    return 0;
-@@ -1325,6 +1360,11 @@
+@@ -1330,6 +1365,11 @@
  {
    int rc;
  
@@ -1082,9 +847,9 @@ diff -urN mutt-1.5.8/mx.c mutt-1.5.8-ro/mx.c
    if (ctx)
    {
      if (ctx->locked) lock = 0;
-diff -urN mutt-1.5.8/mx.h mutt-1.5.8-ro/mx.h
---- mutt-1.5.8/mx.h	2003-08-05 15:58:16.000000000 +0200
-+++ mutt-1.5.8-ro/mx.h	2005-02-13 18:54:40.000000000 +0100
+diff -urN mutt-1.5.10/mx.h mutt-1.5.10-ro/mx.h
+--- mutt-1.5.10/mx.h	2003-08-05 15:58:16.000000000 +0200
++++ mutt-1.5.10-ro/mx.h	2005-08-14 12:10:21.000000000 +0200
 @@ -40,6 +40,9 @@
  #ifdef USE_POP
    , M_POP
@@ -1095,17 +860,17 @@ diff -urN mutt-1.5.8/mx.h mutt-1.5.8-ro/mx.h
  };
  
  WHERE short DefaultMagic INITVAL (M_MBOX);
-diff -urN mutt-1.5.8/PATCHES mutt-1.5.8-ro/PATCHES
---- mutt-1.5.8/PATCHES	2005-02-12 21:55:51.000000000 +0100
-+++ mutt-1.5.8-ro/PATCHES	2005-02-13 18:54:40.000000000 +0100
+diff -urN mutt-1.5.10/PATCHES mutt-1.5.10-ro/PATCHES
+--- mutt-1.5.10/PATCHES	2005-08-11 23:27:30.000000000 +0200
++++ mutt-1.5.10-ro/PATCHES	2005-08-14 12:10:35.000000000 +0200
 @@ -0,0 +1 @@
-+patch-1.5.8.rr.compressed.1
-diff -urN mutt-1.5.8/po/de.po mutt-1.5.8-ro/po/de.po
---- mutt-1.5.8/po/de.po	2005-02-12 21:58:50.000000000 +0100
-+++ mutt-1.5.8-ro/po/de.po	2005-02-13 18:56:06.000000000 +0100
-@@ -710,6 +710,48 @@
- msgid "PGP already selected. Clear & continue ? "
- msgstr "PGP bereits ausgewählt. Löschen und weiter?"
++patch-1.5.10.rr.compressed.1
+diff -urN mutt-1.5.10/po/de.po mutt-1.5.10-ro/po/de.po
+--- mutt-1.5.10/po/de.po	2005-08-11 23:50:35.000000000 +0200
++++ mutt-1.5.10-ro/po/de.po	2005-08-14 12:12:20.000000000 +0200
+@@ -1281,6 +1281,48 @@
+ msgid "Failed to figure out sender"
+ msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu untersuchen."
  
 +#: compress.c:203 mbox.c:661
 +msgid "Mailbox was corrupted!"
@@ -1152,7 +917,7 @@ diff -urN mutt-1.5.8/po/de.po mutt-1.5.8-ro/po/de.po
  #: crypt.c:69
  #, c-format
  msgid " (current time: %c)"
-@@ -1300,6 +1342,10 @@
+@@ -1901,6 +1943,10 @@
  msgid "Help for %s"
  msgstr "Hilfe für %s"
  
@@ -1163,7 +928,7 @@ diff -urN mutt-1.5.8/po/de.po mutt-1.5.8-ro/po/de.po
  #: hook.c:246
  #, c-format
  msgid "unhook: Can't do unhook * from within a hook."
-@@ -2713,18 +2759,10 @@
+@@ -3383,18 +3429,10 @@
  msgid "Mailbox is corrupt!"
  msgstr "Mailbox fehlerhaft!"
  
@@ -1171,31 +936,31 @@ diff -urN mutt-1.5.8/po/de.po mutt-1.5.8-ro/po/de.po
 -msgid "Mailbox was corrupted!"
 -msgstr "Mailbox wurde zerstört!"
 -
- #: mbox.c:699 mbox.c:953
+ #: mbox.c:701 mbox.c:952
  msgid "Fatal error!  Could not reopen mailbox!"
  msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!"
  
--#: mbox.c:708
+-#: mbox.c:710
 -msgid "Unable to lock mailbox!"
 -msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!"
 -
  #. this means ctx->changed or ctx->deleted was set, but no
  #. * messages were found to be changed or deleted.  This should
  #. * never happen, is we presume it is a bug in mutt.
-diff -urN mutt-1.5.8/po/POTFILES.in mutt-1.5.8-ro/po/POTFILES.in
---- mutt-1.5.8/po/POTFILES.in	2002-03-27 09:44:17.000000000 +0100
-+++ mutt-1.5.8-ro/po/POTFILES.in	2005-02-13 18:54:40.000000000 +0100
+diff -urN mutt-1.5.10/po/POTFILES.in mutt-1.5.10-ro/po/POTFILES.in
+--- mutt-1.5.10/po/POTFILES.in	2005-08-03 11:17:47.000000000 +0200
++++ mutt-1.5.10-ro/po/POTFILES.in	2005-08-14 12:13:18.000000000 +0200
 @@ -8,6 +8,7 @@
  color.c
  commands.c
  compose.c
 +compress.c
+ crypt-gpgme.c
  crypt.c
- curs_lib.c
- curs_main.c
-diff -urN mutt-1.5.8/status.c mutt-1.5.8-ro/status.c
---- mutt-1.5.8/status.c	2005-02-03 19:47:53.000000000 +0100
-+++ mutt-1.5.8-ro/status.c	2005-02-13 18:54:40.000000000 +0100
+ cryptglue.c
+diff -urN mutt-1.5.10/status.c mutt-1.5.10-ro/status.c
+--- mutt-1.5.10/status.c	2005-02-03 19:47:53.000000000 +0100
++++ mutt-1.5.10-ro/status.c	2005-08-14 12:10:21.000000000 +0200
 @@ -97,6 +97,14 @@
  
      case 'f':