Security bump (bug #342847).

(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)

3 files changed, 37 insertions, 4 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index b9b39107e46d..a961c25aa818 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.45 2010/10/25 00:29:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.46 2010/10/28 15:40:01 polynomial-c Exp $
+
+*thunderbird-3.1.6 (28 Oct 2010)
+
+  28 Oct 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +files/xulrunner-1.9.2-gtk+-2.21.patch, -thunderbird-3.1.4.ebuild,
+  +thunderbird-3.1.6.ebuild:
+  Security bump (bug #342847).
 
   25 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
   thunderbird-3.1.5.ebuild:
diff --git a/mail-client/thunderbird/files/xulrunner-1.9.2-gtk+-2.21.patch b/mail-client/thunderbird/files/xulrunner-1.9.2-gtk+-2.21.patch
new file mode 100644
index 000000000000..fb414e6c118c
--- /dev/null
+++ b/mail-client/thunderbird/files/xulrunner-1.9.2-gtk+-2.21.patch
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User Jonathan Callen <abcd@gentoo.org>
+# Parent 2599ed882191d88a8e8f0cb68492a156163c5ca7
+pass MOZ_GTK_CFLAGS to ensure proper includes are avaliable.
+
+diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
+--- a/mozilla/toolkit/system/gnome/Makefile.in
++++ b/mozilla/toolkit/system/gnome/Makefile.in
+@@ -84,13 +84,14 @@ EXTRA_DSO_LDOPTS += \
+ 		$(MOZ_LIBNOTIFY_LIBS) \
+ 		$(NULL)
+ 
+ LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ CXXFLAGS += \
++	$(MOZ_GTK2_CFLAGS) \
+ 	$(MOZ_GCONF_CFLAGS) \
+ 	$(MOZ_GNOMEVFS_CFLAGS) \
+ 	$(GLIB_CFLAGS) \
+ 	$(MOZ_LIBNOTIFY_CFLAGS) \
+ 	$(NULL)
diff --git a/mail-client/thunderbird/thunderbird-3.1.4.ebuild b/mail-client/thunderbird/thunderbird-3.1.6.ebuild
index 6e98acd1c7fa..ad0af88704b6 100644
--- a/mail-client/thunderbird/thunderbird-3.1.4.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.4.ebuild,v 1.2 2010/10/14 02:09:52 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.6.ebuild,v 1.1 2010/10/28 15:40:01 polynomial-c Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -46,14 +46,14 @@ for X in ${LANGS} ; do
 done
 
 RDEPEND=">=sys-devel/binutils-2.16.1
-	>=dev-libs/nss-3.12.7
+	>=dev-libs/nss-3.12.8
 	>=dev-libs/nspr-4.8.6
 	>=app-text/hunspell-1.2
 	x11-libs/cairo[X]
 	x11-libs/pango[X]
 	alsa? ( media-libs/alsa-lib )
 	libnotify? ( >=x11-libs/libnotify-0.4 )
-	system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
+	system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete] )
 	wifi? ( net-wireless/wireless-tools )
 	!x11-plugins/lightning"
 
@@ -114,6 +114,9 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
+	epatch "${FILESDIR}/bug-606109.patch"
+	epatch "${FILESDIR}/xulrunner-1.9.2-gtk+-2.21.patch"
+
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user