diff --git a/srcpkgs/chromium/patches/0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch b/srcpkgs/chromium/patches/0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch deleted file mode 100644 index 9057aac89d2..00000000000 --- a/srcpkgs/chromium/patches/0001-NSS-reject-DH-groups-smaller-than-1024-bits.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1da1e686a87ad9f95d26786d2b53a1a4c280189f Mon Sep 17 00:00:00 2001 -From: agl -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 ---- net/third_party/nss/ssl/ssl3con.c -+++ 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 - diff --git a/srcpkgs/chromium/patches/0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch b/srcpkgs/chromium/patches/0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch deleted file mode 100644 index d3fb8f12a14..00000000000 --- a/srcpkgs/chromium/patches/0001-Use-the-correct-URL-for-ERR_SSL_WEAK_SERVER_EPHEMERA.patch +++ /dev/null @@ -1,32 +0,0 @@ -From aa9abe7692a3ee99b69811594938d97cb180351e Mon Sep 17 00:00:00 2001 -From: avi -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 ---- chrome/common/localized_error.cc -+++ 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 - diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index c0e70f4ec84..d8727ba4135 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,14 +1,14 @@ # Template file for 'chromium' pkgname=chromium # See http://www.chromium.org/developers/calendar for the latest version -version=44.0.2403.155 +version=45.0.2454.85 revision=1 short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="Juan RP " homepage="http://www.chromium.org/" license="BSD" distfiles="https://commondatastorage.googleapis.com/${pkgname}-browser-official/${pkgname}-${version}.tar.xz" -checksum=eba271c210a020dd61b72c940abeecdafc562a1d15fb45615dda72bcb6219f3c +checksum=3e8c03a5a6ea4cc35017404a58687ca18207eed70781bad7f2d7d70610934c91 lib32disabled=yes nodebug=yes @@ -17,7 +17,7 @@ hostmakedepends="yasm python pkg-config perl gperf bison ninja hwids icu55-devel makedepends="libpng-devel gtk+-devel nss-devel pciutils-devel libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel - libXScrnSaver-devel alsa-lib-devel icu55-devel snappy-devel libvpx-devel + libXScrnSaver-devel alsa-lib-devel icu55-devel snappy-devel libxml2-devel libxslt-devel pulseaudio-devel nss-devel libexif-devel libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel libjpeg-turbo-devel libevent-devel json-c-devel re2-devel harfbuzz-devel @@ -99,7 +99,7 @@ do_configure() { -Duse_system_xdg_utils=1 -Duse_system_yasm=1 -Duse_system_icu=1 - -Duse_system_libvpx=1 + -Duse_system_libvpx=0 -Duse_cups=1 -Dlinux_link_cups=1 -Duse_pulseaudio=1