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-HEAD.patch from upstream. Date: Sun, 31 May 2026 02:06:08 GMT Message-ID: <178019316800.1.2123633053524321202.rpms-ibus-e08ec45e2894@fedoraproject.org> List-ID: X-Git-Repo: rpms/ibus X-Git-Branch: autotool X-Git-Rev: e08ec45e28946654ded1d2c6eb43d94d0fb9a885 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvaWJ1cwogICAgICAgICAgICBCcmFuY2ggOiBhdXRvdG9vbAogICAgICAgICAg ICBDb21taXQgOiBlMDhlYzQ1ZTI4OTQ2NjU0ZGVkMWQyYzZlYjQzZDk0ZDBmYjlhODg1CiAgICAg ICAgICAgIEF1dGhvciA6IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPgogICAg ICAgICAgICBEYXRlICAgOiAyMDE0LTA3LTE0VDE2OjUyOjM1KzA5OjAwCiAgICAgICAgICAgIFN0 YXRzICA6ICs0NjQvLTQzIGluIDQgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczov L3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2lidXMvYy9lMDhlYzQ1ZTI4OTQ2NjU0ZGVkMWQy YzZlYjQzZDk0ZDBmYjlhODg1P2JyYW5jaD1hdXRvdG9vbAoKICAgICAgICAgICAgTG9nOgogICAg ICAgICAgICBVcGRhdGVkIGlidXMtSEVBRC5wYXRjaCBmcm9tIHVwc3RyZWFtLgoKRml4ZWQgaWJ1 cy1zZXR1cCBTRUdWIHdoZW4gYW4gZW5naW5lIGlzIHNlbGVjdGVkLgpGaXhlZCBpYnVzLXNldHVw IGRlcHJlY2F0ZWQgd2FybmluZ3Mgd2l0aCB0aGUgbGF0ZXN0IHB5dGhvbjMtZ29iamVjdC4KSW50 ZWdyYXRlZCB0aGUgJ0lCVVNfU0VUVVBfWElEJyBlbnZpcm9ubWVudCB2YXJpYWJsZSBmb3IgZWFj aCBlbmdpbmUgc2V0dXAuClNldCBwcmduYW1lICdpYnVzLXNldHVwJyBmb3IgaWJ1cy1zZXR1cC4K Ci0tLQpkaWZmIC0tZ2l0IGEvaWJ1cy01MzA3MTEtcHJlbG9hZC1zeXMucGF0Y2ggYi9pYnVzLTUz MDcxMS1wcmVsb2FkLXN5cy5wYXRjaAppbmRleCA3OTBjYmUwLi5kMTg2OWM0IDEwMDY0NAotLS0g YS9pYnVzLTUzMDcxMS1wcmVsb2FkLXN5cy5wYXRjaAorKysgYi9pYnVzLTUzMDcxMS1wcmVsb2Fk LXN5cy5wYXRjaApAQCAtMSw2ICsxLDYgQEAKLUZyb20gYTZkNGI5YWM5YTIyYzViODhjMzYyYjY1 OWVhZjZmZDU5YTBjZjViZCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb20gOTFmNmQ5ZjNk MGZjODU0NzExYzJiYTE1MWMwZGM1MTA1YTBhOTE1MiBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEK IEZyb206IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdtYWlsLmNvbT4KLURhdGU6IFR1ZSwg MTQgSmFuIDIwMTQgMTU6MzA6MjQgKzA5MDAKK0RhdGU6IE1vbiwgMTQgSnVsIDIwMTQgMTY6MjA6 MjEgKzA5MDAKIFN1YmplY3Q6IFtQQVRDSF0gUmVsb2FkIHByZWxvYWQgZW5naW5lcyB1bnRpbCB1 c2VycyBjdXN0b21pemUgdGhlIGxpc3QuCiAKIFRoZSBpZGVhIGlzLCBpZiB1c2VycyBkb24ndCBj dXN0b21pemUgdGhlIHByZWxvYWRfZW5naW5lcyB3aXRoIGlidXMtc2V0dXAsCkBAIC0xOCwxNCAr MTgsMTQgQEAgSUJVU19QUkVMT0FEX0VOR0lORV9NT0RFX1VTRVIgYW5kIHVzZXJzIGNhbiBjdXN0 b21pemUgdGhlIHZhbHVlCiAncHJlbG9hZC1lbmdpbmVzJy4KIC0tLQogIGRhdGEvaWJ1cy5zY2hl bWFzLmluIHwgMjQgKysrKysrKysrKysrKysKLSBzZXR1cC9tYWluLnB5ICAgICAgICB8IDcwICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLQorIHNldHVwL21haW4ucHkgICAg ICAgIHwgNzIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLQogIHNldHVw L3NldHVwLnVpICAgICAgIHwgMjIgKysrKysrKysrKystLQogIHNyYy9pYnVzdHlwZXMuaCAgICAg IHwgMTAgKysrKysrCiAgdWkvZ3RrMy9wYW5lbC52YWxhICAgfCA5MyArKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCi0gNSBmaWxlcyBjaGFuZ2VkLCAy MTAgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKKyA1IGZpbGVzIGNoYW5nZWQsIDIxMiBp bnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQogCiBkaWZmIC0tZ2l0IGEvZGF0YS9pYnVzLnNj aGVtYXMuaW4gYi9kYXRhL2lidXMuc2NoZW1hcy5pbgotaW5kZXggOGZkN2UxNS4uMjhkMjIxOSAx MDA2NDQKK2luZGV4IDFlNDc3NmIuLjllZTBiMWEgMTAwNjQ0CiAtLS0gYS9kYXRhL2lidXMuc2No ZW1hcy5pbgogKysrIGIvZGF0YS9pYnVzLnNjaGVtYXMuaW4KIEBAIC0yLDYgKzIsMzAgQEAKQEAg LTYwLDcgKzYwLDcgQEAgaW5kZXggOGZkN2UxNS4uMjhkMjIxOSAxMDA2NDQKICAgICAgICA8YXBw bHl0bz4vZGVza3RvcC9pYnVzL2dlbmVyYWwvcHJlbG9hZF9lbmdpbmVzPC9hcHBseXRvPgogICAg ICAgIDxvd25lcj5pYnVzPC9vd25lcj4KIGRpZmYgLS1naXQgYS9zZXR1cC9tYWluLnB5IGIvc2V0 dXAvbWFpbi5weQotaW5kZXggZDNmNDQxNC4uMjM1ZWY5YyAxMDA2NDQKK2luZGV4IGRlZTdiZTQu LmE5OTE0MzggMTAwNjQ0CiAtLS0gYS9zZXR1cC9tYWluLnB5CiArKysgYi9zZXR1cC9tYWluLnB5 CiBAQCAtMTkwLDE2ICsxOTAsMzAgQEAgY2xhc3MgU2V0dXAob2JqZWN0KToKQEAgLTEyNCw3ICsx MjQsNyBAQCBpbmRleCBkM2Y0NDE0Li4yMzVlZjljIDEwMDY0NAogICAgICBkZWYgX190cmVldmll d19ub3RpZnlfY2Ioc2VsZiwgdHJlZXZpZXcsIHByb3ApOgogICAgICAgICAgaWYgcHJvcC5uYW1l IG5vdCBpbiAoImFjdGl2ZS1lbmdpbmUiLCAiZW5naW5lcyIpOgogICAgICAgICAgICAgIHJldHVy bgotQEAgLTMyMSw2ICszNDMsNDMgQEAgY2xhc3MgU2V0dXAob2JqZWN0KToKK0BAIC0zMjEsNiAr MzQzLDQ0IEBAIGNsYXNzIFNldHVwKG9iamVjdCk6CiAgICAgICAgICAgICAgZGVsIHNlbGYuX19l bmdpbmVfc2V0dXBfZXhlY19saXN0W25hbWVdCiAgICAgICAgICBzZWxmLl9fZW5naW5lX3NldHVw X2V4ZWNfbGlzdFtuYW1lXSA9IG9zLnNwYXdubChvcy5QX05PV0FJVCwgKmFyZ3MpCiAgCkBAIC0x NDAsOSArMTQwLDEwIEBAIGluZGV4IGQzZjQ0MTQuLjIzNWVmOWMgMTAwNjQ0CiArICAgICAgICAg ICAgICAgICAgICAgICAgImNsZWFyZWQgaW1tZWRpYXRlbHkgYW5kIHRoZSBsaXN0IHdpbGwgYmUg IiBcCiArICAgICAgICAgICAgICAgICAgICAgICAgImNvbmZpZ3VyZWQgYnkgdGhlIGxvZ2luIGxh bmd1YWdlIGV2ZXJ5IHRpbWUuICIgXAogKyAgICAgICAgICAgICAgICAgICAgICAgICJEbyB5b3Ug YWdyZWUgd2l0aCB0aGlzPyIpCi0rICAgICAgICAgICAgZGxnID0gR3RrLk1lc3NhZ2VEaWFsb2co dHlwZSA9IEd0ay5NZXNzYWdlVHlwZS5RVUVTVElPTiwKKysgICAgICAgICAgICBkbGcgPSBHdGsu TWVzc2FnZURpYWxvZyhtZXNzYWdlX3R5cGUgPSBHdGsuTWVzc2FnZVR5cGUuUVVFU1RJT04sCisr ICAgICAgICAgICAgICAgICAgICB0cmFuc2llbnRfZm9yID0gc2VsZi5fX3dpbmRvdywKICsgICAg ICAgICAgICAgICAgICAgIGJ1dHRvbnMgPSBHdGsuQnV0dG9uc1R5cGUuWUVTX05PLAotKyAgICAg ICAgICAgICAgICAgICAgbWVzc2FnZV9mb3JtYXQgPSBtZXNzYWdlKQorKyAgICAgICAgICAgICAg ICAgICAgdGV4dCA9IG1lc3NhZ2UpCiArICAgICAgICAgICAgaWQgPSBkbGcucnVuKCkKICsgICAg ICAgICAgICBkbGcuZGVzdHJveSgpCiArICAgICAgICAgICAgc2VsZi5fX2ZsdXNoX2d0a19ldmVu dHMoKQpAQCAtMTY5LDcgKzE3MCw3IEBAIGluZGV4IGQzZjQ0MTQuLjIzNWVmOWMgMTAwNjQ0CiAg ICAgICAgICBzZWxmLl9fYnVzID0gSUJ1cy5CdXMoKQogICAgICAgICAgaWYgc2VsZi5fX2J1cy5p c19jb25uZWN0ZWQoKToKIGRpZmYgLS1naXQgYS9zZXR1cC9zZXR1cC51aSBiL3NldHVwL3NldHVw LnVpCi1pbmRleCA2NWRjZWU0Li5hNmEwMDFiIDEwMDY0NAoraW5kZXggNWZmYmU0Ny4uN2M2MGI3 MiAxMDA2NDQKIC0tLSBhL3NldHVwL3NldHVwLnVpCiArKysgYi9zZXR1cC9zZXR1cC51aQogQEAg LTY3Nyw3ICs2NzcsMjMgQEAKQEAgLTE5Nyw3ICsxOTgsNyBAQCBpbmRleCA2NWRjZWU0Li5hNmEw MDFiIDEwMDY0NAogICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJvcmll bnRhdGlvbiI+aG9yaXpvbnRhbDwvcHJvcGVydHk+CiAgICAgICAgICAgICAgICAgICAgICAgICAg PHByb3BlcnR5IG5hbWU9InZpc2libGUiPlRydWU8L3Byb3BlcnR5PgogICAgICAgICAgICAgICAg ICAgICAgICAgIDxwcm9wZXJ0eSBuYW1lPSJjYW5fZm9jdXMiPkZhbHNlPC9wcm9wZXJ0eT4KLUBA IC04NjgsNyArODg0LDcgQEAKK0BAIC04NjksNyArODg1LDcgQEAKICAgICAgICAgICAgICAgICAg ICAgICAgPHBhY2tpbmc+CiAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3BlcnR5IG5hbWU9 ImV4cGFuZCI+VHJ1ZTwvcHJvcGVydHk+CiAgICAgICAgICAgICAgICAgICAgICAgICAgPHByb3Bl cnR5IG5hbWU9ImZpbGwiPlRydWU8L3Byb3BlcnR5PgpAQCAtMjA2LDcgKzIwNyw3IEBAIGluZGV4 IDY1ZGNlZTQuLmE2YTAwMWIgMTAwNjQ0CiAgICAgICAgICAgICAgICAgICAgICAgIDwvcGFja2lu Zz4KICAgICAgICAgICAgICAgICAgICAgIDwvY2hpbGQ+CiAgICAgICAgICAgICAgICAgICAgICA8 Y2hpbGQ+Ci1AQCAtOTE2LDcgKzkzMiw3IEBACitAQCAtOTE3LDcgKzkzMyw3IEBACiAgICAgICAg ICAgICAgICAgICAgICAgIDxwYWNraW5nPgogICAgICAgICAgICAgICAgICAgICAgICAgIDxwcm9w ZXJ0eSBuYW1lPSJleHBhbmQiPkZhbHNlPC9wcm9wZXJ0eT4KICAgICAgICAgICAgICAgICAgICAg ICAgICA8cHJvcGVydHkgbmFtZT0iZmlsbCI+VHJ1ZTwvcHJvcGVydHk+CkBAIC0yMzcsNyArMjM4 LDcgQEAgaW5kZXggODZmYzJjYy4uY2I5ZWIyMiAxMDA2NDQKICAgKiBAeDogeCBjb29yZGluYXRl LgogICAqIEB5OiB5IGNvb3JkaW5hdGUuCiBkaWZmIC0tZ2l0IGEvdWkvZ3RrMy9wYW5lbC52YWxh IGIvdWkvZ3RrMy9wYW5lbC52YWxhCi1pbmRleCAxZGE3OTY2Li5mYzYwZmQ0IDEwMDY0NAoraW5k ZXggN2ExNTA0OS4uZTZjMTI4YSAxMDA2NDQKIC0tLSBhL3VpL2d0azMvcGFuZWwudmFsYQogKysr IGIvdWkvZ3RrMy9wYW5lbC52YWxhCiBAQCAtMTQxLDYgKzE0MSwxMCBAQCBjbGFzcyBQYW5lbCA6 IElCdXMuUGFuZWxTZXJ2aWNlIHsKQEAgLTM0OSw1ICszNTAsNSBAQCBpbmRleCAxZGE3OTY2Li5m YzYwZmQ0IDEwMDY0NAogIAogICAgICBwcml2YXRlIHZvaWQgdXBkYXRlX3hrYl9lbmdpbmVzKCkg ewogLS0gCi0xLjguMAorMS44LjUuMwogCgpkaWZmIC0tZ2l0IGEvaWJ1cy1IRUFELnBhdGNoIGIv aWJ1cy1IRUFELnBhdGNoCmluZGV4IGUyNDk2MDQuLjMxNmUxNDAgMTAwNjQ0Ci0tLSBhL2lidXMt SEVBRC5wYXRjaAorKysgYi9pYnVzLUhFQUQucGF0Y2gKQEAgLTIxMiw3ICsyMTIsNyBAQCBpbmRl eCAxYjYxN2Y4Li5jMTZmODZhIDEwMDY0NAogRnJvbSA5YmFkMGM5NDQxNjJhMTcwMGRjYjY2MTVh YWIyYTZhOWNmZDllZmY1IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQogRnJvbTogZnVqaXdhcmF0 IDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgogRGF0ZTogVGh1LCAxMiBKdW4gMjAxNCAxMToz ODo0MyArMDkwMAotU3ViamVjdDogW1BBVENIIDEvOF0gRml4IGVzY2FwZSBrZXkgd2l0aCBDdHJs K1NoaWZ0K1UgSVNPIDE0NzU1LgorU3ViamVjdDogW1BBVENIXSBGaXggZXNjYXBlIGtleSB3aXRo IEN0cmwrU2hpZnQrVSBJU08gMTQ3NTUuCiAKIEd0a0lNQ29udGV4dFNpbXBsZSB1c2VzIGdka19r ZXltYXBfZ2V0X2Zvcl9kaXNwbGF5KCkgdG8gY2hlY2sgdGhlIHJlYWRhYmxlCiBoZXggY29kZXMg YnV0IElCdXNFbmdpbmVTaW1wbGUgaWdub3JlZCBpdCBiZWNhdXNlIGRvZXMgbm90IGhhdmUgdGhl IGRpc3BsYXkKQEAgLTMxNCw3ICszMTQsNyBAQCBpbmRleCA4YzA3NmFjLi4zMDBhODI4IDEwMDY0 NAogRnJvbSBiNmFmZmZiZDFhMDZlY2YxN2FmMDA5ZjFkZTNlNTEzOTg4ZWNiOTJlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQogRnJvbTogZnVqaXdhcmF0IDx0YWthby5mdWppd2FyYTFAZ21haWwu Y29tPgogRGF0ZTogV2VkLCAxOCBKdW4gMjAxNCAxMTo0MjozNCArMDkwMAotU3ViamVjdDogW1BB VENIIDIvOF0gVXBkYXRlIGlidXNjb21wb3NldGFibGUuaCBmb3IgcHQtYnIuCitTdWJqZWN0OiBb UEFUQ0hdIFVwZGF0ZSBpYnVzY29tcG9zZXRhYmxlLmggZm9yIHB0LWJyLgogCiBwdF9CUi5VVEYt OC9Db21wb3NlIGZpbGUgaXMgdXBkYXRlZDoKIGh0dHA6Ly9jZ2l0LmZyZWVkZXNrdG9wLm9yZy94 b3JnL2xpYi9saWJYMTEvY29tbWl0Lz9pZD1lM2RjMGQxNzMzCkBAIC0xMDAwLDcgKzEwMDAsNyBA QCBpbmRleCAyYmEzNTcxLi4yMmFhYjQ4IDEwMDY0NAogRnJvbSBhNTMwMDc1MGUzOGI1MzI3YmRk MjU1ZDc3NzU0NGQwYzBlYmNiNGQ5IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQogRnJvbTogZnVq aXdhcmF0IDx0YWthby5mdWppd2FyYTFAZ21haWwuY29tPgogRGF0ZTogVHVlLCAyNCBKdW4gMjAx NCAxMToyNDo0MCArMDkwMAotU3ViamVjdDogW1BBVENIIDQvOF0gRG8gbm90IHNvcnQgaWJ1cyBl bmdpbmVzIHdoZW4gdGhleSBhcmUgc2F2ZWQgYnkKK1N1YmplY3Q6IFtQQVRDSF0gRG8gbm90IHNv cnQgaWJ1cyBlbmdpbmVzIHdoZW4gdGhleSBhcmUgc2F2ZWQgYnkKICBpYnVzLXNldHVwLgogCiBp YnVzIDEuNSBjaGFuZ2VzIHRoZSBlbmdpbmUgb3JkZXIgd2l0aCBTdXBlcitzcGFjZSBzaG9ydGN1 dCBrZXkKQEAgLTEwOTksNyArMTA5OSw3IEBAIGluZGV4IGRlZTdiZTQuLjFkODlmM2QgMTAwNjQ0 CiBGcm9tIDhlZjI1OGVjMzFmMTI0MDVlNGY1ZGVkNmE3YTRkODAxMTRhMjE5ZDQgTW9uIFNlcCAx NyAwMDowMDowMCAyMDAxCiBGcm9tOiBPc2FtdSBBb2tpIDxvc2FtdUBkZWJpYW4ub3JnPgogRGF0 ZTogVGh1LCAzIEp1bCAyMDE0IDExOjM5OjMyICswOTAwCi1TdWJqZWN0OiBbUEFUQ0ggNS84XSBV c2UgImtleWNvZGUgTGludXhfa2V5Y29kZSA9IFgxMV9rZXlzeW0iIGZvcm1hdAorU3ViamVjdDog W1BBVENIXSBVc2UgImtleWNvZGUgTGludXhfa2V5Y29kZSA9IFgxMV9rZXlzeW0iIGZvcm1hdAog CiBEZWxldGUgbm9uLUxpbnV4IGtleWJvYXJkIGNvbXBhdGliaWxpdHkuCiAKQEAgLTExNTAsNyAr MTE1MCw3IEBAIGluZGV4IDJjNzgzNDcuLmU1NTQ2ZmEgMTAwNjQ0CiBGcm9tIDNkY2YyNDc0MjIx NmQ2MjM0YTQ1YWNlMWI0MzNiODY0ZWZkZjA4YTIgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCiBG cm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+CiBEYXRlOiBGcmksIDQg SnVsIDIwMTQgMTY6MDM6NTcgKzA5MDAKLVN1YmplY3Q6IFtQQVRDSCA3LzhdIEFkZCBpYnVzIHJl c2V0LWNvbmZpZyBhbmQgcmVhZC1jb25maWcgc3ViLWNvbW1hbmRzLgorU3ViamVjdDogW1BBVENI XSBBZGQgaWJ1cyByZXNldC1jb25maWcgYW5kIHJlYWQtY29uZmlnIHN1Yi1jb21tYW5kcy4KIAog QlVHPXJoYnojNTMwNzExCiBURVNUPXRvb2xzL2lidXMKQEAgLTEyNDMsMTcgKzEyNDMsMjAgQEAg aW5kZXggZGI0ZmQyMy4uZWNjZTgwYSAxMDA2NDQKIC0tIAogMS44LjUuMwogCi1Gcm9tIDRjMjQ1 YmJiYWMzZWRlYTkwOTgwYTBmNDdlZjJkNWMwYzA3MGY5MzYgTW9uIFNlcCAxNyAwMDowMDowMCAy MDAxCitGcm9tIDllNWEyYmQyYzQwZjllZWQ4ZDk5NzEwYjYzYjNkYWI3MzdhYTliOTUgTW9uIFNl cCAxNyAwMDowMDowMCAyMDAxCiBGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFp bC5jb20+Ci1EYXRlOiBNb24sIDcgSnVsIDIwMTQgMTY6MTc6MjUgKzA5MDAKLVN1YmplY3Q6IFtQ QVRDSCA4LzhdIFVwZGF0ZSBpYnVzKDEpIGZvciByZWFkLWNvbmZpZyBhbmQgcmVzZXQtY29uZmln LgorRGF0ZTogVHVlLCA4IEp1bCAyMDE0IDExOjQyOjEyICswOTAwCitTdWJqZWN0OiBbUEFUQ0hd IFVwZGF0ZSBpYnVzKDEpIGZvciByZWFkLWNvbmZpZyBhbmQgcmVzZXQtY29uZmlnLgogCitURVNU PXRvb2xzL2lidXMuMS5negorCitSZXZpZXcgVVJMOiBodHRwczovL2NvZGVyZXZpZXcuYXBwc3Bv dC5jb20vMTExOTAwMDQ0CiAtLS0KICB0b29scy9pYnVzLjEuaW4gfCA3ICsrKysrKysKICAxIGZp bGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspCiAKIGRpZmYgLS1naXQgYS90b29scy9pYnVzLjEu aW4gYi90b29scy9pYnVzLjEuaW4KLWluZGV4IGFiOTlkYjQuLmY3NzdmNjUgMTAwNjQ0CitpbmRl eCBhYjk5ZGI0Li42YWM5MmZmIDEwMDY0NAogLS0tIGEvdG9vbHMvaWJ1cy4xLmluCiArKysgYi90 b29scy9pYnVzLjEuaW4KIEBAIC04NSw2ICs4NSwxMyBAQCBkaXJlY3Rvcmllcywgc2VwYXJhdGVk IGJ5ICc6Jy4KQEAgLTEyNjEsNyArMTI2NCw3IEBAIGluZGV4IGFiOTlkYjQuLmY3NzdmNjUgMTAw NjQ0CiAgU2hvdyB0aGUgRC1CdXMgYWRkcmVzcyBvZiBpYnVzLWRhZW1vbi4KICAuVFAKICtcZkJy ZWFkXC1jb25maWdcZlIKLStTaG93IHRoZSBzZXR0aW5nIHZhbHVlcyBpbiBhIGdzZXR0aW5ncyBj b25maWd1cmF0aW9uIGZpbGUuCisrUHJpbnQgdGhlIHNldHRpbmcgdmFsdWVzIGluIGEgZ3NldHRp bmdzIGNvbmZpZ3VyYXRpb24gZmlsZS4KICsuVFAKICtcZkJyZXNldFwtY29uZmlnXGZSCiArUmVz ZXQgdGhlIHVzZXIgc2V0dGluZyB2YWx1ZXMgdG8gdGhlIGRlZmF1bHQgb25lcyBpbiBhIGdzZXR0 aW5ncwpAQCAtMTI3MywzICsxMjc2LDQxNCBAQCBpbmRleCBhYjk5ZGI0Li5mNzc3ZjY1IDEwMDY0 NAogLS0gCiAxLjguNS4zCiAKK0Zyb20gMTA0ODNiZmViZDFmNTFmZmE1MmFkN2QwMTcxOTNhZTcy OGY5M2JmNSBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IGZ1aml3YXJhdCA8dGFrYW8u ZnVqaXdhcmExQGdtYWlsLmNvbT4KK0RhdGU6IFRodSwgMTAgSnVsIDIwMTQgMTE6NTQ6MzAgKzA5 MDAKK1N1YmplY3Q6IFtQQVRDSF0gRml4IGlidXMtc2V0dXAgU0VHViBpbiBlbmdpbmV0cmVldmll dy5weQorCitXaGVuIGFuIGVuZ2luZSBpcyBhZGRlZCBvbiBpYnVzLXNldHVwLCBlbmdpbmV0cmVl dmlldy5hcHBlbmRfZW5naW5lKCkKK2NhbGxzIHNlbGYuX19tb2RlbC5hcHBlbmQoTm9uZSkgYW5k IGl0IGNhdXNlcyBlbmdpbmUgPT0gTm9uZSBpbgorX19pY29uX2NlbGxfZGF0YV9jYigpIGFuZCBf X25hbWVfY2VsbF9kYXRhX2NiKCkgaW4gZW5naW5ldHJlZXZpZXcKK3dpdGggcHl0aG9uMy1nb2Jq ZWN0IDMuMTMueCB3aGljaCB2ZXJzaW9uIGhhcyBpbXBsZW1lbnRlZCBzZXZlcmFsCitkZXByZWNh dGVkIHdhcm5pbmdzIGluIGdpL292ZXJyaWRlcy9HdGsucHkgLgorSSB0aGluayB0aGlzIHByb2Js ZW0gYWxzbyBjb3VsZCBoYXBwZW4gaW4gdGhlIG9sZCB2ZXJzaW9ucyBpZgordGhlIHN5c3RlbSB3 b3VsZCBiZSBzbG93LgorCitCVUc9cmhieiMxMDQ4NDI5CitURVNUPXNldHVwIGluIEZlZG9yYSAy MQorCitSZXZpZXcgVVJMOiBodHRwczovL2NvZGVyZXZpZXcuYXBwc3BvdC5jb20vMTA0NjIwMDQz CistLS0KKyBzZXR1cC9lbmdpbmV0cmVldmlldy5weSB8IDE1ICsrKysrKysrKysrKystLQorIDEg ZmlsZSBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQorCitkaWZmIC0t Z2l0IGEvc2V0dXAvZW5naW5ldHJlZXZpZXcucHkgYi9zZXR1cC9lbmdpbmV0cmVldmlldy5weQor aW5kZXggM2FiODFiNy4uYWZiMjNmYyAxMDA2NDQKKy0tLSBhL3NldHVwL2VuZ2luZXRyZWV2aWV3 LnB5CisrKysgYi9zZXR1cC9lbmdpbmV0cmVldmlldy5weQorQEAgLTEyOCwxMiArMTI4LDI1IEBA IGNsYXNzIEVuZ2luZVRyZWVWaWV3KEd0ay5UcmVlVmlldyk6CisgICAgIGRlZiBfX2ljb25fY2Vs bF9kYXRhX2NiKHNlbGYsIGNlbGxsYXlvdXQsIHJlbmRlcmVyLCBtb2RlbCwgaXQsIGRhdGEpOgor ICAgICAgICAgZW5naW5lID0gc2VsZi5fX21vZGVsLmdldF92YWx1ZShpdCwgMCkKKyAKKysgICAg ICAgICMgV2hlbiBhcHBlbmRfZW5naW5lKCkgaXMgY2FsbGVkLCBzZWxmLl9fbW9kZWwuYXBwZW5k KE5vbmUpCisrICAgICAgICAjIGlzIGNhbGxlZCBpbnRlcm5hbGx5IGFuZCBlbmdpbmUgPT0gTm9u ZSBjb3VsZCBoYXBwZW4gaW4KKysgICAgICAgICMgYSBzbG93IHN5c3RlbS4KKysgICAgICAgIGlm IGVuZ2luZSA9PSBOb25lOgorKyAgICAgICAgICAgIHJldHVybgorKworICAgICAgICAgaWNvbl9z aXplID0gR3RrLmljb25fc2l6ZV9sb29rdXAoR3RrLkljb25TaXplLkxBUkdFX1RPT0xCQVIpWzBd CisgICAgICAgICBwaXhidWYgPSBsb2FkX2ljb24oZW5naW5lLmdldF9pY29uKCksIEd0ay5JY29u U2l6ZS5MQVJHRV9UT09MQkFSKQorICAgICAgICAgcmVuZGVyZXIuc2V0X3Byb3BlcnR5KCJwaXhi dWYiLCBwaXhidWYpCisgCisgICAgIGRlZiBfX25hbWVfY2VsbF9kYXRhX2NiKHNlbGYsIGNlbGxs YXlvdXQsIHJlbmRlcmVyLCBtb2RlbCwgaXQsIGRhdGEpOgorICAgICAgICAgZW5naW5lID0gc2Vs Zi5fX21vZGVsLmdldF92YWx1ZShpdCwgMCkKKysKKysgICAgICAgICMgV2hlbiBhcHBlbmRfZW5n aW5lKCkgaXMgY2FsbGVkLCBzZWxmLl9fbW9kZWwuYXBwZW5kKE5vbmUpCisrICAgICAgICAjIGlz IGNhbGxlZCBpbnRlcm5hbGx5IGFuZCBlbmdpbmUgPT0gTm9uZSBjb3VsZCBoYXBwZW4gaW4KKysg ICAgICAgICMgYSBzbG93IHN5c3RlbS4KKysgICAgICAgIGlmIGVuZ2luZSA9PSBOb25lOgorKyAg ICAgICAgICAgIHJldHVybgorKworICAgICAgICAgcmVuZGVyZXIuc2V0X3Byb3BlcnR5KCJzZW5z aXRpdmUiLCBUcnVlKQorICAgICAgICAgbGFuZ3VhZ2UgPSBJQnVzLmdldF9sYW5ndWFnZV9uYW1l KGVuZ2luZS5nZXRfbGFuZ3VhZ2UoKSkKKyAgICAgICAgIHJlbmRlcmVyLnNldF9wcm9wZXJ0eSgi dGV4dCIsCitAQCAtMjE1LDcgKzIyOCw2IEBAIGNsYXNzIEVuZ2luZVRyZWVWaWV3KEd0ay5UcmVl Vmlldyk6CisgICAgICAgICBpdCA9IHNlbGYuX19tb2RlbC5wcmVwZW5kKE5vbmUpCisgICAgICAg ICBzZWxmLl9fbW9kZWwuc2V0KGl0LCAwLCBlbmdpbmUpCisgICAgICAgICBzZWxmLl9fZW5naW5l cyA9IFtlbmdpbmVdICsgc2VsZi5fX2VuZ2luZXMKKy0gICAgICAgIHNlbGYuc2Nyb2xsX3RvX2Nl bGwoc2VsZi5fX21vZGVsWzBdLnBhdGgsIE5vbmUpCisgCisgICAgIGRlZiBhcHBlbmRfZW5naW5l KHNlbGYsIGVuZ2luZSk6CisgICAgICAgICBpZiBlbmdpbmUgPT0gTm9uZSBvciBlbmdpbmUgaW4g c2VsZi5fX2VuZ2luZXM6CitAQCAtMjIzLDcgKzIzNSw2IEBAIGNsYXNzIEVuZ2luZVRyZWVWaWV3 KEd0ay5UcmVlVmlldyk6CisgICAgICAgICBpdCA9IHNlbGYuX19tb2RlbC5hcHBlbmQoTm9uZSkK KyAgICAgICAgIHNlbGYuX19tb2RlbC5zZXQoaXQsIDAsIGVuZ2luZSkKKyAgICAgICAgIHNlbGYu X19lbmdpbmVzLmFwcGVuZChlbmdpbmUpCistICAgICAgICBzZWxmLnNjcm9sbF90b19jZWxsKHNl bGYuX19tb2RlbFstMV0ucGF0aCwgTm9uZSkKKyAKKyAgICAgZGVmIHJlbW92ZV9lbmdpbmUoc2Vs Zik6CisgICAgICAgICBpdCA9IHNlbGYuZ2V0X3NlbGVjdGVkX2l0ZXIoKQorLS0gCisxLjguNS4z CisKK0Zyb20gYTE3ZGM4ZThiZDI4OGFkZWRiNzdhZTQxN2Q2ODI1NDE5MzM3ZGFhZSBNb24gU2Vw IDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmExQGdtYWls LmNvbT4KK0RhdGU6IEZyaSwgMTEgSnVsIDIwMTQgMTE6NDU6MDUgKzA5MDAKK1N1YmplY3Q6IFtQ QVRDSF0gRml4IGRlcHJlY2F0ZWQgd2FybmluZ3Mgd2l0aCBweXRob24zLWdvYmplY3QgMy4xMy4z LgorCitweXRob24zLWdvYmplY3QgYWRkcyBzZXZlcmFsIHdhcm5pbmdzIGluIGdpL292ZXJyaWRl cy9HdGsucHkKKworL3Vzci9zaGFyZS9pYnVzL3NldHVwL21haW4ucHk6NzQ6IFB5R0lEZXByZWNh dGlvbldhcm5pbmc6CitVc2luZyBwb3NpdGlvbmFsIGFyZ3VtZW50cyB3aXRoIHRoZSBHT2JqZWN0 IGNvbnN0cnVjdG9yIGhhcyBiZWVuCitkZXByZWNhdGVkLiBQbGVhc2Ugc3BlY2lmeSBrZXl3b3Jk KHMpIGZvciAic2NoZW1hIiBvciB1c2UgYSBjbGFzcworc3BlY2lmaWMgY29uc3RydWN0b3IuCitT ZWU6IGh0dHBzOi8vd2lraS5nbm9tZS5vcmcvUHlHT2JqZWN0L0luaXRpYWxpemVyRGVwcmVjYXRp b25zCisKKy91c3Ivc2hhcmUvaWJ1cy9zZXR1cC9tYWluLnB5OjM2NDogUHlHVEtEZXByZWNhdGlv bldhcm5pbmc6CitUaGUga2V5d29yZChzKSAidHlwZSIgaGF2ZSBiZWVuIGRlcHJlY2F0ZWQgaW4g ZmF2b3Igb2YgIm1lc3NhZ2VfdHlwZSIKK3Jlc3BlY3RpdmVseS4KK1NlZTogaHR0cHM6Ly93aWtp Lmdub21lLm9yZy9QeUdPYmplY3QvSW5pdGlhbGl6ZXJEZXByZWNhdGlvbnMKKworVEVTVD1zZXR1 cAorCitSZXZpZXcgVVJMOiBodHRwczovL2NvZGVyZXZpZXcuYXBwc3BvdC5jb20vMTEwOTkwMDQ0 CistLS0KKyBzZXR1cC9lbmdpbmVhYm91dC5weSAgICAgIHwgMTIgKysrKysrKy0tLS0tCisgc2V0 dXAva2V5Ym9hcmRzaG9ydGN1dC5weSB8IDMyICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tCisgc2V0dXAvbWFpbi5weSAgICAgICAgICAgICB8IDMwICsrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLQorIHNldHVwL3NldHVwLnVpICAgICAgICAgICAgfCAgMiArKworIDQgZmlsZXMg Y2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygrKSwgMzEgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQg YS9zZXR1cC9lbmdpbmVhYm91dC5weSBiL3NldHVwL2VuZ2luZWFib3V0LnB5CitpbmRleCA1MGFi MDAxLi4wOWU5YjVjIDEwMDY0NAorLS0tIGEvc2V0dXAvZW5naW5lYWJvdXQucHkKKysrKyBiL3Nl dHVwL2VuZ2luZWFib3V0LnB5CitAQCAtMjksMTIgKzI5LDE0IEBAIGZyb20gZ2kucmVwb3NpdG9y eSBpbXBvcnQgUGFuZ28KKyBmcm9tIGkxOG4gaW1wb3J0IF8sIE5fCisgCisgY2xhc3MgRW5naW5l QWJvdXQoR3RrLkRpYWxvZyk6CistICAgIGRlZiBfX2luaXRfXyhzZWxmLCBlbmdpbmVkZXNjKToK Ky0gICAgICAgIHNlbGYuX19lbmdpbmVfZGVzYyA9IGVuZ2luZWRlc2MKKy0gICAgICAgIHN1cGVy KEVuZ2luZUFib3V0LCBzZWxmKS5fX2luaXRfXyhfKCJBYm91dCIpLCBOb25lLAorLSAgICAgICAg ICAgICAgICBHdGsuRGlhbG9nRmxhZ3MuTU9EQUwsCistICAgICAgICAgICAgICAgIChfKCJfQ2xv c2UiKSwgR3RrLlJlc3BvbnNlVHlwZS5DTE9TRSkpCisrICAgIGRlZiBfX2luaXRfXyhzZWxmLCBl bmdpbmUsIHRyYW5zaWVudF9mb3IgPSBOb25lKToKKysgICAgICAgIHNlbGYuX19lbmdpbmVfZGVz YyA9IGVuZ2luZQorKyAgICAgICAgc3VwZXIoRW5naW5lQWJvdXQsIHNlbGYpLl9faW5pdF9fKAor KyAgICAgICAgICAgICAgICB0aXRsZSA9IF8oIkFib3V0IiksCisrICAgICAgICAgICAgICAgIHRy YW5zaWVudF9mb3IgPSB0cmFuc2llbnRfZm9yKQorIAorKyAgICAgICAgYnV0dG9ucyA9IChfKCJf Q2xvc2UiKSwgR3RrLlJlc3BvbnNlVHlwZS5DTE9TRSkKKysgICAgICAgIHNlbGYuYWRkX2J1dHRv bnMoKmJ1dHRvbnMpCisgICAgICAgICBzZWxmLl9faW5pdF91aSgpCisgCisgICAgIGRlZiBfX2lu aXRfdWkoc2VsZik6CitkaWZmIC0tZ2l0IGEvc2V0dXAva2V5Ym9hcmRzaG9ydGN1dC5weSBiL3Nl dHVwL2tleWJvYXJkc2hvcnRjdXQucHkKK2luZGV4IGQ4MmZlYTguLjkxNTk1ZjcgMTAwNjQ0Cist LS0gYS9zZXR1cC9rZXlib2FyZHNob3J0Y3V0LnB5CisrKysgYi9zZXR1cC9rZXlib2FyZHNob3J0 Y3V0LnB5CitAQCAtNDksNyArNDksOCBAQCBjbGFzcyBLZXlib2FyZFNob3J0Y3V0U2VsZWN0aW9u KEd0ay5Cb3gpOgorICAgICAgICAgIyBzZWxmLnBhY2tfc3RhcnQobGFiZWwsIEZhbHNlLCBUcnVl LCA0KQorIAorICAgICAgICAgIyBzaG9ydGN1dHMgdmlldworLSAgICAgICAgc2VsZi5fX3Nob3J0 Y3V0X3ZpZXcgPSBHdGsuVHJlZVZpZXcoR3RrLkxpc3RTdG9yZShHT2JqZWN0LlRZUEVfU1RSSU5H KSkKKysgICAgICAgIHNlbGYuX19zaG9ydGN1dF92aWV3ID0gR3RrLlRyZWVWaWV3KAorKyAgICAg ICAgICAgICAgICBtb2RlbCA9IEd0ay5MaXN0U3RvcmUoR09iamVjdC5UWVBFX1NUUklORykpCisg ICAgICAgICBzZWxmLl9fc2hvcnRjdXRfdmlldy5zZXRfc2l6ZV9yZXF1ZXN0KC0xLCAxMDApCisg ICAgICAgICByZW5kZXJlciA9IEd0ay5DZWxsUmVuZGVyZXJUZXh0KCkKKyAgICAgICAgIGNvbHVt biA9IEd0ay5UcmVlVmlld0NvbHVtbihfKCJLZXlib2FyZCBzaG9ydGN1dHMiKSwgcmVuZGVyZXIs IHRleHQgPSAwKQorQEAgLTYzLDcgKzY0LDcgQEAgY2xhc3MgS2V5Ym9hcmRTaG9ydGN1dFNlbGVj dGlvbihHdGsuQm94KToKKyAKKyAgICAgICAgICMga2V5IGNvZGUKKyAgICAgICAgIGhib3ggPSBH dGsuQm94KG9yaWVudGF0aW9uPUd0ay5PcmllbnRhdGlvbi5IT1JJWk9OVEFMKQorLSAgICAgICAg bGFiZWwgPSBHdGsuTGFiZWwoXygiS2V5IGNvZGU6IikpCisrICAgICAgICBsYWJlbCA9IEd0ay5M YWJlbChsYWJlbCA9IF8oIktleSBjb2RlOiIpKQorICAgICAgICAgbGFiZWwuc2V0X2p1c3RpZnko R3RrLkp1c3RpZmljYXRpb24uTEVGVCkKKyAgICAgICAgIGxhYmVsLnNldF9hbGlnbm1lbnQoMC4w LCAwLjUpCisgICAgICAgICBoYm94LnBhY2tfc3RhcnQobGFiZWwsIEZhbHNlLCBUcnVlLCA0KQor QEAgLTcxLDE5ICs3MiwxOSBAQCBjbGFzcyBLZXlib2FyZFNob3J0Y3V0U2VsZWN0aW9uKEd0ay5C b3gpOgorICAgICAgICAgc2VsZi5fX2tleWNvZGVfZW50cnkgPSBHdGsuRW50cnkoKQorICAgICAg ICAgc2VsZi5fX2tleWNvZGVfZW50cnkuY29ubmVjdCgibm90aWZ5Ojp0ZXh0Iiwgc2VsZi5fX2tl eWNvZGVfZW50cnlfbm90aWZ5X2NiKQorICAgICAgICAgaGJveC5wYWNrX3N0YXJ0KHNlbGYuX19r ZXljb2RlX2VudHJ5LCBUcnVlLCBUcnVlLCA0KQorLSAgICAgICAgc2VsZi5fX2tleWNvZGVfYnV0 dG9uID0gR3RrLkJ1dHRvbigiLi4uIikKKysgICAgICAgIHNlbGYuX19rZXljb2RlX2J1dHRvbiA9 IEd0ay5CdXR0b24obGFiZWwgPSAiLi4uIikKKyAgICAgICAgIHNlbGYuX19rZXljb2RlX2J1dHRv bi5jb25uZWN0KCJjbGlja2VkIiwgc2VsZi5fX2tleWNvZGVfYnV0dG9uX2NsaWNrZWRfY2IpCisg ICAgICAgICBoYm94LnBhY2tfc3RhcnQoc2VsZi5fX2tleWNvZGVfYnV0dG9uLCBGYWxzZSwgVHJ1 ZSwgNCkKKyAgICAgICAgIHNlbGYucGFja19zdGFydChoYm94LCBGYWxzZSwgVHJ1ZSwgNCkKKyAK KyAgICAgICAgICMgbW9kaWZpZXJzCisgICAgICAgICBoYm94ID0gR3RrLkJveChvcmllbnRhdGlv bj1HdGsuT3JpZW50YXRpb24uSE9SSVpPTlRBTCkKKy0gICAgICAgIGxhYmVsID0gR3RrLkxhYmVs KF8oIk1vZGlmaWVyczoiKSkKKysgICAgICAgIGxhYmVsID0gR3RrLkxhYmVsKGxhYmVsID0gXygi TW9kaWZpZXJzOiIpKQorICAgICAgICAgbGFiZWwuc2V0X2p1c3RpZnkoR3RrLkp1c3RpZmljYXRp b24uTEVGVCkKKyAgICAgICAgIGxhYmVsLnNldF9hbGlnbm1lbnQoMC4wLCAwLjUpCisgICAgICAg ICBoYm94LnBhY2tfc3RhcnQobGFiZWwsIEZhbHNlLCBUcnVlLCA0KQorIAorLSAgICAgICAgdGFi bGUgPSBHdGsuVGFibGUoNCwgMikKKysgICAgICAgIHRhYmxlID0gR3RrLlRhYmxlKG5fcm93cyA9 IDQsIG5fY29sdW1ucyA9IDIpCisgICAgICAgICBzZWxmLl9fbW9kaWZpZXJfYnV0dG9ucyA9IFtd CisgICAgICAgICBzZWxmLl9fbW9kaWZpZXJfYnV0dG9ucy5hcHBlbmQoKCJDb250cm9sIiwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR3RrLkNoZWNrQnV0dG9uLm5l d193aXRoX21uZW1vbmljKCJfQ29udHJvbCIpLAorQEAgLTI1MCw4ICsyNTEsMTAgQEAgY2xhc3Mg S2V5Ym9hcmRTaG9ydGN1dFNlbGVjdGlvbihHdGsuQm94KToKKyAKKyAgICAgZGVmIF9fa2V5Y29k ZV9idXR0b25fY2xpY2tlZF9jYihzZWxmLCBidXR0b24pOgorICAgICAgICAgb3V0ID0gW10KKy0g ICAgICAgIGRsZyA9IEd0ay5NZXNzYWdlRGlhbG9nKHBhcmVudCA9IHNlbGYuZ2V0X3RvcGxldmVs KCksIGJ1dHRvbnMgPSBHdGsuQnV0dG9uc1R5cGUuQ0xPU0UpCistICAgICAgICBtZXNzYWdlID0g XygiUGxlYXNlIHByZXNzIGEga2V5IChvciBhIGtleSBjb21iaW5hdGlvbikuXG5UaGUgZGlhbG9n IHdpbGwgYmUgY2xvc2VkIHdoZW4gdGhlIGtleSBpcyByZWxlYXNlZC4iKQorKyAgICAgICAgZGxn ID0gR3RrLk1lc3NhZ2VEaWFsb2codHJhbnNpZW50X2ZvciA9IHNlbGYuZ2V0X3RvcGxldmVsKCks CisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBidXR0b25zID0gR3RrLkJ1dHRvbnNU eXBlLkNMT1NFKQorKyAgICAgICAgbWVzc2FnZSA9IF8oIlBsZWFzZSBwcmVzcyBhIGtleSAob3Ig YSBrZXkgY29tYmluYXRpb24pLlxuIiBcCisrICAgICAgICAgICAgICAgICAgICAiVGhlIGRpYWxv ZyB3aWxsIGJlIGNsb3NlZCB3aGVuIHRoZSBrZXkgaXMgcmVsZWFzZWQuIikKKyAgICAgICAgIGRs Zy5zZXRfbWFya3VwKG1lc3NhZ2UpCisgICAgICAgICBkbGcuc2V0X3RpdGxlKF8oIlBsZWFzZSBw cmVzcyBhIGtleSAob3IgYSBrZXkgY29tYmluYXRpb24pIikpCisgICAgICAgICBzdyA9IEd0ay5T Y3JvbGxlZFdpbmRvdygpCitAQCAtMjY1LDcgKzI2OCw3IEBAIGNsYXNzIEtleWJvYXJkU2hvcnRj dXRTZWxlY3Rpb24oR3RrLkJveCk6CisgICAgICAgICBtb2RlbCA9IEd0ay5MaXN0U3RvcmUoR09i amVjdC5UWVBFX0lOVCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHT2JqZWN0LlRZ UEVfVUlOVCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHT2JqZWN0LlRZUEVfVUlO VCkKKy0gICAgICAgIGFjY2VsX3ZpZXcgPSBHdGsuVHJlZVZpZXcobW9kZWwpCisrICAgICAgICBh Y2NlbF92aWV3ID0gR3RrLlRyZWVWaWV3KG1vZGVsID0gbW9kZWwpCisgICAgICAgICBzdy5hZGQo YWNjZWxfdmlldykKKyAgICAgICAgIGNvbHVtbiA9IEd0ay5UcmVlVmlld0NvbHVtbigpCisgICAg ICAgICByZW5kZXJlciA9IEd0ay5DZWxsUmVuZGVyZXJBY2NlbChhY2NlbF9tb2RlPUd0ay5DZWxs UmVuZGVyZXJBY2NlbE1vZGUuT1RIRVIsCitAQCAtMzE1LDggKzMxOCw5IEBAIGNsYXNzIEtleWJv YXJkU2hvcnRjdXRTZWxlY3Rpb24oR3RrLkJveCk6CisgICAgICAgICBzZWxmLl9fYXBwbHlfYnV0 dG9uLnNldF9zZW5zaXRpdmUoRmFsc2UpCisgCisgY2xhc3MgS2V5Ym9hcmRTaG9ydGN1dFNlbGVj dGlvbkRpYWxvZyhHdGsuRGlhbG9nKToKKy0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHRpdGxlID0g Tm9uZSwgcGFyZW50ID0gTm9uZSwgZmxhZ3MgPSAwLCBidXR0b25zID0gTm9uZSk6CistICAgICAg ICBzdXBlcihLZXlib2FyZFNob3J0Y3V0U2VsZWN0aW9uRGlhbG9nLCBzZWxmKS5fX2luaXRfXyh0 aXRsZSwgcGFyZW50LCBmbGFncywgYnV0dG9ucykKKysgICAgZGVmIF9faW5pdF9fKHNlbGYsIHRp dGxlID0gTm9uZSwgdHJhbnNpZW50X2ZvciA9IE5vbmUsIGZsYWdzID0gMCk6CisrICAgICAgICBz dXBlcihLZXlib2FyZFNob3J0Y3V0U2VsZWN0aW9uRGlhbG9nLCBzZWxmKS5fX2luaXRfXygKKysg ICAgICAgICAgICAgICAgdGl0bGUgPSB0aXRsZSwgdHJhbnNpZW50X2ZvciA9IHRyYW5zaWVudF9m b3IsIGZsYWdzID0gZmxhZ3MpCisgICAgICAgICBzZWxmLl9fc2VsZWN0aW9uX3ZpZXcgPSBLZXli b2FyZFNob3J0Y3V0U2VsZWN0aW9uKCkKKyAgICAgICAgIHNlbGYudmJveC5wYWNrX3N0YXJ0KHNl bGYuX19zZWxlY3Rpb25fdmlldywgRmFsc2UsIFRydWUsIDApCisgICAgICAgICBzZWxmLnZib3gu c2hvd19hbGwoKQorQEAgLTMzMywxMCArMzM3LDEwIEBAIGNsYXNzIEtleWJvYXJkU2hvcnRjdXRT ZWxlY3Rpb25EaWFsb2coR3RrLkRpYWxvZyk6CisgCisgCisgaWYgX19uYW1lX18gPT0gIl9fbWFp bl9fIjoKKy0gICAgZGxnID0gS2V5Ym9hcmRTaG9ydGN1dFNlbGVjdGlvbkRpYWxvZygKKy0gICAg ICAgIHRpdGxlID0gIlNlbGVjdCB0ZXN0IiwKKy0gICAgICAgIGJ1dHRvbnMgPSAoXygiX0NhbmNl bCIpLCBHdGsuUmVzcG9uc2VUeXBlLkNBTkNFTCwKKy0gICAgICAgICAgICAgICAgICAgXygiX09L IiksIEd0ay5SZXNwb25zZVR5cGUuT0spKQorKyAgICBkbGcgPSBLZXlib2FyZFNob3J0Y3V0U2Vs ZWN0aW9uRGlhbG9nKHRpdGxlID0gIlNlbGVjdCB0ZXN0IikKKysgICAgYnV0dG9ucyA9IChfKCJf Q2FuY2VsIiksIEd0ay5SZXNwb25zZVR5cGUuQ0FOQ0VMLAorKyAgICAgICAgICAgICAgIF8oIl9P SyIpLCBHdGsuUmVzcG9uc2VUeXBlLk9LKQorKyAgICBkbGcuYWRkX2J1dHRvbnMoYnV0dG9ucykK KyAgICAgZGxnLmFkZF9zaG9ydGN1dCgiQ29udHJvbCtTaGlmdCtzcGFjZSIpCisgICAgIGRsZy5z ZXRfc2hvcnRjdXRzKE5vbmUpCisgICAgIHByaW50KChkbGcucnVuKCkpKQorZGlmZiAtLWdpdCBh L3NldHVwL21haW4ucHkgYi9zZXR1cC9tYWluLnB5CitpbmRleCAxZDg5ZjNkLi4xYmM5Y2ZiIDEw MDY0NAorLS0tIGEvc2V0dXAvbWFpbi5weQorKysrIGIvc2V0dXAvbWFpbi5weQorQEAgLTcwLDEw ICs3MCwxMiBAQCBjbGFzcyBTZXR1cChvYmplY3QpOgorICAgICBkZWYgX19pbml0X18oc2VsZik6 CisgICAgICAgICBzdXBlcihTZXR1cCwgc2VsZikuX19pbml0X18oKQorIAorLSAgICAgICAgc2Vs Zi5fX3NldHRpbmdzX2dlbmVyYWwgPSBHaW8uU2V0dGluZ3MoIm9yZy5mcmVlZGVza3RvcC5pYnVz LmdlbmVyYWwiKTsKKysgICAgICAgIHNlbGYuX19zZXR0aW5nc19nZW5lcmFsID0gR2lvLlNldHRp bmdzKAorKyAgICAgICAgICAgICAgICBzY2hlbWEgPSAib3JnLmZyZWVkZXNrdG9wLmlidXMuZ2Vu ZXJhbCIpOworICAgICAgICAgc2VsZi5fX3NldHRpbmdzX2hvdGtleSA9IEdpby5TZXR0aW5ncygK Ky0gICAgICAgICAgICAgICAgIm9yZy5mcmVlZGVza3RvcC5pYnVzLmdlbmVyYWwuaG90a2V5Iik7 CistICAgICAgICBzZWxmLl9fc2V0dGluZ3NfcGFuZWwgPSBHaW8uU2V0dGluZ3MoIm9yZy5mcmVl ZGVza3RvcC5pYnVzLnBhbmVsIik7CisrICAgICAgICAgICAgICAgIHNjaGVtYSA9ICJvcmcuZnJl ZWRlc2t0b3AuaWJ1cy5nZW5lcmFsLmhvdGtleSIpOworKyAgICAgICAgc2VsZi5fX3NldHRpbmdz X3BhbmVsID0gR2lvLlNldHRpbmdzKAorKyAgICAgICAgICAgICAgICBzY2hlbWEgPSAib3JnLmZy ZWVkZXNrdG9wLmlidXMucGFuZWwiKTsKKyAKKyAgICAgICAgICMgSUJ1cy5CdXMoKSBjYWxscyBp YnVzX2J1c19uZXcoKS4KKyAgICAgICAgICMgR3RrLkJ1aWxkZXIoKS5hZGRfZnJvbV9maWxlKCkg YWxzbyBjYWxscyBpYnVzX2J1c19uZXdfYXN5bmMoKQorQEAgLTMwMCw3ICszMDIsNyBAQCBjbGFz cyBTZXR1cChvYmplY3QpOgorICAgICBkZWYgX19idXR0b25fZW5naW5lX2Fib3V0X2NiKHNlbGYs IGJ1dHRvbik6CisgICAgICAgICBlbmdpbmUgPSBzZWxmLl9fdHJlZXZpZXcuZ2V0X2FjdGl2ZV9l bmdpbmUoKQorICAgICAgICAgaWYgZW5naW5lOgorLSAgICAgICAgICAgIGFib3V0ID0gRW5naW5l QWJvdXQoZW5naW5lKQorKyAgICAgICAgICAgIGFib3V0ID0gRW5naW5lQWJvdXQoZW5naW5lID0g ZW5naW5lLCB0cmFuc2llbnRfZm9yID0gc2VsZi5fX3dpbmRvdykKKyAgICAgICAgICAgICBhYm91 dC5ydW4oKQorICAgICAgICAgICAgIGFib3V0LmRlc3Ryb3koKQorIAorQEAgLTMyOCw3ICszMzAs NyBAQCBjbGFzcyBTZXR1cChvYmplY3QpOgorICAgICAgICAgICAgIHJldHVybgorIAorICAgICAg ICAgbWVzc2FnZSA9IF8oIlRoZSBJQnVzIGRhZW1vbiBpcyBub3QgcnVubmluZy4gRG8geW91IHdp c2ggdG8gc3RhcnQgaXQ/IikKKy0gICAgICAgIGRsZyA9IEd0ay5NZXNzYWdlRGlhbG9nKHR5cGUg PSBHdGsuTWVzc2FnZVR5cGUuUVVFU1RJT04sCisrICAgICAgICBkbGcgPSBHdGsuTWVzc2FnZURp YWxvZyhtZXNzYWdlX3R5cGUgPSBHdGsuTWVzc2FnZVR5cGUuUVVFU1RJT04sCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBidXR0b25zID0gR3RrLkJ1dHRvbnNUeXBlLllFU19OTywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRleHQgPSBtZXNzYWdlKQorICAgICAg ICAgaWQgPSBkbGcucnVuKCkKK0BAIC0zNTQsNyArMzU2LDcgQEAgY2xhc3MgU2V0dXAob2JqZWN0 KToKKyAgICAgICAgICAgICAgICAgIiAgZXhwb3J0IFhNT0RJRklFUlM9QGltPWlidXNcbiIKKyAg ICAgICAgICAgICAgICAgIiAgZXhwb3J0IFFUX0lNX01PRFVMRT1pYnVzIgorICAgICAgICAgICAg ICAgICApCistICAgICAgICAgICAgZGxnID0gR3RrLk1lc3NhZ2VEaWFsb2codHlwZSA9IEd0ay5N ZXNzYWdlVHlwZS5JTkZPLAorKyAgICAgICAgICAgIGRsZyA9IEd0ay5NZXNzYWdlRGlhbG9nKG1l c3NhZ2VfdHlwZSA9IEd0ay5NZXNzYWdlVHlwZS5JTkZPLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGJ1dHRvbnMgPSBHdGsuQnV0dG9uc1R5cGUuT0ssCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdGV4dCA9IG1lc3NhZ2UpCisgICAgICAgICAgICAg aWQgPSBkbGcucnVuKCkKK0BAIC0zNjMsNyArMzY1LDcgQEAgY2xhc3MgU2V0dXAob2JqZWN0KToK KyAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgIyBUcmFuc2xhdG9yczogJWQgPT0gNSBjdXJy ZW50bHkKKyAgICAgICAgICAgICBtZXNzYWdlID0gXygiSUJ1cyBkYWVtb24gY291bGQgbm90IGJl IHN0YXJ0ZWQgaW4gJWQgc2Vjb25kcyIpCistICAgICAgICAgICAgZGxnID0gR3RrLk1lc3NhZ2VE aWFsb2codHlwZSA9IEd0ay5NZXNzYWdlVHlwZS5JTkZPLAorKyAgICAgICAgICAgIGRsZyA9IEd0 ay5NZXNzYWdlRGlhbG9nKG1lc3NhZ2VfdHlwZSA9IEd0ay5NZXNzYWdlVHlwZS5JTkZPLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ1dHRvbnMgPSBHdGsuQnV0dG9uc1R5 cGUuT0ssCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGV4dCA9IG1lc3Nh Z2UgJSB0aW1lb3V0KQorICAgICAgICAgICAgIGlkID0gZGxnLnJ1bigpCitAQCAtMzc4LDcgKzM4 MCw5IEBAIGNsYXNzIFNldHVwKG9iamVjdCk6CisgICAgICAgICAjIFRyYW5zbGF0b3JzOiBUaXRs ZSBvZiB0aGUgd2luZG93CisgICAgICAgICB0aXRsZTIgPSBfKCJzd2l0Y2hpbmcgaW5wdXQgbWV0 aG9kcyIpCisgICAgICAgICB0aXRsZSA9IHRpdGxlMSAlIHRpdGxlMgorLSAgICAgICAgZGlhbG9n ID0ga2V5Ym9hcmRzaG9ydGN1dC5LZXlib2FyZFNob3J0Y3V0U2VsZWN0aW9uRGlhbG9nKGJ1dHRv bnMgPSBidXR0b25zLCB0aXRsZSA9IHRpdGxlKQorKyAgICAgICAgZGlhbG9nID0ga2V5Ym9hcmRz aG9ydGN1dC5LZXlib2FyZFNob3J0Y3V0U2VsZWN0aW9uRGlhbG9nKAorKyAgICAgICAgICAgICAg ICB0aXRsZSA9IHRpdGxlLCB0cmFuc2llbnRfZm9yID0gc2VsZi5fX3dpbmRvdykKKysgICAgICAg IGRpYWxvZy5hZGRfYnV0dG9ucygqYnV0dG9ucykKKyAgICAgICAgIHRleHQgPSBlbnRyeS5nZXRf dGV4dCgpCisgICAgICAgICBpZiB0ZXh0OgorICAgICAgICAgICAgIHNob3J0Y3V0cyA9IHRleHQu c3BsaXQoIjsgIikKK0BAIC00MDksOSArNDEzLDEwIEBAIGNsYXNzIFNldHVwKG9iamVjdCk6Cisg ICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgICBzZWxmLl9fYnVzLnJlZ2lzdGVyX3N0 YXJ0X2VuZ2luZShkYXRhW0RBVEFfTEFOR10sIGRhdGFbREFUQV9OQU1FXSkKKyAgICAgICAgICAg ICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CistICAgICAgICAgICAgICAgIGRsZyA9IEd0ay5NZXNz YWdlRGlhbG9nKHR5cGUgPSBHdGsuTWVzc2FnZVR5cGUuRVJST1IsCisrICAgICAgICAgICAgICAg IGRsZyA9IEd0ay5NZXNzYWdlRGlhbG9nKG1lc3NhZ2VfdHlwZSA9IEd0ay5NZXNzYWdlVHlwZS5F UlJPUiwKKysgICAgICAgICAgICAgICAgICAgICAgICB0cmFuc2llbnRfZm9yID0gc2VsZi5fX3dp bmRvdywKKyAgICAgICAgICAgICAgICAgICAgICAgICBidXR0b25zID0gR3RrLkJ1dHRvbnNUeXBl LkNMT1NFLAorLSAgICAgICAgICAgICAgICAgICAgICAgIG1lc3NhZ2VfZm9ybWF0ID0gc3RyKGUp KQorKyAgICAgICAgICAgICAgICAgICAgICAgIHRleHQgPSBzdHIoZSkpCisgICAgICAgICAgICAg ICAgIGRsZy5ydW4oKQorICAgICAgICAgICAgICAgICBkbGcuZGVzdHJveSgpCisgICAgICAgICAg ICAgICAgIHNlbGYuX19mbHVzaF9ndGtfZXZlbnRzKCkKK0BAIC00MjAsOSArNDI1LDEwIEBAIGNs YXNzIFNldHVwKG9iamVjdCk6CisgICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgICBz ZWxmLl9fYnVzLnJlZ2lzdGVyX3N0b3BfZW5naW5lKGRhdGFbREFUQV9MQU5HXSwgZGF0YVtEQVRB X05BTUVdKQorICAgICAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKKy0gICAgICAgICAg ICAgICAgZGxnID0gR3RrLk1lc3NhZ2VEaWFsb2codHlwZSA9IEd0ay5NZXNzYWdlVHlwZS5FUlJP UiwKKysgICAgICAgICAgICAgICAgZGxnID0gR3RrLk1lc3NhZ2VEaWFsb2cobWVzc2FnZV90eXBl ID0gR3RrLk1lc3NhZ2VUeXBlLkVSUk9SLAorKyAgICAgICAgICAgICAgICAgICAgICAgIHRyYW5z aWVudF9mb3IgPSBzZWxmLl9fd2luZG93LAorICAgICAgICAgICAgICAgICAgICAgICAgIGJ1dHRv bnMgPSBHdGsuQnV0dG9uc1R5cGUuQ0xPU0UsCistICAgICAgICAgICAgICAgICAgICAgICAgbWVz c2FnZV9mb3JtYXQgPSBzdHIoZSkpCisrICAgICAgICAgICAgICAgICAgICAgICAgdGV4dCA9IHN0 cihlKSkKKyAgICAgICAgICAgICAgICAgZGxnLnJ1bigpCisgICAgICAgICAgICAgICAgIGRsZy5k ZXN0cm95KCkKKyAgICAgICAgICAgICAgICAgc2VsZi5fX2ZsdXNoX2d0a19ldmVudHMoKQorZGlm ZiAtLWdpdCBhL3NldHVwL3NldHVwLnVpIGIvc2V0dXAvc2V0dXAudWkKK2luZGV4IGJiNzg0MzMu LmQ3ODAxZWEgMTAwNjQ0CistLS0gYS9zZXR1cC9zZXR1cC51aQorKysrIGIvc2V0dXAvc2V0dXAu dWkKK0BAIC02Miw2ICs2Miw4IEBACisgICAgIDxwcm9wZXJ0eSBuYW1lPSJyZXNpemFibGUiPkZh bHNlPC9wcm9wZXJ0eT4KKyAgICAgPHByb3BlcnR5IG5hbWU9IndpbmRvd19wb3NpdGlvbiI+Y2Vu dGVyLWFsd2F5czwvcHJvcGVydHk+CisgICAgIDxwcm9wZXJ0eSBuYW1lPSJpY29uX25hbWUiPmli dXMtc2V0dXA8L3Byb3BlcnR5PgorKyAgICA8IS0tIGZvciBHdGtGb250Q2hvb3NlckRpYWxvZyAt LT4KKysgICAgPHByb3BlcnR5IG5hbWU9Im1vZGFsIj5UcnVlPC9wcm9wZXJ0eT4KKyAgICAgPGNo aWxkPgorICAgICAgIDxvYmplY3QgY2xhc3M9Ikd0a0JveCIgaWQ9InZib3gxIj4KKyAgICAgICAg IDxwcm9wZXJ0eSBuYW1lPSJvcmllbnRhdGlvbiI+dmVydGljYWw8L3Byb3BlcnR5PgorLS0gCisx LjguNS4zCisKK0Zyb20gYjFiNGUyOTQ2NjgyZTNkNTNhYTM5NmQ4NDY5YzdmYTE2YTJkYmNhOCBN b24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IGZ1aml3YXJhdCA8dGFrYW8uZnVqaXdhcmEx QGdtYWlsLmNvbT4KK0RhdGU6IEZyaSwgMTEgSnVsIDIwMTQgMTE6NTA6MDQgKzA5MDAKK1N1Ympl Y3Q6IFtQQVRDSF0gRXhwb3J0IHRoZSAnSUJVU19TRVRVUF9YSUQnIGVudmlyb25tZW50IHZhcmlh YmxlIGZvciBlYWNoCisgZW5naW5lIHNldHVwLgorCitGb2xsb3cgR05PTUVfQ09OVFJPTF9DRU5U RVJfWElELgoraHR0cHM6Ly93aWtpLmdub21lLm9yZy9BbGxhbkRheS9JTUVHdWlkZWxpbmVzCisK K1RFU1Q9c2V0dXAKKworUmV2aWV3IFVSTDogaHR0cHM6Ly9jb2RlcmV2aWV3LmFwcHNwb3QuY29t LzExMjkyMDA0NAorLS0tCisgc2V0dXAvbWFpbi5weSB8IDYgKysrKysrCisgMSBmaWxlIGNoYW5n ZWQsIDYgaW5zZXJ0aW9ucygrKQorCitkaWZmIC0tZ2l0IGEvc2V0dXAvbWFpbi5weSBiL3NldHVw L21haW4ucHkKK2luZGV4IDFiYzljZmIuLmU0ZGRkNDUgMTAwNjQ0CistLS0gYS9zZXR1cC9tYWlu LnB5CisrKysgYi9zZXR1cC9tYWluLnB5CitAQCAtMjgsNiArMjgsNyBAQCBpbXBvcnQgc2lnbmFs CisgaW1wb3J0IHN5cworIGltcG9ydCB0aW1lCisgCisrZnJvbSBnaS5yZXBvc2l0b3J5IGltcG9y dCBHZGtYMTEKKyBmcm9tIGdpLnJlcG9zaXRvcnkgaW1wb3J0IEdpbworIGZyb20gZ2kucmVwb3Np dG9yeSBpbXBvcnQgR0xpYgorIGZyb20gZ2kucmVwb3NpdG9yeSBpbXBvcnQgR3RrCitAQCAtMjMz LDYgKzIzNCw3IEBAIGNsYXNzIFNldHVwKG9iamVjdCk6CisgICAgICAgICAjIGFkZCBpY29uIHNl YXJjaCBwYXRoCisgICAgICAgICBzZWxmLl9fd2luZG93ID0gc2VsZi5fX2J1aWxkZXIuZ2V0X29i amVjdCgid2luZG93X3ByZWZlcmVuY2VzIikKKyAgICAgICAgIHNlbGYuX193aW5kb3cuY29ubmVj dCgiZGVsZXRlLWV2ZW50IiwgR3RrLm1haW5fcXVpdCkKKysgICAgICAgIHNlbGYuX193aW5kb3cu Y29ubmVjdCgibm90aWZ5Ojp3aW5kb3ciLCBzZWxmLl9fZ2RrX3dpbmRvd19zZXRfY2IpCisgCisg ICAgICAgICBzZWxmLl9fYnV0dG9uX2Nsb3NlID0gc2VsZi5fX2J1aWxkZXIuZ2V0X29iamVjdCgi YnV0dG9uX2Nsb3NlIikKKyAgICAgICAgIHNlbGYuX19idXR0b25fY2xvc2UuY29ubmVjdCgiY2xp Y2tlZCIsIEd0ay5tYWluX3F1aXQpCitAQCAtMjQ4LDYgKzI1MCwxMCBAQCBjbGFzcyBTZXR1cChv YmplY3QpOgorICAgICAgICAgc2VsZi5fX2luaXRfcGFuZWwoKQorICAgICAgICAgc2VsZi5fX2lu aXRfZ2VuZXJhbCgpCisgCisrICAgIGRlZiBfX2dka193aW5kb3dfc2V0X2NiKHNlbGYsIG9iamVj dCwgcHNwZWMpOgorKyAgICAgICAgc3RyID0gJyV1JyAlIEdka1gxMS5YMTFXaW5kb3cuZ2V0X3hp ZChvYmplY3QuZ2V0X3dpbmRvdygpKQorKyAgICAgICAgR0xpYi5zZXRlbnYoJ0lCVVNfU0VUVVBf WElEJywgc3RyLCBUcnVlKQorKworICAgICBkZWYgX19jb21ib2JveF9ub3RpZnlfYWN0aXZlX2Vu Z2luZV9jYihzZWxmLCBjb21ib2JveCwgcHJvcGVydHkpOgorICAgICAgICAgZW5naW5lID0gc2Vs Zi5fX2NvbWJvYm94LmdldF9hY3RpdmVfZW5naW5lKCkKKyAgICAgICAgIGJ1dHRvbiA9IHNlbGYu X19idWlsZGVyLmdldF9vYmplY3QoImJ1dHRvbl9lbmdpbmVfYWRkIikKKy0tIAorMS44LjUuMwor CitGcm9tIDliMjAwNGVmY2QyNmUxMWJiZDU2Y2Y1MTY1NmZlMzI2ZmMxMWJlOGUgTW9uIFNlcCAx NyAwMDowMDowMCAyMDAxCitGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5j b20+CitEYXRlOiBNb24sIDE0IEp1bCAyMDE0IDExOjQ1OjI1ICswOTAwCitTdWJqZWN0OiBbUEFU Q0hdIENhbGwgR0xpYi5zZXRfcHJnbmFtZSgnaWJ1cy1zZXR1cCcpIGZvciBpYnVzLXNldHVwCisg bWFpbi5weQorCitURVNUPXhsc2NsaWVudHMKKworUmV2aWV3IFVSTDogaHR0cHM6Ly9jb2RlcmV2 aWV3LmFwcHNwb3QuY29tLzEwODU1MDA0MworLS0tCisgc2V0dXAvbWFpbi5weSB8IDYgKysrKyst CisgMSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQorCitkaWZm IC0tZ2l0IGEvc2V0dXAvbWFpbi5weSBiL3NldHVwL21haW4ucHkKK2luZGV4IGU0ZGRkNDUuLjli ZDBhZjEgMTAwNjQ0CistLS0gYS9zZXR1cC9tYWluLnB5CisrKysgYi9zZXR1cC9tYWluLnB5CitA QCAtMjgsOSArMjgsMTMgQEAgaW1wb3J0IHNpZ25hbAorIGltcG9ydCBzeXMKKyBpbXBvcnQgdGlt ZQorIAorK2Zyb20gZ2kucmVwb3NpdG9yeSBpbXBvcnQgR0xpYgorKyMgc2V0X3ByZ25hbWUgYmVm b3JlIGltcG9ydGluZyBvdGhlciBtb2R1bGVzIHRvIHNob3cgdGhlIG5hbWUgaW4gd2FybmluZwor KyMgbWVzc2FnZXMgd2hlbiBpbXBvcnQgbW9kdWxlcyBhcmUgZmFpbGVkLgorK0dMaWIuc2V0X3By Z25hbWUoJ2lidXMtc2V0dXAnKQorKworIGZyb20gZ2kucmVwb3NpdG9yeSBpbXBvcnQgR2RrWDEx CisgZnJvbSBnaS5yZXBvc2l0b3J5IGltcG9ydCBHaW8KKy1mcm9tIGdpLnJlcG9zaXRvcnkgaW1w b3J0IEdMaWIKKyBmcm9tIGdpLnJlcG9zaXRvcnkgaW1wb3J0IEd0aworIGZyb20gZ2kucmVwb3Np dG9yeSBpbXBvcnQgSUJ1cworIGZyb20gb3MgaW1wb3J0IHBhdGgKKy0tIAorMS44LjUuMworCgpk aWZmIC0tZ2l0IGEvaWJ1cy14eC1zZXR1cC1mcmVxdWVudC1sYW5nLnBhdGNoIGIvaWJ1cy14eC1z ZXR1cC1mcmVxdWVudC1sYW5nLnBhdGNoCmluZGV4IGY5NjQzMGEuLjM1NjAwYzkgMTAwNjQ0Ci0t LSBhL2lidXMteHgtc2V0dXAtZnJlcXVlbnQtbGFuZy5wYXRjaAorKysgYi9pYnVzLXh4LXNldHVw LWZyZXF1ZW50LWxhbmcucGF0Y2gKQEAgLTEsNiArMSw2IEBACi1Gcm9tIDZjNWI0ZjE5N2FmZGU1 MTg1YzIzZWQ3MjVlZWNiMzZkYTQzNTA3ZTYgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9t IDc5NTg3ZjE4Nzk5OGI2ZTg5YzQ3OGFjMjNjN2RiY2JhNTZhOTE2MzcgTW9uIFNlcCAxNyAwMDow MDowMCAyMDAxCiBGcm9tOiBmdWppd2FyYXQgPHRha2FvLmZ1aml3YXJhMUBnbWFpbC5jb20+Ci1E YXRlOiBUdWUsIDE0IEphbiAyMDE0IDE1OjMwOjU0ICswOTAwCitEYXRlOiBNb24sIDE0IEp1bCAy MDE0IDE2OjIxOjE5ICswOTAwCiBTdWJqZWN0OiBbUEFUQ0hdIEVuYWJsZSBpYnVzLXNldHVwIHRv IHNob3cgdGhlIGZyZXF1ZW50bHkgdXNlZCBsYW5ndWFnZXMKICBvbmx5IGluIElNRSBsaXN0Lgog CkBAIC0xMCw3ICsxMCw3IEBAIFN1YmplY3Q6IFtQQVRDSF0gRW5hYmxlIGlidXMtc2V0dXAgdG8g c2hvdyB0aGUgZnJlcXVlbnRseSB1c2VkIGxhbmd1YWdlcwogIDIgZmlsZXMgY2hhbmdlZCwgMjky IGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygtKQogCiBkaWZmIC0tZ2l0IGEvZGF0YS9pYnVz LnNjaGVtYXMuaW4gYi9kYXRhL2lidXMuc2NoZW1hcy5pbgotaW5kZXggMjhkMjIxOS4uMDYwMDEz MyAxMDA2NDQKK2luZGV4IDllZTBiMWEuLmM2MzhlN2QgMTAwNjQ0CiAtLS0gYS9kYXRhL2lidXMu c2NoZW1hcy5pbgogKysrIGIvZGF0YS9pYnVzLnNjaGVtYXMuaW4KIEBAIC0zODQsNiArMzg0LDE3 NCBAQCBzZSxzaSxzayxzeSxzeShrdSksdGgsdGosdHIsdWEsdXosdm4KQEAgLTE4OSw3ICsxODks NyBAQCBpbmRleCAyOGQyMjE5Li4wNjAwMTMzIDEwMDY0NAogICAgICAgIDxhcHBseXRvPi9kZXNr dG9wL2lidXMvcGFuZWwvY3VzdG9tX2ZvbnQ8L2FwcGx5dG8+CiAgICAgICAgPG93bmVyPmlidXM8 L293bmVyPgogZGlmZiAtLWdpdCBhL3NldHVwL2VuZ2luZWNvbWJvYm94LnB5IGIvc2V0dXAvZW5n aW5lY29tYm9ib3gucHkKLWluZGV4IGI0NWFkNTYuLjgzMGYwZTggMTAwNjQ0CitpbmRleCAyYTJh Njc3Li5hMjAzYjI1IDEwMDY0NAogLS0tIGEvc2V0dXAvZW5naW5lY29tYm9ib3gucHkKICsrKyBi L3NldHVwL2VuZ2luZWNvbWJvYm94LnB5CiBAQCAtMjQsNiArMjQsNyBAQCBpbXBvcnQgbG9jYWxl CkBAIC0yMDcsNyArMjA3LDcgQEAgaW5kZXggYjQ1YWQ1Ni4uODMwZjBlOCAxMDA2NDQKICsgICAg ICAgIHNlbGYuX19hbGxfbW9kZWwgPSBOb25lCiArICAgICAgICBzZWxmLl9fc2hvd19zdWJfbGFu ZyA9IEZhbHNlCiArICAgICAgICBzZWxmLl9fc2V0dGluZ3NfeGtibGF5b3V0Y29uZmlnID0gR2lv LlNldHRpbmdzKAotKyAgICAgICAgICAgICAgICAib3JnLmZyZWVkZXNrdG9wLmlidXMuZ2VuZXJh bC54a2JsYXlvdXRjb25maWciKTsKKysgICAgICAgICAgICAgICAgc2NoZW1hID0gIm9yZy5mcmVl ZGVza3RvcC5pYnVzLmdlbmVyYWwueGtibGF5b3V0Y29uZmlnIik7CiAgCiAgICAgICAgICByZW5k ZXJlciA9IEd0ay5DZWxsUmVuZGVyZXJQaXhidWYoKQogICAgICAgICAgcmVuZGVyZXIuc2V0X3By b3BlcnR5KCJ4YWxpZ24iLCAwKQpAQCAtMjE3LDE3ICsyMTcsNiBAQCBpbmRleCBiNDVhZDU2Li44 MzBmMGU4IDEwMDY0NAogIAogLSAgICBkZWYgc2V0X2VuZ2luZXMoc2VsZiwgZW5naW5lcyk6CiAt ICAgICAgICBzZWxmLl9fbW9kZWwgPSBHdGsuVHJlZVN0b3JlKG9iamVjdCkKLS0KLS0gICAgICAg IGl0ZXIxID0gc2VsZi5fX21vZGVsLmFwcGVuZChOb25lKQotLSAgICAgICAgc2VsZi5fX21vZGVs LnNldChpdGVyMSwgMCwgMCkKLS0gICAgICAgIGxhbmdzID0ge30KLS0gICAgICAgIGZvciBlIGlu IGVuZ2luZXM6Ci0tICAgICAgICAgICAgbCA9IElCdXMuZ2V0X2xhbmd1YWdlX25hbWUoZS5nZXRf bGFuZ3VhZ2UoKSkKLS0gICAgICAgICAgICBpZiBsID09IE5vbmU6Ci0tICAgICAgICAgICAgICAg IGwgPSAiIgotLSAgICAgICAgICAgIGlmIGwgbm90IGluIGxhbmdzOgotLSAgICAgICAgICAgICAg ICBsYW5nc1tsXSA9IFtdCi0tICAgICAgICAgICAgbGFuZ3NbbF0uYXBwZW5kKGUpCiArICAgIGRl ZiBfX2djb25mX2dldF9sYW5nX2xpc3RfZnJvbV9sb2NhbGUoc2VsZik6CiArICAgICAgICBjb21t b25fbGlzdCA9IFsnZW4nLCAnT3RoZXInXQogKyAgICAgICAgbG9jID0gTm9uZQpAQCAtMjU2LDcg KzI0NSwxNyBAQCBpbmRleCBiNDVhZDU2Li44MzBmMGU4IDEwMDY0NAogKyAgICAgICAgaWYgbGFu Z19saXN0ID09IE5vbmU6CiArICAgICAgICAgICAgcmV0dXJuIFtsb2NdICsgY29tbW9uX2xpc3QK ICsgICAgICAgIHJldHVybiBsYW5nX2xpc3QgKyBjb21tb25fbGlzdAotKworIAorLSAgICAgICAg aXRlcjEgPSBzZWxmLl9fbW9kZWwuYXBwZW5kKE5vbmUpCistICAgICAgICBzZWxmLl9fbW9kZWwu c2V0KGl0ZXIxLCAwLCAwKQorLSAgICAgICAgbGFuZ3MgPSB7fQorLSAgICAgICAgZm9yIGUgaW4g ZW5naW5lczoKKy0gICAgICAgICAgICBsID0gSUJ1cy5nZXRfbGFuZ3VhZ2VfbmFtZShlLmdldF9s YW5ndWFnZSgpKQorLSAgICAgICAgICAgIGlmIGwgPT0gTm9uZToKKy0gICAgICAgICAgICAgICAg bCA9ICIiCistICAgICAgICAgICAgaWYgbCBub3QgaW4gbGFuZ3M6CistICAgICAgICAgICAgICAg IGxhbmdzW2xdID0gW10KKy0gICAgICAgICAgICBsYW5nc1tsXS5hcHBlbmQoZSkKICsgICAgZGVm IF9faGFzX2VuZ2luZV9pbl9sYW5nX2xpc3Qoc2VsZiwgZW5naW5lLCBsYW5nX2xpc3QpOgogKyAg ICAgICAgcmV0dmFsID0gRmFsc2UKICsgICAgICAgIGZvciBsYW5nIGluIGxhbmdfbGlzdDoKQEAg LTQxMCw1ICs0MDksNSBAQCBpbmRleCBiNDVhZDU2Li44MzBmMGU4IDEwMDY0NAogICAgICAgICAg ICAgIHJhaXNlIEF0dHJpYnV0ZUVycm9yKCd1bmtub3duIHByb3BlcnR5ICVzJyAlIHByb3BlcnR5 Lm5hbWUpCiAgCiAtLSAKLTEuOC4wCisxLjguNS4zCiAKCmRpZmYgLS1naXQgYS9pYnVzLnNwZWMg Yi9pYnVzLnNwZWMKaW5kZXggYzdmNzRjOS4uZmZjOTlmNiAxMDA2NDQKLS0tIGEvaWJ1cy5zcGVj CisrKyBiL2lidXMuc3BlYwpAQCAtMzYsNyArMzYsNyBAQAogCiBOYW1lOiAgICAgICAgICAgaWJ1 cwogVmVyc2lvbjogICAgICAgIDEuNS43Ci1SZWxlYXNlOiAgICAgICAgNSV7P2Rpc3R9CitSZWxl YXNlOiAgICAgICAgNiV7P2Rpc3R9CiBTdW1tYXJ5OiAgICAgICAgSW50ZWxsaWdlbnQgSW5wdXQg QnVzIGZvciBMaW51eCBPUwogTGljZW5zZTogICAgICAgIExHUEx2MisKIEdyb3VwOiAgICAgICAg ICBTeXN0ZW0gRW52aXJvbm1lbnQvTGlicmFyaWVzCkBAIC00NjYsNiArNDY2LDEzIEBAIGZpCiAl e19kYXRhZGlyfS9ndGstZG9jL2h0bWwvKgogCiAlY2hhbmdlbG9nCisqIE1vbiBKdWwgMTQgMjAx NCBUYWthbyBGdWppd2FyYSA8dGZ1aml3YXJAcmVkaGF0LmNvbT4gLSAxLjUuNy02CistIFVwZGF0 ZWQgaWJ1cy1IRUFELnBhdGNoIGZyb20gdXBzdHJlYW0uCisgIEZpeGVkIGlidXMtc2V0dXAgU0VH ViB3aGVuIGFuIGVuZ2luZSBpcyBzZWxlY3RlZC4KKyAgRml4ZWQgaWJ1cy1zZXR1cCBkZXByZWNh dGVkIHdhcm5pbmdzIHdpdGggdGhlIGxhdGVzdCBweXRob24zLWdvYmplY3QuCisgIEludGVncmF0 ZWQgdGhlICdJQlVTX1NFVFVQX1hJRCcgZW52aXJvbm1lbnQgdmFyaWFibGUgZm9yIGVhY2ggZW5n aW5lIHNldHVwLgorICBTZXQgcHJnbmFtZSAnaWJ1cy1zZXR1cCcgZm9yIGlidXMtc2V0dXAuCisK ICogTW9uIEp1bCAwNyAyMDE0IFRha2FvIEZ1aml3YXJhIDx0ZnVqaXdhckByZWRoYXQuY29tPiAt IDEuNS43LTUKIC0gVXBkYXRlZCBpYnVzLUhFQUQucGF0Y2ggZnJvbSB1cHN0cmVhbS4KICAgQWRk ZWQgcGwocXdlcnR6KS4K