From 5d3c3fa81030a83995f063940cfb189c5d6100fe Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Fri, 20 Feb 2015 21:10:51 -0200
Subject: iceweasel-1:35.0.1.deb1-2: fix https://labs.parabola.nu/issues/645
 and https://labs.parabola.nu/issues/677

---
 libre/iceweasel/PKGBUILD  |  4 ++--
 libre/iceweasel/vendor.js | 20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'libre/iceweasel')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 3402dbec8..d4ce362e2 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 pkgname=iceweasel
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -60,7 +60,7 @@ sha256sums=('44646270b68b7ec5ee73516ea5bada0f32d1c2c01d4afdb7102ba7f98c93a7a8'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '84895ff873a89770c62c4568fd111ac92d540b4499b2b77258c6c88a929ef049'
             '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
-            '09b1869f948df05c196a47883d61cad79c99020f9160d5ebe5bc827242138c57'
+            'bdb9123015db160e8e68b4166e5da00f49b6d407f2a9b91fe9c5487ddbdafded'
             'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 
diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js
index 430f41604..5af1e8c22 100644
--- a/libre/iceweasel/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -22,9 +22,10 @@ pref("ui.key.menuAccessKeyFocuses", false);
 pref("social.remote-install.enabled", false);
 pref("social.toast-notifications.enabled", false);
 
-// Make sure that whitelisted and directory installs are empty
+// Make sure that whitelisted, directory installs and sharing directory are empty
 pref("social.whitelist", "");
 pref("social.directories", "");
+pref("social.shareDirectory", "");
 
 // Disable the GeoLocation API for content
 pref("geo.enabled", false);
@@ -47,3 +48,20 @@ pref("security.ssl3.ecdhe_ecdsa_rc4_128_sha", false);
 pref("security.ssl3.ecdhe_rsa_rc4_128_sha", false);
 pref("security.ssl3.rsa_rc4_128_md5", false);
 pref("security.ssl3.rsa_rc4_128_sha", false);
+
+// Disable Firefox Hello and make sure that the request URLs of the Firefox Hello are empty
+pref("loop.enabled", false);
+pref("loop.feedback.baseUrl", "");
+pref("loop.gettingStarted.url", "");
+pref("loop.learnMoreUrl", "");
+pref("loop.legal.ToS_url", "");
+pref("loop.legal.privacy_url", "");
+pref("loop.oauth.google.redirect_uri", "");
+pref("loop.oauth.google.scope", "");
+pref("loop.server", "");
+pref("loop.soft_start_hostname", "");
+pref("loop.support_url", "");
+pref("loop.throttled2", false);
+
+// Make sure that the request URL of the Discover Apps is empty
+pref("browser.apps.URL", "");
-- 
cgit v1.2.3