Attachment #168285 for bug #208054

Lines 3-9 Link Here

(-)mail/mutt.new/Makefile 2016-03-16 08:39:28.848965000 +0100 (-2 / +7 lines)
3	PORTNAME= mutt	3	PORTNAME= mutt
4	PORTVERSION= 1.5.24	4	PORTVERSION= 1.5.24
5	PORTREVISION?= 5	5	PORTREVISION?= 6
6	CATEGORIES+= mail ipv6	6	CATEGORIES+= mail ipv6
7	MASTER_SITES= ftp://ftp.mutt.org/mutt/ \	7	MASTER_SITES= ftp://ftp.mutt.org/mutt/ \
8	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \	8	ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
Lines 54-60 Link Here
54	.if defined (LITE)	54	.if defined (LITE)
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 FORCEBASE64 \
58	GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \	58	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 \
Lines 72-77 Link Here
72	COMPRESSED_FOLDERS_DESC= Compressed folders	72	COMPRESSED_FOLDERS_DESC= Compressed folders
73	SASL_DESC= SASL authentication	73	SASL_DESC= SASL authentication
74	DEBUG_DESC= Debugging capabilities	74	DEBUG_DESC= Debugging capabilities
		75	FORCEBASE64_DESC= Force base64 encoding for compose
75	FLOCK_DESC= flock() usage	76	FLOCK_DESC= flock() usage
76	GPGME_DESC= Gpgme interface	77	GPGME_DESC= Gpgme interface
77	GREETING_PATCH_DESC= Greeting support	78	GREETING_PATCH_DESC= Greeting support
Lines 282-287 Link Here
282	post-install-NNTP-on:	283	post-install-NNTP-on:
283	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}	284	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
		285	post-patch-FORCEBASE64-on:
		286	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64
		287
284	post-patch-GREETING_PATCH-on:	288	post-patch-GREETING_PATCH-on:
285	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting	289	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting
Lines 336-338 Link Here
336	.endif	340	.endif
337	.include <bsd.port.mk>	341	.include <bsd.port.mk>
		342




diff -rudp -x '*.orig' mutt-1.5.24-orig/init.h mutt-1.5.24/init.h
--- mutt-1.5.24-orig/init.h    2015-08-30 19:06:38.000000000 +0200
+++ mutt-1.5.24/init.h 2016-02-09 13:48:24.757051459 +0100
@@ -838,6 +838,11 @@ struct option_t MuttVars[] = {
   ** 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
diff -rudp -x '*.orig' mutt-1.5.24-orig/mutt.h mutt-1.5.24/mutt.h
--- 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,
diff -rudp -x '*.orig' mutt-1.5.24-orig/sendlib.c mutt-1.5.24/sendlib.c
--- 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

Line 0 Link Here

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