From: Jakub Bogusz Date: Fri, 15 Jun 2007 17:43:43 +0000 (+0000) Subject: - updated for 1.5.16 X-Git-Tag: auto/th/mutt-1_5_16-1~2 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=commitdiff_plain;h=4cc0f761179a022a2f3379a9a03ce76832f84c48 - updated for 1.5.16 Changed files: mutt-rr.compressed.patch -> 1.9 --- diff --git a/mutt-rr.compressed.patch b/mutt-rr.compressed.patch index c80dd16..aae957b 100644 --- a/mutt-rr.compressed.patch +++ b/mutt-rr.compressed.patch @@ -1,7 +1,60 @@ -diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c ---- mutt-1.5.15/compress.c 1970-01-01 01:00:00.000000000 +0100 -+++ mutt-1.5.15-ro/compress.c 2007-05-27 14:20:23.000000000 +0200 -@@ -0,0 +1,499 @@ +diff -udprP mutt-1.5.16.orig/Makefile.am mutt-1.5.16/Makefile.am +--- mutt-1.5.16.orig/Makefile.am 2007-06-04 07:20:01.000000000 +0300 ++++ mutt-1.5.16/Makefile.am 2007-06-12 14:22:35.000000000 +0300 +@@ -18,6 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist. + bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ + mutt_SOURCES = $(BUILT_SOURCES) \ + addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ ++ compress.c \ + crypt.c cryptglue.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 \ +@@ -67,6 +68,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mu + + EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ + configure account.h \ ++ compress.h \ + 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 -udprP mutt-1.5.16.orig/Makefile.in mutt-1.5.16/Makefile.in +--- mutt-1.5.16.orig/Makefile.in 2007-06-10 05:43:26.000000000 +0300 ++++ mutt-1.5.16/Makefile.in 2007-06-12 14:22:35.000000000 +0300 +@@ -14,6 +14,10 @@ + + @SET_MAKE@ + ++mutt_SOURCES += compress.c ++EXTRA_DIST += compress.h ++mutt_OBJECTS += compress.o ++ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +diff -udprP mutt-1.5.16.orig/Muttrc.head mutt-1.5.16/Muttrc.head +--- mutt-1.5.16.orig/Muttrc.head 2007-06-06 19:02:56.000000000 +0300 ++++ mutt-1.5.16/Muttrc.head 2007-06-12 14:22:35.000000000 +0300 +@@ -24,6 +24,11 @@ macro generic,pager " + macro index,pager y "?" "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. + # +diff -udprP mutt-1.5.16.orig/PATCHES mutt-1.5.16/PATCHES +--- mutt-1.5.16.orig/PATCHES 2007-04-30 05:07:48.000000000 +0300 ++++ mutt-1.5.16/PATCHES 2007-06-12 14:22:35.000000000 +0300 +@@ -0,0 +1 @@ ++rr.compressed +diff -udprP mutt-1.5.16.orig/compress.c mutt-1.5.16/compress.c +--- mutt-1.5.16.orig/compress.c 1970-01-01 03:00:00.000000000 +0300 ++++ mutt-1.5.16/compress.c 2007-06-12 14:22:35.000000000 +0300 +@@ -0,0 +1,490 @@ +/* + * Copyright (C) 1997 Alain Penders + * @@ -45,8 +98,9 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + off_t size; /* size of real folder */ +} COMPRESS_INFO; + ++char echo_cmd[HUGE_STRING]; + -+/* ++/* parameters: + * ctx - context to lock + * excl - exclusive lock? + * retry - should retry if unable to lock? @@ -93,42 +147,29 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + return find_compress_hook (M_OPENHOOK, path) ? 1 : 0; +} + -+/* -+ * if the file is new, we really do not append, but create, and so use -+ * close-hook, and not append-hook ++/* if the file is new, we really do not append, but create, and so use ++ * close-hook, and not append-hook + */ +static const char* get_append_command (const char *path, const CONTEXT* ctx) +{ + COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; + return (is_new (path)) ? ci->close : ci->append; +} -+ ++ +int mutt_can_append_compressed (const char *path) +{ + int magic; + + if (is_new (path)) -+ { -+ char *dir_path = safe_strdup(path); -+ char *aux = strrchr(dir_path, '/'); -+ int dir_valid = 1; -+ if (aux) -+ { -+ *aux='\0'; -+ if (access(dir_path, W_OK|X_OK)) -+ dir_valid = 0; -+ } -+ safe_free((void**)&dir_path); -+ return dir_valid && (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0); -+ } ++ return (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0); + + magic = mx_get_magic (path); -+ ++ + if (magic != 0 && magic != M_COMPRESSED) + return 0; + + return (find_compress_hook (M_APPENDHOOK, path) -+ || (find_compress_hook (M_OPENHOOK, path) ++ || (find_compress_hook (M_OPENHOOK, path) + && find_compress_hook (M_CLOSEHOOK, path))) ? 1 : 0; +} + @@ -145,7 +186,7 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + ci->close = find_compress_hook (M_CLOSEHOOK, ctx->path); + return ci; +} -+ ++ +static void set_path (CONTEXT* ctx) +{ + char tmppath[_POSIX_PATH_MAX]; @@ -159,7 +200,7 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + strcpy (ctx->path, tmppath); +} + -+static int get_size (const char* path) ++static int get_size (const char* path) +{ + struct stat sb; + if (stat (path, &sb) != 0) @@ -167,7 +208,7 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + return (sb.st_size); +} + -+static void store_size (CONTEXT* ctx) ++static void store_size (CONTEXT* ctx) +{ + COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; + ci->size = get_size (ctx->realpath); @@ -175,12 +216,12 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + +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, ++ const char *fmt, const char *ifstring, ++ const char *elsestring, unsigned long data, + format_flag flags) +{ + char tmp[SHORT_STRING]; -+ ++ + CONTEXT *ctx = (CONTEXT *) data; + switch (op) + { @@ -196,8 +237,7 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + return (src); +} + -+/* -+ * check that the command has both %f and %t ++/* check that the command has both %f and %t + * 0 means OK, -1 means error + */ +int mutt_test_compress_command (const char* cmd) @@ -208,7 +248,7 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c +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, ++ mutt_FormatString (expanded, sizeof (expanded), 0, cmd, compresshook_format_str, + (unsigned long) ctx, 0); + return safe_strdup (expanded); +} @@ -235,7 +275,7 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + 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) @@ -248,7 +288,7 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + mutt_message (_("Decompressing %s..."), ctx->realpath); + + cmd = get_compression_cmd (ci->open, ctx); -+ if (cmd == NULL) ++ if (cmd == NULL) + return (-1); + dprint (2, (debugfile, "DecompressCmd: '%s'\n", cmd)); + @@ -270,7 +310,8 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + + endwin (); + fflush (stdout); -+ fprintf (stderr, _("Decompressing %s...\n"),ctx->realpath); ++ sprintf(echo_cmd,_("echo Decompressing %s..."),ctx->realpath); ++ mutt_system(echo_cmd); + rc = mutt_system (cmd); + mbox_unlock_compressed (ctx, fp); + mutt_unblock_signals (); @@ -280,11 +321,11 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + { + 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); -+ if (rc) ++ if (rc) + return (-1); + + if (mutt_check_mailbox_compressed (ctx)) @@ -302,7 +343,7 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c +} + +/* remove the temporary mailbox */ -+void remove_file (CONTEXT* ctx) ++void remove_file (CONTEXT* ctx) +{ + if (ctx->magic == M_MBOX || ctx->magic == M_MMDF) + remove (ctx->path); @@ -348,9 +389,7 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + 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) -+ && ! option (OPTSAVEEMPTY)) ++ if (access (ctx->path, F_OK) != 0 && ! option (OPTSAVEEMPTY)) + remove (ctx->realpath); + else + remove_file (ctx); @@ -372,7 +411,7 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + mutt_message (_("Compressing %s..."), ctx->realpath); + + cmd = get_compression_cmd (ci->close, ctx); -+ if (cmd == NULL) ++ if (cmd == NULL) + return (-1); + + if ((fp = fopen (ctx->realpath, "a")) == NULL) @@ -387,7 +426,9 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + fclose (fp); + mutt_unblock_signals (); + mutt_error _("Unable to lock mailbox!"); -+ store_size (ctx); ++ ++ store_size (ctx); ++ + FREE (&cmd); + return (-1); + } @@ -396,7 +437,8 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + + endwin (); + fflush (stdout); -+ fprintf (stderr, _("Compressing %s...\n"), ctx->realpath); ++ sprintf(echo_cmd,_("echo Compressing %s..."), ctx->realpath); ++ mutt_system(echo_cmd); + if (mutt_system (cmd)) + { + mutt_any_key_to_continue (NULL); @@ -409,7 +451,7 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + fclose (fp); + + FREE (&cmd); -+ ++ + store_size (ctx); + + return (rc); @@ -422,15 +464,16 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + char *cmd; + COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; + -+ dprint (2, (debugfile, "mutt_slow_close_compressed called on '%s'\n", ++ dprint (2, (debugfile, "mutt_slow_close_compressed called on '%s'\n", + ctx->path)); + -+ if (! (ctx->append ++ 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 */ ++ { /* 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); + return (0); + } @@ -448,7 +491,7 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + } + + cmd = get_compression_cmd (append, ctx); -+ if (cmd == NULL) ++ if (cmd == NULL) + return (-1); + + if ((fp = fopen (ctx->realpath, "a")) == NULL) @@ -473,9 +516,10 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c + fflush (stdout); + + if (append == ci->close) -+ fprintf (stderr, _("Compressing %s...\n"), ctx->realpath); ++ sprintf(echo_cmd,_("echo Compressing %s..."), ctx->realpath); + else -+ fprintf (stderr, _("Compressed-appending to %s...\n"), ctx->realpath); ++ sprintf(echo_cmd,_("echo Compressed-appending to %s..."), ctx->realpath); ++ mutt_system(echo_cmd); + + if (mutt_system (cmd)) + { @@ -501,9 +545,9 @@ diff -urN mutt-1.5.15/compress.c mutt-1.5.15-ro/compress.c +} + +#endif /* USE_COMPRESSED */ -diff -urN mutt-1.5.15/compress.h mutt-1.5.15-ro/compress.h ---- mutt-1.5.15/compress.h 1970-01-01 01:00:00.000000000 +0100 -+++ mutt-1.5.15-ro/compress.h 2007-05-27 14:20:23.000000000 +0200 +diff -udprP mutt-1.5.16.orig/compress.h mutt-1.5.16/compress.h +--- mutt-1.5.16.orig/compress.h 1970-01-01 03:00:00.000000000 +0300 ++++ mutt-1.5.16/compress.h 2007-06-12 14:22:35.000000000 +0300 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -532,67 +576,68 @@ diff -urN mutt-1.5.15/compress.h mutt-1.5.15-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.15/config.h.in mutt-1.5.15-ro/config.h.in ---- mutt-1.5.15/config.h.in 2007-04-06 09:18:47.000000000 +0200 -+++ mutt-1.5.15-ro/config.h.in 2007-05-27 14:20:23.000000000 +0200 -@@ -513,6 +513,9 @@ +diff -udprP mutt-1.5.16.orig/config.h.in mutt-1.5.16/config.h.in +--- mutt-1.5.16.orig/config.h.in 2007-06-10 05:44:57.000000000 +0300 ++++ mutt-1.5.16/config.h.in 2007-06-12 14:22:35.000000000 +0300 +@@ -512,6 +512,9 @@ + /* Define to enable Sun mailtool attachments support. */ #undef SUN_ATTACHMENT - -+/* Define to enable compressed mailboxes support */ ++ ++/* The compressed mailboxes support */ +#undef USE_COMPRESSED -+ + /* Define to use dotlocking for mailboxes. */ #undef USE_DOTLOCK - -diff -urN mutt-1.5.15/configure mutt-1.5.15-ro/configure ---- mutt-1.5.15/configure 2007-04-06 09:17:16.000000000 +0200 -+++ mutt-1.5.15-ro/configure 2007-05-27 14:20:23.000000000 +0200 -@@ -1354,6 +1354,7 @@ - --enable-hcache Enable header caching - --disable-iconv Disable iconv support - --disable-nls Do not use Native Language Support +diff -udprP mutt-1.5.16.orig/configure mutt-1.5.16/configure +--- mutt-1.5.16.orig/configure 2007-06-10 05:43:29.000000000 +0300 ++++ mutt-1.5.16/configure 2007-06-12 14:22:35.000000000 +0300 +@@ -1350,6 +1350,7 @@ Optional Features: + --disable-warnings Turn off compiler warnings (not recommended) + --enable-nfs-fix Work around an NFS with broken attributes caching + --enable-mailtool Enable Sun mailtool attachments support + --enable-compressed Enable compressed folders support - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -17502,6 +17503,17 @@ + --enable-locales-fix The result of isprint() is unreliable + --enable-exact-address Enable regeneration of email addresses + --enable-hcache Enable header caching +@@ -14414,6 +14415,18 @@ echo "${ECHO_T}$mutt_cv_regex_broken" >& + fi fi - ++ +# Check whether --enable-compressed or --disable-compressed was given. +if test "${enable_compressed+set}" = set; then -+ enableval="$enable_compressed"; if test x$enableval = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF ++ enableval="$enable_compressed" ++ if test x$enableval = xyes; then ++ cat >> confdefs.h <<\EOF +#define USE_COMPRESSED 1 -+_ACEOF ++EOF + + fi +fi + + if test $mutt_cv_regex = yes; then - # Check whether --with-exec-shell was given. - if test "${with_exec_shell+set}" = set; then -diff -urN mutt-1.5.15/configure.ac mutt-1.5.15-ro/configure.ac ---- mutt-1.5.15/configure.ac 2007-04-06 09:11:53.000000000 +0200 -+++ mutt-1.5.15-ro/configure.ac 2007-05-27 14:33:52.000000000 +0200 -@@ -803,6 +803,11 @@ - AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) + cat >>confdefs.h <<\_ACEOF +diff -udprP mutt-1.5.16.orig/configure.ac mutt-1.5.16/configure.ac +--- mutt-1.5.16.orig/configure.ac 2007-06-04 07:20:01.000000000 +0300 ++++ mutt-1.5.16/configure.ac 2007-06-12 14:22:35.000000000 +0300 +@@ -780,6 +780,11 @@ AC_ARG_ENABLE(mailtool, AC_HELP_STRING([ + AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ]) fi]) +AC_ARG_ENABLE(compressed, AC_HELP_STRING([--enable-compressed], [Enable compressed folders support]), -+ [if test x$enableval = xyes; then -+ AC_DEFINE(USE_COMPRESSED,1, [ Define to support compressed folders. ]) ++ [if test x$enableval = xyes; then ++ AC_DEFINE(USE_COMPRESSED,1,[ Define to enable compressed folders support. ]) + fi]) + - 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.15/curs_main.c mutt-1.5.15-ro/curs_main.c ---- mutt-1.5.15/curs_main.c 2007-04-03 19:41:14.000000000 +0200 -+++ mutt-1.5.15-ro/curs_main.c 2007-05-27 14:20:26.000000000 +0200 -@@ -1096,6 +1096,11 @@ + AC_ARG_ENABLE(locales-fix, AC_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.16.orig/curs_main.c mutt-1.5.16/curs_main.c +--- mutt-1.5.16.orig/curs_main.c 2007-05-20 10:30:00.000000000 +0300 ++++ mutt-1.5.16/curs_main.c 2007-06-12 14:22:35.000000000 +0300 +@@ -1111,6 +1111,11 @@ int mutt_index_menu (void) { int check; @@ -604,14 +649,63 @@ diff -urN mutt-1.5.15/curs_main.c mutt-1.5.15-ro/curs_main.c mutt_str_replace (&LastFolder, Context->path); oldcount = Context ? Context->msgcount : 0; -diff -urN mutt-1.5.15/doc/manual.xml.head mutt-1.5.15-ro/doc/manual.xml.head ---- mutt-1.5.15/doc/manual.xml.head 2007-04-04 07:37:13.000000000 +0200 -+++ mutt-1.5.15-ro/doc/manual.xml.head 2007-05-27 14:20:26.000000000 +0200 -@@ -4910,6 +4910,205 @@ +diff -udprP mutt-1.5.16.orig/doc/Makefile.am mutt-1.5.16/doc/Makefile.am +--- mutt-1.5.16.orig/doc/Makefile.am 2007-04-13 19:43:45.000000000 +0300 ++++ mutt-1.5.16/doc/Makefile.am 2007-06-12 14:22:35.000000000 +0300 +@@ -27,7 +27,7 @@ EXTRA_DIST = dotlock.man \ + + HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \ + configuration.html mimesupport.html advancedusage.html \ +- tuning.html reference.html miscellany.html ++ tuning.html reference.html miscellany.html compressed-folders.html + + BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES) + +diff -udprP mutt-1.5.16.orig/doc/Makefile.in mutt-1.5.16/doc/Makefile.in +--- mutt-1.5.16.orig/doc/Makefile.in 2007-06-10 05:43:25.000000000 +0300 ++++ mutt-1.5.16/doc/Makefile.in 2007-06-12 14:22:35.000000000 +0300 +@@ -223,7 +223,7 @@ EXTRA_DIST = dotlock.man \ + + HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \ + configuration.html mimesupport.html advancedusage.html \ +- tuning.html reference.html miscellany.html ++ tuning.html reference.html miscellany.html compressed-folders.html + + 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.16.orig/doc/manual.xml.head mutt-1.5.16/doc/manual.xml.head +--- mutt-1.5.16.orig/doc/manual.xml.head 2007-04-04 08:37:13.000000000 +0300 ++++ mutt-1.5.16/doc/manual.xml.head 2007-06-12 14:22:35.000000000 +0300 +@@ -4083,6 +4083,24 @@ configuration option/command. See + fcc-save-hook + + ++ ++ ++ ++open-hook ++ ++ ++ ++ ++ ++close-hook ++ ++ ++ ++ ++ ++append-hook ++ ++ + + + +@@ -4910,6 +4928,254 @@ becomes an issue as mutt will silently f -+ ++ +Compressed folders Support (OPTIONAL) + + @@ -620,166 +714,217 @@ diff -urN mutt-1.5.15/doc/manual.xml.head mutt-1.5.15-ro/doc/manual.xml.head +--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 (open-hook, close-hook and append-hook) which define commands to -+uncompress and compress a folder and to append messages to an existing -+compressed folder respectively. ++ ++There are three hooks defined ++(open-hook, ++close-hook and ++append-hook) which define commands ++to uncompress and compress a folder and to append messages to an ++existing compressed folder respectively. ++ + ++ +For example: + + -+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" + ++ + -+You do not have to specify all of the commands. If you omit append-hook, the folder will be open and -+closed again each time you will add to it. If you omit close-hook (or give empty command) , the -+folder will be open in the mode. If you specify append-hook though you'll be able to ++ ++You do not have to specify all of the commands. If you omit ++append-hook, the folder will be open ++and closed again each time you will add to it. If you omit ++close-hook (or give empty command), ++the folder will be open in the mode. If you specify ++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 -+"." as a regexp. But this may be surprising if your -+compressing script produces empty files. In this situation, unset ++``.'' as a regexp. But this may be surprising if your compressing ++script produces empty files. In this situation, unset +$save_empty, so that +the compressed file will be removed if you delete all of the messages. + + -+ ++ +Open a compressed mailbox for reading + + -+Usage: open-hook regexp "command" ++Usage: open-hook regexp command ++ + ++ +The command is the command that can be used for +opening the folders whose names match regexp. ++ + ++ +The command string is the printf-like format +string, and it should accept two parameters: %f, which is +replaced with the (compressed) folder name, and %t which is +replaced with the name of the temporary folder to which to write. ++ + ++ +%f and %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, %% is replaced by +%, as in printf, and any other %anything is left as is. ++ + -+The command should not remove the original compressed file. The -+command should return non-zero exit status if it -+fails, so mutt knows something's wrong. ++ ++The command should not ++remove the original compressed file. The command ++should return non-zero exit status if it fails, so mutt knows ++something's wrong. ++ + ++ +Example: + + -+open-hook \\.gz$ "gzip -cd %f > %t" ++open-hook \\.gz$ "gzip -cd %f > %t" + ++ + ++ +If the command is empty, this operation is +disabled for this file type. + -+ + -+ ++ ++ ++ +Write a compressed mailbox + + -+Usage: close-hook regexp "command" ++Usage: close-hook regexp command ++ + -+This is used to close the folder that was open with the open-hook command after some changes were -+made to it. ++ ++This is used to close the folder that was open with the ++open-hook command after some changes ++were made to it. ++ + ++ +The command string is the command that can be -+used for closing the folders whose names match -+regexp. It has the same format as in the open-hook command. Temporary folder in this -+case is the folder previously produced by the open-hook command. ++used for closing the folders whose names match regexp. ++It has the same format as in the open-hook ++command. Temporary folder in this case is the folder previously ++produced by the open-hook command. ++ + -+The command should not remove the decompressed file. The -+command should return non-zero exit status if it -+fails, so mutt knows something's wrong. ++ ++The command should not ++remove the decompressed file. The command should ++return non-zero exit status if it fails, so mutt knows something's ++wrong. ++ + ++ +Example: + + -+close-hook \\.gz$ "gzip -c %t > %f" ++close-hook \\.gz$ "gzip -c %t > %f" + ++ + ++ +If the command is empty, this operation is +disabled for this file type, and the file can only be open in the -+read-only mode. ++readonly mode. ++ + ++ +close-hook is not called when you +exit from the folder if the folder was not changed. + -+ + -+ ++ ++ ++ +Append a message to a compressed mailbox + + -+Usage: append-hook regexp "command" ++Usage: append-hook regexp command ++ + -+This command is used for saving to an existing compressed folder. The -+command is the command that can be used for -+appending to the folders whose names match -+regexp. It has the same format as in the open-hook command. The temporary folder in -+this case contains the messages that are being appended. ++ ++This command is used for saving to an existing compressed folder. ++The command is the command that can be used for ++appending to the folders whose names match regexp. ++It has the same format as in the open-hook ++command. The temporary folder in this case contains the messages that ++are being appended. ++ + -+The command should not remove the decompressed file. The -+command should return non-zero exit status if it -+fails, so mutt knows something's wrong. ++ ++The command should not ++remove the decompressed file. The command should ++return non-zero exit status if it fails, so mutt knows something's ++wrong. ++ + ++ +Example: + + -+append-hook \\.gz$ "gzip -c %t >> %f" ++append-hook \\.gz$ "gzip -c %t >> %f" + ++ + ++ +When 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 ($mbox_type) type is always -+supposed (i.e. this is the format used for the temporary folder). ++out what the folder type is. Thus the default ++($mbox_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, close-hook is called, and not append-hook. append-hook is only for appending to -+existing folders. ++ ++If the file does not exist when you save to it, ++close-hook is called, and not ++append-hook. ++append-hook is only for appending ++to existing folders. ++ + ++ +If the command is empty, this operation is +disabled for this file type. In this case, the folder will be open and +closed again (using open-hook and -+close-hookrespectively) each time you -+will add to it. ++close-hook respectively) each time ++you will add to it. + -+ + -+ ++ ++ ++ +Encrypted folders + + @@ -791,32 +936,69 @@ diff -urN mutt-1.5.15/doc/manual.xml.head mutt-1.5.15-ro/doc/manual.xml.head +open-hook \\.pgp$ "pgp -f < %f > %t" +close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId < %t > %f" + ++ + ++ +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: -+ -+ -+open-hook \\.gpg$ "gpg --decrypt < %f > %t" -+close-hook \\.gpg$ "gpg --encrypt --recipient YourGpgUserIdOrKeyId < %t > %f" -+ -+ ++ +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. + -+ ++ + ++ ++ + Mutt's MIME Support -diff -urN mutt-1.5.15/doc/muttrc.man.head mutt-1.5.15-ro/doc/muttrc.man.head ---- mutt-1.5.15/doc/muttrc.man.head 2007-04-01 23:58:55.000000000 +0200 -+++ mutt-1.5.15-ro/doc/muttrc.man.head 2007-05-27 14:20:26.000000000 +0200 -@@ -345,6 +345,24 @@ +@@ -6056,6 +6322,12 @@ The following are the commands understoo + + + ++append-hook pattern command ++ ++ ++ ++ ++ + auto_view mimetype [ mimetype ... ] + + +@@ -6086,6 +6358,12 @@ The following are the commands understoo + + + ++close-hook pattern command ++ ++ ++ ++ ++ + color object foreground background [ regexp ] + + +@@ -6218,6 +6496,12 @@ The following are the commands understoo + + + ++open-hook pattern command ++ ++ ++ ++ ++ + crypt-hook pattern key-id + + +diff -udprP mutt-1.5.16.orig/doc/muttrc.man.head mutt-1.5.16/doc/muttrc.man.head +--- mutt-1.5.16.orig/doc/muttrc.man.head 2007-04-02 00:58:55.000000000 +0300 ++++ mutt-1.5.16/doc/muttrc.man.head 2007-06-12 14:22:35.000000000 +0300 +@@ -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. @@ -841,9 +1023,9 @@ diff -urN mutt-1.5.15/doc/muttrc.man.head mutt-1.5.15-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.15/hook.c mutt-1.5.15-ro/hook.c ---- mutt-1.5.15/hook.c 2007-04-01 23:58:56.000000000 +0200 -+++ mutt-1.5.15-ro/hook.c 2007-05-27 14:23:46.000000000 +0200 +diff -udprP mutt-1.5.16.orig/hook.c mutt-1.5.16/hook.c +--- mutt-1.5.16.orig/hook.c 2007-04-08 02:36:55.000000000 +0300 ++++ mutt-1.5.16/hook.c 2007-06-12 14:22:35.000000000 +0300 @@ -24,6 +24,10 @@ #include "mailbox.h" #include "mutt_crypt.h" @@ -855,7 +1037,7 @@ diff -urN mutt-1.5.15/hook.c mutt-1.5.15-ro/hook.c #include #include #include -@@ -92,6 +96,16 @@ +@@ -92,6 +96,16 @@ int mutt_parse_hook (BUFFER *buf, BUFFER memset (&pattern, 0, sizeof (pattern)); pattern.data = safe_strdup (path); } @@ -864,18 +1046,18 @@ diff -urN mutt-1.5.15/hook.c mutt-1.5.15-ro/hook.c + { + if (mutt_test_compress_command (command.data)) + { -+ strfcpy (err->data, _("bad formatted command string"), err->dsize); -+ return (-1); ++ strfcpy (err->data, _("bad formatted command string"), err->dsize); ++ return (-1); + } + } +#endif else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK)) && (!WithCrypto || !(data & M_CRYPTHOOK)) ) -diff -urN mutt-1.5.15/init.h mutt-1.5.15-ro/init.h ---- mutt-1.5.15/init.h 2007-04-05 18:03:55.000000000 +0200 -+++ mutt-1.5.15-ro/init.h 2007-05-27 14:20:26.000000000 +0200 -@@ -3111,6 +3111,11 @@ +diff -udprP mutt-1.5.16.orig/init.h mutt-1.5.16/init.h +--- mutt-1.5.16.orig/init.h 2007-06-10 05:29:21.000000000 +0300 ++++ mutt-1.5.16/init.h 2007-06-12 14:22:35.000000000 +0300 +@@ -3129,6 +3129,11 @@ struct command_t Commands[] = { { "fcc-hook", mutt_parse_hook, M_FCCHOOK }, { "fcc-save-hook", mutt_parse_hook, M_FCCHOOK | M_SAVEHOOK }, { "folder-hook", mutt_parse_hook, M_FOLDERHOOK }, @@ -887,84 +1069,25 @@ diff -urN mutt-1.5.15/init.h mutt-1.5.15-ro/init.h { "group", parse_group, 0 }, { "ungroup", parse_ungroup, 0 }, { "hdr_order", parse_list, UL &HeaderOrderList }, -diff -urN mutt-1.5.15/main.c mutt-1.5.15-ro/main.c ---- mutt-1.5.15/main.c 2007-04-04 07:37:13.000000000 +0200 -+++ mutt-1.5.15-ro/main.c 2007-05-27 14:20:26.000000000 +0200 -@@ -401,6 +401,12 @@ - #else - "-LOCALES_HACK " +diff -udprP mutt-1.5.16.orig/main.c mutt-1.5.16/main.c +--- mutt-1.5.16.orig/main.c 2007-04-10 23:53:08.000000000 +0300 ++++ mutt-1.5.16/main.c 2007-06-12 14:22:35.000000000 +0300 +@@ -310,6 +310,12 @@ static void show_version (void) + "-USE_GNU_REGEX " #endif -+ + +#ifdef USE_COMPRESSED + "+COMPRESSED " +#else + "-COMPRESSED " +#endif - - #ifdef HAVE_WC_FUNCS - "+HAVE_WC_FUNCS " -diff -urN mutt-1.5.15/Makefile.am mutt-1.5.15-ro/Makefile.am ---- mutt-1.5.15/Makefile.am 2007-04-06 22:04:45.000000000 +0200 -+++ mutt-1.5.15-ro/Makefile.am 2007-05-27 14:20:26.000000000 +0200 -@@ -18,7 +18,7 @@ - bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ - mutt_SOURCES = $(BUILT_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 \ -@@ -66,7 +66,7 @@ - utf8.c wcwidth.c - - EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ -- configure account.h \ -+ configure account.h compress.h \ - 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.15/Makefile.in mutt-1.5.15-ro/Makefile.in ---- mutt-1.5.15/Makefile.in 2007-04-06 22:05:40.000000000 +0200 -+++ mutt-1.5.15-ro/Makefile.in 2007-05-27 14:20:26.000000000 +0200 -@@ -74,7 +74,7 @@ - attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \ - buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \ - cryptglue.$(OBJEXT) commands.$(OBJEXT) complete.$(OBJEXT) \ -- compose.$(OBJEXT) copy.$(OBJEXT) curs_lib.$(OBJEXT) \ -+ compose.$(OBJEXT) compress.$(OBJEXT) copy.$(OBJEXT) curs_lib.$(OBJEXT) \ - curs_main.$(OBJEXT) date.$(OBJEXT) edit.$(OBJEXT) \ - enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) \ - filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \ -@@ -301,7 +301,7 @@ - BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h - mutt_SOURCES = $(BUILT_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 \ -@@ -334,7 +334,7 @@ - utf8.c wcwidth.c - - EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ -- configure account.h \ -+ configure account.h compress.h \ - 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 \ -@@ -504,6 +504,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/complete.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compose.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-gpgme.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-mod-pgp-classic.Po@am__quote@ -diff -urN mutt-1.5.15/mbox.c mutt-1.5.15-ro/mbox.c ---- mutt-1.5.15/mbox.c 2007-04-01 23:58:56.000000000 +0200 -+++ mutt-1.5.15-ro/mbox.c 2007-05-27 14:20:26.000000000 +0200 ++ + "\n" + + #ifdef HAVE_COLOR +diff -udprP mutt-1.5.16.orig/mbox.c mutt-1.5.16/mbox.c +--- mutt-1.5.16.orig/mbox.c 2007-04-02 00:58:56.000000000 +0300 ++++ mutt-1.5.16/mbox.c 2007-06-12 14:22:35.000000000 +0300 @@ -29,6 +29,10 @@ #include "copy.h" #include "mutt_curses.h" @@ -976,7 +1099,7 @@ diff -urN mutt-1.5.15/mbox.c mutt-1.5.15-ro/mbox.c #include #include #include -@@ -1026,6 +1030,12 @@ +@@ -1026,6 +1030,12 @@ bail: /* Come here in case of disaster int mbox_close_mailbox (CONTEXT *ctx) { mx_unlock_file (ctx->path, fileno (ctx->fp), 1); @@ -989,10 +1112,10 @@ diff -urN mutt-1.5.15/mbox.c mutt-1.5.15-ro/mbox.c mutt_unblock_signals (); mx_fastclose_mailbox (ctx); return 0; -diff -urN mutt-1.5.15/mutt.h mutt-1.5.15-ro/mutt.h ---- mutt-1.5.15/mutt.h 2007-04-02 20:04:35.000000000 +0200 -+++ mutt-1.5.15-ro/mutt.h 2007-05-27 14:20:26.000000000 +0200 -@@ -160,6 +160,11 @@ +diff -udprP mutt-1.5.16.orig/mutt.h mutt-1.5.16/mutt.h +--- mutt-1.5.16.orig/mutt.h 2007-04-11 06:14:01.000000000 +0300 ++++ mutt-1.5.16/mutt.h 2007-06-12 14:22:35.000000000 +0300 +@@ -160,6 +160,11 @@ typedef enum #define M_ACCOUNTHOOK (1<<9) #define M_REPLYHOOK (1<<10) #define M_SEND2HOOK (1<<11) @@ -1004,51 +1127,21 @@ diff -urN mutt-1.5.15/mutt.h mutt-1.5.15-ro/mutt.h /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -882,6 +887,11 @@ - int flagged; /* how many flagged messages */ - int msgnotreadyet; /* which msg "new" in pager, -1 if none */ +@@ -889,6 +894,11 @@ typedef struct _context + + unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */ +#ifdef USE_COMPRESSED + void *compressinfo; /* compressed mbox module private data */ + char *realpath; /* path to compressed mailbox */ +#endif /* USE_COMPRESSED */ + - short magic; /* mailbox type */ - - unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */ -diff -urN mutt-1.5.15/Muttrc mutt-1.5.15-ro/Muttrc ---- mutt-1.5.15/Muttrc 2007-04-06 22:34:36.000000000 +0200 -+++ mutt-1.5.15-ro/Muttrc 2007-05-27 14:20:26.000000000 +0200 -@@ -21,6 +21,11 @@ - macro index,pager y "?" "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. - # -diff -urN mutt-1.5.15/Muttrc.head mutt-1.5.15-ro/Muttrc.head ---- mutt-1.5.15/Muttrc.head 2007-04-01 23:58:55.000000000 +0200 -+++ mutt-1.5.15-ro/Muttrc.head 2007-05-27 14:20:26.000000000 +0200 -@@ -21,6 +21,11 @@ - macro index,pager y "?" "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. - # -diff -urN mutt-1.5.15/mx.c mutt-1.5.15-ro/mx.c ---- mutt-1.5.15/mx.c 2007-04-03 19:41:14.000000000 +0200 -+++ mutt-1.5.15-ro/mx.c 2007-05-27 14:24:41.000000000 +0200 + unsigned int locked : 1; /* is the mailbox locked? */ + unsigned int changed : 1; /* mailbox has been modified */ + unsigned int readonly : 1; /* don't allow changes to the mailbox */ +diff -udprP mutt-1.5.16.orig/mx.c mutt-1.5.16/mx.c +--- mutt-1.5.16.orig/mx.c 2007-04-03 20:41:14.000000000 +0300 ++++ mutt-1.5.16/mx.c 2007-06-12 14:22:35.000000000 +0300 @@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -1060,7 +1153,7 @@ diff -urN mutt-1.5.15/mx.c mutt-1.5.15-ro/mx.c #ifdef USE_IMAP #include "imap.h" #endif -@@ -450,6 +454,10 @@ +@@ -450,6 +454,11 @@ int mx_get_magic (const char *path) return (-1); } @@ -1068,10 +1161,11 @@ diff -urN mutt-1.5.15/mx.c mutt-1.5.15-ro/mx.c + if (magic == 0 && mutt_can_read_compressed (path)) + return M_COMPRESSED; +#endif ++ return (magic); } -@@ -489,6 +497,13 @@ +@@ -489,6 +498,13 @@ static int mx_open_mailbox_append (CONTE { struct stat sb; @@ -1085,12 +1179,10 @@ diff -urN mutt-1.5.15/mx.c mutt-1.5.15-ro/mx.c ctx->append = 1; #ifdef USE_IMAP -@@ -652,7 +667,12 @@ - } +@@ -653,6 +669,11 @@ CONTEXT *mx_open_mailbox (const char *pa ctx->magic = mx_get_magic (path); -- -+ + +#ifdef USE_COMPRESSED + if (ctx->magic == M_COMPRESSED) + mutt_open_read_compressed (ctx); @@ -1099,7 +1191,7 @@ diff -urN mutt-1.5.15/mx.c mutt-1.5.15-ro/mx.c if(ctx->magic == 0) mutt_error (_("%s is not a mailbox."), path); -@@ -753,6 +773,10 @@ +@@ -753,6 +774,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx) mutt_free_header (&ctx->hdrs[i]); FREE (&ctx->hdrs); FREE (&ctx->v2r); @@ -1110,7 +1202,7 @@ diff -urN mutt-1.5.15/mx.c mutt-1.5.15-ro/mx.c FREE (&ctx->path); FREE (&ctx->pattern); if (ctx->limit_pattern) -@@ -805,6 +829,12 @@ +@@ -805,6 +830,12 @@ static int sync_mailbox (CONTEXT *ctx, i if (tmp && tmp->new == 0) mutt_update_mailbox (tmp); @@ -1123,7 +1215,7 @@ diff -urN mutt-1.5.15/mx.c mutt-1.5.15-ro/mx.c return rc; } -@@ -1006,6 +1036,11 @@ +@@ -1006,6 +1037,11 @@ int mx_close_mailbox (CONTEXT *ctx, int !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY)) mx_unlink_empty (ctx->path); @@ -1135,7 +1227,7 @@ diff -urN mutt-1.5.15/mx.c mutt-1.5.15-ro/mx.c mx_fastclose_mailbox (ctx); return 0; -@@ -1315,6 +1350,11 @@ +@@ -1315,6 +1351,11 @@ int mx_check_mailbox (CONTEXT *ctx, int { int rc; @@ -1147,10 +1239,10 @@ diff -urN mutt-1.5.15/mx.c mutt-1.5.15-ro/mx.c if (ctx) { if (ctx->locked) lock = 0; -diff -urN mutt-1.5.15/mx.h mutt-1.5.15-ro/mx.h ---- mutt-1.5.15/mx.h 2007-04-01 23:58:56.000000000 +0200 -+++ mutt-1.5.15-ro/mx.h 2007-05-27 14:20:29.000000000 +0200 -@@ -40,6 +40,9 @@ +diff -udprP mutt-1.5.16.orig/mx.h mutt-1.5.16/mx.h +--- mutt-1.5.16.orig/mx.h 2007-04-02 00:58:56.000000000 +0300 ++++ mutt-1.5.16/mx.h 2007-06-12 14:22:35.000000000 +0300 +@@ -40,6 +40,9 @@ enum #ifdef USE_POP , M_POP #endif @@ -1160,97 +1252,10 @@ diff -urN mutt-1.5.15/mx.h mutt-1.5.15-ro/mx.h }; WHERE short DefaultMagic INITVAL (M_MBOX); -diff -urN mutt-1.5.15/PATCHES mutt-1.5.15-ro/PATCHES ---- mutt-1.5.15/PATCHES 2007-03-15 16:49:37.000000000 +0100 -+++ mutt-1.5.15-ro/PATCHES 2007-05-27 14:38:02.000000000 +0200 -@@ -0,0 +1 @@ -+patch-1.5.15.rr.compressed.2 -diff -urN mutt-1.5.15/po/de.po mutt-1.5.15-ro/po/de.po ---- mutt-1.5.15/po/de.po 2007-04-06 22:35:40.000000000 +0200 -+++ mutt-1.5.15-ro/po/de.po 2007-05-27 14:22:49.000000000 +0200 -@@ -1280,6 +1280,48 @@ - msgid "Failed to figure out sender" - msgstr "Kann Absender nicht ermitteln" - -+#: compress.c:203 mbox.c:661 -+msgid "Mailbox was corrupted!" -+msgstr "Mailbox wurde zerstört!" -+ -+#: 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" -+msgstr "Komprimiere %s...\n" -+ -+#: compress.c:381 -+#, c-format -+msgid "" -+"%s: Error compressing mailbox! Original mailbox deleted, uncompressed one " -+"kept!\n" -+msgstr "" -+"%s: Fehler beim Komprimieren der Mailbox! Ursprüngliche Mailbox gelöscht, " -+"entpackte gespeichert!\n" -+ -+#: compress.c:425 compress.c:456 -+#, c-format -+msgid "Compressed-appending to %s...\n" -+msgstr "Hänge komprimiert an %s... an\n" -+ -+#: compress.c:461 -+#, 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)" -@@ -1945,6 +1987,10 @@ - msgid "Bad history file format (line %d)" - msgstr "" - -+#: hook.c:96 -+msgid "bad 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." -@@ -3437,18 +3483,10 @@ - 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. -diff -urN mutt-1.5.15/po/POTFILES.in mutt-1.5.15-ro/po/POTFILES.in ---- mutt-1.5.15/po/POTFILES.in 2007-04-01 23:58:57.000000000 +0200 -+++ mutt-1.5.15-ro/po/POTFILES.in 2007-05-27 14:20:29.000000000 +0200 -@@ -8,6 +8,7 @@ +diff -udprP mutt-1.5.16.orig/po/POTFILES.in mutt-1.5.16/po/POTFILES.in +--- mutt-1.5.16.orig/po/POTFILES.in 2007-04-02 00:58:57.000000000 +0300 ++++ mutt-1.5.16/po/POTFILES.in 2007-06-12 14:22:35.000000000 +0300 +@@ -8,6 +8,7 @@ charset.c color.c commands.c compose.c @@ -1258,10 +1263,10 @@ diff -urN mutt-1.5.15/po/POTFILES.in mutt-1.5.15-ro/po/POTFILES.in crypt-gpgme.c crypt.c cryptglue.c -diff -urN mutt-1.5.15/status.c mutt-1.5.15-ro/status.c ---- mutt-1.5.15/status.c 2007-04-01 23:58:58.000000000 +0200 -+++ mutt-1.5.15-ro/status.c 2007-05-27 14:20:29.000000000 +0200 -@@ -97,6 +97,14 @@ +diff -udprP mutt-1.5.16.orig/status.c mutt-1.5.16/status.c +--- mutt-1.5.16.orig/status.c 2007-04-16 02:56:26.000000000 +0300 ++++ mutt-1.5.16/status.c 2007-06-12 14:22:35.000000000 +0300 +@@ -99,6 +99,14 @@ status_format_str (char *buf, size_t buf case 'f': snprintf (fmt, sizeof(fmt), "%%%ss", prefix);