Update Iceweasel-hardened pref for v50

3 files changed, 15 insertions, 14 deletions

diff --git a/nonprism/iceweasel-hardened-preferences/PKGBUILD b/nonprism/iceweasel-hardened-preferences/PKGBUILD
index 8abcd2cfb..e255fd648 100644
--- a/nonprism/iceweasel-hardened-preferences/PKGBUILD
+++ b/nonprism/iceweasel-hardened-preferences/PKGBUILD
@@ -10,7 +10,8 @@ license=(MPL)
 replaces=('iceweasel-hardened')
 conflicts=('iceweasel-hardened')
 depends=('firejail')
-optdepends=('iceweasel-noscript: XSS and Javascript Protection (Important)')
+optdepends=('iceweasel-noscript: XSS and Javascript Protection (Important)'
+'iceweasel-ublock-origin: Block ads and trackers')
 url="https://wiki.parabola.nu/${pkgname%%-*}"
 install=iceweasel-hardened.install
 source=('firefox-branding.js'
@@ -19,12 +20,12 @@ source=('firefox-branding.js'
 'iceweasel-hardened.install')
 sha512sums=('cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
 'd542452fa1d619d22e9c9b6e4af58d7310abdc5c81d871a1abbddb0087c53913c8a244af2b7be416a2c439383afc2480c439078ebde0ccac518300d9027b4800'
-'c5678128d9b3a442322c9c5ea3aaec8df7e891eca575bd798fd6a820c7f6e39daaed3fcf4b796a0298243ed645ed5a6075d26df2152cb82037104872eb3dbd3f'
-'6dac0640bc84606be573cd5e8f2c2c5b40f30c3c9660b43e3df06dbce7e18f039fcff4e663d4eae61371c949ea78bdda2dd58339100942965b108b29c9d80375')
+'ba20f29fa176795a664168dbc05e2a28fa34c82d5a7606cee6f12d30dbc49fe0280d95da0eaf1fa3f7f52fcd341da1bd546de4cd055acd79056c8eeee97317b5'
+'e9baa13d50195ff5be507093c45c00bb06a77c9e633ac183ec2fd74eebb11bfc07bde334fe4455b763e8700cde146ae223578ebd8d13066739220502b6eebff6')
 whirlpoolsums=('19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3'
 'f7cb38e58f644ddeae9f931c290ae1d96e54d0a8937171f2ebad498b65b87f2115cbd0a0f2a55e12dceba7a387e70fd2432678010a87975f8322c9c27b41efd2'
-'111d468f523136ffaf6b886fbca966ec680d5dcdb6afa7ffc308146339672b4f68e721de25cb811d63a58d6b80582befaa59b93b9e5641d7421652eab55323f8'
-'e9c71ee315adf97e0da1f0395a16ac6adf64490da3883875182c9468f15b3707ddfc304b3acfdf05646533239c5dc2ff8e38652d0246f2b07fc9e620ef7d694e')
+'e4316359d1350a0f32753923d6e20c8e998d7c7379b7dd10e62f1962d96f1bd4711755e5dc6631aa9616215da61331193b1bc66b38aa0c5a24e87bc1d214a63a'
+'44b57bbbf8f00ffee11afc84f5ea3daedc39e59da3ee91e337c1eaad24c014caf5680eb250e25a3e046db9caaf6829c3b667693de9f040d8864be34b96300bb9')
 
 package() {
   install -Dm644 iceweasel-branding.js "$pkgdir"/usr/lib/iceweasel/browser/defaults/preferences/iceweasel-branding.js
diff --git a/nonprism/iceweasel-hardened-preferences/iceweasel-branding.js b/nonprism/iceweasel-hardened-preferences/iceweasel-branding.js
index daa92b859..a264a0e08 100644
--- a/nonprism/iceweasel-hardened-preferences/iceweasel-branding.js
+++ b/nonprism/iceweasel-hardened-preferences/iceweasel-branding.js
@@ -587,18 +587,18 @@ pref("browser.safebrowsing.provider.google.updateURL",			"");
 pref("browser.safebrowsing.provider.google.lists",				"");
 
 // https://bugzilla.mozilla.org/show_bug.cgi?id=1025965
-user_pref("browser.safebrowsing.phishing.enabled", false);
-user_pref("browser.safebrowsing.provider.google4.lists", "");
-user_pref("browser.safebrowsing.provider.google4.updateURL", "");
-user_pref("browser.safebrowsing.provider.google4.gethashURL", "");
-user_pref("browser.safebrowsing.provider.google4.reportURL", "");
-user_pref("browser.safebrowsing.provider.mozilla.lists", "");
+pref("browser.safebrowsing.phishing.enabled", false);
+pref("browser.safebrowsing.provider.google4.lists", "");
+pref("browser.safebrowsing.provider.google4.updateURL", "");
+pref("browser.safebrowsing.provider.google4.gethashURL", "");
+pref("browser.safebrowsing.provider.google4.reportURL", "");
+pref("browser.safebrowsing.provider.mozilla.lists", "");
 
 // Disable Microsoft Family Safety MiTM support
 // https://bugzilla.mozilla.org/show_bug.cgi?id=1239166
 // https://wiki.mozilla.org/SecurityEngineering/Untrusted_Certificates_in_Windows_Child_Mode
 // https://hg.mozilla.org/releases/mozilla-release/file/ddb37c386bb2ffa180117b4d30ca3b41a8af233c/security/manager/ssl/nsNSSComponent.cpp#l782
-user_pref("security.family_safety.mode", 0);
+pref("security.family_safety.mode", 0);
 
 // Disable pocket
 // https://support.mozilla.org/en-US/kb/save-web-pages-later-pocket-firefox
diff --git a/nonprism/iceweasel-hardened-preferences/iceweasel-hardened.install b/nonprism/iceweasel-hardened-preferences/iceweasel-hardened.install
index a40085990..b269e6e33 100644
--- a/nonprism/iceweasel-hardened-preferences/iceweasel-hardened.install
+++ b/nonprism/iceweasel-hardened-preferences/iceweasel-hardened.install
@@ -1,6 +1,6 @@
 post_install() {
 	echo "..."
-	echo "Note: It is now required to use iceweasel-hardened or iceweasel binaries separately. They cannot run at the same time, but can be ran interchangebly. Additionally some user.js preferences may be overriden in your normal profile due to Mozilla bug #1322624."
+	echo "Note: It is now required to use iceweasel-hardened or iceweasel binaries separately. They cannot run at the same time, but can be ran interchangebly. Additionally, some user.js preferences may be overriden in your normal profile due to Mozilla bug #1322624. You can re-enable these in about:config."
 	echo "..."
-	echo "Nota: ahora se require usar los binarios iceweasel-hardened o iceweasel de forma separada. No pueden ser usados al mismo tiempo, pero sí de manera alterna. Además, algunas preferencias de user.js pueden ser anuladas en tu perfil normal debido al error #1322624 de Mozilla."
+	echo "Nota: ahora se require usar los binarios iceweasel-hardened o iceweasel de forma separada. No pueden ser usados al mismo tiempo, pero sí de manera alterna. Además, algunas preferencias de user.js pueden ser anuladas en tu perfil normal debido al error #1322624 de Mozilla. Puede volver a habilitarlos en about:config."
 }
\ No newline at end of file