149639 2015-09-29 13:26:19 -0700 [Win] Allow 'prepare-ChangeLog' to be used without Cygwin 2015-09-29 14:17:02 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build PC All RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham achristensen bfulgham commit-queue dbates lforschler oldest_to_newest 1129361 0 bfulgham 2015-09-29 13:26:19 -0700 Revise the file handling and work around some Windows Perl idiosyncracies to support running the 'prepare-ChangeLog' command without needing Cygwin. 1129366 1 262099 bfulgham 2015-09-29 13:36:20 -0700 Created attachment 262099 Patch 1129367 2 262099 bfulgham 2015-09-29 13:38:19 -0700 Comment on attachment 262099 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262099&action=review > Tools/Scripts/prepare-ChangeLog:110 > +sub resolveChangeLogsPath(@); Crap. This should be resolveChangeLogsPath($@). I'll upload a fix. 1129368 3 262100 bfulgham 2015-09-29 13:39:21 -0700 Created attachment 262100 Patch v2 (correct sub declaration) 1129380 4 262100 achristensen 2015-09-29 13:48:32 -0700 Comment on attachment 262100 Patch v2 (correct sub declaration) r=me 1129397 5 bfulgham 2015-09-29 14:17:02 -0700 Committed r190328: <http://trac.webkit.org/changeset/190328> 262099 2015-09-29 13:36:20 -0700 2015-09-29 13:39:18 -0700 Patch bug-149639-20150929135215.patch text/plain 8876 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5MDMyMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM0IEBACisyMDE1LTA5LTI5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIEFsbG93ICdwcmVwYXJlLUNoYW5nZUxvZycgdG8gYmUgdXNlZCB3 aXRob3V0IEN5Z3dpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ5NjM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBTY3JpcHRzL1ZDU1V0aWxzLnBtOgorICAgICAgICAoZXhpdFN0YXR1cyk6IFVzZSAn aXNXaW5kb3dzKCknIG1ldGhvZC4KKyAgICAgICAgKGlzU1ZOVmVyc2lvbjE2T3JOZXdlcik6ICdl dmFsJyBpcyBub3QgbmVlZGVkIGhlcmUsIGFuZCBqdXN0IGNhdXNlcworICAgICAgICBhbiBlcnJv ci4gVGhpcyBtZXRob2QgY291bGQgcHJvYmFibHkganVzdCBnbyBhd2F5LgorICAgICAgICAobm9y bWFsaXplUGF0aCk6IExlYXZlIFdpbmRvd3MgKG9yIFVuaXgpIHBhdGhzIGFzIHBsYXRmb3JtIHBh dGhzLCByYXRoZXIgdGhhbgorICAgICAgICBhbHdheXMgY2hhbmdpbmcgdG8gVW5peCBzdHlsZS4g CisgICAgICAgICh1bml4UGF0aCk6IEFkZGVkLiBOZWVkZWQgc28gV2luZG93cyBjYW4gYWx3YXlz IHNob3cgYSBVbml4IHBhdGggaW4gdGhlCisgICAgICAgIENoYW5nZUxvZyBmaWxlLgorICAgICAg ICAoY2hhbmdlTG9nTmFtZSk6IFdvcmsgYXJvdW5kIHRoZSBmYWN0IHRoYXQgJ2dldHB3dWlkJyBp cyBub3QgYXZhaWxhYmxlIG9uCisgICAgICAgIGEgcHVyZSBXaW5kb3dzIGJ1aWxkIG9mIFBlcmwu CisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoKKyAgICAgICAgKGdlbmVyYXRl RnVuY3Rpb25MaXN0cyk6IE5vcm1hbGl6ZSBwYXRoIHJlY2VpdmVkIGZyb20gJ3N2bicgaW4gY2Fz ZSBpdCdzIGEgVW5peAorICAgICAgICBwYXRoIG9uIFdpbmRvd3MuCisgICAgICAgIChzdm5VcGRh dGVDb21tYW5kKTogQWRkZWQgaGVscGVyIGZ1bmN0aW9uLiBOZWVkZWQgYmVjYXVzZSBXaW5kb3dz IFBlcmwgZG9lcyBub3QKKyAgICAgICAgc3VwcG9ydCB1c2luZyBhcnJheXMgZm9yICdvcGVuJyBh cmd1bWVudHMuCisgICAgICAgIChyZXNvbHZlQ2hhbmdlTG9nc1BhdGgpOiBEaXR0by4KKyAgICAg ICAgKHJlc29sdmVDb25mbGljdGVkQ2hhbmdlTG9ncyk6IFVzZSBuZXcgaGVscGVyIGZ1bmN0aW9u cy4KKyAgICAgICAgKGdlbmVyYXRlTmV3Q2hhbmdlTG9ncyk6IEZvcmNlIFdpbmRvd3MgdG8gdXNl IFVuaXggcGF0aHMgaW4gQ2hhbmdlTG9nIG91dHB1dC4KKyAgICAgICAgKGRpZmZDb21tYW5kKTog VXNlIGRvdWJsZS1xdW90ZXMgZm9yIHBhdGhzLCBzaW5jZSBXaW5kb3dzIGRvZXNuJ3QgdW5kZXJz dGFuZCBzaW5nbGUKKyAgICAgICAgcXVvdGVzLiBVbml4IHN5c3RlbXMgYXJlIGhhcHB5IGVpdGhl ciB3YXkuCisgICAgICAgIChzdGF0dXNDb21tYW5kKTogRGl0dG8uCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAobGF1bmNoZXJOYW1lKTogRHJpdmUtYnkgZml4LiBX aW5MYXVuY2hlciB3YXMgcmVuYW1lZCB0byBNaW5pQnJvd3NlciBzb21lIHRpbWUgYWdvLgorCiAy MDE1LTA5LTI5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAg IFtXaW5dIFVucmV2aWV3ZWQgNjQtYml0IGJ1aWxkIGZpeCBhZnRlciBzd2l0Y2ggdG8gQ01ha2Uu CkluZGV4OiBUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Nj cmlwdHMvVkNTVXRpbHMucG0JKHJldmlzaW9uIDE5MDMxMSkKKysrIFRvb2xzL1NjcmlwdHMvVkNT VXRpbHMucG0JKHdvcmtpbmcgY29weSkKQEAgLTEsNCArMSw0IEBACi0jIENvcHlyaWdodCAoQykg MjAwNywgMjAwOCwgMjAwOSwgMjAxMCwgMjAxMSwgMjAxMiwgMjAxMyBBcHBsZSBJbmMuICBBbGwg cmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMDctMjAxMywgMjAxNSBBcHBsZSBJ bmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogIyBDb3B5cmlnaHQgKEMpIDIwMDksIDIwMTAgQ2hy aXMgSmVyZG9uZWsgKGNocmlzLmplcmRvbmVrQGdtYWlsLmNvbSkKICMgQ29weXJpZ2h0IChDKSAy MDEwLCAyMDExIFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVk LgogIyBDb3B5cmlnaHQgKEMpIDIwMTIgRGFuaWVsIEJhdGVzIChkYmF0ZXNAaW50dWRhdGEuY29t KQpAQCAtOTAsNiArOTAsNyBAQCBCRUdJTiB7CiAgICAgICAgICZ0b1dpbmRvd3NMaW5lRW5kaW5n cwogICAgICAgICAmZ2l0Q29tbWl0Rm9yU1ZOUmV2aXNpb24KICAgICAgICAgJmxpc3RPZkNoYW5n ZWRGaWxlc0JldHdlZW5SZXZpc2lvbnMKKyAgICAgICAgJnVuaXhQYXRoCiAgICAgKTsKICAgICAl RVhQT1JUX1RBR1MgPSAoICk7CiAgICAgQEVYUE9SVF9PSyAgID0gKCk7CkBAIC0xMjYsNyArMTI3 LDcgQEAgbXkgJHN2blByb3BlcnR5VmFsdWVOb05ld2xpbmVSZWdFeCA9IHFyIwogc3ViIGV4aXRT dGF0dXMoJCkKIHsKICAgICBteSAoJHJldHVybnZhbHVlKSA9IEBfOwotICAgIGlmICgkXk8gZXEg Ik1TV2luMzIiKSB7CisgICAgaWYgKGlzV2luZG93cygpKSB7CiAgICAgICAgIHJldHVybiAkcmV0 dXJudmFsdWUgPj4gODsKICAgICB9CiAgICAgaWYgKCFXSUZFWElURUQoJHJldHVybnZhbHVlKSkg ewpAQCAtMzMzLDcgKzMzNCw3IEBAIHN1YiBzdm5WZXJzaW9uKCkKIHN1YiBpc1NWTlZlcnNpb24x Nk9yTmV3ZXIoKQogewogICAgIG15ICR2ZXJzaW9uID0gc3ZuVmVyc2lvbigpOwotICAgIHJldHVy biBldmFsICJ2JHZlcnNpb24iIGdlIHYxLjY7CisgICAgcmV0dXJuICJ2JHZlcnNpb24iIGdlIHYx LjY7CiB9CiAKIHN1YiBjaGRpclJldHVybmluZ1JlbGF0aXZlUGF0aCgkKQpAQCAtNDgxLDYgKzQ4 MiwxNyBAQCBzdWIgbWFrZUZpbGVQYXRoUmVsYXRpdmUoJCkKIHN1YiBub3JtYWxpemVQYXRoKCQp CiB7CiAgICAgbXkgKCRwYXRoKSA9IEBfOworICAgIGlmIChpc1dpbmRvd3MoKSkgeworICAgICAg ICAkcGF0aCA9fiBzL1wvL1xcL2c7CisgICAgfSBlbHNlIHsKKyAgICAgICAgJHBhdGggPX4gcy9c XC9cLy9nOworICAgIH0KKyAgICByZXR1cm4gJHBhdGg7Cit9CisKK3N1YiB1bml4UGF0aCgkKQor eworICAgIG15ICgkcGF0aCkgPSBAXzsKICAgICAkcGF0aCA9fiBzL1xcL1wvL2c7CiAgICAgcmV0 dXJuICRwYXRoOwogfQpAQCAtMTkyMyw3ICsxOTM1LDEwIEBAIHN1YiBjaGFuZ2VMb2dOYW1lRXJy b3IoJCkKIAogc3ViIGNoYW5nZUxvZ05hbWUoKQogewotICAgIG15ICRuYW1lID0gJEVOVntDSEFO R0VfTE9HX05BTUV9IHx8ICRFTlZ7UkVBTF9OQU1FfSB8fCBnaXRDb25maWcoInVzZXIubmFtZSIp IHx8IChzcGxpdCAvXHMqLFxzKi8sIChnZXRwd3VpZCAkPClbNl0pWzBdOworICAgIG15ICRuYW1l ID0gJEVOVntDSEFOR0VfTE9HX05BTUV9IHx8ICRFTlZ7UkVBTF9OQU1FfSB8fCBnaXRDb25maWco InVzZXIubmFtZSIpOworICAgIGlmIChub3QgJG5hbWUgYW5kICFpc1dpbmRvd3MoKSkgeworICAg ICAgICAkbmFtZSA9IChzcGxpdCAvXHMqLFxzKi8sIChnZXRwd3VpZCAkPClbNl0pWzBdOworICAg IH0KIAogICAgIGNoYW5nZUxvZ05hbWVFcnJvcigiRmFpbGVkIHRvIGRldGVybWluZSBDaGFuZ2VM b2cgbmFtZS4iKSB1bmxlc3MgJG5hbWU7CiAgICAgIyBnZXRwd3VpZCBzZWVtcyB0byBhbHdheXMg c3VjY2VlZCBvbiB3aW5kb3dzLCByZXR1cm5pbmcgdGhlIHVzZXJuYW1lIGluc3RlYWQgb2YgdGhl IGZ1bGwgbmFtZS4gIFRoaXMgY2hlY2sgd2lsbCBjYXRjaCB0aGF0IGNhc2UuCkluZGV4OiBUb29s cy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv cHJlcGFyZS1DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MDMxMSkKKysrIFRvb2xzL1NjcmlwdHMvcHJl cGFyZS1DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTMsNyArMyw3IEBACiAKICMKICMgIENv cHlyaWdodCAoQykgMjAwMCwgMjAwMSBFYXplbCwgSW5jLgotIyAgQ29weXJpZ2h0IChDKSAyMDAy LCAyMDAzLCAyMDA0LCAyMDA1LCAyMDA2LCAyMDA3IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisjICBDb3B5cmlnaHQgKEMpIDIwMDItMjAwNywgMjAxNSBBcHBsZSBJbmMuICBBbGwg cmlnaHRzIHJlc2VydmVkLgogIyAgQ29weXJpZ2h0IChDKSAyMDA5IFRvcmNoIE1vYmlsZSwgSW5j LgogIyAgQ29weXJpZ2h0IChDKSAyMDA5IENhbWVyb24gTWNDb3JtYWNrIDxjYW1AbWNjLmlkLmF1 PgogIwpAQCAtMTA3LDEwICsxMDcsMTIgQEAgc3ViIHBsdXJhbGl6ZUFuZExpc3QoJCRAKTsKIHN1 YiBwcmludERpZmYoJCQkJCk7CiBzdWIgcHJvY2Vzc1BhdGhzKFxAKTsKIHN1YiBwcm9wZXJ0eUNo YW5nZURlc2NyaXB0aW9uKCQpOworc3ViIHJlc29sdmVDaGFuZ2VMb2dzUGF0aChAKTsKIHN1YiBy ZXNvbHZlQ29uZmxpY3RlZENoYW5nZUxvZ3MoJCk7CiBzdWIgcmV2aWV3ZXJBbmREZXNjcmlwdGlv bkZvckdpdENvbW1pdCgkJCk7CiBzdWIgc3RhdHVzQ29tbWFuZCgkJCQkKTsKIHN1YiBzdGF0dXNE ZXNjcmlwdGlvbigkJCQkKTsKK3N1YiBzdm5VcGRhdGVDb21tYW5kKEApOwogc3ViIHRlc3RMaXN0 Rm9yQ2hhbmdlTG9nKEApOwogCiAjIyMgQ29uc3RhbnQgdmFyaWFibGVzLgpAQCAtMjg0LDYgKzI4 Niw3IEBAIHN1YiBnZW5lcmF0ZUZ1bmN0aW9uTGlzdHMoJCQkJCQpCiAgICAgICAgIG9wZW4gRElG RiwgIi18IiwgZGlmZkNvbW1hbmQoJGNoYW5nZWRGaWxlcywgJGdpdENvbW1pdCwgJGdpdEluZGV4 LCAkbWVyZ2VCYXNlKSBvciBkaWUgIlRoZSBkaWZmIGZhaWxlZDogJCEuXG4iOwogICAgICAgICB3 aGlsZSAoPERJRkY+KSB7CiAgICAgICAgICAgICAkZmlsZSA9IG1ha2VGaWxlUGF0aFJlbGF0aXZl KCQxKSBpZiAkXyA9fiBkaWZmSGVhZGVyRm9ybWF0KCk7CisgICAgICAgICAgICAkZmlsZSA9IG5v cm1hbGl6ZVBhdGgoJGZpbGUpOwogICAgICAgICAgICAgaWYgKGRlZmluZWQgJGZpbGUpIHsKICAg ICAgICAgICAgICAgICBteSAoJGJlZm9yZV9zdGFydCwgJGJlZm9yZV9lbmQpID0gZXh0cmFjdExp bmVSYW5nZUJlZm9yZUNoYW5nZSgkXyk7CiAgICAgICAgICAgICAgICAgaWYgKCRiZWZvcmVfc3Rh cnQgPj0gMSAmJiAkYmVmb3JlX2VuZCA+PSAxKSB7CkBAIC01MDgsMTIgKzUxMSwzNCBAQCBzdWIg Z2V0TGF0ZXN0Q2hhbmdlTG9ncygkKQogICAgIHJldHVybiBcQGNoYW5nZUxvZ3M7CiB9CiAKK3N1 YiBzdm5VcGRhdGVDb21tYW5kKEApCit7CisgICAgbXkgQGNoYW5nZUxvZ3MgPSBzaGlmdDsKKwor ICAgIG15IEBlc2NhcGVkQ2hhbmdlTG9nUGF0aHMgPSBtYXAoZXNjYXBlU3VidmVyc2lvblBhdGgo JF8pLCBAY2hhbmdlTG9ncyk7CisgICAgbXkgJGVzY2FwZWRDaGFuZ2VMb2dQYXRoc1N0cmluZyA9 IHFxKCIpIC4gam9pbihxcSgiICIpLCBAZXNjYXBlZENoYW5nZUxvZ1BhdGhzKSAuIHFxKCIpOwor ICAgIG15ICRjb21tYW5kID0gU1ZOIC4gIiB1cGRhdGUgJGVzY2FwZWRDaGFuZ2VMb2dQYXRoc1N0 cmluZyI7CisKKyAgICByZXR1cm4gJGNvbW1hbmQ7Cit9CisKK3N1YiByZXNvbHZlQ2hhbmdlTG9n c1BhdGgoJEApCit7CisgICAgbXkgKCRyZXNvbHZlQ2hhbmdlTG9nc1BhdGgsIEBjb25mbGljdGVk Q2hhbmdlTG9ncykgPSBAXzsKKworICAgIG15IEBlc2NhcGVkQ29uZmxpY3RlZENoYW5nZUxvZ3Mg PSBtYXAoZXNjYXBlU3VidmVyc2lvblBhdGgoJF8pLCBAY29uZmxpY3RlZENoYW5nZUxvZ3MpOwor ICAgIG15ICRlc2NhcGVkQ29uZmxpY3RlZENoYW5nZUxvZ3NTdHJpbmcgPSBxcSgiKSAuIGpvaW4o cXEoIiAiKSwgQGVzY2FwZWRDb25mbGljdGVkQ2hhbmdlTG9ncykgLiBxcSgiKTsKKyAgICBteSAk Y29tbWFuZCA9ICIkcmVzb2x2ZUNoYW5nZUxvZ3NQYXRoIC0tbm8td2FybmluZ3MgJGVzY2FwZWRD b25mbGljdGVkQ2hhbmdlTG9nc1N0cmluZyI7CisKKyAgICByZXR1cm4gJGNvbW1hbmQ7Cit9CisK IHN1YiByZXNvbHZlQ29uZmxpY3RlZENoYW5nZUxvZ3MoJCkKIHsKICAgICBteSAoJGNoYW5nZUxv Z3MpID0gQF87CiAKICAgICBwcmludCBTVERFUlIgIiAgUnVubmluZyAnc3ZuIHVwZGF0ZScgdG8g dXBkYXRlIENoYW5nZUxvZyBmaWxlcy5cbiI7Ci0gICAgb3BlbiBFUlJPUlMsICItfCIsIFNWTiwg InVwZGF0ZSIsIEAkY2hhbmdlTG9ncworICAgIG9wZW4gRVJST1JTLCAiLXwiLCBzdm5VcGRhdGVD b21tYW5kKEAkY2hhbmdlTG9ncykKICAgICAgICAgb3IgZGllICJUaGUgc3ZuIHVwZGF0ZSBvZiBD aGFuZ2VMb2cgZmlsZXMgZmFpbGVkOiAkIS5cbiI7CiAgICAgbXkgQGNvbmZsaWN0ZWRDaGFuZ2VM b2dzOwogICAgIHdoaWxlIChteSAkbGluZSA9IDxFUlJPUlM+KSB7CkBAIC01MjYsNyArNTUxLDcg QEAgc3ViIHJlc29sdmVDb25mbGljdGVkQ2hhbmdlTG9ncygkKQogCiAgICAgcHJpbnQgU1RERVJS ICIgIEF0dGVtcHRpbmcgdG8gbWVyZ2UgY29uZmxpY3RlZCBDaGFuZ2VMb2dzLlxuIjsKICAgICBt eSAkcmVzb2x2ZUNoYW5nZUxvZ3NQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZShkaXJuYW1lKCQw KSwgInJlc29sdmUtQ2hhbmdlTG9ncyIpOwotICAgIG9wZW4gUkVTT0xWRSwgIi18IiwgJHJlc29s dmVDaGFuZ2VMb2dzUGF0aCwgIi0tbm8td2FybmluZ3MiLCBAY29uZmxpY3RlZENoYW5nZUxvZ3MK KyAgICBvcGVuIFJFU09MVkUsICItfCIsIHJlc29sdmVDaGFuZ2VMb2dzUGF0aCgkcmVzb2x2ZUNo YW5nZUxvZ3NQYXRoLCBAY29uZmxpY3RlZENoYW5nZUxvZ3MpCiAgICAgICAgIG9yIGRpZSAiQ291 bGQgbm90IG9wZW4gcmVzb2x2ZS1DaGFuZ2VMb2dzIHNjcmlwdDogJCEuXG4iOwogICAgIHByaW50 IFNUREVSUiAiICAgICRfIiB3aGlsZSA8UkVTT0xWRT47CiAgICAgY2xvc2UgUkVTT0xWRTsKQEAg LTU4NSw2ICs2MTAsNyBAQCBzdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQkJCQp CiAKICAgICAgICAgZm9yZWFjaCBteSAkZmlsZSAoc29ydCBAeyRmaWxlc0luQ2hhbmdlTG9nLT57 JHByZWZpeH19KSB7CiAgICAgICAgICAgICBteSAkZmlsZV9zdGVtID0gc3Vic3RyICRmaWxlLCBs ZW5ndGggJHByZWZpeDsKKyAgICAgICAgICAgICRmaWxlX3N0ZW0gPSB1bml4UGF0aCgkZmlsZV9z dGVtKTsKICAgICAgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGluZUVuZGluZ3Mo IiAgICAgICAgKiAkZmlsZV9zdGVtOiRmdW5jdGlvbkxpc3RzLT57JGZpbGV9XG4iLCAkZW5kbCk7 CiAgICAgICAgIH0KIApAQCAtMTg4Niw3ICsxOTEyLDcgQEAgc3ViIGRpZmZDb21tYW5kKCQkJCQp CiAgICAgbXkgJGNvbW1hbmQ7CiAgICAgaWYgKGlzU1ZOKCkpIHsKICAgICAgICAgbXkgQGVzY2Fw ZWRQYXRocyA9IG1hcChlc2NhcGVTdWJ2ZXJzaW9uUGF0aCgkXyksIEAkcGF0aHMpOwotICAgICAg ICBteSAkZXNjYXBlZFBhdGhzU3RyaW5nID0gIiciIC4gam9pbigiJyAnIiwgQGVzY2FwZWRQYXRo cykgLiAiJyI7CisgICAgICAgIG15ICRlc2NhcGVkUGF0aHNTdHJpbmcgPSBxcSgiKSAuIGpvaW4o cXEoIiAiKSwgQGVzY2FwZWRQYXRocykgLiBxcSgiKTsKICAgICAgICAgJGNvbW1hbmQgPSBTVk4g LiAiIGRpZmYgLS1kaWZmLWNtZCBkaWZmIC14IC11ICRlc2NhcGVkUGF0aHNTdHJpbmciOwogICAg IH0gZWxzaWYgKGlzR2l0KCkpIHsKICAgICAgICAgbXkgJHBhdGhzU3RyaW5nID0gIiciIC4gam9p bigiJyAnIiwgQCRwYXRocykgLiAiJyI7IApAQCAtMTkwNCw3ICsxOTMwLDcgQEAgc3ViIHN0YXR1 c0NvbW1hbmQoJCQkJCkKICAgICBteSAkY29tbWFuZDsKICAgICBpZiAoaXNTVk4oKSkgewogICAg ICAgICBteSBAZXNjYXBlZEZpbGVzID0gbWFwKGVzY2FwZVN1YnZlcnNpb25QYXRoKCRfKSwga2V5 cyAlJHBhdGhzKTsKLSAgICAgICAgbXkgJGVzY2FwZWRGaWxlc1N0cmluZyA9ICInIiAuIGpvaW4o IicgJyIsIEBlc2NhcGVkRmlsZXMpIC4gIiciOworICAgICAgICBteSAkZXNjYXBlZEZpbGVzU3Ry aW5nID0gcXEoIikgLiBqb2luKHFxKCIgIiksIEBlc2NhcGVkRmlsZXMpIC4gcXEoIik7CiAgICAg ICAgICRjb21tYW5kID0gU1ZOIC4gIiBzdGF0ICRlc2NhcGVkRmlsZXNTdHJpbmciOwogICAgIH0g ZWxzaWYgKGlzR2l0KCkpIHsKICAgICAgICAgbXkgJGZpbGVzU3RyaW5nID0gJyInIC4gam9pbign IiAiJywga2V5cyAlJHBhdGhzKSAuICciJzsKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9u IDE5MDMxMSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpA QCAtMTM4NCw3ICsxMzg0LDcgQEAgc3ViIGxhdW5jaGVyTmFtZSgpCiAgICAgfSBlbHNpZiAoaXNB cHBsZU1hY1dlYktpdCgpKSB7CiAgICAgICAgIHJldHVybiAiU2FmYXJpIjsKICAgICB9IGVsc2lm IChpc0FwcGxlV2luV2ViS2l0KCkpIHsKLSAgICAgICAgcmV0dXJuICJXaW5MYXVuY2hlciI7Cisg ICAgICAgIHJldHVybiAiTWluaUJyb3dzZXIiOwogICAgIH0KIH0KIAo= 262100 2015-09-29 13:39:21 -0700 2015-09-29 13:48:32 -0700 Patch v2 (correct sub declaration) bug-149639-20150929135517.patch text/plain 8877 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5MDMyMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM0IEBACisyMDE1LTA5LTI5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIEFsbG93ICdwcmVwYXJlLUNoYW5nZUxvZycgdG8gYmUgdXNlZCB3 aXRob3V0IEN5Z3dpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ5NjM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBTY3JpcHRzL1ZDU1V0aWxzLnBtOgorICAgICAgICAoZXhpdFN0YXR1cyk6IFVzZSAn aXNXaW5kb3dzKCknIG1ldGhvZC4KKyAgICAgICAgKGlzU1ZOVmVyc2lvbjE2T3JOZXdlcik6ICdl dmFsJyBpcyBub3QgbmVlZGVkIGhlcmUsIGFuZCBqdXN0IGNhdXNlcworICAgICAgICBhbiBlcnJv ci4gVGhpcyBtZXRob2QgY291bGQgcHJvYmFibHkganVzdCBnbyBhd2F5LgorICAgICAgICAobm9y bWFsaXplUGF0aCk6IExlYXZlIFdpbmRvd3MgKG9yIFVuaXgpIHBhdGhzIGFzIHBsYXRmb3JtIHBh dGhzLCByYXRoZXIgdGhhbgorICAgICAgICBhbHdheXMgY2hhbmdpbmcgdG8gVW5peCBzdHlsZS4g CisgICAgICAgICh1bml4UGF0aCk6IEFkZGVkLiBOZWVkZWQgc28gV2luZG93cyBjYW4gYWx3YXlz IHNob3cgYSBVbml4IHBhdGggaW4gdGhlCisgICAgICAgIENoYW5nZUxvZyBmaWxlLgorICAgICAg ICAoY2hhbmdlTG9nTmFtZSk6IFdvcmsgYXJvdW5kIHRoZSBmYWN0IHRoYXQgJ2dldHB3dWlkJyBp cyBub3QgYXZhaWxhYmxlIG9uCisgICAgICAgIGEgcHVyZSBXaW5kb3dzIGJ1aWxkIG9mIFBlcmwu CisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoKKyAgICAgICAgKGdlbmVyYXRl RnVuY3Rpb25MaXN0cyk6IE5vcm1hbGl6ZSBwYXRoIHJlY2VpdmVkIGZyb20gJ3N2bicgaW4gY2Fz ZSBpdCdzIGEgVW5peAorICAgICAgICBwYXRoIG9uIFdpbmRvd3MuCisgICAgICAgIChzdm5VcGRh dGVDb21tYW5kKTogQWRkZWQgaGVscGVyIGZ1bmN0aW9uLiBOZWVkZWQgYmVjYXVzZSBXaW5kb3dz IFBlcmwgZG9lcyBub3QKKyAgICAgICAgc3VwcG9ydCB1c2luZyBhcnJheXMgZm9yICdvcGVuJyBh cmd1bWVudHMuCisgICAgICAgIChyZXNvbHZlQ2hhbmdlTG9nc1BhdGgpOiBEaXR0by4KKyAgICAg ICAgKHJlc29sdmVDb25mbGljdGVkQ2hhbmdlTG9ncyk6IFVzZSBuZXcgaGVscGVyIGZ1bmN0aW9u cy4KKyAgICAgICAgKGdlbmVyYXRlTmV3Q2hhbmdlTG9ncyk6IEZvcmNlIFdpbmRvd3MgdG8gdXNl IFVuaXggcGF0aHMgaW4gQ2hhbmdlTG9nIG91dHB1dC4KKyAgICAgICAgKGRpZmZDb21tYW5kKTog VXNlIGRvdWJsZS1xdW90ZXMgZm9yIHBhdGhzLCBzaW5jZSBXaW5kb3dzIGRvZXNuJ3QgdW5kZXJz dGFuZCBzaW5nbGUKKyAgICAgICAgcXVvdGVzLiBVbml4IHN5c3RlbXMgYXJlIGhhcHB5IGVpdGhl ciB3YXkuCisgICAgICAgIChzdGF0dXNDb21tYW5kKTogRGl0dG8uCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAobGF1bmNoZXJOYW1lKTogRHJpdmUtYnkgZml4LiBX aW5MYXVuY2hlciB3YXMgcmVuYW1lZCB0byBNaW5pQnJvd3NlciBzb21lIHRpbWUgYWdvLgorCiAy MDE1LTA5LTI5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAg IFtXaW5dIFVucmV2aWV3ZWQgNjQtYml0IGJ1aWxkIGZpeCBhZnRlciBzd2l0Y2ggdG8gQ01ha2Uu CkluZGV4OiBUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Nj cmlwdHMvVkNTVXRpbHMucG0JKHJldmlzaW9uIDE5MDMxMSkKKysrIFRvb2xzL1NjcmlwdHMvVkNT VXRpbHMucG0JKHdvcmtpbmcgY29weSkKQEAgLTEsNCArMSw0IEBACi0jIENvcHlyaWdodCAoQykg MjAwNywgMjAwOCwgMjAwOSwgMjAxMCwgMjAxMSwgMjAxMiwgMjAxMyBBcHBsZSBJbmMuICBBbGwg cmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMDctMjAxMywgMjAxNSBBcHBsZSBJ bmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogIyBDb3B5cmlnaHQgKEMpIDIwMDksIDIwMTAgQ2hy aXMgSmVyZG9uZWsgKGNocmlzLmplcmRvbmVrQGdtYWlsLmNvbSkKICMgQ29weXJpZ2h0IChDKSAy MDEwLCAyMDExIFJlc2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVk LgogIyBDb3B5cmlnaHQgKEMpIDIwMTIgRGFuaWVsIEJhdGVzIChkYmF0ZXNAaW50dWRhdGEuY29t KQpAQCAtOTAsNiArOTAsNyBAQCBCRUdJTiB7CiAgICAgICAgICZ0b1dpbmRvd3NMaW5lRW5kaW5n cwogICAgICAgICAmZ2l0Q29tbWl0Rm9yU1ZOUmV2aXNpb24KICAgICAgICAgJmxpc3RPZkNoYW5n ZWRGaWxlc0JldHdlZW5SZXZpc2lvbnMKKyAgICAgICAgJnVuaXhQYXRoCiAgICAgKTsKICAgICAl RVhQT1JUX1RBR1MgPSAoICk7CiAgICAgQEVYUE9SVF9PSyAgID0gKCk7CkBAIC0xMjYsNyArMTI3 LDcgQEAgbXkgJHN2blByb3BlcnR5VmFsdWVOb05ld2xpbmVSZWdFeCA9IHFyIwogc3ViIGV4aXRT dGF0dXMoJCkKIHsKICAgICBteSAoJHJldHVybnZhbHVlKSA9IEBfOwotICAgIGlmICgkXk8gZXEg Ik1TV2luMzIiKSB7CisgICAgaWYgKGlzV2luZG93cygpKSB7CiAgICAgICAgIHJldHVybiAkcmV0 dXJudmFsdWUgPj4gODsKICAgICB9CiAgICAgaWYgKCFXSUZFWElURUQoJHJldHVybnZhbHVlKSkg ewpAQCAtMzMzLDcgKzMzNCw3IEBAIHN1YiBzdm5WZXJzaW9uKCkKIHN1YiBpc1NWTlZlcnNpb24x Nk9yTmV3ZXIoKQogewogICAgIG15ICR2ZXJzaW9uID0gc3ZuVmVyc2lvbigpOwotICAgIHJldHVy biBldmFsICJ2JHZlcnNpb24iIGdlIHYxLjY7CisgICAgcmV0dXJuICJ2JHZlcnNpb24iIGdlIHYx LjY7CiB9CiAKIHN1YiBjaGRpclJldHVybmluZ1JlbGF0aXZlUGF0aCgkKQpAQCAtNDgxLDYgKzQ4 MiwxNyBAQCBzdWIgbWFrZUZpbGVQYXRoUmVsYXRpdmUoJCkKIHN1YiBub3JtYWxpemVQYXRoKCQp CiB7CiAgICAgbXkgKCRwYXRoKSA9IEBfOworICAgIGlmIChpc1dpbmRvd3MoKSkgeworICAgICAg ICAkcGF0aCA9fiBzL1wvL1xcL2c7CisgICAgfSBlbHNlIHsKKyAgICAgICAgJHBhdGggPX4gcy9c XC9cLy9nOworICAgIH0KKyAgICByZXR1cm4gJHBhdGg7Cit9CisKK3N1YiB1bml4UGF0aCgkKQor eworICAgIG15ICgkcGF0aCkgPSBAXzsKICAgICAkcGF0aCA9fiBzL1xcL1wvL2c7CiAgICAgcmV0 dXJuICRwYXRoOwogfQpAQCAtMTkyMyw3ICsxOTM1LDEwIEBAIHN1YiBjaGFuZ2VMb2dOYW1lRXJy b3IoJCkKIAogc3ViIGNoYW5nZUxvZ05hbWUoKQogewotICAgIG15ICRuYW1lID0gJEVOVntDSEFO R0VfTE9HX05BTUV9IHx8ICRFTlZ7UkVBTF9OQU1FfSB8fCBnaXRDb25maWcoInVzZXIubmFtZSIp IHx8IChzcGxpdCAvXHMqLFxzKi8sIChnZXRwd3VpZCAkPClbNl0pWzBdOworICAgIG15ICRuYW1l ID0gJEVOVntDSEFOR0VfTE9HX05BTUV9IHx8ICRFTlZ7UkVBTF9OQU1FfSB8fCBnaXRDb25maWco InVzZXIubmFtZSIpOworICAgIGlmIChub3QgJG5hbWUgYW5kICFpc1dpbmRvd3MoKSkgeworICAg ICAgICAkbmFtZSA9IChzcGxpdCAvXHMqLFxzKi8sIChnZXRwd3VpZCAkPClbNl0pWzBdOworICAg IH0KIAogICAgIGNoYW5nZUxvZ05hbWVFcnJvcigiRmFpbGVkIHRvIGRldGVybWluZSBDaGFuZ2VM b2cgbmFtZS4iKSB1bmxlc3MgJG5hbWU7CiAgICAgIyBnZXRwd3VpZCBzZWVtcyB0byBhbHdheXMg c3VjY2VlZCBvbiB3aW5kb3dzLCByZXR1cm5pbmcgdGhlIHVzZXJuYW1lIGluc3RlYWQgb2YgdGhl IGZ1bGwgbmFtZS4gIFRoaXMgY2hlY2sgd2lsbCBjYXRjaCB0aGF0IGNhc2UuCkluZGV4OiBUb29s cy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv cHJlcGFyZS1DaGFuZ2VMb2cJKHJldmlzaW9uIDE5MDMxMSkKKysrIFRvb2xzL1NjcmlwdHMvcHJl cGFyZS1DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTMsNyArMyw3IEBACiAKICMKICMgIENv cHlyaWdodCAoQykgMjAwMCwgMjAwMSBFYXplbCwgSW5jLgotIyAgQ29weXJpZ2h0IChDKSAyMDAy LCAyMDAzLCAyMDA0LCAyMDA1LCAyMDA2LCAyMDA3IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisjICBDb3B5cmlnaHQgKEMpIDIwMDItMjAwNywgMjAxNSBBcHBsZSBJbmMuICBBbGwg cmlnaHRzIHJlc2VydmVkLgogIyAgQ29weXJpZ2h0IChDKSAyMDA5IFRvcmNoIE1vYmlsZSwgSW5j LgogIyAgQ29weXJpZ2h0IChDKSAyMDA5IENhbWVyb24gTWNDb3JtYWNrIDxjYW1AbWNjLmlkLmF1 PgogIwpAQCAtMTA3LDEwICsxMDcsMTIgQEAgc3ViIHBsdXJhbGl6ZUFuZExpc3QoJCRAKTsKIHN1 YiBwcmludERpZmYoJCQkJCk7CiBzdWIgcHJvY2Vzc1BhdGhzKFxAKTsKIHN1YiBwcm9wZXJ0eUNo YW5nZURlc2NyaXB0aW9uKCQpOworc3ViIHJlc29sdmVDaGFuZ2VMb2dzUGF0aCgkQCk7CiBzdWIg cmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCQpOwogc3ViIHJldmlld2VyQW5kRGVzY3JpcHRp b25Gb3JHaXRDb21taXQoJCQpOwogc3ViIHN0YXR1c0NvbW1hbmQoJCQkJCk7CiBzdWIgc3RhdHVz RGVzY3JpcHRpb24oJCQkJCk7CitzdWIgc3ZuVXBkYXRlQ29tbWFuZChAKTsKIHN1YiB0ZXN0TGlz dEZvckNoYW5nZUxvZyhAKTsKIAogIyMjIENvbnN0YW50IHZhcmlhYmxlcy4KQEAgLTI4NCw2ICsy ODYsNyBAQCBzdWIgZ2VuZXJhdGVGdW5jdGlvbkxpc3RzKCQkJCQkKQogICAgICAgICBvcGVuIERJ RkYsICItfCIsIGRpZmZDb21tYW5kKCRjaGFuZ2VkRmlsZXMsICRnaXRDb21taXQsICRnaXRJbmRl eCwgJG1lcmdlQmFzZSkgb3IgZGllICJUaGUgZGlmZiBmYWlsZWQ6ICQhLlxuIjsKICAgICAgICAg d2hpbGUgKDxESUZGPikgewogICAgICAgICAgICAgJGZpbGUgPSBtYWtlRmlsZVBhdGhSZWxhdGl2 ZSgkMSkgaWYgJF8gPX4gZGlmZkhlYWRlckZvcm1hdCgpOworICAgICAgICAgICAgJGZpbGUgPSBu b3JtYWxpemVQYXRoKCRmaWxlKTsKICAgICAgICAgICAgIGlmIChkZWZpbmVkICRmaWxlKSB7CiAg ICAgICAgICAgICAgICAgbXkgKCRiZWZvcmVfc3RhcnQsICRiZWZvcmVfZW5kKSA9IGV4dHJhY3RM aW5lUmFuZ2VCZWZvcmVDaGFuZ2UoJF8pOwogICAgICAgICAgICAgICAgIGlmICgkYmVmb3JlX3N0 YXJ0ID49IDEgJiYgJGJlZm9yZV9lbmQgPj0gMSkgewpAQCAtNTA4LDEyICs1MTEsMzQgQEAgc3Vi IGdldExhdGVzdENoYW5nZUxvZ3MoJCkKICAgICByZXR1cm4gXEBjaGFuZ2VMb2dzOwogfQogCitz dWIgc3ZuVXBkYXRlQ29tbWFuZChAKQoreworICAgIG15IEBjaGFuZ2VMb2dzID0gc2hpZnQ7CisK KyAgICBteSBAZXNjYXBlZENoYW5nZUxvZ1BhdGhzID0gbWFwKGVzY2FwZVN1YnZlcnNpb25QYXRo KCRfKSwgQGNoYW5nZUxvZ3MpOworICAgIG15ICRlc2NhcGVkQ2hhbmdlTG9nUGF0aHNTdHJpbmcg PSBxcSgiKSAuIGpvaW4ocXEoIiAiKSwgQGVzY2FwZWRDaGFuZ2VMb2dQYXRocykgLiBxcSgiKTsK KyAgICBteSAkY29tbWFuZCA9IFNWTiAuICIgdXBkYXRlICRlc2NhcGVkQ2hhbmdlTG9nUGF0aHNT dHJpbmciOworCisgICAgcmV0dXJuICRjb21tYW5kOworfQorCitzdWIgcmVzb2x2ZUNoYW5nZUxv Z3NQYXRoKCRAKQoreworICAgIG15ICgkcmVzb2x2ZUNoYW5nZUxvZ3NQYXRoLCBAY29uZmxpY3Rl ZENoYW5nZUxvZ3MpID0gQF87CisKKyAgICBteSBAZXNjYXBlZENvbmZsaWN0ZWRDaGFuZ2VMb2dz ID0gbWFwKGVzY2FwZVN1YnZlcnNpb25QYXRoKCRfKSwgQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKTsK KyAgICBteSAkZXNjYXBlZENvbmZsaWN0ZWRDaGFuZ2VMb2dzU3RyaW5nID0gcXEoIikgLiBqb2lu KHFxKCIgIiksIEBlc2NhcGVkQ29uZmxpY3RlZENoYW5nZUxvZ3MpIC4gcXEoIik7CisgICAgbXkg JGNvbW1hbmQgPSAiJHJlc29sdmVDaGFuZ2VMb2dzUGF0aCAtLW5vLXdhcm5pbmdzICRlc2NhcGVk Q29uZmxpY3RlZENoYW5nZUxvZ3NTdHJpbmciOworCisgICAgcmV0dXJuICRjb21tYW5kOworfQor CiBzdWIgcmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCQpCiB7CiAgICAgbXkgKCRjaGFuZ2VM b2dzKSA9IEBfOwogCiAgICAgcHJpbnQgU1RERVJSICIgIFJ1bm5pbmcgJ3N2biB1cGRhdGUnIHRv IHVwZGF0ZSBDaGFuZ2VMb2cgZmlsZXMuXG4iOwotICAgIG9wZW4gRVJST1JTLCAiLXwiLCBTVk4s ICJ1cGRhdGUiLCBAJGNoYW5nZUxvZ3MKKyAgICBvcGVuIEVSUk9SUywgIi18Iiwgc3ZuVXBkYXRl Q29tbWFuZChAJGNoYW5nZUxvZ3MpCiAgICAgICAgIG9yIGRpZSAiVGhlIHN2biB1cGRhdGUgb2Yg Q2hhbmdlTG9nIGZpbGVzIGZhaWxlZDogJCEuXG4iOwogICAgIG15IEBjb25mbGljdGVkQ2hhbmdl TG9nczsKICAgICB3aGlsZSAobXkgJGxpbmUgPSA8RVJST1JTPikgewpAQCAtNTI2LDcgKzU1MSw3 IEBAIHN1YiByZXNvbHZlQ29uZmxpY3RlZENoYW5nZUxvZ3MoJCkKIAogICAgIHByaW50IFNUREVS UiAiICBBdHRlbXB0aW5nIHRvIG1lcmdlIGNvbmZsaWN0ZWQgQ2hhbmdlTG9ncy5cbiI7CiAgICAg bXkgJHJlc29sdmVDaGFuZ2VMb2dzUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoZGlybmFtZSgk MCksICJyZXNvbHZlLUNoYW5nZUxvZ3MiKTsKLSAgICBvcGVuIFJFU09MVkUsICItfCIsICRyZXNv bHZlQ2hhbmdlTG9nc1BhdGgsICItLW5vLXdhcm5pbmdzIiwgQGNvbmZsaWN0ZWRDaGFuZ2VMb2dz CisgICAgb3BlbiBSRVNPTFZFLCAiLXwiLCByZXNvbHZlQ2hhbmdlTG9nc1BhdGgoJHJlc29sdmVD aGFuZ2VMb2dzUGF0aCwgQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKQogICAgICAgICBvciBkaWUgIkNv dWxkIG5vdCBvcGVuIHJlc29sdmUtQ2hhbmdlTG9ncyBzY3JpcHQ6ICQhLlxuIjsKICAgICBwcmlu dCBTVERFUlIgIiAgICAkXyIgd2hpbGUgPFJFU09MVkU+OwogICAgIGNsb3NlIFJFU09MVkU7CkBA IC01ODUsNiArNjEwLDcgQEAgc3ViIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCQkJCQkJCQkJCQk KQogCiAgICAgICAgIGZvcmVhY2ggbXkgJGZpbGUgKHNvcnQgQHskZmlsZXNJbkNoYW5nZUxvZy0+ eyRwcmVmaXh9fSkgewogICAgICAgICAgICAgbXkgJGZpbGVfc3RlbSA9IHN1YnN0ciAkZmlsZSwg bGVuZ3RoICRwcmVmaXg7CisgICAgICAgICAgICAkZmlsZV9zdGVtID0gdW5peFBhdGgoJGZpbGVf c3RlbSk7CiAgICAgICAgICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdz KCIgICAgICAgICogJGZpbGVfc3RlbTokZnVuY3Rpb25MaXN0cy0+eyRmaWxlfVxuIiwgJGVuZGwp OwogICAgICAgICB9CiAKQEAgLTE4ODYsNyArMTkxMiw3IEBAIHN1YiBkaWZmQ29tbWFuZCgkJCQk KQogICAgIG15ICRjb21tYW5kOwogICAgIGlmIChpc1NWTigpKSB7CiAgICAgICAgIG15IEBlc2Nh cGVkUGF0aHMgPSBtYXAoZXNjYXBlU3VidmVyc2lvblBhdGgoJF8pLCBAJHBhdGhzKTsKLSAgICAg ICAgbXkgJGVzY2FwZWRQYXRoc1N0cmluZyA9ICInIiAuIGpvaW4oIicgJyIsIEBlc2NhcGVkUGF0 aHMpIC4gIiciOworICAgICAgICBteSAkZXNjYXBlZFBhdGhzU3RyaW5nID0gcXEoIikgLiBqb2lu KHFxKCIgIiksIEBlc2NhcGVkUGF0aHMpIC4gcXEoIik7CiAgICAgICAgICRjb21tYW5kID0gU1ZO IC4gIiBkaWZmIC0tZGlmZi1jbWQgZGlmZiAteCAtdSAkZXNjYXBlZFBhdGhzU3RyaW5nIjsKICAg ICB9IGVsc2lmIChpc0dpdCgpKSB7CiAgICAgICAgIG15ICRwYXRoc1N0cmluZyA9ICInIiAuIGpv aW4oIicgJyIsIEAkcGF0aHMpIC4gIiciOyAKQEAgLTE5MDQsNyArMTkzMCw3IEBAIHN1YiBzdGF0 dXNDb21tYW5kKCQkJCQpCiAgICAgbXkgJGNvbW1hbmQ7CiAgICAgaWYgKGlzU1ZOKCkpIHsKICAg ICAgICAgbXkgQGVzY2FwZWRGaWxlcyA9IG1hcChlc2NhcGVTdWJ2ZXJzaW9uUGF0aCgkXyksIGtl eXMgJSRwYXRocyk7Ci0gICAgICAgIG15ICRlc2NhcGVkRmlsZXNTdHJpbmcgPSAiJyIgLiBqb2lu KCInICciLCBAZXNjYXBlZEZpbGVzKSAuICInIjsKKyAgICAgICAgbXkgJGVzY2FwZWRGaWxlc1N0 cmluZyA9IHFxKCIpIC4gam9pbihxcSgiICIpLCBAZXNjYXBlZEZpbGVzKSAuIHFxKCIpOwogICAg ICAgICAkY29tbWFuZCA9IFNWTiAuICIgc3RhdCAkZXNjYXBlZEZpbGVzU3RyaW5nIjsKICAgICB9 IGVsc2lmIChpc0dpdCgpKSB7CiAgICAgICAgIG15ICRmaWxlc1N0cmluZyA9ICciJyAuIGpvaW4o JyIgIicsIGtleXMgJSRwYXRocykgLiAnIic7CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lv biAxOTAzMTEpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkK QEAgLTEzODQsNyArMTM4NCw3IEBAIHN1YiBsYXVuY2hlck5hbWUoKQogICAgIH0gZWxzaWYgKGlz QXBwbGVNYWNXZWJLaXQoKSkgewogICAgICAgICByZXR1cm4gIlNhZmFyaSI7CiAgICAgfSBlbHNp ZiAoaXNBcHBsZVdpbldlYktpdCgpKSB7Ci0gICAgICAgIHJldHVybiAiV2luTGF1bmNoZXIiOwor ICAgICAgICByZXR1cm4gIk1pbmlCcm93c2VyIjsKICAgICB9CiB9CiAK