221609 2021-02-09 08:28:37 -0800 [webkitscmpy] Correctly parse branch commits 2021-02-09 09:35:46 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain webkit-bug-importer oldest_to_newest 1727053 0 jbedard 2021-02-09 08:28:37 -0800 Most branch commits contain a revision in their changelog. We should only respect the final revision in a changelog. 1727054 1 webkit-bug-importer 2021-02-09 08:28:48 -0800 <rdar://problem/74142906> 1727061 2 419722 jbedard 2021-02-09 08:40:47 -0800 Created attachment 419722 Patch 1727063 3 419722 aakash_jain 2021-02-09 08:44:13 -0800 Comment on attachment 419722 Patch rs=me 1727069 4 419726 jbedard 2021-02-09 08:48:47 -0800 Created attachment 419726 Patch for landing 1727087 5 ews-feeder 2021-02-09 09:35:45 -0800 Committed r272581: <https://commits.webkit.org/r272581> All reviewed patches have been landed. Closing bug and clearing flags on attachment 419726. 419722 2021-02-09 08:40:47 -0800 2021-02-09 08:48:44 -0800 Patch bug-221609-20210209084046.patch text/plain 6281 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MjU4MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDIxLTAyLTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIENvcnJlY3RseSBwYXJzZSBicmFuY2ggY29tbWl0 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNjA5 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDE0MjkwNj4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERpdHRvLgorICAgICAgICAqIFNj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weToKKyAg ICAgICAgKEdpdC5jb21taXQpOiBPbmx5IHJlc3BlY3QgdGhlIGxhc3QgcmV2aXNpb24gaW4gYSBj b21taXQgbWVzc2FnZS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9tb2Nrcy9naXQtcmVwby5qc29uOiBNYWtlIG9uZSBjb21taXQgc2ltaWxhcgor ICAgICAgICB0byBhIGNoZXJyeS1waWNrLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5OgorICAgICAgICAoR2l0SHVi LmNvbW1pdCk6IE9ubHkgcmVzcGVjdCB0aGUgbGFzdCByZXZpc2lvbiBpbiBhIGNvbW1pdCBtZXNz YWdlLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvZmluZF91bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RGaW5kLnRlc3RfaGFzaCk6IENo YW5nZSBjb21taXQgYmVpbmcgdGVzdGVkIHNpbmNlIG9yaWdpbmFsIGNvbW1pdCB3b3VsZAorICAg ICAgICByZXNvbHZlIGEgcmV2aXNpb24uCisKIDIwMjEtMDItMDkgIERhbmllbCBLb2xlc2EgIDxk a29sZXNhQGlnYWxpYS5jb20+CiAKICAgICAgICAgQWxsb3cgaWNlY3JlYW0gdG9vbGNoYWluIG92 ZXJyaWRlIGluIGZsYXRwYWt1dGlscwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvc2V0dXAucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvc2V0dXAucHkJKHJldmlzaW9uIDI3MjU3OSkKKysrIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMSw3ICsy MSw2IEBACiAjIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgogCiBmcm9tIHNldHVwdG9vbHMgaW1wb3J0IHNldHVwCi1mcm9tIHdlYmtp dHNjbXB5IGltcG9ydCB2ZXJzaW9uCiAKIGRlZiByZWFkbWUoKToKICAgICB3aXRoIG9wZW4oJ1JF QURNRS5tZCcpIGFzIGY6CkBAIC0zMCw3ICsyOSw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAo CiAgICAgbmFtZT0nd2Via2l0c2NtcHknLAotICAgIHZlcnNpb249cmVwcih2ZXJzaW9uKSwKKyAg ICB2ZXJzaW9uPScwLjkuOCcsCiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgZGVzaWduZWQgdG8g aW50ZXJhY3Qgd2l0aCBnaXQgYW5kIHN2biByZXBvc2l0b3JpZXMuJywKICAgICBsb25nX2Rlc2Ny aXB0aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZpZXJzPVsKSW5kZXg6IFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5p dF9fLnB5CShyZXZpc2lvbiAyNzI1NzkpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtNDYsNyAr NDYsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3ZWJr aXRjb3JlcHkgd2l0aCBgcGlwIGluc3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgtdXJs IDxwYWNrYWdlIGluZGV4IFVSTD5gIgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwgOSwg NykKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDksIDgpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBh Y2thZ2UoJ2VudHJ5cG9pbnRzJywgVmVyc2lvbigwLCAzLCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdp c3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJzaW9uKDAsIDE1LCAwKSkpCkluZGV4OiBUb29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbG9jYWwvZ2l0LnB5CShyZXZpc2lvbiAyNzI1NzkpCisrKyBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkJKHdvcmtpbmcgY29w eSkKQEAgLTI0Nyw4ICsyNDcsOCBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgaWYgYnJhbmNo X3BvaW50IGFuZCBwYXJzZWRfYnJhbmNoX3BvaW50IGFuZCBicmFuY2hfcG9pbnQgIT0gcGFyc2Vk X2JyYW5jaF9wb2ludDoKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIlByb3ZpZGVkICdi cmFuY2hfcG9pbnQnIGRvZXMgbm90IG1hdGNoIGJyYW5jaCBwb2ludCBvZiBzcGVjaWZpZWQgYnJh bmNoIikKIAotICAgICAgICBtYXRjaCA9IHNlbGYuR0lUX1NWTl9SRVZJU0lPTi5zZWFyY2gobG9n LnN0ZG91dCkKLSAgICAgICAgcmV2aXNpb24gPSBpbnQobWF0Y2guZ3JvdXAoJ3JldmlzaW9uJykp IGlmIG1hdGNoIGVsc2UgTm9uZQorICAgICAgICBtYXRjaGVzID0gc2VsZi5HSVRfU1ZOX1JFVklT SU9OLmZpbmRhbGwobG9nLnN0ZG91dCkKKyAgICAgICAgcmV2aXNpb24gPSBpbnQobWF0Y2hlc1st MV0uc3BsaXQoJ0AnKVswXSkgaWYgbWF0Y2hlcyBlbHNlIE5vbmUKIAogICAgICAgICBjb21taXRf dGltZSA9IHJ1bigKICAgICAgICAgICAgIFtzZWxmLmV4ZWN1dGFibGUoKSwgJ3Nob3cnLCAnLXMn LCAnLS1mb3JtYXQ9JWN0JywgaGFzaF0sCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9naXQtcmVwby5qc29uCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2dp dC1yZXBvLmpzb24JKHJldmlzaW9uIDI3MjU3OSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2dpdC1yZXBvLmpzb24JKHdvcmtpbmcgY29w eSkKQEAgLTgyLDcgKzgyLDcgQEAKICAgICAgICAgICAgIH0sIAogICAgICAgICAgICAgInRpbWVz dGFtcCI6IDE2MDE2NjQwMDAsIAogICAgICAgICAgICAgImJyYW5jaCI6ICJicmFuY2gtYiIsIAot ICAgICAgICAgICAgIm1lc3NhZ2UiOiAiNXRoIGNvbW1pdFxuIiwgCisgICAgICAgICAgICAibWVz c2FnZSI6ICI1dGggY29tbWl0XG4gICAgQ2hlcnJ5IHBpY2tcbiAgICBnaXQtc3ZuLWlkOiBodHRw czovL3N2bi53ZWJraXQub3JnL3JlcG9zaXRvcnkvd2Via2l0L3RydW5rQDYgMjY4ZjQ1Y2MtY2Qw OS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjIiwKICAgICAgICAgICAgICJpZGVudGlmaWVyIjogIjIu MkBicmFuY2gtYiIsIAogICAgICAgICAgICAgInJldmlzaW9uIjogNQogICAgICAgICB9LCAKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90 ZS9naXRfaHViLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5CShyZXZpc2lvbiAyNzI1NzkpCisr KyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUv Z2l0X2h1Yi5weQkod29ya2luZyBjb3B5KQpAQCAtMzE3LDggKzMxNyw4IEBAIGNsYXNzIEdpdEh1 YihTY20pOgogICAgICAgICAgICAgICAgIGlkZW50aWZpZXIgPSBzZWxmLl9kaWZmZXJlbmNlKHNl bGYuZGVmYXVsdF9icmFuY2gsIGNvbW1pdF9kYXRhWydzaGEnXSkKICAgICAgICAgICAgIGJyYW5j aF9wb2ludCA9IHNlbGYuX2NvdW50X2Zvcl9yZWYocmVmPWNvbW1pdF9kYXRhWydzaGEnXSlbMF0g LSBpZGVudGlmaWVyCiAKLSAgICAgICAgbWF0Y2ggPSBzZWxmLkdJVF9TVk5fUkVWSVNJT04uc2Vh cmNoKGNvbW1pdF9kYXRhWydjb21taXQnXVsnbWVzc2FnZSddKQotICAgICAgICByZXZpc2lvbiA9 IGludChtYXRjaC5ncm91cCgncmV2aXNpb24nKSkgaWYgbWF0Y2ggZWxzZSBOb25lCisgICAgICAg IG1hdGNoZXMgPSBzZWxmLkdJVF9TVk5fUkVWSVNJT04uZmluZGFsbChjb21taXRfZGF0YVsnY29t bWl0J11bJ21lc3NhZ2UnXSkKKyAgICAgICAgcmV2aXNpb24gPSBpbnQobWF0Y2hlc1stMV0uc3Bs aXQoJ0AnKVswXSkgaWYgbWF0Y2hlcyBlbHNlIE5vbmUKIAogICAgICAgICBkYXRlID0gZGF0ZXRp bWUuc3RycHRpbWUoY29tbWl0X2RhdGFbJ2NvbW1pdCddWydjb21taXR0ZXInXVsnZGF0ZSddLCAn JVktJW0tJWRUJUg6JU06JVNaJykKICAgICAgICAgZW1haWxfbWF0Y2ggPSBzZWxmLkVNQUlMX1JF Lm1hdGNoKGNvbW1pdF9kYXRhWydjb21taXQnXVsnYXV0aG9yJ11bJ2VtYWlsJ10pCkluZGV4OiBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRf dW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9maW5kX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzI1Nzkp CisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0 L2ZpbmRfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTEwMSwxMCArMTAxLDEwIEBAIGNs YXNzIFRlc3RGaW5kKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9oYXNoKHNlbGYp OgogICAgICAgICB3aXRoIE91dHB1dENhcHR1cmUoKSBhcyBjYXB0dXJlZCwgbW9ja3MubG9jYWwu R2l0KHNlbGYucGF0aCksIG1vY2tzLmxvY2FsLlN2bigpLCBNb2NrVGltZToKICAgICAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoMCwgcHJvZ3JhbS5tYWluKAotICAgICAgICAgICAgICAgIGFyZ3M9 KCdmaW5kJywgJzNjZDMyZTM1MjQxMCcsICctcScpLAorICAgICAgICAgICAgICAgIGFyZ3M9KCdm aW5kJywgJzc5MDcyNWE2JywgJy1xJyksCiAgICAgICAgICAgICAgICAgcGF0aD1zZWxmLnBhdGgs CiAgICAgICAgICAgICApKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLnN0ZG91 dC5nZXR2YWx1ZSgpLCAnMi4yQGJyYW5jaC1iIHwgM2NkMzJlMzUyNDEwIHwgNXRoIGNvbW1pdFxu JykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRvdXQuZ2V0dmFsdWUoKSwg JzIuM0BicmFuY2gtYiB8IDc5MDcyNWE2ZDc5ZSB8IDh0aCBjb21taXRcbicpCiAKICAgICBkZWYg dGVzdF9yZXZpc2lvbl9zdm4oc2VsZik6CiAgICAgICAgIHdpdGggT3V0cHV0Q2FwdHVyZSgpIGFz IGNhcHR1cmVkLCBtb2Nrcy5sb2NhbC5HaXQoKSwgbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCks IE1vY2tUaW1lOgo= 419726 2021-02-09 08:48:47 -0800 2021-02-09 09:35:46 -0800 Patch for landing bug-221609-20210209084846.patch text/plain 6284 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MjU4MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDIxLTAyLTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIENvcnJlY3RseSBwYXJzZSBicmFuY2ggY29tbWl0 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNjA5 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDE0MjkwNj4KKworICAgICAgICBSdWJiZXItc3Rh bXBlZCBieSBBYWthc2ggSmFpbi4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERpdHRvLgorICAgICAgICAq IFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weToK KyAgICAgICAgKEdpdC5jb21taXQpOiBPbmx5IHJlc3BlY3QgdGhlIGxhc3QgcmV2aXNpb24gaW4g YSBjb21taXQgbWVzc2FnZS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9tb2Nrcy9naXQtcmVwby5qc29uOiBNYWtlIG9uZSBjb21taXQgc2ltaWxh cgorICAgICAgICB0byBhIGNoZXJyeS1waWNrLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5OgorICAgICAgICAoR2l0 SHViLmNvbW1pdCk6IE9ubHkgcmVzcGVjdCB0aGUgbGFzdCByZXZpc2lvbiBpbiBhIGNvbW1pdCBt ZXNzYWdlLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj bXB5L3Rlc3QvZmluZF91bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RGaW5kLnRlc3RfaGFzaCk6 IENoYW5nZSBjb21taXQgYmVpbmcgdGVzdGVkIHNpbmNlIG9yaWdpbmFsIGNvbW1pdCB3b3VsZAor ICAgICAgICByZXNvbHZlIGEgcmV2aXNpb24uCisKIDIwMjEtMDItMDkgIERhbmllbCBLb2xlc2Eg IDxka29sZXNhQGlnYWxpYS5jb20+CiAKICAgICAgICAgQWxsb3cgaWNlY3JlYW0gdG9vbGNoYWlu IG92ZXJyaWRlIGluIGZsYXRwYWt1dGlscwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvc2V0dXAucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvc2V0dXAucHkJKHJldmlzaW9uIDI3MjU4MCkKKysrIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMSw3 ICsyMSw2IEBACiAjIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgogCiBmcm9tIHNldHVwdG9vbHMgaW1wb3J0IHNldHVwCi1mcm9tIHdl YmtpdHNjbXB5IGltcG9ydCB2ZXJzaW9uCiAKIGRlZiByZWFkbWUoKToKICAgICB3aXRoIG9wZW4o J1JFQURNRS5tZCcpIGFzIGY6CkBAIC0zMCw3ICsyOSw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0 dXAoCiAgICAgbmFtZT0nd2Via2l0c2NtcHknLAotICAgIHZlcnNpb249cmVwcih2ZXJzaW9uKSwK KyAgICB2ZXJzaW9uPScwLjkuOCcsCiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgZGVzaWduZWQg dG8gaW50ZXJhY3Qgd2l0aCBnaXQgYW5kIHN2biByZXBvc2l0b3JpZXMuJywKICAgICBsb25nX2Rl c2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZpZXJzPVsKSW5kZXg6IFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19f aW5pdF9fLnB5CShyZXZpc2lvbiAyNzI1ODApCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtNDYs NyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3 ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgt dXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwg OSwgNykKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDksIDgpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVy KFBhY2thZ2UoJ2VudHJ5cG9pbnRzJywgVmVyc2lvbigwLCAzLCAwKSkpCiBBdXRvSW5zdGFsbC5y ZWdpc3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJzaW9uKDAsIDE1LCAwKSkpCkluZGV4OiBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvbG9jYWwvZ2l0LnB5CShyZXZpc2lvbiAyNzI1ODApCisrKyBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkJKHdvcmtpbmcg Y29weSkKQEAgLTI0Nyw4ICsyNDcsOCBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgaWYgYnJh bmNoX3BvaW50IGFuZCBwYXJzZWRfYnJhbmNoX3BvaW50IGFuZCBicmFuY2hfcG9pbnQgIT0gcGFy c2VkX2JyYW5jaF9wb2ludDoKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIlByb3ZpZGVk ICdicmFuY2hfcG9pbnQnIGRvZXMgbm90IG1hdGNoIGJyYW5jaCBwb2ludCBvZiBzcGVjaWZpZWQg YnJhbmNoIikKIAotICAgICAgICBtYXRjaCA9IHNlbGYuR0lUX1NWTl9SRVZJU0lPTi5zZWFyY2go bG9nLnN0ZG91dCkKLSAgICAgICAgcmV2aXNpb24gPSBpbnQobWF0Y2guZ3JvdXAoJ3JldmlzaW9u JykpIGlmIG1hdGNoIGVsc2UgTm9uZQorICAgICAgICBtYXRjaGVzID0gc2VsZi5HSVRfU1ZOX1JF VklTSU9OLmZpbmRhbGwobG9nLnN0ZG91dCkKKyAgICAgICAgcmV2aXNpb24gPSBpbnQobWF0Y2hl c1stMV0uc3BsaXQoJ0AnKVswXSkgaWYgbWF0Y2hlcyBlbHNlIE5vbmUKIAogICAgICAgICBjb21t aXRfdGltZSA9IHJ1bigKICAgICAgICAgICAgIFtzZWxmLmV4ZWN1dGFibGUoKSwgJ3Nob3cnLCAn LXMnLCAnLS1mb3JtYXQ9JWN0JywgaGFzaF0sCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9naXQtcmVwby5qc29uCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tz L2dpdC1yZXBvLmpzb24JKHJldmlzaW9uIDI3MjU4MCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2dpdC1yZXBvLmpzb24JKHdvcmtpbmcg Y29weSkKQEAgLTgyLDcgKzgyLDcgQEAKICAgICAgICAgICAgIH0sIAogICAgICAgICAgICAgInRp bWVzdGFtcCI6IDE2MDE2NjQwMDAsIAogICAgICAgICAgICAgImJyYW5jaCI6ICJicmFuY2gtYiIs IAotICAgICAgICAgICAgIm1lc3NhZ2UiOiAiNXRoIGNvbW1pdFxuIiwgCisgICAgICAgICAgICAi bWVzc2FnZSI6ICI1dGggY29tbWl0XG4gICAgQ2hlcnJ5IHBpY2tcbiAgICBnaXQtc3ZuLWlkOiBo dHRwczovL3N2bi53ZWJraXQub3JnL3JlcG9zaXRvcnkvd2Via2l0L3RydW5rQDYgMjY4ZjQ1Y2Mt Y2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjIiwKICAgICAgICAgICAgICJpZGVudGlmaWVyIjog IjIuMkBicmFuY2gtYiIsIAogICAgICAgICAgICAgInJldmlzaW9uIjogNQogICAgICAgICB9LCAK SW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Jl bW90ZS9naXRfaHViLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5CShyZXZpc2lvbiAyNzI1ODAp CisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1v dGUvZ2l0X2h1Yi5weQkod29ya2luZyBjb3B5KQpAQCAtMzE3LDggKzMxNyw4IEBAIGNsYXNzIEdp dEh1YihTY20pOgogICAgICAgICAgICAgICAgIGlkZW50aWZpZXIgPSBzZWxmLl9kaWZmZXJlbmNl KHNlbGYuZGVmYXVsdF9icmFuY2gsIGNvbW1pdF9kYXRhWydzaGEnXSkKICAgICAgICAgICAgIGJy YW5jaF9wb2ludCA9IHNlbGYuX2NvdW50X2Zvcl9yZWYocmVmPWNvbW1pdF9kYXRhWydzaGEnXSlb MF0gLSBpZGVudGlmaWVyCiAKLSAgICAgICAgbWF0Y2ggPSBzZWxmLkdJVF9TVk5fUkVWSVNJT04u c2VhcmNoKGNvbW1pdF9kYXRhWydjb21taXQnXVsnbWVzc2FnZSddKQotICAgICAgICByZXZpc2lv biA9IGludChtYXRjaC5ncm91cCgncmV2aXNpb24nKSkgaWYgbWF0Y2ggZWxzZSBOb25lCisgICAg ICAgIG1hdGNoZXMgPSBzZWxmLkdJVF9TVk5fUkVWSVNJT04uZmluZGFsbChjb21taXRfZGF0YVsn Y29tbWl0J11bJ21lc3NhZ2UnXSkKKyAgICAgICAgcmV2aXNpb24gPSBpbnQobWF0Y2hlc1stMV0u c3BsaXQoJ0AnKVswXSkgaWYgbWF0Y2hlcyBlbHNlIE5vbmUKIAogICAgICAgICBkYXRlID0gZGF0 ZXRpbWUuc3RycHRpbWUoY29tbWl0X2RhdGFbJ2NvbW1pdCddWydjb21taXR0ZXInXVsnZGF0ZSdd LCAnJVktJW0tJWRUJUg6JU06JVNaJykKICAgICAgICAgZW1haWxfbWF0Y2ggPSBzZWxmLkVNQUlM X1JFLm1hdGNoKGNvbW1pdF9kYXRhWydjb21taXQnXVsnYXV0aG9yJ11bJ2VtYWlsJ10pCkluZGV4 OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2Zp bmRfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9maW5kX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzI1 ODApCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90 ZXN0L2ZpbmRfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTEwMSwxMCArMTAxLDEwIEBA IGNsYXNzIFRlc3RGaW5kKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9oYXNoKHNl bGYpOgogICAgICAgICB3aXRoIE91dHB1dENhcHR1cmUoKSBhcyBjYXB0dXJlZCwgbW9ja3MubG9j YWwuR2l0KHNlbGYucGF0aCksIG1vY2tzLmxvY2FsLlN2bigpLCBNb2NrVGltZToKICAgICAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoMCwgcHJvZ3JhbS5tYWluKAotICAgICAgICAgICAgICAgIGFy Z3M9KCdmaW5kJywgJzNjZDMyZTM1MjQxMCcsICctcScpLAorICAgICAgICAgICAgICAgIGFyZ3M9 KCdmaW5kJywgJzc5MDcyNWE2JywgJy1xJyksCiAgICAgICAgICAgICAgICAgcGF0aD1zZWxmLnBh dGgsCiAgICAgICAgICAgICApKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLnN0 ZG91dC5nZXR2YWx1ZSgpLCAnMi4yQGJyYW5jaC1iIHwgM2NkMzJlMzUyNDEwIHwgNXRoIGNvbW1p dFxuJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRvdXQuZ2V0dmFsdWUo KSwgJzIuM0BicmFuY2gtYiB8IDc5MDcyNWE2ZDc5ZSB8IDh0aCBjb21taXRcbicpCiAKICAgICBk ZWYgdGVzdF9yZXZpc2lvbl9zdm4oc2VsZik6CiAgICAgICAgIHdpdGggT3V0cHV0Q2FwdHVyZSgp IGFzIGNhcHR1cmVkLCBtb2Nrcy5sb2NhbC5HaXQoKSwgbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0 aCksIE1vY2tUaW1lOgo=