diff options
Diffstat (limited to 'libre/icecat')
| -rw-r--r-- | libre/icecat/PKGBUILD | 20 | ||||
| -rw-r--r-- | libre/icecat/add-bracket-for-sed-4.3-compliance.patch | 29 | ||||
| -rw-r--r-- | libre/icecat/nss-3.28.patch | 35 |
3 files changed, 5 insertions, 79 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index c5bf394e6..a13547042 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -13,9 +13,9 @@ _pgo=false pkgname=icecat -_pkgver=45.5.1-gnu1 +_pkgver=45.7.0-gnu1 pkgver=${_pkgver//-/_} -pkgrel=4.1 +pkgrel=1 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 armv7h) @@ -42,16 +42,14 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{ firefox-gcc-6.0.patch gcc6-fix-compilation-for-IceCat.patch mozilla-1228540-1.patch - nss-3.28.patch vendor.js $pkgname-fixed-loading-icon.png no-libnotify.patch $pkgname-gtk3-20.patch disable-crypto-hardening-settings.patch disable-spoofSource-referer.patch - no-neon.patch - add-bracket-for-sed-4.3-compliance.patch) -sha256sums=('8163e5bc53f69d9f9b0fc5e9f95fae33da8139ae0f902756751cadbaa27e6ee9' + no-neon.patch) +sha256sums=('635b2d458b22221dcaff4463ce3ed2983e6fc4981c09170899fd63ea231dc7d6' 'SKIP' '89f375161a085ec37e88d5ceb9562dc33ed8ef03e225fefa819dfe3c6eb7290f' '583fe7b1897a7437854415c33cedefed1c987ca2ffea6b5826a99d4e7a71e05f' @@ -61,15 +59,13 @@ sha256sums=('8163e5bc53f69d9f9b0fc5e9f95fae33da8139ae0f902756751cadbaa27e6ee9' '4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf' '329cf6753d29ae64a4336a8a76ee71f0d331a39132159401e4d11de65b708a07' 'd1ccbaf0973615c57f7893355e5cd3a89efb4e91071d0ec376e429b50cf6ed19' - '87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4' '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' 'e4ebdd14096d177d264a7993dbd5df46463605ff45f783732c26d30b9caa53a7' '2e355a477f1df792cd7f9d1e3a56030543e0cf2d09051dd293ba495a7edb54fd' '0166aa368420f0bf0aab064b2188e3d852b241efeeb27dee66df2bc15e84b83a' 'c50043266e69f5844e6dce9ea7193af79587dcaa66806932d7867281a176f03e' - '6d0c1c9ca28b20d206ce24ca84f4d4e3f5d062a2e9cb7445fcb6c2cfea959b4a' - '0b543c953b7357b9b681121006ab1617263dacf611bb2798c8008fc98aebb2e6') + '6d0c1c9ca28b20d206ce24ca84f4d4e3f5d062a2e9cb7445fcb6c2cfea959b4a') validpgpkeys=( 'A57369A8BABC2542B5A0368C3C76EED7D7E04784' # Ruben Rodriguez ) @@ -101,9 +97,6 @@ prepare() { # Update to harfbuzz (following Icedove in [libre]) patch -Np1 -i $srcdir/mozilla-1228540-1.patch - # Update minimum bits in H2 (needed for NSS 3.28) - patch -Np1 -i $srcdir/nss-3.28.patch - # Patch and remove anything that's left patch -Np1 -i "$srcdir/libre.patch" rm -v browser/base/content/abouthome/snippet*.png || true @@ -140,9 +133,6 @@ prepare() { # https://labs.parabola.nu/issues/1073 patch -Np1 -i "$srcdir/disable-spoofSource-referer.patch" - # https://bugzilla.mozilla.org/show_bug.cgi?id=1329272 - patch -Np1 -i ../add-bracket-for-sed-4.3-compliance.patch - # ARM-specific changes: if [[ "$CARCH" == arm* ]]; then # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=850984 diff --git a/libre/icecat/add-bracket-for-sed-4.3-compliance.patch b/libre/icecat/add-bracket-for-sed-4.3-compliance.patch deleted file mode 100644 index ab0b26b67..000000000 --- a/libre/icecat/add-bracket-for-sed-4.3-compliance.patch +++ /dev/null @@ -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 - diff --git a/libre/icecat/nss-3.28.patch b/libre/icecat/nss-3.28.patch deleted file mode 100644 index 92c1376ae..000000000 --- a/libre/icecat/nss-3.28.patch +++ /dev/null @@ -1,35 +0,0 @@ - -# HG changeset patch -# User Franziskus Kiefer <franziskuskiefer@gmail.com> -# Date 1469717280 -7200 -# Node ID 361ac226da2a83516db8d4e4c5b41a69b3ba754f -# Parent 5d5d3ef04f3f77bb95616f56c129256a89f57831 -Bug 1290037 - 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) { - |