Attachment #186181 for bug #222154

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




# $FreeBSD$

PORTNAME=	mutt
PORTVERSION=	1.9.0
PORTREVISION?=	0
CATEGORIES+=	mail ipv6
MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \

OPTIONS_DEFINE=	SASL DEBUG DOCS EXAMPLES FLOCK \
		FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
		LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
		NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR SMART_DATE \
		SMIME_OUTLOOK_COMPAT SMTP URLVIEW XML
		SMTP URLVIEW XML

OPTIONS_SINGLE=	GSSAPI HCACHE SCREEN
OPTIONS_RADIO=	SPELL

MAILDIR_MTIME_PATCH_DESC=	Maildir mtime patch
NCURSES_DESC=	Ncurses support
NLS_DESC=	Native language support (implies ICONV)
PARENT_CHILD_MATCH_PATCH_DESC=	Parent/child match
QUOTE_PATCH_DESC=	Extended quoting
REVERSE_REPLY_PATCH_DESC=	Reverse_reply
SIDEBAR_DESC=	Sidebar support


OPTIONS_DEFAULT=	GPGME HTML HCACHE_BDB ICONV IDN \
		IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
		NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
		SMIME_OUTLOOK_COMPAT SASL SMTP URLVIEW XML GSSAPI_NONE
		URLVIEW XML GSSAPI_NONE
.endif

RUN_DEPENDS+=	${LOCALBASE}/etc/mime.types:misc/mime-support

ICONV_CONFIGURE_OFF=	--disable-iconv

ASPELL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aspell
PARENT_CHILD_MATCH_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-parent-child-match
REVERSE_REPLY_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-reverse_reply

SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2

QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
			patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv

NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv
		patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv
NNTP_CONFIGURE_ON=	--enable-nntp
NNTP_VARS=	XML_NEEDED=yes
NNTP_CATEGORIES=	news
NNTP_BROKEN=	NNTP fails to apply to 1.9.0

SIDEBAR_CONFIGURE_ENABLE=	sidebar


.include <bsd.port.options.mk>

# un/comment as each VERSION is created for PORTVERSION
VVV_PATCH_VERSION=	1.8.3
#GREETING_PATCH_VERSION=	1.8.3

.if !defined(VVV_PATCH_VERSION)

CFLAGS+=		${CFLAGS_ADD}
LDFLAGS+=		${LDFLAGS_ADD}

pre-patch-NNTP-on:
	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp
	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
		${WRKDIR}/patch-nntp
	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp

post-patch-NNTP-on:
.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp




TIMESTAMP = 1504471107
SHA256 (mutt/mutt-1.9.0.tar.gz) = ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4
SIZE (mutt/mutt-1.9.0.tar.gz) = 4191932
SHA256 (mutt/patch-1.8.2.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b
SIZE (mutt/patch-1.8.2.vvv.nntp.gz) = 60675
SHA256 (mutt/patch-1.8.2.vvv.nntp_ru.gz) = c85a288ed6864c311cbc70b31bab9f0d0d1051846becb5e8fe737609fd939a9c
SIZE (mutt/patch-1.8.2.vvv.nntp_ru.gz) = 3465
SHA256 (mutt/date-conditional.diff) = 8936c5fe7a2a62a68f2a8d001c7a6dddf138c48186a338482b6639507ba9133e
SIZE (mutt/date-conditional.diff) = 2023
SHA256 (mutt/mutt-1.9.0.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
SIZE (mutt/mutt-1.9.0.vc.greeting) = 4534
SHA256 (mutt/patch-1.8.3.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b
SIZE (mutt/patch-1.8.3.vvv.nntp.gz) = 60675
SHA256 (mutt/patch-1.8.3.vvv.initials.gz) = e929c863dd012624b2ac724cd296f346374cd2522f256020fa458e94890ca750
SIZE (mutt/patch-1.8.3.vvv.initials.gz) = 686
SHA256 (mutt/patch-1.8.3.vvv.quote.gz) = 03b1aa4aa9152b968fc1709e68207073df62b9b1a5da43ff1d680d6dfe17fe35
SIZE (mutt/patch-1.8.3.vvv.quote.gz) = 1282




--- PATCHES.orig	2017-09-04 23:34:26 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.4.cd.ifdef.1
--- init.c.orig	2017-09-04 23:34:22 UTC
+++ init.c
@@ -656,6 +656,52 @@ static mbchar_table *parse_mbchar_table 
   return t;

 static int parse_unignore (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
 {
   do
--- init.h.orig	2017-09-04 23:34:22 UTC
+++ init.h
@@ -4037,6 +4037,7 @@ static int parse_lists (BUFFER *, BUFFER
 static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);

 static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -4099,6 +4100,7 @@ const struct command_t Commands[] = {
   { "hdr_order",	parse_list,		UL &HeaderOrderList },
 #ifdef HAVE_ICONV
   { "iconv-hook",	mutt_parse_hook,	MUTT_ICONVHOOK },




--- PATCHES.orig	2017-09-04 15:19:31.167205000 -0400
+++ PATCHES	2017-09-04 15:19:31.168636000 -0400
@@ -0,0 +1 @@
+patch-1.5.7.ust.maildir-mtime.2
--- browser.c.orig	2017-09-04 15:19:27.714342000 -0400
+++ browser.c	2017-09-04 15:19:31.178678000 -0400
@@ -32,6 +32,7 @@
 #ifdef USE_IMAP
 #include "imap.h"

 
 #include <stdlib.h>
 #include <dirent.h>
@@ -413,6 +414,21 @@
     menu->data = state->entry;
 }
 

 static int examine_directory (MUTTMENU *menu, struct browser_state *state,
 			      char *d, const char *prefix)
 {
@@ -476,6 +492,7 @@
     tmp = Incoming;
     while (tmp && mutt_strcmp (buffer, tmp->path))
       tmp = tmp->next;

     if (tmp && Context &&
         !mutt_strcmp (tmp->realpath, Context->realpath))
     {
@@ -549,6 +566,7 @@
 	s.st_mtime = st2.st_mtime;
     }
 
+    check_maildir_times (tmp, &s);
     add_folder (menu, state, buffer, &s, tmp);




--- PATCHES.orig	2017-09-04 23:35:30 UTC
+++ PATCHES
@@ -0,0 +1 @@
+patch-1.5.6.cb.reverse_reply.2
--- init.h.orig	2017-09-04 23:35:27 UTC
+++ init.h
@@ -2687,6 +2687,13 @@ struct option_t MuttVars[] = {
   ** possibly including eventual real names.  When it is \fIunset\fP, mutt will
   ** override any such real names with the setting of the $$realname variable.
   */

   { "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
   /*
   ** .pp
--- mutt.h.orig	2017-09-04 23:35:27 UTC
+++ mutt.h
@@ -448,6 +448,7 @@ enum
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,

   OPTRFC2047PARAMS,
   OPTSAVEADDRESS,
   OPTSAVEEMPTY,
--- protos.h.orig	2017-09-04 23:35:27 UTC
+++ protos.h
@@ -93,6 +93,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, c
 ADDRESS *mutt_lookup_alias (const char *s);

 ADDRESS *mutt_expand_aliases (ADDRESS *);
 ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
 
--- send.c.orig	2017-09-04 23:35:27 UTC
+++ send.c
@@ -598,6 +598,10 @@ void mutt_fix_reply_recipients (ENVELOPE
   /* the CC field can get cluttered, especially with lists */
   env->to = mutt_remove_duplicates (env->to);
   env->cc = mutt_remove_duplicates (env->cc);

   env->cc = mutt_remove_xrefs (env->to, env->cc);
   
   if (env->cc && !env->to)
--- sendlib.c.orig	2017-09-04 23:35:27 UTC
+++ sendlib.c
@@ -2753,6 +2753,35 @@ static void set_noconv_flags (BODY *b, s
   }
 }
 




--- contrib/smime.rc.orig	2017-05-30 19:26:40 UTC
+++ contrib/smime.rc
@@ -23,8 +23,12 @@ set crypt_verify_sig = yes
 
 # 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"
 
+# Uncomment the following line in addition to the one above, if you want that
+# all encrypted messages are also encrypted with your default key.
+# set smime_encrypt_self = yes
+  
 # 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
--- crypt.c.orig	2017-06-04 00:05:52 UTC
+++ crypt.c
@@ -229,8 +229,18 @@ int mutt_protect (HEADER *msg, char *key
     if ((WithCrypto & APPLICATION_SMIME)
         && (msg->security & APPLICATION_SMIME))
     {
-      if (!(tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody,
-                                                        keylist)))
+	   char *new_keylist = keylist;
+
+		 if (SmimeDefaultKey && query_quadoption(OPT_SMIMEENCRYPTSELF, _("Encrypt message to S/MIME Default Key also?")) == MUTT_YES)
+		 {
+			int size = mutt_strlen(keylist) + mutt_strlen (SmimeDefaultKey) + 2; /* +1 for NULL, +1 for \n */
+			new_keylist = safe_malloc(size);
+			snprintf(new_keylist, size, "%s%s\n", keylist, SmimeDefaultKey);
+	   }
+		 
+	  tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody, new_keylist);
+	  safe_free((void **)&new_keylist);
+	  if (!tmp_pbody)
       {
 	/* signed ? free it! */
 	return (-1);
--- init.h.orig	2017-06-04 00:05:52 UTC
+++ init.h
@@ -3017,6 +3017,11 @@ struct option_t MuttVars[] = {
   ** possible \fCprintf(3)\fP-like sequences.
   ** (S/MIME only)
   */
+  { "smime_encrypt_self",	DT_QUAD,	 R_NONE, OPT_SMIMEENCRYPTSELF, 1 },
+  /*
+  ** .pp
+  ** Encrypt the message to smime_default_key too.
+  */
   { "smime_encrypt_with",	DT_STR,	 R_NONE, UL &SmimeCryptAlg, UL "aes256" },
   /*
   ** .pp
--- mutt.h.orig	2017-06-04 00:05:52 UTC
+++ mutt.h
@@ -284,6 +284,7 @@ enum
   OPT_FORWEDIT,
   OPT_FCCATTACH,
   OPT_INCLUDE,
+  OPT_SMIMEENCRYPTSELF,
   OPT_MFUPTO,
   OPT_MIMEFWD,
   OPT_MIMEFWDREST,




--- commands.c.orig	2017-09-08 22:18:16 UTC
+++ commands.c
@@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur)
     {

 	  mutt_message ( _("S/MIME signature successfully verified."));
 	else
 	  mutt_error ( _("S/MIME certificate owner does not match sender."));
--- init.h.orig	2017-09-08 22:18:16 UTC
+++ contrib/smime.rc
@@ -8,7 +8,10 @@ set smime_is_default
 
 # 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
 
--- init.h.orig	2017-06-04 00:06:24 UTC
+++ init.h
@@ -3099,6 +3099,15 @@ struct option_t MuttVars[] = {
   ** to determine the key to use. It will ask you to supply a key, if it can't find one.
   ** (S/MIME only)
   */

   { "smime_sign_as",			DT_SYN,  R_NONE, UL "smime_default_key", 0 },
   { "smime_default_key",		DT_STR,	 R_NONE, UL &SmimeDefaultKey, 0 },
   /*
--- mutt.h.orig	2017-09-08 22:18:16 UTC
+++ mutt.h
@@ -521,6 +521,7 @@ enum
   OPTCRYPTTIMESTAMP,
   OPTSMIMEISDEFAULT,
   OPTSMIMESELFENCRYPT,
   OPTASKCERTLABEL,
+  OPTSMIMENOSENDER,
   OPTSDEFAULTDECRYPTKEY,




--- mutt.h.orig	2017-09-04 23:39:03 UTC
+++ mutt.h
@@ -211,6 +211,7 @@ enum
   MUTT_EXPIRED,

 
   /* actions for mutt_pattern_comp/mutt_pattern_exec */
   MUTT_AND,
--- pattern.c.orig	2017-09-04 23:39:03 UTC
+++ pattern.c
@@ -56,6 +56,7 @@ static const struct pattern_flags
 }
 Flags[] =
 {

   { 'A', MUTT_ALL,			0,		NULL },
   { 'b', MUTT_BODY,		MUTT_FULL_MSG,	eat_regexp },
   { 'B', MUTT_WHOLE_MSG,		MUTT_FULL_MSG,	eat_regexp },
@@ -1270,6 +1271,16 @@ mutt_pattern_exec (struct pattern_t *pat
       else
         result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
       return (pat->not ^ result);
- 

Return to bug 222154

Lines 2-8 Link Here

(-)b/mail/mutt/Makefile (-18 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	PORTVERSION= 1.8.3	5	PORTVERSION= 1.9.0
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES+= mail ipv6	7	CATEGORIES+= mail ipv6
8	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \	8	MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \
Lines 57-65 OPTIONS_EXCLUDE= NLS DOCS EXAMPLES Link Here
57	OPTIONS_DEFINE= SASL DEBUG DOCS EXAMPLES FLOCK \	57	OPTIONS_DEFINE= SASL DEBUG DOCS EXAMPLES FLOCK \
58	FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \	58	FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
59	LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \	59	LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
60	NLS NNTP PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \	60	NLS NNTP QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR SMART_DATE \
61	REVERSE_REPLY_PATCH SIDEBAR SMART_DATE SMIME_OUTLOOK_COMPAT \	61	SMIME_OUTLOOK_COMPAT SMTP URLVIEW XML
62	SMTP URLVIEW XML
63		62
64	OPTIONS_SINGLE= GSSAPI HCACHE SCREEN	63	OPTIONS_SINGLE= GSSAPI HCACHE SCREEN
65	OPTIONS_RADIO= SPELL	64	OPTIONS_RADIO= SPELL
Lines 82-88 MAILBOX_MANPAGES_DESC= Install mbox.5/mmdf.5 manpages Link Here
82	MAILDIR_MTIME_PATCH_DESC= Maildir mtime patch	81	MAILDIR_MTIME_PATCH_DESC= Maildir mtime patch
83	NCURSES_DESC= Ncurses support	82	NCURSES_DESC= Ncurses support
84	NLS_DESC= Native language support (implies ICONV)	83	NLS_DESC= Native language support (implies ICONV)
85	PARENT_CHILD_MATCH_PATCH_DESC= Parent/child match
86	QUOTE_PATCH_DESC= Extended quoting	84	QUOTE_PATCH_DESC= Extended quoting
87	REVERSE_REPLY_PATCH_DESC= Reverse_reply	85	REVERSE_REPLY_PATCH_DESC= Reverse_reply
88	SIDEBAR_DESC= Sidebar support	86	SIDEBAR_DESC= Sidebar support
Lines 100-108 XML_DESC= Use XML tools for rebuilding documentation Link Here
100		98
101	OPTIONS_DEFAULT= GPGME HTML HCACHE_BDB ICONV IDN \	99	OPTIONS_DEFAULT= GPGME HTML HCACHE_BDB ICONV IDN \
102	IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \	100	IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
103	NLS NCURSES PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \	101	NLS NCURSES QUOTE_PATCH REVERSE_REPLY_PATCH SMART_DATE \
104	REVERSE_REPLY_PATCH SMART_DATE SMIME_OUTLOOK_COMPAT SASL SMTP \	102	SMIME_OUTLOOK_COMPAT SASL SMTP URLVIEW XML GSSAPI_NONE
105	URLVIEW XML GSSAPI_NONE
106	.endif	103	.endif
107		104
108	RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:misc/mime-support	105	RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:misc/mime-support
Lines 170-176 ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} Link Here
170	ICONV_CONFIGURE_OFF= --disable-iconv	167	ICONV_CONFIGURE_OFF= --disable-iconv
171		168
172	ASPELL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-aspell	169	ASPELL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-aspell
173	PARENT_CHILD_MATCH_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-parent-child-match
174	REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply	170	REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply
175		171
176	SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2	172	SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
Lines 201-211 GREETING_PATCH_PATCHFILES= mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc Link Here
201	QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \	197	QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
202	patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv	198	patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
203		199
204	NNTP_DISTFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv \	200	NNTP_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:-p1:vvv
205	patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv
206	NNTP_CONFIGURE_ON= --enable-nntp	201	NNTP_CONFIGURE_ON= --enable-nntp
207	NNTP_VARS= XML_NEEDED=yes	202	NNTP_VARS= XML_NEEDED=yes
208	NNTP_CATEGORIES= news	203	NNTP_CATEGORIES= news
		204	NNTP_BROKEN= NNTP fails to apply to 1.9.0
209		205
210	SIDEBAR_CONFIGURE_ENABLE= sidebar	206	SIDEBAR_CONFIGURE_ENABLE= sidebar
211		207
Lines 214-220 DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref Link Here
214	.include <bsd.port.options.mk>	210	.include <bsd.port.options.mk>
215		211
216	# un/comment as each VERSION is created for PORTVERSION	212	# un/comment as each VERSION is created for PORTVERSION
217	VVV_PATCH_VERSION= 1.8.2	213	VVV_PATCH_VERSION= 1.8.3
218	#GREETING_PATCH_VERSION= 1.8.3	214	#GREETING_PATCH_VERSION= 1.8.3
219		215
220	.if !defined(VVV_PATCH_VERSION)	216	.if !defined(VVV_PATCH_VERSION)
Lines 238-249 LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow Link Here
238	CFLAGS+= ${CFLAGS_ADD}	234	CFLAGS+= ${CFLAGS_ADD}
239	LDFLAGS+= ${LDFLAGS_ADD}	235	LDFLAGS+= ${LDFLAGS_ADD}
240		236
241	pre-patch-NNTP-on:
242	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp
243	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
244	${WRKDIR}/patch-nntp
245	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
246
247	post-patch-NNTP-on:	237	post-patch-NNTP-on:
248	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}	238	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
249	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp	239	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp

Lines 1-15 Link Here

(-)b/mail/mutt/distinfo (-13 / +11 lines)
1	TIMESTAMP = 1496461712	1	TIMESTAMP = 1504471107
2	SHA256 (mutt/mutt-1.8.3.tar.gz) = 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42	2	SHA256 (mutt/mutt-1.9.0.tar.gz) = ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4
3	SIZE (mutt/mutt-1.8.3.tar.gz) = 4122012	3	SIZE (mutt/mutt-1.9.0.tar.gz) = 4191932
4	SHA256 (mutt/patch-1.8.2.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b
5	SIZE (mutt/patch-1.8.2.vvv.nntp.gz) = 60675
6	SHA256 (mutt/patch-1.8.2.vvv.nntp_ru.gz) = c85a288ed6864c311cbc70b31bab9f0d0d1051846becb5e8fe737609fd939a9c
7	SIZE (mutt/patch-1.8.2.vvv.nntp_ru.gz) = 3465
8	SHA256 (mutt/date-conditional.diff) = 8936c5fe7a2a62a68f2a8d001c7a6dddf138c48186a338482b6639507ba9133e	4	SHA256 (mutt/date-conditional.diff) = 8936c5fe7a2a62a68f2a8d001c7a6dddf138c48186a338482b6639507ba9133e
9	SIZE (mutt/date-conditional.diff) = 2023	5	SIZE (mutt/date-conditional.diff) = 2023
10	SHA256 (mutt/mutt-1.8.3.vc.greeting) = 73113eb0a3eb761755315ab03c0b6bcb316c09603461a1f8a3f54bd870a576cc	6	SHA256 (mutt/mutt-1.9.0.vc.greeting) = b4ac804c24a07c7eb8330ebfdc94cdbf6fd7a4671badfb32fb611df09c008317
11	SIZE (mutt/mutt-1.8.3.vc.greeting) = 4499	7	SIZE (mutt/mutt-1.9.0.vc.greeting) = 4534
12	SHA256 (mutt/patch-1.8.2.vvv.initials.gz) = e929c863dd012624b2ac724cd296f346374cd2522f256020fa458e94890ca750	8	SHA256 (mutt/patch-1.8.3.vvv.nntp.gz) = 940cf7fd4fbea39f48bd5594180a7be5c3cc6714d62eeb3f2e5fbc0ab4b3545b
13	SIZE (mutt/patch-1.8.2.vvv.initials.gz) = 686	9	SIZE (mutt/patch-1.8.3.vvv.nntp.gz) = 60675
14	SHA256 (mutt/patch-1.8.2.vvv.quote.gz) = 03b1aa4aa9152b968fc1709e68207073df62b9b1a5da43ff1d680d6dfe17fe35	10	SHA256 (mutt/patch-1.8.3.vvv.initials.gz) = e929c863dd012624b2ac724cd296f346374cd2522f256020fa458e94890ca750
15	SIZE (mutt/patch-1.8.2.vvv.quote.gz) = 1282	11	SIZE (mutt/patch-1.8.3.vvv.initials.gz) = 686
		12	SHA256 (mutt/patch-1.8.3.vvv.quote.gz) = 03b1aa4aa9152b968fc1709e68207073df62b9b1a5da43ff1d680d6dfe17fe35
		13	SIZE (mutt/patch-1.8.3.vvv.quote.gz) = 1282

Lines 1-8 Link Here

(-)b/mail/mutt/files/extra-patch-ifdef (-5 / +5 lines)
1	--- PATCHES.orig 2017-06-03 23:06:11 UTC	1	--- PATCHES.orig 2017-09-04 23:34:26 UTC
2	+++ PATCHES	2	+++ PATCHES
3	@@ -0,0 +1 @@	3	@@ -0,0 +1 @@
4	+patch-1.5.4.cd.ifdef.1	4	+patch-1.5.4.cd.ifdef.1
5	--- init.c.orig 2017-05-30 19:27:52 UTC	5	--- init.c.orig 2017-09-04 23:34:22 UTC
6	+++ init.c	6	+++ init.c
7	@@ -656,6 +656,52 @@ static mbchar_table *parse_mbchar_table	7	@@ -656,6 +656,52 @@ static mbchar_table *parse_mbchar_table
8	return t;	8	return t;
Lines 57-65 Link Here
57	static int parse_unignore (BUFFER buf, BUFFER s, unsigned long data, BUFFER *err)	57	static int parse_unignore (BUFFER buf, BUFFER s, unsigned long data, BUFFER *err)
58	{	58	{
59	do	59	do
60	--- init.h.orig 2017-06-03 23:06:11 UTC	60	--- init.h.orig 2017-09-04 23:34:22 UTC
61	+++ init.h	61	+++ init.h
62	@@ -3904,6 +3904,7 @@ static int parse_lists (BUFFER *, BUFFER	62	@@ -4037,6 +4037,7 @@ static int parse_lists (BUFFER *, BUFFER
63	static int parse_unlists (BUFFER , BUFFER , unsigned long, BUFFER *);	63	static int parse_unlists (BUFFER , BUFFER , unsigned long, BUFFER *);
64	static int parse_alias (BUFFER , BUFFER , unsigned long, BUFFER *);	64	static int parse_alias (BUFFER , BUFFER , unsigned long, BUFFER *);
65	static int parse_unalias (BUFFER , BUFFER , unsigned long, BUFFER *);	65	static int parse_unalias (BUFFER , BUFFER , unsigned long, BUFFER *);
Lines 67-73 Link Here
67	static int parse_ignore (BUFFER , BUFFER , unsigned long, BUFFER *);	67	static int parse_ignore (BUFFER , BUFFER , unsigned long, BUFFER *);
68	static int parse_unignore (BUFFER , BUFFER , unsigned long, BUFFER *);	68	static int parse_unignore (BUFFER , BUFFER , unsigned long, BUFFER *);
69	static int parse_source (BUFFER , BUFFER , unsigned long, BUFFER *);	69	static int parse_source (BUFFER , BUFFER , unsigned long, BUFFER *);
70	@@ -3966,6 +3967,7 @@ const struct command_t Commands[] = {	70	@@ -4099,6 +4100,7 @@ const struct command_t Commands[] = {
71	{ "hdr_order", parse_list, UL &HeaderOrderList },	71	{ "hdr_order", parse_list, UL &HeaderOrderList },
72	#ifdef HAVE_ICONV	72	#ifdef HAVE_ICONV
73	{ "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK },	73	{ "iconv-hook", mutt_parse_hook, MUTT_ICONVHOOK },

Lines 1-9 Link Here

(-)b/mail/mutt/files/extra-patch-maildir-mtime (-9 / +9 lines)
1	--- PATCHES.orig 2017-06-03 22:37:15 UTC	1	--- PATCHES.orig 2017-09-04 15:19:31.167205000 -0400
2	+++ PATCHES	2	+++ PATCHES 2017-09-04 15:19:31.168636000 -0400
3	@@ -0,0 +1 @@	3	@@ -0,0 +1 @@
4	+patch-1.5.7.ust.maildir-mtime.2	4	+patch-1.5.7.ust.maildir-mtime.2
5	--- browser.c.orig 2017-06-03 22:37:03 UTC	5	--- browser.c.orig 2017-09-04 15:19:27.714342000 -0400
6	+++ browser.c	6	+++ browser.c 2017-09-04 15:19:31.178678000 -0400
7	@@ -32,6 +32,7 @@	7	@@ -32,6 +32,7 @@
8	#ifdef USE_IMAP	8	#ifdef USE_IMAP
9	#include "imap.h"	9	#include "imap.h"
Lines 12-18 Link Here
12		12
13	#include <stdlib.h>	13	#include <stdlib.h>
14	#include <dirent.h>	14	#include <dirent.h>
15	@@ -413,6 +414,21 @@ static void init_state (struct browser_s	15	@@ -413,6 +414,21 @@
16	menu->data = state->entry;	16	menu->data = state->entry;
17	}	17	}
18		18
Lines 34-40 Link Here
34	static int examine_directory (MUTTMENU menu, struct browser_state state,	34	static int examine_directory (MUTTMENU menu, struct browser_state state,
35	char d, const char prefix)	35	char d, const char prefix)
36	{	36	{
37	@@ -476,6 +492,7 @@ static int examine_directory (MUTTMENU *	37	@@ -476,6 +492,7 @@
38	tmp = Incoming;	38	tmp = Incoming;
39	while (tmp && mutt_strcmp (buffer, tmp->path))	39	while (tmp && mutt_strcmp (buffer, tmp->path))
40	tmp = tmp->next;	40	tmp = tmp->next;
Lines 42-50 Link Here
42	if (tmp && Context &&	42	if (tmp && Context &&
43	!mutt_strcmp (tmp->realpath, Context->realpath))	43	!mutt_strcmp (tmp->realpath, Context->realpath))
44	{	44	{
45	@@ -549,6 +566,7 @@ static int examine_mailboxes (MUTTMENU *	45	@@ -549,6 +566,7 @@
46	strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));	46	s.st_mtime = st2.st_mtime;
47	mutt_pretty_mailbox (buffer, sizeof (buffer));	47	}
48		48
49	+ check_maildir_times (tmp, &s);	49	+ check_maildir_times (tmp, &s);
50	add_folder (menu, state, buffer, &s, tmp);	50	add_folder (menu, state, buffer, &s, tmp);

Lines 1-10 Link Here

(-)b/mail/mutt/files/extra-patch-reverse_reply (-10 / +10 lines)
1	--- PATCHES.orig 2017-06-03 23:21:18 UTC	1	--- PATCHES.orig 2017-09-04 23:35:30 UTC
2	+++ PATCHES	2	+++ PATCHES
3	@@ -0,0 +1 @@	3	@@ -0,0 +1 @@
4	+patch-1.5.6.cb.reverse_reply.2	4	+patch-1.5.6.cb.reverse_reply.2
5	--- init.h.orig 2017-06-03 23:21:18 UTC	5	--- init.h.orig 2017-09-04 23:35:27 UTC
6	+++ init.h	6	+++ init.h
7	@@ -2588,6 +2588,13 @@ struct option_t MuttVars[] = {	7	@@ -2687,6 +2687,13 @@ struct option_t MuttVars[] = {
8	** possibly including eventual real names. When it is \fIunset\fP, mutt will	8	** possibly including eventual real names. When it is \fIunset\fP, mutt will
9	** override any such real names with the setting of the $$realname variable.	9	** override any such real names with the setting of the $$realname variable.
10	*/	10	*/
Lines 18-26 Link Here
18	{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },	18	{ "rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, 0 },
19	/*	19	/*
20	** .pp	20	** .pp
21	--- mutt.h.orig 2017-06-03 23:21:23 UTC	21	--- mutt.h.orig 2017-09-04 23:35:27 UTC
22	+++ mutt.h	22	+++ mutt.h
23	@@ -440,6 +440,7 @@ enum	23	@@ -448,6 +448,7 @@ enum
24	OPTREVALIAS,	24	OPTREVALIAS,
25	OPTREVNAME,	25	OPTREVNAME,
26	OPTREVREAL,	26	OPTREVREAL,
Lines 28-34 Link Here
28	OPTRFC2047PARAMS,	28	OPTRFC2047PARAMS,
29	OPTSAVEADDRESS,	29	OPTSAVEADDRESS,
30	OPTSAVEEMPTY,	30	OPTSAVEEMPTY,
31	--- protos.h.orig 2017-05-30 19:27:53 UTC	31	--- protos.h.orig 2017-09-04 23:35:27 UTC
32	+++ protos.h	32	+++ protos.h
33	@@ -93,6 +93,7 @@ ADDRESS mutt_get_address (ENVELOPE , c	33	@@ -93,6 +93,7 @@ ADDRESS mutt_get_address (ENVELOPE , c
34	ADDRESS mutt_lookup_alias (const char s);	34	ADDRESS mutt_lookup_alias (const char s);
Lines 38-46 Link Here
38	ADDRESS mutt_expand_aliases (ADDRESS );	38	ADDRESS mutt_expand_aliases (ADDRESS );
39	ADDRESS mutt_parse_adrlist (ADDRESS , const char *);	39	ADDRESS mutt_parse_adrlist (ADDRESS , const char *);
40		40
41	--- send.c.orig 2017-05-30 19:27:53 UTC	41	--- send.c.orig 2017-09-04 23:35:27 UTC
42	+++ send.c	42	+++ send.c
43	@@ -585,6 +585,10 @@ void mutt_fix_reply_recipients (ENVELOPE	43	@@ -598,6 +598,10 @@ void mutt_fix_reply_recipients (ENVELOPE
44	/* the CC field can get cluttered, especially with lists */	44	/* the CC field can get cluttered, especially with lists */
45	env->to = mutt_remove_duplicates (env->to);	45	env->to = mutt_remove_duplicates (env->to);
46	env->cc = mutt_remove_duplicates (env->cc);	46	env->cc = mutt_remove_duplicates (env->cc);
Lines 51-59 Link Here
51	env->cc = mutt_remove_xrefs (env->to, env->cc);	51	env->cc = mutt_remove_xrefs (env->to, env->cc);
52		52
53	if (env->cc && !env->to)	53	if (env->cc && !env->to)
54	--- sendlib.c.orig 2017-05-30 19:27:53 UTC	54	--- sendlib.c.orig 2017-09-04 23:35:27 UTC
55	+++ sendlib.c	55	+++ sendlib.c
56	@@ -2714,6 +2714,35 @@ static void set_noconv_flags (BODY *b, s	56	@@ -2753,6 +2753,35 @@ static void set_noconv_flags (BODY *b, s
57	}	57	}
58	}	58	}
59		59

Removed Link Here

(-)a/mail/mutt/files/patch-smime-self (-63 lines)
1	--- contrib/smime.rc.orig 2017-05-30 19:26:40 UTC
2	+++ contrib/smime.rc
3	@@ -23,8 +23,12 @@ set crypt_verify_sig = yes
4
5	# The (default) keyfile for signing/decrypting. Uncomment the following
6	# line and replace the keyid with your own.
7	-set smime_default_key="12345678.0"
8	+# set smime_default_key="12345678.0"
9
10	+# Uncomment the following line in addition to the one above, if you want that
11	+# all encrypted messages are also encrypted with your default key.
12	+# set smime_encrypt_self = yes
13	+
14	# Uncomment to make mutt ask what key to use when trying to decrypt a message.
15	# It will use the default key above (if that was set) else.
16	# unset smime_decrypt_use_default_key
17	--- crypt.c.orig 2017-06-04 00:05:52 UTC
18	+++ crypt.c
19	@@ -229,8 +229,18 @@ int mutt_protect (HEADER msg, char key
20	if ((WithCrypto & APPLICATION_SMIME)
21	&& (msg->security & APPLICATION_SMIME))
22	{
23	- if (!(tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody,
24	- keylist)))
25	+ char *new_keylist = keylist;
26	+
27	+ if (SmimeDefaultKey && query_quadoption(OPT_SMIMEENCRYPTSELF, _("Encrypt message to S/MIME Default Key also?")) == MUTT_YES)
28	+ {
29	+ int size = mutt_strlen(keylist) + mutt_strlen (SmimeDefaultKey) + 2; /* +1 for NULL, +1 for \n */
30	+ new_keylist = safe_malloc(size);
31	+ snprintf(new_keylist, size, "%s%s\n", keylist, SmimeDefaultKey);
32	+ }
33	+
34	+ tmp_pbody = crypt_smime_build_smime_entity (tmp_smime_pbody, new_keylist);
35	+ safe_free((void **)&new_keylist);
36	+ if (!tmp_pbody)
37	{
38	/* signed ? free it! */
39	return (-1);
40	--- init.h.orig 2017-06-04 00:05:52 UTC
41	+++ init.h
42	@@ -3017,6 +3017,11 @@ struct option_t MuttVars[] = {
43	** possible \fCprintf(3)\fP-like sequences.
44	** (S/MIME only)
45	*/
46	+ { "smime_encrypt_self", DT_QUAD, R_NONE, OPT_SMIMEENCRYPTSELF, 1 },
47	+ /*
48	+ ** .pp
49	+ ** Encrypt the message to smime_default_key too.
50	+ */
51	{ "smime_encrypt_with", DT_STR, R_NONE, UL &SmimeCryptAlg, UL "aes256" },
52	/*
53	** .pp
54	--- mutt.h.orig 2017-06-04 00:05:52 UTC
55	+++ mutt.h
56	@@ -284,6 +284,7 @@ enum
57	OPT_FORWEDIT,
58	OPT_FCCATTACH,
59	OPT_INCLUDE,
60	+ OPT_SMIMEENCRYPTSELF,
61	OPT_MFUPTO,
62	OPT_MIMEFWD,
63	OPT_MIMEFWDREST,

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-smime-sender (-20 / +6 lines)
1	--- commands.c.orig 2017-05-30 19:27:52 UTC	1	--- commands.c.orig 2017-09-08 22:18:16 UTC
2	+++ commands.c	2	+++ commands.c
3	@@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur)	3	@@ -185,7 +185,7 @@ int mutt_display_message (HEADER *cur)
4	{	4	{
Lines 9-31 Link Here
9	mutt_message ( _("S/MIME signature successfully verified."));	9	mutt_message ( _("S/MIME signature successfully verified."));
10	else	10	else
11	mutt_error ( _("S/MIME certificate owner does not match sender."));	11	mutt_error ( _("S/MIME certificate owner does not match sender."));
12	--- contrib/smime.rc.orig 2017-06-04 00:06:24 UTC	12	--- init.h.orig 2017-09-08 22:18:16 UTC
13	+++ contrib/smime.rc
14	@@ -8,7 +8,10 @@ set smime_is_default
15
16	# Uncomment this if you don't want to set labels for certificates you add.
17	# unset smime_ask_cert_label
18	-
19	+
20	+# Uncomment this if you don't want to check for sender's email address
21	+# set smime_dont_check_sender = yes
22	+
23	# Passphrase expiration
24	set smime_timeout=300
25
26	--- init.h.orig 2017-06-04 00:06:24 UTC
27	+++ init.h	13	+++ init.h
28	@@ -3000,6 +3000,15 @@ struct option_t MuttVars[] = {	14	@@ -3099,6 +3099,15 @@ struct option_t MuttVars[] = {
29	** to determine the key to use. It will ask you to supply a key, if it can't find one.	15	** to determine the key to use. It will ask you to supply a key, if it can't find one.
30	** (S/MIME only)	16	** (S/MIME only)
31	*/	17	*/
Lines 41-51 Link Here
41	{ "smime_sign_as", DT_SYN, R_NONE, UL "smime_default_key", 0 },	27	{ "smime_sign_as", DT_SYN, R_NONE, UL "smime_default_key", 0 },
42	{ "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 },	28	{ "smime_default_key", DT_STR, R_NONE, UL &SmimeDefaultKey, 0 },
43	/*	29	/*
44	--- mutt.h.orig 2017-06-04 00:06:24 UTC	30	--- mutt.h.orig 2017-09-08 22:18:16 UTC
45	+++ mutt.h	31	+++ mutt.h
46	@@ -513,6 +513,7 @@ enum	32	@@ -521,6 +521,7 @@ enum
47	OPTCRYPTTIMESTAMP,
48	OPTSMIMEISDEFAULT,	33	OPTSMIMEISDEFAULT,
		34	OPTSMIMESELFENCRYPT,
49	OPTASKCERTLABEL,	35	OPTASKCERTLABEL,
50	+ OPTSMIMENOSENDER,	36	+ OPTSMIMENOSENDER,
51	OPTSDEFAULTDECRYPTKEY,	37	OPTSDEFAULTDECRYPTKEY,

Lines 1-4 Link Here

(-)b/mail/mutt/files/patch-threadcomplete (-5 / +4 lines)
1	--- mutt.h.orig 2017-06-03 22:52:35 UTC	1	--- mutt.h.orig 2017-09-04 23:39:03 UTC
2	+++ mutt.h	2	+++ mutt.h
3	@@ -211,6 +211,7 @@ enum	3	@@ -211,6 +211,7 @@ enum
4	MUTT_EXPIRED,	4	MUTT_EXPIRED,
Lines 8-16 Link Here
8		8
9	/* actions for mutt_pattern_comp/mutt_pattern_exec */	9	/* actions for mutt_pattern_comp/mutt_pattern_exec */
10	MUTT_AND,	10	MUTT_AND,
11	--- pattern.c.orig 2017-06-03 22:52:35 UTC	11	--- pattern.c.orig 2017-09-04 23:39:03 UTC
12	+++ pattern.c	12	+++ pattern.c
13	@@ -57,6 +57,7 @@ static const struct pattern_flags	13	@@ -56,6 +56,7 @@ static const struct pattern_flags
14	}	14	}
15	Flags[] =	15	Flags[] =
16	{	16	{
Lines 18-24 Link Here
18	{ 'A', MUTT_ALL, 0, NULL },	18	{ 'A', MUTT_ALL, 0, NULL },
19	{ 'b', MUTT_BODY, MUTT_FULL_MSG, eat_regexp },	19	{ 'b', MUTT_BODY, MUTT_FULL_MSG, eat_regexp },
20	{ 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG, eat_regexp },	20	{ 'B', MUTT_WHOLE_MSG, MUTT_FULL_MSG, eat_regexp },
21	@@ -1302,6 +1303,16 @@ pattern_exec (struct pattern_t *pat, pat	21	@@ -1270,6 +1271,16 @@ mutt_pattern_exec (struct pattern_t *pat
22	else	22	else
23	result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);	23	result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
24	return (pat->not ^ result);	24	return (pat->not ^ result);
25	-