pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2006Q1]: pkgsrc/www Pullup ticket 1503 - requested by drochner
details: https://anonhg.NetBSD.org/pkgsrc/rev/4dfb5b9418c9
branches: pkgsrc-2006Q1
changeset: 510247:4dfb5b9418c9
user: salo <salo%pkgsrc.org@localhost>
date: Tue May 02 20:59:47 2006 +0000
description:
Pullup ticket 1503 - requested by drochner
security fix for firefox
Revisions pulled up:
- pkgsrc/www/firefox/Makefile 1.34
- pkgsrc/www/firefox/distinfo 1.48
- pkgsrc/www/firefox/patches/patch-fa 1.1
- pkgsrc/www/firefox/patches/patch-fb 1.1
- pkgsrc/www/firefox-gtk1/Makefile 1.12
Module Name: pkgsrc
Committed By: drochner
Date: Fri Apr 28 16:11:31 UTC 2006
Modified Files:
pkgsrc/www/firefox: Makefile distinfo
Added Files:
pkgsrc/www/firefox/patches: patch-fa patch-fb
Log Message:
Fix a memory management / refcount problem which can lead to a DOS or
possible code injection, affecting nested iframes.
See https://bugzilla.mozilla.org/show_bug.cgi?id=334515 and
http://www.securident.com/vuln/ff.txt
bump PKGREVISION
---
Module Name: pkgsrc
Committed By: drochner
Date: Tue May 2 10:10:43 UTC 2006
Modified Files:
pkgsrc/www/firefox-gtk1: Makefile
Log Message:
PKGREVISION bump for firefox security fix, pointed out by Lubomir Sedlacik
diffstat:
www/firefox-gtk1/Makefile | 3 +-
www/firefox/Makefile | 3 +-
www/firefox/distinfo | 4 +-
www/firefox/patches/patch-fa | 22 +++++++++++++
www/firefox/patches/patch-fb | 70 ++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 99 insertions(+), 3 deletions(-)
diffs (139 lines):
diff -r 8b40d5c6b077 -r 4dfb5b9418c9 www/firefox-gtk1/Makefile
--- a/www/firefox-gtk1/Makefile Tue May 02 15:55:22 2006 +0000
+++ b/www/firefox-gtk1/Makefile Tue May 02 20:59:47 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9.2.1 2006/04/15 23:32:58 salo Exp $
+# $NetBSD: Makefile,v 1.9.2.2 2006/05/02 20:59:47 salo Exp $
MOZILLA= firefox-gtk1
+PKGREVISION= 2
COMMENT= Lightweight gecko-based web browser built with GTK+-1.x
.include "../../www/firefox/Makefile-firefox.common"
diff -r 8b40d5c6b077 -r 4dfb5b9418c9 www/firefox/Makefile
--- a/www/firefox/Makefile Tue May 02 15:55:22 2006 +0000
+++ b/www/firefox/Makefile Tue May 02 20:59:47 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31.2.1 2006/04/15 23:32:58 salo Exp $
+# $NetBSD: Makefile,v 1.31.2.2 2006/05/02 20:59:47 salo Exp $
MOZILLA= firefox
+PKGREVISION= 2
EXTRACT_SUFX= .tar.bz2
COMMENT= Lightweight gecko-based web browser
diff -r 8b40d5c6b077 -r 4dfb5b9418c9 www/firefox/distinfo
--- a/www/firefox/distinfo Tue May 02 15:55:22 2006 +0000
+++ b/www/firefox/distinfo Tue May 02 20:59:47 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45.2.1 2006/04/15 23:32:58 salo Exp $
+$NetBSD: distinfo,v 1.45.2.2 2006/05/02 20:59:47 salo Exp $
SHA1 (firefox-1.5.0.2/firefox-1.5.0.2-source.tar.bz2) = 21f5497a4cdd4b142bdcb9c3fbdfea43cae1455f
RMD160 (firefox-1.5.0.2/firefox-1.5.0.2-source.tar.bz2) = a3128798930d069a175d278b5522cdc8e43dc352
@@ -59,3 +59,5 @@
SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266
SHA1 (patch-ea) = 14e31d17c2493e468cd01f99abfc996853a11032
SHA1 (patch-eb) = dc9232b10075d17f7ed742e7be8ea036db2f0241
+SHA1 (patch-fa) = 64f09a71d4d3c36a42e8ccf28b2d3e43dbf8f202
+SHA1 (patch-fb) = fb32614d012565c4cb97e489ef05f3f76d75c841
diff -r 8b40d5c6b077 -r 4dfb5b9418c9 www/firefox/patches/patch-fa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-fa Tue May 02 20:59:47 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-fa,v 1.1.2.2 2006/05/02 20:59:47 salo Exp $
+
+--- embedding/components/commandhandler/src/nsBaseCommandController.h.orig 2006-04-28 12:43:57.000000000 +0200
++++ embedding/components/commandhandler/src/nsBaseCommandController.h
+@@ -49,6 +49,8 @@
+ #include "nsIControllerContext.h"
+ #include "nsIControllerCommandTable.h"
+ #include "nsIInterfaceRequestor.h"
++#include "nsIWeakReference.h"
++#include "nsIWeakReferenceUtils.h"
+
+ // The base editor controller is used for both text widgets,
+ // and all other text and html editing
+@@ -79,7 +81,7 @@ public:
+
+ private:
+
+- nsISupports *mCommandContext;
++ nsWeakPtr mCommandContext;
+
+ // Our reference to the command manager
+ nsCOMPtr<nsIControllerCommandTable> mCommandTable;
diff -r 8b40d5c6b077 -r 4dfb5b9418c9 www/firefox/patches/patch-fb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-fb Tue May 02 20:59:47 2006 +0000
@@ -0,0 +1,70 @@
+$NetBSD: patch-fb,v 1.1.2.2 2006/05/02 20:59:47 salo Exp $
+
+--- embedding/components/commandhandler/src/nsBaseCommandController.cpp.orig 2006-04-28 12:43:57.000000000 +0200
++++ embedding/components/commandhandler/src/nsBaseCommandController.cpp
+@@ -55,7 +55,6 @@ NS_INTERFACE_MAP_BEGIN(nsBaseCommandCont
+ NS_INTERFACE_MAP_END
+
+ nsBaseCommandController::nsBaseCommandController()
+-: mCommandContext(nsnull)
+ {
+ }
+
+@@ -79,7 +78,7 @@ nsBaseCommandController::Init(nsIControl
+ NS_IMETHODIMP
+ nsBaseCommandController::SetCommandContext(nsISupports *aCommandContext)
+ {
+- mCommandContext = aCommandContext; // no addref
++ mCommandContext = do_GetWeakReference(aCommandContext);
+ return NS_OK;
+ }
+
+@@ -113,7 +112,8 @@ nsBaseCommandController::IsCommandEnable
+ {
+ NS_ENSURE_ARG_POINTER(aCommand);
+ NS_ENSURE_ARG_POINTER(aResult);
+- return mCommandTable->IsCommandEnabled(aCommand, mCommandContext, aResult);
++ nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
++ return mCommandTable->IsCommandEnabled(aCommand, context, aResult);
+ }
+
+ NS_IMETHODIMP
+@@ -121,14 +121,16 @@ nsBaseCommandController::SupportsCommand
+ {
+ NS_ENSURE_ARG_POINTER(aCommand);
+ NS_ENSURE_ARG_POINTER(aResult);
+- return mCommandTable->SupportsCommand(aCommand, mCommandContext, aResult);
++ nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
++ return mCommandTable->SupportsCommand(aCommand, context, aResult);
+ }
+
+ NS_IMETHODIMP
+ nsBaseCommandController::DoCommand(const char *aCommand)
+ {
+ NS_ENSURE_ARG_POINTER(aCommand);
+- return mCommandTable->DoCommand(aCommand, mCommandContext);
++ nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
++ return mCommandTable->DoCommand(aCommand, context);
+ }
+
+ NS_IMETHODIMP
+@@ -136,7 +138,8 @@ nsBaseCommandController::DoCommandWithPa
+ nsICommandParams *aParams)
+ {
+ NS_ENSURE_ARG_POINTER(aCommand);
+- return mCommandTable->DoCommandParams(aCommand, aParams, mCommandContext);
++ nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
++ return mCommandTable->DoCommandParams(aCommand, aParams, context);
+ }
+
+ NS_IMETHODIMP
+@@ -144,7 +147,8 @@ nsBaseCommandController::GetCommandState
+ nsICommandParams *aParams)
+ {
+ NS_ENSURE_ARG_POINTER(aCommand);
+- return mCommandTable->GetCommandState(aCommand, aParams, mCommandContext);
++ nsCOMPtr<nsISupports> context = do_QueryReferent(mCommandContext);
++ return mCommandTable->GetCommandState(aCommand, aParams, context);
+ }
+
+ NS_IMETHODIMP
Home |
Main Index |
Thread Index |
Old Index