175972 2017-08-24 18:48:09 -0700 [WinCairo] Use GitHub releases for WinCairoRequirements 2017-08-25 10:24:34 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 don.olmstead don.olmstead achristensen annulen bburg bfulgham buildbot commit-queue lforschler pvollan ross.kirsling webkit-bug-importer oldest_to_newest 1342288 0 don.olmstead 2017-08-24 18:48:09 -0700 Now that there is a script which will download a GitHub release package it should be used instead of the original perl script. 1342296 1 319053 don.olmstead 2017-08-24 18:58:25 -0700 Created attachment 319053 Patch This uses download-latest-github-release.py to get the latest WinCairoRequirements. 1342297 2 buildbot 2017-08-24 18:59:33 -0700 Attachment 319053 did not pass style-queue: ERROR: Tools/Scripts/download-latest-github-release.py:48: expected 2 blank lines, found 1 [pep8/E302] [5] ERROR: Tools/Scripts/download-latest-github-release.py:106: [main] Undefined variable 'ERROR' [pylint/E0602] [5] ERROR: Tools/Scripts/download-latest-github-release.py:129: Undefined variable 'ERROR' [pylint/E0602] [5] Total errors found: 3 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1342311 3 319058 don.olmstead 2017-08-24 19:33:08 -0700 Created attachment 319058 Patch Fix style 1342313 4 buildbot 2017-08-24 19:35:08 -0700 Attachment 319058 did not pass style-queue: ERROR: Tools/Scripts/download-latest-github-release.py:44: expected 2 blank lines, found 1 [pep8/E302] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1342315 5 319060 don.olmstead 2017-08-24 19:40:30 -0700 Created attachment 319060 Patch Fix logic error 1342316 6 319060 don.olmstead 2017-08-24 19:45:25 -0700 Comment on attachment 319060 Patch Modified download-latest-github-release.py so it can be imported and used from the script directly. This means the update-webkit-wincairo-libs doesn't have to keep track of whether the file was updated. Also Removed the old perl implementation. 1342317 7 don.olmstead 2017-08-24 19:47:23 -0700 This should fix the WinCairo builds as the referenced repository has the sqlite files staged so CMake will pick them up. 1342403 8 319060 bfulgham 2017-08-25 09:25:56 -0700 Comment on attachment 319060 Patch Nice! r=me. 1342431 9 319060 commit-queue 2017-08-25 10:23:24 -0700 Comment on attachment 319060 Patch Clearing flags on attachment: 319060 Committed r221191: <http://trac.webkit.org/changeset/221191> 1342432 10 commit-queue 2017-08-25 10:23:25 -0700 All reviewed patches have been landed. Closing bug. 1342433 11 webkit-bug-importer 2017-08-25 10:24:34 -0700 <rdar://problem/34083805> 319053 2017-08-24 18:58:25 -0700 2017-08-24 19:33:08 -0700 Patch bug-175972.diff text/plain 6421 don.olmstead ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNzg0 NTYzMjU4MC4uNjkwMDc0MDU4NmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNy0wOC0yNCAgRG9uIE9sbXN0ZWFk ICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWlyb10gVXNlIEdpdEh1 YiByZWxlYXNlcyBmb3IgV2luQ2Fpcm9SZXF1aXJlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTk3MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6CisgICAg ICAgIChjTWFrZUFyZ3NGcm9tRmVhdHVyZXMpOiBEZWxldGVkLgorICAgICAgICAod3JpdGVDb25n cmF0cyk6IERlbGV0ZWQuCisgICAgICAgICogU2NyaXB0cy9kb3dubG9hZC1sYXRlc3QtZ2l0aHVi LXJlbGVhc2UucHk6CisgICAgICAgIChwYXJzZV9hcmdzKToKKyAgICAgICAgKG1haW4pOgorICAg ICAgICAqIFNjcmlwdHMvdXBkYXRlLXdlYmtpdC13aW5jYWlyby1saWJzLnB5OiBSZW5hbWVkIGZy b20gVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LXdpbmNhaXJvLWxpYnMuCisKIDIwMTctMDgt MjQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAg ICBBZGQgV0tVSURlbGVnYXRlUHJpdmF0ZSBlcXVpdmFsZW50IG9mIFdLUGFnZVVJQ2xpZW50J3Mg aGFuZGxlQXV0b3BsYXlFdmVudApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJr aXQgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRleCA3NmU5YTgxYWYzYS4uMTgxZTMz Y2Q2YjIgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CisrKyBiL1Rvb2xz L1NjcmlwdHMvYnVpbGQtd2Via2l0CkBAIC0yMTksNyArMjE5LDcgQEAgaWYgKGlzQXBwbGVDb2Nv YVdlYktpdCgpKSB7CiAgICAgcHVzaCBAcHJvamVjdHMsICgiVG9vbHMvRHVtcFJlbmRlclRyZWUi LCAiVG9vbHMvV2ViS2l0VGVzdFJ1bm5lciIsICJTb3VyY2UvVGhpcmRQYXJ0eS9ndGVzdCIsICJU b29scy9UZXN0V2ViS2l0QVBJIik7CiAKIH0gZWxzaWYgKGlzV2luQ2Fpcm8oKSkgewotICAgIChz eXN0ZW0oInBlcmwgVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LXdpbmNhaXJvLWxpYnMiKSA9 PSAwKSBvciBkaWU7CisgICAgKHN5c3RlbSgicHl0aG9uIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdl YmtpdC13aW5jYWlyby1saWJzLnB5IikgPT0gMCkgb3IgZGllOwogfSBlbHNpZiAoaXNBcHBsZVdp bldlYktpdCgpKSB7CiAgICAgIyBDb3B5IFdlYktpdFN1cHBvcnRMaWJyYXJ5IHRvIHRoZSBjb3Jy ZWN0IGxvY2F0aW9uIGluIFdlYktpdExpYnJhcmllcyBzbyBpdCBjYW4gYmUgZm91bmQuCiAgICAg IyBXaWxsIGZhaWwgaWYgV2ViS2l0U3VwcG9ydExpYnJhcnkuemlwIGlzIG5vdCBpbiBzb3VyY2Ug cm9vdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvZG93bmxvYWQtbGF0ZXN0LWdpdGh1Yi1y ZWxlYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy9kb3dubG9hZC1sYXRlc3QtZ2l0aHViLXJlbGVhc2Uu cHkKaW5kZXggZDJkNWIwNDkzOTEuLjdkZTQ1YmQxNDczIDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL2Rvd25sb2FkLWxhdGVzdC1naXRodWItcmVsZWFzZS5weQorKysgYi9Ub29scy9TY3JpcHRz L2Rvd25sb2FkLWxhdGVzdC1naXRodWItcmVsZWFzZS5weQpAQCAtNDEsMTUgKzQxLDE4IEBAIENo ZWNrcyB3aGV0aGVyIHRoZSBsYXRlc3QgdmVyc2lvbiBhbHJlYWR5IGV4aXN0cyBpbiB0aGUgb3V0 cHV0IGRpcmVjdG9yeQogaWYgc28sIGRvd25sb2FkIGlzIHNraXBwZWQ7IG90aGVyd2lzZSBhbnkg ZXhpc3RpbmcgdmVyc2lvbiBpcyBvdmVyd3JpdHRlbi4KICcnJwogCitTVUNDRVNTID0gMAorVVBf VE9fREFURSA9IDEKK0NPVUxEX05PVF9GSU5EID0gMgogCi1kZWYgcGFyc2VfYXJncygpOgorZGVm IHBhcnNlX2FyZ3MoYXJndik6CiAgICAgcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIo ZGVzY3JpcHRpb249REVTQ1JJUFRJT04sIGZvcm1hdHRlcl9jbGFzcz1hcmdwYXJzZS5SYXdEZXNj cmlwdGlvbkhlbHBGb3JtYXR0ZXIpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgncmVwbycsIGhl bHA9J0dpdEh1YiByZXBvc2l0b3J5IHNsdWcgKGUuZy4sICJvcmcvcmVwbyIpJykKICAgICBwYXJz ZXIuYWRkX2FyZ3VtZW50KCdmaWxlbmFtZScsIGhlbHA9J2ZpbGVuYW1lIG9mIHJlbGVhc2UgYmlu YXJ5IHRvIGRvd25sb2FkIChlLmcuLCAiZm9vLmV4ZSIsICJiYXIuemlwIiknKQogICAgIHBhcnNl ci5hZGRfYXJndW1lbnQoJy1vJywgJy0tb3V0cHV0LWRpcicsIGRlZmF1bHQ9Jy4nLCBoZWxwPSdv dXRwdXQgZGlyZWN0b3J5IChkZWZhdWx0cyB0byB3b3JraW5nIGRpcmVjdG9yeSknKQogICAgIHBh cnNlci5hZGRfYXJndW1lbnQoJy1lJywgJy0tZW5kcG9pbnQnLCBkZWZhdWx0PVBVQkxJQ19HSVRI VUJfQVBJX0VORFBPSU5ULCBoZWxwPSdHaXRIdWIgQVBJIGVuZHBvaW50IChkZWZhdWx0cyB0byBh cGkuZ2l0aHViLmNvbSknKQogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy10JywgJy0tdG9rZW4n LCBkZWZhdWx0PU5vbmUsIGhlbHA9J0dpdEh1YiBBUEkgT0F1dGggdG9rZW4gKGZvciBwcml2YXRl IHJlcG9zL2VuZHBvaW50cyknKQotICAgIHJldHVybiBwYXJzZXIucGFyc2VfYXJncygpCisgICAg cmV0dXJuIHBhcnNlci5wYXJzZV9hcmdzKGFyZ3YpCiAKIAogZGVmIGZpbmRfbGF0ZXN0X3JlbGVh c2UoYXJncyk6CkBAIC05MiwyMiArOTUsMjIgQEAgZGVmIHNhdmVfdmVyc2lvbl9pbmZvKHZlcnNp b25faW5mb19wYXRoLCB2ZXJzaW9uX2luZm8pOgogICAgICAgICBqc29uLmR1bXAodmVyc2lvbl9p bmZvLCBmaWxlKQogCiAKLWRlZiBtYWluKCk6Ci0gICAgYXJncyA9IHBhcnNlX2FyZ3MoKQorZGVm IG1haW4oYXJndik6CisgICAgYXJncyA9IHBhcnNlX2FyZ3MoYXJndikKIAogICAgIHByaW50ICdT ZWVraW5nIGxhdGVzdCByZWxlYXNlIG9mIHt9IGZyb20ge30uLi4nLmZvcm1hdChhcmdzLmZpbGVu YW1lLCBhcmdzLnJlcG8pCiAgICAgcmVsZWFzZV91cmwsIHZlcnNpb25faW5mbyA9IGZpbmRfbGF0 ZXN0X3JlbGVhc2UoYXJncykKIAogICAgIGlmIG5vdCByZWxlYXNlX3VybDoKICAgICAgICAgcHJp bnQgJ05vIHJlbGVhc2UgZm91bmQhJwotICAgICAgICBzeXMuZXhpdCgxKQorICAgICAgICByZXR1 cm4gRVJST1IKIAogICAgIGJpbmFyeV9wYXRoID0gb3MucGF0aC5qb2luKGFyZ3Mub3V0cHV0X2Rp ciwgYXJncy5maWxlbmFtZSkKICAgICB2ZXJzaW9uX2luZm9fcGF0aCA9IGJpbmFyeV9wYXRoICsg Jy52ZXJzaW9uJwogCiAgICAgaWYgaGFzX2xhdGVzdF9yZWxlYXNlKHZlcnNpb25faW5mb19wYXRo LCB2ZXJzaW9uX2luZm8pOgogICAgICAgICBwcmludCAnQWxyZWFkeSB1cC10by1kYXRlIScKLSAg ICAgICAgc3lzLmV4aXQoMCkKKyAgICAgICAgcmV0dXJuIFVQX1RPX0RBVEUKIAogICAgIGlmIG5v dCBvcy5wYXRoLmV4aXN0cyhhcmdzLm91dHB1dF9kaXIpOgogICAgICAgICBvcy5tYWtlZGlycyhh cmdzLm91dHB1dF9kaXIpCkBAIC0xMTcsNiArMTIwLDExIEBAIGRlZiBtYWluKCk6CiAgICAgc2F2 ZV92ZXJzaW9uX2luZm8odmVyc2lvbl9pbmZvX3BhdGgsIHZlcnNpb25faW5mbykKICAgICBwcmlu dCAnRG9uZSEnCiAKKyAgICByZXR1cm4gU1VDQ0VTUworCiAKIGlmIF9fbmFtZV9fID09ICdfX21h aW5fXyc6Ci0gICAgbWFpbigpCisgICAgcmVzdWx0ID0gbWFpbihzeXMuYXJndlsxOl0pCisKKyAg ICBpZiByZXN1bHQgIT0gRVJST1I6CisgICAgICAgIHN5cy5leGl0KDEpCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtd2luY2Fpcm8tbGlicyBiL1Rvb2xzL1NjcmlwdHMv dXBkYXRlLXdlYmtpdC13aW5jYWlyby1saWJzLnB5Cm9sZCBtb2RlIDEwMDc1NQpuZXcgbW9kZSAx MDA2NDQKc2ltaWxhcml0eSBpbmRleCA2MiUKcmVuYW1lIGZyb20gVG9vbHMvU2NyaXB0cy91cGRh dGUtd2Via2l0LXdpbmNhaXJvLWxpYnMKcmVuYW1lIHRvIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdl YmtpdC13aW5jYWlyby1saWJzLnB5CmluZGV4IDFhOGM2MzUwYjZmLi45NWI4NzQ1NTNlYwotLS0g YS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtd2luY2Fpcm8tbGlicworKysgYi9Ub29scy9T Y3JpcHRzL3VwZGF0ZS13ZWJraXQtd2luY2Fpcm8tbGlicy5weQpAQCAtMSw3ICsxLDYgQEAKLSMh L3Vzci9iaW4vcGVybCAtdwotCi0jIENvcHlyaWdodCAoQykgMjAxMiBCcmVudCBGdWxnaGFtIDxi ZnVsZ2hhbUB3ZWJraXQub3JnPi4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0jIENvcHlyaWdodCAo QykgMjAxMSBDYXJsIExvYm8uICBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyEgL3Vzci9iaW4vZW52 IHB5dGhvbgorIworIyBDb3B5cmlnaHQgKEMpIDIwMTcgU29ueSBJbnRlcmFjdGl2ZSBFbnRlcnRh aW5tZW50IEluYy4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTIsOSArMTEsNiBA QAogIyAyLiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZSBjb3B5cmlnaHQKICMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKICMgICAgIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0j IDMuICBOZWl0aGVyIHRoZSBuYW1lIG9mIEFwcGxlIEluYy4gKCJBcHBsZSIpIG5vciB0aGUgbmFt ZXMgb2YKLSMgICAgIGl0cyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBw cm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQKLSMgICAgIGZyb20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0 IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KICMKICMgVEhJUyBTT0ZUV0FSRSBJ UyBQUk9WSURFRCBCWSBBUFBMRSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMgSVMiIEFORCBBTlkK ICMgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLCBUSEUgSU1QTElFRApAQCAtMjcsMTUgKzIzLDIzIEBACiAjIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBP RgogIyBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgogCi0jIFVwZGF0ZXMgYSBkZXZlbG9wbWVudCBlbnZpcm9ubWVudCB0byB0 aGUgbmV3IFdpbkNhaXJvUmVxdWlyZW1lbnRzLgoraW1wb3J0IGltcG9ydGxpYgoraW1wb3J0IHN5 cworaW1wb3J0IHppcGZpbGUKIAotdXNlIHN0cmljdDsKLXVzZSB3YXJuaW5nczsKLXVzZSBGaW5k QmluOworZG93bmxvYWQgPSBpbXBvcnRsaWIuaW1wb3J0X21vZHVsZSgnZG93bmxvYWQtbGF0ZXN0 LWdpdGh1Yi1yZWxlYXNlJykKIAotbXkgJGZpbGUgPSAiV2luQ2Fpcm9SZXF1aXJlbWVudHMiOwot bXkgJHppcEZpbGUgPSAiJGZpbGUuemlwIjsKLW15ICR3aW5DYWlyb0xpYnNVUkwgPSAiaHR0cHM6 Ly9naXRodWIuY29tL2Z1amlpL1dpbkNhaXJvUmVxdWlyZW1lbnRzL3JlbGVhc2VzL2Rvd25sb2Fk L3YwLjEuMC8kemlwRmlsZSI7Ci1teSAkY29tbWFuZCA9ICIkRmluZEJpbjo6QmluL3VwZGF0ZS13 ZWJraXQtZGVwZW5kZW5jeSI7CityZXBvID0gJ1dlYktpdEZvcldpbmRvd3MvV2luQ2Fpcm9SZXF1 aXJlbWVudHMnCitmaWxlID0gJ1dpbkNhaXJvUmVxdWlyZW1lbnRzLnppcCcKK291dHB1dCA9ICdX ZWJLaXRMaWJyYXJpZXMvd2luJwogCi1zeXN0ZW0oInBlcmwiLCAkY29tbWFuZCwgJHdpbkNhaXJv TGlic1VSTCwgIi4iKSA9PSAwIG9yIGRpZTsKK3Jlc3VsdCA9IGRvd25sb2FkLm1haW4oW3JlcG8s IGZpbGVdKQorCisjIE9ubHkgdW56aXAgaWYgcmVxdWlyZWQKK2lmIHJlc3VsdCA9PSBkb3dubG9h ZC5TVUNDRVNTOgorICAgIHByaW50ICdFeHRyYWN0aW5nIHJlbGVhc2UgdG8ge30uLi4nLmZvcm1h dChvdXRwdXQpCisgICAgemlwID0gemlwZmlsZS5aaXBGaWxlKGZpbGUsICdyJykKKyAgICB6aXAu ZXh0cmFjdGFsbChvdXRwdXQpCisgICAgemlwLmNsb3NlKCkKK2VsaWYgcmVzdWx0ID09IGRvd25s b2FkLkNPVUxEX05PVF9GSU5EOgorICAgIHN5cy5leGl0KDEpCg== 319058 2017-08-24 19:33:08 -0700 2017-08-24 19:40:57 -0700 Patch bug-175972.diff text/plain 6538 don.olmstead ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNzg0 NTYzMjU4MC4uNWQ0MGYwYTUxMGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxNy0wOC0yNCAgRG9uIE9sbXN0ZWFk ICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWlyb10gVXNlIEdpdEh1 YiByZWxlYXNlcyBmb3IgV2luQ2Fpcm9SZXF1aXJlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTk3MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6CisgICAg ICAgIChjTWFrZUFyZ3NGcm9tRmVhdHVyZXMpOiBEZWxldGVkLgorICAgICAgICAod3JpdGVDb25n cmF0cyk6IERlbGV0ZWQuCisgICAgICAgICogU2NyaXB0cy9kb3dubG9hZC1sYXRlc3QtZ2l0aHVi LXJlbGVhc2UucHk6CisgICAgICAgIChTdGF0dXMpOgorICAgICAgICAocGFyc2VfYXJncyk6Cisg ICAgICAgIChtYWluKToKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQtd2luY2Fpcm8t bGlicy5weTogUmVuYW1lZCBmcm9tIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC13aW5jYWly by1saWJzLgorCiAyMDE3LTA4LTI0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CiAKICAgICAgICAgQWRkIFdLVUlEZWxlZ2F0ZVByaXZhdGUgZXF1aXZhbGVudCBv ZiBXS1BhZ2VVSUNsaWVudCdzIGhhbmRsZUF1dG9wbGF5RXZlbnQKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvYnVpbGQtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKaW5kZXgg NzZlOWE4MWFmM2EuLjE4MWUzM2NkNmIyIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1aWxk LXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdApAQCAtMjE5LDcgKzIxOSw3 IEBAIGlmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSkgewogICAgIHB1c2ggQHByb2plY3RzLCAoIlRv b2xzL0R1bXBSZW5kZXJUcmVlIiwgIlRvb2xzL1dlYktpdFRlc3RSdW5uZXIiLCAiU291cmNlL1Ro aXJkUGFydHkvZ3Rlc3QiLCAiVG9vbHMvVGVzdFdlYktpdEFQSSIpOwogCiB9IGVsc2lmIChpc1dp bkNhaXJvKCkpIHsKLSAgICAoc3lzdGVtKCJwZXJsIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtp dC13aW5jYWlyby1saWJzIikgPT0gMCkgb3IgZGllOworICAgIChzeXN0ZW0oInB5dGhvbiBUb29s cy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtd2luY2Fpcm8tbGlicy5weSIpID09IDApIG9yIGRpZTsK IH0gZWxzaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSkgewogICAgICMgQ29weSBXZWJLaXRTdXBwb3J0 TGlicmFyeSB0byB0aGUgY29ycmVjdCBsb2NhdGlvbiBpbiBXZWJLaXRMaWJyYXJpZXMgc28gaXQg Y2FuIGJlIGZvdW5kLgogICAgICMgV2lsbCBmYWlsIGlmIFdlYktpdFN1cHBvcnRMaWJyYXJ5Lnpp cCBpcyBub3QgaW4gc291cmNlIHJvb3QuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2Rvd25s b2FkLWxhdGVzdC1naXRodWItcmVsZWFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvZG93bmxvYWQtbGF0 ZXN0LWdpdGh1Yi1yZWxlYXNlLnB5CmluZGV4IGQyZDViMDQ5MzkxLi5kZWI2M2M2OWZmMyAxMDA3 NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9kb3dubG9hZC1sYXRlc3QtZ2l0aHViLXJlbGVhc2UucHkK KysrIGIvVG9vbHMvU2NyaXB0cy9kb3dubG9hZC1sYXRlc3QtZ2l0aHViLXJlbGVhc2UucHkKQEAg LTQxLDE1ICs0MSwyMCBAQCBDaGVja3Mgd2hldGhlciB0aGUgbGF0ZXN0IHZlcnNpb24gYWxyZWFk eSBleGlzdHMgaW4gdGhlIG91dHB1dCBkaXJlY3RvcnkKIGlmIHNvLCBkb3dubG9hZCBpcyBza2lw cGVkOyBvdGhlcndpc2UgYW55IGV4aXN0aW5nIHZlcnNpb24gaXMgb3ZlcndyaXR0ZW4uCiAnJycK IAorY2xhc3MgU3RhdHVzOgorICAgIERPV05MT0FERUQgPSAwCisgICAgVVBfVE9fREFURSA9IDEK KyAgICBDT1VMRF9OT1RfRklORCA9IDIKIAotZGVmIHBhcnNlX2FyZ3MoKToKKworZGVmIHBhcnNl X2FyZ3MoYXJndik6CiAgICAgcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIoZGVzY3Jp cHRpb249REVTQ1JJUFRJT04sIGZvcm1hdHRlcl9jbGFzcz1hcmdwYXJzZS5SYXdEZXNjcmlwdGlv bkhlbHBGb3JtYXR0ZXIpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgncmVwbycsIGhlbHA9J0dp dEh1YiByZXBvc2l0b3J5IHNsdWcgKGUuZy4sICJvcmcvcmVwbyIpJykKICAgICBwYXJzZXIuYWRk X2FyZ3VtZW50KCdmaWxlbmFtZScsIGhlbHA9J2ZpbGVuYW1lIG9mIHJlbGVhc2UgYmluYXJ5IHRv IGRvd25sb2FkIChlLmcuLCAiZm9vLmV4ZSIsICJiYXIuemlwIiknKQogICAgIHBhcnNlci5hZGRf YXJndW1lbnQoJy1vJywgJy0tb3V0cHV0LWRpcicsIGRlZmF1bHQ9Jy4nLCBoZWxwPSdvdXRwdXQg ZGlyZWN0b3J5IChkZWZhdWx0cyB0byB3b3JraW5nIGRpcmVjdG9yeSknKQogICAgIHBhcnNlci5h ZGRfYXJndW1lbnQoJy1lJywgJy0tZW5kcG9pbnQnLCBkZWZhdWx0PVBVQkxJQ19HSVRIVUJfQVBJ X0VORFBPSU5ULCBoZWxwPSdHaXRIdWIgQVBJIGVuZHBvaW50IChkZWZhdWx0cyB0byBhcGkuZ2l0 aHViLmNvbSknKQogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy10JywgJy0tdG9rZW4nLCBkZWZh dWx0PU5vbmUsIGhlbHA9J0dpdEh1YiBBUEkgT0F1dGggdG9rZW4gKGZvciBwcml2YXRlIHJlcG9z L2VuZHBvaW50cyknKQotICAgIHJldHVybiBwYXJzZXIucGFyc2VfYXJncygpCisgICAgcmV0dXJu IHBhcnNlci5wYXJzZV9hcmdzKGFyZ3YpCiAKIAogZGVmIGZpbmRfbGF0ZXN0X3JlbGVhc2UoYXJn cyk6CkBAIC05MiwyMiArOTcsMjIgQEAgZGVmIHNhdmVfdmVyc2lvbl9pbmZvKHZlcnNpb25faW5m b19wYXRoLCB2ZXJzaW9uX2luZm8pOgogICAgICAgICBqc29uLmR1bXAodmVyc2lvbl9pbmZvLCBm aWxlKQogCiAKLWRlZiBtYWluKCk6Ci0gICAgYXJncyA9IHBhcnNlX2FyZ3MoKQorZGVmIG1haW4o YXJndik6CisgICAgYXJncyA9IHBhcnNlX2FyZ3MoYXJndikKIAogICAgIHByaW50ICdTZWVraW5n IGxhdGVzdCByZWxlYXNlIG9mIHt9IGZyb20ge30uLi4nLmZvcm1hdChhcmdzLmZpbGVuYW1lLCBh cmdzLnJlcG8pCiAgICAgcmVsZWFzZV91cmwsIHZlcnNpb25faW5mbyA9IGZpbmRfbGF0ZXN0X3Jl bGVhc2UoYXJncykKIAogICAgIGlmIG5vdCByZWxlYXNlX3VybDoKICAgICAgICAgcHJpbnQgJ05v IHJlbGVhc2UgZm91bmQhJwotICAgICAgICBzeXMuZXhpdCgxKQorICAgICAgICByZXR1cm4gU3Rh dHVzLkNPVUxEX05PVF9GSU5ECiAKICAgICBiaW5hcnlfcGF0aCA9IG9zLnBhdGguam9pbihhcmdz Lm91dHB1dF9kaXIsIGFyZ3MuZmlsZW5hbWUpCiAgICAgdmVyc2lvbl9pbmZvX3BhdGggPSBiaW5h cnlfcGF0aCArICcudmVyc2lvbicKIAogICAgIGlmIGhhc19sYXRlc3RfcmVsZWFzZSh2ZXJzaW9u X2luZm9fcGF0aCwgdmVyc2lvbl9pbmZvKToKICAgICAgICAgcHJpbnQgJ0FscmVhZHkgdXAtdG8t ZGF0ZSEnCi0gICAgICAgIHN5cy5leGl0KDApCisgICAgICAgIHJldHVybiBTdGF0dXMuVVBfVE9f REFURQogCiAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKGFyZ3Mub3V0cHV0X2Rpcik6CiAgICAg ICAgIG9zLm1ha2VkaXJzKGFyZ3Mub3V0cHV0X2RpcikKQEAgLTExNyw2ICsxMjIsMTEgQEAgZGVm IG1haW4oKToKICAgICBzYXZlX3ZlcnNpb25faW5mbyh2ZXJzaW9uX2luZm9fcGF0aCwgdmVyc2lv bl9pbmZvKQogICAgIHByaW50ICdEb25lIScKIAorICAgIHJldHVybiBTdGF0dXMuRE9XTkxPQURF RAorCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6Ci0gICAgbWFpbigpCisgICAgcmVzdWx0 ID0gbWFpbihzeXMuYXJndlsxOl0pCisKKyAgICBpZiByZXN1bHQgIT0gU3RhdHVzLkNPVUxEX05P VF9GSU5EOgorICAgICAgICBzeXMuZXhpdCgxKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy91 cGRhdGUtd2Via2l0LXdpbmNhaXJvLWxpYnMgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQt d2luY2Fpcm8tbGlicy5weQpvbGQgbW9kZSAxMDA3NTUKbmV3IG1vZGUgMTAwNjQ0CnNpbWlsYXJp dHkgaW5kZXggNjIlCnJlbmFtZSBmcm9tIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC13aW5j YWlyby1saWJzCnJlbmFtZSB0byBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtd2luY2Fpcm8t bGlicy5weQppbmRleCAxYThjNjM1MGI2Zi4uZDliOGI5OTgyNmIKLS0tIGEvVG9vbHMvU2NyaXB0 cy91cGRhdGUtd2Via2l0LXdpbmNhaXJvLWxpYnMKKysrIGIvVG9vbHMvU2NyaXB0cy91cGRhdGUt d2Via2l0LXdpbmNhaXJvLWxpYnMucHkKQEAgLTEsNyArMSw2IEBACi0jIS91c3IvYmluL3Blcmwg LXcKLQotIyBDb3B5cmlnaHQgKEMpIDIwMTIgQnJlbnQgRnVsZ2hhbSA8YmZ1bGdoYW1Ad2Via2l0 Lm9yZz4uICBBbGwgcmlnaHRzIHJlc2VydmVkLgotIyBDb3B5cmlnaHQgKEMpIDIwMTEgQ2FybCBM b2JvLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMhIC91c3IvYmluL2VudiBweXRob24KKyMKKyMg Q29weXJpZ2h0IChDKSAyMDE3IFNvbnkgSW50ZXJhY3RpdmUgRW50ZXJ0YWlubWVudCBJbmMuCiAj CiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTEyLDkgKzExLDYgQEAKICMgMi4gIFJlZGlz dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJp Z2h0CiAjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIgaW4gdGhlCiAjICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotIyAzLiAgTmVpdGhlciB0 aGUgbmFtZSBvZiBBcHBsZSBJbmMuICgiQXBwbGUiKSBub3IgdGhlIG5hbWVzIG9mCi0jICAgICBp dHMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0 cyBkZXJpdmVkCi0jICAgICBmcm9tIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlv ciB3cml0dGVuIHBlcm1pc3Npb24uCiAjCiAjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkg QVBQTEUgQU5EIElUUyBDT05UUklCVVRPUlMgIkFTIElTIiBBTkQgQU5ZCiAjIEVYUFJFU1MgT1Ig SU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElN UExJRUQKQEAgLTI3LDE1ICsyMywyMyBAQAogIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RI RVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YKICMgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K IAotIyBVcGRhdGVzIGEgZGV2ZWxvcG1lbnQgZW52aXJvbm1lbnQgdG8gdGhlIG5ldyBXaW5DYWly b1JlcXVpcmVtZW50cy4KK2ltcG9ydCBpbXBvcnRsaWIKK2ltcG9ydCBzeXMKK2ltcG9ydCB6aXBm aWxlCiAKLXVzZSBzdHJpY3Q7Ci11c2Ugd2FybmluZ3M7Ci11c2UgRmluZEJpbjsKK2Rvd25sb2Fk ID0gaW1wb3J0bGliLmltcG9ydF9tb2R1bGUoJ2Rvd25sb2FkLWxhdGVzdC1naXRodWItcmVsZWFz ZScpCiAKLW15ICRmaWxlID0gIldpbkNhaXJvUmVxdWlyZW1lbnRzIjsKLW15ICR6aXBGaWxlID0g IiRmaWxlLnppcCI7Ci1teSAkd2luQ2Fpcm9MaWJzVVJMID0gImh0dHBzOi8vZ2l0aHViLmNvbS9m dWppaS9XaW5DYWlyb1JlcXVpcmVtZW50cy9yZWxlYXNlcy9kb3dubG9hZC92MC4xLjAvJHppcEZp bGUiOwotbXkgJGNvbW1hbmQgPSAiJEZpbmRCaW46OkJpbi91cGRhdGUtd2Via2l0LWRlcGVuZGVu Y3kiOworcmVwbyA9ICdXZWJLaXRGb3JXaW5kb3dzL1dpbkNhaXJvUmVxdWlyZW1lbnRzJworZmls ZSA9ICdXaW5DYWlyb1JlcXVpcmVtZW50cy56aXAnCitvdXRwdXQgPSAnV2ViS2l0TGlicmFyaWVz L3dpbicKIAotc3lzdGVtKCJwZXJsIiwgJGNvbW1hbmQsICR3aW5DYWlyb0xpYnNVUkwsICIuIikg PT0gMCBvciBkaWU7CityZXN1bHQgPSBkb3dubG9hZC5tYWluKFtyZXBvLCBmaWxlXSkKKworIyBP bmx5IHVuemlwIGlmIHJlcXVpcmVkCitpZiByZXN1bHQgPT0gZG93bmxvYWQuU3RhdHVzLkRPV05M T0FERUQ6CisgICAgcHJpbnQgJ0V4dHJhY3RpbmcgcmVsZWFzZSB0byB7fS4uLicuZm9ybWF0KG91 dHB1dCkKKyAgICB6aXAgPSB6aXBmaWxlLlppcEZpbGUoZmlsZSwgJ3InKQorICAgIHppcC5leHRy YWN0YWxsKG91dHB1dCkKKyAgICB6aXAuY2xvc2UoKQorZWxpZiByZXN1bHQgPT0gZG93bmxvYWQu U3RhdHVzLkNPVUxEX05PVF9GSU5EOgorICAgIHN5cy5leGl0KDEpCg== 319060 2017-08-24 19:40:30 -0700 2017-08-25 10:23:24 -0700 Patch bug-175972.diff text/plain 6466 don.olmstead ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNzg0 NTYzMjU4MC4uNWQ0MGYwYTUxMGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxNy0wOC0yNCAgRG9uIE9sbXN0ZWFk ICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWlyb10gVXNlIEdpdEh1 YiByZWxlYXNlcyBmb3IgV2luQ2Fpcm9SZXF1aXJlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTk3MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6CisgICAg ICAgIChjTWFrZUFyZ3NGcm9tRmVhdHVyZXMpOiBEZWxldGVkLgorICAgICAgICAod3JpdGVDb25n cmF0cyk6IERlbGV0ZWQuCisgICAgICAgICogU2NyaXB0cy9kb3dubG9hZC1sYXRlc3QtZ2l0aHVi LXJlbGVhc2UucHk6CisgICAgICAgIChTdGF0dXMpOgorICAgICAgICAocGFyc2VfYXJncyk6Cisg ICAgICAgIChtYWluKToKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQtd2luY2Fpcm8t bGlicy5weTogUmVuYW1lZCBmcm9tIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC13aW5jYWly by1saWJzLgorCiAyMDE3LTA4LTI0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CiAKICAgICAgICAgQWRkIFdLVUlEZWxlZ2F0ZVByaXZhdGUgZXF1aXZhbGVudCBv ZiBXS1BhZ2VVSUNsaWVudCdzIGhhbmRsZUF1dG9wbGF5RXZlbnQKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvYnVpbGQtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKaW5kZXgg NzZlOWE4MWFmM2EuLjE4MWUzM2NkNmIyIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1aWxk LXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdApAQCAtMjE5LDcgKzIxOSw3 IEBAIGlmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSkgewogICAgIHB1c2ggQHByb2plY3RzLCAoIlRv b2xzL0R1bXBSZW5kZXJUcmVlIiwgIlRvb2xzL1dlYktpdFRlc3RSdW5uZXIiLCAiU291cmNlL1Ro aXJkUGFydHkvZ3Rlc3QiLCAiVG9vbHMvVGVzdFdlYktpdEFQSSIpOwogCiB9IGVsc2lmIChpc1dp bkNhaXJvKCkpIHsKLSAgICAoc3lzdGVtKCJwZXJsIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtp dC13aW5jYWlyby1saWJzIikgPT0gMCkgb3IgZGllOworICAgIChzeXN0ZW0oInB5dGhvbiBUb29s cy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtd2luY2Fpcm8tbGlicy5weSIpID09IDApIG9yIGRpZTsK IH0gZWxzaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSkgewogICAgICMgQ29weSBXZWJLaXRTdXBwb3J0 TGlicmFyeSB0byB0aGUgY29ycmVjdCBsb2NhdGlvbiBpbiBXZWJLaXRMaWJyYXJpZXMgc28gaXQg Y2FuIGJlIGZvdW5kLgogICAgICMgV2lsbCBmYWlsIGlmIFdlYktpdFN1cHBvcnRMaWJyYXJ5Lnpp cCBpcyBub3QgaW4gc291cmNlIHJvb3QuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2Rvd25s b2FkLWxhdGVzdC1naXRodWItcmVsZWFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvZG93bmxvYWQtbGF0 ZXN0LWdpdGh1Yi1yZWxlYXNlLnB5CmluZGV4IGQyZDViMDQ5MzkxLi42MzE1M2E4YmM2YyAxMDA3 NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9kb3dubG9hZC1sYXRlc3QtZ2l0aHViLXJlbGVhc2UucHkK KysrIGIvVG9vbHMvU2NyaXB0cy9kb3dubG9hZC1sYXRlc3QtZ2l0aHViLXJlbGVhc2UucHkKQEAg LTQyLDE0ICs0MiwyMCBAQCBpZiBzbywgZG93bmxvYWQgaXMgc2tpcHBlZDsgb3RoZXJ3aXNlIGFu eSBleGlzdGluZyB2ZXJzaW9uIGlzIG92ZXJ3cml0dGVuLgogJycnCiAKIAotZGVmIHBhcnNlX2Fy Z3MoKToKK2NsYXNzIFN0YXR1czoKKyAgICBET1dOTE9BREVEID0gMAorICAgIFVQX1RPX0RBVEUg PSAxCisgICAgQ09VTERfTk9UX0ZJTkQgPSAyCisKKworZGVmIHBhcnNlX2FyZ3MoYXJndik6CiAg ICAgcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIoZGVzY3JpcHRpb249REVTQ1JJUFRJ T04sIGZvcm1hdHRlcl9jbGFzcz1hcmdwYXJzZS5SYXdEZXNjcmlwdGlvbkhlbHBGb3JtYXR0ZXIp CiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgncmVwbycsIGhlbHA9J0dpdEh1YiByZXBvc2l0b3J5 IHNsdWcgKGUuZy4sICJvcmcvcmVwbyIpJykKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCdmaWxl bmFtZScsIGhlbHA9J2ZpbGVuYW1lIG9mIHJlbGVhc2UgYmluYXJ5IHRvIGRvd25sb2FkIChlLmcu LCAiZm9vLmV4ZSIsICJiYXIuemlwIiknKQogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy1vJywg Jy0tb3V0cHV0LWRpcicsIGRlZmF1bHQ9Jy4nLCBoZWxwPSdvdXRwdXQgZGlyZWN0b3J5IChkZWZh dWx0cyB0byB3b3JraW5nIGRpcmVjdG9yeSknKQogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy1l JywgJy0tZW5kcG9pbnQnLCBkZWZhdWx0PVBVQkxJQ19HSVRIVUJfQVBJX0VORFBPSU5ULCBoZWxw PSdHaXRIdWIgQVBJIGVuZHBvaW50IChkZWZhdWx0cyB0byBhcGkuZ2l0aHViLmNvbSknKQogICAg IHBhcnNlci5hZGRfYXJndW1lbnQoJy10JywgJy0tdG9rZW4nLCBkZWZhdWx0PU5vbmUsIGhlbHA9 J0dpdEh1YiBBUEkgT0F1dGggdG9rZW4gKGZvciBwcml2YXRlIHJlcG9zL2VuZHBvaW50cyknKQot ICAgIHJldHVybiBwYXJzZXIucGFyc2VfYXJncygpCisgICAgcmV0dXJuIHBhcnNlci5wYXJzZV9h cmdzKGFyZ3YpCiAKIAogZGVmIGZpbmRfbGF0ZXN0X3JlbGVhc2UoYXJncyk6CkBAIC05MiwyMiAr OTgsMjIgQEAgZGVmIHNhdmVfdmVyc2lvbl9pbmZvKHZlcnNpb25faW5mb19wYXRoLCB2ZXJzaW9u X2luZm8pOgogICAgICAgICBqc29uLmR1bXAodmVyc2lvbl9pbmZvLCBmaWxlKQogCiAKLWRlZiBt YWluKCk6Ci0gICAgYXJncyA9IHBhcnNlX2FyZ3MoKQorZGVmIG1haW4oYXJndik6CisgICAgYXJn cyA9IHBhcnNlX2FyZ3MoYXJndikKIAogICAgIHByaW50ICdTZWVraW5nIGxhdGVzdCByZWxlYXNl IG9mIHt9IGZyb20ge30uLi4nLmZvcm1hdChhcmdzLmZpbGVuYW1lLCBhcmdzLnJlcG8pCiAgICAg cmVsZWFzZV91cmwsIHZlcnNpb25faW5mbyA9IGZpbmRfbGF0ZXN0X3JlbGVhc2UoYXJncykKIAog ICAgIGlmIG5vdCByZWxlYXNlX3VybDoKICAgICAgICAgcHJpbnQgJ05vIHJlbGVhc2UgZm91bmQh JwotICAgICAgICBzeXMuZXhpdCgxKQorICAgICAgICByZXR1cm4gU3RhdHVzLkNPVUxEX05PVF9G SU5ECiAKICAgICBiaW5hcnlfcGF0aCA9IG9zLnBhdGguam9pbihhcmdzLm91dHB1dF9kaXIsIGFy Z3MuZmlsZW5hbWUpCiAgICAgdmVyc2lvbl9pbmZvX3BhdGggPSBiaW5hcnlfcGF0aCArICcudmVy c2lvbicKIAogICAgIGlmIGhhc19sYXRlc3RfcmVsZWFzZSh2ZXJzaW9uX2luZm9fcGF0aCwgdmVy c2lvbl9pbmZvKToKICAgICAgICAgcHJpbnQgJ0FscmVhZHkgdXAtdG8tZGF0ZSEnCi0gICAgICAg IHN5cy5leGl0KDApCisgICAgICAgIHJldHVybiBTdGF0dXMuVVBfVE9fREFURQogCiAgICAgaWYg bm90IG9zLnBhdGguZXhpc3RzKGFyZ3Mub3V0cHV0X2Rpcik6CiAgICAgICAgIG9zLm1ha2VkaXJz KGFyZ3Mub3V0cHV0X2RpcikKQEAgLTExNyw2ICsxMjMsMTEgQEAgZGVmIG1haW4oKToKICAgICBz YXZlX3ZlcnNpb25faW5mbyh2ZXJzaW9uX2luZm9fcGF0aCwgdmVyc2lvbl9pbmZvKQogICAgIHBy aW50ICdEb25lIScKIAorICAgIHJldHVybiBTdGF0dXMuRE9XTkxPQURFRAorCiAKIGlmIF9fbmFt ZV9fID09ICdfX21haW5fXyc6Ci0gICAgbWFpbigpCisgICAgcmVzdWx0ID0gbWFpbihzeXMuYXJn dlsxOl0pCisKKyAgICBpZiByZXN1bHQgPT0gU3RhdHVzLkNPVUxEX05PVF9GSU5EOgorICAgICAg ICBzeXMuZXhpdCgxKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LXdp bmNhaXJvLWxpYnMgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtd2luY2Fpcm8tbGlicy5w eQpvbGQgbW9kZSAxMDA3NTUKbmV3IG1vZGUgMTAwNjQ0CnNpbWlsYXJpdHkgaW5kZXggNjIlCnJl bmFtZSBmcm9tIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC13aW5jYWlyby1saWJzCnJlbmFt ZSB0byBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtd2luY2Fpcm8tbGlicy5weQppbmRleCAx YThjNjM1MGI2Zi4uZDliOGI5OTgyNmIKLS0tIGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0 LXdpbmNhaXJvLWxpYnMKKysrIGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LXdpbmNhaXJv LWxpYnMucHkKQEAgLTEsNyArMSw2IEBACi0jIS91c3IvYmluL3BlcmwgLXcKLQotIyBDb3B5cmln aHQgKEMpIDIwMTIgQnJlbnQgRnVsZ2hhbSA8YmZ1bGdoYW1Ad2Via2l0Lm9yZz4uICBBbGwgcmln aHRzIHJlc2VydmVkLgotIyBDb3B5cmlnaHQgKEMpIDIwMTEgQ2FybCBMb2JvLiAgQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyMhIC91c3IvYmluL2VudiBweXRob24KKyMKKyMgQ29weXJpZ2h0IChDKSAy MDE3IFNvbnkgSW50ZXJhY3RpdmUgRW50ZXJ0YWlubWVudCBJbmMuCiAjCiAjIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAog IyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMKQEAgLTEyLDkgKzExLDYgQEAKICMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CiAjICAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIg aW4gdGhlCiAjICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlk ZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotIyAzLiAgTmVpdGhlciB0aGUgbmFtZSBvZiBBcHBs ZSBJbmMuICgiQXBwbGUiKSBub3IgdGhlIG5hbWVzIG9mCi0jICAgICBpdHMgY29udHJpYnV0b3Jz IG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkCi0jICAg ICBmcm9tIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1p c3Npb24uCiAjCiAjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQU5EIElUUyBD T05UUklCVVRPUlMgIkFTIElTIiBBTkQgQU5ZCiAjIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5U SUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQKQEAgLTI3LDE1 ICsyMywyMyBAQAogIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5H IElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YKICMgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAotIyBVcGRhdGVzIGEg ZGV2ZWxvcG1lbnQgZW52aXJvbm1lbnQgdG8gdGhlIG5ldyBXaW5DYWlyb1JlcXVpcmVtZW50cy4K K2ltcG9ydCBpbXBvcnRsaWIKK2ltcG9ydCBzeXMKK2ltcG9ydCB6aXBmaWxlCiAKLXVzZSBzdHJp Y3Q7Ci11c2Ugd2FybmluZ3M7Ci11c2UgRmluZEJpbjsKK2Rvd25sb2FkID0gaW1wb3J0bGliLmlt cG9ydF9tb2R1bGUoJ2Rvd25sb2FkLWxhdGVzdC1naXRodWItcmVsZWFzZScpCiAKLW15ICRmaWxl ID0gIldpbkNhaXJvUmVxdWlyZW1lbnRzIjsKLW15ICR6aXBGaWxlID0gIiRmaWxlLnppcCI7Ci1t eSAkd2luQ2Fpcm9MaWJzVVJMID0gImh0dHBzOi8vZ2l0aHViLmNvbS9mdWppaS9XaW5DYWlyb1Jl cXVpcmVtZW50cy9yZWxlYXNlcy9kb3dubG9hZC92MC4xLjAvJHppcEZpbGUiOwotbXkgJGNvbW1h bmQgPSAiJEZpbmRCaW46OkJpbi91cGRhdGUtd2Via2l0LWRlcGVuZGVuY3kiOworcmVwbyA9ICdX ZWJLaXRGb3JXaW5kb3dzL1dpbkNhaXJvUmVxdWlyZW1lbnRzJworZmlsZSA9ICdXaW5DYWlyb1Jl cXVpcmVtZW50cy56aXAnCitvdXRwdXQgPSAnV2ViS2l0TGlicmFyaWVzL3dpbicKIAotc3lzdGVt KCJwZXJsIiwgJGNvbW1hbmQsICR3aW5DYWlyb0xpYnNVUkwsICIuIikgPT0gMCBvciBkaWU7City ZXN1bHQgPSBkb3dubG9hZC5tYWluKFtyZXBvLCBmaWxlXSkKKworIyBPbmx5IHVuemlwIGlmIHJl cXVpcmVkCitpZiByZXN1bHQgPT0gZG93bmxvYWQuU3RhdHVzLkRPV05MT0FERUQ6CisgICAgcHJp bnQgJ0V4dHJhY3RpbmcgcmVsZWFzZSB0byB7fS4uLicuZm9ybWF0KG91dHB1dCkKKyAgICB6aXAg PSB6aXBmaWxlLlppcEZpbGUoZmlsZSwgJ3InKQorICAgIHppcC5leHRyYWN0YWxsKG91dHB1dCkK KyAgICB6aXAuY2xvc2UoKQorZWxpZiByZXN1bHQgPT0gZG93bmxvYWQuU3RhdHVzLkNPVUxEX05P VF9GSU5EOgorICAgIHN5cy5leGl0KDEpCg==