Date: Tue, 19 Jun 2018 00:37:43 +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: r472727 - in head: Mk Mk/Uses www/firefox www/firefox-i18n www/firefox/files Message-ID: <201806190037.w5J0bhPE087870@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Jun 19 00:37:43 2018 New Revision: 472727 URL: https://svnweb.freebsd.org/changeset/ports/472727 Log: www/firefox: update to 61.0 - Drop DTRACE option, as it no longer builds https://bugzilla.mozilla.org/show_bug.cgi?id=1448659 https://bugzilla.mozilla.org/show_bug.cgi?id=702179#c33 - Stop using system hunspell per https://bugzilla.mozilla.org/show_bug.cgi?id=1460600 Changes: https://www.mozilla.org/firefox/61.0/releasenotes/ PR: 227850 Security: cd81806c-26e7-4d4a-8425-02724a2f48af MFH: 2018Q2 Differential Revision: https://reviews.freebsd.org/D15227 Deleted: head/www/firefox/files/patch-bug1375074 head/www/firefox/files/patch-bug1411481 head/www/firefox/files/patch-bug1435212 head/www/firefox/files/patch-bug1438678 head/www/firefox/files/patch-bug1442583 head/www/firefox/files/patch-bug1444798 head/www/firefox/files/patch-bug1445907 head/www/firefox/files/patch-bug1447359 head/www/firefox/files/patch-bug1451292 head/www/firefox/files/patch-bug1456556 head/www/firefox/files/patch-bug702179 head/www/firefox/files/patch-z-bug1436911 Modified: head/Mk/Uses/gecko.mk (contents, props changed) head/Mk/bsd.gecko.mk (contents, props changed) head/www/firefox-i18n/Makefile (contents, props changed) head/www/firefox-i18n/distinfo (contents, props changed) head/www/firefox/Makefile (contents, props changed) head/www/firefox/distinfo (contents, props changed) head/www/firefox/files/patch-addon-search (contents, props changed) head/www/firefox/files/patch-bug1021761 (contents, props changed) head/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp (contents, props changed) head/www/firefox/files/patch-u2f-hid-rs62 (contents, props changed) head/www/firefox/files/patch-z-bug517422 (contents, props changed) Modified: head/Mk/Uses/gecko.mk ============================================================================== --- head/Mk/Uses/gecko.mk Tue Jun 19 00:37:31 2018 (r472726) +++ head/Mk/Uses/gecko.mk Tue Jun 19 00:37:43 2018 (r472727) @@ -37,12 +37,12 @@ RUN_DEPENDS+= libxul>=45:www/libxul .elif ${gecko_ARGS:Mfirefox} _GECKO_DEFAULT_VERSION= 52 -_GECKO_VERSIONS= 52 60 +_GECKO_VERSIONS= 52 61 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions 52_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr -60_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox +61_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${PKG_QUERY} %v firefox firefox-esr Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Tue Jun 19 00:37:31 2018 (r472726) +++ head/Mk/bsd.gecko.mk Tue Jun 19 00:37:43 2018 (r472727) @@ -111,6 +111,11 @@ BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>0:devel/llvm${MES MOZ_EXPORT+= LLVM_CONFIG=llvm-config${MESA_LLVM_VER} .endif +.if ${MOZILLA_VER:R:R} >= 61 +BUILD_DEPENDS+= ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} +MOZ_EXPORT+= PYTHON3="${LOCALBASE}/bin/python${PYTHON3_DEFAULT}" +.endif + .if ${OPSYS} == FreeBSD && ${OSREL} == 11.1 LLD_UNSAFE= yes .endif Modified: head/www/firefox-i18n/Makefile ============================================================================== --- head/www/firefox-i18n/Makefile Tue Jun 19 00:37:31 2018 (r472726) +++ head/www/firefox-i18n/Makefile Tue Jun 19 00:37:43 2018 (r472727) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 60.0.2 +PORTVERSION= 61.0 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi @@ -15,7 +15,7 @@ COMMENT= Localized interface for Firefox EXTRACT_DEPENDS= zip:archivers/zip -USES= zip:infozip gecko:firefox,60,build +USES= zip:infozip gecko:firefox,61,build USE_XPI= firefox NO_ARCH= yes Modified: head/www/firefox-i18n/distinfo ============================================================================== --- head/www/firefox-i18n/distinfo Tue Jun 19 00:37:31 2018 (r472726) +++ head/www/firefox-i18n/distinfo Tue Jun 19 00:37:43 2018 (r472727) @@ -1,197 +1,197 @@ -TIMESTAMP = 1528228087 -SHA256 (xpi/firefox-i18n-60.0.2/ach.xpi) = 3264cdac77964c001d27c1da36d280702c6e28bb9caedf06a7a57d2d034f5097 -SIZE (xpi/firefox-i18n-60.0.2/ach.xpi) = 496058 -SHA256 (xpi/firefox-i18n-60.0.2/af.xpi) = 46c49276255243becdddff6102bea42c4860cc3c008d4b01f8d95b91812cdfca -SIZE (xpi/firefox-i18n-60.0.2/af.xpi) = 486534 -SHA256 (xpi/firefox-i18n-60.0.2/an.xpi) = 037f8ec9d96f019059d8131eff4ab06fff8ecc657f98ea231b1e5e7bae730880 -SIZE (xpi/firefox-i18n-60.0.2/an.xpi) = 519729 -SHA256 (xpi/firefox-i18n-60.0.2/ar.xpi) = cda7d8d114da54e4ecd6a5781795ab590c3510c59ab74d1c8343a2834489fa73 -SIZE (xpi/firefox-i18n-60.0.2/ar.xpi) = 546953 -SHA256 (xpi/firefox-i18n-60.0.2/as.xpi) = b978d40a6ebe0ec9ae07fe9d0b2a24c181422c1c09939255f7984a4b153b9a26 -SIZE (xpi/firefox-i18n-60.0.2/as.xpi) = 529953 -SHA256 (xpi/firefox-i18n-60.0.2/ast.xpi) = 5be044c2ea120e039e73a33c334314ce488bc12f0d0d5605a86320a023ed3ea3 -SIZE (xpi/firefox-i18n-60.0.2/ast.xpi) = 507870 -SHA256 (xpi/firefox-i18n-60.0.2/az.xpi) = c692cc2f12e4df1b5e45a5070766e8c5cf468aeb3315180228defdc5704e61d1 -SIZE (xpi/firefox-i18n-60.0.2/az.xpi) = 523974 -SHA256 (xpi/firefox-i18n-60.0.2/be.xpi) = cc291a855dcb454f114b40c7673db18dd7c0b2962a3c11ff9c0a986e3231eaa6 -SIZE (xpi/firefox-i18n-60.0.2/be.xpi) = 579945 -SHA256 (xpi/firefox-i18n-60.0.2/bg.xpi) = 62178b8aa781941a3de9d11e597092d479f682b5c6738de010110a3b9a9a42d8 -SIZE (xpi/firefox-i18n-60.0.2/bg.xpi) = 573080 -SHA256 (xpi/firefox-i18n-60.0.2/bn-BD.xpi) = cbd8950fdab635e864c10a5358d0495210effd6160a62b9599b093338dc67a16 -SIZE (xpi/firefox-i18n-60.0.2/bn-BD.xpi) = 589638 -SHA256 (xpi/firefox-i18n-60.0.2/bn-IN.xpi) = 026b702fdec8e922e71e6a9198d42de7a615d47d9ce47d8a58fdc8c0ee4ffe5a -SIZE (xpi/firefox-i18n-60.0.2/bn-IN.xpi) = 570083 -SHA256 (xpi/firefox-i18n-60.0.2/br.xpi) = acd17442b0918ddadaa324223b70cc240e3e5f9377ee1bf966cecb6f1bd124cf -SIZE (xpi/firefox-i18n-60.0.2/br.xpi) = 511252 -SHA256 (xpi/firefox-i18n-60.0.2/bs.xpi) = 6fc982720e171f8c4e1b06eed294735a6514e3e54bb9ada39cca697315afb48f -SIZE (xpi/firefox-i18n-60.0.2/bs.xpi) = 513936 -SHA256 (xpi/firefox-i18n-60.0.2/ca.xpi) = 41f425b998c4f37c2e506d24e06ab692597d5d5f191c1042cef42b53b164377e -SIZE (xpi/firefox-i18n-60.0.2/ca.xpi) = 524484 -SHA256 (xpi/firefox-i18n-60.0.2/cak.xpi) = e511a882edb4fe78c5759c716cc5313875dde60dcb144cb19f1ff2d3dd97478d -SIZE (xpi/firefox-i18n-60.0.2/cak.xpi) = 535516 -SHA256 (xpi/firefox-i18n-60.0.2/cs.xpi) = 5bd65f390119dcd6f09be4c71a158187e3d0ce3aa775b17459c4b57b6931877b -SIZE (xpi/firefox-i18n-60.0.2/cs.xpi) = 531015 -SHA256 (xpi/firefox-i18n-60.0.2/cy.xpi) = e2c989a044c9a4af5ec60676d1e2f652d3bea657d0b51f91fe763458781d6279 -SIZE (xpi/firefox-i18n-60.0.2/cy.xpi) = 515864 -SHA256 (xpi/firefox-i18n-60.0.2/da.xpi) = fe33cf6e6b118cbd56af791fce6b57640af600f3ed483ff71b3dace8c3ec378a -SIZE (xpi/firefox-i18n-60.0.2/da.xpi) = 509975 -SHA256 (xpi/firefox-i18n-60.0.2/de.xpi) = eda7bc1cd123f24b57ce6d0fcfca3e6c0954c71a32ef610ae62dfe8ae8477140 -SIZE (xpi/firefox-i18n-60.0.2/de.xpi) = 525689 -SHA256 (xpi/firefox-i18n-60.0.2/dsb.xpi) = 73daa18ad8e7a42c781242a506587fed18158f0bf1f9f2e7e9c2c8fa4916b4a3 -SIZE (xpi/firefox-i18n-60.0.2/dsb.xpi) = 538745 -SHA256 (xpi/firefox-i18n-60.0.2/el.xpi) = c447405287531c915afde8ca535b1b812b29a4a15b8aa1bb562b26276801a371 -SIZE (xpi/firefox-i18n-60.0.2/el.xpi) = 592917 -SHA256 (xpi/firefox-i18n-60.0.2/en-GB.xpi) = fe02706b63725e0ef67d23cecae9e0a592c1b0c8bb0050773954f142793ef0d4 -SIZE (xpi/firefox-i18n-60.0.2/en-GB.xpi) = 490903 -SHA256 (xpi/firefox-i18n-60.0.2/en-US.xpi) = 3a012162ccef7068fd5b16117ede3eb8c151e99635e83c031a37f1989565f16b -SIZE (xpi/firefox-i18n-60.0.2/en-US.xpi) = 472384 -SHA256 (xpi/firefox-i18n-60.0.2/en-ZA.xpi) = 0df9291489150fa400c0927b770f5a94e7d3ad641ea59ac720cbf006f3c58e50 -SIZE (xpi/firefox-i18n-60.0.2/en-ZA.xpi) = 473896 -SHA256 (xpi/firefox-i18n-60.0.2/eo.xpi) = 05cc1895271e735fa0d4e73c0cc792de6d7bea63034777fd7facd3e45d0630da -SIZE (xpi/firefox-i18n-60.0.2/eo.xpi) = 510494 -SHA256 (xpi/firefox-i18n-60.0.2/es-AR.xpi) = 005ee9da32ea33d4f420ecbcd8add9cf2ab5bf332b0a7699ecab4ee67331a564 -SIZE (xpi/firefox-i18n-60.0.2/es-AR.xpi) = 523819 -SHA256 (xpi/firefox-i18n-60.0.2/es-CL.xpi) = f76adcbda565019c183d8a4ecb38a911a7fca78b7db158a5a1fa5402627e0566 -SIZE (xpi/firefox-i18n-60.0.2/es-CL.xpi) = 526509 -SHA256 (xpi/firefox-i18n-60.0.2/es-ES.xpi) = 76b7ab024878427cf6ea87b9a74632c667b4cdcf03bdc899f95bb802dfc304d6 -SIZE (xpi/firefox-i18n-60.0.2/es-ES.xpi) = 459139 -SHA256 (xpi/firefox-i18n-60.0.2/es-MX.xpi) = 2829924eee326add8b7f9f9dffd6a42f54e26bb573307d7655f74dff3fa4df43 -SIZE (xpi/firefox-i18n-60.0.2/es-MX.xpi) = 527838 -SHA256 (xpi/firefox-i18n-60.0.2/et.xpi) = d9f0ff92b02ae4b6674432c191950fce9d5b85307b3dd4a7b818b6c73a701271 -SIZE (xpi/firefox-i18n-60.0.2/et.xpi) = 504174 -SHA256 (xpi/firefox-i18n-60.0.2/eu.xpi) = a80e87f4151defb992312fcd143890c6b86cf5067222a2742257f12eb81fb067 -SIZE (xpi/firefox-i18n-60.0.2/eu.xpi) = 510932 -SHA256 (xpi/firefox-i18n-60.0.2/fa.xpi) = 0bf0337cbd82f45f141eeae5433b4b77da449e3077fc0b32c9a3dc511da47f93 -SIZE (xpi/firefox-i18n-60.0.2/fa.xpi) = 565489 -SHA256 (xpi/firefox-i18n-60.0.2/ff.xpi) = bcf099ecd8ad1544e7d084417d6c876f6629b2689a194d7b38a0988a528e5d15 -SIZE (xpi/firefox-i18n-60.0.2/ff.xpi) = 511432 -SHA256 (xpi/firefox-i18n-60.0.2/fi.xpi) = 657ad94dfd99269ada99636ebf7a7ee9bb7364bdcabaede2f6305bd793793f92 -SIZE (xpi/firefox-i18n-60.0.2/fi.xpi) = 505404 -SHA256 (xpi/firefox-i18n-60.0.2/fr.xpi) = 6c13eaf3cbd4ef845be167f40509e6bb1b6732a3a8f0b7dac8a4b27bb1fb5244 -SIZE (xpi/firefox-i18n-60.0.2/fr.xpi) = 535238 -SHA256 (xpi/firefox-i18n-60.0.2/fy-NL.xpi) = 2def398c510f0417922c6155a47b532a2604794aff25dfaa1a64927e5112e69c -SIZE (xpi/firefox-i18n-60.0.2/fy-NL.xpi) = 523736 -SHA256 (xpi/firefox-i18n-60.0.2/ga-IE.xpi) = a07e724a94de27dcd7efad3b518519eb2dc8fce2e6c6ad82c49d7340f1aae654 -SIZE (xpi/firefox-i18n-60.0.2/ga-IE.xpi) = 526199 -SHA256 (xpi/firefox-i18n-60.0.2/gd.xpi) = f9f60f239d7091ac4fe4e8797fe66a2cf8f1998229439b64f02d12189fc56ed8 -SIZE (xpi/firefox-i18n-60.0.2/gd.xpi) = 520093 -SHA256 (xpi/firefox-i18n-60.0.2/gl.xpi) = 8dbe92bf6e56417998bb581600f33abdc9ced8015a2f5b5404ad16331377d469 -SIZE (xpi/firefox-i18n-60.0.2/gl.xpi) = 496593 -SHA256 (xpi/firefox-i18n-60.0.2/gn.xpi) = 2f8f02fbff9dcafe6e97f56e3bb4cd30dab599cfeac5aa08176ddf115e93c230 -SIZE (xpi/firefox-i18n-60.0.2/gn.xpi) = 532439 -SHA256 (xpi/firefox-i18n-60.0.2/gu-IN.xpi) = 0d5ccd4b83d3bc510f48466b647956d356da98b2873bf324e0449f795418b83c -SIZE (xpi/firefox-i18n-60.0.2/gu-IN.xpi) = 589483 -SHA256 (xpi/firefox-i18n-60.0.2/he.xpi) = ec0799c68a0f054ec30fdf9f7b698517b12d960235dabcbfd6ea828e38647cee -SIZE (xpi/firefox-i18n-60.0.2/he.xpi) = 535211 -SHA256 (xpi/firefox-i18n-60.0.2/hi-IN.xpi) = 3fd33dabf5a465fba7983553ba89d7189cb156132bd2060932b11f1bc3efbabf -SIZE (xpi/firefox-i18n-60.0.2/hi-IN.xpi) = 590076 -SHA256 (xpi/firefox-i18n-60.0.2/hr.xpi) = be54a7a81d3d2aecd5bda7266034f2c41dd2271ca41c4a59dfc2d95ef8ef6876 -SIZE (xpi/firefox-i18n-60.0.2/hr.xpi) = 515186 -SHA256 (xpi/firefox-i18n-60.0.2/hsb.xpi) = c552a2302b5832c953db367475d9eb292e75ef3f1319e034ade05e6e5ef1f15b -SIZE (xpi/firefox-i18n-60.0.2/hsb.xpi) = 536278 -SHA256 (xpi/firefox-i18n-60.0.2/hu.xpi) = 61bb78d4604bb4f4fee525751486e6e5612c285565bb7e42f6e3b388a9dbbe31 -SIZE (xpi/firefox-i18n-60.0.2/hu.xpi) = 537587 -SHA256 (xpi/firefox-i18n-60.0.2/hy-AM.xpi) = 54deba7f2a00e48cadd99208472e467f1f78a678db91ba3fbb8ffe2d925f5dda -SIZE (xpi/firefox-i18n-60.0.2/hy-AM.xpi) = 568629 -SHA256 (xpi/firefox-i18n-60.0.2/ia.xpi) = c69a5c604f90f239a6c78de43b1f7884a5f553eaa49211f81cf76b1c256638f0 -SIZE (xpi/firefox-i18n-60.0.2/ia.xpi) = 509951 -SHA256 (xpi/firefox-i18n-60.0.2/id.xpi) = f7fb19719341975e08328270ba1f4933d589fb4d2798ef9a00965828aba55227 -SIZE (xpi/firefox-i18n-60.0.2/id.xpi) = 501449 -SHA256 (xpi/firefox-i18n-60.0.2/is.xpi) = 0164a3686761abf0be0a1d8f773762031222e22362152865c4e38ac306b0cdd3 -SIZE (xpi/firefox-i18n-60.0.2/is.xpi) = 512502 -SHA256 (xpi/firefox-i18n-60.0.2/it.xpi) = 02b80d059ae403c04b2e130f521b1d80ea71f505cfe4dbd120ea218a84bedeb0 -SIZE (xpi/firefox-i18n-60.0.2/it.xpi) = 398263 -SHA256 (xpi/firefox-i18n-60.0.2/ja.xpi) = dcb3446a228a3cde462264e0ba39c606aea4dc711919e6c7d5dae252ecdd5a67 -SIZE (xpi/firefox-i18n-60.0.2/ja.xpi) = 571244 -SHA256 (xpi/firefox-i18n-60.0.2/ka.xpi) = fcfe7fc9d2cff0399e369eaf1d8bb5d8adb73773d095858bbefd2758d69f7f27 -SIZE (xpi/firefox-i18n-60.0.2/ka.xpi) = 556072 -SHA256 (xpi/firefox-i18n-60.0.2/kab.xpi) = 049404f2dcb4d32ddcce2b36739b4301b69586906defa775fc6500c8fad678ac -SIZE (xpi/firefox-i18n-60.0.2/kab.xpi) = 519624 -SHA256 (xpi/firefox-i18n-60.0.2/kk.xpi) = ed233b274feec630f92c432ea9adf7624548c628308724aa4046baa51a9d6004 -SIZE (xpi/firefox-i18n-60.0.2/kk.xpi) = 582205 -SHA256 (xpi/firefox-i18n-60.0.2/km.xpi) = a67c04fb6437227a68ab8083491119fc0931dc8b397d605b92f804f9f2f4c710 -SIZE (xpi/firefox-i18n-60.0.2/km.xpi) = 582332 -SHA256 (xpi/firefox-i18n-60.0.2/kn.xpi) = 3427d552400dde0e3d73019cdf6d3ff7e0235d8ea0e9647b90da923c60365924 -SIZE (xpi/firefox-i18n-60.0.2/kn.xpi) = 585098 -SHA256 (xpi/firefox-i18n-60.0.2/ko.xpi) = 22eed6eba57f8cb38bda67e8a90e7bff5668f2e596869bc5a1c60c24453733d3 -SIZE (xpi/firefox-i18n-60.0.2/ko.xpi) = 547056 -SHA256 (xpi/firefox-i18n-60.0.2/lij.xpi) = d1d4e0d940eb4a19ea6ba8f4dd883c4e365d9f1ac7dfe90160764278fec29119 -SIZE (xpi/firefox-i18n-60.0.2/lij.xpi) = 512397 -SHA256 (xpi/firefox-i18n-60.0.2/lt.xpi) = 5d7a35f2890260978d0d7110e73ae2109bb3703d6cd65d36048e66e77062c7fe -SIZE (xpi/firefox-i18n-60.0.2/lt.xpi) = 535632 -SHA256 (xpi/firefox-i18n-60.0.2/lv.xpi) = 462e8d28b118e601f8eaadf7ee495fceac969e1110debe2e0b12f4afdc5b1834 -SIZE (xpi/firefox-i18n-60.0.2/lv.xpi) = 525636 -SHA256 (xpi/firefox-i18n-60.0.2/mai.xpi) = 66e8e472fcdd9532a8401a4a9bb7293fcfab4535e6129e62d0aba974753d0c0c -SIZE (xpi/firefox-i18n-60.0.2/mai.xpi) = 548471 -SHA256 (xpi/firefox-i18n-60.0.2/mk.xpi) = d752302445ac0f14496e4230c1c094d2b78fef42f3272914c3a52b72fb8dc4d3 -SIZE (xpi/firefox-i18n-60.0.2/mk.xpi) = 513025 -SHA256 (xpi/firefox-i18n-60.0.2/ml.xpi) = 0652ddfd12240e1a7a258835b6b72af06856d541c99c6a0d2275dca9157674e5 -SIZE (xpi/firefox-i18n-60.0.2/ml.xpi) = 598198 -SHA256 (xpi/firefox-i18n-60.0.2/mr.xpi) = 2a05310d226bd5be71ede145c898eeb1c2e135aefa0245254201266e0595b969 -SIZE (xpi/firefox-i18n-60.0.2/mr.xpi) = 578337 -SHA256 (xpi/firefox-i18n-60.0.2/ms.xpi) = 877a6de579035a20ff32075e5d4d36079af06c0f307428ecf508c39d2af9aab7 -SIZE (xpi/firefox-i18n-60.0.2/ms.xpi) = 508781 -SHA256 (xpi/firefox-i18n-60.0.2/my.xpi) = 6702089f2b5560f7774f6abd432cbaeb8a3364f4897dde19a158efa647bd7a0d -SIZE (xpi/firefox-i18n-60.0.2/my.xpi) = 569572 -SHA256 (xpi/firefox-i18n-60.0.2/nb-NO.xpi) = 773f9a9843c79f34bfa459829b8c9cd3546b544dccefde0e7c468098de47f383 -SIZE (xpi/firefox-i18n-60.0.2/nb-NO.xpi) = 509104 -SHA256 (xpi/firefox-i18n-60.0.2/ne-NP.xpi) = d3e33d855d4e0d0d89fda9c4cd6b1322348059e2ec378d522904f40e81a3f763 -SIZE (xpi/firefox-i18n-60.0.2/ne-NP.xpi) = 554577 -SHA256 (xpi/firefox-i18n-60.0.2/nl.xpi) = 4f419acfd5824b75e6be4a8a95645ff6bc8798fe3e54c740f8652ca7836ef539 -SIZE (xpi/firefox-i18n-60.0.2/nl.xpi) = 516653 -SHA256 (xpi/firefox-i18n-60.0.2/nn-NO.xpi) = 29aa2f24e4bdd67c58d17caecd8b2c7d81bb0bbdc682d76487614621561f1085 -SIZE (xpi/firefox-i18n-60.0.2/nn-NO.xpi) = 510621 -SHA256 (xpi/firefox-i18n-60.0.2/oc.xpi) = ec8836cd689ebb864cb994dfaee342dbcf9a5f2423f0f399ffbc1c6a118d2a7d -SIZE (xpi/firefox-i18n-60.0.2/oc.xpi) = 526207 -SHA256 (xpi/firefox-i18n-60.0.2/or.xpi) = 9da7b23e12d90aeed04e637772a0b8a3f75d7d6dd8d7cfcfc5d60a99f8d2fd19 -SIZE (xpi/firefox-i18n-60.0.2/or.xpi) = 540089 -SHA256 (xpi/firefox-i18n-60.0.2/pa-IN.xpi) = 77432ae4cf8faa53fb3aaa51749547b63205d301cc9b3cbb17cf8837589554da -SIZE (xpi/firefox-i18n-60.0.2/pa-IN.xpi) = 557086 -SHA256 (xpi/firefox-i18n-60.0.2/pl.xpi) = 6c120bfcc19c4b68b21adffdda876eec2e928509eb0441bc0f6290098e3f333c -SIZE (xpi/firefox-i18n-60.0.2/pl.xpi) = 418192 -SHA256 (xpi/firefox-i18n-60.0.2/pt-BR.xpi) = aa3613bea650524dbb7f5dd7114759df3581479602a64f57f520e267582d4987 -SIZE (xpi/firefox-i18n-60.0.2/pt-BR.xpi) = 513944 -SHA256 (xpi/firefox-i18n-60.0.2/pt-PT.xpi) = 67f4f4e4b1bf773cbe5712042fe99af140d85da9366126aa39c59798bb1dd0cf -SIZE (xpi/firefox-i18n-60.0.2/pt-PT.xpi) = 518540 -SHA256 (xpi/firefox-i18n-60.0.2/rm.xpi) = 569994da2a6f808a8d6c533b76487e19088d60085a043afb273c0cdb0f598685 -SIZE (xpi/firefox-i18n-60.0.2/rm.xpi) = 505263 -SHA256 (xpi/firefox-i18n-60.0.2/ro.xpi) = 5a97e49719592a6d5ef0f829947afb54e2e4449a89a354bcb0bced8e6594fde5 -SIZE (xpi/firefox-i18n-60.0.2/ro.xpi) = 513283 -SHA256 (xpi/firefox-i18n-60.0.2/ru.xpi) = 2ea09073bf39fd18f2257176c71044c8fb9eda6c9e7fedab8c23316f5167d9fb -SIZE (xpi/firefox-i18n-60.0.2/ru.xpi) = 590511 -SHA256 (xpi/firefox-i18n-60.0.2/si.xpi) = 200e788abd768d1ea478a341a2b9ed56b44097b36cde8d9b1818157d30c96cec -SIZE (xpi/firefox-i18n-60.0.2/si.xpi) = 544795 -SHA256 (xpi/firefox-i18n-60.0.2/sk.xpi) = f396351241475b099f7924ee78bc156be5213323789e88f013608d908b0df8f6 -SIZE (xpi/firefox-i18n-60.0.2/sk.xpi) = 540928 -SHA256 (xpi/firefox-i18n-60.0.2/sl.xpi) = b10e2296960aa0a98aaf6fecfd08ce64e223e8f7aec169b1a94d628b2c8348c1 -SIZE (xpi/firefox-i18n-60.0.2/sl.xpi) = 518573 -SHA256 (xpi/firefox-i18n-60.0.2/son.xpi) = a63256b85d637d60086cfff632957c44c45ba53c843634f252e42601d54e7abd -SIZE (xpi/firefox-i18n-60.0.2/son.xpi) = 496920 -SHA256 (xpi/firefox-i18n-60.0.2/sq.xpi) = e8b0fe2f702f3c1858adc19521a4a661275df80664303934c79e14839843f067 -SIZE (xpi/firefox-i18n-60.0.2/sq.xpi) = 520487 -SHA256 (xpi/firefox-i18n-60.0.2/sr.xpi) = 6a4e20050e2b4416ebaa35a32fe5e3ed7ac2191bbf0a5cfa7d5e1e046c1c8dfc -SIZE (xpi/firefox-i18n-60.0.2/sr.xpi) = 547998 -SHA256 (xpi/firefox-i18n-60.0.2/sv-SE.xpi) = 942d86553fe7224497e497464537fecf8de2f5fd9819330821e05b7968a4ebd2 -SIZE (xpi/firefox-i18n-60.0.2/sv-SE.xpi) = 517850 -SHA256 (xpi/firefox-i18n-60.0.2/ta.xpi) = 8c03cea19a64a176f135b6de774740292f93cfdfff262440900b3e8117b789b9 -SIZE (xpi/firefox-i18n-60.0.2/ta.xpi) = 577139 -SHA256 (xpi/firefox-i18n-60.0.2/te.xpi) = ea6dbd7a2f4379f8c980d5bdba84cfd2bcc91b81243e01d2770dd8dc238fca82 -SIZE (xpi/firefox-i18n-60.0.2/te.xpi) = 590179 -SHA256 (xpi/firefox-i18n-60.0.2/th.xpi) = be48a1f68ce337997b6b5cc5f14a44ea53c8a6f9f5fcb9bd4f037e83a5e27f3f -SIZE (xpi/firefox-i18n-60.0.2/th.xpi) = 562042 -SHA256 (xpi/firefox-i18n-60.0.2/tr.xpi) = 114102a3af7a638d2a988c97c47f95631fe9c795770db1238e8329226e6c5087 -SIZE (xpi/firefox-i18n-60.0.2/tr.xpi) = 525034 -SHA256 (xpi/firefox-i18n-60.0.2/uk.xpi) = c72bd318699dcef64d285a970850f1b2953c263033bec419a89b86d06a000ce0 -SIZE (xpi/firefox-i18n-60.0.2/uk.xpi) = 580148 -SHA256 (xpi/firefox-i18n-60.0.2/ur.xpi) = b336ad7af245f94e221d96648a0eafd186c9b0aafabdca13d9495a5a2f0f7cea -SIZE (xpi/firefox-i18n-60.0.2/ur.xpi) = 562604 -SHA256 (xpi/firefox-i18n-60.0.2/uz.xpi) = 72c1d09b935e26dd3838c8121527a768cd3518e0010452be062bd7459b84e944 -SIZE (xpi/firefox-i18n-60.0.2/uz.xpi) = 512908 -SHA256 (xpi/firefox-i18n-60.0.2/vi.xpi) = 8598e67bf41d660c443b62b1feccd8fc4904026bd26304278057028028096822 -SIZE (xpi/firefox-i18n-60.0.2/vi.xpi) = 527412 -SHA256 (xpi/firefox-i18n-60.0.2/xh.xpi) = 4fb78a9f7515ab7e3a1d1c7329a53dd91e090312ffbec6c9141454da8e24a000 -SIZE (xpi/firefox-i18n-60.0.2/xh.xpi) = 511086 -SHA256 (xpi/firefox-i18n-60.0.2/zh-CN.xpi) = 8dccc0a7ec90bd42c0beb420d8572fa591afc3deb949fdbb68a610c53949159d -SIZE (xpi/firefox-i18n-60.0.2/zh-CN.xpi) = 542797 -SHA256 (xpi/firefox-i18n-60.0.2/zh-TW.xpi) = f0d1047fcf359865b99a44f873e210cf5adcde8a9f577cb6e5c517f2bcfa84bb -SIZE (xpi/firefox-i18n-60.0.2/zh-TW.xpi) = 541123 +TIMESTAMP = 1529363060 +SHA256 (xpi/firefox-i18n-61.0/ach.xpi) = 4ff0f07119bb1a8f53293b82760d23bd001a957a6c8c21241a79f20ea689ea54 +SIZE (xpi/firefox-i18n-61.0/ach.xpi) = 468315 +SHA256 (xpi/firefox-i18n-61.0/af.xpi) = a575a9b471c911de70eba83dca6a36177b2c8d93a0820d2ce719e91c439b2166 +SIZE (xpi/firefox-i18n-61.0/af.xpi) = 458282 +SHA256 (xpi/firefox-i18n-61.0/an.xpi) = 2f2e969cbcdf8e0ffeb1446ec0d9e4399061c8a9044334f1cc91599de0579693 +SIZE (xpi/firefox-i18n-61.0/an.xpi) = 492776 +SHA256 (xpi/firefox-i18n-61.0/ar.xpi) = d1f69c6e645d4d1e2d05d4cb5613e83f77234c2c1f48a58053ebe9043ee12d3d +SIZE (xpi/firefox-i18n-61.0/ar.xpi) = 514909 +SHA256 (xpi/firefox-i18n-61.0/as.xpi) = ebb0bc6249193cf503947c536fdf66d7777538f3328476947d9eaf5b3a505c97 +SIZE (xpi/firefox-i18n-61.0/as.xpi) = 498325 +SHA256 (xpi/firefox-i18n-61.0/ast.xpi) = 0031dde4c27ae3c097a65757a97e2a418236243bd6520dd4aa13b182eb63d606 +SIZE (xpi/firefox-i18n-61.0/ast.xpi) = 478587 +SHA256 (xpi/firefox-i18n-61.0/az.xpi) = f3665e6cbc8872a917511b1de28792df8d2358e27ea48be61699b02ceb9dac30 +SIZE (xpi/firefox-i18n-61.0/az.xpi) = 494285 +SHA256 (xpi/firefox-i18n-61.0/be.xpi) = 621c76bb5412097875f8b8435a59b81f39bdcc009fdf743296a59da0884b9cb0 +SIZE (xpi/firefox-i18n-61.0/be.xpi) = 550840 +SHA256 (xpi/firefox-i18n-61.0/bg.xpi) = 967921d5d1d6d1538572cab57c732fa2aa136baf9f5ef771f5cb6e7af3b882df +SIZE (xpi/firefox-i18n-61.0/bg.xpi) = 541818 +SHA256 (xpi/firefox-i18n-61.0/bn-BD.xpi) = 299397a1c23b1ff0c00db81beef7c911908dadece988b21c06ca2677ab656f01 +SIZE (xpi/firefox-i18n-61.0/bn-BD.xpi) = 556530 +SHA256 (xpi/firefox-i18n-61.0/bn-IN.xpi) = ac7b4891cfc627fbadebaff5a968a5507ede126641ac954dbaed415887d14ee8 +SIZE (xpi/firefox-i18n-61.0/bn-IN.xpi) = 535413 +SHA256 (xpi/firefox-i18n-61.0/br.xpi) = e7320413b5314c86d50b8303fb6811d655521fc7ead452dba14fd49a583398f9 +SIZE (xpi/firefox-i18n-61.0/br.xpi) = 486575 +SHA256 (xpi/firefox-i18n-61.0/bs.xpi) = 3fc348bfd1f84ae9fddc437e47568a7d45b55ca7a66d30ca2af2632f91d054e5 +SIZE (xpi/firefox-i18n-61.0/bs.xpi) = 489126 +SHA256 (xpi/firefox-i18n-61.0/ca.xpi) = 27de4ea1d34c3f8168d4a7cecb7d231e1b7b87e89bb4038df27cfc7ef5050efd +SIZE (xpi/firefox-i18n-61.0/ca.xpi) = 497516 +SHA256 (xpi/firefox-i18n-61.0/cak.xpi) = 4816243359dfb7f583f93b36c2834c605ca0f2d45b9cbbd6a8dfdccc5e486b20 +SIZE (xpi/firefox-i18n-61.0/cak.xpi) = 509333 +SHA256 (xpi/firefox-i18n-61.0/cs.xpi) = 770ed446a0085c965d9892ac6b0ad8084972e06064fd4d198b1b099648ab29ee +SIZE (xpi/firefox-i18n-61.0/cs.xpi) = 502595 +SHA256 (xpi/firefox-i18n-61.0/cy.xpi) = bb66b94fe6187b4972d4961e62f597da5df64b5da066b6b845df9fa3d5c4ba16 +SIZE (xpi/firefox-i18n-61.0/cy.xpi) = 490414 +SHA256 (xpi/firefox-i18n-61.0/da.xpi) = 35b316521b48446779c1f2745947361bb703c822ee67fe6a74e86223e85bb67e +SIZE (xpi/firefox-i18n-61.0/da.xpi) = 483618 +SHA256 (xpi/firefox-i18n-61.0/de.xpi) = 6aadc1264f5fd8efb3694ff08a5efb75297fc294f0a680203aae74cc070f35b8 +SIZE (xpi/firefox-i18n-61.0/de.xpi) = 502283 +SHA256 (xpi/firefox-i18n-61.0/dsb.xpi) = ccbff842b6764116b47385d2287461963fb5ac7b78f1f2aae4a8e18aed78458d +SIZE (xpi/firefox-i18n-61.0/dsb.xpi) = 512450 +SHA256 (xpi/firefox-i18n-61.0/el.xpi) = edd6f8dde4981106bf737717229a03ba651f34dc425d5840837d40070e843c8b +SIZE (xpi/firefox-i18n-61.0/el.xpi) = 559690 +SHA256 (xpi/firefox-i18n-61.0/en-GB.xpi) = 9afdfac520fc213693673987a6b051822935915ad887c77119328a3e18ae8d20 +SIZE (xpi/firefox-i18n-61.0/en-GB.xpi) = 464877 +SHA256 (xpi/firefox-i18n-61.0/en-US.xpi) = 36de1f6d998c18f3bcf3ea5e7f14aaa355311fa9218a3fb4a6954f8d5dea04d4 +SIZE (xpi/firefox-i18n-61.0/en-US.xpi) = 456416 +SHA256 (xpi/firefox-i18n-61.0/en-ZA.xpi) = 1a8d3d838a06d6ed4a92c7c9a20bdeb3daa51b277b579d7d54f84cb9dc4a50f0 +SIZE (xpi/firefox-i18n-61.0/en-ZA.xpi) = 446645 +SHA256 (xpi/firefox-i18n-61.0/eo.xpi) = 3f709d3f28be0ed4cd8248a7237fcb98080a32a5f9926dc1cac1dd0e8cd2036f +SIZE (xpi/firefox-i18n-61.0/eo.xpi) = 484761 +SHA256 (xpi/firefox-i18n-61.0/es-AR.xpi) = 9e98d6f9c26ff5b9c493f1358311a61ea0b1d7bfc347acb92a0fc1a30a330268 +SIZE (xpi/firefox-i18n-61.0/es-AR.xpi) = 498194 +SHA256 (xpi/firefox-i18n-61.0/es-CL.xpi) = 772f0f0b1c819cdad977a1cc1eeb45a7e20b4cd13e565b3c009101612783647a +SIZE (xpi/firefox-i18n-61.0/es-CL.xpi) = 500856 +SHA256 (xpi/firefox-i18n-61.0/es-ES.xpi) = 478ac6255f1a78eccc84ae147ec20a04dc8b2b81da14531614f1fb5e84a53824 +SIZE (xpi/firefox-i18n-61.0/es-ES.xpi) = 435906 +SHA256 (xpi/firefox-i18n-61.0/es-MX.xpi) = ab8875565143f143c6be267f4f2ac27d93518eaacfb36207ed3a25a43bd43cc5 +SIZE (xpi/firefox-i18n-61.0/es-MX.xpi) = 500944 +SHA256 (xpi/firefox-i18n-61.0/et.xpi) = 7472975fc121194c15c5fa30374eafbced8a284cd05d1ea32f83f6b8483caf63 +SIZE (xpi/firefox-i18n-61.0/et.xpi) = 477542 +SHA256 (xpi/firefox-i18n-61.0/eu.xpi) = 5f69e9bbd37ff36807a5d70f5c8180a1776201f666ef6475fd265aad7c5c53be +SIZE (xpi/firefox-i18n-61.0/eu.xpi) = 488816 +SHA256 (xpi/firefox-i18n-61.0/fa.xpi) = 5fa1d36c12de82753062850b8a34366f237b9083a1ed029e64bbbf3fe9ef530d +SIZE (xpi/firefox-i18n-61.0/fa.xpi) = 537573 +SHA256 (xpi/firefox-i18n-61.0/ff.xpi) = 12dcc07546d56a193bed1c221f738ca5c6bf33a65de2e35bd9deeb950955c205 +SIZE (xpi/firefox-i18n-61.0/ff.xpi) = 483852 +SHA256 (xpi/firefox-i18n-61.0/fi.xpi) = de825d8efd96d3be1143d4c3c38c086303ae99b6ae6016c06743327fb53c6573 +SIZE (xpi/firefox-i18n-61.0/fi.xpi) = 479926 +SHA256 (xpi/firefox-i18n-61.0/fr.xpi) = 5a412bcb07eb0f6cc18ad261cbdb70d591bc9203ba90f9f31b82f27eb821c19e +SIZE (xpi/firefox-i18n-61.0/fr.xpi) = 507142 +SHA256 (xpi/firefox-i18n-61.0/fy-NL.xpi) = f704a7071efbec6f224eb218117caa892e3b9b7cf3e1a95059f8f8f6138b5886 +SIZE (xpi/firefox-i18n-61.0/fy-NL.xpi) = 497982 +SHA256 (xpi/firefox-i18n-61.0/ga-IE.xpi) = a1cd760b5e516c2ce49ea486abd5255134ac807b59778f6e6aa624433b9b87fc +SIZE (xpi/firefox-i18n-61.0/ga-IE.xpi) = 495805 +SHA256 (xpi/firefox-i18n-61.0/gd.xpi) = 71e64d95918a8e709fd985a2c459797529b556209b79453f3e379a1f4a8cd534 +SIZE (xpi/firefox-i18n-61.0/gd.xpi) = 497605 +SHA256 (xpi/firefox-i18n-61.0/gl.xpi) = 3f11ddedb54e3c51b9d49f931770599be7b10e7455001f84b813f156803415b2 +SIZE (xpi/firefox-i18n-61.0/gl.xpi) = 471912 +SHA256 (xpi/firefox-i18n-61.0/gn.xpi) = bfb61578ba13e7866aa952d93e2218a4efc9d8042d6eab90efef3194505bc06b +SIZE (xpi/firefox-i18n-61.0/gn.xpi) = 506407 +SHA256 (xpi/firefox-i18n-61.0/gu-IN.xpi) = 54ab192252fa174aa514c61fe2358be1c8c5be22e1c244d062eddf6ccd6046d3 +SIZE (xpi/firefox-i18n-61.0/gu-IN.xpi) = 557297 +SHA256 (xpi/firefox-i18n-61.0/he.xpi) = a8274869e11dc27b1733e9598ab316f900075aeba606ae027edfdd8047027729 +SIZE (xpi/firefox-i18n-61.0/he.xpi) = 505556 +SHA256 (xpi/firefox-i18n-61.0/hi-IN.xpi) = 4d10b16402ca6e5112ef3aa0392a695d0237450a3c2dd7a2693e6415a39f7cf5 +SIZE (xpi/firefox-i18n-61.0/hi-IN.xpi) = 559344 +SHA256 (xpi/firefox-i18n-61.0/hr.xpi) = f8a9f1bdce13901a7932fbbef0d54004f5f222e4a0c7372b48f1f3454c8aa178 +SIZE (xpi/firefox-i18n-61.0/hr.xpi) = 486045 +SHA256 (xpi/firefox-i18n-61.0/hsb.xpi) = 84082c615cbb27ab990d2e5a9c18b2ac69750ffc1bcc9b715ee91d3188c786ff +SIZE (xpi/firefox-i18n-61.0/hsb.xpi) = 510217 +SHA256 (xpi/firefox-i18n-61.0/hu.xpi) = 47d2be51c52714acc9caedfc378f5d8170bf0eb94a680d60f9d338cd0ff39e6e +SIZE (xpi/firefox-i18n-61.0/hu.xpi) = 511138 +SHA256 (xpi/firefox-i18n-61.0/hy-AM.xpi) = e0f5638f4f61781ffbdb7c2f500993f7236860a152dc0febc155417f063ddbd6 +SIZE (xpi/firefox-i18n-61.0/hy-AM.xpi) = 537823 +SHA256 (xpi/firefox-i18n-61.0/ia.xpi) = 4aa0ed2456fa982b00b6906c03f36a7de8c17f342a9fbe2a3cdaa275f7ddd7f2 +SIZE (xpi/firefox-i18n-61.0/ia.xpi) = 483841 +SHA256 (xpi/firefox-i18n-61.0/id.xpi) = b1b4f6a9d5bd4b048508973c2f2bc89cf6ec6ffc9216736eba2210281eadba8b +SIZE (xpi/firefox-i18n-61.0/id.xpi) = 476106 +SHA256 (xpi/firefox-i18n-61.0/is.xpi) = 6c72add7fa50eed39dfd3a01bba517804cac7365de4d58c40f1565c0480fb576 +SIZE (xpi/firefox-i18n-61.0/is.xpi) = 482669 +SHA256 (xpi/firefox-i18n-61.0/it.xpi) = d90b3b8da4ae296f8989ebc38a7cbdaf8a7a5bfdb996c867b99accb75c317b46 +SIZE (xpi/firefox-i18n-61.0/it.xpi) = 372491 +SHA256 (xpi/firefox-i18n-61.0/ja.xpi) = bce9e2fc73293dd74f230936df6529cbc3cde88cbb8da4f1caa47ff8b2298bbd +SIZE (xpi/firefox-i18n-61.0/ja.xpi) = 538258 +SHA256 (xpi/firefox-i18n-61.0/ka.xpi) = c4a88b5e33ab3e81334b4f75a4a3582f1b68b0ff6a6ce316f7d6aef20ff3f1d5 +SIZE (xpi/firefox-i18n-61.0/ka.xpi) = 525910 +SHA256 (xpi/firefox-i18n-61.0/kab.xpi) = dd94ef81e523077cf0f4eda7906b124d1aa8931cb4397115c36db6f7c6ecb391 +SIZE (xpi/firefox-i18n-61.0/kab.xpi) = 495569 +SHA256 (xpi/firefox-i18n-61.0/kk.xpi) = c0ae9c06aa45f3a21a97ae1474a8916de9caf64a9ea712e0c09bf48ad35c15d8 +SIZE (xpi/firefox-i18n-61.0/kk.xpi) = 553684 +SHA256 (xpi/firefox-i18n-61.0/km.xpi) = 3faa01bc4800bb5bd02a6c6dc1a22169de2e22838fbf6e8e0375dc7bf6614713 +SIZE (xpi/firefox-i18n-61.0/km.xpi) = 547198 +SHA256 (xpi/firefox-i18n-61.0/kn.xpi) = 0ee074666999e6df54324587ca5db10804d678a17b04691fecb6ad15ad19e37b +SIZE (xpi/firefox-i18n-61.0/kn.xpi) = 552594 +SHA256 (xpi/firefox-i18n-61.0/ko.xpi) = 83909986b09d95772edba3ec8dfe00ffc5e89d4efbd65e2e32b39fa530c71643 +SIZE (xpi/firefox-i18n-61.0/ko.xpi) = 519812 +SHA256 (xpi/firefox-i18n-61.0/lij.xpi) = e6b77c22576bfa8004deb1d5a0d061fe63329cededc3cfb90a52a154120841da +SIZE (xpi/firefox-i18n-61.0/lij.xpi) = 486945 +SHA256 (xpi/firefox-i18n-61.0/lt.xpi) = 7e09fe7d6558758bf0ac7f3e267f8c2b4a2cf298bde35d0f78a8de3a1db3fa65 +SIZE (xpi/firefox-i18n-61.0/lt.xpi) = 509390 +SHA256 (xpi/firefox-i18n-61.0/lv.xpi) = 2372a664eeccf2f6ec098ec77e66324bf78960987cf54a1b9c5da35806c059c1 +SIZE (xpi/firefox-i18n-61.0/lv.xpi) = 497552 +SHA256 (xpi/firefox-i18n-61.0/mai.xpi) = 248610a2c8b97b47d506ae28a182fcd39433fcf9bd8877c02b6d48b06fd05411 +SIZE (xpi/firefox-i18n-61.0/mai.xpi) = 518899 +SHA256 (xpi/firefox-i18n-61.0/mk.xpi) = d6536015b53676148a1ae7c8e486755e434c91e0943ce684619f885418847e2b +SIZE (xpi/firefox-i18n-61.0/mk.xpi) = 480669 +SHA256 (xpi/firefox-i18n-61.0/ml.xpi) = f8fe34b1a8f0644764d1be18961cf67b9e6903929453db3555af96e6b678aef1 +SIZE (xpi/firefox-i18n-61.0/ml.xpi) = 562449 +SHA256 (xpi/firefox-i18n-61.0/mr.xpi) = 9c85c36fab015a00ac8a37967e244732331a93337c819667b55931b148d77e1d +SIZE (xpi/firefox-i18n-61.0/mr.xpi) = 547457 +SHA256 (xpi/firefox-i18n-61.0/ms.xpi) = a30b9825ca7989dec5c79db7b37b71edf3a4a5dcb59841fa67ed23c54cc81d2c +SIZE (xpi/firefox-i18n-61.0/ms.xpi) = 483495 +SHA256 (xpi/firefox-i18n-61.0/my.xpi) = 0c40918cc7753227be7368975be8c3adc22737111c3b70182546ab2d63d85e7f +SIZE (xpi/firefox-i18n-61.0/my.xpi) = 536701 +SHA256 (xpi/firefox-i18n-61.0/nb-NO.xpi) = f8cb8b6085304b4fb71d00bb35b0def3992ef118593d45116167cdd198f9a8b0 +SIZE (xpi/firefox-i18n-61.0/nb-NO.xpi) = 483524 +SHA256 (xpi/firefox-i18n-61.0/ne-NP.xpi) = 9b7b57cb0f43f079f1c8cfe9512c9008d224685dafe2ea6a31315f9e65f58cfa +SIZE (xpi/firefox-i18n-61.0/ne-NP.xpi) = 523515 +SHA256 (xpi/firefox-i18n-61.0/nl.xpi) = 732f670ac95ccea8e723d2ffe45bba10061f577dbf6b0799a54641cd5118def6 +SIZE (xpi/firefox-i18n-61.0/nl.xpi) = 489007 +SHA256 (xpi/firefox-i18n-61.0/nn-NO.xpi) = ca0a7a0134a00bb4c2a7148ed4345f1a631151fed763e25c98507189765eb1dd +SIZE (xpi/firefox-i18n-61.0/nn-NO.xpi) = 483559 +SHA256 (xpi/firefox-i18n-61.0/oc.xpi) = f8430be11eb4327899ef6d512f1bc7fa98ba2db9bb2c042bc2f2cda7ca820924 +SIZE (xpi/firefox-i18n-61.0/oc.xpi) = 499696 +SHA256 (xpi/firefox-i18n-61.0/or.xpi) = 815d53ba74a731711dd851485844c64ab06c76ebb845f593dc915e34b6cd0ec9 +SIZE (xpi/firefox-i18n-61.0/or.xpi) = 508184 +SHA256 (xpi/firefox-i18n-61.0/pa-IN.xpi) = 26fe1b7f2338644ecacc4fa79b58c9695f81268e436927b9632eb3b98fb6b2a7 +SIZE (xpi/firefox-i18n-61.0/pa-IN.xpi) = 524502 +SHA256 (xpi/firefox-i18n-61.0/pl.xpi) = 42774f47652e3b8da96aac130d0b4d7ab4e47d080d1931fa0286ad24e6de7fdd +SIZE (xpi/firefox-i18n-61.0/pl.xpi) = 390903 +SHA256 (xpi/firefox-i18n-61.0/pt-BR.xpi) = bc6b9aa57bdf0e87add7b07215fc9f60c811c9a3063c25b030daebc802b76448 +SIZE (xpi/firefox-i18n-61.0/pt-BR.xpi) = 486001 +SHA256 (xpi/firefox-i18n-61.0/pt-PT.xpi) = a8e55d09ba0049dd83e80307ad6529d4e1e829b7f4e13af009bafa8058340e0b +SIZE (xpi/firefox-i18n-61.0/pt-PT.xpi) = 492103 +SHA256 (xpi/firefox-i18n-61.0/rm.xpi) = 55566c7c5bcb72192033153e41dd046fbe58460d2791240b0d7e84c7c021b3e7 +SIZE (xpi/firefox-i18n-61.0/rm.xpi) = 483850 +SHA256 (xpi/firefox-i18n-61.0/ro.xpi) = 663d073e8e9a1fffe74db40ae3a4c1d8960bc9f70b752c6659c40bb0efd53a0e +SIZE (xpi/firefox-i18n-61.0/ro.xpi) = 486750 +SHA256 (xpi/firefox-i18n-61.0/ru.xpi) = 5914d162d9bc0973268035defa38b2720d94961e0f2abc919964d8e6b6f3cc03 +SIZE (xpi/firefox-i18n-61.0/ru.xpi) = 561624 +SHA256 (xpi/firefox-i18n-61.0/si.xpi) = 3a46f3546f82d97bfe31e95068c827781f0e0d88ee1e083ae87266f722e1fae3 +SIZE (xpi/firefox-i18n-61.0/si.xpi) = 511505 +SHA256 (xpi/firefox-i18n-61.0/sk.xpi) = cf9fd3be1bcbbab92982013f96f8a0bec42f80609f9a4620f550ad7f47c182e0 +SIZE (xpi/firefox-i18n-61.0/sk.xpi) = 514224 +SHA256 (xpi/firefox-i18n-61.0/sl.xpi) = 1ca4a44c6e96e7d7359edebf35cf22808acf45bea206e0d48c834bcc5b391b75 +SIZE (xpi/firefox-i18n-61.0/sl.xpi) = 490321 +SHA256 (xpi/firefox-i18n-61.0/son.xpi) = 8766423e4748facd423ec7026a0f7aee3917ec86ddcecd149e069f9c14ea1990 +SIZE (xpi/firefox-i18n-61.0/son.xpi) = 468634 +SHA256 (xpi/firefox-i18n-61.0/sq.xpi) = 67309f9cc1841b3e9108d7975385127724450ca6c7d79b787c68393d24f4fb72 +SIZE (xpi/firefox-i18n-61.0/sq.xpi) = 496574 +SHA256 (xpi/firefox-i18n-61.0/sr.xpi) = 56cb274163b620e7e662ebe2936c5540dc17ab59038178d887cd36b673b617be +SIZE (xpi/firefox-i18n-61.0/sr.xpi) = 519557 +SHA256 (xpi/firefox-i18n-61.0/sv-SE.xpi) = be9d00b7bc5cd208e30816e3cee6cdfce61b2d9e438a2ae0d11b0583ab5104f6 +SIZE (xpi/firefox-i18n-61.0/sv-SE.xpi) = 491597 +SHA256 (xpi/firefox-i18n-61.0/ta.xpi) = 490ec1b7b8978c07e442e9e57fa3a1ad7d453d670ab5cd2968077cf1c0b7c325 +SIZE (xpi/firefox-i18n-61.0/ta.xpi) = 541874 +SHA256 (xpi/firefox-i18n-61.0/te.xpi) = 7e893fcee8c031a035f8dcd5cdb903b946f83aa5c577f1cb0911fff9753a12ad +SIZE (xpi/firefox-i18n-61.0/te.xpi) = 558639 +SHA256 (xpi/firefox-i18n-61.0/th.xpi) = 86b389a1de8921b158b6bc3fcb090cc1917c07205014089c9ee12a43bccadb08 +SIZE (xpi/firefox-i18n-61.0/th.xpi) = 531116 +SHA256 (xpi/firefox-i18n-61.0/tr.xpi) = e4e2c85df418ce35abb5de49d18abea8f923440c06a88efa5c0e61ffdf7b59da +SIZE (xpi/firefox-i18n-61.0/tr.xpi) = 498510 +SHA256 (xpi/firefox-i18n-61.0/uk.xpi) = a45318b8c3905e0357f6f222f861f14c69b9f9f496ffe3bd99d1b289f97d7f5c +SIZE (xpi/firefox-i18n-61.0/uk.xpi) = 553597 +SHA256 (xpi/firefox-i18n-61.0/ur.xpi) = 6986874021a8e79f46db9695faccf53d99c939ca6d3ea22ec35a07c973836fa8 +SIZE (xpi/firefox-i18n-61.0/ur.xpi) = 531618 +SHA256 (xpi/firefox-i18n-61.0/uz.xpi) = 3dcfb7f9fb9e90578d0c5c56b6494664bcd16da378a81a30443bbe9297434bb6 +SIZE (xpi/firefox-i18n-61.0/uz.xpi) = 482052 +SHA256 (xpi/firefox-i18n-61.0/vi.xpi) = 27f856dd839b20a05b66c37653be78c6bb7a461bba3f25340ad6d007a9500211 +SIZE (xpi/firefox-i18n-61.0/vi.xpi) = 500411 +SHA256 (xpi/firefox-i18n-61.0/xh.xpi) = 553074aefd3b5c747246683754a3f3586734d61654211c6111dc1cc65a7b2793 +SIZE (xpi/firefox-i18n-61.0/xh.xpi) = 481790 +SHA256 (xpi/firefox-i18n-61.0/zh-CN.xpi) = 47de4388fbb67520d95b86dd1daaebb4a3f7fb7877c703c1d4c5b4d08d61614f +SIZE (xpi/firefox-i18n-61.0/zh-CN.xpi) = 514399 +SHA256 (xpi/firefox-i18n-61.0/zh-TW.xpi) = 3b33af36adb7c7c070d066b81203e0ada3bef549db74c06e0d41301a47a2448f +SIZE (xpi/firefox-i18n-61.0/zh-TW.xpi) = 513546 Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Tue Jun 19 00:37:31 2018 (r472726) +++ head/www/firefox/Makefile Tue Jun 19 00:37:43 2018 (r472727) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 60.0.2 +DISTVERSION= 61.0 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -13,7 +13,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.37:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=1.7.6:print/harfbuzz \ @@ -21,7 +21,7 @@ BUILD_DEPENDS= nspr>=4.19:devel/nspr \ png>=1.6.34:graphics/png \ libvorbis>=1.3.6,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ - sqlite3>=3.22.0:databases/sqlite3 \ + sqlite3>=3.23.1:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ @@ -32,7 +32,7 @@ BUILD_DEPENDS= nspr>=4.19:devel/nspr \ USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -cairo -soundtouch +USE_MOZILLA= -cairo -hunspell -soundtouch USE_GL= gl USES= tar:xz @@ -43,7 +43,7 @@ FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILL MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding -OPTIONS_EXCLUDE= BUNDLED_CAIRO +OPTIONS_EXCLUDE= BUNDLED_CAIRO DTRACE .include "${.CURDIR}/../../www/firefox/Makefile.options" Modified: head/www/firefox/distinfo ============================================================================== --- head/www/firefox/distinfo Tue Jun 19 00:37:31 2018 (r472726) +++ head/www/firefox/distinfo Tue Jun 19 00:37:43 2018 (r472727) @@ -1,3 +1,3 @@ -TIMESTAMP = 1528228087 -SHA256 (firefox-60.0.2.source.tar.xz) = 764566a06b71164e7fd20b2b0e6b08a71b4ccd4d6fd61867eb08011a551f6725 -SIZE (firefox-60.0.2.source.tar.xz) = 271930220 +TIMESTAMP = 1529363060 +SHA256 (firefox-61.0.source.tar.xz) = d1219830af3b8b64eace38cc9844bb04bf06537909e9aa1dd7682cb1b2099721 +SIZE (firefox-61.0.source.tar.xz) = 266279484 Modified: head/www/firefox/files/patch-addon-search ============================================================================== --- head/www/firefox/files/patch-addon-search Tue Jun 19 00:37:31 2018 (r472726) +++ head/www/firefox/files/patch-addon-search Tue Jun 19 00:37:43 2018 (r472727) @@ -40,11 +40,11 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644 if (file.url) { addon.sourceURI = NetUtil.newURI(file.url); } -diff --git toolkit/mozapps/extensions/internal/XPIProvider.jsm toolkit/mozapps/extensions/internal/XPIProvider.jsm +diff --git toolkit/mozapps/extensions/internal/XPIDatabase.jsm toolkit/mozapps/extensions/internal/XPIDatabase.jsm index f70fd8d7e3bd8..81e8cd7764fdf 100644 ---- toolkit/mozapps/extensions/internal/XPIProvider.jsm -+++ toolkit/mozapps/extensions/internal/XPIProvider.jsm -@@ -4974,7 +4974,7 @@ AddonInternal.prototype = { +--- toolkit/mozapps/extensions/internal/XPIDatabase.jsm ++++ toolkit/mozapps/extensions/internal/XPIDatabase.jsm +@@ -355,7 +355,7 @@ class AddonInternal { // Something is causing errors in here try { for (let platform of this.targetPlatforms) { Modified: head/www/firefox/files/patch-bug1021761 ============================================================================== --- head/www/firefox/files/patch-bug1021761 Tue Jun 19 00:37:31 2018 (r472726) +++ head/www/firefox/files/patch-bug1021761 Tue Jun 19 00:37:43 2018 (r472727) @@ -689,7 +689,7 @@ new file mode 100644 index 000000000000..7d96168b9ea6 --- /dev/null +++ media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,454 @@ +@@ -0,0 +1,453 @@ +/* + * Copyright © 2014 Mozilla Foundation + * @@ -1126,7 +1126,6 @@ index 000000000000..7d96168b9ea6 + .get_max_channel_count = oss_get_max_channel_count, + .get_min_latency = oss_get_min_latency, + .get_preferred_sample_rate = oss_get_preferred_sample_rate, -+ .get_preferred_channel_layout = NULL, + .enumerate_devices = NULL, + .device_collection_destroy = NULL, + .destroy = oss_destroy, @@ -1161,10 +1160,10 @@ index e1fea30ca417..a5b1100f1014 100644 if CONFIG['MOZ_PULSEAUDIO'] or CONFIG['MOZ_JACK']: SOURCES += [ 'cubeb_resampler.cpp', -@@ -88,6 +94,7 @@ if CONFIG['OS_TARGET'] == 'Android': - FINAL_LIBRARY = 'gkmedias' +@@ -89,6 +95,7 @@ FINAL_LIBRARY = 'gkmedias' CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] + CFLAGS += CONFIG['MOZ_JACK_CFLAGS'] +CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] @@ -1250,9 +1249,9 @@ index 28e1a9e48d61..edacedcf6e5d 100644 +AC_SUBST_LIST(MOZ_OSS_CFLAGS) +AC_SUBST_LIST(MOZ_OSS_LIBS) + - dnl ================================== - dnl = Check alsa availability on Linux - dnl ================================== + dnl ======================================================== + dnl NegotiateAuth + dnl ======================================================== diff --git toolkit/library/moz.build toolkit/library/moz.build index e06592daa265..ce016b96c2bc 100644 --- toolkit/library/moz.build Modified: head/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp ============================================================================== --- head/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp Tue Jun 19 00:37:31 2018 (r472726) +++ head/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp Tue Jun 19 00:37:43 2018 (r472727) @@ -7,7 +7,7 @@ index 53fc3c9937f7..b23771ab80fa 100644 @@ -7,6 +7,7 @@ #include "FlacDecoder.h" #include "MediaContainerType.h" - #include "MediaPrefs.h" + #include "mozilla/StaticPrefs.h" +#include "PDMFactory.h" namespace mozilla { @@ -15,10 +15,10 @@ index 53fc3c9937f7..b23771ab80fa 100644 @@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() { #ifdef MOZ_FFVPX - return MediaPrefs::FlacEnabled(); + return StaticPrefs::MediaFlacEnabled(); +#elif defined(MOZ_FFMPEG) + RefPtr<PDMFactory> platform = new PDMFactory(); -+ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), ++ return StaticPrefs::MediaFlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), + /* DecoderDoctorDiagnostics* */ nullptr); #else // Until bug 1295886 is fixed. Modified: head/www/firefox/files/patch-u2f-hid-rs62 ============================================================================== --- head/www/firefox/files/patch-u2f-hid-rs62 Tue Jun 19 00:37:31 2018 (r472726) +++ head/www/firefox/files/patch-u2f-hid-rs62 Tue Jun 19 00:37:43 2018 (r472727) @@ -4,7 +4,7 @@ diff --git Cargo.lock Cargo.lock index 4bfba0eb2f52..cd4d80035d81 100644 --- Cargo.lock +++ Cargo.lock -@@ -486,6 +486,15 @@ dependencies = [ +@@ -552,6 +552,15 @@ dependencies = [ "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -13,14 +13,14 @@ index 4bfba0eb2f52..cd4d80035d81 100644 +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", + "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] - name = "dtoa" - version = "0.4.2" -@@ -1170,6 +1179,14 @@ name = "nom" + name = "diff" + version = "0.1.11" +@@ -1351,6 +1360,14 @@ name = "nom" version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -35,23 +35,23 @@ index 4bfba0eb2f52..cd4d80035d81 100644 [[package]] name = "nserror" version = "0.1.0" -@@ -1863,6 +1880,7 @@ dependencies = [ +@@ -2126,6 +2143,7 @@ dependencies = [ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "boxfnonce 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "devd-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "libudev 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -2220,6 +2238,7 @@ dependencies = [ + "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -2511,6 +2529,7 @@ dependencies = [ "checksum darling_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "167dd3e235c2f1da16a635c282630452cdf49191eb05711de1bcd1d3d5068c00" "checksum darling_macro 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c53edaba455f6073a10c27c72440860eb3f60444f8c8660a391032eeae744d82" "checksum debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3" +"checksum devd-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e7c9ac481c38baf400d3b732e4a06850dfaa491d1b6379a249d9d40d14c2434c" + "checksum diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a" + "checksum docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d8acd393692c503b168471874953a2531df0e9ab77d0b6bbc582395743300a4a" "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab" - "checksum dtoa-short 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "068d4026697c1a18f0b0bb8cfcad1b0c151b90d8edb9bf4c235ad68128920d1d" - "checksum dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a207eb7b40e25d1d28dc679f451d321fb6954b73ceaa47986702575865469461" -@@ -2279,6 +2298,7 @@ dependencies = [ +@@ -2581,6 +2600,7 @@ dependencies = [ "checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09" "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" "checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" @@ -73,14 +73,6 @@ index a0ab8ce71067..046de1e46f15 100644 [target.'cfg(target_os = "macos")'.dependencies] core-foundation-sys = "0.5.1" -@@ -21,6 +24,6 @@ runloop = "0.1.0" - bitflags = "1.0" - - [dev-dependencies] --rust-crypto = "^0.2" -+sha2 = "^0.7" - base64 = "^0.4" - env_logger = "0.4.1" diff --git dom/webauthn/u2f-hid-rs/README.md dom/webauthn/u2f-hid-rs/README.md index 2edf412211b5..a29905832e5e 100644 --- dom/webauthn/u2f-hid-rs/README.md @@ -94,61 +86,6 @@ index 2edf412211b5..a29905832e5e 100644 * **Supported HID Transports**: USB. * **Supported Protocols**: [FIDO U2F over USB](https://fidoalliance.org/specs/fido-u2f-v1.1-id-20160915/fido-u2f-raw-message-formats-v1.1-id-20160915.html). -diff --git dom/webauthn/u2f-hid-rs/examples/main.rs dom/webauthn/u2f-hid-rs/examples/main.rs -index d0b02e61a05b..8ecf102f2136 100644 ---- dom/webauthn/u2f-hid-rs/examples/main.rs -+++ dom/webauthn/u2f-hid-rs/examples/main.rs -@@ -3,10 +3,9 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - extern crate base64; --extern crate crypto; -+extern crate sha2; - extern crate u2fhid; --use crypto::digest::Digest; --use crypto::sha2::Sha256; -+use sha2::{Digest, Sha256}; - use std::io; - use std::sync::mpsc::channel; - use u2fhid::{AuthenticatorTransports, KeyHandle, RegisterFlags, SignFlags, U2FManager}; -@@ -17,10 +16,12 @@ extern crate log; - macro_rules! try_or { - ($val:expr, $or:expr) => { - match $val { -- Ok(v) => { v } -- Err(e) => { return $or(e); } -+ Ok(v) => v, -+ Err(e) => { -+ return $or(e); -+ } - } -- } -+ }; - } - - fn u2f_get_key_handle_from_register_response(register_response: &Vec<u8>) -> io::Result<Vec<u8>> { -@@ -46,15 +47,13 @@ fn main() { - let challenge_str = format!("{}{}", - r#"{"challenge": "1vQ9mxionq0ngCnjD-wTsv1zUSrGRtFqG2xP09SbZ70","#, - r#" "version": "U2F_V2", "appId": "http://demo.yubico.com"}"#); -- let mut challenge = Sha256::new(); -- challenge.input_str(&challenge_str); -- let mut chall_bytes: Vec<u8> = vec![0; challenge.output_bytes()]; -- challenge.result(&mut chall_bytes); -+ let mut challenge = Sha256::default(); -+ challenge.input(challenge_str.as_bytes()); -+ let chall_bytes = Vec::from(challenge.result().as_slice()); - -- let mut application = Sha256::new(); -- application.input_str("http://demo.yubico.com"); -- let mut app_bytes: Vec<u8> = vec![0; application.output_bytes()]; -- application.result(&mut app_bytes); -+ let mut application = Sha256::default(); -+ application.input("http://demo.yubico.com".as_bytes()); -+ let app_bytes = Vec::from(application.result().as_slice()); - - let manager = U2FManager::new().unwrap(); - let flags = RegisterFlags::empty(); diff --git dom/webauthn/u2f-hid-rs/src/freebsd/device.rs dom/webauthn/u2f-hid-rs/src/freebsd/device.rs new file mode 100644 index 000000000000..5b9e7f2a912e @@ -756,42 +693,6 @@ index 1307497e91ac..e0cdc5080924 100644 #[path = "stub/mod.rs"] pub mod platform; -@@ -39,8 +51,8 @@ extern crate bitflags; - - mod consts; - mod statemachine; --mod u2ftypes; - mod u2fprotocol; -+mod u2ftypes; - - mod manager; - pub use manager::U2FManager; -@@ -88,9 +100,9 @@ pub enum Error { - NotAllowed = 5, - } - -+#[cfg(fuzzing)] -+pub use consts::*; - #[cfg(fuzzing)] - pub use u2fprotocol::*; - #[cfg(fuzzing)] - pub use u2ftypes::*; --#[cfg(fuzzing)] --pub use consts::*; -diff --git dom/webauthn/u2f-hid-rs/src/linux/device.rs dom/webauthn/u2f-hid-rs/src/linux/device.rs -index 6ed57106920f..35569f88a190 100644 ---- dom/webauthn/u2f-hid-rs/src/linux/device.rs -+++ dom/webauthn/u2f-hid-rs/src/linux/device.rs -@@ -11,8 +11,8 @@ use std::os::unix::prelude::*; - - use consts::CID_BROADCAST; - use platform::hidraw; --use util::from_unix_result; - use u2ftypes::U2FDevice; -+use util::from_unix_result; - - #[derive(Debug)] - pub struct Device { diff --git dom/webauthn/u2f-hid-rs/src/linux/hidraw.rs dom/webauthn/u2f-hid-rs/src/linux/hidraw.rs index 0ce5d379c3f7..182fe0ec5f2e 100644 --- dom/webauthn/u2f-hid-rs/src/linux/hidraw.rs @@ -821,7 +722,7 @@ index 0ce5d379c3f7..182fe0ec5f2e 100644 const NRBITS: u32 = 8; const TYPEBITS: u32 = 8; -@@ -35,28 +29,15 @@ const TYPESHIFT: u32 = NRSHIFT + NRBITS as u32; +@@ -35,17 +29,6 @@ const TYPESHIFT: u32 = NRSHIFT + NRBITS as u32; const SIZESHIFT: u32 = TYPESHIFT + TYPEBITS as u32; const DIRSHIFT: u32 = SIZESHIFT + SIZEBITS as u32; @@ -839,28 +740,8 @@ index 0ce5d379c3f7..182fe0ec5f2e 100644 // https://github.com/torvalds/linux/blob/master/include/uapi/linux/hid.h const HID_MAX_DESCRIPTOR_SIZE: usize = 4096; - macro_rules! ioctl { -- ($dir:expr, $name:ident, $ioty:expr, $nr:expr; $ty:ty) => ( -+ ($dir:expr, $name:ident, $ioty:expr, $nr:expr; $ty:ty) => { - pub unsafe fn $name(fd: libc::c_int, val: *mut $ty) -> io::Result<libc::c_int> { - let size = mem::size_of::<$ty>(); -- let ioc = (($dir as u32) << DIRSHIFT) | -- (($ioty as u32) << TYPESHIFT) | -- (($nr as u32) << NRSHIFT) | -- ((size as u32) << SIZESHIFT); -+ let ioc = (($dir as u32) << DIRSHIFT) | (($ioty as u32) << TYPESHIFT) -+ | (($nr as u32) << NRSHIFT) | ((size as u32) << SIZESHIFT); +@@ -68,115 +51,7 @@ macro_rules! ioctl { - #[cfg(not(target_env = "musl"))] - type IocType = libc::c_ulong; -@@ -65,120 +46,12 @@ macro_rules! ioctl { - - from_unix_result(libc::ioctl(fd, ioc as IocType, val)) - } -- ); -+ }; - } - // https://github.com/torvalds/linux/blob/master/include/uapi/linux/hidraw.h ioctl!(READ, hidiocgrdescsize, b'H', 0x01; ::libc::c_int); -ioctl!(READ, hidiocgrdesc, b'H', 0x02; /*struct*/ ReportDescriptor); @@ -1013,126 +894,10 @@ index 0ce5d379c3f7..182fe0ec5f2e 100644 + value.truncate(desc.size as usize); + Ok(ReportDescriptor { value }) } -diff --git dom/webauthn/u2f-hid-rs/src/linux/monitor.rs dom/webauthn/u2f-hid-rs/src/linux/monitor.rs -index 47c376ba9176..408ea4b7b9ad 100644 ---- dom/webauthn/u2f-hid-rs/src/linux/monitor.rs -+++ dom/webauthn/u2f-hid-rs/src/linux/monitor.rs -@@ -65,13 +65,11 @@ where - - // Start listening for new devices. - let mut socket = monitor.listen()?; -- let mut fds = vec![ -- ::libc::pollfd { -- fd: socket.as_raw_fd(), -- events: POLLIN, -- revents: 0, -- }, -- ]; -+ let mut fds = vec![::libc::pollfd { -+ fd: socket.as_raw_fd(), -+ events: POLLIN, -+ revents: 0, -+ }]; - - while alive() { - // Wait for new events, break on failure. -diff --git dom/webauthn/u2f-hid-rs/src/macos/iokit.rs dom/webauthn/u2f-hid-rs/src/macos/iokit.rs -index 7e550af2a445..79e53599004e 100644 ---- dom/webauthn/u2f-hid-rs/src/macos/iokit.rs -+++ dom/webauthn/u2f-hid-rs/src/macos/iokit.rs -@@ -282,13 +282,13 @@ extern "C" { - - #[cfg(test)] - mod tests { -+ use super::*; - use core_foundation_sys::base::*; - use core_foundation_sys::runloop::*; - use libc::c_void; - use std::ptr; - use std::sync::mpsc::{channel, Sender}; - use std::thread; -- use super::*; - - extern "C" fn observe(_: CFRunLoopObserverRef, _: CFRunLoopActivity, context: *mut c_void) { - let tx: &Sender<SendableRunLoop> = unsafe { &*(context as *mut _) }; -diff --git dom/webauthn/u2f-hid-rs/src/macos/monitor.rs dom/webauthn/u2f-hid-rs/src/macos/monitor.rs -index c346fe5eff57..b971ed885d18 100644 ---- dom/webauthn/u2f-hid-rs/src/macos/monitor.rs -+++ dom/webauthn/u2f-hid-rs/src/macos/monitor.rs -@@ -10,9 +10,9 @@ use core_foundation_sys::runloop::*; - use libc::c_void; - use platform::iokit::*; - use runloop::RunLoop; --use std::{io, slice}; - use std::collections::HashMap; - use std::sync::mpsc::{channel, Receiver, Sender}; -+use std::{io, slice}; - use util::io_err; - - struct DeviceData { -diff --git dom/webauthn/u2f-hid-rs/src/manager.rs dom/webauthn/u2f-hid-rs/src/manager.rs -index c9f92bdbfad5..ca8b80a9584a 100644 ---- dom/webauthn/u2f-hid-rs/src/manager.rs -+++ dom/webauthn/u2f-hid-rs/src/manager.rs -@@ -7,8 +7,8 @@ use std::sync::mpsc::{channel, RecvTimeoutError, Sender}; - use std::time::Duration; - - use consts::PARAMETER_SIZE; --use statemachine::StateMachine; - use runloop::RunLoop; -+use statemachine::StateMachine; - use util::OnceCallback; - - enum QueueAction { -diff --git dom/webauthn/u2f-hid-rs/src/statemachine.rs dom/webauthn/u2f-hid-rs/src/statemachine.rs -index 8e4abaa7cf02..55e7d36155a3 100644 ---- dom/webauthn/u2f-hid-rs/src/statemachine.rs -+++ dom/webauthn/u2f-hid-rs/src/statemachine.rs -@@ -7,8 +7,8 @@ use platform::device::Device; - use platform::transaction::Transaction; - use std::thread; - use std::time::Duration; --use util::OnceCallback; - use u2fprotocol::{u2f_init_device, u2f_is_keyhandle_valid, u2f_register, u2f_sign}; -+use util::OnceCallback; - - fn is_valid_transport(transports: ::AuthenticatorTransports) -> bool { - transports.is_empty() || transports.contains(::AuthenticatorTransports::USB) -diff --git dom/webauthn/u2f-hid-rs/src/u2fprotocol.rs dom/webauthn/u2f-hid-rs/src/u2fprotocol.rs -index 4d6737b1289e..0b984407d873 100644 ---- dom/webauthn/u2f-hid-rs/src/u2fprotocol.rs -+++ dom/webauthn/u2f-hid-rs/src/u2fprotocol.rs -@@ -5,9 +5,9 @@ - extern crate std; - - use rand::{thread_rng, Rng}; -+use std::ffi::CString; - use std::io; - use std::io::{Read, Write}; --use std::ffi::CString; - - use consts::*; - use u2ftypes::*; diff --git dom/webauthn/u2f-hid-rs/src/util.rs dom/webauthn/u2f-hid-rs/src/util.rs index 27db864e2fcd..770e166d57d2 100644 --- dom/webauthn/u2f-hid-rs/src/util.rs +++ dom/webauthn/u2f-hid-rs/src/util.rs -@@ -12,10 +12,12 @@ use boxfnonce::SendBoxFnOnce; - macro_rules! try_or { - ($val:expr, $or:expr) => { - match $val { -- Ok(v) => { v } -- Err(e) => { return $or(e); } -+ Ok(v) => v, -+ Err(e) => { -+ return $or(e); -+ } - } -- } -+ }; - } - - pub trait Signed { @@ -44,6 +46,16 @@ pub fn from_unix_result<T: Signed>(rv: T) -> io::Result<T> { } } @@ -1150,33 +915,6 @@ index 27db864e2fcd..770e166d57d2 100644 pub fn io_err(msg: &str) -> io::Error { io::Error::new(io::ErrorKind::Other, msg) } -diff --git dom/webauthn/u2f-hid-rs/src/windows/device.rs dom/webauthn/u2f-hid-rs/src/windows/device.rs -index cbbe2811d672..5579cc052a6f 100644 ---- dom/webauthn/u2f-hid-rs/src/windows/device.rs -+++ dom/webauthn/u2f-hid-rs/src/windows/device.rs -@@ -7,8 +7,8 @@ use std::io; - use std::io::{Read, Write}; - use std::os::windows::io::AsRawHandle; - --use consts::{FIDO_USAGE_U2FHID, CID_BROADCAST, FIDO_USAGE_PAGE, HID_RPT_SIZE}; - use super::winapi::DeviceCapabilities; -+use consts::{FIDO_USAGE_U2FHID, CID_BROADCAST, FIDO_USAGE_PAGE, HID_RPT_SIZE}; - - use u2ftypes::U2FDevice; - -diff --git dom/webauthn/u2f-hid-rs/src/windows/winapi.rs dom/webauthn/u2f-hid-rs/src/windows/winapi.rs -index 18c6898e86ee..bd8a7e58d06a 100644 ---- dom/webauthn/u2f-hid-rs/src/windows/winapi.rs -+++ dom/webauthn/u2f-hid-rs/src/windows/winapi.rs -@@ -60,7 +60,7 @@ extern "stdcall" { - macro_rules! offset_of { - ($ty:ty, $field:ident) => { - unsafe { &(*(0 as *const $ty)).$field as *const _ as usize } -- } -+ }; - } - - fn from_wide_ptr(ptr: *const u16, len: usize) -> String { diff --git third_party/rust/devd-rs/.cargo-checksum.json third_party/rust/devd-rs/.cargo-checksum.json new file mode 100644 index 000000000000..7f8c6af3141e Modified: head/www/firefox/files/patch-z-bug517422 ============================================================================== --- head/www/firefox/files/patch-z-bug517422 Tue Jun 19 00:37:31 2018 (r472726) +++ head/www/firefox/files/patch-z-bug517422 Tue Jun 19 00:37:43 2018 (r472727) @@ -132,10 +132,10 @@ diff --git dom/media/AudioStream.h dom/media/AudioStre index 7dc1f60f95cc..67d402a4117f 100644 --- dom/media/AudioStream.h +++ dom/media/AudioStream.h -@@ -15,7 +15,11 @@ - #include "mozilla/TimeStamp.h" - #include "mozilla/UniquePtr.h" - #include "CubebUtils.h" +@@ -16,7 +16,11 @@ + #include "nsAutoPtr.h" + #include "nsCOMPtr.h" + #include "nsThreadUtils.h" +#ifdef MOZ_SYSTEM_SOUNDTOUCH +#include "soundtouch/SoundTouch.h" +#else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806190037.w5J0bhPE087870>