Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Jun 2002 08:42:11 +0200 (CEST)
From:      Udo Schweigert <udo.schweigert@siemens.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/39188: maintainer-update of mail/mutt-devel
Message-ID:  <200206120642.g5C6gBYn085318@alaska.cert.siemens.de>

next in thread | raw e-mail | index | archive | help

>Number:         39188
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 11 23:50:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 4.6-RELEASE i386
>Organization:
>Environment:
System: FreeBSD alaska.cert.siemens.de 4.6-RELEASE FreeBSD 4.6-RELEASE #88: Fri Jun 7 14:14:31 CEST 2002 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4_6/sys/alaska i386


>Description:

This updates mail/mutt-devel to the most recent development version 1.5.1.

Note: the diff is against mutt-devel-1.4 which waits in PR ports/38694 
for a cvs commit (for exactly 2 weeks), thus this can only be used
after ports/38694 has been applied. Note also that 1.4 should be tagged
with the tag mutt_1_4_0_beta, because that will be used later by the maintainer
of mail/mutt to update mail/mutt to 1.4.

>How-To-Repeat:
>Fix:

New files (cvs add):
	files/patch-Makefile.am
	files/patch-smime-sender
	files/smime.h

Files to be removed (cvs rm):
	files/extra-maildir-patch-Makefile.am
	files/extra-maildir-patch-globals.h
	files/extra-maildir-patch-init.h
	files/extra-maildir-patch-mh.c
	files/extra-maildir-patch-mutt.h
	files/maildir_clean_dir.c
	files/maildir_clean_dir.h

diff -ru --exclude=CVS mutt-devel.old/Makefile mutt-devel/Makefile
--- mutt-devel.old/Makefile	Thu May 30 09:58:06 2002
+++ mutt-devel/Makefile	Thu May 30 09:44:35 2002
@@ -49,22 +49,16 @@
 #
 # If you want to enable the pgp_outlook_compat function for use with pgp define:
 #  WITH_MUTT_PGP_OUTLOOK_PATCH
-#
-# If you want to enable some functions whoch improve maildir handling define:
-#  WITH_MUTT_MAILDIR_PATCH
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.4
+PORTVERSION=	1.5.1
 #PORTREVISION?=	0
 CATEGORIES+=	mail
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
 .endif
-MASTER_SITES=	ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \
-		ftp://ftp.parodius.com/pub/mutt/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \
+MASTER_SITES=	ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \
 		ftp://ftp.parodius.com/pub/mutt/devel/ \
-		ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.mutt.org/pub/mutt/devel/
 DISTNAME=	mutt-${PORTVERSION}i
 
@@ -101,18 +95,6 @@
 		s/^(AUTOMAKE = ).+/\1${AUTOMAKE}/; s/^(AUTOHEADER = ).+/\1${AUTOHEADER}/" \
 		${BUILD_WRKSRC}/Makefile
 
-.if defined(WITH_MUTT_MAILDIR_PATCH)
-.for file in Makefile.am globals.h init.h mh.c mutt.h
-EXTRA_PATCHES+=	${WRKSRC}/patch-${file}
-pre-patch::
-	${CP} ${PATCHDIR}/extra-maildir-patch-${file} ${WRKSRC}/patch-${file}
-.endfor
-.for file in maildir_clean_dir.h maildir_clean_dir.c
-pre-patch::
-	${CP} ${PATCHDIR}/${file} ${WRKSRC}/${file}
-.endfor
-.endif
-	
 .if !defined(PATCH_VERSION)
 PATCH_VERSION=	${PORTVERSION}
 .endif
@@ -208,8 +190,9 @@
 MAN5=		muttrc.5 mbox.5
 
 post-patch::
-	 @${PERL} -pi.fbsd -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
+	@${PERL} -pi.fbsd -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 		${WRKSRC}/contrib/gpg.rc
+	@${CP} ${PATCHDIR}/smime.h ${WRKSRC}
 
 pre-configure::
 	@(cd ${WRKSRC}; ${ACLOCAL} -I m4)
@@ -309,7 +292,7 @@
 PLIST_SUB+=	SUB_ADD_E="@comment "
 PLIST_SUB+=	SUB_ADD_F="@comment "
 PLIST_SUB+=	SUB_ADD_G="@comment "
-PLIST_SUB+=	SUB_PGP_A=""
+PLIST_SUB+=	SUB_PGP_A="@comment "
 .else # patches
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -345,20 +328,10 @@
 post-patch::
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
 .endif
-.if defined(WITH_MUTT_PGP_OUTLOOK_PATCH) && !defined(WITH_MUTT_MAILDIR_PATCH)
+.if defined(WITH_MUTT_PGP_OUTLOOK_PATCH)
 PLIST_SUB+=	SUB_PGP=""
 .else
 PLIST_SUB+=	SUB_PGP="@comment "
-.endif
-.if defined(WITH_MUTT_MAILDIR_PATCH) && !defined(WITH_MUTT_PGP_OUTLOOK_PATCH)
-PLIST_SUB+=	SUB_MAILDIR=""
-.else
-PLIST_SUB+=	SUB_MAILDIR="@comment "
-.endif
-.if defined(WITH_MUTT_PGP_OUTLOOK_PATCH) && defined(WITH_MUTT_MAILDIR_PATCH)
-PLIST_SUB+=	SUB_MAILDIRPGP=""
-.else
-PLIST_SUB+=	SUB_MAILDIRPGP="@comment "
 .endif
 .if ${SGML_USED} == yes
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
diff -ru --exclude=CVS mutt-devel.old/distinfo mutt-devel/distinfo
--- mutt-devel.old/distinfo	Thu May 30 09:58:06 2002
+++ mutt-devel/distinfo	Thu May 16 16:32:31 2002
@@ -1,5 +1,5 @@
-MD5 (mutt/mutt-1.4i.tar.gz) = a67bcdf1a1cd53d61ccd3ebf3993ba59
-MD5 (mutt/patch-1.4.rr.compressed.gz) = c21b9367cf1ad2853b468bb4e17ec2df
-MD5 (mutt/patch-1.4.vvv.nntp.gz) = 6533160a0f691c93706411c5087c9a72
-MD5 (mutt/patch-1.4.vvv.initials.gz) = 43b4c482d9f8164a016d6d869328ad66
-MD5 (mutt/patch-1.4.vvv.quote.gz) = 0b02942702144c28c26133a7ddf0c84b
+MD5 (mutt/mutt-1.5.1i.tar.gz) = 5f281dcab555e9c206a5cd16a530e0da
+MD5 (mutt/patch-1.5.1.rr.compressed.gz) = 583f434aa7e440806d12f2143ecff3d8
+MD5 (mutt/patch-1.5.1.vvv.nntp.gz) = 5bce8bf3d320808cfa7b822ebcc5086d
+MD5 (mutt/patch-1.5.1.vvv.initials.gz) = 39cd4f8beff1664a3078d4a1a08c7b5e
+MD5 (mutt/patch-1.5.1.vvv.quote.gz) = 83aa6b5a9c1117d7f15df0c59037c318
diff -ru --exclude=CVS mutt-devel.old/files/extra-patch-pgp-outlook mutt-devel/files/extra-patch-pgp-outlook
--- mutt-devel.old/files/extra-patch-pgp-outlook	Thu May 30 09:58:06 2002
+++ mutt-devel/files/extra-patch-pgp-outlook	Sun May  5 14:25:42 2002
@@ -20,17 +20,16 @@
    OPT_PGPTRADITIONAL, /* create old-style PGP messages */
 +  OPT_PGPOUTLOOK,     /* Create even older broken outlook compatible messages */
  #endif
---- pgp.c.orig	Mon Feb 12 08:55:21 2001
-+++ pgp.c	Sat Feb 24 18:11:40 2001
-@@ -1501,12 +1501,20 @@
+--- pgp.c.orig	Thu Apr  4 08:49:50 2002
++++ pgp.c	Sun May  5 13:57:57 2002
+@@ -1399,11 +1399,20 @@
    
    b->encoding = ENC7BIT;
  
--  b->type = TYPEAPPLICATION;
--  b->subtype = safe_strdup ("pgp");
--
--  mutt_set_parameter ("format", "text", &b->parameter);
--  mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign",
+-  b->type = TYPETEXT;
+-  b->subtype = safe_strdup ("plain");
+-  
+-  mutt_set_parameter ("x-action", flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed",
 -		      &b->parameter);
 +  /* Outlook seems to work by scanning the message itself for PGP information, */
 +  /* not the headers.  If the headers are anything but text/plain, it will */
@@ -43,34 +42,36 @@
 +    b->subtype = safe_strdup ("pgp");
 +
 +    mutt_set_parameter ("format", "text", &b->parameter);
-+    mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign",
++    mutt_set_parameter ("x-action", flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed",
 +		        &b->parameter);
 +  }
- 
-   b->filename = safe_strdup (pgpoutfile);
+   mutt_set_parameter ("charset", send_charset, &b->parameter);
    
-@@ -1559,8 +1567,13 @@
-   {
-     if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create an application/pgp message?"))) == -1)
-       return -1;
--    else if (i == M_YES)
-+    else if (i == M_YES) {
-       traditional = 1;
-+    if ((i = query_quadoption (OPT_PGPOUTLOOK, _("Create an Outlook compatible message?"))) == -1)
-+      return -1;
-+    else if (i == M_YES)
-+      flags |= PGPOUTLOOK;
-+    }
-   }
- 
-   mutt_message _("Invoking PGP...");
---- pgplib.h.orig	Mon Feb 12 08:56:00 2001
-+++ pgplib.h	Sat Feb 24 18:12:25 2001
-@@ -23,6 +23,7 @@
- #define PGPSIGN     (1 << 1)
- #define PGPKEY      (1 << 2)
- #define PGPGOODSIGN (1 << 3)
-+#define PGPOUTLOOK   (1 << 4)
+   b->filename = safe_strdup (pgpoutfile);
+--- pgplib.h.orig	Sun Feb  3 10:34:23 2002
++++ pgplib.h	Sun May  5 14:01:30 2002
+@@ -25,6 +25,7 @@
+ #define PGPSIGN     (APPLICATION_PGP | SIGN)
+ #define PGPGOODSIGN (APPLICATION_PGP | GOODSIGN)
+ #define PGPKEY      (APPLICATION_PGP | (1 << 3))
++#define PGPOUTLOOK  (APPLICATION_PGP | (1 << 4))
  
  #define KEYFLAG_CANSIGN 		(1 <<  0)
  #define KEYFLAG_CANENCRYPT 		(1 <<  1)
+--- crypt.c.orig	Tue Mar 26 23:23:11 2002
++++ crypt.c	Sun May  5 13:53:52 2002
+@@ -184,8 +184,13 @@
+     {
+       if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create an inline PGP message?"))) == -1)
+ 	return -1;
+-      else if (i == M_YES)
++      else if (i == M_YES) {
+ 	traditional = 1;
++	if ((i = query_quadoption (OPT_PGPOUTLOOK, _("Create an Outlook compatible message?"))) == -1)
++	  return -1;
++	else if (i == M_YES)
++	  flags |= PGPOUTLOOK;
++      }
+     }
+     if (traditional)
+     {
diff -ru --exclude=CVS mutt-devel.old/files/patch-05 mutt-devel/files/patch-05
--- mutt-devel.old/files/patch-05	Thu May 30 09:58:06 2002
+++ mutt-devel/files/patch-05	Thu May  2 09:53:28 2002
@@ -63,17 +63,35 @@
    {
    case -1: /* abort - don't resort */
      return -1;
---- compose.c.orig	Mon Feb 12 18:02:38 2001
-+++ compose.c	Fri Mar 30 17:04:09 2001
-@@ -130,7 +130,7 @@
+--- compose.c.orig	Tue Mar 26 23:03:26 2002
++++ compose.c	Thu May  2 09:21:11 2002
+@@ -173,7 +173,7 @@
    char input_signas[SHORT_STRING];
  
-   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
+   switch (mutt_multi_choice (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
 -			     _("esabf")))
 +			     N_("esabf")))
    {
    case 1: /* (e)ncrypt */
-     bits |= PGPENCRYPT;
+     msg->security |= PGPENCRYPT;
+@@ -229,7 +229,7 @@
+     char *p;
+ 
+   switch (mutt_multi_choice (_("S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "),
+-			     _("ewsabf")))
++			     N_("ewsabf")))
+   {
+   case 1: /* (e)ncrypt */
+     msg->security |= SMIMEENCRYPT;
+@@ -239,7 +239,7 @@
+     msg->security |= SMIMEENCRYPT;
+     switch (mutt_multi_choice (_("1: DES, 2: Tripple-DES, 3: RC2-40,"
+ 				 " 4: RC2-64, 5: RC2-128, or (f)orget it? "),
+-			       _("12345f"))) {
++			       N_("12345f"))) {
+     case 1:
+ 	mutt_str_replace (&SmimeCryptAlg, "des");
+ 	break;
 --- muttlib.c.orig	Sun Apr  9 14:39:02 2000
 +++ muttlib.c	Fri May 12 11:26:58 2000
 @@ -671,7 +671,7 @@
diff -ru --exclude=CVS mutt-devel.old/files/patch-Makefile.am mutt-devel/files/patch-Makefile.am
--- mutt-devel.old/files/patch-Makefile.am	Thu Jan  1 01:00:00 1970
+++ mutt-devel/files/patch-Makefile.am	Sun May  5 14:25:42 2002
@@ -0,0 +1,24 @@
+--- Makefile.am.orig	Thu Feb  7 10:14:11 2002
++++ Makefile.am	Sun May  5 11:34:05 2002
+@@ -3,6 +3,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc
++EXTRA_SCRIPTS = 
+ 
+ if BUILD_IMAP
+ IMAP_SUBDIR = imap
+@@ -11,11 +12,11 @@
+ 
+ SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
+ 
+-bin_SCRIPTS = muttbug flea
++bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ 
+ BUILT_SOURCES = keymap_defs.h patchlist.c
+ 
+-bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
++bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
+ mutt_SOURCES = $(BUILT_SOURCES) \
+ 	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
+ 	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
diff -ru --exclude=CVS mutt-devel.old/files/patch-smime-sender mutt-devel/files/patch-smime-sender
--- mutt-devel.old/files/patch-smime-sender	Thu Jan  1 01:00:00 1970
+++ mutt-devel/files/patch-smime-sender	Fri May 31 17:10:22 2002
@@ -0,0 +1,67 @@
+--- commands.c.orig2	Fri May 31 10:14:06 2002
++++ commands.c	Fri May 31 10:32:00 2002
+@@ -197,7 +197,7 @@
+     {
+       if (cur->security & GOODSIGN)
+       {
+-	if (!smime_verify_sender(cur))
++	if (option(OPTSMIMENOSENDER) || !smime_verify_sender(cur))
+ 	  mutt_message ( _("S/MIME signature successfully verified."));
+ 	else
+ 	  mutt_error ( _("S/MIME certificate owner does not match sender."));
+--- init.h.orig2	Fri May 31 10:14:05 2002
++++ init.h	Fri May 31 10:54:55 2002
+@@ -1435,6 +1435,15 @@
+   ** This flag controls wether you want to be asked to enter a label for a certificate
+   ** about to be added to the database or not. It is set by default.
+   */
++  { "smime_dont_check_sender",	DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 },
++  /*
++  ** .pp
++  ** This flag controls wether you want the skip the check for the sender's
++  ** email address against the email address stored in the certificate. 
++  ** This can be useful if most of your email senders use SMIMEv3 which no
++  ** longer needs email-addresses as part of the certificates.
++  ** It is not set by default.
++  */
+   { "smime_decrypt_use_default_key",	DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },
+   /*
+   ** .pp
+--- mutt.h.orig2	Fri May 31 10:14:06 2002
++++ mutt.h	Fri May 31 10:24:03 2002
+@@ -453,6 +453,7 @@
+ #ifdef HAVE_SMIME
+   OPTSMIMEISDEFAULT,
+   OPTASKCERTLABEL,
++  OPTSMIMENOSENDER,
+   OPTSDEFAULTDECRYPTKEY,
+ #endif
+ #ifdef HAVE_PGP
+--- contrib/smime.rc.orig	Sat Mar  2 12:59:50 2002
++++ contrib/smime.rc	Fri May 31 17:09:04 2002
+@@ -6,9 +6,12 @@
+ # will be the default method unless the following option is set
+ set smime_is_default
+ 
+-# Uncoment this if you don't want to set labels for certificates you add.
++# Uncomment this if you don't want to set labels for certificates you add.
+ # unset smime_ask_cert_label
+ 
++# Uncomment this if you don't want to check for sender's email address
++# set smime_dont_check_sender = yes
++
+ # Passphrase expiration
+ set smime_timeout=300
+ 
+@@ -23,9 +26,9 @@
+ 
+ # The (default) keyfile for signing/decrypting.  Uncomment the following
+ # line and replace the keyid with your own.
+-set smime_default_key="12345678.0"
++# set smime_default_key="12345678.0"
+ 
+-# Uncommen to make mutt ask what key to use when trying to decrypt a message.
++# Uncomment to make mutt ask what key to use when trying to decrypt a message.
+ # It will use the default key above (if that was set) else.
+ # unset smime_decrypt_use_default_key
+ 
diff -ruN ../1.3/mutt-devel/files/smime.h mutt-devel/files/smime.h
--- ../1.3/mutt-devel/files/smime.h	Thu Jan  1 01:00:00 1970
+++ mutt-devel/files/smime.h	Thu May  2 09:53:28 2002
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2001,2002 Oliver Ehli <elmy@acm.org>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ */
+
+
+#ifdef HAVE_SMIME
+
+#include "crypt.h"
+
+WHERE char *SmimeDefaultKey;
+WHERE char *SmimeCryptAlg;
+WHERE short SmimeTimeout;
+WHERE char *SmimeCertificates;
+WHERE char *SmimeKeys;
+WHERE char *SmimeCryptAlg;
+WHERE char *SmimeCALocation;
+
+/* The command formats */
+
+WHERE char *SmimeVerifyCommand;
+WHERE char *SmimeVerifyOpaqueCommand;
+WHERE char *SmimeDecryptCommand;
+
+WHERE char *SmimeSignCommand;
+WHERE char *SmimeSignOpaqueCommand;
+WHERE char *SmimeEncryptCommand;
+
+WHERE char *SmimeGetSignerCertCommand;
+WHERE char *SmimePk7outCommand;
+WHERE char *SmimeGetCertCommand;
+WHERE char *SmimeImportCertCommand;
+WHERE char *SmimeGetCertEmailCommand;
+
+
+#define APPLICATION_SMIME  (1 << 6)
+
+#define SIGNOPAQUE    (1 << 4)
+
+#define SMIMEENCRYPT  (APPLICATION_SMIME | ENCRYPT)
+#define SMIMESIGN     (APPLICATION_SMIME | SIGN)
+#define SMIMEGOODSIGN (APPLICATION_SMIME | GOODSIGN)
+#define SMIMEBADSIGN  (APPLICATION_SMIME | BADSIGN)
+#define SMIMEOPAQUE   (APPLICATION_SMIME | SIGNOPAQUE)
+
+
+
+#define smime_valid_passphrase() crypt_valid_passphrase(APPLICATION_SMIME)
+
+void smime_void_passphrase (void);
+
+int mutt_is_application_smime (BODY *);
+
+
+int   smime_decrypt_mime (FILE *, FILE **, BODY *, BODY **);
+
+void  smime_application_smime_handler (BODY *, STATE *);
+
+
+BODY* smime_sign_message (BODY *);
+
+BODY* smime_build_smime_entity (BODY *, char *);
+
+int   smime_verify_one(BODY *, STATE *, const char *);
+
+
+int   smime_verify_sender(HEADER *);
+
+
+char* smime_get_field_from_db (char *, char *, short, short);
+
+void  smime_getkeys (ENVELOPE *);
+
+char* smime_ask_for_key (char *, char *, short);
+
+
+void  smime_invoke_import (char *, char *);
+
+#endif
diff -ru --exclude=CVS mutt-devel.old/files/smime.h mutt-devel/files/smime.h
--- mutt-devel.old/files/smime.h	Thu Jan  1 01:00:00 1970
+++ mutt-devel/files/smime.h	Thu May  2 09:53:28 2002
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2001,2002 Oliver Ehli <elmy@acm.org>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ */
+
+
+#ifdef HAVE_SMIME
+
+#include "crypt.h"
+
+WHERE char *SmimeDefaultKey;
+WHERE char *SmimeCryptAlg;
+WHERE short SmimeTimeout;
+WHERE char *SmimeCertificates;
+WHERE char *SmimeKeys;
+WHERE char *SmimeCryptAlg;
+WHERE char *SmimeCALocation;
+
+/* The command formats */
+
+WHERE char *SmimeVerifyCommand;
+WHERE char *SmimeVerifyOpaqueCommand;
+WHERE char *SmimeDecryptCommand;
+
+WHERE char *SmimeSignCommand;
+WHERE char *SmimeSignOpaqueCommand;
+WHERE char *SmimeEncryptCommand;
+
+WHERE char *SmimeGetSignerCertCommand;
+WHERE char *SmimePk7outCommand;
+WHERE char *SmimeGetCertCommand;
+WHERE char *SmimeImportCertCommand;
+WHERE char *SmimeGetCertEmailCommand;
+
+
+#define APPLICATION_SMIME  (1 << 6)
+
+#define SIGNOPAQUE    (1 << 4)
+
+#define SMIMEENCRYPT  (APPLICATION_SMIME | ENCRYPT)
+#define SMIMESIGN     (APPLICATION_SMIME | SIGN)
+#define SMIMEGOODSIGN (APPLICATION_SMIME | GOODSIGN)
+#define SMIMEBADSIGN  (APPLICATION_SMIME | BADSIGN)
+#define SMIMEOPAQUE   (APPLICATION_SMIME | SIGNOPAQUE)
+
+
+
+#define smime_valid_passphrase() crypt_valid_passphrase(APPLICATION_SMIME)
+
+void smime_void_passphrase (void);
+
+int mutt_is_application_smime (BODY *);
+
+
+int   smime_decrypt_mime (FILE *, FILE **, BODY *, BODY **);
+
+void  smime_application_smime_handler (BODY *, STATE *);
+
+
+BODY* smime_sign_message (BODY *);
+
+BODY* smime_build_smime_entity (BODY *, char *);
+
+int   smime_verify_one(BODY *, STATE *, const char *);
+
+
+int   smime_verify_sender(HEADER *);
+
+
+char* smime_get_field_from_db (char *, char *, short, short);
+
+void  smime_getkeys (ENVELOPE *);
+
+char* smime_ask_for_key (char *, char *, short);
+
+
+void  smime_invoke_import (char *, char *);
+
+#endif
diff -ru --exclude=CVS mutt-devel.old/pkg-plist mutt-devel/pkg-plist
--- mutt-devel.old/pkg-plist	Thu May 30 09:58:06 2002
+++ mutt-devel/pkg-plist	Fri May 31 11:16:12 2002
@@ -5,6 +5,7 @@
 bin/muttbug
 bin/pgpewrap
 bin/pgpring
+bin/smime_keys
 etc/Muttrc
 etc/mime.types
 share/locale/ca/LC_MESSAGES/mutt.mo
@@ -13,8 +14,8 @@
 share/locale/de/LC_MESSAGES/mutt.mo
 share/locale/el/LC_MESSAGES/mutt.mo
 share/locale/eo/LC_MESSAGES/mutt.mo
-share/locale/et/LC_MESSAGES/mutt.mo
 share/locale/es/LC_MESSAGES/mutt.mo
+share/locale/et/LC_MESSAGES/mutt.mo
 share/locale/fr/LC_MESSAGES/mutt.mo
 share/locale/gl/LC_MESSAGES/mutt.mo
 share/locale/hu/LC_MESSAGES/mutt.mo
@@ -34,24 +35,38 @@
 share/locale/zh_CN/LC_MESSAGES/mutt.mo
 share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%PORTDOCS%%share/doc/mutt/ABOUT-NLS
-%%PORTDOCS%%share/doc/mutt/PGP-Notes.txt
-%%PORTDOCS%%share/doc/mutt/applying-patches.txt
-%%PORTDOCS%%share/doc/mutt/devel-notes.txt
 %%PORTDOCS%%share/doc/mutt/COPYRIGHT
-%%PORTDOCS%%share/doc/mutt/GPL
-%%PORTDOCS%%share/doc/mutt/INSTALL
 %%PORTDOCS%%share/doc/mutt/ChangeLog
 %%SUB_NNTP%%share/doc/mutt/ChangeLog.nntp
-%%PORTDOCS%%share/doc/mutt/README
+%%PORTDOCS%%share/doc/mutt/GPL
+%%PORTDOCS%%share/doc/mutt/INSTALL
 %%PORTDOCS%%share/doc/mutt/NEWS
-%%PORTDOCS%%share/doc/mutt/TODO
+%%PORTDOCS%%share/doc/mutt/PGP-Notes.txt
+%%PORTDOCS%%share/doc/mutt/README
 %%PORTDOCS%%share/doc/mutt/README.SECURITY
 %%PORTDOCS%%share/doc/mutt/README.SSL
+%%PORTDOCS%%share/doc/mutt/TODO
+%%PORTDOCS%%share/doc/mutt/applying-patches.txt
+%%PORTDOCS%%share/doc/mutt/devel-notes.txt
 %%PORTDOCS%%share/doc/mutt/language.txt
 %%PORTDOCS%%share/doc/mutt/language50.txt
-%%PORTDOCS%%share/doc/mutt/manual.txt
 %%SUB_SGML%%share/doc/mutt/manual.latin1
+%%PORTDOCS%%share/doc/mutt/manual.txt
 %%PORTDOCS%%share/doc/mutt/patch-notes.txt
+%%PORTDOCS%%share/doc/mutt/smime-notes.txt
+%%PORTDOCS%%share/doc/mutt/samples/Mush.rc
+%%PORTDOCS%%share/doc/mutt/samples/Pine.rc
+%%PORTDOCS%%share/doc/mutt/samples/Tin.rc
+%%PORTDOCS%%share/doc/mutt/samples/ca-bundle.crt
+%%PORTDOCS%%share/doc/mutt/samples/gpg.rc
+%%PORTDOCS%%share/doc/mutt/samples/pgp2.rc
+%%PORTDOCS%%share/doc/mutt/samples/pgp5.rc
+%%PORTDOCS%%share/doc/mutt/samples/pgp6.rc
+%%PORTDOCS%%share/doc/mutt/samples/sample.mailcap
+%%PORTDOCS%%share/doc/mutt/samples/sample.muttrc
+%%PORTDOCS%%share/doc/mutt/samples/sample.muttrc-tlr
+%%PORTDOCS%%share/doc/mutt/samples/smime.rc
+%%PORTDOCS%%share/doc/mutt/samples/smime_keys_test.pl
 %%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
 %%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
 %%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
@@ -70,16 +85,6 @@
 %%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
 %%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
 %%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
-%%PORTDOCS%%share/doc/mutt/samples/Mush.rc
-%%PORTDOCS%%share/doc/mutt/samples/Pine.rc
-%%PORTDOCS%%share/doc/mutt/samples/gpg.rc
-%%PORTDOCS%%share/doc/mutt/samples/pgp2.rc
-%%PORTDOCS%%share/doc/mutt/samples/pgp5.rc
-%%PORTDOCS%%share/doc/mutt/samples/pgp6.rc
-%%PORTDOCS%%share/doc/mutt/samples/Tin.rc
-%%PORTDOCS%%share/doc/mutt/samples/sample.muttrc
-%%PORTDOCS%%share/doc/mutt/samples/sample.mailcap
-%%PORTDOCS%%share/doc/mutt/samples/sample.muttrc-tlr
 %%PORTDOCS%%@dirrm share/doc/mutt/samples/iconv
 %%PORTDOCS%%@dirrm share/doc/mutt/samples
 %%SUB_HTML%%share/doc/mutt/html/manual.html
@@ -421,169 +426,153 @@
 %%SUB_HTML%%share/doc/mutt/html/manual335.html
 %%SUB_HTML%%share/doc/mutt/html/manual336.html
 %%SUB_HTML%%share/doc/mutt/html/manual337.html
-%%SUB_HTML%%%%SUB_PGP_A%%%%SUB_PGP%%share/doc/mutt/html/manual338.html
-%%SUB_HTML%%%%SUB_PGP_A%%%%SUB_MAILDIR%%share/doc/mutt/html/manual338.html
-%%SUB_HTML%%%%SUB_PGP_A%%%%SUB_MAILDIR%%share/doc/mutt/html/manual339.html
-%%SUB_HTML%%%%SUB_PGP_A%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual338.html
-%%SUB_HTML%%%%SUB_PGP_A%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual339.html
-%%SUB_HTML%%%%SUB_PGP_A%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual340.html
-%%SUB_ADD_A%%share/doc/mutt/html/manual338.html
-%%SUB_ADD_A%%share/doc/mutt/html/manual339.html
-%%SUB_ADD_A%%%%SUB_PGP%%share/doc/mutt/html/manual340.html
-%%SUB_ADD_A%%%%SUB_MAILDIR%%share/doc/mutt/html/manual340.html
-%%SUB_ADD_A%%%%SUB_MAILDIR%%share/doc/mutt/html/manual341.html
-%%SUB_ADD_A%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual340.html
-%%SUB_ADD_A%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual341.html
-%%SUB_ADD_A%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual342.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual338.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual339.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual340.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual341.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual342.html
-%%SUB_ADD_B%%%%SUB_PGP%%share/doc/mutt/html/manual343.html
-%%SUB_ADD_B%%%%SUB_MAILDIR%%share/doc/mutt/html/manual343.html
-%%SUB_ADD_B%%%%SUB_MAILDIR%%share/doc/mutt/html/manual344.html
-%%SUB_ADD_B%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual343.html
-%%SUB_ADD_B%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual344.html
-%%SUB_ADD_B%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual345.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual338.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual339.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual340.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual341.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual342.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual343.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual344.html
-%%SUB_ADD_C%%%%SUB_PGP%%share/doc/mutt/html/manual345.html
-%%SUB_ADD_C%%%%SUB_MAILDIR%%share/doc/mutt/html/manual345.html
-%%SUB_ADD_C%%%%SUB_MAILDIR%%share/doc/mutt/html/manual346.html
-%%SUB_ADD_C%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual345.html
-%%SUB_ADD_C%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual346.html
-%%SUB_ADD_C%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual347.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual338.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual339.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual340.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual341.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual342.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual343.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual344.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual345.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual346.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual347.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual348.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual349.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual350.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual351.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual352.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual353.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual354.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual355.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual356.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual357.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual358.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual359.html
-%%SUB_ADD_D%%%%SUB_PGP%%share/doc/mutt/html/manual360.html
-%%SUB_ADD_D%%%%SUB_MAILDIR%%share/doc/mutt/html/manual360.html
-%%SUB_ADD_D%%%%SUB_MAILDIR%%share/doc/mutt/html/manual361.html
-%%SUB_ADD_D%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual360.html
-%%SUB_ADD_D%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual361.html
-%%SUB_ADD_D%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual362.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual338.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual339.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual340.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual341.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual342.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual343.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual344.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual345.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual346.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual347.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual348.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual349.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual350.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual351.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual352.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual353.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual354.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual355.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual356.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual357.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual358.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual359.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual360.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual361.html
-%%SUB_ADD_E%%%%SUB_PGP%%share/doc/mutt/html/manual362.html
-%%SUB_ADD_E%%%%SUB_MAILDIR%%share/doc/mutt/html/manual362.html
-%%SUB_ADD_E%%%%SUB_MAILDIR%%share/doc/mutt/html/manual363.html
-%%SUB_ADD_E%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual362.html
-%%SUB_ADD_E%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual363.html
-%%SUB_ADD_E%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual364.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual338.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual339.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual340.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual341.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual342.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual343.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual344.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual345.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual346.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual347.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual348.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual349.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual350.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual351.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual352.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual353.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual354.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual355.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual356.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual357.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual358.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual359.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual360.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual361.html
+%%SUB_HTML%%share/doc/mutt/html/manual338.html
+%%SUB_HTML%%share/doc/mutt/html/manual339.html
+%%SUB_HTML%%share/doc/mutt/html/manual340.html
+%%SUB_HTML%%share/doc/mutt/html/manual341.html
+%%SUB_HTML%%share/doc/mutt/html/manual342.html
+%%SUB_HTML%%share/doc/mutt/html/manual343.html
+%%SUB_HTML%%share/doc/mutt/html/manual344.html
+%%SUB_HTML%%share/doc/mutt/html/manual345.html
+%%SUB_HTML%%share/doc/mutt/html/manual346.html
+%%SUB_HTML%%share/doc/mutt/html/manual347.html
+%%SUB_HTML%%share/doc/mutt/html/manual348.html
+%%SUB_HTML%%share/doc/mutt/html/manual349.html
+%%SUB_HTML%%share/doc/mutt/html/manual350.html
+%%SUB_HTML%%share/doc/mutt/html/manual351.html
+%%SUB_HTML%%share/doc/mutt/html/manual352.html
+%%SUB_HTML%%share/doc/mutt/html/manual353.html
+%%SUB_HTML%%share/doc/mutt/html/manual354.html
+%%SUB_HTML%%share/doc/mutt/html/manual355.html
+%%SUB_HTML%%share/doc/mutt/html/manual356.html
+%%SUB_HTML%%share/doc/mutt/html/manual357.html
+%%SUB_HTML%%share/doc/mutt/html/manual358.html
+%%SUB_HTML%%share/doc/mutt/html/manual359.html
+%%SUB_HTML%%share/doc/mutt/html/manual360.html
+%%SUB_HTML%%share/doc/mutt/html/manual361.html
+%%SUB_HTML%%%%SUB_PGP_A%%%%SUB_PGP%%share/doc/mutt/html/manual362.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual362.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual363.html
+%%SUB_ADD_A%%%%SUB_PGP%%share/doc/mutt/html/manual364.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual362.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual363.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual364.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual365.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual366.html
+%%SUB_ADD_B%%%%SUB_PGP%%share/doc/mutt/html/manual367.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual362.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual363.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual364.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual365.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual366.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual367.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual368.html
+%%SUB_ADD_C%%%%SUB_PGP%%share/doc/mutt/html/manual369.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual362.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual363.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual364.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual365.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual366.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual367.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual368.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual369.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual370.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual371.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual372.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual373.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual374.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual375.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual376.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual377.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual378.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual379.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual380.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual381.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual382.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual383.html
+%%SUB_ADD_D%%%%SUB_PGP%%share/doc/mutt/html/manual384.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual362.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual363.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual364.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual365.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual366.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual367.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual368.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual369.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual370.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual371.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual372.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual373.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual374.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual375.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual376.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual377.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual378.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual379.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual380.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual381.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual382.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual383.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual384.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual385.html
+%%SUB_ADD_E%%%%SUB_PGP%%share/doc/mutt/html/manual386.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual362.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual363.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual364.html
-%%SUB_ADD_F%%%%SUB_PGP%%share/doc/mutt/html/manual365.html
-%%SUB_ADD_F%%%%SUB_MAILDIR%%share/doc/mutt/html/manual365.html
-%%SUB_ADD_F%%%%SUB_MAILDIR%%share/doc/mutt/html/manual366.html
-%%SUB_ADD_F%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual365.html
-%%SUB_ADD_F%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual366.html
-%%SUB_ADD_F%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual367.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual338.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual339.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual340.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual341.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual342.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual343.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual344.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual345.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual346.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual347.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual348.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual349.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual350.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual351.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual352.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual353.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual354.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual355.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual356.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual357.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual358.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual359.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual360.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual361.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual365.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual366.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual367.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual368.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual369.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual370.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual371.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual372.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual373.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual374.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual375.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual376.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual377.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual378.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual379.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual380.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual381.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual382.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual383.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual384.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual385.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual386.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual387.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual388.html
+%%SUB_ADD_F%%%%SUB_PGP%%share/doc/mutt/html/manual389.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual362.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual363.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual364.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual365.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual366.html
-%%SUB_ADD_G%%%%SUB_PGP%%share/doc/mutt/html/manual367.html
-%%SUB_ADD_G%%%%SUB_MAILDIR%%share/doc/mutt/html/manual367.html
-%%SUB_ADD_G%%%%SUB_MAILDIR%%share/doc/mutt/html/manual368.html
-%%SUB_ADD_G%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual367.html
-%%SUB_ADD_G%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual368.html
-%%SUB_ADD_G%%%%SUB_MAILDIRPGP%%share/doc/mutt/html/manual369.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual367.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual368.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual369.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual370.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual371.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual372.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual373.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual374.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual375.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual376.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual377.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual378.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual379.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual380.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual381.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual382.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual383.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual384.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual385.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual386.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual387.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual388.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual389.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual390.html
+%%SUB_ADD_G%%%%SUB_PGP%%share/doc/mutt/html/manual391.html
 %%SUB_HTML%%@dirrm share/doc/mutt/html
 %%PORTDOCS%%@dirrm share/doc/mutt

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




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