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
+ - 2007-03-13 myon: update for 1.5.14+tip (conflict in hook.c)
== END PATCH
-diff -urN mutt-1.5.11/compress.c mutt-1.5.11-ro/compress.c
---- mutt-1.5.11/compress.c 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.5.11-ro/compress.c 2005-09-27 13:26:58.000000000 +0200
-@@ -0,0 +1,487 @@
+Index: mutt/compress.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ mutt/compress.c 2007-03-13 20:59:30.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 */
-diff -urN mutt-1.5.11/compress.h mutt-1.5.11-ro/compress.h
---- mutt-1.5.11/compress.h 1970-01-01 01:00:00.000000000 +0100
-+++ mutt-1.5.11-ro/compress.h 2005-09-27 13:26:58.000000000 +0200
+Index: mutt/compress.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ mutt/compress.h 2007-03-13 20:59:30.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 *);
-diff -urN mutt-1.5.11/config.h.in mutt-1.5.11-ro/config.h.in
-diff -urN mutt-1.5.11/configure mutt-1.5.11-ro/configure
-diff -urN mutt-1.5.11/configure.in mutt-1.5.11-ro/configure.in
---- mutt-1.5.11/configure.in 2005-09-15 16:21:24.000000000 +0200
-+++ mutt-1.5.11-ro/configure.in 2005-09-27 13:26:58.000000000 +0200
-@@ -711,6 +711,11 @@
+Index: mutt/configure.in
+===================================================================
+--- mutt.orig/configure.in 2007-03-13 20:53:07.000000000 +0100
++++ mutt/configure.in 2007-03-13 20:59:30.000000000 +0100
+@@ -807,6 +807,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",
-diff -urN mutt-1.5.11/curs_main.c mutt-1.5.11-ro/curs_main.c
---- mutt-1.5.11/curs_main.c 2005-09-07 10:19:43.000000000 +0200
-+++ mutt-1.5.11-ro/curs_main.c 2005-09-27 13:26:58.000000000 +0200
-@@ -1091,6 +1091,11 @@
+Index: mutt/curs_main.c
+===================================================================
+--- mutt.orig/curs_main.c 2007-03-13 20:53:07.000000000 +0100
++++ mutt/curs_main.c 2007-03-13 20:59:30.000000000 +0100
+@@ -1090,6 +1090,11 @@ int mutt_index_menu (void)
{
int check;
mutt_str_replace (&LastFolder, Context->path);
oldcount = Context ? Context->msgcount : 0;
-diff -urN mutt-1.5.11/doc/manual.xml.head mutt-1.5.11-ro/doc/manual.xml.head
---- mutt-1.5.11/doc/manual.xml.head 2005-09-06 18:46:44.000000000 +0200
-+++ mutt-1.5.11-ro/doc/manual.xml.head 2005-09-27 13:29:11.000000000 +0200
-@@ -4404,6 +4404,205 @@
+Index: mutt/doc/manual.xml.head
+===================================================================
+--- mutt.orig/doc/manual.xml.head 2007-03-13 20:53:07.000000000 +0100
++++ mutt/doc/manual.xml.head 2007-03-13 20:59:30.000000000 +0100
+@@ -4843,6 +4843,205 @@ becomes an issue as mutt will silently f
- </sect1>
+ </chapter>
-+<sect2 id="compressedfolders">
++<sect1 id="compressedfolders">
+<title>Compressed folders Support (OPTIONAL)</title>
+
+<para>
+the compressed file will be removed if you delete all of the messages.
+</para>
+
-+<sect3 id="open-hook">
++<sect2 id="open-hook">
+<title>Open a compressed mailbox for reading</title>
+
+<para>
+If the <emphasis>command</emphasis> is empty, this operation is
+disabled for this file type.
+</para>
-+</sect3>
++</sect2>
+
-+<sect3 id="close-hook">
++<sect2 id="close-hook">
+<title>Write a compressed mailbox</title>
+
+<para>
+<link linkend="close-hook">close-hook</link> is not called when you
+exit from the folder if the folder was not changed.
+</para>
-+</sect3>
++</sect2>
+
-+<sect3 id="append-hook">
++<sect2 id="append-hook">
+<title>Append a message to a compressed mailbox</title>
+
+<para>
+<link linkend="close-hook">close-hook</link>respectively) each time you
+will add to it.
+</para>
-+</sect3>
++</sect2>
+
-+<sect3>
++<sect2>
+<title>Encrypted folders</title>
+
+<para>
+decrypted in the /tmp directory, where it can be read by your system
+administrator. So think about the security aspects of this.
+</para>
-+</sect3>
+</sect2>
++</sect1>
+
- <sect1 id="mimesupport">
+ <chapter id="mimesupport">
<title>Mutt's MIME Support</title>
-diff -urN mutt-1.5.11/doc/muttrc.man.head mutt-1.5.11-ro/doc/muttrc.man.head
---- mutt-1.5.11/doc/muttrc.man.head 2005-09-07 10:19:44.000000000 +0200
-+++ mutt-1.5.11-ro/doc/muttrc.man.head 2005-09-27 13:29:53.000000000 +0200
-@@ -316,6 +316,24 @@
+Index: mutt/doc/muttrc.man.head
+===================================================================
+--- mutt.orig/doc/muttrc.man.head 2007-03-13 20:53:07.000000000 +0100
++++ mutt/doc/muttrc.man.head 2007-03-13 20:59:30.000000000 +0100
+@@ -316,6 +316,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.
-diff -urN mutt-1.5.11/hook.c mutt-1.5.11-ro/hook.c
---- mutt-1.5.11/hook.c 2005-02-03 19:47:52.000000000 +0100
-+++ mutt-1.5.11-ro/hook.c 2005-09-27 13:27:02.000000000 +0200
+Index: mutt/hook.c
+===================================================================
+--- mutt.orig/hook.c 2007-03-13 20:53:07.000000000 +0100
++++ mutt/hook.c 2007-03-13 21:00:40.000000000 +0100
@@ -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))
)
-diff -urN mutt-1.5.11/init.h mutt-1.5.11-ro/init.h
---- mutt-1.5.11/init.h 2005-09-15 16:19:54.000000000 +0200
-+++ mutt-1.5.11-ro/init.h 2005-09-27 13:27:02.000000000 +0200
-@@ -3100,6 +3100,11 @@
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h 2007-03-13 20:53:07.000000000 +0100
++++ mutt/init.h 2007-03-13 20:59:30.000000000 +0100
+@@ -3167,6 +3167,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 },
-diff -urN mutt-1.5.11/main.c mutt-1.5.11-ro/main.c
---- mutt-1.5.11/main.c 2005-09-07 10:19:43.000000000 +0200
-+++ mutt-1.5.11-ro/main.c 2005-09-27 13:27:02.000000000 +0200
-@@ -385,6 +385,12 @@
+Index: mutt/main.c
+===================================================================
+--- mutt.orig/main.c 2007-03-13 20:53:07.000000000 +0100
++++ mutt/main.c 2007-03-13 20:59:30.000000000 +0100
+@@ -404,6 +404,12 @@ static void show_version (void)
#else
"-LOCALES_HACK "
#endif
#ifdef HAVE_WC_FUNCS
"+HAVE_WC_FUNCS "
-diff -urN mutt-1.5.11/Makefile.am mutt-1.5.11-ro/Makefile.am
---- mutt-1.5.11/Makefile.am 2005-08-11 23:27:28.000000000 +0200
-+++ mutt-1.5.11-ro/Makefile.am 2005-09-27 13:27:02.000000000 +0200
-@@ -18,7 +18,7 @@
+Index: mutt/Makefile.am
+===================================================================
+--- mutt.orig/Makefile.am 2007-03-13 20:53:07.000000000 +0100
++++ mutt/Makefile.am 2007-03-13 20:59:30.000000000 +0100
+@@ -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 \
- handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
-@@ -67,7 +67,7 @@
- crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c
+ edit.c enter.c flags.c init.c filter.c from.c \
+ getdomain.c group.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 \
+ 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 \
-diff -urN mutt-1.5.11/Makefile.in mutt-1.5.11-ro/Makefile.in
-diff -urN mutt-1.5.11/mbox.c mutt-1.5.11-ro/mbox.c
---- mutt-1.5.11/mbox.c 2005-08-02 09:08:00.000000000 +0200
-+++ mutt-1.5.11-ro/mbox.c 2005-09-27 13:27:02.000000000 +0200
-@@ -28,6 +28,10 @@
- #include "sort.h"
+Index: mutt/mbox.c
+===================================================================
+--- mutt.orig/mbox.c 2007-03-13 20:53:07.000000000 +0100
++++ mutt/mbox.c 2007-03-13 20:59:30.000000000 +0100
+@@ -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;
-diff -urN mutt-1.5.11/mutt.h mutt-1.5.11-ro/mutt.h
---- mutt-1.5.11/mutt.h 2005-09-07 10:19:43.000000000 +0200
-+++ mutt-1.5.11-ro/mutt.h 2005-09-27 13:27:02.000000000 +0200
-@@ -157,6 +157,11 @@
+Index: mutt/mutt.h
+===================================================================
+--- mutt.orig/mutt.h 2007-03-13 20:53:07.000000000 +0100
++++ mutt/mutt.h 2007-03-13 20:59:30.000000000 +0100
+@@ -159,6 +159,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
-@@ -828,6 +833,11 @@
+@@ -882,6 +887,11 @@ typedef struct
void *data; /* driver specific data */
#endif /* USE_IMAP */
+
short magic; /* mailbox type */
- unsigned int locked : 1; /* is the mailbox locked? */
-diff -urN mutt-1.5.11/Muttrc mutt-1.5.11-ro/Muttrc
-diff -urN mutt-1.5.11/Muttrc.head mutt-1.5.11-ro/Muttrc.head
-diff -urN mutt-1.5.11/Muttrc.head.in mutt-1.5.11-ro/Muttrc.head.in
-diff -urN mutt-1.5.11/mx.c mutt-1.5.11-ro/mx.c
---- mutt-1.5.11/mx.c 2005-09-07 10:19:43.000000000 +0200
-+++ mutt-1.5.11-ro/mx.c 2005-09-27 13:27:02.000000000 +0200
+ unsigned char rights[(RIGHTSMAX + 7)/8]; /* ACL bits */
+Index: mutt/mx.c
+===================================================================
+--- mutt.orig/mx.c 2007-03-13 20:53:07.000000000 +0100
++++ mutt/mx.c 2007-03-13 20:59:30.000000000 +0100
@@ -30,6 +30,10 @@
#include "keymap.h"
#include "url.h"
#ifdef USE_IMAP
#include "imap.h"
#endif
-@@ -454,6 +458,10 @@
+@@ -454,6 +458,10 @@ int mx_get_magic (const char *path)
return (-1);
}
return (magic);
}
-@@ -493,6 +501,13 @@
- {
+@@ -494,6 +502,13 @@ static int mx_open_mailbox_append (CONTE
struct stat sb;
+ mode_t omask;
+#ifdef USE_COMPRESSED
+ /* special case for appending to compressed folders -
ctx->append = 1;
#ifdef USE_IMAP
-@@ -653,7 +668,12 @@
+@@ -664,7 +679,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 @@
+@@ -770,6 +790,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 @@
+@@ -827,6 +851,12 @@ static int sync_mailbox (CONTEXT *ctx, i
if (tmp && tmp->new == 0)
mutt_update_mailbox (tmp);
#endif
return rc;
}
-@@ -1021,6 +1051,11 @@
+@@ -1028,6 +1058,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;
-@@ -1330,6 +1365,11 @@
+@@ -1342,6 +1377,11 @@ int mx_check_mailbox (CONTEXT *ctx, int
{
int rc;
if (ctx)
{
if (ctx->locked) lock = 0;
-diff -urN mutt-1.5.11/mx.h mutt-1.5.11-ro/mx.h
---- mutt-1.5.11/mx.h 2003-08-05 15:58:16.000000000 +0200
-+++ mutt-1.5.11-ro/mx.h 2005-09-27 13:27:02.000000000 +0200
-@@ -40,6 +40,9 @@
+Index: mutt/mx.h
+===================================================================
+--- mutt.orig/mx.h 2007-03-13 20:53:07.000000000 +0100
++++ mutt/mx.h 2007-03-13 20:59:30.000000000 +0100
+@@ -40,6 +40,9 @@ enum
#ifdef USE_POP
, M_POP
#endif
};
WHERE short DefaultMagic INITVAL (M_MBOX);
-diff -urN mutt-1.5.11/PATCHES mutt-1.5.11-ro/PATCHES
---- mutt-1.5.11/PATCHES 2005-08-15 10:16:00.000000000 +0200
-+++ mutt-1.5.11-ro/PATCHES 2005-09-27 13:30:25.000000000 +0200
+Index: mutt/PATCHES
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ mutt/PATCHES 2007-03-13 20:59:30.000000000 +0100
@@ -0,0 +1 @@
-+patch-1.5.11.rr.compressed.1
-diff -urN mutt-1.5.11/po/de.po mutt-1.5.11-ro/po/de.po
---- mutt-1.5.11/po/de.po 2005-09-15 16:23:50.000000000 +0200
-+++ mutt-1.5.11-ro/po/de.po 2005-09-27 13:27:02.000000000 +0200
-@@ -1262,6 +1262,48 @@
++patch-1.5.14.rr.compressed.1
+Index: mutt/po/de.po
+===================================================================
+--- mutt.orig/po/de.po 2007-03-13 20:53:07.000000000 +0100
++++ mutt/po/de.po 2007-03-13 20:59:30.000000000 +0100
+@@ -1266,6 +1266,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)"
-@@ -1882,6 +1924,10 @@
+@@ -1926,6 +1968,10 @@ msgstr ""
msgid "Help for %s"
msgstr "Hilfe für %s"
#: hook.c:246
#, c-format
msgid "unhook: Can't do unhook * from within a hook."
-@@ -3336,18 +3382,10 @@
+@@ -3428,18 +3474,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.
-diff -urN mutt-1.5.11/po/POTFILES.in mutt-1.5.11-ro/po/POTFILES.in
---- mutt-1.5.11/po/POTFILES.in 2005-08-03 11:17:47.000000000 +0200
-+++ mutt-1.5.11-ro/po/POTFILES.in 2005-09-27 13:27:02.000000000 +0200
-@@ -8,6 +8,7 @@
+Index: mutt/po/POTFILES.in
+===================================================================
+--- mutt.orig/po/POTFILES.in 2007-03-13 20:53:07.000000000 +0100
++++ mutt/po/POTFILES.in 2007-03-13 20:59:30.000000000 +0100
+@@ -8,6 +8,7 @@ charset.c
color.c
commands.c
compose.c
crypt-gpgme.c
crypt.c
cryptglue.c
-diff -urN mutt-1.5.11/status.c mutt-1.5.11-ro/status.c
---- mutt-1.5.11/status.c 2005-02-03 19:47:53.000000000 +0100
-+++ mutt-1.5.11-ro/status.c 2005-09-27 13:27:02.000000000 +0200
-@@ -97,6 +97,14 @@
+Index: mutt/status.c
+===================================================================
+--- mutt.orig/status.c 2007-03-13 20:53:07.000000000 +0100
++++ mutt/status.c 2007-03-13 20:59:30.000000000 +0100
+@@ -97,6 +97,14 @@ status_format_str (char *buf, size_t buf
case 'f':
snprintf (fmt, sizeof(fmt), "%%%ss", prefix);
projects / software / mutt-debian.git / blobdiff