From dff8f675f82ccb04f8fad482680cbb92c74fc6df Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Tue, 26 Mar 2019 21:44:52 -0400
Subject: [PATCH] Abrowser: fixed automated connection and unbranding
---
helpers/DATA/firefox/settings.js | 2 ++
helpers/make-firefox | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js
index e42c0751..2943fad5 100644
--- a/helpers/DATA/firefox/settings.js
+++ b/helpers/DATA/firefox/settings.js
@@ -101,6 +101,8 @@ pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false);
pref("browser.safebrowsing.enabled", false);
pref("browser.safebrowsing.downloads.remote.enabled", false);
pref("browser.safebrowsing.malware.enabled", false);
+pref("browser.safebrowsing.provider.mozilla.gethashURL", "");
+pref("browser.safebrowsing.provider.mozilla.updateURL", "");
pref("services.sync.privacyURL", "https://trisquel.info/en/legal");
pref("social.enabled", false);
pref("social.remote-install.enabled", false);
diff --git a/helpers/make-firefox b/helpers/make-firefox
index a4ecce98..7a56bd38 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (C) 2008-2018 Ruben Rodriguez <ruben@trisquel.info>
+# Copyright (C) 2008-2019 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2015 Santiago Rodriguez <santi@trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=60
+VERSION=61
. ./config
@@ -239,12 +239,12 @@ done
for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing
do
- find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = \"\">/"
+ find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = /"
done
for STRING in helpus community-2 community-exp
do
- find -name aboutDialog.ftl | xargs sed -i "s/^$STRING.*/$STRING = \"\">/"
+ find -name aboutDialog.ftl | xargs sed -i "s/^$STRING.*/$STRING = /"
done
sed -i 's/<a\ href\=\"http\:\/\/www.mozilla.org\/\">Mozilla\ Project<\/a>/<a\ href\=\"http\:\/\/www.trisquel.info\/\"\>Trisquel\ Project<\/a>/g' browser/base/content/overrides/app-license.html
--
GitLab