213954 2020-07-04 05:18:55 -0700 [SOUP] Add support for HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain 2020-07-09 01:23:33 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=213502 https://bugs.webkit.org/show_bug.cgi?id=193458 P2 Normal --- 214077 1 cgarcia webkit-unassigned agomez berto bugs-noreply clopez ews-watchlist gustavo ltilve mcatanzaro pnormand oldest_to_newest 1668771 0 cgarcia 2020-07-04 05:18:55 -0700 We currently use HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain as SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY because that's the default, but it's not really supported by libsoup. SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY is actually HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain. We need new libsoup API to add the new policy and use the right one. I'm not sure we want to expose the new one in the API though, since it's less restrictive and we now have ITP support. 1668772 1 403520 cgarcia 2020-07-04 05:21:27 -0700 Created attachment 403520 WIP This is wip, it requires new libsoup API, and a new release to add version checks to use the new policy. See https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/127 1668773 2 cgarcia 2020-07-04 05:22:56 -0700 After this, I agree we should rename the policies to avoid confusion between "Only" and "Exclusively" as proposed in bug #193458. 1668784 3 403520 mcatanzaro 2020-07-04 08:38:12 -0700 Comment on attachment 403520 WIP View in context: https://bugs.webkit.org/attachment.cgi?id=403520&action=review Looks good. > Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp:294 > - if (m_thirdPartyCookieBlockingMode == ThirdPartyCookieBlockingMode::All && m_cookieAcceptPolicy == HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain) > + if (m_thirdPartyCookieBlockingMode == ThirdPartyCookieBlockingMode::All && m_cookieAcceptPolicy == HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain) I think we need a comment to explain why we are rejecting changes to ExclusivelyFromMainDocumentDomain but not to OnlyFromMainDocumentDomain: OnlyFromMainDocumentDomain is the default behavior when running layout tests, we have a couple tests that depend on it, and OnlyFromMainDocumentDomain cannot be set by public API users so they'll never notice. 1669391 4 403687 cgarcia 2020-07-07 07:38:59 -0700 Created attachment 403687 WIP Updated and also includes the test expectations. 1669724 5 403772 cgarcia 2020-07-08 05:23:13 -0700 Created attachment 403772 Patch 1669725 6 ews-watchlist 2020-07-08 05:41:01 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1669735 7 403772 pnormand 2020-07-08 06:38:16 -0700 Comment on attachment 403772 Patch I have built this, along with SDK, http tests pass in GTK/Release. 1670030 8 cgarcia 2020-07-08 23:45:14 -0700 (In reply to Philippe Normand from comment #7) > Comment on attachment 403772 [details] > Patch > > I have built this, along with SDK, http tests pass in GTK/Release. Does this mean I can land the patch and the bots will have the new libsoup already? 1670032 9 cgarcia 2020-07-09 00:57:09 -0700 Committed r264156: <https://trac.webkit.org/changeset/264156> 1670041 10 pnormand 2020-07-09 01:23:33 -0700 SDK r264156 is deployed... 403520 2020-07-04 05:21:27 -0700 2020-07-07 07:38:59 -0700 WIP wk-cookies-policy.diff text/plain 4276 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9OZXR3b3Jr U3RvcmFnZVNlc3Npb25Tb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv c291cC9OZXR3b3JrU3RvcmFnZVNlc3Npb25Tb3VwLmNwcAppbmRleCAyYjE4MjUwNGFmZGMuLjhm ZjYxZmQwMDc4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9z b3VwL05ldHdvcmtTdG9yYWdlU2Vzc2lvblNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvc291cC9OZXR3b3JrU3RvcmFnZVNlc3Npb25Tb3VwLmNwcApAQCAtNTYs NyArNTYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6 TmV0d29ya1N0b3JhZ2VTZXNzaW9uKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkKICAgICA6IG1f c2Vzc2lvbklEKHNlc3Npb25JRCkKLSAgICAsIG1fY29va2llQWNjZXB0UG9saWN5KEhUVFBDb29r aWVBY2NlcHRQb2xpY3k6Ok9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluKQorICAgICwgbV9jb29r aWVBY2NlcHRQb2xpY3koSFRUUENvb2tpZUFjY2VwdFBvbGljeTo6RXhjbHVzaXZlbHlGcm9tTWFp bkRvY3VtZW50RG9tYWluKQogICAgICwgbV9jb29raWVTdG9yYWdlKGFkb3B0R1JlZihzb3VwX2Nv b2tpZV9qYXJfbmV3KCkpKQogewogICAgIHNldENvb2tpZUFjY2VwdFBvbGljeShtX2Nvb2tpZUFj Y2VwdFBvbGljeSk7CkBAIC0yNDgsNyArMjQ4LDcgQEAgdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Np b246OnNldENvb2tpZUFjY2VwdFBvbGljeShIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGljeSkK IHsKICAgICBpZiAobV9pc1Jlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkICYmIG1fdGhpcmRQ YXJ0eUNvb2tpZUJsb2NraW5nTW9kZSA9PSBUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlOjpB bGwpIHsKICAgICAgICAgbV9jb29raWVBY2NlcHRQb2xpY3kgPSBwb2xpY3k7Ci0gICAgICAgIGlm IChtX2Nvb2tpZUFjY2VwdFBvbGljeSA9PSBIVFRQQ29va2llQWNjZXB0UG9saWN5OjpPbmx5RnJv bU1haW5Eb2N1bWVudERvbWFpbikKKyAgICAgICAgaWYgKG1fY29va2llQWNjZXB0UG9saWN5ID09 IEhUVFBDb29raWVBY2NlcHRQb2xpY3k6OkV4Y2x1c2l2ZWx5RnJvbU1haW5Eb2N1bWVudERvbWFp bikKICAgICAgICAgICAgIHBvbGljeSA9IEhUVFBDb29raWVBY2NlcHRQb2xpY3k6OkFsd2F5c0Fj Y2VwdDsKICAgICB9CiAKQEAgLTI2MSwxMCArMjYxLDEwIEBAIHZvaWQgTmV0d29ya1N0b3JhZ2VT ZXNzaW9uOjpzZXRDb29raWVBY2NlcHRQb2xpY3koSFRUUENvb2tpZUFjY2VwdFBvbGljeSBwb2xp Y3kpCiAgICAgICAgIHNvdXBQb2xpY3kgPSBTT1VQX0NPT0tJRV9KQVJfQUNDRVBUX05FVkVSOwog ICAgICAgICBicmVhazsKICAgICBjYXNlIEhUVFBDb29raWVBY2NlcHRQb2xpY3k6Ok9ubHlGcm9t TWFpbkRvY3VtZW50RG9tYWluOgotICAgICAgICBzb3VwUG9saWN5ID0gU09VUF9DT09LSUVfSkFS X0FDQ0VQVF9OT19USElSRF9QQVJUWTsKKyAgICAgICAgc291cFBvbGljeSA9IFNPVVBfQ09PS0lF X0pBUl9BQ0NFUFRfR1JBTkRGQVRIRVJFRF9USElSRF9QQVJUWTsKICAgICAgICAgYnJlYWs7CiAg ICAgY2FzZSBIVFRQQ29va2llQWNjZXB0UG9saWN5OjpFeGNsdXNpdmVseUZyb21NYWluRG9jdW1l bnREb21haW46Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICBzb3VwUG9s aWN5ID0gU09VUF9DT09LSUVfSkFSX0FDQ0VQVF9OT19USElSRF9QQVJUWTsKICAgICAgICAgYnJl YWs7CiAgICAgfQogCkBAIC0yNzcsNiArMjc3LDggQEAgSFRUUENvb2tpZUFjY2VwdFBvbGljeSBO ZXR3b3JrU3RvcmFnZVNlc3Npb246OmNvb2tpZUFjY2VwdFBvbGljeSgpIGNvbnN0CiAgICAgY2Fz ZSBTT1VQX0NPT0tJRV9KQVJfQUNDRVBUX0FMV0FZUzoKICAgICAgICAgcmV0dXJuIEhUVFBDb29r aWVBY2NlcHRQb2xpY3k6OkFsd2F5c0FjY2VwdDsKICAgICBjYXNlIFNPVVBfQ09PS0lFX0pBUl9B Q0NFUFRfTk9fVEhJUkRfUEFSVFk6CisgICAgICAgIHJldHVybiBIVFRQQ29va2llQWNjZXB0UG9s aWN5OjpFeGNsdXNpdmVseUZyb21NYWluRG9jdW1lbnREb21haW47CisgICAgY2FzZSBTT1VQX0NP T0tJRV9KQVJfQUNDRVBUX0dSQU5ERkFUSEVSRURfVEhJUkRfUEFSVFk6CiAgICAgICAgIHJldHVy biBIVFRQQ29va2llQWNjZXB0UG9saWN5OjpPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFpbjsKICAg ICBjYXNlIFNPVVBfQ09PS0lFX0pBUl9BQ0NFUFRfTkVWRVI6CiAgICAgICAgIHJldHVybiBIVFRQ Q29va2llQWNjZXB0UG9saWN5OjpOZXZlcjsKQEAgLTI4OSw3ICsyOTEsNyBAQCB2b2lkIE5ldHdv cmtTdG9yYWdlU2Vzc2lvbjo6c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoYm9vbCBl bmFibGVkKQogewogICAgIGlmIChlbmFibGVkKSB7CiAgICAgICAgIG1fY29va2llQWNjZXB0UG9s aWN5ID0gY29va2llQWNjZXB0UG9saWN5KCk7Ci0gICAgICAgIGlmIChtX3RoaXJkUGFydHlDb29r aWVCbG9ja2luZ01vZGUgPT0gVGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTo6QWxsICYmIG1f Y29va2llQWNjZXB0UG9saWN5ID09IEhUVFBDb29raWVBY2NlcHRQb2xpY3k6Ok9ubHlGcm9tTWFp bkRvY3VtZW50RG9tYWluKQorICAgICAgICBpZiAobV90aGlyZFBhcnR5Q29va2llQmxvY2tpbmdN b2RlID09IFRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGU6OkFsbCAmJiBtX2Nvb2tpZUFjY2Vw dFBvbGljeSA9PSBIVFRQQ29va2llQWNjZXB0UG9saWN5OjpFeGNsdXNpdmVseUZyb21NYWluRG9j dW1lbnREb21haW4pCiAgICAgICAgICAgICBzZXRDb29raWVBY2NlcHRQb2xpY3koSFRUUENvb2tp ZUFjY2VwdFBvbGljeTo6QWx3YXlzQWNjZXB0KTsKICAgICAgICAgbV9pc1Jlc291cmNlTG9hZFN0 YXRpc3RpY3NFbmFibGVkID0gdHJ1ZTsKICAgICB9IGVsc2UgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0Q29va2llTWFuYWdlci5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcAppbmRl eCA0MDVlMTJlMjY0YjkuLmQ1OGY2ODBjNzMxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0Q29va2llTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0Q29va2llTWFuYWdlci5jcHAKQEAgLTk2LDYg Kzk2LDcgQEAgc3RhdGljIGlubGluZSBXZWJLaXRDb29raWVBY2NlcHRQb2xpY3kgdG9XZWJLaXRD b29raWVBY2NlcHRQb2xpY3koV2ViQ29yZTo6SFRUUEMKICAgICBjYXNlIFdlYkNvcmU6OkhUVFBD b29raWVBY2NlcHRQb2xpY3k6Ok5ldmVyOgogICAgICAgICByZXR1cm4gV0VCS0lUX0NPT0tJRV9Q T0xJQ1lfQUNDRVBUX05FVkVSOwogICAgIGNhc2UgV2ViQ29yZTo6SFRUUENvb2tpZUFjY2VwdFBv bGljeTo6T25seUZyb21NYWluRG9jdW1lbnREb21haW46CisgICAgY2FzZSBXZWJDb3JlOjpIVFRQ Q29va2llQWNjZXB0UG9saWN5OjpFeGNsdXNpdmVseUZyb21NYWluRG9jdW1lbnREb21haW46CiAg ICAgICAgIHJldHVybiBXRUJLSVRfQ09PS0lFX1BPTElDWV9BQ0NFUFRfTk9fVEhJUkRfUEFSVFk7 CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CkBAIC0xMTEsNyAr MTEyLDcgQEAgc3RhdGljIGlubGluZSBXZWJDb3JlOjpIVFRQQ29va2llQWNjZXB0UG9saWN5IHRv SFRUUENvb2tpZUFjY2VwdFBvbGljeShXZWJLaXRDb28KICAgICBjYXNlIFdFQktJVF9DT09LSUVf UE9MSUNZX0FDQ0VQVF9ORVZFUjoKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkhUVFBDb29raWVB Y2NlcHRQb2xpY3k6Ok5ldmVyOwogICAgIGNhc2UgV0VCS0lUX0NPT0tJRV9QT0xJQ1lfQUNDRVBU X05PX1RISVJEX1BBUlRZOgotICAgICAgICByZXR1cm4gV2ViQ29yZTo6SFRUUENvb2tpZUFjY2Vw dFBvbGljeTo6T25seUZyb21NYWluRG9jdW1lbnREb21haW47CisgICAgICAgIHJldHVybiBXZWJD b3JlOjpIVFRQQ29va2llQWNjZXB0UG9saWN5OjpFeGNsdXNpdmVseUZyb21NYWluRG9jdW1lbnRE b21haW47CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAg ICAgIHJldHVybiBXZWJDb3JlOjpIVFRQQ29va2llQWNjZXB0UG9saWN5OjpBbHdheXNBY2NlcHQ7 Cg== 403687 2020-07-07 07:38:59 -0700 2020-07-08 05:23:13 -0700 WIP wk2-no-third-party-cookies.diff text/plain 9351 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2dsaWIvVGVzdEV4cGVjdGF0aW9ucyBi L0xheW91dFRlc3RzL3BsYXRmb3JtL2dsaWIvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBlNTBjNzFh NWNjMzkuLjQ0ODIwYWViNTUyZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ2xp Yi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2dsaWIvVGVzdEV4 cGVjdGF0aW9ucwpAQCAtNjAyLDEwICs2MDIsNiBAQCBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3Mv ZGVueS13aXRoLXByb21wdC1kb2VzLW5vdC1wcmVzZXJ2ZS1nZXN0dXJlLmh0bWwgWyBTa2lwCiBo dHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvZGVueS13aXRoLXByb21wdC1kb2VzLW5vdC1wcmVzZXJ2 ZS1nZXN0dXJlLWRhdGFiYXNlLmh0bWwgWyBTa2lwIF0KIHdlYmtpdC5vcmcvYi8yMDg0MDAgaHR0 cC90ZXN0cy9zdG9yYWdlQWNjZXNzL2hhcy1zdG9yYWdlLWFjY2Vzcy10cnVlLWlmLXRoaXJkLXBh cnR5LWhhcy1jb29raWVzLWVwaGVtZXJhbC1kYXRhYmFzZS5odG1sIFsgRmFpbHVyZSBdCiB3ZWJr aXQub3JnL2IvMjA4NDAwIGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9oYXMtc3RvcmFnZS1hY2Nl c3MtdHJ1ZS1pZi10aGlyZC1wYXJ0eS1oYXMtY29va2llcy1lcGhlbWVyYWwuaHRtbCBbIEZhaWx1 cmUgXQotd2Via2l0Lm9yZy9iLzIxMzk1NCBodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVz dC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4tbmF2aWdhdGUtY3Jvc3Mtc2l0ZS1zaG91bGQtbm90LWhh dmUtYWNjZXNzLWRhdGFiYXNlLmh0bWwgWyBGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTM5NTQg aHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLW5h dmlnYXRlLWNyb3NzLXNpdGUtc2hvdWxkLW5vdC1oYXZlLWFjY2Vzcy5odG1sIFsgRmFpbHVyZSBd Ci13ZWJraXQub3JnL2IvMjEzOTU0IGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFu ZC1ncmFudC1hY2Nlc3MtdGhlbi1uYXZpZ2F0ZS1zYW1lLXNpdGUtc2hvdWxkLWhhdmUtYWNjZXNz LWRhdGFiYXNlLmh0bWwgWyBGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTM5NTQgaHR0cC90ZXN0 cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdyYW50LWFjY2Vzcy10aGVuLW5hdmlnYXRlLXNh bWUtc2l0ZS1zaG91bGQtaGF2ZS1hY2Nlc3MuaHRtbCBbIEZhaWx1cmUgXQogCiB3ZWJraXQub3Jn L2IvMTcyMDU2IGZhc3QvdGV4dC9tdWx0aWdseXBoLWNoYXJhY3RlcnMuaHRtbCBbIFBhc3MgXQog CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9nbGliL2h0dHAvdGVzdHMvd2Vic29j a2V0L3Rlc3RzL2h5Ymkvd2Vic29ja2V0LWFsbG93ZWQtc2V0dGluZy1jb29raWUtYXMtdGhpcmQt cGFydHktZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ2xpYi9odHRwL3Rlc3Rz L3dlYnNvY2tldC90ZXN0cy9oeWJpL3dlYnNvY2tldC1hbGxvd2VkLXNldHRpbmctY29va2llLWFz LXRoaXJkLXBhcnR5LWV4cGVjdGVkLnR4dApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg OTNiMjEyYmEzYzVjLi4wMDAwMDAwMDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ2xp Yi9odHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3dlYnNvY2tldC1hbGxvd2VkLXNldHRp bmctY29va2llLWFzLXRoaXJkLXBhcnR5LWV4cGVjdGVkLnR4dAorKysgL2Rldi9udWxsCkBAIC0x LDE5ICswLDAgQEAKLVRlc3RzIFdlYlNvY2tldCBTZXQtQ29va2llIGJlaGF2aW9yIGZvciB0aGly ZC1wYXJ0aWVzIHdpdGggZXhpc3RpbmcgY29va2llcy4KLQotT24gc3VjY2VzcywgeW91IHdpbGwg c2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExF VEUiLgotCi0KLVBBU1MgZG9jdW1lbnQubG9jYXRpb24uaG9zdCBpcyAiMTI3LjAuMC4xOjgwMDAi Ci0KLVNldHRpbmcgdGhpcmQtcGFydHkgY29va2llICdmb28nIHRocm91Z2ggY3Jvc3Mtb3JpZ2lu IFdlYlNvY2tldCBoYW5kc2hha2UuCi0KLU9wZW5pbmcgbG9jYWxob3N0IHRoaXJkLXBhcnR5IGlm cmFtZSB0byBjaGVjayBpdHMgY29va2llcy4KLVBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRy dWUKLQotVEVTVCBDT01QTEVURQotCi0KLS0tLS0tLS0tCi1GcmFtZTogJzwhLS1mcmFtZTEtLT4n Ci0tLS0tLS0tLQotQ29va2llcyBhcmU6IHNldEFzRmlyc3RQYXJ0eSA9IHZhbHVlCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9nbGliL2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3Rz L2h5Ymkvd2Vic29ja2V0LWNvb2tpZS1vdmVyd3JpdGUtYmVoYXZpb3ItZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vZ2xpYi9odHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJp L3dlYnNvY2tldC1jb29raWUtb3ZlcndyaXRlLWJlaGF2aW9yLWV4cGVjdGVkLnR4dApkZWxldGVk IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggOWIxZWQwYTNiNGVmLi4wMDAwMDAwMDAwMDAKLS0tIGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vZ2xpYi9odHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJp L3dlYnNvY2tldC1jb29raWUtb3ZlcndyaXRlLWJlaGF2aW9yLWV4cGVjdGVkLnR4dAorKysgL2Rl di9udWxsCkBAIC0xLDE4ICswLDAgQEAKLVRlc3RzIFdlYlNvY2tldCBTZXQtQ29va2llIG92ZXJ3 cml0aW5nIGJlaGF2aW9yIHdpdGggcmVzcGVjdCB0byBhIGRvY3VtZW50IGNvb2tpZS4KLQotT24g c3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93 ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgotCi0KLVNldHRpbmcgdGhpcmQtcGFydHkgY29va2llICdm b28nIHRocm91Z2ggY3Jvc3Mtb3JpZ2luIFdlYlNvY2tldCBoYW5kc2hha2UgYW5kIGNoZWNraW5n IHRoYXQgaXQgZG9lc24ndCB3cml0ZSBmaXJzdC1wYXJ0eSBjb29raWVzLgotUEFTUyBjb29raWVW YWx1ZSBpcyAiIgotCi1PcGVuaW5nIGxvY2FsaG9zdCB0aGlyZC1wYXJ0eSBpZnJhbWUgdG8gY2hl Y2sgaXRzIGNvb2tpZXMuCi1QQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCi0KLVRFU1Qg Q09NUExFVEUKLQotCi0tLS0tLS0tLQotRnJhbWU6ICc8IS0tZnJhbWUxLS0+JwotLS0tLS0tLS0K LUNvb2tpZXMgYXJlOiBzZXRBc0ZpcnN0UGFydHkgPSB2YWx1ZQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9ndGsvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA3Yzg5ZTBlYmJhYmEuLmQ4ZTY2YjFkMjZiNCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKKysr IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTE3NSw5ICsx NzUsNiBAQCBmYXN0L2ltYWdlcy9wZGYtYXMtYmFja2dyb3VuZC5odG1sIFsgV29udEZpeCBQYXNz IF0KIGZhc3QvaW1hZ2VzL3BkZi1hcy1pbWFnZS5odG1sIFsgV29udEZpeCBQYXNzIF0KIGZhc3Qv aW1hZ2VzL3BkZi1hcy10aWxlZC1iYWNrZ3JvdW5kLmh0bWwgWyBXb250Rml4IFBhc3MgXQogCi0j IERvZXNuJ3QgYXBwbHkgdG8gcGxhdGZvcm1zIHRoYXQgZG9uJ3QgZW5mb3JjZSB0aGUgQ0ZOZXR3 b3JrLXN0eWxlIDNyZCBwYXJ0eSBjb29raWUgcG9saWN5LgotaHR0cC90ZXN0cy9jb29raWVzL3Ro aXJkLXBhcnR5LWNvb2tpZS1yZWxheGluZy5odG1sIFsgV29udEZpeCBGYWlsdXJlIF0KLQogIyBU aGlzIHRlc3QgaXMgc3BlY2lmaWMgdG8gUXVpY2tUaW1lIG1lZGlhIGVuZ2luZS4KIG1lZGlhL3Zp ZGVvLWRvZXMtbm90LWxvb3AuaHRtbCBbIFdvbnRGaXggVGltZW91dCBDcmFzaCBdCiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9OZXR3b3JrU3RvcmFn ZVNlc3Npb25Tb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9O ZXR3b3JrU3RvcmFnZVNlc3Npb25Tb3VwLmNwcAppbmRleCAyYjE4MjUwNGFmZGMuLjhmZjYxZmQw MDc4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL05l dHdvcmtTdG9yYWdlU2Vzc2lvblNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvc291cC9OZXR3b3JrU3RvcmFnZVNlc3Npb25Tb3VwLmNwcApAQCAtNTYsNyArNTYs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6TmV0d29y a1N0b3JhZ2VTZXNzaW9uKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkKICAgICA6IG1fc2Vzc2lv bklEKHNlc3Npb25JRCkKLSAgICAsIG1fY29va2llQWNjZXB0UG9saWN5KEhUVFBDb29raWVBY2Nl cHRQb2xpY3k6Ok9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluKQorICAgICwgbV9jb29raWVBY2Nl cHRQb2xpY3koSFRUUENvb2tpZUFjY2VwdFBvbGljeTo6RXhjbHVzaXZlbHlGcm9tTWFpbkRvY3Vt ZW50RG9tYWluKQogICAgICwgbV9jb29raWVTdG9yYWdlKGFkb3B0R1JlZihzb3VwX2Nvb2tpZV9q YXJfbmV3KCkpKQogewogICAgIHNldENvb2tpZUFjY2VwdFBvbGljeShtX2Nvb2tpZUFjY2VwdFBv bGljeSk7CkBAIC0yNDgsNyArMjQ4LDcgQEAgdm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNl dENvb2tpZUFjY2VwdFBvbGljeShIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGljeSkKIHsKICAg ICBpZiAobV9pc1Jlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkICYmIG1fdGhpcmRQYXJ0eUNv b2tpZUJsb2NraW5nTW9kZSA9PSBUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlOjpBbGwpIHsK ICAgICAgICAgbV9jb29raWVBY2NlcHRQb2xpY3kgPSBwb2xpY3k7Ci0gICAgICAgIGlmIChtX2Nv b2tpZUFjY2VwdFBvbGljeSA9PSBIVFRQQ29va2llQWNjZXB0UG9saWN5OjpPbmx5RnJvbU1haW5E b2N1bWVudERvbWFpbikKKyAgICAgICAgaWYgKG1fY29va2llQWNjZXB0UG9saWN5ID09IEhUVFBD b29raWVBY2NlcHRQb2xpY3k6OkV4Y2x1c2l2ZWx5RnJvbU1haW5Eb2N1bWVudERvbWFpbikKICAg ICAgICAgICAgIHBvbGljeSA9IEhUVFBDb29raWVBY2NlcHRQb2xpY3k6OkFsd2F5c0FjY2VwdDsK ICAgICB9CiAKQEAgLTI2MSwxMCArMjYxLDEwIEBAIHZvaWQgTmV0d29ya1N0b3JhZ2VTZXNzaW9u OjpzZXRDb29raWVBY2NlcHRQb2xpY3koSFRUUENvb2tpZUFjY2VwdFBvbGljeSBwb2xpY3kpCiAg ICAgICAgIHNvdXBQb2xpY3kgPSBTT1VQX0NPT0tJRV9KQVJfQUNDRVBUX05FVkVSOwogICAgICAg ICBicmVhazsKICAgICBjYXNlIEhUVFBDb29raWVBY2NlcHRQb2xpY3k6Ok9ubHlGcm9tTWFpbkRv Y3VtZW50RG9tYWluOgotICAgICAgICBzb3VwUG9saWN5ID0gU09VUF9DT09LSUVfSkFSX0FDQ0VQ VF9OT19USElSRF9QQVJUWTsKKyAgICAgICAgc291cFBvbGljeSA9IFNPVVBfQ09PS0lFX0pBUl9B Q0NFUFRfR1JBTkRGQVRIRVJFRF9USElSRF9QQVJUWTsKICAgICAgICAgYnJlYWs7CiAgICAgY2Fz ZSBIVFRQQ29va2llQWNjZXB0UG9saWN5OjpFeGNsdXNpdmVseUZyb21NYWluRG9jdW1lbnREb21h aW46Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICBzb3VwUG9saWN5ID0g U09VUF9DT09LSUVfSkFSX0FDQ0VQVF9OT19USElSRF9QQVJUWTsKICAgICAgICAgYnJlYWs7CiAg ICAgfQogCkBAIC0yNzcsNiArMjc3LDggQEAgSFRUUENvb2tpZUFjY2VwdFBvbGljeSBOZXR3b3Jr U3RvcmFnZVNlc3Npb246OmNvb2tpZUFjY2VwdFBvbGljeSgpIGNvbnN0CiAgICAgY2FzZSBTT1VQ X0NPT0tJRV9KQVJfQUNDRVBUX0FMV0FZUzoKICAgICAgICAgcmV0dXJuIEhUVFBDb29raWVBY2Nl cHRQb2xpY3k6OkFsd2F5c0FjY2VwdDsKICAgICBjYXNlIFNPVVBfQ09PS0lFX0pBUl9BQ0NFUFRf Tk9fVEhJUkRfUEFSVFk6CisgICAgICAgIHJldHVybiBIVFRQQ29va2llQWNjZXB0UG9saWN5OjpF eGNsdXNpdmVseUZyb21NYWluRG9jdW1lbnREb21haW47CisgICAgY2FzZSBTT1VQX0NPT0tJRV9K QVJfQUNDRVBUX0dSQU5ERkFUSEVSRURfVEhJUkRfUEFSVFk6CiAgICAgICAgIHJldHVybiBIVFRQ Q29va2llQWNjZXB0UG9saWN5OjpPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFpbjsKICAgICBjYXNl IFNPVVBfQ09PS0lFX0pBUl9BQ0NFUFRfTkVWRVI6CiAgICAgICAgIHJldHVybiBIVFRQQ29va2ll QWNjZXB0UG9saWN5OjpOZXZlcjsKQEAgLTI4OSw3ICsyOTEsNyBAQCB2b2lkIE5ldHdvcmtTdG9y YWdlU2Vzc2lvbjo6c2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoYm9vbCBlbmFibGVk KQogewogICAgIGlmIChlbmFibGVkKSB7CiAgICAgICAgIG1fY29va2llQWNjZXB0UG9saWN5ID0g Y29va2llQWNjZXB0UG9saWN5KCk7Ci0gICAgICAgIGlmIChtX3RoaXJkUGFydHlDb29raWVCbG9j a2luZ01vZGUgPT0gVGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTo6QWxsICYmIG1fY29va2ll QWNjZXB0UG9saWN5ID09IEhUVFBDb29raWVBY2NlcHRQb2xpY3k6Ok9ubHlGcm9tTWFpbkRvY3Vt ZW50RG9tYWluKQorICAgICAgICBpZiAobV90aGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlID09 IFRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGU6OkFsbCAmJiBtX2Nvb2tpZUFjY2VwdFBvbGlj eSA9PSBIVFRQQ29va2llQWNjZXB0UG9saWN5OjpFeGNsdXNpdmVseUZyb21NYWluRG9jdW1lbnRE b21haW4pCiAgICAgICAgICAgICBzZXRDb29raWVBY2NlcHRQb2xpY3koSFRUUENvb2tpZUFjY2Vw dFBvbGljeTo6QWx3YXlzQWNjZXB0KTsKICAgICAgICAgbV9pc1Jlc291cmNlTG9hZFN0YXRpc3Rp Y3NFbmFibGVkID0gdHJ1ZTsKICAgICB9IGVsc2UgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0Q29va2llTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcAppbmRleCA0MDVl MTJlMjY0YjkuLjFlZTczZWJjMGVhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL2dsaWIvV2ViS2l0Q29va2llTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0Q29va2llTWFuYWdlci5jcHAKQEAgLTk1LDEyICs5NSwx MiBAQCBzdGF0aWMgaW5saW5lIFdlYktpdENvb2tpZUFjY2VwdFBvbGljeSB0b1dlYktpdENvb2tp ZUFjY2VwdFBvbGljeShXZWJDb3JlOjpIVFRQQwogICAgICAgICByZXR1cm4gV0VCS0lUX0NPT0tJ RV9QT0xJQ1lfQUNDRVBUX0FMV0FZUzsKICAgICBjYXNlIFdlYkNvcmU6OkhUVFBDb29raWVBY2Nl cHRQb2xpY3k6Ok5ldmVyOgogICAgICAgICByZXR1cm4gV0VCS0lUX0NPT0tJRV9QT0xJQ1lfQUND RVBUX05FVkVSOwotICAgIGNhc2UgV2ViQ29yZTo6SFRUUENvb2tpZUFjY2VwdFBvbGljeTo6T25s eUZyb21NYWluRG9jdW1lbnREb21haW46CisgICAgY2FzZSBXZWJDb3JlOjpIVFRQQ29va2llQWNj ZXB0UG9saWN5OjpFeGNsdXNpdmVseUZyb21NYWluRG9jdW1lbnREb21haW46CiAgICAgICAgIHJl dHVybiBXRUJLSVRfQ09PS0lFX1BPTElDWV9BQ0NFUFRfTk9fVEhJUkRfUEFSVFk7Ci0gICAgZGVm YXVsdDoKLSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIHJldHVybiBXRUJL SVRfQ09PS0lFX1BPTElDWV9BQ0NFUFRfQUxXQVlTOworICAgIGNhc2UgV2ViQ29yZTo6SFRUUENv b2tpZUFjY2VwdFBvbGljeTo6T25seUZyb21NYWluRG9jdW1lbnREb21haW46CisgICAgICAgIGJy ZWFrOwogICAgIH0KKyAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCiBzdGF0 aWMgaW5saW5lIFdlYkNvcmU6OkhUVFBDb29raWVBY2NlcHRQb2xpY3kgdG9IVFRQQ29va2llQWNj ZXB0UG9saWN5KFdlYktpdENvb2tpZUFjY2VwdFBvbGljeSBraXRQb2xpY3kpCkBAIC0xMTEsMTEg KzExMSw5IEBAIHN0YXRpYyBpbmxpbmUgV2ViQ29yZTo6SFRUUENvb2tpZUFjY2VwdFBvbGljeSB0 b0hUVFBDb29raWVBY2NlcHRQb2xpY3koV2ViS2l0Q29vCiAgICAgY2FzZSBXRUJLSVRfQ09PS0lF X1BPTElDWV9BQ0NFUFRfTkVWRVI6CiAgICAgICAgIHJldHVybiBXZWJDb3JlOjpIVFRQQ29va2ll QWNjZXB0UG9saWN5OjpOZXZlcjsKICAgICBjYXNlIFdFQktJVF9DT09LSUVfUE9MSUNZX0FDQ0VQ VF9OT19USElSRF9QQVJUWToKLSAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkhUVFBDb29raWVBY2Nl cHRQb2xpY3k6Ok9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluOwotICAgIGRlZmF1bHQ6Ci0gICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICByZXR1cm4gV2ViQ29yZTo6SFRUUENv b2tpZUFjY2VwdFBvbGljeTo6QWx3YXlzQWNjZXB0OworICAgICAgICByZXR1cm4gV2ViQ29yZTo6 SFRUUENvb2tpZUFjY2VwdFBvbGljeTo6RXhjbHVzaXZlbHlGcm9tTWFpbkRvY3VtZW50RG9tYWlu OwogICAgIH0KKyAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCiBzdGF0aWMg dm9pZCB3ZWJraXRfY29va2llX21hbmFnZXJfY2xhc3NfaW5pdChXZWJLaXRDb29raWVNYW5hZ2Vy Q2xhc3MqIGZpbmRDbGFzcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5o CmluZGV4IDdhMTBlYWI3YTg2My4uZGFhNTczYTA0ZTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQb29sLmgKQEAgLTY4NCw3ICs2ODQsNyBAQCBwcml2YXRlOgogICAgIFdl YkNvbnRleHRTdXBwbGVtZW50TWFwIG1fc3VwcGxlbWVudHM7CiAKICNpZiBVU0UoU09VUCkKLSAg ICBXZWJDb3JlOjpIVFRQQ29va2llQWNjZXB0UG9saWN5IG1faW5pdGlhbEhUVFBDb29raWVBY2Nl cHRQb2xpY3kgeyBXZWJDb3JlOjpIVFRQQ29va2llQWNjZXB0UG9saWN5OjpPbmx5RnJvbU1haW5E b2N1bWVudERvbWFpbiB9OworICAgIFdlYkNvcmU6OkhUVFBDb29raWVBY2NlcHRQb2xpY3kgbV9p bml0aWFsSFRUUENvb2tpZUFjY2VwdFBvbGljeSB7IFdlYkNvcmU6OkhUVFBDb29raWVBY2NlcHRQ b2xpY3k6OkV4Y2x1c2l2ZWx5RnJvbU1haW5Eb2N1bWVudERvbWFpbiB9OwogICAgIFdlYkNvcmU6 OlNvdXBOZXR3b3JrUHJveHlTZXR0aW5ncyBtX25ldHdvcmtQcm94eVNldHRpbmdzOwogI2VuZGlm CiAK 403772 2020-07-08 05:23:13 -0700 2020-07-08 07:50:19 -0700 Patch wk2-no-third-party.diff text/plain 14197 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2YTYyOTMzYzkwMjkuLjY5NjhlYmVjZGQxZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBA CisyMDIwLTA3LTA4ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K KworICAgICAgICBbU09VUF0gQWRkIHN1cHBvcnQgZm9yIEhUVFBDb29raWVBY2NlcHRQb2xpY3k6 Ok9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM5NTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGVzdCBleHBlY3RhdGlvbnMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9nbGliL1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogcGxhdGZvcm0vZ2xp Yi9odHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3dlYnNvY2tldC1hbGxvd2VkLXNldHRp bmctY29va2llLWFzLXRoaXJkLXBhcnR5LWV4cGVjdGVkLnR4dDogUmVtb3ZlZC4KKyAgICAgICAg KiBwbGF0Zm9ybS9nbGliL2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5Ymkvd2Vic29ja2V0 LWNvb2tpZS1vdmVyd3JpdGUtYmVoYXZpb3ItZXhwZWN0ZWQudHh0OiBSZW1vdmVkLgorICAgICAg ICAqIHBsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDIwLTA3LTA3ICBMYXVybyBN b3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dQRV0gR2FyZGVuIHNv bWUgcmVjZW50IGZhaWx1cmVzIGFuZCBtb3ZlIHJlbGF0ZWQgZW50cmllcyB0b2dldGhlcgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ2xpYi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vZ2xpYi9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGE1Mjk3OGZkMTZi Ni4uOTlhYTk5OTUzNDA2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9nbGliL1Rl c3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ2xpYi9UZXN0RXhwZWN0 YXRpb25zCkBAIC02MjcsMTAgKzYyNyw2IEBAIGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9kZW55 LXdpdGgtcHJvbXB0LWRvZXMtbm90LXByZXNlcnZlLWdlc3R1cmUuaHRtbCBbIFNraXAKIGh0dHAv dGVzdHMvc3RvcmFnZUFjY2Vzcy9kZW55LXdpdGgtcHJvbXB0LWRvZXMtbm90LXByZXNlcnZlLWdl c3R1cmUtZGF0YWJhc2UuaHRtbCBbIFNraXAgXQogd2Via2l0Lm9yZy9iLzIwODQwMCBodHRwL3Rl c3RzL3N0b3JhZ2VBY2Nlc3MvaGFzLXN0b3JhZ2UtYWNjZXNzLXRydWUtaWYtdGhpcmQtcGFydHkt aGFzLWNvb2tpZXMtZXBoZW1lcmFsLWRhdGFiYXNlLmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5v cmcvYi8yMDg0MDAgaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL2hhcy1zdG9yYWdlLWFjY2Vzcy10 cnVlLWlmLXRoaXJkLXBhcnR5LWhhcy1jb29raWVzLWVwaGVtZXJhbC5odG1sIFsgRmFpbHVyZSBd Ci13ZWJraXQub3JnL2IvMjEzOTU0IGh0dHAvdGVzdHMvc3RvcmFnZUFjY2Vzcy9yZXF1ZXN0LWFu ZC1ncmFudC1hY2Nlc3MtdGhlbi1uYXZpZ2F0ZS1jcm9zcy1zaXRlLXNob3VsZC1ub3QtaGF2ZS1h Y2Nlc3MtZGF0YWJhc2UuaHRtbCBbIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxMzk1NCBodHRw L3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4tbmF2aWdh dGUtY3Jvc3Mtc2l0ZS1zaG91bGQtbm90LWhhdmUtYWNjZXNzLmh0bWwgWyBGYWlsdXJlIF0KLXdl YmtpdC5vcmcvYi8yMTM5NTQgaHR0cC90ZXN0cy9zdG9yYWdlQWNjZXNzL3JlcXVlc3QtYW5kLWdy YW50LWFjY2Vzcy10aGVuLW5hdmlnYXRlLXNhbWUtc2l0ZS1zaG91bGQtaGF2ZS1hY2Nlc3MtZGF0 YWJhc2UuaHRtbCBbIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxMzk1NCBodHRwL3Rlc3RzL3N0 b3JhZ2VBY2Nlc3MvcmVxdWVzdC1hbmQtZ3JhbnQtYWNjZXNzLXRoZW4tbmF2aWdhdGUtc2FtZS1z aXRlLXNob3VsZC1oYXZlLWFjY2Vzcy5odG1sIFsgRmFpbHVyZSBdCiAKIHdlYmtpdC5vcmcvYi8x NzIwNTYgZmFzdC90ZXh0L211bHRpZ2x5cGgtY2hhcmFjdGVycy5odG1sIFsgUGFzcyBdCiAKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2dsaWIvaHR0cC90ZXN0cy93ZWJzb2NrZXQv dGVzdHMvaHliaS93ZWJzb2NrZXQtYWxsb3dlZC1zZXR0aW5nLWNvb2tpZS1hcy10aGlyZC1wYXJ0 eS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9nbGliL2h0dHAvdGVzdHMvd2Vi c29ja2V0L3Rlc3RzL2h5Ymkvd2Vic29ja2V0LWFsbG93ZWQtc2V0dGluZy1jb29raWUtYXMtdGhp cmQtcGFydHktZXhwZWN0ZWQudHh0CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA5M2Iy MTJiYTNjNWMuLjAwMDAwMDAwMDAwMAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9nbGliL2h0 dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5Ymkvd2Vic29ja2V0LWFsbG93ZWQtc2V0dGluZy1j b29raWUtYXMtdGhpcmQtcGFydHktZXhwZWN0ZWQudHh0CisrKyAvZGV2L251bGwKQEAgLTEsMTkg KzAsMCBAQAotVGVzdHMgV2ViU29ja2V0IFNldC1Db29raWUgYmVoYXZpb3IgZm9yIHRoaXJkLXBh cnRpZXMgd2l0aCBleGlzdGluZyBjb29raWVzLgotCi1PbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUg YSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIu Ci0KLQotUEFTUyBkb2N1bWVudC5sb2NhdGlvbi5ob3N0IGlzICIxMjcuMC4wLjE6ODAwMCIKLQot U2V0dGluZyB0aGlyZC1wYXJ0eSBjb29raWUgJ2ZvbycgdGhyb3VnaCBjcm9zcy1vcmlnaW4gV2Vi U29ja2V0IGhhbmRzaGFrZS4KLQotT3BlbmluZyBsb2NhbGhvc3QgdGhpcmQtcGFydHkgaWZyYW1l IHRvIGNoZWNrIGl0cyBjb29raWVzLgotUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQot Ci1URVNUIENPTVBMRVRFCi0KLQotLS0tLS0tLS0KLUZyYW1lOiAnPCEtLWZyYW1lMS0tPicKLS0t LS0tLS0tCi1Db29raWVzIGFyZTogc2V0QXNGaXJzdFBhcnR5ID0gdmFsdWUKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3BsYXRmb3JtL2dsaWIvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHli aS93ZWJzb2NrZXQtY29va2llLW92ZXJ3cml0ZS1iZWhhdmlvci1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9nbGliL2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5Ymkvd2Vi c29ja2V0LWNvb2tpZS1vdmVyd3JpdGUtYmVoYXZpb3ItZXhwZWN0ZWQudHh0CmRlbGV0ZWQgZmls ZSBtb2RlIDEwMDY0NAppbmRleCA5YjFlZDBhM2I0ZWYuLjAwMDAwMDAwMDAwMAotLS0gYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9nbGliL2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5Ymkvd2Vi c29ja2V0LWNvb2tpZS1vdmVyd3JpdGUtYmVoYXZpb3ItZXhwZWN0ZWQudHh0CisrKyAvZGV2L251 bGwKQEAgLTEsMTggKzAsMCBAQAotVGVzdHMgV2ViU29ja2V0IFNldC1Db29raWUgb3ZlcndyaXRp bmcgYmVoYXZpb3Igd2l0aCByZXNwZWN0IHRvIGEgZG9jdW1lbnQgY29va2llLgotCi1PbiBzdWNj ZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBi eSAiVEVTVCBDT01QTEVURSIuCi0KLQotU2V0dGluZyB0aGlyZC1wYXJ0eSBjb29raWUgJ2Zvbycg dGhyb3VnaCBjcm9zcy1vcmlnaW4gV2ViU29ja2V0IGhhbmRzaGFrZSBhbmQgY2hlY2tpbmcgdGhh dCBpdCBkb2Vzbid0IHdyaXRlIGZpcnN0LXBhcnR5IGNvb2tpZXMuCi1QQVNTIGNvb2tpZVZhbHVl IGlzICIiCi0KLU9wZW5pbmcgbG9jYWxob3N0IHRoaXJkLXBhcnR5IGlmcmFtZSB0byBjaGVjayBp dHMgY29va2llcy4KLVBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKLQotVEVTVCBDT01Q TEVURQotCi0KLS0tLS0tLS0tCi1GcmFtZTogJzwhLS1mcmFtZTEtLT4nCi0tLS0tLS0tLQotQ29v a2llcyBhcmU6IHNldEFzRmlyc3RQYXJ0eSA9IHZhbHVlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0 ay9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDVmNTEzZTUzNDA0Yi4uNjg3YzU5ZmE2MzYzIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucworKysgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTc1LDkgKzE3NSw2 IEBAIGZhc3QvaW1hZ2VzL3BkZi1hcy1iYWNrZ3JvdW5kLmh0bWwgWyBXb250Rml4IFBhc3MgXQog ZmFzdC9pbWFnZXMvcGRmLWFzLWltYWdlLmh0bWwgWyBXb250Rml4IFBhc3MgXQogZmFzdC9pbWFn ZXMvcGRmLWFzLXRpbGVkLWJhY2tncm91bmQuaHRtbCBbIFdvbnRGaXggUGFzcyBdCiAKLSMgRG9l c24ndCBhcHBseSB0byBwbGF0Zm9ybXMgdGhhdCBkb24ndCBlbmZvcmNlIHRoZSBDRk5ldHdvcmst c3R5bGUgM3JkIHBhcnR5IGNvb2tpZSBwb2xpY3kuCi1odHRwL3Rlc3RzL2Nvb2tpZXMvdGhpcmQt cGFydHktY29va2llLXJlbGF4aW5nLmh0bWwgWyBXb250Rml4IEZhaWx1cmUgXQotCiAjIFRoaXMg dGVzdCBpcyBzcGVjaWZpYyB0byBRdWlja1RpbWUgbWVkaWEgZW5naW5lLgogbWVkaWEvdmlkZW8t ZG9lcy1ub3QtbG9vcC5odG1sIFsgV29udEZpeCBUaW1lb3V0IENyYXNoIF0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IGNmNmMyMTVjYzM2NS4uMzAzOWYwZmU2YmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMjAtMDctMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtTT1VQXSBBZGQgc3VwcG9ydCBmb3IgSFRUUENvb2tpZUFjY2VwdFBvbGlj eTo6T25seUZyb21NYWluRG9jdW1lbnREb21haW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzk1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEhhbmRsZSBib3RoIE9ubHlGcm9tTWFpbkRvY3VtZW50RG9t YWluIGFuZCBFeGNsdXNpdmVseUZyb21NYWluRG9jdW1lbnREb21haW4uCisKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL3NvdXAvTmV0d29ya1N0b3JhZ2VTZXNzaW9uU291cC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb246Ok5ldHdvcmtTdG9yYWdlU2Vzc2lv bik6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldENvb2tpZUFj Y2VwdFBvbGljeSk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb246OmNv b2tpZUFjY2VwdFBvbGljeSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RvcmFn ZVNlc3Npb246OnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKToKKwogMjAyMC0wNy0w NyAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW0FwcGxlIFBheV0g Rml4IHRoZSBidWlsZCBvbiBDYXRhbGluYSBpbnRlcm5hbCBTREtzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvTmV0d29ya1N0b3JhZ2VTZXNzaW9uU291 cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvTmV0d29ya1N0b3Jh Z2VTZXNzaW9uU291cC5jcHAKaW5kZXggMmIxODI1MDRhZmRjLi45N2RkNzllOGExNTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9OZXR3b3JrU3RvcmFn ZVNlc3Npb25Tb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvTmV0d29ya1N0b3JhZ2VTZXNzaW9uU291cC5jcHAKQEAgLTU2LDcgKzU2LDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogCiBOZXR3b3JrU3RvcmFnZVNlc3Npb246Ok5ldHdvcmtTdG9yYWdlU2Vz c2lvbihQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQpCiAgICAgOiBtX3Nlc3Npb25JRChzZXNzaW9u SUQpCi0gICAgLCBtX2Nvb2tpZUFjY2VwdFBvbGljeShIVFRQQ29va2llQWNjZXB0UG9saWN5OjpP bmx5RnJvbU1haW5Eb2N1bWVudERvbWFpbikKKyAgICAsIG1fY29va2llQWNjZXB0UG9saWN5KEhU VFBDb29raWVBY2NlcHRQb2xpY3k6OkV4Y2x1c2l2ZWx5RnJvbU1haW5Eb2N1bWVudERvbWFpbikK ICAgICAsIG1fY29va2llU3RvcmFnZShhZG9wdEdSZWYoc291cF9jb29raWVfamFyX25ldygpKSkK IHsKICAgICBzZXRDb29raWVBY2NlcHRQb2xpY3kobV9jb29raWVBY2NlcHRQb2xpY3kpOwpAQCAt MjQ4LDcgKzI0OCw3IEBAIHZvaWQgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpzZXRDb29raWVBY2Nl cHRQb2xpY3koSFRUUENvb2tpZUFjY2VwdFBvbGljeSBwb2xpY3kpCiB7CiAgICAgaWYgKG1faXNS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCAmJiBtX3RoaXJkUGFydHlDb29raWVCbG9ja2lu Z01vZGUgPT0gVGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTo6QWxsKSB7CiAgICAgICAgIG1f Y29va2llQWNjZXB0UG9saWN5ID0gcG9saWN5OwotICAgICAgICBpZiAobV9jb29raWVBY2NlcHRQ b2xpY3kgPT0gSFRUUENvb2tpZUFjY2VwdFBvbGljeTo6T25seUZyb21NYWluRG9jdW1lbnREb21h aW4pCisgICAgICAgIGlmIChtX2Nvb2tpZUFjY2VwdFBvbGljeSA9PSBIVFRQQ29va2llQWNjZXB0 UG9saWN5OjpFeGNsdXNpdmVseUZyb21NYWluRG9jdW1lbnREb21haW4pCiAgICAgICAgICAgICBw b2xpY3kgPSBIVFRQQ29va2llQWNjZXB0UG9saWN5OjpBbHdheXNBY2NlcHQ7CiAgICAgfQogCkBA IC0yNjEsMTAgKzI2MSwxNCBAQCB2b2lkIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29va2ll QWNjZXB0UG9saWN5KEhUVFBDb29raWVBY2NlcHRQb2xpY3kgcG9saWN5KQogICAgICAgICBzb3Vw UG9saWN5ID0gU09VUF9DT09LSUVfSkFSX0FDQ0VQVF9ORVZFUjsKICAgICAgICAgYnJlYWs7CiAg ICAgY2FzZSBIVFRQQ29va2llQWNjZXB0UG9saWN5OjpPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFp bjoKLSAgICAgICAgc291cFBvbGljeSA9IFNPVVBfQ09PS0lFX0pBUl9BQ0NFUFRfTk9fVEhJUkRf UEFSVFk7CisjaWYgU09VUF9DSEVDS19WRVJTSU9OKDIsIDcxLCAwKQorICAgICAgICBzb3VwUG9s aWN5ID0gU09VUF9DT09LSUVfSkFSX0FDQ0VQVF9HUkFOREZBVEhFUkVEX1RISVJEX1BBUlRZOwog ICAgICAgICBicmVhazsKKyNlbHNlCisgICAgICAgIEZBTExUSFJPVUdIOworI2VuZGlmCiAgICAg Y2FzZSBIVFRQQ29va2llQWNjZXB0UG9saWN5OjpFeGNsdXNpdmVseUZyb21NYWluRG9jdW1lbnRE b21haW46Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICBzb3VwUG9saWN5 ID0gU09VUF9DT09LSUVfSkFSX0FDQ0VQVF9OT19USElSRF9QQVJUWTsKICAgICAgICAgYnJlYWs7 CiAgICAgfQogCkBAIC0yNzcsNyArMjgxLDExIEBAIEhUVFBDb29raWVBY2NlcHRQb2xpY3kgTmV0 d29ya1N0b3JhZ2VTZXNzaW9uOjpjb29raWVBY2NlcHRQb2xpY3koKSBjb25zdAogICAgIGNhc2Ug U09VUF9DT09LSUVfSkFSX0FDQ0VQVF9BTFdBWVM6CiAgICAgICAgIHJldHVybiBIVFRQQ29va2ll QWNjZXB0UG9saWN5OjpBbHdheXNBY2NlcHQ7CiAgICAgY2FzZSBTT1VQX0NPT0tJRV9KQVJfQUND RVBUX05PX1RISVJEX1BBUlRZOgorICAgICAgICByZXR1cm4gSFRUUENvb2tpZUFjY2VwdFBvbGlj eTo6RXhjbHVzaXZlbHlGcm9tTWFpbkRvY3VtZW50RG9tYWluOworI2lmIFNPVVBfQ0hFQ0tfVkVS U0lPTigyLCA3MSwgMCkKKyAgICBjYXNlIFNPVVBfQ09PS0lFX0pBUl9BQ0NFUFRfR1JBTkRGQVRI RVJFRF9USElSRF9QQVJUWToKICAgICAgICAgcmV0dXJuIEhUVFBDb29raWVBY2NlcHRQb2xpY3k6 Ok9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluOworI2VuZGlmCiAgICAgY2FzZSBTT1VQX0NPT0tJ RV9KQVJfQUNDRVBUX05FVkVSOgogICAgICAgICByZXR1cm4gSFRUUENvb2tpZUFjY2VwdFBvbGlj eTo6TmV2ZXI7CiAgICAgfQpAQCAtMjg5LDcgKzI5Nyw3IEBAIHZvaWQgTmV0d29ya1N0b3JhZ2VT ZXNzaW9uOjpzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChib29sIGVuYWJsZWQpCiB7 CiAgICAgaWYgKGVuYWJsZWQpIHsKICAgICAgICAgbV9jb29raWVBY2NlcHRQb2xpY3kgPSBjb29r aWVBY2NlcHRQb2xpY3koKTsKLSAgICAgICAgaWYgKG1fdGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5n TW9kZSA9PSBUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlOjpBbGwgJiYgbV9jb29raWVBY2Nl cHRQb2xpY3kgPT0gSFRUUENvb2tpZUFjY2VwdFBvbGljeTo6T25seUZyb21NYWluRG9jdW1lbnRE b21haW4pCisgICAgICAgIGlmIChtX3RoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUgPT0gVGhp cmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTo6QWxsICYmIG1fY29va2llQWNjZXB0UG9saWN5ID09 IEhUVFBDb29raWVBY2NlcHRQb2xpY3k6OkV4Y2x1c2l2ZWx5RnJvbU1haW5Eb2N1bWVudERvbWFp bikKICAgICAgICAgICAgIHNldENvb2tpZUFjY2VwdFBvbGljeShIVFRQQ29va2llQWNjZXB0UG9s aWN5OjpBbHdheXNBY2NlcHQpOwogICAgICAgICBtX2lzUmVzb3VyY2VMb2FkU3RhdGlzdGljc0Vu YWJsZWQgPSB0cnVlOwogICAgIH0gZWxzZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQxNTE5NWE4OWUzMS4uYmQ1 OGNhYjY0ZWNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA3LTA4ICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbU09VUF0gQWRk IHN1cHBvcnQgZm9yIEhUVFBDb29raWVBY2NlcHRQb2xpY3k6Ok9ubHlGcm9tTWFpbkRvY3VtZW50 RG9tYWluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTM5NTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV c2UgRXhjbHVzaXZlbHlGcm9tTWFpbkRvY3VtZW50RG9tYWluIGZvciBXRUJLSVRfQ09PS0lFX1BP TElDWV9BQ0NFUFRfTk9fVEhJUkRfUEFSVFkgaW5zdGVhZCBvZgorICAgICAgICBPbmx5RnJvbU1h aW5Eb2N1bWVudERvbWFpbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRD b29raWVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKHRvV2ViS2l0Q29va2llQWNjZXB0UG9saWN5KToK KyAgICAgICAgKHRvSFRUUENvb2tpZUFjY2VwdFBvbGljeSk6CisgICAgICAgICogVUlQcm9jZXNz L1dlYlByb2Nlc3NQb29sLmg6CisKIDIwMjAtMDctMDggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8 Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFVwZGF0ZSBPcHRpb25z R1RLLmNtYWtlIGFuZCBORVdTIGZvciAyLjI5LjMgcmVsZWFzZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0Q29va2llTWFuYWdlci5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcAppbmRl eCA0MDVlMTJlMjY0YjkuLjFlZTczZWJjMGVhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0Q29va2llTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0Q29va2llTWFuYWdlci5jcHAKQEAgLTk1LDEy ICs5NSwxMiBAQCBzdGF0aWMgaW5saW5lIFdlYktpdENvb2tpZUFjY2VwdFBvbGljeSB0b1dlYktp dENvb2tpZUFjY2VwdFBvbGljeShXZWJDb3JlOjpIVFRQQwogICAgICAgICByZXR1cm4gV0VCS0lU X0NPT0tJRV9QT0xJQ1lfQUNDRVBUX0FMV0FZUzsKICAgICBjYXNlIFdlYkNvcmU6OkhUVFBDb29r aWVBY2NlcHRQb2xpY3k6Ok5ldmVyOgogICAgICAgICByZXR1cm4gV0VCS0lUX0NPT0tJRV9QT0xJ Q1lfQUNDRVBUX05FVkVSOwotICAgIGNhc2UgV2ViQ29yZTo6SFRUUENvb2tpZUFjY2VwdFBvbGlj eTo6T25seUZyb21NYWluRG9jdW1lbnREb21haW46CisgICAgY2FzZSBXZWJDb3JlOjpIVFRQQ29v a2llQWNjZXB0UG9saWN5OjpFeGNsdXNpdmVseUZyb21NYWluRG9jdW1lbnREb21haW46CiAgICAg ICAgIHJldHVybiBXRUJLSVRfQ09PS0lFX1BPTElDWV9BQ0NFUFRfTk9fVEhJUkRfUEFSVFk7Ci0g ICAgZGVmYXVsdDoKLSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIHJldHVy biBXRUJLSVRfQ09PS0lFX1BPTElDWV9BQ0NFUFRfQUxXQVlTOworICAgIGNhc2UgV2ViQ29yZTo6 SFRUUENvb2tpZUFjY2VwdFBvbGljeTo6T25seUZyb21NYWluRG9jdW1lbnREb21haW46CisgICAg ICAgIGJyZWFrOwogICAgIH0KKyAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQog CiBzdGF0aWMgaW5saW5lIFdlYkNvcmU6OkhUVFBDb29raWVBY2NlcHRQb2xpY3kgdG9IVFRQQ29v a2llQWNjZXB0UG9saWN5KFdlYktpdENvb2tpZUFjY2VwdFBvbGljeSBraXRQb2xpY3kpCkBAIC0x MTEsMTEgKzExMSw5IEBAIHN0YXRpYyBpbmxpbmUgV2ViQ29yZTo6SFRUUENvb2tpZUFjY2VwdFBv bGljeSB0b0hUVFBDb29raWVBY2NlcHRQb2xpY3koV2ViS2l0Q29vCiAgICAgY2FzZSBXRUJLSVRf Q09PS0lFX1BPTElDWV9BQ0NFUFRfTkVWRVI6CiAgICAgICAgIHJldHVybiBXZWJDb3JlOjpIVFRQ Q29va2llQWNjZXB0UG9saWN5OjpOZXZlcjsKICAgICBjYXNlIFdFQktJVF9DT09LSUVfUE9MSUNZ X0FDQ0VQVF9OT19USElSRF9QQVJUWToKLSAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkhUVFBDb29r aWVBY2NlcHRQb2xpY3k6Ok9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluOwotICAgIGRlZmF1bHQ6 Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICByZXR1cm4gV2ViQ29yZTo6 SFRUUENvb2tpZUFjY2VwdFBvbGljeTo6QWx3YXlzQWNjZXB0OworICAgICAgICByZXR1cm4gV2Vi Q29yZTo6SFRUUENvb2tpZUFjY2VwdFBvbGljeTo6RXhjbHVzaXZlbHlGcm9tTWFpbkRvY3VtZW50 RG9tYWluOwogICAgIH0KKyAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCiBz dGF0aWMgdm9pZCB3ZWJraXRfY29va2llX21hbmFnZXJfY2xhc3NfaW5pdChXZWJLaXRDb29raWVN YW5hZ2VyQ2xhc3MqIGZpbmRDbGFzcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQb29sLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5oCmluZGV4IDdhMTBlYWI3YTg2My4uZGFhNTczYTA0ZTdhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKQEAgLTY4NCw3ICs2ODQsNyBAQCBwcml2YXRlOgog ICAgIFdlYkNvbnRleHRTdXBwbGVtZW50TWFwIG1fc3VwcGxlbWVudHM7CiAKICNpZiBVU0UoU09V UCkKLSAgICBXZWJDb3JlOjpIVFRQQ29va2llQWNjZXB0UG9saWN5IG1faW5pdGlhbEhUVFBDb29r aWVBY2NlcHRQb2xpY3kgeyBXZWJDb3JlOjpIVFRQQ29va2llQWNjZXB0UG9saWN5OjpPbmx5RnJv bU1haW5Eb2N1bWVudERvbWFpbiB9OworICAgIFdlYkNvcmU6OkhUVFBDb29raWVBY2NlcHRQb2xp Y3kgbV9pbml0aWFsSFRUUENvb2tpZUFjY2VwdFBvbGljeSB7IFdlYkNvcmU6OkhUVFBDb29raWVB Y2NlcHRQb2xpY3k6OkV4Y2x1c2l2ZWx5RnJvbU1haW5Eb2N1bWVudERvbWFpbiB9OwogICAgIFdl YkNvcmU6OlNvdXBOZXR3b3JrUHJveHlTZXR0aW5ncyBtX25ldHdvcmtQcm94eVNldHRpbmdzOwog I2VuZGlmCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCBlZDRiNGJkYjBkYjQuLjJiNjFiYWE2Yjg3NyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdl TG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTA3LTA4ICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbU09V UF0gQWRkIHN1cHBvcnQgZm9yIEhUVFBDb29raWVBY2NlcHRQb2xpY3k6Ok9ubHlGcm9tTWFpbkRv Y3VtZW50RG9tYWluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTM5NTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVcGRhdGUgbGlic291cCB0byB2ZXJzaW9uIDIuNzEuMC4KKworICAgICAgICAqIGJ1aWxk c3RyZWFtL2VsZW1lbnRzL3Nkay9saWJzb3VwLmJzdDoKKyAgICAgICAgKiBndGsvamhidWlsZC5t b2R1bGVzOgorCiAyMDIwLTA3LTA3ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAog ICAgICAgICBFbmFibGVkIHRlc3Rpbmcgb2YgZGF0ZS90aW1lIGlucHV0IHR5cGVzIGZvciBXZWJL aXQyIG1hY09TCmRpZmYgLS1naXQgYS9Ub29scy9idWlsZHN0cmVhbS9lbGVtZW50cy9zZGsvbGli c291cC5ic3QgYi9Ub29scy9idWlsZHN0cmVhbS9lbGVtZW50cy9zZGsvbGlic291cC5ic3QKaW5k ZXggYTNiNjVlNzBlN2NkLi4wOTMwYjEyZjQ0YWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2J1aWxkc3Ry ZWFtL2VsZW1lbnRzL3Nkay9saWJzb3VwLmJzdAorKysgYi9Ub29scy9idWlsZHN0cmVhbS9lbGVt ZW50cy9zZGsvbGlic291cC5ic3QKQEAgLTEsOCArMSw4IEBACiBraW5kOiBtZXNvbgogc291cmNl czoKIC0ga2luZDogdGFyCi0gIHVybDogZ25vbWVfZG93bmxvYWRzOmxpYnNvdXAvMi43MC9saWJz b3VwLTIuNzAuMC50YXIueHoKLSAgcmVmOiA1NGIwMjBmNzRhZWZhNDM4OTE4ZDhlNTNjZmY2MmUy YjFlNTllZmUyZGU1M2UwNmIxOWE0YjA3YjFmNGQ1MzQyCisgIHVybDogZ25vbWVfZG93bmxvYWRz OmxpYnNvdXAvMi43MS9saWJzb3VwLTIuNzEuMC50YXIueHoKKyAgcmVmOiA4OGUyNGZhZDcyZDE2 ZTFjYjY5MmM4NzgyNjg4ZGJlZTRiZjQ0MTUxZWZiMGQ5ZWQyNWIxNGYzODQ5ZDk4OTZlCiBidWls ZC1kZXBlbmRzOgogLSBzZGsvZ29iamVjdC1pbnRyb3NwZWN0aW9uLmJzdAogLSBmcmVlZGVza3Rv cC1zZGsuYnN0OmNvbXBvbmVudHMvcHl0aG9uMy5ic3QKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9q aGJ1aWxkLm1vZHVsZXMgYi9Ub29scy9ndGsvamhidWlsZC5tb2R1bGVzCmluZGV4IGZjNzA3Nzcw MTE3OS4uOWZkYjZiNzVjYWVmIDEwMDY0NAotLS0gYS9Ub29scy9ndGsvamhidWlsZC5tb2R1bGVz CisrKyBiL1Rvb2xzL2d0ay9qaGJ1aWxkLm1vZHVsZXMKQEAgLTI0MSw5ICsyNDEsOSBAQAogICAg ICAgPGRlcCBwYWNrYWdlPSJnbGliLW5ldHdvcmtpbmciLz4KICAgICAgIDxkZXAgcGFja2FnZT0i bGlicHNsIi8+CiAgICAgPC9kZXBlbmRlbmNpZXM+Ci0gICAgPGJyYW5jaCBtb2R1bGU9Ii9zb3Vy Y2VzL2xpYnNvdXAvMi42OS9saWJzb3VwLSR7dmVyc2lvbn0udGFyLnh6IiB2ZXJzaW9uPSIyLjY5 LjkwIgorICAgIDxicmFuY2ggbW9kdWxlPSIvc291cmNlcy9saWJzb3VwLzIuNzEvbGlic291cC0k e3ZlcnNpb259LnRhci54eiIgdmVyc2lvbj0iMi43MS4wIgogICAgICAgICAgICAgcmVwbz0iZG93 bmxvYWQuZ25vbWUub3JnIgotICAgICAgICAgICAgaGFzaD0ic2hhMjU2OjhlZDE4MDkyY2ZiMjdk ODcwYTdjN2M0NTk5MmYzYTIxNmJkMjJkZDZmZDZkMmM5ZmJmMWFkYzJkNjk1N2NhYjgiPgorICAg ICAgICAgICAgaGFzaD0ic2hhMjU2Ojg4ZTI0ZmFkNzJkMTZlMWNiNjkyYzg3ODI2ODhkYmVlNGJm NDQxNTFlZmIwZDllZDI1YjE0ZjM4NDlkOTg5NmUiPgogICAgIDwvYnJhbmNoPgogICA8L21lc29u PgogCg==