Attachment 46348 Details for Bug 71181 – file.diff

[patch] file.diff

file.diff (text/plain), 1.81 KB, created by Udo.Schweigert on 2004-08-31 07:00:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Udo.Schweigert

Created: 2004-08-31 07:00:43 UTC

Size: 1.81 KB

patch

obsolete

>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);

Actions: View | Diff

Attachments on bug 71181: 46348