Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 31 Aug 2004 07:59:02 +0200 (CEST)
From:      Udo Schweigert <udo.schweigert@siemens.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/71181: maintainer-update of mail/mutt-devel
Message-ID:  <200408310559.i7V5x2U4057362@alaska.cert.siemens.com>
Resent-Message-ID: <200408310600.i7V60hck010378@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 

>Number:         71181
>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 31 06:00:43 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:

>Description:

Maintainer update of mail/mutt-devel:

	- Add a patch to correctly handle attachments in S/MIME encrypted and 
	  signed messages (especially those generated by Outlook).

	- Bump PORTREVISION.

Committer: cvs add files/patch-smime-recvattach

>How-To-Repeat:
>Fix:

diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile	Mon Aug 30 06:06:29 2004
+++ ./Makefile	Tue Aug 31 07:56:39 2004
@@ -81,7 +81,7 @@
 
 PORTNAME=	mutt-devel
 PORTVERSION=	1.5.6
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
diff -ru  /usr/ports/mail/mutt-devel/files/patch-smime-recvattach ./files/patch-smime-recvattach
--- /usr/ports/mail/mutt-devel/files/patch-smime-recvattach	Thu Jan  1 01:00:00 1970
+++ ./files/patch-smime-recvattach	Tue Aug 31 07:53:47 2004
@@ -0,0 +1,39 @@
+diff -u -r3.13 recvattach.c
+--- recvattach.c	12 Apr 2004 20:33:33 -0000	3.13
++++ recvattach.c	30 Aug 2004 20:26:30 -0000
+@@ -913,18 +913,33 @@
+       mx_close_message (&msg);
+       return;
+     }
+-    if ((WithCrypto & APPLICATION_SMIME) && hdr->security & APPLICATION_SMIME)
++    if ((WithCrypto & APPLICATION_SMIME) && (hdr->security & APPLICATION_SMIME))
+     {
+       if (hdr->env)
+ 	  crypt_smime_getkeys (hdr->env);
+ 
+       if (mutt_is_application_smime(hdr->content))
++      {
+ 	secured = ! crypt_smime_decrypt_mime (msg->fp, &fp,
+                                               hdr->content, &cur);
++	
++	/* S/MIME nesting */
++	if ((mutt_is_application_smime (cur) & SMIMEOPAQUE))
++	{
++	  BODY *_cur = cur;
++	  FILE *_fp = fp;
++	  
++	  fp = NULL; cur = NULL;
++	  secured = !crypt_smime_decrypt_mime (_fp, &fp, _cur, &cur);
++	  
++	  mutt_free_body (&_cur);
++	  safe_fclose (&_fp);
++	}
++      }
+       else
+ 	need_secured = 0;
+     }
+-    if ((WithCrypto & APPLICATION_PGP) && hdr->security & APPLICATION_PGP)
++    if ((WithCrypto & APPLICATION_PGP) && (hdr->security & APPLICATION_PGP))
+     {
+       if (mutt_is_multipart_encrypted(hdr->content))
+ 	secured = !crypt_pgp_decrypt_mime (msg->fp, &fp, hdr->content, &cur);
>Release-Note:
>Audit-Trail:
>Unformatted:

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408310559.i7V5x2U4057362>