X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/2fc779d212449aded8db453cd8821255913412b5..4a515c415e71cab8683a5ead8bc4de3e66f64539:/debian/patches/features/compressed-folders?ds=inline diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders index 288ab6f..4605c43 100644 --- a/debian/patches/features/compressed-folders +++ b/debian/patches/features/compressed-folders @@ -7,20 +7,15 @@ The home page for this patch is: 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: - - 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 == 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 +--- /dev/null ++++ b/compress.c @@ -0,0 +1,499 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -194,10 +189,10 @@ Index: mutt/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, -+ 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]; + @@ -228,8 +223,8 @@ Index: mutt/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, -+ (unsigned long) ctx, 0); ++ mutt_FormatString (expanded, sizeof (expanded), 0, cmd, ++ compresshook_format_str, (unsigned long) ctx, 0); + return safe_strdup (expanded); +} + @@ -255,7 +250,7 @@ Index: mutt/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) @@ -300,7 +295,7 @@ Index: mutt/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); @@ -521,10 +516,8 @@ Index: mutt/compress.c +} + +#endif /* USE_COMPRESSED */ -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 +--- /dev/null ++++ b/compress.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -553,11 +546,9 @@ Index: mutt/compress.h +int mutt_test_compress_command (const char *); +int mutt_check_mailbox_compressed (CONTEXT *); +void mutt_fast_close_compressed (CONTEXT *); -Index: mutt/configure.in -=================================================================== ---- 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 +--- a/configure.ac ++++ b/configure.ac +@@ -787,6 +787,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -569,11 +560,9 @@ Index: mutt/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", -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) +--- a/curs_main.c ++++ b/curs_main.c +@@ -1132,6 +1132,11 @@ int mutt_index_menu (void) { int check; @@ -585,11 +574,9 @@ Index: mutt/curs_main.c mutt_str_replace (&LastFolder, Context->path); oldcount = Context ? Context->msgcount : 0; -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 +--- a/doc/manual.xml.head ++++ b/doc/manual.xml.head +@@ -4799,6 +4799,205 @@ macro pager \cb |urlview\n @@ -795,11 +782,37 @@ Index: mutt/doc/manual.xml.head Mutt's MIME Support -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 +--- a/doc/Muttrc ++++ b/doc/Muttrc +@@ -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. + # +--- a/doc/Muttrc.head ++++ b/doc/Muttrc.head +@@ -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. + # +--- a/doc/muttrc.man.head ++++ b/doc/muttrc.man.head +@@ -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. @@ -824,10 +837,8 @@ Index: mutt/doc/muttrc.man.head .TP \fBpush\fP \fIstring\fP 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 +--- a/hook.c ++++ b/hook.c @@ -24,6 +24,10 @@ #include "mailbox.h" #include "mutt_crypt.h" @@ -848,7 +859,7 @@ Index: mutt/hook.c + { + 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); + } + } @@ -856,11 +867,9 @@ Index: mutt/hook.c else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK)) && (!WithCrypto || !(data & M_CRYPTHOOK)) ) -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[] = { +--- a/init.h ++++ b/init.h +@@ -3272,6 +3272,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 }, @@ -872,11 +881,9 @@ Index: mutt/init.h { "group", parse_group, 0 }, { "ungroup", parse_ungroup, 0 }, { "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) +--- a/main.c ++++ b/main.c +@@ -403,6 +403,12 @@ static void show_version (void) #else "-LOCALES_HACK " #endif @@ -889,20 +896,18 @@ Index: mutt/main.c #ifdef HAVE_WC_FUNCS "+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 +--- a/Makefile.am ++++ b/Makefile.am @@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist. 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 \ -@@ -66,7 +66,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mu +@@ -57,7 +57,7 @@ EXTRA_mutt_SOURCES = account.c md5.c mut utf8.c wcwidth.c EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ @@ -911,10 +916,8 @@ Index: mutt/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 \ -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 +--- a/mbox.c ++++ b/mbox.c @@ -29,6 +29,10 @@ #include "copy.h" #include "mutt_curses.h" @@ -926,7 +929,7 @@ Index: mutt/mbox.c #include #include #include -@@ -1026,6 +1030,12 @@ bail: /* Come here in case of disaster +@@ -1037,6 +1041,12 @@ bail: /* Come here in case of disaster int mbox_close_mailbox (CONTEXT *ctx) { mx_unlock_file (ctx->path, fileno (ctx->fp), 1); @@ -939,11 +942,9 @@ Index: mutt/mbox.c mutt_unblock_signals (); mx_fastclose_mailbox (ctx); 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 +--- a/mutt.h ++++ b/mutt.h +@@ -160,6 +160,11 @@ typedef enum #define M_ACCOUNTHOOK (1<<9) #define M_REPLYHOOK (1<<10) #define M_SEND2HOOK (1<<11) @@ -955,9 +956,9 @@ Index: mutt/mutt.h /* 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 */ +@@ -892,6 +897,11 @@ typedef struct _context + 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 */ @@ -967,10 +968,8 @@ Index: mutt/mutt.h short magic; /* mailbox type */ 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 +--- a/mx.c ++++ b/mx.c @@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -982,7 +981,7 @@ Index: mutt/mx.c #ifdef USE_IMAP #include "imap.h" #endif -@@ -454,6 +458,10 @@ int mx_get_magic (const char *path) +@@ -445,6 +449,10 @@ int mx_get_magic (const char *path) return (-1); } @@ -993,9 +992,9 @@ Index: mutt/mx.c return (magic); } -@@ -494,6 +502,13 @@ static int mx_open_mailbox_append (CONTE +@@ -484,6 +492,13 @@ static int mx_open_mailbox_append (CONTE + { struct stat sb; - mode_t omask; +#ifdef USE_COMPRESSED + /* special case for appending to compressed folders - @@ -1007,7 +1006,7 @@ Index: mutt/mx.c ctx->append = 1; #ifdef USE_IMAP -@@ -664,7 +679,12 @@ CONTEXT *mx_open_mailbox (const char *pa +@@ -647,7 +662,12 @@ CONTEXT *mx_open_mailbox (const char *pa } ctx->magic = mx_get_magic (path); @@ -1021,7 +1020,7 @@ Index: mutt/mx.c if(ctx->magic == 0) mutt_error (_("%s is not a mailbox."), path); -@@ -770,6 +790,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx) +@@ -748,6 +768,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx) mutt_free_header (&ctx->hdrs[i]); FREE (&ctx->hdrs); FREE (&ctx->v2r); @@ -1032,10 +1031,10 @@ Index: mutt/mx.c FREE (&ctx->path); FREE (&ctx->pattern); if (ctx->limit_pattern) -@@ -827,6 +851,12 @@ static int sync_mailbox (CONTEXT *ctx, i +@@ -800,6 +824,12 @@ static int sync_mailbox (CONTEXT *ctx, i + if (tmp && tmp->new == 0) mutt_update_mailbox (tmp); - #endif + +#ifdef USE_COMPRESSED + if (rc == 0 && ctx->compressinfo) @@ -1045,7 +1044,7 @@ Index: mutt/mx.c return rc; } -@@ -1028,6 +1058,11 @@ int mx_close_mailbox (CONTEXT *ctx, int +@@ -1058,6 +1088,11 @@ int mx_close_mailbox (CONTEXT *ctx, int !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY)) mx_unlink_empty (ctx->path); @@ -1057,7 +1056,7 @@ Index: mutt/mx.c mx_fastclose_mailbox (ctx); return 0; -@@ -1342,6 +1377,11 @@ int mx_check_mailbox (CONTEXT *ctx, int +@@ -1373,6 +1408,11 @@ int mx_check_mailbox (CONTEXT *ctx, int { int rc; @@ -1069,10 +1068,8 @@ Index: mutt/mx.c if (ctx) { 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 +--- a/mx.h ++++ b/mx.h @@ -40,6 +40,9 @@ enum #ifdef USE_POP , M_POP @@ -1083,17 +1080,9 @@ Index: mutt/mx.h }; 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 -=================================================================== ---- 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 +--- a/po/de.po ++++ b/po/de.po +@@ -1289,6 +1289,48 @@ msgstr "Prüfung des Absenders fehlgeschl msgid "Failed to figure out sender" msgstr "Kann Absender nicht ermitteln" @@ -1142,40 +1131,38 @@ Index: mutt/po/de.po #: crypt.c:69 #, c-format msgid " (current time: %c)" -@@ -1926,6 +1968,10 @@ msgstr "" - msgid "Help for %s" - msgstr "Hilfe für %s" +@@ -1958,6 +2000,10 @@ msgstr "Hilfe für %s" + msgid "Bad history file format (line %d)" + msgstr "Falsches Format der Datei früherer Eingaben (Zeile %d)" +#: hook.c:96 -+msgid "bad formatted command string" ++msgid "badly formatted command string" +msgstr "Hook enthält nicht die Muster %f und %t" + - #: hook.c:246 + #: hook.c:251 #, c-format msgid "unhook: Can't do unhook * from within a hook." -@@ -3428,18 +3474,10 @@ msgstr "Lese %s..." +@@ -2687,18 +2733,10 @@ msgstr "Lese %s..." msgid "Mailbox is corrupt!" msgstr "Mailbox fehlerhaft!" --#: mbox.c:670 +-#: mbox.c:678 -msgid "Mailbox was corrupted!" -msgstr "Mailbox wurde zerstört!" - - #: mbox.c:711 mbox.c:964 + #: mbox.c:719 mbox.c:975 msgid "Fatal error! Could not reopen mailbox!" msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!" --#: mbox.c:720 +-#: mbox.c:728 -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 -=================================================================== ---- 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 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in @@ -8,6 +8,7 @@ charset.c color.c commands.c @@ -1184,11 +1171,9 @@ Index: mutt/po/POTFILES.in crypt-gpgme.c crypt.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 +--- a/status.c ++++ b/status.c +@@ -96,6 +96,14 @@ status_format_str (char *buf, size_t buf case 'f': snprintf (fmt, sizeof(fmt), "%%%ss", prefix);