Update to NeoMutt 20170912 based on Mutt 1.9.0

OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=174
This commit is contained in:
2017-09-15 09:18:59 +00:00
committed by Git OBS Bridge
parent ebec6d94e2
commit 929b87c1a3
16 changed files with 250 additions and 196 deletions

View File

@@ -5,8 +5,8 @@
3 files changed, 16 insertions(+), 1 deletion(-)
--- globals.h
+++ globals.h 2017-06-13 08:12:32.139412148 +0000
@@ -291,6 +291,8 @@ WHERE struct Regex PgpDecryptionOkay;
+++ globals.h 2017-09-11 12:01:55.090752808 +0000
@@ -292,6 +292,8 @@ WHERE struct Regex PgpDecryptionOkay;
WHERE char *PgpSignAs;
WHERE short PgpTimeout;
WHERE char *PgpEntryFormat;
@@ -16,29 +16,29 @@
WHERE char *PgpDecodeCommand;
WHERE char *PgpVerifyCommand;
--- init.h
+++ init.h 2017-06-13 08:12:32.139412148 +0000
@@ -3409,6 +3409,18 @@ struct Option MuttVars[] = {
+++ init.h 2017-09-11 12:03:41.660816163 +0000
@@ -3466,6 +3466,18 @@ struct Option 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_STRING, R_NONE, UL &PgpMimeSignatureFilename, UL "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_STRING, R_NONE, UL &PgpMimeSignatureDescription, UL "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, OPT_SMIME_ASK_CERT_LABEL, 1 },
/*
** .pp
--- ncrypt/pgp.c
+++ ncrypt/pgp.c 2017-06-13 08:12:32.139412148 +0000
@@ -1186,7 +1186,8 @@ struct Body *pgp_sign_message(struct Bod
+++ ncrypt/pgp.c 2017-09-11 12:01:55.090752808 +0000
@@ -1208,7 +1208,8 @@ struct Body *pgp_sign_message(struct Bod
t->disposition = DISPNONE;
t->encoding = ENC7BIT;
t->unlink = true; /* ok to remove this file after sending. */