From 22a13d9cf7f397372f38b5c7a91d485dd52b9267 Mon Sep 17 00:00:00 2001
From: jbeich <jbeich@35697150-7ecd-e111-bb59-0022644237b5>
Date: Mon, 7 Aug 2017 18:22:51 +0000
Subject: [PATCH] www/firefox: update to 56.0

Changes:	https://www.mozilla.org/firefox/56.0/releasenotes/
PR:		221335
Security:	1098a15b-b0f6-42b7-b5c7-8a8646e8be07
MFH:		2017Q3 (requires r447450 and r447538)
---
 Mk/Uses/gecko.mk                              |   4 +-
 Mk/bsd.gecko.mk                               |   8 +-
 www/firefox-i18n/Makefile                     |   4 +-
 www/firefox-i18n/distinfo                     | 382 ++++++------
 www/firefox/Makefile                          |  25 +-
 www/firefox/distinfo                          |   6 +-
 www/firefox/files/patch-bug1312182            | 376 ------------
 www/firefox/files/patch-bug1384655            |  72 +++
 www/firefox/files/patch-bug1385597            |  24 -
 www/firefox/files/patch-bug826985             |  16 +-
 www/firefox/files/patch-bug847568             |   2 +-
 www/firefox/files/patch-rust-option           | 816 --------------------------
 www/firefox/files/patch-toolkit_moz.configure |  13 +
 13 files changed, 309 insertions(+), 1439 deletions(-)
 delete mode 100644 www/firefox/files/patch-bug1312182
 create mode 100644 www/firefox/files/patch-bug1384655
 delete mode 100644 www/firefox/files/patch-bug1385597
 delete mode 100644 www/firefox/files/patch-rust-option
 create mode 100644 www/firefox/files/patch-toolkit_moz.configure

diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk
index 691bd5aaa827..a2975447daf2 100644
--- a/Mk/Uses/gecko.mk
+++ b/Mk/Uses/gecko.mk
@@ -37,12 +37,12 @@ RUN_DEPENDS+=	libxul>=45:www/libxul
 .elif ${gecko_ARGS:Mfirefox}
 
 _GECKO_DEFAULT_VERSION=	52
-_GECKO_VERSIONS=		52 55
+_GECKO_VERSIONS=		52 56
 _GECKO_TYPE=	firefox
 
 # Dependence lines for different Firefox versions
 52_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
-55_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
+56_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
 
 .if exists(${LOCALBASE}/bin/firefox)
 _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index aea22ac5b322..032ff4bbdc8f 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -387,13 +387,15 @@ post-patch-SNDIO-on:
 		${MOZSRC}/media/webrtc/signaling/test/common.build
 .endif
 
-.if ${PORT_OPTIONS:MRUST}
-BUILD_DEPENDS+=	rust>=1.15.1:${RUST_PORT}
+.if ${PORT_OPTIONS:MRUST} || ${MOZILLA_VER:R:R} >= 54
+BUILD_DEPENDS+=	rust>=1.17.0:${RUST_PORT}
 . if ${MOZILLA_VER:R:R} >= 51
-BUILD_DEPENDS+=	cargo>=0.16.0:devel/cargo
+BUILD_DEPENDS+=	cargo>=0.18.0:devel/cargo
 . endif
 RUST_PORT?=		lang/rust
+. if ${MOZILLA_VER:R:R} < 54
 MOZ_OPTIONS+=	--enable-rust
+. endif
 .else
 MOZ_OPTIONS+=	--disable-rust
 .endif
diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile
index df50f13511f8..ad716bd2c83e 100644
--- a/www/firefox-i18n/Makefile
+++ b/www/firefox-i18n/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	firefox-i18n
-PORTVERSION=	55.0
+PORTVERSION=	56.0b1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
 		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build3/linux-i686/xpi
@@ -15,7 +15,7 @@ COMMENT=	Localized interface for Firefox
 
 EXTRACT_DEPENDS=	zip:archivers/zip
 
-USES=		zip:infozip gecko:firefox,55,build
+USES=		zip:infozip gecko:firefox,56,build
 USE_XPI=	firefox
 
 NO_ARCH=	yes
diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo
index ca68f965dd8b..81b2c5e5f4e6 100644
--- a/www/firefox-i18n/distinfo
+++ b/www/firefox-i18n/distinfo
@@ -1,191 +1,191 @@
-TIMESTAMP = 1501529467
-SHA256 (xpi/firefox-i18n-55.0/ach.xpi) = 7effd111a095cddfa54f351259213bf344a63a594ecee1619c5ea181dae1b26f
-SIZE (xpi/firefox-i18n-55.0/ach.xpi) = 447503
-SHA256 (xpi/firefox-i18n-55.0/af.xpi) = b17db928990810aac31c86d01d92e73f0e4a0bfcdb98d7ec3d9ab1dcaadb0e30
-SIZE (xpi/firefox-i18n-55.0/af.xpi) = 448923
-SHA256 (xpi/firefox-i18n-55.0/an.xpi) = e15aa4930d21d29b7f409beb1fdcf18603eee54670672f856eb0019304442b34
-SIZE (xpi/firefox-i18n-55.0/an.xpi) = 468637
-SHA256 (xpi/firefox-i18n-55.0/ar.xpi) = 6f574ebea13627ade9f0732f5ef8857cf24c9986b41f83d4162f5b4dd934f65b
-SIZE (xpi/firefox-i18n-55.0/ar.xpi) = 492759
-SHA256 (xpi/firefox-i18n-55.0/as.xpi) = eda8c3227dcc8ff518a85184a9d9bd121b54a9d9bef7936650a59ff405bee942
-SIZE (xpi/firefox-i18n-55.0/as.xpi) = 501506
-SHA256 (xpi/firefox-i18n-55.0/ast.xpi) = 4003edf17a241136abcc2722131b4d0c9f0ad5f9d3cad30f0903786c11dbe527
-SIZE (xpi/firefox-i18n-55.0/ast.xpi) = 460839
-SHA256 (xpi/firefox-i18n-55.0/az.xpi) = 227f74edc75a27483eacac85f775a7aed4d551f2da8b80ec8f6df102855d0e0d
-SIZE (xpi/firefox-i18n-55.0/az.xpi) = 475367
-SHA256 (xpi/firefox-i18n-55.0/be.xpi) = 3e93a38c9e81ecd6b12686cb553a9d4963b3aa27544eca1a7d702dfb4d59bf17
-SIZE (xpi/firefox-i18n-55.0/be.xpi) = 522574
-SHA256 (xpi/firefox-i18n-55.0/bg.xpi) = 85a0566d0df2b8501f76c7680c47aed147d07f74bad80a4734a3e5a0f1c5d93a
-SIZE (xpi/firefox-i18n-55.0/bg.xpi) = 520010
-SHA256 (xpi/firefox-i18n-55.0/bn-BD.xpi) = 477429b439a1bf73b59f21690988786ae87c06c5b587cdee8269c1cc2f5ffeca
-SIZE (xpi/firefox-i18n-55.0/bn-BD.xpi) = 535105
-SHA256 (xpi/firefox-i18n-55.0/bn-IN.xpi) = 9d7004f7d7cc21ec8026d34fbc7a78c52bc8205f738df715d9d53bd57e56f664
-SIZE (xpi/firefox-i18n-55.0/bn-IN.xpi) = 526353
-SHA256 (xpi/firefox-i18n-55.0/br.xpi) = 1f2c64f8e11262340895ce55c16130745cff855778068b576b0e832cfa3a8f8c
-SIZE (xpi/firefox-i18n-55.0/br.xpi) = 457058
-SHA256 (xpi/firefox-i18n-55.0/bs.xpi) = b18b81b09302846fdc9a53294b5c905406949fbe54abb172229ab5da62ae03fb
-SIZE (xpi/firefox-i18n-55.0/bs.xpi) = 465024
-SHA256 (xpi/firefox-i18n-55.0/ca.xpi) = 6060c966fe663d4e6c44b4de7f4b8accab722ebc5788ca41fc2c1b846d238ede
-SIZE (xpi/firefox-i18n-55.0/ca.xpi) = 473016
-SHA256 (xpi/firefox-i18n-55.0/cak.xpi) = 057900bfde342f8543734d95d83a31873a7bd727879f2a0662826ffef66f6855
-SIZE (xpi/firefox-i18n-55.0/cak.xpi) = 481773
-SHA256 (xpi/firefox-i18n-55.0/cs.xpi) = 807db70a47d46de4bce82027ca45fa2c1b0b0beecedd93c51134ac148e022025
-SIZE (xpi/firefox-i18n-55.0/cs.xpi) = 476808
-SHA256 (xpi/firefox-i18n-55.0/cy.xpi) = 11d8e6ae3ef64b878d33de9c1e87627c71f3c8d7858cdfd7fb901fda0e51a05f
-SIZE (xpi/firefox-i18n-55.0/cy.xpi) = 458724
-SHA256 (xpi/firefox-i18n-55.0/da.xpi) = 5eee7d6abfdff7b63a71ad75c7628f8b9d2f3e06292c547d2c32521b86ddc170
-SIZE (xpi/firefox-i18n-55.0/da.xpi) = 452603
-SHA256 (xpi/firefox-i18n-55.0/de.xpi) = 9e59e27baff599dd0450c31a77532f8db37ca217f105b780ff14822607cfb85b
-SIZE (xpi/firefox-i18n-55.0/de.xpi) = 465988
-SHA256 (xpi/firefox-i18n-55.0/dsb.xpi) = 1ace2c50ed147c64764eb9e55f8aa6a7917b4f1e76fac660f0ae282655d4fc43
-SIZE (xpi/firefox-i18n-55.0/dsb.xpi) = 482080
-SHA256 (xpi/firefox-i18n-55.0/el.xpi) = 776251cf76587518eebc4c3398168eb226d5e859c69e6068031d72e42d13d233
-SIZE (xpi/firefox-i18n-55.0/el.xpi) = 539776
-SHA256 (xpi/firefox-i18n-55.0/en-GB.xpi) = 9f298233d64ed509211dced494b206271457d29d82a06e999a2e4ec3c09cfadf
-SIZE (xpi/firefox-i18n-55.0/en-GB.xpi) = 439267
-SHA256 (xpi/firefox-i18n-55.0/en-US.xpi) = 6e48418b8251189baa662323892c0ca71be87d22cd3e4b786557cecd813802ee
-SIZE (xpi/firefox-i18n-55.0/en-US.xpi) = 439813
-SHA256 (xpi/firefox-i18n-55.0/en-ZA.xpi) = 3c207e0c0da51086665dfbcb3932e428b5a43fa78633df8165d6f164d8e12921
-SIZE (xpi/firefox-i18n-55.0/en-ZA.xpi) = 438620
-SHA256 (xpi/firefox-i18n-55.0/eo.xpi) = 43291d1441f465ccef16c78dd1d7185b105f853c072956b64cca85d25951ccb7
-SIZE (xpi/firefox-i18n-55.0/eo.xpi) = 461138
-SHA256 (xpi/firefox-i18n-55.0/es-AR.xpi) = a15bdfad6500e6e5843c24d0e7ee05962505346db9c200269c4bf01dc4a5a6db
-SIZE (xpi/firefox-i18n-55.0/es-AR.xpi) = 467617
-SHA256 (xpi/firefox-i18n-55.0/es-CL.xpi) = 361e31c430cbb7cd6480d4449c6626c58688a4c2ccfcf29307542b7bd2c6fdae
-SIZE (xpi/firefox-i18n-55.0/es-CL.xpi) = 471598
-SHA256 (xpi/firefox-i18n-55.0/es-ES.xpi) = 7f5a906ef66e606436763730909324171bbf32ae5ccb7604c76f503b91a34bdc
-SIZE (xpi/firefox-i18n-55.0/es-ES.xpi) = 359822
-SHA256 (xpi/firefox-i18n-55.0/es-MX.xpi) = 5d72f78c861a79ee8e44a60b65bd6e0ff709a5233335dac2ce14b7434a660930
-SIZE (xpi/firefox-i18n-55.0/es-MX.xpi) = 474243
-SHA256 (xpi/firefox-i18n-55.0/et.xpi) = 38b9ec43a0dbf4b9fa85c40e0dcf9105f4f685a4953145b6777fe93f20920e33
-SIZE (xpi/firefox-i18n-55.0/et.xpi) = 454469
-SHA256 (xpi/firefox-i18n-55.0/eu.xpi) = 9c389e96c5ae242b8a6367540c06726ec97b932ccb8e6648cfc1499072d724c1
-SIZE (xpi/firefox-i18n-55.0/eu.xpi) = 460418
-SHA256 (xpi/firefox-i18n-55.0/fa.xpi) = 1447f4827395e5def561df5cd900087ff7ff1dd725c06a613eb9ab10bc8ea7e8
-SIZE (xpi/firefox-i18n-55.0/fa.xpi) = 511559
-SHA256 (xpi/firefox-i18n-55.0/ff.xpi) = df842a9519944fc4346c2ab1ddd303e3dfddbb0ae816e7c8d25541860a0cfe5b
-SIZE (xpi/firefox-i18n-55.0/ff.xpi) = 455293
-SHA256 (xpi/firefox-i18n-55.0/fi.xpi) = d7d5e06340d93be95e392825f135482c85872578706920ef5cf5fa5d539c54d5
-SIZE (xpi/firefox-i18n-55.0/fi.xpi) = 453944
-SHA256 (xpi/firefox-i18n-55.0/fr.xpi) = 8d671e1013ee08d17a7817f3a892ec497b53a0bf71acf94bfc8eb9d07e1fbaab
-SIZE (xpi/firefox-i18n-55.0/fr.xpi) = 476666
-SHA256 (xpi/firefox-i18n-55.0/fy-NL.xpi) = 9697130fdecbc7ac9efa4e4710b613de8f932dc2d13c935d6f6cd7aa6d25dd85
-SIZE (xpi/firefox-i18n-55.0/fy-NL.xpi) = 469967
-SHA256 (xpi/firefox-i18n-55.0/ga-IE.xpi) = bc4116e1db74fa3505408a2bcd32ac4528c5378b1db218068120963dc984a6ea
-SIZE (xpi/firefox-i18n-55.0/ga-IE.xpi) = 481439
-SHA256 (xpi/firefox-i18n-55.0/gd.xpi) = 660b7b327fe3fdc6b4adb759086d8c9d3cf1cc7dc3d50067f94cece10861771d
-SIZE (xpi/firefox-i18n-55.0/gd.xpi) = 469053
-SHA256 (xpi/firefox-i18n-55.0/gl.xpi) = e086f3751c598394b3724afdb6d043df9dab988c4db67ead8871ce1ea7e74833
-SIZE (xpi/firefox-i18n-55.0/gl.xpi) = 459110
-SHA256 (xpi/firefox-i18n-55.0/gn.xpi) = 1ebe6518168127627febf8fab8bfb14da0cf31d28af680506dc42c72283a1499
-SIZE (xpi/firefox-i18n-55.0/gn.xpi) = 476200
-SHA256 (xpi/firefox-i18n-55.0/gu-IN.xpi) = cb0d3a437140f901f11367bbd09ee8679f4c7d19c2984ef39e82411fd093617c
-SIZE (xpi/firefox-i18n-55.0/gu-IN.xpi) = 498981
-SHA256 (xpi/firefox-i18n-55.0/he.xpi) = e2fb06c845cc39cf414793afdab3012b362faed05c52b7c821f70f2fbed6c84f
-SIZE (xpi/firefox-i18n-55.0/he.xpi) = 479880
-SHA256 (xpi/firefox-i18n-55.0/hi-IN.xpi) = bd2b6ebca05d02227168a51fe30f781a3836d707033074a76556394edb479e66
-SIZE (xpi/firefox-i18n-55.0/hi-IN.xpi) = 530570
-SHA256 (xpi/firefox-i18n-55.0/hr.xpi) = cdbd72e04a0432cd9177bb9b8ab92fc8d80a80ab5785746d3b9e4721fd65c298
-SIZE (xpi/firefox-i18n-55.0/hr.xpi) = 467990
-SHA256 (xpi/firefox-i18n-55.0/hsb.xpi) = cc36ffd9f41dc787edaa9b2d80fa84cdd462bda961b02407e1a08f31ba7d9127
-SIZE (xpi/firefox-i18n-55.0/hsb.xpi) = 479796
-SHA256 (xpi/firefox-i18n-55.0/hu.xpi) = 9e609583fa23225324b217862fd266300a0766e070a06c20812921d248fa19e1
-SIZE (xpi/firefox-i18n-55.0/hu.xpi) = 481644
-SHA256 (xpi/firefox-i18n-55.0/hy-AM.xpi) = d050ef2cf16ce9dc955ec06155073315ecb73b8495e45bf278fa7f803c81ef15
-SIZE (xpi/firefox-i18n-55.0/hy-AM.xpi) = 520877
-SHA256 (xpi/firefox-i18n-55.0/id.xpi) = da15ba92adf6c3d745b294f1e2b264bcdfca1929c9a6320b9448e8dac2279ef3
-SIZE (xpi/firefox-i18n-55.0/id.xpi) = 450289
-SHA256 (xpi/firefox-i18n-55.0/is.xpi) = 0f8efe945dd9faee7d4fd2c88ba3b9caa810e2fda7b390e0793b84b5c6575979
-SIZE (xpi/firefox-i18n-55.0/is.xpi) = 464367
-SHA256 (xpi/firefox-i18n-55.0/it.xpi) = 45daddf8cd24a00716877a9bac62fc76257d8abba7bde2861a16feb88778a4b8
-SIZE (xpi/firefox-i18n-55.0/it.xpi) = 352939
-SHA256 (xpi/firefox-i18n-55.0/ja.xpi) = 07a7a1adecbebaf193a77beec7df50ae44550c1bfea91de82b751a9bf256341f
-SIZE (xpi/firefox-i18n-55.0/ja.xpi) = 519762
-SHA256 (xpi/firefox-i18n-55.0/ka.xpi) = a2de711f6531681ee4e9bff14fd0fe0d8d987eeb8bc9a1171da70d9708713c70
-SIZE (xpi/firefox-i18n-55.0/ka.xpi) = 493534
-SHA256 (xpi/firefox-i18n-55.0/kab.xpi) = ca6b5c9c05ec6bfe7c209457b8f326e9554f7e6cfc0c7da942fbbf807373f4b7
-SIZE (xpi/firefox-i18n-55.0/kab.xpi) = 470043
-SHA256 (xpi/firefox-i18n-55.0/kk.xpi) = 91d5d5279c7ca52211c66b11ce16cbbe448ea1e0f77b8516bdb730dc26ede4a0
-SIZE (xpi/firefox-i18n-55.0/kk.xpi) = 526706
-SHA256 (xpi/firefox-i18n-55.0/km.xpi) = 66b2d22c136861fe25b0030d937758f2b9304cebc00ea1c1204440ade26cf0d0
-SIZE (xpi/firefox-i18n-55.0/km.xpi) = 540645
-SHA256 (xpi/firefox-i18n-55.0/kn.xpi) = 9304a1dd34f0549df39cd49e598945916a9342ca82497f8365bf69adfc845128
-SIZE (xpi/firefox-i18n-55.0/kn.xpi) = 538857
-SHA256 (xpi/firefox-i18n-55.0/ko.xpi) = 10e257126a527261de33c1eb32aae8686d04074a5d158d0643f7728f51f0d761
-SIZE (xpi/firefox-i18n-55.0/ko.xpi) = 494545
-SHA256 (xpi/firefox-i18n-55.0/lij.xpi) = 0297bac042dcf9bbf5309b2162248a2a7f39c32ef28313aac40f8bbbf7291653
-SIZE (xpi/firefox-i18n-55.0/lij.xpi) = 458696
-SHA256 (xpi/firefox-i18n-55.0/lt.xpi) = 119039f74baf681c36bebbbc1238c80b1a75cdf22a43aefdbe8973552d0173fc
-SIZE (xpi/firefox-i18n-55.0/lt.xpi) = 481080
-SHA256 (xpi/firefox-i18n-55.0/lv.xpi) = 70c391da7f6e396a9dc0b5edae49858ea3b6bfd2d5790feb4ed1702f0f02d8d8
-SIZE (xpi/firefox-i18n-55.0/lv.xpi) = 473735
-SHA256 (xpi/firefox-i18n-55.0/mai.xpi) = ab6ba18d08c4cacd10da473362c9b60037429b3fde6b65519ad975b1ce36fa40
-SIZE (xpi/firefox-i18n-55.0/mai.xpi) = 517893
-SHA256 (xpi/firefox-i18n-55.0/mk.xpi) = 8e1bac561a9e4f8bf63e5fe5f0371869278ea8bf16a9dcd2b5d808daacf0cb3d
-SIZE (xpi/firefox-i18n-55.0/mk.xpi) = 500205
-SHA256 (xpi/firefox-i18n-55.0/ml.xpi) = 53440574bd1e31bd11a31874c0a3dbad7bb4ebe6009cc4add6219ba9790010f9
-SIZE (xpi/firefox-i18n-55.0/ml.xpi) = 540980
-SHA256 (xpi/firefox-i18n-55.0/mr.xpi) = 96556da0ac4ed3d4a328bfcfc0d1559de7857a10d6c5546efb659117e4e76f7c
-SIZE (xpi/firefox-i18n-55.0/mr.xpi) = 528248
-SHA256 (xpi/firefox-i18n-55.0/ms.xpi) = 779321a93bd2a406fbbfa53977e3965678df5449f882cdfede8a71662943313d
-SIZE (xpi/firefox-i18n-55.0/ms.xpi) = 459190
-SHA256 (xpi/firefox-i18n-55.0/my.xpi) = 610c3680b94ba69f17755e62428267d873375c1700d6cb7c2ebf1e14f85f4a44
-SIZE (xpi/firefox-i18n-55.0/my.xpi) = 528096
-SHA256 (xpi/firefox-i18n-55.0/nb-NO.xpi) = 088ebff9c0be6ed01060d75a8b9bce408051093e4529ae1b7f6258311ed1e3f1
-SIZE (xpi/firefox-i18n-55.0/nb-NO.xpi) = 457644
-SHA256 (xpi/firefox-i18n-55.0/nl.xpi) = d5755cd3d461dcf7003220bd93d8c8d7fa78a09d67a8ed09bb48ca372e61a0f6
-SIZE (xpi/firefox-i18n-55.0/nl.xpi) = 461509
-SHA256 (xpi/firefox-i18n-55.0/nn-NO.xpi) = 83fb7df21553416dc7e489b5968bc9824c8f971ea68194a3c7addab58db1ef9a
-SIZE (xpi/firefox-i18n-55.0/nn-NO.xpi) = 458455
-SHA256 (xpi/firefox-i18n-55.0/or.xpi) = 4f36dfd176d808da70e67deb9029536a6ed2fa23c59129ca9cf520f22c607c8c
-SIZE (xpi/firefox-i18n-55.0/or.xpi) = 511353
-SHA256 (xpi/firefox-i18n-55.0/pa-IN.xpi) = b51b39635f527402cb2cb723b87b83c9939306f628835ef99a09bd75babfc737
-SIZE (xpi/firefox-i18n-55.0/pa-IN.xpi) = 498452
-SHA256 (xpi/firefox-i18n-55.0/pl.xpi) = 887fa9c5fc493d42ea9dfa3a7d79c16f2b24943e23473ca6031ef2a2993632e0
-SIZE (xpi/firefox-i18n-55.0/pl.xpi) = 372428
-SHA256 (xpi/firefox-i18n-55.0/pt-BR.xpi) = ff7e424a31a2c8488b8d35be6c8a369ccec3b7b6ec28909217d0f3275fba1a5b
-SIZE (xpi/firefox-i18n-55.0/pt-BR.xpi) = 462715
-SHA256 (xpi/firefox-i18n-55.0/pt-PT.xpi) = 2b28680e0e18b5c2d6377fac95a24f307328cc1a92d83fcd934d4492def8f257
-SIZE (xpi/firefox-i18n-55.0/pt-PT.xpi) = 465236
-SHA256 (xpi/firefox-i18n-55.0/rm.xpi) = 2c856ef717e74bfce70667cd588bb722ee8e61ee6ae4f5c41c5cc32161451323
-SIZE (xpi/firefox-i18n-55.0/rm.xpi) = 458263
-SHA256 (xpi/firefox-i18n-55.0/ro.xpi) = 74a29131e14d4168046d802227b9682c62d68531b4cafd536726baf0401e3dd0
-SIZE (xpi/firefox-i18n-55.0/ro.xpi) = 462971
-SHA256 (xpi/firefox-i18n-55.0/ru.xpi) = b0ebd011dd78ab946a8c06018bf74fed3e05b579f04df8a5c7d855f93282edfc
-SIZE (xpi/firefox-i18n-55.0/ru.xpi) = 530900
-SHA256 (xpi/firefox-i18n-55.0/si.xpi) = 3691c7971d7cbec72294ca8c81258237b22add5cee54a5c7602421e46fb81baf
-SIZE (xpi/firefox-i18n-55.0/si.xpi) = 508352
-SHA256 (xpi/firefox-i18n-55.0/sk.xpi) = 6a4dc2028c74439b36ef52bdd7348a52663fd007802ae730d014ca881d1a6d11
-SIZE (xpi/firefox-i18n-55.0/sk.xpi) = 487581
-SHA256 (xpi/firefox-i18n-55.0/sl.xpi) = 951fd5826419431e1ac0c6030e637bf57d043353b367472868bc0309197e2a63
-SIZE (xpi/firefox-i18n-55.0/sl.xpi) = 465759
-SHA256 (xpi/firefox-i18n-55.0/son.xpi) = ba61b906f3d02913365c552a876cf30f0933e967d925f2c62bfe892d9218b829
-SIZE (xpi/firefox-i18n-55.0/son.xpi) = 456958
-SHA256 (xpi/firefox-i18n-55.0/sq.xpi) = 499e363cfe095148e945a768b6d6f2a9989df91b1435293dcfac9e3d1ee09866
-SIZE (xpi/firefox-i18n-55.0/sq.xpi) = 470630
-SHA256 (xpi/firefox-i18n-55.0/sr.xpi) = e7c70b9ff895314ddfa13a88b5cae2a94e40cfb2c972e2d861b746f878bb5454
-SIZE (xpi/firefox-i18n-55.0/sr.xpi) = 494876
-SHA256 (xpi/firefox-i18n-55.0/sv-SE.xpi) = 5d83139e9a87bc6fdbafc8c4a191cfbe0e7200dab351e2431b1394cf683a80d6
-SIZE (xpi/firefox-i18n-55.0/sv-SE.xpi) = 466008
-SHA256 (xpi/firefox-i18n-55.0/ta.xpi) = 05629092b140728440133c3d07c9263bdf42152bd02757d9afaf31d0128a4bee
-SIZE (xpi/firefox-i18n-55.0/ta.xpi) = 519995
-SHA256 (xpi/firefox-i18n-55.0/te.xpi) = 5115e0039746aafa84a01b867a2e05d702776574eb09ce43ed71f1ab98d3868e
-SIZE (xpi/firefox-i18n-55.0/te.xpi) = 542538
-SHA256 (xpi/firefox-i18n-55.0/th.xpi) = d4b2df41441fbfc46a94728ec16c99d2a30f1de6a7f4b33b848114d8dba0e9f7
-SIZE (xpi/firefox-i18n-55.0/th.xpi) = 511902
-SHA256 (xpi/firefox-i18n-55.0/tr.xpi) = 31d971310a408e20bf792dfe42cbb5cd66d148bc66d072b735ff20f4be344a0e
-SIZE (xpi/firefox-i18n-55.0/tr.xpi) = 472160
-SHA256 (xpi/firefox-i18n-55.0/uk.xpi) = 174f6c9acb71ec6ae67f60f6c25ced02fdc639d97be2347376552d6908d7d298
-SIZE (xpi/firefox-i18n-55.0/uk.xpi) = 526435
-SHA256 (xpi/firefox-i18n-55.0/ur.xpi) = 6a829c48c17a3fbcf51474c6e7aac74c855ea4fb5db954bcaffc6f847bafca49
-SIZE (xpi/firefox-i18n-55.0/ur.xpi) = 520745
-SHA256 (xpi/firefox-i18n-55.0/uz.xpi) = 67efdac191ae3e71e1d3148857ba2a88cbcc9b059fd662c75fb13162fae76197
-SIZE (xpi/firefox-i18n-55.0/uz.xpi) = 467670
-SHA256 (xpi/firefox-i18n-55.0/vi.xpi) = de824a1b4d8b3b9adccb5eb523e186b4d0e96b5ea134cd7856ac29d9ddf0255d
-SIZE (xpi/firefox-i18n-55.0/vi.xpi) = 476525
-SHA256 (xpi/firefox-i18n-55.0/xh.xpi) = 8c06e786d7ba8c302f3be831b1c39aa770131af4f0ffb3b2f0930eba9ae0a27c
-SIZE (xpi/firefox-i18n-55.0/xh.xpi) = 470718
-SHA256 (xpi/firefox-i18n-55.0/zh-CN.xpi) = d7f69b51ba7ab586714221b1dce74e0896459b218067155b10bc461e9f4d5d55
-SIZE (xpi/firefox-i18n-55.0/zh-CN.xpi) = 490382
-SHA256 (xpi/firefox-i18n-55.0/zh-TW.xpi) = bc110d30be7ad0cced842c2d50774d76d5feec842284722fa11ee9034bc2757b
-SIZE (xpi/firefox-i18n-55.0/zh-TW.xpi) = 489345
+TIMESTAMP = 1502172478
+SHA256 (xpi/firefox-i18n-56.0b1/ach.xpi) = 412d590806c83a0048e0e0fe90b55a05feb225f98d7ab7bd17ccbc8da4ea5d22
+SIZE (xpi/firefox-i18n-56.0b1/ach.xpi) = 453652
+SHA256 (xpi/firefox-i18n-56.0b1/af.xpi) = 492a985216b9991620c70a4aa67083afb27e5861821cca8c967e72cf0d50eab9
+SIZE (xpi/firefox-i18n-56.0b1/af.xpi) = 454977
+SHA256 (xpi/firefox-i18n-56.0b1/an.xpi) = 6894dd02211ddce20a4805eb5bbbbb469815599397f3df298c542f6e5275e4e6
+SIZE (xpi/firefox-i18n-56.0b1/an.xpi) = 474624
+SHA256 (xpi/firefox-i18n-56.0b1/ar.xpi) = d43ba5d761c86f6f72df9ba56fe8228490546cb41aff2efcdb1e0d465ccb8b5f
+SIZE (xpi/firefox-i18n-56.0b1/ar.xpi) = 499454
+SHA256 (xpi/firefox-i18n-56.0b1/as.xpi) = 2299695121e34d4b55c62107d1ff7ddcf32a63aaf3f145fdeb461d1a8ddeac54
+SIZE (xpi/firefox-i18n-56.0b1/as.xpi) = 507000
+SHA256 (xpi/firefox-i18n-56.0b1/ast.xpi) = eeb3ea046af00cab26633a3a4d370e704dd9ce8a0a8fd50deb3907bb24997acd
+SIZE (xpi/firefox-i18n-56.0b1/ast.xpi) = 467915
+SHA256 (xpi/firefox-i18n-56.0b1/az.xpi) = 8945fa6a28ee498cb23c401e7e4458cb007857fea7bace6cf6c890b5517497bc
+SIZE (xpi/firefox-i18n-56.0b1/az.xpi) = 483745
+SHA256 (xpi/firefox-i18n-56.0b1/be.xpi) = 2c9df8ad9115952d87af9ffe6612e79c630ea7fe8310afa74e20699b8ab0bb76
+SIZE (xpi/firefox-i18n-56.0b1/be.xpi) = 530147
+SHA256 (xpi/firefox-i18n-56.0b1/bg.xpi) = 6af8ae541c535c6f78b6a29e649bef6581fbb9b6cea39ada86f79d70e166f91d
+SIZE (xpi/firefox-i18n-56.0b1/bg.xpi) = 527542
+SHA256 (xpi/firefox-i18n-56.0b1/bn-BD.xpi) = a8b4fff82480a173a0d20969e427bb9c5c30ec7dcac21ca56cc334c1e3674bec
+SIZE (xpi/firefox-i18n-56.0b1/bn-BD.xpi) = 541521
+SHA256 (xpi/firefox-i18n-56.0b1/bn-IN.xpi) = edf7026aed76ecb633357cd5ccb6febdc54284a65a12f9cc6380fff2ef04b22f
+SIZE (xpi/firefox-i18n-56.0b1/bn-IN.xpi) = 533200
+SHA256 (xpi/firefox-i18n-56.0b1/br.xpi) = 5c16c2b88700918bb472a21c97d0a5734a53beacbcc0af4c11ac2c818f22b6ad
+SIZE (xpi/firefox-i18n-56.0b1/br.xpi) = 463042
+SHA256 (xpi/firefox-i18n-56.0b1/bs.xpi) = dc52da64489e662d76877d87e92cdedc15ff74795a5862bc2c09bfa88a7bafcb
+SIZE (xpi/firefox-i18n-56.0b1/bs.xpi) = 471016
+SHA256 (xpi/firefox-i18n-56.0b1/ca.xpi) = 8908a3e4bce9cbbe8ba2b6cc0665aa94d67a86f403401f4f54854e8a5257fec2
+SIZE (xpi/firefox-i18n-56.0b1/ca.xpi) = 478874
+SHA256 (xpi/firefox-i18n-56.0b1/cak.xpi) = 7baf225b38756d018421bb2348cb6b0a9b05332b7b66c5fa79b6fcf43ff96188
+SIZE (xpi/firefox-i18n-56.0b1/cak.xpi) = 488264
+SHA256 (xpi/firefox-i18n-56.0b1/cs.xpi) = 9bfc529442743cf8774aede1ca0453a39d815d9db359789e162956464689575a
+SIZE (xpi/firefox-i18n-56.0b1/cs.xpi) = 483852
+SHA256 (xpi/firefox-i18n-56.0b1/cy.xpi) = 8aa5b4f94ade896e3b530a7c0eb80af98847fac29e8a823e8c1f30bd4302afd4
+SIZE (xpi/firefox-i18n-56.0b1/cy.xpi) = 465054
+SHA256 (xpi/firefox-i18n-56.0b1/da.xpi) = 63981fb0f02d05855b8b96fcac3d86c2ffaacb332f606117f44bc36198bcfa7b
+SIZE (xpi/firefox-i18n-56.0b1/da.xpi) = 458855
+SHA256 (xpi/firefox-i18n-56.0b1/de.xpi) = 480cb992987c94577f7f0fb1aa522b24dbaca357ae00f1390b132b8875b0e350
+SIZE (xpi/firefox-i18n-56.0b1/de.xpi) = 472957
+SHA256 (xpi/firefox-i18n-56.0b1/dsb.xpi) = 8872d7e4a4e8ef858db9ffdbdf49dbb022a2a9df18904581544ab492dd22966e
+SIZE (xpi/firefox-i18n-56.0b1/dsb.xpi) = 488655
+SHA256 (xpi/firefox-i18n-56.0b1/el.xpi) = 7729999f17bc385901ffdaa8c063434b62306a36619c1cc49ab2bf15b3d30453
+SIZE (xpi/firefox-i18n-56.0b1/el.xpi) = 552883
+SHA256 (xpi/firefox-i18n-56.0b1/en-GB.xpi) = 81a4f78ef57b46b705fed1d6ed7679fb5bd5fdc764125ebc8184b491458a0040
+SIZE (xpi/firefox-i18n-56.0b1/en-GB.xpi) = 446124
+SHA256 (xpi/firefox-i18n-56.0b1/en-US.xpi) = 4c176fa8afd30fe128ab7165488f13e5d6e03836f10148b5cd58714ad012c6ee
+SIZE (xpi/firefox-i18n-56.0b1/en-US.xpi) = 445701
+SHA256 (xpi/firefox-i18n-56.0b1/en-ZA.xpi) = 7e4984f7f32c7699b9ff30417b51eda74d16b7b2bab3601738bf5d964ee39b60
+SIZE (xpi/firefox-i18n-56.0b1/en-ZA.xpi) = 444667
+SHA256 (xpi/firefox-i18n-56.0b1/eo.xpi) = 0bd84a11d460b64b207b0b9ae5645f796f7dcc497dec202774daaa3b89f7f8e7
+SIZE (xpi/firefox-i18n-56.0b1/eo.xpi) = 467843
+SHA256 (xpi/firefox-i18n-56.0b1/es-AR.xpi) = 1991f29026474146746ee71a5ef86cbb1356cb598342e329f93aad3ff4615fe1
+SIZE (xpi/firefox-i18n-56.0b1/es-AR.xpi) = 474190
+SHA256 (xpi/firefox-i18n-56.0b1/es-CL.xpi) = b00006c35422638864ab2ba0d159e0a23cab15c2781af4a3ed3cf34e3bdaa747
+SIZE (xpi/firefox-i18n-56.0b1/es-CL.xpi) = 478668
+SHA256 (xpi/firefox-i18n-56.0b1/es-ES.xpi) = d741a9d9099364d5b2c92c86f80a0c09dd3b78c6404097b007c74906a2f6a33d
+SIZE (xpi/firefox-i18n-56.0b1/es-ES.xpi) = 364379
+SHA256 (xpi/firefox-i18n-56.0b1/es-MX.xpi) = b6b8b8e0647232d712151b32e5efb355249808f5bd47a3aee103296cce719c6c
+SIZE (xpi/firefox-i18n-56.0b1/es-MX.xpi) = 481315
+SHA256 (xpi/firefox-i18n-56.0b1/et.xpi) = 25b5f1a98d5fe4c6dc81d412d976dc79f7da9d0a2ed62fe6df21ef4691b4af1c
+SIZE (xpi/firefox-i18n-56.0b1/et.xpi) = 462028
+SHA256 (xpi/firefox-i18n-56.0b1/eu.xpi) = 9a7aa4be11366d913d37d80f99caa05bfc0efa142787919e37aed128757a0d9a
+SIZE (xpi/firefox-i18n-56.0b1/eu.xpi) = 466768
+SHA256 (xpi/firefox-i18n-56.0b1/fa.xpi) = 898110bc2bd25a1f9fcda81b02c95b9a464993e12b44bcc21c3abb415ddf8184
+SIZE (xpi/firefox-i18n-56.0b1/fa.xpi) = 517415
+SHA256 (xpi/firefox-i18n-56.0b1/ff.xpi) = 760b1035bf7d29ade6b31a848cf791b366957203ce49ab774998f45eabce05f0
+SIZE (xpi/firefox-i18n-56.0b1/ff.xpi) = 461860
+SHA256 (xpi/firefox-i18n-56.0b1/fi.xpi) = e5f9bd3526be82f67f03f091eb513b3532c206ce140e7e58832787ca8fbe1593
+SIZE (xpi/firefox-i18n-56.0b1/fi.xpi) = 461217
+SHA256 (xpi/firefox-i18n-56.0b1/fr.xpi) = a3f4f53aae25570f6d316a60cfe735a5bb1acad6222f18ed776813fc87e6ae2f
+SIZE (xpi/firefox-i18n-56.0b1/fr.xpi) = 483323
+SHA256 (xpi/firefox-i18n-56.0b1/fy-NL.xpi) = 8700c551364f445fbda68e5e97f4926a15c4da32d0f238aee2ca5eb2b96238dc
+SIZE (xpi/firefox-i18n-56.0b1/fy-NL.xpi) = 476804
+SHA256 (xpi/firefox-i18n-56.0b1/ga-IE.xpi) = 489847a798fe28c3333c1d6d225ee0c87ac6d389ccbd2cd04b2092eb2b87ce62
+SIZE (xpi/firefox-i18n-56.0b1/ga-IE.xpi) = 488128
+SHA256 (xpi/firefox-i18n-56.0b1/gd.xpi) = a321811a4f5b051cc021d96516f6e2e104bccbeecf5ecc4913f62aa305cf0746
+SIZE (xpi/firefox-i18n-56.0b1/gd.xpi) = 475688
+SHA256 (xpi/firefox-i18n-56.0b1/gl.xpi) = 2bd25e6a349b56045f5bc14247022908a92b5d7c6e42edd6c3b502569e1bbf9d
+SIZE (xpi/firefox-i18n-56.0b1/gl.xpi) = 465231
+SHA256 (xpi/firefox-i18n-56.0b1/gn.xpi) = 5ac7af26986fbda50aeae171acf60c6d3a067f7421f765aed76087a76dbebe4f
+SIZE (xpi/firefox-i18n-56.0b1/gn.xpi) = 484550
+SHA256 (xpi/firefox-i18n-56.0b1/gu-IN.xpi) = 1b9c99da6217394db4117fc6af62ec380ff8bbbb2aee58ad5c85fd1bf76aee8d
+SIZE (xpi/firefox-i18n-56.0b1/gu-IN.xpi) = 512486
+SHA256 (xpi/firefox-i18n-56.0b1/he.xpi) = ba17825233eddb38378ccc6d65f8f06c9e5d0c1a63c00cf9b14c5adaf8738edb
+SIZE (xpi/firefox-i18n-56.0b1/he.xpi) = 487257
+SHA256 (xpi/firefox-i18n-56.0b1/hi-IN.xpi) = c460aac15419564e5622f0fbec5584543fb75ceb0dc5e5edf41522e3590ec9d1
+SIZE (xpi/firefox-i18n-56.0b1/hi-IN.xpi) = 535965
+SHA256 (xpi/firefox-i18n-56.0b1/hr.xpi) = bef1b02de45ff7890b33ce139c6452ea04e3d45e670950020462438f9d1566c9
+SIZE (xpi/firefox-i18n-56.0b1/hr.xpi) = 473820
+SHA256 (xpi/firefox-i18n-56.0b1/hsb.xpi) = 2835c02a078f136b55287ecb498458200684642ed7f2c766ae6ebb186aaa3cbe
+SIZE (xpi/firefox-i18n-56.0b1/hsb.xpi) = 486353
+SHA256 (xpi/firefox-i18n-56.0b1/hu.xpi) = d6c073f52cd2f89cdc8f0390249f13db3892555e444d3d870f1ccc56be20561a
+SIZE (xpi/firefox-i18n-56.0b1/hu.xpi) = 487561
+SHA256 (xpi/firefox-i18n-56.0b1/hy-AM.xpi) = 2339c238812a85a3dbe2d1fbd181c7cd9bc74269e2bd3beb296c444e00ffbb99
+SIZE (xpi/firefox-i18n-56.0b1/hy-AM.xpi) = 526461
+SHA256 (xpi/firefox-i18n-56.0b1/id.xpi) = 67584ac2610826d818cf514ad19dc2a4dd8f12368fecec9d442c9cd608e8fd25
+SIZE (xpi/firefox-i18n-56.0b1/id.xpi) = 457829
+SHA256 (xpi/firefox-i18n-56.0b1/is.xpi) = 127e543846495b445b0b30f945167ac96d70d259b72ce5940ae566e261afe7ff
+SIZE (xpi/firefox-i18n-56.0b1/is.xpi) = 466205
+SHA256 (xpi/firefox-i18n-56.0b1/it.xpi) = b23dc0a8f78e02c1240f977f92243e981ef4c42bb7679508d7a920d78b356f5f
+SIZE (xpi/firefox-i18n-56.0b1/it.xpi) = 357457
+SHA256 (xpi/firefox-i18n-56.0b1/ja.xpi) = 127f303ae88d3c947270514148d301c2480e56c9d42d504fc1cf05aa3495e509
+SIZE (xpi/firefox-i18n-56.0b1/ja.xpi) = 526423
+SHA256 (xpi/firefox-i18n-56.0b1/ka.xpi) = 9124e0792edfee04b48d0674704f667a561a5c3162f00a0a08e12f38efab1081
+SIZE (xpi/firefox-i18n-56.0b1/ka.xpi) = 507862
+SHA256 (xpi/firefox-i18n-56.0b1/kab.xpi) = 36487938f36d9226dd49f867b1f3828e6d179ae3cd8fea3099b36dd63da87a64
+SIZE (xpi/firefox-i18n-56.0b1/kab.xpi) = 476177
+SHA256 (xpi/firefox-i18n-56.0b1/kk.xpi) = 46e085732ef0f3b81c688ccfd9153bf997846ad2da6d37ff4c6a4b28d96761a2
+SIZE (xpi/firefox-i18n-56.0b1/kk.xpi) = 533694
+SHA256 (xpi/firefox-i18n-56.0b1/km.xpi) = 06dc4d42f14a882d12778d3e924d2078dd412e997b118345d02208a27748641e
+SIZE (xpi/firefox-i18n-56.0b1/km.xpi) = 548107
+SHA256 (xpi/firefox-i18n-56.0b1/kn.xpi) = a25f35cc2d6b3cf120edde1a87155cc225cf8f377049abb4a8f29219138aed95
+SIZE (xpi/firefox-i18n-56.0b1/kn.xpi) = 544237
+SHA256 (xpi/firefox-i18n-56.0b1/ko.xpi) = 6e857e42d809e4093fbbe609c056a2693a857658b04cbadcdbc0df392198a4de
+SIZE (xpi/firefox-i18n-56.0b1/ko.xpi) = 501657
+SHA256 (xpi/firefox-i18n-56.0b1/lij.xpi) = 712a0a2be68a5ea95059eac7c4cfd6fa570836aa1ce1fa91581d918ad3a29988
+SIZE (xpi/firefox-i18n-56.0b1/lij.xpi) = 466033
+SHA256 (xpi/firefox-i18n-56.0b1/lt.xpi) = 826b409a0f63a95bb1e178715f04f5b00804a93bd1d3a5c639c96ad96bf26071
+SIZE (xpi/firefox-i18n-56.0b1/lt.xpi) = 487111
+SHA256 (xpi/firefox-i18n-56.0b1/lv.xpi) = a0c9763f769f42189725f2d43e2bf10dba9e3f10bce56217a9743095e9adc44d
+SIZE (xpi/firefox-i18n-56.0b1/lv.xpi) = 480799
+SHA256 (xpi/firefox-i18n-56.0b1/mai.xpi) = 7139c3526d615b8049c250cea8e9265d3a3e5f43553b79c4062fa3d00f6a40af
+SIZE (xpi/firefox-i18n-56.0b1/mai.xpi) = 523460
+SHA256 (xpi/firefox-i18n-56.0b1/mk.xpi) = 071a2c25c3aa3dcff52aa187ff969a89022871e9cc8a1a8e92e81521922f7807
+SIZE (xpi/firefox-i18n-56.0b1/mk.xpi) = 506133
+SHA256 (xpi/firefox-i18n-56.0b1/ml.xpi) = dc49a4a04e31df5bb6ddf97c8e57c207ea45d8bdec7748db88a8bae3c768254d
+SIZE (xpi/firefox-i18n-56.0b1/ml.xpi) = 546308
+SHA256 (xpi/firefox-i18n-56.0b1/mr.xpi) = 28c6a6e83d0de7340f8a3db9625b76bc40c40662f7869256d5068deec5cb4eda
+SIZE (xpi/firefox-i18n-56.0b1/mr.xpi) = 535225
+SHA256 (xpi/firefox-i18n-56.0b1/ms.xpi) = eedac30fa348db7231249f37d65e69d4b6b917004bd4167182b453b47709acc9
+SIZE (xpi/firefox-i18n-56.0b1/ms.xpi) = 465275
+SHA256 (xpi/firefox-i18n-56.0b1/my.xpi) = 3c2ba0009e2af5f16b53b19291e156d42dba42e6e60352c1d111c203f1c279f7
+SIZE (xpi/firefox-i18n-56.0b1/my.xpi) = 535485
+SHA256 (xpi/firefox-i18n-56.0b1/nb-NO.xpi) = c30f9792dad9f3dc3bc58d09ceb182ee16950c21bf7240102672fd27f00ead2c
+SIZE (xpi/firefox-i18n-56.0b1/nb-NO.xpi) = 464328
+SHA256 (xpi/firefox-i18n-56.0b1/nl.xpi) = dd801df2eca1c3d066b10a11be6f4cac923b55e1c3ebe005a88219a27c41f405
+SIZE (xpi/firefox-i18n-56.0b1/nl.xpi) = 467817
+SHA256 (xpi/firefox-i18n-56.0b1/nn-NO.xpi) = 520f5d3c4d3fb14f8be937ef244e23a151b600566d721dbf2cc4952a3ada2e0c
+SIZE (xpi/firefox-i18n-56.0b1/nn-NO.xpi) = 464961
+SHA256 (xpi/firefox-i18n-56.0b1/or.xpi) = 10b34d93c44f289062ea509aa98491680ecf70c80631ab1b13e3b4b15307e5f3
+SIZE (xpi/firefox-i18n-56.0b1/or.xpi) = 516928
+SHA256 (xpi/firefox-i18n-56.0b1/pa-IN.xpi) = 527c19109c2e15f3fa21632af7c30c39390ca20379ca79589e129b26737115dd
+SIZE (xpi/firefox-i18n-56.0b1/pa-IN.xpi) = 507796
+SHA256 (xpi/firefox-i18n-56.0b1/pl.xpi) = 43604f8e1b97d8da3622a973e7646630bb3603f7b0987e766962819e38f58d9b
+SIZE (xpi/firefox-i18n-56.0b1/pl.xpi) = 378149
+SHA256 (xpi/firefox-i18n-56.0b1/pt-BR.xpi) = 09dfca88187e2885ba07639ec4abe0bb13f7a601f1d2e9ebf370c978b5346855
+SIZE (xpi/firefox-i18n-56.0b1/pt-BR.xpi) = 469701
+SHA256 (xpi/firefox-i18n-56.0b1/pt-PT.xpi) = 993091bd8ca3ef2a46aa054575a5929289d6a26b0581f663f6c0dfa91a5652c1
+SIZE (xpi/firefox-i18n-56.0b1/pt-PT.xpi) = 471537
+SHA256 (xpi/firefox-i18n-56.0b1/rm.xpi) = 7f5ba090ffb44f57e23bfc34fc8f82019a84019758d0080cc95a74c172b03ace
+SIZE (xpi/firefox-i18n-56.0b1/rm.xpi) = 466932
+SHA256 (xpi/firefox-i18n-56.0b1/ro.xpi) = be984bbdc3804036e8f78ec68d41240804c10a8849718c22e5fb3c48f68a1058
+SIZE (xpi/firefox-i18n-56.0b1/ro.xpi) = 469362
+SHA256 (xpi/firefox-i18n-56.0b1/ru.xpi) = 79dc589f689b5809ff4411259214db6b8681dc5526ab0885c741697bb01b0eef
+SIZE (xpi/firefox-i18n-56.0b1/ru.xpi) = 540181
+SHA256 (xpi/firefox-i18n-56.0b1/si.xpi) = 81a80d73e28a7cdfa4aad3fe1a2a5339b47de72986671164b258e48fab1a3fd3
+SIZE (xpi/firefox-i18n-56.0b1/si.xpi) = 514681
+SHA256 (xpi/firefox-i18n-56.0b1/sk.xpi) = c629771b649d636da592e4de1c452f384f100ad97578085f42ff578c3aeed92d
+SIZE (xpi/firefox-i18n-56.0b1/sk.xpi) = 494327
+SHA256 (xpi/firefox-i18n-56.0b1/sl.xpi) = e6dc80a580493bb4bf566d9366b378a5a05e9b6a0344c38ed2b10cee4eb7c924
+SIZE (xpi/firefox-i18n-56.0b1/sl.xpi) = 472564
+SHA256 (xpi/firefox-i18n-56.0b1/son.xpi) = e34c7e0333bf7484b6eaba7868025707d3ac6d88fdabff38f5e8a6207f5e1e2a
+SIZE (xpi/firefox-i18n-56.0b1/son.xpi) = 463080
+SHA256 (xpi/firefox-i18n-56.0b1/sq.xpi) = afc266e4047dee27345c0a6444b4ca92ab52c22981fe221ea85771bde3728bc6
+SIZE (xpi/firefox-i18n-56.0b1/sq.xpi) = 478090
+SHA256 (xpi/firefox-i18n-56.0b1/sr.xpi) = bcefd7cb107a92ebb36b5ed80679adce44cff27b484ac5a5dc0a9d10fd1162ce
+SIZE (xpi/firefox-i18n-56.0b1/sr.xpi) = 503249
+SHA256 (xpi/firefox-i18n-56.0b1/sv-SE.xpi) = 1b9dc86f9d0079599aac0a5442a5dfc885df4f6d32da781208d414c675566c3b
+SIZE (xpi/firefox-i18n-56.0b1/sv-SE.xpi) = 472906
+SHA256 (xpi/firefox-i18n-56.0b1/ta.xpi) = 6c58721853c044a51a57da6296b434757443a731954127dc000ee93195344cd0
+SIZE (xpi/firefox-i18n-56.0b1/ta.xpi) = 529407
+SHA256 (xpi/firefox-i18n-56.0b1/te.xpi) = 159cbe9398fe3b4b35f8ff4cc5f59f38af708b8c3ab3014dbf51da27385f4bd7
+SIZE (xpi/firefox-i18n-56.0b1/te.xpi) = 548885
+SHA256 (xpi/firefox-i18n-56.0b1/th.xpi) = 3d0527bf8d4e123e99fc9dc27e3e5ef44706fa4d03e3cebb3ef29ddf327fcc44
+SIZE (xpi/firefox-i18n-56.0b1/th.xpi) = 519059
+SHA256 (xpi/firefox-i18n-56.0b1/tr.xpi) = 11586e465484b5590370f22483ed1418ba1b4d5ba649543addc60a19a4830cca
+SIZE (xpi/firefox-i18n-56.0b1/tr.xpi) = 479826
+SHA256 (xpi/firefox-i18n-56.0b1/uk.xpi) = fe544ee562f63790d7e8e4b6b3191fbc78e8e0842781908ce69e8d5423315846
+SIZE (xpi/firefox-i18n-56.0b1/uk.xpi) = 534199
+SHA256 (xpi/firefox-i18n-56.0b1/ur.xpi) = a25c8ed3d6cb5d9d0e42f107e01561d04f07d1976c4d3f9101578780404f245a
+SIZE (xpi/firefox-i18n-56.0b1/ur.xpi) = 526109
+SHA256 (xpi/firefox-i18n-56.0b1/uz.xpi) = 8cca61c59f1153b82bcf88bae6e308154ca923fb46e2726d4fe62eb07043637c
+SIZE (xpi/firefox-i18n-56.0b1/uz.xpi) = 473862
+SHA256 (xpi/firefox-i18n-56.0b1/vi.xpi) = 925663ce548661100daf9a22a84a00c587769547fa7b0a157c9b2a7118eac80e
+SIZE (xpi/firefox-i18n-56.0b1/vi.xpi) = 485059
+SHA256 (xpi/firefox-i18n-56.0b1/xh.xpi) = 7321e4b31ece1a339f3cd57f23c8fa69686974ae6b8c0b42c5ee85b7b2a60abf
+SIZE (xpi/firefox-i18n-56.0b1/xh.xpi) = 476601
+SHA256 (xpi/firefox-i18n-56.0b1/zh-CN.xpi) = 656c406c0722978577d1db973f0abaf5b876023b160d737a4cc6a9234cd2ff2e
+SIZE (xpi/firefox-i18n-56.0b1/zh-CN.xpi) = 497771
+SHA256 (xpi/firefox-i18n-56.0b1/zh-TW.xpi) = 82cce54bcddbcb07e55efa141df16618995c4eecf3e6aeb817e0af9f7f893d9b
+SIZE (xpi/firefox-i18n-56.0b1/zh-TW.xpi) = 496513
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index a502f94d0537..76c6dea357e7 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	55.0
+DISTVERSION=	56.0b1
 DISTVERSIONSUFFIX=.source
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
@@ -12,20 +12,22 @@ MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nspr>=4.15:devel/nspr \
-		nss>=3.31:security/nss \
-		libevent>=2.0.22:devel/libevent \
-		harfbuzz>=1.4.6:print/harfbuzz \
+BUILD_DEPENDS=	nspr>=4.16:devel/nspr \
+		nss>=3.32:security/nss \
+		harfbuzz>=1.4.7:print/harfbuzz \
 		graphite2>=1.3.10:graphics/graphite2 \
-		png>=1.6.28:graphics/png \
+		png>=1.6.31:graphics/png \
 		libvorbis>=1.3.5,3:audio/libvorbis \
 		libvpx>=1.5.0:multimedia/libvpx \
-		sqlite3>=3.19.2:databases/sqlite3 \
+		sqlite3>=3.19.3:databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		yasm:devel/yasm \
+		llvm40>0:devel/llvm40 \
 		zip:archivers/zip
+#		libevent>=2.1.8:devel/libevent \
+#		icu>=59.1,1:devel/icu \
 #		soundtouch>=1.9.0:audio/soundtouch \
 
 LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
@@ -33,7 +35,7 @@ LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 USE_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr-45.* firefox-esr-3[18].* firefox-esr-24.*
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	-soundtouch
+USE_MOZILLA=	-event -icu -soundtouch # XXX bug 1372546, ports/218788
 MOZILLA_NAME=	Firefox
 
 USE_GL=		gl
@@ -41,16 +43,13 @@ USES=		tar:xz
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
+MOZ_EXPORT=	BINDGEN_CFLAGS="-isystem${LOCALBASE}/include/nspr \
+			-isystem${LOCALBASE}/include/pixman-1" # XXX bug 1341234
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
-OPTIONS_DEFINE=		RUST
 OPTIONS_DEFAULT=	BUNDLED_CAIRO
 OPTIONS_EXCLUDE=	GNOMEUI
-# XXX lang/rust and devel/cargo currently build only on these platforms
-OPTIONS_DEFAULT_aarch64=RUST
-OPTIONS_DEFAULT_amd64=	RUST
-OPTIONS_DEFAULT_i386=	RUST
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 1e8d58961193..4944979d39b5 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501791759
-SHA256 (firefox-55.0.source.tar.xz) = 0db9f315ca67c65e36b4298465af4d08c4245eedeccf04040051c2fdc9f4576f
-SIZE (firefox-55.0.source.tar.xz) = 235014712
+TIMESTAMP = 1502172478
+SHA256 (firefox-56.0b1.source.tar.xz) = 35353aee58d087d22fa83428b9b502663fafec5e287872b5917d1d19529011d2
+SIZE (firefox-56.0b1.source.tar.xz) = 252869028
diff --git a/www/firefox/files/patch-bug1312182 b/www/firefox/files/patch-bug1312182
deleted file mode 100644
index 9c2b65f06d65..000000000000
--- a/www/firefox/files/patch-bug1312182
+++ /dev/null
@@ -1,376 +0,0 @@
-commit 0d02dac1638ad
-Author: Alessio Placitelli <alessio.placitelli@gmail.com>
-Date:   Tue May 30 10:42:42 2017 +0200
-
-    Bug 1312182 - Consolidate the uses of MOZ_TELEMETRY_REPORTING in the code. r=flod,gfritzsche,jaws
-    
-    The MOZ_TELEMETRY_REPORTING define does not control whether or not Telemetry is enabled
-    but rather if it will send the gathered data to Mozilla servers. We still want to
-    display the about:preferences options and let developers know about this behaviour.
-    Please note that this patch is not changing any behaviour: it's only making it explicit
-    by showing the options as disabled rather than hiding them.
-    
-    MozReview-Commit-ID: 7A0y0E0hm0Q
-    
-    --HG--
-    extra : rebase_source : 36d1a7f5ec5c05b43731daf9507d3068fe7674ee
----
- browser/base/content/baseMenuOverlay.xul           |  2 +-
- browser/components/nsBrowserGlue.js                |  8 +--
- .../components/preferences/in-content-new/main.xul |  2 -
- .../preferences/in-content-new/privacy.js          | 32 +++++------
- .../preferences/in-content-new/privacy.xul         | 14 ++---
- .../components/preferences/in-content/advanced.js  | 63 +++++++++++-----------
- .../components/preferences/in-content/advanced.xul |  7 ++-
- .../chrome/browser/preferences-old/advanced.dtd    |  5 ++
- .../en-US/chrome/browser/preferences/advanced.dtd  |  5 ++
- 9 files changed, 67 insertions(+), 71 deletions(-)
-
-diff --git browser/base/content/baseMenuOverlay.xul browser/base/content/baseMenuOverlay.xul
-index 1befa2bb66cc..804bbdebb797 100644
---- browser/base/content/baseMenuOverlay.xul
-+++ browser/base/content/baseMenuOverlay.xul
-@@ -61,7 +61,7 @@
-                   onclick="checkForMiddleClick(this, event);"
-                   label="&helpKeyboardShortcuts.label;"
-                   accesskey="&helpKeyboardShortcuts.accesskey;"/>
--#ifdef MOZ_TELEMETRY_REPORTING
-+#ifdef MOZ_SERVICES_HEALTHREPORT
-         <menuitem id="healthReport"
-                   label="&healthReport2.label;"
-                   accesskey="&healthReport2.accesskey;"
-diff --git browser/components/nsBrowserGlue.js browser/components/nsBrowserGlue.js
-index 554c279356b9..1c21bf4c4323 100644
---- browser/components/nsBrowserGlue.js
-+++ browser/components/nsBrowserGlue.js
-@@ -528,9 +528,7 @@ BrowserGlue.prototype = {
-     os.addObserver(this, "distribution-customization-complete");
-     os.addObserver(this, "handle-xul-text-link");
-     os.addObserver(this, "profile-before-change");
--    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
--      os.addObserver(this, "keyword-search");
--    }
-+    os.addObserver(this, "keyword-search");
-     os.addObserver(this, "browser-search-engine-modified");
-     os.addObserver(this, "restart-in-safe-mode");
-     os.addObserver(this, "flash-plugin-hang");
-@@ -583,9 +581,7 @@ BrowserGlue.prototype = {
-       os.removeObserver(this, "places-database-locked");
-     os.removeObserver(this, "handle-xul-text-link");
-     os.removeObserver(this, "profile-before-change");
--    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
--      os.removeObserver(this, "keyword-search");
--    }
-+    os.removeObserver(this, "keyword-search");
-     os.removeObserver(this, "browser-search-engine-modified");
-     os.removeObserver(this, "flash-plugin-hang");
-     os.removeObserver(this, "xpi-signature-changed");
-diff --git browser/components/preferences/in-content-new/main.xul browser/components/preferences/in-content-new/main.xul
-index e89ee1891c91..8672557bede2 100644
---- browser/components/preferences/in-content-new/main.xul
-+++ browser/components/preferences/in-content-new/main.xul
-@@ -183,11 +183,9 @@
-               name="layout.spellcheckDefault"
-               type="int"/>
- 
--#ifdef MOZ_TELEMETRY_REPORTING
-   <preference id="toolkit.telemetry.enabled"
-               name="toolkit.telemetry.enabled"
-               type="bool"/>
--#endif
- 
-   <preference id="browser.preferences.defaultPerformanceSettings.enabled"
-               name="browser.preferences.defaultPerformanceSettings.enabled"
-diff --git browser/components/preferences/in-content-new/privacy.js browser/components/preferences/in-content-new/privacy.js
-index be057bfad611..73f72391b991 100644
---- browser/components/preferences/in-content-new/privacy.js
-+++ browser/components/preferences/in-content-new/privacy.js
-@@ -321,11 +321,9 @@ var gPrivacyPane = {
-       this.initSubmitCrashes();
-     }
-     this.initTelemetry();
--    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
--      this.initSubmitHealthReport();
--      setEventListener("submitHealthReportBox", "command",
--                       gPrivacyPane.updateSubmitHealthReport);
--    }
-+    this.initSubmitHealthReport();
-+    setEventListener("submitHealthReportBox", "command",
-+                     gPrivacyPane.updateSubmitHealthReport);
- 
-     // Append search keywords into the elements could open subdialogs.
-     let bundlePrefs = document.getElementById("bundlePreferences");
-@@ -1414,8 +1412,10 @@ var gPrivacyPane = {
-    * In all cases, set up the Learn More link sanely.
-    */
-   initTelemetry() {
--    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
--      this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");
-+    this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");
-+    // If we're not sending any Telemetry, disable the telemetry upload checkbox as well.
-+    if (!AppConstants.MOZ_TELEMETRY_REPORTING) {
-+      document.getElementById("submitTelemetryBox").setAttribute("disabled", "true");
-     }
-   },
- 
-@@ -1439,9 +1439,6 @@ var gPrivacyPane = {
-    * @param {Boolean} aEnabled False disables the controls, true enables them.
-    */
-   setTelemetrySectionEnabled(aEnabled) {
--    if (!AppConstants.MOZ_TELEMETRY_REPORTING) {
--      return;
--    }
-     // If FHR is disabled, additional data sharing should be disabled as well.
-     let disabled = !aEnabled;
-     document.getElementById("submitTelemetryBox").disabled = disabled;
-@@ -1456,19 +1453,21 @@ var gPrivacyPane = {
-    * Initialize the health report service reference and checkbox.
-    */
-   initSubmitHealthReport() {
--    if (!AppConstants.MOZ_TELEMETRY_REPORTING) {
--      return;
--    }
-     this._setupLearnMoreLink("datareporting.healthreport.infoURL", "FHRLearnMore");
- 
-     let checkbox = document.getElementById("submitHealthReportBox");
- 
--    if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED)) {
-+    // Telemetry is only sending data if MOZ_TELEMETRY_REPORTING is defined.
-+    // We still want to display the preferences panel if that's not the case, but
-+    // we want it to be disabled and unchecked.
-+    if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED) ||
-+        !AppConstants.MOZ_TELEMETRY_REPORTING) {
-       checkbox.setAttribute("disabled", "true");
-       return;
-     }
- 
--    checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED);
-+    checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED) &&
-+                       AppConstants.MOZ_TELEMETRY_REPORTING;
-     this.setTelemetrySectionEnabled(checkbox.checked);
-   },
- 
-@@ -1476,9 +1475,6 @@ var gPrivacyPane = {
-    * Update the health report preference with state from checkbox.
-    */
-   updateSubmitHealthReport() {
--    if (!AppConstants.MOZ_TELEMETRY_REPORTING) {
--      return;
--    }
-     let checkbox = document.getElementById("submitHealthReportBox");
-     Services.prefs.setBoolPref(PREF_UPLOAD_ENABLED, checkbox.checked);
-     this.setTelemetrySectionEnabled(checkbox.checked);
-diff --git browser/components/preferences/in-content-new/privacy.xul browser/components/preferences/in-content-new/privacy.xul
-index 9d531bd8274b..8030567573f8 100644
---- browser/components/preferences/in-content-new/privacy.xul
-+++ browser/components/preferences/in-content-new/privacy.xul
-@@ -760,9 +760,14 @@
- </groupbox>
- 
- <!-- Data Choices -->
--#ifdef MOZ_TELEMETRY_REPORTING
--<groupbox id="historyGroup" data-category="panePrivacy" data-subcategory="reports" hidden="true">
-+#ifdef MOZ_DATA_REPORTING
-+
-+<groupbox id="telemetryGroup" data-category="panePrivacy" data-subcategory="reports" hidden="true">
- <caption><label>&reports.label;</label></caption>
-+#ifndef MOZ_TELEMETRY_REPORTING
-+  <description id="TelemetryDisabledDesc" control="telemetryGroup">&healthReportingDisabled.label;</description>
-+#endif
-+
-   <hbox align="center">
-     <checkbox id="submitHealthReportBox" label="&enableHealthReport.label;"
-               accesskey="&enableHealthReport.accesskey;"/>
-@@ -782,14 +787,9 @@
-                  class="indent">&telemetryDesc.label;</description>
-   </vbox>
- </groupbox>
--#endif
- 
--#ifdef MOZ_DATA_REPORTING
- #ifdef MOZ_CRASHREPORTER
- <groupbox id="crashReporterGroup" data-category="panePrivacy" data-subcategory="reports" hidden="true">
--#ifndef MOZ_TELEMETRY_REPORTING
--<caption><label>&reports.label;</label></caption>
--#endif
-   <hbox align="center">
-     <checkbox id="automaticallySubmitCrashesBox"
-               preference="browser.crashReports.unsubmittedCheck.autoSubmit"
-diff --git browser/components/preferences/in-content/advanced.js browser/components/preferences/in-content/advanced.js
-index a6a2abaad9cf..9c7a2e716403 100644
---- browser/components/preferences/in-content/advanced.js
-+++ browser/components/preferences/in-content/advanced.js
-@@ -46,9 +46,7 @@ var gAdvancedPane = {
-       this.initSubmitCrashes();
-     }
-     this.initTelemetry();
--    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
--      this.initSubmitHealthReport();
--    }
-+    this.initSubmitHealthReport();
-     this.updateOnScreenKeyboardVisibility();
-     this.updateCacheSizeInputField();
-     this.updateActualCacheSize();
-@@ -78,10 +76,8 @@ var gAdvancedPane = {
-                      gAdvancedPane.updateHardwareAcceleration);
-     setEventListener("advancedPrefs", "select",
-                      gAdvancedPane.tabSelectionChanged);
--    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
--      setEventListener("submitHealthReportBox", "command",
--                       gAdvancedPane.updateSubmitHealthReport);
--    }
-+    setEventListener("submitHealthReportBox", "command",
-+                     gAdvancedPane.updateSubmitHealthReport);
- 
-     setEventListener("connectionSettings", "command",
-                      gAdvancedPane.showConnections);
-@@ -293,8 +289,10 @@ var gAdvancedPane = {
-    * In all cases, set up the Learn More link sanely.
-    */
-   initTelemetry() {
--    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
--      this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");
-+    this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");
-+    // If we're not sending any Telemetry, disable the telemetry upload checkbox as well.
-+    if (!AppConstants.MOZ_TELEMETRY_REPORTING) {
-+      document.getElementById("submitTelemetryBox").setAttribute("disabled", "true");
-     }
-   },
- 
-@@ -303,46 +301,45 @@ var gAdvancedPane = {
-    * @param {Boolean} aEnabled False disables the controls, true enables them.
-    */
-   setTelemetrySectionEnabled(aEnabled) {
--    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
--      // If FHR is disabled, additional data sharing should be disabled as well.
--      let disabled = !aEnabled;
--      document.getElementById("submitTelemetryBox").disabled = disabled;
--      if (disabled) {
--        // If we disable FHR, untick the telemetry checkbox.
--        Services.prefs.setBoolPref("toolkit.telemetry.enabled", false);
--      }
--      document.getElementById("telemetryDataDesc").disabled = disabled;
-+    // If FHR is disabled, additional data sharing should be disabled as well.
-+    let disabled = !aEnabled;
-+    document.getElementById("submitTelemetryBox").disabled = disabled;
-+    if (disabled) {
-+      // If we disable FHR, untick the telemetry checkbox.
-+      Services.prefs.setBoolPref("toolkit.telemetry.enabled", false);
-     }
-+    document.getElementById("telemetryDataDesc").disabled = disabled;
-   },
- 
-   /**
-    * Initialize the health report service reference and checkbox.
-    */
-   initSubmitHealthReport() {
--    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
--      this._setupLearnMoreLink("datareporting.healthreport.infoURL", "FHRLearnMore");
--
--      let checkbox = document.getElementById("submitHealthReportBox");
-+    this._setupLearnMoreLink("datareporting.healthreport.infoURL", "FHRLearnMore");
- 
--      if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED)) {
--        checkbox.setAttribute("disabled", "true");
--        return;
--      }
-+    let checkbox = document.getElementById("submitHealthReportBox");
- 
--      checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED);
--      this.setTelemetrySectionEnabled(checkbox.checked);
-+    // Telemetry is only sending data if MOZ_TELEMETRY_REPORTING is defined.
-+    // We still want to display the preferences panel if that's not the case, but
-+    // we want it to be disabled and unchecked.
-+    if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED) ||
-+        !AppConstants.MOZ_TELEMETRY_REPORTING) {
-+      checkbox.setAttribute("disabled", "true");
-+      return;
-     }
-+
-+    checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED) &&
-+                       AppConstants.MOZ_TELEMETRY_REPORTING;
-+    this.setTelemetrySectionEnabled(checkbox.checked);
-   },
- 
-   /**
-    * Update the health report preference with state from checkbox.
-    */
-   updateSubmitHealthReport() {
--    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
--      let checkbox = document.getElementById("submitHealthReportBox");
--      Services.prefs.setBoolPref(PREF_UPLOAD_ENABLED, checkbox.checked);
--      this.setTelemetrySectionEnabled(checkbox.checked);
--    }
-+    let checkbox = document.getElementById("submitHealthReportBox");
-+    Services.prefs.setBoolPref(PREF_UPLOAD_ENABLED, checkbox.checked);
-+    this.setTelemetrySectionEnabled(checkbox.checked);
-   },
- 
-   updateOnScreenKeyboardVisibility() {
-diff --git browser/components/preferences/in-content/advanced.xul browser/components/preferences/in-content/advanced.xul
-index f2330223fb18..1b2c62168a59 100644
---- browser/components/preferences/in-content/advanced.xul
-+++ browser/components/preferences/in-content/advanced.xul
-@@ -37,12 +37,9 @@
-   <preference id="layout.spellcheckDefault"
-               name="layout.spellcheckDefault"
-               type="int"/>
--
--#ifdef MOZ_TELEMETRY_REPORTING
-   <preference id="toolkit.telemetry.enabled"
-               name="toolkit.telemetry.enabled"
-               type="bool"/>
--#endif
- 
-   <!-- Data Choices tab -->
- #ifdef MOZ_CRASHREPORTER
-@@ -189,6 +186,9 @@
-     <!-- Data Choices -->
-     <tabpanel id="dataChoicesPanel" orient="vertical">
- #ifdef MOZ_TELEMETRY_REPORTING
-+      <description>&healthReportingDisabled.label;</description>
-+      <separator class="thin"/>
-+#endif
-       <groupbox>
-         <caption>
-           <checkbox id="submitHealthReportBox" label="&enableHealthReport.label;"
-@@ -216,7 +216,6 @@
-           </hbox>
-         </vbox>
-       </groupbox>
--#endif
- #ifdef MOZ_CRASHREPORTER
-       <groupbox>
-         <caption>
-diff --git browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd
-index 215b800d3385..bf23c4fd251f 100644
---- browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd
-+++ browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd
-@@ -28,6 +28,11 @@
- 
- <!ENTITY dataChoicesTab.label            "Data Choices">
- 
-+<!-- LOCALIZATION NOTE (healthReportingDisabled.label): This message is displayed above
-+disabled data sharing options in developer builds or builds with no Telemetry support
-+available. -->
-+<!ENTITY healthReportingDisabled.label   "Data reporting is disabled for this build configuration">
-+
- <!ENTITY healthReportDesc.label          "Helps you understand your browser performance and shares data with &vendorShortName; about your browser health">
- <!ENTITY enableHealthReport.label        "Enable &brandShortName; Health Report">
- <!ENTITY enableHealthReport.accesskey    "R">
-diff --git browser/locales/en-US/chrome/browser/preferences/advanced.dtd browser/locales/en-US/chrome/browser/preferences/advanced.dtd
-index 58a6b38630cf..6c478e48244a 100644
---- browser/locales/en-US/chrome/browser/preferences/advanced.dtd
-+++ browser/locales/en-US/chrome/browser/preferences/advanced.dtd
-@@ -28,6 +28,11 @@
- 
- <!ENTITY dataChoicesTab.label            "Data Choices">
- 
-+<!-- LOCALIZATION NOTE (healthReportingDisabled.label): This message is displayed above
-+disabled data sharing options in developer builds or builds with no Telemetry support
-+available. -->
-+<!ENTITY healthReportingDisabled.label   "Data reporting is disabled for this build configuration">
-+
- <!ENTITY healthReportDesc.label          "Helps you understand your browser performance and shares data with &vendorShortName; about your browser health">
- <!ENTITY enableHealthReport.label        "Enable &brandShortName; Health Report">
- <!ENTITY enableHealthReport.accesskey    "R">
diff --git a/www/firefox/files/patch-bug1384655 b/www/firefox/files/patch-bug1384655
new file mode 100644
index 000000000000..48d7675770eb
--- /dev/null
+++ b/www/firefox/files/patch-bug1384655
@@ -0,0 +1,72 @@
+commit 023f1a00c766
+Author: Paul Adenot <paul@paul.cx>
+Date:   Tue Aug 8 10:00:37 2017 +0200
+
+    Bug 1384655 - Remove obsolete latency measuring macros in downstream code we don't use anymore. r=jesup
+    
+    MozReview-Commit-ID: ARAWGe7yFM4
+---
+ .../modules/audio_device/linux/audio_device_alsa_linux.cc      | 10 ----------
+ .../webrtc/modules/audio_device/sndio/audio_device_sndio.cc    |  6 ------
+ 2 files changed, 16 deletions(-)
+
+diff --git build/gyp.mozbuild build/gyp.mozbuild
+index 765540f30834..4e1c10df74ac 100644
+--- build/gyp.mozbuild
++++ build/gyp.mozbuild
+@@ -20,7 +20,7 @@ gyp_vars.update({
+     'use_official_google_api_keys': 0,
+     'have_clock_monotonic': 1 if CONFIG['HAVE_CLOCK_MONOTONIC'] else 0,
+     'have_ethtool_cmd_speed_hi': 1 if CONFIG['MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI'] else 0,
+-    'include_alsa_audio': 0,
++    'include_alsa_audio': 1 if CONFIG['MOZ_ALSA'] else 0,
+     'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0,
+     'include_sndio_audio': 1 if CONFIG['MOZ_SNDIO'] else 0,
+     'use_libv4l2': 1 if CONFIG['MOZ_LIBV4L2'] else 0,
+diff --git media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
+index c9a77d39b789..8926911abff4 100644
+--- media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
++++ media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc
+@@ -17,14 +17,6 @@
+ #include "webrtc/system_wrappers/include/event_wrapper.h"
+ #include "webrtc/system_wrappers/include/sleep.h"
+ #include "webrtc/system_wrappers/include/trace.h"
+- 
+-#include "Latency.h"
+-
+-#define LOG_FIRST_CAPTURE(x) LogTime(AsyncLatencyLogger::AudioCaptureBase, \
+-                                     reinterpret_cast<uint64_t>(x), 0)
+-#define LOG_CAPTURE_FRAMES(x, frames) LogLatency(AsyncLatencyLogger::AudioCapture, \
+-                                                 reinterpret_cast<uint64_t>(x), frames)
+-
+ 
+ webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable;
+ 
+@@ -2143,10 +2135,8 @@ bool AudioDeviceLinuxALSA::RecThreadProcess()
+             _recordingFramesLeft = _recordingFramesIn10MS;
+ 
+             if (_firstRecord) {
+-              LOG_FIRST_CAPTURE(this);
+               _firstRecord = false;
+             }
+-            LOG_CAPTURE_FRAMES(this, _recordingFramesIn10MS);
+             // store the recorded buffer (no action will be taken if the
+             // #recorded samples is not a full buffer)
+             _ptrAudioBuffer->SetRecordedBuffer(_recordingBuffer,
+diff --git media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc
+index 68bc72ec8680..0ec39f21c8c1 100644
+--- media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc
++++ media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc
+@@ -18,12 +18,6 @@
+ #include "webrtc/system_wrappers/include/sleep.h"
+ #include "webrtc/system_wrappers/include/trace.h"
+ 
+-#include "Latency.h"
+-
+-#define LOG_FIRST_CAPTURE(x) LogTime(AsyncLatencyLogger::AudioCaptureBase, \
+-                                     reinterpret_cast<uint64_t>(x), 0)
+-#define LOG_CAPTURE_FRAMES(x, frames) LogLatency(AsyncLatencyLogger::AudioCapture, \
+-                                                 reinterpret_cast<uint64_t>(x), frames)
+ extern "C"
+ {
+     static void playOnmove(void *arg, int delta)
diff --git a/www/firefox/files/patch-bug1385597 b/www/firefox/files/patch-bug1385597
deleted file mode 100644
index c04746e89449..000000000000
--- a/www/firefox/files/patch-bug1385597
+++ /dev/null
@@ -1,24 +0,0 @@
-Properly restore system timezone on other POSIX systems. r?ehsan
-    
---- toolkit/components/resistfingerprinting/nsRFPService.cpp
-+++ toolkit/components/resistfingerprinting/nsRFPService.cpp
-@@ -162,14 +162,14 @@ nsRFPService::UpdatePref()
-         PR_SetEnv(tz);
-       }
-     } else {
--#if defined(XP_LINUX) || defined (XP_MACOSX)
--      // For POSIX like system, we reset the TZ to the /etc/localtime, which is the
--      // system timezone.
--      PR_SetEnv("TZ=:/etc/localtime");
--#else
-+#if defined(XP_WIN)
-       // For Windows, we reset the TZ to an empty string. This will make Windows to use
-       // its system timezone.
-       PR_SetEnv("TZ=");
-+#else
-+      // For POSIX like system, we reset the TZ to the /etc/localtime, which is the
-+      // system timezone.
-+      PR_SetEnv("TZ=:/etc/localtime");
- #endif
-     }
-   }
diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985
index 8e23b9382748..8e9e7d24a024 100644
--- a/www/firefox/files/patch-bug826985
+++ b/www/firefox/files/patch-bug826985
@@ -107,10 +107,11 @@ index 12df1b3..e9863ba 100644
  
  #include <new>
  
-@@ -26,6 +31,15 @@
- #include "critical_section_wrapper.h"
- #include "video_capture_linux.h"
- 
+@@ -32,6 +35,15 @@
+ #include "webrtc/modules/video_capture/linux/video_capture_linux.h"
+ #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
+ #include "webrtc/system_wrappers/include/trace.h"
++
 +#ifdef HAVE_LIBV4L2
 +#define open	v4l2_open
 +#define close	v4l2_close
@@ -119,10 +120,9 @@ index 12df1b3..e9863ba 100644
 +#define mmap	v4l2_mmap
 +#define munmap	v4l2_munmap
 +#endif
-+
- namespace webrtc
- {
- namespace videocapturemodule
+ 
+ namespace webrtc {
+ namespace videocapturemodule {
 diff --git media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
 index d46b5aa..e452223 100644
 --- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
index 0deb5a504f56..c2c40cc26b26 100644
--- a/www/firefox/files/patch-bug847568
+++ b/www/firefox/files/patch-bug847568
@@ -261,7 +261,7 @@ index 9297e4d6f501..d8e273887e4b 100644
 +option('--with-system-harfbuzz',
 +       help="Use system harfbuzz (located with pkgconfig)")
 +
-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.6',
++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.7',
 +                                    when='--with-system-harfbuzz')
 +
 +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
diff --git a/www/firefox/files/patch-rust-option b/www/firefox/files/patch-rust-option
deleted file mode 100644
index e60e11b111ee..000000000000
--- a/www/firefox/files/patch-rust-option
+++ /dev/null
@@ -1,816 +0,0 @@
-Revert bug 1284816, bug 1341967, bug 1336153 to postpone bustage on non-x86 archs.
-
-diff --git browser/confvars.sh browser/confvars.sh
-index d8dcd99c2757..740d9d3e5fcf 100755
---- browser/confvars.sh
-+++ browser/confvars.sh
-@@ -30,6 +30,7 @@ if test "$OS_ARCH" = "WINNT"; then
-   fi
- fi
- 
-+MOZ_RUST_MP4PARSE=1
- if test "$NIGHTLY_BUILD"; then
-   MOZ_RUST_URLPARSE=1
- fi
-diff --git build/moz.configure/rust.configure build/moz.configure/rust.configure
-index 267d989f1597..f709820e60ae 100644
---- build/moz.configure/rust.configure
-+++ build/moz.configure/rust.configure
-@@ -4,10 +4,20 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
--# Rust is required by `rust_compiler` below. We allow_missing here
--# to propagate failures to the better error message there.
--rustc = check_prog('RUSTC', ['rustc'], allow_missing=True)
--cargo = check_prog('CARGO', ['cargo'], allow_missing=True)
-+option('--disable-rust', help='Don\'t include Rust language sources')
-+
-+@depends('--enable-rust')
-+def rust_compiler_names(value):
-+    if value:
-+        return ['rustc']
-+
-+@depends('--enable-rust')
-+def cargo_binary_names(value):
-+    if value:
-+        return ['cargo']
-+
-+rustc = check_prog('RUSTC', rust_compiler_names, allow_missing=True)
-+cargo = check_prog('CARGO', cargo_binary_names, allow_missing=True)
- 
- @depends_if(rustc)
- @checking('rustc version', lambda info: info.version)
-@@ -43,9 +53,12 @@ def cargo_info(cargo):
-         version=Version(version),
-     )
- 
--@depends(rustc_info, cargo_info)
-+@depends('--enable-rust', rustc_info, cargo_info)
- @imports(_from='textwrap', _import='dedent')
--def rust_compiler(rustc_info, cargo_info):
-+def rust_compiler(value, rustc_info, cargo_info):
-+    if not value:
-+        return None
-+
-     if not rustc_info:
-         die(dedent('''\
-         Rust compiler not found.
-@@ -97,6 +110,9 @@ def rust_compiler(rustc_info, cargo_info):
- 
-     return True
- 
-+set_define('MOZ_RUST', rust_compiler)
-+set_config('MOZ_RUST', rust_compiler)
-+
- @template
- def rust_triple_alias(host_or_target):
-     """Template defining the alias used for rustc's --target flag.
-@@ -227,7 +243,8 @@ set_config('RUST_HOST_TARGET', rust_host_triple)
- 
- @depends(rust_target_triple)
- def rust_target_env_name(triple):
--    return triple.upper().replace('-','_')
-+    if triple:
-+        return triple.upper().replace('-','_')
- 
- # We need this to form various Cargo environment variables, as there is no
- # uppercase function in make, and we don't want to shell out just for
-@@ -235,5 +252,6 @@ def rust_target_env_name(triple):
- set_config('RUST_TARGET_ENV_NAME', rust_target_env_name)
- 
- # Until we remove all the other Rust checks in old-configure.
-+add_old_configure_assignment('MOZ_RUST', rust_compiler)
- add_old_configure_assignment('RUSTC', rustc)
- add_old_configure_assignment('RUST_TARGET', rust_target_triple)
-diff --git config/rules.mk config/rules.mk
-index 94cc5556e3d0..7b143ebc5146 100644
---- config/rules.mk
-+++ config/rules.mk
-@@ -900,6 +900,7 @@ endif
- 
- $(foreach file,$(DUMP_SYMS_TARGETS),$(eval $(call syms_template,$(file),$(file)_syms.track)))
- 
-+ifdef MOZ_RUST
- cargo_host_flag := --target=$(RUST_HOST_TARGET)
- cargo_target_flag := --target=$(RUST_TARGET)
- 
-@@ -1055,6 +1056,7 @@ force-cargo-host-program-build:
- 
- $(HOST_RUST_PROGRAMS): force-cargo-host-program-build
- endif # HOST_RUST_PROGRAMS
-+endif # MOZ_RUST
- 
- $(SOBJS):
- 	$(REPORT_BUILD)
-diff --git dom/media/MediaPrefs.h dom/media/MediaPrefs.h
-index 4dcc659222a4..559334d89fd1 100644
---- dom/media/MediaPrefs.h
-+++ dom/media/MediaPrefs.h
-@@ -183,7 +183,7 @@ private:
-   DECL_MEDIA_PREF("media.ogg.flac.enabled",                   FlacInOgg, bool, false);
-   DECL_MEDIA_PREF("media.flac.enabled",                       FlacEnabled, bool, true);
- 
--#if !defined(RELEASE_OR_BETA)
-+#if defined(MOZ_RUST_MP4PARSE) && !defined(RELEASE_OR_BETA)
-   DECL_MEDIA_PREF("media.rust.test_mode",                     RustTestMode, bool, false);
- #endif
- 
-diff --git dom/media/gtest/moz.build dom/media/gtest/moz.build
-index c66ac4a9437f..e2203c0a4321 100644
---- dom/media/gtest/moz.build
-+++ dom/media/gtest/moz.build
-@@ -22,7 +22,6 @@ UNIFIED_SOURCES += [
-     'TestMozPromise.cpp',
-     'TestMP3Demuxer.cpp',
-     'TestMP4Demuxer.cpp',
--    'TestRust.cpp',
-     'TestTrackEncoder.cpp',
-     'TestVideoSegment.cpp',
-     'TestVideoUtils.cpp',
-@@ -36,6 +35,9 @@ if CONFIG['MOZ_WEBM_ENCODER']:
-         'TestWebMWriter.cpp',
-     ]
- 
-+if CONFIG['MOZ_RUST']:
-+    UNIFIED_SOURCES += ['TestRust.cpp',]
-+
- TEST_HARNESS_FILES.gtest += [
-     '../test/gizmo-frag.mp4',
-     '../test/gizmo.mp4',
-diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build
-index c65b53b80f63..8953f646e831 100644
---- media/libcubeb/src/moz.build
-+++ media/libcubeb/src/moz.build
-@@ -32,7 +32,8 @@ if CONFIG['MOZ_PULSEAUDIO']:
-         'cubeb_pulse.c',
-     ]
-     DEFINES['USE_PULSE'] = True
--    DEFINES['USE_PULSE_RUST'] = True
-+    if CONFIG['MOZ_RUST']:
-+        DEFINES['USE_PULSE_RUST'] = True
- 
- if CONFIG['MOZ_JACK']:
-     SOURCES += [
-diff --git media/libstagefright/binding/DecoderData.cpp media/libstagefright/binding/DecoderData.cpp
-index 109ea329d154..a06e533b1e62 100644
---- media/libstagefright/binding/DecoderData.cpp
-+++ media/libstagefright/binding/DecoderData.cpp
-@@ -13,9 +13,11 @@
- #include "mozilla/ArrayUtils.h"
- #include "include/ESDS.h"
- 
-+#ifdef MOZ_RUST_MP4PARSE
- // OpusDecoder header is really needed only by MP4 in rust
- #include "OpusDecoder.h"
- #include "mp4parse.h"
-+#endif // MOZ_RUST_MP4PARSE
- 
- using namespace stagefright;
- using mozilla::media::TimeUnit;
-@@ -177,6 +179,7 @@ MP4VideoInfo::Update(const MetaData* aMetaData, const char* aMimeType)
-   FindData(aMetaData, kKeyAVCC, mExtraData);
- }
- 
-+#ifdef MOZ_RUST_MP4PARSE
- static void
- UpdateTrackProtectedInfo(mozilla::TrackInfo& aConfig,
-                          const mp4parse_sinf_info& aSinf)
-@@ -263,6 +266,7 @@ MP4VideoInfo::Update(const mp4parse_track_info* track,
-     mExtraData->AppendElements(video->extra_data.data, video->extra_data.length);
-   }
- }
-+#endif // MOZ_RUST_MP4PARSE
- 
- bool
- MP4VideoInfo::IsValid() const
-diff --git media/libstagefright/binding/MP4Metadata.cpp media/libstagefright/binding/MP4Metadata.cpp
-index 5c3810d99a38..5d14dfd8b8a9 100644
---- media/libstagefright/binding/MP4Metadata.cpp
-+++ media/libstagefright/binding/MP4Metadata.cpp
-@@ -20,14 +20,18 @@
- #include "mp4_demuxer/MP4Metadata.h"
- #include "mp4_demuxer/Stream.h"
- #include "MediaPrefs.h"
-+#ifdef MOZ_RUST_MP4PARSE
- #include "mp4parse.h"
-+#endif // MOZ_RUST_MP4PARSE
- 
- #include <limits>
- #include <stdint.h>
- #include <vector>
- 
- 
-+#ifdef MOZ_RUST_MP4PARSE
- struct FreeMP4Parser { void operator()(mp4parse_parser* aPtr) { mp4parse_free(aPtr); } };
-+#endif // MOZ_RUST_MP4PARSE
- 
- using namespace stagefright;
- using mozilla::media::TimeUnit;
-@@ -105,6 +109,7 @@ private:
-   bool mCanSeek;
- };
- 
-+#ifdef MOZ_RUST_MP4PARSE
- // Wrap an mp4_demuxer::Stream to remember the read offset.
- 
- class RustStreamAdaptor {
-@@ -151,6 +156,7 @@ private:
-   RustStreamAdaptor mRustSource;
-   mozilla::UniquePtr<mp4parse_parser, FreeMP4Parser> mRustParser;
- };
-+#endif // MOZ_RUST_MP4PARSE
- 
- class IndiceWrapperStagefright : public IndiceWrapper {
- public:
-@@ -187,6 +193,7 @@ IndiceWrapperStagefright::GetIndice(size_t aIndex, Index::Indice& aIndice) const
-   return true;
- }
- 
-+#ifdef MOZ_RUST_MP4PARSE
- // the owner of mIndice is rust mp4 paser, so lifetime of this class
- // SHOULD NOT longer than rust parser.
- class IndiceWrapperRust : public IndiceWrapper
-@@ -232,9 +239,11 @@ IndiceWrapperRust::GetIndice(size_t aIndex, Index::Indice& aIndice) const
-   aIndice.sync = indice->sync;
-   return true;
- }
-+#endif // MOZ_RUST_MP4PARSE
- 
- MP4Metadata::MP4Metadata(Stream* aSource)
-  : mStagefright(MakeUnique<MP4MetadataStagefright>(aSource))
-+#ifdef MOZ_RUST_MP4PARSE
-  , mRust(MakeUnique<MP4MetadataRust>(aSource))
-  , mPreferRust(MediaPrefs::EnableRustMP4Parser())
-  , mReportedAudioTrackTelemetry(false)
-@@ -242,6 +251,7 @@ MP4Metadata::MP4Metadata(Stream* aSource)
- #ifndef RELEASE_OR_BETA
-  , mRustTestMode(MediaPrefs::RustTestMode())
- #endif
-+#endif // MOZ_RUST_MP4PARSE
- {
- }
- 
-@@ -274,8 +284,11 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
-   MP4Metadata::ResultAndTrackCount numTracks =
-     mStagefright->GetNumberTracks(aType);
- 
-+#ifdef MOZ_RUST_MP4PARSE
-   if (!mRust) {
-+#endif // MOZ_RUST_MP4PARSE
-     return numTracks;
-+#ifdef MOZ_RUST_MP4PARSE
-   }
- 
-   MP4Metadata::ResultAndTrackCount numTracksRust =
-@@ -350,8 +363,10 @@ MP4Metadata::GetNumberTracks(mozilla::TrackInfo::TrackType aType) const
-   // Same non-error numbers, just return any.
-   // (Choosing Rust here, in case it carries a warning, we'd want to know that.)
-   return numTracksRust;
-+#endif // MOZ_RUST_MP4PARSE
- }
- 
-+#ifdef MOZ_RUST_MP4PARSE
- bool MP4Metadata::ShouldPreferRust() const {
-   if (!mRust) {
-     return false;
-@@ -389,6 +404,7 @@ bool MP4Metadata::ShouldPreferRust() const {
-   // Otherwise, fall back.
-   return false;
- }
-+#endif // MOZ_RUST_MP4PARSE
- 
- static const char*
- GetDifferentField(const mozilla::TrackInfo& info,
-@@ -443,6 +459,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
-   MP4Metadata::ResultAndTrackInfo info =
-     mStagefright->GetTrackInfo(aType, aTrackNumber);
- 
-+#ifdef MOZ_RUST_MP4PARSE
-   if (!mRust) {
-     return info;
-   }
-@@ -514,6 +531,7 @@ MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
-   if (mPreferRust) {
-     return infoRust;
-   }
-+#endif // MOZ_RUST_MP4PARSE
- 
-   return info;
- }
-@@ -528,6 +546,7 @@ MP4Metadata::ResultAndCryptoFile
- MP4Metadata::Crypto() const
- {
-   MP4Metadata::ResultAndCryptoFile crypto = mStagefright->Crypto();
-+#ifdef MOZ_RUST_MP4PARSE
-   MP4Metadata::ResultAndCryptoFile rustCrypto = mRust->Crypto();
- 
- #ifndef RELEASE_OR_BETA
-@@ -548,6 +567,7 @@ MP4Metadata::Crypto() const
-   if (mPreferRust) {
-     return rustCrypto;
-   }
-+#endif // MOZ_RUST_MP4PARSE
- 
-   return crypto;
- }
-@@ -556,17 +576,22 @@ MP4Metadata::ResultAndIndice
- MP4Metadata::GetTrackIndice(mozilla::TrackID aTrackID)
- {
-   FallibleTArray<Index::Indice> indiceSF;
-+#ifdef MOZ_RUST_MP4PARSE
-   if (!mPreferRust
- #ifndef RELEASE_OR_BETA
-       || mRustTestMode
- #endif
-      ) {
-+#endif // MOZ_RUST_MP4PARSE
-     MediaResult rv = mStagefright->ReadTrackIndex(indiceSF, aTrackID);
-     if (NS_FAILED(rv)) {
-       return {Move(rv), nullptr};
-     }
-+#ifdef MOZ_RUST_MP4PARSE
-   }
-+#endif // MOZ_RUST_MP4PARSE
- 
-+#ifdef MOZ_RUST_MP4PARSE
-   mp4parse_byte_data indiceRust = {};
-   if (mPreferRust
- #ifndef RELEASE_OR_BETA
-@@ -592,13 +617,18 @@ MP4Metadata::GetTrackIndice(mozilla::TrackID aTrackID)
-     }
-   }
- #endif
-+#endif // MOZ_RUST_MP4PARSE
- 
-   UniquePtr<IndiceWrapper> indice;
-+#ifdef MOZ_RUST_MP4PARSE
-   if (mPreferRust) {
-     indice = mozilla::MakeUnique<IndiceWrapperRust>(indiceRust);
-   } else {
-+#endif // MOZ_RUST_MP4PARSE
-     indice = mozilla::MakeUnique<IndiceWrapperStagefright>(indiceSF);
-+#ifdef MOZ_RUST_MP4PARSE
-   }
-+#endif // MOZ_RUST_MP4PARSE
- 
-   return {NS_OK, Move(indice)};
- }
-@@ -856,6 +886,7 @@ MP4MetadataStagefright::Metadata(Stream* aSource)
-   return {NS_OK, Move(buffer)};
- }
- 
-+#ifdef MOZ_RUST_MP4PARSE
- bool
- RustStreamAdaptor::Read(uint8_t* buffer, uintptr_t size, size_t* bytes_read)
- {
-@@ -1152,5 +1183,6 @@ MP4MetadataRust::Metadata(Stream* aSource)
-   MOZ_ASSERT(false, "Not yet implemented");
-   return {NS_ERROR_NOT_IMPLEMENTED, nullptr};
- }
-+#endif // MOZ_RUST_MP4PARSE
- 
- } // namespace mp4_demuxer
-diff --git media/libstagefright/binding/include/mp4_demuxer/DecoderData.h media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
-index 3cd4b7c142f4..dc25ddf03b10 100644
---- media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
-+++ media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
-@@ -19,11 +19,13 @@ namespace stagefright
- class MetaData;
- }
- 
-+#ifdef MOZ_RUST_MP4PARSE
- extern "C" {
- typedef struct mp4parse_track_info mp4parse_track_info;
- typedef struct mp4parse_track_audio_info mp4parse_track_audio_info;
- typedef struct mp4parse_track_video_info mp4parse_track_video_info;
- }
-+#endif // MOZ_RUST_MP4PARSE
- 
- namespace mp4_demuxer
- {
-@@ -71,8 +73,10 @@ public:
-   void Update(const stagefright::MetaData* aMetaData,
-               const char* aMimeType);
- 
-+#ifdef MOZ_RUST_MP4PARSE
-   void Update(const mp4parse_track_info* track,
-               const mp4parse_track_audio_info* audio);
-+#endif // MOZ_RUST_MP4PARSE
- 
-   virtual bool IsValid() const override;
- };
-@@ -85,8 +89,10 @@ public:
-   void Update(const stagefright::MetaData* aMetaData,
-               const char* aMimeType);
- 
-+#ifdef MOZ_RUST_MP4PARSE
-   void Update(const mp4parse_track_info* track,
-               const mp4parse_track_video_info* video);
-+#endif // MOZ_RUST_MP4PARSE
- 
-   virtual bool IsValid() const override;
- };
-diff --git media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
-index 492c9c1c1bc3..e16dbbd1155e 100644
---- media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
-+++ media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
-@@ -13,7 +13,9 @@
- #include "MediaInfo.h"
- #include "MediaResult.h"
- #include "Stream.h"
-+#ifdef MOZ_RUST_MP4PARSE
- #include "mp4parse.h"
-+#endif // MOZ_RUST_MP4PARSE
- 
- namespace mp4_demuxer {
- 
-@@ -82,6 +84,7 @@ public:
- 
- private:
-   UniquePtr<MP4MetadataStagefright> mStagefright;
-+#ifdef MOZ_RUST_MP4PARSE
-   UniquePtr<MP4MetadataRust> mRust;
-   mutable bool mPreferRust;
-   mutable bool mReportedAudioTrackTelemetry;
-@@ -90,6 +93,7 @@ private:
-   mutable bool mRustTestMode;
- #endif
-   bool ShouldPreferRust() const;
-+#endif // MOZ_RUST_MP4PARSE
- };
- 
- } // namespace mp4_demuxer
-diff --git media/libstagefright/gtest/moz.build media/libstagefright/gtest/moz.build
-index be4d56fc93f7..66fdd365f8f3 100644
---- media/libstagefright/gtest/moz.build
-+++ media/libstagefright/gtest/moz.build
-@@ -38,12 +38,13 @@ TEST_HARNESS_FILES.gtest += [
-     'test_case_1351094.mp4',
- ]
- 
--UNIFIED_SOURCES += ['TestMP4Rust.cpp',]
--TEST_HARNESS_FILES.gtest += [
--    '../../../dom/media/test/street.mp4',
--]
--LOCAL_INCLUDES += [
--    '../binding/include',
--]
-+if CONFIG['MOZ_RUST']:
-+    UNIFIED_SOURCES += ['TestMP4Rust.cpp',]
-+    TEST_HARNESS_FILES.gtest += [
-+        '../../../dom/media/test/street.mp4',
-+    ]
-+    LOCAL_INCLUDES += [
-+        '../binding/include',
-+    ]
- 
- FINAL_LIBRARY = 'xul-gtest'
-diff --git media/libstagefright/moz.build media/libstagefright/moz.build
-index af5d1194d621..6725a0179989 100644
---- media/libstagefright/moz.build
-+++ media/libstagefright/moz.build
-@@ -83,9 +83,10 @@ SOURCES += [
-     'system/core/libutils/VectorImpl.cpp',
- ]
- 
--EXPORTS += [
--    'binding/include/mp4parse.h',
--]
-+if CONFIG['MOZ_RUST']:
-+    EXPORTS += [
-+        'binding/include/mp4parse.h',
-+    ]
- 
- UNIFIED_SOURCES += [
-     'binding/Adts.cpp',
-diff --git mobile/android/confvars.sh mobile/android/confvars.sh
-index e79b6f5c0707..eb62763acaf7 100644
---- mobile/android/confvars.sh
-+++ mobile/android/confvars.sh
-@@ -30,6 +30,8 @@ MOZ_XULRUNNER=
- MOZ_CAPTURE=1
- MOZ_RAW=1
- 
-+MOZ_RUST_MP4PARSE=1
-+
- # use custom widget for html:select
- MOZ_USE_NATIVE_POPUP_WINDOWS=1
- 
-diff --git netwerk/base/moz.build netwerk/base/moz.build
-index 61d022a9660e..e5ca1d77d859 100644
---- netwerk/base/moz.build
-+++ netwerk/base/moz.build
-@@ -256,7 +256,7 @@ UNIFIED_SOURCES += [
-     'TLSServerSocket.cpp',
- ]
- 
--if CONFIG['MOZ_RUST_URLPARSE']:
-+if CONFIG['MOZ_RUST'] and CONFIG['MOZ_RUST_URLPARSE']:
-     EXPORTS.mozilla.net += [ 'RustURL.h' ]
-     UNIFIED_SOURCES += [ 'RustURL.cpp' ]
- 
-diff --git netwerk/base/nsStandardURL.cpp netwerk/base/nsStandardURL.cpp
-index 608b918a4ecf..20bcdeb34ab8 100644
---- netwerk/base/nsStandardURL.cpp
-+++ netwerk/base/nsStandardURL.cpp
-@@ -858,6 +858,7 @@ nsStandardURL::BuildNormalizedSpec(const char *spec)
-         if (!SegmentIs(spec, mScheme, "resource") &&
-             !SegmentIs(spec, mScheme, "chrome")) {
-             nsAutoCString ipString;
-+#ifdef MOZ_RUST
-             if (encHost.Length() > 0 &&
-                 encHost.First() == '[' && encHost.Last() == ']' &&
-                 ValidIPv6orHostname(encHost.get(), encHost.Length())) {
-@@ -866,7 +867,9 @@ nsStandardURL::BuildNormalizedSpec(const char *spec)
-                     return rv;
-                 }
-                 encHost = ipString;
--            } else if (NS_SUCCEEDED(NormalizeIPv4(encHost, ipString))) {
-+            } else
-+#endif
-+            if (NS_SUCCEEDED(NormalizeIPv4(encHost, ipString))) {
-                 encHost = ipString;
-             }
-         }
-@@ -2112,6 +2115,7 @@ nsStandardURL::SetHost(const nsACString &input)
- 
-     if (!SegmentIs(mScheme, "resource") && !SegmentIs(mScheme, "chrome")) {
-         nsAutoCString ipString;
-+#ifdef MOZ_RUST
-         if (hostBuf.Length() > 0 &&
-             hostBuf.First() == '[' && hostBuf.Last() == ']' &&
-             ValidIPv6orHostname(hostBuf.get(), hostBuf.Length())) {
-@@ -2120,7 +2124,9 @@ nsStandardURL::SetHost(const nsACString &input)
-                 return rv;
-             }
-             hostBuf = ipString;
--        } else if (NS_SUCCEEDED(NormalizeIPv4(hostBuf, ipString))) {
-+        } else
-+#endif
-+        if (NS_SUCCEEDED(NormalizeIPv4(hostBuf, ipString))) {
-           hostBuf = ipString;
-         }
-     }
-diff --git old-configure.in old-configure.in
-index 717a94fcc692..54b29d737cc1 100644
---- old-configure.in
-+++ old-configure.in
-@@ -2330,9 +2330,14 @@ if test -n "$MOZ_MULET"; then
- fi
- 
- # Propagate feature switches for code written in rust from confvars.sh
--if test -n "$MOZ_RUST_URLPARSE"; then
--    AC_DEFINE(MOZ_RUST_URLPARSE)
--    AC_SUBST(MOZ_RUST_URLPARSE)
-+if test -n "$MOZ_RUST"; then
-+    if test -n "$MOZ_RUST_MP4PARSE"; then
-+        AC_DEFINE(MOZ_RUST_MP4PARSE)
-+    fi
-+    if test -n "$MOZ_RUST_URLPARSE"; then
-+        AC_DEFINE(MOZ_RUST_URLPARSE)
-+        AC_SUBST(MOZ_RUST_URLPARSE)
-+    fi
- fi
- 
- AC_SUBST(MOZ_PHOENIX)
-diff --git toolkit/components/telemetry/Histograms.json toolkit/components/telemetry/Histograms.json
-index 061c55f6a5b6..e49dfd176952 100644
---- toolkit/components/telemetry/Histograms.json
-+++ toolkit/components/telemetry/Histograms.json
-@@ -8320,7 +8320,8 @@
-     "expires_in_version": "60",
-     "kind": "boolean",
-     "bug_numbers": [1220885],
--    "description": "Whether the rust mp4 demuxer successfully parsed a stream segment."
-+    "description": "Whether the rust mp4 demuxer successfully parsed a stream segment.",
-+    "cpp_guard": "MOZ_RUST_MP4PARSE"
-   },
-   "MEDIA_RUST_MP4PARSE_ERROR_CODE": {
-     "record_in_processes": ["main", "content"],
-@@ -8329,7 +8330,8 @@
-     "kind": "enumerated",
-     "n_values": 32,
-     "bug_numbers": [1238420],
--    "description": "The error code reported when an MP4 parse attempt has failed.0 = OK, 1 = bad argument, 2 = invalid data, 3 = unsupported, 4 = unexpected end of file, 5 = read error."
-+    "description": "The error code reported when an MP4 parse attempt has failed.0 = OK, 1 = bad argument, 2 = invalid data, 3 = unsupported, 4 = unexpected end of file, 5 = read error.",
-+    "cpp_guard": "MOZ_RUST_MP4PARSE"
-   },
-   "MEDIA_RUST_MP4PARSE_TRACK_MATCH_AUDIO": {
-     "record_in_processes": ["main", "content"],
-@@ -8337,7 +8339,8 @@
-     "expires_in_version": "60",
-     "kind": "boolean",
-     "bug_numbers": [1231169],
--    "description": "Whether rust and stagefight mp4 parser audio track results match."
-+    "description": "Whether rust and stagefight mp4 parser audio track results match.",
-+    "cpp_guard": "MOZ_RUST_MP4PARSE"
-   },
-   "MEDIA_RUST_MP4PARSE_TRACK_MATCH_VIDEO": {
-     "record_in_processes": ["main", "content"],
-@@ -8345,7 +8348,8 @@
-     "expires_in_version": "60",
-     "kind": "boolean",
-     "bug_numbers": [1231169],
--    "description": "Whether rust and stagefight mp4 parser video track results match."
-+    "description": "Whether rust and stagefight mp4 parser video track results match.",
-+    "cpp_guard": "MOZ_RUST_MP4PARSE"
-   },
-   "MEDIA_WMF_DECODE_ERROR": {
-     "record_in_processes": ["main", "content", "gpu"],
-diff --git toolkit/library/gtest/moz.build toolkit/library/gtest/moz.build
-index 69a8fb1f4893..c684f48e456e 100644
---- toolkit/library/gtest/moz.build
-+++ toolkit/library/gtest/moz.build
-@@ -7,7 +7,6 @@
- FINAL_TARGET = 'dist/bin/gtest'
- 
- USE_LIBS += [
--    'gkrust-gtest',
-     'static:xul',
-     # xul-gtest is an intermediate static library. It is used as FINAL_TARGET
-     # for gtest code.
-@@ -21,6 +20,11 @@ USE_LIBS += [
- # before StaticXULComponentStart.
- Libxul('xul-gtest-real')
- 
-+if CONFIG['MOZ_RUST']:
-+    USE_LIBS += [
-+        'gkrust-gtest',
-+    ]
-+
- DIRS += [
-     'static',
- ]
-diff --git toolkit/library/moz.build toolkit/library/moz.build
-index 650f6eaba980..191e90ceb09a 100644
---- toolkit/library/moz.build
-+++ toolkit/library/moz.build
-@@ -63,7 +63,7 @@ def Libxul(name):
- 
-     # This option should go away in bug 1290972, but we need to wait until
-     # Rust 1.12 has been released.
--    if CONFIG['OS_ARCH'] == 'Darwin':
-+    if CONFIG['MOZ_RUST'] and CONFIG['OS_ARCH'] == 'Darwin':
-         LDFLAGS += ['-Wl,-no_compact_unwind']
- 
- Libxul('xul')
-@@ -343,4 +343,5 @@ USE_LIBS += ['StaticXULComponentsEnd']
- # The above library needs to be last for C++ purposes.  This library,
- # however, is entirely composed of Rust code, and needs to come after
- # all the C++ code so any possible C++ -> Rust calls can be resolved.
--USE_LIBS += ['gkrust']
-+if CONFIG['MOZ_RUST']:
-+    USE_LIBS += ['gkrust']
-diff --git toolkit/moz.configure toolkit/moz.configure
-index ac9d123224ce..e90da70f0fa5 100644
---- toolkit/moz.configure
-+++ toolkit/moz.configure
-@@ -88,8 +88,7 @@ include('../js/moz.configure')
- 
- # Rust
- # ==============================================================
--include('../build/moz.configure/rust.configure',
--        when='--enable-compile-environment')
-+include('../build/moz.configure/rust.configure')
- 
- 
- # L10N
-@@ -623,13 +622,13 @@ id_and_secret_keyfile('Leanplum SDK')
- option('--enable-stylo', nargs='?', choices=('build',),
-        help='Include Stylo in the build and/or enable it at runtime')
- 
--@depends('--enable-stylo')
--def stylo_config(value):
-+@depends('--enable-stylo', '--enable-rust')
-+def stylo_config(value, rust_enabled):
-     build_stylo = None
-     enable_stylo = None
- 
-     # The default is to not build Stylo at all.
--    if value.origin == 'default':
-+    if not rust_enabled or value.origin == 'default':
-         pass
-     elif value == 'build':
-         build_stylo = True
-@@ -769,12 +768,14 @@ set_config('SERVO_TARGET_DIR', servo_target_dir)
- option('--enable-webrender', nargs='?', choices=('build',),
-        help='Include WebRender in the build and/or enable it at runtime')
- 
--@depends('--enable-webrender', milestone)
--def webrender(value, milestone):
-+@depends('--enable-webrender', '--enable-rust', milestone)
-+def webrender(value, rust_enabled, milestone):
-     build_webrender = None
-     enable_webrender = None
- 
--    if value.origin == 'default':
-+    if not rust_enabled:
-+        pass
-+    elif value.origin == 'default':
-         # if nothing is specified, default to just building on Nightly
-         build_webrender = milestone.is_nightly
-     elif value == 'build':
-diff --git toolkit/toolkit.mozbuild toolkit/toolkit.mozbuild
-index b845aab48023..9215afc6dd2d 100644
---- toolkit/toolkit.mozbuild
-+++ toolkit/toolkit.mozbuild
-@@ -133,16 +133,23 @@ if CONFIG['MOZ_PREF_EXTENSIONS']:
- 
- DIRS += [
-     '/devtools',
--    '/toolkit/library',
--    '/toolkit/library/gtest/rust',
--    '/toolkit/library/rust',
--    '/toolkit/library/StaticXULComponentsEnd',
-     '/services',
-     '/startupcache',
-     '/js/ductwork/debugger',
-     '/other-licenses/snappy',
- ]
- 
-+if CONFIG['MOZ_RUST']:
-+    DIRS += [
-+        '/toolkit/library/gtest/rust',
-+        '/toolkit/library/rust',
-+    ]
-+
-+DIRS += [
-+    '/toolkit/library/StaticXULComponentsEnd',
-+    '/toolkit/library',
-+]
-+
- if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-     DIRS += ['/toolkit/system/gnome']
- 
-diff --git toolkit/xre/nsAppRunner.cpp toolkit/xre/nsAppRunner.cpp
-index 667c2eb1b365..6fb6cf102baa 100644
---- toolkit/xre/nsAppRunner.cpp
-+++ toolkit/xre/nsAppRunner.cpp
-@@ -227,11 +227,13 @@
- extern uint32_t gRestartMode;
- extern void InstallSignalHandlers(const char *ProgramName);
- 
-+#ifdef MOZ_RUST
- // This workaround is fixed in Rust 1.19. For details, see bug 1358151.
- // Implementation in toolkit/library/rust/shared/lib.rs
- extern "C" {
-   void rust_init_please_remove_this_after_updating_rust_1_19();
- }
-+#endif
- 
- #define FILE_COMPATIBILITY_INFO NS_LITERAL_CSTRING("compatibility.ini")
- #define FILE_INVALIDATE_CACHES NS_LITERAL_CSTRING(".purgecaches")
-@@ -3122,8 +3124,10 @@ XREMain::XRE_mainInit(bool* aExitFlag)
-     return 1;
-   *aExitFlag = false;
- 
-+#ifdef MOZ_RUST
-   // This workaround is fixed in Rust 1.19. For details, see bug 1358151.
-   rust_init_please_remove_this_after_updating_rust_1_19();
-+#endif
- 
-   atexit(UnexpectedExit);
-   auto expectedShutdown = mozilla::MakeScopeExit([&] {
-diff --git xpcom/base/nsDebugImpl.cpp xpcom/base/nsDebugImpl.cpp
-index e6bb623c258b..c49d61dce605 100644
---- xpcom/base/nsDebugImpl.cpp
-+++ xpcom/base/nsDebugImpl.cpp
-@@ -148,14 +148,20 @@ nsDebugImpl::Abort(const char* aFile, int32_t aLine)
-   return NS_OK;
- }
- 
-+#ifdef MOZ_RUST
- // From toolkit/library/rust/lib.rs
- extern "C" void intentional_panic(const char* message);
-+#endif
- 
- NS_IMETHODIMP
- nsDebugImpl::RustPanic(const char* aMessage)
- {
-+#ifdef MOZ_RUST
-   intentional_panic(aMessage);
-   return NS_OK;
-+#else
-+  return NS_ERROR_NOT_IMPLEMENTED;
-+#endif
- }
- 
- NS_IMETHODIMP
-diff --git xpcom/rust/nsstring/gtest/moz.build xpcom/rust/nsstring/gtest/moz.build
-index 197411678815..5bed9e57e57d 100644
---- xpcom/rust/nsstring/gtest/moz.build
-+++ xpcom/rust/nsstring/gtest/moz.build
-@@ -4,8 +4,9 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
--UNIFIED_SOURCES += [
--    'Test.cpp'
--]
-+if CONFIG['MOZ_RUST']:
-+    UNIFIED_SOURCES += [
-+        'Test.cpp'
-+    ]
- 
- FINAL_LIBRARY = 'xul-gtest'
diff --git a/www/firefox/files/patch-toolkit_moz.configure b/www/firefox/files/patch-toolkit_moz.configure
new file mode 100644
index 000000000000..03c2d4f868a0
--- /dev/null
+++ b/www/firefox/files/patch-toolkit_moz.configure
@@ -0,0 +1,13 @@
+Bindgen crashes on i386
+
+--- toolkit/moz.configure.orig	2017-08-08 06:07:58 UTC
++++ toolkit/moz.configure
+@@ -620,7 +620,7 @@ def stylo_config(value, _, target):
+ 
+     # If nothing is specified, default to building stylo where possible.
+     if value.origin == 'default':
+-        if target.os == 'GNU' and target.bitness == 32:
++        if target.os != 'WINNT' and target.bitness == 32:
+             # The clang setup we use in automation is a little unusual, and
+             # doesn't play well with bindgen on 32-bit Linux.
+             pass