Author: jajcus Date: Fri Oct 7 08:07:15 2005 GMT Module: SOURCES Tag: DEVEL ---- Log message: - updated for Mutt 1.5.10
---- Files affected: SOURCES: mutt-bj.status-time.patch (1.1 -> 1.1.4.1) , mutt-cd.trash_folder.patch (1.1 -> 1.1.4.1) , mutt-manual.patch (1.1.4.1 -> 1.1.4.2) , mutt-rr.compressed.patch (1.4.4.3 -> 1.4.4.4) ---- Diffs: ================================================================ Index: SOURCES/mutt-bj.status-time.patch diff -u SOURCES/mutt-bj.status-time.patch:1.1 SOURCES/mutt-bj.status-time.patch:1.1.4.1 --- SOURCES/mutt-bj.status-time.patch:1.1 Thu Jan 24 22:09:57 2002 +++ SOURCES/mutt-bj.status-time.patch Fri Oct 7 10:07:10 2005 @@ -1,7 +1,7 @@ -diff -Nur mutt-1.3.25-2/curs_main.c mutt-1.3.25/curs_main.c ---- mutt-1.3.25-2/curs_main.c Tue Jan 22 00:06:44 2002 -+++ mutt-1.3.25/curs_main.c Tue Jan 22 00:07:02 2002 -@@ -546,7 +546,7 @@ +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/curs_main.c mutt-1.5.10/curs_main.c +--- mutt-1.5.10.orig/curs_main.c 2005-10-07 09:28:10.000000000 +0200 ++++ mutt-1.5.10/curs_main.c 2005-10-07 09:28:24.000000000 +0200 +@@ -559,7 +559,7 @@ menu_redraw_current (menu); } @@ -10,10 +10,19 @@ { menu_status_line (buf, sizeof (buf), menu, NONULL (Status)); CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2); -diff -Nur mutt-1.3.25-2/globals.h mutt-1.3.25/globals.h ---- mutt-1.3.25-2/globals.h Tue Jan 22 00:06:44 2002 -+++ mutt-1.3.25/globals.h Tue Jan 22 00:07:02 2002 -@@ -145,6 +145,7 @@ +Only in mutt-1.5.10/doc: manual-1.html +Only in mutt-1.5.10/doc: manual-2.html +Only in mutt-1.5.10/doc: manual-3.html +Only in mutt-1.5.10/doc: manual-4.html +Only in mutt-1.5.10/doc: manual-5.html +Only in mutt-1.5.10/doc: manual-6.html +Only in mutt-1.5.10/doc: manual-7.html +Only in mutt-1.5.10/doc: manual.html +Only in mutt-1.5.10/doc: manual.txt +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/globals.h mutt-1.5.10/globals.h +--- mutt-1.5.10.orig/globals.h 2005-08-03 11:17:46.000000000 +0200 ++++ mutt-1.5.10/globals.h 2005-10-07 09:28:24.000000000 +0200 +@@ -174,6 +174,7 @@ WHERE short ReadInc; WHERE short SendmailWait; WHERE short SleepTime INITVAL (1); @@ -21,10 +30,10 @@ WHERE short Timeout; WHERE short WrapMargin; WHERE short WriteInc; -diff -Nur mutt-1.3.25-2/init.h mutt-1.3.25/init.h ---- mutt-1.3.25-2/init.h Tue Jan 22 00:06:44 2002 -+++ mutt-1.3.25/init.h Tue Jan 22 00:09:07 2002 -@@ -2119,6 +2119,9 @@ +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/init.h mutt-1.5.10/init.h +--- mutt-1.5.10.orig/init.h 2005-10-07 09:28:10.000000000 +0200 ++++ mutt-1.5.10/init.h 2005-10-07 09:28:24.000000000 +0200 +@@ -2626,6 +2626,9 @@ ** .dt %u .dd number of unread messages * ** .dt %v .dd Mutt version string ** .dt %V .dd currently active limit pattern, if any * @@ -34,7 +43,7 @@ ** .dt %>X .dd right justify the rest of the string and pad with "X" ** .dt %|X .dd pad to the end of the line with "X" ** .de -@@ -2160,6 +2163,16 @@ +@@ -2671,6 +2674,16 @@ ** Setting this variable causes the ``status bar'' to be displayed on ** the first line of the screen rather than near the bottom. */ @@ -51,10 +60,10 @@ { "strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, 0 }, /* ** .pp -diff -Nur mutt-1.3.25-2/menu.c mutt-1.3.25/menu.c ---- mutt-1.3.25-2/menu.c Tue Jan 22 00:06:44 2002 -+++ mutt-1.3.25/menu.c Tue Jan 22 00:07:02 2002 -@@ -1045,3 +1045,23 @@ +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/menu.c mutt-1.5.10/menu.c +--- mutt-1.5.10.orig/menu.c 2005-06-12 20:32:46.000000000 +0200 ++++ mutt-1.5.10/menu.c 2005-10-07 09:28:24.000000000 +0200 +@@ -1087,3 +1087,23 @@ } /* not reached */ } @@ -78,19 +87,19 @@ + else + return 0; +} -diff -Nur mutt-1.3.25-2/mutt_menu.h mutt-1.3.25/mutt_menu.h ---- mutt-1.3.25-2/mutt_menu.h Tue Jan 22 00:06:44 2002 -+++ mutt-1.3.25/mutt_menu.h Tue Jan 22 00:07:02 2002 -@@ -107,3 +107,5 @@ - /* used in both the index and pager index to make an entry. */ +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/mutt_menu.h mutt-1.5.10/mutt_menu.h +--- mutt-1.5.10.orig/mutt_menu.h 2005-08-11 21:37:02.000000000 +0200 ++++ mutt-1.5.10/mutt_menu.h 2005-10-07 09:28:59.000000000 +0200 +@@ -112,4 +112,5 @@ void index_make_entry (char *, size_t, struct menu_t *, int); int index_color (int); -+ + +int update_status_time (void); -diff -Nur mutt-1.3.25-2/pager.c mutt-1.3.25/pager.c ---- mutt-1.3.25-2/pager.c Tue Jan 22 00:06:44 2002 -+++ mutt-1.3.25/pager.c Tue Jan 22 00:07:02 2002 -@@ -1712,7 +1712,7 @@ + #endif /* _MUTT_MENU_H_ */ +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/pager.c mutt-1.5.10/pager.c +--- mutt-1.5.10.orig/pager.c 2005-08-11 21:37:02.000000000 +0200 ++++ mutt-1.5.10/pager.c 2005-10-07 09:28:24.000000000 +0200 +@@ -1763,7 +1763,7 @@ SETCOLOR (MT_COLOR_NORMAL); } @@ -99,10 +108,10 @@ { /* redraw the pager_index indicator, because the * flags for this message might have changed. */ -diff -Nur mutt-1.3.25-2/status.c mutt-1.3.25/status.c ---- mutt-1.3.25-2/status.c Tue Jan 22 00:06:44 2002 -+++ mutt-1.3.25/status.c Tue Jan 22 00:07:02 2002 -@@ -26,6 +26,7 @@ +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/status.c mutt-1.5.10/status.c +--- mutt-1.5.10.orig/status.c 2005-10-07 09:28:10.000000000 +0200 ++++ mutt-1.5.10/status.c 2005-10-07 09:28:24.000000000 +0200 +@@ -30,6 +30,7 @@ #include <string.h> #include <ctype.h> #include <unistd.h> @@ -110,7 +119,7 @@ static char *get_sort_str (char *buf, size_t buflen, int method) { -@@ -284,6 +285,61 @@ +@@ -288,6 +289,61 @@ *buf = 0; return (src); @@ -172,4 +181,3 @@ default: snprintf (buf, buflen, "%%%s%c", prefix, op); break; - ================================================================ Index: SOURCES/mutt-cd.trash_folder.patch diff -u SOURCES/mutt-cd.trash_folder.patch:1.1 SOURCES/mutt-cd.trash_folder.patch:1.1.4.1 --- SOURCES/mutt-cd.trash_folder.patch:1.1 Tue Feb 12 21:57:01 2002 +++ SOURCES/mutt-cd.trash_folder.patch Fri Oct 7 10:07:10 2005 @@ -1,28 +1,35 @@ -diff -pruN2 mutt-1.3.27.orig/commands.c mutt-1.3.27/commands.c ---- mutt-1.3.27.orig/commands.c Mon Dec 3 11:17:57 2001 -+++ mutt-1.3.27/commands.c Wed Jan 23 22:33:11 2002 -@@ -616,9 +616,13 @@ void _mutt_save_message (HEADER *h, CONT - mutt_parse_mime_message (Context, h); - -- if (mutt_append_message (ctx, Context, h, cmflags, chflags) == 0 && delete) -+ if (mutt_append_message (ctx, Context, h, cmflags, chflags) == 0) - { -- mutt_set_flag (Context, h, M_DELETE, 1); -- if (option (OPTDELETEUNTAG)) -- mutt_set_flag (Context, h, M_TAG, 0); -+ if (delete) -+ { -+ mutt_set_flag (Context, h, M_DELETE, 1); -+ if (option (OPTDELETEUNTAG)) -+ mutt_set_flag (Context, h, M_TAG, 0); -+ } -+ mutt_set_flag (Context, h, M_APPENDED, 1); +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/PATCHES mutt-1.5.10/PATCHES +--- mutt-1.5.10.orig/PATCHES 2005-10-07 09:29:54.000000000 +0200 ++++ mutt-1.5.10/PATCHES 2005-10-07 09:30:06.000000000 +0200 +@@ -1,2 +1,3 @@ + vvv.quote ++patch-1.3.27.cd.trash_folder.1 + rr.compressed +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/commands.c mutt-1.5.10/commands.c +--- mutt-1.5.10.orig/commands.c 2005-08-02 09:08:00.000000000 +0200 ++++ mutt-1.5.10/commands.c 2005-10-07 09:32:06.000000000 +0200 +@@ -690,6 +690,7 @@ + if (option (OPTDELETEUNTAG)) + mutt_set_flag (Context, h, M_TAG, 0); } ++ mutt_set_flag (Context, h, M_APPENDED, 1); + + return 0; } -diff -pruN2 mutt-1.3.27.orig/flags.c mutt-1.3.27/flags.c ---- mutt-1.3.27.orig/flags.c Tue Jan 15 22:12:59 2002 -+++ mutt-1.3.27/flags.c Wed Jan 23 22:33:11 2002 -@@ -76,4 +76,15 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE +Only in mutt-1.5.10/doc: manual-1.html +Only in mutt-1.5.10/doc: manual-2.html +Only in mutt-1.5.10/doc: manual-3.html +Only in mutt-1.5.10/doc: manual-4.html +Only in mutt-1.5.10/doc: manual-5.html +Only in mutt-1.5.10/doc: manual-6.html +Only in mutt-1.5.10/doc: manual-7.html +Only in mutt-1.5.10/doc: manual.html +Only in mutt-1.5.10/doc: manual.txt +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/flags.c mutt-1.5.10/flags.c +--- mutt-1.5.10.orig/flags.c 2005-02-03 19:47:52.000000000 +0100 ++++ mutt-1.5.10/flags.c 2005-10-07 09:30:06.000000000 +0200 +@@ -91,6 +91,17 @@ + } break; + case M_APPENDED: @@ -37,20 +44,24 @@ + break; + case M_NEW: - if (bf) -diff -pruN2 mutt-1.3.27.orig/globals.h mutt-1.3.27/globals.h ---- mutt-1.3.27.orig/globals.h Thu Jan 3 21:56:46 2002 -+++ mutt-1.3.27/globals.h Wed Jan 23 22:33:11 2002 -@@ -110,4 +110,5 @@ WHERE char *Status; + + #ifdef USE_IMAP +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/globals.h mutt-1.5.10/globals.h +--- mutt-1.5.10.orig/globals.h 2005-10-07 09:29:54.000000000 +0200 ++++ mutt-1.5.10/globals.h 2005-10-07 09:30:06.000000000 +0200 +@@ -130,6 +130,7 @@ + WHERE char *Status; WHERE char *Tempdir; WHERE char *Tochars; +WHERE char *TrashPath; WHERE char *Username; WHERE char *Visual; -diff -pruN2 mutt-1.3.27.orig/init.h mutt-1.3.27/init.h ---- mutt-1.3.27.orig/init.h Mon Dec 10 11:09:03 2001 -+++ mutt-1.3.27/init.h Wed Jan 23 22:33:11 2002 -@@ -2236,4 +2236,11 @@ struct option_t MuttVars[] = { + +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/init.h mutt-1.5.10/init.h +--- mutt-1.5.10.orig/init.h 2005-10-07 09:29:54.000000000 +0200 ++++ mutt-1.5.10/init.h 2005-10-07 09:30:06.000000000 +0200 +@@ -2774,6 +2774,13 @@ + ** by \fIyou\fP. The sixth character is used to indicate when a mail ** was sent to a mailing-list you subscribe to (default: L). */ + { "trash", DT_PATH, R_NONE, UL &TrashPath, 0 }, @@ -62,31 +73,39 @@ + */ #ifdef USE_SOCKET { "tunnel", DT_STR, R_NONE, UL &Tunnel, UL 0 }, -diff -pruN2 mutt-1.3.27.orig/mutt.h mutt-1.3.27/mutt.h ---- mutt-1.3.27.orig/mutt.h Tue Jan 15 22:00:32 2002 -+++ mutt-1.3.27/mutt.h Wed Jan 23 22:33:11 2002 -@@ -185,4 +185,5 @@ enum + /* +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/mutt.h mutt-1.5.10/mutt.h +--- mutt-1.5.10.orig/mutt.h 2005-10-07 09:29:54.000000000 +0200 ++++ mutt-1.5.10/mutt.h 2005-10-07 09:30:06.000000000 +0200 +@@ -207,6 +207,7 @@ + M_DELETE, M_UNDELETE, M_DELETED, + M_APPENDED, M_FLAG, M_TAG, -@@ -618,4 +619,5 @@ typedef struct header + M_UNTAG, +@@ -702,6 +703,7 @@ + unsigned int mime : 1; /* has a Mime-Version header? */ unsigned int flagged : 1; /* marked important? */ unsigned int tagged : 1; + unsigned int appended : 1; /* has been saved */ unsigned int deleted : 1; unsigned int changed : 1; -@@ -740,4 +742,5 @@ typedef struct + unsigned int attach_del : 1; /* has an attachment marked for deletion */ +@@ -830,6 +832,7 @@ + int new; /* how many new messages? */ int unread; /* how many unread messages? */ int deleted; /* how many deleted messages */ + int appended; /* how many saved messages? */ int flagged; /* how many flagged messages */ int msgnotreadyet; /* which msg "new" in pager, -1 if none */ -diff -pruN2 mutt-1.3.27.orig/mx.c mutt-1.3.27/mx.c ---- mutt-1.3.27.orig/mx.c Tue Jan 15 22:09:53 2002 -+++ mutt-1.3.27/mx.c Wed Jan 23 22:33:11 2002 -@@ -816,4 +816,45 @@ static int sync_mailbox (CONTEXT *ctx, i + #if defined USE_POP || defined USE_IMAP +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/mx.c mutt-1.5.10/mx.c +--- mutt-1.5.10.orig/mx.c 2005-10-07 09:29:54.000000000 +0200 ++++ mutt-1.5.10/mx.c 2005-10-07 09:30:06.000000000 +0200 +@@ -850,6 +850,47 @@ + return rc; } +/* move deleted mails to the trash folder */ @@ -132,7 +151,9 @@ + /* save changes and close mailbox */ int mx_close_mailbox (CONTEXT *ctx, int *index_hint) -@@ -999,9 +1040,17 @@ int mx_close_mailbox (CONTEXT *ctx, int + { +@@ -1032,11 +1073,19 @@ + if (ctx->changed || ctx->deleted) { - if ((check = sync_mailbox (ctx, index_hint)) != 0) @@ -151,7 +172,9 @@ + } } } -@@ -1174,6 +1223,10 @@ int mx_sync_mailbox (CONTEXT *ctx, int * + +@@ -1214,8 +1263,12 @@ + if (ctx->magic == M_IMAP) rc = imap_sync_mailbox (ctx, purge, index_hint); else -#endif @@ -163,10 +186,12 @@ + } if (rc == 0) { -diff -pruN2 mutt-1.3.27.orig/postpone.c mutt-1.3.27/postpone.c ---- mutt-1.3.27.orig/postpone.c Mon Dec 3 11:17:57 2001 -+++ mutt-1.3.27/postpone.c Wed Jan 23 22:33:11 2002 -@@ -271,4 +271,7 @@ int mutt_get_postponed (CONTEXT *ctx, HE + #ifdef USE_IMAP +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/postpone.c mutt-1.5.10/postpone.c +--- mutt-1.5.10.orig/postpone.c 2005-02-03 19:47:53.000000000 +0100 ++++ mutt-1.5.10/postpone.c 2005-10-07 09:30:06.000000000 +0200 +@@ -279,6 +279,9 @@ + /* finished with this message, so delete it. */ mutt_set_flag (PostContext, h, M_DELETE, 1); + /* and consider it saved, so that it won't be moved to the trash folder */ @@ -174,8 +199,4 @@ + /* update the count for the status display */ PostCount = PostContext->msgcount - PostContext->deleted; -diff -pruN mutt-1.3.27.orig/PATCHES mutt-1.3.27/PATCHES ---- mutt-1.3.27.orig/PATCHES Mon Nov 26 20:16:52 2001 -+++ mutt-1.3.27/PATCHES Thu Dec 6 16:27:55 2001 -@@ -1,0 +1 @@ -+patch-1.3.27.cd.trash_folder.1 + ================================================================ Index: SOURCES/mutt-manual.patch diff -u SOURCES/mutt-manual.patch:1.1.4.1 SOURCES/mutt-manual.patch:1.1.4.2 --- SOURCES/mutt-manual.patch:1.1.4.1 Thu Mar 31 19:16:54 2005 +++ SOURCES/mutt-manual.patch Fri Oct 7 10:07:10 2005 @@ -1,6 +1,6 @@ -diff -urN mutt-1.4.orig/Muttrc.head.in mutt-1.4/Muttrc.head.in ---- mutt-1.4.orig/Muttrc.head.in Mon Mar 20 11:25:49 2000 -+++ mutt-1.4/Muttrc.head.in Thu Aug 1 21:48:21 2002 +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/Muttrc.head.in mutt-1.5.10/Muttrc.head.in +--- mutt-1.5.10.orig/Muttrc.head.in 2002-01-24 13:10:47.000000000 +0100 ++++ mutt-1.5.10/Muttrc.head.in 2005-10-07 09:34:11.000000000 +0200 @@ -15,9 +15,9 @@ macro pager \cb |urlview\n 'call urlview to extract URLs out of a message' @@ -14,14 +14,24 @@ # If Mutt is unable to determine your site's domain name correctly, you can # set the default here. ---- mutt-1.5.9/doc/Makefile.in.orig 2005-02-15 20:28:24.000000000 +0100 -+++ mutt-1.5.9/doc/Makefile.in 2005-03-31 19:14:24.632303128 +0200 -@@ -103,7 +103,7 @@ +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/doc/Makefile.in mutt-1.5.10/doc/Makefile.in +--- mutt-1.5.10.orig/doc/Makefile.in 2005-08-11 21:37:02.000000000 +0200 ++++ mutt-1.5.10/doc/Makefile.in 2005-10-07 09:35:04.000000000 +0200 +@@ -114,7 +114,7 @@ check: manual.txt: manual.sgml -- if linuxdoc -B txt --pass='-P -c' manual ; then \ +- if linuxdoc -B txt -c latin --pass='-P -c' manual ; then \ + if sgml2txt -c latin manual ; then \ uniq < manual.txt | expand > _manual.txt ; \ rm manual.txt ; \ mv _manual.txt manual.txt ;\ +Only in mutt-1.5.10/doc: manual-1.html +Only in mutt-1.5.10/doc: manual-2.html +Only in mutt-1.5.10/doc: manual-3.html +Only in mutt-1.5.10/doc: manual-4.html +Only in mutt-1.5.10/doc: manual-5.html +Only in mutt-1.5.10/doc: manual-6.html +Only in mutt-1.5.10/doc: manual-7.html +Only in mutt-1.5.10/doc: manual.html +Only in mutt-1.5.10/doc: manual.txt ================================================================ Index: SOURCES/mutt-rr.compressed.patch diff -u SOURCES/mutt-rr.compressed.patch:1.4.4.3 SOURCES/mutt-rr.compressed.patch:1.4.4.4 --- SOURCES/mutt-rr.compressed.patch:1.4.4.3 Thu Mar 31 18:25:38 2005 +++ SOURCES/mutt-rr.compressed.patch Fri Oct 7 10:07:10 2005 @@ -1,7 +1,7 @@ -diff -udprP mutt-1.5.9.orig/Makefile.am mutt-1.5.9/Makefile.am ---- mutt-1.5.9.orig/Makefile.am 2005-02-13 11:56:41.000000000 +0200 -+++ mutt-1.5.9/Makefile.am 2005-03-13 19:36:54.827894664 +0200 -@@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist. +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/Makefile.am mutt-1.5.10/Makefile.am +--- mutt-1.5.10.orig/Makefile.am 2005-08-11 23:27:28.000000000 +0200 ++++ mutt-1.5.10/Makefile.am 2005-10-07 09:39:13.000000000 +0200 +@@ -18,7 +18,7 @@ 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 \ @@ -10,7 +10,7 @@ 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 \ -@@ -68,6 +68,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mu +@@ -68,6 +68,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ configure account.h \ @@ -18,9 +18,9 @@ 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 -udprP mutt-1.5.9.orig/Makefile.in mutt-1.5.9/Makefile.in ---- mutt-1.5.9.orig/Makefile.in 2005-03-13 18:37:46.000000000 +0200 -+++ mutt-1.5.9/Makefile.in 2005-03-13 19:36:54.828894512 +0200 +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/Makefile.in mutt-1.5.10/Makefile.in +--- mutt-1.5.10.orig/Makefile.in 2005-08-11 23:50:19.000000000 +0200 ++++ mutt-1.5.10/Makefile.in 2005-10-07 09:39:13.000000000 +0200 @@ -14,6 +14,10 @@ @SET_MAKE@ @@ -30,14 +30,14 @@ +mutt_OBJECTS += compress.o + - SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) + SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) pgpewrap.c $(pgpring_SOURCES) -diff -udprP mutt-1.5.9.orig/Muttrc.head mutt-1.5.9/Muttrc.head ---- mutt-1.5.9.orig/Muttrc.head 2005-03-13 18:37:06.000000000 +0200 -+++ mutt-1.5.9/Muttrc.head 2005-03-13 19:36:54.828894512 +0200 -@@ -19,6 +19,11 @@ macro generic <f1> "!less /usr/local/doc - macro index <f1> "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation" - macro pager <f1> "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation" +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/Muttrc.head mutt-1.5.10/Muttrc.head +--- mutt-1.5.10.orig/Muttrc.head 2005-08-11 23:49:51.000000000 +0200 ++++ mutt-1.5.10/Muttrc.head 2005-10-07 09:39:13.000000000 +0200 +@@ -19,6 +19,11 @@ + macro index <f1> "!less ${prefix}/doc/mutt/manual.txt\n" "Show Mutt documentation" + macro pager <f1> "!less ${prefix}/doc/mutt/manual.txt\n" "Show Mutt documentation" +# Use folders which match on \\.gz$ as gzipped folders: +# open-hook \\.gz$ "gzip -cd %f > %t" @@ -47,782 +47,456 @@ # If Mutt is unable to determine your site's domain name correctly, you can # set the default here. # -diff -udprP mutt-1.5.9.orig/PATCHES mutt-1.5.9/PATCHES ---- mutt-1.5.9.orig/PATCHES 2005-03-13 18:33:06.000000000 +0200 -+++ mutt-1.5.9/PATCHES 2005-03-13 19:36:54.829894360 +0200 +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/PATCHES mutt-1.5.10/PATCHES +--- mutt-1.5.10.orig/PATCHES 2005-08-11 23:27:30.000000000 +0200 ++++ mutt-1.5.10/PATCHES 2005-10-07 09:39:13.000000000 +0200 @@ -0,0 +1 @@ +rr.compressed -diff -udprP mutt-1.5.9.orig/compress.c mutt-1.5.9/compress.c ---- mutt-1.5.9.orig/compress.c 1970-01-01 03:00:00.000000000 +0300 -+++ mutt-1.5.9/compress.c 2005-03-13 19:36:54.830894208 +0200 -@@ -0,0 +1,490 @@ -+/* -+ * Copyright (C) 1997 Alain Penders <[EMAIL PROTECTED]> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ */ +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/config.h.in mutt-1.5.10/config.h.in +--- mutt-1.5.10.orig/config.h.in 2005-08-11 23:49:51.000000000 +0200 ++++ mutt-1.5.10/config.h.in 2005-10-07 09:39:13.000000000 +0200 +@@ -497,6 +497,9 @@ + + /* Define to enable Sun mailtool attachments support. */ + #undef SUN_ATTACHMENT ++ ++/* The compressed mailboxes support */ ++#undef USE_COMPRESSED + + /* Define to use dotlocking for mailboxes. */ + #undef USE_DOTLOCK +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/configure mutt-1.5.10/configure +--- mutt-1.5.10.orig/configure 2005-08-11 23:49:35.000000000 +0200 ++++ mutt-1.5.10/configure 2005-10-07 09:39:13.000000000 +0200 +@@ -867,6 +867,7 @@ + --enable-nfs-fix Work around an NFS with broken attributes caching + --enable-buffy-size Use file size attribute instead of access time + --enable-mailtool Enable Sun mailtool attachments support ++ --enable-compressed Enable compressed folders support + --enable-locales-fix The result of isprint() is unreliable + --enable-exact-address Enable regeneration of email addresses + --enable-hcache Enable header caching +@@ -11235,6 +11236,18 @@ + fi + fi + + -+#if HAVE_CONFIG_H -+# include "config.h" -+#endif ++# 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 <<\EOF ++#define USE_COMPRESSED 1 ++EOF + -+#include "mutt.h" ++ fi ++fi ++ + if test $mutt_cv_regex = yes; then + + cat >>confdefs.h <<\_ACEOF +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/configure.in mutt-1.5.10/configure.in +--- mutt-1.5.10.orig/configure.in 2005-10-07 09:38:57.000000000 +0200 ++++ mutt-1.5.10/configure.in 2005-10-07 09:39:13.000000000 +0200 +@@ -746,6 +746,11 @@ + AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ]) + fi]) + ++AC_ARG_ENABLE(compressed, AC_HELP_STRING([--enable-compressed], [Enable compressed folders support]), ++ [if test x$enableval = xyes; then ++ AC_DEFINE(USE_COMPRESSED,1,[ Define to enable compressed folders support. ]) ++ fi]) + + AC_ARG_ENABLE(locales-fix, AC_HELP_STRING([--enable-locales-fix], [The result of isprint() is unreliable]), + [if test x$enableval = xyes; then + AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/curs_main.c mutt-1.5.10/curs_main.c +--- mutt-1.5.10.orig/curs_main.c 2005-08-11 21:37:01.000000000 +0200 ++++ mutt-1.5.10/curs_main.c 2005-10-07 09:39:13.000000000 +0200 +@@ -1087,6 +1087,11 @@ + { + int check; + +#ifdef USE_COMPRESSED ++ if (Context->compressinfo && Context->realpath) ++ mutt_str_replace (&LastFolder, Context->realpath); ++ else ++#endif + mutt_str_replace (&LastFolder, Context->path); + oldcount = Context ? Context->msgcount : 0; + +diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/doc/manual.sgml mutt-1.5.10/doc/manual.sgml +--- mutt-1.5.10.orig/doc/manual.sgml 2005-08-11 23:49:52.000000000 +0200 ++++ mutt-1.5.10/doc/manual.sgml 2005-10-07 09:39:13.000000000 +0200 +@@ -2576,6 +2576,168 @@ + macro pager \cb |urlview\n + </verb></tscreen> + ++<sect1>Compressed folders Support (OPTIONAL) ++<p> + -+#include "mx.h" -+#include "mailbox.h" -+#include "mutt_curses.h" ++If Mutt was compiled with compressed folders support (by running the ++<em/configure/ script with the <em/--enable-compressed/ flag), Mutt ++can open folders stored in an arbitrary format, provided that the user ++has a script to convert from/to this format to one of the accepted. + -+#include <errno.h> -+#include <string.h> -+#include <unistd.h> -+#include <sys/stat.h> ++The most common use is to open compressed archived folders e.g. with ++gzip. + -+typedef struct -+{ -+ const char *close; /* close-hook command */ -+ const char *open; /* open-hook command */ -+ const char *append; /* append-hook command */ -+ off_t size; /* size of real folder */ -+} COMPRESS_INFO; ++In addition, the user can provide a script that gets a folder in an ++accepted format and appends its context to the folder in the ++user-defined format, which may be faster than converting the entire ++folder to the accepted format, appending to it and converting back to ++the user-defined format. + -+char echo_cmd[HUGE_STRING]; ++There are three hooks defined (<ref id="open-hook" name="open-hook">, ++<ref id="close-hook" name="close-hook"> and <ref id="append-hook" ++name="append-hook">) which define commands to uncompress and compress ++a folder and to append messages to an existing compressed folder ++respectively. + -+/* parameters: <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/mutt-bj.status-time.patch?r1=1.1&r2=1.1.4.1&f=u http://cvs.pld-linux.org/SOURCES/mutt-cd.trash_folder.patch?r1=1.1&r2=1.1.4.1&f=u http://cvs.pld-linux.org/SOURCES/mutt-manual.patch?r1=1.1.4.1&r2=1.1.4.2&f=u http://cvs.pld-linux.org/SOURCES/mutt-rr.compressed.patch?r1=1.4.4.3&r2=1.4.4.4&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit