From d26530dc66586102a02add0f0812d4967352e22c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 18 Apr 2021 19:26:41 +0200 Subject: [PATCH] - rediff patches --- format-security.patch | 9 +- mutt-cd.signatures_menu.patch | 265 +++++++++++++++++++-------------- mutt-crypt-autoselectkey.patch | 74 ++++++--- mutt-manual.patch | 11 +- mutt-null_name.patch | 10 +- mutt-po.patch | 11 +- mutt-vvv.quote.patch | 33 ++-- 7 files changed, 244 insertions(+), 169 deletions(-) diff --git a/format-security.patch b/format-security.patch index 4a8d4d6..e2dce8c 100644 --- a/format-security.patch +++ b/format-security.patch @@ -1,11 +1,12 @@ ---- mutt-1.5.21/signature.c~ 2012-12-07 08:23:16.427880553 +0100 -+++ mutt-1.5.21/signature.c 2012-12-07 08:24:37.171211039 +0100 -@@ -292,7 +292,7 @@ +diff -urNp -x '*.orig' mutt-2.0.6.org/signature.c mutt-2.0.6/signature.c +--- mutt-2.0.6.org/signature.c 2021-04-18 19:23:40.820045368 +0200 ++++ mutt-2.0.6/signature.c 2021-04-18 19:23:40.966713972 +0200 +@@ -290,7 +290,7 @@ static SIG_LIST *sig_search_filter (MUTT char* searchBuf = menu->menu >= 0 && menu->menu < MENU_MAX ? SearchBuffers[menu->menu] : NULL; - snprintf (buf, sizeof(buf), searchBuf ? searchBuf : ""); + snprintf (buf, sizeof(buf), "%s", searchBuf ? searchBuf : ""); if (mutt_get_field (_("Search for: "), buf, - sizeof (buf), M_CLEAR) != 0 || !buf[0]) + sizeof (buf), MUTT_CLEAR) != 0 || !buf[0]) return (NULL); diff --git a/mutt-cd.signatures_menu.patch b/mutt-cd.signatures_menu.patch index 5d62c0e..fbe564b 100644 --- a/mutt-cd.signatures_menu.patch +++ b/mutt-cd.signatures_menu.patch @@ -1,29 +1,36 @@ -diff -pruN2 mutt-1.3.27.orig/Makefile.am mutt-1.3.27/Makefile.am ---- mutt-1.3.27.orig/Makefile.am Fri Nov 9 01:18:28 2001 -+++ mutt-1.3.27/Makefile.am Wed Jan 23 22:35:32 2002 -@@ -25,5 +25,5 @@ mutt_SOURCES = $(BUILT_SOURCES) \ +diff -urNp -x '*.orig' mutt-2.0.6.org/Makefile.am mutt-2.0.6/Makefile.am +--- mutt-2.0.6.org/Makefile.am 2021-03-06 20:06:37.000000000 +0100 ++++ mutt-2.0.6/Makefile.am 2021-04-18 19:23:38.363346256 +0200 +@@ -36,7 +36,7 @@ mutt_SOURCES = \ + main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \ postpone.c query.c recvattach.c recvcmd.c \ - rfc822.c rfc1524.c rfc2047.c rfc2231.c \ + rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ - score.c send.c sendlib.c signal.c sort.c \ + score.c send.c sendlib.c signal.c signature.c sort.c \ status.c system.c thread.c charset.c history.c lib.c \ - muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \ -diff -pruN2 mutt-1.3.27.orig/OPS mutt-1.3.27/OPS ---- mutt-1.3.27.orig/OPS Tue Sep 11 12:50:50 2001 -+++ mutt-1.3.27/OPS Wed Jan 23 22:35:32 2002 -@@ -37,4 +37,5 @@ OP_COMPOSE_POSTPONE_MESSAGE "save this m - OP_COMPOSE_RENAME_FILE "rename/move an attached file" - OP_COMPOSE_SEND_MESSAGE "send the message" + mutt_lisp.c muttlib.c editmsg.c mbyte.c \ + url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c \ +diff -urNp -x '*.orig' mutt-2.0.6.org/OPS mutt-2.0.6/OPS +--- mutt-2.0.6.org/OPS 2021-03-06 20:06:37.000000000 +0100 ++++ mutt-2.0.6/OPS 2021-04-18 19:23:38.363346256 +0200 +@@ -36,6 +36,7 @@ OP_COMPOSE_EDIT_MIME "edit attachment us + OP_COMPOSE_EDIT_REPLY_TO "edit the Reply-To field" + OP_COMPOSE_EDIT_SUBJECT "edit the subject of this message" + OP_COMPOSE_EDIT_TO "edit the TO list" +OP_COMPOSE_SIG "choose a signature" - OP_COMPOSE_TOGGLE_DISPOSITION "toggle disposition between inline/attachment" - OP_COMPOSE_TOGGLE_UNLINK "toggle whether to delete file after sending it" -@@ -126,4 +127,5 @@ OP_NEXT_ENTRY "move to the next entry" + OP_CREATE_MAILBOX "create a new mailbox (IMAP only)" + OP_EDIT_TYPE "edit attachment content type" + OP_COMPOSE_GET_ATTACHMENT "get a temporary copy of an attachment" +@@ -153,6 +154,7 @@ OP_MIDDLE_PAGE "move to the middle of th + OP_NEXT_ENTRY "move to the next entry" OP_NEXT_LINE "scroll down one line" OP_NEXT_PAGE "move to the next page" +OP_NEXT_SIG "move to the next signature" OP_PAGER_BOTTOM "jump to the bottom of the message" OP_PAGER_HIDE_QUOTED "toggle display of quoted text" -@@ -134,9 +136,11 @@ OP_PREV_ENTRY "move to the previous entr + OP_PAGER_SKIP_QUOTED "skip beyond quoted text" +@@ -161,11 +163,13 @@ OP_PIPE "pipe message/attachment to a sh + OP_PREV_ENTRY "move to the previous entry" OP_PREV_LINE "scroll up one line" OP_PREV_PAGE "move to the previous page" +OP_PREV_SIG "move to the previous signature" @@ -35,16 +42,26 @@ diff -pruN2 mutt-1.3.27.orig/OPS mutt-1.3.27/OPS +OP_RANDOM_SIG "pick a signature at random" OP_RECALL_MESSAGE "recall a postponed message" OP_REDRAW "clear and redraw the screen" -@@ -150,4 +154,5 @@ OP_SEARCH_OPPOSITE "search for next matc + OP_REFORMAT_WINCH "{internal}" +@@ -179,6 +183,7 @@ OP_SEARCH_NEXT "search for next match" + OP_SEARCH_OPPOSITE "search for next match in opposite direction" OP_SEARCH_TOGGLE "toggle search pattern coloring" OP_SHELL_ESCAPE "invoke a command in a subshell" +OP_SIG_SEARCH "search signatures matching a pattern" OP_SORT "sort messages" OP_SORT_REVERSE "sort messages in reverse order" -diff -pruN2 mutt-1.3.27.orig/compose.c mutt-1.3.27/compose.c ---- mutt-1.3.27.orig/compose.c Mon Dec 3 11:17:57 2001 -+++ mutt-1.3.27/compose.c Wed Jan 23 22:35:32 2002 -@@ -1103,4 +1103,9 @@ int mutt_compose_menu (HEADER *msg, /* + OP_TAG "tag the current entry" +diff -urNp -x '*.orig' mutt-2.0.6.org/PATCHES mutt-2.0.6/PATCHES +--- mutt-2.0.6.org/PATCHES 2021-04-18 19:23:38.230011162 +0200 ++++ mutt-2.0.6/PATCHES 2021-04-18 19:23:38.366679633 +0200 +@@ -1 +1,2 @@ + vvv.quote ++patch-1.3.27.cd.signatures_menu.2.1 +diff -urNp -x '*.orig' mutt-2.0.6.org/compose.c mutt-2.0.6/compose.c +--- mutt-2.0.6.org/compose.c 2020-12-01 04:05:21.000000000 +0100 ++++ mutt-2.0.6/compose.c 2021-04-18 19:23:38.363346256 +0200 +@@ -1747,6 +1747,11 @@ int mutt_compose_menu (SEND_CONTEXT *sct + /* no send2hook, since this doesn't modify the message */ break; + case OP_COMPOSE_SIG: @@ -54,30 +71,33 @@ diff -pruN2 mutt-1.3.27.orig/compose.c mutt-1.3.27/compose.c + case OP_PIPE: case OP_FILTER: -diff -pruN2 mutt-1.3.27.orig/doc/manual.sgml.head mutt-1.3.27/doc/manual.sgml.head ---- mutt-1.3.27.orig/doc/manual.xml.head Sat Jan 12 12:35:43 2002 -+++ mutt-1.3.27/doc/manual.xml.head Wed Jan 23 22:35:32 2002 -@@ -526,4 +526,5 @@ c edit-cc edit the - b edit-bcc edit the Bcc field - y send-message send the message + CHECK_COUNT; +diff -urNp -x '*.orig' mutt-2.0.6.org/doc/manual.xml.head mutt-2.0.6/doc/manual.xml.head +--- mutt-2.0.6.org/doc/manual.xml.head 2021-03-06 20:06:37.000000000 +0100 ++++ mutt-2.0.6/doc/manual.xml.head 2021-04-18 19:23:38.363346256 +0200 +@@ -525,6 +525,7 @@ linkend="tab-keys-nav-page"/> for page-b + + + +ESC s signature-menu select a signature and append it to your mail - s edit-subject edit the Subject - f edit-fcc specify an ``Fcc'' mailbox -diff -pruN2 mutt-1.3.27.orig/functions.h mutt-1.3.27/functions.h ---- mutt-1.3.27.orig/functions.h Tue Sep 11 12:51:39 2001 -+++ mutt-1.3.27/functions.h Wed Jan 23 22:35:32 2002 -@@ -309,4 +309,5 @@ struct binding_t OpCompose[] = { - { "send-message", OP_COMPOSE_SEND_MESSAGE, "y" }, - { "pipe-entry", OP_PIPE, "|" }, + + + +diff -urNp -x '*.orig' mutt-2.0.6.org/functions.h mutt-2.0.6/functions.h +--- mutt-2.0.6.org/functions.h 2021-03-06 20:06:37.000000000 +0100 ++++ mutt-2.0.6/functions.h 2021-04-18 19:23:38.363346256 +0200 +@@ -308,6 +308,7 @@ const struct binding_t OpPager[] = { /* + + { "what-key", OP_WHAT_KEY, NULL }, + { "check-stats", OP_CHECK_STATS, NULL }, + { "signature-menu", OP_COMPOSE_SIG, "\033s" }, - #ifdef HAVE_PGP -@@ -363,4 +364,17 @@ struct binding_t OpQuery[] = { - { "query", OP_QUERY, "Q" }, - { "query-append", OP_QUERY_APPEND, "A" }, -+ { NULL, 0, NULL } -+}; -+ + #ifdef USE_SIDEBAR + { "sidebar-first", OP_SIDEBAR_FIRST, NULL }, +@@ -458,6 +459,19 @@ const struct binding_t OpQuery[] = { /* + { NULL, 0, NULL } + }; + +/* Signature Menu */ +struct binding_t OpSig[] = { + { "next-sig", OP_NEXT_SIG, "j" }, @@ -88,22 +108,29 @@ diff -pruN2 mutt-1.3.27.orig/functions.h mutt-1.3.27/functions.h + +struct binding_t OpSigDir[] = { + { "search-sig", OP_SIG_SEARCH, "/" }, - { NULL, 0, NULL } - }; -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:35:32 2002 -@@ -100,4 +100,5 @@ WHERE char *Sendmail; - WHERE char *Shell; ++ { NULL, 0, NULL } ++}; ++ + const struct binding_t OpEditor[] = { /* map: editor */ + { "bol", OP_EDITOR_BOL, "\001" }, + { "backward-char", OP_EDITOR_BACKWARD_CHAR, "\002" }, +diff -urNp -x '*.orig' mutt-2.0.6.org/globals.h mutt-2.0.6/globals.h +--- mutt-2.0.6.org/globals.h 2021-04-18 19:23:38.230011162 +0200 ++++ mutt-2.0.6/globals.h 2021-04-18 19:23:38.363346256 +0200 +@@ -145,6 +145,7 @@ WHERE char *SidebarFormat; + WHERE char *SidebarIndentString; + #endif WHERE char *Signature; +WHERE char *SigDirectory; WHERE char *SimpleSearch; - WHERE char *Spoolfile; -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:35:32 2002 -@@ -1954,4 +1954,12 @@ struct option_t MuttVars[] = { - ** its stdout. + #if USE_SMTP + WHERE char *SmtpAuthenticators; +diff -urNp -x '*.orig' mutt-2.0.6.org/init.h mutt-2.0.6/init.h +--- mutt-2.0.6.org/init.h 2021-04-18 19:23:38.230011162 +0200 ++++ mutt-2.0.6/init.h 2021-04-18 19:23:38.363346256 +0200 +@@ -1953,6 +1953,14 @@ struct option_t MuttVars[] = { + ** automatically generated with \fIa\fP will be composed + ** from this prefix and the letter \fIa\fP. */ + { "signatures_directory", DT_PATH, R_NONE, {.p=&SigDirectory}, {.p=""} }, + /* @@ -113,26 +140,32 @@ diff -pruN2 mutt-1.3.27.orig/init.h mutt-1.3.27/init.h + ** sig_dashes (``-- ''). + ** You can choose between these signatures from the compose menu. + */ - { "simple_search", DT_STR, R_NONE, UL &SimpleSearch, UL "~f %s | ~s %s" }, + { "mark_old", DT_BOOL, R_BOTH, {.l=OPTMARKOLD}, {.l=1} }, /* -diff -pruN2 mutt-1.3.27.orig/keymap.c mutt-1.3.27/keymap.c ---- mutt-1.3.27.orig/keymap.c Tue Oct 16 16:29:02 2001 -+++ mutt-1.3.27/keymap.c Wed Jan 23 22:35:32 2002 -@@ -50,4 +50,6 @@ struct mapping_t Menus[] = { - - { "query", MENU_QUERY }, + ** .pp +diff -urNp -x '*.orig' mutt-2.0.6.org/keymap.c mutt-2.0.6/keymap.c +--- mutt-2.0.6.org/keymap.c 2021-03-06 20:06:37.000000000 +0100 ++++ mutt-2.0.6/keymap.c 2021-04-18 19:23:38.366679633 +0200 +@@ -49,6 +49,8 @@ const struct mapping_t Menus[] = { + { "pager", MENU_PAGER }, + { "postpone", MENU_POST }, + { "pgp", MENU_PGP }, + { "signature", MENU_SIG }, + { "sig_directory", MENU_SIG_DIR }, - { "generic", MENU_GENERIC }, - { NULL, 0 } -@@ -528,4 +530,6 @@ void km_init (void) + { "smime", MENU_SMIME }, + #ifdef CRYPT_BACKEND_GPGME + { "key_select_pgp", MENU_KEY_SELECT_PGP }, +@@ -749,6 +751,8 @@ void km_init (void) + create_bindings (OpPost, MENU_POST); create_bindings (OpQuery, MENU_QUERY); create_bindings (OpAlias, MENU_ALIAS); + create_bindings (OpSig, MENU_SIG); + create_bindings (OpSigDir, MENU_SIG_DIR); -@@ -619,4 +623,7 @@ void km_init (void) + if ((WithCrypto & APPLICATION_PGP)) +@@ -851,6 +855,9 @@ void km_init (void) + km_bindkey ("", MENU_ATTACH, OP_VIEW_ATTACH); km_bindkey ("", MENU_COMPOSE, OP_VIEW_ATTACH); + km_bindkey ("", MENU_SIG, OP_PREV_SIG); @@ -140,7 +173,9 @@ diff -pruN2 mutt-1.3.27.orig/keymap.c mutt-1.3.27/keymap.c + /* edit-to (default "t") hides generic tag-entry in Compose menu This will bind tag-entry to "T" in the Compose menu */ -@@ -739,4 +746,8 @@ struct binding_t *km_get_table (int menu + km_bindkey ("T", MENU_COMPOSE, OP_TAG); +@@ -1015,6 +1022,10 @@ const struct binding_t *km_get_table (in + return OpEditor; case MENU_QUERY: return OpQuery; + case MENU_SIG: @@ -148,36 +183,64 @@ diff -pruN2 mutt-1.3.27.orig/keymap.c mutt-1.3.27/keymap.c + case MENU_SIG_DIR: + return OpSigDir; - -diff -pruN2 mutt-1.3.27.orig/keymap.h mutt-1.3.27/keymap.h ---- mutt-1.3.27.orig/keymap.h Tue Sep 11 12:50:12 2001 -+++ mutt-1.3.27/keymap.h Wed Jan 23 22:35:32 2002 -@@ -60,4 +60,6 @@ enum + case MENU_PGP: + return (WithCrypto & APPLICATION_PGP)? OpPgp:NULL; +diff -urNp -x '*.orig' mutt-2.0.6.org/keymap.h mutt-2.0.6/keymap.h +--- mutt-2.0.6.org/keymap.h 2021-03-06 20:06:37.000000000 +0100 ++++ mutt-2.0.6/keymap.h 2021-04-18 19:23:38.366679633 +0200 +@@ -63,6 +63,8 @@ enum + MENU_PAGER, MENU_POST, MENU_QUERY, + MENU_SIG, + MENU_SIG_DIR, - -@@ -102,4 +104,6 @@ extern struct binding_t OpEditor[]; - extern struct binding_t OpQuery[]; - extern struct binding_t OpAlias[]; + + MENU_PGP, +@@ -105,6 +107,8 @@ const struct binding_t *km_get_table (in + extern const struct binding_t OpGeneric[]; + extern const struct binding_t OpPost[]; + extern const struct binding_t OpMain[]; +extern struct binding_t OpSig[]; +extern struct binding_t OpSigDir[]; + extern const struct binding_t OpAttach[]; + extern const struct binding_t OpPager[]; + extern const struct binding_t OpCompose[]; +diff -urNp -x '*.orig' mutt-2.0.6.org/menu.c mutt-2.0.6/menu.c +--- mutt-2.0.6.org/menu.c 2021-04-18 19:23:38.230011162 +0200 ++++ mutt-2.0.6/menu.c 2021-04-18 19:23:38.366679633 +0200 +@@ -683,7 +683,7 @@ void menu_current_bottom (MUTTMENU *menu + mutt_error _("No entries."); + } + +-static void menu_next_entry (MUTTMENU *menu) ++void menu_next_entry (MUTTMENU *menu) + { + if (menu->current < menu->max - 1) + { +@@ -694,7 +694,7 @@ static void menu_next_entry (MUTTMENU *m + mutt_error _("You are on the last entry."); + } - #ifdef HAVE_PGP -diff -pruN2 mutt-1.3.27.orig/protos.h mutt-1.3.27/protos.h ---- mutt-1.3.27.orig/protos.h Wed Jan 16 21:43:58 2002 -+++ mutt-1.3.27/protos.h Wed Jan 23 22:35:32 2002 -@@ -225,4 +225,5 @@ void mutt_shell_escape (void); - void mutt_show_error (void); - void mutt_signal_init (void); +-static void menu_prev_entry (MUTTMENU *menu) ++void menu_prev_entry (MUTTMENU *menu) + { + if (menu->current) + { +diff -urNp -x '*.orig' mutt-2.0.6.org/protos.h mutt-2.0.6/protos.h +--- mutt-2.0.6.org/protos.h 2021-03-06 20:06:37.000000000 +0100 ++++ mutt-2.0.6/protos.h 2021-04-18 19:23:38.366679633 +0200 +@@ -224,6 +224,7 @@ void mutt_free_body (BODY **); + void mutt_free_color (int fg, int bg); + void mutt_free_enter_state (ENTER_STATE **); + void mutt_free_envelope (ENVELOPE **); +void mutt_signature (char *); - void mutt_stamp_attachment (BODY *a); - void mutt_tabs_to_spaces (char *); -diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c ---- mutt-1.3.27.orig/signature.c Thu Jan 1 01:00:00 1970 -+++ mutt-1.3.27/signature.c Wed Jan 23 22:35:32 2002 + void mutt_free_header (HEADER **); + void mutt_free_parameter (PARAMETER **); + void mutt_free_regexp (REGEXP **); +diff -urNp -x '*.orig' mutt-2.0.6.org/signature.c mutt-2.0.6/signature.c +--- mutt-2.0.6.org/signature.c 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-2.0.6/signature.c 2021-04-18 19:23:38.366679633 +0200 @@ -0,0 +1,499 @@ +/* + * Copyright (C) 2001 Cedric Duval @@ -678,29 +741,3 @@ diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c + if (sig_dir_menu (SigDirectory, msg_file) == -1) + mutt_error (_("%s: no files in this directory"), SigDirectory); +} -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 +2 @@ -+patch-1.3.27.cd.signatures_menu.2.1 -diff --git a/menu.c b/menu.c ---- a/menu.c -+++ b/menu.c -@@ -642,7 +642,7 @@ - mutt_error _("No entries."); - } - --static void menu_next_entry (MUTTMENU *menu) -+void menu_next_entry (MUTTMENU *menu) - { - if (menu->current < menu->max - 1) - { -@@ -653,7 +653,7 @@ - mutt_error _("You are on the last entry."); - } - --static void menu_prev_entry (MUTTMENU *menu) -+void menu_prev_entry (MUTTMENU *menu) - { - if (menu->current) - { diff --git a/mutt-crypt-autoselectkey.patch b/mutt-crypt-autoselectkey.patch index e9d6e1e..61e56e9 100644 --- a/mutt-crypt-autoselectkey.patch +++ b/mutt-crypt-autoselectkey.patch @@ -1,10 +1,16 @@ ---- crypt-autoselectkey/PATCHES Dec 2002 17:44:54 -0000 3.6 -+++ crypt-autoselectkey/PATCHES Feb 2004 13:19:46 -0000 -@@ -0,0 +1 @@ +diff -urNp -x '*.orig' mutt-2.0.6.org/PATCHES mutt-2.0.6/PATCHES +--- mutt-2.0.6.org/PATCHES 2021-04-18 19:23:38.550015388 +0200 ++++ mutt-2.0.6/PATCHES 2021-04-18 19:23:38.680017105 +0200 +@@ -1,2 +1,3 @@ +patch-1.5.6.dw.crypt-autoselectkey.1 ---- crypt-autoselectkey/init.h Feb 2004 17:10:43 -0000 3.43 -+++ crypt-autoselectkey/init.h Feb 2004 13:19:46 -0000 -@@ -1205,2 +1205,12 @@ struct option_t MuttVars[] = { + vvv.quote + patch-1.3.27.cd.signatures_menu.2.1 +diff -urNp -x '*.orig' mutt-2.0.6.org/init.h mutt-2.0.6/init.h +--- mutt-2.0.6.org/init.h 2021-04-18 19:23:38.550015388 +0200 ++++ mutt-2.0.6/init.h 2021-04-18 19:23:38.680017105 +0200 +@@ -1203,6 +1203,16 @@ struct option_t MuttVars[] = { + ** For a full listing of defined \fCprintf(3)\fP-like sequences see + ** the section on $$index_format. See also $$attribution_locale. */ + + @@ -16,16 +22,26 @@ + ** one matching key is available. This may be useful in conjunction with + ** the \fIcrypt-hook\fP command. + */ - { "pgp_autosign", DT_SYN, R_NONE, UL "crypt_autosign", 0 }, ---- crypt-autoselectkey/mutt.h Feb 2004 17:10:43 -0000 3.23 -+++ crypt-autoselectkey/mutt.h Feb 2004 13:19:46 -0000 -@@ -431,2 +431,3 @@ enum - + /* L10N: + $forward_attribution_trailer default value + */ +diff -urNp -x '*.orig' mutt-2.0.6.org/mutt.h mutt-2.0.6/mutt.h +--- mutt-2.0.6.org/mutt.h 2021-04-18 19:23:38.546682010 +0200 ++++ mutt-2.0.6/mutt.h 2021-04-18 19:23:38.680017105 +0200 +@@ -429,6 +429,7 @@ enum + #if defined(HAVE_QDBM) || defined(HAVE_TC) || defined(HAVE_KC) + OPTHCACHECOMPRESS, + #endif /* HAVE_QDBM */ + OPTCRYPTAUTOSELECT, - OPTCRYPTAUTOSIGN, ---- crypt-autoselectkey/pgpkey.c Oct 2003 19:55:39 -0000 3.8 -+++ crypt-autoselectkey/pgpkey.c Feb 2004 13:19:46 -0000 -@@ -437,4 +437,9 @@ static int pgp_id_matches_addr (ADDRESS + #endif + OPTHDRS, + OPTHEADER, +diff -urNp -x '*.orig' mutt-2.0.6.org/pgpkey.c mutt-2.0.6/pgpkey.c +--- mutt-2.0.6.org/pgpkey.c 2020-07-25 20:22:53.000000000 +0200 ++++ mutt-2.0.6/pgpkey.c 2021-04-18 19:23:38.680017105 +0200 +@@ -440,8 +440,13 @@ static int pgp_id_matches_addr (ADDRESS + return rv; + } + +#define pgp_trusted_id(uid) (!option(OPTPGPCHECKTRUST) \ @@ -36,15 +52,27 @@ - ADDRESS * p, const char *s) + ADDRESS * p, const char *s) { -@@ -452,2 +457,3 @@ static pgp_key_t pgp_select_key (pgp_key + int keymax; + pgp_uid_t **KeyTable; +@@ -456,6 +461,7 @@ static pgp_key_t pgp_select_key (pgp_key + pgp_uid_t *a; + int (*f) (const void *, const void *); + int keymatch = 0; /* count matching keys */ int unusable = 0; -@@ -481,2 +487,3 @@ static pgp_key_t pgp_select_key (pgp_key + + keymax = 0; +@@ -485,6 +491,7 @@ static pgp_key_t pgp_select_key (pgp_key + + KeyTable[i++] = a; } + keymatch++; } -@@ -489,2 +496,17 @@ static pgp_key_t pgp_select_key (pgp_key + + if (!i && unusable) +@@ -493,6 +500,21 @@ static pgp_key_t pgp_select_key (pgp_key + mutt_sleep (1); + return NULL; } + else if (keymatch == 1 && option(OPTCRYPTAUTOSELECT)) + { @@ -62,10 +90,16 @@ + } + } -@@ -599,5 +621,3 @@ static pgp_key_t pgp_select_key (pgp_key - + switch (PgpSortKeys & SORT_MASK) + { +@@ -609,9 +631,7 @@ static pgp_key_t pgp_select_key (pgp_key + break; + } + - if (option (OPTPGPCHECKTRUST) && - (!pgp_id_is_valid (KeyTable[menu->current]) - || !pgp_id_is_strong (KeyTable[menu->current]))) + if (!pgp_trusted_id(KeyTable[menu->current])) { + char *s = ""; + char buff[LONG_STRING]; diff --git a/mutt-manual.patch b/mutt-manual.patch index d293c1b..e331bad 100644 --- a/mutt-manual.patch +++ b/mutt-manual.patch @@ -1,11 +1,12 @@ ---- mutt-1.5.18/doc/Muttrc.head.in.orig 2006-08-23 22:29:05.494260250 +0200 -+++ mutt-1.5.18/doc/Muttrc.head 2006-08-23 22:29:30.383815750 +0200 -@@ -15,7 +15,7 @@ - macro attach,compose \cb " urlview" "call urlview to extract URLs out of a message" +diff -urNp -x '*.orig' mutt-2.0.6.org/doc/Muttrc.head mutt-2.0.6/doc/Muttrc.head +--- mutt-2.0.6.org/doc/Muttrc.head 2020-07-25 20:22:53.000000000 +0200 ++++ mutt-2.0.6/doc/Muttrc.head 2021-04-18 19:23:39.000021331 +0200 +@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ + "call urlview to extract URLs out of a message" # Show documentation when pressing F1 -macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" +macro generic,pager " less @docdir@/manual.txt.gz" "show Mutt documentation" # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" - macro index,pager y "?" "show incoming mailboxes list" + # note: these macros have been subsumed by the function. diff --git a/mutt-null_name.patch b/mutt-null_name.patch index 0e29e36..a1b95af 100644 --- a/mutt-null_name.patch +++ b/mutt-null_name.patch @@ -1,7 +1,7 @@ -diff -urN mutt-1.3.27.orig/browser.c mutt-1.3.27/browser.c ---- mutt-1.3.27.orig/browser.c Tue Dec 18 16:12:48 2001 -+++ mutt-1.3.27/browser.c Mon Feb 4 00:40:48 2002 -@@ -388,6 +388,10 @@ +diff -urNp -x '*.orig' mutt-2.0.6.org/browser.c mutt-2.0.6/browser.c +--- mutt-2.0.6.org/browser.c 2020-12-01 04:05:21.000000000 +0100 ++++ mutt-2.0.6/browser.c 2021-04-18 19:23:38.053342162 +0200 +@@ -475,6 +475,10 @@ static int examine_directory (MUTTMENU * while ((de = readdir (dp)) != NULL) { @@ -11,4 +11,4 @@ diff -urN mutt-1.3.27.orig/browser.c mutt-1.3.27/browser.c + if (mutt_strcmp (de->d_name, ".") == 0) continue; /* we don't need . */ - + diff --git a/mutt-po.patch b/mutt-po.patch index adbd2c6..89437b4 100644 --- a/mutt-po.patch +++ b/mutt-po.patch @@ -1,11 +1,12 @@ ---- mutt-1.5.9/po/pt_BR.po.orig 2005-03-13 17:38:40.000000000 +0100 -+++ mutt-1.5.9/po/pt_BR.po 2005-03-31 16:54:59.167047152 +0200 -@@ -9,7 +9,7 @@ - "Language-Team: LIE-BR (http://lie-br.conectiva.com.br)\n" +diff -urNp -x '*.orig' mutt-2.0.6.org/po/pt_BR.po mutt-2.0.6/po/pt_BR.po +--- mutt-2.0.6.org/po/pt_BR.po 2021-02-08 03:27:00.000000000 +0100 ++++ mutt-2.0.6/po/pt_BR.po 2021-04-18 19:23:39.643363160 +0200 +@@ -10,7 +10,7 @@ msgstr "" + "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding:\n" +"Content-Transfer-Encoding: 8bit\n" - #: account.c:148 + #: account.c:163 #, fuzzy, c-format diff --git a/mutt-vvv.quote.patch b/mutt-vvv.quote.patch index 2df3a83..c6fc3ab 100644 --- a/mutt-vvv.quote.patch +++ b/mutt-vvv.quote.patch @@ -1,12 +1,12 @@ -diff -udprP mutt-1.12.1.orig/PATCHES mutt-1.12.1/PATCHES ---- mutt-1.12.1.orig/PATCHES 2017-12-03 05:10:17.000000000 +0200 -+++ mutt-1.12.1/PATCHES 2019-08-11 19:32:51.176165992 +0300 +diff -urNp -x '*.orig' mutt-2.0.6.org/PATCHES mutt-2.0.6/PATCHES +--- mutt-2.0.6.org/PATCHES 2020-06-24 23:41:42.000000000 +0200 ++++ mutt-2.0.6/PATCHES 2021-04-18 19:23:37.740004690 +0200 @@ -0,0 +1 @@ +vvv.quote -diff -udprP mutt-1.12.1.orig/handler.c mutt-1.12.1/handler.c ---- mutt-1.12.1.orig/handler.c 2019-05-31 19:21:33.000000000 +0300 -+++ mutt-1.12.1/handler.c 2019-08-11 19:32:51.177165977 +0300 -@@ -1593,7 +1593,31 @@ static int text_plain_handler (BODY *b, +diff -urNp -x '*.orig' mutt-2.0.6.org/handler.c mutt-2.0.6/handler.c +--- mutt-2.0.6.org/handler.c 2021-03-06 20:06:37.000000000 +0100 ++++ mutt-2.0.6/handler.c 2021-04-18 19:23:37.740004690 +0200 +@@ -1603,7 +1603,31 @@ static int text_plain_handler (BODY *b, buf[--l] = 0; } if (s->prefix) @@ -39,7 +39,7 @@ diff -udprP mutt-1.12.1.orig/handler.c mutt-1.12.1/handler.c state_puts (buf, s); state_putc ('\n', s); } -@@ -1779,7 +1803,7 @@ int mutt_body_handler (BODY *b, STATE *s +@@ -1806,7 +1830,7 @@ int mutt_body_handler (BODY *b, STATE *s */ if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b)) encrypted_handler = handler = crypt_pgp_application_pgp_handler; @@ -48,9 +48,10 @@ diff -udprP mutt-1.12.1.orig/handler.c mutt-1.12.1/handler.c handler = rfc3676_handler; else handler = text_plain_handler; ---- mutt-2.0.6/init.h.orig 2021-04-07 17:27:35.690778943 +0000 -+++ mutt-2.0.6/init.h 2021-04-07 17:29:10.704113619 +0000 -@@ -2966,6 +2966,19 @@ +diff -urNp -x '*.orig' mutt-2.0.6.org/init.h mutt-2.0.6/init.h +--- mutt-2.0.6.org/init.h 2021-04-18 19:23:37.610002974 +0200 ++++ mutt-2.0.6/init.h 2021-04-18 19:23:37.740004690 +0200 +@@ -2966,6 +2966,19 @@ struct option_t MuttVars[] = { ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are ** prompted for confirmation when you try to quit. */ @@ -70,11 +71,11 @@ diff -udprP mutt-1.12.1.orig/handler.c mutt-1.12.1/handler.c { "quote_regexp", DT_RX, R_PAGER, {.p=&QuoteRegexp}, {.p="^([ \t]*[|>:}#])+"} }, /* ** .pp -diff -udprP mutt-1.12.1.orig/mutt.h mutt-1.12.1/mutt.h ---- mutt-1.12.1.orig/mutt.h 2019-06-14 04:29:29.000000000 +0300 -+++ mutt-1.12.1/mutt.h 2019-08-11 19:32:51.179165947 +0300 -@@ -479,6 +479,8 @@ enum - OPTPRINTDECODE, +diff -urNp -x '*.orig' mutt-2.0.6.org/mutt.h mutt-2.0.6/mutt.h +--- mutt-2.0.6.org/mutt.h 2021-03-06 20:06:37.000000000 +0100 ++++ mutt-2.0.6/mutt.h 2021-04-18 19:23:37.740004690 +0200 +@@ -510,6 +510,8 @@ enum + OPTPRINTDECODEWEED, OPTPRINTSPLIT, OPTPROMPTAFTER, + OPTQUOTEEMPTY, -- 2.43.0