219271 2020-11-23 21:45:56 -0800 [webkitcorepy] Defer pypi index check until usage 2020-12-08 15:23:42 -0800 1 1 1 Unclassified WebKit Tools / Tests Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser jbedard ap dewei_zhu jbedard krollin simon.fraser webkit-bug-importer oldest_to_newest 1709965 0 simon.fraser 2020-11-23 21:45:56 -0800 Why is AutoInstall talking to a pypi server every time I run a build? Ld WebCore PhaseScriptExecution Check For Weak VTables and Externals PhaseScriptExecution Check For Inappropriate Objective-C Class Names PhaseScriptExecution Check For Inappropriate Files In Framework PhaseScriptExecution Copy modern media controls code and assets PhaseScriptExecution Check .xcfilelists Failed to set AutoInstall index to pypi.apple.com, no response from the server Falling back to current index, pypi.org ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1710152 1 webkit-bug-importer 2020-11-26 03:58:09 -0800 <rdar://problem/71748250> 1710589 2 jbedard 2020-11-30 06:47:43 -0800 This is an issue specifically about Apple's Internal pypi mirror. The fix may end up being a WebKit one anyways, though. 1712935 3 415679 jbedard 2020-12-08 14:39:44 -0800 Created attachment 415679 Patch 1712938 4 dewei_zhu 2020-12-08 14:49:02 -0800 r=me 1712939 5 415680 jbedard 2020-12-08 14:55:57 -0800 Created attachment 415680 Patch for landing 1712950 6 ews-feeder 2020-12-08 15:23:41 -0800 Committed r270558: <https://trac.webkit.org/changeset/270558> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415680. 415679 2020-12-08 14:39:44 -0800 2020-12-08 14:55:54 -0800 Patch bug-219271-20201208163942.patch text/plain 5546 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MDU1NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDIwLTEyLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBEZWZlciBweXBpIGluZGV4IGNoZWNrIHVudGls IHVzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTkyNzEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNzQ4MjUwPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weTogQnVtcCB2ZXJzaW9uLgorICAgICAg ICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3Rh bGwucHk6CisgICAgICAgIChQYWNrYWdlLkFyY2hpdmUuZG93bmxvYWQpOiBWZXJpZnkgb3VyIGlu ZGV4IGJlZm9yZSB1c2luZyBpdC4KKyAgICAgICAgKFBhY2thZ2UuYXJjaGl2ZXMpOiBEaXR0by4K KyAgICAgICAgKEF1dG9JbnN0YWxsKTogUHJvdmlkZSB2YXJpYWJsZXMgdG8gY2FjaGUgaW5mb3Jt YXRpb24gbmVlZGVkIGZvciBweXBpIGluZGV4IHZlcmlmaWNhdGlvbi4KKyAgICAgICAgKEF1dG9J bnN0YWxsLl92ZXJpZnlfaW5kZXgpOiBWZXJpZnkgdGhlIGN1cnJlbnQgaW5kZXggaXMgcmVhY2hh YmxlIGlmIGEgZmFsbGJhY2sgaW5kZXggZXhpc3RzLgorICAgICAgICAoQXV0b0luc3RhbGwuc2V0 X2luZGV4KTogRGVmZXIgY2hlY2tpbmcgdGhlIHByb3ZpZGVkIGluZGV4IGJ5IGRlZmF1bHQuCisK IDIwMjAtMTItMDggIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAg ICAgIFt3ZWJraXRjb3JlcHldIEZpeCBjYXNlIHdoZXJlIGNhY2hlZD1UcnVlIHdpdGggb3RoZXIg YXJndW1lbnRzCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Vi a2l0Y29yZXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI3MDU1 NSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkv X19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDcgQEAgZnJvbSB3ZWJraXRj b3JlcHkudGltZW91dCBpbXBvcnQgVGltZW91dAogZnJvbSB3ZWJraXRjb3JlcHkuc3VicHJvY2Vz c191dGlscyBpbXBvcnQgVGltZW91dEV4cGlyZWQsIENvbXBsZXRlZFByb2Nlc3MsIHJ1bgogZnJv bSB3ZWJraXRjb3JlcHkub3V0cHV0X2NhcHR1cmUgaW1wb3J0IExvZ2dlckNhcHR1cmUsIE91dHB1 dENhcHR1cmUsIE91dHB1dER1cGxpY2F0ZQogCi12ZXJzaW9uID0gVmVyc2lvbigwLCA0LCAyMykK K3ZlcnNpb24gPSBWZXJzaW9uKDAsIDQsIDI0KQogCiBmcm9tIHdlYmtpdGNvcmVweS5hdXRvaW5z dGFsbCBpbXBvcnQgUGFja2FnZSwgQXV0b0luc3RhbGwKIGlmIHN5cy52ZXJzaW9uX2luZm8gPiAo MywgMCk6CkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0 Y29yZXB5L2F1dG9pbnN0YWxsLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkJKHJldmlzaW9uIDI3 MDU1NSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3Jl cHkvYXV0b2luc3RhbGwucHkJKHdvcmtpbmcgY29weSkKQEAgLTY0LDYgKzY0LDcgQEAgY2xhc3Mg UGFja2FnZShvYmplY3QpOgogICAgICAgICAgICAgcmV0dXJuICd7fS97fS17fS57fScuZm9ybWF0 KEF1dG9JbnN0YWxsLmRpcmVjdG9yeSwgc2VsZi5uYW1lLCBzZWxmLnZlcnNpb24sIHNlbGYuZXh0 ZW5zaW9uKQogCiAgICAgICAgIGRlZiBkb3dubG9hZChzZWxmKToKKyAgICAgICAgICAgIEF1dG9J bnN0YWxsLl92ZXJpZnlfaW5kZXgoKQogICAgICAgICAgICAgcmVzcG9uc2UgPSBBdXRvSW5zdGFs bC5fcmVxdWVzdChzZWxmLmxpbmspCiAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAg aWYgcmVzcG9uc2UuY29kZSAhPSAyMDA6CkBAIC0xMTcsNiArMTE4LDcgQEAgY2xhc3MgUGFja2Fn ZShvYmplY3QpOgogICAgICAgICBpZiBzZWxmLl9hcmNoaXZlczoKICAgICAgICAgICAgIHJldHVy biBzZWxmLl9hcmNoaXZlcwogCisgICAgICAgIEF1dG9JbnN0YWxsLl92ZXJpZnlfaW5kZXgoKQog ICAgICAgICBwYXRoID0gJ3NpbXBsZS97fS8nLmZvcm1hdChzZWxmLnB5cGlfbmFtZSkKICAgICAg ICAgcmVzcG9uc2UgPSBBdXRvSW5zdGFsbC5fcmVxdWVzdCgnaHR0cHM6Ly97fS97fScuZm9ybWF0 KEF1dG9JbnN0YWxsLmluZGV4LCBwYXRoKSkKICAgICAgICAgdHJ5OgpAQCAtMzIyLDYgKzMyNCwx MCBAQCBjbGFzcyBBdXRvSW5zdGFsbChvYmplY3QpOgogICAgICMgUmVseSBvbiBvdXIgb3duIGNl cnRpZmljYXRlcyBmb3IgUHlQaSwgc2luY2Ugd2UgdXNlIFB5UGkgdG8gc3RhbmRhcmRpemUgcm9v dCBjZXJ0aWZpY2F0ZXMKICAgICBjYV9jZXJ0X3BhdGggPSBvcy5wYXRoLmpvaW4ob3MucGF0aC5k aXJuYW1lKF9fZmlsZV9fKSwgJ2NhY2VydC5wZW0nKQogCisgICAgX3ByZXZpb3VzX2luZGV4ID0g Tm9uZQorICAgIF9wcmV2aW91c19jYV9jZXJ0X3BhdGggPSBOb25lCisgICAgX2ZhdGFsX2NoZWNr ID0gRmFsc2UKKwogICAgICMgV2hlbiBzaGFyaW5nIGFuIGluc3RhbGwgbG9jYXRpb24sIHByb2pl Y3RzIG1heSB3aXNoIHRvIG92ZXJ3cml0ZSBwYWNrYWdlcyBvbiBkaXNrCiAgICAgIyBvcmlnaW5h dGluZyBmcm9tIGEgZGlmZmVyZW50IGluZGV4LgogICAgIG92ZXJ3cml0ZV9mb3JlaWduX3BhY2th Z2VzID0gRmFsc2UKQEAgLTM5NSwzNSArNDAxLDUwIEBAIGNsYXNzIEF1dG9JbnN0YWxsKG9iamVj dCk6CiAgICAgICAgIGNscy5kaXJlY3RvcnkgPSBkaXJlY3RvcnkKIAogICAgIEBjbGFzc21ldGhv ZAotICAgIGRlZiBzZXRfaW5kZXgoY2xzLCBpbmRleCwgY2hlY2s9VHJ1ZSwgZmF0YWw9RmFsc2Us IGNhX2NlcnRfcGF0aD1Ob25lKToKLSAgICAgICAgaWYgbm90IGNoZWNrOgotICAgICAgICAgICAg Y2xzLmluZGV4ID0gaW5kZXgKLSAgICAgICAgICAgIGNscy5jYV9jZXJ0X3BhdGggPSBjYV9jZXJ0 X3BhdGgKLSAgICAgICAgICAgIHJldHVybiBjbHMuaW5kZXgKKyAgICBkZWYgX3ZlcmlmeV9pbmRl eChjbHMpOgorICAgICAgICBpZiBub3QgY2xzLl9wcmV2aW91c19pbmRleDoKKyAgICAgICAgICAg IHJldHVybgogCiAgICAgICAgIGRlZiBlcnJvcihtZXNzYWdlKToKLSAgICAgICAgICAgIGlmIGZh dGFsOgorICAgICAgICAgICAgaWYgY2xzLl9mYXRhbF9jaGVjazoKICAgICAgICAgICAgICAgICBy YWlzZSBWYWx1ZUVycm9yKG1lc3NhZ2UpCiAKICAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUo J3t9XG4nLmZvcm1hdChtZXNzYWdlKSkKLSAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoJ0Zh bGxpbmcgYmFjayB0byBjdXJyZW50IGluZGV4LCB7fVxuXG4nLmZvcm1hdChjbHMuaW5kZXgpKQor ICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgnRmFsbGluZyBiYWNrIHRvIHByZXZpb3VzIGlu ZGV4LCB7fVxuXG4nLmZvcm1hdChjbHMuX3ByZXZpb3VzX2luZGV4KSkKKworICAgICAgICAgICAg Y2xzLmluZGV4ID0gY2xzLl9wcmV2aW91c19pbmRleAorICAgICAgICAgICAgY2xzLmNhX2NlcnRf cGF0aCA9IGNscy5fcHJldmlvdXNfY2FfY2VydF9wYXRoCiAKICAgICAgICAgcmVzcG9uc2UgPSBO b25lCiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIHJlc3BvbnNlID0gQXV0b0luc3RhbGwuX3Jl cXVlc3QoJ2h0dHBzOi8ve30vc2ltcGxlL3BpcC8nLmZvcm1hdChpbmRleCksIGNhX2NlcnRfcGF0 aD1jYV9jZXJ0X3BhdGgpCisgICAgICAgICAgICByZXNwb25zZSA9IEF1dG9JbnN0YWxsLl9yZXF1 ZXN0KCdodHRwczovL3t9L3NpbXBsZS9waXAvJy5mb3JtYXQoY2xzLmluZGV4KSwgY2FfY2VydF9w YXRoPWNscy5jYV9jZXJ0X3BhdGgpCiAgICAgICAgICAgICBpZiByZXNwb25zZS5jb2RlICE9IDIw MDoKICAgICAgICAgICAgICAgICBlcnJvcignRmFpbGVkIHRvIHNldCBBdXRvSW5zdGFsbCBpbmRl eCB0byB7fSwgcmVjZWl2ZWQge30gcmVzcG9uc2Ugd2hlbiBzZWFyY2hpbmcgZm9yIHNpbXBsZS9w aXAnLmZvcm1hdChpbmRleCwgcmVzcG9uc2UuY29kZSkpCi0gICAgICAgICAgICBlbHNlOgotICAg ICAgICAgICAgICAgIGNscy5pbmRleCA9IGluZGV4Ci0gICAgICAgICAgICAgICAgY2xzLmNhX2Nl cnRfcGF0aCA9IGNhX2NlcnRfcGF0aAorCiAgICAgICAgIGV4Y2VwdCBVUkxFcnJvcjoKLSAgICAg ICAgICAgIGVycm9yKCdGYWlsZWQgdG8gc2V0IEF1dG9JbnN0YWxsIGluZGV4IHRvIHt9LCBubyBy ZXNwb25zZSBmcm9tIHRoZSBzZXJ2ZXInLmZvcm1hdChpbmRleCkpCisgICAgICAgICAgICBlcnJv cignRmFpbGVkIHRvIHNldCBBdXRvSW5zdGFsbCBpbmRleCB0byB7fSwgbm8gcmVzcG9uc2UgZnJv bSB0aGUgc2VydmVyJy5mb3JtYXQoY2xzLmluZGV4KSkKKwogICAgICAgICBmaW5hbGx5OgogICAg ICAgICAgICAgaWYgcmVzcG9uc2U6CiAgICAgICAgICAgICAgICAgcmVzcG9uc2UuY2xvc2UoKQog Ci0gICAgICAgIHJldHVybiBjbHMuaW5kZXgKKyAgICAgICAgICAgIGNscy5fcHJldmlvdXNfaW5k ZXggPSBOb25lCisgICAgICAgICAgICBjbHMuX3ByZXZpb3VzX2NhX2NlcnRfcGF0aCA9IE5vbmUK KyAgICAgICAgICAgIGNscy5fZmF0YWxfY2hlY2sgPSBGYWxzZQorCisgICAgQGNsYXNzbWV0aG9k CisgICAgZGVmIHNldF9pbmRleChjbHMsIGluZGV4LCBjaGVjaz1GYWxzZSwgZmF0YWw9RmFsc2Us IGNhX2NlcnRfcGF0aD1Ob25lKToKKyAgICAgICAgY2xzLl9wcmV2aW91c19pbmRleCA9IGNscy5p bmRleAorICAgICAgICBjbHMuX3ByZXZpb3VzX2NhX2NlcnRfcGF0aCA9IGNscy5jYV9jZXJ0X3Bh dGgKKyAgICAgICAgY2xzLl9mYXRhbF9jaGVjayA9IGZhdGFsCiAKKyAgICAgICAgY2xzLmluZGV4 ID0gaW5kZXgKKyAgICAgICAgY2xzLmNhX2NlcnRfcGF0aCA9IGNhX2NlcnRfcGF0aAorCisgICAg ICAgIGlmIGNoZWNrOgorICAgICAgICAgICAgY2xzLl92ZXJpZnlfaW5kZXgoKQorCisgICAgICAg IHJldHVybiBjbHMuaW5kZXgKIAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBzZXRfdGltZW91 dChjbHMsIHRpbWVvdXQpOgo= 415680 2020-12-08 14:55:57 -0800 2020-12-08 15:23:42 -0800 Patch for landing bug-219271-20201208165556.patch text/plain 5541 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MDU1NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDIwLTEyLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBEZWZlciBweXBpIGluZGV4IGNoZWNrIHVudGls IHVzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTkyNzEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNzQ4MjUwPgorCisgICAgICAgIFJldmll d2VkIGJ5IERld2VpIFpodS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNv cmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBT Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5 OgorICAgICAgICAoUGFja2FnZS5BcmNoaXZlLmRvd25sb2FkKTogVmVyaWZ5IG91ciBpbmRleCBi ZWZvcmUgdXNpbmcgaXQuCisgICAgICAgIChQYWNrYWdlLmFyY2hpdmVzKTogRGl0dG8uCisgICAg ICAgIChBdXRvSW5zdGFsbCk6IFByb3ZpZGUgdmFyaWFibGVzIHRvIGNhY2hlIGluZm9ybWF0aW9u IG5lZWRlZCBmb3IgcHlwaSBpbmRleCB2ZXJpZmljYXRpb24uCisgICAgICAgIChBdXRvSW5zdGFs bC5fdmVyaWZ5X2luZGV4KTogVmVyaWZ5IHRoZSBjdXJyZW50IGluZGV4IGlzIHJlYWNoYWJsZSBp ZiBhIGZhbGxiYWNrIGluZGV4IGV4aXN0cy4KKyAgICAgICAgKEF1dG9JbnN0YWxsLnNldF9pbmRl eCk6IERlZmVyIGNoZWNraW5nIHRoZSBwcm92aWRlZCBpbmRleCBieSBkZWZhdWx0LgorCiAyMDIw LTEyLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBb d2Via2l0Y29yZXB5XSBGaXggY2FzZSB3aGVyZSBjYWNoZWQ9VHJ1ZSB3aXRoIG90aGVyIGFyZ3Vt ZW50cwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNv cmVweS9fX2luaXRfXy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CShyZXZpc2lvbiAyNzA1NTUpCisr KyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5p dF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zNSw3ICszNSw3IEBAIGZyb20gd2Via2l0Y29yZXB5 LnRpbWVvdXQgaW1wb3J0IFRpbWVvdXQKIGZyb20gd2Via2l0Y29yZXB5LnN1YnByb2Nlc3NfdXRp bHMgaW1wb3J0IFRpbWVvdXRFeHBpcmVkLCBDb21wbGV0ZWRQcm9jZXNzLCBydW4KIGZyb20gd2Vi a2l0Y29yZXB5Lm91dHB1dF9jYXB0dXJlIGltcG9ydCBMb2dnZXJDYXB0dXJlLCBPdXRwdXRDYXB0 dXJlLCBPdXRwdXREdXBsaWNhdGUKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwgNCwgMjMpCit2ZXJz aW9uID0gVmVyc2lvbigwLCA0LCAyNCkKIAogZnJvbSB3ZWJraXRjb3JlcHkuYXV0b2luc3RhbGwg aW1wb3J0IFBhY2thZ2UsIEF1dG9JbnN0YWxsCiBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDAp OgpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVw eS9hdXRvaW5zdGFsbC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5CShyZXZpc2lvbiAyNzA1NTUp CisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1 dG9pbnN0YWxsLnB5CSh3b3JraW5nIGNvcHkpCkBAIC02NCw2ICs2NCw3IEBAIGNsYXNzIFBhY2th Z2Uob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybiAne30ve30te30ue30nLmZvcm1hdChBdXRv SW5zdGFsbC5kaXJlY3RvcnksIHNlbGYubmFtZSwgc2VsZi52ZXJzaW9uLCBzZWxmLmV4dGVuc2lv bikKIAogICAgICAgICBkZWYgZG93bmxvYWQoc2VsZik6CisgICAgICAgICAgICBBdXRvSW5zdGFs bC5fdmVyaWZ5X2luZGV4KCkKICAgICAgICAgICAgIHJlc3BvbnNlID0gQXV0b0luc3RhbGwuX3Jl cXVlc3Qoc2VsZi5saW5rKQogICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIGlmIHJl c3BvbnNlLmNvZGUgIT0gMjAwOgpAQCAtMTE3LDYgKzExOCw3IEBAIGNsYXNzIFBhY2thZ2Uob2Jq ZWN0KToKICAgICAgICAgaWYgc2VsZi5fYXJjaGl2ZXM6CiAgICAgICAgICAgICByZXR1cm4gc2Vs Zi5fYXJjaGl2ZXMKIAorICAgICAgICBBdXRvSW5zdGFsbC5fdmVyaWZ5X2luZGV4KCkKICAgICAg ICAgcGF0aCA9ICdzaW1wbGUve30vJy5mb3JtYXQoc2VsZi5weXBpX25hbWUpCiAgICAgICAgIHJl c3BvbnNlID0gQXV0b0luc3RhbGwuX3JlcXVlc3QoJ2h0dHBzOi8ve30ve30nLmZvcm1hdChBdXRv SW5zdGFsbC5pbmRleCwgcGF0aCkpCiAgICAgICAgIHRyeToKQEAgLTMyMiw2ICszMjQsMTAgQEAg Y2xhc3MgQXV0b0luc3RhbGwob2JqZWN0KToKICAgICAjIFJlbHkgb24gb3VyIG93biBjZXJ0aWZp Y2F0ZXMgZm9yIFB5UGksIHNpbmNlIHdlIHVzZSBQeVBpIHRvIHN0YW5kYXJkaXplIHJvb3QgY2Vy dGlmaWNhdGVzCiAgICAgY2FfY2VydF9wYXRoID0gb3MucGF0aC5qb2luKG9zLnBhdGguZGlybmFt ZShfX2ZpbGVfXyksICdjYWNlcnQucGVtJykKIAorICAgIF9wcmV2aW91c19pbmRleCA9IE5vbmUK KyAgICBfcHJldmlvdXNfY2FfY2VydF9wYXRoID0gTm9uZQorICAgIF9mYXRhbF9jaGVjayA9IEZh bHNlCisKICAgICAjIFdoZW4gc2hhcmluZyBhbiBpbnN0YWxsIGxvY2F0aW9uLCBwcm9qZWN0cyBt YXkgd2lzaCB0byBvdmVyd3JpdGUgcGFja2FnZXMgb24gZGlzawogICAgICMgb3JpZ2luYXRpbmcg ZnJvbSBhIGRpZmZlcmVudCBpbmRleC4KICAgICBvdmVyd3JpdGVfZm9yZWlnbl9wYWNrYWdlcyA9 IEZhbHNlCkBAIC0zOTUsMzUgKzQwMSw1MCBAQCBjbGFzcyBBdXRvSW5zdGFsbChvYmplY3QpOgog ICAgICAgICBjbHMuZGlyZWN0b3J5ID0gZGlyZWN0b3J5CiAKICAgICBAY2xhc3NtZXRob2QKLSAg ICBkZWYgc2V0X2luZGV4KGNscywgaW5kZXgsIGNoZWNrPVRydWUsIGZhdGFsPUZhbHNlLCBjYV9j ZXJ0X3BhdGg9Tm9uZSk6Ci0gICAgICAgIGlmIG5vdCBjaGVjazoKLSAgICAgICAgICAgIGNscy5p bmRleCA9IGluZGV4Ci0gICAgICAgICAgICBjbHMuY2FfY2VydF9wYXRoID0gY2FfY2VydF9wYXRo Ci0gICAgICAgICAgICByZXR1cm4gY2xzLmluZGV4CisgICAgZGVmIF92ZXJpZnlfaW5kZXgoY2xz KToKKyAgICAgICAgaWYgbm90IGNscy5fcHJldmlvdXNfaW5kZXg6CisgICAgICAgICAgICByZXR1 cm4KIAogICAgICAgICBkZWYgZXJyb3IobWVzc2FnZSk6Ci0gICAgICAgICAgICBpZiBmYXRhbDoK KyAgICAgICAgICAgIGlmIGNscy5fZmF0YWxfY2hlY2s6CiAgICAgICAgICAgICAgICAgcmFpc2Ug VmFsdWVFcnJvcihtZXNzYWdlKQogCiAgICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRlKCd7fVxu Jy5mb3JtYXQobWVzc2FnZSkpCi0gICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRlKCdGYWxsaW5n IGJhY2sgdG8gY3VycmVudCBpbmRleCwge31cblxuJy5mb3JtYXQoY2xzLmluZGV4KSkKKyAgICAg ICAgICAgIHN5cy5zdGRlcnIud3JpdGUoJ0ZhbGxpbmcgYmFjayB0byBwcmV2aW91cyBpbmRleCwg e31cblxuJy5mb3JtYXQoY2xzLl9wcmV2aW91c19pbmRleCkpCisKKyAgICAgICAgICAgIGNscy5p bmRleCA9IGNscy5fcHJldmlvdXNfaW5kZXgKKyAgICAgICAgICAgIGNscy5jYV9jZXJ0X3BhdGgg PSBjbHMuX3ByZXZpb3VzX2NhX2NlcnRfcGF0aAogCiAgICAgICAgIHJlc3BvbnNlID0gTm9uZQog ICAgICAgICB0cnk6Ci0gICAgICAgICAgICByZXNwb25zZSA9IEF1dG9JbnN0YWxsLl9yZXF1ZXN0 KCdodHRwczovL3t9L3NpbXBsZS9waXAvJy5mb3JtYXQoaW5kZXgpLCBjYV9jZXJ0X3BhdGg9Y2Ff Y2VydF9wYXRoKQorICAgICAgICAgICAgcmVzcG9uc2UgPSBBdXRvSW5zdGFsbC5fcmVxdWVzdCgn aHR0cHM6Ly97fS9zaW1wbGUvcGlwLycuZm9ybWF0KGNscy5pbmRleCksIGNhX2NlcnRfcGF0aD1j bHMuY2FfY2VydF9wYXRoKQogICAgICAgICAgICAgaWYgcmVzcG9uc2UuY29kZSAhPSAyMDA6CiAg ICAgICAgICAgICAgICAgZXJyb3IoJ0ZhaWxlZCB0byBzZXQgQXV0b0luc3RhbGwgaW5kZXggdG8g e30sIHJlY2VpdmVkIHt9IHJlc3BvbnNlIHdoZW4gc2VhcmNoaW5nIGZvciBzaW1wbGUvcGlwJy5m b3JtYXQoaW5kZXgsIHJlc3BvbnNlLmNvZGUpKQotICAgICAgICAgICAgZWxzZToKLSAgICAgICAg ICAgICAgICBjbHMuaW5kZXggPSBpbmRleAotICAgICAgICAgICAgICAgIGNscy5jYV9jZXJ0X3Bh dGggPSBjYV9jZXJ0X3BhdGgKKwogICAgICAgICBleGNlcHQgVVJMRXJyb3I6Ci0gICAgICAgICAg ICBlcnJvcignRmFpbGVkIHRvIHNldCBBdXRvSW5zdGFsbCBpbmRleCB0byB7fSwgbm8gcmVzcG9u c2UgZnJvbSB0aGUgc2VydmVyJy5mb3JtYXQoaW5kZXgpKQorICAgICAgICAgICAgZXJyb3IoJ0Zh aWxlZCB0byBzZXQgQXV0b0luc3RhbGwgaW5kZXggdG8ge30sIG5vIHJlc3BvbnNlIGZyb20gdGhl IHNlcnZlcicuZm9ybWF0KGNscy5pbmRleCkpCisKICAgICAgICAgZmluYWxseToKICAgICAgICAg ICAgIGlmIHJlc3BvbnNlOgogICAgICAgICAgICAgICAgIHJlc3BvbnNlLmNsb3NlKCkKIAotICAg ICAgICByZXR1cm4gY2xzLmluZGV4CisgICAgICAgICAgICBjbHMuX3ByZXZpb3VzX2luZGV4ID0g Tm9uZQorICAgICAgICAgICAgY2xzLl9wcmV2aW91c19jYV9jZXJ0X3BhdGggPSBOb25lCisgICAg ICAgICAgICBjbHMuX2ZhdGFsX2NoZWNrID0gRmFsc2UKKworICAgIEBjbGFzc21ldGhvZAorICAg IGRlZiBzZXRfaW5kZXgoY2xzLCBpbmRleCwgY2hlY2s9RmFsc2UsIGZhdGFsPUZhbHNlLCBjYV9j ZXJ0X3BhdGg9Tm9uZSk6CisgICAgICAgIGNscy5fcHJldmlvdXNfaW5kZXggPSBjbHMuaW5kZXgK KyAgICAgICAgY2xzLl9wcmV2aW91c19jYV9jZXJ0X3BhdGggPSBjbHMuY2FfY2VydF9wYXRoCisg ICAgICAgIGNscy5fZmF0YWxfY2hlY2sgPSBmYXRhbAogCisgICAgICAgIGNscy5pbmRleCA9IGlu ZGV4CisgICAgICAgIGNscy5jYV9jZXJ0X3BhdGggPSBjYV9jZXJ0X3BhdGgKKworICAgICAgICBp ZiBjaGVjazoKKyAgICAgICAgICAgIGNscy5fdmVyaWZ5X2luZGV4KCkKKworICAgICAgICByZXR1 cm4gY2xzLmluZGV4CiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgc2V0X3RpbWVvdXQoY2xz LCB0aW1lb3V0KToK