From 4a9d03d5e8d2c3fd13d68ebcceec9a76acf7880b Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Jan 13 2016 22:39:31 +0000 Subject: Add missing nssoptions.h header needed by the nss321 patch File copied from upstream NSS. --- diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index d9d3bde..da525df 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -63,6 +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 # the architectures theoretically supported by the version of V8 used (#1298011) # You may need some minor patching to build on one of the secondary @@ -280,6 +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 %build export STRIP=strip diff --git a/qtwebengine-opensource-src-5.6.0-beta-nssoptions-h.patch b/qtwebengine-opensource-src-5.6.0-beta-nssoptions-h.patch new file mode 100644 index 0000000..8f19296 --- /dev/null +++ b/qtwebengine-opensource-src-5.6.0-beta-nssoptions-h.patch @@ -0,0 +1,25 @@ +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 ++