Pullup ticket 1826 - requested by ghen

security update for firefox

Revisions pulled up:
- pkgsrc/www/firefox/Makefile-firefox.common		1.36, 1.37
- pkgsrc/www/firefox/distinfo				1.53, 1.54
- pkgsrc/www/firefox-bin/Makefile			1.20, 1.21
- pkgsrc/www/firefox-bin/Makefile.Linux.i386		1.7
- pkgsrc/www/firefox-bin/distinfo			1.19, 1.20

   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Thu Aug  3 08:31:28 UTC 2006

   Modified Files:
   	pkgsrc/www/firefox-bin: Makefile Makefile.Linux.i386 distinfo

   Log Message:
   Update "firefox-bin" package to version 1.5.0.6. Changes since 1.5.0.5:
   - Fixed an issue with playing Windows Media content
---
   Module Name:		pkgsrc
   Committed By:	ghen
   Date:		Thu Aug  3 09:37:35 UTC 2006

   Modified Files:
   	pkgsrc/www/firefox: Makefile-firefox.common distinfo

   Log Message:
   Update www/firefox* to Firefox 1.5.0.6.  Just one change:

   - Fixed an issue with playing Windows Media content
---
   Module Name:		pkgsrc
   Committed By:	ghen
   Date:		Fri Sep 15 09:24:30 UTC 2006

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

   Log Message:
   Update firefox-bin to 1.5.0.7.  Source package update will follow later.

   Fixed in Firefox 1.5.0.7:
   MFSA 2006-64 Crashes with evidence of memory corruption (rv:1.8.0.7)
   MFSA 2006-62 Popup-blocker cross-site scripting (XSS)
   MFSA 2006-61 Frame spoofing using document.open()
   MFSA 2006-60 RSA Signature Forgery
   MFSA 2006-59 Concurrency-related vulnerability
   MFSA 2006-58 Auto-Update compromise through DNS and SSL spoofing
   MFSA 2006-57 JavaScript Regular Expression Heap Corruption

   For more info, see http://www.mozilla.com/firefox/releases/1.5.0.7.html
---
   Module Name:		pkgsrc
   Committed By:	ghen
   Date:		Fri Sep 15 13:53:08 UTC 2006

   Modified Files:
   	pkgsrc/www/firefox: Makefile-firefox.common distinfo

   Log Message:
   Update firefox and firefox-gtk1 to 1.5.0.7.  Fixed in this version:

   MFSA 2006-64 Crashes with evidence of memory corruption (rv:1.8.0.7)
   MFSA 2006-62 Popup-blocker cross-site scripting (XSS)
   MFSA 2006-61 Frame spoofing using document.open()
   MFSA 2006-60 RSA Signature Forgery
   MFSA 2006-59 Concurrency-related vulnerability
   MFSA 2006-58 Auto-Update compromise through DNS and SSL spoofing
   MFSA 2006-57 JavaScript Regular Expression Heap Corruption

   For more info, see http://www.mozilla.com/firefox/releases/1.5.0.7.html

5 files changed, 16 insertions, 16 deletions

diff --git a/www/firefox-bin/Makefile b/www/firefox-bin/Makefile
index 7090433f872..96a4346215e 100644
--- a/www/firefox-bin/Makefile
+++ b/www/firefox-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18.2.1 2006/07/27 12:46:37 salo Exp $
+# $NetBSD: Makefile,v 1.18.2.2 2006/09/16 18:00:09 salo Exp $
 
 MOZILLA=	firefox
-MOZ_VER=	1.5.0.5
+MOZ_VER=	1.5.0.7
 MOZ_DISTVER=	${MOZ_VER}
 
 HOMEPAGE=	http://www.mozilla.com/firefox/
diff --git a/www/firefox-bin/Makefile.Linux.i386 b/www/firefox-bin/Makefile.Linux.i386
index 59c6ec2e95e..85acf85e9df 100644
--- a/www/firefox-bin/Makefile.Linux.i386
+++ b/www/firefox-bin/Makefile.Linux.i386
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.Linux.i386,v 1.6 2006/05/03 19:47:36 jdolecek Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.6.2.1 2006/09/16 18:00:09 salo Exp $
 
 DISTNAME=	${MOZILLA}-${MOZ_DISTVER}
 MOZ_DISTDIR=	releases/${MOZ_DIR}/linux-i686/en-US
 MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/firefox/${MOZ_DISTDIR}/ \
-		http://ftp.cvut.cz/mozilla/firefox/${MOZ_DISTDIR}/
-
+		http://ftp.cvut.cz/mozilla/firefox/${MOZ_DISTDIR}/ \
+		http://www.mirrorservice.org/sites/ftp.mozilla.org/pub/mozilla.org/firefox/${MOZ_DISTDIR}/ \
+		ftp://ftp.fu-berlin.de/unix/www/firefox/${MOZ_DISTDIR}/
 
 MOZ_PLATFORM=	linux
diff --git a/www/firefox-bin/distinfo b/www/firefox-bin/distinfo
index 6e7abe59054..aa325ff725c 100644
--- a/www/firefox-bin/distinfo
+++ b/www/firefox-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17.2.1 2006/07/27 12:46:37 salo Exp $
+$NetBSD: distinfo,v 1.17.2.2 2006/09/16 18:00:09 salo Exp $
 
-SHA1 (firefox/releases/1.5.0.5/linux-i686/en-US/firefox-1.5.0.5.tar.gz) = a14d958d3af13bc517a17ebc3e9ff5c79c552037
-RMD160 (firefox/releases/1.5.0.5/linux-i686/en-US/firefox-1.5.0.5.tar.gz) = 1df5169e576c1709dc6e8a242545125e2ba3f57d
-Size (firefox/releases/1.5.0.5/linux-i686/en-US/firefox-1.5.0.5.tar.gz) = 8468627 bytes
+SHA1 (firefox/releases/1.5.0.7/linux-i686/en-US/firefox-1.5.0.7.tar.gz) = 61bdb6a73f6ab02abfde0070e946ea443171fda4
+RMD160 (firefox/releases/1.5.0.7/linux-i686/en-US/firefox-1.5.0.7.tar.gz) = db54624c61650e9102b4b893a3635631764bd275
+Size (firefox/releases/1.5.0.7/linux-i686/en-US/firefox-1.5.0.7.tar.gz) = 8472682 bytes
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index 05b07838348..3f1ca1a5289 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile-firefox.common,v 1.34.2.1 2006/07/30 11:40:44 salo Exp $
+# $NetBSD: Makefile-firefox.common,v 1.34.2.2 2006/09/16 18:00:09 salo Exp $
 
 MOZILLA_BIN=		firefox-bin
-MOZ_VER=		1.5.0.5
+MOZ_VER=		1.5.0.7
 EXTRACT_SUFX=		.tar.bz2
 
 DISTNAME=		firefox-${MOZ_VER}-source
-DIST_SUBDIR=		firefox-${MOZ_VER}
 
 MASTER_SITES=		http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/source/
 MASTER_SITES+=		ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/source/
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 80f2a512a8a..ff43b8cc10f 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.50.2.1 2006/07/30 11:40:44 salo Exp $
+$NetBSD: distinfo,v 1.50.2.2 2006/09/16 18:00:09 salo Exp $
 
-SHA1 (firefox-1.5.0.5/firefox-1.5.0.5-source.tar.bz2) = e4a5d4fb1a2fd5ee8f65fff1e39f2871bc0113ef
-RMD160 (firefox-1.5.0.5/firefox-1.5.0.5-source.tar.bz2) = d3a086cddfeeba8b857f2fa1b83f0aabffe66a96
-Size (firefox-1.5.0.5/firefox-1.5.0.5-source.tar.bz2) = 35519188 bytes
+SHA1 (firefox-1.5.0.7-source.tar.bz2) = f10d57af87bddc1b929ec5321688ac0efa880960
+RMD160 (firefox-1.5.0.7-source.tar.bz2) = 156a73842949d4fcd401dfaa54afc6cac3aa66c2
+Size (firefox-1.5.0.7-source.tar.bz2) = 35541113 bytes
 SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
 SHA1 (patch-ab) = eda86e19dbf45be392b6be4a40dbb25936c91439
 SHA1 (patch-ac) = c0cfa9805d883e0761b5bc63b4015cbf1e951eec