diff options
author | Martin Stransky <stransky@redhat.com> | 2018-01-23 20:25:55 +0100 |
---|---|---|
committer | Martin Stransky <stransky@redhat.com> | 2018-01-23 20:25:55 +0100 |
commit | 5d35b83763bfa9d6fa1e45800ffefe0401556a59 (patch) | |
tree | 790d35f753205730630e6d31c4c1a0607169dddf /firefox-fedora-rhbz-1537287-v2.patch | |
parent | Try to disable rust debuginfo on arm to have arm builds again (rhbz#1523912) (diff) | |
download | librewolf-fedora-ff-5d35b83763bfa9d6fa1e45800ffefe0401556a59.tar.gz librewolf-fedora-ff-5d35b83763bfa9d6fa1e45800ffefe0401556a59.tar.bz2 librewolf-fedora-ff-5d35b83763bfa9d6fa1e45800ffefe0401556a59.zip |
Update to Firefox 58
Diffstat (limited to 'firefox-fedora-rhbz-1537287-v2.patch')
-rw-r--r-- | firefox-fedora-rhbz-1537287-v2.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/firefox-fedora-rhbz-1537287-v2.patch b/firefox-fedora-rhbz-1537287-v2.patch new file mode 100644 index 0000000..e7d314e --- /dev/null +++ b/firefox-fedora-rhbz-1537287-v2.patch @@ -0,0 +1,52 @@ +diff --git a/security/certverifier/NSSCertDBTrustDomain.cpp b/security/certverifier/NSSCertDBTrustDomain.cpp +--- a/security/certverifier/NSSCertDBTrustDomain.cpp ++++ b/security/certverifier/NSSCertDBTrustDomain.cpp +@@ -1059,26 +1059,17 @@ InitializeNSS(const nsACString& dir, boo + // "/usr/lib/nss/libnssckbi.so". + uint32_t flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; + if (readOnly) { + flags |= NSS_INIT_READONLY; + } + if (!loadPKCS11Modules) { + flags |= NSS_INIT_NOMODDB; + } +- // At the moment, sqldb does not work with non-ASCII file paths on Windows. +- bool useSQLDB = Preferences::GetBool("security.use_sqldb", false) && +- (NS_IsNativeUTF8() || NS_IsAscii(PromiseFlatCString(dir).get())); + nsAutoCString dbTypeAndDirectory; +- // Don't change any behavior if the user has specified an alternative database +- // location with MOZPSM_NSSDBDIR_OVERRIDE. +- const char* dbDirOverride = getenv("MOZPSM_NSSDBDIR_OVERRIDE"); +- if (useSQLDB && (!dbDirOverride || strlen(dbDirOverride) == 0)) { +- dbTypeAndDirectory.Append("sql:"); +- } + dbTypeAndDirectory.Append(dir); + MOZ_LOG(gCertVerifierLog, LogLevel::Debug, + ("InitializeNSS(%s, %d, %d)", dbTypeAndDirectory.get(), readOnly, + loadPKCS11Modules)); + SECStatus srv = NSS_Initialize(dbTypeAndDirectory.get(), "", "", + SECMOD_DB, flags); + if (srv != SECSuccess) { + return srv; +diff --git a/security/manager/ssl/security-prefs.js b/security/manager/ssl/security-prefs.js +--- a/security/manager/ssl/security-prefs.js ++++ b/security/manager/ssl/security-prefs.js +@@ -39,17 +39,17 @@ pref("security.ask_for_password", + pref("security.password_lifetime", 30); + + // If true, use the modern sqlite-backed certificate and key databases in NSS. + // If false, use the default format. Currently the default in NSS is the old + // BerkeleyDB format, but this will change in bug 1377940. + // Changing this requires a restart to take effect. + // Note that the environment variable MOZPSM_NSSDBDIR_OVERRIDE can override both + // the behavior of this preference and the NSS default. +-pref("security.use_sqldb", true); ++pref("security.use_sqldb", false); + + // The supported values of this pref are: + // 0: disable detecting Family Safety mode and importing the root + // 1: only attempt to detect Family Safety mode (don't import the root) + // 2: detect Family Safety mode and import the root + // (This is only relevant to Windows 8.1) + pref("security.family_safety.mode", 2); + |