Index: head/mail/thunderbird/Makefile =================================================================== --- head/mail/thunderbird/Makefile (revision 474291) +++ head/mail/thunderbird/Makefile (revision 474292) @@ -1,90 +1,91 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= thunderbird DISTVERSION= 52.9.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.13.1:devel/nspr \ nss>=3.28.6:security/nss \ libevent>=2.0.21_2:devel/libevent \ harfbuzz>=1.4.1:print/harfbuzz \ graphite2>=1.3.8:graphics/graphite2 \ png>=1.6.25:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.17.0:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip # soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l SSP_UNSAFE= yes USE_GECKO= gecko USE_MOZILLA= -soundtouch USE_GL= gl USES= tar:xz MOZ_OPTIONS= --enable-application=mail --enable-official-branding MOZ_MK_OPTIONS= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_PKGCONFIG_FILES= PORTNAME_ICON= ${MOZILLA}.png PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS_DEFINE= LIGHTNING RUST OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA GTK3 LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" # Inconsistent fallback order (libcubeb vs. audio_device) SNDIO_PREVENTS= ${OPTIONS_MULTI_AUDIO:NSNDIO} .include MOZSRC:= ${WRKSRC}/mozilla .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar .else MOZ_OPTIONS+= --disable-calendar .endif post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mail/app/nsMailApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) port-pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME_ICON} .include Index: head/mail/thunderbird/files/patch-bug1473893 =================================================================== --- head/mail/thunderbird/files/patch-bug1473893 (nonexistent) +++ head/mail/thunderbird/files/patch-bug1473893 (revision 474292) @@ -0,0 +1,73 @@ +commit f883eeb39f24 +Author: Jorg K +Date: Mon Jul 9 00:09:58 2018 +0200 + + Bug 1473893 - Don't use parsed HTML MIME class if saving, processing attachments and in other cases. r=aceman a=jorgk + +--- + mailnews/db/gloda/test/unit/test_mime_attachments_size.js | 3 --- + mailnews/mime/src/mimei.cpp | 12 ++++++++++-- + 2 files changed, 10 insertions(+), 5 deletions(-) + +diff --git mailnews/db/gloda/test/unit/test_mime_attachments_size.js mailnews/db/gloda/test/unit/test_mime_attachments_size.js +index 7eff626979..389bebee42 100644 +--- mailnews/db/gloda/test/unit/test_mime_attachments_size.js ++++ mailnews/db/gloda/test/unit/test_mime_attachments_size.js +@@ -211,19 +211,16 @@ function check_attachments(aMimeMsg, eps + for (let att of aMimeMsg.allUserAttachments) { + dump("*** Attachment now is " + att.name + " " + att.size + "\n"); + do_check_true(Math.abs(att.size - originalTextByteCount) <= epsilon); + totalSize += att.size; + } + + // undefined means true + if (checkTotalSize !== false) { +- // Account for stuff added by libmime, incl. two CRLF or LF before and after. +- totalSize += "".length; +- totalSize += ("@mozilla.org/windows-registry-key;1" in Cc) ? 4 : 2; + dump("*** Total size comparison: " + totalSize + " vs " + aMimeMsg.size + "\n"); + do_check_true(Math.abs(aMimeMsg.size - totalSize) <= epsilon); + } + + async_driver(); + } + + function* test_message_attachments(info) { +diff --git mailnews/mime/src/mimei.cpp mailnews/mime/src/mimei.cpp +index 450eae584a..8290a83e63 100644 +--- mailnews/mime/src/mimei.cpp ++++ mailnews/mime/src/mimei.cpp +@@ -505,21 +505,29 @@ mime_find_class (const char *content_typ + clazz = (MimeObjectClass *)&mimeUntypedTextClass; + + /* Subtypes of text... + */ + else if (!PL_strncasecmp(content_type, "text/", 5)) + { + if (!PL_strcasecmp(content_type+5, "html")) + { +- if (opts +- && opts->format_out == nsMimeOutput::nsMimeMessageSaveAs) ++ if (opts && ++ (opts->format_out == nsMimeOutput::nsMimeMessageSaveAs || ++ opts->format_out == nsMimeOutput::nsMimeMessageFilterSniffer || ++ opts->format_out == nsMimeOutput::nsMimeMessageDecrypt || ++ opts->format_out == nsMimeOutput::nsMimeMessageAttach)) + // SaveAs in new modes doesn't work yet. + { +- clazz = (MimeObjectClass *)&mimeInlineTextHTMLParsedClass; ++ // Don't use the parsed HTML class if we're ... ++ // - saving the HTML of a message ++ // - getting message content for filtering ++ // - snarfing attachments (nsMimeMessageDecrypt used in SnarfMsgAttachment) ++ // - processing attachments (like deleting attachments). ++ clazz = (MimeObjectClass *)&mimeInlineTextHTMLClass; + types_of_classes_to_disallow = 0; + } + else if (html_as == 0 || html_as == 4) // Render sender's HTML + clazz = (MimeObjectClass *)&mimeInlineTextHTMLParsedClass; + else if (html_as == 1) // convert HTML to plaintext + // Do a HTML->TXT->HTML conversion, see mimethpl.h. + clazz = (MimeObjectClass *)&mimeInlineTextHTMLAsPlaintextClass; + else if (html_as == 2) // display HTML source + Property changes on: head/mail/thunderbird/files/patch-bug1473893 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/seamonkey/Makefile =================================================================== --- head/www/seamonkey/Makefile (revision 474291) +++ head/www/seamonkey/Makefile (revision 474292) @@ -1,91 +1,91 @@ # Created by: eivind/dima/jseger # $FreeBSD$ PORTNAME= seamonkey DISTVERSION= 2.49.4 -PORTREVISION= 9 +PORTREVISION= 10 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.13.1:devel/nspr \ nss>=3.28.6:security/nss \ libevent>=2.0.21_2:devel/libevent \ harfbuzz>=1.4.1:print/harfbuzz \ graphite2>=1.3.8:graphics/graphite2 \ png>=1.6.25:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.17.0:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip # soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l SSP_UNSAFE= yes USE_GECKO= gecko USE_GL= gl USES= tar:xz MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MOZ_OPTIONS+= --enable-application=suite USE_MOZILLA= -soundtouch MOZ_PKGCONFIG_FILES= OPTIONS_DEFINE= LDAP LIGHTNING RUST OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 OPTIONS_DEFAULT=CANBERRA GTK3 LDAP LIGHTNING LDAP_DESC?= LDAP support for Mailnews .include "${.CURDIR}/../../www/firefox/Makefile.options" # Inconsistent fallback order (libcubeb vs. audio_device) SNDIO_PREVENTS= ${OPTIONS_MULTI_AUDIO:NSNDIO} .include MOZSRC:= ${WRKSRC}/mozilla .if ! ${PORT_OPTIONS:MLDAP} MOZ_OPTIONS+= --disable-ldap .else MOZ_OPTIONS+= --enable-ldap .endif .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar .else MOZ_OPTIONS+= --disable-calendar .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/suite/app/nsSuiteApp.cpp @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/mozilla/modules/libpref/init/all.js @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/${MOZILLA}.desktop pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${LN} -sf ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png .include Index: head/www/seamonkey/files/patch-bug1473893 =================================================================== --- head/www/seamonkey/files/patch-bug1473893 (nonexistent) +++ head/www/seamonkey/files/patch-bug1473893 (revision 474292) @@ -0,0 +1,73 @@ +commit f883eeb39f24 +Author: Jorg K +Date: Mon Jul 9 00:09:58 2018 +0200 + + Bug 1473893 - Don't use parsed HTML MIME class if saving, processing attachments and in other cases. r=aceman a=jorgk + +--- + mailnews/db/gloda/test/unit/test_mime_attachments_size.js | 3 --- + mailnews/mime/src/mimei.cpp | 12 ++++++++++-- + 2 files changed, 10 insertions(+), 5 deletions(-) + +diff --git mailnews/db/gloda/test/unit/test_mime_attachments_size.js mailnews/db/gloda/test/unit/test_mime_attachments_size.js +index 7eff626979..389bebee42 100644 +--- mailnews/db/gloda/test/unit/test_mime_attachments_size.js ++++ mailnews/db/gloda/test/unit/test_mime_attachments_size.js +@@ -211,19 +211,16 @@ function check_attachments(aMimeMsg, eps + for (let att of aMimeMsg.allUserAttachments) { + dump("*** Attachment now is " + att.name + " " + att.size + "\n"); + do_check_true(Math.abs(att.size - originalTextByteCount) <= epsilon); + totalSize += att.size; + } + + // undefined means true + if (checkTotalSize !== false) { +- // Account for stuff added by libmime, incl. two CRLF or LF before and after. +- totalSize += "".length; +- totalSize += ("@mozilla.org/windows-registry-key;1" in Cc) ? 4 : 2; + dump("*** Total size comparison: " + totalSize + " vs " + aMimeMsg.size + "\n"); + do_check_true(Math.abs(aMimeMsg.size - totalSize) <= epsilon); + } + + async_driver(); + } + + function* test_message_attachments(info) { +diff --git mailnews/mime/src/mimei.cpp mailnews/mime/src/mimei.cpp +index 450eae584a..8290a83e63 100644 +--- mailnews/mime/src/mimei.cpp ++++ mailnews/mime/src/mimei.cpp +@@ -505,21 +505,29 @@ mime_find_class (const char *content_typ + clazz = (MimeObjectClass *)&mimeUntypedTextClass; + + /* Subtypes of text... + */ + else if (!PL_strncasecmp(content_type, "text/", 5)) + { + if (!PL_strcasecmp(content_type+5, "html")) + { +- if (opts +- && opts->format_out == nsMimeOutput::nsMimeMessageSaveAs) ++ if (opts && ++ (opts->format_out == nsMimeOutput::nsMimeMessageSaveAs || ++ opts->format_out == nsMimeOutput::nsMimeMessageFilterSniffer || ++ opts->format_out == nsMimeOutput::nsMimeMessageDecrypt || ++ opts->format_out == nsMimeOutput::nsMimeMessageAttach)) + // SaveAs in new modes doesn't work yet. + { +- clazz = (MimeObjectClass *)&mimeInlineTextHTMLParsedClass; ++ // Don't use the parsed HTML class if we're ... ++ // - saving the HTML of a message ++ // - getting message content for filtering ++ // - snarfing attachments (nsMimeMessageDecrypt used in SnarfMsgAttachment) ++ // - processing attachments (like deleting attachments). ++ clazz = (MimeObjectClass *)&mimeInlineTextHTMLClass; + types_of_classes_to_disallow = 0; + } + else if (html_as == 0 || html_as == 4) // Render sender's HTML + clazz = (MimeObjectClass *)&mimeInlineTextHTMLParsedClass; + else if (html_as == 1) // convert HTML to plaintext + // Do a HTML->TXT->HTML conversion, see mimethpl.h. + clazz = (MimeObjectClass *)&mimeInlineTextHTMLAsPlaintextClass; + else if (html_as == 2) // display HTML source + Property changes on: head/www/seamonkey/files/patch-bug1473893 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property