Update to 45.7.0

This commit is contained in:
Joan Figueras 2017-03-05 20:29:47 +01:00
parent 96f86a102a
commit fbfbf5d992
4 changed files with 10 additions and 76 deletions

View file

@ -1,7 +1,7 @@
pkgbase = icecat
pkgdesc = GNU version of the Firefox browser.
pkgver = 45.5.1
pkgrel = 6
pkgver = 45.7.0
pkgrel = 1
url = http://www.gnu.org/software/gnuzilla/
arch = i686
arch = x86_64
@ -39,18 +39,16 @@ pkgbase = icecat
optdepends = upower: Battery API
options = !emptydirs
options = !makeflags
source = http://ftpmirror.gnu.org/gnuzilla/45.5.1/icecat-45.5.1-gnu1.tar.bz2
source = http://ftpmirror.gnu.org/gnuzilla/45.5.1/icecat-45.5.1-gnu1.tar.bz2.sig
source = http://ftpmirror.gnu.org/gnuzilla/45.7.0/icecat-45.7.0-gnu1.tar.bz2
source = http://ftpmirror.gnu.org/gnuzilla/45.7.0/icecat-45.7.0-gnu1.tar.bz2.sig
source = mozconfig
source = icecat.desktop
source = icecat-safe.desktop
source = vendor.js
source = gcc6-fix-compilation-for-IceCat.patch
source = firefox-gcc-6.0.patch
source = icu_configure.patch
source = update_keybits_in_H2.patch
validpgpkeys = A57369A8BABC2542B5A0368C3C76EED7D7E04784
sha256sums = 8163e5bc53f69d9f9b0fc5e9f95fae33da8139ae0f902756751cadbaa27e6ee9
sha256sums = 635b2d458b22221dcaff4463ce3ed2983e6fc4981c09170899fd63ea231dc7d6
sha256sums = SKIP
sha256sums = 0f9c8f4e7795ded4f661af9ff73a5b091fda4eebc969a76e00e48d005feebe7d
sha256sums = c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3
@ -58,8 +56,6 @@ pkgbase = icecat
sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4
sha256sums = 329cf6753d29ae64a4336a8a76ee71f0d331a39132159401e4d11de65b708a07
sha256sums = 4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf
sha256sums = ef2a7c41685f8e371d47909bf4cc071a349ef09b1421ab523c94057d85ca8f07
sha256sums = f99424950ae7493b5814d36279f4af49e89127731fde2b7938b2c10e403796e1
pkgname = icecat

View file

@ -6,10 +6,10 @@
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
pkgname=icecat
pkgver=45.5.1
pkgver=45.7.0
_pkgver=${pkgver}-gnu1
_pkgverbase=${pkgver%%.*}
pkgrel=6
pkgrel=1
pkgdesc="GNU version of the Firefox browser."
arch=(i686 x86_64)
url="http://www.gnu.org/software/gnuzilla/"
@ -31,20 +31,16 @@ source=(http://ftpmirror.gnu.org/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz
icecat-safe.desktop
vendor.js
gcc6-fix-compilation-for-IceCat.patch
firefox-gcc-6.0.patch
icu_configure.patch
update_keybits_in_H2.patch)
firefox-gcc-6.0.patch)
sha256sums=('8163e5bc53f69d9f9b0fc5e9f95fae33da8139ae0f902756751cadbaa27e6ee9'
sha256sums=('635b2d458b22221dcaff4463ce3ed2983e6fc4981c09170899fd63ea231dc7d6'
'SKIP'
'0f9c8f4e7795ded4f661af9ff73a5b091fda4eebc969a76e00e48d005feebe7d'
'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
'190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303'
'4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
'329cf6753d29ae64a4336a8a76ee71f0d331a39132159401e4d11de65b708a07'
'4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf'
'ef2a7c41685f8e371d47909bf4cc071a349ef09b1421ab523c94057d85ca8f07'
'f99424950ae7493b5814d36279f4af49e89127731fde2b7938b2c10e403796e1')
'4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf')
validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
@ -60,13 +56,6 @@ prepare() {
patch -Np1 -i $srcdir/gcc6-fix-compilation-for-IceCat.patch
patch -Np1 -i $srcdir/firefox-gcc-6.0.patch
# without fixing this, the build throws errors that it's unable to extract the icu version number from uvernum.h and aborts (Thanks jghodd)
patch -Np0 -i ${srcdir}/icu_configure.patch
# Bug 1290037 - Update keybits in H2. r=mt, a=ritu
# https://hg.mozilla.org/releases/mozilla-esr45/rev/bf0dd9ae6807 - https://bbs.archlinux.org/viewtopic.php?id=222513
patch -Np1 -i ${srcdir}/update_keybits_in_H2.patch
msg2 "Starting build..."
cp -v ${srcdir}/mozconfig .mozconfig

View file

@ -1,22 +0,0 @@
--- configure_old 2017-01-15 12:13:23.456943319 +0100
+++ configure 2017-01-15 12:13:35.291907492 +0100
@@ -30305,7 +30305,7 @@
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
{ echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; }
fi
--- js/src/configure_old 2017-01-15 12:14:55.625663124 +0100
+++ js/src/configure 2017-01-15 12:15:09.949619360 +0100
@@ -15906,7 +15906,7 @@
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
{ echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; }
fi

View file

@ -1,29 +0,0 @@
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) {