Updated to 60.0.1

4 files changed, 131 insertions, 112 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4806d9c..257e787 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox
-pkgver=59.0.2
-pkgrel=3
+pkgver=60.0.1
+pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -21,22 +21,27 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 options=(!emptydirs !makeflags !strip)
 _repo=https://hg.mozilla.org/mozilla-unified
 source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
+        complete-csd-window-offset-mozilla-1457691.patch.xz
         0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz
         $pkgname.desktop firefox-symbolic.svg
         no-crmf.diff
-         vendor.js)
+        vendor.js)
 sha256sums=('SKIP'
+            'a3fb3c3b6fb775c99afdbad507848b77c5e4bbaac2e8ceeb1bfb47699c4b6268'
             '8422030440032535d918844263fbd92d39bff207acb5fff55ed0afee38bcf582'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
             '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873'
-            '3aabcc9ac0389e13b0f98c86f0c58b248e69bb3e9d83747619bce8a00602824b')
+            'ea7c74586629bf0a888e0a67c2d3ce155a45a34f5391e49e478d5bdcd09fed8b')
 
 prepare() {
   mkdir path
   ln -s /usr/bin/python2 path/python
 
   cd mozilla-unified
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1283299#c158
+  patch -Np1 -i ../complete-csd-window-offset-mozilla-1457691.patch
+
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1435212
   patch -Np1 -i ../0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch
 
@@ -83,6 +88,8 @@ ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --disable-webrtc
 
+mk_add_options MOZ_MAKE_FLAGS="-j2"
+
 END
 
   # Disable various components at the source level
@@ -90,6 +97,14 @@ END
   sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService"
   sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket"
   sed -i '/activity-stream/d' browser/extensions/moz.build || die "failed to wipe activity-stream"
+  sed -i '/aushelper/d' browser/extensions/moz.build || die "failed to wipe aushelper"
+  sed -i '/followonsearch/d' browser/extensions/moz.build || die "failed to wipe followonsearch"
+  sed -i '/formautofill/d' browser/extensions/moz.build || die "failed to wipe formautofill"
+  sed -i '/onboarding/d' browser/extensions/moz.build || die "failed to wipe onboarding"
+  sed -i '/screenshots/d' browser/extensions/moz.build || die "failed to wipe screenshots"
+  #sed -i '/webcompat/d' browser/extensions/moz.build || die "failed to wipe webcompat"
+
+
 }
 
 build() {
@@ -111,7 +126,7 @@ build() {
 package() {
   cd mozilla-unified
   DESTDIR="$pkgdir" ./mach install
-  find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +
+  # find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +
 
   install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
   local shortver=$(echo $pkgver | cut -d'.' -f1,2)
diff --git a/complete-csd-window-offset-mozilla-1457691.patch.xz b/complete-csd-window-offset-mozilla-1457691.patch.xz
new file mode 100644
index 0000000..9c6e88f
--- /dev/null
+++ b/complete-csd-window-offset-mozilla-1457691.patch.xz
diff --git a/upload-symbol-archive b/upload-symbol-archive
deleted file mode 100755
index 5b61750..0000000
--- a/upload-symbol-archive
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash -e
-
-die() {
-  echo >&2 "$@"
-  exit 1
-}
-
-(( $# >= 2 )) || die "Usage: $0 TOKEN-FILE SYMBOL-ARCHIVE..."
-token="$1"
-shift
-
-[[ -f $token && -s $token ]] || die "Invalid TOKEN-FILE ${token@Q}"
-
-for zip; do
-  [[ $(file -Ebi "$zip") == application/zip* ]] || die "Invalid SYMBOL-ARCHIVE ${zip@Q}"
-done
-
-for zip; do
-  echo >&2 "Uploading ${zip@Q} ..."
-  curl -X POST -H "Auth-Token: $(<"$token")" -F "${zip##*/}=@$zip" \
-    --retry 4 --retry-connrefused --connect-timeout 120 \
-    https://symbols.mozilla.org/upload/
-  echo
-done
diff --git a/vendor.js b/vendor.js
index 5f34c03..b07042a 100644
--- a/vendor.js
+++ b/vendor.js
@@ -9,13 +9,18 @@ pref("app.normandy.api_url", false);
 pref("app.normandy.enabled", false);
 pref("app.releaseNotesURL",				"https://www.mozilla.org/en-US/firefox/notes/");
 pref("app.shield.optoutstudies.enabled", false);
-pref("app.update.auto", 						false);
-pref("app.update.checkInstallTime", 			false);
-pref("app.update.enabled",					false);
+//pref("app.update.auto", 						true);
+pref("app.update.auto", 						false);  //Conflict
+//pref("app.update.checkInstallTime", 			true);
+pref("app.update.checkInstallTime", 			false);  //Conflict
+//pref("app.update.enabled",					true);
+pref("app.update.enabled",					false);  //Conflict
 pref("app.update.service.enabled", false);
 pref("app.update.silent", false);
-pref("app.update.staging.enabled",				false);
-pref("app.update.url",				"");
+//pref("app.update.staging.enabled",				true);
+pref("app.update.staging.enabled",				false);  //Conflict
+//pref("app.update.url",				"https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/%LOCALE%");
+pref("app.update.url",				"");  //Conflict
 
 //pref("beacon.enabled",					true);
 pref("beacon.enabled",					false);  //Conflict
@@ -38,10 +43,10 @@ pref("browser.cache.disk.smart_size.first_run", false);
 pref("browser.cache.disk_cache_ssl",			false);  //Conflict
 pref("browser.cache.frecency_experiment", -1);
 pref("browser.cache.memory.capacity", 1048576);  //Hidden
-//pref("browser.cache.offline.enable",			false);  //Required for storage API
-pref("browser.cache.offline.insecure.enable",			false);  //Added in Firefox 60
-pref("browser.chrome.errorReporter.enabled", 		false);  //Added in Firefox 60
-pref("browser.chrome.errorReporter.submitUrl",				"");  //Added in Firefox 60
+pref("browser.cache.offline.enable",			false);
+pref("browser.cache.offline.insecure.enable",			false);
+pref("browser.chrome.errorReporter.enabled", 		false);
+pref("browser.chrome.errorReporter.submitUrl",				"");
 pref("browser.crashReports.unsubmittedCheck.autoSubmit2", 		false);
 pref("browser.crashReports.unsubmittedCheck.enabled", 		false);
 pref("browser.customizemode.tip0.learnMoreUrl",				"https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");
@@ -71,14 +76,10 @@ pref("browser.migrate.automigrate.enabled", false);
 //pref("browser.newtab.preload",				true);
 pref("browser.newtab.preload",				false);  //Conflict
 pref("browser.newtab.url", "about:blank"); //FIXME  //TabMix can unset this at times
-pref("browser.newtabpage.activity-stream.enabled",				false);
-pref("browser.newtabpage.directory.source", "data:text/plain,");
 pref("browser.newtabpage.activity-stream.aboutHome.enabled",				false);
 pref("browser.newtabpage.activity-stream.feeds.section.topstories",				false);
 //pref("browser.newtabpage.enabled",				true);
 pref("browser.newtabpage.enabled",				false);  //Conflict
-pref("browser.newtabpage.enhanced",			false); //Also set by TabMix
-pref("browser.newtabpage.introShown",			true);
 pref("browser.newtabpage.preload", false);
 pref("browser.newtabpage.remote",				false);
 pref("browser.offline-apps.notify", true);
@@ -93,10 +94,14 @@ pref("browser.reader.detectedFirstArticle", true);
 pref("browser.rights.3.shown", true);
 pref("browser.safebrowsing.blockedURIs.enabled", false);
 pref("browser.safebrowsing.downloads.enabled", false);
-pref("browser.safebrowsing.downloads.remote.block_dangerous",			false);
-pref("browser.safebrowsing.downloads.remote.block_dangerous_host",		false);
-pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted",	false);
-pref("browser.safebrowsing.downloads.remote.block_uncommon",	false);
+//pref("browser.safebrowsing.downloads.remote.block_dangerous",			true);
+pref("browser.safebrowsing.downloads.remote.block_dangerous",			false);  //Conflict
+//pref("browser.safebrowsing.downloads.remote.block_dangerous_host",		true);
+pref("browser.safebrowsing.downloads.remote.block_dangerous_host",		false);  //Conflict
+//pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted",	true);
+pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted",	false);  //Conflict
+//pref("browser.safebrowsing.downloads.remote.block_uncommon",	true);
+pref("browser.safebrowsing.downloads.remote.block_uncommon",	false);  //Conflict
 pref("browser.safebrowsing.downloads.remote.enabled",			false);
 pref("browser.safebrowsing.downloads.remote.url",				"");
 pref("browser.safebrowsing.malware.enabled",		false);
@@ -105,14 +110,16 @@ pref("browser.safebrowsing.provider.mozilla.gethashURL",		"");
 pref("browser.safebrowsing.provider.mozilla.reportURL", "");
 pref("browser.safebrowsing.provider.mozilla.updateURL",			"");
 pref("browser.safebrowsing.provider.google.gethashURL",		"");
-pref("browser.safebrowsing.provider.google.reportURL",			"");
+//pref("browser.safebrowsing.provider.google.reportURL",			"");
+pref("browser.safebrowsing.provider.google.reportURL",			"");  //Conflict
 pref("browser.safebrowsing.provider.google.updateURL",			"");
 pref("browser.safebrowsing.provider.google.reportMalwareMistakeURL", "");
 pref("browser.safebrowsing.provider.google.reportPhishMistakeURL", "");
 pref("browser.safebrowsing.provider.google4.dataSharing.enabled", false);
 pref("browser.safebrowsing.provider.google4.dataSharingURL", "");
 pref("browser.safebrowsing.provider.google4.gethashURL", "");
-pref("browser.safebrowsing.provider.google4.reportURL", "");
+//pref("browser.safebrowsing.provider.google4.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=
+pref("browser.safebrowsing.provider.google4.reportURL", "");  //Conflict
 pref("browser.safebrowsing.provider.google4.reportMalwareMistakeURL", "");
 pref("browser.safebrowsing.provider.google4.reportPhishMistakeURL", "");
 pref("browser.safebrowsing.provider.google4.updateURL", "");
@@ -120,24 +127,24 @@ pref("browser.safebrowsing.provider.google4.updateURL", "");
 pref("browser.safebrowsing.reportPhishURL", "");  //Conflict
 pref("browser.search.countryCode",				"US");
 pref("browser.search.defaultenginename",		"data:text/plain,browser.search.defaultenginename=DuckDuckGo");
-pref("browser.search.defaultenginename.US",		"data:text/plain,browser.search.defaultenginename.US=Yahoo");
+pref("browser.search.defaultenginename.US",		"data:text/plain,browser.search.defaultenginename.US=Google");
 pref("browser.search.geoSpecificDefaults",			false);
 //pref("browser.search.geoSpecificDefaults.url",		"https://search.services.mozilla.com/1/%APP%/%VERSION%/%CHANNEL%/%LOCALE%/%REGION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%");
 pref("browser.search.geoSpecificDefaults.url",		"");  //Conflict
 pref("browser.search.geoip.url",				"");
 pref("browser.search.order.1",		"Google");
-pref("browser.search.order.2",		"Yahoo");
-pref("browser.search.order.3",		"Bing");
+pref("browser.search.order.2",		"Bing");
+pref("browser.search.order.3",		"chrome://browser-region/locale/region.properties");
 pref("browser.search.order.extra.1",		"DuckDuckGo");
 pref("browser.search.order.extra.2",		"YouTube");
-pref("browser.search.order.US.1",		"data:text/plain,browser.search.order.US.1=Yahoo");
-pref("browser.search.order.US.2",		"data:text/plain,browser.search.order.US.2=Google");
-pref("browser.search.order.US.3",		"data:text/plain,browser.search.order.US.3=Bing");
+pref("browser.search.order.US.1",		"data:text/plain,browser.search.order.US.1=Google");
+pref("browser.search.order.US.2",		"data:text/plain,browser.search.order.US.2=Bing");
 pref("browser.search.region",				"US");
 pref("browser.search.suggest.enabled",			false);
 pref("browser.search.update",				false);
 pref("browser.send_pings",					false);
-pref("browser.send_pings.require_same_host", true);
+//pref("browser.send_pings.require_same_host", false);
+pref("browser.send_pings.require_same_host", true);  //Conflict
 //pref("browser.sessionhistory.max_entries", 50);
 pref("browser.sessionhistory.max_entries", 10);  //Conflict
 pref("browser.sessionstore.privacy_level",			2);
@@ -148,8 +155,10 @@ pref("browser.slowStartup.maxSamples", 0);
 pref("browser.slowStartup.notificationDisabled", true);
 pref("browser.slowStartup.samples", 0);
 pref("browser.ssl_override_behavior",			2);
-pref("browser.startup.homepage_override.buildID", "20100101");
-pref("browser.startup.homepage_override.mstone", "ignore");
+//pref("browser.startup.homepage_override.buildID", "");
+pref("browser.startup.homepage_override.buildID", "20100101");  //Conflict
+//pref("browser.startup.homepage_override.mstone", "");
+pref("browser.startup.homepage_override.mstone", "ignore");  //Conflict
 //pref("browser.storageManager.enabled", 				true);  //Required for Storage API
 pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}");
 //pref("browser.tabs.crashReporting.sendReport", 				true);
@@ -165,17 +174,18 @@ pref("browser.taskbar.lists.tasks.enabled", false);
 pref("browser.taskbar.previews.enable", false);
 pref("browser.uitour.enabled",				false);
 pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
+//pref("browser.urlbar.autoFill", true);
+pref("browser.urlbar.autoFill", false);  //Conflict
+//pref("browser.urlbar.autoFill.typed", true);
+pref("browser.urlbar.autoFill.typed", false);  //Conflict
+//pref("browser.urlbar.autocomplete.enabled", true);
+pref("browser.urlbar.autocomplete.enabled", false);  //Conflict
 pref("browser.urlbar.decodeURLsOnCopy", true);
 pref("browser.urlbar.filter.javascript",			true);
 pref("browser.urlbar.maxHistoricalSearchSuggestions", 0);
 pref("browser.urlbar.oneOffSearches", false);
+pref("browser.urlbar.searchSuggestionsChoice", false);
 pref("browser.urlbar.speculativeConnect.enabled", false);
-//pref("browser.urlbar.autocomplete.enabled", true);
-pref("browser.urlbar.autocomplete.enabled", false);  //Conflict
-//pref("browser.urlbar.autoFill", true);
-pref("browser.urlbar.autoFill", false);  //Conflict
-//pref("browser.urlbar.autoFill.typed", true);
-pref("browser.urlbar.autoFill.typed", false);  //Conflict
 //pref("browser.urlbar.suggest.bookmark", true);
 pref("browser.urlbar.suggest.bookmark", false);  //Conflict
 //pref("browser.urlbar.suggest.history", true);
@@ -183,9 +193,6 @@ pref("browser.urlbar.suggest.history", false);  //Conflict
 //pref("browser.urlbar.suggest.openpage", false);
 pref("browser.urlbar.suggest.openpage", false);  //Conflict
 pref("browser.urlbar.suggest.searches", false);
-pref("browser.urlbar.searchSuggestionsChoice", false);
-
-
 //pref("browser.urlbar.trimURLs",				true);
 pref("browser.urlbar.trimURLs",				false);  //Conflict
 //pref("browser.urlbar.userMadeSearchSuggestionsChoice", false);
@@ -198,9 +205,11 @@ pref("browser.xul.error_pages.expert_bad_cert", true);  //Conflict
 //pref("canvas.capturestream.enabled", true);
 pref("canvas.capturestream.enabled", false);  //Conflict
 
-pref("captivedetect.canonicalURL", "");
+//pref("captivedetect.canonicalURL", "http://detectportal.firefox.com/success.txt");
+pref("captivedetect.canonicalURL", "");  //Conflict
 
-pref("clipboard.autocopy", false);
+//pref("clipboard.autocopy", true);
+pref("clipboard.autocopy", false);  //Conflict
 
 pref("datareporting.healthreport.uploadEnabled",		false);
 pref("datareporting.policy.dataSubmissionEnabled",		false);
@@ -214,12 +223,15 @@ pref("devtools.debugger.chrome-debugging-host", "127.0.0.1");
 pref("devtools.debugger.force-local",			true);
 pref("devtools.debugger.prompt-connection", true);
 pref("devtools.debugger.remote-enabled",			false);
-pref("devtools.devedition.promo.url", "https://www.mozilla.org/firefox/developer/");
+//pref("devtools.devedition.promo.url", "https://www.mozilla.org/firefox/developer/?utm_source=firefox-dev-tools&utm_medium=firefox-browser&utm_content=betadoorhanger");
+pref("devtools.devedition.promo.url", "https://www.mozilla.org/firefox/developer/");  //Conflict
 pref("devtools.webide.autoinstallADBHelper",		false);
 pref("devtools.webide.enabled",				false);
 
 pref("dom.allow_cut_copy", false);  //Hidden
-pref("dom.caches.enabled", false);
+//pref("dom.caches.enabled", true);
+pref("dom.caches.enabled", false);  //Conflict
+pref("dom.disable_window_showModalDialog", true);
 //pref("dom.event.clipboardevents.enabled", true);
 pref("dom.event.clipboardevents.enabled", false);  //Conflict
 pref("dom.event.highrestimestamp.enabled", true);
@@ -241,19 +253,22 @@ pref("dom.performance.enable_user_timing_logging", false);
 pref("dom.popup_allowed_events", "change click dblclick mouseup notificationclick reset submit touchend");
 //pref("dom.popup_maximum", 20);
 pref("dom.popup_maximum", 3);  //Conflict
-pref("dom.push.connection.enabled", false);
+//pref("dom.push.connection.enabled", true);
+pref("dom.push.connection.enabled", false);  //Conflict
 pref("dom.push.enabled", false);
 pref("dom.push.serverURL", "");
 pref("dom.push.userAgentID", "");
 pref("dom.securecontext.whitelist_onions", true);
 pref("dom.serviceWorkers.enabled",				false);
 pref("dom.storage.enabled",		true);  //required by noscript
-//pref("dom.storage.enabled",		false);  //Conflict
 // pref("dom.storageManager.enabled", false);  //Required for Storage API
-pref("dom.vibrator.enabled", false);
+//pref("dom.vibrator.enabled", true);
+pref("dom.vibrator.enabled", false);  //Conflict
 pref("dom.vr.enabled",						false);
 pref("dom.vr.add-test-devices", 				0);
 pref("dom.vr.cardboard.enabled", 				false);
+//pref("dom.vr.oculus.enabled",					true);
+pref("dom.vr.oculus.enabled",					false);  //Conflict
 pref("dom.vr.openvr.enabled",					false);
 pref("dom.vr.osvr.enabled", false);
 pref("dom.vr.poseprediction.enabled",			false);
@@ -264,24 +279,23 @@ pref("dom.webnotifications.enabled", false);  //Conflict
 pref("dom.webnotifications.requireinteraction.enabled", false);
 //pref("dom.webnotifications.serviceworker.enabled", true);
 pref("dom.webnotifications.serviceworker.enabled", false);  //Conflict
-//pref("dom.workers.enabled", true);
-pref("dom.workers.enabled", false);  //Conflict
 
 pref("experiments.activeExperiment", false);
 pref("experiments.enabled",				false);
-pref("experiments.manifest.uri", "");
-pref("experiments.supported", false);
+//pref("experiments.manifest.uri", "https://telemetry-experiment.cdn.mozilla.net/manifest/v1/firefox/%VERSION%/%CHANNEL%");
+pref("experiments.manifest.uri", "");  //Conflict
+//pref("experiments.supported", true);
+pref("experiments.supported", false);  //Conflict
 
 //pref("extensions.autoDisableScopes", 0); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox
-pref("extensions.autoDisableScopes", 10); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox  //Conflict
+pref("extensions.autoDisableScopes", 15); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox  //Conflict
 pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/");
 pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%");
 pref("extensions.blocklist.url", "https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%APP_ID%/%APP_VERSION%/");
 //pref("extensions.bootstrappedAddons", "{}");
 //pref("extensions.checkCompatibility.4.*", false);
 //pref("extensions.databaseSchema", 3);
-//pref("extensions.enabledScopes", 1); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox
-pref("extensions.enabledScopes", 5); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox  //Conflict
+pref("extensions.enabledScopes", 1); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox
 pref("extensions.formautofill.addresses.enabled", false);
 pref("extensions.formautofill.available", "off");
 pref("extensions.formautofill.creditCards.enabled", false);
@@ -301,9 +315,7 @@ pref("extensions.hotfix.id", "");
 //pref("extensions.pocket.enabled",				true);
 pref("extensions.pocket.enabled",				false);  //Conflict
 pref("extensions.screenshots.disabled", true);
-pref("extensions.screenshots.upload-disabled", true);  //Added in Firefox 60
-pref("extensions.shield-recipe-client.api_url", "");
-pref("extensions.shield-recipe-client.enabled", false);
+pref("extensions.screenshots.upload-disabled", true);
 pref("extensions.systemAddon.update.url", "");
 pref("extensions.ui.lastCategory", "addons://list/extension");
 //pref("extensions.update.autoUpdateDefault", true);
@@ -316,6 +328,7 @@ pref("extensions.webcompat-reporter.enabled", false);
 pref("extensions.webcompat-reporter.newIssueEndpoint", "");
 pref("extensions.webextensions.keepStorageOnUninstall", false);
 pref("extensions.webextensions.keepUuidOnUninstall", false);
+pref("extensions.webextensions.restrictedDomains", "");
 pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
 
 pref("font.blacklist.underline_offset", "FangSong,Gulim,GulimChe,MingLiU,MingLiU-ExtB,MingLiU_HKSCS,MingLiU-HKSCS-ExtB,MS Gothic,MS Mincho,MS PGothic,MS PMincho,MS UI Gothic,PMingLiU,PMingLiU-ExtB,SimHei,SimSun,SimSun-ExtB,Hei,Kai,Apple LiGothic,Apple LiSung,Osaka");
@@ -330,7 +343,8 @@ pref("general.warnOnAboutConfig", false);  //Conflict
 pref("geo.enabled", false);
 pref("geo.wifi.logging.enabled", false);
 pref("geo.wifi.uri", "");
-pref("geo.wifi.xhr.timeout", 1);
+//pref("geo.wifi.xhr.timeout", 60000);
+pref("geo.wifi.xhr.timeout", 1);  //Conflict
 
 pref("gfx.direct2d.disabled",				true);
 pref("gfx.downloadable_fonts.enabled", true);
@@ -341,11 +355,14 @@ pref("gfx.font_rendering.opentype_svg.enabled",		false);
 pref("gfx.layerscope.enabled", false);
 pref("gfx.offscreencanvas.enabled", false);
 
-pref("identity.fxaccounts.enabled", false);  //Added in Firefox 60
+pref("identity.fxaccounts.enabled", false);
 pref("identity.fxaccounts.remote.email.uri",				"");
-pref("identity.fxaccounts.remote.force_auth.uri",				"");
-pref("identity.mobilepromo.android",				"https://www.mozilla.org/firefox/android/");
-pref("identity.mobilepromo.ios",				"");
+//pref("identity.fxaccounts.remote.force_auth.uri",				"https://accounts.firefox.com/force_auth?service=sync&context=fx_desktop_v3");
+pref("identity.fxaccounts.remote.force_auth.uri",				"");  //Conflict
+//pref("identity.mobilepromo.android",				"https://www.mozilla.org/firefox/android/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=");
+pref("identity.mobilepromo.android",				"https://www.mozilla.org/firefox/android/");  //Conflict
+//pref("identity.mobilepromo.ios",				"https://www.mozilla.org/firefox/ios/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=");
+pref("identity.mobilepromo.ios",				"");  //Conflict
 
 pref("intl.accept_languages",				"en-US, en");
 pref("intl.charset.default", "windows-1252");
@@ -367,7 +384,8 @@ pref("keyword.enabled",					false);  //Conflict
 pref("layers.acceleration.disabled",			true);
 
 pref("layout.css.font-loading-api.enabled", true);
-pref("layout.css.visited_links_enabled",			false);
+//pref("layout.css.visited_links_enabled",			true);
+pref("layout.css.visited_links_enabled",			false);  //Conflict
 
 //pref("lightweightThemes.recommendedThemes",	"[{"id":"recommended-1","homepageURL":"https://addons.mozilla.org/firefox/addon/a-web-browser-renaissance/","headerURL":"resource:///chrome/browser/content/browser/defaultthemes/1.header.jpg","footerURL":"resource:///chrome/browser/content/browser/defaultthemes/1.footer.jpg","textcolor":"#000000","accentcolor":"#f2d9b1","iconURL":"resource:///chrome/browser/content/browser/defaultthemes/1.icon.jpg","previewURL":"resource:///chrome/browser/content/browser/defaultthemes/1.preview.jpg","author":"Sean.Martell","version":"0"},{"id":"recommended-2","homepageURL":"https://addons.mozilla.org/firefox/addon/space-fantasy/","headerURL":"resource:///chrome/browser/content/browser/defaultthemes/2.header.jpg","footerURL":"resource:///chrome/browser/content/browser/defaultthemes/2.footer.jpg","textcolor":"#ffffff","accentcolor":"#d9d9d9","iconURL":"resource:///chrome/browser/content/browser/defaultthemes/2.icon.jpg","previewURL":"resource:///chrome/browser/content/browser/defaultthemes/2.preview.jpg","author":"fx5800p","version":"1.0"},{"id":"recommended-3","homepageURL":"https://addons.mozilla.org/firefox/addon/linen-light/","headerURL":"resource:///chrome/browser/content/browser/defaultthemes/3.header.png","footerURL":"resource:///chrome/browser/content/browser/defaultthemes/3.footer.png","accentcolor":"#ada8a8","iconURL":"resource:///chrome/browser/content/browser/defaultthemes/3.icon.png","previewURL":"resource:///chrome/browser/content/browser/defaultthemes/3.preview.png","author":"DVemer","version":"1.0"},{"id":"recommended-4","homepageURL":"https://addons.mozilla.org/firefox/addon/pastel-gradient/","headerURL":"resource:///chrome/browser/content/browser/defaultthemes/4.header.png","footerURL":"resource:///chrome/browser/content/browser/defaultthemes/4.footer.png","textcolor":"#000000","accentcolor":"#000000","iconURL":"resource:///chrome/browser/content/browser/defaultthemes/4.icon.png","previewURL":"resource:///chrome/browser/content/browser/defaultthemes/4.preview.png","author":"darrinhenein","version":"1.0"},{"id":"recommended-5","homepageURL":"https://addons.mozilla.org/firefox/addon/carbon-light/","headerURL":"resource:///chrome/browser/content/browser/defaultthemes/5.header.png","footerURL":"resource:///chrome/browser/content/browser/defaultthemes/5.footer.png","textcolor":"#3b3b3b","accentcolor":"#2e2e2e","iconURL":"resource:///chrome/browser/content/browser/defaultthemes/5.icon.jpg","previewURL":"resource:///chrome/browser/content/browser/defaultthemes/5.preview.jpg","author":"Jaxivo","version":"1.0"}]");
 pref("lightweightThemes.recommendedThemes",	"");  //Conflict
@@ -379,10 +397,11 @@ pref("mathml.disabled", true);
 pref("media.audio_data.enabled", false);
 //pref("media.autoplay.enabled", true);
 pref("media.autoplay.enabled", false);  //Conflict
-//pref("media.block-autoplay-until-in-foreground", false);
 pref("media.benchmark.vp9.threshold", 0);
+//pref("media.block-autoplay-until-in-foreground", false);
 pref("media.block-autoplay-until-in-foreground", true);  //Conflict
 //pref("media.cache_size", 0);
+pref("media.cache_size", 512000);  //Conflict
 pref("media.decoder-doctor.new-issue-endpoint", "");
 pref("media.eme.enabled",				false);
 pref("media.getusermedia.audiocapture.enabled",	false);
@@ -404,7 +423,6 @@ pref("media.gmp-widevinecdm.enabled",		false);
 pref("media.gmp-widevinecdm.visible",		false);
 pref("media.navigator.enabled",				false);
 pref("media.navigator.video.enabled",			false);
-pref("media.ondevicechange.fakeDeviceChangeEvent.enabled", false);
 pref("media.peerconnection.enabled",			false);
 pref("media.peerconnection.ice.no_host",			true);
 pref("media.peerconnection.ice.tcp", false);
@@ -421,18 +439,25 @@ pref("middlemouse.contentLoadURL", false);  //Conflict
 pref("network.allow-experiments",			false);  //Conflict
 pref("network.auth.subresource-img-cross-origin-http-auth-allow", false);
 pref("network.captive-portal-service.enabled", false);
-pref("network.cookie.cookieBehavior",			2);
+//pref("network.cookie.cookieBehavior",			1);
+pref("network.cookie.cookieBehavior",			2);  //Conflict
 pref("network.cookie.leave-secure-alone", true);
 //pref("network.cookie.lifetimePolicy",			2);
 pref("network.cookie.lifetimePolicy",			0);  //Conflict //required by ublock origin
+pref("network.cookie.same-site.enabled",		true);
 pref("network.cookie.thirdparty.nonsecureSessionOnly",		true);
-pref("network.cookie.thirdparty.sessionOnly",		true);
-pref("network.dnsCacheEntries",			0);
-pref("network.dnsCacheExpiration",			0);
-pref("network.dnsCacheExpirationGracePeriod",			0);
+//pref("network.cookie.thirdparty.sessionOnly",		false);
+pref("network.cookie.thirdparty.sessionOnly",		true);  //Conflict
+//pref("network.dnsCacheEntries",			400);
+pref("network.dnsCacheEntries",			0);  //Conflict
+//pref("network.dnsCacheExpiration",			60);
+pref("network.dnsCacheExpiration",			0);  //Conflict
+//pref("network.dnsCacheExpirationGracePeriod",			60);
+pref("network.dnsCacheExpirationGracePeriod",			0);  //Conflict
 pref("network.dns.blockDotOnion",				true);
 pref("network.dns.disablePrefetch",			true);
 pref("network.dns.disablePrefetchFromHTTPS",		true);  //Hidden
+pref("network.ftp.enabled",		false);
 pref("network.gio.supported-protocols", "");
 pref("network.http.altsvc.enabled", false);
 pref("network.http.altsvc.oe", false);
@@ -450,12 +475,12 @@ pref("network.http.referer.defaultPolicy.pbmode", 1);    //A better default
 //pref("network.http.referer.XOriginPolicy", 2);        //Breaks many sites
 //pref("network.http.referer.XOriginTrimmingPolicy", 0);  //Breaks many sites
 pref("network.http.spdy.enabled", false);
-pref("network.http.spdy.enabled.deps", false);
+//pref("network.http.spdy.enabled.deps", true);
+pref("network.http.spdy.enabled.deps", false);  //Conflict
 pref("network.http.spdy.enabled.http2", false);
 pref("network.http.spdy.enabled.http2draft", false);
 //pref("network.http.speculative-parallel-limit",		6);
 pref("network.http.speculative-parallel-limit",		0);  //Conflict
-pref("network.http.tailing.enabled",				false);
 //pref("network.IDN_show_punycode",				false);
 pref("network.IDN_show_punycode",				true);   //Conflict
 pref("network.jar.block-remote-files", true);
@@ -475,6 +500,7 @@ pref("network.proxy.socks_remote_dns",			true);
 pref("network.proxy.type", 0);  //Conflict
 pref("network.security.ports.banned", "9050,9051,9150,9151");
 pref("network.stricttransportsecurity.preloadlist", true);
+pref("network.trr.bootstrapAddress", "");
 pref("network.trr.mode", 0);
 pref("network.trr.uri", "");
 
@@ -503,7 +529,8 @@ pref("permissions.manager.defaultsUrl", "");  //Conflict
 //pref("permissions.memory_only", true);
 pref("permissions.memory_only", false);  //Conflict
 
-pref("places.history.enabled", false);
+//pref("places.history.enabled", true);
+pref("places.history.enabled", false);  //Conflict
 
 //pref("plugin.default.state", 1);
 pref("plugin.default.state", 0);  //Conflict
@@ -581,7 +608,8 @@ pref("security.block_script_with_wrong_mime", true);
 pref("security.cert_pinning.enforcement_level",	2);
 pref("security.csp.enable", true);
 pref("security.csp.enable_violation_events", false);
-pref("security.csp.experimentalEnabled", true);
+//pref("security.csp.experimentalEnabled", false);
+pref("security.csp.experimentalEnabled", true); //Conflict
 pref("security.data_uri.block_toplevel_data_uri_navigations", true);
 pref("security.dialog_enable_delay",			1000);
 pref("security.enable_tls_session_tickets", false);
@@ -589,7 +617,7 @@ pref("security.enterprise_roots.enabled", false);
 pref("security.family_safety.mode", 0);
 pref("security.fileuri.strict_origin_policy",		true);
 pref("security.insecure_connection_icon.enabled",		true);
-pref("security.insecure_connection_text.enabled",		true);  //Added in Firefox 60
+pref("security.insecure_connection_text.enabled",		true);
 pref("security.insecure_field_warning.contextual.enabled", true);
 pref("security.insecure_password.ui.enabled",		true);
 pref("security.mixed_content.block_active_content",	true);
@@ -632,8 +660,8 @@ pref("security.tls.version.max",				4);  //Conflict
 
 pref("services.blocklist.signing.enforced", true);
 pref("services.blocklist.update_enabled", false);
-pref("services.sync.engine.prefs", false);
 pref("services.sync.engine.addons", false);
+pref("services.sync.engine.prefs", false);
 pref("services.sync.engine.tabs", false);
 pref("services.sync.ui.hidden", true);
 
@@ -644,44 +672,43 @@ pref("signon.formlessCapture.enabled",			false);  //Conflict
 pref("signon.rememberSignons",				false);
 pref("signon.storeWhenAutocompleteOff",			true);
 
-pref("startup.homepage_override_url", "");
+//pref("startup.homepage_override_url", "https://blog.torproject.org/category/tags/tor-browser");
+pref("startup.homepage_override_url", "");  //Conflict
 pref("startup.homepage_welcome_url", "");
 pref("startup.homepage_welcome_url.additional", "");
 
 pref("svg.disabled", true);
 pref("svg.in-content.enabled", false);
 
-pref("toolkit.telemetry.archive.enabled", false);
+//pref("toolkit.telemetry.archive.enabled", true);
+pref("toolkit.telemetry.archive.enabled", false);  //Conflict
 pref("toolkit.telemetry.bhrPing.enabled",				false);
 pref("toolkit.telemetry.cachedClientID", "");
 pref("toolkit.telemetry.enabled",				false);
 pref("toolkit.telemetry.firstShutdownPing.enabled",				false);
 pref("toolkit.telemetry.hybridContent.enabled",				false);
 pref("toolkit.telemetry.newProfilePing.enabled", false);
-pref("toolkit.telemetry.server", "data:,");
+//pref("toolkit.telemetry.server", "https://incoming.telemetry.mozilla.org");
+pref("toolkit.telemetry.server", "data:,");  //Conflict
 pref("toolkit.telemetry.shutdownPingSender.enabled", false);
 pref("toolkit.telemetry.updatePing.enabled", false);
 pref("toolkit.telemetry.unified",				false);
 
 pref("ui.use_standins_for_native_colors", true);
 
-//pref("view_source.tab", true);
-pref("view_source.tab", false);  //Conflict
-
 //pref("webchannel.allowObject.urlWhitelist", "https://accounts.firefox.com https://content.cdn.mozilla.net https://input.mozilla.org https://support.mozilla.org https://install.mozilla.org");
 pref("webchannel.allowObject.urlWhitelist", "");  //Conflict
 
 //pref("webextensions.storage.sync.enabled", false);
-pref("webextensions.storage.sync.enabled", true);  //required by noscript
-pref("webextensions.storage.sync.serverURL", "");
-
+pref("webextensions.storage.sync.enabled", true);  //Conflict //required by noscript
+//pref("webextensions.storage.sync.serverURL", "https://webextensions.settings.services.mozilla.com/v1");
+pref("webextensions.storage.sync.serverURL", "");  //Conflict
 
 //pref("webgl.disabled",					false);
 pref("webgl.disabled",					true);  //Conflict
 pref("webgl.disable-extensions",				true);
 pref("webgl.disable-fail-if-major-performance-caveat",	true);
 pref("webgl.dxgl.enabled", false);
-pref("webgl.enable-debug-renderer-info",			false);
 pref("webgl.enable-webgl2",					false);
 pref("webgl.min_capability_mode",				true);
 
@@ -690,6 +717,7 @@ pref("webgl.min_capability_mode",				true);
 pref("xpinstall.signatures.required",		false);  //Conflict
 //pref("xpinstall.whitelist.add", "");
 //pref("xpinstall.whitelist.add.36", "");
+pref("xpinstall.whitelist.required",		true);
 
 //
 // Tor Related