Determine which phishing shavar to use depending on MOZ_OFFICIAL_BRANDING

Gbp-Pq: Topic iceweasel-branding
Gbp-Pq: Name Determine-which-phishing-shavar-to-use-depending-on-.patch

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 1e67603191d84c78e68ee0a0ddfbfc55c44ec3e9..fad92ac31056e91173f20393709dbbc8d84036ca 100644 (file)
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4799,7 +4799,11 @@ pref("dom.mapped_arraybuffer.enabled", false);
 
 // The tables used for Safebrowsing phishing and malware checks.
 pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-malware-simple,test-unwanted-simple");
+#ifdef MOZ_OFFICIAL_BRANDING
 pref("urlclassifier.phishTable", "goog-phish-shavar,test-phish-simple");
+#else
+pref("urlclassifier.phishTable", "googpub-phish-shavar,test-phish-simple");
+#endif
 pref("urlclassifier.downloadBlockTable", "");
 pref("urlclassifier.downloadAllowTable", "");
 pref("urlclassifier.disallow_completions", "test-malware-simple,test-phish-simple,test-unwanted-simple,test-track-simple,test-trackwhite-simple,goog-downloadwhite-digest256,mozstd-track-digest256,mozstd-trackwhite-digest256,mozfull-track-digest256");

diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
index 42efa9e2dccfffb5165d505b002a69de0e9713c4..2306a96f21b3ad0cb13519aa84cb10f9b1304bd6 100644 (file)
--- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build
@@ -45,3 +45,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wshadow']
+
+if CONFIG['MOZ_OFFICIAL_BRANDING']:
+    DEFINES['MOZ_OFFICIAL_BRANDING'] = True