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
+ - 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-05-16 myon: conflict in flags.c resolved, adjusted mutt_FormatString
+ call and compresshook_format_str in compress.c
== END PATCH
---- /dev/null
-+++ compress.c
-@@ -0,0 +1,487 @@
+Index: debian-mutt/compress.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-mutt/compress.c 2007-05-17 00:11:39.000000000 +0200
+@@ -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);
+
+}
+
+static const char *
-+compresshook_format_str (char *dest, size_t destlen, char op, const char *src,
++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)
+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,
++ mutt_FormatString (expanded, sizeof (expanded), 0, cmd, compresshook_format_str,
+ (unsigned long) ctx, 0);
+ return safe_strdup (expanded);
+}
+}
+
+#endif /* USE_COMPRESSED */
---- /dev/null
-+++ compress.h
+Index: debian-mutt/compress.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-mutt/compress.h 2007-05-16 23:54:01.000000000 +0200
@@ -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 *);
---- configure.in.orig
-+++ configure.in
-@@ -745,6 +745,11 @@
+Index: debian-mutt/configure.ac
+===================================================================
+--- debian-mutt.orig/configure.ac 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/configure.ac 2007-05-16 23:54: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])
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",
---- curs_main.c.orig
-+++ curs_main.c
-@@ -1096,6 +1096,11 @@
+Index: debian-mutt/curs_main.c
+===================================================================
+--- debian-mutt.orig/curs_main.c 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/curs_main.c 2007-05-17 00:13:50.000000000 +0200
+@@ -1111,6 +1111,11 @@ int mutt_index_menu (void)
{
int check;
mutt_str_replace (&LastFolder, Context->path);
oldcount = Context ? Context->msgcount : 0;
---- doc/manual.xml.head.orig
-+++ doc/manual.xml.head
-@@ -4745,6 +4745,205 @@
+Index: debian-mutt/doc/manual.xml.head
+===================================================================
+--- debian-mutt.orig/doc/manual.xml.head 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/doc/manual.xml.head 2007-05-17 00:13:50.000000000 +0200
+@@ -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">
---- doc/muttrc.man.head.orig
-+++ doc/muttrc.man.head
-@@ -316,6 +316,24 @@
+ <title>Mutt's MIME Support</title>
+
+Index: debian-mutt/doc/muttrc.man.head
+===================================================================
+--- debian-mutt.orig/doc/muttrc.man.head 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/doc/muttrc.man.head 2007-05-16 23:54:01.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,
or even just an arbitrary search string.
.TP
\fBpush\fP \fIstring\fP
This command adds the named \fIstring\fP to the keyboard buffer.
---- hook.c.orig
-+++ hook.c
+Index: debian-mutt/hook.c
+===================================================================
+--- debian-mutt.orig/hook.c 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/hook.c 2007-05-16 23:54:01.000000000 +0200
@@ -24,6 +24,10 @@
#include "mailbox.h"
#include "mutt_crypt.h"
#include <limits.h>
#include <string.h>
#include <stdlib.h>
-@@ -92,6 +96,16 @@
+@@ -92,6 +96,16 @@ int mutt_parse_hook (BUFFER *buf, BUFFER
memset (&pattern, 0, sizeof (pattern));
pattern.data = safe_strdup (path);
}
+ }
+ }
+#endif
- else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
+ else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK))
&& (!WithCrypto || !(data & M_CRYPTHOOK))
)
---- init.h.orig
-+++ init.h
-@@ -3108,6 +3108,11 @@
+Index: debian-mutt/init.h
+===================================================================
+--- debian-mutt.orig/init.h 2007-05-16 23:53:58.000000000 +0200
++++ debian-mutt/init.h 2007-05-17 00:13:50.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 },
- { "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 },
---- main.c.orig
-+++ main.c
-@@ -398,6 +398,12 @@
+Index: debian-mutt/main.c
+===================================================================
+--- debian-mutt.orig/main.c 2007-05-16 23:53:58.000000000 +0200
++++ debian-mutt/main.c 2007-05-16 23:54:01.000000000 +0200
+@@ -401,6 +401,12 @@ static void show_version (void)
#else
"-LOCALES_HACK "
#endif
#ifdef HAVE_WC_FUNCS
"+HAVE_WC_FUNCS "
---- Makefile.am.orig
-+++ Makefile.am
-@@ -18,7 +18,7 @@
+Index: debian-mutt/Makefile.am
+===================================================================
+--- debian-mutt.orig/Makefile.am 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/Makefile.am 2007-05-16 23:54:01.000000000 +0200
+@@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.
bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
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 \
+- 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 \
-@@ -68,7 +68,7 @@
- crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c
+@@ -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 \
- configure account.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 \
---- mbox.c.orig
-+++ mbox.c
-@@ -28,6 +28,10 @@
- #include "sort.h"
+Index: debian-mutt/mbox.c
+===================================================================
+--- debian-mutt.orig/mbox.c 2007-05-16 23:53:58.000000000 +0200
++++ debian-mutt/mbox.c 2007-05-16 23:54:01.000000000 +0200
+@@ -29,6 +29,10 @@
#include "copy.h"
+ #include "mutt_curses.h"
+#ifdef USE_COMPRESSED
+#include "compress.h"
#include <sys/stat.h>
#include <dirent.h>
#include <string.h>
-@@ -1014,6 +1018,12 @@
+@@ -1026,6 +1030,12 @@ bail: /* Come here in case of disaster
int mbox_close_mailbox (CONTEXT *ctx)
{
mx_unlock_file (ctx->path, fileno (ctx->fp), 1);
mutt_unblock_signals ();
mx_fastclose_mailbox (ctx);
return 0;
---- mutt.h.orig
-+++ mutt.h
-@@ -157,6 +157,11 @@
+Index: debian-mutt/mutt.h
+===================================================================
+--- debian-mutt.orig/mutt.h 2007-05-16 23:53:58.000000000 +0200
++++ debian-mutt/mutt.h 2007-05-17 00:13:50.000000000 +0200
+@@ -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
-@@ -863,6 +868,11 @@
- 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 */
+
short magic; /* mailbox type */
- unsigned int locked : 1; /* is the mailbox locked? */
---- mx.c.orig
-+++ mx.c
+ unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */
+Index: debian-mutt/mx.c
+===================================================================
+--- debian-mutt.orig/mx.c 2007-05-16 23:53:58.000000000 +0200
++++ debian-mutt/mx.c 2007-05-17 00:13:49.000000000 +0200
@@ -30,6 +30,10 @@
#include "keymap.h"
#include "url.h"
#ifdef USE_IMAP
#include "imap.h"
#endif
-@@ -454,6 +458,10 @@
+@@ -450,6 +454,10 @@ int mx_get_magic (const char *path)
return (-1);
}
return (magic);
}
-@@ -493,6 +501,13 @@
+@@ -489,6 +497,13 @@ static int mx_open_mailbox_append (CONTE
{
struct stat sb;
ctx->append = 1;
#ifdef USE_IMAP
-@@ -653,7 +668,12 @@
+@@ -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);
-@@ -759,6 +779,10 @@
+@@ -753,6 +773,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)
-@@ -816,6 +840,12 @@
+@@ -805,6 +829,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;
}
-@@ -1017,6 +1047,11 @@
+@@ -1006,6 +1036,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;
-@@ -1326,6 +1361,11 @@
+@@ -1315,6 +1350,11 @@ int mx_check_mailbox (CONTEXT *ctx, int
{
int rc;
if (ctx)
{
if (ctx->locked) lock = 0;
---- mx.h.orig
-+++ mx.h
-@@ -40,6 +40,9 @@
+Index: debian-mutt/mx.h
+===================================================================
+--- debian-mutt.orig/mx.h 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/mx.h 2007-05-16 23:54:01.000000000 +0200
+@@ -40,6 +40,9 @@ enum
#ifdef USE_POP
, M_POP
#endif
};
WHERE short DefaultMagic INITVAL (M_MBOX);
---- PATCHES.orig
-+++ PATCHES
-@@ -1,2 +1,3 @@
-+patch-1.5.11.rr.compressed.1
- patch-1.5.6.tt.assumed_charset.1
- patch-1.5.6.dw.maildir-mtime.1
---- po/de.po.orig
-+++ po/de.po
-@@ -1262,6 +1262,48 @@
+Index: debian-mutt/PATCHES
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ debian-mutt/PATCHES 2007-05-17 00:13:50.000000000 +0200
+@@ -0,0 +1 @@
++patch-1.5.14.rr.compressed.1
+Index: debian-mutt/po/de.po
+===================================================================
+--- debian-mutt.orig/po/de.po 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/po/de.po 2007-05-16 23:54:01.000000000 +0200
+@@ -1280,6 +1280,48 @@ msgstr "Prüfung des Absenders fehlgeschl
msgid "Failed to figure out sender"
msgstr "Kann Absender nicht ermitteln"
#: crypt.c:69
#, c-format
msgid " (current time: %c)"
-@@ -1910,6 +1952,10 @@
- msgid "Help for %s"
- msgstr "Hilfe für %s"
-
-+#: hook.c:96
-+msgid "bad formatted command string"
-+msgstr "Hook enthält nicht die Muster %f und %t"
-+
- #: hook.c:246
- #, c-format
- msgid "unhook: Can't do unhook * from within a hook."
-@@ -3424,18 +3470,10 @@
+@@ -3437,18 +3479,10 @@ msgstr "Lese %s..."
msgid "Mailbox is corrupt!"
msgstr "Mailbox fehlerhaft!"
--#: mbox.c:662
+-#: mbox.c:670
-msgid "Mailbox was corrupted!"
-msgstr "Mailbox wurde zerstört!"
-
- #: mbox.c:701 mbox.c:952
+ #: mbox.c:711 mbox.c:964
msgid "Fatal error! Could not reopen mailbox!"
msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!"
--#: mbox.c:710
+-#: mbox.c:720
-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.
---- po/POTFILES.in.orig
-+++ po/POTFILES.in
-@@ -8,6 +8,7 @@
+Index: debian-mutt/po/POTFILES.in
+===================================================================
+--- debian-mutt.orig/po/POTFILES.in 2007-05-16 23:53:59.000000000 +0200
++++ debian-mutt/po/POTFILES.in 2007-05-16 23:54:01.000000000 +0200
+@@ -8,6 +8,7 @@ charset.c
color.c
commands.c
compose.c
crypt-gpgme.c
crypt.c
cryptglue.c
---- status.c.orig
-+++ status.c
-@@ -97,6 +97,14 @@
+Index: debian-mutt/status.c
+===================================================================
+--- debian-mutt.orig/status.c 2007-05-16 23:53:58.000000000 +0200
++++ debian-mutt/status.c 2007-05-17 00:13:49.000000000 +0200
+@@ -99,6 +99,14 @@ status_format_str (char *buf, size_t buf
case 'f':
snprintf (fmt, sizeof(fmt), "%%%ss", prefix);
projects / software / mutt-debian.git / blobdiff