X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/92469c2db947a16e6290589c4b71809ee46eabc8..572cf368647e91a0c40a2ab8167a172bf09dad4b:/debian/patches/features/compressed-folders?ds=sidebyside diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders index 7c0268c..304d032 100644 --- a/debian/patches/features/compressed-folders +++ b/debian/patches/features/compressed-folders @@ -7,23 +7,16 @@ The home page for this patch is: http://www.spinnaker.de/mutt/compressed/ * Patch last synced with upstream: - - Date: 2005-09-29 - - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.11.rr.compressed.1.gz + - Date: 2007-06-14 + - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.16.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) - - adjust the init.h hunk to the presence of group & ungroup - - 2006-07-15: adjust Makefile.am and doc/manual.xml.head to mutt-1.5.12 - - 2006-08-16: adjust Makefile.am mutt-1.5.13 + - 2007-06-14 myon: remove hunks for Muttrc* == END PATCH -Index: compress.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ compress.c 2007-03-01 22:30:00.101678680 +0100 -@@ -0,0 +1,487 @@ +--- /dev/null ++++ b/compress.c +@@ -0,0 +1,499 @@ +/* + * Copyright (C) 1997 Alain Penders + * @@ -130,7 +123,19 @@ Index: compress.c + int magic; + + if (is_new (path)) -+ return (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0); ++ { ++ 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); ++ } + + magic = mx_get_magic (path); + @@ -184,10 +189,10 @@ Index: 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]; + @@ -218,8 +223,8 @@ Index: 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); +} + @@ -245,7 +250,7 @@ Index: 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) @@ -290,7 +295,7 @@ Index: 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); @@ -511,10 +516,8 @@ Index: compress.c +} + +#endif /* USE_COMPRESSED */ -Index: compress.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ compress.h 2007-03-01 22:30:00.101678680 +0100 +--- /dev/null ++++ b/compress.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -543,11 +546,9 @@ Index: compress.h +int mutt_test_compress_command (const char *); +int mutt_check_mailbox_compressed (CONTEXT *); +void mutt_fast_close_compressed (CONTEXT *); -Index: configure.in -=================================================================== ---- configure.in.orig 2007-03-01 22:20:42.248485256 +0100 -+++ configure.in 2007-03-01 22:30:00.102678528 +0100 -@@ -808,6 +808,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN +--- a/configure.ac ++++ b/configure.ac +@@ -791,6 +791,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -559,11 +560,9 @@ Index: 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: curs_main.c -=================================================================== ---- curs_main.c.orig 2007-03-01 22:08:47.806097008 +0100 -+++ curs_main.c 2007-03-01 22:30:00.102678528 +0100 -@@ -1090,6 +1090,11 @@ int mutt_index_menu (void) +--- a/curs_main.c ++++ b/curs_main.c +@@ -1131,6 +1131,11 @@ int mutt_index_menu (void) { int check; @@ -575,13 +574,11 @@ Index: curs_main.c mutt_str_replace (&LastFolder, Context->path); oldcount = Context ? Context->msgcount : 0; -Index: doc/manual.xml.head -=================================================================== ---- doc/manual.xml.head.orig 2007-03-01 22:08:47.852090016 +0100 -+++ doc/manual.xml.head 2007-03-01 22:30:00.106677920 +0100 -@@ -4749,6 +4749,205 @@ becomes an issue as mutt will silently f +--- a/doc/manual.xml.head ++++ b/doc/manual.xml.head +@@ -5010,6 +5010,205 @@ becomes an issue as mutt will silently f - + + +Compressed folders Support (OPTIONAL) @@ -782,14 +779,12 @@ Index: doc/manual.xml.head + + + - - -Index: doc/muttrc.man.head -=================================================================== ---- doc/muttrc.man.head.orig 2007-03-01 22:08:47.900082720 +0100 -+++ doc/muttrc.man.head 2007-03-01 22:30:00.106677920 +0100 -@@ -316,6 +316,24 @@ specify the ID of the public key to be u + Mutt's MIME Support + +--- 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. @@ -814,10 +809,8 @@ Index: doc/muttrc.man.head .TP \fBpush\fP \fIstring\fP This command adds the named \fIstring\fP to the keyboard buffer. -Index: hook.c -=================================================================== ---- hook.c.orig 2007-03-01 22:08:47.947075576 +0100 -+++ hook.c 2007-03-01 22:30:00.107677768 +0100 +--- a/hook.c ++++ b/hook.c @@ -24,6 +24,10 @@ #include "mailbox.h" #include "mutt_crypt.h" @@ -838,35 +831,31 @@ Index: 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); + } + } +#endif - else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK)) + else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK)) && (!WithCrypto || !(data & M_CRYPTHOOK)) ) -Index: init.h -=================================================================== ---- init.h.orig 2007-03-01 22:20:35.279544696 +0100 -+++ init.h 2007-03-01 22:30:00.108677616 +0100 -@@ -3155,6 +3155,11 @@ struct command_t Commands[] = { +--- a/init.h ++++ b/init.h +@@ -3193,6 +3193,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 }, - { "group", parse_group, 0 }, - { "ungroup", parse_ungroup, 0 }, +#ifdef USE_COMPRESSED + { "open-hook", mutt_parse_hook, M_OPENHOOK }, + { "close-hook", mutt_parse_hook, M_CLOSEHOOK }, + { "append-hook", mutt_parse_hook, M_APPENDHOOK }, +#endif + { "group", parse_group, 0 }, + { "ungroup", parse_ungroup, 0 }, { "hdr_order", parse_list, UL &HeaderOrderList }, - #ifdef HAVE_ICONV - { "iconv-hook", mutt_parse_hook, M_ICONVHOOK }, -Index: main.c -=================================================================== ---- main.c.orig 2007-03-01 22:20:46.386856128 +0100 -+++ main.c 2007-03-01 22:30:00.108677616 +0100 -@@ -404,6 +404,12 @@ static void show_version (void) +--- a/main.c ++++ b/main.c +@@ -401,6 +401,12 @@ static void show_version (void) #else "-LOCALES_HACK " #endif @@ -879,10 +868,8 @@ Index: main.c #ifdef HAVE_WC_FUNCS "+HAVE_WC_FUNCS " -Index: Makefile.am -=================================================================== ---- Makefile.am.orig 2007-03-01 22:20:46.454845792 +0100 -+++ Makefile.am 2007-03-01 22:30:00.108677616 +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) \ @@ -892,7 +879,7 @@ Index: Makefile.am 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 \ -@@ -67,7 +67,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mu +@@ -66,7 +66,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 \ @@ -901,10 +888,8 @@ Index: 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: mbox.c -=================================================================== ---- mbox.c.orig 2007-03-01 22:08:48.131047608 +0100 -+++ mbox.c 2007-03-01 22:30:00.109677464 +0100 +--- a/mbox.c ++++ b/mbox.c @@ -29,6 +29,10 @@ #include "copy.h" #include "mutt_curses.h" @@ -929,11 +914,9 @@ Index: mbox.c mutt_unblock_signals (); mx_fastclose_mailbox (ctx); return 0; -Index: mutt.h -=================================================================== ---- mutt.h.orig 2007-03-01 22:20:43.625275952 +0100 -+++ mutt.h 2007-03-01 22:30:00.109677464 +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) @@ -945,9 +928,9 @@ Index: 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 */ +@@ -891,6 +896,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 */ @@ -957,10 +940,8 @@ Index: mutt.h short magic; /* mailbox type */ unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */ -Index: mx.c -=================================================================== ---- mx.c.orig 2007-03-01 22:08:48.223033624 +0100 -+++ mx.c 2007-03-01 22:30:00.110677312 +0100 +--- a/mx.c ++++ b/mx.c @@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -972,7 +953,7 @@ Index: 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); } @@ -983,7 +964,7 @@ Index: mx.c return (magic); } -@@ -493,6 +501,13 @@ static int mx_open_mailbox_append (CONTE +@@ -484,6 +492,13 @@ static int mx_open_mailbox_append (CONTE { struct stat sb; @@ -997,7 +978,7 @@ Index: mx.c ctx->append = 1; #ifdef USE_IMAP -@@ -656,7 +671,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); @@ -1011,7 +992,7 @@ Index: mx.c if(ctx->magic == 0) mutt_error (_("%s is not a mailbox."), path); -@@ -762,6 +782,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); @@ -1022,10 +1003,10 @@ Index: mx.c FREE (&ctx->path); FREE (&ctx->pattern); if (ctx->limit_pattern) -@@ -819,6 +843,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) @@ -1035,7 +1016,7 @@ Index: mx.c return rc; } -@@ -1020,6 +1050,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); @@ -1047,7 +1028,7 @@ Index: mx.c mx_fastclose_mailbox (ctx); return 0; -@@ -1329,6 +1364,11 @@ int mx_check_mailbox (CONTEXT *ctx, int +@@ -1373,6 +1408,11 @@ int mx_check_mailbox (CONTEXT *ctx, int { int rc; @@ -1059,10 +1040,8 @@ Index: mx.c if (ctx) { if (ctx->locked) lock = 0; -Index: mx.h -=================================================================== ---- mx.h.orig 2007-03-01 22:08:48.272026176 +0100 -+++ mx.h 2007-03-01 22:30:00.110677312 +0100 +--- a/mx.h ++++ b/mx.h @@ -40,6 +40,9 @@ enum #ifdef USE_POP , M_POP @@ -1073,17 +1052,18 @@ Index: mx.h }; WHERE short DefaultMagic INITVAL (M_MBOX); -Index: PATCHES -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ PATCHES 2007-03-01 22:30:00.110677312 +0100 -@@ -0,0 +1 @@ -+patch-1.5.11.rr.compressed.1 -Index: po/de.po -=================================================================== ---- po/de.po.orig 2007-03-01 22:21:09.228383688 +0100 -+++ po/de.po 2007-03-01 22:30:00.112677008 +0100 -@@ -1266,6 +1266,48 @@ msgstr "Prüfung des Absenders fehlgeschl +--- a/po/de.po ++++ b/po/de.po +@@ -3,7 +3,7 @@ msgstr "" + "Project-Id-Version: 1.5.16\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2007-06-09 20:30-0700\n" +-"PO-Revision-Date: 2007-06-10 17:18+0200\n" ++"PO-Revision-Date: 2007-09-08 22:04+0200\n" + "Last-Translator: Roland Rosenfeld \n" + "Language-Team: German \n" + "MIME-Version: 1.0\n" +@@ -1279,6 +1279,48 @@ msgstr "Prüfung des Absenders fehlgeschl msgid "Failed to figure out sender" msgstr "Kann Absender nicht ermitteln" @@ -1132,18 +1112,18 @@ Index: 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" +@@ -1948,6 +1990,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..." +@@ -3452,18 +3498,10 @@ msgstr "Lese %s..." msgid "Mailbox is corrupt!" msgstr "Mailbox fehlerhaft!" @@ -1162,10 +1142,8 @@ Index: po/de.po #. 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: po/POTFILES.in -=================================================================== ---- po/POTFILES.in.orig 2007-03-01 22:20:56.152371544 +0100 -+++ po/POTFILES.in 2007-03-01 22:30:00.112677008 +0100 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in @@ -8,6 +8,7 @@ charset.c color.c commands.c @@ -1174,11 +1152,9 @@ Index: po/POTFILES.in crypt-gpgme.c crypt.c cryptglue.c -Index: status.c -=================================================================== ---- status.c.orig 2007-03-01 22:08:48.458997752 +0100 -+++ status.c 2007-03-01 22:30:00.113676856 +0100 -@@ -97,6 +97,14 @@ status_format_str (char *buf, size_t buf +--- a/status.c ++++ b/status.c +@@ -99,6 +99,14 @@ status_format_str (char *buf, size_t buf case 'f': snprintf (fmt, sizeof(fmt), "%%%ss", prefix); @@ -1193,3 +1169,7 @@ Index: status.c if (Context && Context->path) { strfcpy (tmp, Context->path, sizeof (tmp)); +--- a/PATCHES ++++ b/PATCHES +@@ -0,0 +1 @@ ++patch-1.5.16.rr.compressed.1