diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index da525df..118648b 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -63,8 +63,8 @@ Patch6: qtwebengine-opensource-src-5.6.0-beta-system-icu-utf.patch # update the bundled patched NSS SSL implementation to NSS 3.21, matching the # system NSS (backport of https://codereview.chromium.org/1511123006) Patch7: qtwebengine-opensource-src-5.6.0-beta-nss321.patch -# add missing nssoptions.h header needed by the above, from upstream NSS -Patch8: qtwebengine-opensource-src-5.6.0-beta-nssoptions-h.patch +# add missing nssoptions.h and verref.h headers needed by the above, from NSS +Patch8: qtwebengine-opensource-src-5.6.0-beta-nss-headers.patch # the architectures theoretically supported by the version of V8 used (#1298011) # You may need some minor patching to build on one of the secondary @@ -282,7 +282,7 @@ BuildArch: noarch %patch5 -p1 -b .system-nspr-prtime %patch6 -p1 -b .system-icu-utf %patch7 -p1 -b .nss321 -%patch8 -p1 -b .nssoptions-h +%patch8 -p1 -b .nss-headers %build export STRIP=strip diff --git a/qtwebengine-opensource-src-5.6.0-beta-nss-headers.patch b/qtwebengine-opensource-src-5.6.0-beta-nss-headers.patch new file mode 100644 index 0000000..f47a3c8 --- /dev/null +++ b/qtwebengine-opensource-src-5.6.0-beta-nss-headers.patch @@ -0,0 +1,69 @@ +diff -Nur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/nssoptions.h qtwebengine-opensource-src-5.6.0-beta-nss-headers/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/nssoptions.h +--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/nssoptions.h 1970-01-01 01:00:00.000000000 +0100 ++++ qtwebengine-opensource-src-5.6.0-beta-nss-headers/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/nssoptions.h 2016-01-13 23:34:30.880040223 +0100 +@@ -0,0 +1,21 @@ ++/* ++ * NSS utility functions ++ * ++ * This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++/* ++ * Include the default limits here ++ */ ++/* SSL default limits are here so we don't have to import a private SSL header ++ * file into NSS proper */ ++ ++/* The minimum server key sizes accepted by the clients. ++ * Not 1024 to be conservative. */ ++#define SSL_RSA_MIN_MODULUS_BITS 1023 ++/* 1023 to avoid cases where p = 2q+1 for a 512-bit q turns out to be ++ * only 1023 bits and similar. We don't have good data on whether this ++ * happens because NSS used to count bit lengths incorrectly. */ ++#define SSL_DH_MIN_P_BITS 1023 ++#define SSL_DSA_MIN_P_BITS 1023 ++ +diff -Nur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/verref.h qtwebengine-opensource-src-5.6.0-beta-nss-headers/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/verref.h +--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/verref.h 1970-01-01 01:00:00.000000000 +0100 ++++ qtwebengine-opensource-src-5.6.0-beta-nss-headers/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/verref.h 2016-01-13 23:59:22.996128771 +0100 +@@ -0,0 +1,40 @@ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++/* This header is used inline in a function to ensure that a version string ++ * symbol is linked in and not optimized out. A volatile reference is added to ++ * the variable identified by NSS_VERSION_VARIABLE. ++ * ++ * Use this as follows: ++ * ++ * #define NSS_VERSION_VARIABLE __nss_ssl_version ++ * #include "verref.h" ++ */ ++ ++/* Suppress unused variable warnings. */ ++#ifdef _MSC_VER ++#pragma warning(push) ++#pragma warning(disable: 4101) ++#endif ++/* This works for both gcc and clang */ ++#if defined(__GNUC__) && !defined(NSS_NO_GCC48) ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wunused-variable" ++#endif ++ ++#ifndef NSS_VERSION_VARIABLE ++#error NSS_VERSION_VARIABLE must be set before including "verref.h" ++#endif ++{ ++ extern const char NSS_VERSION_VARIABLE[]; ++ volatile const char _nss_version_c = NSS_VERSION_VARIABLE[0]; ++} ++#undef NSS_VERSION_VARIABLE ++ ++#ifdef _MSC_VER ++#pragma warning(pop) ++#endif ++#if defined(__GNUC__) && !defined(NSS_NO_GCC48) ++#pragma GCC diagnostic pop ++#endif diff --git a/qtwebengine-opensource-src-5.6.0-beta-nssoptions-h.patch b/qtwebengine-opensource-src-5.6.0-beta-nssoptions-h.patch deleted file mode 100644 index 8f19296..0000000 --- a/qtwebengine-opensource-src-5.6.0-beta-nssoptions-h.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/nssoptions.h qtwebengine-opensource-src-5.6.0-beta-nssoptions-h/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/nssoptions.h ---- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/nssoptions.h 1970-01-01 01:00:00.000000000 +0100 -+++ qtwebengine-opensource-src-5.6.0-beta-nssoptions-h/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/nssoptions.h 2016-01-13 23:34:30.880040223 +0100 -@@ -0,0 +1,21 @@ -+/* -+ * NSS utility functions -+ * -+ * This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+/* -+ * Include the default limits here -+ */ -+/* SSL default limits are here so we don't have to import a private SSL header -+ * file into NSS proper */ -+ -+/* The minimum server key sizes accepted by the clients. -+ * Not 1024 to be conservative. */ -+#define SSL_RSA_MIN_MODULUS_BITS 1023 -+/* 1023 to avoid cases where p = 2q+1 for a 512-bit q turns out to be -+ * only 1023 bits and similar. We don't have good data on whether this -+ * happens because NSS used to count bit lengths incorrectly. */ -+#define SSL_DH_MIN_P_BITS 1023 -+#define SSL_DSA_MIN_P_BITS 1023 -+