X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/3bd1181b4032837400f724a4fb3a70bcea1285de..78077051deed41adf786e1f5f4397dadf3012956:/debian/patches/features/compressed-folders?ds=sidebyside diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders index 6dd7a6d..355d84b 100644 --- a/debian/patches/features/compressed-folders +++ b/debian/patches/features/compressed-folders @@ -14,10 +14,8 @@ The home page for this patch is: - 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-06-14 10:57:02.000000000 +0200 +--- /dev/null ++++ b/compress.c @@ -0,0 +1,499 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -518,10 +516,8 @@ Index: debian-mutt/compress.c +} + +#endif /* USE_COMPRESSED */ -Index: debian-mutt/compress.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ debian-mutt/compress.h 2007-06-14 10:57:02.000000000 +0200 +--- /dev/null ++++ b/compress.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -550,55 +546,9 @@ 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-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 +--- a/configure.ac ++++ b/configure.ac +@@ -804,6 +804,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -610,11 +560,9 @@ Index: debian-mutt/configure.ac 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: debian-mutt/curs_main.c -=================================================================== ---- 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) +--- a/curs_main.c ++++ b/curs_main.c +@@ -1116,6 +1116,11 @@ int mutt_index_menu (void) { int check; @@ -626,11 +574,9 @@ Index: debian-mutt/curs_main.c mutt_str_replace (&LastFolder, Context->path); oldcount = Context ? Context->msgcount : 0; -Index: debian-mutt/doc/manual.xml.head -=================================================================== ---- 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 +--- a/doc/manual.xml.head ++++ b/doc/manual.xml.head +@@ -4932,6 +4932,205 @@ becomes an issue as mutt will silently f @@ -836,10 +782,8 @@ Index: debian-mutt/doc/manual.xml.head Mutt's MIME Support -Index: debian-mutt/doc/muttrc.man.head -=================================================================== ---- 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 +--- 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, @@ -865,10 +809,8 @@ Index: debian-mutt/doc/muttrc.man.head .TP \fBpush\fP \fIstring\fP This command adds the named \fIstring\fP to the keyboard buffer. -Index: debian-mutt/hook.c -=================================================================== ---- 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 +--- a/hook.c ++++ b/hook.c @@ -24,6 +24,10 @@ #include "mailbox.h" #include "mutt_crypt.h" @@ -897,11 +839,9 @@ Index: debian-mutt/hook.c else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK)) && (!WithCrypto || !(data & M_CRYPTHOOK)) ) -Index: debian-mutt/init.h -=================================================================== ---- 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[] = { +--- a/init.h ++++ b/init.h +@@ -3172,6 +3172,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 }, @@ -913,11 +853,9 @@ Index: debian-mutt/init.h { "group", parse_group, 0 }, { "ungroup", parse_ungroup, 0 }, { "hdr_order", parse_list, UL &HeaderOrderList }, -Index: debian-mutt/main.c -=================================================================== ---- 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) +--- a/main.c ++++ b/main.c +@@ -400,6 +400,12 @@ static void show_version (void) #else "-LOCALES_HACK " #endif @@ -930,10 +868,8 @@ Index: debian-mutt/main.c #ifdef HAVE_WC_FUNCS "+HAVE_WC_FUNCS " -Index: debian-mutt/Makefile.am -=================================================================== ---- 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 +--- 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) \ @@ -952,49 +888,8 @@ 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-06-14 10:54:19.000000000 +0200 -+++ debian-mutt/mbox.c 2007-06-14 10:57:02.000000000 +0200 +--- a/mbox.c ++++ b/mbox.c @@ -29,6 +29,10 @@ #include "copy.h" #include "mutt_curses.h" @@ -1019,10 +914,8 @@ Index: debian-mutt/mbox.c mutt_unblock_signals (); mx_fastclose_mailbox (ctx); return 0; -Index: debian-mutt/mutt.h -=================================================================== ---- 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 +--- a/mutt.h ++++ b/mutt.h @@ -160,6 +160,11 @@ typedef enum #define M_ACCOUNTHOOK (1<<9) #define M_REPLYHOOK (1<<10) @@ -1035,7 +928,7 @@ Index: debian-mutt/mutt.h /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -885,6 +890,11 @@ typedef struct _context +@@ -889,6 +894,11 @@ typedef struct _context int flagged; /* how many flagged messages */ int msgnotreadyet; /* which msg "new" in pager, -1 if none */ @@ -1047,10 +940,8 @@ Index: debian-mutt/mutt.h short magic; /* mailbox type */ unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */ -Index: debian-mutt/mx.c -=================================================================== ---- 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 +--- a/mx.c ++++ b/mx.c @@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -1125,7 +1016,7 @@ Index: debian-mutt/mx.c return rc; } -@@ -1006,6 +1036,11 @@ int mx_close_mailbox (CONTEXT *ctx, int +@@ -1063,6 +1093,11 @@ int mx_close_mailbox (CONTEXT *ctx, int !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY)) mx_unlink_empty (ctx->path); @@ -1137,7 +1028,7 @@ Index: debian-mutt/mx.c mx_fastclose_mailbox (ctx); return 0; -@@ -1315,6 +1350,11 @@ int mx_check_mailbox (CONTEXT *ctx, int +@@ -1378,6 +1413,11 @@ int mx_check_mailbox (CONTEXT *ctx, int { int rc; @@ -1149,10 +1040,8 @@ Index: debian-mutt/mx.c if (ctx) { if (ctx->locked) lock = 0; -Index: debian-mutt/mx.h -=================================================================== ---- 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 +--- a/mx.h ++++ b/mx.h @@ -40,6 +40,9 @@ enum #ifdef USE_POP , M_POP @@ -1163,17 +1052,25 @@ Index: debian-mutt/mx.h }; WHERE short DefaultMagic INITVAL (M_MBOX); -Index: debian-mutt/PATCHES -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ debian-mutt/PATCHES 2007-06-14 10:57:02.000000000 +0200 -@@ -0,0 +1 @@ +--- a/PATCHES ++++ b/PATCHES +@@ -5,3 +5,4 @@ patch-1.5.13.nt+ab.xtitles.4 + patch-1.5.6.dw.maildir-mtime.1 + patch-1.5.13.cd.ifdef.2 + patch-1.5.8.hr.sensible_browser_position.3 +patch-1.5.16.rr.compressed.1 -Index: debian-mutt/po/de.po -=================================================================== ---- 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 +--- a/po/de.po ++++ b/po/de.po +@@ -3,7 +3,7 @@ msgstr "" + "Project-Id-Version: 1.5.14\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2007-02-23 09:18-0800\n" +-"PO-Revision-Date: 2007-02-25 12:33+0100\n" ++"PO-Revision-Date: 2007-09-08 20:55+0200\n" + "Last-Translator: Roland Rosenfeld \n" + "Language-Team: German \n" + "MIME-Version: 1.0\n" +@@ -1266,6 +1266,48 @@ msgstr "Prüfung des Absenders fehlgeschl msgid "Failed to figure out sender" msgstr "Kann Absender nicht ermitteln" @@ -1222,18 +1119,18 @@ Index: debian-mutt/po/de.po #: crypt.c:69 #, c-format msgid " (current time: %c)" -@@ -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)" +@@ -1926,6 +1968,10 @@ msgstr "" + msgid "Help for %s" + msgstr "Hilfe für %s" +#: hook.c:96 +msgid "badly formatted command string" +msgstr "Hook enthält nicht die Muster %f und %t" + - #: hook.c:251 + #: hook.c:246 #, c-format msgid "unhook: Can't do unhook * from within a hook." -@@ -3452,18 +3498,10 @@ msgstr "Lese %s..." +@@ -3428,18 +3474,10 @@ msgstr "Lese %s..." msgid "Mailbox is corrupt!" msgstr "Mailbox fehlerhaft!" @@ -1252,10 +1149,8 @@ Index: debian-mutt/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: debian-mutt/po/POTFILES.in -=================================================================== ---- 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 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in @@ -8,6 +8,7 @@ charset.c color.c commands.c @@ -1264,11 +1159,9 @@ Index: debian-mutt/po/POTFILES.in crypt-gpgme.c crypt.c cryptglue.c -Index: debian-mutt/status.c -=================================================================== ---- 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 +--- a/status.c ++++ b/status.c +@@ -97,6 +97,14 @@ status_format_str (char *buf, size_t buf case 'f': snprintf (fmt, sizeof(fmt), "%%%ss", prefix);