236539 2022-02-12 06:18:20 -0800 REGRESSION(r289687): broke commit queue 2022-02-12 06:21:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 235297 1 commit-queue commit-queue aakash_jain dewei_zhu jbedard webkit-bug-importer oldest_to_newest 1840682 0 commit-queue 2022-02-12 06:18:20 -0800 https://commits.webkit.org/r289687 introduced a regression: broke commit queue This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1840684 1 451784 commit-queue 2022-02-12 06:18:27 -0800 Created attachment 451784 REVERT of r289687 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1840685 2 451784 aakash_jain 2022-02-12 06:20:48 -0800 Comment on attachment 451784 REVERT of r289687 Clearing flags on attachment: 451784 Committed r289690 (247175@trunk): <https://commits.webkit.org/247175@trunk> 1840686 3 aakash_jain 2022-02-12 06:20:52 -0800 All reviewed patches have been landed. Closing bug. 1840687 4 webkit-bug-importer 2022-02-12 06:21:15 -0800 <rdar://problem/88854979> 451784 2022-02-12 06:18:27 -0800 2022-02-12 06:20:48 -0800 REVERT of r289687 bug-236539-20220212061826.patch text/plain 14042 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5Njg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTMyMTZhN2I3YjAwODRkOTVmZmFkNGU0NDRlZmE3YmRl ZTI4MTFjNy4uYjgwNWNkZGJhZDIxMTljNjdjYjQwNGJmMzE4NTYwOGU4ZDVkNWZhNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIyLTAyLTEyICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4K KworICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI4OTY4Ny4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjUzOQorCisgICAgICAgIGJyb2tl IGNvbW1pdCBxdWV1ZQorCisgICAgICAgIFJldmVydGVkIGNoYW5nZXNldDoKKworICAgICAgICAi Z2l0LXdlYmtpdCBzZXR1cCBzaG91bGQgYWxsb3cgY2hhbmdpbmcgdGhlIGNyZWRlbnRpYWxzIgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1Mjk3Cisg ICAgICAgIGh0dHBzOi8vY29tbWl0cy53ZWJraXQub3JnL3IyODk2ODcKKwogMjAyMi0wMi0wOCAg Sm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgZ2l0LXdlYmtp dCBzZXR1cCBzaG91bGQgYWxsb3cgY2hhbmdpbmcgdGhlIGNyZWRlbnRpYWxzCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRidWdzcHkvc2V0dXAucHkgYi9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRidWdzcHkvc2V0dXAucHkKaW5kZXggNjY4ODVlYmJmYmI1 YzUwOThjOGI1OTRkMTIwNmFhNWMwMWEwMGU5OC4uNjAxZDg5NDA1ZGJkM2ZjN2RlZWZiOGI2NmQx OTVjODlmZDdlZDE2MiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 YnVnc3B5L3NldHVwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGJ1Z3Nw eS9zZXR1cC5weQpAQCAtMzAsNyArMzAsNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAg IG5hbWU9J3dlYmtpdGJ1Z3NweScsCi0gICAgdmVyc2lvbj0nMC4zLjMnLAorICAgIHZlcnNpb249 JzAuMy4yJywKICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBjb250YWluaW5nIGEgc2hhcmVkIEFQ SSBmb3IgdmFyaW91cyBidWcgdHJhY2tlcnMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRt ZSgpLAogICAgIGNsYXNzaWZpZXJzPVsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGJ1Z3NweS93ZWJraXRidWdzcHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRidWdzcHkvd2Via2l0YnVnc3B5L19faW5pdF9fLnB5CmluZGV4IDYw MTRkYWUxMjVhNDE0MjQwZWVmY2ExNzdiODlkY2E1OWQ5NmIxNGUuLjBhMWYwZTdjODM0MTkzMDk5 NjhmNmY4YjFiYzVmZTdjMjdkYzdjMWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGJ1Z3NweS93ZWJraXRidWdzcHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0YnVnc3B5L3dlYmtpdGJ1Z3NweS9fX2luaXRfXy5weQpAQCAt NDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFs bCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5k ZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24o MCwgMywgMykKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDMsIDIpCiAKIGZyb20gLnVzZXIgaW1wb3J0 IFVzZXIKIGZyb20gLmlzc3VlIGltcG9ydCBJc3N1ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0YnVnc3B5L3dlYmtpdGJ1Z3NweS9idWd6aWxsYS5weSBiL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGJ1Z3NweS93ZWJraXRidWdzcHkvYnVnemlsbGEucHkK aW5kZXggOTA3NmUyMzhlMmZkNjk5MDFhODA5OWFkZjIxOTI1M2Q0ZmVhYjJhZS4uYWQzM2I0NTky ZTYxMjU5YzUzYWMxMDdjYTEzMTY1ZjA4ZTU2N2ZhZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0YnVnc3B5L3dlYmtpdGJ1Z3NweS9idWd6aWxsYS5weQorKysgYi9U b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRidWdzcHkvd2Via2l0YnVnc3B5L2J1Z3ppbGxh LnB5CkBAIC0xMTAsMTkgKzExMCwxMSBAQCBjbGFzcyBUcmFja2VyKEdlbmVyaWNUcmFja2VyKToK ICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5pc3N1ZShpbnQobWF0Y2guZ3JvdXAoJ2lkJykp KQogICAgICAgICByZXR1cm4gTm9uZQogCi0gICAgZGVmIGNyZWRlbnRpYWxzKHNlbGYsIHJlcXVp cmVkPVRydWUsIHZhbGlkYXRlPUZhbHNlKToKLSAgICAgICAgZGVmIHZhbGlkYXRlcih1c2VybmFt ZSwgcGFzc3dvcmQpOgotICAgICAgICAgICAgcmVzcG9uc2UgPSByZXF1ZXN0cy5nZXQoJ3t9L3Jl c3QvdXNlci97fT9sb2dpbj17fSZwYXNzd29yZD17fScuZm9ybWF0KHNlbGYudXJsLCB1c2VybmFt ZSwgdXNlcm5hbWUsIHBhc3N3b3JkKSkKLSAgICAgICAgICAgIGlmIHJlc3BvbnNlLnN0YXR1c19j b2RlID09IDIwMDoKLSAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQotICAgICAgICAgICAgc3lz LnN0ZGVyci53cml0ZSgnTG9naW4gdG8ge30gZm9yIHt9IGZhaWxlZFxuJy5mb3JtYXQoc2VsZi51 cmwsIHVzZXJuYW1lKSkKLSAgICAgICAgICAgIHJldHVybiBGYWxzZQotCisgICAgZGVmIGNyZWRl bnRpYWxzKHNlbGYsIHJlcXVpcmVkPVRydWUpOgogICAgICAgICByZXR1cm4gd2Via2l0Y29yZXB5 LmNyZWRlbnRpYWxzKAogICAgICAgICAgICAgdXJsPXNlbGYudXJsLAogICAgICAgICAgICAgcmVx dWlyZWQ9cmVxdWlyZWQsCiAgICAgICAgICAgICBwcm9tcHQ9c2VsZi51cmwuc3BsaXQoJy8vJylb LTFdLAotICAgICAgICAgICAgdmFsaWRhdGVyPXZhbGlkYXRlciBpZiB2YWxpZGF0ZSBlbHNlIE5v bmUsCiAgICAgICAgICkKIAogICAgIGRlZiBfbG9naW5fYXJndW1lbnRzKHNlbGYsIHJlcXVpcmVk PUZhbHNlLCBxdWVyeT1Ob25lKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdGJ1Z3NweS93ZWJraXRidWdzcHkvZ2l0aHViLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0YnVnc3B5L3dlYmtpdGJ1Z3NweS9naXRodWIucHkKaW5kZXggODQ0YTU1NzNh NTFkOWU4MjY3MmJlZWFhOWZhZjQ2MmVmMTg3YjU2Mi4uYTQxYWM4OGY2YTMyYTM5N2M0OWYwZjZj YjRmYzMyYTJjZjQzYTNkZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0YnVnc3B5L3dlYmtpdGJ1Z3NweS9naXRodWIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0YnVnc3B5L3dlYmtpdGJ1Z3NweS9naXRodWIucHkKQEAgLTg2LDIzICs4Niw5 IEBAIGNsYXNzIFRyYWNrZXIoR2VuZXJpY1RyYWNrZXIpOgogICAgICAgICAgICAgICAgIHJldHVy biBzZWxmLmlzc3VlKGludChtYXRjaC5ncm91cCgnaWQnKSkpCiAgICAgICAgIHJldHVybiBOb25l CiAKLSAgICBkZWYgY3JlZGVudGlhbHMoc2VsZiwgcmVxdWlyZWQ9VHJ1ZSwgdmFsaWRhdGU9RmFs c2UpOgotICAgICAgICBkZWYgdmFsaWRhdGVyKHVzZXJuYW1lLCBhY2Nlc3NfdG9rZW4pOgotICAg ICAgICAgICAgaWYgJ0AnIGluIHVzZXJuYW1lOgotICAgICAgICAgICAgICAgIHN5cy5zdGRlcnIu d3JpdGUoIlByb3ZpZGVkIHVzZXJuYW1lIGNvbnRhaW5zIGFuICdAJyBzeW1ib2wuIFBsZWFzZSBt YWtlIHN1cmUgdG8gZW50ZXIgeW91ciBHaXRIdWIgdXNlcm5hbWUsIG5vdCBhbiBlbWFpbCBhc3Nv Y2lhdGVkIHdpdGggdGhlIGFjY291bnRcbiIpCi0gICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNl Ci0gICAgICAgICAgICByZXNwb25zZSA9IHJlcXVlc3RzLmdldCgKLSAgICAgICAgICAgICAgICAn e30vdXNlcicuZm9ybWF0KHNlbGYuYXBpX3VybCksCi0gICAgICAgICAgICAgICAgaGVhZGVycz1k aWN0KEFjY2VwdD0nYXBwbGljYXRpb24vdm5kLmdpdGh1Yi52Mytqc29uJyksCi0gICAgICAgICAg ICAgICAgYXV0aD1IVFRQQmFzaWNBdXRoKHVzZXJuYW1lLCBhY2Nlc3NfdG9rZW4pLAotICAgICAg ICAgICAgKQotICAgICAgICAgICAgaWYgcmVzcG9uc2Uuc3RhdHVzX2NvZGUgPT0gMjAwIGFuZCBy ZXNwb25zZS5qc29uKCkuZ2V0KCdsb2dpbicpID09IHVzZXJuYW1lOgotICAgICAgICAgICAgICAg IHJldHVybiBUcnVlCi0gICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRlKCdMb2dpbiB0byB7fSBm b3Ige30gZmFpbGVkXG4nLmZvcm1hdChzZWxmLmFwaV91cmwsIHVzZXJuYW1lKSkKLSAgICAgICAg ICAgIHJldHVybiBGYWxzZQotCisgICAgZGVmIGNyZWRlbnRpYWxzKHNlbGYsIHJlcXVpcmVkPVRy dWUpOgogICAgICAgICBob3N0bmFtZSA9IHNlbGYudXJsLnNwbGl0KCcvJylbMl0KLSAgICAgICAg cmV0dXJuIHdlYmtpdGNvcmVweS5jcmVkZW50aWFscygKKyAgICAgICAgYXJncyA9IGRpY3QoCiAg ICAgICAgICAgICB1cmw9c2VsZi5hcGlfdXJsLAogICAgICAgICAgICAgcmVxdWlyZWQ9cmVxdWly ZWQsCiAgICAgICAgICAgICBuYW1lPXNlbGYudXJsLnNwbGl0KCcvJylbMl0ucmVwbGFjZSgnLics ICdfJykudXBwZXIoKSwKQEAgLTExMCw5ICs5NiwxNyBAQCBjbGFzcyBUcmFja2VyKEdlbmVyaWNU cmFja2VyKToKIFBsZWFzZSBnbyB0byBodHRwczovL3tob3N0fS9zZXR0aW5ncy90b2tlbnMvbmV3 IGFuZCBnZW5lcmF0ZSBhIG5ldyAnUGVyc29uYWwgYWNjZXNzIHRva2VuJyB2aWEgJ0RldmVsb3Bl ciBzZXR0aW5ncycKIHdpdGggJ3JlcG8nIGFuZCAnd29ya2Zsb3cnIGFjY2VzcyBhbmQgYXBwcm9w cmlhdGUgJ0V4cGlyYXRpb24nIGZvciB5b3VyIHtob3N0fSB1c2VyJycnLmZvcm1hdChob3N0PWhv c3RuYW1lKSwKICAgICAgICAgICAgIGtleV9uYW1lPSd0b2tlbicsCi0gICAgICAgICAgICB2YWxp ZGF0ZXI9dmFsaWRhdGVyIGlmIHZhbGlkYXRlIGVsc2UgTm9uZSwKICAgICAgICAgKQogCisgICAg ICAgIHVzZXJuYW1lLCB0b2tlbiA9IHdlYmtpdGNvcmVweS5jcmVkZW50aWFscygqKmFyZ3MpCisg ICAgICAgIGlmIHVzZXJuYW1lIGFuZCAnQCcgaW4gdXNlcm5hbWU6CisgICAgICAgICAgICBzeXMu c3RkZXJyLndyaXRlKCJQcm92aWRlZCB1c2VybmFtZSBjb250YWlucyBhbiAnQCcgc3ltYm9sLiBQ bGVhc2UgbWFrZSBzdXJlIHRvIGVudGVyIHlvdXIgR2l0SHViIHVzZXJuYW1lLCBub3QgYW4gZW1h aWwgYXNzb2NpYXRlZCB3aXRoIHRoZSBhY2NvdW50XG4iKQorICAgICAgICAgICAgd2Via2l0Y29y ZXB5LmRlbGV0ZV9jcmVkZW50aWFscyh1cmw9YXJnc1sndXJsJ10sIG5hbWU9YXJnc1snbmFtZSdd KQorICAgICAgICAgICAgdXNlcm5hbWUsIHRva2VuID0gd2Via2l0Y29yZXB5LmNyZWRlbnRpYWxz KCoqYXJncykKKyAgICAgICAgaWYgdXNlcm5hbWUgYW5kICdAJyBpbiB1c2VybmFtZToKKyAgICAg ICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIkdpdEh1YiB1c2VybmFtZXMgY2Fubm90IGhhdmUgJ0An IGluIHRoZW0iKQorICAgICAgICByZXR1cm4gdXNlcm5hbWUsIHRva2VuCisKICAgICBkZWYgcmVx dWVzdChzZWxmLCBwYXRoPU5vbmUsIHBhcmFtcz1Ob25lLCBoZWFkZXJzPU5vbmUsIGF1dGhlbnRp Y2F0ZWQ9Tm9uZSwgcGFnaW5hdGU9VHJ1ZSk6CiAgICAgICAgIGhlYWRlcnMgPSB7a2V5OiB2YWx1 ZSBmb3Iga2V5LCB2YWx1ZSBpbiBoZWFkZXJzLml0ZW1zKCl9IGlmIGhlYWRlcnMgZWxzZSBkaWN0 KCkKICAgICAgICAgaGVhZGVyc1snQWNjZXB0J10gPSBoZWFkZXJzLmdldCgnQWNjZXB0JywgJ2Fw cGxpY2F0aW9uL3ZuZC5naXRodWIudjMranNvbicpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0dXAucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRjb3JlcHkvc2V0dXAucHkKaW5kZXggM2E0MDA2NmVhMTRiNDMwYjE3NjQzYjI5YjFm N2Q3YmNlN2QyYWFkYi4uZWIyNTJlZjBjMTM3M2FlYmE0YTM4YmZkMTA0ZmY0ZTBmZWQ5MzAzMSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weQpAQCAt MzAsNyArMzAsNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dlYmtpdGNv cmVweScsCi0gICAgdmVyc2lvbj0nMC4xMy4wJywKKyAgICB2ZXJzaW9uPScwLjEyLjknLAogICAg IGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGNvbnRhaW5pbmcgdmFyaW91cyBQeXRob24gc3VwcG9ydCBj bGFzc2VzIGFuZCBmdW5jdGlvbnMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAog ICAgIGNsYXNzaWZpZXJzPVsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CmluZGV4IDg3MmNhMDMw NmE2NTc0YTJmMjc5NjUxZThhZjMzMzMzNDk3N2VkOTAuLmZhZDUwYTk5M2NmNjcxOTAxN2NkMDU5 Y2U0NjdkYmI2OTg0NzFjNzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQpAQCAtNDQsNyAr NDQsNyBAQCBmcm9tIHdlYmtpdGNvcmVweS5jYWxsX2J5X25lZWQgaW1wb3J0IENhbGxCeU5lZWQK IGZyb20gd2Via2l0Y29yZXB5LmVkaXRvciBpbXBvcnQgRWRpdG9yCiBmcm9tIHdlYmtpdGNvcmVw eS5maWxlX2xvY2sgaW1wb3J0IEZpbGVMb2NrCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDEzLCAw KQordmVyc2lvbiA9IFZlcnNpb24oMCwgMTIsIDEwKQogCiBmcm9tIHdlYmtpdGNvcmVweS5hdXRv aW5zdGFsbCBpbXBvcnQgUGFja2FnZSwgQXV0b0luc3RhbGwKIGlmIHN5cy52ZXJzaW9uX2luZm8g PiAoMywgMCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3Jl cHkvd2Via2l0Y29yZXB5L2NyZWRlbnRpYWxzLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9jcmVkZW50aWFscy5weQppbmRleCA4ZTU4YWY5OGM0 M2FiMjczYzg2OGU3YjY0NGZmYTIxZGQwZmY3NzQ5Li41MjgzM2QwNGU3YzU0M2Q2M2ZjMjM5ZDc2 NDVkNjY5MWU0ZmRhZmFkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRjb3JlcHkvd2Via2l0Y29yZXB5L2NyZWRlbnRpYWxzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvY3JlZGVudGlhbHMucHkKQEAgLTI0 LDEyICsyNCwxMiBAQCBpbXBvcnQgZ2V0cGFzcwogaW1wb3J0IHN5cwogCiBmcm9tIHN1YnByb2Nl c3MgaW1wb3J0IENhbGxlZFByb2Nlc3NFcnJvcgotZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IEVu dmlyb25tZW50LCBPdXRwdXRDYXB0dXJlLCBUZXJtaW5hbCwgc3RyaW5nX3V0aWxzCitmcm9tIHdl YmtpdGNvcmVweSBpbXBvcnQgRW52aXJvbm1lbnQsIE91dHB1dENhcHR1cmUsIFRlcm1pbmFsCiAK IF9jYWNoZSA9IGRpY3QoKQogCiAKLWRlZiBjcmVkZW50aWFscyh1cmwsIHJlcXVpcmVkPVRydWUs IG5hbWU9Tm9uZSwgcHJvbXB0PU5vbmUsIGtleV9uYW1lPSdwYXNzd29yZCcsIHZhbGlkYXRlcj1O b25lLCByZXRyeT0zKToKK2RlZiBjcmVkZW50aWFscyh1cmwsIHJlcXVpcmVkPVRydWUsIG5hbWU9 Tm9uZSwgcHJvbXB0PU5vbmUsIGtleV9uYW1lPSdwYXNzd29yZCcpOgogICAgIGdsb2JhbCBfY2Fj aGUKIAogICAgIG5hbWUgPSBuYW1lIG9yIHVybC5zcGxpdCgnLycpWzJdLnJlcGxhY2UoJy4nLCAn XycpCkBAIC01MSw0OSArNTEsMzYgQEAgZGVmIGNyZWRlbnRpYWxzKHVybCwgcmVxdWlyZWQ9VHJ1 ZSwgbmFtZT1Ob25lLCBwcm9tcHQ9Tm9uZSwga2V5X25hbWU9J3Bhc3N3b3JkJywKIAogICAgIHVz ZXJuYW1lX3Byb21wdGVkID0gRmFsc2UKICAgICBrZXlfcHJvbXB0ZWQgPSBGYWxzZQorICAgIGlm IG5vdCB1c2VybmFtZToKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgaWYga2V5cmluZzoKKyAg ICAgICAgICAgICAgICB1c2VybmFtZSA9IGtleXJpbmcuZ2V0X3Bhc3N3b3JkKHVybCwgJ3VzZXJu YW1lJykKKyAgICAgICAgZXhjZXB0IChSdW50aW1lRXJyb3IsIEF0dHJpYnV0ZUVycm9yKToKKyAg ICAgICAgICAgIHBhc3MKIAotICAgIGZvciBhdHRlbXB0IGluIHJhbmdlKHJldHJ5KToKLSAgICAg ICAgaWYgYXR0ZW1wdDoKLSAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoJ0lnbm9yaW5nIGtl eWNoYWluIHZhbHVlcyBhbmQgcmUtcHJvbXB0aW5nIHVzZXJcbicpCi0gICAgICAgIGlmIG5vdCB1 c2VybmFtZToKLSAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICBpZiBrZXlyaW5nIGFu ZCBub3QgYXR0ZW1wdDoKLSAgICAgICAgICAgICAgICAgICAgdXNlcm5hbWUgPSBrZXlyaW5nLmdl dF9wYXNzd29yZCh1cmwsICd1c2VybmFtZScpCi0gICAgICAgICAgICBleGNlcHQgKFJ1bnRpbWVF cnJvciwgQXR0cmlidXRlRXJyb3IpOgotICAgICAgICAgICAgICAgIHBhc3MKLQotICAgICAgICAg ICAgaWYgbm90IHVzZXJuYW1lIGFuZCByZXF1aXJlZDoKLSAgICAgICAgICAgICAgICBpZiBub3Qg c3lzLnN0ZGVyci5pc2F0dHkoKSBvciBub3Qgc3lzLnN0ZGluLmlzYXR0eSgpOgotICAgICAgICAg ICAgICAgICAgICByYWlzZSBPU0Vycm9yKCdObyB0dHkgdG8gcHJvbXB0IHVzZXIgZm9yIHVzZXJu YW1lJykKLSAgICAgICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRlKCJBdXRoZW50aWNhdGlvbiBy ZXF1aXJlZCB0byB1c2Uge31cbiIuZm9ybWF0KHByb21wdCBvciBuYW1lKSkKLSAgICAgICAgICAg ICAgICBzeXMuc3RkZXJyLndyaXRlKCdVc2VybmFtZTogJykKLSAgICAgICAgICAgICAgICB1c2Vy bmFtZSA9IFRlcm1pbmFsLmlucHV0KCkKLSAgICAgICAgICAgICAgICB1c2VybmFtZV9wcm9tcHRl ZCA9IFRydWUKLQotICAgICAgICBpZiBub3Qga2V5OgotICAgICAgICAgICAgdHJ5OgotICAgICAg ICAgICAgICAgIGlmIGtleXJpbmcgYW5kIG5vdCBhdHRlbXB0OgotICAgICAgICAgICAgICAgICAg ICBrZXkgPSBrZXlyaW5nLmdldF9wYXNzd29yZCh1cmwsIHVzZXJuYW1lKQotICAgICAgICAgICAg ZXhjZXB0IChSdW50aW1lRXJyb3IsIEF0dHJpYnV0ZUVycm9yKToKLSAgICAgICAgICAgICAgICBw YXNzCi0KLSAgICAgICAgICAgIGlmIG5vdCBrZXkgYW5kIHJlcXVpcmVkOgotICAgICAgICAgICAg ICAgIGlmIG5vdCBzeXMuc3RkZXJyLmlzYXR0eSgpIG9yIG5vdCBzeXMuc3RkaW4uaXNhdHR5KCk6 Ci0gICAgICAgICAgICAgICAgICAgIHJhaXNlIE9TRXJyb3IoJ05vIHR0eSB0byBwcm9tcHQgdXNl ciBmb3IgdXNlcm5hbWUnKQotICAgICAgICAgICAgICAgIGtleSA9IGdldHBhc3MuZ2V0cGFzcygn e306ICcuZm9ybWF0KGtleV9uYW1lLmNhcGl0YWxpemUoKSkpCi0gICAgICAgICAgICAgICAga2V5 X3Byb21wdGVkID0gVHJ1ZQorICAgICAgICBpZiBub3QgdXNlcm5hbWUgYW5kIHJlcXVpcmVkOgor ICAgICAgICAgICAgaWYgbm90IHN5cy5zdGRlcnIuaXNhdHR5KCkgb3Igbm90IHN5cy5zdGRpbi5p c2F0dHkoKToKKyAgICAgICAgICAgICAgICByYWlzZSBPU0Vycm9yKCdObyB0dHkgdG8gcHJvbXB0 IHVzZXIgZm9yIHVzZXJuYW1lJykKKyAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIkF1dGhl bnRpY2F0aW9uIHJlcXVpcmVkIHRvIHVzZSB7fVxuIi5mb3JtYXQocHJvbXB0IG9yIG5hbWUpKQor ICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgnVXNlcm5hbWU6ICcpCisgICAgICAgICAgICB1 c2VybmFtZSA9IFRlcm1pbmFsLmlucHV0KCkKKyAgICAgICAgICAgIHVzZXJuYW1lX3Byb21wdGVk ID0gVHJ1ZQogCi0gICAgICAgIGlmIHVzZXJuYW1lIGFuZCBrZXkgYW5kIChub3QgdmFsaWRhdGVy IG9yIHZhbGlkYXRlcih1c2VybmFtZSwga2V5KSk6Ci0gICAgICAgICAgICBfY2FjaGVbbmFtZV0g PSAodXNlcm5hbWUsIGtleSkKLSAgICAgICAgICAgIGJyZWFrCisgICAgaWYgbm90IGtleToKKyAg ICAgICAgdHJ5OgorICAgICAgICAgICAgaWYga2V5cmluZzoKKyAgICAgICAgICAgICAgICBrZXkg PSBrZXlyaW5nLmdldF9wYXNzd29yZCh1cmwsIHVzZXJuYW1lKQorICAgICAgICBleGNlcHQgKFJ1 bnRpbWVFcnJvciwgQXR0cmlidXRlRXJyb3IpOgorICAgICAgICAgICAgcGFzcwogCi0gICAgICAg IHVzZXJuYW1lID0gTm9uZQotICAgICAgICBrZXkgPSBOb25lCi0gICAgICAgIHN5cy5zdGRlcnIu d3JpdGUoIkZhaWxlZCB0byB2YWxpZGF0ZSBjcmVkZW50aWFscyBmb3IgJ3t9JyAoe30gYXR0ZW1w dClcbiIuZm9ybWF0KHVybCwgc3RyaW5nX3V0aWxzLm9yZGluYWwoYXR0ZW1wdCArIDEpKSkKKyAg ICAgICAgaWYgbm90IGtleSBhbmQgcmVxdWlyZWQ6CisgICAgICAgICAgICBpZiBub3Qgc3lzLnN0 ZGVyci5pc2F0dHkoKSBvciBub3Qgc3lzLnN0ZGluLmlzYXR0eSgpOgorICAgICAgICAgICAgICAg IHJhaXNlIE9TRXJyb3IoJ05vIHR0eSB0byBwcm9tcHQgdXNlciBmb3IgdXNlcm5hbWUnKQorICAg ICAgICAgICAga2V5ID0gZ2V0cGFzcy5nZXRwYXNzKCd7fTogJy5mb3JtYXQoa2V5X25hbWUuY2Fw aXRhbGl6ZSgpKSkKKyAgICAgICAgICAgIGtleV9wcm9tcHRlZCA9IFRydWUKIAotICAgIGlmIG5v dCB1c2VybmFtZSBvciBub3Qga2V5OgotICAgICAgICBzeXMuc3RkZXJyLndyaXRlKCJFeGhhdXN0 ZWQgYXR0ZW1wdHMgdG8gcHJvbXB0IHVzZXIgZm9yICd7fScgY3JlZGVudGlhbHNcbiIuZm9ybWF0 KHVybCkpCi0gICAgICAgIHN5cy5leGl0KDEpCisgICAgaWYgdXNlcm5hbWUgYW5kIGtleToKKyAg ICAgICAgX2NhY2hlW25hbWVdID0gKHVzZXJuYW1lLCBrZXkpCiAKICAgICBpZiBrZXlyaW5nIGFu ZCAodXNlcm5hbWVfcHJvbXB0ZWQgb3Iga2V5X3Byb21wdGVkKToKICAgICAgICAgaWYgVGVybWlu YWwuY2hvb3NlKApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvc2V0dXAucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5w eQppbmRleCAzNGRjMzM3NTQwNjNhY2EwM2NlMWU1ZGIzYWEzMTEwZDVmNTliNDYyLi45NmNhMzk2 YmNkMjEwNzYzYjQzYmVjMzc0ZDU5NDQwZTFkODE2M2ZiIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQpAQCAtMjksNyArMjksNyBAQCBkZWYgcmVhZG1l KCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dlYmtpdHNjbXB5JywKLSAgICB2ZXJzaW9uPSc0LjEu NCcsCisgICAgdmVyc2lvbj0nNC4xLjMnLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGRlc2ln bmVkIHRvIGludGVyYWN0IHdpdGggZ2l0IGFuZCBzdm4gcmVwb3NpdG9yaWVzLicsCiAgICAgbG9u Z19kZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1bCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5w eSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5p dF9fLnB5CmluZGV4IDE4ZDFkNWViMmZhODg2MzE2OThmYzg0NTUxNTg1MmQ4YmYyYzdjOWEuLmQ3 YTQxNGY2YmI5MzFhNjQ1Mjg5MzQ4ODUyODE0MmViOGRmODVjOGMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5p dF9fLnB5CkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBs ZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkg LS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9u ID0gVmVyc2lvbig0LCAxLCA0KQordmVyc2lvbiA9IFZlcnNpb24oNCwgMSwgMykKIAogQXV0b0lu c3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZmFzdGVuZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQog QXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnamluamEyJywgVmVyc2lvbigyLCAxMSwgMykp KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvcHJvZ3JhbS9zZXR1cC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vc2V0dXAucHkKaW5kZXggNzlmYjgwOWQ2MDM3YTliNGY2 MDA5ODM5ZWFlMTM3MDU5ZjY5OGQ5Yy4uY2ZhOTA5MGUyNjNmMTIwY2NiMTVlZjcwYzhlOWI0MTdk MWIzZDFmOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvcHJvZ3JhbS9zZXR1cC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9ncmFtL3NldHVwLnB5CkBAIC0yNTEsNyArMjUx LDcgQEAgY2xhc3MgU2V0dXAoQ29tbWFuZCk6CiAgICAgICAgIGlmIGNvZGU6CiAgICAgICAgICAg ICByZXR1cm4gcmVzdWx0CiAKLSAgICAgICAgdXNlcm5hbWUsIF8gPSBybXQuY3JlZGVudGlhbHMo cmVxdWlyZWQ9VHJ1ZSwgdmFsaWRhdGU9VHJ1ZSkKKyAgICAgICAgdXNlcm5hbWUsIF8gPSBybXQu Y3JlZGVudGlhbHMocmVxdWlyZWQ9VHJ1ZSkKICAgICAgICAgbG9nLmluZm8oIkFkZGluZyBmb3Jr ZWQgcmVtb3RlIGFzICd7fScgYW5kICdmb3JrJy4uLiIuZm9ybWF0KHVzZXJuYW1lKSkKICAgICAg ICAgdXJsID0gcmVwb3NpdG9yeS51cmwoKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weSBiL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHVi LnB5CmluZGV4IDI0MGQyYjE1Zjc4NzI5ZTc2MjkzYzExZGMyMDE5NmNkY2IxMzQ1NTkuLmMxNDc4 NmE4ZWI5ZGNiNzcwNTgzNmIzNzJjYzJkNzY3OWU3NTUzOTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Jl bW90ZS9naXRfaHViLnB5CkBAIC0yNzIsOCArMjcyLDggQEAgY2xhc3MgR2l0SHViKFNjbSk6CiAg ICAgICAgICAgICAgICAgdXNlcnMuY3JlYXRlKGNvbnRyaWJ1dG9yLm5hbWUsIGNvbnRyaWJ1dG9y LmdpdGh1YiwgY29udHJpYnV0b3IuZW1haWxzKQogICAgICAgICBzZWxmLnRyYWNrZXIgPSBUcmFj a2VyKHVybCwgdXNlcnM9dXNlcnMpCiAKLSAgICBkZWYgY3JlZGVudGlhbHMoc2VsZiwgcmVxdWly ZWQ9VHJ1ZSwgdmFsaWRhdGU9RmFsc2UpOgotICAgICAgICByZXR1cm4gc2VsZi50cmFja2VyLmNy ZWRlbnRpYWxzKHJlcXVpcmVkPXJlcXVpcmVkLCB2YWxpZGF0ZT12YWxpZGF0ZSkKKyAgICBkZWYg Y3JlZGVudGlhbHMoc2VsZiwgcmVxdWlyZWQ9VHJ1ZSk6CisgICAgICAgIHJldHVybiBzZWxmLnRy YWNrZXIuY3JlZGVudGlhbHMocmVxdWlyZWQ9cmVxdWlyZWQpCiAKICAgICBAcHJvcGVydHkKICAg ICBkZWYgaXNfZ2l0KHNlbGYpOgo=