From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Takao Fujiwara To: git-commits@fedoraproject.org Subject: [rpms/ibus] autotool: Updated ibus-xx-increase-timeout.patch to fix #1163722 Date: Sun, 31 May 2026 02:06:12 GMT Message-ID: <178019317226.1.2351267821670851212.rpms-ibus-727f9412b9f5@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 727f9412b9f587fcf65c45a209a901a2562dd4ce ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiA3MjdmOTQxMmI5ZjU4N2ZjZjY1YzQ1YTIwOWE5MDFhMjU2MmRkNGNlCiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDE0LTEyLTA4VDEzOjQ2OjM0KzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICs2MTUvLTQyIGluIDMgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczov L3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2lidXMvYy83MjdmOTQxMmI5ZjU4N2ZjZjY1YzQ1 YTIwOWE5MDFhMjU2MmRkNGNlP2JyYW5jaD1hdXRvdG9vbAoKICAgICAgICAgICAgTG9nOgogICAg ICAgICAgICBVcGRhdGVkIGlidXMteHgtaW5jcmVhc2UtdGltZW91dC5wYXRjaCB0byBmaXggIzEx NjM3MjIKClVwZGF0ZWQgaWJ1cy1IRUFELnBhdGNoIGZvciB1cHN0cmVhbSAjMTc0NywgIzE3NDgs ICMxNzUzCmFuZCBnbm9tZSAjNzAzMDIwLCBnbm9tZSAjNzMwNjI4CgotLS0KZGlmZiAtLWdpdCBh L2lidXMtSEVBRC5wYXRjaCBiL2lidXMtSEVBRC5wYXRjaAppbmRleCBmZDMwOTRiLi44MGYyY2Ri IDEwMDY0NAotLS0gYS9pYnVzLUhFQUQucGF0Y2gKKysrIGIvaWJ1cy1IRUFELnBhdGNoCkBAIC05 OCwzICs5OCw1NzUgQEAgaW5kZXggNzZjZWEyMy4uN2I5OWZkZiAxMDA2NDQKIC0tIAogMS44LjUu MwogCitGcm9tIGUyNTA3MjYzODE3OTI2Y2ViOTc1MTFkYTNkNjE3OTM0ZDRiNzM0NDMgTW9uIFNl cCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBPc2FtdSBBb2tpIDxvc2FtdUBkZWJpYW4ub3JnPgor RGF0ZTogVGh1LCAxMyBOb3YgMjAxNCAxMToyMzozOCArMDkwMAorU3ViamVjdDogW1BBVENIXSBp YnVzLXNldHVwIHRyaWVzIEMgc2luY2UgZW5fVVMuVVRGLTggaXMgbm90IGluc3RhbGxlZCBpbgor IERlYmlhbiBieSBkZWZhdWx0LgorCitCVUc9aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9pYnVz L2lzc3Vlcy9kZXRhaWw/aWQ9MTc0NworVEVTVD1zZXR1cAorCitSZXZpZXcgVVJMOiBodHRwczov L2NvZGVyZXZpZXcuYXBwc3BvdC5jb20vMTY2NDIwMDQzCitQYXRjaCBmcm9tIE9zYW11IEFva2kg PG9zYW11QGRlYmlhbi5vcmc+LgorLS0tCisgc2V0dXAvZW5naW5lY29tYm9ib3gucHkgfCAgMiAr LQorIHNldHVwL2VuZ2luZWRpYWxvZy5weSAgIHwgMTMgKysrKysrKysrLS0tLQorIDIgZmlsZXMg Y2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBh L3NldHVwL2VuZ2luZWNvbWJvYm94LnB5IGIvc2V0dXAvZW5naW5lY29tYm9ib3gucHkKK2luZGV4 IDJhMmE2NzcuLjE5OWVkOTYgMTAwNjQ0CistLS0gYS9zZXR1cC9lbmdpbmVjb21ib2JveC5weQor KysrIGIvc2V0dXAvZW5naW5lY29tYm9ib3gucHkKK0BAIC03OCw3ICs3OCw3IEBAIGNsYXNzIEVu Z2luZUNvbWJvQm94KEd0ay5Db21ib0JveCk6CisgICAgICAgICBrZXlzLnNvcnQoa2V5PWZ1bmN0 b29scy5jbXBfdG9fa2V5KGxvY2FsZS5zdHJjb2xsKSkKKyAgICAgICAgIGxvYyA9IGxvY2FsZS5n ZXRsb2NhbGUoKVswXQorICAgICAgICAgIyBOb25lIG9uIEMgbG9jYWxlCistICAgICAgICBpZiBs b2MgPT0gTm9uZToKKysgICAgICAgIGlmIGxvYyA9PSBOb25lIG9yIGxvYyA9PSAnQyc6CisgICAg ICAgICAgICAgbG9jID0gJ2VuX1VTJworICAgICAgICAgY3VycmVudF9sYW5nID0gSUJ1cy5nZXRf bGFuZ3VhZ2VfbmFtZShsb2MpCisgICAgICAgICAjIG1vdmUgY3VycmVudCBsYW5ndWFnZSB0byB0 aGUgZmlyc3QgcGxhY2UKK2RpZmYgLS1naXQgYS9zZXR1cC9lbmdpbmVkaWFsb2cucHkgYi9zZXR1 cC9lbmdpbmVkaWFsb2cucHkKK2luZGV4IDhhNTY5MDEuLjJiMTc5YWQgMTAwNjQ0CistLS0gYS9z ZXR1cC9lbmdpbmVkaWFsb2cucHkKKysrKyBiL3NldHVwL2VuZ2luZWRpYWxvZy5weQorQEAgLTMy NSwyMSArMzI1LDI2IEBAIGNsYXNzIEVuZ2luZURpYWxvZyhHdGsuRGlhbG9nKToKKyAKKyAgICAg ICAgICAgICAjIFJldHJpZXZlIFVudHJhbnNsYXRlZCBsYW5ndWFnZSBuYW1lcy4KKyAgICAgICAg ICAgICBiYWNrdXBfbG9jYWxlID0gbG9jYWxlLnNldGxvY2FsZShsb2NhbGUuTENfQUxMLCBOb25l KQorLSAgICAgICAgICAgIHRyeToKKy0gICAgICAgICAgICAgICAgbG9jYWxlLnNldGxvY2FsZShs b2NhbGUuTENfQUxMLCAnZW5fVVMuVVRGLTgnKQorKyAgICAgICAgICAgIGRlZiBfX3NldF91bnRy YW5zX3dpdGhfbG9jYWxlKGVuX2xvY2FsZSk6CisrICAgICAgICAgICAgICAgIGxvY2FsZS5zZXRs b2NhbGUobG9jYWxlLkxDX0FMTCwgZW5fbG9jYWxlKQorICAgICAgICAgICAgICAgICB1bnRyYW5z ID0gSUJ1cy5nZXRfbGFuZ3VhZ2VfbmFtZShlLmdldF9sYW5ndWFnZSgpKQorICAgICAgICAgICAg ICAgICBpZiB1bnRyYW5zID09IE5vbmU6CisgICAgICAgICAgICAgICAgICAgICB1bnRyYW5zID0g JycKKyAgICAgICAgICAgICAgICAgc2VsZi5fX3VudHJhbnNfZm9yX2xhbmdbbF0gPSB1bnRyYW5z CisrICAgICAgICAgICAgdHJ5OgorKyAgICAgICAgICAgICAgICBfX3NldF91bnRyYW5zX3dpdGhf bG9jYWxlKCdlbl9VUy5VVEYtOCcpCisgICAgICAgICAgICAgZXhjZXB0IGxvY2FsZS5FcnJvcjoK Ky0gICAgICAgICAgICAgICAgcGFzcworKyAgICAgICAgICAgICAgICB0cnk6CisrICAgICAgICAg ICAgICAgICAgICBfX3NldF91bnRyYW5zX3dpdGhfbG9jYWxlKCdDJykKKysgICAgICAgICAgICAg ICAgZXhjZXB0IGxvY2FsZS5FcnJvcjoKKysgICAgICAgICAgICAgICAgICAgIHBhc3MKKyAgICAg ICAgICAgICBsb2NhbGUuc2V0bG9jYWxlKGxvY2FsZS5MQ19BTEwsIGJhY2t1cF9sb2NhbGUpCisg CisgICAgICAgICBrZXlzID0gbGlzdChzZWxmLl9fZW5naW5lc19mb3JfbGFuZy5rZXlzKCkpCisg ICAgICAgICBrZXlzLnNvcnQoa2V5PWZ1bmN0b29scy5jbXBfdG9fa2V5KGxvY2FsZS5zdHJjb2xs KSkKKyAgICAgICAgIGxvYyA9IGxvY2FsZS5nZXRsb2NhbGUoKVswXQorICAgICAgICAgIyBOb25l IG9uIEMgbG9jYWxlCistICAgICAgICBpZiBsb2MgPT0gTm9uZToKKysgICAgICAgIGlmIGxvYyA9 PSBOb25lIG9yIGxvYyA9PSAnQyc6CisgICAgICAgICAgICAgbG9jID0gJ2VuX1VTJworICAgICAg ICAgY3VycmVudF9sYW5nID0gSUJ1cy5nZXRfbGFuZ3VhZ2VfbmFtZShsb2MpCisgICAgICAgICAj IG1vdmUgY3VycmVudCBsYW5ndWFnZSB0byB0aGUgZmlyc3QgcGxhY2UKKy0tIAorMS44LjUuMwor CitGcm9tIGRlMzU0MWQyYTI2YzY3M2YyN2MwNjg1NTlmNmQzNjMwNjRlMDM3NjAgTW9uIFNlcCAx NyAwMDowMDowMCAyMDAxCitGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5j b20+CitEYXRlOiBUaHUsIDEzIE5vdiAyMDE0IDExOjI4OjQzICswOTAwCitTdWJqZWN0OiBbUEFU Q0hdIFJlbW92ZSAiUmVsZWFzZSIgbW9kaWZpZXJzIGtleSBvbiBpYnVzLXNldHVwLgorCitCVUc9 aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9pYnVzL2lzc3Vlcy9kZXRhaWw/aWQ9MTc0OAorVEVT VD1zZXR1cAorCitSZXZpZXcgVVJMOiBodHRwczovL2NvZGVyZXZpZXcuYXBwc3BvdC5jb20vMTY3 NTcwMDQzCistLS0KKyBzZXR1cC9rZXlib2FyZHNob3J0Y3V0LnB5IHwgMTIgKysrKy0tLS0tLS0t CisgMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKKworZGlm ZiAtLWdpdCBhL3NldHVwL2tleWJvYXJkc2hvcnRjdXQucHkgYi9zZXR1cC9rZXlib2FyZHNob3J0 Y3V0LnB5CitpbmRleCA5MTU5NWY3Li44NjQ2M2NiIDEwMDY0NAorLS0tIGEvc2V0dXAva2V5Ym9h cmRzaG9ydGN1dC5weQorKysrIGIvc2V0dXAva2V5Ym9hcmRzaG9ydGN1dC5weQorQEAgLTEwNSwy MCArMTA1LDE2IEBAIGNsYXNzIEtleWJvYXJkU2hvcnRjdXRTZWxlY3Rpb24oR3RrLkJveCk6Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEd0ay5DaGVja0J1dHRvbi5u ZXdfd2l0aF9tbmVtb25pYygiX0h5cGVyIiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIEdkay5Nb2RpZmllclR5cGUuSFlQRVJfTUFTSykpCisgICAgICAgICAjIDxD YXBzTG9jaz4gaXMgbm90IHBhcnNlZCBieSBndGtfYWNjZWxlcmF0b3JfcGFyc2UoKQorLSAgICAg ICAgIyBGSVhNRTogTmVlZCB0byBjaGVjayBpZiBpYnVzIGd0ayBwYW5lbCBjYW4gZW5hYmxlIDxS ZWxlYXNlPi4KKy0gICAgICAgIHNlbGYuX19tb2RpZmllcl9idXR0b25zLmFwcGVuZCgoIlJlbGVh c2UiLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHdGsuQ2hlY2tC dXR0b24ubmV3X3dpdGhfbW5lbW9uaWMoIl9SZWxlYXNlIiksCistICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIEdkay5Nb2RpZmllclR5cGUuUkVMRUFTRV9NQVNLKSkKKysg ICAgICAgICMgPFJlbGVhc2U+IGlzIG5vdCBzdXBwb3J0ZWQgYnkgWElHcmFiS2V5Y29kZSgpCisg ICAgICAgICBmb3IgbmFtZSwgYnV0dG9uLCBtYXNrIGluIHNlbGYuX19tb2RpZmllcl9idXR0b25z OgorICAgICAgICAgICAgIGJ1dHRvbi5jb25uZWN0KCJ0b2dnbGVkIiwgc2VsZi5fX21vZGlmaWVy X2J1dHRvbl90b2dnbGVkX2NiLCBuYW1lKQorIAorICAgICAgICAgdGFibGUuYXR0YWNoKHNlbGYu X19tb2RpZmllcl9idXR0b25zWzBdWzFdLCAwLCAxLCAwLCAxKQorICAgICAgICAgdGFibGUuYXR0 YWNoKHNlbGYuX19tb2RpZmllcl9idXR0b25zWzFdWzFdLCAxLCAyLCAwLCAxKQorICAgICAgICAg dGFibGUuYXR0YWNoKHNlbGYuX19tb2RpZmllcl9idXR0b25zWzJdWzFdLCAyLCAzLCAwLCAxKQor LSAgICAgICAgdGFibGUuYXR0YWNoKHNlbGYuX19tb2RpZmllcl9idXR0b25zWzNdWzFdLCAzLCA0 LCAwLCAxKQorLSAgICAgICAgdGFibGUuYXR0YWNoKHNlbGYuX19tb2RpZmllcl9idXR0b25zWzRd WzFdLCAwLCAxLCAxLCAyKQorLSAgICAgICAgdGFibGUuYXR0YWNoKHNlbGYuX19tb2RpZmllcl9i dXR0b25zWzVdWzFdLCAxLCAyLCAxLCAyKQorLSAgICAgICAgdGFibGUuYXR0YWNoKHNlbGYuX19t b2RpZmllcl9idXR0b25zWzZdWzFdLCAyLCAzLCAxLCAyKQorKyAgICAgICAgdGFibGUuYXR0YWNo KHNlbGYuX19tb2RpZmllcl9idXR0b25zWzNdWzFdLCAwLCAxLCAxLCAyKQorKyAgICAgICAgdGFi bGUuYXR0YWNoKHNlbGYuX19tb2RpZmllcl9idXR0b25zWzRdWzFdLCAxLCAyLCAxLCAyKQorKyAg ICAgICAgdGFibGUuYXR0YWNoKHNlbGYuX19tb2RpZmllcl9idXR0b25zWzVdWzFdLCAyLCAzLCAx LCAyKQorICAgICAgICAgaGJveC5wYWNrX3N0YXJ0KHRhYmxlLCBUcnVlLCBUcnVlLCA0KQorICAg ICAgICAgc2VsZi5wYWNrX3N0YXJ0KGhib3gsIEZhbHNlLCBUcnVlLCA0KQorIAorLS0gCisxLjgu NS4zCisKK0Zyb20gYTdhYmNlNjk4ZjQwZTYwMjc1YzQ2ZjA1OTY3ZThjYzM2OTc2OWU0YiBNb24g U2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IFBlbmcgV3UgPGFsZXhlcGljb0BnbWFpbC5jb20+ CitEYXRlOiBXZWQsIDE5IE5vdiAyMDE0IDE4OjEwOjA1ICswOTAwCitTdWJqZWN0OiBbUEFUQ0hd IEZpeGVzIGlidXNfZW5naW5lX3VwZGF0ZV9sb29rdXBfdGFibGVfZmFzdCBtZXRob2QKKworZ25v bWUgc2hlbGwgbmVlZHMgdGhlIHByZXZpb3VzIHBhZ2UgYW5kIG5leHQgcGFnZQordG8gY29ycmVj dGx5IHNob3cgdGhlIHBhZ2UgdXAvZG93biBhcnJvd3MsCitzZW5kIHRocmVlIHBhZ2VzIGluc3Rl YWQgb2Ygb25lIHBhZ2UuCisKK1VSTDogaHR0cHM6Ly9idWd6aWxsYS5nbm9tZS5vcmcvc2hvd19i dWcuY2dpP2lkPTcwMzAyMAorCitCVUc9CisKK1JldmlldyBVUkw6IGh0dHBzOi8vY29kZXJldmll dy5hcHBzcG90LmNvbS8xNjQ1NDAwNDUKK1BhdGNoIGZyb20gUGVuZyBXdSA8YWxleGVwaWNvQGdt YWlsLmNvbT4uCistLS0KKyBzcmMvaWJ1c2VuZ2luZS5jIHwgMjcgKysrKysrKysrKysrKysrKysr KysrKy0tLS0tCisgMSBmaWxlIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25z KC0pCisKK2RpZmYgLS1naXQgYS9zcmMvaWJ1c2VuZ2luZS5jIGIvc3JjL2lidXNlbmdpbmUuYwor aW5kZXggNTNkNTdkZi4uNDc1OGY4MiAxMDA2NDQKKy0tLSBhL3NyYy9pYnVzZW5naW5lLmMKKysr KyBiL3NyYy9pYnVzZW5naW5lLmMKK0BAIC0xNDIyLDEyICsxNDIyLDE3IEBAIGlidXNfZW5naW5l X3VwZGF0ZV9sb29rdXBfdGFibGVfZmFzdCAoSUJ1c0VuZ2luZSAgICAgICAgKmVuZ2luZSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElCdXNMb29rdXBUYWJsZSAgICp0 YWJsZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdib29sZWFuICAg ICAgICAgICB2aXNpYmxlKQorIHsKKysgICAgLyogTm90ZTogZ25vbWUgc2hlbGwgbmVlZHMgdGhl IHByZXZpb3VzIHBhZ2UgYW5kIG5leHQgcGFnZQorKyAgICAgICB0byBjb3JyZWN0bHkgc2hvdyB0 aGUgcGFnZSB1cC9kb3duIGFycm93cywKKysgICAgICAgc2VuZCB0aHJlZSBwYWdlcyBpbnN0ZWFk IG9mIG9uZSBwYWdlLiAqLworKworICAgICBnX3JldHVybl9pZl9mYWlsIChJQlVTX0lTX0VOR0lO RSAoZW5naW5lKSk7CisgICAgIGdfcmV0dXJuX2lmX2ZhaWwgKElCVVNfSVNfTE9PS1VQX1RBQkxF ICh0YWJsZSkpOworIAorICAgICBJQnVzTG9va3VwVGFibGUgKm5ld190YWJsZTsKKyAgICAgSUJ1 c1RleHQgKnRleHQ7CisgICAgIGdpbnQgcGFnZV9iZWdpbjsKKysgICAgZ2ludCBjdXJzb3JfcG9z OworICAgICBnaW50IGk7CisgCisgICAgIGlmICh0YWJsZS0+Y2FuZGlkYXRlcy0+bGVuIDwgdGFi bGUtPnBhZ2Vfc2l6ZSA8PCAyKSB7CitAQCAtMTQzNiwxOSArMTQ0MSwzMSBAQCBpYnVzX2VuZ2lu ZV91cGRhdGVfbG9va3VwX3RhYmxlX2Zhc3QgKElCdXNFbmdpbmUgICAgICAgICplbmdpbmUsCisg ICAgIH0KKyAKKyAgICAgcGFnZV9iZWdpbiA9ICh0YWJsZS0+Y3Vyc29yX3BvcyAvIHRhYmxlLT5w YWdlX3NpemUpICogdGFibGUtPnBhZ2Vfc2l6ZTsKKysgICAgY3Vyc29yX3BvcyA9IGlidXNfbG9v a3VwX3RhYmxlX2dldF9jdXJzb3JfaW5fcGFnZSAodGFibGUpOworKworKyAgICBpZiAodGFibGUt PmN1cnNvcl9wb3MgPj0gdGFibGUtPnBhZ2Vfc2l6ZSkgeworKyAgICAgICAgLyogaGFzIHByZXZp b3VzIHBhZ2UsIGFkanVzdCB0aGUgdmFsdWUuICovCisrICAgICAgICBwYWdlX2JlZ2luIC09IHRh YmxlLT5wYWdlX3NpemU7CisrICAgICAgICBjdXJzb3JfcG9zICs9IHRhYmxlLT5wYWdlX3NpemU7 CisrICAgIH0KKyAKKy0gICAgbmV3X3RhYmxlID0gaWJ1c19sb29rdXBfdGFibGVfbmV3ICh0YWJs ZS0+cGFnZV9zaXplLCAwLCB0YWJsZS0+Y3Vyc29yX3Zpc2libGUsIHRhYmxlLT5yb3VuZCk7Cisr ICAgIG5ld190YWJsZSA9IGlidXNfbG9va3VwX3RhYmxlX25ldworKyAgICAgICAgKHRhYmxlLT5w YWdlX3NpemUsIDAsIHRhYmxlLT5jdXJzb3JfdmlzaWJsZSwgdGFibGUtPnJvdW5kKTsKKyAKKy0g ICAgZm9yIChpID0gcGFnZV9iZWdpbjsgaSA8IHBhZ2VfYmVnaW4gKyB0YWJsZS0+cGFnZV9zaXpl ICYmIGkgPCB0YWJsZS0+Y2FuZGlkYXRlcy0+bGVuOyBpKyspIHsKKy0gICAgICAgIGlidXNfbG9v a3VwX3RhYmxlX2FwcGVuZF9jYW5kaWRhdGUgKG5ld190YWJsZSwgaWJ1c19sb29rdXBfdGFibGVf Z2V0X2NhbmRpZGF0ZSAodGFibGUsIGkpKTsKKysgICAgLyogJzMnIG1lYW5zIHRoZSBwcmV2aW91 cyBwYWdlLCBjdXJyZW50IHBhZ2UgYW5kIG5leHQgcGFnZS4gKi8KKysgICAgZm9yIChpID0gcGFn ZV9iZWdpbjsgaSA8IHBhZ2VfYmVnaW4gKyAzICogdGFibGUtPnBhZ2Vfc2l6ZSAmJgorKyAgICAg ICAgICAgICBpIDwgdGFibGUtPmNhbmRpZGF0ZXMtPmxlbjsgaSsrKSB7CisrICAgICAgICBpYnVz X2xvb2t1cF90YWJsZV9hcHBlbmRfY2FuZGlkYXRlCisrICAgICAgICAgICAgKG5ld190YWJsZSwg aWJ1c19sb29rdXBfdGFibGVfZ2V0X2NhbmRpZGF0ZSAodGFibGUsIGkpKTsKKyAgICAgfQorIAor ICAgICBmb3IgKGkgPSAwOyAodGV4dCA9IGlidXNfbG9va3VwX3RhYmxlX2dldF9sYWJlbCAodGFi bGUsIGkpKSAhPSBOVUxMOyBpKyspIHsKKyAgICAgICAgIGlidXNfbG9va3VwX3RhYmxlX2FwcGVu ZF9sYWJlbCAobmV3X3RhYmxlLCB0ZXh0KTsKKyAgICAgfQorIAorLSAgICBpYnVzX2xvb2t1cF90 YWJsZV9zZXRfY3Vyc29yX3BvcyAobmV3X3RhYmxlLCBpYnVzX2xvb2t1cF90YWJsZV9nZXRfY3Vy c29yX2luX3BhZ2UgKHRhYmxlKSk7CistICAgIGlidXNfbG9va3VwX3RhYmxlX3NldF9vcmllbnRh dGlvbiAobmV3X3RhYmxlLCBpYnVzX2xvb2t1cF90YWJsZV9nZXRfb3JpZW50YXRpb24gKHRhYmxl KSk7CisrICAgIGlidXNfbG9va3VwX3RhYmxlX3NldF9jdXJzb3JfcG9zIChuZXdfdGFibGUsIGN1 cnNvcl9wb3MpOworKyAgICBpYnVzX2xvb2t1cF90YWJsZV9zZXRfb3JpZW50YXRpb24KKysgICAg ICAgIChuZXdfdGFibGUsIGlidXNfbG9va3VwX3RhYmxlX2dldF9vcmllbnRhdGlvbiAodGFibGUp KTsKKyAKKyAgICAgaWJ1c19lbmdpbmVfdXBkYXRlX2xvb2t1cF90YWJsZSAoZW5naW5lLCBuZXdf dGFibGUsIHZpc2libGUpOworIAorLS0gCisxLjguNS4zCisKK0Zyb20gZjY5ZGRjMzk1Mjk3MWM1 NTk5YzkyYWVlM2RjMWRlNjAxN2QwN2YzYyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206 IFBlbmcgV3UgPGFsZXhlcGljb0BnbWFpbC5jb20+CitEYXRlOiBGcmksIDUgRGVjIDIwMTQgMTE6 NDE6MDggKzA5MDAKK1N1YmplY3Q6IFtQQVRDSF0gRml4ZXMgaWJ1c19rZXl2YWxfbmFtZSBtZXRo b2QgaW4gYysrIGJpbmRpbmcKKworQWRkIEdfQkVHSU5fREVDTFMgYW5kIEdfRU5EX0RFQ0xTIG1h Y3JvcyBpbiBzcmMvaWJ1c2tleXMuaAorCitCVUc9CisKK1JldmlldyBVUkw6IGh0dHBzOi8vY29k ZXJldmlldy5hcHBzcG90LmNvbS8xODU4NTAwNDMKK1BhdGNoIGZyb20gUGVuZyBXdSA8YWxleGVw aWNvQGdtYWlsLmNvbT4uCistLS0KKyBzcmMvaWJ1c2tleXMuaCB8IDIgKysKKyAxIGZpbGUgY2hh bmdlZCwgMiBpbnNlcnRpb25zKCspCisKK2RpZmYgLS1naXQgYS9zcmMvaWJ1c2tleXMuaCBiL3Ny Yy9pYnVza2V5cy5oCitpbmRleCA2YWNiMGQ2Li43OTY5OTI5IDEwMDY0NAorLS0tIGEvc3JjL2li dXNrZXlzLmgKKysrKyBiL3NyYy9pYnVza2V5cy5oCitAQCAtMjksNiArMjksNyBAQAorIAorICNp bmNsdWRlIDxnbGliLmg+CisgCisrR19CRUdJTl9ERUNMUworIC8qKgorICAqIGlidXNfa2V5dmFs X25hbWU6CisgICogQGtleXZhbDogS2V5IHN5bWJvbC4KK0BAIC03Myw0ICs3NCw1IEBAIGd1aW50 ICAgICAgICAgICAgaWJ1c191bmljb2RlX3RvX2tleXZhbCAoZ3VuaWNoYXIgICAgICAgIHdjKTsK KyAgKiovCisgZ3VuaWNoYXIgICAgICAgICBpYnVzX2tleXZhbF90b191bmljb2RlIChndWludCAg ICAgICAgICAga2V5dmFsKTsKKyAKKytHX0VORF9ERUNMUworICNlbmRpZiAvLyBfX0lCVVNfS0VZ U19IXworLS0gCisxLjguNS4zCisKK0Zyb20gMDk3NzE1NzQ2ZGEwZjU2YjhiOGMzZGRhZTJkYTM0 NDIwMzJiZmYwYyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IFJ1aSBNYXRvcyA8dGlh Z29tYXRvc0BnbWFpbC5jb20+CitEYXRlOiBGcmksIDUgRGVjIDIwMTQgMjA6MjU6NDQgKzA5MDAK K1N1YmplY3Q6IFtQQVRDSF0gQ2FycnkgY3VycmVudCBjb250ZXh0IGNvbnRlbnQgdHlwZSBpbnRv IGZha2UgY29udGV4dCB3aGVuCisgc3dpdGNoaW5nCisKK1doZW4gZm9jdXMgbW92ZXMgb3V0IG9m IGEgY29udGV4dCB0byB0aGUgZmFrZSBjb250ZXh0IHdlIHNob3VsZCBrZWVwCit0aGUgY29udGVu dCB0eXBlIHByb3BlcnRpZXMgYXMgdGhleSB3ZXJlIGluIHRoZSBmb2N1c2VkIG91dCBjb250ZXh0 LgorCitUaGlzIGFsbG93cyBwYW5lbCBpbXBsZW1lbnRhdGlvbnMgdG8gc2hvdyB0aGUgcHJvcGVy IFVJIHdoaWxlIGlucHV0Citmb2N1cyBtb3ZlcyBhd2F5IHRlbXBvcmFyaWx5IGZyb20gYSB0ZXh0 IGVudHJ5LgorCitFLmcuIGEgcGFzc3dvcmQgZW50cnkgaXMgZm9jdXNlZCBhbmQgdGhlIHVzZXIg Y2xpY2tzIG9uIHRoZSBwYW5lbAorVUkuIEF0IHRoaXMgcG9pbnQgaWJ1cyBzd2l0Y2hlcyB0aGUg Y3VycmVudGx5IGZvY3VzZWQgY29udGV4dCB0byB0aGUKK2Zha2UgY29udGV4dCBhbmQgZW1pdHMg c2V0LWNvbnRlbnQtdHlwZSB3aXRoIHRoZSBmYWtlIGNvbnRleHQKK3Byb3BlcnRpZXMgd2hpY2gg YXJlIGVtcHR5IGFuZCB0aHVzIHRoZSBwYW5lbCByZWFjdHMgdG8gaXQuIFRoaXMgaXNuJ3QKK3Ro ZSBpbnRlbmRlZCBiZWhhdmlvciB0aG91Z2ggc2luY2UsIGZyb20gYSB1c2VyIFBPViwgdGhlIHBh c3N3b3JkCitlbnRyeSBpcyBzdGlsbCB0aGUgY29udGV4dCB0aGF0IHdpbGwgYmUgZ2V0dGluZyB0 ZXh0IGlucHV0IHdoZW4gdGhlCitwYW5lbCBVSSBnZXRzIGRpc21pc3NlZC4KKworUj1zaGF3bi5w Lmh1YW5nQGdtYWlsLmNvbQorQlVHPWh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVn LmNnaT9pZD03MzA2MjgKKworUmV2aWV3IFVSTDogaHR0cHM6Ly9jb2RlcmV2aWV3LmFwcHNwb3Qu Y29tLzE3NjI2MDA0MworUGF0Y2ggZnJvbSBSdWkgTWF0b3MgPHRpYWdvbWF0b3NAZ21haWwuY29t Pi4KKy0tLQorIGJ1cy9pYnVzaW1wbC5jICAgICB8ICA2ICsrKysKKyBidXMvaW5wdXRjb250ZXh0 LmMgfCA5MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0KKyBidXMvaW5wdXRjb250ZXh0LmggfCAxMCArKysrKysKKyAzIGZpbGVzIGNoYW5nZWQs IDcyIGluc2VydGlvbnMoKyksIDM1IGRlbGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvYnVzL2li dXNpbXBsLmMgYi9idXMvaWJ1c2ltcGwuYworaW5kZXggZGQyNTRlMi4uNjFmNjY0OSAxMDA2NDQK Ky0tLSBhL2J1cy9pYnVzaW1wbC5jCisrKysgYi9idXMvaWJ1c2ltcGwuYworQEAgLTYyMCw2ICs2 MjAsOCBAQCBidXNfaWJ1c19pbXBsX3NldF9mb2N1c2VkX2NvbnRleHQgKEJ1c0lCdXNJbXBsICAg ICAqaWJ1cywKKyAgICAgfQorIAorICAgICBCdXNFbmdpbmVQcm94eSAqZW5naW5lID0gTlVMTDsK KysgICAgZ3VpbnQgcHVycG9zZSA9IDA7CisrICAgIGd1aW50IGhpbnRzID0gMDsKKyAKKyAgICAg aWYgKGlidXMtPmZvY3VzZWRfY29udGV4dCkgeworICAgICAgICAgaWYgKGlidXMtPnVzZV9nbG9i YWxfZW5naW5lKSB7CitAQCAtNjM0LDEyICs2MzYsMTYgQEAgYnVzX2lidXNfaW1wbF9zZXRfZm9j dXNlZF9jb250ZXh0IChCdXNJQnVzSW1wbCAgICAgKmlidXMsCisgICAgICAgICBpZiAoaWJ1cy0+ cGFuZWwgIT0gTlVMTCkKKyAgICAgICAgICAgICBidXNfcGFuZWxfcHJveHlfZm9jdXNfb3V0IChp YnVzLT5wYW5lbCwgaWJ1cy0+Zm9jdXNlZF9jb250ZXh0KTsKKyAKKysgICAgICAgIGJ1c19pbnB1 dF9jb250ZXh0X2dldF9jb250ZW50X3R5cGUgKGlidXMtPmZvY3VzZWRfY29udGV4dCwKKysgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZwdXJwb3NlLCAmaGludHMp OworICAgICAgICAgZ19vYmplY3RfdW5yZWYgKGlidXMtPmZvY3VzZWRfY29udGV4dCk7CisgICAg ICAgICBpYnVzLT5mb2N1c2VkX2NvbnRleHQgPSBOVUxMOworICAgICB9CisgCisgICAgIGlmIChj b250ZXh0ID09IE5VTEwgJiYgaWJ1cy0+dXNlX2dsb2JhbF9lbmdpbmUpIHsKKyAgICAgICAgIGNv bnRleHQgPSBpYnVzLT5mYWtlX2NvbnRleHQ7CisrICAgICAgICBpZiAoY29udGV4dCkKKysgICAg ICAgICAgICBidXNfaW5wdXRfY29udGV4dF9zZXRfY29udGVudF90eXBlIChjb250ZXh0LCBwdXJw b3NlLCBoaW50cyk7CisgICAgIH0KKyAKKyAgICAgaWYgKGNvbnRleHQpIHsKK2RpZmYgLS1naXQg YS9idXMvaW5wdXRjb250ZXh0LmMgYi9idXMvaW5wdXRjb250ZXh0LmMKK2luZGV4IGQ5OTI0YTEu LmVhNzcxMDIgMTAwNjQ0CistLS0gYS9idXMvaW5wdXRjb250ZXh0LmMKKysrKyBiL2J1cy9pbnB1 dGNvbnRleHQuYworQEAgLTExNTEsNiArMTE1MSw0NyBAQCBidXNfaW5wdXRfY29udGV4dF9zZXJ2 aWNlX21ldGhvZF9jYWxsIChJQnVzU2VydmljZSAgICAgICAgICAgICpzZXJ2aWNlLAorICAgICBn X3JldHVybl9pZl9yZWFjaGVkICgpOworIH0KKyAKKytzdGF0aWMgdm9pZAorK19pY19zZXRfY29u dGVudF90eXBlIChCdXNJbnB1dENvbnRleHQgKmNvbnRleHQsCisrICAgICAgICAgICAgICAgICAg ICAgIEdWYXJpYW50ICAgICAgICAqdmFsdWUpCisreworKyAgICBndWludCBwdXJwb3NlID0gMDsK KysgICAgZ3VpbnQgaGludHMgPSAwOworKworKyAgICBnX3ZhcmlhbnRfZ2V0ICh2YWx1ZSwgIih1 dSkiLCAmcHVycG9zZSwgJmhpbnRzKTsKKysgICAgaWYgKHB1cnBvc2UgIT0gY29udGV4dC0+cHVy cG9zZSB8fCBoaW50cyAhPSBjb250ZXh0LT5oaW50cykgeworKyAgICAgICAgR0Vycm9yICplcnJv cjsKKysgICAgICAgIGdib29sZWFuIHJldHZhbDsKKysKKysgICAgICAgIGNvbnRleHQtPnB1cnBv c2UgPSBwdXJwb3NlOworKyAgICAgICAgY29udGV4dC0+aGludHMgPSBoaW50czsKKysKKysgICAg ICAgIGlmIChjb250ZXh0LT5oYXNfZm9jdXMgJiYgY29udGV4dC0+ZW5naW5lKQorKyAgICAgICAg ICAgIGJ1c19lbmdpbmVfcHJveHlfc2V0X2NvbnRlbnRfdHlwZSAoY29udGV4dC0+ZW5naW5lLAor KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHVycG9zZSwK KysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhpbnRzKTsK KysKKysgICAgICAgIGlmIChjb250ZXh0LT5oYXNfZm9jdXMpIHsKKysgICAgICAgICAgICBnX3Np Z25hbF9lbWl0IChjb250ZXh0LAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRleHRf c2lnbmFsc1tTRVRfQ09OVEVOVF9UWVBFXSwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAw LAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRleHQtPnB1cnBvc2UsCisrICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29udGV4dC0+aGludHMpOworKyAgICAgICAgfQorKworKyAg ICAgICAgZXJyb3IgPSBOVUxMOworKyAgICAgICAgcmV0dmFsID0gYnVzX2lucHV0X2NvbnRleHRf cHJvcGVydHlfY2hhbmdlZCAoY29udGV4dCwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICJDb250ZW50VHlwZSIsCisrICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YWx1ZSwKKysgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZlcnJvcik7CisrICAg ICAgICBpZiAoIXJldHZhbCkgeworKyAgICAgICAgICAgIGdfd2FybmluZyAoIkZhaWxlZCB0byBl bWl0IFByb3BlcnRpZXNDaGFuZ2VkIHNpZ25hbDogJXMiLAorKyAgICAgICAgICAgICAgICAgICAg ICAgZXJyb3ItPm1lc3NhZ2UpOworKyAgICAgICAgICAgIGdfZXJyb3JfZnJlZSAoZXJyb3IpOwor KyAgICAgICAgfQorKyAgICB9CisrfQorKworIHN0YXRpYyBnYm9vbGVhbgorIGJ1c19pbnB1dF9j b250ZXh0X3NlcnZpY2Vfc2V0X3Byb3BlcnR5IChJQnVzU2VydmljZSAgICAgKnNlcnZpY2UsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdEQnVzQ29ubmVjdGlvbiAq Y29ubmVjdGlvbiwKK0BAIC0xMTc1LDQxICsxMjE2LDcgQEAgYnVzX2lucHV0X2NvbnRleHRfc2Vy dmljZV9zZXRfcHJvcGVydHkgKElCdXNTZXJ2aWNlICAgICAqc2VydmljZSwKKyAKKyAgICAgaWYg KGdfc3RyY21wMCAocHJvcGVydHlfbmFtZSwgIkNvbnRlbnRUeXBlIikgPT0gMCkgeworICAgICAg ICAgQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0ID0gKEJ1c0lucHV0Q29udGV4dCAqKSBzZXJ2aWNl OworLSAgICAgICAgZ3VpbnQgcHVycG9zZSA9IDA7CistICAgICAgICBndWludCBoaW50cyA9IDA7 CistCistICAgICAgICBnX3ZhcmlhbnRfZ2V0ICh2YWx1ZSwgIih1dSkiLCAmcHVycG9zZSwgJmhp bnRzKTsKKy0gICAgICAgIGlmIChwdXJwb3NlICE9IGNvbnRleHQtPnB1cnBvc2UgfHwgaGludHMg IT0gY29udGV4dC0+aGludHMpIHsKKy0gICAgICAgICAgICBHRXJyb3IgKmVycm9yOworLSAgICAg ICAgICAgIGdib29sZWFuIHJldHZhbDsKKy0KKy0gICAgICAgICAgICBjb250ZXh0LT5wdXJwb3Nl ID0gcHVycG9zZTsKKy0gICAgICAgICAgICBjb250ZXh0LT5oaW50cyA9IGhpbnRzOworLQorLSAg ICAgICAgICAgIGlmIChjb250ZXh0LT5oYXNfZm9jdXMgJiYgY29udGV4dC0+ZW5naW5lKQorLSAg ICAgICAgICAgICAgICBidXNfZW5naW5lX3Byb3h5X3NldF9jb250ZW50X3R5cGUgKGNvbnRleHQt PmVuZ2luZSwKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwdXJwb3NlLAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGhpbnRzKTsKKy0KKy0gICAgICAgICAgICBpZiAoY29udGV4dC0+aGFzX2ZvY3Vz KSB7CistICAgICAgICAgICAgICAgIGdfc2lnbmFsX2VtaXQgKGNvbnRleHQsCistICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbnRleHRfc2lnbmFsc1tTRVRfQ09OVEVOVF9UWVBFXSwK Ky0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwKKy0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29udGV4dC0+cHVycG9zZSwKKy0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgY29udGV4dC0+aGludHMpOworLSAgICAgICAgICAgIH0KKy0KKy0gICAgICAgICAgICBl cnJvciA9IE5VTEw7CistICAgICAgICAgICAgcmV0dmFsID0gYnVzX2lucHV0X2NvbnRleHRfcHJv cGVydHlfY2hhbmdlZCAoY29udGV4dCwKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiQ29udGVudFR5cGUiLAorLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZhbHVlLAorLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZlcnJv cik7CistICAgICAgICAgICAgaWYgKCFyZXR2YWwpIHsKKy0gICAgICAgICAgICAgICAgZ193YXJu aW5nICgiRmFpbGVkIHRvIGVtaXQgUHJvcGVydGllc0NoYW5nZWQgc2lnbmFsOiAlcyIsCistICAg ICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3ItPm1lc3NhZ2UpOworLSAgICAgICAgICAgICAg ICBnX2Vycm9yX2ZyZWUgKGVycm9yKTsKKy0gICAgICAgICAgICB9CistICAgICAgICB9CisrICAg ICAgICBfaWNfc2V0X2NvbnRlbnRfdHlwZSAoY29udGV4dCwgdmFsdWUpOworICAgICAgICAgcmV0 dXJuIFRSVUU7CisgICAgIH0KKyAKK0BAIC0yNTIxLDMgKzI1MjgsMTcgQEAgYnVzX2lucHV0X2Nv bnRleHRfZ2V0X2NvbnRlbnRfdHlwZSAoQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0LAorICAgICAq cHVycG9zZSA9IGNvbnRleHQtPnB1cnBvc2U7CisgICAgICpoaW50cyA9IGNvbnRleHQtPmhpbnRz OworIH0KKysKKyt2b2lkCisrYnVzX2lucHV0X2NvbnRleHRfc2V0X2NvbnRlbnRfdHlwZSAoQnVz SW5wdXRDb250ZXh0ICpjb250ZXh0LAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGd1aW50ICAgICAgICAgICAgcHVycG9zZSwKKysgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBndWludCAgICAgICAgICAgIGhpbnRzKQorK3sKKysgICAgR1ZhcmlhbnQgKnZh bHVlOworKworKyAgICBnX2Fzc2VydCAoQlVTX0lTX0lOUFVUX0NPTlRFWFQgKGNvbnRleHQpKTsK KysKKysgICAgdmFsdWUgPSBnX3ZhcmlhbnRfcmVmX3NpbmsgKGdfdmFyaWFudF9uZXcgKCIodXUp IiwgcHVycG9zZSwgaGludHMpKTsKKysgICAgX2ljX3NldF9jb250ZW50X3R5cGUgKGNvbnRleHQs IHZhbHVlKTsKKysgICAgZ192YXJpYW50X3VucmVmICh2YWx1ZSk7CisrfQorZGlmZiAtLWdpdCBh L2J1cy9pbnB1dGNvbnRleHQuaCBiL2J1cy9pbnB1dGNvbnRleHQuaAoraW5kZXggZjI4MmZhZS4u MjU4ZjUwMSAxMDA2NDQKKy0tLSBhL2J1cy9pbnB1dGNvbnRleHQuaAorKysrIGIvYnVzL2lucHV0 Y29udGV4dC5oCitAQCAtMjUwLDUgKzI1MCwxNSBAQCB2b2lkICAgICAgICAgICAgICAgICBidXNf aW5wdXRfY29udGV4dF9nZXRfY29udGVudF90eXBlCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGd1aW50ICAgICAgICAgICAgICAqcHVycG9zZSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ3VpbnQgICAg ICAgICAgICAgICpoaW50cyk7CisgCisrLyoqCisrICogYnVzX2lucHV0X2NvbnRleHRfc2V0X2Nv bnRlbnRfdHlwZToKKysgKiBAcHVycG9zZTogSW5wdXQgcHVycG9zZS4KKysgKiBAaGludHM6IElu cHV0IGhpbnRzLgorKyAqLworK3ZvaWQgICAgICAgICAgICAgICAgIGJ1c19pbnB1dF9jb250ZXh0 X3NldF9jb250ZW50X3R5cGUKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAoQnVzSW5wdXRDb250ZXh0ICpjb250ZXh0LAorKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBndWludCAgICAgICAgICAgIHB1cnBvc2Us CisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGd1aW50 ICAgICAgICAgICAgaGludHMpOworKworIEdfRU5EX0RFQ0xTCisgI2VuZGlmCistLSAKKzEuOC41 LjMKKworRnJvbSA4ZjQ3MWNlMTM4YTlkYzEwYWI1YjFlMGM3MTZiYjQ4Y2EzNmZlMTJhIE1vbiBT ZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogRG91ZyBSaW50b3VsIDxkb3VnX3JpbnRvdWxAc2ls Lm9yZz4KK0RhdGU6IE1vbiwgOCBEZWMgMjAxNCAxMjo1MjowMCArMDkwMAorU3ViamVjdDogW1BB VENIXSBTaG93IGxhbmd1YWdlIHJhdGhlciB0aGFuIGxheW91dCBpbiB4a2IgcGFuZWwgaWNvbgor CitCVUc9aHR0cHM6Ly9jb2RlLmdvb2dsZS5jb20vcC9pYnVzL2lzc3Vlcy9kZXRhaWw/aWQ9MTc1 MworVEVTVD11aS9ndGszL2lidXMtdWktZ3RrMworCitSZXZpZXcgVVJMOiBodHRwczovL2NvZGVy ZXZpZXcuYXBwc3BvdC5jb20vMTg0ODQwMDQzCitQYXRjaCBmcm9tIERvdWcgUmludG91bCA8ZG91 Z19yaW50b3VsQHNpbC5vcmc+LgorLS0tCisgdWkvZ3RrMy9wYW5lbC52YWxhICAgIHwgIDggKysr Ky0tLS0KKyB1aS9ndGszL3N3aXRjaGVyLnZhbGEgfCA0MiArKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAyIGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKyks IDI4IGRlbGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvdWkvZ3RrMy9wYW5lbC52YWxhIGIvdWkv Z3RrMy9wYW5lbC52YWxhCitpbmRleCA3Yjk5ZmRmLi40ZTAyMTQwIDEwMDY0NAorLS0tIGEvdWkv Z3RrMy9wYW5lbC52YWxhCisrKysgYi91aS9ndGszL3BhbmVsLnZhbGEKK0BAIC0xMTM1LDE2ICsx MTM1LDE2IEBAIGNsYXNzIFBhbmVsIDogSUJ1cy5QYW5lbFNlcnZpY2UgeworICAgICAgICAgaWYg KGljb25fbmFtZVswXSA9PSAnLycpCisgICAgICAgICAgICAgbV9zdGF0dXNfaWNvbi5zZXRfZnJv bV9maWxlKGljb25fbmFtZSk7CisgICAgICAgICBlbHNlIHsKKy0gICAgICAgICAgICBzdHJpbmcg c3ltYm9sID0gbnVsbDsKKysgICAgICAgICAgICBzdHJpbmcgbGFuZ3VhZ2UgPSBudWxsOworIAor ICAgICAgICAgICAgIGlmIChlbmdpbmUgIT0gbnVsbCkgeworICAgICAgICAgICAgICAgICB2YXIg bmFtZSA9IGVuZ2luZS5nZXRfbmFtZSgpOworICAgICAgICAgICAgICAgICBpZiAobmFtZS5sZW5n dGggPj0gNCAmJiBuYW1lWzA6NF0gPT0gInhrYjoiKQorLSAgICAgICAgICAgICAgICAgICAgc3lt Ym9sID0gbV9zd2l0Y2hlci5nZXRfeGtiX3N5bWJvbChlbmdpbmUpOworKyAgICAgICAgICAgICAg ICAgICAgbGFuZ3VhZ2UgPSBtX3N3aXRjaGVyLmdldF94a2JfbGFuZ3VhZ2UoZW5naW5lKTsKKyAg ICAgICAgICAgICB9CisgCistICAgICAgICAgICAgaWYgKHN5bWJvbCAhPSBudWxsKSB7CistICAg ICAgICAgICAgICAgIEdkay5QaXhidWYgcGl4YnVmID0gY3JlYXRlX2ljb25fcGl4YnVmX3dpdGhf c3RyaW5nKHN5bWJvbCk7CisrICAgICAgICAgICAgaWYgKGxhbmd1YWdlICE9IG51bGwpIHsKKysg ICAgICAgICAgICAgICAgR2RrLlBpeGJ1ZiBwaXhidWYgPSBjcmVhdGVfaWNvbl9waXhidWZfd2l0 aF9zdHJpbmcobGFuZ3VhZ2UpOworICAgICAgICAgICAgICAgICBtX3N0YXR1c19pY29uLnNldF9m cm9tX3BpeGJ1ZihwaXhidWYpOworICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAg ICAgIHZhciB0aGVtZSA9IEd0ay5JY29uVGhlbWUuZ2V0X2RlZmF1bHQoKTsKK2RpZmYgLS1naXQg YS91aS9ndGszL3N3aXRjaGVyLnZhbGEgYi91aS9ndGszL3N3aXRjaGVyLnZhbGEKK2luZGV4IDc2 MDFkODAuLjQ3NmIxNTkgMTAwNjQ0CistLS0gYS91aS9ndGszL3N3aXRjaGVyLnZhbGEKKysrKyBi L3VpL2d0azMvc3dpdGNoZXIudmFsYQorQEAgLTIxLDggKzIxLDYgQEAKKyAgKi8KKyAKKyBjbGFz cyBTd2l0Y2hlciA6IEd0ay5XaW5kb3cgeworLSAgICBwcml2YXRlIGNvbnN0IGludCBERVNDX0xB QkVMX01BWF9MRU4gPSAyMDsKKy0KKyAgICAgcHJpdmF0ZSBjbGFzcyBJQnVzRW5naW5lQnV0dG9u IDogR3RrLkJ1dHRvbiB7CisgICAgICAgICBwdWJsaWMgSUJ1c0VuZ2luZUJ1dHRvbihJQnVzLkVu Z2luZURlc2MgZW5naW5lLCBTd2l0Y2hlciBzd2l0Y2hlcikgeworICAgICAgICAgICAgIEdMaWIu T2JqZWN0KCk7CitAQCAtMzgsMTQgKzM2LDE0IEBAIGNsYXNzIFN3aXRjaGVyIDogR3RrLldpbmRv dyB7CisgICAgICAgICAgICAgICAgIGljb24uc2V0X3ZhbGlnbihHdGsuQWxpZ24uQ0VOVEVSKTsK KyAgICAgICAgICAgICAgICAgYWRkKGljb24pOworICAgICAgICAgICAgIH0gZWxzZSB7CistICAg ICAgICAgICAgICAgIHZhciBzeW1ib2wgPSBzd2l0Y2hlci5nZXRfeGtiX3N5bWJvbChlbmdpbmUp OworKyAgICAgICAgICAgICAgICB2YXIgbGFuZ3VhZ2UgPSBzd2l0Y2hlci5nZXRfeGtiX2xhbmd1 YWdlKGVuZ2luZSk7CisgCistICAgICAgICAgICAgICAgIEd0ay5MYWJlbCBsYWJlbCA9IG5ldyBH dGsuTGFiZWwoc3ltYm9sKTsKKysgICAgICAgICAgICAgICAgR3RrLkxhYmVsIGxhYmVsID0gbmV3 IEd0ay5MYWJlbChsYW5ndWFnZSk7CisgICAgICAgICAgICAgICAgIGxhYmVsLnNldF9oYWxpZ24o R3RrLkFsaWduLkNFTlRFUik7CisgICAgICAgICAgICAgICAgIGxhYmVsLnNldF92YWxpZ24oR3Rr LkFsaWduLkNFTlRFUik7CistICAgICAgICAgICAgICAgIHN0cmluZyBzeW1ib2xfZm9udCA9ICJN b25vc3BhY2UgQm9sZCAxNiI7CisrICAgICAgICAgICAgICAgIHN0cmluZyBsYW5ndWFnZV9mb250 ID0gIk1vbm9zcGFjZSBCb2xkIDE2IjsKKyAgICAgICAgICAgICAgICAgc3RyaW5nIG1hcmt1cCA9 ICI8c3BhbiBmb250PVwiJXNcIj4lczwvc3Bhbj4iLgorLSAgICAgICAgICAgICAgICAgICAgICAg IHByaW50ZihzeW1ib2xfZm9udCwgc3ltYm9sKTsKKysgICAgICAgICAgICAgICAgICAgICAgICBw cmludGYobGFuZ3VhZ2VfZm9udCwgbGFuZ3VhZ2UpOworIAorICAgICAgICAgICAgICAgICBsYWJl bC5zZXRfbWFya3VwKG1hcmt1cCk7CisgCitAQCAtODksNyArODcsNyBAQCBjbGFzcyBTd2l0Y2hl ciA6IEd0ay5XaW5kb3cgeworICAgICBwcml2YXRlIHVpbnQgbV9wb3B1cF9kZWxheV90aW1lX2lk ID0gMDsKKyAgICAgcHJpdmF0ZSBpbnQgbV9yb290X3g7CisgICAgIHByaXZhdGUgaW50IG1fcm9v dF95OworLSAgICBwcml2YXRlIEdMaWIuSGFzaFRhYmxlPHN0cmluZywgc3RyaW5nPiBtX3hrYl9z eW1ib2xzID0KKysgICAgcHJpdmF0ZSBHTGliLkhhc2hUYWJsZTxzdHJpbmcsIHN0cmluZz4gbV94 a2JfbGFuZ3VhZ2VzID0KKyAgICAgICAgICAgICBuZXcgR0xpYi5IYXNoVGFibGU8c3RyaW5nLCBz dHJpbmc+KEdMaWIuc3RyX2hhc2gsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBHTGliLnN0cl9lcXVhbCk7CisgCitAQCAtMjY4LDEwICsyNjYsNiBAQCBj bGFzcyBTd2l0Y2hlciA6IEd0ay5XaW5kb3cgeworICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICAgICAgICAgICB9KTsKKyAKKy0gICAgICAgICAgICBpZiAobG9uZ25hbWUubGVuZ3Ro ID4gREVTQ19MQUJFTF9NQVhfTEVOKSB7CistICAgICAgICAgICAgICAgIGxvbmduYW1lID0gbG9u Z25hbWVbMDpERVNDX0xBQkVMX01BWF9MRU5dOworLSAgICAgICAgICAgIH0KKy0KKyAgICAgICAg ICAgICBidXR0b24ubG9uZ25hbWUgPSBsb25nbmFtZTsKKyAgICAgICAgICAgICBtX2xhYmVsLnNl dF9sYWJlbChsb25nbmFtZSk7CisgCitAQCAtNDI5LDM3ICs0MjMsMzcgQEAgY2xhc3MgU3dpdGNo ZXIgOiBHdGsuV2luZG93IHsKKyAgICAgICAgIG1fcG9wdXBfZGVsYXlfdGltZSA9IHBvcHVwX2Rl bGF5X3RpbWU7CisgICAgIH0KKyAKKy0gICAgcHVibGljIHN0cmluZyBnZXRfeGtiX3N5bWJvbChJ QnVzLkVuZ2luZURlc2MgZW5naW5lKSB7CisrICAgIHB1YmxpYyBzdHJpbmcgZ2V0X3hrYl9sYW5n dWFnZShJQnVzLkVuZ2luZURlc2MgZW5naW5lKSB7CisgICAgICAgICB2YXIgbmFtZSA9IGVuZ2lu ZS5nZXRfbmFtZSgpOworIAorICAgICAgICAgYXNzZXJ0KG5hbWVbMDo0XSA9PSAieGtiOiIpOwor IAorLSAgICAgICAgdmFyIHN5bWJvbCA9IG1feGtiX3N5bWJvbHNbbmFtZV07CisrICAgICAgICB2 YXIgbGFuZ3VhZ2UgPSBtX3hrYl9sYW5ndWFnZXNbbmFtZV07CisgCistICAgICAgICBpZiAoc3lt Ym9sICE9IG51bGwpCistICAgICAgICAgICAgcmV0dXJuIHN5bWJvbDsKKysgICAgICAgIGlmIChs YW5ndWFnZSAhPSBudWxsKQorKyAgICAgICAgICAgIHJldHVybiBsYW5ndWFnZTsKKyAKKy0gICAg ICAgIHZhciBsYXlvdXQgPSBlbmdpbmUuZ2V0X2xheW91dCgpOworKyAgICAgICAgbGFuZ3VhZ2Ug PSBlbmdpbmUuZ2V0X2xhbmd1YWdlKCk7CisgCisgICAgICAgICAvKiBNYXliZSBpbnZhbGlkIGxh eW91dCAqLworLSAgICAgICAgaWYgKGxheW91dC5sZW5ndGggPCAyKQorLSAgICAgICAgICAgIHJl dHVybiBsYXlvdXQ7CisrICAgICAgICBpZiAobGFuZ3VhZ2UubGVuZ3RoIDwgMikKKysgICAgICAg ICAgICByZXR1cm4gbGFuZ3VhZ2U7CisgCistICAgICAgICBzeW1ib2wgPSBsYXlvdXRbMDoyXS51 cCgpOworKyAgICAgICAgbGFuZ3VhZ2UgPSBsYW5ndWFnZVswOjJdLnVwKCk7CisgCisgICAgICAg ICBpbnQgaW5kZXggPSAwOworIAorLSAgICAgICAgZm9yZWFjaCAodmFyIHNhdmVkX3N5bWJvbCBp biBtX3hrYl9zeW1ib2xzLmdldF92YWx1ZXMoKSkgeworLSAgICAgICAgICAgIGlmIChzeW1ib2wg PT0gc2F2ZWRfc3ltYm9sWzA6Ml0pCisrICAgICAgICBmb3JlYWNoICh2YXIgc2F2ZWRfbGFuZ3Vh Z2UgaW4gbV94a2JfbGFuZ3VhZ2VzLmdldF92YWx1ZXMoKSkgeworKyAgICAgICAgICAgIGlmIChs YW5ndWFnZSA9PSBzYXZlZF9sYW5ndWFnZVswOjJdKQorICAgICAgICAgICAgICAgICBpbmRleCsr OworICAgICAgICAgfQorIAorICAgICAgICAgaWYgKGluZGV4ID4gMCkgeworICAgICAgICAgICAg IHVuaWNoYXIgdSA9IDB4MjA4MSArIGluZGV4OworLSAgICAgICAgICAgIHN5bWJvbCA9ICIlcyVz Ii5wcmludGYoc3ltYm9sLCB1LnRvX3N0cmluZygpKTsKKysgICAgICAgICAgICBsYW5ndWFnZSA9 ICIlcyVzIi5wcmludGYobGFuZ3VhZ2UsIHUudG9fc3RyaW5nKCkpOworICAgICAgICAgfQorIAor LSAgICAgICAgbV94a2Jfc3ltYm9scy5pbnNlcnQobmFtZSwgc3ltYm9sKTsKKy0gICAgICAgIHJl dHVybiBzeW1ib2w7CisrICAgICAgICBtX3hrYl9sYW5ndWFnZXMuaW5zZXJ0KG5hbWUsIGxhbmd1 YWdlKTsKKysgICAgICAgIHJldHVybiBsYW5ndWFnZTsKKyAgICAgfQorIH0KKy0tIAorMS44LjUu MworCgpkaWZmIC0tZ2l0IGEvaWJ1cy14eC1pbmNyZWFzZS10aW1lb3V0LnBhdGNoIGIvaWJ1cy14 eC1pbmNyZWFzZS10aW1lb3V0LnBhdGNoCmluZGV4IDczODAzNzIuLmE0MDZkNjkgMTAwNjQ0Ci0t LSBhL2lidXMteHgtaW5jcmVhc2UtdGltZW91dC5wYXRjaAorKysgYi9pYnVzLXh4LWluY3JlYXNl LXRpbWVvdXQucGF0Y2gKQEAgLTEsMTEgKzEsMTEgQEAKIC0tLSBpYnVzLTEuNS44L2J1cy9nbG9i YWwuYy5vcmlnCTIwMTQtMTAtMjQgMTE6Mzk6MDIuOTkyMzU5ODU1ICswOTAwCi0rKysgaWJ1cy0x LjUuOC9idXMvZ2xvYmFsLmMJMjAxNC0xMC0yNCAxMTo0MDozMy45MTcwNTE4MTMgKzA5MDAKKysr KyBpYnVzLTEuNS44L2J1cy9nbG9iYWwuYwkyMDE0LTEyLTAxIDE5OjExOjExLjMxMTc1OTExMiAr MDkwMAogQEAgLTI4LDQgKzI4LDQgQEAgZ2NoYXIgKmdfYWRkcmVzcyA9ICJ1bml4OnRtcGRpcj0v dG1wIjsKICBnY2hhciAqZ19jYWNoZSA9ICJhdXRvIjsKICBnYm9vbGVhbiBnX21lbXBybyA9IEZB TFNFOwogIGdib29sZWFuIGdfdmVyYm9zZSA9IEZBTFNFOwogLWdpbnQgICBnX2dkYnVzX3RpbWVv dXQgPSA1MDAwOwotK2dpbnQgICBnX2dkYnVzX3RpbWVvdXQgPSAyMDAwMDsKKytnaW50ICAgZ19n ZGJ1c190aW1lb3V0ID0gMTUwMDA7CiAtLS0gaWJ1cy0xLjUuOC9idXMvaWJ1c2ltcGwuYy5vcmln CTIwMTQtMTAtMTQgMTI6MTU6MzAuNTQ3MzY5MTA4ICswOTAwCiArKysgaWJ1cy0xLjUuOC9idXMv aWJ1c2ltcGwuYwkyMDE0LTEwLTE0IDEyOjE2OjIzLjE4MjM5NjI0NyArMDkwMAogQEAgLTEzOTAs MTEgKzEzOTAsMTIgQEAgX2lidXNfc2V0X2dsb2JhbF9lbmdpbmVfcmVhZHlfY2IgKEJ1c0lucApA QCAtMjQsNjUgKzI0LDYxIEBACiAgICAgIGVsc2UgewogICAgICAgICAgZ19kYnVzX21ldGhvZF9p bnZvY2F0aW9uX3JldHVybl92YWx1ZSAoZGF0YS0+aW52b2NhdGlvbiwgTlVMTCk7CiAtLS0gaWJ1 cy0xLjUuOC9idXMvbWFpbi5jLm9yaWcJMjAxNC0xMC0yNCAxMTo0MTozMi41NzkxNDA5MTIgKzA5 MDAKLSsrKyBpYnVzLTEuNS44L2J1cy9tYWluLmMJMjAxNC0xMC0yNCAxMTo0MTo0My41MjAzNDM4 NjcgKzA5MDAKKysrKyBpYnVzLTEuNS44L2J1cy9tYWluLmMJMjAxNC0xMi0wMSAxOToxMjoxNy4y MzUxMDk4NDkgKzA5MDAKIEBAIC02NCw3ICs2NCw3IEBAIHN0YXRpYyBjb25zdCBHT3B0aW9uRW50 cnkgZW50cmllc1tdID0KICAgICAgeyAiYWRkcmVzcyIsICAgJ2EnLCAwLCBHX09QVElPTl9BUkdf U1RSSU5HLCAmZ19hZGRyZXNzLCAgICJzcGVjaWZ5IHRoZSBhZGRyZXNzIG9mIGlidXMgZGFlbW9u LiIsICJhZGRyZXNzIiB9LAogICAgICB7ICJyZXBsYWNlIiwgICAncicsIDAsIEdfT1BUSU9OX0FS R19OT05FLCAgICZyZXBsYWNlLCAgICJpZiB0aGVyZSBpcyBhbiBvbGQgaWJ1cy1kYWVtb24gaXMg cnVubmluZywgaXQgd2lsbCBiZSByZXBsYWNlZC4iLCBOVUxMIH0sCiAgICAgIHsgImNhY2hlIiwg ICAgICd0JywgMCwgR19PUFRJT05fQVJHX1NUUklORywgJmdfY2FjaGUsICAgInNwZWNpZnkgdGhl IGNhY2hlIG1vZGUuIFthdXRvL3JlZnJlc2gvbm9uZV0iLCBOVUxMIH0sCiAtICAgIHsgInRpbWVv dXQiLCAgICdvJywgMCwgR19PUFRJT05fQVJHX0lOVCwgICAgJmdfZ2RidXNfdGltZW91dCwgImdk YnVzIHJlcGx5IHRpbWVvdXQgaW4gbWlsbGlzZWNvbmRzLiBwYXNzIC0xIHRvIHVzZSB0aGUgZGVm YXVsdCB0aW1lb3V0IG9mIGdkYnVzLiIsICJ0aW1lb3V0IFtkZWZhdWx0IGlzIDUwMDBdIiB9LAot KyAgICB7ICJ0aW1lb3V0IiwgICAnbycsIDAsIEdfT1BUSU9OX0FSR19JTlQsICAgICZnX2dkYnVz X3RpbWVvdXQsICJnZGJ1cyByZXBseSB0aW1lb3V0IGluIG1pbGxpc2Vjb25kcy4gcGFzcyAtMSB0 byB1c2UgdGhlIGRlZmF1bHQgdGltZW91dCBvZiBnZGJ1cy4iLCAidGltZW91dCBbZGVmYXVsdCBp cyAyMDAwMF0iIH0sCisrICAgIHsgInRpbWVvdXQiLCAgICdvJywgMCwgR19PUFRJT05fQVJHX0lO VCwgICAgJmdfZ2RidXNfdGltZW91dCwgImdkYnVzIHJlcGx5IHRpbWVvdXQgaW4gbWlsbGlzZWNv bmRzLiBwYXNzIC0xIHRvIHVzZSB0aGUgZGVmYXVsdCB0aW1lb3V0IG9mIGdkYnVzLiIsICJ0aW1l b3V0IFtkZWZhdWx0IGlzIDE1MDAwXSIgfSwKICAgICAgeyAibWVtLXByb2ZpbGUiLCAnbScsIDAs IEdfT1BUSU9OX0FSR19OT05FLCAgICZnX21lbXBybywgICAiZW5hYmxlIG1lbW9yeSBwcm9maWxl LCBzZW5kIFNJR1VTUjIgdG8gcHJpbnQgb3V0IHRoZSBtZW1vcnkgcHJvZmlsZS4iLCBOVUxMIH0s CiAgICAgIHsgInJlc3RhcnQiLCAgICAgJ1InLCAwLCBHX09QVElPTl9BUkdfTk9ORSwgICAmcmVz dGFydCwgICAgInJlc3RhcnQgcGFuZWwgYW5kIGNvbmZpZyBwcm9jZXNzZXMgd2hlbiB0aGV5IGRp ZS4iLCBOVUxMIH0sCiAgICAgIHsgInZlcmJvc2UiLCAgICd2JywgMCwgR19PUFRJT05fQVJHX05P TkUsICAgJmdfdmVyYm9zZSwgICAidmVyYm9zZS4iLCBOVUxMIH0sCiAtLS0gaWJ1cy0xLjUuOC9z cmMvaWJ1c3NoYXJlLmMub3JpZwkyMDE0LTEwLTIyIDExOjQ5OjU1LjM4NjkxMzM3NiArMDkwMAot KysrIGlidXMtMS41Ljgvc3JjL2lidXNzaGFyZS5jCTIwMTQtMTAtMjQgMTE6NDQ6MTUuNzE5MjQ5 OTUxICswOTAwCisrKysgaWJ1cy0xLjUuOC9zcmMvaWJ1c3NoYXJlLmMJMjAxNC0xMi0wMSAxOTox MzowMS4xMzUwMDkzMjMgKzA5MDAKIEBAIC0xNTgsOCArMTU4LDkgQEAgaWJ1c19nZXRfc29ja2V0 X3BhdGggKHZvaWQpCiAgZ2ludAogIGlidXNfZ2V0X3RpbWVvdXQgKHZvaWQpCiAgewogLSAgICAv KiA2MDAwIG1zIGlzIHRoZSBkZWZhdWx0IHRpbWVvdXQgb24gdGhlIGlidXMtZGFlbW9uIHNpZGUg KDUgc2VjKSBwbHVzIDEuICovCiAtICAgIHN0YXRpYyBjb25zdCBnaW50IGRlZmF1bHRfdGltZW91 dCA9IDYwMDA7Ci0rICAgIC8qIDIxMDAwIG1zIGlzIHRoZSBkZWZhdWx0IHRpbWVvdXQgb24gdGhl IGlidXMtZGFlbW9uIHNpZGUKLSsgICAgICogKDIwIHNlYykgcGx1cyAxLiAqLwotKyAgICBzdGF0 aWMgY29uc3QgZ2ludCBkZWZhdWx0X3RpbWVvdXQgPSAyMTAwMDsKKysgICAgLyogMTYwMDAgbXMg aXMgdGhlIGRlZmF1bHQgdGltZW91dCBvbiB0aGUgaWJ1cy1kYWVtb24gc2lkZQorKyAgICAgKiAo MTUgc2VjKSBwbHVzIDEuICovCisrICAgIHN0YXRpYyBjb25zdCBnaW50IGRlZmF1bHRfdGltZW91 dCA9IDE2MDAwOwogIAogICAgICBzdGF0aWMgZ2ludDY0IHRpbWVvdXQgPSAtMjsKICAgICAgaWYg KHRpbWVvdXQgPT0gLTIpIHsKIC0tLSBpYnVzLTEuNS44L3VpL2d0azMvcGFuZWwudmFsYS5vcmln CTIwMTQtMTAtMjIgMTI6MDA6MzcuMDE3NjA0ODI1ICswOTAwCi0rKysgaWJ1cy0xLjUuOC91aS9n dGszL3BhbmVsLnZhbGEJMjAxNC0xMC0yMiAxNTowMDo0Ny43NDIxODc0MzAgKzA5MDAKLUBAIC02 ODcsMTQgKzY4NywyOCBAQCBjbGFzcyBQYW5lbCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKLSAgICAg fQorKysrIGlidXMtMS41LjgvdWkvZ3RrMy9wYW5lbC52YWxhCTIwMTQtMTEtMjggMTg6NDk6NDku ODc4MjM0OTY2ICswOTAwCitAQCAtNjUsNiArNjUsOCBAQCBjbGFzcyBQYW5lbCA6IElCdXMuUGFu ZWxTZXJ2aWNlIHsKKyAgICAgICAgICAgICByZWQgPSAwLjAsIGdyZWVuID0gMC4wLCBibHVlID0g MC4wLCBhbHBoYSA9IDEuMCB9OworICAgICBwcml2YXRlIFhLQkxheW91dCBtX3hrYmxheW91dCA9 IG5ldyBYS0JMYXlvdXQoKTsKKyAgICAgcHJpdmF0ZSBib29sIGluaXRlZF9lbmdpbmVzX29yZGVy ID0gdHJ1ZTsKKysgICAgcHJpdmF0ZSB1aW50IG1fcHJlbG9hZF9lbmdpbmVzX2lkOworKyAgICBw cml2YXRlIGNvbnN0IHVpbnQgUFJFTE9BRF9FTkdJTkVTX0RFTEFZX1RJTUUgPSAzMDAwMDsKICAK LSAgICAgcHJpdmF0ZSB2b2lkIHNldF9lbmdpbmUoSUJ1cy5FbmdpbmVEZXNjIGVuZ2luZSkgewot LSAgICAgICAgaWYgKCFtX2J1cy5zZXRfZ2xvYmFsX2VuZ2luZShlbmdpbmUuZ2V0X25hbWUoKSkp IHsKLS0gICAgICAgICAgICB3YXJuaW5nKCJTd2l0Y2ggZW5naW5lIHRvICVzIGZhaWxlZC4iLCBl bmdpbmUuZ2V0X25hbWUoKSk7Ci0tICAgICAgICAgICAgcmV0dXJuOwotLSAgICAgICAgfQotKyAg ICAgICAgLyogVXNlIGFzeW5jIGJlY2F1c2UgSUJ1cy5CdXMuc2V0X2dsb2JhbF9lbmdpbmUoKSB1 c2VzCi0rICAgICAgICAgKiBJQnVzLmdldF90aW1lb3V0KCkgaW50ZXJuYWxseSBhbmQgdGhlIHZh bHVlIGRvZXMgbm90IGZvbGxvdwotKyAgICAgICAgICogaWJ1cy1kYWVtb24gLS10aW1lb3V0Lgot KyAgICAgICAgICovCi0rICAgICAgICBtX2J1cy5zZXRfZ2xvYmFsX2VuZ2luZV9hc3luYy5iZWdp bihlbmdpbmUuZ2V0X25hbWUoKSwgLTEsIG51bGwsCi0rICAgICAgICAgICAgICAgIChvYmosIHJl cykgPT4gewotKyAgICAgICAgICAgICAgICAgICAgdHJ5IHsKLSsgICAgICAgICAgICAgICAgICAg ICAgICBib29sIHJlc3VsdCA9Ci0rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2J1 cy5zZXRfZ2xvYmFsX2VuZ2luZV9hc3luY19maW5pc2gocmVzKTsKLSsgICAgICAgICAgICAgICAg ICAgICAgICBpZiAoIXJlc3VsdCkKLSsgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2Fybmlu ZygiU3dpdGNoIGVuZ2luZSB0byAlcyBmYWlsZWQuIiwKLSsgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBlbmdpbmUuZ2V0X25hbWUoKSk7Ci0rICAgICAgICAgICAgICAgICAgICB9 IGNhdGNoIChHTGliLkVycm9yIGUpIHsKLSsgICAgICAgICAgICAgICAgICAgICAgICB3YXJuaW5n KCJTd2l0Y2ggZW5naW5lIHRvICVzIGZhaWxlZC46IEdMaWIuRXJyb3I6ICVzIiwKLSsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGVuZ2luZS5nZXRfbmFtZSgpLAotKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZS5tZXNzYWdlKTsKLSsgICAgICAgICAgICAgICAgICAgIH0K KyAgICAgcHJpdmF0ZSBHTGliLkxpc3Q8S2V5YmluZGluZz4gbV9rZXliaW5kaW5ncyA9IG5ldyBH TGliLkxpc3Q8S2V5YmluZGluZz4oKTsKICAKLS0gICAgICAgIC8vIHNldCB4a2IgbGF5b3V0Ci0t ICAgICAgICBpZiAoIW1fdXNlX3N5c3RlbV9rZXlib2FyZF9sYXlvdXQpCi0tICAgICAgICAgICAg bV94a2JsYXlvdXQuc2V0X2xheW91dChlbmdpbmUpOwotKyAgICAgICAgICAgICAgICAgICAgLy8g c2V0IHhrYiBsYXlvdXQKLSsgICAgICAgICAgICAgICAgICAgIGlmICghbV91c2Vfc3lzdGVtX2tl eWJvYXJkX2xheW91dCkKLSsgICAgICAgICAgICAgICAgICAgICAgICBtX3hrYmxheW91dC5zZXRf bGF5b3V0KGVuZ2luZSk7Ci0rICAgICAgICAgICAgICAgIH0pOworQEAgLTc2NCw4ICs3NjYsMjEg QEAgY2xhc3MgUGFuZWwgOiBJQnVzLlBhbmVsU2VydmljZSB7CisgICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgfQogIAotICAgICAgICAgZW5naW5lX2NvbnRleHRzX2luc2VydChlbmdpbmUp OworKyAgICAgICAgaWYgKG1fcHJlbG9hZF9lbmdpbmVzX2lkICE9IDApIHsKKysgICAgICAgICAg ICBHTGliLlNvdXJjZS5yZW1vdmUobV9wcmVsb2FkX2VuZ2luZXNfaWQpOworKyAgICAgICAgICAg IG1fcHJlbG9hZF9lbmdpbmVzX2lkID0gMDsKKysgICAgICAgIH0KKysKKyAgICAgICAgIG5hbWVz ICs9IGVuZ2luZXNbaW5kZXhdLmdldF9uYW1lKCk7CistICAgICAgICBtX2J1cy5wcmVsb2FkX2Vu Z2luZXNfYXN5bmMuYmVnaW4obmFtZXMsIC0xLCBudWxsKTsKKysgICAgICAgIG1fcHJlbG9hZF9l bmdpbmVzX2lkID0KKysgICAgICAgICAgICAgICAgVGltZW91dC5hZGQoCisrICAgICAgICAgICAg ICAgICAgICAgICAgUFJFTE9BRF9FTkdJTkVTX0RFTEFZX1RJTUUsCisrICAgICAgICAgICAgICAg ICAgICAgICAgKCkgPT4geworKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2J1cy5wcmVs b2FkX2VuZ2luZXNfYXN5bmMuYmVnaW4obmFtZXMsCisrICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAtMSwKKysgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG51bGwpOwor KyAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisrICAgICAgICAgICAg ICAgICAgICAgICAgfSk7CiAgICAgIH0KKyAKKyAgICAgcHJpdmF0ZSB2b2lkIHVwZGF0ZV9lbmdp bmVzKHN0cmluZ1tdPyB1bm93bmVkX2VuZ2luZV9uYW1lcywKCmRpZmYgLS1naXQgYS9pYnVzLnNw ZWMgYi9pYnVzLnNwZWMKaW5kZXggYzY2Y2QyNS4uNmZiZWE3MiAxMDA2NDQKLS0tIGEvaWJ1cy5z cGVjCisrKyBiL2lidXMuc3BlYwpAQCAtMjgsNyArMjgsNyBAQAogCiBOYW1lOiAgICAgICAgICAg aWJ1cwogVmVyc2lvbjogICAgICAgIDEuNS45Ci1SZWxlYXNlOiAgICAgICAgNSV7P2Rpc3R9CitS ZWxlYXNlOiAgICAgICAgNiV7P2Rpc3R9CiBTdW1tYXJ5OiAgICAgICAgSW50ZWxsaWdlbnQgSW5w dXQgQnVzIGZvciBMaW51eCBPUwogTGljZW5zZTogICAgICAgIExHUEx2MisKIEdyb3VwOiAgICAg ICAgICBTeXN0ZW0gRW52aXJvbm1lbnQvTGlicmFyaWVzCkBAIC00MTEsNiArNDExLDExIEBAIGZp CiAle19kYXRhZGlyfS9ndGstZG9jL2h0bWwvKgogCiAlY2hhbmdlbG9nCisqIE1vbiBEZWMgMDgg MjAxNCBUYWthbyBGdWppd2FyYSA8dGZ1aml3YXJAcmVkaGF0LmNvbT4gLSAxLjUuOS02CistIFVw ZGF0ZWQgaWJ1cy14eC1pbmNyZWFzZS10aW1lb3V0LnBhdGNoIHRvIGZpeCAjMTE2MzcyMgorLSBV cGRhdGVkIGlidXMtSEVBRC5wYXRjaCBmb3IgdXBzdHJlYW0gIzE3NDcsICMxNzQ4LCAjMTc1Mwor ICBhbmQgZ25vbWUgIzcwMzAyMCwgZ25vbWUgIzczMDYyOAorCiAqIFdlZCBOb3YgMTIgMjAxNCBU YWthbyBGdWppd2FyYSA8dGZ1aml3YXJAcmVkaGF0LmNvbT4gLSAxLjUuOS01CiAtIHJoYnojMTE2 MTg3MSBBZGRlZCBCUiBvZiBweXRob24gYW5kIHB5dGhvbjMKIAo=