ports/85465: maintainer-update of mail/mutt-devel

[Udo Schweigert]

>Number:         85465
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 30 08:50:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 5.4-RELEASE-p5 i386
>Organization:
>Environment:

>Description:

Maintainer update of mail/mutt-devel:

	- Fix distinfo for vvv.quote patch

	- Fix handling of pgp messages (from mutt's cvs)

Committer: new file (cvs add) files/patch-pgp.c


>How-To-Repeat:
>Fix:

diff -ru  /usr/ports/mail/mutt-devel/distinfo ./distinfo
--- /usr/ports/mail/mutt-devel/distinfo	Mon Aug 29 12:13:58 2005
+++ ./distinfo	Tue Aug 30 10:26:18 2005
@@ -6,8 +6,8 @@
 SIZE (mutt/patch-1.5.10.vvv.nntp.gz) = 98153
 MD5 (mutt/patch-1.5.10.vvv.initials.gz) = 91eea7344625830bf4231dc1d56cb799
 SIZE (mutt/patch-1.5.10.vvv.initials.gz) = 682
-MD5 (mutt/patch-1.5.10.vvv.quote.gz) = 7d9b9c2d52318782d81d2ffb95576d48
-SIZE (mutt/patch-1.5.10.vvv.quote.gz) = 1580
+MD5 (mutt/patch-1.5.10.vvv.quote.gz) = a447f9362a9ef37c8fdc58efa73ed326
+SIZE (mutt/patch-1.5.10.vvv.quote.gz) = 1963
 MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
 SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
 MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
diff -ru  /usr/ports/mail/mutt-devel/files/patch-pgp.c ./files/patch-pgp.c
--- /usr/ports/mail/mutt-devel/files/patch-pgp.c	Thu Jan  1 01:00:00 1970
+++ ./files/patch-pgp.c	Mon Aug 29 15:26:49 2005
@@ -0,0 +1,27 @@
+--- pgp.c.orig	Thu Aug 11 23:22:41 2005
++++ pgp.c	Thu Aug 25 08:01:22 2005
+@@ -381,16 +381,21 @@
+ 	}
+ 	
+         /* treat empty result as sign of failure */
+-	rewind (pgpout);
+-        if ((c = fgetc (pgpout)) == EOF)
++	if (pgpout)
++	{
++	  rewind (pgpout);
++	  c = fgetc (pgpout);
++	  ungetc (c, pgpout);
++	}
++        if (!clearsign && (!pgpout || c == EOF))
+ 	{
+           mutt_error _("Could not decrypt PGP message");
++	  mutt_sleep (1);
+           pgp_void_passphrase ();
+           rc = -1;
+           
+           goto out;
+         }
+-	ungetc (c, pgpout);
+       }
+       
+       /*
>Release-Note:
>Audit-Trail:
>Unformatted: