X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/0f1a08eb5b6fe56944418dc42fbaa104052579f2..3bd1181b4032837400f724a4fb3a70bcea1285de:/debian/patches/features/compressed-folders diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders index cae3fb3..6dd7a6d 100644 --- a/debian/patches/features/compressed-folders +++ b/debian/patches/features/compressed-folders @@ -7,21 +7,17 @@ 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: 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) - - 2007-03-13 myon: update for 1.5.14+tip (conflict in hook.c) - - 2007-03-20 myon: conflict in mx.c resolved (BUFFY_SIZE is gone) + - 2007-06-14 myon: remove hunks for Muttrc* == END PATCH Index: debian-mutt/compress.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ debian-mutt/compress.c 2007-03-21 21:28:21.000000000 +0100 ++++ debian-mutt/compress.c 2007-06-14 10:57:02.000000000 +0200 @@ -0,0 +1,499 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -195,10 +191,10 @@ Index: debian-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]; + @@ -229,8 +225,8 @@ Index: debian-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); +} + @@ -256,7 +252,7 @@ Index: debian-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) @@ -301,7 +297,7 @@ Index: debian-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); @@ -525,7 +521,7 @@ Index: debian-mutt/compress.c Index: debian-mutt/compress.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ debian-mutt/compress.h 2007-03-21 21:28:21.000000000 +0100 ++++ debian-mutt/compress.h 2007-06-14 10:57:02.000000000 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -554,11 +550,55 @@ Index: debian-mutt/compress.h +int mutt_test_compress_command (const char *); +int mutt_check_mailbox_compressed (CONTEXT *); +void mutt_fast_close_compressed (CONTEXT *); +Index: debian-mutt/config.h.in +=================================================================== +--- debian-mutt.orig/config.h.in 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/config.h.in 2007-06-14 10:57:02.000000000 +0200 +@@ -513,6 +513,9 @@ + /* Define to enable Sun mailtool attachments support. */ + #undef SUN_ATTACHMENT + ++/* Define to enable compressed mailboxes support */ ++#undef USE_COMPRESSED ++ + /* Define to use dotlocking for mailboxes. */ + #undef USE_DOTLOCK + +Index: debian-mutt/configure +=================================================================== +--- debian-mutt.orig/configure 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/configure 2007-06-14 10:57:02.000000000 +0200 +@@ -1371,6 +1371,7 @@ Optional Features: + --enable-hcache Enable header caching + --disable-iconv Disable iconv support + --disable-nls Do not use Native Language Support ++ --enable-compressed Enable compressed folders support + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -15105,6 +15106,17 @@ _ACEOF + 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 ++#define USE_COMPRESSED 1 ++_ACEOF ++ ++ fi ++fi ++ + + # Check whether --with-exec-shell was given. + if test "${with_exec_shell+set}" = set; then Index: debian-mutt/configure.ac =================================================================== ---- debian-mutt.orig/configure.ac 2007-03-21 21:25:18.000000000 +0100 -+++ debian-mutt/configure.ac 2007-03-21 21:28:21.000000000 +0100 -@@ -803,6 +803,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN +--- debian-mutt.orig/configure.ac 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/configure.ac 2007-06-14 10:57:02.000000000 +0200 +@@ -785,6 +785,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -572,9 +612,9 @@ Index: debian-mutt/configure.ac AC_DEFINE_UNQUOTED(EXECSHELL, "$withval", Index: debian-mutt/curs_main.c =================================================================== ---- debian-mutt.orig/curs_main.c 2007-03-20 22:52:50.000000000 +0100 -+++ debian-mutt/curs_main.c 2007-03-21 21:28:21.000000000 +0100 -@@ -1090,6 +1090,11 @@ int mutt_index_menu (void) +--- debian-mutt.orig/curs_main.c 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/curs_main.c 2007-06-14 10:57:02.000000000 +0200 +@@ -1111,6 +1111,11 @@ int mutt_index_menu (void) { int check; @@ -588,8 +628,8 @@ Index: debian-mutt/curs_main.c Index: debian-mutt/doc/manual.xml.head =================================================================== ---- debian-mutt.orig/doc/manual.xml.head 2007-03-20 22:31:20.000000000 +0100 -+++ debian-mutt/doc/manual.xml.head 2007-03-21 21:28:21.000000000 +0100 +--- debian-mutt.orig/doc/manual.xml.head 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/doc/manual.xml.head 2007-06-14 10:57:02.000000000 +0200 @@ -4910,6 +4910,205 @@ becomes an issue as mutt will silently f @@ -798,8 +838,8 @@ Index: debian-mutt/doc/manual.xml.head Index: debian-mutt/doc/muttrc.man.head =================================================================== ---- debian-mutt.orig/doc/muttrc.man.head 2007-03-20 22:31:20.000000000 +0100 -+++ debian-mutt/doc/muttrc.man.head 2007-03-21 21:28:21.000000000 +0100 +--- debian-mutt.orig/doc/muttrc.man.head 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/doc/muttrc.man.head 2007-06-14 10:57:02.000000000 +0200 @@ -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, @@ -827,8 +867,8 @@ Index: debian-mutt/doc/muttrc.man.head This command adds the named \fIstring\fP to the keyboard buffer. Index: debian-mutt/hook.c =================================================================== ---- debian-mutt.orig/hook.c 2007-03-20 22:31:20.000000000 +0100 -+++ debian-mutt/hook.c 2007-03-21 21:28:21.000000000 +0100 +--- debian-mutt.orig/hook.c 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/hook.c 2007-06-14 10:57:02.000000000 +0200 @@ -24,6 +24,10 @@ #include "mailbox.h" #include "mutt_crypt.h" @@ -849,7 +889,7 @@ Index: debian-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); + } + } @@ -859,9 +899,9 @@ Index: debian-mutt/hook.c ) Index: debian-mutt/init.h =================================================================== ---- debian-mutt.orig/init.h 2007-03-21 21:26:23.000000000 +0100 -+++ debian-mutt/init.h 2007-03-21 21:28:21.000000000 +0100 -@@ -3115,6 +3115,11 @@ struct command_t Commands[] = { +--- debian-mutt.orig/init.h 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/init.h 2007-06-14 10:57:02.000000000 +0200 +@@ -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 }, @@ -875,9 +915,9 @@ Index: debian-mutt/init.h { "hdr_order", parse_list, UL &HeaderOrderList }, Index: debian-mutt/main.c =================================================================== ---- debian-mutt.orig/main.c 2007-03-20 22:52:50.000000000 +0100 -+++ debian-mutt/main.c 2007-03-21 21:28:21.000000000 +0100 -@@ -400,6 +400,12 @@ static void show_version (void) +--- debian-mutt.orig/main.c 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/main.c 2007-06-14 10:57:02.000000000 +0200 +@@ -401,6 +401,12 @@ static void show_version (void) #else "-LOCALES_HACK " #endif @@ -892,8 +932,8 @@ Index: debian-mutt/main.c "+HAVE_WC_FUNCS " Index: debian-mutt/Makefile.am =================================================================== ---- debian-mutt.orig/Makefile.am 2007-03-21 21:25:18.000000000 +0100 -+++ debian-mutt/Makefile.am 2007-03-21 21:28:21.000000000 +0100 +--- debian-mutt.orig/Makefile.am 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/Makefile.am 2007-06-14 10:57:02.000000000 +0200 @@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist. bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ mutt_SOURCES = $(BUILT_SOURCES) \ @@ -912,10 +952,49 @@ Index: debian-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: debian-mutt/Makefile.in +=================================================================== +--- debian-mutt.orig/Makefile.in 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/Makefile.in 2007-06-14 10:57:02.000000000 +0200 +@@ -74,7 +74,7 @@ am_mutt_OBJECTS = $(am__objects_1) addrb + 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) \ +@@ -302,7 +302,7 @@ bin_SCRIPTS = muttbug flea @SMIMEAUX_TAR + 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 \ +@@ -335,7 +335,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mu + 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 \ +@@ -507,6 +507,7 @@ distclean-compile: + @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@ Index: debian-mutt/mbox.c =================================================================== ---- debian-mutt.orig/mbox.c 2007-03-20 22:31:20.000000000 +0100 -+++ debian-mutt/mbox.c 2007-03-21 21:28:21.000000000 +0100 +--- debian-mutt.orig/mbox.c 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/mbox.c 2007-06-14 10:57:02.000000000 +0200 @@ -29,6 +29,10 @@ #include "copy.h" #include "mutt_curses.h" @@ -942,8 +1021,8 @@ Index: debian-mutt/mbox.c return 0; Index: debian-mutt/mutt.h =================================================================== ---- debian-mutt.orig/mutt.h 2007-03-20 22:52:50.000000000 +0100 -+++ debian-mutt/mutt.h 2007-03-21 21:28:21.000000000 +0100 +--- debian-mutt.orig/mutt.h 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/mutt.h 2007-06-14 10:57:02.000000000 +0200 @@ -160,6 +160,11 @@ typedef enum #define M_ACCOUNTHOOK (1<<9) #define M_REPLYHOOK (1<<10) @@ -956,9 +1035,9 @@ Index: debian-mutt/mutt.h /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -886,6 +891,11 @@ typedef struct - void *data; /* driver specific data */ - #endif /* USE_IMAP */ +@@ -885,6 +890,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 */ @@ -970,8 +1049,8 @@ Index: debian-mutt/mutt.h unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */ Index: debian-mutt/mx.c =================================================================== ---- debian-mutt.orig/mx.c 2007-03-21 21:25:18.000000000 +0100 -+++ debian-mutt/mx.c 2007-03-21 21:29:55.000000000 +0100 +--- debian-mutt.orig/mx.c 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/mx.c 2007-06-14 10:57:02.000000000 +0200 @@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -1022,7 +1101,7 @@ Index: debian-mutt/mx.c if(ctx->magic == 0) mutt_error (_("%s is not a mailbox."), path); -@@ -758,6 +778,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx) +@@ -753,6 +773,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx) mutt_free_header (&ctx->hdrs[i]); FREE (&ctx->hdrs); FREE (&ctx->v2r); @@ -1033,7 +1112,7 @@ Index: debian-mutt/mx.c FREE (&ctx->path); FREE (&ctx->pattern); if (ctx->limit_pattern) -@@ -810,6 +834,12 @@ static int sync_mailbox (CONTEXT *ctx, i +@@ -805,6 +829,12 @@ static int sync_mailbox (CONTEXT *ctx, i if (tmp && tmp->new == 0) mutt_update_mailbox (tmp); @@ -1046,7 +1125,7 @@ Index: debian-mutt/mx.c return rc; } -@@ -1011,6 +1041,11 @@ int mx_close_mailbox (CONTEXT *ctx, int +@@ -1006,6 +1036,11 @@ int mx_close_mailbox (CONTEXT *ctx, int !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY)) mx_unlink_empty (ctx->path); @@ -1058,7 +1137,7 @@ Index: debian-mutt/mx.c mx_fastclose_mailbox (ctx); return 0; -@@ -1320,6 +1355,11 @@ int mx_check_mailbox (CONTEXT *ctx, int +@@ -1315,6 +1350,11 @@ int mx_check_mailbox (CONTEXT *ctx, int { int rc; @@ -1072,8 +1151,8 @@ Index: debian-mutt/mx.c if (ctx->locked) lock = 0; Index: debian-mutt/mx.h =================================================================== ---- debian-mutt.orig/mx.h 2007-03-20 22:31:20.000000000 +0100 -+++ debian-mutt/mx.h 2007-03-21 21:28:21.000000000 +0100 +--- debian-mutt.orig/mx.h 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/mx.h 2007-06-14 10:57:02.000000000 +0200 @@ -40,6 +40,9 @@ enum #ifdef USE_POP , M_POP @@ -1087,14 +1166,14 @@ Index: debian-mutt/mx.h Index: debian-mutt/PATCHES =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ debian-mutt/PATCHES 2007-03-21 21:28:21.000000000 +0100 ++++ debian-mutt/PATCHES 2007-06-14 10:57:02.000000000 +0200 @@ -0,0 +1 @@ -+patch-1.5.14.rr.compressed.1 ++patch-1.5.16.rr.compressed.1 Index: debian-mutt/po/de.po =================================================================== ---- debian-mutt.orig/po/de.po 2007-03-20 22:31:20.000000000 +0100 -+++ debian-mutt/po/de.po 2007-03-21 21:28:21.000000000 +0100 -@@ -1266,6 +1266,48 @@ msgstr "Prüfung des Absenders fehlgeschl +--- debian-mutt.orig/po/de.po 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/po/de.po 2007-06-14 10:57:02.000000000 +0200 +@@ -1279,6 +1279,48 @@ msgstr "Prüfung des Absenders fehlgeschl msgid "Failed to figure out sender" msgstr "Kann Absender nicht ermitteln" @@ -1143,18 +1222,18 @@ Index: debian-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" +@@ -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!" @@ -1175,8 +1254,8 @@ Index: debian-mutt/po/de.po #. * never happen, is we presume it is a bug in mutt. Index: debian-mutt/po/POTFILES.in =================================================================== ---- debian-mutt.orig/po/POTFILES.in 2007-03-20 22:31:20.000000000 +0100 -+++ debian-mutt/po/POTFILES.in 2007-03-21 21:28:21.000000000 +0100 +--- debian-mutt.orig/po/POTFILES.in 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/po/POTFILES.in 2007-06-14 10:57:02.000000000 +0200 @@ -8,6 +8,7 @@ charset.c color.c commands.c @@ -1187,9 +1266,9 @@ Index: debian-mutt/po/POTFILES.in cryptglue.c Index: debian-mutt/status.c =================================================================== ---- debian-mutt.orig/status.c 2007-03-20 22:31:20.000000000 +0100 -+++ debian-mutt/status.c 2007-03-21 21:28:21.000000000 +0100 -@@ -97,6 +97,14 @@ status_format_str (char *buf, size_t buf +--- debian-mutt.orig/status.c 2007-06-14 10:54:19.000000000 +0200 ++++ debian-mutt/status.c 2007-06-14 10:57:02.000000000 +0200 +@@ -99,6 +99,14 @@ status_format_str (char *buf, size_t buf case 'f': snprintf (fmt, sizeof(fmt), "%%%ss", prefix);