230540 2021-09-21 02:14:06 -0700 [webkitcorepy] Not possible to autoinstall a package with micro version 0 2024-11-06 15:40:19 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified REOPENED https://bugs.webkit.org/show_bug.cgi?id=231381 InRadar P2 Normal --- 1 cgarcia jbedard dewei_zhu jbedard mcatanzaro slewis tsavell webkit-bug-importer oldest_to_newest 1795477 0 cgarcia 2021-09-21 02:14:06 -0700 This happens if there are more versions of the package. For example try to install pytest 6.2.0, even when using Version (6, 2, 0), the installed version is 6.2.5. I think we should differentiate between Version(6, 2) and Version(6, 2, 0), probably initializing implicit arguments to None instead of 0 and handling None everywhere in version.py. 1795534 1 jbedard 2021-09-21 07:31:12 -0700 If we do end up doing this, it probably needs to be the special case, not the default one. I seem to recall this is the behavior we want when dealing with iOS/MacOS versions, although been a bit since I was dealing with this code 1797792 2 webkit-bug-importer 2021-09-28 02:15:16 -0700 <rdar://problem/83613371> 1802133 3 440633 jbedard 2021-10-08 09:57:16 -0700 Created attachment 440633 Patch 1802162 4 440647 jbedard 2021-10-08 11:14:05 -0700 Created attachment 440647 Patch for landing 1802190 5 ews-feeder 2021-10-08 12:19:24 -0700 Committed r283824 (242711@main): <https://commits.webkit.org/242711@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440647. 1802305 6 tsavell 2021-10-08 16:26:03 -0700 Reverted https://trac.webkit.org/changeset/283824/webkit in: https://trac.webkit.org/changeset/283850/webkit 2073319 7 gsnedders 2024-11-06 15:40:19 -0800 (In reply to Truitt Savell from comment #6) > Reverted https://trac.webkit.org/changeset/283824/webkit in: > https://trac.webkit.org/changeset/283850/webkit Per that commit message, "Reverting r283824 becasue it broke baseline search paths". We don't seem to have ever re-landed this. 440633 2021-10-08 09:57:16 -0700 2021-10-08 11:14:02 -0700 Patch bug-230540-20211008095715.patch text/plain 5531 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzODA0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTQ1NDFkZmFhMWI4ZjE5ZDFhZjc5Y2UxOTU5NjEwYjJk ZGFjYjk3Yi4uM2QyNmJmMTJjNjNhY2ViYjdlMzZhYjZiYmZlMzM0NDllMTdmZGI3YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIxLTEwLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0Y29yZXB5XSBOb3QgcG9zc2libGUgdG8gYXV0b2luc3RhbGwgYSBwYWNr YWdlIHdpdGggbWljcm8gdmVyc2lvbiAwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzA1NDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgzNjEzMzcx PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS90ZXN0cy92ZXJzaW9uX3Vu aXR0ZXN0LnB5OgorICAgICAgICAoVmVyc2lvblRlc3RDYXNlLnRlc3RfaW50X2NvbnN0cnVjdG9y KTogRGVmYXVsdCB2YWx1ZXMgYXJlICdOb25lLicKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll cy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3ZlcnNpb24ucHk6CisgICAgICAgIChWZXJzaW9u LmZyb21faXRlcmFibGUpOgorICAgICAgICAoVmVyc2lvbi5fX2luaXRfXyk6IFVzZSAnTm9uZScg YXMgdGhlIGRlZmF1bHQgdmFsdWUgaW5zdGVhZCBvZiAwLgorICAgICAgICAoVmVyc2lvbi5fX3Nl dGl0ZW1fXyk6IFN1cHBvcnQgJ05vbmUnIGFzIGEgdmVyc2lvbiB2YWx1ZS4KKyAgICAgICAgKFZl cnNpb24uX19jb250YWluc19fKTogRGl0dG8uCisgICAgICAgIChWZXJzaW9uLl9faGFzaF9fKTog RGl0dG8uCisgICAgICAgIChWZXJzaW9uLl9fY21wX18pOiBEaXR0by4KKwogMjAyMS0xMC0wOCAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dl YkRyaXZlcl0gVXBkYXRlIHczYyBhbmQgc2VsZW5pdW0gdGVzdHMKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvdGVzdHMvdmVyc2lv bl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJr aXRjb3JlcHkvdGVzdHMvdmVyc2lvbl91bml0dGVzdC5weQppbmRleCAzODBlOGE1ZjI0YjBkMWUx Mzg1MmZmOTU3MDFlMzMwY2MyZDVhYjY0Li5hNjExMGNlMTlmNzU3ZTg5OTkyMjQyZTZlNDY0MjNi YWQ1N2Q0NDFiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3Jl cHkvd2Via2l0Y29yZXB5L3Rlc3RzL3ZlcnNpb25fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS90ZXN0cy92ZXJzaW9uX3Vu aXR0ZXN0LnB5CkBAIC01MiwxMCArNTIsMTAgQEAgY2xhc3MgVmVyc2lvblRlc3RDYXNlKHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9pbnRfY29uc3RydWN0b3Ioc2VsZik6CiAgICAg ICAgIHYgPSBWZXJzaW9uKDEpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodi5tYWpvciwgMSkK LSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh2Lm1pbm9yLCAwKQotICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHYudGlueSwgMCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh2Lm1pY3JvLCAwKQot ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHYubmFubywgMCkKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbCh2Lm1pbm9yLCBOb25lKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHYudGlueSwgTm9u ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh2Lm1pY3JvLCBOb25lKQorICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHYubmFubywgTm9uZSkKIAogICAgIGRlZiB0ZXN0X2xlbihzZWxmKToKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4oVmVyc2lvbigxLCAyLCAzLCA0LCA1KSksIDUpCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29y ZXB5L3ZlcnNpb24ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Vi a2l0Y29yZXB5L3ZlcnNpb24ucHkKaW5kZXggNTk1YWE2YWVkN2I1MWFlYzcwNjU4MzdiZjYwN2Ux YmMzZmZhNzcxNC4uZjljMDBiZTZhNDAxNWNiNDEyZTM3NjkxZjI3ZWYwZmFlZWNmOWI2MiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVw eS92ZXJzaW9uLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93 ZWJraXRjb3JlcHkvdmVyc2lvbi5weQpAQCAtMzcsNyArMzcsNyBAQCBjbGFzcyBWZXJzaW9uKG9i amVjdCk6CiAgICAgZGVmIGZyb21faXRlcmFibGUodmFsKToKICAgICAgICAgcmVzdWx0ID0gVmVy c2lvbigpCiAgICAgICAgIGZvciBpIGluIHJhbmdlKGxlbih2YWwpKToKLSAgICAgICAgICAgIHJl c3VsdFtpXSA9IGludCh2YWxbaV0pCisgICAgICAgICAgICByZXN1bHRbaV0gPSBOb25lIGlmIHZh bFtpXSBpcyBOb25lIGVsc2UgaW50KHZhbFtpXSkKICAgICAgICAgcmV0dXJuIHJlc3VsdAogCiAg ICAgQHN0YXRpY21ldGhvZApAQCAtNDUsMTIgKzQ1LDEyIEBAIGNsYXNzIFZlcnNpb24ob2JqZWN0 KToKICAgICAgICAgZnJvbSB3ZWJraXRweS5jb21tb24udmVyc2lvbl9uYW1lX21hcCBpbXBvcnQg VmVyc2lvbk5hbWVNYXAKICAgICAgICAgcmV0dXJuIFZlcnNpb25OYW1lTWFwLm1hcCgpLmZyb21f bmFtZShuYW1lKVsxXQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG1ham9yPTAsIG1pbm9yPTAs IHRpbnk9MCwgbWljcm89MCwgbmFubz0wKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgbWFqb3I9 MCwgbWlub3I9Tm9uZSwgdGlueT1Ob25lLCBtaWNybz1Ob25lLCBuYW5vPU5vbmUpOgogICAgICAg ICBzZWxmLm1ham9yID0gaW50KG1ham9yKQotICAgICAgICBzZWxmLm1pbm9yID0gaW50KG1pbm9y KQotICAgICAgICBzZWxmLnRpbnkgPSBpbnQodGlueSkKLSAgICAgICAgc2VsZi5taWNybyA9IGlu dChtaWNybykKLSAgICAgICAgc2VsZi5uYW5vID0gaW50KG5hbm8pCisgICAgICAgIHNlbGYubWlu b3IgPSBOb25lIGlmIG1pbm9yIGlzIE5vbmUgZWxzZSBpbnQobWlub3IpCisgICAgICAgIHNlbGYu dGlueSA9IE5vbmUgaWYgdGlueSBpcyBOb25lIGVsc2UgaW50KHRpbnkpCisgICAgICAgIHNlbGYu bWljcm8gPSBOb25lIGlmIG1pY3JvIGlzIE5vbmUgZWxzZSBpbnQobWljcm8pCisgICAgICAgIHNl bGYubmFubyA9IE5vbmUgaWYgbmFubyBpcyBOb25lIGVsc2UgaW50KG5hbm8pCiAKICAgICBkZWYg X19sZW5fXyhzZWxmKToKICAgICAgICAgcmV0dXJuIDUKQEAgLTc1LDIxICs3NSwyMiBAQCBjbGFz cyBWZXJzaW9uKG9iamVjdCk6CiAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoJ0V4cGVjdGVkIHZl cnNpb24ga2V5IHRvIGJlIHN0cmluZyBvciBpbnRlZ2VyJykKIAogICAgIGRlZiBfX3NldGl0ZW1f XyhzZWxmLCBrZXksIHZhbHVlKToKKyAgICAgICAgdmFsdWUgPSBOb25lIGlmIHZhbHVlIGlzIE5v bmUgZWxzZSBpbnQodmFsdWUpCiAgICAgICAgIGlmIGlzaW5zdGFuY2Uoa2V5LCBpbnQpOgogICAg ICAgICAgICAgaWYga2V5ID09IDA6Ci0gICAgICAgICAgICAgICAgc2VsZi5tYWpvciA9IGludCh2 YWx1ZSkKKyAgICAgICAgICAgICAgICBzZWxmLm1ham9yID0gdmFsdWUKICAgICAgICAgICAgICAg ICByZXR1cm4gc2VsZi5tYWpvcgogICAgICAgICAgICAgZWxpZiBrZXkgPT0gMToKLSAgICAgICAg ICAgICAgICBzZWxmLm1pbm9yID0gaW50KHZhbHVlKQorICAgICAgICAgICAgICAgIHNlbGYubWlu b3IgPSB2YWx1ZQogICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLm1pbm9yCiAgICAgICAgICAg ICBlbGlmIGtleSA9PSAyOgotICAgICAgICAgICAgICAgIHNlbGYudGlueSA9IGludCh2YWx1ZSkK KyAgICAgICAgICAgICAgICBzZWxmLnRpbnkgPSB2YWx1ZQogICAgICAgICAgICAgICAgIHJldHVy biBzZWxmLnRpbnkKICAgICAgICAgICAgIGVsaWYga2V5ID09IDM6Ci0gICAgICAgICAgICAgICAg c2VsZi5taWNybyA9IGludCh2YWx1ZSkKKyAgICAgICAgICAgICAgICBzZWxmLm1pY3JvID0gdmFs dWUKICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5taWNybwogICAgICAgICAgICAgZWxpZiBr ZXkgPT0gNDoKLSAgICAgICAgICAgICAgICBzZWxmLm5hbm8gPSBpbnQodmFsdWUpCisgICAgICAg ICAgICAgICAgc2VsZi5uYW5vID0gdmFsdWUKICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5u YW5vCiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdWZXJzaW9uIGtleSBtdXN0IGJlIGJl dHdlZW4gMCBhbmQgNCcpCiAgICAgICAgIGVsaWYgaXNpbnN0YW5jZShrZXksIHN0cik6CkBAIC0x MzYsOSArMTM3LDkgQEAgY2xhc3MgVmVyc2lvbihvYmplY3QpOgogICAgICAgICBhc3NlcnQgaXNp bnN0YW5jZSh2ZXJzaW9uLCBWZXJzaW9uKQogICAgICAgICBkb2VzX21hdGNoID0gVHJ1ZQogICAg ICAgICBmb3IgaSBpbiByYW5nZShsZW4odmVyc2lvbikpOgotICAgICAgICAgICAgaWYgc2VsZltp XSAhPSB2ZXJzaW9uW2ldOgorICAgICAgICAgICAgaWYgKHNlbGZbaV0gb3IgMCkgIT0gKHZlcnNp b25baV0gb3IgMCk6CiAgICAgICAgICAgICAgICAgZG9lc19tYXRjaCA9IEZhbHNlCi0gICAgICAg ICAgICBpZiBub3QgZG9lc19tYXRjaCBhbmQgc2VsZltpXSAhPSAwOgorICAgICAgICAgICAgaWYg bm90IGRvZXNfbWF0Y2ggYW5kIHNlbGZbaV0gaXMgbm90IE5vbmU6CiAgICAgICAgICAgICAgICAg cmV0dXJuIEZhbHNlCiAgICAgICAgIHJldHVybiBUcnVlCiAKQEAgLTE1NiwxNCArMTU3LDE0IEBA IGNsYXNzIFZlcnNpb24ob2JqZWN0KToKICAgICAgICAgcmVzdWx0ID0gMAogICAgICAgICBmb3Ig aW5kZXggaW4gcmFuZ2UobGVuKHNlbGYpKToKICAgICAgICAgICAgIHJlc3VsdCAqPSAxMDAwCi0g ICAgICAgICAgICByZXN1bHQgKz0gc2VsZltpbmRleF0KKyAgICAgICAgICAgIHJlc3VsdCArPSAt MSBpZiBzZWxmW2luZGV4XSBpcyBOb25lIGVsc2Ugc2VsZltpbmRleF0KICAgICAgICAgcmV0dXJu IHJlc3VsdAogCiAgICAgZGVmIF9fY21wX18oc2VsZiwgb3RoZXIpOgogICAgICAgICBpZiBvdGhl ciBpcyBOb25lOgogICAgICAgICAgICAgcmV0dXJuIDEKICAgICAgICAgZm9yIGkgaW4gcmFuZ2Uo bGVuKHNlbGYpKToKLSAgICAgICAgICAgIGRpZmYgPSBzZWxmW2ldIC0gb3RoZXJbaV0KKyAgICAg ICAgICAgIGRpZmYgPSAoc2VsZltpXSBvciAwKSAtIChvdGhlcltpXSBvciAwKQogICAgICAgICAg ICAgaWYgZGlmZjoKICAgICAgICAgICAgICAgICByZXR1cm4gZGlmZgogICAgICAgICByZXR1cm4g MAo= 440647 2021-10-08 11:14:05 -0700 2021-10-08 12:19:25 -0700 Patch for landing bug-230540-20211008111404.patch text/plain 6891 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzODExCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2ZkYWVhZDk2Y2NjZmVhMGVlYzhiOGM3YWVkYTY5NWVk ZGRiYWIzZC4uMjdmNTE4YTI2MWQ4OGViMTkzMmQyYTYzMzlkNTUzNWY4ZmRjYWZmMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDIxLTEwLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0Y29yZXB5XSBOb3QgcG9zc2libGUgdG8gYXV0b2luc3RhbGwgYSBwYWNr YWdlIHdpdGggbWljcm8gdmVyc2lvbiAwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzA1NDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgzNjEzMzcx PgorCisgICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgQ2F0YW56YXJvLgorCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisg ICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2lu aXRfXy5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5 L3dlYmtpdGNvcmVweS90ZXN0cy92ZXJzaW9uX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVmVyc2lv blRlc3RDYXNlLnRlc3RfaW50X2NvbnN0cnVjdG9yKTogRGVmYXVsdCB2YWx1ZXMgYXJlICdOb25l LicKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5 L3ZlcnNpb24ucHk6CisgICAgICAgIChWZXJzaW9uLmZyb21faXRlcmFibGUpOgorICAgICAgICAo VmVyc2lvbi5fX2luaXRfXyk6IFVzZSAnTm9uZScgYXMgdGhlIGRlZmF1bHQgdmFsdWUgaW5zdGVh ZCBvZiAwLgorICAgICAgICAoVmVyc2lvbi5fX3NldGl0ZW1fXyk6IFN1cHBvcnQgJ05vbmUnIGFz IGEgdmVyc2lvbiB2YWx1ZS4KKyAgICAgICAgKFZlcnNpb24uX19jb250YWluc19fKTogRGl0dG8u CisgICAgICAgIChWZXJzaW9uLl9faGFzaF9fKTogRGl0dG8uCisgICAgICAgIChWZXJzaW9uLl9f Y21wX18pOiBEaXR0by4KKwogMjAyMS0xMC0wOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBs ZS5jb20+CiAKICAgICAgICAgTWFrZSBXVEY6Okl0ZXJhdG9yUmFuZ2UgcmV2ZXJzaWJsZQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5IGIv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5CmluZGV4IGFlYzJj ODJiMWYxZmQxMjIyMzIwOTM1NjdhMjllYjA1MmE4NjYzYmEuLmVmMjY4MTI2MjdiMzg4MGNmZjhh OGU0ZDYyMWFmY2Q4N2E3NDM1NDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdGNvcmVweS9zZXR1cC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRjb3JlcHkvc2V0dXAucHkKQEAgLTMwLDcgKzMwLDcgQEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1 cCgKICAgICBuYW1lPSd3ZWJraXRjb3JlcHknLAotICAgIHZlcnNpb249JzAuMTEuMScsCisgICAg dmVyc2lvbj0nMC4xMS4yJywKICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBjb250YWluaW5nIHZh cmlvdXMgUHl0aG9uIHN1cHBvcnQgY2xhc3NlcyBhbmQgZnVuY3Rpb25zLicsCiAgICAgbG9uZ19k ZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1bCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5 IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2lu aXRfXy5weQppbmRleCBlYTM1Mzk5Y2Q2ODgzODQxYjFkMzIwMjg2ZGM4MmZjMjNkOGRmZjY5Li42 MDcyYzQ2Njg4ZTVkOTc2MThhZWRjYzAwNjhlMmNlZDljNTc5OGJkIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkv X19pbml0X18ucHkKQEAgLTQzLDcgKzQzLDcgQEAgZnJvbSB3ZWJraXRjb3JlcHkuY2FsbF9ieV9u ZWVkIGltcG9ydCBDYWxsQnlOZWVkCiBmcm9tIHdlYmtpdGNvcmVweS5lZGl0b3IgaW1wb3J0IEVk aXRvcgogZnJvbSB3ZWJraXRjb3JlcHkuZmlsZV9sb2NrIGltcG9ydCBGaWxlTG9jawogCi12ZXJz aW9uID0gVmVyc2lvbigwLCAxMSwgMSkKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDExLCAyKQogCiBm cm9tIHdlYmtpdGNvcmVweS5hdXRvaW5zdGFsbCBpbXBvcnQgUGFja2FnZSwgQXV0b0luc3RhbGwK IGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3Rlc3RzL3ZlcnNpb25fdW5pdHRl c3QucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5 L3Rlc3RzL3ZlcnNpb25fdW5pdHRlc3QucHkKaW5kZXggMzgwZThhNWYyNGIwZDFlMTM4NTJmZjk1 NzAxZTMzMGNjMmQ1YWI2NC4uYTYxMTBjZTE5Zjc1N2U4OTk5MjI0MmU2ZTQ2NDIzYmFkNTdkNDQx YiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtp dGNvcmVweS90ZXN0cy92ZXJzaW9uX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvdGVzdHMvdmVyc2lvbl91bml0dGVzdC5w eQpAQCAtNTIsMTAgKzUyLDEwIEBAIGNsYXNzIFZlcnNpb25UZXN0Q2FzZSh1bml0dGVzdC5UZXN0 Q2FzZSk6CiAgICAgZGVmIHRlc3RfaW50X2NvbnN0cnVjdG9yKHNlbGYpOgogICAgICAgICB2ID0g VmVyc2lvbigxKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHYubWFqb3IsIDEpCi0gICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwodi5taW5vciwgMCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh2 LnRpbnksIDApCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodi5taWNybywgMCkKLSAgICAgICAg c2VsZi5hc3NlcnRFcXVhbCh2Lm5hbm8sIDApCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodi5t aW5vciwgTm9uZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh2LnRpbnksIE5vbmUpCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwodi5taWNybywgTm9uZSkKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbCh2Lm5hbm8sIE5vbmUpCiAKICAgICBkZWYgdGVzdF9sZW4oc2VsZik6CiAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwobGVuKFZlcnNpb24oMSwgMiwgMywgNCwgNSkpLCA1KQpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS92ZXJz aW9uLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVw eS92ZXJzaW9uLnB5CmluZGV4IDU5NWFhNmFlZDdiNTFhZWM3MDY1ODM3YmY2MDdlMWJjM2ZmYTc3 MTQuLmY5YzAwYmU2YTQwMTVjYjQxMmUzNzY5MWYyN2VmMGZhZWVjZjliNjIgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvdmVyc2lv bi5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29y ZXB5L3ZlcnNpb24ucHkKQEAgLTM3LDcgKzM3LDcgQEAgY2xhc3MgVmVyc2lvbihvYmplY3QpOgog ICAgIGRlZiBmcm9tX2l0ZXJhYmxlKHZhbCk6CiAgICAgICAgIHJlc3VsdCA9IFZlcnNpb24oKQog ICAgICAgICBmb3IgaSBpbiByYW5nZShsZW4odmFsKSk6Ci0gICAgICAgICAgICByZXN1bHRbaV0g PSBpbnQodmFsW2ldKQorICAgICAgICAgICAgcmVzdWx0W2ldID0gTm9uZSBpZiB2YWxbaV0gaXMg Tm9uZSBlbHNlIGludCh2YWxbaV0pCiAgICAgICAgIHJldHVybiByZXN1bHQKIAogICAgIEBzdGF0 aWNtZXRob2QKQEAgLTQ1LDEyICs0NSwxMiBAQCBjbGFzcyBWZXJzaW9uKG9iamVjdCk6CiAgICAg ICAgIGZyb20gd2Via2l0cHkuY29tbW9uLnZlcnNpb25fbmFtZV9tYXAgaW1wb3J0IFZlcnNpb25O YW1lTWFwCiAgICAgICAgIHJldHVybiBWZXJzaW9uTmFtZU1hcC5tYXAoKS5mcm9tX25hbWUobmFt ZSlbMV0KIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBtYWpvcj0wLCBtaW5vcj0wLCB0aW55PTAs IG1pY3JvPTAsIG5hbm89MCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIG1ham9yPTAsIG1pbm9y PU5vbmUsIHRpbnk9Tm9uZSwgbWljcm89Tm9uZSwgbmFubz1Ob25lKToKICAgICAgICAgc2VsZi5t YWpvciA9IGludChtYWpvcikKLSAgICAgICAgc2VsZi5taW5vciA9IGludChtaW5vcikKLSAgICAg ICAgc2VsZi50aW55ID0gaW50KHRpbnkpCi0gICAgICAgIHNlbGYubWljcm8gPSBpbnQobWljcm8p Ci0gICAgICAgIHNlbGYubmFubyA9IGludChuYW5vKQorICAgICAgICBzZWxmLm1pbm9yID0gTm9u ZSBpZiBtaW5vciBpcyBOb25lIGVsc2UgaW50KG1pbm9yKQorICAgICAgICBzZWxmLnRpbnkgPSBO b25lIGlmIHRpbnkgaXMgTm9uZSBlbHNlIGludCh0aW55KQorICAgICAgICBzZWxmLm1pY3JvID0g Tm9uZSBpZiBtaWNybyBpcyBOb25lIGVsc2UgaW50KG1pY3JvKQorICAgICAgICBzZWxmLm5hbm8g PSBOb25lIGlmIG5hbm8gaXMgTm9uZSBlbHNlIGludChuYW5vKQogCiAgICAgZGVmIF9fbGVuX18o c2VsZik6CiAgICAgICAgIHJldHVybiA1CkBAIC03NSwyMSArNzUsMjIgQEAgY2xhc3MgVmVyc2lv bihvYmplY3QpOgogICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdFeHBlY3RlZCB2ZXJzaW9uIGtl eSB0byBiZSBzdHJpbmcgb3IgaW50ZWdlcicpCiAKICAgICBkZWYgX19zZXRpdGVtX18oc2VsZiwg a2V5LCB2YWx1ZSk6CisgICAgICAgIHZhbHVlID0gTm9uZSBpZiB2YWx1ZSBpcyBOb25lIGVsc2Ug aW50KHZhbHVlKQogICAgICAgICBpZiBpc2luc3RhbmNlKGtleSwgaW50KToKICAgICAgICAgICAg IGlmIGtleSA9PSAwOgotICAgICAgICAgICAgICAgIHNlbGYubWFqb3IgPSBpbnQodmFsdWUpCisg ICAgICAgICAgICAgICAgc2VsZi5tYWpvciA9IHZhbHVlCiAgICAgICAgICAgICAgICAgcmV0dXJu IHNlbGYubWFqb3IKICAgICAgICAgICAgIGVsaWYga2V5ID09IDE6Ci0gICAgICAgICAgICAgICAg c2VsZi5taW5vciA9IGludCh2YWx1ZSkKKyAgICAgICAgICAgICAgICBzZWxmLm1pbm9yID0gdmFs dWUKICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5taW5vcgogICAgICAgICAgICAgZWxpZiBr ZXkgPT0gMjoKLSAgICAgICAgICAgICAgICBzZWxmLnRpbnkgPSBpbnQodmFsdWUpCisgICAgICAg ICAgICAgICAgc2VsZi50aW55ID0gdmFsdWUKICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi50 aW55CiAgICAgICAgICAgICBlbGlmIGtleSA9PSAzOgotICAgICAgICAgICAgICAgIHNlbGYubWlj cm8gPSBpbnQodmFsdWUpCisgICAgICAgICAgICAgICAgc2VsZi5taWNybyA9IHZhbHVlCiAgICAg ICAgICAgICAgICAgcmV0dXJuIHNlbGYubWljcm8KICAgICAgICAgICAgIGVsaWYga2V5ID09IDQ6 Ci0gICAgICAgICAgICAgICAgc2VsZi5uYW5vID0gaW50KHZhbHVlKQorICAgICAgICAgICAgICAg IHNlbGYubmFubyA9IHZhbHVlCiAgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYubmFubwogICAg ICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignVmVyc2lvbiBrZXkgbXVzdCBiZSBiZXR3ZWVuIDAg YW5kIDQnKQogICAgICAgICBlbGlmIGlzaW5zdGFuY2Uoa2V5LCBzdHIpOgpAQCAtMTM2LDkgKzEz Nyw5IEBAIGNsYXNzIFZlcnNpb24ob2JqZWN0KToKICAgICAgICAgYXNzZXJ0IGlzaW5zdGFuY2Uo dmVyc2lvbiwgVmVyc2lvbikKICAgICAgICAgZG9lc19tYXRjaCA9IFRydWUKICAgICAgICAgZm9y IGkgaW4gcmFuZ2UobGVuKHZlcnNpb24pKToKLSAgICAgICAgICAgIGlmIHNlbGZbaV0gIT0gdmVy c2lvbltpXToKKyAgICAgICAgICAgIGlmIChzZWxmW2ldIG9yIDApICE9ICh2ZXJzaW9uW2ldIG9y IDApOgogICAgICAgICAgICAgICAgIGRvZXNfbWF0Y2ggPSBGYWxzZQotICAgICAgICAgICAgaWYg bm90IGRvZXNfbWF0Y2ggYW5kIHNlbGZbaV0gIT0gMDoKKyAgICAgICAgICAgIGlmIG5vdCBkb2Vz X21hdGNoIGFuZCBzZWxmW2ldIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgICAgIHJldHVybiBG YWxzZQogICAgICAgICByZXR1cm4gVHJ1ZQogCkBAIC0xNTYsMTQgKzE1NywxNCBAQCBjbGFzcyBW ZXJzaW9uKG9iamVjdCk6CiAgICAgICAgIHJlc3VsdCA9IDAKICAgICAgICAgZm9yIGluZGV4IGlu IHJhbmdlKGxlbihzZWxmKSk6CiAgICAgICAgICAgICByZXN1bHQgKj0gMTAwMAotICAgICAgICAg ICAgcmVzdWx0ICs9IHNlbGZbaW5kZXhdCisgICAgICAgICAgICByZXN1bHQgKz0gLTEgaWYgc2Vs ZltpbmRleF0gaXMgTm9uZSBlbHNlIHNlbGZbaW5kZXhdCiAgICAgICAgIHJldHVybiByZXN1bHQK IAogICAgIGRlZiBfX2NtcF9fKHNlbGYsIG90aGVyKToKICAgICAgICAgaWYgb3RoZXIgaXMgTm9u ZToKICAgICAgICAgICAgIHJldHVybiAxCiAgICAgICAgIGZvciBpIGluIHJhbmdlKGxlbihzZWxm KSk6Ci0gICAgICAgICAgICBkaWZmID0gc2VsZltpXSAtIG90aGVyW2ldCisgICAgICAgICAgICBk aWZmID0gKHNlbGZbaV0gb3IgMCkgLSAob3RoZXJbaV0gb3IgMCkKICAgICAgICAgICAgIGlmIGRp ZmY6CiAgICAgICAgICAgICAgICAgcmV0dXJuIGRpZmYKICAgICAgICAgcmV0dXJuIDAK