Index: head/www/firefox/Makefile =================================================================== --- head/www/firefox/Makefile (revision 118475) +++ head/www/firefox/Makefile (revision 118476) @@ -1,224 +1,225 @@ # New ports collection makefile for: phoenix # Date created: 2002/10/21 # Whom: Alan Eldridge # # $FreeBSD$ # PORTNAME= firefox PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla 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 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} FAKEDIR= ${WRKDIR}/fake FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME} HAS_CONFIGURE= yes ESD_LIB= libesd.so.2 LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME} NO_MTREE= yes PLIST= ${WRKDIR}/plist PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 libidl USE_ICONV= yes USE_PERL5_BUILD=yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/mozilla PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ mozilla-nspr mozilla-nss mozilla-plugin 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= DEBUG "Build a debugging image" off \ HEADERS "Install headers and IDL files" off \ LOGGING "Enable additional log messages" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ XFT "Enable support for anti-aliased fonts" on \ SMB "Enable smb:// URI support using gnomevfs" off .include .if defined(WITH_DEBUG) WITH_LOGGING= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 CONFIGURE_ENV+= WITH_OPTIMIZE=-O2 .else CONFIGURE_ENV+= WITH_OPTIMIZE=-O .endif # defined(WITH_OPTIMIZED_CFLAGS) .if defined(WITH_LOGGING) CONFIGURE_ENV+= WITH_LOGGING=yes .endif # defined(WITH_LOGGING) .if defined(WITHOUT_XFT) CONFIGURE_ENV+= WITHOUT_XFT=yes .else LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .endif # !defined(WITHOUT_XFT) .if defined(WITH_SMB) USE_GNOME+= gnomevfs2 CONFIGURE_ENV+= WITH_SMB=yes .endif # defined(WITH_SMB) CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${X11BASE}/lib LIBS+= ${PTHREAD_LIBS} EXTRA_SCRIPTS= ${PORTNAME}.rb .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= "core dumps on alpha during post-build" .endif pre-extract:: @${ECHO_MSG} @${ECHO_MSG} "Extracting source (this takes a while) ..." @${ECHO_MSG} post-extract:: # FAKEDIR is here so that nsinstall will install under FAKEDIR, not # under PREFIX. See pre-install and do-install for details. @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ -e 's|@CFLAGS@|${CFLAGS}|' \ -e 's|@LDFLAGS@|${LDFLAGS}|' \ -e 's|@LIBS@|${LIBS}|' \ -e 's|@X11BASE@|${X11BASE}|' \ -e 's|@LOCALBASE@|${LOCALBASE}|' \ -e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \ -e 's|@PERL@|${PERL5}|' \ <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig post-patch: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/nsprpub/configure @${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/config/config.mk \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @${PERL} -pi -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ embedding/minimo ${MV} ${WRKSRC}/${ii}/all.js ${WRKSRC}/${ii}/all.js.bak ${SED} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ < ${WRKSRC}/${ii}/all.js.bak > ${WRKSRC}/${ii}/all.js .endfor .for ii in ${PKGCONFIG_FILES} @${PERL} -pi -e 's|mozilla-|firefox-|g' \ ${WRKSRC}/build/unix/${ii}.pc.in .endfor 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: # XXX This works around an install problem that is triggered when # toolkit/profile/src is built after profile/src. @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so pre-install: # Overview: the program installs itself in FAKEDIR, then a list is made of the # files and directories in there. This is the PLIST (packing list) for the # package, replacing the traditional pkg-plist file. @${RM} -rf ${FAKEDIR} ${PLIST} @${MKDIR} ${FAKEDIR}/lib/browser_plugins @${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} install .for ii in mac win .for jj in / .jar @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} .endfor .endfor @${INSTALL_DATA} ${FILESDIR}/Extensions.rdf \ ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} .if !defined (WITH_HEADERS) @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include .endif .for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS} @${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ ${GREP} / >> ${PLIST} do-install: # This is the actual installation. First, the contents of FAKEDIR are # just copied to PREFIX. cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor .for ii in f F ${RM} -f ${PREFIX}/bin/${ii}irefox ${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox .endfor ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox ${RM} -f ${PREFIX}/bin/firefox-config ${LN} -sf ${LOCAL_PREFIX}/bin/firefox-config \ ${PREFIX}/bin/firefox-config ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \ 's|${FAKEDIR}|${PREFIX}|g' -if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PLUGINSDIR}/libjavaplugin_oji.so ; \ break; \ fi; \ done; \ fi .include Property changes on: head/www/firefox/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.91 \ No newline at end of property +1.92 \ No newline at end of property Index: head/www/firefox/files/patch-250862 =================================================================== --- head/www/firefox/files/patch-250862 (nonexistent) +++ head/www/firefox/files/patch-250862 (revision 118476) @@ -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/firefox/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/firefox/files/patch-255067 =================================================================== --- head/www/firefox/files/patch-255067 (nonexistent) +++ head/www/firefox/files/patch-255067 (revision 118476) @@ -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/firefox/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/firefox/files/patch-256316 =================================================================== --- head/www/firefox/files/patch-256316 (nonexistent) +++ head/www/firefox/files/patch-256316 (revision 118476) @@ -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/firefox/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/firefox-devel/Makefile =================================================================== --- head/www/firefox-devel/Makefile (revision 118475) +++ head/www/firefox-devel/Makefile (revision 118476) @@ -1,224 +1,225 @@ # New ports collection makefile for: phoenix # Date created: 2002/10/21 # Whom: Alan Eldridge # # $FreeBSD$ # PORTNAME= firefox PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla 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 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} FAKEDIR= ${WRKDIR}/fake FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME} HAS_CONFIGURE= yes ESD_LIB= libesd.so.2 LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME} NO_MTREE= yes PLIST= ${WRKDIR}/plist PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 libidl USE_ICONV= yes USE_PERL5_BUILD=yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/mozilla PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ mozilla-nspr mozilla-nss mozilla-plugin 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= DEBUG "Build a debugging image" off \ HEADERS "Install headers and IDL files" off \ LOGGING "Enable additional log messages" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ XFT "Enable support for anti-aliased fonts" on \ SMB "Enable smb:// URI support using gnomevfs" off .include .if defined(WITH_DEBUG) WITH_LOGGING= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 CONFIGURE_ENV+= WITH_OPTIMIZE=-O2 .else CONFIGURE_ENV+= WITH_OPTIMIZE=-O .endif # defined(WITH_OPTIMIZED_CFLAGS) .if defined(WITH_LOGGING) CONFIGURE_ENV+= WITH_LOGGING=yes .endif # defined(WITH_LOGGING) .if defined(WITHOUT_XFT) CONFIGURE_ENV+= WITHOUT_XFT=yes .else LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .endif # !defined(WITHOUT_XFT) .if defined(WITH_SMB) USE_GNOME+= gnomevfs2 CONFIGURE_ENV+= WITH_SMB=yes .endif # defined(WITH_SMB) CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${X11BASE}/lib LIBS+= ${PTHREAD_LIBS} EXTRA_SCRIPTS= ${PORTNAME}.rb .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= "core dumps on alpha during post-build" .endif pre-extract:: @${ECHO_MSG} @${ECHO_MSG} "Extracting source (this takes a while) ..." @${ECHO_MSG} post-extract:: # FAKEDIR is here so that nsinstall will install under FAKEDIR, not # under PREFIX. See pre-install and do-install for details. @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ -e 's|@CFLAGS@|${CFLAGS}|' \ -e 's|@LDFLAGS@|${LDFLAGS}|' \ -e 's|@LIBS@|${LIBS}|' \ -e 's|@X11BASE@|${X11BASE}|' \ -e 's|@LOCALBASE@|${LOCALBASE}|' \ -e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \ -e 's|@PERL@|${PERL5}|' \ <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig post-patch: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/nsprpub/configure @${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/config/config.mk \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @${PERL} -pi -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ embedding/minimo ${MV} ${WRKSRC}/${ii}/all.js ${WRKSRC}/${ii}/all.js.bak ${SED} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ < ${WRKSRC}/${ii}/all.js.bak > ${WRKSRC}/${ii}/all.js .endfor .for ii in ${PKGCONFIG_FILES} @${PERL} -pi -e 's|mozilla-|firefox-|g' \ ${WRKSRC}/build/unix/${ii}.pc.in .endfor 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: # XXX This works around an install problem that is triggered when # toolkit/profile/src is built after profile/src. @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so pre-install: # Overview: the program installs itself in FAKEDIR, then a list is made of the # files and directories in there. This is the PLIST (packing list) for the # package, replacing the traditional pkg-plist file. @${RM} -rf ${FAKEDIR} ${PLIST} @${MKDIR} ${FAKEDIR}/lib/browser_plugins @${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} install .for ii in mac win .for jj in / .jar @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} .endfor .endfor @${INSTALL_DATA} ${FILESDIR}/Extensions.rdf \ ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} .if !defined (WITH_HEADERS) @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include .endif .for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS} @${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ ${GREP} / >> ${PLIST} do-install: # This is the actual installation. First, the contents of FAKEDIR are # just copied to PREFIX. cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor .for ii in f F ${RM} -f ${PREFIX}/bin/${ii}irefox ${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox .endfor ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox ${RM} -f ${PREFIX}/bin/firefox-config ${LN} -sf ${LOCAL_PREFIX}/bin/firefox-config \ ${PREFIX}/bin/firefox-config ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \ 's|${FAKEDIR}|${PREFIX}|g' -if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PLUGINSDIR}/libjavaplugin_oji.so ; \ break; \ fi; \ done; \ fi .include Property changes on: head/www/firefox-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.91 \ No newline at end of property +1.92 \ No newline at end of property Index: head/www/firefox-devel/files/patch-250862 =================================================================== --- head/www/firefox-devel/files/patch-250862 (nonexistent) +++ head/www/firefox-devel/files/patch-250862 (revision 118476) @@ -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/firefox-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/firefox-devel/files/patch-255067 =================================================================== --- head/www/firefox-devel/files/patch-255067 (nonexistent) +++ head/www/firefox-devel/files/patch-255067 (revision 118476) @@ -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/firefox-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/firefox-devel/files/patch-256316 =================================================================== --- head/www/firefox-devel/files/patch-256316 (nonexistent) +++ head/www/firefox-devel/files/patch-256316 (revision 118476) @@ -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/firefox-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/firefox-esr/Makefile =================================================================== --- head/www/firefox-esr/Makefile (revision 118475) +++ head/www/firefox-esr/Makefile (revision 118476) @@ -1,224 +1,225 @@ # New ports collection makefile for: phoenix # Date created: 2002/10/21 # Whom: Alan Eldridge # # $FreeBSD$ # PORTNAME= firefox PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla 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 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} FAKEDIR= ${WRKDIR}/fake FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME} HAS_CONFIGURE= yes ESD_LIB= libesd.so.2 LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME} NO_MTREE= yes PLIST= ${WRKDIR}/plist PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 libidl USE_ICONV= yes USE_PERL5_BUILD=yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/mozilla PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ mozilla-nspr mozilla-nss mozilla-plugin 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= DEBUG "Build a debugging image" off \ HEADERS "Install headers and IDL files" off \ LOGGING "Enable additional log messages" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ XFT "Enable support for anti-aliased fonts" on \ SMB "Enable smb:// URI support using gnomevfs" off .include .if defined(WITH_DEBUG) WITH_LOGGING= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 CONFIGURE_ENV+= WITH_OPTIMIZE=-O2 .else CONFIGURE_ENV+= WITH_OPTIMIZE=-O .endif # defined(WITH_OPTIMIZED_CFLAGS) .if defined(WITH_LOGGING) CONFIGURE_ENV+= WITH_LOGGING=yes .endif # defined(WITH_LOGGING) .if defined(WITHOUT_XFT) CONFIGURE_ENV+= WITHOUT_XFT=yes .else LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .endif # !defined(WITHOUT_XFT) .if defined(WITH_SMB) USE_GNOME+= gnomevfs2 CONFIGURE_ENV+= WITH_SMB=yes .endif # defined(WITH_SMB) CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${X11BASE}/lib LIBS+= ${PTHREAD_LIBS} EXTRA_SCRIPTS= ${PORTNAME}.rb .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= "core dumps on alpha during post-build" .endif pre-extract:: @${ECHO_MSG} @${ECHO_MSG} "Extracting source (this takes a while) ..." @${ECHO_MSG} post-extract:: # FAKEDIR is here so that nsinstall will install under FAKEDIR, not # under PREFIX. See pre-install and do-install for details. @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ -e 's|@CFLAGS@|${CFLAGS}|' \ -e 's|@LDFLAGS@|${LDFLAGS}|' \ -e 's|@LIBS@|${LIBS}|' \ -e 's|@X11BASE@|${X11BASE}|' \ -e 's|@LOCALBASE@|${LOCALBASE}|' \ -e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \ -e 's|@PERL@|${PERL5}|' \ <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig post-patch: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/nsprpub/configure @${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/config/config.mk \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @${PERL} -pi -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ embedding/minimo ${MV} ${WRKSRC}/${ii}/all.js ${WRKSRC}/${ii}/all.js.bak ${SED} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ < ${WRKSRC}/${ii}/all.js.bak > ${WRKSRC}/${ii}/all.js .endfor .for ii in ${PKGCONFIG_FILES} @${PERL} -pi -e 's|mozilla-|firefox-|g' \ ${WRKSRC}/build/unix/${ii}.pc.in .endfor 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: # XXX This works around an install problem that is triggered when # toolkit/profile/src is built after profile/src. @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so pre-install: # Overview: the program installs itself in FAKEDIR, then a list is made of the # files and directories in there. This is the PLIST (packing list) for the # package, replacing the traditional pkg-plist file. @${RM} -rf ${FAKEDIR} ${PLIST} @${MKDIR} ${FAKEDIR}/lib/browser_plugins @${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} install .for ii in mac win .for jj in / .jar @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} .endfor .endfor @${INSTALL_DATA} ${FILESDIR}/Extensions.rdf \ ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} .if !defined (WITH_HEADERS) @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include .endif .for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS} @${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ ${GREP} / >> ${PLIST} do-install: # This is the actual installation. First, the contents of FAKEDIR are # just copied to PREFIX. cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor .for ii in f F ${RM} -f ${PREFIX}/bin/${ii}irefox ${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox .endfor ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox ${RM} -f ${PREFIX}/bin/firefox-config ${LN} -sf ${LOCAL_PREFIX}/bin/firefox-config \ ${PREFIX}/bin/firefox-config ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \ 's|${FAKEDIR}|${PREFIX}|g' -if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PLUGINSDIR}/libjavaplugin_oji.so ; \ break; \ fi; \ done; \ fi .include Property changes on: head/www/firefox-esr/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.91 \ No newline at end of property +1.92 \ No newline at end of property Index: head/www/firefox-esr/files/patch-250862 =================================================================== --- head/www/firefox-esr/files/patch-250862 (nonexistent) +++ head/www/firefox-esr/files/patch-250862 (revision 118476) @@ -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/firefox-esr/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/firefox-esr/files/patch-255067 =================================================================== --- head/www/firefox-esr/files/patch-255067 (nonexistent) +++ head/www/firefox-esr/files/patch-255067 (revision 118476) @@ -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/firefox-esr/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/firefox-esr/files/patch-256316 =================================================================== --- head/www/firefox-esr/files/patch-256316 (nonexistent) +++ head/www/firefox-esr/files/patch-256316 (revision 118476) @@ -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/firefox-esr/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/firefox10/Makefile =================================================================== --- head/www/firefox10/Makefile (revision 118475) +++ head/www/firefox10/Makefile (revision 118476) @@ -1,224 +1,225 @@ # New ports collection makefile for: phoenix # Date created: 2002/10/21 # Whom: Alan Eldridge # # $FreeBSD$ # PORTNAME= firefox PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla 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 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} FAKEDIR= ${WRKDIR}/fake FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME} HAS_CONFIGURE= yes ESD_LIB= libesd.so.2 LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME} NO_MTREE= yes PLIST= ${WRKDIR}/plist PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 libidl USE_ICONV= yes USE_PERL5_BUILD=yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/mozilla PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ mozilla-nspr mozilla-nss mozilla-plugin 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= DEBUG "Build a debugging image" off \ HEADERS "Install headers and IDL files" off \ LOGGING "Enable additional log messages" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ XFT "Enable support for anti-aliased fonts" on \ SMB "Enable smb:// URI support using gnomevfs" off .include .if defined(WITH_DEBUG) WITH_LOGGING= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 CONFIGURE_ENV+= WITH_OPTIMIZE=-O2 .else CONFIGURE_ENV+= WITH_OPTIMIZE=-O .endif # defined(WITH_OPTIMIZED_CFLAGS) .if defined(WITH_LOGGING) CONFIGURE_ENV+= WITH_LOGGING=yes .endif # defined(WITH_LOGGING) .if defined(WITHOUT_XFT) CONFIGURE_ENV+= WITHOUT_XFT=yes .else LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .endif # !defined(WITHOUT_XFT) .if defined(WITH_SMB) USE_GNOME+= gnomevfs2 CONFIGURE_ENV+= WITH_SMB=yes .endif # defined(WITH_SMB) CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${X11BASE}/lib LIBS+= ${PTHREAD_LIBS} EXTRA_SCRIPTS= ${PORTNAME}.rb .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= "core dumps on alpha during post-build" .endif pre-extract:: @${ECHO_MSG} @${ECHO_MSG} "Extracting source (this takes a while) ..." @${ECHO_MSG} post-extract:: # FAKEDIR is here so that nsinstall will install under FAKEDIR, not # under PREFIX. See pre-install and do-install for details. @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ -e 's|@CFLAGS@|${CFLAGS}|' \ -e 's|@LDFLAGS@|${LDFLAGS}|' \ -e 's|@LIBS@|${LIBS}|' \ -e 's|@X11BASE@|${X11BASE}|' \ -e 's|@LOCALBASE@|${LOCALBASE}|' \ -e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \ -e 's|@PERL@|${PERL5}|' \ <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig post-patch: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/nsprpub/configure @${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/config/config.mk \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @${PERL} -pi -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ embedding/minimo ${MV} ${WRKSRC}/${ii}/all.js ${WRKSRC}/${ii}/all.js.bak ${SED} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ < ${WRKSRC}/${ii}/all.js.bak > ${WRKSRC}/${ii}/all.js .endfor .for ii in ${PKGCONFIG_FILES} @${PERL} -pi -e 's|mozilla-|firefox-|g' \ ${WRKSRC}/build/unix/${ii}.pc.in .endfor 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: # XXX This works around an install problem that is triggered when # toolkit/profile/src is built after profile/src. @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so pre-install: # Overview: the program installs itself in FAKEDIR, then a list is made of the # files and directories in there. This is the PLIST (packing list) for the # package, replacing the traditional pkg-plist file. @${RM} -rf ${FAKEDIR} ${PLIST} @${MKDIR} ${FAKEDIR}/lib/browser_plugins @${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} install .for ii in mac win .for jj in / .jar @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} .endfor .endfor @${INSTALL_DATA} ${FILESDIR}/Extensions.rdf \ ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} .if !defined (WITH_HEADERS) @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include .endif .for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS} @${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ ${GREP} / >> ${PLIST} do-install: # This is the actual installation. First, the contents of FAKEDIR are # just copied to PREFIX. cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor .for ii in f F ${RM} -f ${PREFIX}/bin/${ii}irefox ${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox .endfor ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox ${RM} -f ${PREFIX}/bin/firefox-config ${LN} -sf ${LOCAL_PREFIX}/bin/firefox-config \ ${PREFIX}/bin/firefox-config ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \ 's|${FAKEDIR}|${PREFIX}|g' -if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PLUGINSDIR}/libjavaplugin_oji.so ; \ break; \ fi; \ done; \ fi .include Property changes on: head/www/firefox10/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.91 \ No newline at end of property +1.92 \ No newline at end of property Index: head/www/firefox10/files/patch-250862 =================================================================== --- head/www/firefox10/files/patch-250862 (nonexistent) +++ head/www/firefox10/files/patch-250862 (revision 118476) @@ -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/firefox10/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/firefox10/files/patch-255067 =================================================================== --- head/www/firefox10/files/patch-255067 (nonexistent) +++ head/www/firefox10/files/patch-255067 (revision 118476) @@ -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/firefox10/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/firefox10/files/patch-256316 =================================================================== --- head/www/firefox10/files/patch-256316 (nonexistent) +++ head/www/firefox10/files/patch-256316 (revision 118476) @@ -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/firefox10/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/firefox15/Makefile =================================================================== --- head/www/firefox15/Makefile (revision 118475) +++ head/www/firefox15/Makefile (revision 118476) @@ -1,224 +1,225 @@ # New ports collection makefile for: phoenix # Date created: 2002/10/21 # Whom: Alan Eldridge # # $FreeBSD$ # PORTNAME= firefox PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla 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 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} FAKEDIR= ${WRKDIR}/fake FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME} HAS_CONFIGURE= yes ESD_LIB= libesd.so.2 LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME} NO_MTREE= yes PLIST= ${WRKDIR}/plist PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 libidl USE_ICONV= yes USE_PERL5_BUILD=yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/mozilla PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ mozilla-nspr mozilla-nss mozilla-plugin 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= DEBUG "Build a debugging image" off \ HEADERS "Install headers and IDL files" off \ LOGGING "Enable additional log messages" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ XFT "Enable support for anti-aliased fonts" on \ SMB "Enable smb:// URI support using gnomevfs" off .include .if defined(WITH_DEBUG) WITH_LOGGING= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 CONFIGURE_ENV+= WITH_OPTIMIZE=-O2 .else CONFIGURE_ENV+= WITH_OPTIMIZE=-O .endif # defined(WITH_OPTIMIZED_CFLAGS) .if defined(WITH_LOGGING) CONFIGURE_ENV+= WITH_LOGGING=yes .endif # defined(WITH_LOGGING) .if defined(WITHOUT_XFT) CONFIGURE_ENV+= WITHOUT_XFT=yes .else LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .endif # !defined(WITHOUT_XFT) .if defined(WITH_SMB) USE_GNOME+= gnomevfs2 CONFIGURE_ENV+= WITH_SMB=yes .endif # defined(WITH_SMB) CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${X11BASE}/lib LIBS+= ${PTHREAD_LIBS} EXTRA_SCRIPTS= ${PORTNAME}.rb .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= "core dumps on alpha during post-build" .endif pre-extract:: @${ECHO_MSG} @${ECHO_MSG} "Extracting source (this takes a while) ..." @${ECHO_MSG} post-extract:: # FAKEDIR is here so that nsinstall will install under FAKEDIR, not # under PREFIX. See pre-install and do-install for details. @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ -e 's|@CFLAGS@|${CFLAGS}|' \ -e 's|@LDFLAGS@|${LDFLAGS}|' \ -e 's|@LIBS@|${LIBS}|' \ -e 's|@X11BASE@|${X11BASE}|' \ -e 's|@LOCALBASE@|${LOCALBASE}|' \ -e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \ -e 's|@PERL@|${PERL5}|' \ <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig post-patch: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/nsprpub/configure @${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/config/config.mk \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @${PERL} -pi -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ embedding/minimo ${MV} ${WRKSRC}/${ii}/all.js ${WRKSRC}/${ii}/all.js.bak ${SED} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ < ${WRKSRC}/${ii}/all.js.bak > ${WRKSRC}/${ii}/all.js .endfor .for ii in ${PKGCONFIG_FILES} @${PERL} -pi -e 's|mozilla-|firefox-|g' \ ${WRKSRC}/build/unix/${ii}.pc.in .endfor 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: # XXX This works around an install problem that is triggered when # toolkit/profile/src is built after profile/src. @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so pre-install: # Overview: the program installs itself in FAKEDIR, then a list is made of the # files and directories in there. This is the PLIST (packing list) for the # package, replacing the traditional pkg-plist file. @${RM} -rf ${FAKEDIR} ${PLIST} @${MKDIR} ${FAKEDIR}/lib/browser_plugins @${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} install .for ii in mac win .for jj in / .jar @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} .endfor .endfor @${INSTALL_DATA} ${FILESDIR}/Extensions.rdf \ ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} .if !defined (WITH_HEADERS) @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include .endif .for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS} @${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ ${GREP} / >> ${PLIST} do-install: # This is the actual installation. First, the contents of FAKEDIR are # just copied to PREFIX. cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor .for ii in f F ${RM} -f ${PREFIX}/bin/${ii}irefox ${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox .endfor ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox ${RM} -f ${PREFIX}/bin/firefox-config ${LN} -sf ${LOCAL_PREFIX}/bin/firefox-config \ ${PREFIX}/bin/firefox-config ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \ 's|${FAKEDIR}|${PREFIX}|g' -if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PLUGINSDIR}/libjavaplugin_oji.so ; \ break; \ fi; \ done; \ fi .include Property changes on: head/www/firefox15/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.91 \ No newline at end of property +1.92 \ No newline at end of property Index: head/www/firefox15/files/patch-250862 =================================================================== --- head/www/firefox15/files/patch-250862 (nonexistent) +++ head/www/firefox15/files/patch-250862 (revision 118476) @@ -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/firefox15/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/firefox15/files/patch-255067 =================================================================== --- head/www/firefox15/files/patch-255067 (nonexistent) +++ head/www/firefox15/files/patch-255067 (revision 118476) @@ -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/firefox15/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/firefox15/files/patch-256316 =================================================================== --- head/www/firefox15/files/patch-256316 (nonexistent) +++ head/www/firefox15/files/patch-256316 (revision 118476) @@ -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/firefox15/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/firefox3-devel/Makefile =================================================================== --- head/www/firefox3-devel/Makefile (revision 118475) +++ head/www/firefox3-devel/Makefile (revision 118476) @@ -1,224 +1,225 @@ # New ports collection makefile for: phoenix # Date created: 2002/10/21 # Whom: Alan Eldridge # # $FreeBSD$ # PORTNAME= firefox PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla 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 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} FAKEDIR= ${WRKDIR}/fake FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME} HAS_CONFIGURE= yes ESD_LIB= libesd.so.2 LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME} NO_MTREE= yes PLIST= ${WRKDIR}/plist PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 libidl USE_ICONV= yes USE_PERL5_BUILD=yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/mozilla PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ mozilla-nspr mozilla-nss mozilla-plugin 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= DEBUG "Build a debugging image" off \ HEADERS "Install headers and IDL files" off \ LOGGING "Enable additional log messages" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ XFT "Enable support for anti-aliased fonts" on \ SMB "Enable smb:// URI support using gnomevfs" off .include .if defined(WITH_DEBUG) WITH_LOGGING= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 CONFIGURE_ENV+= WITH_OPTIMIZE=-O2 .else CONFIGURE_ENV+= WITH_OPTIMIZE=-O .endif # defined(WITH_OPTIMIZED_CFLAGS) .if defined(WITH_LOGGING) CONFIGURE_ENV+= WITH_LOGGING=yes .endif # defined(WITH_LOGGING) .if defined(WITHOUT_XFT) CONFIGURE_ENV+= WITHOUT_XFT=yes .else LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .endif # !defined(WITHOUT_XFT) .if defined(WITH_SMB) USE_GNOME+= gnomevfs2 CONFIGURE_ENV+= WITH_SMB=yes .endif # defined(WITH_SMB) CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${X11BASE}/lib LIBS+= ${PTHREAD_LIBS} EXTRA_SCRIPTS= ${PORTNAME}.rb .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= "core dumps on alpha during post-build" .endif pre-extract:: @${ECHO_MSG} @${ECHO_MSG} "Extracting source (this takes a while) ..." @${ECHO_MSG} post-extract:: # FAKEDIR is here so that nsinstall will install under FAKEDIR, not # under PREFIX. See pre-install and do-install for details. @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ -e 's|@CFLAGS@|${CFLAGS}|' \ -e 's|@LDFLAGS@|${LDFLAGS}|' \ -e 's|@LIBS@|${LIBS}|' \ -e 's|@X11BASE@|${X11BASE}|' \ -e 's|@LOCALBASE@|${LOCALBASE}|' \ -e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \ -e 's|@PERL@|${PERL5}|' \ <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig post-patch: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/nsprpub/configure @${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/config/config.mk \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @${PERL} -pi -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ embedding/minimo ${MV} ${WRKSRC}/${ii}/all.js ${WRKSRC}/${ii}/all.js.bak ${SED} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ < ${WRKSRC}/${ii}/all.js.bak > ${WRKSRC}/${ii}/all.js .endfor .for ii in ${PKGCONFIG_FILES} @${PERL} -pi -e 's|mozilla-|firefox-|g' \ ${WRKSRC}/build/unix/${ii}.pc.in .endfor 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: # XXX This works around an install problem that is triggered when # toolkit/profile/src is built after profile/src. @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so pre-install: # Overview: the program installs itself in FAKEDIR, then a list is made of the # files and directories in there. This is the PLIST (packing list) for the # package, replacing the traditional pkg-plist file. @${RM} -rf ${FAKEDIR} ${PLIST} @${MKDIR} ${FAKEDIR}/lib/browser_plugins @${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} install .for ii in mac win .for jj in / .jar @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} .endfor .endfor @${INSTALL_DATA} ${FILESDIR}/Extensions.rdf \ ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} .if !defined (WITH_HEADERS) @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include .endif .for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS} @${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ ${GREP} / >> ${PLIST} do-install: # This is the actual installation. First, the contents of FAKEDIR are # just copied to PREFIX. cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor .for ii in f F ${RM} -f ${PREFIX}/bin/${ii}irefox ${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox .endfor ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox ${RM} -f ${PREFIX}/bin/firefox-config ${LN} -sf ${LOCAL_PREFIX}/bin/firefox-config \ ${PREFIX}/bin/firefox-config ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \ 's|${FAKEDIR}|${PREFIX}|g' -if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PLUGINSDIR}/libjavaplugin_oji.so ; \ break; \ fi; \ done; \ fi .include Property changes on: head/www/firefox3-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.91 \ No newline at end of property +1.92 \ No newline at end of property Index: head/www/firefox3-devel/files/patch-250862 =================================================================== --- head/www/firefox3-devel/files/patch-250862 (nonexistent) +++ head/www/firefox3-devel/files/patch-250862 (revision 118476) @@ -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/firefox3-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/firefox3-devel/files/patch-255067 =================================================================== --- head/www/firefox3-devel/files/patch-255067 (nonexistent) +++ head/www/firefox3-devel/files/patch-255067 (revision 118476) @@ -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/firefox3-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/firefox3-devel/files/patch-256316 =================================================================== --- head/www/firefox3-devel/files/patch-256316 (nonexistent) +++ head/www/firefox3-devel/files/patch-256316 (revision 118476) @@ -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/firefox3-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/firefox35/Makefile =================================================================== --- head/www/firefox35/Makefile (revision 118475) +++ head/www/firefox35/Makefile (revision 118476) @@ -1,224 +1,225 @@ # New ports collection makefile for: phoenix # Date created: 2002/10/21 # Whom: Alan Eldridge # # $FreeBSD$ # PORTNAME= firefox PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla 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 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} FAKEDIR= ${WRKDIR}/fake FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME} HAS_CONFIGURE= yes ESD_LIB= libesd.so.2 LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME} NO_MTREE= yes PLIST= ${WRKDIR}/plist PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 libidl USE_ICONV= yes USE_PERL5_BUILD=yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/mozilla PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ mozilla-nspr mozilla-nss mozilla-plugin 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= DEBUG "Build a debugging image" off \ HEADERS "Install headers and IDL files" off \ LOGGING "Enable additional log messages" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ XFT "Enable support for anti-aliased fonts" on \ SMB "Enable smb:// URI support using gnomevfs" off .include .if defined(WITH_DEBUG) WITH_LOGGING= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 CONFIGURE_ENV+= WITH_OPTIMIZE=-O2 .else CONFIGURE_ENV+= WITH_OPTIMIZE=-O .endif # defined(WITH_OPTIMIZED_CFLAGS) .if defined(WITH_LOGGING) CONFIGURE_ENV+= WITH_LOGGING=yes .endif # defined(WITH_LOGGING) .if defined(WITHOUT_XFT) CONFIGURE_ENV+= WITHOUT_XFT=yes .else LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .endif # !defined(WITHOUT_XFT) .if defined(WITH_SMB) USE_GNOME+= gnomevfs2 CONFIGURE_ENV+= WITH_SMB=yes .endif # defined(WITH_SMB) CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${X11BASE}/lib LIBS+= ${PTHREAD_LIBS} EXTRA_SCRIPTS= ${PORTNAME}.rb .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= "core dumps on alpha during post-build" .endif pre-extract:: @${ECHO_MSG} @${ECHO_MSG} "Extracting source (this takes a while) ..." @${ECHO_MSG} post-extract:: # FAKEDIR is here so that nsinstall will install under FAKEDIR, not # under PREFIX. See pre-install and do-install for details. @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ -e 's|@CFLAGS@|${CFLAGS}|' \ -e 's|@LDFLAGS@|${LDFLAGS}|' \ -e 's|@LIBS@|${LIBS}|' \ -e 's|@X11BASE@|${X11BASE}|' \ -e 's|@LOCALBASE@|${LOCALBASE}|' \ -e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \ -e 's|@PERL@|${PERL5}|' \ <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig post-patch: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/nsprpub/configure @${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/config/config.mk \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @${PERL} -pi -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ embedding/minimo ${MV} ${WRKSRC}/${ii}/all.js ${WRKSRC}/${ii}/all.js.bak ${SED} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ < ${WRKSRC}/${ii}/all.js.bak > ${WRKSRC}/${ii}/all.js .endfor .for ii in ${PKGCONFIG_FILES} @${PERL} -pi -e 's|mozilla-|firefox-|g' \ ${WRKSRC}/build/unix/${ii}.pc.in .endfor 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: # XXX This works around an install problem that is triggered when # toolkit/profile/src is built after profile/src. @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so pre-install: # Overview: the program installs itself in FAKEDIR, then a list is made of the # files and directories in there. This is the PLIST (packing list) for the # package, replacing the traditional pkg-plist file. @${RM} -rf ${FAKEDIR} ${PLIST} @${MKDIR} ${FAKEDIR}/lib/browser_plugins @${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} install .for ii in mac win .for jj in / .jar @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} .endfor .endfor @${INSTALL_DATA} ${FILESDIR}/Extensions.rdf \ ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} .if !defined (WITH_HEADERS) @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include .endif .for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS} @${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ ${GREP} / >> ${PLIST} do-install: # This is the actual installation. First, the contents of FAKEDIR are # just copied to PREFIX. cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor .for ii in f F ${RM} -f ${PREFIX}/bin/${ii}irefox ${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox .endfor ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox ${RM} -f ${PREFIX}/bin/firefox-config ${LN} -sf ${LOCAL_PREFIX}/bin/firefox-config \ ${PREFIX}/bin/firefox-config ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \ 's|${FAKEDIR}|${PREFIX}|g' -if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PLUGINSDIR}/libjavaplugin_oji.so ; \ break; \ fi; \ done; \ fi .include Property changes on: head/www/firefox35/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.91 \ No newline at end of property +1.92 \ No newline at end of property Index: head/www/firefox35/files/patch-250862 =================================================================== --- head/www/firefox35/files/patch-250862 (nonexistent) +++ head/www/firefox35/files/patch-250862 (revision 118476) @@ -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/firefox35/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/firefox35/files/patch-255067 =================================================================== --- head/www/firefox35/files/patch-255067 (nonexistent) +++ head/www/firefox35/files/patch-255067 (revision 118476) @@ -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/firefox35/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/firefox35/files/patch-256316 =================================================================== --- head/www/firefox35/files/patch-256316 (nonexistent) +++ head/www/firefox35/files/patch-256316 (revision 118476) @@ -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/firefox35/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/firefox36/Makefile =================================================================== --- head/www/firefox36/Makefile (revision 118475) +++ head/www/firefox36/Makefile (revision 118476) @@ -1,224 +1,225 @@ # New ports collection makefile for: phoenix # Date created: 2002/10/21 # Whom: Alan Eldridge # # $FreeBSD$ # PORTNAME= firefox PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla 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 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} FAKEDIR= ${WRKDIR}/fake FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME} HAS_CONFIGURE= yes ESD_LIB= libesd.so.2 LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME} NO_MTREE= yes PLIST= ${WRKDIR}/plist PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 libidl USE_ICONV= yes USE_PERL5_BUILD=yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/mozilla PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ mozilla-nspr mozilla-nss mozilla-plugin 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= DEBUG "Build a debugging image" off \ HEADERS "Install headers and IDL files" off \ LOGGING "Enable additional log messages" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ XFT "Enable support for anti-aliased fonts" on \ SMB "Enable smb:// URI support using gnomevfs" off .include .if defined(WITH_DEBUG) WITH_LOGGING= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 CONFIGURE_ENV+= WITH_OPTIMIZE=-O2 .else CONFIGURE_ENV+= WITH_OPTIMIZE=-O .endif # defined(WITH_OPTIMIZED_CFLAGS) .if defined(WITH_LOGGING) CONFIGURE_ENV+= WITH_LOGGING=yes .endif # defined(WITH_LOGGING) .if defined(WITHOUT_XFT) CONFIGURE_ENV+= WITHOUT_XFT=yes .else LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .endif # !defined(WITHOUT_XFT) .if defined(WITH_SMB) USE_GNOME+= gnomevfs2 CONFIGURE_ENV+= WITH_SMB=yes .endif # defined(WITH_SMB) CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${X11BASE}/lib LIBS+= ${PTHREAD_LIBS} EXTRA_SCRIPTS= ${PORTNAME}.rb .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= "core dumps on alpha during post-build" .endif pre-extract:: @${ECHO_MSG} @${ECHO_MSG} "Extracting source (this takes a while) ..." @${ECHO_MSG} post-extract:: # FAKEDIR is here so that nsinstall will install under FAKEDIR, not # under PREFIX. See pre-install and do-install for details. @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ -e 's|@CFLAGS@|${CFLAGS}|' \ -e 's|@LDFLAGS@|${LDFLAGS}|' \ -e 's|@LIBS@|${LIBS}|' \ -e 's|@X11BASE@|${X11BASE}|' \ -e 's|@LOCALBASE@|${LOCALBASE}|' \ -e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \ -e 's|@PERL@|${PERL5}|' \ <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig post-patch: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/nsprpub/configure @${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/config/config.mk \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @${PERL} -pi -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ embedding/minimo ${MV} ${WRKSRC}/${ii}/all.js ${WRKSRC}/${ii}/all.js.bak ${SED} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ < ${WRKSRC}/${ii}/all.js.bak > ${WRKSRC}/${ii}/all.js .endfor .for ii in ${PKGCONFIG_FILES} @${PERL} -pi -e 's|mozilla-|firefox-|g' \ ${WRKSRC}/build/unix/${ii}.pc.in .endfor 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: # XXX This works around an install problem that is triggered when # toolkit/profile/src is built after profile/src. @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so pre-install: # Overview: the program installs itself in FAKEDIR, then a list is made of the # files and directories in there. This is the PLIST (packing list) for the # package, replacing the traditional pkg-plist file. @${RM} -rf ${FAKEDIR} ${PLIST} @${MKDIR} ${FAKEDIR}/lib/browser_plugins @${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} install .for ii in mac win .for jj in / .jar @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} .endfor .endfor @${INSTALL_DATA} ${FILESDIR}/Extensions.rdf \ ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} .if !defined (WITH_HEADERS) @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include .endif .for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS} @${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ ${GREP} / >> ${PLIST} do-install: # This is the actual installation. First, the contents of FAKEDIR are # just copied to PREFIX. cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor .for ii in f F ${RM} -f ${PREFIX}/bin/${ii}irefox ${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox .endfor ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox ${RM} -f ${PREFIX}/bin/firefox-config ${LN} -sf ${LOCAL_PREFIX}/bin/firefox-config \ ${PREFIX}/bin/firefox-config ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \ 's|${FAKEDIR}|${PREFIX}|g' -if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PLUGINSDIR}/libjavaplugin_oji.so ; \ break; \ fi; \ done; \ fi .include Property changes on: head/www/firefox36/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.91 \ No newline at end of property +1.92 \ No newline at end of property Index: head/www/firefox36/files/patch-250862 =================================================================== --- head/www/firefox36/files/patch-250862 (nonexistent) +++ head/www/firefox36/files/patch-250862 (revision 118476) @@ -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/firefox36/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/firefox36/files/patch-255067 =================================================================== --- head/www/firefox36/files/patch-255067 (nonexistent) +++ head/www/firefox36/files/patch-255067 (revision 118476) @@ -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/firefox36/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/firefox36/files/patch-256316 =================================================================== --- head/www/firefox36/files/patch-256316 (nonexistent) +++ head/www/firefox36/files/patch-256316 (revision 118476) @@ -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/firefox36/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/flock/Makefile =================================================================== --- head/www/flock/Makefile (revision 118475) +++ head/www/flock/Makefile (revision 118476) @@ -1,224 +1,225 @@ # New ports collection makefile for: phoenix # Date created: 2002/10/21 # Whom: Alan Eldridge # # $FreeBSD$ # PORTNAME= firefox PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla 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 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} FAKEDIR= ${WRKDIR}/fake FAKESUBDIR= ${FAKEDIR}/lib/${PORTNAME} HAS_CONFIGURE= yes ESD_LIB= libesd.so.2 LOCAL_PREFIX= ${PREFIX}/lib/${PORTNAME} NO_MTREE= yes PLIST= ${WRKDIR}/plist PLUGINSDIR= ${PREFIX}/lib/browser_plugins USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 libidl USE_ICONV= yes USE_PERL5_BUILD=yes USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/mozilla PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \ mozilla-nspr mozilla-nss mozilla-plugin 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= DEBUG "Build a debugging image" off \ HEADERS "Install headers and IDL files" off \ LOGGING "Enable additional log messages" off \ OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ XFT "Enable support for anti-aliased fonts" on \ SMB "Enable smb:// URI support using gnomevfs" off .include .if defined(WITH_DEBUG) WITH_LOGGING= yes CONFIGURE_ENV+= WITH_DEBUG=yes .endif # defined(WITH_DEBUG) .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 CONFIGURE_ENV+= WITH_OPTIMIZE=-O2 .else CONFIGURE_ENV+= WITH_OPTIMIZE=-O .endif # defined(WITH_OPTIMIZED_CFLAGS) .if defined(WITH_LOGGING) CONFIGURE_ENV+= WITH_LOGGING=yes .endif # defined(WITH_LOGGING) .if defined(WITHOUT_XFT) CONFIGURE_ENV+= WITHOUT_XFT=yes .else LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .endif # !defined(WITHOUT_XFT) .if defined(WITH_SMB) USE_GNOME+= gnomevfs2 CONFIGURE_ENV+= WITH_SMB=yes .endif # defined(WITH_SMB) CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${X11BASE}/lib LIBS+= ${PTHREAD_LIBS} EXTRA_SCRIPTS= ${PORTNAME}.rb .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= "core dumps on alpha during post-build" .endif pre-extract:: @${ECHO_MSG} @${ECHO_MSG} "Extracting source (this takes a while) ..." @${ECHO_MSG} post-extract:: # FAKEDIR is here so that nsinstall will install under FAKEDIR, not # under PREFIX. See pre-install and do-install for details. @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ -e 's|@CFLAGS@|${CFLAGS}|' \ -e 's|@LDFLAGS@|${LDFLAGS}|' \ -e 's|@LIBS@|${LIBS}|' \ -e 's|@X11BASE@|${X11BASE}|' \ -e 's|@LOCALBASE@|${LOCALBASE}|' \ -e 's|@PREFIX@|${FAKEDIR}/lib/firefox|' \ -e 's|@PERL@|${PERL5}|' \ <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig post-patch: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure \ ${WRKSRC}/nsprpub/configure @${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/config/config.mk \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @${PERL} -pi -e 's|libesd\.so\.\d+|${ESD_LIB}|g' \ ${WRKSRC}/widget/src/gtk2/nsSound.cpp .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ embedding/minimo ${MV} ${WRKSRC}/${ii}/all.js ${WRKSRC}/${ii}/all.js.bak ${SED} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ < ${WRKSRC}/${ii}/all.js.bak > ${WRKSRC}/${ii}/all.js .endfor .for ii in ${PKGCONFIG_FILES} @${PERL} -pi -e 's|mozilla-|firefox-|g' \ ${WRKSRC}/build/unix/${ii}.pc.in .endfor 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: # XXX This works around an install problem that is triggered when # toolkit/profile/src is built after profile/src. @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so pre-install: # Overview: the program installs itself in FAKEDIR, then a list is made of the # files and directories in there. This is the PLIST (packing list) for the # package, replacing the traditional pkg-plist file. @${RM} -rf ${FAKEDIR} ${PLIST} @${MKDIR} ${FAKEDIR}/lib/browser_plugins @${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Makefile ${MAKE_ARGS} install .for ii in mac win .for jj in / .jar @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} .endfor .endfor @${INSTALL_DATA} ${FILESDIR}/Extensions.rdf \ ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} .if !defined (WITH_HEADERS) @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include .endif .for ii in firefox Firefox firefox-config ${EXTRA_SCRIPTS} @${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ ${GREP} / >> ${PLIST} do-install: # This is the actual installation. First, the contents of FAKEDIR are # just copied to PREFIX. cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor .for ii in f F ${RM} -f ${PREFIX}/bin/${ii}irefox ${LN} -sf ${LOCAL_PREFIX}/bin/firefox ${PREFIX}/bin/${ii}irefox .endfor ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox ${RM} -f ${PREFIX}/bin/firefox-config ${LN} -sf ${LOCAL_PREFIX}/bin/firefox-config \ ${PREFIX}/bin/firefox-config ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' ${LOCAL_PREFIX}/bin/firefox-config ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} ${PERL} -pi -e \ 's|${FAKEDIR}|${PREFIX}|g' -if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ ${LN} -sf $${jpi} \ ${PLUGINSDIR}/libjavaplugin_oji.so ; \ break; \ fi; \ done; \ fi .include Property changes on: head/www/flock/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.91 \ No newline at end of property +1.92 \ No newline at end of property Index: head/www/flock/files/patch-250862 =================================================================== --- head/www/flock/files/patch-250862 (nonexistent) +++ head/www/flock/files/patch-250862 (revision 118476) @@ -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/flock/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/flock/files/patch-255067 =================================================================== --- head/www/flock/files/patch-255067 (nonexistent) +++ head/www/flock/files/patch-255067 (revision 118476) @@ -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/flock/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/flock/files/patch-256316 =================================================================== --- head/www/flock/files/patch-256316 (nonexistent) +++ head/www/flock/files/patch-256316 (revision 118476) @@ -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/flock/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