Date: Wednesday, September 2, 2015 @ 02:15:54 Author: foutrelis Revision: 245187
upgpkg: chromium 45.0.2454.85-1 New upstream release. Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch chromium/trunk/0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch -----------------------------------------------------------------+ 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch | 33 ---------- 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch | 32 --------- PKGBUILD | 19 +---- 3 files changed, 4 insertions(+), 80 deletions(-) Deleted: 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch =================================================================== --- 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch 2015-09-01 22:36:16 UTC (rev 245186) +++ 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch 2015-09-02 00:15:54 UTC (rev 245187) @@ -1,33 +0,0 @@ -From 1da1e686a87ad9f95d26786d2b53a1a4c280189f Mon Sep 17 00:00:00 2001 -From: agl <[email protected]> -Date: Wed, 20 May 2015 13:20:29 -0700 -Subject: [PATCH] NSS: reject DH groups smaller than 1024 bits. - -Since some platforms are still using NSS for now, this change mirrors https://boringssl-review.googlesource.com/#/c/4813/ in NSS. - -BUG=490240 - -Review URL: https://codereview.chromium.org/1143303002 - -Cr-Commit-Position: refs/heads/master@{#330791} ---- - net/third_party/nss/ssl/ssl3con.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c -index 89c98ea..861d434 100644 ---- a/net/third_party/nss/ssl/ssl3con.c -+++ b/net/third_party/nss/ssl/ssl3con.c -@@ -6946,7 +6946,8 @@ ssl3_HandleServerKeyExchange(sslSocket *ss, SSL3Opaque *b, PRUint32 length) - if (rv != SECSuccess) { - goto loser; /* malformed. */ - } -- if (dh_p.len < 512/8) { -+ if (dh_p.len < 1024/8 || -+ (dh_p.len == 1024/8 && (dh_p.data[0] & 0x80) == 0)) { - errCode = SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY; - goto alert_loser; - } --- -2.4.2 - Deleted: 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch =================================================================== --- 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch 2015-09-01 22:36:16 UTC (rev 245186) +++ 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch 2015-09-02 00:15:54 UTC (rev 245187) @@ -1,32 +0,0 @@ -From aa9abe7692a3ee99b69811594938d97cb180351e Mon Sep 17 00:00:00 2001 -From: avi <[email protected]> -Date: Wed, 20 May 2015 13:57:17 -0700 -Subject: [PATCH] Use the correct URL for ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY - errors. - -BUG=490260,490240 -TEST=as in bug - -Review URL: https://codereview.chromium.org/1148943002 - -Cr-Commit-Position: refs/heads/master@{#330799} ---- - chrome/common/localized_error.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc -index 0c4ad43..1ea56b1 100644 ---- a/chrome/common/localized_error.cc -+++ b/chrome/common/localized_error.cc -@@ -49,7 +49,7 @@ namespace { - static const char kRedirectLoopLearnMoreUrl[] = - "https://www.google.com/support/chrome/bin/answer.py?answer=95626";; - static const char kWeakDHKeyLearnMoreUrl[] = -- "http://sites.google.com/a/chromium.org/dev/"; -+ "https://www.chromium.org/administrators/"; - "err_ssl_weak_server_ephemeral_dh_key"; - #if defined(OS_CHROMEOS) - static const char kAppWarningLearnMoreUrl[] = --- -2.4.2 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-09-01 22:36:16 UTC (rev 245186) +++ PKGBUILD 2015-09-02 00:15:54 UTC (rev 245187) @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths <[email protected]> pkgname=chromium -pkgver=44.0.2403.157 +pkgver=45.0.2454.85 pkgrel=1 _launcher_ver=2 pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" @@ -15,8 +15,7 @@ depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'icu' 'libexif' 'libgcrypt' 'ttf-font' 'systemd' 'dbus' 'flac' 'snappy' 'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz' 'libsecret' - 'libvpx' 'perl' 'perl-file-basedir' 'desktop-file-utils' - 'hicolor-icon-theme') + 'perl' 'perl-file-basedir' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja') makedepends_x86_64=('lib32-gcc-libs' 'lib32-zlib') optdepends=('kdebase-kdialog: needed for file dialogs in KDE' @@ -27,15 +26,11 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz chromium.desktop - 0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch - 0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch 0001-Demand-for-newer-POSIX-macro.patch chromium-widevine.patch) -sha256sums=('e1a4d5fd030842684d69e840d411f45b4e5ccf377d7f131fe37ce1a13439f3b4' +sha256sums=('3e8c03a5a6ea4cc35017404a58687ca18207eed70781bad7f2d7d70610934c91' '7f91c81721092d707d7b94e6555a48bc7fd0bc0e1174df4649bdcd745930e52f' '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9' - '46daf921ed7eaab175f5a86b09357c69c33a10ffe1d4e7c24476af510c1b28d0' - '8fb428244be7b50268a2848a34405c5551232e5c77f9e553cfdd3103979748d2' 'd908939b10161efe658f0f82d2c132bf28dff54e08f02c6fed93815c3656f328' '379b746e187de28f80f5a7cd19edcfa31859656826f802a1ede054fcb6dfb221') @@ -59,12 +54,6 @@ prepare() { cd "$srcdir/$pkgname-$pkgver" - # https://code.google.com/p/chromium/issues/detail?id=490240 - patch -Np1 -i ../0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch - - # https://code.google.com/p/chromium/issues/detail?id=490260 - patch -Np1 -i ../0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch - # Fix BoringSSL build with glibc 2.22 (FS#45965) patch -Np1 -d third_party/boringssl/src < ../0001-Demand-for-newer-POSIX-macro.patch @@ -137,7 +126,7 @@ -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 - -Duse_system_libvpx=1 + -Duse_system_libvpx=0 -Duse_system_libxml=0 -Duse_system_snappy=1 -Duse_system_xdg_utils=1
