2015-09-11 17:37:14 +02:00
|
|
|
---
|
|
|
|
PATCHES | 1 +
|
|
|
|
globals.h | 2 ++
|
|
|
|
init.h | 12 ++++++++++++
|
|
|
|
pgp.c | 3 ++-
|
|
|
|
4 files changed, 17 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
--- PATCHES
|
2016-06-13 11:33:22 +02:00
|
|
|
+++ PATCHES 2016-06-13 09:02:59.501498661 +0000
|
2015-09-11 17:37:14 +02:00
|
|
|
@@ -1,3 +1,4 @@
|
|
|
|
+patch-1.5.3.vk.pgp_verbose_mime
|
|
|
|
patch-1.5.9.aw.listreply.1
|
2016-06-13 11:33:22 +02:00
|
|
|
patch-quasi-delete-neo-20160612
|
|
|
|
patch-progress-neo-20160612
|
2015-09-11 17:37:14 +02:00
|
|
|
--- globals.h
|
2016-06-13 11:33:22 +02:00
|
|
|
+++ globals.h 2016-06-13 09:02:33.338000098 +0000
|
2016-05-31 14:38:26 +02:00
|
|
|
@@ -274,6 +274,8 @@ WHERE REGEXP PgpDecryptionOkay;
|
2012-05-25 16:08:44 +02:00
|
|
|
WHERE char *PgpSignAs;
|
|
|
|
WHERE short PgpTimeout;
|
|
|
|
WHERE char *PgpEntryFormat;
|
|
|
|
+WHERE char *PgpMimeSignatureFilename;
|
|
|
|
+WHERE char *PgpMimeSignatureDescription;
|
|
|
|
WHERE char *PgpClearSignCommand;
|
|
|
|
WHERE char *PgpDecodeCommand;
|
|
|
|
WHERE char *PgpVerifyCommand;
|
2015-09-11 17:37:14 +02:00
|
|
|
--- init.h
|
2016-06-13 11:33:22 +02:00
|
|
|
+++ init.h 2016-06-13 09:02:33.338000098 +0000
|
|
|
|
@@ -3185,6 +3185,18 @@ struct option_t MuttVars[] = {
|
2012-05-25 16:08:44 +02:00
|
|
|
** 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"},
|
|
|
|
+ /*
|
|
|
|
+ ** .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"},
|
|
|
|
+ /*
|
|
|
|
+ ** .pp
|
|
|
|
+ ** This option sets the Content-Description used for signature parts in
|
|
|
|
+ ** PGP/MIME signed messages.
|
|
|
|
+ */
|
|
|
|
|
|
|
|
|
|
|
|
|
2015-09-11 17:37:14 +02:00
|
|
|
--- pgp.c
|
2016-06-13 11:33:22 +02:00
|
|
|
+++ pgp.c 2016-06-13 09:02:33.338000098 +0000
|
2016-05-12 16:10:16 +02:00
|
|
|
@@ -1261,7 +1261,8 @@ BODY *pgp_sign_message (BODY *a)
|
2012-05-25 16:08:44 +02:00
|
|
|
t->disposition = DISPNONE;
|
|
|
|
t->encoding = ENC7BIT;
|
|
|
|
t->unlink = 1; /* ok to remove this file after sending. */
|
2015-09-11 17:37:14 +02:00
|
|
|
- mutt_set_parameter ("name", "signature.asc", &t->parameter);
|
2012-05-25 16:08:44 +02:00
|
|
|
+ mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter);
|
|
|
|
+ t->description = safe_strdup (PgpMimeSignatureDescription);
|
|
|
|
|
|
|
|
return (a);
|
|
|
|
}
|