diff options
| author | tron <tron> | 2004-02-01 22:37:18 +0000 |
|---|---|---|
| committer | tron <tron> | 2004-02-01 22:37:18 +0000 |
| commit | 673b2a023eb8fcf44ebdf134e06cfeb39dbda9c0 (patch) | |
| tree | 24fca26062e7e067774014e6ad6aa392b64ab75d /mail | |
| parent | 678eb8ff8bd32e2c3270203ec19092db36756070 (diff) | |
| download | pkgsrc-673b2a023eb8fcf44ebdf134e06cfeb39dbda9c0.tar.gz | |
Don't leak a file descriptor if a PGP signed e-mail is checked. Patch
supplied by David Laight in privat e-mail.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/mutt/distinfo | 4 | ||||
| -rw-r--r-- | mail/mutt/patches/patch-ba | 36 |
2 files changed, 20 insertions, 20 deletions
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo index 7c321cdbf32..fe2547e3cf4 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2004/01/28 10:58:00 lukem Exp $ +$NetBSD: distinfo,v 1.15 2004/02/01 22:37:18 tron Exp $ SHA1 (mutt-1.4.1i.tar.gz) = 34622caf9d04979d8ad01219050288561998f64b Size (mutt-1.4.1i.tar.gz) = 2599487 bytes @@ -7,5 +7,5 @@ SHA1 (patch-ad) = 63abea4130832d7612a904f7954ab9c97b3b80ac SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e SHA1 (patch-af) = 645b4f363ef47ac31335f15cdfc6e4c87542bcab SHA1 (patch-ag) = a1574bfe28b2a0ee5295a3f3529b6865f72075fa -SHA1 (patch-ba) = 859390820f3829d64a59a2b052af79487f52459b +SHA1 (patch-ba) = 689305356812d04bd3b490c436ed898a4b308136 SHA1 (patch-bb) = 701a9f538c3231c2b83029b02014aab9dfc71f5e diff --git a/mail/mutt/patches/patch-ba b/mail/mutt/patches/patch-ba index 5e12f6a26ab..f7cc520fd3b 100644 --- a/mail/mutt/patches/patch-ba +++ b/mail/mutt/patches/patch-ba @@ -1,7 +1,7 @@ -$NetBSD: patch-ba,v 1.1 2004/01/28 10:58:00 lukem Exp $ +$NetBSD: patch-ba,v 1.2 2004/02/01 22:37:19 tron Exp $ ---- pgp.c.orig 2002-01-10 02:39:28.000000000 +1100 -+++ pgp.c +--- pgp.c.orig Wed Jan 9 16:39:28 2002 ++++ pgp.c Sun Feb 1 23:32:50 2004 @@ -55,7 +55,7 @@ @@ -11,20 +11,20 @@ $NetBSD: patch-ba,v 1.1 2004/01/28 10:58:00 lukem Exp $ void pgp_void_passphrase (void) { - ---- send.c.orig 2002-01-31 09:50:59.000000000 +1100 -+++ send.c -@@ -1611,6 +1611,13 @@ full_fcc: - } +@@ -737,14 +737,14 @@ + + if (pgp_copy_checksig (pgperr, s->fpout) >= 0) + badsig = 0; +- +- safe_fclose (&pgperr); + + if ((rv = mutt_wait_filter (thepid))) + badsig = -1; + + dprint (1, (debugfile, "pgp_verify_one: mutt_wait_filter returned %d.\n", rv)); } - -+#ifdef HAVE_PGP -+ { -+ /* Extend the expiry time while messages keep getting sent. */ -+ extern time_t PgpExptime; -+ PgpExptime = time (NULL) + PgpTimeout; -+ } -+#endif /* HAVE_PGP */ - - rv = 0; ++ ++ safe_fclose (&pgperr); + + state_attach_puts (_("[-- End of PGP output --]\n\n"), s); |