Update to Thunderbird and Thunderbird-l10n 24.1.1.

Fixed in Thunderbird 24.1.1
MFSA 2013-103 Miscellaneous Network Security Services (NSS) vulnerabilities

TODO: put sdk common files into their own PLIST in order to simplify updates to
PLIST.enigmail and PLIST.lightning.

7 files changed, 43 insertions, 14 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 203f976f389..59d1374df06 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.127 2013/11/13 14:36:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.128 2013/12/02 15:01:04 richard Exp $
 
 DISTNAME=	# empty
 PKGNAME=	thunderbird-${TB_VER}
-PKGREVISION=	1
-TB_VER=		24.1.0
+TB_VER=		24.1.1
 #LIGHTNINGVER=	1.9
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
diff --git a/mail/thunderbird/PLIST.enigmail b/mail/thunderbird/PLIST.enigmail
index ba7de873798..488b225061f 100644
--- a/mail/thunderbird/PLIST.enigmail
+++ b/mail/thunderbird/PLIST.enigmail
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.enigmail,v 1.9 2013/11/29 17:17:25 wiz Exp $
+@comment $NetBSD: PLIST.enigmail,v 1.10 2013/12/02 15:01:04 richard Exp $
 include/thunderbird/AbstractMediaDecoder.h
 include/thunderbird/AccEvent.h
 include/thunderbird/AnimationCommon.h
@@ -485,6 +485,7 @@ include/thunderbird/mozilla/a11y/DocManager.h
 include/thunderbird/mozilla/a11y/FocusManager.h
 include/thunderbird/mozilla/a11y/HyperTextAccessible.h
 include/thunderbird/mozilla/a11y/HyperTextAccessibleWrap.h
+${PLIST.debug}include/thunderbird/mozilla/a11y/Logging.h
 include/thunderbird/mozilla/a11y/Platform.h
 include/thunderbird/mozilla/a11y/Role.h
 include/thunderbird/mozilla/a11y/SelectionManager.h
@@ -3458,6 +3459,7 @@ include/thunderbird/prplIPref.h
 include/thunderbird/prplIProtocol.h
 include/thunderbird/prplIRequest.h
 include/thunderbird/prplITooltipInfo.h
+${PLIST.debug}include/thunderbird/pure.h
 include/thunderbird/qcms.h
 include/thunderbird/qcmstypes.h
 include/thunderbird/qsObjectHelper.h
@@ -3622,7 +3624,6 @@ include/thunderbird/theora/codec.h
 include/thunderbird/theora/theora.h
 include/thunderbird/theora/theoradec.h
 include/thunderbird/theora/theoraenc.h
-include/thunderbird/tremor/ivorbiscodec.h
 include/thunderbird/txIEXSLTRegExFunctions.h
 include/thunderbird/txIFunctionEvaluationContext.h
 include/thunderbird/txINodeSet.h
@@ -3630,6 +3631,7 @@ include/thunderbird/txIXPathObject.h
 include/thunderbird/uconvutil.h
 include/thunderbird/updatedefines.h
 include/thunderbird/updatelogging.h
+include/thunderbird/vorbis/codec.h
 include/thunderbird/webvtt/cue.h
 include/thunderbird/webvtt/error.h
 include/thunderbird/webvtt/node.h
@@ -3701,7 +3703,7 @@ lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/pipeCo
 lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess.jsm
 lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_unix.js
 lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_win.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/NetBSD_${MACHINE_ARCH}-gcc3/lib/libsubprocess-${MACHINE_ARCH}-gcc3.so
+lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/${OPSYS}_${TARGET_XPCOM_ABI}/lib/libsubprocess-${TARGET_XPCOM_ABI}.so
 share/idl/thunderbird/IJSDebugger.idl
 share/idl/thunderbird/MailNewsTypes2.idl
 share/idl/thunderbird/amIAddonManager.idl
diff --git a/mail/thunderbird/PLIST.lightning b/mail/thunderbird/PLIST.lightning
index 38b2c57fd40..ce141a1dea2 100644
--- a/mail/thunderbird/PLIST.lightning
+++ b/mail/thunderbird/PLIST.lightning
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.lightning,v 1.17 2013/11/29 17:17:25 wiz Exp $
+@comment $NetBSD: PLIST.lightning,v 1.18 2013/12/02 15:01:04 richard Exp $
 include/thunderbird/AbstractMediaDecoder.h
 include/thunderbird/AccEvent.h
 include/thunderbird/AnimationCommon.h
@@ -538,6 +538,7 @@ include/thunderbird/mozilla/a11y/DocManager.h
 include/thunderbird/mozilla/a11y/FocusManager.h
 include/thunderbird/mozilla/a11y/HyperTextAccessible.h
 include/thunderbird/mozilla/a11y/HyperTextAccessibleWrap.h
+${PLIST.debug}include/thunderbird/mozilla/a11y/Logging.h
 include/thunderbird/mozilla/a11y/Platform.h
 include/thunderbird/mozilla/a11y/Role.h
 include/thunderbird/mozilla/a11y/SelectionManager.h
@@ -3511,6 +3512,7 @@ include/thunderbird/prplIPref.h
 include/thunderbird/prplIProtocol.h
 include/thunderbird/prplIRequest.h
 include/thunderbird/prplITooltipInfo.h
+${PLIST.debug}include/thunderbird/pure.h
 include/thunderbird/qcms.h
 include/thunderbird/qcmstypes.h
 include/thunderbird/qsObjectHelper.h
@@ -3675,7 +3677,6 @@ include/thunderbird/theora/codec.h
 include/thunderbird/theora/theora.h
 include/thunderbird/theora/theoradec.h
 include/thunderbird/theora/theoraenc.h
-include/thunderbird/tremor/ivorbiscodec.h
 include/thunderbird/txIEXSLTRegExFunctions.h
 include/thunderbird/txIFunctionEvaluationContext.h
 include/thunderbird/txINodeSet.h
@@ -3683,6 +3684,7 @@ include/thunderbird/txIXPathObject.h
 include/thunderbird/uconvutil.h
 include/thunderbird/updatedefines.h
 include/thunderbird/updatelogging.h
+include/thunderbird/vorbis/codec.h
 include/thunderbird/webvtt/cue.h
 include/thunderbird/webvtt/error.h
 include/thunderbird/webvtt/node.h
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index a74df4e6c65..953e1a1397f 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.131 2013/11/29 17:41:08 wiz Exp $
+$NetBSD: distinfo,v 1.132 2013/12/02 15:01:04 richard Exp $
 
 SHA1 (enigmail-1.6.tar.gz) = 51a7eb7d86ce24d8199f741a0079f0d56ecd6368
 RMD160 (enigmail-1.6.tar.gz) = a854bb37a6a7f298f6cc268110dcb21d00909fa4
 Size (enigmail-1.6.tar.gz) = 1231111 bytes
-SHA1 (thunderbird-24.1.0.source.tar.bz2) = 7e7f8837daff087dab8aea58495952bf80b2cb39
-RMD160 (thunderbird-24.1.0.source.tar.bz2) = 35fae89f8a86359bc63f168a6d314e843c43d209
-Size (thunderbird-24.1.0.source.tar.bz2) = 140336934 bytes
+SHA1 (thunderbird-24.1.1.source.tar.bz2) = db75336cbeef823b334b3bfc5176bbfa5acb70d6
+RMD160 (thunderbird-24.1.1.source.tar.bz2) = 6ad0f6342d4ae074766efd6a973898726e56be8a
+Size (thunderbird-24.1.1.source.tar.bz2) = 140346889 bytes
 SHA1 (patch-aa) = 0ed482fc1d015afcb4813d74ac602acbe875aa6e
 SHA1 (patch-ak) = b47277baa1137a7610445b7c4dd147b331d5c5e6
 SHA1 (patch-al) = 9970e89e92ff8b120119b560cb661eabd3a387de
@@ -27,6 +27,7 @@ SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = cb54ccc3bd5ff050e89a8e5
 SHA1 (patch-ipc_chromium_src_build_build__config.h) = 7e5f6e195884d7fc629c10aefe13dba768001daf
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = d484fabb24e9ebf14c64675d7cf3c3e6972b5790
 SHA1 (patch-ldap_sdks_c-sdk_build.mk) = 171d81697d136abb6e02cb81445cd88fd8580de2
+SHA1 (patch-mail_installer_package-manifest.in) = 9f79382d6e17a839d3ba90dab4f657a80340141a
 SHA1 (patch-mail_installer_removed-files.in) = 26d69b9b8747f25130af75ea057cf2abc615bfff
 SHA1 (patch-mailnews_base_search_src_nsMsgSearchTerm.cpp) = 7ec5d09a1e329a3a7c13e6bbf654b591a4d65422
 SHA1 (patch-mb) = 9ee926289c0ad6d125dd5337f0a4dc515f91dc23
diff --git a/mail/thunderbird/files/patch-ipc_src_Makefile.enig b/mail/thunderbird/files/patch-ipc_src_Makefile.enig
index b6036508f6a..6ef065d8c9c 100644
--- a/mail/thunderbird/files/patch-ipc_src_Makefile.enig
+++ b/mail/thunderbird/files/patch-ipc_src_Makefile.enig
@@ -15,3 +15,15 @@ index 6bae7d6..b6815f8 100644
  
  ifeq ($(OS_ARCH),FreeBSD)
  LDFLAGS += -shared -Wl,-Bsymbolic
+@@ -33,6 +31,11 @@ ifeq ($(OS_ARCH),OpenBSD)
+ LDFLAGS += -shared -Wl,-Bsymbolic
+ CFLAGS += -fPIC
+ endif
++
++ifeq ($(OS_ARCH),SunOS)
++LDFLAGS += -shared -Wl,-Bsymbolic
++CFLAGS += -fPIC
++endif
+ 
+ ifeq ($(OS_ARCH),HP-UX)
+ ifeq ($(GNU_CC)$(GNU_CXX),)
diff --git a/mail/thunderbird/options.mk b/mail/thunderbird/options.mk
index e39831682b4..d795868603a 100644
--- a/mail/thunderbird/options.mk
+++ b/mail/thunderbird/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2013/11/12 20:50:51 ryoon Exp $
+# $NetBSD: options.mk,v 1.13 2013/12/02 15:01:04 richard Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.thunderbird
 PKG_SUPPORTED_OPTIONS=	debug mozilla-jemalloc gnome official-mozilla-branding mozilla-lightning mozilla-enigmail
@@ -6,7 +6,7 @@ PKG_SUGGESTED_OPTIONS=	mozilla-lightning
 
 PLIST_VARS+=		branding nobranding debug gnome jemalloc
 
-.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
+.if ${OPSYS} == "Linux" #|| ${OPSYS} == "SunOS"
 PKG_SUGGESTED_OPTIONS+=	mozilla-jemalloc
 .endif
 
diff --git a/mail/thunderbird/patches/patch-mail_installer_package-manifest.in b/mail/thunderbird/patches/patch-mail_installer_package-manifest.in
new file mode 100644
index 00000000000..0b7edb64f27
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mail_installer_package-manifest.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-mail_installer_package-manifest.in,v 1.1 2013/12/02 15:01:04 richard Exp $
+
+--- mail/installer/package-manifest.in.orig	2013-11-18 16:43:05.000000000 +0000
++++ mail/installer/package-manifest.in
+@@ -673,7 +673,7 @@
+ @BINPATH@/components/pippki.xpt
+ 
+ ; for Solaris SPARC
+-#ifdef SOLARIS
++#if defined(SOLARIS) && defined(SPARC)
+ @BINPATH@/@DLL_PREFIX@freebl_32fpu_3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@freebl_32int_3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@freebl_32int64_3@DLL_SUFFIX@