213614 2020-06-25 12:37:08 -0700 [JHBuild] Add support for using a minimal moduleset 2021-10-08 05:16:09 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=231420 InRadar P2 Normal --- 1 clopez clopez agomez aperez bugs-noreply cgarcia clopez darin ews-watchlist jbedard ltilve pnormand thorton webkit-bug-importer oldest_to_newest 1666167 0 clopez 2020-06-25 12:37:08 -0700 We would like to be able to build WebKit on a given distribution using as much libraries from the system as possible. So the idea is to have a minimum JHBuild moduleset for building only the libraries that are not available on the distribution. 1666175 1 402796 clopez 2020-06-25 12:45:33 -0700 Created attachment 402796 Patch 1666746 2 402796 cgarcia 2020-06-27 01:17:06 -0700 Comment on attachment 402796 Patch I think there's an option in jhbuild to prefer system modules when the version is newer than the one in the moduleset. 1669406 3 clopez 2020-07-07 08:45:39 -0700 (In reply to Carlos Garcia Campos from comment #2) > Comment on attachment 402796 [details] > Patch > > I think there's an option in jhbuild to prefer system modules when the > version is newer than the one in the moduleset. Right. But AFAIK that doesn't work for what I intend to do here. AFAIK <systemmodule ...> tells JHBuild that the dependency should be installed by the system (distro package), and if is not installed then JHBuild will fail. In other words: with systemmodule, jhbuild won't build the dependency if the system doesn't provide one new enough. It will simply fail. What I'm trying to do here is to tell JHBuild to check if the system provides a new enough version of the dependency, and if it does then skip building it. If it doesn't then JHBuild will build it, instead of failing. This is achieved by using the <pkg-config> directive in the modules 1669408 4 403692 clopez 2020-07-07 08:54:05 -0700 Created attachment 403692 Patch 1669700 5 ews-feeder 2020-07-08 03:41:58 -0700 Committed r264092: <https://trac.webkit.org/changeset/264092> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403692. 1669701 6 webkit-bug-importer 2020-07-08 03:42:14 -0700 <rdar://problem/65217427> 402796 2020-06-25 12:45:33 -0700 2020-07-07 08:53:36 -0700 Patch bug-213614-20200625214532.patch text/plain 15166 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNTIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2JjZTZlNzg1M2JkYTg0MmFjZjE5NDJkMGIzYTRkZTdi ZDQzZDQ1OS4uNzY1ZTMxYmM0OTc4OGViNDVlZjVhOGJmYzg5OGJjOWExNzRiOTVjNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5 IEBACisyMDIwLTA2LTI1ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtKSEJ1aWxkXSBBZGQgc3VwcG9ydCBmb3IgdXNpbmcgYSBtaW5p bWFsIG1vZHVsZXNldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjEzNjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhpcyBwYXRjaCBpbnRyb2R1Y2VzIGEgd2F5IG9mIHNwZWNpZnlpbmcgYSBtb2R1bGVz ZXQgb3RoZXIgdGhhbiB0aGUgZGVmYXVsdAorICAgICAgICB2aWEgdGhlIGVudmlyb25tZW50IHZh cmlhYmxlIFdFQktJVF9KSEJVSUxEX01PRFVMRVNFVCBhbmQgYWRkcyBhIG1pbmltYWwgbW9kdWxl c2V0CisgICAgICAgIHRoYXQgYWxsb3dzIGJ1aWxkaW5nIFdlYktpdCB3aXRoIGl0LiBUaGlzIG1p bmltYWwgbW9kdWxlc2V0IGluY2x1ZGVzIHRoZSBsaWJyYXJpZXMKKyAgICAgICAgbmVlZGVkIGZv ciBidWlsZGluZyBXZWJLaXQgb24gVWJ1bnR1LTE4MDQsIGFuZCB0aG9zZSBsaWJyYXJpZXMgYXJl IG9ubHkgYnVpbGQgaWYKKyAgICAgICAgbmVlZGVkIHNpbmNlIHRoZXkgaW5jbHVkZSB0aGUgPHBr Zy1jb25maWc+IGVudHJpZXMgdGhhdCB0ZWxscyBKSEJ1aWxkIHRvIG5vdCBidWlsZAorICAgICAg ICB0aGVtIGlmIHRob3NlIGFyZSBhbHJlYWR5IGluc3RhbGxlZCBzeXN0ZW0gd2lkZS4gU28gdGhp cyBtaW5pbWFsIG1vZHVsZXNldCBzaG91bGQKKyAgICAgICAgd29yayBhbHNvIG9uIG5ld2VyIHZl cnNpb25zIG9mIFVidW50dSBvciBldmVuIG90aGVyIGRpc3RyaWJ1dGlvbnMuCisKKyAgICAgICAg VG8gdXNlIHRoaXMsIHlvdSBoYXZlIHRvIGV4cG9ydCBvbiB0aGUgYnVpbGQgZW52aXJvbm1lbnQ6 CisgICAgICAgIFdFQktJVF9KSEJVSUxEPTEKKyAgICAgICAgV0VCS0lUX0pIQlVJTERfTU9EVUxF U0VUPW1pbmltYWwKKworICAgICAgICAqIFNjcmlwdHMvdXBkYXRlLXdlYmtpdC1saWJzLWpoYnVp bGQ6CisgICAgICAgIChnZXRKaGJ1aWxkSW5jbHVkZWRGaWxlUGF0aHMpOgorICAgICAgICAoamhi dWlsZE1vZHVsZXNldE5hbWVDaGFuZ2VkKToKKyAgICAgICAgKGpoYnVpbGRDb25maWd1cmF0aW9u Q2hhbmdlZCk6CisgICAgICAgIChzYXZlSmhidWlsZE1kNSk6CisgICAgICAgIChzYXZlSmhidWls ZE1vZHVsZXNldE5hbWUpOgorICAgICAgICAoc2F2ZUpoYnVpbGRDb25maWcpOgorICAgICAgICAo ZGVsZXRlSmhidWlsZE1kNSk6CisgICAgICAgIChkZWxldGVKaGJ1aWxkTW9kdWxlc2V0TmFtZSk6 CisgICAgICAgIChkZWxldGVKaGJ1aWxkQ29uZmlnKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dGRpcnMucG06CisgICAgICAgIChnZXRKaGJ1aWxkTW9kdWxlc2V0TmFtZSk6CisgICAgICAgICog Z3RrL2poYnVpbGQtbWluaW1hbC5tb2R1bGVzOiBBZGRlZC4KKyAgICAgICAgKiBqaGJ1aWxkL2po YnVpbGRyY19jb21tb24ucHk6CisgICAgICAgIChpbml0KToKKyAgICAgICAgKiB3cGUvamhidWls ZC1taW5pbWFsLm1vZHVsZXM6IEFkZGVkLgorCiAyMDIwLTA2LTI1ICBBYWthc2ggSmFpbiAgPGFh a2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbZXdzXSBTaGFyZSBtb3JlIGJvdHMgYmV0 d2VlbiBFV1MgYnVpbGRlciBhbmQgdGVzdGVycwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy91 cGRhdGUtd2Via2l0LWxpYnMtamhidWlsZCBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1s aWJzLWpoYnVpbGQKaW5kZXggYmY3M2ZlN2I0ZmJlZWI1MjFkYTFmNjBhZWZiNDNhZTA3N2E2NGZm Yy4uYzhmOTYwNTRkYjMxZDViZDk1ZDBlMmFhYTBjYmQyNmQyMTEzZGExZSAxMDA3NTUKLS0tIGEv VG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWxpYnMtamhidWlsZAorKysgYi9Ub29scy9TY3Jp cHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxkCkBAIC00OCw2ICs0OCw3IEBAIEdldE9wdGlv bnMoCiBzdWIgZ2V0SmhidWlsZEluY2x1ZGVkRmlsZVBhdGhzCiB7CiAgICAgbXkgJGpoYnVpbGRG aWxlID0gc2hpZnQ7CisgICAgZGllICJDYW4ndCBmaW5kIGZpbGUgJGpoYnVpbGRGaWxlIiBpZiAh IC1lICRqaGJ1aWxkRmlsZTsKICAgICBteSAkZG9tID0gWE1MOjpMaWJYTUwtPmxvYWRfeG1sKGxv Y2F0aW9uID0+ICRqaGJ1aWxkRmlsZSk7CiAgICAgbXkgQGluY2x1ZGVzOwogCkBAIC05NSwxMCAr OTYsMjMgQEAgc3ViIGpoYnVpbGRDb25maWd1cmF0aW9uQ2hlY2tGaWxlCiAgICAgfQogfQogCitz dWIgamhidWlsZE1vZHVsZXNldE5hbWVDaGFuZ2VkKCkKK3sKKyAgICBteSAkamhCdWlsZE1vZHVs ZXNldE5hbWVGaWxlID0gam9pbignLycsIGdldEpoYnVpbGRQYXRoKCksICRwbGF0Zm9ybSwgJ21v ZHVsZXNldC5uYW1lJyk7CisgICAgbXkgJHByZXZpb3VzTW9kdWxlc2V0TmFtZTsKKyAgICBvcGVu KG15ICRGSCwgJzwnLCAkamhCdWlsZE1vZHVsZXNldE5hbWVGaWxlKSBvciByZXR1cm4gMTsKKyAg ICB7CisgICAgICAgIGxvY2FsICQvOyAjIGxvY2FsaXplZCBzbHVycCBtb2RlCisgICAgICAgICRw cmV2aW91c01vZHVsZXNldE5hbWUgPSA8JEZIPjsKKyAgICB9CisgICAgY2xvc2UoJEZIKTsKKyAg ICByZXR1cm4gJHByZXZpb3VzTW9kdWxlc2V0TmFtZSBuZSBnZXRKaGJ1aWxkTW9kdWxlc2V0TmFt ZSgpOworfQorCiBzdWIgamhidWlsZENvbmZpZ3VyYXRpb25DaGFuZ2VkKCkKIHsKLSAgICBteSAk amhidWlsZE1haW4gPSBqb2luKCcvJywgc291cmNlRGlyKCksICdUb29scycsICRwbGF0Zm9ybSwg J2poYnVpbGQubW9kdWxlcycpOwotICAgIG15IEBqaGJ1aWxkRmlsZXMgPSBxdyhqaGJ1aWxkcmMg amhidWlsZC5tb2R1bGVzKTsKKyAgICBteSAkamhidWlsZE1haW4gPSBqb2luKCcvJywgc291cmNl RGlyKCksICdUb29scycsICRwbGF0Zm9ybSwgZ2V0SmhidWlsZE1vZHVsZXNldE5hbWUoKSk7Cisg ICAgbXkgQGpoYnVpbGRGaWxlcyA9ICgnamhidWlsZHJjJywgZ2V0SmhidWlsZE1vZHVsZXNldE5h bWUoKSk7CiAgICAgcHVzaChAamhidWlsZEZpbGVzLCBnZXRKaGJ1aWxkSW5jbHVkZWRGaWxlUGF0 aHMoJGpoYnVpbGRNYWluKSk7CiAKICAgICBmb3JlYWNoIG15ICRmaWxlIChAamhidWlsZEZpbGVz KSB7CkBAIC0xMDYsNiArMTIwLDcgQEAgc3ViIGpoYnVpbGRDb25maWd1cmF0aW9uQ2hhbmdlZCgp CiAgICAgICAgICAgICByZXR1cm4gMTsKICAgICAgICAgfQogICAgIH0KKyAgICByZXR1cm4gamhi dWlsZE1vZHVsZXNldE5hbWVDaGFuZ2VkKCk7CiB9CiAKIHN1YiBzYXZlTWQ1RmlsZQpAQCAtMTI1 LDggKzE0MCw4IEBAIHN1YiBzYXZlTWQ1RmlsZQogc3ViIHNhdmVKaGJ1aWxkTWQ1KCkgewogICAg ICMgU2F2ZSBtZDVzdW0gZm9yIGpoYnVpbGQtcmVsYXRlZCBmaWxlcy5zYXZlSmhidWlsZE1kNSgp OwogICAgIG15ICRqaGJ1aWxkUGF0aCA9IGdldEpoYnVpbGRQYXRoKCk7Ci0gICAgbXkgJGpoYnVp bGRNYWluID0gam9pbignLycsIHNvdXJjZURpcigpLCAnVG9vbHMnLCAkcGxhdGZvcm0sICdqaGJ1 aWxkLm1vZHVsZXMnKTsKLSAgICBteSBAamhidWlsZEZpbGVzID0gcXcoamhidWlsZHJjIGpoYnVp bGQubW9kdWxlcyk7CisgICAgbXkgJGpoYnVpbGRNYWluID0gam9pbignLycsIHNvdXJjZURpcigp LCAnVG9vbHMnLCAkcGxhdGZvcm0sIGdldEpoYnVpbGRNb2R1bGVzZXROYW1lKCkpOworICAgIG15 IEBqaGJ1aWxkRmlsZXMgPSAoJ2poYnVpbGRyYycsIGdldEpoYnVpbGRNb2R1bGVzZXROYW1lKCkp OwogICAgIHB1c2goQGpoYnVpbGRGaWxlcywgZ2V0SmhidWlsZEluY2x1ZGVkRmlsZVBhdGhzKCRq aGJ1aWxkTWFpbikpOwogCiAgICAgKC1kICRqaGJ1aWxkUGF0aCkgfHwgbWtwYXRoICRqaGJ1aWxk UGF0aDsKQEAgLTEzNSwxNCArMTUwLDI4IEBAIHN1YiBzYXZlSmhidWlsZE1kNSgpIHsKICAgICB9 CiB9CiAKK3N1YiBzYXZlSmhidWlsZE1vZHVsZXNldE5hbWUoKSB7CisgICAgbXkgJGpoQnVpbGRQ bGF0Zm9ybURpciA9IGpvaW4oJy8nLCBnZXRKaGJ1aWxkUGF0aCgpLCAkcGxhdGZvcm0pOworICAg ICgtZCAkamhCdWlsZFBsYXRmb3JtRGlyKSB8fCBta3BhdGggJGpoQnVpbGRQbGF0Zm9ybURpcjsK KyAgICBteSAkamhCdWlsZE1vZHVsZXNldE5hbWVGaWxlID0gam9pbignLycsICRqaEJ1aWxkUGxh dGZvcm1EaXIsICdtb2R1bGVzZXQubmFtZScpOworICAgIG9wZW4oRkgsICc+JywgJGpoQnVpbGRN b2R1bGVzZXROYW1lRmlsZSk7CisgICAgcHJpbnQgRkggZ2V0SmhidWlsZE1vZHVsZXNldE5hbWUo KTsKKyAgICBjbG9zZShGSCk7Cit9CisKK3N1YiBzYXZlSmhidWlsZENvbmZpZygpIHsKKyAgICBz YXZlSmhidWlsZE1kNSgpOworICAgIHNhdmVKaGJ1aWxkTW9kdWxlc2V0TmFtZSgpOworfQorCiBz dWIgZGVsZXRlSmhidWlsZE1kNSgpIHsKICAgICBteSAkamhidWlsZFBhdGggPSBnZXRKaGJ1aWxk UGF0aCgpOwogICAgIGlmICghLWQgJGpoYnVpbGRQYXRoKSB7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKLSAgICBteSAkamhidWlsZE1haW4gPSBqb2luKCcvJywgc291cmNlRGlyKCksICdUb29s cycsICRwbGF0Zm9ybSwgJ2poYnVpbGQubW9kdWxlcycpOwotICAgIG15IEBqaGJ1aWxkRmlsZXMg PSBxdyhqaGJ1aWxkcmMgamhidWlsZC5tb2R1bGVzKTsKKyAgICBteSAkamhidWlsZE1haW4gPSBq b2luKCcvJywgc291cmNlRGlyKCksICdUb29scycsICRwbGF0Zm9ybSwgZ2V0SmhidWlsZE1vZHVs ZXNldE5hbWUoKSk7CisgICAgbXkgQGpoYnVpbGRGaWxlcyA9ICgnamhidWlsZHJjJywgZ2V0Smhi dWlsZE1vZHVsZXNldE5hbWUoKSk7CiAgICAgcHVzaChAamhidWlsZEZpbGVzLCBnZXRKaGJ1aWxk SW5jbHVkZWRGaWxlUGF0aHMoJGpoYnVpbGRNYWluKSk7CiAKICAgICBmb3JlYWNoIG15ICRmaWxl IChAamhidWlsZEZpbGVzKSB7CkBAIC0xNTEsNiArMTgwLDE2IEBAIHN1YiBkZWxldGVKaGJ1aWxk TWQ1KCkgewogICAgIH0KIH0KIAorc3ViIGRlbGV0ZUpoYnVpbGRNb2R1bGVzZXROYW1lKCkgewor ICAgIG15ICRqaEJ1aWxkTW9kdWxlc2V0TmFtZUZpbGUgPSBqb2luKCcvJywgamhidWlsZFBhdGgs ICRwbGF0Zm9ybSwgJ21vZHVsZXNldC5uYW1lJyk7CisgICAgdW5saW5rKCRqaEJ1aWxkTW9kdWxl c2V0TmFtZUZpbGUpIGlmIC1lICRqaEJ1aWxkTW9kdWxlc2V0TmFtZUZpbGU7Cit9CisKK3N1YiBk ZWxldGVKaGJ1aWxkQ29uZmlnKCkgeworICAgIGRlbGV0ZUpoYnVpbGRNZDUoKTsKKyAgICBkZWxl dGVKaGJ1aWxkTW9kdWxlc2V0TmFtZSgpOworfQorCiBzdWIgcnVuSmhidWlsZAogewogICAgIG15 ICRjb21tYW5kID0gc2hpZnQ7CkBAIC0xOTMsOCArMjMyLDggQEAgaWYgKCR3aXBlT25DaGFuZ2Ug JiYgLWUgZ2V0SmhidWlsZFBhdGgoKSkgewogCiBwcmludCAiVXBkYXRpbmcgIiAuICRwcmV0dHlQ bGF0Zm9ybXskcGxhdGZvcm19IC4gIiBwb3J0IGRlcGVuZGVuY2llcyB1c2luZyBqaGJ1aWxkLi4u XG4iOwogaWYgKHJ1bkpoYnVpbGQoImJ1aWxkIikgPT0gMCkgewotICAgIHNhdmVKaGJ1aWxkTWQ1 KCk7CisgICAgc2F2ZUpoYnVpbGRDb25maWcoKTsKIH0gZWxzZSB7Ci0gICAgZGVsZXRlSmhidWls ZE1kNSgpOworICAgIGRlbGV0ZUpoYnVpbGRDb25maWcoKTsKICAgICBkaWUgIkZhaWxlZCB0byBi dWlsZCAiIC4gJHByZXR0eVBsYXRmb3JteyRwbGF0Zm9ybX0gLiAiIHBvcnQgZGVwZW5kZW5jaWVz IHdpdGggamhidWlsZFxuIjsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBiM2U1NmEwZDFiNDM4N2Rm NjFlMGNlODY1YjdhNTBiOGQ1ODRkYWIyLi4wMmVhZDljMGEwMmRhZTM4MjE2OTNiZGQ0MTMzMTY4 MmVmYzVhZTc2IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0yMDc4LDYgKzIwNzgsMTYgQEAgc3ViIGdl dEpoYnVpbGRQYXRoKCkKICAgICByZXR1cm4gRmlsZTo6U3BlYy0+Y2F0ZGlyKEBqaGJ1aWxkUGF0 aCk7CiB9CiAKKworc3ViIGdldEpoYnVpbGRNb2R1bGVzZXROYW1lKCkKK3sKKyAgICBpZiAoZGVm aW5lZCgkRU5WeydXRUJLSVRfSkhCVUlMRF9NT0RVTEVTRVQnfSkpIHsKKyAgICAgICAgcmV0dXJu ICdqaGJ1aWxkLScgLiAkRU5WeydXRUJLSVRfSkhCVUlMRF9NT0RVTEVTRVQnfSAuICcubW9kdWxl cyc7CisgICAgfQorICAgIHJldHVybiAnamhidWlsZC5tb2R1bGVzJzsKK30KKworCiBzdWIgZ2V0 VXNlckZsYXRwYWtQYXRoKCkKIHsKICAgICBteSAkcHJvZHVjdERpciA9IGJhc2VQcm9kdWN0RGly KCk7CmRpZmYgLS1naXQgYS9Ub29scy9ndGsvamhidWlsZC1taW5pbWFsLm1vZHVsZXMgYi9Ub29s cy9ndGsvamhidWlsZC1taW5pbWFsLm1vZHVsZXMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGNkYTVlYmJjOWIyNjAw NjdiZDU0ZmNhOTBlNjYxNjNkY2RiMjNhMQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL2d0ay9q aGJ1aWxkLW1pbmltYWwubW9kdWxlcwpAQCAtMCwwICsxLDcyIEBACis8P3htbCB2ZXJzaW9uPSIx LjAiPz4KKzwhRE9DVFlQRSBtb2R1bGVzZXQgU1lTVEVNICJtb2R1bGVzZXQuZHRkIj4KKzw/eG1s LXN0eWxlc2hlZXQgdHlwZT0idGV4dC94c2wiIGhyZWY9Im1vZHVsZXNldC54c2wiPz4KKzxtb2R1 bGVzZXQ+CisKKyAgPG1ldGFtb2R1bGUgaWQ9IndlYmtpdGd0ay1taW5pbWFsLWRlcGVuZGVuY2ll cyI+CisgICAgPGRlcGVuZGVuY2llcz4KKyAgICAgIDxkZXAgcGFja2FnZT0id3BlYmFja2VuZC1m ZG8iLz4KKyAgICA8L2RlcGVuZGVuY2llcz4KKyAgPC9tZXRhbW9kdWxlPgorCisgIDwhLS0gUGxl YXNlIHVzZSBodHRwL2h0dHBzIHRvIGFjY2VzcyByZXBvc2l0b3JpZXMgdG8gYmUgZnJpZW5kbHkg dG8gdXNlcnMgc3R1Y2sgYmVoaW5kIGZpcmV3YWxscy4gLS0+CisgIDxyZXBvc2l0b3J5IHR5cGU9 ImdpdCIgbmFtZT0iZ2l0aHViLmNvbSIKKyAgICAgIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbSIv PgorICA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1lPSJnaXRodWItdGFyYmFsbCIKKyAg ICAgIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS8iLz4KKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFy YmFsbCIgbmFtZT0ic291cmNld2FyZS5vcmctbWlycm9yIgorICAgICAgaHJlZj0iaHR0cDovL21p cnJvcnMua2VybmVsLm9yZy9zb3VyY2VzLnJlZGhhdC5jb20vIi8+CisgIDxyZXBvc2l0b3J5IHR5 cGU9InRhcmJhbGwiIG5hbWU9ImZ0cC5nbm9tZS5vcmciCisgICAgICBocmVmPSJodHRwOi8vZnRw Lmdub21lLm9yZyIvPgorICA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1lPSJkb3dubG9h ZC5nbm9tZS5vcmciCisgICAgICBocmVmPSJodHRwczovL2Rvd25sb2FkLmdub21lLm9yZyIvPgor ICA8cmVwb3NpdG9yeSB0eXBlPSJnaXQiIG5hbWU9ImdpdC5nbm9tZS5vcmciCisgICAgICBocmVm PSJodHRwczovL2dpdC5nbm9tZS5vcmcvYnJvd3NlLyIvPgorICA8cmVwb3NpdG9yeSB0eXBlPSJ0 YXJiYWxsIiBuYW1lPSJjYWlyb2dyYXBoaWNzLm9yZyIKKyAgICAgIGhyZWY9Imh0dHA6Ly9jYWly b2dyYXBoaWNzLm9yZyIvPgorICA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1lPSJmcmVl ZGVza3RvcC5vcmciCisgICAgICBocmVmPSJodHRwOi8vd3d3LmZyZWVkZXNrdG9wLm9yZyIvPgor ICA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1lPSJ4b3JnIgorICAgICAgaHJlZj0iaHR0 cDovL3hvcmcuZnJlZWRlc2t0b3Aub3JnIi8+CisgIDxyZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwi IG5hbWU9InhtbHNvZnQub3JnIgorICAgICAgaHJlZj0iaHR0cDovL3htbHNvZnQub3JnIi8+Cisg IDxyZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwiIG5hbWU9InNhdmFubmFoLmdudS5vcmciCisgICAg ICBocmVmPSJodHRwOi8vZG93bmxvYWQuc2F2YW5uYWguZ251Lm9yZy9yZWxlYXNlcy8iLz4KKyAg PHJlcG9zaXRvcnkgdHlwZT0iZ2l0IiBuYW1lPSJmcmVlZGVza3RvcC1naXQiCisgICAgICBocmVm PSJodHRwOi8vYW5vbmdpdC5mcmVlZGVza3RvcC5vcmcvZ2l0Ii8+CisgPHJlcG9zaXRvcnkgdHlw ZT0idGFyYmFsbCIgbmFtZT0iZHJpLmZyZWVkZXNrdG9wLm9yZyIKKyAgICAgIGhyZWY9Imh0dHBz Oi8vZHJpLmZyZWVkZXNrdG9wLm9yZyIvPgorICA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBu YW1lPSJtZXNhLmZyZWVkZXNrdG9wLm9yZyIKKyAgICAgIGhyZWY9Imh0dHBzOi8vbWVzYS5mcmVl ZGVza3RvcC5vcmciLz4KKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFtZT0id2F5bGFu ZC5mcmVlZGVza3RvcC5vcmciCisgICAgICBocmVmPSJodHRwOi8vd2F5bGFuZC5mcmVlZGVza3Rv cC5vcmciLz4KKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFtZT0ibGx2bS5vcmciCisg ICAgICBocmVmPSJodHRwOi8vbGx2bS5vcmciLz4KKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFs bCIgbmFtZT0id2Via2l0Z3RrLWpoYnVpbGQtbWlycm9yIgorICAgICAgaHJlZj0iaHR0cDovL3dl YmtpdGd0ay5vcmcvamhidWlsZF9taXJyb3IvIi8+CisgIDxyZXBvc2l0b3J5IHR5cGU9InRhcmJh bGwiIG5hbWU9ImdudXBnLm9yZyIKKyAgICAgIGhyZWY9Imh0dHBzOi8vd3d3LmdudXBnLm9yZy9m dHAvZ2NyeXB0LyIvPgorICA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1lPSJ3cGV3ZWJr aXQiCisgICAgICBocmVmPSJodHRwczovL3dwZXdlYmtpdC5vcmcvcmVsZWFzZXMvIi8+CisKKwor PCEtLSBUaGlzIG1vZHVsZXNldCBpcyB1c2VkIHdoZW4gdGhlIGVudmlyb25tZW50IHZhcmlhYmxl IFdFQktJVF9KSEJVSUxEX01PRFVMRVNFVD1taW5pbWFsIGlzIHNldCAtLT4KKzwhLS0gSXRzIGlu dGVuZGVkIHRvIGFsbG93IGJ1aWxkaW5nIFdlYktpdCB1c2luZyBhcyBtdWNoIGFzIGxpYnJhcmll cyBmcm9tIHlvdXIgZGlzdHJpYnV0aW9uIGFzIHBvc3NpYmxlIC0tPgorPCEtLSBJbiBvcmRlciB0 byBlbnN1cmUgaXRzIG1pbmltYWwsIGFsbCB0aGUgbW9kdWxlcyBzaG91bGQgaGF2ZSBhIHBrZy1j b25maWcgZGVjbGFyYXRpb24gbGluZSAtLT4KKworICA8Y21ha2UgaWQ9ImxpYndwZSI+CisgICAg PHBrZy1jb25maWc+d3BlLTEuMC5wYzwvcGtnLWNvbmZpZz4KKyAgICA8YnJhbmNoIHJlcG89Indw ZXdlYmtpdCIgbW9kdWxlPSJsaWJ3cGUtMS40LjAudGFyLnh6IiB2ZXJzaW9uPSIxLjQuMCIKKyAg ICAgICAgICAgIGhhc2g9InNoYTI1NjplMmQzNDk0ZmMzM2ZlOTQ2YWQ5MTdmZDZhM2FiZDEyNzQ2 MmI5MWJiYTYyZWY4YjM1NTA3ZTkyZjhlZGU0MTg4Ii8+CisgIDwvY21ha2U+CisKKyAgPGNtYWtl IGlkPSJ3cGViYWNrZW5kLWZkbyI+CisgICAgPGRlcGVuZGVuY2llcz4KKyAgICAgIDxkZXAgcGFj a2FnZT0ibGlid3BlIi8+CisgICAgPC9kZXBlbmRlbmNpZXM+CisgICAgPHBrZy1jb25maWc+d3Bl YmFja2VuZC1mZG8tMS4wLnBjPC9wa2ctY29uZmlnPgorICAgIDxicmFuY2ggcmVwbz0id3Bld2Vi a2l0IiBtb2R1bGU9IndwZWJhY2tlbmQtZmRvLTEuNC4xLnRhci54eiIgdmVyc2lvbj0iMS40LjEi CisgICAgICAgICAgICBoYXNoPSJzaGEyNTY6NjI0OWEwYjdjYmZhNjYyMjA2YThkMmZhMjRlMmM1 NzRlNzVjNjgxYWQwZTkzNDY4MDkxZjFkYzY4ZGRiMjk5ZCIvPgorICA8L2NtYWtlPgorCis8L21v ZHVsZXNldD4KZGlmZiAtLWdpdCBhL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weSBi L1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weQppbmRleCBiYmJkYmYzNjAzOWZiZjdk MzBlYjlmMGQ2NzRiY2M4YTAyZDFhOTJjLi42OTEwMmVmYzY4ZDliYmE3YmM4NmFlMmY3MmYxNTYw NDkzNDE4NzY0IDEwMDY0NAotLS0gYS9Ub29scy9qaGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkK KysrIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkcmNfY29tbW9uLnB5CkBAIC00MywxNCArNDMsMjYg QEAgZGVmIGluaXQoamhidWlsZHJjX2dsb2JhbHMsIGpoYnVpbGRfcGxhdGZvcm0pOgogCiAgICAg amhidWlsZHJjX2dsb2JhbHNbImJ1aWxkX3BvbGljeSJdID0gJ3VwZGF0ZWQnCiAKLSAgICBfX21v ZHVsZXNldF9maWxlX3VyaSA9ICdmaWxlOi8vJyArIG9zLnBhdGguam9pbihfX3Rvb2xzX2RpcmVj dG9yeSwgJ2poYnVpbGQubW9kdWxlcycpCisgICAgX19tb2R1bGVzZXRfZmlsZV9uYW1lID0gJ2po YnVpbGQubW9kdWxlcycKKyAgICBpZiAnV0VCS0lUX0pIQlVJTERfTU9EVUxFU0VUJyBpbiBvcy5l bnZpcm9uOgorICAgICAgICBfX21vZHVsZXNldF9maWxlX25hbWUgPSAnamhidWlsZC0lcy5tb2R1 bGVzJyAlIG9zLmVudmlyb25bJ1dFQktJVF9KSEJVSUxEX01PRFVMRVNFVCddCisgICAgX19tb2R1 bGVzZXRfZmlsZV9wYXRoID0gb3MucGF0aC5qb2luKF9fdG9vbHNfZGlyZWN0b3J5LCBfX21vZHVs ZXNldF9maWxlX25hbWUpCisgICAgaWYgbm90IG9zLnBhdGguaXNmaWxlKF9fbW9kdWxlc2V0X2Zp bGVfcGF0aCk6CisgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigiQ2FuJ3QgZmluZCB0aGUgbW9k dWxlc2V0IGluIHBhdGggJXMiICUgX19tb2R1bGVzZXRfZmlsZV9wYXRoKQorICAgIF9fbW9kdWxl c2V0X2ZpbGVfdXJpID0gJ2ZpbGU6Ly8nICsgX19tb2R1bGVzZXRfZmlsZV9wYXRoCisKICAgICBf X2V4dHJhX21vZHVsZXNldHMgPSBvcy5lbnZpcm9uLmdldCgiV0VCS0lUX0VYVFJBX01PRFVMRVNF VFMiLCAiIikuc3BsaXQoIiwiKQogICAgIGpoYnVpbGRyY19nbG9iYWxzWyJtb2R1bGVzZXQiXSA9 IFtfX21vZHVsZXNldF9maWxlX3VyaSwgXQogICAgIGlmIF9fZXh0cmFfbW9kdWxlc2V0cyAhPSBb JyddOgogICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1sibW9kdWxlc2V0Il0uZXh0ZW5kKF9fZXh0 cmFfbW9kdWxlc2V0cykKIAogICAgIF9fZXh0cmFfbW9kdWxlcyA9IG9zLmVudmlyb24uZ2V0KCJX RUJLSVRfRVhUUkFfTU9EVUxFUyIsICIiKS5zcGxpdCgiLCIpCi0gICAgamhidWlsZHJjX2dsb2Jh bHNbIm1vZHVsZXMiXSA9IFsnd2Via2l0JyArIGpoYnVpbGRfcGxhdGZvcm0gKyAnLXRlc3Rpbmct ZGVwZW5kZW5jaWVzJywgXQorCisgICAgYmFzZV9kZXBlbmRlbmN5X3N1ZmZpeCA9ICd0ZXN0aW5n JworICAgIGlmICdXRUJLSVRfSkhCVUlMRF9NT0RVTEVTRVQnIGluIG9zLmVudmlyb246CisgICAg ICAgIGJhc2VfZGVwZW5kZW5jeV9zdWZmaXggPSBvcy5lbnZpcm9uWydXRUJLSVRfSkhCVUlMRF9N T0RVTEVTRVQnXQorCisgICAgamhidWlsZHJjX2dsb2JhbHNbIm1vZHVsZXMiXSA9IFsnd2Via2l0 JyArIGpoYnVpbGRfcGxhdGZvcm0gKyAnLScgKyBiYXNlX2RlcGVuZGVuY3lfc3VmZml4ICsgJy1k ZXBlbmRlbmNpZXMnLCBdCiAgICAgaWYgX19leHRyYV9tb2R1bGVzICE9IFsnJ106CiAgICAgICAg IGpoYnVpbGRyY19nbG9iYWxzWyJtb2R1bGVzIl0uZXh0ZW5kKF9fZXh0cmFfbW9kdWxlcykKIApk aWZmIC0tZ2l0IGEvVG9vbHMvd3BlL2poYnVpbGQtbWluaW1hbC5tb2R1bGVzIGIvVG9vbHMvd3Bl L2poYnVpbGQtbWluaW1hbC5tb2R1bGVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFlMTQ1YWJhYTAxZWJmMDI3NTBj MTQxMWZmMTA1NjNlNzA3ZDRhYWMKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy93cGUvamhidWls ZC1taW5pbWFsLm1vZHVsZXMKQEAgLTAsMCArMSw3MiBAQAorPD94bWwgdmVyc2lvbj0iMS4wIj8+ Cis8IURPQ1RZUEUgbW9kdWxlc2V0IFNZU1RFTSAibW9kdWxlc2V0LmR0ZCI+Cis8P3htbC1zdHls ZXNoZWV0IHR5cGU9InRleHQveHNsIiBocmVmPSJtb2R1bGVzZXQueHNsIj8+Cis8bW9kdWxlc2V0 PgorCisgIDxtZXRhbW9kdWxlIGlkPSJ3ZWJraXR3cGUtbWluaW1hbC1kZXBlbmRlbmNpZXMiPgor ICAgIDxkZXBlbmRlbmNpZXM+CisgICAgICA8ZGVwIHBhY2thZ2U9IndwZWJhY2tlbmQtZmRvIi8+ CisgICAgPC9kZXBlbmRlbmNpZXM+CisgIDwvbWV0YW1vZHVsZT4KKworICA8IS0tIFBsZWFzZSB1 c2UgaHR0cC9odHRwcyB0byBhY2Nlc3MgcmVwb3NpdG9yaWVzIHRvIGJlIGZyaWVuZGx5IHRvIHVz ZXJzIHN0dWNrIGJlaGluZCBmaXJld2FsbHMuIC0tPgorICA8cmVwb3NpdG9yeSB0eXBlPSJnaXQi IG5hbWU9ImdpdGh1Yi5jb20iCisgICAgICBocmVmPSJodHRwczovL2dpdGh1Yi5jb20iLz4KKyAg PHJlcG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFtZT0iZ2l0aHViLXRhcmJhbGwiCisgICAgICBo cmVmPSJodHRwczovL2dpdGh1Yi5jb20vIi8+CisgIDxyZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwi IG5hbWU9InNvdXJjZXdhcmUub3JnLW1pcnJvciIKKyAgICAgIGhyZWY9Imh0dHA6Ly9taXJyb3Jz Lmtlcm5lbC5vcmcvc291cmNlcy5yZWRoYXQuY29tLyIvPgorICA8cmVwb3NpdG9yeSB0eXBlPSJ0 YXJiYWxsIiBuYW1lPSJmdHAuZ25vbWUub3JnIgorICAgICAgaHJlZj0iaHR0cDovL2Z0cC5nbm9t ZS5vcmciLz4KKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFtZT0iZG93bmxvYWQuZ25v bWUub3JnIgorICAgICAgaHJlZj0iaHR0cHM6Ly9kb3dubG9hZC5nbm9tZS5vcmciLz4KKyAgPHJl cG9zaXRvcnkgdHlwZT0iZ2l0IiBuYW1lPSJnaXQuZ25vbWUub3JnIgorICAgICAgaHJlZj0iaHR0 cHM6Ly9naXQuZ25vbWUub3JnL2Jyb3dzZS8iLz4KKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFs bCIgbmFtZT0iY2Fpcm9ncmFwaGljcy5vcmciCisgICAgICBocmVmPSJodHRwOi8vY2Fpcm9ncmFw aGljcy5vcmciLz4KKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFtZT0iZnJlZWRlc2t0 b3Aub3JnIgorICAgICAgaHJlZj0iaHR0cDovL3d3dy5mcmVlZGVza3RvcC5vcmciLz4KKyAgPHJl cG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFtZT0ieG9yZyIKKyAgICAgIGhyZWY9Imh0dHA6Ly94 b3JnLmZyZWVkZXNrdG9wLm9yZyIvPgorICA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1l PSJ4bWxzb2Z0Lm9yZyIKKyAgICAgIGhyZWY9Imh0dHA6Ly94bWxzb2Z0Lm9yZyIvPgorICA8cmVw b3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1lPSJzYXZhbm5haC5nbnUub3JnIgorICAgICAgaHJl Zj0iaHR0cDovL2Rvd25sb2FkLnNhdmFubmFoLmdudS5vcmcvcmVsZWFzZXMvIi8+CisgIDxyZXBv c2l0b3J5IHR5cGU9ImdpdCIgbmFtZT0iZnJlZWRlc2t0b3AtZ2l0IgorICAgICAgaHJlZj0iaHR0 cDovL2Fub25naXQuZnJlZWRlc2t0b3Aub3JnL2dpdCIvPgorIDxyZXBvc2l0b3J5IHR5cGU9InRh cmJhbGwiIG5hbWU9ImRyaS5mcmVlZGVza3RvcC5vcmciCisgICAgICBocmVmPSJodHRwczovL2Ry aS5mcmVlZGVza3RvcC5vcmciLz4KKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFtZT0i bWVzYS5mcmVlZGVza3RvcC5vcmciCisgICAgICBocmVmPSJodHRwczovL21lc2EuZnJlZWRlc2t0 b3Aub3JnIi8+CisgIDxyZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwiIG5hbWU9IndheWxhbmQuZnJl ZWRlc2t0b3Aub3JnIgorICAgICAgaHJlZj0iaHR0cDovL3dheWxhbmQuZnJlZWRlc2t0b3Aub3Jn Ii8+CisgIDxyZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwiIG5hbWU9Imxsdm0ub3JnIgorICAgICAg aHJlZj0iaHR0cDovL2xsdm0ub3JnIi8+CisgIDxyZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwiIG5h bWU9IndlYmtpdGd0ay1qaGJ1aWxkLW1pcnJvciIKKyAgICAgIGhyZWY9Imh0dHA6Ly93ZWJraXRn dGsub3JnL2poYnVpbGRfbWlycm9yLyIvPgorICA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBu YW1lPSJnbnVwZy5vcmciCisgICAgICBocmVmPSJodHRwczovL3d3dy5nbnVwZy5vcmcvZnRwL2dj cnlwdC8iLz4KKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFtZT0id3Bld2Via2l0Igor ICAgICAgaHJlZj0iaHR0cHM6Ly93cGV3ZWJraXQub3JnL3JlbGVhc2VzLyIvPgorCisKKzwhLS0g VGhpcyBtb2R1bGVzZXQgaXMgdXNlZCB3aGVuIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBXRUJL SVRfSkhCVUlMRF9NT0RVTEVTRVQ9bWluaW1hbCBpcyBzZXQgLS0+Cis8IS0tIEl0cyBpbnRlbmRl ZCB0byBhbGxvdyBidWlsZGluZyBXZWJLaXQgdXNpbmcgYXMgbXVjaCBhcyBsaWJyYXJpZXMgZnJv bSB5b3VyIGRpc3RyaWJ1dGlvbiBhcyBwb3NzaWJsZSAtLT4KKzwhLS0gSW4gb3JkZXIgdG8gZW5z dXJlIGl0cyBtaW5pbWFsLCBhbGwgdGhlIG1vZHVsZXMgc2hvdWxkIGhhdmUgYSBwa2ctY29uZmln IGRlY2xhcmF0aW9uIGxpbmUgLS0+CisKKyAgPGNtYWtlIGlkPSJsaWJ3cGUiPgorICAgIDxwa2ct Y29uZmlnPndwZS0xLjAucGM8L3BrZy1jb25maWc+CisgICAgPGJyYW5jaCByZXBvPSJ3cGV3ZWJr aXQiIG1vZHVsZT0ibGlid3BlLTEuNC4wLnRhci54eiIgdmVyc2lvbj0iMS40LjAiCisgICAgICAg ICAgICBoYXNoPSJzaGEyNTY6ZTJkMzQ5NGZjMzNmZTk0NmFkOTE3ZmQ2YTNhYmQxMjc0NjJiOTFi YmE2MmVmOGIzNTUwN2U5MmY4ZWRlNDE4OCIvPgorICA8L2NtYWtlPgorCisgIDxjbWFrZSBpZD0i d3BlYmFja2VuZC1mZG8iPgorICAgIDxkZXBlbmRlbmNpZXM+CisgICAgICA8ZGVwIHBhY2thZ2U9 ImxpYndwZSIvPgorICAgIDwvZGVwZW5kZW5jaWVzPgorICAgIDxwa2ctY29uZmlnPndwZWJhY2tl bmQtZmRvLTEuMC5wYzwvcGtnLWNvbmZpZz4KKyAgICA8YnJhbmNoIHJlcG89IndwZXdlYmtpdCIg bW9kdWxlPSJ3cGViYWNrZW5kLWZkby0xLjQuMS50YXIueHoiIHZlcnNpb249IjEuNC4xIgorICAg ICAgICAgICAgaGFzaD0ic2hhMjU2OjYyNDlhMGI3Y2JmYTY2MjIwNmE4ZDJmYTI0ZTJjNTc0ZTc1 YzY4MWFkMGU5MzQ2ODA5MWYxZGM2OGRkYjI5OWQiLz4KKyAgPC9jbWFrZT4KKworPC9tb2R1bGVz ZXQ+Cg== 403692 2020-07-07 08:54:05 -0700 2020-07-08 03:41:59 -0700 Patch bug-213614-20200707175403.patch text/plain 15993 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MDE3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjMxYjM4MjE0OWNlYzcyZDliNGIzODBlOGE3NzAyNjdm NDYxNDU1YS4uMTE0MmUxMDRlODEwYWMzMjU4YzQ3NWU2MmQwMDcwNGU3YjNmNTQ4NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1 IEBACisyMDIwLTA3LTA3ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtKSEJ1aWxkXSBBZGQgc3VwcG9ydCBmb3IgdXNpbmcgYSBtaW5p bWFsIG1vZHVsZXNldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjEzNjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhpcyBwYXRjaCBpbnRyb2R1Y2VzIGEgd2F5IG9mIHNwZWNpZnlpbmcgYSBtb2R1bGVz ZXQgb3RoZXIgdGhhbiB0aGUgZGVmYXVsdAorICAgICAgICB2aWEgdGhlIGVudmlyb25tZW50IHZh cmlhYmxlIFdFQktJVF9KSEJVSUxEX01PRFVMRVNFVCBhbmQgYWRkcyBhIG1pbmltYWwgbW9kdWxl c2V0CisgICAgICAgIHRoYXQgYWxsb3dzIGJ1aWxkaW5nIFdlYktpdCB3aXRoIGl0LiBUaGlzIG1p bmltYWwgbW9kdWxlc2V0IGluY2x1ZGVzIHRoZSBsaWJyYXJpZXMKKyAgICAgICAgbmVlZGVkIGZv ciBidWlsZGluZyBXZWJLaXQgb24gVWJ1bnR1LTE4LjA0LCBhbmQgdGhvc2UgbGlicmFyaWVzIGFy ZSBvbmx5IGJ1aWxkIGlmCisgICAgICAgIG5lZWRlZCBzaW5jZSB0aGV5IGluY2x1ZGUgdGhlIDxw a2ctY29uZmlnPiBlbnRyaWVzIHRoYXQgdGVsbHMgSkhCdWlsZCB0byBub3QgYnVpbGQKKyAgICAg ICAgdGhlbSBpZiB0aG9zZSBhcmUgYWxyZWFkeSBpbnN0YWxsZWQgc3lzdGVtIHdpZGUuIFNvIHRo aXMgbWluaW1hbCBtb2R1bGVzZXQgc2hvdWxkCisgICAgICAgIHdvcmsgYWxzbyBvbiBuZXdlciB2 ZXJzaW9ucyBvZiBVYnVudHUgb3IgZXZlbiBvdGhlciBkaXN0cmlidXRpb25zLgorCisgICAgICAg IEN1cnJlbnRseSBhIHJlY2lwZSBmb3IgbmV3ZXIgbGlic291cCB0aGFuIHRoZSBvbmUgc2hpcHBl ZCBieSBVYnVudHUtMTguMDQgaXMgaW5jbHVkZWQKKyAgICAgICAgc2luY2Ugd2UgbmVlZCB0aGlz IHRvIGhhdmUgc3VwcG9ydCBmb3IgU2FtZVNpdGUgY29va2llIHN1cHBvcnQuCisgICAgICAgIFRo ZSBtaW5pbWFsIG1vZHVsZXNldCBpcyBzaGFyZWQgYmV0d2VlbiBXUEUgYW5kIEdUSyB0byByZWR1 Y2UgY29kZSBkdXBsaWNhdGlvbi4KKworICAgICAgICBUbyB1c2UgdGhpcywgeW91IGhhdmUgdG8g ZXhwb3J0IG9uIHRoZSBidWlsZCBlbnZpcm9ubWVudDoKKyAgICAgICAgV0VCS0lUX0pIQlVJTEQ9 MQorICAgICAgICBXRUJLSVRfSkhCVUlMRF9NT0RVTEVTRVQ9bWluaW1hbAorCisgICAgICAgICog U2NyaXB0cy91cGRhdGUtd2Via2l0LWxpYnMtamhidWlsZDoKKyAgICAgICAgKGdldEpoYnVpbGRJ bmNsdWRlZEZpbGVQYXRocyk6CisgICAgICAgIChqaGJ1aWxkTW9kdWxlc2V0TmFtZUNoYW5nZWQp OgorICAgICAgICAoamhidWlsZENvbmZpZ3VyYXRpb25DaGFuZ2VkKToKKyAgICAgICAgKHNhdmVK aGJ1aWxkTWQ1KToKKyAgICAgICAgKHNhdmVKaGJ1aWxkTW9kdWxlc2V0TmFtZSk6CisgICAgICAg IChzYXZlSmhidWlsZENvbmZpZyk6CisgICAgICAgIChkZWxldGVKaGJ1aWxkTWQ1KToKKyAgICAg ICAgKGRlbGV0ZUpoYnVpbGRNb2R1bGVzZXROYW1lKToKKyAgICAgICAgKGRlbGV0ZUpoYnVpbGRD b25maWcpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGdldEpo YnVpbGRNb2R1bGVzZXROYW1lKToKKyAgICAgICAgKiBndGsvamhidWlsZC1taW5pbWFsLm1vZHVs ZXM6IEFkZGVkLgorICAgICAgICAqIGpoYnVpbGQvamhidWlsZC1taW5pbWFsLm1vZHVsZXM6IEFk ZGVkLgorICAgICAgICAqIGpoYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weToKKyAgICAgICAgKGlu aXQpOgorICAgICAgICAqIGpoYnVpbGQvcGF0Y2hlcy9saWJzb3VwLWxvd2VyLWdsaWItZGVwZW5k ZW5jeS10by0yLjM4LnBhdGNoOiBBZGRlZC4KKyAgICAgICAgKiB3cGUvamhidWlsZC1taW5pbWFs Lm1vZHVsZXM6IEFkZGVkLgorCiAyMDIwLTA3LTA3ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBh cHBsZS5jb20+CiAKICAgICAgICAgQWRkZWQgYSB0ZXN0IGZvciBjYWxsT25NYWluVGhyZWFkCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxkIGIvVG9v bHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWxpYnMtamhidWlsZAppbmRleCBiZjczZmU3YjRmYmVl YjUyMWRhMWY2MGFlZmI0M2FlMDc3YTY0ZmZjLi5jOGY5NjA1NGRiMzFkNWJkOTVkMGUyYWFhMGNi ZDI2ZDIxMTNkYTFlIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtbGli cy1qaGJ1aWxkCisrKyBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQK QEAgLTQ4LDYgKzQ4LDcgQEAgR2V0T3B0aW9ucygKIHN1YiBnZXRKaGJ1aWxkSW5jbHVkZWRGaWxl UGF0aHMKIHsKICAgICBteSAkamhidWlsZEZpbGUgPSBzaGlmdDsKKyAgICBkaWUgIkNhbid0IGZp bmQgZmlsZSAkamhidWlsZEZpbGUiIGlmICEgLWUgJGpoYnVpbGRGaWxlOwogICAgIG15ICRkb20g PSBYTUw6OkxpYlhNTC0+bG9hZF94bWwobG9jYXRpb24gPT4gJGpoYnVpbGRGaWxlKTsKICAgICBt eSBAaW5jbHVkZXM7CiAKQEAgLTk1LDEwICs5NiwyMyBAQCBzdWIgamhidWlsZENvbmZpZ3VyYXRp b25DaGVja0ZpbGUKICAgICB9CiB9CiAKK3N1YiBqaGJ1aWxkTW9kdWxlc2V0TmFtZUNoYW5nZWQo KQoreworICAgIG15ICRqaEJ1aWxkTW9kdWxlc2V0TmFtZUZpbGUgPSBqb2luKCcvJywgZ2V0Smhi dWlsZFBhdGgoKSwgJHBsYXRmb3JtLCAnbW9kdWxlc2V0Lm5hbWUnKTsKKyAgICBteSAkcHJldmlv dXNNb2R1bGVzZXROYW1lOworICAgIG9wZW4obXkgJEZILCAnPCcsICRqaEJ1aWxkTW9kdWxlc2V0 TmFtZUZpbGUpIG9yIHJldHVybiAxOworICAgIHsKKyAgICAgICAgbG9jYWwgJC87ICMgbG9jYWxp emVkIHNsdXJwIG1vZGUKKyAgICAgICAgJHByZXZpb3VzTW9kdWxlc2V0TmFtZSA9IDwkRkg+Owor ICAgIH0KKyAgICBjbG9zZSgkRkgpOworICAgIHJldHVybiAkcHJldmlvdXNNb2R1bGVzZXROYW1l IG5lIGdldEpoYnVpbGRNb2R1bGVzZXROYW1lKCk7Cit9CisKIHN1YiBqaGJ1aWxkQ29uZmlndXJh dGlvbkNoYW5nZWQoKQogewotICAgIG15ICRqaGJ1aWxkTWFpbiA9IGpvaW4oJy8nLCBzb3VyY2VE aXIoKSwgJ1Rvb2xzJywgJHBsYXRmb3JtLCAnamhidWlsZC5tb2R1bGVzJyk7Ci0gICAgbXkgQGpo YnVpbGRGaWxlcyA9IHF3KGpoYnVpbGRyYyBqaGJ1aWxkLm1vZHVsZXMpOworICAgIG15ICRqaGJ1 aWxkTWFpbiA9IGpvaW4oJy8nLCBzb3VyY2VEaXIoKSwgJ1Rvb2xzJywgJHBsYXRmb3JtLCBnZXRK aGJ1aWxkTW9kdWxlc2V0TmFtZSgpKTsKKyAgICBteSBAamhidWlsZEZpbGVzID0gKCdqaGJ1aWxk cmMnLCBnZXRKaGJ1aWxkTW9kdWxlc2V0TmFtZSgpKTsKICAgICBwdXNoKEBqaGJ1aWxkRmlsZXMs IGdldEpoYnVpbGRJbmNsdWRlZEZpbGVQYXRocygkamhidWlsZE1haW4pKTsKIAogICAgIGZvcmVh Y2ggbXkgJGZpbGUgKEBqaGJ1aWxkRmlsZXMpIHsKQEAgLTEwNiw2ICsxMjAsNyBAQCBzdWIgamhi dWlsZENvbmZpZ3VyYXRpb25DaGFuZ2VkKCkKICAgICAgICAgICAgIHJldHVybiAxOwogICAgICAg ICB9CiAgICAgfQorICAgIHJldHVybiBqaGJ1aWxkTW9kdWxlc2V0TmFtZUNoYW5nZWQoKTsKIH0K IAogc3ViIHNhdmVNZDVGaWxlCkBAIC0xMjUsOCArMTQwLDggQEAgc3ViIHNhdmVNZDVGaWxlCiBz dWIgc2F2ZUpoYnVpbGRNZDUoKSB7CiAgICAgIyBTYXZlIG1kNXN1bSBmb3IgamhidWlsZC1yZWxh dGVkIGZpbGVzLnNhdmVKaGJ1aWxkTWQ1KCk7CiAgICAgbXkgJGpoYnVpbGRQYXRoID0gZ2V0Smhi dWlsZFBhdGgoKTsKLSAgICBteSAkamhidWlsZE1haW4gPSBqb2luKCcvJywgc291cmNlRGlyKCks ICdUb29scycsICRwbGF0Zm9ybSwgJ2poYnVpbGQubW9kdWxlcycpOwotICAgIG15IEBqaGJ1aWxk RmlsZXMgPSBxdyhqaGJ1aWxkcmMgamhidWlsZC5tb2R1bGVzKTsKKyAgICBteSAkamhidWlsZE1h aW4gPSBqb2luKCcvJywgc291cmNlRGlyKCksICdUb29scycsICRwbGF0Zm9ybSwgZ2V0SmhidWls ZE1vZHVsZXNldE5hbWUoKSk7CisgICAgbXkgQGpoYnVpbGRGaWxlcyA9ICgnamhidWlsZHJjJywg Z2V0SmhidWlsZE1vZHVsZXNldE5hbWUoKSk7CiAgICAgcHVzaChAamhidWlsZEZpbGVzLCBnZXRK aGJ1aWxkSW5jbHVkZWRGaWxlUGF0aHMoJGpoYnVpbGRNYWluKSk7CiAKICAgICAoLWQgJGpoYnVp bGRQYXRoKSB8fCBta3BhdGggJGpoYnVpbGRQYXRoOwpAQCAtMTM1LDE0ICsxNTAsMjggQEAgc3Vi IHNhdmVKaGJ1aWxkTWQ1KCkgewogICAgIH0KIH0KIAorc3ViIHNhdmVKaGJ1aWxkTW9kdWxlc2V0 TmFtZSgpIHsKKyAgICBteSAkamhCdWlsZFBsYXRmb3JtRGlyID0gam9pbignLycsIGdldEpoYnVp bGRQYXRoKCksICRwbGF0Zm9ybSk7CisgICAgKC1kICRqaEJ1aWxkUGxhdGZvcm1EaXIpIHx8IG1r cGF0aCAkamhCdWlsZFBsYXRmb3JtRGlyOworICAgIG15ICRqaEJ1aWxkTW9kdWxlc2V0TmFtZUZp bGUgPSBqb2luKCcvJywgJGpoQnVpbGRQbGF0Zm9ybURpciwgJ21vZHVsZXNldC5uYW1lJyk7Cisg ICAgb3BlbihGSCwgJz4nLCAkamhCdWlsZE1vZHVsZXNldE5hbWVGaWxlKTsKKyAgICBwcmludCBG SCBnZXRKaGJ1aWxkTW9kdWxlc2V0TmFtZSgpOworICAgIGNsb3NlKEZIKTsKK30KKworc3ViIHNh dmVKaGJ1aWxkQ29uZmlnKCkgeworICAgIHNhdmVKaGJ1aWxkTWQ1KCk7CisgICAgc2F2ZUpoYnVp bGRNb2R1bGVzZXROYW1lKCk7Cit9CisKIHN1YiBkZWxldGVKaGJ1aWxkTWQ1KCkgewogICAgIG15 ICRqaGJ1aWxkUGF0aCA9IGdldEpoYnVpbGRQYXRoKCk7CiAgICAgaWYgKCEtZCAkamhidWlsZFBh dGgpIHsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIG15ICRqaGJ1aWxkTWFpbiA9IGpv aW4oJy8nLCBzb3VyY2VEaXIoKSwgJ1Rvb2xzJywgJHBsYXRmb3JtLCAnamhidWlsZC5tb2R1bGVz Jyk7Ci0gICAgbXkgQGpoYnVpbGRGaWxlcyA9IHF3KGpoYnVpbGRyYyBqaGJ1aWxkLm1vZHVsZXMp OworICAgIG15ICRqaGJ1aWxkTWFpbiA9IGpvaW4oJy8nLCBzb3VyY2VEaXIoKSwgJ1Rvb2xzJywg JHBsYXRmb3JtLCBnZXRKaGJ1aWxkTW9kdWxlc2V0TmFtZSgpKTsKKyAgICBteSBAamhidWlsZEZp bGVzID0gKCdqaGJ1aWxkcmMnLCBnZXRKaGJ1aWxkTW9kdWxlc2V0TmFtZSgpKTsKICAgICBwdXNo KEBqaGJ1aWxkRmlsZXMsIGdldEpoYnVpbGRJbmNsdWRlZEZpbGVQYXRocygkamhidWlsZE1haW4p KTsKIAogICAgIGZvcmVhY2ggbXkgJGZpbGUgKEBqaGJ1aWxkRmlsZXMpIHsKQEAgLTE1MSw2ICsx ODAsMTYgQEAgc3ViIGRlbGV0ZUpoYnVpbGRNZDUoKSB7CiAgICAgfQogfQogCitzdWIgZGVsZXRl SmhidWlsZE1vZHVsZXNldE5hbWUoKSB7CisgICAgbXkgJGpoQnVpbGRNb2R1bGVzZXROYW1lRmls ZSA9IGpvaW4oJy8nLCBqaGJ1aWxkUGF0aCwgJHBsYXRmb3JtLCAnbW9kdWxlc2V0Lm5hbWUnKTsK KyAgICB1bmxpbmsoJGpoQnVpbGRNb2R1bGVzZXROYW1lRmlsZSkgaWYgLWUgJGpoQnVpbGRNb2R1 bGVzZXROYW1lRmlsZTsKK30KKworc3ViIGRlbGV0ZUpoYnVpbGRDb25maWcoKSB7CisgICAgZGVs ZXRlSmhidWlsZE1kNSgpOworICAgIGRlbGV0ZUpoYnVpbGRNb2R1bGVzZXROYW1lKCk7Cit9CisK IHN1YiBydW5KaGJ1aWxkCiB7CiAgICAgbXkgJGNvbW1hbmQgPSBzaGlmdDsKQEAgLTE5Myw4ICsy MzIsOCBAQCBpZiAoJHdpcGVPbkNoYW5nZSAmJiAtZSBnZXRKaGJ1aWxkUGF0aCgpKSB7CiAKIHBy aW50ICJVcGRhdGluZyAiIC4gJHByZXR0eVBsYXRmb3JteyRwbGF0Zm9ybX0gLiAiIHBvcnQgZGVw ZW5kZW5jaWVzIHVzaW5nIGpoYnVpbGQuLi5cbiI7CiBpZiAocnVuSmhidWlsZCgiYnVpbGQiKSA9 PSAwKSB7Ci0gICAgc2F2ZUpoYnVpbGRNZDUoKTsKKyAgICBzYXZlSmhidWlsZENvbmZpZygpOwog fSBlbHNlIHsKLSAgICBkZWxldGVKaGJ1aWxkTWQ1KCk7CisgICAgZGVsZXRlSmhidWlsZENvbmZp ZygpOwogICAgIGRpZSAiRmFpbGVkIHRvIGJ1aWxkICIgLiAkcHJldHR5UGxhdGZvcm17JHBsYXRm b3JtfSAuICIgcG9ydCBkZXBlbmRlbmNpZXMgd2l0aCBqaGJ1aWxkXG4iOwogfQpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCmluZGV4IGE0MThjYmRiM2QxYjVmNWEyZjRhNTA1ZmY1Mzc3M2VhNTRmYTNhM2MuLjM3ZGUz MDNhZGIzM2ZmNDY1YTJhOTJlYzVlMTZiMDliM2QxN2VkM2EgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAg LTIxMDgsNiArMjEwOCwxNiBAQCBzdWIgZ2V0SmhidWlsZFBhdGgoKQogICAgIHJldHVybiBGaWxl OjpTcGVjLT5jYXRkaXIoQGpoYnVpbGRQYXRoKTsKIH0KIAorCitzdWIgZ2V0SmhidWlsZE1vZHVs ZXNldE5hbWUoKQoreworICAgIGlmIChkZWZpbmVkKCRFTlZ7J1dFQktJVF9KSEJVSUxEX01PRFVM RVNFVCd9KSkgeworICAgICAgICByZXR1cm4gJ2poYnVpbGQtJyAuICRFTlZ7J1dFQktJVF9KSEJV SUxEX01PRFVMRVNFVCd9IC4gJy5tb2R1bGVzJzsKKyAgICB9CisgICAgcmV0dXJuICdqaGJ1aWxk Lm1vZHVsZXMnOworfQorCisKIHN1YiBnZXRVc2VyRmxhdHBha1BhdGgoKQogewogICAgIG15ICRw cm9kdWN0RGlyID0gYmFzZVByb2R1Y3REaXIoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9qaGJ1 aWxkLW1pbmltYWwubW9kdWxlcyBiL1Rvb2xzL2d0ay9qaGJ1aWxkLW1pbmltYWwubW9kdWxlcwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi5mOTRmMmJjMDdkY2ZjZDFjMjY5MWQzZTIyMTY3OTMyZmU4ZDUxZDg5Ci0tLSAv ZGV2L251bGwKKysrIGIvVG9vbHMvZ3RrL2poYnVpbGQtbWluaW1hbC5tb2R1bGVzCkBAIC0wLDAg KzEsNiBAQAorPD94bWwgdmVyc2lvbj0iMS4wIj8+Cis8IURPQ1RZUEUgbW9kdWxlc2V0IFNZU1RF TSAibW9kdWxlc2V0LmR0ZCI+Cis8P3htbC1zdHlsZXNoZWV0IHR5cGU9InRleHQveHNsIiBocmVm PSJtb2R1bGVzZXQueHNsIj8+Cis8bW9kdWxlc2V0PgorICA8aW5jbHVkZSBocmVmPSIuLi9qaGJ1 aWxkL2poYnVpbGQtbWluaW1hbC5tb2R1bGVzIi8+Cis8L21vZHVsZXNldD4KZGlmZiAtLWdpdCBh L1Rvb2xzL2poYnVpbGQvamhidWlsZC1taW5pbWFsLm1vZHVsZXMgYi9Ub29scy9qaGJ1aWxkL2po YnVpbGQtbWluaW1hbC5tb2R1bGVzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjU0OGEwYWU2ZGJiNmFjYjY4ODBkMzlh ZmEwZTQwNTUwYmM2NjMzODYKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9qaGJ1aWxkL2poYnVp bGQtbWluaW1hbC5tb2R1bGVzCkBAIC0wLDAgKzEsMTA4IEBACis8P3htbCB2ZXJzaW9uPSIxLjAi Pz4KKzwhRE9DVFlQRSBtb2R1bGVzZXQgU1lTVEVNICJtb2R1bGVzZXQuZHRkIj4KKzw/eG1sLXN0 eWxlc2hlZXQgdHlwZT0idGV4dC94c2wiIGhyZWY9Im1vZHVsZXNldC54c2wiPz4KKzxtb2R1bGVz ZXQ+CisKKyAgPG1ldGFtb2R1bGUgaWQ9IndlYmtpdGd0ay1taW5pbWFsLWRlcGVuZGVuY2llcyI+ CisgICAgPGRlcGVuZGVuY2llcz4KKyAgICAgIDxkZXAgcGFja2FnZT0id3BlYmFja2VuZC1mZG8i Lz4KKyAgICAgIDxkZXAgcGFja2FnZT0ibGlic291cCIvPgorICAgIDwvZGVwZW5kZW5jaWVzPgor ICA8L21ldGFtb2R1bGU+CisKKyAgPG1ldGFtb2R1bGUgaWQ9IndlYmtpdHdwZS1taW5pbWFsLWRl cGVuZGVuY2llcyI+CisgICAgPGRlcGVuZGVuY2llcz4KKyAgICAgIDxkZXAgcGFja2FnZT0id3Bl YmFja2VuZC1mZG8iLz4KKyAgICAgIDxkZXAgcGFja2FnZT0ibGlic291cCIvPgorICAgIDwvZGVw ZW5kZW5jaWVzPgorICA8L21ldGFtb2R1bGU+CisKKyAgPCEtLSBQbGVhc2UgdXNlIGh0dHAvaHR0 cHMgdG8gYWNjZXNzIHJlcG9zaXRvcmllcyB0byBiZSBmcmllbmRseSB0byB1c2VycyBzdHVjayBi ZWhpbmQgZmlyZXdhbGxzLiAtLT4KKyAgPHJlcG9zaXRvcnkgdHlwZT0iZ2l0IiBuYW1lPSJnaXRo dWIuY29tIgorICAgICAgaHJlZj0iaHR0cHM6Ly9naXRodWIuY29tIi8+CisgIDxyZXBvc2l0b3J5 IHR5cGU9InRhcmJhbGwiIG5hbWU9ImdpdGh1Yi10YXJiYWxsIgorICAgICAgaHJlZj0iaHR0cHM6 Ly9naXRodWIuY29tLyIvPgorICA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1lPSJzb3Vy Y2V3YXJlLm9yZy1taXJyb3IiCisgICAgICBocmVmPSJodHRwOi8vbWlycm9ycy5rZXJuZWwub3Jn L3NvdXJjZXMucmVkaGF0LmNvbS8iLz4KKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFt ZT0iZnRwLmdub21lLm9yZyIKKyAgICAgIGhyZWY9Imh0dHA6Ly9mdHAuZ25vbWUub3JnIi8+Cisg IDxyZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwiIG5hbWU9ImRvd25sb2FkLmdub21lLm9yZyIKKyAg ICAgIGhyZWY9Imh0dHBzOi8vZG93bmxvYWQuZ25vbWUub3JnIi8+CisgIDxyZXBvc2l0b3J5IHR5 cGU9ImdpdCIgbmFtZT0iZ2l0Lmdub21lLm9yZyIKKyAgICAgIGhyZWY9Imh0dHBzOi8vZ2l0Lmdu b21lLm9yZy9icm93c2UvIi8+CisgIDxyZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwiIG5hbWU9ImNh aXJvZ3JhcGhpY3Mub3JnIgorICAgICAgaHJlZj0iaHR0cDovL2NhaXJvZ3JhcGhpY3Mub3JnIi8+ CisgIDxyZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwiIG5hbWU9ImZyZWVkZXNrdG9wLm9yZyIKKyAg ICAgIGhyZWY9Imh0dHA6Ly93d3cuZnJlZWRlc2t0b3Aub3JnIi8+CisgIDxyZXBvc2l0b3J5IHR5 cGU9InRhcmJhbGwiIG5hbWU9InhvcmciCisgICAgICBocmVmPSJodHRwOi8veG9yZy5mcmVlZGVz a3RvcC5vcmciLz4KKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFtZT0ieG1sc29mdC5v cmciCisgICAgICBocmVmPSJodHRwOi8veG1sc29mdC5vcmciLz4KKyAgPHJlcG9zaXRvcnkgdHlw ZT0idGFyYmFsbCIgbmFtZT0ic2F2YW5uYWguZ251Lm9yZyIKKyAgICAgIGhyZWY9Imh0dHA6Ly9k b3dubG9hZC5zYXZhbm5haC5nbnUub3JnL3JlbGVhc2VzLyIvPgorICA8cmVwb3NpdG9yeSB0eXBl PSJnaXQiIG5hbWU9ImZyZWVkZXNrdG9wLWdpdCIKKyAgICAgIGhyZWY9Imh0dHA6Ly9hbm9uZ2l0 LmZyZWVkZXNrdG9wLm9yZy9naXQiLz4KKyA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1l PSJkcmkuZnJlZWRlc2t0b3Aub3JnIgorICAgICAgaHJlZj0iaHR0cHM6Ly9kcmkuZnJlZWRlc2t0 b3Aub3JnIi8+CisgIDxyZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwiIG5hbWU9Im1lc2EuZnJlZWRl c2t0b3Aub3JnIgorICAgICAgaHJlZj0iaHR0cHM6Ly9tZXNhLmZyZWVkZXNrdG9wLm9yZyIvPgor ICA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1lPSJ3YXlsYW5kLmZyZWVkZXNrdG9wLm9y ZyIKKyAgICAgIGhyZWY9Imh0dHA6Ly93YXlsYW5kLmZyZWVkZXNrdG9wLm9yZyIvPgorICA8cmVw b3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1lPSJsbHZtLm9yZyIKKyAgICAgIGhyZWY9Imh0dHA6 Ly9sbHZtLm9yZyIvPgorICA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1lPSJ3ZWJraXRn dGstamhidWlsZC1taXJyb3IiCisgICAgICBocmVmPSJodHRwOi8vd2Via2l0Z3RrLm9yZy9qaGJ1 aWxkX21pcnJvci8iLz4KKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFtZT0iZ251cGcu b3JnIgorICAgICAgaHJlZj0iaHR0cHM6Ly93d3cuZ251cGcub3JnL2Z0cC9nY3J5cHQvIi8+Cisg IDxyZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwiIG5hbWU9IndwZXdlYmtpdCIKKyAgICAgIGhyZWY9 Imh0dHBzOi8vd3Bld2Via2l0Lm9yZy9yZWxlYXNlcy8iLz4KKworCis8IS0tIFRoaXMgbW9kdWxl c2V0IGlzIHVzZWQgd2hlbiB0aGUgZW52aXJvbm1lbnQgdmFyaWFibGUgV0VCS0lUX0pIQlVJTERf TU9EVUxFU0VUPW1pbmltYWwgaXMgc2V0IC0tPgorPCEtLSBJdHMgaW50ZW5kZWQgdG8gYWxsb3cg YnVpbGRpbmcgV2ViS2l0IHVzaW5nIGFzIG11Y2ggYXMgbGlicmFyaWVzIGZyb20geW91ciBkaXN0 cmlidXRpb24gYXMgcG9zc2libGUgLS0+Cis8IS0tIEluIG9yZGVyIHRvIGVuc3VyZSBpdHMgbWlu aW1hbCwgYWxsIHRoZSBtb2R1bGVzIHNob3VsZCBoYXZlIGEgcGtnLWNvbmZpZyBkZWNsYXJhdGlv biBsaW5lIC0tPgorCisgIDxjbWFrZSBpZD0ibGlid3BlIj4KKyAgICA8YnJhbmNoIG1vZHVsZT0i V2ViUGxhdGZvcm1Gb3JFbWJlZGRlZC9saWJ3cGUvcmVsZWFzZXMvZG93bmxvYWQvMS42LjAvbGli d3BlLTEuNi4wLnRhci54eiIgdmVyc2lvbj0iMS42LjAiCisgICAgICAgICAgICByZXBvPSJnaXRo dWItdGFyYmFsbCIKKyAgICAgICAgICAgIGhhc2g9IjM1ODdjNmI4YTgwN2Y0YmI3NmIyNjhiYTc0 Y2E4MmM2YjM5NWI5MDIzNWRiNDFhZDgyNTIyMjQ0NTYxOTNjOTAiLz4KKyAgPC9jbWFrZT4KKwor ICA8Y21ha2UgaWQ9IndwZWJhY2tlbmQtZmRvIj4KKyAgICA8ZGVwZW5kZW5jaWVzPgorICAgICAg PGRlcCBwYWNrYWdlPSJsaWJ3cGUiLz4KKyAgICA8L2RlcGVuZGVuY2llcz4KKyAgICA8YnJhbmNo IHJlcG89ImdpdGh1Yi5jb20iIG1vZHVsZT0iSWdhbGlhL1dQRUJhY2tlbmQtZmRvLmdpdCIgY2hl Y2tvdXRkaXI9IndwZWJhY2tlbmQtZmRvIiB0YWc9IjEuMy4xLTU0LWcxZjU4ZWJkZjYzMmZkZjkw ZjY5MTk0OWQ5MGM4MzM4YThkNzA3M2M3Ii8+CisgIDwvY21ha2U+CisKKyAgPCEtLSBsaWJzb3Vw ID49IDIuNjkgcmVxdWlyZWQgZm9yIFNhbWVTaXRlIGNvb2tpZSBzdXBwb3J0IC0tPgorICA8bWVz b24gaWQ9ImxpYnNvdXAiIG1lc29uYXJncz0iLURpbnRyb3NwZWN0aW9uPWRpc2FibGVkIC1EZ3Nz YXBpPWRpc2FibGVkIC1EdmFwaT1kaXNhYmxlZCAtRHRlc3RzPWZhbHNlIj4KKyAgICA8cGtnLWNv bmZpZz5saWJzb3VwLTIuNC5wYzwvcGtnLWNvbmZpZz4KKyAgICA8ZGVwZW5kZW5jaWVzPgorICAg ICAgPGRlcCBwYWNrYWdlPSJsaWJwc2wiLz4KKyAgICA8L2RlcGVuZGVuY2llcz4KKyAgICA8YnJh bmNoIG1vZHVsZT0iL3NvdXJjZXMvbGlic291cC8yLjY5L2xpYnNvdXAtJHt2ZXJzaW9ufS50YXIu eHoiIHZlcnNpb249IjIuNjkuOTAiCisgICAgICAgICAgICByZXBvPSJkb3dubG9hZC5nbm9tZS5v cmciCisgICAgICAgICAgICBoYXNoPSJzaGEyNTY6OGVkMTgwOTJjZmIyN2Q4NzBhN2M3YzQ1OTky ZjNhMjE2YmQyMmRkNmZkNmQyYzlmYmYxYWRjMmQ2OTU3Y2FiOCI+CisgICAgPHBhdGNoIGZpbGU9 ImxpYnNvdXAtbG93ZXItZ2xpYi1kZXBlbmRlbmN5LXRvLTIuMzgucGF0Y2giIHN0cmlwPSIxIi8+ CisgICAgPC9icmFuY2g+CisgIDwvbWVzb24+CisKKyAgPGF1dG90b29scyBpZD0ibGlicHNsIiBh dXRvZ2VuYXJncz0iLS1lbmFibGUtcnVudGltZT1saWJpY3UgLS1lbmFibGUtYnVpbHRpbj1saWJp Y3UiPgorICAgIDxwa2ctY29uZmlnPmxpYnBzbC5wYzwvcGtnLWNvbmZpZz4KKyAgICA8YnJhbmNo IG1vZHVsZT0icm9ja2RhYm9vdC9saWJwc2wvcmVsZWFzZXMvZG93bmxvYWQvbGlicHNsLSR7dmVy c2lvbn0vbGlicHNsLSR7dmVyc2lvbn0udGFyLmd6IgorICAgICAgICAgICAgdmVyc2lvbj0iMC4y MC4yIgorICAgICAgICAgICAgcmVwbz0iZ2l0aHViLXRhcmJhbGwiCisgICAgICAgICAgICBoYXNo PSJzaGEyNTY6ZjhmZDBhZWI2NjI1MmRmY2M2MzhmMTRkOWJlMWUyMzYyZmRhZjJjYTg2YmRlMDQ0 NGZmNGQ1Y2M5NjFiNTYwZiIvPgorICA8L2F1dG90b29scz4KKworICA8IS0tIG1lc29uIDAuNTAu MSByZXF1aXJlZCB0byBidWlsZCBsaWJzb3VwIDIuNjkgLS0+CisgIDxkaXN0dXRpbHMgaWQ9Im1l c29uIiBweXRob24zPSIxIj4KKyAgICA8YnJhbmNoIHJlcG89ImdpdGh1Yi10YXJiYWxsIgorICAg ICAgICAgICAgdmVyc2lvbj0iMC41MC4xIgorICAgICAgICAgICAgbW9kdWxlPSJtZXNvbmJ1aWxk L21lc29uL3JlbGVhc2VzL2Rvd25sb2FkLyR7dmVyc2lvbn0vbWVzb24tJHt2ZXJzaW9ufS50YXIu Z3oiCisgICAgICAgICAgICBjaGVja291dGRpcj0ibWVzb24tJHt2ZXJzaW9ufSIKKyAgICAgICAg ICAgIGhhc2g9InNoYTI1NjpmNjhmNTZkNjBjODBhNzdkZjhmYzA4ZmExMDE2YmM1ODMxNjA1ZDQ3 MTdiNjIyYzk2MjEyNTczMjcxZTE0ZWNjIi8+CisgIDwvZGlzdHV0aWxzPgorCis8L21vZHVsZXNl dD4KZGlmZiAtLWdpdCBhL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weSBiL1Rvb2xz L2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weQppbmRleCBiYmJkYmYzNjAzOWZiZjdkMzBlYjlm MGQ2NzRiY2M4YTAyZDFhOTJjLi42OTEwMmVmYzY4ZDliYmE3YmM4NmFlMmY3MmYxNTYwNDkzNDE4 NzY0IDEwMDY0NAotLS0gYS9Ub29scy9qaGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkKKysrIGIv VG9vbHMvamhidWlsZC9qaGJ1aWxkcmNfY29tbW9uLnB5CkBAIC00MywxNCArNDMsMjYgQEAgZGVm IGluaXQoamhidWlsZHJjX2dsb2JhbHMsIGpoYnVpbGRfcGxhdGZvcm0pOgogCiAgICAgamhidWls ZHJjX2dsb2JhbHNbImJ1aWxkX3BvbGljeSJdID0gJ3VwZGF0ZWQnCiAKLSAgICBfX21vZHVsZXNl dF9maWxlX3VyaSA9ICdmaWxlOi8vJyArIG9zLnBhdGguam9pbihfX3Rvb2xzX2RpcmVjdG9yeSwg J2poYnVpbGQubW9kdWxlcycpCisgICAgX19tb2R1bGVzZXRfZmlsZV9uYW1lID0gJ2poYnVpbGQu bW9kdWxlcycKKyAgICBpZiAnV0VCS0lUX0pIQlVJTERfTU9EVUxFU0VUJyBpbiBvcy5lbnZpcm9u OgorICAgICAgICBfX21vZHVsZXNldF9maWxlX25hbWUgPSAnamhidWlsZC0lcy5tb2R1bGVzJyAl IG9zLmVudmlyb25bJ1dFQktJVF9KSEJVSUxEX01PRFVMRVNFVCddCisgICAgX19tb2R1bGVzZXRf ZmlsZV9wYXRoID0gb3MucGF0aC5qb2luKF9fdG9vbHNfZGlyZWN0b3J5LCBfX21vZHVsZXNldF9m aWxlX25hbWUpCisgICAgaWYgbm90IG9zLnBhdGguaXNmaWxlKF9fbW9kdWxlc2V0X2ZpbGVfcGF0 aCk6CisgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcigiQ2FuJ3QgZmluZCB0aGUgbW9kdWxlc2V0 IGluIHBhdGggJXMiICUgX19tb2R1bGVzZXRfZmlsZV9wYXRoKQorICAgIF9fbW9kdWxlc2V0X2Zp bGVfdXJpID0gJ2ZpbGU6Ly8nICsgX19tb2R1bGVzZXRfZmlsZV9wYXRoCisKICAgICBfX2V4dHJh X21vZHVsZXNldHMgPSBvcy5lbnZpcm9uLmdldCgiV0VCS0lUX0VYVFJBX01PRFVMRVNFVFMiLCAi Iikuc3BsaXQoIiwiKQogICAgIGpoYnVpbGRyY19nbG9iYWxzWyJtb2R1bGVzZXQiXSA9IFtfX21v ZHVsZXNldF9maWxlX3VyaSwgXQogICAgIGlmIF9fZXh0cmFfbW9kdWxlc2V0cyAhPSBbJyddOgog ICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1sibW9kdWxlc2V0Il0uZXh0ZW5kKF9fZXh0cmFfbW9k dWxlc2V0cykKIAogICAgIF9fZXh0cmFfbW9kdWxlcyA9IG9zLmVudmlyb24uZ2V0KCJXRUJLSVRf RVhUUkFfTU9EVUxFUyIsICIiKS5zcGxpdCgiLCIpCi0gICAgamhidWlsZHJjX2dsb2JhbHNbIm1v ZHVsZXMiXSA9IFsnd2Via2l0JyArIGpoYnVpbGRfcGxhdGZvcm0gKyAnLXRlc3RpbmctZGVwZW5k ZW5jaWVzJywgXQorCisgICAgYmFzZV9kZXBlbmRlbmN5X3N1ZmZpeCA9ICd0ZXN0aW5nJworICAg IGlmICdXRUJLSVRfSkhCVUlMRF9NT0RVTEVTRVQnIGluIG9zLmVudmlyb246CisgICAgICAgIGJh c2VfZGVwZW5kZW5jeV9zdWZmaXggPSBvcy5lbnZpcm9uWydXRUJLSVRfSkhCVUlMRF9NT0RVTEVT RVQnXQorCisgICAgamhidWlsZHJjX2dsb2JhbHNbIm1vZHVsZXMiXSA9IFsnd2Via2l0JyArIGpo YnVpbGRfcGxhdGZvcm0gKyAnLScgKyBiYXNlX2RlcGVuZGVuY3lfc3VmZml4ICsgJy1kZXBlbmRl bmNpZXMnLCBdCiAgICAgaWYgX19leHRyYV9tb2R1bGVzICE9IFsnJ106CiAgICAgICAgIGpoYnVp bGRyY19nbG9iYWxzWyJtb2R1bGVzIl0uZXh0ZW5kKF9fZXh0cmFfbW9kdWxlcykKIApkaWZmIC0t Z2l0IGEvVG9vbHMvamhidWlsZC9wYXRjaGVzL2xpYnNvdXAtbG93ZXItZ2xpYi1kZXBlbmRlbmN5 LXRvLTIuMzgucGF0Y2ggYi9Ub29scy9qaGJ1aWxkL3BhdGNoZXMvbGlic291cC1sb3dlci1nbGli LWRlcGVuZGVuY3ktdG8tMi4zOC5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42YjY2OWIzNjEzMmUzYTRkYWJl YmRlZmI0ODc4ODhlMjA4NWRiMDZlCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvamhidWlsZC9w YXRjaGVzL2xpYnNvdXAtbG93ZXItZ2xpYi1kZXBlbmRlbmN5LXRvLTIuMzgucGF0Y2gKQEAgLTAs MCArMSwzMCBAQAorRnJvbSA4YjUyNTU1YWZlZDIzZTRjMjJlMGExMTBjMDZkMzhhMWM4OGRjM2Nm IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogQ2FybG9zIEFsYmVydG8gTG9wZXogUGVy ZXogPGNsb3BlekBpZ2FsaWEuY29tPgorRGF0ZTogV2VkLCAxIEp1bCAyMDIwIDE0OjQ3OjUwICsw MjAwCitTdWJqZWN0OiBbUEFUQ0hdIFJldmVydCAiQnVtcCBnbGliIGRlcGVuZGVuY3kgdG8gMi41 OCIKKworVGhpcyByZXZlcnRzIGNvbW1pdCBjN2RhMzYyYTI1OTNlZDkzOTFlZTgzMWVkYmYwZDI3 Y2JkNjgwYTY3LgorCitUaGUgbmV3IGdsaWIgdmVyc2lvbiBpcyBvbmx5IG5lZWRlZCB0byBiZSBh YmxlIHRvIHVzZQorZ19jYW5vbmljYWxpemVfZmlsZW5hbWUoKSBvbiB0ZXN0cy90ZXN0LXV0aWxz LmMgd2hpY2ggd2UgZG9udAorYnVpbGQuCistLS0KKyBtZXNvbi5idWlsZCB8IDIgKy0KKyAxIGZp bGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKKworZGlmZiAtLWdpdCBh L21lc29uLmJ1aWxkIGIvbWVzb24uYnVpbGQKK2luZGV4IGZmZmJiNDJmLi43ZDlkN2Q4NiAxMDA2 NDQKKy0tLSBhL21lc29uLmJ1aWxkCisrKysgYi9tZXNvbi5idWlsZAorQEAgLTgwLDcgKzgwLDcg QEAgZW5kaWYKKyAKKyBhZGRfcHJvamVjdF9hcmd1bWVudHMoY29tbW9uX2ZsYWdzLCBsYW5ndWFn ZSA6ICdjJykKKyAKKy1nbGliX3JlcXVpcmVkX3ZlcnNpb24gPSAnPj0gMi41OCcKKytnbGliX3Jl cXVpcmVkX3ZlcnNpb24gPSAnPj0gMi4zOCcKKyBnbGliX2RlcCA9IGRlcGVuZGVuY3koJ2dsaWIt Mi4wJywgdmVyc2lvbiA6IGdsaWJfcmVxdWlyZWRfdmVyc2lvbiwKKyAgICAgICAgICAgICAgICAg ICAgICAgIGZhbGxiYWNrOiBbJ2dsaWInLCAnbGliZ2xpYl9kZXAnXSkKKyBnb2JqZWN0X2RlcCA9 IGRlcGVuZGVuY3koJ2dvYmplY3QtMi4wJywgdmVyc2lvbiA6IGdsaWJfcmVxdWlyZWRfdmVyc2lv biwKKy0tIAorMi4yMC4xCisKZGlmZiAtLWdpdCBhL1Rvb2xzL3dwZS9qaGJ1aWxkLW1pbmltYWwu bW9kdWxlcyBiL1Rvb2xzL3dwZS9qaGJ1aWxkLW1pbmltYWwubW9kdWxlcwpuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5m OTRmMmJjMDdkY2ZjZDFjMjY5MWQzZTIyMTY3OTMyZmU4ZDUxZDg5Ci0tLSAvZGV2L251bGwKKysr IGIvVG9vbHMvd3BlL2poYnVpbGQtbWluaW1hbC5tb2R1bGVzCkBAIC0wLDAgKzEsNiBAQAorPD94 bWwgdmVyc2lvbj0iMS4wIj8+Cis8IURPQ1RZUEUgbW9kdWxlc2V0IFNZU1RFTSAibW9kdWxlc2V0 LmR0ZCI+Cis8P3htbC1zdHlsZXNoZWV0IHR5cGU9InRleHQveHNsIiBocmVmPSJtb2R1bGVzZXQu eHNsIj8+Cis8bW9kdWxlc2V0PgorICA8aW5jbHVkZSBocmVmPSIuLi9qaGJ1aWxkL2poYnVpbGQt bWluaW1hbC5tb2R1bGVzIi8+Cis8L21vZHVsZXNldD4K