X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/6132f1fe27fba7f86ce8c2f5ee806e8e1f1fc3de..b4c0283bbf4dfa85adf3df88b21bde4b2a48b11c:/upstream/extra-patches/compressed-folders?ds=sidebyside diff --git a/upstream/extra-patches/compressed-folders b/upstream/extra-patches/compressed-folders index 5ad6cd0..35634f0 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-04-03 - - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.9.rr.compressed.1.gz + - Date: 2005-08-14 + - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.10.rr.compressed.1.gz * Changes made: - filterdiff -p1 \ $(for f in Makefile.in config.h.in configure 'Muttrc*' doc/manual.txt \ 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.9/compress.c mutt-1.5.9-ro/compress.c ---- mutt-1.5.9/compress.c 1970-01-01 01:00:00.000000000 +0100 -+++ mutt-1.5.9-ro/compress.c 2005-03-20 14:06:20.000000000 +0100 +diff -urN mutt-1.5.10/compress.c mutt-1.5.10-ro/compress.c +--- mutt-1.5.10/compress.c 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-1.5.10-ro/compress.c 2005-08-14 12:10:21.000000000 +0200 @@ -0,0 +1,487 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -508,9 +507,9 @@ diff -urN mutt-1.5.9/compress.c mutt-1.5.9-ro/compress.c +} + +#endif /* USE_COMPRESSED */ -diff -urN mutt-1.5.9/compress.h mutt-1.5.9-ro/compress.h ---- mutt-1.5.9/compress.h 1970-01-01 01:00:00.000000000 +0100 -+++ mutt-1.5.9-ro/compress.h 2005-03-20 14:06:20.000000000 +0100 +diff -urN mutt-1.5.10/compress.h mutt-1.5.10-ro/compress.h +--- mutt-1.5.10/compress.h 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-1.5.10-ro/compress.h 2005-08-14 12:10:21.000000000 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -539,12 +538,12 @@ diff -urN mutt-1.5.9/compress.h mutt-1.5.9-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.9/config.h.in mutt-1.5.9-ro/config.h.in -diff -urN mutt-1.5.9/configure mutt-1.5.9-ro/configure -diff -urN mutt-1.5.9/configure.in mutt-1.5.9-ro/configure.in ---- mutt-1.5.9/configure.in 2005-03-13 17:36:01.000000000 +0100 -+++ mutt-1.5.9-ro/configure.in 2005-03-20 14:11:05.000000000 +0100 -@@ -777,6 +777,11 @@ +diff -urN mutt-1.5.10/config.h.in mutt-1.5.10-ro/config.h.in +diff -urN mutt-1.5.10/configure mutt-1.5.10-ro/configure +diff -urN mutt-1.5.10/configure.in mutt-1.5.10-ro/configure.in +--- mutt-1.5.10/configure.in 2005-08-11 23:49:24.000000000 +0200 ++++ mutt-1.5.10-ro/configure.in 2005-08-14 12:10:21.000000000 +0200 +@@ -753,6 +753,11 @@ AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -556,10 +555,10 @@ diff -urN mutt-1.5.9/configure.in mutt-1.5.9-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.9/curs_main.c mutt-1.5.9-ro/curs_main.c ---- mutt-1.5.9/curs_main.c 2005-02-28 19:36:35.000000000 +0100 -+++ mutt-1.5.9-ro/curs_main.c 2005-03-20 14:06:20.000000000 +0100 -@@ -1076,6 +1076,11 @@ +diff -urN mutt-1.5.10/curs_main.c mutt-1.5.10-ro/curs_main.c +--- mutt-1.5.10/curs_main.c 2005-08-11 21:37:01.000000000 +0200 ++++ mutt-1.5.10-ro/curs_main.c 2005-08-14 12:10:21.000000000 +0200 +@@ -1087,6 +1087,11 @@ { int check; @@ -571,14 +570,14 @@ diff -urN mutt-1.5.9/curs_main.c mutt-1.5.9-ro/curs_main.c mutt_str_replace (&LastFolder, Context->path); oldcount = Context ? Context->msgcount : 0; -diff -urN mutt-1.5.9/doc/manual-4.html mutt-1.5.9-ro/doc/manual-4.html -diff -urN mutt-1.5.9/doc/manual-6.html mutt-1.5.9-ro/doc/manual-6.html -diff -urN mutt-1.5.9/doc/manual.html mutt-1.5.9-ro/doc/manual.html -diff -urN mutt-1.5.9/doc/manual.sgml mutt-1.5.9-ro/doc/manual.sgml -diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head ---- mutt-1.5.9/doc/manual.sgml.head 2005-02-19 14:49:49.000000000 +0100 -+++ mutt-1.5.9-ro/doc/manual.sgml.head 2005-03-20 14:06:20.000000000 +0100 -@@ -2539,6 +2539,176 @@ +diff -urN mutt-1.5.10/doc/manual-4.html mutt-1.5.10-ro/doc/manual-4.html +diff -urN mutt-1.5.10/doc/manual-6.html mutt-1.5.10-ro/doc/manual-6.html +diff -urN mutt-1.5.10/doc/manual.html mutt-1.5.10-ro/doc/manual.html +diff -urN mutt-1.5.10/doc/manual.sgml mutt-1.5.10-ro/doc/manual.sgml +diff -urN mutt-1.5.10/doc/manual.sgml.head mutt-1.5.10-ro/doc/manual.sgml.head +--- mutt-1.5.10/doc/manual.sgml.head 2005-08-11 21:37:02.000000000 +0200 ++++ mutt-1.5.10-ro/doc/manual.sgml.head 2005-08-14 12:10:21.000000000 +0200 +@@ -2576,6 +2576,176 @@ macro pager \cb |urlview\n @@ -755,7 +754,7 @@ diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head Mutt's MIME Support

Quite a bit of effort has been made to make Mutt the premier text-mode -@@ -3118,6 +3288,8 @@ +@@ -3156,6 +3326,8 @@ @@ -764,7 +763,7 @@ diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head @@ -773,7 +772,7 @@ diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head @@ -782,11 +781,11 @@ diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head #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 +922,10 @@ diff -urN mutt-1.5.9/mbox.c mutt-1.5.9-ro/mbox.c mutt_unblock_signals (); mx_fastclose_mailbox (ctx); return 0; -diff -urN mutt-1.5.9/mutt.h mutt-1.5.9-ro/mutt.h ---- mutt-1.5.9/mutt.h 2005-02-28 16:13:57.000000000 +0100 -+++ mutt-1.5.9-ro/mutt.h 2005-03-20 14:06:20.000000000 +0100 -@@ -159,6 +159,11 @@ +diff -urN mutt-1.5.10/mutt.h mutt-1.5.10-ro/mutt.h +--- mutt-1.5.10/mutt.h 2005-08-11 21:37:23.000000000 +0200 ++++ mutt-1.5.10-ro/mutt.h 2005-08-14 12:10:21.000000000 +0200 +@@ -161,6 +161,11 @@ #define M_ACCOUNTHOOK (1<<9) #define M_REPLYHOOK (1<<10) #define M_SEND2HOOK (1<<11) @@ -938,7 +937,7 @@ diff -urN mutt-1.5.9/mutt.h mutt-1.5.9-ro/mutt.h /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -824,6 +829,11 @@ +@@ -829,6 +834,11 @@ void *data; /* driver specific data */ #endif /* USE_IMAP */ @@ -950,12 +949,12 @@ diff -urN mutt-1.5.9/mutt.h mutt-1.5.9-ro/mutt.h short magic; /* mailbox type */ unsigned int locked : 1; /* is the mailbox locked? */ -diff -urN mutt-1.5.9/Muttrc mutt-1.5.9-ro/Muttrc -diff -urN mutt-1.5.9/Muttrc.head mutt-1.5.9-ro/Muttrc.head -diff -urN mutt-1.5.9/Muttrc.head.in mutt-1.5.9-ro/Muttrc.head.in -diff -urN mutt-1.5.9/mx.c mutt-1.5.9-ro/mx.c ---- mutt-1.5.9/mx.c 2005-02-03 19:47:53.000000000 +0100 -+++ mutt-1.5.9-ro/mx.c 2005-03-20 14:06:20.000000000 +0100 +diff -urN mutt-1.5.10/Muttrc mutt-1.5.10-ro/Muttrc +diff -urN mutt-1.5.10/Muttrc.head mutt-1.5.10-ro/Muttrc.head +diff -urN mutt-1.5.10/Muttrc.head.in mutt-1.5.10-ro/Muttrc.head.in +diff -urN mutt-1.5.10/mx.c mutt-1.5.10-ro/mx.c +--- mutt-1.5.10/mx.c 2005-08-02 09:08:01.000000000 +0200 ++++ mutt-1.5.10-ro/mx.c 2005-08-14 12:10:21.000000000 +0200 @@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -1042,7 +1041,7 @@ diff -urN mutt-1.5.9/mx.c mutt-1.5.9-ro/mx.c mx_fastclose_mailbox (ctx); return 0; -@@ -1325,6 +1360,11 @@ +@@ -1330,6 +1365,11 @@ { int rc; @@ -1054,9 +1053,9 @@ diff -urN mutt-1.5.9/mx.c mutt-1.5.9-ro/mx.c if (ctx) { if (ctx->locked) lock = 0; -diff -urN mutt-1.5.9/mx.h mutt-1.5.9-ro/mx.h ---- mutt-1.5.9/mx.h 2003-08-05 15:58:16.000000000 +0200 -+++ mutt-1.5.9-ro/mx.h 2005-03-20 14:06:20.000000000 +0100 +diff -urN mutt-1.5.10/mx.h mutt-1.5.10-ro/mx.h +--- mutt-1.5.10/mx.h 2003-08-05 15:58:16.000000000 +0200 ++++ mutt-1.5.10-ro/mx.h 2005-08-14 12:10:21.000000000 +0200 @@ -40,6 +40,9 @@ #ifdef USE_POP , M_POP @@ -1067,17 +1066,17 @@ diff -urN mutt-1.5.9/mx.h mutt-1.5.9-ro/mx.h }; WHERE short DefaultMagic INITVAL (M_MBOX); -diff -urN mutt-1.5.9/PATCHES mutt-1.5.9-ro/PATCHES ---- mutt-1.5.9/PATCHES 2005-03-13 17:33:06.000000000 +0100 -+++ mutt-1.5.9-ro/PATCHES 2005-03-20 17:59:28.000000000 +0100 +diff -urN mutt-1.5.10/PATCHES mutt-1.5.10-ro/PATCHES +--- mutt-1.5.10/PATCHES 2005-08-11 23:27:30.000000000 +0200 ++++ mutt-1.5.10-ro/PATCHES 2005-08-14 12:10:35.000000000 +0200 @@ -0,0 +1 @@ -+patch-1.5.9.rr.compressed.1 -diff -urN mutt-1.5.9/po/de.po mutt-1.5.9-ro/po/de.po ---- mutt-1.5.9/po/de.po 2005-03-13 17:38:22.000000000 +0100 -+++ mutt-1.5.9-ro/po/de.po 2005-03-20 14:06:20.000000000 +0100 -@@ -715,6 +715,48 @@ - msgid "PGP already selected. Clear & continue ? " - msgstr "PGP bereits ausgewählt. Löschen und weiter?" ++patch-1.5.10.rr.compressed.1 +diff -urN mutt-1.5.10/po/de.po mutt-1.5.10-ro/po/de.po +--- mutt-1.5.10/po/de.po 2005-08-11 23:50:35.000000000 +0200 ++++ mutt-1.5.10-ro/po/de.po 2005-08-14 12:12:20.000000000 +0200 +@@ -1281,6 +1281,48 @@ + msgid "Failed to figure out sender" + msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu untersuchen." +#: compress.c:203 mbox.c:661 +msgid "Mailbox was corrupted!" @@ -1124,7 +1123,7 @@ diff -urN mutt-1.5.9/po/de.po mutt-1.5.9-ro/po/de.po #: crypt.c:69 #, c-format msgid " (current time: %c)" -@@ -1305,6 +1347,10 @@ +@@ -1901,6 +1943,10 @@ msgid "Help for %s" msgstr "Hilfe für %s" @@ -1135,7 +1134,7 @@ diff -urN mutt-1.5.9/po/de.po mutt-1.5.9-ro/po/de.po #: hook.c:246 #, c-format msgid "unhook: Can't do unhook * from within a hook." -@@ -2737,18 +2783,10 @@ +@@ -3383,18 +3429,10 @@ msgid "Mailbox is corrupt!" msgstr "Mailbox fehlerhaft!" @@ -1143,31 +1142,31 @@ diff -urN mutt-1.5.9/po/de.po mutt-1.5.9-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.9/po/POTFILES.in mutt-1.5.9-ro/po/POTFILES.in ---- mutt-1.5.9/po/POTFILES.in 2002-03-27 09:44:17.000000000 +0100 -+++ mutt-1.5.9-ro/po/POTFILES.in 2005-03-20 14:06:20.000000000 +0100 +diff -urN mutt-1.5.10/po/POTFILES.in mutt-1.5.10-ro/po/POTFILES.in +--- mutt-1.5.10/po/POTFILES.in 2005-08-03 11:17:47.000000000 +0200 ++++ mutt-1.5.10-ro/po/POTFILES.in 2005-08-14 12:13:18.000000000 +0200 @@ -8,6 +8,7 @@ color.c commands.c compose.c +compress.c + crypt-gpgme.c crypt.c - curs_lib.c - curs_main.c -diff -urN mutt-1.5.9/status.c mutt-1.5.9-ro/status.c ---- mutt-1.5.9/status.c 2005-02-03 19:47:53.000000000 +0100 -+++ mutt-1.5.9-ro/status.c 2005-03-20 14:06:20.000000000 +0100 + cryptglue.c +diff -urN mutt-1.5.10/status.c mutt-1.5.10-ro/status.c +--- mutt-1.5.10/status.c 2005-02-03 19:47:53.000000000 +0100 ++++ mutt-1.5.10-ro/status.c 2005-08-14 12:10:21.000000000 +0200 @@ -97,6 +97,14 @@ case 'f':