Update to 45.7.0

This commit is contained in:
Jan Horak 2017-01-31 09:58:18 +01:00
parent e06f51d27b
commit 7691d90f5c
5 changed files with 14 additions and 78 deletions

3
.gitignore vendored
View File

@ -161,3 +161,6 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
/thunderbird-45.6.0.source.tar.xz
/thunderbird-langpacks-45.6.0-20161216.tar.xz
/l10n-lightning-45.6.0.tar.xz
/thunderbird-45.7.0.source.tar.xz
/thunderbird-langpacks-45.7.0-20170131.tar.xz
/l10n-lightning-45.7.0.tar.xz

View File

@ -1,34 +0,0 @@
# HG changeset patch
# User Franziskus Kiefer <franziskuskiefer@gmail.com>
# Date 1469717280 -7200
# Thu Jul 28 16:48:00 2016 +0200
# Node ID 95aa61f1e3562e526bf88179d9d078fd90ad1bda
# Parent d42aacfe34af25e2f5110e2ca3d24a210eabeb33
Update keybits in H2, r=mt
MozReview-Commit-ID: 35oWoDMqe1Y
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
@@ -3544,18 +3544,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) {

View File

@ -1,29 +0,0 @@
From 66fc64a75617ffc68f16780f60e39c1f368dfd41 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 9 Jan 2017 14:37:33 +0100
Subject: [PATCH] bug 1329272: add bracket for sed 4.3 compliance, r=glandium
---
build/autoconf/icu.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
index 4f46345f435a..794ddcdf4e52 100644
--- a/build/autoconf/icu.m4
+++ b/build/autoconf/icu.m4
@@ -67,11 +67,11 @@ if test -n "$USE_ICU"; then
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"
--
2.11.0

View File

@ -1,3 +1,3 @@
SHA512 (thunderbird-45.6.0.source.tar.xz) = 5e61b392303d16f760c381ea35749bfdad8fbb9432aacf714b84f7f2f5041a89e8aa391a4491a6bf62198516dbd6978ebbf90ada9734183ed9113bf90ceeb838
SHA512 (thunderbird-langpacks-45.6.0-20161216.tar.xz) = 7d2bc14f450ba29dd4394ec142e8fdfa2ba0cafdab0807acd91264353ca40336b486dcac6827912a7b3ee1414b4d5004b1de37b7b32179fb36b9ec5296cff132
SHA512 (l10n-lightning-45.6.0.tar.xz) = fe8d6bd6a9ed0bc7a7da01e36e6c7fec5d13e9336b13351cf59de7e529d79cb8d883f0ff1dbdcb228dbf50bf516986285e2f1d537eb3309aeb0d7355b523f49c
SHA512 (thunderbird-45.7.0.source.tar.xz) = 99cea54b553158c1e08cf19157ac2bb6822fd1fef0501d36f983e6b8d4f2143a2e6124d61297446944033d3fed9326fe0f12ca45db0b5815be71a0777e73ffb0
SHA512 (thunderbird-langpacks-45.7.0-20170131.tar.xz) = a4726a0c64d2ad754018a866092d2678b41bcec4af8d5ef29183e8a63aa6031c55e909cb18c5188dd64826cb2fa98a303e574551d19b37a7a6806d9f93de698e
SHA512 (l10n-lightning-45.7.0.tar.xz) = 554d15b47b895c4b3f22f82abaa9329b4beb30e7b4ab1124f7ef3eb1cc70ca310c77a6ba4906bc3c2915a3373f26790f0cd17fff7a4cb3735cc416701ad5b3b3

View File

@ -34,13 +34,13 @@
%define system_libvpx 1
%define tb_version 45.6.0
%define tarballdir thunderbird-45.6.0
%define tarballdir thunderbird-45.7.0
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
# Bump one with each minor lightning release
%define gdata_version 2.6
# BUMP VERSION THERE:
%define gdata_version_internal 0.11
%define gdata_version_internal 0.12
%global gdata_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
# The tarball is pretty inconsistent with directory structure.
@ -62,14 +62,14 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 45.6.0
Release: 5%{?dist}
Version: 45.7.0
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
Source0: ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks}
Source1: thunderbird-langpacks-%{version}-20161216.tar.xz
Source1: thunderbird-langpacks-%{version}-20170131.tar.xz
%endif
# Locales for lightning
Source2: l10n-lightning-%{version}.tar.xz
@ -107,10 +107,6 @@ Patch400: rhbz-966424.patch
Patch402: rhbz-1014858.patch
# libvpx no longer has compat defines, use the current ones
# NSS 3.28.1 patch
Patch500: mozilla-1290037.patch
Patch501: mozilla-1329272.patch
%if %{official_branding}
# Required by Mozilla Corporation
@ -227,9 +223,6 @@ cd mozilla
%patch400 -p1 -b .966424
#%patch402 -p1 -b .rhbz-1014858 FIXME musi byt
%patch304 -p1 -b .1245783
# NSS 3.28.1 patch
%patch500 -p1 -b .1290037
%patch501 -p1 -b .1329272
cd ..
%patch105 -p1 -b .bad-langs
@ -618,6 +611,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Tue Jan 31 2017 Jan Horak <jhorak@redhat.com> - 45.7.0-1
- Update to 45.7.0
* Fri Jan 20 2017 Martin Stransky <stransky@redhat.com> - 45.6.0-6
- Rebuilt for new nss 3.28.1 (mozbz#1290037)