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-03-13
+ - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.14.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-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)
== END PATCH
-Index: compress.c
+Index: debian-mutt/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 @@
++++ debian-mutt/compress.c 2007-03-21 21:28:21.000000000 +0100
+@@ -0,0 +1,499 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
+ *
+ 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);
+
+}
+
+#endif /* USE_COMPRESSED */
-Index: compress.h
+Index: debian-mutt/compress.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compress.h 2007-03-01 22:30:00.101678680 +0100
++++ debian-mutt/compress.h 2007-03-21 21:28:21.000000000 +0100
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
+int mutt_test_compress_command (const char *);
+int mutt_check_mailbox_compressed (CONTEXT *);
+void mutt_fast_close_compressed (CONTEXT *);
-Index: configure.in
+Index: debian-mutt/configure.ac
===================================================================
---- 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
+--- 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
AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
fi])
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
+Index: debian-mutt/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
+--- 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)
{
int check;
mutt_str_replace (&LastFolder, Context->path);
oldcount = Context ? Context->msgcount : 0;
-Index: doc/manual.xml.head
+Index: debian-mutt/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
+--- 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
+@@ -4910,6 +4910,205 @@ becomes an issue as mutt will silently f
- </sect1>
+ </chapter>
+<sect1 id="compressedfolders">
+<title>Compressed folders Support (OPTIONAL)</title>
+</sect2>
+</sect1>
+
- </chapter>
-
<chapter id="mimesupport">
-Index: doc/muttrc.man.head
+ <title>Mutt's MIME Support</title>
+
+Index: debian-mutt/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
+--- 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
+@@ -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.
.TP
\fBpush\fP \fIstring\fP
This command adds the named \fIstring\fP to the keyboard buffer.
-Index: hook.c
+Index: debian-mutt/hook.c
===================================================================
---- hook.c.orig 2007-03-01 22:08:47.947075576 +0100
-+++ hook.c 2007-03-01 22:30:00.107677768 +0100
+--- 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
@@ -24,6 +24,10 @@
#include "mailbox.h"
#include "mutt_crypt.h"
+ }
+ }
+#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
+Index: debian-mutt/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[] = {
+--- 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[] = {
+ { "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
+Index: debian-mutt/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)
+--- 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)
#else
"-LOCALES_HACK "
#endif
#ifdef HAVE_WC_FUNCS
"+HAVE_WC_FUNCS "
-Index: Makefile.am
+Index: debian-mutt/Makefile.am
===================================================================
---- Makefile.am.orig 2007-03-01 22:20:46.454845792 +0100
-+++ Makefile.am 2007-03-01 22:30:00.108677616 +0100
+--- 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
@@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.
bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
mutt_SOURCES = $(BUILT_SOURCES) \
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 md5c.c mu
utf8.c wcwidth.c
EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
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
+Index: debian-mutt/mbox.c
===================================================================
---- mbox.c.orig 2007-03-01 22:08:48.131047608 +0100
-+++ mbox.c 2007-03-01 22:30:00.109677464 +0100
+--- 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
@@ -29,6 +29,10 @@
#include "copy.h"
#include "mutt_curses.h"
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
return 0;
-Index: mutt.h
+Index: debian-mutt/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
+--- 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
+@@ -160,6 +160,11 @@ typedef enum
#define M_ACCOUNTHOOK (1<<9)
#define M_REPLYHOOK (1<<10)
#define M_SEND2HOOK (1<<11)
/* tree characters for linearize_tree and print_enriched_string */
#define M_TREE_LLCORNER 1
-@@ -882,6 +887,11 @@ typedef struct
+@@ -886,6 +891,11 @@ typedef struct
void *data; /* driver specific data */
#endif /* USE_IMAP */
short magic; /* mailbox type */
unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */
-Index: mx.c
+Index: debian-mutt/mx.c
===================================================================
---- mx.c.orig 2007-03-01 22:08:48.223033624 +0100
-+++ mx.c 2007-03-01 22:30:00.110677312 +0100
+--- 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
@@ -30,6 +30,10 @@
#include "keymap.h"
#include "url.h"
#ifdef USE_IMAP
#include "imap.h"
#endif
-@@ -454,6 +458,10 @@ int mx_get_magic (const char *path)
+@@ -450,6 +454,10 @@ int mx_get_magic (const char *path)
return (-1);
}
return (magic);
}
-@@ -493,6 +501,13 @@ static int mx_open_mailbox_append (CONTE
+@@ -489,6 +497,13 @@ static int mx_open_mailbox_append (CONTE
{
struct stat sb;
ctx->append = 1;
#ifdef USE_IMAP
-@@ -656,7 +671,12 @@ CONTEXT *mx_open_mailbox (const char *pa
+@@ -652,7 +667,12 @@ CONTEXT *mx_open_mailbox (const char *pa
}
ctx->magic = mx_get_magic (path);
if(ctx->magic == 0)
mutt_error (_("%s is not a mailbox."), path);
-@@ -762,6 +782,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx)
+@@ -758,6 +778,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx)
mutt_free_header (&ctx->hdrs[i]);
FREE (&ctx->hdrs);
FREE (&ctx->v2r);
FREE (&ctx->path);
FREE (&ctx->pattern);
if (ctx->limit_pattern)
-@@ -819,6 +843,12 @@ static int sync_mailbox (CONTEXT *ctx, i
+@@ -810,6 +834,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)
return rc;
}
-@@ -1020,6 +1050,11 @@ int mx_close_mailbox (CONTEXT *ctx, int
+@@ -1011,6 +1041,11 @@ int mx_close_mailbox (CONTEXT *ctx, int
!mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY))
mx_unlink_empty (ctx->path);
mx_fastclose_mailbox (ctx);
return 0;
-@@ -1329,6 +1364,11 @@ int mx_check_mailbox (CONTEXT *ctx, int
+@@ -1320,6 +1355,11 @@ int mx_check_mailbox (CONTEXT *ctx, int
{
int rc;
if (ctx)
{
if (ctx->locked) lock = 0;
-Index: mx.h
+Index: debian-mutt/mx.h
===================================================================
---- mx.h.orig 2007-03-01 22:08:48.272026176 +0100
-+++ mx.h 2007-03-01 22:30:00.110677312 +0100
+--- 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
@@ -40,6 +40,9 @@ enum
#ifdef USE_POP
, M_POP
};
WHERE short DefaultMagic INITVAL (M_MBOX);
-Index: PATCHES
+Index: debian-mutt/PATCHES
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ PATCHES 2007-03-01 22:30:00.110677312 +0100
++++ debian-mutt/PATCHES 2007-03-21 21:28:21.000000000 +0100
@@ -0,0 +1 @@
-+patch-1.5.11.rr.compressed.1
-Index: po/de.po
++patch-1.5.14.rr.compressed.1
+Index: debian-mutt/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
+--- 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
msgid "Failed to figure out sender"
msgstr "Kann Absender nicht ermitteln"
#. 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
+Index: debian-mutt/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
+--- 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
@@ -8,6 +8,7 @@ charset.c
color.c
commands.c
crypt-gpgme.c
crypt.c
cryptglue.c
-Index: status.c
+Index: debian-mutt/status.c
===================================================================
---- status.c.orig 2007-03-01 22:08:48.458997752 +0100
-+++ status.c 2007-03-01 22:30:00.113676856 +0100
+--- 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
case 'f':
projects / software / mutt-debian.git / blobdiff