Port changes from Abrowser's updates from 60 through 68

2 files changed, 52 insertions, 36 deletions

diff --git a/data/settings.js b/data/settings.js
index d3753ac..03af220 100644
--- a/data/settings.js
+++ b/data/settings.js
@@ -109,6 +109,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://www.gnu.org/software/gnuzilla/");
 pref("social.enabled", false);
 pref("social.remote-install.enabled", false);
@@ -162,10 +164,12 @@ pref("browser.newtabpage.introShown", true);
 pref("browser.aboutHomeSnippets.updateUrl", "");
 // Always ask before restoring the browsing session
 pref("browser.sessionstore.max_resumed_crashes", 0);
-// Disable tracking protection by default, as it makes automated connections to fetch lists
-pref("browser.safebrowsing.provider.mozilla.updateURL", "");
-pref("privacy.trackingprotection.enabled", false);
-pref("privacy.trackingprotection.pbmode.enabled", false);
+// Disable tracking protection by default, as it makes automated connections to fetch lists (not doing this until the newtab privacy block is reimplemented)
+//pref("browser.safebrowsing.provider.mozilla.updateURL", "");
+pref("privacy.trackingprotection.enabled", true);
+pref("privacy.trackingprotection.pbmode.enabled", true);
+pref("urlclassifier.trackingTable", "test-track-simple,base-track-digest256,content-track-digest256");
+pref("browser.privacy.trackingprotection.menu", "always");
 pref("privacy.trackingprotection.introURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tracking-protection/start/");
 // Disable geolocation
 pref("geo.enabled", false);
@@ -181,6 +185,8 @@ pref("privacy.resistFingerprinting", true);
 pref("webgl.disabled", true);
 // Don't reveal your internal IP when WebRTC is enabled
 pref("media.peerconnection.ice.no_host", true);
+pref("privacy.trackingprotection.cryptomining.enabled", true);
+pref("privacy.trackingprotection.fingerprinting.enabled", true);
 
 // Services
 pref("gecko.handlerService.schemes.mailto.0.name", "");
@@ -329,6 +335,7 @@ pref("security.ssl3.dhe_rsa_aes_128_sha", false);
 pref("security.ssl3.dhe_rsa_aes_256_sha", false);
 pref("security.ssl3.dhe_dss_aes_128_sha", false);
 pref("security.ssl3.dhe_rsa_des_ede3_sha", false);
+pref("security.ssl3.rsa_des_ede3_sha", false);
 
 // Disable Pocket integration
 pref("browser.pocket.enabled", false);
@@ -336,6 +343,8 @@ pref("extensions.pocket.enabled", false);
 
 // Do not require xpi extensions to be signed by Mozilla
 pref("xpinstall.signatures.required", false);
+// enable extensions by default in private mode
+pref("extensions.allowPrivateBrowsingByDefault", true);
 
 // Do not show unicode urls https://www.xudongz.com/blog/2017/idn-phishing/
 pref("network.IDN_show_punycode", true);
@@ -362,3 +371,8 @@ pref("gfx.xrender.enabled",true);
 pref("dom.webnotifications.enabled",false); 
 pref("dom.webnotifications.serviceworker.enabled",false); 
 pref("dom.push.enabled",false); 
+
+// Disable recommended extensions
+pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr", false);
+pref("extensions.htmlaboutaddons.discover.enabled", false);
+pref("extensions.htmlaboutaddons.recommendations.enabled", false);
diff --git a/makeicecat b/makeicecat
index 402e093..25dde1c 100644
--- a/makeicecat
+++ b/makeicecat
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 #    Copyright (C) 2014-2019  Ruben Rodriguez <ruben@gnu.org>
+#    Copyright (C) 2019  Amin Bandali <bandali@gnu.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -160,6 +161,9 @@ LISTURL="lists.gnu.org/mailman/listinfo/bug-gnuzilla"
 echo "ac_add_options --disable-eme" >> build/mozconfig.common.override
 echo "ac_add_options --disable-eme" >> build/mozconfig.common
 
+# Correct build error
+echo "ac_add_options --enable-stdcxx-compat" >> build/mozconfig.common.override
+
 # Disable healthreport
 sed '/mozilla.org\/legal/d' -i toolkit/components/telemetry/healthreport-prefs.js
 cat << EOF >> toolkit/components/telemetry/healthreport-prefs.js
@@ -183,23 +187,19 @@ done
 
 # Disable activity-stream antifeatures.
 # These are not condensed into a single sed script to make it fail on individual commands that didn't change the source
-sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed '/\["showSponsored/,/value/s/value: true/value: false/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed '/\["disableSnippets/,/value/s/value: false/value: true/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed '/\["telemetry"/,/value/s/value: true/value: false/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed '/\["section.highlights.includePocket"/,/value/s/value: true/value: false/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed '/\["telemetry.ping.endpoint"/,/value/s/value: .*/value: ""/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed '/\["tippyTop.service.endpoint"/,/value/s/value: .*/value: ""/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed 's/\(read_more_endpoint:\) .http.*/\1 "",/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed 's/\(stories_endpoint:\) .http.*/\1 "",/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed 's/\(stories_referrer:\) .http.*/\1 "",/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed 's/\(privacy_notice_link:\) .http.*/\1 "https:\/\/trisquel.info\/legal",/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed 's/\(disclaimer_link:\) .http.*/\1 "",/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed 's/\(topics_endpoint:\) .http.*/\1 "",/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed '/name: "snippets"/,/value/s/value: true/value: false/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed '/name: "telemetry"/,/value/s/value: true/value: false/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-sed '/name: "section.topstories"/,/return/s/return.*/return false;/' -i browser/extensions/activity-stream/lib/ActivityStream.jsm
-
+ActivityStream=browser/components/newtab/lib/ActivityStream.jsm
+sed '/^const DEFAULT_SITES/,/^])\;/c const DEFAULT_SITES = new Map\([[""]]\);' -i $ActivityStream
+sed '/\["showSponsored/,/value/s/value: true/value: false/' -i $ActivityStream
+sed '/\["telemetry"/,/value/s/value: true/value: false/' -i $ActivityStream
+sed '/\["section.highlights.includePocket"/,/value/s/value: true/value: false/' -i $ActivityStream
+sed '/\["telemetry.ping.endpoint"/,/value/s/value: .*/value: ""/' -i $ActivityStream
+sed 's/\(read_more_endpoint:\) .http.*/\1 "",/' -i $ActivityStream
+sed 's/\(stories_endpoint:\) .http.*/\1 "",/' -i $ActivityStream
+sed 's/\(stories_referrer:\) .http.*/\1 "",/' -i $ActivityStream
+sed 's/\(topics_endpoint:\) .http.*/\1 "",/' -i $ActivityStream
+sed '/name: "telemetry"/,/value/s/value: true/value: false/' -i $ActivityStream
+sed '/name: "section.topstories"/,/return/s/return.*/return false;/' -i $ActivityStream
+sed 's/.Ubuntu., //' -i browser/components/newtab/css/activity-stream*.css
 
 ###############################################################################
 # Branding
@@ -225,17 +225,20 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in
 
 find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
 
-for STRING in community.end3 community.exp.end community.start2 community.mozillaLink community.middle2 community.creditsLink community.end2 contribute.start contribute.getInvolvedLink contribute.end channel.description.start channel.description.end
+for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded
 do
- find -name aboutDialog.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/"
+ find -name aboutRights.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/"
 done
 
-for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded
+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.dtd | xargs sed -i "s/ENTITY $STRING.*/ENTITY $STRING \"\">/"
+ find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = /"
 done
 
-sed '/helpus.start/d' -i browser/base/content/aboutDialog.xul
+for STRING in helpus community-2 community-exp
+do
+ find -name aboutDialog.ftl | xargs sed -i "s/^$STRING.*/$STRING = /"
+done
 
 cp $DATA/aboutRights.xhtml toolkit/content/aboutRights.xhtml
 cp $DATA/aboutRights.xhtml toolkit/content/aboutRights-unbranded.xhtml
@@ -253,7 +256,8 @@ echo "#plugindeprecation-notice {  display: none !important; }" >> toolkit/mozap
 # Hide warnings on unsigned extensions
 echo ".warning{display: none!important; } .addon[notification=warning]{background-image: none!important;}" >> toolkit/mozapps/extensions/content/extensions.css
 # Hide extra links in about box
-sed '/releaseNotes.link/d; /helpus/d' -i ./browser/base/content/aboutDialog.xul
+sed '/releaseNotes.link/d' -i ./browser/base/content/aboutDialog.xul
+sed '/description.*helpus/,/description/d' -i ./browser/base/content/aboutDialog.xul
 
 ###############################################################################
 # Batch rebranding
@@ -572,15 +576,13 @@ find extensions/gnu/ | sed s=extensions/gnu=browser/extensions= >> ./browser/ins
 find extensions/gnu/ | sed s=extensions/gnu=distribution/extensions= >> mobile/android/installer/allowed-dupes.mn
 
 # Onboarding
-
-sed 's/.Ubuntu., //' -i browser/extensions/activity-stream/css/activity-stream*.css
-cp $DATA/onboarding/bootstrap.js browser/extensions/onboarding
-cp $DATA/onboarding/onboarding.js browser/extensions/onboarding/content
-cp $DATA/onboarding/onboarding.properties browser/extensions/onboarding/locales/en-US
-for locale in $(ls -1 $DATA/onboarding/locales/); do
-    mkdir -p l10n/$locale/browser/extensions/onboarding || true
-    cp $DATA/onboarding/locales/$locale/onboarding.properties l10n/$locale/browser/extensions/onboarding
-done
+#cp $DATA/onboarding/bootstrap.js browser/extensions/onboarding
+#cp $DATA/onboarding/onboarding.js browser/extensions/onboarding/content
+#cp $DATA/onboarding/onboarding.properties browser/extensions/onboarding/locales/en-US
+#for locale in $(ls -1 $DATA/onboarding/locales/); do
+#    mkdir -p l10n/$locale/browser/extensions/onboarding || true
+#    cp $DATA/onboarding/locales/$locale/onboarding.properties l10n/$locale/browser/extensions/onboarding
+#done
 
 # Fix CVE-2009-4029
 sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in