Sync with upstream

2 files changed, 32 insertions, 33 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 35a5360..7009cb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 
 _pkgname=firefox
 pkgname=${_pkgname}-preferences-basic
-pkgver=20191022
-pkgrel=2
+pkgver=20100112
+pkgrel=1
 pkgdesc="Vendor.js for Firefox (Basic)"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -17,7 +17,7 @@ makedepends=()
 conflicts=(firefox-preferences)
 provides=(firefox-preferences)
 source=(vendor.js)
-sha512sums=('78348e7d47757077460154444e1293d3b87d104400660f87d47aff62d640f289598603aff3f73522edf6def29dea6f91d50ed4b752c4a7d95ddd1209104fb26f')
+b2sums=('e9f255ec37bf640b364dfc5d25d66c59a325df7207b7183605229d02f4a88a6b780434ad58f40ea1e2e580e946f977d0564c2afae303ed98f83a3e4c26f25c36')
 
 package() {
   install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
diff --git a/vendor.js b/vendor.js
index e8338b8..20070ee 100644
--- a/vendor.js
+++ b/vendor.js
@@ -3,8 +3,6 @@ pref("accessibility.blockautorefresh", true);  //Conflict
 //pref("accessibility.force_disabled", 0);
 pref("accessibility.force_disabled", 1);  //Conflict
 
-pref("alerts.showFavicons", false);
-
 //pref("app.normandy.api_url", "https://normandy.cdn.mozilla.net/api/v1");
 pref("app.normandy.api_url", "");  //Conflict
 //pref("app.normandy.enabled", true);
@@ -31,15 +29,18 @@ pref("beacon.enabled", false);  //Conflict
 //pref("breakpad.reportURL", "https://crash-stats.mozilla.com/report/index/");
 pref("breakpad.reportURL", "");  //Conflict
 
+pref("browser.aboutConfig.showWarning", false);
 pref("browser.backspace_action", 2);
 //pref("browser.cache.disk.enable", false);
 //pref("browser.cache.disk.smart_size.enabled", true);
 //pref("browser.cache.disk.smart_size.enabled", false);  //Conflict
-//pref("browser.cache.memory.capacity", 1048576);
+//pref("browser.cache.memory.capacity", 1048576);  //Hidden
 pref("browser.cache.offline.enable", false);
 //pref("browser.cache.offline.insecure.enable", true);
 pref("browser.cache.offline.insecure.enable", false);  //Conflict
+pref("chrome.errorReporter.submitUrl", "");  //ESR68
 //pref("browser.chrome.site_icons", false);  //Breaks favicons
+//pref("browser.contentblocking.category", "custom");
 //pref("browser.contentblocking.category", "custom");  //Setting this will set the value to default for some reason
 pref("browser.contentblocking.introCount", 20);
 pref("browser.crashReports.unsubmittedCheck.autoSubmit2", false);
@@ -65,6 +66,7 @@ pref("browser.helperApps.deleteTempFileOnExit", true);
 pref("browser.library.activity-stream.enabled", false);  //Conflict
 pref("browser.link.open_newwindow", 3);
 pref("browser.link.open_newwindow.restriction", 0);
+pref("browser.messaging-system.whatsNewPanel.enabled", false);
 pref("browser.migrate.automigrate.enabled", false);
 //pref("browser.newtab.preload", true);
 pref("browser.newtab.preload", false);  //Conflict
@@ -103,7 +105,7 @@ pref("browser.newtabpage.activity-stream.section.highlights.includeVisited", fal
 pref("browser.newtabpage.activity-stream.showSearch", false);
 pref("browser.newtabpage.activity-stream.showSponsored", false);
 pref("browser.newtabpage.activity-stream.telemetry", false);
-pref("browser.newtabpage.activity-stream.telemetry.ping.endpoint", "");
+pref("browser.newtabpage.activity-stream.telemetry.ping.endpoint", "");  //ESR68
 //pref("browser.newtabpage.enabled", true);
 pref("browser.newtabpage.enabled", false);  //Conflict
 pref("browser.newtabpage.preload", false);
@@ -200,7 +202,7 @@ pref("browser.urlbar.userMadeSearchSuggestionsChoice", true);  //Conflict
 pref("browser.urlbar.usepreloadedtopurls.enabled", false);
 //pref("browser.xul.error_pages.expert_bad_cert", false);
 pref("browser.xul.error_pages.expert_bad_cert", true);  //Conflict
-pref("browser.zoom.siteSpecific", false);
+pref("browser.zoom.siteSpecific", false);  //Non-RFP
 
 //pref("captivedetect.canonicalURL", "http://detectportal.firefox.com/success.txt");
 pref("captivedetect.canonicalURL", "");  //Conflict
@@ -213,7 +215,7 @@ pref("datareporting.policy.dataSubmissionEnabled", false);
 //pref("datareporting.policy.firstRunURL", https://www.mozilla.org/privacy/firefox/"");
 pref("datareporting.policy.firstRunURL", "");  //Conflict
 
-pref("device.sensors.enabled", false);
+pref("device.sensors.enabled", false);  //Non-RFP
 
 pref("devtools.aboutdebugging.showSystemAddons", true);
 pref("devtools.appmanager.enabled", false);
@@ -227,21 +229,21 @@ 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.remote.adb.extensionURL", "");
-pref("devtools.webide.autoinstallADBExtension", false);
-pref("devtools.webide.enabled", false);
+pref("devtools.webide.autoinstallADBExtension", false);  //ESR68
+pref("devtools.webide.enabled", false);  //ESR68
 
 pref("dom.allow_cut_copy", false);
 //pref("dom.caches.enabled", true);
 //pref("dom.caches.enabled", false);  //Conflict
 pref("dom.disable_window_showModalDialog", true);
-pref("dom.enable_performance", false);
-pref("dom.enable_resource_timing", false);
+pref("dom.enable_performance", false);  //Non-RFP
+pref("dom.enable_resource_timing", false);  //Non-RFP
 //pref("dom.event.clipboardevents.enabled", true);
 pref("dom.event.clipboardevents.enabled", false);  //Conflict
 pref("dom.forms.autocomplete.experimental", false);
-pref("dom.gamepad.enabled", false);
+pref("dom.gamepad.enabled", false);  //Non-RFP
 pref("dom.keyboardevent.dispatch_during_composition", false);
-pref("dom.indexedDB.enabled", true);
+pref("dom.indexedDB.enabled", true);  //ESR68
 pref("dom.input.dirpicker", false);
 //pref("dom.IntersectionObserver.enabled", true);
 //pref("dom.IntersectionObserver.enabled", false);  //Conflict
@@ -250,7 +252,7 @@ pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false);  //Confli
 //pref("dom.ipc.plugins.reportCrashURL", true);
 pref("dom.ipc.plugins.reportCrashURL", false);  //Conflict
 pref("dom.mozTCPSocket.enabled", false);
-pref("dom.netinfo.enabled", false);
+pref("dom.netinfo.enabled", false);  //Non-RFP
 pref("dom.performance.enable_timing_logging", false);
 //pref("dom.popup_allowed_events", "change click dblclick auxclick mouseup pointerup notificationclick reset submit touchend contextmenu");
 //pref("dom.popup_allowed_events", "click dblclick");  //Conflict
@@ -260,8 +262,8 @@ pref("dom.securecontext.whitelist_onions", true);
 //pref("dom.serviceWorkers.enabled", false);
 pref("dom.targetBlankNoOpener.enabled", true);
 pref("dom.vr.enabled", false);
-pref("dom.w3c_pointer_events.enabled", 0);
-pref("dom.w3c_touch_events.enabled", 0);
+pref("dom.w3c_pointer_events.enabled", 0);  //Non-RFP
+pref("dom.w3c_touch_events.enabled", 0);  //Non-RFP
 pref("dom.webaudio.enabled", false);
 pref("dom.webnotifications.requireinteraction.enabled", false);
 
@@ -376,10 +378,8 @@ pref("media.audio_data.enabled", false);
 pref("media.autoplay.allow-muted", false);  //Removed in 69
 //pref("media.autoplay.default", 0);
 pref("media.autoplay.default", 5);  //Conflict
-pref("media.autoplay.enabled", false);
 pref("media.autoplay.enabled.user-gestures-needed", false);
 pref("media.benchmark.vp9.threshold", 0);
-pref("media.block-autoplay-until-in-foreground", true);
 //pref("media.cache_size", 0);
 pref("media.eme.enabled", false);
 pref("media.getusermedia.audiocapture.enabled", false);
@@ -400,12 +400,13 @@ pref("media.gmp-widevinecdm.visible", false);
 pref("media.media-capabilities.enabled", false);
 pref("media.memory_cache_max_size", 16384);
 pref("media.navigator.enabled", false);
-pref("media.ondevicechange.enabled", false);
+pref("media.ondevicechange.enabled", false);  //Non-RFP
 pref("media.peerconnection.enabled", false);
 pref("media.peerconnection.ice.default_address_only", true);
 pref("media.peerconnection.ice.no_host", true);
+pref("media.peerconnection.ice.proxy_only_if_behind_proxy", true);
 pref("media.video_stats.enabled", false);
-pref("media.webspeech.synth.enabled", false);
+pref("media.webspeech.synth.enabled", false);  //Non-RFP
 
 pref("middlemouse.contentLoadURL", false);
 pref("middlemouse.paste", false);
@@ -489,7 +490,7 @@ pref("nsITelemetry.canRecordBase", false);
 pref("nsITelemetry.canRecordExtended", false);
 
 //pref("offline-apps.allow_by_default", true);
-pref("offline-apps.allow_by_default", false);  //Conflict
+pref("offline-apps.allow_by_default", false);  //ESR68  //Conflict
 
 //pref("pdfjs.disabled", false);
 //pref("pdfjs.disabled", true);  //Conflict
@@ -548,7 +549,7 @@ pref("plugins.click_to_play", true);  //Removed in 69
 //pref("privacy.donottrackheader.enabled", false);
 pref("privacy.donottrackheader.enabled", true);  //Conflict
 pref("privacy.firstparty.isolate", true);
-pref("privacy.firstparty.isolate.block_post_message", true);
+pref("privacy.firstparty.isolate.block_post_message", true);  //Hidden
 pref("privacy.firstparty.isolate.restrict_opener_access", true);
 //pref("privacy.resistFingerprinting", true);
 //pref("privacy.resistFingerprinting.block_mozAddonManager", true);  //Hidden
@@ -562,8 +563,6 @@ pref("privacy.trackingprotection.enabled", false);
 pref("privacy.trackingprotection.cryptomining.enabled", false);
 pref("privacy.trackingprotection.lower_network_priority", false);
 pref("privacy.trackingprotection.pbmode.enabled", false);
-//pref("privacy.usercontext.about_newtab_segregation.enabled", false);
-pref("privacy.usercontext.about_newtab_segregation.enabled", true);  //Conflict
 //pref("privacy.userContext.enabled", false);
 pref("privacy.userContext.enabled", true);  //Conflict
 //pref("privacy.userContext.ui.enabled", false);
@@ -583,8 +582,8 @@ pref("security.csp.enable", true);
 pref("security.dialog_enable_delay", 1000);
 pref("security.enterprise_roots.enabled", false);
 pref("security.family_safety.mode", 0);
-//pref("security.insecure_connection_icon.enabled", false);
-pref("security.insecure_connection_icon.enabled", true);  //Conflict
+//pref("security.insecure_connection_icon.enabled", false);  //Hidden
+pref("security.insecure_connection_icon.enabled", true);  //Hidden  //Conflict
 //pref("security.insecure_connection_text.enabled", false);
 pref("security.insecure_connection_text.enabled", true);  //Conflict
 pref("security.mixed_content.block_active_content", true);
@@ -632,8 +631,7 @@ pref("startup.homepage_override_url", "");  //Conflict
 pref("startup.homepage_welcome_url", "");
 pref("startup.homepage_welcome_url.additional", "");
 
-//pref("svg.disabled", true);
-pref("svg.disabled", false);  //Conflict //Multiple critical addons now depend on svg support.
+//pref("svg.disabled", true);  //No longer breaks addons as of 71/68.1.0
 
 pref("toolkit.coverage.endpoint.base", "");
 pref("toolkit.coverage.opt-out", true);
@@ -647,8 +645,8 @@ pref("toolkit.telemetry.coverage.opt-out", true);
 pref("toolkit.telemetry.enabled", false);
 //pref("toolkit.telemetry.firstShutdownPing.enabled", true);
 pref("toolkit.telemetry.firstShutdownPing.enabled", false);  //Conflict
-//pref("toolkit.telemetry.hybridContent.enabled", true);
-pref("toolkit.telemetry.hybridContent.enabled", false);  //Conflict
+//pref("toolkit.telemetry.hybridContent.enabled", true);  //ESR68
+pref("toolkit.telemetry.hybridContent.enabled", false);  //ESR68  //Conflict
 //pref("toolkit.telemetry.newProfilePing.enabled", true);
 pref("toolkit.telemetry.newProfilePing.enabled", false);  //Conflict
 //pref("toolkit.telemetry.server", "https://incoming.telemetry.mozilla.org");
@@ -659,7 +657,8 @@ pref("toolkit.telemetry.shutdownPingSender.enabled", false);  //Conflict
 pref("toolkit.telemetry.updatePing.enabled", false);  //Conflict
 pref("toolkit.telemetry.unified", false);
 
-pref("ui.use_standins_for_native_colors", true);
+//pref("ui.systemUsesDarkTheme", 0);  //Hidden
+pref("ui.use_standins_for_native_colors", true);  //Non-RFP
 
 pref("view_source.tab", true);  //Added in Firefox 68