libre/iceweasel: updated to 57.0

7 files changed, 122 insertions, 357 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 8305ac427..952569737 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -19,9 +19,9 @@ _oldname=firefox
 pkgname=iceweasel
 
 epoch=1
-pkgver=56.0.2
-pkgrel=3
-_brandingver=54.0
+pkgver=57.0
+pkgrel=1
+_brandingver=57.0
 _brandingrel=1
 _parabolarepo=https://repo.parabola.nu/other/iceweasel
 arch=(i686 x86_64 armv7h)
@@ -63,27 +63,25 @@ source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname
         no-crmf.patch
         mozilla-build-arm.patch
         wifi-disentangle.patch
-        wifi-fix-interface.patch
-        glibc-2.26-fix.diff)
-sha256sums=('6f7d284c31383a9860d7b52f05f866526d5a7c31e3ef2959d79122ba074f5ca1'
-            '03191fa14ab599695b26361f2de6e93fbb518f24142689496480d78976cc52cb'
+        wifi-fix-interface.patch)
+sha256sums=('603af00155be87f2c9c58047dd0072971f1cdab1f632695aae6ad072efefbb8f'
+            'e93f2363d7b414d207250eb1c63d955681f158c8d5678ef3d2e9232cdb0382c7'
             'SKIP'
-            'f448c1857a954b3b7e7af07c4dcea43e2bc73ff88dd8f2eada0ad16a40cb4eb6'
-            'ca7c59ca3c4f4240e0614562286085ede667986b2d1ffba044b29b0e310e626b'
-            '32f1fe3ad4f80d0ae419064db2abe49b97cd7cb18c35d68be1a2befb60172a2a'
+            '71e20557568330c29553201a6009060feb65921b021fff8053ad9f7cb67670fa'
+            'a2178c90d9ebb990990226d9ffdb6f94e20c7d6f9e00925fb42cf0df5c634bd9'
+            '6e23fe534394bbab0041f5935cd23c2590285f7541b0a10f3042905676b1561e'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
             '250f7aaa3c1362f9d2bb2211cd605eab93a5e806e8540f184979d41acf46142a'
             '46e588300797bda599c8f5157437fd79f88b6e1179f2fde49e0405e435e03efa'
             '085b968e613a5aadbc8cbec20f4db80d76c4fd7cfe75642babefa6385663cbb5'
             'd28b14a870aa100273243039d08ab9e64d325c28b6291413441146ebdf5d38ee'
-            'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484'
+            'ce1765c7812da53dc555103d54998d57890def127aa034b37f21dbfab65dde65'
             'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65'
-            '2f8064a67c025d306f14fdd83c0ecae8d256231ec76a98150acd89162d40c3e1'
+            'c0ceaaa83a0c79035cdb39b6c130064409dffa546ae2d576fa061b52e4a0392f'
             '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a'
             'f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed'
-            'e98a3453d803cc7ddcb81a7dc83f883230dd8591bdf936fc5a868428979ed1f1'
-            'cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8')
+            'e98a3453d803cc7ddcb81a7dc83f883230dd8591bdf936fc5a868428979ed1f1')
 validpgpkeys=(
               'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin
 )
@@ -143,10 +141,6 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
   patch -Np1 -i "$srcdir/no-crmf.patch"
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1385667
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1394149
-  patch -Np1 -i ../glibc-2.26-fix.diff
-
   mkdir "$srcdir/path"
   ln -s /usr/bin/python2 "$srcdir/path/python"
 
diff --git a/libre/iceweasel/enable-object-directory-paths.patch b/libre/iceweasel/enable-object-directory-paths.patch
index bc938c66e..7cfbdd326 100644
--- a/libre/iceweasel/enable-object-directory-paths.patch
+++ b/libre/iceweasel/enable-object-directory-paths.patch
@@ -2,7 +2,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozb
 index 41ae8ae..dcc3263 100644
 --- a/python/mozbuild/mozbuild/frontend/context.py
 +++ b/python/mozbuild/mozbuild/frontend/context.py
-@@ -408,8 +408,6 @@ class Path(ContextDerivedValue, unicode):
+@@ -468,8 +468,6 @@ class Path(ContextDerivedValue, unicode):
  class SourcePath(Path):
      """Like Path, but limited to paths in the source directory."""
      def __init__(self, context, value):
diff --git a/libre/iceweasel/glibc-2.26-fix.diff b/libre/iceweasel/glibc-2.26-fix.diff
deleted file mode 100644
index 48733ab89..000000000
--- a/libre/iceweasel/glibc-2.26-fix.diff
+++ /dev/null
@@ -1,258 +0,0 @@
-From 6a0b7c8ecf0734ba1bcdccf8e0ee97e721fd5420 Mon Sep 17 00:00:00 2001
-Message-Id: <6a0b7c8ecf0734ba1bcdccf8e0ee97e721fd5420.1505113337.git.jan.steffens@gmail.com>
-From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
-Date: Sat, 19 Aug 2017 20:14:25 +0200
-Subject: [PATCH] Fix use of struct ucontext (squash 2 commits)
-
-Needed for building with glibc 2.26.
-
-Bug 1385667: Use ucontext_t consistently in breakpad-client. r=ted
-MozReview-Commit-ID: AJhzJdNXP0f
-
-Bug 1394149: Fix remaining uses of ucontext in breakpad-client. r=ted
-MozReview-Commit-ID: 5tP7fXsI7dQ
----
- .../linux/dump_writer_common/ucontext_reader.cc    | 30 +++++++++++-----------
- .../linux/dump_writer_common/ucontext_reader.h     | 10 ++++----
- .../linux/handler/exception_handler.cc             | 10 ++++----
- .../linux/handler/exception_handler.h              |  2 +-
- .../linux/microdump_writer/microdump_writer.cc     |  2 +-
- .../linux/minidump_writer/minidump_writer.cc       |  2 +-
- 6 files changed, 28 insertions(+), 28 deletions(-)
-
-diff --git a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc
-index 999960912e459e1b..303c0ebd32b663c4 100644
---- a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc
-@@ -40,15 +40,15 @@ namespace google_breakpad {
- 
- #if defined(__i386__)
- 
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.gregs[REG_ESP];
- }
- 
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.gregs[REG_EIP];
- }
- 
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                                     const struct _libc_fpstate* fp) {
-   const greg_t* regs = uc->uc_mcontext.gregs;
- 
-@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
- 
- #elif defined(__x86_64)
- 
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.gregs[REG_RSP];
- }
- 
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.gregs[REG_RIP];
- }
- 
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                                     const struct _libc_fpstate* fpregs) {
-   const greg_t* regs = uc->uc_mcontext.gregs;
- 
-@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
- 
- #elif defined(__ARM_EABI__)
- 
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.arm_sp;
- }
- 
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.arm_pc;
- }
- 
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
-   out->context_flags = MD_CONTEXT_ARM_FULL;
- 
-   out->iregs[0] = uc->uc_mcontext.arm_r0;
-@@ -184,41 +184,41 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
- 
- #elif defined(__aarch64__)
- 
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.sp;
- }
- 
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.pc;
- }
- 
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                                     const struct fpsimd_context* fpregs) {
-   out->context_flags = MD_CONTEXT_ARM64_FULL;
- 
-   out->cpsr = static_cast<uint32_t>(uc->uc_mcontext.pstate);
-   for (int i = 0; i < MD_CONTEXT_ARM64_REG_SP; ++i)
-     out->iregs[i] = uc->uc_mcontext.regs[i];
-   out->iregs[MD_CONTEXT_ARM64_REG_SP] = uc->uc_mcontext.sp;
-   out->iregs[MD_CONTEXT_ARM64_REG_PC] = uc->uc_mcontext.pc;
- 
-   out->float_save.fpsr = fpregs->fpsr;
-   out->float_save.fpcr = fpregs->fpcr;
-   my_memcpy(&out->float_save.regs, &fpregs->vregs,
-       MD_FLOATINGSAVEAREA_ARM64_FPR_COUNT * 16);
- }
- 
- #elif defined(__mips__)
- 
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
- }
- 
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-   return uc->uc_mcontext.pc;
- }
- 
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- #if _MIPS_SIM == _ABI64
-   out->context_flags = MD_CONTEXT_MIPS64_FULL;
- #elif _MIPS_SIM == _ABIO32
-diff --git a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h
-index c533e28ba7441e83..039752a2dfb6e589 100644
---- a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h
-+++ b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h
-@@ -41,21 +41,21 @@ namespace google_breakpad {
- 
- // Wraps platform-dependent implementations of accessors to ucontext structs.
- struct UContextReader {
--  static uintptr_t GetStackPointer(const struct ucontext* uc);
-+  static uintptr_t GetStackPointer(const ucontext_t* uc);
- 
--  static uintptr_t GetInstructionPointer(const struct ucontext* uc);
-+  static uintptr_t GetInstructionPointer(const ucontext_t* uc);
- 
-   // Juggle a arch-specific ucontext into a minidump format
-   //   out: the minidump structure
-   //   info: the collection of register structures.
- #if defined(__i386__) || defined(__x86_64)
--  static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                              const struct _libc_fpstate* fp);
- #elif defined(__aarch64__)
--  static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                              const struct fpsimd_context* fpregs);
- #else
--  static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
-+  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
- #endif
- };
- 
-diff --git a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc
-index 71a51a763938e39d..12df9bc96ec45fea 100644
---- a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc
-+++ b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc
-@@ -439,44 +439,44 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) {
-   // Fill in all the holes in the struct to make Valgrind happy.
-   memset(&g_crash_context_, 0, sizeof(g_crash_context_));
-   memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
--  memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
-+  memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
- #if defined(__aarch64__)
--  struct ucontext* uc_ptr = (struct ucontext*)uc;
-+  ucontext_t* uc_ptr = (ucontext_t*)uc;
-   struct fpsimd_context* fp_ptr =
-       (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
-   if (fp_ptr->head.magic == FPSIMD_MAGIC) {
-     memcpy(&g_crash_context_.float_state, fp_ptr,
-            sizeof(g_crash_context_.float_state));
-   }
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
-   // FP state is not part of user ABI on ARM Linux.
--  // In case of MIPS Linux FP state is already part of struct ucontext
-+  // In case of MIPS Linux FP state is already part of ucontext_t
-   // and 'float_state' is not a member of CrashContext.
--  struct ucontext* uc_ptr = (struct ucontext*)uc;
-+  ucontext_t* uc_ptr = (ucontext_t*)uc;
-   if (uc_ptr->uc_mcontext.fpregs) {
-     memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
-            sizeof(g_crash_context_.float_state));
-   }
- #endif
-   g_crash_context_.tid = syscall(__NR_gettid);
-   if (crash_handler_ != NULL) {
-     if (crash_handler_(&g_crash_context_, sizeof(g_crash_context_),
-                        callback_context_)) {
-       return true;
-     }
-   }
-   return GenerateDump(&g_crash_context_);
- }
- 
- // This is a public interface to HandleSignal that allows the client to
- // generate a crash dump. This function may run in a compromised context.
- bool ExceptionHandler::SimulateSignalDelivery(int sig) {
-   siginfo_t siginfo = {};
-   // Mimic a trusted signal to allow tracing the process (see
-   // ExceptionHandler::HandleSignal().
-   siginfo.si_code = SI_USER;
-   siginfo.si_pid = getpid();
--  struct ucontext context;
-+  ucontext_t context;
-   getcontext(&context);
-   return HandleSignal(sig, &siginfo, &context);
- }
-diff --git a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h
-index 711586fec7ddae59..be1880170e2826b0 100644
---- a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h
-+++ b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h
-@@ -191,7 +191,7 @@ class ExceptionHandler {
-   struct CrashContext {
-     siginfo_t siginfo;
-     pid_t tid;  // the crashing thread.
--    struct ucontext context;
-+    ucontext_t context;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
-     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
-     // In case of MIPS Linux FP state is already part of struct
-diff --git a/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc b/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc
-index ff20bf36584c876b..a0b90e08fc5f0cff 100644
---- a/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc
-+++ b/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc
-@@ -571,7 +571,7 @@ class MicrodumpWriter {
- 
-   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
- 
--  const struct ucontext* const ucontext_;
-+  const ucontext_t* const ucontext_;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
-   const google_breakpad::fpstate_t* const float_state_;
- #endif
-diff --git a/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc
-index 0650bb95c179464a..6b5304bcd605ca3a 100644
---- a/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc
-+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc
-@@ -1247,7 +1247,7 @@ class MinidumpWriter {
-   const int fd_;  // File descriptor where the minidum should be written.
-   const char* path_;  // Path to the file where the minidum should be written.
- 
--  const struct ucontext* const ucontext_;  // also from the signal handler
-+  const ucontext_t* const ucontext_;  // also from the signal handler
- #if !defined(__ARM_EABI__) && !defined(__mips__)
-   const google_breakpad::fpstate_t* const float_state_;  // ditto
- #endif
--- 
-2.14.1
-
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index ac2694740..41f16dd08 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -2,34 +2,27 @@ diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content
 index c0b02e257..dc726d41a 100644
 --- a/browser/base/content/abouthome/aboutHome.css
 +++ b/browser/base/content/abouthome/aboutHome.css
-@@ -354,26 +354,46 @@ body[narrow] #restorePreviousSession::before {
+@@ -310,6 +310,48 @@ body[narrow] #restorePreviousSession::be
    width: 32px;
  }
  
--#aboutMozilla {
 +#aboutGNU {
-   display: block;
--  position: relative; /* pin wordmark to edge of document, not of viewport */
-   -moz-box-ordinal-group: 0;
-   opacity: .2;
-   transition: opacity 150ms;
- }
- 
--#aboutMozilla:hover {
++  display: block;
++  -moz-box-ordinal-group: 0;
++  opacity: .2;
++  transition: opacity 150ms;
++}
++
 +#aboutGNU:hover {
-   opacity: .6;
- }
- 
--#aboutMozilla::before {
--  content: url("chrome://browser/content/abouthome/mozilla.svg");
++  opacity: .6;
++}
++
 +#aboutGNU::before {
 +  content: url("chrome://browser/content/abouthome/gnu_headshadow.png");
-   display: block;
-   position: absolute;
-   top: 12px;
-   offset-inline-end: 12px;
--  width: 67px;
--  height: 19px;
++  display: block;
++  position: absolute;
++  top: 12px;
++  offset-inline-end: 12px;
 +  width: 200px;
 +  height: 110px;
 +}
@@ -53,9 +46,11 @@ index c0b02e257..dc726d41a 100644
 +  left: 12px;
 +  width: 120px;
 +  height: 120px;
- }
- 
++}
++
  /* [HiDPI]
+  * At resolutions above 1dppx, prefer downscaling the 2x Retina graphics
+  * rather than upscaling the original-size ones (bug 818940).
 diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
 index 50f3e01cd..5df008555 100644
 --- a/browser/base/content/abouthome/aboutHome.js
@@ -84,7 +79,7 @@ diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/conte
 index c288e732e..6d14ee773 100644
 --- a/browser/base/content/abouthome/aboutHome.xhtml
 +++ b/browser/base/content/abouthome/aboutHome.xhtml
-@@ -48,10 +48,6 @@
+@@ -49,10 +49,6 @@
        </div>
  
        <div id="snippetContainer">
@@ -95,12 +90,10 @@ index c288e732e..6d14ee773 100644
          <span id="rightsSnippet" hidden="true">&abouthome.rightsSnippet;</span>
          <div id="snippets"/>
        </div>
-@@ -73,7 +69,7 @@
+@@ -73,5 +69,7 @@
+       <div id="restorePreviousSessionSeparator"/>
        <button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>
      </div>
- 
--    <a id="aboutMozilla" href="https://www.mozilla.org/about/?utm_source=about-home&amp;utm_medium=Referral"
--       aria-label="&abouthome.aboutMozilla.label;"/>
 +    <a id="aboutGNU" href="https://www.gnu.org"></a>
 +    <a id="aboutDRMfree" href="https://www.defectivebydesign.org/drm-free"></a>
    </body>
@@ -109,11 +102,10 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 index 4dcd47c95..219019b20 100644
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -31,7 +31,8 @@ browser.jar:
+@@ -27,6 +27,8 @@ browser.jar:
          content/browser/abouthome/settings.png        (content/abouthome/settings.png)
          content/browser/abouthome/restore.png         (content/abouthome/restore.png)
          content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
--        content/browser/abouthome/mozilla.svg         (content/abouthome/mozilla.svg)
 +        content/browser/abouthome/gnu_headshadow.png  (content/abouthome/gnu_headshadow.png)
 +        content/browser/abouthome/drm-free.png        (content/abouthome/drm-free.png)
          content/browser/abouthome/snippet1@2x.png      (content/abouthome/snippet1@2x.png)
@@ -262,11 +254,12 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 index eff09189b..6d76d20f0 100644
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -93,11 +93,6 @@
+@@ -97,12 +97,6 @@
      locale/browser/searchplugins/               (.deps/generated_@AB_CD@/*.xml)
      locale/browser/searchplugins/list.json      (.deps/generated_@AB_CD@/list.json)
  #endif
 -    locale/browser/searchplugins/images/amazon.ico     (searchplugins/images/amazon.ico)
+-    locale/browser/searchplugins/images/ebay.ico       (searchplugins/images/ebay.ico)
 -    locale/browser/searchplugins/images/wikipedia.ico  (searchplugins/images/wikipedia.ico)
 -    locale/browser/searchplugins/images/yahoo.ico      (searchplugins/images/yahoo.ico)
 -    locale/browser/searchplugins/images/yandex-en.ico  (searchplugins/images/yandex-en.ico)
@@ -278,7 +271,7 @@ diff --git a/browser/locales/search/list.json b/browser/locales/search/list.json
 index 544740a43..4961e5437 100644
 --- a/browser/locales/search/list.json
 +++ b/browser/locales/search/list.json
-@@ -1,753 +1,734 @@
+@@ -1,802 +1,748 @@
  {
    "default": {
      "visibleDefaultEngines": [
@@ -291,7 +284,9 @@ index 544740a43..4961e5437 100644
 -      "google": "google-nocodes"
      },
      "CA": {
--      "google": "google-nocodes"
+-      "google": "google-nocodes",
+-      "ebay": "ebay-ca",
+-      "ebay-fr": "ebay-ca"
      },
      "KZ": {
 -      "google": "google-nocodes"
@@ -313,18 +308,45 @@ index 544740a43..4961e5437 100644
      },
      "HK": {
 -      "google": "google-nocodes"
+     },
+     "AT": {
+-      "ebay-de": "ebay-at"
+     },
+     "AU": {
+-      "ebay": "ebay-au",
+-      "ebay-uk": "ebay-au"
+     },
+     "BE": {
+-      "ebay": "ebay-be",
+-      "ebay-nl": "ebay-be",
+-      "ebay-fr": "ebay-be"
+     },
+     "CH": {
+-      "ebay": "ebay-ch",
+-      "ebay-de": "ebay-ch",
+-      "ebay-fr": "ebay-ch"
+     },
+     "IE": {
+-      "ebay": "ebay-ie",
+-      "ebay-uk": "ebay-ie"
+     },
+     "NL": {
+-      "ebay": "ebay-nl"
+     },
+     "GB": {
+-      "ebay": "ebay-uk"
      }
    },
    "locales": {
      "en-US": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazondotcom", "bing", "ddg", "twitter", "wikipedia"
+-          "google", "yahoo", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
 -        ]
 -      },
 -      "experimental-hidden": {
 -        "visibleDefaultEngines": [
--          "yahoo-en-CA", "yandex-en"
+-          "amazon-ca", "amazon-au", "google-2018", "yahoo-en-CA", "yandex-en"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -348,7 +370,7 @@ index 544740a43..4961e5437 100644
      "an": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "bing", "wikipedia-an", "ddg", "twitter"
+-          "google", "yahoo-es", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -372,7 +394,7 @@ index 544740a43..4961e5437 100644
      "ast": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "bing", "diccionariu-alla", "ddg", "wikipedia-ast"
+-          "google", "yahoo-es", "bing", "diccionariu-alla", "ddg", "ebay-es", "wikipedia-ast"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -396,7 +418,7 @@ index 544740a43..4961e5437 100644
      "bg": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "diribg", "amazondotcom", "ddg", "portalbgdict", "wikipedia-bg"
+-          "google", "amazondotcom", "ddg", "portalbgdict", "wikipedia-bg"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -420,7 +442,7 @@ index 544740a43..4961e5437 100644
      "br": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "amazon-france", "ddg", "freelang", "klask", "wikipedia-br"
+-          "google", "yahoo-france", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -436,7 +458,7 @@ index 544740a43..4961e5437 100644
      "ca": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "diec2", "ddg", "twitter", "wikipedia-ca"
+-          "google", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -460,7 +482,7 @@ index 544740a43..4961e5437 100644
      "cy": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "palasprint", "termau", "wikipedia-cy"
+-          "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "termau", "wikipedia-cy"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -476,7 +498,7 @@ index 544740a43..4961e5437 100644
      "de": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-de", "amazondotcom-de", "bing", "ddg", "leo_ende_de", "wikipedia-de"
+-          "google", "yahoo-de", "amazondotcom-de", "bing", "ddg", "ebay-de", "leo_ende_de", "wikipedia-de"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -484,7 +506,7 @@ index 544740a43..4961e5437 100644
      "dsb": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "leo_ende_de", "wikipedia-dsb"
+-          "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -500,7 +522,7 @@ index 544740a43..4961e5437 100644
      "en-GB": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "twitter", "wikipedia"
+-          "google", "yahoo-en-GB", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -545,7 +567,7 @@ index 544740a43..4961e5437 100644
      "es-ES": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "bing", "drae", "ddg", "twitter", "wikipedia-es"
+-          "google", "yahoo-es", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -554,6 +576,11 @@ index 544740a43..4961e5437 100644
        "default": {
          "visibleDefaultEngines": [
 -          "google", "yahoo-mx", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
+-        ]
+-      },
+-      "experimental-hidden": {
+-        "visibleDefaultEngines": [
+-          "amazon-mx"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -569,7 +596,7 @@ index 544740a43..4961e5437 100644
      "eu": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazon-en-GB", "ddg", "elebila", "wikipedia-eu"
+-          "google", "yahoo", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -601,7 +628,7 @@ index 544740a43..4961e5437 100644
      "fr": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
+-          "google", "yahoo-france", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "wikipedia-fr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -609,7 +636,12 @@ index 544740a43..4961e5437 100644
      "fy-NL": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-fy-NL", "bing", "bolcom-fy-NL", "ddg", "marktplaats-fy-NL", "wikipedia-fy-NL"
+-          "google", "yahoo-fy-NL", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL"
+-        ]
+-      },
+-      "experimental-hidden": {
+-        "visibleDefaultEngines": [
+-          "amazon-nl"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -617,7 +649,7 @@ index 544740a43..4961e5437 100644
      "ga-IE": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "tearma", "twitter", "wikipedia-ga-IE"
+-          "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -625,7 +657,7 @@ index 544740a43..4961e5437 100644
      "gd": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "faclair-beag", "amazon-en-GB", "bbc-alba", "ddg", "wikipedia-gd"
+-          "google", "yahoo-en-GB", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -633,7 +665,7 @@ index 544740a43..4961e5437 100644
      "gl": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "amazon-en-GB", "ddg", "wikipedia-gl"
+-          "google", "yahoo-es", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -681,7 +713,7 @@ index 544740a43..4961e5437 100644
      "hsb": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "leo_ende_de", "wikipedia-hsb"
+-          "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -721,7 +753,7 @@ index 544740a43..4961e5437 100644
      "it": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-it", "bing", "amazon-it", "ddg", "hoepli", "wikipedia-it"
+-          "google", "yahoo-it", "bing", "amazon-it", "ddg", "ebay-it", "hoepli", "wikipedia-it"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -793,7 +825,7 @@ index 544740a43..4961e5437 100644
      "lij": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-it", "bing", "amazon-it", "ddg", "paroledigenova-lij", "wikipedia-lij"
+-          "google", "yahoo-it", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -897,7 +929,12 @@ index 544740a43..4961e5437 100644
      "nl": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "bing", "bolcom-nl", "ddg", "marktplaats-nl", "wikipedia-nl"
+-          "google", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl"
+-        ]
+-      },
+-      "experimental-hidden": {
+-        "visibleDefaultEngines": [
+-          "amazon-nl"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -938,6 +975,11 @@ index 544740a43..4961e5437 100644
        "default": {
          "visibleDefaultEngines": [
 -          "google", "yahoo-br", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
+-        ]
+-      },
+-      "experimental-hidden": {
+-        "visibleDefaultEngines": [
+-          "amazon-br"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -953,7 +995,7 @@ index 544740a43..4961e5437 100644
      "rm": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-ch", "bing", "ddg", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm"
+-          "google", "yahoo-ch", "bing", "ddg", "ebay-ch", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1164,15 +1206,15 @@ diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales
 index 6097fa82a..3dfe372db 100644
 --- a/devtools/client/locales/en-US/toolbox.dtd
 +++ b/devtools/client/locales/en-US/toolbox.dtd
-@@ -93,7 +93,7 @@
+@@ -80,7 +80,7 @@
    -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
    -  boolean preference in about:config, in the options panel. -->
  <!ENTITY options.enableRemote.label3    "Enable remote debugging">
 -<!ENTITY options.enableRemote.tooltip2  "Turning this option on will allow the developer tools to debug a remote instance like Firefox OS">
 +<!ENTITY options.enableRemote.tooltip2  "Turning this option on will allow the developer tools to debug a remote instance like Iceweasel OS">
  
- <!-- LOCALIZATION NOTE (options.enableWorkers.label): This is the label for the
-   -  checkbox that toggles worker debugging, i.e. devtools.debugger.workers
+ <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
+   -  options.disableJavaScript.tooltip): This is the options panel label and
 diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd
 index 5e1a80ccd..8f375da2e 100644
 --- a/devtools/client/locales/en-US/webide.dtd
@@ -1186,7 +1228,7 @@ index 5e1a80ccd..8f375da2e 100644
  
  <!ENTITY projectMenu_label "Project">
  <!ENTITY projectMenu_accesskey "P">
-@@ -59,7 +59,7 @@
+@@ -55,7 +55,7 @@
  <!ENTITY projectButton_label "Open App">
  <!ENTITY runtimeButton_label "Select Runtime">
  
@@ -1210,16 +1252,3 @@ index 2368ad7f1..05e39c74f 100644
  
  runtimeButton_label=Select Runtime
  projectButton_label=Open App
-@@ -54,10 +54,10 @@ error_runtimeVersionTooRecent=The connected runtime has a more recent build date
- addons_stable=stable
- addons_unstable=unstable
- # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of
--# a given simulator version in the "Manage Simulators" pane.  %1$S: Firefox OS
-+# a given simulator version in the "Manage Simulators" pane.  %1$S: Iceweasel OS
- # version in the simulator, ex. 1.3.  %2$S: Simulator stability label, ex.
- # "stable" or "unstable".
--addons_simulator_label=Firefox OS %1$S Simulator (%2$S)
-+addons_simulator_label=Iceweasel OS %1$S Simulator (%2$S)
- addons_install_button=install
- addons_uninstall_button=uninstall
- addons_adb_label=ADB Helper Add-on
diff --git a/libre/iceweasel/mozconfig b/libre/iceweasel/mozconfig
index c38c05444..608676753 100644
--- a/libre/iceweasel/mozconfig
+++ b/libre/iceweasel/mozconfig
@@ -34,8 +34,8 @@ STRIP_FLAGS="--strip-debug"
 
 # Parabola features
 ac_add_options --with-distribution-id=nu.parabola
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-url-classifier
+#ac_add_options --disable-safe-browsing
+#ac_add_options --disable-url-classifier
 ac_add_options --disable-eme
 
 # vim:set ft=sh:
diff --git a/libre/iceweasel/no-crmf.patch b/libre/iceweasel/no-crmf.patch
index 83525f6a9..9d4e5f17f 100644
--- a/libre/iceweasel/no-crmf.patch
+++ b/libre/iceweasel/no-crmf.patch
@@ -2,8 +2,8 @@ diff --git i/old-configure.in w/old-configure.in
 index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
 --- i/old-configure.in
 +++ w/old-configure.in
-@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
-     AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+@@ -1906,9 +1906,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
+     AM_PATH_NSS(3.33, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
  fi
  
 -if test -n "$MOZ_SYSTEM_NSS"; then
diff --git a/libre/iceweasel/remove-default-and-shell-icons-in-packaging-manifest.patch b/libre/iceweasel/remove-default-and-shell-icons-in-packaging-manifest.patch
index 6bc67b30a..f46f46d14 100644
--- a/libre/iceweasel/remove-default-and-shell-icons-in-packaging-manifest.patch
+++ b/libre/iceweasel/remove-default-and-shell-icons-in-packaging-manifest.patch
@@ -2,7 +2,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
 index cffcff1..85d28cc 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -653,11 +653,6 @@
+@@ -621,11 +621,6 @@
  @RESPATH@/chrome/toolkit.manifest
  @RESPATH@/chrome/recording.manifest
  @RESPATH@/chrome/recording/*
@@ -14,9 +14,9 @@ index cffcff1..85d28cc 100644
  @RESPATH@/browser/features/*
  
  ; [Webide Files]
-@@ -670,17 +665,10 @@
- @RESPATH@/browser/chrome/devtools.manifest
+@@ -644,17 +639,10 @@
  @RESPATH@/browser/@PREF_DIR@/devtools.js
+ @RESPATH@/browser/@PREF_DIR@/debugger.js
  
 -; shell icons
 -#ifdef XP_UNIX