Pullup ticket 2203 - requested by ghen

security update for firefox

Revisions pulled up:
- pkgsrc/www/firefox/Makefile-firefox.common		1.49
- pkgsrc/www/firefox/distinfo				1.70
- pkgsrc/www/firefox/patches/patch-ac			1.10
- pkgsrc/www/firefox-bin/Makefile			1.35
- pkgsrc/www/firefox-bin/distinfo			1.33, 1.34, 1.35

   Module Name:		pkgsrc
   Committed By:	ghen
   Date:		Fri Oct 19 08:59:56 UTC 2007

   Modified Files:
   	pkgsrc/www/firefox: Makefile-firefox.common distinfo
   	pkgsrc/www/firefox-bin: Makefile distinfo
   	pkgsrc/www/firefox/patches: patch-ac

   Log Message:
   Update firefox, firefox-bin and firefox-gtk1 to 2.0.0.8.

   Security fixes in this version:

   MFSA 2007-36 URIs with invalid %-encoding mishandled by Windows
   MFSA 2007-35 XPCNativeWrapper pollution using Script object
   MFSA 2007-34 Possible file stealing through sftp protocol
   MFSA 2007-33 XUL pages can hide the window titlebar
   MFSA 2007-32 File input focus stealing vulnerability
   MFSA 2007-31 Browser digest authentication request splitting
   MFSA 2007-30 onUnload Tailgating
   MFSA 2007-29 Crashes with evidence of memory corruption (rv:1.8.1.8)

   For more info, see http://www.mozilla.com/en-US/firefox/2.0.0.8/releasenotes/
---
   Module Name:		pkgsrc
   Committed By:	ghen
   Date:		Fri Oct 19 19:47:43 UTC 2007

   Modified Files:
   	pkgsrc/www/firefox-bin: distinfo

   Log Message:
   Add distinfo entries for Solaris {8,10}/{i386,sparc} as well.
   Noted by dmcmahill.
---
   Module Name:		pkgsrc
   Committed By:	ghen
   Date:		Sat Oct 20 10:42:37 UTC 2007

   Modified Files:
   	pkgsrc/www/firefox-bin: distinfo

   Log Message:
   Remove empty lines to get rid of warnings in weekly pkgsrc checks on babylon5.
   Suggested by veego.

5 files changed, 34 insertions, 39 deletions

diff --git a/www/firefox-bin/Makefile b/www/firefox-bin/Makefile
index 3aa96e9d765..df11f1d0de0 100644
--- a/www/firefox-bin/Makefile
+++ b/www/firefox-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2007/09/20 07:17:32 ghen Exp $
+# $NetBSD: Makefile,v 1.34.2.1 2007/10/22 23:18:58 salo Exp $
 
 MOZILLA=		firefox
-MOZ_VER=		2.0.0.7
+MOZ_VER=		2.0.0.8
 MOZ_DISTVER=		${MOZ_VER}
 
 HOMEPAGE=		http://www.mozilla.com/en-US/firefox/
diff --git a/www/firefox-bin/distinfo b/www/firefox-bin/distinfo
index 3c8ad99932c..819997322a9 100644
--- a/www/firefox-bin/distinfo
+++ b/www/firefox-bin/distinfo
@@ -1,21 +1,17 @@
-# $NetBSD: distinfo,v 1.32 2007/10/07 19:58:46 dmcmahill Exp $
+$NetBSD: distinfo,v 1.32.2.1 2007/10/22 23:18:58 salo Exp $
 
-SHA1 (firefox/releases/2.0.0.7/linux-i686/en-US/firefox-2.0.0.7.tar.gz) = a5acf3e329549634be8ccf5a435ba563298440d8
-RMD160 (firefox/releases/2.0.0.7/linux-i686/en-US/firefox-2.0.0.7.tar.gz) = b098d2d40e8c899ece96230f0f5b88615c14728b
-Size (firefox/releases/2.0.0.7/linux-i686/en-US/firefox-2.0.0.7.tar.gz) = 9671863 bytes
-
-SHA1 (firefox/releases/2.0.0.7/contrib/solaris_tarball/firefox-2.0.0.7.en-US.solaris8-i386-gtk1.tar.bz2) = 9912e56145b2b9679ff7319d970fbe363dced590
-RMD160 (firefox/releases/2.0.0.7/contrib/solaris_tarball/firefox-2.0.0.7.en-US.solaris8-i386-gtk1.tar.bz2) = a099077e66a52dcca416062cf2995746dc483682
-Size (firefox/releases/2.0.0.7/contrib/solaris_tarball/firefox-2.0.0.7.en-US.solaris8-i386-gtk1.tar.bz2) = 11204630 bytes
-
-SHA1 (firefox/releases/2.0.0.7/contrib/solaris_tarball/firefox-2.0.0.7.en-US.solaris8-sparc-gtk1.tar.bz2) = f421cfa7bde1f9cf6298edf44533efc3abdce7b1
-RMD160 (firefox/releases/2.0.0.7/contrib/solaris_tarball/firefox-2.0.0.7.en-US.solaris8-sparc-gtk1.tar.bz2) = ddfcac9d6ad9c52052d35ef641be295cce66cc36
-Size (firefox/releases/2.0.0.7/contrib/solaris_tarball/firefox-2.0.0.7.en-US.solaris8-sparc-gtk1.tar.bz2) = 12870048 bytes
-
-SHA1 (firefox/releases/2.0.0.7/contrib/solaris_tarball/firefox-2.0.0.7.en-US.solaris10-i386.tar.bz2) = 5b2033936e1e9184d6c60e99fa05610d64154556
-RMD160 (firefox/releases/2.0.0.7/contrib/solaris_tarball/firefox-2.0.0.7.en-US.solaris10-i386.tar.bz2) = 9fcbacc21d1fb14bfe9026ea355f948400aa13b7
-Size (firefox/releases/2.0.0.7/contrib/solaris_tarball/firefox-2.0.0.7.en-US.solaris10-i386.tar.bz2) = 11887270 bytes
-
-SHA1 (firefox/releases/2.0.0.7/contrib/solaris_tarball/firefox-2.0.0.7.en-US.solaris10-sparc.tar.bz2) = e795b984782ce6c15309b8f2d95fbdc992f9addd
-RMD160 (firefox/releases/2.0.0.7/contrib/solaris_tarball/firefox-2.0.0.7.en-US.solaris10-sparc.tar.bz2) = 819dd37356b5ef006ab7f065bc6a11da59ef7931
-Size (firefox/releases/2.0.0.7/contrib/solaris_tarball/firefox-2.0.0.7.en-US.solaris10-sparc.tar.bz2) = 13373259 bytes
+SHA1 (firefox/releases/2.0.0.8/contrib/solaris_tarball/firefox-2.0.0.8.en-US.solaris8-i386-gtk1.tar.bz2) = 58495ecd499efd69c25fcff26d8d50d307382a36
+RMD160 (firefox/releases/2.0.0.8/contrib/solaris_tarball/firefox-2.0.0.8.en-US.solaris8-i386-gtk1.tar.bz2) = 12025ab2f5a01dc19e538f578037b3dfcf8ac223
+Size (firefox/releases/2.0.0.8/contrib/solaris_tarball/firefox-2.0.0.8.en-US.solaris8-i386-gtk1.tar.bz2) = 27258 bytes
+SHA1 (firefox/releases/2.0.0.8/contrib/solaris_tarball/firefox-2.0.0.8.en-US.solaris8-sparc-gtk1.tar.bz2) = 619f687740dd4710c66dc23d5dd45917d39de7ef
+RMD160 (firefox/releases/2.0.0.8/contrib/solaris_tarball/firefox-2.0.0.8.en-US.solaris8-sparc-gtk1.tar.bz2) = 553fa2ea79e3b77c9358b62551b9b908fd10c3b5
+Size (firefox/releases/2.0.0.8/contrib/solaris_tarball/firefox-2.0.0.8.en-US.solaris8-sparc-gtk1.tar.bz2) = 27267 bytes
+SHA1 (firefox/releases/2.0.0.8/contrib/solaris_tarball/firefox-2.0.0.8.en-US.solaris10-i386.tar.bz2) = 8b92d36408828b7a324fb9545a77624ce8bf7857
+RMD160 (firefox/releases/2.0.0.8/contrib/solaris_tarball/firefox-2.0.0.8.en-US.solaris10-i386.tar.bz2) = 6633aeca93fee425f7087201ddd1eb8922e88896
+Size (firefox/releases/2.0.0.8/contrib/solaris_tarball/firefox-2.0.0.8.en-US.solaris10-i386.tar.bz2) = 11896427 
+SHA1 (firefox/releases/2.0.0.8/contrib/solaris_tarball/firefox-2.0.0.8.en-US.solaris10-sparc.tar.bz2) = 9c4f5b5ccb002b58fd2046cae45706e6d19bf9c1
+RMD160 (firefox/releases/2.0.0.8/contrib/solaris_tarball/firefox-2.0.0.8.en-US.solaris10-sparc.tar.bz2) = 18c14763a1966f642a8937ff5a348a6868a0f659
+Size (firefox/releases/2.0.0.8/contrib/solaris_tarball/firefox-2.0.0.8.en-US.solaris10-sparc.tar.bz2) = 13363688 
+SHA1 (firefox/releases/2.0.0.8/linux-i686/en-US/firefox-2.0.0.8.tar.gz) = f22c615a73fa1eb11a1a9237646ae86a81007da3
+RMD160 (firefox/releases/2.0.0.8/linux-i686/en-US/firefox-2.0.0.8.tar.gz) = 7a4a3a088090f6f3d3622294e092c1a58f427c69
+Size (firefox/releases/2.0.0.8/linux-i686/en-US/firefox-2.0.0.8.tar.gz) = 9674559 bytes
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index b977249a73a..c0f48e3dc41 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.48 2007/09/20 07:17:31 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.48.2.1 2007/10/22 23:18:57 salo Exp $
 
 MOZILLA_BIN=		firefox-bin
-MOZ_VER=		2.0.0.7
+MOZ_VER=		2.0.0.8
 EXTRACT_SUFX=		.tar.bz2
 
 DISTNAME=		firefox-${MOZ_VER}-source
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 7f04076472e..cd2b4fe054e 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.69 2007/09/20 07:17:32 ghen Exp $
+$NetBSD: distinfo,v 1.69.2.1 2007/10/22 23:18:58 salo Exp $
 
-SHA1 (firefox-2.0.0.7-source.tar.bz2) = fad5670c21bd634c93a8cfc4abcfcfeb09a6a7df
-RMD160 (firefox-2.0.0.7-source.tar.bz2) = 8fd4e43cda35b2401d6ed800305d4fc52216ea1c
-Size (firefox-2.0.0.7-source.tar.bz2) = 37394798 bytes
+SHA1 (firefox-2.0.0.8-source.tar.bz2) = 98d145e9c23d7171fc2440582f085126615f0cde
+RMD160 (firefox-2.0.0.8-source.tar.bz2) = beccaf1cb30e8f00a0f58e671c2c27490ad2001a
+Size (firefox-2.0.0.8-source.tar.bz2) = 37452335 bytes
 SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
 SHA1 (patch-ab) = 19069a4e572744eccb04e9906e16dad28d2dac01
-SHA1 (patch-ac) = 3f28e27c100655aca4daaca02a77a76064359e94
+SHA1 (patch-ac) = 96bee96d365d6a95d14031f4f1df9584b94d570b
 SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79
 SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d
 SHA1 (patch-af) = 01e10664fbf20dffa53ecb94be24a421c39b838b
diff --git a/www/firefox/patches/patch-ac b/www/firefox/patches/patch-ac
index d2925ff6270..375b6da1c48 100644
--- a/www/firefox/patches/patch-ac
+++ b/www/firefox/patches/patch-ac
@@ -1,9 +1,8 @@
-$NetBSD: patch-ac,v 1.9 2007/05/12 13:53:07 ghen Exp $
+$NetBSD: patch-ac,v 1.9.4.1 2007/10/22 23:18:58 salo Exp $
 
-diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2005-06-15 17:32:21.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	2005-12-04 19:03:04.000000000 +0900
-@@ -61,10 +61,13 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2007-10-03 14:54:53.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -62,10 +62,13 @@ include $(topsrcdir)/config/config.mk
  #
  # Lots of Unixish x86 flavors
  #
@@ -17,8 +16,8 @@ diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/
 +endif
  endif
  #
- # New code for Linux, et. al., with gcc
-@@ -157,7 +160,7 @@
+ # OpenBSD/amd64
+@@ -170,7 +173,7 @@ endif
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -27,7 +26,7 @@ diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/
  CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -191,7 +194,7 @@
+@@ -214,7 +217,7 @@ endif
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -36,7 +35,7 @@ diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -274,6 +277,7 @@
+@@ -297,6 +300,7 @@ endif
  ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))                           
  CPPSRCS		:= xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
  ASFILES		:= xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
@@ -44,7 +43,7 @@ diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/
  endif
  
  #
-@@ -322,6 +326,13 @@
+@@ -353,6 +357,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
  CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif