Merge branch 'upstream' of ssh://antonio-guest@git.debian.org/git/pkg-mutt/mutt

[software/mutt-debian.git] / debian / patches / features / compressed-folders

diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders
index 288ab6f830fd46017543071613fffdb42de79636..40460162bbd4b24797fa5af3d49b6674d2a030f7 100644 (file)
--- a/debian/patches/features/compressed-folders
+++ b/debian/patches/features/compressed-folders
@@ -7,20 +7,20 @@ The home page for this patch is:
   http://www.spinnaker.de/mutt/compressed/
 
 * Patch last synced with upstream:
   http://www.spinnaker.de/mutt/compressed/
 
 * Patch last synced with upstream:

-  - Date: 2007-03-13
-  - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.14.rr.compressed.1.gz
+  - Date: 2008-05-20
+  - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.18.rr.compressed.1.gz

 
 * Changes made:
 
 * Changes made:

-  - filterdiff -p1 \
-    $(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)
-  - 2007-03-13 myon: update for 1.5.14+tip (conflict in hook.c)
+  - 2008-05-20 myon: refreshed to remove hunks in auto* files
+  - 2009-09-15 myon: refreshed for mutt-1.5.19
+                     status.c:103: add sizeof (tmp) to mutt_pretty_mailbox
+  - 2009-09-15 scotton: removed doc/Muttrc for mutt-1.5.19 (only patch doc/Muttrc.head)

 
 == END PATCH
 Index: mutt/compress.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
 
 == END PATCH
 Index: mutt/compress.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000

-+++ mutt/compress.c    2007-03-13 20:59:30.000000000 +0100
++++ mutt/compress.c    2009-06-25 12:36:25.000000000 +0200

 @@ -0,0 +1,499 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
 @@ -0,0 +1,499 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>


@@ -194,10 +194,10 @@ Index: mutt/compress.c
 +}
 +
 +static const char *
 +}
 +
 +static const char *

-+compresshook_format_str (char *dest, size_t destlen, char op, const char *src,
-+                       const char *fmt, const char *ifstring,
-+                       const char *elsestring, unsigned long data,
-+                       format_flag flags)
++compresshook_format_str (char *dest, size_t destlen, size_t col, char op,
++                       const char *src, const char *fmt,
++                       const char *ifstring, const char *elsestring,
++                       unsigned long data, format_flag flags)

 +{
 +  char tmp[SHORT_STRING];
 +
 +{
 +  char tmp[SHORT_STRING];
 +


@@ -228,8 +228,8 @@ Index: mutt/compress.c
 +static char *get_compression_cmd (const char* cmd, const CONTEXT* ctx)
 +{
 +  char expanded[_POSIX_PATH_MAX];
 +static char *get_compression_cmd (const char* cmd, const CONTEXT* ctx)
 +{
 +  char expanded[_POSIX_PATH_MAX];

-+  mutt_FormatString (expanded, sizeof (expanded), cmd, compresshook_format_str,
-+                   (unsigned long) ctx, 0);
++  mutt_FormatString (expanded, sizeof (expanded), 0, cmd,
++                   compresshook_format_str, (unsigned long) ctx, 0);

 +  return safe_strdup (expanded);
 +}
 +
 +  return safe_strdup (expanded);
 +}
 +


@@ -255,7 +255,7 @@ Index: mutt/compress.c
 +  COMPRESS_INFO *ci = set_compress_info (ctx);
 +  if (!ci->open) {
 +    ctx->magic = 0;
 +  COMPRESS_INFO *ci = set_compress_info (ctx);
 +  if (!ci->open) {
 +    ctx->magic = 0;

-+    FREE (ctx->compressinfo);
++    FREE (&ctx->compressinfo);

 +    return (-1);
 +  }
 +  if (!ci->close || access (ctx->path, W_OK) != 0)
 +    return (-1);
 +  }
 +  if (!ci->close || access (ctx->path, W_OK) != 0)


@@ -300,7 +300,7 @@ Index: mutt/compress.c
 +  {
 +    mutt_any_key_to_continue (NULL);
 +    ctx->magic = 0;
 +  {
 +    mutt_any_key_to_continue (NULL);
 +    ctx->magic = 0;

-+    FREE (ctx->compressinfo);
++    FREE (&ctx->compressinfo);

 +    mutt_error (_("Error executing: %s : unable to open the mailbox!\n"), cmd);
 +  }
 +  FREE (&cmd);
 +    mutt_error (_("Error executing: %s : unable to open the mailbox!\n"), cmd);
 +  }
 +  FREE (&cmd);


@@ -368,8 +368,8 @@ Index: mutt/compress.c
 +      fclose (ctx->fp);
 +    ctx->fp = NULL;
 +    /* if the folder was removed, remove the gzipped folder too */
 +      fclose (ctx->fp);
 +    ctx->fp = NULL;
 +    /* if the folder was removed, remove the gzipped folder too */

-+    if ((ctx->magic > 0) 
-+      && (access (ctx->path, F_OK) != 0) 
++    if ((ctx->magic > 0)
++      && (access (ctx->path, F_OK) != 0)

 +      && ! option (OPTSAVEEMPTY))
 +      remove (ctx->realpath);
 +    else
 +      && ! option (OPTSAVEEMPTY))
 +      remove (ctx->realpath);
 +    else


@@ -448,7 +448,7 @@ Index: mutt/compress.c
 +  if (! (ctx->append
 +       && ((append = get_append_command (ctx->realpath, ctx))
 +           || (append = ci->close))))
 +  if (! (ctx->append
 +       && ((append = get_append_command (ctx->realpath, ctx))
 +           || (append = ci->close))))

-+  { 
++  {

 +    /* if we can not or should not append, we only have to remove the */
 +    /* compressed info, because sync was already called               */
 +    mutt_fast_close_compressed (ctx);
 +    /* if we can not or should not append, we only have to remove the */
 +    /* compressed info, because sync was already called               */
 +    mutt_fast_close_compressed (ctx);


@@ -524,7 +524,7 @@ Index: mutt/compress.c
 Index: mutt/compress.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
 Index: mutt/compress.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000

-+++ mutt/compress.h    2007-03-13 20:59:30.000000000 +0100
++++ mutt/compress.h    2009-06-25 12:36:26.000000000 +0200

 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>


@@ -553,11 +553,11 @@ Index: mutt/compress.h
 +int mutt_test_compress_command (const char *);
 +int mutt_check_mailbox_compressed (CONTEXT *);
 +void mutt_fast_close_compressed (CONTEXT *);
 +int mutt_test_compress_command (const char *);
 +int mutt_check_mailbox_compressed (CONTEXT *);
 +void mutt_fast_close_compressed (CONTEXT *);

-Index: mutt/configure.in
+Index: mutt/configure.ac

 ===================================================================
 ===================================================================

---- mutt.orig/configure.in     2007-03-13 20:53:07.000000000 +0100
-+++ mutt/configure.in  2007-03-13 20:59:30.000000000 +0100
-@@ -807,6 +807,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN
+--- mutt.orig/configure.ac     2009-06-25 12:35:38.000000000 +0200
++++ mutt/configure.ac  2009-06-25 12:36:26.000000000 +0200
+@@ -805,6 +805,11 @@

                  AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
          fi])
  
                  AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
          fi])
  


@@ -571,9 +571,9 @@ Index: mutt/configure.in
                  AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
 Index: mutt/curs_main.c
 ===================================================================
                  AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
 Index: mutt/curs_main.c
 ===================================================================

---- mutt.orig/curs_main.c      2007-03-13 20:53:07.000000000 +0100
-+++ mutt/curs_main.c   2007-03-13 20:59:30.000000000 +0100
-@@ -1090,6 +1090,11 @@ int mutt_index_menu (void)
+--- mutt.orig/curs_main.c      2009-06-25 12:36:14.000000000 +0200
++++ mutt/curs_main.c   2009-06-25 12:36:26.000000000 +0200
+@@ -1135,6 +1135,11 @@

          {
          int check;
  
          {
          int check;
  


@@ -587,9 +587,9 @@ Index: mutt/curs_main.c
  
 Index: mutt/doc/manual.xml.head
 ===================================================================
  
 Index: mutt/doc/manual.xml.head
 ===================================================================

---- mutt.orig/doc/manual.xml.head      2007-03-13 20:53:07.000000000 +0100
-+++ mutt/doc/manual.xml.head   2007-03-13 20:59:30.000000000 +0100
-@@ -4843,6 +4843,205 @@ becomes an issue as mutt will silently f
+--- mutt.orig/doc/manual.xml.head      2009-06-25 12:35:42.000000000 +0200
++++ mutt/doc/manual.xml.head   2009-06-25 12:36:26.000000000 +0200
+@@ -5678,6 +5678,205 @@

  
  </chapter>
  
  
  </chapter>
  


@@ -622,9 +622,9 @@ Index: mutt/doc/manual.xml.head
 +For example:
 +
 +<screen>
 +For example:
 +
 +<screen>

-+open-hook \\.gz$ "gzip -cd %f &gt; %t" 
++open-hook \\.gz$ "gzip -cd %f &gt; %t"

 +close-hook \\.gz$ "gzip -c %t &gt; %f"
 +close-hook \\.gz$ "gzip -c %t &gt; %f"

-+append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" 
++append-hook \\.gz$ "gzip -c %t &gt;&gt; %f"

 +</screen>
 +
 +You do not have to specify all of the commands. If you omit <link
 +</screen>
 +
 +You do not have to specify all of the commands. If you omit <link


@@ -672,7 +672,7 @@ Index: mutt/doc/manual.xml.head
 +Example:
 +
 +<screen>
 +Example:
 +
 +<screen>

-+open-hook \\.gz$ "gzip -cd %f &gt; %t" 
++open-hook \\.gz$ "gzip -cd %f &gt; %t"

 +</screen>
 +
 +If the <emphasis>command</emphasis> is empty, this operation is
 +</screen>
 +
 +If the <emphasis>command</emphasis> is empty, this operation is


@@ -738,7 +738,7 @@ Index: mutt/doc/manual.xml.head
 +Example:
 +
 +<screen>
 +Example:
 +
 +<screen>

-+append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" 
++append-hook \\.gz$ "gzip -c %t &gt;&gt; %f"

 +</screen>
 +
 +When <link linkend="append-hook">append-hook</link> is used, the folder
 +</screen>
 +
 +When <link linkend="append-hook">append-hook</link> is used, the folder


@@ -795,11 +795,27 @@ Index: mutt/doc/manual.xml.head
  <chapter id="mimesupport">
  <title>Mutt's MIME Support</title>
  
  <chapter id="mimesupport">
  <title>Mutt's MIME Support</title>
  

+Index: mutt/doc/Muttrc.head
+===================================================================
+--- mutt.orig/doc/Muttrc.head  2009-06-25 12:35:36.000000000 +0200
++++ mutt/doc/Muttrc.head       2009-06-25 12:36:26.000000000 +0200
+@@ -29,6 +29,11 @@
+ 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"
++
+ # If Mutt is unable to determine your site's domain name correctly, you can
+ # set the default here.
+ #

 Index: mutt/doc/muttrc.man.head
 ===================================================================
 Index: mutt/doc/muttrc.man.head
 ===================================================================

---- mutt.orig/doc/muttrc.man.head      2007-03-13 20:53:07.000000000 +0100
-+++ mutt/doc/muttrc.man.head   2007-03-13 20:59:30.000000000 +0100
-@@ -316,6 +316,24 @@ specify the ID of the public key to be u
+--- mutt.orig/doc/muttrc.man.head      2009-06-25 12:35:36.000000000 +0200
++++ mutt/doc/muttrc.man.head   2009-06-25 12:36:26.000000000 +0200
+@@ -345,6 +345,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,
  or even just an arbitrary search string.
  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.


@@ -815,7 +831,7 @@ Index: mutt/doc/muttrc.man.head
 +"\fI\\\\.gz$\fP"). The commands tell Mutt how to uncompress a folder
 +(\fBopen-hook\fP), compress a folder (\fBclose-hook\fP) or append a
 +compressed mail to a compressed folder (\fBappend-hook\fP). The
 +"\fI\\\\.gz$\fP"). The commands tell Mutt how to uncompress a folder
 +(\fBopen-hook\fP), compress a folder (\fBclose-hook\fP) or append a
 +compressed mail to a compressed folder (\fBappend-hook\fP). The

-+\fIcommand\fP string is the 
++\fIcommand\fP string is the

 +.BR printf (3)
 +like format string, and it should accept two parameters: \fB%f\fP,
 +which is replaced with the (compressed) folder name, and \fB%t\fP
 +.BR printf (3)
 +like format string, and it should accept two parameters: \fB%f\fP,
 +which is replaced with the (compressed) folder name, and \fB%t\fP


@@ -826,8 +842,8 @@ Index: mutt/doc/muttrc.man.head
  This command adds the named \fIstring\fP to the keyboard buffer.
 Index: mutt/hook.c
 ===================================================================
  This command adds the named \fIstring\fP to the keyboard buffer.
 Index: mutt/hook.c
 ===================================================================

---- mutt.orig/hook.c   2007-03-13 20:53:07.000000000 +0100
-+++ mutt/hook.c        2007-03-13 21:00:40.000000000 +0100
+--- mutt.orig/hook.c   2009-06-25 12:35:36.000000000 +0200
++++ mutt/hook.c        2009-06-25 12:36:26.000000000 +0200

 @@ -24,6 +24,10 @@
  #include "mailbox.h"
  #include "mutt_crypt.h"
 @@ -24,6 +24,10 @@
  #include "mailbox.h"
  #include "mutt_crypt.h"


@@ -839,7 +855,7 @@ Index: mutt/hook.c
  #include <limits.h>
  #include <string.h>
  #include <stdlib.h>
  #include <limits.h>
  #include <string.h>
  #include <stdlib.h>

-@@ -92,6 +96,16 @@ int mutt_parse_hook (BUFFER *buf, BUFFER
+@@ -92,6 +96,16 @@

      memset (&pattern, 0, sizeof (pattern));
      pattern.data = safe_strdup (path);
    }
      memset (&pattern, 0, sizeof (pattern));
      pattern.data = safe_strdup (path);
    }


@@ -848,7 +864,7 @@ Index: mutt/hook.c
 +  {
 +    if (mutt_test_compress_command (command.data))
 +    {
 +  {
 +    if (mutt_test_compress_command (command.data))
 +    {

-+      strfcpy (err->data, _("bad formatted command string"), err->dsize);
++      strfcpy (err->data, _("badly formatted command string"), err->dsize);

 +      return (-1);
 +    }
 +  }
 +      return (-1);
 +    }
 +  }


@@ -858,9 +874,9 @@ Index: mutt/hook.c
        )
 Index: mutt/init.h
 ===================================================================
        )
 Index: mutt/init.h
 ===================================================================

---- mutt.orig/init.h   2007-03-13 20:53:07.000000000 +0100
-+++ mutt/init.h        2007-03-13 20:59:30.000000000 +0100
-@@ -3167,6 +3167,11 @@ struct command_t Commands[] = {
+--- mutt.orig/init.h   2009-06-25 12:36:22.000000000 +0200
++++ mutt/init.h        2009-06-25 12:36:26.000000000 +0200
+@@ -3504,6 +3504,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 },
    { "fcc-hook",               mutt_parse_hook,        M_FCCHOOK },
    { "fcc-save-hook",  mutt_parse_hook,        M_FCCHOOK | M_SAVEHOOK },
    { "folder-hook",    mutt_parse_hook,        M_FOLDERHOOK },


@@ -874,9 +890,9 @@ Index: mutt/init.h
    { "hdr_order",      parse_list,             UL &HeaderOrderList },
 Index: mutt/main.c
 ===================================================================
    { "hdr_order",      parse_list,             UL &HeaderOrderList },
 Index: mutt/main.c
 ===================================================================

---- mutt.orig/main.c   2007-03-13 20:53:07.000000000 +0100
-+++ mutt/main.c        2007-03-13 20:59:30.000000000 +0100
-@@ -404,6 +404,12 @@ static void show_version (void)
+--- mutt.orig/main.c   2009-06-25 12:35:36.000000000 +0200
++++ mutt/main.c        2009-06-25 12:36:26.000000000 +0200
+@@ -402,6 +402,12 @@

  #else
        "-LOCALES_HACK  "
  #endif
  #else
        "-LOCALES_HACK  "
  #endif


@@ -891,19 +907,19 @@ Index: mutt/main.c
        "+HAVE_WC_FUNCS  "
 Index: mutt/Makefile.am
 ===================================================================
        "+HAVE_WC_FUNCS  "
 Index: mutt/Makefile.am
 ===================================================================

---- mutt.orig/Makefile.am      2007-03-13 20:53:07.000000000 +0100
-+++ mutt/Makefile.am   2007-03-13 20:59:30.000000000 +0100
-@@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.
+--- mutt.orig/Makefile.am      2009-06-25 12:35:36.000000000 +0200
++++ mutt/Makefile.am   2009-06-25 12:36:26.000000000 +0200
+@@ -18,7 +18,7 @@

  bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
  bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@

- mutt_SOURCES = $(BUILT_SOURCES) \
+ mutt_SOURCES = \

        addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
 -      crypt.c cryptglue.c \
 +      crypt.c cryptglue.c compress.c \
        commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
        edit.c enter.c flags.c init.c filter.c from.c \
        getdomain.c group.c \
        addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
 -      crypt.c cryptglue.c \
 +      crypt.c cryptglue.c compress.c \
        commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
        edit.c enter.c flags.c init.c filter.c from.c \
        getdomain.c group.c \

-@@ -66,7 +66,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mu
-       utf8.c wcwidth.c 
+@@ -57,7 +57,7 @@
+       bcache.h browser.h hcache.h mbyte.h mutt_idna.h remailer.h url.h

  
  EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
 -      configure account.h \
  
  EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
 -      configure account.h \


@@ -913,8 +929,8 @@ Index: mutt/Makefile.am
        mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
 Index: mutt/mbox.c
 ===================================================================
        mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
 Index: mutt/mbox.c
 ===================================================================

---- mutt.orig/mbox.c   2007-03-13 20:53:07.000000000 +0100
-+++ mutt/mbox.c        2007-03-13 20:59:30.000000000 +0100
+--- mutt.orig/mbox.c   2009-06-25 12:35:36.000000000 +0200
++++ mutt/mbox.c        2009-06-25 12:36:26.000000000 +0200

 @@ -29,6 +29,10 @@
  #include "copy.h"
  #include "mutt_curses.h"
 @@ -29,6 +29,10 @@
  #include "copy.h"
  #include "mutt_curses.h"


@@ -926,7 +942,7 @@ Index: mutt/mbox.c
  #include <sys/stat.h>
  #include <dirent.h>
  #include <string.h>
  #include <sys/stat.h>
  #include <dirent.h>
  #include <string.h>

-@@ -1026,6 +1030,12 @@ bail:  /* Come here in case of disaster 
+@@ -1048,6 +1052,12 @@

  int mbox_close_mailbox (CONTEXT *ctx)
  {
    mx_unlock_file (ctx->path, fileno (ctx->fp), 1);
  int mbox_close_mailbox (CONTEXT *ctx)
  {
    mx_unlock_file (ctx->path, fileno (ctx->fp), 1);


@@ -941,9 +957,9 @@ Index: mutt/mbox.c
    return 0;
 Index: mutt/mutt.h
 ===================================================================
    return 0;
 Index: mutt/mutt.h
 ===================================================================

---- mutt.orig/mutt.h   2007-03-13 20:53:07.000000000 +0100
-+++ mutt/mutt.h        2007-03-13 20:59:30.000000000 +0100
-@@ -159,6 +159,11 @@ typedef enum
+--- mutt.orig/mutt.h   2009-06-25 12:36:14.000000000 +0200
++++ mutt/mutt.h        2009-06-25 12:36:26.000000000 +0200
+@@ -146,6 +146,11 @@

  #define M_ACCOUNTHOOK (1<<9)
  #define M_REPLYHOOK   (1<<10)
  #define M_SEND2HOOK     (1<<11)
  #define M_ACCOUNTHOOK (1<<9)
  #define M_REPLYHOOK   (1<<10)
  #define M_SEND2HOOK     (1<<11)


@@ -955,9 +971,9 @@ Index: mutt/mutt.h
  
  /* tree characters for linearize_tree and print_enriched_string */
  #define M_TREE_LLCORNER               1
  
  /* tree characters for linearize_tree and print_enriched_string */
  #define M_TREE_LLCORNER               1

-@@ -882,6 +887,11 @@ typedef struct
-   void *data;                 /* driver specific data */
- #endif /* USE_IMAP */
+@@ -882,6 +887,11 @@
+   int flagged;                        /* how many flagged messages */
+   int msgnotreadyet;          /* which msg "new" in pager, -1 if none */

  
 +#ifdef USE_COMPRESSED
 +  void *compressinfo;         /* compressed mbox module private data */
  
 +#ifdef USE_COMPRESSED
 +  void *compressinfo;         /* compressed mbox module private data */


@@ -969,8 +985,8 @@ Index: mutt/mutt.h
    unsigned char rights[(RIGHTSMAX + 7)/8];    /* ACL bits */
 Index: mutt/mx.c
 ===================================================================
    unsigned char rights[(RIGHTSMAX + 7)/8];    /* ACL bits */
 Index: mutt/mx.c
 ===================================================================

---- mutt.orig/mx.c     2007-03-13 20:53:07.000000000 +0100
-+++ mutt/mx.c  2007-03-13 20:59:30.000000000 +0100
+--- mutt.orig/mx.c     2009-06-25 12:36:14.000000000 +0200
++++ mutt/mx.c  2009-06-25 12:36:26.000000000 +0200

 @@ -30,6 +30,10 @@
  #include "keymap.h"
  #include "url.h"
 @@ -30,6 +30,10 @@
  #include "keymap.h"
  #include "url.h"


@@ -982,7 +998,7 @@ Index: mutt/mx.c
  #ifdef USE_IMAP
  #include "imap.h"
  #endif
  #ifdef USE_IMAP
  #include "imap.h"
  #endif

-@@ -454,6 +458,10 @@ int mx_get_magic (const char *path)
+@@ -415,6 +419,10 @@

      return (-1);
    }
  
      return (-1);
    }
  


@@ -993,9 +1009,9 @@ Index: mutt/mx.c
    return (magic);
  }
  
    return (magic);
  }
  

-@@ -494,6 +502,13 @@ static int mx_open_mailbox_append (CONTE
+@@ -454,6 +462,13 @@
+ {

    struct stat sb;
    struct stat sb;

-   mode_t omask;

  
 +#ifdef USE_COMPRESSED
 +  /* special case for appending to compressed folders -
  
 +#ifdef USE_COMPRESSED
 +  /* special case for appending to compressed folders -


@@ -1007,7 +1023,7 @@ Index: mutt/mx.c
    ctx->append = 1;
  
  #ifdef USE_IMAP
    ctx->append = 1;
  
  #ifdef USE_IMAP

-@@ -664,7 +679,12 @@ CONTEXT *mx_open_mailbox (const char *pa
+@@ -617,7 +632,12 @@

    }
  
    ctx->magic = mx_get_magic (path);
    }
  
    ctx->magic = mx_get_magic (path);


@@ -1021,7 +1037,7 @@ Index: mutt/mx.c
    if(ctx->magic == 0)
      mutt_error (_("%s is not a mailbox."), path);
  
    if(ctx->magic == 0)
      mutt_error (_("%s is not a mailbox."), path);
  

-@@ -770,6 +790,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx)
+@@ -718,6 +738,10 @@

      mutt_free_header (&ctx->hdrs[i]);
    FREE (&ctx->hdrs);
    FREE (&ctx->v2r);
      mutt_free_header (&ctx->hdrs[i]);
    FREE (&ctx->hdrs);
    FREE (&ctx->v2r);


@@ -1032,10 +1048,10 @@ Index: mutt/mx.c
    FREE (&ctx->path);
    FREE (&ctx->pattern);
    if (ctx->limit_pattern) 
    FREE (&ctx->path);
    FREE (&ctx->pattern);
    if (ctx->limit_pattern) 

-@@ -827,6 +851,12 @@ static int sync_mailbox (CONTEXT *ctx, i
+@@ -770,6 +794,12 @@
+   

    if (tmp && tmp->new == 0)
      mutt_update_mailbox (tmp);
    if (tmp && tmp->new == 0)
      mutt_update_mailbox (tmp);

- #endif

 +
 +#ifdef USE_COMPRESSED
 +  if (rc == 0 && ctx->compressinfo)
 +
 +#ifdef USE_COMPRESSED
 +  if (rc == 0 && ctx->compressinfo)


@@ -1045,7 +1061,7 @@ Index: mutt/mx.c
    return rc;
  }
  
    return rc;
  }
  

-@@ -1028,6 +1058,11 @@ int mx_close_mailbox (CONTEXT *ctx, int 
+@@ -1033,6 +1063,11 @@

        !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY))
      mx_unlink_empty (ctx->path);
  
        !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY))
      mx_unlink_empty (ctx->path);
  


@@ -1057,7 +1073,7 @@ Index: mutt/mx.c
    mx_fastclose_mailbox (ctx);
  
    return 0;
    mx_fastclose_mailbox (ctx);
  
    return 0;

-@@ -1342,6 +1377,11 @@ int mx_check_mailbox (CONTEXT *ctx, int 
+@@ -1355,6 +1390,11 @@

  {
    int rc;
  
  {
    int rc;
  


@@ -1071,9 +1087,9 @@ Index: mutt/mx.c
      if (ctx->locked) lock = 0;
 Index: mutt/mx.h
 ===================================================================
      if (ctx->locked) lock = 0;
 Index: mutt/mx.h
 ===================================================================

---- mutt.orig/mx.h     2007-03-13 20:53:07.000000000 +0100
-+++ mutt/mx.h  2007-03-13 20:59:30.000000000 +0100
-@@ -40,6 +40,9 @@ enum
+--- mutt.orig/mx.h     2009-06-25 12:35:36.000000000 +0200
++++ mutt/mx.h  2009-06-25 12:36:26.000000000 +0200
+@@ -40,6 +40,9 @@

  #ifdef USE_POP
    , M_POP
  #endif
  #ifdef USE_POP
    , M_POP
  #endif


@@ -1083,38 +1099,53 @@ Index: mutt/mx.h
  };
  
  WHERE short DefaultMagic INITVAL (M_MBOX);
  };
  
  WHERE short DefaultMagic INITVAL (M_MBOX);

-Index: mutt/PATCHES
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ mutt/PATCHES       2007-03-13 20:59:30.000000000 +0100
-@@ -0,0 +1 @@
-+patch-1.5.14.rr.compressed.1

 Index: mutt/po/de.po
 ===================================================================
 Index: mutt/po/de.po
 ===================================================================

---- mutt.orig/po/de.po 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/po/de.po      2007-03-13 20:59:30.000000000 +0100
-@@ -1266,6 +1266,48 @@ msgstr "Prüfung des Absenders fehlgeschl
- msgid "Failed to figure out sender"
- msgstr "Kann Absender nicht ermitteln"
+--- mutt.orig/po/de.po 2009-06-25 12:35:36.000000000 +0200
++++ mutt/po/de.po      2009-06-25 12:36:26.000000000 +0200
+@@ -2005,6 +2005,10 @@
+ msgid "Bad history file format (line %d)"
+ msgstr "Falsches Format der Datei früherer Eingaben (Zeile %d)"
+ 
++#: hook.c:96
++msgid "badly formatted command string"
++msgstr "Hook enthält nicht die Muster %f und %t"
++
+ #: hook.c:251
+ #, c-format
+ msgid "unhook: Can't do unhook * from within a hook."
+@@ -2766,7 +2770,7 @@
+ msgid "Mailbox is corrupt!"
+ msgstr "Mailbox fehlerhaft!"
+ 
+-#: mbox.c:678
++#: mbox.c:678 compress.c:203 mbox.c:661
+ msgid "Mailbox was corrupted!"
+ msgstr "Mailbox wurde zerstört!"
+ 
+@@ -2774,10 +2778,11 @@
+ msgid "Fatal error!  Could not reopen mailbox!"
+ msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!"
+ 
+-#: mbox.c:746
++#: mbox.c:746 compress.c:264 compress.c:246 compress.c:367 compress.c:443 mbox.c:706
+ msgid "Unable to lock mailbox!"
+ msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!"

  
  

-+#: compress.c:203 mbox.c:661
-+msgid "Mailbox was corrupted!"
-+msgstr "Mailbox wurde zerstört!"
++
+ #. 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.
+@@ -5378,3 +5383,32 @@
+ 
+ #~ msgid "Authentication method is unknown."
+ #~ msgstr "Authentifizierungsmethode unbekannt."

 +
 +#: compress.c:228 compress.c:253
 +#, c-format
 +msgid "Decompressing %s...\n"
 +msgstr "Entpacke %s...\n"
 +
 +
 +#: compress.c:228 compress.c:253
 +#, c-format
 +msgid "Decompressing %s...\n"
 +msgstr "Entpacke %s...\n"
 +

-+#: compress.c:246 compress.c:367 compress.c:443 mbox.c:706
-+msgid "Unable to lock mailbox!"
-+msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!"
-+
-+#: compress.c:264
-+#, c-format
-+msgid "Error executing: %s : unable to open the mailbox!\n"
-+msgstr "Fehler beim Ausführen von %s : Kann die Mailbox nicht öffnen!\n"
-+

 +#: compress.c:350 compress.c:377 compress.c:423 compress.c:454
 +#, c-format
 +msgid "Compressing %s...\n"
 +#: compress.c:350 compress.c:377 compress.c:423 compress.c:454
 +#, c-format
 +msgid "Compressing %s...\n"


@@ -1138,45 +1169,11 @@ Index: mutt/po/de.po
 +#, c-format
 +msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 +msgstr " %s: Fehler beim packen der Mailbox! Entpackte Mailbox gespeichert!\n"
 +#, c-format
 +msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 +msgstr " %s: Fehler beim packen der Mailbox! Entpackte Mailbox gespeichert!\n"

-+
- #: crypt.c:69
- #, c-format
- msgid " (current time: %c)"
-@@ -1926,6 +1968,10 @@ msgstr ""
- msgid "Help for %s"
- msgstr "Hilfe für %s"
- 
-+#: hook.c:96
-+msgid "bad formatted command string"
-+msgstr "Hook enthält nicht die Muster %f und %t"
-+
- #: hook.c:246
- #, c-format
- msgid "unhook: Can't do unhook * from within a hook."
-@@ -3428,18 +3474,10 @@ msgstr "Lese %s..."
- msgid "Mailbox is corrupt!"
- msgstr "Mailbox fehlerhaft!"
- 
--#: mbox.c:670
--msgid "Mailbox was corrupted!"
--msgstr "Mailbox wurde zerstört!"
--
- #: mbox.c:711 mbox.c:964
- msgid "Fatal error!  Could not reopen mailbox!"
- msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!"
- 
--#: mbox.c:720
--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.

 Index: mutt/po/POTFILES.in
 ===================================================================
 Index: mutt/po/POTFILES.in
 ===================================================================

---- mutt.orig/po/POTFILES.in   2007-03-13 20:53:07.000000000 +0100
-+++ mutt/po/POTFILES.in        2007-03-13 20:59:30.000000000 +0100
-@@ -8,6 +8,7 @@ charset.c
+--- mutt.orig/po/POTFILES.in   2009-06-25 12:35:36.000000000 +0200
++++ mutt/po/POTFILES.in        2009-06-25 12:36:26.000000000 +0200
+@@ -8,6 +8,7 @@

  color.c
  commands.c
  compose.c
  color.c
  commands.c
  compose.c


@@ -1186,9 +1183,9 @@ Index: mutt/po/POTFILES.in
  cryptglue.c
 Index: mutt/status.c
 ===================================================================
  cryptglue.c
 Index: mutt/status.c
 ===================================================================

---- mutt.orig/status.c 2007-03-13 20:53:07.000000000 +0100
-+++ mutt/status.c      2007-03-13 20:59:30.000000000 +0100
-@@ -97,6 +97,14 @@ status_format_str (char *buf, size_t buf
+--- mutt.orig/status.c 2009-06-25 12:35:44.000000000 +0200
++++ mutt/status.c      2009-06-25 12:36:26.000000000 +0200
+@@ -96,6 +96,14 @@

  
      case 'f':
        snprintf (fmt, sizeof(fmt), "%%%ss", prefix);
  
      case 'f':
        snprintf (fmt, sizeof(fmt), "%%%ss", prefix);


@@ -1196,7 +1193,7 @@ Index: mutt/status.c
 +      if (Context && Context->compressinfo && Context->realpath)
 +      {
 +       strfcpy (tmp, Context->realpath, sizeof (tmp));
 +      if (Context && Context->compressinfo && Context->realpath)
 +      {
 +       strfcpy (tmp, Context->realpath, sizeof (tmp));

-+       mutt_pretty_mailbox (tmp);
++       mutt_pretty_mailbox (tmp, sizeof (tmp));

 +      }
 +      else
 +#endif
 +      }
 +      else
 +#endif