Index: head/www/mozilla-devel/Makefile =================================================================== --- head/www/mozilla-devel/Makefile (revision 118474) +++ head/www/mozilla-devel/Makefile (revision 118475) @@ -1,337 +1,337 @@ # New ports collection makefile for: mozilla # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # # $FreeBSD$ # PORTNAME?= mozilla PORTVERSION= 1.8.a3 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH?= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.a3/a3/}/src \ adamw/:local DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.a3/a3/}${EXTRACT_SUFX} \ libart_lgpl${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ nspr4.1:${PORTSDIR}/devel/nspr WRKSRC= ${WRKDIR}/${PORTNAME} MOZILLA?= mozilla-devel MOZ_SUFX?= -devel USE_GNOME= gtk20 libidl LATEST_LINK= ${MOZILLA} EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/*\ --exclude */package/* \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes USE_ICONV= yes USE_GMAKE= yes WANT_GNOME= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= \ --disable-auto-deps \ --enable-chrome-format=jar \ --disable-cpp-exceptions \ --disable-cpp-rtti \ --enable-crypto \ --disable-gtktest \ --disable-freetypetest \ --disable-installer \ --disable-glibtest \ --enable-double-buffer \ --enable-mathml \ --disable-md \ --disable-pedantic \ --disable-bidi \ --disable-plaintext-editor-only \ --enable-svg \ --enable-svg-renderer-libart \ --disable-tests \ --disable-xterm-updates \ --enable-xinerama \ --with-system-zlib \ --with-system-jpeg=${LOCALBASE} \ --with-system-mng=${LOCALBASE} \ --with-system-png=${LOCALBASE} \ --with-gssapi=/usr \ --with-pthreads PLIST= ${WRKDIR}/pkg-plist MOZ_EXTENSIONS= default CONFIGURE_ENV= MOZ_INTERNAL_LIBART_LGPL=1 \ LOCALBASE=${LOCALBASE} PKGINSTALL= ${WRKDIR}/pkg-install CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 ESD_LIB= libesd.so.2 FREETYPE_LIB= libfreetype.so.9 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ mozilla-nspr mozilla-nss mozilla-plugin # JPI stuff. List paths to Java Plug-ins here in the order to try. JPI_LIST?=\ ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \ ${LOCALBASE}/jdk1.4.1/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \ ${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \ ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so OPTIONS=XFT "Enable Xft font anti-aliasing" on \ CALENDAR "Enable the Calendar module" off \ MAILNEWS "Enable Mail and News modules" on \ COMPOSER "Enable the HTML Composer module" on \ DEBUG "Enable debugging (i.e. gdb) support" off \ LDAP "Enable LDAP support for Mailnews" on \ CHATZILLA "Enable the Chatzilla IRC module" on \ XMLTERM "Enable the XMLTerm module" on \ JAVASCRIPT_DEBUGGER "Enable the DTD and JavaScript debuggers" off \ OPTIMIZED_CFLAGS "Enable -O2 optimizations" off \ SMB "Enable smb:// URI support using gnomevfs" off .include .if ${ARCH} == "amd64" BROKEN= "Coredump during build on amd64" .endif .if ${ARCH} == "ia64" || ${ARCH} == "alpha" BROKEN= "Does not compile on ia64 or alpha" .endif .if !defined(WITHOUT_XFT) LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ARGS+=--enable-xft .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir) BROKEN= Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \ illegibly. Please remove the mozilla-fonts package. .endif .else CONFIGURE_ARGS+=--disable-xft .endif .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug \ --disable-strip .else CONFIGURE_ARGS+=--disable-debug \ --enable-strip .endif .if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \ defined(WITHOUT_COMPOSER)) BROKEN= "Calendar requires Composer and Mailnews support." .endif # LDAP is only used by mail and news so disable both together .if defined(WITHOUT_MAILNEWS) CONFIGURE_ARGS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) CONFIGURE_ARGS+= --disable-ldap --enable-mailnews .else CONFIGURE_ARGS+= --enable-ldap --enable-mailnews .endif .endif .if !defined(WITHOUT_CHATZILLA) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc .endif .if !defined(WITHOUT_XMLTERM) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},xmlterm .endif CONFIGURE_ARGS+= --enable-extensions=${MOZ_EXTENSIONS} .if defined(WITH_JAVASCRIPT_DEBUGGER) CONFIGURE_ARGS+= --enable-jsd \ --enable-dtd-debug .else CONFIGURE_ARGS+= --disable-jsd \ --disable-dtd-debug .endif .if defined(WITH_CALENDAR) CONFIGURE_ARGS+= --enable-calendar .endif .if defined(WITHOUT_COMPOSER) CONFIGURE_ARGS+= --disable-composer .endif MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \ MOZ_INTERNAL_LIBART_LGPL=1 ALL_TARGET= default .if ${ARCH} == "i386" CONFIGURE_ARGS+= --enable-reorder .endif .if ${OSVERSION} < 500035 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp .endif .if defined(WITH_SMB) USE_GNOME+= gnomevfs2 .else CONFIGURE_ARGS+=--disable-gnomevfs .endif .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 CONFIGURE_ARGS+= --enable-optimize=-O2 .endif .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= "core dumps on alpha during post-build" .endif .if exists(${LOCALBASE}/include/freetype/freetype.h) BROKEN="You must upgrade your freetype port to 1.3.1_2 or higher before installing Mozilla. If you have 1.3.1_2 installed, please remove ${LOCALBASE}/include/freetype, then build Mozilla" .endif pre-everything:: .if defined(WITH_CALENDAR) @${ECHO_MSG} "" @${ECHO_MSG} "Calendar is still beta software." @${ECHO_MSG} "Use at your own risk." @${ECHO_MSG} "http://mozilla.org/projects/calendar/" @${ECHO_MSG} "" .endif post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ -e 's|%%HEADERS_SUFX%%|${MOZ_SUFX}|g' \ ${WRKSRC}/config/autoconf.mk.in @${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \ ${REINPLACE_CMD} 's|||g' @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/nsprpub/configure @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/configure \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @${REINPLACE_CMD} -e 's|libesd\.so\.0|${ESD_LIB}|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/modules/libpref/src/init/all.js @${REINPLACE_CMD} -e 's||\"${LOCALBASE}/include/iconv.h\"|g' \ ${WRKSRC}/configure \ ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp @${REINPLACE_CMD} -e 's|libfreetype.so.6|${FREETYPE_LIB}|g' \ ${WRKSRC}/modules/libpref/src/init/all.js @for pcfile in ${PKGCONFIG_FILES}; do \ ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \ s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \ ${WRKSRC}/build/unix/$${pcfile}.pc.in; \ done @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} pre-configure: @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ ${FALSE}; \ fi post-build: ${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \ ${FILESDIR}/mozilla.sh >${WRKSRC}/${MOZILLA} ${FIND} ${WRKSRC}/dist/bin -type d | ${SORT} -r | \ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE} pre-install: ${RM} -f ${PLIST} ${TOUCH} -f ${PLIST} if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${ECHO_CMD} bin/mozilla >> ${PLIST} ; \ fi ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ break; \ fi; \ done; \ ${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \ fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \ done cd ${WRKSRC}/dist/include && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:include/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} cd ${WRKSRC}/dist/bin && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} ${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ fi if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ break; \ fi; \ done; \ fi for pcfile in ${PKGCONFIG_FILES}; do \ ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \ done -${RM} -fr ${PREFIX}/include/${MOZILLA} ${MKDIR} ${PREFIX}/include/${MOZILLA} ${CHMOD} 755 ${PREFIX}/include/${MOZILLA} cd ${WRKSRC}/dist/include && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/www/mozilla-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.195 \ No newline at end of property +1.196 \ No newline at end of property Index: head/www/mozilla-devel/files/patch-250862 =================================================================== --- head/www/mozilla-devel/files/patch-250862 (nonexistent) +++ head/www/mozilla-devel/files/patch-250862 (revision 118475) @@ -0,0 +1,22 @@ +Index: mozilla/xpfe/communicator/resources/content/contentAreaDD.js +=================================================================== +RCS file: /cvsroot/mozilla/xpfe/communicator/resources/content/contentAreaDD.js,v +retrieving revision 1.32 +retrieving revision 1.32.88.1 +diff -u -r1.32 -r1.32.88.1 +--- xpfe/communicator/resources/content/contentAreaDD.js 10 Jul 2002 01:23:50 -0000 1.32 ++++ xpfe/communicator/resources/content/contentAreaDD.js 27 Aug 2004 01:13:39 -0000 1.32.88.1 +@@ -53,8 +53,11 @@ + { + var url = transferUtils.retrieveURLFromData(aXferData.data, aXferData.flavour.contentType); + +- // valid urls don't contain spaces ' '; if we have a space it isn't a valid url so bail out +- if (!url || !url.length || url.indexOf(" ", 0) != -1) ++ // valid urls don't contain spaces ' '; if we have a space it ++ // isn't a valid url, or if it's a javascript: or data: url, ++ // bail out ++ if (!url || !url.length || url.indexOf(" ", 0) != -1 || ++ /^\s*(javascript|data):/.test(url)) + return; + + switch (document.firstChild.getAttribute('windowtype')) { Property changes on: head/www/mozilla-devel/files/patch-250862 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/mozilla-devel/files/patch-255067 =================================================================== --- head/www/mozilla-devel/files/patch-255067 (nonexistent) +++ head/www/mozilla-devel/files/patch-255067 (revision 118475) @@ -0,0 +1,60 @@ +Index: mozilla/gfx/src/shared/gfxImageFrame.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/shared/gfxImageFrame.cpp,v +retrieving revision 1.26 +retrieving revision 1.26.12.1 +diff -u -r1.26 -r1.26.12.1 +--- gfx/src/shared/gfxImageFrame.cpp 16 Jan 2004 23:28:48 -0000 1.26 ++++ gfx/src/shared/gfxImageFrame.cpp 27 Aug 2004 11:02:58 -0000 1.26.12.1 +@@ -72,6 +72,13 @@ + return NS_ERROR_FAILURE; + } + ++ /* reject over-wide or over-tall images */ ++ const PRInt32 k64KLimit = 0x0000FFFF; ++ if ( aWidth > k64KLimit || aHeight > k64KLimit ){ ++ NS_ERROR("image too big"); ++ return NS_ERROR_FAILURE; ++ } ++ + nsresult rv; + + mOffset.MoveTo(aX, aY); +Index: mozilla/gfx/src/windows/nsImageWin.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/windows/nsImageWin.cpp,v +retrieving revision 3.130.2.1 +retrieving revision 3.130.2.1.6.1 +diff -u -r3.130.2.1 -r3.130.2.1.6.1 +--- gfx/src/windows/nsImageWin.cpp 11 May 2004 21:53:49 -0000 3.130.2.1 ++++ gfx/src/windows/nsImageWin.cpp 27 Aug 2004 11:02:58 -0000 3.130.2.1.6.1 +@@ -131,6 +131,10 @@ + return NS_ERROR_UNEXPECTED; + } + ++ // limit images to 64k pixels on a side (~55 feet on a 100dpi monitor) ++ const PRInt32 k64KLimit = 0x0000FFFF; ++ if (aWidth > k64KLimit || aHeight > k64KLimit) ++ return NS_ERROR_FAILURE; + + if (mNumPaletteColors >= 0){ + // If we have a palette +Index: mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp +=================================================================== +RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp,v +retrieving revision 1.24.2.1 +retrieving revision 1.24.2.1.6.1 +diff -u -r1.24.2.1 -r1.24.2.1.6.1 +--- modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp 13 May 2004 22:27:35 -0000 1.24.2.1 ++++ modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp 27 Aug 2004 11:02:58 -0000 1.24.2.1.6.1 +@@ -274,7 +274,9 @@ + CalcBitShift(); + } + // BMPs with negative width are invalid +- if (mBIH.width < 0) ++ // Reject extremely wide images to keep the math sane ++ const PRInt32 k64KWidth = 0x0000FFFF; ++ if (mBIH.width < 0 || mBIH.width > k64KWidth) + return NS_ERROR_FAILURE; + + PRUint32 real_height = (mBIH.height > 0) ? mBIH.height : -mBIH.height; Property changes on: head/www/mozilla-devel/files/patch-255067 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/mozilla-devel/files/patch-256316 =================================================================== --- head/www/mozilla-devel/files/patch-256316 (nonexistent) +++ head/www/mozilla-devel/files/patch-256316 (revision 118475) @@ -0,0 +1,18 @@ +Index: mozilla/netwerk/dns/src/nsIDNService.cpp +=================================================================== +RCS file: /cvsroot/mozilla/netwerk/dns/src/nsIDNService.cpp,v +retrieving revision 1.18 +retrieving revision 1.18.10.1 +diff -u -r1.18 -r1.18.10.1 +--- netwerk/dns/src/nsIDNService.cpp 3 Apr 2004 07:32:18 -0000 1.18 ++++ netwerk/dns/src/nsIDNService.cpp 27 Aug 2004 11:23:21 -0000 1.18.10.1 +@@ -242,6 +242,9 @@ + + NS_IMETHODIMP nsIDNService::Normalize(const nsACString & input, nsACString & output) + { ++ // protect against bogus input ++ NS_ENSURE_TRUE(IsUTF8(input), NS_ERROR_UNEXPECTED); ++ + nsAutoString outUTF16; + nsresult rv = stringPrep(NS_ConvertUTF8toUTF16(input), outUTF16); + if (NS_SUCCEEDED(rv)) Property changes on: head/www/mozilla-devel/files/patch-256316 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/mozilla-devel/files/patch-257314 =================================================================== --- head/www/mozilla-devel/files/patch-257314 (nonexistent) +++ head/www/mozilla-devel/files/patch-257314 (revision 118475) @@ -0,0 +1,31 @@ +Index: nsVCardObj.cpp +=================================================================== +RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsVCardObj.cpp,v +retrieving revision 1.2 +retrieving revision 1.2.24.1 +diff -u -r1.2 -r1.2.24.1 +--- mailnews/addrbook/src/nsVCardObj.cpp 14 Sep 2003 21:45:58 -0000 1.2 ++++ mailnews/addrbook/src/nsVCardObj.cpp 31 Aug 2004 07:44:25 -0000 1.2.24.1 +@@ -1344,16 +1344,13 @@ + + static void writeGroup(OFile *fp, VObject *o) + { +- char buf1[256]; +- char buf2[256]; +- PL_strcpy(buf1,NAME_OF(o)); +- while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { +- PL_strcpy(buf2,STRINGZ_VALUE_OF(o)); +- PL_strcat(buf2,"."); +- PL_strcat(buf2,buf1); +- PL_strcpy(buf1,buf2); ++ nsCAutoString buf(NAME_OF(o)); ++ ++ while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { ++ buf.Insert(NS_LITERAL_CSTRING("."), 0); ++ buf.Insert(STRINGZ_VALUE_OF(o), 0); + } +- appendsOFile(fp,buf1); ++ appendsOFile(fp, buf.get()); + } + + static int inList(const char **list, const char *s) Property changes on: head/www/mozilla-devel/files/patch-257314 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/mozilla-devel/files/patch-258005 =================================================================== --- head/www/mozilla-devel/files/patch-258005 (nonexistent) +++ head/www/mozilla-devel/files/patch-258005 (revision 118475) @@ -0,0 +1,278 @@ +Index: nsMsgCompUtils.cpp +=================================================================== +RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp,v +retrieving revision 1.161 +retrieving revision 1.161.10.1 +diff -u -r1.161 -r1.161.10.1 +--- mailnews/compose/src/nsMsgCompUtils.cpp 12 Mar 2004 07:23:38 -0000 1.161 ++++ mailnews/compose/src/nsMsgCompUtils.cpp 8 Sep 2004 19:27:53 -0000 1.161.10.1 +@@ -821,16 +821,7 @@ + nsresult rv; + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); + +- PRInt32 buffer_size = 2048 + (real_name ? 2*PL_strlen(real_name) : 0) + (base_url ? 2*PL_strlen(base_url) : 0) + +- (type_param ? PL_strlen(type_param) : 0) + (encoding ? PL_strlen(encoding) : 0) + +- (description ? PL_strlen(description) : 0) + (x_mac_type ? PL_strlen(x_mac_type) : 0) + +- (x_mac_creator ? PL_strlen(x_mac_creator) : 0) + (attachmentCharset ? PL_strlen(attachmentCharset) : 0) + +- (bodyCharset ? PL_strlen(bodyCharset) : 0) + (content_id ? PL_strlen(content_id) : 0); +- char *buffer = (char *) PR_Malloc (buffer_size); +- char *buffer_tail = buffer; +- +- if (! buffer) +- return 0; /* NS_ERROR_OUT_OF_MEMORY */ ++ nsCString buf(""); + + NS_ASSERTION (encoding, "null encoding"); + +@@ -874,14 +865,13 @@ + } + } + +- PUSH_STRING ("Content-Type: "); +- PUSH_STRING (type); +- ++ buf.Append("Content-Type: "); ++ buf.Append(type); + if (type_param && *type_param) + { + if (*type_param != ';') +- PUSH_STRING("; "); +- PUSH_STRING(type_param); ++ buf.Append("; "); ++ buf.Append(type_param); + } + + if (mime_type_needs_charset (type)) +@@ -918,8 +908,8 @@ + (PL_strcasecmp(encoding, ENCODING_BASE64) != 0)) && + (*charset_label)) + { +- PUSH_STRING ("; charset="); +- PUSH_STRING (charset_label); ++ buf.Append("; charset="); ++ buf.Append(charset_label); + } + } + +@@ -930,7 +920,7 @@ + if(type && !PL_strcasecmp(type, "text/plain")) + { + if(UseFormatFlowed(bodyCharset)) +- PUSH_STRING ("; format=flowed"); ++ buf.Append("; format=flowed"); + // else + // { + // Don't add a markup. Could use +@@ -942,59 +932,59 @@ + } + + if (x_mac_type && *x_mac_type) { +- PUSH_STRING ("; x-mac-type=\""); +- PUSH_STRING (x_mac_type); +- PUSH_STRING ("\""); ++ buf.Append("; x-mac-type=\""); ++ buf.Append(x_mac_type); ++ buf.Append("\""); + } + + if (x_mac_creator && *x_mac_creator) { +- PUSH_STRING ("; x-mac-creator=\""); +- PUSH_STRING (x_mac_creator); +- PUSH_STRING ("\""); ++ buf.Append("; x-mac-creator=\""); ++ buf.Append(x_mac_creator); ++ buf.Append("\""); + } + + #ifdef EMIT_NAME_IN_CONTENT_TYPE + if (encodedRealName && *encodedRealName) { + if (parmFolding == 0 || parmFolding == 1) { +- PUSH_STRING (";\r\n name=\""); +- PUSH_STRING (encodedRealName); +- PUSH_STRING ("\""); ++ buf.Append(";\r\n name=\""); ++ buf.Append(encodedRealName); ++ buf.Append("\""); + } + else // if (parmFolding == 2) + { + char *rfc2231Parm = RFC2231ParmFolding("name", charset.get(), + nsMsgI18NGetAcceptLanguage(), encodedRealName); + if (rfc2231Parm) { +- PUSH_STRING(";\r\n "); +- PUSH_STRING(rfc2231Parm); ++ buf.Append(";\r\n "); ++ buf.Append(rfc2231Parm); + PR_Free(rfc2231Parm); + } + } + } + #endif /* EMIT_NAME_IN_CONTENT_TYPE */ ++ buf.Append(CRLF); + +- PUSH_NEWLINE (); ++ buf.Append("Content-Transfer-Encoding: "); ++ buf.Append(encoding); + +- PUSH_STRING ("Content-Transfer-Encoding: "); +- PUSH_STRING (encoding); +- PUSH_NEWLINE (); ++ buf.Append(CRLF); + + if (description && *description) { + char *s = mime_fix_header (description); + if (s) { +- PUSH_STRING ("Content-Description: "); +- PUSH_STRING (s); +- PUSH_NEWLINE (); ++ buf.Append("Content-Description: "); ++ buf.Append(s); ++ buf.Append(CRLF); + PR_Free(s); + } + } + + if ( (content_id) && (*content_id) ) + { +- PUSH_STRING ("Content-ID: <"); +- PUSH_STRING (content_id); +- PUSH_STRING (">"); +- PUSH_NEWLINE (); ++ buf.Append("Content-ID: <"); ++ buf.Append(content_id); ++ buf.Append(">"); ++ buf.Append(CRLF); + } + + if (encodedRealName && *encodedRealName) { +@@ -1004,15 +994,15 @@ + rv = prefs->GetIntPref("mail.content_disposition_type", &pref_content_disposition); + NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get mail.content_disposition_type"); + +- PUSH_STRING ("Content-Disposition: "); ++ buf.Append("Content-Disposition: "); + + if (pref_content_disposition == 1) +- PUSH_STRING ("attachment"); ++ buf.Append("attachment"); + else + if (pref_content_disposition == 2 && + (!PL_strcasecmp(type, TEXT_PLAIN) || + (period && !PL_strcasecmp(period, ".txt")))) +- PUSH_STRING("attachment"); ++ buf.Append("attachment"); + + /* If this document is an anonymous binary file or a vcard, + then always show it as an attachment, never inline. */ +@@ -1020,23 +1010,23 @@ + if (!PL_strcasecmp(type, APPLICATION_OCTET_STREAM) || + !PL_strcasecmp(type, TEXT_VCARD) || + !PL_strcasecmp(type, APPLICATION_DIRECTORY)) /* text/x-vcard synonym */ +- PUSH_STRING ("attachment"); ++ buf.Append("attachment"); + else +- PUSH_STRING ("inline"); ++ buf.Append("inline"); + + if (parmFolding == 0 || parmFolding == 1) { +- PUSH_STRING (";\r\n filename=\""); +- PUSH_STRING (encodedRealName); +- PUSH_STRING ("\"" CRLF); ++ buf.Append(";\r\n filename=\""); ++ buf.Append(encodedRealName); ++ buf.Append("\"" CRLF); + } + else // if (parmFolding == 2) + { + char *rfc2231Parm = RFC2231ParmFolding("filename", charset.get(), + nsMsgI18NGetAcceptLanguage(), encodedRealName); + if (rfc2231Parm) { +- PUSH_STRING(";\r\n "); +- PUSH_STRING(rfc2231Parm); +- PUSH_NEWLINE (); ++ buf.Append(";\r\n "); ++ buf.Append(rfc2231Parm); ++ buf.Append(CRLF); + PR_Free(rfc2231Parm); + } + } +@@ -1045,7 +1035,7 @@ + if (type && + (!PL_strcasecmp (type, MESSAGE_RFC822) || + !PL_strcasecmp (type, MESSAGE_NEWS))) +- PUSH_STRING ("Content-Disposition: inline" CRLF); ++ buf.Append("Content-Disposition: inline" CRLF); + + #ifdef GENERATE_CONTENT_BASE + /* If this is an HTML document, and we know the URL it originally +@@ -1079,9 +1069,9 @@ + prefs->GetBoolPref("mail.use_content_location_on_send", &useContentLocation); + + if (useContentLocation) +- PUSH_STRING ("Content-Location: \""); ++ buf.Append("Content-Location: \""); + else +- PUSH_STRING ("Content-Base: \""); ++ buf.Append("Content-Base: \""); + /* rhp - Pref for Content-Location usage */ + + /* rhp: this is to work with the Content-Location stuff */ +@@ -1089,34 +1079,34 @@ + + while (*s != 0 && *s != '#') + { +- const char *ot = buffer_tail; +- ++ PRUint32 ot=buf.Length(); ++ char tmp[]="\x00\x00"; + /* URLs must be wrapped at 40 characters or less. */ + if (col >= 38) { +- PUSH_STRING(CRLF "\t"); ++ buf.Append(CRLF "\t"); + col = 0; + } + + if (*s == ' ') +- PUSH_STRING("%20"); ++ buf.Append("%20"); + else if (*s == '\t') +- PUSH_STRING("%09"); ++ buf.Append("%09"); + else if (*s == '\n') +- PUSH_STRING("%0A"); ++ buf.Append("%0A"); + else if (*s == '\r') +- PUSH_STRING("%0D"); ++ buf.Append("%0D"); + else { +- *buffer_tail++ = *s; +- *buffer_tail = '\0'; ++ tmp[0]=*s; ++ buf.Append(tmp); + } + s++; +- col += (buffer_tail - ot); ++ col += (buf.Length() - ot); + } +- PUSH_STRING ("\"" CRLF); ++ buf.Append("\"" CRLF); + + /* rhp: this is to try to get around this fun problem with Content-Location */ + if (!useContentLocation) { +- PUSH_STRING ("Content-Location: \""); ++ buf.Append("Content-Location: \""); + s = base_url; + col = 0; + useContentLocation = PR_TRUE; +@@ -1130,10 +1120,9 @@ + #endif /* GENERATE_CONTENT_BASE */ + + /* realloc it smaller... */ +- buffer = (char*) PR_REALLOC (buffer, buffer_tail - buffer + 1); + + PR_FREEIF(encodedRealName); +- return buffer; ++ return PL_strdup(buf.get()); + } + + static PRBool isValidHost( const char* host ) Property changes on: head/www/mozilla-devel/files/patch-258005 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/seamonkey/Makefile =================================================================== --- head/www/seamonkey/Makefile (revision 118474) +++ head/www/seamonkey/Makefile (revision 118475) @@ -1,337 +1,337 @@ # New ports collection makefile for: mozilla # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # # $FreeBSD$ # PORTNAME?= mozilla PORTVERSION= 1.8.a3 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH?= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.a3/a3/}/src \ adamw/:local DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.a3/a3/}${EXTRACT_SUFX} \ libart_lgpl${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ nspr4.1:${PORTSDIR}/devel/nspr WRKSRC= ${WRKDIR}/${PORTNAME} MOZILLA?= mozilla-devel MOZ_SUFX?= -devel USE_GNOME= gtk20 libidl LATEST_LINK= ${MOZILLA} EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/*\ --exclude */package/* \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes USE_ICONV= yes USE_GMAKE= yes WANT_GNOME= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= \ --disable-auto-deps \ --enable-chrome-format=jar \ --disable-cpp-exceptions \ --disable-cpp-rtti \ --enable-crypto \ --disable-gtktest \ --disable-freetypetest \ --disable-installer \ --disable-glibtest \ --enable-double-buffer \ --enable-mathml \ --disable-md \ --disable-pedantic \ --disable-bidi \ --disable-plaintext-editor-only \ --enable-svg \ --enable-svg-renderer-libart \ --disable-tests \ --disable-xterm-updates \ --enable-xinerama \ --with-system-zlib \ --with-system-jpeg=${LOCALBASE} \ --with-system-mng=${LOCALBASE} \ --with-system-png=${LOCALBASE} \ --with-gssapi=/usr \ --with-pthreads PLIST= ${WRKDIR}/pkg-plist MOZ_EXTENSIONS= default CONFIGURE_ENV= MOZ_INTERNAL_LIBART_LGPL=1 \ LOCALBASE=${LOCALBASE} PKGINSTALL= ${WRKDIR}/pkg-install CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 ESD_LIB= libesd.so.2 FREETYPE_LIB= libfreetype.so.9 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ mozilla-nspr mozilla-nss mozilla-plugin # JPI stuff. List paths to Java Plug-ins here in the order to try. JPI_LIST?=\ ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \ ${LOCALBASE}/jdk1.4.1/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \ ${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \ ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so OPTIONS=XFT "Enable Xft font anti-aliasing" on \ CALENDAR "Enable the Calendar module" off \ MAILNEWS "Enable Mail and News modules" on \ COMPOSER "Enable the HTML Composer module" on \ DEBUG "Enable debugging (i.e. gdb) support" off \ LDAP "Enable LDAP support for Mailnews" on \ CHATZILLA "Enable the Chatzilla IRC module" on \ XMLTERM "Enable the XMLTerm module" on \ JAVASCRIPT_DEBUGGER "Enable the DTD and JavaScript debuggers" off \ OPTIMIZED_CFLAGS "Enable -O2 optimizations" off \ SMB "Enable smb:// URI support using gnomevfs" off .include .if ${ARCH} == "amd64" BROKEN= "Coredump during build on amd64" .endif .if ${ARCH} == "ia64" || ${ARCH} == "alpha" BROKEN= "Does not compile on ia64 or alpha" .endif .if !defined(WITHOUT_XFT) LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ARGS+=--enable-xft .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir) BROKEN= Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \ illegibly. Please remove the mozilla-fonts package. .endif .else CONFIGURE_ARGS+=--disable-xft .endif .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug \ --disable-strip .else CONFIGURE_ARGS+=--disable-debug \ --enable-strip .endif .if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \ defined(WITHOUT_COMPOSER)) BROKEN= "Calendar requires Composer and Mailnews support." .endif # LDAP is only used by mail and news so disable both together .if defined(WITHOUT_MAILNEWS) CONFIGURE_ARGS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) CONFIGURE_ARGS+= --disable-ldap --enable-mailnews .else CONFIGURE_ARGS+= --enable-ldap --enable-mailnews .endif .endif .if !defined(WITHOUT_CHATZILLA) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc .endif .if !defined(WITHOUT_XMLTERM) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},xmlterm .endif CONFIGURE_ARGS+= --enable-extensions=${MOZ_EXTENSIONS} .if defined(WITH_JAVASCRIPT_DEBUGGER) CONFIGURE_ARGS+= --enable-jsd \ --enable-dtd-debug .else CONFIGURE_ARGS+= --disable-jsd \ --disable-dtd-debug .endif .if defined(WITH_CALENDAR) CONFIGURE_ARGS+= --enable-calendar .endif .if defined(WITHOUT_COMPOSER) CONFIGURE_ARGS+= --disable-composer .endif MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \ MOZ_INTERNAL_LIBART_LGPL=1 ALL_TARGET= default .if ${ARCH} == "i386" CONFIGURE_ARGS+= --enable-reorder .endif .if ${OSVERSION} < 500035 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp .endif .if defined(WITH_SMB) USE_GNOME+= gnomevfs2 .else CONFIGURE_ARGS+=--disable-gnomevfs .endif .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 CONFIGURE_ARGS+= --enable-optimize=-O2 .endif .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= "core dumps on alpha during post-build" .endif .if exists(${LOCALBASE}/include/freetype/freetype.h) BROKEN="You must upgrade your freetype port to 1.3.1_2 or higher before installing Mozilla. If you have 1.3.1_2 installed, please remove ${LOCALBASE}/include/freetype, then build Mozilla" .endif pre-everything:: .if defined(WITH_CALENDAR) @${ECHO_MSG} "" @${ECHO_MSG} "Calendar is still beta software." @${ECHO_MSG} "Use at your own risk." @${ECHO_MSG} "http://mozilla.org/projects/calendar/" @${ECHO_MSG} "" .endif post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ -e 's|%%HEADERS_SUFX%%|${MOZ_SUFX}|g' \ ${WRKSRC}/config/autoconf.mk.in @${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \ ${REINPLACE_CMD} 's|||g' @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/nsprpub/configure @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/configure \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @${REINPLACE_CMD} -e 's|libesd\.so\.0|${ESD_LIB}|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/modules/libpref/src/init/all.js @${REINPLACE_CMD} -e 's||\"${LOCALBASE}/include/iconv.h\"|g' \ ${WRKSRC}/configure \ ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp @${REINPLACE_CMD} -e 's|libfreetype.so.6|${FREETYPE_LIB}|g' \ ${WRKSRC}/modules/libpref/src/init/all.js @for pcfile in ${PKGCONFIG_FILES}; do \ ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \ s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \ ${WRKSRC}/build/unix/$${pcfile}.pc.in; \ done @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} pre-configure: @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ ${FALSE}; \ fi post-build: ${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \ ${FILESDIR}/mozilla.sh >${WRKSRC}/${MOZILLA} ${FIND} ${WRKSRC}/dist/bin -type d | ${SORT} -r | \ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE} pre-install: ${RM} -f ${PLIST} ${TOUCH} -f ${PLIST} if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${ECHO_CMD} bin/mozilla >> ${PLIST} ; \ fi ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ break; \ fi; \ done; \ ${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \ fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \ done cd ${WRKSRC}/dist/include && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:include/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} cd ${WRKSRC}/dist/bin && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} ${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ fi if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ break; \ fi; \ done; \ fi for pcfile in ${PKGCONFIG_FILES}; do \ ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \ done -${RM} -fr ${PREFIX}/include/${MOZILLA} ${MKDIR} ${PREFIX}/include/${MOZILLA} ${CHMOD} 755 ${PREFIX}/include/${MOZILLA} cd ${WRKSRC}/dist/include && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/www/seamonkey/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.195 \ No newline at end of property +1.196 \ No newline at end of property Index: head/www/seamonkey/files/patch-250862 =================================================================== --- head/www/seamonkey/files/patch-250862 (nonexistent) +++ head/www/seamonkey/files/patch-250862 (revision 118475) @@ -0,0 +1,22 @@ +Index: mozilla/xpfe/communicator/resources/content/contentAreaDD.js +=================================================================== +RCS file: /cvsroot/mozilla/xpfe/communicator/resources/content/contentAreaDD.js,v +retrieving revision 1.32 +retrieving revision 1.32.88.1 +diff -u -r1.32 -r1.32.88.1 +--- xpfe/communicator/resources/content/contentAreaDD.js 10 Jul 2002 01:23:50 -0000 1.32 ++++ xpfe/communicator/resources/content/contentAreaDD.js 27 Aug 2004 01:13:39 -0000 1.32.88.1 +@@ -53,8 +53,11 @@ + { + var url = transferUtils.retrieveURLFromData(aXferData.data, aXferData.flavour.contentType); + +- // valid urls don't contain spaces ' '; if we have a space it isn't a valid url so bail out +- if (!url || !url.length || url.indexOf(" ", 0) != -1) ++ // valid urls don't contain spaces ' '; if we have a space it ++ // isn't a valid url, or if it's a javascript: or data: url, ++ // bail out ++ if (!url || !url.length || url.indexOf(" ", 0) != -1 || ++ /^\s*(javascript|data):/.test(url)) + return; + + switch (document.firstChild.getAttribute('windowtype')) { Property changes on: head/www/seamonkey/files/patch-250862 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/seamonkey/files/patch-255067 =================================================================== --- head/www/seamonkey/files/patch-255067 (nonexistent) +++ head/www/seamonkey/files/patch-255067 (revision 118475) @@ -0,0 +1,60 @@ +Index: mozilla/gfx/src/shared/gfxImageFrame.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/shared/gfxImageFrame.cpp,v +retrieving revision 1.26 +retrieving revision 1.26.12.1 +diff -u -r1.26 -r1.26.12.1 +--- gfx/src/shared/gfxImageFrame.cpp 16 Jan 2004 23:28:48 -0000 1.26 ++++ gfx/src/shared/gfxImageFrame.cpp 27 Aug 2004 11:02:58 -0000 1.26.12.1 +@@ -72,6 +72,13 @@ + return NS_ERROR_FAILURE; + } + ++ /* reject over-wide or over-tall images */ ++ const PRInt32 k64KLimit = 0x0000FFFF; ++ if ( aWidth > k64KLimit || aHeight > k64KLimit ){ ++ NS_ERROR("image too big"); ++ return NS_ERROR_FAILURE; ++ } ++ + nsresult rv; + + mOffset.MoveTo(aX, aY); +Index: mozilla/gfx/src/windows/nsImageWin.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/windows/nsImageWin.cpp,v +retrieving revision 3.130.2.1 +retrieving revision 3.130.2.1.6.1 +diff -u -r3.130.2.1 -r3.130.2.1.6.1 +--- gfx/src/windows/nsImageWin.cpp 11 May 2004 21:53:49 -0000 3.130.2.1 ++++ gfx/src/windows/nsImageWin.cpp 27 Aug 2004 11:02:58 -0000 3.130.2.1.6.1 +@@ -131,6 +131,10 @@ + return NS_ERROR_UNEXPECTED; + } + ++ // limit images to 64k pixels on a side (~55 feet on a 100dpi monitor) ++ const PRInt32 k64KLimit = 0x0000FFFF; ++ if (aWidth > k64KLimit || aHeight > k64KLimit) ++ return NS_ERROR_FAILURE; + + if (mNumPaletteColors >= 0){ + // If we have a palette +Index: mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp +=================================================================== +RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp,v +retrieving revision 1.24.2.1 +retrieving revision 1.24.2.1.6.1 +diff -u -r1.24.2.1 -r1.24.2.1.6.1 +--- modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp 13 May 2004 22:27:35 -0000 1.24.2.1 ++++ modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp 27 Aug 2004 11:02:58 -0000 1.24.2.1.6.1 +@@ -274,7 +274,9 @@ + CalcBitShift(); + } + // BMPs with negative width are invalid +- if (mBIH.width < 0) ++ // Reject extremely wide images to keep the math sane ++ const PRInt32 k64KWidth = 0x0000FFFF; ++ if (mBIH.width < 0 || mBIH.width > k64KWidth) + return NS_ERROR_FAILURE; + + PRUint32 real_height = (mBIH.height > 0) ? mBIH.height : -mBIH.height; Property changes on: head/www/seamonkey/files/patch-255067 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/seamonkey/files/patch-256316 =================================================================== --- head/www/seamonkey/files/patch-256316 (nonexistent) +++ head/www/seamonkey/files/patch-256316 (revision 118475) @@ -0,0 +1,18 @@ +Index: mozilla/netwerk/dns/src/nsIDNService.cpp +=================================================================== +RCS file: /cvsroot/mozilla/netwerk/dns/src/nsIDNService.cpp,v +retrieving revision 1.18 +retrieving revision 1.18.10.1 +diff -u -r1.18 -r1.18.10.1 +--- netwerk/dns/src/nsIDNService.cpp 3 Apr 2004 07:32:18 -0000 1.18 ++++ netwerk/dns/src/nsIDNService.cpp 27 Aug 2004 11:23:21 -0000 1.18.10.1 +@@ -242,6 +242,9 @@ + + NS_IMETHODIMP nsIDNService::Normalize(const nsACString & input, nsACString & output) + { ++ // protect against bogus input ++ NS_ENSURE_TRUE(IsUTF8(input), NS_ERROR_UNEXPECTED); ++ + nsAutoString outUTF16; + nsresult rv = stringPrep(NS_ConvertUTF8toUTF16(input), outUTF16); + if (NS_SUCCEEDED(rv)) Property changes on: head/www/seamonkey/files/patch-256316 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/seamonkey/files/patch-257314 =================================================================== --- head/www/seamonkey/files/patch-257314 (nonexistent) +++ head/www/seamonkey/files/patch-257314 (revision 118475) @@ -0,0 +1,31 @@ +Index: nsVCardObj.cpp +=================================================================== +RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsVCardObj.cpp,v +retrieving revision 1.2 +retrieving revision 1.2.24.1 +diff -u -r1.2 -r1.2.24.1 +--- mailnews/addrbook/src/nsVCardObj.cpp 14 Sep 2003 21:45:58 -0000 1.2 ++++ mailnews/addrbook/src/nsVCardObj.cpp 31 Aug 2004 07:44:25 -0000 1.2.24.1 +@@ -1344,16 +1344,13 @@ + + static void writeGroup(OFile *fp, VObject *o) + { +- char buf1[256]; +- char buf2[256]; +- PL_strcpy(buf1,NAME_OF(o)); +- while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { +- PL_strcpy(buf2,STRINGZ_VALUE_OF(o)); +- PL_strcat(buf2,"."); +- PL_strcat(buf2,buf1); +- PL_strcpy(buf1,buf2); ++ nsCAutoString buf(NAME_OF(o)); ++ ++ while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { ++ buf.Insert(NS_LITERAL_CSTRING("."), 0); ++ buf.Insert(STRINGZ_VALUE_OF(o), 0); + } +- appendsOFile(fp,buf1); ++ appendsOFile(fp, buf.get()); + } + + static int inList(const char **list, const char *s) Property changes on: head/www/seamonkey/files/patch-257314 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/seamonkey/files/patch-258005 =================================================================== --- head/www/seamonkey/files/patch-258005 (nonexistent) +++ head/www/seamonkey/files/patch-258005 (revision 118475) @@ -0,0 +1,278 @@ +Index: nsMsgCompUtils.cpp +=================================================================== +RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp,v +retrieving revision 1.161 +retrieving revision 1.161.10.1 +diff -u -r1.161 -r1.161.10.1 +--- mailnews/compose/src/nsMsgCompUtils.cpp 12 Mar 2004 07:23:38 -0000 1.161 ++++ mailnews/compose/src/nsMsgCompUtils.cpp 8 Sep 2004 19:27:53 -0000 1.161.10.1 +@@ -821,16 +821,7 @@ + nsresult rv; + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); + +- PRInt32 buffer_size = 2048 + (real_name ? 2*PL_strlen(real_name) : 0) + (base_url ? 2*PL_strlen(base_url) : 0) + +- (type_param ? PL_strlen(type_param) : 0) + (encoding ? PL_strlen(encoding) : 0) + +- (description ? PL_strlen(description) : 0) + (x_mac_type ? PL_strlen(x_mac_type) : 0) + +- (x_mac_creator ? PL_strlen(x_mac_creator) : 0) + (attachmentCharset ? PL_strlen(attachmentCharset) : 0) + +- (bodyCharset ? PL_strlen(bodyCharset) : 0) + (content_id ? PL_strlen(content_id) : 0); +- char *buffer = (char *) PR_Malloc (buffer_size); +- char *buffer_tail = buffer; +- +- if (! buffer) +- return 0; /* NS_ERROR_OUT_OF_MEMORY */ ++ nsCString buf(""); + + NS_ASSERTION (encoding, "null encoding"); + +@@ -874,14 +865,13 @@ + } + } + +- PUSH_STRING ("Content-Type: "); +- PUSH_STRING (type); +- ++ buf.Append("Content-Type: "); ++ buf.Append(type); + if (type_param && *type_param) + { + if (*type_param != ';') +- PUSH_STRING("; "); +- PUSH_STRING(type_param); ++ buf.Append("; "); ++ buf.Append(type_param); + } + + if (mime_type_needs_charset (type)) +@@ -918,8 +908,8 @@ + (PL_strcasecmp(encoding, ENCODING_BASE64) != 0)) && + (*charset_label)) + { +- PUSH_STRING ("; charset="); +- PUSH_STRING (charset_label); ++ buf.Append("; charset="); ++ buf.Append(charset_label); + } + } + +@@ -930,7 +920,7 @@ + if(type && !PL_strcasecmp(type, "text/plain")) + { + if(UseFormatFlowed(bodyCharset)) +- PUSH_STRING ("; format=flowed"); ++ buf.Append("; format=flowed"); + // else + // { + // Don't add a markup. Could use +@@ -942,59 +932,59 @@ + } + + if (x_mac_type && *x_mac_type) { +- PUSH_STRING ("; x-mac-type=\""); +- PUSH_STRING (x_mac_type); +- PUSH_STRING ("\""); ++ buf.Append("; x-mac-type=\""); ++ buf.Append(x_mac_type); ++ buf.Append("\""); + } + + if (x_mac_creator && *x_mac_creator) { +- PUSH_STRING ("; x-mac-creator=\""); +- PUSH_STRING (x_mac_creator); +- PUSH_STRING ("\""); ++ buf.Append("; x-mac-creator=\""); ++ buf.Append(x_mac_creator); ++ buf.Append("\""); + } + + #ifdef EMIT_NAME_IN_CONTENT_TYPE + if (encodedRealName && *encodedRealName) { + if (parmFolding == 0 || parmFolding == 1) { +- PUSH_STRING (";\r\n name=\""); +- PUSH_STRING (encodedRealName); +- PUSH_STRING ("\""); ++ buf.Append(";\r\n name=\""); ++ buf.Append(encodedRealName); ++ buf.Append("\""); + } + else // if (parmFolding == 2) + { + char *rfc2231Parm = RFC2231ParmFolding("name", charset.get(), + nsMsgI18NGetAcceptLanguage(), encodedRealName); + if (rfc2231Parm) { +- PUSH_STRING(";\r\n "); +- PUSH_STRING(rfc2231Parm); ++ buf.Append(";\r\n "); ++ buf.Append(rfc2231Parm); + PR_Free(rfc2231Parm); + } + } + } + #endif /* EMIT_NAME_IN_CONTENT_TYPE */ ++ buf.Append(CRLF); + +- PUSH_NEWLINE (); ++ buf.Append("Content-Transfer-Encoding: "); ++ buf.Append(encoding); + +- PUSH_STRING ("Content-Transfer-Encoding: "); +- PUSH_STRING (encoding); +- PUSH_NEWLINE (); ++ buf.Append(CRLF); + + if (description && *description) { + char *s = mime_fix_header (description); + if (s) { +- PUSH_STRING ("Content-Description: "); +- PUSH_STRING (s); +- PUSH_NEWLINE (); ++ buf.Append("Content-Description: "); ++ buf.Append(s); ++ buf.Append(CRLF); + PR_Free(s); + } + } + + if ( (content_id) && (*content_id) ) + { +- PUSH_STRING ("Content-ID: <"); +- PUSH_STRING (content_id); +- PUSH_STRING (">"); +- PUSH_NEWLINE (); ++ buf.Append("Content-ID: <"); ++ buf.Append(content_id); ++ buf.Append(">"); ++ buf.Append(CRLF); + } + + if (encodedRealName && *encodedRealName) { +@@ -1004,15 +994,15 @@ + rv = prefs->GetIntPref("mail.content_disposition_type", &pref_content_disposition); + NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get mail.content_disposition_type"); + +- PUSH_STRING ("Content-Disposition: "); ++ buf.Append("Content-Disposition: "); + + if (pref_content_disposition == 1) +- PUSH_STRING ("attachment"); ++ buf.Append("attachment"); + else + if (pref_content_disposition == 2 && + (!PL_strcasecmp(type, TEXT_PLAIN) || + (period && !PL_strcasecmp(period, ".txt")))) +- PUSH_STRING("attachment"); ++ buf.Append("attachment"); + + /* If this document is an anonymous binary file or a vcard, + then always show it as an attachment, never inline. */ +@@ -1020,23 +1010,23 @@ + if (!PL_strcasecmp(type, APPLICATION_OCTET_STREAM) || + !PL_strcasecmp(type, TEXT_VCARD) || + !PL_strcasecmp(type, APPLICATION_DIRECTORY)) /* text/x-vcard synonym */ +- PUSH_STRING ("attachment"); ++ buf.Append("attachment"); + else +- PUSH_STRING ("inline"); ++ buf.Append("inline"); + + if (parmFolding == 0 || parmFolding == 1) { +- PUSH_STRING (";\r\n filename=\""); +- PUSH_STRING (encodedRealName); +- PUSH_STRING ("\"" CRLF); ++ buf.Append(";\r\n filename=\""); ++ buf.Append(encodedRealName); ++ buf.Append("\"" CRLF); + } + else // if (parmFolding == 2) + { + char *rfc2231Parm = RFC2231ParmFolding("filename", charset.get(), + nsMsgI18NGetAcceptLanguage(), encodedRealName); + if (rfc2231Parm) { +- PUSH_STRING(";\r\n "); +- PUSH_STRING(rfc2231Parm); +- PUSH_NEWLINE (); ++ buf.Append(";\r\n "); ++ buf.Append(rfc2231Parm); ++ buf.Append(CRLF); + PR_Free(rfc2231Parm); + } + } +@@ -1045,7 +1035,7 @@ + if (type && + (!PL_strcasecmp (type, MESSAGE_RFC822) || + !PL_strcasecmp (type, MESSAGE_NEWS))) +- PUSH_STRING ("Content-Disposition: inline" CRLF); ++ buf.Append("Content-Disposition: inline" CRLF); + + #ifdef GENERATE_CONTENT_BASE + /* If this is an HTML document, and we know the URL it originally +@@ -1079,9 +1069,9 @@ + prefs->GetBoolPref("mail.use_content_location_on_send", &useContentLocation); + + if (useContentLocation) +- PUSH_STRING ("Content-Location: \""); ++ buf.Append("Content-Location: \""); + else +- PUSH_STRING ("Content-Base: \""); ++ buf.Append("Content-Base: \""); + /* rhp - Pref for Content-Location usage */ + + /* rhp: this is to work with the Content-Location stuff */ +@@ -1089,34 +1079,34 @@ + + while (*s != 0 && *s != '#') + { +- const char *ot = buffer_tail; +- ++ PRUint32 ot=buf.Length(); ++ char tmp[]="\x00\x00"; + /* URLs must be wrapped at 40 characters or less. */ + if (col >= 38) { +- PUSH_STRING(CRLF "\t"); ++ buf.Append(CRLF "\t"); + col = 0; + } + + if (*s == ' ') +- PUSH_STRING("%20"); ++ buf.Append("%20"); + else if (*s == '\t') +- PUSH_STRING("%09"); ++ buf.Append("%09"); + else if (*s == '\n') +- PUSH_STRING("%0A"); ++ buf.Append("%0A"); + else if (*s == '\r') +- PUSH_STRING("%0D"); ++ buf.Append("%0D"); + else { +- *buffer_tail++ = *s; +- *buffer_tail = '\0'; ++ tmp[0]=*s; ++ buf.Append(tmp); + } + s++; +- col += (buffer_tail - ot); ++ col += (buf.Length() - ot); + } +- PUSH_STRING ("\"" CRLF); ++ buf.Append("\"" CRLF); + + /* rhp: this is to try to get around this fun problem with Content-Location */ + if (!useContentLocation) { +- PUSH_STRING ("Content-Location: \""); ++ buf.Append("Content-Location: \""); + s = base_url; + col = 0; + useContentLocation = PR_TRUE; +@@ -1130,10 +1120,9 @@ + #endif /* GENERATE_CONTENT_BASE */ + + /* realloc it smaller... */ +- buffer = (char*) PR_REALLOC (buffer, buffer_tail - buffer + 1); + + PR_FREEIF(encodedRealName); +- return buffer; ++ return PL_strdup(buf.get()); + } + + static PRBool isValidHost( const char* host ) Property changes on: head/www/seamonkey/files/patch-258005 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/seamonkey2/Makefile =================================================================== --- head/www/seamonkey2/Makefile (revision 118474) +++ head/www/seamonkey2/Makefile (revision 118475) @@ -1,337 +1,337 @@ # New ports collection makefile for: mozilla # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # # $FreeBSD$ # PORTNAME?= mozilla PORTVERSION= 1.8.a3 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH?= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.a3/a3/}/src \ adamw/:local DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.a3/a3/}${EXTRACT_SUFX} \ libart_lgpl${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 \ nspr4.1:${PORTSDIR}/devel/nspr WRKSRC= ${WRKDIR}/${PORTNAME} MOZILLA?= mozilla-devel MOZ_SUFX?= -devel USE_GNOME= gtk20 libidl LATEST_LINK= ${MOZILLA} EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/*\ --exclude */package/* \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes USE_ICONV= yes USE_GMAKE= yes WANT_GNOME= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= \ --disable-auto-deps \ --enable-chrome-format=jar \ --disable-cpp-exceptions \ --disable-cpp-rtti \ --enable-crypto \ --disable-gtktest \ --disable-freetypetest \ --disable-installer \ --disable-glibtest \ --enable-double-buffer \ --enable-mathml \ --disable-md \ --disable-pedantic \ --disable-bidi \ --disable-plaintext-editor-only \ --enable-svg \ --enable-svg-renderer-libart \ --disable-tests \ --disable-xterm-updates \ --enable-xinerama \ --with-system-zlib \ --with-system-jpeg=${LOCALBASE} \ --with-system-mng=${LOCALBASE} \ --with-system-png=${LOCALBASE} \ --with-gssapi=/usr \ --with-pthreads PLIST= ${WRKDIR}/pkg-plist MOZ_EXTENSIONS= default CONFIGURE_ENV= MOZ_INTERNAL_LIBART_LGPL=1 \ LOCALBASE=${LOCALBASE} PKGINSTALL= ${WRKDIR}/pkg-install CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 ESD_LIB= libesd.so.2 FREETYPE_LIB= libfreetype.so.9 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ mozilla-nspr mozilla-nss mozilla-plugin # JPI stuff. List paths to Java Plug-ins here in the order to try. JPI_LIST?=\ ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \ ${LOCALBASE}/jdk1.4.1/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \ ${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \ ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so OPTIONS=XFT "Enable Xft font anti-aliasing" on \ CALENDAR "Enable the Calendar module" off \ MAILNEWS "Enable Mail and News modules" on \ COMPOSER "Enable the HTML Composer module" on \ DEBUG "Enable debugging (i.e. gdb) support" off \ LDAP "Enable LDAP support for Mailnews" on \ CHATZILLA "Enable the Chatzilla IRC module" on \ XMLTERM "Enable the XMLTerm module" on \ JAVASCRIPT_DEBUGGER "Enable the DTD and JavaScript debuggers" off \ OPTIMIZED_CFLAGS "Enable -O2 optimizations" off \ SMB "Enable smb:// URI support using gnomevfs" off .include .if ${ARCH} == "amd64" BROKEN= "Coredump during build on amd64" .endif .if ${ARCH} == "ia64" || ${ARCH} == "alpha" BROKEN= "Does not compile on ia64 or alpha" .endif .if !defined(WITHOUT_XFT) LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ARGS+=--enable-xft .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir) BROKEN= Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \ illegibly. Please remove the mozilla-fonts package. .endif .else CONFIGURE_ARGS+=--disable-xft .endif .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug \ --disable-strip .else CONFIGURE_ARGS+=--disable-debug \ --enable-strip .endif .if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \ defined(WITHOUT_COMPOSER)) BROKEN= "Calendar requires Composer and Mailnews support." .endif # LDAP is only used by mail and news so disable both together .if defined(WITHOUT_MAILNEWS) CONFIGURE_ARGS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) CONFIGURE_ARGS+= --disable-ldap --enable-mailnews .else CONFIGURE_ARGS+= --enable-ldap --enable-mailnews .endif .endif .if !defined(WITHOUT_CHATZILLA) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc .endif .if !defined(WITHOUT_XMLTERM) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},xmlterm .endif CONFIGURE_ARGS+= --enable-extensions=${MOZ_EXTENSIONS} .if defined(WITH_JAVASCRIPT_DEBUGGER) CONFIGURE_ARGS+= --enable-jsd \ --enable-dtd-debug .else CONFIGURE_ARGS+= --disable-jsd \ --disable-dtd-debug .endif .if defined(WITH_CALENDAR) CONFIGURE_ARGS+= --enable-calendar .endif .if defined(WITHOUT_COMPOSER) CONFIGURE_ARGS+= --disable-composer .endif MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \ MOZ_INTERNAL_LIBART_LGPL=1 ALL_TARGET= default .if ${ARCH} == "i386" CONFIGURE_ARGS+= --enable-reorder .endif .if ${OSVERSION} < 500035 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp .endif .if defined(WITH_SMB) USE_GNOME+= gnomevfs2 .else CONFIGURE_ARGS+=--disable-gnomevfs .endif .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 CONFIGURE_ARGS+= --enable-optimize=-O2 .endif .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= "core dumps on alpha during post-build" .endif .if exists(${LOCALBASE}/include/freetype/freetype.h) BROKEN="You must upgrade your freetype port to 1.3.1_2 or higher before installing Mozilla. If you have 1.3.1_2 installed, please remove ${LOCALBASE}/include/freetype, then build Mozilla" .endif pre-everything:: .if defined(WITH_CALENDAR) @${ECHO_MSG} "" @${ECHO_MSG} "Calendar is still beta software." @${ECHO_MSG} "Use at your own risk." @${ECHO_MSG} "http://mozilla.org/projects/calendar/" @${ECHO_MSG} "" .endif post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ -e 's|%%HEADERS_SUFX%%|${MOZ_SUFX}|g' \ ${WRKSRC}/config/autoconf.mk.in @${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \ ${REINPLACE_CMD} 's|||g' @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/nsprpub/configure @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/configure \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @${REINPLACE_CMD} -e 's|libesd\.so\.0|${ESD_LIB}|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/modules/libpref/src/init/all.js @${REINPLACE_CMD} -e 's||\"${LOCALBASE}/include/iconv.h\"|g' \ ${WRKSRC}/configure \ ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp @${REINPLACE_CMD} -e 's|libfreetype.so.6|${FREETYPE_LIB}|g' \ ${WRKSRC}/modules/libpref/src/init/all.js @for pcfile in ${PKGCONFIG_FILES}; do \ ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \ s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \ ${WRKSRC}/build/unix/$${pcfile}.pc.in; \ done @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} pre-configure: @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ ${FALSE}; \ fi post-build: ${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \ ${FILESDIR}/mozilla.sh >${WRKSRC}/${MOZILLA} ${FIND} ${WRKSRC}/dist/bin -type d | ${SORT} -r | \ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE} pre-install: ${RM} -f ${PLIST} ${TOUCH} -f ${PLIST} if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${ECHO_CMD} bin/mozilla >> ${PLIST} ; \ fi ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ break; \ fi; \ done; \ ${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \ fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \ done cd ${WRKSRC}/dist/include && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:include/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} cd ${WRKSRC}/dist/bin && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} ${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ fi if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ break; \ fi; \ done; \ fi for pcfile in ${PKGCONFIG_FILES}; do \ ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \ done -${RM} -fr ${PREFIX}/include/${MOZILLA} ${MKDIR} ${PREFIX}/include/${MOZILLA} ${CHMOD} 755 ${PREFIX}/include/${MOZILLA} cd ${WRKSRC}/dist/include && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/www/seamonkey2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.195 \ No newline at end of property +1.196 \ No newline at end of property Index: head/www/seamonkey2/files/patch-250862 =================================================================== --- head/www/seamonkey2/files/patch-250862 (nonexistent) +++ head/www/seamonkey2/files/patch-250862 (revision 118475) @@ -0,0 +1,22 @@ +Index: mozilla/xpfe/communicator/resources/content/contentAreaDD.js +=================================================================== +RCS file: /cvsroot/mozilla/xpfe/communicator/resources/content/contentAreaDD.js,v +retrieving revision 1.32 +retrieving revision 1.32.88.1 +diff -u -r1.32 -r1.32.88.1 +--- xpfe/communicator/resources/content/contentAreaDD.js 10 Jul 2002 01:23:50 -0000 1.32 ++++ xpfe/communicator/resources/content/contentAreaDD.js 27 Aug 2004 01:13:39 -0000 1.32.88.1 +@@ -53,8 +53,11 @@ + { + var url = transferUtils.retrieveURLFromData(aXferData.data, aXferData.flavour.contentType); + +- // valid urls don't contain spaces ' '; if we have a space it isn't a valid url so bail out +- if (!url || !url.length || url.indexOf(" ", 0) != -1) ++ // valid urls don't contain spaces ' '; if we have a space it ++ // isn't a valid url, or if it's a javascript: or data: url, ++ // bail out ++ if (!url || !url.length || url.indexOf(" ", 0) != -1 || ++ /^\s*(javascript|data):/.test(url)) + return; + + switch (document.firstChild.getAttribute('windowtype')) { Property changes on: head/www/seamonkey2/files/patch-250862 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/seamonkey2/files/patch-255067 =================================================================== --- head/www/seamonkey2/files/patch-255067 (nonexistent) +++ head/www/seamonkey2/files/patch-255067 (revision 118475) @@ -0,0 +1,60 @@ +Index: mozilla/gfx/src/shared/gfxImageFrame.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/shared/gfxImageFrame.cpp,v +retrieving revision 1.26 +retrieving revision 1.26.12.1 +diff -u -r1.26 -r1.26.12.1 +--- gfx/src/shared/gfxImageFrame.cpp 16 Jan 2004 23:28:48 -0000 1.26 ++++ gfx/src/shared/gfxImageFrame.cpp 27 Aug 2004 11:02:58 -0000 1.26.12.1 +@@ -72,6 +72,13 @@ + return NS_ERROR_FAILURE; + } + ++ /* reject over-wide or over-tall images */ ++ const PRInt32 k64KLimit = 0x0000FFFF; ++ if ( aWidth > k64KLimit || aHeight > k64KLimit ){ ++ NS_ERROR("image too big"); ++ return NS_ERROR_FAILURE; ++ } ++ + nsresult rv; + + mOffset.MoveTo(aX, aY); +Index: mozilla/gfx/src/windows/nsImageWin.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/windows/nsImageWin.cpp,v +retrieving revision 3.130.2.1 +retrieving revision 3.130.2.1.6.1 +diff -u -r3.130.2.1 -r3.130.2.1.6.1 +--- gfx/src/windows/nsImageWin.cpp 11 May 2004 21:53:49 -0000 3.130.2.1 ++++ gfx/src/windows/nsImageWin.cpp 27 Aug 2004 11:02:58 -0000 3.130.2.1.6.1 +@@ -131,6 +131,10 @@ + return NS_ERROR_UNEXPECTED; + } + ++ // limit images to 64k pixels on a side (~55 feet on a 100dpi monitor) ++ const PRInt32 k64KLimit = 0x0000FFFF; ++ if (aWidth > k64KLimit || aHeight > k64KLimit) ++ return NS_ERROR_FAILURE; + + if (mNumPaletteColors >= 0){ + // If we have a palette +Index: mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp +=================================================================== +RCS file: /cvsroot/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp,v +retrieving revision 1.24.2.1 +retrieving revision 1.24.2.1.6.1 +diff -u -r1.24.2.1 -r1.24.2.1.6.1 +--- modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp 13 May 2004 22:27:35 -0000 1.24.2.1 ++++ modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp 27 Aug 2004 11:02:58 -0000 1.24.2.1.6.1 +@@ -274,7 +274,9 @@ + CalcBitShift(); + } + // BMPs with negative width are invalid +- if (mBIH.width < 0) ++ // Reject extremely wide images to keep the math sane ++ const PRInt32 k64KWidth = 0x0000FFFF; ++ if (mBIH.width < 0 || mBIH.width > k64KWidth) + return NS_ERROR_FAILURE; + + PRUint32 real_height = (mBIH.height > 0) ? mBIH.height : -mBIH.height; Property changes on: head/www/seamonkey2/files/patch-255067 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/seamonkey2/files/patch-256316 =================================================================== --- head/www/seamonkey2/files/patch-256316 (nonexistent) +++ head/www/seamonkey2/files/patch-256316 (revision 118475) @@ -0,0 +1,18 @@ +Index: mozilla/netwerk/dns/src/nsIDNService.cpp +=================================================================== +RCS file: /cvsroot/mozilla/netwerk/dns/src/nsIDNService.cpp,v +retrieving revision 1.18 +retrieving revision 1.18.10.1 +diff -u -r1.18 -r1.18.10.1 +--- netwerk/dns/src/nsIDNService.cpp 3 Apr 2004 07:32:18 -0000 1.18 ++++ netwerk/dns/src/nsIDNService.cpp 27 Aug 2004 11:23:21 -0000 1.18.10.1 +@@ -242,6 +242,9 @@ + + NS_IMETHODIMP nsIDNService::Normalize(const nsACString & input, nsACString & output) + { ++ // protect against bogus input ++ NS_ENSURE_TRUE(IsUTF8(input), NS_ERROR_UNEXPECTED); ++ + nsAutoString outUTF16; + nsresult rv = stringPrep(NS_ConvertUTF8toUTF16(input), outUTF16); + if (NS_SUCCEEDED(rv)) Property changes on: head/www/seamonkey2/files/patch-256316 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/seamonkey2/files/patch-257314 =================================================================== --- head/www/seamonkey2/files/patch-257314 (nonexistent) +++ head/www/seamonkey2/files/patch-257314 (revision 118475) @@ -0,0 +1,31 @@ +Index: nsVCardObj.cpp +=================================================================== +RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsVCardObj.cpp,v +retrieving revision 1.2 +retrieving revision 1.2.24.1 +diff -u -r1.2 -r1.2.24.1 +--- mailnews/addrbook/src/nsVCardObj.cpp 14 Sep 2003 21:45:58 -0000 1.2 ++++ mailnews/addrbook/src/nsVCardObj.cpp 31 Aug 2004 07:44:25 -0000 1.2.24.1 +@@ -1344,16 +1344,13 @@ + + static void writeGroup(OFile *fp, VObject *o) + { +- char buf1[256]; +- char buf2[256]; +- PL_strcpy(buf1,NAME_OF(o)); +- while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { +- PL_strcpy(buf2,STRINGZ_VALUE_OF(o)); +- PL_strcat(buf2,"."); +- PL_strcat(buf2,buf1); +- PL_strcpy(buf1,buf2); ++ nsCAutoString buf(NAME_OF(o)); ++ ++ while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { ++ buf.Insert(NS_LITERAL_CSTRING("."), 0); ++ buf.Insert(STRINGZ_VALUE_OF(o), 0); + } +- appendsOFile(fp,buf1); ++ appendsOFile(fp, buf.get()); + } + + static int inList(const char **list, const char *s) Property changes on: head/www/seamonkey2/files/patch-257314 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/seamonkey2/files/patch-258005 =================================================================== --- head/www/seamonkey2/files/patch-258005 (nonexistent) +++ head/www/seamonkey2/files/patch-258005 (revision 118475) @@ -0,0 +1,278 @@ +Index: nsMsgCompUtils.cpp +=================================================================== +RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp,v +retrieving revision 1.161 +retrieving revision 1.161.10.1 +diff -u -r1.161 -r1.161.10.1 +--- mailnews/compose/src/nsMsgCompUtils.cpp 12 Mar 2004 07:23:38 -0000 1.161 ++++ mailnews/compose/src/nsMsgCompUtils.cpp 8 Sep 2004 19:27:53 -0000 1.161.10.1 +@@ -821,16 +821,7 @@ + nsresult rv; + nsCOMPtr prefs(do_GetService(kPrefCID, &rv)); + +- PRInt32 buffer_size = 2048 + (real_name ? 2*PL_strlen(real_name) : 0) + (base_url ? 2*PL_strlen(base_url) : 0) + +- (type_param ? PL_strlen(type_param) : 0) + (encoding ? PL_strlen(encoding) : 0) + +- (description ? PL_strlen(description) : 0) + (x_mac_type ? PL_strlen(x_mac_type) : 0) + +- (x_mac_creator ? PL_strlen(x_mac_creator) : 0) + (attachmentCharset ? PL_strlen(attachmentCharset) : 0) + +- (bodyCharset ? PL_strlen(bodyCharset) : 0) + (content_id ? PL_strlen(content_id) : 0); +- char *buffer = (char *) PR_Malloc (buffer_size); +- char *buffer_tail = buffer; +- +- if (! buffer) +- return 0; /* NS_ERROR_OUT_OF_MEMORY */ ++ nsCString buf(""); + + NS_ASSERTION (encoding, "null encoding"); + +@@ -874,14 +865,13 @@ + } + } + +- PUSH_STRING ("Content-Type: "); +- PUSH_STRING (type); +- ++ buf.Append("Content-Type: "); ++ buf.Append(type); + if (type_param && *type_param) + { + if (*type_param != ';') +- PUSH_STRING("; "); +- PUSH_STRING(type_param); ++ buf.Append("; "); ++ buf.Append(type_param); + } + + if (mime_type_needs_charset (type)) +@@ -918,8 +908,8 @@ + (PL_strcasecmp(encoding, ENCODING_BASE64) != 0)) && + (*charset_label)) + { +- PUSH_STRING ("; charset="); +- PUSH_STRING (charset_label); ++ buf.Append("; charset="); ++ buf.Append(charset_label); + } + } + +@@ -930,7 +920,7 @@ + if(type && !PL_strcasecmp(type, "text/plain")) + { + if(UseFormatFlowed(bodyCharset)) +- PUSH_STRING ("; format=flowed"); ++ buf.Append("; format=flowed"); + // else + // { + // Don't add a markup. Could use +@@ -942,59 +932,59 @@ + } + + if (x_mac_type && *x_mac_type) { +- PUSH_STRING ("; x-mac-type=\""); +- PUSH_STRING (x_mac_type); +- PUSH_STRING ("\""); ++ buf.Append("; x-mac-type=\""); ++ buf.Append(x_mac_type); ++ buf.Append("\""); + } + + if (x_mac_creator && *x_mac_creator) { +- PUSH_STRING ("; x-mac-creator=\""); +- PUSH_STRING (x_mac_creator); +- PUSH_STRING ("\""); ++ buf.Append("; x-mac-creator=\""); ++ buf.Append(x_mac_creator); ++ buf.Append("\""); + } + + #ifdef EMIT_NAME_IN_CONTENT_TYPE + if (encodedRealName && *encodedRealName) { + if (parmFolding == 0 || parmFolding == 1) { +- PUSH_STRING (";\r\n name=\""); +- PUSH_STRING (encodedRealName); +- PUSH_STRING ("\""); ++ buf.Append(";\r\n name=\""); ++ buf.Append(encodedRealName); ++ buf.Append("\""); + } + else // if (parmFolding == 2) + { + char *rfc2231Parm = RFC2231ParmFolding("name", charset.get(), + nsMsgI18NGetAcceptLanguage(), encodedRealName); + if (rfc2231Parm) { +- PUSH_STRING(";\r\n "); +- PUSH_STRING(rfc2231Parm); ++ buf.Append(";\r\n "); ++ buf.Append(rfc2231Parm); + PR_Free(rfc2231Parm); + } + } + } + #endif /* EMIT_NAME_IN_CONTENT_TYPE */ ++ buf.Append(CRLF); + +- PUSH_NEWLINE (); ++ buf.Append("Content-Transfer-Encoding: "); ++ buf.Append(encoding); + +- PUSH_STRING ("Content-Transfer-Encoding: "); +- PUSH_STRING (encoding); +- PUSH_NEWLINE (); ++ buf.Append(CRLF); + + if (description && *description) { + char *s = mime_fix_header (description); + if (s) { +- PUSH_STRING ("Content-Description: "); +- PUSH_STRING (s); +- PUSH_NEWLINE (); ++ buf.Append("Content-Description: "); ++ buf.Append(s); ++ buf.Append(CRLF); + PR_Free(s); + } + } + + if ( (content_id) && (*content_id) ) + { +- PUSH_STRING ("Content-ID: <"); +- PUSH_STRING (content_id); +- PUSH_STRING (">"); +- PUSH_NEWLINE (); ++ buf.Append("Content-ID: <"); ++ buf.Append(content_id); ++ buf.Append(">"); ++ buf.Append(CRLF); + } + + if (encodedRealName && *encodedRealName) { +@@ -1004,15 +994,15 @@ + rv = prefs->GetIntPref("mail.content_disposition_type", &pref_content_disposition); + NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get mail.content_disposition_type"); + +- PUSH_STRING ("Content-Disposition: "); ++ buf.Append("Content-Disposition: "); + + if (pref_content_disposition == 1) +- PUSH_STRING ("attachment"); ++ buf.Append("attachment"); + else + if (pref_content_disposition == 2 && + (!PL_strcasecmp(type, TEXT_PLAIN) || + (period && !PL_strcasecmp(period, ".txt")))) +- PUSH_STRING("attachment"); ++ buf.Append("attachment"); + + /* If this document is an anonymous binary file or a vcard, + then always show it as an attachment, never inline. */ +@@ -1020,23 +1010,23 @@ + if (!PL_strcasecmp(type, APPLICATION_OCTET_STREAM) || + !PL_strcasecmp(type, TEXT_VCARD) || + !PL_strcasecmp(type, APPLICATION_DIRECTORY)) /* text/x-vcard synonym */ +- PUSH_STRING ("attachment"); ++ buf.Append("attachment"); + else +- PUSH_STRING ("inline"); ++ buf.Append("inline"); + + if (parmFolding == 0 || parmFolding == 1) { +- PUSH_STRING (";\r\n filename=\""); +- PUSH_STRING (encodedRealName); +- PUSH_STRING ("\"" CRLF); ++ buf.Append(";\r\n filename=\""); ++ buf.Append(encodedRealName); ++ buf.Append("\"" CRLF); + } + else // if (parmFolding == 2) + { + char *rfc2231Parm = RFC2231ParmFolding("filename", charset.get(), + nsMsgI18NGetAcceptLanguage(), encodedRealName); + if (rfc2231Parm) { +- PUSH_STRING(";\r\n "); +- PUSH_STRING(rfc2231Parm); +- PUSH_NEWLINE (); ++ buf.Append(";\r\n "); ++ buf.Append(rfc2231Parm); ++ buf.Append(CRLF); + PR_Free(rfc2231Parm); + } + } +@@ -1045,7 +1035,7 @@ + if (type && + (!PL_strcasecmp (type, MESSAGE_RFC822) || + !PL_strcasecmp (type, MESSAGE_NEWS))) +- PUSH_STRING ("Content-Disposition: inline" CRLF); ++ buf.Append("Content-Disposition: inline" CRLF); + + #ifdef GENERATE_CONTENT_BASE + /* If this is an HTML document, and we know the URL it originally +@@ -1079,9 +1069,9 @@ + prefs->GetBoolPref("mail.use_content_location_on_send", &useContentLocation); + + if (useContentLocation) +- PUSH_STRING ("Content-Location: \""); ++ buf.Append("Content-Location: \""); + else +- PUSH_STRING ("Content-Base: \""); ++ buf.Append("Content-Base: \""); + /* rhp - Pref for Content-Location usage */ + + /* rhp: this is to work with the Content-Location stuff */ +@@ -1089,34 +1079,34 @@ + + while (*s != 0 && *s != '#') + { +- const char *ot = buffer_tail; +- ++ PRUint32 ot=buf.Length(); ++ char tmp[]="\x00\x00"; + /* URLs must be wrapped at 40 characters or less. */ + if (col >= 38) { +- PUSH_STRING(CRLF "\t"); ++ buf.Append(CRLF "\t"); + col = 0; + } + + if (*s == ' ') +- PUSH_STRING("%20"); ++ buf.Append("%20"); + else if (*s == '\t') +- PUSH_STRING("%09"); ++ buf.Append("%09"); + else if (*s == '\n') +- PUSH_STRING("%0A"); ++ buf.Append("%0A"); + else if (*s == '\r') +- PUSH_STRING("%0D"); ++ buf.Append("%0D"); + else { +- *buffer_tail++ = *s; +- *buffer_tail = '\0'; ++ tmp[0]=*s; ++ buf.Append(tmp); + } + s++; +- col += (buffer_tail - ot); ++ col += (buf.Length() - ot); + } +- PUSH_STRING ("\"" CRLF); ++ buf.Append("\"" CRLF); + + /* rhp: this is to try to get around this fun problem with Content-Location */ + if (!useContentLocation) { +- PUSH_STRING ("Content-Location: \""); ++ buf.Append("Content-Location: \""); + s = base_url; + col = 0; + useContentLocation = PR_TRUE; +@@ -1130,10 +1120,9 @@ + #endif /* GENERATE_CONTENT_BASE */ + + /* realloc it smaller... */ +- buffer = (char*) PR_REALLOC (buffer, buffer_tail - buffer + 1); + + PR_FREEIF(encodedRealName); +- return buffer; ++ return PL_strdup(buf.get()); + } + + static PRBool isValidHost( const char* host ) Property changes on: head/www/seamonkey2/files/patch-258005 ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property