updated to 57.0 branding57.0-157.0

5 files changed, 12 insertions, 13 deletions

diff --git a/release.sh b/release.sh
index cc2c517..a8bb513 100755
--- a/release.sh
+++ b/release.sh
@@ -3,7 +3,7 @@
 set -eu
 
 pkgname=iceweasel
-brandingver=54.0
+brandingver=57.0
 brandingrel=1
 
 srcdir=src
diff --git a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
index 7ce4e48..fd16aa2 100644
--- a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
+++ b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
@@ -10,7 +10,7 @@ diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupe
 index c5ab86b65..c402ab76f 100644
 --- a/browser/installer/allowed-dupes.mn
 +++ b/browser/installer/allowed-dupes.mn
-@@ -208,9 +208,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
+@@ -147,9 +147,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
  components/FxAccountsPush.js
  crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
  crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib
diff --git a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch
index 87b7ae0..115f579 100644
--- a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch
+++ b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch
@@ -12,10 +12,10 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 index 11bfba3..ed817aa 100644
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -5070,9 +5070,7 @@ pref("dom.mapped_arraybuffer.enabled", true);
- // The tables used for Safebrowsing phishing and malware checks.
- pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-malware-simple,test-unwanted-simple");
+@@ -5377,9 +5377,7 @@ pref("dom.mapped_arraybuffer.enabled", t
  
+ // The tables used for Safebrowsing phishing and malware checks
+ pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-harmful-simple,test-malware-simple,test-unwanted-simple");
 -#ifdef MOZILLA_OFFICIAL
 -// In the official build, we are allowed to use google's private
 -// phishing list "goog-phish-shavar". See Bug 1288840.
@@ -27,7 +27,7 @@ diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 index 1c2c13e..7783e9d 100644
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -46,3 +46,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
+@@ -48,3 +48,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
  FINAL_TARGET_PP_FILES += [
      'greprefs.js',
  ]
diff --git a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
index 22e21fa..022cde7 100644
--- a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
+++ b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
@@ -2,7 +2,7 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 index 894e3e0..73f5378 100644
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -19,6 +19,8 @@ SUBMAKEFILES += \
+@@ -11,6 +11,8 @@ SUBMAKEFILES += \
  	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
  	$(NULL)
  
@@ -18,14 +18,13 @@ index 05cf816..5301b0b 100644
 @@ -3,25 +3,25 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
- malformedURI=The URL is not valid and cannot be loaded.
+ malformedURI2=Please check that the URL is correct and try again.
 -fileNotFound=Firefox can’t find the file at %S.
 +#expand fileNotFound=__MOZ_APP_DISPLAYNAME__ can’t find the file at %S.
  fileAccessDenied=The file at %S is not readable.
--dnsNotFound=Firefox can’t find the server at %S.
+ dnsNotFound2=We can’t connect to 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 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.
@@ -51,7 +50,7 @@ index 05cf816..5301b0b 100644
  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
-@@ -35,7 +35,7 @@ unwantedBlocked=The site at %S has been
+@@ -36,7 +36,7 @@ unwantedBlocked=The site at %S has been
  deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences.
  cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
  corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
diff --git a/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch b/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch
index ef31c80..7510261 100644
--- a/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch
+++ b/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch
@@ -24,12 +24,12 @@ 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()
+@@ -4482,7 +4482,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);
+         pm->Migrate(&mDirProvider, aKey, gResetOldProfileName);
        }