From dd553843f2683dd69c0ead6ffa29ace002345f18 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Mon, 26 Sep 2016 06:35:00 -0300
Subject: iceweasel-1:49.0.deb3-1: updating version

---
 libre/iceweasel/PKGBUILD  | 12 ++++++++----
 libre/iceweasel/vendor.js | 15 +++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'libre/iceweasel')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 5b3d9de31..adf098f92 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -21,7 +21,7 @@ _debname=firefox
 _brandingver=49.0
 _brandingrel=1
 _debver=49.0
-_debrel=deb1
+_debrel=deb3
 _debrepo=http://ftp.debian.org/debian/pool/main/
 _parabolarepo=https://repo.parabola.nu/other/iceweasel
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -31,7 +31,6 @@ pkgname=iceweasel
 epoch=1
 pkgver=$_debver.$_debrel
 pkgrel=1
-
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 armv7h)
 license=(MPL GPL LGPL)
@@ -66,7 +65,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         mozilla-1253216.patch
         mozilla-build-arm.patch)
 sha256sums=('2f463afd3c74eb9477f58525214f06498357ff90f01b45fb2675fc77c57bcffe'
-            'ad6e1da709e0f7e86da83fee84067968acd1678576c4cf1757214b2954780ce5'
+            '8825dcceccb53e2b3f3dc46101de01f32f8ae0ed6c8bd809fda4e96cdad76be9'
             'c0fd88e37187298a7658919cf2e4b6d024425b781d6aff5bdba49dc991f379d3'
             'SKIP'
             '69d612da53ed7eb04be20d0bfc51eb6e132216a7f7159dde37f4666973ca14d4'
@@ -76,7 +75,7 @@ sha256sums=('2f463afd3c74eb9477f58525214f06498357ff90f01b45fb2675fc77c57bcffe'
             '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
             '87034dbb640f70454b27d1695a6f03b6fd1ab81c82eb4d8c771db925ae03d408'
             '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
-            'e1c82f5f683258e17f7b3dba62a938e4efe4d232f45a4b82e74cd2793fd5f7fe'
+            '6a21bafa6ea587b853c0ac069df595936585822e15ed3a33f825a33c6b9971de'
             'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484'
             'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65'
             '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a')
@@ -132,6 +131,11 @@ prepare() {
   rm -rv browser/locales/en-US/searchplugins
   cp -av /usr/lib/mozilla/searchplugins browser/locales/en-US
 
+  # Disable various components at the source level
+  sed -i 's|1|0|' toolkit/components/telemetry/TelemetryStartup.manifest || die "failed break telemetry startup"
+  sed -i 's|1|0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService"
+  sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket"
+
   # ARM-specific changes:
   if [[ "$CARCH" == arm* ]]; then
       sed -i '/ac_add_options --enable-rust/d' .mozconfig
diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js
index ab4a9aedb..5fd0d1c07 100644
--- a/libre/iceweasel/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -18,12 +18,12 @@ pref("geo.enabled", false);
 pref("geo.wifi.uri", "");
 
 // Disable Pocket and make sure that the request URLs of the Pocket are empty
+pref("browser.pocket.api", "about:blank");
 pref("browser.pocket.enabled", false);
-pref("browser.pocket.api", "");
-pref("browser.pocket.site", "");
-pref("browser.pocket.oAuthConsumerKey", "");
+pref("browser.pocket.enabledLocales", "about:blank");
+pref("browser.pocket.oAuthConsumerKey", "about:blank");
+pref("browser.pocket.site", "about:blank");
 pref("browser.pocket.useLocaleList", false);
-pref("browser.pocket.enabledLocales", "");
 
 // Disable Freedom Violating DRM Feature
 pref("browser.eme.ui.enabled", false);
@@ -34,7 +34,7 @@ pref("media.eme.apiVisible", false);
 pref("browser.newtabpage.enhanced", false);
 
 // Override add-on signing
-pref("xpinstall.signatures.required", false);
+pref("xpinstall.signatures.required", true); // Requires signing by AMO, disable to install third-party unsigned addons
 
 // Poodle attack
 pref("security.tls.version.min", 1);
@@ -63,7 +63,7 @@ pref("network.cookie.cookieBehavior", 1);
 pref("browser.EULA.override", true);
 
 // disable app updater url
-pref("app.update.url", "http://127.0.0.1/");"
+pref("app.update.url", "http://127.0.0.1/");
 
 // Set useragent to Firefox compatible
 //pref("general.useragent.compatMode.firefox", true);
@@ -211,3 +211,6 @@ pref("browser.casting.enabled", false);
 pref("social.directories", "");
 pref("social.whitelist", "");
 pref("social.shareDirectory", "");
+
+// Disable Barlog
+pref("app.update.url", "about:blank");
\ No newline at end of file
-- 
cgit v1.2.3