Update to Firefox 1.5.0.2.

Firefox 1.5.0.2 offers improved stability, and several security fixes:

MFSA 2006-29 Spoofing with translucent windows (pkgsrc vulnid. 1818)
MFSA 2006-28 Security check of js_ValueToFunctionObject() can be circumvented (vulnid. 1819)
MFSA 2006-25 Privilege escalation through Print Preview (vulnid. 1820)
MFSA 2006-24 Privilege escalation using crypto.generateCRMFRequest (vulnid. 1821)
MFSA 2006-23 File stealing by changing input type (vulnid. 1822)
MFSA 2006-22 CSS Letter-Spacing Heap Overflow Vulnerability (vulnid. 1823)
MFSA 2006-20 Crashes with evidence of memory corruption (rv:1.8.0.2) (vulnid. 1824)

For a detailed ChangeLog, see:
http://www.squarefree.com/burningedge/releases/1.5.0.2.html

5 files changed, 18 insertions, 21 deletions

diff --git a/www/firefox-gtk1/Makefile b/www/firefox-gtk1/Makefile
index e47d96ec83c..30557219e6d 100644
--- a/www/firefox-gtk1/Makefile
+++ b/www/firefox-gtk1/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:11:21 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/15 14:20:31 ghen Exp $
 
 MOZILLA=	firefox-gtk1
-PKGREVISION=	1
 COMMENT=	Lightweight gecko-based web browser built with GTK+-1.x
 
 .include "../../www/firefox/Makefile-firefox.common"
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 3b0b0f17c7b..3505f1338ba 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2006/02/06 09:20:46 ghen Exp $
+# $NetBSD: Makefile,v 1.32 2006/04/15 14:20:31 ghen Exp $
 
 MOZILLA=		firefox
-PKGREVISION=		1
 EXTRACT_SUFX=		.tar.bz2
 COMMENT=		Lightweight gecko-based web browser
 
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index e80663b49a0..10c8cb75aa9 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.28 2006/03/14 01:14:34 jlam Exp $
+# $NetBSD: Makefile-firefox.common,v 1.29 2006/04/15 14:20:31 ghen Exp $
 
 MOZILLA_BIN=		firefox-bin
-MOZ_VER=		1.5.0.1
+MOZ_VER=		1.5.0.2
 EXTRACT_SUFX=		.tar.bz2
 
 DISTNAME=		firefox-${MOZ_VER}-source
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index e0957f9f5c9..9b2c8a0e40d 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.46 2006/04/13 14:47:50 taya Exp $
+$NetBSD: distinfo,v 1.47 2006/04/15 14:20:31 ghen Exp $
 
-SHA1 (firefox-1.5.0.1/firefox-1.5.0.1-source.tar.bz2) = 719a0c5218ead7a4e426612277e1c92c33800d38
-RMD160 (firefox-1.5.0.1/firefox-1.5.0.1-source.tar.bz2) = 6e332fb1a7e80ab56d3d6e3de3d203c8c58217bf
-Size (firefox-1.5.0.1/firefox-1.5.0.1-source.tar.bz2) = 34705286 bytes
+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
+Size (firefox-1.5.0.2/firefox-1.5.0.2-source.tar.bz2) = 35234245 bytes
 SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
-SHA1 (patch-ab) = bcc480ab0f7d1760bf4f26b6464db6b69fa3b4d6
+SHA1 (patch-ab) = eda86e19dbf45be392b6be4a40dbb25936c91439
 SHA1 (patch-ac) = c0cfa9805d883e0761b5bc63b4015cbf1e951eec
 SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79
 SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d
diff --git a/www/firefox/patches/patch-ab b/www/firefox/patches/patch-ab
index 72d7644050d..855b84a3cd7 100644
--- a/www/firefox/patches/patch-ab
+++ b/www/firefox/patches/patch-ab
@@ -1,10 +1,9 @@
-$NetBSD: patch-ab,v 1.5 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-ab,v 1.6 2006/04/15 14:20:31 ghen Exp $
 
-diff -ruN ../Orig/mozilla/configure.in ./configure.in
---- ../Orig/mozilla/configure.in	2005-10-04 14:53:49.000000000 +0900
-+++ ./configure.in	2005-12-04 19:02:51.000000000 +0900
-@@ -1360,7 +1360,7 @@
-     esac
+--- configure.in.orig	2006-04-15 10:47:18.000000000 +0200
++++ configure.in
+@@ -1418,7 +1418,7 @@ case "$target" in
+     LDFLAGS=$_SAVE_LDFLAGS
      ;;
  
 -*-freebsd*)
@@ -12,7 +11,7 @@ diff -ruN ../Orig/mozilla/configure.in ./configure.in
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1374,6 +1374,9 @@
+@@ -1432,6 +1432,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -22,7 +21,7 @@ diff -ruN ../Orig/mozilla/configure.in ./configure.in
      ;; 
  
  *-hpux*)
-@@ -1768,6 +1771,13 @@
+@@ -1826,6 +1829,13 @@ case "$target" in
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -36,7 +35,7 @@ diff -ruN ../Orig/mozilla/configure.in ./configure.in
      ;;
  
  *-nto*) 
-@@ -1993,7 +2003,7 @@
+@@ -2051,7 +2061,7 @@ dnl the qsort routine under solaris is f
         MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
         MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
         MKSHLIB_UNFORCE_ALL=''
@@ -45,7 +44,7 @@ diff -ruN ../Orig/mozilla/configure.in ./configure.in
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
-@@ -5205,7 +5215,7 @@
+@@ -5279,7 +5289,7 @@ dnl ====================================
  dnl = Enable code optimization. ON by default.
  dnl ========================================================
  if test -z "$MOZ_OPTIMIZE_FLAGS"; then