mail-client/thunderbird : version bump

3 files changed, 87 insertions, 0 deletions

diff --git a/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch b/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch
new file mode 100644
index 00000000..01542105
--- /dev/null
+++ b/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch
@@ -0,0 +1,25 @@
+From: Jory A. Pratt <anarchy@gentoo.org>
+
+Add the gentoo preferences for the omni.jar creation
+
+diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in
+--- a/mail/installer/package-manifest.in
++++ b/mail/installer/package-manifest.in
+@@ -313,16 +313,17 @@
+ @RESPATH@/components/devtools-startup.manifest
+ @RESPATH@/components/devtools-startup.js
+ 
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ; Default Profile Settings
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; default pref files
++@RESPATH@/defaults/pref/all-gentoo.js
+ @RESPATH@/defaults/pref/all-thunderbird.js
+ @RESPATH@/defaults/pref/channel-prefs.js
+ @RESPATH@/defaults/pref/composer.js
+ @RESPATH@/defaults/pref/mailnews.js
+ @RESPATH@/defaults/pref/mdn.js
+ @RESPATH@/defaults/pref/smime.js
+ @RESPATH@/defaults/pref/thunderbird-branding.js
+ @RESPATH@/greprefs.js
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..9e165ff9
--- /dev/null
+++ b/mail-client/thunderbird/files/mozilla_configure_regexp_esr.patch
@@ -0,0 +1,32 @@
+From: Jory A. Pratt <anarchy@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..a1f0ffae
--- /dev/null
+++ b/mail-client/thunderbird/files/update_h2_curve.patch
@@ -0,0 +1,30 @@
+From: Franziskus Kiefer <franziskuskiefer@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) {