From 83878813a41cdb42e8a114cc265df4b947a18e6b Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 18 Apr 2019 20:30:35 -0700
Subject: Re-enabled blacklist updates Removed obsolete noscript settings

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

diff --git a/PKGBUILD b/PKGBUILD
index 567b080..0ec8755 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -45,7 +45,7 @@ sha256sums=('1fe4cfe4f4afce8d5532da8f36a48c333750c90a6ee67167309357edf514c22a'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
             '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
             '821f858bac2e13ce02b8c20d5387d4ecc8ab2d0e4ebe0a517cbf935da6aeb31b'
-            '281cc9cd7874955821ca739ebb3aef34bd8c8cb82dadb0fd4d122e7b580059bc'
+            'c2a3373a595f680ef85b1b657c5ff4aee771ee5989ab2ec99bf9846708e10f92'
             'a8c15c9d54ef8b360c0932f4ccf5e74954f14e9a9c2a1ae924b6c392075b2b8c'
             '33a91a7e8ca702ee493f483abe93bf6917881dc4192566587bdfb103da3a2422'
             'ad8a270e1b2affb098440f82517c3952207b28ebf604fef695dad3e29a5ba30e'
diff --git a/vendor.js b/vendor.js
index 9c4883a..4f4d1a9 100644
--- a/vendor.js
+++ b/vendor.js
@@ -339,7 +339,8 @@ pref("dom.webnotifications.serviceworker.enabled", false);  //Conflict
 //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", false);
+pref("extensions.blocklist.enabled", true);
+//pref("extensions.blocklist.enabled", false);  //Conflict
 pref("extensions.blocklist.itemURL", "https://blocked.cdn.mozilla.net/%blockID%.html");
 //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
@@ -590,11 +591,6 @@ pref("network.trr.uri", "");
 //pref("network.trr.waitforportal", true);
 pref("network.trr.waitforportal", false);  //Conflict
 
-pref("noscript.ABE.wanIpAsLocal", false);
-pref("noscript.allowWhitelistUpdates", false);
-pref("noscript.forbidFonts", true);
-pref("noscript.forbidMedia", true);
-
 pref("nsITelemetry.canRecordBase", false);
 pref("nsITelemetry.canRecordExtended", false);
 
-- 
cgit v1.2.1