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: Delete upstreamed patches Date: Sun, 31 May 2026 02:08:53 GMT Message-ID: <178019333375.1.14127478013814230320.rpms-ibus-8f31308236e7@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: 8f31308236e71b333e91495ddbdddf1e69401b59 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvaWJ1cwpCcmFuY2gg OiBhdXRvdG9vbApDb21taXQgOiA4ZjMxMzA4MjM2ZTcxYjMzM2U5MTQ5NWRkYmRkZGYxZTY5NDAx YjU5CkF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgpEYXRlICAg OiAyMDI1LTAzLTE5VDEzOjUxOjUwKzA5OjAwClN0YXRzICA6ICswLy01NDIgaW4gMSBmaWxlKHMp ClVSTCAgICA6IGh0dHBzOi8vc3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvaWJ1cy9jLzhmMzEz MDgyMzZlNzFiMzMzZTkxNDk1ZGRiZGRkZjFlNjk0MDFiNTk/YnJhbmNoPWF1dG90b29sCgpMb2c6 CkRlbGV0ZSB1cHN0cmVhbWVkIHBhdGNoZXMKCi0tLQpkaWZmIC0tZ2l0IGEvaWJ1cy1IRUFELnBh dGNoIGIvaWJ1cy1IRUFELnBhdGNoCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlYWRh M2ZjLi4wMDAwMDAwCi0tLSBhL2lidXMtSEVBRC5wYXRjaAorKysgL2Rldi9udWxsCkBAIC0xLDU0 MiArMCwwIEBACi1Gcm9tIDY0NmNmNDU5OTAyYzM1MjY4OTAxYTg3MTNjZDdjZDg4YTRjZjdjZjkg TW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCi1Gcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJh MUBnbWFpbC5jb20+Ci1EYXRlOiBXZWQsIDUgTWFyIDIwMjUgMDg6NDE6MzQgKzA5MDAKLVN1Ympl Y3Q6IFtQQVRDSF0gY2xpZW50L2d0azI6IFJldmVydCAiQWRkIGEgcGFkIHRvIHRoZSBjdXJzb3Ig aGVpZ2h0IGluIFdheWxhbmQiCi0KLUZpeCB0aGUgcmVncmVzc2lvbiBpbiBnbm9tZS1zaGVsbC4K LQotQlVHPWh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC8tL2lzc3Vl cy84MjI4Ci1GaXhlczogaHR0cHM6Ly9naXRodWIuY29tL2lidXMvaWJ1cy9jb21taXQvYzM4ZDgy ZgotLS0tCi0gY2xpZW50L2d0azIvaWJ1c2ltY29udGV4dC5jIHwgMiAtLQotIDEgZmlsZSBjaGFu Z2VkLCAyIGRlbGV0aW9ucygtKQotCi1kaWZmIC0tZ2l0IGEvY2xpZW50L2d0azIvaWJ1c2ltY29u dGV4dC5jIGIvY2xpZW50L2d0azIvaWJ1c2ltY29udGV4dC5jCi1pbmRleCBhNDVhYWU5Mi4uMjY2 ZmE2ZmUgMTAwNjQ0Ci0tLS0gYS9jbGllbnQvZ3RrMi9pYnVzaW1jb250ZXh0LmMKLSsrKyBiL2Ns aWVudC9ndGsyL2lidXNpbWNvbnRleHQuYwotQEAgLTE2OTMsMTQgKzE2OTMsMTIgQEAgX3NldF9j dXJzb3JfbG9jYXRpb25faW50ZXJuYWwgKElCdXNJTUNvbnRleHQgKmlidXNpbWNvbnRleHQpCi0g I2VuZGlmCi0gCi0gICAgIGlmIChHREtfSVNfV0FZTEFORF9ESVNQTEFZIChkaXNwbGF5KSkgewot LSAgICAgICAgYXJlYS55ICs9IGFyZWEuaGVpZ2h0IC8gMjsKLSAgICAgICAgIGlidXNfaW5wdXRf Y29udGV4dF9zZXRfY3Vyc29yX2xvY2F0aW9uX3JlbGF0aXZlICgKLSAgICAgICAgICAgICAgICAg aWJ1c2ltY29udGV4dC0+aWJ1c2NvbnRleHQsCi0gICAgICAgICAgICAgICAgIGFyZWEueCwKLSAg ICAgICAgICAgICAgICAgYXJlYS55LAotICAgICAgICAgICAgICAgICBhcmVhLndpZHRoLAotICAg ICAgICAgICAgICAgICBhcmVhLmhlaWdodCk7Ci0tCi0gICAgIH0gZWxzZSB7Ci0gI2VuZGlmCi0g ICAgICAgICBpYnVzX2lucHV0X2NvbnRleHRfc2V0X2N1cnNvcl9sb2NhdGlvbiAoaWJ1c2ltY29u dGV4dC0+aWJ1c2NvbnRleHQsCi0tLSAKLTIuNDcuMAotCi1Gcm9tIGRhNGQ3YzE5ZTQ3NGQwZTY5 YzZlMzUxMTZjNjI1NzY1Y2MzNzdjN2QgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCi1Gcm9tOiBm dWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+Ci1EYXRlOiBTdW4sIDkgTWFyIDIw MjUgMTA6MDg6NDQgKzA5MDAKLVN1YmplY3Q6IFtQQVRDSF0gYnVzOiBTZW5kIEZvY3VzSW4gc2ln bmFsIGFnYWluIGFmdGVyIGRlbGF5ZWQgRm9jdXNJZCBwcm9wZXJ0eQotCi1UaGUgRm9jdXNJZCBE LUJ1cyBwcm9wZXJ0eSBpcyBjaGVja2VkIGFmdGVyIGJvdGggYnVzL0VuZ2luZVByb3h5Ci1hbmQg c3JjL0lCdXNFbmdpbmUgaXMgZ2VuZXJhdGVkIHdpdGggYW4gaWRsZSB0aGVuIHRoZSBmaXJzdAot Rm9jdXNJbiBELUJ1cyBzaWduYWwgaXMgc2VudCB3aXRob3V0IGNoZWNraW5nIHRoZSBGb2N1c0lk IHByb3BlcnR5Ci13aGVuIGlidXMtZGFlbW9uIHJ1bnMuCi1UaGUgc29sdXRpb24gaXMgdG8gc2Vu ZCB0aGUgRm9jdXNJbiBzaWduYWwgYWdhaW4gaW4gY2FzZSB0aGUKLUZvY3VzSWQgcHJvcGVydHkg aXMgVFJVRS4KLQotQlVHPWh0dHBzOi8vZ2l0aHViLmNvbS9pYnVzL2lidXMvcHVsbC8yNzE3Ci0t LS0KLSBidXMvZW5naW5lcHJveHkuYyB8IDI2ICsrKysrKysrKysrKysrKysrKysrKysrKy0tCi0g MSBmaWxlIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCi0KLWRpZmYg LS1naXQgYS9idXMvZW5naW5lcHJveHkuYyBiL2J1cy9lbmdpbmVwcm94eS5jCi1pbmRleCAyMGY4 OWNlZi4uZmExNWQyZTcgMTAwNjQ0Ci0tLS0gYS9idXMvZW5naW5lcHJveHkuYwotKysrIGIvYnVz L2VuZ2luZXByb3h5LmMKLUBAIC0yLDcgKzIsNyBAQAotIC8qIHZpbTpzZXQgZXQgc3RzPTQ6ICov Ci0gLyogaWJ1cyAtIFRoZSBJbnB1dCBCdXMKLSAgKiBDb3B5cmlnaHQgKEMpIDIwMDgtMjAxMyBQ ZW5nIEh1YW5nIDxzaGF3bi5wLmh1YW5nQGdtYWlsLmNvbT4KLS0gKiBDb3B5cmlnaHQgKEMpIDIw MTUtMjAyMiBUYWthbyBGdWppd2FyYSA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KLSsgKiBD b3B5cmlnaHQgKEMpIDIwMTUtMjAyNSBUYWthbyBGdWppd2FyYSA8dGFrYW8uZnVqaXdhcmExQGdt YWlsLmNvbT4KLSAgKiBDb3B5cmlnaHQgKEMpIDIwMDgtMjAxNiBSZWQgSGF0LCBJbmMuCi0gICoK LSAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUg aXQgYW5kL29yCi1AQCAtNjEsNiArNjEsOCBAQCBzdHJ1Y3QgX0J1c0VuZ2luZVByb3h5IHsKLSAg ICAgSUJ1c1Byb3BMaXN0ICpwcm9wX2xpc3Q7Ci0gICAgIGdib29sZWFuIGhhc19mb2N1c19pZDsK LSAgICAgZ2Jvb2xlYW4gaGFzX2FjdGl2ZV9zdXJyb3VuZGluZ190ZXh0OwotKyAgICBnY2hhciAq b2JqZWN0X3BhdGg7Ci0rICAgIGdjaGFyICpjbGllbnQ7Ci0gfTsKLSAKLSBzdHJ1Y3QgX0J1c0Vu Z2luZVByb3h5Q2xhc3MgewotQEAgLTEzOTEsNiArMTM5Myw4IEBAIF9nZXRfaGFzX2ZvY3VzX2lk X2NiIChHT2JqZWN0ICAgICAgICAqb2JqZWN0LAotICAgICAgICAgICAgIGhhc2hfdGFibGUsCi0g ICAgICAgICAgICAgKGdwb2ludGVyKWlidXNfZW5naW5lX2Rlc2NfZ2V0X25hbWUgKGVuZ2luZS0+ ZGVzYyksCi0gICAgICAgICAgICAgdmFsdWUpOwotKyAgICAgICAgaWYgKGVuZ2luZS0+aGFzX2Zv Y3VzKQotKyAgICAgICAgICAgIGdfc2lnbmFsX2VtaXQgKGVuZ2luZSwgZW5naW5lX3NpZ25hbHNb UkVRVUlSRV9TVVJST1VORElOR19URVhUXSwgMCk7Ci0gICAgIH0KLSAgICAgZ19oYXNoX3RhYmxl X3VucmVmIChoYXNoX3RhYmxlKTsKLSB9Ci1AQCAtMTQzNiw2ICsxNDQwLDE4IEBAIF9nZXRfYWN0 aXZlX3N1cnJvdW5kaW5nX3RleHRfY2IgKEdPYmplY3QgICAgICAgICpvYmplY3QsCi0gICAgICAg ICAgICAgaGFzaF90YWJsZSwKLSAgICAgICAgICAgICAoZ3BvaW50ZXIpaWJ1c19lbmdpbmVfZGVz Y19nZXRfbmFtZSAoZW5naW5lLT5kZXNjKSwKLSAgICAgICAgICAgICB2YWx1ZSk7Ci0rICAgICAg ICBpZiAoZW5naW5lLT5oYXNfZm9jdXNfaWQgJiYgZW5naW5lLT5vYmplY3RfcGF0aCkgewotKyAg ICAgICAgICAgIGdjaGFyICpvYmplY3RfcGF0aCA9IGdfc3RyZHVwIChlbmdpbmUtPm9iamVjdF9w YXRoKTsKLSsgICAgICAgICAgICBnY2hhciAqY2xpZW50ID0gZ19zdHJkdXAgKGVuZ2luZS0+Y2xp ZW50KTsKLSsKLSsgICAgICAgICAgICBlbmdpbmUtPmhhc19mb2N1cyA9IEZBTFNFOwotKyAgICAg ICAgICAgIC8qIFNlbmQgdGhlIEZvY3VzSW4gRC1CdXMgc2lnbmFsIGFnYWluIGFmdGVyIHRoZSBk ZWxheWVkIEZvY3VzSWQKLSsgICAgICAgICAgICAgKiBELUJ1cyBwcm9wZXJ0eS4KLSsgICAgICAg ICAgICAgKi8KLSsgICAgICAgICAgICBidXNfZW5naW5lX3Byb3h5X2ZvY3VzX2luIChlbmdpbmUs IG9iamVjdF9wYXRoLCBjbGllbnQpOwotKyAgICAgICAgICAgIGdfZnJlZSAob2JqZWN0X3BhdGgp OwotKyAgICAgICAgICAgIGdfZnJlZSAoY2xpZW50KTsKLSsgICAgICAgIH0KLSAgICAgfQotICAg ICBnX2hhc2hfdGFibGVfdW5yZWYgKGhhc2hfdGFibGUpOwotIH0KLUBAIC0xNDc5LDkgKzE0OTUs MTMgQEAgYnVzX2VuZ2luZV9wcm94eV9mb2N1c19pbiAoQnVzRW5naW5lUHJveHkgKmVuZ2luZSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAqY2xpZW50KQotIHsK LSAgICAgZ19hc3NlcnQgKEJVU19JU19FTkdJTkVfUFJPWFkgKGVuZ2luZSkpOwotLSAgICBpZiAo ZW5naW5lLT5oYXNfZm9jdXMpCi0rICAgIGlmIChlbmdpbmUtPmhhc19mb2N1cyAmJiAhZ19zdHJj bXAwIChvYmplY3RfcGF0aCwgZW5naW5lLT5vYmplY3RfcGF0aCkpCi0gICAgICAgICByZXR1cm47 Ci0gICAgIGVuZ2luZS0+aGFzX2ZvY3VzID0gVFJVRTsKLSsgICAgZ19mcmVlIChlbmdpbmUtPm9i amVjdF9wYXRoKTsKLSsgICAgZ19mcmVlIChlbmdpbmUtPmNsaWVudCk7Ci0rICAgIGVuZ2luZS0+ b2JqZWN0X3BhdGggPSBnX3N0cmR1cCAob2JqZWN0X3BhdGgpOwotKyAgICBlbmdpbmUtPmNsaWVu dCA9IGdfc3RyZHVwIChjbGllbnQpOwotICAgICBpZiAoZW5naW5lLT5oYXNfYWN0aXZlX3N1cnJv dW5kaW5nX3RleHQpCi0gICAgICAgICBnX3NpZ25hbF9lbWl0IChlbmdpbmUsIGVuZ2luZV9zaWdu YWxzW1JFUVVJUkVfU1VSUk9VTkRJTkdfVEVYVF0sIDApOwotICAgICBpZiAoZW5naW5lLT5oYXNf Zm9jdXNfaWQpIHsKLUBAIC0xNTEzLDYgKzE1MzMsOCBAQCBidXNfZW5naW5lX3Byb3h5X2ZvY3Vz X291dCAoQnVzRW5naW5lUHJveHkgKmVuZ2luZSwKLSAgICAgaWYgKCFlbmdpbmUtPmhhc19mb2N1 cykKLSAgICAgICAgIHJldHVybjsKLSAgICAgZW5naW5lLT5oYXNfZm9jdXMgPSBGQUxTRTsKLSsg ICAgZ19jbGVhcl9wb2ludGVyICgmZW5naW5lLT5vYmplY3RfcGF0aCwgZ19mcmVlKTsKLSsgICAg Z19jbGVhcl9wb2ludGVyICgmZW5naW5lLT5jbGllbnQsIGdfZnJlZSk7Ci0gICAgIGlmIChlbmdp bmUtPmhhc19mb2N1c19pZCkgewotICAgICAgICAgZ19kYnVzX3Byb3h5X2NhbGwgKChHREJ1c1By b3h5ICopZW5naW5lLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICJGb2N1c091dElkIiwK LS0tIAotMi40Ny4wCi0KLUZyb20gNTc5NzE1MDg5MjMxN2EzMGUzNzc1NmVlNjJhZTRmZDY0NDcw MGRmYyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKLUZyb206IGZ1aml3YXJhdCA8dGFrYW8uZnVq aXdhcmExQGdtYWlsLmNvbT4KLURhdGU6IEZyaSwgMTQgTWFyIDIwMjUgMjE6MDA6MzggKzA5MDAK LVN1YmplY3Q6IFtQQVRDSF0gdWkvZ3RrMzogRml4IHRpbWUgbGFnIG9mIENhbmRpZGF0ZVBhbmVs IGluIFgxMQotCi1UaGUgdGltZWQgYHNldF9sb29rdXBfdGFibGUoKWAgaXMgYSB3b3JrYXJvdW5k IHdpdGggdGhlIFdheWxhbmQKLWlucHV0LW1ldGhvZCBwcm90b2NvbCB1bmRlciB0aGUgY29uc3Ry dWN0aW9uIHRvIHN0b3AgdGhlIG1hbnkgRC1CdXMKLW1ldGhvZHMgYnV0IGl0IHNob3VsZCBub3Qg YWZmZWN0IFhvcmcgVUkgYXQgbGVhc3QuCi0KLU5vdyBgbV9pc193YXlsYW5kIGZsYWdgIGlzIGlu aGVyaXRlZCB0byB0aGUgQ2FuZGlkYXRlUGFuZWwgYW5kIFN3aXRjaGVyCi1hbmQgYWRkIGBtX2Zp cnN0X3NldF9sb29rdXBfdGFibGVgIGZsYWcgbmV3bHkgdG8gZW5oYW5jZSB0aGUgbGFnCi13aXRo IHRoZSBXYXlsYW5kIGlucHV0LW1ldGhvZCBwcm90b2NvbC4KLQotQWxzbyBmaXggY29tcGlsZSB3 YXJuaW5ncyB3aXRoIGB2YWxhY2AgaW4gYHhrYmxheW91dC52YWxhYC4KLQotRml4ZXM6IGh0dHBz Oi8vZ2l0aHViLmNvbS9pYnVzL2lidXMvY29tbWl0L2Q1ZTZlNzEKLUJVRz1odHRwczovL2dpdGh1 Yi5jb20vaWJ1cy9pYnVzL2lzc3Vlcy8yNzQwCi0tLS0KLSB1aS9ndGszL2NhbmRpZGF0ZXBhbmVs LnZhbGEgfCA2MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCi0gdWkvZ3Rr My9wYW5lbC52YWxhICAgICAgICAgIHwgIDUgKy0tCi0gdWkvZ3RrMy9zd2l0Y2hlci52YWxhICAg ICAgIHwgMjUgKysrKysrKystLS0tLS0tCi0gdWkvZ3RrMy94a2JsYXlvdXQudmFsYSAgICAgIHwg MzQgKysrKysrKysrKy0tLS0tLS0tLS0KLSA0IGZpbGVzIGNoYW5nZWQsIDkwIGluc2VydGlvbnMo KyksIDM3IGRlbGV0aW9ucygtKQotCi1kaWZmIC0tZ2l0IGEvdWkvZ3RrMy9jYW5kaWRhdGVwYW5l bC52YWxhIGIvdWkvZ3RrMy9jYW5kaWRhdGVwYW5lbC52YWxhCi1pbmRleCBmMjQ0NzcwMy4uNWJh OGNmMzYgMTAwNjQ0Ci0tLS0gYS91aS9ndGszL2NhbmRpZGF0ZXBhbmVsLnZhbGEKLSsrKyBiL3Vp L2d0azMvY2FuZGlkYXRlcGFuZWwudmFsYQotQEAgLTM2LDkgKzM2LDEwIEBAIHB1YmxpYyBjbGFz cyBDYW5kaWRhdGVQYW5lbCA6IEd0ay5Cb3h7Ci0gCi0gICAgIHByaXZhdGUgUGFuZ28uQXR0cmli dXRlIG1fbGFuZ3VhZ2VfYXR0cmlidXRlOwotICAgICBwcml2YXRlIHVpbnQgbV91cGRhdGVfaWQ7 Ci0rICAgIHByaXZhdGUgYm9vbCBtX2lzX3dheWxhbmQ7Ci0rICAgIHByaXZhdGUgYm9vbCBtX25v X3dheWxhbmRfcGFuZWw7Ci0gCi0gI2lmIFVTRV9HREtfV0FZTEFORAotLSAgICBwcml2YXRlIGJv b2wgbV9ub193YXlsYW5kX3BhbmVsOwotICAgICBwcml2YXRlIGJvb2wgbV9oaWRlX2FmdGVyX3No b3c7Ci0gICAgIHByaXZhdGUgdWludCBtX3ByZXZfcGFnZV9zaXplOwotICAgICBwcml2YXRlIHVp bnQgbV9wcmV2X25jYW5kaWRhdGVzOwotQEAgLTQ4LDYgKzQ5LDcgQEAgcHVibGljIGNsYXNzIENh bmRpZGF0ZVBhbmVsIDogR3RrLkJveHsKLSAgICAgcHJpdmF0ZSB1aW50IG1fc2V0X3ByZWVkaXRf dGV4dF9pZDsKLSAgICAgcHJpdmF0ZSB1aW50IG1fc2V0X2F1eGlsaWFyeV90ZXh0X2lkOwotICAg ICBwcml2YXRlIHVpbnQgbV9zZXRfbG9va3VwX3RhYmxlX2lkOwotKyAgICBwcml2YXRlIGJvb2wg bV9maXJzdF9zZXRfbG9va3VwX3RhYmxlOwotICNlbmRpZgotIAotICAgICBwdWJsaWMgc2lnbmFs IHZvaWQgY3Vyc29yX3VwKCk7Ci1AQCAtNjQsNyArNjYsOCBAQCBwdWJsaWMgY2xhc3MgQ2FuZGlk YXRlUGFuZWwgOiBHdGsuQm94ewotICAgICBwdWJsaWMgc2lnbmFsIHZvaWQgcmVhbGl6ZV9zdXJm YWNlKHZvaWQgKnN1cmZhY2UpOwotICNlbmRpZgotIAotLSAgICBwdWJsaWMgQ2FuZGlkYXRlUGFu ZWwoYm9vbCBub193YXlsYW5kX3BhbmVsKSB7Ci0rICAgIHB1YmxpYyBDYW5kaWRhdGVQYW5lbChi b29sIGlzX3dheWxhbmQsCi0rICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIG5vX3dheWxh bmRfcGFuZWwpIHsKLSAgICAgICAgIC8vIENhbGwgYmFzZSBjbGFzcyBjb25zdHJ1Y3RvcgotICAg ICAgICAgR0xpYi5PYmplY3QoCi0gICAgICAgICAgICAgbmFtZSA6ICJJQnVzQ2FuZGlkYXRlIiwK LUBAIC03Miw5ICs3NSw4IEBAIHB1YmxpYyBjbGFzcyBDYW5kaWRhdGVQYW5lbCA6IEd0ay5Cb3h7 Ci0gICAgICAgICAgICAgdmlzaWJsZTogdHJ1ZQotICAgICAgICAgKTsKLSAKLS0jaWYgVVNFX0dE S19XQVlMQU5ECi0rICAgICAgICBtX2lzX3dheWxhbmQgPSBpc193YXlsYW5kOwotICAgICAgICAg bV9ub193YXlsYW5kX3BhbmVsID0gbm9fd2F5bGFuZF9wYW5lbDsKLS0jZW5kaWYKLSAgICAgICAg IG1fdG9wbGV2ZWwgPSBuZXcgR3RrLldpbmRvdyhHdGsuV2luZG93VHlwZS5QT1BVUCk7Ci0gICAg ICAgICBtX3RvcGxldmVsLmFkZF9ldmVudHMoR2RrLkV2ZW50TWFzay5CVVRUT05fUFJFU1NfTUFT Syk7Ci0gICAgICAgICBtX3RvcGxldmVsLmJ1dHRvbl9wcmVzc19ldmVudC5jb25uZWN0KCh3LCBl KSA9PiB7Ci1AQCAtODcsNyArODksNyBAQCBwdWJsaWMgY2xhc3MgQ2FuZGlkYXRlUGFuZWwgOiBH dGsuQm94ewotICAgICAgICAgICAgIGFkanVzdF93aW5kb3dfcG9zaXRpb24odyk7Ci0gICAgICAg ICB9KTsKLSAjaWYgVVNFX0dES19XQVlMQU5ECi0tICAgICAgICBpZiAoIUJpbmRpbmdDb21tb24u ZGVmYXVsdF9pc194ZGlzcGxheSgpKSB7Ci0rICAgICAgICBpZiAobV9pc193YXlsYW5kKSB7Ci0g ICAgICAgICAgICAgbV90b3BsZXZlbC5yZWFsaXplLmNvbm5lY3QoKHcpID0+IHsKLSAgICAgICAg ICAgICAgICAgcmVhbGl6ZV93aW5kb3codHJ1ZSk7Ci0gICAgICAgICAgICAgfSk7Ci1AQCAtMjAx LDYgKzIwMywxMCBAQCBwdWJsaWMgY2xhc3MgQ2FuZGlkYXRlUGFuZWwgOiBHdGsuQm94ewotICAg ICB9Ci0gCi0gICAgIHB1YmxpYyB2b2lkIHNldF9wcmVlZGl0X3RleHQoSUJ1cy5UZXh0PyB0ZXh0 LCB1aW50IGN1cnNvcikgewotKyAgICAgICAgaWYgKCFtX2lzX3dheWxhbmQpIHsKLSsgICAgICAg ICAgICBzZXRfcHJlZWRpdF90ZXh0X3JlYWwodGV4dCwgY3Vyc29yKTsKLSsgICAgICAgICAgICBy ZXR1cm47Ci0rICAgICAgICB9Ci0gI2lmIFVTRV9HREtfV0FZTEFORAotICAgICAgICAgaWYgKG1f c2V0X3ByZWVkaXRfdGV4dF9pZCA+IDApCi0gICAgICAgICAgICAgR0xpYi5Tb3VyY2UucmVtb3Zl KG1fc2V0X3ByZWVkaXRfdGV4dF9pZCk7Ci1AQCAtMjM4LDYgKzI0NCwxMCBAQCBwdWJsaWMgY2xh c3MgQ2FuZGlkYXRlUGFuZWwgOiBHdGsuQm94ewotICAgICB9Ci0gCi0gICAgIHB1YmxpYyB2b2lk IHNldF9hdXhpbGlhcnlfdGV4dChJQnVzLlRleHQ/IHRleHQpIHsKLSsgICAgICAgIGlmICghbV9p c193YXlsYW5kKSB7Ci0rICAgICAgICAgICAgc2V0X2F1eGlsaWFyeV90ZXh0X3JlYWwodGV4dCk7 Ci0rICAgICAgICAgICAgcmV0dXJuOwotKyAgICAgICAgfQotICNpZiBVU0VfR0RLX1dBWUxBTkQK LSAgICAgICAgIGlmIChtX3NldF9hdXhpbGlhcnlfdGV4dF9pZCA+IDApCi0gICAgICAgICAgICAg R0xpYi5Tb3VyY2UucmVtb3ZlKG1fc2V0X2F1eGlsaWFyeV90ZXh0X2lkKTsKLUBAIC0yNjksNiAr Mjc5LDEwIEBAIHB1YmxpYyBjbGFzcyBDYW5kaWRhdGVQYW5lbCA6IEd0ay5Cb3h7Ci0gICAgIH0K LSAKLSAgICAgcHVibGljIHZvaWQgc2V0X2xvb2t1cF90YWJsZShJQnVzLkxvb2t1cFRhYmxlPyB0 YWJsZSkgewotKyAgICAgICAgaWYgKCFtX2lzX3dheWxhbmQpIHsKLSsgICAgICAgICAgICBzZXRf bG9va3VwX3RhYmxlX3JlYWwodGFibGUpOwotKyAgICAgICAgICAgIHJldHVybjsKLSsgICAgICAg IH0KLSAjaWYgVVNFX0dES19XQVlMQU5ECi0gICAgICAgICBpZiAobV9zZXRfbG9va3VwX3RhYmxl X2lkID4gMCkgewotICAgICAgICAgICAgIGlmICh0YWJsZSA9PSBudWxsIHx8Ci1AQCAtMjgyLDE0 ICsyOTYsMjUgQEAgcHVibGljIGNsYXNzIENhbmRpZGF0ZVBhbmVsIDogR3RrLkJveHsKLSAgICAg ICAgICAgICB9Ci0gICAgICAgICB9Ci0gICAgICAgICBpZiAodGFibGUgIT0gbnVsbCkgewotKyAg ICAgICAgICAgIGlmIChtX3ByZXZfbmNhbmRpZGF0ZXMgPT0gMCkKLSsgICAgICAgICAgICAgICAg bV9maXJzdF9zZXRfbG9va3VwX3RhYmxlID0gdHJ1ZTsKLSAgICAgICAgICAgICBtX3ByZXZfcGFn ZV9zaXplID0gdGFibGUuZ2V0X3BhZ2Vfc2l6ZSgpOwotICAgICAgICAgICAgIG1fcHJldl9uY2Fu ZGlkYXRlcyA9IHRhYmxlLmdldF9udW1iZXJfb2ZfY2FuZGlkYXRlcygpOwotICAgICAgICAgICAg IG1fcHJldl9jdXJzb3IgPSB0YWJsZS5nZXRfY3Vyc29yX3BvcygpOwotICAgICAgICAgICAgIG1f cHJldl9jdXJzb3JfaW5fcGFnZSA9IHRhYmxlLmdldF9jdXJzb3JfaW5fcGFnZSgpOwotICAgICAg ICAgICAgIG1fcHJldl9zaG93X2N1cnNvciA9IHRhYmxlLmlzX2N1cnNvcl92aXNpYmxlKCk7Ci0r ICAgICAgICB9IGVsc2UgewotKyAgICAgICAgICAgIG1fcHJldl9wYWdlX3NpemUgPSBtX3ByZXZf bmNhbmRpZGF0ZXMgPSBtX3ByZXZfY3Vyc29yID0KLSsgICAgICAgICAgICAgICAgICAgIG1fcHJl dl9jdXJzb3JfaW5fcGFnZSA9IDA7Ci0rICAgICAgICAgICAgbV9wcmV2X3Nob3dfY3Vyc29yID0g ZmFsc2U7Ci0gICAgICAgICB9Ci0gICAgICAgICAvLyBGSVhNRTogVG9vIG1hbnkgUHJlZWRpdFRl eHQgRC1CdXMgc2lnbmFsIGhhcHBlbnMgaW4gV2F5bGFuZC4KLSAgICAgICAgIG1fc2V0X2xvb2t1 cF90YWJsZV9pZCA9IFRpbWVvdXQuYWRkKDEwMCwKLSsgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBJZiBtX3NldF9sb29rdXBfdGFibGVfaWQKLSsg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vID09IDAsIGRlbGV0 ZSB0aGUgcXVldWVkIHRpbWVkCi0rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAvLyBjYWxsYmFja3MgdG8gYXZvaWQgdGhlIGxhc3QKLSsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHJldmVyc2UgY3Vyc29yIG1vdmUgYWZ0ZXIg dGhlCi0rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBrZXkg cmVsZWFzZS4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgp ID0+IHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBt X3NldF9sb29rdXBfdGFibGVfaWQgPSAwOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHNldF9sb29rdXBfdGFibGVfcmVhbCh0YWJsZSk7Ci1AQCAtMzUz LDkgKzM3OCwzMyBAQCBwdWJsaWMgY2xhc3MgQ2FuZGlkYXRlUGFuZWwgOiBHdGsuQm94ewotICAg ICB9Ci0gCi0gICAgIHByaXZhdGUgdm9pZCB1cGRhdGUoKSB7Ci0rICAgICAgICBpZiAoIW1faXNf d2F5bGFuZCkgewotKyAgICAgICAgICAgIHVwZGF0ZV9yZWFsKCk7Ci0rICAgICAgICAgICAgcmV0 dXJuOwotKyAgICAgICAgfQotKyNpZiBVU0VfR0RLX1dBWUxBTkQKLSsgICAgICAgIC8vIFNob3cg dGhlIGZpcnN0IGxvb2t1cCB0YWJsZSBpbW1lZGlhdGVseSB3aXRoIHRoZSBXYXlsYW5kCi0rICAg ICAgICAvLyBpbnB1dC1tZXRob2QgcHJvdG9jb2wgYmVjYXVzZSBrZWVwaW5nIHByZXNzaW5nIHRo ZSBzcGFjZSBrZXkKLSsgICAgICAgIC8vIGNhdXNlcyBtYW55IHVwZGF0ZSgpIGFuZCB0aGUgdGlt ZWQgdXBkYXRlX3JlYWwoKSBpcyBub3QgY2FsbGVkCi0rICAgICAgICAvLyB1bnRpbCB0aGUgc3Bh Y2Uga2V5IGlzIHJlbGVhc2VkLgotKyAgICAgICAgaWYgKG1fZmlyc3Rfc2V0X2xvb2t1cF90YWJs ZSkgewotKyAgICAgICAgICAgIG1fZmlyc3Rfc2V0X2xvb2t1cF90YWJsZSA9IGZhbHNlOwotKyAg ICAgICAgICAgIGlmIChtX3VwZGF0ZV9pZCA+IDApIHsKLSsgICAgICAgICAgICAgICAgR0xpYi5T b3VyY2UucmVtb3ZlKG1fdXBkYXRlX2lkKTsKLSsgICAgICAgICAgICAgICAgbV91cGRhdGVfaWQg PSAwOwotKyAgICAgICAgICAgIH0KLSsgICAgICAgICAgICB1cGRhdGVfcmVhbCgpOwotKyAgICAg ICAgICAgIHJldHVybjsKLSsgICAgICAgIH0KLSsjZW5kaWYKLSAgICAgICAgIGlmIChtX3VwZGF0 ZV9pZCA+IDApCi0gICAgICAgICAgICAgR0xpYi5Tb3VyY2UucmVtb3ZlKG1fdXBkYXRlX2lkKTsK LS0gICAgICAgIC8vIHNldF9sb29rdXBfdGFibGUoKSBhbmQgc2V0X3ByZWVkaXRfdGV4dCgpIGhh cHBlbnMgc2VxdWVudGlhbGx5LgotKyAgICAgICAgLy8gLSBzZXRfbG9va3VwX3RhYmxlKCkgYW5k IHNldF9wcmVlZGl0X3RleHQoKSBoYXBwZW5zIHNlcXVlbnRpYWxseS4KLSsgICAgICAgIC8vIC0g SGlkZSBDYW5kaWRhdGVQYW5lbCBhZnRlciBhIGNhbmRpZGF0ZSBpcyBjb21taXR0ZWQgd2l0aCBF bW9qaWVyCi0rICAgICAgICAvLyBhbmQgeHRlcm0gd2l0aG91dCB0aGUgV2F5bGFuZCBwYW5lbCBp biB0aGUgV2F5bGFuZCBpbnB1dC1tZXRob2QgVjIuCi0rICAgICAgICAvLyAtIERvbid0IHNob3cg dGhlIGhpZGRlbiBsb29rdXAgdGFibGUgdW5leHBlY3RlZGx5IGFnYWluIGFmdGVyCi0rICAgICAg ICAvLyBhIGNhbmRpZGF0ZSBpcyBjb21taXR0ZWQgd2l0aCB0aGUgV2F5bGFuZCBhcHBsaWNhdGlv bnMgaW4gdGhlCi0rICAgICAgICAvLyBXYXlsYW5kIGlucHV0LW1ldGhvZCBWMi4KLSAgICAgICAg IG1fdXBkYXRlX2lkID0gVGltZW91dC5hZGQoMTAwLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAoKSA9PiB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtX3VwZGF0ZV9pZCA9IDA7Ci1AQCAtNDM2LDcgKzQ4NSw3IEBAIHB1YmxpYyBjbGFzcyBDYW5k aWRhdGVQYW5lbCA6IEd0ay5Cb3h7Ci0gCi0gICAgIHB1YmxpYyBuZXcgdm9pZCBoaWRlKCkgewot ICNpZiBVU0VfR0RLX1dBWUxBTkQKLS0gICAgICAgIGlmICghQmluZGluZ0NvbW1vbi5kZWZhdWx0 X2lzX3hkaXNwbGF5KCkpCi0rICAgICAgICBpZiAobV9pc193YXlsYW5kKQotICAgICAgICAgICAg IHJlYWxpemVfc3VyZmFjZShudWxsKTsKLSAjZW5kaWYKLSAgICAgICAgIG1fdG9wbGV2ZWwuaGlk ZSgpOwotZGlmZiAtLWdpdCBhL3VpL2d0azMvcGFuZWwudmFsYSBiL3VpL2d0azMvcGFuZWwudmFs YQotaW5kZXggMTg2YjNhYzkuLmU0MmExNjZlIDEwMDY0NAotLS0tIGEvdWkvZ3RrMy9wYW5lbC52 YWxhCi0rKysgYi91aS9ndGszL3BhbmVsLnZhbGEKLUBAIC0xNzMsNyArMTczLDggQEAgY2xhc3Mg UGFuZWwgOiBJQnVzLlBhbmVsU2VydmljZSB7Ci0gICAgIH0KLSAKLSAgICAgcHJpdmF0ZSBDYW5k aWRhdGVQYW5lbCBjYW5kaWRhdGVfcGFuZWxfbmV3KGJvb2wgbm9fd2F5bGFuZF9wYW5lbCkgewot LSAgICAgICAgQ2FuZGlkYXRlUGFuZWwgY2FuZGlkYXRlX3BhbmVsID0gbmV3IENhbmRpZGF0ZVBh bmVsKG5vX3dheWxhbmRfcGFuZWwpOwotKyAgICAgICAgQ2FuZGlkYXRlUGFuZWwgY2FuZGlkYXRl X3BhbmVsID0gbmV3IENhbmRpZGF0ZVBhbmVsKG1faXNfd2F5bGFuZCwKLSsgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub193YXlsYW5k X3BhbmVsKTsKLSAgICAgICAgIGNhbmRpZGF0ZV9wYW5lbC5wYWdlX3VwLmNvbm5lY3QoKHcpID0+ IHRoaXMucGFnZV91cCgpKTsKLSAgICAgICAgIGNhbmRpZGF0ZV9wYW5lbC5wYWdlX2Rvd24uY29u bmVjdCgodykgPT4gdGhpcy5wYWdlX2Rvd24oKSk7Ci0gICAgICAgICBjYW5kaWRhdGVfcGFuZWwu Y3Vyc29yX3VwLmNvbm5lY3QoKHcpID0+IHRoaXMuY3Vyc29yX3VwKCkpOwotQEAgLTE5MCw3ICsx OTEsNyBAQCBjbGFzcyBQYW5lbCA6IElCdXMuUGFuZWxTZXJ2aWNlIHsKLSAgICAgfQotIAotICAg ICBwcml2YXRlIFN3aXRjaGVyIHN3aXRjaGVyX25ldyhib29sIG5vX3dheWxhbmRfcGFuZWwpIHsK LS0gICAgICAgIFN3aXRjaGVyIHN3aXRjaGVyID0gbmV3IFN3aXRjaGVyKG5vX3dheWxhbmRfcGFu ZWwpOwotKyAgICAgICAgU3dpdGNoZXIgc3dpdGNoZXIgPSBuZXcgU3dpdGNoZXIobV9pc193YXls YW5kLCBub193YXlsYW5kX3BhbmVsKTsKLSAjaWYgVVNFX0dES19XQVlMQU5ECi0gICAgICAgICBz d2l0Y2hlci5yZWFsaXplX3N1cmZhY2UuY29ubmVjdCgKLSAgICAgICAgICAgICAgICAgKHcsIHMp ID0+IHRoaXMucmVhbGl6ZV9zdXJmYWNlKHMpKTsKLWRpZmYgLS1naXQgYS91aS9ndGszL3N3aXRj aGVyLnZhbGEgYi91aS9ndGszL3N3aXRjaGVyLnZhbGEKLWluZGV4IDEzZWViNDgxLi45OWEyZmEw YiAxMDA2NDQKLS0tLSBhL3VpL2d0azMvc3dpdGNoZXIudmFsYQotKysrIGIvdWkvZ3RrMy9zd2l0 Y2hlci52YWxhCi1AQCAtOTYsNiArOTYsNyBAQCBjbGFzcyBTd2l0Y2hlciA6IEd0ay5XaW5kb3cg ewotICAgICBwcml2YXRlIGRvdWJsZSBtX21vdXNlX2luaXRfeDsKLSAgICAgcHJpdmF0ZSBkb3Vi bGUgbV9tb3VzZV9pbml0X3k7Ci0gICAgIHByaXZhdGUgYm9vbCAgIG1fbW91c2VfbW92ZWQ7Ci0r ICAgIHByaXZhdGUgYm9vbCAgIG1faXNfd2F5bGFuZDsKLSAgICAgcHJpdmF0ZSBib29sICAgbV9u b193YXlsYW5kX3BhbmVsOwotICAgICBwcml2YXRlIEdMaWIuSGFzaFRhYmxlPHN0cmluZywgc3Ry aW5nPiBtX3hrYl9sYW5ndWFnZXMgPQotICAgICAgICAgICAgIG5ldyBHTGliLkhhc2hUYWJsZTxz dHJpbmcsIHN0cmluZz4oR0xpYi5zdHJfaGFzaCwKLUBAIC0xMDYsMTYgKzEwNywxOSBAQCBjbGFz cyBTd2l0Y2hlciA6IEd0ay5XaW5kb3cgewotICAgICBwdWJsaWMgc2lnbmFsIHZvaWQgcmVhbGl6 ZV9zdXJmYWNlKHZvaWQgKnN1cmZhY2UpOwotICNlbmRpZgotIAotLSAgICBwdWJsaWMgU3dpdGNo ZXIoYm9vbCBub193YXlsYW5kX3BhbmVsKSB7Ci0rICAgIHB1YmxpYyBTd2l0Y2hlcihib29sIGlz X3dheWxhbmQsCi0rICAgICAgICAgICAgICAgICAgICBib29sIG5vX3dheWxhbmRfcGFuZWwpIHsK LSAgICAgICAgIEdMaWIuT2JqZWN0KAotICAgICAgICAgICAgIHR5cGUgOiBHdGsuV2luZG93VHlw ZS5QT1BVUCwKLS0gICAgICAgICAgICBldmVudHMgOiBHZGsuRXZlbnRNYXNrLktFWV9QUkVTU19N QVNLIHwgR2RrLkV2ZW50TWFzay5LRVlfUkVMRUFTRV9NQVNLLAotKyAgICAgICAgICAgIGV2ZW50 cyA6IEdkay5FdmVudE1hc2suS0VZX1BSRVNTX01BU0sgfAotKyAgICAgICAgICAgICAgICAgICAg IEdkay5FdmVudE1hc2suS0VZX1JFTEVBU0VfTUFTSywKLSAgICAgICAgICAgICB3aW5kb3dfcG9z aXRpb24gOiBHdGsuV2luZG93UG9zaXRpb24uQ0VOVEVSLAotICAgICAgICAgICAgIGFjY2VwdF9m b2N1cyA6IHRydWUsCi0gICAgICAgICAgICAgZGVjb3JhdGVkIDogZmFsc2UsCi0gICAgICAgICAg ICAgbW9kYWwgOiB0cnVlLAotICAgICAgICAgICAgIGZvY3VzX3Zpc2libGUgOiB0cnVlCi0gICAg ICAgICApOwotKyAgICAgICAgbV9pc193YXlsYW5kID0gaXNfd2F5bGFuZDsKLSAgICAgICAgIG1f bm9fd2F5bGFuZF9wYW5lbCA9IG5vX3dheWxhbmRfcGFuZWw7Ci0gICAgICAgICBHdGsuQm94IHZi b3ggPSBuZXcgR3RrLkJveChHdGsuT3JpZW50YXRpb24uVkVSVElDQUwsIDApOwotICAgICAgICAg YWRkKHZib3gpOwotQEAgLTEzOSw3ICsxNDMsNyBAQCBjbGFzcyBTd2l0Y2hlciA6IEd0ay5XaW5k b3cgewotICAgICAgICAgdmJveC5wYWNrX2VuZChtX2xhYmVsLCBmYWxzZSwgZmFsc2UsIDApOwot IAotICNpZiBVU0VfR0RLX1dBWUxBTkQKLS0gICAgICAgIGlmICghQmluZGluZ0NvbW1vbi5kZWZh dWx0X2lzX3hkaXNwbGF5KCkpIHsKLSsgICAgICAgIGlmIChtX2lzX3dheWxhbmQpIHsKLSAgICAg ICAgICAgICB0aGlzLnJlYWxpemUuY29ubmVjdCgodykgPT4gewotICAgICAgICAgICAgICAgICBy ZWFsaXplX3dpbmRvdyh0cnVlKTsKLSAgICAgICAgICAgICB9KTsKLUBAIC0zODEsMTIgKzM4NSw4 IEBAIGNsYXNzIFN3aXRjaGVyIDogR3RrLldpbmRvdyB7Ci0gICAgICAgICAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgbV9tb3Vz ZV9tb3ZlZCA9IHRydWU7Ci0tI2lmIFVTRV9HREtfV0FZTEFORAotLSAgICAgICAgICAgICAgICBp ZiAoQmluZGluZ0NvbW1vbi5kZWZhdWx0X2lzX3hkaXNwbGF5KCkpCi0rICAgICAgICAgICAgICAg IGlmICghbV9pc193YXlsYW5kKQotICAgICAgICAgICAgICAgICAgICAgYnV0dG9uLmdyYWJfZm9j dXMoKTsKLS0jZWxzZQotLSAgICAgICAgICAgICAgICBidXR0b24uZ3JhYl9mb2N1cygpOwotLSNl bmRpZgotICAgICAgICAgICAgICAgICBtX3NlbGVjdGVkX2VuZ2luZSA9IGluZGV4OwotICAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAgfSk7Ci1AQCAtNTcxLDcgKzU3 MSw3IEBAIGNsYXNzIFN3aXRjaGVyIDogR3RrLldpbmRvdyB7Ci0gICAgICAgICAvLyBpZiBlLnR5 cGUgPT0gR2RrLkV2ZW50VHlwZS5LRVlfUkVMRUFTRSwgbV9sb29wIGlzIGFscmVhZHkgbnVsbC4K LSAgICAgICAgIC8vIG1fbG9vcCBpcyBhbHdheXMgbnVsbCBpbiBXYXlsYW5kIGJ1dCB0aGlzIHNp Z25hbCBpcyBub3QgZW1pdHRlZAotICAgICAgICAgLy8gd2hlbiB0aGUgV2F5bGFuZCBwYW5lbCBw cm90b2NvbCBpcyBlbmFibGVkLgotLSAgICAgICAgaWYgKG1fbG9vcCA9PSBudWxsICYmICFtX25v X3dheWxhbmRfcGFuZWwpCi0rICAgICAgICBpZiAobV9sb29wID09IG51bGwgJiYgIW1faXNfd2F5 bGFuZCkKLSAgICAgICAgICAgICByZXR1cm4gR2RrLkVWRU5UX1BST1BBR0FURTsKLSAKLSAgICAg ICAgIGlmIChtX3BvcHVwX2RlbGF5X3RpbWUgPiAwKSB7Ci1AQCAtNTgyLDkgKzU4Miw5IEBAIGNs YXNzIFN3aXRjaGVyIDogR3RrLldpbmRvdyB7Ci0gICAgICAgICB9Ci0gCi0gICAgICAgICBtX3Jl c3VsdCA9IChpbnQpbV9zZWxlY3RlZF9lbmdpbmU7Ci0tICAgICAgICBpZiAoIW1fbm9fd2F5bGFu ZF9wYW5lbCkgewotKyAgICAgICAgaWYgKCFtX2lzX3dheWxhbmQpIHsKLSAgICAgICAgICAgICBt X2xvb3AucXVpdCgpOwotLSAgICAgICAgfSBlbHNlIHsKLSsgICAgICAgIH0gZWxzZSBpZiAobV9u b193YXlsYW5kX3BhbmVsKSB7Ci0gICAgICAgICAgICAgLy8gU3dpdGNoZXIgd2l0aG91dCB0aGUg V2F5bGFuZCBwYW5lbCBwcm90b2NvbCBjYW4gcmV0dXJuCi0gICAgICAgICAgICAgLy8gdGhlIG1f cmVzdWx0X2VuZ2luZSBpbW1lZGlhdGVseSBpbiBXYXlsYW5kIHdpdGhvdXQgd2FpdGluZwotICAg ICAgICAgICAgIC8vIGZvciB0aGUgZm9jdXMtaW4gZXZlbnQgZHVlIHRvIGEgdmlydHVhbCBpbnB1 dCBjb250ZXh0IGluCi1AQCAtNTkyLDYgKzU5Miw5IEBAIGNsYXNzIFN3aXRjaGVyIDogR3RrLldp bmRvdyB7Ci0gICAgICAgICAgICAgR0xpYi5hc3NlcnQobV9yZXN1bHQgPCBtX2VuZ2luZXMubGVu Z3RoKTsKLSAgICAgICAgICAgICBtX3Jlc3VsdF9lbmdpbmUgPSBtX2VuZ2luZXNbbV9yZXN1bHRd OwotICAgICAgICAgICAgIGhpZGUoKTsKLSsgICAgICAgIH0gZWxzZSB7Ci0rICAgICAgICAgICAg Ly8gU3dpdGNoZXIgc2hvdWxkIG5vdCBnZXQgZm9jdXMgd2l0aCB0aGUgV2F5bGFuZCBwYW5lbCBw cm90b2NvbC4KLSsgICAgICAgICAgICBHTGliLmFzc2VydF9ub3RfcmVhY2hlZCgpOwotICAgICAg ICAgfQotICAgICAgICAgcmV0dXJuIEdkay5FVkVOVF9TVE9QOwotICAgICB9Ci1kaWZmIC0tZ2l0 IGEvdWkvZ3RrMy94a2JsYXlvdXQudmFsYSBiL3VpL2d0azMveGtibGF5b3V0LnZhbGEKLWluZGV4 IDg3NDkyMGVlLi41OTg0MzFjMyAxMDA2NDQKLS0tLSBhL3VpL2d0azMveGtibGF5b3V0LnZhbGEK LSsrKyBiL3VpL2d0azMveGtibGF5b3V0LnZhbGEKLUBAIC00OCw2ICs0OCwxMSBAQCBjbGFzcyBY S0JMYXlvdXQKLSAgICAgcHVibGljIHZvaWQgZ2V0X2xheW91dChvdXQgc3RyaW5nIGxheW91dCwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdXQgc3RyaW5nIHZhcmlhbnQsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgb3V0IHN0cmluZyBvcHRpb24pIHsKLSsgICAgICAgIGxheW91 dCA9ICIiOwotKyAgICAgICAgdmFyaWFudCA9ICIiOwotKyAgICAgICAgdmFyIG8gPSBFbnZpcm9u bWVudC5nZXRfdmFyaWFibGUoIlhLQl9ERUZBVUxUX09QVElPTlMiKTsKLSsgICAgICAgIG9wdGlv biA9IG8gIT0gbnVsbCA/IG8gOiAiIjsKLSsKLSAgICAgICAgIHNlYXJjaF9nZXRfbGF5b3V0X3By b2dyYW0oKTsKLSAgICAgICAgIGlmIChtX2dldF9sYXlvdXRfYXJnc1swXSA9PSBudWxsKSB7Ci0g ICAgICAgICAgICAgd2FybmluZygiTm90IGZvdW5kIGxvY2FsZWN0bCBvciBzZXR4a2JtYXAgY29t bWFuZCBpbiBQQVRIIik7Ci1AQCAtNjAsMTEgKzY1LDYgQEAgY2xhc3MgWEtCTGF5b3V0Ci0gICAg ICAgICBzdHJpbmcgc3RhbmRhcmRfZXJyb3IgPSBudWxsOwotICAgICAgICAgaW50IGV4aXRfc3Rh dHVzID0gMDsKLSAKLS0gICAgICAgIGxheW91dCA9ICIiOwotLSAgICAgICAgdmFyaWFudCA9ICIi OwotLSAgICAgICAgdmFyIG8gPSBFbnZpcm9ubWVudC5nZXRfdmFyaWFibGUoIlhLQl9ERUZBVUxU X09QVElPTlMiKTsKLS0gICAgICAgIG9wdGlvbiA9IG8gIT0gbnVsbCA/IG8gOiAiIjsKLS0KLSAg ICAgICAgIHRyeSB7Ci0gICAgICAgICAgICAgR0xpYi5Qcm9jZXNzLnNwYXduX3N5bmMobnVsbCwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleGVjX2NvbW1hbmQsCi1AQCAt ODQsMTQgKzg0LDE0IEBAIGNsYXNzIFhLQkxheW91dAotIAotICAgICAgICAgaWYgKGV4ZWNfY29t bWFuZFswXSA9PSAibG9jYWxlY3RsIikgewotICAgICAgICAgICAgIHBhcnNlX2xvY2FsZWN0bF9z dGF0dXNfc3RyKHN0YW5kYXJkX291dHB1dCwKLS0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBvdXQgbGF5b3V0LAotLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG91dCB2YXJpYW50LAotLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG91dCBvcHRpb24pOwotKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHJlZiBsYXlvdXQsCi0rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVm IHZhcmlhbnQsCi0rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVmIG9w dGlvbik7Ci0gICAgICAgICB9IGVsc2UgaWYgKGV4ZWNfY29tbWFuZFswXSA9PSBYS0JfQ09NTUFO RCkgewotICAgICAgICAgICAgIHBhcnNlX3hrYm1hcF9xdWVyeV9zdHIoc3RhbmRhcmRfb3V0cHV0 LAotLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0IGxheW91dCwKLS0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG91dCB2YXJpYW50LAotLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgb3V0IG9wdGlvbik7Ci0rICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICByZWYgbGF5b3V0LAotKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcmVmIHZhcmlhbnQsCi0rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByZWYgb3B0aW9uKTsKLSAgICAgICAgIH0KLSAgICAgfQotIAotQEAgLTExMyw5ICsxMTMsOSBA QCBjbGFzcyBYS0JMYXlvdXQKLSAKLSAKLSAgICAgcHJpdmF0ZSB2b2lkIHBhcnNlX2xvY2FsZWN0 bF9zdGF0dXNfc3RyKHN0cmluZyBzdGFuZGFyZF9vdXRwdXQsCi0tICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBvdXQgc3RyaW5nIGxheW91dCwKLS0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG91dCBzdHJpbmcgdmFyaWFudCwKLS0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG91dCBzdHJpbmcgb3B0 aW9uKSB7Ci0rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWYg c3RyaW5nIGxheW91dCwKLSsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJlZiBzdHJpbmcgdmFyaWFudCwKLSsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHJlZiBzdHJpbmcgb3B0aW9uKSB7Ci0gICAgICAgICBmb3JlYWNoIChzdHJp bmcgbGluZSBpbiBzdGFuZGFyZF9vdXRwdXQuc3BsaXQoIlxuIikpIHsKLSAgICAgICAgICAgICBj b25zdCBzdHJpbmdbXSBlbGVtZW50cyA9IHsgIlgxMSBMYXlvdXQ6IiwgIlgxMSBWYXJpYW50OiIg fTsKLSAgICAgICAgICAgICBmb3JlYWNoICh1bm93bmVkIHN0cmluZyBlbGVtZW50IGluIGVsZW1l bnRzKSB7Ci1AQCAtMTM2LDkgKzEzNiw5IEBAIGNsYXNzIFhLQkxheW91dAotIAotIAotICAgICBw cml2YXRlIHZvaWQgcGFyc2VfeGtibWFwX3F1ZXJ5X3N0cihzdHJpbmcgc3RhbmRhcmRfb3V0cHV0 LAotLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdXQgc3RyaW5nIGxh eW91dCwKLS0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0IHN0cmlu ZyB2YXJpYW50LAotLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvdXQg c3RyaW5nIG9wdGlvbikgewotKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByZWYgc3RyaW5nIGxheW91dCwKLSsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcmVmIHN0cmluZyB2YXJpYW50LAotKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICByZWYgc3RyaW5nIG9wdGlvbikgewotICAgICAgICAgZm9yZWFjaCAoc3RyaW5n IGxpbmUgaW4gc3RhbmRhcmRfb3V0cHV0LnNwbGl0KCJcbiIpKSB7Ci0gICAgICAgICAgICAgY29u c3Qgc3RyaW5nW10gZWxlbWVudHMgPSB7ICJsYXlvdXQ6IiwgInZhcmlhbnQ6IiwgIm9wdGlvbnM6 IiB9OwotICAgICAgICAgICAgIGZvcmVhY2ggKHVub3duZWQgc3RyaW5nIGVsZW1lbnQgaW4gZWxl bWVudHMpIHsKLS0tIAotMi40Ny4wCi0KLUZyb20gMWQ1NmQ3N2IxOWRhZjVjOGQ2ZjNlZTg3YTA3 MTJhZTU5MDQyOTNmNCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKLUZyb206IGZ1aml3YXJhdCA8 dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KLURhdGU6IEZyaSwgMTQgTWFyIDIwMjUgMjE6MDA6 NTIgKzA5MDAKLVN1YmplY3Q6IFtQQVRDSF0gY2xpZW50L3dheWxhbmQ6IEZpeCBpbmZpbml0ZSBS ZXR1cm4ga2V5IGluIHh0ZXJtCi0KLUN1cnJlbnRseSB0aGUgcmVwZWF0aW5nIGtleSBmZWF0dXJl IG9mIElCdXMgaXMgZGlzYWJsZWQgd2hlbiB0aGUgZm9jdXMKLWlzIGNoYW5nZWQgYnV0IHRoZSBm ZWF0dXJlIG9mIHRoZSBXYXlsYW5kIGNvbXBvc2l0b3Igc3RpbGwgaGFwcGVucyBpbgotdGhlIFN3 YXkgZGVza3RvcCBzZXNzaW9uIHdoZW4gaW52b2tlIHh0ZXJtIGJ5IG1hbnVhbCBpbiBmb290Lgot SSB0aGluayBTd2F5IHNob3VsZCBzdG9wIHRoZSByZXBlYXRpbmcga2V5IGZlYXR1cmUgd2hlbiB0 aGUgZm9jdXMgaXMKLWNoYW5nZWQgZnJvbSB0aGUgV2F5bGFuZCBhcHBsaWNhdGlvbiB0byB0aGUg bm9uLVdheWxhbmQgYXBwbGljYXRpb24uCi0KLUkgYWRkIGEgd29ya2Fyb3VuZCB0byBjYWxsIGB6 d3BfdmlydHVhbF9rZXlib2FyZF92MV9rZXkoKWAgd2l0aAotdGhlIGBXTF9LRVlCT0FSRF9LRVlf U1RBVEVfUkVMRUFTRURgIGZsYWcgdG8gc3RvcCB0aGUgZmVhdHVyZSBvZgotdGhlIFN3YXkgY29t cG9zaXRvciBhZnRlciB0aGUgSUJ1cyByZXBlYXRpbmcga2V5IHRpbWVvdXQuCi0tLS0KLSBjbGll bnQvd2F5bGFuZC9pYnVzd2F5bGFuZGltLmMgfCAxMSArKysrKysrKysrKwotIDEgZmlsZSBjaGFu Z2VkLCAxMSBpbnNlcnRpb25zKCspCi0KLWRpZmYgLS1naXQgYS9jbGllbnQvd2F5bGFuZC9pYnVz d2F5bGFuZGltLmMgYi9jbGllbnQvd2F5bGFuZC9pYnVzd2F5bGFuZGltLmMKLWluZGV4IGJhMzky YzZiLi4zNTZjZWMzMSAxMDA2NDQKLS0tLSBhL2NsaWVudC93YXlsYW5kL2lidXN3YXlsYW5kaW0u YwotKysrIGIvY2xpZW50L3dheWxhbmQvaWJ1c3dheWxhbmRpbS5jCi1AQCAtMTMzMiw2ICsxMzMy LDE3IEBAIF9wcm9jZXNzX2tleV9ldmVudF9yZXBlYXRfZGVsYXlfY2IgKGdwb2ludGVyIHVzZXJf ZGF0YSkKLSAgICAgLyogVGhlIGtleSByZWxlYXNlIGV2ZW50IHdhcyBzZW50IHRvIG5vbi1XYXls YW5kIGFwcHMgbGlrZXMgeHRlcm0uICovCi0gICAgIGlmICghcHJpdi0+aWJ1c2NvbnRleHQpIHsK LSAgICAgICAgIGV2ZW50LT5jb3VudF9jYl9pZCA9IDA7Ci0rICAgICAgICAvKiBTdG9wIHRoZSBp bmZpbml0ZSBSZXR1cm4ga2V5cyBpbiBub24tV2F5bGFuZCBhcHBzIGxpa2VzIHh0ZXJtIGluCi0r ICAgICAgICAgKiB0aGUgU3dheSBkZXNrdG9wIHNlc3Npb24uCi0rICAgICAgICAgKiBCdXQgcHJp di0+Y29udGV4dCBpbiBOVUxMIGluIHRoZSBXYXlsYW5kIGlucHV0LW1ldGhvZCBWMSBoZXJlLgot KyAgICAgICAgICovCi0rICAgICAgICBpZiAocHJpdi0+dmVyc2lvbiAhPSBJTlBVVF9NRVRIT0Rf VjEpIHsKLSsgICAgICAgICAgICBpYnVzX3dheWxhbmRfaW1fa2V5KGV2ZW50LT53bGltLAotKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZlbnQtPnNlcmlhbCwKLSsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGV2ZW50LT50aW1lICsgcHJpdi0+cmVwZWF0X2RlbGF5LAot KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXZlbnQtPmtleSwKLSsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFdMX0tFWUJPQVJEX0tFWV9TVEFURV9SRUxFQVNFRCk7Ci0r ICAgICAgICB9Ci0gICAgICAgICByZXR1cm4gR19TT1VSQ0VfUkVNT1ZFOwotICAgICB9Ci0gICAg IC8qIFRoZSBmb2N1cyBpcyBjaGFuZ2VkLiAqLwotLS0gCi0yLjQ3LjAKLQo=