Pullup ticket 793 - requested by Shin'ichiro TAYA

security update for mozilla

Revisions pulled up:
- pkgsrc/www/mozilla/Makefile			1.152
- pkgsrc/www/mozilla/buildlink3.mk		1.14
- pkgsrc/www/mozilla/distinfo			1.88
- pkgsrc/www/mozilla-gtk2/Makefile		1.30
- pkgsrc/www/mozilla-gtk2/buildlink3.mk		1.12

   Module Name:		pkgsrc
   Committed By:	taya
   Date:		Sat Oct  1 04:42:09 UTC 2005

   Modified Files:
   	pkgsrc/www/mozilla: Makefile buildlink3.mk distinfo
   	pkgsrc/www/mozilla-gtk2: Makefile buildlink3.mk

   Log Message:
   Update mozilla & mozilla-gtk2 to 1.7.12

   This is a bug fix release.
   Fixed bugs are follows:

   * Fix for a potential buffer overflow vulnerability when loading
     a hostname with all soft-hyphens
   * Fix to prevent URLs passed from external programs from being
     parsed by the shell (Linux only)
   * Fix to prevent a crash when loading a Proxy Auto-Config (PAC)
     script that uses an "eval" statement
   * Fix to restore InstallTrigger.getVersion() for Extension authors
   * Fix a crash in mail when stopping a search and then searching again
   * Other stability and security fixes
   	MFSA 2005-59 Command-line handling on Linux allows shell execution
   	MFSA 2005-58 Firefox 1.0.7 / Mozilla Suite 1.7.12 Vulnerability Fixes
   	MFSA 2005-57 IDN heap overrun using soft-hyphens

5 files changed, 14 insertions, 16 deletions

diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile
index fd9aa248449..2f24ef5dcb4 100644
--- a/www/mozilla-gtk2/Makefile
+++ b/www/mozilla-gtk2/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.29 2005/09/17 02:35:20 jlam Exp $
+# $NetBSD: Makefile,v 1.29.2.1 2005/10/01 18:47:18 salo Exp $
 
 MOZILLA=	mozilla-gtk2
 MOZILLA_BIN=	mozilla-bin
-MOZ_VER=	1.7.11
+MOZ_VER=	1.7.12
 EXTRACT_SUFX=	.tar.bz2
-PKGREVISION=	2
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 #DISTFILES+=	mozilla-source-1.7.3-libart_lgpl.tar.bz2
 #SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL}
-DIST_SUBDIR=	mozilla-1.7.11
+DIST_SUBDIR=	mozilla-1.7.12
 DISTINFO_FILE=	${.CURDIR}/../../www/mozilla/distinfo
 PATCHDIR=	${.CURDIR}/../../www/mozilla/patches
 FILESDIR=	${.CURDIR}/../../www/mozilla/files
diff --git a/www/mozilla-gtk2/buildlink3.mk b/www/mozilla-gtk2/buildlink3.mk
index 740638d04b4..5302195e721 100644
--- a/www/mozilla-gtk2/buildlink3.mk
+++ b/www/mozilla-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/08/03 14:30:50 taya Exp $
+# $NetBSD: buildlink3.mk,v 1.11.2.1 2005/10/01 18:47:18 salo Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MOZILLA_GTK2_BUILDLINK3_MK:=	${MOZILLA_GTK2_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	mozilla-gtk2
 
 .if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mozilla-gtk2+=	mozilla-gtk2>=1.7.5
-BUILDLINK_RECOMMENDED.mozilla-gtk2+=	mozilla-gtk2>=1.7.11
+BUILDLINK_RECOMMENDED.mozilla-gtk2+=	mozilla-gtk2>=1.7.12
 BUILDLINK_PKGSRCDIR.mozilla-gtk2?=	../../www/mozilla-gtk2
 .endif	# MOZILLA_GTK2_BUILDLINK3_MK
 
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index c28068b8c8c..55b01c16ada 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.151 2005/09/17 02:35:19 jlam Exp $
+# $NetBSD: Makefile,v 1.151.2.1 2005/10/01 18:47:18 salo Exp $
 
 MOZILLA=	mozilla
 MOZILLA_BIN=	mozilla-bin
-MOZ_VER=	1.7.11
+MOZ_VER=	1.7.12
 EXTRACT_SUFX=	.tar.bz2
-PKGREVISION=	2
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 #DISTFILES+=    mozilla-source-1.7.3-libart_lgpl.tar.bz2
 #SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL}
 
-DIST_SUBDIR=	mozilla-1.7.11
+DIST_SUBDIR=	mozilla-1.7.12
 
 COMMENT=	Full featured gecko-based browser
 
diff --git a/www/mozilla/buildlink3.mk b/www/mozilla/buildlink3.mk
index 4b95e104ef3..6c75ff17aec 100644
--- a/www/mozilla/buildlink3.mk
+++ b/www/mozilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2005/08/03 14:30:50 taya Exp $
+# $NetBSD: buildlink3.mk,v 1.13.2.1 2005/10/01 18:47:18 salo Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MOZILLA_BUILDLINK3_MK:=	${MOZILLA_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	mozilla
 
 .if !empty(MOZILLA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mozilla+=	mozilla>=1.7.5
-BUILDLINK_RECOMMENDED.mozilla+=	mozilla>=1.7.11
+BUILDLINK_RECOMMENDED.mozilla+=	mozilla>=1.7.12
 BUILDLINK_PKGSRCDIR.mozilla?=	../../www/mozilla
 .endif	# MOZILLA_BUILDLINK3_MK
 
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index ea5be6ef421..d45c8a8c048 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.86 2005/09/08 22:03:45 abs Exp $
+$NetBSD: distinfo,v 1.86.2.1 2005/10/01 18:47:18 salo Exp $
 
-SHA1 (mozilla-1.7.11/mozilla-1.7.11-source.tar.bz2) = 1805ee3f65c73ea66a8cb7a69b12273345c14184
-RMD160 (mozilla-1.7.11/mozilla-1.7.11-source.tar.bz2) = 32396e6654e3addff4cb494ac8ac7e5ecdbbc173
-Size (mozilla-1.7.11/mozilla-1.7.11-source.tar.bz2) = 30448903 bytes
+SHA1 (mozilla-1.7.12/mozilla-1.7.12-source.tar.bz2) = d94251b86d36b8d5e3e45d31a67ebe334f1ba267
+RMD160 (mozilla-1.7.12/mozilla-1.7.12-source.tar.bz2) = 8881779a39f360a814177ed948fab5a8330193aa
+Size (mozilla-1.7.12/mozilla-1.7.12-source.tar.bz2) = 30446836 bytes
 SHA1 (patch-aa) = be62070f062e8ae13f06bd7b3f4f0d4a9ee67bef
 SHA1 (patch-ab) = ceff4fae4f3c1f7d23db41a04e5da81e1c897424
 SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642