36986 2010-04-01 16:15:37 -0700 Add rollout command to sheriffbot 2010-04-01 16:34:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned eric oldest_to_newest 207465 0 abarth 2010-04-01 16:15:37 -0700 Add rollout command to sheriffbot 207468 1 52348 abarth 2010-04-01 16:17:06 -0700 Created attachment 52348 Patch 207473 2 52348 eric 2010-04-01 16:28:47 -0700 Comment on attachment 52348 Patch Fantastic! 207477 3 52348 abarth 2010-04-01 16:34:50 -0700 Comment on attachment 52348 Patch Clearing flags on attachment: 52348 Committed r56947: <http://trac.webkit.org/changeset/56947> 207478 4 abarth 2010-04-01 16:34:55 -0700 All reviewed patches have been landed. Closing bug. 52348 2010-04-01 16:17:06 -0700 2010-04-01 16:34:50 -0700 Patch bug-36986-20100401161705.patch text/plain 23845 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyMmRmNjRlLi40OTVkN2NmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjkgQEAKIDIwMTAtMDQt MDEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgcm9sbG91dCBjb21tYW5kIHRvIHNoZXJp ZmZib3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2 OTg2CisKKyAgICAgICAgVGhpcyBJUkMgY29tbWFuZCBjcmVhdGVzIGEgbmV3IGJ1ZyBhbiBhdHRh Y2hlcyBhIHJvbGxvdXQgcGF0Y2guICBUbworICAgICAgICBhY3R1YWxseSBjb21taXQgdGhlIHJv bGxvdXQsIGEgY29tbWl0dGVyIG5lZWRzIHRvIG1hcmsgdGhlIHBhdGNoCisgICAgICAgIGNvbW1p dC1xdWV1ZSsgaW4gYnVncy53ZWJraXQub3JnLgorCisgICAgICAgIEFsc28sIGZhY3RvcmVkIG91 dCBzb21lIG9mIHRoZSBsb2dpYyBmcm9tIHRoZSBxdWV1ZSBpbnRvIGEgc2VwYXJhdGUKKyAgICAg ICAgb2JqZWN0IGZvciBlYXNpZXIgdGVzdGluZy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS90b29sL2JvdC9pcmNfY29tbWFuZC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rv b2wvYm90L3NoZXJpZmYucHk6IEFkZGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9v bC9ib3Qvc2hlcmlmZl91bml0dGVzdC5weTogQWRkZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL2JvdC9zaGVyaWZmaXJjYm90LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvdG9vbC9ib3Qvc2hlcmlmZmlyY2JvdF91bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVldWVzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9zaGVyaWZmYm90LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9zaGVyaWZmYm90X3VuaXR0ZXN0LnB5OgorCisyMDEwLTA0LTAx ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKICAgICAgICAgVW5yZXZpZXdlZC4g IEFkZCBjbWFycmluJ3MgSVJDIG5pY2tuYW1lLgogCiAgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHk6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5IGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQppbmRleCA1Yzc1ZGY2 Li5iMzk5ZGU5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vZXhlY3V0aXZlLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKQEAgLTExNiw2ICsxMTYsNyBAQCBjbGFzcyBFeGVj dXRpdmUob2JqZWN0KToKICAgICAgICAgICAgIHJhaXNlIFNjcmlwdEVycm9yKHNjcmlwdF9hcmdz PWFyZ3MsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleGl0X2NvZGU9ZXhpdF9jb2Rl LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0cHV0PWNoaWxkX291dHB1dCkKKyAg ICAgICAgcmV0dXJuIGNoaWxkX291dHB1dAogCiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBj cHVfY291bnQoKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9ib3QvaXJjX2NvbW1hbmQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Ym90L2lyY19jb21tYW5kLnB5CmluZGV4IDI2YjZkNjUuLjkxNDdlNDIgMTAwNjQ0Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvaXJjX2NvbW1hbmQucHkKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9pcmNfY29tbWFuZC5weQpAQCAt MjgsMjUgKzI4LDQyIEBACiAKIGZyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LmNoYW5nZWxv ZyBpbXBvcnQgdmlld19zb3VyY2VfdXJsCiBmcm9tIHdlYmtpdHB5LnRvb2wuYm90LnF1ZXVlZW5n aW5lIGltcG9ydCBUZXJtaW5hdGVRdWV1ZQotCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0u ZXhlY3V0aXZlIGltcG9ydCBTY3JpcHRFcnJvcgogCiAjIEZJWE1FOiBNZXJnZSB3aXRoIENvbW1h bmQ/CiBjbGFzcyBJUkNDb21tYW5kKG9iamVjdCk6Ci0gICAgZGVmIGV4ZWN1dGUoc2VsZiwgYXJn cywgdG9vbCk6CisgICAgZGVmIGV4ZWN1dGUoc2VsZiwgYXJncywgdG9vbCwgc2hlcmlmZik6CiAg ICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IsICJzdWJjbGFzc2VzIG11c3QgaW1wbGVt ZW50IgogCiAKIGNsYXNzIExhc3RHcmVlblJldmlzaW9uKElSQ0NvbW1hbmQpOgotICAgIGRlZiBl eGVjdXRlKHNlbGYsIGFyZ3MsIHRvb2wpOgorICAgIGRlZiBleGVjdXRlKHNlbGYsIGFyZ3MsIHRv b2wsIHNoZXJpZmYpOgogICAgICAgICByZXR1cm4gdmlld19zb3VyY2VfdXJsKHRvb2wuYnVpbGRi b3QubGFzdF9ncmVlbl9yZXZpc2lvbigpKQogCiAKIGNsYXNzIFJlc3RhcnQoSVJDQ29tbWFuZCk6 Ci0gICAgZGVmIGV4ZWN1dGUoc2VsZiwgYXJncywgdG9vbCk6CisgICAgZGVmIGV4ZWN1dGUoc2Vs ZiwgYXJncywgdG9vbCwgc2hlcmlmZik6CiAgICAgICAgIHRvb2wuaXJjKCkucG9zdCgiUmVzdGFy dGluZy4uLiIpCiAgICAgICAgIHJhaXNlIFRlcm1pbmF0ZVF1ZXVlKCkKIAogCitjbGFzcyBSb2xs b3V0KElSQ0NvbW1hbmQpOgorICAgIGRlZiBleGVjdXRlKHNlbGYsIGFyZ3MsIHRvb2wsIHNoZXJp ZmYpOgorICAgICAgICBpZiBsZW4oYXJncykgPCAyOgorICAgICAgICAgICAgdG9vbC5pcmMoKS5w b3N0KCJVc2FnZTogU1ZOX1JFVklTSU9OIFJFQVNPTiIpCisgICAgICAgICAgICByZXR1cm4KKyAg ICAgICAgc3ZuX3JldmlzaW9uID0gYXJnc1swXQorICAgICAgICByb2xsb3V0X3JlYXNvbiA9ICIg Ii5qb2luKGFyZ3NbMTpdKQorICAgICAgICB0b29sLmlyYygpLnBvc3QoIlByZXBhcmluZyByb2xs b3V0IGZvciByJXMuLi4iICUgc3ZuX3JldmlzaW9uKQorICAgICAgICB0cnk6CisgICAgICAgICAg ICBidWdfaWQgPSBzaGVyaWZmLnBvc3Rfcm9sbG91dF9wYXRjaChzdm5fcmV2aXNpb24sIHJvbGxv dXRfcmVhc29uKQorICAgICAgICAgICAgYnVnX3VybCA9IHRvb2wuYnVncy5idWdfdXJsX2Zvcl9i dWdfaWQoYnVnX2lkKQorICAgICAgICAgICAgdG9vbC5pcmMoKS5wb3N0KCJDcmVhdGVkIHJvbGxv dXQ6ICVzIiAlIGJ1Z191cmwpCisgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKKyAgICAg ICAgICAgIHRvb2wuaXJjKCkucG9zdCgiRmFpbGVkIHRvIGNyZWF0ZSByb2xsb3V0IHBhdGNoOiIp CisgICAgICAgICAgICB0b29sLmlyYygpLnBvc3QoIiVzIiAlIGUpCisKKwogY2xhc3MgSGkoSVJD Q29tbWFuZCk6Ci0gICAgZGVmIGV4ZWN1dGUoc2VsZiwgYXJncywgdG9vbCk6CisgICAgZGVmIGV4 ZWN1dGUoc2VsZiwgYXJncywgdG9vbCwgc2hlcmlmZik6CiAgICAgICAgIHJldHVybiAnIk9ubHkg eW91IGNhbiBwcmV2ZW50IGZvcmVzdCBmaXJlcy4iIC0tIFNtb2tleSB0aGUgQmVhcicKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3Qvc2hlcmlmZi5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3Qvc2hlcmlmZi5weQpuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yMmY3ZDA3Ci0tLSAvZGV2L251bGwKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9zaGVyaWZmLnB5CkBAIC0wLDAg KzEsODcgQEAKKyMgQ29weXJpZ2h0IChjKSAyMDEwIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAg ICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyMgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0 cmlidXRpb24uCisjICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRo ZSBuYW1lcyBvZiBpdHMKKyMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3Ig cHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNw ZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMg SVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVU IE5PVAorIyBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IKKyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlN RUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVU T1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQ RUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QKKyMgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsCisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElO VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklM SVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg T0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291 dC5jaGFuZ2Vsb2cgaW1wb3J0IHZpZXdfc291cmNlX3VybAorZnJvbSB3ZWJraXRweS5jb21tb24u bmV0LmJ1Z3ppbGxhIGltcG9ydCBwYXJzZV9idWdfaWQKK2Zyb20gd2Via2l0cHkudG9vbC5ncmFt bWFyIGltcG9ydCBqb2luX3dpdGhfc2VwYXJhdG9ycworCisKK2NsYXNzIFNoZXJpZmYob2JqZWN0 KToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgdG9vbCwgc2hlcmlmZmJvdCk6CisgICAgICAgIHNl bGYuX3Rvb2wgPSB0b29sCisgICAgICAgIHNlbGYuX3NoZXJpZmZib3QgPSBzaGVyaWZmYm90CisK KyAgICBkZWYgcG9zdF9pcmNfd2FybmluZyhzZWxmLCBjb21taXRfaW5mbywgYnVpbGRlcnMpOgor ICAgICAgICBpcmNfbmlja25hbWVzID0gc29ydGVkKFtwYXJ0eS5pcmNfbmlja25hbWUgZm9yCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcnR5IGluIGNvbW1pdF9pbmZvLnJlc3Bv bnNpYmxlX3BhcnRpZXMoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiBwYXJ0 eS5pcmNfbmlja25hbWVdKQorICAgICAgICBpcmNfcHJlZml4ID0gIjogIiBpZiBpcmNfbmlja25h bWVzIGVsc2UgIiIKKyAgICAgICAgaXJjX21lc3NhZ2UgPSAiJXMlcyVzIG1pZ2h0IGhhdmUgYnJv a2VuICVzIiAlICgKKyAgICAgICAgICAgICIsICIuam9pbihpcmNfbmlja25hbWVzKSwKKyAgICAg ICAgICAgIGlyY19wcmVmaXgsCisgICAgICAgICAgICB2aWV3X3NvdXJjZV91cmwoY29tbWl0X2lu Zm8ucmV2aXNpb24oKSksCisgICAgICAgICAgICBqb2luX3dpdGhfc2VwYXJhdG9ycyhbYnVpbGRl ci5uYW1lKCkgZm9yIGJ1aWxkZXIgaW4gYnVpbGRlcnNdKSkKKworICAgICAgICBzZWxmLl90b29s LmlyYygpLnBvc3QoaXJjX21lc3NhZ2UpCisKKyAgICBkZWYgcG9zdF9yb2xsb3V0X3BhdGNoKHNl bGYsIHN2bl9yZXZpc2lvbiwgcm9sbG91dF9yZWFzb24pOgorICAgICAgICBvdXRwdXQgPSBzZWxm Ll9zaGVyaWZmYm90LnJ1bl93ZWJraXRfcGF0Y2goWworICAgICAgICAgICAgImNyZWF0ZS1yb2xs b3V0IiwKKyAgICAgICAgICAgICItLWZvcmNlLWNsZWFuIiwKKyAgICAgICAgICAgICItLW5vbi1p bnRlcmFjdGl2ZSIsCisgICAgICAgICAgICAiLS1wYXJlbnQtY29tbWFuZD1zaGVyaWZmLWJvdCIs CisgICAgICAgICAgICBzdm5fcmV2aXNpb24sCisgICAgICAgICAgICByb2xsb3V0X3JlYXNvbiwK KyAgICAgICAgXSkKKyAgICAgICAgcmV0dXJuIHBhcnNlX2J1Z19pZChvdXRwdXQpCisKKyAgICBk ZWYgX3JvbGxvdXRfcmVhc29uKHNlbGYsIGJ1aWxkZXJzKToKKyAgICAgICAgIyBGSVhNRTogVGhp cyBzaG91bGQgZXhwbGFpbiB3aGljaCBsYXlvdXQgdGVzdHMgZmFpbGVkCisgICAgICAgICMgaG93 ZXZlciwgdGhhdCB3b3VsZCByZXF1aXJlIEJ1aWxkIG9iamVjdHMgaGVyZSwgZWl0aGVyIHBhc3Nl ZAorICAgICAgICAjIGluIHRocm91Z2ggZmFpbHVyZV9pbmZvLCBvciB0aHJvdWdoIEJ1aWxkZXIu bGF0ZXN0X2J1aWxkLgorICAgICAgICBuYW1lcyA9IFtidWlsZGVyLm5hbWUoKSBmb3IgYnVpbGRl ciBpbiBidWlsZGVyc10KKyAgICAgICAgcmV0dXJuICJDYXVzZWQgYnVpbGRlcnMgJXMgdG8gZmFp bC4iICUgam9pbl93aXRoX3NlcGFyYXRvcnMobmFtZXMpCisKKyAgICBkZWYgcG9zdF9hdXRvbWF0 aWNfcm9sbG91dF9wYXRjaChzZWxmLCBjb21taXRfaW5mbywgYnVpbGRlcnMpOgorICAgICAgICAj IEZvciBub3cgd2UncmUgb25seSBwb3N0aW5nIHJvbGxvdXQgcGF0Y2hlcyBmb3IgY29tbWl0LXF1 ZXVlIHBhdGNoZXMuCisgICAgICAgIGNvbW1pdF9ib3RfZW1haWwgPSAiZXNlaWRlbEBjaHJvbWl1 bS5vcmciCisgICAgICAgIGlmIGNvbW1pdF9ib3RfZW1haWwgbm90IGluIGNvbW1pdF9pbmZvLmNv bW1pdHRlcigpLmVtYWlsczoKKyAgICAgICAgICAgIHJldHVybgorICAgICAgICB0cnk6CisgICAg ICAgICAgICBzZWxmLnBvc3Rfcm9sbG91dF9wYXRjaChjb21taXRfaW5mby5yZXZpc2lvbigpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fcm9sbG91dF9yZWFzb24o YnVpbGRlcnMpKQorICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3IsIGU6CisgICAgICAgICAgICBs b2coIkZhaWxlZCB0byBjcmVhdGUtcm9sbG91dC4iKQorCisgICAgZGVmIHBvc3RfYmxhbWVfY29t bWVudF9vbl9idWcoc2VsZiwgY29tbWl0X2luZm8sIGJ1aWxkZXJzKToKKyAgICAgICAgaWYgbm90 IGNvbW1pdF9pbmZvLmJ1Z19pZCgpOgorICAgICAgICAgICAgcmV0dXJuCisgICAgICAgIGNvbW1l bnQgPSAiJXMgbWlnaHQgaGF2ZSBicm9rZW4gJXMiICUgKAorICAgICAgICAgICAgdmlld19zb3Vy Y2VfdXJsKGNvbW1pdF9pbmZvLnJldmlzaW9uKCkpLAorICAgICAgICAgICAgam9pbl93aXRoX3Nl cGFyYXRvcnMoW2J1aWxkZXIubmFtZSgpIGZvciBidWlsZGVyIGluIGJ1aWxkZXJzXSkpCisgICAg ICAgIHNlbGYuX3Rvb2wuYnVncy5wb3N0X2NvbW1lbnRfdG9fYnVnKGNvbW1pdF9pbmZvLmJ1Z19p ZCgpLCBjb21tZW50KQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL2JvdC9zaGVyaWZmX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2JvdC9zaGVyaWZmX3VuaXR0ZXN0LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLjY1YmYxZWEKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvYm90L3NoZXJpZmZfdW5pdHRlc3QucHkKQEAgLTAsMCArMSw2NiBAQAor IyBDb3B5cmlnaHQgKEMpIDIwMTAgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMK KyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0OgorIworIyAgICAqIFJlZGlzdHJp YnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Cisj IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyMgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1 Y2UgdGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisj ICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0 cworIyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1 Y3RzIGRlcml2ZWQgZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Ig d3JpdHRlbiBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRI RSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJUyIgQU5EIEFOWSBF WFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlU RUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRO RVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZF TlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxF IEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhFTVBM QVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1J VEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NT IE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBI T1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisj IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCisKK2ltcG9ydCBvcworaW1wb3J0IHVuaXR0ZXN0CisKK2Zyb20gd2Via2l0 cHkuY29tbW9uLm5ldC5idWlsZGJvdCBpbXBvcnQgQnVpbGRlcgorZnJvbSB3ZWJraXRweS50aGly ZHBhcnR5Lm1vY2sgaW1wb3J0IE1vY2sKK2Zyb20gd2Via2l0cHkudG9vbC5ib3Quc2hlcmlmZiBp bXBvcnQgU2hlcmlmZgorZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2NrVG9v bCwgbW9ja19idWlsZGVyCisKKworY2xhc3MgTW9ja1NoZXJpZmZCb3Qob2JqZWN0KToKKyAgICBk ZWYgcnVuX3dlYmtpdF9wYXRjaChzZWxmLCBhcmdzKToKKyAgICAgICAgcmV0dXJuICJDcmVhdGVk IGJ1ZyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY5MzZcbiIKKwor CitjbGFzcyBTaGVyaWZmVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CisgICAgZGVmIHRlc3Rfcm9s bG91dF9yZWFzb24oc2VsZik6CisgICAgICAgIHNoZXJpZmYgPSBTaGVyaWZmKE1vY2tUb29sKCks IE1vY2tTaGVyaWZmQm90KCkpCisgICAgICAgIGJ1aWxkZXJzID0gWworICAgICAgICAgICAgQnVp bGRlcigiRm9vIiwgTm9uZSksCisgICAgICAgICAgICBCdWlsZGVyKCJCYXIiLCBOb25lKSwKKyAg ICAgICAgXQorICAgICAgICByZWFzb24gPSAiQ2F1c2VkIGJ1aWxkZXJzIEZvbyBhbmQgQmFyIHRv IGZhaWwuIgorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzaGVyaWZmLl9yb2xsb3V0X3JlYXNv bihidWlsZGVycyksIHJlYXNvbikKKworICAgIGRlZiB0ZXN0X3Bvc3RfYmxhbWVfY29tbWVudF9v bl9idWcoc2VsZik6CisgICAgICAgIHNoZXJpZmYgPSBTaGVyaWZmKE1vY2tUb29sKCksIE1vY2tT aGVyaWZmQm90KCkpCisgICAgICAgIGJ1aWxkZXJzID0gWworICAgICAgICAgICAgQnVpbGRlcigi Rm9vIiwgTm9uZSksCisgICAgICAgICAgICBCdWlsZGVyKCJCYXIiLCBOb25lKSwKKyAgICAgICAg XQorICAgICAgICBjb21taXRfaW5mbyA9IE1vY2soKQorICAgICAgICBjb21taXRfaW5mby5idWdf aWQgPSBsYW1iZGE6IE5vbmUKKyAgICAgICAgY29tbWl0X2luZm8ucmV2aXNpb24gPSBsYW1iZGE6 IDQzMjEKKyAgICAgICAgIyBTaG91bGQgZG8gbm90aGluZyB3aXRoIG5vIGJ1Z19pZAorICAgICAg ICBzaGVyaWZmLnBvc3RfYmxhbWVfY29tbWVudF9vbl9idWcoY29tbWl0X2luZm8sIGJ1aWxkZXJz KQorICAgICAgICAjIFNob3VsZCB0cnkgdG8gcG9zdCBhIGNvbW1lbnQgdG8gdGhlIGJ1ZywgYnV0 IE1vY2tUb29sLmJ1Z3MgZG9lcyBub3RoaW5nLgorICAgICAgICBjb21taXRfaW5mby5idWdfaWQg PSBsYW1iZGE6IDEyMzQKKyAgICAgICAgc2hlcmlmZi5wb3N0X2JsYW1lX2NvbW1lbnRfb25fYnVn KGNvbW1pdF9pbmZvLCBidWlsZGVycykKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9ib3Qvc2hlcmlmZmlyY2JvdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9ib3Qvc2hlcmlmZmlyY2JvdC5weQppbmRleCBkMWYwMTZkLi44MTgzZTYx IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L3NoZXJp ZmZpcmNib3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9z aGVyaWZmaXJjYm90LnB5CkBAIC0zMiw3ICszMiw3IEBAIGZyb20gd2Via2l0cHkuY29tbW9uLm5l dC5pcmMuaXJjYm90IGltcG9ydCBJUkNCb3REZWxlZ2F0ZQogZnJvbSB3ZWJraXRweS5jb21tb24u dGhyZWFkLnRocmVhZGVkbWVzc2FnZXF1ZXVlIGltcG9ydCBUaHJlYWRlZE1lc3NhZ2VRdWV1ZQog CiAKLWNsYXNzIF9JUkNUaHJlYWRUZWFyb2ZmKG9iamVjdCk6CitjbGFzcyBfSVJDVGhyZWFkVGVh cm9mZihJUkNCb3REZWxlZ2F0ZSk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBhc3N3b3JkLCBt ZXNzYWdlX3F1ZXVlLCB3YWtldXBfZXZlbnQpOgogICAgICAgICBzZWxmLl9wYXNzd29yZCA9IHBh c3N3b3JkCiAgICAgICAgIHNlbGYuX21lc3NhZ2VfcXVldWUgPSBtZXNzYWdlX3F1ZXVlCkBAIC01 MSwyMCArNTEsMjQgQEAgY2xhc3MgX0lSQ1RocmVhZFRlYXJvZmYob2JqZWN0KToKICAgICAgICAg cmV0dXJuIHNlbGYuX3Bhc3N3b3JkCiAKIAotY2xhc3MgU2hlcmlmZklSQ0JvdChJUkNCb3REZWxl Z2F0ZSk6CitjbGFzcyBTaGVyaWZmSVJDQm90KG9iamVjdCk6CiAgICAgIyBGSVhNRTogTGFtZS4g IFdlIHNob3VsZCBoYXZlIGFuIGF1dG8tcmVnaXN0ZXJpbmcgQ29tbWFuZENlbnRlci4KICAgICBj b21tYW5kcyA9IHsKICAgICAgICAgImxhc3QtZ3JlZW4tcmV2aXNpb24iOiBpcmNfY29tbWFuZC5M YXN0R3JlZW5SZXZpc2lvbiwKICAgICAgICAgInJlc3RhcnQiOiBpcmNfY29tbWFuZC5SZXN0YXJ0 LAorICAgICAgICAicm9sbG91dCI6IGlyY19jb21tYW5kLlJvbGxvdXQsCiAgICAgICAgICJoaSI6 IGlyY19jb21tYW5kLkhpLAogICAgIH0KIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0b29sKToK KyAgICBkZWYgX19pbml0X18oc2VsZiwgdG9vbCwgc2hlcmlmZik6CiAgICAgICAgIHNlbGYuX3Rv b2wgPSB0b29sCisgICAgICAgIHNlbGYuX3NoZXJpZmYgPSBzaGVyaWZmCiAgICAgICAgIHNlbGYu X21lc3NhZ2VfcXVldWUgPSBUaHJlYWRlZE1lc3NhZ2VRdWV1ZSgpCiAKICAgICBkZWYgaXJjX2Rl bGVnYXRlKHNlbGYpOgotICAgICAgICByZXR1cm4gX0lSQ1RocmVhZFRlYXJvZmYoc2VsZi5fdG9v bC5pcmNfcGFzc3dvcmQsIHNlbGYuX21lc3NhZ2VfcXVldWUsIHNlbGYuX3Rvb2wud2FrZXVwX2V2 ZW50KQorICAgICAgICByZXR1cm4gX0lSQ1RocmVhZFRlYXJvZmYoc2VsZi5fdG9vbC5pcmNfcGFz c3dvcmQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9tZXNzYWdlX3F1 ZXVlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fdG9vbC53YWtldXBf ZXZlbnQpCiAKICAgICBkZWYgcHJvY2Vzc19tZXNzYWdlKHNlbGYsIG1lc3NhZ2UpOgogICAgICAg ICB0b2tlbml6ZWRfbWVzc2FnZSA9IG1lc3NhZ2Uuc3RyaXAoKS5zcGxpdCgiICIpCkBAIC03Miw5 ICs3NiwxMiBAQCBjbGFzcyBTaGVyaWZmSVJDQm90KElSQ0JvdERlbGVnYXRlKToKICAgICAgICAg ICAgIHJldHVybgogICAgICAgICBjb21tYW5kID0gc2VsZi5jb21tYW5kcy5nZXQodG9rZW5pemVk X21lc3NhZ2VbMF0pCiAgICAgICAgIGlmIG5vdCBjb21tYW5kOgotICAgICAgICAgICAgc2VsZi5f dG9vbC5pcmMoKS5wb3N0KCJBdmFpbGFibGUgY29tbWFuZHM6ICVzIiAlICIsICIuam9pbihzZWxm LmNvbW1hbmRzLmtleXMoKSkpCisgICAgICAgICAgICBzZWxmLl90b29sLmlyYygpLnBvc3QoCisg ICAgICAgICAgICAgICAgIkF2YWlsYWJsZSBjb21tYW5kczogJXMiICUgIiwgIi5qb2luKHNlbGYu Y29tbWFuZHMua2V5cygpKSkKICAgICAgICAgICAgIHJldHVybgotICAgICAgICByZXNwb25zZSA9 IGNvbW1hbmQoKS5leGVjdXRlKHRva2VuaXplZF9tZXNzYWdlWzE6XSwgc2VsZi5fdG9vbCkKKyAg ICAgICAgcmVzcG9uc2UgPSBjb21tYW5kKCkuZXhlY3V0ZSh0b2tlbml6ZWRfbWVzc2FnZVsxOl0s CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fdG9vbCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9zaGVyaWZmKQogICAgICAgICBp ZiByZXNwb25zZToKICAgICAgICAgICAgIHNlbGYuX3Rvb2wuaXJjKCkucG9zdChyZXNwb25zZSkK IApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9zaGVy aWZmaXJjYm90X3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2JvdC9zaGVyaWZmaXJjYm90X3VuaXR0ZXN0LnB5CmluZGV4IDNiZTdlNGYuLmJkM2Y5OWEgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3Qvc2hlcmlmZmly Y2JvdF91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Ym90L3NoZXJpZmZpcmNib3RfdW5pdHRlc3QucHkKQEAgLTI5LDEzICsyOSwxNiBAQAogaW1wb3J0 IHVuaXR0ZXN0CiAKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5vdXRwdXRjYXB0dXJlIGlt cG9ydCBPdXRwdXRDYXB0dXJlCitmcm9tIHdlYmtpdHB5LnRvb2wuYm90LnNoZXJpZmYgaW1wb3J0 IFNoZXJpZmYKIGZyb20gd2Via2l0cHkudG9vbC5ib3Quc2hlcmlmZmlyY2JvdCBpbXBvcnQgU2hl cmlmZklSQ0JvdAorZnJvbSB3ZWJraXRweS50b29sLmJvdC5zaGVyaWZmX3VuaXR0ZXN0IGltcG9y dCBNb2NrU2hlcmlmZkJvdAogZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2Nr VG9vbAogCisKIGRlZiBydW4obWVzc2FnZSk6CiAgICAgdG9vbCA9IE1vY2tUb29sKCkKICAgICB0 b29sLmVuc3VyZV9pcmNfY29ubmVjdGVkKE5vbmUpCi0gICAgYm90ID0gU2hlcmlmZklSQ0JvdCh0 b29sKQorICAgIGJvdCA9IFNoZXJpZmZJUkNCb3QodG9vbCwgU2hlcmlmZih0b29sLCBNb2NrU2hl cmlmZkJvdCgpKSkKICAgICBib3QuX21lc3NhZ2VfcXVldWUucG9zdChtZXNzYWdlKQogICAgIGJv dC5wcm9jZXNzX3BlbmRpbmdfbWVzc2FnZXMoKQogCkBAIC00Niw5ICs0OSwyMSBAQCBjbGFzcyBT aGVyaWZmSVJDQm90VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIE91dHB1dENhcHR1 cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBydW4sIGFyZ3M9WyJoaSJdLCBleHBlY3RlZF9zdGRl cnI9ZXhwZWN0ZWRfc3RkZXJyKQogCiAgICAgZGVmIHRlc3RfYm9ndXMoc2VsZik6Ci0gICAgICAg IGV4cGVjdGVkX3N0ZGVyciA9ICJNT0NLOiBpcmMucG9zdDogQXZhaWxhYmxlIGNvbW1hbmRzOiBo aSwgcmVzdGFydCwgbGFzdC1ncmVlbi1yZXZpc2lvblxuIgorICAgICAgICBleHBlY3RlZF9zdGRl cnIgPSAiTU9DSzogaXJjLnBvc3Q6IEF2YWlsYWJsZSBjb21tYW5kczogcm9sbG91dCwgaGksIHJl c3RhcnQsIGxhc3QtZ3JlZW4tcmV2aXNpb25cbiIKICAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFz c2VydF9vdXRwdXRzKHNlbGYsIHJ1biwgYXJncz1bImJvZ3VzIl0sIGV4cGVjdGVkX3N0ZGVycj1l eHBlY3RlZF9zdGRlcnIpCiAKICAgICBkZWYgdGVzdF9sZ3Ioc2VsZik6CiAgICAgICAgIGV4cGVj dGVkX3N0ZGVyciA9ICJNT0NLOiBpcmMucG9zdDogaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFu Z2VzZXQvOTQ3OVxuIgogICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2Vs ZiwgcnVuLCBhcmdzPVsibGFzdC1ncmVlbi1yZXZpc2lvbiJdLCBleHBlY3RlZF9zdGRlcnI9ZXhw ZWN0ZWRfc3RkZXJyKQorCisgICAgZGVmIHRlc3Rfcm9sbG91dChzZWxmKToKKyAgICAgICAgZXhw ZWN0ZWRfc3RkZXJyID0gIk1PQ0s6IGlyYy5wb3N0OiBQcmVwYXJpbmcgcm9sbG91dCBmb3IgcjIx NjU0Li4uXG5NT0NLOiBpcmMucG9zdDogQ3JlYXRlZCByb2xsb3V0OiBodHRwOi8vZXhhbXBsZS5j b20vMzY5MzZcbiIKKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYs IHJ1biwgYXJncz1bInJvbGxvdXQgMjE2NTQgVGhpcyBwYXRjaCBicm9rZSB0aGUgd29ybGQiXSwg ZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycikKKworICAgIGRlZiB0ZXN0X3JvbGxvdXRf YmFuYW5hcyhzZWxmKToKKyAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIk1PQ0s6IGlyYy5wb3N0 OiBVc2FnZTogU1ZOX1JFVklTSU9OIFJFQVNPTlxuIgorICAgICAgICBPdXRwdXRDYXB0dXJlKCku YXNzZXJ0X291dHB1dHMoc2VsZiwgcnVuLCBhcmdzPVsicm9sbG91dCBiYW5hbmFzIl0sIGV4cGVj dGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCisKKyAgICBkZWYgdGVzdF9yb2xsb3V0X25vX3Jl YXNvbihzZWxmKToKKyAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIk1PQ0s6IGlyYy5wb3N0OiBV c2FnZTogU1ZOX1JFVklTSU9OIFJFQVNPTlxuIgorICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNz ZXJ0X291dHB1dHMoc2VsZiwgcnVuLCBhcmdzPVsicm9sbG91dCAyMTY1NCJdLCBleHBlY3RlZF9z dGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVlcy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9xdWV1ZXMucHkKaW5kZXggZmQ3NDJmMS4uNmNjNGE1MSAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXVl cy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVl dWVzLnB5CkBAIC03Myw3ICs3Myw3IEBAIGNsYXNzIEFic3RyYWN0UXVldWUoQ29tbWFuZCwgUXVl dWVFbmdpbmVEZWxlZ2F0ZSk6CiAgICAgICAgICMgRklYTUU6IFRoaXMgaXMgYSBoYWNrLCB3ZSBz aG91bGQgaGF2ZSBhIG1vcmUgZ2VuZXJhbCB3YXkgdG8gcGFzcyBnbG9iYWwgb3B0aW9ucy4KICAg ICAgICAgd2Via2l0X3BhdGNoX2FyZ3MgKz0gWyItLXN0YXR1cy1ob3N0PSVzIiAlIHNlbGYudG9v bC5zdGF0dXNfc2VydmVyLmhvc3RdCiAgICAgICAgIHdlYmtpdF9wYXRjaF9hcmdzICs9IG1hcChz dHIsIGFyZ3MpCi0gICAgICAgIHNlbGYudG9vbC5leGVjdXRpdmUucnVuX2FuZF90aHJvd19pZl9m YWlsKHdlYmtpdF9wYXRjaF9hcmdzKQorICAgICAgICByZXR1cm4gc2VsZi50b29sLmV4ZWN1dGl2 ZS5ydW5fYW5kX3Rocm93X2lmX2ZhaWwod2Via2l0X3BhdGNoX2FyZ3MpCiAKICAgICAjIFF1ZXVl RW5naW5lRGVsZWdhdGUgbWV0aG9kcwogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvc2hlcmlmZmJvdC5weSBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9zaGVyaWZmYm90LnB5CmluZGV4IDY1NzhhMDAuLjY5 NGU3ZTEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy9zaGVyaWZmYm90LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9jb21tYW5kcy9zaGVyaWZmYm90LnB5CkBAIC0yOSwxMSArMjksMTAgQEAKIGltcG9ydCBvcwog CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZGVwcmVjYXRlZF9sb2dnaW5nIGltcG9ydCBs b2cKLWZyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LmNoYW5nZWxvZyBpbXBvcnQgdmlld19z b3VyY2VfdXJsCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcucG9ydHMgaW1wb3J0IFdlYktp dFBvcnQKK2Zyb20gd2Via2l0cHkudG9vbC5ib3Quc2hlcmlmZiBpbXBvcnQgU2hlcmlmZgogZnJv bSB3ZWJraXRweS50b29sLmJvdC5zaGVyaWZmaXJjYm90IGltcG9ydCBTaGVyaWZmSVJDQm90CiBm cm9tIHdlYmtpdHB5LnRvb2wuY29tbWFuZHMucXVldWVzIGltcG9ydCBBYnN0cmFjdFF1ZXVlCi1m cm9tIHdlYmtpdHB5LnRvb2wuZ3JhbW1hciBpbXBvcnQgam9pbl93aXRoX3NlcGFyYXRvcnMKIAog Y2xhc3MgU2hlcmlmZkJvdChBYnN0cmFjdFF1ZXVlKToKICAgICBuYW1lID0gInNoZXJpZmYtYm90 IgpAQCAtNDUsNyArNDQsOCBAQCBjbGFzcyBTaGVyaWZmQm90KEFic3RyYWN0UXVldWUpOgogCiAg ICAgZGVmIGJlZ2luX3dvcmtfcXVldWUoc2VsZik6CiAgICAgICAgIEFic3RyYWN0UXVldWUuYmVn aW5fd29ya19xdWV1ZShzZWxmKQotICAgICAgICBzZWxmLl9pcmNfYm90ID0gU2hlcmlmZklSQ0Jv dChzZWxmLnRvb2wpCisgICAgICAgIHNlbGYuX3NoZXJpZmYgPSBTaGVyaWZmKHNlbGYudG9vbCwg c2VsZikKKyAgICAgICAgc2VsZi5faXJjX2JvdCA9IFNoZXJpZmZJUkNCb3Qoc2VsZi50b29sLCBz ZWxmLl9zaGVyaWZmKQogICAgICAgICBzZWxmLnRvb2wuZW5zdXJlX2lyY19jb25uZWN0ZWQoc2Vs Zi5faXJjX2JvdC5pcmNfZGVsZWdhdGUoKSkKIAogICAgIGRlZiB3b3JrX2l0ZW1fbG9nX3BhdGgo c2VsZiwgZmFpbHVyZV9pbmZvKToKQEAgLTYyLDcgKzYyLDcgQEAgY2xhc3MgU2hlcmlmZkJvdChB YnN0cmFjdFF1ZXVlKToKICAgICAgICAgICAgIHJldHVybiB7CiAgICAgICAgICAgICAgICAgInN2 bl9yZXZpc2lvbiI6IHN2bl9yZXZpc2lvbiwKICAgICAgICAgICAgICAgICAiYnVpbGRlcnMiOiBi dWlsZGVycywKLSAgICAgICAgICAgICAgICAjIEZJWE1FOiBfcm9sbG91dF9yZWFzb24gbmVlZHMg QnVpbGQgb2JqZWN0cyB3aGljaCB3ZSBjb3VsZCBwYXNzIGhlcmUuCisgICAgICAgICAgICAgICAg IyBGSVhNRTogU2hlcmlmZi5fcm9sbG91dF9yZWFzb24gbmVlZHMgQnVpbGQgb2JqZWN0cyB3aGlj aCB3ZSBjb3VsZCBwYXNzIGhlcmUuCiAgICAgICAgICAgICB9CiAgICAgICAgIHJldHVybiBOb25l CiAKQEAgLTcwLDYxICs3MCwxNSBAQCBjbGFzcyBTaGVyaWZmQm90KEFic3RyYWN0UXVldWUpOgog ICAgICAgICAjIEN1cnJlbnRseSwgd2UgZG9uJ3QgaGF2ZSBhbnkgcmVhc29ucyBub3QgdG8gcHJv Y2VlZCB3aXRoIHdvcmsgaXRlbXMuCiAgICAgICAgIHJldHVybiBUcnVlCiAKLSAgICAjIF9wb3N0 KiBtZXRob2RzIHNob3VsZCBtb3ZlIG9udG8gc29tZSBuZXcgY2xhc3Mgd2hlcmUgdGhleSBjYW4g c2hhcmUgbW9yZSBsb2dpYyBhbmQgc3RhdGUuCi0gICAgZGVmIF9wb3N0X2lyY193YXJuaW5nKHNl bGYsIGNvbW1pdF9pbmZvLCBidWlsZGVycyk6Ci0gICAgICAgIGlyY19uaWNrbmFtZXMgPSBzb3J0 ZWQoW3BhcnR5LmlyY19uaWNrbmFtZSBmb3IgcGFydHkgaW4gY29tbWl0X2luZm8ucmVzcG9uc2li bGVfcGFydGllcygpIGlmIHBhcnR5LmlyY19uaWNrbmFtZV0pCi0gICAgICAgIGlyY19wcmVmaXgg PSAiOiAiIGlmIGlyY19uaWNrbmFtZXMgZWxzZSAiIgotICAgICAgICBpcmNfbWVzc2FnZSA9ICIl cyVzJXMgYXBwZWFycyB0byBoYXZlIGJyb2tlbiAlcyIgJSAoCi0gICAgICAgICAgICAiLCAiLmpv aW4oaXJjX25pY2tuYW1lcyksCi0gICAgICAgICAgICBpcmNfcHJlZml4LAotICAgICAgICAgICAg dmlld19zb3VyY2VfdXJsKGNvbW1pdF9pbmZvLnJldmlzaW9uKCkpLAotICAgICAgICAgICAgam9p bl93aXRoX3NlcGFyYXRvcnMoW2J1aWxkZXIubmFtZSgpIGZvciBidWlsZGVyIGluIGJ1aWxkZXJz XSkpCi0KLSAgICAgICAgc2VsZi50b29sLmlyYygpLnBvc3QoaXJjX21lc3NhZ2UpCi0KLSAgICBk ZWYgX3JvbGxvdXRfcmVhc29uKHNlbGYsIGJ1aWxkZXJzKToKLSAgICAgICAgIyBGSVhNRTogVGhp cyBzaG91bGQgZXhwbGFpbiB3aGljaCBsYXlvdXQgdGVzdHMgZmFpbGVkCi0gICAgICAgICMgaG93 ZXZlciwgdGhhdCB3b3VsZCByZXF1aXJlIEJ1aWxkIG9iamVjdHMgaGVyZSwgZWl0aGVyIHBhc3Nl ZAotICAgICAgICAjIGluIHRocm91Z2ggZmFpbHVyZV9pbmZvLCBvciB0aHJvdWdoIEJ1aWxkZXIu bGF0ZXN0X2J1aWxkLgotICAgICAgICBidWlsZGVyX25hbWVzID0gW2J1aWxkZXIubmFtZSgpIGZv ciBidWlsZGVyIGluIGJ1aWxkZXJzXQotICAgICAgICByZXR1cm4gIkNhdXNlZCBidWlsZGVycyAl cyB0byBmYWlsLiIgJSBqb2luX3dpdGhfc2VwYXJhdG9ycyhidWlsZGVyX25hbWVzKQotCi0gICAg ZGVmIF9wb3N0X3JvbGxvdXRfcGF0Y2goc2VsZiwgY29tbWl0X2luZm8sIHJvbGxvdXRfcmVhc29u KToKLSAgICAgICAgIyBGb3Igbm93IHdlJ3JlIG9ubHkgcG9zdGluZyByb2xsb3V0IHBhdGNoZXMg Zm9yIGNvbW1pdC1xdWV1ZSdkIHBhdGNoZXMuCi0gICAgICAgIGNvbW1pdF9ib3RfZW1haWwgPSAi ZXNlaWRlbEBjaHJvbWl1bS5vcmciCi0gICAgICAgIGlmIGNvbW1pdF9ib3RfZW1haWwgbm90IGlu IGNvbW1pdF9pbmZvLmNvbW1pdHRlcigpLmVtYWlsczoKLSAgICAgICAgICAgIHJldHVybgotCi0g ICAgICAgIGFyZ3MgPSBbCi0gICAgICAgICAgICAiY3JlYXRlLXJvbGxvdXQiLAotICAgICAgICAg ICAgIi0tZm9yY2UtY2xlYW4iLAotICAgICAgICAgICAgIi0tbm9uLWludGVyYWN0aXZlIiwKLSAg ICAgICAgICAgICItLXBhcmVudC1jb21tYW5kPSVzIiAlIHNlbGYubmFtZSwKLSAgICAgICAgICAg IGNvbW1pdF9pbmZvLnJldmlzaW9uKCksCi0gICAgICAgICAgICBzZWxmLl9yb2xsb3V0X3JlYXNv bihidWlsZGVycyksCi0gICAgICAgIF0KLSAgICAgICAgdHJ5OgotICAgICAgICAgICAgc2VsZi5y dW5fd2Via2l0X3BhdGNoKGFyZ3MpCi0gICAgICAgIGV4Y2VwdDoKLSAgICAgICAgICAgIGxvZygi RmFpbGVkIHRvIGNyZWF0ZS1yb2xsb3V0LiIpCi0KLSAgICBkZWYgX3Bvc3RfYmxhbWVfY29tbWVu dF9vbl9idWcoc2VsZiwgY29tbWl0X2luZm8sIGJ1aWxkZXJzKToKLSAgICAgICAgaWYgbm90IGNv bW1pdF9pbmZvLmJ1Z19pZCgpOgotICAgICAgICAgICAgcmV0dXJuCi0gICAgICAgIGNvbW1lbnQg PSAiJXMgYXBwZWFycyB0byBoYXZlIGJyb2tlbiAlcyIgJSAoCi0gICAgICAgICAgICB2aWV3X3Nv dXJjZV91cmwoY29tbWl0X2luZm8ucmV2aXNpb24oKSksCi0gICAgICAgICAgICBqb2luX3dpdGhf c2VwYXJhdG9ycyhbYnVpbGRlci5uYW1lKCkgZm9yIGJ1aWxkZXIgaW4gYnVpbGRlcnNdKSkKLSAg ICAgICAgc2VsZi50b29sLmJ1Z3MucG9zdF9jb21tZW50X3RvX2J1Zyhjb21taXRfaW5mby5idWdf aWQoKSwgY29tbWVudCkKLQogICAgIGRlZiBwcm9jZXNzX3dvcmtfaXRlbShzZWxmLCBmYWlsdXJl X2luZm8pOgogICAgICAgICBzdm5fcmV2aXNpb24gPSBmYWlsdXJlX2luZm9bInN2bl9yZXZpc2lv biJdCiAgICAgICAgIGJ1aWxkZXJzID0gZmFpbHVyZV9pbmZvWyJidWlsZGVycyJdCiAKICAgICAg ICAgc2VsZi51cGRhdGUoKQogICAgICAgICBjb21taXRfaW5mbyA9IHNlbGYudG9vbC5jaGVja291 dCgpLmNvbW1pdF9pbmZvX2Zvcl9yZXZpc2lvbihzdm5fcmV2aXNpb24pCi0gICAgICAgIHNlbGYu X3Bvc3RfaXJjX3dhcm5pbmcoY29tbWl0X2luZm8sIGJ1aWxkZXJzKQotICAgICAgICBzZWxmLl9w b3N0X2JsYW1lX2NvbW1lbnRfb25fYnVnKGNvbW1pdF9pbmZvLCBidWlsZGVycykKLSAgICAgICAg c2VsZi5fcG9zdF9yb2xsb3V0X3BhdGNoKGNvbW1pdF9pbmZvLCBidWlsZGVycykKKyAgICAgICAg c2VsZi5fc2hlcmlmZi5wb3N0X2lyY193YXJuaW5nKGNvbW1pdF9pbmZvLCBidWlsZGVycykKKyAg ICAgICAgc2VsZi5fc2hlcmlmZi5wb3N0X2JsYW1lX2NvbW1lbnRfb25fYnVnKGNvbW1pdF9pbmZv LCBidWlsZGVycykKKyAgICAgICAgc2VsZi5fc2hlcmlmZi5wb3N0X2F1dG9tYXRpY19yb2xsb3V0 X3BhdGNoKGNvbW1pdF9pbmZvLCBidWlsZGVycykKIAogICAgICAgICBmb3IgYnVpbGRlciBpbiBi dWlsZGVyczoKICAgICAgICAgICAgIHNlbGYudG9vbC5zdGF0dXNfc2VydmVyLnVwZGF0ZV9zdm5f cmV2aXNpb24oc3ZuX3JldmlzaW9uLCBidWlsZGVyLm5hbWUoKSkKZGlmZiAtLWdpdCBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9zaGVyaWZmYm90X3VuaXR0ZXN0 LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NoZXJpZmZi b3RfdW5pdHRlc3QucHkKaW5kZXggMDU3NjllZi4uMDA5ZGI1OSAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NoZXJpZmZib3RfdW5pdHRlc3Qu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3NoZXJp ZmZib3RfdW5pdHRlc3QucHkKQEAgLTI4LDExICsyOCwxMCBAQAogCiBpbXBvcnQgb3MKIAotZnJv bSB3ZWJraXRweS5jb21tb24ubmV0LmJ1aWxkYm90IGltcG9ydCBCdWlsZGVyCi1mcm9tIHdlYmtp dHB5LnRoaXJkcGFydHkubW9jayBpbXBvcnQgTW9jawogZnJvbSB3ZWJraXRweS50b29sLmNvbW1h bmRzLnF1ZXVlc3Rlc3QgaW1wb3J0IFF1ZXVlc1Rlc3QKIGZyb20gd2Via2l0cHkudG9vbC5jb21t YW5kcy5zaGVyaWZmYm90IGltcG9ydCBTaGVyaWZmQm90Ci1mcm9tIHdlYmtpdHB5LnRvb2wubW9j a3Rvb2wgaW1wb3J0IE1vY2tUb29sLCBtb2NrX2J1aWxkZXIKK2Zyb20gd2Via2l0cHkudG9vbC5t b2NrdG9vbCBpbXBvcnQgbW9ja19idWlsZGVyCisKIAogY2xhc3MgU2hlcmlmZkJvdFRlc3QoUXVl dWVzVGVzdCk6CiAgICAgZGVmIHRlc3Rfc2hlcmlmZl9ib3Qoc2VsZik6CkBAIC00MywzMiArNDIs NyBAQCBjbGFzcyBTaGVyaWZmQm90VGVzdChRdWV1ZXNUZXN0KToKICAgICAgICAgZXhwZWN0ZWRf c3RkZXJyID0gewogICAgICAgICAgICAgImJlZ2luX3dvcmtfcXVldWUiOiAiQ0FVVElPTjogc2hl cmlmZi1ib3Qgd2lsbCBkaXNjYXJkIGFsbCBsb2NhbCBjaGFuZ2VzIGluIFwiJXNcIlxuUnVubmlu ZyBXZWJLaXQgc2hlcmlmZi1ib3QuXG4iICUgb3MuZ2V0Y3dkKCksCiAgICAgICAgICAgICAibmV4 dF93b3JrX2l0ZW0iOiAiIiwKLSAgICAgICAgICAgICJwcm9jZXNzX3dvcmtfaXRlbSI6ICJNT0NL OiBpcmMucG9zdDogYWJhcnRoLCBkYXJpbiwgZXNlaWRlbDogaHR0cDovL3RyYWMud2Via2l0Lm9y Zy9jaGFuZ2VzZXQvMjk4MzcgYXBwZWFycyB0byBoYXZlIGJyb2tlbiBNb2NrIGJ1aWxkZXIgbmFt ZSAoVGVzdHMpXG4iLAorICAgICAgICAgICAgInByb2Nlc3Nfd29ya19pdGVtIjogIk1PQ0s6IGly Yy5wb3N0OiBhYmFydGgsIGRhcmluLCBlc2VpZGVsOiBodHRwOi8vdHJhYy53ZWJraXQub3JnL2No YW5nZXNldC8yOTgzNyBtaWdodCBoYXZlIGJyb2tlbiBNb2NrIGJ1aWxkZXIgbmFtZSAoVGVzdHMp XG4iLAogICAgICAgICAgICAgImhhbmRsZV91bmV4cGVjdGVkX2Vycm9yIjogIk1vY2sgZXJyb3Ig bWVzc2FnZVxuIgogICAgICAgICB9CiAgICAgICAgIHNlbGYuYXNzZXJ0X3F1ZXVlX291dHB1dHMo U2hlcmlmZkJvdCgpLCB3b3JrX2l0ZW09bW9ja193b3JrX2l0ZW0sIGV4cGVjdGVkX3N0ZGVycj1l eHBlY3RlZF9zdGRlcnIpCi0KLSAgICBkZWYgdGVzdF9yb2xsb3V0X3JlYXNvbihzZWxmKToKLSAg ICAgICAgYm90ID0gU2hlcmlmZkJvdCgpCi0gICAgICAgIGJ1aWxkZXJzID0gWwotICAgICAgICAg ICAgQnVpbGRlcigiRm9vIiwgTm9uZSksCi0gICAgICAgICAgICBCdWlsZGVyKCJCYXIiLCBOb25l KSwKLSAgICAgICAgXQotICAgICAgICByZWFzb24gPSAiQ2F1c2VkIGJ1aWxkZXJzIEZvbyBhbmQg QmFyIHRvIGZhaWwuIgotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhib3QuX3JvbGxvdXRfcmVh c29uKGJ1aWxkZXJzKSwgcmVhc29uKQotCi0gICAgZGVmIHRlc3RfcG9zdF9ibGFtZV9jb21tZW50 X29uX2J1ZyhzZWxmKToKLSAgICAgICAgYm90ID0gU2hlcmlmZkJvdCgpCi0gICAgICAgIGJvdC50 b29sID0gTW9ja1Rvb2woKQotICAgICAgICBidWlsZGVycyA9IFsKLSAgICAgICAgICAgIEJ1aWxk ZXIoIkZvbyIsIE5vbmUpLAotICAgICAgICAgICAgQnVpbGRlcigiQmFyIiwgTm9uZSksCi0gICAg ICAgIF0KLSAgICAgICAgY29tbWl0X2luZm8gPSBNb2NrKCkKLSAgICAgICAgY29tbWl0X2luZm8u YnVnX2lkID0gbGFtYmRhOk5vbmUKLSAgICAgICAgY29tbWl0X2luZm8ucmV2aXNpb24gPSBsYW1i ZGE6NDMyMQotICAgICAgICAjIFNob3VsZCBkbyBub3RoaW5nIHdpdGggbm8gYnVnX2lkCi0gICAg ICAgIGJvdC5fcG9zdF9ibGFtZV9jb21tZW50X29uX2J1Zyhjb21taXRfaW5mbywgYnVpbGRlcnMp Ci0gICAgICAgICMgU2hvdWxkIHRyeSB0byBwb3N0IGEgY29tbWVudCB0byB0aGUgYnVnLCBidXQg TW9ja1Rvb2wuYnVncyBkb2VzIG5vdGhpbmcuCi0gICAgICAgIGNvbW1pdF9pbmZvLmJ1Z19pZCA9 IGxhbWJkYToxMjM0Ci0gICAgICAgIGJvdC5fcG9zdF9ibGFtZV9jb21tZW50X29uX2J1Zyhjb21t aXRfaW5mbywgYnVpbGRlcnMpCg==