From 051f42bcdc9a6d91d3052456189d6491d0867ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 21 Sep 2016 23:29:03 -0300 Subject: Update Determine-which-phishing-shavar-to-use-depending-on-.patch --- ...ne-which-phishing-shavar-to-use-depending-on-.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch b/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch index 3fb154f..451054a 100644 --- a/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch +++ b/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch @@ -1,5 +1,5 @@ -From: Mike Hommey -Date: Thu, 1 Apr 2010 15:34:59 +0200 +From: André Silva +Date: Wed, 21 Sep 2016 23:28:27 -0300 Subject: Determine which phishing shavar to use depending on MOZ_OFFICIAL_BRANDING @@ -9,10 +9,10 @@ Subject: Determine which phishing shavar to use depending on 2 files changed, 7 insertions(+) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index a0a9b18..6e7f443 100644 +index 284f464..3fbd83b 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -4834,7 +4834,11 @@ pref("dom.mapped_arraybuffer.enabled", false); +@@ -5028,7 +5028,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"); @@ -21,14 +21,14 @@ index a0a9b18..6e7f443 100644 +#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,test-forbid-simple,goog-downloadwhite-digest256,mozstd-track-digest256,mozstd-trackwhite-digest256,mozfull-track-digest256"); + + // Tables for application reputation. + pref("urlclassifier.downloadBlockTable", "goog-badbinurl-shavar"); diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build -index 8d3a49d..702fcbf 100644 +index 650d1a8..2db2fdb 100644 --- a/modules/libpref/moz.build +++ b/modules/libpref/moz.build -@@ -49,3 +49,6 @@ if CONFIG['GNU_CXX']: +@@ -46,3 +46,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT'] FINAL_TARGET_PP_FILES += [ 'greprefs.js', ] -- cgit v1.2.2