Update to 10.0.12

Changelog: from http://www.mozilla.org/en-US/thunderbird/10.0.12/releasenotes/
    FIXED
    Security fixes can be found here

MFSA 2013-20 Mis-issued TURKTRUST certificates
MFSA 2013-17 Use-after-free in ListenerManager
MFSA 2013-16 Use-after-free in serializeToStream
MFSA 2013-15 Privilege escalation through plugin objects
MFSA 2013-12 Buffer overflow in Javascript string concatenation
MFSA 2013-11 Address space layout leaked in XBL objects
MFSA 2013-09 Compartment mismatch with quickstubs returned values
MFSA 2013-05 Use-after-free when displaying table with many columns and column groups
MFSA 2013-04 URL spoofing in addressbar during page loads
MFSA 2013-02 Use-after-free and buffer overflow issues found using Address Sanitizer
MFSA 2013-01 Miscellaneous memory safety hazards (rv:18.0/ rv:10.0.12 / rv:17.0.2)

4 files changed, 42 insertions, 14 deletions

diff --git a/mail/thunderbird10/Makefile b/mail/thunderbird10/Makefile
index 9864d3b8143..6ec5fccac8c 100644
--- a/mail/thunderbird10/Makefile
+++ b/mail/thunderbird10/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2012/11/22 08:14:15 is Exp $
+# $NetBSD: Makefile,v 1.19 2013/01/10 16:09:59 ryoon Exp $
 #
 
 DISTNAME=	thunderbird-${TB_VER}esr.source
 PKGNAME=	thunderbird10-${TB_VER}
-TB_VER=		10.0.11
+TB_VER=		10.0.12
 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 b6cd2bc800f..502335822ca 100644
--- a/mail/thunderbird10/PLIST
+++ b/mail/thunderbird10/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/11/22 08:14:15 is Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/01/10 16:09:59 ryoon Exp $
 bin/thunderbird10
 include/thunderbird10/AtkSocketAccessible.h
 include/thunderbird10/BasicLayers.h
@@ -220,9 +220,11 @@ include/thunderbird10/mozStorageCID.h
 include/thunderbird10/mozStorageHelper.h
 include/thunderbird10/mozcontainer.h
 include/thunderbird10/mozilla-config.h
+include/thunderbird10/mozilla/Attributes.h
 include/thunderbird10/mozilla/AutoRestore.h
 include/thunderbird10/mozilla/Base64.h
 include/thunderbird10/mozilla/BlockingResourceBase.h
+include/thunderbird10/mozilla/CheckedInt.h
 include/thunderbird10/mozilla/CondVar.h
 include/thunderbird10/mozilla/DeadlockDetector.h
 include/thunderbird10/mozilla/FileUtils.h
diff --git a/mail/thunderbird10/distinfo b/mail/thunderbird10/distinfo
index 0ea342939ae..924293765fd 100644
--- a/mail/thunderbird10/distinfo
+++ b/mail/thunderbird10/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.11 2012/12/24 21:14:19 joerg Exp $
+$NetBSD: distinfo,v 1.12 2013/01/10 16:09:59 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.11esr.source.tar.bz2) = c7b2dd2fbead11d61da9508926e4c3e82bc2d099
-RMD160 (thunderbird-10.0.11esr.source.tar.bz2) = 29a600de7cf87adfcad58b1d097583b28a38a746
-Size (thunderbird-10.0.11esr.source.tar.bz2) = 97793584 bytes
+SHA1 (thunderbird-10.0.12esr.source.tar.bz2) = 260a3baca5eaa80bcc075b08c9f12016d61877de
+RMD160 (thunderbird-10.0.12esr.source.tar.bz2) = 63586fc3460f4522900b84f58805c3a3a9cfe7a6
+Size (thunderbird-10.0.12esr.source.tar.bz2) = 97703324 bytes
 SHA1 (patch-aa) = e526125da549e9924135379cffae4754db94154f
 SHA1 (patch-aa-toplevel) = dfff316c77e468a3720f3d18e9edfc67059fc0e1
 SHA1 (patch-ab) = 6e243fcf826226330d6b62548838393bb1cbafb5
@@ -35,7 +32,7 @@ SHA1 (patch-bf) = bfee07121770f85a1a5f85ee6b9ac4c97066d109
 SHA1 (patch-bg) = 9fcb2b715d5d2fdec3dceef63aa1dbbd5d40a377
 SHA1 (patch-bi) = 40fe7fb45d2bce5c783cb3277a2b45e86ac84777
 SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 1267429d7c38dd8d18132bd2afe6d0ffb1ea5062
-SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = b6c0d2866075e02364e6ce497e4a08670f97d969
+SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 56327f66ba59aa0d67b5b23d38cd045eca68dd7a
 SHA1 (patch-ipc_chromium_src_base_file__util.h) = 8009f5d95351778445b95bffb9628a4a60604bd7
 SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 924f9f08e669b0bb2de6f057a6b73437451717a3
 SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = a46f6f521fed6b20790adf2e61e8c8035ed82e62
diff --git a/mail/thunderbird10/patches/patch-ipc_chromium_src_base_debug__util__posic.cc b/mail/thunderbird10/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
index e009f227cd7..3d955655d62 100644
--- a/mail/thunderbird10/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
+++ b/mail/thunderbird10/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.2 2013/01/10 16:09:59 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig	2013-01-05 14:22:10.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/debug_util_posix.cc
 @@ -5,7 +5,7 @@
  #include "build/build_config.h"
@@ -33,12 +33,41 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.1.1.1 2012/03/15
  
  // Based on Apple's recommended method as described in
  // http://developer.apple.com/qa/qa2004/qa1361.html
-@@ -71,7 +74,11 @@ bool DebugUtil::BeingDebugged() {
+@@ -51,14 +54,22 @@ bool DebugUtil::BeingDebugged() {
+   // we're looking for information about a specific process ID.
+   int mib[] = {
+     CTL_KERN,
++#if defined(OS_NETBSD)
++    KERN_PROC2,
++#else
+     KERN_PROC,
++#endif
+     KERN_PROC_PID,
+     getpid()
+   };
+ 
+   // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
+   // binary interfaces may change.
++#if defined(OS_NETBSD)
++  struct kinfo_proc2 info;
++#else
+   struct kinfo_proc info;
++#endif
+   size_t info_size = sizeof(info);
+ 
+   int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0);
+@@ -71,7 +82,17 @@ bool DebugUtil::BeingDebugged() {
  
    // This process is being debugged if the P_TRACED flag is set.
    is_set = true;
 +#if defined(__DragonFly__)
 +  being_debugged = (info.kp_flags & P_TRACED) != 0;
++#elif defined(OS_FREEBSD)
++  being_debugged = (info.ki_flag & P_TRACED) != 0;
++#elif defined(OS_OPENBSD)
++  being_debugged = (info.p_flag & P_TRACED) != 0;
++#elif defined(OS_NETBSD)
++  being_debugged = (info.p_flag & P_TRACED) != 0;
 +#else
    being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
 +#endif