1
0
forked from pool/mutt
mutt/patch-1.5.24.vk.pgp_verbose_mime

59 lines
1.8 KiB
Plaintext

---
PATCHES | 1 +
globals.h | 2 ++
init.h | 12 ++++++++++++
pgp.c | 3 ++-
4 files changed, 17 insertions(+), 1 deletion(-)
--- PATCHES
+++ PATCHES 2016-09-13 10:02:27.260419491 +0000
@@ -1,3 +1,4 @@
+patch-1.5.3.vk.pgp_verbose_mime
patch-1.5.9.aw.listreply.1
patch-compress-neo-git
patch-cond-date-neo-git
--- globals.h
+++ globals.h 2016-09-13 10:02:12.156702439 +0000
@@ -271,6 +271,8 @@ WHERE REGEXP PgpDecryptionOkay;
WHERE char *PgpSignAs;
WHERE short PgpTimeout;
WHERE char *PgpEntryFormat;
+WHERE char *PgpMimeSignatureFilename;
+WHERE char *PgpMimeSignatureDescription;
WHERE char *PgpClearSignCommand;
WHERE char *PgpDecodeCommand;
WHERE char *PgpVerifyCommand;
--- init.h
+++ init.h 2016-09-13 10:02:12.156702439 +0000
@@ -3205,6 +3205,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"},
+ /*
+ ** .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.
+ */
--- pgp.c
+++ pgp.c 2016-09-13 10:02:12.156702439 +0000
@@ -1261,7 +1261,8 @@ BODY *pgp_sign_message (BODY *a)
t->disposition = DISPNONE;
t->encoding = ENC7BIT;
t->unlink = 1; /* ok to remove this file after sending. */
- mutt_set_parameter ("name", "signature.asc", &t->parameter);
+ mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter);
+ t->description = safe_strdup (PgpMimeSignatureDescription);
return (a);
}