Attachment #22613 for bug #39188

View | Details | Raw Unified | Return to bug 39188
Collapse All | Expand All




#
# 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.5.1
#PORTREVISION?=	0
CATEGORIES+=	mail
.if defined(WITH_MUTT_NNTP)
CATEGORIES+=	news
.endif
MASTER_SITES=	ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \
		ftp://ftp.parodius.com/pub/mutt/ \
		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


		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

MAN5=		muttrc.5 mbox.5

post-patch::
	@${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)

PLIST_SUB+=	SUB_ADD_E="@comment "
PLIST_SUB+=	SUB_ADD_F="@comment "
PLIST_SUB+=	SUB_ADD_G="@comment "
PLIST_SUB+=	SUB_PGP_A="@comment "
.else # patches
PLIST_SUB+=	SUB_ADD_A="@comment "
PLIST_SUB+=	SUB_ADD_B="@comment "

post-patch::
	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
.endif
.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

Lines 1-5 Link Here

(-)mutt-devel/distinfo (-5 / +5 lines)
1	MD5 (mutt/mutt-1.4i.tar.gz) = a67bcdf1a1cd53d61ccd3ebf3993ba59	1	MD5 (mutt/mutt-1.5.1i.tar.gz) = 5f281dcab555e9c206a5cd16a530e0da
2	MD5 (mutt/patch-1.4.rr.compressed.gz) = c21b9367cf1ad2853b468bb4e17ec2df	2	MD5 (mutt/patch-1.5.1.rr.compressed.gz) = 583f434aa7e440806d12f2143ecff3d8
3	MD5 (mutt/patch-1.4.vvv.nntp.gz) = 6533160a0f691c93706411c5087c9a72	3	MD5 (mutt/patch-1.5.1.vvv.nntp.gz) = 5bce8bf3d320808cfa7b822ebcc5086d
4	MD5 (mutt/patch-1.4.vvv.initials.gz) = 43b4c482d9f8164a016d6d869328ad66	4	MD5 (mutt/patch-1.5.1.vvv.initials.gz) = 39cd4f8beff1664a3078d4a1a08c7b5e
5	MD5 (mutt/patch-1.4.vvv.quote.gz) = 0b02942702144c28c26133a7ddf0c84b	5	MD5 (mutt/patch-1.5.1.vvv.quote.gz) = 83aa6b5a9c1117d7f15df0c59037c318




   OPT_PGPTRADITIONAL, /* create old-style PGP messages */
+  OPT_PGPOUTLOOK,     /* Create even older broken outlook compatible messages */
 #endif
--- 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 = TYPETEXT;
-  b->subtype = safe_strdup ("plain");
-  
-  mutt_set_parameter ("x-action", flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed",
-  mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign",
-		      &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 */

+    b->subtype = safe_strdup ("pgp");
+
+    mutt_set_parameter ("format", "text", &b->parameter);
+    mutt_set_parameter ("x-action", flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed",
+		        &b->parameter);
+  }
   mutt_set_parameter ("charset", send_charset, &b->parameter);
   b->filename = safe_strdup (pgpoutfile);
   
   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))
+      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)
 
 #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)
     {




   {
   case -1: /* abort - don't resort */
     return -1;
--- 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 (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
-			     _("esabf")))
+			     N_("esabf")))
   {
   case 1: /* (e)ncrypt */
     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 @@




--- 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 \




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




/*
 * 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




/*
 * 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




bin/muttbug
bin/pgpewrap
bin/pgpring
bin/smime_keys
etc/Muttrc
etc/mime.types
share/locale/ca/LC_MESSAGES/mutt.mo

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

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/GPL
%%PORTDOCS%%share/doc/mutt/INSTALL
%%PORTDOCS%%share/doc/mutt/NEWS
%%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

%%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

%%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%%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_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_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%%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/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_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%%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

Return to bug 39188

Lines 49-70 Link Here

(-)mutt-devel/Makefile (-33 / +6 lines)
49	#	49	#
50	# If you want to enable the pgp_outlook_compat function for use with pgp define:	50	# If you want to enable the pgp_outlook_compat function for use with pgp define:
51	# WITH_MUTT_PGP_OUTLOOK_PATCH	51	# WITH_MUTT_PGP_OUTLOOK_PATCH
52	#
53	# If you want to enable some functions whoch improve maildir handling define:
54	# WITH_MUTT_MAILDIR_PATCH
55		52
56	PORTNAME= mutt-devel	53	PORTNAME= mutt-devel
57	PORTVERSION= 1.4	54	PORTVERSION= 1.5.1
58	#PORTREVISION?= 0	55	#PORTREVISION?= 0
59	CATEGORIES+= mail	56	CATEGORIES+= mail
60	.if defined(WITH_MUTT_NNTP)	57	.if defined(WITH_MUTT_NNTP)
61	CATEGORIES+= news	58	CATEGORIES+= news
62	.endif	59	.endif
63	MASTER_SITES= ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \	60	MASTER_SITES= ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \
64	ftp://ftp.parodius.com/pub/mutt/ \
65	ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \
66	ftp://ftp.parodius.com/pub/mutt/devel/ \	61	ftp://ftp.parodius.com/pub/mutt/devel/ \
67	ftp://ftp.mutt.org/pub/mutt/ \
68	ftp://ftp.mutt.org/pub/mutt/devel/	62	ftp://ftp.mutt.org/pub/mutt/devel/
69	DISTNAME= mutt-${PORTVERSION}i	63	DISTNAME= mutt-${PORTVERSION}i
70		64
Lines 101-118 Link Here
101	s/^(AUTOMAKE = ).+/\1${AUTOMAKE}/; s/^(AUTOHEADER = ).+/\1${AUTOHEADER}/" \	95	s/^(AUTOMAKE = ).+/\1${AUTOMAKE}/; s/^(AUTOHEADER = ).+/\1${AUTOHEADER}/" \
102	${BUILD_WRKSRC}/Makefile	96	${BUILD_WRKSRC}/Makefile
103		97
104	.if defined(WITH_MUTT_MAILDIR_PATCH)
105	.for file in Makefile.am globals.h init.h mh.c mutt.h
106	EXTRA_PATCHES+= ${WRKSRC}/patch-${file}
107	pre-patch::
108	${CP} ${PATCHDIR}/extra-maildir-patch-${file} ${WRKSRC}/patch-${file}
109	.endfor
110	.for file in maildir_clean_dir.h maildir_clean_dir.c
111	pre-patch::
112	${CP} ${PATCHDIR}/${file} ${WRKSRC}/${file}
113	.endfor
114	.endif
115
116	.if !defined(PATCH_VERSION)	98	.if !defined(PATCH_VERSION)
117	PATCH_VERSION= ${PORTVERSION}	99	PATCH_VERSION= ${PORTVERSION}
118	.endif	100	.endif
Lines 208-215 Link Here
208	MAN5= muttrc.5 mbox.5	190	MAN5= muttrc.5 mbox.5
209		191
210	post-patch::	192	post-patch::
211	@${PERL} -pi.fbsd -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \	193	@${PERL} -pi.fbsd -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
212	${WRKSRC}/contrib/gpg.rc	194	${WRKSRC}/contrib/gpg.rc
		195	@${CP} ${PATCHDIR}/smime.h ${WRKSRC}
213		196
214	pre-configure::	197	pre-configure::
215	@(cd ${WRKSRC}; ${ACLOCAL} -I m4)	198	@(cd ${WRKSRC}; ${ACLOCAL} -I m4)
Lines 309-315 Link Here
309	PLIST_SUB+= SUB_ADD_E="@comment "	292	PLIST_SUB+= SUB_ADD_E="@comment "
310	PLIST_SUB+= SUB_ADD_F="@comment "	293	PLIST_SUB+= SUB_ADD_F="@comment "
311	PLIST_SUB+= SUB_ADD_G="@comment "	294	PLIST_SUB+= SUB_ADD_G="@comment "
312	PLIST_SUB+= SUB_PGP_A=""	295	PLIST_SUB+= SUB_PGP_A="@comment "
313	.else # patches	296	.else # patches
314	PLIST_SUB+= SUB_ADD_A="@comment "	297	PLIST_SUB+= SUB_ADD_A="@comment "
315	PLIST_SUB+= SUB_ADD_B="@comment "	298	PLIST_SUB+= SUB_ADD_B="@comment "
Lines 345-364 Link Here
345	post-patch::	328	post-patch::
346	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib	329	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
347	.endif	330	.endif
348	.if defined(WITH_MUTT_PGP_OUTLOOK_PATCH) && !defined(WITH_MUTT_MAILDIR_PATCH)	331	.if defined(WITH_MUTT_PGP_OUTLOOK_PATCH)
349	PLIST_SUB+= SUB_PGP=""	332	PLIST_SUB+= SUB_PGP=""
350	.else	333	.else
351	PLIST_SUB+= SUB_PGP="@comment "	334	PLIST_SUB+= SUB_PGP="@comment "
352	.endif
353	.if defined(WITH_MUTT_MAILDIR_PATCH) && !defined(WITH_MUTT_PGP_OUTLOOK_PATCH)
354	PLIST_SUB+= SUB_MAILDIR=""
355	.else
356	PLIST_SUB+= SUB_MAILDIR="@comment "
357	.endif
358	.if defined(WITH_MUTT_PGP_OUTLOOK_PATCH) && defined(WITH_MUTT_MAILDIR_PATCH)
359	PLIST_SUB+= SUB_MAILDIRPGP=""
360	.else
361	PLIST_SUB+= SUB_MAILDIRPGP="@comment "
362	.endif	335	.endif
363	.if ${SGML_USED} == yes	336	.if ${SGML_USED} == yes
364	BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat	337	BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat

Lines 20-36 Link Here

(-)mutt-devel/files/extra-patch-pgp-outlook (-33 / +34 lines)
20	OPT_PGPTRADITIONAL, /* create old-style PGP messages */	20	OPT_PGPTRADITIONAL, /* create old-style PGP messages */
21	+ OPT_PGPOUTLOOK, /* Create even older broken outlook compatible messages */	21	+ OPT_PGPOUTLOOK, /* Create even older broken outlook compatible messages */
22	#endif	22	#endif
23	--- pgp.c.orig Mon Feb 12 08:55:21 2001	23	--- pgp.c.orig Thu Apr 4 08:49:50 2002
24	+++ pgp.c Sat Feb 24 18:11:40 2001	24	+++ pgp.c Sun May 5 13:57:57 2002
25	@@ -1501,12 +1501,20 @@	25	@@ -1399,11 +1399,20 @@
26		26
27	b->encoding = ENC7BIT;	27	b->encoding = ENC7BIT;
28		28
29	- b->type = TYPEAPPLICATION;	29	- b->type = TYPETEXT;
30	- b->subtype = safe_strdup ("pgp");	30	- b->subtype = safe_strdup ("plain");
31	-	31	-
32	- mutt_set_parameter ("format", "text", &b->parameter);	32	- mutt_set_parameter ("x-action", flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed",
33	- mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign",
34	- &b->parameter);	33	- &b->parameter);
35	+ /* Outlook seems to work by scanning the message itself for PGP information, */	34	+ /* Outlook seems to work by scanning the message itself for PGP information, */
36	+ /* not the headers. If the headers are anything but text/plain, it will */	35	+ /* not the headers. If the headers are anything but text/plain, it will */
Lines 43-76 Link Here
43	+ b->subtype = safe_strdup ("pgp");	42	+ b->subtype = safe_strdup ("pgp");
44	+	43	+
45	+ mutt_set_parameter ("format", "text", &b->parameter);	44	+ mutt_set_parameter ("format", "text", &b->parameter);
46	+ mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign",	45	+ mutt_set_parameter ("x-action", flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed",
47	+ &b->parameter);	46	+ &b->parameter);
48	+ }	47	+ }
49		48	mutt_set_parameter ("charset", send_charset, &b->parameter);
50	b->filename = safe_strdup (pgpoutfile);
51		49
52	@@ -1559,8 +1567,13 @@	50	b->filename = safe_strdup (pgpoutfile);
53	{	51	--- pgplib.h.orig Sun Feb 3 10:34:23 2002
54	if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create an application/pgp message?"))) == -1)	52	+++ pgplib.h Sun May 5 14:01:30 2002
55	return -1;	53	@@ -25,6 +25,7 @@
56	- else if (i == M_YES)	54	#define PGPSIGN (APPLICATION_PGP \| SIGN)
57	+ else if (i == M_YES) {	55	#define PGPGOODSIGN (APPLICATION_PGP \| GOODSIGN)
58	traditional = 1;	56	#define PGPKEY (APPLICATION_PGP \| (1 << 3))
59	+ if ((i = query_quadoption (OPT_PGPOUTLOOK, _("Create an Outlook compatible message?"))) == -1)	57	+#define PGPOUTLOOK (APPLICATION_PGP \| (1 << 4))
60	+ return -1;
61	+ else if (i == M_YES)
62	+ flags \|= PGPOUTLOOK;
63	+ }
64	}
65
66	mutt_message _("Invoking PGP...");
67	--- pgplib.h.orig Mon Feb 12 08:56:00 2001
68	+++ pgplib.h Sat Feb 24 18:12:25 2001
69	@@ -23,6 +23,7 @@
70	#define PGPSIGN (1 << 1)
71	#define PGPKEY (1 << 2)
72	#define PGPGOODSIGN (1 << 3)
73	+#define PGPOUTLOOK (1 << 4)
74		58
75	#define KEYFLAG_CANSIGN (1 << 0)	59	#define KEYFLAG_CANSIGN (1 << 0)
76	#define KEYFLAG_CANENCRYPT (1 << 1)	60	#define KEYFLAG_CANENCRYPT (1 << 1)
		61	--- crypt.c.orig Tue Mar 26 23:23:11 2002
		62	+++ crypt.c Sun May 5 13:53:52 2002
		63	@@ -184,8 +184,13 @@
		64	{
		65	if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create an inline PGP message?"))) == -1)
		66	return -1;
		67	- else if (i == M_YES)
		68	+ else if (i == M_YES) {
		69	traditional = 1;
		70	+ if ((i = query_quadoption (OPT_PGPOUTLOOK, _("Create an Outlook compatible message?"))) == -1)
		71	+ return -1;
		72	+ else if (i == M_YES)
		73	+ flags \|= PGPOUTLOOK;
		74	+ }
		75	}
		76	if (traditional)
		77	{

Lines 63-79 Link Here

(-)mutt-devel/files/patch-05 (-5 / +23 lines)
63	{	63	{
64	case -1: /* abort - don't resort */	64	case -1: /* abort - don't resort */
65	return -1;	65	return -1;
66	--- compose.c.orig Mon Feb 12 18:02:38 2001	66	--- compose.c.orig Tue Mar 26 23:03:26 2002
67	+++ compose.c Fri Mar 30 17:04:09 2001	67	+++ compose.c Thu May 2 09:21:11 2002
68	@@ -130,7 +130,7 @@	68	@@ -173,7 +173,7 @@
69	char input_signas[SHORT_STRING];	69	char input_signas[SHORT_STRING];
70		70
71	switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),	71	switch (mutt_multi_choice (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
72	- _("esabf")))	72	- _("esabf")))
73	+ N_("esabf")))	73	+ N_("esabf")))
74	{	74	{
75	case 1: /* (e)ncrypt */	75	case 1: /* (e)ncrypt */
76	bits \|= PGPENCRYPT;	76	msg->security \|= PGPENCRYPT;
		77	@@ -229,7 +229,7 @@
		78	char *p;
		79
		80	switch (mutt_multi_choice (_("S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "),
		81	- _("ewsabf")))
		82	+ N_("ewsabf")))
		83	{
		84	case 1: /* (e)ncrypt */
		85	msg->security \|= SMIMEENCRYPT;
		86	@@ -239,7 +239,7 @@
		87	msg->security \|= SMIMEENCRYPT;
		88	switch (mutt_multi_choice (_("1: DES, 2: Tripple-DES, 3: RC2-40,"
		89	" 4: RC2-64, 5: RC2-128, or (f)orget it? "),
		90	- _("12345f"))) {
		91	+ N_("12345f"))) {
		92	case 1:
		93	mutt_str_replace (&SmimeCryptAlg, "des");
		94	break;
77	--- muttlib.c.orig Sun Apr 9 14:39:02 2000	95	--- muttlib.c.orig Sun Apr 9 14:39:02 2000
78	+++ muttlib.c Fri May 12 11:26:58 2000	96	+++ muttlib.c Fri May 12 11:26:58 2000
79	@@ -671,7 +671,7 @@	97	@@ -671,7 +671,7 @@

Line 0 Link Here

(-)mutt-devel/files/patch-Makefile.am (+24 lines)
	1	--- Makefile.am.orig Thu Feb 7 10:14:11 2002
	2	+++ Makefile.am Sun May 5 11:34:05 2002
	3	@@ -3,6 +3,7 @@
	4
	5	AUTOMAKE_OPTIONS = foreign
	6	EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc
	7	+EXTRA_SCRIPTS =
	8
	9	if BUILD_IMAP
	10	IMAP_SUBDIR = imap
	11	@@ -11,11 +12,11 @@
	12
	13	SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
	14
	15	-bin_SCRIPTS = muttbug flea
	16	+bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
	17
	18	BUILT_SOURCES = keymap_defs.h patchlist.c
	19
	20	-bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
	21	+bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
	22	mutt_SOURCES = $(BUILT_SOURCES) \
	23	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
	24	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \

Line 0 Link Here

(-)mutt-devel/files/patch-smime-sender (+67 lines)
		1	--- commands.c.orig2 Fri May 31 10:14:06 2002
		2	+++ commands.c Fri May 31 10:32:00 2002
		3	@@ -197,7 +197,7 @@
		4	{
		5	if (cur->security & GOODSIGN)
		6	{
		7	- if (!smime_verify_sender(cur))
		8	+ if (option(OPTSMIMENOSENDER) \|\| !smime_verify_sender(cur))
		9	mutt_message ( _("S/MIME signature successfully verified."));
		10	else
		11	mutt_error ( _("S/MIME certificate owner does not match sender."));
		12	--- init.h.orig2 Fri May 31 10:14:05 2002
		13	+++ init.h Fri May 31 10:54:55 2002
		14	@@ -1435,6 +1435,15 @@
		15	** This flag controls wether you want to be asked to enter a label for a certificate
		16	** about to be added to the database or not. It is set by default.
		17	*/
		18	+ { "smime_dont_check_sender", DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 },
		19	+ /*
		20	+ ** .pp
		21	+ ** This flag controls wether you want the skip the check for the sender's
		22	+ ** email address against the email address stored in the certificate.
		23	+ ** This can be useful if most of your email senders use SMIMEv3 which no
		24	+ ** longer needs email-addresses as part of the certificates.
		25	+ ** It is not set by default.
		26	+ */
		27	{ "smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },
		28	/*
		29	** .pp
		30	--- mutt.h.orig2 Fri May 31 10:14:06 2002
		31	+++ mutt.h Fri May 31 10:24:03 2002
		32	@@ -453,6 +453,7 @@
		33	#ifdef HAVE_SMIME
		34	OPTSMIMEISDEFAULT,
		35	OPTASKCERTLABEL,
		36	+ OPTSMIMENOSENDER,
		37	OPTSDEFAULTDECRYPTKEY,
		38	#endif
		39	#ifdef HAVE_PGP
		40	--- contrib/smime.rc.orig Sat Mar 2 12:59:50 2002
		41	+++ contrib/smime.rc Fri May 31 17:09:04 2002
		42	@@ -6,9 +6,12 @@
		43	# will be the default method unless the following option is set
		44	set smime_is_default
		45
		46	-# Uncoment this if you don't want to set labels for certificates you add.
		47	+# Uncomment this if you don't want to set labels for certificates you add.
		48	# unset smime_ask_cert_label
		49
		50	+# Uncomment this if you don't want to check for sender's email address
		51	+# set smime_dont_check_sender = yes
		52	+
		53	# Passphrase expiration
		54	set smime_timeout=300
		55
		56	@@ -23,9 +26,9 @@
		57
		58	# The (default) keyfile for signing/decrypting. Uncomment the following
		59	# line and replace the keyid with your own.
		60	-set smime_default_key="12345678.0"
		61	+# set smime_default_key="12345678.0"
		62
		63	-# Uncommen to make mutt ask what key to use when trying to decrypt a message.
		64	+# Uncomment to make mutt ask what key to use when trying to decrypt a message.
65	# It will use the default key above (if that was set) else.
66	# unset smime_decrypt_use_default_key
67

Line 0 Link Here

(-)mutt-devel/files/smime.h (+92 lines)
		1	/*
		2	* Copyright (C) 2001,2002 Oliver Ehli <elmy@acm.org>
		3	*
		4	* This program is free software; you can redistribute it and/or modify
		5	* it under the terms of the GNU General Public License as published by
		6	* the Free Software Foundation; either version 2 of the License, or
		7	* (at your option) any later version.
		8	*
		9	* This program is distributed in the hope that it will be useful,
		10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	* GNU General Public License for more details.
		13	*
		14	* You should have received a copy of the GNU General Public License
		15	* along with this program; if not, write to the Free Software
		16	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
		17	*/
		18
		19
		20	#ifdef HAVE_SMIME
		21
		22	#include "crypt.h"
		23
		24	WHERE char *SmimeDefaultKey;
		25	WHERE char *SmimeCryptAlg;
		26	WHERE short SmimeTimeout;
		27	WHERE char *SmimeCertificates;
		28	WHERE char *SmimeKeys;
		29	WHERE char *SmimeCryptAlg;
		30	WHERE char *SmimeCALocation;
		31
		32	/* The command formats */
		33
		34	WHERE char *SmimeVerifyCommand;
		35	WHERE char *SmimeVerifyOpaqueCommand;
		36	WHERE char *SmimeDecryptCommand;
		37
		38	WHERE char *SmimeSignCommand;
		39	WHERE char *SmimeSignOpaqueCommand;
		40	WHERE char *SmimeEncryptCommand;
		41
		42	WHERE char *SmimeGetSignerCertCommand;
		43	WHERE char *SmimePk7outCommand;
		44	WHERE char *SmimeGetCertCommand;
		45	WHERE char *SmimeImportCertCommand;
		46	WHERE char *SmimeGetCertEmailCommand;
		47
		48
		49	#define APPLICATION_SMIME (1 << 6)
		50
		51	#define SIGNOPAQUE (1 << 4)
		52
		53	#define SMIMEENCRYPT (APPLICATION_SMIME \| ENCRYPT)
		54	#define SMIMESIGN (APPLICATION_SMIME \| SIGN)
		55	#define SMIMEGOODSIGN (APPLICATION_SMIME \| GOODSIGN)
		56	#define SMIMEBADSIGN (APPLICATION_SMIME \| BADSIGN)
		57	#define SMIMEOPAQUE (APPLICATION_SMIME \| SIGNOPAQUE)
		58
		59
		60
		61	#define smime_valid_passphrase() crypt_valid_passphrase(APPLICATION_SMIME)
		62
		63	void smime_void_passphrase (void);
		64
65	int mutt_is_application_smime (BODY *);
66
67
68	int smime_decrypt_mime (FILE , FILE , BODY , BODY **);
69
70	void smime_application_smime_handler (BODY , STATE );
71
72
73	BODY* smime_sign_message (BODY *);
74
75	BODY* smime_build_smime_entity (BODY , char );
76
77	int smime_verify_one(BODY , STATE , const char *);
78
79
80	int smime_verify_sender(HEADER *);
81
82
83	char* smime_get_field_from_db (char , char , short, short);
84
85	void smime_getkeys (ENVELOPE *);
86
87	char* smime_ask_for_key (char , char , short);
88
89
90	void smime_invoke_import (char , char );
91
92	#endif

Lines 5-10 Link Here

(-)mutt-devel/pkg-plist (-175 / +164 lines)
5	bin/muttbug	5	bin/muttbug
6	bin/pgpewrap	6	bin/pgpewrap
7	bin/pgpring	7	bin/pgpring
		8	bin/smime_keys
8	etc/Muttrc	9	etc/Muttrc
9	etc/mime.types	10	etc/mime.types
10	share/locale/ca/LC_MESSAGES/mutt.mo	11	share/locale/ca/LC_MESSAGES/mutt.mo
Lines 13-20 Link Here
13	share/locale/de/LC_MESSAGES/mutt.mo	14	share/locale/de/LC_MESSAGES/mutt.mo
14	share/locale/el/LC_MESSAGES/mutt.mo	15	share/locale/el/LC_MESSAGES/mutt.mo
15	share/locale/eo/LC_MESSAGES/mutt.mo	16	share/locale/eo/LC_MESSAGES/mutt.mo
16	share/locale/et/LC_MESSAGES/mutt.mo
17	share/locale/es/LC_MESSAGES/mutt.mo	17	share/locale/es/LC_MESSAGES/mutt.mo
		18	share/locale/et/LC_MESSAGES/mutt.mo
18	share/locale/fr/LC_MESSAGES/mutt.mo	19	share/locale/fr/LC_MESSAGES/mutt.mo
19	share/locale/gl/LC_MESSAGES/mutt.mo	20	share/locale/gl/LC_MESSAGES/mutt.mo
20	share/locale/hu/LC_MESSAGES/mutt.mo	21	share/locale/hu/LC_MESSAGES/mutt.mo
Lines 34-57 Link Here
34	share/locale/zh_CN/LC_MESSAGES/mutt.mo	35	share/locale/zh_CN/LC_MESSAGES/mutt.mo
35	share/locale/zh_TW/LC_MESSAGES/mutt.mo	36	share/locale/zh_TW/LC_MESSAGES/mutt.mo
36	%%PORTDOCS%%share/doc/mutt/ABOUT-NLS	37	%%PORTDOCS%%share/doc/mutt/ABOUT-NLS
37	%%PORTDOCS%%share/doc/mutt/PGP-Notes.txt
38	%%PORTDOCS%%share/doc/mutt/applying-patches.txt
39	%%PORTDOCS%%share/doc/mutt/devel-notes.txt
40	%%PORTDOCS%%share/doc/mutt/COPYRIGHT	38	%%PORTDOCS%%share/doc/mutt/COPYRIGHT
41	%%PORTDOCS%%share/doc/mutt/GPL
42	%%PORTDOCS%%share/doc/mutt/INSTALL
43	%%PORTDOCS%%share/doc/mutt/ChangeLog	39	%%PORTDOCS%%share/doc/mutt/ChangeLog
44	%%SUB_NNTP%%share/doc/mutt/ChangeLog.nntp	40	%%SUB_NNTP%%share/doc/mutt/ChangeLog.nntp
45	%%PORTDOCS%%share/doc/mutt/README	41	%%PORTDOCS%%share/doc/mutt/GPL
		42	%%PORTDOCS%%share/doc/mutt/INSTALL
46	%%PORTDOCS%%share/doc/mutt/NEWS	43	%%PORTDOCS%%share/doc/mutt/NEWS
47	%%PORTDOCS%%share/doc/mutt/TODO	44	%%PORTDOCS%%share/doc/mutt/PGP-Notes.txt
		45	%%PORTDOCS%%share/doc/mutt/README
48	%%PORTDOCS%%share/doc/mutt/README.SECURITY	46	%%PORTDOCS%%share/doc/mutt/README.SECURITY
49	%%PORTDOCS%%share/doc/mutt/README.SSL	47	%%PORTDOCS%%share/doc/mutt/README.SSL
		48	%%PORTDOCS%%share/doc/mutt/TODO
		49	%%PORTDOCS%%share/doc/mutt/applying-patches.txt