Security bump bug #427224

(Portage version: 2.1.11.9/cvs/Linux x86_64)

4 files changed, 33 insertions, 19 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 43c88e31dc72..56845244e4f6 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.156 2012/07/06 07:37:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.157 2012/07/19 22:33:25 anarchy Exp $
+
+*thunderbird-14.0 (19 Jul 2012)
+*thunderbird-10.0.6 (19 Jul 2012)
+
+  19 Jul 2012; Jory A. Pratt <anarchy@gentoo.org> +thunderbird-10.0.6.ebuild,
+  +thunderbird-14.0.ebuild, -thunderbird-10.0.4.ebuild,
+  -thunderbird-13.0.ebuild, thunderbird-10.0.5.ebuild:
+  Security bump  bug #427224
 
   06 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
   -files/1001-xulrunner_fix_jemalloc_vs_aslr.patch, -files/libnotify-0.7.patch,
@@ -2177,4 +2185,3 @@
   Update to 0.7.3 for security meta-bug 59419. This is the first of the mozilla
   ebuilds to use mozilla.eclass. Remove unused amd64 patch which exceeds
   repoman's filesize limit.
-
diff --git a/mail-client/thunderbird/thunderbird-10.0.5.ebuild b/mail-client/thunderbird/thunderbird-10.0.5.ebuild
index b545e7cdd35f..c0512e86760a 100644
--- a/mail-client/thunderbird/thunderbird-10.0.5.ebuild
+++ b/mail-client/thunderbird/thunderbird-10.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.5.ebuild,v 1.5 2012/07/04 19:14:42 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.5.ebuild,v 1.6 2012/07/19 22:33:25 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -176,6 +176,7 @@ src_configure() {
 	# Use enable features
 	mozconfig_use_enable lightning calendar
 	mozconfig_use_enable gconf
+	mozconfig_use_with webm system-libvpx "${EPREFIX}"/usr
 
 	# Bug #72667
 	if use mozdom; then
diff --git a/mail-client/thunderbird/thunderbird-10.0.4.ebuild b/mail-client/thunderbird/thunderbird-10.0.6.ebuild
index febb69a78b4d..8b6db2df416d 100644
--- a/mail-client/thunderbird/thunderbird-10.0.4.ebuild
+++ b/mail-client/thunderbird/thunderbird-10.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.4.ebuild,v 1.6 2012/07/04 19:14:42 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.6.ebuild,v 1.1 2012/07/19 22:33:25 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -30,13 +30,13 @@ inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm"
+IUSE="bindist gconf +crypt +ipc +lightning +minimal mozdom +webm selinux"
 
 PATCH="thunderbird-10.0-patches-0.1"
-PATCHFF="firefox-10.0-patches-0.7"
+PATCHFF="firefox-10.0-patches-0.9"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
@@ -50,9 +50,8 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.13.1
 	>=dev-libs/nspr-4.8.8
 	>=dev-libs/glib-2.26
-	crashreporter? ( net-misc/curl )
 	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	media-libs/libpng[apng]
+	>=media-libs/libpng-1.5.9[apng]
 	>=x11-libs/cairo-1.10
 	>=x11-libs/pango-1.14.0
 	>=x11-libs/gtk+-2.14
@@ -61,6 +60,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	virtual/libffi
 	!x11-plugins/enigmail
 	system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] )
+	selinux? ( sec-policy/selinux-thunderbird )
 	crypt?  ( || (
 		( >=app-crypt/gnupg-2.0
 			|| (
@@ -115,7 +115,7 @@ src_prepare() {
 
 	# Apply our patchset from firefox to thunderbird as well
 	pushd "${S}"/mozilla &>/dev/null || die
-	EPATCH_EXCLUDE="6012_fix_shlibsign.patch" \
+	EPATCH_EXCLUDE="6012_fix_shlibsign.patch 6013_fix_abort_declaration.patch" \
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/firefox"
diff --git a/mail-client/thunderbird/thunderbird-13.0.ebuild b/mail-client/thunderbird/thunderbird-14.0.ebuild
index ac7ae7b497d6..91ac6950827f 100644
--- a/mail-client/thunderbird/thunderbird-13.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-14.0.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-13.0.ebuild,v 1.6 2012/07/04 19:14:42 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-14.0.ebuild,v 1.1 2012/07/19 22:33:25 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
 MOZ_ESR=""
 
 # This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi
-fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT
-rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et
+eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN
+pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW )
 
 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
 MOZ_PV="${PV/_beta/b}"
@@ -20,7 +20,7 @@ fi
 MOZ_P="${PN}-${MOZ_PV}"
 
 # Enigmail version
-EMVER="1.4.1"
+EMVER="1.4.3"
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
@@ -33,10 +33,10 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist gconf +crashreporter +crypt +ipc +jit +lightning +minimal mozdom +webm"
+IUSE="bindist gconf +crypt +ipc +jit +lightning +minimal mozdom +webm selinux"
 
 PATCH="thunderbird-13.0-patches-0.1"
-PATCHFF="firefox-13.0-patches-0.2"
+PATCHFF="firefox-14.0-patches-0.3"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
@@ -50,17 +50,17 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.13.5
 	>=dev-libs/nspr-4.9.1
 	>=dev-libs/glib-2.26
-	crashreporter? ( net-misc/curl )
 	gconf? ( >=gnome-base/gconf-1.2.1:2 )
 	>=media-libs/libpng-1.5.9[apng]
 	>=x11-libs/cairo-1.10
 	>=x11-libs/pango-1.14.0
 	>=x11-libs/gtk+-2.14
 	webm? ( >=media-libs/libvpx-1.0.0
-		media-libs/alsa-lib )
+		kernel_linux? ( media-libs/alsa-lib ) )
 	virtual/libffi
 	!x11-plugins/enigmail
 	system-sqlite? ( >=dev-db/sqlite-3.7.10[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
+	selinux? ( sec-policy/selinux-thunderbird )
 	crypt?  ( || (
 		( >=app-crypt/gnupg-2.0
 			|| (
@@ -72,6 +72,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1
 	) )"
 
 DEPEND="${RDEPEND}
+	!elibc_glibc? ( dev-libs/libexecinfo )
 	virtual/pkgconfig
 	webm? ( x86? ( ${ASM_DEPEND} )
 		amd64? ( ${ASM_DEPEND} )
@@ -128,6 +129,11 @@ src_prepare() {
 		cd "${S}"
 	fi
 
+	# Disable gnomevfs extension
+	sed -i -e "s:gnomevfs::" "${S}/"mozilla/browser/confvars.sh \
+		-e "s:gnomevfs::" "${S}/"mozilla/xulrunner/confvars.sh \
+		|| die "Failed to remove gnomevfs extension"
+
 	#Fix compilation with curl-7.21.7 bug 376027
 	sed -e '/#include <curl\/types.h>/d'  \
 		-i "${S}"/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \