76357 2012-01-15 20:40:59 -0800 webkitpy: add determine_full_port_name(), clean up port.__init__() 2012-01-17 13:05:34 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76356 76215 76360 1 dpranke dpranke abarth eric ojan webkit.review.bot oldest_to_newest 536341 0 dpranke 2012-01-15 20:40:59 -0800 broken out from bug 76215. 536343 1 122587 dpranke 2012-01-15 20:53:12 -0800 Created attachment 122587 Patch 536970 2 122587 abarth 2012-01-17 02:05:39 -0800 Comment on attachment 122587 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122587&action=review It's slightly hard to read this patch because it has the earlier patch mixed in. Generally, this looks like a reasonable patch. My main concern is that the mac and win ports seem to have some very similar looking code that probably should be shared. > Tools/ChangeLog:101 > +2012-01-15 Dirk Pranke <dpranke@chromium.org> Looks like you've got two ChangeLogs here. > Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py:116 > + assert port_name in ('chromium-linux', 'chromium-gpu-linux', > + 'chromium-linux-x86', 'chromium-linux-x86_64', > + 'chromium-gpu-linux-x86_64') Can we avoid listing information about all the subclasses here? > Tools/Scripts/webkitpy/layout_tests/port/mac.py:50 > + # FIXME: This may be wrong, since options is a global property, and the port_name is specific to this object? > + if options and not hasattr(options, 'webkit_test_runner'): > + options.webkit_test_runner = True Yuck. options is usually immutable. > Tools/Scripts/webkitpy/layout_tests/port/win.py:59 > + @classmethod > + def determine_full_port_name(cls, host, options, port_name): > + if port_name.endswith('-wk2'): > + # FIXME: This may be wrong, since options is a global property, and the port_name is specific to this object? > + if options and not hasattr(options, 'webkit_test_runner'): > + options.webkit_test_runner = True > + port_name = port_name.replace('-wk2', '') > + if port_name.endswith('win'): > + if host.platform.os_name != 'win': > + return 'win' > + return port_name + '-' + host.platform.os_version > + return port_name Can we share some of this code with MacPort? 537271 3 dpranke 2012-01-17 12:10:29 -0800 (In reply to comment #2) > (From update of attachment 122587 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=122587&action=review > > It's slightly hard to read this patch because it has the earlier patch mixed in. Generally, this looks like a reasonable patch. My main concern is that the mac and win ports seem to have some very similar looking code that probably should be shared. > Whoops. I really need to teach webkit-patch to handle stacked patches, because I often forget to tell it to diff against the tracking branch. Sorry! > > Tools/ChangeLog:101 > > +2012-01-15 Dirk Pranke <dpranke@chromium.org> > > Looks like you've got two ChangeLogs here. > Fixed as per above (I will post the corrected patch). > > Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py:116 > > + assert port_name in ('chromium-linux', 'chromium-gpu-linux', > > + 'chromium-linux-x86', 'chromium-linux-x86_64', > > + 'chromium-gpu-linux-x86_64') > > Can we avoid listing information about all the subclasses here? > I don't think so, because they're not all subclasses. > > Tools/Scripts/webkitpy/layout_tests/port/mac.py:50 > > + # FIXME: This may be wrong, since options is a global property, and the port_name is specific to this object? > > + if options and not hasattr(options, 'webkit_test_runner'): > > + options.webkit_test_runner = True > > Yuck. options is usually immutable. > I don't usually view options as immutable. There are other places in the layout_tests package where we write to options because setting up the default value ahead of parsing the arguments is difficult or impossible (as it is here). We could pull all of the values off of options and on to other objects, but that doesn't seem like a better alternative to me. Maybe you have a different approach you prefer? > > Tools/Scripts/webkitpy/layout_tests/port/win.py:59 > > + @classmethod > > + def determine_full_port_name(cls, host, options, port_name): > > + if port_name.endswith('-wk2'): > > + # FIXME: This may be wrong, since options is a global property, and the port_name is specific to this object? > > + if options and not hasattr(options, 'webkit_test_runner'): > > + options.webkit_test_runner = True > > + port_name = port_name.replace('-wk2', '') > > + if port_name.endswith('win'): > > + if host.platform.os_name != 'win': > > + return 'win' > > + return port_name + '-' + host.platform.os_version > > + return port_name > > Can we share some of this code with MacPort? Will fix. 537285 4 122799 dpranke 2012-01-17 12:24:34 -0800 Created attachment 122799 fix diff, consolidate apple logic 537287 5 dpranke 2012-01-17 12:27:47 -0800 Committed r105183: <http://trac.webkit.org/changeset/105183> 537303 6 eric 2012-01-17 12:48:59 -0800 I assume your'e aware of the -g option to webkit-patch upload? webkit-patch -g head or webkit-patch -g head.. are super useful for uploading just a single commit, or everything since a commit. 537310 7 dpranke 2012-01-17 12:58:39 -0800 (In reply to comment #6) > I assume your'e aware of the -g option to webkit-patch upload? > > webkit-patch -g head > > or > > webkit-patch -g head.. > > are super useful for uploading just a single commit, or everything since a commit. Yes, I'm aware of it, but in my experience it doesn't always work "right" (I need to file bugs for these things to confirm them): 1) I usually need to specify -g branch..HEAD; -g branch or -g branch.. doesn't work for me (haven't tried this one lately, though). 2) The change doesn't pick up any uncommitted files; not usually a problem except when I"m generating a changelog. I wouldn't expect -g branch..HEAD to work in this case, but since I haven't gotten -g branch to work ... Anyway, what I was actually referring to was getting webkit-patch to look for and recognize the upstream branch tracking properly (it should look for the config setting for branch.$BRANCH.merge and diff against that automatically, I think) so that I don't have to specify the base. 537316 8 eric 2012-01-17 13:05:34 -0800 Ojan and Evan Martin are the folks behind -g, iirc. I'm just a happy user. I do encourage you to file bugs. Thanks! 122587 2012-01-15 20:53:12 -0800 2012-01-17 12:24:30 -0800 Patch bug-76357-20120115205310.patch text/plain 45920 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MDM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODUyMGZiZGI3MTIwMjQ0YjRjZmZjNGNlZTFjZjE5YTkw NjM1ZTA2ZS4uNTg4N2VjMGRhYmE4NzkyM2ZmZjQ5ZTc0ZWI0ZTJlYzMzNGQyYWJiOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy OCBAQAorMjAxMi0wMS0xNSAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKwor ICAgICAgICB3ZWJraXRweTogYWRkIGRldGVybWluZV9mdWxsX3BvcnRfbmFtZSgpLCBjbGVhbiB1 cCBwb3J0Ll9faW5pdF9fKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTc2MzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRWFjaCBQb3J0IGNsYXNzIGlzIG5vdyByZXF1aXJlZCB0byBpbXBsZW1lbnQgYSAn cG9ydF9uYW1lJyBmaWVsZAorICAgICAgICB0aGF0IHdpbGwgbWF0Y2ggdGhlIHN0YXJ0IG9mIGFs bCBwb3J0cyBjb25zdHJ1Y3RlZCBieSB0aGlzIGNsYXNzIGFuZAorICAgICAgICBhICdkZXRlcm1p bmVfZnVsbF9wb3J0X25hbWUnIGZpZWxkIHRoYXQgd2lsbCBtYWtlIHRoZSBwb3J0CisgICAgICAg IGZ1bGx5LXF1YWxpZmllZC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvYXBwbGUucHk6CisgICAgICAgIChBcHBsZVBvcnQuX19pbml0X18pOgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAgICAgICAg KFBvcnQpOgorICAgICAgICAoUG9ydC5kZXRlcm1pbmVfcG9ydF9uYW1lKToKKyAgICAgICAgKFBv cnQuX19pbml0X18pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvY2hyb21pdW0ucHk6CisgICAgICAgIChDaHJvbWl1bVBvcnQuZm9yKToKKyAgICAgICAgKENo cm9taXVtUG9ydC5fX2luaXRfXyk6CisgICAgICAgIChDaHJvbWl1bVBvcnQpOgorICAgICAgICAo Q2hyb21pdW1Qb3J0Ll9jaHJvbWl1bV9iYXNlX2Rpcik6CisgICAgICAgIChDaHJvbWl1bVBvcnQu cGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fZ3B1LnB5OgorICAgICAgICAoQ2hyb21pdW1HcHVMaW51 eFBvcnQpOgorICAgICAgICAoQ2hyb21pdW1HcHVMaW51eFBvcnQuX19pbml0X18pOgorICAgICAg ICAoQ2hyb21pdW1HcHVNYWNQb3J0KToKKyAgICAgICAgKENocm9taXVtR3B1TWFjUG9ydC5fX2lu aXRfXyk6CisgICAgICAgIChDaHJvbWl1bUdwdVdpblBvcnQpOgorICAgICAgICAoQ2hyb21pdW1H cHVXaW5Qb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5OgorICAgICAgICAoQ2hyb21pdW1MaW51eFBvcnQp OgorICAgICAgICAoQ2hyb21pdW1MaW51eFBvcnQuZGV0ZXJtaW5lX3BvcnRfbmFtZSk6CisgICAg ICAgIChDaHJvbWl1bUxpbnV4UG9ydC5fX2luaXRfXyk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHk6CisgICAgICAgIChDaHJvbWl1 bU1hY1BvcnQpOgorICAgICAgICAoQ2hyb21pdW1NYWNQb3J0LmRldGVybWluZV9wb3J0X25hbWUp OgorICAgICAgICAoQ2hyb21pdW1NYWNQb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbi5weToKKyAgICAgICAgKENo cm9taXVtV2luUG9ydCk6CisgICAgICAgIChDaHJvbWl1bVdpblBvcnQuZGV0ZXJtaW5lX3BvcnRf bmFtZSk6CisgICAgICAgIChDaHJvbWl1bVdpblBvcnQuX19pbml0X18pOgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJ5cnVuLnB5OgorICAgICAgICAoRHJ5 UnVuUG9ydCk6CisgICAgICAgIChEcnlSdW5Qb3J0LmRldGVybWluZV9wb3J0X25hbWUpOgorICAg ICAgICAoRHJ5UnVuUG9ydC5fX2luaXRfXyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9lZmwucHk6CisgICAgICAgIChFZmxQb3J0KToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnkucHk6CisgICAgICAgIChQ b3J0RmFjdG9yeSk6CisgICAgICAgIChQb3J0RmFjdG9yeS5fZGVmYXVsdF9wb3J0KToKKyAgICAg ICAgKFBvcnRGYWN0b3J5LmdldCk6CisgICAgICAgIChQb3J0RmFjdG9yeS5nZXQuaW4pOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeV91bml0dGVz dC5weToKKyAgICAgICAgKEZhY3RvcnlUZXN0LmFzc2VydF9wb3J0KToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2dvb2dsZV9jaHJvbWUucHk6CisgICAgICAg IChHb29nbGVDaHJvbWVMaW51eDMyUG9ydCk6CisgICAgICAgIChHb29nbGVDaHJvbWVMaW51eDMy UG9ydC5kZXRlcm1pbmVfcG9ydF9uYW1lKToKKyAgICAgICAgKEdvb2dsZUNocm9tZUxpbnV4NjRQ b3J0KToKKyAgICAgICAgKEdvb2dsZUNocm9tZUxpbnV4NjRQb3J0LmRldGVybWluZV9wb3J0X25h bWUpOgorICAgICAgICAoR29vZ2xlQ2hyb21lTWFjUG9ydCk6CisgICAgICAgIChHb29nbGVDaHJv bWVNYWNQb3J0LmRldGVybWluZV9wb3J0X25hbWUpOgorICAgICAgICAoR29vZ2xlQ2hyb21lV2lu UG9ydCk6CisgICAgICAgIChHb29nbGVDaHJvbWVXaW5Qb3J0LmRldGVybWluZV9wb3J0X25hbWUp OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5Ogor ICAgICAgICAoR3RrUG9ydCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9tYWMucHk6CisgICAgICAgIChNYWNQb3J0KToKKyAgICAgICAgKE1hY1BvcnQuZGV0 ZXJtaW5lX3BvcnRfbmFtZSk6CisgICAgICAgIChNYWNQb3J0Ll9faW5pdF9fKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weToKKyAg ICAgICAgKHRlc3RfdmVyc2lvbnMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvbW9ja19kcnQucHk6CisgICAgICAgIChNb2NrRFJUUG9ydCk6CisgICAgICAg IChNb2NrRFJUUG9ydC5kZXRlcm1pbmVfcG9ydF9uYW1lKToKKyAgICAgICAgKE1vY2tEUlRQb3J0 Ll9faW5pdF9fKToKKyAgICAgICAgKE1vY2tEUlQpOgorICAgICAgICAoTW9ja0RSVC5kZXRlcm1p bmVfcG9ydF9uYW1lKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3BvcnRfdGVzdGNhc2UucHk6CisgICAgICAgIChQb3J0VGVzdENhc2UubWFrZV9wb3J0KToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5OgorICAg ICAgICAoUXRQb3J0KToKKyAgICAgICAgKFF0UG9ydC5kZXRlcm1pbmVfcG9ydF9uYW1lKToKKyAg ICAgICAgKFF0UG9ydC5fX2luaXRfXyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC90ZXN0LnB5OgorICAgICAgICAoVGVzdFBvcnQpOgorICAgICAgICAoVGVz dFBvcnQuZGV0ZXJtaW5lX3BvcnRfbmFtZSk6CisgICAgICAgIChUZXN0UG9ydC5fX2luaXRfXyk6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHk6 CisgICAgICAgIChXZWJLaXRQb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbi5weToKKyAgICAgICAgKFdpblBvcnQpOgorICAgICAg ICAoV2luUG9ydC5kZXRlcm1pbmVfcG9ydF9uYW1lKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3Rvb2wvc2VydmVycy9yZWJhc2VsaW5lc2VydmVyLnB5OgorICAgICAgICAoZ2V0X3Rlc3Rf YmFzZWxpbmVzLkFsbFBsYXRmb3Jtc1BvcnQuX19pbml0X18pOgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvdG9vbC9zZXJ2ZXJzL3JlYmFzZWxpbmVzZXJ2ZXJfdW5pdHRlc3QucHk6CisgICAg ICAgIChnZXRfdGVzdF9jb25maWcuVGVzdE1hY1BvcnQpOgorICAgICAgICAoZ2V0X3Rlc3RfY29u ZmlnKToKKworMjAxMi0wMS0xNSAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4K KworICAgICAgICB3ZWJraXRweTogY2xlYW4gdXAgcG9ydCBjb2RlIGluIHByZXBhcmF0aW9uIGZv ciBzdGF0aWMgcG9ydCBuYW1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzYzNTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUbyBmaXggYnVnIDc2MjE1IGFuZCBiZSBhYmxlIHRvIGRldGVybWluZSBhcHBy b3ByaWF0ZSBwb3J0IG5hbWVzCisgICAgICAgIGluIHdlYmtpdHB5IHdpdGhvdXQgYWN0dWFsbHkg Y29uc3RydWN0aW5nIFBvcnQgb2JqZWN0cywgd2UgbmVlZAorICAgICAgICB0byBzaHVmZmxlIHNv bWUgbG9naWMgaW4gdGhlIGNocm9taXVtIHBvcnRzIHRvIGJlIGFibGUgdG8gZmlndXJlCisgICAg ICAgIG91dCB3aGV0aGVyIHdlIGJ1aWx0IERSVCBpbiAzMiBvciA2NC1iaXQgbW9kZS4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHk6Cisg ICAgICAgIChDaHJvbWl1bVBvcnQpOgorICAgICAgICAoQ2hyb21pdW1Qb3J0Ll9jaHJvbWl1bV9i YXNlX2Rpcik6CisgICAgICAgIChDaHJvbWl1bVBvcnQuX19pbml0X18pOgorICAgICAgICAoQ2hy b21pdW1Qb3J0LnBhdGhfZnJvbV9jaHJvbWl1bV9iYXNlKToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5OgorICAgICAgICAoQ2hy b21pdW1MaW51eFBvcnQpOgorICAgICAgICAoQ2hyb21pdW1MaW51eFBvcnQuX2RldGVybWluZV9k cml2ZXJfcGF0aF9zdGF0aWNhbGx5KToKKyAgICAgICAgKENocm9taXVtTGludXhQb3J0Ll9zdGF0 aWNfYnVpbGRfcGF0aCk6CisgICAgICAgIChDaHJvbWl1bUxpbnV4UG9ydC5fZGV0ZXJtaW5lX2Fy Y2hpdGVjdHVyZSk6CisgICAgICAgIChDaHJvbWl1bUxpbnV4UG9ydC5fX2luaXRfXyk6CisgICAg ICAgIChDaHJvbWl1bUxpbnV4UG9ydC5fYnVpbGRfcGF0aCk6CisKIDIwMTItMDEtMTUgIFBhYmxv IEZsb3VyZXQgIDxwYWJsb2ZAbW90b3JvbGEuY29tPgogCiAgICAgICAgIEZpeCBjb21waWxhdGlv biBlcnJvcnMgb24gYnVpbGQtd2Via2l0IC0tZGVidWcgLS1uby12aWRlbyBvbiBtYWMuCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2FwcGxlLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9hcHBsZS5weQppbmRl eCBjMjM4Y2EzZTRmYzhhMzliMzEwOWNmOWY2OGYzNDRlMWYxMTc2OWFjLi5jNzJlNmZkZWE3NTdh YTA1NTExODg5MTRhNzZmMGE5NzNmNThhOTE5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2FwcGxlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYXBwbGUucHkKQEAgLTU2LDIzICs1NiwxMiBAQCBjbGFz cyBBcHBsZVBvcnQoV2ViS2l0UG9ydCk6CiAgICAgICAgICMgaW5zdGVhZCBvZiB0aGUgaW5kaXZp ZHVhbCBwb3J0IGNvbnN0cnVjdG9ycy4KICAgICAgICAgcmV0dXJuIHBvcnRfbmFtZVtsZW4oc2Vs Zi5wb3J0X25hbWUgKyAnLScpOl0KIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0 X25hbWU9Tm9uZSwgKiprd2FyZ3MpOgotICAgICAgICBwb3J0X25hbWUgPSBwb3J0X25hbWUgb3Ig c2VsZi5wb3J0X25hbWUKLSAgICAgICAgV2ViS2l0UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBw b3J0X25hbWU9cG9ydF9uYW1lLCAqKmt3YXJncykKKyAgICBkZWYgX19pbml0X18oc2VsZiwgaG9z dCwgcG9ydF9uYW1lLCAqKmt3YXJncyk6CisgICAgICAgIFdlYktpdFBvcnQuX19pbml0X18oc2Vs ZiwgaG9zdCwgcG9ydF9uYW1lLCAqKmt3YXJncykKIAotICAgICAgICAjIEZJWE1FOiBUaGlzIHNv cnQgb2YgcGFyc2luZyBiZWxvbmdzIGluIGZhY3RvcnkucHkhCi0gICAgICAgIGlmIHBvcnRfbmFt ZSA9PSAnJXMtd2syJyAlIHNlbGYucG9ydF9uYW1lOgotICAgICAgICAgICAgcG9ydF9uYW1lID0g c2VsZi5wb3J0X25hbWUKLSAgICAgICAgICAgICMgRklYTUU6IFRoaXMgbWF5IGJlIHdyb25nLCBz aW5jZSBvcHRpb25zIGlzIGEgZ2xvYmFsIHByb3BlcnR5LCBhbmQgdGhlIHBvcnRfbmFtZSBpcyBz cGVjaWZpYyB0byB0aGlzIG9iamVjdD8KLSAgICAgICAgICAgIHNlbGYuc2V0X29wdGlvbl9kZWZh dWx0KCd3ZWJraXRfdGVzdF9ydW5uZXInLCBUcnVlKQotCi0gICAgICAgIGlmIHBvcnRfbmFtZSA9 PSBzZWxmLnBvcnRfbmFtZToKLSAgICAgICAgICAgIHNlbGYuX3ZlcnNpb24gPSBob3N0LnBsYXRm b3JtLm9zX3ZlcnNpb24KLSAgICAgICAgICAgIHNlbGYuX25hbWUgPSBzZWxmLnBvcnRfbmFtZSAr ICctJyArIHNlbGYuX3ZlcnNpb24KLSAgICAgICAgZWxzZToKLSAgICAgICAgICAgIGFsbG93ZWRf cG9ydF9uYW1lcyA9IHNlbGYuVkVSU0lPTl9GQUxMQkFDS19PUkRFUiArIFtzZWxmLm9wZXJhdGlu Z19zeXN0ZW0oKSArICItZnV0dXJlIl0KLSAgICAgICAgICAgIGFzc2VydCBwb3J0X25hbWUgaW4g YWxsb3dlZF9wb3J0X25hbWVzLCAiJXMgaXMgbm90IGluICVzIiAlIChwb3J0X25hbWUsIGFsbG93 ZWRfcG9ydF9uYW1lcykKLSAgICAgICAgICAgIHNlbGYuX3ZlcnNpb24gPSBzZWxmLl9zdHJpcF9w b3J0X25hbWVfcHJlZml4KHBvcnRfbmFtZSkKKyAgICAgICAgYWxsb3dlZF9wb3J0X25hbWVzID0g c2VsZi5WRVJTSU9OX0ZBTExCQUNLX09SREVSICsgW3NlbGYub3BlcmF0aW5nX3N5c3RlbSgpICsg Ii1mdXR1cmUiXQorICAgICAgICBhc3NlcnQgcG9ydF9uYW1lIGluIGFsbG93ZWRfcG9ydF9uYW1l cywgIiVzIGlzIG5vdCBpbiAlcyIgJSAocG9ydF9uYW1lLCBhbGxvd2VkX3BvcnRfbmFtZXMpCisg ICAgICAgIHNlbGYuX3ZlcnNpb24gPSBzZWxmLl9zdHJpcF9wb3J0X25hbWVfcHJlZml4KHBvcnRf bmFtZSkKIAogICAgICMgRklYTUU6IEEgbW9yZSBzb3BoaXNpdGNhdGVkIHZlcnNpb24gb2YgdGhp cyBmdW5jdGlvbiBzaG91bGQgbW92ZSB0byBXZWJLaXRQb3J0IGFuZCByZXBsYWNlIGFsbCBjYWxs cyB0byBuYW1lKCkuCiAgICAgZGVmIF9wb3J0X25hbWVfd2l0aF92ZXJzaW9uKHNlbGYpOgpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4 IDQ4Yzc4ZGEyMGMwNWQ2NTRkNDczYTJhZTQxY2ZlMTAwOTI2NWRhMGUuLjE1OGVkYTIwZGY5NWQz OWU1ZWI0N2RmZDI2NzhiYzEzYjkwODE4MzkgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAgLTgxLDE3ICs4MSwzMSBAQCBjbGFzcyBE dW1teU9wdGlvbnMob2JqZWN0KToKIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAiIiJBYnN0cmFj dCBjbGFzcyBmb3IgUG9ydC1zcGVjaWZpYyBob29rcyBmb3IgdGhlIGxheW91dF90ZXN0IHBhY2th Z2UuIiIiCiAKLSAgICBwb3J0X25hbWUgPSBOb25lICAjIFN1YmNsYXNzZXMgb3ZlcnJpZGUgdGhp cworICAgICMgU3ViY2xhc3NlcyBvdmVycmlkZSB0aGlzLiBUaGlzIHNob3VsZCBpbmRpY2F0ZSB0 aGUgYmFzaWMgaW1wbGVtZW50YXRpb24KKyAgICAjIHBhcnQgb2YgdGhlIHBvcnQgbmFtZSwgZS5n LiwgJ2Nocm9taXVtLW1hYycsICd3aW4nLCAnZ3RrJzsgdGhlcmUgaXMgcHJvYmFibHkgKD8pCisg ICAgIyBvbmUgdW5pcXVlIHZhbHVlIHBlciBjbGFzcy4KKworICAgICMgRklYTUU6IFdlIHNob3Vs ZCBwcm9iYWJseSByZW5hbWUgdGhpcyB0byBzb21ldGhpbmcgbGlrZSAnaW1wbGVtZW50YXRpb25f bmFtZScuCisgICAgcG9ydF9uYW1lID0gTm9uZQogCiAgICAgIyBUZXN0IG5hbWVzIHJlc2VtYmxl IHVuaXggcmVsYXRpdmUgcGF0aHMsIGFuZCB1c2UgJy8nIGFzIGEgZGlyZWN0b3J5IHNlcGFyYXRv ci4KICAgICBURVNUX1BBVEhfU0VQQVJBVE9SID0gJy8nCiAKICAgICBBTExfQlVJTERfVFlQRVMg PSAoJ2RlYnVnJywgJ3JlbGVhc2UnKQogCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGRldGVy bWluZV9mdWxsX3BvcnRfbmFtZShjbHMsIGhvc3QsIG9wdGlvbnMsIHBvcnRfbmFtZSk6CisgICAg ICAgICIiIlJldHVybiBhIGZ1bGx5LXNwZWNpZmllZCBwb3J0IG5hbWUgdGhhdCBjYW4gYmUgdXNl ZCB0byBjb25zdHJ1Y3Qgb2JqZWN0cy4iIiIKKyAgICAgICAgIyBTdWJjbGFzc2VzIHdpbGwgdXN1 YWxseSBvdmVycmlkZSB0aGlzLgorICAgICAgICByZXR1cm4gY2xzLnBvcnRfbmFtZQorCiAgICAg ZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZT1Ob25lLCBvcHRpb25zPU5vbmUsIGNv bmZpZz1Ob25lLCAqKmt3YXJncyk6CiAKKyAgICAgICAgIyBUaGlzIHZhbHVlIG1heSBiZSBkaWZm ZXJlbnQgZnJvbSBjbHMucG9ydF9uYW1lIGJ5IGhhdmluZyB2ZXJzaW9uIG1vZGlmaWVycworICAg ICAgICAjIGFuZCBvdGhlciBmaWVsZHMgYXBwZW5kZWQgdG8gaXQgKGZvciBleGFtcGxlLCAncXQt YXJtJyBvciAnbWFjLXdrMicpLgorICAgICAgICBzZWxmLl9uYW1lID0gcG9ydF9uYW1lIG9yIHNl bGYucG9ydF9uYW1lCisKICAgICAgICAgIyBUaGVzZSBhcmUgZGVmYXVsdCB2YWx1ZXMgdGhhdCBz aG91bGQgYmUgb3ZlcnJpZGRlbiBpbiBhIHN1YmNsYXNzZXMuCi0gICAgICAgIHNlbGYuX25hbWUg PSBwb3J0X25hbWUgb3Igc2VsZi5wb3J0X25hbWUgICMgU3ViY2xhc3NlcyBtYXkgYXBwZW5kIGEg LVZFUlNJT04gKGxpa2UgbWFjLWxlb3BhcmQpIG9yIG90aGVyIHF1YWxpZmllcnMuCiAgICAgICAg IHNlbGYuX3ZlcnNpb24gPSAnJwogICAgICAgICBzZWxmLl9hcmNoaXRlY3R1cmUgPSAneDg2Jwog ICAgICAgICBzZWxmLl9ncmFwaGljc190eXBlID0gJ2NwdScKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CmluZGV4IGE2ZjYxMTIz ZGU1MjZkOTFlMjJlZWJkZGZjNjY4NjE4YzBhNGJkODcuLmZlNTE1OGJmZWE0NWQxMjdjYTJmMjJh OWVlOGY2ZDZkMDNjNzE4MTAgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQpAQCAtNTgsOCArNTgsNiBAQCBfbG9nID0gbG9n Z2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiBjbGFzcyBDaHJvbWl1bVBvcnQoUG9ydCk6CiAgICAg IiIiQWJzdHJhY3QgYmFzZSBjbGFzcyBmb3IgQ2hyb21pdW0gaW1wbGVtZW50YXRpb25zIG9mIHRo ZSBQb3J0IGNsYXNzLiIiIgogCi0gICAgcG9ydF9uYW1lID0gImNocm9taXVtIgotCiAgICAgQUxM X1NZU1RFTVMgPSAoCiAgICAgICAgICgnbGVvcGFyZCcsICd4ODYnKSwKICAgICAgICAgKCdzbm93 bGVvcGFyZCcsICd4ODYnKSwKQEAgLTg1LDExICs4MywxOCBAQCBjbGFzcyBDaHJvbWl1bVBvcnQo UG9ydCk6CiAgICAgICAgICdsaW51eCc6IFsnbHVjaWQnXSwKICAgICB9CiAKLSAgICBkZWYgX19p bml0X18oc2VsZiwgaG9zdCwgKiprd2FyZ3MpOgotICAgICAgICBQb3J0Ll9faW5pdF9fKHNlbGYs IGhvc3QsICoqa3dhcmdzKQotICAgICAgICAjIEFsbCBzdWItY2xhc3NlcyBvdmVycmlkZSB0aGlz LCBidXQgd2UgbmVlZCBhbiBpbml0aWFsIHZhbHVlIGZvciB0ZXN0aW5nLgotICAgICAgICBzZWxm Ll92ZXJzaW9uID0gJ3hwJwotICAgICAgICBzZWxmLl9jaHJvbWl1bV9iYXNlX2RpciA9IE5vbmUK KyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgX2Nocm9taXVtX2Jhc2VfZGlyKGNscywgZmlsZXN5 c3RlbSk6CisgICAgICAgIG1vZHVsZV9wYXRoID0gZmlsZXN5c3RlbS5wYXRoX3RvX21vZHVsZShj bHMuX19tb2R1bGVfXykKKyAgICAgICAgb2Zmc2V0ID0gbW9kdWxlX3BhdGguZmluZCgndGhpcmRf cGFydHknKQorICAgICAgICBpZiBvZmZzZXQgPT0gLTE6CisgICAgICAgICAgICByZXR1cm4gZmls ZXN5c3RlbS5qb2luKG1vZHVsZV9wYXRoWzA6bW9kdWxlX3BhdGguZmluZCgnVG9vbHMnKV0sICdT b3VyY2UnLCAnV2ViS2l0JywgJ2Nocm9taXVtJykKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAg IHJldHVybiBtb2R1bGVfcGF0aFswOm9mZnNldF0KKworICAgIGRlZiBfX2luaXRfXyhzZWxmLCBo b3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKToKKyAgICAgICAgUG9ydC5fX2luaXRfXyhzZWxmLCBo b3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKQorICAgICAgICBzZWxmLl9jaHJvbWl1bV9iYXNlX2Rp cl9wYXRoID0gTm9uZQogCiAgICAgZGVmIF9jaGVja19maWxlX2V4aXN0cyhzZWxmLCBwYXRoX3Rv X2ZpbGUsIGZpbGVfZGVzY3JpcHRpb24sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdmVy cmlkZV9zdGVwPU5vbmUsIGxvZ2dpbmc9VHJ1ZSk6CkBAIC0yMjAsMTQgKzIyNSw5IEBAIGNsYXNz IENocm9taXVtUG9ydChQb3J0KToKICAgICBkZWYgcGF0aF9mcm9tX2Nocm9taXVtX2Jhc2Uoc2Vs ZiwgKmNvbXBzKToKICAgICAgICAgIiIiUmV0dXJucyB0aGUgZnVsbCBwYXRoIHRvIHBhdGggbWFk ZSBieSBqb2luaW5nIHRoZSB0b3Agb2YgdGhlCiAgICAgICAgIENocm9taXVtIHNvdXJjZSB0cmVl IGFuZCB0aGUgbGlzdCBvZiBwYXRoIGNvbXBvbmVudHMgaW4gfCpjb21wc3wuIiIiCi0gICAgICAg IGlmIG5vdCBzZWxmLl9jaHJvbWl1bV9iYXNlX2RpcjoKLSAgICAgICAgICAgIGNocm9taXVtX21v ZHVsZV9wYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5wYXRoX3RvX21vZHVsZShzZWxmLl9fbW9kdWxl X18pCi0gICAgICAgICAgICBvZmZzZXQgPSBjaHJvbWl1bV9tb2R1bGVfcGF0aC5maW5kKCd0aGly ZF9wYXJ0eScpCi0gICAgICAgICAgICBpZiBvZmZzZXQgPT0gLTE6Ci0gICAgICAgICAgICAgICAg c2VsZi5fY2hyb21pdW1fYmFzZV9kaXIgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oY2hyb21pdW1f bW9kdWxlX3BhdGhbMDpjaHJvbWl1bV9tb2R1bGVfcGF0aC5maW5kKCdUb29scycpXSwgJ1NvdXJj ZScsICdXZWJLaXQnLCAnY2hyb21pdW0nKQotICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAg ICAgICBzZWxmLl9jaHJvbWl1bV9iYXNlX2RpciA9IGNocm9taXVtX21vZHVsZV9wYXRoWzA6b2Zm c2V0XQotICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX2Nocm9taXVt X2Jhc2VfZGlyLCAqY29tcHMpCisgICAgICAgIGlmIG5vdCBzZWxmLl9jaHJvbWl1bV9iYXNlX2Rp cl9wYXRoOgorICAgICAgICAgICAgc2VsZi5fY2hyb21pdW1fYmFzZV9kaXJfcGF0aCA9IHNlbGYu X2Nocm9taXVtX2Jhc2VfZGlyKHNlbGYuX2ZpbGVzeXN0ZW0pCisgICAgICAgIHJldHVybiBzZWxm Ll9maWxlc3lzdGVtLmpvaW4oc2VsZi5fY2hyb21pdW1fYmFzZV9kaXJfcGF0aCwgKmNvbXBzKQog CiAgICAgZGVmIHBhdGhfdG9fdGVzdF9leHBlY3RhdGlvbnNfZmlsZShzZWxmKToKICAgICAgICAg cmV0dXJuIHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdMYXlvdXRUZXN0cycsICdwbGF0Zm9y bScsICdjaHJvbWl1bScsICd0ZXN0X2V4cGVjdGF0aW9ucy50eHQnKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9ncHUucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2dwdS5weQpp bmRleCA4YjQxNDVlMjA0MDEwMDY2NjQxNjQyMjNhMzE2YWM4NzllODcxOWUxLi5mZGMxMTE3Yzk2 ZmRhMjQwZTdiNGI0NDAxYmQ4NTgxZjJlYTIzNjQ0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2dwdS5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2dwdS5weQpAQCAtNzEs OCArNzEsMTAgQEAgZGVmIF9kZWZhdWx0X3Rlc3RzX3BhdGhzKHBvcnQpOgogCiAKIGNsYXNzIENo cm9taXVtR3B1TGludXhQb3J0KGNocm9taXVtX2xpbnV4LkNocm9taXVtTGludXhQb3J0KToKLSAg ICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lPSdjaHJvbWl1bS1ncHUtbGludXgn LCAqKmt3YXJncyk6Ci0gICAgICAgIGNocm9taXVtX2xpbnV4LkNocm9taXVtTGludXhQb3J0Ll9f aW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZT1wb3J0X25hbWUsICoqa3dhcmdzKQorICAgIHBv cnRfbmFtZSA9ICdjaHJvbWl1bS1ncHUtbGludXgnCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwg aG9zdCwgcG9ydF9uYW1lLCAqKmt3YXJncyk6CisgICAgICAgIGNocm9taXVtX2xpbnV4LkNocm9t aXVtTGludXhQb3J0Ll9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZSwgKiprd2FyZ3MpCiAg ICAgICAgIF9zZXRfZ3B1X29wdGlvbnMoc2VsZikKIAogICAgIGRlZiBiYXNlbGluZV9zZWFyY2hf cGF0aChzZWxmKToKQEAgLTg2LDggKzg4LDEwIEBAIGNsYXNzIENocm9taXVtR3B1TGludXhQb3J0 KGNocm9taXVtX2xpbnV4LkNocm9taXVtTGludXhQb3J0KToKIAogCiBjbGFzcyBDaHJvbWl1bUdw dU1hY1BvcnQoY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydCk6Ci0gICAgZGVmIF9faW5pdF9f KHNlbGYsIGhvc3QsIHBvcnRfbmFtZT0nY2hyb21pdW0tZ3B1LW1hYycsICoqa3dhcmdzKToKLSAg ICAgICAgY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBw b3J0X25hbWU9cG9ydF9uYW1lLCAqKmt3YXJncykKKyAgICBwb3J0X25hbWUgPSAnY2hyb21pdW0t Z3B1LW1hYycKKworICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dh cmdzKToKKyAgICAgICAgY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydC5fX2luaXRfXyhzZWxm LCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKQogICAgICAgICBfc2V0X2dwdV9vcHRpb25zKHNl bGYpCiAKICAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CkBAIC0xMDAsOCArMTA0 LDEwIEBAIGNsYXNzIENocm9taXVtR3B1TWFjUG9ydChjaHJvbWl1bV9tYWMuQ2hyb21pdW1NYWNQ b3J0KToKIAogCiBjbGFzcyBDaHJvbWl1bUdwdVdpblBvcnQoY2hyb21pdW1fd2luLkNocm9taXVt V2luUG9ydCk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZT0nY2hyb21p dW0tZ3B1LXdpbicsICoqa3dhcmdzKToKLSAgICAgICAgY2hyb21pdW1fd2luLkNocm9taXVtV2lu UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWU9cG9ydF9uYW1lLCAqKmt3YXJncykK KyAgICBwb3J0X25hbWUgPSAnY2hyb21pdW0tZ3B1LXdpbicKKworICAgIGRlZiBfX2luaXRfXyhz ZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKToKKyAgICAgICAgY2hyb21pdW1fd2luLkNo cm9taXVtV2luUG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKQog ICAgICAgICBfc2V0X2dwdV9vcHRpb25zKHNlbGYpCiAKICAgICBkZWYgYmFzZWxpbmVfc2VhcmNo X3BhdGgoc2VsZik6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weQppbmRleCA2YjZlOGVmNDk0YjA2ZmE1N2Y0 NzdmNDRjMzVhNDcxNjFkOGEyMTc2Li5jZWUxZWI1Mjk2NzRmNDg4YjIzMDQ2NTMzMzgxOTg5MzJi OGM1ZjQ5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Nocm9taXVtX2xpbnV4LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkKQEAgLTI4LDEzICsyOCwxNyBAQAogIyBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgogCiBpbXBvcnQgbG9nZ2luZwotaW1wb3J0IGNocm9taXVtCisKK2Zyb20gd2Via2l0 cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGNocm9taXVtCitmcm9tIHdlYmtpdHB5LmxheW91 dF90ZXN0cy5wb3J0IGltcG9ydCBjb25maWcKIAogCiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIo X19uYW1lX18pCiAKIAogY2xhc3MgQ2hyb21pdW1MaW51eFBvcnQoY2hyb21pdW0uQ2hyb21pdW1Q b3J0KToKKyAgICBwb3J0X25hbWUgPSAnY2hyb21pdW0tbGludXgnCisKICAgICBTVVBQT1JURURf QVJDSElURUNUVVJFUyA9ICgneDg2JywgJ3g4Nl82NCcpCiAKICAgICBGQUxMQkFDS19QQVRIUyA9 IHsKQEAgLTU1LDMzICs1OSwzMyBAQCBjbGFzcyBDaHJvbWl1bUxpbnV4UG9ydChjaHJvbWl1bS5D aHJvbWl1bVBvcnQpOgogICAgICAgICBdLAogICAgIH0KIAotICAgIGRlZiBfX2luaXRfXyhzZWxm LCBob3N0LCBwb3J0X25hbWU9Tm9uZSwgKiprd2FyZ3MpOgotICAgICAgICBwb3J0X25hbWUgPSBw b3J0X25hbWUgb3IgJ2Nocm9taXVtLWxpbnV4JwotICAgICAgICBjaHJvbWl1bS5DaHJvbWl1bVBv cnQuX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lPXBvcnRfbmFtZSwgKiprd2FyZ3MpCi0g ICAgICAgICMgV2UgcmUtc2V0IHRoZSBwb3J0IG5hbWUgb25jZSB0aGUgYmFzZSBvYmplY3QgaXMg ZnVsbHkgaW5pdGlhbGl6ZWQKLSAgICAgICAgIyBpbiBvcmRlciB0byBiZSBhYmxlIHRvIGZpbmQg dGhlIERSVCBiaW5hcnkgcHJvcGVybHkuCi0gICAgICAgIGlmIHBvcnRfbmFtZS5lbmRzd2l0aCgn LWxpbnV4Jyk6Ci0gICAgICAgICAgICBzZWxmLl9hcmNoaXRlY3R1cmUgPSBzZWxmLl9kZXRlcm1p bmVfYXJjaGl0ZWN0dXJlKCkKLSAgICAgICAgICAgICMgRklYTUU6IFRoaXMgaXMgYW4gdWdseSBo YWNrIHRvIGF2b2lkIHJlbmFtaW5nIHRoZSBHUFUgcG9ydC4KLSAgICAgICAgICAgIGlmIHBvcnRf bmFtZSA9PSAnY2hyb21pdW0tbGludXgnOgotICAgICAgICAgICAgICAgIHBvcnRfbmFtZSA9IHBv cnRfbmFtZSArICctJyArIHNlbGYuX2FyY2hpdGVjdHVyZQotICAgICAgICBlbHNlOgotICAgICAg ICAgICAgYmFzZSwgYXJjaCA9IHBvcnRfbmFtZS5yc3BsaXQoJy0nLCAxKQotICAgICAgICAgICAg YXNzZXJ0IGJhc2UgaW4gKCdjaHJvbWl1bS1saW51eCcsICdjaHJvbWl1bS1ncHUtbGludXgnKQot ICAgICAgICAgICAgc2VsZi5fYXJjaGl0ZWN0dXJlID0gYXJjaAotICAgICAgICBhc3NlcnQgc2Vs Zi5fYXJjaGl0ZWN0dXJlIGluIHNlbGYuU1VQUE9SVEVEX0FSQ0hJVEVDVFVSRVMKLSAgICAgICAg YXNzZXJ0IHBvcnRfbmFtZSBpbiAoJ2Nocm9taXVtLWxpbnV4JywgJ2Nocm9taXVtLWdwdS1saW51 eCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICdjaHJvbWl1bS1saW51eC14ODYnLCAn Y2hyb21pdW0tbGludXgteDg2XzY0JywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2No cm9taXVtLWdwdS1saW51eC14ODZfNjQnKQotICAgICAgICBzZWxmLl9uYW1lID0gcG9ydF9uYW1l Ci0gICAgICAgIHNlbGYuX3ZlcnNpb24gPSAnbHVjaWQnICAjIFdlIG9ubHkgc3VwcG9ydCBsdWNp ZCByaWdodCBub3cuCi0KLSAgICBkZWYgX2RldGVybWluZV9hcmNoaXRlY3R1cmUoc2VsZik6Ci0g ICAgICAgIGRyaXZlcl9wYXRoID0gc2VsZi5fcGF0aF90b19kcml2ZXIoKQorICAgIEBjbGFzc21l dGhvZAorICAgIGRlZiBfZGV0ZXJtaW5lX2RyaXZlcl9wYXRoX3N0YXRpY2FsbHkoY2xzLCBob3N0 LCBvcHRpb25zKToKKyAgICAgICAgY29uZmlnX29iamVjdCA9IGNvbmZpZy5Db25maWcoaG9zdC5l eGVjdXRpdmUsIGhvc3QuZmlsZXN5c3RlbSkKKyAgICAgICAgYnVpbGRfZGlyZWN0b3J5ID0gZ2V0 YXR0cihvcHRpb25zLCAnYnVpbGRfZGlyZWN0b3J5JywgTm9uZSkKKyAgICAgICAgd2Via2l0X2Jh c2UgPSBjb25maWdfb2JqZWN0LnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpCisgICAgICAgIGNocm9t aXVtX2Jhc2UgPSBjbHMuX2Nocm9taXVtX2Jhc2VfZGlyKGhvc3QuZmlsZXN5c3RlbSkKKyAgICAg ICAgY29uZmlndXJhdGlvbiA9IGdldGF0dHIob3B0aW9ucywgJ2NvbmZpZ3VyYXRpb24nLCBjb25m aWdfb2JqZWN0LmRlZmF1bHRfY29uZmlndXJhdGlvbigpKQorICAgICAgICByZXR1cm4gY2xzLl9z dGF0aWNfYnVpbGRfcGF0aChob3N0LmZpbGVzeXN0ZW0sIGJ1aWxkX2RpcmVjdG9yeSwgY2hyb21p dW1fYmFzZSwgd2Via2l0X2Jhc2UsIGNvbmZpZ3VyYXRpb24sICdEdW1wUmVuZGVyVHJlZScpCisK KyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9zdGF0aWNfYnVpbGRfcGF0aChmaWxlc3lzdGVt LCBidWlsZF9kaXJlY3RvcnksIGNocm9taXVtX2Jhc2UsIHdlYmtpdF9iYXNlLCAqY29tcHMpOgor ICAgICAgICBpZiBidWlsZF9kaXJlY3Rvcnk6CisgICAgICAgICAgICByZXR1cm4gZmlsZXN5c3Rl bS5qb2luKGJ1aWxkX2RpcmVjdG9yeSwgKmNvbXBzKQorICAgICAgICBpZiBmaWxlc3lzdGVtLmV4 aXN0cyhmaWxlc3lzdGVtLmpvaW4oY2hyb21pdW1fYmFzZSwgJ3Njb25zYnVpbGQnKSk6CisgICAg ICAgICAgICByZXR1cm4gZmlsZXN5c3RlbS5qb2luKGNocm9taXVtX2Jhc2UsICdzY29uc2J1aWxk JywgKmNvbXBzKQorICAgICAgICBpZiBmaWxlc3lzdGVtLmV4aXN0cyhmaWxlc3lzdGVtLmpvaW4o Y2hyb21pdW1fYmFzZSwgJ291dCcsICpjb21wcykpOgorICAgICAgICAgICAgcmV0dXJuIGZpbGVz eXN0ZW0uam9pbihjaHJvbWl1bV9iYXNlLCAnb3V0JywgKmNvbXBzKQorICAgICAgICBpZiBmaWxl c3lzdGVtLmV4aXN0cyhmaWxlc3lzdGVtLmpvaW4od2Via2l0X2Jhc2UsICdzY29uc2J1aWxkJykp OgorICAgICAgICAgICAgcmV0dXJuIGZpbGVzeXN0ZW0uam9pbih3ZWJraXRfYmFzZSwgJ3Njb25z YnVpbGQnLCAqY29tcHMpCisgICAgICAgIHJldHVybiBmaWxlc3lzdGVtLmpvaW4od2Via2l0X2Jh c2UsICdvdXQnLCAqY29tcHMpCisKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9kZXRlcm1p bmVfYXJjaGl0ZWN0dXJlKGZpbGVzeXN0ZW0sIGV4ZWN1dGl2ZSwgZHJpdmVyX3BhdGgpOgogICAg ICAgICBmaWxlX291dHB1dCA9ICcnCi0gICAgICAgIGlmIHNlbGYuX2ZpbGVzeXN0ZW0uZXhpc3Rz KGRyaXZlcl9wYXRoKToKKyAgICAgICAgaWYgZmlsZXN5c3RlbS5leGlzdHMoZHJpdmVyX3BhdGgp OgogICAgICAgICAgICAgIyBUaGUgLS1kZXJlZmVyZW5jZSBmbGFnIHRlbGxzIGZpbGUgdG8gZm9s bG93IHN5bWxpbmtzCi0gICAgICAgICAgICBmaWxlX291dHB1dCA9IHNlbGYuX2V4ZWN1dGl2ZS5y dW5fY29tbWFuZChbJ2ZpbGUnLCAnLS1kZXJlZmVyZW5jZScsIGRyaXZlcl9wYXRoXSwgcmV0dXJu X3N0ZGVycj1UcnVlKQorICAgICAgICAgICAgZmlsZV9vdXRwdXQgPSBleGVjdXRpdmUucnVuX2Nv bW1hbmQoWydmaWxlJywgJy0tZGVyZWZlcmVuY2UnLCBkcml2ZXJfcGF0aF0sIHJldHVybl9zdGRl cnI9VHJ1ZSkKIAogICAgICAgICBpZiAnRUxGIDMyLWJpdCBMU0IgZXhlY3V0YWJsZScgaW4gZmls ZV9vdXRwdXQ6CiAgICAgICAgICAgICByZXR1cm4gJ3g4NicKQEAgLTk2LDYgKzEwMCwyMyBAQCBj bGFzcyBDaHJvbWl1bUxpbnV4UG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICAgICAj IGlmIHdlIGFjdHVhbGx5IHRyeSB0byB1c2UgdGhlIGJpbmFyeSwgY2hlY2tfYnVpbGQoKSBzaG91 bGQgZmFpbC4KICAgICAgICAgcmV0dXJuICd4ODZfNjQnCiAKKyAgICBAY2xhc3NtZXRob2QKKyAg ICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGNscywgaG9zdCwgb3B0aW9ucywgcG9ydF9u YW1lKToKKyAgICAgICAgaWYgcG9ydF9uYW1lLmVuZHN3aXRoKCctbGludXgnKToKKyAgICAgICAg ICAgIHJldHVybiBwb3J0X25hbWUgKyAnLScgKyBjbHMuX2RldGVybWluZV9hcmNoaXRlY3R1cmUo aG9zdC5maWxlc3lzdGVtLCBob3N0LmV4ZWN1dGl2ZSwgY2xzLl9kZXRlcm1pbmVfZHJpdmVyX3Bh dGhfc3RhdGljYWxseShob3N0LCBvcHRpb25zKSkKKyAgICAgICAgcmV0dXJuIHBvcnRfbmFtZQor CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZSwgKiprd2FyZ3MpOgorICAg ICAgICBjaHJvbWl1bS5DaHJvbWl1bVBvcnQuX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1l LCAqKmt3YXJncykKKyAgICAgICAgKGJhc2UsIGFyY2gpID0gcG9ydF9uYW1lLnJzcGxpdCgnLScs IDEpCisgICAgICAgIGFzc2VydCBiYXNlIGluICgnY2hyb21pdW0tbGludXgnLCAnY2hyb21pdW0t Z3B1LWxpbnV4JykKKyAgICAgICAgYXNzZXJ0IGFyY2ggaW4gc2VsZi5TVVBQT1JURURfQVJDSElU RUNUVVJFUworICAgICAgICBhc3NlcnQgcG9ydF9uYW1lIGluICgnY2hyb21pdW0tbGludXgnLCAn Y2hyb21pdW0tZ3B1LWxpbnV4JywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2Nocm9t aXVtLWxpbnV4LXg4NicsICdjaHJvbWl1bS1saW51eC14ODZfNjQnLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnY2hyb21pdW0tZ3B1LWxpbnV4LXg4Nl82NCcpCisgICAgICAgIHNlbGYu X3ZlcnNpb24gPSAnbHVjaWQnICAjIFdlIG9ubHkgc3VwcG9ydCBsdWNpZCByaWdodCBub3cuCisg ICAgICAgIHNlbGYuX2FyY2hpdGVjdHVyZSA9IGFyY2gKKwogICAgIGRlZiBiYXNlbGluZV9zZWFy Y2hfcGF0aChzZWxmKToKICAgICAgICAgcG9ydF9uYW1lcyA9IHNlbGYuRkFMTEJBQ0tfUEFUSFNb c2VsZi5fYXJjaGl0ZWN0dXJlXQogICAgICAgICByZXR1cm4gbWFwKHNlbGYuX3dlYmtpdF9iYXNl bGluZV9wYXRoLCBwb3J0X25hbWVzKQpAQCAtMTE4LDE4ICsxMzksNyBAQCBjbGFzcyBDaHJvbWl1 bUxpbnV4UG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICMKIAogICAgIGRlZiBfYnVp bGRfcGF0aChzZWxmLCAqY29tcHMpOgotICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ2J1aWxk X2RpcmVjdG9yeScpOgotICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihz ZWxmLmdldF9vcHRpb24oJ2J1aWxkX2RpcmVjdG9yeScpLCAqY29tcHMpCi0KLSAgICAgICAgYmFz ZSA9IHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoKQotICAgICAgICBpZiBzZWxmLl9maWxl c3lzdGVtLmV4aXN0cyhzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ3Njb25zYnVpbGQnKSk6 Ci0gICAgICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5qb2luKGJhc2UsICdzY29uc2J1 aWxkJywgKmNvbXBzKQotICAgICAgICBpZiBzZWxmLl9maWxlc3lzdGVtLmV4aXN0cyhzZWxmLl9m aWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcsICpjb21wcykpOgotICAgICAgICAgICAgcmV0dXJu IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihiYXNlLCAnb3V0JywgKmNvbXBzKQotICAgICAgICBiYXNl ID0gc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoKQotICAgICAgICBpZiBzZWxmLl9maWxlc3lz dGVtLmV4aXN0cyhzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ3Njb25zYnVpbGQnKSk6Ci0g ICAgICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5qb2luKGJhc2UsICdzY29uc2J1aWxk JywgKmNvbXBzKQotICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5qb2luKGJhc2UsICdv dXQnLCAqY29tcHMpCisgICAgICAgIHJldHVybiBzZWxmLl9zdGF0aWNfYnVpbGRfcGF0aChzZWxm Ll9maWxlc3lzdGVtLCBzZWxmLmdldF9vcHRpb24oJ2J1aWxkX2RpcmVjdG9yeScpLCBzZWxmLnBh dGhfZnJvbV9jaHJvbWl1bV9iYXNlKCksIHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCksICpj b21wcykKIAogICAgIGRlZiBfY2hlY2tfYXBhY2hlX2luc3RhbGwoc2VsZik6CiAgICAgICAgIHJl c3VsdCA9IHNlbGYuX2NoZWNrX2ZpbGVfZXhpc3RzKHNlbGYuX3BhdGhfdG9fYXBhY2hlKCksICJh cGFjaGUyIikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW1fbWFjLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKaW5kZXggNDFhMWE1NTVhZTJjYjVmZThlNzRhMGUxOWJh ZTk3ZmU3OTJlZmQ3NC4uZTZkNTU3ZjU1NmFiODFlZjExOWVhMzFlYWZiZDdkMjlkMWNlZGY5YiAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV9tYWMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV9tYWMucHkKQEAgLTQwLDYgKzQwLDcgQEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9n Z2VyKF9fbmFtZV9fKQogCiBjbGFzcyBDaHJvbWl1bU1hY1BvcnQoY2hyb21pdW0uQ2hyb21pdW1Q b3J0KToKICAgICBTVVBQT1JURURfT1NfVkVSU0lPTlMgPSAoJ2xlb3BhcmQnLCAnc25vd2xlb3Bh cmQnLCAnbGlvbicsICdmdXR1cmUnKQorICAgIHBvcnRfbmFtZSA9ICdjaHJvbWl1bS1tYWMnCiAK ICAgICBGQUxMQkFDS19QQVRIUyA9IHsKICAgICAgICAgJ2xlb3BhcmQnOiBbCkBAIC03MywxOCAr NzQsMTkgQEAgY2xhc3MgQ2hyb21pdW1NYWNQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAg ICAgICAgIF0sCiAgICAgfQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFt ZT1Ob25lLCBvc192ZXJzaW9uX3N0cmluZz1Ob25lLCAqKmt3YXJncyk6CisgICAgQGNsYXNzbWV0 aG9kCisgICAgZGVmIGRldGVybWluZV9mdWxsX3BvcnRfbmFtZShjbHMsIGhvc3QsIG9wdGlvbnMs IHBvcnRfbmFtZSk6CisgICAgICAgIGlmIHBvcnRfbmFtZS5lbmRzd2l0aCgnLW1hYycpOgorICAg ICAgICAgICAgcmV0dXJuIHBvcnRfbmFtZSArICctJyArIGhvc3QucGxhdGZvcm0ub3NfdmVyc2lv bgorICAgICAgICByZXR1cm4gcG9ydF9uYW1lCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwgaG9z dCwgcG9ydF9uYW1lLCAqKmt3YXJncyk6CisgICAgICAgIGNocm9taXVtLkNocm9taXVtUG9ydC5f X2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKQorCiAgICAgICAgICMgV2Un cmUgYSBsaXR0bGUgZ2VuZXJpYyBoZXJlIGJlY2F1c2UgdGhpcyBjb2RlIGlzIHJldXNlZCBieSB0 aGUKICAgICAgICAgIyAnZ29vZ2xlLWNocm9tZScgcG9ydCBhcyB3ZWxsIGFzIHRoZSAnbW9jay0n IGFuZCAnZHJ5cnVuLScgcG9ydHMuCi0gICAgICAgIHBvcnRfbmFtZSA9IHBvcnRfbmFtZSBvciAn Y2hyb21pdW0tbWFjJwotICAgICAgICBjaHJvbWl1bS5DaHJvbWl1bVBvcnQuX19pbml0X18oc2Vs ZiwgaG9zdCwgcG9ydF9uYW1lPXBvcnRfbmFtZSwgKiprd2FyZ3MpCi0gICAgICAgIGlmIHBvcnRf bmFtZS5lbmRzd2l0aCgnLW1hYycpOgotICAgICAgICAgICAgYXNzZXJ0IGhvc3QucGxhdGZvcm0u aXNfbWFjKCkKLSAgICAgICAgICAgIHNlbGYuX3ZlcnNpb24gPSBob3N0LnBsYXRmb3JtLm9zX3Zl cnNpb24KLSAgICAgICAgICAgIHNlbGYuX25hbWUgPSBwb3J0X25hbWUgKyAnLScgKyBzZWxmLl92 ZXJzaW9uCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBzZWxmLl92ZXJzaW9uID0gcG9ydF9u YW1lW3BvcnRfbmFtZS5pbmRleCgnLW1hYy0nKSArIGxlbignLW1hYy0nKTpdCi0gICAgICAgICAg ICBhc3NlcnQgc2VsZi5fdmVyc2lvbiBpbiBzZWxmLlNVUFBPUlRFRF9PU19WRVJTSU9OUworICAg ICAgICBzZWxmLl92ZXJzaW9uID0gcG9ydF9uYW1lW3BvcnRfbmFtZS5pbmRleCgnLW1hYy0nKSAr IGxlbignLW1hYy0nKTpdCisgICAgICAgIGFzc2VydCBzZWxmLl92ZXJzaW9uIGluIHNlbGYuU1VQ UE9SVEVEX09TX1ZFUlNJT05TCiAKICAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6 CiAgICAgICAgIGZhbGxiYWNrX3BhdGhzID0gc2VsZi5GQUxMQkFDS19QQVRIUwpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4u cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dp bi5weQppbmRleCAwYjZlNDk3NGI0OWQ4NjBjNmIzY2I4NDE0ZWU0ZjcwZjYzMmQ3MjgxLi40ZTc5 ZmI4YzhhOTk5ZDU4OThjNzY0ZDE2OGNlYmE4NWY3YWMyYjZlIDEwMDc1NQotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbi5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbi5weQpA QCAtMzksNiArMzksOCBAQCBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKIAog Y2xhc3MgQ2hyb21pdW1XaW5Qb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CisgICAgcG9ydF9u YW1lID0gJ2Nocm9taXVtLXdpbicKKwogICAgICMgRklYTUU6IEZpZ3VyZSBvdXQgaG93IHRvIHVu aWZ5IHRoaXMgd2l0aCBiYXNlLlRlc3RDb25maWd1cmF0aW9uLmFsbF9zeXN0ZW1zKCk/CiAgICAg U1VQUE9SVEVEX1ZFUlNJT05TID0gKCd4cCcsICd2aXN0YScsICd3aW43JykKIApAQCAtNjcsMjIg KzY5LDI0IEBAIGNsYXNzIENocm9taXVtV2luUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgog ICAgICAgICBdLAogICAgIH0KIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25h bWU9Tm9uZSwgd2luZG93c192ZXJzaW9uPU5vbmUsICoqa3dhcmdzKToKLSAgICAgICAgIyBXZSdy ZSBhIGxpdHRsZSBnZW5lcmljIGhlcmUgYmVjYXVzZSB0aGlzIGNvZGUgaXMgcmV1c2VkIGJ5IHRo ZQotICAgICAgICAjICdnb29nbGUtY2hyb21lJyBwb3J0IGFzIHdlbGwgYXMgdGhlICdtb2NrLScg YW5kICdkcnlydW4tJyBwb3J0cy4KLSAgICAgICAgcG9ydF9uYW1lID0gcG9ydF9uYW1lIG9yICdj aHJvbWl1bS13aW4nCi0gICAgICAgIGNocm9taXVtLkNocm9taXVtUG9ydC5fX2luaXRfXyhzZWxm LCBob3N0LCBwb3J0X25hbWU9cG9ydF9uYW1lLCAqKmt3YXJncykKKyAgICBAY2xhc3NtZXRob2QK KyAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGNscywgaG9zdCwgb3B0aW9ucywgcG9y dF9uYW1lKToKICAgICAgICAgaWYgcG9ydF9uYW1lLmVuZHN3aXRoKCctd2luJyk6CiAgICAgICAg ICAgICBhc3NlcnQgaG9zdC5wbGF0Zm9ybS5pc193aW4oKQogICAgICAgICAgICAgaWYgaG9zdC5w bGF0Zm9ybS5vc192ZXJzaW9uIGluICgnN3NwMCcsICc3c3AxJywgJ2Z1dHVyZScpOgotICAgICAg ICAgICAgICAgIHNlbGYuX3ZlcnNpb24gPSAnd2luNycKKyAgICAgICAgICAgICAgICB2ZXJzaW9u ID0gJ3dpbjcnCiAgICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgIHNlbGYuX3ZlcnNp b24gPSBob3N0LnBsYXRmb3JtLm9zX3ZlcnNpb24KLSAgICAgICAgICAgIHNlbGYuX25hbWUgPSBw b3J0X25hbWUgKyAnLScgKyBzZWxmLl92ZXJzaW9uCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAg ICBzZWxmLl92ZXJzaW9uID0gcG9ydF9uYW1lW3BvcnRfbmFtZS5pbmRleCgnLXdpbi0nKSArIGxl bignLXdpbi0nKTpdCi0gICAgICAgIGFzc2VydCBzZWxmLl92ZXJzaW9uIGluIHNlbGYuU1VQUE9S VEVEX1ZFUlNJT05TLCAiJXMgaXMgbm90IGluICVzIiAlIChzZWxmLl92ZXJzaW9uLCBzZWxmLlNV UFBPUlRFRF9WRVJTSU9OUykKKyAgICAgICAgICAgICAgICB2ZXJzaW9uID0gaG9zdC5wbGF0Zm9y bS5vc192ZXJzaW9uCisgICAgICAgICAgICBwb3J0X25hbWUgPSBwb3J0X25hbWUgKyAnLScgKyB2 ZXJzaW9uCisgICAgICAgIHJldHVybiBwb3J0X25hbWUKIAorICAgIGRlZiBfX2luaXRfXyhzZWxm LCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKToKKyAgICAgICAgY2hyb21pdW0uQ2hyb21pdW1Q b3J0Ll9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZSwgKiprd2FyZ3MpCisKKyAgICAgICAg IyBXZSdyZSBhIGxpdHRsZSBnZW5lcmljIGhlcmUgYmVjYXVzZSB0aGlzIGNvZGUgaXMgcmV1c2Vk IGJ5IHRoZQorICAgICAgICAjICdnb29nbGUtY2hyb21lJyBwb3J0IGFzIHdlbGwgYXMgdGhlICdt b2NrLScgYW5kICdkcnlydW4tJyBwb3J0cy4KKyAgICAgICAgc2VsZi5fdmVyc2lvbiA9IHBvcnRf bmFtZVtwb3J0X25hbWUuaW5kZXgoJy13aW4tJykgKyBsZW4oJy13aW4tJyk6XQorICAgICAgICBh c3NlcnQgc2VsZi5fdmVyc2lvbiBpbiBzZWxmLlNVUFBPUlRFRF9WRVJTSU9OUywgIiVzIGlzIG5v dCBpbiAlcyIgJSAoc2VsZi5fdmVyc2lvbiwgc2VsZi5TVVBQT1JURURfVkVSU0lPTlMpCiAKICAg ICBkZWYgc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKHNlbGYsIHNlcnZlcl9uYW1lPU5vbmUpOgog ICAgICAgICBlbnYgPSBjaHJvbWl1bS5DaHJvbWl1bVBvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2Vy dmVyKHNlbGYsIHNlcnZlcl9uYW1lKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9kcnlydW4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2RyeXJ1bi5weQppbmRleCBhNDhkMDc0NjEyMTdiNzllNTg0OGJhOTI2 Y2U1MjNiYjcxMGQwYmI2Li4yNDJhYmVlZWRkZmIzOTRiMTZlYmZiMGE4MzM2ZGU3OGVmOWMxODRh IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Ry eXJ1bi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Ry eXJ1bi5weQpAQCAtNTgsMTUgKzU4LDE2IEBAIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBv cnQgaW1wb3J0IERyaXZlciwgRHJpdmVyT3V0cHV0LCBmYWN0b3J5CiAjIGFsbCBvZiB0aGUgbWV0 aG9kcyBhcmUgcGFzc2VkIHRvIHRoZSBfX2RlbGVnYXRlLCBub3QgdG8gdGhlIGJhc2UgY2xhc3Mu CiBjbGFzcyBEcnlSdW5Qb3J0KG9iamVjdCk6CiAgICAgIiIiRHJ5UnVuIGltcGxlbWVudGF0aW9u IG9mIHRoZSBQb3J0IGludGVyZmFjZS4iIiIKKyAgICBwb3J0X25hbWUgPSAnZHJ5cnVuJwogCi0g ICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsICoqa3dhcmdzKToKLSAgICAgICAgcGZ4ID0gJ2Ry eXJ1bi0nCi0gICAgICAgIGlmICdwb3J0X25hbWUnIGluIGt3YXJnczoKLSAgICAgICAgICAgIGlm IGt3YXJnc1sncG9ydF9uYW1lJ10uc3RhcnRzd2l0aChwZngpOgotICAgICAgICAgICAgICAgIGt3 YXJnc1sncG9ydF9uYW1lJ10gPSBrd2FyZ3NbJ3BvcnRfbmFtZSddW2xlbihwZngpOl0KLSAgICAg ICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAga3dhcmdzWydwb3J0X25hbWUnXSA9IE5vbmUK LSAgICAgICAgc2VsZi5fX2RlbGVnYXRlID0gZmFjdG9yeS5Qb3J0RmFjdG9yeShob3N0KS5nZXQo Kiprd2FyZ3MpCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGRldGVybWluZV9mdWxsX3BvcnRf bmFtZShjbHMsIGhvc3QsIG9wdGlvbnMsIHBvcnRfbmFtZSk6CisgICAgICAgICIiIlJldHVybiBh IGZ1bGx5LXNwZWNpZmllZCBwb3J0IG5hbWUgdGhhdCBjYW4gYmUgdXNlZCB0byBjb25zdHJ1Y3Qg b2JqZWN0cy4iIiIKKyAgICAgICAgIyBTdWJjbGFzc2VzIHdpbGwgdXN1YWxseSBvdmVycmlkZSB0 aGlzLgorICAgICAgICByZXR1cm4gcG9ydF9uYW1lCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwg aG9zdCwgcG9ydF9uYW1lLCAqKmt3YXJncyk6CisgICAgICAgIHNlbGYuX19kZWxlZ2F0ZSA9IGZh Y3RvcnkuUG9ydEZhY3RvcnkoaG9zdCkuZ2V0KHBvcnRfbmFtZS5yZXBsYWNlKCdkcnlydW4tJywg JycpLCAqKmt3YXJncykKIAogICAgIGRlZiBfX2dldGF0dHJfXyhzZWxmLCBuYW1lKToKICAgICAg ICAgcmV0dXJuIGdldGF0dHIoc2VsZi5fX2RlbGVnYXRlLCBuYW1lKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9lZmwucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2VmbC5weQppbmRleCAzYWM3MWQ1NzE0Nzhm Mzg4M2ExZDBkZGNkNjcwZDdiZTMxYTVlOWQ4Li5hNGI3MGEzNzg5NjFlYjkxYjFhMWUzZjQxYjg1 OWU2NDJmMTc5ODZhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2VmbC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2VmbC5weQpAQCAtMzgsMTEgKzM4LDcgQEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2Vy KF9fbmFtZV9fKQogCiAKIGNsYXNzIEVmbFBvcnQoV2ViS2l0UG9ydCk6Ci0gICAgcG9ydF9uYW1l ID0gImVmbCIKLQotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCAqKmt3YXJncyk6Ci0gICAg ICAgIFdlYktpdFBvcnQuX19pbml0X18oc2VsZiwgaG9zdCwgKiprd2FyZ3MpCi0gICAgICAgIHNl bGYuX3ZlcnNpb24gPSBzZWxmLnBvcnRfbmFtZQorICAgIHBvcnRfbmFtZSA9ICdlZmwnCiAKICAg ICBkZWYgX3BvcnRfZmxhZ19mb3Jfc2NyaXB0cyhzZWxmKToKICAgICAgICAgcmV0dXJuICItLWVm bCIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv ZmFjdG9yeS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFj dG9yeS5weQppbmRleCA3MDk1MDBkMzU1ZTcwMjMwNmFkMzE4MWE1YmEyNDA5MTZlY2U3OGZlLi45 NzVlMmQ3NDU2NzBhMTYyNWFkNWFhYzVlMzY5OWY2MDgyMDI4OTU1IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnkucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5LnB5CkBAIC03NCw2 ICs3NCw3IEBAIGNsYXNzIFBvcnRGYWN0b3J5KG9iamVjdCk6CiAgICAgICAgIHBvcnRfbmFtZSBp cyBOb25lLCB0aGlzIHJvdXRpbmUgYXR0ZW1wdHMgdG8gZ3Vlc3MgYXQgdGhlIG1vc3QKICAgICAg ICAgYXBwcm9wcmlhdGUgcG9ydCBvbiB0aGlzIHBsYXRmb3JtLiIiIgogICAgICAgICBwb3J0X3Rv X3VzZSA9IHNlbGYuX3BvcnRfbmFtZV9mcm9tX2FyZ3VtZW50c19hbmRfb3B0aW9ucyhwb3J0X25h bWUsIG9wdGlvbnMsIHNlbGYuX2hvc3QucGxhdGZvcm0pCisgICAgICAgIHBvcnRfbmFtZSA9IHBv cnRfbmFtZSBvciBwb3J0X3RvX3VzZQogICAgICAgICBpZiBwb3J0X3RvX3VzZS5zdGFydHN3aXRo KCd0ZXN0Jyk6CiAgICAgICAgICAgICBpbXBvcnQgdGVzdAogICAgICAgICAgICAgbWFrZXIgPSB0 ZXN0LlRlc3RQb3J0CkBAIC0xMzcsNyArMTM4LDggQEAgY2xhc3MgUG9ydEZhY3Rvcnkob2JqZWN0 KToKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3Io J3Vuc3VwcG9ydGVkIHBvcnQ6ICVzJyAlIHBvcnRfdG9fdXNlKQogCi0gICAgICAgIHJldHVybiBt YWtlcihzZWxmLl9ob3N0LCBwb3J0X25hbWU9cG9ydF9uYW1lLCBvcHRpb25zPW9wdGlvbnMsICoq a3dhcmdzKQorICAgICAgICBwb3J0X25hbWUgPSBtYWtlci5kZXRlcm1pbmVfZnVsbF9wb3J0X25h bWUoc2VsZi5faG9zdCwgb3B0aW9ucywgcG9ydF9uYW1lKQorICAgICAgICByZXR1cm4gbWFrZXIo c2VsZi5faG9zdCwgcG9ydF9uYW1lLCBvcHRpb25zPW9wdGlvbnMsICoqa3dhcmdzKQogCiAgICAg ZGVmIGFsbF9wb3J0X25hbWVzKHNlbGYpOgogICAgICAgICAiIiJSZXR1cm4gYSBsaXN0IG9mIGFs bCB2YWxpZCwgZnVsbHktc3BlY2lmaWVkLCAicmVhbCIgcG9ydCBuYW1lcy4KZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeV91bml0dGVz dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeV91 bml0dGVzdC5weQppbmRleCAxYjFmZjNmM2ZjYjkyZmJiNzdkODMxODlmNmY4ZmY4MzhlM2ZhNGNk Li5iNTY3ZjczYjg5Njg4ZWUwN2I5NmE5NzBiYmRmYWQ2ZDg3MGYzNzlhIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnlfdW5pdHRlc3Qu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5 X3VuaXR0ZXN0LnB5CkBAIC01Nyw3ICs1Nyw5IEBAIGNsYXNzIEZhY3RvcnlUZXN0KHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICBkZWYgYXNzZXJ0X3BvcnQoc2VsZiwgcG9ydF9uYW1lPU5vbmUsIG9z X25hbWU9Tm9uZSwgb3NfdmVyc2lvbj1Ob25lLCBvcHRpb25zPU5vbmUsIGNscz1Ob25lKToKICAg ICAgICAgaG9zdCA9IE1vY2tTeXN0ZW1Ib3N0KG9zX25hbWU9b3NfbmFtZSwgb3NfdmVyc2lvbj1v c192ZXJzaW9uKQogICAgICAgICBwb3J0ID0gUG9ydEZhY3RvcnkoaG9zdCkuZ2V0KHBvcnRfbmFt ZSwgb3B0aW9ucz1vcHRpb25zKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoaXNpbnN0YW5jZShw b3J0LCBjbHMpKQorICAgICAgICAjIEZJWE1FOiBUaGlzIHdpbGwgZmFpbCB1bnRpbCB3ZSBmaW5p c2ggcmVmYWN0b3JpbmcgZmFjdG9yeS5weS4KKyAgICAgICAgIyBzZWxmLmFzc2VydFRydWUoaXNp bnN0YW5jZShwb3J0LCBjbHMpKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0Ll9fY2xh c3NfXy5fX25hbWVfXywgY2xzLl9fbmFtZV9fKQogCiAgICAgZGVmIHRlc3RfbWFjKHNlbGYpOgog ICAgICAgICBzZWxmLmFzc2VydF9wb3J0KHBvcnRfbmFtZT0nbWFjJywgY2xzPW1hYy5NYWNQb3J0 KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9n b29nbGVfY2hyb21lLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9nb29nbGVfY2hyb21lLnB5CmluZGV4IDFkNzc4MzEyNjg0ZjlhNjI2MWI1MmE1YjMxYzMxYmU0 Njc3NDBlY2YuLjUxZjgzZGVkMWQ3MGFhYTZhMWE4OThiNDUzNmZiMTNiYTcwYjA2YmMgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ29vZ2xlX2No cm9tZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2dv b2dsZV9jaHJvbWUucHkKQEAgLTQ3LDYgKzQ3LDEzIEBAIGRlZiBfdGVzdF9leHBlY3RhdGlvbnNf b3ZlcnJpZGVzKHBvcnQsIHN1cGVyKToKIAogCiBjbGFzcyBHb29nbGVDaHJvbWVMaW51eDMyUG9y dChjaHJvbWl1bV9saW51eC5DaHJvbWl1bUxpbnV4UG9ydCk6CisgICAgcG9ydF9uYW1lID0gJ2dv b2dsZS1jaHJvbWUtbGludXgzMicKKworICAgICMgRklYTUU6IE1ha2UgZ29vZ2xlLWNocm9tZS1Y WFggd29yayBhcyBhIHBvcnQgbmFtZS4KKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZGV0ZXJt aW5lX2Z1bGxfcG9ydF9uYW1lKGNscywgaG9zdCwgb3B0aW9ucywgcG9ydF9uYW1lKToKKyAgICAg ICAgcmV0dXJuICdjaHJvbWl1bS1saW51eC14ODYnCisKICAgICBkZWYgYmFzZWxpbmVfc2VhcmNo X3BhdGgoc2VsZik6CiAgICAgICAgIHBhdGhzID0gY2hyb21pdW1fbGludXguQ2hyb21pdW1MaW51 eFBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZikKICAgICAgICAgcGF0aHMuaW5zZXJ0KDAs IHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdnb29nbGUtY2hyb21lLWxpbnV4MzInKSkKQEAg LTYwLDYgKzY3LDEzIEBAIGNsYXNzIEdvb2dsZUNocm9tZUxpbnV4MzJQb3J0KGNocm9taXVtX2xp bnV4LkNocm9taXVtTGludXhQb3J0KToKIAogCiBjbGFzcyBHb29nbGVDaHJvbWVMaW51eDY0UG9y dChjaHJvbWl1bV9saW51eC5DaHJvbWl1bUxpbnV4UG9ydCk6CisgICAgcG9ydF9uYW1lID0gJ2dv b2dsZS1jaHJvbWUtbGludXg2NCcKKworICAgICMgRklYTUU6IE1ha2UgZ29vZ2xlLWNocm9tZS1Y WFggd29yayBhcyBhIHBvcnQgbmFtZS4KKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZGV0ZXJt aW5lX2Z1bGxfcG9ydF9uYW1lKGNscywgaG9zdCwgb3B0aW9ucywgcG9ydF9uYW1lKToKKyAgICAg ICAgcmV0dXJuICdjaHJvbWl1bS1saW51eC14ODZfNjQnCisKICAgICBkZWYgYmFzZWxpbmVfc2Vh cmNoX3BhdGgoc2VsZik6CiAgICAgICAgIHBhdGhzID0gY2hyb21pdW1fbGludXguQ2hyb21pdW1M aW51eFBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZikKICAgICAgICAgcGF0aHMuaW5zZXJ0 KDAsIHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdnb29nbGUtY2hyb21lLWxpbnV4NjQnKSkK QEAgLTczLDYgKzg3LDEzIEBAIGNsYXNzIEdvb2dsZUNocm9tZUxpbnV4NjRQb3J0KGNocm9taXVt X2xpbnV4LkNocm9taXVtTGludXhQb3J0KToKIAogCiBjbGFzcyBHb29nbGVDaHJvbWVNYWNQb3J0 KGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQpOgorICAgIHBvcnRfbmFtZSA9ICdnb29nbGUt Y2hyb21lLW1hYycKKworICAgICMgRklYTUU6IE1ha2UgZ29vZ2xlLWNocm9tZS1YWFggd29yayBh cyBhIHBvcnQgbmFtZS4KKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxf cG9ydF9uYW1lKGNscywgaG9zdCwgb3B0aW9ucywgcG9ydF9uYW1lKToKKyAgICAgICAgcmV0dXJu ICdjaHJvbWl1bS1tYWMtbGVvcGFyZCcKKwogICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChz ZWxmKToKICAgICAgICAgcGF0aHMgPSBjaHJvbWl1bV9tYWMuQ2hyb21pdW1NYWNQb3J0LmJhc2Vs aW5lX3NlYXJjaF9wYXRoKHNlbGYpCiAgICAgICAgIHBhdGhzLmluc2VydCgwLCBzZWxmLl93ZWJr aXRfYmFzZWxpbmVfcGF0aCgnZ29vZ2xlLWNocm9tZS1tYWMnKSkKQEAgLTgzLDYgKzEwNCwxMyBA QCBjbGFzcyBHb29nbGVDaHJvbWVNYWNQb3J0KGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQp OgogCiAKIGNsYXNzIEdvb2dsZUNocm9tZVdpblBvcnQoY2hyb21pdW1fd2luLkNocm9taXVtV2lu UG9ydCk6CisgICAgcG9ydF9uYW1lID0gJ2dvb2dsZS1jaHJvbWUtd2luJworCisgICAgIyBGSVhN RTogTWFrZSBnb29nbGUtY2hyb21lLVhYWCB3b3JrIGFzIGEgcG9ydCBuYW1lLgorICAgIEBjbGFz c21ldGhvZAorICAgIGRlZiBkZXRlcm1pbmVfZnVsbF9wb3J0X25hbWUoY2xzLCBob3N0LCBvcHRp b25zLCBwb3J0X25hbWUpOgorICAgICAgICByZXR1cm4gJ2Nocm9taXVtLXdpbi14cCcKKwogICAg IGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKICAgICAgICAgcGF0aHMgPSBjaHJvbWl1 bV93aW4uQ2hyb21pdW1XaW5Qb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpCiAgICAgICAg IHBhdGhzLmluc2VydCgwLCBzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCgnZ29vZ2xlLWNocm9t ZS13aW4nKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvZ3RrLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9n dGsucHkKaW5kZXggM2Y1NjMwNGYxMDgzZjEzZjU5ZWZlZGVkMTkxNDU2YmYyYmQ3M2JlMC4uNmRl ZGQyZDcwNjA3MWNjZGM0YTQ5ODUxY2M2ZDI2YzgwMTAyNGFkYiAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkKQEAgLTc2LDEwICs3Niw2IEBA IGNsYXNzIEd0a0RyaXZlcihXZWJLaXREcml2ZXIpOgogY2xhc3MgR3RrUG9ydChXZWJLaXRQb3J0 KToKICAgICBwb3J0X25hbWUgPSAiZ3RrIgogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3Qs ICoqa3dhcmdzKToKLSAgICAgICAgV2ViS2l0UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCAqKmt3 YXJncykKLSAgICAgICAgc2VsZi5fdmVyc2lvbiA9IHNlbGYucG9ydF9uYW1lCi0KICAgICBkZWYg X3BvcnRfZmxhZ19mb3Jfc2NyaXB0cyhzZWxmKToKICAgICAgICAgcmV0dXJuICItLWd0ayIKIApk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQppbmRl eCBjMTFjMGEwYTNhMDE3NDhhNWYxOGQxMzVhOTBmNWM0NmNjZTEzNDY3Li4xYjJkOGUzMzkxZmI2 N2NiNzJmMzkyOGFiYWEyNDJjMzBiNjFmNWFmIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQpAQCAtNDIsOCArNDIsMTkgQEAgY2xhc3MgTWFj UG9ydChBcHBsZVBvcnQpOgogICAgICMgYW5kIHRoZSBvcmRlciBvZiBmYWxsYmFjayBiZXR3ZWVu IHRoZW0uICBNYXRjaGVzIE9SV1QuCiAgICAgVkVSU0lPTl9GQUxMQkFDS19PUkRFUiA9IFsibWFj LWxlb3BhcmQiLCAibWFjLXNub3dsZW9wYXJkIiwgIm1hYy1saW9uIiwgIm1hYyJdCiAKLSAgICBk ZWYgX19pbml0X18oc2VsZiwgaG9zdCwgKiprd2FyZ3MpOgotICAgICAgICBBcHBsZVBvcnQuX19p bml0X18oc2VsZiwgaG9zdCwgKiprd2FyZ3MpCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGRl dGVybWluZV9mdWxsX3BvcnRfbmFtZShjbHMsIGhvc3QsIG9wdGlvbnMsIHBvcnRfbmFtZSk6Cisg ICAgICAgIGlmIHBvcnRfbmFtZS5lbmRzd2l0aCgnLXdrMicpOgorICAgICAgICAgICAgIyBGSVhN RTogVGhpcyBtYXkgYmUgd3JvbmcsIHNpbmNlIG9wdGlvbnMgaXMgYSBnbG9iYWwgcHJvcGVydHks IGFuZCB0aGUgcG9ydF9uYW1lIGlzIHNwZWNpZmljIHRvIHRoaXMgb2JqZWN0PworICAgICAgICAg ICAgaWYgb3B0aW9ucyBhbmQgbm90IGhhc2F0dHIob3B0aW9ucywgJ3dlYmtpdF90ZXN0X3J1bm5l cicpOgorICAgICAgICAgICAgICAgIG9wdGlvbnMud2Via2l0X3Rlc3RfcnVubmVyID0gVHJ1ZQor ICAgICAgICAgICAgcG9ydF9uYW1lID0gcG9ydF9uYW1lLnJlcGxhY2UoJy13azInLCAnJykKKyAg ICAgICAgaWYgcG9ydF9uYW1lLmVuZHN3aXRoKCdtYWMnKToKKyAgICAgICAgICAgIHJldHVybiBw b3J0X25hbWUgKyAnLScgKyBob3N0LnBsYXRmb3JtLm9zX3ZlcnNpb24KKyAgICAgICAgcmV0dXJu IHBvcnRfbmFtZQorCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZSwgKipr d2FyZ3MpOgorICAgICAgICBBcHBsZVBvcnQuX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1l LCAqKmt3YXJncykKICAgICAgICAgc2VsZi5fbGVha19kZXRlY3RvciA9IExlYWtEZXRlY3Rvcihz ZWxmKQogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oImxlYWtzIik6CiAgICAgICAgICAgICAj IER1bXBSZW5kZXJUcmVlIHNsb3dzIGRvd24gbm90aWNhYmx5IGlmIHdlIHJ1biBtb3JlIHRoYW4g YWJvdXQgMTAwMCB0ZXN0cyBpbiBhIGJhdGNoCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5CmluZGV4IDg5NjVmYjg0 YzJhNDRhOGZhOWFmNDg2ZGVkMjA1YTczOTUyODQyNGIuLjczNzY2Mjk2YzRlYzM3MDhiYjNjMTU4 NWI3NjdiZDdlMmE1MTdlYTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5CkBAIC05OCwyMyArOTgsMTkgQEAg amF2YS8KICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQudmVyc2lvbigpKQogCiAgICAgZGVm IHRlc3RfdmVyc2lvbnMoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJ2xl b3BhcmQnLCAnbWFjLWxlb3BhcmQnKQogICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdtYWMnLCAn bGVvcGFyZCcsICdtYWMtbGVvcGFyZCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ21hYy1s ZW9wYXJkJywgJ3RpZ2VyJywgJ21hYy1sZW9wYXJkJykKICAgICAgICAgc2VsZi5hc3NlcnRfbmFt ZSgnbWFjLWxlb3BhcmQnLCAnbGVvcGFyZCcsICdtYWMtbGVvcGFyZCcpCiAgICAgICAgIHNlbGYu YXNzZXJ0X25hbWUoJ21hYy1sZW9wYXJkJywgJ3Nub3dsZW9wYXJkJywgJ21hYy1sZW9wYXJkJykK IAotICAgICAgICBzZWxmLmFzc2VydF9uYW1lKE5vbmUsICdzbm93bGVvcGFyZCcsICdtYWMtc25v d2xlb3BhcmQnKQogICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdtYWMnLCAnc25vd2xlb3BhcmQn LCAnbWFjLXNub3dsZW9wYXJkJykKICAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnbWFjLXNub3ds ZW9wYXJkJywgJ3RpZ2VyJywgJ21hYy1zbm93bGVvcGFyZCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0 X25hbWUoJ21hYy1zbm93bGVvcGFyZCcsICdsZW9wYXJkJywgJ21hYy1zbm93bGVvcGFyZCcpCiAg ICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ21hYy1zbm93bGVvcGFyZCcsICdzbm93bGVvcGFyZCcs ICdtYWMtc25vd2xlb3BhcmQnKQogCi0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJ2xp b24nLCAnbWFjLWxpb24nKQogICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdtYWMnLCAnbGlvbics ICdtYWMtbGlvbicpCiAgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ21hYy1saW9uJywgJ2xpb24n LCAnbWFjLWxpb24nKQogCi0gICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoTm9uZSwgJ2Z1dHVyZScs ICdtYWMtZnV0dXJlJykKICAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnbWFjJywgJ2Z1dHVyZScs ICdtYWMtZnV0dXJlJykKICAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnbWFjLWZ1dHVyZScsICdm dXR1cmUnLCAnbWFjLWZ1dHVyZScpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0LnB5CmluZGV4IGQ1MzU5ZGVjNzk1MGNhNjE0N2Iz MWZjNDZjNGJiODQxZjU0M2M1ZmEuLmYyODRlNzY5ZmU5MjNmNzkwN2RhMjhmZWM3NGM2YTgyODNm MjYzNzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvbW9ja19kcnQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9tb2NrX2RydC5weQpAQCAtNTAsMTQgKzUwLDE4IEBAIF9sb2cgPSBsb2dnaW5nLmdldExv Z2dlcihfX25hbWVfXykKIAogY2xhc3MgTW9ja0RSVFBvcnQob2JqZWN0KToKICAgICAiIiJNb2Nr UG9ydCBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgUG9ydCBpbnRlcmZhY2UuIiIiCisgICAgcG9ydF9u YW1lID0gJ21vY2snCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgKiprd2FyZ3MpOgot ICAgICAgICBwcmVmaXggPSAnbW9jay0nCi0gICAgICAgIGlmICdwb3J0X25hbWUnIGluIGt3YXJn czoKLSAgICAgICAgICAgIGt3YXJnc1sncG9ydF9uYW1lJ10gPSBrd2FyZ3NbJ3BvcnRfbmFtZSdd W2xlbihwcmVmaXgpOl0KKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxf cG9ydF9uYW1lKGNscywgaG9zdCwgb3B0aW9ucywgcG9ydF9uYW1lKToKKyAgICAgICAgIiIiUmV0 dXJuIGEgZnVsbHktc3BlY2lmaWVkIHBvcnQgbmFtZSB0aGF0IGNhbiBiZSB1c2VkIHRvIGNvbnN0 cnVjdCBvYmplY3RzLiIiIgorICAgICAgICAjIFN1YmNsYXNzZXMgd2lsbCB1c3VhbGx5IG92ZXJy aWRlIHRoaXMuCisgICAgICAgIHJldHVybiBwb3J0X25hbWUKKworICAgIGRlZiBfX2luaXRfXyhz ZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKToKKyAgICAgICAgc2VsZi5fX2RlbGVnYXRl ID0gUG9ydEZhY3RvcnkoaG9zdCkuZ2V0KHBvcnRfbmFtZS5yZXBsYWNlKCdtb2NrLScsICcnKSwg Kiprd2FyZ3MpCisgICAgICAgIHNlbGYuX19yZWFsX25hbWUgPSBwb3J0X25hbWUKICAgICAgICAg c2VsZi5faG9zdCA9IGhvc3QKLSAgICAgICAgc2VsZi5fX2RlbGVnYXRlID0gUG9ydEZhY3Rvcnko aG9zdCkuZ2V0KCoqa3dhcmdzKQotICAgICAgICBzZWxmLl9fcmVhbF9uYW1lID0gcHJlZml4ICsg c2VsZi5fX2RlbGVnYXRlLm5hbWUoKQogCiAgICAgZGVmIHJlYWxfbmFtZShzZWxmKToKICAgICAg ICAgcmV0dXJuIHNlbGYuX19yZWFsX25hbWUKQEAgLTE3NCw2ICsxNzgsMTIgQEAgY2xhc3MgX0RS VElucHV0KG9iamVjdCk6CiAKIAogY2xhc3MgTW9ja0RSVChvYmplY3QpOgorICAgIEBjbGFzc21l dGhvZAorICAgIGRlZiBkZXRlcm1pbmVfZnVsbF9wb3J0X25hbWUoY2xzLCBob3N0LCBvcHRpb25z LCBwb3J0X25hbWUpOgorICAgICAgICAiIiJSZXR1cm4gYSBmdWxseS1zcGVjaWZpZWQgcG9ydCBu YW1lIHRoYXQgY2FuIGJlIHVzZWQgdG8gY29uc3RydWN0IG9iamVjdHMuIiIiCisgICAgICAgICMg U3ViY2xhc3NlcyB3aWxsIHVzdWFsbHkgb3ZlcnJpZGUgdGhpcy4KKyAgICAgICAgcmV0dXJuIGNs cy5wb3J0X25hbWUKKwogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBvcHRpb25zLCBhcmdzLCBob3N0 LCBzdGRpbiwgc3Rkb3V0LCBzdGRlcnIpOgogICAgICAgICBzZWxmLl9vcHRpb25zID0gb3B0aW9u cwogICAgICAgICBzZWxmLl9hcmdzID0gYXJncwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CmluZGV4IGEwMjFj YmM5OGU2MzcwODQ0MzNmNTlhNGI3OWU4YWJmZWM2NTllM2IuLjA3YjM2NTdiYmYzZDk0OTY1Yzdk MjUxMDdkM2Q4OWRlOTVlOTIzODQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3BvcnRfdGVzdGNhc2UucHkKQEAgLTU5LDEwICs1OSwx MiBAQCBjbGFzcyBQb3J0VGVzdENhc2UodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIG9zX3ZlcnNp b24gPSBOb25lCiAgICAgcG9ydF9tYWtlciA9IE5vbmUKIAotICAgIGRlZiBtYWtlX3BvcnQoc2Vs ZiwgaG9zdD1Ob25lLCBvcHRpb25zPU5vbmUsIG9zX25hbWU9Tm9uZSwgb3NfdmVyc2lvbj1Ob25l LCAqKmt3YXJncyk6CisgICAgZGVmIG1ha2VfcG9ydChzZWxmLCBob3N0PU5vbmUsIHBvcnRfbmFt ZT1Ob25lLCBvcHRpb25zPU5vbmUsIG9zX25hbWU9Tm9uZSwgb3NfdmVyc2lvbj1Ob25lLCAqKmt3 YXJncyk6CiAgICAgICAgIGhvc3QgPSBob3N0IG9yIE1vY2tTeXN0ZW1Ib3N0KG9zX25hbWU9KG9z X25hbWUgb3Igc2VsZi5vc19uYW1lKSwgb3NfdmVyc2lvbj0ob3NfdmVyc2lvbiBvciBzZWxmLm9z X3ZlcnNpb24pKQogICAgICAgICBvcHRpb25zID0gb3B0aW9ucyBvciBNb2NrT3B0aW9ucyhjb25m aWd1cmF0aW9uPSdSZWxlYXNlJykKLSAgICAgICAgcmV0dXJuIHNlbGYucG9ydF9tYWtlcihob3N0 LCBvcHRpb25zPW9wdGlvbnMsICoqa3dhcmdzKQorICAgICAgICBwb3J0X25hbWUgPSBwb3J0X25h bWUgb3Igc2VsZi5wb3J0X25hbWUKKyAgICAgICAgcG9ydF9uYW1lID0gc2VsZi5wb3J0X21ha2Vy LmRldGVybWluZV9mdWxsX3BvcnRfbmFtZShob3N0LCBvcHRpb25zLCBwb3J0X25hbWUpCisgICAg ICAgIHJldHVybiBzZWxmLnBvcnRfbWFrZXIoaG9zdCwgcG9ydF9uYW1lPShwb3J0X25hbWUgb3Ig c2VsZi5wb3J0X25hbWUpLCBvcHRpb25zPW9wdGlvbnMsICoqa3dhcmdzKQogCiAgICAgZGVmIHRl c3RfZGVmYXVsdF93b3JrZXJfbW9kZWwoc2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2Vf cG9ydCgpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3F0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5w eQppbmRleCA3MDEzNzVlMWUyYjY2ZjA3MDgwZTBlNzE3MDBjMjVlYWQ2YzUyNzEzLi4yNDQ1ODc2 OGM3MTgzNmRmMjNmZWQ1MWQ1YjM4NjczYjdlODcyYjgwIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKQEAgLTQ5LDIzICs0OSwyMiBAQCBjbGFz cyBRdFBvcnQoV2ViS2l0UG9ydCk6CiAgICAgZGVmIF9wb3J0X2ZsYWdfZm9yX3NjcmlwdHMoc2Vs Zik6CiAgICAgICAgIHJldHVybiAiLS1xdCIKIAorICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBk ZXRlcm1pbmVfZnVsbF9wb3J0X25hbWUoY2xzLCBob3N0LCBvcHRpb25zLCBwb3J0X25hbWUpOgor ICAgICAgICBpZiBwb3J0X25hbWUgYW5kIHBvcnRfbmFtZSAhPSBjbHMucG9ydF9uYW1lOgorICAg ICAgICAgICAgcmV0dXJuIHBvcnRfbmFtZQorICAgICAgICByZXR1cm4gcG9ydF9uYW1lICsgJy0n ICsgaG9zdC5wbGF0Zm9ybS5vc19uYW1lCisKICAgICAjIHN5c19wbGF0Zm9ybSBleGlzdHMgb25s eSBmb3IgdW5pdCB0ZXN0aW5nLgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25h bWU9Tm9uZSwgKiprd2FyZ3MpOgotICAgICAgICBwb3J0X25hbWUgPSBwb3J0X25hbWUgb3Igc2Vs Zi5wb3J0X25hbWUKLSAgICAgICAgV2ViS2l0UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0 X25hbWU9Tm9uZSwgKiprd2FyZ3MpCi0gICAgICAgIHNlbGYuX29wZXJhdGluZ19zeXN0ZW0gPSBo b3N0LnBsYXRmb3JtLm9zX25hbWUKLSAgICAgICAgc2VsZi5fdmVyc2lvbiA9IHNlbGYub3BlcmF0 aW5nX3N5c3RlbSgpCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZSwgKipr d2FyZ3MpOgorICAgICAgICBXZWJLaXRQb3J0Ll9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFt ZSwgKiprd2FyZ3MpCiAKICAgICAgICAgIyBGSVhNRTogVGhpcyB3aWxsIGFsbG93IFdlYktpdFBv cnQuYmFzZWxpbmVfc2VhcmNoX3BhdGggYW5kIFdlYktpdFBvcnQuX3NraXBwZWRfZmlsZV9zZWFy Y2hfcGF0aHMKICAgICAgICAgIyB0byBkbyB0aGUgcmlnaHQgdGhpbmcsIGJ1dCBkb2Vzbid0IGlu Y2x1ZGUgc3VwcG9ydCBmb3IgcXQtNC44IG9yIHF0LWFybSAoc2VlbiBpbiBMYXlvdXRUZXN0cy9w bGF0Zm9ybSkgeWV0LgorICAgICAgICBzZWxmLl9vcGVyYXRpbmdfc3lzdGVtID0gcG9ydF9uYW1l LnJlcGxhY2UoJ3F0LScsICcnKQogCi0gICAgICAgIGlmIHBvcnRfbmFtZSAhPSBzZWxmLnBvcnRf bmFtZToKLSAgICAgICAgICAgIHNlbGYuX25hbWUgPSBwb3J0X25hbWUKLSAgICAgICAgZWxzZToK LSAgICAgICAgICAgIG5hbWVfY29tcG9uZW50cyA9IFtzZWxmLnBvcnRfbmFtZV0KLSAgICAgICAg ICAgIGlmIHNlbGYub3BlcmF0aW5nX3N5c3RlbSgpOgotICAgICAgICAgICAgICAgIG5hbWVfY29t cG9uZW50cy5hcHBlbmQoc2VsZi5vcGVyYXRpbmdfc3lzdGVtKCkpCi0gICAgICAgICAgICBzZWxm Ll9uYW1lID0gIi0iLmpvaW4obmFtZV9jb21wb25lbnRzKQorICAgICAgICAjIEZJWE1FOiBXaHkg aXMgdGhpcyBiZWluZyBzZXQgYXQgYWxsPworICAgICAgICBzZWxmLl92ZXJzaW9uID0gc2VsZi5v cGVyYXRpbmdfc3lzdGVtKCkKIAogICAgIGRlZiBfZ2VuZXJhdGVfYWxsX3Rlc3RfY29uZmlndXJh dGlvbnMoc2VsZik6CiAgICAgICAgIGNvbmZpZ3VyYXRpb25zID0gW10KZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weQppbmRleCAwZDUxY2Y5MDEy Yjg3ODQ1ZjcxMmU4YWZhZGZiOWE1YzZkOGE2YzQyLi40Y2MyNGEzODc1ZmYyYjU5ZjU3N2MxYTdh N2QzNjE1MzAxZjdhZTI1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3Rlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC90ZXN0LnB5CkBAIC0zMDQsNiArMzA0LDggQEAgV09OVEZJWCBTS0lQIDogZmFp bHVyZXMvZXhwZWN0ZWQvZXhjZXB0aW9uLmh0bWwgPSBDUkFTSAogCiAKIGNsYXNzIFRlc3RQb3J0 KFBvcnQpOgorICAgIHBvcnRfbmFtZSA9ICd0ZXN0JworCiAgICAgIiIiVGVzdCBpbXBsZW1lbnRh dGlvbiBvZiB0aGUgUG9ydCBpbnRlcmZhY2UuIiIiCiAgICAgQUxMX0JBU0VMSU5FX1ZBUklBTlRT ID0gKAogICAgICAgICAndGVzdC1tYWMtc25vd2xlb3BhcmQnLCAndGVzdC1tYWMtbGVvcGFyZCcs CkBAIC0zMTEsMTYgKzMxMywyMSBAQCBjbGFzcyBUZXN0UG9ydChQb3J0KToKICAgICAgICAgJ3Rl c3QtbGludXgteDg2XzY0JywKICAgICApCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwg cG9ydF9uYW1lPU5vbmUsICoqa3dhcmdzKToKLSAgICAgICAgaWYgbm90IHBvcnRfbmFtZSBvciBw b3J0X25hbWUgPT0gJ3Rlc3QnOgotICAgICAgICAgICAgcG9ydF9uYW1lID0gJ3Rlc3QtbWFjLWxl b3BhcmQnCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGRldGVybWluZV9mdWxsX3BvcnRfbmFt ZShjbHMsIGhvc3QsIG9wdGlvbnMsIHBvcnRfbmFtZSk6CisgICAgICAgIGlmIHBvcnRfbmFtZSA9 PSAndGVzdCc6CisgICAgICAgICAgICByZXR1cm4gJ3Rlc3QtbWFjLWxlb3BhcmQnCisgICAgICAg IHJldHVybiBwb3J0X25hbWUKIAorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25h bWU9Tm9uZSwgKiprd2FyZ3MpOgorICAgICAgICAjIEZJWE1FOiBDb25zaWRlciB1cGRhdGluZyBh bGwgb2YgdGhlIGNhbGxlcnMgdG8gcGFzcyBpbiBhIHBvcnRfbmFtZSBzbyBpdCBjYW4gYmUgYQor ICAgICAgICAjIHJlcXVpcmVkIHBhcmFtZXRlciBsaWtlIGFsbCBvZiB0aGUgb3RoZXIgUG9ydCBv YmplY3RzLgorICAgICAgICBwb3J0X25hbWUgPSBwb3J0X25hbWUgb3IgJ3Rlc3QtbWFjLWxlb3Bh cmQnCisgICAgICAgIFBvcnQuX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lLCAqKmt3YXJn cykKICAgICAgICAgc2VsZi5fdGVzdHMgPSB1bml0X3Rlc3RfbGlzdCgpCiAgICAgICAgIHNlbGYu X2V4cGVjdGF0aW9uc19wYXRoID0gTEFZT1VUX1RFU1RfRElSICsgJy9wbGF0Zm9ybS90ZXN0L3Rl c3RfZXhwZWN0YXRpb25zLnR4dCcKICAgICAgICAgc2VsZi5fcmVzdWx0c19kaXJlY3RvcnkgPSBO b25lCiAKLSAgICAgICAgUG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWU9cG9ydF9u YW1lLCAqKmt3YXJncykKLQogICAgICAgICBzZWxmLl9vcGVyYXRpbmdfc3lzdGVtID0gJ21hYycK ICAgICAgICAgaWYgcG9ydF9uYW1lLnN0YXJ0c3dpdGgoJ3Rlc3Qtd2luJyk6CiAgICAgICAgICAg ICBzZWxmLl9vcGVyYXRpbmdfc3lzdGVtID0gJ3dpbicKQEAgLTMzNyw3ICszNDQsNiBAQCBjbGFz cyBUZXN0UG9ydChQb3J0KToKICAgICAgICAgfQogICAgICAgICBzZWxmLl92ZXJzaW9uID0gdmVy c2lvbl9tYXBbcG9ydF9uYW1lXQogCi0KICAgICBkZWYgX3BhdGhfdG9fZHJpdmVyKHNlbGYpOgog ICAgICAgICAjIFRoaXMgcm91dGluZSBzaG91bGRuJ3Qgbm9ybWFsbHkgYmUgY2FsbGVkLCBidXQg aXQgaXMgY2FsbGVkIGJ5CiAgICAgICAgICMgdGhlIG1vY2tfZHJ0IERyaXZlci4gV2UgcmV0dXJu IHNvbWV0aGluZywgYnV0IG1ha2Ugc3VyZSBpdCdzIHVzZWxlc3MuCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CmluZGV4IGNkZDZhZjJk NmI2NjYwODkzN2E5ZTQ4ZDliOTU5YjE2ZTZjMzM1YWIuLjZiYmRhY2M2NDdiZjI2NGQ0ZmMwYzUx YTYwOWE5ZjkxZjIzMjIyNmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CkBAIC01MSw4ICs1MSw4IEBAIF9sb2cgPSBsb2dnaW5n LmdldExvZ2dlcihfX25hbWVfXykKIAogCiBjbGFzcyBXZWJLaXRQb3J0KFBvcnQpOgotICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBob3N0LCAqKmt3YXJncyk6Ci0gICAgICAgIFBvcnQuX19pbml0X18o c2VsZiwgaG9zdCwgKiprd2FyZ3MpCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRf bmFtZT1Ob25lLCAqKmt3YXJncyk6CisgICAgICAgIFBvcnQuX19pbml0X18oc2VsZiwgaG9zdCwg cG9ydF9uYW1lPXBvcnRfbmFtZSwgKiprd2FyZ3MpCiAKICAgICAgICAgIyBGSVhNRTogRGlzYWJs ZSBwaXhlbCB0ZXN0cyB1bnRpbCB0aGV5IGFyZSBydW4gYnkgZGVmYXVsdCBvbiBidWlsZC53ZWJr aXQub3JnLgogICAgICAgICBzZWxmLnNldF9vcHRpb25fZGVmYXVsdCgicGl4ZWxfdGVzdHMiLCBG YWxzZSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvd2luLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4u cHkKaW5kZXggMzIzYmMxZGJmM2NlYjljZGY5M2RkNzgyNjU3MTgyNzhjNzBiM2RjNC4uNmE3MjIx OTM3ZjAyY2NjMTdiZWQzNTM1MGM4MGE4N2E1MGExNzJjYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHkKQEAgLTQ1LDYgKzQ1LDIwIEBAIGNs YXNzIFdpblBvcnQoQXBwbGVQb3J0KToKICAgICAjIGFuZCB0aGUgb3JkZXIgb2YgZmFsbGJhY2sg YmV0d2VlbiB0aGVtLiAgTWF0Y2hlcyBPUldULgogICAgIFZFUlNJT05fRkFMTEJBQ0tfT1JERVIg PSBbIndpbi14cCIsICJ3aW4tdmlzdGEiLCAid2luLTdzcDAiLCAid2luIl0KIAorICAgIEBjbGFz c21ldGhvZAorICAgIGRlZiBkZXRlcm1pbmVfZnVsbF9wb3J0X25hbWUoY2xzLCBob3N0LCBvcHRp b25zLCBwb3J0X25hbWUpOgorICAgICAgICBpZiBwb3J0X25hbWUuZW5kc3dpdGgoJy13azInKToK KyAgICAgICAgICAgICMgRklYTUU6IFRoaXMgbWF5IGJlIHdyb25nLCBzaW5jZSBvcHRpb25zIGlz IGEgZ2xvYmFsIHByb3BlcnR5LCBhbmQgdGhlIHBvcnRfbmFtZSBpcyBzcGVjaWZpYyB0byB0aGlz IG9iamVjdD8KKyAgICAgICAgICAgIGlmIG9wdGlvbnMgYW5kIG5vdCBoYXNhdHRyKG9wdGlvbnMs ICd3ZWJraXRfdGVzdF9ydW5uZXInKToKKyAgICAgICAgICAgICAgICBvcHRpb25zLndlYmtpdF90 ZXN0X3J1bm5lciA9IFRydWUKKyAgICAgICAgICAgIHBvcnRfbmFtZSA9IHBvcnRfbmFtZS5yZXBs YWNlKCctd2syJywgJycpCisgICAgICAgIGlmIHBvcnRfbmFtZS5lbmRzd2l0aCgnd2luJyk6Cisg ICAgICAgICAgICBpZiBob3N0LnBsYXRmb3JtLm9zX25hbWUgIT0gJ3dpbic6CisgICAgICAgICAg ICAgICAgcmV0dXJuICd3aW4nCisgICAgICAgICAgICByZXR1cm4gcG9ydF9uYW1lICsgJy0nICsg aG9zdC5wbGF0Zm9ybS5vc192ZXJzaW9uCisgICAgICAgIHJldHVybiBwb3J0X25hbWUKKworCiAg ICAgZGVmIGNvbXBhcmVfdGV4dChzZWxmLCBleHBlY3RlZF90ZXh0LCBhY3R1YWxfdGV4dCk6CiAg ICAgICAgICMgU2FuaXR5IHdhcyByZXN0b3JlZCBpbiBXSzIsIHNvIHdlIGRvbid0IG5lZWQgdGhp cyBoYWNrIHRoZXJlLgogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1 bm5lcicpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMv cmViYXNlbGluZXNlcnZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zZXJ2ZXJz L3JlYmFzZWxpbmVzZXJ2ZXIucHkKaW5kZXggMzljNWI5ZTU1MWRhMWVmMGVhOTA2ODFjNDk0Yzk1 NTU5YWM4YTM1YS4uMTViY2Q2ZjU1OTQzMWI1ZTYxNmVkNzQ2NTA0MjhmOWU2NGViMTE2YSAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvcmViYXNlbGluZXNl cnZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9yZWJhc2Vs aW5lc2VydmVyLnB5CkBAIC0xNjUsNyArMTY1LDcgQEAgZGVmIGdldF90ZXN0X2Jhc2VsaW5lcyh0 ZXN0X2ZpbGUsIHRlc3RfY29uZmlnKToKICAgICAjIEZJWE1FOiBUaGlzIHNlZW1zIGxpa2UgYSBo YWNrLiBUaGlzIG9ubHkgc2VlbXMgdXNlZCB0byBhY2Nlc3MgdGhlIFBvcnQuZXhwZWN0ZWRfYmFz ZWxpbmVzIGxvZ2ljLgogICAgIGNsYXNzIEFsbFBsYXRmb3Jtc1BvcnQoV2ViS2l0UG9ydCk6CiAg ICAgICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0KToKLSAgICAgICAgICAgIFdlYktpdFBvcnQu X19pbml0X18oc2VsZiwgaG9zdCkKKyAgICAgICAgICAgIFdlYktpdFBvcnQuX19pbml0X18oc2Vs ZiwgaG9zdCwgJ21hYycpCiAgICAgICAgICAgICBzZWxmLl9wbGF0Zm9ybXNfYnlfZGlyZWN0b3J5 ID0gZGljdChbKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoKHApLCBwKSBmb3IgcCBpbiB0ZXN0 X2NvbmZpZy5wbGF0Zm9ybXNdKQogCiAgICAgICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChz ZWxmKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zZXJ2ZXJzL3Jl YmFzZWxpbmVzZXJ2ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv c2VydmVycy9yZWJhc2VsaW5lc2VydmVyX3VuaXR0ZXN0LnB5CmluZGV4IDMwZDFlNjYxMDBkNzI4 NDc4YWI4NGFmNzVhNTQ3M2JlZTQ5ZDBhN2UuLjBiOWJjNDNhZmQ0YmU0OTQ4ODQzNmVlMTJhMmZk NDdjNDI0NGRlNmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zZXJ2 ZXJzL3JlYmFzZWxpbmVzZXJ2ZXJfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS90b29sL3NlcnZlcnMvcmViYXNlbGluZXNlcnZlcl91bml0dGVzdC5weQpAQCAtMzEwLDEx ICszMTAsOCBAQCBkZWYgZ2V0X3Rlc3RfY29uZmlnKHRlc3RfZmlsZXM9W10sIHJlc3VsdF9maWxl cz1bXSk6CiAgICAgY2xhc3MgVGVzdE1hY1BvcnQoV2ViS2l0UG9ydCk6CiAgICAgICAgIHBvcnRf bmFtZSA9ICJtYWMiCiAKLSAgICAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QpOgotICAgICAg ICAgICAgV2ViS2l0UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWU9c2VsZi5wb3J0 X25hbWUpCi0KICAgICByZXR1cm4gVGVzdENvbmZpZygKLSAgICAgICAgVGVzdE1hY1BvcnQoaG9z dCksCisgICAgICAgIFRlc3RNYWNQb3J0KGhvc3QsICdtYWMnKSwKICAgICAgICAgbGF5b3V0X3Rl c3RzX2RpcmVjdG9yeSwKICAgICAgICAgcmVzdWx0c19kaXJlY3RvcnksCiAgICAgICAgICgnbWFj JywgJ21hYy1sZW9wYXJkJywgJ3dpbicsICdsaW51eCcpLAo= 122799 2012-01-17 12:24:34 -0800 2012-01-17 12:46:34 -0800 fix diff, consolidate apple logic bug-76357-20120117122433.patch text/plain 39403 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MTc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGZjNzU5OWQ4ZmYxOGQ2NjlhMjgyYjAzZjhlNjk1NTgw N2FjOGE1ZS4uYThlMjEyYzMwNjFlYzUzZmQ2ZjU3YTkxZmYyMDdjNjRiZDBkMmIxZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDEw NSBAQAogMjAxMi0wMS0xNyAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAor ICAgICAgICB3ZWJraXRweTogYWRkIGRldGVybWluZV9mdWxsX3BvcnRfbmFtZSgpLCBjbGVhbiB1 cCBwb3J0Ll9faW5pdF9fKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTc2MzU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAg ICAgICBFYWNoIFBvcnQgY2xhc3MgaXMgbm93IHJlcXVpcmVkIHRvIGltcGxlbWVudCBhICdwb3J0 X25hbWUnIGZpZWxkCisgICAgICAgIHRoYXQgd2lsbCBtYXRjaCB0aGUgc3RhcnQgb2YgYWxsIHBv cnRzIGNvbnN0cnVjdGVkIGJ5IHRoaXMgY2xhc3MgYW5kCisgICAgICAgIGEgJ2RldGVybWluZV9m dWxsX3BvcnRfbmFtZScgZmllbGQgdGhhdCB3aWxsIG1ha2UgdGhlIHBvcnQKKyAgICAgICAgZnVs bHktcXVhbGlmaWVkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9hcHBsZS5weToKKyAgICAgICAgKEFwcGxlUG9ydC5fX2luaXRfXyk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9y dCk6CisgICAgICAgIChQb3J0LmRldGVybWluZV9wb3J0X25hbWUpOgorICAgICAgICAoUG9ydC5f X2luaXRfXyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bS5weToKKyAgICAgICAgKENocm9taXVtUG9ydC5mb3IpOgorICAgICAgICAoQ2hyb21p dW1Qb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKENocm9taXVtUG9ydCk6CisgICAgICAgIChDaHJv bWl1bVBvcnQuX2Nocm9taXVtX2Jhc2VfZGlyKToKKyAgICAgICAgKENocm9taXVtUG9ydC5wYXRo X2Zyb21fY2hyb21pdW1fYmFzZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9jaHJvbWl1bV9ncHUucHk6CisgICAgICAgIChDaHJvbWl1bUdwdUxpbnV4UG9y dCk6CisgICAgICAgIChDaHJvbWl1bUdwdUxpbnV4UG9ydC5fX2luaXRfXyk6CisgICAgICAgIChD aHJvbWl1bUdwdU1hY1BvcnQpOgorICAgICAgICAoQ2hyb21pdW1HcHVNYWNQb3J0Ll9faW5pdF9f KToKKyAgICAgICAgKENocm9taXVtR3B1V2luUG9ydCk6CisgICAgICAgIChDaHJvbWl1bUdwdVdp blBvcnQuX19pbml0X18pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW1fbGludXgucHk6CisgICAgICAgIChDaHJvbWl1bUxpbnV4UG9ydCk6Cisg ICAgICAgIChDaHJvbWl1bUxpbnV4UG9ydC5kZXRlcm1pbmVfcG9ydF9uYW1lKToKKyAgICAgICAg KENocm9taXVtTGludXhQb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weToKKyAgICAgICAgKENocm9taXVtTWFj UG9ydCk6CisgICAgICAgIChDaHJvbWl1bU1hY1BvcnQuZGV0ZXJtaW5lX3BvcnRfbmFtZSk6Cisg ICAgICAgIChDaHJvbWl1bU1hY1BvcnQuX19pbml0X18pOgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5OgorICAgICAgICAoQ2hyb21p dW1XaW5Qb3J0KToKKyAgICAgICAgKENocm9taXVtV2luUG9ydC5kZXRlcm1pbmVfcG9ydF9uYW1l KToKKyAgICAgICAgKENocm9taXVtV2luUG9ydC5fX2luaXRfXyk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcnlydW4ucHk6CisgICAgICAgIChEcnlSdW5Q b3J0KToKKyAgICAgICAgKERyeVJ1blBvcnQuZGV0ZXJtaW5lX3BvcnRfbmFtZSk6CisgICAgICAg IChEcnlSdW5Qb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2VmbC5weToKKyAgICAgICAgKEVmbFBvcnQpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeS5weToKKyAgICAgICAgKFBvcnRG YWN0b3J5KToKKyAgICAgICAgKFBvcnRGYWN0b3J5Ll9kZWZhdWx0X3BvcnQpOgorICAgICAgICAo UG9ydEZhY3RvcnkuZ2V0KToKKyAgICAgICAgKFBvcnRGYWN0b3J5LmdldC5pbik6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5X3VuaXR0ZXN0LnB5 OgorICAgICAgICAoRmFjdG9yeVRlc3QuYXNzZXJ0X3BvcnQpOgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ29vZ2xlX2Nocm9tZS5weToKKyAgICAgICAgKEdv b2dsZUNocm9tZUxpbnV4MzJQb3J0KToKKyAgICAgICAgKEdvb2dsZUNocm9tZUxpbnV4MzJQb3J0 LmRldGVybWluZV9wb3J0X25hbWUpOgorICAgICAgICAoR29vZ2xlQ2hyb21lTGludXg2NFBvcnQp OgorICAgICAgICAoR29vZ2xlQ2hyb21lTGludXg2NFBvcnQuZGV0ZXJtaW5lX3BvcnRfbmFtZSk6 CisgICAgICAgIChHb29nbGVDaHJvbWVNYWNQb3J0KToKKyAgICAgICAgKEdvb2dsZUNocm9tZU1h Y1BvcnQuZGV0ZXJtaW5lX3BvcnRfbmFtZSk6CisgICAgICAgIChHb29nbGVDaHJvbWVXaW5Qb3J0 KToKKyAgICAgICAgKEdvb2dsZUNocm9tZVdpblBvcnQuZGV0ZXJtaW5lX3BvcnRfbmFtZSk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHk6CisgICAg ICAgIChHdGtQb3J0KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L21hYy5weToKKyAgICAgICAgKE1hY1BvcnQpOgorICAgICAgICAoTWFjUG9ydC5kZXRlcm1p bmVfcG9ydF9uYW1lKToKKyAgICAgICAgKE1hY1BvcnQuX19pbml0X18pOgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjX3VuaXR0ZXN0LnB5OgorICAgICAg ICAodGVzdF92ZXJzaW9ucyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9tb2NrX2RydC5weToKKyAgICAgICAgKE1vY2tEUlRQb3J0KToKKyAgICAgICAgKE1v Y2tEUlRQb3J0LmRldGVybWluZV9wb3J0X25hbWUpOgorICAgICAgICAoTW9ja0RSVFBvcnQuX19p bml0X18pOgorICAgICAgICAoTW9ja0RSVCk6CisgICAgICAgIChNb2NrRFJULmRldGVybWluZV9w b3J0X25hbWUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv cG9ydF90ZXN0Y2FzZS5weToKKyAgICAgICAgKFBvcnRUZXN0Q2FzZS5tYWtlX3BvcnQpOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHk6CisgICAgICAg IChRdFBvcnQpOgorICAgICAgICAoUXRQb3J0LmRldGVybWluZV9wb3J0X25hbWUpOgorICAgICAg ICAoUXRQb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3Rlc3QucHk6CisgICAgICAgIChUZXN0UG9ydCk6CisgICAgICAgIChUZXN0UG9y dC5kZXRlcm1pbmVfcG9ydF9uYW1lKToKKyAgICAgICAgKFRlc3RQb3J0Ll9faW5pdF9fKToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weToKKyAg ICAgICAgKFdlYktpdFBvcnQuX19pbml0X18pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvd2luLnB5OgorICAgICAgICAoV2luUG9ydCk6CisgICAgICAgIChX aW5Qb3J0LmRldGVybWluZV9wb3J0X25hbWUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv dG9vbC9zZXJ2ZXJzL3JlYmFzZWxpbmVzZXJ2ZXIucHk6CisgICAgICAgIChnZXRfdGVzdF9iYXNl bGluZXMuQWxsUGxhdGZvcm1zUG9ydC5fX2luaXRfXyk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL3NlcnZlcnMvcmViYXNlbGluZXNlcnZlcl91bml0dGVzdC5weToKKyAgICAgICAg KGdldF90ZXN0X2NvbmZpZy5UZXN0TWFjUG9ydCk6CisgICAgICAgIChnZXRfdGVzdF9jb25maWcp OgorCisyMDEyLTAxLTE3ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAg ICAgICAgIHdlYmtpdHB5OiBjbGVhbiB1cCBwb3J0IGNvZGUgaW4gcHJlcGFyYXRpb24gZm9yIHN0 YXRpYyBwb3J0IG5hbWVzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03NjM1NgogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2FwcGxlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9hcHBsZS5weQppbmRleCBjMjM4Y2EzZTRmYzhhMzliMzEwOWNmOWY2OGYzNDRlMWYx MTc2OWFjLi5mMGJlZmU5MWJhOWM4OWU0NzQ2MTk0NDBjYzYzMzY3ZTU4NzkyMGYxIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2FwcGxlLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYXBwbGUucHkKQEAg LTQ5LDYgKzQ5LDI0IEBAIGNsYXNzIEFwcGxlUG9ydChXZWJLaXRQb3J0KToKICAgICAjIEl0J3Mg cG9zc2libGUgdGhhdCBBcHBsZSB3b3VsZCB3YW50IHRvIGZpeCB0aGlzIGNvZGUgdG8gd29yayBi ZXR0ZXIgd2l0aCB0aG9zZSByZXN1bHRzLgogICAgIEZVVFVSRV9WRVJTSU9OID0gJ2Z1dHVyZScg ICMgRklYTUU6IFRoaXMgd2hvbGUgJ2Z1dHVyZScgdGhpbmcgZmVlbHMgbGlrZSBhIGhhY2suCiAK KyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGNscywg aG9zdCwgb3B0aW9ucywgcG9ydF9uYW1lKToKKyAgICAgICAgaWYgcG9ydF9uYW1lLmVuZHN3aXRo KCctd2syJyk6CisgICAgICAgICAgICAjIEZJWE1FOiBUaGlzIG1heSBiZSB3cm9uZywgc2luY2Ug b3B0aW9ucyBpcyBhIGdsb2JhbCBwcm9wZXJ0eSwgYW5kIHRoZSBwb3J0X25hbWUgaXMgc3BlY2lm aWMgdG8gdGhpcyBvYmplY3Q/CisgICAgICAgICAgICBpZiBvcHRpb25zIGFuZCBub3QgaGFzYXR0 cihvcHRpb25zLCAnd2Via2l0X3Rlc3RfcnVubmVyJyk6CisgICAgICAgICAgICAgICAgb3B0aW9u cy53ZWJraXRfdGVzdF9ydW5uZXIgPSBUcnVlCisgICAgICAgICAgICBwb3J0X25hbWUgPSBwb3J0 X25hbWUucmVwbGFjZSgnLXdrMicsICcnKQorICAgICAgICBpZiBwb3J0X25hbWUgPT0gY2xzLnBv cnRfbmFtZToKKyAgICAgICAgICAgICMgRklYTUU6IFRoaXMgaXMgYWxtb3N0IGNlcnRhaW5seSB3 cm9uZzsgd2Ugc2hvdWxkbid0IGJlIHJldHVybmluZyBhIHBvcnQgbmFtZSBhdCBhbGwKKyAgICAg ICAgICAgICMgaWYgd2UncmUgb24gdGhlIHdyb25nIHBsYXRmb3JtIGFuZCBpdCBpc24ndCBmdWxs eSBzcGVjaWZpZWQuIEFsc28sICdtYWMnIGFuZCAnd2luJworICAgICAgICAgICAgIyBzaG91bGRu J3QgYmUgbGVnYWwgcG9ydCBuYW1lcywgc2luY2Ugd2UgY2FuJ3QgZGlzdGluZ3Vpc2ggdGhlbSBm cm9tIHVuZGVyc3BlY2lmaWVkCisgICAgICAgICAgICAjIGFiYnJldmlhdGlvbnMgKGkuZS4sIGRv ZXMgJ21hYycgcmVmZXIgdG8gJ21hYy1mdXR1cmUnIG9yICd0aGUgdmVyc2lvbiBvZiBtYWMgbWF0 Y2hpbmcgdGhlCisgICAgICAgICAgICAjIHZlcnNpb24gb2YgdGhlIG9wZXJhdGluZyBzeXN0ZW0g b24gdGhlIGhvc3QgbWFjaGluZSc/KS4KKyAgICAgICAgICAgIGlmIHBvcnRfbmFtZSAhPSBob3N0 LnBsYXRmb3JtLm9zX25hbWU6CisgICAgICAgICAgICAgICAgcmV0dXJuIHBvcnRfbmFtZQorICAg ICAgICAgICAgcmV0dXJuIHBvcnRfbmFtZSArICctJyArIGhvc3QucGxhdGZvcm0ub3NfdmVyc2lv bgorICAgICAgICByZXR1cm4gcG9ydF9uYW1lCisKICAgICBkZWYgX3N0cmlwX3BvcnRfbmFtZV9w cmVmaXgoc2VsZiwgcG9ydF9uYW1lKToKICAgICAgICAgIyBDYWxsZXJzIHRyZWF0IHRoaXMgcmV0 dXJuIHZhbHVlIGFzIHRoZSAidmVyc2lvbiIsIHdoaWNoIG9ubHkgd29ya3MKICAgICAgICAgIyBi ZWNhdXNlIEFwcGxlIHBvcnRzIHVzZSBhIHNpbXBsZSBuYW1lLXZlcnNpb24gcG9ydF9uYW1lIHNj aGVtZS4KQEAgLTU2LDIzICs3NCwxMiBAQCBjbGFzcyBBcHBsZVBvcnQoV2ViS2l0UG9ydCk6CiAg ICAgICAgICMgaW5zdGVhZCBvZiB0aGUgaW5kaXZpZHVhbCBwb3J0IGNvbnN0cnVjdG9ycy4KICAg ICAgICAgcmV0dXJuIHBvcnRfbmFtZVtsZW4oc2VsZi5wb3J0X25hbWUgKyAnLScpOl0KIAotICAg IGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWU9Tm9uZSwgKiprd2FyZ3MpOgotICAg ICAgICBwb3J0X25hbWUgPSBwb3J0X25hbWUgb3Igc2VsZi5wb3J0X25hbWUKLSAgICAgICAgV2Vi S2l0UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWU9cG9ydF9uYW1lLCAqKmt3YXJn cykKLQotICAgICAgICAjIEZJWE1FOiBUaGlzIHNvcnQgb2YgcGFyc2luZyBiZWxvbmdzIGluIGZh Y3RvcnkucHkhCi0gICAgICAgIGlmIHBvcnRfbmFtZSA9PSAnJXMtd2syJyAlIHNlbGYucG9ydF9u YW1lOgotICAgICAgICAgICAgcG9ydF9uYW1lID0gc2VsZi5wb3J0X25hbWUKLSAgICAgICAgICAg ICMgRklYTUU6IFRoaXMgbWF5IGJlIHdyb25nLCBzaW5jZSBvcHRpb25zIGlzIGEgZ2xvYmFsIHBy b3BlcnR5LCBhbmQgdGhlIHBvcnRfbmFtZSBpcyBzcGVjaWZpYyB0byB0aGlzIG9iamVjdD8KLSAg ICAgICAgICAgIHNlbGYuc2V0X29wdGlvbl9kZWZhdWx0KCd3ZWJraXRfdGVzdF9ydW5uZXInLCBU cnVlKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKToK KyAgICAgICAgV2ViS2l0UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dh cmdzKQogCi0gICAgICAgIGlmIHBvcnRfbmFtZSA9PSBzZWxmLnBvcnRfbmFtZToKLSAgICAgICAg ICAgIHNlbGYuX3ZlcnNpb24gPSBob3N0LnBsYXRmb3JtLm9zX3ZlcnNpb24KLSAgICAgICAgICAg IHNlbGYuX25hbWUgPSBzZWxmLnBvcnRfbmFtZSArICctJyArIHNlbGYuX3ZlcnNpb24KLSAgICAg ICAgZWxzZToKLSAgICAgICAgICAgIGFsbG93ZWRfcG9ydF9uYW1lcyA9IHNlbGYuVkVSU0lPTl9G QUxMQkFDS19PUkRFUiArIFtzZWxmLm9wZXJhdGluZ19zeXN0ZW0oKSArICItZnV0dXJlIl0KLSAg ICAgICAgICAgIGFzc2VydCBwb3J0X25hbWUgaW4gYWxsb3dlZF9wb3J0X25hbWVzLCAiJXMgaXMg bm90IGluICVzIiAlIChwb3J0X25hbWUsIGFsbG93ZWRfcG9ydF9uYW1lcykKLSAgICAgICAgICAg IHNlbGYuX3ZlcnNpb24gPSBzZWxmLl9zdHJpcF9wb3J0X25hbWVfcHJlZml4KHBvcnRfbmFtZSkK KyAgICAgICAgYWxsb3dlZF9wb3J0X25hbWVzID0gc2VsZi5WRVJTSU9OX0ZBTExCQUNLX09SREVS ICsgW3NlbGYub3BlcmF0aW5nX3N5c3RlbSgpICsgIi1mdXR1cmUiXQorICAgICAgICBhc3NlcnQg cG9ydF9uYW1lIGluIGFsbG93ZWRfcG9ydF9uYW1lcywgIiVzIGlzIG5vdCBpbiAlcyIgJSAocG9y dF9uYW1lLCBhbGxvd2VkX3BvcnRfbmFtZXMpCisgICAgICAgIHNlbGYuX3ZlcnNpb24gPSBzZWxm Ll9zdHJpcF9wb3J0X25hbWVfcHJlZml4KHBvcnRfbmFtZSkKIAogICAgICMgRklYTUU6IEEgbW9y ZSBzb3BoaXNpdGNhdGVkIHZlcnNpb24gb2YgdGhpcyBmdW5jdGlvbiBzaG91bGQgbW92ZSB0byBX ZWJLaXRQb3J0IGFuZCByZXBsYWNlIGFsbCBjYWxscyB0byBuYW1lKCkuCiAgICAgZGVmIF9wb3J0 X25hbWVfd2l0aF92ZXJzaW9uKHNlbGYpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IDQ4Yzc4ZGEyMGMwNWQ2NTRkNDczYTJhZTQx Y2ZlMTAwOTI2NWRhMGUuLmZlNTZkOTJkNmEyNjZiOGEwOGJiYjkwNmM0OTAzZDRhNWUzNDU5ZDQg MTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFz ZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2Uu cHkKQEAgLTgxLDE3ICs4MSwzMyBAQCBjbGFzcyBEdW1teU9wdGlvbnMob2JqZWN0KToKIGNsYXNz IFBvcnQob2JqZWN0KToKICAgICAiIiJBYnN0cmFjdCBjbGFzcyBmb3IgUG9ydC1zcGVjaWZpYyBo b29rcyBmb3IgdGhlIGxheW91dF90ZXN0IHBhY2thZ2UuIiIiCiAKLSAgICBwb3J0X25hbWUgPSBO b25lICAjIFN1YmNsYXNzZXMgb3ZlcnJpZGUgdGhpcworICAgICMgU3ViY2xhc3NlcyBvdmVycmlk ZSB0aGlzLiBUaGlzIHNob3VsZCBpbmRpY2F0ZSB0aGUgYmFzaWMgaW1wbGVtZW50YXRpb24KKyAg ICAjIHBhcnQgb2YgdGhlIHBvcnQgbmFtZSwgZS5nLiwgJ2Nocm9taXVtLW1hYycsICd3aW4nLCAn Z3RrJzsgdGhlcmUgaXMgcHJvYmFibHkgKD8pCisgICAgIyBvbmUgdW5pcXVlIHZhbHVlIHBlciBj bGFzcy4KKworICAgICMgRklYTUU6IFdlIHNob3VsZCBwcm9iYWJseSByZW5hbWUgdGhpcyB0byBz b21ldGhpbmcgbGlrZSAnaW1wbGVtZW50YXRpb25fbmFtZScuCisgICAgcG9ydF9uYW1lID0gTm9u ZQogCiAgICAgIyBUZXN0IG5hbWVzIHJlc2VtYmxlIHVuaXggcmVsYXRpdmUgcGF0aHMsIGFuZCB1 c2UgJy8nIGFzIGEgZGlyZWN0b3J5IHNlcGFyYXRvci4KICAgICBURVNUX1BBVEhfU0VQQVJBVE9S ID0gJy8nCiAKICAgICBBTExfQlVJTERfVFlQRVMgPSAoJ2RlYnVnJywgJ3JlbGVhc2UnKQogCisg ICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGRldGVybWluZV9mdWxsX3BvcnRfbmFtZShjbHMsIGhv c3QsIG9wdGlvbnMsIHBvcnRfbmFtZSk6CisgICAgICAgICIiIlJldHVybiBhIGZ1bGx5LXNwZWNp ZmllZCBwb3J0IG5hbWUgdGhhdCBjYW4gYmUgdXNlZCB0byBjb25zdHJ1Y3Qgb2JqZWN0cy4iIiIK KyAgICAgICAgIyBTdWJjbGFzc2VzIHdpbGwgdXN1YWxseSBvdmVycmlkZSB0aGlzLgorICAgICAg ICByZXR1cm4gY2xzLnBvcnRfbmFtZQorCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBv cnRfbmFtZT1Ob25lLCBvcHRpb25zPU5vbmUsIGNvbmZpZz1Ob25lLCAqKmt3YXJncyk6CiAKKyAg ICAgICAgIyBUaGlzIHZhbHVlIG1heSBiZSBkaWZmZXJlbnQgZnJvbSBjbHMucG9ydF9uYW1lIGJ5 IGhhdmluZyB2ZXJzaW9uIG1vZGlmaWVycworICAgICAgICAjIGFuZCBvdGhlciBmaWVsZHMgYXBw ZW5kZWQgdG8gaXQgKGZvciBleGFtcGxlLCAncXQtYXJtJyBvciAnbWFjLXdrMicpLgorCisgICAg ICAgICMgRklYTUU6IHBvcnRfbmFtZSBzaG91bGQgYmUgYSByZXF1aXJlZCBwYXJhbWV0ZXIuIEl0 IGlzbid0IHlldCBiZWNhdXNlIGxvdHMgb2YgdGVzdHMgbmVlZCB0byBiZSB1cGRhdGQuCisgICAg ICAgIHNlbGYuX25hbWUgPSBwb3J0X25hbWUgb3Igc2VsZi5wb3J0X25hbWUKKwogICAgICAgICAj IFRoZXNlIGFyZSBkZWZhdWx0IHZhbHVlcyB0aGF0IHNob3VsZCBiZSBvdmVycmlkZGVuIGluIGEg c3ViY2xhc3Nlcy4KLSAgICAgICAgc2VsZi5fbmFtZSA9IHBvcnRfbmFtZSBvciBzZWxmLnBvcnRf bmFtZSAgIyBTdWJjbGFzc2VzIG1heSBhcHBlbmQgYSAtVkVSU0lPTiAobGlrZSBtYWMtbGVvcGFy ZCkgb3Igb3RoZXIgcXVhbGlmaWVycy4KICAgICAgICAgc2VsZi5fdmVyc2lvbiA9ICcnCiAgICAg ICAgIHNlbGYuX2FyY2hpdGVjdHVyZSA9ICd4ODYnCiAgICAgICAgIHNlbGYuX2dyYXBoaWNzX3R5 cGUgPSAnY3B1JwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW0ucHkKaW5kZXggNWI1MDE0ZmZkNjkwNTYwYjA3MWY3MjZhODlhODAwYmNh ZGEyZWI1Zi4uNjU2NmU5YmUwNzkwOGM3YmRjZjBhOGU2N2I2NWZkMDUwNDI0NDE0NiAxMDA3NTUK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVt LnB5CkBAIC01OCw4ICs1OCw2IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykK IGNsYXNzIENocm9taXVtUG9ydChQb3J0KToKICAgICAiIiJBYnN0cmFjdCBiYXNlIGNsYXNzIGZv ciBDaHJvbWl1bSBpbXBsZW1lbnRhdGlvbnMgb2YgdGhlIFBvcnQgY2xhc3MuIiIiCiAKLSAgICBw b3J0X25hbWUgPSAiY2hyb21pdW0iCi0KICAgICBBTExfU1lTVEVNUyA9ICgKICAgICAgICAgKCds ZW9wYXJkJywgJ3g4NicpLAogICAgICAgICAoJ3Nub3dsZW9wYXJkJywgJ3g4NicpLApAQCAtOTQs MTAgKzkyLDkgQEAgY2xhc3MgQ2hyb21pdW1Qb3J0KFBvcnQpOgogICAgICAgICBlbHNlOgogICAg ICAgICAgICAgcmV0dXJuIG1vZHVsZV9wYXRoWzA6b2Zmc2V0XQogCi0gICAgZGVmIF9faW5pdF9f KHNlbGYsIGhvc3QsICoqa3dhcmdzKToKLSAgICAgICAgUG9ydC5fX2luaXRfXyhzZWxmLCBob3N0 LCAqKmt3YXJncykKKyAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lLCAqKmt3 YXJncyk6CisgICAgICAgIFBvcnQuX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lLCAqKmt3 YXJncykKICAgICAgICAgIyBBbGwgc3ViLWNsYXNzZXMgb3ZlcnJpZGUgdGhpcywgYnV0IHdlIG5l ZWQgYW4gaW5pdGlhbCB2YWx1ZSBmb3IgdGVzdGluZy4KLSAgICAgICAgc2VsZi5fdmVyc2lvbiA9 ICd4cCcKICAgICAgICAgc2VsZi5fY2hyb21pdW1fYmFzZV9kaXJfcGF0aCA9IE5vbmUKIAogICAg IGRlZiBfY2hlY2tfZmlsZV9leGlzdHMoc2VsZiwgcGF0aF90b19maWxlLCBmaWxlX2Rlc2NyaXB0 aW9uLApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV9ncHUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Nocm9taXVtX2dwdS5weQppbmRleCA4YjQxNDVlMjA0MDEwMDY2NjQxNjQyMjNhMzE2YWM4 NzllODcxOWUxLi5mZGMxMTE3Yzk2ZmRhMjQwZTdiNGI0NDAxYmQ4NTgxZjJlYTIzNjQ0IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVt X2dwdS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2No cm9taXVtX2dwdS5weQpAQCAtNzEsOCArNzEsMTAgQEAgZGVmIF9kZWZhdWx0X3Rlc3RzX3BhdGhz KHBvcnQpOgogCiAKIGNsYXNzIENocm9taXVtR3B1TGludXhQb3J0KGNocm9taXVtX2xpbnV4LkNo cm9taXVtTGludXhQb3J0KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1l PSdjaHJvbWl1bS1ncHUtbGludXgnLCAqKmt3YXJncyk6Ci0gICAgICAgIGNocm9taXVtX2xpbnV4 LkNocm9taXVtTGludXhQb3J0Ll9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZT1wb3J0X25h bWUsICoqa3dhcmdzKQorICAgIHBvcnRfbmFtZSA9ICdjaHJvbWl1bS1ncHUtbGludXgnCisKKyAg ICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lLCAqKmt3YXJncyk6CisgICAgICAg IGNocm9taXVtX2xpbnV4LkNocm9taXVtTGludXhQb3J0Ll9faW5pdF9fKHNlbGYsIGhvc3QsIHBv cnRfbmFtZSwgKiprd2FyZ3MpCiAgICAgICAgIF9zZXRfZ3B1X29wdGlvbnMoc2VsZikKIAogICAg IGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKQEAgLTg2LDggKzg4LDEwIEBAIGNsYXNz IENocm9taXVtR3B1TGludXhQb3J0KGNocm9taXVtX2xpbnV4LkNocm9taXVtTGludXhQb3J0KToK IAogCiBjbGFzcyBDaHJvbWl1bUdwdU1hY1BvcnQoY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9y dCk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZT0nY2hyb21pdW0tZ3B1 LW1hYycsICoqa3dhcmdzKToKLSAgICAgICAgY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydC5f X2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWU9cG9ydF9uYW1lLCAqKmt3YXJncykKKyAgICBw b3J0X25hbWUgPSAnY2hyb21pdW0tZ3B1LW1hYycKKworICAgIGRlZiBfX2luaXRfXyhzZWxmLCBo b3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKToKKyAgICAgICAgY2hyb21pdW1fbWFjLkNocm9taXVt TWFjUG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKQogICAgICAg ICBfc2V0X2dwdV9vcHRpb25zKHNlbGYpCiAKICAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgo c2VsZik6CkBAIC0xMDAsOCArMTA0LDEwIEBAIGNsYXNzIENocm9taXVtR3B1TWFjUG9ydChjaHJv bWl1bV9tYWMuQ2hyb21pdW1NYWNQb3J0KToKIAogCiBjbGFzcyBDaHJvbWl1bUdwdVdpblBvcnQo Y2hyb21pdW1fd2luLkNocm9taXVtV2luUG9ydCk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGhv c3QsIHBvcnRfbmFtZT0nY2hyb21pdW0tZ3B1LXdpbicsICoqa3dhcmdzKToKLSAgICAgICAgY2hy b21pdW1fd2luLkNocm9taXVtV2luUG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWU9 cG9ydF9uYW1lLCAqKmt3YXJncykKKyAgICBwb3J0X25hbWUgPSAnY2hyb21pdW0tZ3B1LXdpbicK KworICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKToKKyAg ICAgICAgY2hyb21pdW1fd2luLkNocm9taXVtV2luUG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBw b3J0X25hbWUsICoqa3dhcmdzKQogICAgICAgICBfc2V0X2dwdV9vcHRpb25zKHNlbGYpCiAKICAg ICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weQppbmRl eCAxNTQyMGQwNzJmZWQ4MTE4MTZlMTE0NDJlNGUxMjE2MTY2Zjg1NThlLi5jZWUxZWI1Mjk2NzRm NDg4YjIzMDQ2NTMzMzgxOTg5MzJiOGM1ZjQ5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkKQEAgLTM3 LDYgKzM3LDggQEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiAKIGNsYXNz IENocm9taXVtTGludXhQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CisgICAgcG9ydF9uYW1l ID0gJ2Nocm9taXVtLWxpbnV4JworCiAgICAgU1VQUE9SVEVEX0FSQ0hJVEVDVFVSRVMgPSAoJ3g4 NicsICd4ODZfNjQnKQogCiAgICAgRkFMTEJBQ0tfUEFUSFMgPSB7CkBAIC05OCwyNiArMTAwLDIy IEBAIGNsYXNzIENocm9taXVtTGludXhQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAg ICAgICMgaWYgd2UgYWN0dWFsbHkgdHJ5IHRvIHVzZSB0aGUgYmluYXJ5LCBjaGVja19idWlsZCgp IHNob3VsZCBmYWlsLgogICAgICAgICByZXR1cm4gJ3g4Nl82NCcKIAotICAgIGRlZiBfX2luaXRf XyhzZWxmLCBob3N0LCBwb3J0X25hbWU9Tm9uZSwgKiprd2FyZ3MpOgotICAgICAgICBwb3J0X25h bWUgPSBwb3J0X25hbWUgb3IgJ2Nocm9taXVtLWxpbnV4JwotICAgICAgICBjaHJvbWl1bS5DaHJv bWl1bVBvcnQuX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lPXBvcnRfbmFtZSwgKiprd2Fy Z3MpCi0gICAgICAgICMgV2UgcmUtc2V0IHRoZSBwb3J0IG5hbWUgb25jZSB0aGUgYmFzZSBvYmpl Y3QgaXMgZnVsbHkgaW5pdGlhbGl6ZWQKLSAgICAgICAgIyBpbiBvcmRlciB0byBiZSBhYmxlIHRv IGZpbmQgdGhlIERSVCBiaW5hcnkgcHJvcGVybHkuCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVm IGRldGVybWluZV9mdWxsX3BvcnRfbmFtZShjbHMsIGhvc3QsIG9wdGlvbnMsIHBvcnRfbmFtZSk6 CiAgICAgICAgIGlmIHBvcnRfbmFtZS5lbmRzd2l0aCgnLWxpbnV4Jyk6Ci0gICAgICAgICAgICBz ZWxmLl9hcmNoaXRlY3R1cmUgPSBzZWxmLl9kZXRlcm1pbmVfYXJjaGl0ZWN0dXJlKHNlbGYuX2Zp bGVzeXN0ZW0sIHNlbGYuX2V4ZWN1dGl2ZSwgc2VsZi5fZGV0ZXJtaW5lX2RyaXZlcl9wYXRoX3N0 YXRpY2FsbHkoaG9zdCwgc2VsZi5fb3B0aW9ucykpCi0gICAgICAgICAgICAjIEZJWE1FOiBUaGlz IGlzIGFuIHVnbHkgaGFjayB0byBhdm9pZCByZW5hbWluZyB0aGUgR1BVIHBvcnQuCi0gICAgICAg ICAgICBpZiBwb3J0X25hbWUgPT0gJ2Nocm9taXVtLWxpbnV4JzoKLSAgICAgICAgICAgICAgICBw b3J0X25hbWUgPSBwb3J0X25hbWUgKyAnLScgKyBzZWxmLl9hcmNoaXRlY3R1cmUKLSAgICAgICAg ZWxzZToKLSAgICAgICAgICAgIGJhc2UsIGFyY2ggPSBwb3J0X25hbWUucnNwbGl0KCctJywgMSkK LSAgICAgICAgICAgIGFzc2VydCBiYXNlIGluICgnY2hyb21pdW0tbGludXgnLCAnY2hyb21pdW0t Z3B1LWxpbnV4JykKLSAgICAgICAgICAgIHNlbGYuX2FyY2hpdGVjdHVyZSA9IGFyY2gKLSAgICAg ICAgYXNzZXJ0IHNlbGYuX2FyY2hpdGVjdHVyZSBpbiBzZWxmLlNVUFBPUlRFRF9BUkNISVRFQ1RV UkVTCisgICAgICAgICAgICByZXR1cm4gcG9ydF9uYW1lICsgJy0nICsgY2xzLl9kZXRlcm1pbmVf YXJjaGl0ZWN0dXJlKGhvc3QuZmlsZXN5c3RlbSwgaG9zdC5leGVjdXRpdmUsIGNscy5fZGV0ZXJt aW5lX2RyaXZlcl9wYXRoX3N0YXRpY2FsbHkoaG9zdCwgb3B0aW9ucykpCisgICAgICAgIHJldHVy biBwb3J0X25hbWUKKworICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoq a3dhcmdzKToKKyAgICAgICAgY2hyb21pdW0uQ2hyb21pdW1Qb3J0Ll9faW5pdF9fKHNlbGYsIGhv c3QsIHBvcnRfbmFtZSwgKiprd2FyZ3MpCisgICAgICAgIChiYXNlLCBhcmNoKSA9IHBvcnRfbmFt ZS5yc3BsaXQoJy0nLCAxKQorICAgICAgICBhc3NlcnQgYmFzZSBpbiAoJ2Nocm9taXVtLWxpbnV4 JywgJ2Nocm9taXVtLWdwdS1saW51eCcpCisgICAgICAgIGFzc2VydCBhcmNoIGluIHNlbGYuU1VQ UE9SVEVEX0FSQ0hJVEVDVFVSRVMKICAgICAgICAgYXNzZXJ0IHBvcnRfbmFtZSBpbiAoJ2Nocm9t aXVtLWxpbnV4JywgJ2Nocm9taXVtLWdwdS1saW51eCcsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICdjaHJvbWl1bS1saW51eC14ODYnLCAnY2hyb21pdW0tbGludXgteDg2XzY0JywKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2Nocm9taXVtLWdwdS1saW51eC14ODZfNjQnKQot ICAgICAgICBzZWxmLl9uYW1lID0gcG9ydF9uYW1lCiAgICAgICAgIHNlbGYuX3ZlcnNpb24gPSAn bHVjaWQnICAjIFdlIG9ubHkgc3VwcG9ydCBsdWNpZCByaWdodCBub3cuCisgICAgICAgIHNlbGYu X2FyY2hpdGVjdHVyZSA9IGFyY2gKIAogICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxm KToKICAgICAgICAgcG9ydF9uYW1lcyA9IHNlbGYuRkFMTEJBQ0tfUEFUSFNbc2VsZi5fYXJjaGl0 ZWN0dXJlXQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bV9tYWMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtX21hYy5weQppbmRleCA0MWExYTU1NWFlMmNiNWZlOGU3NGEwZTE5YmFl OTdmZTc5MmVmZDc0Li5lNmQ1NTdmNTU2YWI4MWVmMTE5ZWEzMWVhZmJkN2QyOWQxY2VkZjliIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t aXVtX21hYy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX21hYy5weQpAQCAtNDAsNiArNDAsNyBAQCBfbG9nID0gbG9nZ2luZy5nZXRMb2dn ZXIoX19uYW1lX18pCiAKIGNsYXNzIENocm9taXVtTWFjUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBv cnQpOgogICAgIFNVUFBPUlRFRF9PU19WRVJTSU9OUyA9ICgnbGVvcGFyZCcsICdzbm93bGVvcGFy ZCcsICdsaW9uJywgJ2Z1dHVyZScpCisgICAgcG9ydF9uYW1lID0gJ2Nocm9taXVtLW1hYycKIAog ICAgIEZBTExCQUNLX1BBVEhTID0gewogICAgICAgICAnbGVvcGFyZCc6IFsKQEAgLTczLDE4ICs3 NCwxOSBAQCBjbGFzcyBDaHJvbWl1bU1hY1BvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKICAg ICAgICAgXSwKICAgICB9CiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1l PU5vbmUsIG9zX3ZlcnNpb25fc3RyaW5nPU5vbmUsICoqa3dhcmdzKToKKyAgICBAY2xhc3NtZXRo b2QKKyAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGNscywgaG9zdCwgb3B0aW9ucywg cG9ydF9uYW1lKToKKyAgICAgICAgaWYgcG9ydF9uYW1lLmVuZHN3aXRoKCctbWFjJyk6CisgICAg ICAgICAgICByZXR1cm4gcG9ydF9uYW1lICsgJy0nICsgaG9zdC5wbGF0Zm9ybS5vc192ZXJzaW9u CisgICAgICAgIHJldHVybiBwb3J0X25hbWUKKworICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0 LCBwb3J0X25hbWUsICoqa3dhcmdzKToKKyAgICAgICAgY2hyb21pdW0uQ2hyb21pdW1Qb3J0Ll9f aW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZSwgKiprd2FyZ3MpCisKICAgICAgICAgIyBXZSdy ZSBhIGxpdHRsZSBnZW5lcmljIGhlcmUgYmVjYXVzZSB0aGlzIGNvZGUgaXMgcmV1c2VkIGJ5IHRo ZQogICAgICAgICAjICdnb29nbGUtY2hyb21lJyBwb3J0IGFzIHdlbGwgYXMgdGhlICdtb2NrLScg YW5kICdkcnlydW4tJyBwb3J0cy4KLSAgICAgICAgcG9ydF9uYW1lID0gcG9ydF9uYW1lIG9yICdj aHJvbWl1bS1tYWMnCi0gICAgICAgIGNocm9taXVtLkNocm9taXVtUG9ydC5fX2luaXRfXyhzZWxm LCBob3N0LCBwb3J0X25hbWU9cG9ydF9uYW1lLCAqKmt3YXJncykKLSAgICAgICAgaWYgcG9ydF9u YW1lLmVuZHN3aXRoKCctbWFjJyk6Ci0gICAgICAgICAgICBhc3NlcnQgaG9zdC5wbGF0Zm9ybS5p c19tYWMoKQotICAgICAgICAgICAgc2VsZi5fdmVyc2lvbiA9IGhvc3QucGxhdGZvcm0ub3NfdmVy c2lvbgotICAgICAgICAgICAgc2VsZi5fbmFtZSA9IHBvcnRfbmFtZSArICctJyArIHNlbGYuX3Zl cnNpb24KLSAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHNlbGYuX3ZlcnNpb24gPSBwb3J0X25h bWVbcG9ydF9uYW1lLmluZGV4KCctbWFjLScpICsgbGVuKCctbWFjLScpOl0KLSAgICAgICAgICAg IGFzc2VydCBzZWxmLl92ZXJzaW9uIGluIHNlbGYuU1VQUE9SVEVEX09TX1ZFUlNJT05TCisgICAg ICAgIHNlbGYuX3ZlcnNpb24gPSBwb3J0X25hbWVbcG9ydF9uYW1lLmluZGV4KCctbWFjLScpICsg bGVuKCctbWFjLScpOl0KKyAgICAgICAgYXNzZXJ0IHNlbGYuX3ZlcnNpb24gaW4gc2VsZi5TVVBQ T1JURURfT1NfVkVSU0lPTlMKIAogICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToK ICAgICAgICAgZmFsbGJhY2tfcGF0aHMgPSBzZWxmLkZBTExCQUNLX1BBVEhTCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbi5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2lu LnB5CmluZGV4IDBiNmU0OTc0YjQ5ZDg2MGM2YjNjYjg0MTRlZTRmNzBmNjMyZDcyODEuLjRlNzlm YjhjOGE5OTlkNTg5OGM3NjRkMTY4Y2ViYTg1ZjdhYzJiNmUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5CkBA IC0zOSw2ICszOSw4IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogCiBj bGFzcyBDaHJvbWl1bVdpblBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKKyAgICBwb3J0X25h bWUgPSAnY2hyb21pdW0td2luJworCiAgICAgIyBGSVhNRTogRmlndXJlIG91dCBob3cgdG8gdW5p ZnkgdGhpcyB3aXRoIGJhc2UuVGVzdENvbmZpZ3VyYXRpb24uYWxsX3N5c3RlbXMoKT8KICAgICBT VVBQT1JURURfVkVSU0lPTlMgPSAoJ3hwJywgJ3Zpc3RhJywgJ3dpbjcnKQogCkBAIC02NywyMiAr NjksMjQgQEAgY2xhc3MgQ2hyb21pdW1XaW5Qb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAg ICAgICAgIF0sCiAgICAgfQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFt ZT1Ob25lLCB3aW5kb3dzX3ZlcnNpb249Tm9uZSwgKiprd2FyZ3MpOgotICAgICAgICAjIFdlJ3Jl IGEgbGl0dGxlIGdlbmVyaWMgaGVyZSBiZWNhdXNlIHRoaXMgY29kZSBpcyByZXVzZWQgYnkgdGhl Ci0gICAgICAgICMgJ2dvb2dsZS1jaHJvbWUnIHBvcnQgYXMgd2VsbCBhcyB0aGUgJ21vY2stJyBh bmQgJ2RyeXJ1bi0nIHBvcnRzLgotICAgICAgICBwb3J0X25hbWUgPSBwb3J0X25hbWUgb3IgJ2No cm9taXVtLXdpbicKLSAgICAgICAgY2hyb21pdW0uQ2hyb21pdW1Qb3J0Ll9faW5pdF9fKHNlbGYs IGhvc3QsIHBvcnRfbmFtZT1wb3J0X25hbWUsICoqa3dhcmdzKQorICAgIEBjbGFzc21ldGhvZAor ICAgIGRlZiBkZXRlcm1pbmVfZnVsbF9wb3J0X25hbWUoY2xzLCBob3N0LCBvcHRpb25zLCBwb3J0 X25hbWUpOgogICAgICAgICBpZiBwb3J0X25hbWUuZW5kc3dpdGgoJy13aW4nKToKICAgICAgICAg ICAgIGFzc2VydCBob3N0LnBsYXRmb3JtLmlzX3dpbigpCiAgICAgICAgICAgICBpZiBob3N0LnBs YXRmb3JtLm9zX3ZlcnNpb24gaW4gKCc3c3AwJywgJzdzcDEnLCAnZnV0dXJlJyk6Ci0gICAgICAg ICAgICAgICAgc2VsZi5fdmVyc2lvbiA9ICd3aW43JworICAgICAgICAgICAgICAgIHZlcnNpb24g PSAnd2luNycKICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgc2VsZi5fdmVyc2lv biA9IGhvc3QucGxhdGZvcm0ub3NfdmVyc2lvbgotICAgICAgICAgICAgc2VsZi5fbmFtZSA9IHBv cnRfbmFtZSArICctJyArIHNlbGYuX3ZlcnNpb24KLSAgICAgICAgZWxzZToKLSAgICAgICAgICAg IHNlbGYuX3ZlcnNpb24gPSBwb3J0X25hbWVbcG9ydF9uYW1lLmluZGV4KCctd2luLScpICsgbGVu KCctd2luLScpOl0KLSAgICAgICAgYXNzZXJ0IHNlbGYuX3ZlcnNpb24gaW4gc2VsZi5TVVBQT1JU RURfVkVSU0lPTlMsICIlcyBpcyBub3QgaW4gJXMiICUgKHNlbGYuX3ZlcnNpb24sIHNlbGYuU1VQ UE9SVEVEX1ZFUlNJT05TKQorICAgICAgICAgICAgICAgIHZlcnNpb24gPSBob3N0LnBsYXRmb3Jt Lm9zX3ZlcnNpb24KKyAgICAgICAgICAgIHBvcnRfbmFtZSA9IHBvcnRfbmFtZSArICctJyArIHZl cnNpb24KKyAgICAgICAgcmV0dXJuIHBvcnRfbmFtZQogCisgICAgZGVmIF9faW5pdF9fKHNlbGYs IGhvc3QsIHBvcnRfbmFtZSwgKiprd2FyZ3MpOgorICAgICAgICBjaHJvbWl1bS5DaHJvbWl1bVBv cnQuX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lLCAqKmt3YXJncykKKworICAgICAgICAj IFdlJ3JlIGEgbGl0dGxlIGdlbmVyaWMgaGVyZSBiZWNhdXNlIHRoaXMgY29kZSBpcyByZXVzZWQg YnkgdGhlCisgICAgICAgICMgJ2dvb2dsZS1jaHJvbWUnIHBvcnQgYXMgd2VsbCBhcyB0aGUgJ21v Y2stJyBhbmQgJ2RyeXJ1bi0nIHBvcnRzLgorICAgICAgICBzZWxmLl92ZXJzaW9uID0gcG9ydF9u YW1lW3BvcnRfbmFtZS5pbmRleCgnLXdpbi0nKSArIGxlbignLXdpbi0nKTpdCisgICAgICAgIGFz c2VydCBzZWxmLl92ZXJzaW9uIGluIHNlbGYuU1VQUE9SVEVEX1ZFUlNJT05TLCAiJXMgaXMgbm90 IGluICVzIiAlIChzZWxmLl92ZXJzaW9uLCBzZWxmLlNVUFBPUlRFRF9WRVJTSU9OUykKIAogICAg IGRlZiBzZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIoc2VsZiwgc2VydmVyX25hbWU9Tm9uZSk6CiAg ICAgICAgIGVudiA9IGNocm9taXVtLkNocm9taXVtUG9ydC5zZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2 ZXIoc2VsZiwgc2VydmVyX25hbWUpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2RyeXJ1bi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvZHJ5cnVuLnB5CmluZGV4IGE0OGQwNzQ2MTIxN2I3OWU1ODQ4YmE5MjZj ZTUyM2JiNzEwZDBiYjYuLjI0MmFiZWVlZGRmYjM5NGIxNmViZmIwYTgzMzZkZTc4ZWY5YzE4NGEg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJ5 cnVuLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJ5 cnVuLnB5CkBAIC01OCwxNSArNTgsMTYgQEAgZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9y dCBpbXBvcnQgRHJpdmVyLCBEcml2ZXJPdXRwdXQsIGZhY3RvcnkKICMgYWxsIG9mIHRoZSBtZXRo b2RzIGFyZSBwYXNzZWQgdG8gdGhlIF9fZGVsZWdhdGUsIG5vdCB0byB0aGUgYmFzZSBjbGFzcy4K IGNsYXNzIERyeVJ1blBvcnQob2JqZWN0KToKICAgICAiIiJEcnlSdW4gaW1wbGVtZW50YXRpb24g b2YgdGhlIFBvcnQgaW50ZXJmYWNlLiIiIgorICAgIHBvcnRfbmFtZSA9ICdkcnlydW4nCiAKLSAg ICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgKiprd2FyZ3MpOgotICAgICAgICBwZnggPSAnZHJ5 cnVuLScKLSAgICAgICAgaWYgJ3BvcnRfbmFtZScgaW4ga3dhcmdzOgotICAgICAgICAgICAgaWYg a3dhcmdzWydwb3J0X25hbWUnXS5zdGFydHN3aXRoKHBmeCk6Ci0gICAgICAgICAgICAgICAga3dh cmdzWydwb3J0X25hbWUnXSA9IGt3YXJnc1sncG9ydF9uYW1lJ11bbGVuKHBmeCk6XQotICAgICAg ICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBrd2FyZ3NbJ3BvcnRfbmFtZSddID0gTm9uZQot ICAgICAgICBzZWxmLl9fZGVsZWdhdGUgPSBmYWN0b3J5LlBvcnRGYWN0b3J5KGhvc3QpLmdldCgq Kmt3YXJncykKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9u YW1lKGNscywgaG9zdCwgb3B0aW9ucywgcG9ydF9uYW1lKToKKyAgICAgICAgIiIiUmV0dXJuIGEg ZnVsbHktc3BlY2lmaWVkIHBvcnQgbmFtZSB0aGF0IGNhbiBiZSB1c2VkIHRvIGNvbnN0cnVjdCBv YmplY3RzLiIiIgorICAgICAgICAjIFN1YmNsYXNzZXMgd2lsbCB1c3VhbGx5IG92ZXJyaWRlIHRo aXMuCisgICAgICAgIHJldHVybiBwb3J0X25hbWUKKworICAgIGRlZiBfX2luaXRfXyhzZWxmLCBo b3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKToKKyAgICAgICAgc2VsZi5fX2RlbGVnYXRlID0gZmFj dG9yeS5Qb3J0RmFjdG9yeShob3N0KS5nZXQocG9ydF9uYW1lLnJlcGxhY2UoJ2RyeXJ1bi0nLCAn JyksICoqa3dhcmdzKQogCiAgICAgZGVmIF9fZ2V0YXR0cl9fKHNlbGYsIG5hbWUpOgogICAgICAg ICByZXR1cm4gZ2V0YXR0cihzZWxmLl9fZGVsZWdhdGUsIG5hbWUpCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2VmbC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZWZsLnB5CmluZGV4IDNhYzcxZDU3MTQ3OGYz ODgzYTFkMGRkY2Q2NzBkN2JlMzFhNWU5ZDguLmE0YjcwYTM3ODk2MWViOTFiMWExZTNmNDFiODU5 ZTY0MmYxNzk4NmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvZWZsLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvZWZsLnB5CkBAIC0zOCwxMSArMzgsNyBAQCBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIo X19uYW1lX18pCiAKIAogY2xhc3MgRWZsUG9ydChXZWJLaXRQb3J0KToKLSAgICBwb3J0X25hbWUg PSAiZWZsIgotCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsICoqa3dhcmdzKToKLSAgICAg ICAgV2ViS2l0UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCAqKmt3YXJncykKLSAgICAgICAgc2Vs Zi5fdmVyc2lvbiA9IHNlbGYucG9ydF9uYW1lCisgICAgcG9ydF9uYW1lID0gJ2VmbCcKIAogICAg IGRlZiBfcG9ydF9mbGFnX2Zvcl9zY3JpcHRzKHNlbGYpOgogICAgICAgICByZXR1cm4gIi0tZWZs IgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9m YWN0b3J5LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0 b3J5LnB5CmluZGV4IDcwOTUwMGQzNTVlNzAyMzA2YWQzMTgxYTViYTI0MDkxNmVjZTc4ZmUuLjk3 NWUyZDc0NTY3MGExNjI1YWQ1YWFjNWUzNjk5ZjYwODIwMjg5NTUgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeS5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnkucHkKQEAgLTc0LDYg Kzc0LDcgQEAgY2xhc3MgUG9ydEZhY3Rvcnkob2JqZWN0KToKICAgICAgICAgcG9ydF9uYW1lIGlz IE5vbmUsIHRoaXMgcm91dGluZSBhdHRlbXB0cyB0byBndWVzcyBhdCB0aGUgbW9zdAogICAgICAg ICBhcHByb3ByaWF0ZSBwb3J0IG9uIHRoaXMgcGxhdGZvcm0uIiIiCiAgICAgICAgIHBvcnRfdG9f dXNlID0gc2VsZi5fcG9ydF9uYW1lX2Zyb21fYXJndW1lbnRzX2FuZF9vcHRpb25zKHBvcnRfbmFt ZSwgb3B0aW9ucywgc2VsZi5faG9zdC5wbGF0Zm9ybSkKKyAgICAgICAgcG9ydF9uYW1lID0gcG9y dF9uYW1lIG9yIHBvcnRfdG9fdXNlCiAgICAgICAgIGlmIHBvcnRfdG9fdXNlLnN0YXJ0c3dpdGgo J3Rlc3QnKToKICAgICAgICAgICAgIGltcG9ydCB0ZXN0CiAgICAgICAgICAgICBtYWtlciA9IHRl c3QuVGVzdFBvcnQKQEAgLTEzNyw3ICsxMzgsOCBAQCBjbGFzcyBQb3J0RmFjdG9yeShvYmplY3Qp OgogICAgICAgICBlbHNlOgogICAgICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcign dW5zdXBwb3J0ZWQgcG9ydDogJXMnICUgcG9ydF90b191c2UpCiAKLSAgICAgICAgcmV0dXJuIG1h a2VyKHNlbGYuX2hvc3QsIHBvcnRfbmFtZT1wb3J0X25hbWUsIG9wdGlvbnM9b3B0aW9ucywgKipr d2FyZ3MpCisgICAgICAgIHBvcnRfbmFtZSA9IG1ha2VyLmRldGVybWluZV9mdWxsX3BvcnRfbmFt ZShzZWxmLl9ob3N0LCBvcHRpb25zLCBwb3J0X25hbWUpCisgICAgICAgIHJldHVybiBtYWtlcihz ZWxmLl9ob3N0LCBwb3J0X25hbWUsIG9wdGlvbnM9b3B0aW9ucywgKiprd2FyZ3MpCiAKICAgICBk ZWYgYWxsX3BvcnRfbmFtZXMoc2VsZik6CiAgICAgICAgICIiIlJldHVybiBhIGxpc3Qgb2YgYWxs IHZhbGlkLCBmdWxseS1zcGVjaWZpZWQsICJyZWFsIiBwb3J0IG5hbWVzLgpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5X3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5X3Vu aXR0ZXN0LnB5CmluZGV4IDFiMWZmM2YzZmNiOTJmYmI3N2Q4MzE4OWY2ZjhmZjgzOGUzZmE0Y2Qu LmI1NjdmNzNiODk2ODhlZTA3Yjk2YTk3MGJiZGZhZDZkODcwZjM3OWEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeV91bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3Rvcnlf dW5pdHRlc3QucHkKQEAgLTU3LDcgKzU3LDkgQEAgY2xhc3MgRmFjdG9yeVRlc3QodW5pdHRlc3Qu VGVzdENhc2UpOgogICAgIGRlZiBhc3NlcnRfcG9ydChzZWxmLCBwb3J0X25hbWU9Tm9uZSwgb3Nf bmFtZT1Ob25lLCBvc192ZXJzaW9uPU5vbmUsIG9wdGlvbnM9Tm9uZSwgY2xzPU5vbmUpOgogICAg ICAgICBob3N0ID0gTW9ja1N5c3RlbUhvc3Qob3NfbmFtZT1vc19uYW1lLCBvc192ZXJzaW9uPW9z X3ZlcnNpb24pCiAgICAgICAgIHBvcnQgPSBQb3J0RmFjdG9yeShob3N0KS5nZXQocG9ydF9uYW1l LCBvcHRpb25zPW9wdGlvbnMpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShpc2luc3RhbmNlKHBv cnQsIGNscykpCisgICAgICAgICMgRklYTUU6IFRoaXMgd2lsbCBmYWlsIHVudGlsIHdlIGZpbmlz aCByZWZhY3RvcmluZyBmYWN0b3J5LnB5LgorICAgICAgICAjIHNlbGYuYXNzZXJ0VHJ1ZShpc2lu c3RhbmNlKHBvcnQsIGNscykpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuX19jbGFz c19fLl9fbmFtZV9fLCBjbHMuX19uYW1lX18pCiAKICAgICBkZWYgdGVzdF9tYWMoc2VsZik6CiAg ICAgICAgIHNlbGYuYXNzZXJ0X3BvcnQocG9ydF9uYW1lPSdtYWMnLCBjbHM9bWFjLk1hY1BvcnQp CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2dv b2dsZV9jaHJvbWUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2dvb2dsZV9jaHJvbWUucHkKaW5kZXggMWQ3NzgzMTI2ODRmOWE2MjYxYjUyYTViMzFjMzFiZTQ2 Nzc0MGVjZi4uNTFmODNkZWQxZDcwYWFhNmExYTg5OGI0NTM2ZmIxM2JhNzBiMDZiYyAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9nb29nbGVfY2hy b21lLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ29v Z2xlX2Nocm9tZS5weQpAQCAtNDcsNiArNDcsMTMgQEAgZGVmIF90ZXN0X2V4cGVjdGF0aW9uc19v dmVycmlkZXMocG9ydCwgc3VwZXIpOgogCiAKIGNsYXNzIEdvb2dsZUNocm9tZUxpbnV4MzJQb3J0 KGNocm9taXVtX2xpbnV4LkNocm9taXVtTGludXhQb3J0KToKKyAgICBwb3J0X25hbWUgPSAnZ29v Z2xlLWNocm9tZS1saW51eDMyJworCisgICAgIyBGSVhNRTogTWFrZSBnb29nbGUtY2hyb21lLVhY WCB3b3JrIGFzIGEgcG9ydCBuYW1lLgorICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBkZXRlcm1p bmVfZnVsbF9wb3J0X25hbWUoY2xzLCBob3N0LCBvcHRpb25zLCBwb3J0X25hbWUpOgorICAgICAg ICByZXR1cm4gJ2Nocm9taXVtLWxpbnV4LXg4NicKKwogICAgIGRlZiBiYXNlbGluZV9zZWFyY2hf cGF0aChzZWxmKToKICAgICAgICAgcGF0aHMgPSBjaHJvbWl1bV9saW51eC5DaHJvbWl1bUxpbnV4 UG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKQogICAgICAgICBwYXRocy5pbnNlcnQoMCwg c2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoJ2dvb2dsZS1jaHJvbWUtbGludXgzMicpKQpAQCAt NjAsNiArNjcsMTMgQEAgY2xhc3MgR29vZ2xlQ2hyb21lTGludXgzMlBvcnQoY2hyb21pdW1fbGlu dXguQ2hyb21pdW1MaW51eFBvcnQpOgogCiAKIGNsYXNzIEdvb2dsZUNocm9tZUxpbnV4NjRQb3J0 KGNocm9taXVtX2xpbnV4LkNocm9taXVtTGludXhQb3J0KToKKyAgICBwb3J0X25hbWUgPSAnZ29v Z2xlLWNocm9tZS1saW51eDY0JworCisgICAgIyBGSVhNRTogTWFrZSBnb29nbGUtY2hyb21lLVhY WCB3b3JrIGFzIGEgcG9ydCBuYW1lLgorICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBkZXRlcm1p bmVfZnVsbF9wb3J0X25hbWUoY2xzLCBob3N0LCBvcHRpb25zLCBwb3J0X25hbWUpOgorICAgICAg ICByZXR1cm4gJ2Nocm9taXVtLWxpbnV4LXg4Nl82NCcKKwogICAgIGRlZiBiYXNlbGluZV9zZWFy Y2hfcGF0aChzZWxmKToKICAgICAgICAgcGF0aHMgPSBjaHJvbWl1bV9saW51eC5DaHJvbWl1bUxp bnV4UG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKQogICAgICAgICBwYXRocy5pbnNlcnQo MCwgc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoJ2dvb2dsZS1jaHJvbWUtbGludXg2NCcpKQpA QCAtNzMsNiArODcsMTMgQEAgY2xhc3MgR29vZ2xlQ2hyb21lTGludXg2NFBvcnQoY2hyb21pdW1f bGludXguQ2hyb21pdW1MaW51eFBvcnQpOgogCiAKIGNsYXNzIEdvb2dsZUNocm9tZU1hY1BvcnQo Y2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydCk6CisgICAgcG9ydF9uYW1lID0gJ2dvb2dsZS1j aHJvbWUtbWFjJworCisgICAgIyBGSVhNRTogTWFrZSBnb29nbGUtY2hyb21lLVhYWCB3b3JrIGFz IGEgcG9ydCBuYW1lLgorICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBkZXRlcm1pbmVfZnVsbF9w b3J0X25hbWUoY2xzLCBob3N0LCBvcHRpb25zLCBwb3J0X25hbWUpOgorICAgICAgICByZXR1cm4g J2Nocm9taXVtLW1hYy1sZW9wYXJkJworCiAgICAgZGVmIGJhc2VsaW5lX3NlYXJjaF9wYXRoKHNl bGYpOgogICAgICAgICBwYXRocyA9IGNocm9taXVtX21hYy5DaHJvbWl1bU1hY1BvcnQuYmFzZWxp bmVfc2VhcmNoX3BhdGgoc2VsZikKICAgICAgICAgcGF0aHMuaW5zZXJ0KDAsIHNlbGYuX3dlYmtp dF9iYXNlbGluZV9wYXRoKCdnb29nbGUtY2hyb21lLW1hYycpKQpAQCAtODMsNiArMTA0LDEzIEBA IGNsYXNzIEdvb2dsZUNocm9tZU1hY1BvcnQoY2hyb21pdW1fbWFjLkNocm9taXVtTWFjUG9ydCk6 CiAKIAogY2xhc3MgR29vZ2xlQ2hyb21lV2luUG9ydChjaHJvbWl1bV93aW4uQ2hyb21pdW1XaW5Q b3J0KToKKyAgICBwb3J0X25hbWUgPSAnZ29vZ2xlLWNocm9tZS13aW4nCisKKyAgICAjIEZJWE1F OiBNYWtlIGdvb2dsZS1jaHJvbWUtWFhYIHdvcmsgYXMgYSBwb3J0IG5hbWUuCisgICAgQGNsYXNz bWV0aG9kCisgICAgZGVmIGRldGVybWluZV9mdWxsX3BvcnRfbmFtZShjbHMsIGhvc3QsIG9wdGlv bnMsIHBvcnRfbmFtZSk6CisgICAgICAgIHJldHVybiAnY2hyb21pdW0td2luLXhwJworCiAgICAg ZGVmIGJhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgogICAgICAgICBwYXRocyA9IGNocm9taXVt X3dpbi5DaHJvbWl1bVdpblBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZikKICAgICAgICAg cGF0aHMuaW5zZXJ0KDAsIHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoKCdnb29nbGUtY2hyb21l LXdpbicpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9ndGsucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0 ay5weQppbmRleCBmN2IzZGIwNGMwNjE2NTZiZGJlMTQ5ZGNhOTZiZDgwOWE1ZjNjYjEzLi5iNmE1 Y2FhMmUzODBmNDdiY2I5Yzg4YTcyM2ZkMTdlNGRkMWM0NmY0IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2d0ay5weQpAQCAtNzYsMTAgKzc2LDYgQEAg Y2xhc3MgR3RrRHJpdmVyKFdlYktpdERyaXZlcik6CiBjbGFzcyBHdGtQb3J0KFdlYktpdFBvcnQp OgogICAgIHBvcnRfbmFtZSA9ICJndGsiCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwg Kiprd2FyZ3MpOgotICAgICAgICBXZWJLaXRQb3J0Ll9faW5pdF9fKHNlbGYsIGhvc3QsICoqa3dh cmdzKQotICAgICAgICBzZWxmLl92ZXJzaW9uID0gc2VsZi5wb3J0X25hbWUKLQogICAgIGRlZiBf cG9ydF9mbGFnX2Zvcl9zY3JpcHRzKHNlbGYpOgogICAgICAgICByZXR1cm4gIi0tZ3RrIgogCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5CmluZGV4 IGMxMWMwYTBhM2EwMTc0OGE1ZjE4ZDEzNWE5MGY1YzQ2Y2NlMTM0NjcuLmZjMTkyNWM5MWViN2Ex Y2VhMjRiNjQ3MmI5MzYwZDM4MTc3M2YzZTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5CkBAIC00Miw4ICs0Miw4IEBAIGNsYXNzIE1hY1Bv cnQoQXBwbGVQb3J0KToKICAgICAjIGFuZCB0aGUgb3JkZXIgb2YgZmFsbGJhY2sgYmV0d2VlbiB0 aGVtLiAgTWF0Y2hlcyBPUldULgogICAgIFZFUlNJT05fRkFMTEJBQ0tfT1JERVIgPSBbIm1hYy1s ZW9wYXJkIiwgIm1hYy1zbm93bGVvcGFyZCIsICJtYWMtbGlvbiIsICJtYWMiXQogCi0gICAgZGVm IF9faW5pdF9fKHNlbGYsIGhvc3QsICoqa3dhcmdzKToKLSAgICAgICAgQXBwbGVQb3J0Ll9faW5p dF9fKHNlbGYsIGhvc3QsICoqa3dhcmdzKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBw b3J0X25hbWUsICoqa3dhcmdzKToKKyAgICAgICAgQXBwbGVQb3J0Ll9faW5pdF9fKHNlbGYsIGhv c3QsIHBvcnRfbmFtZSwgKiprd2FyZ3MpCiAgICAgICAgIHNlbGYuX2xlYWtfZGV0ZWN0b3IgPSBM ZWFrRGV0ZWN0b3Ioc2VsZikKICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCJsZWFrcyIpOgog ICAgICAgICAgICAgIyBEdW1wUmVuZGVyVHJlZSBzbG93cyBkb3duIG5vdGljYWJseSBpZiB3ZSBy dW4gbW9yZSB0aGFuIGFib3V0IDEwMDAgdGVzdHMgaW4gYSBiYXRjaApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5pdHRlc3QucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weQpp bmRleCA4OTY1ZmI4NGMyYTQ0YThmYTlhZjQ4NmRlZDIwNWE3Mzk1Mjg0MjRiLi43Mzc2NjI5NmM0 ZWMzNzA4YmIzYzE1ODViNzY3YmQ3ZTJhNTE3ZWEzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hY191bml0dGVzdC5weQpAQCAtOTgs MjMgKzk4LDE5IEBAIGphdmEvCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LnZlcnNpb24o KSkKIAogICAgIGRlZiB0ZXN0X3ZlcnNpb25zKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydF9u YW1lKE5vbmUsICdsZW9wYXJkJywgJ21hYy1sZW9wYXJkJykKICAgICAgICAgc2VsZi5hc3NlcnRf bmFtZSgnbWFjJywgJ2xlb3BhcmQnLCAnbWFjLWxlb3BhcmQnKQogICAgICAgICBzZWxmLmFzc2Vy dF9uYW1lKCdtYWMtbGVvcGFyZCcsICd0aWdlcicsICdtYWMtbGVvcGFyZCcpCiAgICAgICAgIHNl bGYuYXNzZXJ0X25hbWUoJ21hYy1sZW9wYXJkJywgJ2xlb3BhcmQnLCAnbWFjLWxlb3BhcmQnKQog ICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdtYWMtbGVvcGFyZCcsICdzbm93bGVvcGFyZCcsICdt YWMtbGVvcGFyZCcpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRfbmFtZShOb25lLCAnc25vd2xlb3Bh cmQnLCAnbWFjLXNub3dsZW9wYXJkJykKICAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgnbWFjJywg J3Nub3dsZW9wYXJkJywgJ21hYy1zbm93bGVvcGFyZCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0X25h bWUoJ21hYy1zbm93bGVvcGFyZCcsICd0aWdlcicsICdtYWMtc25vd2xlb3BhcmQnKQogICAgICAg ICBzZWxmLmFzc2VydF9uYW1lKCdtYWMtc25vd2xlb3BhcmQnLCAnbGVvcGFyZCcsICdtYWMtc25v d2xlb3BhcmQnKQogICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdtYWMtc25vd2xlb3BhcmQnLCAn c25vd2xlb3BhcmQnLCAnbWFjLXNub3dsZW9wYXJkJykKIAotICAgICAgICBzZWxmLmFzc2VydF9u YW1lKE5vbmUsICdsaW9uJywgJ21hYy1saW9uJykKICAgICAgICAgc2VsZi5hc3NlcnRfbmFtZSgn bWFjJywgJ2xpb24nLCAnbWFjLWxpb24nKQogICAgICAgICBzZWxmLmFzc2VydF9uYW1lKCdtYWMt bGlvbicsICdsaW9uJywgJ21hYy1saW9uJykKIAotICAgICAgICBzZWxmLmFzc2VydF9uYW1lKE5v bmUsICdmdXR1cmUnLCAnbWFjLWZ1dHVyZScpCiAgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ21h YycsICdmdXR1cmUnLCAnbWFjLWZ1dHVyZScpCiAgICAgICAgIHNlbGYuYXNzZXJ0X25hbWUoJ21h Yy1mdXR1cmUnLCAnZnV0dXJlJywgJ21hYy1mdXR1cmUnKQogCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0LnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydC5weQppbmRleCBkNTM1OWRl Yzc5NTBjYTYxNDdiMzFmYzQ2YzRiYjg0MWY1NDNjNWZhLi5mMjg0ZTc2OWZlOTIzZjc5MDdkYTI4 ZmVjNzRjNmE4MjgzZjI2Mzc2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnQucHkKQEAgLTUwLDE0ICs1MCwxOCBAQCBfbG9nID0g bG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKIGNsYXNzIE1vY2tEUlRQb3J0KG9iamVjdCk6 CiAgICAgIiIiTW9ja1BvcnQgaW1wbGVtZW50YXRpb24gb2YgdGhlIFBvcnQgaW50ZXJmYWNlLiIi IgorICAgIHBvcnRfbmFtZSA9ICdtb2NrJwogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3Qs ICoqa3dhcmdzKToKLSAgICAgICAgcHJlZml4ID0gJ21vY2stJwotICAgICAgICBpZiAncG9ydF9u YW1lJyBpbiBrd2FyZ3M6Ci0gICAgICAgICAgICBrd2FyZ3NbJ3BvcnRfbmFtZSddID0ga3dhcmdz Wydwb3J0X25hbWUnXVtsZW4ocHJlZml4KTpdCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGRl dGVybWluZV9mdWxsX3BvcnRfbmFtZShjbHMsIGhvc3QsIG9wdGlvbnMsIHBvcnRfbmFtZSk6Cisg ICAgICAgICIiIlJldHVybiBhIGZ1bGx5LXNwZWNpZmllZCBwb3J0IG5hbWUgdGhhdCBjYW4gYmUg dXNlZCB0byBjb25zdHJ1Y3Qgb2JqZWN0cy4iIiIKKyAgICAgICAgIyBTdWJjbGFzc2VzIHdpbGwg dXN1YWxseSBvdmVycmlkZSB0aGlzLgorICAgICAgICByZXR1cm4gcG9ydF9uYW1lCisKKyAgICBk ZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lLCAqKmt3YXJncyk6CisgICAgICAgIHNl bGYuX19kZWxlZ2F0ZSA9IFBvcnRGYWN0b3J5KGhvc3QpLmdldChwb3J0X25hbWUucmVwbGFjZSgn bW9jay0nLCAnJyksICoqa3dhcmdzKQorICAgICAgICBzZWxmLl9fcmVhbF9uYW1lID0gcG9ydF9u YW1lCiAgICAgICAgIHNlbGYuX2hvc3QgPSBob3N0Ci0gICAgICAgIHNlbGYuX19kZWxlZ2F0ZSA9 IFBvcnRGYWN0b3J5KGhvc3QpLmdldCgqKmt3YXJncykKLSAgICAgICAgc2VsZi5fX3JlYWxfbmFt ZSA9IHByZWZpeCArIHNlbGYuX19kZWxlZ2F0ZS5uYW1lKCkKIAogICAgIGRlZiByZWFsX25hbWUo c2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9fcmVhbF9uYW1lCkBAIC0xNzQsNiArMTc4LDEy IEBAIGNsYXNzIF9EUlRJbnB1dChvYmplY3QpOgogCiAKIGNsYXNzIE1vY2tEUlQob2JqZWN0KToK KyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGNscywg aG9zdCwgb3B0aW9ucywgcG9ydF9uYW1lKToKKyAgICAgICAgIiIiUmV0dXJuIGEgZnVsbHktc3Bl Y2lmaWVkIHBvcnQgbmFtZSB0aGF0IGNhbiBiZSB1c2VkIHRvIGNvbnN0cnVjdCBvYmplY3RzLiIi IgorICAgICAgICAjIFN1YmNsYXNzZXMgd2lsbCB1c3VhbGx5IG92ZXJyaWRlIHRoaXMuCisgICAg ICAgIHJldHVybiBjbHMucG9ydF9uYW1lCisKICAgICBkZWYgX19pbml0X18oc2VsZiwgb3B0aW9u cywgYXJncywgaG9zdCwgc3RkaW4sIHN0ZG91dCwgc3RkZXJyKToKICAgICAgICAgc2VsZi5fb3B0 aW9ucyA9IG9wdGlvbnMKICAgICAgICAgc2VsZi5fYXJncyA9IGFyZ3MKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5w eQppbmRleCBhMDIxY2JjOThlNjM3MDg0NDMzZjU5YTRiNzllOGFiZmVjNjU5ZTNiLi4zOGI1NGZl NjRjY2NlNThhNmJjZWRkODIzNzJhYjA1NDgzN2E0MTMxIDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3BvcnRfdGVzdGNhc2UucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CkBA IC01OSwxMCArNTksMTIgQEAgY2xhc3MgUG9ydFRlc3RDYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICBvc192ZXJzaW9uID0gTm9uZQogICAgIHBvcnRfbWFrZXIgPSBOb25lCiAKLSAgICBkZWYg bWFrZV9wb3J0KHNlbGYsIGhvc3Q9Tm9uZSwgb3B0aW9ucz1Ob25lLCBvc19uYW1lPU5vbmUsIG9z X3ZlcnNpb249Tm9uZSwgKiprd2FyZ3MpOgorICAgIGRlZiBtYWtlX3BvcnQoc2VsZiwgaG9zdD1O b25lLCBwb3J0X25hbWU9Tm9uZSwgb3B0aW9ucz1Ob25lLCBvc19uYW1lPU5vbmUsIG9zX3ZlcnNp b249Tm9uZSwgKiprd2FyZ3MpOgogICAgICAgICBob3N0ID0gaG9zdCBvciBNb2NrU3lzdGVtSG9z dChvc19uYW1lPShvc19uYW1lIG9yIHNlbGYub3NfbmFtZSksIG9zX3ZlcnNpb249KG9zX3ZlcnNp b24gb3Igc2VsZi5vc192ZXJzaW9uKSkKICAgICAgICAgb3B0aW9ucyA9IG9wdGlvbnMgb3IgTW9j a09wdGlvbnMoY29uZmlndXJhdGlvbj0nUmVsZWFzZScpCi0gICAgICAgIHJldHVybiBzZWxmLnBv cnRfbWFrZXIoaG9zdCwgb3B0aW9ucz1vcHRpb25zLCAqKmt3YXJncykKKyAgICAgICAgcG9ydF9u YW1lID0gcG9ydF9uYW1lIG9yIHNlbGYucG9ydF9uYW1lCisgICAgICAgIHBvcnRfbmFtZSA9IHNl bGYucG9ydF9tYWtlci5kZXRlcm1pbmVfZnVsbF9wb3J0X25hbWUoaG9zdCwgb3B0aW9ucywgcG9y dF9uYW1lKQorICAgICAgICByZXR1cm4gc2VsZi5wb3J0X21ha2VyKGhvc3QsIHBvcnRfbmFtZSwg b3B0aW9ucz1vcHRpb25zLCAqKmt3YXJncykKIAogICAgIGRlZiB0ZXN0X2RlZmF1bHRfd29ya2Vy X21vZGVsKHNlbGYpOgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKaW5kZXggNzAxMzc1ZTFl MmI2NmYwNzA4MGUwZTcxNzAwYzI1ZWFkNmM1MjcxMy4uMjQ0NTg3NjhjNzE4MzZkZjIzZmVkNTFk NWIzODY3M2I3ZTg3MmI4MCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9xdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3F0LnB5CkBAIC00OSwyMyArNDksMjIgQEAgY2xhc3MgUXRQb3J0KFdlYktpdFBv cnQpOgogICAgIGRlZiBfcG9ydF9mbGFnX2Zvcl9zY3JpcHRzKHNlbGYpOgogICAgICAgICByZXR1 cm4gIi0tcXQiCiAKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9y dF9uYW1lKGNscywgaG9zdCwgb3B0aW9ucywgcG9ydF9uYW1lKToKKyAgICAgICAgaWYgcG9ydF9u YW1lIGFuZCBwb3J0X25hbWUgIT0gY2xzLnBvcnRfbmFtZToKKyAgICAgICAgICAgIHJldHVybiBw b3J0X25hbWUKKyAgICAgICAgcmV0dXJuIHBvcnRfbmFtZSArICctJyArIGhvc3QucGxhdGZvcm0u b3NfbmFtZQorCiAgICAgIyBzeXNfcGxhdGZvcm0gZXhpc3RzIG9ubHkgZm9yIHVuaXQgdGVzdGlu Zy4KLSAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lPU5vbmUsICoqa3dhcmdz KToKLSAgICAgICAgcG9ydF9uYW1lID0gcG9ydF9uYW1lIG9yIHNlbGYucG9ydF9uYW1lCi0gICAg ICAgIFdlYktpdFBvcnQuX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lPU5vbmUsICoqa3dh cmdzKQotICAgICAgICBzZWxmLl9vcGVyYXRpbmdfc3lzdGVtID0gaG9zdC5wbGF0Zm9ybS5vc19u YW1lCi0gICAgICAgIHNlbGYuX3ZlcnNpb24gPSBzZWxmLm9wZXJhdGluZ19zeXN0ZW0oKQorICAg IGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKToKKyAgICAgICAg V2ViS2l0UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKQogCiAg ICAgICAgICMgRklYTUU6IFRoaXMgd2lsbCBhbGxvdyBXZWJLaXRQb3J0LmJhc2VsaW5lX3NlYXJj aF9wYXRoIGFuZCBXZWJLaXRQb3J0Ll9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhzCiAgICAgICAg ICMgdG8gZG8gdGhlIHJpZ2h0IHRoaW5nLCBidXQgZG9lc24ndCBpbmNsdWRlIHN1cHBvcnQgZm9y IHF0LTQuOCBvciBxdC1hcm0gKHNlZW4gaW4gTGF5b3V0VGVzdHMvcGxhdGZvcm0pIHlldC4KKyAg ICAgICAgc2VsZi5fb3BlcmF0aW5nX3N5c3RlbSA9IHBvcnRfbmFtZS5yZXBsYWNlKCdxdC0nLCAn JykKIAotICAgICAgICBpZiBwb3J0X25hbWUgIT0gc2VsZi5wb3J0X25hbWU6Ci0gICAgICAgICAg ICBzZWxmLl9uYW1lID0gcG9ydF9uYW1lCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBuYW1l X2NvbXBvbmVudHMgPSBbc2VsZi5wb3J0X25hbWVdCi0gICAgICAgICAgICBpZiBzZWxmLm9wZXJh dGluZ19zeXN0ZW0oKToKLSAgICAgICAgICAgICAgICBuYW1lX2NvbXBvbmVudHMuYXBwZW5kKHNl bGYub3BlcmF0aW5nX3N5c3RlbSgpKQotICAgICAgICAgICAgc2VsZi5fbmFtZSA9ICItIi5qb2lu KG5hbWVfY29tcG9uZW50cykKKyAgICAgICAgIyBGSVhNRTogV2h5IGlzIHRoaXMgYmVpbmcgc2V0 IGF0IGFsbD8KKyAgICAgICAgc2VsZi5fdmVyc2lvbiA9IHNlbGYub3BlcmF0aW5nX3N5c3RlbSgp CiAKICAgICBkZWYgX2dlbmVyYXRlX2FsbF90ZXN0X2NvbmZpZ3VyYXRpb25zKHNlbGYpOgogICAg ICAgICBjb25maWd1cmF0aW9ucyA9IFtdCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3Rlc3QucHkKaW5kZXggMGQ1MWNmOTAxMmI4Nzg0NWY3MTJlOGFmYWRm YjlhNWM2ZDhhNmM0Mi4uNGNjMjRhMzg3NWZmMmI1OWY1NzdjMWE3YTdkMzYxNTMwMWY3YWUyNSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0 LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5w eQpAQCAtMzA0LDYgKzMwNCw4IEBAIFdPTlRGSVggU0tJUCA6IGZhaWx1cmVzL2V4cGVjdGVkL2V4 Y2VwdGlvbi5odG1sID0gQ1JBU0gKIAogCiBjbGFzcyBUZXN0UG9ydChQb3J0KToKKyAgICBwb3J0 X25hbWUgPSAndGVzdCcKKwogICAgICIiIlRlc3QgaW1wbGVtZW50YXRpb24gb2YgdGhlIFBvcnQg aW50ZXJmYWNlLiIiIgogICAgIEFMTF9CQVNFTElORV9WQVJJQU5UUyA9ICgKICAgICAgICAgJ3Rl c3QtbWFjLXNub3dsZW9wYXJkJywgJ3Rlc3QtbWFjLWxlb3BhcmQnLApAQCAtMzExLDE2ICszMTMs MjEgQEAgY2xhc3MgVGVzdFBvcnQoUG9ydCk6CiAgICAgICAgICd0ZXN0LWxpbnV4LXg4Nl82NCcs CiAgICAgKQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZT1Ob25lLCAq Kmt3YXJncyk6Ci0gICAgICAgIGlmIG5vdCBwb3J0X25hbWUgb3IgcG9ydF9uYW1lID09ICd0ZXN0 JzoKLSAgICAgICAgICAgIHBvcnRfbmFtZSA9ICd0ZXN0LW1hYy1sZW9wYXJkJworICAgIEBjbGFz c21ldGhvZAorICAgIGRlZiBkZXRlcm1pbmVfZnVsbF9wb3J0X25hbWUoY2xzLCBob3N0LCBvcHRp b25zLCBwb3J0X25hbWUpOgorICAgICAgICBpZiBwb3J0X25hbWUgPT0gJ3Rlc3QnOgorICAgICAg ICAgICAgcmV0dXJuICd0ZXN0LW1hYy1sZW9wYXJkJworICAgICAgICByZXR1cm4gcG9ydF9uYW1l CiAKKyAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lPU5vbmUsICoqa3dhcmdz KToKKyAgICAgICAgIyBGSVhNRTogQ29uc2lkZXIgdXBkYXRpbmcgYWxsIG9mIHRoZSBjYWxsZXJz IHRvIHBhc3MgaW4gYSBwb3J0X25hbWUgc28gaXQgY2FuIGJlIGEKKyAgICAgICAgIyByZXF1aXJl ZCBwYXJhbWV0ZXIgbGlrZSBhbGwgb2YgdGhlIG90aGVyIFBvcnQgb2JqZWN0cy4KKyAgICAgICAg cG9ydF9uYW1lID0gcG9ydF9uYW1lIG9yICd0ZXN0LW1hYy1sZW9wYXJkJworICAgICAgICBQb3J0 Ll9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZSwgKiprd2FyZ3MpCiAgICAgICAgIHNlbGYu X3Rlc3RzID0gdW5pdF90ZXN0X2xpc3QoKQogICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnNfcGF0 aCA9IExBWU9VVF9URVNUX0RJUiArICcvcGxhdGZvcm0vdGVzdC90ZXN0X2V4cGVjdGF0aW9ucy50 eHQnCiAgICAgICAgIHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5ID0gTm9uZQogCi0gICAgICAgIFBv cnQuX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lPXBvcnRfbmFtZSwgKiprd2FyZ3MpCi0K ICAgICAgICAgc2VsZi5fb3BlcmF0aW5nX3N5c3RlbSA9ICdtYWMnCiAgICAgICAgIGlmIHBvcnRf bmFtZS5zdGFydHN3aXRoKCd0ZXN0LXdpbicpOgogICAgICAgICAgICAgc2VsZi5fb3BlcmF0aW5n X3N5c3RlbSA9ICd3aW4nCkBAIC0zMzcsNyArMzQ0LDYgQEAgY2xhc3MgVGVzdFBvcnQoUG9ydCk6 CiAgICAgICAgIH0KICAgICAgICAgc2VsZi5fdmVyc2lvbiA9IHZlcnNpb25fbWFwW3BvcnRfbmFt ZV0KIAotCiAgICAgZGVmIF9wYXRoX3RvX2RyaXZlcihzZWxmKToKICAgICAgICAgIyBUaGlzIHJv dXRpbmUgc2hvdWxkbid0IG5vcm1hbGx5IGJlIGNhbGxlZCwgYnV0IGl0IGlzIGNhbGxlZCBieQog ICAgICAgICAjIHRoZSBtb2NrX2RydCBEcml2ZXIuIFdlIHJldHVybiBzb21ldGhpbmcsIGJ1dCBt YWtlIHN1cmUgaXQncyB1c2VsZXNzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQppbmRleCBjZGQ2YWYyZDZiNjY2MDg5MzdhOWU0OGQ5 Yjk1OWIxNmU2YzMzNWFiLi42YmJkYWNjNjQ3YmYyNjRkNGZjMGM1MWE2MDlhOWY5MWYyMzIyMjZm IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dl YmtpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dl YmtpdC5weQpAQCAtNTEsOCArNTEsOCBAQCBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1l X18pCiAKIAogY2xhc3MgV2ViS2l0UG9ydChQb3J0KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwg aG9zdCwgKiprd2FyZ3MpOgotICAgICAgICBQb3J0Ll9faW5pdF9fKHNlbGYsIGhvc3QsICoqa3dh cmdzKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWU9Tm9uZSwgKiprd2Fy Z3MpOgorICAgICAgICBQb3J0Ll9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZT1wb3J0X25h bWUsICoqa3dhcmdzKQogCiAgICAgICAgICMgRklYTUU6IERpc2FibGUgcGl4ZWwgdGVzdHMgdW50 aWwgdGhleSBhcmUgcnVuIGJ5IGRlZmF1bHQgb24gYnVpbGQud2Via2l0Lm9yZy4KICAgICAgICAg c2VsZi5zZXRfb3B0aW9uX2RlZmF1bHQoInBpeGVsX3Rlc3RzIiwgRmFsc2UpCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9yZWJhc2VsaW5lc2VydmVyLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvcmViYXNlbGluZXNlcnZlci5w eQppbmRleCAzOWM1YjllNTUxZGExZWYwZWE5MDY4MWM0OTRjOTU1NTlhYzhhMzVhLi4xNWJjZDZm NTU5NDMxYjVlNjE2ZWQ3NDY1MDQyOGY5ZTY0ZWIxMTZhIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9yZWJhc2VsaW5lc2VydmVyLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zZXJ2ZXJzL3JlYmFzZWxpbmVzZXJ2ZXIucHkKQEAgLTE2 NSw3ICsxNjUsNyBAQCBkZWYgZ2V0X3Rlc3RfYmFzZWxpbmVzKHRlc3RfZmlsZSwgdGVzdF9jb25m aWcpOgogICAgICMgRklYTUU6IFRoaXMgc2VlbXMgbGlrZSBhIGhhY2suIFRoaXMgb25seSBzZWVt cyB1c2VkIHRvIGFjY2VzcyB0aGUgUG9ydC5leHBlY3RlZF9iYXNlbGluZXMgbG9naWMuCiAgICAg Y2xhc3MgQWxsUGxhdGZvcm1zUG9ydChXZWJLaXRQb3J0KToKICAgICAgICAgZGVmIF9faW5pdF9f KHNlbGYsIGhvc3QpOgotICAgICAgICAgICAgV2ViS2l0UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0 KQorICAgICAgICAgICAgV2ViS2l0UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCAnbWFjJykKICAg ICAgICAgICAgIHNlbGYuX3BsYXRmb3Jtc19ieV9kaXJlY3RvcnkgPSBkaWN0KFsoc2VsZi5fd2Vi a2l0X2Jhc2VsaW5lX3BhdGgocCksIHApIGZvciBwIGluIHRlc3RfY29uZmlnLnBsYXRmb3Jtc10p CiAKICAgICAgICAgZGVmIGJhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvcmViYXNlbGluZXNlcnZlcl91bml0 dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zZXJ2ZXJzL3JlYmFzZWxpbmVz ZXJ2ZXJfdW5pdHRlc3QucHkKaW5kZXggMzBkMWU2NjEwMGQ3Mjg0NzhhYjg0YWY3NWE1NDczYmVl NDlkMGE3ZS4uMGI5YmM0M2FmZDRiZTQ5NDg4NDM2ZWUxMmEyZmQ0N2M0MjQ0ZGU2YSAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvcmViYXNlbGluZXNlcnZl cl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9y ZWJhc2VsaW5lc2VydmVyX3VuaXR0ZXN0LnB5CkBAIC0zMTAsMTEgKzMxMCw4IEBAIGRlZiBnZXRf dGVzdF9jb25maWcodGVzdF9maWxlcz1bXSwgcmVzdWx0X2ZpbGVzPVtdKToKICAgICBjbGFzcyBU ZXN0TWFjUG9ydChXZWJLaXRQb3J0KToKICAgICAgICAgcG9ydF9uYW1lID0gIm1hYyIKIAotICAg ICAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCk6Ci0gICAgICAgICAgICBXZWJLaXRQb3J0Ll9f aW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZT1zZWxmLnBvcnRfbmFtZSkKLQogICAgIHJldHVy biBUZXN0Q29uZmlnKAotICAgICAgICBUZXN0TWFjUG9ydChob3N0KSwKKyAgICAgICAgVGVzdE1h Y1BvcnQoaG9zdCwgJ21hYycpLAogICAgICAgICBsYXlvdXRfdGVzdHNfZGlyZWN0b3J5LAogICAg ICAgICByZXN1bHRzX2RpcmVjdG9yeSwKICAgICAgICAgKCdtYWMnLCAnbWFjLWxlb3BhcmQnLCAn d2luJywgJ2xpbnV4JyksCg==