Sync with upstream

2 files changed, 26 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5a4cc5a..8a51656 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 _pkgname=firefox
 pkgname=${_pkgname}-preferences-basic
 pkgver=20190506
-pkgrel=1
+pkgrel=2
 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=('71c4383fcb36b25d8888cc1c0bf62f37eb6c3bd0e6ae020db3974be7fb4c2fa0a0938f8f0a5dd1eae7de9c100879fe0fd50dd19afb78a02766e2555535b07d96')
+sha512sums=('90645ac78982ea47f980211ff167f27bb2ad2abf565853e3445162e2593b7a79268b5ebeecb001a8702e2262b89b0252890f80615dfb370a5b61e66adbcea12b')
 
 package() {
   install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
diff --git a/vendor.js b/vendor.js
index ca609d6..10ae1e6 100644
--- a/vendor.js
+++ b/vendor.js
@@ -38,6 +38,8 @@ pref("browser.backspace_action", 2);
 //pref("browser.cache.disk.enable", false);
 //pref("browser.cache.disk_cache_ssl", true);
 //pref("browser.cache.disk_cache_ssl", false);  //Conflict
+//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.offline.enable", false);
 //pref("browser.cache.offline.insecure.enable", true);
@@ -81,6 +83,7 @@ pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false);
 pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false);
 pref("browser.newtabpage.activity-stream.default.sites", "");
 pref("browser.newtabpage.activity-stream.disableSnippets", true);
+pref("browser.newtabpage.activity-stream.discoverystream.config", "");  //Conflict
 pref("browser.newtabpage.activity-stream.feeds.aboutpreferences", false);
 pref("browser.newtabpage.activity-stream.feeds.asrouterfeed", false);
 pref("browser.newtabpage.activity-stream.feeds.discoverystreamfeed", false);
@@ -112,6 +115,8 @@ pref("browser.newtabpage.enabled", false);  //Conflict
 pref("browser.newtabpage.preload", false);
 pref("browser.newtabpage.remote", false);
 pref("browser.pagethumbnails.capturing_disabled", true); //Breaks page thumbnails
+pref("browser.ping-centre.production.endpoint", "");  //Conflict
+pref("browser.ping-centre.staging.endpoint", "");  //Conflict
 //pref("browser.ping-centre.telemetry", true);
 pref("browser.ping-centre.telemetry", false);  //Conflict
 pref("browser.policies.testing.disallowEnterprise", true);
@@ -275,10 +280,12 @@ pref("dom.webnotifications.requireinteraction.enabled", false);
 //pref("extensions.autoDisableScopes", 0); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox
 pref("extensions.autoDisableScopes", 15); //bits: 1=profile 2=.mozilla/extensions 4=/usr/lib/firefox 8=/usr/share/firefox  //Conflict
 pref("extensions.blocklist.detailsURL", "https://blocked.cdn.mozilla.net/");
-pref("extensions.blocklist.enabled", true);
-pref("extensions.blocklist.itemURL", "https://blocked.cdn.mozilla.net/%blockID%.html");
+pref("extensions.blocklist.enabled", false);
+//pref("extensions.blocklist.itemURL", "https://blocked.cdn.mozilla.net/%blockID%.html");
+pref("extensions.blocklist.itemURL", "");  //Conflict
 //pref("extensions.blocklist.url", "https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
-pref("extensions.blocklist.url", "https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%APP_ID%/%APP_VERSION%/");  //Conflict
+//pref("extensions.blocklist.url", "https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%APP_ID%/%APP_VERSION%/");  //Conflict
+pref("extensions.blocklist.url", "");  //Conflict
 //pref("extensions.bootstrappedAddons", "{}");
 //pref("extensions.checkCompatibility.4.*", false);
 //pref("extensions.databaseSchema", 3);
@@ -341,10 +348,18 @@ pref("gfx.font_rendering.opentype_svg.enabled", false);
 pref("gfx.layerscope.enabled", false);
 
 pref("identity.fxaccounts.enabled", false);
+//pref("identity.fxaccounts.auth.uri", "identity.fxaccounts.auth.uri");
+pref("identity.fxaccounts.auth.uri", "");  //Conflict
+//pref("identity.fxaccounts.remote.oauth.uri", "https://oauth.accounts.firefox.com/v1");
+pref("identity.fxaccounts.remote.oauth.uri", "");  //Conflict
+//pref("identity.fxaccounts.remote.profile.uri", "https://profile.accounts.firefox.com/v1");
+pref("identity.fxaccounts.remote.profile.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", "https://www.mozilla.org/firefox/ios/");  //Conflict
+//pref("identity.sync.tokenserver.uri", "https://token.services.mozilla.com/1.0/sync/1.5");
+pref("identity.sync.tokenserver.uri", "");  //Conflict
 
 pref("intl.accept_languages", "en-US, en");
 pref("intl.charset.default", "windows-1252");
@@ -391,6 +406,8 @@ pref("media.getusermedia.screensharing.enabled", false);  //Conflict
 pref("media.gmp-gmpopenh264.autoupdate", false);
 pref("media.gmp-gmpopenh264.enabled", false);
 pref("media.gmp-manager.updateEnabled", false);  //Hidden
+//pref("media.gmp-manager.url", "https://aus5.mozilla.org/update/3/GMP/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");  //Hidden
+pref("media.gmp-manager.url", "data:text/plain,");  //Conflict
 pref("media.gmp-manager.url.override", "data:text/plain,");  //Hidden
 pref("media.gmp-provider.enabled", false);
 pref("media.gmp-widevinecdm.autoupdate", false);
@@ -613,6 +630,8 @@ pref("security.ssl.treat_unsafe_negotiation_as_broken", true);  //Conflict
 //pref("security.tls.enable_0rtt_data", true);
 pref("security.tls.enable_0rtt_data", false);  //Conflict
 
+//pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1");
+pref("services.settings.server", "");  //Conflict
 pref("services.sync.engine.addons", false);
 pref("services.sync.engine.prefs", false);
 pref("services.sync.engine.tabs", false);
@@ -662,6 +681,8 @@ pref("ui.use_standins_for_native_colors", true);
 pref("webchannel.allowObject.urlWhitelist", "");  //Conflict
 
 pref("webextensions.storage.sync.enabled", true);
+//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