Pullup ticket 339 - requested by Shin'ichiro TAYA

security fix for firefox

Patch supplied by submitter, equals to:

   Module Name:		pkgsrc
   Committed By:	taya
   Date:		Sun Feb 27 13:20:43 UTC 2005

   Log Message:
   Update firefox to 1.0.1.

   Changes from release notes:

   * Improved stability
   * International Domain Names are now displayed as punycode.
     (To show International Domain Names in Unicode, set the
     "network.IDN_show_punycode" preference to false.)
   * Several security fixes.
   MFSA 2005-29  Internationalized Domain Name (IDN) homograph spoofing
   MFSA 2005-28 Unsafe /tmp/plugtmp directory exploitable to erase user's files
   MFSA 2005-27 Plugins can be used to load privileged content
   MFSA 2005-26 Cross-site scripting by dropping javascript: link on tab
   MFSA 2005-25 Image drag and drop executable spoofing
   MFSA 2005-24 HTTP auth prompt tab spoofing
   MFSA 2005-23 Download dialog source spoofing
   MFSA 2005-22 Download dialog spoofing using Content-Disposition header
   MFSA 2005-21 Overwrite arbitrary files downloading .lnk twice
   MFSA 2005-20 XSLT can include stylesheets from arbitrary hosts
   MFSA 2005-19 Autocomplete data leak
   MFSA 2005-18 Memory overwrite in string library
   MFSA 2005-17 Install source spoofing with user:pass@host
   MFSA 2005-16 Spoofing download and security dialogs with overlapping windows
   MFSA 2005-15 Heap overflow possible in UTF8 to Unicode conversion
   MFSA 2005-14 SSL "secure site" indicator spoofing
   MFSA 2005-13 Window Injection Spoofing

6 files changed, 33 insertions, 13 deletions

diff --git a/www/firefox-gtk2/PLIST b/www/firefox-gtk2/PLIST
index 5f582969d8c..9533d3075a2 100644
--- a/www/firefox-gtk2/PLIST
+++ b/www/firefox-gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/12/03 16:45:54 taya Exp $
+@comment $NetBSD: PLIST,v 1.11.2.1 2005/03/09 19:16:39 salo Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -726,8 +726,11 @@ include/${MOZILLA}/docshell/nsIDocShell.h
 include/${MOZILLA}/docshell/nsIDocShellHistory.h
 include/${MOZILLA}/docshell/nsIDocShellLoadInfo.h
 include/${MOZILLA}/docshell/nsIDocShellTreeItem.h
+include/${MOZILLA}/docshell/nsIDocShellTreeItemTmp.h
 include/${MOZILLA}/docshell/nsIDocShellTreeNode.h
+include/${MOZILLA}/docshell/nsIDocShellTreeNodeTmp.h
 include/${MOZILLA}/docshell/nsIDocShellTreeOwner.h
+include/${MOZILLA}/docshell/nsIDocShellTreeOwnerTmp.h
 include/${MOZILLA}/docshell/nsIEditorDocShell.h
 include/${MOZILLA}/docshell/nsIGlobalHistory.h
 include/${MOZILLA}/docshell/nsIGlobalHistory2.h
@@ -2230,7 +2233,10 @@ include/${MOZILLA}/zlib/zlib.h
 @comment end INCLUDE
 @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
 @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/firefox-bin -register
+@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/${MOZILLA_BIN} -register
+@unexec ${RM} %D/lib/${MOZILLA}/extensions/Extensions.rdf
+@unexec ${RM} %D/lib/${MOZILLA}/extensions/installed-extensions-processed.txt
+@unexec ${RM} %D/lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/content/overlays.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/communicator/content/overlays.rdf
@@ -2239,6 +2245,9 @@ include/${MOZILLA}/zlib/zlib.h
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/navigator/content/overlays.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
 @unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat
+@unexec ${RM} %D/lib/${MOZILLA}/components.ini
+@dirrm lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+@dirrm lib/${MOZILLA}/extensions
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/navigator/content
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/navigator
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/messenger/content
@@ -2281,6 +2290,7 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm lib/${MOZILLA}/chrome/icons/default
 @dirrm lib/${MOZILLA}/chrome/icons
 @dirrm lib/${MOZILLA}/chrome
+@dirrm lib/${MOZILLA}
 @dirrm include/${MOZILLA}/zlib
 @dirrm include/${MOZILLA}/xultmpl
 @dirrm include/${MOZILLA}/xuldoc
@@ -2326,6 +2336,7 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/sidebar
 @dirrm include/${MOZILLA}/shistory
 @dirrm include/${MOZILLA}/shellservice
+@dirrm include/${MOZILLA}/seccmd
 @dirrm include/${MOZILLA}/satchel
 @dirrm include/${MOZILLA}/rdfutil
 @dirrm include/${MOZILLA}/rdf
diff --git a/www/firefox-gtk2/buildlink3.mk b/www/firefox-gtk2/buildlink3.mk
index dfc264a8191..a840939614d 100644
--- a/www/firefox-gtk2/buildlink3.mk
+++ b/www/firefox-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/11/17 02:34:53 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.1.2.1 2005/03/09 19:16:39 salo Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FIREFOX_GTK2_BUILDLINK3_MK:=	${FIREFOX_GTK2_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfirefox-gtk2}
 BUILDLINK_PACKAGES+=	firefox-gtk2
 
 .if !empty(FIREFOX_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.firefox-gtk2+=	firefox-gtk2>=1.0nb1
+BUILDLINK_DEPENDS.firefox-gtk2+=	firefox-gtk2>=1.0.1
 BUILDLINK_PKGSRCDIR.firefox-gtk2?=	../../www/firefox-gtk2
 .endif	# FIREFOX_GTK2_BUILDLINK3_MK
 
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index a14e0c938d3..821e210c00c 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.10 2004/12/03 16:45:54 taya Exp $
+# $NetBSD: Makefile-firefox.common,v 1.10.2.1 2005/03/09 19:16:39 salo Exp $
 
 MOZILLA_BIN=	firefox-bin
-MOZ_VER=	1.0
-PKGREVISION=	2
+MOZ_VER=	1.0.1
 EXTRACT_SUFX=	.tar.bz2
 
 DISTNAME=	firefox-${MOZ_VER}-source
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 315b95ba2a5..23f7540e86e 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/12/03 16:45:54 taya Exp $
+@comment $NetBSD: PLIST,v 1.11.2.1 2005/03/09 19:16:39 salo Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -714,8 +714,11 @@ include/${MOZILLA}/docshell/nsIDocShell.h
 include/${MOZILLA}/docshell/nsIDocShellHistory.h
 include/${MOZILLA}/docshell/nsIDocShellLoadInfo.h
 include/${MOZILLA}/docshell/nsIDocShellTreeItem.h
+include/${MOZILLA}/docshell/nsIDocShellTreeItemTmp.h
 include/${MOZILLA}/docshell/nsIDocShellTreeNode.h
+include/${MOZILLA}/docshell/nsIDocShellTreeNodeTmp.h
 include/${MOZILLA}/docshell/nsIDocShellTreeOwner.h
+include/${MOZILLA}/docshell/nsIDocShellTreeOwnerTmp.h
 include/${MOZILLA}/docshell/nsIEditorDocShell.h
 include/${MOZILLA}/docshell/nsIGlobalHistory.h
 include/${MOZILLA}/docshell/nsIGlobalHistory2.h
@@ -2216,6 +2219,9 @@ include/${MOZILLA}/zlib/zlib.h
 @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
 @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
 @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/firefox-bin -register
+@unexec ${RM} %D/lib/${MOZILLA}/extensions/Extensions.rdf
+@unexec ${RM} %D/lib/${MOZILLA}/extensions/installed-extensions-processed.txt
+@unexec ${RM} %D/lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/content/overlays.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/communicator/content/overlays.rdf
@@ -2224,6 +2230,9 @@ include/${MOZILLA}/zlib/zlib.h
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/navigator/content/overlays.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
 @unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat
+@unexec ${RM} %D/lib/${MOZILLA}/components.ini
+@dirrm lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+@dirrm lib/${MOZILLA}/extensions
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/navigator/content
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/navigator
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/messenger/content
@@ -2264,6 +2273,7 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm lib/${MOZILLA}/components/myspell
 @dirrm lib/${MOZILLA}/components
 @dirrm lib/${MOZILLA}/chrome
+@dirrm lib/${MOZILLA}
 @dirrm include/${MOZILLA}/zlib
 @dirrm include/${MOZILLA}/xultmpl
 @dirrm include/${MOZILLA}/xuldoc
diff --git a/www/firefox/buildlink3.mk b/www/firefox/buildlink3.mk
index 55a9aa7b7c7..dd6bc34efd1 100644
--- a/www/firefox/buildlink3.mk
+++ b/www/firefox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/11/17 02:34:53 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.1.2.1 2005/03/09 19:16:39 salo Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FIREFOX_BUILDLINK3_MK:=	${FIREFOX_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfirefox}
 BUILDLINK_PACKAGES+=	firefox
 
 .if !empty(FIREFOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.firefox+=	firefox>=1.0nb1
+BUILDLINK_DEPENDS.firefox+=	firefox>=1.0.1
 BUILDLINK_PKGSRCDIR.firefox?=	../../www/firefox
 .endif	# FIREFOX_BUILDLINK3_MK
 
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 6f404fb43c8..98aa772821d 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.23 2004/12/04 04:43:49 taya Exp $
+$NetBSD: distinfo,v 1.23.2.1 2005/03/09 19:16:39 salo Exp $
 
-SHA1 (firefox-1.0/firefox-1.0-source.tar.bz2) = a115c28f53d093da7832f6b80c982acb5b469f83
-Size (firefox-1.0/firefox-1.0-source.tar.bz2) = 32686249 bytes
+SHA1 (firefox-1.0.1/firefox-1.0.1-source.tar.bz2) = 269fe256b8dfd4ac10f18e420546289e9d7c545b
+Size (firefox-1.0.1/firefox-1.0.1-source.tar.bz2) = 32671529 bytes
 SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9
 SHA1 (patch-ab) = 0c1f2d6cca09b4dd6b168ed29d84d245967a3369
 SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642