* Stephane Bortzmeyer <[EMAIL PROTECTED]> [2002-10-16 14:40 (CEST)] > Is there a way to display the message "Good signature from..." *after* > the message, not between the headers and the messages? Or to hide it > unless specifically called? (Yes, I've look at the documentation and > in many .muttrc at www.dotfiles.com.)
The attached patch is against the mutt 1.5.1 tar ball available
at the mutt site, and allows what you asked for, setting the
configuration variable pgp_bottom_sig
--
Rafael C. Gawenda
2:346/7.549@fidonet
Registered LiNUX user #93375
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
You can't assign IP address 127.0.0.1 to the loopback adapter,
because it is a reserved address for loopback devices (Microsoft
Windows XP - P R O F E S S I O N A L)
diff -u mutt-1.5.1-o/PATCHES mutt-1.5.1/PATCHES
--- mutt-1.5.1-o/PATCHES Fri Oct 18 10:34:23 2002
+++ mutt-1.5.1/PATCHES Fri Oct 18 10:06:53 2002
@@ -1,0 +1 @@
+patch-1.5.1.rg.pgp_sigatbottom.1
diff -u mutt-1.5.1-o/crypt.c mutt-1.5.1/crypt.c
--- mutt-1.5.1-o/crypt.c Tue Mar 26 23:23:11 2002
+++ mutt-1.5.1/crypt.c Fri Oct 18 10:20:51 2002
@@ -724,6 +724,15 @@
return;
}
+#ifdef HAVE_PGP
+ if (option(OPTPGPBOTTOMSIG))
+ {
+ state_attach_puts (_("[-- The following data is signed --]\n\n"), s);
+ mutt_body_handler (a, s);
+ state_attach_puts (_("\n[-- End of signed data --]\n\n"), s);
+ }
+#endif
+
if (s->flags & M_DISPLAY)
{
@@ -767,6 +776,9 @@
b->badsig = goodsig; /* XXX - WHAT!?!?!? */
/* Now display the signed body */
+#ifdef HAVE_PGP
+ if (!option(OPTPGPBOTTOMSIG))
+#endif
state_attach_puts (_("[-- The following data is signed --]\n\n"), s);
@@ -775,11 +787,19 @@
else
state_attach_puts (_("[-- Warning: Can't find any signatures. --]\n\n"), s);
}
-
+
+#ifdef HAVE_PGP
+ if (!option(OPTPGPBOTTOMSIG))
+#endif
mutt_body_handler (a, s);
-
+
+#ifdef HAVE_PGP
+ if (s->flags & M_DISPLAY && sigcnt && !option(OPTPGPBOTTOMSIG))
+ state_attach_puts (_("\n[-- End of signed data --]\n"), s);
+#else
if (s->flags & M_DISPLAY && sigcnt)
state_attach_puts (_("\n[-- End of signed data --]\n"), s);
+#endif
}
diff -u mutt-1.5.1-o/init.h mutt-1.5.1/init.h
--- mutt-1.5.1-o/init.h Thu Apr 25 15:26:01 2002
+++ mutt-1.5.1/init.h Fri Oct 18 10:25:30 2002
@@ -1502,6 +1502,12 @@
** variable is only used if ``$$mime_forward'' is \fIset\fP and
** ``$$mime_forward_decode'' is \fIunset\fP.
*/
+ { "pgp_bottom_sig", DT_BOOL, R_NONE, OPTPGPBOTTOMSIG, 0},
+ /*
+ ** .pp
+ ** When set, the PGP signature report will be at the end of the signed
+ ** message part.
+ */
{ "forw_decrypt", DT_SYN, R_NONE, UL "forward_decrypt", 0 },
/*
*/
diff -u mutt-1.5.1-o/mutt.h mutt-1.5.1/mutt.h
--- mutt-1.5.1-o/mutt.h Sat Apr 20 10:09:54 2002
+++ mutt-1.5.1/mutt.h Fri Oct 18 10:04:55 2002
@@ -436,6 +436,7 @@
#ifdef HAVE_PGP
OPTPGPIGNORESUB,
OPTPGPLONGIDS,
+ OPTPGPBOTTOMSIG,
#endif
#if 0
OPTPGPENCRYPTSELF,
diff -u mutt-1.5.1-o/pgp.c mutt-1.5.1/pgp.c
--- mutt-1.5.1-o/pgp.c Thu Apr 4 08:49:50 2002
+++ mutt-1.5.1/pgp.c Fri Oct 18 10:10:03 2002
@@ -325,7 +325,7 @@
safe_fclose (&pgperr);
- if (s->flags & M_DISPLAY)
+ if (s->flags & M_DISPLAY & !option(OPTPGPBOTTOMSIG))
{
state_putc ('\n', s);
state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
msg31889/pgp00000.pgp
Description: PGP signature
