Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Jan 2019 16:42:07 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490962 - in head/www: firefox-esr firefox-esr-i18n firefox-esr/files
Message-ID:  <201901221642.x0MGg7Wr018168@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Jan 22 16:42:07 2019
New Revision: 490962
URL: https://svnweb.freebsd.org/changeset/ports/490962

Log:
  nwww/firefox-esr: update to 60.5.0
  
  Changes:	https://www.mozilla.org/firefox/60.5.0/releasenotes/
  Patch churn by:	https://bugzilla.mozilla.org/show_bug.cgi?id=1513900
  Security:	b1f7d52f-fc42-48e8-8403-87d4c9d26229
  MFH:		2019Q1

Deleted:
  head/www/firefox-esr/files/patch-bug1500850
Modified:
  head/www/firefox-esr-i18n/Makefile   (contents, props changed)
  head/www/firefox-esr-i18n/distinfo   (contents, props changed)
  head/www/firefox-esr/Makefile   (contents, props changed)
  head/www/firefox-esr/distinfo   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1375074   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1411481   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1438678   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1442583   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1447359   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1451292   (contents, props changed)
  head/www/firefox-esr/files/patch-bug1456556   (contents, props changed)
  head/www/firefox-esr/files/patch-z-bug1436911   (contents, props changed)

Modified: head/www/firefox-esr-i18n/Makefile
==============================================================================
--- head/www/firefox-esr-i18n/Makefile	Tue Jan 22 16:26:49 2019	(r490961)
+++ head/www/firefox-esr-i18n/Makefile	Tue Jan 22 16:42:07 2019	(r490962)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-PORTVERSION=	60.4.0
+PORTVERSION=	60.5.0
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}esr/linux-i686/xpi \
-		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build2/linux-i686/xpi
+		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build1/linux-i686/xpi
 PKGNAMEPREFIX=
 PKGNAMESUFFIX=	-esr-i18n
 DISTFILES=	${FIREFOX_I18N_:S/$/.xpi/}

Modified: head/www/firefox-esr-i18n/distinfo
==============================================================================
--- head/www/firefox-esr-i18n/distinfo	Tue Jan 22 16:26:49 2019	(r490961)
+++ head/www/firefox-esr-i18n/distinfo	Tue Jan 22 16:42:07 2019	(r490962)
@@ -1,197 +1,197 @@
-TIMESTAMP = 1543878683
-SHA256 (xpi/firefox-60.4.0/ach.xpi) = 6c5994f79cd186bd9c12b309f7fe4dcccfea6467cdef752e5808f8b999f4e863
-SIZE (xpi/firefox-60.4.0/ach.xpi) = 496839
-SHA256 (xpi/firefox-60.4.0/af.xpi) = 533f29c135b81f87b4d0e16a1c1024bb88fb765530006346632dfcabae775efd
-SIZE (xpi/firefox-60.4.0/af.xpi) = 487313
-SHA256 (xpi/firefox-60.4.0/an.xpi) = 1386a3c3ec49171f0f36cc402e42947da237f685c337c350190de260b65d0c08
-SIZE (xpi/firefox-60.4.0/an.xpi) = 520500
-SHA256 (xpi/firefox-60.4.0/ar.xpi) = 28c1493982afd32ccb1533140fdc2f72cf5202be6917a6ee549d44a93180ce91
-SIZE (xpi/firefox-60.4.0/ar.xpi) = 547812
-SHA256 (xpi/firefox-60.4.0/as.xpi) = 8686a58ecba3b3fc16335ce3178f7958c0d3a2af36a9365ce73ec946af87bfbd
-SIZE (xpi/firefox-60.4.0/as.xpi) = 530723
-SHA256 (xpi/firefox-60.4.0/ast.xpi) = b4a37f8336ca24670c83d9efb92ffb4ed263c1a5d3a9bf4219f887eb80ea5d90
-SIZE (xpi/firefox-60.4.0/ast.xpi) = 508654
-SHA256 (xpi/firefox-60.4.0/az.xpi) = 6aec8e5f2ec6e6022a64ffa78d362355fad1b1bc244bd98bdf8ed357e0c27c51
-SIZE (xpi/firefox-60.4.0/az.xpi) = 524747
-SHA256 (xpi/firefox-60.4.0/be.xpi) = 830f80a2d2d82067a44a39b10d13b9ca48c19703ae346f561bf39230fc67c33d
-SIZE (xpi/firefox-60.4.0/be.xpi) = 580716
-SHA256 (xpi/firefox-60.4.0/bg.xpi) = aea44af29929a9623c2eec09841c1886d6f5ca28cc5850cbbf4bfc6f9629ae40
-SIZE (xpi/firefox-60.4.0/bg.xpi) = 573847
-SHA256 (xpi/firefox-60.4.0/bn-BD.xpi) = b9a405fb1188b9f9d0e412653ccfb3bf7ac0442a97fecdecf03a62e8cf45f5f6
-SIZE (xpi/firefox-60.4.0/bn-BD.xpi) = 590424
-SHA256 (xpi/firefox-60.4.0/bn-IN.xpi) = cd470e9980bcd4695c144cb6015e3daa35a996743916404574959d9dd441076d
-SIZE (xpi/firefox-60.4.0/bn-IN.xpi) = 570865
-SHA256 (xpi/firefox-60.4.0/br.xpi) = 509881c785d1a9f55cf7fa9e30de444ac9af5886748dca4a2cd45df60d9df257
-SIZE (xpi/firefox-60.4.0/br.xpi) = 512028
-SHA256 (xpi/firefox-60.4.0/bs.xpi) = b9c140cc80ea283c014b14261fdb9a9ef3b80a555bf82006d75ac4e1ca267e0a
-SIZE (xpi/firefox-60.4.0/bs.xpi) = 514708
-SHA256 (xpi/firefox-60.4.0/ca.xpi) = b93070ce533d706d81aa23d8c86d40f7b4ab12530a61eab1db16f044616156dc
-SIZE (xpi/firefox-60.4.0/ca.xpi) = 525255
-SHA256 (xpi/firefox-60.4.0/cak.xpi) = 247ea7d7505d4b628cb61f2e3cc3f117ad6361b4068651e7ef9e1e2d6e2daaa9
-SIZE (xpi/firefox-60.4.0/cak.xpi) = 536300
-SHA256 (xpi/firefox-60.4.0/cs.xpi) = 61a1b2ac458acb878b117c1d6c69a84754d1b6aa0c0cabfb4949dab8c4d72e12
-SIZE (xpi/firefox-60.4.0/cs.xpi) = 531794
-SHA256 (xpi/firefox-60.4.0/cy.xpi) = 973c736b181fe17fa9178a56520ee1fe859bd29fb34ee4d608025e9ad32daa79
-SIZE (xpi/firefox-60.4.0/cy.xpi) = 516632
-SHA256 (xpi/firefox-60.4.0/da.xpi) = 9a4cdbfa1d7a8df5d8d0cf593e702ab9a64a0d7bf8f7e5e5f52c0b926a1a2bb9
-SIZE (xpi/firefox-60.4.0/da.xpi) = 510750
-SHA256 (xpi/firefox-60.4.0/de.xpi) = 4fd7c13c3f7d3b35f4e8e6b78c0ffc346ac997dabdbcdc4ae325b32ba9205f53
-SIZE (xpi/firefox-60.4.0/de.xpi) = 526520
-SHA256 (xpi/firefox-60.4.0/dsb.xpi) = b3146a23988fed470c20a464e24bccaa32436b1c496a7c3cb7b6f88c7c445966
-SIZE (xpi/firefox-60.4.0/dsb.xpi) = 539525
-SHA256 (xpi/firefox-60.4.0/el.xpi) = e4063533df98d216b95513782536c5df4ce61e3c1c04a16d5454767fb091395c
-SIZE (xpi/firefox-60.4.0/el.xpi) = 593689
-SHA256 (xpi/firefox-60.4.0/en-GB.xpi) = 63ed16629f8abacc5246760e87878604390f5501bfaf81770cd9d772cf74963a
-SIZE (xpi/firefox-60.4.0/en-GB.xpi) = 491695
-SHA256 (xpi/firefox-60.4.0/en-US.xpi) = c253f340f02c8c3a1d0dbf7b68fde4055892e69fc45c0e144ff74fd487dadacd
-SIZE (xpi/firefox-60.4.0/en-US.xpi) = 473178
-SHA256 (xpi/firefox-60.4.0/en-ZA.xpi) = 0c1b753e59455191a79d5f11c2dfbec7778dbf39242eb49a668c5eb297fba33a
-SIZE (xpi/firefox-60.4.0/en-ZA.xpi) = 474674
-SHA256 (xpi/firefox-60.4.0/eo.xpi) = 449f6581cb43407675aae277b37b974d7785b6526956fb2434cf4bef60d44e60
-SIZE (xpi/firefox-60.4.0/eo.xpi) = 511268
-SHA256 (xpi/firefox-60.4.0/es-AR.xpi) = 014b6a3dd4fba99c19c61ebc9a886147aedd69fbc4d5f5d26970cd14319f9d8b
-SIZE (xpi/firefox-60.4.0/es-AR.xpi) = 524653
-SHA256 (xpi/firefox-60.4.0/es-CL.xpi) = 60437b90b11c35ae0071d491a17af9b9708fd570db85a0c1643178ac1d9fa65e
-SIZE (xpi/firefox-60.4.0/es-CL.xpi) = 527320
-SHA256 (xpi/firefox-60.4.0/es-ES.xpi) = e99b60f519a100303c7a36af33cf65146043a74f676e9c7996f7e21c211ea01d
-SIZE (xpi/firefox-60.4.0/es-ES.xpi) = 459964
-SHA256 (xpi/firefox-60.4.0/es-MX.xpi) = 3d77b4a0d3beabc64208198479192e00e1eeb184def90e9dcc5ab27676b18138
-SIZE (xpi/firefox-60.4.0/es-MX.xpi) = 528665
-SHA256 (xpi/firefox-60.4.0/et.xpi) = 6ce4afd678cd214b76671b2a8aa63d58cbe85d32692c27c221ee13f6bd8095a9
-SIZE (xpi/firefox-60.4.0/et.xpi) = 504965
-SHA256 (xpi/firefox-60.4.0/eu.xpi) = 4adb45e03a94dd409a84ee466127871c338e4c842e46218f48474e7c676be125
-SIZE (xpi/firefox-60.4.0/eu.xpi) = 511708
-SHA256 (xpi/firefox-60.4.0/fa.xpi) = 8869a4c54df2806563e97f60144c78137ab539295870d22ae616b8e6b4508a31
-SIZE (xpi/firefox-60.4.0/fa.xpi) = 566264
-SHA256 (xpi/firefox-60.4.0/ff.xpi) = 31870f3e69c7c4c87b933ccde828da337012a1cd48c90d585ce878fea235557f
-SIZE (xpi/firefox-60.4.0/ff.xpi) = 512205
-SHA256 (xpi/firefox-60.4.0/fi.xpi) = ce639812fd26d480cbb132400a114a1dbfd83a9c97da6a68f633dbec638a74da
-SIZE (xpi/firefox-60.4.0/fi.xpi) = 506183
-SHA256 (xpi/firefox-60.4.0/fr.xpi) = f7f52f50f36835be12707c4e44e3000b12a9ba7533d110930289499fee1a995f
-SIZE (xpi/firefox-60.4.0/fr.xpi) = 536067
-SHA256 (xpi/firefox-60.4.0/fy-NL.xpi) = b0f419ee2bfb6cb0da3ebcf5f43f7d2b4435161b12ffc1d922946353b64ad543
-SIZE (xpi/firefox-60.4.0/fy-NL.xpi) = 524530
-SHA256 (xpi/firefox-60.4.0/ga-IE.xpi) = 27890cb3850aa0dc2795ba474b6671e90386068d602fc7b3b82e325afa05334f
-SIZE (xpi/firefox-60.4.0/ga-IE.xpi) = 526983
-SHA256 (xpi/firefox-60.4.0/gd.xpi) = c611343e3305c61c0bb3fbe2b9a54efea092e714930bbe3f40c0bdb1630a9d5a
-SIZE (xpi/firefox-60.4.0/gd.xpi) = 520873
-SHA256 (xpi/firefox-60.4.0/gl.xpi) = f9278c95c96c097597a3c226ae3bf516c47be6967f96ee993c47eb382b185a1d
-SIZE (xpi/firefox-60.4.0/gl.xpi) = 497370
-SHA256 (xpi/firefox-60.4.0/gn.xpi) = f9a80dd819a039c4923eb6be6b99bad8ddfa3929b8fd0aa033a020c1d271bebd
-SIZE (xpi/firefox-60.4.0/gn.xpi) = 533216
-SHA256 (xpi/firefox-60.4.0/gu-IN.xpi) = f0428fe69468ebd2eea170d9d7257f86c348b233dafb5ff351e8e026158ffe54
-SIZE (xpi/firefox-60.4.0/gu-IN.xpi) = 590266
-SHA256 (xpi/firefox-60.4.0/he.xpi) = 1c77961f575e7987507f5ebc7c91b8d104a0dccc893db6bdfc1ad4e03d92f760
-SIZE (xpi/firefox-60.4.0/he.xpi) = 535985
-SHA256 (xpi/firefox-60.4.0/hi-IN.xpi) = af38739494d7348e7e5f53b1c14548110f8f5d1869e4de2f2c559fc458a69218
-SIZE (xpi/firefox-60.4.0/hi-IN.xpi) = 590865
-SHA256 (xpi/firefox-60.4.0/hr.xpi) = 21b05b3332c8c417b21133291b9189c929339bd33ac85c0e133c1762e6899296
-SIZE (xpi/firefox-60.4.0/hr.xpi) = 515957
-SHA256 (xpi/firefox-60.4.0/hsb.xpi) = 7bac818f9228cfc14f2ce2630af40a19ca62a8f698f30bd42dc12274e3dc5428
-SIZE (xpi/firefox-60.4.0/hsb.xpi) = 537060
-SHA256 (xpi/firefox-60.4.0/hu.xpi) = ca76e1ad2f5b0566d1e724173482131d0dbf001e0f7ffd15eff2108e645155c9
-SIZE (xpi/firefox-60.4.0/hu.xpi) = 538411
-SHA256 (xpi/firefox-60.4.0/hy-AM.xpi) = 56fd2362e3472b24fa9f193c1bb518a45fc8f66ec761f1cd0a2d6ab50d7931b9
-SIZE (xpi/firefox-60.4.0/hy-AM.xpi) = 569416
-SHA256 (xpi/firefox-60.4.0/ia.xpi) = 472f3f127a0bd1b40336ab002bf169bc75a91b99f620e102dc5641e804f2759f
-SIZE (xpi/firefox-60.4.0/ia.xpi) = 510729
-SHA256 (xpi/firefox-60.4.0/id.xpi) = 6d19a040775eed58b3bdbe6ea4b7d471c2a7501936f5e8e9a860cd50302ef0c6
-SIZE (xpi/firefox-60.4.0/id.xpi) = 502222
-SHA256 (xpi/firefox-60.4.0/is.xpi) = cb3929f9aacfec38027e2d7e9aaeeed3c8480904b39318ceb7d46396292a1150
-SIZE (xpi/firefox-60.4.0/is.xpi) = 513273
-SHA256 (xpi/firefox-60.4.0/it.xpi) = eb437d8fb09550dab8660076185d8c229f5d3e7cde03698896dce7bc983d7671
-SIZE (xpi/firefox-60.4.0/it.xpi) = 399106
-SHA256 (xpi/firefox-60.4.0/ja.xpi) = 4effde2a5c6694281a81a6d47e3a4422655db06329721923e5a13a2e0757ebef
-SIZE (xpi/firefox-60.4.0/ja.xpi) = 572011
-SHA256 (xpi/firefox-60.4.0/ka.xpi) = 96591b99c9516c93bde22783bbec58a5cbcffc272e5688229b51a1adc10f82e8
-SIZE (xpi/firefox-60.4.0/ka.xpi) = 556851
-SHA256 (xpi/firefox-60.4.0/kab.xpi) = 8b0ea6983a234e50fa502ed7d8e42201fb8dc186395296a52bbf282c4a66b9b0
-SIZE (xpi/firefox-60.4.0/kab.xpi) = 520400
-SHA256 (xpi/firefox-60.4.0/kk.xpi) = ded846cfe2cb80f129d2874648c3dbc714bfce43ec0e56b54977f0a4b62ecc3a
-SIZE (xpi/firefox-60.4.0/kk.xpi) = 582977
-SHA256 (xpi/firefox-60.4.0/km.xpi) = 8205b3a0e405750e6bbef1a4bcd0375374d0651761d28718b8257d9e5065e080
-SIZE (xpi/firefox-60.4.0/km.xpi) = 583111
-SHA256 (xpi/firefox-60.4.0/kn.xpi) = d80186be24ddceee96b87f80138a370e8879b4100954bf18d2e38b7785482a61
-SIZE (xpi/firefox-60.4.0/kn.xpi) = 585871
-SHA256 (xpi/firefox-60.4.0/ko.xpi) = ec0444e78fa7651873ed5576f052117b02baa6e24228bed4baf820307919988f
-SIZE (xpi/firefox-60.4.0/ko.xpi) = 547828
-SHA256 (xpi/firefox-60.4.0/lij.xpi) = 089f2bdeeedef607aa6fd3b83a1be73d24a1ecf59d4127689690ef0511b88975
-SIZE (xpi/firefox-60.4.0/lij.xpi) = 513181
-SHA256 (xpi/firefox-60.4.0/lt.xpi) = 52b69dc62f1b0915aabea613a32dc438e9ecdb04cf5bf0a86486ccabb59ae951
-SIZE (xpi/firefox-60.4.0/lt.xpi) = 536463
-SHA256 (xpi/firefox-60.4.0/lv.xpi) = 77d97caaf9ce22a35b43e3723219323002a1cb7d013470cefa99020b6b8fa4e1
-SIZE (xpi/firefox-60.4.0/lv.xpi) = 526417
-SHA256 (xpi/firefox-60.4.0/mai.xpi) = 3a30240c7c2d3d8428a6c2a902ebcc8c427f6348b4f0115b3dc16ebde87b9081
-SIZE (xpi/firefox-60.4.0/mai.xpi) = 549248
-SHA256 (xpi/firefox-60.4.0/mk.xpi) = 400e9920beaf8ba0e7deb085c5a3fcdd01e9331bc17d6f72aa9037051b9a779b
-SIZE (xpi/firefox-60.4.0/mk.xpi) = 513808
-SHA256 (xpi/firefox-60.4.0/ml.xpi) = 5fa399baa1ebe7839a100602cfc224e826f5eb19af071a52cd820cc7970ca230
-SIZE (xpi/firefox-60.4.0/ml.xpi) = 598979
-SHA256 (xpi/firefox-60.4.0/mr.xpi) = dd72dd03d4d17d7cf31a1a226b4a0c3409dd009394404b3cb8f54f9b2f942334
-SIZE (xpi/firefox-60.4.0/mr.xpi) = 579111
-SHA256 (xpi/firefox-60.4.0/ms.xpi) = b30f0459ab5450a32d4afce816358506fe2893407f83b1766e397ad523616cc7
-SIZE (xpi/firefox-60.4.0/ms.xpi) = 509556
-SHA256 (xpi/firefox-60.4.0/my.xpi) = 96695c1a83f8be86281594b985f7e9b8b457851f2e96b93627aaf4d4559ea51e
-SIZE (xpi/firefox-60.4.0/my.xpi) = 570351
-SHA256 (xpi/firefox-60.4.0/nb-NO.xpi) = e0b532164d0c205ad7f0ecb1c385056d594cd6739881eca9d3a41ad01b12d265
-SIZE (xpi/firefox-60.4.0/nb-NO.xpi) = 509887
-SHA256 (xpi/firefox-60.4.0/ne-NP.xpi) = 2070c51153b071a762ee86b79b08b5cc949c169c15f1b970eb8e10765285122b
-SIZE (xpi/firefox-60.4.0/ne-NP.xpi) = 555363
-SHA256 (xpi/firefox-60.4.0/nl.xpi) = ff01bbc0b7f14bdcac59c172772607cbd2e7b39fa6606eb823e5c7b836b8c6be
-SIZE (xpi/firefox-60.4.0/nl.xpi) = 517458
-SHA256 (xpi/firefox-60.4.0/nn-NO.xpi) = d4bf54a03f8340cef80ff2bb2f052d64904da6b861bd69da8d13d65eaeef9ecf
-SIZE (xpi/firefox-60.4.0/nn-NO.xpi) = 511433
-SHA256 (xpi/firefox-60.4.0/oc.xpi) = 396d39257841d62d0ba0bd0afa52363959221d2cdc75fbaeedcf7f18246cb199
-SIZE (xpi/firefox-60.4.0/oc.xpi) = 526984
-SHA256 (xpi/firefox-60.4.0/or.xpi) = de5a59fc86a8f3bec1889b642eea1bfc0ed71306f6536e43028e75f004842040
-SIZE (xpi/firefox-60.4.0/or.xpi) = 540864
-SHA256 (xpi/firefox-60.4.0/pa-IN.xpi) = 6829648639d2501a9836f09f23e087a7d6011868eea65728a818a35182f67643
-SIZE (xpi/firefox-60.4.0/pa-IN.xpi) = 557874
-SHA256 (xpi/firefox-60.4.0/pl.xpi) = aa76272480d526d462c33809b90d018ad8f2bfa23f62703623c85c18329bab60
-SIZE (xpi/firefox-60.4.0/pl.xpi) = 419029
-SHA256 (xpi/firefox-60.4.0/pt-BR.xpi) = 9876de5ac0d45af3a2f97e7a354215b3bdc766674565ee1a2fabd4d97b3388c5
-SIZE (xpi/firefox-60.4.0/pt-BR.xpi) = 514761
-SHA256 (xpi/firefox-60.4.0/pt-PT.xpi) = 50ab49d5a76a234f65b2577af92a2e0805743212e3995f58d66e61540b4790b7
-SIZE (xpi/firefox-60.4.0/pt-PT.xpi) = 519363
-SHA256 (xpi/firefox-60.4.0/rm.xpi) = 3f09406658fa066aceb85053897fba5c4798bc7e035ee803443bbacb2cc40293
-SIZE (xpi/firefox-60.4.0/rm.xpi) = 506044
-SHA256 (xpi/firefox-60.4.0/ro.xpi) = 1417b4da31080b1d9a1e4fba9d8dbd8127150cac276f1754522ec40a7f2dbfbc
-SIZE (xpi/firefox-60.4.0/ro.xpi) = 514056
-SHA256 (xpi/firefox-60.4.0/ru.xpi) = b54cb486377eaaf7a5ff5c01e3ee6eaab55a0c893afd513868dbc29df38a6eb8
-SIZE (xpi/firefox-60.4.0/ru.xpi) = 591396
-SHA256 (xpi/firefox-60.4.0/si.xpi) = 2d30b26181b6cf1f62f21e58c8220cf4f07fdef498c6501f9f62b164af282eee
-SIZE (xpi/firefox-60.4.0/si.xpi) = 545576
-SHA256 (xpi/firefox-60.4.0/sk.xpi) = 0a9109c3d40b9dcfadc39399acf805182e8713fcc8f600e472b084289c30277f
-SIZE (xpi/firefox-60.4.0/sk.xpi) = 541703
-SHA256 (xpi/firefox-60.4.0/sl.xpi) = 9e892bf500c93a414ce4b9ec92f41241cd7b8fae45379aa5e0bdccb2c931370b
-SIZE (xpi/firefox-60.4.0/sl.xpi) = 519373
-SHA256 (xpi/firefox-60.4.0/son.xpi) = ff261bc0ef624014c4d5fd91d45ad7445fdb82517353fbf1a2f5ba749fa3a572
-SIZE (xpi/firefox-60.4.0/son.xpi) = 497700
-SHA256 (xpi/firefox-60.4.0/sq.xpi) = 43fdaebedb1c10d9706340cc4636e732cdd0288eee9a328a322e6b486666fa89
-SIZE (xpi/firefox-60.4.0/sq.xpi) = 521262
-SHA256 (xpi/firefox-60.4.0/sr.xpi) = 9f7226ad8764daf416147b859a54416cb020f324c3f956c78c806e7259ec56f5
-SIZE (xpi/firefox-60.4.0/sr.xpi) = 548773
-SHA256 (xpi/firefox-60.4.0/sv-SE.xpi) = 1800232094c7155114105002dd33c08f2fdcc92e41551ba1d480f4612e7f7077
-SIZE (xpi/firefox-60.4.0/sv-SE.xpi) = 518658
-SHA256 (xpi/firefox-60.4.0/ta.xpi) = 5270288b98966f6b3fa3276b2a02e03ca38dca33bb757190ee2999d5b64d309c
-SIZE (xpi/firefox-60.4.0/ta.xpi) = 577921
-SHA256 (xpi/firefox-60.4.0/te.xpi) = 1df0426f98e4096818c2c37dcf7c77d3f5c0f5f0ffe2a1f69820e4ee5ef9dad5
-SIZE (xpi/firefox-60.4.0/te.xpi) = 590964
-SHA256 (xpi/firefox-60.4.0/th.xpi) = 3ae7e912052724a7b9c63a51889a49596cadd8718db53aaad91a41aaf4bdbd7b
-SIZE (xpi/firefox-60.4.0/th.xpi) = 562819
-SHA256 (xpi/firefox-60.4.0/tr.xpi) = 2deb102c37e8d5dc006ad1eb551f17fd0363d3930009cd42f2057a9432872663
-SIZE (xpi/firefox-60.4.0/tr.xpi) = 525859
-SHA256 (xpi/firefox-60.4.0/uk.xpi) = ccb412aef1f753adf3d8d0f00064ceb577e1a93ef81219fd80e378edbf116900
-SIZE (xpi/firefox-60.4.0/uk.xpi) = 580919
-SHA256 (xpi/firefox-60.4.0/ur.xpi) = d5baa384cf1ad6c4b8e92f5751aab31ad7a10464936d7b9af347c69e7c1c8924
-SIZE (xpi/firefox-60.4.0/ur.xpi) = 563382
-SHA256 (xpi/firefox-60.4.0/uz.xpi) = c0a2ed70997900393a4db969603a7acf20418a2fd998768ced127bb507a061a0
-SIZE (xpi/firefox-60.4.0/uz.xpi) = 513686
-SHA256 (xpi/firefox-60.4.0/vi.xpi) = ff4c4893b0313e3ea7720c7b4dc485229f0228f6a86f943789bb4f0b371ed788
-SIZE (xpi/firefox-60.4.0/vi.xpi) = 528187
-SHA256 (xpi/firefox-60.4.0/xh.xpi) = bd455ced24f9f38bfbba68a7f0781d78d1e0eb2f2590e6fc666bf4bc3e1db8d9
-SIZE (xpi/firefox-60.4.0/xh.xpi) = 511859
-SHA256 (xpi/firefox-60.4.0/zh-CN.xpi) = 47037f75daba786f81a4789ab84b7c77d9d5fe5f14c1de266715ff12193df3ce
-SIZE (xpi/firefox-60.4.0/zh-CN.xpi) = 543585
-SHA256 (xpi/firefox-60.4.0/zh-TW.xpi) = 5bee6ca745bc28ecc64c7d89fc9c4914e8d9fc22b2add02b94a8b856b77a8f19
-SIZE (xpi/firefox-60.4.0/zh-TW.xpi) = 541910
+TIMESTAMP = 1548088758
+SHA256 (xpi/firefox-60.5.0/ach.xpi) = a2ba0f9a1c3ffa7ba472421688ed9aa70e4035be929e3a8c880821a537505546
+SIZE (xpi/firefox-60.5.0/ach.xpi) = 490505
+SHA256 (xpi/firefox-60.5.0/af.xpi) = 8435c23da9c156d8a36c8099c412b7947331f011912e011dbe5e922fff13471a
+SIZE (xpi/firefox-60.5.0/af.xpi) = 480978
+SHA256 (xpi/firefox-60.5.0/an.xpi) = 175f1fcd0c5ee3919b10ca64ae614518696069af09ebcbe37f1b10c75360e504
+SIZE (xpi/firefox-60.5.0/an.xpi) = 514173
+SHA256 (xpi/firefox-60.5.0/ar.xpi) = d8d48369d9c1a5fbeab247cd3a49293c8615dec9c75d63746b8891438bdbe45f
+SIZE (xpi/firefox-60.5.0/ar.xpi) = 541482
+SHA256 (xpi/firefox-60.5.0/as.xpi) = 6232e9a777900747ae9e9a5ca3f7136b3a686753de08cfa30355069330c49931
+SIZE (xpi/firefox-60.5.0/as.xpi) = 524379
+SHA256 (xpi/firefox-60.5.0/ast.xpi) = abd9d11d8ab8b1693914790feeac70499f65fa66c046550c3f7d65dcb05789c0
+SIZE (xpi/firefox-60.5.0/ast.xpi) = 502320
+SHA256 (xpi/firefox-60.5.0/az.xpi) = fee2345995fa0dd9e458ec802e641b7f49d26f250561af770536fdbcca6ccdcd
+SIZE (xpi/firefox-60.5.0/az.xpi) = 518406
+SHA256 (xpi/firefox-60.5.0/be.xpi) = 8f64d4cf0fc6359a4d57381f3f4c48cd08ccea715ae3cc1fd39524684cf432c4
+SIZE (xpi/firefox-60.5.0/be.xpi) = 574375
+SHA256 (xpi/firefox-60.5.0/bg.xpi) = 8d7e8eb3e78c5b065e67feb7bd139dfe51777e94eec175666112d0feabb35a21
+SIZE (xpi/firefox-60.5.0/bg.xpi) = 567514
+SHA256 (xpi/firefox-60.5.0/bn-BD.xpi) = ce9757427944823f6d06ed2d90ffd982bea200049e69ef49478ef5ebd966fb5a
+SIZE (xpi/firefox-60.5.0/bn-BD.xpi) = 584071
+SHA256 (xpi/firefox-60.5.0/bn-IN.xpi) = 486668fbe033a83664b08153cf181bb802f1663fe2d4c0047aada39e5bc82841
+SIZE (xpi/firefox-60.5.0/bn-IN.xpi) = 564527
+SHA256 (xpi/firefox-60.5.0/br.xpi) = 4e0b49b1eaa2d44737997f8e3c695a256973e93fe233233d49ce905f72b487f8
+SIZE (xpi/firefox-60.5.0/br.xpi) = 505688
+SHA256 (xpi/firefox-60.5.0/bs.xpi) = 839f050b56d55882cc61eab1b73b9ff56b1fdb1ed2c0154ca8fe06ea67ed02b8
+SIZE (xpi/firefox-60.5.0/bs.xpi) = 508372
+SHA256 (xpi/firefox-60.5.0/ca.xpi) = 2f5f3ff916177781b506e129a4bf74c97db3aad9e5e9acde9f86ee9cf273730d
+SIZE (xpi/firefox-60.5.0/ca.xpi) = 518926
+SHA256 (xpi/firefox-60.5.0/cak.xpi) = 4e04e4ddd64c9af6909660f572440c5ca03a1fe1ee64329901b561de6b47476e
+SIZE (xpi/firefox-60.5.0/cak.xpi) = 529958
+SHA256 (xpi/firefox-60.5.0/cs.xpi) = 66f283465eef56f1adad5d6170fd2a936ffdd9cd6cabf73a7c0c3339232d13c1
+SIZE (xpi/firefox-60.5.0/cs.xpi) = 525448
+SHA256 (xpi/firefox-60.5.0/cy.xpi) = 92954cee354b7df208bec826ff2baf32a55d8c4dab3fc6347b6ea0953518606f
+SIZE (xpi/firefox-60.5.0/cy.xpi) = 510294
+SHA256 (xpi/firefox-60.5.0/da.xpi) = 07418d50b3733249106b3d9c1149d52475f9931d81003c7ad23b7d9dbb4ba7c1
+SIZE (xpi/firefox-60.5.0/da.xpi) = 504415
+SHA256 (xpi/firefox-60.5.0/de.xpi) = c0cf662c86d651e2a6ef104869d67a5f32cde9e21cb74a4c39bbd0b49c87947d
+SIZE (xpi/firefox-60.5.0/de.xpi) = 520174
+SHA256 (xpi/firefox-60.5.0/dsb.xpi) = 203303eeede9dd0cac6757f24f0516e7f43f86ca39ede5ccf03c9c0558355501
+SIZE (xpi/firefox-60.5.0/dsb.xpi) = 533186
+SHA256 (xpi/firefox-60.5.0/el.xpi) = c9380e03e35d7a6557a955fa81c00ae3efca5254340ef4071c14a2cfc486a062
+SIZE (xpi/firefox-60.5.0/el.xpi) = 587349
+SHA256 (xpi/firefox-60.5.0/en-GB.xpi) = 3be7137172568548c6907e78934fa4eb5e8444da9e2a08455d0369ad1370f6e4
+SIZE (xpi/firefox-60.5.0/en-GB.xpi) = 485336
+SHA256 (xpi/firefox-60.5.0/en-US.xpi) = a2a66e00037385e570119897ef7fa8b56b3d865f635e767b0d00ac2a59665247
+SIZE (xpi/firefox-60.5.0/en-US.xpi) = 477209
+SHA256 (xpi/firefox-60.5.0/en-ZA.xpi) = 9959c1bf402933ef558828c819a713eb1bfc924eab5bc81b1e2239cab11789b6
+SIZE (xpi/firefox-60.5.0/en-ZA.xpi) = 468329
+SHA256 (xpi/firefox-60.5.0/eo.xpi) = 192982dac142e9e714158bcad0cb38c9d9335d2b324a61c815a82fa4922b9189
+SIZE (xpi/firefox-60.5.0/eo.xpi) = 504924
+SHA256 (xpi/firefox-60.5.0/es-AR.xpi) = cc583e3a6911724ba0fb75bbf6c4754ee7939c931d631f14555f20213e3733ec
+SIZE (xpi/firefox-60.5.0/es-AR.xpi) = 518298
+SHA256 (xpi/firefox-60.5.0/es-CL.xpi) = b25cefb2e77010dc9824e24cc72612bbeb1f04538148df876c164298a8db3255
+SIZE (xpi/firefox-60.5.0/es-CL.xpi) = 520985
+SHA256 (xpi/firefox-60.5.0/es-ES.xpi) = 55da6ad91102b98d86776c3877a1052a0855c24e193f36ffd230e8cf49bb39f9
+SIZE (xpi/firefox-60.5.0/es-ES.xpi) = 453620
+SHA256 (xpi/firefox-60.5.0/es-MX.xpi) = 0cd3f48b81cd07b9a65087601948a74f08584ca260130792977e1a199496f42a
+SIZE (xpi/firefox-60.5.0/es-MX.xpi) = 522317
+SHA256 (xpi/firefox-60.5.0/et.xpi) = 77b7823496a5132dff18eede0771e10b1416c8432377c7c5f3d64977fe3a4853
+SIZE (xpi/firefox-60.5.0/et.xpi) = 498628
+SHA256 (xpi/firefox-60.5.0/eu.xpi) = 3380392a7a3e9cc66f2e9ea086db37c9c1bf8daad3ecd890f0f318278273a4bf
+SIZE (xpi/firefox-60.5.0/eu.xpi) = 505368
+SHA256 (xpi/firefox-60.5.0/fa.xpi) = 63a4212c00f09fe7e82872171fd2a5edbaf96a37dfa4e434e0e10fe3c2f40361
+SIZE (xpi/firefox-60.5.0/fa.xpi) = 559921
+SHA256 (xpi/firefox-60.5.0/ff.xpi) = d4add5039244f7e66309a67dd97267aadd80d4915ebf3fdfee02226a1fef5b55
+SIZE (xpi/firefox-60.5.0/ff.xpi) = 505868
+SHA256 (xpi/firefox-60.5.0/fi.xpi) = d633db9d09c920ab24e5d5f137ebd3a464824a5f0e745be99f78186a0c2dc814
+SIZE (xpi/firefox-60.5.0/fi.xpi) = 499842
+SHA256 (xpi/firefox-60.5.0/fr.xpi) = 033380edaff4e90c6d02f6a6f7ab88977566fe8cb017f0ad37ec9cb1183988f3
+SIZE (xpi/firefox-60.5.0/fr.xpi) = 529728
+SHA256 (xpi/firefox-60.5.0/fy-NL.xpi) = 36a172dcb0f898c8f05be6ba2713089b665f8b97086cd8acf4a68b9c63df0ce7
+SIZE (xpi/firefox-60.5.0/fy-NL.xpi) = 518166
+SHA256 (xpi/firefox-60.5.0/ga-IE.xpi) = 3b20c17362bfa5ad2599c257ff7575211643dd2135ea2175b1883d303a1222c1
+SIZE (xpi/firefox-60.5.0/ga-IE.xpi) = 520632
+SHA256 (xpi/firefox-60.5.0/gd.xpi) = 8c7a1f978ca1615b561a7ff72f17a460e25a69ba8ba05fbecfa1af0b7ffaba2d
+SIZE (xpi/firefox-60.5.0/gd.xpi) = 514519
+SHA256 (xpi/firefox-60.5.0/gl.xpi) = 503eac56c0de43eb78842069e1ef6e28f47529ce5071ab99d09332ca52eef4f1
+SIZE (xpi/firefox-60.5.0/gl.xpi) = 491042
+SHA256 (xpi/firefox-60.5.0/gn.xpi) = 81c3077d1dcce3f8550b7310b7a11f5b89d3f37fe449a4a9ae565110c88c6e80
+SIZE (xpi/firefox-60.5.0/gn.xpi) = 526872
+SHA256 (xpi/firefox-60.5.0/gu-IN.xpi) = a6da5d5e4f556648ca736f911bdc3bd0d7b6b0435ff8d9925e876689fbed4c20
+SIZE (xpi/firefox-60.5.0/gu-IN.xpi) = 583923
+SHA256 (xpi/firefox-60.5.0/he.xpi) = 76ec9845e46b20d5b58b2d1e1e00b6f8bd1509d16feafc9ac15494b5da935af8
+SIZE (xpi/firefox-60.5.0/he.xpi) = 529648
+SHA256 (xpi/firefox-60.5.0/hi-IN.xpi) = beb1a8dbccf475853fd195cc253b52bf07f101c8c34fa0259b89619aa14dc479
+SIZE (xpi/firefox-60.5.0/hi-IN.xpi) = 584509
+SHA256 (xpi/firefox-60.5.0/hr.xpi) = 25f3e6b9f49f8c56346138954e99df9fb86d0fa6f5223ac8b63a9e53397a00f7
+SIZE (xpi/firefox-60.5.0/hr.xpi) = 509620
+SHA256 (xpi/firefox-60.5.0/hsb.xpi) = abc604edbab67cd6b8d0678fb25e03384fc4973f06c08cb9c93916127a661cc2
+SIZE (xpi/firefox-60.5.0/hsb.xpi) = 530715
+SHA256 (xpi/firefox-60.5.0/hu.xpi) = effb8ba9231e2ea1af70033c80bd27e37a912c699cb3ac234cd0879331a05e37
+SIZE (xpi/firefox-60.5.0/hu.xpi) = 532074
+SHA256 (xpi/firefox-60.5.0/hy-AM.xpi) = 2f5563c0c684ac054e69e984078475b2d71397834cab9c6d74cd68f7cd319cad
+SIZE (xpi/firefox-60.5.0/hy-AM.xpi) = 563066
+SHA256 (xpi/firefox-60.5.0/ia.xpi) = c5fdced947caaeb0172d51cc974d702f9fa99f5c0552da7e64638478597e2c07
+SIZE (xpi/firefox-60.5.0/ia.xpi) = 504389
+SHA256 (xpi/firefox-60.5.0/id.xpi) = 2bd546dcb03b8f9a524279a1acaff133f2df91656f081147f9c8e29c87dc6679
+SIZE (xpi/firefox-60.5.0/id.xpi) = 495886
+SHA256 (xpi/firefox-60.5.0/is.xpi) = 28937b2afb2b86a584a9b753db34385edfce1fe9fb326845700a31aff2cc61fa
+SIZE (xpi/firefox-60.5.0/is.xpi) = 506928
+SHA256 (xpi/firefox-60.5.0/it.xpi) = 249f814508909827612872c33c8489d14a72c8159fdde2cabb2e302c1ed47665
+SIZE (xpi/firefox-60.5.0/it.xpi) = 392758
+SHA256 (xpi/firefox-60.5.0/ja.xpi) = 82962d88547b4fbfbcd1871bc31e0a675f29bdeece6e0c75a01884c807c28829
+SIZE (xpi/firefox-60.5.0/ja.xpi) = 565680
+SHA256 (xpi/firefox-60.5.0/ka.xpi) = 5cbe70fa9968b1738f2d9c7b5148e80556e451e932e6c63cea076e9227a55d3d
+SIZE (xpi/firefox-60.5.0/ka.xpi) = 550500
+SHA256 (xpi/firefox-60.5.0/kab.xpi) = 5ad25c5aabd8e1f5b5057accffb4a86cc469f89ac6228c5dbb04b10237b112d5
+SIZE (xpi/firefox-60.5.0/kab.xpi) = 514060
+SHA256 (xpi/firefox-60.5.0/kk.xpi) = 38af66276252c607bb500714d4dcdd55137d3d031ac425dbb05cd9b6b728bd5a
+SIZE (xpi/firefox-60.5.0/kk.xpi) = 576624
+SHA256 (xpi/firefox-60.5.0/km.xpi) = e14db2fc6f7143d82f93b02a614418435c0a1153133d5bd6ad37ec28f63b6d07
+SIZE (xpi/firefox-60.5.0/km.xpi) = 576768
+SHA256 (xpi/firefox-60.5.0/kn.xpi) = 4c2ce5a2da677e77dfca3bafb2abc7e3bbe03e5b93cfd7515b6107215bc7db6a
+SIZE (xpi/firefox-60.5.0/kn.xpi) = 579531
+SHA256 (xpi/firefox-60.5.0/ko.xpi) = cd649f4781774f6b886624dd0ab9fb62a9b1fcd2a82a8cd38cafe2ddf59489f8
+SIZE (xpi/firefox-60.5.0/ko.xpi) = 541479
+SHA256 (xpi/firefox-60.5.0/lij.xpi) = 187473d54e790d0de5d080b4ceb29f04dd91dddd7b5c9b4292e24674f953439b
+SIZE (xpi/firefox-60.5.0/lij.xpi) = 506833
+SHA256 (xpi/firefox-60.5.0/lt.xpi) = f4d03d5c0f27840b54732038a14abc8f79297556aeb237740944f9966176257f
+SIZE (xpi/firefox-60.5.0/lt.xpi) = 530127
+SHA256 (xpi/firefox-60.5.0/lv.xpi) = 379c1917204acd4f08f37d05432ddeb8c93cd7df6d73f0334efa4679960ee07e
+SIZE (xpi/firefox-60.5.0/lv.xpi) = 520073
+SHA256 (xpi/firefox-60.5.0/mai.xpi) = a2109247043fe4a3c6a6d26ee7f6243fb40fc84b0709d8cd03f85d7c275eabba
+SIZE (xpi/firefox-60.5.0/mai.xpi) = 542908
+SHA256 (xpi/firefox-60.5.0/mk.xpi) = 21ff72e6d53da3e60d0c7bf2f82433b079e42e7e708fb313908b6a3cf1497bce
+SIZE (xpi/firefox-60.5.0/mk.xpi) = 507466
+SHA256 (xpi/firefox-60.5.0/ml.xpi) = 52969e3451f70dd44fcf9490fa013c09fb9e7557065f1b93b34e26d4b07b92d3
+SIZE (xpi/firefox-60.5.0/ml.xpi) = 592638
+SHA256 (xpi/firefox-60.5.0/mr.xpi) = 3817f48392d2e9466f3dbc3bee6035b295525c61b987bf918fa87ae96acb4249
+SIZE (xpi/firefox-60.5.0/mr.xpi) = 572774
+SHA256 (xpi/firefox-60.5.0/ms.xpi) = 86df6261272c9e20eda9d35a1b34e0d5b4f57824dd9f1508a67e3f856505be04
+SIZE (xpi/firefox-60.5.0/ms.xpi) = 503212
+SHA256 (xpi/firefox-60.5.0/my.xpi) = e1e17b578f76d298c4f00e968480de9a6bb411b20ec9f172c08227a1f3f38ab5
+SIZE (xpi/firefox-60.5.0/my.xpi) = 564011
+SHA256 (xpi/firefox-60.5.0/nb-NO.xpi) = f33d035a2301eff579722729e0706c3e554318901a3152086519e47052886e2b
+SIZE (xpi/firefox-60.5.0/nb-NO.xpi) = 503523
+SHA256 (xpi/firefox-60.5.0/ne-NP.xpi) = 56c1b55465a04c2c2c02d2bb991be7108a00b4817ab4474bb9827cf5485c4b60
+SIZE (xpi/firefox-60.5.0/ne-NP.xpi) = 549007
+SHA256 (xpi/firefox-60.5.0/nl.xpi) = dcc02a13cd6a2e6966c33a6e22b4c5efe747fc8c1c917b583329852143da2615
+SIZE (xpi/firefox-60.5.0/nl.xpi) = 511120
+SHA256 (xpi/firefox-60.5.0/nn-NO.xpi) = 4baf1cb8b296be82af8f184a98a1c8482eda7b7d400002a5b1262c278a5ac1ee
+SIZE (xpi/firefox-60.5.0/nn-NO.xpi) = 505077
+SHA256 (xpi/firefox-60.5.0/oc.xpi) = 9ee6f7921d702ba369a3f3916d2ba8c78d6d642cc7729462e296207770b350dc
+SIZE (xpi/firefox-60.5.0/oc.xpi) = 520642
+SHA256 (xpi/firefox-60.5.0/or.xpi) = 7e21597934f2d0ea9e79d86a1b8112ccec5e3fa097fa81f391d2de13e849c453
+SIZE (xpi/firefox-60.5.0/or.xpi) = 534527
+SHA256 (xpi/firefox-60.5.0/pa-IN.xpi) = 7b80dc8d0878510779f54676b8e674e78452f9c23a77d1f4c48477fda694cb99
+SIZE (xpi/firefox-60.5.0/pa-IN.xpi) = 551529
+SHA256 (xpi/firefox-60.5.0/pl.xpi) = 135a0ae339e15698d8d2889207a11003d50fea45751cd625b6e64f97fb0fb1b4
+SIZE (xpi/firefox-60.5.0/pl.xpi) = 412687
+SHA256 (xpi/firefox-60.5.0/pt-BR.xpi) = 204344298e14d26ea2ed05f31e154d0d94ebcac9bd3ac5065bbe894191504b4a
+SIZE (xpi/firefox-60.5.0/pt-BR.xpi) = 508406
+SHA256 (xpi/firefox-60.5.0/pt-PT.xpi) = 056ea7ffae257ca29c43a230d548e0d544be07503f115f4654f2b42e60f7a871
+SIZE (xpi/firefox-60.5.0/pt-PT.xpi) = 513017
+SHA256 (xpi/firefox-60.5.0/rm.xpi) = b501acb42fadeb5c09759d5ecd8927a817c1184251579c30d22e8f3e8559417d
+SIZE (xpi/firefox-60.5.0/rm.xpi) = 499697
+SHA256 (xpi/firefox-60.5.0/ro.xpi) = 59fe61b708feba6db37ec2b00219527a1b189fb37ccfd9818292a2dd47dfaf3d
+SIZE (xpi/firefox-60.5.0/ro.xpi) = 507716
+SHA256 (xpi/firefox-60.5.0/ru.xpi) = f3a62290312a09765bba7aba84631cf37b3b79670cd137bfd7384942bfa00852
+SIZE (xpi/firefox-60.5.0/ru.xpi) = 585064
+SHA256 (xpi/firefox-60.5.0/si.xpi) = dceeccd3361a82ad05f4665382741967802aed6071bd800a1e68af484a3814ad
+SIZE (xpi/firefox-60.5.0/si.xpi) = 539234
+SHA256 (xpi/firefox-60.5.0/sk.xpi) = 7b9103802d717cff1a218e07b378efa1f52fa5df8d23b7f9dd709cc20fab3144
+SIZE (xpi/firefox-60.5.0/sk.xpi) = 535366
+SHA256 (xpi/firefox-60.5.0/sl.xpi) = e1107df49e3527180af7ef4a410076745b0d62023240aaf7d8d8685563fdff16
+SIZE (xpi/firefox-60.5.0/sl.xpi) = 513035
+SHA256 (xpi/firefox-60.5.0/son.xpi) = afe8cc14c16a87ca988bd9295e527d1f4683e232c386a095dc306b4030df69ae
+SIZE (xpi/firefox-60.5.0/son.xpi) = 491349
+SHA256 (xpi/firefox-60.5.0/sq.xpi) = bff844962aab57127fa61a60a0ee4a1a9898aacbbfc801dbfd65fa8953b7f5c3
+SIZE (xpi/firefox-60.5.0/sq.xpi) = 514929
+SHA256 (xpi/firefox-60.5.0/sr.xpi) = 3ac5aff5998d266478db70232a80d86f52ddd6dee80717bfe222f75588bfc84c
+SIZE (xpi/firefox-60.5.0/sr.xpi) = 542433
+SHA256 (xpi/firefox-60.5.0/sv-SE.xpi) = 48662b7136f21f128349ce85fa10b0f04c4e076f25e09456b9090a03c838a33f
+SIZE (xpi/firefox-60.5.0/sv-SE.xpi) = 512309
+SHA256 (xpi/firefox-60.5.0/ta.xpi) = 613fadb0207f939ee22243f55dd59718761ff23232df3e40205e6861f9228737
+SIZE (xpi/firefox-60.5.0/ta.xpi) = 571574
+SHA256 (xpi/firefox-60.5.0/te.xpi) = 4abea6eec75a6303db54ef91854063ec94b4f969da216e79daf1ea980daff185
+SIZE (xpi/firefox-60.5.0/te.xpi) = 584618
+SHA256 (xpi/firefox-60.5.0/th.xpi) = 153639e2f8e85fdc2bcfb2e031caf3868a286e4248ac31a9097a56b901f40788
+SIZE (xpi/firefox-60.5.0/th.xpi) = 556478
+SHA256 (xpi/firefox-60.5.0/tr.xpi) = 27e940d6612bca7b125a1590b9278a069f20bb07c9389ccf52c0cdc6a379d437
+SIZE (xpi/firefox-60.5.0/tr.xpi) = 519516
+SHA256 (xpi/firefox-60.5.0/uk.xpi) = 92df5501fe2a52680a2fd8e77939181f4691b86fd3da7ed1b23d86ec728a7c03
+SIZE (xpi/firefox-60.5.0/uk.xpi) = 574587
+SHA256 (xpi/firefox-60.5.0/ur.xpi) = 9907ba31668a51225e06160cbc23b2a5be0c68e2b296d5626b4f47008484a617
+SIZE (xpi/firefox-60.5.0/ur.xpi) = 557030
+SHA256 (xpi/firefox-60.5.0/uz.xpi) = 3d83fee5c580868ad95719aeacd2262713bd0854c0c480e763954207e7f93655
+SIZE (xpi/firefox-60.5.0/uz.xpi) = 507342
+SHA256 (xpi/firefox-60.5.0/vi.xpi) = fb33f5a01f756ef3cbffbe6a332042d12c26d1850735c3d11464501c292ae4f2
+SIZE (xpi/firefox-60.5.0/vi.xpi) = 521851
+SHA256 (xpi/firefox-60.5.0/xh.xpi) = 96940b760a54aa0fb518921adfc94670a8baec02360f5e1755d4eea5a16acb32
+SIZE (xpi/firefox-60.5.0/xh.xpi) = 505508
+SHA256 (xpi/firefox-60.5.0/zh-CN.xpi) = 96cafbe78c4214409833e16b5f570623eefbdfb9d5c3540b3aa4045b8ec4ca87
+SIZE (xpi/firefox-60.5.0/zh-CN.xpi) = 537232
+SHA256 (xpi/firefox-60.5.0/zh-TW.xpi) = d7b07264328b5f10a463bd965f7a8239f1803812d06281911815a1e5af23d3e9
+SIZE (xpi/firefox-60.5.0/zh-TW.xpi) = 535555

Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile	Tue Jan 22 16:26:49 2019	(r490961)
+++ head/www/firefox-esr/Makefile	Tue Jan 22 16:42:07 2019	(r490962)
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	60.4.0
-PORTREVISION=	3
+DISTVERSION=	60.5.0
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
 PKGNAMESUFFIX=	-esr
 DISTFILES=	${DISTNAME}esr.source${EXTRACT_SUFX}
 
@@ -15,7 +14,7 @@ MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.19:devel/nspr \
-		nss>=3.36.1:security/nss \
+		nss>=3.36.7:security/nss \
 		icu>=59.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=1.7.6:print/harfbuzz \

Modified: head/www/firefox-esr/distinfo
==============================================================================
--- head/www/firefox-esr/distinfo	Tue Jan 22 16:26:49 2019	(r490961)
+++ head/www/firefox-esr/distinfo	Tue Jan 22 16:42:07 2019	(r490962)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1543878683
-SHA256 (firefox-60.4.0esr.source.tar.xz) = 205258548c3f245d42377b338f0db1272df39489d61305c39b83e52750ebff85
-SIZE (firefox-60.4.0esr.source.tar.xz) = 268425148
+TIMESTAMP = 1548088758
+SHA256 (firefox-60.5.0esr.source.tar.xz) = a2473adf478efa196896d1b8eb76e38a891b716042b2cff869989765969593ff
+SIZE (firefox-60.5.0esr.source.tar.xz) = 268295560

Modified: head/www/firefox-esr/files/patch-bug1375074
==============================================================================
--- head/www/firefox-esr/files/patch-bug1375074	Tue Jan 22 16:26:49 2019	(r490961)
+++ head/www/firefox-esr/files/patch-bug1375074	Tue Jan 22 16:42:07 2019	(r490962)
@@ -40,43 +40,44 @@ diff --git js/src/vm/UnboxedObject.cpp js/src/vm/Unbox
 index c8c178965c488..5badf328ede4f 100644
 --- js/src/vm/UnboxedObject.cpp
 +++ js/src/vm/UnboxedObject.cpp
-@@ -95,7 +95,15 @@ UnboxedLayout::makeConstructorCode(JSContext* cx, HandleObjectGroup group)
+@@ -86,8 +86,15 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 
  #endif
  
  #ifdef JS_CODEGEN_ARM64
--    // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing.
-+    // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
-+    // addressing.  The register we use for PSP may however also be used by
-+    // calling code, and it is nonvolatile, so save it.  Do this as a special
-+    // case first because the generic save/restore code needs the PSP to be
-+    // initialized already.
-+    MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
-+    masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
+-  // ARM64 communicates stack address via sp, but uses a pseudo-sp for
+-  // addressing.
++  // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for
++  // addressing.  The register we use for PSP may however also be used by
++  // calling code, and it is nonvolatile, so save it.  Do this as a special
++  // case first because the generic save/restore code needs the PSP to be
++  // initialized already.
++  MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64()));
++  masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex));
 +
-+    // Initialize the PSP from the SP.
-     masm.initStackPtr();
++  // Initialize the PSP from the SP.
+   masm.initStackPtr();
  #endif
  
-@@ -233,7 +241,22 @@ UnboxedLayout::makeConstructorCode(JSContext* cx, HandleObjectGroup group)
-         masm.pop(ScratchDoubleReg);
-     masm.PopRegsInMask(savedNonVolatileRegisters);
+@@ -239,7 +246,22 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 
+   if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg);
+   masm.PopRegsInMask(savedNonVolatileRegisters);
  
 +#ifdef JS_CODEGEN_ARM64
-+    // Now restore the value that was in the PSP register on entry, and return.
++  // Now restore the value that was in the PSP register on entry, and return.
 +
-+    // Obtain the correct SP from the PSP.
-+    masm.Mov(sp, PseudoStackPointer64);
++  // Obtain the correct SP from the PSP.
++  masm.Mov(sp, PseudoStackPointer64);
 +
-+    // Restore the saved value of the PSP register, this value is whatever the
-+    // caller had saved in it, not any actual SP value, and it must not be
-+    // overwritten subsequently.
-+    masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
++  // Restore the saved value of the PSP register, this value is whatever the
++  // caller had saved in it, not any actual SP value, and it must not be
++  // overwritten subsequently.
++  masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex));
 +
-+    // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
-+    masm.Ret(vixl::lr);
++  // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong.
++  masm.Ret(vixl::lr);
 +#else
-     masm.abiret();
+   masm.abiret();
 +#endif
  
-     masm.bind(&failureStoreOther);
+   masm.bind(&failureStoreOther);
  

Modified: head/www/firefox-esr/files/patch-bug1411481
==============================================================================
--- head/www/firefox-esr/files/patch-bug1411481	Tue Jan 22 16:26:49 2019	(r490961)
+++ head/www/firefox-esr/files/patch-bug1411481	Tue Jan 22 16:42:07 2019	(r490962)
@@ -15,71 +15,69 @@ diff --git dom/canvas/CanvasRenderingContext2D.cpp dom
 index ef3f868bdbf7..8666564b4d0c 100644
 --- dom/canvas/CanvasRenderingContext2D.cpp
 +++ dom/canvas/CanvasRenderingContext2D.cpp
-@@ -1438,7 +1438,8 @@ CanvasRenderingContext2D::AllowOpenGLCanvas() const
+@@ -1358,7 +1358,8 @@ bool CanvasRenderingContext2D::AllowOpenGLCanvas() con
    // HTMLCanvasElement::GetCompositorBackendType would return LAYERS_NONE
    // as well, so it wouldn't help much.
  
 -  return (mCompositorBackend == LayersBackend::LAYERS_OPENGL) &&
 +  return (mCompositorBackend == LayersBackend::LAYERS_OPENGL ||
 +          mCompositorBackend == LayersBackend::LAYERS_WR) &&
-     gfxPlatform::GetPlatform()->AllowOpenGLCanvas();
+          gfxPlatform::GetPlatform()->AllowOpenGLCanvas();
  }
  
 diff --git gfx/thebes/gfxPlatform.cpp gfx/thebes/gfxPlatform.cpp
 index b9beea68d8c5..82635f9ab3ce 100644
 --- gfx/thebes/gfxPlatform.cpp
 +++ gfx/thebes/gfxPlatform.cpp
-@@ -1386,7 +1386,8 @@ bool gfxPlatform::AllowOpenGLCanvas()
-   // so we let content process always assume correct compositor backend.
+@@ -1341,7 +1341,8 @@ bool gfxPlatform::AllowOpenGLCanvas() {
    // The callers have to do the right thing.
-   bool correctBackend = !XRE_IsParentProcess() ||
--    ((mCompositorBackend == LayersBackend::LAYERS_OPENGL) &&
-+    ((mCompositorBackend == LayersBackend::LAYERS_OPENGL ||
-+      mCompositorBackend == LayersBackend::LAYERS_WR) &&
-      (GetContentBackendFor(mCompositorBackend) == BackendType::SKIA));
+   bool correctBackend =
+       !XRE_IsParentProcess() ||
+-      ((mCompositorBackend == LayersBackend::LAYERS_OPENGL) &&
++      ((mCompositorBackend == LayersBackend::LAYERS_OPENGL ||
++        mCompositorBackend == LayersBackend::LAYERS_WR) &&
+        (GetContentBackendFor(mCompositorBackend) == BackendType::SKIA));
  
    if (gfxPrefs::CanvasAzureAccelerated() && correctBackend) {
 diff --git gfx/thebes/gfxPlatform.h gfx/thebes/gfxPlatform.h
 index c988eb1168a8..3bbf2b763f26 100644
 --- gfx/thebes/gfxPlatform.h
 +++ gfx/thebes/gfxPlatform.h
-@@ -286,7 +286,7 @@ public:
-     /// asking for it, we will examine the commands in the first few seconds
-     /// of the canvas usage, and potentially change to accelerated or
-     /// non-accelerated canvas.
--    bool AllowOpenGLCanvas();
-+    virtual bool AllowOpenGLCanvas();
-     virtual void InitializeSkiaCacheLimits();
+@@ -265,7 +265,7 @@ class gfxPlatform {
+   /// asking for it, we will examine the commands in the first few seconds
+   /// of the canvas usage, and potentially change to accelerated or
+   /// non-accelerated canvas.
+-  bool AllowOpenGLCanvas();
++  virtual bool AllowOpenGLCanvas();
+   virtual void InitializeSkiaCacheLimits();
  
-     static bool AsyncPanZoomEnabled();
+   static bool AsyncPanZoomEnabled();
 diff --git gfx/thebes/gfxWindowsPlatform.cpp gfx/thebes/gfxWindowsPlatform.cpp
 index 9ba6f40c6cc0..4d65791d075f 100644
 --- gfx/thebes/gfxWindowsPlatform.cpp
 +++ gfx/thebes/gfxWindowsPlatform.cpp
-@@ -509,6 +509,13 @@ gfxWindowsPlatform::UpdateRenderMode()
+@@ -466,6 +466,11 @@ void gfxWindowsPlatform::UpdateRenderMode() {
    }
  }
  
-+bool
-+gfxWindowsPlatform::AllowOpenGLCanvas()
-+{
++bool gfxWindowsPlatform::AllowOpenGLCanvas() {
 +  // OpenGL canvas is not supported on windows
 +  return false;
 +}
 +
- mozilla::gfx::BackendType
- gfxWindowsPlatform::GetContentBackendFor(mozilla::layers::LayersBackend aLayers)
- {
+ mozilla::gfx::BackendType gfxWindowsPlatform::GetContentBackendFor(
+     mozilla::layers::LayersBackend aLayers) {
+   mozilla::gfx::BackendType defaultBackend =
 diff --git gfx/thebes/gfxWindowsPlatform.h gfx/thebes/gfxWindowsPlatform.h
 index 47048de8f5f5..47ec0e9e5547 100644
 --- gfx/thebes/gfxWindowsPlatform.h
 +++ gfx/thebes/gfxWindowsPlatform.h
-@@ -174,6 +174,8 @@ public:
-     void SchedulePaintIfDeviceReset() override;
-     void CheckForContentOnlyDeviceReset();
+@@ -171,6 +171,8 @@ class gfxWindowsPlatform : public gfxPlatform {
+   void SchedulePaintIfDeviceReset() override;
+   void CheckForContentOnlyDeviceReset();
  
-+    bool AllowOpenGLCanvas() override;
++  bool AllowOpenGLCanvas() override;
 +
-     mozilla::gfx::BackendType GetContentBackendFor(mozilla::layers::LayersBackend aLayers) override;
+   mozilla::gfx::BackendType GetContentBackendFor(
+       mozilla::layers::LayersBackend aLayers) override;
  
-     mozilla::gfx::BackendType GetPreferredCanvasBackend() override;

Modified: head/www/firefox-esr/files/patch-bug1438678
==============================================================================
--- head/www/firefox-esr/files/patch-bug1438678	Tue Jan 22 16:26:49 2019	(r490961)
+++ head/www/firefox-esr/files/patch-bug1438678	Tue Jan 22 16:42:07 2019	(r490962)
@@ -82,7 +82,7 @@ index e27f3eedc1b1..60be7005354b 100644
  
  #include "ContentParent.h"
  #include "TabParent.h"
-@@ -1998,61 +1999,56 @@ ContentParent::LaunchSubprocess(ProcessPriority aInitialPriority /* = PROCESS_PR
+@@ -1857,64 +1858,56 @@ bool ContentParent::LaunchSubprocess(
    extraArgs.push_back(idStr);
    extraArgs.push_back(IsForBrowser() ? "-isForBrowser" : "-notForBrowser");
  
@@ -100,31 +100,34 @@ index e27f3eedc1b1..60be7005354b 100644
  
 -  for (unsigned int i = 0; i < prefsLen; i++) {
 -    const char* prefName = ContentPrefs::GetEarlyPref(i);
--    MOZ_ASSERT(i == 0 || strcmp(prefName, ContentPrefs::GetEarlyPref(i - 1)) > 0,
--               "Content process preferences should be sorted alphabetically.");
+-    MOZ_ASSERT(
+-        i == 0 || strcmp(prefName, ContentPrefs::GetEarlyPref(i - 1)) > 0,
+-        "Content process preferences should be sorted alphabetically.");
 -
 -    if (!Preferences::MustSendToContentProcesses(prefName)) {
 -      continue;
 -    }
 -
 -    switch (Preferences::GetType(prefName)) {
--    case nsIPrefBranch::PREF_INT:
--      intPrefs.Append(nsPrintfCString("%u:%d|", i, Preferences::GetInt(prefName)));
--      break;
--    case nsIPrefBranch::PREF_BOOL:
--      boolPrefs.Append(nsPrintfCString("%u:%d|", i, Preferences::GetBool(prefName)));
--      break;
--    case nsIPrefBranch::PREF_STRING: {
--      nsAutoCString value;
--      Preferences::GetCString(prefName, value);
--      stringPrefs.Append(nsPrintfCString("%u:%d;%s|", i, value.Length(), value.get()));
--      }
--      break;
--    case nsIPrefBranch::PREF_INVALID:
--      break;
--    default:
--      printf("preference type: %x\n", Preferences::GetType(prefName));
--      MOZ_CRASH();
+-      case nsIPrefBranch::PREF_INT:
+-        intPrefs.Append(
+-            nsPrintfCString("%u:%d|", i, Preferences::GetInt(prefName)));
+-        break;
+-      case nsIPrefBranch::PREF_BOOL:
+-        boolPrefs.Append(
+-            nsPrintfCString("%u:%d|", i, Preferences::GetBool(prefName)));
+-        break;
+-      case nsIPrefBranch::PREF_STRING: {
+-        nsAutoCString value;
+-        Preferences::GetCString(prefName, value);
+-        stringPrefs.Append(
+-            nsPrintfCString("%u:%d;%s|", i, value.Length(), value.get()));
+-      } break;
+-      case nsIPrefBranch::PREF_INVALID:
+-        break;
+-      default:
+-        printf("preference type: %x\n", Preferences::GetType(prefName));
+-        MOZ_CRASH();
 -    }
 +  // Set up the shared memory.
 +  base::SharedMemory shm;
@@ -133,12 +136,12 @@ index e27f3eedc1b1..60be7005354b 100644
 +    NS_ERROR("failed to create shared memory in the parent");
 +    MarkAsDead();
 +    return false;
-+  }
+   }
 +  if (!shm.Map(prefs.Length())) {
 +    NS_ERROR("failed to map shared memory in the parent");
 +    MarkAsDead();
 +    return false;
-   }
++  }
  
 -  nsCString schedulerPrefs = Scheduler::GetPrefs();
 +  // Copy the serialized prefs into the shared memory.
@@ -164,7 +167,7 @@ index e27f3eedc1b1..60be7005354b 100644
 +  mSubprocess->AddHandleToShare(prefsHandle);
 +  extraArgs.push_back("-prefsHandle");
 +  extraArgs.push_back(
-+    nsPrintfCString("%zu", reinterpret_cast<uintptr_t>(prefsHandle)).get());
++      nsPrintfCString("%zu", reinterpret_cast<uintptr_t>(prefsHandle)).get());
 +#else
 +  // In contrast, Unix fds are per-process. So remap the fd to a fixed one that
 +  // will be used in the child.
@@ -175,18 +178,18 @@ index e27f3eedc1b1..60be7005354b 100644
 +  // remapping so it doesn't get closed in the child.
 +  mSubprocess->AddFdToRemap(shm.handle().fd, kPrefsFileDescriptor);
 +#endif
-+
+ 
 +  // Pass the length via a command flag.
 +  extraArgs.push_back("-prefsLen");
 +  extraArgs.push_back(nsPrintfCString("%zu", uintptr_t(prefs.Length())).get());
- 
++
    // Scheduler prefs need to be handled differently because the scheduler needs
    // to start up in the content process before the normal preferences service.
 +  nsCString schedulerPrefs = Scheduler::GetPrefs();
    extraArgs.push_back("-schedulerPrefs");
    extraArgs.push_back(schedulerPrefs.get());
  
-@@ -2061,6 +2057,7 @@ ContentParent::LaunchSubprocess(ProcessPriority aInitialPriority /* = PROCESS_PR
+@@ -1923,6 +1916,7 @@ bool ContentParent::LaunchSubprocess(
    }
  
    if (!mSubprocess->LaunchAndWaitForProcessHandle(extraArgs)) {
@@ -215,24 +218,18 @@ index e3c1f16910c6..2441c8cb9224 100644
  #include "mozilla/SandboxSettings.h"
  #include "nsAppDirectoryServiceDefs.h"
  #include "nsDirectoryService.h"
-@@ -81,6 +82,16 @@ SetUpSandboxEnvironment()
+@@ -76,14 +77,21 @@ static void SetUpSandboxEnvironment() {
  }
  #endif
  
 +#ifdef ANDROID
 +static int gPrefsFd = -1;
 +
-+void
-+SetPrefsFd(int aFd)
-+{
-+  gPrefsFd = aFd;
-+}
++void SetPrefsFd(int aFd) { gPrefsFd = aFd; }
 +#endif
 +
- bool
- ContentProcess::Init(int aArgc, char* aArgv[])
- {
-@@ -88,9 +99,10 @@ ContentProcess::Init(int aArgc, char* aArgv[])
+ bool ContentProcess::Init(int aArgc, char* aArgv[]) {
+   // If passed in grab the application path for xpcom init
    bool foundAppdir = false;
    bool foundChildID = false;
    bool foundIsForBrowser = false;
@@ -246,7 +243,7 @@ index e3c1f16910c6..2441c8cb9224 100644
    bool foundSchedulerPrefs = false;
  
    uint64_t childID;
-@@ -103,7 +115,8 @@ ContentProcess::Init(int aArgc, char* aArgv[])
+@@ -96,7 +104,8 @@ bool ContentProcess::Init(int aArgc, char* aArgv[]) {
  #endif
  
    char* schedulerPrefs = nullptr;
@@ -256,17 +253,20 @@ index e3c1f16910c6..2441c8cb9224 100644
    for (int idx = aArgc; idx > 0; idx--) {
      if (!aArgv[idx]) {
        continue;
-@@ -134,54 +147,24 @@ ContentProcess::Init(int aArgc, char* aArgv[])
+@@ -128,55 +137,24 @@ bool ContentProcess::Init(int aArgc, char* aArgv[]) {
        }
        isForBrowser = strcmp(aArgv[idx], "-notForBrowser");
        foundIsForBrowser = true;
 -    } else if (!strcmp(aArgv[idx], "-intPrefs")) {
--      char* str = aArgv[idx + 1];
++#ifdef XP_WIN
++    } else if (!strcmp(aArgv[idx], "-prefsHandle")) {
+       char* str = aArgv[idx + 1];
 -      while (*str) {
 -        int32_t index = strtol(str, &str, 10);
 -        MOZ_ASSERT(str[0] == ':');
 -        str++;
--        MaybePrefValue value(PrefValue(static_cast<int32_t>(strtol(str, &str, 10))));
+-        MaybePrefValue value(
+-            PrefValue(static_cast<int32_t>(strtol(str, &str, 10))));
 -        MOZ_ASSERT(str[0] == '|');
 -        str++;
 -        // XXX: we assume these values as default values, which may not be
@@ -278,8 +278,14 @@ index e3c1f16910c6..2441c8cb9224 100644
 -      }
 -      foundIntPrefs = true;
 -    } else if (!strcmp(aArgv[idx], "-boolPrefs")) {
-+#ifdef XP_WIN
-+    } else if (!strcmp(aArgv[idx], "-prefsHandle")) {
++      MOZ_ASSERT(str[0] != '\0');
++      // ContentParent uses %zu to print a word-sized unsigned integer. So even
++      // though strtoull() returns a long long int, it will fit in a uintptr_t.
++      prefsHandle = reinterpret_cast<HANDLE>(strtoull(str, &str, 10));
++      MOZ_ASSERT(str[0] == '\0');
++      foundPrefsHandle = true;
++#endif
++    } else if (!strcmp(aArgv[idx], "-prefsLen")) {
        char* str = aArgv[idx + 1];
 -      while (*str) {
 -        int32_t index = strtol(str, &str, 10);
@@ -294,15 +300,7 @@ index e3c1f16910c6..2441c8cb9224 100644
 -      }
 -      foundBoolPrefs = true;
 -    } else if (!strcmp(aArgv[idx], "-stringPrefs")) {
-+      MOZ_ASSERT(str[0] != '\0');
-+      // ContentParent uses %zu to print a word-sized unsigned integer. So even
-+      // though strtoull() returns a long long int, it will fit in a uintptr_t.
-+      prefsHandle = reinterpret_cast<HANDLE>(strtoull(str, &str, 10));
-+      MOZ_ASSERT(str[0] == '\0');
-+      foundPrefsHandle = true;
-+#endif
-+    } else if (!strcmp(aArgv[idx], "-prefsLen")) {
-       char* str = aArgv[idx + 1];
+-      char* str = aArgv[idx + 1];
 -      while (*str) {
 -        int32_t index = strtol(str, &str, 10);
 -        MOZ_ASSERT(str[0] == ':');
@@ -327,25 +325,22 @@ index e3c1f16910c6..2441c8cb9224 100644
      } else if (!strcmp(aArgv[idx], "-schedulerPrefs")) {
        schedulerPrefs = aArgv[idx + 1];
        foundSchedulerPrefs = true;
-@@ -209,21 +192,43 @@ ContentProcess::Init(int aArgc, char* aArgv[])
-     bool allFound = foundAppdir
-                  && foundChildID
-                  && foundIsForBrowser
--                 && foundIntPrefs
--                 && foundBoolPrefs
--                 && foundStringPrefs
--                 && foundSchedulerPrefs;
+@@ -201,19 +179,42 @@ bool ContentProcess::Init(int aArgc, char* aArgv[]) {
+ #endif /* XP_MACOSX && MOZ_CONTENT_SANDBOX */
+ 
+     bool allFound = foundAppdir && foundChildID && foundIsForBrowser &&
+-                    foundIntPrefs && foundBoolPrefs && foundStringPrefs &&
+-                    foundSchedulerPrefs;
 -
-+                 && foundPrefsLen
-+                 && foundSchedulerPrefs
++                    foundPrefsLen && foundSchedulerPrefs
 +#ifdef XP_WIN
-+                 && foundPrefsHandle
++                    && foundPrefsHandle
 +#endif
  #if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
 -    allFound &= foundProfile;
-+                 && foundProfile
++                    && foundProfile
  #endif
-+                 && true;
++                    && true;
  
      if (allFound) {
        break;
@@ -376,13 +371,13 @@ index e3c1f16910c6..2441c8cb9224 100644
 +                                           prefsLen);
 +
    Scheduler::SetPrefs(schedulerPrefs);
-   mContent.Init(IOThreadChild::message_loop(),
-                 ParentPid(),
+   mContent.Init(IOThreadChild::message_loop(), ParentPid(),
+                 IOThreadChild::channel(), childID, isForBrowser);
 diff --git dom/ipc/ContentProcess.h dom/ipc/ContentProcess.h
 index a3854c761e10..6582c94da496 100644
 --- dom/ipc/ContentProcess.h
 +++ dom/ipc/ContentProcess.h
-@@ -49,6 +49,11 @@ private:
+@@ -45,6 +45,11 @@ class ContentProcess : public mozilla::ipc::ProcessChi
    DISALLOW_EVIL_CONSTRUCTORS(ContentProcess);
  };
  
@@ -391,18 +386,19 @@ index a3854c761e10..6582c94da496 100644
 +void SetPrefsFd(int aFd);
 +#endif
 +
- } // namespace dom
- } // namespace mozilla
+ }  // namespace dom
+ }  // namespace mozilla
  
 diff --git ipc/chromium/src/base/process_util_win.cc ipc/chromium/src/base/process_util_win.cc
 index 3ed54cd744ac..46667985cd71 100644
 --- ipc/chromium/src/base/process_util_win.cc
 +++ ipc/chromium/src/base/process_util_win.cc
-@@ -354,6 +354,10 @@ bool LaunchApp(const std::wstring& cmdline,
+@@ -320,6 +320,11 @@ bool LaunchApp(const std::wstring& cmdline, const Laun
    LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList = NULL;
    std::vector<HANDLE> handlesToInherit;
    for (HANDLE h : options.handles_to_inherit) {
-+    if (SetHandleInformation(h, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT) == 0) {
++    if (SetHandleInformation(h, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT) ==
++        0) {
 +      MOZ_DIAGNOSTIC_ASSERT(false, "SetHandleInformation failed");
 +      return false;
 +    }
@@ -413,19 +409,19 @@ diff --git ipc/glue/GeckoChildProcessHost.cpp ipc/glue
 index d18ed9edd4ca..3be1c51d10bb 100644
 --- ipc/glue/GeckoChildProcessHost.cpp
 +++ ipc/glue/GeckoChildProcessHost.cpp
-@@ -1030,9 +1030,6 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
+@@ -1018,9 +1018,6 @@ bool GeckoChildProcessHost::PerformAsyncLaunchInternal
  
    if (!CrashReporter::IsDummy()) {
      PROsfd h = PR_FileDesc2NativeHandle(crashAnnotationWritePipe);
--# if defined(MOZ_SANDBOX)
+-#if defined(MOZ_SANDBOX)
 -    mSandboxBroker.AddHandleToShare(reinterpret_cast<HANDLE>(h));
--# endif // defined(MOZ_SANDBOX)
+-#endif  // defined(MOZ_SANDBOX)
      mLaunchOptions->handles_to_inherit.push_back(reinterpret_cast<HANDLE>(h));
      std::string hStr = std::to_string(h);
      cmdLine.AppendLooseValue(UTF8ToWide(hStr));
-@@ -1043,6 +1040,11 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
+@@ -1031,6 +1028,11 @@ bool GeckoChildProcessHost::PerformAsyncLaunchInternal
  
- # if defined(MOZ_SANDBOX)
+ #if defined(MOZ_SANDBOX)
    if (shouldSandboxCurrentProcess) {
 +    // Mark the handles to inherit as inheritable.
 +    for (HANDLE h : mLaunchOptions->handles_to_inherit) {
@@ -434,24 +430,25 @@ index d18ed9edd4ca..3be1c51d10bb 100644
 +
      if (mSandboxBroker.LaunchApp(cmdLine.program().c_str(),
                                   cmdLine.command_line_string().c_str(),
-                                  mLaunchOptions->env_map,
-@@ -1180,7 +1182,7 @@ GeckoChildProcessHost::LaunchAndroidService(const char* type,
-                                             const base::file_handle_mapping_vector& fds_to_remap,
-                                             ProcessHandle* process_handle)
- {
+                                  mLaunchOptions->env_map, mProcessType,
+@@ -1154,7 +1156,7 @@ void GeckoChildProcessHost::LaunchAndroidService(
+     const char* type, const std::vector<std::string>& argv,
+     const base::file_handle_mapping_vector& fds_to_remap,
+     ProcessHandle* process_handle) {
 -  MOZ_ASSERT((fds_to_remap.size() > 0) && (fds_to_remap.size() <= 3));
 +  MOZ_RELEASE_ASSERT((2 <= fds_to_remap.size()) && (fds_to_remap.size() <= 4));
    JNIEnv* const env = mozilla::jni::GetEnvForThread();
    MOZ_ASSERT(env);
  
-@@ -1189,21 +1191,25 @@ GeckoChildProcessHost::LaunchAndroidService(const char* type,
+@@ -1164,23 +1166,26 @@ void GeckoChildProcessHost::LaunchAndroidService(
    for (int ix = 0; ix < argvSize; ix++) {
      jargs->SetElement(ix, jni::StringParam(argv[ix].c_str(), env));
    }
 -  base::file_handle_mapping_vector::const_iterator it = fds_to_remap.begin();
 -  int32_t ipcFd = it->first;
 -  it++;
--  // If the Crash Reporter is disabled, there will not be a second file descriptor.
+-  // If the Crash Reporter is disabled, there will not be a second file
+-  // descriptor.
 +
 +  // XXX: this processing depends entirely on the internals of
 +  // ContentParent::LaunchSubprocess()
@@ -475,9 +472,11 @@ index d18ed9edd4ca..3be1c51d10bb 100644
 +    crashFd = fds_to_remap[2].first;
 +    crashAnnotationFd = fds_to_remap[3].first;
    }
--  int32_t handle = java::GeckoProcessManager::Start(type, jargs, ipcFd, crashFd, crashAnnotationFd);
+-  int32_t handle = java::GeckoProcessManager::Start(type, jargs, ipcFd, crashFd,
+-                                                    crashAnnotationFd);
 +
-+  int32_t handle = java::GeckoProcessManager::Start(type, jargs, prefsFd, ipcFd, crashFd, crashAnnotationFd);
++  int32_t handle = java::GeckoProcessManager::Start(type, jargs, prefsFd, ipcFd,
++                                                    crashFd, crashAnnotationFd);
  
    if (process_handle) {
      *process_handle = handle;
@@ -485,8 +484,8 @@ diff --git ipc/glue/GeckoChildProcessHost.h ipc/glue/G
 index 631c42066bc7..0345e221abcc 100644
 --- ipc/glue/GeckoChildProcessHost.h
 +++ ipc/glue/GeckoChildProcessHost.h
-@@ -103,6 +103,16 @@ public:
-   }
+@@ -94,6 +94,16 @@ class GeckoChildProcessHost : public ChildProcessHost 
+   task_t GetChildTask() { return mChildTask; }
  #endif
  
 +#ifdef XP_WIN
@@ -676,22 +675,22 @@ diff --git modules/libpref/Preferences.cpp modules/lib
 index 330ed4a09b54..b884591c9271 100644
 --- modules/libpref/Preferences.cpp
 +++ modules/libpref/Preferences.cpp
-@@ -2920,7 +2920,7 @@ public:
+@@ -2637,7 +2637,7 @@ class AddPreferencesMemoryReporterRunnable : public Ru
  
- } // namespace
+ }  // namespace
  
 -// A list of prefs sent early from the parent, via the command line.
 +// A list of prefs sent early from the parent, via shared memory.

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



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