Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Aug 2017 15:36:56 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r447690 - in branches/2017Q3: Mk/Uses www/firefox www/firefox-i18n www/firefox/files
Message-ID:  <201708101536.v7AFauef059776@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Aug 10 15:36:56 2017
New Revision: 447690
URL: https://svnweb.freebsd.org/changeset/ports/447690

Log:
  MFH: r447501 r447660
  
  www/firefox: update to 55.0.1
  
  This is the last release to support RUST=off. Later versions
  remove non-Rust codepaths e.g., via encoding_rs.
  
  Changes:	https://www.mozilla.org/firefox/55.0.1/releasenotes/
  PR:		216541 219963
  Security:	555b244e-6b20-4546-851f-d8eb7d6c1ffa
  Approved by:	ports-secteam (zi)

Added:
  branches/2017Q3/www/firefox/files/patch-bug1312182
     - copied unchanged from r447501, head/www/firefox/files/patch-bug1312182
  branches/2017Q3/www/firefox/files/patch-bug1385597
     - copied unchanged from r447501, head/www/firefox/files/patch-bug1385597
  branches/2017Q3/www/firefox/files/patch-third__party_python_futures_concurrent_futures_process.py
     - copied unchanged from r447501, head/www/firefox/files/patch-third__party_python_futures_concurrent_futures_process.py
Deleted:
  branches/2017Q3/www/firefox/files/patch-bug1356709
  branches/2017Q3/www/firefox/files/patch-bug1357874
  branches/2017Q3/www/firefox/files/patch-bug1360321
  branches/2017Q3/www/firefox/files/patch-bug1376411
  branches/2017Q3/www/firefox/files/patch-bug981348
  branches/2017Q3/www/firefox/files/patch-python_futures_concurrent_futures_process.py
Modified:
  branches/2017Q3/Mk/Uses/gecko.mk
  branches/2017Q3/www/firefox-i18n/Makefile
  branches/2017Q3/www/firefox-i18n/Makefile.lang
  branches/2017Q3/www/firefox-i18n/Makefile.option
  branches/2017Q3/www/firefox-i18n/distinfo
  branches/2017Q3/www/firefox/Makefile
  branches/2017Q3/www/firefox/distinfo
  branches/2017Q3/www/firefox/files/patch-bug1021761
  branches/2017Q3/www/firefox/files/patch-bug702179
  branches/2017Q3/www/firefox/files/patch-bug826985
  branches/2017Q3/www/firefox/files/patch-bug847568
  branches/2017Q3/www/firefox/files/patch-rust-option
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/Mk/Uses/gecko.mk
==============================================================================
--- branches/2017Q3/Mk/Uses/gecko.mk	Thu Aug 10 15:35:47 2017	(r447689)
+++ branches/2017Q3/Mk/Uses/gecko.mk	Thu Aug 10 15:36:56 2017	(r447690)
@@ -37,12 +37,12 @@ RUN_DEPENDS+=	libxul>=45:www/libxul
 .elif ${gecko_ARGS:Mfirefox}
 
 _GECKO_DEFAULT_VERSION=	52
-_GECKO_VERSIONS=		52 54
+_GECKO_VERSIONS=		52 55
 _GECKO_TYPE=	firefox
 
 # Dependence lines for different Firefox versions
 52_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
-54_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
+55_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
 
 .if exists(${LOCALBASE}/bin/firefox)
 _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null

Modified: branches/2017Q3/www/firefox-i18n/Makefile
==============================================================================
--- branches/2017Q3/www/firefox-i18n/Makefile	Thu Aug 10 15:35:47 2017	(r447689)
+++ branches/2017Q3/www/firefox-i18n/Makefile	Thu Aug 10 15:36:56 2017	(r447690)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	firefox-i18n
-PORTVERSION=	54.0.1
+PORTVERSION=	55.0.1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
-		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
+		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi
 PKGNAMEPREFIX=
 DISTFILES=	${FIREFOX_I18N_:S/$/.xpi/}
 DIST_SUBDIR=	xpi/${DISTNAME}
@@ -15,7 +15,7 @@ COMMENT=	Localized interface for Firefox
 
 EXTRACT_DEPENDS=	zip:archivers/zip
 
-USES=		zip:infozip gecko:firefox,54,build
+USES=		zip:infozip gecko:firefox,55,build
 USE_XPI=	firefox
 
 NO_ARCH=	yes

Modified: branches/2017Q3/www/firefox-i18n/Makefile.lang
==============================================================================
--- branches/2017Q3/www/firefox-i18n/Makefile.lang	Thu Aug 10 15:35:47 2017	(r447689)
+++ branches/2017Q3/www/firefox-i18n/Makefile.lang	Thu Aug 10 15:36:56 2017	(r447690)
@@ -1,7 +1,7 @@
 # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
 # $FreeBSD$
 
-FIREFOX_I18N_ALL_=	ach af an ar as ast az bg bn-BD bn-IN br bs ca cak	\
+FIREFOX_I18N_ALL_=	ach af an ar as ast az be bg bn-BD bn-IN br bs ca cak	\
 			cs cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL	\
 			es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn	\
 			gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab	\
@@ -32,6 +32,9 @@ FIREFOX_I18N+=  ast
 .endif
 .if ${PORT_OPTIONS:MLANG_AZ}
 FIREFOX_I18N+=  az
+.endif
+.if ${PORT_OPTIONS:MLANG_BE}
+FIREFOX_I18N+=	be
 .endif
 .if ${PORT_OPTIONS:MLANG_BG}
 FIREFOX_I18N+=  bg

Modified: branches/2017Q3/www/firefox-i18n/Makefile.option
==============================================================================
--- branches/2017Q3/www/firefox-i18n/Makefile.option	Thu Aug 10 15:35:47 2017	(r447689)
+++ branches/2017Q3/www/firefox-i18n/Makefile.option	Thu Aug 10 15:36:56 2017	(r447690)
@@ -9,6 +9,7 @@ OPTIONS_DEFINE=	LANG_ACH \
 		LANG_AS \
 		LANG_AST \
 		LANG_AZ \
+		LANG_BE \
 		LANG_BG \
 		LANG_BB \
 		LANG_BN \

Modified: branches/2017Q3/www/firefox-i18n/distinfo
==============================================================================
--- branches/2017Q3/www/firefox-i18n/distinfo	Thu Aug 10 15:35:47 2017	(r447689)
+++ branches/2017Q3/www/firefox-i18n/distinfo	Thu Aug 10 15:36:56 2017	(r447690)
@@ -1,189 +1,191 @@
-TIMESTAMP = 1498670356
-SHA256 (xpi/firefox-i18n-54.0.1/ach.xpi) = 2ac6571fee99dbb0886e6b4d75d9ed9b793b5a2551413d0969c4b443e797b9a8
-SIZE (xpi/firefox-i18n-54.0.1/ach.xpi) = 426785
-SHA256 (xpi/firefox-i18n-54.0.1/af.xpi) = 86e4a12e511e7a88b7eb762b0755984e72b8774c77398481609237e9ca44b4a5
-SIZE (xpi/firefox-i18n-54.0.1/af.xpi) = 436585
-SHA256 (xpi/firefox-i18n-54.0.1/an.xpi) = a925947a8d77450357b2e85454c8b02b71f2553a6abc373d6ef865a098acef6a
-SIZE (xpi/firefox-i18n-54.0.1/an.xpi) = 445344
-SHA256 (xpi/firefox-i18n-54.0.1/ar.xpi) = 8e7d0af2143a5df4f93fb70d0e240180b897320234d9e0f17274f996c9e7ca29
-SIZE (xpi/firefox-i18n-54.0.1/ar.xpi) = 473124
-SHA256 (xpi/firefox-i18n-54.0.1/as.xpi) = 3f4f218ce4da291d008630f20b29d032182f8c5356c387be81a55616881585d3
-SIZE (xpi/firefox-i18n-54.0.1/as.xpi) = 484171
-SHA256 (xpi/firefox-i18n-54.0.1/ast.xpi) = b215e69042c029156b8e787c03f9504beb5e056ea71f0e8e6eb706205f8eee1f
-SIZE (xpi/firefox-i18n-54.0.1/ast.xpi) = 440269
-SHA256 (xpi/firefox-i18n-54.0.1/az.xpi) = a092eb7b69b97e44a375ac1244a8f1bfc48acfd7d99051350803632273164e68
-SIZE (xpi/firefox-i18n-54.0.1/az.xpi) = 454243
-SHA256 (xpi/firefox-i18n-54.0.1/bg.xpi) = 2d12828369f44e8c805e2825946cec5ef040585a92b35c89ff17aceac8a0a83d
-SIZE (xpi/firefox-i18n-54.0.1/bg.xpi) = 485835
-SHA256 (xpi/firefox-i18n-54.0.1/bn-BD.xpi) = ab3a823e662776edf0aeaf9c4535f451ebe4e8ad5811023377ca88eebef56306
-SIZE (xpi/firefox-i18n-54.0.1/bn-BD.xpi) = 508867
-SHA256 (xpi/firefox-i18n-54.0.1/bn-IN.xpi) = 0acff03ac54f2a4609c626d4e5b461c0abacb8b24d6df4dc1b3f2cffc6baffa7
-SIZE (xpi/firefox-i18n-54.0.1/bn-IN.xpi) = 506168
-SHA256 (xpi/firefox-i18n-54.0.1/br.xpi) = e164f7ba23ce3fac8240f9f3cb3b44dd0555c558550d0f9fc98cbfa5eb05de8d
-SIZE (xpi/firefox-i18n-54.0.1/br.xpi) = 434372
-SHA256 (xpi/firefox-i18n-54.0.1/bs.xpi) = 7b74a68b66b6763922cfa08ed8c2dab8dad64fe4b8cd8e51f3b023c635d0dddc
-SIZE (xpi/firefox-i18n-54.0.1/bs.xpi) = 441131
-SHA256 (xpi/firefox-i18n-54.0.1/ca.xpi) = 104ae2cc9b629669005648e5fb2e7cad06965eb700c6246bacc8874c48180b82
-SIZE (xpi/firefox-i18n-54.0.1/ca.xpi) = 443027
-SHA256 (xpi/firefox-i18n-54.0.1/cak.xpi) = aced374c69e3cd85800b685bd1003b290b58f0a37c870e42badce50c740a0a36
-SIZE (xpi/firefox-i18n-54.0.1/cak.xpi) = 458232
-SHA256 (xpi/firefox-i18n-54.0.1/cs.xpi) = 937ab90c522119406605eb0051f81dbe0a0c716826cf222cee532bbaeeb049ac
-SIZE (xpi/firefox-i18n-54.0.1/cs.xpi) = 443929
-SHA256 (xpi/firefox-i18n-54.0.1/cy.xpi) = 6a095bdbe2c274da1772c87914aad3ca4a788f6f3a0d3a10d9432cfdf646a6a3
-SIZE (xpi/firefox-i18n-54.0.1/cy.xpi) = 436310
-SHA256 (xpi/firefox-i18n-54.0.1/da.xpi) = 1a0d5e22c79b0f558031b14edc8aa8a4dd1ce0a5c418549c68c8223c5ab7a7f9
-SIZE (xpi/firefox-i18n-54.0.1/da.xpi) = 423766
-SHA256 (xpi/firefox-i18n-54.0.1/de.xpi) = 1bc9004a9aa4f41245c610ab0c239496cd649157e8ad7bbb89feb83585889b60
-SIZE (xpi/firefox-i18n-54.0.1/de.xpi) = 442814
-SHA256 (xpi/firefox-i18n-54.0.1/dsb.xpi) = 0946b957ff6765bd30171477394ed5e0345cc3c6dadf1fee07b85a57d789515d
-SIZE (xpi/firefox-i18n-54.0.1/dsb.xpi) = 458691
-SHA256 (xpi/firefox-i18n-54.0.1/el.xpi) = 60f7e95db941c2c2b9bdbbb7b4c601badd2cc92f59c716e3ea82294fb7078e63
-SIZE (xpi/firefox-i18n-54.0.1/el.xpi) = 511228
-SHA256 (xpi/firefox-i18n-54.0.1/en-GB.xpi) = 50b09222acad38c4d2a878850905b55cd399f5923fa9aa2b2fa118a48560883e
-SIZE (xpi/firefox-i18n-54.0.1/en-GB.xpi) = 419545
-SHA256 (xpi/firefox-i18n-54.0.1/en-US.xpi) = 14e0d08ce9fd79cd1b9ade2c19d92b255b758384c7e7e608d573beed36f639a3
-SIZE (xpi/firefox-i18n-54.0.1/en-US.xpi) = 425757
-SHA256 (xpi/firefox-i18n-54.0.1/en-ZA.xpi) = 1fcea8c4bd696913c4d93fdd8dc3569707de035e6b5ed4808892e85a8945b58f
-SIZE (xpi/firefox-i18n-54.0.1/en-ZA.xpi) = 413431
-SHA256 (xpi/firefox-i18n-54.0.1/eo.xpi) = d32c2f771aea465c62c4b9d782fccc1d22969be3ea827027d7acdb592ee66e19
-SIZE (xpi/firefox-i18n-54.0.1/eo.xpi) = 437027
-SHA256 (xpi/firefox-i18n-54.0.1/es-AR.xpi) = c1b6a6ffdf9f74d653f72cf3157b820b95eddf26fabc72be3d2bae84457f5d78
-SIZE (xpi/firefox-i18n-54.0.1/es-AR.xpi) = 445558
-SHA256 (xpi/firefox-i18n-54.0.1/es-CL.xpi) = 222dd573b6f877926bee2d58963366b670a4d5176c839663073da1bb6ff51eb5
-SIZE (xpi/firefox-i18n-54.0.1/es-CL.xpi) = 445585
-SHA256 (xpi/firefox-i18n-54.0.1/es-ES.xpi) = 494983532ee064521a37d90cbfbef46d0fab37fe82d4d72b3ade3c539db3585b
-SIZE (xpi/firefox-i18n-54.0.1/es-ES.xpi) = 341281
-SHA256 (xpi/firefox-i18n-54.0.1/es-MX.xpi) = 3a74d108671f717c3bb5954298eb396c861aa902cf7c426cc2cc02ecc15f6dbf
-SIZE (xpi/firefox-i18n-54.0.1/es-MX.xpi) = 447976
-SHA256 (xpi/firefox-i18n-54.0.1/et.xpi) = 4a926107e99dd4bd6a8b6089f08fc53a33f5fb7d55dab8197121558bfc8df1d8
-SIZE (xpi/firefox-i18n-54.0.1/et.xpi) = 423855
-SHA256 (xpi/firefox-i18n-54.0.1/eu.xpi) = 17fc4a655d72a25ed1acc41276fcdd22f5c3662c87b61bca48195345d45f5a3a
-SIZE (xpi/firefox-i18n-54.0.1/eu.xpi) = 438025
-SHA256 (xpi/firefox-i18n-54.0.1/fa.xpi) = 325b3a51f4e5adb0fad02fe050d43d6bfd3b0f6f8bcec24eeccc93df4e2a61da
-SIZE (xpi/firefox-i18n-54.0.1/fa.xpi) = 490360
-SHA256 (xpi/firefox-i18n-54.0.1/ff.xpi) = 7f3616ce409ef5a709321b230541236c0654848b943f7f08e538d8f9606290c5
-SIZE (xpi/firefox-i18n-54.0.1/ff.xpi) = 441539
-SHA256 (xpi/firefox-i18n-54.0.1/fi.xpi) = 1e124737d0d1a51f8edfa2452e39db0da28068fa0a8ba1de97d8a5a8fceac5d2
-SIZE (xpi/firefox-i18n-54.0.1/fi.xpi) = 428998
-SHA256 (xpi/firefox-i18n-54.0.1/fr.xpi) = a77a3ff17a868e64fa45f3543a43a7a35b7c2a8b63a83a9f3ab25ade74252c81
-SIZE (xpi/firefox-i18n-54.0.1/fr.xpi) = 451596
-SHA256 (xpi/firefox-i18n-54.0.1/fy-NL.xpi) = c604b47608caaef2101a1465efdbd70519ceef08d06a7527934a5b612a0af65c
-SIZE (xpi/firefox-i18n-54.0.1/fy-NL.xpi) = 444473
-SHA256 (xpi/firefox-i18n-54.0.1/ga-IE.xpi) = 78e5c09e43ae6c8f0ce17e16c26a50e64a5ec6c71f942c3c3fd78c3087ea6dd5
-SIZE (xpi/firefox-i18n-54.0.1/ga-IE.xpi) = 457484
-SHA256 (xpi/firefox-i18n-54.0.1/gd.xpi) = 8ee562188ed70c78e997215c4c00d9a1f97360dcee5ea430cf6830405c69d40f
-SIZE (xpi/firefox-i18n-54.0.1/gd.xpi) = 446084
-SHA256 (xpi/firefox-i18n-54.0.1/gl.xpi) = d1b440764c3a50c5e69369d459e2ec1be1bded24096d6c33fe09af12b74e0b47
-SIZE (xpi/firefox-i18n-54.0.1/gl.xpi) = 443277
-SHA256 (xpi/firefox-i18n-54.0.1/gn.xpi) = 1c43832720ff7355b5edc8d95e112395abc18c810840de5c2b768a1756b9a981
-SIZE (xpi/firefox-i18n-54.0.1/gn.xpi) = 456068
-SHA256 (xpi/firefox-i18n-54.0.1/gu-IN.xpi) = ddcda3eaf8c04d3eccde0a86e3a95642377d9881849599c8150a9751ee129a93
-SIZE (xpi/firefox-i18n-54.0.1/gu-IN.xpi) = 487118
-SHA256 (xpi/firefox-i18n-54.0.1/he.xpi) = 99b4ea64591e975b5207418812e8b178f1d139fec32d1042d86f69563ca182ae
-SIZE (xpi/firefox-i18n-54.0.1/he.xpi) = 454287
-SHA256 (xpi/firefox-i18n-54.0.1/hi-IN.xpi) = 4031a32ad3f54f38aac8748839404e3ac9da1c2c46ecfe80c59ed31d5a2dd3ff
-SIZE (xpi/firefox-i18n-54.0.1/hi-IN.xpi) = 504632
-SHA256 (xpi/firefox-i18n-54.0.1/hr.xpi) = 9e9c3133951e1af4c71aa3f0583102a78420aec89c6b5ba270b5695b554d5578
-SIZE (xpi/firefox-i18n-54.0.1/hr.xpi) = 447780
-SHA256 (xpi/firefox-i18n-54.0.1/hsb.xpi) = 3e1756b6ebd88994d14cd46bd93bb83041f2da4e33df22a21c27fcd158dd70a8
-SIZE (xpi/firefox-i18n-54.0.1/hsb.xpi) = 456528
-SHA256 (xpi/firefox-i18n-54.0.1/hu.xpi) = 5050f78682cf02e180005fa305751bf65dc12b76e1b0d15178d553a1ab8aae25
-SIZE (xpi/firefox-i18n-54.0.1/hu.xpi) = 451123
-SHA256 (xpi/firefox-i18n-54.0.1/hy-AM.xpi) = eef38f7bbaf2f6d3ec282931eeb0032951e44db39469cbf532ae8883c887217f
-SIZE (xpi/firefox-i18n-54.0.1/hy-AM.xpi) = 496020
-SHA256 (xpi/firefox-i18n-54.0.1/id.xpi) = b5c619719efee4a36e2b5008f6ce2cb4251faa9308f59502909933e14836f36f
-SIZE (xpi/firefox-i18n-54.0.1/id.xpi) = 425284
-SHA256 (xpi/firefox-i18n-54.0.1/is.xpi) = d4a28ac291cd5e6649800b1babd39ec3e7dd808da15b608b16ac15e4548cd256
-SIZE (xpi/firefox-i18n-54.0.1/is.xpi) = 441708
-SHA256 (xpi/firefox-i18n-54.0.1/it.xpi) = ccadf76ba443e1ee2ce80db7a895dae99b0a7670736b78eb21cd75788b97e278
-SIZE (xpi/firefox-i18n-54.0.1/it.xpi) = 335501
-SHA256 (xpi/firefox-i18n-54.0.1/ja.xpi) = 820b33c1c4675fe59f8bc73328da8718bddcec6fd3b7ceeb171ff1994322dcb3
-SIZE (xpi/firefox-i18n-54.0.1/ja.xpi) = 486807
-SHA256 (xpi/firefox-i18n-54.0.1/ka.xpi) = 2d596db623a85e87c45fa698e18ad9e66733f29534be8297ef4c52e7288db8a7
-SIZE (xpi/firefox-i18n-54.0.1/ka.xpi) = 473231
-SHA256 (xpi/firefox-i18n-54.0.1/kab.xpi) = a0611e7f5bebefb65a7de1b0b80b921ae01a5448c65c7218eabdd31ee292d7e6
-SIZE (xpi/firefox-i18n-54.0.1/kab.xpi) = 443917
-SHA256 (xpi/firefox-i18n-54.0.1/kk.xpi) = 9f2d4fb392830db601a650ec0a86860a99647150d65f2a3f58d3ca5f86c667bf
-SIZE (xpi/firefox-i18n-54.0.1/kk.xpi) = 493048
-SHA256 (xpi/firefox-i18n-54.0.1/km.xpi) = 9ba58f2ad59b02905f39ab52e10c967555f4e9d4efde5832d4fed9d9acbdba06
-SIZE (xpi/firefox-i18n-54.0.1/km.xpi) = 517240
-SHA256 (xpi/firefox-i18n-54.0.1/kn.xpi) = e4ee165edd2accef0b75e7ac373be81bac94be182d9184477cee7ba72a9eefb0
-SIZE (xpi/firefox-i18n-54.0.1/kn.xpi) = 516492
-SHA256 (xpi/firefox-i18n-54.0.1/ko.xpi) = 34258d81a65b8e8d82992c359c2c864208f9cbe775b6d8503bff73639a4f38de
-SIZE (xpi/firefox-i18n-54.0.1/ko.xpi) = 460422
-SHA256 (xpi/firefox-i18n-54.0.1/lij.xpi) = 5175475d43dad7033fc3d5ff29bf2ef4b6b7c7c78aa5772494e9e0b076a83b88
-SIZE (xpi/firefox-i18n-54.0.1/lij.xpi) = 431675
-SHA256 (xpi/firefox-i18n-54.0.1/lt.xpi) = 965dac8a258b3f1fa95408f7bb1e4778a4935b0c5259f4b4cadc261a2202b9b0
-SIZE (xpi/firefox-i18n-54.0.1/lt.xpi) = 451195
-SHA256 (xpi/firefox-i18n-54.0.1/lv.xpi) = 28fa09ca2dfa0e35fa939b1e404b38d247b921fbae83d12e84a75a3fe2d506d9
-SIZE (xpi/firefox-i18n-54.0.1/lv.xpi) = 447753
-SHA256 (xpi/firefox-i18n-54.0.1/mai.xpi) = 549b205729fda9ac5b518e4fd14e482cdf53330195cac9aa5abd7a5960e6bd94
-SIZE (xpi/firefox-i18n-54.0.1/mai.xpi) = 497012
-SHA256 (xpi/firefox-i18n-54.0.1/mk.xpi) = bb71fa5d9de5b7f22e9a61846a9712039307d82e410c283ec4c5646eb1722dfc
-SIZE (xpi/firefox-i18n-54.0.1/mk.xpi) = 493118
-SHA256 (xpi/firefox-i18n-54.0.1/ml.xpi) = cf8fd4617b462f10014b56d058526afe5a21c5d27437e6e7bd2d3972d6a80f5f
-SIZE (xpi/firefox-i18n-54.0.1/ml.xpi) = 512264
-SHA256 (xpi/firefox-i18n-54.0.1/mr.xpi) = 5721566ae1bb2aab7bcd10ab5d6461d4828c0665e778694bfc41f7dcda7ec46b
-SIZE (xpi/firefox-i18n-54.0.1/mr.xpi) = 501035
-SHA256 (xpi/firefox-i18n-54.0.1/ms.xpi) = 1ae16e71b6fc08b3eb7bd3db4f356300e33a8eb4093587e7c553109774378541
-SIZE (xpi/firefox-i18n-54.0.1/ms.xpi) = 435502
-SHA256 (xpi/firefox-i18n-54.0.1/my.xpi) = f634472bbd81089fdcf675d4c05078b6a380b5b32f35efcfd2549ae322062ee5
-SIZE (xpi/firefox-i18n-54.0.1/my.xpi) = 511255
-SHA256 (xpi/firefox-i18n-54.0.1/nb-NO.xpi) = 64b19a30823f1ceca9790f91d663569da7e3559f56c91af6d52fe3cb12b42685
-SIZE (xpi/firefox-i18n-54.0.1/nb-NO.xpi) = 433681
-SHA256 (xpi/firefox-i18n-54.0.1/nl.xpi) = 3a42e931b4f4504e7459f5e976cbb6b23d2660d98751a2307fca4da5bf600579
-SIZE (xpi/firefox-i18n-54.0.1/nl.xpi) = 431501
-SHA256 (xpi/firefox-i18n-54.0.1/nn-NO.xpi) = e423caf98330b9655476c5c6181b5390caccdb73c6c1260788d7d854ce2135d3
-SIZE (xpi/firefox-i18n-54.0.1/nn-NO.xpi) = 427871
-SHA256 (xpi/firefox-i18n-54.0.1/or.xpi) = 21542c795149a5014c762ab5b0d80758228d520fbb29d5da3575bac319efcc20
-SIZE (xpi/firefox-i18n-54.0.1/or.xpi) = 494082
-SHA256 (xpi/firefox-i18n-54.0.1/pa-IN.xpi) = ff23be5a0183b9ab0f508e0454363ccb4d4ea787e234f47f506a59a53b823900
-SIZE (xpi/firefox-i18n-54.0.1/pa-IN.xpi) = 473517
-SHA256 (xpi/firefox-i18n-54.0.1/pl.xpi) = f5b54399bde33a78e26ed608a541641cbbd455d6f615ebadaf51a1d4a070c49b
-SIZE (xpi/firefox-i18n-54.0.1/pl.xpi) = 347205
-SHA256 (xpi/firefox-i18n-54.0.1/pt-BR.xpi) = d2fec0d257a63098d1815c19cfda9485898671b05cbd04d405d7aea37bab0da6
-SIZE (xpi/firefox-i18n-54.0.1/pt-BR.xpi) = 437173
-SHA256 (xpi/firefox-i18n-54.0.1/pt-PT.xpi) = 81ab31f6e804bb4000e82d8e5c0f1a523a06017b5c70702080b3d37e69a0cddc
-SIZE (xpi/firefox-i18n-54.0.1/pt-PT.xpi) = 436178
-SHA256 (xpi/firefox-i18n-54.0.1/rm.xpi) = 1f97345a398a8debe697c52c1c9470e8e372b27358f03b97c362936961075c42
-SIZE (xpi/firefox-i18n-54.0.1/rm.xpi) = 433406
-SHA256 (xpi/firefox-i18n-54.0.1/ro.xpi) = a240485bcc277196ff5d9dc83b0ca3682bdb28eea348de9675d076a0cda90252
-SIZE (xpi/firefox-i18n-54.0.1/ro.xpi) = 449474
-SHA256 (xpi/firefox-i18n-54.0.1/ru.xpi) = ed18d1fdb2e0f71bf08a272e80d8954e3cbb67e47656f3c37d94f3368f9d5013
-SIZE (xpi/firefox-i18n-54.0.1/ru.xpi) = 487731
-SHA256 (xpi/firefox-i18n-54.0.1/si.xpi) = 4dce9708ecdd61c82621d97eb88476a4c13212efa136e1cf2db0f7df7e0c4271
-SIZE (xpi/firefox-i18n-54.0.1/si.xpi) = 491069
-SHA256 (xpi/firefox-i18n-54.0.1/sk.xpi) = fa7d3fdf5448c1fde3d875b1897207e129b04e3338d8e20eb050b65d6db1a383
-SIZE (xpi/firefox-i18n-54.0.1/sk.xpi) = 455015
-SHA256 (xpi/firefox-i18n-54.0.1/sl.xpi) = 31795653987c7dc1a1968006b3c8068f6e1089b0f2311d9d53c08cb73d2d3617
-SIZE (xpi/firefox-i18n-54.0.1/sl.xpi) = 433176
-SHA256 (xpi/firefox-i18n-54.0.1/son.xpi) = f1ee7a8fe539071cd78361d40f1e547ee25d0a5e10a72e040ff56d9f20bc297a
-SIZE (xpi/firefox-i18n-54.0.1/son.xpi) = 435053
-SHA256 (xpi/firefox-i18n-54.0.1/sq.xpi) = 4310b19b43b5cd4c841ded13a62c621cf3eea4391e516b08bb70a4ea3e008a9a
-SIZE (xpi/firefox-i18n-54.0.1/sq.xpi) = 448158
-SHA256 (xpi/firefox-i18n-54.0.1/sr.xpi) = 22a1101556894ea99607cc9e447bf6e54705a906e476245e3f599fd7ffc24484
-SIZE (xpi/firefox-i18n-54.0.1/sr.xpi) = 461355
-SHA256 (xpi/firefox-i18n-54.0.1/sv-SE.xpi) = 6fbaa53965beac50102a130257e3703ceddc4621744941beace41d172ab8d559
-SIZE (xpi/firefox-i18n-54.0.1/sv-SE.xpi) = 440479
-SHA256 (xpi/firefox-i18n-54.0.1/ta.xpi) = 192fe9dcf242ff01da8e51c216f04d32fe4a91170dbce22e5e40ecfa7f5e0759
-SIZE (xpi/firefox-i18n-54.0.1/ta.xpi) = 493957
-SHA256 (xpi/firefox-i18n-54.0.1/te.xpi) = c4e2bef212d4fbc5c250808f92318165db9f3bb0936be28b2517f43f213a3010
-SIZE (xpi/firefox-i18n-54.0.1/te.xpi) = 513339
-SHA256 (xpi/firefox-i18n-54.0.1/th.xpi) = be7902e644099d01405198a7f3a7c651494012c26e9729aa63f103a58adb28ba
-SIZE (xpi/firefox-i18n-54.0.1/th.xpi) = 487219
-SHA256 (xpi/firefox-i18n-54.0.1/tr.xpi) = 4460fb3b0c3419ccc67de5b81709337e3990bd0f3753e66cbed467b468e58aff
-SIZE (xpi/firefox-i18n-54.0.1/tr.xpi) = 440413
-SHA256 (xpi/firefox-i18n-54.0.1/uk.xpi) = 9009a1ff5f9e53b2041dd58a47b377d73e0e9dc59d257b49c2ce0f4fe9e15471
-SIZE (xpi/firefox-i18n-54.0.1/uk.xpi) = 490758
-SHA256 (xpi/firefox-i18n-54.0.1/ur.xpi) = efa36df7c6ccda5551d3be4a0beaff1069310607afb99040b7d586a9abd422e4
-SIZE (xpi/firefox-i18n-54.0.1/ur.xpi) = 496584
-SHA256 (xpi/firefox-i18n-54.0.1/uz.xpi) = 90b31da2151bbf9c89766074afec716c4cd05bfbae3d30bac1ccf14a0eb1db62
-SIZE (xpi/firefox-i18n-54.0.1/uz.xpi) = 448113
-SHA256 (xpi/firefox-i18n-54.0.1/vi.xpi) = b971ef91795039963a35e59ab7d653d7f0568760c3a0e2c95dccaf5052fd3750
-SIZE (xpi/firefox-i18n-54.0.1/vi.xpi) = 449655
-SHA256 (xpi/firefox-i18n-54.0.1/xh.xpi) = dbb7ca463660d3bf1fc2c079551b6380dc8d238be1a34cd2426cae4b74382bb9
-SIZE (xpi/firefox-i18n-54.0.1/xh.xpi) = 440803
-SHA256 (xpi/firefox-i18n-54.0.1/zh-CN.xpi) = 0acf841d128b347c85ceb8fa34dd2dcdb3177b1c4cb9fa2a97666ba0912dd16b
-SIZE (xpi/firefox-i18n-54.0.1/zh-CN.xpi) = 458333
-SHA256 (xpi/firefox-i18n-54.0.1/zh-TW.xpi) = bebd2c45d83ba97ebafc3fd463385d3a75d3818bae33bf71e3430594f5f5abbc
-SIZE (xpi/firefox-i18n-54.0.1/zh-TW.xpi) = 469166
+TIMESTAMP = 1502312473
+SHA256 (xpi/firefox-i18n-55.0.1/ach.xpi) = dd7814ceae9dfc8bb5f2f753caa4e1fe1710fd7acbfa561fda51a923c42a9c93
+SIZE (xpi/firefox-i18n-55.0.1/ach.xpi) = 447504
+SHA256 (xpi/firefox-i18n-55.0.1/af.xpi) = 45aec05be03e03c73e2d0179de621149dea373eb4622d956a2c54f1fc6b60a4a
+SIZE (xpi/firefox-i18n-55.0.1/af.xpi) = 448924
+SHA256 (xpi/firefox-i18n-55.0.1/an.xpi) = 1c67b5ae972779f2208654272eca345a549c1e6aa5c59b15fd6e4c04785c3857
+SIZE (xpi/firefox-i18n-55.0.1/an.xpi) = 468638
+SHA256 (xpi/firefox-i18n-55.0.1/ar.xpi) = e15ae3685880f75b0dde0d691a6e6204698440192fc7136604c76d2dda08c3e2
+SIZE (xpi/firefox-i18n-55.0.1/ar.xpi) = 492760
+SHA256 (xpi/firefox-i18n-55.0.1/as.xpi) = bbd45adb073034d86bf520aae2aa78d2278489d20ebe359bd19dd9767aeafbfc
+SIZE (xpi/firefox-i18n-55.0.1/as.xpi) = 501508
+SHA256 (xpi/firefox-i18n-55.0.1/ast.xpi) = 2b6aadfd0101ed1285fc5b6354a15cf7479c25b47a1819cdd80c94fcb26b66c3
+SIZE (xpi/firefox-i18n-55.0.1/ast.xpi) = 460841
+SHA256 (xpi/firefox-i18n-55.0.1/az.xpi) = d359f699a19722c0a65c1b3c2174c7c6219f01c366f156f036d23021831b4300
+SIZE (xpi/firefox-i18n-55.0.1/az.xpi) = 475368
+SHA256 (xpi/firefox-i18n-55.0.1/be.xpi) = 10dbc632413696bebec7a8c857ec37d121611a6ac3296df3155e17d6b156e9af
+SIZE (xpi/firefox-i18n-55.0.1/be.xpi) = 522575
+SHA256 (xpi/firefox-i18n-55.0.1/bg.xpi) = 255ede1bcd7927e69c6a3f2c901abb33f567e7f77b017360bf93bd19509d61d4
+SIZE (xpi/firefox-i18n-55.0.1/bg.xpi) = 520012
+SHA256 (xpi/firefox-i18n-55.0.1/bn-BD.xpi) = 734613c4adb723ad3087db4921ac3c6b25ec2cb2834a34b42653ad373399e508
+SIZE (xpi/firefox-i18n-55.0.1/bn-BD.xpi) = 535107
+SHA256 (xpi/firefox-i18n-55.0.1/bn-IN.xpi) = d75e6896d2c8b83cc8bd63ea6c577a3dcccc9c4cebb12f56c3bfda5fb79daf5a
+SIZE (xpi/firefox-i18n-55.0.1/bn-IN.xpi) = 526354
+SHA256 (xpi/firefox-i18n-55.0.1/br.xpi) = 528391063bff3899380fbdd6863434f340d089a5f800dae286929dd6ca2510c8
+SIZE (xpi/firefox-i18n-55.0.1/br.xpi) = 457060
+SHA256 (xpi/firefox-i18n-55.0.1/bs.xpi) = 88cc4aa3891e66397b01d7b750b3e932af677086c13d04c400e9b5966afed573
+SIZE (xpi/firefox-i18n-55.0.1/bs.xpi) = 465026
+SHA256 (xpi/firefox-i18n-55.0.1/ca.xpi) = daaa7ce4903db429821ba25889e75b9e7b11f7e320e2ae2e6c03ca1e20e01751
+SIZE (xpi/firefox-i18n-55.0.1/ca.xpi) = 473018
+SHA256 (xpi/firefox-i18n-55.0.1/cak.xpi) = 38bada639ddfb0d9abd166617363c2e333d7aa2e63c3d75f6856cd2eb0d31dee
+SIZE (xpi/firefox-i18n-55.0.1/cak.xpi) = 481774
+SHA256 (xpi/firefox-i18n-55.0.1/cs.xpi) = 66196782f7151a01df153b9d763f25f49f035766342874577f586daacbe3a4f3
+SIZE (xpi/firefox-i18n-55.0.1/cs.xpi) = 476809
+SHA256 (xpi/firefox-i18n-55.0.1/cy.xpi) = ac9be82a4f0afdee6febc7cb4581c7f0ce3e900b48e27f00d6e2eb9b5a1e4618
+SIZE (xpi/firefox-i18n-55.0.1/cy.xpi) = 458725
+SHA256 (xpi/firefox-i18n-55.0.1/da.xpi) = 9829fe4ddb635f857b0b299bc752d554c00433750203a0e79d522db44a563ce1
+SIZE (xpi/firefox-i18n-55.0.1/da.xpi) = 452604
+SHA256 (xpi/firefox-i18n-55.0.1/de.xpi) = 1c8620fb483079be896c6a219429e0c13858d80678054bcaf9dc870ba783e5c4
+SIZE (xpi/firefox-i18n-55.0.1/de.xpi) = 465990
+SHA256 (xpi/firefox-i18n-55.0.1/dsb.xpi) = f1603c97d0ba802cce4563fb2107cce5197ff20abe6b1458767173f711d96916
+SIZE (xpi/firefox-i18n-55.0.1/dsb.xpi) = 482081
+SHA256 (xpi/firefox-i18n-55.0.1/el.xpi) = 8cb410e71bf96bc1e78fb9e1362ee9f6cc9622a5ad2041f100d2979f40b23d00
+SIZE (xpi/firefox-i18n-55.0.1/el.xpi) = 539777
+SHA256 (xpi/firefox-i18n-55.0.1/en-GB.xpi) = 2f5f058a2a721928bbd12c768765938d87ad6c37c072584d4811012bcbaa4fbe
+SIZE (xpi/firefox-i18n-55.0.1/en-GB.xpi) = 439269
+SHA256 (xpi/firefox-i18n-55.0.1/en-US.xpi) = 7078baf35f5c02299683b1dcb3767bc796c9dc26a9dd649729ed4109b91fa8f4
+SIZE (xpi/firefox-i18n-55.0.1/en-US.xpi) = 439814
+SHA256 (xpi/firefox-i18n-55.0.1/en-ZA.xpi) = d0447449b12ce3c5325807b9a3f056be3815c58c839f11ea55c754f3bc87da86
+SIZE (xpi/firefox-i18n-55.0.1/en-ZA.xpi) = 438621
+SHA256 (xpi/firefox-i18n-55.0.1/eo.xpi) = b435b855b02c92bb80ab9f7388312c39c1b936ec3242b525ca50e8df41a9811c
+SIZE (xpi/firefox-i18n-55.0.1/eo.xpi) = 461140
+SHA256 (xpi/firefox-i18n-55.0.1/es-AR.xpi) = 0712140958edc68a3050faa589cff1ac5525887d3309ed8ba24dda8f5b594fcf
+SIZE (xpi/firefox-i18n-55.0.1/es-AR.xpi) = 467619
+SHA256 (xpi/firefox-i18n-55.0.1/es-CL.xpi) = 1b9162658325c6a3686056138ff5106f9829ddf842d9036ddc760b86c2d2b32a
+SIZE (xpi/firefox-i18n-55.0.1/es-CL.xpi) = 471599
+SHA256 (xpi/firefox-i18n-55.0.1/es-ES.xpi) = c457a10bf90ea59af66f809fea67513a3762d3aacd9c8a0cd82235108b316959
+SIZE (xpi/firefox-i18n-55.0.1/es-ES.xpi) = 359824
+SHA256 (xpi/firefox-i18n-55.0.1/es-MX.xpi) = faea86e9b5f7c9e4e262108b27fe44a449859c9855c0d16b5e3ff2a78d67dd90
+SIZE (xpi/firefox-i18n-55.0.1/es-MX.xpi) = 474245
+SHA256 (xpi/firefox-i18n-55.0.1/et.xpi) = 8621792549cf4f6e7ae677577081727d95cd2108145e1396e6a7d6da5de74ee9
+SIZE (xpi/firefox-i18n-55.0.1/et.xpi) = 454471
+SHA256 (xpi/firefox-i18n-55.0.1/eu.xpi) = fb38c68ff5a351cba4c0e64ba0502328323241fc3393e0762674ce46cc419053
+SIZE (xpi/firefox-i18n-55.0.1/eu.xpi) = 460419
+SHA256 (xpi/firefox-i18n-55.0.1/fa.xpi) = 7b2b3856a1b6e02cf9671a5847aab6d2367bc1b44a576dca6b93824aec2f7561
+SIZE (xpi/firefox-i18n-55.0.1/fa.xpi) = 511561
+SHA256 (xpi/firefox-i18n-55.0.1/ff.xpi) = cae40f92930db2172446b5a33e8e3e8564738f615834e4485006ec930173530b
+SIZE (xpi/firefox-i18n-55.0.1/ff.xpi) = 455294
+SHA256 (xpi/firefox-i18n-55.0.1/fi.xpi) = f57de383c38a423887b9b57f8a0cd8f861067bd1d86eea0a33b83928e8e3faeb
+SIZE (xpi/firefox-i18n-55.0.1/fi.xpi) = 453945
+SHA256 (xpi/firefox-i18n-55.0.1/fr.xpi) = 202df2c44b9c248819c41b411f3380edad69244e506c1ec77e7833e75841e232
+SIZE (xpi/firefox-i18n-55.0.1/fr.xpi) = 476668
+SHA256 (xpi/firefox-i18n-55.0.1/fy-NL.xpi) = b7f9c5f0d4ffbaa29bf7b16e1f712e430fc489e5aa8c71f2e9d73ae97dc5a119
+SIZE (xpi/firefox-i18n-55.0.1/fy-NL.xpi) = 469971
+SHA256 (xpi/firefox-i18n-55.0.1/ga-IE.xpi) = e685e0d0c60499b209f4334d54cb45f947448edf24f7208804f81dc0fa6f5665
+SIZE (xpi/firefox-i18n-55.0.1/ga-IE.xpi) = 481440
+SHA256 (xpi/firefox-i18n-55.0.1/gd.xpi) = 6c05773dff34bc8175dbb517e79052ec18dbe4d3afc8fc2954bb1d4078f3bd9b
+SIZE (xpi/firefox-i18n-55.0.1/gd.xpi) = 469055
+SHA256 (xpi/firefox-i18n-55.0.1/gl.xpi) = 10174252a20cd7cbceb587e2dc949a61fd9a43fce94c4e0629a7d6c9e295ef87
+SIZE (xpi/firefox-i18n-55.0.1/gl.xpi) = 459111
+SHA256 (xpi/firefox-i18n-55.0.1/gn.xpi) = 9963eac39e177d798969daa1559a54908f90234ef25c68061407661976482fbe
+SIZE (xpi/firefox-i18n-55.0.1/gn.xpi) = 476201
+SHA256 (xpi/firefox-i18n-55.0.1/gu-IN.xpi) = decf4ce02bf2079beca9d91ce56c4be2cc806a6854170ffc203aa31880c83459
+SIZE (xpi/firefox-i18n-55.0.1/gu-IN.xpi) = 498986
+SHA256 (xpi/firefox-i18n-55.0.1/he.xpi) = 98cef48c565a8150dbe31aecbcaf3a63c541715ade1220ba37a68105e83556cb
+SIZE (xpi/firefox-i18n-55.0.1/he.xpi) = 479882
+SHA256 (xpi/firefox-i18n-55.0.1/hi-IN.xpi) = 43859e5074151ba5571c2ea2a3a9b1957d4ca99e056c305da3e30d111b4d1ca1
+SIZE (xpi/firefox-i18n-55.0.1/hi-IN.xpi) = 530571
+SHA256 (xpi/firefox-i18n-55.0.1/hr.xpi) = 22fff17ae146db6f313fbde5f429d9b35e9a88fbade7351239e4054e6fb9da42
+SIZE (xpi/firefox-i18n-55.0.1/hr.xpi) = 467992
+SHA256 (xpi/firefox-i18n-55.0.1/hsb.xpi) = e38d8d9952a2be7f3bbf0cb15ecc1eb4f529e4c36c9f507d795a7fa99a0af156
+SIZE (xpi/firefox-i18n-55.0.1/hsb.xpi) = 479798
+SHA256 (xpi/firefox-i18n-55.0.1/hu.xpi) = 062b955c742a543d2b653e4879c90b7c2ff96372d3f55b1486c1953c9d7fd470
+SIZE (xpi/firefox-i18n-55.0.1/hu.xpi) = 481645
+SHA256 (xpi/firefox-i18n-55.0.1/hy-AM.xpi) = ea10f974acaf0006c851fc7879321f02900b6ba574e2cd1117a701e790ffef7a
+SIZE (xpi/firefox-i18n-55.0.1/hy-AM.xpi) = 520879
+SHA256 (xpi/firefox-i18n-55.0.1/id.xpi) = 48a99906a98d0bc7f9220c4c648e6ebc5428a1b1fdf8041f7d8d17730efeafa1
+SIZE (xpi/firefox-i18n-55.0.1/id.xpi) = 450290
+SHA256 (xpi/firefox-i18n-55.0.1/is.xpi) = f3d8af34fb48721d53e06ddefe88047b5004e10640d0e0b9924bfbf535b7fed3
+SIZE (xpi/firefox-i18n-55.0.1/is.xpi) = 464373
+SHA256 (xpi/firefox-i18n-55.0.1/it.xpi) = b77325ec71144fbe280e369ec0e1dcf72867aff8602eb14102889e09d087822d
+SIZE (xpi/firefox-i18n-55.0.1/it.xpi) = 352941
+SHA256 (xpi/firefox-i18n-55.0.1/ja.xpi) = 6b174b01ae0d4cd9101d88c8d5ec30a7394387e13ad8b1462a886368395de6d1
+SIZE (xpi/firefox-i18n-55.0.1/ja.xpi) = 519764
+SHA256 (xpi/firefox-i18n-55.0.1/ka.xpi) = e69009c27b8810db9e4f9327d7a85c9c07cf4fa1b650999ee71b2706257b3a7e
+SIZE (xpi/firefox-i18n-55.0.1/ka.xpi) = 493535
+SHA256 (xpi/firefox-i18n-55.0.1/kab.xpi) = aaf82a38798f0a0af99fe3c0a66024d604ab62dcab1839ea8b92d1d7dc6b8cc1
+SIZE (xpi/firefox-i18n-55.0.1/kab.xpi) = 470044
+SHA256 (xpi/firefox-i18n-55.0.1/kk.xpi) = 3e52fb9036d0dacf71d831b472816eec29114b018da2ba2a7a64eafef70e9b2d
+SIZE (xpi/firefox-i18n-55.0.1/kk.xpi) = 526707
+SHA256 (xpi/firefox-i18n-55.0.1/km.xpi) = e45c29be853d66afcd3b43f7d78cca8a4db7f1731d487161b57a043bf6f4d951
+SIZE (xpi/firefox-i18n-55.0.1/km.xpi) = 540646
+SHA256 (xpi/firefox-i18n-55.0.1/kn.xpi) = 6be0a26c8fae5e461fa45b6a3c574bce7689d0fed0571fdd12e738288d2341a2
+SIZE (xpi/firefox-i18n-55.0.1/kn.xpi) = 538860
+SHA256 (xpi/firefox-i18n-55.0.1/ko.xpi) = 8d2ba62b56df3e43c20e04d0920ca4608c4956e3590a6a23abe243ad8c597655
+SIZE (xpi/firefox-i18n-55.0.1/ko.xpi) = 494547
+SHA256 (xpi/firefox-i18n-55.0.1/lij.xpi) = f2d68cfb84305f9dc72b6fb04fe0f3bdfbdbc549d683cf2b8229263d97d565a1
+SIZE (xpi/firefox-i18n-55.0.1/lij.xpi) = 458698
+SHA256 (xpi/firefox-i18n-55.0.1/lt.xpi) = 275ff3a72b128b9db0413e0cade162a179a3a0fd702a41c94411bf74a69b97cd
+SIZE (xpi/firefox-i18n-55.0.1/lt.xpi) = 481082
+SHA256 (xpi/firefox-i18n-55.0.1/lv.xpi) = 6c9c5244a1c5ba078c9740851b43f0de6d0d79afcd5c83b3b6dd81e3165fc9ef
+SIZE (xpi/firefox-i18n-55.0.1/lv.xpi) = 473736
+SHA256 (xpi/firefox-i18n-55.0.1/mai.xpi) = 9b5b30fcc3f64e95c073c65cfb857bdbec62e3af630b5443220963b507f28fc4
+SIZE (xpi/firefox-i18n-55.0.1/mai.xpi) = 517894
+SHA256 (xpi/firefox-i18n-55.0.1/mk.xpi) = 1d33aacc5f3db9272a53b77c7aaab17cb03d3bba2480e90e9f4ae88ed178f277
+SIZE (xpi/firefox-i18n-55.0.1/mk.xpi) = 500207
+SHA256 (xpi/firefox-i18n-55.0.1/ml.xpi) = 585d1321d9e765203b1c693609001ed978868aadaa19c4a0f25ad1162c66f8bb
+SIZE (xpi/firefox-i18n-55.0.1/ml.xpi) = 540982
+SHA256 (xpi/firefox-i18n-55.0.1/mr.xpi) = f567327d23cc88411c3dadb17744988ad4bc9157dcbb8d63d4e9013213fa5cd3
+SIZE (xpi/firefox-i18n-55.0.1/mr.xpi) = 528249
+SHA256 (xpi/firefox-i18n-55.0.1/ms.xpi) = 20e472acc73826653d0f6d73472919736b12cd682fc589cd65108878a0288f07
+SIZE (xpi/firefox-i18n-55.0.1/ms.xpi) = 459191
+SHA256 (xpi/firefox-i18n-55.0.1/my.xpi) = 6127217183acbd6272073ba7d2d63f27204a56cc91b0f6fe27a1a835cc3f879a
+SIZE (xpi/firefox-i18n-55.0.1/my.xpi) = 528097
+SHA256 (xpi/firefox-i18n-55.0.1/nb-NO.xpi) = 951bc707774b4772115302e5e17f1951100eb818ecc663c472af3e214a1eae64
+SIZE (xpi/firefox-i18n-55.0.1/nb-NO.xpi) = 457645
+SHA256 (xpi/firefox-i18n-55.0.1/nl.xpi) = 4e79c3c23e2dc8612f94e8df7e535fe31b33996f974ddbb390b3531bfef38d80
+SIZE (xpi/firefox-i18n-55.0.1/nl.xpi) = 461510
+SHA256 (xpi/firefox-i18n-55.0.1/nn-NO.xpi) = e9f20af1ce0ba6b36dd79746292dfd900f939d8ce48b5d11147b66777738e415
+SIZE (xpi/firefox-i18n-55.0.1/nn-NO.xpi) = 458457
+SHA256 (xpi/firefox-i18n-55.0.1/or.xpi) = b4320830c582c73acee3e79d363c1867a136b36f2ebba32cf1f8a7b530218830
+SIZE (xpi/firefox-i18n-55.0.1/or.xpi) = 511354
+SHA256 (xpi/firefox-i18n-55.0.1/pa-IN.xpi) = fe4cc1ed5e1289b18eedf6d102a88460fd2cdb84eb60f7fc02588f5d18b1815b
+SIZE (xpi/firefox-i18n-55.0.1/pa-IN.xpi) = 498453
+SHA256 (xpi/firefox-i18n-55.0.1/pl.xpi) = 0c7d6483a1240dadb2897dd47157456bede2a4387ff193032881db9b5bdbdee0
+SIZE (xpi/firefox-i18n-55.0.1/pl.xpi) = 372430
+SHA256 (xpi/firefox-i18n-55.0.1/pt-BR.xpi) = ac62ce753a160e25b5fd44a0e335fdd79bc392d870e6ac900768ab1781e66064
+SIZE (xpi/firefox-i18n-55.0.1/pt-BR.xpi) = 462717
+SHA256 (xpi/firefox-i18n-55.0.1/pt-PT.xpi) = 7426dd1a89ba871da9d966b29b9168ff345964b7d68d2163c86c1655c47e60e3
+SIZE (xpi/firefox-i18n-55.0.1/pt-PT.xpi) = 465237
+SHA256 (xpi/firefox-i18n-55.0.1/rm.xpi) = 864dca54a7dc2c6974bebaedf9042cbfbcced0a85de2aee0f9d80a232074df9f
+SIZE (xpi/firefox-i18n-55.0.1/rm.xpi) = 458265
+SHA256 (xpi/firefox-i18n-55.0.1/ro.xpi) = 6cb6e1634a235fb2e46e2ff25f33f89c1c61114782a1c58f620d49d55de748ef
+SIZE (xpi/firefox-i18n-55.0.1/ro.xpi) = 462973
+SHA256 (xpi/firefox-i18n-55.0.1/ru.xpi) = 39997f59a5710be0428496edbe6954625f3c321cb89a20c4eb1901a621cf2c3a
+SIZE (xpi/firefox-i18n-55.0.1/ru.xpi) = 530901
+SHA256 (xpi/firefox-i18n-55.0.1/si.xpi) = c4cfa062a266c3ff7f5847dc060c78be9dd91a792f79a2092122ac377270876f
+SIZE (xpi/firefox-i18n-55.0.1/si.xpi) = 508353
+SHA256 (xpi/firefox-i18n-55.0.1/sk.xpi) = 52e71b9050686130559e511c877bb06d76e7765903f31014b63621056e882eb1
+SIZE (xpi/firefox-i18n-55.0.1/sk.xpi) = 487583
+SHA256 (xpi/firefox-i18n-55.0.1/sl.xpi) = b9702991ebd8035610c341bc1b08136ac7711101632f5136dc7a1ea883e474f6
+SIZE (xpi/firefox-i18n-55.0.1/sl.xpi) = 465760
+SHA256 (xpi/firefox-i18n-55.0.1/son.xpi) = 779b7d472496361a860910ce86f7e7281bedf6bddef001923951b52f80e9ff1f
+SIZE (xpi/firefox-i18n-55.0.1/son.xpi) = 456959
+SHA256 (xpi/firefox-i18n-55.0.1/sq.xpi) = 899db3ff59388671fef58e60add6f9fe349d0812c2bc4483637ddbe651943e54
+SIZE (xpi/firefox-i18n-55.0.1/sq.xpi) = 470631
+SHA256 (xpi/firefox-i18n-55.0.1/sr.xpi) = 97c5c450ddd4fb92da585011da59e962522bca2f731b739cd5c002012a607673
+SIZE (xpi/firefox-i18n-55.0.1/sr.xpi) = 494878
+SHA256 (xpi/firefox-i18n-55.0.1/sv-SE.xpi) = 28793b25536173166d37e248aeeb4f0374923a78e7401d906c9a206b68794a92
+SIZE (xpi/firefox-i18n-55.0.1/sv-SE.xpi) = 466011
+SHA256 (xpi/firefox-i18n-55.0.1/ta.xpi) = 3c261563af14eaacb71b18cec93c6bac8b52c4c8b2c6f8daa450ca999b59dd1d
+SIZE (xpi/firefox-i18n-55.0.1/ta.xpi) = 519998
+SHA256 (xpi/firefox-i18n-55.0.1/te.xpi) = 836b79bf5d691cec5e6893b58b22d1c995d20627698dba516851e98c96d6e895
+SIZE (xpi/firefox-i18n-55.0.1/te.xpi) = 542539
+SHA256 (xpi/firefox-i18n-55.0.1/th.xpi) = 9fbce74883162f9330f38f5da6ed2c4b81e8a0eefd78b9bf59cc919714bfa343
+SIZE (xpi/firefox-i18n-55.0.1/th.xpi) = 511903
+SHA256 (xpi/firefox-i18n-55.0.1/tr.xpi) = df231571df6ce29eee1885630e9544ca333f33d7e09a14d93eea7c3e06ac5395
+SIZE (xpi/firefox-i18n-55.0.1/tr.xpi) = 472160
+SHA256 (xpi/firefox-i18n-55.0.1/uk.xpi) = 3373ec3addc81d5177157d3f16ab0e37c0ca7f97ddc56027a72bb5632314e95d
+SIZE (xpi/firefox-i18n-55.0.1/uk.xpi) = 526436
+SHA256 (xpi/firefox-i18n-55.0.1/ur.xpi) = 0153a5af7e98c8a6e8afafb0bfd989ed71f05f12c05215bb3ff467af8614f7e6
+SIZE (xpi/firefox-i18n-55.0.1/ur.xpi) = 520753
+SHA256 (xpi/firefox-i18n-55.0.1/uz.xpi) = a15d82f940f696d6c70cb9d3d8b81d458c0936ccc95ff79d7d2e786536b9bf1e
+SIZE (xpi/firefox-i18n-55.0.1/uz.xpi) = 467671
+SHA256 (xpi/firefox-i18n-55.0.1/vi.xpi) = 718514a6874900e2d8b78a3f5b71335ee4d67a42345bc1e101abada9f461bf89
+SIZE (xpi/firefox-i18n-55.0.1/vi.xpi) = 476527
+SHA256 (xpi/firefox-i18n-55.0.1/xh.xpi) = 33183835d979284be68c7904ec717fe1f92938a5dba067c7b7fb5e3eb5b0991c
+SIZE (xpi/firefox-i18n-55.0.1/xh.xpi) = 470719
+SHA256 (xpi/firefox-i18n-55.0.1/zh-CN.xpi) = 56e42000a5528515e26962fe288c1571ca40cb671189a2496ab8d3a6de097472
+SIZE (xpi/firefox-i18n-55.0.1/zh-CN.xpi) = 490383
+SHA256 (xpi/firefox-i18n-55.0.1/zh-TW.xpi) = e5b94d27d2ef86e1945f4b8757a2f7149125b998f9a3316d0b4d1732646384c1
+SIZE (xpi/firefox-i18n-55.0.1/zh-TW.xpi) = 489347

Modified: branches/2017Q3/www/firefox/Makefile
==============================================================================
--- branches/2017Q3/www/firefox/Makefile	Thu Aug 10 15:35:47 2017	(r447689)
+++ branches/2017Q3/www/firefox/Makefile	Thu Aug 10 15:36:56 2017	(r447690)
@@ -2,26 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	54.0.1
+DISTVERSION=	55.0.1
 DISTVERSIONSUFFIX=.source
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nspr>=4.14:devel/nspr \
-		nss>=3.30.2:security/nss \
+BUILD_DEPENDS=	nspr>=4.15:devel/nspr \
+		nss>=3.31.1:security/nss \
 		libevent>=2.0.22:devel/libevent \
-		harfbuzz>=1.4.3:print/harfbuzz \
+		harfbuzz>=1.4.6:print/harfbuzz \
 		graphite2>=1.3.10:graphics/graphite2 \
 		png>=1.6.28:graphics/png \
 		libvorbis>=1.3.5,3:audio/libvorbis \
 		libvpx>=1.5.0:multimedia/libvpx \
-		sqlite3>=3.17.0:databases/sqlite3 \
+		sqlite3>=3.19.2:databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
@@ -47,6 +46,7 @@ MOZ_OPTIONS=	--enable-application=browser \
 
 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

Modified: branches/2017Q3/www/firefox/distinfo
==============================================================================
--- branches/2017Q3/www/firefox/distinfo	Thu Aug 10 15:35:47 2017	(r447689)
+++ branches/2017Q3/www/firefox/distinfo	Thu Aug 10 15:36:56 2017	(r447690)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498670356
-SHA256 (firefox-54.0.1.source.tar.xz) = 07843e68f2f64842bb230b7fe821e45c82944e64dc3f2a3a90d3ea9f1efa7f77
-SIZE (firefox-54.0.1.source.tar.xz) = 229935420
+TIMESTAMP = 1502312473
+SHA256 (firefox-55.0.1.source.tar.xz) = 827c26ed1940ce22aeeec98120cbe1a415365929a9186a0bc3c4c17726a9a9d3
+SIZE (firefox-55.0.1.source.tar.xz) = 236278024

Modified: branches/2017Q3/www/firefox/files/patch-bug1021761
==============================================================================
--- branches/2017Q3/www/firefox/files/patch-bug1021761	Thu Aug 10 15:35:47 2017	(r447689)
+++ branches/2017Q3/www/firefox/files/patch-bug1021761	Thu Aug 10 15:36:56 2017	(r447690)
@@ -122,8 +122,19 @@ index 57bcb4c13652..68be024f4a68 100644
  
  static int
  validate_stream_params(cubeb_stream_params * input_stream_params,
-@@ -138,6 +141,9 @@ cubeb_init(cubeb ** context, char const * context_name)
+@@ -155,6 +158,10 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
  #if defined(USE_KAI)
+       init_oneshot = kai_init;
+ #endif
++    } else if (!strcmp(backend_name, "oss")) {
++#if defined(USE_OSS)
++      init_oneshot = oss_init;
++#endif
+     } else {
+       /* Already set */
+     }
+@@ -196,6 +203,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam
+ #if defined(USE_KAI)
      kai_init,
  #endif
 +#if defined(USE_OSS)
@@ -246,7 +257,7 @@ index 05ad27fef53b..3ea78e994f59 100644
 +    char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
  
      /* Correct read size to the other stream available frames */
-     if (stm->other_stream && got > stm->other_stream->bufframes) {
+     if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
 @@ -372,8 +421,8 @@ alsa_process_stream(cubeb_stream * stm)
      long drain_frames = avail - stm->bufframes;
      double drain_time = (double) drain_frames / stm->params.rate;
@@ -579,7 +590,7 @@ index 05ad27fef53b..3ea78e994f59 100644
 +  r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
    assert((nfds_t) r == stm->nfds);
  
-   r = pthread_cond_init(&stm->cond, NULL);
+   if (alsa_register_stream(ctx, stm) != 0) {
 @@ -1048,7 +1156,7 @@ alsa_stream_destroy(cubeb_stream * stm)
    pthread_mutex_lock(&stm->mutex);
    if (stm->pcm) {
@@ -1182,29 +1193,14 @@ diff --git media/libcubeb/update.sh media/libcubeb/upd
 index b139b8f497fd..d1f8a223c6d8 100755
 --- media/libcubeb/update.sh
 +++ media/libcubeb/update.sh
-@@ -17,6 +17,7 @@ cp $1/src/cubeb_audiounit.cpp src
- cp $1/src/cubeb_osx_run_loop.h src
- cp $1/src/cubeb_jack.cpp src
+@@ -20,6 +20,7 @@ cp $1/src/cubeb_log.h src
+ cp $1/src/cubeb_mixer.cpp src
+ cp $1/src/cubeb_mixer.h src
  cp $1/src/cubeb_opensl.c src
 +cp $1/src/cubeb_oss.c src
- cp $1/src/cubeb_array_queue.h src
+ cp $1/src/cubeb_osx_run_loop.h src
  cp $1/src/cubeb_panner.cpp src
  cp $1/src/cubeb_panner.h src
-diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build
-index 3e5450f5d63a..dd45427f655a 100644
---- media/webrtc/signaling/test/common.build
-+++ media/webrtc/signaling/test/common.build
-@@ -99,8 +99,8 @@ USE_LIBS += ['mozglue']
- OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
- OS_LIBS += CONFIG['REALTIME_LIBS']
- 
--if CONFIG['MOZ_ALSA']:
--    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
-+if CONFIG['MOZ_OSS']:
-+    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
- 
- if CONFIG['MOZ_SYSTEM_JPEG']:
-     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
 diff --git toolkit/library/moz.build toolkit/library/moz.build
 index a61c689c83c3..7764df6f8a6b 100644
 --- toolkit/library/moz.build

Copied: branches/2017Q3/www/firefox/files/patch-bug1312182 (from r447501, head/www/firefox/files/patch-bug1312182)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q3/www/firefox/files/patch-bug1312182	Thu Aug 10 15:36:56 2017	(r447690, copy of r447501, head/www/firefox/files/patch-bug1312182)
@@ -0,0 +1,376 @@
+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">

Copied: branches/2017Q3/www/firefox/files/patch-bug1385597 (from r447501, head/www/firefox/files/patch-bug1385597)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q3/www/firefox/files/patch-bug1385597	Thu Aug 10 15:36:56 2017	(r447690, copy of r447501, head/www/firefox/files/patch-bug1385597)
@@ -0,0 +1,24 @@
+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
+     }
+   }

Modified: branches/2017Q3/www/firefox/files/patch-bug702179
==============================================================================
--- branches/2017Q3/www/firefox/files/patch-bug702179	Thu Aug 10 15:35:47 2017	(r447689)
+++ branches/2017Q3/www/firefox/files/patch-bug702179	Thu Aug 10 15:36:56 2017	(r447690)
@@ -1,13 +1,12 @@
---- js/src/moz.build.orig	2015-12-16 12:32:04.574425000 +0100
-+++ js/src/moz.build	2015-12-16 12:32:09.032032000 +0100
-@@ -671,10 +671,6 @@ CFLAGS += CONFIG['MOZ_ICU_CFLAGS']
- CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
- LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
+Don't build static JS lib to make sure DTrace probes are picked up.
+
+--- js/src/build/moz.build.orig	2017-04-16 18:00:50 UTC
++++ js/src/build/moz.build

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708101536.v7AFauef059776>