Date: Mon, 25 Jun 2018 22:36:13 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r473354 - in branches/2018Q2: Mk Mk/Uses www/firefox www/firefox-i18n www/firefox/files Message-ID: <201806252236.w5PMaDZV069524@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Jun 25 22:36:12 2018 New Revision: 473354 URL: https://svnweb.freebsd.org/changeset/ports/473354 Log: MFH: r468159 r472727 r472730 r473076 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 Approved by: ports-secteam blanket Differential Revision: https://reviews.freebsd.org/D15227 Deleted: branches/2018Q2/www/firefox/files/patch-bug1375074 branches/2018Q2/www/firefox/files/patch-bug1411481 branches/2018Q2/www/firefox/files/patch-bug1438678 branches/2018Q2/www/firefox/files/patch-bug1442583 branches/2018Q2/www/firefox/files/patch-bug1444798 branches/2018Q2/www/firefox/files/patch-bug1445907 branches/2018Q2/www/firefox/files/patch-bug1447359 branches/2018Q2/www/firefox/files/patch-bug1451292 branches/2018Q2/www/firefox/files/patch-bug1456556 branches/2018Q2/www/firefox/files/patch-bug702179 branches/2018Q2/www/firefox/files/patch-z-bug1436911 Modified: branches/2018Q2/Mk/Uses/gecko.mk branches/2018Q2/Mk/bsd.gecko.mk branches/2018Q2/www/firefox-i18n/Makefile branches/2018Q2/www/firefox-i18n/distinfo branches/2018Q2/www/firefox/Makefile branches/2018Q2/www/firefox/distinfo branches/2018Q2/www/firefox/files/patch-addon-search branches/2018Q2/www/firefox/files/patch-bug1021761 branches/2018Q2/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp branches/2018Q2/www/firefox/files/patch-u2f-hid-rs62 branches/2018Q2/www/firefox/files/patch-z-bug517422 Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/Mk/Uses/gecko.mk ============================================================================== --- branches/2018Q2/Mk/Uses/gecko.mk Mon Jun 25 22:00:36 2018 (r473353) +++ branches/2018Q2/Mk/Uses/gecko.mk Mon Jun 25 22:36:12 2018 (r473354) @@ -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!= ${LOCALBASE}/bin/firefox --version 2>/dev/null Modified: branches/2018Q2/Mk/bsd.gecko.mk ============================================================================== --- branches/2018Q2/Mk/bsd.gecko.mk Mon Jun 25 22:00:36 2018 (r473353) +++ branches/2018Q2/Mk/bsd.gecko.mk Mon Jun 25 22:36:12 2018 (r473354) @@ -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: branches/2018Q2/www/firefox-i18n/Makefile ============================================================================== --- branches/2018Q2/www/firefox-i18n/Makefile Mon Jun 25 22:00:36 2018 (r473353) +++ branches/2018Q2/www/firefox-i18n/Makefile Mon Jun 25 22:36:12 2018 (r473354) @@ -2,10 +2,11 @@ # $FreeBSD$ PORTNAME= firefox-i18n -PORTVERSION= 60.0.2 +PORTVERSION= 61.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build3/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} @@ -15,7 +16,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: branches/2018Q2/www/firefox-i18n/distinfo ============================================================================== --- branches/2018Q2/www/firefox-i18n/distinfo Mon Jun 25 22:00:36 2018 (r473353) +++ branches/2018Q2/www/firefox-i18n/distinfo Mon Jun 25 22:36:12 2018 (r473354) @@ -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 = 1529611471 +SHA256 (xpi/firefox-i18n-61.0/ach.xpi) = 81376263077a639a0df7dc4f160354043298590782ea7d70c42a789df50f1a32 +SIZE (xpi/firefox-i18n-61.0/ach.xpi) = 468310 +SHA256 (xpi/firefox-i18n-61.0/af.xpi) = 84340ef11e67bae138d932fdcce967affa5966a0c5ab01f2cc03d6f68298f2aa +SIZE (xpi/firefox-i18n-61.0/af.xpi) = 458272 +SHA256 (xpi/firefox-i18n-61.0/an.xpi) = 7493be648f7def011e18f6c75290c6def9fac3f3ab4950b4b12b588e212f4a77 +SIZE (xpi/firefox-i18n-61.0/an.xpi) = 492775 +SHA256 (xpi/firefox-i18n-61.0/ar.xpi) = ea4596b8811ae7e7f59f501cb3227232812bd53f3def103ad2bf549cb79d2abb +SIZE (xpi/firefox-i18n-61.0/ar.xpi) = 514910 +SHA256 (xpi/firefox-i18n-61.0/as.xpi) = 4540af01013705c0aea6741a0e213f4874afcb14e34e90a150b19c94e38bfe0a +SIZE (xpi/firefox-i18n-61.0/as.xpi) = 498320 +SHA256 (xpi/firefox-i18n-61.0/ast.xpi) = 6d18813b2e05fe16f66f9f0c82a8e08a3a6fa2890be393c80c301110dd81d800 +SIZE (xpi/firefox-i18n-61.0/ast.xpi) = 478587 +SHA256 (xpi/firefox-i18n-61.0/az.xpi) = e7c42a5364a722e5f6f2351a038ff8c6d70742da71669019810d5537d36f0e39 +SIZE (xpi/firefox-i18n-61.0/az.xpi) = 494290 +SHA256 (xpi/firefox-i18n-61.0/be.xpi) = 0ebf8acad8a81680c135a3c5e2a323cba2207e13edeff400305e492f2c24fe05 +SIZE (xpi/firefox-i18n-61.0/be.xpi) = 550840 +SHA256 (xpi/firefox-i18n-61.0/bg.xpi) = 4ece264c89c8255c74bf65c6a5d25a44af37609e25cc64217c21179accdeaffc +SIZE (xpi/firefox-i18n-61.0/bg.xpi) = 541823 +SHA256 (xpi/firefox-i18n-61.0/bn-BD.xpi) = 8357eee0afe8a67521b2273ef931bf216b06aa3b47add5a11534727080b8cbea +SIZE (xpi/firefox-i18n-61.0/bn-BD.xpi) = 556536 +SHA256 (xpi/firefox-i18n-61.0/bn-IN.xpi) = dce2996cd26162637f4f9a7a8bca61e8d4b8499175231da3580a482c66b91b4c +SIZE (xpi/firefox-i18n-61.0/bn-IN.xpi) = 535412 +SHA256 (xpi/firefox-i18n-61.0/br.xpi) = 338862ca53012668fd5da30e81ae15f4f9255731110ef3c844154b71e3e8931b +SIZE (xpi/firefox-i18n-61.0/br.xpi) = 486576 +SHA256 (xpi/firefox-i18n-61.0/bs.xpi) = da9600f62ef968b429a5d437e48f84308ced217516a3b80949e396b09bd155d5 +SIZE (xpi/firefox-i18n-61.0/bs.xpi) = 489134 +SHA256 (xpi/firefox-i18n-61.0/ca.xpi) = 2afdf45e104400f8c154aeaef8b6099f06fa1ee00cd77353422b8782c80493d5 +SIZE (xpi/firefox-i18n-61.0/ca.xpi) = 497520 +SHA256 (xpi/firefox-i18n-61.0/cak.xpi) = 2dae7c9fbff7b95e02246020518f044c97efdb25264523041fc305bc515dd787 +SIZE (xpi/firefox-i18n-61.0/cak.xpi) = 509328 +SHA256 (xpi/firefox-i18n-61.0/cs.xpi) = 859aeb9a8927fb6dbc5a29a91492989bc5a60204fbc3f8f01ad2009f89d636f9 +SIZE (xpi/firefox-i18n-61.0/cs.xpi) = 502598 +SHA256 (xpi/firefox-i18n-61.0/cy.xpi) = 6769521271903468ecd9065b418646c32cb36b617b4f628bcbd6d6e72081b879 +SIZE (xpi/firefox-i18n-61.0/cy.xpi) = 490416 +SHA256 (xpi/firefox-i18n-61.0/da.xpi) = da9c71cc15f0fbbb272500aba824ac485fcde321e969b50e533dd71b2c5f89d6 +SIZE (xpi/firefox-i18n-61.0/da.xpi) = 483618 +SHA256 (xpi/firefox-i18n-61.0/de.xpi) = da95616a965a18506033d090ea51cd5875114523ba66587ea8d9e4ca06182e1a +SIZE (xpi/firefox-i18n-61.0/de.xpi) = 502283 +SHA256 (xpi/firefox-i18n-61.0/dsb.xpi) = 4522ccd3e85a2a6c8d823ff598c4d2cf1161ad3e51d15fd93b0a5d114eec5b45 +SIZE (xpi/firefox-i18n-61.0/dsb.xpi) = 512451 +SHA256 (xpi/firefox-i18n-61.0/el.xpi) = b87c388daaac4a811a82ff1e1318f4655e9ba80798ba82c00bc5eb813ace1556 +SIZE (xpi/firefox-i18n-61.0/el.xpi) = 559691 +SHA256 (xpi/firefox-i18n-61.0/en-GB.xpi) = c4dde8f507afcbd75466d1d16049227b5b8889e5713607c728f1ba914b0a808e +SIZE (xpi/firefox-i18n-61.0/en-GB.xpi) = 464875 +SHA256 (xpi/firefox-i18n-61.0/en-US.xpi) = ca833b1e4bf09a9876394daa81a49f3b314accd9a0491266beefed7c61479be7 +SIZE (xpi/firefox-i18n-61.0/en-US.xpi) = 456419 +SHA256 (xpi/firefox-i18n-61.0/en-ZA.xpi) = f703ceee50033cbabaad718fbb0740e569e73f61ddc1df6394a458e084864fb2 +SIZE (xpi/firefox-i18n-61.0/en-ZA.xpi) = 446640 +SHA256 (xpi/firefox-i18n-61.0/eo.xpi) = df73ab6175e45dc0b17b735ce299bcb6702b1b61aa3fdf5f37b59394ef171447 +SIZE (xpi/firefox-i18n-61.0/eo.xpi) = 484754 +SHA256 (xpi/firefox-i18n-61.0/es-AR.xpi) = d1724db8da185cad11a8809f3ef77876818eef8ad3231e84018461ef1b874134 +SIZE (xpi/firefox-i18n-61.0/es-AR.xpi) = 498191 +SHA256 (xpi/firefox-i18n-61.0/es-CL.xpi) = d1cf80c4cf7a1acd1f5cdac6ebb9510e23653370bea12e1db6e5c5e60bb41605 +SIZE (xpi/firefox-i18n-61.0/es-CL.xpi) = 500855 +SHA256 (xpi/firefox-i18n-61.0/es-ES.xpi) = a0ab6bc595321debd89c552873d02ffbe52da1e2e23fb0bf9e7ed6c78bf03054 +SIZE (xpi/firefox-i18n-61.0/es-ES.xpi) = 435902 +SHA256 (xpi/firefox-i18n-61.0/es-MX.xpi) = 22b801bc0b8a9df2da8db24a631927f1a7811c39fa20d2f8411312c3e302e566 +SIZE (xpi/firefox-i18n-61.0/es-MX.xpi) = 500950 +SHA256 (xpi/firefox-i18n-61.0/et.xpi) = e4475907568d860b7a22c9e5bac2cb0b8eccb554969dc0302999b2bd3ccc51ea +SIZE (xpi/firefox-i18n-61.0/et.xpi) = 477548 +SHA256 (xpi/firefox-i18n-61.0/eu.xpi) = 0c4571b60b88b12f61fdc05f14b6f1b8f45b52287cb9eac8ab963562a7d958ef +SIZE (xpi/firefox-i18n-61.0/eu.xpi) = 488816 +SHA256 (xpi/firefox-i18n-61.0/fa.xpi) = 01facb4effc8c42f898f0e1f76c2ca73e04b4ec506f6837a4572df0195de54fc +SIZE (xpi/firefox-i18n-61.0/fa.xpi) = 537569 +SHA256 (xpi/firefox-i18n-61.0/ff.xpi) = cbb3fbd66dd978a48e206b8c346b04ad444f67afb596846295057d21e36282cd +SIZE (xpi/firefox-i18n-61.0/ff.xpi) = 483849 +SHA256 (xpi/firefox-i18n-61.0/fi.xpi) = 1276c23a9a6f10b7c4aac59c9e491970e195df109a5de36ebc60cf94915e2780 +SIZE (xpi/firefox-i18n-61.0/fi.xpi) = 479928 +SHA256 (xpi/firefox-i18n-61.0/fr.xpi) = db066b4e73c962aaeb3c8756d30e929d333b1aa67c313c9851e09b841895835e +SIZE (xpi/firefox-i18n-61.0/fr.xpi) = 507141 +SHA256 (xpi/firefox-i18n-61.0/fy-NL.xpi) = 05cd67ee6422fe7ed089541d90f73a3baf88fa8e9653bf2eb1de4f60d3442112 +SIZE (xpi/firefox-i18n-61.0/fy-NL.xpi) = 497986 +SHA256 (xpi/firefox-i18n-61.0/ga-IE.xpi) = 54438b167939fcf94622f98190d13c8a3fd77aec22cbf087223b434452315e7f +SIZE (xpi/firefox-i18n-61.0/ga-IE.xpi) = 495804 +SHA256 (xpi/firefox-i18n-61.0/gd.xpi) = 392b336d0494d5e364c31e12042eda32627ef40b77930602de4c1d306a1aa0d3 +SIZE (xpi/firefox-i18n-61.0/gd.xpi) = 497600 +SHA256 (xpi/firefox-i18n-61.0/gl.xpi) = ce90b2726134c1f4de19e0238dc23b110ad20065f216a33498f282c94657ec12 +SIZE (xpi/firefox-i18n-61.0/gl.xpi) = 471910 +SHA256 (xpi/firefox-i18n-61.0/gn.xpi) = c21270be60c8300c5975bea228d5941504cc8d81757b5392d11b90c0ca353750 +SIZE (xpi/firefox-i18n-61.0/gn.xpi) = 506405 +SHA256 (xpi/firefox-i18n-61.0/gu-IN.xpi) = ef4d075fc8b462b1fd7a0aee53432614e521421f52cd0e90cbbe88ea8e39421b +SIZE (xpi/firefox-i18n-61.0/gu-IN.xpi) = 557292 +SHA256 (xpi/firefox-i18n-61.0/he.xpi) = dce20732f2e5dfba243a9bf96c1956c3a0449fd81f4cacc43c350db32fabc96f +SIZE (xpi/firefox-i18n-61.0/he.xpi) = 505560 +SHA256 (xpi/firefox-i18n-61.0/hi-IN.xpi) = 1b8d7033480b6c2bffec3ce76c073a85142eca8ee6f9ede547207ca33d8f55a9 +SIZE (xpi/firefox-i18n-61.0/hi-IN.xpi) = 559344 +SHA256 (xpi/firefox-i18n-61.0/hr.xpi) = a8a99bd1415e01764e4f317701f4e09377276da6db93e10e6e0ed9fb4885a7b1 +SIZE (xpi/firefox-i18n-61.0/hr.xpi) = 486049 +SHA256 (xpi/firefox-i18n-61.0/hsb.xpi) = ed9b9e3792757ef4ff7422e946bc78e84c9a0f1f8e69db03bb242c8c970de163 +SIZE (xpi/firefox-i18n-61.0/hsb.xpi) = 510213 +SHA256 (xpi/firefox-i18n-61.0/hu.xpi) = fd4018acb9730d98d1f3023539b6d00bde237eb9ea303cb311e88775821c8068 +SIZE (xpi/firefox-i18n-61.0/hu.xpi) = 511142 +SHA256 (xpi/firefox-i18n-61.0/hy-AM.xpi) = 4b4f55569b4f0b521365ed18edff1aa6ca06470c4abe5ef93b33956d1d9748de +SIZE (xpi/firefox-i18n-61.0/hy-AM.xpi) = 537817 +SHA256 (xpi/firefox-i18n-61.0/ia.xpi) = 16bae2d1c4cba9467a7d1845617f085ab5954db4ac813d18eb480ddcf8305074 +SIZE (xpi/firefox-i18n-61.0/ia.xpi) = 483841 +SHA256 (xpi/firefox-i18n-61.0/id.xpi) = 8cd75a88cb666e0fa816211dfb943b1c3d0bd71f1fae997b6b8e4021f9ebd43b +SIZE (xpi/firefox-i18n-61.0/id.xpi) = 476114 +SHA256 (xpi/firefox-i18n-61.0/is.xpi) = f2592d68efd9f0ed4b030b326233d777016916be9b9f61f7feaf47f29e58c427 +SIZE (xpi/firefox-i18n-61.0/is.xpi) = 482660 +SHA256 (xpi/firefox-i18n-61.0/it.xpi) = 2439855ef019a354d3dd2506a4b26603b622bc35d4fae982906285f4227cd9b2 +SIZE (xpi/firefox-i18n-61.0/it.xpi) = 372491 +SHA256 (xpi/firefox-i18n-61.0/ja.xpi) = c62496c7da43cfd521cba7a243baba3b8d8e45515cf1729a8c757168ab37ee26 +SIZE (xpi/firefox-i18n-61.0/ja.xpi) = 538255 +SHA256 (xpi/firefox-i18n-61.0/ka.xpi) = 6beeb507141d9d39a947044dcd7d0ee3e7adb9e1d4a556b0477a16bfa8863d54 +SIZE (xpi/firefox-i18n-61.0/ka.xpi) = 525917 +SHA256 (xpi/firefox-i18n-61.0/kab.xpi) = c588f1f693a12e51f47ede13dcdb392d1fa8f64f0644848f06b1fd7c6859b1bd +SIZE (xpi/firefox-i18n-61.0/kab.xpi) = 495572 +SHA256 (xpi/firefox-i18n-61.0/kk.xpi) = b2baab1a55bc5b3340ae6155deed01448aae08136427fdf210356f27dc42cc97 +SIZE (xpi/firefox-i18n-61.0/kk.xpi) = 553678 +SHA256 (xpi/firefox-i18n-61.0/km.xpi) = fd1a3292d73db55c3f8021188c687a6f0a90fef05305f5ad917b55ff0c189be1 +SIZE (xpi/firefox-i18n-61.0/km.xpi) = 547196 +SHA256 (xpi/firefox-i18n-61.0/kn.xpi) = d8c0e96648022e617dd8cd21a053bfa45c56ec23cc7ab6fbfdbbfb80a5f1dce0 +SIZE (xpi/firefox-i18n-61.0/kn.xpi) = 552584 +SHA256 (xpi/firefox-i18n-61.0/ko.xpi) = cc0b42757564e1b80aa46c296d9ad55aac50a730ec66a76c2b9ca7be9e77b3cf +SIZE (xpi/firefox-i18n-61.0/ko.xpi) = 519815 +SHA256 (xpi/firefox-i18n-61.0/lij.xpi) = d5b731cf3a145b590d16af59ea08bcc27438adda449df0cf1ac468ea55e1fee3 +SIZE (xpi/firefox-i18n-61.0/lij.xpi) = 486946 +SHA256 (xpi/firefox-i18n-61.0/lt.xpi) = c823dfbed5d34e1e296b698e66843be873f292db54e8748ce28e36d54bceed49 +SIZE (xpi/firefox-i18n-61.0/lt.xpi) = 509389 +SHA256 (xpi/firefox-i18n-61.0/lv.xpi) = e01c5cc2770dfbe0b4b0d35dc8ee2062907a0597a94555a7b93e9164f57b9ed7 +SIZE (xpi/firefox-i18n-61.0/lv.xpi) = 497550 +SHA256 (xpi/firefox-i18n-61.0/mai.xpi) = 74bea0ab796797620a6e121513dc2f32114dd23969d57cf3298f10a3f471a0fa +SIZE (xpi/firefox-i18n-61.0/mai.xpi) = 518902 +SHA256 (xpi/firefox-i18n-61.0/mk.xpi) = 5b1e3a476a683378e6d1af350761435219398c6c9dc7f0bfc52efb6836e6996d +SIZE (xpi/firefox-i18n-61.0/mk.xpi) = 480671 +SHA256 (xpi/firefox-i18n-61.0/ml.xpi) = e691c980d0bf89a99e445d7f726e4d5d1242aae16f940405331f8d8d48de42bc +SIZE (xpi/firefox-i18n-61.0/ml.xpi) = 562458 +SHA256 (xpi/firefox-i18n-61.0/mr.xpi) = 70c37eeddb05e6503fe381118bfb488a1368e18240125e2b947617c8a9d4c108 +SIZE (xpi/firefox-i18n-61.0/mr.xpi) = 547455 +SHA256 (xpi/firefox-i18n-61.0/ms.xpi) = f18d1a9224486c1952119f882460fbf6d32606c69afcac862c9069a4f9fdfc38 +SIZE (xpi/firefox-i18n-61.0/ms.xpi) = 483502 +SHA256 (xpi/firefox-i18n-61.0/my.xpi) = 725958f542984c594e783fd151306e8340fbacfd05a7795ae8ce346704a89829 +SIZE (xpi/firefox-i18n-61.0/my.xpi) = 536699 +SHA256 (xpi/firefox-i18n-61.0/nb-NO.xpi) = 144367fb12f0b92d46854c8b8add994be91069df2f8e05ee1287c1c57f9315be +SIZE (xpi/firefox-i18n-61.0/nb-NO.xpi) = 483523 +SHA256 (xpi/firefox-i18n-61.0/ne-NP.xpi) = 3fa7706969e2a0ee3a3c6531714a3c085157ca0f1c19964519de4c974add261c +SIZE (xpi/firefox-i18n-61.0/ne-NP.xpi) = 523520 +SHA256 (xpi/firefox-i18n-61.0/nl.xpi) = f313dd641aab012f93f06278f8da94a70cf42b84e8d2a4ba827d663a960f4126 +SIZE (xpi/firefox-i18n-61.0/nl.xpi) = 489004 +SHA256 (xpi/firefox-i18n-61.0/nn-NO.xpi) = ec35e052f38863addfdca5a4b5a4b25f78f6ac59e9655b03f53b9b9741778a27 +SIZE (xpi/firefox-i18n-61.0/nn-NO.xpi) = 483561 +SHA256 (xpi/firefox-i18n-61.0/oc.xpi) = 659e90d2d1b02a91dab2fd33e531ca35a8ae0d3d37f1e6c53fe7e109f85571a5 +SIZE (xpi/firefox-i18n-61.0/oc.xpi) = 499691 +SHA256 (xpi/firefox-i18n-61.0/or.xpi) = e3c0ce3575adcb20ef60d44abb4051e23d560f2994b0a337a9bec0dbb50b9b45 +SIZE (xpi/firefox-i18n-61.0/or.xpi) = 508181 +SHA256 (xpi/firefox-i18n-61.0/pa-IN.xpi) = 534701f536ce6d665a38152cb9e0209e67383e1cedc71e28e953aa878325b96c +SIZE (xpi/firefox-i18n-61.0/pa-IN.xpi) = 524500 +SHA256 (xpi/firefox-i18n-61.0/pl.xpi) = e97e4800c799baf4f176807e2892995c7c684672e660c5277158b1467589a9d6 +SIZE (xpi/firefox-i18n-61.0/pl.xpi) = 390903 +SHA256 (xpi/firefox-i18n-61.0/pt-BR.xpi) = 76afbe14524ca84c6af851fe1567434237cde207f4f3ab138e8078677f00ce9c +SIZE (xpi/firefox-i18n-61.0/pt-BR.xpi) = 485997 +SHA256 (xpi/firefox-i18n-61.0/pt-PT.xpi) = 7402fa24d7cd719e917e5ff07d88ab955c65960e085440b553c45aa178821e86 +SIZE (xpi/firefox-i18n-61.0/pt-PT.xpi) = 492101 +SHA256 (xpi/firefox-i18n-61.0/rm.xpi) = 3fb1389619e3e0efd2882507434c5683f04abd3aaa54d5f8113240aed3de86bf +SIZE (xpi/firefox-i18n-61.0/rm.xpi) = 483856 +SHA256 (xpi/firefox-i18n-61.0/ro.xpi) = 365dfa4198bbb355706ab405473a350ec971efaed324049f230cdf631c9c9d39 +SIZE (xpi/firefox-i18n-61.0/ro.xpi) = 486748 +SHA256 (xpi/firefox-i18n-61.0/ru.xpi) = 8c2fbba9144750e55791792c8d17d248ade6a3d6a61c727cfe4f4c69c698102b +SIZE (xpi/firefox-i18n-61.0/ru.xpi) = 561631 +SHA256 (xpi/firefox-i18n-61.0/si.xpi) = 7ba7ee23ee35aabf8068024f7198522ac8bf3780720d63444a9fc3f4919754b9 +SIZE (xpi/firefox-i18n-61.0/si.xpi) = 511499 +SHA256 (xpi/firefox-i18n-61.0/sk.xpi) = 47f6258d2051edfb85e698169ccb646a009eee52c44c7f11240c7f7e68be0c48 +SIZE (xpi/firefox-i18n-61.0/sk.xpi) = 514226 +SHA256 (xpi/firefox-i18n-61.0/sl.xpi) = 2c1cf7d3dd8c8db029d06ec63d3a2d1c58f4747ae2dcdc55d1d44cf2e5f2ebb9 +SIZE (xpi/firefox-i18n-61.0/sl.xpi) = 490324 +SHA256 (xpi/firefox-i18n-61.0/son.xpi) = c9fa033ea4bcd3aca38807dc4f52cef7820ebc1e918b30d195491889eb6a4e6c +SIZE (xpi/firefox-i18n-61.0/son.xpi) = 468634 +SHA256 (xpi/firefox-i18n-61.0/sq.xpi) = 4ba0eab56da8a68961dfb8d333dc26f6253d8fa9b5ef773f11396a16ba7cad7a +SIZE (xpi/firefox-i18n-61.0/sq.xpi) = 496569 +SHA256 (xpi/firefox-i18n-61.0/sr.xpi) = 03b2bf62131a59bf6064a9d2190e7d1c14bac55f92e33e48335913acc6cfcd75 +SIZE (xpi/firefox-i18n-61.0/sr.xpi) = 519559 +SHA256 (xpi/firefox-i18n-61.0/sv-SE.xpi) = 6dc7695eed1cdf0e02064560675a30b6e9cca2caad290f7b46d00f3078a99993 +SIZE (xpi/firefox-i18n-61.0/sv-SE.xpi) = 491596 +SHA256 (xpi/firefox-i18n-61.0/ta.xpi) = 72d64bcbc53d2e437c2872f26659c64a82139a7303504b9bdac3ac01ebde1df7 +SIZE (xpi/firefox-i18n-61.0/ta.xpi) = 541866 +SHA256 (xpi/firefox-i18n-61.0/te.xpi) = d1a2e661a450680e56bc07a6dc9bf9502558a66b6689cd0841b8fc8ad37fe457 +SIZE (xpi/firefox-i18n-61.0/te.xpi) = 558635 +SHA256 (xpi/firefox-i18n-61.0/th.xpi) = d219719dd56d23e702bb4e6fc589b50f5f18734722b857ebbd44f49b14f2f99f +SIZE (xpi/firefox-i18n-61.0/th.xpi) = 531112 +SHA256 (xpi/firefox-i18n-61.0/tr.xpi) = 07a4d63c033e8234e07e29be35ebf3f9ab8ac8e376e7f8882f8e5fd2eb8c9b9d +SIZE (xpi/firefox-i18n-61.0/tr.xpi) = 498506 +SHA256 (xpi/firefox-i18n-61.0/uk.xpi) = 4b44592b37c40e12dc636af6422d16327697074fcb74cee3e9bd0f631506a3e5 +SIZE (xpi/firefox-i18n-61.0/uk.xpi) = 553596 +SHA256 (xpi/firefox-i18n-61.0/ur.xpi) = 076380f4698146423286e9f2f742fbbaead2a225651335b0b8bb86c31ef135bc +SIZE (xpi/firefox-i18n-61.0/ur.xpi) = 531611 +SHA256 (xpi/firefox-i18n-61.0/uz.xpi) = fc8da974458213e019261281def322df32f225f4e3099cad5aff38bdc0e77e27 +SIZE (xpi/firefox-i18n-61.0/uz.xpi) = 482058 +SHA256 (xpi/firefox-i18n-61.0/vi.xpi) = b38ee1b09a1f539f9e5eb73ba2a01f99fb98b8896d70295bd90b442a78d8a546 +SIZE (xpi/firefox-i18n-61.0/vi.xpi) = 500409 +SHA256 (xpi/firefox-i18n-61.0/xh.xpi) = e88fea87214959b23a2cb79f2775bb82c8d5d72dd045298ca66b46a698c06e61 +SIZE (xpi/firefox-i18n-61.0/xh.xpi) = 481792 +SHA256 (xpi/firefox-i18n-61.0/zh-CN.xpi) = 3b39e97e9837005e58584101e8048137f2580bd4bcab4688232d75c2f5d9a992 +SIZE (xpi/firefox-i18n-61.0/zh-CN.xpi) = 514392 +SHA256 (xpi/firefox-i18n-61.0/zh-TW.xpi) = 9e3ec5dff511c992c84b6961f77f65428bbe60e6999c4c85aea778eb815984e5 +SIZE (xpi/firefox-i18n-61.0/zh-TW.xpi) = 513542 Modified: branches/2018Q2/www/firefox/Makefile ============================================================================== --- branches/2018Q2/www/firefox/Makefile Mon Jun 25 22:00:36 2018 (r473353) +++ branches/2018Q2/www/firefox/Makefile Mon Jun 25 22:36:12 2018 (r473354) @@ -2,18 +2,19 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 60.0.2 +DISTVERSION= 61.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} 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.3:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=1.7.6:print/harfbuzz \ @@ -21,7 +22,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 +33,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 +44,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: branches/2018Q2/www/firefox/distinfo ============================================================================== --- branches/2018Q2/www/firefox/distinfo Mon Jun 25 22:00:36 2018 (r473353) +++ branches/2018Q2/www/firefox/distinfo Mon Jun 25 22:36:12 2018 (r473354) @@ -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 = 1529611471 +SHA256 (firefox-61.0.source.tar.xz) = 3453e8ac7c602390bda0d34a4a636e0d65fd89d9ae69f7aa1740926715c42268 +SIZE (firefox-61.0.source.tar.xz) = 266932956 Modified: branches/2018Q2/www/firefox/files/patch-addon-search ============================================================================== --- branches/2018Q2/www/firefox/files/patch-addon-search Mon Jun 25 22:00:36 2018 (r473353) +++ branches/2018Q2/www/firefox/files/patch-addon-search Mon Jun 25 22:36:12 2018 (r473354) @@ -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: branches/2018Q2/www/firefox/files/patch-bug1021761 ============================================================================== --- branches/2018Q2/www/firefox/files/patch-bug1021761 Mon Jun 25 22:00:36 2018 (r473353) +++ branches/2018Q2/www/firefox/files/patch-bug1021761 Mon Jun 25 22:36:12 2018 (r473354) @@ -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: branches/2018Q2/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp ============================================================================== --- branches/2018Q2/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp Mon Jun 25 22:00:36 2018 (r473353) +++ branches/2018Q2/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp Mon Jun 25 22:36:12 2018 (r473354) @@ -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: branches/2018Q2/www/firefox/files/patch-u2f-hid-rs62 ============================================================================== --- branches/2018Q2/www/firefox/files/patch-u2f-hid-rs62 Mon Jun 25 22:00:36 2018 (r473353) +++ branches/2018Q2/www/firefox/files/patch-u2f-hid-rs62 Mon Jun 25 22:36:12 2018 (r473354) @@ -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: branches/2018Q2/www/firefox/files/patch-z-bug517422 ============================================================================== --- branches/2018Q2/www/firefox/files/patch-z-bug517422 Mon Jun 25 22:00:36 2018 (r473353) +++ branches/2018Q2/www/firefox/files/patch-z-bug517422 Mon Jun 25 22:36:12 2018 (r473354) @@ -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?201806252236.w5PMaDZV069524>