>Number:         26570
>Category:       pkg
>Synopsis:       update firefox and firefox-gtk2 to 0.9.3
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Aug 06 12:39:01 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Kouichirou Hiratsuka
>Release:        NetBSD 2.0G
>Organization:
>Environment:
System: NetBSD firefly.localdomain 2.0G NetBSD 2.0G (FIREFLY.MP) #48: Fri Aug 6 08:58:50 JST 2004 root@firefly.localdomain:/usr/src/sys/arch/i386/compile/FIREFLY.MP i386
Architecture: i386
Machine: i386
>Description:
	Firefox 0.9.3 was released on Aug. 4.  Three security vulnerabilities
	have been fixed.

	- Importing false CA certificate leading to error -8182 (perm DoS),
	  especially exploitable by email (#249004)
	- lock icon and certificates spoofable with onunload document.write
	  (#253121)
	- new libpng buffer overflow vulnerabilities (#251381)

>How-To-Repeat:
	
>Fix:
	Update MOZ_VER and distinfo.  Patches don't need to update.
	And common data put to firefox/Makefile.common.

diff -ruN firefox.orig/Makefile firefox/Makefile
--- firefox.orig/Makefile	2004-07-05 23:25:29.000000000 +0900
+++ firefox/Makefile	2004-08-06 19:05:15.000000000 +0900
@@ -2,32 +2,13 @@
 
 MOZILLA=	firefox
 MOZILLA_BIN=	firefox-bin
-MOZCONFDIR=	.mozilla
-MOZ_VER=	0.9.1
-PKGREVISION=	1
+MOZ_VER=	0.9.3
 EXTRACT_SUFX=	.tar.bz2
-DISTNAME=	${MOZILLA}-${MOZ_VER}-source
-MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
-		ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
-		http://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/ \
-		ftp://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/
 
-HOMEPAGE=	http://www.mozilla.org/projects/firefox/
-COMMENT=	Lightweight gecko-based web browser
-
-CONFIGURE_ENV+=	MOZ_PHOENIX=1
-MAKE_ENV+=	MOZ_PHOENIX=1
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-CONFIGURE_ARGS+=	--disable-mailnews
-CONFIGURE_ARGS+=	--disable-composer
-CONFIGURE_ARGS+=	--enable-extensions=default,-irc
+COMMENT=	Lightweight gecko-based web browser
 
 BUILD_MATHML=	# defined
 
-pre-install:
-	${CP} -r ${WRKSRC}/dist/bin/defaults/profile/extensions \
-							${WRKSRC}/dist/bin
-	${MV} ${WRKSRC}/dist/bin/extensions/installed-extensions.txt \
-		${WRKSRC}/dist/bin/extensions/installed-extensions-processed.txt
-
-.include "../../www/mozilla/Makefile.common"
+.include "../../www/firefox/Makefile.common"
diff -ruN firefox.orig/Makefile.common firefox/Makefile.common
--- firefox.orig/Makefile.common	1970-01-01 09:00:00.000000000 +0900
+++ firefox/Makefile.common	2004-08-06 19:07:14.000000000 +0900
@@ -0,0 +1,26 @@
+# $NetBSD$
+
+DISTNAME?=	firefox-${MOZ_VER}-source
+MOZCONFDIR=	.mozilla
+
+MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
+		ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
+		http://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/ \
+		ftp://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/
+
+HOMEPAGE=	http://www.mozilla.org/projects/firefox/
+
+CONFIGURE_ENV+=	MOZ_PHOENIX=1
+MAKE_ENV+=	MOZ_PHOENIX=1
+
+CONFIGURE_ARGS+=	--disable-mailnews
+CONFIGURE_ARGS+=	--disable-composer
+CONFIGURE_ARGS+=	--enable-extensions=default,-irc
+
+pre-install:
+	${CP} -r ${WRKSRC}/dist/bin/defaults/profile/extensions \
+							${WRKSRC}/dist/bin
+	${MV} ${WRKSRC}/dist/bin/extensions/installed-extensions.txt \
+		${WRKSRC}/dist/bin/extensions/installed-extensions-processed.txt
+
+.include "../../www/mozilla/Makefile.common"
diff -ruN firefox.orig/distinfo firefox/distinfo
--- firefox.orig/distinfo	2004-07-05 23:25:29.000000000 +0900
+++ firefox/distinfo	2004-08-06 18:26:39.000000000 +0900
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.10 2004/07/05 14:25:29 taya Exp $
 
-SHA1 (firefox-0.9.1-source.tar.bz2) = 34053c9d8c42abbaba295cb1b0129ac5e3456e30
-Size (firefox-0.9.1-source.tar.bz2) = 33960883 bytes
+SHA1 (firefox-0.9.3-source.tar.bz2) = db6290743d824559c5bb7b6bd060b65abcaea15b
+Size (firefox-0.9.3-source.tar.bz2) = 33945173 bytes
 SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9
 SHA1 (patch-ab) = 0c1f2d6cca09b4dd6b168ed29d84d245967a3369
 SHA1 (patch-ac) = e9bc27529cf595ab6f120d9021dd7d6c49112084
diff -ruN firefox-gtk2.orig/CVS/Entries firefox-gtk2/CVS/Entries
--- firefox-gtk2.orig/CVS/Entries	2004-08-06 18:26:31.000000000 +0900
+++ firefox-gtk2/CVS/Entries	2004-08-06 18:26:12.000000000 +0900
@@ -1,5 +1,5 @@
 /DESCR/1.1.1.1/Sun Feb 29 17:46:52 2004//
-/MESSAGE/1.2/Mon Jul  5 14:25:55 2004//
-/Makefile/1.11/Mon Jul  5 14:25:55 2004//
 /PLIST/1.6/Thu Jun 24 04:07:50 2004//
+/MESSAGE/1.2/Tue Jul  6 08:23:42 2004//
+/Makefile/1.11/Fri Aug  6 08:18:10 2004//
 D
diff -ruN firefox-gtk2.orig/Makefile firefox-gtk2/Makefile
--- firefox-gtk2.orig/Makefile	2004-07-05 23:25:55.000000000 +0900
+++ firefox-gtk2/Makefile	2004-08-06 19:05:09.000000000 +0900
@@ -2,38 +2,19 @@
 
 MOZILLA=	firefox-gtk2
 MOZILLA_BIN=	firefox-bin
-MOZ_VER=	0.9.1
-PKGREVISION=	1
+MOZ_VER=	0.9.3
 EXTRACT_SUFX=	.tar.bz2
 
-DISTNAME=	firefox-${MOZ_VER}-source
-MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
-		ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
-		http://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/ \
-		ftp://public.planetmirror.com.au/pub/firefox/releases/${MOZ_VER}/
-
-HOMEPAGE=	http://www.mozilla.org/projects/firefox/
-COMMENT=	Lightweight gecko-based web browser built with GTK2
-
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DISTINFO_FILE=	${.CURDIR}/../../www/firefox/distinfo
 PATCHDIR=	${.CURDIR}/../../www/firefox/patches
 
-CONFIGURE_ENV+=	MOZ_PHOENIX=1
-MAKE_ENV+=	MOZ_PHOENIX=1
-
-CONFIGURE_ARGS+=	--disable-mailnews
-CONFIGURE_ARGS+=	--disable-composer
-CONFIGURE_ARGS+=	--enable-extensions=default,-irc
+COMMENT=	Lightweight gecko-based web browser built with GTK2
 
 USE_GCC_SHLIB=		yes
 BUILD_MATHML=		# defined
+
 MOZILLA_USE_GTK2=	# defined
 MOZILLA_USE_XFT=	YES
 
-pre-install:
-	${CP} -r ${WRKSRC}/dist/bin/defaults/profile/extensions \
-							${WRKSRC}/dist/bin
-	${MV} ${WRKSRC}/dist/bin/extensions/installed-extensions.txt \
-		${WRKSRC}/dist/bin/extensions/installed-extensions-processed.txt
-
-.include "../../www/mozilla/Makefile.common"
+.include "../../www/firefox/Makefile.common"
>Release-Note:
>Audit-Trail:
>Unformatted: