Attachment #168852 for bug #208054

View | Details | Raw Unified | Return to bug 208054 | Differences between
Collapse All | Expand All





PORTNAME=	mutt
PORTVERSION=	1.5.24
PORTREVISION?=	7
CATEGORIES+=	mail ipv6
MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \

OPTIONS_UNSET=	NLS DOCS EXAMPLES
.else
OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
		FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
		IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
		MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \
		MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \

SASL_DESC=	SASL authentication
DEBUG_DESC=	Debugging capabilities
FLOCK_DESC=	flock() usage
FORCEBASE64_DESC=	Option to force base64 encoding for compose
GPGME_DESC=	Gpgme interface
GREETING_PATCH_DESC=	Greeting support
HTML_DESC=	HTML documentation

post-install-NNTP-on:
	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}

post-patch-FORCEBASE64-on:
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64

post-patch-GREETING_PATCH-on:
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting





--- mutt-1.5.24/init.h.orig	2016-03-31 22:09:51.864031000 +0200
+++ mutt-1.5.24/init.h	2016-03-31 22:12:01.242952000 +0200
@@ -838,6 +838,11 @@
   ** sent to both the list and your address, resulting in two copies
   ** of the same email for you.
   */
+  { "force_base64",   DT_BOOL, R_NONE, OPTFORCEBASE64, 0 },
+  /*
+  ** .pp
+  ** If you need to encode all text parts to base64, set this option.
+  */
   { "force_name",	DT_BOOL, R_NONE, OPTFORCENAME, 0 },
   /*
   ** .pp
--- mutt-1.5.24-orig/mutt.h    2015-08-30 19:06:38.000000000 +0200
+++ mutt-1.5.24/mutt.h 2016-02-09 13:48:24.758051324 +0100
@@ -339,6 +339,7 @@ enum
   OPTFASTREPLY,
   OPTFCCCLEAR,
   OPTFOLLOWUPTO,
+  OPTFORCEBASE64,
   OPTFORCENAME,
   OPTFORWDECODE,
   OPTFORWQUOTE,
--- mutt-1.5.24-orig/sendlib.c 2015-08-30 19:06:38.000000000 +0200
+++ mutt-1.5.24/sendlib.c      2016-02-09 13:48:24.759051309 +0100
@@ -1168,7 +1168,9 @@ static void mutt_set_encoding (BODY *b,
   if (b->type == TYPETEXT)
   {
     char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);
-    if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM)))
+    if (option (OPTFORCEBASE64))
+      b->encoding = ENCBASE64;
+    else if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM)))
       b->encoding = ENCQUOTEDPRINTABLE;
     else if (info->hibin)
       b->encoding = option (OPTALLOW8BIT) ? ENC8BIT : ENCQUOTEDPRINTABLE;

Return to bug 208054

Lines 3-9 Link Here

(-)./Makefile (-2 / +6 lines)
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	PORTVERSION= 1.5.24	5	PORTVERSION= 1.5.24
6	PORTREVISION?= 6	6	PORTREVISION?= 7
7	CATEGORIES+= mail ipv6	7	CATEGORIES+= mail ipv6
8	MASTER_SITES= ftp://ftp.mutt.org/mutt/ \	8	MASTER_SITES= ftp://ftp.mutt.org/mutt/ \
9	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \	9	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
Lines 55-61 Link Here
55	OPTIONS_UNSET= NLS DOCS EXAMPLES	55	OPTIONS_UNSET= NLS DOCS EXAMPLES
56	.else	56	.else
57	OPTIONS_DEFINE= COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \	57	OPTIONS_DEFINE= COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
58	GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \	58	FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
59	IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \	59	IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
60	MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \	60	MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \
61	MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \	61	MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \
Lines 73-78 Link Here
73	SASL_DESC= SASL authentication	73	SASL_DESC= SASL authentication
74	DEBUG_DESC= Debugging capabilities	74	DEBUG_DESC= Debugging capabilities
75	FLOCK_DESC= flock() usage	75	FLOCK_DESC= flock() usage
		76	FORCEBASE64_DESC= Option to force base64 encoding for compose
76	GPGME_DESC= Gpgme interface	77	GPGME_DESC= Gpgme interface
77	GREETING_PATCH_DESC= Greeting support	78	GREETING_PATCH_DESC= Greeting support
78	HTML_DESC= HTML documentation	79	HTML_DESC= HTML documentation
Lines 284-289 Link Here
284	post-install-NNTP-on:	285	post-install-NNTP-on:
285	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}	286	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
286		287
		288	post-patch-FORCEBASE64-on:
		289	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64
		290
287	post-patch-GREETING_PATCH-on:	291	post-patch-GREETING_PATCH-on:
288	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting	292	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting
289		293

Line 0 Link Here

(-)./files/extra-patch-forcebase64 (+37 lines)
	1	--- mutt-1.5.24/init.h.orig 2016-03-31 22:09:51.864031000 +0200
	2	+++ mutt-1.5.24/init.h 2016-03-31 22:12:01.242952000 +0200
	3	@@ -838,6 +838,11 @@
	4	** sent to both the list and your address, resulting in two copies
	5	** of the same email for you.
	6	*/
	7	+ { "force_base64", DT_BOOL, R_NONE, OPTFORCEBASE64, 0 },
	8	+ /*
	9	+ ** .pp
	10	+ ** If you need to encode all text parts to base64, set this option.
	11	+ */
	12	{ "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 },
	13	/*
	14	** .pp
	15	--- mutt-1.5.24-orig/mutt.h 2015-08-30 19:06:38.000000000 +0200
	16	+++ mutt-1.5.24/mutt.h 2016-02-09 13:48:24.758051324 +0100
	17	@@ -339,6 +339,7 @@ enum
	18	OPTFASTREPLY,
	19	OPTFCCCLEAR,
	20	OPTFOLLOWUPTO,
	21	+ OPTFORCEBASE64,
	22	OPTFORCENAME,
	23	OPTFORWDECODE,
	24	OPTFORWQUOTE,
	25	--- mutt-1.5.24-orig/sendlib.c 2015-08-30 19:06:38.000000000 +0200
	26	+++ mutt-1.5.24/sendlib.c 2016-02-09 13:48:24.759051309 +0100
	27	@@ -1168,7 +1168,9 @@ static void mutt_set_encoding (BODY *b,
	28	if (b->type == TYPETEXT)
	29	{
	30	char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);
	31	- if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) \|\| info->linemax > 990 \|\| (info->from && option (OPTENCODEFROM)))
	32	+ if (option (OPTFORCEBASE64))
	33	+ b->encoding = ENCBASE64;
	34	+ else if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) \|\| info->linemax > 990 \|\| (info->from && option (OPTENCODEFROM)))
	35	b->encoding = ENCQUOTEDPRINTABLE;
	36	else if (info->hibin)
	37	b->encoding = option (OPTALLOW8BIT) ? ENC8BIT : ENCQUOTEDPRINTABLE;