216433 2020-09-12 05:48:01 -0700 [LFC][IFC] Add support for non-root-inline-box line spacing 2020-09-12 10:08:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1687916 0 zalan 2020-09-12 05:48:01 -0700 when the line spacing comes from a nested inline box. 1687917 1 408591 zalan 2020-09-12 06:04:02 -0700 Created attachment 408591 Patch 1687918 2 408592 zalan 2020-09-12 06:42:14 -0700 Created attachment 408592 Patch 1687928 3 408592 koivisto 2020-09-12 09:05:47 -0700 Comment on attachment 408592 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408592&action=review > Source/WebCore/layout/inlineformatting/InlineLineBox.h:116 > + using InlineBoxMap = HashMap<const Box*, InlineBox*>; > + const InlineBoxMap::ValuesConstIteratorRange inlineBoxList() const { return m_inlineBoxRectMap.values(); } Maybe this can return 'auto' and void defining a type? 1687929 4 408598 zalan 2020-09-12 09:08:54 -0700 Created attachment 408598 Patch 1687930 5 zalan 2020-09-12 09:09:33 -0700 (In reply to Antti Koivisto from comment #3) > Comment on attachment 408592 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=408592&action=review > > > Source/WebCore/layout/inlineformatting/InlineLineBox.h:116 > > + using InlineBoxMap = HashMap<const Box*, InlineBox*>; > > + const InlineBoxMap::ValuesConstIteratorRange inlineBoxList() const { return m_inlineBoxRectMap.values(); } > > Maybe this can return 'auto' and void defining a type? Yeah, it works! It's so much better! Thanks. 1687931 6 408599 zalan 2020-09-12 09:29:15 -0700 Created attachment 408599 Patch 1687933 7 408600 zalan 2020-09-12 09:34:42 -0700 Created attachment 408600 Patch 1687938 8 ews-feeder 2020-09-12 10:07:42 -0700 Committed r266978: <https://trac.webkit.org/changeset/266978> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408600. 1687939 9 webkit-bug-importer 2020-09-12 10:08:16 -0700 <rdar://problem/68769707> 408591 2020-09-12 06:04:02 -0700 2020-09-12 06:42:13 -0700 Patch bug-216433-20200912060401.patch text/plain 9546 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTI0NmJjOWFjM2ViODU2 ZGNkM2VjNGUxNjFkMGMxMjliYmUyNzc5YS4uZTIxMmU1MWUyZGJmOTgyOTkzMjQ2NTZhODZkM2Zk MmM1ZWYzODc3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTA5LTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3Igbm9uLXJvb3QtaW5saW5lLWJveCBsaW5lIHNwYWNpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjQzMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoaWxlIHRoZSBMaW5lQm94IHZlcnRp Y2FsbHkgY29udGFpbnMgYWxsIHRoZSBMaW5lQm94OjpJbmxpbmVCb3hlcywgaXRzIGhlaWdodCB2 YWx1ZSBkb2VzIG5vdAorICAgICAgICBpbmNsdWRlIGFueSBsaW5lIHNwYWNpbmcgKEZvbnRNZXRy aWNzOjpsaW5lU3BhY2luZykuCisgICAgICAgIEVhY2ggTGluZUJveDo6SW5saW5lQm94IG1heSBo YXZlIGEgZGlmZmVyZW50IGxpbmUgc3BhY2luZyB2YWx1ZSAodGhpcyB2YWx1ZSBpcyB6ZXJvIGlu IG1hbnkgY2FzZXMpLgorICAgICAgICBUaGlzIHBhdGNoIGNvbGxlY3RzIGxpbmUgc3BhY2luZyB2 YWx1ZXMgZnJvbSB0aGUgTGluZUJveDo6SW5saW5lQm94ZXMgb24gdGhlIGxpbmUgYW5kIGFkanVz dHMgdGhlIGZpbmFsCisgICAgICAgIGxpbmUgaGVpZ2h0IHZhbHVlIGFjY29yZGluZ2x5LiAKKwor ICAgICAgICBUZXN0OiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0 aC1saW5lLXNwYWNpbmctc2ltcGxlLmh0bWwKKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkTGluZUxvZ2ljYWxSZWN0IGNv bnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6Y29uc3RydWN0SW5saW5lQm94 ZXMpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lQm94OjpsaW5lU3BhY2lu ZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUJveDo6 c2V0TGluZVNwYWNpbmcpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojppbmxp bmVCb3hMaXN0IGNvbnN0KToKKwogMjAyMC0wOS0xMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gTWFrZSBJbmxpbmVCb3hlcyBncm93IHZlcnRp Y2FsbHkgYXMgdGhleSBnYWluIGNvbnRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcAppbmRleCAyNGM3ODQzN2RlZjcyYTA4NjA5YTQ5NzgxYjFjNTE0YThjNWViMWJiLi5mYjkz ZjE3OTBhOTgzZjY3MWYwOTQ1ZmU0OTA4NWYzYzUwYzI5MTgwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9y bWF0dGluZ0NvbnRleHQuY3BwCkBAIC00MDksMTYgKzQwOSwzNCBAQCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dDo6TGluZVJlY3RBbmRMaW5lQm94T2Zmc2V0IElubGluZUZvcm1hdHRpbmdDb250ZXh0 Ojpjb21wdQogICAgIC8vIHwgICAgICAgICAgICAgICAgICAgIHwgbGluZSBzcGFjaW5nICAgICAg ICAgIHwgICB8CiAgICAgLy8gfF9fX19fX19fX19fX19fX19fX19fdl9fX19fX19fX19fX19fX19f X19fX19ffCAgc2Nyb2xsYWJsZSBvdmVyZmxvdwogICAgIC8vCi0gICAgaWYgKGxpbmVDb250ZW50 LnJ1bnMuaXNFbXB0eSgpIHx8IGxpbmVDb250ZW50LmxpbmVCb3guaXNMaW5lVmlzdWFsbHlFbXB0 eSgpKQorICAgIGF1dG8mIGxpbmVCb3ggPSBsaW5lQ29udGVudC5saW5lQm94OworICAgIGlmIChs aW5lQ29udGVudC5ydW5zLmlzRW1wdHkoKSB8fCBsaW5lQm94LmlzTGluZVZpc3VhbGx5RW1wdHko KSkKICAgICAgICAgcmV0dXJuIHsgeyB9LCB7IGxpbmVDb250ZW50LmxvZ2ljYWxUb3BMZWZ0LCBs aW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoLCB7IH0gfSB9OworCiAgICAgYXV0byYgcm9vdFN0 eWxlID0gcm9vdCgpLnN0eWxlKCk7Ci0gICAgYXV0byYgZm9udE1ldHJpY3MgPSByb290U3R5bGUu Zm9udE1ldHJpY3MoKTsKLSAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVTcGFjaW5nID0gZm9udE1l dHJpY3MubGluZVNwYWNpbmcoKTsKLSAgICBhdXRvJiBsaW5lQm94ID0gbGluZUNvbnRlbnQubGlu ZUJveDsKLSAgICBhdXRvIGxpbmVMb2dpY2FsSGVpZ2h0ID0gcm9vdFN0eWxlLmxpbmVIZWlnaHQo KS5pc05lZ2F0aXZlKCkgPyBzdGQ6Om1heChsaW5lQm94LmxvZ2ljYWxIZWlnaHQoKSwgbGluZVNw YWNpbmcpIDogcm9vdFN0eWxlLmNvbXB1dGVkTGluZUhlaWdodCgpOwotICAgIGF1dG8gbG9naWNh bFJlY3QgPSBEaXNwbGF5OjpJbmxpbmVSZWN0IHsgbGluZUNvbnRlbnQubG9naWNhbFRvcExlZnQs IGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGxpbmVMb2dpY2FsSGVpZ2h0fTsKKyAgICBh dXRvIGxpbmVMb2dpY2FsSGVpZ2h0ID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgaWYgKHJv b3RTdHlsZS5saW5lSGVpZ2h0KCkuaXNOZWdhdGl2ZSgpKSB7CisgICAgICAgIC8vIE5lZ2F0aXZl IGxpbmUgaGVpZ2h0IHZhbHVlIG1lYW5zIHRoZSBsaW5lIGhlaWdodCBpcyBkcml2ZW4gYnkgdGhl IGNvbnRlbnQuCisgICAgICAgIGF1dG8gdXNlZExpbmVTcGFjaW5nID0gWyZdIHsKKyAgICAgICAg ICAgIGF1dG8gbGluZUJvZ0xvZ2ljYWxIZWlnaHQgPSBsaW5lQm94LmxvZ2ljYWxIZWlnaHQoKTsK KyAgICAgICAgICAgIGF1dG8gbG9naWNhbFRvcFdpdGhMaW5lU3BhY2luZyA9IElubGluZUxheW91 dFVuaXQgeyB9OworICAgICAgICAgICAgYXV0byBsb2dpY2FsQm90dG9tV2l0aExpbmVTcGFjaW5n ID0gbGluZUJvZ0xvZ2ljYWxIZWlnaHQ7CisgICAgICAgICAgICBmb3IgKGF1dG8mIGlubGluZUJv eCA6IGxpbmVCb3guaW5saW5lQm94TGlzdCgpKSB7CisgICAgICAgICAgICAgICAgaWYgKGF1dG8g bGluZVNwYWNpbmcgPSBpbmxpbmVCb3gtPmxpbmVTcGFjaW5nKCkpIHsKKyAgICAgICAgICAgICAg ICAgICAgLy8gRklYTUU6IGNoZWNrIGlmIGxpbmUgc3BhY2luZyBpcyBkaXN0cmlidXRlZCBldmVu bHkuCisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BXaXRoTGluZVNwYWNpbmcgPSBzdGQ6 Om1pbihsb2dpY2FsVG9wV2l0aExpbmVTcGFjaW5nLCBpbmxpbmVCb3gtPmxvZ2ljYWxUb3AoKSAt ICpsaW5lU3BhY2luZyAvIDIpOworICAgICAgICAgICAgICAgICAgICBsb2dpY2FsQm90dG9tV2l0 aExpbmVTcGFjaW5nID0gc3RkOjptYXgobG9naWNhbEJvdHRvbVdpdGhMaW5lU3BhY2luZywgaW5s aW5lQm94LT5sb2dpY2FsQm90dG9tKCkgKyAqbGluZVNwYWNpbmcgLyAyKTsKKyAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgICAgICByZXR1cm4gLWxvZ2ljYWxUb3BXaXRo TGluZVNwYWNpbmcgKyAobG9naWNhbEJvdHRvbVdpdGhMaW5lU3BhY2luZyAtIGxpbmVCb2dMb2dp Y2FsSGVpZ2h0KTsKKyAgICAgICAgfTsKKyAgICAgICAgbGluZUxvZ2ljYWxIZWlnaHQgPSBsaW5l Qm94LmxvZ2ljYWxIZWlnaHQoKSArIHVzZWRMaW5lU3BhY2luZygpOworICAgIH0gZWxzZQorICAg ICAgICBsaW5lTG9naWNhbEhlaWdodCA9IHJvb3RTdHlsZS5jb21wdXRlZExpbmVIZWlnaHQoKTsK IAorICAgIGF1dG8gbG9naWNhbFJlY3QgPSBEaXNwbGF5OjpJbmxpbmVSZWN0IHsgbGluZUNvbnRl bnQubG9naWNhbFRvcExlZnQsIGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGxpbmVMb2dp Y2FsSGVpZ2h0fTsKICAgICBhdXRvIGhhbGZMZWFkaW5nT2Zmc2V0ID0gWyZdIHsKKyAgICAgICAg YXV0byYgZm9udE1ldHJpY3MgPSByb290U3R5bGUuZm9udE1ldHJpY3MoKTsKICAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBhc2NlbnQgPSBmb250TWV0cmljcy5hc2NlbnQoKTsKICAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBkZXNjZW50ID0gZm9udE1ldHJpY3MuZGVzY2VudCgpOwogICAgICAgICAv LyAxMC44LjEgTGVhZGluZyBhbmQgaGFsZi1sZWFkaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCmluZGV4IDUw ZDQ4MWNjZjE0ZDc5N2JmZGVkNmZkOWFmNTg4MDEyZjQxODg5YjEuLjlhMGEwN2RkNGI0ZDgwYTdl MmJlYjMzOWFjZjhhZTMwM2EwYTgzYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCkBAIC0xNjQsNiArMTY0 LDggQEAgdm9pZCBMaW5lQm94Ojpjb25zdHJ1Y3RJbmxpbmVCb3hlcyhjb25zdCBMaW5lOjpSdW5M aXN0JiBydW5zKQogICAgICAgICBpbmxpbmVCb3guc2V0TG9naWNhbEhlaWdodChsb2dpY2FsSGVp Z2h0KTsKICAgICAgICAgaW5saW5lQm94LnNldEJhc2VsaW5lKGJhc2VsaW5lKTsKICAgICAgICAg aW5saW5lQm94LnNldERlc2NlbnQobG9naWNhbEhlaWdodCAtIGJhc2VsaW5lKTsKKyAgICAgICAg aWYgKGF1dG8gbGluZVNwYWNpbmcgPSBmb250TWV0cmljcy5saW5lU3BhY2luZygpIC0gbG9naWNh bEhlaWdodCkKKyAgICAgICAgICAgIGlubGluZUJveC5zZXRMaW5lU3BhY2luZyhsaW5lU3BhY2lu Zyk7CiAgICAgfTsKIAogICAgIGF1dG8gY29uc3RydWN0Um9vdElubGluZUJveCA9IFsmXSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94LmgKaW5kZXggNDk4ZWM2MWJmYjJlNjY5MmNiNzg1YzkzMTFiYWZkYjdlMDdlNGZlMS4u YzZhMWVhMjE3NjM3Yjk0ZTdhOWQxOTJhZmE3NWU1M2VjMzA2NWIzZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApA QCAtNzYsNiArNzYsNyBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsg cmV0dXJuIG1faXNFbXB0eTsgfQogICAgICAgICB2b2lkIHNldElzTm9uRW1wdHkoKSB7IG1faXNF bXB0eSA9IGZhbHNlOyB9CiAKKyAgICAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gbGlu ZVNwYWNpbmcoKSBjb25zdCB7IHJldHVybiBtX2xpbmVTcGFjaW5nOyB9CiAgICAgICAgIGNvbnN0 IEZvbnRNZXRyaWNzJiBmb250TWV0cmljcygpIGNvbnN0IHsgcmV0dXJuIGxheW91dEJveCgpLnN0 eWxlKCkuZm9udE1ldHJpY3MoKTsgfQogICAgICAgICBjb25zdCBCb3gmIGxheW91dEJveCgpIGNv bnN0IHsgcmV0dXJuICptX2xheW91dEJveDsgfQogCkBAIC04NywxMSArODgsMTMgQEAgcHVibGlj OgogICAgICAgICB2b2lkIHNldExvZ2ljYWxIZWlnaHQoSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs SGVpZ2h0KSB7IG1fbG9naWNhbFJlY3Quc2V0SGVpZ2h0KGxvZ2ljYWxIZWlnaHQpOyB9CiAgICAg ICAgIHZvaWQgc2V0QmFzZWxpbmUoSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSkgeyBtX2Jhc2Vs aW5lID0gYmFzZWxpbmU7IH0KICAgICAgICAgdm9pZCBzZXREZXNjZW50KElubGluZUxheW91dFVu aXQgZGVzY2VudCkgeyBtX2Rlc2NlbnQgPSBkZXNjZW50OyB9CisgICAgICAgIHZvaWQgc2V0TGlu ZVNwYWNpbmcoSW5saW5lTGF5b3V0VW5pdCBsaW5lU3BhY2luZykgeyBtX2xpbmVTcGFjaW5nID0g bGluZVNwYWNpbmc7IH0KIAogICAgICAgICBXZWFrUHRyPGNvbnN0IEJveD4gbV9sYXlvdXRCb3g7 CiAgICAgICAgIERpc3BsYXk6OklubGluZVJlY3QgbV9sb2dpY2FsUmVjdDsKICAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBtX2Jhc2VsaW5lIHsgMCB9OwogICAgICAgICBPcHRpb25hbDxJbmxpbmVM YXlvdXRVbml0PiBtX2Rlc2NlbnQ7CisgICAgICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+ IG1fbGluZVNwYWNpbmc7CiAgICAgICAgIGJvb2wgbV9pc0VtcHR5IHsgdHJ1ZSB9OwogICAgIH07 CiAKQEAgLTEwOSw2ICsxMTIsOSBAQCBwdWJsaWM6CiAgICAgY29uc3QgSW5saW5lQm94JiBpbmxp bmVCb3hGb3JMYXlvdXRCb3goY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0IHsgcmV0dXJuICpt X2lubGluZUJveFJlY3RNYXAuZ2V0KCZsYXlvdXRCb3gpOyB9CiAgICAgRGlzcGxheTo6SW5saW5l UmVjdCBsb2dpY2FsUmVjdEZvclRleHRSdW4oY29uc3QgTGluZTo6UnVuJikgY29uc3Q7CiAKKyAg ICB1c2luZyBJbmxpbmVCb3hNYXAgPSBIYXNoTWFwPGNvbnN0IEJveCosIElubGluZUJveCo+Owor ICAgIGNvbnN0IElubGluZUJveE1hcDo6VmFsdWVzQ29uc3RJdGVyYXRvclJhbmdlIGlubGluZUJv eExpc3QoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUJveFJlY3RNYXAudmFsdWVzKCk7IH0KKwog ICAgIElubGluZUxheW91dFVuaXQgYWxpZ25tZW50QmFzZWxpbmUoKSBjb25zdCB7IHJldHVybiBt X3Jvb3RJbmxpbmVCb3gubG9naWNhbFRvcCgpICsgbV9yb290SW5saW5lQm94LmJhc2VsaW5lKCk7 IH0KIAogcHJpdmF0ZToKQEAgLTEyOSw3ICsxMzUsNyBAQCBwcml2YXRlOgogICAgIElubGluZUJv eCBtX3Jvb3RJbmxpbmVCb3g7CiAKICAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBtX2hv cml6b250YWxBbGlnbm1lbnRPZmZzZXQ7Ci0gICAgSGFzaE1hcDxjb25zdCBCb3gqLCBJbmxpbmVC b3gqPiBtX2lubGluZUJveFJlY3RNYXA7CisgICAgSW5saW5lQm94TWFwIG1faW5saW5lQm94UmVj dE1hcDsKICAgICBWZWN0b3I8c3RkOjp1bmlxdWVfcHRyPElubGluZUJveD4+IG1faW5saW5lQm94 TGlzdDsKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9pbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDsKIH07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMmFmNzA3YmY1MjMyYTA3ZDc5YTA3ZGI2NmVlZmY1OTJh ZDQ5NmFiMS4uYzk2MzU2OGVjZDc3Yjc5M2EyNmNiNGYxNzdhN2NjZDgzMTM1MzZkNCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDIwLTA5LTEyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3VwcG9ydCBmb3Igbm9uLXJvb3QtaW5saW5l LWJveCBsaW5lIHNwYWNpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNjQzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9pbmxpbmUtYm94LXdpdGgt bGluZS1zcGFjaW5nLXNpbXBsZS1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0aC1saW5lLXNwYWNpbmctc2lt cGxlLmh0bWw6IEFkZGVkLgorCiAyMDIwLTA5LTEwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBDb25zdHJ1Y3QgTGluZUJveDo6SW5saW5lQm94 ZXMgZm9yIG5lc3RlZCBpbmxpbmUgbGV2ZWwgYm94ZXMgd2hlbiB0aGV5IG92ZXJsYXAgbXVsdGlw bGUgbGluZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2Nv bnRleHQvaW5saW5lLWJveC13aXRoLWxpbmUtc3BhY2luZy1zaW1wbGUtZXhwZWN0ZWQuaHRtbCBi L0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvaW5saW5lLWJveC13aXRo LWxpbmUtc3BhY2luZy1zaW1wbGUtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xNDUyN2Y2ZDA4 MGIzYWVjMjgxZmE1MzFjNzBjZWMxZGU5MzNlMWE2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9pbmxpbmUtYm94LXdpdGgtbGluZS1z cGFjaW5nLXNpbXBsZS1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsOCBAQAorPHN0eWxlPgorZGl2 IHsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgIHdpZHRoOiA0MDBweDsKKyAgaGVpZ2h0 OiA0NXB4OworfQorPC9zdHlsZT4KKzxkaXY+PC9kaXY+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0aC1saW5lLXNwYWNp bmctc2ltcGxlLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0 L2lubGluZS1ib3gtd2l0aC1saW5lLXNwYWNpbmctc2ltcGxlLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMWUx ODQzZmU4MGRjM2IyZDZkMWNjZGEyZjY5YjJjNDY4M2NmNjJkOAotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvaW5saW5lLWJveC13aXRo LWxpbmUtc3BhY2luZy1zaW1wbGUuaHRtbApAQCAtMCwwICsxLDEzIEBACis8c3R5bGU+CitkaXYg eworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgd2lkdGg6IDQwMHB4OworfQorCitzcGFu IHsKKyAgZm9udC1mYW1pbHk6ICJIaXJhTWluUHJvTi1XMyI7CisgIGZvbnQtc2l6ZTogMzBweDsK KyAgY29sb3I6IGdyZWVuOworfQorPC9zdHlsZT4KKzxkaXY+PHNwYW4+aW5saW5lIGJveCB3aXRo IGxpbmUgc3BhY2luZzwvc3Bhbj48L2Rpdj4K 408592 2020-09-12 06:42:14 -0700 2020-09-12 09:08:53 -0700 Patch bug-216433-20200912064213.patch text/plain 9546 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTI0NmJjOWFjM2ViODU2 ZGNkM2VjNGUxNjFkMGMxMjliYmUyNzc5YS4uZTIxMmU1MWUyZGJmOTgyOTkzMjQ2NTZhODZkM2Zk MmM1ZWYzODc3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTA5LTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3Igbm9uLXJvb3QtaW5saW5lLWJveCBsaW5lIHNwYWNpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjQzMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoaWxlIHRoZSBMaW5lQm94IHZlcnRp Y2FsbHkgY29udGFpbnMgYWxsIHRoZSBMaW5lQm94OjpJbmxpbmVCb3hlcywgaXRzIGhlaWdodCB2 YWx1ZSBkb2VzIG5vdAorICAgICAgICBpbmNsdWRlIGFueSBsaW5lIHNwYWNpbmcgKEZvbnRNZXRy aWNzOjpsaW5lU3BhY2luZykuCisgICAgICAgIEVhY2ggTGluZUJveDo6SW5saW5lQm94IG1heSBo YXZlIGEgZGlmZmVyZW50IGxpbmUgc3BhY2luZyB2YWx1ZSAodGhpcyB2YWx1ZSBpcyB6ZXJvIGlu IG1hbnkgY2FzZXMpLgorICAgICAgICBUaGlzIHBhdGNoIGNvbGxlY3RzIGxpbmUgc3BhY2luZyB2 YWx1ZXMgZnJvbSB0aGUgTGluZUJveDo6SW5saW5lQm94ZXMgb24gdGhlIGxpbmUgYW5kIGFkanVz dHMgdGhlIGZpbmFsCisgICAgICAgIGxpbmUgaGVpZ2h0IHZhbHVlIGFjY29yZGluZ2x5LiAKKwor ICAgICAgICBUZXN0OiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0 aC1saW5lLXNwYWNpbmctc2ltcGxlLmh0bWwKKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkTGluZUxvZ2ljYWxSZWN0IGNv bnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6Y29uc3RydWN0SW5saW5lQm94 ZXMpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lQm94OjpsaW5lU3BhY2lu ZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUJveDo6 c2V0TGluZVNwYWNpbmcpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojppbmxp bmVCb3hMaXN0IGNvbnN0KToKKwogMjAyMC0wOS0xMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gTWFrZSBJbmxpbmVCb3hlcyBncm93IHZlcnRp Y2FsbHkgYXMgdGhleSBnYWluIGNvbnRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcAppbmRleCAyNGM3ODQzN2RlZjcyYTA4NjA5YTQ5NzgxYjFjNTE0YThjNWViMWJiLi5hZjZl MDI1MzczYjY5ZDE5N2Q5MzRkOGZhMTkxYmY4OGE4MTQzZWFkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9y bWF0dGluZ0NvbnRleHQuY3BwCkBAIC00MDksMTYgKzQwOSwzNCBAQCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dDo6TGluZVJlY3RBbmRMaW5lQm94T2Zmc2V0IElubGluZUZvcm1hdHRpbmdDb250ZXh0 Ojpjb21wdQogICAgIC8vIHwgICAgICAgICAgICAgICAgICAgIHwgbGluZSBzcGFjaW5nICAgICAg ICAgIHwgICB8CiAgICAgLy8gfF9fX19fX19fX19fX19fX19fX19fdl9fX19fX19fX19fX19fX19f X19fX19ffCAgc2Nyb2xsYWJsZSBvdmVyZmxvdwogICAgIC8vCi0gICAgaWYgKGxpbmVDb250ZW50 LnJ1bnMuaXNFbXB0eSgpIHx8IGxpbmVDb250ZW50LmxpbmVCb3guaXNMaW5lVmlzdWFsbHlFbXB0 eSgpKQorICAgIGF1dG8mIGxpbmVCb3ggPSBsaW5lQ29udGVudC5saW5lQm94OworICAgIGlmIChs aW5lQ29udGVudC5ydW5zLmlzRW1wdHkoKSB8fCBsaW5lQm94LmlzTGluZVZpc3VhbGx5RW1wdHko KSkKICAgICAgICAgcmV0dXJuIHsgeyB9LCB7IGxpbmVDb250ZW50LmxvZ2ljYWxUb3BMZWZ0LCBs aW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoLCB7IH0gfSB9OworCiAgICAgYXV0byYgcm9vdFN0 eWxlID0gcm9vdCgpLnN0eWxlKCk7Ci0gICAgYXV0byYgZm9udE1ldHJpY3MgPSByb290U3R5bGUu Zm9udE1ldHJpY3MoKTsKLSAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVTcGFjaW5nID0gZm9udE1l dHJpY3MubGluZVNwYWNpbmcoKTsKLSAgICBhdXRvJiBsaW5lQm94ID0gbGluZUNvbnRlbnQubGlu ZUJveDsKLSAgICBhdXRvIGxpbmVMb2dpY2FsSGVpZ2h0ID0gcm9vdFN0eWxlLmxpbmVIZWlnaHQo KS5pc05lZ2F0aXZlKCkgPyBzdGQ6Om1heChsaW5lQm94LmxvZ2ljYWxIZWlnaHQoKSwgbGluZVNw YWNpbmcpIDogcm9vdFN0eWxlLmNvbXB1dGVkTGluZUhlaWdodCgpOwotICAgIGF1dG8gbG9naWNh bFJlY3QgPSBEaXNwbGF5OjpJbmxpbmVSZWN0IHsgbGluZUNvbnRlbnQubG9naWNhbFRvcExlZnQs IGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGxpbmVMb2dpY2FsSGVpZ2h0fTsKKyAgICBh dXRvIGxpbmVMb2dpY2FsSGVpZ2h0ID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgaWYgKHJv b3RTdHlsZS5saW5lSGVpZ2h0KCkuaXNOZWdhdGl2ZSgpKSB7CisgICAgICAgIC8vIE5lZ2F0aXZl IGxpbmUgaGVpZ2h0IHZhbHVlIG1lYW5zIHRoZSBsaW5lIGhlaWdodCBpcyBkcml2ZW4gYnkgdGhl IGNvbnRlbnQuCisgICAgICAgIGF1dG8gdXNlZExpbmVTcGFjaW5nID0gWyZdIHsKKyAgICAgICAg ICAgIGF1dG8gbGluZUJveExvZ2ljYWxIZWlnaHQgPSBsaW5lQm94LmxvZ2ljYWxIZWlnaHQoKTsK KyAgICAgICAgICAgIGF1dG8gbG9naWNhbFRvcFdpdGhMaW5lU3BhY2luZyA9IElubGluZUxheW91 dFVuaXQgeyB9OworICAgICAgICAgICAgYXV0byBsb2dpY2FsQm90dG9tV2l0aExpbmVTcGFjaW5n ID0gbGluZUJveExvZ2ljYWxIZWlnaHQ7CisgICAgICAgICAgICBmb3IgKGF1dG8mIGlubGluZUJv eCA6IGxpbmVCb3guaW5saW5lQm94TGlzdCgpKSB7CisgICAgICAgICAgICAgICAgaWYgKGF1dG8g bGluZVNwYWNpbmcgPSBpbmxpbmVCb3gtPmxpbmVTcGFjaW5nKCkpIHsKKyAgICAgICAgICAgICAg ICAgICAgLy8gRklYTUU6IGNoZWNrIGlmIGxpbmUgc3BhY2luZyBpcyBkaXN0cmlidXRlZCBldmVu bHkuCisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BXaXRoTGluZVNwYWNpbmcgPSBzdGQ6 Om1pbihsb2dpY2FsVG9wV2l0aExpbmVTcGFjaW5nLCBpbmxpbmVCb3gtPmxvZ2ljYWxUb3AoKSAt ICpsaW5lU3BhY2luZyAvIDIpOworICAgICAgICAgICAgICAgICAgICBsb2dpY2FsQm90dG9tV2l0 aExpbmVTcGFjaW5nID0gc3RkOjptYXgobG9naWNhbEJvdHRvbVdpdGhMaW5lU3BhY2luZywgaW5s aW5lQm94LT5sb2dpY2FsQm90dG9tKCkgKyAqbGluZVNwYWNpbmcgLyAyKTsKKyAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgICAgICByZXR1cm4gLWxvZ2ljYWxUb3BXaXRo TGluZVNwYWNpbmcgKyAobG9naWNhbEJvdHRvbVdpdGhMaW5lU3BhY2luZyAtIGxpbmVCb3hMb2dp Y2FsSGVpZ2h0KTsKKyAgICAgICAgfTsKKyAgICAgICAgbGluZUxvZ2ljYWxIZWlnaHQgPSBsaW5l Qm94LmxvZ2ljYWxIZWlnaHQoKSArIHVzZWRMaW5lU3BhY2luZygpOworICAgIH0gZWxzZQorICAg ICAgICBsaW5lTG9naWNhbEhlaWdodCA9IHJvb3RTdHlsZS5jb21wdXRlZExpbmVIZWlnaHQoKTsK IAorICAgIGF1dG8gbG9naWNhbFJlY3QgPSBEaXNwbGF5OjpJbmxpbmVSZWN0IHsgbGluZUNvbnRl bnQubG9naWNhbFRvcExlZnQsIGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGxpbmVMb2dp Y2FsSGVpZ2h0fTsKICAgICBhdXRvIGhhbGZMZWFkaW5nT2Zmc2V0ID0gWyZdIHsKKyAgICAgICAg YXV0byYgZm9udE1ldHJpY3MgPSByb290U3R5bGUuZm9udE1ldHJpY3MoKTsKICAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBhc2NlbnQgPSBmb250TWV0cmljcy5hc2NlbnQoKTsKICAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBkZXNjZW50ID0gZm9udE1ldHJpY3MuZGVzY2VudCgpOwogICAgICAgICAv LyAxMC44LjEgTGVhZGluZyBhbmQgaGFsZi1sZWFkaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCmluZGV4IDUw ZDQ4MWNjZjE0ZDc5N2JmZGVkNmZkOWFmNTg4MDEyZjQxODg5YjEuLjlhMGEwN2RkNGI0ZDgwYTdl MmJlYjMzOWFjZjhhZTMwM2EwYTgzYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCkBAIC0xNjQsNiArMTY0 LDggQEAgdm9pZCBMaW5lQm94Ojpjb25zdHJ1Y3RJbmxpbmVCb3hlcyhjb25zdCBMaW5lOjpSdW5M aXN0JiBydW5zKQogICAgICAgICBpbmxpbmVCb3guc2V0TG9naWNhbEhlaWdodChsb2dpY2FsSGVp Z2h0KTsKICAgICAgICAgaW5saW5lQm94LnNldEJhc2VsaW5lKGJhc2VsaW5lKTsKICAgICAgICAg aW5saW5lQm94LnNldERlc2NlbnQobG9naWNhbEhlaWdodCAtIGJhc2VsaW5lKTsKKyAgICAgICAg aWYgKGF1dG8gbGluZVNwYWNpbmcgPSBmb250TWV0cmljcy5saW5lU3BhY2luZygpIC0gbG9naWNh bEhlaWdodCkKKyAgICAgICAgICAgIGlubGluZUJveC5zZXRMaW5lU3BhY2luZyhsaW5lU3BhY2lu Zyk7CiAgICAgfTsKIAogICAgIGF1dG8gY29uc3RydWN0Um9vdElubGluZUJveCA9IFsmXSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94LmgKaW5kZXggNDk4ZWM2MWJmYjJlNjY5MmNiNzg1YzkzMTFiYWZkYjdlMDdlNGZlMS4u YzZhMWVhMjE3NjM3Yjk0ZTdhOWQxOTJhZmE3NWU1M2VjMzA2NWIzZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApA QCAtNzYsNiArNzYsNyBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsg cmV0dXJuIG1faXNFbXB0eTsgfQogICAgICAgICB2b2lkIHNldElzTm9uRW1wdHkoKSB7IG1faXNF bXB0eSA9IGZhbHNlOyB9CiAKKyAgICAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gbGlu ZVNwYWNpbmcoKSBjb25zdCB7IHJldHVybiBtX2xpbmVTcGFjaW5nOyB9CiAgICAgICAgIGNvbnN0 IEZvbnRNZXRyaWNzJiBmb250TWV0cmljcygpIGNvbnN0IHsgcmV0dXJuIGxheW91dEJveCgpLnN0 eWxlKCkuZm9udE1ldHJpY3MoKTsgfQogICAgICAgICBjb25zdCBCb3gmIGxheW91dEJveCgpIGNv bnN0IHsgcmV0dXJuICptX2xheW91dEJveDsgfQogCkBAIC04NywxMSArODgsMTMgQEAgcHVibGlj OgogICAgICAgICB2b2lkIHNldExvZ2ljYWxIZWlnaHQoSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs SGVpZ2h0KSB7IG1fbG9naWNhbFJlY3Quc2V0SGVpZ2h0KGxvZ2ljYWxIZWlnaHQpOyB9CiAgICAg ICAgIHZvaWQgc2V0QmFzZWxpbmUoSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSkgeyBtX2Jhc2Vs aW5lID0gYmFzZWxpbmU7IH0KICAgICAgICAgdm9pZCBzZXREZXNjZW50KElubGluZUxheW91dFVu aXQgZGVzY2VudCkgeyBtX2Rlc2NlbnQgPSBkZXNjZW50OyB9CisgICAgICAgIHZvaWQgc2V0TGlu ZVNwYWNpbmcoSW5saW5lTGF5b3V0VW5pdCBsaW5lU3BhY2luZykgeyBtX2xpbmVTcGFjaW5nID0g bGluZVNwYWNpbmc7IH0KIAogICAgICAgICBXZWFrUHRyPGNvbnN0IEJveD4gbV9sYXlvdXRCb3g7 CiAgICAgICAgIERpc3BsYXk6OklubGluZVJlY3QgbV9sb2dpY2FsUmVjdDsKICAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBtX2Jhc2VsaW5lIHsgMCB9OwogICAgICAgICBPcHRpb25hbDxJbmxpbmVM YXlvdXRVbml0PiBtX2Rlc2NlbnQ7CisgICAgICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+ IG1fbGluZVNwYWNpbmc7CiAgICAgICAgIGJvb2wgbV9pc0VtcHR5IHsgdHJ1ZSB9OwogICAgIH07 CiAKQEAgLTEwOSw2ICsxMTIsOSBAQCBwdWJsaWM6CiAgICAgY29uc3QgSW5saW5lQm94JiBpbmxp bmVCb3hGb3JMYXlvdXRCb3goY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0IHsgcmV0dXJuICpt X2lubGluZUJveFJlY3RNYXAuZ2V0KCZsYXlvdXRCb3gpOyB9CiAgICAgRGlzcGxheTo6SW5saW5l UmVjdCBsb2dpY2FsUmVjdEZvclRleHRSdW4oY29uc3QgTGluZTo6UnVuJikgY29uc3Q7CiAKKyAg ICB1c2luZyBJbmxpbmVCb3hNYXAgPSBIYXNoTWFwPGNvbnN0IEJveCosIElubGluZUJveCo+Owor ICAgIGNvbnN0IElubGluZUJveE1hcDo6VmFsdWVzQ29uc3RJdGVyYXRvclJhbmdlIGlubGluZUJv eExpc3QoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUJveFJlY3RNYXAudmFsdWVzKCk7IH0KKwog ICAgIElubGluZUxheW91dFVuaXQgYWxpZ25tZW50QmFzZWxpbmUoKSBjb25zdCB7IHJldHVybiBt X3Jvb3RJbmxpbmVCb3gubG9naWNhbFRvcCgpICsgbV9yb290SW5saW5lQm94LmJhc2VsaW5lKCk7 IH0KIAogcHJpdmF0ZToKQEAgLTEyOSw3ICsxMzUsNyBAQCBwcml2YXRlOgogICAgIElubGluZUJv eCBtX3Jvb3RJbmxpbmVCb3g7CiAKICAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBtX2hv cml6b250YWxBbGlnbm1lbnRPZmZzZXQ7Ci0gICAgSGFzaE1hcDxjb25zdCBCb3gqLCBJbmxpbmVC b3gqPiBtX2lubGluZUJveFJlY3RNYXA7CisgICAgSW5saW5lQm94TWFwIG1faW5saW5lQm94UmVj dE1hcDsKICAgICBWZWN0b3I8c3RkOjp1bmlxdWVfcHRyPElubGluZUJveD4+IG1faW5saW5lQm94 TGlzdDsKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9pbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDsKIH07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMmFmNzA3YmY1MjMyYTA3ZDc5YTA3ZGI2NmVlZmY1OTJh ZDQ5NmFiMS4uYzk2MzU2OGVjZDc3Yjc5M2EyNmNiNGYxNzdhN2NjZDgzMTM1MzZkNCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDEzIEBACisyMDIwLTA5LTEyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3VwcG9ydCBmb3Igbm9uLXJvb3QtaW5saW5l LWJveCBsaW5lIHNwYWNpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxNjQzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9pbmxpbmUtYm94LXdpdGgt bGluZS1zcGFjaW5nLXNpbXBsZS1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0aC1saW5lLXNwYWNpbmctc2lt cGxlLmh0bWw6IEFkZGVkLgorCiAyMDIwLTA5LTEwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBDb25zdHJ1Y3QgTGluZUJveDo6SW5saW5lQm94 ZXMgZm9yIG5lc3RlZCBpbmxpbmUgbGV2ZWwgYm94ZXMgd2hlbiB0aGV5IG92ZXJsYXAgbXVsdGlw bGUgbGluZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2Nv bnRleHQvaW5saW5lLWJveC13aXRoLWxpbmUtc3BhY2luZy1zaW1wbGUtZXhwZWN0ZWQuaHRtbCBi L0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvaW5saW5lLWJveC13aXRo LWxpbmUtc3BhY2luZy1zaW1wbGUtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xNDUyN2Y2ZDA4 MGIzYWVjMjgxZmE1MzFjNzBjZWMxZGU5MzNlMWE2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9pbmxpbmUtYm94LXdpdGgtbGluZS1z cGFjaW5nLXNpbXBsZS1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsOCBAQAorPHN0eWxlPgorZGl2 IHsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47CisgIHdpZHRoOiA0MDBweDsKKyAgaGVpZ2h0 OiA0NXB4OworfQorPC9zdHlsZT4KKzxkaXY+PC9kaXY+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0aC1saW5lLXNwYWNp bmctc2ltcGxlLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0 L2lubGluZS1ib3gtd2l0aC1saW5lLXNwYWNpbmctc2ltcGxlLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMWUx ODQzZmU4MGRjM2IyZDZkMWNjZGEyZjY5YjJjNDY4M2NmNjJkOAotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvaW5saW5lLWJveC13aXRo LWxpbmUtc3BhY2luZy1zaW1wbGUuaHRtbApAQCAtMCwwICsxLDEzIEBACis8c3R5bGU+CitkaXYg eworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgd2lkdGg6IDQwMHB4OworfQorCitzcGFu IHsKKyAgZm9udC1mYW1pbHk6ICJIaXJhTWluUHJvTi1XMyI7CisgIGZvbnQtc2l6ZTogMzBweDsK KyAgY29sb3I6IGdyZWVuOworfQorPC9zdHlsZT4KKzxkaXY+PHNwYW4+aW5saW5lIGJveCB3aXRo IGxpbmUgc3BhY2luZzwvc3Bhbj48L2Rpdj4K 408598 2020-09-12 09:08:54 -0700 2020-09-12 09:29:14 -0700 Patch bug-216433-20200912090853.patch text/plain 9506 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTI0NmJjOWFjM2ViODU2 ZGNkM2VjNGUxNjFkMGMxMjliYmUyNzc5YS4uNDAzNzY5ZWY4MGMwNjIxOGVhODY2MDZmNjQzNDdi ZDU4ZDNiZWRhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTA5LTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3Igbm9uLXJvb3QtaW5saW5lLWJveCBsaW5lIHNwYWNpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjQzMworCisgICAgICAgIFJldmll d2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFdoaWxlIHRoZSBMaW5lQm94IHZlcnRp Y2FsbHkgY29udGFpbnMgYWxsIHRoZSBMaW5lQm94OjpJbmxpbmVCb3hlcywgaXRzIGhlaWdodCB2 YWx1ZSBkb2VzIG5vdAorICAgICAgICBpbmNsdWRlIGFueSBsaW5lIHNwYWNpbmcgKEZvbnRNZXRy aWNzOjpsaW5lU3BhY2luZykuCisgICAgICAgIEVhY2ggTGluZUJveDo6SW5saW5lQm94IG1heSBo YXZlIGEgZGlmZmVyZW50IGxpbmUgc3BhY2luZyB2YWx1ZSAodGhpcyB2YWx1ZSBpcyB6ZXJvIGlu IG1hbnkgY2FzZXMpLgorICAgICAgICBUaGlzIHBhdGNoIGNvbGxlY3RzIGxpbmUgc3BhY2luZyB2 YWx1ZXMgZnJvbSB0aGUgTGluZUJveDo6SW5saW5lQm94ZXMgb24gdGhlIGxpbmUgYW5kIGFkanVz dHMgdGhlIGZpbmFsCisgICAgICAgIGxpbmUgaGVpZ2h0IHZhbHVlIGFjY29yZGluZ2x5LiAKKwor ICAgICAgICBUZXN0OiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0 aC1saW5lLXNwYWNpbmctc2ltcGxlLmh0bWwKKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkTGluZUxvZ2ljYWxSZWN0IGNv bnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6Y29uc3RydWN0SW5saW5lQm94 ZXMpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lQm94OjpsaW5lU3BhY2lu ZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUJveDo6 c2V0TGluZVNwYWNpbmcpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojppbmxp bmVCb3hMaXN0IGNvbnN0KToKKwogMjAyMC0wOS0xMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gTWFrZSBJbmxpbmVCb3hlcyBncm93IHZlcnRp Y2FsbHkgYXMgdGhleSBnYWluIGNvbnRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcAppbmRleCAyNGM3ODQzN2RlZjcyYTA4NjA5YTQ5NzgxYjFjNTE0YThjNWViMWJiLi5hZjZl MDI1MzczYjY5ZDE5N2Q5MzRkOGZhMTkxYmY4OGE4MTQzZWFkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9y bWF0dGluZ0NvbnRleHQuY3BwCkBAIC00MDksMTYgKzQwOSwzNCBAQCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dDo6TGluZVJlY3RBbmRMaW5lQm94T2Zmc2V0IElubGluZUZvcm1hdHRpbmdDb250ZXh0 Ojpjb21wdQogICAgIC8vIHwgICAgICAgICAgICAgICAgICAgIHwgbGluZSBzcGFjaW5nICAgICAg ICAgIHwgICB8CiAgICAgLy8gfF9fX19fX19fX19fX19fX19fX19fdl9fX19fX19fX19fX19fX19f X19fX19ffCAgc2Nyb2xsYWJsZSBvdmVyZmxvdwogICAgIC8vCi0gICAgaWYgKGxpbmVDb250ZW50 LnJ1bnMuaXNFbXB0eSgpIHx8IGxpbmVDb250ZW50LmxpbmVCb3guaXNMaW5lVmlzdWFsbHlFbXB0 eSgpKQorICAgIGF1dG8mIGxpbmVCb3ggPSBsaW5lQ29udGVudC5saW5lQm94OworICAgIGlmIChs aW5lQ29udGVudC5ydW5zLmlzRW1wdHkoKSB8fCBsaW5lQm94LmlzTGluZVZpc3VhbGx5RW1wdHko KSkKICAgICAgICAgcmV0dXJuIHsgeyB9LCB7IGxpbmVDb250ZW50LmxvZ2ljYWxUb3BMZWZ0LCBs aW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoLCB7IH0gfSB9OworCiAgICAgYXV0byYgcm9vdFN0 eWxlID0gcm9vdCgpLnN0eWxlKCk7Ci0gICAgYXV0byYgZm9udE1ldHJpY3MgPSByb290U3R5bGUu Zm9udE1ldHJpY3MoKTsKLSAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVTcGFjaW5nID0gZm9udE1l dHJpY3MubGluZVNwYWNpbmcoKTsKLSAgICBhdXRvJiBsaW5lQm94ID0gbGluZUNvbnRlbnQubGlu ZUJveDsKLSAgICBhdXRvIGxpbmVMb2dpY2FsSGVpZ2h0ID0gcm9vdFN0eWxlLmxpbmVIZWlnaHQo KS5pc05lZ2F0aXZlKCkgPyBzdGQ6Om1heChsaW5lQm94LmxvZ2ljYWxIZWlnaHQoKSwgbGluZVNw YWNpbmcpIDogcm9vdFN0eWxlLmNvbXB1dGVkTGluZUhlaWdodCgpOwotICAgIGF1dG8gbG9naWNh bFJlY3QgPSBEaXNwbGF5OjpJbmxpbmVSZWN0IHsgbGluZUNvbnRlbnQubG9naWNhbFRvcExlZnQs IGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGxpbmVMb2dpY2FsSGVpZ2h0fTsKKyAgICBh dXRvIGxpbmVMb2dpY2FsSGVpZ2h0ID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgaWYgKHJv b3RTdHlsZS5saW5lSGVpZ2h0KCkuaXNOZWdhdGl2ZSgpKSB7CisgICAgICAgIC8vIE5lZ2F0aXZl IGxpbmUgaGVpZ2h0IHZhbHVlIG1lYW5zIHRoZSBsaW5lIGhlaWdodCBpcyBkcml2ZW4gYnkgdGhl IGNvbnRlbnQuCisgICAgICAgIGF1dG8gdXNlZExpbmVTcGFjaW5nID0gWyZdIHsKKyAgICAgICAg ICAgIGF1dG8gbGluZUJveExvZ2ljYWxIZWlnaHQgPSBsaW5lQm94LmxvZ2ljYWxIZWlnaHQoKTsK KyAgICAgICAgICAgIGF1dG8gbG9naWNhbFRvcFdpdGhMaW5lU3BhY2luZyA9IElubGluZUxheW91 dFVuaXQgeyB9OworICAgICAgICAgICAgYXV0byBsb2dpY2FsQm90dG9tV2l0aExpbmVTcGFjaW5n ID0gbGluZUJveExvZ2ljYWxIZWlnaHQ7CisgICAgICAgICAgICBmb3IgKGF1dG8mIGlubGluZUJv eCA6IGxpbmVCb3guaW5saW5lQm94TGlzdCgpKSB7CisgICAgICAgICAgICAgICAgaWYgKGF1dG8g bGluZVNwYWNpbmcgPSBpbmxpbmVCb3gtPmxpbmVTcGFjaW5nKCkpIHsKKyAgICAgICAgICAgICAg ICAgICAgLy8gRklYTUU6IGNoZWNrIGlmIGxpbmUgc3BhY2luZyBpcyBkaXN0cmlidXRlZCBldmVu bHkuCisgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3BXaXRoTGluZVNwYWNpbmcgPSBzdGQ6 Om1pbihsb2dpY2FsVG9wV2l0aExpbmVTcGFjaW5nLCBpbmxpbmVCb3gtPmxvZ2ljYWxUb3AoKSAt ICpsaW5lU3BhY2luZyAvIDIpOworICAgICAgICAgICAgICAgICAgICBsb2dpY2FsQm90dG9tV2l0 aExpbmVTcGFjaW5nID0gc3RkOjptYXgobG9naWNhbEJvdHRvbVdpdGhMaW5lU3BhY2luZywgaW5s aW5lQm94LT5sb2dpY2FsQm90dG9tKCkgKyAqbGluZVNwYWNpbmcgLyAyKTsKKyAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgICAgICByZXR1cm4gLWxvZ2ljYWxUb3BXaXRo TGluZVNwYWNpbmcgKyAobG9naWNhbEJvdHRvbVdpdGhMaW5lU3BhY2luZyAtIGxpbmVCb3hMb2dp Y2FsSGVpZ2h0KTsKKyAgICAgICAgfTsKKyAgICAgICAgbGluZUxvZ2ljYWxIZWlnaHQgPSBsaW5l Qm94LmxvZ2ljYWxIZWlnaHQoKSArIHVzZWRMaW5lU3BhY2luZygpOworICAgIH0gZWxzZQorICAg ICAgICBsaW5lTG9naWNhbEhlaWdodCA9IHJvb3RTdHlsZS5jb21wdXRlZExpbmVIZWlnaHQoKTsK IAorICAgIGF1dG8gbG9naWNhbFJlY3QgPSBEaXNwbGF5OjpJbmxpbmVSZWN0IHsgbGluZUNvbnRl bnQubG9naWNhbFRvcExlZnQsIGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lkdGgsIGxpbmVMb2dp Y2FsSGVpZ2h0fTsKICAgICBhdXRvIGhhbGZMZWFkaW5nT2Zmc2V0ID0gWyZdIHsKKyAgICAgICAg YXV0byYgZm9udE1ldHJpY3MgPSByb290U3R5bGUuZm9udE1ldHJpY3MoKTsKICAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBhc2NlbnQgPSBmb250TWV0cmljcy5hc2NlbnQoKTsKICAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBkZXNjZW50ID0gZm9udE1ldHJpY3MuZGVzY2VudCgpOwogICAgICAgICAv LyAxMC44LjEgTGVhZGluZyBhbmQgaGFsZi1sZWFkaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCmluZGV4IDUw ZDQ4MWNjZjE0ZDc5N2JmZGVkNmZkOWFmNTg4MDEyZjQxODg5YjEuLjlhMGEwN2RkNGI0ZDgwYTdl MmJlYjMzOWFjZjhhZTMwM2EwYTgzYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCkBAIC0xNjQsNiArMTY0 LDggQEAgdm9pZCBMaW5lQm94Ojpjb25zdHJ1Y3RJbmxpbmVCb3hlcyhjb25zdCBMaW5lOjpSdW5M aXN0JiBydW5zKQogICAgICAgICBpbmxpbmVCb3guc2V0TG9naWNhbEhlaWdodChsb2dpY2FsSGVp Z2h0KTsKICAgICAgICAgaW5saW5lQm94LnNldEJhc2VsaW5lKGJhc2VsaW5lKTsKICAgICAgICAg aW5saW5lQm94LnNldERlc2NlbnQobG9naWNhbEhlaWdodCAtIGJhc2VsaW5lKTsKKyAgICAgICAg aWYgKGF1dG8gbGluZVNwYWNpbmcgPSBmb250TWV0cmljcy5saW5lU3BhY2luZygpIC0gbG9naWNh bEhlaWdodCkKKyAgICAgICAgICAgIGlubGluZUJveC5zZXRMaW5lU3BhY2luZyhsaW5lU3BhY2lu Zyk7CiAgICAgfTsKIAogICAgIGF1dG8gY29uc3RydWN0Um9vdElubGluZUJveCA9IFsmXSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94LmgKaW5kZXggNDk4ZWM2MWJmYjJlNjY5MmNiNzg1YzkzMTFiYWZkYjdlMDdlNGZlMS4u OTdmODRhNTUxNTkwMWE0ZDQ5MTgxNDFjZTQ0YjI1ZDcwZGIwMmU4OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApA QCAtNzYsNiArNzYsNyBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsg cmV0dXJuIG1faXNFbXB0eTsgfQogICAgICAgICB2b2lkIHNldElzTm9uRW1wdHkoKSB7IG1faXNF bXB0eSA9IGZhbHNlOyB9CiAKKyAgICAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gbGlu ZVNwYWNpbmcoKSBjb25zdCB7IHJldHVybiBtX2xpbmVTcGFjaW5nOyB9CiAgICAgICAgIGNvbnN0 IEZvbnRNZXRyaWNzJiBmb250TWV0cmljcygpIGNvbnN0IHsgcmV0dXJuIGxheW91dEJveCgpLnN0 eWxlKCkuZm9udE1ldHJpY3MoKTsgfQogICAgICAgICBjb25zdCBCb3gmIGxheW91dEJveCgpIGNv bnN0IHsgcmV0dXJuICptX2xheW91dEJveDsgfQogCkBAIC04NywxMSArODgsMTMgQEAgcHVibGlj OgogICAgICAgICB2b2lkIHNldExvZ2ljYWxIZWlnaHQoSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs SGVpZ2h0KSB7IG1fbG9naWNhbFJlY3Quc2V0SGVpZ2h0KGxvZ2ljYWxIZWlnaHQpOyB9CiAgICAg ICAgIHZvaWQgc2V0QmFzZWxpbmUoSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSkgeyBtX2Jhc2Vs aW5lID0gYmFzZWxpbmU7IH0KICAgICAgICAgdm9pZCBzZXREZXNjZW50KElubGluZUxheW91dFVu aXQgZGVzY2VudCkgeyBtX2Rlc2NlbnQgPSBkZXNjZW50OyB9CisgICAgICAgIHZvaWQgc2V0TGlu ZVNwYWNpbmcoSW5saW5lTGF5b3V0VW5pdCBsaW5lU3BhY2luZykgeyBtX2xpbmVTcGFjaW5nID0g bGluZVNwYWNpbmc7IH0KIAogICAgICAgICBXZWFrUHRyPGNvbnN0IEJveD4gbV9sYXlvdXRCb3g7 CiAgICAgICAgIERpc3BsYXk6OklubGluZVJlY3QgbV9sb2dpY2FsUmVjdDsKICAgICAgICAgSW5s aW5lTGF5b3V0VW5pdCBtX2Jhc2VsaW5lIHsgMCB9OwogICAgICAgICBPcHRpb25hbDxJbmxpbmVM YXlvdXRVbml0PiBtX2Rlc2NlbnQ7CisgICAgICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+ IG1fbGluZVNwYWNpbmc7CiAgICAgICAgIGJvb2wgbV9pc0VtcHR5IHsgdHJ1ZSB9OwogICAgIH07 CiAKQEAgLTEwOSw2ICsxMTIsOSBAQCBwdWJsaWM6CiAgICAgY29uc3QgSW5saW5lQm94JiBpbmxp bmVCb3hGb3JMYXlvdXRCb3goY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0IHsgcmV0dXJuICpt X2lubGluZUJveFJlY3RNYXAuZ2V0KCZsYXlvdXRCb3gpOyB9CiAgICAgRGlzcGxheTo6SW5saW5l UmVjdCBsb2dpY2FsUmVjdEZvclRleHRSdW4oY29uc3QgTGluZTo6UnVuJikgY29uc3Q7CiAKKyAg ICB1c2luZyBJbmxpbmVCb3hNYXAgPSBIYXNoTWFwPGNvbnN0IEJveCosIElubGluZUJveCo+Owor ICAgIGF1dG8gaW5saW5lQm94TGlzdCgpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lQm94UmVjdE1h cC52YWx1ZXMoKTsgfQorCiAgICAgSW5saW5lTGF5b3V0VW5pdCBhbGlnbm1lbnRCYXNlbGluZSgp IGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC5sb2dpY2FsVG9wKCkgKyBtX3Jvb3RJbmxp bmVCb3guYmFzZWxpbmUoKTsgfQogCiBwcml2YXRlOgpAQCAtMTI5LDcgKzEzNSw3IEBAIHByaXZh dGU6CiAgICAgSW5saW5lQm94IG1fcm9vdElubGluZUJveDsKIAogICAgIE9wdGlvbmFsPElubGlu ZUxheW91dFVuaXQ+IG1faG9yaXpvbnRhbEFsaWdubWVudE9mZnNldDsKLSAgICBIYXNoTWFwPGNv bnN0IEJveCosIElubGluZUJveCo+IG1faW5saW5lQm94UmVjdE1hcDsKKyAgICBJbmxpbmVCb3hN YXAgbV9pbmxpbmVCb3hSZWN0TWFwOwogICAgIFZlY3RvcjxzdGQ6OnVuaXF1ZV9wdHI8SW5saW5l Qm94Pj4gbV9pbmxpbmVCb3hMaXN0OwogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0 JiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OwogfTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyYWY3MDdiZjUyMzJhMDdk NzlhMDdkYjY2ZWVmZjU5MmFkNDk2YWIxLi44NGE0NmQ1OWM5ZjgwZWFhOGQzMjcxNTdjMGM4ZDZk YmI2NGFmYTA2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDktMTIgIFphbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBwb3J0IGZv ciBub24tcm9vdC1pbmxpbmUtYm94IGxpbmUgc3BhY2luZworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NDMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg QW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgKiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0 L2lubGluZS1ib3gtd2l0aC1saW5lLXNwYWNpbmctc2ltcGxlLWV4cGVjdGVkLmh0bWw6IEFkZGVk LgorICAgICAgICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvaW5saW5lLWJveC13aXRo LWxpbmUtc3BhY2luZy1zaW1wbGUuaHRtbDogQWRkZWQuCisKIDIwMjAtMDktMTAgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIENvbnN0cnVjdCBM aW5lQm94OjpJbmxpbmVCb3hlcyBmb3IgbmVzdGVkIGlubGluZSBsZXZlbCBib3hlcyB3aGVuIHRo ZXkgb3ZlcmxhcCBtdWx0aXBsZSBsaW5lcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9s YXlvdXRmb3JtYXR0aW5nY29udGV4dC9pbmxpbmUtYm94LXdpdGgtbGluZS1zcGFjaW5nLXNpbXBs ZS1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4 dC9pbmxpbmUtYm94LXdpdGgtbGluZS1zcGFjaW5nLXNpbXBsZS1leHBlY3RlZC5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjE0NTI3ZjZkMDgwYjNhZWMyODFmYTUzMWM3MGNlYzFkZTkzM2UxYTYKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2lubGlu ZS1ib3gtd2l0aC1saW5lLXNwYWNpbmctc2ltcGxlLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw4 IEBACis8c3R5bGU+CitkaXYgeworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgd2lkdGg6 IDQwMHB4OworICBoZWlnaHQ6IDQ1cHg7Cit9Cis8L3N0eWxlPgorPGRpdj48L2Rpdj4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvaW5saW5lLWJv eC13aXRoLWxpbmUtc3BhY2luZy1zaW1wbGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0 Zm9ybWF0dGluZ2NvbnRleHQvaW5saW5lLWJveC13aXRoLWxpbmUtc3BhY2luZy1zaW1wbGUuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi4xZTE4NDNmZTgwZGMzYjJkNmQxY2NkYTJmNjliMmM0NjgzY2Y2MmQ4Ci0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4 dC9pbmxpbmUtYm94LXdpdGgtbGluZS1zcGFjaW5nLXNpbXBsZS5odG1sCkBAIC0wLDAgKzEsMTMg QEAKKzxzdHlsZT4KK2RpdiB7CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICB3aWR0aDog NDAwcHg7Cit9CisKK3NwYW4geworICBmb250LWZhbWlseTogIkhpcmFNaW5Qcm9OLVczIjsKKyAg Zm9udC1zaXplOiAzMHB4OworICBjb2xvcjogZ3JlZW47Cit9Cis8L3N0eWxlPgorPGRpdj48c3Bh bj5pbmxpbmUgYm94IHdpdGggbGluZSBzcGFjaW5nPC9zcGFuPjwvZGl2Pgo= 408599 2020-09-12 09:29:15 -0700 2020-09-12 09:34:40 -0700 Patch bug-216433-20200912092914.patch text/plain 10528 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2OTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWFiYmJiNTlhMGI1Zjdm Y2ZiNzZkMzk3MTAzMzE4ZWQ2Nzg1N2U5Ni4uNmJlNzE0NjdkNDk2MDY4ZWQyZTA5NzY2ZjM4NjZh NDcyZjEwNzI1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTA5LTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3Igbm9uLXJvb3QtaW5saW5lLWJveCBsaW5lIHNwYWNpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjQzMworCisgICAgICAgIFJldmll d2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFdoaWxlIHRoZSBMaW5lQm94IHZlcnRp Y2FsbHkgY29udGFpbnMgYWxsIHRoZSBMaW5lQm94OjpJbmxpbmVCb3hlcywgaXRzIGhlaWdodCB2 YWx1ZSBkb2VzIG5vdAorICAgICAgICBpbmNsdWRlIGFueSBsaW5lIHNwYWNpbmcgKEZvbnRNZXRy aWNzOjpsaW5lU3BhY2luZykuCisgICAgICAgIEVhY2ggTGluZUJveDo6SW5saW5lQm94IG1heSBo YXZlIGEgZGlmZmVyZW50IGxpbmUgc3BhY2luZyB2YWx1ZSAodGhpcyB2YWx1ZSBpcyB6ZXJvIGlu IG1hbnkgY2FzZXMpLgorICAgICAgICBUaGlzIHBhdGNoIGNvbGxlY3RzIGxpbmUgc3BhY2luZyB2 YWx1ZXMgZnJvbSB0aGUgTGluZUJveDo6SW5saW5lQm94ZXMgb24gdGhlIGxpbmUgYW5kIGFkanVz dHMgdGhlIGZpbmFsCisgICAgICAgIGxpbmUgaGVpZ2h0IHZhbHVlIGFjY29yZGluZ2x5LiAKKwor ICAgICAgICBUZXN0OiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0 aC1saW5lLXNwYWNpbmctc2ltcGxlLmh0bWwKKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVkTGluZUxvZ2ljYWxSZWN0IGNv bnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6Y29uc3RydWN0SW5saW5lQm94 ZXMpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lQm94OjpsaW5lU3BhY2lu ZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OklubGluZUJveDo6 c2V0TGluZVNwYWNpbmcpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojppbmxp bmVCb3hMaXN0IGNvbnN0KToKKwogMjAyMC0wOS0xMiAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4 ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZHJlc3NpbmcgZmVlZGJhY2sgb24gcjI2Njkz NgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDI0Yzc4NDM3ZGVmNzJh MDg2MDlhNDk3ODFiMWM1MTRhOGM1ZWIxYmIuLmFmNmUwMjUzNzNiNjlkMTk3ZDkzNGQ4ZmExOTFi Zjg4YTgxNDNlYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTQw OSwxNiArNDA5LDM0IEBAIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lUmVjdEFuZExpbmVC b3hPZmZzZXQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1CiAgICAgLy8gfCAgICAgICAg ICAgICAgICAgICAgfCBsaW5lIHNwYWNpbmcgICAgICAgICAgfCAgIHwKICAgICAvLyB8X19fX19f X19fX19fX19fX19fX192X19fX19fX19fX19fX19fX19fX19fX198ICBzY3JvbGxhYmxlIG92ZXJm bG93CiAgICAgLy8KLSAgICBpZiAobGluZUNvbnRlbnQucnVucy5pc0VtcHR5KCkgfHwgbGluZUNv bnRlbnQubGluZUJveC5pc0xpbmVWaXN1YWxseUVtcHR5KCkpCisgICAgYXV0byYgbGluZUJveCA9 IGxpbmVDb250ZW50LmxpbmVCb3g7CisgICAgaWYgKGxpbmVDb250ZW50LnJ1bnMuaXNFbXB0eSgp IHx8IGxpbmVCb3guaXNMaW5lVmlzdWFsbHlFbXB0eSgpKQogICAgICAgICByZXR1cm4geyB7IH0s IHsgbGluZUNvbnRlbnQubG9naWNhbFRvcExlZnQsIGxpbmVDb250ZW50LmxpbmVMb2dpY2FsV2lk dGgsIHsgfSB9IH07CisKICAgICBhdXRvJiByb290U3R5bGUgPSByb290KCkuc3R5bGUoKTsKLSAg ICBhdXRvJiBmb250TWV0cmljcyA9IHJvb3RTdHlsZS5mb250TWV0cmljcygpOwotICAgIElubGlu ZUxheW91dFVuaXQgbGluZVNwYWNpbmcgPSBmb250TWV0cmljcy5saW5lU3BhY2luZygpOwotICAg IGF1dG8mIGxpbmVCb3ggPSBsaW5lQ29udGVudC5saW5lQm94OwotICAgIGF1dG8gbGluZUxvZ2lj YWxIZWlnaHQgPSByb290U3R5bGUubGluZUhlaWdodCgpLmlzTmVnYXRpdmUoKSA/IHN0ZDo6bWF4 KGxpbmVCb3gubG9naWNhbEhlaWdodCgpLCBsaW5lU3BhY2luZykgOiByb290U3R5bGUuY29tcHV0 ZWRMaW5lSGVpZ2h0KCk7Ci0gICAgYXV0byBsb2dpY2FsUmVjdCA9IERpc3BsYXk6OklubGluZVJl Y3QgeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVmdCwgbGluZUNvbnRlbnQubGluZUxvZ2ljYWxX aWR0aCwgbGluZUxvZ2ljYWxIZWlnaHR9OworICAgIGF1dG8gbGluZUxvZ2ljYWxIZWlnaHQgPSBJ bmxpbmVMYXlvdXRVbml0IHsgfTsKKyAgICBpZiAocm9vdFN0eWxlLmxpbmVIZWlnaHQoKS5pc05l Z2F0aXZlKCkpIHsKKyAgICAgICAgLy8gTmVnYXRpdmUgbGluZSBoZWlnaHQgdmFsdWUgbWVhbnMg dGhlIGxpbmUgaGVpZ2h0IGlzIGRyaXZlbiBieSB0aGUgY29udGVudC4KKyAgICAgICAgYXV0byB1 c2VkTGluZVNwYWNpbmcgPSBbJl0geworICAgICAgICAgICAgYXV0byBsaW5lQm94TG9naWNhbEhl aWdodCA9IGxpbmVCb3gubG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAgYXV0byBsb2dpY2Fs VG9wV2l0aExpbmVTcGFjaW5nID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgICAgICAgICBh dXRvIGxvZ2ljYWxCb3R0b21XaXRoTGluZVNwYWNpbmcgPSBsaW5lQm94TG9naWNhbEhlaWdodDsK KyAgICAgICAgICAgIGZvciAoYXV0byYgaW5saW5lQm94IDogbGluZUJveC5pbmxpbmVCb3hMaXN0 KCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoYXV0byBsaW5lU3BhY2luZyA9IGlubGluZUJveC0+ bGluZVNwYWNpbmcoKSkgeworICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRTogY2hlY2sgaWYg bGluZSBzcGFjaW5nIGlzIGRpc3RyaWJ1dGVkIGV2ZW5seS4KKyAgICAgICAgICAgICAgICAgICAg bG9naWNhbFRvcFdpdGhMaW5lU3BhY2luZyA9IHN0ZDo6bWluKGxvZ2ljYWxUb3BXaXRoTGluZVNw YWNpbmcsIGlubGluZUJveC0+bG9naWNhbFRvcCgpIC0gKmxpbmVTcGFjaW5nIC8gMik7CisgICAg ICAgICAgICAgICAgICAgIGxvZ2ljYWxCb3R0b21XaXRoTGluZVNwYWNpbmcgPSBzdGQ6Om1heChs b2dpY2FsQm90dG9tV2l0aExpbmVTcGFjaW5nLCBpbmxpbmVCb3gtPmxvZ2ljYWxCb3R0b20oKSAr ICpsaW5lU3BhY2luZyAvIDIpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIHJldHVybiAtbG9naWNhbFRvcFdpdGhMaW5lU3BhY2luZyArIChsb2dpY2FsQm90 dG9tV2l0aExpbmVTcGFjaW5nIC0gbGluZUJveExvZ2ljYWxIZWlnaHQpOworICAgICAgICB9Owor ICAgICAgICBsaW5lTG9naWNhbEhlaWdodCA9IGxpbmVCb3gubG9naWNhbEhlaWdodCgpICsgdXNl ZExpbmVTcGFjaW5nKCk7CisgICAgfSBlbHNlCisgICAgICAgIGxpbmVMb2dpY2FsSGVpZ2h0ID0g cm9vdFN0eWxlLmNvbXB1dGVkTGluZUhlaWdodCgpOwogCisgICAgYXV0byBsb2dpY2FsUmVjdCA9 IERpc3BsYXk6OklubGluZVJlY3QgeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVmdCwgbGluZUNv bnRlbnQubGluZUxvZ2ljYWxXaWR0aCwgbGluZUxvZ2ljYWxIZWlnaHR9OwogICAgIGF1dG8gaGFs ZkxlYWRpbmdPZmZzZXQgPSBbJl0geworICAgICAgICBhdXRvJiBmb250TWV0cmljcyA9IHJvb3RT dHlsZS5mb250TWV0cmljcygpOwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGFzY2VudCA9IGZv bnRNZXRyaWNzLmFzY2VudCgpOwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGRlc2NlbnQgPSBm b250TWV0cmljcy5kZXNjZW50KCk7CiAgICAgICAgIC8vIDEwLjguMSBMZWFkaW5nIGFuZCBoYWxm LWxlYWRpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZUJveC5jcHAKaW5kZXggNTBkNDgxY2NmMTRkNzk3YmZkZWQ2ZmQ5YWY1 ODgwMTJmNDE4ODliMS4uOWEwYTA3ZGQ0YjRkODBhN2UyYmViMzM5YWNmOGFlMzAzYTBhODNiYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJveC5jcHAKQEAgLTE2NCw2ICsxNjQsOCBAQCB2b2lkIExpbmVCb3g6OmNvbnN0 cnVjdElubGluZUJveGVzKGNvbnN0IExpbmU6OlJ1bkxpc3QmIHJ1bnMpCiAgICAgICAgIGlubGlu ZUJveC5zZXRMb2dpY2FsSGVpZ2h0KGxvZ2ljYWxIZWlnaHQpOwogICAgICAgICBpbmxpbmVCb3gu c2V0QmFzZWxpbmUoYmFzZWxpbmUpOwogICAgICAgICBpbmxpbmVCb3guc2V0RGVzY2VudChsb2dp Y2FsSGVpZ2h0IC0gYmFzZWxpbmUpOworICAgICAgICBpZiAoYXV0byBsaW5lU3BhY2luZyA9IGZv bnRNZXRyaWNzLmxpbmVTcGFjaW5nKCkgLSBsb2dpY2FsSGVpZ2h0KQorICAgICAgICAgICAgaW5s aW5lQm94LnNldExpbmVTcGFjaW5nKGxpbmVTcGFjaW5nKTsKICAgICB9OwogCiAgICAgYXV0byBj b25zdHJ1Y3RSb290SW5saW5lQm94ID0gWyZdIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaAppbmRleCA0OThlYzYxYmZi MmU2NjkyY2I3ODVjOTMxMWJhZmRiN2UwN2U0ZmUxLi45N2Y4NGE1NTE1OTAxYTRkNDkxODE0MWNl NDRiMjVkNzBkYjAyZTg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCkBAIC03Niw2ICs3Niw3IEBAIHB1YmxpYzoK ICAgICAgICAgYm9vbCBpc0VtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9pc0VtcHR5OyB9CiAgICAg ICAgIHZvaWQgc2V0SXNOb25FbXB0eSgpIHsgbV9pc0VtcHR5ID0gZmFsc2U7IH0KIAorICAgICAg ICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBsaW5lU3BhY2luZygpIGNvbnN0IHsgcmV0dXJu IG1fbGluZVNwYWNpbmc7IH0KICAgICAgICAgY29uc3QgRm9udE1ldHJpY3MmIGZvbnRNZXRyaWNz KCkgY29uc3QgeyByZXR1cm4gbGF5b3V0Qm94KCkuc3R5bGUoKS5mb250TWV0cmljcygpOyB9CiAg ICAgICAgIGNvbnN0IEJveCYgbGF5b3V0Qm94KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0Qm94 OyB9CiAKQEAgLTg3LDExICs4OCwxMyBAQCBwdWJsaWM6CiAgICAgICAgIHZvaWQgc2V0TG9naWNh bEhlaWdodChJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQpIHsgbV9sb2dpY2FsUmVjdC5z ZXRIZWlnaHQobG9naWNhbEhlaWdodCk7IH0KICAgICAgICAgdm9pZCBzZXRCYXNlbGluZShJbmxp bmVMYXlvdXRVbml0IGJhc2VsaW5lKSB7IG1fYmFzZWxpbmUgPSBiYXNlbGluZTsgfQogICAgICAg ICB2b2lkIHNldERlc2NlbnQoSW5saW5lTGF5b3V0VW5pdCBkZXNjZW50KSB7IG1fZGVzY2VudCA9 IGRlc2NlbnQ7IH0KKyAgICAgICAgdm9pZCBzZXRMaW5lU3BhY2luZyhJbmxpbmVMYXlvdXRVbml0 IGxpbmVTcGFjaW5nKSB7IG1fbGluZVNwYWNpbmcgPSBsaW5lU3BhY2luZzsgfQogCiAgICAgICAg IFdlYWtQdHI8Y29uc3QgQm94PiBtX2xheW91dEJveDsKICAgICAgICAgRGlzcGxheTo6SW5saW5l UmVjdCBtX2xvZ2ljYWxSZWN0OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1fYmFzZWxpbmUg eyAwIH07CiAgICAgICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1fZGVzY2VudDsKKyAg ICAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gbV9saW5lU3BhY2luZzsKICAgICAgICAg Ym9vbCBtX2lzRW1wdHkgeyB0cnVlIH07CiAgICAgfTsKIApAQCAtMTA5LDYgKzExMiw5IEBAIHB1 YmxpYzoKICAgICBjb25zdCBJbmxpbmVCb3gmIGlubGluZUJveEZvckxheW91dEJveChjb25zdCBC b3gmIGxheW91dEJveCkgY29uc3QgeyByZXR1cm4gKm1faW5saW5lQm94UmVjdE1hcC5nZXQoJmxh eW91dEJveCk7IH0KICAgICBEaXNwbGF5OjpJbmxpbmVSZWN0IGxvZ2ljYWxSZWN0Rm9yVGV4dFJ1 bihjb25zdCBMaW5lOjpSdW4mKSBjb25zdDsKIAorICAgIHVzaW5nIElubGluZUJveE1hcCA9IEhh c2hNYXA8Y29uc3QgQm94KiwgSW5saW5lQm94Kj47CisgICAgYXV0byBpbmxpbmVCb3hMaXN0KCkg Y29uc3QgeyByZXR1cm4gbV9pbmxpbmVCb3hSZWN0TWFwLnZhbHVlcygpOyB9CisKICAgICBJbmxp bmVMYXlvdXRVbml0IGFsaWdubWVudEJhc2VsaW5lKCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5s aW5lQm94LmxvZ2ljYWxUb3AoKSArIG1fcm9vdElubGluZUJveC5iYXNlbGluZSgpOyB9CiAKIHBy aXZhdGU6CkBAIC0xMjksNyArMTM1LDcgQEAgcHJpdmF0ZToKICAgICBJbmxpbmVCb3ggbV9yb290 SW5saW5lQm94OwogCiAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gbV9ob3Jpem9udGFs QWxpZ25tZW50T2Zmc2V0OwotICAgIEhhc2hNYXA8Y29uc3QgQm94KiwgSW5saW5lQm94Kj4gbV9p bmxpbmVCb3hSZWN0TWFwOworICAgIElubGluZUJveE1hcCBtX2lubGluZUJveFJlY3RNYXA7CiAg ICAgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVCb3g+PiBtX2lubGluZUJveExpc3Q7CiAg ICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIG1faW5saW5lRm9ybWF0dGluZ0NvbnRl eHQ7CiB9OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCmluZGV4IDc0NGU0ZjhmN2U1ZDJiZDgwMDgwMDdmYjM3NjkwYzQ3MTM1OGE5NTMu LjFiMWRlZDQ2NmMzOTlmYTQ1NGI4MzkyOGI2MjAwOWU1ZDFhMjNiNTAgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMyBAQAorMjAyMC0wOS0xMiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisg ICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9yIG5vbi1yb290LWlubGluZS1ib3ggbGlu ZSBzcGFjaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTY0MzMKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAg ICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvaW5saW5lLWJveC13aXRoLWxpbmUtc3Bh Y2luZy1zaW1wbGUtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9sYXlvdXRm b3JtYXR0aW5nY29udGV4dC9pbmxpbmUtYm94LXdpdGgtbGluZS1zcGFjaW5nLXNpbXBsZS5odG1s OiBBZGRlZC4KKwogMjAyMC0wOS0xMiAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAg ICAgICAgIEltcGxlbWVudCBsYXp5IGlmcmFtZSBsb2FkaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0aC1saW5lLXNw YWNpbmctc2ltcGxlLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1h dHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0aC1saW5lLXNwYWNpbmctc2ltcGxlLWV4cGVjdGVk Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uMTQ1MjdmNmQwODBiM2FlYzI4MWZhNTMxYzcwY2VjMWRlOTMzZTFh NgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2Nv bnRleHQvaW5saW5lLWJveC13aXRoLWxpbmUtc3BhY2luZy1zaW1wbGUtZXhwZWN0ZWQuaHRtbApA QCAtMCwwICsxLDggQEAKKzxzdHlsZT4KK2RpdiB7CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVu OworICB3aWR0aDogNDAwcHg7CisgIGhlaWdodDogNDVweDsKK30KKzwvc3R5bGU+Cis8ZGl2Pjwv ZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4 dC9pbmxpbmUtYm94LXdpdGgtbGluZS1zcGFjaW5nLXNpbXBsZS5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9pbmxpbmUtYm94LXdpdGgtbGluZS1zcGFjaW5n LXNpbXBsZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFlMTg0M2ZlODBkYzNiMmQ2ZDFjY2RhMmY2OWIyYzQ2 ODNjZjYyZDgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1h dHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0aC1saW5lLXNwYWNpbmctc2ltcGxlLmh0bWwKQEAg LTAsMCArMSwxMyBAQAorPHN0eWxlPgorZGl2IHsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47 CisgIHdpZHRoOiA0MDBweDsKK30KKworc3BhbiB7CisgIGZvbnQtZmFtaWx5OiAiSGlyYU1pblBy b04tVzMiOworICBmb250LXNpemU6IDMwcHg7CisgIGNvbG9yOiBncmVlbjsKK30KKzwvc3R5bGU+ Cis8ZGl2PjxzcGFuPmlubGluZSBib3ggd2l0aCBsaW5lIHNwYWNpbmc8L3NwYW4+PC9kaXY+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9ucyBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGNlODFmMTA2ZDEz ZjlkOGUwMDgzOGJhOTZkMmMzODZjOWJjODNkY2QuLjVlMmI4ODY3YTdlY2IxZDEzZDFjMDljNDgw NzI1NDA2YzkzZDIxYjggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0 RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRp b25zCkBAIC0zNjkxLDYgKzM2OTEsOCBAQCBodHRwL3dwdC9mZXRjaC9yZXNwb25zZS1zdGF0dXMt dGV4dC5odG1sIFsgRmFpbHVyZSBdCiBqcy9kb20vYnVpbHRpbi1nZXR0ZXItbmFtZS5odG1sIFsg RmFpbHVyZSBdCiBmYXN0L2Zvcm1zL2ZpbGUvZW50cmllcy1hcGkvd2Via2l0ZGlyZWN0b3J5LW9w ZW4tcGFuZWwuaHRtbCBbIFNraXAgXQogCitmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0IFsg U2tpcCBdCisKICMgUmVxdWlyZXMgV0syIGxvYWRpbmcgc3VwcG9ydAogaHR0cC93cHQvZmV0Y2gv ZG50LWhlYWRlci1hZnRlci1yZWRpcmVjdGlvbi5odG1sIFsgU2tpcCBdCiBodHRwL3dwdC9mZXRj aC9pbnNwZWN0LXByZWZsaWdodC5odG1sIFsgU2tpcCBdCkBAIC00NDQ1LDggKzQ0NDcsNiBAQCB3 ZWJraXQub3JnL2IvMjA0NTQ1IHN2Zy9hcy1pbWFnZS9zdmctbmVzdGVkLmh0bWwgWyBQYXNzIFRp bWVvdXQgQ3Jhc2ggXQogCiB3ZWJraXQub3JnL2IvMjA0Nzk0IHdlYmFuaW1hdGlvbnMvYWNjZWxl cmF0ZWQtYW5pbWF0aW9uLXJlbW92YWwtdXBvbi10cmFuc2l0aW9uLWNvbXBsZXRpb24uaHRtbCBb IFRpbWVvdXQgXQogCi13ZWJraXQub3JnL2IvMjA0Nzk1IGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2Nv bnRleHQvZmxvdy1pbnRlZ3JhdGlvbi1iYXNpYy5odG1sIFsgRmFpbHVyZSBdCi0KIHdlYmtpdC5v cmcvYi8yMDQ5NzQgaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9zeW5jLXhoci1pbi11bmxvYWQu aHRtbCBbIEZhaWx1cmUgXQogCiB3ZWJraXQub3JnL2IvMjA1MjcyIGpzL2ludGVnZXItZGl2aXNp b24tbmVnMnRvdGhlMzItYnktbmVnMS5odG1sIFsgRmFpbHVyZSBdCg== 408600 2020-09-12 09:34:42 -0700 2020-09-12 10:07:43 -0700 Patch bug-216433-20200912093441.patch text/plain 10527 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2OTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWFiYmJiNTlhMGI1Zjdm Y2ZiNzZkMzk3MTAzMzE4ZWQ2Nzg1N2U5Ni4uMWJmZTFlNGFlZWVhMTVjYTAyZjYyM2ExNGRkODQ5 ZGYxMGE2NTVmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTA5LTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3Igbm9uLXJvb3QtaW5saW5lLWJveCBsaW5lIHNwYWNpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjQzMworCisgICAgICAgIFJldmll d2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFdoaWxlIHRoZSBMaW5lQm94IHZlcnRp Y2FsbHkgY29udGFpbnMgYWxsIHRoZSBMaW5lQm94OjpJbmxpbmVCb3hlcywgaXRzIGhlaWdodCB2 YWx1ZSBkb2VzIG5vdAorICAgICAgICBpbmNsdWRlIGFueSBsaW5lIHNwYWNpbmcgKEZvbnRNZXRy aWNzOjpsaW5lU3BhY2luZykuCisgICAgICAgIEVhY2ggTGluZUJveDo6SW5saW5lQm94IG1heSBo YXZlIGEgZGlmZmVyZW50IGxpbmUgc3BhY2luZyB2YWx1ZSAodGhpcyB2YWx1ZSBpcyB6ZXJvIGlu IG1hbnkgY2FzZXMpLgorICAgICAgICBUaGlzIHBhdGNoIGNvbGxlY3RzIGxpbmUgc3BhY2luZyB2 YWx1ZXMgZnJvbSB0aGUgTGluZUJveDo6SW5saW5lQm94ZXMgb24gdGhlIGxpbmUgYW5kIGFkanVz dHMgdGhlIGZpbmFsCisgICAgICAgIGxpbmUgaGVpZ2h0IHZhbHVlIGFjY29yZGluZ2x5LgorCisg ICAgICAgIFRlc3Q6IGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvaW5saW5lLWJveC13aXRo LWxpbmUtc3BhY2luZy1zaW1wbGUuaHRtbAorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRMaW5lTG9naWNhbFJlY3QgY29u c3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojpjb25zdHJ1Y3RJbmxpbmVCb3hl cyk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94OjpJbmxpbmVCb3g6OmxpbmVTcGFjaW5n IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6SW5saW5lQm94Ojpz ZXRMaW5lU3BhY2luZyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OmlubGlu ZUJveExpc3QgY29uc3QpOgorCiAyMDIwLTA5LTEyICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhm aWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkcmVzc2luZyBmZWVkYmFjayBvbiByMjY2OTM2 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggMjRjNzg0MzdkZWY3MmEw ODYwOWE0OTc4MWIxYzUxNGE4YzVlYjFiYi4uYWY2ZTAyNTM3M2I2OWQxOTdkOTM0ZDhmYTE5MWJm ODhhODE0M2VhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNDA5 LDE2ICs0MDksMzQgQEAgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVSZWN0QW5kTGluZUJv eE9mZnNldCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHUKICAgICAvLyB8ICAgICAgICAg ICAgICAgICAgICB8IGxpbmUgc3BhY2luZyAgICAgICAgICB8ICAgfAogICAgIC8vIHxfX19fX19f X19fX19fX19fX19fX3ZfX19fX19fX19fX19fX19fX19fX19fX3wgIHNjcm9sbGFibGUgb3ZlcmZs b3cKICAgICAvLwotICAgIGlmIChsaW5lQ29udGVudC5ydW5zLmlzRW1wdHkoKSB8fCBsaW5lQ29u dGVudC5saW5lQm94LmlzTGluZVZpc3VhbGx5RW1wdHkoKSkKKyAgICBhdXRvJiBsaW5lQm94ID0g bGluZUNvbnRlbnQubGluZUJveDsKKyAgICBpZiAobGluZUNvbnRlbnQucnVucy5pc0VtcHR5KCkg fHwgbGluZUJveC5pc0xpbmVWaXN1YWxseUVtcHR5KCkpCiAgICAgICAgIHJldHVybiB7IHsgfSwg eyBsaW5lQ29udGVudC5sb2dpY2FsVG9wTGVmdCwgbGluZUNvbnRlbnQubGluZUxvZ2ljYWxXaWR0 aCwgeyB9IH0gfTsKKwogICAgIGF1dG8mIHJvb3RTdHlsZSA9IHJvb3QoKS5zdHlsZSgpOwotICAg IGF1dG8mIGZvbnRNZXRyaWNzID0gcm9vdFN0eWxlLmZvbnRNZXRyaWNzKCk7Ci0gICAgSW5saW5l TGF5b3V0VW5pdCBsaW5lU3BhY2luZyA9IGZvbnRNZXRyaWNzLmxpbmVTcGFjaW5nKCk7Ci0gICAg YXV0byYgbGluZUJveCA9IGxpbmVDb250ZW50LmxpbmVCb3g7Ci0gICAgYXV0byBsaW5lTG9naWNh bEhlaWdodCA9IHJvb3RTdHlsZS5saW5lSGVpZ2h0KCkuaXNOZWdhdGl2ZSgpID8gc3RkOjptYXgo bGluZUJveC5sb2dpY2FsSGVpZ2h0KCksIGxpbmVTcGFjaW5nKSA6IHJvb3RTdHlsZS5jb21wdXRl ZExpbmVIZWlnaHQoKTsKLSAgICBhdXRvIGxvZ2ljYWxSZWN0ID0gRGlzcGxheTo6SW5saW5lUmVj dCB7IGxpbmVDb250ZW50LmxvZ2ljYWxUb3BMZWZ0LCBsaW5lQ29udGVudC5saW5lTG9naWNhbFdp ZHRoLCBsaW5lTG9naWNhbEhlaWdodH07CisgICAgYXV0byBsaW5lTG9naWNhbEhlaWdodCA9IElu bGluZUxheW91dFVuaXQgeyB9OworICAgIGlmIChyb290U3R5bGUubGluZUhlaWdodCgpLmlzTmVn YXRpdmUoKSkgeworICAgICAgICAvLyBOZWdhdGl2ZSBsaW5lIGhlaWdodCB2YWx1ZSBtZWFucyB0 aGUgbGluZSBoZWlnaHQgaXMgZHJpdmVuIGJ5IHRoZSBjb250ZW50LgorICAgICAgICBhdXRvIHVz ZWRMaW5lU3BhY2luZyA9IFsmXSB7CisgICAgICAgICAgICBhdXRvIGxpbmVCb3hMb2dpY2FsSGVp Z2h0ID0gbGluZUJveC5sb2dpY2FsSGVpZ2h0KCk7CisgICAgICAgICAgICBhdXRvIGxvZ2ljYWxU b3BXaXRoTGluZVNwYWNpbmcgPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKKyAgICAgICAgICAgIGF1 dG8gbG9naWNhbEJvdHRvbVdpdGhMaW5lU3BhY2luZyA9IGxpbmVCb3hMb2dpY2FsSGVpZ2h0Owor ICAgICAgICAgICAgZm9yIChhdXRvJiBpbmxpbmVCb3ggOiBsaW5lQm94LmlubGluZUJveExpc3Qo KSkgeworICAgICAgICAgICAgICAgIGlmIChhdXRvIGxpbmVTcGFjaW5nID0gaW5saW5lQm94LT5s aW5lU3BhY2luZygpKSB7CisgICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBjaGVjayBpZiBs aW5lIHNwYWNpbmcgaXMgZGlzdHJpYnV0ZWQgZXZlbmx5LgorICAgICAgICAgICAgICAgICAgICBs b2dpY2FsVG9wV2l0aExpbmVTcGFjaW5nID0gc3RkOjptaW4obG9naWNhbFRvcFdpdGhMaW5lU3Bh Y2luZywgaW5saW5lQm94LT5sb2dpY2FsVG9wKCkgLSAqbGluZVNwYWNpbmcgLyAyKTsKKyAgICAg ICAgICAgICAgICAgICAgbG9naWNhbEJvdHRvbVdpdGhMaW5lU3BhY2luZyA9IHN0ZDo6bWF4KGxv Z2ljYWxCb3R0b21XaXRoTGluZVNwYWNpbmcsIGlubGluZUJveC0+bG9naWNhbEJvdHRvbSgpICsg KmxpbmVTcGFjaW5nIC8gMik7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAg ICAgICAgICAgcmV0dXJuIC1sb2dpY2FsVG9wV2l0aExpbmVTcGFjaW5nICsgKGxvZ2ljYWxCb3R0 b21XaXRoTGluZVNwYWNpbmcgLSBsaW5lQm94TG9naWNhbEhlaWdodCk7CisgICAgICAgIH07Cisg ICAgICAgIGxpbmVMb2dpY2FsSGVpZ2h0ID0gbGluZUJveC5sb2dpY2FsSGVpZ2h0KCkgKyB1c2Vk TGluZVNwYWNpbmcoKTsKKyAgICB9IGVsc2UKKyAgICAgICAgbGluZUxvZ2ljYWxIZWlnaHQgPSBy b290U3R5bGUuY29tcHV0ZWRMaW5lSGVpZ2h0KCk7CiAKKyAgICBhdXRvIGxvZ2ljYWxSZWN0ID0g RGlzcGxheTo6SW5saW5lUmVjdCB7IGxpbmVDb250ZW50LmxvZ2ljYWxUb3BMZWZ0LCBsaW5lQ29u dGVudC5saW5lTG9naWNhbFdpZHRoLCBsaW5lTG9naWNhbEhlaWdodH07CiAgICAgYXV0byBoYWxm TGVhZGluZ09mZnNldCA9IFsmXSB7CisgICAgICAgIGF1dG8mIGZvbnRNZXRyaWNzID0gcm9vdFN0 eWxlLmZvbnRNZXRyaWNzKCk7CiAgICAgICAgIElubGluZUxheW91dFVuaXQgYXNjZW50ID0gZm9u dE1ldHJpY3MuYXNjZW50KCk7CiAgICAgICAgIElubGluZUxheW91dFVuaXQgZGVzY2VudCA9IGZv bnRNZXRyaWNzLmRlc2NlbnQoKTsKICAgICAgICAgLy8gMTAuOC4xIExlYWRpbmcgYW5kIGhhbGYt bGVhZGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQm94LmNwcAppbmRleCA1MGQ0ODFjY2YxNGQ3OTdiZmRlZDZmZDlhZjU4 ODAxMmY0MTg4OWIxLi45YTBhMDdkZDRiNGQ4MGE3ZTJiZWIzMzlhY2Y4YWUzMDNhMGE4M2JiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lQm94LmNwcApAQCAtMTY0LDYgKzE2NCw4IEBAIHZvaWQgTGluZUJveDo6Y29uc3Ry dWN0SW5saW5lQm94ZXMoY29uc3QgTGluZTo6UnVuTGlzdCYgcnVucykKICAgICAgICAgaW5saW5l Qm94LnNldExvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdodCk7CiAgICAgICAgIGlubGluZUJveC5z ZXRCYXNlbGluZShiYXNlbGluZSk7CiAgICAgICAgIGlubGluZUJveC5zZXREZXNjZW50KGxvZ2lj YWxIZWlnaHQgLSBiYXNlbGluZSk7CisgICAgICAgIGlmIChhdXRvIGxpbmVTcGFjaW5nID0gZm9u dE1ldHJpY3MubGluZVNwYWNpbmcoKSAtIGxvZ2ljYWxIZWlnaHQpCisgICAgICAgICAgICBpbmxp bmVCb3guc2V0TGluZVNwYWNpbmcobGluZVNwYWNpbmcpOwogICAgIH07CiAKICAgICBhdXRvIGNv bnN0cnVjdFJvb3RJbmxpbmVCb3ggPSBbJl0gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCmluZGV4IDQ5OGVjNjFiZmIy ZTY2OTJjYjc4NWM5MzExYmFmZGI3ZTA3ZTRmZTEuLjk3Zjg0YTU1MTU5MDFhNGQ0OTE4MTQxY2U0 NGIyNWQ3MGRiMDJlODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKQEAgLTc2LDYgKzc2LDcgQEAgcHVibGljOgog ICAgICAgICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX2lzRW1wdHk7IH0KICAgICAg ICAgdm9pZCBzZXRJc05vbkVtcHR5KCkgeyBtX2lzRW1wdHkgPSBmYWxzZTsgfQogCisgICAgICAg IE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGxpbmVTcGFjaW5nKCkgY29uc3QgeyByZXR1cm4g bV9saW5lU3BhY2luZzsgfQogICAgICAgICBjb25zdCBGb250TWV0cmljcyYgZm9udE1ldHJpY3Mo KSBjb25zdCB7IHJldHVybiBsYXlvdXRCb3goKS5zdHlsZSgpLmZvbnRNZXRyaWNzKCk7IH0KICAg ICAgICAgY29uc3QgQm94JiBsYXlvdXRCb3goKSBjb25zdCB7IHJldHVybiAqbV9sYXlvdXRCb3g7 IH0KIApAQCAtODcsMTEgKzg4LDEzIEBAIHB1YmxpYzoKICAgICAgICAgdm9pZCBzZXRMb2dpY2Fs SGVpZ2h0KElubGluZUxheW91dFVuaXQgbG9naWNhbEhlaWdodCkgeyBtX2xvZ2ljYWxSZWN0LnNl dEhlaWdodChsb2dpY2FsSGVpZ2h0KTsgfQogICAgICAgICB2b2lkIHNldEJhc2VsaW5lKElubGlu ZUxheW91dFVuaXQgYmFzZWxpbmUpIHsgbV9iYXNlbGluZSA9IGJhc2VsaW5lOyB9CiAgICAgICAg IHZvaWQgc2V0RGVzY2VudChJbmxpbmVMYXlvdXRVbml0IGRlc2NlbnQpIHsgbV9kZXNjZW50ID0g ZGVzY2VudDsgfQorICAgICAgICB2b2lkIHNldExpbmVTcGFjaW5nKElubGluZUxheW91dFVuaXQg bGluZVNwYWNpbmcpIHsgbV9saW5lU3BhY2luZyA9IGxpbmVTcGFjaW5nOyB9CiAKICAgICAgICAg V2Vha1B0cjxjb25zdCBCb3g+IG1fbGF5b3V0Qm94OwogICAgICAgICBEaXNwbGF5OjpJbmxpbmVS ZWN0IG1fbG9naWNhbFJlY3Q7CiAgICAgICAgIElubGluZUxheW91dFVuaXQgbV9iYXNlbGluZSB7 IDAgfTsKICAgICAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gbV9kZXNjZW50OworICAg ICAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBtX2xpbmVTcGFjaW5nOwogICAgICAgICBi b29sIG1faXNFbXB0eSB7IHRydWUgfTsKICAgICB9OwogCkBAIC0xMDksNiArMTEyLDkgQEAgcHVi bGljOgogICAgIGNvbnN0IElubGluZUJveCYgaW5saW5lQm94Rm9yTGF5b3V0Qm94KGNvbnN0IEJv eCYgbGF5b3V0Qm94KSBjb25zdCB7IHJldHVybiAqbV9pbmxpbmVCb3hSZWN0TWFwLmdldCgmbGF5 b3V0Qm94KTsgfQogICAgIERpc3BsYXk6OklubGluZVJlY3QgbG9naWNhbFJlY3RGb3JUZXh0UnVu KGNvbnN0IExpbmU6OlJ1biYpIGNvbnN0OwogCisgICAgdXNpbmcgSW5saW5lQm94TWFwID0gSGFz aE1hcDxjb25zdCBCb3gqLCBJbmxpbmVCb3gqPjsKKyAgICBhdXRvIGlubGluZUJveExpc3QoKSBj b25zdCB7IHJldHVybiBtX2lubGluZUJveFJlY3RNYXAudmFsdWVzKCk7IH0KKwogICAgIElubGlu ZUxheW91dFVuaXQgYWxpZ25tZW50QmFzZWxpbmUoKSBjb25zdCB7IHJldHVybiBtX3Jvb3RJbmxp bmVCb3gubG9naWNhbFRvcCgpICsgbV9yb290SW5saW5lQm94LmJhc2VsaW5lKCk7IH0KIAogcHJp dmF0ZToKQEAgLTEyOSw3ICsxMzUsNyBAQCBwcml2YXRlOgogICAgIElubGluZUJveCBtX3Jvb3RJ bmxpbmVCb3g7CiAKICAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBtX2hvcml6b250YWxB bGlnbm1lbnRPZmZzZXQ7Ci0gICAgSGFzaE1hcDxjb25zdCBCb3gqLCBJbmxpbmVCb3gqPiBtX2lu bGluZUJveFJlY3RNYXA7CisgICAgSW5saW5lQm94TWFwIG1faW5saW5lQm94UmVjdE1hcDsKICAg ICBWZWN0b3I8c3RkOjp1bmlxdWVfcHRyPElubGluZUJveD4+IG1faW5saW5lQm94TGlzdDsKICAg ICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDsKIH07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKaW5kZXggNzQ0ZTRmOGY3ZTVkMmJkODAwODAwN2ZiMzc2OTBjNDcxMzU4YTk1My4u MWIxZGVkNDY2YzM5OWZhNDU0YjgzOTI4YjYyMDA5ZTVkMWEyM2I1MCAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDIwLTA5LTEyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAg ICAgICAgW0xGQ11bSUZDXSBBZGQgc3VwcG9ydCBmb3Igbm9uLXJvb3QtaW5saW5lLWJveCBsaW5l IHNwYWNpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxNjQzMworCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAg ICogZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9pbmxpbmUtYm94LXdpdGgtbGluZS1zcGFj aW5nLXNpbXBsZS1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xheW91dGZv cm1hdHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0aC1saW5lLXNwYWNpbmctc2ltcGxlLmh0bWw6 IEFkZGVkLgorCiAyMDIwLTA5LTEyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAg ICAgICAgSW1wbGVtZW50IGxhenkgaWZyYW1lIGxvYWRpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvaW5saW5lLWJveC13aXRoLWxpbmUtc3Bh Y2luZy1zaW1wbGUtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0 dGluZ2NvbnRleHQvaW5saW5lLWJveC13aXRoLWxpbmUtc3BhY2luZy1zaW1wbGUtZXhwZWN0ZWQu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi4xNDUyN2Y2ZDA4MGIzYWVjMjgxZmE1MzFjNzBjZWMxZGU5MzNlMWE2 Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29u dGV4dC9pbmxpbmUtYm94LXdpdGgtbGluZS1zcGFjaW5nLXNpbXBsZS1leHBlY3RlZC5odG1sCkBA IC0wLDAgKzEsOCBAQAorPHN0eWxlPgorZGl2IHsKKyAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47 CisgIHdpZHRoOiA0MDBweDsKKyAgaGVpZ2h0OiA0NXB4OworfQorPC9zdHlsZT4KKzxkaXY+PC9k aXY+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0 L2lubGluZS1ib3gtd2l0aC1saW5lLXNwYWNpbmctc2ltcGxlLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L2lubGluZS1ib3gtd2l0aC1saW5lLXNwYWNpbmct c2ltcGxlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMWUxODQzZmU4MGRjM2IyZDZkMWNjZGEyZjY5YjJjNDY4 M2NmNjJkOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0 dGluZ2NvbnRleHQvaW5saW5lLWJveC13aXRoLWxpbmUtc3BhY2luZy1zaW1wbGUuaHRtbApAQCAt MCwwICsxLDEzIEBACis8c3R5bGU+CitkaXYgeworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsK KyAgd2lkdGg6IDQwMHB4OworfQorCitzcGFuIHsKKyAgZm9udC1mYW1pbHk6ICJIaXJhTWluUHJv Ti1XMyI7CisgIGZvbnQtc2l6ZTogMzBweDsKKyAgY29sb3I6IGdyZWVuOworfQorPC9zdHlsZT4K KzxkaXY+PHNwYW4+aW5saW5lIGJveCB3aXRoIGxpbmUgc3BhY2luZzwvc3Bhbj48L2Rpdj4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vd2luL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggY2U4MWYxMDZkMTNm OWQ4ZTAwODM4YmE5NmQyYzM4NmM5YmM4M2RjZC4uNWUyYjg4NjdhN2VjYjFkMTNkMWMwOWM0ODA3 MjU0MDZjOTNkMjFiOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1Rlc3RF eHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1Rlc3RFeHBlY3RhdGlv bnMKQEAgLTM2OTEsNiArMzY5MSw4IEBAIGh0dHAvd3B0L2ZldGNoL3Jlc3BvbnNlLXN0YXR1cy10 ZXh0Lmh0bWwgWyBGYWlsdXJlIF0KIGpzL2RvbS9idWlsdGluLWdldHRlci1uYW1lLmh0bWwgWyBG YWlsdXJlIF0KIGZhc3QvZm9ybXMvZmlsZS9lbnRyaWVzLWFwaS93ZWJraXRkaXJlY3Rvcnktb3Bl bi1wYW5lbC5odG1sIFsgU2tpcCBdCiAKK2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQgWyBT a2lwIF0KKwogIyBSZXF1aXJlcyBXSzIgbG9hZGluZyBzdXBwb3J0CiBodHRwL3dwdC9mZXRjaC9k bnQtaGVhZGVyLWFmdGVyLXJlZGlyZWN0aW9uLmh0bWwgWyBTa2lwIF0KIGh0dHAvd3B0L2ZldGNo L2luc3BlY3QtcHJlZmxpZ2h0Lmh0bWwgWyBTa2lwIF0KQEAgLTQ0NDUsOCArNDQ0Nyw2IEBAIHdl YmtpdC5vcmcvYi8yMDQ1NDUgc3ZnL2FzLWltYWdlL3N2Zy1uZXN0ZWQuaHRtbCBbIFBhc3MgVGlt ZW91dCBDcmFzaCBdCiAKIHdlYmtpdC5vcmcvYi8yMDQ3OTQgd2ViYW5pbWF0aW9ucy9hY2NlbGVy YXRlZC1hbmltYXRpb24tcmVtb3ZhbC11cG9uLXRyYW5zaXRpb24tY29tcGxldGlvbi5odG1sIFsg VGltZW91dCBdCiAKLXdlYmtpdC5vcmcvYi8yMDQ3OTUgZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29u dGV4dC9mbG93LWludGVncmF0aW9uLWJhc2ljLmh0bWwgWyBGYWlsdXJlIF0KLQogd2Via2l0Lm9y Zy9iLzIwNDk3NCBodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3N5bmMteGhyLWluLXVubG9hZC5o dG1sIFsgRmFpbHVyZSBdCiAKIHdlYmtpdC5vcmcvYi8yMDUyNzIganMvaW50ZWdlci1kaXZpc2lv bi1uZWcydG90aGUzMi1ieS1uZWcxLmh0bWwgWyBGYWlsdXJlIF0K