Pullup ticket 2058 - requested by ghen

security update for firefox

Revisions pulled up:
- pkgsrc/www/firefox/DESCR				1.2
- pkgsrc/www/firefox/Makefile-firefox.common		1.42
- pkgsrc/www/firefox/distinfo				1.64
- pkgsrc/www/firefox-bin/Makefile			1.27
- pkgsrc/www/firefox-bin/distinfo			1.24
- pkgsrc/www/firefox-gtk1/DESCR				1.3

   Module Name:		pkgsrc
   Committed By:	ghen
   Date:		Wed Mar 21 13:33:05 UTC 2007

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

   Log Message:
   Update firefox, firefox-bin and firefox-gtk1 to 1.5.0.11.
   Fixed in this version:

   * Security update: MFSA 2007-11 (FTP PASV port-scanning) has been fixed.
   * Website Compatibility: Fixed various web compatibility regressions.

   For more info, see http://www.mozilla.com/en-US/firefox/releases/1.5.0.11.html

6 files changed, 20 insertions, 12 deletions

diff --git a/www/firefox-bin/Makefile b/www/firefox-bin/Makefile
index 822fc2c4cbe..768fb90b168 100644
--- a/www/firefox-bin/Makefile
+++ b/www/firefox-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25.2.1 2007/03/02 20:17:01 salo Exp $
+# $NetBSD: Makefile,v 1.25.2.2 2007/03/24 18:54:16 salo Exp $
 
 MOZILLA=	firefox
-MOZ_VER=	1.5.0.10
+MOZ_VER=	1.5.0.11
 MOZ_DISTVER=	${MOZ_VER}
 
 HOMEPAGE=	http://www.mozilla.com/firefox/
diff --git a/www/firefox-bin/distinfo b/www/firefox-bin/distinfo
index 33179e7c151..684482927bb 100644
--- a/www/firefox-bin/distinfo
+++ b/www/firefox-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.22.2.1 2007/03/02 20:17:02 salo Exp $
+$NetBSD: distinfo,v 1.22.2.2 2007/03/24 18:54:16 salo Exp $
 
-SHA1 (firefox/releases/1.5.0.10/linux-i686/en-US/firefox-1.5.0.10.tar.gz) = de07b0e1fc695289d7d406ce52f02c700fc1f3eb
-RMD160 (firefox/releases/1.5.0.10/linux-i686/en-US/firefox-1.5.0.10.tar.gz) = 936668938c6ba58e941df35829dcdf53deca99e4
-Size (firefox/releases/1.5.0.10/linux-i686/en-US/firefox-1.5.0.10.tar.gz) = 8530619 bytes
+SHA1 (firefox/releases/1.5.0.11/linux-i686/en-US/firefox-1.5.0.11.tar.gz) = 180eb33fe66a9bdd4fb2b6f4ee6a07ed7e2b1046
+RMD160 (firefox/releases/1.5.0.11/linux-i686/en-US/firefox-1.5.0.11.tar.gz) = b50b1ffd4edf6d22f18fd882c4f8e6035d5d1919
+Size (firefox/releases/1.5.0.11/linux-i686/en-US/firefox-1.5.0.11.tar.gz) = 8531625 bytes
diff --git a/www/firefox-gtk1/DESCR b/www/firefox-gtk1/DESCR
index 4a65a42866e..cba6624f213 100644
--- a/www/firefox-gtk1/DESCR
+++ b/www/firefox-gtk1/DESCR
@@ -8,4 +8,8 @@ Firefox also offers excellent bookmark and history management, and it
 can be extended by developers using industry standards such as XML,
 CSS, JavaScript, C++, etc. Many extensions are available.
 
+Note: Firefox 1.5.0.x will be maintained with security and stability
+updates until April 24, 2007. All users are encouraged to upgrade to
+Firefox 2 (pkgsrc/www/firefox2 and firefox2-gtk1).
+
 firefox-gtk1 uses GTK+-1.x widgets.
diff --git a/www/firefox/DESCR b/www/firefox/DESCR
index 2f9713be943..fe99f48a261 100644
--- a/www/firefox/DESCR
+++ b/www/firefox/DESCR
@@ -7,3 +7,7 @@ windows.
 Firefox also offers excellent bookmark and history management, and it
 can be extended by developers using industry standards such as XML,
 CSS, JavaScript, C++, etc. Many extensions are available.
+
+Note: Firefox 1.5.0.x will be maintained with security and stability
+updates until April 24, 2007. All users are encouraged to upgrade to
+Firefox 2 (pkgsrc/www/firefox2 and firefox2-gtk1).
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index cb5b08dcc3c..74a891f447f 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.39.2.1 2007/03/02 20:17:00 salo Exp $
+# $NetBSD: Makefile-firefox.common,v 1.39.2.2 2007/03/24 18:54:16 salo Exp $
 
 MOZILLA_BIN=		firefox-bin
-MOZ_VER=		1.5.0.10
+MOZ_VER=		1.5.0.11
 EXTRACT_SUFX=		.tar.bz2
 
 DISTNAME=		firefox-${MOZ_VER}-source
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index b706faf4faf..125b29b9e31 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.59.2.2 2007/03/24 18:46:57 salo Exp $
+$NetBSD: distinfo,v 1.59.2.3 2007/03/24 18:54:16 salo Exp $
 
-SHA1 (firefox-1.5.0.10-source.tar.bz2) = c341958ca46d04a4dad6266cb8c11b534f5f758e
-RMD160 (firefox-1.5.0.10-source.tar.bz2) = 6d190be0fa5c38cdbf637af49a351731d4a68d06
-Size (firefox-1.5.0.10-source.tar.bz2) = 35539364 bytes
+SHA1 (firefox-1.5.0.11-source.tar.bz2) = a094ceca09306138828ffa1bce346953ff757ecc
+RMD160 (firefox-1.5.0.11-source.tar.bz2) = 060a6ad81b8312a444568a2609888d2ef1c58bfc
+Size (firefox-1.5.0.11-source.tar.bz2) = 35534921 bytes
 SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
 SHA1 (patch-ab) = eda86e19dbf45be392b6be4a40dbb25936c91439
 SHA1 (patch-ac) = c0cfa9805d883e0761b5bc63b4015cbf1e951eec