New esr release, security update

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xB4D088B4)

4 files changed, 17 insertions, 67 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index a6defdc60eaa..77926357b5ee 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.249 2013/10/26 02:15:17 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.250 2013/11/04 13:41:14 anarchy Exp $
+
+*thunderbird-24.1.0-r1 (04 Nov 2013)
+
+  04 Nov 2013; Jory A. Pratt <anarchy@gentoo.org> +thunderbird-24.1.0-r1.ebuild,
+  -files/enigmail_mailnews_extensions_genxpi.patch,
+  -files/moz24-drop-Wl-build-id.patch, -thunderbird-24.0-r1.ebuild:
+  New esr release, security update
 
   26 Oct 2013; Jory A. Pratt <anarchy@gentoo.org> thunderbird-24.0-r1.ebuild:
   ia64 support, bug #487250
diff --git a/mail-client/thunderbird/files/enigmail_mailnews_extensions_genxpi.patch b/mail-client/thunderbird/files/enigmail_mailnews_extensions_genxpi.patch
deleted file mode 100644
index a945cf2be3ac..000000000000
--- a/mail-client/thunderbird/files/enigmail_mailnews_extensions_genxpi.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD$
-https://bugzilla.mozilla.org/show_bug.cgi?id=886095
---- mailnews/extensions/enigmail/genxpi.orig	Wed Jul  3 13:21:33 2013
-+++ mailnews/extensions/enigmail/genxpi	Thu Jul 11 09:33:44 2013
-@@ -78,6 +78,7 @@ fi
- subprocessDll=${libPrefix}subprocess${dllSuffix}
- spDllFile=platform/${platform}/lib/${libPrefix}subprocess-${xpcomAbi}${dllSuffix}
- 
-+cp ${targetDir}/chrome.manifest ${targetDir}/chrome.manifest.save
- # Prepare chrome.manifest
- cat  ${srcDir}/package/chrome.manifest | \
- sed  's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`' ABI='${platform}'/' \
-@@ -151,4 +152,5 @@ zip ${xpiFile} \
-     chrome.manifest \
-     install.rdf
- 
--rm install.rdf chrome.manifest
-+rm install.rdf
-+mv chrome.manifest.save chrome.manifest
diff --git a/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch b/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch
deleted file mode 100644
index 434dd238a961..000000000000
--- a/mail-client/thunderbird/files/moz24-drop-Wl-build-id.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/comm-esr24/mozilla/configure.in	2013-09-26 09:41:27.220542321 -0400
-+++ b/comm-esr24/mozilla/configure.in	2013-09-26 09:49:07.888550730 -0400
-@@ -1339,13 +1339,6 @@
-     AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
-                   AC_MSG_RESULT([no])
-                   LDFLAGS=$_SAVE_LDFLAGS)
--    AC_MSG_CHECKING([for --build-id option to ld])
--    _SAVE_LDFLAGS=$LDFLAGS
--    LDFLAGS="$LDFLAGS -Wl,--build-id"
--    AC_TRY_LINK(,,AC_MSG_RESULT([yes])
--                  [NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"],
--                  AC_MSG_RESULT([no])
--                  LDFLAGS=$_SAVE_LDFLAGS)
- 
- 
-     # Check for -mssse3 on $CC
---- a/comm-esr24/mozilla/js/src/configure.in	2013-09-26 09:41:27.222542321 -0400
-+++ b/comm-esr24/mozilla/js/src/configure.in	2013-09-26 09:49:19.121550935 -0400
-@@ -1154,13 +1154,6 @@
-     DSO_PIC_CFLAGS='-fPIC'
-     ASFLAGS="$ASFLAGS -fPIC"
- 
--    AC_MSG_CHECKING([for --build-id option to ld])
--    _SAVE_LDFLAGS=$LDFLAGS
--    LDFLAGS="$LDFLAGS -Wl,--build-id"
--    AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
--                  AC_MSG_RESULT([no])
--                  LDFLAGS=$_SAVE_LDFLAGS)
--
-     # Turn on GNU-specific warnings:
-     # -Wall - turn on a lot of warnings
-     # -Wpointer-arith - good to have
diff --git a/mail-client/thunderbird/thunderbird-24.0-r1.ebuild b/mail-client/thunderbird/thunderbird-24.1.0-r1.ebuild
index 489b9efdbeb3..f58ba3650a9a 100644
--- a/mail-client/thunderbird/thunderbird-24.0-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.0-r1.ebuild,v 1.4 2013/10/26 02:15:17 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.1.0-r1.ebuild,v 1.1 2013/11/04 13:41:14 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -12,7 +12,7 @@ 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
+# Convert the ebuild version to th firefox-24.0-patches-0.4.tar.xze upstream mozilla version, used by mozlinguas
 MOZ_PV="${PV/_beta/b}"
 # ESR releases have slightly version numbers
 if [[ ${MOZ_ESR} == 1 ]]; then
@@ -21,7 +21,7 @@ fi
 MOZ_P="${PN}-${MOZ_PV}"
 
 # Enigmail version
-EMVER="1.5.2"
+EMVER="1.6"
 # 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/"
@@ -38,21 +38,19 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt gstreamer +jit ldap +lightning +minimal mozdom pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite"
 
 PATCH="thunderbird-24.0-patches-0.1"
-PATCHFF="firefox-24.0-patches-0.4"
+PATCHFF="firefox-24.0-patches-0.6"
 
 SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
 	${MOZ_HTTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
-	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
+	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
-	http://dev.gentoo.org/~nirbheek/mozilla/patchsets/${PATCHFF}.tar.xz
 	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 RDEPEND="
-	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.15.1
 	>=dev-libs/nspr-4.10
 	>=dev-libs/glib-2.26:2
@@ -62,7 +60,7 @@ RDEPEND="
 	gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] )
 	pulseaudio? ( media-sound/pulseaudio )
 	system-cairo? ( >=x11-libs/cairo-1.12[X] )
-	system-icu? ( dev-libs/icu )
+	system-icu? ( >=dev-libs/icu-0.51.1 )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
 	system-sqlite? ( >=dev-db/sqlite-3.7.17:3[secure-delete,debug=] )
 	>=media-libs/libvpx-1.0.0
@@ -80,6 +78,7 @@ RDEPEND="
 	) )"
 
 DEPEND="${RDEPEND}
+	>=sys-devel/binutils-2.16.1
 	virtual/pkgconfig
 	amd64? ( ${ASM_DEPEND}
 		virtual/opengl )
@@ -122,8 +121,6 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/thunderbird"
-	# drop -Wl,--build-id from LDFLAGS, bug #465466
-	epatch "${FILESDIR}"/moz${PV%%\.*}-drop-Wl-build-id.patch
 
 	# Apply our patchset from firefox to thunderbird as well
 	pushd "${S}"/mozilla &>/dev/null || die
@@ -134,9 +131,6 @@ src_prepare() {
 
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
-		epatch "${FILESDIR}"/enigmail_mailnews_extensions_genxpi.patch
-		popd &>/dev/null || die
 	fi
 
 	# Ensure that are plugins dir is enabled as default
@@ -257,8 +251,8 @@ src_compile() {
 		cd "${S}"/mailnews/extensions/enigmail || die
 		./makemake -r 2&> /dev/null
 		cd "${S}"/tbird/mailnews/extensions/enigmail
-		emake -j1 || die "make enigmail failed"
-		emake -j1 xpi || die "make enigmail xpi failed"
+		emake || die "make enigmail failed"
+		emake xpi || die "make enigmail xpi failed"
 	fi
 }