diff -urN mutt-1.5.11/PATCHES mutt-1.5.11.new/PATCHES --- mutt-1.5.11/PATCHES 2005-08-15 01:16:00.000000000 -0700 +++ mutt-1.5.11.new/PATCHES 2006-03-10 14:45:51.000000000 -0800 @@ -0,0 +1 @@ +patch-1.5.3.vk.pgp_verbose_mime diff -urN mutt-1.5.11/globals.h mutt-1.5.11.new/globals.h --- mutt-1.5.11/globals.h 2005-09-15 07:19:54.000000000 -0700 +++ mutt-1.5.11.new/globals.h 2006-03-10 14:45:51.000000000 -0800 @@ -203,6 +203,8 @@ WHERE char *PgpSignAs; WHERE short PgpTimeout; WHERE char *PgpEntryFormat; +WHERE char *PgpMimeSignatureFilename; +WHERE char *PgpMimeSignatureDescription; WHERE char *PgpClearSignCommand; WHERE char *PgpDecodeCommand; WHERE char *PgpVerifyCommand; diff -urN mutt-1.5.11/init.h mutt-1.5.11.new/init.h --- mutt-1.5.11/init.h 2005-09-15 07:19:54.000000000 -0700 +++ mutt-1.5.11.new/init.h 2006-03-10 14:45:51.000000000 -0800 @@ -1212,6 +1212,18 @@ ** menu, attachments which cannot be decoded in a reasonable manner will ** be attached to the newly composed message if this option is set. */ + { "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. + */ #ifdef MIXMASTER { "mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, UL "%4n %c %-16s %a" }, diff -urN mutt-1.5.11/pgp.c mutt-1.5.11.new/pgp.c --- mutt-1.5.11/pgp.c 2005-09-07 01:19:43.000000000 -0700 +++ mutt-1.5.11.new/pgp.c 2006-03-10 14:45:51.000000000 -0800 @@ -1087,6 +1087,8 @@ t->disposition = DISPINLINE; t->encoding = ENC7BIT; t->unlink = 1; /* ok to remove this file after sending. */ + mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter); + t->description = safe_strdup (PgpMimeSignatureDescription); return (a); }