148899 2015-09-05 09:39:10 -0700 webkit-patch: Passing --no-review should submit patch to EWS by default 2017-08-14 14:15:36 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=54735 InRadar P2 Normal --- 1 bburg dbates ap buildbot darin dbates ddkilzer glenn joepeck sam webkit-bug-importer oldest_to_newest 1123940 0 bburg 2015-09-05 09:39:10 -0700 If you are a Good Person and use EWS to avoid build breaks, it's really tedious to set r? on a patch that's already reviewed then get a bunch of bug mail for no reason. It's also tedious to click "Submit For EWS" on every patch. There should just be an option, like $ webkit-patch upload --request-ews --no-review Which will click that button for us. 1337824 1 dbates 2017-08-10 20:59:49 -0700 An alternative approach proposed in bug #54735 is to introduce a new "try" command "that basically [would] just be upload with --no-review and a pre-set title." I am leaning towards implementing this as proposed in this bug (comment #0) - as an optional flag - because then it could be supported by all of the applicable webkit-patch commands that post a patch: upload, post, and post-commits. The proposal in comment #0 suggests that the flag, --request-ews, just does one thing: submit the patch to EWS. Alternatively we could have the flag, maybe called --try, do more than one things, say do not mark the patch for review and submit the patch to EWS. Or even, upload the patch with a hardcoded name "For EWS Bots" (suggested by Eric Seidel in bug #54735, comment 1), do not mark the patch for review, and submit the patch to EWS. Thoughts? 1337826 2 317914 dbates 2017-08-10 21:18:53 -0700 Created attachment 317914 Patch and unit tests Here is a patch that adds a --submit-to-ews flag to commands upload, post, and post-commits. Its usage matches the proposal in comment #0: "webkit-patch upload --no-review --submit-to-ews ...". That is, it must be used in conjunction with --no-review to be effective. I also added a new command, submit-to-ews, that can take one or more attachment ids and submit them to EWS. This command can be used to submit an existing --no-review patch to EWS. 1338349 3 darin 2017-08-14 09:12:24 -0700 Looks good. I would use this. I wish "--submit-to-ews" was something shorter. Also annoying since I will always have to do both "--no-review" and "--submit-to-ews". Maybe submitting to EWS should be the default even when you say "--no-review" and there should be an option "--no-ews". 1338370 4 318045 dbates 2017-08-14 10:00:45 -0700 Created attachment 318045 Patch and unit tests 1338371 5 dbates 2017-08-14 10:01:45 -0700 (In reply to Darin Adler from comment #3) > Maybe submitting to EWS should be the default even when you say "--no-review" and there should be an option "--no-ews". I updated the patch to take this approach. 1338390 6 318045 ddkilzer 2017-08-14 10:26:20 -0700 Comment on attachment 318045 Patch and unit tests r=me 1338459 7 dbates 2017-08-14 14:08:56 -0700 Actually, I am not going to land the dedicated submit-to-ews command part of the patch. I am not going to include this command because I do not see much value to adding it at least not in its current form that requires specifying attachment id(s), which can only be discovered by visiting the bug. If a person visits the bug then it is straightforward to click the Submit for EWS on the attachments they want to submit. We can always add such a submit-to-ews command in a follow up if more realistic use cases materialize. 1338461 8 dbates 2017-08-14 14:14:19 -0700 Committed r220715: <http://trac.webkit.org/changeset/220715> 1338463 9 webkit-bug-importer 2017-08-14 14:15:36 -0700 <rdar://problem/33883377> 317914 2017-08-10 21:18:53 -0700 2017-08-14 10:00:44 -0700 Patch and unit tests bug-148899-20170810212119.patch text/plain 18360 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNTUwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2NlMjllNjRjODE0YjgwZTkxNWFjZDEyODU1NGNkOTYx YTQxNWNjNi4uOGM0YWQyYTRkNjc3MGVjZjRjYjE1YTIzODFiZTJjNTliZDgyODZjZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU2 IEBACisyMDE3LTA4LTEwICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICB3ZWJraXQtcGF0Y2g6IEFkZCBvcHRpb24gdG8gc3VibWl0IGEgcGF0Y2ggdG8gRVdTCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg4OTkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIGFuIG9w dGlvbmFsIGNvbW1hbmQgbGluZSBmbGFnLCAtLXN1Ym1pdC10by1ld3MsIHRvIHRoZSBjb21tYW5k cyB1cGxvYWQgYW5kIHBvc3QtY29tbWl0cworICAgICAgICB0byBzdWJtaXQgYSAtLW5vLXJldmll dyBwYXRjaChlcykgZm9yIEVXUyBhbmFseXNpcy4gQWxzbyBhZGRzIGEgbmV3IGNvbW1hbmQsIHN1 Ym1pdC10by1ld3MsCisgICAgICAgIHRoYXQgc3VibWl0cyBvbmUgb3IgbW9yZSBhdHRhY2htZW50 cyBpZHMgZm9yIEVXUyBhbmFseXNpcy4KKworICAgICAgICBGcmVxdWVudGx5IEkgd2FudCB0byBw b3N0IHRvIGFuIGRyYWZ0IG9mIGEgcGF0Y2ggd2l0aG91dCByZXZpZXcgdG8gaGF2ZSB0aGUgRVdT IGJvdHMKKyAgICAgICAgcHJvY2VzcyBpdCB0byBjYXRjaCBidWlsZCBhbmQgdGVzdCBicmVha2Fn ZSBiZWZvcmUgSSBjbGVhbiBpdCB1cCBhbmQgcG9zdCBpdCBmb3IgZm9ybWFsCisgICAgICAgIHJl dmlldy4gQ3VycmVudGx5IHRoaXMgcmVxdWlyZXMgdXNpbmcgIndlYmtpdC1wYXRjaCB1cGxvYWQg LS1uby1yZXZpZXcgLS1vcGVuLWJ1ZyIgdG8KKyAgICAgICAgdXBsb2FkIHRoZSBwYXRjaCBhbmQg b3BlbiB0aGUgYnVnIGluIFNhZmFyaSBzbyB0aGF0IEkgY2FuIGNsaWNrIHRoZSBTdWJtaXQgZm9y IEVXUworICAgICAgICBhbmFseXNpcyBidXR0b24uIFdlIHNob3VsZCB0ZWFjaCAid2Via2l0LXBh dGNoIHVwbG9hZCIgaG93IHRvIGRvIHRoaXMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHk6CisgICAgICAgIChCdWd6aWxsYS5fcGFy c2VfYXR0YWNobWVudF9pZF9mcm9tX2FkZF9wYXRjaF90b19idWdfcmVzcG9uc2UpOiBBZGQgaGVs cGVyIGZ1bmN0aW9uIHRvCisgICAgICAgIHBhcnNlIHRoZSBhdHRhY2htZW50IGlkIGZyb20gdGhl IHJlc3BvbnNlIHBhZ2UgYWZ0ZXIgYWRkaW5nIGFuIGF0dGFjaG1lbnQgdG8gdGhlIGJ1Zy4KKyAg ICAgICAgKEJ1Z3ppbGxhLmFkZF9wYXRjaF90b19idWcpOiBNb2RpZmllZCB0byBwYXJzZSBhbmQg cmV0dXJuIHRoZSBhdHRhY2htZW50IGlkIGZyb20gdGhlCisgICAgICAgIEhUVFAgcmVzcG9uc2Ug YWZ0ZXIgdXBsb2FkaW5nIHRoZSBwYXRjaC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGFfbW9jay5weToKKyAgICAgICAgKE1vY2tCdWd6aWxs YS5hZGRfcGF0Y2hfdG9fYnVnKTogUmV0dXJuIGEgZHVtbXkgYXR0YWNobWVudCBpZCBmb3IgdGVz dGluZyBwdXJwb3Nlcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVn emlsbGEvYnVnemlsbGFfdW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X19wYXJzZV9hdHRhY2ht ZW50X2lkX2Zyb21fYWRkX3BhdGNoX3RvX2J1Z19yZXNwb25zZSk6IEFkZGVkLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWQucHk6CisgICAgICAgIChTdWJt aXRUb0VXUyk6IEFkZGVkOyBuZXcgY29tbWFuZC4KKyAgICAgICAgKFN1Ym1pdFRvRVdTLl9wcmVw YXJlX3N0YXRlKTogQ2hlY2sgaWYgdGhlIHNwZWNpZmllZCBhdHRhY2htZW50cyBleGlzdCBvciBl cnJvciBvdXQuIEZvciBub3cKKyAgICAgICAgd2UgZG8gdGhpcyBieSBmZXRjaGluZyB0aGUgYXR0 YWNobWVudCBwYWdlIHRvIHBhcnNlIGl0cyBidWcgaWQgYXMgQnVnemlsbGEgYWx3YXlzIHJldHVy bnMKKyAgICAgICAgYSBIVFRQIDIwMCBPSyByZXNwb25zZSByZWdhcmRsZXNzIG9mIHdoZXRoZXIg dGhlIGF0dGFjaG1lbnQgZG9lcyBub3QgZXhpc3QuIFRoaXMgaXMgaW5lZmZpY2llbnQuCisgICAg ICAgIFdlIHNob3VsZCBsb29rIGZvciBhIG1vcmUgZGlyZWN0IHdheSB0byBkZXRlcm1pbmUgaWYg YW4gYXR0YWNobWVudCBleGlzdHMgdGhhdCBhdm9pZHMgZmV0Y2hpbmcKKyAgICAgICAgdGhlIGVu dGlyZSBjb250ZW50cyBvZiB0aGUgYXR0YWNobWVudC4gCisgICAgICAgIChVcGxvYWQpOiBBZGQg c3RlcCBTdWJtaXRUb0VXUyB0byB0aGUgbGlzdCBvZiBzdGVwcyB3aGVuIHVwbG9hZGluZyBhIHBh dGNoLiAKKyAgICAgICAgKFBvc3RDb21taXRzLl9faW5pdF9fKTogQWRkIC0tc3VibWl0LXRvLWV3 cyBvcHRpb24gdG8gdGhlIGxpc3Qgb2YgYXBwbGljYWJsZSBvcHRpb24gZmxhZ3MgZm9yCisgICAg ICAgIHRoaXMgY29tbWFuZC4KKyAgICAgICAgKFBvc3RDb21taXRzLmV4ZWN1dGUpOiBTdWJtaXQg dGhlIHBhdGNoIHRvIEVXUywgaWYgYXBwbGljYWJsZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5OgorICAgICAgICAodGVzdF91cGxv YWQpOiBTZXQgb3B0aW9ucy5zdWJtaXRfdG9fZXdzIHRvIEZhbHNlIGFzIHRoZSB1cGxvYWQgY29t bWFuZCBleHBlY3RzIHRoaXMgb3B0aW9uCisgICAgICAgIHRvIGJlIHNwZWNpZmllZC4KKyAgICAg ICAgKHRlc3RfdXBsb2FkX3dpdGhfbm9fcmV2aWV3X2FuZF9zdWJtaXRfdG9fZXdzKTogQWRkZWQu CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL19faW5pdF9fLnB5OiBJbXBv cnQgbW9kdWxlIFN1Ym1pdFRvRVdTLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9z dGVwcy9vcHRpb25zLnB5OgorICAgICAgICAoT3B0aW9ucyk6IEFkZGVkIGNvbW1hbmQgbGluZSBv cHRpb24gLS1zdWJtaXQtdG8tZXdzIChkZWZhdWx0czogRmFsc2UpLgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wb3N0ZGlmZi5weToKKyAgICAgICAgKFBvc3REaWZmLm9w dGlvbnMpOiBBZGQgLS1zdWJtaXQtdG8tZXdzIG9wdGlvbiB0byB0aGUgbGlzdCBvZiBhcHBsaWNh YmxlIG9wdGlvbiBmbGFncyBmb3IKKyAgICAgICAgdGhpcyBzdGVwLgorICAgICAgICAoUG9zdERp ZmYucnVuKTogU3VibWl0IHRoZSBwYXRjaCB0byBFV1MsIGlmIGFwcGxpY2FibGUuCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3N1Ym1pdHRvZXdzLnB5OiBBZGRlZC4KKyAg ICAgICAgKFN1Ym1pdFRvRVdTKToKKyAgICAgICAgKFN1Ym1pdFRvRVdTLm9wdGlvbnMpOiBSZXR1 cm4gYW4gZW1wdHkgYXJyYXkgYXMgd2UgdGhpcyBzdGVwIGRvZXMgbm90IGhhdmUgYW55IGNvbW1h bmQgbGluZSBvcHRpb25zLgorICAgICAgICAoU3VibWl0VG9FV1MucnVuKTogU3VibWl0IHRoZSBz cGVjaWZpZWQgYXR0YWNobWVudCBpZHMgZm9yIEVXUyBhbmFseXNpcy4KKwogMjAxNy0wOC0xMCAg b2Jpbm5hIG9iaWtlICA8b29iaWtlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgb2Jzb2xl dGUgbGluayBmcm9tIHdlYmtpdC1xdWV1ZXMgc3RhdHVzIHBhZ2UKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weQppbmRleCA4 MjAzZDE0NmM0Mjc4ZmJmNTM0ZWMyNTgwMzVjOThlYzY3ZjVkZThhLi5iMTBjOTZmYmVkNWVhOTMz MDlkMDE2NWM1ZWI1OTNkZWQ2ZDZjN2JiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5CkBAIC02MjAsNiArNjIwLDE0 IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLmJyb3dzZXJbJ2Nv bW1lbnQnXSA9IGNvbW1lbnRfdGV4dAogICAgICAgICBzZWxmLmJyb3dzZXIuc3VibWl0KCkKIAor ICAgIEBzdGF0aWNtZXRob2QKKyAgICBkZWYgX3BhcnNlX2F0dGFjaG1lbnRfaWRfZnJvbV9hZGRf cGF0Y2hfdG9fYnVnX3Jlc3BvbnNlKHJlc3BvbnNlX2h0bWwpOgorICAgICAgICBtYXRjaCA9IHJl LnNlYXJjaCgnPHRpdGxlPkF0dGFjaG1lbnQgKD9QPGF0dGFjaG1lbnRfaWQ+XGQrKSBhZGRlZCB0 byBCdWcgXGQrPC90aXRsZT4nLCByZXNwb25zZV9odG1sKQorICAgICAgICBpZiBtYXRjaDoKKyAg ICAgICAgICAgIHJldHVybiBtYXRjaC5ncm91cCgnYXR0YWNobWVudF9pZCcpCisgICAgICAgIF9s b2cud2FybmluZygnVW5hYmxlIHRvIHBhcnNlIGF0dGFjaG1lbnQgaWQnKQorICAgICAgICByZXR1 cm4gTm9uZQorCiAgICAgIyBGSVhNRTogVGhlIGFyZ3VtZW50cyB0byB0aGlzIGZ1bmN0aW9uIHNo b3VsZCBiZSBzaW1wbGlmaWVkIGFuZCB0aGVuCiAgICAgIyB0aGlzIHNob3VsZCBiZSBtZXJnZWQg aW50byBhZGRfYXR0YWNobWVudF90b19idWcKICAgICBkZWYgYWRkX3BhdGNoX3RvX2J1ZyhzZWxm LApAQCAtNjUyLDcgKzY2MCw4IEBAIGNsYXNzIEJ1Z3ppbGxhKG9iamVjdCk6CiAgICAgICAgIGlm IGNvbW1lbnRfdGV4dDoKICAgICAgICAgICAgIF9sb2cuaW5mbyhjb21tZW50X3RleHQpCiAgICAg ICAgICAgICBzZWxmLmJyb3dzZXJbJ2NvbW1lbnQnXSA9IGNvbW1lbnRfdGV4dAotICAgICAgICBz ZWxmLmJyb3dzZXIuc3VibWl0KCkKKyAgICAgICAgcmVzcG9uc2UgPSBzZWxmLmJyb3dzZXIuc3Vi bWl0KCkKKyAgICAgICAgcmV0dXJuIHNlbGYuX3BhcnNlX2F0dGFjaG1lbnRfaWRfZnJvbV9hZGRf cGF0Y2hfdG9fYnVnX3Jlc3BvbnNlKHJlc3BvbnNlLnJlYWQoKSkKIAogICAgICMgRklYTUU6IFRo ZXJlIGhhcyB0byBiZSBhIG1vcmUgY29uY2lzZSB3YXkgdG8gd3JpdGUgdGhpcyBtZXRob2QuCiAg ICAgZGVmIF9jaGVja19jcmVhdGVfYnVnX3Jlc3BvbnNlKHNlbGYsIHJlc3BvbnNlX2h0bWwpOgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1 Z3ppbGxhX21vY2sucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemls bGEvYnVnemlsbGFfbW9jay5weQppbmRleCAwNjhkNTk0ZTUyNzQzYWM5MjI5MTNhNDY4NjM3YTQz MWI3NDBhYzc1Li5iYjJjMjc0ZGRlYWEwOGI4NDI2MGFiYWI3ZDBlYzhjZjhhMjE5MDA3IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemls bGFfbW9jay5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemls bGEvYnVnemlsbGFfbW9jay5weQpAQCAtNDYxLDYgKzQ2MSw3IEBAIGNsYXNzIE1vY2tCdWd6aWxs YShvYmplY3QpOgogICAgICAgICAgICAgX2xvZy5pbmZvKCItLSBCZWdpbiBjb21tZW50IC0tIikK ICAgICAgICAgICAgIF9sb2cuaW5mbyhjb21tZW50X3RleHQpCiAgICAgICAgICAgICBfbG9nLmlu Zm8oIi0tIEVuZCBjb21tZW50IC0tIikKKyAgICAgICAgcmV0dXJuICcxMDAwMScKIAogICAgIGRl ZiBhZGRfY2NfdG9fYnVnKHNlbGYsIGJ1Z19pZCwgY2NzKToKICAgICAgICAgcGFzcwpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxh X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxh L2J1Z3ppbGxhX3VuaXR0ZXN0LnB5CmluZGV4IDA5NDAyYjJkYzNmNzI4NTBmNWFhODM0NzU5ZjA2 MDM5MGViNTQ3ZGUuLjliOGM4MDU1Mzc5YjZkM2Y2N2U4ZGIzZmUxNTBlNWEwZmJmNDJmZTQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6 aWxsYV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQv YnVnemlsbGEvYnVnemlsbGFfdW5pdHRlc3QucHkKQEAgLTM0Miw2ICszNDIsMTggQEAgSWdub3Jl IHRoaXMgYnVnLiAgSnVzdCBmb3IgdGVzdGluZyBmYWlsdXJlIG1vZGVzIG9mIHdlYmtpdC1wYXRj aCBhbmQgdGhlIGNvbW1pdC0KICAgICAgICAgdGl0bGVfaHRtbF9idWd6aWxsYV80MjUgPSAiPHRp dGxlPkJ1ZyAxMDE2NDAgU3VibWl0dGVkICZuZGFzaDsgVGVzdGluZyB3ZWJraXQtcGF0Y2ggYWdh aW48L3RpdGxlPiIKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChidWd6aWxsYS5fY2hlY2tfY3Jl YXRlX2J1Z19yZXNwb25zZSh0aXRsZV9odG1sX2J1Z3ppbGxhXzQyNSksICcxMDE2NDAnKQogCisg ICAgZGVmIHRlc3RfX3BhcnNlX2F0dGFjaG1lbnRfaWRfZnJvbV9hZGRfcGF0Y2hfdG9fYnVnX3Jl c3BvbnNlKHNlbGYpOgorICAgICAgICBidWd6aWxsYSA9IEJ1Z3ppbGxhKCkKKworICAgICAgICB0 aXRsZV9odG1sID0gJzx0aXRsZT5BdHRhY2htZW50IDMxNzU5MSBhZGRlZCB0byBCdWcgMTc1MjQ3 PC90aXRsZT4nCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoYnVnemlsbGEuX3BhcnNlX2F0dGFj aG1lbnRfaWRfZnJvbV9hZGRfcGF0Y2hfdG9fYnVnX3Jlc3BvbnNlKHRpdGxlX2h0bWwpLCAnMzE3 NTkxJykKKworICAgICAgICB0aXRsZV9odG1sID0gJzx0aXRsZT5BdHRhY2htZW50IDMxNzU5MTsg bWFsZm9ybWVkPC90aXRsZT4nCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoYnVnemlsbGEuX3Bh cnNlX2F0dGFjaG1lbnRfaWRfZnJvbV9hZGRfcGF0Y2hfdG9fYnVnX3Jlc3BvbnNlKHRpdGxlX2h0 bWwpLCBOb25lKQorCisgICAgICAgIHRpdGxlX2h0bWwgPSAnPHRpdGxlPkF0dGFjaG1lbnQgQSBh ZGRlZCB0byBCdWcgMTc1MjQ3PC90aXRsZT4nCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoYnVn emlsbGEuX3BhcnNlX2F0dGFjaG1lbnRfaWRfZnJvbV9hZGRfcGF0Y2hfdG9fYnVnX3Jlc3BvbnNl KHRpdGxlX2h0bWwpLCBOb25lKQorCiAKIGNsYXNzIEJ1Z3ppbGxhUXVlcmllc1Rlc3QodW5pdHRl c3QuVGVzdENhc2UpOgogICAgIF9zYW1wbGVfcmVxdWVzdF9wYWdlID0gIiIiCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvdXBsb2FkLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3VwbG9hZC5weQppbmRleCBjNTkyNTE5N2Vh Y2NjMTExNWVjNGY3YWRlZDliYWNjMzE3OGJhMWVjLi5mMWViODY5ODBhYzQ5MDQ1MGNlZTU5MTg2 OGI3OTQ5ZDI5YTQ1YmY2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvdXBsb2FkLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21t YW5kcy91cGxvYWQucHkKQEAgLTE2Miw2ICsxNjIsMjggQEAgY2xhc3MgQXNzaWduVG9Db21taXR0 ZXIoQ29tbWFuZCk6CiAgICAgICAgICAgICBzZWxmLl9hc3NpZ25fYnVnX3RvX2xhc3RfcGF0Y2hf YXR0YWNoZXIoYnVnX2lkKQogCiAKK2NsYXNzIFN1Ym1pdFRvRVdTKEFic3RyYWN0U2VxdWVuY2Vk Q29tbWFuZCk6CisgICAgbmFtZSA9ICdzdWJtaXQtdG8tZXdzJworICAgIGhlbHBfdGV4dCA9ICdT dWJtaXQgYXR0YWNobWVudCBmb3IgRVdTIGFuYWx5c2lzJworICAgIGFyZ3VtZW50X25hbWVzID0g J0FUVEFDSE1FTlRfSUQgW0FUVEFDSE1FTlRfSURTXScKKyAgICBzdGVwcyA9IFsKKyAgICAgICAg c3RlcHMuU3VibWl0VG9FV1MsCisgICAgXQorCisgICAgZGVmIF9wcmVwYXJlX3N0YXRlKHNlbGYs IG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgorICAgICAgICAjIEZJWE1FOiBUaGlzIGlzIGluZWZmaWNp ZW50IGFzIHdlIG5lZWQgdG8gZmV0Y2ggdGhlIGVudGlyZSBhdHRhY2htZW50LiBXZSBzaG91bGQK KyAgICAgICAgIyBsb29rIGZvciBhIG1vcmUgZGlyZWN0IHdheSB0byBkZXRlcm1pbmUgaWYgYW4g YXR0YWNobWVudCBleGlzdHMuCisgICAgICAgIGVycm9yX29jY3VycmVkID0gRmFsc2UKKyAgICAg ICAgZm9yIGF0dGFjaG1lbnRfaWQgaW4gYXJnczoKKyAgICAgICAgICAgIGlmIHRvb2wuYnVncy5i dWdfaWRfZm9yX2F0dGFjaG1lbnRfaWQoYXR0YWNobWVudF9pZCk6CisgICAgICAgICAgICAgICAg Y29udGludWUKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoJ1VuYWJsZSB0byBwYXJzZSBidWcgaWQg Zm9yIGF0dGFjaG1lbnQge30uIEFyZSB5b3Ugc3VyZSB5b3UgcGFzc2VkIHRoZSByaWdodCBpZD8n LmZvcm1hdChhdHRhY2htZW50X2lkKSkKKyAgICAgICAgICAgIGVycm9yX29jY3VycmVkID0gVHJ1 ZQorICAgICAgICBpZiBlcnJvcl9vY2N1cnJlZDoKKyAgICAgICAgICAgIHN5cy5leGl0KDEpCisg ICAgICAgIHJldHVybiB7J2F0dGFjaG1lbnRfaWRzJzogYXJnc30KKworCiBjbGFzcyBPYnNvbGV0 ZUF0dGFjaG1lbnRzKEFic3RyYWN0U2VxdWVuY2VkQ29tbWFuZCk6CiAgICAgbmFtZSA9ICJvYnNv bGV0ZS1hdHRhY2htZW50cyIKICAgICBoZWxwX3RleHQgPSAiTWFyayBhbGwgYXR0YWNobWVudHMg b24gYSBidWcgYXMgb2Jzb2xldGUiCkBAIC0yODQsNiArMzA2LDcgQEAgY2xhc3MgVXBsb2FkKEFi c3RyYWN0UGF0Y2hVcGxvYWRpbmdDb21tYW5kKToKICAgICAgICAgc3RlcHMuU3VnZ2VzdFJldmll d2VycywKICAgICAgICAgc3RlcHMuRW5zdXJlQnVnSXNPcGVuQW5kQXNzaWduZWQsCiAgICAgICAg IHN0ZXBzLlBvc3REaWZmLAorICAgICAgICBzdGVwcy5TdWJtaXRUb0VXUywKICAgICBdCiAgICAg bG9uZ19oZWxwID0gIiIidXBsb2FkIHVwbG9hZHMgdGhlIGN1cnJlbnQgZGlmZiB0byBidWdzLndl YmtpdC5vcmcuCiAgICAgSWYgbm8gYnVnIGlkIGlzIHByb3ZpZGVkLCB1cGxvYWQgd2lsbCBjcmVh dGUgYSBidWcuCkBAIC0zMjEsNiArMzQ0LDcgQEAgY2xhc3MgUG9zdENvbW1pdHMoQ29tbWFuZCk6 CiAgICAgICAgICAgICBzdGVwcy5PcHRpb25zLm9ic29sZXRlX3BhdGNoZXMsCiAgICAgICAgICAg ICBzdGVwcy5PcHRpb25zLnJldmlldywKICAgICAgICAgICAgIHN0ZXBzLk9wdGlvbnMucmVxdWVz dF9jb21taXQsCisgICAgICAgICAgICBzdGVwcy5PcHRpb25zLnN1Ym1pdF90b19ld3MsCiAgICAg ICAgIF0KICAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCBvcHRpb25zPW9wdGlvbnMsIHJl cXVpcmVzX2xvY2FsX2NvbW1pdHM9VHJ1ZSkKIApAQCAtMzU2LDcgKzM4MCwxMyBAQCBjbGFzcyBQ b3N0Q29tbWl0cyhDb21tYW5kKToKICAgICAgICAgICAgIGRpZmYgPSB0b29sLnNjbSgpLmNyZWF0 ZV9wYXRjaChnaXRfY29tbWl0PWNvbW1pdF9pZCkKICAgICAgICAgICAgIGRlc2NyaXB0aW9uID0g b3B0aW9ucy5kZXNjcmlwdGlvbiBvciBjb21taXRfbWVzc2FnZS5kZXNjcmlwdGlvbihsc3RyaXA9 VHJ1ZSwgc3RyaXBfdXJsPVRydWUpCiAgICAgICAgICAgICBjb21tZW50X3RleHQgPSBzZWxmLl9j b21tZW50X3RleHRfZm9yX2NvbW1pdChvcHRpb25zLCBjb21taXRfbWVzc2FnZSwgdG9vbCwgY29t bWl0X2lkKQotICAgICAgICAgICAgdG9vbC5idWdzLmFkZF9wYXRjaF90b19idWcoYnVnX2lkLCBk aWZmLCBkZXNjcmlwdGlvbiwgY29tbWVudF90ZXh0LCBtYXJrX2Zvcl9yZXZpZXc9b3B0aW9ucy5y ZXZpZXcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1vcHRpb25zLnJlcXVlc3RfY29tbWl0KQorICAg ICAgICAgICAgYXR0YWNobWVudF9pZCA9IHRvb2wuYnVncy5hZGRfcGF0Y2hfdG9fYnVnKGJ1Z19p ZCwgZGlmZiwgZGVzY3JpcHRpb24sIGNvbW1lbnRfdGV4dCwgbWFya19mb3JfcmV2aWV3PW9wdGlv bnMucmV2aWV3LCBtYXJrX2Zvcl9jb21taXRfcXVldWU9b3B0aW9ucy5yZXF1ZXN0X2NvbW1pdCkK KworICAgICAgICAgICAgIyBXZSBvbmx5IG5lZWQgdG8gc3VibWl0IC0tbm8tcmV2aWV3IHBhdGNo ZXMgdG8gRVdTIGFzIHBhdGNoZXMgcG9zdGVkIGZvciByZXZpZXcgYXJlCisgICAgICAgICAgICAj IGF1dG9tYXRpY2FsbHkgc3VibWl0dGVkIHRvIEVXUyBieSBFV1NGZWVkZXIuCisgICAgICAgICAg ICBpZiBub3Qgb3B0aW9ucy5yZXZpZXcgYW5kIG9wdGlvbnMuc3VibWl0X3RvX2V3czoKKyAgICAg ICAgICAgICAgICBzdGF0ZSA9IHsnYXR0YWNobWVudF9pZHMnOiBbYXR0YWNobWVudF9pZF19Cisg ICAgICAgICAgICAgICAgc3RlcHMuU3VibWl0VG9FV1ModG9vbCwgb3B0aW9ucykucnVuKHN0YXRl KQogCiAKICMgRklYTUU6IFRoaXMgY29tbWFuZCBuZWVkcyB0byBiZSBicm91Z2h0IGludG8gdGhl IG1vZGVybiBhZ2Ugd2l0aCBzdGVwcyBhbmQgQ29tbWl0SW5mby4KZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5CmluZGV4 IDYxZjYwOTA0NTRjYjUyZWZiYzczNTQ4YjBlYWU1MjNmMjIyZjg3MmIuLjFjMWFjZDkwNzc0MDQ0 OTg1MWRjNmRmY2UxNTEzNzNjYTk3ZDU5MWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weQpAQCAtMTIzLDYgKzEy Myw3IEBAIE1PQ0sgYWRkX3BhdGNoX3RvX2J1ZzogYnVnX2lkPTUwMDAwLCBkZXNjcmlwdGlvbj1Q YXRjaCBmb3IgbGFuZGluZywgbWFya19mb3JfcmV2CiAgICAgICAgIG9wdGlvbnMubm9uX2ludGVy YWN0aXZlID0gRmFsc2UKICAgICAgICAgb3B0aW9ucy5yZXF1ZXN0X2NvbW1pdCA9IEZhbHNlCiAg ICAgICAgIG9wdGlvbnMucmV2aWV3ID0gVHJ1ZQorICAgICAgICBvcHRpb25zLnN1Ym1pdF90b19l d3MgPSBGYWxzZQogICAgICAgICBvcHRpb25zLnNvcnRfeGNvZGVfcHJvamVjdCA9IEZhbHNlCiAg ICAgICAgIG9wdGlvbnMuc3VnZ2VzdF9yZXZpZXdlcnMgPSBGYWxzZQogICAgICAgICBleHBlY3Rl ZF9sb2dzID0gIiIiTU9DSzogdXNlci5vcGVuX3VybDogZmlsZTovLy4uLgpAQCAtMTM0LDYgKzEz NSwyOSBAQCBNT0NLOiB1c2VyLm9wZW5fdXJsOiBodHRwOi8vZXhhbXBsZS5jb20vNTAwMDAKICIi IgogICAgICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoVXBsb2FkKCksIFs1MDAwMF0s IG9wdGlvbnM9b3B0aW9ucywgZXhwZWN0ZWRfbG9ncz1leHBlY3RlZF9sb2dzKQogCisgICAgZGVm IHRlc3RfdXBsb2FkX3dpdGhfbm9fcmV2aWV3X2FuZF9zdWJtaXRfdG9fZXdzKHNlbGYpOgorICAg ICAgICBvcHRpb25zID0gTW9ja09wdGlvbnMoKQorICAgICAgICBvcHRpb25zLmNjID0gTm9uZQor ICAgICAgICBvcHRpb25zLmNoZWNrX3N0eWxlID0gVHJ1ZQorICAgICAgICBvcHRpb25zLmNoZWNr X3N0eWxlX2ZpbHRlciA9IE5vbmUKKyAgICAgICAgb3B0aW9ucy5jb21tZW50ID0gTm9uZQorICAg ICAgICBvcHRpb25zLmRlc2NyaXB0aW9uID0gJ01PQ0sgZGVzY3JpcHRpb24nCisgICAgICAgIG9w dGlvbnMubm9uX2ludGVyYWN0aXZlID0gRmFsc2UKKyAgICAgICAgb3B0aW9ucy5yZXF1ZXN0X2Nv bW1pdCA9IEZhbHNlCisgICAgICAgIG9wdGlvbnMucmV2aWV3ID0gRmFsc2UKKyAgICAgICAgb3B0 aW9ucy5zdWJtaXRfdG9fZXdzID0gVHJ1ZQorICAgICAgICBvcHRpb25zLnNvcnRfeGNvZGVfcHJv amVjdCA9IEZhbHNlCisgICAgICAgIG9wdGlvbnMuc3VnZ2VzdF9yZXZpZXdlcnMgPSBGYWxzZQor ICAgICAgICBleHBlY3RlZF9sb2dzID0gIiIiTU9DSzogdXNlci5vcGVuX3VybDogZmlsZTovLy4u LgorV2FzIHRoYXQgZGlmZiBjb3JyZWN0PworT2Jzb2xldGluZyAyIG9sZCBwYXRjaGVzIG9uIGJ1 ZyA1MDAwMAorTU9DSyByZWFzc2lnbl9idWc6IGJ1Z19pZD01MDAwMCwgYXNzaWduZWU9Tm9uZQor TU9DSyBhZGRfcGF0Y2hfdG9fYnVnOiBidWdfaWQ9NTAwMDAsIGRlc2NyaXB0aW9uPU1PQ0sgZGVz Y3JpcHRpb24sIG1hcmtfZm9yX3Jldmlldz1GYWxzZSwgbWFya19mb3JfY29tbWl0X3F1ZXVlPUZh bHNlLCBtYXJrX2Zvcl9sYW5kaW5nPUZhbHNlCitNT0NLOiB1c2VyLm9wZW5fdXJsOiBodHRwOi8v ZXhhbXBsZS5jb20vNTAwMDAKK01PQ0s6IHN1Ym1pdF90b19ld3M6IDEwMDAxCisiIiIKKyAgICAg ICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKFVwbG9hZCgpLCBbNTAwMDBdLCBvcHRpb25z PW9wdGlvbnMsIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncykKKwogICAgIGRlZiB0ZXN0X21h cmtfYnVnX2ZpeGVkKHNlbGYpOgogICAgICAgICB0b29sID0gTW9ja1Rvb2woKQogICAgICAgICB0 b29sLl9zY20ubGFzdF9zdm5fY29tbWl0X2xvZyA9IGxhbWJkYTogInI5ODc2IHwiCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvX19pbml0X18ucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvX19pbml0X18ucHkKaW5kZXggOWNhYmM0ZmE2 ODJiYTRlNTgzNzc2ZWIxY2ZmMDc2N2RhNzQzMjNiNS4uZjNjMTcwZTMxMmVkZDc4NjRmOWQ4NWFk OWM3NzU5ZjJiYzkxYzkzZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L3N0ZXBzL19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVw cy9fX2luaXRfXy5weQpAQCAtNjAsNiArNjAsNyBAQCBmcm9tIHdlYmtpdHB5LnRvb2wuc3RlcHMu cmVvcGVuYnVnYWZ0ZXJyb2xsb3V0IGltcG9ydCBSZW9wZW5CdWdBZnRlclJvbGxvdXQKIGZyb20g d2Via2l0cHkudG9vbC5zdGVwcy5yZXZlcnRyZXZpc2lvbiBpbXBvcnQgUmV2ZXJ0UmV2aXNpb24K IGZyb20gd2Via2l0cHkudG9vbC5zdGVwcy5ydW50ZXN0cyBpbXBvcnQgUnVuVGVzdHMKIGZyb20g d2Via2l0cHkudG9vbC5zdGVwcy5zb3J0eGNvZGVwcm9qZWN0ZmlsZXMgaW1wb3J0IFNvcnRYY29k ZVByb2plY3RGaWxlcworZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLnN1Ym1pdHRvZXdzIGltcG9y dCBTdWJtaXRUb0VXUwogZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLnN1Z2dlc3RyZXZpZXdlcnMg aW1wb3J0IFN1Z2dlc3RSZXZpZXdlcnMKIGZyb20gd2Via2l0cHkudG9vbC5zdGVwcy51cGRhdGUg aW1wb3J0IFVwZGF0ZQogZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLnVwZGF0ZWNoYW5nZWxvZ3N3 aXRocmV2aWV3ZXIgaW1wb3J0IFVwZGF0ZUNoYW5nZUxvZ3NXaXRoUmV2aWV3ZXIKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9vcHRpb25zLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29wdGlvbnMucHkKaW5kZXggYTZlZTA0MjNlYmY1 NzM2YjRhODM1MjZlMGU5MWZhMzkyODA0ZDdjNC4uODI4MzEyMzg1N2ExMDc3MmM0NmNkMGFlZmU3 YzAxNTg2OTVkOWI0YSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0 ZXBzL29wdGlvbnMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29w dGlvbnMucHkKQEAgLTU5LDYgKzU5LDcgQEAgY2xhc3MgT3B0aW9ucyhvYmplY3QpOgogICAgIHJl dmlld2VyID0gbWFrZV9vcHRpb24oIi1yIiwgIi0tcmV2aWV3ZXIiLCBhY3Rpb249InN0b3JlIiwg dHlwZT0ic3RyaW5nIiwgZGVzdD0icmV2aWV3ZXIiLCBoZWxwPSJVcGRhdGUgQ2hhbmdlTG9ncyB0 byBzYXkgUmV2aWV3ZWQgYnkgUkVWSUVXRVIuIikKICAgICBzb3J0X3hjb2RlX3Byb2plY3QgPSBt YWtlX29wdGlvbigiLS1uby1zb3J0LXhjb2RlLXByb2plY3QiLCBhY3Rpb249InN0b3JlX2ZhbHNl IiwgZGVzdD0ic29ydF94Y29kZV9wcm9qZWN0IiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJEb24ndCBz b3J0IG1vZGlmaWVkIHhjb2RlIHByb2plY3RzLiIpCiAgICAgc3VnZ2VzdF9yZXZpZXdlcnMgPSBt YWtlX29wdGlvbigiLS1zdWdnZXN0LXJldmlld2VycyIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRl ZmF1bHQ9RmFsc2UsIGhlbHA9Ik9mZmVyIHRvIENDIGFwcHJvcHJpYXRlIHJldmlld2Vycy4iKQor ICAgIHN1Ym1pdF90b19ld3MgPSBtYWtlX29wdGlvbignLS1zdWJtaXQtdG8tZXdzJywgYWN0aW9u PSdzdG9yZV90cnVlJywgZGVzdD0nc3VibWl0X3RvX2V3cycsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9 J1N1Ym1pdCB0aGUgcGF0Y2ggdG8gRVdTIGZvciBhbmFseXNpcyAob25seSBhcHBsaWVzIHdoZW4g dXNpbmcgLS1uby1yZXZpZXcpLicpCiAgICAgdGVzdCA9IG1ha2Vfb3B0aW9uKCItLXRlc3QiLCBh Y3Rpb249InN0b3JlX3RydWUiLCBkZXN0PSJ0ZXN0IiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iUnVu IHJ1bi13ZWJraXQtdGVzdHMgYmVmb3JlIGNvbW1pdHRpbmcuIikKICAgICBpdGVyYXRlX29uX25l d190ZXN0cyA9IG1ha2Vfb3B0aW9uKCItLWl0ZXJhdGUtb24tbmV3LXRlc3RzIiwgYWN0aW9uPSJz dG9yZSIsIHR5cGU9ImludCIsIGRlc3Q9Iml0ZXJhdGVfb25fbmV3X3Rlc3RzIiwgZGVmYXVsdD0w LCBoZWxwPSJSdW4gcnVuLXdlYmtpdC10ZXN0cyBvbiBuZXcgdGVzdHMgb25seSBiZWZvcmUgY29t bWl0dGluZywgaXRlcmF0aW5nIGEgZ2l2ZW4gbnVtYmVyIG9mIHRpbWUuIikKICAgICB1cGRhdGUg PSBtYWtlX29wdGlvbigiLS1uby11cGRhdGUiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0i dXBkYXRlIiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJEb24ndCB1cGRhdGUgdGhlIHdvcmtpbmcgZGly ZWN0b3J5LiIpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMv cG9zdGRpZmYucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcG9zdGRpZmYu cHkKaW5kZXggZmM1YzQ0M2ZkNmYyZWE1NjRhYThkZWFmOTFjMGU3MTE5ZmU1OGQ3Mi4uMjcxNGRm ZGIxYjQxNDAxMmY5ODQ4MWY5ZWY4NDIwMDVhOTlhY2MwMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3Bvc3RkaWZmLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9zdGVwcy9wb3N0ZGlmZi5weQpAQCAtMzksNiArMzksNyBAQCBjbGFzcyBQ b3N0RGlmZihBYnN0cmFjdFN0ZXApOgogICAgICAgICAgICAgT3B0aW9ucy5yZXZpZXcsCiAgICAg ICAgICAgICBPcHRpb25zLnJlcXVlc3RfY29tbWl0LAogICAgICAgICAgICAgT3B0aW9ucy5vcGVu X2J1ZywKKyAgICAgICAgICAgIE9wdGlvbnMuc3VibWl0X3RvX2V3cywKICAgICAgICAgXQogCiAg ICAgZGVmIHJ1bihzZWxmLCBzdGF0ZSk6CkBAIC00Nyw2ICs0OCwxMSBAQCBjbGFzcyBQb3N0RGlm ZihBYnN0cmFjdFN0ZXApOgogICAgICAgICBjb21tZW50X3RleHQgPSBzZWxmLl9vcHRpb25zLmNv bW1lbnQKICAgICAgICAgYnVnX2lkID0gc3RhdGVbImJ1Z19pZCJdCiAKLSAgICAgICAgc2VsZi5f dG9vbC5idWdzLmFkZF9wYXRjaF90b19idWcoYnVnX2lkLCBkaWZmLCBkZXNjcmlwdGlvbiwgY29t bWVudF90ZXh0PWNvbW1lbnRfdGV4dCwgbWFya19mb3JfcmV2aWV3PXNlbGYuX29wdGlvbnMucmV2 aWV3LCBtYXJrX2Zvcl9jb21taXRfcXVldWU9c2VsZi5fb3B0aW9ucy5yZXF1ZXN0X2NvbW1pdCkK KyAgICAgICAgYXR0YWNobWVudF9pZCA9IHNlbGYuX3Rvb2wuYnVncy5hZGRfcGF0Y2hfdG9fYnVn KGJ1Z19pZCwgZGlmZiwgZGVzY3JpcHRpb24sIGNvbW1lbnRfdGV4dD1jb21tZW50X3RleHQsIG1h cmtfZm9yX3Jldmlldz1zZWxmLl9vcHRpb25zLnJldmlldywgbWFya19mb3JfY29tbWl0X3F1ZXVl PXNlbGYuX29wdGlvbnMucmVxdWVzdF9jb21taXQpCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMu b3Blbl9idWc6CiAgICAgICAgICAgICBzZWxmLl90b29sLnVzZXIub3Blbl91cmwoc2VsZi5fdG9v bC5idWdzLmJ1Z191cmxfZm9yX2J1Z19pZChidWdfaWQpKQorCisgICAgICAgICMgV2Ugb25seSBu ZWVkIHRvIHN1Ym1pdCAtLW5vLXJldmlldyBwYXRjaGVzIHRvIEVXUyBhcyBwYXRjaGVzIHBvc3Rl ZCBmb3IgcmV2aWV3IGFyZQorICAgICAgICAjIGF1dG9tYXRpY2FsbHkgc3VibWl0dGVkIHRvIEVX UyBieSBFV1NGZWVkZXIuCisgICAgICAgIGlmIG5vdCBzZWxmLl9vcHRpb25zLnJldmlldyBhbmQg c2VsZi5fb3B0aW9ucy5zdWJtaXRfdG9fZXdzOgorICAgICAgICAgICAgc3RhdGVbJ2F0dGFjaG1l bnRfaWRzJ10gPSBbYXR0YWNobWVudF9pZF0KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9zdGVwcy9zdWJtaXR0b2V3cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9zdGVwcy9zdWJtaXR0b2V3cy5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xZWFkZTE0YzIyZDUxMDhjOWNj YzcxZWNiODFlZDI2YzVlNWJjMzEwCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL3N0ZXBzL3N1Ym1pdHRvZXdzLnB5CkBAIC0wLDAgKzEsMzggQEAKKyMgQ29w eXJpZ2h0IChDKSAyMDE3IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Yg c291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisj IDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJv dmUgY29weXJpZ2h0CisjICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyMgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Ig b3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyMKKyMgVEhJ UyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JT IGBgQVMgSVMnJworIyBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyMgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorIyBQVVJQT1NFIEFS RSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklC VVRPUlMKKyMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwg U1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorIyBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElO RywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorIyBTVUJTVElUVVRFIEdPT0RT IE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MK KyMgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4KKyMgQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQg KElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyMgQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorIyBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9ydCBsb2dnaW5nCisKK2Zyb20g d2Via2l0cHkudG9vbC5zdGVwcy5hYnN0cmFjdHN0ZXAgaW1wb3J0IEFic3RyYWN0U3RlcAorCitf bG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCisKKworY2xhc3MgU3VibWl0VG9FV1Mo QWJzdHJhY3RTdGVwKToKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgb3B0aW9ucyhjbHMpOgor ICAgICAgICByZXR1cm4gW10KKworICAgIGRlZiBydW4oc2VsZiwgc3RhdGUpOgorICAgICAgICBm b3IgYXR0YWNobWVudF9pZCBpbiBzdGF0ZS5nZXQoJ2F0dGFjaG1lbnRfaWRzJywgW10pOgorICAg ICAgICAgICAgc2VsZi5fdG9vbC5zdGF0dXNfc2VydmVyLnN1Ym1pdF90b19ld3MoYXR0YWNobWVu dF9pZCkK 318045 2017-08-14 10:00:45 -0700 2017-08-14 10:26:20 -0700 Patch and unit tests bug-148899-20170814100328.patch text/plain 18615 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNzAxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTQyMmI2ZWJmNWFkNDE0MjhmOWQ4NGZjNjA0ZmU5MDgz OTA2MWIyNy4uZTk0ODU0MDhkZDRhMGI4ODA2NWZhZmI0ZTk0ZDQ2ZmFjODNjZmY3ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYw IEBACisyMDE3LTA4LTE0ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICB3ZWJraXQtcGF0Y2g6IFBhc3NpbmcgLS1uby1yZXZpZXcgc2hvdWxkIHN1Ym1pdCBwYXRj aCB0byBFV1MgYnkgZGVmYXVsdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTQ4ODk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTWFrZSAid2Via2l0LXBhdGNoIHVwbG9hZCAtLW5vLXJldmlldyIgYW5kICJ3 ZWJraXQtcGF0Y2ggcG9zdC1jb21taXRzIC0tbm8tcmV2aWV3IiBzdWJtaXQKKyAgICAgICAgdGhl IHBhdGNoKGVzKSBmb3IgRVdTIGFuYWx5c2lzIGJ5IGRlZmF1bHQuIEFkZCBhIG5ldyBvcHRpb25h bCBjb21tYW5kIGxpbmUgYXJndW1lbnQsIC0tbm8tZXdzLAorICAgICAgICB0byB0aGVzZSBjb21t YW5kcyB0byBub3Qgc3VibWl0IGEgbm9uLXJldmlld2VkIHBhdGNoKGVzKSBmb3IgRVdTIGFuYWx5 c2lzLiBBbHNvIGFkZHMgYQorICAgICAgICBuZXcgY29tbWFuZCwgc3VibWl0LXRvLWV3cywgdGhh dCBzdWJtaXRzIG9uZSBvciBtb3JlIGF0dGFjaG1lbnRzIGlkcyBmb3IgRVdTIGFuYWx5c2lzLgor ICAgICAgICBUaGlzIGNvbW1hbmQgY2FuIGJlIHVzZWQgaWYgeW91IGNoYW5nZSB5b3VyIG1pbmQg YW5kIHdhbnQgdG8gc3VibWl0IGEgcHJldmlvdXNseSAiLS1uby1yZXZpZXciZWQKKyAgICAgICAg LS1uby1ld3MgcGF0Y2goZXMpIGZvciBFV1MgYW5hbHlzaXMuCisKKyAgICAgICAgRnJlcXVlbnRs eSBJIHdhbnQgdG8gcG9zdCB0byBhbiBkcmFmdCBvZiBhIHBhdGNoIHdpdGhvdXQgcmV2aWV3IHRv IGhhdmUgdGhlIEVXUyBib3RzCisgICAgICAgIHByb2Nlc3MgaXQgdG8gY2F0Y2ggYnVpbGQgYW5k IHRlc3QgYnJlYWthZ2UgYmVmb3JlIEkgY2xlYW4gaXQgdXAgYW5kIHBvc3QgaXQgZm9yIGZvcm1h bAorICAgICAgICByZXZpZXcuIEN1cnJlbnRseSB0aGlzIHJlcXVpcmVzIHVzaW5nICJ3ZWJraXQt cGF0Y2ggdXBsb2FkIC0tbm8tcmV2aWV3IC0tb3Blbi1idWciIHRvCisgICAgICAgIHVwbG9hZCB0 aGUgcGF0Y2ggYW5kIG9wZW4gdGhlIGJ1ZyBpbiBTYWZhcmkgc28gdGhhdCBJIGNhbiBjbGljayB0 aGUgU3VibWl0IGZvciBFV1MKKyAgICAgICAgYW5hbHlzaXMgYnV0dG9uLiBXZSBzaG91bGQgdGVh Y2ggIndlYmtpdC1wYXRjaCB1cGxvYWQiIGFuZCAid2Via2l0LXBhdGNoIHBvc3QtY29tbWl0cyIK KyAgICAgICAgaG93IHRvIGRvIHRoaXMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHk6CisgICAgICAgIChCdWd6aWxsYS5fcGFyc2Vf YXR0YWNobWVudF9pZF9mcm9tX2FkZF9wYXRjaF90b19idWdfcmVzcG9uc2UpOiBBZGQgaGVscGVy IGZ1bmN0aW9uIHRvCisgICAgICAgIHBhcnNlIHRoZSBhdHRhY2htZW50IGlkIGZyb20gdGhlIHJl c3BvbnNlIHBhZ2UgYWZ0ZXIgYWRkaW5nIGFuIGF0dGFjaG1lbnQgdG8gdGhlIGJ1Zy4KKyAgICAg ICAgKEJ1Z3ppbGxhLmFkZF9wYXRjaF90b19idWcpOiBNb2RpZmllZCB0byBwYXJzZSBhbmQgcmV0 dXJuIHRoZSBhdHRhY2htZW50IGlkIGZyb20gdGhlCisgICAgICAgIEhUVFAgcmVzcG9uc2UgYWZ0 ZXIgdXBsb2FkaW5nIHRoZSBwYXRjaC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvYnVnemlsbGEvYnVnemlsbGFfbW9jay5weToKKyAgICAgICAgKE1vY2tCdWd6aWxsYS5h ZGRfcGF0Y2hfdG9fYnVnKTogUmV0dXJuIGEgZHVtbXkgYXR0YWNobWVudCBpZCBmb3IgdGVzdGlu ZyBwdXJwb3Nlcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemls bGEvYnVnemlsbGFfdW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X19wYXJzZV9hdHRhY2htZW50 X2lkX2Zyb21fYWRkX3BhdGNoX3RvX2J1Z19yZXNwb25zZSk6IEFkZGVkLgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWQucHk6CisgICAgICAgIChTdWJtaXRU b0VXUyk6IEFkZGVkOyBuZXcgY29tbWFuZC4KKyAgICAgICAgKFN1Ym1pdFRvRVdTLl9wcmVwYXJl X3N0YXRlKTogQ2hlY2sgaWYgdGhlIHNwZWNpZmllZCBhdHRhY2htZW50cyBleGlzdCBvciBlcnJv ciBvdXQuIEZvciBub3cKKyAgICAgICAgd2UgZG8gdGhpcyBieSBmZXRjaGluZyB0aGUgYXR0YWNo bWVudCBwYWdlIHRvIHBhcnNlIGl0cyBidWcgaWQgYXMgQnVnemlsbGEgYWx3YXlzIHJldHVybnMK KyAgICAgICAgYSBIVFRQIDIwMCBPSyByZXNwb25zZSByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhl IGF0dGFjaG1lbnQgZG9lcyBub3QgZXhpc3QuIFRoaXMgaXMgaW5lZmZpY2llbnQuCisgICAgICAg IFdlIHNob3VsZCBsb29rIGZvciBhIG1vcmUgZGlyZWN0IHdheSB0byBkZXRlcm1pbmUgaWYgYW4g YXR0YWNobWVudCBleGlzdHMgdGhhdCBhdm9pZHMgZmV0Y2hpbmcKKyAgICAgICAgdGhlIGVudGly ZSBjb250ZW50cyBvZiB0aGUgYXR0YWNobWVudC4KKyAgICAgICAgKFVwbG9hZCk6IEFkZCBzdGVw IFN1Ym1pdFRvRVdTIHRvIHRoZSBsaXN0IG9mIHN0ZXBzIHdoZW4gdXBsb2FkaW5nIGEgcGF0Y2gu IAorICAgICAgICAoUG9zdENvbW1pdHMuX19pbml0X18pOiBBZGQgLS1uby1ld3Mgb3B0aW9uIHRv IHRoZSBsaXN0IG9mIGFwcGxpY2FibGUgb3B0aW9uIGZsYWdzIGZvcgorICAgICAgICB0aGlzIGNv bW1hbmQuCisgICAgICAgIChQb3N0Q29tbWl0cy5leGVjdXRlKTogU3VibWl0IHRoZSBwYXRjaCB0 byBFV1MsIGlmIGFwcGxpY2FibGUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2Nv bW1hbmRzL3VwbG9hZF91bml0dGVzdC5weToKKyAgICAgICAgKHRlc3RfdXBsb2FkKTogU2V0IG9w dGlvbnMuZXdzIHRvIEZhbHNlIGFzIHRoZSB1cGxvYWQgY29tbWFuZCBleHBlY3RzIHRoaXMgb3B0 aW9uCisgICAgICAgIHRvIGJlIHNwZWNpZmllZC4KKyAgICAgICAgKHRlc3RfdXBsb2FkX3dpdGhf bm9fcmV2aWV3X2FuZF9ld3MpOiBBZGRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rv b2wvc3RlcHMvX19pbml0X18ucHk6IEltcG9ydCBtb2R1bGUgU3VibWl0VG9FV1MuCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29wdGlvbnMucHk6CisgICAgICAgIChPcHRp b25zKTogQWRkZWQgY29tbWFuZCBsaW5lIG9wdGlvbiAtLW5vLWV3cyAoZGVmYXVsdHM6IEZhbHNl IC0gc3VibWl0IHRvIEVXUykuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBz L3Bvc3RkaWZmLnB5OgorICAgICAgICAoUG9zdERpZmYub3B0aW9ucyk6IEFkZCAtLW5vLWV3cyBv cHRpb24gdG8gdGhlIGxpc3Qgb2YgYXBwbGljYWJsZSBvcHRpb24gZmxhZ3MgZm9yCisgICAgICAg IHRoaXMgY29tbWFuZC4KKyAgICAgICAgKFBvc3REaWZmLnJ1bik6IFN1Ym1pdCB0aGUgcGF0Y2gg dG8gRVdTLCBpZiBhcHBsaWNhYmxlLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9z dGVwcy9zdWJtaXR0b2V3cy5weTogQWRkZWQuCisgICAgICAgIChTdWJtaXRUb0VXUyk6CisgICAg ICAgIChTdWJtaXRUb0VXUy5vcHRpb25zKTogUmV0dXJuIGFuIGVtcHR5IGFycmF5IGFzIHdlIHRo aXMgc3RlcCBkb2VzIG5vdCBoYXZlIGFueSBjb21tYW5kIGxpbmUgb3B0aW9ucy4KKyAgICAgICAg KFN1Ym1pdFRvRVdTLnJ1bik6IFN1Ym1pdCB0aGUgc3BlY2lmaWVkIGF0dGFjaG1lbnQgaWRzIGZv ciBFV1MgYW5hbHlzaXMuCisKIDIwMTctMDgtMTEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmVwbGFjZSBEQVRBX1RSQU5TRkVSX0lURU1TIGJ5IGEgcnVudGlt ZSBmbGFnIGFuZCBhZGQgYSBzdHViIGltcGxlbWVudGF0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemlsbGEucHkKaW5kZXggODIw M2QxNDZjNDI3OGZiZjUzNGVjMjU4MDM1Yzk4ZWM2N2Y1ZGU4YS4uYjEwYzk2ZmJlZDVlYTkzMzA5 ZDAxNjVjNWViNTkzZGVkNmQ2YzdiYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxhLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYS5weQpAQCAtNjIwLDYgKzYyMCwxNCBA QCBjbGFzcyBCdWd6aWxsYShvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5icm93c2VyWydjb21t ZW50J10gPSBjb21tZW50X3RleHQKICAgICAgICAgc2VsZi5icm93c2VyLnN1Ym1pdCgpCiAKKyAg ICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9wYXJzZV9hdHRhY2htZW50X2lkX2Zyb21fYWRkX3Bh dGNoX3RvX2J1Z19yZXNwb25zZShyZXNwb25zZV9odG1sKToKKyAgICAgICAgbWF0Y2ggPSByZS5z ZWFyY2goJzx0aXRsZT5BdHRhY2htZW50ICg/UDxhdHRhY2htZW50X2lkPlxkKykgYWRkZWQgdG8g QnVnIFxkKzwvdGl0bGU+JywgcmVzcG9uc2VfaHRtbCkKKyAgICAgICAgaWYgbWF0Y2g6CisgICAg ICAgICAgICByZXR1cm4gbWF0Y2guZ3JvdXAoJ2F0dGFjaG1lbnRfaWQnKQorICAgICAgICBfbG9n Lndhcm5pbmcoJ1VuYWJsZSB0byBwYXJzZSBhdHRhY2htZW50IGlkJykKKyAgICAgICAgcmV0dXJu IE5vbmUKKwogICAgICMgRklYTUU6IFRoZSBhcmd1bWVudHMgdG8gdGhpcyBmdW5jdGlvbiBzaG91 bGQgYmUgc2ltcGxpZmllZCBhbmQgdGhlbgogICAgICMgdGhpcyBzaG91bGQgYmUgbWVyZ2VkIGlu dG8gYWRkX2F0dGFjaG1lbnRfdG9fYnVnCiAgICAgZGVmIGFkZF9wYXRjaF90b19idWcoc2VsZiwK QEAgLTY1Miw3ICs2NjAsOCBAQCBjbGFzcyBCdWd6aWxsYShvYmplY3QpOgogICAgICAgICBpZiBj b21tZW50X3RleHQ6CiAgICAgICAgICAgICBfbG9nLmluZm8oY29tbWVudF90ZXh0KQogICAgICAg ICAgICAgc2VsZi5icm93c2VyWydjb21tZW50J10gPSBjb21tZW50X3RleHQKLSAgICAgICAgc2Vs Zi5icm93c2VyLnN1Ym1pdCgpCisgICAgICAgIHJlc3BvbnNlID0gc2VsZi5icm93c2VyLnN1Ym1p dCgpCisgICAgICAgIHJldHVybiBzZWxmLl9wYXJzZV9hdHRhY2htZW50X2lkX2Zyb21fYWRkX3Bh dGNoX3RvX2J1Z19yZXNwb25zZShyZXNwb25zZS5yZWFkKCkpCiAKICAgICAjIEZJWE1FOiBUaGVy ZSBoYXMgdG8gYmUgYSBtb3JlIGNvbmNpc2Ugd2F5IHRvIHdyaXRlIHRoaXMgbWV0aG9kLgogICAg IGRlZiBfY2hlY2tfY3JlYXRlX2J1Z19yZXNwb25zZShzZWxmLCByZXNwb25zZV9odG1sKToKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6 aWxsYV9tb2NrLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxh L2J1Z3ppbGxhX21vY2sucHkKaW5kZXggMDY4ZDU5NGU1Mjc0M2FjOTIyOTEzYTQ2ODYzN2E0MzFi NzQwYWM3NS4uYmIyYzI3NGRkZWFhMDhiODQyNjBhYmFiN2QwZWM4Y2Y4YTIxOTAwNyAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhL2J1Z3ppbGxh X21vY2sucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxh L2J1Z3ppbGxhX21vY2sucHkKQEAgLTQ2MSw2ICs0NjEsNyBAQCBjbGFzcyBNb2NrQnVnemlsbGEo b2JqZWN0KToKICAgICAgICAgICAgIF9sb2cuaW5mbygiLS0gQmVnaW4gY29tbWVudCAtLSIpCiAg ICAgICAgICAgICBfbG9nLmluZm8oY29tbWVudF90ZXh0KQogICAgICAgICAgICAgX2xvZy5pbmZv KCItLSBFbmQgY29tbWVudCAtLSIpCisgICAgICAgIHJldHVybiAnMTAwMDEnCiAKICAgICBkZWYg YWRkX2NjX3RvX2J1ZyhzZWxmLCBidWdfaWQsIGNjcyk6CiAgICAgICAgIHBhc3MKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9idWd6aWxsYV91 bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS9i dWd6aWxsYV91bml0dGVzdC5weQppbmRleCAwOTQwMmIyZGMzZjcyODUwZjVhYTgzNDc1OWYwNjAz OTBlYjU0N2RlLi45YjhjODA1NTM3OWI2ZDNmNjdlOGRiM2ZlMTUwZTVhMGZiZjQyZmU0IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEvYnVnemls bGFfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1 Z3ppbGxhL2J1Z3ppbGxhX3VuaXR0ZXN0LnB5CkBAIC0zNDIsNiArMzQyLDE4IEBAIElnbm9yZSB0 aGlzIGJ1Zy4gIEp1c3QgZm9yIHRlc3RpbmcgZmFpbHVyZSBtb2RlcyBvZiB3ZWJraXQtcGF0Y2gg YW5kIHRoZSBjb21taXQtCiAgICAgICAgIHRpdGxlX2h0bWxfYnVnemlsbGFfNDI1ID0gIjx0aXRs ZT5CdWcgMTAxNjQwIFN1Ym1pdHRlZCAmbmRhc2g7IFRlc3Rpbmcgd2Via2l0LXBhdGNoIGFnYWlu PC90aXRsZT4iCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoYnVnemlsbGEuX2NoZWNrX2NyZWF0 ZV9idWdfcmVzcG9uc2UodGl0bGVfaHRtbF9idWd6aWxsYV80MjUpLCAnMTAxNjQwJykKIAorICAg IGRlZiB0ZXN0X19wYXJzZV9hdHRhY2htZW50X2lkX2Zyb21fYWRkX3BhdGNoX3RvX2J1Z19yZXNw b25zZShzZWxmKToKKyAgICAgICAgYnVnemlsbGEgPSBCdWd6aWxsYSgpCisKKyAgICAgICAgdGl0 bGVfaHRtbCA9ICc8dGl0bGU+QXR0YWNobWVudCAzMTc1OTEgYWRkZWQgdG8gQnVnIDE3NTI0Nzwv dGl0bGU+JworICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGJ1Z3ppbGxhLl9wYXJzZV9hdHRhY2ht ZW50X2lkX2Zyb21fYWRkX3BhdGNoX3RvX2J1Z19yZXNwb25zZSh0aXRsZV9odG1sKSwgJzMxNzU5 MScpCisKKyAgICAgICAgdGl0bGVfaHRtbCA9ICc8dGl0bGU+QXR0YWNobWVudCAzMTc1OTE7IG1h bGZvcm1lZDwvdGl0bGU+JworICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGJ1Z3ppbGxhLl9wYXJz ZV9hdHRhY2htZW50X2lkX2Zyb21fYWRkX3BhdGNoX3RvX2J1Z19yZXNwb25zZSh0aXRsZV9odG1s KSwgTm9uZSkKKworICAgICAgICB0aXRsZV9odG1sID0gJzx0aXRsZT5BdHRhY2htZW50IEEgYWRk ZWQgdG8gQnVnIDE3NTI0NzwvdGl0bGU+JworICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGJ1Z3pp bGxhLl9wYXJzZV9hdHRhY2htZW50X2lkX2Zyb21fYWRkX3BhdGNoX3RvX2J1Z19yZXNwb25zZSh0 aXRsZV9odG1sKSwgTm9uZSkKKwogCiBjbGFzcyBCdWd6aWxsYVF1ZXJpZXNUZXN0KHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICBfc2FtcGxlX3JlcXVlc3RfcGFnZSA9ICIiIgpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3VwbG9hZC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWQucHkKaW5kZXggYzU5MjUxOTdlYWNj YzExMTVlYzRmN2FkZWQ5YmFjYzMxNzhiYTFlYy4uNjE3NjkzY2QxMzIwM2Q3NzVmNjE2ZDYyMDhi YmRkMjk2MGRhYWJhNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2Nv bW1hbmRzL3VwbG9hZC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvdXBsb2FkLnB5CkBAIC0xNjIsNiArMTYyLDI4IEBAIGNsYXNzIEFzc2lnblRvQ29tbWl0dGVy KENvbW1hbmQpOgogICAgICAgICAgICAgc2VsZi5fYXNzaWduX2J1Z190b19sYXN0X3BhdGNoX2F0 dGFjaGVyKGJ1Z19pZCkKIAogCitjbGFzcyBTdWJtaXRUb0VXUyhBYnN0cmFjdFNlcXVlbmNlZENv bW1hbmQpOgorICAgIG5hbWUgPSAnc3VibWl0LXRvLWV3cycKKyAgICBoZWxwX3RleHQgPSAnU3Vi bWl0IGF0dGFjaG1lbnQgZm9yIEVXUyBhbmFseXNpcycKKyAgICBhcmd1bWVudF9uYW1lcyA9ICdB VFRBQ0hNRU5UX0lEIFtBVFRBQ0hNRU5UX0lEU10nCisgICAgc3RlcHMgPSBbCisgICAgICAgIHN0 ZXBzLlN1Ym1pdFRvRVdTLAorICAgIF0KKworICAgIGRlZiBfcHJlcGFyZV9zdGF0ZShzZWxmLCBv cHRpb25zLCBhcmdzLCB0b29sKToKKyAgICAgICAgIyBGSVhNRTogVGhpcyBpcyBpbmVmZmljaWVu dCBhcyB3ZSBuZWVkIHRvIGZldGNoIHRoZSBlbnRpcmUgYXR0YWNobWVudC4gV2Ugc2hvdWxkCisg ICAgICAgICMgbG9vayBmb3IgYSBtb3JlIGRpcmVjdCB3YXkgdG8gZGV0ZXJtaW5lIGlmIGFuIGF0 dGFjaG1lbnQgZXhpc3RzLgorICAgICAgICBlcnJvcl9vY2N1cnJlZCA9IEZhbHNlCisgICAgICAg IGZvciBhdHRhY2htZW50X2lkIGluIGFyZ3M6CisgICAgICAgICAgICBpZiB0b29sLmJ1Z3MuYnVn X2lkX2Zvcl9hdHRhY2htZW50X2lkKGF0dGFjaG1lbnRfaWQpOgorICAgICAgICAgICAgICAgIGNv bnRpbnVlCisgICAgICAgICAgICBfbG9nLmVycm9yKCdVbmFibGUgdG8gcGFyc2UgYnVnIGlkIGZv ciBhdHRhY2htZW50IHt9LiBBcmUgeW91IHN1cmUgeW91IHBhc3NlZCB0aGUgcmlnaHQgaWQ/Jy5m b3JtYXQoYXR0YWNobWVudF9pZCkpCisgICAgICAgICAgICBlcnJvcl9vY2N1cnJlZCA9IFRydWUK KyAgICAgICAgaWYgZXJyb3Jfb2NjdXJyZWQ6CisgICAgICAgICAgICBzeXMuZXhpdCgxKQorICAg ICAgICByZXR1cm4geydhdHRhY2htZW50X2lkcyc6IGFyZ3N9CisKKwogY2xhc3MgT2Jzb2xldGVB dHRhY2htZW50cyhBYnN0cmFjdFNlcXVlbmNlZENvbW1hbmQpOgogICAgIG5hbWUgPSAib2Jzb2xl dGUtYXR0YWNobWVudHMiCiAgICAgaGVscF90ZXh0ID0gIk1hcmsgYWxsIGF0dGFjaG1lbnRzIG9u IGEgYnVnIGFzIG9ic29sZXRlIgpAQCAtMjg0LDYgKzMwNiw3IEBAIGNsYXNzIFVwbG9hZChBYnN0 cmFjdFBhdGNoVXBsb2FkaW5nQ29tbWFuZCk6CiAgICAgICAgIHN0ZXBzLlN1Z2dlc3RSZXZpZXdl cnMsCiAgICAgICAgIHN0ZXBzLkVuc3VyZUJ1Z0lzT3BlbkFuZEFzc2lnbmVkLAogICAgICAgICBz dGVwcy5Qb3N0RGlmZiwKKyAgICAgICAgc3RlcHMuU3VibWl0VG9FV1MsCiAgICAgXQogICAgIGxv bmdfaGVscCA9ICIiInVwbG9hZCB1cGxvYWRzIHRoZSBjdXJyZW50IGRpZmYgdG8gYnVncy53ZWJr aXQub3JnLgogICAgIElmIG5vIGJ1ZyBpZCBpcyBwcm92aWRlZCwgdXBsb2FkIHdpbGwgY3JlYXRl IGEgYnVnLgpAQCAtMzIxLDYgKzM0NCw3IEBAIGNsYXNzIFBvc3RDb21taXRzKENvbW1hbmQpOgog ICAgICAgICAgICAgc3RlcHMuT3B0aW9ucy5vYnNvbGV0ZV9wYXRjaGVzLAogICAgICAgICAgICAg c3RlcHMuT3B0aW9ucy5yZXZpZXcsCiAgICAgICAgICAgICBzdGVwcy5PcHRpb25zLnJlcXVlc3Rf Y29tbWl0LAorICAgICAgICAgICAgc3RlcHMuT3B0aW9ucy5ld3MsCiAgICAgICAgIF0KICAgICAg ICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCBvcHRpb25zPW9wdGlvbnMsIHJlcXVpcmVzX2xvY2Fs X2NvbW1pdHM9VHJ1ZSkKIApAQCAtMzU2LDcgKzM4MCwxMyBAQCBjbGFzcyBQb3N0Q29tbWl0cyhD b21tYW5kKToKICAgICAgICAgICAgIGRpZmYgPSB0b29sLnNjbSgpLmNyZWF0ZV9wYXRjaChnaXRf Y29tbWl0PWNvbW1pdF9pZCkKICAgICAgICAgICAgIGRlc2NyaXB0aW9uID0gb3B0aW9ucy5kZXNj cmlwdGlvbiBvciBjb21taXRfbWVzc2FnZS5kZXNjcmlwdGlvbihsc3RyaXA9VHJ1ZSwgc3RyaXBf dXJsPVRydWUpCiAgICAgICAgICAgICBjb21tZW50X3RleHQgPSBzZWxmLl9jb21tZW50X3RleHRf Zm9yX2NvbW1pdChvcHRpb25zLCBjb21taXRfbWVzc2FnZSwgdG9vbCwgY29tbWl0X2lkKQotICAg ICAgICAgICAgdG9vbC5idWdzLmFkZF9wYXRjaF90b19idWcoYnVnX2lkLCBkaWZmLCBkZXNjcmlw dGlvbiwgY29tbWVudF90ZXh0LCBtYXJrX2Zvcl9yZXZpZXc9b3B0aW9ucy5yZXZpZXcsIG1hcmtf Zm9yX2NvbW1pdF9xdWV1ZT1vcHRpb25zLnJlcXVlc3RfY29tbWl0KQorICAgICAgICAgICAgYXR0 YWNobWVudF9pZCA9IHRvb2wuYnVncy5hZGRfcGF0Y2hfdG9fYnVnKGJ1Z19pZCwgZGlmZiwgZGVz Y3JpcHRpb24sIGNvbW1lbnRfdGV4dCwgbWFya19mb3JfcmV2aWV3PW9wdGlvbnMucmV2aWV3LCBt YXJrX2Zvcl9jb21taXRfcXVldWU9b3B0aW9ucy5yZXF1ZXN0X2NvbW1pdCkKKworICAgICAgICAg ICAgIyBXZSBvbmx5IG5lZWQgdG8gc3VibWl0IC0tbm8tcmV2aWV3IHBhdGNoZXMgdG8gRVdTIGFz IHBhdGNoZXMgcG9zdGVkIGZvciByZXZpZXcgYXJlCisgICAgICAgICAgICAjIGF1dG9tYXRpY2Fs bHkgc3VibWl0dGVkIHRvIEVXUyBieSBFV1NGZWVkZXIuCisgICAgICAgICAgICBpZiBub3Qgb3B0 aW9ucy5yZXZpZXcgYW5kIG9wdGlvbnMuZXdzOgorICAgICAgICAgICAgICAgIHN0YXRlID0geydh dHRhY2htZW50X2lkcyc6IFthdHRhY2htZW50X2lkXX0KKyAgICAgICAgICAgICAgICBzdGVwcy5T dWJtaXRUb0VXUyh0b29sLCBvcHRpb25zKS5ydW4oc3RhdGUpCiAKIAogIyBGSVhNRTogVGhpcyBj b21tYW5kIG5lZWRzIHRvIGJlIGJyb3VnaHQgaW50byB0aGUgbW9kZXJuIGFnZSB3aXRoIHN0ZXBz IGFuZCBDb21taXRJbmZvLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkKaW5kZXggNjFmNjA5MDQ1NGNiNTJlZmJjNzM1 NDhiMGVhZTUyM2YyMjJmODcyYi4uMzg3YjRiZTU1Y2NlMWM1NzA3MTUxZGI1YTAwMWVjNTQ0ZjQx MGFkNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3Vw bG9hZF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvdXBsb2FkX3VuaXR0ZXN0LnB5CkBAIC0xMjMsNiArMTIzLDcgQEAgTU9DSyBhZGRfcGF0Y2hf dG9fYnVnOiBidWdfaWQ9NTAwMDAsIGRlc2NyaXB0aW9uPVBhdGNoIGZvciBsYW5kaW5nLCBtYXJr X2Zvcl9yZXYKICAgICAgICAgb3B0aW9ucy5ub25faW50ZXJhY3RpdmUgPSBGYWxzZQogICAgICAg ICBvcHRpb25zLnJlcXVlc3RfY29tbWl0ID0gRmFsc2UKICAgICAgICAgb3B0aW9ucy5yZXZpZXcg PSBUcnVlCisgICAgICAgIG9wdGlvbnMuc3VibWl0X3RvX2V3cyA9IEZhbHNlCiAgICAgICAgIG9w dGlvbnMuc29ydF94Y29kZV9wcm9qZWN0ID0gRmFsc2UKICAgICAgICAgb3B0aW9ucy5zdWdnZXN0 X3Jldmlld2VycyA9IEZhbHNlCiAgICAgICAgIGV4cGVjdGVkX2xvZ3MgPSAiIiJNT0NLOiB1c2Vy Lm9wZW5fdXJsOiBmaWxlOi8vLi4uCkBAIC0xMzQsNiArMTM1LDI5IEBAIE1PQ0s6IHVzZXIub3Bl bl91cmw6IGh0dHA6Ly9leGFtcGxlLmNvbS81MDAwMAogIiIiCiAgICAgICAgIHNlbGYuYXNzZXJ0 X2V4ZWN1dGVfb3V0cHV0cyhVcGxvYWQoKSwgWzUwMDAwXSwgb3B0aW9ucz1vcHRpb25zLCBleHBl Y3RlZF9sb2dzPWV4cGVjdGVkX2xvZ3MpCiAKKyAgICBkZWYgdGVzdF91cGxvYWRfd2l0aF9ub19y ZXZpZXdfYW5kX2V3cyhzZWxmKToKKyAgICAgICAgb3B0aW9ucyA9IE1vY2tPcHRpb25zKCkKKyAg ICAgICAgb3B0aW9ucy5jYyA9IE5vbmUKKyAgICAgICAgb3B0aW9ucy5jaGVja19zdHlsZSA9IFRy dWUKKyAgICAgICAgb3B0aW9ucy5jaGVja19zdHlsZV9maWx0ZXIgPSBOb25lCisgICAgICAgIG9w dGlvbnMuY29tbWVudCA9IE5vbmUKKyAgICAgICAgb3B0aW9ucy5kZXNjcmlwdGlvbiA9ICdNT0NL IGRlc2NyaXB0aW9uJworICAgICAgICBvcHRpb25zLm5vbl9pbnRlcmFjdGl2ZSA9IEZhbHNlCisg ICAgICAgIG9wdGlvbnMucmVxdWVzdF9jb21taXQgPSBGYWxzZQorICAgICAgICBvcHRpb25zLnJl dmlldyA9IEZhbHNlCisgICAgICAgIG9wdGlvbnMuZXdzID0gVHJ1ZQorICAgICAgICBvcHRpb25z LnNvcnRfeGNvZGVfcHJvamVjdCA9IEZhbHNlCisgICAgICAgIG9wdGlvbnMuc3VnZ2VzdF9yZXZp ZXdlcnMgPSBGYWxzZQorICAgICAgICBleHBlY3RlZF9sb2dzID0gIiIiTU9DSzogdXNlci5vcGVu X3VybDogZmlsZTovLy4uLgorV2FzIHRoYXQgZGlmZiBjb3JyZWN0PworT2Jzb2xldGluZyAyIG9s ZCBwYXRjaGVzIG9uIGJ1ZyA1MDAwMAorTU9DSyByZWFzc2lnbl9idWc6IGJ1Z19pZD01MDAwMCwg YXNzaWduZWU9Tm9uZQorTU9DSyBhZGRfcGF0Y2hfdG9fYnVnOiBidWdfaWQ9NTAwMDAsIGRlc2Ny aXB0aW9uPU1PQ0sgZGVzY3JpcHRpb24sIG1hcmtfZm9yX3Jldmlldz1GYWxzZSwgbWFya19mb3Jf Y29tbWl0X3F1ZXVlPUZhbHNlLCBtYXJrX2Zvcl9sYW5kaW5nPUZhbHNlCitNT0NLOiB1c2VyLm9w ZW5fdXJsOiBodHRwOi8vZXhhbXBsZS5jb20vNTAwMDAKK01PQ0s6IHN1Ym1pdF90b19ld3M6IDEw MDAxCisiIiIKKyAgICAgICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKFVwbG9hZCgpLCBb NTAwMDBdLCBvcHRpb25zPW9wdGlvbnMsIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncykKKwog ICAgIGRlZiB0ZXN0X21hcmtfYnVnX2ZpeGVkKHNlbGYpOgogICAgICAgICB0b29sID0gTW9ja1Rv b2woKQogICAgICAgICB0b29sLl9zY20ubGFzdF9zdm5fY29tbWl0X2xvZyA9IGxhbWJkYTogInI5 ODc2IHwiCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvX19p bml0X18ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvX19pbml0X18ucHkK aW5kZXggOWNhYmM0ZmE2ODJiYTRlNTgzNzc2ZWIxY2ZmMDc2N2RhNzQzMjNiNS4uZjNjMTcwZTMx MmVkZDc4NjRmOWQ4NWFkOWM3NzU5ZjJiYzkxYzkzZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL3N0ZXBzL19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9zdGVwcy9fX2luaXRfXy5weQpAQCAtNjAsNiArNjAsNyBAQCBmcm9tIHdlYmtp dHB5LnRvb2wuc3RlcHMucmVvcGVuYnVnYWZ0ZXJyb2xsb3V0IGltcG9ydCBSZW9wZW5CdWdBZnRl clJvbGxvdXQKIGZyb20gd2Via2l0cHkudG9vbC5zdGVwcy5yZXZlcnRyZXZpc2lvbiBpbXBvcnQg UmV2ZXJ0UmV2aXNpb24KIGZyb20gd2Via2l0cHkudG9vbC5zdGVwcy5ydW50ZXN0cyBpbXBvcnQg UnVuVGVzdHMKIGZyb20gd2Via2l0cHkudG9vbC5zdGVwcy5zb3J0eGNvZGVwcm9qZWN0ZmlsZXMg aW1wb3J0IFNvcnRYY29kZVByb2plY3RGaWxlcworZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLnN1 Ym1pdHRvZXdzIGltcG9ydCBTdWJtaXRUb0VXUwogZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLnN1 Z2dlc3RyZXZpZXdlcnMgaW1wb3J0IFN1Z2dlc3RSZXZpZXdlcnMKIGZyb20gd2Via2l0cHkudG9v bC5zdGVwcy51cGRhdGUgaW1wb3J0IFVwZGF0ZQogZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLnVw ZGF0ZWNoYW5nZWxvZ3N3aXRocmV2aWV3ZXIgaW1wb3J0IFVwZGF0ZUNoYW5nZUxvZ3NXaXRoUmV2 aWV3ZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9vcHRp b25zLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL29wdGlvbnMucHkKaW5k ZXggYTZlZTA0MjNlYmY1NzM2YjRhODM1MjZlMGU5MWZhMzkyODA0ZDdjNC4uNzI1OTgzNTZhYmM2 MjI2ZjgyZDgyMzIwZTJlYjMxNDJlMTIxODZmZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL3N0ZXBzL29wdGlvbnMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL3N0ZXBzL29wdGlvbnMucHkKQEAgLTQ1LDYgKzQ1LDcgQEAgY2xhc3MgT3B0aW9ucyhv YmplY3QpOgogICAgIGNvbmZpcm0gPSBtYWtlX29wdGlvbigiLS1uby1jb25maXJtIiwgYWN0aW9u PSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImNvbmZpcm0iLCBkZWZhdWx0PVRydWUsIGhlbHA9IlNraXAg Y29uZmlybWF0aW9uIHN0ZXBzLiIpCiAgICAgZGVzY3JpcHRpb24gPSBtYWtlX29wdGlvbigiLW0i LCAiLS1kZXNjcmlwdGlvbiIsIGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJpbmciLCBkZXN0PSJk ZXNjcmlwdGlvbiIsIGhlbHA9IkRlc2NyaXB0aW9uIHN0cmluZyBmb3IgdGhlIGF0dGFjaG1lbnQi KQogICAgIGVtYWlsID0gbWFrZV9vcHRpb24oIi0tZW1haWwiLCBhY3Rpb249InN0b3JlIiwgdHlw ZT0ic3RyaW5nIiwgZGVzdD0iZW1haWwiLCBoZWxwPSJFbWFpbCBhZGRyZXNzIHRvIHVzZSBpbiBD aGFuZ2VMb2dzLiIpCisgICAgZXdzID0gbWFrZV9vcHRpb24oJy0tbm8tZXdzJywgYWN0aW9uPSdz dG9yZV9mYWxzZScsIGRlc3Q9J2V3cycsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0nRG8gbm90IHN1Ym1p dCB0aGUgcGF0Y2ggdG8gRVdTIGZvciBhbmFseXNpcyAob25seSBhcHBsaWVzIHdoZW4gdXNpbmcg LS1uby1yZXZpZXcpLicpCiAgICAgZm9yY2VfY2xlYW4gPSBtYWtlX29wdGlvbigiLS1mb3JjZS1j bGVhbiIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9ImZvcmNlX2NsZWFuIiwgZGVmYXVsdD1G YWxzZSwgaGVscD0iQ2xlYW4gd29ya2luZyBkaXJlY3RvcnkgYmVmb3JlIGFwcGx5aW5nIHBhdGNo ZXMgKHJlbW92ZXMgbG9jYWwgY2hhbmdlcyBhbmQgY29tbWl0cykiKQogICAgIGdpdF9jb21taXQg PSBtYWtlX29wdGlvbigiLWciLCAiLS1naXQtY29tbWl0IiwgYWN0aW9uPSJzdG9yZSIsIGRlc3Q9 ImdpdF9jb21taXQiLCBoZWxwPSJPcGVyYXRlIG9uIGEgbG9jYWwgY29tbWl0LiBJZiBhIHJhbmdl LCB0aGUgY29tbWl0cyBhcmUgc3F1YXNoZWQgaW50byBvbmUuIDxyZWY+Li4uLiBpbmNsdWRlcyB0 aGUgd29ya2luZyBjb3B5IGNoYW5nZXMuIFVQU1RSRUFNIGNhbiBiZSB1c2VkIGZvciB0aGUgdXBz dHJlYW0vdHJhY2tpbmcgYnJhbmNoLiIpCiAgICAgZ3JvdXAgPSBtYWtlX29wdGlvbigiLS1ncm91 cCIsIGFjdGlvbj0ic3RvcmUiLCBkZXN0PSJncm91cCIsIGRlZmF1bHQ9Tm9uZSwgaGVscD0iIikK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wb3N0ZGlmZi5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wb3N0ZGlmZi5weQppbmRleCBm YzVjNDQzZmQ2ZjJlYTU2NGFhOGRlYWY5MWMwZTcxMTlmZTU4ZDcyLi5iNjhkNDA2ZDRkZWQxZTI4 ZjMyY2UxMzBiMmM1Y2FkZmE5YTcwNWVhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvc3RlcHMvcG9zdGRpZmYucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL3N0ZXBzL3Bvc3RkaWZmLnB5CkBAIC0zOSw2ICszOSw3IEBAIGNsYXNzIFBvc3REaWZmKEFi c3RyYWN0U3RlcCk6CiAgICAgICAgICAgICBPcHRpb25zLnJldmlldywKICAgICAgICAgICAgIE9w dGlvbnMucmVxdWVzdF9jb21taXQsCiAgICAgICAgICAgICBPcHRpb25zLm9wZW5fYnVnLAorICAg ICAgICAgICAgT3B0aW9ucy5ld3MsCiAgICAgICAgIF0KIAogICAgIGRlZiBydW4oc2VsZiwgc3Rh dGUpOgpAQCAtNDcsNiArNDgsMTEgQEAgY2xhc3MgUG9zdERpZmYoQWJzdHJhY3RTdGVwKToKICAg ICAgICAgY29tbWVudF90ZXh0ID0gc2VsZi5fb3B0aW9ucy5jb21tZW50CiAgICAgICAgIGJ1Z19p ZCA9IHN0YXRlWyJidWdfaWQiXQogCi0gICAgICAgIHNlbGYuX3Rvb2wuYnVncy5hZGRfcGF0Y2hf dG9fYnVnKGJ1Z19pZCwgZGlmZiwgZGVzY3JpcHRpb24sIGNvbW1lbnRfdGV4dD1jb21tZW50X3Rl eHQsIG1hcmtfZm9yX3Jldmlldz1zZWxmLl9vcHRpb25zLnJldmlldywgbWFya19mb3JfY29tbWl0 X3F1ZXVlPXNlbGYuX29wdGlvbnMucmVxdWVzdF9jb21taXQpCisgICAgICAgIGF0dGFjaG1lbnRf aWQgPSBzZWxmLl90b29sLmJ1Z3MuYWRkX3BhdGNoX3RvX2J1ZyhidWdfaWQsIGRpZmYsIGRlc2Ny aXB0aW9uLCBjb21tZW50X3RleHQ9Y29tbWVudF90ZXh0LCBtYXJrX2Zvcl9yZXZpZXc9c2VsZi5f b3B0aW9ucy5yZXZpZXcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1zZWxmLl9vcHRpb25zLnJlcXVl c3RfY29tbWl0KQogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLm9wZW5fYnVnOgogICAgICAgICAg ICAgc2VsZi5fdG9vbC51c2VyLm9wZW5fdXJsKHNlbGYuX3Rvb2wuYnVncy5idWdfdXJsX2Zvcl9i dWdfaWQoYnVnX2lkKSkKKworICAgICAgICAjIFdlIG9ubHkgbmVlZCB0byBzdWJtaXQgLS1uby1y ZXZpZXcgcGF0Y2hlcyB0byBFV1MgYXMgcGF0Y2hlcyBwb3N0ZWQgZm9yIHJldmlldyBhcmUKKyAg ICAgICAgIyBhdXRvbWF0aWNhbGx5IHN1Ym1pdHRlZCB0byBFV1MgYnkgRVdTRmVlZGVyLgorICAg ICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy5yZXZpZXcgYW5kIHNlbGYuX29wdGlvbnMuZXdzOgor ICAgICAgICAgICAgc3RhdGVbJ2F0dGFjaG1lbnRfaWRzJ10gPSBbYXR0YWNobWVudF9pZF0KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9zdWJtaXR0b2V3cy5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9zdWJtaXR0b2V3cy5weQpuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi4xZWFkZTE0YzIyZDUxMDhjOWNjYzcxZWNiODFlZDI2YzVlNWJjMzEwCi0tLSAvZGV2 L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3N1Ym1pdHRvZXdz LnB5CkBAIC0wLDAgKzEsMzggQEAKKyMgQ29weXJpZ2h0IChDKSAyMDE3IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0 OgorIyAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFi b3ZlIGNvcHlyaWdodAorIyAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkg Zm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUK KyMgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGgg dGhlIGRpc3RyaWJ1dGlvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBM RSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworIyBBTkQgQU5ZIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyMg VEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9S IEEgUEFSVElDVUxBUgorIyBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFM TCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyMgQkUgTElBQkxFIEZPUiBBTlkgRElS RUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorIyBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJF TUVOVCBPRgorIyBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFU QSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyMgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyMgQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkKKyMgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRgorIyBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CisKK2ltcG9ydCBsb2dnaW5nCisKK2Zyb20gd2Via2l0cHkudG9vbC5zdGVwcy5hYnN0cmFjdHN0 ZXAgaW1wb3J0IEFic3RyYWN0U3RlcAorCitfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1l X18pCisKKworY2xhc3MgU3VibWl0VG9FV1MoQWJzdHJhY3RTdGVwKToKKyAgICBAY2xhc3NtZXRo b2QKKyAgICBkZWYgb3B0aW9ucyhjbHMpOgorICAgICAgICByZXR1cm4gW10KKworICAgIGRlZiBy dW4oc2VsZiwgc3RhdGUpOgorICAgICAgICBmb3IgYXR0YWNobWVudF9pZCBpbiBzdGF0ZS5nZXQo J2F0dGFjaG1lbnRfaWRzJywgW10pOgorICAgICAgICAgICAgc2VsZi5fdG9vbC5zdGF0dXNfc2Vy dmVyLnN1Ym1pdF90b19ld3MoYXR0YWNobWVudF9pZCkK