forked from pool/MozillaThunderbird
126ce832a3
- MozillaThunderbird 60.5.0:
* FileLink provider WeTransfer to upload large attachments
* Thunderbird now allows the addition of OpenSearch search engines
from a local XML file using a minimal user inferface: [+] button
to select a file an add, [-] to remove.
* More search engines: Google and DuckDuckGo available by default
in some locales
* During account creation, Thunderbird will now detect servers
using the Microsoft Exchange protocol. It will offer the
installation of a 3rd party add-on (Owl) which supports that
protocol.
* Thunderbird now compatible with other WebExtension-based
FileLink add-ons like the Dropbox add-on
- requires NSS 3.36.7
- removed obsolete patch
mozilla-no-stdcxx-check.patch
- rebased patches
MFSA 2018-31
* CVE-2018-17466 bmo#1488295
Buffer overflow and out-of-bounds read in ANGLE library with
TextureStorage11
* CVE-2018-18492 bmo#1499861
Use-after-free with select element
* CVE-2018-18493 bmo#1504452
Buffer overflow in accelerated 2D canvas with Skia
* CVE-2018-18494 bmo#1487964
Same-origin policy violation using location attribute and
performance.getEntries to steal cross-origin URLs
* CVE-2018-18498 bmo#1500011
Integer overflow when calculating buffer sizes for images
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=451
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From: Wolfgang Rosenauer
|
|
Subject: Do not use gconf for proxy settings if not running within Gnome
|
|
|
|
Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
===================================================================
|
|
RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v
|
|
retrieving revision 1.1
|
|
|
|
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
|
|
@@ -55,24 +55,27 @@ NS_IMETHODIMP
|
|
nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
|
|
// dbus prevents us from being threadsafe, but this routine should not block
|
|
// anyhow
|
|
*aMainThreadOnly = true;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult nsUnixSystemProxySettings::Init() {
|
|
- mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
|
- if (mGSettings) {
|
|
- mGSettings->GetCollectionForSchema(
|
|
- NS_LITERAL_CSTRING("org.gnome.system.proxy"),
|
|
- getter_AddRefs(mProxySettings));
|
|
- }
|
|
- if (!mProxySettings) {
|
|
- mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
|
|
+ // only use GSettings if that is a GNOME session
|
|
+ const char* sessionType = PR_GetEnv("DESKTOP_SESSION");
|
|
+ if (sessionType && !strcmp(sessionType, "gnome")) {
|
|
+ mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
|
|
+ if (mGSettings) {
|
|
+ mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"),
|
|
+ getter_AddRefs(mProxySettings));
|
|
+ }
|
|
+ if (!mProxySettings) {
|
|
+ mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
|
|
+ }
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
bool nsUnixSystemProxySettings::IsProxyMode(const char* aMode) {
|
|
nsAutoCString mode;
|
|
return NS_SUCCEEDED(mGConf->GetString(
|