From 4aea6b5801883aac0ce3c5f122e67f1c927460ce Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 25 Apr 2020 11:38:38 -0700
Subject: Sync with upstream

---
 PKGBUILD  | 6 +++---
 vendor.js | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index cdb4ff1..5d0ffbc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,10 @@
 
 _pkgname=palemoon
 pkgname=${_pkgname}-preferences-basic
-pkgver=20200212
+pkgver=20200425
 pkgrel=1
 pkgdesc="Vendor.js for PaleMoon (Basic)"
-arch=(x86_64)
+arch=(any)
 license=(MPL GPL LGPL)
 url="https://library.iserlohn-fortress.net/arc4/palemoon-preferences-basic"
 depends=()
@@ -17,7 +17,7 @@ makedepends=()
 conflicts=(palemoon-preferences-basic)
 provides=(palemoon-preferences)
 source=(vendor.js)
-b2sums=('06de2b9cb2aba171c3fc6d9a646444bce59c7229d49a1adb3e55e0073a8d1ea4dbcb2a42b7b3ddca1c115bbd9e42249570c81a2c1fb6200b115741f505a5b10a')
+b2sums=('b0238e215a18db022faf6bff8f4fb04fb0542a547416d77d262635a552ece95ce8b3b9c038c2f720ae6d63120002a84c77f227c69c48c223c791157f9143777c')
 
 package() {
   install -Dm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
diff --git a/vendor.js b/vendor.js
index 98c0319..b345f10 100644
--- a/vendor.js
+++ b/vendor.js
@@ -61,6 +61,7 @@ pref("browser.send_pings", 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.cache_behavior", 0);  //Conflict
 //pref("browser.sessionstore.privacy_level", 2);
 //pref("browser.sessionstore.resume_from_crash", true);
 //pref("browser.sessionstore.resume_from_crash", false);  //Conflict
@@ -335,7 +336,10 @@ pref("security.ssl.enable_ocsp_stapling", true);
 pref("security.ssl.require_safe_negotiation", true);  //Conflict
 //pref("security.ssl.treat_unsafe_negotiation_as_broken", false);
 pref("security.ssl.treat_unsafe_negotiation_as_broken", true);  //Conflict
+pref("security.ssl3.security.ssl3.dhe_rsa_aes_128_sha", true);
+pref("security.ssl3.security.ssl3.dhe_rsa_aes_256_sha", true);
 pref("security.ssl3.rsa_aes_256_gcm_sha384", false);
+pref("security.ssl3.rsa_aes_256_sha256", false);
 pref("security.ssl3.dhe_rsa_camellia_128_sha", false);
 pref("security.ssl3.dhe_rsa_camellia_256_sha", false);
 pref("security.ssl3.rsa_camellia_128_sha", false);
-- 
cgit v1.2.1