Initial import

4 files changed, 136 insertions, 0 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
new file mode 100644
index 0000000..3fb154f
--- /dev/null
+++ b/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch
@@ -0,0 +1,37 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Thu, 1 Apr 2010 15:34:59 +0200
+Subject: Determine which phishing shavar to use depending on
+ MOZ_OFFICIAL_BRANDING
+
+---
+ modules/libpref/init/all.js | 4 ++++
+ modules/libpref/moz.build   | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
+index a0a9b18..6e7f443 100644
+--- a/modules/libpref/init/all.js
++++ b/modules/libpref/init/all.js
+@@ -4834,7 +4834,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,test-forbid-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 8d3a49d..702fcbf 100644
+--- a/modules/libpref/moz.build
++++ b/modules/libpref/moz.build
+@@ -49,3 +49,6 @@ if CONFIG['GNU_CXX']:
+ FINAL_TARGET_PP_FILES += [
+     'greprefs.js',
+ ]
++
++if CONFIG['MOZ_OFFICIAL_BRANDING']:
++    DEFINES['MOZ_OFFICIAL_BRANDING'] = True
diff --git a/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch b/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
new file mode 100644
index 0000000..77d16ac
--- /dev/null
+++ b/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
@@ -0,0 +1,61 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Sat, 19 Feb 2011 11:02:30 +0100
+Subject: Use MOZ_APP_DISPLAYNAME to fill appstrings.properties
+
+---
+ browser/locales/Makefile.in                          |  2 ++
+ .../en-US/chrome/overrides/appstrings.properties     | 20 ++++++++++----------
+ 2 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
+index 4c092f0..038fa57 100644
+--- a/browser/locales/Makefile.in
++++ b/browser/locales/Makefile.in
+@@ -26,6 +26,8 @@ SUBMAKEFILES += \
+ 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
+ 	$(NULL)
+ 
++DEFINES += -DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME)
++
+ # This makefile uses variable overrides from the libs-% target to
+ # build non-default locales to non-default dist/ locations. Be aware!
+ 
+diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/browser/locales/en-US/chrome/overrides/appstrings.properties
+index 0484b32..6c2fd16 100644
+--- a/browser/locales/en-US/chrome/overrides/appstrings.properties
++++ b/browser/locales/en-US/chrome/overrides/appstrings.properties
+@@ -3,24 +3,24 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ malformedURI=The URL is not valid and cannot be loaded.
+-fileNotFound=Firefox can't find the file at %S.
+-dnsNotFound=Firefox can't find the server at %S.
+-unknownProtocolFound=Firefox doesn't know how to open this address, because one of the following protocols (%S) isn't associated with any program or is not allowed in this context.
+-connectionFailure=Firefox can't establish a connection to the server at %S.
++#expand fileNotFound=__MOZ_APP_DISPLAYNAME__ can't find the file at %S.
++#expand dnsNotFound=__MOZ_APP_DISPLAYNAME__ can't find the server at %S.
++#expand unknownProtocolFound=__MOZ_APP_DISPLAYNAME__ doesn't know how to open this address, because one of the following protocols (%S) isn't associated with any program or is not allowed in this context.
++#expand connectionFailure=__MOZ_APP_DISPLAYNAME__ can't establish a connection to the server at %S.
+ netInterrupt=The connection to %S was interrupted while the page was loading.
+ netTimeout=The server at %S is taking too long to respond.
+-redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete.
++#expand redirectLoop=__MOZ_APP_DISPLAYNAME__ has detected that the server is redirecting the request for this address in a way that will never complete.
+ ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S"
+ confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
+ resendButton.label=Resend
+-unknownSocketType=Firefox doesn't know how to communicate with the server.
++#expand unknownSocketType=__MOZ_APP_DISPLAYNAME__ doesn't know how to communicate with the server.
+ netReset=The connection to the server was reset while the page was loading.
+ notCached=This document is no longer available.
+-netOffline=Firefox is currently in offline mode and can't browse the Web.
++#expand netOffline=__MOZ_APP_DISPLAYNAME__ is currently in offline mode and can't browse the Web.
+ isprinting=The document cannot change while Printing or in Print Preview.
+-deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Firefox has canceled the request for your protection.
+-proxyResolveFailure=Firefox is configured to use a proxy server that can't be found.
+-proxyConnectFailure=Firefox is configured to use a proxy server that is refusing connections.
++#expand deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. __MOZ_APP_DISPLAYNAME__ has canceled the request for your protection.
++#expand proxyResolveFailure=__MOZ_APP_DISPLAYNAME__ is configured to use a proxy server that can't be found.
++#expand proxyConnectFailure=__MOZ_APP_DISPLAYNAME__ is configured to use a proxy server that is refusing connections.
+ contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
+ unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
+ externalProtocolTitle=External Protocol Request
diff --git a/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch b/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch
new file mode 100644
index 0000000..ef31c80
--- /dev/null
+++ b/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch
@@ -0,0 +1,35 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Sun, 11 May 2014 15:08:37 +0900
+Subject: Use "firefox" instead of MOZ_APP_NAME for profile reset
+
+---
+ toolkit/modules/ResetProfile.jsm | 2 +-
+ toolkit/xre/nsAppRunner.cpp      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/toolkit/modules/ResetProfile.jsm b/toolkit/modules/ResetProfile.jsm
+index 52c35c7..af2c0cf 100644
+--- a/toolkit/modules/ResetProfile.jsm
++++ b/toolkit/modules/ResetProfile.jsm
+@@ -11,7 +11,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+ Cu.import("resource://gre/modules/Services.jsm");
+ Cu.import("resource://gre/modules/AppConstants.jsm");
+ 
+-const MOZ_APP_NAME = AppConstants.MOZ_APP_NAME;
++const MOZ_APP_NAME = "firefox";
+ const MOZ_BUILD_APP = AppConstants.MOZ_BUILD_APP;
+ 
+ this.ResetProfile = {
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+index fe63faa..66ca008 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -4132,7 +4132,7 @@ XREMain::XRE_mainRun()
+         if (gDoProfileReset) {
+           // Automatically migrate from the current application if we just
+           // reset the profile.
+-          aKey = MOZ_APP_NAME;
++          aKey = "firefox";
+         }
+         pm->Migrate(&mDirProvider, aKey);
+       }
diff --git a/patches/series b/patches/series
new file mode 100644
index 0000000..6c7dde7
--- /dev/null
+++ b/patches/series
@@ -0,0 +1,3 @@
+iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
+iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch
+iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch