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] rawhide: Revert PR #1139 to fix UEFI ostree installs Date: Sat, 22 Aug 2026 03:59:51 GMT Message-ID: <178737119195.1.11700933170430981001.rpms-rust-bootupd-4ddb90682216@fedoraproject.org> List-ID: X-Git-Repo: rpms/rust-bootupd X-Git-Branch: rawhide X-Git-Rev: 4ddb9068221689f572b7ceef9b16392b7058171b ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvcnVzdC1ib290dXBkCiAgICAgICAgICAgIEJyYW5jaCA6IHJhd2hpZGUKICAg ICAgICAgICAgQ29tbWl0IDogNGRkYjkwNjgyMjE2ODlmNTcyYjdjZWVmOWIxNjM5MmI3MDU4MTcx YgogICAgICAgICAgICBBdXRob3IgOiBBZGFtIFdpbGxpYW1zb24gPGF3aWxsaWFtQHJlZGhhdC5j b20+CiAgICAgICAgICAgIERhdGUgICA6IDIwMjYtMDgtMjFUMjA6NTk6MDUtMDc6MDAKICAgICAg ICAgICAgU3RhdHMgIDogKzUyOC8tMCBpbiA1IGZpbGUocykKICAgICAgICAgICAgVVJMICAgIDog aHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy9ydXN0LWJvb3R1cGQvYy80ZGRiOTA2 ODIyMTY4OWY1NzJiN2NlZWY5YjE2MzkyYjcwNTgxNzFiP2JyYW5jaD1yYXdoaWRlCgogICAgICAg ICAgICBMb2c6CiAgICAgICAgICAgIFJldmVydCBQUiAjMTEzOSB0byBmaXggVUVGSSBvc3RyZWUg aW5zdGFsbHMKClNlZSBodHRwczovL2dpdGh1Yi5jb20vY29yZW9zL2Jvb3R1cGQvaXNzdWVzLzEx MzkKCi0tLQpkaWZmIC0tZ2l0IGEvMDAwMS1SZXZlcnQtRml4LWdydWItc3RhdGljLWNvbmZpZy1p bnN0YWxsLnBhdGNoIGIvMDAwMS1SZXZlcnQtRml4LWdydWItc3RhdGljLWNvbmZpZy1pbnN0YWxs LnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmM5NzUwZmUKLS0tIC9k ZXYvbnVsbAorKysgYi8wMDAxLVJldmVydC1GaXgtZ3J1Yi1zdGF0aWMtY29uZmlnLWluc3RhbGwu cGF0Y2gKQEAgLTAsMCArMSwxNzEgQEAKK0Zyb20gY2Q3YjI3ZTZjNGRmY2QyODg0OGZhOThmMTk5 ODFlOWQ1YWY5NDUxYSBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IEFkYW0gV2lsbGlh bXNvbiA8YXdpbGxpYW1AcmVkaGF0LmNvbT4KK0RhdGU6IEZyaSwgMjEgQXVnIDIwMjYgMTU6MDg6 MTggLTA3MDAKK1N1YmplY3Q6IFtQQVRDSCAxLzRdIFJldmVydCAiRml4IGdydWIgc3RhdGljIGNv bmZpZyBpbnN0YWxsIgorCitUaGlzIHJldmVydHMgY29tbWl0IDg4M2M3YTg4OGQxNjk5MTY3MmNm OWI5ZDA2ZmY3NGE0ZDJiMTEyOTcuCistLS0KKyBzcmMvYmlvcy5ycyAgICAgICAgfCAgMiArLQor IHNyYy9ib290dXBkLnJzICAgICB8IDI1IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyBzcmMv ZWZpLnJzICAgICAgICAgfCAxMSArKystLS0tLS0tLQorIHNyYy9ncnViY29uZmlncy5ycyB8IDIx ICsrKysrKy0tLS0tLS0tLS0tLS0tLQorIDQgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygr KSwgNDkgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9zcmMvYmlvcy5ycyBiL3NyYy9iaW9z LnJzCitpbmRleCAxMjYzZDhhLi5hNjM4ZGY2IDEwMDY0NAorLS0tIGEvc3JjL2Jpb3MucnMKKysr KyBiL3NyYy9iaW9zLnJzCitAQCAtMjExLDcgKzIxMSw3IEBAIGltcGwgQ29tcG9uZW50IGZvciBC aW9zIHsKKyAgICAgICAgICAgICAgICAgLmNvbnRleHQoIkZhaWxlZCB0byBiYWNrdXAgR1JVQiBj b25maWciKT87CisgICAgICAgICB9CisgCistICAgICAgICBjcmF0ZTo6Z3J1YmNvbmZpZ3M6Omlu c3RhbGwoJmRlc3RkaXIsIE5vbmUsIE5vbmUsIHRydWUsIE5vbmUpPzsKKysgICAgICAgIGNyYXRl OjpncnViY29uZmlnczo6aW5zdGFsbCgmZGVzdGRpciwgTm9uZSwgTm9uZSwgdHJ1ZSk/OworIAor ICAgICAgICAgLy8gUmVtb3ZlIHRoZSByZWFsIGNvbmZpZyBpZiBpdCBpcyBzeW1saW5rIGFuZCB3 aWxsIG5vdAorICAgICAgICAgLy8gaWYgL2Jvb3QvZ3J1YjIvZ3J1Yi5jZmcgaXMgZmlsZQorZGlm ZiAtLWdpdCBhL3NyYy9ib290dXBkLnJzIGIvc3JjL2Jvb3R1cGQucnMKK2luZGV4IGJkYWQ5ZmYu LjcyMjY2YTMgMTAwNjQ0CistLS0gYS9zcmMvYm9vdHVwZC5ycworKysrIGIvc3JjL2Jvb3R1cGQu cnMKK0BAIC0yNzYsMzYgKzI3NiwxMSBAQCBwdWIoY3JhdGUpIGZuIGluc3RhbGwob3B0czogJklu c3RhbGxPcHRzLCBkZXZpY2VzOiAmW0RldmljZV0sIGNvbmZpZ3M6IENvbmZpZ01vZAorICAgICAg ICAgICAgIFNvbWUodXVpZCkgPT4geworICAgICAgICAgICAgICAgICBsZXQgbWV0YSA9IGdldF9z dGF0aWNfY29uZmlnX21ldGEoKT87CisgICAgICAgICAgICAgICAgIHN0YXRlLnN0YXRpY19jb25m aWdzID0gU29tZShtZXRhKTsKKy0KKy0gICAgICAgICAgICAgICAgbGV0IG11dCBlc3BfZGlyID0g Tm9uZTsKKy0KKy0gICAgICAgICAgICAgICAgI1tjZmcoZWZpX2FyY2gpXQorLSAgICAgICAgICAg ICAgICB7CistICAgICAgICAgICAgICAgICAgICBmb3IgYyBpbiAmdGFyZ2V0X2NvbXBvbmVudHMg eworLSAgICAgICAgICAgICAgICAgICAgICAgIHVzZSBjcmF0ZTo6ZWZpOjpFZmk7CistCistICAg ICAgICAgICAgICAgICAgICAgICAgaWYgbGV0IFNvbWUoZWZpKSA9IGMuYXNfYW55KCkuZG93bmNh c3RfcmVmOjo8RWZpPigpIHsKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbGV0IG1vdW50 ZWRfZXNwX3BhdGggPSBlZmkuZ2V0X2VzcF9tb3VudHBvaW50KCk7CistICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGxldCBtb3VudGVkX2VzcF9wYXRoID0gbW91bnRlZF9lc3BfcGF0aC5hc19y ZWYoKS5va19vcl9lbHNlKHx8IHsKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFu eWhvdyEoIk1vdW50ZWQgRVNQIG5vdCBmb3VuZCB0byBpbnN0YWxsIHN0YXRpYyBncnViIGNvbmZp ZyIpCistICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0pPzsKKy0KKy0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgZXNwX2RpciA9IFNvbWUoCistICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBEaXI6Om9wZW5fYW1iaWVudF9kaXIobW91bnRlZF9lc3BfcGF0aCwgYW1iaWVudF9h dXRob3JpdHkoKSkKKy0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAuY29udGV4 dCgiT3BlbmluZyBtb3VudGVkIEVTUCBkaXIiKT8sCistICAgICAgICAgICAgICAgICAgICAgICAg ICAgICk7CistCistICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworLSAgICAgICAg ICAgICAgICAgICAgICAgIH0KKy0gICAgICAgICAgICAgICAgICAgIH0KKy0gICAgICAgICAgICAg ICAgfQorLQorICAgICAgICAgICAgICAgICBjcmF0ZTo6Z3J1YmNvbmZpZ3M6Omluc3RhbGwoCisg ICAgICAgICAgICAgICAgICAgICBzeXNyb290LAorICAgICAgICAgICAgICAgICAgICAgU29tZSgm c291cmNlX3Jvb3RfZGlyKSwKKyAgICAgICAgICAgICAgICAgICAgIGluc3RhbGxlZF9lZmlfdmVu ZG9yLmFzX2RlcmVmKCksCisgICAgICAgICAgICAgICAgICAgICB1dWlkLAorLSAgICAgICAgICAg ICAgICAgICAgZXNwX2Rpci5hc19yZWYoKSwKKyAgICAgICAgICAgICAgICAgKT87CisgICAgICAg ICAgICAgfQorICAgICAgICAgICAgIC8vIE9uIG90aGVyIGFyY2hpdGVjdHVyZXMsIGFzc3VtZSB0 aGF0IHRoZXJlJ3Mgbm90aGluZyB0byBkby4KK2RpZmYgLS1naXQgYS9zcmMvZWZpLnJzIGIvc3Jj L2VmaS5ycworaW5kZXggODM0ZTM1Zi4uNGM5ZDJjYyAxMDA2NDQKKy0tLSBhL3NyYy9lZmkucnMK KysrKyBiL3NyYy9lZmkucnMKK0BAIC0xODEsMTEgKzE4MSw2IEBAIGltcGwgRWZpIHsKKyAgICAg ICAgIH0KKyAgICAgfQorIAorLSAgICAvLy8gUmV0dXJucyB0aGUgRVNQJ3MgbW91bnRwb2ludCBp ZiBwcmVzZW50CistICAgIHB1YihjcmF0ZSkgZm4gZ2V0X2VzcF9tb3VudHBvaW50KCZzZWxmKSAt PiBzdGQ6OmNlbGw6OlJlZjwnXywgT3B0aW9uPFBhdGhCdWY+PiB7CistICAgICAgICBzZWxmLm1v dW50cG9pbnQuYm9ycm93KCkKKy0gICAgfQorLQorICAgICAvLy8gQ2hlY2tzIGlmIHdlIGhhdmUg YWxyZWFkeSBtb3VudGVkIHRoZSBFU1AKKyAgICAgLy8vIElmIG5vdCwgY2hlY2tzIGlmIHRoZSBF U1AgaXMgbW91bnRlZCBhdCBjb21tb24gbW91bnRwb2ludHMsIGkuZS4gL2Jvb3QsIC9ib290L2Vm aQorICAgICAvLy8gRWxzZSwgbW91bnRzIHRoZSBFU1AgYXQgYSB0ZW1wIHBhdGgKK0BAIC0zNzQs NyArMzY5LDcgQEAgaW1wbCBDb21wb25lbnQgZm9yIEVmaSB7CisgCisgICAgIC8vIEJhY2t1cCAi L2Jvb3QvZWZpL0VGSS97dmVuZG9yfS9ncnViLmNmZyIgdG8gIi9ib290L2VmaS9FRkkve3ZlbmRv cn0vZ3J1Yi5jZmcuYmFrIgorICAgICAvLyBSZXBsYWNlICIvYm9vdC9lZmkvRUZJL3t2ZW5kb3J9 L2dydWIuY2ZnIiB3aXRoIG5ldyBzdGF0aWMgImdydWIuY2ZnIgorLSAgICBmbiBtaWdyYXRlX3N0 YXRpY19ncnViX2NvbmZpZygmc2VsZiwgc3lzcm9vdF9wYXRoOiAmc3RyLCBkZXN0X2VmaV9kaXI6 ICZEaXIpIC0+IFJlc3VsdDwoKT4geworKyAgICBmbiBtaWdyYXRlX3N0YXRpY19ncnViX2NvbmZp Zygmc2VsZiwgc3lzcm9vdF9wYXRoOiAmc3RyLCBkZXN0ZGlyOiAmRGlyKSAtPiBSZXN1bHQ8KCk+ IHsKKyAgICAgICAgIGxldCBzeXNyb290ID0gRGlyOjpvcGVuX2FtYmllbnRfZGlyKHN5c3Jvb3Rf cGF0aCwgYW1iaWVudF9hdXRob3JpdHkoKSkKKyAgICAgICAgICAgICAud2l0aF9jb250ZXh0KHx8 IGZvcm1hdCEoIk9wZW5pbmcge3N5c3Jvb3RfcGF0aH0iKSk/OworICAgICAgICAgbGV0IFNvbWUo dmVuZG9yKSA9IHNlbGYuZ2V0X2VmaV92ZW5kb3IoJlBhdGg6Om5ldyhzeXNyb290X3BhdGgpKT8g ZWxzZSB7CitAQCAtMzgyLDcgKzM3Nyw3IEBAIGltcGwgQ29tcG9uZW50IGZvciBFZmkgeworICAg ICAgICAgfTsKKyAKKyAgICAgICAgIC8vIGRlc3RkaXIgaXMgL2Jvb3QvZWZpL0VGSQorLSAgICAg ICAgbGV0IGVmaWRpciA9IGRlc3RfZWZpX2RpcgorKyAgICAgICAgbGV0IGVmaWRpciA9IGRlc3Rk aXIKKyAgICAgICAgICAgICAub3Blbl9kaXIoJnZlbmRvcikKKyAgICAgICAgICAgICAud2l0aF9j b250ZXh0KHx8IGZvcm1hdCEoIk9wZW5pbmcgRUZJL3t9IiwgdmVuZG9yKSk/OworIAorQEAgLTM5 Nyw3ICszOTIsNyBAQCBpbXBsIENvbXBvbmVudCBmb3IgRWZpIHsKKyAgICAgICAgICAgICAgICAg LmNvbnRleHQoIkZhaWxlZCB0byBiYWNrdXAgR1JVQiBjb25maWciKT87CisgICAgICAgICB9Cisg CistICAgICAgICBncnViY29uZmlnczo6aW5zdGFsbCgmc3lzcm9vdCwgTm9uZSwgU29tZSgmdmVu ZG9yKSwgdHJ1ZSwgU29tZSgmZWZpZGlyKSk/OworKyAgICAgICAgZ3J1YmNvbmZpZ3M6Omluc3Rh bGwoJnN5c3Jvb3QsIE5vbmUsIFNvbWUoJnZlbmRvciksIHRydWUpPzsKKyAgICAgICAgIC8vIFN5 bmNocm9uaXplIHRoZSBmaWxlc3lzdGVtIGNvbnRhaW5pbmcgL2Jvb3QvZWZpL0VGSS97dmVuZG9y fSB0byBkaXNrLgorICAgICAgICAgZnNmcmVlemVfdGhhd19jeWNsZShlZmlkaXIucmVvcGVuX2Fz X293bmVkZmQoKT8pPzsKKyAKK2RpZmYgLS1naXQgYS9zcmMvZ3J1YmNvbmZpZ3MucnMgYi9zcmMv Z3J1YmNvbmZpZ3MucnMKK2luZGV4IGYwNjE4MGUuLjQ3NmY5MzQgMTAwNjQ0CistLS0gYS9zcmMv Z3J1YmNvbmZpZ3MucnMKKysrKyBiL3NyYy9ncnViY29uZmlncy5ycworQEAgLTM0LDcgKzM0LDYg QEAgcHViKGNyYXRlKSBmbiBpbnN0YWxsKAorICAgICBzcmNfcm9vdDogT3B0aW9uPCZEaXI+LAor ICAgICBpbnN0YWxsZWRfZWZpX3ZlbmRvcjogT3B0aW9uPCZzdHI+LAorICAgICB3cml0ZV91dWlk OiBib29sLAorLSAgICBtb3VudGVkX2VzcDogT3B0aW9uPCZEaXI+LAorICkgLT4gUmVzdWx0PCgp PiB7CisgICAgIGxldCBib290ZGlyID0gJnRhcmdldF9yb290Lm9wZW5fZGlyKCJib290IikuY29u dGV4dCgiT3BlbmluZyAvYm9vdCIpPzsKKyAgICAgbGV0IGJvb3RfaXNfbW91bnQgPSB7CitAQCAt NDQsNyArNDMsNiBAQCBwdWIoY3JhdGUpIGZuIGluc3RhbGwoCisgICAgICAgICByb290X2RldiAh PSBib290X2RldgorICAgICB9OworIAorLSAgICAvLyBUaGlzIGlzIGluIC9zeXNyb290L2Jvb3QK KyAgICAgaWYgIWJvb3RkaXIuZXhpc3RzKEdSVUIyRElSKSB7CisgICAgICAgICBsZXQgbXV0IGRp cl9vcHRpb25zID0gRGlyQnVpbGRlcjo6bmV3KCk7CisgICAgICAgICBkaXJfb3B0aW9ucy5yZWN1 cnNpdmUodHJ1ZSkubW9kZSgwbzcwMCk7CitAQCAtMTMyLDE2ICsxMzAsMTYgQEAgcHViKGNyYXRl KSBmbiBpbnN0YWxsKAorIAorICAgICBpZiBsZXQgU29tZSh2ZW5kb3JkaXIpID0gaW5zdGFsbGVk X2VmaV92ZW5kb3IgeworICAgICAgICAgbG9nOjpkZWJ1ZyEoInZlbmRvcmRpcj17Oj99IiwgJnZl bmRvcmRpcik7CistICAgICAgICBsZXQgdmVuZG9yID0gUGF0aEJ1Zjo6ZnJvbSgiRUZJIikuam9p bih2ZW5kb3JkaXIpOworKyAgICAgICAgbGV0IHZlbmRvciA9IFBhdGhCdWY6OmZyb20odmVuZG9y ZGlyKTsKKyAgICAgICAgIGxldCB0YXJnZXQgPSAmdmVuZG9yLmpvaW4oImdydWIuY2ZnIik7Cist CistICAgICAgICBpZiBsZXQgU29tZShlZmlkaXIpID0gbW91bnRlZF9lc3AgeworKyAgICAgICAg bGV0IGRlc3RfZWZpZGlyID0gdGFyZ2V0X3Jvb3QKKysgICAgICAgICAgICAub3Blbl9kaXJfb3B0 aW9uYWwoImJvb3QvZWZpL0VGSSIpCisrICAgICAgICAgICAgLmNvbnRleHQoIk9wZW5pbmcgL2Jv b3QvZWZpL0VGSSIpPzsKKysgICAgICAgIGlmIGxldCBTb21lKGVmaWRpcikgPSBkZXN0X2VmaWRp ciB7CisgICAgICAgICAgICAgY29uZmlnZGlyCisgICAgICAgICAgICAgICAgIC5jb3B5KCJncnVi LXN0YXRpYy1lZmkuY2ZnIiwgJmVmaWRpciwgdGFyZ2V0KQorICAgICAgICAgICAgICAgICAuY29u dGV4dCgiQ29weWluZyBzdGF0aWMgRUZJIik/OworLQorICAgICAgICAgICAgIHByaW50bG4hKCJJ bnN0YWxsZWQ6IHt0YXJnZXQ6P30iKTsKKy0KKyAgICAgICAgICAgICBpZiBsZXQgU29tZSh1dWlk X3BhdGgpID0gdXVpZF9wYXRoIHsKKyAgICAgICAgICAgICAgICAgbGV0IHRhcmdldCA9ICZ2ZW5k b3Iuam9pbih1dWlkX3BhdGgpOworICAgICAgICAgICAgICAgICBncnViMmRpcgorQEAgLTIxOCwx NCArMjE2LDcgQEAgbW9kIHRlc3RzIHsKKyAgICAgICAgIHN0ZDo6ZnM6OmNyZWF0ZV9kaXJfYWxs KHRkcC5qb2luKCJib290L2dydWIyIikpPzsKKyAgICAgICAgIHN0ZDo6ZnM6OmNyZWF0ZV9kaXJf YWxsKHRkcC5qb2luKCJib290L2VmaS9FRkkvQk9PVCIpKT87CisgICAgICAgICBzdGQ6OmZzOjpj cmVhdGVfZGlyX2FsbCh0ZHAuam9pbigiYm9vdC9lZmkvRUZJL2ZlZG9yYSIpKT87CistICAgICAg ICBpbnN0YWxsKAorLSAgICAgICAgICAgICZ0ZCwKKy0gICAgICAgICAgICBOb25lLAorLSAgICAg ICAgICAgIFNvbWUoImZlZG9yYSIpLAorLSAgICAgICAgICAgIGZhbHNlLAorLSAgICAgICAgICAg IFNvbWUoJnRkLm9wZW5fZGlyKCJib290L2VmaSIpLnVud3JhcCgpKSwKKy0gICAgICAgICkKKy0g ICAgICAgIC51bndyYXAoKTsKKysgICAgICAgIGluc3RhbGwoJnRkLCBOb25lLCBTb21lKCJmZWRv cmEiKSwgZmFsc2UpLnVud3JhcCgpOworIAorICAgICAgICAgYXNzZXJ0ISh0ZC5leGlzdHMoImJv b3QvZ3J1YjIvZ3J1Yi5jZmciKSk7CisgICAgICAgICBhc3NlcnQhKHRkLmV4aXN0cygiYm9vdC9l ZmkvRUZJL2ZlZG9yYS9ncnViLmNmZyIpKTsKKy0tIAorMi41NS4wCisKCmRpZmYgLS1naXQgYS8w MDAyLVJldmVydC1jb21wb25lbnQtQWRkLWFzX2FueS1tZXRob2QtZm9yLWRvd25jYXN0aW5nLnBh dGNoIGIvMDAwMi1SZXZlcnQtY29tcG9uZW50LUFkZC1hc19hbnktbWV0aG9kLWZvci1kb3duY2Fz dGluZy5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43ZWYyOWE5Ci0t LSAvZGV2L251bGwKKysrIGIvMDAwMi1SZXZlcnQtY29tcG9uZW50LUFkZC1hc19hbnktbWV0aG9k LWZvci1kb3duY2FzdGluZy5wYXRjaApAQCAtMCwwICsxLDY2IEBACitGcm9tIGZhNzkwNWE0Yzky OTZlMDlhNGRhZjEyYjczY2Y0NWRkNmMyMjYzMjcgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitG cm9tOiBBZGFtIFdpbGxpYW1zb24gPGF3aWxsaWFtQHJlZGhhdC5jb20+CitEYXRlOiBGcmksIDIx IEF1ZyAyMDI2IDE1OjA4OjIyIC0wNzAwCitTdWJqZWN0OiBbUEFUQ0ggMi80XSBSZXZlcnQgImNv bXBvbmVudDogQWRkIGBhc19hbnlgIG1ldGhvZCBmb3IgZG93bmNhc3RpbmciCisKK1RoaXMgcmV2 ZXJ0cyBjb21taXQgZDU5ZmIyMGRiNzVjNTUzYTc1MGI0NTgzMGRkZDY3MWNkNWNhZTcwMi4KKy0t LQorIHNyYy9iaW9zLnJzICAgICAgfCA0IC0tLS0KKyBzcmMvY29tcG9uZW50LnJzIHwgMyAtLS0K KyBzcmMvZWZpLnJzICAgICAgIHwgNCAtLS0tCisgMyBmaWxlcyBjaGFuZ2VkLCAxMSBkZWxldGlv bnMoLSkKKworZGlmZiAtLWdpdCBhL3NyYy9iaW9zLnJzIGIvc3JjL2Jpb3MucnMKK2luZGV4IGE2 MzhkZjYuLjAzYTM0MDggMTAwNjQ0CistLS0gYS9zcmMvYmlvcy5ycworKysrIGIvc3JjL2Jpb3Mu cnMKK0BAIC05OSwxMCArOTksNiBAQCBpbXBsIEJpb3MgeworIH0KKyAKKyBpbXBsIENvbXBvbmVu dCBmb3IgQmlvcyB7CistICAgIGZuIGFzX2FueSgmc2VsZikgLT4gJmR5biBzdGQ6OmFueTo6QW55 IHsKKy0gICAgICAgIHNlbGYKKy0gICAgfQorLQorICAgICBmbiBuYW1lKCZzZWxmKSAtPiAmJ3N0 YXRpYyBzdHIgeworICAgICAgICAgc2VsZi5jb21wb25lbnRfdHlwZSgpLmludG8oKQorICAgICB9 CitkaWZmIC0tZ2l0IGEvc3JjL2NvbXBvbmVudC5ycyBiL3NyYy9jb21wb25lbnQucnMKK2luZGV4 IDczMDQzYzMuLjIzYTE0YjUgMTAwNjQ0CistLS0gYS9zcmMvY29tcG9uZW50LnJzCisrKysgYi9z cmMvY29tcG9uZW50LnJzCitAQCAtMTAsNyArMTAsNiBAQCB1c2UgY2FwX3N0ZDo6e2FtYmllbnRf YXV0aG9yaXR5LCBmczo6UGVybWlzc2lvbnN9OworIHVzZSBjYXBfc3RkX2V4dDo6ZGlyZXh0OjpD YXBTdGRFeHREaXJFeHQ7CisgdXNlIGZuX2Vycm9yX2NvbnRleHQ6OmNvbnRleHQ7CisgdXNlIHNl cmRlOjp7RGVzZXJpYWxpemUsIFNlcmlhbGl6ZX07CistdXNlIHN0ZDo6YW55OjpBbnk7CisgdXNl IHN0ZDo6cGF0aDo6e1BhdGgsIFBhdGhCdWZ9OworIAorIHVzZSBib290Y19pbnRlcm5hbF9ibG9j a2Rldjo6RGV2aWNlOworQEAgLTU0LDggKzUzLDYgQEAgaW1wbCBzdGQ6OmZtdDo6RGlzcGxheSBm b3IgQ29tcG9uZW50VHlwZSB7CisgLy8vIGhhbmRsZXMgaW5zdGFsbGluZyBib290bG9hZGVyIGZp bGVzIGR1cmluZyBpbWFnZSBidWlsZHMsIGFwcGx5aW5nIHVwZGF0ZXMgYXQgcnVudGltZSwKKyAv Ly8gYW5kIG9wdGlvbmFsbHkgYWRvcHRpbmcgZXhpc3RpbmcgaW5zdGFsbGF0aW9ucyBub3Qgb3Jp Z2luYWxseSBtYW5hZ2VkIGJ5IGJvb3R1cGQuCisgcHViKGNyYXRlKSB0cmFpdCBDb21wb25lbnQg eworLSAgICBmbiBhc19hbnkoJnNlbGYpIC0+ICZkeW4gQW55OworLQorICAgICAvLy8gUmV0dXJu cyB0aGUgbmFtZSBvZiB0aGUgY29tcG9uZW50OyB0aGlzIHdpbGwgYmUgdXNlZCBmb3Igc2VyaWFs aXphdGlvbgorICAgICAvLy8gYW5kIHNob3VsZCByZW1haW4gc3RhYmxlLgorICAgICBmbiBuYW1l KCZzZWxmKSAtPiAmJ3N0YXRpYyBzdHI7CitkaWZmIC0tZ2l0IGEvc3JjL2VmaS5ycyBiL3NyYy9l ZmkucnMKK2luZGV4IDRjOWQyY2MuLmQxZDkxMWMgMTAwNjQ0CistLS0gYS9zcmMvZWZpLnJzCisr KysgYi9zcmMvZWZpLnJzCitAQCAtMzMwLDEwICszMzAsNiBAQCBmbiBza2lwX3N5c3RlbWRfYm9v dGxvYWRlcnMoKSAtPiBib29sIHsKKyB9CisgCisgaW1wbCBDb21wb25lbnQgZm9yIEVmaSB7Cist ICAgIGZuIGFzX2FueSgmc2VsZikgLT4gJmR5biBzdGQ6OmFueTo6QW55IHsKKy0gICAgICAgIHNl bGYKKy0gICAgfQorLQorICAgICBmbiBuYW1lKCZzZWxmKSAtPiAmJ3N0YXRpYyBzdHIgeworICAg ICAgICAgc2VsZi5jb21wb25lbnRfdHlwZSgpLmludG8oKQorICAgICB9CistLSAKKzIuNTUuMAor CgpkaWZmIC0tZ2l0IGEvMDAwMy1SZXZlcnQtZXNwLVVwZGF0ZS11bm1vdW50LW1ldGhvZC5wYXRj aCBiLzAwMDMtUmV2ZXJ0LWVzcC1VcGRhdGUtdW5tb3VudC1tZXRob2QucGF0Y2gKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTE1NjI3NwotLS0gL2Rldi9udWxsCisrKyBiLzAw MDMtUmV2ZXJ0LWVzcC1VcGRhdGUtdW5tb3VudC1tZXRob2QucGF0Y2gKQEAgLTAsMCArMSw3NiBA QAorRnJvbSA3ZGZjYjk0YjU4OWU4OGZjNjFhNTg5ZWUzMTg0ZmQwNzViMDE4ZDkxIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQorRnJvbTogQWRhbSBXaWxsaWFtc29uIDxhd2lsbGlhbUByZWRoYXQu Y29tPgorRGF0ZTogRnJpLCAyMSBBdWcgMjAyNiAxNTowOTowMiAtMDcwMAorU3ViamVjdDogW1BB VENIIDMvNF0gUmV2ZXJ0ICJlc3A6IFVwZGF0ZSBgdW5tb3VudGAgbWV0aG9kIgorCitUaGlzIHJl dmVydHMgY29tbWl0IDg1MDUzYThhNzJhYWQ4MDgyMDk3NTY2ODcxYTA4YmY1YTllNGIyNzEuCist LS0KKyBzcmMvZWZpLnJzIHwgMjggKysrKysrKysrKysrKysrKysrKysrKysrLS0tLQorIDEgZmls ZSBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQorCitkaWZmIC0tZ2l0 IGEvc3JjL2VmaS5ycyBiL3NyYy9lZmkucnMKK2luZGV4IGQxZDkxMWMuLjcyYWM1ZDUgMTAwNjQ0 CistLS0gYS9zcmMvZWZpLnJzCisrKysgYi9zcmMvZWZpLnJzCitAQCAtOTMsNiArOTMsOSBAQCBw dWIoY3JhdGUpIGZuIGlzX2VmaV9ib290ZWQoKSAtPiBSZXN1bHQ8Ym9vbD4geworICNbZGVyaXZl KERlZmF1bHQsIERlYnVnKV0KKyBwdWIoY3JhdGUpIHN0cnVjdCBFZmkgeworICAgICBtb3VudHBv aW50OiBSZWZDZWxsPE9wdGlvbjxQYXRoQnVmPj4sCisrICAgIC8vLyBXaGV0aGVyIHRoZSBhYm92 ZSBtb3VudHBvaW50IHdhcyBhbHJlYWR5IG1vdW50ZWQgb3Igbm90CisrICAgIC8vLyBXb24ndCB1 bm1vdW50IGlmIGl0IHdhcyBhbHJlYWR5IG1vdW50ZWQKKysgICAgd2FzX21vdW50ZWQ6IFJlZkNl bGw8Ym9vbD4sCisgICAgIC8vLyBHdWFyZCBmb3IgRVNQIG1vdW50ZWQgYXQgYSB0ZW1wb3Jhcnkg bG9jYXRpb24KKyAgICAgdGVtcG1vdW50X2d1YXJkOiBSZWZDZWxsPE9wdGlvbjxUZW1wTW91bnQ+ PiwKKyB9CitAQCAtMTQ5LDYgKzE1Miw3IEBAIGltcGwgRWZpIHsKKyAKKyAgICAgICAgIC8vIE9u bHkgYm9ycm93IG11dGFibHkgaWYgd2UgZm91bmQgYSBtb3VudCBwb2ludAorICAgICAgICAgbG9n OjpkZWJ1ZyEoIlJldXNpbmcgZXhpc3RpbmcgbW91bnQgcG9pbnQge21udDo/fSIpOworKyAgICAg ICAgKnNlbGYud2FzX21vdW50ZWQuYm9ycm93X211dCgpID0gdHJ1ZTsKKyAgICAgICAgICpzZWxm Lm1vdW50cG9pbnQuYm9ycm93X211dCgpID0gU29tZShtbnQuY2xvbmUoKSk7CisgICAgICAgICBP ayhTb21lKG1udCkpCisgICAgIH0KK0BAIC0xNTksNyArMTYzLDkgQEAgaW1wbCBFZmkgeworICAg ICAgICAgbWF0Y2ggc2VsZi5zZWFyY2hfY29tbW9uX2VzcF9tb3VudHBvaW50cyhyb290KT8gewor ICAgICAgICAgICAgIFNvbWUobW50KSA9PiB7CisgICAgICAgICAgICAgICAgIGxvZzo6ZGVidWch KCJNb3VudGVkIGF0IHs6P30iLCBtbnQpOworKyAgICAgICAgICAgICAgICAqc2VsZi53YXNfbW91 bnRlZC5ib3Jyb3dfbXV0KCkgPSB0cnVlOworICAgICAgICAgICAgICAgICAqc2VsZi5tb3VudHBv aW50LmJvcnJvd19tdXQoKSA9IFNvbWUobW50LmNsb25lKCkpOworKworICAgICAgICAgICAgICAg ICBPayhtbnQpCisgICAgICAgICAgICAgfQorICAgICAgICAgICAgIE5vbmUgPT4geworQEAgLTE5 OCwxMiArMjA0LDI2IEBAIGltcGwgRWZpIHsKKyAgICAgfQorIAorICAgICBwdWIoY3JhdGUpIGZu IHVubW91bnQoJnNlbGYpIC0+IFJlc3VsdDwoKT4geworLSAgICAgICAgaWYgbGV0IFNvbWUodG1w bW91bnQpID0gc2VsZi50ZW1wbW91bnRfZ3VhcmQuYm9ycm93X211dCgpLnRha2UoKSB7CistICAg ICAgICAgICAgZHJvcCh0bXBtb3VudCk7CistICAgICAgICAgICAgbG9nOjp0cmFjZSEoIkRyb3Bw ZWQgdGVtcG1vdW50Iik7CisrICAgICAgICBpZiAqc2VsZi53YXNfbW91bnRlZC5ib3Jyb3coKSB7 CisrICAgICAgICAgICAgbG9nOjpkZWJ1ZyEoIk1vdW50cG9pbnQgd2FzIGFscmVhZHkgbW91bnRl ZCwgd29uJ3QgdW5tb3VudCIpOworKyAgICAgICAgICAgIHJldHVybiBPaygoKSk7CisgICAgICAg ICB9CisgCistICAgICAgICAqc2VsZi5tb3VudHBvaW50LmJvcnJvd19tdXQoKSA9IE5vbmU7Cisr ICAgICAgICAqc2VsZi53YXNfbW91bnRlZC5ib3Jyb3dfbXV0KCkgPSBmYWxzZTsKKysKKysgICAg ICAgIGlmIGxldCBTb21lKG1vdW50KSA9IHNlbGYubW91bnRwb2ludC5ib3Jyb3dfbXV0KCkudGFr ZSgpIHsKKysgICAgICAgICAgICBpZiBsZXQgU29tZSh0bXBtb3VudCkgPSBzZWxmLnRlbXBtb3Vu dF9ndWFyZC5ib3Jyb3dfbXV0KCkudGFrZSgpIHsKKysgICAgICAgICAgICAgICAgZHJvcCh0bXBt b3VudCk7CisrICAgICAgICAgICAgICAgIGxvZzo6dHJhY2UhKCJEcm9wcGVkIHRlbXBtb3VudCIp OworKyAgICAgICAgICAgICAgICByZXR1cm4gT2soKCkpOworKyAgICAgICAgICAgIH0KKysKKysg ICAgICAgICAgICBDb21tYW5kOjpuZXcoInVtb3VudCIpCisrICAgICAgICAgICAgICAgIC5hcmco Jm1vdW50KQorKyAgICAgICAgICAgICAgICAucnVuX2luaGVyaXRlZCgpCisrICAgICAgICAgICAg ICAgIC53aXRoX2NvbnRleHQofHwgZm9ybWF0ISgiRmFpbGVkIHRvIHVubW91bnQge21vdW50Oj99 IikpPzsKKysgICAgICAgICAgICBsb2c6OnRyYWNlISgiVW5tb3VudGVkIik7CisrICAgICAgICB9 CisgCisgICAgICAgICBPaygoKSkKKyAgICAgfQorLS0gCisyLjU1LjAKKwoKZGlmZiAtLWdpdCBh LzAwMDQtUmV2ZXJ0LWVzcC1UZW1wTW91bnQtRVNQLWlmLW5vdC1hbHJlYWR5LW1vdW50ZWQucGF0 Y2ggYi8wMDA0LVJldmVydC1lc3AtVGVtcE1vdW50LUVTUC1pZi1ub3QtYWxyZWFkeS1tb3VudGVk LnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjUxOTJiODkKLS0tIC9k ZXYvbnVsbAorKysgYi8wMDA0LVJldmVydC1lc3AtVGVtcE1vdW50LUVTUC1pZi1ub3QtYWxyZWFk eS1tb3VudGVkLnBhdGNoCkBAIC0wLDAgKzEsMjA3IEBACitGcm9tIGU4ZWViMTJlNzkzMzAzODVh MTVmNzY1ZDFjZjdlZThhYzM1MTY3MzYgTW9uIFNlcCAxNyAwMDowMDowMCAyMDAxCitGcm9tOiBB ZGFtIFdpbGxpYW1zb24gPGF3aWxsaWFtQHJlZGhhdC5jb20+CitEYXRlOiBGcmksIDIxIEF1ZyAy MDI2IDE1OjA5OjA3IC0wNzAwCitTdWJqZWN0OiBbUEFUQ0ggNC80XSBSZXZlcnQgImVzcDogVGVt cE1vdW50IEVTUCBpZiBub3QgYWxyZWFkeSBtb3VudGVkIgorCitUaGlzIHJldmVydHMgY29tbWl0 IDE1MGFlMzI4MTQwN2YzMTVkMTMxNjc0ZTBlNWNjNzU4YzRlZTA3NDYuCistLS0KKyBzcmMvZWZp LnJzIHwgMTIzICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCisgMSBmaWxlIGNoYW5nZWQsIDQ4IGluc2VydGlvbnMoKyksIDc1IGRlbGV0aW9ucygt KQorCitkaWZmIC0tZ2l0IGEvc3JjL2VmaS5ycyBiL3NyYy9lZmkucnMKK2luZGV4IDcyYWM1ZDUu LmZjZWVjZDkgMTAwNjQ0CistLS0gYS9zcmMvZWZpLnJzCisrKysgYi9zcmMvZWZpLnJzCitAQCAt MTAsNyArMTAsNiBAQCB1c2Ugc3RkOjpwYXRoOjp7UGF0aCwgUGF0aEJ1Zn07CisgdXNlIHN0ZDo6 cHJvY2Vzczo6Q29tbWFuZDsKKyAKKyB1c2UgYW55aG93Ojp7YmFpbCwgQ29udGV4dCwgUmVzdWx0 fTsKKy11c2UgYm9vdGNfaW50ZXJuYWxfbW91bnQ6OnRlbXBtb3VudDo6VGVtcE1vdW50OworIHVz ZSBib290Y19pbnRlcm5hbF91dGlsczo6Q29tbWFuZFJ1bkV4dDsKKyB1c2UgY2FtaW5vOjp7VXRm OFBhdGgsIFV0ZjhQYXRoQnVmfTsKKyB1c2UgY2FwX3N0ZDo6YW1iaWVudF9hdXRob3JpdHk7CitA QCAtMTksOCArMTgsNiBAQCB1c2UgY2FwX3N0ZF9leHQ6OmNhcF9zdGQ7CisgdXNlIGNhcF9zdGRf ZXh0OjpkaXJleHQ6OkNhcFN0ZEV4dERpckV4dDsKKyB1c2UgZm5fZXJyb3JfY29udGV4dDo6Y29u dGV4dDsKKyB1c2Ugb3NfcmVsZWFzZTo6T3NSZWxlYXNlOworLXVzZSBydXN0aXg6Om1vdW50OjpN b3VudEZsYWdzOworLXVzZSBydXN0aXg6OnBhdGg6OkFyZzsKKyB1c2UgcnVzdGl4Ojp7ZmQ6OkFz RmQsIGZkOjpCb3Jyb3dlZEZkLCBmczo6U3RhdFZmc01vdW50RmxhZ3N9OworIHVzZSB3YWxrZGly OjpXYWxrRGlyOworIHVzZSB3aWRlc3RyaW5nOjpVMTZDU3RyaW5nOworQEAgLTk2LDI1ICs5Mywx MyBAQCBwdWIoY3JhdGUpIHN0cnVjdCBFZmkgeworICAgICAvLy8gV2hldGhlciB0aGUgYWJvdmUg bW91bnRwb2ludCB3YXMgYWxyZWFkeSBtb3VudGVkIG9yIG5vdAorICAgICAvLy8gV29uJ3QgdW5t b3VudCBpZiBpdCB3YXMgYWxyZWFkeSBtb3VudGVkCisgICAgIHdhc19tb3VudGVkOiBSZWZDZWxs PGJvb2w+LAorLSAgICAvLy8gR3VhcmQgZm9yIEVTUCBtb3VudGVkIGF0IGEgdGVtcG9yYXJ5IGxv Y2F0aW9uCistICAgIHRlbXBtb3VudF9ndWFyZDogUmVmQ2VsbDxPcHRpb248VGVtcE1vdW50Pj4s CistfQorLQorLS8vLyBNb3VudCBmbGFncyBzaGFyZWQgYnkgYWxsIEVTUCBtb3VudHM6IG5vbi1l eGVjdXRhYmxlLCBubyBzZXR1aWQuCistY29uc3QgRVNQX01PVU5UX0ZMQUdTOiBNb3VudEZsYWdz ID0KKy0gICAgTW91bnRGbGFnczo6ZnJvbV9iaXRzX3JldGFpbihNb3VudEZsYWdzOjpOT0VYRUMu Yml0cygpIHwgTW91bnRGbGFnczo6Tk9TVUlELmJpdHMoKSk7CistCistLy8vIEZBVCBtb3VudCBv cHRpb25zOiBvd25lci1vbmx5IHBlcm1pc3Npb25zIG9uIGZpbGVzICgwNjAwKSBhbmQgZGlycyAo MDcwMCkuCistY29uc3QgRVNQX01PVU5UX0RBVEE6ICZzdGQ6OmZmaTo6Q1N0ciA9IGMiZm1hc2s9 MDE3NyxkbWFzaz0wMDc3IjsKKy0KKy0vLy8gTW91bnQgdGhlIEVTUCBmcm9tIHRoZSBwcm92aWRl ZCBkZXZpY2UgaW50byBhIHRlbXBvcmFyeSBkaXJlY3RvcnkuCistZm4gbW91bnRfZXNwKGRldmlj ZTogJnN0cikgLT4gUmVzdWx0PFRlbXBNb3VudD4geworLSAgICBUZW1wTW91bnQ6Om1vdW50X2Rl dihkZXZpY2UsICJ2ZmF0IiwgRVNQX01PVU5UX0ZMQUdTLCBTb21lKEVTUF9NT1VOVF9EQVRBKSkK KyB9CisgCisgaW1wbCBFZmkgeworLSAgICAjW2NvbnRleHQoIlNlYXJjaGluZyBjb21tb24gRVNQ IG1vdW50cG9pbnRzIildCistICAgIGZuIHNlYXJjaF9jb21tb25fZXNwX21vdW50cG9pbnRzKCZz ZWxmLCByb290OiAmUGF0aCkgLT4gUmVzdWx0PE9wdGlvbjxQYXRoQnVmPj4geworKyAgICAvLyBH ZXQgbW91bnRlZCBwb2ludCBmb3IgZXNwCisrICAgIHB1YihjcmF0ZSkgZm4gZ2V0X21vdW50ZWRf ZXNwKCZzZWxmLCByb290OiAmUGF0aCkgLT4gUmVzdWx0PE9wdGlvbjxQYXRoQnVmPj4geworKyAg ICAgICAgLy8gRmlyc3QgY2hlY2sgYWxsIHBvdGVudGlhbCBtb3VudCBwb2ludHMgd2l0aG91dCBo b2xkaW5nIHRoZSBib3Jyb3cKKysgICAgICAgIGxldCBtdXQgZm91bmRfbW91bnQgPSBOb25lOwor ICAgICAgICAgZm9yICZtbnQgaW4gRVNQX01PVU5UUy5pdGVyKCkgeworICAgICAgICAgICAgIGxl dCBwYXRoID0gcm9vdC5qb2luKG1udCk7CisgICAgICAgICAgICAgaWYgIXBhdGguZXhpc3RzKCkg eworQEAgLTEzNCw2MyArMTE5LDU5IEBAIGltcGwgRWZpIHsKKyAgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOworICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgIHV0aWw6OmVu c3VyZV93cml0YWJsZV9tb3VudCgmcGF0aCk/OworLSAgICAgICAgICAgICAgICByZXR1cm4gT2so U29tZShwYXRoKSk7CisrICAgICAgICAgICAgICAgICpzZWxmLndhc19tb3VudGVkLmJvcnJvd19t dXQoKSA9IHRydWU7CisrICAgICAgICAgICAgICAgIGZvdW5kX21vdW50ID0gU29tZShwYXRoKTsK KysgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgfQorICAgICAgICAgfQorIAor LSAgICAgICAgT2soTm9uZSkKKy0gICAgfQorLQorLSAgICAvLy8gR2V0IG1vdW50ZWQgcG9pbnQg Zm9yIEVTUAorLSAgICAvLy8gTk9URTogVGhpcyBmdW5jdGlvbiBvbmx5IHNlYXJjaGVzIHRoZSBj b21tb24gRVNQIG1vdW50cG9pbnRzIGFuZCByZXR1cm5zCistICAgIC8vLyB0aGUgcGF0aCBvZiB0 aGUgbW91bnRwb2ludCwgaWYgdGhlcmUgaXMgb25lCistICAgICNbY29udGV4dCgiR2V0dGluZyBt b3VudGVkIEVTUCIpXQorLSAgICBwdWIoY3JhdGUpIGZuIGdldF9tb3VudGVkX2VzcCgmc2VsZiwg cm9vdDogJlBhdGgpIC0+IFJlc3VsdDxPcHRpb248UGF0aEJ1Zj4+IHsKKy0gICAgICAgIGxldCBT b21lKG1udCkgPSBzZWxmLnNlYXJjaF9jb21tb25fZXNwX21vdW50cG9pbnRzKHJvb3QpPyBlbHNl IHsKKy0gICAgICAgICAgICByZXR1cm4gT2soTm9uZSk7CistICAgICAgICB9OworLQorICAgICAg ICAgLy8gT25seSBib3Jyb3cgbXV0YWJseSBpZiB3ZSBmb3VuZCBhIG1vdW50IHBvaW50CistICAg ICAgICBsb2c6OmRlYnVnISgiUmV1c2luZyBleGlzdGluZyBtb3VudCBwb2ludCB7bW50Oj99Iik7 CistICAgICAgICAqc2VsZi53YXNfbW91bnRlZC5ib3Jyb3dfbXV0KCkgPSB0cnVlOworLSAgICAg ICAgKnNlbGYubW91bnRwb2ludC5ib3Jyb3dfbXV0KCkgPSBTb21lKG1udC5jbG9uZSgpKTsKKy0g ICAgICAgIE9rKFNvbWUobW50KSkKKysgICAgICAgIGlmIGxldCBTb21lKG1udCkgPSBmb3VuZF9t b3VudCB7CisrICAgICAgICAgICAgbG9nOjpkZWJ1ZyEoIlJldXNpbmcgZXhpc3RpbmcgbW91bnQg cG9pbnQge21udDo/fSIpOworKyAgICAgICAgICAgICpzZWxmLm1vdW50cG9pbnQuYm9ycm93X211 dCgpID0gU29tZShtbnQuY2xvbmUoKSk7CisrICAgICAgICAgICAgT2soU29tZShtbnQpKQorKyAg ICAgICAgfSBlbHNlIHsKKysgICAgICAgICAgICBPayhOb25lKQorKyAgICAgICAgfQorICAgICB9 CisgCistICAgIC8vLyBNb3VudCB0aGUgcGFzc2VkIGVzcF9kZXZpY2UsIHJldHVybiBtb3VudCBw b2ludAorLSAgICAjW2NvbnRleHQoIk1vdW50aW5nIEVTUCBkZXZpY2UgYXQge30iLCByb290LmRp c3BsYXkoKSldCisrICAgIC8vIE1vdW50IHRoZSBwYXNzZWQgZXNwX2RldmljZSwgcmV0dXJuIG1v dW50IHBvaW50CisgICAgIHB1YihjcmF0ZSkgZm4gbW91bnRfZXNwX2RldmljZSgmc2VsZiwgcm9v dDogJlBhdGgsIGVzcF9kZXZpY2U6ICZQYXRoKSAtPiBSZXN1bHQ8UGF0aEJ1Zj4geworLSAgICAg ICAgbWF0Y2ggc2VsZi5zZWFyY2hfY29tbW9uX2VzcF9tb3VudHBvaW50cyhyb290KT8geworLSAg ICAgICAgICAgIFNvbWUobW50KSA9PiB7CistICAgICAgICAgICAgICAgIGxvZzo6ZGVidWchKCJN b3VudGVkIGF0IHs6P30iLCBtbnQpOworLSAgICAgICAgICAgICAgICAqc2VsZi53YXNfbW91bnRl ZC5ib3Jyb3dfbXV0KCkgPSB0cnVlOworLSAgICAgICAgICAgICAgICAqc2VsZi5tb3VudHBvaW50 LmJvcnJvd19tdXQoKSA9IFNvbWUobW50LmNsb25lKCkpOworKyAgICAgICAgbGV0IG11dCBtb3Vu dHBvaW50ID0gTm9uZTsKKyAKKy0gICAgICAgICAgICAgICAgT2sobW50KQorKyAgICAgICAgZm9y ICZtbnQgaW4gRVNQX01PVU5UUy5pdGVyKCkgeworKyAgICAgICAgICAgIGxldCBtbnQgPSByb290 LmpvaW4obW50KTsKKysgICAgICAgICAgICBpZiAhbW50LmV4aXN0cygpIHsKKysgICAgICAgICAg ICAgICAgY29udGludWU7CisgICAgICAgICAgICAgfQorLSAgICAgICAgICAgIE5vbmUgPT4gewor LSAgICAgICAgICAgICAgICAvLyBJZiB0aGUgRVNQIGlzbid0IGFscmVhZHkgbW91bnRlZCBhdCAv Ym9vdCwgL2Jvb3QvZWZpIG1vdW50IGl0IGF0IGEgdGVtcG9yYXJ5IHBvaW50CistICAgICAgICAg ICAgICAgIC8vIFRoaXMgaXMgc28gdGhhdCB3ZSBkb24ndCBzaGFkb3cgZXhpc3RpbmcgZmlsZXMg aW4gdGhlIGFib3ZlIGRpcmVjdG9yaWVzCistICAgICAgICAgICAgICAgIGxldCBlc3BfbW91bnQg PSBtb3VudF9lc3AoCistICAgICAgICAgICAgICAgICAgICBlc3BfZGV2aWNlCistICAgICAgICAg ICAgICAgICAgICAgICAgLmFzX3N0cigpCistICAgICAgICAgICAgICAgICAgICAgICAgLmNvbnRl eHQoIkNvbnZlcnRpbmcgZXNwX2RldmljZSBwYXRoIHRvIHN0ciIpPywKKy0gICAgICAgICAgICAg ICAgKQorLSAgICAgICAgICAgICAgICAuY29udGV4dCgiQ3JlYXRpbmcgdGVtcCBFU1AgbW91bnQi KT87CistCistICAgICAgICAgICAgICAgIGxldCBtbnRfcGF0aCA9IGVzcF9tb3VudC5kaXIucGF0 aCgpLnRvX3BhdGhfYnVmKCk7CistICAgICAgICAgICAgICAgICpzZWxmLm1vdW50cG9pbnQuYm9y cm93X211dCgpID0gU29tZShtbnRfcGF0aC5jbG9uZSgpKTsKKy0gICAgICAgICAgICAgICAgKnNl bGYudGVtcG1vdW50X2d1YXJkLmJvcnJvd19tdXQoKSA9IFNvbWUoZXNwX21vdW50KTsKKyAKKy0g ICAgICAgICAgICAgICAgT2sobW50X3BhdGgpCisrICAgICAgICAgICAgLy8gQ2hlY2sgaWYgdGhl IHRhcmdldCBpcyBhbHJlYWR5IGEgbW91bnRlZCBFU1AgKGUuZy4gdGhlIGhvc3QKKysgICAgICAg ICAgICAvLyBhbHJlYWR5IGhhcyB0aGUgRVNQIG1vdW50ZWQgd2hlbiBydW5uaW5nIGluc3RhbGwt dG8tZmlsZXN5c3RlbSkuCisrICAgICAgICAgICAgbGV0IHN0ID0gcnVzdGl4Ojpmczo6c3RhdGZz KCZtbnQpPzsKKysgICAgICAgICAgICBpZiBzdC5mX3R5cGUgPT0gbGliYzo6TVNET1NfU1VQRVJf TUFHSUMgeworKyAgICAgICAgICAgICAgICBpZiBpc19tb3VudF9wb2ludCgmbW50KT8geworKyAg ICAgICAgICAgICAgICAgICAgbG9nOjpkZWJ1ZyEoIkVTUCBhbHJlYWR5IG1vdW50ZWQgYXQge21u dDo/fSwgcmV1c2luZyIpOworKyAgICAgICAgICAgICAgICAgICAgbW91bnRwb2ludCA9IFNvbWUo bW50KTsKKysgICAgICAgICAgICAgICAgICAgICpzZWxmLndhc19tb3VudGVkLmJvcnJvd19tdXQo KSA9IHRydWU7CisrICAgICAgICAgICAgICAgICAgICBicmVhazsKKysgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgIH0KKysKKysgICAgICAgICAgICBzdGQ6OnByb2Nlc3M6OkNvbW1hbmQ6 Om5ldygibW91bnQiKQorKyAgICAgICAgICAgICAgICAuYXJnKCZlc3BfZGV2aWNlKQorKyAgICAg ICAgICAgICAgICAuYXJnKCZtbnQpCisrICAgICAgICAgICAgICAgIC5ydW5faW5oZXJpdGVkKCkK KysgICAgICAgICAgICAgICAgLndpdGhfY29udGV4dCh8fCBmb3JtYXQhKCJGYWlsZWQgdG8gbW91 bnQgezo/fSIsIGVzcF9kZXZpY2UpKT87CisrICAgICAgICAgICAgbG9nOjpkZWJ1ZyEoIk1vdW50 ZWQgYXQge21udDo/fSIpOworKyAgICAgICAgICAgIG1vdW50cG9pbnQgPSBTb21lKG1udCk7Cisr ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICB9CisrICAgICAgICBsZXQgbW50ID0gbW91bnRw b2ludC5va19vcl9lbHNlKHx8IGFueWhvdzo6YW55aG93ISgiTm8gbW91bnQgcG9pbnQgZm91bmQi KSk/OworKyAgICAgICAgKnNlbGYubW91bnRwb2ludC5ib3Jyb3dfbXV0KCkgPSBTb21lKG1udC5j bG9uZSgpKTsKKysgICAgICAgIE9rKG1udCkKKyAgICAgfQorIAorLSAgICAvLy8gQ2hlY2tzIGlm IHdlIGhhdmUgYWxyZWFkeSBtb3VudGVkIHRoZSBFU1AKKy0gICAgLy8vIElmIG5vdCwgY2hlY2tz IGlmIHRoZSBFU1AgaXMgbW91bnRlZCBhdCBjb21tb24gbW91bnRwb2ludHMsIGkuZS4gL2Jvb3Qs IC9ib290L2VmaQorLSAgICAvLy8gRWxzZSwgbW91bnRzIHRoZSBFU1AgYXQgYSB0ZW1wIHBhdGgK Ky0gICAgI1tjb250ZXh0KCJFbnN1cmluZyBtb3VudGVkIEVTUCIpXQorKyAgICAvLyBGaXJzdGx5 IGNoZWNrIGlmIGVzcCBpcyBhbHJlYWR5IG1vdW50ZWQsIHRoZW4gbW91bnQgdGhlIHBhc3NlZCBl c3AgZGV2aWNlCisgICAgIHB1YihjcmF0ZSkgZm4gZW5zdXJlX21vdW50ZWRfZXNwKCZzZWxmLCBy b290OiAmUGF0aCwgZXNwX2RldmljZTogJlBhdGgpIC0+IFJlc3VsdDxQYXRoQnVmPiB7CisgICAg ICAgICBpZiBsZXQgU29tZShtb3VudHBvaW50KSA9IHNlbGYubW91bnRwb2ludC5ib3Jyb3coKS5h c19kZXJlZigpIHsKKyAgICAgICAgICAgICByZXR1cm4gT2sobW91bnRwb2ludC50b19vd25lZCgp KTsKK0BAIC0yMDQsMjcgKzE4NSwxNCBAQCBpbXBsIEVmaSB7CisgICAgIH0KKyAKKyAgICAgcHVi KGNyYXRlKSBmbiB1bm1vdW50KCZzZWxmKSAtPiBSZXN1bHQ8KCk+IHsKKy0gICAgICAgIGlmICpz ZWxmLndhc19tb3VudGVkLmJvcnJvdygpIHsKKy0gICAgICAgICAgICBsb2c6OmRlYnVnISgiTW91 bnRwb2ludCB3YXMgYWxyZWFkeSBtb3VudGVkLCB3b24ndCB1bm1vdW50Iik7CistICAgICAgICAg ICAgcmV0dXJuIE9rKCgpKTsKKy0gICAgICAgIH0KKy0KKyAgICAgICAgICpzZWxmLndhc19tb3Vu dGVkLmJvcnJvd19tdXQoKSA9IGZhbHNlOworLQorICAgICAgICAgaWYgbGV0IFNvbWUobW91bnQp ID0gc2VsZi5tb3VudHBvaW50LmJvcnJvd19tdXQoKS50YWtlKCkgeworLSAgICAgICAgICAgIGlm IGxldCBTb21lKHRtcG1vdW50KSA9IHNlbGYudGVtcG1vdW50X2d1YXJkLmJvcnJvd19tdXQoKS50 YWtlKCkgeworLSAgICAgICAgICAgICAgICBkcm9wKHRtcG1vdW50KTsKKy0gICAgICAgICAgICAg ICAgbG9nOjp0cmFjZSEoIkRyb3BwZWQgdGVtcG1vdW50Iik7CistICAgICAgICAgICAgICAgIHJl dHVybiBPaygoKSk7CistICAgICAgICAgICAgfQorLQorICAgICAgICAgICAgIENvbW1hbmQ6Om5l dygidW1vdW50IikKKyAgICAgICAgICAgICAgICAgLmFyZygmbW91bnQpCisgICAgICAgICAgICAg ICAgIC5ydW5faW5oZXJpdGVkKCkKKyAgICAgICAgICAgICAgICAgLndpdGhfY29udGV4dCh8fCBm b3JtYXQhKCJGYWlsZWQgdG8gdW5tb3VudCB7bW91bnQ6P30iKSk/OworICAgICAgICAgICAgIGxv Zzo6dHJhY2UhKCJVbm1vdW50ZWQiKTsKKyAgICAgICAgIH0KKy0KKyAgICAgICAgIE9rKCgpKQor ICAgICB9CisgCitAQCAtNzgzLDYgKzc1MSwxMSBAQCBpbXBsIENvbXBvbmVudCBmb3IgRWZpIHsK KyAKKyBpbXBsIERyb3AgZm9yIEVmaSB7CisgICAgIGZuIGRyb3AoJm11dCBzZWxmKSB7CisrICAg ICAgICBpZiAqc2VsZi53YXNfbW91bnRlZC5ib3Jyb3coKSB7CisrICAgICAgICAgICAgbG9nOjpk ZWJ1ZyEoIm1vdW50cG9pbnQgd2FzIGFscmVhZHkgbW91bnRlZC4gV29uJ3QgdW5tb3VudCIsKTsK KysgICAgICAgICAgICByZXR1cm47CisrICAgICAgICB9CisrCisgICAgICAgICBsb2c6OmRlYnVn ISgiVW5tb3VudGluZyB7Oj99Iiwgc2VsZi5tb3VudHBvaW50KTsKKyAgICAgICAgIGxldCBfID0g c2VsZi51bm1vdW50KCk7CisgICAgIH0KKy0tIAorMi41NS4wCisKCmRpZmYgLS1naXQgYS9ydXN0 LWJvb3R1cGQuc3BlYyBiL3J1c3QtYm9vdHVwZC5zcGVjCmluZGV4IGJkOGRjNmIuLjM3MDAxMmUg MTAwNjQ0Ci0tLSBhL3J1c3QtYm9vdHVwZC5zcGVjCisrKyBiL3J1c3QtYm9vdHVwZC5zcGVjCkBA IC0xMSw2ICsxMSwxNCBAQCBMaWNlbnNlOiAgICAgICAgQXBhY2hlLTIuMAogVVJMOiAgICAgICAg ICAgIGh0dHBzOi8vZ2l0aHViLmNvbS9jb3Jlb3MvYm9vdHVwZAogU291cmNlMDogICAgICAgICV7 Y3JhdGVzX3NvdXJjZX0KIFNvdXJjZTE6ICAgICAgICAle3VybH0vcmVsZWFzZXMvZG93bmxvYWQv diV7dmVyc2lvbn0vYm9vdHVwZC0le3ZlcnNpb259LXZlbmRvci50YXIuenN0ZAorIyBSZXZlcnQg aHR0cHM6Ly9naXRodWIuY29tL2NvcmVvcy9ib290dXBkL3B1bGwvMTEyNgorIyB0byBmaXggVUVG SSBpbnN0YWxscyAtIHNlZQorIyBodHRwczovL2dpdGh1Yi5jb20vY29yZW9zL2Jvb3R1cGQvaXNz dWVzLzExMzkKK1BhdGNoOiAgICAgICAgICAwMDAxLVJldmVydC1GaXgtZ3J1Yi1zdGF0aWMtY29u ZmlnLWluc3RhbGwucGF0Y2gKK1BhdGNoOiAgICAgICAgICAwMDAyLVJldmVydC1jb21wb25lbnQt QWRkLWFzX2FueS1tZXRob2QtZm9yLWRvd25jYXN0aW5nLnBhdGNoCitQYXRjaDogICAgICAgICAg MDAwMy1SZXZlcnQtZXNwLVVwZGF0ZS11bm1vdW50LW1ldGhvZC5wYXRjaAorUGF0Y2g6ICAgICAg ICAgIDAwMDQtUmV2ZXJ0LWVzcC1UZW1wTW91bnQtRVNQLWlmLW5vdC1hbHJlYWR5LW1vdW50ZWQu cGF0Y2gKKwogRXhjbHVkZUFyY2g6ICAgICV7aXg4Nn0KIAogIyBGb3Igbm93LCBzZWUgdXBzdHJl YW0K