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: Adam Williamson To: git-commits@fedoraproject.org Subject: [rpms/rust-bootupd] f45: Revert PR #1139 to fix UEFI ostree installs Date: Mon, 14 Sep 2026 09:34:38 GMT Message-ID: <178937847837.1.3745856623610862474.rpms-rust-bootupd-4ddb90682216@fedoraproject.org> List-ID: X-Git-Repo: rpms/rust-bootupd X-Git-Branch: f45 X-Git-Rev: 4ddb9068221689f572b7ceef9b16392b7058171b ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvcnVzdC1ib290dXBkCiAgICAgICAgICAgIEJyYW5jaCA6IGY0NQogICAgICAg ICAgICBDb21taXQgOiA0ZGRiOTA2ODIyMTY4OWY1NzJiN2NlZWY5YjE2MzkyYjcwNTgxNzFiCiAg ICAgICAgICAgIEF1dGhvciA6IEFkYW0gV2lsbGlhbXNvbiA8YXdpbGxpYW1AcmVkaGF0LmNvbT4K ICAgICAgICAgICAgRGF0ZSAgIDogMjAyNi0wOC0yMVQyMDo1OTowNS0wNzowMAogICAgICAgICAg ICBTdGF0cyAgOiArNTI4Ly0wIGluIDUgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRw czovL3NyYy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL3J1c3QtYm9vdHVwZC9jLzRkZGI5MDY4MjIx Njg5ZjU3MmI3Y2VlZjliMTYzOTJiNzA1ODE3MWI/YnJhbmNoPWY0NQoKICAgICAgICAgICAgTG9n OgogICAgICAgICAgICBSZXZlcnQgUFIgIzExMzkgdG8gZml4IFVFRkkgb3N0cmVlIGluc3RhbGxz CgpTZWUgaHR0cHM6Ly9naXRodWIuY29tL2NvcmVvcy9ib290dXBkL2lzc3Vlcy8xMTM5CgotLS0K ZGlmZiAtLWdpdCBhLzAwMDEtUmV2ZXJ0LUZpeC1ncnViLXN0YXRpYy1jb25maWctaW5zdGFsbC5w YXRjaCBiLzAwMDEtUmV2ZXJ0LUZpeC1ncnViLXN0YXRpYy1jb25maWctaW5zdGFsbC5wYXRjaApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jOTc1MGZlCi0tLSAvZGV2L251bGwK KysrIGIvMDAwMS1SZXZlcnQtRml4LWdydWItc3RhdGljLWNvbmZpZy1pbnN0YWxsLnBhdGNoCkBA IC0wLDAgKzEsMTcxIEBACitGcm9tIGNkN2IyN2U2YzRkZmNkMjg4NDhmYTk4ZjE5OTgxZTlkNWFm OTQ1MWEgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBBZGFtIFdpbGxpYW1zb24gPGF3 aWxsaWFtQHJlZGhhdC5jb20+CitEYXRlOiBGcmksIDIxIEF1ZyAyMDI2IDE1OjA4OjE4IC0wNzAw CitTdWJqZWN0OiBbUEFUQ0ggMS80XSBSZXZlcnQgIkZpeCBncnViIHN0YXRpYyBjb25maWcgaW5z dGFsbCIKKworVGhpcyByZXZlcnRzIGNvbW1pdCA4ODNjN2E4ODhkMTY5OTE2NzJjZjliOWQwNmZm NzRhNGQyYjExMjk3LgorLS0tCisgc3JjL2Jpb3MucnMgICAgICAgIHwgIDIgKy0KKyBzcmMvYm9v dHVwZC5ycyAgICAgfCAyNSAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisgc3JjL2VmaS5ycyAg ICAgICAgIHwgMTEgKysrLS0tLS0tLS0KKyBzcmMvZ3J1YmNvbmZpZ3MucnMgfCAyMSArKysrKyst LS0tLS0tLS0tLS0tLS0KKyA0IGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDQ5IGRl bGV0aW9ucygtKQorCitkaWZmIC0tZ2l0IGEvc3JjL2Jpb3MucnMgYi9zcmMvYmlvcy5ycworaW5k ZXggMTI2M2Q4YS4uYTYzOGRmNiAxMDA2NDQKKy0tLSBhL3NyYy9iaW9zLnJzCisrKysgYi9zcmMv Ymlvcy5ycworQEAgLTIxMSw3ICsyMTEsNyBAQCBpbXBsIENvbXBvbmVudCBmb3IgQmlvcyB7Cisg ICAgICAgICAgICAgICAgIC5jb250ZXh0KCJGYWlsZWQgdG8gYmFja3VwIEdSVUIgY29uZmlnIik/ OworICAgICAgICAgfQorIAorLSAgICAgICAgY3JhdGU6OmdydWJjb25maWdzOjppbnN0YWxsKCZk ZXN0ZGlyLCBOb25lLCBOb25lLCB0cnVlLCBOb25lKT87CisrICAgICAgICBjcmF0ZTo6Z3J1YmNv bmZpZ3M6Omluc3RhbGwoJmRlc3RkaXIsIE5vbmUsIE5vbmUsIHRydWUpPzsKKyAKKyAgICAgICAg IC8vIFJlbW92ZSB0aGUgcmVhbCBjb25maWcgaWYgaXQgaXMgc3ltbGluayBhbmQgd2lsbCBub3QK KyAgICAgICAgIC8vIGlmIC9ib290L2dydWIyL2dydWIuY2ZnIGlzIGZpbGUKK2RpZmYgLS1naXQg YS9zcmMvYm9vdHVwZC5ycyBiL3NyYy9ib290dXBkLnJzCitpbmRleCBiZGFkOWZmLi43MjI2NmEz IDEwMDY0NAorLS0tIGEvc3JjL2Jvb3R1cGQucnMKKysrKyBiL3NyYy9ib290dXBkLnJzCitAQCAt Mjc2LDM2ICsyNzYsMTEgQEAgcHViKGNyYXRlKSBmbiBpbnN0YWxsKG9wdHM6ICZJbnN0YWxsT3B0 cywgZGV2aWNlczogJltEZXZpY2VdLCBjb25maWdzOiBDb25maWdNb2QKKyAgICAgICAgICAgICBT b21lKHV1aWQpID0+IHsKKyAgICAgICAgICAgICAgICAgbGV0IG1ldGEgPSBnZXRfc3RhdGljX2Nv bmZpZ19tZXRhKCk/OworICAgICAgICAgICAgICAgICBzdGF0ZS5zdGF0aWNfY29uZmlncyA9IFNv bWUobWV0YSk7CistCistICAgICAgICAgICAgICAgIGxldCBtdXQgZXNwX2RpciA9IE5vbmU7Cist CistICAgICAgICAgICAgICAgICNbY2ZnKGVmaV9hcmNoKV0KKy0gICAgICAgICAgICAgICAgewor LSAgICAgICAgICAgICAgICAgICAgZm9yIGMgaW4gJnRhcmdldF9jb21wb25lbnRzIHsKKy0gICAg ICAgICAgICAgICAgICAgICAgICB1c2UgY3JhdGU6OmVmaTo6RWZpOworLQorLSAgICAgICAgICAg ICAgICAgICAgICAgIGlmIGxldCBTb21lKGVmaSkgPSBjLmFzX2FueSgpLmRvd25jYXN0X3JlZjo6 PEVmaT4oKSB7CistICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxldCBtb3VudGVkX2VzcF9w YXRoID0gZWZpLmdldF9lc3BfbW91bnRwb2ludCgpOworLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBsZXQgbW91bnRlZF9lc3BfcGF0aCA9IG1vdW50ZWRfZXNwX3BhdGguYXNfcmVmKCkub2tf b3JfZWxzZSh8fCB7CistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbnlob3chKCJN b3VudGVkIEVTUCBub3QgZm91bmQgdG8gaW5zdGFsbCBzdGF0aWMgZ3J1YiBjb25maWciKQorLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICB9KT87CistCistICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGVzcF9kaXIgPSBTb21lKAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg RGlyOjpvcGVuX2FtYmllbnRfZGlyKG1vdW50ZWRfZXNwX3BhdGgsIGFtYmllbnRfYXV0aG9yaXR5 KCkpCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLmNvbnRleHQoIk9wZW5p bmcgbW91bnRlZCBFU1AgZGlyIik/LAorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICApOwor LQorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKy0gICAgICAgICAgICAgICAg ICAgICAgICB9CistICAgICAgICAgICAgICAgICAgICB9CistICAgICAgICAgICAgICAgIH0KKy0K KyAgICAgICAgICAgICAgICAgY3JhdGU6OmdydWJjb25maWdzOjppbnN0YWxsKAorICAgICAgICAg ICAgICAgICAgICAgc3lzcm9vdCwKKyAgICAgICAgICAgICAgICAgICAgIFNvbWUoJnNvdXJjZV9y b290X2RpciksCisgICAgICAgICAgICAgICAgICAgICBpbnN0YWxsZWRfZWZpX3ZlbmRvci5hc19k ZXJlZigpLAorICAgICAgICAgICAgICAgICAgICAgdXVpZCwKKy0gICAgICAgICAgICAgICAgICAg IGVzcF9kaXIuYXNfcmVmKCksCisgICAgICAgICAgICAgICAgICk/OworICAgICAgICAgICAgIH0K KyAgICAgICAgICAgICAvLyBPbiBvdGhlciBhcmNoaXRlY3R1cmVzLCBhc3N1bWUgdGhhdCB0aGVy ZSdzIG5vdGhpbmcgdG8gZG8uCitkaWZmIC0tZ2l0IGEvc3JjL2VmaS5ycyBiL3NyYy9lZmkucnMK K2luZGV4IDgzNGUzNWYuLjRjOWQyY2MgMTAwNjQ0CistLS0gYS9zcmMvZWZpLnJzCisrKysgYi9z cmMvZWZpLnJzCitAQCAtMTgxLDExICsxODEsNiBAQCBpbXBsIEVmaSB7CisgICAgICAgICB9Cisg ICAgIH0KKyAKKy0gICAgLy8vIFJldHVybnMgdGhlIEVTUCdzIG1vdW50cG9pbnQgaWYgcHJlc2Vu dAorLSAgICBwdWIoY3JhdGUpIGZuIGdldF9lc3BfbW91bnRwb2ludCgmc2VsZikgLT4gc3RkOjpj ZWxsOjpSZWY8J18sIE9wdGlvbjxQYXRoQnVmPj4geworLSAgICAgICAgc2VsZi5tb3VudHBvaW50 LmJvcnJvdygpCistICAgIH0KKy0KKyAgICAgLy8vIENoZWNrcyBpZiB3ZSBoYXZlIGFscmVhZHkg bW91bnRlZCB0aGUgRVNQCisgICAgIC8vLyBJZiBub3QsIGNoZWNrcyBpZiB0aGUgRVNQIGlzIG1v dW50ZWQgYXQgY29tbW9uIG1vdW50cG9pbnRzLCBpLmUuIC9ib290LCAvYm9vdC9lZmkKKyAgICAg Ly8vIEVsc2UsIG1vdW50cyB0aGUgRVNQIGF0IGEgdGVtcCBwYXRoCitAQCAtMzc0LDcgKzM2OSw3 IEBAIGltcGwgQ29tcG9uZW50IGZvciBFZmkgeworIAorICAgICAvLyBCYWNrdXAgIi9ib290L2Vm aS9FRkkve3ZlbmRvcn0vZ3J1Yi5jZmciIHRvICIvYm9vdC9lZmkvRUZJL3t2ZW5kb3J9L2dydWIu Y2ZnLmJhayIKKyAgICAgLy8gUmVwbGFjZSAiL2Jvb3QvZWZpL0VGSS97dmVuZG9yfS9ncnViLmNm ZyIgd2l0aCBuZXcgc3RhdGljICJncnViLmNmZyIKKy0gICAgZm4gbWlncmF0ZV9zdGF0aWNfZ3J1 Yl9jb25maWcoJnNlbGYsIHN5c3Jvb3RfcGF0aDogJnN0ciwgZGVzdF9lZmlfZGlyOiAmRGlyKSAt PiBSZXN1bHQ8KCk+IHsKKysgICAgZm4gbWlncmF0ZV9zdGF0aWNfZ3J1Yl9jb25maWcoJnNlbGYs IHN5c3Jvb3RfcGF0aDogJnN0ciwgZGVzdGRpcjogJkRpcikgLT4gUmVzdWx0PCgpPiB7CisgICAg ICAgICBsZXQgc3lzcm9vdCA9IERpcjo6b3Blbl9hbWJpZW50X2RpcihzeXNyb290X3BhdGgsIGFt YmllbnRfYXV0aG9yaXR5KCkpCisgICAgICAgICAgICAgLndpdGhfY29udGV4dCh8fCBmb3JtYXQh KCJPcGVuaW5nIHtzeXNyb290X3BhdGh9IikpPzsKKyAgICAgICAgIGxldCBTb21lKHZlbmRvcikg PSBzZWxmLmdldF9lZmlfdmVuZG9yKCZQYXRoOjpuZXcoc3lzcm9vdF9wYXRoKSk/IGVsc2Ugewor QEAgLTM4Miw3ICszNzcsNyBAQCBpbXBsIENvbXBvbmVudCBmb3IgRWZpIHsKKyAgICAgICAgIH07 CisgCisgICAgICAgICAvLyBkZXN0ZGlyIGlzIC9ib290L2VmaS9FRkkKKy0gICAgICAgIGxldCBl ZmlkaXIgPSBkZXN0X2VmaV9kaXIKKysgICAgICAgIGxldCBlZmlkaXIgPSBkZXN0ZGlyCisgICAg ICAgICAgICAgLm9wZW5fZGlyKCZ2ZW5kb3IpCisgICAgICAgICAgICAgLndpdGhfY29udGV4dCh8 fCBmb3JtYXQhKCJPcGVuaW5nIEVGSS97fSIsIHZlbmRvcikpPzsKKyAKK0BAIC0zOTcsNyArMzky LDcgQEAgaW1wbCBDb21wb25lbnQgZm9yIEVmaSB7CisgICAgICAgICAgICAgICAgIC5jb250ZXh0 KCJGYWlsZWQgdG8gYmFja3VwIEdSVUIgY29uZmlnIik/OworICAgICAgICAgfQorIAorLSAgICAg ICAgZ3J1YmNvbmZpZ3M6Omluc3RhbGwoJnN5c3Jvb3QsIE5vbmUsIFNvbWUoJnZlbmRvciksIHRy dWUsIFNvbWUoJmVmaWRpcikpPzsKKysgICAgICAgIGdydWJjb25maWdzOjppbnN0YWxsKCZzeXNy b290LCBOb25lLCBTb21lKCZ2ZW5kb3IpLCB0cnVlKT87CisgICAgICAgICAvLyBTeW5jaHJvbml6 ZSB0aGUgZmlsZXN5c3RlbSBjb250YWluaW5nIC9ib290L2VmaS9FRkkve3ZlbmRvcn0gdG8gZGlz ay4KKyAgICAgICAgIGZzZnJlZXplX3RoYXdfY3ljbGUoZWZpZGlyLnJlb3Blbl9hc19vd25lZGZk KCk/KT87CisgCitkaWZmIC0tZ2l0IGEvc3JjL2dydWJjb25maWdzLnJzIGIvc3JjL2dydWJjb25m aWdzLnJzCitpbmRleCBmMDYxODBlLi40NzZmOTM0IDEwMDY0NAorLS0tIGEvc3JjL2dydWJjb25m aWdzLnJzCisrKysgYi9zcmMvZ3J1YmNvbmZpZ3MucnMKK0BAIC0zNCw3ICszNCw2IEBAIHB1Yihj cmF0ZSkgZm4gaW5zdGFsbCgKKyAgICAgc3JjX3Jvb3Q6IE9wdGlvbjwmRGlyPiwKKyAgICAgaW5z dGFsbGVkX2VmaV92ZW5kb3I6IE9wdGlvbjwmc3RyPiwKKyAgICAgd3JpdGVfdXVpZDogYm9vbCwK Ky0gICAgbW91bnRlZF9lc3A6IE9wdGlvbjwmRGlyPiwKKyApIC0+IFJlc3VsdDwoKT4geworICAg ICBsZXQgYm9vdGRpciA9ICZ0YXJnZXRfcm9vdC5vcGVuX2RpcigiYm9vdCIpLmNvbnRleHQoIk9w ZW5pbmcgL2Jvb3QiKT87CisgICAgIGxldCBib290X2lzX21vdW50ID0geworQEAgLTQ0LDcgKzQz LDYgQEAgcHViKGNyYXRlKSBmbiBpbnN0YWxsKAorICAgICAgICAgcm9vdF9kZXYgIT0gYm9vdF9k ZXYKKyAgICAgfTsKKyAKKy0gICAgLy8gVGhpcyBpcyBpbiAvc3lzcm9vdC9ib290CisgICAgIGlm ICFib290ZGlyLmV4aXN0cyhHUlVCMkRJUikgeworICAgICAgICAgbGV0IG11dCBkaXJfb3B0aW9u cyA9IERpckJ1aWxkZXI6Om5ldygpOworICAgICAgICAgZGlyX29wdGlvbnMucmVjdXJzaXZlKHRy dWUpLm1vZGUoMG83MDApOworQEAgLTEzMiwxNiArMTMwLDE2IEBAIHB1YihjcmF0ZSkgZm4gaW5z dGFsbCgKKyAKKyAgICAgaWYgbGV0IFNvbWUodmVuZG9yZGlyKSA9IGluc3RhbGxlZF9lZmlfdmVu ZG9yIHsKKyAgICAgICAgIGxvZzo6ZGVidWchKCJ2ZW5kb3JkaXI9ezo/fSIsICZ2ZW5kb3JkaXIp OworLSAgICAgICAgbGV0IHZlbmRvciA9IFBhdGhCdWY6OmZyb20oIkVGSSIpLmpvaW4odmVuZG9y ZGlyKTsKKysgICAgICAgIGxldCB2ZW5kb3IgPSBQYXRoQnVmOjpmcm9tKHZlbmRvcmRpcik7Cisg ICAgICAgICBsZXQgdGFyZ2V0ID0gJnZlbmRvci5qb2luKCJncnViLmNmZyIpOworLQorLSAgICAg ICAgaWYgbGV0IFNvbWUoZWZpZGlyKSA9IG1vdW50ZWRfZXNwIHsKKysgICAgICAgIGxldCBkZXN0 X2VmaWRpciA9IHRhcmdldF9yb290CisrICAgICAgICAgICAgLm9wZW5fZGlyX29wdGlvbmFsKCJi b290L2VmaS9FRkkiKQorKyAgICAgICAgICAgIC5jb250ZXh0KCJPcGVuaW5nIC9ib290L2VmaS9F RkkiKT87CisrICAgICAgICBpZiBsZXQgU29tZShlZmlkaXIpID0gZGVzdF9lZmlkaXIgeworICAg ICAgICAgICAgIGNvbmZpZ2RpcgorICAgICAgICAgICAgICAgICAuY29weSgiZ3J1Yi1zdGF0aWMt ZWZpLmNmZyIsICZlZmlkaXIsIHRhcmdldCkKKyAgICAgICAgICAgICAgICAgLmNvbnRleHQoIkNv cHlpbmcgc3RhdGljIEVGSSIpPzsKKy0KKyAgICAgICAgICAgICBwcmludGxuISgiSW5zdGFsbGVk OiB7dGFyZ2V0Oj99Iik7CistCisgICAgICAgICAgICAgaWYgbGV0IFNvbWUodXVpZF9wYXRoKSA9 IHV1aWRfcGF0aCB7CisgICAgICAgICAgICAgICAgIGxldCB0YXJnZXQgPSAmdmVuZG9yLmpvaW4o dXVpZF9wYXRoKTsKKyAgICAgICAgICAgICAgICAgZ3J1YjJkaXIKK0BAIC0yMTgsMTQgKzIxNiw3 IEBAIG1vZCB0ZXN0cyB7CisgICAgICAgICBzdGQ6OmZzOjpjcmVhdGVfZGlyX2FsbCh0ZHAuam9p bigiYm9vdC9ncnViMiIpKT87CisgICAgICAgICBzdGQ6OmZzOjpjcmVhdGVfZGlyX2FsbCh0ZHAu am9pbigiYm9vdC9lZmkvRUZJL0JPT1QiKSk/OworICAgICAgICAgc3RkOjpmczo6Y3JlYXRlX2Rp cl9hbGwodGRwLmpvaW4oImJvb3QvZWZpL0VGSS9mZWRvcmEiKSk/OworLSAgICAgICAgaW5zdGFs bCgKKy0gICAgICAgICAgICAmdGQsCistICAgICAgICAgICAgTm9uZSwKKy0gICAgICAgICAgICBT b21lKCJmZWRvcmEiKSwKKy0gICAgICAgICAgICBmYWxzZSwKKy0gICAgICAgICAgICBTb21lKCZ0 ZC5vcGVuX2RpcigiYm9vdC9lZmkiKS51bndyYXAoKSksCistICAgICAgICApCistICAgICAgICAu dW53cmFwKCk7CisrICAgICAgICBpbnN0YWxsKCZ0ZCwgTm9uZSwgU29tZSgiZmVkb3JhIiksIGZh bHNlKS51bndyYXAoKTsKKyAKKyAgICAgICAgIGFzc2VydCEodGQuZXhpc3RzKCJib290L2dydWIy L2dydWIuY2ZnIikpOworICAgICAgICAgYXNzZXJ0ISh0ZC5leGlzdHMoImJvb3QvZWZpL0VGSS9m ZWRvcmEvZ3J1Yi5jZmciKSk7CistLSAKKzIuNTUuMAorCgpkaWZmIC0tZ2l0IGEvMDAwMi1SZXZl cnQtY29tcG9uZW50LUFkZC1hc19hbnktbWV0aG9kLWZvci1kb3duY2FzdGluZy5wYXRjaCBiLzAw MDItUmV2ZXJ0LWNvbXBvbmVudC1BZGQtYXNfYW55LW1ldGhvZC1mb3ItZG93bmNhc3RpbmcucGF0 Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uN2VmMjlhOQotLS0gL2Rldi9u dWxsCisrKyBiLzAwMDItUmV2ZXJ0LWNvbXBvbmVudC1BZGQtYXNfYW55LW1ldGhvZC1mb3ItZG93 bmNhc3RpbmcucGF0Y2gKQEAgLTAsMCArMSw2NiBAQAorRnJvbSBmYTc5MDVhNGM5Mjk2ZTA5YTRk YWYxMmI3M2NmNDVkZDZjMjI2MzI3IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogQWRh bSBXaWxsaWFtc29uIDxhd2lsbGlhbUByZWRoYXQuY29tPgorRGF0ZTogRnJpLCAyMSBBdWcgMjAy NiAxNTowODoyMiAtMDcwMAorU3ViamVjdDogW1BBVENIIDIvNF0gUmV2ZXJ0ICJjb21wb25lbnQ6 IEFkZCBgYXNfYW55YCBtZXRob2QgZm9yIGRvd25jYXN0aW5nIgorCitUaGlzIHJldmVydHMgY29t bWl0IGQ1OWZiMjBkYjc1YzU1M2E3NTBiNDU4MzBkZGQ2NzFjZDVjYWU3MDIuCistLS0KKyBzcmMv Ymlvcy5ycyAgICAgIHwgNCAtLS0tCisgc3JjL2NvbXBvbmVudC5ycyB8IDMgLS0tCisgc3JjL2Vm aS5ycyAgICAgICB8IDQgLS0tLQorIDMgZmlsZXMgY2hhbmdlZCwgMTEgZGVsZXRpb25zKC0pCisK K2RpZmYgLS1naXQgYS9zcmMvYmlvcy5ycyBiL3NyYy9iaW9zLnJzCitpbmRleCBhNjM4ZGY2Li4w M2EzNDA4IDEwMDY0NAorLS0tIGEvc3JjL2Jpb3MucnMKKysrKyBiL3NyYy9iaW9zLnJzCitAQCAt OTksMTAgKzk5LDYgQEAgaW1wbCBCaW9zIHsKKyB9CisgCisgaW1wbCBDb21wb25lbnQgZm9yIEJp b3MgeworLSAgICBmbiBhc19hbnkoJnNlbGYpIC0+ICZkeW4gc3RkOjphbnk6OkFueSB7CistICAg ICAgICBzZWxmCistICAgIH0KKy0KKyAgICAgZm4gbmFtZSgmc2VsZikgLT4gJidzdGF0aWMgc3Ry IHsKKyAgICAgICAgIHNlbGYuY29tcG9uZW50X3R5cGUoKS5pbnRvKCkKKyAgICAgfQorZGlmZiAt LWdpdCBhL3NyYy9jb21wb25lbnQucnMgYi9zcmMvY29tcG9uZW50LnJzCitpbmRleCA3MzA0M2Mz Li4yM2ExNGI1IDEwMDY0NAorLS0tIGEvc3JjL2NvbXBvbmVudC5ycworKysrIGIvc3JjL2NvbXBv bmVudC5ycworQEAgLTEwLDcgKzEwLDYgQEAgdXNlIGNhcF9zdGQ6OnthbWJpZW50X2F1dGhvcml0 eSwgZnM6OlBlcm1pc3Npb25zfTsKKyB1c2UgY2FwX3N0ZF9leHQ6OmRpcmV4dDo6Q2FwU3RkRXh0 RGlyRXh0OworIHVzZSBmbl9lcnJvcl9jb250ZXh0Ojpjb250ZXh0OworIHVzZSBzZXJkZTo6e0Rl c2VyaWFsaXplLCBTZXJpYWxpemV9OworLXVzZSBzdGQ6OmFueTo6QW55OworIHVzZSBzdGQ6OnBh dGg6OntQYXRoLCBQYXRoQnVmfTsKKyAKKyB1c2UgYm9vdGNfaW50ZXJuYWxfYmxvY2tkZXY6OkRl dmljZTsKK0BAIC01NCw4ICs1Myw2IEBAIGltcGwgc3RkOjpmbXQ6OkRpc3BsYXkgZm9yIENvbXBv bmVudFR5cGUgeworIC8vLyBoYW5kbGVzIGluc3RhbGxpbmcgYm9vdGxvYWRlciBmaWxlcyBkdXJp bmcgaW1hZ2UgYnVpbGRzLCBhcHBseWluZyB1cGRhdGVzIGF0IHJ1bnRpbWUsCisgLy8vIGFuZCBv cHRpb25hbGx5IGFkb3B0aW5nIGV4aXN0aW5nIGluc3RhbGxhdGlvbnMgbm90IG9yaWdpbmFsbHkg bWFuYWdlZCBieSBib290dXBkLgorIHB1YihjcmF0ZSkgdHJhaXQgQ29tcG9uZW50IHsKKy0gICAg Zm4gYXNfYW55KCZzZWxmKSAtPiAmZHluIEFueTsKKy0KKyAgICAgLy8vIFJldHVybnMgdGhlIG5h bWUgb2YgdGhlIGNvbXBvbmVudDsgdGhpcyB3aWxsIGJlIHVzZWQgZm9yIHNlcmlhbGl6YXRpb24K KyAgICAgLy8vIGFuZCBzaG91bGQgcmVtYWluIHN0YWJsZS4KKyAgICAgZm4gbmFtZSgmc2VsZikg LT4gJidzdGF0aWMgc3RyOworZGlmZiAtLWdpdCBhL3NyYy9lZmkucnMgYi9zcmMvZWZpLnJzCitp bmRleCA0YzlkMmNjLi5kMWQ5MTFjIDEwMDY0NAorLS0tIGEvc3JjL2VmaS5ycworKysrIGIvc3Jj L2VmaS5ycworQEAgLTMzMCwxMCArMzMwLDYgQEAgZm4gc2tpcF9zeXN0ZW1kX2Jvb3Rsb2FkZXJz KCkgLT4gYm9vbCB7CisgfQorIAorIGltcGwgQ29tcG9uZW50IGZvciBFZmkgeworLSAgICBmbiBh c19hbnkoJnNlbGYpIC0+ICZkeW4gc3RkOjphbnk6OkFueSB7CistICAgICAgICBzZWxmCistICAg IH0KKy0KKyAgICAgZm4gbmFtZSgmc2VsZikgLT4gJidzdGF0aWMgc3RyIHsKKyAgICAgICAgIHNl bGYuY29tcG9uZW50X3R5cGUoKS5pbnRvKCkKKyAgICAgfQorLS0gCisyLjU1LjAKKwoKZGlmZiAt LWdpdCBhLzAwMDMtUmV2ZXJ0LWVzcC1VcGRhdGUtdW5tb3VudC1tZXRob2QucGF0Y2ggYi8wMDAz LVJldmVydC1lc3AtVXBkYXRlLXVubW91bnQtbWV0aG9kLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAuLmUxNTYyNzcKLS0tIC9kZXYvbnVsbAorKysgYi8wMDAzLVJldmVy dC1lc3AtVXBkYXRlLXVubW91bnQtbWV0aG9kLnBhdGNoCkBAIC0wLDAgKzEsNzYgQEAKK0Zyb20g N2RmY2I5NGI1ODllODhmYzYxYTU4OWVlMzE4NGZkMDc1YjAxOGQ5MSBNb24gU2VwIDE3IDAwOjAw OjAwIDIwMDEKK0Zyb206IEFkYW0gV2lsbGlhbXNvbiA8YXdpbGxpYW1AcmVkaGF0LmNvbT4KK0Rh dGU6IEZyaSwgMjEgQXVnIDIwMjYgMTU6MDk6MDIgLTA3MDAKK1N1YmplY3Q6IFtQQVRDSCAzLzRd IFJldmVydCAiZXNwOiBVcGRhdGUgYHVubW91bnRgIG1ldGhvZCIKKworVGhpcyByZXZlcnRzIGNv bW1pdCA4NTA1M2E4YTcyYWFkODA4MjA5NzU2Njg3MWEwOGJmNWE5ZTRiMjcxLgorLS0tCisgc3Jj L2VmaS5ycyB8IDI4ICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0KKyAxIGZpbGUgY2hhbmdl ZCwgMjQgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3NyYy9l ZmkucnMgYi9zcmMvZWZpLnJzCitpbmRleCBkMWQ5MTFjLi43MmFjNWQ1IDEwMDY0NAorLS0tIGEv c3JjL2VmaS5ycworKysrIGIvc3JjL2VmaS5ycworQEAgLTkzLDYgKzkzLDkgQEAgcHViKGNyYXRl KSBmbiBpc19lZmlfYm9vdGVkKCkgLT4gUmVzdWx0PGJvb2w+IHsKKyAjW2Rlcml2ZShEZWZhdWx0 LCBEZWJ1ZyldCisgcHViKGNyYXRlKSBzdHJ1Y3QgRWZpIHsKKyAgICAgbW91bnRwb2ludDogUmVm Q2VsbDxPcHRpb248UGF0aEJ1Zj4+LAorKyAgICAvLy8gV2hldGhlciB0aGUgYWJvdmUgbW91bnRw b2ludCB3YXMgYWxyZWFkeSBtb3VudGVkIG9yIG5vdAorKyAgICAvLy8gV29uJ3QgdW5tb3VudCBp ZiBpdCB3YXMgYWxyZWFkeSBtb3VudGVkCisrICAgIHdhc19tb3VudGVkOiBSZWZDZWxsPGJvb2w+ LAorICAgICAvLy8gR3VhcmQgZm9yIEVTUCBtb3VudGVkIGF0IGEgdGVtcG9yYXJ5IGxvY2F0aW9u CisgICAgIHRlbXBtb3VudF9ndWFyZDogUmVmQ2VsbDxPcHRpb248VGVtcE1vdW50Pj4sCisgfQor QEAgLTE0OSw2ICsxNTIsNyBAQCBpbXBsIEVmaSB7CisgCisgICAgICAgICAvLyBPbmx5IGJvcnJv dyBtdXRhYmx5IGlmIHdlIGZvdW5kIGEgbW91bnQgcG9pbnQKKyAgICAgICAgIGxvZzo6ZGVidWch KCJSZXVzaW5nIGV4aXN0aW5nIG1vdW50IHBvaW50IHttbnQ6P30iKTsKKysgICAgICAgICpzZWxm Lndhc19tb3VudGVkLmJvcnJvd19tdXQoKSA9IHRydWU7CisgICAgICAgICAqc2VsZi5tb3VudHBv aW50LmJvcnJvd19tdXQoKSA9IFNvbWUobW50LmNsb25lKCkpOworICAgICAgICAgT2soU29tZSht bnQpKQorICAgICB9CitAQCAtMTU5LDcgKzE2Myw5IEBAIGltcGwgRWZpIHsKKyAgICAgICAgIG1h dGNoIHNlbGYuc2VhcmNoX2NvbW1vbl9lc3BfbW91bnRwb2ludHMocm9vdCk/IHsKKyAgICAgICAg ICAgICBTb21lKG1udCkgPT4geworICAgICAgICAgICAgICAgICBsb2c6OmRlYnVnISgiTW91bnRl ZCBhdCB7Oj99IiwgbW50KTsKKysgICAgICAgICAgICAgICAgKnNlbGYud2FzX21vdW50ZWQuYm9y cm93X211dCgpID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgKnNlbGYubW91bnRwb2ludC5ib3Jy b3dfbXV0KCkgPSBTb21lKG1udC5jbG9uZSgpKTsKKysKKyAgICAgICAgICAgICAgICAgT2sobW50 KQorICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICBOb25lID0+IHsKK0BAIC0xOTgsMTIgKzIw NCwyNiBAQCBpbXBsIEVmaSB7CisgICAgIH0KKyAKKyAgICAgcHViKGNyYXRlKSBmbiB1bm1vdW50 KCZzZWxmKSAtPiBSZXN1bHQ8KCk+IHsKKy0gICAgICAgIGlmIGxldCBTb21lKHRtcG1vdW50KSA9 IHNlbGYudGVtcG1vdW50X2d1YXJkLmJvcnJvd19tdXQoKS50YWtlKCkgeworLSAgICAgICAgICAg IGRyb3AodG1wbW91bnQpOworLSAgICAgICAgICAgIGxvZzo6dHJhY2UhKCJEcm9wcGVkIHRlbXBt b3VudCIpOworKyAgICAgICAgaWYgKnNlbGYud2FzX21vdW50ZWQuYm9ycm93KCkgeworKyAgICAg ICAgICAgIGxvZzo6ZGVidWchKCJNb3VudHBvaW50IHdhcyBhbHJlYWR5IG1vdW50ZWQsIHdvbid0 IHVubW91bnQiKTsKKysgICAgICAgICAgICByZXR1cm4gT2soKCkpOworICAgICAgICAgfQorIAor LSAgICAgICAgKnNlbGYubW91bnRwb2ludC5ib3Jyb3dfbXV0KCkgPSBOb25lOworKyAgICAgICAg KnNlbGYud2FzX21vdW50ZWQuYm9ycm93X211dCgpID0gZmFsc2U7CisrCisrICAgICAgICBpZiBs ZXQgU29tZShtb3VudCkgPSBzZWxmLm1vdW50cG9pbnQuYm9ycm93X211dCgpLnRha2UoKSB7Cisr ICAgICAgICAgICAgaWYgbGV0IFNvbWUodG1wbW91bnQpID0gc2VsZi50ZW1wbW91bnRfZ3VhcmQu Ym9ycm93X211dCgpLnRha2UoKSB7CisrICAgICAgICAgICAgICAgIGRyb3AodG1wbW91bnQpOwor KyAgICAgICAgICAgICAgICBsb2c6OnRyYWNlISgiRHJvcHBlZCB0ZW1wbW91bnQiKTsKKysgICAg ICAgICAgICAgICAgcmV0dXJuIE9rKCgpKTsKKysgICAgICAgICAgICB9CisrCisrICAgICAgICAg ICAgQ29tbWFuZDo6bmV3KCJ1bW91bnQiKQorKyAgICAgICAgICAgICAgICAuYXJnKCZtb3VudCkK KysgICAgICAgICAgICAgICAgLnJ1bl9pbmhlcml0ZWQoKQorKyAgICAgICAgICAgICAgICAud2l0 aF9jb250ZXh0KHx8IGZvcm1hdCEoIkZhaWxlZCB0byB1bm1vdW50IHttb3VudDo/fSIpKT87Cisr ICAgICAgICAgICAgbG9nOjp0cmFjZSEoIlVubW91bnRlZCIpOworKyAgICAgICAgfQorIAorICAg ICAgICAgT2soKCkpCisgICAgIH0KKy0tIAorMi41NS4wCisKCmRpZmYgLS1naXQgYS8wMDA0LVJl dmVydC1lc3AtVGVtcE1vdW50LUVTUC1pZi1ub3QtYWxyZWFkeS1tb3VudGVkLnBhdGNoIGIvMDAw NC1SZXZlcnQtZXNwLVRlbXBNb3VudC1FU1AtaWYtbm90LWFscmVhZHktbW91bnRlZC5wYXRjaApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41MTkyYjg5Ci0tLSAvZGV2L251bGwK KysrIGIvMDAwNC1SZXZlcnQtZXNwLVRlbXBNb3VudC1FU1AtaWYtbm90LWFscmVhZHktbW91bnRl ZC5wYXRjaApAQCAtMCwwICsxLDIwNyBAQAorRnJvbSBlOGVlYjEyZTc5MzMwMzg1YTE1Zjc2NWQx Y2Y3ZWU4YWMzNTE2NzM2IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogQWRhbSBXaWxs aWFtc29uIDxhd2lsbGlhbUByZWRoYXQuY29tPgorRGF0ZTogRnJpLCAyMSBBdWcgMjAyNiAxNTow OTowNyAtMDcwMAorU3ViamVjdDogW1BBVENIIDQvNF0gUmV2ZXJ0ICJlc3A6IFRlbXBNb3VudCBF U1AgaWYgbm90IGFscmVhZHkgbW91bnRlZCIKKworVGhpcyByZXZlcnRzIGNvbW1pdCAxNTBhZTMy ODE0MDdmMzE1ZDEzMTY3NGUwZTVjYzc1OGM0ZWUwNzQ2LgorLS0tCisgc3JjL2VmaS5ycyB8IDEy MyArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQor IDEgZmlsZSBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCA3NSBkZWxldGlvbnMoLSkKKworZGlm ZiAtLWdpdCBhL3NyYy9lZmkucnMgYi9zcmMvZWZpLnJzCitpbmRleCA3MmFjNWQ1Li5mY2VlY2Q5 IDEwMDY0NAorLS0tIGEvc3JjL2VmaS5ycworKysrIGIvc3JjL2VmaS5ycworQEAgLTEwLDcgKzEw LDYgQEAgdXNlIHN0ZDo6cGF0aDo6e1BhdGgsIFBhdGhCdWZ9OworIHVzZSBzdGQ6OnByb2Nlc3M6 OkNvbW1hbmQ7CisgCisgdXNlIGFueWhvdzo6e2JhaWwsIENvbnRleHQsIFJlc3VsdH07CistdXNl IGJvb3RjX2ludGVybmFsX21vdW50Ojp0ZW1wbW91bnQ6OlRlbXBNb3VudDsKKyB1c2UgYm9vdGNf aW50ZXJuYWxfdXRpbHM6OkNvbW1hbmRSdW5FeHQ7CisgdXNlIGNhbWlubzo6e1V0ZjhQYXRoLCBV dGY4UGF0aEJ1Zn07CisgdXNlIGNhcF9zdGQ6OmFtYmllbnRfYXV0aG9yaXR5OworQEAgLTE5LDgg KzE4LDYgQEAgdXNlIGNhcF9zdGRfZXh0OjpjYXBfc3RkOworIHVzZSBjYXBfc3RkX2V4dDo6ZGly ZXh0OjpDYXBTdGRFeHREaXJFeHQ7CisgdXNlIGZuX2Vycm9yX2NvbnRleHQ6OmNvbnRleHQ7Cisg dXNlIG9zX3JlbGVhc2U6Ok9zUmVsZWFzZTsKKy11c2UgcnVzdGl4Ojptb3VudDo6TW91bnRGbGFn czsKKy11c2UgcnVzdGl4OjpwYXRoOjpBcmc7CisgdXNlIHJ1c3RpeDo6e2ZkOjpBc0ZkLCBmZDo6 Qm9ycm93ZWRGZCwgZnM6OlN0YXRWZnNNb3VudEZsYWdzfTsKKyB1c2Ugd2Fsa2Rpcjo6V2Fsa0Rp cjsKKyB1c2Ugd2lkZXN0cmluZzo6VTE2Q1N0cmluZzsKK0BAIC05NiwyNSArOTMsMTMgQEAgcHVi KGNyYXRlKSBzdHJ1Y3QgRWZpIHsKKyAgICAgLy8vIFdoZXRoZXIgdGhlIGFib3ZlIG1vdW50cG9p bnQgd2FzIGFscmVhZHkgbW91bnRlZCBvciBub3QKKyAgICAgLy8vIFdvbid0IHVubW91bnQgaWYg aXQgd2FzIGFscmVhZHkgbW91bnRlZAorICAgICB3YXNfbW91bnRlZDogUmVmQ2VsbDxib29sPiwK Ky0gICAgLy8vIEd1YXJkIGZvciBFU1AgbW91bnRlZCBhdCBhIHRlbXBvcmFyeSBsb2NhdGlvbgor LSAgICB0ZW1wbW91bnRfZ3VhcmQ6IFJlZkNlbGw8T3B0aW9uPFRlbXBNb3VudD4+LAorLX0KKy0K Ky0vLy8gTW91bnQgZmxhZ3Mgc2hhcmVkIGJ5IGFsbCBFU1AgbW91bnRzOiBub24tZXhlY3V0YWJs ZSwgbm8gc2V0dWlkLgorLWNvbnN0IEVTUF9NT1VOVF9GTEFHUzogTW91bnRGbGFncyA9CistICAg IE1vdW50RmxhZ3M6OmZyb21fYml0c19yZXRhaW4oTW91bnRGbGFnczo6Tk9FWEVDLmJpdHMoKSB8 IE1vdW50RmxhZ3M6Ok5PU1VJRC5iaXRzKCkpOworLQorLS8vLyBGQVQgbW91bnQgb3B0aW9uczog b3duZXItb25seSBwZXJtaXNzaW9ucyBvbiBmaWxlcyAoMDYwMCkgYW5kIGRpcnMgKDA3MDApLgor LWNvbnN0IEVTUF9NT1VOVF9EQVRBOiAmc3RkOjpmZmk6OkNTdHIgPSBjImZtYXNrPTAxNzcsZG1h c2s9MDA3NyI7CistCistLy8vIE1vdW50IHRoZSBFU1AgZnJvbSB0aGUgcHJvdmlkZWQgZGV2aWNl IGludG8gYSB0ZW1wb3JhcnkgZGlyZWN0b3J5LgorLWZuIG1vdW50X2VzcChkZXZpY2U6ICZzdHIp IC0+IFJlc3VsdDxUZW1wTW91bnQ+IHsKKy0gICAgVGVtcE1vdW50Ojptb3VudF9kZXYoZGV2aWNl LCAidmZhdCIsIEVTUF9NT1VOVF9GTEFHUywgU29tZShFU1BfTU9VTlRfREFUQSkpCisgfQorIAor IGltcGwgRWZpIHsKKy0gICAgI1tjb250ZXh0KCJTZWFyY2hpbmcgY29tbW9uIEVTUCBtb3VudHBv aW50cyIpXQorLSAgICBmbiBzZWFyY2hfY29tbW9uX2VzcF9tb3VudHBvaW50cygmc2VsZiwgcm9v dDogJlBhdGgpIC0+IFJlc3VsdDxPcHRpb248UGF0aEJ1Zj4+IHsKKysgICAgLy8gR2V0IG1vdW50 ZWQgcG9pbnQgZm9yIGVzcAorKyAgICBwdWIoY3JhdGUpIGZuIGdldF9tb3VudGVkX2VzcCgmc2Vs Ziwgcm9vdDogJlBhdGgpIC0+IFJlc3VsdDxPcHRpb248UGF0aEJ1Zj4+IHsKKysgICAgICAgIC8v IEZpcnN0IGNoZWNrIGFsbCBwb3RlbnRpYWwgbW91bnQgcG9pbnRzIHdpdGhvdXQgaG9sZGluZyB0 aGUgYm9ycm93CisrICAgICAgICBsZXQgbXV0IGZvdW5kX21vdW50ID0gTm9uZTsKKyAgICAgICAg IGZvciAmbW50IGluIEVTUF9NT1VOVFMuaXRlcigpIHsKKyAgICAgICAgICAgICBsZXQgcGF0aCA9 IHJvb3Quam9pbihtbnQpOworICAgICAgICAgICAgIGlmICFwYXRoLmV4aXN0cygpIHsKK0BAIC0x MzQsNjMgKzExOSw1OSBAQCBpbXBsIEVmaSB7CisgICAgICAgICAgICAgICAgICAgICBjb250aW51 ZTsKKyAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICB1dGlsOjplbnN1cmVfd3Jp dGFibGVfbW91bnQoJnBhdGgpPzsKKy0gICAgICAgICAgICAgICAgcmV0dXJuIE9rKFNvbWUocGF0 aCkpOworKyAgICAgICAgICAgICAgICAqc2VsZi53YXNfbW91bnRlZC5ib3Jyb3dfbXV0KCkgPSB0 cnVlOworKyAgICAgICAgICAgICAgICBmb3VuZF9tb3VudCA9IFNvbWUocGF0aCk7CisrICAgICAg ICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgIH0KKyAgICAgICAgIH0KKyAKKy0gICAgICAg IE9rKE5vbmUpCistICAgIH0KKy0KKy0gICAgLy8vIEdldCBtb3VudGVkIHBvaW50IGZvciBFU1AK Ky0gICAgLy8vIE5PVEU6IFRoaXMgZnVuY3Rpb24gb25seSBzZWFyY2hlcyB0aGUgY29tbW9uIEVT UCBtb3VudHBvaW50cyBhbmQgcmV0dXJucworLSAgICAvLy8gdGhlIHBhdGggb2YgdGhlIG1vdW50 cG9pbnQsIGlmIHRoZXJlIGlzIG9uZQorLSAgICAjW2NvbnRleHQoIkdldHRpbmcgbW91bnRlZCBF U1AiKV0KKy0gICAgcHViKGNyYXRlKSBmbiBnZXRfbW91bnRlZF9lc3AoJnNlbGYsIHJvb3Q6ICZQ YXRoKSAtPiBSZXN1bHQ8T3B0aW9uPFBhdGhCdWY+PiB7CistICAgICAgICBsZXQgU29tZShtbnQp ID0gc2VsZi5zZWFyY2hfY29tbW9uX2VzcF9tb3VudHBvaW50cyhyb290KT8gZWxzZSB7CistICAg ICAgICAgICAgcmV0dXJuIE9rKE5vbmUpOworLSAgICAgICAgfTsKKy0KKyAgICAgICAgIC8vIE9u bHkgYm9ycm93IG11dGFibHkgaWYgd2UgZm91bmQgYSBtb3VudCBwb2ludAorLSAgICAgICAgbG9n OjpkZWJ1ZyEoIlJldXNpbmcgZXhpc3RpbmcgbW91bnQgcG9pbnQge21udDo/fSIpOworLSAgICAg ICAgKnNlbGYud2FzX21vdW50ZWQuYm9ycm93X211dCgpID0gdHJ1ZTsKKy0gICAgICAgICpzZWxm Lm1vdW50cG9pbnQuYm9ycm93X211dCgpID0gU29tZShtbnQuY2xvbmUoKSk7CistICAgICAgICBP ayhTb21lKG1udCkpCisrICAgICAgICBpZiBsZXQgU29tZShtbnQpID0gZm91bmRfbW91bnQgewor KyAgICAgICAgICAgIGxvZzo6ZGVidWchKCJSZXVzaW5nIGV4aXN0aW5nIG1vdW50IHBvaW50IHtt bnQ6P30iKTsKKysgICAgICAgICAgICAqc2VsZi5tb3VudHBvaW50LmJvcnJvd19tdXQoKSA9IFNv bWUobW50LmNsb25lKCkpOworKyAgICAgICAgICAgIE9rKFNvbWUobW50KSkKKysgICAgICAgIH0g ZWxzZSB7CisrICAgICAgICAgICAgT2soTm9uZSkKKysgICAgICAgIH0KKyAgICAgfQorIAorLSAg ICAvLy8gTW91bnQgdGhlIHBhc3NlZCBlc3BfZGV2aWNlLCByZXR1cm4gbW91bnQgcG9pbnQKKy0g ICAgI1tjb250ZXh0KCJNb3VudGluZyBFU1AgZGV2aWNlIGF0IHt9Iiwgcm9vdC5kaXNwbGF5KCkp XQorKyAgICAvLyBNb3VudCB0aGUgcGFzc2VkIGVzcF9kZXZpY2UsIHJldHVybiBtb3VudCBwb2lu dAorICAgICBwdWIoY3JhdGUpIGZuIG1vdW50X2VzcF9kZXZpY2UoJnNlbGYsIHJvb3Q6ICZQYXRo LCBlc3BfZGV2aWNlOiAmUGF0aCkgLT4gUmVzdWx0PFBhdGhCdWY+IHsKKy0gICAgICAgIG1hdGNo IHNlbGYuc2VhcmNoX2NvbW1vbl9lc3BfbW91bnRwb2ludHMocm9vdCk/IHsKKy0gICAgICAgICAg ICBTb21lKG1udCkgPT4geworLSAgICAgICAgICAgICAgICBsb2c6OmRlYnVnISgiTW91bnRlZCBh dCB7Oj99IiwgbW50KTsKKy0gICAgICAgICAgICAgICAgKnNlbGYud2FzX21vdW50ZWQuYm9ycm93 X211dCgpID0gdHJ1ZTsKKy0gICAgICAgICAgICAgICAgKnNlbGYubW91bnRwb2ludC5ib3Jyb3df bXV0KCkgPSBTb21lKG1udC5jbG9uZSgpKTsKKysgICAgICAgIGxldCBtdXQgbW91bnRwb2ludCA9 IE5vbmU7CisgCistICAgICAgICAgICAgICAgIE9rKG1udCkKKysgICAgICAgIGZvciAmbW50IGlu IEVTUF9NT1VOVFMuaXRlcigpIHsKKysgICAgICAgICAgICBsZXQgbW50ID0gcm9vdC5qb2luKG1u dCk7CisrICAgICAgICAgICAgaWYgIW1udC5leGlzdHMoKSB7CisrICAgICAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICAgICAgIH0KKy0gICAgICAgICAgICBOb25lID0+IHsKKy0gICAgICAg ICAgICAgICAgLy8gSWYgdGhlIEVTUCBpc24ndCBhbHJlYWR5IG1vdW50ZWQgYXQgL2Jvb3QsIC9i b290L2VmaSBtb3VudCBpdCBhdCBhIHRlbXBvcmFyeSBwb2ludAorLSAgICAgICAgICAgICAgICAv LyBUaGlzIGlzIHNvIHRoYXQgd2UgZG9uJ3Qgc2hhZG93IGV4aXN0aW5nIGZpbGVzIGluIHRoZSBh Ym92ZSBkaXJlY3RvcmllcworLSAgICAgICAgICAgICAgICBsZXQgZXNwX21vdW50ID0gbW91bnRf ZXNwKAorLSAgICAgICAgICAgICAgICAgICAgZXNwX2RldmljZQorLSAgICAgICAgICAgICAgICAg ICAgICAgIC5hc19zdHIoKQorLSAgICAgICAgICAgICAgICAgICAgICAgIC5jb250ZXh0KCJDb252 ZXJ0aW5nIGVzcF9kZXZpY2UgcGF0aCB0byBzdHIiKT8sCistICAgICAgICAgICAgICAgICkKKy0g ICAgICAgICAgICAgICAgLmNvbnRleHQoIkNyZWF0aW5nIHRlbXAgRVNQIG1vdW50Iik/OworLQor LSAgICAgICAgICAgICAgICBsZXQgbW50X3BhdGggPSBlc3BfbW91bnQuZGlyLnBhdGgoKS50b19w YXRoX2J1ZigpOworLSAgICAgICAgICAgICAgICAqc2VsZi5tb3VudHBvaW50LmJvcnJvd19tdXQo KSA9IFNvbWUobW50X3BhdGguY2xvbmUoKSk7CistICAgICAgICAgICAgICAgICpzZWxmLnRlbXBt b3VudF9ndWFyZC5ib3Jyb3dfbXV0KCkgPSBTb21lKGVzcF9tb3VudCk7CisgCistICAgICAgICAg ICAgICAgIE9rKG1udF9wYXRoKQorKyAgICAgICAgICAgIC8vIENoZWNrIGlmIHRoZSB0YXJnZXQg aXMgYWxyZWFkeSBhIG1vdW50ZWQgRVNQIChlLmcuIHRoZSBob3N0CisrICAgICAgICAgICAgLy8g YWxyZWFkeSBoYXMgdGhlIEVTUCBtb3VudGVkIHdoZW4gcnVubmluZyBpbnN0YWxsLXRvLWZpbGVz eXN0ZW0pLgorKyAgICAgICAgICAgIGxldCBzdCA9IHJ1c3RpeDo6ZnM6OnN0YXRmcygmbW50KT87 CisrICAgICAgICAgICAgaWYgc3QuZl90eXBlID09IGxpYmM6Ok1TRE9TX1NVUEVSX01BR0lDIHsK KysgICAgICAgICAgICAgICAgaWYgaXNfbW91bnRfcG9pbnQoJm1udCk/IHsKKysgICAgICAgICAg ICAgICAgICAgIGxvZzo6ZGVidWchKCJFU1AgYWxyZWFkeSBtb3VudGVkIGF0IHttbnQ6P30sIHJl dXNpbmciKTsKKysgICAgICAgICAgICAgICAgICAgIG1vdW50cG9pbnQgPSBTb21lKG1udCk7Cisr ICAgICAgICAgICAgICAgICAgICAqc2VsZi53YXNfbW91bnRlZC5ib3Jyb3dfbXV0KCkgPSB0cnVl OworKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisrICAgICAgICAgICAgICAgIH0KKyAgICAg ICAgICAgICB9CisrCisrICAgICAgICAgICAgc3RkOjpwcm9jZXNzOjpDb21tYW5kOjpuZXcoIm1v dW50IikKKysgICAgICAgICAgICAgICAgLmFyZygmZXNwX2RldmljZSkKKysgICAgICAgICAgICAg ICAgLmFyZygmbW50KQorKyAgICAgICAgICAgICAgICAucnVuX2luaGVyaXRlZCgpCisrICAgICAg ICAgICAgICAgIC53aXRoX2NvbnRleHQofHwgZm9ybWF0ISgiRmFpbGVkIHRvIG1vdW50IHs6P30i LCBlc3BfZGV2aWNlKSk/OworKyAgICAgICAgICAgIGxvZzo6ZGVidWchKCJNb3VudGVkIGF0IHtt bnQ6P30iKTsKKysgICAgICAgICAgICBtb3VudHBvaW50ID0gU29tZShtbnQpOworKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgfQorKyAgICAgICAgbGV0IG1udCA9IG1vdW50cG9pbnQub2tf b3JfZWxzZSh8fCBhbnlob3c6OmFueWhvdyEoIk5vIG1vdW50IHBvaW50IGZvdW5kIikpPzsKKysg ICAgICAgICpzZWxmLm1vdW50cG9pbnQuYm9ycm93X211dCgpID0gU29tZShtbnQuY2xvbmUoKSk7 CisrICAgICAgICBPayhtbnQpCisgICAgIH0KKyAKKy0gICAgLy8vIENoZWNrcyBpZiB3ZSBoYXZl IGFscmVhZHkgbW91bnRlZCB0aGUgRVNQCistICAgIC8vLyBJZiBub3QsIGNoZWNrcyBpZiB0aGUg RVNQIGlzIG1vdW50ZWQgYXQgY29tbW9uIG1vdW50cG9pbnRzLCBpLmUuIC9ib290LCAvYm9vdC9l ZmkKKy0gICAgLy8vIEVsc2UsIG1vdW50cyB0aGUgRVNQIGF0IGEgdGVtcCBwYXRoCistICAgICNb Y29udGV4dCgiRW5zdXJpbmcgbW91bnRlZCBFU1AiKV0KKysgICAgLy8gRmlyc3RseSBjaGVjayBp ZiBlc3AgaXMgYWxyZWFkeSBtb3VudGVkLCB0aGVuIG1vdW50IHRoZSBwYXNzZWQgZXNwIGRldmlj ZQorICAgICBwdWIoY3JhdGUpIGZuIGVuc3VyZV9tb3VudGVkX2VzcCgmc2VsZiwgcm9vdDogJlBh dGgsIGVzcF9kZXZpY2U6ICZQYXRoKSAtPiBSZXN1bHQ8UGF0aEJ1Zj4geworICAgICAgICAgaWYg bGV0IFNvbWUobW91bnRwb2ludCkgPSBzZWxmLm1vdW50cG9pbnQuYm9ycm93KCkuYXNfZGVyZWYo KSB7CisgICAgICAgICAgICAgcmV0dXJuIE9rKG1vdW50cG9pbnQudG9fb3duZWQoKSk7CitAQCAt MjA0LDI3ICsxODUsMTQgQEAgaW1wbCBFZmkgeworICAgICB9CisgCisgICAgIHB1YihjcmF0ZSkg Zm4gdW5tb3VudCgmc2VsZikgLT4gUmVzdWx0PCgpPiB7CistICAgICAgICBpZiAqc2VsZi53YXNf bW91bnRlZC5ib3Jyb3coKSB7CistICAgICAgICAgICAgbG9nOjpkZWJ1ZyEoIk1vdW50cG9pbnQg d2FzIGFscmVhZHkgbW91bnRlZCwgd29uJ3QgdW5tb3VudCIpOworLSAgICAgICAgICAgIHJldHVy biBPaygoKSk7CistICAgICAgICB9CistCisgICAgICAgICAqc2VsZi53YXNfbW91bnRlZC5ib3Jy b3dfbXV0KCkgPSBmYWxzZTsKKy0KKyAgICAgICAgIGlmIGxldCBTb21lKG1vdW50KSA9IHNlbGYu bW91bnRwb2ludC5ib3Jyb3dfbXV0KCkudGFrZSgpIHsKKy0gICAgICAgICAgICBpZiBsZXQgU29t ZSh0bXBtb3VudCkgPSBzZWxmLnRlbXBtb3VudF9ndWFyZC5ib3Jyb3dfbXV0KCkudGFrZSgpIHsK Ky0gICAgICAgICAgICAgICAgZHJvcCh0bXBtb3VudCk7CistICAgICAgICAgICAgICAgIGxvZzo6 dHJhY2UhKCJEcm9wcGVkIHRlbXBtb3VudCIpOworLSAgICAgICAgICAgICAgICByZXR1cm4gT2so KCkpOworLSAgICAgICAgICAgIH0KKy0KKyAgICAgICAgICAgICBDb21tYW5kOjpuZXcoInVtb3Vu dCIpCisgICAgICAgICAgICAgICAgIC5hcmcoJm1vdW50KQorICAgICAgICAgICAgICAgICAucnVu X2luaGVyaXRlZCgpCisgICAgICAgICAgICAgICAgIC53aXRoX2NvbnRleHQofHwgZm9ybWF0ISgi RmFpbGVkIHRvIHVubW91bnQge21vdW50Oj99IikpPzsKKyAgICAgICAgICAgICBsb2c6OnRyYWNl ISgiVW5tb3VudGVkIik7CisgICAgICAgICB9CistCisgICAgICAgICBPaygoKSkKKyAgICAgfQor IAorQEAgLTc4Myw2ICs3NTEsMTEgQEAgaW1wbCBDb21wb25lbnQgZm9yIEVmaSB7CisgCisgaW1w bCBEcm9wIGZvciBFZmkgeworICAgICBmbiBkcm9wKCZtdXQgc2VsZikgeworKyAgICAgICAgaWYg KnNlbGYud2FzX21vdW50ZWQuYm9ycm93KCkgeworKyAgICAgICAgICAgIGxvZzo6ZGVidWchKCJt b3VudHBvaW50IHdhcyBhbHJlYWR5IG1vdW50ZWQuIFdvbid0IHVubW91bnQiLCk7CisrICAgICAg ICAgICAgcmV0dXJuOworKyAgICAgICAgfQorKworICAgICAgICAgbG9nOjpkZWJ1ZyEoIlVubW91 bnRpbmcgezo/fSIsIHNlbGYubW91bnRwb2ludCk7CisgICAgICAgICBsZXQgXyA9IHNlbGYudW5t b3VudCgpOworICAgICB9CistLSAKKzIuNTUuMAorCgpkaWZmIC0tZ2l0IGEvcnVzdC1ib290dXBk LnNwZWMgYi9ydXN0LWJvb3R1cGQuc3BlYwppbmRleCBiZDhkYzZiLi4zNzAwMTJlIDEwMDY0NAot LS0gYS9ydXN0LWJvb3R1cGQuc3BlYworKysgYi9ydXN0LWJvb3R1cGQuc3BlYwpAQCAtMTEsNiAr MTEsMTQgQEAgTGljZW5zZTogICAgICAgIEFwYWNoZS0yLjAKIFVSTDogICAgICAgICAgICBodHRw czovL2dpdGh1Yi5jb20vY29yZW9zL2Jvb3R1cGQKIFNvdXJjZTA6ICAgICAgICAle2NyYXRlc19z b3VyY2V9CiBTb3VyY2UxOiAgICAgICAgJXt1cmx9L3JlbGVhc2VzL2Rvd25sb2FkL3Yle3ZlcnNp b259L2Jvb3R1cGQtJXt2ZXJzaW9ufS12ZW5kb3IudGFyLnpzdGQKKyMgUmV2ZXJ0IGh0dHBzOi8v Z2l0aHViLmNvbS9jb3Jlb3MvYm9vdHVwZC9wdWxsLzExMjYKKyMgdG8gZml4IFVFRkkgaW5zdGFs bHMgLSBzZWUKKyMgaHR0cHM6Ly9naXRodWIuY29tL2NvcmVvcy9ib290dXBkL2lzc3Vlcy8xMTM5 CitQYXRjaDogICAgICAgICAgMDAwMS1SZXZlcnQtRml4LWdydWItc3RhdGljLWNvbmZpZy1pbnN0 YWxsLnBhdGNoCitQYXRjaDogICAgICAgICAgMDAwMi1SZXZlcnQtY29tcG9uZW50LUFkZC1hc19h bnktbWV0aG9kLWZvci1kb3duY2FzdGluZy5wYXRjaAorUGF0Y2g6ICAgICAgICAgIDAwMDMtUmV2 ZXJ0LWVzcC1VcGRhdGUtdW5tb3VudC1tZXRob2QucGF0Y2gKK1BhdGNoOiAgICAgICAgICAwMDA0 LVJldmVydC1lc3AtVGVtcE1vdW50LUVTUC1pZi1ub3QtYWxyZWFkeS1tb3VudGVkLnBhdGNoCisK IEV4Y2x1ZGVBcmNoOiAgICAle2l4ODZ9CiAKICMgRm9yIG5vdywgc2VlIHVwc3RyZWFtCg==