Uprev NSS requirement on Linux to 3.26
BUG=691261 Review-Url: https://codereview.chromium.org/2721373002 Cr-Commit-Position: refs/heads/master@{#478030}
This commit is contained in:
@@ -325,7 +325,7 @@ fi
|
|||||||
# xdg-utils: For OS integration.
|
# xdg-utils: For OS integration.
|
||||||
# wget: For uploading crash reports with Breakpad.
|
# wget: For uploading crash reports with Breakpad.
|
||||||
ADDITIONAL_DEPS="ca-certificates, fonts-liberation, libappindicator1, \
|
ADDITIONAL_DEPS="ca-certificates, fonts-liberation, libappindicator1, \
|
||||||
libnss3 (>= 3.17.2), lsb-release, xdg-utils (>= 1.0.2), wget"
|
libnss3 (>= 3.26), lsb-release, xdg-utils (>= 1.0.2), wget"
|
||||||
|
|
||||||
# Fix-up libnspr dependency due to renaming in Ubuntu (the old package still
|
# Fix-up libnspr dependency due to renaming in Ubuntu (the old package still
|
||||||
# exists, but it was moved to "universe" repository, which isn't installed by
|
# exists, but it was moved to "universe" repository, which isn't installed by
|
||||||
|
@@ -131,7 +131,9 @@ do_package() {
|
|||||||
# lsb implies many dependencies.
|
# lsb implies many dependencies.
|
||||||
#
|
#
|
||||||
# nss (bundled) is optional in LSB 4.0. Also specify a more recent version
|
# nss (bundled) is optional in LSB 4.0. Also specify a more recent version
|
||||||
# for security and stability updates.
|
# for security and stability updates. While we depend on libnss3.so and not
|
||||||
|
# libssl3.so, force the dependency on libssl3 to ensure the NSS version is
|
||||||
|
# 3.28 or later, since libssl3 should always be packaged with libnss3.
|
||||||
#
|
#
|
||||||
# libstdc++.so.6 is for C++11 support.
|
# libstdc++.so.6 is for C++11 support.
|
||||||
#
|
#
|
||||||
@@ -153,7 +155,8 @@ do_package() {
|
|||||||
# TODO(thestig): Use the liberation-fonts package once its available on all
|
# TODO(thestig): Use the liberation-fonts package once its available on all
|
||||||
# supported distros.
|
# supported distros.
|
||||||
DEPENDS="lsb >= 4.0, \
|
DEPENDS="lsb >= 4.0, \
|
||||||
libnss3.so(NSS_3.19.1)${PKG_ARCH}, \
|
libnss3.so(NSS_3.22)${PKG_ARCH}, \
|
||||||
|
libssl3.so(NSS_3.28)${PKG_ARCH}, \
|
||||||
libstdc++.so.6(GLIBCXX_3.4.18)${PKG_ARCH}, \
|
libstdc++.so.6(GLIBCXX_3.4.18)${PKG_ARCH}, \
|
||||||
wget, \
|
wget, \
|
||||||
xdg-utils, \
|
xdg-utils, \
|
||||||
|
@@ -670,16 +670,13 @@ class NSSInitSingleton {
|
|||||||
|
|
||||||
EnsureNSPRInit();
|
EnsureNSPRInit();
|
||||||
|
|
||||||
// We *must* have NSS >= 3.14.3.
|
// We *must* have NSS >= 3.26 at compile time.
|
||||||
static_assert(
|
static_assert((NSS_VMAJOR == 3 && NSS_VMINOR >= 26) || (NSS_VMAJOR > 3),
|
||||||
(NSS_VMAJOR == 3 && NSS_VMINOR == 14 && NSS_VPATCH >= 3) ||
|
"nss version check failed");
|
||||||
(NSS_VMAJOR == 3 && NSS_VMINOR > 14) ||
|
|
||||||
(NSS_VMAJOR > 3),
|
|
||||||
"nss version check failed");
|
|
||||||
// Also check the run-time NSS version.
|
// Also check the run-time NSS version.
|
||||||
// NSS_VersionCheck is a >= check, not strict equality.
|
// NSS_VersionCheck is a >= check, not strict equality.
|
||||||
if (!NSS_VersionCheck("3.14.3")) {
|
if (!NSS_VersionCheck("3.26")) {
|
||||||
LOG(FATAL) << "NSS_VersionCheck(\"3.14.3\") failed. NSS >= 3.14.3 is "
|
LOG(FATAL) << "NSS_VersionCheck(\"3.26\") failed. NSS >= 3.26 is "
|
||||||
"required. Please upgrade to the latest NSS, and if you "
|
"required. Please upgrade to the latest NSS, and if you "
|
||||||
"still get this error, contact your distribution "
|
"still get this error, contact your distribution "
|
||||||
"maintainer.";
|
"maintainer.";
|
||||||
|
@@ -44,15 +44,6 @@ ScopedTestNSSDB::~ScopedTestNSSDB() {
|
|||||||
CERT_DestroyCertList(cert_list);
|
CERT_DestroyCertList(cert_list);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Don't close when NSS is < 3.15.1, because it would require an additional
|
|
||||||
// sleep for 1 second after closing the database, due to
|
|
||||||
// http://bugzil.la/875601.
|
|
||||||
if (!NSS_VersionCheck("3.15.1")) {
|
|
||||||
LOG(ERROR) << "NSS version is < 3.15.1, test DB will not be closed.";
|
|
||||||
temp_dir_.Take();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// NSS is allowed to do IO on the current thread since dispatching
|
// NSS is allowed to do IO on the current thread since dispatching
|
||||||
// to a dedicated thread would still have the affect of blocking
|
// to a dedicated thread would still have the affect of blocking
|
||||||
// the current thread, due to NSS's internal locking requirements
|
// the current thread, due to NSS's internal locking requirements
|
||||||
|
Reference in New Issue
Block a user