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: Leo Sandoval To: git-commits@fedoraproject.org Subject: [rpms/grub2] f45: bli: Allow overriding PACKAGE_STRING via grub-mkimage Date: Wed, 23 Sep 2026 19:26:39 GMT Message-ID: <179019159990.1.4611324093568797780.rpms-grub2-aed73aaf0e29@fedoraproject.org> List-ID: X-Git-Repo: rpms/grub2 X-Git-Branch: f45 X-Git-Rev: aed73aaf0e296e4cd95dbe25c1178000b781a77b ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvZ3J1YjIKICAgICAgICAgICAgQnJhbmNoIDogZjQ1CiAgICAgICAgICAgIENv bW1pdCA6IGFlZDczYWFmMGUyOTZlNGNkOTVkYmUyNWMxMTc4MDAwYjc4MWE3N2IKICAgICAgICAg ICAgQXV0aG9yIDogTGVvIFNhbmRvdmFsIDxsc2FuZG92YUByZWRoYXQuY29tPgogICAgICAgICAg ICBEYXRlICAgOiAyMDI2LTA5LTIzVDExOjUxOjMzLTA2OjAwCiAgICAgICAgICAgIFN0YXRzICA6 ICsyNjQvLTEgaW4gMyBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8vc3JjLmZl ZG9yYXByb2plY3Qub3JnL3JwbXMvZ3J1YjIvYy9hZWQ3M2FhZjBlMjk2ZTRjZDk1ZGJlMjVjMTE3 ODAwMGI3ODFhNzdiP2JyYW5jaD1mNDUKCiAgICAgICAgICAgIExvZzoKICAgICAgICAgICAgYmxp OiBBbGxvdyBvdmVycmlkaW5nIFBBQ0tBR0VfU1RSSU5HIHZpYSBncnViLW1raW1hZ2UKClRoaXMg Y2hhbmdlIHByb3Bvc2FsIGlzIGludGVuZGVkIHRvIGVuaGFuY2UgdGhlIGdydWIyLW1raW1hZ2Ug dG9vbCBhbmQKaW5jbHVkZSB0aGUgcGFyYW1ldGVyICctLXBhY2thZ2Utc3RyaW5nJyB3aGljaCB3 b3VsZCBiZSBmdXJ0aGVyIHVzZWQKYnkgdGhlIG5ldyBncnViLWNjIHBhY2thZ2UuIFVsdGltYXRl bHkgdGhpcyB3b3VsZCBiZSByZWZsZWN0ZWQgaW50bwp0aGUgTG9hZGVySW5mb3IgRUZJIHZhcmlh YmxlIHNldCBieSB0aGUgJ2JsaScgbW9kdWxlLCBlLmcuCgogICAgIyBjYXQgL3N5cy9maXJtd2Fy ZS9lZmkvZWZpdmFycy9Mb2FkZXJJbmZvLTRhNjdiMDgyLTBhNGMtNDFjZi1iNmM3LTQ0MGIyOWJi OGM0ZgogICAgR1JVQiBDQyAyLjEyLTc1LmZjNDUKClNpZ25lZC1vZmYtYnk6IExlbyBTYW5kb3Zh bCA8bHNhbmRvdmFAcmVkaGF0LmNvbT4KCi0tLQpkaWZmIC0tZ2l0IGEvMDQ1MS1ibGktQWxsb3ct b3ZlcnJpZGluZy1QQUNLQUdFX1NUUklORy12aWEtZ3J1Yi1ta2ltYWdlLnBhdGNoIGIvMDQ1MS1i bGktQWxsb3ctb3ZlcnJpZGluZy1QQUNLQUdFX1NUUklORy12aWEtZ3J1Yi1ta2ltYWdlLnBhdGNo Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE4ZjU1MDQKLS0tIC9kZXYvbnVs bAorKysgYi8wNDUxLWJsaS1BbGxvdy1vdmVycmlkaW5nLVBBQ0tBR0VfU1RSSU5HLXZpYS1ncnVi LW1raW1hZ2UucGF0Y2gKQEAgLTAsMCArMSwyNTkgQEAKK0Zyb20gMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IExl byBTYW5kb3ZhbCA8bHNhbmRvdmFAcmVkaGF0LmNvbT4KK0RhdGU6IE1vbiwgMTAgQXVnIDIwMjYg MTM6NTM6MjMgLTA2MDAKK1N1YmplY3Q6IFtQQVRDSF0gYmxpOiBBbGxvdyBvdmVycmlkaW5nIFBB Q0tBR0VfU1RSSU5HIHZpYSBncnViLW1raW1hZ2UKKworQWRkIGEgLS1wYWNrYWdlLXN0cmluZyBv cHRpb24gdG8gZ3J1Yi1ta2ltYWdlIGFuZCBncnViLWluc3RhbGwgdGhhdAorZW1iZWRzIGEgY3Vz dG9tIHZlcnNpb24gc3RyaW5nIGludG8gdGhlIEdSVUIgaW1hZ2UuIFRoZSBibGkgbW9kdWxlIHJl YWRzCit0aGlzIHN0cmluZyBhdCBpbml0aWFsaXphdGlvbiBhbmQgdXNlcyBpdCBmb3IgdGhlIExv YWRlckluZm8gRUZJIHZhcmlhYmxlCitpbnN0ZWFkIG9mIHRoZSBjb21waWxlLXRpbWUgUEFDS0FH RV9TVFJJTkcuCisKK1RoaXMgYWxsb3dzIGRpc3RyaWJ1dGlvbnMgdG8gc2V0IGEgZGlzdHJvLXNw ZWNpZmljIHZlcnNpb24gc3RyaW5nIChlLmcuCisiR1JVQiBDQyAyLjEyLTQ1IiBmb3IgQ29uZmlk ZW50aWFsIENvbXB1dGluZykgYXQgaW1hZ2UgY3JlYXRpb24gdGltZQord2l0aG91dCByZWJ1aWxk aW5nIGZyb20gc291cmNlIHdoaWNoIGlzIGRlc2lyZWQgZm9yIHBhY2thZ2VzIGxpa2UKK2luY29t aW5nIGdydWIyLWNvbmZpZGVudGlhbC1jb21wdXRpbmcgWzFdLgorCitUaGUgaW1wbGVtZW50YXRp b24gZm9sbG93cyB0aGUgZXhpc3RpbmcgT0JKX1RZUEUgcGF0dGVybiB1c2VkIGJ5CitPQkpfVFlQ RV9QUkVGSVggYW5kIE9CSl9UWVBFX0RJU0FCTEVfVFBNX1NUUklOR19QQ1I6IGdydWItbWtpbWFn ZQorZW1iZWRzIHRoZSBzdHJpbmcgYXMgYSBtb2R1bGUgaGVhZGVyIHdpdGggdHlwZSBPQkpfVFlQ RV9QQUNLQUdFX1NUUklORywKK2FuZCB0aGUgYmxpIG1vZHVsZSBpdGVyYXRlcyB0aGUgZW1iZWRk ZWQgbW9kdWxlcyB3aXRoIEZPUl9NT0RVTEVTIHRvCitmaW5kIGl0LiBJZiBubyAtLXBhY2thZ2Ut c3RyaW5nIHdhcyBnaXZlbiwgdGhlIGNvbXBpbGUtdGltZQorUEFDS0FHRV9TVFJJTkcgaXMgdXNl ZCBhcyBhIGZhbGxiYWNrLgorCitbMV0KK2h0dHBzOi8vZmVkb3JhcHJvamVjdC5vcmcvd2lraS9D aGFuZ2VzL0dydWIyTGlnaHRGb3JDb25maWRlbnRpYWxDb21wdXRpbmcKK1syXSBodHRwczovL2J1 Z3ppbGxhLnJlZGhhdC5jb20vc2hvd19idWcuY2dpP2lkPTI1MTM1OTkKKworQ28tQXV0aG9yZWQt Qnk6IENsYXVkZSBPcHVzIDQuNiA8bm9yZXBseUBhbnRocm9waWMuY29tPgorU2lnbmVkLW9mZi1i eTogTGVvIFNhbmRvdmFsIDxsc2FuZG92YUByZWRoYXQuY29tPgorLS0tCisgZ3J1Yi1jb3JlL2Nv bW1hbmRzL2JsaS5jICAgIHwgMTUgKysrKysrKysrKysrKystCisgaW5jbHVkZS9ncnViL2tlcm5l bC5oICAgICAgIHwgIDMgKystCisgaW5jbHVkZS9ncnViL3V0aWwvaW5zdGFsbC5oIHwgIDggKysr KysrLS0KKyB1dGlsL2dydWItaW5zdGFsbC1jb21tb24uYyAgfCAxMyArKysrKysrKysrKy0tCisg dXRpbC9ncnViLW1raW1hZ2UuYyAgICAgICAgIHwgMTIgKysrKysrKysrKystCisgdXRpbC9ta2lt YWdlLmMgICAgICAgICAgICAgIHwgMjQgKysrKysrKysrKysrKysrKysrKysrKy0tCisgNiBmaWxl cyBjaGFuZ2VkLCA2NiBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQorCitkaWZmIC0tZ2l0 IGEvZ3J1Yi1jb3JlL2NvbW1hbmRzL2JsaS5jIGIvZ3J1Yi1jb3JlL2NvbW1hbmRzL2JsaS5jCitp bmRleCAyOThjNWY3MGEuLjUzYzhmZjAxYyAxMDA2NDQKKy0tLSBhL2dydWItY29yZS9jb21tYW5k cy9ibGkuYworKysrIGIvZ3J1Yi1jb3JlL2NvbW1hbmRzL2JsaS5jCitAQCAtMjgsNiArMjgsNyBA QAorICNpbmNsdWRlIDxncnViL21pc2MuaD4KKyAjaW5jbHVkZSA8Z3J1Yi9tbS5oPgorICNpbmNs dWRlIDxncnViL3BhcnRpdGlvbi5oPgorKyNpbmNsdWRlIDxncnViL2tlcm5lbC5oPgorICNpbmNs dWRlIDxncnViL3R5cGVzLmg+CisgCisgR1JVQl9NT0RfTElDRU5TRSAoIkdQTHYzKyIpOworQEAg LTEyOSw3ICsxMzAsMTkgQEAgc2V0X2xvYWRlcl9kZXZpY2VfcGFydF91dWlkICh2b2lkKQorIAor IEdSVUJfTU9EX0lOSVQgKGJsaSkKKyB7CistICBncnViX2VmaV9zZXRfdmFyaWFibGVfdG9fc3Ry aW5nICgiTG9hZGVySW5mbyIsICZibGlfdmVuZG9yX2d1aWQsIFBBQ0tBR0VfU1RSSU5HLAorKyAg Y29uc3QgY2hhciAqbG9hZGVyX2luZm8gPSBQQUNLQUdFX1NUUklORzsKKysgIHN0cnVjdCBncnVi X21vZHVsZV9oZWFkZXIgKmhlYWRlcjsKKysKKysgIEZPUl9NT0RVTEVTIChoZWFkZXIpCisrICAg IHsKKysgICAgICBpZiAoaGVhZGVyLT50eXBlID09IE9CSl9UWVBFX1BBQ0tBR0VfU1RSSU5HKQor Kwl7CisrCSAgbG9hZGVyX2luZm8gPSAoY29uc3QgY2hhciAqKSAoaGVhZGVyICsgMSk7CisrCSAg YnJlYWs7CisrCX0KKysgICAgfQorKworKyAgZ3J1Yl9lZmlfc2V0X3ZhcmlhYmxlX3RvX3N0cmlu ZyAoIkxvYWRlckluZm8iLCAmYmxpX3ZlbmRvcl9ndWlkLCBsb2FkZXJfaW5mbywKKyAJCQkJICAg R1JVQl9FRklfVkFSSUFCTEVfQk9PVFNFUlZJQ0VfQUNDRVNTIHwKKyAJCQkJICAgR1JVQl9FRklf VkFSSUFCTEVfUlVOVElNRV9BQ0NFU1MpOworICAgc2V0X2xvYWRlcl9kZXZpY2VfcGFydF91dWlk ICgpOworZGlmZiAtLWdpdCBhL2luY2x1ZGUvZ3J1Yi9rZXJuZWwuaCBiL2luY2x1ZGUvZ3J1Yi9r ZXJuZWwuaAoraW5kZXggMGU5YWQ5ZmE1Li40M2U3ZjQzYzMgMTAwNjQ0CistLS0gYS9pbmNsdWRl L2dydWIva2VybmVsLmgKKysrKyBiL2luY2x1ZGUvZ3J1Yi9rZXJuZWwuaAorQEAgLTM0LDcgKzM0 LDggQEAgZW51bQorICAgT0JKX1RZUEVfR1BHX1BVQktFWSwKKyAgIE9CSl9UWVBFX1g1MDlfUFVC S0VZLAorICAgT0JKX1RZUEVfRElTQUJMRV9DTEksCistICBPQkpfVFlQRV9ESVNBQkxFX1RQTV9T VFJJTkdfUENSCisrICBPQkpfVFlQRV9ESVNBQkxFX1RQTV9TVFJJTkdfUENSLAorKyAgT0JKX1RZ UEVfUEFDS0FHRV9TVFJJTkcKKyB9OworIAorIC8qIFRoZSBtb2R1bGUgaGVhZGVyLiAgKi8KK2Rp ZmYgLS1naXQgYS9pbmNsdWRlL2dydWIvdXRpbC9pbnN0YWxsLmggYi9pbmNsdWRlL2dydWIvdXRp bC9pbnN0YWxsLmgKK2luZGV4IGUzZTY3MmU4My4uMzcwYTIwOTM4IDEwMDY0NAorLS0tIGEvaW5j bHVkZS9ncnViL3V0aWwvaW5zdGFsbC5oCisrKysgYi9pbmNsdWRlL2dydWIvdXRpbC9pbnN0YWxs LmgKK0BAIC03Niw2ICs3Niw4IEBACisgICAgIE5fKCJkaXNhYmxlZCBjb21tYW5kIGxpbmUgaW50 ZXJmYWNlIGFjY2VzcyIpLCAwIH0sCQkJXAorICAgeyAiZGlzYWJsZS10cG0tc3RyaW5nLXBjciIs IEdSVUJfSU5TVEFMTF9PUFRJT05TX0RJU0FCTEVfVFBNX1NUUklOR19QQ1IsIDAsIDAsIFwKKyAg ICAgICBOXygiZGlzYWJsZSBUUE0gc3RyaW5nIFBDUiBtZWFzdXJlbWVudHMiKSwgMCB9LAkJCVwK KysgIHsgInBhY2thZ2Utc3RyaW5nIiwgR1JVQl9JTlNUQUxMX09QVElPTlNfUEFDS0FHRV9TVFJJ TkcsIE5fKCJTVFJJTkciKSwgMCwgXAorKyAgICAgIE5fKCJvdmVycmlkZSB0aGUgcGFja2FnZSB2 ZXJzaW9uIHN0cmluZyBlbWJlZGRlZCBpbiB0aGUgaW1hZ2UiKSwgMCB9LCBcCisgICB7ICJ2ZXJi b3NlIiwgJ3YnLCAwLCAwLAkJCQkJCVwKKyAgICAgTl8oInByaW50IHZlcmJvc2UgbWVzc2FnZXMu IiksIDEgfQorIAorQEAgLTE0MSw3ICsxNDMsOCBAQCBlbnVtIGdydWJfaW5zdGFsbF9vcHRpb25z IHsKKyAgIEdSVUJfSU5TVEFMTF9PUFRJT05TX0RJU0FCTEVfU0hJTV9MT0NLLAorICAgR1JVQl9J TlNUQUxMX09QVElPTlNfQVBQRU5ERURfU0lHTkFUVVJFX1NJWkUsCisgICBHUlVCX0lOU1RBTExf T1BUSU9OU19ESVNBQkxFX0NMSSwKKy0gIEdSVUJfSU5TVEFMTF9PUFRJT05TX0RJU0FCTEVfVFBN X1NUUklOR19QQ1IKKysgIEdSVUJfSU5TVEFMTF9PUFRJT05TX0RJU0FCTEVfVFBNX1NUUklOR19Q Q1IsCisrICBHUlVCX0lOU1RBTExfT1BUSU9OU19QQUNLQUdFX1NUUklORworIH07CisgCisgZXh0 ZXJuIGNoYXIgKmdydWJfaW5zdGFsbF9zb3VyY2VfZGlyZWN0b3J5OworQEAgLTIwNiw3ICsyMDks OCBAQCBncnViX2luc3RhbGxfZ2VuZXJhdGVfaW1hZ2UgKGNvbnN0IGNoYXIgKmRpciwgY29uc3Qg Y2hhciAqcHJlZml4LAorIAkJCSAgICAgZ3J1Yl9jb21wcmVzc2lvbl90IGNvbXAsIGNvbnN0IGNo YXIgKmR0Yl9maWxlLAorIAkJCSAgICAgY29uc3QgY2hhciAqc2JhdF9wYXRoLCBjb25zdCBpbnQg ZGlzYWJsZV9zaGltX2xvY2ssCisgCQkJICAgICBjb25zdCBpbnQgZGlzYWJsZV9jbGksCistCQkJ ICAgICBjb25zdCBpbnQgZGlzYWJsZV90cG1fc3RyaW5nX3Bjcik7CisrCQkJICAgICBjb25zdCBp bnQgZGlzYWJsZV90cG1fc3RyaW5nX3BjciwKKysJCQkgICAgIGNvbnN0IGNoYXIgKnBhY2thZ2Vf c3RyaW5nKTsKKyAKKyBjb25zdCBzdHJ1Y3QgZ3J1Yl9pbnN0YWxsX2ltYWdlX3RhcmdldF9kZXNj ICoKKyBncnViX2luc3RhbGxfZ2V0X2ltYWdlX3RhcmdldCAoY29uc3QgY2hhciAqYXJnKTsKK2Rp ZmYgLS1naXQgYS91dGlsL2dydWItaW5zdGFsbC1jb21tb24uYyBiL3V0aWwvZ3J1Yi1pbnN0YWxs LWNvbW1vbi5jCitpbmRleCA5Y2ZhMTRhY2MuLmIwZWUyZDkxZCAxMDA2NDQKKy0tLSBhL3V0aWwv Z3J1Yi1pbnN0YWxsLWNvbW1vbi5jCisrKysgYi91dGlsL2dydWItaW5zdGFsbC1jb21tb24uYwor QEAgLTQ3MSw2ICs0NzEsNyBAQCBzdGF0aWMgZ3J1Yl9jb21wcmVzc2lvbl90IGNvbXByZXNzaW9u OworIHN0YXRpYyBzaXplX3QgYXBwc2lnX3NpemU7Cisgc3RhdGljIGludCBkaXNhYmxlX2NsaTsK KyBzdGF0aWMgaW50IGRpc2FibGVfdHBtX3N0cmluZ19wY3I7Cisrc3RhdGljIGNoYXIgKnBhY2th Z2Vfc3RyaW5nOworIAorIGludAorIGdydWJfaW5zdGFsbF9wYXJzZSAoaW50IGtleSwgY2hhciAq YXJnKQorQEAgLTUyMiw2ICs1MjMsMTIgQEAgZ3J1Yl9pbnN0YWxsX3BhcnNlIChpbnQga2V5LCBj aGFyICphcmcpCisgICAgIGNhc2UgR1JVQl9JTlNUQUxMX09QVElPTlNfRElTQUJMRV9UUE1fU1RS SU5HX1BDUjoKKyAgICAgICBkaXNhYmxlX3RwbV9zdHJpbmdfcGNyID0gMTsKKyAgICAgICByZXR1 cm4gMTsKKysgICAgY2FzZSBHUlVCX0lOU1RBTExfT1BUSU9OU19QQUNLQUdFX1NUUklORzoKKysg ICAgICBpZiAocGFja2FnZV9zdHJpbmcpCisrCWZyZWUgKHBhY2thZ2Vfc3RyaW5nKTsKKysKKysg ICAgICBwYWNrYWdlX3N0cmluZyA9IHhzdHJkdXAgKGFyZyk7CisrICAgICAgcmV0dXJuIDE7Cisg CisgICAgIGNhc2UgR1JVQl9JTlNUQUxMX09QVElPTlNfVkVSQk9TSVRZOgorICAgICAgIHZlcmJv c2l0eSsrOworQEAgLTcyMyw3ICs3MzAsOCBAQCBncnViX2luc3RhbGxfbWFrZV9pbWFnZV93cmFw X2ZpbGUgKGNvbnN0IGNoYXIgKmRpciwgY29uc3QgY2hhciAqcHJlZml4LAorIAkJICBub3RlID8g IiAtLW5vdGUiIDogIiIsCisgCQkgIGRpc2FibGVfc2hpbV9sb2NrID8gIiAtLWRpc2FibGUtc2hp bS1sb2NrIiA6ICIiLAorIAkJICBkaXNhYmxlX2NsaSA/ICIgLS1kaXNhYmxlLWNsaSIgOiAiIiwK Ky0JCSAgZGlzYWJsZV90cG1fc3RyaW5nX3BjciA/ICIgLS1kaXNhYmxlLXRwbS1zdHJpbmctcGNy IiA6ICIiLCBzKTsKKysJCSAgZGlzYWJsZV90cG1fc3RyaW5nX3BjciA/ICIgLS1kaXNhYmxlLXRw bS1zdHJpbmctcGNyIiA6ICIiLAorKwkJICBwYWNrYWdlX3N0cmluZyA/ICIgLS1wYWNrYWdlLXN0 cmluZyIgOiAiIiwgcyk7CisgICBmcmVlIChzKTsKKyAKKyAgIHRndCA9IGdydWJfaW5zdGFsbF9n ZXRfaW1hZ2VfdGFyZ2V0IChta2ltYWdlX3RhcmdldCk7CitAQCAtNzM3LDcgKzc0NSw4IEBAIGdy dWJfaW5zdGFsbF9tYWtlX2ltYWdlX3dyYXBfZmlsZSAoY29uc3QgY2hhciAqZGlyLCBjb25zdCBj aGFyICpwcmVmaXgsCisgCQkJICAgICAgIGNvbmZpZ19wYXRoLCB0Z3QsCisgCQkJICAgICAgIG5v dGUsIGFwcHNpZ19zaXplLCBjb21wcmVzc2lvbiwgZHRiLCBzYmF0LAorIAkJCSAgICAgICBkaXNh YmxlX3NoaW1fbG9jaywgZGlzYWJsZV9jbGksCistCQkJICAgICAgIGRpc2FibGVfdHBtX3N0cmlu Z19wY3IpOworKwkJCSAgICAgICBkaXNhYmxlX3RwbV9zdHJpbmdfcGNyLAorKwkJCSAgICAgICBw YWNrYWdlX3N0cmluZyk7CisgICB3aGlsZSAoZGMtLSkKKyAgICAgZ3J1Yl9pbnN0YWxsX3BvcF9t b2R1bGUgKCk7CisgfQorZGlmZiAtLWdpdCBhL3V0aWwvZ3J1Yi1ta2ltYWdlLmMgYi91dGlsL2dy dWItbWtpbWFnZS5jCitpbmRleCA5OWQ1YzYwNDYuLjFiYzY0ZmJiYiAxMDA2NDQKKy0tLSBhL3V0 aWwvZ3J1Yi1ta2ltYWdlLmMKKysrKyBiL3V0aWwvZ3J1Yi1ta2ltYWdlLmMKK0BAIC04Niw2ICs4 Niw3IEBAIHN0YXRpYyBzdHJ1Y3QgYXJncF9vcHRpb24gb3B0aW9uc1tdID0geworICAgeyJkaXNh YmxlLXNoaW0tbG9jayIsIEdSVUJfSU5TVEFMTF9PUFRJT05TX0RJU0FCTEVfU0hJTV9MT0NLLCAw LCAwLCBOXygiZGlzYWJsZSBzaGltX2xvY2sgdmVyaWZpZXIiKSwgMH0sCisgICB7ImRpc2FibGUt Y2xpIiwgR1JVQl9JTlNUQUxMX09QVElPTlNfRElTQUJMRV9DTEksIDAsIDAsIE5fKCJkaXNhYmxl IGNvbW1hbmQgbGluZSBpbnRlcmZhY2UgYWNjZXNzIiksIDB9LAorICAgeyJkaXNhYmxlLXRwbS1z dHJpbmctcGNyIiwgR1JVQl9JTlNUQUxMX09QVElPTlNfRElTQUJMRV9UUE1fU1RSSU5HX1BDUiwg MCwgMCwgTl8oImRpc2FibGUgVFBNIHN0cmluZyBQQ1IgbWVhc3VyZW1lbnRzIiksIDB9LAorKyAg eyJwYWNrYWdlLXN0cmluZyIsIEdSVUJfSU5TVEFMTF9PUFRJT05TX1BBQ0tBR0VfU1RSSU5HLCBO XygiU1RSSU5HIiksIDAsIE5fKCJvdmVycmlkZSB0aGUgcGFja2FnZSB2ZXJzaW9uIHN0cmluZyBl bWJlZGRlZCBpbiB0aGUgaW1hZ2UiKSwgMH0sCisgICB7InZlcmJvc2UiLCAgICAgJ3YnLCAwLCAg ICAgIDAsIE5fKCJwcmludCB2ZXJib3NlIG1lc3NhZ2VzLiIpLCAwfSwKKyAgIHsiYXBwZW5kZWQt c2lnbmF0dXJlLXNpemUiLCAnUycsIE5fKCJTSVpFIiksIDAsIE5fKCJBZGQgYSBub3RlIHNlZ21l bnQgcmVzZXJ2aW5nIFNJWkUgYnl0ZXMgZm9yIGFuIGFwcGVuZGVkIHNpZ25hdHVyZSIpLCAwfSwK KyAgIHsgMCwgMCwgMCwgMCwgMCwgMCB9CitAQCAtMTM3LDYgKzEzOCw3IEBAIHN0cnVjdCBhcmd1 bWVudHMKKyAgIHNpemVfdCBhcHBzaWdfc2l6ZTsKKyAgIGludCBkaXNhYmxlX2NsaTsKKyAgIGlu dCBkaXNhYmxlX3RwbV9zdHJpbmdfcGNyOworKyAgY2hhciAqcGFja2FnZV9zdHJpbmc7CisgICBj b25zdCBzdHJ1Y3QgZ3J1Yl9pbnN0YWxsX2ltYWdlX3RhcmdldF9kZXNjICppbWFnZV90YXJnZXQ7 CisgICBncnViX2NvbXByZXNzaW9uX3QgY29tcDsKKyB9OworQEAgLTI3MSw2ICsyNzMsMTMgQEAg YXJncF9wYXJzZXIgKGludCBrZXksIGNoYXIgKmFyZywgc3RydWN0IGFyZ3Bfc3RhdGUgKnN0YXRl KQorICAgICAgIGFyZ3VtZW50cy0+ZGlzYWJsZV90cG1fc3RyaW5nX3BjciA9IDE7CisgICAgICAg YnJlYWs7CisgCisrICAgIGNhc2UgR1JVQl9JTlNUQUxMX09QVElPTlNfUEFDS0FHRV9TVFJJTkc6 CisrICAgICAgaWYgKGFyZ3VtZW50cy0+cGFja2FnZV9zdHJpbmcpCisrCWZyZWUgKGFyZ3VtZW50 cy0+cGFja2FnZV9zdHJpbmcpOworKworKyAgICAgIGFyZ3VtZW50cy0+cGFja2FnZV9zdHJpbmcg PSB4c3RyZHVwIChhcmcpOworKyAgICAgIGJyZWFrOworKworICAgICBjYXNlICd2JzoKKyAgICAg ICB2ZXJib3NpdHkrKzsKKyAgICAgICBicmVhazsKK0BAIC0zNjEsNyArMzcwLDggQEAgbWFpbiAo aW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKKyAJCQkgICAgICAgYXJndW1lbnRzLmR0YiwgYXJndW1l bnRzLnNiYXQsCisgCQkJICAgICAgIGFyZ3VtZW50cy5kaXNhYmxlX3NoaW1fbG9jaywKKyAJCQkg ICAgICAgYXJndW1lbnRzLmRpc2FibGVfY2xpLAorLQkJCSAgICAgICBhcmd1bWVudHMuZGlzYWJs ZV90cG1fc3RyaW5nX3Bjcik7CisrCQkJICAgICAgIGFyZ3VtZW50cy5kaXNhYmxlX3RwbV9zdHJp bmdfcGNyLAorKwkJCSAgICAgICBhcmd1bWVudHMucGFja2FnZV9zdHJpbmcpOworIAorICAgaWYg KGdydWJfdXRpbF9maWxlX3N5bmMgKGZwKSA8IDApCisgICAgIGdydWJfdXRpbF9lcnJvciAoXygi Y2Fubm90IHN5bmMgYCVzJzogJXMiKSwgYXJndW1lbnRzLm91dHB1dCA/IDogInN0ZG91dCIsCitk aWZmIC0tZ2l0IGEvdXRpbC9ta2ltYWdlLmMgYi91dGlsL21raW1hZ2UuYworaW5kZXggNzI3NWEx YjkyLi5kZTEzODZjZmMgMTAwNjQ0CistLS0gYS91dGlsL21raW1hZ2UuYworKysrIGIvdXRpbC9t a2ltYWdlLmMKK0BAIC04ODksMTIgKzg4OSwxMyBAQCBncnViX2luc3RhbGxfZ2VuZXJhdGVfaW1h Z2UgKGNvbnN0IGNoYXIgKmRpciwgY29uc3QgY2hhciAqcHJlZml4LAorIAkJCSAgICAgaW50IG5v dGUsIHNpemVfdCBhcHBzaWdfc2l6ZSwgZ3J1Yl9jb21wcmVzc2lvbl90IGNvbXAsCisgCQkJICAg ICBjb25zdCBjaGFyICpkdGJfcGF0aCwgY29uc3QgY2hhciAqc2JhdF9wYXRoLAorIAkJCSAgICAg aW50IGRpc2FibGVfc2hpbV9sb2NrLCBpbnQgZGlzYWJsZV9jbGksCistCQkJICAgICBpbnQgZGlz YWJsZV90cG1fc3RyaW5nX3BjcikKKysJCQkgICAgIGludCBkaXNhYmxlX3RwbV9zdHJpbmdfcGNy LAorKwkJCSAgICAgY29uc3QgY2hhciAqcGFja2FnZV9zdHJpbmcpCisgeworICAgY2hhciAqa2Vy bmVsX2ltZywgKmNvcmVfaW1nOworICAgc2l6ZV90IHRvdGFsX21vZHVsZV9zaXplLCBjb3JlX3Np emU7CisgICBzaXplX3QgbWVtZGlza19zaXplID0gMCwgY29uZmlnX3NpemUgPSAwOworLSAgc2l6 ZV90IHByZWZpeF9zaXplID0gMCwgZHRiX3NpemUgPSAwLCBzYmF0X3NpemUgPSAwOworKyAgc2l6 ZV90IHByZWZpeF9zaXplID0gMCwgZHRiX3NpemUgPSAwLCBzYmF0X3NpemUgPSAwLCBwYWNrYWdl X3N0cmluZ19zaXplID0gMDsKKyAgIGNoYXIgKmtlcm5lbF9wYXRoOworICAgc2l6ZV90IG9mZnNl dDsKKyAgIHN0cnVjdCBncnViX3V0aWxfcGF0aF9saXN0ICpwYXRoX2xpc3QsICpwOworQEAgLTk3 MCw2ICs5NzEsMTIgQEAgZ3J1Yl9pbnN0YWxsX2dlbmVyYXRlX2ltYWdlIChjb25zdCBjaGFyICpk aXIsIGNvbnN0IGNoYXIgKnByZWZpeCwKKyAgIGlmIChkaXNhYmxlX3RwbV9zdHJpbmdfcGNyKQor ICAgICB0b3RhbF9tb2R1bGVfc2l6ZSArPSBzaXplb2YgKHN0cnVjdCBncnViX21vZHVsZV9oZWFk ZXIpOworIAorKyAgaWYgKHBhY2thZ2Vfc3RyaW5nKQorKyAgICB7CisrICAgICAgcGFja2FnZV9z dHJpbmdfc2l6ZSA9IEFMSUdOX0FERFIgKHN0cmxlbiAocGFja2FnZV9zdHJpbmcpICsgMSk7Cisr ICAgICAgdG90YWxfbW9kdWxlX3NpemUgKz0gcGFja2FnZV9zdHJpbmdfc2l6ZSArIHNpemVvZiAo c3RydWN0IGdydWJfbW9kdWxlX2hlYWRlcik7CisrICAgIH0KKysKKyAgIGlmIChjb25maWdfcGF0 aCkKKyAgICAgeworICAgICAgIGNvbmZpZ19zaXplID0gQUxJR05fQUREUiAoZ3J1Yl91dGlsX2dl dF9pbWFnZV9zaXplIChjb25maWdfcGF0aCkgKyAxKTsKK0BAIC0xMTU2LDYgKzExNjMsMTkgQEAg Z3J1Yl9pbnN0YWxsX2dlbmVyYXRlX2ltYWdlIChjb25zdCBjaGFyICpkaXIsIGNvbnN0IGNoYXIg KnByZWZpeCwKKyAgICAgICBvZmZzZXQgKz0gc2l6ZW9mICgqaGVhZGVyKTsKKyAgICAgfQorIAor KyAgaWYgKHBhY2thZ2Vfc3RyaW5nKQorKyAgICB7CisrICAgICAgc3RydWN0IGdydWJfbW9kdWxl X2hlYWRlciAqaGVhZGVyOworKworKyAgICAgIGhlYWRlciA9IChzdHJ1Y3QgZ3J1Yl9tb2R1bGVf aGVhZGVyICopIChrZXJuZWxfaW1nICsgb2Zmc2V0KTsKKysgICAgICBoZWFkZXItPnR5cGUgPSBn cnViX2hvc3RfdG9fdGFyZ2V0MzIgKE9CSl9UWVBFX1BBQ0tBR0VfU1RSSU5HKTsKKysgICAgICBo ZWFkZXItPnNpemUgPSBncnViX2hvc3RfdG9fdGFyZ2V0MzIgKHBhY2thZ2Vfc3RyaW5nX3NpemUg KyBzaXplb2YgKCpoZWFkZXIpKTsKKysgICAgICBvZmZzZXQgKz0gc2l6ZW9mICgqaGVhZGVyKTsK KysKKysgICAgICBncnViX3N0cmNweSAoa2VybmVsX2ltZyArIG9mZnNldCwgcGFja2FnZV9zdHJp bmcpOworKyAgICAgIG9mZnNldCArPSBwYWNrYWdlX3N0cmluZ19zaXplOworKyAgICB9CisrCisg ICBpZiAoY29uZmlnX3BhdGgpCisgICAgIHsKKyAgICAgICBzdHJ1Y3QgZ3J1Yl9tb2R1bGVfaGVh ZGVyICpoZWFkZXI7CgpkaWZmIC0tZ2l0IGEvZ3J1Yi5wYXRjaGVzIGIvZ3J1Yi5wYXRjaGVzCmlu ZGV4IDI5YTFmY2IuLmYxNmZlMTUgMTAwNjQ0Ci0tLSBhL2dydWIucGF0Y2hlcworKysgYi9ncnVi LnBhdGNoZXMKQEAgLTQ0MiwzICs0NDIsNCBAQCBQYXRjaDA0NDc6IDA0NDctdHBtLU9ubHktc2tp cC1UUE0tc3RyaW5nLVBDUi1tZWFzdXJlbWVudHMtd2l0aC1leHBsaS5wYXRjaAogUGF0Y2gwNDQ4 OiAwNDQ4LVJldmVydC1Vc2UtbWVkYW55LWluc3RlYWQtb2YtbGFyZ2UtbW9kZWwtZm9yLVJJU0NW LnBhdGNoCiBQYXRjaDA0NDk6IDA0NDktY29uZmlndXJlLUFkZC1tbm8tcmVsYXgtb24tcmlzY3Yu cGF0Y2gKIFBhdGNoMDQ1MDogMDQ1MC1jb25maWd1cmUtRGVmZXItY2hlY2stZm9yLW1jbW9kZWwt bGFyZ2UtdW50aWwtUElDLVBJLnBhdGNoCitQYXRjaDA0NTE6IDA0NTEtYmxpLUFsbG93LW92ZXJy aWRpbmctUEFDS0FHRV9TVFJJTkctdmlhLWdydWItbWtpbWFnZS5wYXRjaApcIE5vIG5ld2xpbmUg YXQgZW5kIG9mIGZpbGUKCmRpZmYgLS1naXQgYS9ncnViMi5zcGVjIGIvZ3J1YjIuc3BlYwppbmRl eCA4ZGUyMTc0Li5jOWU4YWIzIDEwMDY0NAotLS0gYS9ncnViMi5zcGVjCisrKyBiL2dydWIyLnNw ZWMKQEAgLTE3LDcgKzE3LDcgQEAKIE5hbWU6CQlncnViMgogRXBvY2g6CQkxCiBWZXJzaW9uOgky LjEyCi1SZWxlYXNlOgk3NyV7P2Rpc3R9CitSZWxlYXNlOgk3OCV7P2Rpc3R9CiBTdW1tYXJ5OglC b290bG9hZGVyIHdpdGggc3VwcG9ydCBmb3IgTGludXgsIE11bHRpYm9vdCBhbmQgbW9yZQogTGlj ZW5zZToJR1BMLTMuMC1vci1sYXRlcgogVVJMOgkJaHR0cDovL3d3dy5nbnUub3JnL3NvZnR3YXJl L2dydWIvCkBAIC03MDIsNiArNzAyLDkgQEAgZmkKICVlbmRpZgogCiAlY2hhbmdlbG9nCisqIFdl ZCBTZXAgMjMgMjAyNiBMZW8gU2FuZG92YWwgPGxzYW5kb3ZhQHJlZGhhdC5jb20+IC0gMi4xMi03 OAorLSBibGk6IEFsbG93IG92ZXJyaWRpbmcgUEFDS0FHRV9TVFJJTkcgdmlhIGdydWItbWtpbWFn ZQorCiAqIFRodSBBdWcgMjAgMjAyNiBBbmRyZWEgQm9sb2duYW5pIDxhYm9sb2duYUByZWRoYXQu Y29tPiAtIDIuMTItNzcKIC0gVXNlIGxhcmdlIGNvZGUgbW9kZWwgb24gcmlzY3Y2NAogCg==