- rediffed patches, refreshed for current glibc, virtuelenv and nss

diff --git a/firefox-nss.patch b/firefox-nss.patch
new file mode 100644 (file)
index 0000000..2c9c7e6
--- /dev/null
+++ b/firefox-nss.patch
@@ -0,0 +1,212 @@
+--- firefox-52.9.0esr/dom/indexedDB/IDBTransaction.h.orig      2017-04-11 04:13:20.000000000 +0200
++++ firefox-52.9.0esr/dom/indexedDB/IDBTransaction.h   2023-01-30 17:20:23.523854344 +0100
+@@ -59,7 +59,7 @@ public:
+     READ_ONLY = 0,
+     READ_WRITE,
+     READ_WRITE_FLUSH,
+-    CLEANUP,
++    MODE_CLEANUP,
+     VERSION_CHANGE,
+ 
+     // Only needed for IPC serialization helper, should never be used in code.
+@@ -189,7 +189,7 @@ public:
+     AssertIsOnOwningThread();
+     return mMode == READ_WRITE ||
+            mMode == READ_WRITE_FLUSH ||
+-           mMode == CLEANUP ||
++           mMode == MODE_CLEANUP ||
+            mMode == VERSION_CHANGE;
+   }
+ 
+--- firefox-52.9.0esr/dom/indexedDB/IDBTransaction.cpp.orig    2017-04-11 04:13:20.000000000 +0200
++++ firefox-52.9.0esr/dom/indexedDB/IDBTransaction.cpp 2023-01-30 17:22:00.506243353 +0100
+@@ -216,7 +216,7 @@ IDBTransaction::Create(JSContext* aCx, I
+   MOZ_ASSERT(aMode == READ_ONLY ||
+              aMode == READ_WRITE ||
+              aMode == READ_WRITE_FLUSH ||
+-             aMode == CLEANUP);
++             aMode == MODE_CLEANUP);
+ 
+   RefPtr<IDBTransaction> transaction =
+     new IDBTransaction(aDatabase, aObjectStoreNames, aMode);
+@@ -871,7 +871,7 @@ IDBTransaction::GetMode(ErrorResult& aRv
+     case READ_WRITE_FLUSH:
+       return IDBTransactionMode::Readwriteflush;
+ 
+-    case CLEANUP:
++    case MODE_CLEANUP:
+       return IDBTransactionMode::Cleanup;
+ 
+     case VERSION_CHANGE:
+--- firefox-52.9.0esr/dom/indexedDB/IDBDatabase.cpp.orig       2017-04-11 04:13:20.000000000 +0200
++++ firefox-52.9.0esr/dom/indexedDB/IDBDatabase.cpp    2023-01-30 17:22:18.294567977 +0100
+@@ -668,7 +668,7 @@ IDBDatabase::Transaction(JSContext* aCx,
+       break;
+     case IDBTransactionMode::Readwrite:
+       if (mQuotaExceeded) {
+-        mode = IDBTransaction::CLEANUP;
++        mode = IDBTransaction::MODE_CLEANUP;
+         mQuotaExceeded = false;
+       } else {
+         mode = IDBTransaction::READ_WRITE;
+@@ -678,7 +678,7 @@ IDBDatabase::Transaction(JSContext* aCx,
+       mode = IDBTransaction::READ_WRITE_FLUSH;
+       break;
+     case IDBTransactionMode::Cleanup:
+-      mode = IDBTransaction::CLEANUP;
++      mode = IDBTransaction::MODE_CLEANUP;
+       mQuotaExceeded = false;
+       break;
+     case IDBTransactionMode::Versionchange:
+@@ -713,7 +713,7 @@ IDBDatabase::Transaction(JSContext* aCx,
+ 
+   transaction->SetBackgroundActor(actor);
+ 
+-  if (mode == IDBTransaction::CLEANUP) {
++  if (mode == IDBTransaction::MODE_CLEANUP) {
+     ExpireFileActors(/* aExpireAll */ true);
+   }
+ 
+@@ -863,7 +863,7 @@ IDBDatabase::AbortTransactions(bool aSho
+             // We warn for any transactions that could have written data.
+             case IDBTransaction::READ_WRITE:
+             case IDBTransaction::READ_WRITE_FLUSH:
+-            case IDBTransaction::CLEANUP:
++            case IDBTransaction::MODE_CLEANUP:
+             case IDBTransaction::VERSION_CHANGE:
+               transactionsThatNeedWarning.AppendElement(transaction);
+               break;
+--- firefox-52.9.0esr/dom/indexedDB/IDBCursor.cpp.orig 2017-04-11 04:13:20.000000000 +0200
++++ firefox-52.9.0esr/dom/indexedDB/IDBCursor.cpp      2023-01-30 17:22:34.372654549 +0100
+@@ -696,7 +696,7 @@ IDBCursor::Update(JSContext* aCx, JS::Ha
+     return nullptr;
+   }
+ 
+-  if (mTransaction->GetMode() == IDBTransaction::CLEANUP ||
++  if (mTransaction->GetMode() == IDBTransaction::MODE_CLEANUP ||
+       IsSourceDeleted() ||
+       !mHaveValue ||
+       mType == Type_ObjectStoreKey ||
+--- firefox-52.9.0esr/dom/indexedDB/ActorsParent.cpp.orig      2018-06-21 20:53:54.000000000 +0200
++++ firefox-52.9.0esr/dom/indexedDB/ActorsParent.cpp   2023-01-30 17:22:58.922453551 +0100
+@@ -11529,7 +11529,7 @@ AutoSavepoint::~AutoSavepoint()
+     MOZ_ASSERT(mDEBUGTransaction->GetMode() == IDBTransaction::READ_WRITE ||
+                mDEBUGTransaction->GetMode() ==
+                  IDBTransaction::READ_WRITE_FLUSH ||
+-               mDEBUGTransaction->GetMode() == IDBTransaction::CLEANUP ||
++               mDEBUGTransaction->GetMode() == IDBTransaction::MODE_CLEANUP ||
+                mDEBUGTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+ 
+     if (NS_FAILED(mConnection->RollbackSavepoint())) {
+@@ -11545,7 +11545,7 @@ AutoSavepoint::Start(const TransactionBa
+   MOZ_ASSERT(aTransaction);
+   MOZ_ASSERT(aTransaction->GetMode() == IDBTransaction::READ_WRITE ||
+              aTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
+-             aTransaction->GetMode() == IDBTransaction::CLEANUP ||
++             aTransaction->GetMode() == IDBTransaction::MODE_CLEANUP ||
+              aTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+ 
+   DatabaseConnection* connection = aTransaction->GetDatabase()->GetConnection();
+@@ -14692,7 +14692,7 @@ Database::AllocPBackgroundIDBTransaction
+   if (NS_WARN_IF(aMode != IDBTransaction::READ_ONLY &&
+                  aMode != IDBTransaction::READ_WRITE &&
+                  aMode != IDBTransaction::READ_WRITE_FLUSH &&
+-                 aMode != IDBTransaction::CLEANUP)) {
++                 aMode != IDBTransaction::MODE_CLEANUP)) {
+     ASSERT_UNLESS_FUZZING();
+     return nullptr;
+   }
+@@ -14701,7 +14701,7 @@ Database::AllocPBackgroundIDBTransaction
+   // has write access.
+   if (NS_WARN_IF((aMode == IDBTransaction::READ_WRITE ||
+                   aMode == IDBTransaction::READ_WRITE_FLUSH ||
+-                  aMode == IDBTransaction::CLEANUP) &&
++                  aMode == IDBTransaction::MODE_CLEANUP) &&
+                  mPrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo &&
+                  !mChromeWriteAccessAllowed)) {
+     return nullptr;
+@@ -14767,7 +14767,7 @@ Database::RecvPBackgroundIDBTransactionC
+   MOZ_ASSERT(aMode == IDBTransaction::READ_ONLY ||
+              aMode == IDBTransaction::READ_WRITE ||
+              aMode == IDBTransaction::READ_WRITE_FLUSH ||
+-             aMode == IDBTransaction::CLEANUP);
++             aMode == IDBTransaction::MODE_CLEANUP);
+   MOZ_ASSERT(!mClosed);
+ 
+   if (IsInvalidated()) {
+@@ -14926,7 +14926,7 @@ StartTransactionOp::DoDatabaseWork(Datab
+ 
+   Transaction()->SetActiveOnConnectionThread();
+ 
+-  if (Transaction()->GetMode() == IDBTransaction::CLEANUP) {
++  if (Transaction()->GetMode() == IDBTransaction::MODE_CLEANUP) {
+     nsresult rv = aConnection->DisableQuotaChecks();
+     if (NS_WARN_IF(NS_FAILED(rv))) {
+       return rv;
+@@ -15245,7 +15245,7 @@ TransactionBase::VerifyRequestParams(con
+     case RequestParams::TObjectStoreDeleteParams: {
+       if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
+                      mMode != IDBTransaction::READ_WRITE_FLUSH &&
+-                     mMode != IDBTransaction::CLEANUP &&
++                     mMode != IDBTransaction::MODE_CLEANUP &&
+                      mMode != IDBTransaction::VERSION_CHANGE)) {
+         ASSERT_UNLESS_FUZZING();
+         return false;
+@@ -15269,7 +15269,7 @@ TransactionBase::VerifyRequestParams(con
+     case RequestParams::TObjectStoreClearParams: {
+       if (NS_WARN_IF(mMode != IDBTransaction::READ_WRITE &&
+                      mMode != IDBTransaction::READ_WRITE_FLUSH &&
+-                     mMode != IDBTransaction::CLEANUP &&
++                     mMode != IDBTransaction::MODE_CLEANUP &&
+                      mMode != IDBTransaction::VERSION_CHANGE)) {
+         ASSERT_UNLESS_FUZZING();
+         return false;
+@@ -23959,7 +23959,7 @@ CommitOp::WriteAutoIncrementCounts()
+   mTransaction->AssertIsOnConnectionThread();
+   MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE ||
+              mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
+-             mTransaction->GetMode() == IDBTransaction::CLEANUP ||
++             mTransaction->GetMode() == IDBTransaction::MODE_CLEANUP ||
+              mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+ 
+   const nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray =
+@@ -24027,7 +24027,7 @@ CommitOp::CommitOrRollbackAutoIncrementC
+   mTransaction->AssertIsOnConnectionThread();
+   MOZ_ASSERT(mTransaction->GetMode() == IDBTransaction::READ_WRITE ||
+              mTransaction->GetMode() == IDBTransaction::READ_WRITE_FLUSH ||
+-             mTransaction->GetMode() == IDBTransaction::CLEANUP ||
++             mTransaction->GetMode() == IDBTransaction::MODE_CLEANUP ||
+              mTransaction->GetMode() == IDBTransaction::VERSION_CHANGE);
+ 
+   nsTArray<RefPtr<FullObjectStoreMetadata>>& metadataArray =
+@@ -24161,7 +24161,7 @@ CommitOp::Run()
+ 
+       connection->FinishWriteTransaction();
+ 
+-      if (mTransaction->GetMode() == IDBTransaction::CLEANUP) {
++      if (mTransaction->GetMode() == IDBTransaction::MODE_CLEANUP) {
+         connection->DoIdleProcessing(/* aNeedsCheckpoint */ true);
+ 
+         connection->EnableQuotaChecks();
+--- firefox-52.9.0esr/dom/indexedDB/ProfilerHelpers.h.orig     2017-04-11 04:13:20.000000000 +0200
++++ firefox-52.9.0esr/dom/indexedDB/ProfilerHelpers.h  2023-01-30 17:23:10.715212995 +0100
+@@ -129,7 +129,7 @@ public:
+       case IDBTransaction::READ_WRITE_FLUSH:
+         AppendLiteral("\"readwriteflush\"");
+         break;
+-      case IDBTransaction::CLEANUP:
++      case IDBTransaction::MODE_CLEANUP:
+         AppendLiteral("\"cleanup\"");
+         break;
+       case IDBTransaction::VERSION_CHANGE:
+--- firefox-52.9.0esr/dom/indexedDB/IDBObjectStore.cpp.orig    2018-06-21 20:53:54.000000000 +0200
++++ firefox-52.9.0esr/dom/indexedDB/IDBObjectStore.cpp 2023-01-30 17:23:19.722754184 +0100
+@@ -1406,7 +1406,7 @@ IDBObjectStore::AddOrPut(JSContext* aCx,
+   MOZ_ASSERT(aCx);
+   MOZ_ASSERT_IF(aFromCursor, aOverwrite);
+ 
+-  if (mTransaction->GetMode() == IDBTransaction::CLEANUP ||
++  if (mTransaction->GetMode() == IDBTransaction::MODE_CLEANUP ||
+       mDeletedSpec) {
+     aRv.Throw(NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR);
+     return nullptr;

diff --git a/firefox-prefs.patch b/firefox-prefs.patch
index b3d6f73aaf8189dac7ba8474b0c7cb54d7096bb0..4ba07b85a96468d89e2f18fcb803f2a4bab9ecfb 100644 (file)
--- a/firefox-prefs.patch
+++ b/firefox-prefs.patch
@@ -1,17 +1,16 @@
-diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile/firefox.js
 --- mozilla.orig/browser/app/profile/firefox.js        2008-06-21 12:55:30.000000000 +0200
 +++ mozilla/browser/app/profile/firefox.js     2008-06-21 15:25:48.000000000 +0200
-@@ -94,7 +94,7 @@ pref("extensions.hotfix.certs.1.sha1Fingerprint", "F1:DB:F9:6A:7B:B8:04:FA:48:3C
+@@ -62,7 +62,7 @@ pref("extensions.systemAddon.update.url"
  
  // Disable add-ons that are not installed by the user in all scopes by default.
  // See the SCOPE constants in AddonManager.jsm for values to use here.
 -pref("extensions.autoDisableScopes", 15);
 +pref("extensions.autoDisableScopes", 3);
  
- // Dictionary download preference
- pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-@@ -157,12 +157,12 @@
- pref("app.update.cert.checkAttributes", false);
+ // Add-on content security policies.
+ pref("extensions.webextensions.base-content-security-policy", "script-src 'self' https://* moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; object-src 'self' https://* moz-extension: blob: filesystem:;");
+@@ -111,12 +111,12 @@ pref("app.update.log", false);
+ pref("app.update.backgroundMaxErrors", 10);
  
  // Whether or not app updates are enabled
 -pref("app.update.enabled", true);
@@ -25,33 +24,33 @@ diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile
  
  // If set to true, the Update Service will present no UI for any event.
  pref("app.update.silent", false);
-@@ -252,7 +252,7 @@
- pref("general.useragent.complexOverride.moodle", false); // bug 797703
+@@ -206,7 +206,7 @@ pref("general.autoScroll", true);
+ #endif
  
  // At startup, check if we're the default browser and prompt user if not.
 -pref("browser.shell.checkDefaultBrowser", true);
 +pref("browser.shell.checkDefaultBrowser", false);
  pref("browser.shell.shortcutFavicons",true);
+ pref("browser.shell.mostRecentDateSetAsDefault", "");
+ #ifdef RELEASE_OR_BETA
+@@ -462,6 +462,8 @@ pref("browser.bookmarks.max_backups",
  
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
-@@ -448,6 +448,8 @@
- //  0: no backups created (and deletes all existing backups)
- pref("browser.bookmarks.max_backups",             10);
+ pref("browser.bookmarks.showRecentlyBookmarked",  true);
  
 +pref("intl.locale.matchOS", true);
 +
  // Scripts & Windows prefs
  pref("dom.disable_open_during_load",              true);
  pref("javascript.options.showInConsole",          true);
-@@ -574,7 +576,7 @@
- pref("alerts.totalOpenTime", 4000);
+@@ -592,7 +594,7 @@ pref("mousewheel.with_control.action",3)
+ pref("mousewheel.with_win.action", 1);
  
  pref("browser.xul.error_pages.enabled", true);
 -pref("browser.xul.error_pages.expert_bad_cert", false);
 +pref("browser.xul.error_pages.expert_bad_cert", true);
  
- // Work Offline is best manually managed by the user.
- pref("network.manage-offline-status", false);
+ // Enable captive portal detection.
+ pref("network.captive-portal-service.enabled", true);
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
 @@ -1510,7 +1510,7 @@ pref("layout.css.visited_links_enabled", true);

diff --git a/firefox-system-virtualenv.patch b/firefox-system-virtualenv.patch
index c97400c212daf89526490eaab45400bc29084d97..d4b8bda2747f8c4bee5e18429cd3dc9a48817e16 100644 (file)
--- a/firefox-system-virtualenv.patch
+++ b/firefox-system-virtualenv.patch
@@ -1,6 +1,6 @@
---- xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py~     2013-05-11 21:19:23.000000000 +0200
-+++ xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py      2013-05-14 22:51:32.136719267 +0200
-@@ -37,8 +37,7 @@
+--- firefox-52.9.0esr/python/mozbuild/mozbuild/virtualenv.py~  2013-05-11 21:19:23.000000000 +0200
++++ firefox-52.9.0esr/python/mozbuild/mozbuild/virtualenv.py   2013-05-14 22:51:32.136719267 +0200
+@@ -66,8 +66,7 @@ class VirtualenvManager(object):
      @property
      def virtualenv_script_path(self):
          """Path to virtualenv's own populator script."""
@@ -9,4 +9,20 @@
 +        return '/usr/bin/virtualenv-2'
  
      @property
-     def python_path(self):
+     def bin_path(self):
+@@ -390,15 +389,6 @@ class VirtualenvManager(object):
+             for package in packages:
+                 handle_package(package)
+ 
+-            sitecustomize = os.path.join(
+-                os.path.dirname(os.__file__), 'sitecustomize.py')
+-            with open(sitecustomize, 'w') as f:
+-                f.write(
+-                    '# Importing mach_bootstrap has the side effect of\n'
+-                    '# installing an import hook\n'
+-                    'import mach_bootstrap\n'
+-                )
+-
+         finally:
+             os.environ.pop('MACOSX_DEPLOYMENT_TARGET', None)
+ 

diff --git a/firefox52-esr.spec b/firefox52-esr.spec
index e275cfb254f901bc0299b2bfcd1c2ac012703c16..dc6df1fc18ae7e41c1877092098f00ddbf3e3870 100644 (file)
--- a/firefox52-esr.spec
+++ b/firefox52-esr.spec
@@ -21,7 +21,7 @@
 # The actual sqlite version (see RHBZ#480989):
 %define                sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
 
-%define                _basename       firefox
+%define                srcname firefox
 %define                nspr_ver        4.13.1
 %define                nss_ver         3.28.6
 
@@ -33,23 +33,23 @@ Version:    52.9.0
 Release:       7
 License:       MPL v2.0
 Group:         X11/Applications/Networking
-Source0:       http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
+Source0:       http://releases.mozilla.org/pub/firefox/releases/%{version}esr/source/%{srcname}-%{version}esr.source.tar.xz
 # Source0-md5: b8c2f3619c684818be9a513f8aa1dbfd
-Source3:       %{_basename}.desktop
-Source4:       %{_basename}.sh
+Source3:       %{srcname}.desktop
+Source4:       %{srcname}.sh
 Source5:       vendor.js
 Source6:       vendor-ac.js
 Patch0:                idl-parser.patch
 Patch1:                xulrunner-new-libxul.patch
 Patch2:                xulrunner-paths.patch
 Patch3:                ffmpeg4.patch
-Patch4:                %{_basename}-prefs.patch
-Patch5:                %{_basename}-pld-bookmarks.patch
-Patch6:                %{_basename}-no-subshell.patch
-Patch7:                %{_basename}-middle_click_paste.patch
-Patch8:                %{_basename}-system-virtualenv.patch
-Patch9:                %{_basename}-Disable-Firefox-Health-Report.patch
-Patch10:       freetype.patch
+Patch4:                %{srcname}-prefs.patch
+Patch5:                %{srcname}-pld-bookmarks.patch
+Patch6:                %{srcname}-no-subshell.patch
+Patch7:                %{srcname}-middle_click_paste.patch
+Patch8:                %{srcname}-system-virtualenv.patch
+Patch9:                %{srcname}-Disable-Firefox-Health-Report.patch
+Patch10:       %{srcname}-nss.patch
 Patch11:       xulrunner-pc.patch
 Patch12:       glibc.patch
 URL:           https://www.mozilla.org/firefox/
@@ -216,7 +216,7 @@ Firefox development package.
 Pakiet programistyczny Firefoksa.
 
 %prep
-%setup -q -n %{_basename}-%{version}esr
+%setup -q -n %{srcname}-%{version}esr
 
 # avoid using included headers (-I. is before HUNSPELL_CFLAGS)
 %{__rm} extensions/spellcheck/hunspell/src/{*.hxx,hunspell.h}
@@ -231,9 +231,9 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
 %patch5 -p1
 %patch6 -p2
 %patch7 -p1
-%patch8 -p2
+%patch8 -p1
 %patch9 -p1
-%patch10 -p2
+%patch10 -p1
 %patch11 -p1
 %patch12 -p1
 

diff --git a/glibc.patch b/glibc.patch
index 5c331b74b05a069aa815256309656f9fdb936db1..e82ee67fa051ff8c6e1307188a03a53a4461f157 100644 (file)
--- a/glibc.patch
+++ b/glibc.patch
@@ -16,3 +16,14 @@
  
  #ifdef XP_WIN
  #include <windows.h>
+--- firefox-52.9.0esr/memory/mozjemalloc/jemalloc.c.orig       2017-05-12 02:25:50.000000000 +0200
++++ firefox-52.9.0esr/memory/mozjemalloc/jemalloc.c    2023-01-30 06:15:52.731524546 +0100
+@@ -331,7 +331,7 @@ __FBSDID("$FreeBSD: head/lib/libc/stdlib
+ #endif
+ #include <sys/time.h>
+ #include <sys/types.h>
+-#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID)
++#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID) && !defined(__linux__)
+ #include <sys/sysctl.h>
+ #endif
+ #include <sys/uio.h>

diff --git a/xulrunner-new-libxul.patch b/xulrunner-new-libxul.patch
index f4a527cc2a884e6a60727001a7e697839d0dd7b7..f9d344716a4416e6ca95ffea352b67bdc26f8251 100644 (file)
--- a/xulrunner-new-libxul.patch
+++ b/xulrunner-new-libxul.patch
@@ -1,4 +1,3 @@
-diff -ruNp mozilla.orig/toolkit/mozapps/installer/packager.py mozilla/toolkit/mozapps/installer/packager.py
 --- mozilla.orig/toolkit/mozapps/installer/packager.py 2015-04-03 04:30:06.000000000 +0200
 +++ mozilla/toolkit/mozapps/installer/packager.py      2015-04-10 14:52:45.133163567 +0200
 @@ -152,7 +152,7 @@ def precompile_cache(formatter, source_p
@@ -9,4 +8,4 @@ diff -ruNp mozilla.orig/toolkit/mozapps/installer/packager.py mozilla/toolkit/mo
 +        extra_env = {'MOZ_STARTUP_CACHE': cache, 'LD_PRELOAD': os.path.join(gre_path, 'libxul.so')}
          if buildconfig.substs.get('MOZ_TSAN'):
              extra_env['TSAN_OPTIONS'] = 'report_bugs=0'
-         if launcher.launch(['xpcshell', '-g', gre_path, '-a', app_path,
+         if buildconfig.substs.get('MOZ_ASAN'):