Sync with upstream

2 files changed, 49 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7392b1d..6cf1eec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,18 +6,18 @@
 
 _pkgname=palemoon
 pkgname=${_pkgname}-preferences-basic
-pkgver=20190522
+pkgver=20200113
 pkgrel=1
 pkgdesc="Vendor.js for PaleMoon (Basic)"
 arch=(x86_64)
 license=(MPL GPL LGPL)
-url="https://www.palemoon.org/"
+url="https://library.iserlohn-fortress.net/arc4/palemoon-preferences-basic"
 depends=()
 makedepends=()
 conflicts=(palemoon-preferences-basic)
 provides=(palemoon-preferences-basic)
 source=(vendor.js)
-sha512sums=('edb7c8efb84f57c3d67eebfc45e60f6873047ed1fab64145d3c2560820ea979d2f639c8d286f685a489be742e4993f41ab1d37dfb5286fb4768b0ae33cf7207c')
+b2sums=('60d0a45c747aa717ca1354b85933f7184f89f209615bc5764da01ff482e89f7261c63021b5cdbb125316faea0bb5a645a3f697c4416e5866ee90c9a768bbea53')
 
 package() {
   install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
diff --git a/vendor.js b/vendor.js
index eae6108..d401082 100644
--- a/vendor.js
+++ b/vendor.js
@@ -1,5 +1,7 @@
 //pref("accessibility.blockautorefresh", false);
 pref("accessibility.blockautorefresh", true);  //Conflict
+//pref("accessibility.force_disabled", 0);
+//pref("accessibility.force_disabled", 1);  //Conflict
 
 pref("alerts.showFavicons", false);
 
@@ -10,6 +12,7 @@ pref("app.update.auto", false);  //Conflict
 //pref("app.update.enabled", true);
 pref("app.update.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
 pref("app.update.url.details", "https://www.palemoon.org/releasenotes.shtml");
 pref("app.update.url.manual", "https://www.palemoon.org/");
@@ -20,8 +23,6 @@ pref("beacon.enabled", false);  //Conflict
 
 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.disk.smart_size.first_run", true);
@@ -81,6 +82,10 @@ pref("browser.xul.error_pages.expert_bad_cert", true);  //Conflict
 
 pref("camera.control.face_detection.enabled", false);
 
+//pref("captivedetect.canonicalURL", "http://detectportal.firefox.com/success.txt");
+//pref("captivedetect.canonicalURL", "http://detectportal.palemoon.org/success.txt");
+//pref("captivedetect.canonicalURL", "");  //Conflict
+
 //pref("clipboard.autocopy", true);
 pref("clipboard.autocopy", false);  //Conflict
 
@@ -88,6 +93,7 @@ pref("device.sensors.enabled", false);
 
 pref("devtools.webide.enabled", false);
 
+pref("dom.allow_cut_copy", false);  //Hidden
 //pref("dom.caches.enabled", true);
 //pref("dom.caches.enabled", false);  //Conflict
 pref("dom.enable_performance", false);
@@ -128,19 +134,16 @@ pref("extensions.update.enabled", true);
 //pref("extensions.webservice.discoverURL", "https://addons.palemoon.org/?component=discover");
 pref("extensions.webservice.discoverURL", "");  //Conflict
 
-//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");
-pref("font.blacklist.underline_offset", "");  //Conflict
-
 //pref("full-screen-api.warning.timeout", 3000);
 pref("full-screen-api.warning.timeout", 0); //Conflict
 
 pref("general.appname.override", "Netscape");
 pref("general.appversion.override", "5.0 (Windows)");
 pref("general.buildID.override", "20100101");
-pref("general.oscpu.override", "Windows NT 6.1");
+pref("general.oscpu.override", "Windows NT 10.0");
 pref("general.platform.override", "Win32");
 pref("general.productSub.override", "20100101");
-pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0");
+pref("general.useragent.override", "Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Firefox/68.0");
 pref("general.useragent.compatMode", 0);
 pref("general.useragent.compatMode.firefox", false);
 pref("general.useragent.compatMode.gecko", false);
@@ -154,6 +157,7 @@ pref("geo.enabled", false);
 pref("geo.wifi.uri", "");
 
 pref("gfx.downloadable_fonts.fallback_delay", -1);
+//pref("gfx.downloadable_fonts.woff2.enabled", false);
 pref("gfx.font_rendering.graphite.enabled", false);
 pref("gfx.font_rendering.opentype_svg.enabled", false);
 
@@ -173,28 +177,38 @@ pref("javascript.use_us_english_locale", true);
 //pref("keyword.enabled", false);  //Conflict
 
 //pref("layers.acceleration.force-enabled", true);
+
 //pref("layout.css.visited_links_enabled", true);
 pref("layout.css.visited_links_enabled", false);  //Conflict
 
 //pref("lightweightThemes.update.enabled", true);
 pref("lightweightThemes.update.enabled", false);  //Conflict
 
+pref("mathml.disabled", true);
+
 pref("media.autoplay.enabled", false);
 pref("media.benchmark.vp9.threshold", 0);
 pref("media.block-autoplay-until-in-foreground", true);
 //pref("media.cache_size", 0);
 pref("media.getusermedia.screensharing.allowed_domains", "");
 pref("media.getusermedia.screensharing.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.video_stats.enabled", false);
 
 pref("middlemouse.contentLoadURL", false);
+pref("middlemouse.paste", false);
 
 pref("network.auth.subresource-http-auth-allow", 1);
+//pref("network.auth.subresource-http-img-XO-auth", 1);
 pref("network.allow-experiments", false);
+pref("network.captive-portal-service.enabled", false);
 pref("network.cookie.cookieBehavior", 1);
 //pref("network.cookie.cookieBehavior", 2);  //Conflict
+//pref("network.cookie.lifetimePolicy", 2);
+pref("network.cookie.lifetimePolicy", 0);  //Conflict //required by ublock origin
 //pref("network.cookie.thirdparty.sessionOnly", false);
 //pref("network.cookie.thirdparty.sessionOnly", true);  //Conflict
 //pref("network.dnsCacheEntries", 400);
@@ -205,14 +219,31 @@ pref("network.cookie.cookieBehavior", 1);
 //pref("network.dnsCacheExpirationGracePeriod", 0);  //Conflict
 //pref("network.dns.disableIPv6", false);
 //pref("network.dns.disableIPv6", true);  //Conflict
+pref("network.dns.disablePrefetch", true);
 //pref("network.http.altsvc.enabled", true);
 pref("network.http.altsvc.enabled", false);  //Conflict
+//pref("network.http.altsvc.oe", true);
+pref("network.http.altsvc.oe", false);  //Conflict
 pref("network.http.connection-retry-timeout", 0);
+pref("network.http.keep-alive.timeout", 115);
 pref("network.http.max-persistent-connections-per-proxy", 256);
+pref("network.http.referer.spoofSource", false);
+pref("network.http.referer.trimmingPolicy", 0);
+//pref("network.http.referer.trimmingPolicy", 2);  //Conflict
+pref("network.http.referer.XOriginPolicy", 0);
+//pref("network.http.referer.XOriginPolicy", 2);  //Conflict
+pref("network.http.referer.XOriginTrimmingPolicy", 0);
 pref("network.http.spdy.allow-push", false);
+//pref("network.http.speculative-parallel-limit", 6);
+pref("network.http.speculative-parallel-limit", 0);  //Conflict
 pref("network.http.upgrade-insecure-requests", true);
 //pref("network.IDN_show_punycode", false);
 pref("network.IDN_show_punycode", true);   //Conflict
+pref("network.manage-offline-status", false);
+pref("network.predictor.enabled", false);
+pref("network.predictor.enable-prefetch", false);
+//pref("network.prefetch-next", true);
+pref("network.prefetch-next", false); //Conflict
 pref("network.protocol-handler.external-default", false);
 pref("network.protocol-handler.external.mailto", false);
 pref("network.protocol-handler.external.news", false);
@@ -240,6 +271,8 @@ pref("plugin.expose_full_path", false);
 //pref("plugin.sessionPermissionNow.intervalInMinutes", 60);
 pref("plugin.sessionPermissionNow.intervalInMinutes", 0);  //Conflict
 
+pref("plugins.click_to_play", true);
+
 //pref("privacy.clearOnShutdown.cache", true);
 //pref("privacy.clearOnShutdown.connectivityData", false);
 //pref("privacy.clearOnShutdown.connectivityData", true); //Conflict
@@ -278,10 +311,14 @@ pref("privacy.donottrackheader.enabled", true);  //Conflict
 //pref("reader.parse-on-load.enabled", true);
 pref("reader.parse-on-load.enabled", false);  //Conflict
 
+//pref("security.block_ftp_subresources", false);  //Set to false if required ftp sites are broken
+pref("security.cert_pinning.enforcement_level", 2);
 pref("security.csp.enable", true);
 //pref("security.csp.experimentalEnabled", false);
 pref("security.csp.experimentalEnabled", true); //Conflict
 pref("security.dialog_enable_delay", 1000);
+pref("security.family_safety.mode", 0);
+//pref("security.fileuri.unique_origin", false); //Set to false if required file: URIs are breaking
 pref("security.mixed_content.block_active_content", true);
 //pref("security.mixed_content.block_display_content", false);
 pref("security.mixed_content.block_display_content", true);  //Conflict
@@ -316,7 +353,8 @@ pref("services.sync.termsURL", "https://www.palemoon.org/sync/terms.shtml");
 pref("signon.formlessCapture.enabled", false);  //Conflict
 //pref("signon.rememberSignons", false);
 
-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", "");