head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.52
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.50
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.48
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.46
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.44
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.42
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.40
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.38
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.36
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.34
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.32
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.30
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.28
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.26
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.24
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.22
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.20
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.18
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.16
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.14
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.12
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.10
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.8
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.6
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.4
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.2
	pkgsrc-2004Q1-base:1.3;
locks; strict;
comment	@# @;


1.3
date	2004.02.02.07.21.24;	author tron;	state dead;
branches;
next	1.2;

1.2
date	2004.02.01.22.37.19;	author tron;	state Exp;
branches;
next	1.1;

1.1
date	2004.01.28.10.58.00;	author lukem;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Repeat after me:
I will not patch multiple files with one patch file.
I will not patch multiple files with one patch file.
I will not patch multiple files with one patch file.
[...]
@
text
@$NetBSD: patch-ba,v 1.2 2004/02/01 22:37:19 tron Exp $

--- pgp.c.orig	Wed Jan  9 16:39:28 2002
+++ pgp.c	Sun Feb  1 23:32:50 2004
@@@@ -55,7 +55,7 @@@@
 
 
 char PgpPass[STRING];
-static time_t PgpExptime = 0; /* when does the cached passphrase expire? */
+time_t PgpExptime = 0; /* when does the cached passphrase expire? */
 
 void pgp_void_passphrase (void)
 {
@@@@ -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));
   }
+
+  safe_fclose (&pgperr);
   
   state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
   
@


1.2
log
@Don't leak a file descriptor if a PGP signed e-mail is checked. Patch
supplied by David Laight in privat e-mail.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@patch-ba:
	Change pgp_timeout so that the timeout counter is reset every
	time mail is sent.  This makes pgp_timeout much more useful;
	rather than prompting you every pgp_timeout seconds for the
	passphrase, you only get prompted if pgp_timeout seconds have
	elapsed since you last sent email.
	From Ben Elliston.

patch-bb:
	Add new boolean option - change_folder_next.  If set, the `c'
	(change-folder) command selects the next unread mailbox in the
	mailboxes list from the current folder, rather than always
	going back to the start of the mailboxes list.
	From Simon Burge, with the buffy.c::mutt_buffy() fixes from me.

Bump PKGREVISION.

(ok-ed by agc@@)
@
text
@d3 2
a4 2
--- pgp.c.orig	2002-01-10 02:39:28.000000000 +1100
+++ pgp.c
d14 11
a24 5

--- send.c.orig	2002-01-31 09:50:59.000000000 +1100
+++ send.c
@@@@ -1611,6 +1611,13 @@@@ full_fcc:
     }
d26 4
a29 10
 
+#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;
@