From: Antonio Radici Date: Sun, 3 Oct 2010 20:11:26 +0000 (+0100) Subject: refreshed all patches up to mutt.org X-Git-Tag: debian/1.5.21-1~2 X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/73c09bc56e79605cf421a31c7e36958422055a20 refreshed all patches up to mutt.org --- diff --git a/debian/patches/debian-specific/467432-write_bcc.patch b/debian/patches/debian-specific/467432-write_bcc.patch index c075cdc..7a14553 100644 --- a/debian/patches/debian-specific/467432-write_bcc.patch +++ b/debian/patches/debian-specific/467432-write_bcc.patch @@ -26,7 +26,7 @@ Stefan Völkel in the second bug /* now copy the body of the message. */ --- a/init.h +++ b/init.h -@@ -3365,14 +3365,9 @@ +@@ -3392,14 +3392,9 @@ { "write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, 1}, /* ** .pp @@ -46,7 +46,7 @@ Stefan Völkel in the second bug /* --- a/protos.h +++ b/protos.h -@@ -372,7 +372,7 @@ +@@ -366,7 +366,7 @@ int mutt_write_mime_body (BODY *, FILE *); int mutt_write_mime_header (BODY *, FILE *); int mutt_write_one_header (FILE *fp, const char *tag, const char *value, const char *pfx, int wraplen, int flags); @@ -57,7 +57,7 @@ Stefan Völkel in the second bug void mutt_set_header_color(CONTEXT *, HEADER *); --- a/send.c +++ b/send.c -@@ -994,10 +994,10 @@ +@@ -995,10 +995,10 @@ unset_option (OPTWRITEBCC); #endif #ifdef MIXMASTER @@ -72,7 +72,7 @@ Stefan Völkel in the second bug if (old_write_bcc) --- a/sendlib.c +++ b/sendlib.c -@@ -1835,7 +1835,7 @@ +@@ -1929,7 +1929,7 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach, @@ -81,7 +81,7 @@ Stefan Völkel in the second bug { char buffer[LONG_STRING]; char *p, *q; -@@ -1878,7 +1878,7 @@ +@@ -1972,7 +1972,7 @@ else if (mode > 0) fputs ("Cc: \n", fp); @@ -90,7 +90,7 @@ Stefan Völkel in the second bug { if(mode != 0 || option(OPTWRITEBCC)) { -@@ -2616,7 +2616,7 @@ +@@ -2711,7 +2711,7 @@ /* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header() * post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header() * */ diff --git a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff index 61d04ce..13a96b6 100644 --- a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff +++ b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff @@ -3,16 +3,16 @@ used, rather than calling gethostbyname() on the actual hostname --- a/init.c +++ b/init.c -@@ -47,6 +47,7 @@ +@@ -48,6 +48,7 @@ #include #include #include +#include #include #include - -@@ -2953,6 +2954,31 @@ - return 0; + #include +@@ -2952,6 +2953,31 @@ + srandom(seed); } +int getmailname(char *s, size_t l) diff --git a/debian/patches/debian-specific/Muttrc b/debian/patches/debian-specific/Muttrc index fd0a798..5af37cc 100644 --- a/debian/patches/debian-specific/Muttrc +++ b/debian/patches/debian-specific/Muttrc @@ -40,7 +40,7 @@ # imitate the old search-body function macro index \eb "~b " "search in message bodies" -@@ -23,7 +51,7 @@ +@@ -23,14 +51,14 @@ "call urlview to extract URLs out of a message" # Show documentation when pressing F1 @@ -49,8 +49,7 @@ # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" macro index,pager y "?" "show incoming mailboxes list" -@@ -35,7 +63,7 @@ - # append-hook \\.gz$ "gzip -c %t >> %f" + bind browser y exit # If Mutt is unable to determine your site's domain name correctly, you can -# set the default here. @@ -58,7 +57,7 @@ # # set hostname=cs.hmc.edu -@@ -47,6 +75,10 @@ +@@ -42,6 +70,10 @@ # be undone with unmime_lookup. mime_lookup application/octet-stream @@ -69,7 +68,7 @@ ## ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH *** ## -@@ -101,6 +133,9 @@ +@@ -96,6 +128,9 @@ attachments -A message/external-body attachments -I message/external-body diff --git a/debian/patches/debian-specific/document_debian_defaults b/debian/patches/debian-specific/document_debian_defaults index 7240bef..38f46ad 100644 --- a/debian/patches/debian-specific/document_debian_defaults +++ b/debian/patches/debian-specific/document_debian_defaults @@ -1,10 +1,8 @@ Some customization of the option which are straying from the default only on Debian systems -Index: mutt/init.h -=================================================================== ---- mutt.orig/init.h 2009-06-25 12:36:35.000000000 +0200 -+++ mutt/init.h 2009-06-25 12:36:36.000000000 +0200 +--- a/init.h ++++ b/init.h @@ -312,6 +312,9 @@ ** .pp ** When this variable is \fIset\fP, mutt will include Delivered-To headers when @@ -15,7 +13,7 @@ Index: mutt/init.h */ { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 }, /* -@@ -1032,6 +1035,9 @@ +@@ -1033,6 +1036,9 @@ ** one is not used. ** .pp ** Also see $$use_domain and $$hidden_host. @@ -25,7 +23,7 @@ Index: mutt/init.h */ { "ignore_linear_white_space", DT_BOOL, R_NONE, OPTIGNORELWS, 0 }, /* -@@ -1554,6 +1560,9 @@ +@@ -1566,6 +1572,9 @@ ** system. It is used with various sets of parameters to gather the ** list of known remailers, and to finally send a message through the ** mixmaster chain. @@ -35,7 +33,7 @@ Index: mutt/init.h */ #endif { "move", DT_QUAD, R_NONE, OPT_MOVE, M_NO }, -@@ -2570,6 +2579,10 @@ +@@ -2585,6 +2594,10 @@ ** This variable contains the name of either a directory, or a file which ** contains trusted certificates for use with OpenSSL. ** (S/MIME only) @@ -46,7 +44,7 @@ Index: mutt/init.h */ { "smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, 0 }, /* -@@ -2776,6 +2789,9 @@ +@@ -2791,6 +2804,9 @@ ** .ts ** set smtp_authenticators="digest-md5:cram-md5" ** .te @@ -56,7 +54,7 @@ Index: mutt/init.h */ # endif /* USE_SASL */ { "smtp_pass", DT_STR, R_NONE, UL &SmtpPass, UL 0 }, -@@ -2823,6 +2839,9 @@ +@@ -2838,6 +2854,9 @@ ** .pp ** You may optionally use the ``reverse-'' prefix to specify reverse sorting ** order (example: ``\fCset sort=reverse-date-sent\fP''). @@ -66,7 +64,7 @@ Index: mutt/init.h */ { "sort_alias", DT_SORT|DT_SORT_ALIAS, R_NONE, UL &SortAlias, SORT_ALIAS }, /* -@@ -3348,6 +3367,9 @@ +@@ -3375,6 +3394,9 @@ ** is set to deliver directly via SMTP (see $$smtp_url), this ** option does nothing: mutt will never write out the ``Bcc:'' header ** in this case. diff --git a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime index cb91b5f..4179485 100644 --- a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime +++ b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime @@ -1,10 +1,8 @@ Enable pgp_mime_signature_filename and pgp_mime_signature_description -Index: mutt/globals.h -=================================================================== ---- mutt.orig/globals.h 2009-06-25 12:35:48.000000000 +0200 -+++ mutt/globals.h 2009-06-25 12:36:22.000000000 +0200 -@@ -242,6 +242,8 @@ +--- a/globals.h ++++ b/globals.h +@@ -243,6 +243,8 @@ WHERE char *PgpListSecringCommand; WHERE char *PgpListPubringCommand; WHERE char *PgpGetkeysCommand; @@ -13,11 +11,9 @@ Index: mutt/globals.h /*-- formerly in smime.h --*/ WHERE char *SmimeDefaultKey; -Index: mutt/init.h -=================================================================== ---- mutt.orig/init.h 2009-06-25 12:35:48.000000000 +0200 -+++ mutt/init.h 2009-06-25 12:36:22.000000000 +0200 -@@ -2541,6 +2541,18 @@ +--- a/init.h ++++ b/init.h +@@ -2556,6 +2556,18 @@ ** a line quoted text if it also matches $$smileys. This mostly ** happens at the beginning of a line. */ @@ -36,12 +32,10 @@ Index: mutt/init.h -Index: mutt/pgp.c -=================================================================== ---- mutt.orig/pgp.c 2009-06-25 12:35:36.000000000 +0200 -+++ mutt/pgp.c 2009-06-25 12:36:22.000000000 +0200 -@@ -1131,6 +1131,8 @@ - t->disposition = DISPINLINE; +--- a/pgp.c ++++ b/pgp.c +@@ -1129,6 +1129,8 @@ + t->disposition = DISPNONE; t->encoding = ENC7BIT; t->unlink = 1; /* ok to remove this file after sending. */ + mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter); diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders index 274aec2..a9de103 100644 --- a/debian/patches/features/compressed-folders +++ b/debian/patches/features/compressed-folders @@ -551,7 +551,7 @@ The home page for this patch is: +void mutt_fast_close_compressed (CONTEXT *); --- a/configure.ac +++ b/configure.ac -@@ -805,6 +805,11 @@ +@@ -812,6 +812,11 @@ AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -565,7 +565,7 @@ The home page for this patch is: AC_DEFINE_UNQUOTED(EXECSHELL, "$withval", --- a/curs_main.c +++ b/curs_main.c -@@ -1135,6 +1135,11 @@ +@@ -1153,6 +1153,11 @@ { int check; @@ -579,7 +579,7 @@ The home page for this patch is: --- a/doc/manual.xml.head +++ b/doc/manual.xml.head -@@ -5678,6 +5678,205 @@ +@@ -6116,6 +6116,205 @@ @@ -787,7 +787,7 @@ The home page for this patch is: --- a/doc/muttrc.man.head +++ b/doc/muttrc.man.head -@@ -345,6 +345,24 @@ +@@ -346,6 +346,24 @@ 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. @@ -844,7 +844,7 @@ The home page for this patch is: ) --- a/init.h +++ b/init.h -@@ -3504,6 +3504,11 @@ +@@ -3530,6 +3530,11 @@ { "fcc-hook", mutt_parse_hook, M_FCCHOOK }, { "fcc-save-hook", mutt_parse_hook, M_FCCHOOK | M_SAVEHOOK }, { "folder-hook", mutt_parse_hook, M_FOLDERHOOK }, @@ -853,12 +853,12 @@ The home page for this patch is: + { "close-hook", mutt_parse_hook, M_CLOSEHOOK }, + { "append-hook", mutt_parse_hook, M_APPENDHOOK }, +#endif - { "group", parse_group, 0 }, - { "ungroup", parse_ungroup, 0 }, + { "group", parse_group, M_GROUP }, + { "ungroup", parse_group, M_UNGROUP }, { "hdr_order", parse_list, UL &HeaderOrderList }, --- a/main.c +++ b/main.c -@@ -402,6 +402,12 @@ +@@ -401,6 +401,12 @@ #else "-LOCALES_HACK " #endif @@ -873,7 +873,7 @@ The home page for this patch is: "+HAVE_WC_FUNCS " --- a/Makefile.am +++ b/Makefile.am -@@ -18,7 +18,7 @@ +@@ -22,7 +22,7 @@ bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ mutt_SOURCES = \ addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ @@ -882,7 +882,7 @@ The home page for this patch is: 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 \ -@@ -57,7 +57,7 @@ +@@ -61,7 +61,7 @@ bcache.h browser.h hcache.h mbyte.h mutt_idna.h remailer.h url.h EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ @@ -904,7 +904,7 @@ The home page for this patch is: #include #include #include -@@ -1048,6 +1052,12 @@ +@@ -1070,6 +1074,12 @@ int mbox_close_mailbox (CONTEXT *ctx) { mx_unlock_file (ctx->path, fileno (ctx->fp), 1); @@ -931,7 +931,7 @@ The home page for this patch is: /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -882,6 +887,11 @@ +@@ -887,6 +892,11 @@ int flagged; /* how many flagged messages */ int msgnotreadyet; /* which msg "new" in pager, -1 if none */ @@ -956,7 +956,7 @@ The home page for this patch is: #ifdef USE_IMAP #include "imap.h" #endif -@@ -415,6 +419,10 @@ +@@ -414,6 +418,10 @@ return (-1); } @@ -967,7 +967,7 @@ The home page for this patch is: return (magic); } -@@ -454,6 +462,13 @@ +@@ -453,6 +461,13 @@ { struct stat sb; @@ -981,7 +981,7 @@ The home page for this patch is: ctx->append = 1; #ifdef USE_IMAP -@@ -617,7 +632,12 @@ +@@ -616,7 +631,12 @@ } ctx->magic = mx_get_magic (path); @@ -995,7 +995,7 @@ The home page for this patch is: if(ctx->magic == 0) mutt_error (_("%s is not a mailbox."), path); -@@ -718,6 +738,10 @@ +@@ -721,6 +741,10 @@ mutt_free_header (&ctx->hdrs[i]); FREE (&ctx->hdrs); FREE (&ctx->v2r); @@ -1006,7 +1006,7 @@ The home page for this patch is: FREE (&ctx->path); FREE (&ctx->pattern); if (ctx->limit_pattern) -@@ -770,6 +794,12 @@ +@@ -773,6 +797,12 @@ if (tmp && tmp->new == 0) mutt_update_mailbox (tmp); @@ -1019,7 +1019,7 @@ The home page for this patch is: return rc; } -@@ -1033,6 +1063,11 @@ +@@ -1043,6 +1073,11 @@ !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY)) mx_unlink_empty (ctx->path); @@ -1031,7 +1031,7 @@ The home page for this patch is: mx_fastclose_mailbox (ctx); return 0; -@@ -1355,6 +1390,11 @@ +@@ -1361,6 +1396,11 @@ { int rc; @@ -1045,55 +1045,49 @@ The home page for this patch is: if (ctx->locked) lock = 0; --- a/mx.h +++ b/mx.h -@@ -40,6 +40,9 @@ - #ifdef USE_POP - , M_POP - #endif +@@ -36,6 +36,9 @@ + M_MAILDIR, + M_IMAP, + M_POP +#ifdef USE_COMPRESSED + , M_COMPRESSED +#endif }; WHERE short DefaultMagic INITVAL (M_MBOX); +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -8,6 +8,7 @@ + color.c + commands.c + compose.c ++compress.c + crypt-gpgme.c + crypt.c + cryptglue.c +--- a/status.c ++++ b/status.c +@@ -96,6 +96,14 @@ + + case 'f': + snprintf (fmt, sizeof(fmt), "%%%ss", prefix); ++#ifdef USE_COMPRESSED ++ if (Context && Context->compressinfo && Context->realpath) ++ { ++ strfcpy (tmp, Context->realpath, sizeof (tmp)); ++ mutt_pretty_mailbox (tmp, sizeof (tmp)); ++ } ++ else ++#endif + if (Context && Context->path) + { + strfcpy (tmp, Context->path, sizeof (tmp)); --- a/po/de.po +++ b/po/de.po -@@ -2005,6 +2005,10 @@ - msgid "Bad history file format (line %d)" - msgstr "Falsches Format der Datei früherer Eingaben (Zeile %d)" - -+#: hook.c:96 -+msgid "badly formatted command string" -+msgstr "Hook enthält nicht die Muster %f und %t" -+ - #: hook.c:251 - #, c-format - msgid "unhook: Can't do unhook * from within a hook." -@@ -2766,7 +2770,7 @@ - msgid "Mailbox is corrupt!" - msgstr "Mailbox fehlerhaft!" - --#: mbox.c:678 -+#: mbox.c:678 compress.c:203 mbox.c:661 - msgid "Mailbox was corrupted!" - msgstr "Mailbox wurde zerstört!" - -@@ -2774,10 +2778,11 @@ - msgid "Fatal error! Could not reopen mailbox!" - msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!" +@@ -5159,6 +5159,36 @@ + msgid "show S/MIME options" + msgstr "Zeige S/MIME Optionen" --#: mbox.c:746 -+#: mbox.c:746 compress.c:264 compress.c:246 compress.c:367 compress.c:443 mbox.c:706 - 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. -@@ -5378,3 +5383,32 @@ - - #~ msgid "Authentication method is unknown." - #~ msgstr "Authentifizierungsmethode unbekannt." + +#: compress.c:228 compress.c:253 +#, c-format @@ -1123,30 +1117,7 @@ The home page for this patch is: +#, c-format +msgid " %s: Error compressing mailbox! Uncompressed one kept!\n" +msgstr " %s: Fehler beim packen der Mailbox! Entpackte Mailbox gespeichert!\n" ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -8,6 +8,7 @@ - color.c - commands.c - compose.c -+compress.c - crypt-gpgme.c - crypt.c - cryptglue.c ---- a/status.c -+++ b/status.c -@@ -96,6 +96,14 @@ ++ + #~ msgid "Clear" + #~ msgstr "Klartext" - case 'f': - snprintf (fmt, sizeof(fmt), "%%%ss", prefix); -+#ifdef USE_COMPRESSED -+ if (Context && Context->compressinfo && Context->realpath) -+ { -+ strfcpy (tmp, Context->realpath, sizeof (tmp)); -+ mutt_pretty_mailbox (tmp, sizeof (tmp)); -+ } -+ else -+#endif - if (Context && Context->path) - { - strfcpy (tmp, Context->path, sizeof (tmp)); diff --git a/debian/patches/features/ifdef b/debian/patches/features/ifdef index 28913b5..771d8b0 100644 --- a/debian/patches/features/ifdef +++ b/debian/patches/features/ifdef @@ -28,8 +28,8 @@ ifdef trash set trash=~/Mail/trash == END PATCH --- a/init.c +++ b/init.c -@@ -635,6 +635,65 @@ static int remove_from_rx_list (RX_LIST - return (rv); +@@ -601,6 +601,65 @@ + } } +static int parse_ifdef (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err) @@ -96,7 +96,7 @@ ifdef trash set trash=~/Mail/trash do --- a/init.h +++ b/init.h -@@ -3413,6 +3413,7 @@ static int parse_lists (BUFFER *, BUFFER +@@ -3439,6 +3439,7 @@ static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *); @@ -104,9 +104,9 @@ ifdef trash set trash=~/Mail/trash static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *); -@@ -3463,6 +3464,7 @@ struct command_t Commands[] = { - { "group", parse_group, 0 }, - { "ungroup", parse_ungroup, 0 }, +@@ -3489,6 +3490,7 @@ + { "group", parse_group, M_GROUP }, + { "ungroup", parse_group, M_UNGROUP }, { "hdr_order", parse_list, UL &HeaderOrderList }, + { "ifdef", parse_ifdef, 0 }, #ifdef HAVE_ICONV @@ -114,7 +114,7 @@ ifdef trash set trash=~/Mail/trash #endif --- a/doc/manual.xml.head +++ b/doc/manual.xml.head -@@ -4087,6 +4087,28 @@ considered to be an executable program f +@@ -4373,6 +4373,28 @@ diff --git a/debian/patches/features/imap_fast_trash b/debian/patches/features/imap_fast_trash index def2bc2..d40d169 100644 --- a/debian/patches/features/imap_fast_trash +++ b/debian/patches/features/imap_fast_trash @@ -4,11 +4,9 @@ Make "move to trash folder" use IMAP COPY. by Paul Miller (jettero) -diff --git a/imap/imap.c b/imap/imap.c -index f08b4ea..47a8035 100644 --- a/imap/imap.c +++ b/imap/imap.c -@@ -2028,3 +2028,54 @@ int imap_complete(char* dest, size_t dlen, char* path) { +@@ -2028,3 +2028,54 @@ return -1; } @@ -63,11 +61,9 @@ index f08b4ea..47a8035 100644 + + return 1; +} -diff --git a/imap/imap.h b/imap/imap.h -index 74d7e13..99cd454 100644 --- a/imap/imap.h +++ b/imap/imap.h -@@ -72,4 +72,7 @@ void imap_keepalive (void); +@@ -72,4 +72,7 @@ int imap_account_match (const ACCOUNT* a1, const ACCOUNT* a2); @@ -75,11 +71,9 @@ index 74d7e13..99cd454 100644 +int imap_fast_trash(); + #endif -diff --git a/mx.c b/mx.c -index 78aafcc..38c4e7f 100644 --- a/mx.c +++ b/mx.c -@@ -828,6 +828,11 @@ static int trash_append (CONTEXT *ctx) +@@ -802,6 +802,11 @@ && stc.st_dev == st.st_dev && stc.st_rdev == st.st_rdev) return 0; /* we are in the trash folder: simple sync */ diff --git a/debian/patches/features/purge-message b/debian/patches/features/purge-message index d16c0f2..9d290b9 100644 --- a/debian/patches/features/purge-message +++ b/debian/patches/features/purge-message @@ -26,11 +26,9 @@ of having a trash folder feature. - Fixed indentation of "purged" in mutt.h. == END PATCH -Index: mutt/OPS -=================================================================== ---- mutt.orig/OPS 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/OPS 2009-06-25 12:36:14.000000000 +0200 -@@ -141,6 +141,7 @@ +--- a/OPS ++++ b/OPS +@@ -142,6 +142,7 @@ OP_PREV_LINE "scroll up one line" OP_PREV_PAGE "move to the previous page" OP_PRINT "print the current entry" @@ -38,11 +36,9 @@ Index: mutt/OPS OP_QUERY "query external program for addresses" OP_QUERY_APPEND "append new query results to current results" OP_QUIT "save changes to mailbox and quit" -Index: mutt/curs_main.c -=================================================================== ---- mutt.orig/curs_main.c 2009-06-25 12:35:44.000000000 +0200 -+++ mutt/curs_main.c 2009-06-25 12:36:14.000000000 +0200 -@@ -1823,6 +1823,7 @@ +--- a/curs_main.c ++++ b/curs_main.c +@@ -1843,6 +1843,7 @@ MAYBE_REDRAW (menu->redraw); break; @@ -50,7 +46,7 @@ Index: mutt/curs_main.c case OP_DELETE: CHECK_MSGCOUNT; -@@ -1833,6 +1834,7 @@ +@@ -1853,6 +1854,7 @@ if (tag) { mutt_tag_set_flag (M_DELETE, 1); @@ -58,7 +54,7 @@ Index: mutt/curs_main.c if (option (OPTDELETEUNTAG)) mutt_tag_set_flag (M_TAG, 0); menu->redraw = REDRAW_INDEX; -@@ -1840,6 +1842,8 @@ +@@ -1860,6 +1862,8 @@ else { mutt_set_flag (Context, CURHDR, M_DELETE, 1); @@ -67,7 +63,7 @@ Index: mutt/curs_main.c if (option (OPTDELETEUNTAG)) mutt_set_flag (Context, CURHDR, M_TAG, 0); if (option (OPTRESOLVE)) -@@ -2136,11 +2140,13 @@ +@@ -2161,11 +2165,13 @@ if (tag) { mutt_tag_set_flag (M_DELETE, 0); @@ -81,7 +77,7 @@ Index: mutt/curs_main.c if (option (OPTRESOLVE) && menu->current < Context->vcount - 1) { menu->current++; -@@ -2161,9 +2167,11 @@ +@@ -2186,9 +2192,11 @@ CHECK_ACL(M_ACL_DELETE, _("undelete message(s)")); rc = mutt_thread_set_flag (CURHDR, M_DELETE, 0, @@ -95,10 +91,8 @@ Index: mutt/curs_main.c { if (option (OPTRESOLVE)) { -Index: mutt/flags.c -=================================================================== ---- mutt.orig/flags.c 2009-06-25 12:35:48.000000000 +0200 -+++ mutt/flags.c 2009-06-25 12:36:14.000000000 +0200 +--- a/flags.c ++++ b/flags.c @@ -104,6 +104,16 @@ } break; @@ -116,11 +110,9 @@ Index: mutt/flags.c case M_NEW: if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN)) -Index: mutt/functions.h -=================================================================== ---- mutt.orig/functions.h 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/functions.h 2009-06-25 12:36:14.000000000 +0200 -@@ -120,6 +120,7 @@ +--- a/functions.h ++++ b/functions.h +@@ -121,6 +121,7 @@ { "toggle-write", OP_TOGGLE_WRITE, "%" }, { "next-thread", OP_MAIN_NEXT_THREAD, "\016" }, { "next-subthread", OP_MAIN_NEXT_SUBTHREAD, "\033n" }, @@ -128,7 +120,7 @@ Index: mutt/functions.h { "query", OP_QUERY, "Q" }, { "quit", OP_QUIT, "q" }, { "reply", OP_REPLY, "r" }, -@@ -209,6 +210,7 @@ +@@ -213,6 +214,7 @@ { "print-message", OP_PRINT, "p" }, { "previous-thread", OP_MAIN_PREV_THREAD, "\020" }, { "previous-subthread",OP_MAIN_PREV_SUBTHREAD, "\033p" }, @@ -136,10 +128,8 @@ Index: mutt/functions.h { "quit", OP_QUIT, "Q" }, { "exit", OP_EXIT, "q" }, { "reply", OP_REPLY, "r" }, -Index: mutt/mutt.h -=================================================================== ---- mutt.orig/mutt.h 2009-06-25 12:35:48.000000000 +0200 -+++ mutt/mutt.h 2009-06-25 12:36:14.000000000 +0200 +--- a/mutt.h ++++ b/mutt.h @@ -188,6 +188,7 @@ M_UNDELETE, M_DELETED, @@ -148,7 +138,7 @@ Index: mutt/mutt.h M_FLAG, M_TAG, M_UNTAG, -@@ -704,6 +705,7 @@ +@@ -709,6 +710,7 @@ unsigned int flagged : 1; /* marked important? */ unsigned int tagged : 1; unsigned int appended : 1; /* has been saved */ @@ -156,11 +146,9 @@ Index: mutt/mutt.h unsigned int deleted : 1; unsigned int changed : 1; unsigned int attach_del : 1; /* has an attachment marked for deletion */ -Index: mutt/mx.c -=================================================================== ---- mutt.orig/mx.c 2009-06-25 12:36:10.000000000 +0200 -+++ mutt/mx.c 2009-06-25 12:36:14.000000000 +0200 -@@ -803,6 +803,7 @@ +--- a/mx.c ++++ b/mx.c +@@ -806,6 +806,7 @@ { for (i = 0 ; i < ctx->msgcount ; i++) if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->appended @@ -168,11 +156,9 @@ Index: mutt/mx.c && mutt_append_message (ctx_trash, ctx, ctx->hdrs[i], 0, 0) == -1) { mx_close_mailbox (ctx_trash, NULL); -Index: mutt/pager.c -=================================================================== ---- mutt.orig/pager.c 2009-06-25 12:35:44.000000000 +0200 -+++ mutt/pager.c 2009-06-25 12:36:14.000000000 +0200 -@@ -2316,12 +2316,15 @@ +--- a/pager.c ++++ b/pager.c +@@ -2343,12 +2343,15 @@ MAYBE_REDRAW (redraw); break; @@ -188,7 +174,7 @@ Index: mutt/pager.c if (option (OPTDELETEUNTAG)) mutt_set_flag (Context, extra->hdr, M_TAG, 0); redraw = REDRAW_STATUS | REDRAW_INDEX; -@@ -2648,6 +2651,7 @@ +@@ -2675,6 +2678,7 @@ CHECK_ACL(M_ACL_DELETE, _("undelete message")); mutt_set_flag (Context, extra->hdr, M_DELETE, 0); @@ -196,7 +182,7 @@ Index: mutt/pager.c redraw = REDRAW_STATUS | REDRAW_INDEX; if (option (OPTRESOLVE)) { -@@ -2663,9 +2667,11 @@ +@@ -2690,9 +2694,11 @@ CHECK_ACL(M_ACL_DELETE, _("undelete message(s)")); r = mutt_thread_set_flag (extra->hdr, M_DELETE, 0, @@ -209,11 +195,9 @@ Index: mutt/pager.c { if (option (OPTRESOLVE)) { -Index: mutt/pattern.c -=================================================================== ---- mutt.orig/pattern.c 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/pattern.c 2009-06-25 12:36:14.000000000 +0200 -@@ -1347,8 +1347,10 @@ +--- a/pattern.c ++++ b/pattern.c +@@ -1357,8 +1357,10 @@ { switch (op) { diff --git a/debian/patches/features/sensible_browser_position b/debian/patches/features/sensible_browser_position index 744353a..fe487b1 100644 --- a/debian/patches/features/sensible_browser_position +++ b/debian/patches/features/sensible_browser_position @@ -5,11 +5,9 @@ This is the sensible browser position patch by Haakon Riiser. http://lists.df7cb.de/mutt/message/20050309.162127.a244a894.en.html == END PATCH -Index: mutt/menu.c -=================================================================== ---- mutt.orig/menu.c 2009-06-25 12:35:36.000000000 +0200 -+++ mutt/menu.c 2009-06-25 12:36:19.000000000 +0200 -@@ -853,8 +853,17 @@ +--- a/menu.c ++++ b/menu.c +@@ -852,8 +852,17 @@ int mutt_menuLoop (MUTTMENU *menu) { @@ -27,7 +25,7 @@ Index: mutt/menu.c FOREVER { if (option (OPTMENUCALLER)) -@@ -1082,6 +1091,8 @@ +@@ -1081,6 +1090,8 @@ break; default: @@ -36,11 +34,9 @@ Index: mutt/menu.c return (i); } } -Index: mutt/browser.c -=================================================================== ---- mutt.orig/browser.c 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/browser.c 2009-06-25 12:36:19.000000000 +0200 -@@ -55,6 +55,7 @@ +--- a/browser.c ++++ b/browser.c +@@ -56,6 +56,7 @@ int num; } FOLDER; @@ -48,7 +44,7 @@ Index: mutt/browser.c static char LastDir[_POSIX_PATH_MAX] = ""; static char LastDirBackup[_POSIX_PATH_MAX] = ""; -@@ -519,9 +520,13 @@ +@@ -536,9 +537,13 @@ menu->tagged = 0; if (buffy) @@ -62,7 +58,7 @@ Index: mutt/browser.c strfcpy (path, LastDir, sizeof (path)); mutt_pretty_mailbox (path, sizeof (path)); #ifdef USE_IMAP -@@ -530,8 +535,22 @@ +@@ -547,8 +552,22 @@ path, NONULL (Mask.pattern)); else #endif @@ -87,7 +83,7 @@ Index: mutt/browser.c } menu->redraw = REDRAW_FULL; } -@@ -714,7 +733,6 @@ +@@ -731,7 +750,6 @@ #endif ) { @@ -95,10 +91,8 @@ Index: mutt/browser.c /* save the old directory */ strfcpy (OldLastDir, LastDir, sizeof (OldLastDir)); -Index: mutt/mutt_menu.h -=================================================================== ---- mutt.orig/mutt_menu.h 2009-06-25 12:35:44.000000000 +0200 -+++ mutt/mutt_menu.h 2009-06-25 12:36:19.000000000 +0200 +--- a/mutt_menu.h ++++ b/mutt_menu.h @@ -49,6 +49,7 @@ int offset; /* which screen row to start the index */ int pagelen; /* number of entries per screen */ diff --git a/debian/patches/features/trash-folder b/debian/patches/features/trash-folder index b871175..632541c 100644 --- a/debian/patches/features/trash-folder +++ b/debian/patches/features/trash-folder @@ -46,11 +46,9 @@ To sum up, it's more integrated and transparent to the user. - Fixed indentation of "appended" in mutt.h. == END PATCH -Index: mutt/commands.c -=================================================================== ---- mutt.orig/commands.c 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/commands.c 2009-06-25 12:35:48.000000000 +0200 -@@ -716,6 +716,7 @@ +--- a/commands.c ++++ b/commands.c +@@ -717,6 +717,7 @@ if (option (OPTDELETEUNTAG)) mutt_set_flag (Context, h, M_TAG, 0); } @@ -58,10 +56,8 @@ Index: mutt/commands.c return 0; } -Index: mutt/flags.c -=================================================================== ---- mutt.orig/flags.c 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/flags.c 2009-06-25 12:35:48.000000000 +0200 +--- a/flags.c ++++ b/flags.c @@ -65,7 +65,13 @@ { h->deleted = 0; @@ -95,10 +91,8 @@ Index: mutt/flags.c case M_NEW: if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN)) -Index: mutt/globals.h -=================================================================== ---- mutt.orig/globals.h 2009-06-25 12:35:44.000000000 +0200 -+++ mutt/globals.h 2009-06-25 12:35:48.000000000 +0200 +--- a/globals.h ++++ b/globals.h @@ -139,6 +139,7 @@ WHERE char *Status; WHERE char *Tempdir; @@ -107,11 +101,9 @@ Index: mutt/globals.h WHERE char *Username; WHERE char *Visual; WHERE char *XtermTitle; -Index: mutt/imap/message.c -=================================================================== ---- mutt.orig/imap/message.c 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/imap/message.c 2009-06-25 12:35:48.000000000 +0200 -@@ -867,6 +867,7 @@ +--- a/imap/message.c ++++ b/imap/message.c +@@ -876,6 +876,7 @@ if (ctx->hdrs[n]->tagged) { mutt_set_flag (ctx, ctx->hdrs[n], M_DELETE, 1); @@ -119,7 +111,7 @@ Index: mutt/imap/message.c if (option (OPTDELETEUNTAG)) mutt_set_flag (ctx, ctx->hdrs[n], M_TAG, 0); } -@@ -874,6 +875,7 @@ +@@ -883,6 +884,7 @@ else { mutt_set_flag (ctx, h, M_DELETE, 1); @@ -127,11 +119,9 @@ Index: mutt/imap/message.c if (option (OPTDELETEUNTAG)) mutt_set_flag (ctx, h, M_TAG, 0); } -Index: mutt/init.h -=================================================================== ---- mutt.orig/init.h 2009-06-25 12:35:44.000000000 +0200 -+++ mutt/init.h 2009-06-25 12:35:48.000000000 +0200 -@@ -3180,6 +3180,16 @@ +--- a/init.h ++++ b/init.h +@@ -3195,6 +3195,16 @@ ** by \fIyou\fP. The sixth character is used to indicate when a mail ** was sent to a mailing-list you subscribe to. */ @@ -148,10 +138,8 @@ Index: mutt/init.h #ifdef USE_SOCKET { "tunnel", DT_STR, R_NONE, UL &Tunnel, UL 0 }, /* -Index: mutt/mutt.h -=================================================================== ---- mutt.orig/mutt.h 2009-06-25 12:35:44.000000000 +0200 -+++ mutt/mutt.h 2009-06-25 12:35:48.000000000 +0200 +--- a/mutt.h ++++ b/mutt.h @@ -187,6 +187,7 @@ M_DELETE, M_UNDELETE, @@ -160,7 +148,7 @@ Index: mutt/mutt.h M_FLAG, M_TAG, M_UNTAG, -@@ -702,6 +703,7 @@ +@@ -707,6 +708,7 @@ unsigned int mime : 1; /* has a MIME-Version header? */ unsigned int flagged : 1; /* marked important? */ unsigned int tagged : 1; @@ -168,7 +156,7 @@ Index: mutt/mutt.h unsigned int deleted : 1; unsigned int changed : 1; unsigned int attach_del : 1; /* has an attachment marked for deletion */ -@@ -874,6 +876,7 @@ +@@ -879,6 +881,7 @@ int new; /* how many new messages? */ int unread; /* how many unread messages? */ int deleted; /* how many deleted messages */ @@ -176,11 +164,9 @@ Index: mutt/mutt.h int flagged; /* how many flagged messages */ int msgnotreadyet; /* which msg "new" in pager, -1 if none */ -Index: mutt/muttlib.c -=================================================================== ---- mutt.orig/muttlib.c 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/muttlib.c 2009-06-25 12:35:48.000000000 +0200 -@@ -1460,7 +1460,9 @@ +--- a/muttlib.c ++++ b/muttlib.c +@@ -1515,7 +1515,9 @@ if (magic > 0 && !mx_access (s, W_OK)) { @@ -191,11 +177,9 @@ Index: mutt/muttlib.c { snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s); if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO) -Index: mutt/mx.c -=================================================================== ---- mutt.orig/mx.c 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/mx.c 2009-06-25 12:35:48.000000000 +0200 -@@ -773,6 +773,53 @@ +--- a/mx.c ++++ b/mx.c +@@ -776,6 +776,53 @@ return rc; } @@ -249,7 +233,7 @@ Index: mutt/mx.c /* save changes and close mailbox */ int mx_close_mailbox (CONTEXT *ctx, int *index_hint) { -@@ -909,6 +956,7 @@ +@@ -912,6 +959,7 @@ if (mutt_append_message (&f, ctx, ctx->hdrs[i], 0, CH_UPDATE_LEN) == 0) { mutt_set_flag (ctx, ctx->hdrs[i], M_DELETE, 1); @@ -257,7 +241,7 @@ Index: mutt/mx.c } else { -@@ -931,6 +979,14 @@ +@@ -936,6 +984,14 @@ return 0; } @@ -272,7 +256,7 @@ Index: mutt/mx.c #ifdef USE_IMAP /* allow IMAP to preserve the deleted flag across sessions */ if (ctx->magic == M_IMAP) -@@ -1130,6 +1186,12 @@ +@@ -1133,6 +1189,12 @@ msgcount = ctx->msgcount; deleted = ctx->deleted; @@ -285,11 +269,9 @@ Index: mutt/mx.c #ifdef USE_IMAP if (ctx->magic == M_IMAP) rc = imap_sync_mailbox (ctx, purge, index_hint); -Index: mutt/postpone.c -=================================================================== ---- mutt.orig/postpone.c 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/postpone.c 2009-06-25 12:35:48.000000000 +0200 -@@ -276,6 +276,9 @@ +--- a/postpone.c ++++ b/postpone.c +@@ -277,6 +277,9 @@ /* finished with this message, so delete it. */ mutt_set_flag (PostContext, h, M_DELETE, 1); diff --git a/debian/patches/features/xtitles b/debian/patches/features/xtitles index b42acc1..dc9951b 100644 --- a/debian/patches/features/xtitles +++ b/debian/patches/features/xtitles @@ -10,10 +10,8 @@ This is the xterm title patch as found on the mutt mailing lists. (cleaner code, no functional change, evades conflict with sidebar patch) == END PATCH -Index: mutt/curs_main.c -=================================================================== ---- mutt.orig/curs_main.c 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/curs_main.c 2009-06-25 12:35:44.000000000 +0200 +--- a/curs_main.c ++++ b/curs_main.c @@ -110,6 +110,19 @@ extern size_t UngetCount; @@ -34,7 +32,7 @@ Index: mutt/curs_main.c void index_make_entry (char *s, size_t l, MUTTMENU *menu, int num) { format_flag flag = M_FORMAT_MAKEPRINT | M_FORMAT_ARROWCURSOR | M_FORMAT_INDEX; -@@ -566,6 +579,13 @@ +@@ -562,6 +575,13 @@ SETCOLOR (MT_COLOR_NORMAL); BKGDSET (MT_COLOR_NORMAL); menu->redraw &= ~REDRAW_STATUS; @@ -48,10 +46,8 @@ Index: mutt/curs_main.c } menu->redraw = 0; -Index: mutt/globals.h -=================================================================== ---- mutt.orig/globals.h 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/globals.h 2009-06-25 12:35:44.000000000 +0200 +--- a/globals.h ++++ b/globals.h @@ -141,6 +141,8 @@ WHERE char *Tochars; WHERE char *Username; @@ -61,11 +57,9 @@ Index: mutt/globals.h WHERE char *CurrentFolder; WHERE char *LastFolder; -Index: mutt/init.c -=================================================================== ---- mutt.orig/init.c 2009-06-25 12:35:42.000000000 +0200 -+++ mutt/init.c 2009-06-25 12:35:44.000000000 +0200 -@@ -1892,6 +1892,26 @@ +--- a/init.c ++++ b/init.c +@@ -1873,6 +1873,26 @@ toggle_option (MuttVars[idx].data); else set_option (MuttVars[idx].data); @@ -92,11 +86,9 @@ Index: mutt/init.c } else if (myvar || DTYPE (MuttVars[idx].type) == DT_STR || DTYPE (MuttVars[idx].type) == DT_PATH || -Index: mutt/init.h -=================================================================== ---- mutt.orig/init.h 2009-06-25 12:35:42.000000000 +0200 -+++ mutt/init.h 2009-06-25 12:35:44.000000000 +0200 -@@ -3337,6 +3337,27 @@ +--- a/init.h ++++ b/init.h +@@ -3364,6 +3364,27 @@ ** Also see the $$read_inc, $$net_inc and $$time_inc variables and the ** ``$tuning'' section of the manual for performance considerations. */ @@ -124,11 +116,9 @@ Index: mutt/init.h /*--*/ { NULL, 0, 0, 0, 0 } }; -Index: mutt/mutt.h -=================================================================== ---- mutt.orig/mutt.h 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/mutt.h 2009-06-25 12:35:44.000000000 +0200 -@@ -446,6 +446,7 @@ +--- a/mutt.h ++++ b/mutt.h +@@ -447,6 +447,7 @@ OPTWRAPSEARCH, OPTWRITEBCC, /* write out a bcc header? */ OPTXMAILER, @@ -136,11 +126,9 @@ Index: mutt/mutt.h OPTCRYPTUSEGPGME, OPTCRYPTUSEPKA, -Index: mutt/pager.c -=================================================================== ---- mutt.orig/pager.c 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/pager.c 2009-06-25 12:35:44.000000000 +0200 -@@ -1784,6 +1784,13 @@ +--- a/pager.c ++++ b/pager.c +@@ -1812,6 +1812,13 @@ } BKGDSET (MT_COLOR_NORMAL); SETCOLOR (MT_COLOR_NORMAL); @@ -154,10 +142,8 @@ Index: mutt/pager.c } if ((redraw & REDRAW_INDEX) && index) -Index: mutt/status.c -=================================================================== ---- mutt.orig/status.c 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/status.c 2009-06-25 12:35:44.000000000 +0200 +--- a/status.c ++++ b/status.c @@ -195,6 +195,8 @@ break; @@ -167,10 +153,8 @@ Index: mutt/status.c if (menu->top + menu->pagelen >= menu->max) cp = menu->top ? "end" : "all"; else -Index: mutt/mutt_menu.h -=================================================================== ---- mutt.orig/mutt_menu.h 2009-06-25 12:35:37.000000000 +0200 -+++ mutt/mutt_menu.h 2009-06-25 12:35:44.000000000 +0200 +--- a/mutt_menu.h ++++ b/mutt_menu.h @@ -103,6 +103,8 @@ void menu_current_bottom (MUTTMENU *); void menu_check_recenter (MUTTMENU *); diff --git a/debian/patches/series b/debian/patches/series index 404ac09..ca5203f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,7 @@ # build system patches misc/am-maintainer-mode -misc/hg.pmdef.debugtime -debian-specific/build_doc_adjustments.diff +#misc/hg.pmdef.debugtime +#debian-specific/build_doc_adjustments.diff # features features/ifdef @@ -29,43 +29,40 @@ misc/smime.rc # patches integrated from upstream mercurial # drop them with a new upstream release -upstream/533209-mutt_perror.patch -upstream/533459-unmailboxes.patch -upstream/533439-mbox-time.patch upstream/531430-imapuser.patch -upstream/534543-imap-port.patch -upstream/538128-mh-folder-access.patch +#upstream/534543-imap-port.patch +#upstream/538128-mh-folder-access.patch upstream/537818-emptycharset.patch -upstream/535096-pop-port.patch -upstream/542910-search-segfault.patch -upstream/533370-pgp-inline.patch -upstream/533520-signature-highlight.patch -upstream/393926-internal-viewer.patch +#upstream/535096-pop-port.patch +#upstream/542910-search-segfault.patch +#upstream/533370-pgp-inline.patch +#upstream/533520-signature-highlight.patch +#upstream/393926-internal-viewer.patch upstream/543467-thread-segfault.patch -upstream/544180-italian-yesorno.patch +#upstream/544180-italian-yesorno.patch upstream/542817-smimekeys-tmpdir.patch -upstream/544794-smtp-batch.patch +#upstream/544794-smtp-batch.patch upstream/537694-segv-imap-headers.patch upstream/548577-gpgme-1.2.patch -upstream/548494-swedish-intl.patch +#upstream/548494-swedish-intl.patch upstream/553321-ansi-escape-segfault.patch -upstream/553238-german-intl.patch -upstream/557395-muttrc-crypto.patch -upstream/545316-header-color.patch +#upstream/553238-german-intl.patch +#upstream/557395-muttrc-crypto.patch +#upstream/545316-header-color.patch upstream/568295-references.patch upstream/547980-smime_keys-chaining.patch upstream/528233-readonly-open.patch upstream/228671-pipe-mime.patch upstream/383769-score-match.patch -upstream/547739-manual-typos.patch -upstream/311296-rand-mktemp.patch -upstream/573823-imap_internal_date -upstream/542344-dont_fold_From_ +#upstream/547739-manual-typos.patch +#upstream/311296-rand-mktemp.patch +#upstream/573823-imap_internal_date +#upstream/542344-dont_fold_From_ upstream/path_max -misc/hyphen-as-minus.patch +#misc/hyphen-as-minus.patch #misc/manpage-typos.patch -misc/smime_keys-manpage.patch +#misc/smime_keys-manpage.patch mutt.org # extra patches for mutt-patched diff --git a/debian/patches/upstream/228671-pipe-mime.patch b/debian/patches/upstream/228671-pipe-mime.patch index f17b147..830219f 100644 --- a/debian/patches/upstream/228671-pipe-mime.patch +++ b/debian/patches/upstream/228671-pipe-mime.patch @@ -6,7 +6,7 @@ Updated in #569279. --- a/imap/message.c +++ b/imap/message.c -@@ -392,7 +392,7 @@ int imap_fetch_message (MESSAGE *msg, CO +@@ -398,7 +398,7 @@ char path[_POSIX_PATH_MAX]; char *pc; long bytes; @@ -15,7 +15,7 @@ Updated in #569279. int uid; int cacheno; IMAP_CACHE *cache; -@@ -489,9 +489,15 @@ int imap_fetch_message (MESSAGE *msg, CO +@@ -495,9 +495,15 @@ imap_error ("imap_fetch_message()", buf); goto bail; } diff --git a/debian/patches/upstream/531430-imapuser.patch b/debian/patches/upstream/531430-imapuser.patch index a32939a..105d2c0 100644 --- a/debian/patches/upstream/531430-imapuser.patch +++ b/debian/patches/upstream/531430-imapuser.patch @@ -3,7 +3,7 @@ is asked with wrong informaton, see upstream #3240 --- a/account.c +++ b/account.c -@@ -218,7 +218,7 @@ +@@ -222,7 +222,7 @@ else { snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "), diff --git a/debian/patches/upstream/537818-emptycharset.patch b/debian/patches/upstream/537818-emptycharset.patch index a330018..bdbe083 100644 --- a/debian/patches/upstream/537818-emptycharset.patch +++ b/debian/patches/upstream/537818-emptycharset.patch @@ -3,7 +3,7 @@ empty, see upstream bug http://bugs.mutt.org/3326 --- a/init.c +++ b/init.c -@@ -1751,6 +1751,9 @@ +@@ -1732,6 +1732,9 @@ char *p, *q = NULL, *s = safe_strdup (val); int rc = 0, strict = strcmp (opt->option, "send_charset") == 0; diff --git a/debian/patches/upstream/548577-gpgme-1.2.patch b/debian/patches/upstream/548577-gpgme-1.2.patch index 14dfba8..b90f72a 100644 --- a/debian/patches/upstream/548577-gpgme-1.2.patch +++ b/debian/patches/upstream/548577-gpgme-1.2.patch @@ -3,9 +3,9 @@ mutt will be able to open pgp crypted/signed message with gpgme --- a/init.c +++ b/init.c -@@ -51,6 +51,10 @@ - #include +@@ -53,6 +53,10 @@ #include + #include +#if defined(CRYPT_BACKEND_GPGME) +#include diff --git a/debian/patches/upstream/553321-ansi-escape-segfault.patch b/debian/patches/upstream/553321-ansi-escape-segfault.patch index 85a8788..4c436c1 100644 --- a/debian/patches/upstream/553321-ansi-escape-segfault.patch +++ b/debian/patches/upstream/553321-ansi-escape-segfault.patch @@ -6,7 +6,7 @@ The bug and the patch were forwarded upstream, see http://bugs.mutt.org/3371 --- a/pager.c +++ b/pager.c -@@ -1028,7 +1028,7 @@ +@@ -1053,7 +1053,7 @@ q = *fmt; while (*p) {