235550 2022-01-24 17:10:51 -0800 Support workspace builds in build-webkit 2022-01-26 11:24:19 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 emw webkit-unassigned ap jbedard webkit-bug-importer oldest_to_newest 1833564 0 emw 2022-01-24 17:10:51 -0800 Support workspace builds in build-webkit 1833566 1 449884 emw 2022-01-24 17:17:40 -0800 Created attachment 449884 Patch 1833578 2 449886 emw 2022-01-24 18:09:39 -0800 Created attachment 449886 Patch 1833754 3 449886 ap 2022-01-25 10:00:06 -0800 Comment on attachment 449886 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=449886&action=review r=me. I don't see how the Windows build failure can be caused by this. > Tools/Scripts/build-webkit:126 > + --[no-]use-workspace Use WebKit.xcworkspace and XCBuild (iOS and Mac only) AFAICT this affects watchOS and tvOS too. 1833784 4 449943 emw 2022-01-25 10:57:02 -0800 Created attachment 449943 Patch 1833785 5 emw 2022-01-25 10:58:09 -0800 (In reply to Alexey Proskuryakov from comment #3) > Comment on attachment 449886 [details] > Patch > > > Tools/Scripts/build-webkit:126 > > + --[no-]use-workspace Use WebKit.xcworkspace and XCBuild (iOS and Mac only) > > AFAICT this affects watchOS and tvOS too. Good catch, I've changed this and a couple other Xcode-specific flags to say "Apple platforms only". 1834161 6 emw 2022-01-26 10:30:51 -0800 (In reply to Elliott Williams from comment #5) > I've changed this and a couple other Xcode-specific flags to say > "Apple platforms only". This patch is ready to go, and shouldn't need additional review since it's a usage-text-only change. The windows build failure has sorted itself out, and the jsc-armv7 test failure appears to be a flake. 1834186 7 ews-feeder 2022-01-26 11:23:17 -0800 Committed r288632 (246447@main): <https://commits.webkit.org/246447@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449943. 1834188 8 webkit-bug-importer 2022-01-26 11:24:19 -0800 <rdar://problem/88086388> 449884 2022-01-24 17:17:40 -0800 2022-01-24 18:09:36 -0800 Patch bug-235550-20220124171739.patch text/plain 9416 emw U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MDM3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjdhMjZhZmVjMDhkNTdiZjE3ZjEwODAwM2RmNDRhZmQy OWRjYThiNi4uNDNhNDE1YjE2NGYxMDdhYzFkY2ZlYjcwNzdkOThjNzIyMGEyNzM5MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIyLTAxLTI0ICBFbGxpb3R0IFdpbGxpYW1zICA8ZW13QGFwcGxlLmNvbT4KKworICAg ICAgICBTdXBwb3J0IHdvcmtzcGFjZSBidWlsZHMgaW4gYnVpbGQtd2Via2l0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU1NTAKKworICAgICAgICBP biBBcHBsZSBwbGF0Zm9ybXMsIGBidWlsZC13ZWJraXQgLS11c2Utd29ya3NwYWNlYCBub3cgYnVp bGRzIHVzaW5nIFdlYktpdC54Y3dvcmtzcGFjZSBhbmQKKyAgICAgICAgWENCdWlsZC4gVGhpcyBj b21wbGVtZW50cyB0aGUgYFVTRV9XT1JLU1BBQ0U9WUVTYCBNYWtlIGZsYWcgYWRkZWQgaW4KKyAg ICAgICAgaHR0cHM6Ly9jb21taXRzLndlYmtpdC5vcmcvMjQ2MjMyQG1haW4uCisKKyAgICAgICAg QXQgdGhpcyB0aW1lLCB0aGVyZSBpcyBubyBndWFyYW50ZWUgb2YgY29ycmVjdG5lc3Mgd2hlbiBi dWlsZGluZyB3aXRoIFVTRV9XT1JLU1BBQ0U9WUVTLCBhbmQKKyAgICAgICAgd29ya3NwYWNlIGJ1 aWxkcyBhcmUgbm90IGNoZWNrZWQgYnkgYnVpbGRlcnMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDogQWRkIC0t dXNlLXdvcmtzcGFjZSBmbGFnLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbTogUmVt b3ZlIGNhblVzZVhDQnVpbGQsIHRoZSBmbGFnIGl0IHBvd2VyZWQgaXMgbm8gbG9uZ2VyIHVzZWQu CisgICAgICAgIChidWlsZFhDb2RlV29ya3NwYWNlKTogQWRkZWQuCisKIDIwMjItMDEtMTkgIEVs bGlvdHQgV2lsbGlhbXMgIDxlbXdAYXBwbGUuY29tPgogCiAgICAgICAgIFtYQ0J1aWxkXSBCdWls ZCB2aWEgdGhlIHdvcmtzcGFjZSB3aXRoIFVTRV9XT1JLU1BBQ0U9WUVTCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0Cmlu ZGV4IDFlM2RiNWE0ZDNlMzliOGQ1NGQxNjgxZTA1YmY2Y2NjYjdmY2QwNjEuLjgxNzQ3YTQxYWZm YTczN2RmODljYzU2NzE2OWExZWY0NGQxYzBkMjUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv YnVpbGQtd2Via2l0CisrKyBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CkBAIC03NSw2ICs3 NSw3IEBAIG15ICRzaG91bGRSdW5TdGF0aWNBbmFseXplciA9IDA7CiBteSAkbm9FeHBlcmltZW50 YWxGZWF0dXJlcyA9IDA7CiBteSAkbHRvTW9kZSA9ICJkZWZhdWx0IjsKIG15ICR4Y2J1aWxkID0g dW5kZWY7CitteSAkdXNlV29ya3NwYWNlID0gdW5kZWY7CiBteSAkc3RhcnRUaW1lID0gdGltZSgp OwogbXkgJGFyY2hzMzJiaXQgPSAwOwogbXkgJHNraXBMaWJyYXJ5VXBkYXRlID0gMDsKQEAgLTEw Myw4ICsxMDQsOCBAQCBmb3JlYWNoIChAZmVhdHVyZXMpIHsKIG15ICRwcm9ncmFtTmFtZSA9IGJh c2VuYW1lKCQwKTsKIG15ICR1c2FnZSA9IDw8RU9GOwogVXNhZ2U6ICRwcm9ncmFtTmFtZSBbb3B0 aW9uc10gW29wdGlvbnMgdG8gcGFzcyB0byBidWlsZCBzeXN0ZW1dCi0gIC0taGVscCAgICAgICAg ICAgICAgICAgICAgICAgICAgICBTaG93IHRoaXMgaGVscCBtZXNzYWdlCi0gIC0tdmVyYm9zZSAg ICAgICAgICAgICAgICAgICAgICAgICBTaG93IHZlcmJvc2UgYnVpbGQgb3V0cHV0CisgIC1oLCAt LWhlbHAgICAgICAgICAgICAgICAgICAgICAgICBTaG93IHRoaXMgaGVscCBtZXNzYWdlCisgIC12 LCAtLXZlcmJvc2UgICAgICAgICAgICAgICAgICAgICBTaG93IHZlcmJvc2UgYnVpbGQgb3V0cHV0 CiAgIC0tY2xlYW4gICAgICAgICAgICAgICAgICAgICAgICAgICBDbGVhbnVwIHRoZSBidWlsZCBk aXJlY3RvcnkKICAgLS1nZW5lcmF0ZS1wcm9qZWN0LW9ubHkgICAgICAgICAgIE9ubHkgZ2VuZXJh dGUgcHJvamVjdCBmaWxlcwogICAtLWRlYnVnICAgICAgICAgICAgICAgICAgICAgICAgICAgQ29t cGlsZSB3aXRoIERlYnVnIGNvbmZpZ3VyYXRpb24KQEAgLTEyMSw3ICsxMjIsOCBAQCBVc2FnZTog JHByb2dyYW1OYW1lIFtvcHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRvIGJ1aWxkIHN5c3RlbV0K ICAgLS1jb3ZlcmFnZSAgICAgICAgICAgICAgICAgICAgICAgIEVuYWJsZSBjb2RlIGNvdmVyYWdl IHN1cHBvcnQgKE1hYyBvbmx5KQogICAtLWFuYWx5emUgICAgICAgICAgICAgICAgICAgICAgICAg RW5hYmxlIHN0YXRpYyBhbmF5bHNpcyAoaU9TIGFuZCBNYWMgb25seSkKICAgLS1sdG8tbW9kZT08 bW9kZT4gICAgICAgICAgICAgICAgIFNldCBMaW5rIFRpbWUgT3B0aW1pemF0aW9uIG1vZGUgKGZ1 bGwsIHRoaW4sIG9yIG5vbmUpIChMTFZNIG9ubHkpCi0gIC0tW25vLV14Y2J1aWxkICAgICAgICAg ICAgICAgICAgICBGb3JjZSB0aGUgdXNlIG9mIFhDQnVpbGQgb3Igbm90CisgIC0tW25vLV14Y2J1 aWxkICAgICAgICAgICAgICAgICAgICBERVBSRUNBVEVEIHVzZSBvZiBYQ0J1aWxkIG9yIG5vdAor ICAtLVtuby1ddXNlLXdvcmtzcGFjZSAgICAgICAgICAgICAgVXNlIFdlYktpdC54Y3dvcmtzcGFj ZSBhbmQgWENCdWlsZCAoaU9TIGFuZCBNYWMgb25seSkKIAogICAtLWZ0dyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgQnVpbGQgdGhlIEZUVyBXaW5kb3dzIHBvcnQKICAgLS1ndGsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIEJ1aWxkIHRoZSBHVEsrIHBvcnQKQEAgLTE0Nyw3ICsxNDks NyBAQCBVc2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRvIGJ1 aWxkIHN5c3RlbV0KIEVPRgogCiBteSAlb3B0aW9ucyA9ICgKLSAgICAnaGVscCcgPT4gXCRzaG93 SGVscCwKKyAgICAnaHxoZWxwJyA9PiBcJHNob3dIZWxwLAogICAgICd2fHZlcmJvc2UnID0+IFwk dmVyYm9zZSwKICAgICAnY2xlYW4nID0+IFwkY2xlYW4sCiAgICAgJ2luc3RhbGwtaGVhZGVycz1z JyA9PiBcJGluc3RhbGxIZWFkZXJzLApAQCAtMTYyLDYgKzE2NCw3IEBAIG15ICVvcHRpb25zID0g KAogICAgICduby1leHBlcmltZW50YWwtZmVhdHVyZXMnID0+IFwkbm9FeHBlcmltZW50YWxGZWF0 dXJlcywKICAgICAnbHRvLW1vZGU9cycgPT4gXCRsdG9Nb2RlLAogICAgICd4Y2J1aWxkIScgPT4g XCR4Y2J1aWxkLAorICAgICd1c2Utd29ya3NwYWNlIScgPT4gXCR1c2VXb3Jrc3BhY2UsCiAgICAg J3NraXAtbGlicmFyeS11cGRhdGUnID0+IFwkc2tpcExpYnJhcnlVcGRhdGUsCiAgICAgJ3VzZS1j Y2FjaGUhJyA9PiBcJHVzZUNDYWNoZSwKICk7CkBAIC0yMjMsMTQgKzIyNiw2IEBAIG15IEBvcHRp b25zID0gKCk7CiBpZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkpIHsKICAgICBwdXNoIEBvcHRpb25z LCBYY29kZU9wdGlvbnMoKTsKIAotICAgICMgVGVtcG9yYXJpbHkgZGlzYWJsZSBkZWZhdWx0IHVz ZSBvZiBYQ0J1aWxkIHVudGlsIGlzc3VlcyB3aXRoIGl0IGFyZSBpcm9uZWQgb3V0LgotICAgICNp ZiAoKG5vdCBkZWZpbmVkICR4Y2J1aWxkIG9yICR4Y2J1aWxkKSBhbmQgY2FuVXNlWENCdWlsZCgp KSB7Ci0gICAgaWYgKCR4Y2J1aWxkIGFuZCBjYW5Vc2VYQ0J1aWxkKCkpIHsKLSAgICAgICAgcHVz aCBAb3B0aW9ucywgIi1Vc2VOZXdCdWlsZFN5c3RlbT1ZRVMiOwotICAgIH0gZWxzZSB7Ci0gICAg ICAgIHB1c2ggQG9wdGlvbnMsICItVXNlTmV3QnVpbGRTeXN0ZW09Tk8iOwotICAgIH0KLQogICAg IHN1YiBvcHRpb24oJCQpCiAgICAgewogICAgICAgICBteSAoJGZlYXR1cmUsICRpc0VuYWJsZWQp ID0gQF87CkBAIC0yNDMsMjkgKzIzOCwzMiBAQCBpZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkpIHsK ICAgICAgICAgcHVzaCBAb3B0aW9ucywgJG9wdGlvbiB1bmxlc3MgJG9wdGlvbiBlcSAiIjsKICAg ICB9CiAKLSAgICAjIEFOR0xFIGFuZCBsaWJ3ZWJydGMgbXVzdCBjb21lIGJlZm9yZSBXZWJDb3Jl Ci0gICAgc3BsaWNlIEBwcm9qZWN0cywgMCwgMCwgKCJTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRSIp OwotICAgICMgaWYgKG5vdCAkYXJjaHMzMmJpdCBhbmQgKHBvcnROYW1lKCkgZXEgTWFjIG9yIHBv cnROYW1lKCkgZXEgaU9TIG9yIHBvcnROYW1lKCkgZXEgd2F0Y2hPUykpIHsKLSAgICBpZiAocG9y dE5hbWUoKSBlcSBNYWMgb3IgcG9ydE5hbWUoKSBlcSBpT1MpIHsKLSAgICAgICAgc3BsaWNlIEBw cm9qZWN0cywgMCwgMCwgKCJTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMiKTsKLSAgICB9Cisg ICAgIyBJbiB3b3Jrc3BhY2VzLCBidWlsZCBvcmRlciBpcyBkZXRlcm1pbmVkIGJ5IFhDQnVpbGQu CisgICAgaWYgKCEkdXNlV29ya3NwYWNlKSB7CisgICAgICAgICMgQU5HTEUgYW5kIGxpYndlYnJ0 YyBtdXN0IGNvbWUgYmVmb3JlIFdlYkNvcmUKKyAgICAgICAgc3BsaWNlIEBwcm9qZWN0cywgMCwg MCwgKCJTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRSIpOworICAgICAgICAjIGlmIChub3QgJGFyY2hz MzJiaXQgYW5kIChwb3J0TmFtZSgpIGVxIE1hYyBvciBwb3J0TmFtZSgpIGVxIGlPUyBvciBwb3J0 TmFtZSgpIGVxIHdhdGNoT1MpKSB7CisgICAgICAgIGlmIChwb3J0TmFtZSgpIGVxIE1hYyBvciBw b3J0TmFtZSgpIGVxIGlPUykgeworICAgICAgICAgICAgc3BsaWNlIEBwcm9qZWN0cywgMCwgMCwg KCJTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMiKTsKKyAgICAgICAgfQogCi0gICAgcHVzaCBA cHJvamVjdHMsICgiU291cmNlL1dlYktpdCIpOworICAgICAgICBwdXNoIEBwcm9qZWN0cywgKCJT b3VyY2UvV2ViS2l0Iik7CiAKLSAgICBpZiAoIWlzRW1iZWRkZWRXZWJLaXQoKSkgewotICAgICAg ICBwdXNoIEBwcm9qZWN0cywgKCJUb29scy9NaW5pQnJvd3NlciIpOworICAgICAgICBpZiAoIWlz RW1iZWRkZWRXZWJLaXQoKSkgeworICAgICAgICAgICAgcHVzaCBAcHJvamVjdHMsICgiVG9vbHMv TWluaUJyb3dzZXIiKTsKIAotICAgICAgICAjIFdlYkluc3BlY3RvclVJIG11c3QgY29tZSBhZnRl ciBKYXZhU2NyaXB0Q29yZSBhbmQgV2ViQ29yZSBidXQgYmVmb3JlIFdlYktpdCBhbmQgV2ViS2l0 MgotICAgICAgICBteSAkd2ViS2l0SW5kZXggPSBmaXJzdCB7ICRwcm9qZWN0c1skX10gZXEgIlNv dXJjZS9XZWJLaXRMZWdhY3kiIH0gMC4uJCNwcm9qZWN0czsKLSAgICAgICAgc3BsaWNlKEBwcm9q ZWN0cywgJHdlYktpdEluZGV4LCAwLCAiU291cmNlL1dlYkluc3BlY3RvclVJIik7Ci0gICAgfQor ICAgICAgICAgICAgIyBXZWJJbnNwZWN0b3JVSSBtdXN0IGNvbWUgYWZ0ZXIgSmF2YVNjcmlwdENv cmUgYW5kIFdlYkNvcmUgYnV0IGJlZm9yZSBXZWJLaXQgYW5kIFdlYktpdDIKKyAgICAgICAgICAg IG15ICR3ZWJLaXRJbmRleCA9IGZpcnN0IHsgJHByb2plY3RzWyRfXSBlcSAiU291cmNlL1dlYktp dExlZ2FjeSIgfSAwLi4kI3Byb2plY3RzOworICAgICAgICAgICAgc3BsaWNlKEBwcm9qZWN0cywg JHdlYktpdEluZGV4LCAwLCAiU291cmNlL1dlYkluc3BlY3RvclVJIik7CisgICAgICAgIH0KIAot ICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKLSAgICAgICAgcHVzaCBAcHJvamVjdHMsICgi VG9vbHMvbGxkYi9sbGRiV2ViS2l0VGVzdGVyIik7Ci0gICAgfQorICAgICAgICBpZiAoaXNBcHBs ZU1hY1dlYktpdCgpKSB7CisgICAgICAgICAgICBwdXNoIEBwcm9qZWN0cywgKCJUb29scy9sbGRi L2xsZGJXZWJLaXRUZXN0ZXIiKTsKKyAgICAgICAgfQogCi0gICAgIyBCdWlsZCBUb29scyBuZWVk ZWQgZm9yIEFwcGxlIHBvcnRzIChleGNlcHQgZm9yIHR2T1MpCi0gICAgcHVzaCBAcHJvamVjdHMs ICgiVG9vbHMvRHVtcFJlbmRlclRyZWUiLCAiVG9vbHMvV2ViS2l0VGVzdFJ1bm5lciIsICJTb3Vy Y2UvVGhpcmRQYXJ0eS9ndGVzdCIsICJUb29scy9UZXN0V2ViS2l0QVBJIik7CisgICAgICAgICMg QnVpbGQgVG9vbHMgbmVlZGVkIGZvciBBcHBsZSBwb3J0cyAoZXhjZXB0IGZvciB0dk9TKQorICAg ICAgICBwdXNoIEBwcm9qZWN0cywgKCJUb29scy9EdW1wUmVuZGVyVHJlZSIsICJUb29scy9XZWJL aXRUZXN0UnVubmVyIiwgIlNvdXJjZS9UaGlyZFBhcnR5L2d0ZXN0IiwgIlRvb2xzL1Rlc3RXZWJL aXRBUEkiKTsKKyAgICB9CiAKIH0gZWxzaWYgKGlzV2luQ2Fpcm8oKSAmJiAhJHNraXBMaWJyYXJ5 VXBkYXRlKSB7CiAgICAgKHN5c3RlbSgicHl0aG9uIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtp dC13aW5jYWlyby1saWJzLnB5IikgPT0gMCkgb3IgZGllOwpAQCAtMzM5LDI1ICszMzcsMzMgQEAg aWYgKGlzQXBwbGVXaW5XZWJLaXQoKSB8fCBpc1dpbkNhaXJvKCkgfHwgaXNQbGF5U3RhdGlvbigp IHx8IGlzRlRXKCkpIHsKIH0gZWxzaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpICYmICFpc0NNYWtl QnVpbGQoKSkgewogICAgIGV4aXQgMCBpZiBpc0dlbmVyYXRlUHJvamVjdE9ubHkoKTsKIAorICAg IG15IEBsb2NhbF9vcHRpb25zID0gQG9wdGlvbnM7CisgICAgcHVzaCBAbG9jYWxfb3B0aW9ucywg WGNvZGVDb3ZlcmFnZVN1cHBvcnRPcHRpb25zKCkgaWYgJGNvdmVyYWdlU3VwcG9ydDsKKyAgICBw dXNoIEBsb2NhbF9vcHRpb25zLCBYY29kZVN0YXRpY0FuYWx5emVyT3B0aW9uKCkgaWYgJHNob3Vs ZFJ1blN0YXRpY0FuYWx5emVyOworICAgIHB1c2ggQGxvY2FsX29wdGlvbnMsICJXS19MVE9fTU9E RT0kbHRvTW9kZSIgaWYgKCRsdG9Nb2RlIG5lICJkZWZhdWx0Iik7CisKICAgICAjIEJ1aWxkLCBh bmQgYWJvcnQgaWYgdGhlIGJ1aWxkIGZhaWxzLgotICAgIGZvciBteSAkZGlyIChAcHJvamVjdHMp IHsKLSAgICAgICAgY2hkaXIgJGRpciBvciBkaWU7Ci0gICAgICAgICRyZXN1bHQgPSAwOworICAg IGlmICgkdXNlV29ya3NwYWNlKSB7CisgICAgICAgIG15ICRzY2hlbWUgPSAkb25seVdlYktpdFBy b2plY3QgPyAiV2ViS2l0TGVnYWN5IiA6ICJBbGwgTW9kdWxlcyI7CisgICAgICAgICRyZXN1bHQg PSBidWlsZFhDb2RlV29ya3NwYWNlKCJXZWJLaXQueGN3b3Jrc3BhY2UiLCAkc2NoZW1lLCAkY2xl YW4sIEBsb2NhbF9vcHRpb25zLCBAQVJHVik7CisgICAgICAgIGlmIChleGl0U3RhdHVzKCRyZXN1 bHQpKSB7CisgICAgICAgICAgICBleGl0IGV4aXRTdGF0dXMoJHJlc3VsdCk7CisgICAgICAgIH0K KyAgICB9IGVsc2UgeworICAgICAgICBmb3IgbXkgJGRpciAoQHByb2plY3RzKSB7CisgICAgICAg ICAgICBjaGRpciAkZGlyIG9yIGRpZTsKKyAgICAgICAgICAgICRyZXN1bHQgPSAwOwogCi0gICAg ICAgIG15ICRwcm9qZWN0ID0gYmFzZW5hbWUoJGRpcik7Ci0gICAgICAgIAotICAgICAgICBteSBA bG9jYWxfb3B0aW9ucyA9IEBvcHRpb25zOwotICAgICAgICBwdXNoIEBsb2NhbF9vcHRpb25zLCBY Y29kZUNvdmVyYWdlU3VwcG9ydE9wdGlvbnMoKSBpZiAkY292ZXJhZ2VTdXBwb3J0OwotICAgICAg ICBwdXNoIEBsb2NhbF9vcHRpb25zLCBYY29kZVN0YXRpY0FuYWx5emVyT3B0aW9uKCkgaWYgJHNo b3VsZFJ1blN0YXRpY0FuYWx5emVyOwotICAgICAgICBwdXNoIEBsb2NhbF9vcHRpb25zLCAiV0tf TFRPX01PREU9JGx0b01vZGUiIGlmICgkbHRvTW9kZSBuZSAiZGVmYXVsdCIpOwotICAgICAgICBt eSAkcHJvamVjdFBhdGggPSAkcHJvamVjdCA9fiAvZ3Rlc3QvID8gInhjb2RlL2d0ZXN0IiA6ICRw cm9qZWN0OwotICAgICAgICAkcmVzdWx0ID0gYnVpbGRYQ29kZVByb2plY3QoJHByb2plY3RQYXRo LCAkY2xlYW4sIEBsb2NhbF9vcHRpb25zLCBAQVJHVik7CisgICAgICAgICAgICBteSAkcHJvamVj dCA9IGJhc2VuYW1lKCRkaXIpOworICAgICAgICAgICAgbXkgJHByb2plY3RQYXRoID0gJHByb2pl Y3QgPX4gL2d0ZXN0LyA/ICJ4Y29kZS9ndGVzdCIgOiAkcHJvamVjdDsKKyAgICAgICAgICAgICRy ZXN1bHQgPSBidWlsZFhDb2RlUHJvamVjdCgkcHJvamVjdFBhdGgsICRjbGVhbiwgQGxvY2FsX29w dGlvbnMsIEBBUkdWKTsKIAotICAgICAgICAjIFZhcmlvdXMgYnVpbGQqIGNhbGxzIGFib3ZlIG1h eSBjaGFuZ2UgdGhlIENXRC4KLSAgICAgICAgY2hkaXJXZWJLaXQoKTsKKyAgICAgICAgICAgICMg VmFyaW91cyBidWlsZCogY2FsbHMgYWJvdmUgbWF5IGNoYW5nZSB0aGUgQ1dELgorICAgICAgICAg ICAgY2hkaXJXZWJLaXQoKTsKIAotICAgICAgICBpZiAoZXhpdFN0YXR1cygkcmVzdWx0KSkgewot ICAgICAgICAgICAgZXhpdCBleGl0U3RhdHVzKCRyZXN1bHQpOworICAgICAgICAgICAgaWYgKGV4 aXRTdGF0dXMoJHJlc3VsdCkpIHsKKyAgICAgICAgICAgICAgICBleGl0IGV4aXRTdGF0dXMoJHJl c3VsdCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpp bmRleCA0OGUxNGU1MjFjOTg0YmI4MGI4NzgzOTY1MzJlMDVhMmVkY2ZlNDFkLi5kNTYwNGIzODQ0 ZjZlNjAxYTgwYzQ3MzNkY2I0YTY1OTE0ZDA3MzIwIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0xMDc5 LDEyICsxMDc5LDYgQEAgc3ViIFhjb2RlU3RhdGljQW5hbHl6ZXJPcHRpb24oKQogICAgIHJldHVy biAiUlVOX0NMQU5HX1NUQVRJQ19BTkFMWVpFUj1ZRVMiOwogfQogCi1zdWIgY2FuVXNlWENCdWls ZCgpCi17Ci0gICAgZGV0ZXJtaW5lWGNvZGVWZXJzaW9uKCk7Ci0gICAgcmV0dXJuIChldmFsICJ2 JHhjb2RlVmVyc2lvbiIgZ2UgdjExLjQpCi19Ci0KIG15ICRwYXNzZWRDb25maWd1cmF0aW9uOwog bXkgJHNlYXJjaGVkRm9yUGFzc2VkQ29uZmlndXJhdGlvbjsKIHN1YiBkZXRlcm1pbmVQYXNzZWRD b25maWd1cmF0aW9uCkBAIC0yMTEzLDYgKzIxMDcsMTUgQEAgc3ViIGJ1aWxkWENvZGVQcm9qZWN0 KCQkQCkKICAgICByZXR1cm4gc3lzdGVtICJ4Y29kZWJ1aWxkIiwgIi1wcm9qZWN0IiwgIiRwcm9q ZWN0Lnhjb2RlcHJvaiIsIEBleHRyYU9wdGlvbnM7CiB9CiAKK3N1YiBidWlsZFhDb2RlV29ya3Nw YWNlKCQkJEApCit7CisgICAgbXkgKCR3b3Jrc3BhY2UsICRzY2hlbWUsICRjbGVhbiwgQGV4dHJh T3B0aW9ucykgPSBAXzsKKyAgICBpZiAoJGNsZWFuKSB7CisgICAgICAgIHB1c2ggQGV4dHJhT3B0 aW9ucywgImNsZWFuIjsKKyAgICB9CisgICAgcmV0dXJuIHN5c3RlbSAieGNvZGVidWlsZCIsICIt d29ya3NwYWNlIiwgJHdvcmtzcGFjZSwgIi1zY2hlbWUiLCAkc2NoZW1lLCBAZXh0cmFPcHRpb25z OworfQorCiBzdWIgZ2V0VmlzdWFsU3R1ZGlvVG9vbHNldCgpCiB7CiAgICAgaWYgKGlzUGxheVN0 YXRpb24oKSkgewo= 449886 2022-01-24 18:09:39 -0800 2022-01-25 10:57:00 -0800 Patch bug-235550-20220124180938.patch text/plain 9658 emw U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGJhNmYzZThmNmE0MTAyMjI1NjE3YjlhYzNiM2EwOGUz NDI5YzU0ZC4uMTc2NGM5YjQ2YTRjMTIxN2FmMzY4Y2I3N2RiOTBhMmYzMjViMzBmYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIyLTAxLTI0ICBFbGxpb3R0IFdpbGxpYW1zICA8ZW13QGFwcGxlLmNvbT4KKworICAg ICAgICBTdXBwb3J0IHdvcmtzcGFjZSBidWlsZHMgaW4gYnVpbGQtd2Via2l0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU1NTAKKworICAgICAgICBP biBBcHBsZSBwbGF0Zm9ybXMsIGBidWlsZC13ZWJraXQgLS11c2Utd29ya3NwYWNlYCBub3cgYnVp bGRzIHVzaW5nIFdlYktpdC54Y3dvcmtzcGFjZSBhbmQKKyAgICAgICAgWENCdWlsZC4gVGhpcyBj b21wbGVtZW50cyB0aGUgYFVTRV9XT1JLU1BBQ0U9WUVTYCBNYWtlIGZsYWcgYWRkZWQgaW4KKyAg ICAgICAgaHR0cHM6Ly9jb21taXRzLndlYmtpdC5vcmcvMjQ2MjMyQG1haW4uCisKKyAgICAgICAg QXQgdGhpcyB0aW1lLCB0aGVyZSBpcyBubyBndWFyYW50ZWUgb2YgY29ycmVjdG5lc3Mgd2hlbiBi dWlsZGluZyB3aXRoIFVTRV9XT1JLU1BBQ0U9WUVTLCBhbmQKKyAgICAgICAgd29ya3NwYWNlIGJ1 aWxkcyBhcmUgbm90IGNoZWNrZWQgYnkgYnVpbGRlcnMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDogQWRkIC0t dXNlLXdvcmtzcGFjZSBmbGFnLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbTogUmVt b3ZlIGNhblVzZVhDQnVpbGQsIHRoZSBmbGFnIGl0IHBvd2VyZWQgaXMgbm8gbG9uZ2VyIHVzZWQu CisgICAgICAgIChidWlsZFhDb2RlV29ya3NwYWNlKTogQWRkZWQuCisKIDIwMjItMDEtMjQgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtd W2ExMXldIFRlc3QgYWNjZXNzaWJpbGl0eS91cmwtdGVzdC5odG1sIGZhaWxzIHdpdGggQVRTUEkK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy9i dWlsZC13ZWJraXQKaW5kZXggMWUzZGI1YTRkM2UzOWI4ZDU0ZDE2ODFlMDViZjZjY2NiN2ZjZDA2 MS4uZGQ1NTIzYzk3ZDRjY2JhYmVmZjM5NDU3MmE2NGNlZWZhZmY2NzY5ZiAxMDA3NTUKLS0tIGEv VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKKysrIGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJr aXQKQEAgLTc1LDYgKzc1LDcgQEAgbXkgJHNob3VsZFJ1blN0YXRpY0FuYWx5emVyID0gMDsKIG15 ICRub0V4cGVyaW1lbnRhbEZlYXR1cmVzID0gMDsKIG15ICRsdG9Nb2RlID0gImRlZmF1bHQiOwog bXkgJHhjYnVpbGQgPSB1bmRlZjsKK215ICR1c2VXb3Jrc3BhY2UgPSB1bmRlZjsKIG15ICRzdGFy dFRpbWUgPSB0aW1lKCk7CiBteSAkYXJjaHMzMmJpdCA9IDA7CiBteSAkc2tpcExpYnJhcnlVcGRh dGUgPSAwOwpAQCAtMTAzLDggKzEwNCw4IEBAIGZvcmVhY2ggKEBmZWF0dXJlcykgewogbXkgJHBy b2dyYW1OYW1lID0gYmFzZW5hbWUoJDApOwogbXkgJHVzYWdlID0gPDxFT0Y7CiBVc2FnZTogJHBy b2dyYW1OYW1lIFtvcHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRvIGJ1aWxkIHN5c3RlbV0KLSAg LS1oZWxwICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNob3cgdGhpcyBoZWxwIG1lc3NhZ2UK LSAgLS12ZXJib3NlICAgICAgICAgICAgICAgICAgICAgICAgIFNob3cgdmVyYm9zZSBidWlsZCBv dXRwdXQKKyAgLWgsIC0taGVscCAgICAgICAgICAgICAgICAgICAgICAgIFNob3cgdGhpcyBoZWxw IG1lc3NhZ2UKKyAgLXYsIC0tdmVyYm9zZSAgICAgICAgICAgICAgICAgICAgIFNob3cgdmVyYm9z ZSBidWlsZCBvdXRwdXQKICAgLS1jbGVhbiAgICAgICAgICAgICAgICAgICAgICAgICAgIENsZWFu dXAgdGhlIGJ1aWxkIGRpcmVjdG9yeQogICAtLWdlbmVyYXRlLXByb2plY3Qtb25seSAgICAgICAg ICAgT25seSBnZW5lcmF0ZSBwcm9qZWN0IGZpbGVzCiAgIC0tZGVidWcgICAgICAgICAgICAgICAg ICAgICAgICAgICBDb21waWxlIHdpdGggRGVidWcgY29uZmlndXJhdGlvbgpAQCAtMTIxLDcgKzEy Miw4IEBAIFVzYWdlOiAkcHJvZ3JhbU5hbWUgW29wdGlvbnNdIFtvcHRpb25zIHRvIHBhc3MgdG8g YnVpbGQgc3lzdGVtXQogICAtLWNvdmVyYWdlICAgICAgICAgICAgICAgICAgICAgICAgRW5hYmxl IGNvZGUgY292ZXJhZ2Ugc3VwcG9ydCAoTWFjIG9ubHkpCiAgIC0tYW5hbHl6ZSAgICAgICAgICAg ICAgICAgICAgICAgICBFbmFibGUgc3RhdGljIGFuYXlsc2lzIChpT1MgYW5kIE1hYyBvbmx5KQog ICAtLWx0by1tb2RlPTxtb2RlPiAgICAgICAgICAgICAgICAgU2V0IExpbmsgVGltZSBPcHRpbWl6 YXRpb24gbW9kZSAoZnVsbCwgdGhpbiwgb3Igbm9uZSkgKExMVk0gb25seSkKLSAgLS1bbm8tXXhj YnVpbGQgICAgICAgICAgICAgICAgICAgIEZvcmNlIHRoZSB1c2Ugb2YgWENCdWlsZCBvciBub3QK KyAgLS1bbm8tXXhjYnVpbGQgICAgICAgICAgICAgICAgICAgIERFUFJFQ0FURUQgdXNlIG9mIFhD QnVpbGQgb3Igbm90CisgIC0tW25vLV11c2Utd29ya3NwYWNlICAgICAgICAgICAgICBVc2UgV2Vi S2l0Lnhjd29ya3NwYWNlIGFuZCBYQ0J1aWxkIChpT1MgYW5kIE1hYyBvbmx5KQogCiAgIC0tZnR3 ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBCdWlsZCB0aGUgRlRXIFdpbmRvd3MgcG9ydAog ICAtLWd0ayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQnVpbGQgdGhlIEdUSysgcG9ydApA QCAtMTQ3LDcgKzE0OSw3IEBAIFVzYWdlOiAkcHJvZ3JhbU5hbWUgW29wdGlvbnNdIFtvcHRpb25z IHRvIHBhc3MgdG8gYnVpbGQgc3lzdGVtXQogRU9GCiAKIG15ICVvcHRpb25zID0gKAotICAgICdo ZWxwJyA9PiBcJHNob3dIZWxwLAorICAgICdofGhlbHAnID0+IFwkc2hvd0hlbHAsCiAgICAgJ3Z8 dmVyYm9zZScgPT4gXCR2ZXJib3NlLAogICAgICdjbGVhbicgPT4gXCRjbGVhbiwKICAgICAnaW5z dGFsbC1oZWFkZXJzPXMnID0+IFwkaW5zdGFsbEhlYWRlcnMsCkBAIC0xNjIsNiArMTY0LDcgQEAg bXkgJW9wdGlvbnMgPSAoCiAgICAgJ25vLWV4cGVyaW1lbnRhbC1mZWF0dXJlcycgPT4gXCRub0V4 cGVyaW1lbnRhbEZlYXR1cmVzLAogICAgICdsdG8tbW9kZT1zJyA9PiBcJGx0b01vZGUsCiAgICAg J3hjYnVpbGQhJyA9PiBcJHhjYnVpbGQsCisgICAgJ3VzZS13b3Jrc3BhY2UhJyA9PiBcJHVzZVdv cmtzcGFjZSwKICAgICAnc2tpcC1saWJyYXJ5LXVwZGF0ZScgPT4gXCRza2lwTGlicmFyeVVwZGF0 ZSwKICAgICAndXNlLWNjYWNoZSEnID0+IFwkdXNlQ0NhY2hlLAogKTsKQEAgLTIyMiwxMyArMjI1 LDEzIEBAIG15IEBvcHRpb25zID0gKCk7CiAKIGlmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSkgewog ICAgIHB1c2ggQG9wdGlvbnMsIFhjb2RlT3B0aW9ucygpOwotCi0gICAgIyBUZW1wb3JhcmlseSBk aXNhYmxlIGRlZmF1bHQgdXNlIG9mIFhDQnVpbGQgdW50aWwgaXNzdWVzIHdpdGggaXQgYXJlIGly b25lZCBvdXQuCi0gICAgI2lmICgobm90IGRlZmluZWQgJHhjYnVpbGQgb3IgJHhjYnVpbGQpIGFu ZCBjYW5Vc2VYQ0J1aWxkKCkpIHsKLSAgICBpZiAoJHhjYnVpbGQgYW5kIGNhblVzZVhDQnVpbGQo KSkgeworICAgIGlmICgkeGNidWlsZCkgeworICAgICAgICAjIERlcHJlY2F0ZWQ6IEV2ZW50dWFs bHksIGFsbCBYQ0J1aWxkIGludm9jYXRpb25zIHdpbGwgYnVpbGQgdGhyb3VnaCB0aGUgd29ya3Nw YWNlLgogICAgICAgICBwdXNoIEBvcHRpb25zLCAiLVVzZU5ld0J1aWxkU3lzdGVtPVlFUyI7Ci0g ICAgfSBlbHNlIHsKKyAgICB9IGVsc2lmICghJHVzZVdvcmtzcGFjZSkgewogICAgICAgICBwdXNo IEBvcHRpb25zLCAiLVVzZU5ld0J1aWxkU3lzdGVtPU5PIjsKKyAgICB9IGVsc2UgeworICAgICAg ICBkaWUgIkVycm9yOiAtLXVzZS13b3Jrc3BhY2UgYW5kIC0tbm8teGNidWlsZCBhcmUgbm90IGNv bXBhdGlibGUuIFdvcmtzcGFjZXMgYnVpbGRzIHJlcXVpcmUgWENCdWlsZC5cbiI7CiAgICAgfQog CiAgICAgc3ViIG9wdGlvbigkJCkKQEAgLTI0MywyOSArMjQ2LDMyIEBAIGlmIChpc0FwcGxlQ29j b2FXZWJLaXQoKSkgewogICAgICAgICBwdXNoIEBvcHRpb25zLCAkb3B0aW9uIHVubGVzcyAkb3B0 aW9uIGVxICIiOwogICAgIH0KIAotICAgICMgQU5HTEUgYW5kIGxpYndlYnJ0YyBtdXN0IGNvbWUg YmVmb3JlIFdlYkNvcmUKLSAgICBzcGxpY2UgQHByb2plY3RzLCAwLCAwLCAoIlNvdXJjZS9UaGly ZFBhcnR5L0FOR0xFIik7Ci0gICAgIyBpZiAobm90ICRhcmNoczMyYml0IGFuZCAocG9ydE5hbWUo KSBlcSBNYWMgb3IgcG9ydE5hbWUoKSBlcSBpT1Mgb3IgcG9ydE5hbWUoKSBlcSB3YXRjaE9TKSkg ewotICAgIGlmIChwb3J0TmFtZSgpIGVxIE1hYyBvciBwb3J0TmFtZSgpIGVxIGlPUykgewotICAg ICAgICBzcGxpY2UgQHByb2plY3RzLCAwLCAwLCAoIlNvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0 YyIpOwotICAgIH0KKyAgICAjIEluIHdvcmtzcGFjZXMsIGJ1aWxkIG9yZGVyIGlzIGRldGVybWlu ZWQgYnkgWENCdWlsZC4KKyAgICBpZiAoISR1c2VXb3Jrc3BhY2UpIHsKKyAgICAgICAgIyBBTkdM RSBhbmQgbGlid2VicnRjIG11c3QgY29tZSBiZWZvcmUgV2ViQ29yZQorICAgICAgICBzcGxpY2Ug QHByb2plY3RzLCAwLCAwLCAoIlNvdXJjZS9UaGlyZFBhcnR5L0FOR0xFIik7CisgICAgICAgICMg aWYgKG5vdCAkYXJjaHMzMmJpdCBhbmQgKHBvcnROYW1lKCkgZXEgTWFjIG9yIHBvcnROYW1lKCkg ZXEgaU9TIG9yIHBvcnROYW1lKCkgZXEgd2F0Y2hPUykpIHsKKyAgICAgICAgaWYgKHBvcnROYW1l KCkgZXEgTWFjIG9yIHBvcnROYW1lKCkgZXEgaU9TKSB7CisgICAgICAgICAgICBzcGxpY2UgQHBy b2plY3RzLCAwLCAwLCAoIlNvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0YyIpOworICAgICAgICB9 CiAKLSAgICBwdXNoIEBwcm9qZWN0cywgKCJTb3VyY2UvV2ViS2l0Iik7CisgICAgICAgIHB1c2gg QHByb2plY3RzLCAoIlNvdXJjZS9XZWJLaXQiKTsKIAotICAgIGlmICghaXNFbWJlZGRlZFdlYktp dCgpKSB7Ci0gICAgICAgIHB1c2ggQHByb2plY3RzLCAoIlRvb2xzL01pbmlCcm93c2VyIik7Cisg ICAgICAgIGlmICghaXNFbWJlZGRlZFdlYktpdCgpKSB7CisgICAgICAgICAgICBwdXNoIEBwcm9q ZWN0cywgKCJUb29scy9NaW5pQnJvd3NlciIpOwogCi0gICAgICAgICMgV2ViSW5zcGVjdG9yVUkg bXVzdCBjb21lIGFmdGVyIEphdmFTY3JpcHRDb3JlIGFuZCBXZWJDb3JlIGJ1dCBiZWZvcmUgV2Vi S2l0IGFuZCBXZWJLaXQyCi0gICAgICAgIG15ICR3ZWJLaXRJbmRleCA9IGZpcnN0IHsgJHByb2pl Y3RzWyRfXSBlcSAiU291cmNlL1dlYktpdExlZ2FjeSIgfSAwLi4kI3Byb2plY3RzOwotICAgICAg ICBzcGxpY2UoQHByb2plY3RzLCAkd2ViS2l0SW5kZXgsIDAsICJTb3VyY2UvV2ViSW5zcGVjdG9y VUkiKTsKLSAgICB9CisgICAgICAgICAgICAjIFdlYkluc3BlY3RvclVJIG11c3QgY29tZSBhZnRl ciBKYXZhU2NyaXB0Q29yZSBhbmQgV2ViQ29yZSBidXQgYmVmb3JlIFdlYktpdCBhbmQgV2ViS2l0 MgorICAgICAgICAgICAgbXkgJHdlYktpdEluZGV4ID0gZmlyc3QgeyAkcHJvamVjdHNbJF9dIGVx ICJTb3VyY2UvV2ViS2l0TGVnYWN5IiB9IDAuLiQjcHJvamVjdHM7CisgICAgICAgICAgICBzcGxp Y2UoQHByb2plY3RzLCAkd2ViS2l0SW5kZXgsIDAsICJTb3VyY2UvV2ViSW5zcGVjdG9yVUkiKTsK KyAgICAgICAgfQogCi0gICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewotICAgICAgICBwdXNo IEBwcm9qZWN0cywgKCJUb29scy9sbGRiL2xsZGJXZWJLaXRUZXN0ZXIiKTsKLSAgICB9CisgICAg ICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKKyAgICAgICAgICAgIHB1c2ggQHByb2plY3Rz LCAoIlRvb2xzL2xsZGIvbGxkYldlYktpdFRlc3RlciIpOworICAgICAgICB9CiAKLSAgICAjIEJ1 aWxkIFRvb2xzIG5lZWRlZCBmb3IgQXBwbGUgcG9ydHMgKGV4Y2VwdCBmb3IgdHZPUykKLSAgICBw dXNoIEBwcm9qZWN0cywgKCJUb29scy9EdW1wUmVuZGVyVHJlZSIsICJUb29scy9XZWJLaXRUZXN0 UnVubmVyIiwgIlNvdXJjZS9UaGlyZFBhcnR5L2d0ZXN0IiwgIlRvb2xzL1Rlc3RXZWJLaXRBUEki KTsKKyAgICAgICAgIyBCdWlsZCBUb29scyBuZWVkZWQgZm9yIEFwcGxlIHBvcnRzIChleGNlcHQg Zm9yIHR2T1MpCisgICAgICAgIHB1c2ggQHByb2plY3RzLCAoIlRvb2xzL0R1bXBSZW5kZXJUcmVl IiwgIlRvb2xzL1dlYktpdFRlc3RSdW5uZXIiLCAiU291cmNlL1RoaXJkUGFydHkvZ3Rlc3QiLCAi VG9vbHMvVGVzdFdlYktpdEFQSSIpOworICAgIH0KIAogfSBlbHNpZiAoaXNXaW5DYWlybygpICYm ICEkc2tpcExpYnJhcnlVcGRhdGUpIHsKICAgICAoc3lzdGVtKCJweXRob24gVG9vbHMvU2NyaXB0 cy91cGRhdGUtd2Via2l0LXdpbmNhaXJvLWxpYnMucHkiKSA9PSAwKSBvciBkaWU7CkBAIC0zMzks MjUgKzM0NSwzMyBAQCBpZiAoaXNBcHBsZVdpbldlYktpdCgpIHx8IGlzV2luQ2Fpcm8oKSB8fCBp c1BsYXlTdGF0aW9uKCkgfHwgaXNGVFcoKSkgewogfSBlbHNpZiAoaXNBcHBsZUNvY29hV2ViS2l0 KCkgJiYgIWlzQ01ha2VCdWlsZCgpKSB7CiAgICAgZXhpdCAwIGlmIGlzR2VuZXJhdGVQcm9qZWN0 T25seSgpOwogCisgICAgbXkgQGxvY2FsX29wdGlvbnMgPSBAb3B0aW9uczsKKyAgICBwdXNoIEBs b2NhbF9vcHRpb25zLCBYY29kZUNvdmVyYWdlU3VwcG9ydE9wdGlvbnMoKSBpZiAkY292ZXJhZ2VT dXBwb3J0OworICAgIHB1c2ggQGxvY2FsX29wdGlvbnMsIFhjb2RlU3RhdGljQW5hbHl6ZXJPcHRp b24oKSBpZiAkc2hvdWxkUnVuU3RhdGljQW5hbHl6ZXI7CisgICAgcHVzaCBAbG9jYWxfb3B0aW9u cywgIldLX0xUT19NT0RFPSRsdG9Nb2RlIiBpZiAoJGx0b01vZGUgbmUgImRlZmF1bHQiKTsKKwog ICAgICMgQnVpbGQsIGFuZCBhYm9ydCBpZiB0aGUgYnVpbGQgZmFpbHMuCi0gICAgZm9yIG15ICRk aXIgKEBwcm9qZWN0cykgewotICAgICAgICBjaGRpciAkZGlyIG9yIGRpZTsKLSAgICAgICAgJHJl c3VsdCA9IDA7CisgICAgaWYgKCR1c2VXb3Jrc3BhY2UpIHsKKyAgICAgICAgbXkgJHNjaGVtZSA9 ICRvbmx5V2ViS2l0UHJvamVjdCA/ICJXZWJLaXRMZWdhY3kiIDogIkFsbCBNb2R1bGVzIjsKKyAg ICAgICAgJHJlc3VsdCA9IGJ1aWxkWENvZGVXb3Jrc3BhY2UoIldlYktpdC54Y3dvcmtzcGFjZSIs ICRzY2hlbWUsICRjbGVhbiwgQGxvY2FsX29wdGlvbnMsIEBBUkdWKTsKKyAgICAgICAgaWYgKGV4 aXRTdGF0dXMoJHJlc3VsdCkpIHsKKyAgICAgICAgICAgIGV4aXQgZXhpdFN0YXR1cygkcmVzdWx0 KTsKKyAgICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICAgIGZvciBteSAkZGlyIChAcHJvamVj dHMpIHsKKyAgICAgICAgICAgIGNoZGlyICRkaXIgb3IgZGllOworICAgICAgICAgICAgJHJlc3Vs dCA9IDA7CiAKLSAgICAgICAgbXkgJHByb2plY3QgPSBiYXNlbmFtZSgkZGlyKTsKLSAgICAgICAg Ci0gICAgICAgIG15IEBsb2NhbF9vcHRpb25zID0gQG9wdGlvbnM7Ci0gICAgICAgIHB1c2ggQGxv Y2FsX29wdGlvbnMsIFhjb2RlQ292ZXJhZ2VTdXBwb3J0T3B0aW9ucygpIGlmICRjb3ZlcmFnZVN1 cHBvcnQ7Ci0gICAgICAgIHB1c2ggQGxvY2FsX29wdGlvbnMsIFhjb2RlU3RhdGljQW5hbHl6ZXJP cHRpb24oKSBpZiAkc2hvdWxkUnVuU3RhdGljQW5hbHl6ZXI7Ci0gICAgICAgIHB1c2ggQGxvY2Fs X29wdGlvbnMsICJXS19MVE9fTU9ERT0kbHRvTW9kZSIgaWYgKCRsdG9Nb2RlIG5lICJkZWZhdWx0 Iik7Ci0gICAgICAgIG15ICRwcm9qZWN0UGF0aCA9ICRwcm9qZWN0ID1+IC9ndGVzdC8gPyAieGNv ZGUvZ3Rlc3QiIDogJHByb2plY3Q7Ci0gICAgICAgICRyZXN1bHQgPSBidWlsZFhDb2RlUHJvamVj dCgkcHJvamVjdFBhdGgsICRjbGVhbiwgQGxvY2FsX29wdGlvbnMsIEBBUkdWKTsKKyAgICAgICAg ICAgIG15ICRwcm9qZWN0ID0gYmFzZW5hbWUoJGRpcik7CisgICAgICAgICAgICBteSAkcHJvamVj dFBhdGggPSAkcHJvamVjdCA9fiAvZ3Rlc3QvID8gInhjb2RlL2d0ZXN0IiA6ICRwcm9qZWN0Owor ICAgICAgICAgICAgJHJlc3VsdCA9IGJ1aWxkWENvZGVQcm9qZWN0KCRwcm9qZWN0UGF0aCwgJGNs ZWFuLCBAbG9jYWxfb3B0aW9ucywgQEFSR1YpOwogCi0gICAgICAgICMgVmFyaW91cyBidWlsZCog Y2FsbHMgYWJvdmUgbWF5IGNoYW5nZSB0aGUgQ1dELgotICAgICAgICBjaGRpcldlYktpdCgpOwor ICAgICAgICAgICAgIyBWYXJpb3VzIGJ1aWxkKiBjYWxscyBhYm92ZSBtYXkgY2hhbmdlIHRoZSBD V0QuCisgICAgICAgICAgICBjaGRpcldlYktpdCgpOwogCi0gICAgICAgIGlmIChleGl0U3RhdHVz KCRyZXN1bHQpKSB7Ci0gICAgICAgICAgICBleGl0IGV4aXRTdGF0dXMoJHJlc3VsdCk7CisgICAg ICAgICAgICBpZiAoZXhpdFN0YXR1cygkcmVzdWx0KSkgeworICAgICAgICAgICAgICAgIGV4aXQg ZXhpdFN0YXR1cygkcmVzdWx0KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIApk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtCmluZGV4IDQ4ZTE0ZTUyMWM5ODRiYjgwYjg3ODM5NjUzMmUwNWEyZWRjZmU0 MWQuLmQ1NjA0YjM4NDRmNmU2MDFhODBjNDczM2RjYjRhNjU5MTRkMDczMjAgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KQEAgLTEwNzksMTIgKzEwNzksNiBAQCBzdWIgWGNvZGVTdGF0aWNBbmFseXplck9wdGlv bigpCiAgICAgcmV0dXJuICJSVU5fQ0xBTkdfU1RBVElDX0FOQUxZWkVSPVlFUyI7CiB9CiAKLXN1 YiBjYW5Vc2VYQ0J1aWxkKCkKLXsKLSAgICBkZXRlcm1pbmVYY29kZVZlcnNpb24oKTsKLSAgICBy ZXR1cm4gKGV2YWwgInYkeGNvZGVWZXJzaW9uIiBnZSB2MTEuNCkKLX0KLQogbXkgJHBhc3NlZENv bmZpZ3VyYXRpb247CiBteSAkc2VhcmNoZWRGb3JQYXNzZWRDb25maWd1cmF0aW9uOwogc3ViIGRl dGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24KQEAgLTIxMTMsNiArMjEwNywxNSBAQCBzdWIgYnVp bGRYQ29kZVByb2plY3QoJCRAKQogICAgIHJldHVybiBzeXN0ZW0gInhjb2RlYnVpbGQiLCAiLXBy b2plY3QiLCAiJHByb2plY3QueGNvZGVwcm9qIiwgQGV4dHJhT3B0aW9uczsKIH0KIAorc3ViIGJ1 aWxkWENvZGVXb3Jrc3BhY2UoJCQkQCkKK3sKKyAgICBteSAoJHdvcmtzcGFjZSwgJHNjaGVtZSwg JGNsZWFuLCBAZXh0cmFPcHRpb25zKSA9IEBfOworICAgIGlmICgkY2xlYW4pIHsKKyAgICAgICAg cHVzaCBAZXh0cmFPcHRpb25zLCAiY2xlYW4iOworICAgIH0KKyAgICByZXR1cm4gc3lzdGVtICJ4 Y29kZWJ1aWxkIiwgIi13b3Jrc3BhY2UiLCAkd29ya3NwYWNlLCAiLXNjaGVtZSIsICRzY2hlbWUs IEBleHRyYU9wdGlvbnM7Cit9CisKIHN1YiBnZXRWaXN1YWxTdHVkaW9Ub29sc2V0KCkKIHsKICAg ICBpZiAoaXNQbGF5U3RhdGlvbigpKSB7Cg== 449943 2022-01-25 10:57:02 -0800 2022-01-26 11:23:19 -0800 Patch bug-235550-20220125105702.patch text/plain 10514 emw U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGJhNmYzZThmNmE0MTAyMjI1NjE3YjlhYzNiM2EwOGUz NDI5YzU0ZC4uMDE4Mzk5MDk5YWM3ZDAxNzUxOTVlNjk5NjQ1OTdiNTI4NDQwNTcwNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIyLTAxLTI0ICBFbGxpb3R0IFdpbGxpYW1zICA8ZW13QGFwcGxlLmNvbT4KKworICAg ICAgICBTdXBwb3J0IHdvcmtzcGFjZSBidWlsZHMgaW4gYnVpbGQtd2Via2l0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU1NTAKKworICAgICAgICBP biBBcHBsZSBwbGF0Zm9ybXMsIGBidWlsZC13ZWJraXQgLS11c2Utd29ya3NwYWNlYCBub3cgYnVp bGRzIHVzaW5nIFdlYktpdC54Y3dvcmtzcGFjZSBhbmQKKyAgICAgICAgWENCdWlsZC4gVGhpcyBj b21wbGVtZW50cyB0aGUgYFVTRV9XT1JLU1BBQ0U9WUVTYCBNYWtlIGZsYWcgYWRkZWQgaW4KKyAg ICAgICAgaHR0cHM6Ly9jb21taXRzLndlYmtpdC5vcmcvMjQ2MjMyQG1haW4uCisKKyAgICAgICAg QXQgdGhpcyB0aW1lLCB0aGVyZSBpcyBubyBndWFyYW50ZWUgb2YgY29ycmVjdG5lc3Mgd2hlbiBi dWlsZGluZyB3aXRoIFVTRV9XT1JLU1BBQ0U9WUVTLCBhbmQKKyAgICAgICAgd29ya3NwYWNlIGJ1 aWxkcyBhcmUgbm90IGNoZWNrZWQgYnkgYnVpbGRlcnMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg QWxleGV5IFByb3NrdXJ5YWtvdi4KKworICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OiBB ZGQgLS11c2Utd29ya3NwYWNlIGZsYWcsIGNvcnJlY3QgcGxhdGZvcm0gaGludHMgaW4gJHVzYWdl LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbTogUmVtb3ZlIGNhblVzZVhDQnVpbGQs IHRoZSBmbGFnIGl0IHBvd2VyZWQgaXMgbm8gbG9uZ2VyIHVzZWQuCisgICAgICAgIChidWlsZFhD b2RlV29ya3NwYWNlKTogQWRkZWQuCisKIDIwMjItMDEtMjQgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW2ExMXldIFRlc3QgYWNjZXNz aWJpbGl0eS91cmwtdGVzdC5odG1sIGZhaWxzIHdpdGggQVRTUEkKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvYnVpbGQtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKaW5kZXgg MWUzZGI1YTRkM2UzOWI4ZDU0ZDE2ODFlMDViZjZjY2NiN2ZjZDA2MS4uYjlhYzcyNDM4NDkxNzA5 ZjI5ZTk5YTVkMDM5NTQzMmViNTE5NTI3ZSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9idWls ZC13ZWJraXQKKysrIGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKQEAgLTc1LDYgKzc1LDcg QEAgbXkgJHNob3VsZFJ1blN0YXRpY0FuYWx5emVyID0gMDsKIG15ICRub0V4cGVyaW1lbnRhbEZl YXR1cmVzID0gMDsKIG15ICRsdG9Nb2RlID0gImRlZmF1bHQiOwogbXkgJHhjYnVpbGQgPSB1bmRl ZjsKK215ICR1c2VXb3Jrc3BhY2UgPSB1bmRlZjsKIG15ICRzdGFydFRpbWUgPSB0aW1lKCk7CiBt eSAkYXJjaHMzMmJpdCA9IDA7CiBteSAkc2tpcExpYnJhcnlVcGRhdGUgPSAwOwpAQCAtMTAzLDEz ICsxMDQsMTMgQEAgZm9yZWFjaCAoQGZlYXR1cmVzKSB7CiBteSAkcHJvZ3JhbU5hbWUgPSBiYXNl bmFtZSgkMCk7CiBteSAkdXNhZ2UgPSA8PEVPRjsKIFVzYWdlOiAkcHJvZ3JhbU5hbWUgW29wdGlv bnNdIFtvcHRpb25zIHRvIHBhc3MgdG8gYnVpbGQgc3lzdGVtXQotICAtLWhlbHAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZQotICAtLXZlcmJvc2UgICAg ICAgICAgICAgICAgICAgICAgICAgU2hvdyB2ZXJib3NlIGJ1aWxkIG91dHB1dAorICAtaCwgLS1o ZWxwICAgICAgICAgICAgICAgICAgICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZQorICAtdiwg LS12ZXJib3NlICAgICAgICAgICAgICAgICAgICAgU2hvdyB2ZXJib3NlIGJ1aWxkIG91dHB1dAog ICAtLWNsZWFuICAgICAgICAgICAgICAgICAgICAgICAgICAgQ2xlYW51cCB0aGUgYnVpbGQgZGly ZWN0b3J5CiAgIC0tZ2VuZXJhdGUtcHJvamVjdC1vbmx5ICAgICAgICAgICBPbmx5IGdlbmVyYXRl IHByb2plY3QgZmlsZXMKICAgLS1kZWJ1ZyAgICAgICAgICAgICAgICAgICAgICAgICAgIENvbXBp bGUgd2l0aCBEZWJ1ZyBjb25maWd1cmF0aW9uCiAgIC0tcmVsZWFzZSAgICAgICAgICAgICAgICAg ICAgICAgICBDb21waWxlIHdpdGggUmVsZWFzZSBjb25maWd1cmF0aW9uCi0gIC0tc2RrPTxzZGs+ ICAgICAgICAgICAgICAgICAgICAgICBVc2UgYSBzcGVjaWZpYyBYY29kZSBTREsgKGlPUyBhbmQg TWFjIG9ubHkpCisgIC0tc2RrPTxzZGs+ICAgICAgICAgICAgICAgICAgICAgICBVc2UgYSBzcGVj aWZpYyBYY29kZSBTREsgKEFwcGxlIHBsYXRmb3JtcyBvbmx5KQogICAtLWlvcy1kZXZpY2UgICAg ICAgICAgICAgICAgICAgICAgVXNlICJpcGhvbmVvcy5pbnRlcm5hbCIgU0RLIGlmIGluc3RhbGxl ZCwgZWxzZSAiaXBob25lb3MiIFNESyAoaU9TIG9ubHkpCiAgIC0tZGV2aWNlICAgICAgICAgICAg ICAgICAgICAgICAgICBERVBSRUNBVEVEIGFsaWFzIG9mIC0taW9zLWRldmljZQogICAtLWlvcy1z aW11bGF0b3IgICAgICAgICAgICAgICAgICAgVXNlICJpcGhvbmVzaW11bGF0b3IuaW50ZXJuYWwi IFNESyBpZiBpbnN0YWxsZWQsIGVsc2UgImlwaG9uZXNpbXVsYXRvciIgU0RLIChpT1Mgb25seSkK QEAgLTExOSw5ICsxMjAsMTAgQEAgVXNhZ2U6ICRwcm9ncmFtTmFtZSBbb3B0aW9uc10gW29wdGlv bnMgdG8gcGFzcyB0byBidWlsZCBzeXN0ZW1dCiAgIC0td2F0Y2hvcy1kZXZpY2UgICAgICAgICAg ICAgICAgICBVc2UgIndhdGNob3MuaW50ZXJuYWwiIFNESyBpZiBpbnN0YWxsZWQsIGVsc2UgIndh dGNob3MiIFNESyAod2F0Y2hPUyBvbmx5KQogICAtLXdhdGNob3Mtc2ltdWxhdG9yICAgICAgICAg ICAgICAgVXNlICJ3YXRjaHNpbXVsYXRvciIgKHdhdGNoT1Mgb25seSkKICAgLS1jb3ZlcmFnZSAg ICAgICAgICAgICAgICAgICAgICAgIEVuYWJsZSBjb2RlIGNvdmVyYWdlIHN1cHBvcnQgKE1hYyBv bmx5KQotICAtLWFuYWx5emUgICAgICAgICAgICAgICAgICAgICAgICAgRW5hYmxlIHN0YXRpYyBh bmF5bHNpcyAoaU9TIGFuZCBNYWMgb25seSkKKyAgLS1hbmFseXplICAgICAgICAgICAgICAgICAg ICAgICAgIEVuYWJsZSBzdGF0aWMgYW5heWxzaXMgKEFwcGxlIHBsYXRmb3JtcyBvbmx5KQogICAt LWx0by1tb2RlPTxtb2RlPiAgICAgICAgICAgICAgICAgU2V0IExpbmsgVGltZSBPcHRpbWl6YXRp b24gbW9kZSAoZnVsbCwgdGhpbiwgb3Igbm9uZSkgKExMVk0gb25seSkKLSAgLS1bbm8tXXhjYnVp bGQgICAgICAgICAgICAgICAgICAgIEZvcmNlIHRoZSB1c2Ugb2YgWENCdWlsZCBvciBub3QKKyAg LS1bbm8tXXhjYnVpbGQgICAgICAgICAgICAgICAgICAgIERFUFJFQ0FURUQgdXNlIG9mIFhDQnVp bGQgb3Igbm90CisgIC0tW25vLV11c2Utd29ya3NwYWNlICAgICAgICAgICAgICBVc2UgV2ViS2l0 Lnhjd29ya3NwYWNlIGFuZCBYQ0J1aWxkIChBcHBsZSBwbGF0Zm9ybXMgb25seSkKIAogICAtLWZ0 dyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQnVpbGQgdGhlIEZUVyBXaW5kb3dzIHBvcnQK ICAgLS1ndGsgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEJ1aWxkIHRoZSBHVEsrIHBvcnQK QEAgLTE0Nyw3ICsxNDksNyBAQCBVc2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbb3B0aW9u cyB0byBwYXNzIHRvIGJ1aWxkIHN5c3RlbV0KIEVPRgogCiBteSAlb3B0aW9ucyA9ICgKLSAgICAn aGVscCcgPT4gXCRzaG93SGVscCwKKyAgICAnaHxoZWxwJyA9PiBcJHNob3dIZWxwLAogICAgICd2 fHZlcmJvc2UnID0+IFwkdmVyYm9zZSwKICAgICAnY2xlYW4nID0+IFwkY2xlYW4sCiAgICAgJ2lu c3RhbGwtaGVhZGVycz1zJyA9PiBcJGluc3RhbGxIZWFkZXJzLApAQCAtMTYyLDYgKzE2NCw3IEBA IG15ICVvcHRpb25zID0gKAogICAgICduby1leHBlcmltZW50YWwtZmVhdHVyZXMnID0+IFwkbm9F eHBlcmltZW50YWxGZWF0dXJlcywKICAgICAnbHRvLW1vZGU9cycgPT4gXCRsdG9Nb2RlLAogICAg ICd4Y2J1aWxkIScgPT4gXCR4Y2J1aWxkLAorICAgICd1c2Utd29ya3NwYWNlIScgPT4gXCR1c2VX b3Jrc3BhY2UsCiAgICAgJ3NraXAtbGlicmFyeS11cGRhdGUnID0+IFwkc2tpcExpYnJhcnlVcGRh dGUsCiAgICAgJ3VzZS1jY2FjaGUhJyA9PiBcJHVzZUNDYWNoZSwKICk7CkBAIC0yMjIsMTMgKzIy NSwxMyBAQCBteSBAb3B0aW9ucyA9ICgpOwogCiBpZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkpIHsK ICAgICBwdXNoIEBvcHRpb25zLCBYY29kZU9wdGlvbnMoKTsKLQotICAgICMgVGVtcG9yYXJpbHkg ZGlzYWJsZSBkZWZhdWx0IHVzZSBvZiBYQ0J1aWxkIHVudGlsIGlzc3VlcyB3aXRoIGl0IGFyZSBp cm9uZWQgb3V0LgotICAgICNpZiAoKG5vdCBkZWZpbmVkICR4Y2J1aWxkIG9yICR4Y2J1aWxkKSBh bmQgY2FuVXNlWENCdWlsZCgpKSB7Ci0gICAgaWYgKCR4Y2J1aWxkIGFuZCBjYW5Vc2VYQ0J1aWxk KCkpIHsKKyAgICBpZiAoJHhjYnVpbGQpIHsKKyAgICAgICAgIyBEZXByZWNhdGVkOiBFdmVudHVh bGx5LCBhbGwgWENCdWlsZCBpbnZvY2F0aW9ucyB3aWxsIGJ1aWxkIHRocm91Z2ggdGhlIHdvcmtz cGFjZS4KICAgICAgICAgcHVzaCBAb3B0aW9ucywgIi1Vc2VOZXdCdWlsZFN5c3RlbT1ZRVMiOwot ICAgIH0gZWxzZSB7CisgICAgfSBlbHNpZiAoISR1c2VXb3Jrc3BhY2UpIHsKICAgICAgICAgcHVz aCBAb3B0aW9ucywgIi1Vc2VOZXdCdWlsZFN5c3RlbT1OTyI7CisgICAgfSBlbHNlIHsKKyAgICAg ICAgZGllICJFcnJvcjogLS11c2Utd29ya3NwYWNlIGFuZCAtLW5vLXhjYnVpbGQgYXJlIG5vdCBj b21wYXRpYmxlLiBXb3Jrc3BhY2VzIGJ1aWxkcyByZXF1aXJlIFhDQnVpbGQuXG4iOwogICAgIH0K IAogICAgIHN1YiBvcHRpb24oJCQpCkBAIC0yNDMsMjkgKzI0NiwzMiBAQCBpZiAoaXNBcHBsZUNv Y29hV2ViS2l0KCkpIHsKICAgICAgICAgcHVzaCBAb3B0aW9ucywgJG9wdGlvbiB1bmxlc3MgJG9w dGlvbiBlcSAiIjsKICAgICB9CiAKLSAgICAjIEFOR0xFIGFuZCBsaWJ3ZWJydGMgbXVzdCBjb21l IGJlZm9yZSBXZWJDb3JlCi0gICAgc3BsaWNlIEBwcm9qZWN0cywgMCwgMCwgKCJTb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRSIpOwotICAgICMgaWYgKG5vdCAkYXJjaHMzMmJpdCBhbmQgKHBvcnROYW1l KCkgZXEgTWFjIG9yIHBvcnROYW1lKCkgZXEgaU9TIG9yIHBvcnROYW1lKCkgZXEgd2F0Y2hPUykp IHsKLSAgICBpZiAocG9ydE5hbWUoKSBlcSBNYWMgb3IgcG9ydE5hbWUoKSBlcSBpT1MpIHsKLSAg ICAgICAgc3BsaWNlIEBwcm9qZWN0cywgMCwgMCwgKCJTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJy dGMiKTsKLSAgICB9CisgICAgIyBJbiB3b3Jrc3BhY2VzLCBidWlsZCBvcmRlciBpcyBkZXRlcm1p bmVkIGJ5IFhDQnVpbGQuCisgICAgaWYgKCEkdXNlV29ya3NwYWNlKSB7CisgICAgICAgICMgQU5H TEUgYW5kIGxpYndlYnJ0YyBtdXN0IGNvbWUgYmVmb3JlIFdlYkNvcmUKKyAgICAgICAgc3BsaWNl IEBwcm9qZWN0cywgMCwgMCwgKCJTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRSIpOworICAgICAgICAj IGlmIChub3QgJGFyY2hzMzJiaXQgYW5kIChwb3J0TmFtZSgpIGVxIE1hYyBvciBwb3J0TmFtZSgp IGVxIGlPUyBvciBwb3J0TmFtZSgpIGVxIHdhdGNoT1MpKSB7CisgICAgICAgIGlmIChwb3J0TmFt ZSgpIGVxIE1hYyBvciBwb3J0TmFtZSgpIGVxIGlPUykgeworICAgICAgICAgICAgc3BsaWNlIEBw cm9qZWN0cywgMCwgMCwgKCJTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMiKTsKKyAgICAgICAg fQogCi0gICAgcHVzaCBAcHJvamVjdHMsICgiU291cmNlL1dlYktpdCIpOworICAgICAgICBwdXNo IEBwcm9qZWN0cywgKCJTb3VyY2UvV2ViS2l0Iik7CiAKLSAgICBpZiAoIWlzRW1iZWRkZWRXZWJL aXQoKSkgewotICAgICAgICBwdXNoIEBwcm9qZWN0cywgKCJUb29scy9NaW5pQnJvd3NlciIpOwor ICAgICAgICBpZiAoIWlzRW1iZWRkZWRXZWJLaXQoKSkgeworICAgICAgICAgICAgcHVzaCBAcHJv amVjdHMsICgiVG9vbHMvTWluaUJyb3dzZXIiKTsKIAotICAgICAgICAjIFdlYkluc3BlY3RvclVJ IG11c3QgY29tZSBhZnRlciBKYXZhU2NyaXB0Q29yZSBhbmQgV2ViQ29yZSBidXQgYmVmb3JlIFdl YktpdCBhbmQgV2ViS2l0MgotICAgICAgICBteSAkd2ViS2l0SW5kZXggPSBmaXJzdCB7ICRwcm9q ZWN0c1skX10gZXEgIlNvdXJjZS9XZWJLaXRMZWdhY3kiIH0gMC4uJCNwcm9qZWN0czsKLSAgICAg ICAgc3BsaWNlKEBwcm9qZWN0cywgJHdlYktpdEluZGV4LCAwLCAiU291cmNlL1dlYkluc3BlY3Rv clVJIik7Ci0gICAgfQorICAgICAgICAgICAgIyBXZWJJbnNwZWN0b3JVSSBtdXN0IGNvbWUgYWZ0 ZXIgSmF2YVNjcmlwdENvcmUgYW5kIFdlYkNvcmUgYnV0IGJlZm9yZSBXZWJLaXQgYW5kIFdlYktp dDIKKyAgICAgICAgICAgIG15ICR3ZWJLaXRJbmRleCA9IGZpcnN0IHsgJHByb2plY3RzWyRfXSBl cSAiU291cmNlL1dlYktpdExlZ2FjeSIgfSAwLi4kI3Byb2plY3RzOworICAgICAgICAgICAgc3Bs aWNlKEBwcm9qZWN0cywgJHdlYktpdEluZGV4LCAwLCAiU291cmNlL1dlYkluc3BlY3RvclVJIik7 CisgICAgICAgIH0KIAotICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKLSAgICAgICAgcHVz aCBAcHJvamVjdHMsICgiVG9vbHMvbGxkYi9sbGRiV2ViS2l0VGVzdGVyIik7Ci0gICAgfQorICAg ICAgICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7CisgICAgICAgICAgICBwdXNoIEBwcm9qZWN0 cywgKCJUb29scy9sbGRiL2xsZGJXZWJLaXRUZXN0ZXIiKTsKKyAgICAgICAgfQogCi0gICAgIyBC dWlsZCBUb29scyBuZWVkZWQgZm9yIEFwcGxlIHBvcnRzIChleGNlcHQgZm9yIHR2T1MpCi0gICAg cHVzaCBAcHJvamVjdHMsICgiVG9vbHMvRHVtcFJlbmRlclRyZWUiLCAiVG9vbHMvV2ViS2l0VGVz dFJ1bm5lciIsICJTb3VyY2UvVGhpcmRQYXJ0eS9ndGVzdCIsICJUb29scy9UZXN0V2ViS2l0QVBJ Iik7CisgICAgICAgICMgQnVpbGQgVG9vbHMgbmVlZGVkIGZvciBBcHBsZSBwb3J0cyAoZXhjZXB0 IGZvciB0dk9TKQorICAgICAgICBwdXNoIEBwcm9qZWN0cywgKCJUb29scy9EdW1wUmVuZGVyVHJl ZSIsICJUb29scy9XZWJLaXRUZXN0UnVubmVyIiwgIlNvdXJjZS9UaGlyZFBhcnR5L2d0ZXN0Iiwg IlRvb2xzL1Rlc3RXZWJLaXRBUEkiKTsKKyAgICB9CiAKIH0gZWxzaWYgKGlzV2luQ2Fpcm8oKSAm JiAhJHNraXBMaWJyYXJ5VXBkYXRlKSB7CiAgICAgKHN5c3RlbSgicHl0aG9uIFRvb2xzL1Njcmlw dHMvdXBkYXRlLXdlYmtpdC13aW5jYWlyby1saWJzLnB5IikgPT0gMCkgb3IgZGllOwpAQCAtMzM5 LDI1ICszNDUsMzMgQEAgaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSB8fCBpc1dpbkNhaXJvKCkgfHwg aXNQbGF5U3RhdGlvbigpIHx8IGlzRlRXKCkpIHsKIH0gZWxzaWYgKGlzQXBwbGVDb2NvYVdlYktp dCgpICYmICFpc0NNYWtlQnVpbGQoKSkgewogICAgIGV4aXQgMCBpZiBpc0dlbmVyYXRlUHJvamVj dE9ubHkoKTsKIAorICAgIG15IEBsb2NhbF9vcHRpb25zID0gQG9wdGlvbnM7CisgICAgcHVzaCBA bG9jYWxfb3B0aW9ucywgWGNvZGVDb3ZlcmFnZVN1cHBvcnRPcHRpb25zKCkgaWYgJGNvdmVyYWdl U3VwcG9ydDsKKyAgICBwdXNoIEBsb2NhbF9vcHRpb25zLCBYY29kZVN0YXRpY0FuYWx5emVyT3B0 aW9uKCkgaWYgJHNob3VsZFJ1blN0YXRpY0FuYWx5emVyOworICAgIHB1c2ggQGxvY2FsX29wdGlv bnMsICJXS19MVE9fTU9ERT0kbHRvTW9kZSIgaWYgKCRsdG9Nb2RlIG5lICJkZWZhdWx0Iik7CisK ICAgICAjIEJ1aWxkLCBhbmQgYWJvcnQgaWYgdGhlIGJ1aWxkIGZhaWxzLgotICAgIGZvciBteSAk ZGlyIChAcHJvamVjdHMpIHsKLSAgICAgICAgY2hkaXIgJGRpciBvciBkaWU7Ci0gICAgICAgICRy ZXN1bHQgPSAwOworICAgIGlmICgkdXNlV29ya3NwYWNlKSB7CisgICAgICAgIG15ICRzY2hlbWUg PSAkb25seVdlYktpdFByb2plY3QgPyAiV2ViS2l0TGVnYWN5IiA6ICJBbGwgTW9kdWxlcyI7Cisg ICAgICAgICRyZXN1bHQgPSBidWlsZFhDb2RlV29ya3NwYWNlKCJXZWJLaXQueGN3b3Jrc3BhY2Ui LCAkc2NoZW1lLCAkY2xlYW4sIEBsb2NhbF9vcHRpb25zLCBAQVJHVik7CisgICAgICAgIGlmIChl eGl0U3RhdHVzKCRyZXN1bHQpKSB7CisgICAgICAgICAgICBleGl0IGV4aXRTdGF0dXMoJHJlc3Vs dCk7CisgICAgICAgIH0KKyAgICB9IGVsc2UgeworICAgICAgICBmb3IgbXkgJGRpciAoQHByb2pl Y3RzKSB7CisgICAgICAgICAgICBjaGRpciAkZGlyIG9yIGRpZTsKKyAgICAgICAgICAgICRyZXN1 bHQgPSAwOwogCi0gICAgICAgIG15ICRwcm9qZWN0ID0gYmFzZW5hbWUoJGRpcik7Ci0gICAgICAg IAotICAgICAgICBteSBAbG9jYWxfb3B0aW9ucyA9IEBvcHRpb25zOwotICAgICAgICBwdXNoIEBs b2NhbF9vcHRpb25zLCBYY29kZUNvdmVyYWdlU3VwcG9ydE9wdGlvbnMoKSBpZiAkY292ZXJhZ2VT dXBwb3J0OwotICAgICAgICBwdXNoIEBsb2NhbF9vcHRpb25zLCBYY29kZVN0YXRpY0FuYWx5emVy T3B0aW9uKCkgaWYgJHNob3VsZFJ1blN0YXRpY0FuYWx5emVyOwotICAgICAgICBwdXNoIEBsb2Nh bF9vcHRpb25zLCAiV0tfTFRPX01PREU9JGx0b01vZGUiIGlmICgkbHRvTW9kZSBuZSAiZGVmYXVs dCIpOwotICAgICAgICBteSAkcHJvamVjdFBhdGggPSAkcHJvamVjdCA9fiAvZ3Rlc3QvID8gInhj b2RlL2d0ZXN0IiA6ICRwcm9qZWN0OwotICAgICAgICAkcmVzdWx0ID0gYnVpbGRYQ29kZVByb2pl Y3QoJHByb2plY3RQYXRoLCAkY2xlYW4sIEBsb2NhbF9vcHRpb25zLCBAQVJHVik7CisgICAgICAg ICAgICBteSAkcHJvamVjdCA9IGJhc2VuYW1lKCRkaXIpOworICAgICAgICAgICAgbXkgJHByb2pl Y3RQYXRoID0gJHByb2plY3QgPX4gL2d0ZXN0LyA/ICJ4Y29kZS9ndGVzdCIgOiAkcHJvamVjdDsK KyAgICAgICAgICAgICRyZXN1bHQgPSBidWlsZFhDb2RlUHJvamVjdCgkcHJvamVjdFBhdGgsICRj bGVhbiwgQGxvY2FsX29wdGlvbnMsIEBBUkdWKTsKIAotICAgICAgICAjIFZhcmlvdXMgYnVpbGQq IGNhbGxzIGFib3ZlIG1heSBjaGFuZ2UgdGhlIENXRC4KLSAgICAgICAgY2hkaXJXZWJLaXQoKTsK KyAgICAgICAgICAgICMgVmFyaW91cyBidWlsZCogY2FsbHMgYWJvdmUgbWF5IGNoYW5nZSB0aGUg Q1dELgorICAgICAgICAgICAgY2hkaXJXZWJLaXQoKTsKIAotICAgICAgICBpZiAoZXhpdFN0YXR1 cygkcmVzdWx0KSkgewotICAgICAgICAgICAgZXhpdCBleGl0U3RhdHVzKCRyZXN1bHQpOworICAg ICAgICAgICAgaWYgKGV4aXRTdGF0dXMoJHJlc3VsdCkpIHsKKyAgICAgICAgICAgICAgICBleGl0 IGV4aXRTdGF0dXMoJHJlc3VsdCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0ZGlycy5wbQppbmRleCA0OGUxNGU1MjFjOTg0YmI4MGI4NzgzOTY1MzJlMDVhMmVkY2Zl NDFkLi5kNTYwNGIzODQ0ZjZlNjAxYTgwYzQ3MzNkY2I0YTY1OTE0ZDA3MzIwIDEwMDc1NQotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRk aXJzLnBtCkBAIC0xMDc5LDEyICsxMDc5LDYgQEAgc3ViIFhjb2RlU3RhdGljQW5hbHl6ZXJPcHRp b24oKQogICAgIHJldHVybiAiUlVOX0NMQU5HX1NUQVRJQ19BTkFMWVpFUj1ZRVMiOwogfQogCi1z dWIgY2FuVXNlWENCdWlsZCgpCi17Ci0gICAgZGV0ZXJtaW5lWGNvZGVWZXJzaW9uKCk7Ci0gICAg cmV0dXJuIChldmFsICJ2JHhjb2RlVmVyc2lvbiIgZ2UgdjExLjQpCi19Ci0KIG15ICRwYXNzZWRD b25maWd1cmF0aW9uOwogbXkgJHNlYXJjaGVkRm9yUGFzc2VkQ29uZmlndXJhdGlvbjsKIHN1YiBk ZXRlcm1pbmVQYXNzZWRDb25maWd1cmF0aW9uCkBAIC0yMTEzLDYgKzIxMDcsMTUgQEAgc3ViIGJ1 aWxkWENvZGVQcm9qZWN0KCQkQCkKICAgICByZXR1cm4gc3lzdGVtICJ4Y29kZWJ1aWxkIiwgIi1w cm9qZWN0IiwgIiRwcm9qZWN0Lnhjb2RlcHJvaiIsIEBleHRyYU9wdGlvbnM7CiB9CiAKK3N1YiBi dWlsZFhDb2RlV29ya3NwYWNlKCQkJEApCit7CisgICAgbXkgKCR3b3Jrc3BhY2UsICRzY2hlbWUs ICRjbGVhbiwgQGV4dHJhT3B0aW9ucykgPSBAXzsKKyAgICBpZiAoJGNsZWFuKSB7CisgICAgICAg IHB1c2ggQGV4dHJhT3B0aW9ucywgImNsZWFuIjsKKyAgICB9CisgICAgcmV0dXJuIHN5c3RlbSAi eGNvZGVidWlsZCIsICItd29ya3NwYWNlIiwgJHdvcmtzcGFjZSwgIi1zY2hlbWUiLCAkc2NoZW1l LCBAZXh0cmFPcHRpb25zOworfQorCiBzdWIgZ2V0VmlzdWFsU3R1ZGlvVG9vbHNldCgpCiB7CiAg ICAgaWYgKGlzUGxheVN0YXRpb24oKSkgewo=