You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

patch-1.5.4.vk.pgp_verbose_mime.patch 1.8KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263
  1. From: Antonio Radici <antonio@debian.org>
  2. Date: Thu, 27 Feb 2014 14:45:01 +0100
  3. Subject: patch-1.5.4.vk.pgp_verbose_mime
  4. Enable pgp_mime_signature_filename and
  5. pgp_mime_signature_description.
  6. Gbp-Pq: Topic features-old
  7. ---
  8. globals.h | 2 ++
  9. init.h | 12 ++++++++++++
  10. pgp.c | 2 ++
  11. 3 files changed, 16 insertions(+)
  12. diff --git a/globals.h b/globals.h
  13. index a7e2304..5b6e56a 100644
  14. --- a/globals.h
  15. +++ b/globals.h
  16. @@ -244,6 +244,8 @@ WHERE char *PgpVerifyKeyCommand;
  17. WHERE char *PgpListSecringCommand;
  18. WHERE char *PgpListPubringCommand;
  19. WHERE char *PgpGetkeysCommand;
  20. +WHERE char *PgpMimeSignatureFilename;
  21. +WHERE char *PgpMimeSignatureDescription;
  22. /*-- formerly in smime.h --*/
  23. WHERE char *SmimeDefaultKey;
  24. diff --git a/init.h b/init.h
  25. index d4a882b..a64992a 100644
  26. --- a/init.h
  27. +++ b/init.h
  28. @@ -2590,6 +2590,18 @@ struct option_t MuttVars[] = {
  29. ** a line quoted text if it also matches $$smileys. This mostly
  30. ** happens at the beginning of a line.
  31. */
  32. + { "pgp_mime_signature_filename", DT_STR, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"},
  33. + /*
  34. + ** .pp
  35. + ** This option sets the filename used for signature parts in PGP/MIME
  36. + ** signed messages.
  37. + */
  38. + { "pgp_mime_signature_description", DT_STR, R_NONE, UL &PgpMimeSignatureDescription, UL "Digital signature"},
  39. + /*
  40. + ** .pp
  41. + ** This option sets the Content-Description used for signature parts in
  42. + ** PGP/MIME signed messages.
  43. + */
  44. diff --git a/pgp.c b/pgp.c
  45. index 506a078..92dee8c 100644
  46. --- a/pgp.c
  47. +++ b/pgp.c
  48. @@ -1127,6 +1127,8 @@ BODY *pgp_sign_message (BODY *a)
  49. t->disposition = DISPNONE;
  50. t->encoding = ENC7BIT;
  51. t->unlink = 1; /* ok to remove this file after sending. */
  52. + mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter);
  53. + t->description = safe_strdup (PgpMimeSignatureDescription);
  54. return (a);
  55. }