Fix build: added rust patch for i686, also use glibc patch like in extra. Disabled hardening.

7 files changed, 258 insertions, 124 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72cb0185da72..009c86d181f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = firefox-esr
 	pkgdesc = Standalone web browser from mozilla.org, Extended Support Release
 	pkgver = 52.3.0
-	pkgrel = 5
+	pkgrel = 6
 	url = https://www.mozilla.org/en-US/firefox/organizations/
 	arch = i686
 	arch = x86_64
@@ -20,7 +20,7 @@ pkgbase = firefox-esr
 	makedepends = inetutils
 	makedepends = xorg-server-xvfb
 	makedepends = autoconf2.13
-	makedepends = cargo
+	makedepends = rust
 	depends = gtk3
 	depends = gtk2
 	depends = mozilla-common
@@ -47,26 +47,27 @@ pkgbase = firefox-esr
 	source = https://ftp.mozilla.org/pub/firefox/releases/52.3.0esr/source/firefox-52.3.0esr.source.tar.xz
 	source = firefox.desktop
 	source = firefox-symbolic.svg
-	source = 0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
 	source = 0001-Bug-54395-remove-hardcoded-flag-lcrmf.patch
 	source = firefox-install-dir.patch
 	source = fix-wifi-scanner.diff
-	source = use-noexcept-instead-of-an-exception-specification-in-mozalloc.patch
-	source = breakpad-still-uses-struct-ucontext-in-ucontext_reader-cc.patch
+	source = glibc-2.26-fix.diff
 	source = clip-ft-glyph.diff
 	source = harmony-fix.diff
+	source = rust-i686.patch
+	source = make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
 	validpgpkeys = 2B90598A745E992F315E22C58AB132963A06537A
 	sha256sums = c16bc86d6cb8c2199ed1435ab80a9ae65f9324c820ea0eeb38bf89a97d253b5b
 	sha256sums = c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826
 	sha256sums = a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9
-	sha256sums = 413cd6d366d78f325d80ebebccfd0afa0d266b40b2e54b66ba2fa03c15f3ea67
 	sha256sums = 93c495526c1a1227f76dda5f3a43b433bc7cf217aaf74bd06b8fc187d285f593
 	sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd
 	sha256sums = 9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8
 	sha256sums = 37e127dbed0285dc48e8033959a84e241c3e5cf0ce9544a172e640b54d3dfe0e
-	sha256sums = 1fe3b7f8b14f1978b96866f983d16709581d9df389fb46881fa63f080d036931
+	sha256sums = cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8
 	sha256sums = dc4feddbf22ea11ae2513c68b7f3fc9047850d055a7f30d31a7ee94d7d5de12a
 	sha256sums = 8ed42e75b577d57e4b07f1d70137cb8e82f757abb616f1cfea694a041ad5679e
+	sha256sums = f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269
+	sha256sums = 7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9
 
 pkgname = firefox-esr
 
diff --git a/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch b/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
deleted file mode 100644
index cf2e0eb9b80b..000000000000
--- a/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From bbd48a5613c872883616884cfaf41665b0e4ec9b Mon Sep 17 00:00:00 2001
-From: Ralph Giles <giles@mozilla.com>
-Date: Fri, 10 Feb 2017 12:58:18 -0800
-Subject: [PATCH] Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj
-
-We use the cheddar crate to generate a C header file
-for our mp4parse_capi wrapper crate. Currently we
-do this at code check-in time via update-rust.sh.
-
-Cargo 0.18 and later will try to execute a build.rs
-file in the crate source tree regardless of whether
-it's specified in Cargo.toml so patching out that
-line just results in 'crate cheddar not found'.
-
-This change restores the old behaviour by substituting
-a 'build = false' line instead.
-
-We do have syntex vendored, but we don't currently build
-it by default, so I prefer this solution to just vendoring
-cheddar and generating the header at build time. The syntex
-crate is quite large and adds significantly to our compile
-time.
-
-MozReview-Commit-ID: InJRRODWAdP
-
---HG--
-extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e
----
- media/libstagefright/binding/mp4parse-cargo.patch     | 5 +++--
- media/libstagefright/binding/mp4parse_capi/Cargo.toml | 2 ++
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-index aee7ee947151a27c..d7e3f55119d3f4b6 100644
---- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-+++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-@@ -18,6 +18,8 @@ exclude = [
-   "*.mp4",
- ]
- 
-+build = false
-+
- [dependencies]
- byteorder = "1.0.0"
- "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
--- 
-2.12.2
-
diff --git a/PKGBUILD b/PKGBUILD
index afa5ac0f1ad3..926396bdf6c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=firefox-esr
 pkgver=52.3.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release"
 arch=(i686 x86_64)
 license=(MPL GPL LGPL)
@@ -13,7 +13,7 @@ url="https://www.mozilla.org/en-US/firefox/organizations/"
 depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib ffmpeg
          libvpx libevent nss hunspell sqlite ttf-font icu)
 makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutils xorg-server-xvfb
-             autoconf2.13 cargo)
+             autoconf2.13 rust)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'speech-dispatcher: Text-to-Speech')
@@ -22,24 +22,25 @@ conflicts=(firefox)
 options=(!emptydirs !makeflags)
 source=(https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz
         firefox.desktop firefox-symbolic.svg
-        0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
         0001-Bug-54395-remove-hardcoded-flag-lcrmf.patch
         firefox-install-dir.patch fix-wifi-scanner.diff
-		use-noexcept-instead-of-an-exception-specification-in-mozalloc.patch
-		breakpad-still-uses-struct-ucontext-in-ucontext_reader-cc.patch
+		glibc-2.26-fix.diff
 		clip-ft-glyph.diff
-		harmony-fix.diff)
+		harmony-fix.diff
+		rust-i686.patch
+		make_SystemResourceMonitor.stop_more_resilient_to_errors.patch)
 sha256sums=('c16bc86d6cb8c2199ed1435ab80a9ae65f9324c820ea0eeb38bf89a97d253b5b'
             'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826'
             'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
-            '413cd6d366d78f325d80ebebccfd0afa0d266b40b2e54b66ba2fa03c15f3ea67'
             '93c495526c1a1227f76dda5f3a43b433bc7cf217aaf74bd06b8fc187d285f593'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
             '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
             '37e127dbed0285dc48e8033959a84e241c3e5cf0ce9544a172e640b54d3dfe0e'
-            '1fe3b7f8b14f1978b96866f983d16709581d9df389fb46881fa63f080d036931'
+            'cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8'
             'dc4feddbf22ea11ae2513c68b7f3fc9047850d055a7f30d31a7ee94d7d5de12a'
-            '8ed42e75b577d57e4b07f1d70137cb8e82f757abb616f1cfea694a041ad5679e')
+            '8ed42e75b577d57e4b07f1d70137cb8e82f757abb616f1cfea694a041ad5679e'
+            'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
+            '7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -65,17 +66,12 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
   patch -Np1 -i ../fix-wifi-scanner.diff
 
-  # https://bugs.archlinux.org/task/53890
-  patch -Np1 -i ../0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
-
   # https://bugs.archlinux.org/task/54395 // https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
   patch -Np1 -i ../0001-Bug-54395-remove-hardcoded-flag-lcrmf.patch
 
-  # https://hg.mozilla.org/mozilla-central/rev/ae7e3082d862
-  patch -Np1 -i ../use-noexcept-instead-of-an-exception-specification-in-mozalloc.patch
-
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1385667
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1394149
-  patch -Np1 -i ../breakpad-still-uses-struct-ucontext-in-ucontext_reader-cc.patch
+  patch -d toolkit/crashreporter/google-breakpad/src/client -Np4 < ../glibc-2.26-fix.diff
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1393467
   patch -Np1 -i ../clip-ft-glyph.diff
@@ -83,6 +79,12 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1400721
   patch -Np1 -i ../harmony-fix.diff
 
+  # Build with the rust targets we actually ship
+  patch -Np1 -i ../rust-i686.patch
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1384062
+  patch -Np1 -i ../make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
+
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key
 
@@ -133,8 +135,8 @@ build() {
   # _FORTIFY_SOURCE causes configure failures
   CPPFLAGS+=" -O2"
 
-  # Hardening
-  LDFLAGS+=" -Wl,-z,now"
+#  # Hardening
+#  LDFLAGS+=" -Wl,-z,now"
 
   export PATH="$srcdir/path:$PATH"
 
diff --git a/breakpad-still-uses-struct-ucontext-in-ucontext_reader-cc.patch b/glibc-2.26-fix.diff
index 5449c007f80a..48733ab899bb 100644
--- a/breakpad-still-uses-struct-ucontext-in-ucontext_reader-cc.patch
+++ b/glibc-2.26-fix.diff
@@ -1,6 +1,30 @@
---- a/toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc	2017-04-11 04:13:23.000000000 +0200
-+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc	2017-08-27 17:39:00.081780670 +0200
-@@ -40,15 +40,15 @@
+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__)
  
@@ -19,7 +43,7 @@
                                      const struct _libc_fpstate* fp) {
    const greg_t* regs = uc->uc_mcontext.gregs;
  
-@@ -88,15 +88,15 @@
+@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
  
  #elif defined(__x86_64)
  
@@ -38,12 +62,12 @@
                                      const struct _libc_fpstate* fpregs) {
    const greg_t* regs = uc->uc_mcontext.gregs;
  
-@@ -145,15 +145,15 @@
+@@ -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 context_t* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
    return uc->uc_mcontext.arm_sp;
  }
  
@@ -57,7 +81,7 @@
    out->context_flags = MD_CONTEXT_ARM_FULL;
  
    out->iregs[0] = uc->uc_mcontext.arm_r0;
-@@ -184,15 +184,15 @@
+@@ -184,41 +184,41 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
  
  #elif defined(__aarch64__)
  
@@ -76,7 +100,17 @@
                                      const struct fpsimd_context* fpregs) {
    out->context_flags = MD_CONTEXT_ARM64_FULL;
  
-@@ -210,11 +210,11 @@
+   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__)
  
@@ -90,9 +124,16 @@
    return uc->uc_mcontext.pc;
  }
  
---- a/toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h	2017-04-11 04:13:23.000000000 +0200
-+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h	2017-08-27 17:39:11.743721257 +0200
-@@ -41,21 +41,21 @@
+-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 {
@@ -119,9 +160,11 @@
  #endif
  };
  
---- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc	2017-04-11 04:13:23.000000000 +0200
-+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc	2017-08-27 17:39:37.367593788 +0200
-@@ -439,9 +439,9 @@
+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));
@@ -129,11 +172,12 @@
 +  memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
  #if defined(__aarch64__)
 -  struct ucontext* uc_ptr = (struct ucontext*)uc;
-+  struct ucontext* uc_ptr = (ucontext_t*)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) {
-@@ -450,9 +450,9 @@
+     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.
@@ -145,7 +189,23 @@
    if (uc_ptr->uc_mcontext.fpregs) {
      memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
             sizeof(g_crash_context_.float_state));
-@@ -476,7 +476,7 @@
+   }
+ #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();
@@ -154,9 +214,11 @@
    getcontext(&context);
    return HandleSignal(sig, &siginfo, &context);
  }
---- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.h	2017-04-11 04:13:23.000000000 +0200
-+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.h	2017-08-27 17:39:45.479554314 +0200
-@@ -191,7 +191,7 @@
+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.
@@ -165,9 +227,11 @@
  #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
---- a/toolkit/crashreporter/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc	2017-04-11 04:13:23.000000000 +0200
-+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc	2017-08-27 17:40:42.127289699 +0200
-@@ -571,7 +571,7 @@
+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); }
  
@@ -176,9 +240,11 @@
  #if !defined(__ARM_EABI__) && !defined(__mips__)
    const google_breakpad::fpstate_t* const float_state_;
  #endif
---- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc	2017-04-11 04:13:23.000000000 +0200
-+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc	2017-08-27 17:41:08.215173976 +0200
-@@ -1247,7 +1247,7 @@
+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.
  
@@ -187,3 +253,6 @@
  #if !defined(__ARM_EABI__) && !defined(__mips__)
    const google_breakpad::fpstate_t* const float_state_;  // ditto
  #endif
+-- 
+2.14.1
+
diff --git a/make_SystemResourceMonitor.stop_more_resilient_to_errors.patch b/make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
new file mode 100644
index 000000000000..ff75dcfd0c86
--- /dev/null
+++ b/make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
@@ -0,0 +1,119 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1502856976 -32400
+# Node ID 8d9ae8c45dd07496f164364f24c5f43edcf2eb6e
+# Parent  fa02d334033f0039ef82b3d7dc194312ba250279
+Bug 1384062 - Make SystemResourceMonitor.stop more resilient to errors. r=ahal,gps
+
+The poll() call in SystemResourceMonitor.stop might fail even though
+there is something to read from the pipe, in some corner cases, and
+python won't let us know about it. In that case, an exception is thrown,
+leaving the SystemResourceMonitor (and its callers) in a weird state. In
+practice, this leads BuildMonitor.__exit__ to recall stop, which then
+fails.
+
+So when poll() throws an exception, we pretend there's still something
+to read, and we try to read anyways. If there is something to read,
+recv() will return it, otherwise, it will throw an exception of its own,
+which we catch, pretending we're done.
+
+Furthermore, when there is nothing to read from the pipe, poll() simply
+returns False, and our loop never sets `done` to True, and we then hit
+an assert, which doesn't have its place here, so we remove it.
+
+Finally, the other end of the pipe might have died at any time, making
+sending over the pipe fail, so we also protect against that.
+
+With all these changes, it feels like the reason to backout bug 1239939
+in bug 1272782 should have been dealt with, and we can drop the timeout
+again.
+
+diff --git a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
+--- a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
++++ b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
+@@ -284,57 +284,71 @@ class SystemResourceMonitor(object):
+         """
+         if not self._process:
+             self._stopped = True
+             return
+ 
+         assert self._running
+         assert not self._stopped
+ 
+-        self._pipe.send(('terminate',))
++        try:
++            self._pipe.send(('terminate',))
++        except Exception:
++            pass
+         self._running = False
+         self._stopped = True
+ 
+         self.measurements = []
+ 
+-        done = False
+-
+         # The child process will send each data sample over the pipe
+         # as a separate data structure. When it has finished sending
+         # samples, it sends a special "done" message to indicate it
+         # is finished.
+-        while self._pipe.poll(1.0):
+-            start_time, end_time, io_diff, cpu_diff, cpu_percent, virt_mem, \
+-                swap_mem = self._pipe.recv()
++
++        # multiprocessing.Pipe is not actually a pipe on at least Linux.  that
++        # has an effect on the expected outcome of reading from it when the
++        # other end of the pipe dies, leading to possibly hanging on revc()
++        # below. So we must poll().
++        def poll():
++            try:
++                return self._pipe.poll(0.1)
++            except Exception:
++                # Poll might throw an exception even though there's still
++                # data to read. That happens when the underlying system call
++                # returns both POLLERR and POLLIN, but python doesn't tell us
++                # about it. So assume there is something to read, and we'll
++                # get an exception when trying to read the data.
++                return True
++        while poll():
++            try:
++                start_time, end_time, io_diff, cpu_diff, cpu_percent, virt_mem, \
++                    swap_mem = self._pipe.recv()
++            except Exception:
++                # Let's assume we're done here
++                break
+ 
+             # There should be nothing after the "done" message so
+             # terminate.
+             if start_time == 'done':
+-                done = True
+                 break
+ 
+             io = self._io_type(*io_diff)
+             virt = self._virt_type(*virt_mem)
+             swap = self._swap_type(*swap_mem)
+             cpu_times = [self._cpu_times_type(*v) for v in cpu_diff]
+ 
+             self.measurements.append(SystemResourceUsage(start_time, end_time,
+                                                          cpu_times, cpu_percent, io, virt, swap))
+ 
+         # We establish a timeout so we don't hang forever if the child
+         # process has crashed.
+         self._process.join(10)
+         if self._process.is_alive():
+             self._process.terminate()
+             self._process.join(10)
+-        else:
+-            # We should have received a "done" message from the
+-            # child indicating it shut down properly. This only
+-            # happens if the child shuts down cleanly.
+-            assert done
+ 
+         if len(self.measurements):
+             self.start_time = self.measurements[0].start
+             self.end_time = self.measurements[-1].end
+ 
+     # Methods to record events alongside the monitored data.
+ 
+     def record_event(self, name):
+
diff --git a/rust-i686.patch b/rust-i686.patch
new file mode 100644
index 000000000000..85512e1436b8
--- /dev/null
+++ b/rust-i686.patch
@@ -0,0 +1,16 @@
+ build/moz.configure/rust.configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/build/moz.configure/rust.configure i/build/moz.configure/rust.configure
+index cd86b24153debb1b..44911715e25d95e3 100644
+--- c/build/moz.configure/rust.configure
++++ i/build/moz.configure/rust.configure
+@@ -81,7 +81,7 @@ def rust_target(rust_compiler, rustc, target, cross_compiling):
+             # OpenBSD
+             ('x86_64', 'OpenBSD'): 'x86_64-unknown-openbsd',
+             # Linux
+-            ('x86', 'Linux'): 'i586-unknown-linux-gnu',
++            ('x86', 'Linux'): 'i686-unknown-linux-gnu',
+             # Linux
+             ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
+             # OS X and iOS
diff --git a/use-noexcept-instead-of-an-exception-specification-in-mozalloc.patch b/use-noexcept-instead-of-an-exception-specification-in-mozalloc.patch
deleted file mode 100644
index 65f536a02000..000000000000
--- a/use-noexcept-instead-of-an-exception-specification-in-mozalloc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/memory/mozalloc/mozalloc.h
-+++ b/memory/mozalloc/mozalloc.h
-@@ -170,16 +170,22 @@ MFBT_API void* moz_xvalloc(size_t size)
- #define MOZALLOC_THROW_IF_HAS_EXCEPTIONS throw()
- #define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS
- #elif defined(_MSC_VER)
- /*
-  * Suppress build warning spam (bug 578546).
-  */
- #define MOZALLOC_THROW_IF_HAS_EXCEPTIONS
- #define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS
-+#elif __cplusplus >= 201103
-+/*
-+ * C++11 has deprecated exception-specifications in favour of |noexcept|.
-+ */
-+#define MOZALLOC_THROW_IF_HAS_EXCEPTIONS noexcept(true)
-+#define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS noexcept(false)
- #else
- #define MOZALLOC_THROW_IF_HAS_EXCEPTIONS throw()
- #define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS throw(std::bad_alloc)
- #endif
- 
- #define MOZALLOC_THROW_BAD_ALLOC MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS
- 
- MOZALLOC_EXPORT_NEW