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] rawhide: bli: Allow overriding PACKAGE_STRING via grub-mkimage Date: Tue, 11 Aug 2026 18:00:09 GMT Message-ID: <178647120949.1.4120452136128922858.rpms-grub2-89a6a08bfb05@fedoraproject.org> List-ID: X-Git-Repo: rpms/grub2 X-Git-Branch: rawhide X-Git-Rev: 89a6a08bfb05ab7deeb53f05c60fc91a719441f0 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvZ3J1YjIKICAgICAgICAgICAgQnJhbmNoIDogcmF3aGlkZQogICAgICAgICAg ICBDb21taXQgOiA4OWE2YTA4YmZiMDVhYjdkZWViNTNmMDVjNjBmYzkxYTcxOTQ0MWYwCiAgICAg ICAgICAgIEF1dGhvciA6IExlbyBTYW5kb3ZhbCA8bHNhbmRvdmFAcmVkaGF0LmNvbT4KICAgICAg ICAgICAgRGF0ZSAgIDogMjAyNi0wOC0xMFQxNzozNzo1MC0wNjowMAogICAgICAgICAgICBTdGF0 cyAgOiArMjY3Ly0yIGluIDQgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczovL3Ny Yy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2dydWIyL2MvODlhNmEwOGJmYjA1YWI3ZGVlYjUzZjA1 YzYwZmM5MWE3MTk0NDFmMD9icmFuY2g9cmF3aGlkZQoKICAgICAgICAgICAgTG9nOgogICAgICAg ICAgICBibGk6IEFsbG93IG92ZXJyaWRpbmcgUEFDS0FHRV9TVFJJTkcgdmlhIGdydWItbWtpbWFn ZQoKVGhpcyBjaGFuZ2UgcHJvcG9zYWwgaXMgaW50ZW5kZWQgdG8gZW5oYW5jZSB0aGUgZ3J1YjIt bWtpbWFnZSB0b29sIGFuZAppbmNsdWRlIHRoZSBwYXJhbWV0ZXIgJy0tcGFja2FnZS1zdHJpbmcn IHdoaWNoIHdvdWxkIGJlIGZ1cnRoZXIgdXNlZApieSB0aGUgbmV3IGdydWIyLWNvbmZpZGVudGlh bC1jb21wdXRpbmcgcGFja2FnZSBbMSwyXS4gVWx0aW1hdGVseSB0aGlzIHdvdWxkCmJlIHJlZmxl Y3RlZCBpbnRvIHRoZSBMb2FkZXJJbmZvciBFRkkgdmFyaWFibGUgc2V0IGJ5IHRoZSAnYmxpJyBt b2R1bGUsIGUuZy4KCiAgICAjIGNhdCAvc3lzL2Zpcm13YXJlL2VmaS9lZml2YXJzL0xvYWRlcklu Zm8tNGE2N2IwODItMGE0Yy00MWNmLWI2YzctNDQwYjI5YmI4YzRmCiAgICBHUlVCIENDIDIuMTIt NzUuZmM0NQoKU2lnbmVkLW9mZi1ieTogTGVvIFNhbmRvdmFsIDxsc2FuZG92YUByZWRoYXQuY29t PgoKLS0tCmRpZmYgLS1naXQgYS8wNDQ4LWJsaS1BbGxvdy1vdmVycmlkaW5nLVBBQ0tBR0VfU1RS SU5HLXZpYS1ncnViLW1raW1hZ2UucGF0Y2ggYi8wNDQ4LWJsaS1BbGxvdy1vdmVycmlkaW5nLVBB Q0tBR0VfU1RSSU5HLXZpYS1ncnViLW1raW1hZ2UucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMC4uYThmNTUwNAotLS0gL2Rldi9udWxsCisrKyBiLzA0NDgtYmxpLUFsbG93 LW92ZXJyaWRpbmctUEFDS0FHRV9TVFJJTkctdmlhLWdydWItbWtpbWFnZS5wYXRjaApAQCAtMCww ICsxLDI1OSBAQAorRnJvbSAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogTGVvIFNhbmRvdmFsIDxsc2FuZG92YUBy ZWRoYXQuY29tPgorRGF0ZTogTW9uLCAxMCBBdWcgMjAyNiAxMzo1MzoyMyAtMDYwMAorU3ViamVj dDogW1BBVENIXSBibGk6IEFsbG93IG92ZXJyaWRpbmcgUEFDS0FHRV9TVFJJTkcgdmlhIGdydWIt bWtpbWFnZQorCitBZGQgYSAtLXBhY2thZ2Utc3RyaW5nIG9wdGlvbiB0byBncnViLW1raW1hZ2Ug YW5kIGdydWItaW5zdGFsbCB0aGF0CitlbWJlZHMgYSBjdXN0b20gdmVyc2lvbiBzdHJpbmcgaW50 byB0aGUgR1JVQiBpbWFnZS4gVGhlIGJsaSBtb2R1bGUgcmVhZHMKK3RoaXMgc3RyaW5nIGF0IGlu aXRpYWxpemF0aW9uIGFuZCB1c2VzIGl0IGZvciB0aGUgTG9hZGVySW5mbyBFRkkgdmFyaWFibGUK K2luc3RlYWQgb2YgdGhlIGNvbXBpbGUtdGltZSBQQUNLQUdFX1NUUklORy4KKworVGhpcyBhbGxv d3MgZGlzdHJpYnV0aW9ucyB0byBzZXQgYSBkaXN0cm8tc3BlY2lmaWMgdmVyc2lvbiBzdHJpbmcg KGUuZy4KKyJHUlVCIENDIDIuMTItNDUiIGZvciBDb25maWRlbnRpYWwgQ29tcHV0aW5nKSBhdCBp bWFnZSBjcmVhdGlvbiB0aW1lCit3aXRob3V0IHJlYnVpbGRpbmcgZnJvbSBzb3VyY2Ugd2hpY2gg aXMgZGVzaXJlZCBmb3IgcGFja2FnZXMgbGlrZQoraW5jb21pbmcgZ3J1YjItY29uZmlkZW50aWFs LWNvbXB1dGluZyBbMV0uCisKK1RoZSBpbXBsZW1lbnRhdGlvbiBmb2xsb3dzIHRoZSBleGlzdGlu ZyBPQkpfVFlQRSBwYXR0ZXJuIHVzZWQgYnkKK09CSl9UWVBFX1BSRUZJWCBhbmQgT0JKX1RZUEVf RElTQUJMRV9UUE1fU1RSSU5HX1BDUjogZ3J1Yi1ta2ltYWdlCitlbWJlZHMgdGhlIHN0cmluZyBh cyBhIG1vZHVsZSBoZWFkZXIgd2l0aCB0eXBlIE9CSl9UWVBFX1BBQ0tBR0VfU1RSSU5HLAorYW5k IHRoZSBibGkgbW9kdWxlIGl0ZXJhdGVzIHRoZSBlbWJlZGRlZCBtb2R1bGVzIHdpdGggRk9SX01P RFVMRVMgdG8KK2ZpbmQgaXQuIElmIG5vIC0tcGFja2FnZS1zdHJpbmcgd2FzIGdpdmVuLCB0aGUg Y29tcGlsZS10aW1lCitQQUNLQUdFX1NUUklORyBpcyB1c2VkIGFzIGEgZmFsbGJhY2suCisKK1sx XQoraHR0cHM6Ly9mZWRvcmFwcm9qZWN0Lm9yZy93aWtpL0NoYW5nZXMvR3J1YjJMaWdodEZvckNv bmZpZGVudGlhbENvbXB1dGluZworWzJdIGh0dHBzOi8vYnVnemlsbGEucmVkaGF0LmNvbS9zaG93 X2J1Zy5jZ2k/aWQ9MjUxMzU5OQorCitDby1BdXRob3JlZC1CeTogQ2xhdWRlIE9wdXMgNC42IDxu b3JlcGx5QGFudGhyb3BpYy5jb20+CitTaWduZWQtb2ZmLWJ5OiBMZW8gU2FuZG92YWwgPGxzYW5k b3ZhQHJlZGhhdC5jb20+CistLS0KKyBncnViLWNvcmUvY29tbWFuZHMvYmxpLmMgICAgfCAxNSAr KysrKysrKysrKysrKy0KKyBpbmNsdWRlL2dydWIva2VybmVsLmggICAgICAgfCAgMyArKy0KKyBp bmNsdWRlL2dydWIvdXRpbC9pbnN0YWxsLmggfCAgOCArKysrKystLQorIHV0aWwvZ3J1Yi1pbnN0 YWxsLWNvbW1vbi5jICB8IDEzICsrKysrKysrKysrLS0KKyB1dGlsL2dydWItbWtpbWFnZS5jICAg ICAgICAgfCAxMiArKysrKysrKysrKy0KKyB1dGlsL21raW1hZ2UuYyAgICAgICAgICAgICAgfCAy NCArKysrKysrKysrKysrKysrKysrKysrLS0KKyA2IGZpbGVzIGNoYW5nZWQsIDY2IGluc2VydGlv bnMoKyksIDkgZGVsZXRpb25zKC0pCisKK2RpZmYgLS1naXQgYS9ncnViLWNvcmUvY29tbWFuZHMv YmxpLmMgYi9ncnViLWNvcmUvY29tbWFuZHMvYmxpLmMKK2luZGV4IDI5OGM1ZjcwYS4uNTNjOGZm MDFjIDEwMDY0NAorLS0tIGEvZ3J1Yi1jb3JlL2NvbW1hbmRzL2JsaS5jCisrKysgYi9ncnViLWNv cmUvY29tbWFuZHMvYmxpLmMKK0BAIC0yOCw2ICsyOCw3IEBACisgI2luY2x1ZGUgPGdydWIvbWlz Yy5oPgorICNpbmNsdWRlIDxncnViL21tLmg+CisgI2luY2x1ZGUgPGdydWIvcGFydGl0aW9uLmg+ CisrI2luY2x1ZGUgPGdydWIva2VybmVsLmg+CisgI2luY2x1ZGUgPGdydWIvdHlwZXMuaD4KKyAK KyBHUlVCX01PRF9MSUNFTlNFICgiR1BMdjMrIik7CitAQCAtMTI5LDcgKzEzMCwxOSBAQCBzZXRf bG9hZGVyX2RldmljZV9wYXJ0X3V1aWQgKHZvaWQpCisgCisgR1JVQl9NT0RfSU5JVCAoYmxpKQor IHsKKy0gIGdydWJfZWZpX3NldF92YXJpYWJsZV90b19zdHJpbmcgKCJMb2FkZXJJbmZvIiwgJmJs aV92ZW5kb3JfZ3VpZCwgUEFDS0FHRV9TVFJJTkcsCisrICBjb25zdCBjaGFyICpsb2FkZXJfaW5m byA9IFBBQ0tBR0VfU1RSSU5HOworKyAgc3RydWN0IGdydWJfbW9kdWxlX2hlYWRlciAqaGVhZGVy OworKworKyAgRk9SX01PRFVMRVMgKGhlYWRlcikKKysgICAgeworKyAgICAgIGlmIChoZWFkZXIt PnR5cGUgPT0gT0JKX1RZUEVfUEFDS0FHRV9TVFJJTkcpCisrCXsKKysJICBsb2FkZXJfaW5mbyA9 IChjb25zdCBjaGFyICopIChoZWFkZXIgKyAxKTsKKysJICBicmVhazsKKysJfQorKyAgICB9Cisr CisrICBncnViX2VmaV9zZXRfdmFyaWFibGVfdG9fc3RyaW5nICgiTG9hZGVySW5mbyIsICZibGlf dmVuZG9yX2d1aWQsIGxvYWRlcl9pbmZvLAorIAkJCQkgICBHUlVCX0VGSV9WQVJJQUJMRV9CT09U U0VSVklDRV9BQ0NFU1MgfAorIAkJCQkgICBHUlVCX0VGSV9WQVJJQUJMRV9SVU5USU1FX0FDQ0VT Uyk7CisgICBzZXRfbG9hZGVyX2RldmljZV9wYXJ0X3V1aWQgKCk7CitkaWZmIC0tZ2l0IGEvaW5j bHVkZS9ncnViL2tlcm5lbC5oIGIvaW5jbHVkZS9ncnViL2tlcm5lbC5oCitpbmRleCAwZTlhZDlm YTUuLjQzZTdmNDNjMyAxMDA2NDQKKy0tLSBhL2luY2x1ZGUvZ3J1Yi9rZXJuZWwuaAorKysrIGIv aW5jbHVkZS9ncnViL2tlcm5lbC5oCitAQCAtMzQsNyArMzQsOCBAQCBlbnVtCisgICBPQkpfVFlQ RV9HUEdfUFVCS0VZLAorICAgT0JKX1RZUEVfWDUwOV9QVUJLRVksCisgICBPQkpfVFlQRV9ESVNB QkxFX0NMSSwKKy0gIE9CSl9UWVBFX0RJU0FCTEVfVFBNX1NUUklOR19QQ1IKKysgIE9CSl9UWVBF X0RJU0FCTEVfVFBNX1NUUklOR19QQ1IsCisrICBPQkpfVFlQRV9QQUNLQUdFX1NUUklORworIH07 CisgCisgLyogVGhlIG1vZHVsZSBoZWFkZXIuICAqLworZGlmZiAtLWdpdCBhL2luY2x1ZGUvZ3J1 Yi91dGlsL2luc3RhbGwuaCBiL2luY2x1ZGUvZ3J1Yi91dGlsL2luc3RhbGwuaAoraW5kZXggZTNl NjcyZTgzLi4zNzBhMjA5MzggMTAwNjQ0CistLS0gYS9pbmNsdWRlL2dydWIvdXRpbC9pbnN0YWxs LmgKKysrKyBiL2luY2x1ZGUvZ3J1Yi91dGlsL2luc3RhbGwuaAorQEAgLTc2LDYgKzc2LDggQEAK KyAgICAgTl8oImRpc2FibGVkIGNvbW1hbmQgbGluZSBpbnRlcmZhY2UgYWNjZXNzIiksIDAgfSwJ CQlcCisgICB7ICJkaXNhYmxlLXRwbS1zdHJpbmctcGNyIiwgR1JVQl9JTlNUQUxMX09QVElPTlNf RElTQUJMRV9UUE1fU1RSSU5HX1BDUiwgMCwgMCwgXAorICAgICAgIE5fKCJkaXNhYmxlIFRQTSBz dHJpbmcgUENSIG1lYXN1cmVtZW50cyIpLCAwIH0sCQkJXAorKyAgeyAicGFja2FnZS1zdHJpbmci LCBHUlVCX0lOU1RBTExfT1BUSU9OU19QQUNLQUdFX1NUUklORywgTl8oIlNUUklORyIpLCAwLCBc CisrICAgICAgTl8oIm92ZXJyaWRlIHRoZSBwYWNrYWdlIHZlcnNpb24gc3RyaW5nIGVtYmVkZGVk IGluIHRoZSBpbWFnZSIpLCAwIH0sIFwKKyAgIHsgInZlcmJvc2UiLCAndicsIDAsIDAsCQkJCQkJ XAorICAgICBOXygicHJpbnQgdmVyYm9zZSBtZXNzYWdlcy4iKSwgMSB9CisgCitAQCAtMTQxLDcg KzE0Myw4IEBAIGVudW0gZ3J1Yl9pbnN0YWxsX29wdGlvbnMgeworICAgR1JVQl9JTlNUQUxMX09Q VElPTlNfRElTQUJMRV9TSElNX0xPQ0ssCisgICBHUlVCX0lOU1RBTExfT1BUSU9OU19BUFBFTkRF RF9TSUdOQVRVUkVfU0laRSwKKyAgIEdSVUJfSU5TVEFMTF9PUFRJT05TX0RJU0FCTEVfQ0xJLAor LSAgR1JVQl9JTlNUQUxMX09QVElPTlNfRElTQUJMRV9UUE1fU1RSSU5HX1BDUgorKyAgR1JVQl9J TlNUQUxMX09QVElPTlNfRElTQUJMRV9UUE1fU1RSSU5HX1BDUiwKKysgIEdSVUJfSU5TVEFMTF9P UFRJT05TX1BBQ0tBR0VfU1RSSU5HCisgfTsKKyAKKyBleHRlcm4gY2hhciAqZ3J1Yl9pbnN0YWxs X3NvdXJjZV9kaXJlY3Rvcnk7CitAQCAtMjA2LDcgKzIwOSw4IEBAIGdydWJfaW5zdGFsbF9nZW5l cmF0ZV9pbWFnZSAoY29uc3QgY2hhciAqZGlyLCBjb25zdCBjaGFyICpwcmVmaXgsCisgCQkJICAg ICBncnViX2NvbXByZXNzaW9uX3QgY29tcCwgY29uc3QgY2hhciAqZHRiX2ZpbGUsCisgCQkJICAg ICBjb25zdCBjaGFyICpzYmF0X3BhdGgsIGNvbnN0IGludCBkaXNhYmxlX3NoaW1fbG9jaywKKyAJ CQkgICAgIGNvbnN0IGludCBkaXNhYmxlX2NsaSwKKy0JCQkgICAgIGNvbnN0IGludCBkaXNhYmxl X3RwbV9zdHJpbmdfcGNyKTsKKysJCQkgICAgIGNvbnN0IGludCBkaXNhYmxlX3RwbV9zdHJpbmdf cGNyLAorKwkJCSAgICAgY29uc3QgY2hhciAqcGFja2FnZV9zdHJpbmcpOworIAorIGNvbnN0IHN0 cnVjdCBncnViX2luc3RhbGxfaW1hZ2VfdGFyZ2V0X2Rlc2MgKgorIGdydWJfaW5zdGFsbF9nZXRf aW1hZ2VfdGFyZ2V0IChjb25zdCBjaGFyICphcmcpOworZGlmZiAtLWdpdCBhL3V0aWwvZ3J1Yi1p bnN0YWxsLWNvbW1vbi5jIGIvdXRpbC9ncnViLWluc3RhbGwtY29tbW9uLmMKK2luZGV4IDljZmEx NGFjYy4uYjBlZTJkOTFkIDEwMDY0NAorLS0tIGEvdXRpbC9ncnViLWluc3RhbGwtY29tbW9uLmMK KysrKyBiL3V0aWwvZ3J1Yi1pbnN0YWxsLWNvbW1vbi5jCitAQCAtNDcxLDYgKzQ3MSw3IEBAIHN0 YXRpYyBncnViX2NvbXByZXNzaW9uX3QgY29tcHJlc3Npb247Cisgc3RhdGljIHNpemVfdCBhcHBz aWdfc2l6ZTsKKyBzdGF0aWMgaW50IGRpc2FibGVfY2xpOworIHN0YXRpYyBpbnQgZGlzYWJsZV90 cG1fc3RyaW5nX3BjcjsKKytzdGF0aWMgY2hhciAqcGFja2FnZV9zdHJpbmc7CisgCisgaW50Cisg Z3J1Yl9pbnN0YWxsX3BhcnNlIChpbnQga2V5LCBjaGFyICphcmcpCitAQCAtNTIyLDYgKzUyMywx MiBAQCBncnViX2luc3RhbGxfcGFyc2UgKGludCBrZXksIGNoYXIgKmFyZykKKyAgICAgY2FzZSBH UlVCX0lOU1RBTExfT1BUSU9OU19ESVNBQkxFX1RQTV9TVFJJTkdfUENSOgorICAgICAgIGRpc2Fi bGVfdHBtX3N0cmluZ19wY3IgPSAxOworICAgICAgIHJldHVybiAxOworKyAgICBjYXNlIEdSVUJf SU5TVEFMTF9PUFRJT05TX1BBQ0tBR0VfU1RSSU5HOgorKyAgICAgIGlmIChwYWNrYWdlX3N0cmlu ZykKKysJZnJlZSAocGFja2FnZV9zdHJpbmcpOworKworKyAgICAgIHBhY2thZ2Vfc3RyaW5nID0g eHN0cmR1cCAoYXJnKTsKKysgICAgICByZXR1cm4gMTsKKyAKKyAgICAgY2FzZSBHUlVCX0lOU1RB TExfT1BUSU9OU19WRVJCT1NJVFk6CisgICAgICAgdmVyYm9zaXR5Kys7CitAQCAtNzIzLDcgKzcz MCw4IEBAIGdydWJfaW5zdGFsbF9tYWtlX2ltYWdlX3dyYXBfZmlsZSAoY29uc3QgY2hhciAqZGly LCBjb25zdCBjaGFyICpwcmVmaXgsCisgCQkgIG5vdGUgPyAiIC0tbm90ZSIgOiAiIiwKKyAJCSAg ZGlzYWJsZV9zaGltX2xvY2sgPyAiIC0tZGlzYWJsZS1zaGltLWxvY2siIDogIiIsCisgCQkgIGRp c2FibGVfY2xpID8gIiAtLWRpc2FibGUtY2xpIiA6ICIiLAorLQkJICBkaXNhYmxlX3RwbV9zdHJp bmdfcGNyID8gIiAtLWRpc2FibGUtdHBtLXN0cmluZy1wY3IiIDogIiIsIHMpOworKwkJICBkaXNh YmxlX3RwbV9zdHJpbmdfcGNyID8gIiAtLWRpc2FibGUtdHBtLXN0cmluZy1wY3IiIDogIiIsCisr CQkgIHBhY2thZ2Vfc3RyaW5nID8gIiAtLXBhY2thZ2Utc3RyaW5nIiA6ICIiLCBzKTsKKyAgIGZy ZWUgKHMpOworIAorICAgdGd0ID0gZ3J1Yl9pbnN0YWxsX2dldF9pbWFnZV90YXJnZXQgKG1raW1h Z2VfdGFyZ2V0KTsKK0BAIC03MzcsNyArNzQ1LDggQEAgZ3J1Yl9pbnN0YWxsX21ha2VfaW1hZ2Vf d3JhcF9maWxlIChjb25zdCBjaGFyICpkaXIsIGNvbnN0IGNoYXIgKnByZWZpeCwKKyAJCQkgICAg ICAgY29uZmlnX3BhdGgsIHRndCwKKyAJCQkgICAgICAgbm90ZSwgYXBwc2lnX3NpemUsIGNvbXBy ZXNzaW9uLCBkdGIsIHNiYXQsCisgCQkJICAgICAgIGRpc2FibGVfc2hpbV9sb2NrLCBkaXNhYmxl X2NsaSwKKy0JCQkgICAgICAgZGlzYWJsZV90cG1fc3RyaW5nX3Bjcik7CisrCQkJICAgICAgIGRp c2FibGVfdHBtX3N0cmluZ19wY3IsCisrCQkJICAgICAgIHBhY2thZ2Vfc3RyaW5nKTsKKyAgIHdo aWxlIChkYy0tKQorICAgICBncnViX2luc3RhbGxfcG9wX21vZHVsZSAoKTsKKyB9CitkaWZmIC0t Z2l0IGEvdXRpbC9ncnViLW1raW1hZ2UuYyBiL3V0aWwvZ3J1Yi1ta2ltYWdlLmMKK2luZGV4IDk5 ZDVjNjA0Ni4uMWJjNjRmYmJiIDEwMDY0NAorLS0tIGEvdXRpbC9ncnViLW1raW1hZ2UuYworKysr IGIvdXRpbC9ncnViLW1raW1hZ2UuYworQEAgLTg2LDYgKzg2LDcgQEAgc3RhdGljIHN0cnVjdCBh cmdwX29wdGlvbiBvcHRpb25zW10gPSB7CisgICB7ImRpc2FibGUtc2hpbS1sb2NrIiwgR1JVQl9J TlNUQUxMX09QVElPTlNfRElTQUJMRV9TSElNX0xPQ0ssIDAsIDAsIE5fKCJkaXNhYmxlIHNoaW1f bG9jayB2ZXJpZmllciIpLCAwfSwKKyAgIHsiZGlzYWJsZS1jbGkiLCBHUlVCX0lOU1RBTExfT1BU SU9OU19ESVNBQkxFX0NMSSwgMCwgMCwgTl8oImRpc2FibGUgY29tbWFuZCBsaW5lIGludGVyZmFj ZSBhY2Nlc3MiKSwgMH0sCisgICB7ImRpc2FibGUtdHBtLXN0cmluZy1wY3IiLCBHUlVCX0lOU1RB TExfT1BUSU9OU19ESVNBQkxFX1RQTV9TVFJJTkdfUENSLCAwLCAwLCBOXygiZGlzYWJsZSBUUE0g c3RyaW5nIFBDUiBtZWFzdXJlbWVudHMiKSwgMH0sCisrICB7InBhY2thZ2Utc3RyaW5nIiwgR1JV Ql9JTlNUQUxMX09QVElPTlNfUEFDS0FHRV9TVFJJTkcsIE5fKCJTVFJJTkciKSwgMCwgTl8oIm92 ZXJyaWRlIHRoZSBwYWNrYWdlIHZlcnNpb24gc3RyaW5nIGVtYmVkZGVkIGluIHRoZSBpbWFnZSIp LCAwfSwKKyAgIHsidmVyYm9zZSIsICAgICAndicsIDAsICAgICAgMCwgTl8oInByaW50IHZlcmJv c2UgbWVzc2FnZXMuIiksIDB9LAorICAgeyJhcHBlbmRlZC1zaWduYXR1cmUtc2l6ZSIsICdTJywg Tl8oIlNJWkUiKSwgMCwgTl8oIkFkZCBhIG5vdGUgc2VnbWVudCByZXNlcnZpbmcgU0laRSBieXRl cyBmb3IgYW4gYXBwZW5kZWQgc2lnbmF0dXJlIiksIDB9LAorICAgeyAwLCAwLCAwLCAwLCAwLCAw IH0KK0BAIC0xMzcsNiArMTM4LDcgQEAgc3RydWN0IGFyZ3VtZW50cworICAgc2l6ZV90IGFwcHNp Z19zaXplOworICAgaW50IGRpc2FibGVfY2xpOworICAgaW50IGRpc2FibGVfdHBtX3N0cmluZ19w Y3I7CisrICBjaGFyICpwYWNrYWdlX3N0cmluZzsKKyAgIGNvbnN0IHN0cnVjdCBncnViX2luc3Rh bGxfaW1hZ2VfdGFyZ2V0X2Rlc2MgKmltYWdlX3RhcmdldDsKKyAgIGdydWJfY29tcHJlc3Npb25f dCBjb21wOworIH07CitAQCAtMjcxLDYgKzI3MywxMyBAQCBhcmdwX3BhcnNlciAoaW50IGtleSwg Y2hhciAqYXJnLCBzdHJ1Y3QgYXJncF9zdGF0ZSAqc3RhdGUpCisgICAgICAgYXJndW1lbnRzLT5k aXNhYmxlX3RwbV9zdHJpbmdfcGNyID0gMTsKKyAgICAgICBicmVhazsKKyAKKysgICAgY2FzZSBH UlVCX0lOU1RBTExfT1BUSU9OU19QQUNLQUdFX1NUUklORzoKKysgICAgICBpZiAoYXJndW1lbnRz LT5wYWNrYWdlX3N0cmluZykKKysJZnJlZSAoYXJndW1lbnRzLT5wYWNrYWdlX3N0cmluZyk7Cisr CisrICAgICAgYXJndW1lbnRzLT5wYWNrYWdlX3N0cmluZyA9IHhzdHJkdXAgKGFyZyk7CisrICAg ICAgYnJlYWs7CisrCisgICAgIGNhc2UgJ3YnOgorICAgICAgIHZlcmJvc2l0eSsrOworICAgICAg IGJyZWFrOworQEAgLTM2MSw3ICszNzAsOCBAQCBtYWluIChpbnQgYXJnYywgY2hhciAqYXJndltd KQorIAkJCSAgICAgICBhcmd1bWVudHMuZHRiLCBhcmd1bWVudHMuc2JhdCwKKyAJCQkgICAgICAg YXJndW1lbnRzLmRpc2FibGVfc2hpbV9sb2NrLAorIAkJCSAgICAgICBhcmd1bWVudHMuZGlzYWJs ZV9jbGksCistCQkJICAgICAgIGFyZ3VtZW50cy5kaXNhYmxlX3RwbV9zdHJpbmdfcGNyKTsKKysJ CQkgICAgICAgYXJndW1lbnRzLmRpc2FibGVfdHBtX3N0cmluZ19wY3IsCisrCQkJICAgICAgIGFy Z3VtZW50cy5wYWNrYWdlX3N0cmluZyk7CisgCisgICBpZiAoZ3J1Yl91dGlsX2ZpbGVfc3luYyAo ZnApIDwgMCkKKyAgICAgZ3J1Yl91dGlsX2Vycm9yIChfKCJjYW5ub3Qgc3luYyBgJXMnOiAlcyIp LCBhcmd1bWVudHMub3V0cHV0ID8gOiAic3Rkb3V0IiwKK2RpZmYgLS1naXQgYS91dGlsL21raW1h Z2UuYyBiL3V0aWwvbWtpbWFnZS5jCitpbmRleCA3Mjc1YTFiOTIuLmRlMTM4NmNmYyAxMDA2NDQK Ky0tLSBhL3V0aWwvbWtpbWFnZS5jCisrKysgYi91dGlsL21raW1hZ2UuYworQEAgLTg4OSwxMiAr ODg5LDEzIEBAIGdydWJfaW5zdGFsbF9nZW5lcmF0ZV9pbWFnZSAoY29uc3QgY2hhciAqZGlyLCBj b25zdCBjaGFyICpwcmVmaXgsCisgCQkJICAgICBpbnQgbm90ZSwgc2l6ZV90IGFwcHNpZ19zaXpl LCBncnViX2NvbXByZXNzaW9uX3QgY29tcCwKKyAJCQkgICAgIGNvbnN0IGNoYXIgKmR0Yl9wYXRo LCBjb25zdCBjaGFyICpzYmF0X3BhdGgsCisgCQkJICAgICBpbnQgZGlzYWJsZV9zaGltX2xvY2ss IGludCBkaXNhYmxlX2NsaSwKKy0JCQkgICAgIGludCBkaXNhYmxlX3RwbV9zdHJpbmdfcGNyKQor KwkJCSAgICAgaW50IGRpc2FibGVfdHBtX3N0cmluZ19wY3IsCisrCQkJICAgICBjb25zdCBjaGFy ICpwYWNrYWdlX3N0cmluZykKKyB7CisgICBjaGFyICprZXJuZWxfaW1nLCAqY29yZV9pbWc7Cisg ICBzaXplX3QgdG90YWxfbW9kdWxlX3NpemUsIGNvcmVfc2l6ZTsKKyAgIHNpemVfdCBtZW1kaXNr X3NpemUgPSAwLCBjb25maWdfc2l6ZSA9IDA7CistICBzaXplX3QgcHJlZml4X3NpemUgPSAwLCBk dGJfc2l6ZSA9IDAsIHNiYXRfc2l6ZSA9IDA7CisrICBzaXplX3QgcHJlZml4X3NpemUgPSAwLCBk dGJfc2l6ZSA9IDAsIHNiYXRfc2l6ZSA9IDAsIHBhY2thZ2Vfc3RyaW5nX3NpemUgPSAwOworICAg Y2hhciAqa2VybmVsX3BhdGg7CisgICBzaXplX3Qgb2Zmc2V0OworICAgc3RydWN0IGdydWJfdXRp bF9wYXRoX2xpc3QgKnBhdGhfbGlzdCwgKnA7CitAQCAtOTcwLDYgKzk3MSwxMiBAQCBncnViX2lu c3RhbGxfZ2VuZXJhdGVfaW1hZ2UgKGNvbnN0IGNoYXIgKmRpciwgY29uc3QgY2hhciAqcHJlZml4 LAorICAgaWYgKGRpc2FibGVfdHBtX3N0cmluZ19wY3IpCisgICAgIHRvdGFsX21vZHVsZV9zaXpl ICs9IHNpemVvZiAoc3RydWN0IGdydWJfbW9kdWxlX2hlYWRlcik7CisgCisrICBpZiAocGFja2Fn ZV9zdHJpbmcpCisrICAgIHsKKysgICAgICBwYWNrYWdlX3N0cmluZ19zaXplID0gQUxJR05fQURE UiAoc3RybGVuIChwYWNrYWdlX3N0cmluZykgKyAxKTsKKysgICAgICB0b3RhbF9tb2R1bGVfc2l6 ZSArPSBwYWNrYWdlX3N0cmluZ19zaXplICsgc2l6ZW9mIChzdHJ1Y3QgZ3J1Yl9tb2R1bGVfaGVh ZGVyKTsKKysgICAgfQorKworICAgaWYgKGNvbmZpZ19wYXRoKQorICAgICB7CisgICAgICAgY29u ZmlnX3NpemUgPSBBTElHTl9BRERSIChncnViX3V0aWxfZ2V0X2ltYWdlX3NpemUgKGNvbmZpZ19w YXRoKSArIDEpOworQEAgLTExNTYsNiArMTE2MywxOSBAQCBncnViX2luc3RhbGxfZ2VuZXJhdGVf aW1hZ2UgKGNvbnN0IGNoYXIgKmRpciwgY29uc3QgY2hhciAqcHJlZml4LAorICAgICAgIG9mZnNl dCArPSBzaXplb2YgKCpoZWFkZXIpOworICAgICB9CisgCisrICBpZiAocGFja2FnZV9zdHJpbmcp CisrICAgIHsKKysgICAgICBzdHJ1Y3QgZ3J1Yl9tb2R1bGVfaGVhZGVyICpoZWFkZXI7CisrCisr ICAgICAgaGVhZGVyID0gKHN0cnVjdCBncnViX21vZHVsZV9oZWFkZXIgKikgKGtlcm5lbF9pbWcg KyBvZmZzZXQpOworKyAgICAgIGhlYWRlci0+dHlwZSA9IGdydWJfaG9zdF90b190YXJnZXQzMiAo T0JKX1RZUEVfUEFDS0FHRV9TVFJJTkcpOworKyAgICAgIGhlYWRlci0+c2l6ZSA9IGdydWJfaG9z dF90b190YXJnZXQzMiAocGFja2FnZV9zdHJpbmdfc2l6ZSArIHNpemVvZiAoKmhlYWRlcikpOwor KyAgICAgIG9mZnNldCArPSBzaXplb2YgKCpoZWFkZXIpOworKworKyAgICAgIGdydWJfc3RyY3B5 IChrZXJuZWxfaW1nICsgb2Zmc2V0LCBwYWNrYWdlX3N0cmluZyk7CisrICAgICAgb2Zmc2V0ICs9 IHBhY2thZ2Vfc3RyaW5nX3NpemU7CisrICAgIH0KKysKKyAgIGlmIChjb25maWdfcGF0aCkKKyAg ICAgeworICAgICAgIHN0cnVjdCBncnViX21vZHVsZV9oZWFkZXIgKmhlYWRlcjsKCmRpZmYgLS1n aXQgYS9ncnViLWNjLm1hY3JvcyBiL2dydWItY2MubWFjcm9zCmluZGV4IDczNjg0YzEuLmU1ZmEz NWMgMTAwNjQ0Ci0tLSBhL2dydWItY2MubWFjcm9zCisrKyBiL2dydWItY2MubWFjcm9zCkBAIC02 Miw2ICs2Miw3IEBAIG1rc3F1YXNoZnMgbWVtZGlzayBtZW1kaXNrLnNxdWFzaGZzIC1jb21wIGx6 bwkJCVwKIAktYyAnJXtTT1VSQ0UxN30nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFxcXAogCS1wIC9FRkkvJXtlZmlfdmVuZG9yfQkJCQkJXFxcCiAJLS1kaXNhYmxlLXRw bS1zdHJpbmctcGNyICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcXFwKKwktLXBhY2th Z2Utc3RyaW5nICJHUlVCIENDICV7dmVyc2lvbn0tJXtyZWxlYXNlfSIJXFxcCiAJJHtHUlVCX01P RFVMRVN9CQkJCQkJXAogJXs0fS4vZ3J1Yi1ta2ltYWdlIC1PICV7MX0gLW8gJXszfS5vcmlnCQkJ CVxcXAogCS1kIGdydWItY29yZQkJCQkJCVxcXApAQCAtNzAsNiArNzEsNyBAQCBta3NxdWFzaGZz IG1lbWRpc2sgbWVtZGlzay5zcXVhc2hmcyAtY29tcCBsem8JCQlcCiAJLW0gbWVtZGlzay5zcXVh c2hmcwkJCQkJXFxcCiAJLXAgL0VGSS9CT09UCQkJCQkJXFxcCiAJLS1kaXNhYmxlLXRwbS1zdHJp bmctcGNyICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcXFwKKwktLXBhY2thZ2Utc3Ry aW5nICJHUlVCIENDICV7dmVyc2lvbn0tJXtyZWxlYXNlfSIJXFxcCiAJJHtHUlVCX0NDX01PRFVM RVN9CQkJCQkJXAogJXtleHBhbmQ6JSVkZWZpbmUgX19fcGVzaWduX2NsaWVudF9jZXJ0ICV7P19f X3Blc2lnbl9jbGllbnRfY2VydH0leyE/X19fcGVzaWduX2NsaWVudF9jZXJ0OiV7X19wZXNpZ25f Y2xpZW50X2NlcnR9fX0gXAogJXs/X19wZXNpZ25fY2xpZW50X2NlcnQ6JXtleHBhbmQ6JSVkZWZp bmUgX19wZXNpZ25fY2xpZW50X2NlcnQgJXtfX19wZXNpZ25fY2xpZW50X2NlcnR9fX0gXAoKZGlm ZiAtLWdpdCBhL2dydWIucGF0Y2hlcyBiL2dydWIucGF0Y2hlcwppbmRleCAyZWI0MDIxLi45ZTkx ZTA4IDEwMDY0NAotLS0gYS9ncnViLnBhdGNoZXMKKysrIGIvZ3J1Yi5wYXRjaGVzCkBAIC00Mzgs NCArNDM4LDUgQEAgUGF0Y2gwNDQzOiAwNDQzLWllZWUxMjc1LXN1cHBvcnQtYWRkZWQtZm9yLW11 bHRpcGxlLW52bWUtYm9vdHBhdGhzLnBhdGNoCiBQYXRjaDA0NDQ6IDA0NDQtaWVlZTEyNzUtYWRk LXN1cHBvcnQtZm9yLU5WTWVvRkMucGF0Y2gKIFBhdGNoMDQ0NTogMDQ0NS1ncnViLWdldC1rZXJu ZWwtc2V0dGluZ3MtVHJlYXRlLWtlcm5lbC11a2ktZHRibG9hZGVyLnBhdGNoCiBQYXRjaDA0NDY6 IDA0NDYtbW0tdHJ5LWFsbG9jYXRpbmctcmVnaW9ucy1hYm92ZS1kZWZpbmVkLWxpbWl0LWFzLWxh cy5wYXRjaAotUGF0Y2gwNDQ3OiAwNDQ3LXRwbS1Pbmx5LXNraXAtVFBNLXN0cmluZy1QQ1ItbWVh c3VyZW1lbnRzLXdpdGgtZXhwbGkucGF0Y2gKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCitQ YXRjaDA0NDc6IDA0NDctdHBtLU9ubHktc2tpcC1UUE0tc3RyaW5nLVBDUi1tZWFzdXJlbWVudHMt d2l0aC1leHBsaS5wYXRjaAorUGF0Y2gwNDQ4OiAwNDQ4LWJsaS1BbGxvdy1vdmVycmlkaW5nLVBB Q0tBR0VfU1RSSU5HLXZpYS1ncnViLW1raW1hZ2UucGF0Y2gKXCBObyBuZXdsaW5lIGF0IGVuZCBv ZiBmaWxlCgpkaWZmIC0tZ2l0IGEvZ3J1YjIuc3BlYyBiL2dydWIyLnNwZWMKaW5kZXggN2MzMmYx Yy4uYmRjYmZhYiAxMDA2NDQKLS0tIGEvZ3J1YjIuc3BlYworKysgYi9ncnViMi5zcGVjCkBAIC0x Nyw3ICsxNyw3IEBACiBOYW1lOgkJZ3J1YjIKIEVwb2NoOgkJMQogVmVyc2lvbjoJMi4xMgotUmVs ZWFzZToJNzQlez9kaXN0fQorUmVsZWFzZToJNzUlez9kaXN0fQogU3VtbWFyeToJQm9vdGxvYWRl ciB3aXRoIHN1cHBvcnQgZm9yIExpbnV4LCBNdWx0aWJvb3QgYW5kIG1vcmUKIExpY2Vuc2U6CUdQ TC0zLjAtb3ItbGF0ZXIKIFVSTDoJCWh0dHA6Ly93d3cuZ251Lm9yZy9zb2Z0d2FyZS9ncnViLwpA QCAtNjk0LDYgKzY5NCw5IEBAIGZpCiAlZW5kaWYKIAogJWNoYW5nZWxvZworKiBNb24gQXVnIDEw IDIwMjYgTGVvIFNhbmRvdmFsIDxsc2FuZG92YUByZWRoYXQuY29tPiAtIDIuMTItNzUKKy0gYmxp OiBBbGxvdyBvdmVycmlkaW5nIFBBQ0tBR0VfU1RSSU5HIHZpYSBncnViLW1raW1hZ2UKKwogKiBN b24gQXVnIDMgMjAyNiBMZW8gU2FuZG92YWwgPGxzYW5kb3ZhQHJlZGhhdC5jb20+IC0gMi4xMi03 NAogLSBncnViLWVmaS1jYzogZGlzYWJsZSBUUE0gc3RyaW5nIG1lYXN1cmVtZW50cyBhdCBydW50 aW1lCiAK