Update legacy firefox36 package to 3.6.21.

Fixes some security issues:

MFSA 2011-34 Protection against fraudulent DigiNotar certificates
MFSA 2011-30 Security issues addressed in Firefox 3.6.20
MFSA 2011-24 Cookie isolation error
MFSA 2011-23 Multiple dangling pointer vulnerabilities
MFSA 2011-22 Integer overflow and arbitrary code execution in Array.reduceRight()
MFSA 2011-21 Memory corruption due to multipart/x-mixed-replace images
MFSA 2011-20 Use-after-free vulnerability when viewing XUL document with script disabled
MFSA 2011-19 Miscellaneous memory safety hazards (rv:3.0/1.9.2.18)

4 files changed, 7 insertions, 46 deletions

diff --git a/devel/xulrunner192/Makefile b/devel/xulrunner192/Makefile
index fa1572454e6..ebab22599f0 100644
--- a/devel/xulrunner192/Makefile
+++ b/devel/xulrunner192/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2011/08/20 13:05:49 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2011/09/05 11:05:21 tnn Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner192-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-PKGREVISION=	2
 CATEGORIES=	devel www
 
 MAINTAINER=	tnn@NetBSD.org
diff --git a/devel/xulrunner192/dist.mk b/devel/xulrunner192/dist.mk
index 76973232b31..06a7ff249a9 100644
--- a/devel/xulrunner192/dist.mk
+++ b/devel/xulrunner192/dist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dist.mk,v 1.2 2011/05/04 13:53:45 tnn Exp $
+# $NetBSD: dist.mk,v 1.3 2011/09/05 11:05:21 tnn Exp $
 #
 # used by devel/xulrunner192/Makefile
 # used by www/firefox36/Makefile
@@ -6,7 +6,7 @@
 DISTNAME=	firefox-${FIREFOX_VER}.source
 FIREFOX_VER=	3.6${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	1.9.2
-MOZ_BRANCH_MINOR=	.17
+MOZ_BRANCH_MINOR=	.21
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/devel/xulrunner192/distinfo b/devel/xulrunner192/distinfo
index 6f3472338fd..c2886f4c1ab 100644
--- a/devel/xulrunner192/distinfo
+++ b/devel/xulrunner192/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2011/08/20 13:05:49 tnn Exp $
+$NetBSD: distinfo,v 1.4 2011/09/05 11:05:21 tnn Exp $
 
-SHA1 (firefox-3.6.17.source.tar.bz2) = 1ae71e8e2838d438de2f6f860fe77d067f3629ee
-RMD160 (firefox-3.6.17.source.tar.bz2) = af7320c7447dea4b1722b937bb77b20943e9e68d
-Size (firefox-3.6.17.source.tar.bz2) = 51522989 bytes
+SHA1 (firefox-3.6.21.source.tar.bz2) = 3c1f001ad22d93b48e191999f548b4382db3d36c
+RMD160 (firefox-3.6.21.source.tar.bz2) = b883221eca22ddb4a9f2ce2c966d4bf406051c34
+Size (firefox-3.6.21.source.tar.bz2) = 51556131 bytes
 SHA1 (patch-aa) = 88223c8a4047d284d31e91aa28af23d9b0caaf5a
 SHA1 (patch-ab) = a9a9db3f53ecac231007de9ed163bd99f2184462
 SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
@@ -48,7 +48,6 @@ SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00
 SHA1 (patch-mm) = 8db6fbb1197147978bce1de5c9b8017ed940efd1
 SHA1 (patch-mn) = e7e5e615ca26f7cee0fb27b796fd3d423d693f6b
 SHA1 (patch-mp) = 34bf95224cdecedd93566f9405f725b0c9b5ee0f
-SHA1 (patch-nd) = f5156ca4d1e61dd1b355bbaa5ebd9cc490d8d865
 SHA1 (patch-pa) = df6b19762f03070794fb4cdce79fe792ed9284b1
 SHA1 (patch-pb) = 61f9b8aa5bc377167980f8c2a8715062ac00e66e
 SHA1 (patch-pc) = 4fac35249d1a36c6ccaa3f4e3b4677998ee1d6ee
diff --git a/devel/xulrunner192/patches/patch-nd b/devel/xulrunner192/patches/patch-nd
deleted file mode 100644
index 43ef0bd6687..00000000000
--- a/devel/xulrunner192/patches/patch-nd
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-nd,v 1.1.1.1 2011/04/19 11:16:08 tnn Exp $
-
-# reported upstream as
-#   https://bugzilla.mozilla.org/show_bug.cgi?id=514002
-
---- gfx/qcms/iccread.c.orig	2009-07-30 17:30:16.000000000 +0200
-+++ gfx/qcms/iccread.c	2009-09-01 21:29:29.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <math.h>
- #include <assert.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "qcmsint.h"
- 
- //XXX: use a better typename
-@@ -84,7 +85,9 @@ static uint32_t read_u32(struct mem_sour
- 		invalid_source(mem, "Invalid offset");
- 		return 0;
- 	} else {
--		return be32_to_cpu(*(__be32*)(mem->buf + offset));
-+		uint32_t v;
-+		memcpy(&v, mem->buf + offset, 4);
-+		return be32_to_cpu(v);
- 	}
- }
- 
-@@ -94,7 +97,9 @@ static uint16_t read_u16(struct mem_sour
- 		invalid_source(mem, "Invalid offset");
- 		return 0;
- 	} else {
--		return be16_to_cpu(*(__be16*)(mem->buf + offset));
-+		uint16_t v;
-+		memcpy(&v, mem->buf + offset, 2);
-+		return be16_to_cpu(v);
- 	}
- }
-