Updated to 66.0.2 (Build 1), Added fixes for mozbz#1526243, mozbz#1540145

5 files changed, 523 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 64e17c0..2a900a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -334,3 +334,5 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-66.0-20190315.tar.xz
 /firefox-66.0.1.source.tar.xz
 /firefox-langpacks-66.0.1-20190322.tar.xz
+/firefox-66.0.2.source.tar.xz
+/firefox-langpacks-66.0.2-20190401.tar.xz
diff --git a/firefox.spec b/firefox.spec
index 7334e13..b1968c7 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -98,13 +98,13 @@ ExcludeArch: s390x
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        66.0.1
-Release:        4%{?pre_tag}%{?dist}
+Version:        66.0.2
+Release:        1%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
 %if %{with langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20190322.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20190401.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source10:       firefox-mozconfig
@@ -155,6 +155,8 @@ Patch412:        mozilla-1337988.patch
 Patch413:        mozilla-1353817.patch
 Patch415:        Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
 Patch417:        bug1375074-save-restore-x28.patch
+Patch418:        mozilla-1526243.patch
+Patch419:        mozilla-1540145.patch
 
 # Wayland specific upstream patches
 Patch574:        firefox-pipewire.patch
@@ -368,6 +370,8 @@ This package contains results of tests executed during build.
 %if 0%{?big_endian}
 %patch26 -p1 -b .icu
 %endif
+%patch418 -p1 -b .mozilla-1526243
+%patch419 -p1 -b .mozilla-1540145
 
 # Wayland specific upstream patches
 %if 0%{?fedora} > 28
@@ -932,6 +936,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr 1 2019 Martin Stransky <stransky@redhat.com> - 66.0.2-1
+- Updated to 66.0.2 (Build 1)
+- Added fixes for mozbz#1526243, mozbz#1540145
+
 * Thu Mar 28 2019 Martin Stransky <stransky@redhat.com> - 66.0.1-4
 - Added fix for mozbz#1539471 - wayland popups/tooltips
 
diff --git a/mozilla-1526243.patch b/mozilla-1526243.patch
new file mode 100644
index 0000000..2d12378
--- /dev/null
+++ b/mozilla-1526243.patch
@@ -0,0 +1,340 @@
+changeset:   465480:a86f3560fb17
+parent:      465477:26d9b7ffbd6b
+user:        Martin Stransky <stransky@redhat.com>
+date:        Fri Mar 29 15:30:15 2019 +0100
+summary:     Bug 1526243 - [Linux] Don't use nsGConfService in nsGNOMEShellService.cpp, r=glandium
+
+diff --git a/browser/components/shell/nsGNOMEShellService.cpp b/browser/components/shell/nsGNOMEShellService.cpp
+--- a/browser/components/shell/nsGNOMEShellService.cpp
++++ b/browser/components/shell/nsGNOMEShellService.cpp
+@@ -10,17 +10,16 @@
+ #include "nsShellService.h"
+ #include "nsIServiceManager.h"
+ #include "nsIFile.h"
+ #include "nsIProperties.h"
+ #include "nsDirectoryServiceDefs.h"
+ #include "nsIPrefService.h"
+ #include "prenv.h"
+ #include "nsString.h"
+-#include "nsIGConfService.h"
+ #include "nsIGIOService.h"
+ #include "nsIGSettingsService.h"
+ #include "nsIStringBundle.h"
+ #include "nsIOutputStream.h"
+ #include "nsIProcess.h"
+ #include "nsServiceManagerUtils.h"
+ #include "nsComponentManagerUtils.h"
+ #include "nsIImageLoadingContent.h"
+@@ -65,48 +64,39 @@ static const ProtocolAssociation appProt
+ 
+ static const MimeTypeAssociation appTypes[] = {
+     // clang-format off
+   { "text/html",             "htm html shtml" },
+   { "application/xhtml+xml", "xhtml xht"      }
+     // clang-format on
+ };
+ 
+-// GConf registry key constants
+-#define DG_BACKGROUND "/desktop/gnome/background"
+-
+-#define kDesktopImageKey DG_BACKGROUND "/picture_filename"
+-#define kDesktopOptionsKey DG_BACKGROUND "/picture_options"
+-#define kDesktopDrawBGKey DG_BACKGROUND "/draw_background"
+-#define kDesktopColorKey DG_BACKGROUND "/primary_color"
+-
+ #define kDesktopBGSchema "org.gnome.desktop.background"
+ #define kDesktopImageGSKey "picture-uri"
+ #define kDesktopOptionGSKey "picture-options"
+ #define kDesktopDrawBGGSKey "draw-background"
+ #define kDesktopColorGSKey "primary-color"
+ 
+ static bool IsRunningAsASnap() { return (PR_GetEnv("SNAP") != nullptr); }
+ 
+ nsresult nsGNOMEShellService::Init() {
+   nsresult rv;
+ 
+   if (gfxPlatform::IsHeadless()) {
+     return NS_ERROR_NOT_AVAILABLE;
+   }
+ 
+-  // GConf, GSettings or GIO _must_ be available, or we do not allow
++  // GSettings or GIO _must_ be available, or we do not allow
+   // CreateInstance to succeed.
+ 
+-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+   nsCOMPtr<nsIGSettingsService> gsettings =
+       do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
+ 
+-  if (!gconf && !giovfs && !gsettings) return NS_ERROR_NOT_AVAILABLE;
++  if (!giovfs && !gsettings) return NS_ERROR_NOT_AVAILABLE;
+ 
+   // Check G_BROKEN_FILENAMES.  If it's set, then filenames in glib use
+   // the locale encoding.  If it's not set, they use UTF-8.
+   mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nullptr;
+ 
+   if (GetAppPathFromLauncher()) return NS_OK;
+ 
+   nsCOMPtr<nsIProperties> dirSvc(
+@@ -212,35 +202,23 @@ nsGNOMEShellService::IsDefaultBrowser(bo
+     }
+     if (strcmp(output, "yes\n") == 0) {
+       *aIsDefaultBrowser = true;
+     }
+     g_free(output);
+     return NS_OK;
+   }
+ 
+-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+-
+-  bool enabled;
+   nsAutoCString handler;
+   nsCOMPtr<nsIGIOMimeApp> gioApp;
+ 
+   for (unsigned int i = 0; i < ArrayLength(appProtocols); ++i) {
+     if (!appProtocols[i].essential) continue;
+ 
+-    if (gconf) {
+-      handler.Truncate();
+-      gconf->GetAppForProtocol(nsDependentCString(appProtocols[i].name),
+-                               &enabled, handler);
+-
+-      if (!CheckHandlerMatchesAppName(handler) || !enabled)
+-        return NS_OK;  // the handler is disabled or set to another app
+-    }
+-
+     if (giovfs) {
+       handler.Truncate();
+       nsCOMPtr<nsIHandlerApp> handlerApp;
+       giovfs->GetAppForURIScheme(nsDependentCString(appProtocols[i].name),
+                                  getter_AddRefs(handlerApp));
+       gioApp = do_QueryInterface(handlerApp);
+       if (!gioApp) return NS_OK;
+ 
+@@ -270,39 +248,17 @@ nsGNOMEShellService::SetDefaultBrowser(b
+     GSpawnFlags flags = static_cast<GSpawnFlags>(G_SPAWN_SEARCH_PATH |
+                                                  G_SPAWN_STDOUT_TO_DEV_NULL |
+                                                  G_SPAWN_STDERR_TO_DEV_NULL);
+     g_spawn_sync(nullptr, (gchar **)argv, nullptr, flags, nullptr, nullptr,
+                  nullptr, nullptr, nullptr, nullptr);
+     return NS_OK;
+   }
+ 
+-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+-  if (gconf) {
+-    nsAutoCString appKeyValue;
+-    if (mAppIsInPath) {
+-      // mAppPath is in the users path, so use only the basename as the launcher
+-      gchar *tmp = g_path_get_basename(mAppPath.get());
+-      appKeyValue = tmp;
+-      g_free(tmp);
+-    } else {
+-      appKeyValue = mAppPath;
+-    }
+-
+-    appKeyValue.AppendLiteral(" %s");
+-
+-    for (unsigned int i = 0; i < ArrayLength(appProtocols); ++i) {
+-      if (appProtocols[i].essential || aClaimAllTypes) {
+-        gconf->SetAppForProtocol(nsDependentCString(appProtocols[i].name),
+-                                 appKeyValue);
+-      }
+-    }
+-  }
+-
+   if (giovfs) {
+     nsresult rv;
+     nsCOMPtr<nsIStringBundleService> bundleService =
+         do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
+     NS_ENSURE_SUCCESS(rv, rv);
+ 
+     nsCOMPtr<nsIStringBundle> brandBundle;
+     rv = bundleService->CreateBundle(BRAND_PROPERTIES,
+@@ -353,19 +309,21 @@ nsGNOMEShellService::SetDefaultBrowser(b
+   }
+ 
+   return NS_OK;
+ }
+ 
+ NS_IMETHODIMP
+ nsGNOMEShellService::GetCanSetDesktopBackground(bool *aResult) {
+   // setting desktop background is currently only supported
+-  // for Gnome or desktops using the same GSettings and GConf keys
+-  const char *gnomeSession = getenv("GNOME_DESKTOP_SESSION_ID");
+-  if (gnomeSession) {
++  // for Gnome or desktops using the same GSettings keys
++  const char *currentDesktop = getenv("XDG_CURRENT_DESKTOP");
++  if (currentDesktop &&
++      (strstr(currentDesktop, "GNOME-Flashback:GNOME") != nullptr ||
++       strstr(currentDesktop, "GNOME") != nullptr)) {
+     *aResult = true;
+   } else {
+     *aResult = false;
+   }
+ 
+   return NS_OK;
+ }
+ 
+@@ -439,20 +397,16 @@ nsGNOMEShellService::SetDesktopBackgroun
+   filePath.Append('/');
+   filePath.Append(NS_ConvertUTF16toUTF8(brandName));
+   filePath.AppendLiteral("_wallpaper.png");
+ 
+   // write the image to a file in the home dir
+   rv = WriteImage(filePath, container);
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+-  // Try GSettings first. If we don't have GSettings or the right schema, fall
+-  // back to using GConf instead. Note that if GSettings works ok, the changes
+-  // get mirrored to GConf by the gsettings->gconf bridge in
+-  // gnome-settings-daemon
+   nsCOMPtr<nsIGSettingsService> gsettings =
+       do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
+   if (gsettings) {
+     nsCOMPtr<nsIGSettingsCollection> background_settings;
+     gsettings->GetCollectionForSchema(NS_LITERAL_CSTRING(kDesktopBGSchema),
+                                       getter_AddRefs(background_settings));
+     if (background_settings) {
+       gchar *file_uri = g_filename_to_uri(filePath.get(), nullptr, nullptr);
+@@ -465,32 +419,17 @@ nsGNOMEShellService::SetDesktopBackgroun
+                                      nsDependentCString(file_uri));
+       g_free(file_uri);
+       background_settings->SetBoolean(NS_LITERAL_CSTRING(kDesktopDrawBGGSKey),
+                                       true);
+       return rv;
+     }
+   }
+ 
+-  // if the file was written successfully, set it as the system wallpaper
+-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+-
+-  if (gconf) {
+-    gconf->SetString(NS_LITERAL_CSTRING(kDesktopOptionsKey), options);
+-
+-    // Set the image to an empty string first to force a refresh
+-    // (since we could be writing a new image on top of an existing
+-    // Firefox_wallpaper.png and nautilus doesn't monitor the file for changes)
+-    gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey), EmptyCString());
+-
+-    gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey), filePath);
+-    gconf->SetBool(NS_LITERAL_CSTRING(kDesktopDrawBGKey), true);
+-  }
+-
+-  return rv;
++  return NS_ERROR_FAILURE;
+ }
+ 
+ #define COLOR_16_TO_8_BIT(_c) ((_c) >> 8)
+ #define COLOR_8_TO_16_BIT(_c) ((_c) << 8 | (_c))
+ 
+ NS_IMETHODIMP
+ nsGNOMEShellService::GetDesktopBackgroundColor(uint32_t *aColor) {
+   nsCOMPtr<nsIGSettingsService> gsettings =
+@@ -502,22 +441,16 @@ nsGNOMEShellService::GetDesktopBackgroun
+     gsettings->GetCollectionForSchema(NS_LITERAL_CSTRING(kDesktopBGSchema),
+                                       getter_AddRefs(background_settings));
+     if (background_settings) {
+       background_settings->GetString(NS_LITERAL_CSTRING(kDesktopColorGSKey),
+                                      background);
+     }
+   }
+ 
+-  if (!background_settings) {
+-    nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+-    if (gconf)
+-      gconf->GetString(NS_LITERAL_CSTRING(kDesktopColorKey), background);
+-  }
+-
+   if (background.IsEmpty()) {
+     *aColor = 0;
+     return NS_OK;
+   }
+ 
+   GdkColor color;
+   gboolean success = gdk_color_parse(background.get(), &color);
+ 
+@@ -555,23 +488,17 @@ nsGNOMEShellService::SetDesktopBackgroun
+                                       getter_AddRefs(background_settings));
+     if (background_settings) {
+       background_settings->SetString(NS_LITERAL_CSTRING(kDesktopColorGSKey),
+                                      colorString);
+       return NS_OK;
+     }
+   }
+ 
+-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+-
+-  if (gconf) {
+-    gconf->SetString(NS_LITERAL_CSTRING(kDesktopColorKey), colorString);
+-  }
+-
+-  return NS_OK;
++  return NS_ERROR_FAILURE;
+ }
+ 
+ NS_IMETHODIMP
+ nsGNOMEShellService::OpenApplication(int32_t aApplication) {
+   nsAutoCString scheme;
+   if (aApplication == APPLICATION_MAIL)
+     scheme.AssignLiteral("mailto");
+   else if (aApplication == APPLICATION_NEWS)
+@@ -581,55 +508,17 @@ nsGNOMEShellService::OpenApplication(int
+ 
+   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+   if (giovfs) {
+     nsCOMPtr<nsIHandlerApp> handlerApp;
+     giovfs->GetAppForURIScheme(scheme, getter_AddRefs(handlerApp));
+     if (handlerApp) return handlerApp->LaunchWithURI(nullptr, nullptr);
+   }
+ 
+-  nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+-  if (!gconf) return NS_ERROR_FAILURE;
+-
+-  bool enabled;
+-  nsAutoCString appCommand;
+-  gconf->GetAppForProtocol(scheme, &enabled, appCommand);
+-
+-  if (!enabled) return NS_ERROR_FAILURE;
+-
+-  // XXX we don't currently handle launching a terminal window.
+-  // If the handler requires a terminal, bail.
+-  bool requiresTerminal;
+-  gconf->HandlerRequiresTerminal(scheme, &requiresTerminal);
+-  if (requiresTerminal) return NS_ERROR_FAILURE;
+-
+-  // Perform shell argument expansion
+-  int argc;
+-  char **argv;
+-  if (!g_shell_parse_argv(appCommand.get(), &argc, &argv, nullptr))
+-    return NS_ERROR_FAILURE;
+-
+-  char **newArgv = new char *[argc + 1];
+-  int newArgc = 0;
+-
+-  // Run through the list of arguments.  Copy all of them to the new
+-  // argv except for %s, which we skip.
+-  for (int i = 0; i < argc; ++i) {
+-    if (strcmp(argv[i], "%s") != 0) newArgv[newArgc++] = argv[i];
+-  }
+-
+-  newArgv[newArgc] = nullptr;
+-
+-  gboolean err = g_spawn_async(nullptr, newArgv, nullptr, G_SPAWN_SEARCH_PATH,
+-                               nullptr, nullptr, nullptr, nullptr);
+-
+-  g_strfreev(argv);
+-  delete[] newArgv;
+-
+-  return err ? NS_OK : NS_ERROR_FAILURE;
++  return NS_ERROR_FAILURE;
+ }
+ 
+ NS_IMETHODIMP
+ nsGNOMEShellService::OpenApplicationWithURI(nsIFile *aApplication,
+                                             const nsACString &aURI) {
+   nsresult rv;
+   nsCOMPtr<nsIProcess> process =
+       do_CreateInstance("@mozilla.org/process/util;1", &rv);
+
diff --git a/mozilla-1540145.patch b/mozilla-1540145.patch
new file mode 100644
index 0000000..efdf89d
--- /dev/null
+++ b/mozilla-1540145.patch
@@ -0,0 +1,168 @@
+diff -up firefox-66.0.1/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.mozilla-1540145 firefox-66.0.1/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+--- firefox-66.0.1/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.mozilla-1540145	2019-03-22 06:06:07.000000000 +0100
++++ firefox-66.0.1/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2019-04-01 09:33:18.621166482 +0200
+@@ -6,7 +6,6 @@
+ #include "nsISystemProxySettings.h"
+ #include "mozilla/ModuleUtils.h"
+ #include "nsIServiceManager.h"
+-#include "nsIGConfService.h"
+ #include "nsIURI.h"
+ #include "nsReadableUtils.h"
+ #include "nsArrayUtils.h"
+@@ -32,16 +31,10 @@ class nsUnixSystemProxySettings final :
+  private:
+   ~nsUnixSystemProxySettings() = default;
+ 
+-  nsCOMPtr<nsIGConfService> mGConf;
+-  nsCOMPtr<nsIGSettingsService> mGSettings;
++    nsCOMPtr<nsIGSettingsService> mGSettings;
+   nsCOMPtr<nsIGSettingsCollection> mProxySettings;
+   nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection>
+       mSchemeProxySettings;
+-  bool IsProxyMode(const char* aMode);
+-  nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType,
+-                                   nsACString& aResult);
+-  nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost,
+-                             int32_t aPort, nsACString& aResult);
+   nsresult GetProxyFromGSettings(const nsACString& aScheme,
+                                  const nsACString& aHost, int32_t aPort,
+                                  nsACString& aResult);
+@@ -66,20 +59,10 @@ nsresult nsUnixSystemProxySettings::Init
+         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(
+-             NS_LITERAL_CSTRING("/system/proxy/mode"), mode)) &&
+-         mode.EqualsASCII(aMode);
+-}
+-
+ nsresult nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) {
+   if (mProxySettings) {
+     nsCString proxyMode;
+@@ -92,14 +75,8 @@ nsresult nsUnixSystemProxySettings::GetP
+     }
+     /* The org.gnome.system.proxy schema has been found, but auto mode is not
+      * set. Don't try the GConf and return empty string. */
+-    aResult.Truncate();
+-    return NS_OK;
+   }
+ 
+-  if (mGConf && IsProxyMode("auto")) {
+-    return mGConf->GetString(NS_LITERAL_CSTRING("/system/proxy/autoconfig_url"),
+-                             aResult);
+-  }
+   // Return an empty string when auto mode is not set.
+   aResult.Truncate();
+   return NS_OK;
+@@ -217,30 +194,6 @@ static nsresult GetProxyFromEnvironment(
+   return NS_OK;
+ }
+ 
+-nsresult nsUnixSystemProxySettings::SetProxyResultFromGConf(
+-    const char* aKeyBase, const char* aType, nsACString& aResult) {
+-  nsAutoCString hostKey;
+-  hostKey.AppendASCII(aKeyBase);
+-  hostKey.AppendLiteral("host");
+-  nsAutoCString host;
+-  nsresult rv = mGConf->GetString(hostKey, host);
+-  NS_ENSURE_SUCCESS(rv, rv);
+-  if (host.IsEmpty()) return NS_ERROR_FAILURE;
+-
+-  nsAutoCString portKey;
+-  portKey.AppendASCII(aKeyBase);
+-  portKey.AppendLiteral("port");
+-  int32_t port;
+-  rv = mGConf->GetInt(portKey, &port);
+-  NS_ENSURE_SUCCESS(rv, rv);
+-
+-  /* When port is 0, proxy is not considered as enabled even if host is set. */
+-  if (port == 0) return NS_ERROR_FAILURE;
+-
+-  SetProxyResult(aType, host, port, aResult);
+-  return NS_OK;
+-}
+-
+ nsresult nsUnixSystemProxySettings::SetProxyResultFromGSettings(
+     const char* aKeyBase, const char* aType, nsACString& aResult) {
+   nsDependentCString key(aKeyBase);
+@@ -366,63 +319,6 @@ static bool HostIgnoredByProxy(const nsA
+   return memcmp(&ignoreAddr, &hostAddr, sizeof(PRIPv6Addr)) == 0;
+ }
+ 
+-nsresult nsUnixSystemProxySettings::GetProxyFromGConf(const nsACString& aScheme,
+-                                                      const nsACString& aHost,
+-                                                      int32_t aPort,
+-                                                      nsACString& aResult) {
+-  bool masterProxySwitch = false;
+-  mGConf->GetBool(NS_LITERAL_CSTRING("/system/http_proxy/use_http_proxy"),
+-                  &masterProxySwitch);
+-  // if no proxy is set in GConf return NS_ERROR_FAILURE
+-  if (!(IsProxyMode("manual") || masterProxySwitch)) {
+-    return NS_ERROR_FAILURE;
+-  }
+-
+-  nsCOMPtr<nsIArray> ignoreList;
+-  if (NS_SUCCEEDED(mGConf->GetStringList(
+-          NS_LITERAL_CSTRING("/system/http_proxy/ignore_hosts"),
+-          getter_AddRefs(ignoreList))) &&
+-      ignoreList) {
+-    uint32_t len = 0;
+-    ignoreList->GetLength(&len);
+-    for (uint32_t i = 0; i < len; ++i) {
+-      nsCOMPtr<nsISupportsString> str = do_QueryElementAt(ignoreList, i);
+-      if (str) {
+-        nsAutoString s;
+-        if (NS_SUCCEEDED(str->GetData(s)) && !s.IsEmpty()) {
+-          if (HostIgnoredByProxy(NS_ConvertUTF16toUTF8(s), aHost)) {
+-            aResult.AppendLiteral("DIRECT");
+-            return NS_OK;
+-          }
+-        }
+-      }
+-    }
+-  }
+-
+-  bool useHttpProxyForAll = false;
+-  // This setting sometimes doesn't exist, don't bail on failure
+-  mGConf->GetBool(NS_LITERAL_CSTRING("/system/http_proxy/use_same_proxy"),
+-                  &useHttpProxyForAll);
+-
+-  nsresult rv;
+-  if (!useHttpProxyForAll) {
+-    rv = SetProxyResultFromGConf("/system/proxy/socks_", "SOCKS", aResult);
+-    if (NS_SUCCEEDED(rv)) return rv;
+-  }
+-
+-  if (aScheme.LowerCaseEqualsLiteral("http") || useHttpProxyForAll) {
+-    rv = SetProxyResultFromGConf("/system/http_proxy/", "PROXY", aResult);
+-  } else if (aScheme.LowerCaseEqualsLiteral("https")) {
+-    rv = SetProxyResultFromGConf("/system/proxy/secure_", "PROXY", aResult);
+-  } else if (aScheme.LowerCaseEqualsLiteral("ftp")) {
+-    rv = SetProxyResultFromGConf("/system/proxy/ftp_", "PROXY", aResult);
+-  } else {
+-    rv = NS_ERROR_FAILURE;
+-  }
+-
+-  return rv;
+-}
+-
+ nsresult nsUnixSystemProxySettings::GetProxyFromGSettings(
+     const nsACString& aScheme, const nsACString& aHost, int32_t aPort,
+     nsACString& aResult) {
+@@ -494,7 +390,6 @@ nsresult nsUnixSystemProxySettings::GetP
+     nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult);
+     if (NS_SUCCEEDED(rv)) return rv;
+   }
+-  if (mGConf) return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
+ 
+   return GetProxyFromEnvironment(aScheme, aHost, aPort, aResult);
+ }
diff --git a/sources b/sources
index 110cb17..a753462 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (cbindgen-vendor.tar.xz) = b6737ca86e6223bb9e25861dae05e18469aecbeaa74d0d24719f531b01c74b9a00d9ba4e7faf6366e98cb7f0bdbeedfc337b739fff60bb3d22faabe9751f7ded
-SHA512 (firefox-66.0.1.source.tar.xz) = 6ca68a20335440c8aeb58d44d2024cd468ce22557457c5c7e8b5bc6ee6d7ad790d2b0a2a6fd23bb9b592b4d357f0662b96849935dc5a1d020dfd21d2490902ed
-SHA512 (firefox-langpacks-66.0.1-20190322.tar.xz) = db81ee66e8629048bce97bd60d73a7d7e9809d0c7705cfaf39263218220329d297662576b9af218e60350476db5a6507599e5f34f249394d283f9c5f3f3551c8
+SHA512 (firefox-66.0.2.source.tar.xz) = 2246f3aed4e8a1d557a2383204e926c45d63d7977032512982b3698da4d6260b67fa91507f1a103af0af77198b7ffb34d6609159729aa7bf1c7c16cf2f7efc5b
+SHA512 (firefox-langpacks-66.0.2-20190401.tar.xz) = 7976d5b1de7f3068a0f10c9106cf2e1700af8aa07972b542afac3a78aeb3713e656b4866ff1811e6753e2abe0e172d425db9430d18427997aba572efa9ebc15f