Update to 10.0.6

* Remove obsolete mozilla-jit option

Changelog:
Fix the following security issues.

MFSA 2012-56 Code execution through javascript: URLs
MFSA 2012-54 Clickjacking of certificate warning page
MFSA 2012-53 Content Security Policy 1.0 implementation errors cause data leakage
MFSA 2012-52 JSDependentString::undepend string conversion results in memory corruption
MFSA 2012-51 X-Frame-Options header ignored when duplicated
MFSA 2012-49 Same-compartment Security Wrappers can be bypassed
MFSA 2012-48 use-after-free in nsGlobalWindow::PageHidden
MFSA 2012-47 Improper filtering of javascript in HTML feed-view
MFSA 2012-45 Spoofing issue with location
MFSA 2012-44 Gecko memory corruption
MFSA 2012-42 Miscellaneous memory safety hazards (rv:14.0/ rv:10.0.6)

4 files changed, 9 insertions, 46 deletions

diff --git a/mail/thunderbird10/Makefile b/mail/thunderbird10/Makefile
index 732e13a1ea8..fa321fddbf0 100644
--- a/mail/thunderbird10/Makefile
+++ b/mail/thunderbird10/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2012/06/14 07:43:59 sbd Exp $
+# $NetBSD: Makefile,v 1.8 2012/08/04 12:03:31 ryoon Exp $
 #
 
 DISTNAME=	thunderbird-${TB_VER}esr.source
 PKGNAME=	thunderbird10-${TB_VER}
-TB_VER=		10.0.5
-PKGREVISION=	1
+TB_VER=		10.0.6
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA_ESR:=thunderbird/releases/${TB_VER}esr/source/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/thunderbird10/PLIST b/mail/thunderbird10/PLIST
index 46b7fbdc1df..fd099726bef 100644
--- a/mail/thunderbird10/PLIST
+++ b/mail/thunderbird10/PLIST
@@ -1,17 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/29 20:36:30 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/08/04 12:03:31 ryoon Exp $
 bin/thunderbird10
-${PLIST.jit}include/thunderbird10/Allocator.h
-${PLIST.jit}include/thunderbird10/Assembler.h
 include/thunderbird10/AtkSocketAccessible.h
 include/thunderbird10/BasicLayers.h
 include/thunderbird10/CheckedInt.h
-${PLIST.jit}include/thunderbird10/CodeAlloc.h
-${PLIST.jit}include/thunderbird10/Containers.h
 include/thunderbird10/CustomQS_Canvas2D.h
 include/thunderbird10/CustomQS_WebGL.h
 include/thunderbird10/EGLUtils.h
 include/thunderbird10/ForceDiscreteGPUHelperCGL.h
-${PLIST.jit}include/thunderbird10/Fragmento.h
 include/thunderbird10/FrameLayerBuilder.h
 include/thunderbird10/FramePropertyTable.h
 include/thunderbird10/GLContext.h
@@ -26,34 +21,25 @@ include/thunderbird10/IPC/nsGUIEventIPC.h
 include/thunderbird10/ImageErrors.h
 include/thunderbird10/ImageLayers.h
 include/thunderbird10/ImageLogging.h
-${PLIST.jit}include/thunderbird10/LIR.h
-${PLIST.jit}include/thunderbird10/LIRopcode.tbl
 include/thunderbird10/LayerManagerOGL.h
 include/thunderbird10/LayerManagerOGLProgram.h
 include/thunderbird10/Layers.h
 include/thunderbird10/MailNewsTypes.h
 include/thunderbird10/MailNewsTypes2.h
 include/thunderbird10/NSReg.h
-${PLIST.jit}include/thunderbird10/Native.h
-${PLIST.jit}include/thunderbird10/NativeCommon.h
-${PLIST.jit}include/thunderbird10/Native${NANOJIT_ARCH}.h
 include/thunderbird10/PCOMContentPermissionRequestChild.h
 include/thunderbird10/PPrefTuple.h
 include/thunderbird10/PrefTuple.h
 include/thunderbird10/ReadbackLayer.h
-${PLIST.jit}include/thunderbird10/RegAlloc.h
 include/thunderbird10/TabMessageUtils.h
-${PLIST.jit}include/thunderbird10/VMPI.h
 include/thunderbird10/VerReg.h
 include/thunderbird10/VideoUtils.h
-${PLIST.jit}include/thunderbird10/Writer.h
 include/thunderbird10/a11yGeneric.h
 include/thunderbird10/amIInstallTrigger.h
 include/thunderbird10/amIWebInstallListener.h
 include/thunderbird10/amIWebInstaller.h
 include/thunderbird10/angle/ResourceLimits.h
 include/thunderbird10/angle/ShaderLang.h
-${PLIST.jit}include/thunderbird10/avmplus.h
 include/thunderbird10/domstubs.h
 include/thunderbird10/expat.h
 include/thunderbird10/expat_config.h
@@ -139,7 +125,6 @@ include/thunderbird10/jsalloc.h
 include/thunderbird10/jsapi.h
 include/thunderbird10/jsatom.h
 include/thunderbird10/jsautokw.h
-${PLIST.jit}include/thunderbird10/jsbuiltins.h
 include/thunderbird10/jscell.h
 include/thunderbird10/jsclist.h
 include/thunderbird10/jsclone.h
@@ -428,13 +413,10 @@ include/thunderbird10/mozilla/throw_gcc.h
 include/thunderbird10/mozilla/unused.h
 include/thunderbird10/mozpngconf.h
 include/thunderbird10/msgCore.h
-${PLIST.jit}include/thunderbird10/nanojit.h
 include/thunderbird10/necko-config.h
 include/thunderbird10/nestegg/nestegg-stdint.h
 include/thunderbird10/nestegg/nestegg.h
 include/thunderbird10/netCore.h
-${PLIST.jit}include/thunderbird10/njconfig.h
-${PLIST.jit}include/thunderbird10/njcpudetect.h
 include/thunderbird10/npapi.h
 include/thunderbird10/npfunctions.h
 include/thunderbird10/npruntime.h
diff --git a/mail/thunderbird10/distinfo b/mail/thunderbird10/distinfo
index 9324da91555..62e83d5a324 100644
--- a/mail/thunderbird10/distinfo
+++ b/mail/thunderbird10/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2012/06/08 11:08:22 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2012/08/04 12:03:32 ryoon Exp $
 
 SHA1 (enigmail-1.4.tar.gz) = 1ee4bcd8d38685af44c1aeeea4fbba7bf30513e4
 RMD160 (enigmail-1.4.tar.gz) = b3c717e150c826faae1daa09806e07dd16619c51
 Size (enigmail-1.4.tar.gz) = 1323467 bytes
-SHA1 (thunderbird-10.0.5esr.source.tar.bz2) = e7b084176bfa36480eb36f2c9c1f0bd205253f1e
-RMD160 (thunderbird-10.0.5esr.source.tar.bz2) = d559619b22894593cd74e731347da6cc4358954c
-Size (thunderbird-10.0.5esr.source.tar.bz2) = 97617123 bytes
+SHA1 (thunderbird-10.0.6esr.source.tar.bz2) = 95f33ea1f30018fa6213e1e9922e8346b52ec618
+RMD160 (thunderbird-10.0.6esr.source.tar.bz2) = 25e568eb0ff8e9acc2da03b25139fe667a5b11ad
+Size (thunderbird-10.0.6esr.source.tar.bz2) = 97779445 bytes
 SHA1 (patch-aa) = a6787e51004112a2056fd695c44c8610ffcc0d60
 SHA1 (patch-aa-toplevel) = dfff316c77e468a3720f3d18e9edfc67059fc0e1
 SHA1 (patch-ab) = 6e243fcf826226330d6b62548838393bb1cbafb5
diff --git a/mail/thunderbird10/options.mk b/mail/thunderbird10/options.mk
index 815bea9795f..e39710ae2e2 100644
--- a/mail/thunderbird10/options.mk
+++ b/mail/thunderbird10/options.mk
@@ -1,25 +1,15 @@
-# $NetBSD: options.mk,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2012/08/04 12:03:32 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.thunderbird
 PKG_SUPPORTED_OPTIONS=	debug mozilla-jemalloc gnome official-mozilla-branding mozilla-lightning mozilla-enigmail
 PKG_SUGGESTED_OPTIONS=	mozilla-lightning
 
-PLIST_VARS+=		branding nobranding debug gnome jemalloc jit
+PLIST_VARS+=		branding nobranding debug gnome jemalloc
 
 .if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PKG_SUGGESTED_OPTIONS+=	mozilla-jemalloc
 .endif
 
-.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \
-	!empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64)
-PKG_SUPPORTED_OPTIONS+=	mozilla-jit
-PKG_SUGGESTED_OPTIONS+=	mozilla-jit
-NANOJIT_ARCH.i386=	i386
-NANOJIT_ARCH.arm=	ARM
-NANOJIT_ARCH.sparc=	Sparc
-NANOJIT_ARCH.x86_64=	X64
-.endif
-
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnome)
@@ -47,14 +37,6 @@ CONFIGURE_ARGS+=	--disable-debug --disable-debug-symbols
 CONFIGURE_ARGS+=	--enable-install-strip
 .endif
 
-.if !empty(PKG_OPTIONS:Mmozilla-jit)
-PLIST.jit=		yes
-PLIST_SUBST+=		NANOJIT_ARCH=${NANOJIT_ARCH.${MACHINE_ARCH}}
-CONFIGURE_ARGS+=	--enable-tracejit
-.else
-CONFIGURE_ARGS+=	--disable-tracejit
-.endif
-
 .if !empty(PKG_OPTIONS:Mmozilla-lightning)
 CONFIGURE_ARGS+=	--enable-calendar
 PLIST_SRC+=		PLIST.lightning