commit: d4e796a0bc39189d690465c3a455b27873989456 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Sat Apr 23 19:37:40 2016 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Sat Apr 23 19:37:40 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d4e796a0
dev-qt/qtwebengine: delete unused patches Package-Manager: portage-2.2.28 .../files/qtwebengine-5.6.0-nss-3.23-01.patch | 59 ------------------ .../files/qtwebengine-5.6.0-nss-3.23-02.patch | 69 ---------------------- 2 files changed, 128 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-01.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-01.patch deleted file mode 100644 index 8d192b6..0000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-01.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0a385bb01d9cf060fae4c9d350ee98561654df96 Mon Sep 17 00:00:00 2001 -From: Kai Koehne <[email protected]> -Date: Thu, 24 Mar 2016 12:34:25 +0100 -Subject: [PATCH] [backport] Call EnsureNSSHttpIOInit in the chimera build. - -Otherwise we end up using the default NSS client and not -SystemURLRequestContext. - -This is a minimal fix to be merged onto release branches. -A follow-up will revise this to be somewhat less error-prone. - -BUG=539520 -TEST=Open about:net-internals on Linux or Chrome OS - Visit https://incomplete-chain.badssl.com/ in a new tab - The Events tab of about:net-internals should show a fetch for http://crt.comodoca.com/COMODORSADomainValidationSecureServerCA.crt - -Review URL: https://codereview.chromium.org/1384343002 - -Task-number: QTBUG-51890 -Task-number: QTBUG-52068 -Change-Id: I567d5cd5e6d4e53b833699e67c45f3bdfc52953d -Reviewed-by: Joerg Bornemann <[email protected]> -Reviewed-by: Allan Sandfeld Jensen <[email protected]> ---- - chromium/net/socket/ssl_client_socket_openssl.cc | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc b/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc -index 5489ead..dc9b3ff 100644 ---- a/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc -+++ b/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc -@@ -57,6 +57,10 @@ - #include "net/ssl/ssl_platform_key.h" - #endif - -+#if defined(USE_NSS_CERTS) || defined(OS_IOS) -+#include "net/cert_net/nss_ocsp.h" -+#endif -+ - namespace net { - - namespace { -@@ -795,6 +799,14 @@ int SSLClientSocketOpenSSL::Init() { - DCHECK(!ssl_); - DCHECK(!transport_bio_); - -+#if defined(USE_NSS_CERTS) || defined(OS_IOS) -+ if (ssl_config_.cert_io_enabled) { -+ // TODO(davidben): Move this out of SSLClientSocket. See -+ // https://crbug.com/539520. -+ EnsureNSSHttpIOInit(); -+ } -+#endif -+ - SSLContext* context = SSLContext::GetInstance(); - crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE); - --- -2.7.4 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-02.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-02.patch deleted file mode 100644 index a194650..0000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-02.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 82900c7b96b2a6fb42fe3841df7685b820edd588 Mon Sep 17 00:00:00 2001 -From: Kai Koehne <[email protected]> -Date: Thu, 24 Mar 2016 13:55:28 +0100 -Subject: [PATCH] Use system NSS only for certificate handling - -Compiling against NSS 3.23 fails with current Chromium. Also, with NSS -3.21 there are failures connecting to e.g. google.com. - -Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL -is always used for cryptography, and NSS only for certificate handlng. - -Patches included in 3rdparty update: - -0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build. -0472123 Fix build against newer NSS -90c62c4 <third_party/libpng> [Backport] update to libpng 1.2.56 -34857b8 <third_party/libpng> [Backport] Stop large iCCP chunks causing delays and "Aw Snap!" - -Task-number: QTBUG-52193 -Task-number: QTBUG-51890 -Task-number: QTBUG-52068 -Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5 -Reviewed-by: Allan Sandfeld Jensen <[email protected]> ---- - src/core/config/linux.pri | 9 ++++++--- - tools/qmake/mkspecs/features/configure.prf | 4 ++-- - 3 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index 88c1a41..39eeb2a 100644 ---- a/src/core/config/linux.pri -+++ b/src/core/config/linux.pri -@@ -18,11 +18,14 @@ GYP_CONFIG += \ - use_gio=0 \ - use_gnome_keyring=0 \ - use_kerberos=0 \ -- use_pango=0 -+ use_pango=0 \ -+ use_openssl=1 - --!use?(nss) { -+use?(nss) { -+ GYP_CONFIG += use_nss_certs=1 \ -+ use_openssl_certs=0 -+} else { - GYP_CONFIG += use_nss_certs=0 \ -- use_openssl=1 \ - use_openssl_certs=1 - } - -diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf -index 4cb4600..953572d 100644 ---- a/tools/qmake/mkspecs/features/configure.prf -+++ b/tools/qmake/mkspecs/features/configure.prf -@@ -72,9 +72,9 @@ defineTest(runConfigure) { - defineTest(finalizeConfigure) { - linux { - use?(nss) { -- log("SSL............................... Using system NSS$${EOL}") -+ log("Certificate handling.............. Using system NSS$${EOL}") - } else { -- log("SSL............................... Using bundled BoringSSL$${EOL}") -+ log("Certificate handling.............. Using bundled BoringSSL$${EOL}") - } - use?(system_icu) { - packagesExist("icu-uc icu-i18n") { --- -2.7.4 -
