Date: Thu, 13 Nov 2014 17:07:06 +0000 (UTC) From: Vsevolod Stakhov <vsevolod@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372527 - in head/mail/exim: . files Message-ID: <201411131707.sADH76XG062196@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vsevolod Date: Thu Nov 13 17:07:05 2014 New Revision: 372527 URL: https://svnweb.freebsd.org/changeset/ports/372527 QAT: https://qat.redports.org/buildarchive/r372527/ Log: Add patch to avoid http://bugs.exim.org/show_bug.cgi?id=1513 Obtained from: exim git and Victor Ustugov adopted patch Added: head/mail/exim/files/patch-src__mime.c (contents, props changed) Modified: head/mail/exim/Makefile Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Thu Nov 13 16:17:22 2014 (r372526) +++ head/mail/exim/Makefile Thu Nov 13 17:07:05 2014 (r372527) @@ -3,7 +3,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} MASTER_SITE_SUBDIR= exim4/:exim Added: head/mail/exim/files/patch-src__mime.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/exim/files/patch-src__mime.c Thu Nov 13 17:07:05 2014 (r372527) @@ -0,0 +1,52 @@ +diff -urN ../exim-4.84.orig/src/mime.c ../exim-4.84/src/mime.c +--- ../exim-4.84.orig/src/mime.c 2014-08-09 15:44:29.000000000 +0300 ++++ ../exim-4.84/src/mime.c 2014-11-12 02:36:21.000000000 +0200 +@@ -620,12 +620,18 @@ + else + param_value = string_cat(param_value, &size, &ptr, q++, 1); + } +- param_value[ptr++] = '\0'; +- param_value_len = ptr; +- +- param_value = rfc2047_decode(param_value, check_rfc2047_length, NULL, 32, ¶m_value_len, &q); +- debug_printf("Found %s MIME parameter in %s header, value is '%s'\n", mp->name, mime_header_list[i].name, param_value); +- *((uschar **)(mp->value)) = param_value; ++ if (param_value) ++ { ++ param_value[ptr++] = '\0'; ++ param_value_len = ptr; ++ ++ param_value = rfc2047_decode(param_value, ++ check_rfc2047_length, NULL, 32, ¶m_value_len, &q); ++ debug_printf("Found %s MIME parameter in %s header, " ++ "value is '%s'\n", mp->name, mime_header_list[i].name, ++ param_value); ++ } ++ *mp->value = param_value; + p += (mp->namelen + param_value_len + 1); + goto NEXT_PARAM_SEARCH; + } +diff -urN ../exim-4.84.orig/src/mime.h ../exim-4.84/src/mime.h +--- ../exim-4.84.orig/src/mime.h 2014-08-09 15:44:29.000000000 +0300 ++++ ../exim-4.84/src/mime.h 2014-11-12 02:36:13.000000000 +0200 +@@ -40,15 +40,15 @@ + + + typedef struct mime_parameter { +- uschar *name; +- int namelen; +- void *value; ++ uschar * name; ++ int namelen; ++ uschar ** value; + } mime_parameter; + + static mime_parameter mime_parameter_list[] = { +- { US"name=", 5, &mime_filename }, ++ { US"name=", 5, &mime_filename }, + { US"filename=", 9, &mime_filename }, +- { US"charset=", 8, &mime_charset }, ++ { US"charset=", 8, &mime_charset }, + { US"boundary=", 9, &mime_boundary } + }; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411131707.sADH76XG062196>