libre/iceweasel: Update data reporting preference overrides

Because data reporting is now hopefully disabled via build config
options, reviewed some of the related preference overrides:

Removed the following preferences:

datareporting.healthreport.uploadEnabled
  defined only if MOZ_SERVICES_HEALTHREPORT is defined,
  see modules/libpref/init/all.js

datareporting.healthreport.about.reportUrl
  Removed upstream, see:
  https://bugzilla.mozilla.org/show_bug.cgi?id=1352497
  Can be found only in some test files

datareporting.healthreport.documentServerURI
  Probably have been removed too, documentServerURI can
  now be found only in obsolete documentation and some tests

healthreport.uploadEnabled
  cannot be found alone in source tree.
  Only datareporting.healthreport.uploadEnabled can be found.

datareporting.policy.dataSubmissionEnabled
  defined only if MOZ_DATA_REPORTING is defined,
  see modules/libpref/init/all.js

datareporting.healthreport.service.enabled
  could find only in some test files

datareporting.policy.firstRunTime
datareporting.policy.dataSubmissionPolicyVersion
  could not find in source tree

Also checked the following preferences:

toolkit.telemetry*
  still available in the code, so have not removed them

pref("toolkit.telemetry.server_owner", "User");
  This is just a nitpicking probably, because upstream preference says
"Mozilla" instead. And that is not true, because of the following
override in vendor.js :)
pref("toolkit.telemetry.server", "127.0.0.1");

Signed-off-by: Andreas Grapentin <andreas@grapentin.org>

2 files changed, 9 insertions, 10 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 6ed720ee9..dccebc5f0 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -46,7 +46,7 @@ pkgname=iceweasel
 epoch=1
 pkgver=78.0.1
 pkgrel=1
-pkgrel+=.parabola1
+pkgrel+=.parabola2
 _brandingver=77.0
 _brandingrel=1
 pkgdesc="Standalone web browser derived from Mozilla Firefox"
@@ -86,7 +86,7 @@ sha256sums=('494d277b120028e036e2aee3f658d79afc895457dc6aadb1c02f0547ef1d66ca'
             'SKIP'
             'f9d0a6b4ecd82d28b130a9c08dc3b060b50f1f34fc47d2a4675f9d982d15b3b3'
             '0ed6b8efa00f73a96bceaba2d6a31fb11d416106729ab9b8289b191eb9acccfa'
-            'cc3d71eb493a3d53b1662567cae872f81ff99e0845d59ac402a890461c356183')
+            '714998c5fc379f54a66ff80a845b7880169cd5b4094b77b719a99d33b65c0940')
 sha256sums_i686=('125000a8d4eec602d51eebcb9c94fb48c3ec1f5162ea28116bfdfe14d1a34cf9'
                  '6395b7e349963c9a689929b44525159328954af156ef0b9a42182e7e16baa8ba')
 sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
diff --git a/libre/iceweasel/vendor.js.in b/libre/iceweasel/vendor.js.in
index a98f3d3a2..d67ae2fb0 100644
--- a/libre/iceweasel/vendor.js.in
+++ b/libre/iceweasel/vendor.js.in
@@ -149,13 +149,7 @@ pref("security.enterprise_roots.enabled", false);
 //pref("services.sync.privacyURL", "https://www.gnu.org/software/gnuzilla/");
 pref("social.enabled", false);
 pref("social.remote-install.enabled", false);
-pref("datareporting.healthreport.uploadEnabled", false);
-pref("datareporting.healthreport.about.reportUrl", "127.0.0.1");
-pref("datareporting.healthreport.documentServerURI", "127.0.0.1");
-pref("healthreport.uploadEnabled", false);
 pref("social.toast-notifications.enabled", false);
-pref("datareporting.policy.dataSubmissionEnabled", false);
-pref("datareporting.healthreport.service.enabled", false);
 pref("browser.slowStartup.notificationDisabled", true);
 pref("network.http.sendRefererHeader", 2);
 //pref("network.http.referer.spoofSource", true);
@@ -172,6 +166,7 @@ pref("toolkit.telemetry.unified", false);
 pref("toolkit.telemetry.newProfilePing.enabled", false);
 pref("toolkit.telemetry.firstShutdownPing.enabled", false);
 pref("toolkit.telemetry.server", "127.0.0.1");
+pref("toolkit.telemetry.server_owner", "User");
 pref("app.shield.optoutstudies.enabled", false);
 pref("experiments.enabled", false);
 pref("experiments.manifest.uri", "127.0.0.1");
@@ -223,8 +218,6 @@ pref("identity.mobilepromo.android", "https://f-droid.org/repository/browse/?fdi
 pref("browser.snippets.geoUrl", "http://127.0.0.1/");
 pref("browser.snippets.updateUrl", "http://127.0.0.1/");
 pref("browser.snippets.statsUrl", "http://127.0.0.1/");
-pref("datareporting.policy.firstRunTime", 0);
-pref("datareporting.policy.dataSubmissionPolicyVersion", 2);
 pref("browser.webapps.checkForUpdates", 0);
 pref("browser.webapps.updateCheckUrl", "http://127.0.0.1/");
 pref("app.faqURL", "http://libreplanet.org/wiki/Group:IceCat/FAQ");
@@ -322,3 +315,9 @@ pref("browser.messaging-system.whatsNewPanel.enabled", false);
 // Disable 'Recommendations' section in about:addons
 // Related to: https://labs.parabola.nu/issues/2409
 pref("extensions.getAddons.showPane", false);
+
+// Disable some bits of Normandy, subsystem that allows Mozilla to make changes remotely.
+// Should be already disbled by setting MOZ_NORMANDY to False in build configuration.
+// Setting these preferences just in case and to not frustrate users.
+pref("app.normandy.api_url", "http://127.0.0.1/");
+pref("app.normandy.enabled", false);