225860 2021-05-17 01:29:50 -0700 Fix grid aspect-ratio tests 2021-07-20 04:54:05 -0700 1 1 1 Unclassified WebKit CSS Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 47738 1 rbuis rbuis changseok clopez esprehn+autocc ews-watchlist glenn jfernandez kondapallykalyan pdr rego svillar webkit-bug-importer youennf zalan zsun oldest_to_newest 1760692 0 rbuis 2021-05-17 01:29:50 -0700 Fix grid-aspect-ratio-018+19.html. 1760693 1 428816 rbuis 2021-05-17 01:36:35 -0700 Created attachment 428816 Patch 1761135 2 428816 jfernandez 2021-05-18 06:22:51 -0700 Comment on attachment 428816 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428816&action=review > Source/WebCore/rendering/RenderBox.cpp:5163 > + if (isGridItem() && style().justifySelf().position() == ItemPosition::Stretch) I don't think this is correct. There are several other cases that we should consider to determine the grid item uses stretch alignment: 1- container: justify-items: stretch | normal; item: justify-self: auto | normal 2- container/item combination resolved to stretch, but width non-auto. Additionally, should we consider here the item's writing-mode, so that we check align-self property instead ? > Source/WebCore/rendering/RenderGrid.cpp:1870 > + if (isHorizontalWritingMode() == child.isHorizontalWritingMode() && child.style().alignSelf().position() != ItemPosition::Stretch) { ditto > Source/WebCore/rendering/RenderGrid.cpp:1891 > + } else if (child.style().alignSelf().position() != ItemPosition::Stretch) { ditto 1763060 3 webkit-bug-importer 2021-05-24 01:30:16 -0700 <rdar://problem/78390550> 1774732 4 432866 rbuis 2021-07-04 11:58:38 -0700 Created attachment 432866 Patch 1777746 5 433747 rbuis 2021-07-18 02:14:30 -0700 Created attachment 433747 Patch 1777747 6 ews-watchlist 2021-07-18 02:15:15 -0700 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1777835 7 433777 rbuis 2021-07-19 02:01:58 -0700 Created attachment 433777 Patch 1777857 8 433786 rbuis 2021-07-19 06:16:20 -0700 Created attachment 433786 Patch 1777870 9 433791 rbuis 2021-07-19 08:22:24 -0700 Created attachment 433791 Patch 1778020 10 433791 jfernandez 2021-07-19 15:23:48 -0700 Comment on attachment 433791 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433791&action=review > Source/WebCore/rendering/RenderBox.cpp:2791 > + auto itemPosition = stretchingMode == StretchingMode::Any ? containingBlock->selfAlignmentNormalBehavior(this) : ItemPosition::Normal; Is this variable name accurate ? Shouldn't be something like "normal behavior" ? > Source/WebCore/rendering/RenderGrid.cpp:1140 > + // interested in explicit stretch, not normal behavior. No need to wrap line in this comment. > Source/WebCore/rendering/RenderGrid.cpp:1141 > + bool hasExplicitInlineStretch = child.style().resolvedJustifySelf(&style(), ItemPosition::Normal).position() == ItemPosition::Stretch; Now that we have this StretchingMode enumg, wouldn't be better to use it in the alignSelfForChild to determine the proper normal-behavior ? > Source/WebCore/rendering/RenderGrid.cpp:1142 > + bool hasExplicitBlockStretch = child.style().resolvedAlignSelf(&style(), ItemPosition::Normal).position() == ItemPosition::Stretch; ditto > Source/WebCore/rendering/RenderGrid.cpp:1144 > + std::swap(hasExplicitInlineStretch, hasExplicitBlockStretch); Perhaps we could avoid this swatch if we use the blockFlowIsColumnAxis before, so that inline is associated to justify or align, and viceversa. > Source/WebCore/rendering/RenderGrid.cpp:1145 > + if (hasExplicitInlineStretch && hasExplicitBlockStretch) Couldn't these 3 clause be simplified like this ? return hasExplicitInlineStretch ? hasExplicitBlockStretc : !hasExplicitBlockStretch; > Source/WebCore/rendering/RenderGrid.cpp:1887 > + if (isHorizontalWritingMode() == child.isHorizontalWritingMode() && child.style().alignSelf().position() != ItemPosition::Stretch) { Why we don't need to consider align-self: auto here ? > Source/WebCore/rendering/RenderGrid.cpp:1891 > + } else if (child.style().justifySelf().position() != ItemPosition::Stretch) { ditto > Source/WebCore/rendering/RenderGrid.cpp:1903 > + if (isHorizontalWritingMode() == child.isHorizontalWritingMode() && child.style().justifySelf().position() != ItemPosition::Stretch) { ditto > Source/WebCore/rendering/RenderGrid.cpp:1908 > + } else if (child.style().alignSelf().position() != ItemPosition::Stretch) { ditto 1778108 11 433855 rbuis 2021-07-20 01:04:40 -0700 Created attachment 433855 Patch 1778114 12 433791 rbuis 2021-07-20 01:32:00 -0700 Comment on attachment 433791 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433791&action=review >> Source/WebCore/rendering/RenderBox.cpp:2791 >> + auto itemPosition = stretchingMode == StretchingMode::Any ? containingBlock->selfAlignmentNormalBehavior(this) : ItemPosition::Normal; > > Is this variable name accurate ? Shouldn't be something like "normal behavior" ? Yes, I had to improve it too in my chromium patch, done. >> Source/WebCore/rendering/RenderGrid.cpp:1140 >> + // interested in explicit stretch, not normal behavior. > > No need to wrap line in this comment. I think we can remove this comment, but point taken (this happens when applying chromium patches :)) >> Source/WebCore/rendering/RenderGrid.cpp:1141 >> + bool hasExplicitInlineStretch = child.style().resolvedJustifySelf(&style(), ItemPosition::Normal).position() == ItemPosition::Stretch; > > Now that we have this StretchingMode enumg, wouldn't be better to use it in the alignSelfForChild to determine the proper normal-behavior ? Done. >> Source/WebCore/rendering/RenderGrid.cpp:1142 >> + bool hasExplicitBlockStretch = child.style().resolvedAlignSelf(&style(), ItemPosition::Normal).position() == ItemPosition::Stretch; > > ditto Done. >> Source/WebCore/rendering/RenderGrid.cpp:1144 >> + std::swap(hasExplicitInlineStretch, hasExplicitBlockStretch); > > Perhaps we could avoid this swatch if we use the blockFlowIsColumnAxis before, so that inline is associated to justify or align, and viceversa. I think row/columns and writing-mode needs more tests which could result in removing the swap, but I prefer to do that in a future patch. >> Source/WebCore/rendering/RenderGrid.cpp:1145 >> + if (hasExplicitInlineStretch && hasExplicitBlockStretch) > > Couldn't these 3 clause be simplified like this ? > return hasExplicitInlineStretch ? hasExplicitBlockStretc : !hasExplicitBlockStretch; Looks like it can be simplified way more, now that I wrote down the combinations. >> Source/WebCore/rendering/RenderGrid.cpp:1887 >> + if (isHorizontalWritingMode() == child.isHorizontalWritingMode() && child.style().alignSelf().position() != ItemPosition::Stretch) { > > Why we don't need to consider align-self: auto here ? I think this one boils down to more testing needed. I left a FIXME to indicate we should work on this more. >> Source/WebCore/rendering/RenderGrid.cpp:1891 >> + } else if (child.style().justifySelf().position() != ItemPosition::Stretch) { > > ditto Done. >> Source/WebCore/rendering/RenderGrid.cpp:1903 >> + if (isHorizontalWritingMode() == child.isHorizontalWritingMode() && child.style().justifySelf().position() != ItemPosition::Stretch) { > > ditto Done. >> Source/WebCore/rendering/RenderGrid.cpp:1908 >> + } else if (child.style().alignSelf().position() != ItemPosition::Stretch) { > > ditto Done. 1778128 13 433855 jfernandez 2021-07-20 02:59:29 -0700 Comment on attachment 433855 Patch r=me 1778135 14 ews-feeder 2021-07-20 03:39:08 -0700 Committed r280075 (239801@main): <https://commits.webkit.org/239801@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 433855. 1778150 15 zsun 2021-07-20 04:54:05 -0700 *** Bug 227293 has been marked as a duplicate of this bug. *** 428816 2021-05-17 01:36:35 -0700 2021-07-04 11:58:32 -0700 Patch bug-225860-20210517103633.patch text/plain 6625 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzI0OGQzZjY4MjIwMTIy Zjc5MWVjYjBiNjdjZjA2ZTUyMzI0ZGRiNS4uNDFmYTRmOGIyYTg3OWEyYzMzMjFhYzRmNjIzNzNl YTQwM2VkNjM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA1LTE3ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGdyaWQtYXNwZWN0LXJhdGlv LTAxOCsxOS5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjU4NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBEbyBub3QgYXBwbHkgYXNwZWN0IHJhdGlvIGlmIHdlIGhhdmUgc3RyZXRjaCBhbGlnbm1l bnQ6CisgICAgICAgIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZ3JpZC8jZ3JpZC1pdGVt LXNpemluZworCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0 aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Db2x1bW5BeGlzIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Sb3dBeGlzIGNvbnN0KToK KwogMjAyMS0wNS0xNiAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAg U3VwcG9ydCBzZXJpYWxpemluZyBJbWFnZURhdGEgb2JqZWN0IGNvbG9yU3BhY2UgcHJvcGVydHkg aW4gU2VyaWFsaXplZFNjcmlwdFZhbHVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCmluZGV4IDZhYTU0YjRkMDFlMzgwZDc3NTFiOWU0ZjMwZTk5NmRhYTNkNDcwNGIuLmQxZDBh ZGQ4MjM0OWVmOGFlZjc3MTQ2ZWYyMmY2MjIyNTlmMmQzN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwCkBAIC01MTYwLDYgKzUxNjAsOSBAQCBib29sIFJlbmRlckJveDo6 c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgaWYg KHNob3VsZElnbm9yZUFzcGVjdFJhdGlvKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAg IGlmIChpc0dyaWRJdGVtKCkgJiYgc3R5bGUoKS5qdXN0aWZ5U2VsZigpLnBvc2l0aW9uKCkgPT0g SXRlbVBvc2l0aW9uOjpTdHJldGNoKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBhdXRv IGlzUmVzb2x2YWJsZVBlcmNlbnRhZ2VIZWlnaHQgPSBbJl0gewogICAgICAgICByZXR1cm4gc3R5 bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgKGlzT3V0T2ZG bG93UG9zaXRpb25lZCgpIHx8IHBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkp OwogICAgIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3Jp ZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5kZXggNjZi ZWVkZDIxMWRiMDM2YzRiMDM5M2FkMmU2NjU2NWM3MGZmNGFlOC4uZDkxODIwODA5MDRkM2IyNWQ2 NzQ0YzNjZTIwY2I3M2E3OGYzMjEwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckdyaWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJH cmlkLmNwcApAQCAtMTg2NywxMSArMTg2NywxMSBAQCBjb25zdCBjaGFyKiBSZW5kZXJHcmlkOjpy ZW5kZXJOYW1lKCkgY29uc3QKIGJvb2wgUmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJbkNvbHVtbkF4 aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsKICAgICBpZiAoY2hpbGQuc3R5bGUo KS5oYXNBc3BlY3RSYXRpbygpKSB7Ci0gICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9k ZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgaWYgKGlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSAmJiBjaGlsZC5zdHlsZSgpLmFsaWduU2VsZigpLnBvc2l0aW9uKCkgIT0gSXRlbVBvc2l0aW9u OjpTdHJldGNoKSB7CiAgICAgICAgICAgICAvLyBBIG5vbi1hdXRvIGlubGluZSBzaXplIG1lYW5z IHRoZSBzYW1lIGZvciBibG9jayBzaXplIChjb2x1bW4gYXhpcyBzaXplKSBiZWNhdXNlIG9mIHRo ZSBhc3BlY3QgcmF0aW8uCiAgICAgICAgICAgICBpZiAoIWNoaWxkLnN0eWxlKCkubG9naWNhbFdp ZHRoKCkuaXNBdXRvKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9 IGVsc2UgeworICAgICAgICB9IGVsc2UgaWYgKGNoaWxkLnN0eWxlKCkuanVzdGlmeVNlbGYoKS5w b3NpdGlvbigpICE9IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkgewogICAgICAgICAgICAgY29uc3Qg TGVuZ3RoJiBsb2dpY2FsSGVpZ2h0ID0gY2hpbGQuc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7CiAg ICAgICAgICAgICBpZiAobG9naWNhbEhlaWdodC5pc0ZpeGVkKCkgfHwgKGxvZ2ljYWxIZWlnaHQu aXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgY2hpbGQucGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJ c1Jlc29sdmFibGUoKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTg4Mywx MiArMTg4MywxMiBAQCBib29sIFJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Db2x1bW5BeGlzKGNv bnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiBib29sIFJlbmRlckdyaWQ6Omhhc0F1dG9TaXpl SW5Sb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7CiAgICAgaWYgKGNoaWxk LnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgewotICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3Jp dGluZ01vZGUoKSA9PSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7CisgICAgICAg IGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlKCkgJiYgY2hpbGQuc3R5bGUoKS5qdXN0aWZ5U2VsZigpLnBvc2l0aW9uKCkgIT0gSXRl bVBvc2l0aW9uOjpTdHJldGNoKSB7CiAgICAgICAgICAgICAvLyBBIG5vbi1hdXRvIGJsb2NrIHNp emUgbWVhbnMgdGhlIHNhbWUgZm9yIGlubGluZSBzaXplIChyb3cgYXhpcyBzaXplKSBiZWNhdXNl IG9mIHRoZSBhc3BlY3QgcmF0aW8uCiAgICAgICAgICAgICBjb25zdCBMZW5ndGgmIGxvZ2ljYWxI ZWlnaHQgPSBjaGlsZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgICAgIGlmIChs b2dpY2FsSGVpZ2h0LmlzRml4ZWQoKSB8fCAobG9naWNhbEhlaWdodC5pc1BlcmNlbnRPckNhbGN1 bGF0ZWQoKSAmJiBjaGlsZC5wZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKSkK ICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0gZWxzZSB7CisgICAgICAg IH0gZWxzZSBpZiAoY2hpbGQuc3R5bGUoKS5hbGlnblNlbGYoKS5wb3NpdGlvbigpICE9IEl0ZW1Q b3NpdGlvbjo6U3RyZXRjaCkgewogICAgICAgICAgICAgaWYgKCFjaGlsZC5zdHlsZSgpLmxvZ2lj YWxXaWR0aCgpLmlzQXV0bygpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAg ICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDJiMDYyYmNiNmM5YTM0YTc4YTVlODg3NjVjYzc2Y2NjYmY0YjM1ZGQuLjhi N2I1MDhlMGZmYTlhZWJlMDU5ZTlmYzQwMzJmMjMzNTJhODhlZmMgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NCBAQAorMjAyMS0wNS0xNyAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAg IEZpeCBncmlkLWFzcGVjdC1yYXRpby0wMTgrMTkuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1ODYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVW5za2lwIHRlc3RzIHRoYXQgbm93IHBhc3MuCisK KyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA1LTE2ICBDYW1lcm9uIE1jQ29y bWFjayAgPGhleWNhbUBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBNYXRoTUwgV1BUcyB3YWl0 IGZvciBhbGwgZm9udCBsb2FkcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0 aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggY2Y4ZThjMmQ5YmYxMDk5 ZTZhMzg0NWNhNDVlNjE2ZDc3NGE1MGJkYS4uYjk0ZDUzNzY4MzUzYmU5MTExZjEyZjQ0ZTNmM2Rl YzU5OTUwOTQ1MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysg Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDU5LDggKzQ0NTksNiBAQCB3ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y YXRpby0wMjIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVj dC1yYXRpby0wMTkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2 MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMjAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzNC5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCkBAIC00OTIyLDQgKzQ5MjAsNCBAQCB3ZWJraXQub3Jn L2IvMjA4OTg4IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2VieHIveHJXZWJHTExh eWVyX2ZyYW1lYnVmZgogd2Via2l0Lm9yZy9iLzIwODk4OCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL3dlYnhyL3hyV2ViR0xMYXllcl9vcGFxdWVfZnJhbWVidWZmZXIuaHR0cHMuaHRt bCBbIFNraXAgXQogd2Via2l0Lm9yZy9iLzIwODk4OCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3dlYnhyL3hyU3RhdGlvbmFyeVJlZmVyZW5jZVNwYWNlX2Zsb29ybGV2ZWxfdXBkYXRl cy5odHRwcy5odG1sIFsgU2tpcCBdCiB3ZWJraXQub3JnL2IvMjA4OTg4IGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvd2VieHIveHJTZXNzaW9uX2NhbmNlbEFuaW1hdGlvbkZyYW1lX2lu dmFsaWRoYW5kbGUuaHR0cHMuaHRtbCBbIFNraXAgXQotd2Via2l0Lm9yZy9iLzIwODk4OCBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYnhyL3hyV2ViR0xMYXllcl9vcGFxdWVfZnJh bWVidWZmZXJfc3RlbmNpbC5odHRwcy5odG1sIFsgU2tpcCBdClwgTm8gbmV3bGluZSBhdCBlbmQg b2YgZmlsZQord2Via2l0Lm9yZy9iLzIwODk4OCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL3dlYnhyL3hyV2ViR0xMYXllcl9vcGFxdWVfZnJhbWVidWZmZXJfc3RlbmNpbC5odHRwcy5o dG1sIFsgU2tpcCBdCg== 432866 2021-07-04 11:58:38 -0700 2021-07-18 02:14:25 -0700 Patch bug-225860-20210704205836.patch text/plain 6926 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjNhYmFkOTNhNzJjYjk3 ZTA5ZjIzNmRkZDZhYjk5YjQxYzM0ZDIzYy4uMjliZjdjN2RiODgxZDk4MjQ2OTM1MDgxM2UyNzdi NTdmMmU0NWY4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA3LTA0ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGdyaWQtYXNwZWN0LXJhdGlv LTAxOCsxOS5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjU4NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBEbyBub3QgYXBwbHkgYXNwZWN0IHJhdGlvIGlmIHdlIGhhdmUgc3RyZXRjaCBhbGlnbm1l bnQ6CisgICAgICAgIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZ3JpZC8jZ3JpZC1pdGVt LXNpemluZworCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0 aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Db2x1bW5BeGlzIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Sb3dBeGlzIGNvbnN0KToK KwogMjAyMS0wNy0wNCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBXZWJBdWRpbyBhdXRvLXBsYXkgcG9saWN5IHNob3VsZCBjb21lIGZyb20gdG9wIGRv Y3VtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDY4OWIxN2Rj MDgwZWViNTUwYTJhYjc0ODZiZmI4N2VjOGNhOTg0ZjEuLjJiN2Q1ZWQ5YzNiNmQyMWI5ZGQzYmMx Yzg3MzM1YWE1YTViMGMzN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CkBAIC01MjUyLDYgKzUyNTIsOSBAQCBib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgaWYgKHNob3VsZElnbm9yZUFzcGVj dFJhdGlvKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGlmIChpc0dyaWRJdGVtKCkg JiYgc3R5bGUoKS5qdXN0aWZ5U2VsZigpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJl dGNoKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBhdXRvIGlzUmVzb2x2YWJsZVBlcmNl bnRhZ2VIZWlnaHQgPSBbJl0gewogICAgICAgICByZXR1cm4gc3R5bGUoKS5sb2dpY2FsSGVpZ2h0 KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgKGlzT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8 IHBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpOwogICAgIH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5kZXggOWUwMDdmOGRkYjcwZDgwNWYwZjFj ZmUwZWFiZmRiMjdjYjhlNjE1Ni4uYTZlMDYyYWZmNjIxOGIyMDNhNTliZDhiMDc1MzFlYWM3NzJl YTYzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApAQCAtMTg2Nywx MSArMTg2NywxMSBAQCBjb25zdCBjaGFyKiBSZW5kZXJHcmlkOjpyZW5kZXJOYW1lKCkgY29uc3QK IGJvb2wgUmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94 JiBjaGlsZCkgY29uc3QKIHsKICAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygp KSB7Ci0gICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdN b2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAmJiBjaGlsZC5zdHlsZSgp LmFsaWduU2VsZigpLnBvc2l0aW9uKCkgIT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoKSB7CiAgICAg ICAgICAgICAvLyBBIG5vbi1hdXRvIGlubGluZSBzaXplIG1lYW5zIHRoZSBzYW1lIGZvciBibG9j ayBzaXplIChjb2x1bW4gYXhpcyBzaXplKSBiZWNhdXNlIG9mIHRoZSBhc3BlY3QgcmF0aW8uCiAg ICAgICAgICAgICBpZiAoIWNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9IGVsc2UgeworICAgICAgICB9 IGVsc2UgaWYgKGNoaWxkLnN0eWxlKCkuanVzdGlmeVNlbGYoKS5wb3NpdGlvbigpICE9IEl0ZW1Q b3NpdGlvbjo6U3RyZXRjaCkgewogICAgICAgICAgICAgY29uc3QgTGVuZ3RoJiBsb2dpY2FsSGVp Z2h0ID0gY2hpbGQuc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7CiAgICAgICAgICAgICBpZiAobG9n aWNhbEhlaWdodC5pc0ZpeGVkKCkgfHwgKGxvZ2ljYWxIZWlnaHQuaXNQZXJjZW50T3JDYWxjdWxh dGVkKCkgJiYgY2hpbGQucGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSkpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTg4MywxMiArMTg4MywxMiBAQCBib29s IFJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Db2x1bW5BeGlzKGNvbnN0IFJlbmRlckJveCYgY2hp bGQpIGNvbnN0CiBib29sIFJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Sb3dBeGlzKGNvbnN0IFJl bmRlckJveCYgY2hpbGQpIGNvbnN0CiB7CiAgICAgaWYgKGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0 UmF0aW8oKSkgewotICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBjaGls ZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7CisgICAgICAgIGlmIChpc0hvcml6b250YWxX cml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgJiYgY2hpbGQu c3R5bGUoKS5qdXN0aWZ5U2VsZigpLnBvc2l0aW9uKCkgIT0gSXRlbVBvc2l0aW9uOjpTdHJldGNo KSB7CiAgICAgICAgICAgICAvLyBBIG5vbi1hdXRvIGJsb2NrIHNpemUgbWVhbnMgdGhlIHNhbWUg Zm9yIGlubGluZSBzaXplIChyb3cgYXhpcyBzaXplKSBiZWNhdXNlIG9mIHRoZSBhc3BlY3QgcmF0 aW8uCiAgICAgICAgICAgICBjb25zdCBMZW5ndGgmIGxvZ2ljYWxIZWlnaHQgPSBjaGlsZC5zdHls ZSgpLmxvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0LmlzRml4 ZWQoKSB8fCAobG9naWNhbEhlaWdodC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiBjaGlsZC5w ZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKSkKICAgICAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0gZWxzZSB7CisgICAgICAgIH0gZWxzZSBpZiAoY2hpbGQu c3R5bGUoKS5hbGlnblNlbGYoKS5wb3NpdGlvbigpICE9IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkg ewogICAgICAgICAgICAgaWYgKCFjaGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygp KQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGQwMzY3 OWYzNzgxZGFmM2RjOWQ3ZjkwNmIyMzc4MzlkMjNlMjFkMDEuLmI0NTk1YTA5N2QyMWVmZmEwYTE5 ZmU3NzExMmQ5YjlhZjE5OTExMDQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wNy0wNCAg Um9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBncmlkLWFzcGVjdC1y YXRpby0wMTgrMTkuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI1ODYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVW5za2lwIHRlc3RzIHRoYXQgbm93IHBhc3MuCisKKyAgICAgICAgKiBUZXN0RXhw ZWN0YXRpb25zOgorCiAyMDIxLTA3LTA0ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAK ICAgICAgICAgUmVzeW5jIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8gZnJvbSB1cHN0cmVhbQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0 aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMjViMTFjNzhkMWE4ZTJj MDI2OWNhNTk3NzE0OTUwZTRhOWE3NWMyNy4uMDBlNjBhZTA3ZGY5MzNmMDVlYzc2ZDk5ZjUwMmIy ZTI1NzRhYzQ4OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysg Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NjI4LDE2ICs0NjI4LDggQEAgd2Vi a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt cmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE4Lmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3Bl Y3QtcmF0aW8tMDE5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDMwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDMxLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDMy Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1h c3BlY3QtcmF0aW8tMDMzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM1Lmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8t MDM2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3Jp ZC1hc3BlY3QtcmF0aW8tMDM3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzQuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9zZWxlY3QtZWxlbWVudC0w MDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo= 433747 2021-07-18 02:14:30 -0700 2021-07-19 02:01:53 -0700 Patch bug-225860-20210718111428.patch text/plain 18159 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTQ1NjU0MWU0NGNjNjRl MjQ1NmE0MWFmODMyYmUyZWJmN2NlZTc3My4uMjg4MTg1N2JiNzFmODZkOGJhOTg3N2Q3ZjdmZmRk MzY1MTE3Zjk4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTA3LTE4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGdyaWQtYXNwZWN0LXJhdGlv LTAxOCsxOS5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjU4NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBEbyBub3QgYXBwbHkgYXNwZWN0IHJhdGlvIGlmIHdlIGhhdmUgZXhwbGljaXQgc3RyZXRj aGluZzoKKyAgICAgICAgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1ncmlkLyNncmlkLWl0 ZW0tc2l6aW5nCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJveDo6aGFzU3RyZXRjaGVkTG9naWNhbEhlaWdodCBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Omhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJHcmlkOjphc3BlY3RSYXRpb1ByZWZlcnNJbmxpbmUpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyR3JpZDo6YXBwbHlTdHJldGNoQWxpZ25tZW50VG9DaGlsZElmTmVlZGVkKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Db2x1bW5BeGlzIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Sb3dBeGlzIGNv bnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5oOgorCiAyMDIxLTA3LTE2ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIGdldEJvdW5k aW5nQ2xpZW50UmVjdCgpIHJldHVybnMgdGhlIGluY29ycmVjdCByZWN0YW5nbGUgb24gZWxlbWVu dHMgd2hvc2UgcGFyZW50IGVsZW1lbnQgaXMgc2V0IC13ZWJraXQtY29sdW1uLWNvdW50CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDBmZjIxOGZlNjYzZDVkYTJkZGY2 OTU4NWEwMzFlMGU0ZDJmOWJlYTguLjExYTU0MjQ2MTlmMjhlMThiYTliZWE1NmI1NzU1MjExNDI3 Njk4ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0yNzYwLDcg KzI3NjAsMjQgQEAgYm9vbCBSZW5kZXJCb3g6OmlzU3RyZXRjaGluZ0NvbHVtbkZsZXhJdGVtKCkg Y29uc3QKIH0KIAogLy8gRklYTUU6IENhbi9TaG91bGQgd2UgbW92ZSB0aGlzIGluc2lkZSBzcGVj aWZpYyBsYXlvdXQgY2xhc3NlcyAoZmxleC4gZ3JpZCk/IENhbiB3ZSByZWZhY3RvciBjb2x1bW5G bGV4SXRlbUhhc1N0cmV0Y2hBbGlnbm1lbnQgbG9naWM/Ci1ib29sIFJlbmRlckJveDo6aGFzU3Ry ZXRjaGVkTG9naWNhbFdpZHRoKCkgY29uc3QKK2Jvb2wgUmVuZGVyQm94OjpoYXNTdHJldGNoZWRM b2dpY2FsSGVpZ2h0KCkgY29uc3QKK3sKKyAgICBhdXRvJiBzdHlsZSA9IHRoaXMtPnN0eWxlKCk7 CisgICAgaWYgKCFzdHlsZS5sb2dpY2FsSGVpZ2h0KCkuaXNBdXRvKCkgfHwgc3R5bGUubWFyZ2lu QmVmb3JlKCkuaXNBdXRvKCkgfHwgc3R5bGUubWFyZ2luQWZ0ZXIoKS5pc0F1dG8oKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIFJlbmRlckJsb2NrKiBjb250YWluaW5nQmxvY2sgPSB0aGlz LT5jb250YWluaW5nQmxvY2soKTsKKyAgICBpZiAoIWNvbnRhaW5pbmdCbG9jaykgeworICAgICAg ICAvLyBXZSBhcmUgZXZhbHVhdGluZyBhbGlnbi1zZWxmL2p1c3RpZnktc2VsZiwgd2hpY2ggZGVm YXVsdCB0byAnbm9ybWFsJyBmb3IgdGhlIHJvb3QgZWxlbWVudC4KKyAgICAgICAgLy8gVGhlICdu b3JtYWwnIHZhbHVlIGJlaGF2ZXMgbGlrZSAnc3RhcnQnIGV4Y2VwdCBmb3IgRmxleGJveCBJdGVt cywgd2hpY2ggb2J2aW91c2x5IHNob3VsZCBoYXZlIGEgY29udGFpbmVyLgorICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgfQorICAgIGlmIChjb250YWluaW5nQmxvY2stPmlzSG9yaXpvbnRhbFdy aXRpbmdNb2RlKCkgIT0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKKyAgICAgICAgcmV0dXJu IHN0eWxlLnJlc29sdmVkSnVzdGlmeVNlbGYoJmNvbnRhaW5pbmdCbG9jay0+c3R5bGUoKSwgY29u dGFpbmluZ0Jsb2NrLT5zZWxmQWxpZ25tZW50Tm9ybWFsQmVoYXZpb3IodGhpcykpLnBvc2l0aW9u KCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoOworICAgIHJldHVybiBzdHlsZS5yZXNvbHZlZEFs aWduU2VsZigmY29udGFpbmluZ0Jsb2NrLT5zdHlsZSgpLCBjb250YWluaW5nQmxvY2stPnNlbGZB bGlnbm1lbnROb3JtYWxCZWhhdmlvcih0aGlzKSkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246 OlN0cmV0Y2g7Cit9CisKKy8vIEZJWE1FOiBDYW4vU2hvdWxkIHdlIG1vdmUgdGhpcyBpbnNpZGUg c3BlY2lmaWMgbGF5b3V0IGNsYXNzZXMgKGZsZXguIGdyaWQpPyBDYW4gd2UgcmVmYWN0b3IgY29s dW1uRmxleEl0ZW1IYXNTdHJldGNoQWxpZ25tZW50IGxvZ2ljPworYm9vbCBSZW5kZXJCb3g6Omhh c1N0cmV0Y2hlZExvZ2ljYWxXaWR0aChib29sIGV4cGxpY2l0U3RyZXRjaGluZykgY29uc3QKIHsK ICAgICBhdXRvJiBzdHlsZSA9IHRoaXMtPnN0eWxlKCk7CiAgICAgaWYgKCFzdHlsZS5sb2dpY2Fs V2lkdGgoKS5pc0F1dG8oKSB8fCBzdHlsZS5tYXJnaW5TdGFydCgpLmlzQXV0bygpIHx8IHN0eWxl Lm1hcmdpbkVuZCgpLmlzQXV0bygpKQpAQCAtMjc3Miw4ICsyNzg5LDggQEAgYm9vbCBSZW5kZXJC b3g6Omhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICB9CiAgICAgaWYgKGNvbnRhaW5pbmdCbG9jay0+aXNIb3Jpem9udGFsV3JpdGluZ01v ZGUoKSAhPSBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpKQotICAgICAgICByZXR1cm4gc3R5bGUu cmVzb2x2ZWRBbGlnblNlbGYoJmNvbnRhaW5pbmdCbG9jay0+c3R5bGUoKSwgY29udGFpbmluZ0Js b2NrLT5zZWxmQWxpZ25tZW50Tm9ybWFsQmVoYXZpb3IodGhpcykpLnBvc2l0aW9uKCkgPT0gSXRl bVBvc2l0aW9uOjpTdHJldGNoOwotICAgIHJldHVybiBzdHlsZS5yZXNvbHZlZEp1c3RpZnlTZWxm KCZjb250YWluaW5nQmxvY2stPnN0eWxlKCksIGNvbnRhaW5pbmdCbG9jay0+c2VsZkFsaWdubWVu dE5vcm1hbEJlaGF2aW9yKHRoaXMpKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlvbjo6U3RyZXRj aDsKKyAgICAgICAgcmV0dXJuIHN0eWxlLnJlc29sdmVkQWxpZ25TZWxmKCZjb250YWluaW5nQmxv Y2stPnN0eWxlKCksIGV4cGxpY2l0U3RyZXRjaGluZyA/IEl0ZW1Qb3NpdGlvbjo6Tm9ybWFsIDog Y29udGFpbmluZ0Jsb2NrLT5zZWxmQWxpZ25tZW50Tm9ybWFsQmVoYXZpb3IodGhpcykpLnBvc2l0 aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoOworICAgIHJldHVybiBzdHlsZS5yZXNvbHZl ZEp1c3RpZnlTZWxmKCZjb250YWluaW5nQmxvY2stPnN0eWxlKCksIGV4cGxpY2l0U3RyZXRjaGlu ZyA/IEl0ZW1Qb3NpdGlvbjo6Tm9ybWFsOiBjb250YWluaW5nQmxvY2stPnNlbGZBbGlnbm1lbnRO b3JtYWxCZWhhdmlvcih0aGlzKSkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2g7 CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpzaXplc0xvZ2ljYWxXaWR0aFRvRml0Q29udGVudChTaXpl VHlwZSB3aWR0aFR5cGUpIGNvbnN0CkBAIC01MjUxLDYgKzUyNjgsMTQgQEAgYm9vbCBSZW5kZXJC b3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdAogICAg IGlmIChzaG91bGRJZ25vcmVBc3BlY3RSYXRpbygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK KyAgICBpZiAoaXNHcmlkSXRlbSgpKSB7CisgICAgICAgIGlmIChzaG91bGRDb21wdXRlU2l6ZUFz UmVwbGFjZWQoKSkgeworICAgICAgICAgICAgaWYgKGhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgp ICYmIGhhc1N0cmV0Y2hlZExvZ2ljYWxIZWlnaHQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgIH0gZWxzZSBpZiAoaGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKHRydWUp KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKwogICAgIGF1dG8gaXNSZXNvbHZh YmxlUGVyY2VudGFnZUhlaWdodCA9IFsmXSB7CiAgICAgICAgIHJldHVybiBzdHlsZSgpLmxvZ2lj YWxIZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiAoaXNPdXRPZkZsb3dQb3NpdGlv bmVkKCkgfHwgcGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CiAgICAgfTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCA0MDhlZDFhM2Q0NDNiMDZkM2U1 MWMxYmMxNTZhZWY5ODk2OWExMTcwLi4wNmJhYzQzMGYxZWUzOTJmMTMyNTg0ZjQxMTU4YTAyNjgw MGU5NTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC00MzYsNyArNDM2 LDggQEAgb3ZlcnJpZGU7CiAgICAgLy8gb2YgYSBjb250YWluaW5nIGJsb2NrKS4gIEhUTUw0IGJ1 dHRvbnMsIDxzZWxlY3Q+cywgPGlucHV0PnMsIGxlZ2VuZHMsIGFuZCBmbG9hdGluZy9jb21wYWN0 IGVsZW1lbnRzIGRvIHRoaXMuCiAgICAgYm9vbCBzaXplc0xvZ2ljYWxXaWR0aFRvRml0Q29udGVu dChTaXplVHlwZSkgY29uc3Q7CiAKLSAgICBib29sIGhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgp IGNvbnN0OworICAgIGJvb2wgaGFzU3RyZXRjaGVkTG9naWNhbEhlaWdodCgpIGNvbnN0OworICAg IGJvb2wgaGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKGJvb2wgPSBmYWxzZSkgY29uc3Q7CiAgICAg Ym9vbCBpc1N0cmV0Y2hpbmdDb2x1bW5GbGV4SXRlbSgpIGNvbnN0OwogICAgIGJvb2wgY29sdW1u RmxleEl0ZW1IYXNTdHJldGNoQWxpZ25tZW50KCkgY29uc3Q7CiAgICAgCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5kZXggOWUwMDdmOGRkYjcwZDgwNWYwZjFjZmUwZWFi ZmRiMjdjYjhlNjE1Ni4uYTdlMTU4ZTg4OWJmZmE1ODY5Mzg1ZTIyYWIzYWE5YzllOWY4YjRjOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApAQCAtMTEzMiw2ICsxMTMy LDIzIEBAIFN0eWxlU2VsZkFsaWdubWVudERhdGEgUmVuZGVyR3JpZDo6anVzdGlmeVNlbGZGb3JD aGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBjCiAgICAgcmV0dXJuIGNoaWxkLnN0eWxlKCku cmVzb2x2ZWRKdXN0aWZ5U2VsZihncmlkU3R5bGUsIHNlbGZBbGlnbm1lbnROb3JtYWxCZWhhdmlv cigmY2hpbGQpKTsKIH0KIAorYm9vbCBSZW5kZXJHcmlkOjphc3BlY3RSYXRpb1ByZWZlcnNJbmxp bmUoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgYm9vbCBibG9ja0Zsb3dJc0NvbHVtbkF4aXMpCit7 CisgICAgaWYgKCFjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICAvLyBOb3QgdXNpbmcgQWxpZ25TZWxmRm9yQ2hpbGQvSnVzdGlmeVNlbGZG b3JDaGlsZCBoZXJlIHNpbmNlIHdlIGFyZSBvbmx5CisgICAgLy8gaW50ZXJlc3RlZCBpbiBleHBs aWNpdCBzdHJldGNoLCBub3Qgbm9ybWFsIGJlaGF2aW9yLgorICAgIGJvb2wgaGFzRXhwbGljaXRJ bmxpbmVTdHJldGNoID0gY2hpbGQuc3R5bGUoKS5yZXNvbHZlZEp1c3RpZnlTZWxmKCZzdHlsZSgp LCBJdGVtUG9zaXRpb246Ok5vcm1hbCkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0 Y2g7CisgICAgYm9vbCBoYXNFeHBsaWNpdEJsb2NrU3RyZXRjaCA9IGNoaWxkLnN0eWxlKCkucmVz b2x2ZWRBbGlnblNlbGYoJnN0eWxlKCksIEl0ZW1Qb3NpdGlvbjo6Tm9ybWFsKS5wb3NpdGlvbigp ID09IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaDsKKyAgICBpZiAoIWJsb2NrRmxvd0lzQ29sdW1uQXhp cykKKyAgICAgICAgc3RkOjpzd2FwKGhhc0V4cGxpY2l0SW5saW5lU3RyZXRjaCwgaGFzRXhwbGlj aXRCbG9ja1N0cmV0Y2gpOworICAgIGlmIChoYXNFeHBsaWNpdElubGluZVN0cmV0Y2ggJiYgaGFz RXhwbGljaXRCbG9ja1N0cmV0Y2gpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoaGFz RXhwbGljaXRJbmxpbmVTdHJldGNoKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4g IWhhc0V4cGxpY2l0QmxvY2tTdHJldGNoOworfQorCiAvLyBGSVhNRTogVGhpcyBsb2dpYyBpcyBz aGFyZWQgYnkgUmVuZGVyRmxleGlibGVCb3gsIHNvIGl0IHNob3VsZCBiZSBtb3ZlZCB0byBSZW5k ZXJCb3guCiB2b2lkIFJlbmRlckdyaWQ6OmFwcGx5U3RyZXRjaEFsaWdubWVudFRvQ2hpbGRJZk5l ZWRlZChSZW5kZXJCb3gmIGNoaWxkKQogewpAQCAtMTE0NCw3ICsxMTYxLDcgQEAgdm9pZCBSZW5k ZXJHcmlkOjphcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkSWZOZWVkZWQoUmVuZGVyQm94JiBj aGlsZCkKICAgICBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gY2hpbGRCbG9ja0RpcmVjdGlvbiA9 IEdyaWRMYXlvdXRGdW5jdGlvbnM6OmZsb3dBd2FyZURpcmVjdGlvbkZvckNoaWxkKCp0aGlzLCBj aGlsZCwgRm9yUm93cyk7CiAgICAgYm9vbCBibG9ja0Zsb3dJc0NvbHVtbkF4aXMgPSBjaGlsZEJs b2NrRGlyZWN0aW9uID09IEZvclJvd3M7CiAgICAgYm9vbCBhbGxvd2VkVG9TdHJldGNoQ2hpbGRC bG9ja1NpemUgPSBibG9ja0Zsb3dJc0NvbHVtbkF4aXMgPyBhbGxvd2VkVG9TdHJldGNoQ2hpbGRB bG9uZ0NvbHVtbkF4aXMoY2hpbGQpIDogYWxsb3dlZFRvU3RyZXRjaENoaWxkQWxvbmdSb3dBeGlz KGNoaWxkKTsKLSAgICBpZiAoYWxsb3dlZFRvU3RyZXRjaENoaWxkQmxvY2tTaXplKSB7CisgICAg aWYgKGFsbG93ZWRUb1N0cmV0Y2hDaGlsZEJsb2NrU2l6ZSAmJiAhYXNwZWN0UmF0aW9QcmVmZXJz SW5saW5lKGNoaWxkLCBibG9ja0Zsb3dJc0NvbHVtbkF4aXMpKSB7CiAgICAgICAgIExheW91dFVu aXQgc3RyZXRjaGVkTG9naWNhbEhlaWdodCA9IGF2YWlsYWJsZUFsaWdubWVudFNwYWNlRm9yQ2hp bGRCZWZvcmVTdHJldGNoaW5nKEdyaWRMYXlvdXRGdW5jdGlvbnM6Om92ZXJyaWRpbmdDb250YWlu aW5nQmxvY2tDb250ZW50U2l6ZUZvckNoaWxkKGNoaWxkLCBjaGlsZEJsb2NrRGlyZWN0aW9uKS52 YWx1ZSgpLCBjaGlsZCk7CiAgICAgICAgIExheW91dFVuaXQgZGVzaXJlZExvZ2ljYWxIZWlnaHQg PSBjaGlsZC5jb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoc3RyZXRjaGVkTG9naWNhbEhl aWdodCwgc3RkOjpudWxsb3B0KTsKICAgICAgICAgY2hpbGQuc2V0T3ZlcnJpZGluZ0xvZ2ljYWxI ZWlnaHQoZGVzaXJlZExvZ2ljYWxIZWlnaHQpOwpAQCAtMTg2NywxMSArMTg4NCwxMSBAQCBjb25z dCBjaGFyKiBSZW5kZXJHcmlkOjpyZW5kZXJOYW1lKCkgY29uc3QKIGJvb2wgUmVuZGVyR3JpZDo6 aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsK ICAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7Ci0gICAgICAgIGlmIChp c0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2Rl KCkpIHsKKyAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNI b3Jpem9udGFsV3JpdGluZ01vZGUoKSAmJiBjaGlsZC5zdHlsZSgpLmFsaWduU2VsZigpLnBvc2l0 aW9uKCkgIT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoKSB7CiAgICAgICAgICAgICAvLyBBIG5vbi1h dXRvIGlubGluZSBzaXplIG1lYW5zIHRoZSBzYW1lIGZvciBibG9jayBzaXplIChjb2x1bW4gYXhp cyBzaXplKSBiZWNhdXNlIG9mIHRoZSBhc3BlY3QgcmF0aW8uCiAgICAgICAgICAgICBpZiAoIWNo aWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkpCiAgICAgICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwotICAgICAgICB9IGVsc2UgeworICAgICAgICB9IGVsc2UgaWYgKGNoaWxkLnN0 eWxlKCkuanVzdGlmeVNlbGYoKS5wb3NpdGlvbigpICE9IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkg ewogICAgICAgICAgICAgY29uc3QgTGVuZ3RoJiBsb2dpY2FsSGVpZ2h0ID0gY2hpbGQuc3R5bGUo KS5sb2dpY2FsSGVpZ2h0KCk7CiAgICAgICAgICAgICBpZiAobG9naWNhbEhlaWdodC5pc0ZpeGVk KCkgfHwgKGxvZ2ljYWxIZWlnaHQuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgY2hpbGQucGVy Y2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSkpCiAgICAgICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwpAQCAtMTg4MywxMiArMTkwMCwxMiBAQCBib29sIFJlbmRlckdyaWQ6Omhhc0F1 dG9TaXplSW5Db2x1bW5BeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiBib29sIFJl bmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Sb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNv bnN0CiB7CiAgICAgaWYgKGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgewotICAgICAg ICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBjaGlsZC5pc0hvcml6b250YWxXcml0 aW5nTW9kZSgpKSB7CisgICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNo aWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgJiYgY2hpbGQuc3R5bGUoKS5qdXN0aWZ5U2Vs ZigpLnBvc2l0aW9uKCkgIT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoKSB7CiAgICAgICAgICAgICAv LyBBIG5vbi1hdXRvIGJsb2NrIHNpemUgbWVhbnMgdGhlIHNhbWUgZm9yIGlubGluZSBzaXplIChy b3cgYXhpcyBzaXplKSBiZWNhdXNlIG9mIHRoZSBhc3BlY3QgcmF0aW8uCiAgICAgICAgICAgICBj b25zdCBMZW5ndGgmIGxvZ2ljYWxIZWlnaHQgPSBjaGlsZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQo KTsKICAgICAgICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0LmlzRml4ZWQoKSB8fCAobG9naWNhbEhl aWdodC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiBjaGlsZC5wZXJjZW50YWdlTG9naWNhbEhl aWdodElzUmVzb2x2YWJsZSgpKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg ICAgIH0gZWxzZSB7CisgICAgICAgIH0gZWxzZSBpZiAoY2hpbGQuc3R5bGUoKS5hbGlnblNlbGYo KS5wb3NpdGlvbigpICE9IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkgewogICAgICAgICAgICAgaWYg KCFjaGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpKQogICAgICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICAgICAgfQpAQCAtMTg5Niw0ICsxOTEzLDYgQEAgYm9vbCBSZW5k ZXJHcmlkOjpoYXNBdXRvU2l6ZUluUm93QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25z dAogICAgIHJldHVybiBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY2hpbGQuc3R5bGUoKS53 aWR0aCgpLmlzQXV0bygpIDogY2hpbGQuc3R5bGUoKS5oZWlnaHQoKS5pc0F1dG8oKTsKIH0KIAor CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3Jp ZC5oCmluZGV4IDhjMTExMTIzZjkzOGEzOWZlZmQ0YzgzMDk0ZjQ5YjZlM2MyOTJjMmIuLmU3MTI5 NTNmYWNkNmQ5ZTFmMGMwNmZlZTQyNzM0MDI1ZTc5ZDAxN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckdyaWQuaApAQCAtMTg4LDYgKzE4OCw4IEBAIHByaXZhdGU6CiAKICAgICBib29s IHNob3VsZFJlc2V0TG9naWNhbEhlaWdodEJlZm9yZUxheW91dCgpIGNvbnN0IG92ZXJyaWRlIHsg cmV0dXJuIHRydWU7IH0KIAorICAgIGJvb2wgYXNwZWN0UmF0aW9QcmVmZXJzSW5saW5lKGNvbnN0 IFJlbmRlckJveCYgY2hpbGQsIGJvb2wgYmxvY2tGbG93SXNDb2x1bW5BeGlzKTsKKwogICAgIEdy aWQgbV9ncmlkOwogCiAgICAgR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtIG1fdHJhY2tTaXppbmdB bGdvcml0aG07CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggMWVmM2QzOWU0NWU4NjIxYTI0NDE4N2EzZDQ3OTFlY2MyZTBjYTE3 ZC4uZDFkYjRjMTc1MWIyZGYxNmRkMjBjNDZiMmIzMDg1YmFiMWRlZWI0NSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDIxLTA3LTE4ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAg ICAgICAgRml4IGdyaWQtYXNwZWN0LXJhdGlvLTAxOCsxOS5odG1sCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU4NjAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVbnNraXAgdGVzdHMgdGhhdCBub3cgcGFz cy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDctMTYgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgZ2V0Qm91bmRpbmdDbGll bnRSZWN0KCkgcmV0dXJucyB0aGUgaW5jb3JyZWN0IHJlY3RhbmdsZSBvbiBlbGVtZW50cyB3aG9z ZSBwYXJlbnQgZWxlbWVudCBpcyBzZXQgLXdlYmtpdC1jb2x1bW4tY291bnQKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2MvQ2hhbmdlTG9nCmluZGV4IDg1Y2I3MzA2ZmZiZTA5YWFlMzI1YTRhY2ExYWUzNGI3YjE5 NjMzOTMuLjdmMTZhYTRkMDViMGM5ZjJjYzgwNDc5NDAxZTMwZGUzOWY0ZjFmY2IgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA3LTE4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGdyaWQtYXNwZWN0LXJhdGlv LTAxOCsxOS5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjU4NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3Jp ZC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWw6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRtbDoKKwog MjAyMS0wNy0xNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIElt cGxlbWVudCAnU3VibWl0RXZlbnQnIGludGVyZmFjZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv VGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggODEw YTU1ZWUzNzNiNmE2NTUwODVjYmQ3YzBlMTIwMmEyZTI5MTUzYi4uOWI1MDNmMmMyNzllMDdlYjA2 ZmIzODIxNzc0ZTJmMjE1ZDJjZGQwYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVj dGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0xNDM0LDggKzE0 MzQsNiBAQCB3ZWJraXQub3JnL2IvMjE2MTQ2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLQogd2Via2l0Lm9yZy9iLzIxNjE0NiBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1i YXNlbGluZS1qdXN0aWZ5LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvcmVwbGFjZWQtYWxp Z25tZW50LXdpdGgtYXNwZWN0LXJhdGlvLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvcmVw bGFjZWQtYWxpZ25tZW50LXdpdGgtYXNwZWN0LXJhdGlvLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCi1pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGln bm1lbnQvcmVwbGFjZWQtYWxpZ25tZW50LXdpdGgtYXNwZWN0LXJhdGlvLTAwNC5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCi1pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt Z3JpZC9hbGlnbm1lbnQvcmVwbGFjZWQtYWxpZ25tZW50LXdpdGgtYXNwZWN0LXJhdGlvLTAwNS5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvcmVwbGFjZWQtYWxpZ25tZW50LXdpdGgtYXNwZWN0LXJh dGlvLTAwNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvcmVwbGFjZWQtYWxpZ25tZW50LXdpdGgt YXNwZWN0LXJhdGlvLTAwNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvcmVwbGFjZWQtYWxpZ25t ZW50LXdpdGgtYXNwZWN0LXJhdGlvLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCkBAIC00 NzM2LDE3ICs0NzM0LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t MDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3Jp ZC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDMwLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0 aW8tMDMxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v Z3JpZC1hc3BlY3QtcmF0aW8tMDMyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDMzLmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM0Lmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3Qt cmF0aW8tMDM1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM3Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM4Lmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQt ZWxlbWVudC0wMzQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2 MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby9zZWxlY3QtZWxlbWVudC0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS0wMDEuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1h c3BlY3QtcmF0aW8tMDE4Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0w MTguaHRtbAppbmRleCA3NmZkNmQ5Njk0NGEyMGM3YTQ5ZjllMThlMTUyNDE2OWY0ZTQwYTcxLi5k MGI0OTZlMjUwMzUyOTg0N2JiZjkxZmY4YjBkNDk1NjVhYmMxODkyIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbAorKysgYi9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbApAQCAtMTcsNiArMTcsOSBAQAogPHA+VGVzdCBw YXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJl ZDwvc3Ryb25nPi48L3A+CiAKIDxkaXYgaWQ9InJlZmVyZW5jZS1vdmVybGFwcGVkLXJlZCI+PC9k aXY+Ci08ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEw MHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDEwMHB4OyI+Ci0gIDxkaXYgc3R5bGU9ImhlaWdodDog MTAwcHg7IGFzcGVjdC1yYXRpbzogMS8yOyBqdXN0aWZ5LXNlbGY6IHN0cmV0Y2g7IGJhY2tncm91 bmQ6IGdyZWVuOyI+PC9kaXY+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBs YXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDUwcHg7Ij4KKyAgPGRpdiBz dHlsZT0iaGVpZ2h0OiA1MHB4OyBhc3BlY3QtcmF0aW86IDEvMjsganVzdGlmeS1zZWxmOiBzdHJl dGNoOyBiYWNrZ3JvdW5kOiBncmVlbjsiPjwvZGl2PgorPC9kaXY+Cis8ZGl2IHN0eWxlPSJkaXNw bGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJv d3M6IDUwcHg7anVzdGlmeS1pdGVtczogc3RyZXRjaCI+CisgIDxkaXYgc3R5bGU9ImhlaWdodDog NTBweDsgYXNwZWN0LXJhdGlvOiAxLzI7IGp1c3RpZnktc2VsZjogYXV0bzsgYmFja2dyb3VuZDog Z3JlZW47Ij48L2Rpdj4KIDwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1h c3BlY3QtcmF0aW8tMDE5Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0w MTkuaHRtbAppbmRleCA0NjViMzk5NDlmYjI2ZWY5NWY2ZTcxMTdmN2Q1OTliOGY4MmZmYTY4Li5i ZjljMzUzODY2ZjczZDIxZTUwYWNhNTBlZDU5ZGViY2VlYmZmYzUwIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRtbApAQCAtMTcsNiArMTcsOSBAQAogPHA+VGVzdCBw YXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJl ZDwvc3Ryb25nPi48L3A+CiAKIDxkaXYgaWQ9InJlZmVyZW5jZS1vdmVybGFwcGVkLXJlZCI+PC9k aXY+Ci08ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEw MHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDEwMHB4OyI+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBn cmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDUw cHg7Ij4KICAgPGRpdiBzdHlsZT0id2lkdGg6IDEwMHB4OyBhc3BlY3QtcmF0aW86IDIvMTsgYWxp Z24tc2VsZjogc3RyZXRjaDsgYmFja2dyb3VuZDogZ3JlZW47Ij48L2Rpdj4KIDwvZGl2PgorPGRp diBzdHlsZT0iZGlzcGxheTogZ3JpZDsgZ3JpZC10ZW1wbGF0ZS1jb2x1bW5zOiAxMDBweDsgZ3Jp ZC10ZW1wbGF0ZS1yb3dzOiA1MHB4OyBhbGlnbi1pdGVtczogc3RyZXRjaCI+CisgIDxkaXYgc3R5 bGU9IndpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAyLzE7IGFsaWduLXNlbGY6IGF1dG87IGJh Y2tncm91bmQ6IGdyZWVuOyI+PC9kaXY+Cis8L2Rpdj4K 433777 2021-07-19 02:01:58 -0700 2021-07-19 06:16:15 -0700 Patch bug-225860-20210719110156.patch text/plain 16137 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M0YTFlMGQ5N2E0OTJl MzFhYzEwZjk4ZmIxODBlYmVlMGQxZWQwNy4uNTgxOTBiNTBiZTE1MjQwZjU2MjIxYmRlMTVmNTkx MmEwMDQ1ZWFjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTA3LTE5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGdyaWQtYXNwZWN0LXJhdGlv LTAxOCsxOS5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjU4NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBEbyBub3QgYXBwbHkgYXNwZWN0IHJhdGlvIGlmIHdlIGhhdmUgZXhwbGljaXQgc3RyZXRj aGluZzoKKyAgICAgICAgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1ncmlkLyNncmlkLWl0 ZW0tc2l6aW5nCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJveDo6aGFzU3RyZXRjaGVkTG9naWNhbEhlaWdodCBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6Omhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJHcmlkOjphc3BlY3RSYXRpb1ByZWZlcnNJbmxpbmUpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyR3JpZDo6YXBwbHlTdHJldGNoQWxpZ25tZW50VG9DaGlsZElmTmVlZGVkKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Db2x1bW5BeGlzIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Sb3dBeGlzIGNv bnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5oOgorCiAyMDIxLTA3LTE5ICBa aXJhbiBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0NTUy1ncmlkXSBJZ25vcmUg dGhlIGFzcGVjdC1yYXRpbyBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgaWYgc3RyZXRjaCBhbGlnbm1l bnRzIGFyZSBhcHBsaWVkIHRvIGJvdGggYXhlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmNwcAppbmRleCAwYWMwZjEzM2IzZjNmYTY0YzYwNzJlYTE1MDUyNjVkM2RlMzcyOWQ1Li5i ZGJmMjVlNDliNmM0MGRmNzdkZTBmNDg5NzE3NDYzODJmNDU2NmVjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMjc3Nyw3ICsyNzc3LDcgQEAgYm9vbCBSZW5kZXJC b3g6Omhhc1N0cmV0Y2hlZExvZ2ljYWxIZWlnaHQoKSBjb25zdAogfQogCiAvLyBGSVhNRTogQ2Fu L1Nob3VsZCB3ZSBtb3ZlIHRoaXMgaW5zaWRlIHNwZWNpZmljIGxheW91dCBjbGFzc2VzIChmbGV4 LiBncmlkKT8gQ2FuIHdlIHJlZmFjdG9yIGNvbHVtbkZsZXhJdGVtSGFzU3RyZXRjaEFsaWdubWVu dCBsb2dpYz8KLWJvb2wgUmVuZGVyQm94OjpoYXNTdHJldGNoZWRMb2dpY2FsV2lkdGgoKSBjb25z dAorYm9vbCBSZW5kZXJCb3g6Omhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aChTdHJldGNoaW5nTW9k ZSBzdHJldGNoaW5nTW9kZSkgY29uc3QKIHsKICAgICBhdXRvJiBzdHlsZSA9IHRoaXMtPnN0eWxl KCk7CiAgICAgaWYgKCFzdHlsZS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSB8fCBzdHlsZS5tYXJn aW5TdGFydCgpLmlzQXV0bygpIHx8IHN0eWxlLm1hcmdpbkVuZCgpLmlzQXV0bygpKQpAQCAtMjc4 OCw5ICsyNzg4LDEwIEBAIGJvb2wgUmVuZGVyQm94OjpoYXNTdHJldGNoZWRMb2dpY2FsV2lkdGgo KSBjb25zdAogICAgICAgICAvLyBUaGUgJ25vcm1hbCcgdmFsdWUgYmVoYXZlcyBsaWtlICdzdGFy dCcgZXhjZXB0IGZvciBGbGV4Ym94IEl0ZW1zLCB3aGljaCBvYnZpb3VzbHkgc2hvdWxkIGhhdmUg YSBjb250YWluZXIuCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CisgICAgYXV0byBpdGVt UG9zaXRpb24gPSBzdHJldGNoaW5nTW9kZSA9PSBTdHJldGNoaW5nTW9kZTo6QW55ID8gY29udGFp bmluZ0Jsb2NrLT5zZWxmQWxpZ25tZW50Tm9ybWFsQmVoYXZpb3IodGhpcykgOiBJdGVtUG9zaXRp b246Ok5vcm1hbDsKICAgICBpZiAoY29udGFpbmluZ0Jsb2NrLT5pc0hvcml6b250YWxXcml0aW5n TW9kZSgpICE9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCi0gICAgICAgIHJldHVybiBzdHls ZS5yZXNvbHZlZEFsaWduU2VsZigmY29udGFpbmluZ0Jsb2NrLT5zdHlsZSgpLCBjb250YWluaW5n QmxvY2stPnNlbGZBbGlnbm1lbnROb3JtYWxCZWhhdmlvcih0aGlzKSkucG9zaXRpb24oKSA9PSBJ dGVtUG9zaXRpb246OlN0cmV0Y2g7Ci0gICAgcmV0dXJuIHN0eWxlLnJlc29sdmVkSnVzdGlmeVNl bGYoJmNvbnRhaW5pbmdCbG9jay0+c3R5bGUoKSwgY29udGFpbmluZ0Jsb2NrLT5zZWxmQWxpZ25t ZW50Tm9ybWFsQmVoYXZpb3IodGhpcykpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJl dGNoOworICAgICAgICByZXR1cm4gc3R5bGUucmVzb2x2ZWRBbGlnblNlbGYoJmNvbnRhaW5pbmdC bG9jay0+c3R5bGUoKSwgaXRlbVBvc2l0aW9uKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlvbjo6 U3RyZXRjaDsKKyAgICByZXR1cm4gc3R5bGUucmVzb2x2ZWRKdXN0aWZ5U2VsZigmY29udGFpbmlu Z0Jsb2NrLT5zdHlsZSgpLCBpdGVtUG9zaXRpb24pLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9u OjpTdHJldGNoOwogfQogCiBib29sIFJlbmRlckJveDo6c2l6ZXNMb2dpY2FsV2lkdGhUb0ZpdENv bnRlbnQoU2l6ZVR5cGUgd2lkdGhUeXBlKSBjb25zdApAQCAtNTI2OCw4ICs1MjY5LDEzIEBAIGJv b2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkg Y29uc3QKICAgICBpZiAoc2hvdWxkSWdub3JlQXNwZWN0UmF0aW8oKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCi0gICAgaWYgKGlzR3JpZEl0ZW0oKSAmJiBzaG91bGRDb21wdXRlU2l6ZUFzUmVw bGFjZWQoKSAmJiBoYXNTdHJldGNoZWRMb2dpY2FsV2lkdGgoKSAmJiBoYXNTdHJldGNoZWRMb2dp Y2FsSGVpZ2h0KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoaXNHcmlkSXRlbSgp KSB7CisgICAgICAgIGlmIChzaG91bGRDb21wdXRlU2l6ZUFzUmVwbGFjZWQoKSkgeworICAgICAg ICAgICAgaWYgKGhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpICYmIGhhc1N0cmV0Y2hlZExvZ2lj YWxIZWlnaHQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0gZWxz ZSBpZiAoaGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKFN0cmV0Y2hpbmdNb2RlOjpFeHBsaWNpdCkp CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogCiAgICAgYXV0byBpc1Jlc29sdmFi bGVQZXJjZW50YWdlSGVpZ2h0ID0gWyZdIHsKICAgICAgICAgcmV0dXJuIHN0eWxlKCkubG9naWNh bEhlaWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIChpc091dE9mRmxvd1Bvc2l0aW9u ZWQoKSB8fCBwZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCA3NzE4YTRhZGE4MmM5ZjFlN2JiZDQ3M2E5YzQx MTNkNWJlYjc1MjRlLi41NzlhOWE0NmRhYzRiZGViZTFkZTZlMDlmMzk0MGYwNzg3YjliYjQzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC00MzcsNyArNDM3LDggQEAgb3Zl cnJpZGU7CiAgICAgYm9vbCBzaXplc0xvZ2ljYWxXaWR0aFRvRml0Q29udGVudChTaXplVHlwZSkg Y29uc3Q7CiAKICAgICBib29sIGhhc1N0cmV0Y2hlZExvZ2ljYWxIZWlnaHQoKSBjb25zdDsKLSAg ICBib29sIGhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpIGNvbnN0OworICAgIGVudW0gY2xhc3Mg U3RyZXRjaGluZ01vZGUgeyBBbnksIEV4cGxpY2l0IH07CisgICAgYm9vbCBoYXNTdHJldGNoZWRM b2dpY2FsV2lkdGgoU3RyZXRjaGluZ01vZGUgPSBTdHJldGNoaW5nTW9kZTo6QW55KSBjb25zdDsK ICAgICBib29sIGlzU3RyZXRjaGluZ0NvbHVtbkZsZXhJdGVtKCkgY29uc3Q7CiAgICAgYm9vbCBj b2x1bW5GbGV4SXRlbUhhc1N0cmV0Y2hBbGlnbm1lbnQoKSBjb25zdDsKICAgICAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAppbmRleCA5ZTAwN2Y4ZGRiNzBkODA1ZjBmMWNm ZTBlYWJmZGIyN2NiOGU2MTU2Li5hN2UxNThlODg5YmZmYTU4NjkzODVlMjJhYjNhYTljOWU5Zjhi NGM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC0xMTMyLDYg KzExMzIsMjMgQEAgU3R5bGVTZWxmQWxpZ25tZW50RGF0YSBSZW5kZXJHcmlkOjpqdXN0aWZ5U2Vs ZkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIGMKICAgICByZXR1cm4gY2hpbGQuc3R5 bGUoKS5yZXNvbHZlZEp1c3RpZnlTZWxmKGdyaWRTdHlsZSwgc2VsZkFsaWdubWVudE5vcm1hbEJl aGF2aW9yKCZjaGlsZCkpOwogfQogCitib29sIFJlbmRlckdyaWQ6OmFzcGVjdFJhdGlvUHJlZmVy c0lubGluZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBib29sIGJsb2NrRmxvd0lzQ29sdW1uQXhp cykKK3sKKyAgICBpZiAoIWNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworICAgIC8vIE5vdCB1c2luZyBBbGlnblNlbGZGb3JDaGlsZC9KdXN0aWZ5 U2VsZkZvckNoaWxkIGhlcmUgc2luY2Ugd2UgYXJlIG9ubHkKKyAgICAvLyBpbnRlcmVzdGVkIGlu IGV4cGxpY2l0IHN0cmV0Y2gsIG5vdCBub3JtYWwgYmVoYXZpb3IuCisgICAgYm9vbCBoYXNFeHBs aWNpdElubGluZVN0cmV0Y2ggPSBjaGlsZC5zdHlsZSgpLnJlc29sdmVkSnVzdGlmeVNlbGYoJnN0 eWxlKCksIEl0ZW1Qb3NpdGlvbjo6Tm9ybWFsKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlvbjo6 U3RyZXRjaDsKKyAgICBib29sIGhhc0V4cGxpY2l0QmxvY2tTdHJldGNoID0gY2hpbGQuc3R5bGUo KS5yZXNvbHZlZEFsaWduU2VsZigmc3R5bGUoKSwgSXRlbVBvc2l0aW9uOjpOb3JtYWwpLnBvc2l0 aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoOworICAgIGlmICghYmxvY2tGbG93SXNDb2x1 bW5BeGlzKQorICAgICAgICBzdGQ6OnN3YXAoaGFzRXhwbGljaXRJbmxpbmVTdHJldGNoLCBoYXNF eHBsaWNpdEJsb2NrU3RyZXRjaCk7CisgICAgaWYgKGhhc0V4cGxpY2l0SW5saW5lU3RyZXRjaCAm JiBoYXNFeHBsaWNpdEJsb2NrU3RyZXRjaCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlm IChoYXNFeHBsaWNpdElubGluZVN0cmV0Y2gpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIHJl dHVybiAhaGFzRXhwbGljaXRCbG9ja1N0cmV0Y2g7Cit9CisKIC8vIEZJWE1FOiBUaGlzIGxvZ2lj IGlzIHNoYXJlZCBieSBSZW5kZXJGbGV4aWJsZUJveCwgc28gaXQgc2hvdWxkIGJlIG1vdmVkIHRv IFJlbmRlckJveC4KIHZvaWQgUmVuZGVyR3JpZDo6YXBwbHlTdHJldGNoQWxpZ25tZW50VG9DaGls ZElmTmVlZGVkKFJlbmRlckJveCYgY2hpbGQpCiB7CkBAIC0xMTQ0LDcgKzExNjEsNyBAQCB2b2lk IFJlbmRlckdyaWQ6OmFwcGx5U3RyZXRjaEFsaWdubWVudFRvQ2hpbGRJZk5lZWRlZChSZW5kZXJC b3gmIGNoaWxkKQogICAgIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBjaGlsZEJsb2NrRGlyZWN0 aW9uID0gR3JpZExheW91dEZ1bmN0aW9uczo6Zmxvd0F3YXJlRGlyZWN0aW9uRm9yQ2hpbGQoKnRo aXMsIGNoaWxkLCBGb3JSb3dzKTsKICAgICBib29sIGJsb2NrRmxvd0lzQ29sdW1uQXhpcyA9IGNo aWxkQmxvY2tEaXJlY3Rpb24gPT0gRm9yUm93czsKICAgICBib29sIGFsbG93ZWRUb1N0cmV0Y2hD aGlsZEJsb2NrU2l6ZSA9IGJsb2NrRmxvd0lzQ29sdW1uQXhpcyA/IGFsbG93ZWRUb1N0cmV0Y2hD aGlsZEFsb25nQ29sdW1uQXhpcyhjaGlsZCkgOiBhbGxvd2VkVG9TdHJldGNoQ2hpbGRBbG9uZ1Jv d0F4aXMoY2hpbGQpOwotICAgIGlmIChhbGxvd2VkVG9TdHJldGNoQ2hpbGRCbG9ja1NpemUpIHsK KyAgICBpZiAoYWxsb3dlZFRvU3RyZXRjaENoaWxkQmxvY2tTaXplICYmICFhc3BlY3RSYXRpb1By ZWZlcnNJbmxpbmUoY2hpbGQsIGJsb2NrRmxvd0lzQ29sdW1uQXhpcykpIHsKICAgICAgICAgTGF5 b3V0VW5pdCBzdHJldGNoZWRMb2dpY2FsSGVpZ2h0ID0gYXZhaWxhYmxlQWxpZ25tZW50U3BhY2VG b3JDaGlsZEJlZm9yZVN0cmV0Y2hpbmcoR3JpZExheW91dEZ1bmN0aW9uczo6b3ZlcnJpZGluZ0Nv bnRhaW5pbmdCbG9ja0NvbnRlbnRTaXplRm9yQ2hpbGQoY2hpbGQsIGNoaWxkQmxvY2tEaXJlY3Rp b24pLnZhbHVlKCksIGNoaWxkKTsKICAgICAgICAgTGF5b3V0VW5pdCBkZXNpcmVkTG9naWNhbEhl aWdodCA9IGNoaWxkLmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChzdHJldGNoZWRMb2dp Y2FsSGVpZ2h0LCBzdGQ6Om51bGxvcHQpOwogICAgICAgICBjaGlsZC5zZXRPdmVycmlkaW5nTG9n aWNhbEhlaWdodChkZXNpcmVkTG9naWNhbEhlaWdodCk7CkBAIC0xODY3LDExICsxODg0LDExIEBA IGNvbnN0IGNoYXIqIFJlbmRlckdyaWQ6OnJlbmRlck5hbWUoKSBjb25zdAogYm9vbCBSZW5kZXJH cmlkOjpoYXNBdXRvU2l6ZUluQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25z dAogewogICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKLSAgICAgICAg aWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGlu Z01vZGUoKSkgeworICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBjaGls ZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICYmIGNoaWxkLnN0eWxlKCkuYWxpZ25TZWxmKCku cG9zaXRpb24oKSAhPSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKICAgICAgICAgICAgIC8vIEEg bm9uLWF1dG8gaW5saW5lIHNpemUgbWVhbnMgdGhlIHNhbWUgZm9yIGJsb2NrIHNpemUgKGNvbHVt biBheGlzIHNpemUpIGJlY2F1c2Ugb2YgdGhlIGFzcGVjdCByYXRpby4KICAgICAgICAgICAgIGlm ICghY2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSkKICAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0gZWxzZSB7CisgICAgICAgIH0gZWxzZSBpZiAoY2hp bGQuc3R5bGUoKS5qdXN0aWZ5U2VsZigpLnBvc2l0aW9uKCkgIT0gSXRlbVBvc2l0aW9uOjpTdHJl dGNoKSB7CiAgICAgICAgICAgICBjb25zdCBMZW5ndGgmIGxvZ2ljYWxIZWlnaHQgPSBjaGlsZC5z dHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0Lmlz Rml4ZWQoKSB8fCAobG9naWNhbEhlaWdodC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiBjaGls ZC5wZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKSkKICAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CkBAIC0xODgzLDEyICsxOTAwLDEyIEBAIGJvb2wgUmVuZGVyR3JpZDo6 aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIGJv b2wgUmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJblJvd0F4aXMoY29uc3QgUmVuZGVyQm94JiBjaGls ZCkgY29uc3QKIHsKICAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7Ci0g ICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRh bFdyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkg PT0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAmJiBjaGlsZC5zdHlsZSgpLmp1c3Rp ZnlTZWxmKCkucG9zaXRpb24oKSAhPSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKICAgICAgICAg ICAgIC8vIEEgbm9uLWF1dG8gYmxvY2sgc2l6ZSBtZWFucyB0aGUgc2FtZSBmb3IgaW5saW5lIHNp emUgKHJvdyBheGlzIHNpemUpIGJlY2F1c2Ugb2YgdGhlIGFzcGVjdCByYXRpby4KICAgICAgICAg ICAgIGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9naWNhbEhl aWdodCgpOwogICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8IChsb2dp Y2FsSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxkLnBlcmNlbnRhZ2VMb2dp Y2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgfSBlbHNlIGlmIChjaGlsZC5zdHlsZSgpLmFsaWdu U2VsZigpLnBvc2l0aW9uKCkgIT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoKSB7CiAgICAgICAgICAg ICBpZiAoIWNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkpCiAgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CkBAIC0xODk2LDQgKzE5MTMsNiBAQCBib29s IFJlbmRlckdyaWQ6Omhhc0F1dG9TaXplSW5Sb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQp IGNvbnN0CiAgICAgcmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBjaGlsZC5zdHls ZSgpLndpZHRoKCkuaXNBdXRvKCkgOiBjaGlsZC5zdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpOwog fQogCisKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJHcmlkLmgKaW5kZXggOGMxMTExMjNmOTM4YTM5ZmVmZDRjODMwOTRmNDliNmUzYzI5MmMyYi4u ZTcxMjk1M2ZhY2Q2ZDllMWYwYzA2ZmVlNDI3MzQwMjVlNzlkMDE3ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyR3JpZC5oCkBAIC0xODgsNiArMTg4LDggQEAgcHJpdmF0ZToKIAogICAg IGJvb2wgc2hvdWxkUmVzZXRMb2dpY2FsSGVpZ2h0QmVmb3JlTGF5b3V0KCkgY29uc3Qgb3ZlcnJp ZGUgeyByZXR1cm4gdHJ1ZTsgfQogCisgICAgYm9vbCBhc3BlY3RSYXRpb1ByZWZlcnNJbmxpbmUo Y29uc3QgUmVuZGVyQm94JiBjaGlsZCwgYm9vbCBibG9ja0Zsb3dJc0NvbHVtbkF4aXMpOworCiAg ICAgR3JpZCBtX2dyaWQ7CiAKICAgICBHcmlkVHJhY2tTaXppbmdBbGdvcml0aG0gbV90cmFja1Np emluZ0FsZ29yaXRobTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyYmYyMjhmYTc4YTk2NTVmMTQyMTBiMDNjZTBmODUwMjA3 Y2ZlOWMzLi5jMDY4ODhjM2YxZWYzZjk2MDk3M2UwNWFkNTE5N2NjNzA0N2M0YzBkIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTQgQEAKKzIwMjEtMDctMTkgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4K KworICAgICAgICBGaXggZ3JpZC1hc3BlY3QtcmF0aW8tMDE4KzE5Lmh0bWwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTg2MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuc2tpcCB0ZXN0cyB0aGF0IG5v dyBwYXNzLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wNy0xOSAgWmly YW4gU3VuICA8enN1bkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDU1MtZ3JpZF0gSWdub3JlIHRo ZSBhc3BlY3QtcmF0aW8gb2YgYSByZXBsYWNlZCBlbGVtZW50IGlmIHN0cmV0Y2ggYWxpZ25tZW50 cyBhcmUgYXBwbGllZCB0byBib3RoIGF4ZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmlu ZGV4IDg1Y2I3MzA2ZmZiZTA5YWFlMzI1YTRhY2ExYWUzNGI3YjE5NjMzOTMuLjhkZTYyZDBiNGJk MWRmNmExY2E4ZjMyNjQyZjkyZTY5M2MyZjY3OGIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lt cG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA3LTE5ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxp YS5jb20+CisKKyAgICAgICAgRml4IGdyaWQtYXNwZWN0LXJhdGlvLTAxOCsxOS5odG1sCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU4NjAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE4 Lmh0bWw6CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRtbDoKKwogMjAyMS0wNy0xNSAgQ2hyaXMg RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCAnU3VibWl0RXZl bnQnIGludGVyZmFjZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBi L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOTczOTA4MzUzMWI2ZDdjNzNlMzg5 OTQ2ZGM0NzU4NDg2ZWNlYTkyNS4uOWI1MDNmMmMyNzllMDdlYjA2ZmIzODIxNzc0ZTJmMjE1ZDJj ZGQwYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlv dXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NzM0LDE3ICs0NzM0LDYgQEAgd2Via2l0Lm9y Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n L2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t MDIyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl eC1hc3BlY3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0 aW8tMDE5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v Z3JpZC1hc3BlY3QtcmF0aW8tMDMwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDMxLmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDMyLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3Qt cmF0aW8tMDMzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM1Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM2Lmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3Bl Y3QtcmF0aW8tMDM3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzQuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9zZWxlY3QtZWxlbWVudC0wMDEuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUv Y29udGFpbi1pbnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgYi9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbAppbmRleCA3NmZkNmQ5Njk0NGEy MGM3YTQ5ZjllMThlMTUyNDE2OWY0ZTQwYTcxLi5kMGI0OTZlMjUwMzUyOTg0N2JiZjkxZmY4YjBk NDk1NjVhYmMxODkyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRp by0wMTguaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRt bApAQCAtMTcsNiArMTcsOSBAQAogPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQg Z3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CiAKIDxkaXYgaWQ9 InJlZmVyZW5jZS1vdmVybGFwcGVkLXJlZCI+PC9kaXY+Ci08ZGl2IHN0eWxlPSJkaXNwbGF5OiBn cmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDEw MHB4OyI+Ci0gIDxkaXYgc3R5bGU9ImhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzogMS8yOyBq dXN0aWZ5LXNlbGY6IHN0cmV0Y2g7IGJhY2tncm91bmQ6IGdyZWVuOyI+PC9kaXY+Cis8ZGl2IHN0 eWxlPSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRl bXBsYXRlLXJvd3M6IDUwcHg7Ij4KKyAgPGRpdiBzdHlsZT0iaGVpZ2h0OiA1MHB4OyBhc3BlY3Qt cmF0aW86IDEvMjsganVzdGlmeS1zZWxmOiBzdHJldGNoOyBiYWNrZ3JvdW5kOiBncmVlbjsiPjwv ZGl2PgorPC9kaXY+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNv bHVtbnM6IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDUwcHg7anVzdGlmeS1pdGVtczogc3Ry ZXRjaCI+CisgIDxkaXYgc3R5bGU9ImhlaWdodDogNTBweDsgYXNwZWN0LXJhdGlvOiAxLzI7IGp1 c3RpZnktc2VsZjogYXV0bzsgYmFja2dyb3VuZDogZ3JlZW47Ij48L2Rpdj4KIDwvZGl2PgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwgYi9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRtbAppbmRleCA0NjViMzk5NDlmYjI2 ZWY5NWY2ZTcxMTdmN2Q1OTliOGY4MmZmYTY4Li5iZjljMzUzODY2ZjczZDIxZTUwYWNhNTBlZDU5 ZGViY2VlYmZmYzUwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRp by0wMTkuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRt bApAQCAtMTcsNiArMTcsOSBAQAogPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQg Z3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CiAKIDxkaXYgaWQ9 InJlZmVyZW5jZS1vdmVybGFwcGVkLXJlZCI+PC9kaXY+Ci08ZGl2IHN0eWxlPSJkaXNwbGF5OiBn cmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDEw MHB4OyI+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6 IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDUwcHg7Ij4KICAgPGRpdiBzdHlsZT0id2lkdGg6 IDEwMHB4OyBhc3BlY3QtcmF0aW86IDIvMTsgYWxpZ24tc2VsZjogc3RyZXRjaDsgYmFja2dyb3Vu ZDogZ3JlZW47Ij48L2Rpdj4KIDwvZGl2PgorPGRpdiBzdHlsZT0iZGlzcGxheTogZ3JpZDsgZ3Jp ZC10ZW1wbGF0ZS1jb2x1bW5zOiAxMDBweDsgZ3JpZC10ZW1wbGF0ZS1yb3dzOiA1MHB4OyBhbGln bi1pdGVtczogc3RyZXRjaCI+CisgIDxkaXYgc3R5bGU9IndpZHRoOiAxMDBweDsgYXNwZWN0LXJh dGlvOiAyLzE7IGFsaWduLXNlbGY6IGF1dG87IGJhY2tncm91bmQ6IGdyZWVuOyI+PC9kaXY+Cis8 L2Rpdj4K 433786 2021-07-19 06:16:20 -0700 2021-07-19 08:22:19 -0700 Patch bug-225860-20210719151618.patch text/plain 18714 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M0YTFlMGQ5N2E0OTJl MzFhYzEwZjk4ZmIxODBlYmVlMGQxZWQwNy4uNWNmY2MyOWZlNTdlNjM3YzlhYmJjYTEzOGZhODBi ZjA5NzA5MDMxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA3LTE5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGdyaWQtYXNwZWN0LXJhdGlv LTAxOCsxOS5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjU4NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBEbyBub3QgYXBwbHkgYXNwZWN0IHJhdGlvIGlmIHdlIGhhdmUgZXhwbGljaXQgc3RyZXRj aGluZzoKKyAgICAgICAgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1ncmlkLyNncmlkLWl0 ZW0tc2l6aW5nCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJveDo6aGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21B c3BlY3RSYXRpbyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckdyaWQ6OmFzcGVjdFJhdGlvUHJlZmVyc0lubGluZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJHcmlkOjphcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkSWZOZWVkZWQpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJblJvd0F4aXMgY29uc3QpOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmg6CisKIDIwMjEtMDctMTkgIFppcmFuIFN1 biAgPHpzdW5AaWdhbGlhLmNvbT4KIAogICAgICAgICBbQ1NTLWdyaWRdIElnbm9yZSB0aGUgYXNw ZWN0LXJhdGlvIG9mIGEgcmVwbGFjZWQgZWxlbWVudCBpZiBzdHJldGNoIGFsaWdubWVudHMgYXJl IGFwcGxpZWQgdG8gYm90aCBheGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CmluZGV4IDBhYzBmMTMzYjNmM2ZhNjRjNjA3MmVhMTUwNTI2NWQzZGUzNzI5ZDUuLmJkYmYyNWU0 OWI2YzQwZGY3N2RlMGY0ODk3MTc0NjM4MmY0NTY2ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwCkBAIC0yNzc3LDcgKzI3NzcsNyBAQCBib29sIFJlbmRlckJveDo6aGFz U3RyZXRjaGVkTG9naWNhbEhlaWdodCgpIGNvbnN0CiB9CiAKIC8vIEZJWE1FOiBDYW4vU2hvdWxk IHdlIG1vdmUgdGhpcyBpbnNpZGUgc3BlY2lmaWMgbGF5b3V0IGNsYXNzZXMgKGZsZXguIGdyaWQp PyBDYW4gd2UgcmVmYWN0b3IgY29sdW1uRmxleEl0ZW1IYXNTdHJldGNoQWxpZ25tZW50IGxvZ2lj PwotYm9vbCBSZW5kZXJCb3g6Omhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpIGNvbnN0Citib29s IFJlbmRlckJveDo6aGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKFN0cmV0Y2hpbmdNb2RlIHN0cmV0 Y2hpbmdNb2RlKSBjb25zdAogewogICAgIGF1dG8mIHN0eWxlID0gdGhpcy0+c3R5bGUoKTsKICAg ICBpZiAoIXN0eWxlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpIHx8IHN0eWxlLm1hcmdpblN0YXJ0 KCkuaXNBdXRvKCkgfHwgc3R5bGUubWFyZ2luRW5kKCkuaXNBdXRvKCkpCkBAIC0yNzg4LDkgKzI3 ODgsMTAgQEAgYm9vbCBSZW5kZXJCb3g6Omhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpIGNvbnN0 CiAgICAgICAgIC8vIFRoZSAnbm9ybWFsJyB2YWx1ZSBiZWhhdmVzIGxpa2UgJ3N0YXJ0JyBleGNl cHQgZm9yIEZsZXhib3ggSXRlbXMsIHdoaWNoIG9idmlvdXNseSBzaG91bGQgaGF2ZSBhIGNvbnRh aW5lci4KICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KKyAgICBhdXRvIGl0ZW1Qb3NpdGlv biA9IHN0cmV0Y2hpbmdNb2RlID09IFN0cmV0Y2hpbmdNb2RlOjpBbnkgPyBjb250YWluaW5nQmxv Y2stPnNlbGZBbGlnbm1lbnROb3JtYWxCZWhhdmlvcih0aGlzKSA6IEl0ZW1Qb3NpdGlvbjo6Tm9y bWFsOwogICAgIGlmIChjb250YWluaW5nQmxvY2stPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkg IT0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKLSAgICAgICAgcmV0dXJuIHN0eWxlLnJlc29s dmVkQWxpZ25TZWxmKCZjb250YWluaW5nQmxvY2stPnN0eWxlKCksIGNvbnRhaW5pbmdCbG9jay0+ c2VsZkFsaWdubWVudE5vcm1hbEJlaGF2aW9yKHRoaXMpKS5wb3NpdGlvbigpID09IEl0ZW1Qb3Np dGlvbjo6U3RyZXRjaDsKLSAgICByZXR1cm4gc3R5bGUucmVzb2x2ZWRKdXN0aWZ5U2VsZigmY29u dGFpbmluZ0Jsb2NrLT5zdHlsZSgpLCBjb250YWluaW5nQmxvY2stPnNlbGZBbGlnbm1lbnROb3Jt YWxCZWhhdmlvcih0aGlzKSkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2g7Cisg ICAgICAgIHJldHVybiBzdHlsZS5yZXNvbHZlZEFsaWduU2VsZigmY29udGFpbmluZ0Jsb2NrLT5z dHlsZSgpLCBpdGVtUG9zaXRpb24pLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNo OworICAgIHJldHVybiBzdHlsZS5yZXNvbHZlZEp1c3RpZnlTZWxmKCZjb250YWluaW5nQmxvY2st PnN0eWxlKCksIGl0ZW1Qb3NpdGlvbikucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0 Y2g7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpzaXplc0xvZ2ljYWxXaWR0aFRvRml0Q29udGVudChT aXplVHlwZSB3aWR0aFR5cGUpIGNvbnN0CkBAIC01MjY4LDggKzUyNjksMTMgQEAgYm9vbCBSZW5k ZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdAog ICAgIGlmIChzaG91bGRJZ25vcmVBc3BlY3RSYXRpbygpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKLSAgICBpZiAoaXNHcmlkSXRlbSgpICYmIHNob3VsZENvbXB1dGVTaXplQXNSZXBsYWNlZCgp ICYmIGhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpICYmIGhhc1N0cmV0Y2hlZExvZ2ljYWxIZWln aHQoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChpc0dyaWRJdGVtKCkpIHsKKyAg ICAgICAgaWYgKHNob3VsZENvbXB1dGVTaXplQXNSZXBsYWNlZCgpKSB7CisgICAgICAgICAgICBp ZiAoaGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKCkgJiYgaGFzU3RyZXRjaGVkTG9naWNhbEhlaWdo dCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfSBlbHNlIGlmICho YXNTdHJldGNoZWRMb2dpY2FsV2lkdGgoU3RyZXRjaGluZ01vZGU6OkV4cGxpY2l0KSkKKyAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICBhdXRvIGlzUmVzb2x2YWJsZVBlcmNl bnRhZ2VIZWlnaHQgPSBbJl0gewogICAgICAgICByZXR1cm4gc3R5bGUoKS5sb2dpY2FsSGVpZ2h0 KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgKGlzT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8 IHBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5oCmluZGV4IDc3MThhNGFkYTgyYzlmMWU3YmJkNDczYTljNDExM2Q1YmVi NzUyNGUuLjU3OWE5YTQ2ZGFjNGJkZWJlMWRlNmUwOWYzOTQwZjA3ODdiOWJiNDMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTQzNyw3ICs0MzcsOCBAQCBvdmVycmlkZTsK ICAgICBib29sIHNpemVzTG9naWNhbFdpZHRoVG9GaXRDb250ZW50KFNpemVUeXBlKSBjb25zdDsK IAogICAgIGJvb2wgaGFzU3RyZXRjaGVkTG9naWNhbEhlaWdodCgpIGNvbnN0OwotICAgIGJvb2wg aGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKCkgY29uc3Q7CisgICAgZW51bSBjbGFzcyBTdHJldGNo aW5nTW9kZSB7IEFueSwgRXhwbGljaXQgfTsKKyAgICBib29sIGhhc1N0cmV0Y2hlZExvZ2ljYWxX aWR0aChTdHJldGNoaW5nTW9kZSA9IFN0cmV0Y2hpbmdNb2RlOjpBbnkpIGNvbnN0OwogICAgIGJv b2wgaXNTdHJldGNoaW5nQ29sdW1uRmxleEl0ZW0oKSBjb25zdDsKICAgICBib29sIGNvbHVtbkZs ZXhJdGVtSGFzU3RyZXRjaEFsaWdubWVudCgpIGNvbnN0OwogICAgIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IDllMDA3ZjhkZGI3MGQ4MDVmMGYxY2ZlMGVhYmZk YjI3Y2I4ZTYxNTYuLmE3ZTE1OGU4ODliZmZhNTg2OTM4NWUyMmFiM2FhOWM5ZTlmOGI0YzkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTExMzIsNiArMTEzMiwy MyBAQCBTdHlsZVNlbGZBbGlnbm1lbnREYXRhIFJlbmRlckdyaWQ6Omp1c3RpZnlTZWxmRm9yQ2hp bGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgYwogICAgIHJldHVybiBjaGlsZC5zdHlsZSgpLnJl c29sdmVkSnVzdGlmeVNlbGYoZ3JpZFN0eWxlLCBzZWxmQWxpZ25tZW50Tm9ybWFsQmVoYXZpb3Io JmNoaWxkKSk7CiB9CiAKK2Jvb2wgUmVuZGVyR3JpZDo6YXNwZWN0UmF0aW9QcmVmZXJzSW5saW5l KGNvbnN0IFJlbmRlckJveCYgY2hpbGQsIGJvb2wgYmxvY2tGbG93SXNDb2x1bW5BeGlzKQorewor ICAgIGlmICghY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgLy8gTm90IHVzaW5nIEFsaWduU2VsZkZvckNoaWxkL0p1c3RpZnlTZWxmRm9y Q2hpbGQgaGVyZSBzaW5jZSB3ZSBhcmUgb25seQorICAgIC8vIGludGVyZXN0ZWQgaW4gZXhwbGlj aXQgc3RyZXRjaCwgbm90IG5vcm1hbCBiZWhhdmlvci4KKyAgICBib29sIGhhc0V4cGxpY2l0SW5s aW5lU3RyZXRjaCA9IGNoaWxkLnN0eWxlKCkucmVzb2x2ZWRKdXN0aWZ5U2VsZigmc3R5bGUoKSwg SXRlbVBvc2l0aW9uOjpOb3JtYWwpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNo OworICAgIGJvb2wgaGFzRXhwbGljaXRCbG9ja1N0cmV0Y2ggPSBjaGlsZC5zdHlsZSgpLnJlc29s dmVkQWxpZ25TZWxmKCZzdHlsZSgpLCBJdGVtUG9zaXRpb246Ok5vcm1hbCkucG9zaXRpb24oKSA9 PSBJdGVtUG9zaXRpb246OlN0cmV0Y2g7CisgICAgaWYgKCFibG9ja0Zsb3dJc0NvbHVtbkF4aXMp CisgICAgICAgIHN0ZDo6c3dhcChoYXNFeHBsaWNpdElubGluZVN0cmV0Y2gsIGhhc0V4cGxpY2l0 QmxvY2tTdHJldGNoKTsKKyAgICBpZiAoaGFzRXhwbGljaXRJbmxpbmVTdHJldGNoICYmIGhhc0V4 cGxpY2l0QmxvY2tTdHJldGNoKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKGhhc0V4 cGxpY2l0SW5saW5lU3RyZXRjaCkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuICFo YXNFeHBsaWNpdEJsb2NrU3RyZXRjaDsKK30KKwogLy8gRklYTUU6IFRoaXMgbG9naWMgaXMgc2hh cmVkIGJ5IFJlbmRlckZsZXhpYmxlQm94LCBzbyBpdCBzaG91bGQgYmUgbW92ZWQgdG8gUmVuZGVy Qm94Lgogdm9pZCBSZW5kZXJHcmlkOjphcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkSWZOZWVk ZWQoUmVuZGVyQm94JiBjaGlsZCkKIHsKQEAgLTExNDQsNyArMTE2MSw3IEBAIHZvaWQgUmVuZGVy R3JpZDo6YXBwbHlTdHJldGNoQWxpZ25tZW50VG9DaGlsZElmTmVlZGVkKFJlbmRlckJveCYgY2hp bGQpCiAgICAgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGNoaWxkQmxvY2tEaXJlY3Rpb24gPSBH cmlkTGF5b3V0RnVuY3Rpb25zOjpmbG93QXdhcmVEaXJlY3Rpb25Gb3JDaGlsZCgqdGhpcywgY2hp bGQsIEZvclJvd3MpOwogICAgIGJvb2wgYmxvY2tGbG93SXNDb2x1bW5BeGlzID0gY2hpbGRCbG9j a0RpcmVjdGlvbiA9PSBGb3JSb3dzOwogICAgIGJvb2wgYWxsb3dlZFRvU3RyZXRjaENoaWxkQmxv Y2tTaXplID0gYmxvY2tGbG93SXNDb2x1bW5BeGlzID8gYWxsb3dlZFRvU3RyZXRjaENoaWxkQWxv bmdDb2x1bW5BeGlzKGNoaWxkKSA6IGFsbG93ZWRUb1N0cmV0Y2hDaGlsZEFsb25nUm93QXhpcyhj aGlsZCk7Ci0gICAgaWYgKGFsbG93ZWRUb1N0cmV0Y2hDaGlsZEJsb2NrU2l6ZSkgeworICAgIGlm IChhbGxvd2VkVG9TdHJldGNoQ2hpbGRCbG9ja1NpemUgJiYgIWFzcGVjdFJhdGlvUHJlZmVyc0lu bGluZShjaGlsZCwgYmxvY2tGbG93SXNDb2x1bW5BeGlzKSkgewogICAgICAgICBMYXlvdXRVbml0 IHN0cmV0Y2hlZExvZ2ljYWxIZWlnaHQgPSBhdmFpbGFibGVBbGlnbm1lbnRTcGFjZUZvckNoaWxk QmVmb3JlU3RyZXRjaGluZyhHcmlkTGF5b3V0RnVuY3Rpb25zOjpvdmVycmlkaW5nQ29udGFpbmlu Z0Jsb2NrQ29udGVudFNpemVGb3JDaGlsZChjaGlsZCwgY2hpbGRCbG9ja0RpcmVjdGlvbikudmFs dWUoKSwgY2hpbGQpOwogICAgICAgICBMYXlvdXRVbml0IGRlc2lyZWRMb2dpY2FsSGVpZ2h0ID0g Y2hpbGQuY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KHN0cmV0Y2hlZExvZ2ljYWxIZWln aHQsIHN0ZDo6bnVsbG9wdCk7CiAgICAgICAgIGNoaWxkLnNldE92ZXJyaWRpbmdMb2dpY2FsSGVp Z2h0KGRlc2lyZWRMb2dpY2FsSGVpZ2h0KTsKQEAgLTE4NjcsMTEgKzE4ODQsMTEgQEAgY29uc3Qg Y2hhciogUmVuZGVyR3JpZDo6cmVuZGVyTmFtZSgpIGNvbnN0CiBib29sIFJlbmRlckdyaWQ6Omhh c0F1dG9TaXplSW5Db2x1bW5BeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7CiAg ICAgaWYgKGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgewotICAgICAgICBpZiAoaXNI b3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgp KSB7CisgICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlKCkgJiYgY2hpbGQuc3R5bGUoKS5hbGlnblNlbGYoKS5wb3NpdGlv bigpICE9IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkgewogICAgICAgICAgICAgLy8gQSBub24tYXV0 byBpbmxpbmUgc2l6ZSBtZWFucyB0aGUgc2FtZSBmb3IgYmxvY2sgc2l6ZSAoY29sdW1uIGF4aXMg c2l6ZSkgYmVjYXVzZSBvZiB0aGUgYXNwZWN0IHJhdGlvLgogICAgICAgICAgICAgaWYgKCFjaGls ZC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpKQogICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKLSAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgfSBlbHNlIGlmIChjaGlsZC5zdHls ZSgpLmp1c3RpZnlTZWxmKCkucG9zaXRpb24oKSAhPSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsK ICAgICAgICAgICAgIGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCku bG9naWNhbEhlaWdodCgpOwogICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgp IHx8IChsb2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxkLnBlcmNl bnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpKQogICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKQEAgLTE4ODMsMTIgKzE5MDAsMTIgQEAgYm9vbCBSZW5kZXJHcmlkOjpoYXNBdXRv U2l6ZUluQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogYm9vbCBSZW5k ZXJHcmlkOjpoYXNBdXRvU2l6ZUluUm93QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25z dAogewogICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKLSAgICAgICAg aWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGlu Z01vZGUoKSkgeworICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBjaGls ZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICYmIGNoaWxkLnN0eWxlKCkuanVzdGlmeVNlbGYo KS5wb3NpdGlvbigpICE9IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkgewogICAgICAgICAgICAgLy8g QSBub24tYXV0byBibG9jayBzaXplIG1lYW5zIHRoZSBzYW1lIGZvciBpbmxpbmUgc2l6ZSAocm93 IGF4aXMgc2l6ZSkgYmVjYXVzZSBvZiB0aGUgYXNwZWN0IHJhdGlvLgogICAgICAgICAgICAgY29u c3QgTGVuZ3RoJiBsb2dpY2FsSGVpZ2h0ID0gY2hpbGQuc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7 CiAgICAgICAgICAgICBpZiAobG9naWNhbEhlaWdodC5pc0ZpeGVkKCkgfHwgKGxvZ2ljYWxIZWln aHQuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgY2hpbGQucGVyY2VudGFnZUxvZ2ljYWxIZWln aHRJc1Jlc29sdmFibGUoKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAg ICB9IGVsc2UgeworICAgICAgICB9IGVsc2UgaWYgKGNoaWxkLnN0eWxlKCkuYWxpZ25TZWxmKCku cG9zaXRpb24oKSAhPSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKICAgICAgICAgICAgIGlmICgh Y2hpbGQuc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSkKICAgICAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KQEAgLTE4OTYsNCArMTkxMyw2IEBAIGJvb2wgUmVuZGVy R3JpZDo6aGFzQXV0b1NpemVJblJvd0F4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QK ICAgICByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGNoaWxkLnN0eWxlKCkud2lk dGgoKS5pc0F1dG8oKSA6IGNoaWxkLnN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCk7CiB9CiAKKwor CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyR3JpZC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQu aAppbmRleCA4YzExMTEyM2Y5MzhhMzlmZWZkNGM4MzA5NGY0OWI2ZTNjMjkyYzJiLi5lNzEyOTUz ZmFjZDZkOWUxZjBjMDZmZWU0MjczNDAyNWU3OWQwMTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJHcmlkLmgKQEAgLTE4OCw2ICsxODgsOCBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBz aG91bGRSZXNldExvZ2ljYWxIZWlnaHRCZWZvcmVMYXlvdXQoKSBjb25zdCBvdmVycmlkZSB7IHJl dHVybiB0cnVlOyB9CiAKKyAgICBib29sIGFzcGVjdFJhdGlvUHJlZmVyc0lubGluZShjb25zdCBS ZW5kZXJCb3gmIGNoaWxkLCBib29sIGJsb2NrRmxvd0lzQ29sdW1uQXhpcyk7CisKICAgICBHcmlk IG1fZ3JpZDsKIAogICAgIEdyaWRUcmFja1NpemluZ0FsZ29yaXRobSBtX3RyYWNrU2l6aW5nQWxn b3JpdGhtOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCmluZGV4IDJiZjIyOGZhNzhhOTY1NWYxNDIxMGIwM2NlMGY4NTAyMDdjZmU5YzMu LmMwNjg4OGMzZjFlZjNmOTYwOTczZTA1YWQ1MTk3Y2M3MDQ3YzRjMGQgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNCBAQAorMjAyMS0wNy0xOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAg ICAgIEZpeCBncmlkLWFzcGVjdC1yYXRpby0wMTgrMTkuaHRtbAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1ODYwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVW5za2lwIHRlc3RzIHRoYXQgbm93IHBhc3Mu CisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTA3LTE5ICBaaXJhbiBTdW4g IDx6c3VuQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0NTUy1ncmlkXSBJZ25vcmUgdGhlIGFzcGVj dC1yYXRpbyBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgaWYgc3RyZXRjaCBhbGlnbm1lbnRzIGFyZSBh cHBsaWVkIHRvIGJvdGggYXhlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggODVj YjczMDZmZmJlMDlhYWUzMjVhNGFjYTFhZTM0YjdiMTk2MzM5My4uYWFjMDdmMGM4YTExZTgyNjhl MjIwYTM0Y2JhMmI2ZmMwNTFlZjYyNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTUgQEAKKzIwMjEtMDctMTkgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4K KworICAgICAgICBGaXggZ3JpZC1hc3BlY3QtcmF0aW8tMDE4KzE5Lmh0bWwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTg2MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTMtZXhwZWN0 ZWQueGh0OiBSZW1vdmVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDEzLmh0bWw6IFJlbW92ZWQuCisg ICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9n cmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxOS5odG1sOgor CiAyMDIxLTA3LTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAg SW1wbGVtZW50ICdTdWJtaXRFdmVudCcgaW50ZXJmYWNlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA5 NzM5MDgzNTMxYjZkN2M3M2UzODk5NDZkYzQ3NTg0ODZlY2VhOTI1Li45YjUwM2YyYzI3OWUwN2Vi MDZmYjM4MjE3NzRlMmYyMTVkMmNkZDBhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhw ZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ3MzQsMTcg KzQ3MzQsNiBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9mbGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVj dC1yYXRpby0wMTguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2 MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Vi a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzAuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzEu aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFz cGVjdC1yYXRpby0wMzIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzQuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0w MzUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlk LWFzcGVjdC1yYXRpby0wMzYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzguaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50 LTAzNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3Nl bGVjdC1lbGVtZW50LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvY29u dGFpbi1pbnRyaW5zaWMtc2l6ZS9jb250YWluLWludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1y YXRpby0wMTMtZXhwZWN0ZWQueGh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8t MDEzLWV4cGVjdGVkLnhodApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDVhMTM3OTQ0 ODJhOTRmNmMxMGJkOWQ0Yzk4NzA0ZTYzZWY2MDMzMS4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0w MTMtZXhwZWN0ZWQueGh0CisrKyAvZGV2L251bGwKQEAgLTEsMTkgKzAsMCBAQAotPCFET0NUWVBF IGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIgImh0dHA6Ly93 d3cudzMub3JnL1RSL3hodG1sMS9EVEQveGh0bWwxLXN0cmljdC5kdGQiPgotPGh0bWwgeG1sbnM9 Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGh0bWwiPgotIDxoZWFkPgotICA8dGl0bGU+Q1NTIFJl ZnRlc3QgUmVmZXJlbmNlPC90aXRsZT4KLSAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJHw6ly YXJkIFRhbGJvdCIgaHJlZj0iaHR0cDovL3d3dy5ndGFsYm90Lm9yZy9Ccm93c2VyQnVnc1NlY3Rp b24vY3NzMjF0ZXN0c3VpdGUvIiAvPgotICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRB WwotICBkaXYKLSAgewotICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKLSAgaGVpZ2h0OiAxMDBw eDsKLSAgd2lkdGg6IDEwMHB4OwotICB9Ci0gIF1dPjwvc3R5bGU+Ci0gPC9oZWFkPgotIDxib2R5 PgotICA8cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5k IDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KLSAgPGRpdj48L2Rpdj4KLSA8L2JvZHk+Ci08 L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTMu aHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxMy5odG1sCmRlbGV0ZWQg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlNTJkYjE2NzIxYTFhMDgyYmQ4NmIyNGQ4N2JmYTQ3MDk4 Mzg2NjljLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxMy5odG1sCisrKyAvZGV2L251bGwKQEAg LTEsMjIgKzAsMCBAQAotPCFET0NUWVBFIGh0bWw+Ci08dGl0bGU+Q1NTIGFzcGVjdC1yYXRpbzog aXRlbXMgc3RyZXRjaGVkIGluIGJvdGggYXhlcyBzaG91bGQgaWdub3JlIGFzcGVjdCByYXRpbzwv dGl0bGU+Ci08bGluayByZWw9ImF1dGhvciIgdGl0bGU9Ik1vemlsbGEiIGhyZWY9Imh0dHBzOi8v d3d3Lm1vemlsbGEub3JnLyI+Ci08bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRz LmNzc3dnLm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpbyI+Ci08bGluayByZWw9ImhlbHAi IGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZ3JpZC8jZ3JpZC1pdGVtLXNpemlu ZyI+Ci08bGluayByZWw9Im1hdGNoIiBocmVmPSIuLi8uLi9yZWZlcmVuY2UvcmVmLWZpbGxlZC1n cmVlbi0xMDBweC1zcXVhcmUueGh0IiAvPgotPHN0eWxlPgotICAjcmVmZXJlbmNlLW92ZXJsYXBw ZWQtcmVkIHsKLSAgICBwb3NpdGlvbjogYWJzb2x1dGU7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjog cmVkOwotICAgIHdpZHRoOiAxMDBweDsKLSAgICBoZWlnaHQ6IDEwMHB4OwotICAgIHotaW5kZXg6 IC0xOwotICB9Ci08L3N0eWxlPgotCi08cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxl ZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KLQotPGRpdiBp ZD0icmVmZXJlbmNlLW92ZXJsYXBwZWQtcmVkIj48L2Rpdj4KLTxkaXYgc3R5bGU9ImRpc3BsYXk6 IGdyaWQ7IGdyaWQtdGVtcGxhdGUtY29sdW1uczogMTAwcHg7IGdyaWQtdGVtcGxhdGUtcm93czog MTAwcHg7Ij4KLSAgPGRpdiBzdHlsZT0iYmFja2dyb3VuZDogZ3JlZW47IGFzcGVjdC1yYXRpbzog MS8xOyBqdXN0aWZ5LXNlbGY6IHN0cmV0Y2g7IGFsaWduLXNlbGY6IHN0cmV0Y2g7Ij48L2Rpdj4K LTwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE4 Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbAppbmRleCA3 NmZkNmQ5Njk0NGEyMGM3YTQ5ZjllMThlMTUyNDE2OWY0ZTQwYTcxLi5kMGI0OTZlMjUwMzUyOTg0 N2JiZjkxZmY4YjBkNDk1NjVhYmMxODkyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlk LWFzcGVjdC1yYXRpby0wMTguaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1y YXRpby0wMTguaHRtbApAQCAtMTcsNiArMTcsOSBAQAogPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUg aXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+ CiAKIDxkaXYgaWQ9InJlZmVyZW5jZS1vdmVybGFwcGVkLXJlZCI+PC9kaXY+Ci08ZGl2IHN0eWxl PSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRlbXBs YXRlLXJvd3M6IDEwMHB4OyI+Ci0gIDxkaXYgc3R5bGU9ImhlaWdodDogMTAwcHg7IGFzcGVjdC1y YXRpbzogMS8yOyBqdXN0aWZ5LXNlbGY6IHN0cmV0Y2g7IGJhY2tncm91bmQ6IGdyZWVuOyI+PC9k aXY+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEw MHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDUwcHg7Ij4KKyAgPGRpdiBzdHlsZT0iaGVpZ2h0OiA1 MHB4OyBhc3BlY3QtcmF0aW86IDEvMjsganVzdGlmeS1zZWxmOiBzdHJldGNoOyBiYWNrZ3JvdW5k OiBncmVlbjsiPjwvZGl2PgorPC9kaXY+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBncmlk LXRlbXBsYXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDUwcHg7anVzdGlm eS1pdGVtczogc3RyZXRjaCI+CisgIDxkaXYgc3R5bGU9ImhlaWdodDogNTBweDsgYXNwZWN0LXJh dGlvOiAxLzI7IGp1c3RpZnktc2VsZjogYXV0bzsgYmFja2dyb3VuZDogZ3JlZW47Ij48L2Rpdj4K IDwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE5 Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRtbAppbmRleCA0 NjViMzk5NDlmYjI2ZWY5NWY2ZTcxMTdmN2Q1OTliOGY4MmZmYTY4Li5iZjljMzUzODY2ZjczZDIx ZTUwYWNhNTBlZDU5ZGViY2VlYmZmYzUwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlk LWFzcGVjdC1yYXRpby0wMTkuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1y YXRpby0wMTkuaHRtbApAQCAtMTcsNiArMTcsOSBAQAogPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUg aXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+ CiAKIDxkaXYgaWQ9InJlZmVyZW5jZS1vdmVybGFwcGVkLXJlZCI+PC9kaXY+Ci08ZGl2IHN0eWxl PSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRlbXBs YXRlLXJvd3M6IDEwMHB4OyI+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBs YXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDUwcHg7Ij4KICAgPGRpdiBz dHlsZT0id2lkdGg6IDEwMHB4OyBhc3BlY3QtcmF0aW86IDIvMTsgYWxpZ24tc2VsZjogc3RyZXRj aDsgYmFja2dyb3VuZDogZ3JlZW47Ij48L2Rpdj4KIDwvZGl2PgorPGRpdiBzdHlsZT0iZGlzcGxh eTogZ3JpZDsgZ3JpZC10ZW1wbGF0ZS1jb2x1bW5zOiAxMDBweDsgZ3JpZC10ZW1wbGF0ZS1yb3dz OiA1MHB4OyBhbGlnbi1pdGVtczogc3RyZXRjaCI+CisgIDxkaXYgc3R5bGU9IndpZHRoOiAxMDBw eDsgYXNwZWN0LXJhdGlvOiAyLzE7IGFsaWduLXNlbGY6IGF1dG87IGJhY2tncm91bmQ6IGdyZWVu OyI+PC9kaXY+Cis8L2Rpdj4K 433791 2021-07-19 08:22:24 -0700 2021-07-20 01:04:35 -0700 Patch bug-225860-20210719172223.patch text/plain 18867 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M0YTFlMGQ5N2E0OTJl MzFhYzEwZjk4ZmIxODBlYmVlMGQxZWQwNy4uNjdlNTc0OTUxYTZlMGJhMzM3NTFmMDE2YWZiMmFj ODgwMjk3NmVkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIxLTA3LTE5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGdyaWQgYXNwZWN0LXJhdGlv IHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjU4NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXggdmFyaW91cyBjb21iaW5hdGlvbnMgb2YgaW1wbGljaXQvZXhwbGljaXQgc3RyZXRjaGluZyBp biBpbmxpbmUgYW5kCisgICAgICAgIGJsb2NrIGRpcmVjdGlvbnMgYXMgdGVzdGVkIGJ5IGdyaWQt YXNwZWN0LXJhdGlvLTAyOC5odG1sIHVudGlsCisgICAgICAgIGdyaWQtYXNwZWN0LXJhdGlvLTAz OC5odG1sIGFuZCBhcyBzcGVjaWZpZWQgWzEsIDJdLgorICAgICAgICBBbHNvIHRyZWF0IGV4cGxp Y2l0IHN0cmV0Y2hpbmcgdGhyb3VnaCBqdXN0aWZ5LWl0ZW1zL2FsaWduLWl0ZW1zOiBzdHJldGNo CisgICAgICAgIGxpa2UganVzdGlmeS1zZWxmL2FsaWduLXNlbGY6IHN0cmV0Y2guCisKKyAgICAg ICAgWzFdIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZ3JpZC8jZ3JpZC1pdGVtLXNpemlu ZworICAgICAgICBbMl0gLy9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJh dGlvCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJveDo6aGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RS YXRpbyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6 OmFzcGVjdFJhdGlvUHJlZmVyc0lubGluZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlk OjphcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkSWZOZWVkZWQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJblJvd0F4aXMgY29uc3QpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmg6CisKIDIwMjEtMDctMTkgIFppcmFuIFN1biAgPHpz dW5AaWdhbGlhLmNvbT4KIAogICAgICAgICBbQ1NTLWdyaWRdIElnbm9yZSB0aGUgYXNwZWN0LXJh dGlvIG9mIGEgcmVwbGFjZWQgZWxlbWVudCBpZiBzdHJldGNoIGFsaWdubWVudHMgYXJlIGFwcGxp ZWQgdG8gYm90aCBheGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4 IDBhYzBmMTMzYjNmM2ZhNjRjNjA3MmVhMTUwNTI2NWQzZGUzNzI5ZDUuLmJkYmYyNWU0OWI2YzQw ZGY3N2RlMGY0ODk3MTc0NjM4MmY0NTY2ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCkBAIC0yNzc3LDcgKzI3NzcsNyBAQCBib29sIFJlbmRlckJveDo6aGFzU3RyZXRj aGVkTG9naWNhbEhlaWdodCgpIGNvbnN0CiB9CiAKIC8vIEZJWE1FOiBDYW4vU2hvdWxkIHdlIG1v dmUgdGhpcyBpbnNpZGUgc3BlY2lmaWMgbGF5b3V0IGNsYXNzZXMgKGZsZXguIGdyaWQpPyBDYW4g d2UgcmVmYWN0b3IgY29sdW1uRmxleEl0ZW1IYXNTdHJldGNoQWxpZ25tZW50IGxvZ2ljPwotYm9v bCBSZW5kZXJCb3g6Omhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpIGNvbnN0Citib29sIFJlbmRl ckJveDo6aGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKFN0cmV0Y2hpbmdNb2RlIHN0cmV0Y2hpbmdN b2RlKSBjb25zdAogewogICAgIGF1dG8mIHN0eWxlID0gdGhpcy0+c3R5bGUoKTsKICAgICBpZiAo IXN0eWxlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpIHx8IHN0eWxlLm1hcmdpblN0YXJ0KCkuaXNB dXRvKCkgfHwgc3R5bGUubWFyZ2luRW5kKCkuaXNBdXRvKCkpCkBAIC0yNzg4LDkgKzI3ODgsMTAg QEAgYm9vbCBSZW5kZXJCb3g6Omhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpIGNvbnN0CiAgICAg ICAgIC8vIFRoZSAnbm9ybWFsJyB2YWx1ZSBiZWhhdmVzIGxpa2UgJ3N0YXJ0JyBleGNlcHQgZm9y IEZsZXhib3ggSXRlbXMsIHdoaWNoIG9idmlvdXNseSBzaG91bGQgaGF2ZSBhIGNvbnRhaW5lci4K ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KKyAgICBhdXRvIGl0ZW1Qb3NpdGlvbiA9IHN0 cmV0Y2hpbmdNb2RlID09IFN0cmV0Y2hpbmdNb2RlOjpBbnkgPyBjb250YWluaW5nQmxvY2stPnNl bGZBbGlnbm1lbnROb3JtYWxCZWhhdmlvcih0aGlzKSA6IEl0ZW1Qb3NpdGlvbjo6Tm9ybWFsOwog ICAgIGlmIChjb250YWluaW5nQmxvY2stPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgIT0gaXNI b3Jpem9udGFsV3JpdGluZ01vZGUoKSkKLSAgICAgICAgcmV0dXJuIHN0eWxlLnJlc29sdmVkQWxp Z25TZWxmKCZjb250YWluaW5nQmxvY2stPnN0eWxlKCksIGNvbnRhaW5pbmdCbG9jay0+c2VsZkFs aWdubWVudE5vcm1hbEJlaGF2aW9yKHRoaXMpKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlvbjo6 U3RyZXRjaDsKLSAgICByZXR1cm4gc3R5bGUucmVzb2x2ZWRKdXN0aWZ5U2VsZigmY29udGFpbmlu Z0Jsb2NrLT5zdHlsZSgpLCBjb250YWluaW5nQmxvY2stPnNlbGZBbGlnbm1lbnROb3JtYWxCZWhh dmlvcih0aGlzKSkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2g7CisgICAgICAg IHJldHVybiBzdHlsZS5yZXNvbHZlZEFsaWduU2VsZigmY29udGFpbmluZ0Jsb2NrLT5zdHlsZSgp LCBpdGVtUG9zaXRpb24pLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoOworICAg IHJldHVybiBzdHlsZS5yZXNvbHZlZEp1c3RpZnlTZWxmKCZjb250YWluaW5nQmxvY2stPnN0eWxl KCksIGl0ZW1Qb3NpdGlvbikucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2g7CiB9 CiAKIGJvb2wgUmVuZGVyQm94OjpzaXplc0xvZ2ljYWxXaWR0aFRvRml0Q29udGVudChTaXplVHlw ZSB3aWR0aFR5cGUpIGNvbnN0CkBAIC01MjY4LDggKzUyNjksMTMgQEAgYm9vbCBSZW5kZXJCb3g6 OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdAogICAgIGlm IChzaG91bGRJZ25vcmVBc3BlY3RSYXRpbygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAg ICBpZiAoaXNHcmlkSXRlbSgpICYmIHNob3VsZENvbXB1dGVTaXplQXNSZXBsYWNlZCgpICYmIGhh c1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpICYmIGhhc1N0cmV0Y2hlZExvZ2ljYWxIZWlnaHQoKSkK LSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChpc0dyaWRJdGVtKCkpIHsKKyAgICAgICAg aWYgKHNob3VsZENvbXB1dGVTaXplQXNSZXBsYWNlZCgpKSB7CisgICAgICAgICAgICBpZiAoaGFz U3RyZXRjaGVkTG9naWNhbFdpZHRoKCkgJiYgaGFzU3RyZXRjaGVkTG9naWNhbEhlaWdodCgpKQor ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfSBlbHNlIGlmIChoYXNTdHJl dGNoZWRMb2dpY2FsV2lkdGgoU3RyZXRjaGluZ01vZGU6OkV4cGxpY2l0KSkKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICBhdXRvIGlzUmVzb2x2YWJsZVBlcmNlbnRhZ2VI ZWlnaHQgPSBbJl0gewogICAgICAgICByZXR1cm4gc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNQ ZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgKGlzT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8IHBlcmNl bnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5oCmluZGV4IDc3MThhNGFkYTgyYzlmMWU3YmJkNDczYTljNDExM2Q1YmViNzUyNGUu LjU3OWE5YTQ2ZGFjNGJkZWJlMWRlNmUwOWYzOTQwZjA3ODdiOWJiNDMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTQzNyw3ICs0MzcsOCBAQCBvdmVycmlkZTsKICAgICBi b29sIHNpemVzTG9naWNhbFdpZHRoVG9GaXRDb250ZW50KFNpemVUeXBlKSBjb25zdDsKIAogICAg IGJvb2wgaGFzU3RyZXRjaGVkTG9naWNhbEhlaWdodCgpIGNvbnN0OwotICAgIGJvb2wgaGFzU3Ry ZXRjaGVkTG9naWNhbFdpZHRoKCkgY29uc3Q7CisgICAgZW51bSBjbGFzcyBTdHJldGNoaW5nTW9k ZSB7IEFueSwgRXhwbGljaXQgfTsKKyAgICBib29sIGhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aChT dHJldGNoaW5nTW9kZSA9IFN0cmV0Y2hpbmdNb2RlOjpBbnkpIGNvbnN0OwogICAgIGJvb2wgaXNT dHJldGNoaW5nQ29sdW1uRmxleEl0ZW0oKSBjb25zdDsKICAgICBib29sIGNvbHVtbkZsZXhJdGVt SGFzU3RyZXRjaEFsaWdubWVudCgpIGNvbnN0OwogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckdyaWQuY3BwCmluZGV4IDllMDA3ZjhkZGI3MGQ4MDVmMGYxY2ZlMGVhYmZkYjI3Y2I4 ZTYxNTYuLmQ2NTcxM2Y4ZmY4ZDRhNzhkYmU4NzE2MjJmNWU2Zjk3NjM0MGM1MmEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTExMzIsNiArMTEzMiwyMyBAQCBT dHlsZVNlbGZBbGlnbm1lbnREYXRhIFJlbmRlckdyaWQ6Omp1c3RpZnlTZWxmRm9yQ2hpbGQoY29u c3QgUmVuZGVyQm94JiBjaGlsZCwgYwogICAgIHJldHVybiBjaGlsZC5zdHlsZSgpLnJlc29sdmVk SnVzdGlmeVNlbGYoZ3JpZFN0eWxlLCBzZWxmQWxpZ25tZW50Tm9ybWFsQmVoYXZpb3IoJmNoaWxk KSk7CiB9CiAKK2Jvb2wgUmVuZGVyR3JpZDo6YXNwZWN0UmF0aW9QcmVmZXJzSW5saW5lKGNvbnN0 IFJlbmRlckJveCYgY2hpbGQsIGJvb2wgYmxvY2tGbG93SXNDb2x1bW5BeGlzKQoreworICAgIGlm ICghY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgLy8gTm90IHVzaW5nIGFsaWduU2VsZkZvckNoaWxkL2p1c3RpZnlTZWxmRm9yQ2hpbGQg aGVyZSBzaW5jZSB3ZSBhcmUgb25seQorICAgIC8vIGludGVyZXN0ZWQgaW4gZXhwbGljaXQgc3Ry ZXRjaCwgbm90IG5vcm1hbCBiZWhhdmlvci4KKyAgICBib29sIGhhc0V4cGxpY2l0SW5saW5lU3Ry ZXRjaCA9IGNoaWxkLnN0eWxlKCkucmVzb2x2ZWRKdXN0aWZ5U2VsZigmc3R5bGUoKSwgSXRlbVBv c2l0aW9uOjpOb3JtYWwpLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoOworICAg IGJvb2wgaGFzRXhwbGljaXRCbG9ja1N0cmV0Y2ggPSBjaGlsZC5zdHlsZSgpLnJlc29sdmVkQWxp Z25TZWxmKCZzdHlsZSgpLCBJdGVtUG9zaXRpb246Ok5vcm1hbCkucG9zaXRpb24oKSA9PSBJdGVt UG9zaXRpb246OlN0cmV0Y2g7CisgICAgaWYgKCFibG9ja0Zsb3dJc0NvbHVtbkF4aXMpCisgICAg ICAgIHN0ZDo6c3dhcChoYXNFeHBsaWNpdElubGluZVN0cmV0Y2gsIGhhc0V4cGxpY2l0QmxvY2tT dHJldGNoKTsKKyAgICBpZiAoaGFzRXhwbGljaXRJbmxpbmVTdHJldGNoICYmIGhhc0V4cGxpY2l0 QmxvY2tTdHJldGNoKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKGhhc0V4cGxpY2l0 SW5saW5lU3RyZXRjaCkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuICFoYXNFeHBs aWNpdEJsb2NrU3RyZXRjaDsKK30KKwogLy8gRklYTUU6IFRoaXMgbG9naWMgaXMgc2hhcmVkIGJ5 IFJlbmRlckZsZXhpYmxlQm94LCBzbyBpdCBzaG91bGQgYmUgbW92ZWQgdG8gUmVuZGVyQm94Lgog dm9pZCBSZW5kZXJHcmlkOjphcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkSWZOZWVkZWQoUmVu ZGVyQm94JiBjaGlsZCkKIHsKQEAgLTExNDQsNyArMTE2MSw3IEBAIHZvaWQgUmVuZGVyR3JpZDo6 YXBwbHlTdHJldGNoQWxpZ25tZW50VG9DaGlsZElmTmVlZGVkKFJlbmRlckJveCYgY2hpbGQpCiAg ICAgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGNoaWxkQmxvY2tEaXJlY3Rpb24gPSBHcmlkTGF5 b3V0RnVuY3Rpb25zOjpmbG93QXdhcmVEaXJlY3Rpb25Gb3JDaGlsZCgqdGhpcywgY2hpbGQsIEZv clJvd3MpOwogICAgIGJvb2wgYmxvY2tGbG93SXNDb2x1bW5BeGlzID0gY2hpbGRCbG9ja0RpcmVj dGlvbiA9PSBGb3JSb3dzOwogICAgIGJvb2wgYWxsb3dlZFRvU3RyZXRjaENoaWxkQmxvY2tTaXpl ID0gYmxvY2tGbG93SXNDb2x1bW5BeGlzID8gYWxsb3dlZFRvU3RyZXRjaENoaWxkQWxvbmdDb2x1 bW5BeGlzKGNoaWxkKSA6IGFsbG93ZWRUb1N0cmV0Y2hDaGlsZEFsb25nUm93QXhpcyhjaGlsZCk7 Ci0gICAgaWYgKGFsbG93ZWRUb1N0cmV0Y2hDaGlsZEJsb2NrU2l6ZSkgeworICAgIGlmIChhbGxv d2VkVG9TdHJldGNoQ2hpbGRCbG9ja1NpemUgJiYgIWFzcGVjdFJhdGlvUHJlZmVyc0lubGluZShj aGlsZCwgYmxvY2tGbG93SXNDb2x1bW5BeGlzKSkgewogICAgICAgICBMYXlvdXRVbml0IHN0cmV0 Y2hlZExvZ2ljYWxIZWlnaHQgPSBhdmFpbGFibGVBbGlnbm1lbnRTcGFjZUZvckNoaWxkQmVmb3Jl U3RyZXRjaGluZyhHcmlkTGF5b3V0RnVuY3Rpb25zOjpvdmVycmlkaW5nQ29udGFpbmluZ0Jsb2Nr Q29udGVudFNpemVGb3JDaGlsZChjaGlsZCwgY2hpbGRCbG9ja0RpcmVjdGlvbikudmFsdWUoKSwg Y2hpbGQpOwogICAgICAgICBMYXlvdXRVbml0IGRlc2lyZWRMb2dpY2FsSGVpZ2h0ID0gY2hpbGQu Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KHN0cmV0Y2hlZExvZ2ljYWxIZWlnaHQsIHN0 ZDo6bnVsbG9wdCk7CiAgICAgICAgIGNoaWxkLnNldE92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KGRl c2lyZWRMb2dpY2FsSGVpZ2h0KTsKQEAgLTE4NjcsMTEgKzE4ODQsMTEgQEAgY29uc3QgY2hhciog UmVuZGVyR3JpZDo6cmVuZGVyTmFtZSgpIGNvbnN0CiBib29sIFJlbmRlckdyaWQ6Omhhc0F1dG9T aXplSW5Db2x1bW5BeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0CiB7CiAgICAgaWYg KGNoaWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkgewotICAgICAgICBpZiAoaXNIb3Jpem9u dGFsV3JpdGluZ01vZGUoKSA9PSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7Cisg ICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRh bFdyaXRpbmdNb2RlKCkgJiYgY2hpbGQuc3R5bGUoKS5hbGlnblNlbGYoKS5wb3NpdGlvbigpICE9 IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkgewogICAgICAgICAgICAgLy8gQSBub24tYXV0byBpbmxp bmUgc2l6ZSBtZWFucyB0aGUgc2FtZSBmb3IgYmxvY2sgc2l6ZSAoY29sdW1uIGF4aXMgc2l6ZSkg YmVjYXVzZSBvZiB0aGUgYXNwZWN0IHJhdGlvLgogICAgICAgICAgICAgaWYgKCFjaGlsZC5zdHls ZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgfSBlbHNlIGlmIChjaGlsZC5zdHlsZSgpLmp1 c3RpZnlTZWxmKCkucG9zaXRpb24oKSAhPSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKICAgICAg ICAgICAgIGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9naWNh bEhlaWdodCgpOwogICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8IChs b2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxkLnBlcmNlbnRhZ2VM b2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKQEAgLTE4ODMsMTIgKzE5MDAsMTIgQEAgYm9vbCBSZW5kZXJHcmlkOjpoYXNBdXRvU2l6ZUlu Q29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogYm9vbCBSZW5kZXJHcmlk OjpoYXNBdXRvU2l6ZUluUm93QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogewog ICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKLSAgICAgICAgaWYgKGlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSkgeworICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA9PSBjaGlsZC5pc0hv cml6b250YWxXcml0aW5nTW9kZSgpICYmIGNoaWxkLnN0eWxlKCkuanVzdGlmeVNlbGYoKS5wb3Np dGlvbigpICE9IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkgewogICAgICAgICAgICAgLy8gQSBub24t YXV0byBibG9jayBzaXplIG1lYW5zIHRoZSBzYW1lIGZvciBpbmxpbmUgc2l6ZSAocm93IGF4aXMg c2l6ZSkgYmVjYXVzZSBvZiB0aGUgYXNwZWN0IHJhdGlvLgogICAgICAgICAgICAgY29uc3QgTGVu Z3RoJiBsb2dpY2FsSGVpZ2h0ID0gY2hpbGQuc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7CiAgICAg ICAgICAgICBpZiAobG9naWNhbEhlaWdodC5pc0ZpeGVkKCkgfHwgKGxvZ2ljYWxIZWlnaHQuaXNQ ZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgY2hpbGQucGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jl c29sdmFibGUoKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9IGVs c2UgeworICAgICAgICB9IGVsc2UgaWYgKGNoaWxkLnN0eWxlKCkuYWxpZ25TZWxmKCkucG9zaXRp b24oKSAhPSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKICAgICAgICAgICAgIGlmICghY2hpbGQu c3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSkKICAgICAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCmluZGV4 IDhjMTExMTIzZjkzOGEzOWZlZmQ0YzgzMDk0ZjQ5YjZlM2MyOTJjMmIuLmU3MTI5NTNmYWNkNmQ5 ZTFmMGMwNmZlZTQyNzM0MDI1ZTc5ZDAxN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckdyaWQuaApAQCAtMTg4LDYgKzE4OCw4IEBAIHByaXZhdGU6CiAKICAgICBib29sIHNob3VsZFJl c2V0TG9naWNhbEhlaWdodEJlZm9yZUxheW91dCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRy dWU7IH0KIAorICAgIGJvb2wgYXNwZWN0UmF0aW9QcmVmZXJzSW5saW5lKGNvbnN0IFJlbmRlckJv eCYgY2hpbGQsIGJvb2wgYmxvY2tGbG93SXNDb2x1bW5BeGlzKTsKKwogICAgIEdyaWQgbV9ncmlk OwogCiAgICAgR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtIG1fdHJhY2tTaXppbmdBbGdvcml0aG07 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggMmJmMjI4ZmE3OGE5NjU1ZjE0MjEwYjAzY2UwZjg1MDIwN2NmZTljMy4uYmM4ZTRm ZGJhODQ2ZDRjY2MwNzkyODk3ZTRiMTEwNDhhNDQ2NjAxMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDIxLTA3LTE5ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4 IGdyaWQgYXNwZWN0LXJhdGlvIHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjU4NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBVbnNraXAgdGVzdHMgdGhhdCBub3cgcGFzcy4KKworICAgICAgICAq IFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDctMTkgIFppcmFuIFN1biAgPHpzdW5AaWdhbGlh LmNvbT4KIAogICAgICAgICBbQ1NTLWdyaWRdIElnbm9yZSB0aGUgYXNwZWN0LXJhdGlvIG9mIGEg cmVwbGFjZWQgZWxlbWVudCBpZiBzdHJldGNoIGFsaWdubWVudHMgYXJlIGFwcGxpZWQgdG8gYm90 aCBheGVzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCA4NWNiNzMwNmZmYmUwOWFh ZTMyNWE0YWNhMWFlMzRiN2IxOTYzMzkzLi41NzIyMjZhZDc4MjA1NGE0MzJlM2RiN2QxNGY4OWFk ZTUwZDY4YjdjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBA QAorMjAyMS0wNy0xOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZp eCBncmlkIGFzcGVjdC1yYXRpbyB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI1ODYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSW1wb3J0IGFzcGVjdC1yYXRpbyB0ZXN0cyBiYXNlZCBvbiA1NmJm OThjNWMwLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTMtZXhwZWN0ZWQueGh0OiBSZW1vdmVkLgor ICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v Z3JpZC1hc3BlY3QtcmF0aW8tMDEzLmh0bWw6IFJlbW92ZWQuCisgICAgICAgICogd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0w MTguaHRtbDoKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxOS5odG1sOgorCiAyMDIxLTA3LTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50ICdTdWJtaXRF dmVudCcgaW50ZXJmYWNlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z IGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA5NzM5MDgzNTMxYjZkN2M3M2Uz ODk5NDZkYzQ3NTg0ODZlY2VhOTI1Li45YjUwM2YyYzI3OWUwN2ViMDZmYjM4MjE3NzRlMmYyMTVk MmNkZDBhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xh eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ3MzQsMTcgKzQ3MzQsNiBAQCB3ZWJraXQu b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp bmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp by0wMjIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m bGV4LWFzcGVjdC1yYXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1y YXRpby0wMTkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9ncmlkLWFzcGVjdC1yYXRpby0wMzAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzEuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzIuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVj dC1yYXRpby0wMzMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2 MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Vi a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzUuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzYu aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFz cGVjdC1yYXRpby0wMzcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMzguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9yZXBsYWNlZC1lbGVtZW50LTAzNC5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3NlbGVjdC1lbGVtZW50LTAwMS5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvY29udGFpbi1pbnRyaW5zaWMtc2l6 ZS9jb250YWluLWludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTMtZXhwZWN0ZWQu eGh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDEzLWV4cGVjdGVkLnhodApk ZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDVhMTM3OTQ0ODJhOTRmNmMxMGJkOWQ0Yzk4 NzA0ZTYzZWY2MDMzMS4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAot LS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTMtZXhwZWN0ZWQueGh0Cisr KyAvZGV2L251bGwKQEAgLTEsMTkgKzAsMCBAQAotPCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9X M0MvL0RURCBYSFRNTCAxLjAgU3RyaWN0Ly9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSL3hodG1s MS9EVEQveGh0bWwxLXN0cmljdC5kdGQiPgotPGh0bWwgeG1sbnM9Imh0dHA6Ly93d3cudzMub3Jn LzE5OTkveGh0bWwiPgotIDxoZWFkPgotICA8dGl0bGU+Q1NTIFJlZnRlc3QgUmVmZXJlbmNlPC90 aXRsZT4KLSAgPGxpbmsgcmVsPSJhdXRob3IiIHRpdGxlPSJHw6lyYXJkIFRhbGJvdCIgaHJlZj0i aHR0cDovL3d3dy5ndGFsYm90Lm9yZy9Ccm93c2VyQnVnc1NlY3Rpb24vY3NzMjF0ZXN0c3VpdGUv IiAvPgotICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWwotICBkaXYKLSAgewotICBi YWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKLSAgaGVpZ2h0OiAxMDBweDsKLSAgd2lkdGg6IDEwMHB4 OwotICB9Ci0gIF1dPjwvc3R5bGU+Ci0gPC9oZWFkPgotIDxib2R5PgotICA8cD5UZXN0IHBhc3Nl cyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5kIDxzdHJvbmc+bm8gcmVkPC9z dHJvbmc+LjwvcD4KLSAgPGRpdj48L2Rpdj4KLSA8L2JvZHk+Ci08L2h0bWw+CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTMuaHRtbCBiL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxMy5odG1sCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NApp bmRleCBlNTJkYjE2NzIxYTFhMDgyYmQ4NmIyNGQ4N2JmYTQ3MDk4Mzg2NjljLi4wMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2dyaWQt YXNwZWN0LXJhdGlvLTAxMy5odG1sCisrKyAvZGV2L251bGwKQEAgLTEsMjIgKzAsMCBAQAotPCFE T0NUWVBFIGh0bWw+Ci08dGl0bGU+Q1NTIGFzcGVjdC1yYXRpbzogaXRlbXMgc3RyZXRjaGVkIGlu IGJvdGggYXhlcyBzaG91bGQgaWdub3JlIGFzcGVjdCByYXRpbzwvdGl0bGU+Ci08bGluayByZWw9 ImF1dGhvciIgdGl0bGU9Ik1vemlsbGEiIGhyZWY9Imh0dHBzOi8vd3d3Lm1vemlsbGEub3JnLyI+ Ci08bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mtc2l6 aW5nLTQvI2FzcGVjdC1yYXRpbyI+Ci08bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJh ZnRzLmNzc3dnLm9yZy9jc3MtZ3JpZC8jZ3JpZC1pdGVtLXNpemluZyI+Ci08bGluayByZWw9Im1h dGNoIiBocmVmPSIuLi8uLi9yZWZlcmVuY2UvcmVmLWZpbGxlZC1ncmVlbi0xMDBweC1zcXVhcmUu eGh0IiAvPgotPHN0eWxlPgotICAjcmVmZXJlbmNlLW92ZXJsYXBwZWQtcmVkIHsKLSAgICBwb3Np dGlvbjogYWJzb2x1dGU7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcmVkOwotICAgIHdpZHRoOiAx MDBweDsKLSAgICBoZWlnaHQ6IDEwMHB4OwotICAgIHotaW5kZXg6IC0xOwotICB9Ci08L3N0eWxl PgotCi08cD5UZXN0IHBhc3NlcyBpZiB0aGVyZSBpcyBhIGZpbGxlZCBncmVlbiBzcXVhcmUgYW5k IDxzdHJvbmc+bm8gcmVkPC9zdHJvbmc+LjwvcD4KLQotPGRpdiBpZD0icmVmZXJlbmNlLW92ZXJs YXBwZWQtcmVkIj48L2Rpdj4KLTxkaXYgc3R5bGU9ImRpc3BsYXk6IGdyaWQ7IGdyaWQtdGVtcGxh dGUtY29sdW1uczogMTAwcHg7IGdyaWQtdGVtcGxhdGUtcm93czogMTAwcHg7Ij4KLSAgPGRpdiBz dHlsZT0iYmFja2dyb3VuZDogZ3JlZW47IGFzcGVjdC1yYXRpbzogMS8xOyBqdXN0aWZ5LXNlbGY6 IHN0cmV0Y2g7IGFsaWduLXNlbGY6IHN0cmV0Y2g7Ij48L2Rpdj4KLTwvZGl2PgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgYi9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbAppbmRleCA3NmZkNmQ5Njk0NGEyMGM3YTQ5 ZjllMThlMTUyNDE2OWY0ZTQwYTcxLi5kMGI0OTZlMjUwMzUyOTg0N2JiZjkxZmY4YjBkNDk1NjVh YmMxODkyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTgu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbApAQCAt MTcsNiArMTcsOSBAQAogPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4g c3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CiAKIDxkaXYgaWQ9InJlZmVy ZW5jZS1vdmVybGFwcGVkLXJlZCI+PC9kaXY+Ci08ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBn cmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDEwMHB4OyI+ Ci0gIDxkaXYgc3R5bGU9ImhlaWdodDogMTAwcHg7IGFzcGVjdC1yYXRpbzogMS8yOyBqdXN0aWZ5 LXNlbGY6IHN0cmV0Y2g7IGJhY2tncm91bmQ6IGdyZWVuOyI+PC9kaXY+Cis8ZGl2IHN0eWxlPSJk aXNwbGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRlbXBsYXRl LXJvd3M6IDUwcHg7Ij4KKyAgPGRpdiBzdHlsZT0iaGVpZ2h0OiA1MHB4OyBhc3BlY3QtcmF0aW86 IDEvMjsganVzdGlmeS1zZWxmOiBzdHJldGNoOyBiYWNrZ3JvdW5kOiBncmVlbjsiPjwvZGl2Pgor PC9kaXY+Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6 IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDUwcHg7anVzdGlmeS1pdGVtczogc3RyZXRjaCI+ CisgIDxkaXYgc3R5bGU9ImhlaWdodDogNTBweDsgYXNwZWN0LXJhdGlvOiAxLzI7IGp1c3RpZnkt c2VsZjogYXV0bzsgYmFja2dyb3VuZDogZ3JlZW47Ij48L2Rpdj4KIDwvZGl2PgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwgYi9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRtbAppbmRleCA0NjViMzk5NDlmYjI2ZWY5NWY2 ZTcxMTdmN2Q1OTliOGY4MmZmYTY4Li5iZjljMzUzODY2ZjczZDIxZTUwYWNhNTBlZDU5ZGViY2Vl YmZmYzUwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTku aHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTkuaHRtbApAQCAt MTcsNiArMTcsOSBAQAogPHA+VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4g c3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48L3A+CiAKIDxkaXYgaWQ9InJlZmVy ZW5jZS1vdmVybGFwcGVkLXJlZCI+PC9kaXY+Ci08ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBn cmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDEwMHB4OyI+ Cis8ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNvbHVtbnM6IDEwMHB4 OyBncmlkLXRlbXBsYXRlLXJvd3M6IDUwcHg7Ij4KICAgPGRpdiBzdHlsZT0id2lkdGg6IDEwMHB4 OyBhc3BlY3QtcmF0aW86IDIvMTsgYWxpZ24tc2VsZjogc3RyZXRjaDsgYmFja2dyb3VuZDogZ3Jl ZW47Ij48L2Rpdj4KIDwvZGl2PgorPGRpdiBzdHlsZT0iZGlzcGxheTogZ3JpZDsgZ3JpZC10ZW1w bGF0ZS1jb2x1bW5zOiAxMDBweDsgZ3JpZC10ZW1wbGF0ZS1yb3dzOiA1MHB4OyBhbGlnbi1pdGVt czogc3RyZXRjaCI+CisgIDxkaXYgc3R5bGU9IndpZHRoOiAxMDBweDsgYXNwZWN0LXJhdGlvOiAy LzE7IGFsaWduLXNlbGY6IGF1dG87IGJhY2tncm91bmQ6IGdyZWVuOyI+PC9kaXY+Cis8L2Rpdj4K 433855 2021-07-20 01:04:40 -0700 2021-07-20 03:39:10 -0700 Patch bug-225860-20210720100438.patch text/plain 21937 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzIwN2NhNmNmZDcxMTc0 ZWJhNzFkNTg1MTk5MzRmMDcxOGFiMDZmMC4uNzQ2Yjc5YmNkMTFmOTNiY2QzNzFhM2I1OWEwMjYw OGZlNjBlMWNmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTA3LTIwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGdyaWQgYXNwZWN0LXJhdGlv IHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjU4NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXggdmFyaW91cyBjb21iaW5hdGlvbnMgb2YgaW1wbGljaXQvZXhwbGljaXQgc3RyZXRjaGluZyBp biBpbmxpbmUgYW5kCisgICAgICAgIGJsb2NrIGRpcmVjdGlvbnMgYXMgdGVzdGVkIGJ5IGdyaWQt YXNwZWN0LXJhdGlvLTAyOC5odG1sIHVudGlsCisgICAgICAgIGdyaWQtYXNwZWN0LXJhdGlvLTAz OC5odG1sIGFuZCBhcyBzcGVjaWZpZWQgWzEsIDJdLgorICAgICAgICBBbHNvIHRyZWF0IGV4cGxp Y2l0IHN0cmV0Y2hpbmcgdGhyb3VnaCBqdXN0aWZ5LWl0ZW1zL2FsaWduLWl0ZW1zOiBzdHJldGNo CisgICAgICAgIGxpa2UganVzdGlmeS1zZWxmL2FsaWduLXNlbGY6IHN0cmV0Y2guCisKKyAgICAg ICAgWzFdIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZ3JpZC8jZ3JpZC1pdGVtLXNpemlu ZworICAgICAgICBbMl0gLy9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJh dGlvCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJveDo6aGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RS YXRpbyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6 OnNlbGZBbGlnbm1lbnRGb3JDaGlsZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJH cmlkOjphbGlnblNlbGZGb3JDaGlsZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJH cmlkOjpqdXN0aWZ5U2VsZkZvckNoaWxkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckdyaWQ6OmFzcGVjdFJhdGlvUHJlZmVyc0lubGluZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJHcmlkOjphcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkSWZOZWVkZWQpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6aGFzQXV0b1NpemVJblJvd0F4aXMgY29uc3QpOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmg6CisKIDIwMjEtMDctMTkgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IElEQlRyYW5zYWN0 aW9uLmNvbW1pdCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDBh YzBmMTMzYjNmM2ZhNjRjNjA3MmVhMTUwNTI2NWQzZGUzNzI5ZDUuLmMzODY0NDRmYTI5YzhjMDQ2 MGUzNGE4MmM4MTU2ZjY3NmI0ODQ3NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCkBAIC0yNzc3LDcgKzI3NzcsNyBAQCBib29sIFJlbmRlckJveDo6aGFzU3RyZXRjaGVk TG9naWNhbEhlaWdodCgpIGNvbnN0CiB9CiAKIC8vIEZJWE1FOiBDYW4vU2hvdWxkIHdlIG1vdmUg dGhpcyBpbnNpZGUgc3BlY2lmaWMgbGF5b3V0IGNsYXNzZXMgKGZsZXguIGdyaWQpPyBDYW4gd2Ug cmVmYWN0b3IgY29sdW1uRmxleEl0ZW1IYXNTdHJldGNoQWxpZ25tZW50IGxvZ2ljPwotYm9vbCBS ZW5kZXJCb3g6Omhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpIGNvbnN0Citib29sIFJlbmRlckJv eDo6aGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKFN0cmV0Y2hpbmdNb2RlIHN0cmV0Y2hpbmdNb2Rl KSBjb25zdAogewogICAgIGF1dG8mIHN0eWxlID0gdGhpcy0+c3R5bGUoKTsKICAgICBpZiAoIXN0 eWxlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpIHx8IHN0eWxlLm1hcmdpblN0YXJ0KCkuaXNBdXRv KCkgfHwgc3R5bGUubWFyZ2luRW5kKCkuaXNBdXRvKCkpCkBAIC0yNzg4LDkgKzI3ODgsMTAgQEAg Ym9vbCBSZW5kZXJCb3g6Omhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpIGNvbnN0CiAgICAgICAg IC8vIFRoZSAnbm9ybWFsJyB2YWx1ZSBiZWhhdmVzIGxpa2UgJ3N0YXJ0JyBleGNlcHQgZm9yIEZs ZXhib3ggSXRlbXMsIHdoaWNoIG9idmlvdXNseSBzaG91bGQgaGF2ZSBhIGNvbnRhaW5lci4KICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KKyAgICBhdXRvIG5vcm1hbEl0ZW1Qb3NpdGlvbiA9 IHN0cmV0Y2hpbmdNb2RlID09IFN0cmV0Y2hpbmdNb2RlOjpBbnkgPyBjb250YWluaW5nQmxvY2st PnNlbGZBbGlnbm1lbnROb3JtYWxCZWhhdmlvcih0aGlzKSA6IEl0ZW1Qb3NpdGlvbjo6Tm9ybWFs OwogICAgIGlmIChjb250YWluaW5nQmxvY2stPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgIT0g aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKLSAgICAgICAgcmV0dXJuIHN0eWxlLnJlc29sdmVk QWxpZ25TZWxmKCZjb250YWluaW5nQmxvY2stPnN0eWxlKCksIGNvbnRhaW5pbmdCbG9jay0+c2Vs ZkFsaWdubWVudE5vcm1hbEJlaGF2aW9yKHRoaXMpKS5wb3NpdGlvbigpID09IEl0ZW1Qb3NpdGlv bjo6U3RyZXRjaDsKLSAgICByZXR1cm4gc3R5bGUucmVzb2x2ZWRKdXN0aWZ5U2VsZigmY29udGFp bmluZ0Jsb2NrLT5zdHlsZSgpLCBjb250YWluaW5nQmxvY2stPnNlbGZBbGlnbm1lbnROb3JtYWxC ZWhhdmlvcih0aGlzKSkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2g7CisgICAg ICAgIHJldHVybiBzdHlsZS5yZXNvbHZlZEFsaWduU2VsZigmY29udGFpbmluZ0Jsb2NrLT5zdHls ZSgpLCBub3JtYWxJdGVtUG9zaXRpb24pLnBvc2l0aW9uKCkgPT0gSXRlbVBvc2l0aW9uOjpTdHJl dGNoOworICAgIHJldHVybiBzdHlsZS5yZXNvbHZlZEp1c3RpZnlTZWxmKCZjb250YWluaW5nQmxv Y2stPnN0eWxlKCksIG5vcm1hbEl0ZW1Qb3NpdGlvbikucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRp b246OlN0cmV0Y2g7CiB9CiAKIGJvb2wgUmVuZGVyQm94OjpzaXplc0xvZ2ljYWxXaWR0aFRvRml0 Q29udGVudChTaXplVHlwZSB3aWR0aFR5cGUpIGNvbnN0CkBAIC01MjY4LDggKzUyNjksMTMgQEAg Ym9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8o KSBjb25zdAogICAgIGlmIChzaG91bGRJZ25vcmVBc3BlY3RSYXRpbygpKQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKLSAgICBpZiAoaXNHcmlkSXRlbSgpICYmIHNob3VsZENvbXB1dGVTaXplQXNS ZXBsYWNlZCgpICYmIGhhc1N0cmV0Y2hlZExvZ2ljYWxXaWR0aCgpICYmIGhhc1N0cmV0Y2hlZExv Z2ljYWxIZWlnaHQoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChpc0dyaWRJdGVt KCkpIHsKKyAgICAgICAgaWYgKHNob3VsZENvbXB1dGVTaXplQXNSZXBsYWNlZCgpKSB7CisgICAg ICAgICAgICBpZiAoaGFzU3RyZXRjaGVkTG9naWNhbFdpZHRoKCkgJiYgaGFzU3RyZXRjaGVkTG9n aWNhbEhlaWdodCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfSBl bHNlIGlmIChoYXNTdHJldGNoZWRMb2dpY2FsV2lkdGgoU3RyZXRjaGluZ01vZGU6OkV4cGxpY2l0 KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICBhdXRvIGlzUmVzb2x2 YWJsZVBlcmNlbnRhZ2VIZWlnaHQgPSBbJl0gewogICAgICAgICByZXR1cm4gc3R5bGUoKS5sb2dp Y2FsSGVpZ2h0KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgKGlzT3V0T2ZGbG93UG9zaXRp b25lZCgpIHx8IHBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IDc3MThhNGFkYTgyYzlmMWU3YmJkNDczYTlj NDExM2Q1YmViNzUyNGUuLjRlZGY2YjBmZmQ0M2ZiYWRmYTAxN2YzYzlhYmYwNTlmOGVmOGRkNjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTQzLDYgKzQzLDggQEAgZW51 bSBPdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSB7IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJT aXplLCBJbmNsdWRlT3ZlcmxheVMKIAogZW51bSBTaG91bGRDb21wdXRlUHJlZmVycmVkIHsgQ29t cHV0ZUFjdHVhbCwgQ29tcHV0ZVByZWZlcnJlZCB9OwogCitlbnVtIGNsYXNzIFN0cmV0Y2hpbmdN b2RlIHsgQW55LCBFeHBsaWNpdCB9OworCiBjbGFzcyBSZW5kZXJCb3ggOiBwdWJsaWMgUmVuZGVy Qm94TW9kZWxPYmplY3QgewogICAgIFdURl9NQUtFX0lTT19BTExPQ0FURUQoUmVuZGVyQm94KTsK IHB1YmxpYzoKQEAgLTQzNyw3ICs0MzksNyBAQCBvdmVycmlkZTsKICAgICBib29sIHNpemVzTG9n aWNhbFdpZHRoVG9GaXRDb250ZW50KFNpemVUeXBlKSBjb25zdDsKIAogICAgIGJvb2wgaGFzU3Ry ZXRjaGVkTG9naWNhbEhlaWdodCgpIGNvbnN0OwotICAgIGJvb2wgaGFzU3RyZXRjaGVkTG9naWNh bFdpZHRoKCkgY29uc3Q7CisgICAgYm9vbCBoYXNTdHJldGNoZWRMb2dpY2FsV2lkdGgoU3RyZXRj aGluZ01vZGUgPSBTdHJldGNoaW5nTW9kZTo6QW55KSBjb25zdDsKICAgICBib29sIGlzU3RyZXRj aGluZ0NvbHVtbkZsZXhJdGVtKCkgY29uc3Q7CiAgICAgYm9vbCBjb2x1bW5GbGV4SXRlbUhhc1N0 cmV0Y2hBbGlnbm1lbnQoKSBjb25zdDsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJHcmlkLmNwcAppbmRleCA5ZTAwN2Y4ZGRiNzBkODA1ZjBmMWNmZTBlYWJmZGIyN2NiOGU2MTU2 Li5mZjk2OWRmZjUxMDUyYTEyMjA4NWI0MTcwZmQzNDM3YmU2YjQyMTg3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC02OCw3ICs2OCw3IEBAIFJlbmRlckdyaWQ6 On5SZW5kZXJHcmlkKCkKIAogU3R5bGVTZWxmQWxpZ25tZW50RGF0YSBSZW5kZXJHcmlkOjpzZWxm QWxpZ25tZW50Rm9yQ2hpbGQoR3JpZEF4aXMgYXhpcywgY29uc3QgUmVuZGVyQm94JiBjaGlsZCwg Y29uc3QgUmVuZGVyU3R5bGUqIGdyaWRTdHlsZSkgY29uc3QKIHsKLSAgICByZXR1cm4gYXhpcyA9 PSBHcmlkUm93QXhpcyA/IGp1c3RpZnlTZWxmRm9yQ2hpbGQoY2hpbGQsIGdyaWRTdHlsZSkgOiBh bGlnblNlbGZGb3JDaGlsZChjaGlsZCwgZ3JpZFN0eWxlKTsKKyAgICByZXR1cm4gYXhpcyA9PSBH cmlkUm93QXhpcyA/IGp1c3RpZnlTZWxmRm9yQ2hpbGQoY2hpbGQsIFN0cmV0Y2hpbmdNb2RlOjpB bnksIGdyaWRTdHlsZSkgOiBhbGlnblNlbGZGb3JDaGlsZChjaGlsZCwgU3RyZXRjaGluZ01vZGU6 OkFueSwgZ3JpZFN0eWxlKTsKIH0KIAogYm9vbCBSZW5kZXJHcmlkOjpzZWxmQWxpZ25tZW50Q2hh bmdlZFRvU3RyZXRjaChHcmlkQXhpcyBheGlzLCBjb25zdCBSZW5kZXJTdHlsZSYgb2xkU3R5bGUs IGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSwgY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29u c3QKQEAgLTExMTgsMTggKzExMTgsMzEgQEAgTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjphdmFpbGFi bGVBbGlnbm1lbnRTcGFjZUZvckNoaWxkQmVmb3JlU3RyZXRjaGluZyhMYXlvdXRVbmkKICAgICBy ZXR1cm4gc3RkOjptYXgoMF9sdSwgZ3JpZEFyZWFCcmVhZHRoRm9yQ2hpbGQgLSBHcmlkTGF5b3V0 RnVuY3Rpb25zOjptYXJnaW5Mb2dpY2FsU2l6ZUZvckNoaWxkKCp0aGlzLCBjaGlsZEJsb2NrRmxv d0RpcmVjdGlvbiwgY2hpbGQpKTsKIH0KIAotU3R5bGVTZWxmQWxpZ25tZW50RGF0YSBSZW5kZXJH cmlkOjphbGlnblNlbGZGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBSZW5k ZXJTdHlsZSogZ3JpZFN0eWxlKSBjb25zdAorU3R5bGVTZWxmQWxpZ25tZW50RGF0YSBSZW5kZXJH cmlkOjphbGlnblNlbGZGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBTdHJldGNoaW5n TW9kZSBzdHJldGNoaW5nTW9kZSwgY29uc3QgUmVuZGVyU3R5bGUqIGdyaWRTdHlsZSkgY29uc3QK IHsKICAgICBpZiAoIWdyaWRTdHlsZSkKICAgICAgICAgZ3JpZFN0eWxlID0gJnN0eWxlKCk7Ci0g ICAgcmV0dXJuIGNoaWxkLnN0eWxlKCkucmVzb2x2ZWRBbGlnblNlbGYoZ3JpZFN0eWxlLCBzZWxm QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3IoJmNoaWxkKSk7CisgICAgYXV0byBub3JtYWxCZWhhdmlv ciA9IHN0cmV0Y2hpbmdNb2RlID09IFN0cmV0Y2hpbmdNb2RlOjpBbnkgPyBzZWxmQWxpZ25tZW50 Tm9ybWFsQmVoYXZpb3IoJmNoaWxkKSA6IEl0ZW1Qb3NpdGlvbjo6Tm9ybWFsOworICAgIHJldHVy biBjaGlsZC5zdHlsZSgpLnJlc29sdmVkQWxpZ25TZWxmKGdyaWRTdHlsZSwgbm9ybWFsQmVoYXZp b3IpOwogfQogCi1TdHlsZVNlbGZBbGlnbm1lbnREYXRhIFJlbmRlckdyaWQ6Omp1c3RpZnlTZWxm Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCwgY29uc3QgUmVuZGVyU3R5bGUqIGdyaWRT dHlsZSkgY29uc3QKK1N0eWxlU2VsZkFsaWdubWVudERhdGEgUmVuZGVyR3JpZDo6anVzdGlmeVNl bGZGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBTdHJldGNoaW5nTW9kZSBzdHJldGNo aW5nTW9kZSwgY29uc3QgUmVuZGVyU3R5bGUqIGdyaWRTdHlsZSkgY29uc3QKIHsKICAgICBpZiAo IWdyaWRTdHlsZSkKICAgICAgICAgZ3JpZFN0eWxlID0gJnN0eWxlKCk7Ci0gICAgcmV0dXJuIGNo aWxkLnN0eWxlKCkucmVzb2x2ZWRKdXN0aWZ5U2VsZihncmlkU3R5bGUsIHNlbGZBbGlnbm1lbnRO b3JtYWxCZWhhdmlvcigmY2hpbGQpKTsKKyAgICBhdXRvIG5vcm1hbEJlaGF2aW9yID0gc3RyZXRj aGluZ01vZGUgPT0gU3RyZXRjaGluZ01vZGU6OkFueSA/IHNlbGZBbGlnbm1lbnROb3JtYWxCZWhh dmlvcigmY2hpbGQpIDogSXRlbVBvc2l0aW9uOjpOb3JtYWw7CisgICAgcmV0dXJuIGNoaWxkLnN0 eWxlKCkucmVzb2x2ZWRKdXN0aWZ5U2VsZihncmlkU3R5bGUsIG5vcm1hbEJlaGF2aW9yKTsKK30K KworYm9vbCBSZW5kZXJHcmlkOjphc3BlY3RSYXRpb1ByZWZlcnNJbmxpbmUoY29uc3QgUmVuZGVy Qm94JiBjaGlsZCwgYm9vbCBibG9ja0Zsb3dJc0NvbHVtbkF4aXMpCit7CisgICAgaWYgKCFjaGls ZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBi b29sIGhhc0V4cGxpY2l0SW5saW5lU3RyZXRjaCA9IGp1c3RpZnlTZWxmRm9yQ2hpbGQoY2hpbGQs IFN0cmV0Y2hpbmdNb2RlOjpFeHBsaWNpdCkucG9zaXRpb24oKSA9PSBJdGVtUG9zaXRpb246OlN0 cmV0Y2g7CisgICAgYm9vbCBoYXNFeHBsaWNpdEJsb2NrU3RyZXRjaCA9IGFsaWduU2VsZkZvckNo aWxkKGNoaWxkLCBTdHJldGNoaW5nTW9kZTo6RXhwbGljaXQpLnBvc2l0aW9uKCkgPT0gSXRlbVBv c2l0aW9uOjpTdHJldGNoOworICAgIGlmICghYmxvY2tGbG93SXNDb2x1bW5BeGlzKQorICAgICAg ICBzdGQ6OnN3YXAoaGFzRXhwbGljaXRJbmxpbmVTdHJldGNoLCBoYXNFeHBsaWNpdEJsb2NrU3Ry ZXRjaCk7CisgICAgcmV0dXJuICFoYXNFeHBsaWNpdEJsb2NrU3RyZXRjaDsKIH0KIAogLy8gRklY TUU6IFRoaXMgbG9naWMgaXMgc2hhcmVkIGJ5IFJlbmRlckZsZXhpYmxlQm94LCBzbyBpdCBzaG91 bGQgYmUgbW92ZWQgdG8gUmVuZGVyQm94LgpAQCAtMTE0NCw3ICsxMTU3LDcgQEAgdm9pZCBSZW5k ZXJHcmlkOjphcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkSWZOZWVkZWQoUmVuZGVyQm94JiBj aGlsZCkKICAgICBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gY2hpbGRCbG9ja0RpcmVjdGlvbiA9 IEdyaWRMYXlvdXRGdW5jdGlvbnM6OmZsb3dBd2FyZURpcmVjdGlvbkZvckNoaWxkKCp0aGlzLCBj aGlsZCwgRm9yUm93cyk7CiAgICAgYm9vbCBibG9ja0Zsb3dJc0NvbHVtbkF4aXMgPSBjaGlsZEJs b2NrRGlyZWN0aW9uID09IEZvclJvd3M7CiAgICAgYm9vbCBhbGxvd2VkVG9TdHJldGNoQ2hpbGRC bG9ja1NpemUgPSBibG9ja0Zsb3dJc0NvbHVtbkF4aXMgPyBhbGxvd2VkVG9TdHJldGNoQ2hpbGRB bG9uZ0NvbHVtbkF4aXMoY2hpbGQpIDogYWxsb3dlZFRvU3RyZXRjaENoaWxkQWxvbmdSb3dBeGlz KGNoaWxkKTsKLSAgICBpZiAoYWxsb3dlZFRvU3RyZXRjaENoaWxkQmxvY2tTaXplKSB7CisgICAg aWYgKGFsbG93ZWRUb1N0cmV0Y2hDaGlsZEJsb2NrU2l6ZSAmJiAhYXNwZWN0UmF0aW9QcmVmZXJz SW5saW5lKGNoaWxkLCBibG9ja0Zsb3dJc0NvbHVtbkF4aXMpKSB7CiAgICAgICAgIExheW91dFVu aXQgc3RyZXRjaGVkTG9naWNhbEhlaWdodCA9IGF2YWlsYWJsZUFsaWdubWVudFNwYWNlRm9yQ2hp bGRCZWZvcmVTdHJldGNoaW5nKEdyaWRMYXlvdXRGdW5jdGlvbnM6Om92ZXJyaWRpbmdDb250YWlu aW5nQmxvY2tDb250ZW50U2l6ZUZvckNoaWxkKGNoaWxkLCBjaGlsZEJsb2NrRGlyZWN0aW9uKS52 YWx1ZSgpLCBjaGlsZCk7CiAgICAgICAgIExheW91dFVuaXQgZGVzaXJlZExvZ2ljYWxIZWlnaHQg PSBjaGlsZC5jb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoc3RyZXRjaGVkTG9naWNhbEhl aWdodCwgc3RkOjpudWxsb3B0KTsKICAgICAgICAgY2hpbGQuc2V0T3ZlcnJpZGluZ0xvZ2ljYWxI ZWlnaHQoZGVzaXJlZExvZ2ljYWxIZWlnaHQpOwpAQCAtMTg2NywxMSArMTg4MCwxMiBAQCBjb25z dCBjaGFyKiBSZW5kZXJHcmlkOjpyZW5kZXJOYW1lKCkgY29uc3QKIGJvb2wgUmVuZGVyR3JpZDo6 aGFzQXV0b1NpemVJbkNvbHVtbkF4aXMoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsK ICAgICBpZiAoY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKSB7Ci0gICAgICAgIGlmIChp c0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2Rl KCkpIHsKKyAgICAgICAgLy8gRklYTUU6IHNob3VsZCBhbGlnbi1pdGVtcyArIGFsaWduLXNlbGY6 IGF1dG8vanVzdGlmeS1pdGVtcyArIGp1c3RpZnktc2VsZjogYXV0byBiZSB0YWtlbiBpbnRvIGFj Y291bnQ/CisgICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgJiYgY2hpbGQuc3R5bGUoKS5hbGlnblNlbGYoKS5wb3Np dGlvbigpICE9IEl0ZW1Qb3NpdGlvbjo6U3RyZXRjaCkgewogICAgICAgICAgICAgLy8gQSBub24t YXV0byBpbmxpbmUgc2l6ZSBtZWFucyB0aGUgc2FtZSBmb3IgYmxvY2sgc2l6ZSAoY29sdW1uIGF4 aXMgc2l6ZSkgYmVjYXVzZSBvZiB0aGUgYXNwZWN0IHJhdGlvLgogICAgICAgICAgICAgaWYgKCFj aGlsZC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpKQogICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKLSAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgfSBlbHNlIGlmIChjaGlsZC5z dHlsZSgpLmp1c3RpZnlTZWxmKCkucG9zaXRpb24oKSAhPSBJdGVtUG9zaXRpb246OlN0cmV0Y2gp IHsKICAgICAgICAgICAgIGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0eWxl KCkubG9naWNhbEhlaWdodCgpOwogICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhl ZCgpIHx8IChsb2dpY2FsSGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxkLnBl cmNlbnRhZ2VMb2dpY2FsSGVpZ2h0SXNSZXNvbHZhYmxlKCkpKQogICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKQEAgLTE4ODMsMTIgKzE4OTcsMTMgQEAgYm9vbCBSZW5kZXJHcmlkOjpoYXNB dXRvU2l6ZUluQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogYm9vbCBS ZW5kZXJHcmlkOjpoYXNBdXRvU2l6ZUluUm93QXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBj b25zdAogewogICAgIGlmIChjaGlsZC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkpIHsKLSAgICAg ICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3Jp dGluZ01vZGUoKSkgeworICAgICAgICAvLyBGSVhNRTogc2hvdWxkIGFsaWduLWl0ZW1zICsgYWxp Z24tc2VsZjogYXV0by9qdXN0aWZ5LWl0ZW1zICsganVzdGlmeS1zZWxmOiBhdXRvIGJlIHRha2Vu IGludG8gYWNjb3VudD8KKyAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0g Y2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAmJiBjaGlsZC5zdHlsZSgpLmp1c3RpZnlT ZWxmKCkucG9zaXRpb24oKSAhPSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpIHsKICAgICAgICAgICAg IC8vIEEgbm9uLWF1dG8gYmxvY2sgc2l6ZSBtZWFucyB0aGUgc2FtZSBmb3IgaW5saW5lIHNpemUg KHJvdyBheGlzIHNpemUpIGJlY2F1c2Ugb2YgdGhlIGFzcGVjdCByYXRpby4KICAgICAgICAgICAg IGNvbnN0IExlbmd0aCYgbG9naWNhbEhlaWdodCA9IGNoaWxkLnN0eWxlKCkubG9naWNhbEhlaWdo dCgpOwogICAgICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHQuaXNGaXhlZCgpIHx8IChsb2dpY2Fs SGVpZ2h0LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIGNoaWxkLnBlcmNlbnRhZ2VMb2dpY2Fs SGVpZ2h0SXNSZXNvbHZhYmxlKCkpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgfSBlbHNlIGlmIChjaGlsZC5zdHlsZSgpLmFsaWduU2Vs ZigpLnBvc2l0aW9uKCkgIT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoKSB7CiAgICAgICAgICAgICBp ZiAoIWNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkpCiAgICAgICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyR3JpZC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdy aWQuaAppbmRleCA4YzExMTEyM2Y5MzhhMzlmZWZkNGM4MzA5NGY0OWI2ZTNjMjkyYzJiLi43YjAz OWEyMjlmZWMyMTljOTk2NzFjYzg2M2ZjNmRiZWQzODMwMzA1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJHcmlkLmgKQEAgLTE1Niw4ICsxNTYsOCBAQCBwcml2YXRlOgogCiAgICAgdm9p ZCBwYWludENoaWxkcmVuKFBhaW50SW5mbyYgZm9yU2VsZiwgY29uc3QgTGF5b3V0UG9pbnQmIHBh aW50T2Zmc2V0LCBQYWludEluZm8mIGZvckNoaWxkLCBib29sIHVzZVByaW50UmVjdCkgb3ZlcnJp ZGU7CiAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVBbGlnbm1lbnRTcGFjZUZvckNoaWxkQmVmb3Jl U3RyZXRjaGluZyhMYXlvdXRVbml0IGdyaWRBcmVhQnJlYWR0aEZvckNoaWxkLCBjb25zdCBSZW5k ZXJCb3gmKSBjb25zdDsKLSAgICBTdHlsZVNlbGZBbGlnbm1lbnREYXRhIGp1c3RpZnlTZWxmRm9y Q2hpbGQoY29uc3QgUmVuZGVyQm94JiwgY29uc3QgUmVuZGVyU3R5bGUqID0gbnVsbHB0cikgY29u c3Q7Ci0gICAgU3R5bGVTZWxmQWxpZ25tZW50RGF0YSBhbGlnblNlbGZGb3JDaGlsZChjb25zdCBS ZW5kZXJCb3gmLCBjb25zdCBSZW5kZXJTdHlsZSogPSBudWxscHRyKSBjb25zdDsKKyAgICBTdHls ZVNlbGZBbGlnbm1lbnREYXRhIGp1c3RpZnlTZWxmRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94Jiwg U3RyZXRjaGluZ01vZGUgPSBTdHJldGNoaW5nTW9kZTo6QW55LCBjb25zdCBSZW5kZXJTdHlsZSog PSBudWxscHRyKSBjb25zdDsKKyAgICBTdHlsZVNlbGZBbGlnbm1lbnREYXRhIGFsaWduU2VsZkZv ckNoaWxkKGNvbnN0IFJlbmRlckJveCYsIFN0cmV0Y2hpbmdNb2RlID0gU3RyZXRjaGluZ01vZGU6 OkFueSwgY29uc3QgUmVuZGVyU3R5bGUqID0gbnVsbHB0cikgY29uc3Q7CiAgICAgdm9pZCBhcHBs eVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkSWZOZWVkZWQoUmVuZGVyQm94Jik7CiAgICAgYm9vbCBo YXNBdXRvU2l6ZUluQ29sdW1uQXhpcyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKICAg ICBib29sIGhhc0F1dG9TaXplSW5Sb3dBeGlzKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0 OwpAQCAtMTg4LDYgKzE4OCw4IEBAIHByaXZhdGU6CiAKICAgICBib29sIHNob3VsZFJlc2V0TG9n aWNhbEhlaWdodEJlZm9yZUxheW91dCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0K IAorICAgIGJvb2wgYXNwZWN0UmF0aW9QcmVmZXJzSW5saW5lKGNvbnN0IFJlbmRlckJveCYgY2hp bGQsIGJvb2wgYmxvY2tGbG93SXNDb2x1bW5BeGlzKTsKKwogICAgIEdyaWQgbV9ncmlkOwogCiAg ICAgR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtIG1fdHJhY2tTaXppbmdBbGdvcml0aG07CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggYjMwNjJjNzE1MWI5OGU3MmRlOWYzMGEzMDQ3MTg3ZGU0MTc2M2ZkZS4uY2RiOWJhYTRhMmJj ZTAzZjMyMWI3NGZmMTQyNjNlOWJmYWZkYjg4NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIx LTA3LTIwICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgRml4IGdyaWQg YXNwZWN0LXJhdGlvIHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMjU4NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVbnNraXAgdGVzdHMgdGhhdCBub3cgcGFzcy4KKworICAgICAgICAqIFRlc3RF eHBlY3RhdGlvbnM6CisKIDIwMjEtMDctMTkgIFJvYmVydCBKZW5uZXIgIDxKZW5uZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIFtCaWdTdXIgUmVsZWFzZSBXazIgQXJtNjRdIGluc3BlY3Rvci9jc3Mv bm9kZS1zdHlsZXMtcmVmcmVzaGVkLmh0bWwgaXMgYSBmbGFreSBmYWlsdXJlICgyMjQ3ODgpCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCBiNWI4NDdhNTYxMTM3NjY2NTdhZDdkODVk ZmE3ZjNkMTUwYTA1Y2NiLi5kMzUzOTZjYzkyNmNkNWViZmY1Zjk4N2FhNzE5NzJkOWRmYTE0MTk1 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMS0w Ny0yMCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEZpeCBncmlkIGFz cGVjdC1yYXRpbyB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI1ODYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSW1wb3J0IGFzcGVjdC1yYXRpbyB0ZXN0cyBiYXNlZCBvbiA1NmJmOThjNWMwLgor CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9ncmlkLWFzcGVjdC1yYXRpby0wMTMtZXhwZWN0ZWQueGh0OiBSZW1vdmVkLgorICAgICAgICAq IHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3Bl Y3QtcmF0aW8tMDEzLmh0bWw6IFJlbW92ZWQuCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1yYXRpby0wMTguaHRtbDoK KyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2dyaWQtYXNwZWN0LXJhdGlvLTAxOS5odG1sOgorCiAyMDIxLTA3LTE5ICBTaWh1aSBMaXUgIDxz aWh1aV9saXVAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBJREJUcmFuc2FjdGlvbi5j b21taXQoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91 dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYmQyOGE4ZDlmZDAwMjY5N2EyMGM2OTA4N2Yw MzJlYjg0ZjZiNjM2MC4uNDgxMWFhZmY3OGQ0NDU1MmRhNjQzNjgxOTUxMjliNzYzZjdiMjE2ZiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0 cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NzQwLDE3ICs0NzQwLDYgQEAgd2Via2l0Lm9yZy9iLzIx NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl Y3QtcmF0aW8tMDI1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE5 Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1h c3BlY3QtcmF0aW8tMDMwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDMxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDMyLmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8t MDMzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3Jp ZC1hc3BlY3QtcmF0aW8tMDM0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDM2Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0 aW8tMDM3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v Z3JpZC1hc3BlY3QtcmF0aW8tMDM4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vcmVwbGFjZWQtZWxlbWVudC0wMzQuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9zZWxlY3QtZWxlbWVudC0wMDEuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUvY29udGFp bi1pbnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDEzLWV4cGVjdGVkLnhodCBiL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxMy1leHBlY3RlZC54aHQKZGVsZXRlZCBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDA1YTEzNzk0NDgyYTk0ZjZjMTBiZDlkNGM5ODcwNGU2M2Vm NjAzMzEuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDEzLWV4cGVjdGVkLnhodAorKysgL2Rldi9u dWxsCkBAIC0xLDE5ICswLDAgQEAKLTwhRE9DVFlQRSBodG1sIFBVQkxJQyAiLS8vVzNDLy9EVEQg WEhUTUwgMS4wIFN0cmljdC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi94aHRtbDEvRFREL3ho dG1sMS1zdHJpY3QuZHRkIj4KLTxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3ho dG1sIj4KLSA8aGVhZD4KLSAgPHRpdGxlPkNTUyBSZWZ0ZXN0IFJlZmVyZW5jZTwvdGl0bGU+Ci0g IDxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iR8OpcmFyZCBUYWxib3QiIGhyZWY9Imh0dHA6Ly93 d3cuZ3RhbGJvdC5vcmcvQnJvd3NlckJ1Z3NTZWN0aW9uL2NzczIxdGVzdHN1aXRlLyIgLz4KLSAg PHN0eWxlIHR5cGU9InRleHQvY3NzIj48IVtDREFUQVsKLSAgZGl2Ci0gIHsKLSAgYmFja2dyb3Vu ZC1jb2xvcjogZ3JlZW47Ci0gIGhlaWdodDogMTAwcHg7Ci0gIHdpZHRoOiAxMDBweDsKLSAgfQot ICBdXT48L3N0eWxlPgotIDwvaGVhZD4KLSA8Ym9keT4KLSAgPHA+VGVzdCBwYXNzZXMgaWYgdGhl cmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25nPi48 L3A+Ci0gIDxkaXY+PC9kaXY+Ci0gPC9ib2R5PgotPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDEzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlk LWFzcGVjdC1yYXRpby0wMTMuaHRtbApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZTUy ZGIxNjcyMWExYTA4MmJkODZiMjRkODdiZmE0NzA5ODM4NjY5Yy4uMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ncmlkLWFzcGVjdC1y YXRpby0wMTMuaHRtbAorKysgL2Rldi9udWxsCkBAIC0xLDIyICswLDAgQEAKLTwhRE9DVFlQRSBo dG1sPgotPHRpdGxlPkNTUyBhc3BlY3QtcmF0aW86IGl0ZW1zIHN0cmV0Y2hlZCBpbiBib3RoIGF4 ZXMgc2hvdWxkIGlnbm9yZSBhc3BlY3QgcmF0aW88L3RpdGxlPgotPGxpbmsgcmVsPSJhdXRob3Ii IHRpdGxlPSJNb3ppbGxhIiBocmVmPSJodHRwczovL3d3dy5tb3ppbGxhLm9yZy8iPgotPGxpbmsg cmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNh c3BlY3QtcmF0aW8iPgotPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3 Zy5vcmcvY3NzLWdyaWQvI2dyaWQtaXRlbS1zaXppbmciPgotPGxpbmsgcmVsPSJtYXRjaCIgaHJl Zj0iLi4vLi4vcmVmZXJlbmNlL3JlZi1maWxsZWQtZ3JlZW4tMTAwcHgtc3F1YXJlLnhodCIgLz4K LTxzdHlsZT4KLSAgI3JlZmVyZW5jZS1vdmVybGFwcGVkLXJlZCB7Ci0gICAgcG9zaXRpb246IGFi c29sdXRlOwotICAgIGJhY2tncm91bmQtY29sb3I6IHJlZDsKLSAgICB3aWR0aDogMTAwcHg7Ci0g ICAgaGVpZ2h0OiAxMDBweDsKLSAgICB6LWluZGV4OiAtMTsKLSAgfQotPC9zdHlsZT4KLQotPHA+ VGVzdCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25n Pm5vIHJlZDwvc3Ryb25nPi48L3A+Ci0KLTxkaXYgaWQ9InJlZmVyZW5jZS1vdmVybGFwcGVkLXJl ZCI+PC9kaXY+Ci08ZGl2IHN0eWxlPSJkaXNwbGF5OiBncmlkOyBncmlkLXRlbXBsYXRlLWNvbHVt bnM6IDEwMHB4OyBncmlkLXRlbXBsYXRlLXJvd3M6IDEwMHB4OyI+Ci0gIDxkaXYgc3R5bGU9ImJh Y2tncm91bmQ6IGdyZWVuOyBhc3BlY3QtcmF0aW86IDEvMTsganVzdGlmeS1zZWxmOiBzdHJldGNo OyBhbGlnbi1zZWxmOiBzdHJldGNoOyI+PC9kaXY+Ci08L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxOC5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3Jp ZC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwKaW5kZXggNzZmZDZkOTY5NDRhMjBjN2E0OWY5ZTE4ZTE1 MjQxNjlmNGU0MGE3MS4uZDBiNDk2ZTI1MDM1Mjk4NDdiYmY5MWZmOGIwZDQ5NTY1YWJjMTg5MiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwKKysr IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE4Lmh0bWwKQEAgLTE3LDYgKzE3 LDkgQEAKIDxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFyZSBh bmQgPHN0cm9uZz5ubyByZWQ8L3N0cm9uZz4uPC9wPgogCiA8ZGl2IGlkPSJyZWZlcmVuY2Utb3Zl cmxhcHBlZC1yZWQiPjwvZGl2PgotPGRpdiBzdHlsZT0iZGlzcGxheTogZ3JpZDsgZ3JpZC10ZW1w bGF0ZS1jb2x1bW5zOiAxMDBweDsgZ3JpZC10ZW1wbGF0ZS1yb3dzOiAxMDBweDsiPgotICA8ZGl2 IHN0eWxlPSJoZWlnaHQ6IDEwMHB4OyBhc3BlY3QtcmF0aW86IDEvMjsganVzdGlmeS1zZWxmOiBz dHJldGNoOyBiYWNrZ3JvdW5kOiBncmVlbjsiPjwvZGl2PgorPGRpdiBzdHlsZT0iZGlzcGxheTog Z3JpZDsgZ3JpZC10ZW1wbGF0ZS1jb2x1bW5zOiAxMDBweDsgZ3JpZC10ZW1wbGF0ZS1yb3dzOiA1 MHB4OyI+CisgIDxkaXYgc3R5bGU9ImhlaWdodDogNTBweDsgYXNwZWN0LXJhdGlvOiAxLzI7IGp1 c3RpZnktc2VsZjogc3RyZXRjaDsgYmFja2dyb3VuZDogZ3JlZW47Ij48L2Rpdj4KKzwvZGl2Pgor PGRpdiBzdHlsZT0iZGlzcGxheTogZ3JpZDsgZ3JpZC10ZW1wbGF0ZS1jb2x1bW5zOiAxMDBweDsg Z3JpZC10ZW1wbGF0ZS1yb3dzOiA1MHB4O2p1c3RpZnktaXRlbXM6IHN0cmV0Y2giPgorICA8ZGl2 IHN0eWxlPSJoZWlnaHQ6IDUwcHg7IGFzcGVjdC1yYXRpbzogMS8yOyBqdXN0aWZ5LXNlbGY6IGF1 dG87IGJhY2tncm91bmQ6IGdyZWVuOyI+PC9kaXY+CiA8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2dyaWQtYXNwZWN0LXJhdGlvLTAxOS5odG1sIGIvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3Jp ZC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwKaW5kZXggNDY1YjM5OTQ5ZmIyNmVmOTVmNmU3MTE3Zjdk NTk5YjhmODJmZmE2OC4uYmY5YzM1Mzg2NmY3M2QyMWU1MGFjYTUwZWQ1OWRlYmNlZWJmZmM1MCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwKKysr IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vZ3JpZC1hc3BlY3QtcmF0aW8tMDE5Lmh0bWwKQEAgLTE3LDYgKzE3 LDkgQEAKIDxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFyZSBh bmQgPHN0cm9uZz5ubyByZWQ8L3N0cm9uZz4uPC9wPgogCiA8ZGl2IGlkPSJyZWZlcmVuY2Utb3Zl cmxhcHBlZC1yZWQiPjwvZGl2PgotPGRpdiBzdHlsZT0iZGlzcGxheTogZ3JpZDsgZ3JpZC10ZW1w bGF0ZS1jb2x1bW5zOiAxMDBweDsgZ3JpZC10ZW1wbGF0ZS1yb3dzOiAxMDBweDsiPgorPGRpdiBz dHlsZT0iZGlzcGxheTogZ3JpZDsgZ3JpZC10ZW1wbGF0ZS1jb2x1bW5zOiAxMDBweDsgZ3JpZC10 ZW1wbGF0ZS1yb3dzOiA1MHB4OyI+CiAgIDxkaXYgc3R5bGU9IndpZHRoOiAxMDBweDsgYXNwZWN0 LXJhdGlvOiAyLzE7IGFsaWduLXNlbGY6IHN0cmV0Y2g7IGJhY2tncm91bmQ6IGdyZWVuOyI+PC9k aXY+CiA8L2Rpdj4KKzxkaXYgc3R5bGU9ImRpc3BsYXk6IGdyaWQ7IGdyaWQtdGVtcGxhdGUtY29s dW1uczogMTAwcHg7IGdyaWQtdGVtcGxhdGUtcm93czogNTBweDsgYWxpZ24taXRlbXM6IHN0cmV0 Y2giPgorICA8ZGl2IHN0eWxlPSJ3aWR0aDogMTAwcHg7IGFzcGVjdC1yYXRpbzogMi8xOyBhbGln bi1zZWxmOiBhdXRvOyBiYWNrZ3JvdW5kOiBncmVlbjsiPjwvZGl2PgorPC9kaXY+Cg==