1
0
forked from pool/mutt

Update to mutt 1.13.3

OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=201
This commit is contained in:
Dr. Werner Fink 2020-01-15 06:59:22 +00:00 committed by Git OBS Bridge
parent 5c060f88fe
commit db79e9cc9f
17 changed files with 375 additions and 105 deletions

View File

@ -7,24 +7,24 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
3 files changed, 26 insertions(+)
--- init.h
+++ init.h 2019-11-13 13:32:20.528047580 +0000
@@ -1678,6 +1678,13 @@ struct option_t MuttVars[] = {
+++ init.h 2020-01-14 13:35:13.352604037 +0000
@@ -1745,6 +1745,13 @@ struct option_t MuttVars[] = {
** from your spool mailbox to your $$mbox mailbox, or as a result of
** a ``$mbox-hook'' command.
*/
+ { "list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, MUTT_NO },
+ { "list_reply", DT_QUAD, R_NONE, {.l=OPT_LISTREPLY}, {.l=MUTT_NO} },
+ /*
+ ** .pp
+ ** When set, address replies to the mailing list the original message came
+ ** from (instead to the author only). Setting this option to ``ask-yes'' or
+ ** ``ask-no'' will ask if you really intended to reply to the author only.
+ */
{ "mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, 5 },
{ "mail_check", DT_NUM, R_NONE, {.p=&BuffyTimeout}, {.l=5} },
/*
** .pp
--- mutt.h
+++ mutt.h 2019-11-13 13:35:09.700879253 +0000
@@ -329,6 +329,7 @@ enum
+++ mutt.h 2020-01-14 13:32:27.595685455 +0000
@@ -338,6 +338,7 @@ enum
#endif
OPT_SUBJECT,
OPT_VERIFYSIG, /* verify PGP signatures */
@ -33,8 +33,8 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
/* THIS MUST BE THE LAST VALUE. */
OPT_MAX
--- send.c
+++ send.c 2019-11-13 13:37:22.658388984 +0000
@@ -559,6 +559,7 @@ static int include_reply (CONTEXT *ctx,
+++ send.c 2020-01-14 13:32:27.599685379 +0000
@@ -565,6 +565,7 @@ static int include_reply (CONTEXT *ctx,
static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto)
{
char prompt[STRING];
@ -42,7 +42,7 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
if (flags && env->mail_followup_to && hmfupto == MUTT_YES)
{
@@ -572,6 +573,23 @@ static int default_to (ADDRESS **to, ENV
@@ -578,6 +579,23 @@ static int default_to (ADDRESS **to, ENV
if (flags & SENDLISTREPLY)
return 0;

View File

@ -18,7 +18,7 @@ Index: mutt/lib.c
--- lib.c
+++ lib.c 2019-01-02 13:25:44.767193676 +0000
@@ -627,6 +627,9 @@ char *mutt_substrdup (const char *begin,
@@ -662,6 +662,9 @@ char *mutt_substrdup (const char *begin,
size_t len;
char *p;

View File

@ -4,8 +4,8 @@
2 files changed, 4 insertions(+), 4 deletions(-)
--- mh.c
+++ mh.c 2019-01-02 13:20:40.204793251 +0000
@@ -1813,9 +1813,9 @@ static int mh_rewrite_message (CONTEXT *
+++ mh.c 2020-01-14 13:31:51.368358811 +0000
@@ -1814,9 +1814,9 @@ static int mh_rewrite_message (CONTEXT *
BUFFER *newpath = NULL;
BUFFER *partpath = NULL;
@ -19,8 +19,8 @@
if ((dest = mx_open_new_message (ctx, h, 0)) == NULL)
return -1;
--- mutt.h
+++ mutt.h 2019-01-02 13:19:38.181933079 +0000
@@ -720,7 +720,7 @@ typedef struct body
+++ mutt.h 2020-01-14 13:31:51.368358811 +0000
@@ -759,7 +759,7 @@ typedef struct body
PARAMETER *parameter; /* parameters of the content-type */
char *description; /* content-description */
char *form_name; /* Content-Disposition form-data name param */

View File

@ -1,20 +1,23 @@
---
browser.c | 7 +++++++
1 file changed, 7 insertions(+)
browser.c | 10 ++++++++++
1 file changed, 10 insertions(+)
--- browser.c
+++ browser.c 2019-11-14 08:20:37.266842776 +0000
@@ -963,6 +963,13 @@ void _mutt_buffer_select_file (BUFFER *f
{
mutt_buffer_strcpy (f, state.entry[menu->current].name);
mutt_buffer_expand_path (f);
+++ browser.c 2020-01-14 14:51:44.927127369 +0000
@@ -969,6 +969,16 @@ void _mutt_buffer_select_file (BUFFER *f
mutt_buffer_strcpy (f, state.entry[menu->current].full_path);
+#ifdef USE_IMAP
+ if (mx_is_imap (mutt_b2s (f)))
+ {
+ state.imap_browse = 1;
+ mutt_buffer_strcpy (LastDir, mutt_b2s (f));
+ }
+ if (buffy)
+ {
+ if (mx_is_imap (mutt_b2s (f)))
+ {
+ state.imap_browse = 1;
+ mutt_buffer_strcpy (LastDir, mutt_b2s (f));
+ }
+ }
+#endif
}
#ifdef USE_IMAP
else if (state.imap_browse)
/* fall through */
case OP_EXIT:

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bc42750ce8237742b9382f2148fc547a8d8601aa4a7cd28c55fe7ca045196882
size 4675774

View File

@ -1,13 +1,13 @@
---
configure.ac | 18 +++++++++++++-----
doc/Muttrc.head | 2 +-
imap/auth.c | 22 +++++++++++++++++++++-
imap/auth.c | 23 ++++++++++++++++++++++-
mx.c | 3 +++
4 files changed, 38 insertions(+), 7 deletions(-)
4 files changed, 39 insertions(+), 7 deletions(-)
--- configure.ac
+++ configure.ac 2019-11-13 12:53:59.275193074 +0000
@@ -245,7 +245,7 @@ main ()
+++ configure.ac 2020-01-14 13:04:28.102878757 +0000
@@ -295,7 +295,7 @@ main ()
mutt_cv_slang=$withval
if test -d $withval/include/slang; then
CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
@ -16,7 +16,7 @@
CPPFLAGS="$CPPFLAGS -I${withval}/include"
fi
LDFLAGS="$LDFLAGS -L${withval}/lib"
@@ -715,8 +715,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
@@ -766,8 +766,12 @@ AC_ARG_WITH(ssl, AS_HELP_STRING([--with-
else
if test "$with_ssl" != "yes"
then
@ -31,7 +31,7 @@
fi
saved_LIBS="$LIBS"
@@ -803,8 +807,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
@@ -854,8 +858,12 @@ AC_ARG_WITH(sasl, AS_HELP_STRING([--with
if test "$with_sasl" != "yes"
then
@ -47,7 +47,7 @@
saved_LIBS="$LIBS"
--- doc/Muttrc.head
+++ doc/Muttrc.head 2019-11-13 12:53:59.275193074 +0000
+++ doc/Muttrc.head 2020-01-14 13:05:31.265704120 +0000
@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
"call urlview to extract URLs out of a message"
@ -56,9 +56,9 @@
+macro generic,index,pager <F1> "<shell-escape> less @docdir@/manual.txt.gz<Enter>" "show Mutt documentation"
# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
macro index y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
# note: these macros have been subsumed by the <browse-mailboxes> function.
--- imap/auth.c
+++ imap/auth.c 2019-11-13 12:56:50.175985326 +0000
+++ imap/auth.c 2020-01-14 13:04:28.102878757 +0000
@@ -73,6 +73,25 @@ int imap_authenticate (IMAP_DATA* idata)
dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method));
authenticator = imap_authenticators;
@ -97,8 +97,8 @@
}
else
--- mx.c
+++ mx.c 2019-11-13 12:53:59.275193074 +0000
@@ -1450,6 +1450,9 @@ void mx_update_context (CONTEXT *ctx, in
+++ mx.c 2020-01-14 13:04:28.102878757 +0000
@@ -1474,6 +1474,9 @@ void mx_update_context (CONTEXT *ctx, in
{
h = ctx->hdrs[msgno];

3
mutt-1.13.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78423016b5f2fcb31bfd156999ff6638177be4459230d2ee61a81e5641d07378
size 4896808

View File

@ -5,12 +5,12 @@ Index: init.h
1 file changed, 1 insertion(+)
--- init.h
+++ init.h 2019-01-02 13:04:23.746719029 +0000
@@ -4180,6 +4180,7 @@ struct option_t MuttVars[] = {
+++ init.h 2020-01-14 13:28:27.408149074 +0000
@@ -4345,6 +4345,7 @@ struct option_t MuttVars[] = {
** printing, or replying to messages.
*/
{ "wrap", DT_NUM, R_PAGER, UL &Wrap, 0 },
+ { "wrapcolumn", DT_SYN, R_NONE, UL "wrap", 0 },
{ "wrap", DT_NUM, R_PAGER, {.p=&Wrap}, {.l=0} },
+ { "wrapcolumn", DT_SYN, R_NONE, {.p="wrap"}, {.p=0} },
/*
** .pp
** When set to a positive value, mutt will wrap text at $$wrap characters.

View File

@ -5,24 +5,24 @@
3 files changed, 14 insertions(+), 3 deletions(-)
--- init.h
+++ init.h 2019-11-13 13:02:27.665650218 +0000
@@ -3010,6 +3010,13 @@ struct option_t MuttVars[] = {
+++ init.h 2020-01-14 13:12:26.725982952 +0000
@@ -3078,6 +3078,13 @@ struct option_t MuttVars[] = {
** .pp
** Also see the $$force_name variable.
*/
+ { "send_group_reply_to", DT_BOOL, R_NONE, OPTSENDGROUPREPLYTO, 0 },
+ { "send_group_reply_to", DT_BOOL, R_NONE, {.l=OPTSENDGROUPREPLYTO}, {.l=0} },
+ /*
+ ** .pp
+ ** This variable controls how group replies are done.
+ ** When set, all recepients listet in "To:" are set in the
+ ** "To:" header again, else in the "CC", which is the default.
+ */
{ "score", DT_BOOL, R_NONE, OPTSCORE, 1 },
{ "score", DT_BOOL, R_NONE, {.l=OPTSCORE}, {.l=1} },
/*
** .pp
--- mutt.h
+++ mutt.h 2019-11-13 13:02:27.665650218 +0000
@@ -493,6 +493,7 @@ enum
+++ mutt.h 2020-01-14 13:07:33.727426389 +0000
@@ -509,6 +509,7 @@ enum
OPTSAVEADDRESS,
OPTSAVEEMPTY,
OPTSAVENAME,
@ -31,8 +31,8 @@
#ifdef USE_SIDEBAR
OPTSIDEBAR,
--- send.c
+++ send.c 2019-11-13 13:15:12.547293335 +0000
@@ -673,9 +673,12 @@ int mutt_fetch_recips (ENVELOPE *out, EN
+++ send.c 2020-01-14 13:07:33.727426389 +0000
@@ -679,9 +679,12 @@ int mutt_fetch_recips (ENVELOPE *out, EN
(!in->mail_followup_to || hmfupto != MUTT_YES))
{
/* if (!mutt_addr_is_user(in->to)) */

View File

@ -9,7 +9,7 @@ Index: mutt-1.5.21/init.c
--- init.c
+++ init.c 2019-01-02 13:25:20.795634552 +0000
@@ -3536,7 +3536,7 @@ void mutt_init (int skip_sys_rc, LIST *c
@@ -3577,7 +3577,7 @@ void mutt_init (int skip_sys_rc, LIST *c
else
{
/* Default search path from RFC1524 */

View File

@ -8,7 +8,7 @@
--- crypt-gpgme.c
+++ crypt-gpgme.c 2019-11-13 13:46:16.512388398 +0000
@@ -2669,7 +2669,7 @@ static void copy_clearsigned (gpgme_data
@@ -2733,7 +2733,7 @@ static void copy_clearsigned (gpgme_data
if (armor_header)
{
@ -19,7 +19,7 @@
}
--- lib.c
+++ lib.c 2019-11-13 13:42:00.245189313 +0000
@@ -683,6 +683,17 @@ int mutt_strcmp(const char *a, const cha
@@ -718,6 +718,17 @@ int mutt_strcmp(const char *a, const cha
return strcmp(NONULL(a), NONULL(b));
}
@ -39,7 +39,7 @@
return strcasecmp(NONULL(a), NONULL(b));
--- lib.h
+++ lib.h 2019-11-13 13:47:17.399247662 +0000
@@ -201,6 +201,7 @@ int mutt_copy_stream (FILE *, FILE *);
@@ -200,6 +200,7 @@ int mutt_copy_stream (FILE *, FILE *);
int mutt_copy_bytes (FILE *, FILE *, size_t);
int mutt_strcasecmp (const char *, const char *);
int mutt_strcmp (const char *, const char *);
@ -69,7 +69,7 @@
break;
if (armor_header)
@@ -442,14 +442,14 @@ int pgp_application_pgp_handler (BODY *m
@@ -446,14 +446,14 @@ int pgp_application_pgp_handler (BODY *m
could_not_decrypt = 0;
decrypt_okay_rc = 0;
@ -87,7 +87,7 @@
{
needpass = 0;
pgp_keyblock = 1;
@@ -482,10 +482,10 @@ int pgp_application_pgp_handler (BODY *m
@@ -486,10 +486,10 @@ int pgp_application_pgp_handler (BODY *m
fputs (buf, tmpfp);
@ -101,7 +101,7 @@
break;
/* remember optional Charset: armor header as defined by RfC4880 */
if (mutt_strncmp ("Charset: ", buf, 9) == 0)
@@ -740,11 +740,11 @@ static int pgp_check_traditional_one_bod
@@ -751,11 +751,11 @@ static int pgp_check_traditional_one_bod
{
if (mutt_strncmp ("-----BEGIN PGP ", buf, 15) == 0)
{
@ -116,7 +116,7 @@
key = 1;
}
}
@@ -1261,9 +1261,9 @@ BODY *pgp_sign_message (BODY *a)
@@ -1297,9 +1297,9 @@ BODY *pgp_sign_message (BODY *a)
*/
while (fgets (buffer, sizeof (buffer) - 1, pgpout) != NULL)
{

View File

@ -9,8 +9,8 @@
7 files changed, 149 insertions(+), 4 deletions(-)
--- Makefile.am
+++ Makefile.am 2019-11-13 13:18:22.867731105 +0000
@@ -32,7 +32,7 @@ mutt_SOURCES = \
+++ Makefile.am 2020-01-14 13:28:45.787807571 +0000
@@ -33,7 +33,7 @@ mutt_SOURCES = \
edit.c enter.c flags.c init.c filter.c from.c \
getdomain.c group.c \
handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
@ -19,7 +19,7 @@
postpone.c query.c recvattach.c recvcmd.c \
rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
score.c send.c sendlib.c signal.c sort.c \
@@ -86,7 +86,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
@@ -89,7 +89,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
mutt_dotlock_LDADD = $(LIBOBJS)
mutt_dotlock_DEPENDENCIES = $(LIBOBJS)
@ -29,23 +29,23 @@
mutt_pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS)
--- mbox.c
+++ mbox.c 2019-11-13 13:18:22.867731105 +0000
@@ -890,8 +890,13 @@ static int mbox_sync_mailbox (CONTEXT *c
+++ mbox.c 2020-01-14 13:30:35.969760118 +0000
@@ -891,8 +891,13 @@ static int mbox_sync_mailbox (CONTEXT *c
/* Create a temporary file to write the new version of the mailbox in. */
mutt_mktemp (tempfile, sizeof (tempfile));
tempfile = mutt_buffer_pool_get ();
mutt_buffer_mktemp (tempfile);
+#if defined(__linux__)
+ if ((i = opennfs(tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 ||
+ (fp = fdopen(i, "w")) == NULL)
+ if ((i = opennfs (mutt_b2s (tempfile), O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 ||
+ (fp = fdopen (i, "w")) == NULL)
+#else
if ((i = open (tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 ||
if ((i = open (mutt_b2s (tempfile), O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 ||
(fp = fdopen (i, "w")) == NULL)
+#endif
{
if (-1 != i)
{
--- mh.c
+++ mh.c 2019-11-13 13:24:16.337114049 +0000
+++ mh.c 2020-01-14 13:28:45.787807571 +0000
@@ -369,7 +369,11 @@ static int mh_mkstemp (CONTEXT * dest, F
{
mutt_buffer_printf (path, "%s/.mutt-%s-%d-%d",
@ -58,7 +58,7 @@
{
if (errno != EEXIST)
{
@@ -1552,8 +1556,11 @@ static int maildir_open_new_message (MES
@@ -1553,8 +1557,11 @@ static int maildir_open_new_message (MES
dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
mutt_b2s (path)));
@ -72,8 +72,8 @@
if (errno != EEXIST)
{
--- mutt.h
+++ mutt.h 2019-11-13 13:18:22.867731105 +0000
@@ -1124,4 +1124,7 @@ typedef struct
+++ mutt.h 2020-01-14 13:28:45.787807571 +0000
@@ -1169,4 +1169,7 @@ typedef struct
#include "lib.h"
#include "globals.h"
@ -82,8 +82,8 @@
+#endif
#endif /*MUTT_H*/
--- muttlib.c
+++ muttlib.c 2019-11-13 13:21:44.139963407 +0000
@@ -2306,6 +2306,10 @@ int safe_open (const char *path, int fla
+++ muttlib.c 2020-01-14 13:28:45.787807571 +0000
@@ -2391,6 +2391,10 @@ int safe_open (const char *path, int fla
BUFFER *safe_file = NULL;
BUFFER *safe_dir = NULL;
@ -94,7 +94,7 @@
if (flags & O_EXCL)
{
safe_file = mutt_buffer_pool_get ();
@@ -2334,7 +2338,7 @@ int safe_open (const char *path, int fla
@@ -2419,7 +2423,7 @@ int safe_open (const char *path, int fla
if ((fd = open (path, flags & ~O_EXCL, 0600)) < 0)
goto cleanup;
@ -103,8 +103,8 @@
/* make sure the file is not symlink */
if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
compare_stat(&osb, &nsb) == -1)
--- /dev/null
+++ opennfs.c 2019-11-13 13:18:22.867731105 +0000
--- opennfs.c
+++ opennfs.c 2020-01-14 13:28:45.787807571 +0000
@@ -0,0 +1,122 @@
+#include <errno.h>
+#include <fcntl.h>
@ -229,8 +229,8 @@
+ return open(path, flags, mode);
+}
--- sendlib.c
+++ sendlib.c 2019-11-13 13:18:22.867731105 +0000
@@ -2284,7 +2284,11 @@ send_msg (const char *path, char **args,
+++ sendlib.c 2020-01-14 13:28:45.787807571 +0000
@@ -2489,7 +2489,11 @@ send_msg (const char *path, char **args,
if (SendmailWait >= 0 && tempfile && *tempfile)
{
/* *tempfile will be opened as stdout */

View File

@ -16,7 +16,7 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
--- signal.c
+++ signal.c 2019-11-14 08:40:31.823464569 +0000
@@ -92,6 +92,7 @@ static void sighandler (int sig)
@@ -132,6 +132,7 @@ static void sighandler (int sig)
break;
#endif
@ -24,7 +24,7 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
case SIGINT:
SigInt = 1;
break;
@@ -119,7 +120,6 @@ void mutt_signal_init (void)
@@ -159,7 +160,6 @@ void mutt_signal_init (void)
act.sa_handler = exit_handler;
sigaction (SIGTERM, &act, NULL);
sigaction (SIGHUP, &act, NULL);
@ -32,7 +32,7 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
/* we want to avoid race conditions */
sigaddset (&act.sa_mask, SIGTSTP);
@@ -139,6 +139,7 @@ void mutt_signal_init (void)
@@ -179,6 +179,7 @@ void mutt_signal_init (void)
sigaction (SIGCONT, &act, NULL);
sigaction (SIGTSTP, &act, NULL);
@ -40,7 +40,7 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
sigaction (SIGINT, &act, NULL);
#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
sigaction (SIGWINCH, &act, NULL);
@@ -175,6 +176,7 @@ void mutt_block_signals (void)
@@ -215,6 +216,7 @@ void mutt_block_signals (void)
sigaddset (&Sigset, SIGTERM);
sigaddset (&Sigset, SIGHUP);
sigaddset (&Sigset, SIGTSTP);
@ -48,7 +48,7 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
sigaddset (&Sigset, SIGINT);
#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
sigaddset (&Sigset, SIGWINCH);
@@ -249,5 +251,6 @@ void mutt_allow_interrupt (int dispositi
@@ -289,5 +291,6 @@ void mutt_allow_interrupt (int dispositi
if (disposition == 0)
sa.sa_flags |= SA_RESTART;
#endif

View File

@ -1,3 +1,269 @@
-------------------------------------------------------------------
Tue Jan 14 14:53:05 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Update to mutt 1.13.3 (2020-01-07):
* Fix crash when polling a closed ssl connection.
* Turn off auto-clear outside of autocrypt initialization.
* automatic post-release commit for mutt-1.13.2
* Revert "Fixes unchecked return from link() in dotlock.c"
* automatic post-release commit for mutt-1.13.1
* Fix segv in IMAP postponed menu caused by reopen_allow.
* Fix imap postponed mailbox use-after-free error.
* Rename sidebar mailbox shortcuts option and default off.
* Make shortpath/indent code guards explicit.
* Create $sidebar_relative_shortpath_indent, default unset.
* Fix new option order in the manual.
* Add $sidebar_use_mb_shortcuts to turn off shortcuts.
* Minor documentation fixes.
* automatic post-release commit for mutt-1.13.0
* Change "Prf Enc" to "Prf Encr".
* Update de.po
* Update copyright year
* Update ja.po
* Clarify $write_bcc documentation.
* Add a bit more documentation about sending.
* Updated Catalan translation.
* Updated Czech translation.
* Updated Russian translation.
* Updated Ukrainian translation.
* Updated Danish translation.
* Update de.po
* Fix $fcc_attach to not prompt in batch mode.
* Change $send_multipart_alternative to run in batch mode on ask-yes.
* allow autoview preview of multipart/alternative content
* add view-alt function, so now we have
+ view-alt "v"
+ view-alt-text "Esc v"
+ view-alt-mailcap "V"
* Fix __attribute__((warn_unused_result)) issue in query.c
* Fix __attribute__((warn_unused_result)) issue in help.c
* Fix __attribute__((warn_unused_result)) warning in enter.c
* Fixes unchecked return from link() in dotlock.c
* Update patchlist.sh to support `guilt' patch queues
* Add gcc comments for fallthrough case statements.
* Add $count_alternatives to count attachments inside alternatives.
* Remove nonreentrant calls from exit_handler()
* Add markdown2html contrib script.
* Remove input buffer flush on sigwinch in index.
* Fix sigwinch race in the index and menu processor.
* Change $write_bcc to default off.
* Block multipart type alternatives generation.
* s/Mercurial/Git/ in INSTALL
* Ensure APP_PGP flag is enabled for autocrypt.
* Add ability to generate multipart/alternative using a filter script.
* Create multipart/mixed helpers.
* mutt_parse_content_type: work around annoying charset behaviour from Outlook
* Convert smime_decrypt_mime() to use buffer pool.
* Convert smime_handle_entity() to use buffers.
* Convert smime_verify_one() to use buffer pool.
* Convert smime_sign_message() to use buffer pool.
* Convert smime_build_smime_entity() to use buffer pool.
* Convert smime_invoke_import() and helpers to use buffer pool.
* Convert smime_verify_sender() and helpers to use buffer pool.
* Convert smime_get_candidates() to use buffer pool.
* Convert mutt_write_fcc() to use buffer pool.
* Convert _mutt_bounce_message to use buffer pool.
* Convert send_msg() $sendmail_wait to use buffer pool.
* Convert transform_to_7bit() to use buffer pool.
* Convert mutt_message_to_7bit() to use buffer.
* Convert fcc to a buffer.
* Convert send_message() to use buffer pool.
* Add typelen parameter to rfc1524_mailcap_lookup().
* Convert rfc1524_mailcap_lookup() to use buffer pool for path.
* Convert mutt_attach_reply() to use buffer pool.
* Convert attach_forward_msgs() to use buffer pool.
* Convert attach_forward_bodies to use buffer pool.
* Convert attach_fmt %f to use buffer pool.
* Convert mutt_num_postponed() maildir check to use buffer pool.
* Convert pop_fetch_message() to use buffer pool.
* Convert pop_read_header() to use buffer pool.
* Convert pgp_find_hash to use buffer pool.
* Convert pgp_make_key_attachment() to use buffer pool.
* Remove make_key_attachment parameter.
* Convert pgp_select_key() to use buffer pool.
* Convert pgp_traditional_encryptsign() to use buffer pool.
* Convert pgp_encrypt_message() to use buffer pool.
* Convert pgp_encrypted_handler() to use buffer pool.
* Convert pgp_decrypt_mime() to use buffer pool.
* Convert pgp_decrypt_part() to use buffer pool.
* Convert pgp_extract_keys_from_attachment() to use buffer pool.
* Convert pgp_verify_one() to use buffer pool.
* Convert pgp_check_traditional_one_body() to use buffer pool.
* Clean up pager change folder aborts to return to pager.
* Remove menu->menu hack when redirecting pager ops through index.
* Stable branch quick fix for pager change-mailbox push/exec bug.
* Convert pgp_app_handler to use buffer pool.
* Convert msg_search to use buffer.
* Convert mx_close_mailbox() to use buffer pool.
* Reduce line buffer size in mx_get_magic().
* Convert mutt_save_confirm() to use buffer pool.
* Removed unused mutt_expand_link()
* Change ssl_init to use buffer pool for rand filename.
* Convert mbox_sync_mailbox() to use buffer pool.
* Update mime fields when piping a message with $pipe_decode set.
* Add new browse-mailboxes function in index and pager.
* Convert main() to use buffers for paths.
* Add sticky browser behavior for sorting.
* Convert start_debug() to use buffer pool.
* Convert set/reset and source_rc to use buffers for paths.
* Convert parse_path_(un)list to use buffer pool for path.
* Change message cache id to use SHORT_STRING.
* Convert imap_cachepath() and callers to use buffers.
* Convert imap_open_new_message() to use buffer pool.
* Convert save-hook and fcc-hook to use buffer pool internally.
* Convert mutt_parse_hook() to use buffer pool.
* Convert shrink_histfile() tempfile to use buffer pool.
* Convert mutt_help() to use buffer for tempfile.
* Convert mutt_edit_headers() to use buffer pool.
* Fix built-in pager checks for help and attachments.
* Memcpy header cache fetch values to ensure alignment.
* Convert hcache delete and open calls to use buffer pool.
* Convert hcache fetch and store raw to use buffer pool.
* Convert hcache_open to use buffer pool.
* Convert hcache db4 lockfile to buffer.
* Convert run_decode_and_handler() to use buffer pool.
* Convert edit_one_message() to use buffer pool.
* Convert mutt_error_history to use buffer pool.
* Convert crypt_extract_keys and signed handler to use buffers.
* Convert crypt-gpgme to use BUFFER for tempfiles.
* Fix memory leak in compose write-fcc function.
* Convert compress setup_paths() to use buffer.
* Remove nonull check from _mutt_enter_fname()
* Convert compose menu fname variable to buffer.
* Convert buffer callers of mutt_get_field() to use buffer version.
* Create mutt_buffer_get_field().
* Convert compose check_attachments() to use buffer pool.
* Fix mutt_save_message() "enter_fname()" to use buffer version.
* Convert mutt_complete() to use the buffer pool.
* Improve sidebar indentation and shortpath behavior.
* Convert print_attachment_list to use buffer pool.
* Convert recvattach save_attachment functions to use buffer pool.
* Convert mutt_save_message() to use buffer pool.
* Convert mutt_display_message() to buffer pool.
* Change browser <display-filename> to show full_path.
* Convert remaining mutt_encode_path() call to use BUFFER.
* Add $browser_sticky_cursor default set.
* Rename browser fields to display_name and full_path.
* Convert bcache to use buffer pools.
* Fix memory leak when attaching messages.
* Reuse the static space_stuff function for unstuffing.
* Remove manual note about space-stuffing only once.
* Re-enable and cleanup format-flowed space stuffing.
* Properly revert on an autocrypt postpone failure.
* de.po: proper translation for term collapse
* Clean up the autocrypt doc a bit more.
* Update autocrypt keyring documentation.
* Fix --with-sqlite3 test for autocrypt.
* Add $ssl_use_tlsv1_3 config variable, default set.
* Add size display configuration variables.
* Fix LibreSSL build.
* Update POTFILES.in.
* Add checks for buffered OpenSSL or GnuTLS data when polling.
* Mention base64 keydata being stored in the autocrypt database.
* Move LIBAUTOCRYPT before MUTTLIBS to fix building issues.
* Add autocrypt and sqlite3 to .gitlab-ci.yml.
* Add L10N comment about autocrypt menu help line abbreviations.
* Add a note about autocrypt first-run and macros.
* Add autocrypt documentation about shared key and keyring strategies.
* Minor autocrypt manual section updates.
* Enabled writing protected subject with autocrypt too.
* Turn off macro processing during autocrypt initialization.
* Allow nested setting of OPTIGNOREMACROEVENTS.
* Add $autocrypt_reply.
* Automatically clear screen when popping the last menu.
* Add ability to create autocrypt account from an existing key.
* Don't try to decrypt autocrypt messages if the option is off.
* Manual typo fix.
* Add autocrypt README file
* Add documentation for the autocrypt feature.
* Add option to scan mailboxes during first run.
* Add more translation string comments for autocrypt.
* Basic autocrypt account menu.
* Convert peer_update to just pass the peer object.
* Improve gen-map-doc work on multi-word maps.
* Add account->enabled checks.
* Add prefer-encrypt prompt during account creation.
* Add AUTOCRYPT header to imap fetch list.
* Add L10N translation message comments.
* Add autocrypt source files to POTFILES.in
* Print an error message if an autocrypt key can't be found.
* Handle autocrypt message decryption.
* Slightly improve the gossip header key update.
* Fix process_gossip_headers() to look at the right envelope.
* Autocrypt outgoing emails.
* Postpone work:
+ Change mutt_protect() to have a postpone parameter. Remove the
manual toggling of the SIGN bit outside the call when postponing.
+ Since autocrypt doesn't set the SIGN bit, this allows us to turn off
signing inside mutt_protect() for both normal and autocrypt mode.
+ Set the autocrypt postpone key in AutocryptDefaultKey.
* Write autocrypt and gossip headers in outgoing emails.
* Add autocrypt line to the compose menu.
* Add another HEADER security bit for autocrypt.
* Change gossip header address comparison to use normalized addresses.
* Change autocrypt_db normalization to return ADDRESS.
* Add gossip header processing.
* Convert to use sqllite3_prepare_v3().
* Process autocrypt headers.
* Add autocrypt header parsing to mutt_parse_rfc822_line().
* Convert parse_parameters() for autocrypt header usage:
+ change to use a BUFFER to accomodate large autocrypt keydata
attribute values.
+ Autocrypt header parameters are not rfc2231 compliant. Rather
than rolling another very similar function, just change the
existing one to allow space separation.
* Add initial autocrypt account setup.
* Factor out mutt_edit_address() in send.c.
* Start autocrypt gpgme.
* Add database and schema initialization.
* Add autocrypt config vars.
* Initial autoconf and makefile setup for autocrypt.
* Add a comment to the OPTIGNOREMACROEVENTS km_dokey() change.
* Change OPTIGNOREMACROEVENTS to actuallly ignore macros instead of throwing errors on macros
* Added * option to unattachments command
* Add builds.sr.ht CI manifests
* Fix a reference to HeaderCachePageSize.
* Omit User-Agent: header by default
* Remove unnecessary "" checks for DT_STR and DT_PATH MuttVars.
* Convert $header_cache_pagesize to type DT_LNUM.
* Convert Commands to use the union pointer_long_t too.
* Fix the makedoc program to cope with the new MuttVars format.
* Convert MuttVars.data and .init to use a union type.
* Detail the documentation of %l for index_format.
* Add NULL checks to rfc1524_free_entry().
* Clean up mutt_print_attachment() cleanup.
* Remove mutt_rfc1524_expand_filename() return value and checks.
* Remove unnecessary strcmp for mutt_view_attachment().
* Remove NULL and 0 INITVAL declarataions.
* Combine DT_STR and DT_PATH in mutt_set_default().
* Remove UL "" initialization from init.h.
* Allow imap_cmd_finish() to both expunge and fetch new mail.
* Check for GNU Make to allow version.h FORCE target.
* Change --disable-doc to only skip manual generation.
* Remove EXTRACT_MACROS check from EXTRACT_NUMBER in regex.
* Rename --with-regex to --with-bundled-regex.
* Remove undefined left-shift on negative value from regex.c.
* Change mutt_addr_is_user() to no for a NULL address.
* Turn on $ssl_force_tls by default.
* make OP_HALF_{UP,DOWN} behave symmetric.
- Post the patches
* aw.listreply.diff
* bsc907453-CVE-2014-9116-jessie.patch
* bug-676388-largefile.patch
* mutt-1.10.1-imap.patch
* mutt-1.5.15-wrapcolumn.diff
* mutt-1.5.20-sendgroupreplyto.diff
* mutt-1.5.21-mailcap.diff
* mutt-1.5.23-carriage-return.path
* mutt-1.6.1-opennfs.dif
* mutt-Fix-SIGQUIT-handling.patch
* patch-1.5.24.vk.pgp_verbose_mime
* widechar.sidebar.dif
- Port and rename patch mutt-1.12.2.dif whic is now mutt-1.13.3.dif
-------------------------------------------------------------------
Thu Nov 14 08:46:14 UTC 2019 - Dr. Werner Fink <werner@suse.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package mutt
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -75,7 +75,7 @@ Recommends: w3m
Requires(post): shared-mime-info
Requires(postun): shared-mime-info
%endif
Version: 1.12.2
Version: 1.13.3
Release: 0
Summary: Mail Program
# ftp://ftp.mutt.org/mutt/devel/
@ -89,7 +89,7 @@ Source3: mutt.png
Source4: mutt.desktop
Source5: skel.muttrc
Source9: mutt.mailcap
Patch: %name-1.12.2.dif
Patch0: %name-1.13.3.dif
# http://www.spinnaker.de/mutt/compressed/
Patch2: %name-1.5.9i-pgpewrap.diff
Patch3: %name-1.5.20-sendgroupreplyto.diff
@ -144,7 +144,7 @@ Provides translations to the package mutt.
%prep
%setup -q -n mutt-%version
%patch -p0 -b .p0
%patch0 -p0 -b .p0
%patch2 -p0 -b .pgpewrap
%patch3 -p0 -b .sendgroupreplyto
%patch4 -p0 -b .wrapcolumn
@ -326,6 +326,7 @@ install -D -m 644 doc/manual.txt.gz %{buildroot}%{_docdir}/%name/
%doc %{_docdir}/%name/samples/*.rc
%doc %{_docdir}/%name/samples/ca-bundle.crt
%doc %{_docdir}/%name/samples/colors.*
%doc %{_docdir}/%name/samples/markdown2html
%doc %{_docdir}/%name/samples/mutt_xtitle
%doc %{_docdir}/%name/samples/sample.*
%doc %{_docdir}/%name/samples/smime_keys_test.pl

View File

@ -5,8 +5,8 @@
3 files changed, 16 insertions(+), 4 deletions(-)
--- globals.h
+++ globals.h 2019-01-02 13:23:50.937286980 +0000
@@ -263,6 +263,8 @@ WHERE char *PgpDefaultKey;
+++ globals.h 2020-01-14 13:37:00.770606718 +0000
@@ -270,6 +270,8 @@ WHERE char *PgpDefaultKey;
WHERE char *PgpSignAs;
WHERE long PgpTimeout;
WHERE char *PgpEntryFormat;
@ -16,32 +16,32 @@
WHERE char *PgpDecodeCommand;
WHERE char *PgpVerifyCommand;
--- init.h
+++ init.h 2019-01-02 13:22:43.822520945 +0000
@@ -3308,9 +3308,18 @@ struct option_t MuttVars[] = {
+++ init.h 2020-01-14 13:41:15.145875625 +0000
@@ -3461,9 +3461,18 @@ struct option_t MuttVars[] = {
** a line quoted text if it also matches $$smileys. This mostly
** happens at the beginning of a line.
*/
-
-
-
+ { "pgp_mime_signature_filename", DT_STR, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"},
+ { "pgp_mime_signature_filename", DT_STR, R_NONE, {.p=&PgpMimeSignatureFilename}, {.p="signature.asc"} },
+ /*
+ ** .pp
+ ** This option sets the filename used for signature parts in PGP/MIME
+ ** signed messages.
+ */
+ { "pgp_mime_signature_description", DT_STR, R_NONE, UL &PgpMimeSignatureDescription, UL "Digital signature"},
+ { "pgp_mime_signature_description", DT_STR, R_NONE, {.p=&PgpMimeSignatureDescription}, {.p="Digital signature"} },
+ /*
+ ** .pp
+ ** This option sets the Content-Description used for signature parts in
+ ** PGP/MIME signed messages.
+ */
{ "smime_ask_cert_label", DT_BOOL, R_NONE, OPTASKCERTLABEL, 1 },
{ "smime_ask_cert_label", DT_BOOL, R_NONE, {.l=OPTASKCERTLABEL}, {.l=1} },
/*
** .pp
--- pgp.c
+++ pgp.c 2019-01-02 13:22:43.822520945 +0000
@@ -1325,7 +1325,8 @@ BODY *pgp_sign_message (BODY *a)
+++ pgp.c 2020-01-14 13:42:29.880485319 +0000
@@ -1360,7 +1360,8 @@ BODY *pgp_sign_message (BODY *a)
t->disposition = DISPNONE;
t->encoding = ENC7BIT;
t->unlink = 1; /* ok to remove this file after sending. */
@ -49,5 +49,5 @@
+ mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter);
+ t->description = safe_strdup (PgpMimeSignatureDescription);
return (a);
}
cleanup:
mutt_buffer_pool_release (&sigfile);

View File

@ -31,7 +31,7 @@
case TEXT :
switch (wc)
{
@@ -878,9 +880,8 @@ static int text_enriched_handler (BODY *
@@ -879,9 +881,8 @@ static int text_enriched_handler (BODY *
enriched_flush (&stte, 1);
else
{