importing 49.0-1 sources from https://repomirror.parabola.nu/other/iceweasel/iceweasel_49.0-1.branding.tar.xz49.0-1

3 files changed, 14 insertions, 14 deletions

diff --git a/release.sh b/release.sh
index 327ad71..a10fb26 100755
--- a/release.sh
+++ b/release.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-pkgver=45.0
+pkgver=49.0
 pkgrel=1
 
 srcdir=src
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 3fb154f..451054a 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
@@ -1,5 +1,5 @@
-From: Mike Hommey <mh@glandium.org>
-Date: Thu, 1 Apr 2010 15:34:59 +0200
+From: André Silva <emulatorman@parabola.nu>
+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',
  ]
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 97ed821..5f46769 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
@@ -1,5 +1,5 @@
 From: André Silva <emulatorman@parabola.nu>
-Date: Sat, 04 Aug 2016 06:13:13 +0100
+Date: Wed, 21 Sep 2016 22:48:27 -0300
 Subject: Use MOZ_APP_DISPLAYNAME to fill appstrings.properties
 
 ---
@@ -8,7 +8,7 @@ Subject: Use MOZ_APP_DISPLAYNAME to fill appstrings.properties
  2 files changed, 15 insertions(+), 13 deletions(-)
 
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
-index 76c4af8..440c1a6 100644
+index 894e3e0..73f5378 100644
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
 @@ -19,6 +19,8 @@ SUBMAKEFILES += \
@@ -21,7 +21,7 @@ index 76c4af8..440c1a6 100644
  # 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 ea6f26c..6412e39 100644
+index 05cf816..5301b0b 100644
 --- a/browser/locales/en-US/chrome/overrides/appstrings.properties
 +++ b/browser/locales/en-US/chrome/overrides/appstrings.properties
 @@ -3,25 +3,25 @@
@@ -63,7 +63,7 @@ index ea6f26c..6412e39 100644
 @@ -36,9 +36,9 @@ deceptiveBlocked=This web page at %S has been reported as a deceptive site and h
  forbiddenBlocked=The site at %S has been blocked by your browser configuration.
  cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
- corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
+ corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
 -remoteXUL=This page uses an unsupported technology that is no longer available by default in Firefox.
 +#expand remoteXUL=This page uses an unsupported technology that is no longer available by default in __MOZ_APP_DISPLAYNAME__.
  ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".