X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/4c13acfc45a942f5f481ce6a3dfcea461da505ad..c17d89a9948fd2608b6e1f238f324cd4b3a47dc5:/upstream/extra-patches/compressed-folders diff --git a/upstream/extra-patches/compressed-folders b/upstream/extra-patches/compressed-folders index f12621e..1d15cad 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-09-29 + - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.11.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.11/compress.c mutt-1.5.11-ro/compress.c +--- mutt-1.5.11/compress.c 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-1.5.11-ro/compress.c 2005-09-27 13:26:58.000000000 +0200 @@ -0,0 +1,487 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -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.11/compress.h mutt-1.5.11-ro/compress.h +--- mutt-1.5.11/compress.h 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-1.5.11-ro/compress.h 2005-09-27 13:26:58.000000000 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -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.11/config.h.in mutt-1.5.11-ro/config.h.in +diff -urN mutt-1.5.11/configure mutt-1.5.11-ro/configure +diff -urN mutt-1.5.11/configure.in mutt-1.5.11-ro/configure.in +--- mutt-1.5.11/configure.in 2005-09-15 16:21:24.000000000 +0200 ++++ mutt-1.5.11-ro/configure.in 2005-09-27 13:26:58.000000000 +0200 +@@ -711,6 +711,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.11/curs_main.c mutt-1.5.11-ro/curs_main.c +--- mutt-1.5.11/curs_main.c 2005-09-07 10:19:43.000000000 +0200 ++++ mutt-1.5.11-ro/curs_main.c 2005-09-27 13:26:58.000000000 +0200 +@@ -1091,6 +1091,11 @@ { int check; @@ -571,24 +570,22 @@ 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 - +diff -urN mutt-1.5.11/doc/manual.xml.head mutt-1.5.11-ro/doc/manual.xml.head +--- mutt-1.5.11/doc/manual.xml.head 2005-09-06 18:46:44.000000000 +0200 ++++ mutt-1.5.11-ro/doc/manual.xml.head 2005-09-27 13:29:11.000000000 +0200 +@@ -4404,6 +4404,205 @@ -+Compressed folders Support (OPTIONAL) -+

+ + ++ ++Compressed folders Support (OPTIONAL) + ++ +If Mutt was compiled with compressed folders support (by running the -+configure script with the ++--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. @@ -599,143 +596,167 @@ diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head +folder to the accepted format, appending to it and converting back to +the user-defined format. + -+There are three hooks defined (, -+ and ) 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" -+ ++ + -+You do not have to specify all of the commands. If you omit , the folder will be open and -+closed again each time you will add to it. If you omit (or give empty command) , the -+folder will be open in the mode. If you specify though you'll be able to append -+to the folder. ++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 -+&dquot;.&dquot; as a regexp. But this may be surprising if your -+compressing script produces empty files. In this situation, unset , so that the compressed file -+will be removed if you delete all of the messages. ++"." 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 + -+Open a compressed mailbox for reading

-+Usage: ++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. + +Example: + -+ ++ +open-hook \\.gz$ "gzip -cd %f > %t" -+ ++ ++ ++If the command is empty, this operation is ++disabled for this file type. ++ ++ + -+If the ++Write a compressed mailbox + -+Write a compressed mailbox

-+Usage: ++Usage: close-hook regexp "command" + -+This is used to close the folder that was open with the 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. Temporary folder -+in this case is the folder previously produced by the command. ++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. + -+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" -+ ++ + -+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. + -+ is not called when you exit -+from the folder if the folder was not changed. ++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 a message to a compressed mailbox + -+This command is used for saving to an existing compressed folder. -+The command. -+The temporary folder in this case contains the messages that are being -+appended. ++ ++Usage: append-hook regexp "command" + -+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. + +Example: + -+ ++ +append-hook \\.gz$ "gzip -c %t >> %f" -+ -+ -+When 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 () 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, is called, and not . is only -+for appending to existing folders. -+ -+If the and respectively) each time you will add to it. -+ -+Encrypted folders -+

++ ++ ++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). ++ ++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. ++ ++ ++ ++ ++Encrypted folders ++ ++ +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: + -+ ++ +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. @@ -743,50 +764,24 @@ diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head +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" -+ -+ -+Mutt's MIME Support -

- Quite a bit of effort has been made to make Mutt the premier text-mode -@@ -3116,6 +3286,8 @@ - - -+ - - - -+ - - - -+ - - ++ ++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.11/doc/muttrc.man.head mutt-1.5.11-ro/doc/muttrc.man.head +--- mutt-1.5.11/doc/muttrc.man.head 2005-09-07 10:19:44.000000000 +0200 ++++ mutt-1.5.11-ro/doc/muttrc.man.head 2005-09-27 13:29:53.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 +807,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.11/hook.c mutt-1.5.11-ro/hook.c +--- mutt-1.5.11/hook.c 2005-02-03 19:47:52.000000000 +0100 ++++ mutt-1.5.11-ro/hook.c 2005-09-27 13:27:02.000000000 +0200 @@ -24,6 +24,10 @@ #include "mailbox.h" #include "mutt_crypt.h" @@ -843,10 +838,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.11/init.h mutt-1.5.11-ro/init.h +--- mutt-1.5.11/init.h 2005-09-15 16:19:54.000000000 +0200 ++++ mutt-1.5.11-ro/init.h 2005-09-27 13:27:02.000000000 +0200 +@@ -3002,6 +3002,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 +853,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.11/main.c mutt-1.5.11-ro/main.c +--- mutt-1.5.11/main.c 2005-09-07 10:19:43.000000000 +0200 ++++ mutt-1.5.11-ro/main.c 2005-09-27 13:27:02.000000000 +0200 +@@ -385,6 +385,12 @@ #else "-LOCALES_HACK " #endif @@ -874,9 +869,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.11/Makefile.am mutt-1.5.11-ro/Makefile.am +--- mutt-1.5.11/Makefile.am 2005-08-11 23:27:28.000000000 +0200 ++++ mutt-1.5.11-ro/Makefile.am 2005-09-27 13:27:02.000000000 +0200 @@ -18,7 +18,7 @@ bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ mutt_SOURCES = $(BUILT_SOURCES) \ @@ -895,10 +890,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.11/Makefile.in mutt-1.5.11-ro/Makefile.in +diff -urN mutt-1.5.11/mbox.c mutt-1.5.11-ro/mbox.c +--- mutt-1.5.11/mbox.c 2005-08-02 09:08:00.000000000 +0200 ++++ mutt-1.5.11-ro/mbox.c 2005-09-27 13:27:02.000000000 +0200 @@ -28,6 +28,10 @@ #include "sort.h" #include "copy.h" @@ -910,7 +905,7 @@ diff -urN mutt-1.5.8/mbox.c mutt-1.5.8-ro/mbox.c #include #include #include -@@ -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 +918,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.11/mutt.h mutt-1.5.11-ro/mutt.h +--- mutt-1.5.11/mutt.h 2005-09-07 10:19:43.000000000 +0200 ++++ mutt-1.5.11-ro/mutt.h 2005-09-27 13:27:02.000000000 +0200 +@@ -157,6 +157,11 @@ #define M_ACCOUNTHOOK (1<<9) #define M_REPLYHOOK (1<<10) #define M_SEND2HOOK (1<<11) @@ -938,7 +933,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 @@ +@@ -828,6 +833,11 @@ void *data; /* driver specific data */ #endif /* USE_IMAP */ @@ -950,40 +945,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 "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation" - macro pager "!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 "!less @docdir@/manual.txt\n" "Show Mutt documentation" - macro pager "!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.11/Muttrc mutt-1.5.11-ro/Muttrc +diff -urN mutt-1.5.11/Muttrc.head mutt-1.5.11-ro/Muttrc.head +diff -urN mutt-1.5.11/Muttrc.head.in mutt-1.5.11-ro/Muttrc.head.in +diff -urN mutt-1.5.11/mx.c mutt-1.5.11-ro/mx.c +--- mutt-1.5.11/mx.c 2005-09-07 10:19:43.000000000 +0200 ++++ mutt-1.5.11-ro/mx.c 2005-09-27 13:27:02.000000000 +0200 @@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -1070,7 +1037,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 +1049,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.11/mx.h mutt-1.5.11-ro/mx.h +--- mutt-1.5.11/mx.h 2003-08-05 15:58:16.000000000 +0200 ++++ mutt-1.5.11-ro/mx.h 2005-09-27 13:27:02.000000000 +0200 @@ -40,6 +40,9 @@ #ifdef USE_POP , M_POP @@ -1095,17 +1062,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.11/PATCHES mutt-1.5.11-ro/PATCHES +--- mutt-1.5.11/PATCHES 2005-08-15 10:16:00.000000000 +0200 ++++ mutt-1.5.11-ro/PATCHES 2005-09-27 13:30:25.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.11.rr.compressed.1 +diff -urN mutt-1.5.11/po/de.po mutt-1.5.11-ro/po/de.po +--- mutt-1.5.11/po/de.po 2005-09-15 16:23:50.000000000 +0200 ++++ mutt-1.5.11-ro/po/de.po 2005-09-27 13:27:02.000000000 +0200 +@@ -1262,6 +1262,48 @@ + msgid "Failed to figure out sender" + msgstr "Kann Absender nicht ermitteln" +#: compress.c:203 mbox.c:661 +msgid "Mailbox was corrupted!" @@ -1152,7 +1119,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 @@ +@@ -1882,6 +1924,10 @@ msgid "Help for %s" msgstr "Hilfe für %s" @@ -1163,7 +1130,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 @@ +@@ -3336,18 +3382,10 @@ msgid "Mailbox is corrupt!" msgstr "Mailbox fehlerhaft!" @@ -1171,31 +1138,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.11/po/POTFILES.in mutt-1.5.11-ro/po/POTFILES.in +--- mutt-1.5.11/po/POTFILES.in 2005-08-03 11:17:47.000000000 +0200 ++++ mutt-1.5.11-ro/po/POTFILES.in 2005-09-27 13:27:02.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.11/status.c mutt-1.5.11-ro/status.c +--- mutt-1.5.11/status.c 2005-02-03 19:47:53.000000000 +0100 ++++ mutt-1.5.11-ro/status.c 2005-09-27 13:27:02.000000000 +0200 @@ -97,6 +97,14 @@ case 'f':