Updated to 62.0

2 files changed, 63 insertions, 44 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e18acd6..4178606 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id$
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox
-majver=61
+majver=62
 minver=0
-revver=2
-bz2ver=${majver}_${minver}_${revver}
-pkgver=$majver.$minver.$revver
+#revver=0
+#bz2ver=${majver}_${minver}_${revver}
+bz2ver=${majver}_${minver}
+#pkgver=$majver.$minver.$revver
+pkgver=$majver.$minver
 pkgrel=1
 #pkgname=firefox
 #pkgver=61.0.1
@@ -31,10 +32,10 @@ source=(firefox-$pkgver.tar.bz2::https://hg.mozilla.org/releases/mozilla-release
         $pkgname.desktop firefox-symbolic.svg
         vendor.js
         package-manifest.diff)
-sha256sums=('ab0e92290ea2c83fb48a82a6341d5186a90d899ec199605950bade07f23fcb1c'
+sha256sums=('81fc299be89e6f34c09209e89cebacf47c5c86395f24026ee17ad3d53d9c626c'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
-            'b62568ba5177eb74d62b8e979e55450fdc862f794d8e01157edf1d0b5e8bf527'
+            '6ee76f17d65bb03ca7555a5ffc6fc37114beba5fac4e2d76e70e8896df9d06c0'
             '28e5db73f04ce8794f68822deda5512c64f832e542ad58fb7e40cad9e4785664')
 
 prepare() {
diff --git a/vendor.js b/vendor.js
index cc4a5f1..bcfc74a 100644
--- a/vendor.js
+++ b/vendor.js
@@ -1,14 +1,17 @@
 //pref("accessibility.blockautorefresh", 			false);
 pref("accessibility.blockautorefresh", 			true);  //Conflict
-pref("accessibility.force_disabled", 1);
+//pref("accessibility.force_disabled", 0);
+pref("accessibility.force_disabled", 1);  //Conflict
 
 
 pref("alerts.showFavicons", false); //Breaks favicons
 
 //pref("app.feedback.baseURL",		"https://input.mozilla.org/%LOCALE%/feedback/%APP%/%VERSION%/");
 pref("app.feedback.baseURL",		"");  //Conflict
-pref("app.normandy.api_url",		"");
-pref("app.normandy.enabled", false);
+//pref("app.normandy.api_url",		"https://normandy.cdn.mozilla.net/api/v1");
+pref("app.normandy.api_url",		"");  //Conflict
+//pref("app.normandy.enabled", true);
+pref("app.normandy.enabled", false);  //Conflict
 pref("app.releaseNotesURL",				"https://www.mozilla.org/en-US/firefox/notes/");
 pref("app.shield.optoutstudies.enabled", false);
 //pref("app.update.auto", 						true);
@@ -19,8 +22,7 @@ pref("app.update.checkInstallTime", 			false);  //Conflict
 pref("app.update.enabled",					false);  //Conflict
 pref("app.update.service.enabled", false);
 pref("app.update.silent", false);
-//pref("app.update.staging.enabled",				true);
-pref("app.update.staging.enabled",				false);  //Conflict
+pref("app.update.staging.enabled",				false);
 //pref("app.update.url",				"https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/%LOCALE%");
 pref("app.update.url",				"");  //Conflict
 
@@ -43,12 +45,13 @@ pref("browser.cache.disk.smart_size.enabled", false);  //Conflict
 pref("browser.cache.disk.smart_size.first_run", false);
 //pref("browser.cache.disk_cache_ssl",			true);
 pref("browser.cache.disk_cache_ssl",			false);  //Conflict
-pref("browser.cache.frecency_experiment", -1);
-pref("browser.cache.memory.capacity", 1048576);  //Hidden
+pref("browser.cache.memory.capacity", 1048576);
 pref("browser.cache.offline.enable",			false);
-pref("browser.cache.offline.insecure.enable",			false);
+//pref("browser.cache.offline.insecure.enable",			true);
+pref("browser.cache.offline.insecure.enable",			false);  //Conflict
 pref("browser.chrome.errorReporter.enabled", 		false);
-pref("browser.chrome.errorReporter.submitUrl",				"");
+//pref("browser.chrome.errorReporter.submitUrl",				"https://sentry.prod.mozaws.net/api/339/store/");
+pref("browser.chrome.errorReporter.submitUrl",				"");  //Conflict
 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,7 +74,8 @@ pref("browser.fixup.hide_user_pass", true);
 pref("browser.formfill.enable",				false);
 pref("browser.helperApps.deleteTempFileOnExit",		true);
 pref("browser.laterrun.enabled", false);
-pref("browser.library.activity-stream.enabled",				false);
+//pref("browser.library.activity-stream.enabled",				true);
+pref("browser.library.activity-stream.enabled",				false);  //Conflict
 pref("browser.link.open_newwindow",	3);
 pref("browser.link.open_newwindow.restriction",	0);
 pref("browser.migrate.automigrate.enabled", false);
@@ -80,14 +84,19 @@ pref("browser.newtab.preload",				false);  //Conflict
 pref("browser.newtab.url", "about:blank"); //FIXME  //TabMix can unset this at times
 pref("browser.newtabpage.activity-stream.aboutHome.enabled",				false);
 pref("browser.newtabpage.activity-stream.feeds.section.topstories",				false);
-pref("browser.newtabpage.enabled", false);
+//pref("browser.newtabpage.enabled", true);
+pref("browser.newtabpage.enabled", false);  //Conflict
 pref("browser.newtabpage.preload", false);
 pref("browser.newtabpage.remote",				false);
 pref("browser.offline-apps.notify", true);
-pref("browser.onboarding.enabled", false);
+//pref("browser.onboarding.enabled", true);
+pref("browser.onboarding.enabled", false);  //Conflict
 pref("browser.pagethumbnails.capturing_disabled",		true); //Breaks page thumbnails
-pref("browser.ping-centre.telemetry",		false);
+//pref("browser.ping-centre.telemetry",		true);
+pref("browser.ping-centre.telemetry",		false);  //Conflict
+//pref("browser.ping-centre.production.endpoint",		"https://tiles.services.mozilla.com/v3/links/ping-centre");
 pref("browser.ping-centre.production.endpoint",		"https://127.0.0.1");  //Conflict
+//pref("browser.ping-centre.staging.endpoint",		"https://onyx_tiles.stage.mozaws.net/v3/links/ping-centre");
 pref("browser.ping-centre.staging.endpoint",		"https://127.0.0.1");  //Conflict
 //pref("browser.privatebrowsing.autostart",			true);
 pref("browser.privatebrowsing.autostart",			false);  //Conflict
@@ -112,18 +121,23 @@ 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",			"https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
 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.google.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url=");
+pref("browser.safebrowsing.provider.google.reportMalwareMistakeURL", "");  //Conflict
+//pref("browser.safebrowsing.provider.google.reportPhishMistakeURL", "https://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%&url=");
+pref("browser.safebrowsing.provider.google.reportPhishMistakeURL", "");  //Conflict
 pref("browser.safebrowsing.provider.google4.dataSharing.enabled", false);
-pref("browser.safebrowsing.provider.google4.dataSharingURL", "");
+//pref("browser.safebrowsing.provider.google4.dataSharingURL", "https://safebrowsing.googleapis.com/v4/threatHits?$ct=application/x-protobuf&key=%GOOGLE_API_KEY%&$httpMethod=POST");
+pref("browser.safebrowsing.provider.google4.dataSharingURL", "");  //Conflict
 pref("browser.safebrowsing.provider.google4.gethashURL", "");
 //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.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url=");
+pref("browser.safebrowsing.provider.google4.reportMalwareMistakeURL", "");  //Conflict
+//pref("browser.safebrowsing.provider.google4.reportPhishMistakeURL", "https://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%&url=");
+pref("browser.safebrowsing.provider.google4.reportPhishMistakeURL", "");  //Conflict
 pref("browser.safebrowsing.provider.google4.updateURL", "");
 //pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%&url=");
 pref("browser.safebrowsing.reportPhishURL", "");  //Conflict
@@ -151,49 +165,53 @@ 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",		"about:blank");
+//pref("browser.startup.homepage",		"about:tor");
+pref("browser.startup.homepage",		"about:blank");  //Conflict
 pref("browser.startup.homepage_override.buildID", "20100101");
 //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.storageManager.enabled", 				true);
 pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}");
 //pref("browser.tabs.crashReporting.sendReport", 				true);
 pref("browser.tabs.crashReporting.sendReport", 				false);  //Conflict
 pref("browser.tabs.insertRelatedAfterCurrent", 				true);
-pref("browser.tabs.remote.allowLinkedWebInFileUriProcess", false);
+//pref("browser.tabs.remote.allowLinkedWebInFileUriProcess", true);
+pref("browser.tabs.remote.allowLinkedWebInFileUriProcess", false);  //Conflict
 pref("browser.tabs.selectOwnerOnClose", 				true);
 pref("browser.taskbar.lists.enabled", false);
 pref("browser.taskbar.lists.frequent.enabled", false);
 pref("browser.taskbar.lists.recent.enabled", false);
 pref("browser.taskbar.lists.tasks.enabled", false);
 pref("browser.taskbar.previews.enable", false);
-pref("browser.uitour.enabled",				false);
+//pref("browser.uitour.enabled",				true);
+pref("browser.uitour.enabled",				false);  //Conflict
 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);  //Removed in Firefox 62
-pref("browser.urlbar.autoFill.typed", false);  //Conflict  //Removed in Firefox 62
 //pref("browser.urlbar.autocomplete.enabled", true);
 pref("browser.urlbar.autocomplete.enabled", false);  //Conflict
-pref("browser.urlbar.decodeURLsOnCopy", true);
+//pref("browser.urlbar.decodeURLsOnCopy", false);
+pref("browser.urlbar.decodeURLsOnCopy", true);  //Conflict
 pref("browser.urlbar.filter.javascript",			true);
 pref("browser.urlbar.maxHistoricalSearchSuggestions", 0);
-pref("browser.urlbar.oneOffSearches", false);
+//pref("browser.urlbar.oneOffSearches", true);
+pref("browser.urlbar.oneOffSearches", false);  //Conflict
 pref("browser.urlbar.searchSuggestionsChoice", false);
-pref("browser.urlbar.speculativeConnect.enabled", false);
+//pref("browser.urlbar.speculativeConnect.enabled", true);
+pref("browser.urlbar.speculativeConnect.enabled", false);  //Conflict
 //pref("browser.urlbar.suggest.bookmark", true);
 pref("browser.urlbar.suggest.bookmark", false);  //Conflict
 //pref("browser.urlbar.suggest.history", true);
 pref("browser.urlbar.suggest.history", false);  //Conflict
-//pref("browser.urlbar.suggest.openpage", false);
+//pref("browser.urlbar.suggest.openpage", true);
 pref("browser.urlbar.suggest.openpage", false);  //Conflict
-pref("browser.urlbar.suggest.searches", false);
+//pref("browser.urlbar.suggest.searches", true);
+pref("browser.urlbar.suggest.searches", false);  //Conflict
 //pref("browser.urlbar.trimURLs",				true);
 pref("browser.urlbar.trimURLs",				false);  //Conflict
 //pref("browser.urlbar.userMadeSearchSuggestionsChoice", false);
 pref("browser.urlbar.userMadeSearchSuggestionsChoice", true);  //Conflict
 pref("browser.urlbar.usepreloadedtopurls.enabled",				false);
-pref("browser.usedOnWindows10", true);
 //pref("browser.xul.error_pages.expert_bad_cert", false);
 pref("browser.xul.error_pages.expert_bad_cert", true);  //Conflict
 pref("browser.zoom.siteSpecific", false);
@@ -209,17 +227,20 @@ pref("clipboard.autocopy", false);  //Conflict
 
 pref("datareporting.healthreport.uploadEnabled",		false);
 pref("datareporting.policy.dataSubmissionEnabled",		false);
-pref("datareporting.policy.firstRunURL", "");
+//pref("datareporting.policy.firstRunURL", https://www.mozilla.org/privacy/firefox/"");
+pref("datareporting.policy.firstRunURL", "");  //Conflict
 
 pref("device.sensors.enabled", false);
 pref("device.storage.enabled", false);
 
 pref("devtools.appmanager.enabled", false);
-pref("devtools.chrome.enabled",				false);
+//pref("devtools.chrome.enabled",				true);
+pref("devtools.chrome.enabled",				false);  //Conflict
 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.debugger.remote-enabled",			true);
+pref("devtools.debugger.remote-enabled",			false);  //Conflict
 //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);
@@ -572,8 +593,6 @@ pref("plugin.scan.plid.all", false);
 pref("plugin.sessionPermissionNow.intervalInMinutes", 0);  //Conflict
 //pref("plugin.state.flash",					1);
 pref("plugin.state.flash",					0);  //Conflict
-//pref("plugin.state.java",					1);
-pref("plugin.state.java",					0);  //Conflict
 pref("plugin.state.libgnome-shell-browser-plugin",		0);
 
 pref("plugins.click_to_play",				true);
@@ -686,7 +705,6 @@ pref("security.ssl3.rsa_aes_128_sha",			true);
 pref("security.ssl3.rsa_aes_256_sha",			true);
 pref("security.tls.enable_0rtt_data", false);
 pref("security.tls.unrestricted_rc4_fallback", false);
-pref("security.tls.version.fallback-limit",		3);
 //pref("security.tls.version.min",				1);
 pref("security.tls.version.min",				3);  //Conflict
 //pref("security.tls.version.max",				3);