From a25c630a21d78be6515648d8d65cf13fb633c3b5 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@gnu.org>
Date: Thu, 13 Sep 2018 20:47:06 -0400
Subject: Preserve Firefox as UserAgent

---
 makeicecat | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'makeicecat')

diff --git a/makeicecat b/makeicecat
index 3bb16a1..37a4f39 100644
--- a/makeicecat
+++ b/makeicecat
@@ -405,6 +405,11 @@ sed 's/mozilla-bin/icecat-bin/' -i build/unix/run-mozilla.sh
 
 find -type f | grep run-mozilla | xargs prename s/mozilla/icecat/
 
+# do not alter useragent/platform/oscpu/etc with fingerprinting countermeasure, it makes things worse
+sed '/ShouldResistFingerprinting/,/}/s/^/\/\//' -i ./netwerk/protocol/http/nsHttpHandler.cpp
+sed '/If fingerprinting resistance is on/,/}/s/^/\/\//' -i ./dom/base/Navigator.cpp
+
+# Leave user agent as Firefox
 sed "/MOZILLA_UAVERSION/ s:IceCat/:Firefox/:" -i netwerk/protocol/http/nsHttpHandler.cpp
 
 find . -name region.properties |xargs -i /bin/sed 's_https://www.mibbit.*__' -i {}
@@ -421,9 +426,9 @@ cat << EOF >> browser/app/profile/icecat.js
 // Set useragent to Firefox compatible
 //pref("general.useragent.compatMode.firefox",true);
 // Spoof the useragent to a generic one
-pref("general.useragent.compatMode.firefox",true);
+//pref("general.useragent.compatMode.icecat",true);
 // Spoof the useragent to a generic one
-pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:${FFMAJOR}.0) Gecko/20100101 Firefox/${FFMAJOR}.0");
+//pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:${FFMAJOR}.0) Gecko/20100101 Firefox/${FFMAJOR}.0");
 pref("general.appname.override", "Netscape");
 pref("general.appversion.override", "${FFMAJOR}.0");
 pref("general.buildID.override", "Gecko/20100101");
@@ -433,6 +438,7 @@ EOF
 
 cat << EOF >> browser/confvars.sh
 # IceCat settings
+MOZ_APP_UA_NAME=IceCat
 MOZ_APP_VENDOR=GNU
 MOZ_APP_VERSION=$FFVERSION
 MOZ_APP_PROFILE=mozilla/icecat
-- 
cgit v1.2.3