From owner-freebsd-gnome@FreeBSD.ORG Wed Nov 28 21:05:08 2007 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 621B216A417; Wed, 28 Nov 2007 21:05:08 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [210.51.165.229]) by mx1.freebsd.org (Postfix) with ESMTP id EA4C113C45B; Wed, 28 Nov 2007 21:05:07 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from localhost (tarsier.geekcn.org [210.51.165.229]) by tarsier.geekcn.org (Postfix) with ESMTP id 4093EEC27C3; Thu, 29 Nov 2007 05:05:18 +0800 (CST) X-Virus-Scanned: amavisd-new at geekcn.org Received: from tarsier.geekcn.org ([210.51.165.229]) by localhost (mail.geekcn.org [210.51.165.229]) (amavisd-new, port 10024) with ESMTP id p5rF17MKsvEV; Thu, 29 Nov 2007 05:05:12 +0800 (CST) Received: from charlie.delphij.net (71.5.7.139.ptr.us.xo.net [71.5.7.139]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTP id 0A81DEC2745; Thu, 29 Nov 2007 05:05:10 +0800 (CST) DomainKey-Signature: a=rsa-sha1; s=default; d=delphij.net; c=nofws; q=dns; h=message-id:date:from:reply-to:organization:user-agent: mime-version:to:cc:subject:references:in-reply-to: x-enigmail-version:content-type; b=F4ZWOT47C/+H9bq9vFpyyQFTwvNajRzgp+X6F2BS9QRUMYmOwLEl+zb5WLryESAXX 2F4WOLutOPbyn3WzBgOmA== Message-ID: <474DD7F8.6080105@delphij.net> Date: Wed, 28 Nov 2007 13:04:56 -0800 From: Xin LI Organization: The FreeBSD Project User-Agent: Thunderbird 2.0.0.9 (X11/20071125) MIME-Version: 1.0 To: Joe Marcus Clarke References: <474C993B.4060706@delphij.net> <1196233491.75142.15.camel@shumai.marcuscom.com> <474DB41B.7010901@marcuscom.com> In-Reply-To: <474DB41B.7010901@marcuscom.com> X-Enigmail-Version: 0.95.5 Content-Type: multipart/mixed; boundary="------------020204000703050209010702" Cc: d@delphij.net, freebsd-gnome@freebsd.org, portmgr@freebsd.org Subject: Re: [PATCH] Update firefox to 2.0.0.10 X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: d@delphij.net List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Nov 2007 21:05:08 -0000 This is a multi-part message in MIME format. --------------020204000703050209010702 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Joe Marcus Clarke wrote: > Jeremy Messenger wrote: [...] >> http://www.neowin.net/news/main/07/11/28/firefox-20010-gaffe-prompts-quick-fix > >> https://bugzilla.mozilla.org/show_bug.cgi?id=405584 > >> One of us will have to dig to find patch or we can create security patch >> instead update it to 2.0.0.10. > > Looks like this should fix it. Can someone run a quick test? I'll try > and get to it myself. > > https://bugzilla.mozilla.org/attachment.cgi?id=284556 Here is a patch, I have verified it myself. Cheers, - -- Xin LI http://www.delphij.net/ FreeBSD - The Power to Serve! -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQFHTdf4hcUczkLqiksRAjcfAJ9HlekLLPPoVOHsd1NEBY28X6W+mgCgt+tk 0Q5L5KrWJf8+v372iNuZR7o= =LJbY -----END PGP SIGNATURE----- --------------020204000703050209010702 Content-Type: text/x-patch; name="firefox-2010-quickfix.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="firefox-2010-quickfix.diff" Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/firefox/Makefile,v retrieving revision 1.186 diff -u -p -r1.186 Makefile --- Makefile 28 Nov 2007 17:47:33 -0000 1.186 +++ Makefile 28 Nov 2007 19:22:18 -0000 @@ -8,6 +8,7 @@ PORTNAME= firefox DISTVERSION= 2.0.0.10 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} Index: files/patch-content__canvas__src__nsCanvasRenderingContext2D.cpp =================================================================== RCS file: files/patch-content__canvas__src__nsCanvasRenderingContext2D.cpp diff -N files/patch-content__canvas__src__nsCanvasRenderingContext2D.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-content__canvas__src__nsCanvasRenderingContext2D.cpp 28 Nov 2007 19:22:05 -0000 @@ -0,0 +1,26 @@ +Index: content/canvas/src/nsCanvasRenderingContext2D.cpp +=================================================================== +RCS file: /cvsroot/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp,v +retrieving revision 1.102 +diff -u -8 -p -r1.102 nsCanvasRenderingContext2D.cpp +--- content/canvas/src/nsCanvasRenderingContext2D.cpp 10 Oct 2007 20:31:45 -0000 1.102 ++++ content/canvas/src/nsCanvasRenderingContext2D.cpp 11 Oct 2007 23:31:32 -0000 +@@ -2140,17 +2140,17 @@ nsCanvasRenderingContext2D::CairoSurface + getter_AddRefs(imgRequest)); + NS_ENSURE_SUCCESS(rv, rv); + if (!imgRequest) + // XXX ERRMSG we need to report an error to developers here! (bug 329026) + return NS_ERROR_NOT_AVAILABLE; + + PRUint32 status; + imgRequest->GetImageStatus(&status); +- if (status != imgIRequest::STATUS_LOAD_COMPLETE) ++ if ((status & imgIRequest::STATUS_LOAD_COMPLETE) == 0) + return NS_ERROR_NOT_AVAILABLE; + + nsCOMPtr uri; + rv = imageLoader->GetCurrentURI(uriOut); + NS_ENSURE_SUCCESS(rv, rv); + + *forceWriteOnlyOut = PR_FALSE; + --------------020204000703050209010702--