commit: b4ad211836355ff4626320150e2a9d374e4fa077 Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Sun Jan 8 21:36:31 2017 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Sun Jan 8 21:40:26 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ad2118
mail-client/thunderbird - fix sed-4.3 support, add support for >=nss-3.28 .../files/mozilla_configure_regexp_esr.patch | 32 ++++++++++++++++++++++ .../thunderbird/files/update_h2_curve.patch | 30 ++++++++++++++++++++ ...-45.6.0.ebuild => thunderbird-45.6.0-r1.ebuild} | 4 ++- 3 files changed, 65 insertions(+), 1 deletion(-) diff --git a/mail-client/thunderbird/files/mozilla_configure_regexp_esr.patch b/mail-client/thunderbird/files/mozilla_configure_regexp_esr.patch new file mode 100644 index 00000000..9e165ff --- /dev/null +++ b/mail-client/thunderbird/files/mozilla_configure_regexp_esr.patch @@ -0,0 +1,32 @@ +From: Jory A. Pratt <anar...@gentoo.org> + +Note: the first occurrence of :space: is [:space:] (with a single pair +of []), where it should be [[:space:]] (with two pairs of []). + +This causes the sed command to fail (with the error message quoted in +my original report), driving to failure the whole configure step. + +https://bugzilla.mozilla.org/show_bug.cgi?id=1329252 + +diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 +--- a/build/autoconf/icu.m4 ++++ b/build/autoconf/icu.m4 +@@ -68,17 +68,17 @@ if test -n "$USE_ICU"; then + icudir="$_topsrcdir/intl/icu/source" + if test ! -d "$icudir"; then + icudir="$_topsrcdir/../../intl/icu/source" + if test ! -d "$icudir"; then + AC_MSG_ERROR([Cannot find the ICU directory]) + fi + fi + +- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` ++ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` + if test x"$version" = x; then + AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno]) + fi + MOZ_ICU_VERSION="$version" + + if test "$OS_TARGET" = WINNT; then + MOZ_SHARED_ICU=1 + fi diff --git a/mail-client/thunderbird/files/update_h2_curve.patch b/mail-client/thunderbird/files/update_h2_curve.patch new file mode 100644 index 00000000..a1f0ffa --- /dev/null +++ b/mail-client/thunderbird/files/update_h2_curve.patch @@ -0,0 +1,30 @@ +From: Franziskus Kiefer <franziskuskie...@gmail.com> + +Update keybits in H2 + +https://bugzilla.mozilla.org/show_bug.cgi?id=1290037 + +diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp +--- a/netwerk/protocol/http/Http2Session.cpp ++++ b/netwerk/protocol/http/Http2Session.cpp +@@ -3516,18 +3516,18 @@ Http2Session::ConfirmTLSProfile() + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } + + uint32_t keybits = ssl->GetKEAKeyBits(); + if (kea == ssl_kea_dh && keybits < 2048) { + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } + + int16_t macAlgorithm = ssl->GetMACAlgorithmUsed(); + LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n", + this, macAlgorithm)); + if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) { diff --git a/mail-client/thunderbird/thunderbird-45.6.0.ebuild b/mail-client/thunderbird/thunderbird-45.6.0-r1.ebuild similarity index 98% rename from mail-client/thunderbird/thunderbird-45.6.0.ebuild rename to mail-client/thunderbird/thunderbird-45.6.0-r1.ebuild index 7c03d69..a3f77f2 100644 --- a/mail-client/thunderbird/thunderbird-45.6.0.ebuild +++ b/mail-client/thunderbird/thunderbird-45.6.0-r1.ebuild @@ -130,7 +130,9 @@ src_prepare() { # Apply our patchset from firefox to thunderbird as well pushd "${S}"/mozilla &>/dev/null || die - eapply "${WORKDIR}/firefox" + eapply "${WORKDIR}/firefox" \ + "${FILESDIR}"/mozilla_configure_regexp_esr.patch \ + "${FILESDIR}"/update_h2_curve.patch popd &>/dev/null || die # Ensure that are plugins dir is enabled as default
