213727 2020-06-29 07:23:38 -0700 [webkitperl] nativeArchitecture() needs to support remote devices 2020-06-30 04:52:06 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=213487 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain guijemont saam webkit-bug-importer zhifei_fang oldest_to_newest 1667079 0 jbedard 2020-06-29 07:23:38 -0700 When targeting a remote platform, nativeArchitecture() needs to support return the architecture of the remote device. 1667113 1 webkit-bug-importer 2020-06-29 08:50:14 -0700 <rdar://problem/64892021> 1667116 2 403066 jbedard 2020-06-29 08:58:13 -0700 Created attachment 403066 Patch 1667148 3 403073 jbedard 2020-06-29 09:41:58 -0700 Created attachment 403073 Patch 1667166 4 403066 guijemont 2020-06-29 10:20:15 -0700 Comment on attachment 403066 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403066&action=review The changes look sensible at first sight. I'll try to run a couple tests locally, though the arm EWS should pick it up soon. > Tools/Scripts/webkitdirs.pm:131 > +my %nativeArchitectureMap = (); Do we need this to be a map? It looks like we would always have exactly one element in it, or are there some nativeArchitecture() calls without arguments that are left there on purpose? 1667177 5 jbedard 2020-06-29 10:34:10 -0700 (In reply to Guillaume Emont from comment #4) > Comment on attachment 403066 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=403066&action=review > > The changes look sensible at first sight. I'll try to run a couple tests > locally, though the arm EWS should pick it up soon. > > > Tools/Scripts/webkitdirs.pm:131 > > +my %nativeArchitectureMap = (); > > Do we need this to be a map? It looks like we would always have exactly one > element in it, or are there some nativeArchitecture() calls without > arguments that are left there on purpose? It's hard to get rid of all the nativeArchitecture() calls without arguments since other places in webkitdirs may call it. Seemed better to just cache the results on a per-host basis. 1667178 6 403073 jbedard 2020-06-29 10:35:39 -0700 Comment on attachment 403073 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403073&action=review > Tools/Scripts/webkitdirs.pm:362 > + if ($target eq 'localhost') { Just realized this won't work, embedded devices will target localhost on a different port. 1667179 7 403080 jbedard 2020-06-29 10:41:01 -0700 Created attachment 403080 Patch 1667265 8 403109 jbedard 2020-06-29 13:56:01 -0700 Created attachment 403109 Patch 1667281 9 403115 jbedard 2020-06-29 14:39:50 -0700 Created attachment 403115 Patch 1667327 10 403127 jbedard 2020-06-29 15:56:02 -0700 Created attachment 403127 Patch 1667337 11 403132 jbedard 2020-06-29 16:13:02 -0700 Created attachment 403132 Patch 1667364 12 403141 jbedard 2020-06-29 17:03:12 -0700 Created attachment 403141 Patch 1667421 13 403160 jbedard 2020-06-29 19:26:19 -0700 Created attachment 403160 Patch 1667534 14 guijemont 2020-06-30 04:39:24 -0700 The patch makes sense to me, I could locally check that it works with --remote, and the jsc-armv7 ews confirms that it fixes the issues introduced in r263569. I am not a reviewer, but I think that this patch should be landed ASAP as it will unbreak the armv7 and mips bots (EWS and post-commit). 1667535 15 403160 aakash_jain 2020-06-30 04:49:44 -0700 Comment on attachment 403160 Patch rs=me 1667536 16 ews-feeder 2020-06-30 04:52:05 -0700 Committed r263742: <https://trac.webkit.org/changeset/263742> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403160. 403066 2020-06-29 08:58:13 -0700 2020-06-29 10:40:57 -0700 Patch bug-213727-20200629085812.patch text/plain 6737 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MzY2MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA2LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cGVybF0gbmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmVlZHMgdG8g c3VwcG9ydCByZW1vdGUgZGV2aWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEzNzI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDg5MjAyMT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzOiBEZXRlcm1pbmUgdGhlIG1hY2hpbmUgYWN0dWFs bHkgcnVubmluZyB0ZXN0cyBhbmQgcGFzcworICAgICAgICB0aGF0IHRvIG5hdGl2ZUFyY2hpdGVj dHVyZSguLi4pLgorICAgICAgICAocnVuVGVzdCk6IFBhc3MgbmF0aXZlVGFyZ2V0IGFuZCBuYXRp dmVQb3J0LgorICAgICAgICAocnVuSlNDU3RyZXNzVGVzdHMpOiBEaXR0by4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1 cmUpOiBOYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGRlcGVuZGVudCBvbiB0aGUgdGFyZ2V0IGRldmlj ZS4KKyAgICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6IENhbGwgbmF0aXZlQXJjaGl0ZWN0 dXJlKCkgaW5zdGVhZCBvZiBhY2Nlc3NpbmcgdGhlIHZhcmlhYmxlIGRpcmVjdGx5LgorICAgICAg ICAobmF0aXZlQXJjaGl0ZWN0dXJlKTogRW5zdXJlIHRoYXQgd2UgcmV0dXJuIG9ubHkgdGhlIGFy Y2hpdGVjdHVyZSBvZiB0aGUgc3BlY2lmaWVkIHRhcmdldC4KKwogMjAyMC0wNi0yOSAgSm9uYXRo YW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgcnVuLWphdmFzY3JpcHRj b3JlLXRlc3RzOiBTdXBwb3J0IEFwcGxlIFNpbGljb24gcnVubmluZyB4ODYgcHJvY2Vzc2VzCklu ZGV4OiBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cwkocmV2aXNpb24gMjYzNjYw KQorKysgVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMJKHdvcmtpbmcgY29w eSkKQEAgLTQ4NiwxNyArNDg2LDM3IEBAIGlmICgkc2hvd0hlbHApIHsKIAogc2V0Q29uZmlndXJh dGlvblByb2R1Y3REaXIoQ3dkOjphYnNfcGF0aCgkcm9vdCkpIGlmIChkZWZpbmVkKCRyb290KSk7 CiBteSAkYXJjaHNJbkJ1aWxkID0gYXJjaGl0ZWN0dXJlc0ZvclByb2R1Y3RzKCk7CisKK215ICRu YXRpdmVUYXJnZXQgPSAibG9jYWxob3N0IjsKK215ICRuYXRpdmVQb3J0ID0gMjI7CiskbmF0aXZl VGFyZ2V0ID0gJHJlbW90ZUhvc3QgaWYgKCRyZW1vdGVIb3N0KTsKK2lmIChkZWZpbmVkICRyZW1v dGVDb25maWdGaWxlKSB7CisgICAgb3BlbiBteSAkaGFuZGxlLCAnPCcsICRyZW1vdGVDb25maWdG aWxlIG9yIGRpZSAiRmFpbGVkIHRvIG9wZW4gJHJlbW90ZUNvbmZpZ0ZpbGU6ICQhIjsKKyAgICBt eSAkY29uZmlnSnNvbiA9IGRvIHsgbG9jYWwgJC87IDwkaGFuZGxlPiB9OworICAgIG15ICRyZW1v dGVDb25maWcgPSBkZWNvZGVfanNvbigkY29uZmlnSnNvbik7CisgICAgaWYgKGRlZmluZWQgJHJl bW90ZUNvbmZpZy0+eyJyZW1vdGVzIn0pIHsKKyAgICAgICAgbXkgJHJlbW90ZXMgPSAkcmVtb3Rl Q29uZmlnLT57InJlbW90ZXMifTsKKyAgICAgICAgbXkgQHNwbGl0ID0gc3BsaXQoJzonLCBAJHJl bW90ZXNbMF0tPnsiYWRkcmVzcyJ9KTsKKyAgICAgICAgJG5hdGl2ZVRhcmdldCA9ICRzcGxpdFsw XTsKKyAgICAgICAgJG5hdGl2ZVBvcnQgPSAkc3BsaXRbMV0gaWYgc2NhbGFyKEBzcGxpdCkgPiAx OworICAgIH0gZWxzaWYgKGRlZmluZWQgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifSkgeworICAg ICAgICBteSBAc3BsaXQgPSBzcGxpdCgnOicsICRyZW1vdGVDb25maWctPnsicmVtb3RlIn0pOwor ICAgICAgICAkbmF0aXZlVGFyZ2V0ID0gJHNwbGl0WzBdOworICAgICAgICAkbmF0aXZlUG9ydCA9 ICRzcGxpdFsxXSBpZiBzY2FsYXIoQHNwbGl0KSA+IDE7CisgICAgfQorfQorCiBpZiAoZGVmaW5l ZCAkYXJjaHMpIHsKICAgICBkaWUgIiRhcmNocyBub3Qgc3VwcG9ydGVkIGJ5IHRoZSBwcm92aWRl ZCBiaW5hcnksIHdoaWNoIHN1cHBvcnRzICckYXJjaHNJbkJ1aWxkJyIgaWYgaW5kZXgoJGFyY2hz SW5CdWlsZCwgJGFyY2hzKSA9PSAtMTsKIH0gZWxzZSB7CiAgICAgIyBGYWxsYmFjayBpcyB4ODZf NjQsIHdoaWNoIHdlIHJlcGxhY2Ugd2l0aCB0aGUgbmF0aXZlIGFyY2hpdGVjdHVyZSBpZiB0aGUg bmF0aXZlIGFyY2hpdGVjdHVyZSBpcyBpbiB0aGUgcHJvdmlkZWQgYnVpbGQKICAgICAkYXJjaHMg PSAieDg2XzY0IjsKLSAgICAkYXJjaHMgPSBuYXRpdmVBcmNoaXRlY3R1cmUoKSBpZiBpbmRleCgk YXJjaHNJbkJ1aWxkLCBuYXRpdmVBcmNoaXRlY3R1cmUoKSkgIT0gLTE7CisgICAgJGFyY2hzID0g bmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVUYXJnZXQsICRuYXRpdmVQb3J0KSBpZiBpbmRleCgk YXJjaHNJbkJ1aWxkLCBuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBv cnQpKSAhPSAtMTsKIH0KIAogIyBGb3IgcnVubmluZyB0ZXN0cywgYXJtNjRlIHNob3VsZCBtYXAg dG8gYXJtNjQKICRhcmNocyA9ICJhcm02NCIgaWYgJGFyY2hzIGVxICJhcm02NGUiOwotaWYgKCRh cmNocyBuZSBuYXRpdmVBcmNoaXRlY3R1cmUoKSAmJiAobmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmUg ImFybTY0IiB8fCAhaXNBcHBsZU1hY1dlYktpdCgpKSkgeworaWYgKCRhcmNocyBuZSBuYXRpdmVB cmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQpICYmIChuYXRpdmVBcmNoaXRl Y3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQpIG5lICJhcm02NCIgfHwgIWlzQXBwbGVN YWNXZWJLaXQoKSkpIHsKICAgICBkaWUgIkNhbm5vdCBydW4gdGVzdHMgd2l0aCAkYXJjaHMgb24g dGhpcyBtYWNoaW5lIjsKIH0KIApAQCAtNTY4LDcgKzU4OCw3IEBAIHN1YiBydW5UZXN0IHsKICAg ICBjaGRpcigkcHJvZHVjdERpcikgb3IgZGllICJGYWlsZWQgdG8gc3dpdGNoIGRpcmVjdG9yeSB0 byAnJHByb2R1Y3REaXInXG4iOwogICAgIG15IEBjb21tYW5kID0gKHRlc3RQYXRoKCRwcm9kdWN0 RGlyLCAkdGVzdE5hbWUpKTsKICAgICB1bnNoaWZ0IEBjb21tYW5kLCAoInhjcnVuIiwgIi1zZGsi LCB4Y29kZVNESygpLCAic2ltIikgaWYgd2lsbFVzZUlPU1NpbXVsYXRvclNESygpOwotICAgIHVu c2hpZnQgQGNvbW1hbmQsICgiL3Vzci9iaW4vYXJjaCIsICItJGFyY2hzIikgaWYgJGFyY2hzIG5l IG5hdGl2ZUFyY2hpdGVjdHVyZSgpOworICAgIHVuc2hpZnQgQGNvbW1hbmQsICgiL3Vzci9iaW4v YXJjaCIsICItJGFyY2hzIikgaWYgJGFyY2hzIG5lIG5hdGl2ZUFyY2hpdGVjdHVyZSgkbmF0aXZl VGFyZ2V0LCAkbmF0aXZlUG9ydCk7CiAgICAgdW5zaGlmdCBAY29tbWFuZCwgd3JhcHBlclByZWZp eElmTmVlZGVkKCkgaWYgaXNHdGsoKSBvciBpc1dQRSgpOwogCiAgICAgaWYgKCRlbnZWYXJzIG5l ICIiKSB7CkBAIC03MzIsNyArNzUyLDcgQEAgc3ViIHJ1bkpTQ1N0cmVzc1Rlc3RzCiAgICAgICAg ICIvdXNyL2Jpbi9lbnYiLCAicnVieSIsICJUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRl c3RzIiwKICAgICAgICAgIi1qIiwganNjUGF0aCgkcHJvZHVjdERpciksICItbyIsICRqc2NTdHJl c3NSZXN1bHRzRGlyLCAiLS1hcmNoIiwgJGFyY2hzKTsKIAotICAgIGlmIChuYXRpdmVBcmNoaXRl Y3R1cmUoKSAhPSAkYXJjaHMpIHsKKyAgICBpZiAobmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVU YXJnZXQsICRuYXRpdmVQb3J0KSAhPSAkYXJjaHMpIHsKICAgICAgICAgcHVzaChAanNjU3RyZXNz RHJpdmVyQ21kLCAiLS1mb3JjZS1hcmNoaXRlY3R1cmUiKTsKICAgICAgICAgcHVzaChAanNjU3Ry ZXNzRHJpdmVyQ21kLCAkYXJjaHMpOwogICAgIH0KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlz aW9uIDI2MzY2MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5 KQpAQCAtMTI4LDcgKzEyOCw3IEBAIHVzZSBjb25zdGFudCBJT1NfREVWRUxPUE1FTlRfQ0VSVElG SUNBVEUKIG91ciBARVhQT1JUX09LOwogCiBteSAkYXJjaGl0ZWN0dXJlOwotbXkgJG5hdGl2ZUFy Y2hpdGVjdHVyZTsKK215ICVuYXRpdmVBcmNoaXRlY3R1cmVNYXAgPSAoKTsKIG15ICRhc2FuSXNF bmFibGVkOwogbXkgJGZvcmNlT3B0aW1pemF0aW9uTGV2ZWw7CiBteSAkY292ZXJhZ2VJc0VuYWJs ZWQ7CkBAIC0zNTEsMTggKzM1MSwyOCBAQCBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbgogICAg IH0KIH0KIAotc3ViIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZQorc3ViIGRldGVybWluZU5h dGl2ZUFyY2hpdGVjdHVyZSg7JCQpCiB7Ci0gICAgcmV0dXJuIGlmIGRlZmluZWQgJG5hdGl2ZUFy Y2hpdGVjdHVyZTsKLSAgICAkbmF0aXZlQXJjaGl0ZWN0dXJlID0gYHVuYW1lIC1tYDsKLSAgICBj aG9tcCAkbmF0aXZlQXJjaGl0ZWN0dXJlOwotICAgICRuYXRpdmVBcmNoaXRlY3R1cmUgPSAieDg2 XzY0IiBpZiAobm90IGRlZmluZWQgJG5hdGl2ZUFyY2hpdGVjdHVyZSk7CisgICAgbXkgKCR0YXJn ZXQsICRwb3J0KSA9IEBfOworICAgICR0YXJnZXQgPSAnbG9jYWxob3N0JyBpZiB1bmRlZiAkdGFy Z2V0OworICAgICRwb3J0ID0gMjIgaWYgdW5kZWYgJHBvcnQ7CisgICAgcmV0dXJuIGlmIGRlZmlu ZWQgJG5hdGl2ZUFyY2hpdGVjdHVyZU1hcHsiJHRhcmdldDokcG9ydCJ9OworCisgICAgbXkgJG91 dHB1dDsKKyAgICBpZiAoJHRhcmdldCBlcSAnbG9jYWxob3N0JykgeworICAgICAgICAkb3V0cHV0 ID0gYHVuYW1lIC1tYDsKKyAgICB9IGVsc2UgeworICAgICAgICAkb3V0cHV0ID0gYHNzaCAtbyBO b0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMgLXAgJHBvcnQgJHRhcmdldCAndW5h bWUgIC1tJ2A7CisgICAgfQorICAgIGNob21wICRvdXRwdXQ7CisgICAgJG91dHB1dCA9ICJ4ODZf NjQiIGlmIChub3QgZGVmaW5lZCAkb3V0cHV0KTsKIAogICAgICMgRklYTUU6IFJlbW92ZSB0aGlz IHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzY0MjA4NTMyPiBpcyByZXNvbHZlZAotICAgIGlmIChpc0Fw cGxlQ29jb2FXZWJLaXQoKSAmJiAkbmF0aXZlQXJjaGl0ZWN0dXJlIG5lICJ4ODZfNjQiKSB7Ci0g ICAgICAgICRuYXRpdmVBcmNoaXRlY3R1cmUgPSAiYXJtNjQiOworICAgIGlmIChpc0FwcGxlQ29j b2FXZWJLaXQoKSAmJiAkb3V0cHV0IG5lICJ4ODZfNjQiKSB7CisgICAgICAgICRvdXRwdXQgPSAi YXJtNjQiOwogICAgIH0KLSAgICBkaWUgIidhcm02NGUnIGlzIGFuIGludmFsaWQgbmF0aXZlIGFy Y2hpdGVjdHVyZSIgaWYgJG5hdGl2ZUFyY2hpdGVjdHVyZSBlcSAiYXJtNjRlIjsKKyAgICBkaWUg Iidhcm02NGUnIGlzIGFuIGludmFsaWQgbmF0aXZlIGFyY2hpdGVjdHVyZSIgaWYgJG91dHB1dCBl cSAiYXJtNjRlIjsKKyAgICAkbmF0aXZlQXJjaGl0ZWN0dXJlTWFweyIkdGFyZ2V0OiRwb3J0In0g PSAkb3V0cHV0OwogfQogCiBzdWIgZGV0ZXJtaW5lQXJjaGl0ZWN0dXJlCkBAIC0zNzEsOCArMzgx LDcgQEAgc3ViIGRldGVybWluZUFyY2hpdGVjdHVyZQogCiAgICAgZGV0ZXJtaW5lQmFzZVByb2R1 Y3REaXIoKTsKICAgICBkZXRlcm1pbmVYY29kZVNESygpOwotICAgIGRldGVybWluZU5hdGl2ZUFy Y2hpdGVjdHVyZSgpOwotICAgICRhcmNoaXRlY3R1cmUgPSAkbmF0aXZlQXJjaGl0ZWN0dXJlOwor ICAgICRhcmNoaXRlY3R1cmUgPSBuYXRpdmVBcmNoaXRlY3R1cmUoKTsKIAogICAgIGlmIChpc0Fw cGxlQ29jb2FXZWJLaXQoKSkgewogICAgICAgICBpZiAob3BlbiBBUkNISVRFQ1RVUkUsICIkYmFz ZVByb2R1Y3REaXIvQXJjaGl0ZWN0dXJlIikgewpAQCAtMTA1MSwxMCArMTA2MCwxNCBAQCBzdWIg cGFzc2VkQXJjaGl0ZWN0dXJlCiAgICAgcmV0dXJuICRwYXNzZWRBcmNoaXRlY3R1cmU7CiB9CiAK LXN1YiBuYXRpdmVBcmNoaXRlY3R1cmUoKQorc3ViIG5hdGl2ZUFyY2hpdGVjdHVyZSg7JCQpCiB7 Ci0gICAgZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKCk7Ci0gICAgcmV0dXJuICRuYXRpdmVB cmNoaXRlY3R1cmU7CisgICAgZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKEBfKTsKKworICAg IG15ICgkdGFyZ2V0LCAkcG9ydCkgPSBAXzsKKyAgICAkdGFyZ2V0ID0gJ2xvY2FsaG9zdCcgaWYg dW5kZWYgJHRhcmdldDsKKyAgICAkcG9ydCA9IDIyIGlmIHVuZGVmICRwb3J0OworICAgIHJldHVy biAkbmF0aXZlQXJjaGl0ZWN0dXJlTWFweyIkdGFyZ2V0OiRwb3J0In07CiB9CiAKIHN1YiBhcmNo aXRlY3R1cmUoKQo= 403073 2020-06-29 09:41:58 -0700 2020-06-29 10:40:59 -0700 Patch bug-213727-20200629094157.patch text/plain 6789 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MzY2MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA2LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cGVybF0gbmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmVlZHMgdG8g c3VwcG9ydCByZW1vdGUgZGV2aWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEzNzI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDg5MjAyMT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzOiBEZXRlcm1pbmUgdGhlIG1hY2hpbmUgYWN0dWFs bHkgcnVubmluZyB0ZXN0cyBhbmQgcGFzcworICAgICAgICB0aGF0IHRvIG5hdGl2ZUFyY2hpdGVj dHVyZSguLi4pLgorICAgICAgICAocnVuVGVzdCk6IFBhc3MgbmF0aXZlVGFyZ2V0IGFuZCBuYXRp dmVQb3J0LgorICAgICAgICAocnVuSlNDU3RyZXNzVGVzdHMpOiBEaXR0by4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1 cmUpOiBOYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGRlcGVuZGVudCBvbiB0aGUgdGFyZ2V0IGRldmlj ZS4KKyAgICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6IENhbGwgbmF0aXZlQXJjaGl0ZWN0 dXJlKCkgaW5zdGVhZCBvZiBhY2Nlc3NpbmcgdGhlIHZhcmlhYmxlIGRpcmVjdGx5LgorICAgICAg ICAobmF0aXZlQXJjaGl0ZWN0dXJlKTogRW5zdXJlIHRoYXQgd2UgcmV0dXJuIG9ubHkgdGhlIGFy Y2hpdGVjdHVyZSBvZiB0aGUgc3BlY2lmaWVkIHRhcmdldC4KKwogMjAyMC0wNi0yOSAgSm9uYXRo YW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgcnVuLWphdmFzY3JpcHRj b3JlLXRlc3RzOiBTdXBwb3J0IEFwcGxlIFNpbGljb24gcnVubmluZyB4ODYgcHJvY2Vzc2VzCklu ZGV4OiBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cwkocmV2aXNpb24gMjYzNjYw KQorKysgVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMJKHdvcmtpbmcgY29w eSkKQEAgLTQ4NiwxNyArNDg2LDM3IEBAIGlmICgkc2hvd0hlbHApIHsKIAogc2V0Q29uZmlndXJh dGlvblByb2R1Y3REaXIoQ3dkOjphYnNfcGF0aCgkcm9vdCkpIGlmIChkZWZpbmVkKCRyb290KSk7 CiBteSAkYXJjaHNJbkJ1aWxkID0gYXJjaGl0ZWN0dXJlc0ZvclByb2R1Y3RzKCk7CisKK215ICRu YXRpdmVUYXJnZXQgPSAibG9jYWxob3N0IjsKK215ICRuYXRpdmVQb3J0ID0gMjI7CiskbmF0aXZl VGFyZ2V0ID0gJHJlbW90ZUhvc3QgaWYgKCRyZW1vdGVIb3N0KTsKK2lmIChkZWZpbmVkICRyZW1v dGVDb25maWdGaWxlKSB7CisgICAgb3BlbiBteSAkaGFuZGxlLCAnPCcsICRyZW1vdGVDb25maWdG aWxlIG9yIGRpZSAiRmFpbGVkIHRvIG9wZW4gJHJlbW90ZUNvbmZpZ0ZpbGU6ICQhIjsKKyAgICBt eSAkY29uZmlnSnNvbiA9IGRvIHsgbG9jYWwgJC87IDwkaGFuZGxlPiB9OworICAgIG15ICRyZW1v dGVDb25maWcgPSBkZWNvZGVfanNvbigkY29uZmlnSnNvbik7CisgICAgaWYgKGRlZmluZWQgJHJl bW90ZUNvbmZpZy0+eyJyZW1vdGVzIn0pIHsKKyAgICAgICAgbXkgJHJlbW90ZXMgPSAkcmVtb3Rl Q29uZmlnLT57InJlbW90ZXMifTsKKyAgICAgICAgbXkgQHNwbGl0ID0gc3BsaXQoJzonLCBAJHJl bW90ZXNbMF0tPnsiYWRkcmVzcyJ9KTsKKyAgICAgICAgJG5hdGl2ZVRhcmdldCA9ICRzcGxpdFsw XTsKKyAgICAgICAgJG5hdGl2ZVBvcnQgPSAkc3BsaXRbMV0gaWYgc2NhbGFyKEBzcGxpdCkgPiAx OworICAgIH0gZWxzaWYgKGRlZmluZWQgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifSkgeworICAg ICAgICBteSBAc3BsaXQgPSBzcGxpdCgnOicsICRyZW1vdGVDb25maWctPnsicmVtb3RlIn0pOwor ICAgICAgICAkbmF0aXZlVGFyZ2V0ID0gJHNwbGl0WzBdOworICAgICAgICAkbmF0aXZlUG9ydCA9 ICRzcGxpdFsxXSBpZiBzY2FsYXIoQHNwbGl0KSA+IDE7CisgICAgfQorfQorCiBpZiAoZGVmaW5l ZCAkYXJjaHMpIHsKICAgICBkaWUgIiRhcmNocyBub3Qgc3VwcG9ydGVkIGJ5IHRoZSBwcm92aWRl ZCBiaW5hcnksIHdoaWNoIHN1cHBvcnRzICckYXJjaHNJbkJ1aWxkJyIgaWYgaW5kZXgoJGFyY2hz SW5CdWlsZCwgJGFyY2hzKSA9PSAtMTsKIH0gZWxzZSB7CiAgICAgIyBGYWxsYmFjayBpcyB4ODZf NjQsIHdoaWNoIHdlIHJlcGxhY2Ugd2l0aCB0aGUgbmF0aXZlIGFyY2hpdGVjdHVyZSBpZiB0aGUg bmF0aXZlIGFyY2hpdGVjdHVyZSBpcyBpbiB0aGUgcHJvdmlkZWQgYnVpbGQKICAgICAkYXJjaHMg PSAieDg2XzY0IjsKLSAgICAkYXJjaHMgPSBuYXRpdmVBcmNoaXRlY3R1cmUoKSBpZiBpbmRleCgk YXJjaHNJbkJ1aWxkLCBuYXRpdmVBcmNoaXRlY3R1cmUoKSkgIT0gLTE7CisgICAgJGFyY2hzID0g bmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVUYXJnZXQsICRuYXRpdmVQb3J0KSBpZiBpbmRleCgk YXJjaHNJbkJ1aWxkLCBuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBv cnQpKSAhPSAtMTsKIH0KIAogIyBGb3IgcnVubmluZyB0ZXN0cywgYXJtNjRlIHNob3VsZCBtYXAg dG8gYXJtNjQKICRhcmNocyA9ICJhcm02NCIgaWYgJGFyY2hzIGVxICJhcm02NGUiOwotaWYgKCRh cmNocyBuZSBuYXRpdmVBcmNoaXRlY3R1cmUoKSAmJiAobmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmUg ImFybTY0IiB8fCAhaXNBcHBsZU1hY1dlYktpdCgpKSkgeworaWYgKCRhcmNocyBuZSBuYXRpdmVB cmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQpICYmIChuYXRpdmVBcmNoaXRl Y3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQpIG5lICJhcm02NCIgfHwgIWlzQXBwbGVN YWNXZWJLaXQoKSkpIHsKICAgICBkaWUgIkNhbm5vdCBydW4gdGVzdHMgd2l0aCAkYXJjaHMgb24g dGhpcyBtYWNoaW5lIjsKIH0KIApAQCAtNTY4LDcgKzU4OCw3IEBAIHN1YiBydW5UZXN0IHsKICAg ICBjaGRpcigkcHJvZHVjdERpcikgb3IgZGllICJGYWlsZWQgdG8gc3dpdGNoIGRpcmVjdG9yeSB0 byAnJHByb2R1Y3REaXInXG4iOwogICAgIG15IEBjb21tYW5kID0gKHRlc3RQYXRoKCRwcm9kdWN0 RGlyLCAkdGVzdE5hbWUpKTsKICAgICB1bnNoaWZ0IEBjb21tYW5kLCAoInhjcnVuIiwgIi1zZGsi LCB4Y29kZVNESygpLCAic2ltIikgaWYgd2lsbFVzZUlPU1NpbXVsYXRvclNESygpOwotICAgIHVu c2hpZnQgQGNvbW1hbmQsICgiL3Vzci9iaW4vYXJjaCIsICItJGFyY2hzIikgaWYgJGFyY2hzIG5l IG5hdGl2ZUFyY2hpdGVjdHVyZSgpOworICAgIHVuc2hpZnQgQGNvbW1hbmQsICgiL3Vzci9iaW4v YXJjaCIsICItJGFyY2hzIikgaWYgJGFyY2hzIG5lIG5hdGl2ZUFyY2hpdGVjdHVyZSgkbmF0aXZl VGFyZ2V0LCAkbmF0aXZlUG9ydCk7CiAgICAgdW5zaGlmdCBAY29tbWFuZCwgd3JhcHBlclByZWZp eElmTmVlZGVkKCkgaWYgaXNHdGsoKSBvciBpc1dQRSgpOwogCiAgICAgaWYgKCRlbnZWYXJzIG5l ICIiKSB7CkBAIC03MzIsNyArNzUyLDcgQEAgc3ViIHJ1bkpTQ1N0cmVzc1Rlc3RzCiAgICAgICAg ICIvdXNyL2Jpbi9lbnYiLCAicnVieSIsICJUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRl c3RzIiwKICAgICAgICAgIi1qIiwganNjUGF0aCgkcHJvZHVjdERpciksICItbyIsICRqc2NTdHJl c3NSZXN1bHRzRGlyLCAiLS1hcmNoIiwgJGFyY2hzKTsKIAotICAgIGlmIChuYXRpdmVBcmNoaXRl Y3R1cmUoKSAhPSAkYXJjaHMpIHsKKyAgICBpZiAobmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVU YXJnZXQsICRuYXRpdmVQb3J0KSAhPSAkYXJjaHMpIHsKICAgICAgICAgcHVzaChAanNjU3RyZXNz RHJpdmVyQ21kLCAiLS1mb3JjZS1hcmNoaXRlY3R1cmUiKTsKICAgICAgICAgcHVzaChAanNjU3Ry ZXNzRHJpdmVyQ21kLCAkYXJjaHMpOwogICAgIH0KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlz aW9uIDI2MzY2MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5 KQpAQCAtMTI4LDcgKzEyOCw3IEBAIHVzZSBjb25zdGFudCBJT1NfREVWRUxPUE1FTlRfQ0VSVElG SUNBVEUKIG91ciBARVhQT1JUX09LOwogCiBteSAkYXJjaGl0ZWN0dXJlOwotbXkgJG5hdGl2ZUFy Y2hpdGVjdHVyZTsKK215ICVuYXRpdmVBcmNoaXRlY3R1cmVNYXAgPSAoKTsKIG15ICRhc2FuSXNF bmFibGVkOwogbXkgJGZvcmNlT3B0aW1pemF0aW9uTGV2ZWw7CiBteSAkY292ZXJhZ2VJc0VuYWJs ZWQ7CkBAIC0zNTEsMTggKzM1MSwyOCBAQCBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbgogICAg IH0KIH0KIAotc3ViIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZQorc3ViIGRldGVybWluZU5h dGl2ZUFyY2hpdGVjdHVyZSg7JCQpCiB7Ci0gICAgcmV0dXJuIGlmIGRlZmluZWQgJG5hdGl2ZUFy Y2hpdGVjdHVyZTsKLSAgICAkbmF0aXZlQXJjaGl0ZWN0dXJlID0gYHVuYW1lIC1tYDsKLSAgICBj aG9tcCAkbmF0aXZlQXJjaGl0ZWN0dXJlOwotICAgICRuYXRpdmVBcmNoaXRlY3R1cmUgPSAieDg2 XzY0IiBpZiAobm90IGRlZmluZWQgJG5hdGl2ZUFyY2hpdGVjdHVyZSk7CisgICAgbXkgKCR0YXJn ZXQsICRwb3J0KSA9IEBfOworICAgICR0YXJnZXQgPSAnbG9jYWxob3N0JyBpZiAodW5kZWYgJHRh cmdldCB8fCAhJHRhcmdldCk7CisgICAgJHBvcnQgPSAyMiBpZiAodW5kZWYgJHBvcnQgfHwgISRw b3J0KTsKKyAgICByZXR1cm4gaWYgZGVmaW5lZCAkbmF0aXZlQXJjaGl0ZWN0dXJlTWFweyIkdGFy Z2V0OiRwb3J0In07CisKKyAgICBteSAkb3V0cHV0OworICAgIGlmICgkdGFyZ2V0IGVxICdsb2Nh bGhvc3QnKSB7CisgICAgICAgICRvdXRwdXQgPSBgdW5hbWUgLW1gOworICAgIH0gZWxzZSB7Cisg ICAgICAgICRvdXRwdXQgPSBgc3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0 PXllcyAtcCAkcG9ydCAkdGFyZ2V0ICd1bmFtZSAgLW0nYDsKKyAgICB9CisgICAgY2hvbXAgJG91 dHB1dDsKKyAgICAkb3V0cHV0ID0gIng4Nl82NCIgaWYgKG5vdCBkZWZpbmVkICRvdXRwdXQpOwog CiAgICAgIyBGSVhNRTogUmVtb3ZlIHRoaXMgd2hlbiA8cmRhcjovL3Byb2JsZW0vNjQyMDg1MzI+ IGlzIHJlc29sdmVkCi0gICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpICYmICRuYXRpdmVBcmNo aXRlY3R1cmUgbmUgIng4Nl82NCIpIHsKLSAgICAgICAgJG5hdGl2ZUFyY2hpdGVjdHVyZSA9ICJh cm02NCI7CisgICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpICYmICRvdXRwdXQgbmUgIng4Nl82 NCIpIHsKKyAgICAgICAgJG91dHB1dCA9ICJhcm02NCI7CiAgICAgfQotICAgIGRpZSAiJ2FybTY0 ZScgaXMgYW4gaW52YWxpZCBuYXRpdmUgYXJjaGl0ZWN0dXJlIiBpZiAkbmF0aXZlQXJjaGl0ZWN0 dXJlIGVxICJhcm02NGUiOworICAgIGRpZSAiJ2FybTY0ZScgaXMgYW4gaW52YWxpZCBuYXRpdmUg YXJjaGl0ZWN0dXJlIiBpZiAkb3V0cHV0IGVxICJhcm02NGUiOworICAgICRuYXRpdmVBcmNoaXRl Y3R1cmVNYXB7IiR0YXJnZXQ6JHBvcnQifSA9ICRvdXRwdXQ7CiB9CiAKIHN1YiBkZXRlcm1pbmVB cmNoaXRlY3R1cmUKQEAgLTM3MSw4ICszODEsNyBAQCBzdWIgZGV0ZXJtaW5lQXJjaGl0ZWN0dXJl CiAKICAgICBkZXRlcm1pbmVCYXNlUHJvZHVjdERpcigpOwogICAgIGRldGVybWluZVhjb2RlU0RL KCk7Ci0gICAgZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKCk7Ci0gICAgJGFyY2hpdGVjdHVy ZSA9ICRuYXRpdmVBcmNoaXRlY3R1cmU7CisgICAgJGFyY2hpdGVjdHVyZSA9IG5hdGl2ZUFyY2hp dGVjdHVyZSgpOwogCiAgICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpKSB7CiAgICAgICAgIGlm IChvcGVuIEFSQ0hJVEVDVFVSRSwgIiRiYXNlUHJvZHVjdERpci9BcmNoaXRlY3R1cmUiKSB7CkBA IC0xMDUxLDEwICsxMDYwLDE0IEBAIHN1YiBwYXNzZWRBcmNoaXRlY3R1cmUKICAgICByZXR1cm4g JHBhc3NlZEFyY2hpdGVjdHVyZTsKIH0KIAotc3ViIG5hdGl2ZUFyY2hpdGVjdHVyZSgpCitzdWIg bmF0aXZlQXJjaGl0ZWN0dXJlKDskJCkKIHsKLSAgICBkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1 cmUoKTsKLSAgICByZXR1cm4gJG5hdGl2ZUFyY2hpdGVjdHVyZTsKKyAgICBkZXRlcm1pbmVOYXRp dmVBcmNoaXRlY3R1cmUoQF8pOworCisgICAgbXkgKCR0YXJnZXQsICRwb3J0KSA9IEBfOworICAg ICR0YXJnZXQgPSAnbG9jYWxob3N0JyBpZiAodW5kZWYgJHRhcmdldCB8fCAhJHRhcmdldCk7Cisg ICAgJHBvcnQgPSAyMiBpZiAodW5kZWYgJHBvcnQgfHwgISRwb3J0KTsKKyAgICByZXR1cm4gJG5h dGl2ZUFyY2hpdGVjdHVyZU1hcHsiJHRhcmdldDokcG9ydCJ9OwogfQogCiBzdWIgYXJjaGl0ZWN0 dXJlKCkK 403080 2020-06-29 10:41:01 -0700 2020-06-29 13:55:44 -0700 Patch bug-213727-20200629104100.patch text/plain 6760 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MzY2MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA2LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cGVybF0gbmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmVlZHMgdG8g c3VwcG9ydCByZW1vdGUgZGV2aWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEzNzI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDg5MjAyMT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzOiBEZXRlcm1pbmUgdGhlIG1hY2hpbmUgYWN0dWFs bHkgcnVubmluZyB0ZXN0cyBhbmQgcGFzcworICAgICAgICB0aGF0IHRvIG5hdGl2ZUFyY2hpdGVj dHVyZSguLi4pLgorICAgICAgICAocnVuVGVzdCk6IFBhc3MgbmF0aXZlVGFyZ2V0IGFuZCBuYXRp dmVQb3J0LgorICAgICAgICAocnVuSlNDU3RyZXNzVGVzdHMpOiBEaXR0by4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1 cmUpOiBOYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGRlcGVuZGVudCBvbiB0aGUgdGFyZ2V0IGRldmlj ZS4KKyAgICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6IENhbGwgbmF0aXZlQXJjaGl0ZWN0 dXJlKCkgaW5zdGVhZCBvZiBhY2Nlc3NpbmcgdGhlIHZhcmlhYmxlIGRpcmVjdGx5LgorICAgICAg ICAobmF0aXZlQXJjaGl0ZWN0dXJlKTogRW5zdXJlIHRoYXQgd2UgcmV0dXJuIG9ubHkgdGhlIGFy Y2hpdGVjdHVyZSBvZiB0aGUgc3BlY2lmaWVkIHRhcmdldC4KKwogMjAyMC0wNi0yOSAgSm9uYXRo YW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgcnVuLWphdmFzY3JpcHRj b3JlLXRlc3RzOiBTdXBwb3J0IEFwcGxlIFNpbGljb24gcnVubmluZyB4ODYgcHJvY2Vzc2VzCklu ZGV4OiBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cwkocmV2aXNpb24gMjYzNjYw KQorKysgVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMJKHdvcmtpbmcgY29w eSkKQEAgLTQ4NiwxNyArNDg2LDM3IEBAIGlmICgkc2hvd0hlbHApIHsKIAogc2V0Q29uZmlndXJh dGlvblByb2R1Y3REaXIoQ3dkOjphYnNfcGF0aCgkcm9vdCkpIGlmIChkZWZpbmVkKCRyb290KSk7 CiBteSAkYXJjaHNJbkJ1aWxkID0gYXJjaGl0ZWN0dXJlc0ZvclByb2R1Y3RzKCk7CisKK215ICRu YXRpdmVUYXJnZXQgPSAibG9jYWxob3N0IjsKK215ICRuYXRpdmVQb3J0ID0gMjI7CiskbmF0aXZl VGFyZ2V0ID0gJHJlbW90ZUhvc3QgaWYgKCRyZW1vdGVIb3N0KTsKK2lmIChkZWZpbmVkICRyZW1v dGVDb25maWdGaWxlKSB7CisgICAgb3BlbiBteSAkaGFuZGxlLCAnPCcsICRyZW1vdGVDb25maWdG aWxlIG9yIGRpZSAiRmFpbGVkIHRvIG9wZW4gJHJlbW90ZUNvbmZpZ0ZpbGU6ICQhIjsKKyAgICBt eSAkY29uZmlnSnNvbiA9IGRvIHsgbG9jYWwgJC87IDwkaGFuZGxlPiB9OworICAgIG15ICRyZW1v dGVDb25maWcgPSBkZWNvZGVfanNvbigkY29uZmlnSnNvbik7CisgICAgaWYgKGRlZmluZWQgJHJl bW90ZUNvbmZpZy0+eyJyZW1vdGVzIn0pIHsKKyAgICAgICAgbXkgJHJlbW90ZXMgPSAkcmVtb3Rl Q29uZmlnLT57InJlbW90ZXMifTsKKyAgICAgICAgbXkgQHNwbGl0ID0gc3BsaXQoJzonLCBAJHJl bW90ZXNbMF0tPnsiYWRkcmVzcyJ9KTsKKyAgICAgICAgJG5hdGl2ZVRhcmdldCA9ICRzcGxpdFsw XTsKKyAgICAgICAgJG5hdGl2ZVBvcnQgPSAkc3BsaXRbMV0gaWYgc2NhbGFyKEBzcGxpdCkgPiAx OworICAgIH0gZWxzaWYgKGRlZmluZWQgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifSkgeworICAg ICAgICBteSBAc3BsaXQgPSBzcGxpdCgnOicsICRyZW1vdGVDb25maWctPnsicmVtb3RlIn0pOwor ICAgICAgICAkbmF0aXZlVGFyZ2V0ID0gJHNwbGl0WzBdOworICAgICAgICAkbmF0aXZlUG9ydCA9 ICRzcGxpdFsxXSBpZiBzY2FsYXIoQHNwbGl0KSA+IDE7CisgICAgfQorfQorCiBpZiAoZGVmaW5l ZCAkYXJjaHMpIHsKICAgICBkaWUgIiRhcmNocyBub3Qgc3VwcG9ydGVkIGJ5IHRoZSBwcm92aWRl ZCBiaW5hcnksIHdoaWNoIHN1cHBvcnRzICckYXJjaHNJbkJ1aWxkJyIgaWYgaW5kZXgoJGFyY2hz SW5CdWlsZCwgJGFyY2hzKSA9PSAtMTsKIH0gZWxzZSB7CiAgICAgIyBGYWxsYmFjayBpcyB4ODZf NjQsIHdoaWNoIHdlIHJlcGxhY2Ugd2l0aCB0aGUgbmF0aXZlIGFyY2hpdGVjdHVyZSBpZiB0aGUg bmF0aXZlIGFyY2hpdGVjdHVyZSBpcyBpbiB0aGUgcHJvdmlkZWQgYnVpbGQKICAgICAkYXJjaHMg PSAieDg2XzY0IjsKLSAgICAkYXJjaHMgPSBuYXRpdmVBcmNoaXRlY3R1cmUoKSBpZiBpbmRleCgk YXJjaHNJbkJ1aWxkLCBuYXRpdmVBcmNoaXRlY3R1cmUoKSkgIT0gLTE7CisgICAgJGFyY2hzID0g bmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVUYXJnZXQsICRuYXRpdmVQb3J0KSBpZiBpbmRleCgk YXJjaHNJbkJ1aWxkLCBuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBv cnQpKSAhPSAtMTsKIH0KIAogIyBGb3IgcnVubmluZyB0ZXN0cywgYXJtNjRlIHNob3VsZCBtYXAg dG8gYXJtNjQKICRhcmNocyA9ICJhcm02NCIgaWYgJGFyY2hzIGVxICJhcm02NGUiOwotaWYgKCRh cmNocyBuZSBuYXRpdmVBcmNoaXRlY3R1cmUoKSAmJiAobmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmUg ImFybTY0IiB8fCAhaXNBcHBsZU1hY1dlYktpdCgpKSkgeworaWYgKCRhcmNocyBuZSBuYXRpdmVB cmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQpICYmIChuYXRpdmVBcmNoaXRl Y3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQpIG5lICJhcm02NCIgfHwgIWlzQXBwbGVN YWNXZWJLaXQoKSkpIHsKICAgICBkaWUgIkNhbm5vdCBydW4gdGVzdHMgd2l0aCAkYXJjaHMgb24g dGhpcyBtYWNoaW5lIjsKIH0KIApAQCAtNTY4LDcgKzU4OCw3IEBAIHN1YiBydW5UZXN0IHsKICAg ICBjaGRpcigkcHJvZHVjdERpcikgb3IgZGllICJGYWlsZWQgdG8gc3dpdGNoIGRpcmVjdG9yeSB0 byAnJHByb2R1Y3REaXInXG4iOwogICAgIG15IEBjb21tYW5kID0gKHRlc3RQYXRoKCRwcm9kdWN0 RGlyLCAkdGVzdE5hbWUpKTsKICAgICB1bnNoaWZ0IEBjb21tYW5kLCAoInhjcnVuIiwgIi1zZGsi LCB4Y29kZVNESygpLCAic2ltIikgaWYgd2lsbFVzZUlPU1NpbXVsYXRvclNESygpOwotICAgIHVu c2hpZnQgQGNvbW1hbmQsICgiL3Vzci9iaW4vYXJjaCIsICItJGFyY2hzIikgaWYgJGFyY2hzIG5l IG5hdGl2ZUFyY2hpdGVjdHVyZSgpOworICAgIHVuc2hpZnQgQGNvbW1hbmQsICgiL3Vzci9iaW4v YXJjaCIsICItJGFyY2hzIikgaWYgJGFyY2hzIG5lIG5hdGl2ZUFyY2hpdGVjdHVyZSgkbmF0aXZl VGFyZ2V0LCAkbmF0aXZlUG9ydCk7CiAgICAgdW5zaGlmdCBAY29tbWFuZCwgd3JhcHBlclByZWZp eElmTmVlZGVkKCkgaWYgaXNHdGsoKSBvciBpc1dQRSgpOwogCiAgICAgaWYgKCRlbnZWYXJzIG5l ICIiKSB7CkBAIC03MzIsNyArNzUyLDcgQEAgc3ViIHJ1bkpTQ1N0cmVzc1Rlc3RzCiAgICAgICAg ICIvdXNyL2Jpbi9lbnYiLCAicnVieSIsICJUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRl c3RzIiwKICAgICAgICAgIi1qIiwganNjUGF0aCgkcHJvZHVjdERpciksICItbyIsICRqc2NTdHJl c3NSZXN1bHRzRGlyLCAiLS1hcmNoIiwgJGFyY2hzKTsKIAotICAgIGlmIChuYXRpdmVBcmNoaXRl Y3R1cmUoKSAhPSAkYXJjaHMpIHsKKyAgICBpZiAobmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVU YXJnZXQsICRuYXRpdmVQb3J0KSAhPSAkYXJjaHMpIHsKICAgICAgICAgcHVzaChAanNjU3RyZXNz RHJpdmVyQ21kLCAiLS1mb3JjZS1hcmNoaXRlY3R1cmUiKTsKICAgICAgICAgcHVzaChAanNjU3Ry ZXNzRHJpdmVyQ21kLCAkYXJjaHMpOwogICAgIH0KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlz aW9uIDI2MzY2MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5 KQpAQCAtMTI4LDcgKzEyOCw3IEBAIHVzZSBjb25zdGFudCBJT1NfREVWRUxPUE1FTlRfQ0VSVElG SUNBVEUKIG91ciBARVhQT1JUX09LOwogCiBteSAkYXJjaGl0ZWN0dXJlOwotbXkgJG5hdGl2ZUFy Y2hpdGVjdHVyZTsKK215ICVuYXRpdmVBcmNoaXRlY3R1cmVNYXAgPSAoKTsKIG15ICRhc2FuSXNF bmFibGVkOwogbXkgJGZvcmNlT3B0aW1pemF0aW9uTGV2ZWw7CiBteSAkY292ZXJhZ2VJc0VuYWJs ZWQ7CkBAIC0zNTEsMTggKzM1MSwyOCBAQCBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbgogICAg IH0KIH0KIAotc3ViIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZQorc3ViIGRldGVybWluZU5h dGl2ZUFyY2hpdGVjdHVyZSg7JCQpCiB7Ci0gICAgcmV0dXJuIGlmIGRlZmluZWQgJG5hdGl2ZUFy Y2hpdGVjdHVyZTsKLSAgICAkbmF0aXZlQXJjaGl0ZWN0dXJlID0gYHVuYW1lIC1tYDsKLSAgICBj aG9tcCAkbmF0aXZlQXJjaGl0ZWN0dXJlOwotICAgICRuYXRpdmVBcmNoaXRlY3R1cmUgPSAieDg2 XzY0IiBpZiAobm90IGRlZmluZWQgJG5hdGl2ZUFyY2hpdGVjdHVyZSk7CisgICAgbXkgKCR0YXJn ZXQsICRwb3J0KSA9IEBfOworICAgICR0YXJnZXQgPSAnJyBpZiAodW5kZWYgJHRhcmdldCB8fCAh JHRhcmdldCk7CisgICAgJHBvcnQgPSAwIGlmICh1bmRlZiAkcG9ydCB8fCAhJHBvcnQpOworICAg IHJldHVybiBpZiBkZWZpbmVkICRuYXRpdmVBcmNoaXRlY3R1cmVNYXB7IiR0YXJnZXQ6JHBvcnQi fTsKKworICAgIG15ICRvdXRwdXQ7CisgICAgaWYgKCR0YXJnZXQgZXEgJycpIHsKKyAgICAgICAg JG91dHB1dCA9IGB1bmFtZSAtbWA7CisgICAgfSBlbHNlIHsKKyAgICAgICAgJG91dHB1dCA9IGBz c2ggLW8gTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIC1wICRwb3J0ICR0YXJn ZXQgJ3VuYW1lICAtbSdgOworICAgIH0KKyAgICBjaG9tcCAkb3V0cHV0OworICAgICRvdXRwdXQg PSAieDg2XzY0IiBpZiAobm90IGRlZmluZWQgJG91dHB1dCk7CiAKICAgICAjIEZJWE1FOiBSZW1v dmUgdGhpcyB3aGVuIDxyZGFyOi8vcHJvYmxlbS82NDIwODUzMj4gaXMgcmVzb2x2ZWQKLSAgICBp ZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkgJiYgJG5hdGl2ZUFyY2hpdGVjdHVyZSBuZSAieDg2XzY0 IikgewotICAgICAgICAkbmF0aXZlQXJjaGl0ZWN0dXJlID0gImFybTY0IjsKKyAgICBpZiAoaXNB cHBsZUNvY29hV2ViS2l0KCkgJiYgJG91dHB1dCBuZSAieDg2XzY0IikgeworICAgICAgICAkb3V0 cHV0ID0gImFybTY0IjsKICAgICB9Ci0gICAgZGllICInYXJtNjRlJyBpcyBhbiBpbnZhbGlkIG5h dGl2ZSBhcmNoaXRlY3R1cmUiIGlmICRuYXRpdmVBcmNoaXRlY3R1cmUgZXEgImFybTY0ZSI7Cisg ICAgZGllICInYXJtNjRlJyBpcyBhbiBpbnZhbGlkIG5hdGl2ZSBhcmNoaXRlY3R1cmUiIGlmICRv dXRwdXQgZXEgImFybTY0ZSI7CisgICAgJG5hdGl2ZUFyY2hpdGVjdHVyZU1hcHsiJHRhcmdldDok cG9ydCJ9ID0gJG91dHB1dDsKIH0KIAogc3ViIGRldGVybWluZUFyY2hpdGVjdHVyZQpAQCAtMzcx LDggKzM4MSw3IEBAIHN1YiBkZXRlcm1pbmVBcmNoaXRlY3R1cmUKIAogICAgIGRldGVybWluZUJh c2VQcm9kdWN0RGlyKCk7CiAgICAgZGV0ZXJtaW5lWGNvZGVTREsoKTsKLSAgICBkZXRlcm1pbmVO YXRpdmVBcmNoaXRlY3R1cmUoKTsKLSAgICAkYXJjaGl0ZWN0dXJlID0gJG5hdGl2ZUFyY2hpdGVj dHVyZTsKKyAgICAkYXJjaGl0ZWN0dXJlID0gbmF0aXZlQXJjaGl0ZWN0dXJlKCk7CiAKICAgICBp ZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkpIHsKICAgICAgICAgaWYgKG9wZW4gQVJDSElURUNUVVJF LCAiJGJhc2VQcm9kdWN0RGlyL0FyY2hpdGVjdHVyZSIpIHsKQEAgLTEwNTEsMTAgKzEwNjAsMTQg QEAgc3ViIHBhc3NlZEFyY2hpdGVjdHVyZQogICAgIHJldHVybiAkcGFzc2VkQXJjaGl0ZWN0dXJl OwogfQogCi1zdWIgbmF0aXZlQXJjaGl0ZWN0dXJlKCkKK3N1YiBuYXRpdmVBcmNoaXRlY3R1cmUo OyQkKQogewotICAgIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZSgpOwotICAgIHJldHVybiAk bmF0aXZlQXJjaGl0ZWN0dXJlOworICAgIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZShAXyk7 CisKKyAgICBteSAoJHRhcmdldCwgJHBvcnQpID0gQF87CisgICAgJHRhcmdldCA9ICcnIGlmICh1 bmRlZiAkdGFyZ2V0IHx8ICEkdGFyZ2V0KTsKKyAgICAkcG9ydCA9IDAgaWYgKHVuZGVmICRwb3J0 IHx8ICEkcG9ydCk7CisgICAgcmV0dXJuICRuYXRpdmVBcmNoaXRlY3R1cmVNYXB7IiR0YXJnZXQ6 JHBvcnQifTsKIH0KIAogc3ViIGFyY2hpdGVjdHVyZSgpCg== 403109 2020-06-29 13:56:01 -0700 2020-06-29 14:39:35 -0700 Patch bug-213727-20200629135555.patch text/plain 6817 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MzY4OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA2LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cGVybF0gbmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmVlZHMgdG8g c3VwcG9ydCByZW1vdGUgZGV2aWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEzNzI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDg5MjAyMT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzOiBEZXRlcm1pbmUgdGhlIG1hY2hpbmUgYWN0dWFs bHkgcnVubmluZyB0ZXN0cyBhbmQgcGFzcworICAgICAgICB0aGF0IHRvIG5hdGl2ZUFyY2hpdGVj dHVyZSguLi4pLgorICAgICAgICAocnVuVGVzdCk6IFBhc3MgbmF0aXZlVGFyZ2V0IGFuZCBuYXRp dmVQb3J0LgorICAgICAgICAocnVuSlNDU3RyZXNzVGVzdHMpOiBEaXR0by4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1 cmUpOiBOYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGRlcGVuZGVudCBvbiB0aGUgdGFyZ2V0IGRldmlj ZS4KKyAgICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6IENhbGwgbmF0aXZlQXJjaGl0ZWN0 dXJlKCkgaW5zdGVhZCBvZiBhY2Nlc3NpbmcgdGhlIHZhcmlhYmxlIGRpcmVjdGx5LgorICAgICAg ICAobmF0aXZlQXJjaGl0ZWN0dXJlKTogRW5zdXJlIHRoYXQgd2UgcmV0dXJuIG9ubHkgdGhlIGFy Y2hpdGVjdHVyZSBvZiB0aGUgc3BlY2lmaWVkIHRhcmdldC4KKwogMjAyMC0wNi0yOSAgRnVqaWkg SGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2luXSBydW4t d2Via2l0LXRlc3RzIGlzIGZhaWxpbmcgdG8gcnVuIERSVCBhbmQgV1RSIHdpdGhvdXQgLS1hcmNo aXRlY3R1cmUgeDg2XzY0CkluZGV4OiBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10 ZXN0cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0 cwkocmV2aXNpb24gMjYzNjg4KQorKysgVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUt dGVzdHMJKHdvcmtpbmcgY29weSkKQEAgLTQ4NiwxNyArNDg2LDM3IEBAIGlmICgkc2hvd0hlbHAp IHsKIAogc2V0Q29uZmlndXJhdGlvblByb2R1Y3REaXIoQ3dkOjphYnNfcGF0aCgkcm9vdCkpIGlm IChkZWZpbmVkKCRyb290KSk7CiBteSAkYXJjaHNJbkJ1aWxkID0gYXJjaGl0ZWN0dXJlc0ZvclBy b2R1Y3RzKCk7CisKK215ICRuYXRpdmVUYXJnZXQgPSAibG9jYWxob3N0IjsKK215ICRuYXRpdmVQ b3J0ID0gMjI7CiskbmF0aXZlVGFyZ2V0ID0gJHJlbW90ZUhvc3QgaWYgKCRyZW1vdGVIb3N0KTsK K2lmIChkZWZpbmVkICRyZW1vdGVDb25maWdGaWxlKSB7CisgICAgb3BlbiBteSAkaGFuZGxlLCAn PCcsICRyZW1vdGVDb25maWdGaWxlIG9yIGRpZSAiRmFpbGVkIHRvIG9wZW4gJHJlbW90ZUNvbmZp Z0ZpbGU6ICQhIjsKKyAgICBteSAkY29uZmlnSnNvbiA9IGRvIHsgbG9jYWwgJC87IDwkaGFuZGxl PiB9OworICAgIG15ICRyZW1vdGVDb25maWcgPSBkZWNvZGVfanNvbigkY29uZmlnSnNvbik7Cisg ICAgaWYgKGRlZmluZWQgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGVzIn0pIHsKKyAgICAgICAgbXkg JHJlbW90ZXMgPSAkcmVtb3RlQ29uZmlnLT57InJlbW90ZXMifTsKKyAgICAgICAgbXkgQHNwbGl0 ID0gc3BsaXQoJzonLCBAJHJlbW90ZXNbMF0tPnsiYWRkcmVzcyJ9KTsKKyAgICAgICAgJG5hdGl2 ZVRhcmdldCA9ICRzcGxpdFswXTsKKyAgICAgICAgJG5hdGl2ZVBvcnQgPSAkc3BsaXRbMV0gaWYg c2NhbGFyKEBzcGxpdCkgPiAxOworICAgIH0gZWxzaWYgKGRlZmluZWQgJHJlbW90ZUNvbmZpZy0+ eyJyZW1vdGUifSkgeworICAgICAgICBteSBAc3BsaXQgPSBzcGxpdCgnOicsICRyZW1vdGVDb25m aWctPnsicmVtb3RlIn0pOworICAgICAgICAkbmF0aXZlVGFyZ2V0ID0gJHNwbGl0WzBdOworICAg ICAgICAkbmF0aXZlUG9ydCA9ICRzcGxpdFsxXSBpZiBzY2FsYXIoQHNwbGl0KSA+IDE7CisgICAg fQorfQorCiBpZiAoZGVmaW5lZCAkYXJjaHMpIHsKICAgICBkaWUgIiRhcmNocyBub3Qgc3VwcG9y dGVkIGJ5IHRoZSBwcm92aWRlZCBiaW5hcnksIHdoaWNoIHN1cHBvcnRzICckYXJjaHNJbkJ1aWxk JyIgaWYgaW5kZXgoJGFyY2hzSW5CdWlsZCwgJGFyY2hzKSA9PSAtMTsKLX0gZWxzZSB7Cit9IGVs c2lmICgpIHsKICAgICAjIEZhbGxiYWNrIGlzIHg4Nl82NCwgd2hpY2ggd2UgcmVwbGFjZSB3aXRo IHRoZSBuYXRpdmUgYXJjaGl0ZWN0dXJlIGlmIHRoZSBuYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGlu IHRoZSBwcm92aWRlZCBidWlsZAogICAgICRhcmNocyA9ICJ4ODZfNjQiOwotICAgICRhcmNocyA9 IG5hdGl2ZUFyY2hpdGVjdHVyZSgpIGlmIGluZGV4KCRhcmNoc0luQnVpbGQsIG5hdGl2ZUFyY2hp dGVjdHVyZSgpKSAhPSAtMTsKKyAgICAkYXJjaHMgPSBuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2 ZVRhcmdldCwgJG5hdGl2ZVBvcnQpIGlmICghaXNBcHBsZU1hY1dlYktpdCgpIHx8IGluZGV4KCRh cmNoc0luQnVpbGQsIG5hdGl2ZUFyY2hpdGVjdHVyZSgkbmF0aXZlVGFyZ2V0LCAkbmF0aXZlUG9y dCkpICE9IC0xKTsKIH0KIAogIyBGb3IgcnVubmluZyB0ZXN0cywgYXJtNjRlIHNob3VsZCBtYXAg dG8gYXJtNjQKICRhcmNocyA9ICJhcm02NCIgaWYgJGFyY2hzIGVxICJhcm02NGUiOwotaWYgKCRh cmNocyBuZSBuYXRpdmVBcmNoaXRlY3R1cmUoKSAmJiAobmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmUg ImFybTY0IiB8fCAhaXNBcHBsZU1hY1dlYktpdCgpKSkgeworaWYgKCRhcmNocyBuZSBuYXRpdmVB cmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQpICYmIChuYXRpdmVBcmNoaXRl Y3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQpIG5lICJhcm02NCIgfHwgIWlzQXBwbGVN YWNXZWJLaXQoKSkpIHsKICAgICBkaWUgIkNhbm5vdCBydW4gdGVzdHMgd2l0aCAkYXJjaHMgb24g dGhpcyBtYWNoaW5lIjsKIH0KIApAQCAtNTY4LDcgKzU4OCw3IEBAIHN1YiBydW5UZXN0IHsKICAg ICBjaGRpcigkcHJvZHVjdERpcikgb3IgZGllICJGYWlsZWQgdG8gc3dpdGNoIGRpcmVjdG9yeSB0 byAnJHByb2R1Y3REaXInXG4iOwogICAgIG15IEBjb21tYW5kID0gKHRlc3RQYXRoKCRwcm9kdWN0 RGlyLCAkdGVzdE5hbWUpKTsKICAgICB1bnNoaWZ0IEBjb21tYW5kLCAoInhjcnVuIiwgIi1zZGsi LCB4Y29kZVNESygpLCAic2ltIikgaWYgd2lsbFVzZUlPU1NpbXVsYXRvclNESygpOwotICAgIHVu c2hpZnQgQGNvbW1hbmQsICgiL3Vzci9iaW4vYXJjaCIsICItJGFyY2hzIikgaWYgJGFyY2hzIG5l IG5hdGl2ZUFyY2hpdGVjdHVyZSgpOworICAgIHVuc2hpZnQgQGNvbW1hbmQsICgiL3Vzci9iaW4v YXJjaCIsICItJGFyY2hzIikgaWYgJGFyY2hzIG5lIG5hdGl2ZUFyY2hpdGVjdHVyZSgkbmF0aXZl VGFyZ2V0LCAkbmF0aXZlUG9ydCk7CiAgICAgdW5zaGlmdCBAY29tbWFuZCwgd3JhcHBlclByZWZp eElmTmVlZGVkKCkgaWYgaXNHdGsoKSBvciBpc1dQRSgpOwogCiAgICAgaWYgKCRlbnZWYXJzIG5l ICIiKSB7CkBAIC03MzIsNyArNzUyLDcgQEAgc3ViIHJ1bkpTQ1N0cmVzc1Rlc3RzCiAgICAgICAg ICIvdXNyL2Jpbi9lbnYiLCAicnVieSIsICJUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRl c3RzIiwKICAgICAgICAgIi1qIiwganNjUGF0aCgkcHJvZHVjdERpciksICItbyIsICRqc2NTdHJl c3NSZXN1bHRzRGlyLCAiLS1hcmNoIiwgJGFyY2hzKTsKIAotICAgIGlmIChuYXRpdmVBcmNoaXRl Y3R1cmUoKSAhPSAkYXJjaHMpIHsKKyAgICBpZiAobmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVU YXJnZXQsICRuYXRpdmVQb3J0KSBuZSAkYXJjaHMpIHsKICAgICAgICAgcHVzaChAanNjU3RyZXNz RHJpdmVyQ21kLCAiLS1mb3JjZS1hcmNoaXRlY3R1cmUiKTsKICAgICAgICAgcHVzaChAanNjU3Ry ZXNzRHJpdmVyQ21kLCAkYXJjaHMpOwogICAgIH0KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlz aW9uIDI2MzY4OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5 KQpAQCAtMTI4LDcgKzEyOCw3IEBAIHVzZSBjb25zdGFudCBJT1NfREVWRUxPUE1FTlRfQ0VSVElG SUNBVEUKIG91ciBARVhQT1JUX09LOwogCiBteSAkYXJjaGl0ZWN0dXJlOwotbXkgJG5hdGl2ZUFy Y2hpdGVjdHVyZTsKK215ICVuYXRpdmVBcmNoaXRlY3R1cmVNYXAgPSAoKTsKIG15ICRhc2FuSXNF bmFibGVkOwogbXkgJGZvcmNlT3B0aW1pemF0aW9uTGV2ZWw7CiBteSAkY292ZXJhZ2VJc0VuYWJs ZWQ7CkBAIC0zNTEsMTggKzM1MSwyOCBAQCBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbgogICAg IH0KIH0KIAotc3ViIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZQorc3ViIGRldGVybWluZU5h dGl2ZUFyY2hpdGVjdHVyZSg7JCQpCiB7Ci0gICAgcmV0dXJuIGlmIGRlZmluZWQgJG5hdGl2ZUFy Y2hpdGVjdHVyZTsKLSAgICAkbmF0aXZlQXJjaGl0ZWN0dXJlID0gYHVuYW1lIC1tYDsKLSAgICBj aG9tcCAkbmF0aXZlQXJjaGl0ZWN0dXJlOwotICAgICRuYXRpdmVBcmNoaXRlY3R1cmUgPSAieDg2 XzY0IiBpZiAobm90IGRlZmluZWQgJG5hdGl2ZUFyY2hpdGVjdHVyZSk7CisgICAgbXkgKCR0YXJn ZXQsICRwb3J0KSA9IEBfOworICAgICR0YXJnZXQgPSAnJyBpZiAodW5kZWYgJHRhcmdldCB8fCAh JHRhcmdldCk7CisgICAgJHBvcnQgPSAwIGlmICh1bmRlZiAkcG9ydCB8fCAhJHBvcnQpOworICAg IHJldHVybiBpZiBkZWZpbmVkICRuYXRpdmVBcmNoaXRlY3R1cmVNYXB7IiR0YXJnZXQ6JHBvcnQi fTsKKworICAgIG15ICRvdXRwdXQ7CisgICAgaWYgKCR0YXJnZXQgZXEgJycpIHsKKyAgICAgICAg JG91dHB1dCA9IGB1bmFtZSAtbWA7CisgICAgfSBlbHNlIHsKKyAgICAgICAgJG91dHB1dCA9IGBz c2ggLW8gTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIC1wICRwb3J0ICR0YXJn ZXQgJ3VuYW1lICAtbSdgOworICAgIH0KKyAgICBjaG9tcCAkb3V0cHV0OworICAgICRvdXRwdXQg PSAieDg2XzY0IiBpZiAobm90IGRlZmluZWQgJG91dHB1dCk7CiAKICAgICAjIEZJWE1FOiBSZW1v dmUgdGhpcyB3aGVuIDxyZGFyOi8vcHJvYmxlbS82NDIwODUzMj4gaXMgcmVzb2x2ZWQKLSAgICBp ZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkgJiYgJG5hdGl2ZUFyY2hpdGVjdHVyZSBuZSAieDg2XzY0 IikgewotICAgICAgICAkbmF0aXZlQXJjaGl0ZWN0dXJlID0gImFybTY0IjsKKyAgICBpZiAoaXNB cHBsZUNvY29hV2ViS2l0KCkgJiYgJG91dHB1dCBuZSAieDg2XzY0IikgeworICAgICAgICAkb3V0 cHV0ID0gImFybTY0IjsKICAgICB9Ci0gICAgZGllICInYXJtNjRlJyBpcyBhbiBpbnZhbGlkIG5h dGl2ZSBhcmNoaXRlY3R1cmUiIGlmICRuYXRpdmVBcmNoaXRlY3R1cmUgZXEgImFybTY0ZSI7Cisg ICAgZGllICInYXJtNjRlJyBpcyBhbiBpbnZhbGlkIG5hdGl2ZSBhcmNoaXRlY3R1cmUiIGlmICRv dXRwdXQgZXEgImFybTY0ZSI7CisgICAgJG5hdGl2ZUFyY2hpdGVjdHVyZU1hcHsiJHRhcmdldDok cG9ydCJ9ID0gJG91dHB1dDsKIH0KIAogc3ViIGRldGVybWluZUFyY2hpdGVjdHVyZQpAQCAtMzcx LDggKzM4MSw3IEBAIHN1YiBkZXRlcm1pbmVBcmNoaXRlY3R1cmUKIAogICAgIGRldGVybWluZUJh c2VQcm9kdWN0RGlyKCk7CiAgICAgZGV0ZXJtaW5lWGNvZGVTREsoKTsKLSAgICBkZXRlcm1pbmVO YXRpdmVBcmNoaXRlY3R1cmUoKTsKLSAgICAkYXJjaGl0ZWN0dXJlID0gJG5hdGl2ZUFyY2hpdGVj dHVyZTsKKyAgICAkYXJjaGl0ZWN0dXJlID0gbmF0aXZlQXJjaGl0ZWN0dXJlKCk7CiAKICAgICBp ZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkpIHsKICAgICAgICAgaWYgKG9wZW4gQVJDSElURUNUVVJF LCAiJGJhc2VQcm9kdWN0RGlyL0FyY2hpdGVjdHVyZSIpIHsKQEAgLTEwNTEsMTAgKzEwNjAsMTQg QEAgc3ViIHBhc3NlZEFyY2hpdGVjdHVyZQogICAgIHJldHVybiAkcGFzc2VkQXJjaGl0ZWN0dXJl OwogfQogCi1zdWIgbmF0aXZlQXJjaGl0ZWN0dXJlKCkKK3N1YiBuYXRpdmVBcmNoaXRlY3R1cmUo OyQkKQogewotICAgIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZSgpOwotICAgIHJldHVybiAk bmF0aXZlQXJjaGl0ZWN0dXJlOworICAgIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZShAXyk7 CisKKyAgICBteSAoJHRhcmdldCwgJHBvcnQpID0gQF87CisgICAgJHRhcmdldCA9ICcnIGlmICh1 bmRlZiAkdGFyZ2V0IHx8ICEkdGFyZ2V0KTsKKyAgICAkcG9ydCA9IDAgaWYgKHVuZGVmICRwb3J0 IHx8ICEkcG9ydCk7CisgICAgcmV0dXJuICRuYXRpdmVBcmNoaXRlY3R1cmVNYXB7IiR0YXJnZXQ6 JHBvcnQifTsKIH0KIAogc3ViIGFyY2hpdGVjdHVyZSgpCg== 403115 2020-06-29 14:39:50 -0700 2020-06-29 16:12:59 -0700 Patch bug-213727-20200629143947.patch text/plain 6799 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MzY5MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA2LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cGVybF0gbmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmVlZHMgdG8g c3VwcG9ydCByZW1vdGUgZGV2aWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEzNzI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDg5MjAyMT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzOiBEZXRlcm1pbmUgdGhlIG1hY2hpbmUgYWN0dWFs bHkgcnVubmluZyB0ZXN0cyBhbmQgcGFzcworICAgICAgICB0aGF0IHRvIG5hdGl2ZUFyY2hpdGVj dHVyZSguLi4pLgorICAgICAgICAocnVuVGVzdCk6IFBhc3MgbmF0aXZlVGFyZ2V0IGFuZCBuYXRp dmVQb3J0LgorICAgICAgICAocnVuSlNDU3RyZXNzVGVzdHMpOiBEaXR0by4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1 cmUpOiBOYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGRlcGVuZGVudCBvbiB0aGUgdGFyZ2V0IGRldmlj ZS4KKyAgICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6IENhbGwgbmF0aXZlQXJjaGl0ZWN0 dXJlKCkgaW5zdGVhZCBvZiBhY2Nlc3NpbmcgdGhlIHZhcmlhYmxlIGRpcmVjdGx5LgorICAgICAg ICAobmF0aXZlQXJjaGl0ZWN0dXJlKTogRW5zdXJlIHRoYXQgd2UgcmV0dXJuIG9ubHkgdGhlIGFy Y2hpdGVjdHVyZSBvZiB0aGUgc3BlY2lmaWVkIHRhcmdldC4KKwogMjAyMC0wNi0yOSAgV2Vuc29u IEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBlZGl0aW5n L3NlbGVjdGlvbi9pb3Mvc2VsZWN0LXRleHQtYWZ0ZXItY2hhbmdpbmctZm9jdXMuaHRtbCBzb21l dGltZXMgZmFpbHMKSW5kZXg6IFRvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3Rz Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCShy ZXZpc2lvbiAyNjM2OTMpCisrKyBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0 cwkod29ya2luZyBjb3B5KQpAQCAtNDg2LDE3ICs0ODYsMzcgQEAgaWYgKCRzaG93SGVscCkgewog CiBzZXRDb25maWd1cmF0aW9uUHJvZHVjdERpcihDd2Q6OmFic19wYXRoKCRyb290KSkgaWYgKGRl ZmluZWQoJHJvb3QpKTsKIG15ICRhcmNoc0luQnVpbGQgPSBhcmNoaXRlY3R1cmVzRm9yUHJvZHVj dHMoKTsKKworbXkgJG5hdGl2ZVRhcmdldCA9ICJsb2NhbGhvc3QiOworbXkgJG5hdGl2ZVBvcnQg PSAyMjsKKyRuYXRpdmVUYXJnZXQgPSAkcmVtb3RlSG9zdCBpZiAoJHJlbW90ZUhvc3QpOworaWYg KGRlZmluZWQgJHJlbW90ZUNvbmZpZ0ZpbGUpIHsKKyAgICBvcGVuIG15ICRoYW5kbGUsICc8Jywg JHJlbW90ZUNvbmZpZ0ZpbGUgb3IgZGllICJGYWlsZWQgdG8gb3BlbiAkcmVtb3RlQ29uZmlnRmls ZTogJCEiOworICAgIG15ICRjb25maWdKc29uID0gZG8geyBsb2NhbCAkLzsgPCRoYW5kbGU+IH07 CisgICAgbXkgJHJlbW90ZUNvbmZpZyA9IGRlY29kZV9qc29uKCRjb25maWdKc29uKTsKKyAgICBp ZiAoZGVmaW5lZCAkcmVtb3RlQ29uZmlnLT57InJlbW90ZXMifSkgeworICAgICAgICBteSAkcmVt b3RlcyA9ICRyZW1vdGVDb25maWctPnsicmVtb3RlcyJ9OworICAgICAgICBteSBAc3BsaXQgPSBz cGxpdCgnOicsIEAkcmVtb3Rlc1swXS0+eyJhZGRyZXNzIn0pOworICAgICAgICAkbmF0aXZlVGFy Z2V0ID0gJHNwbGl0WzBdOworICAgICAgICAkbmF0aXZlUG9ydCA9ICRzcGxpdFsxXSBpZiBzY2Fs YXIoQHNwbGl0KSA+IDE7CisgICAgfSBlbHNpZiAoZGVmaW5lZCAkcmVtb3RlQ29uZmlnLT57InJl bW90ZSJ9KSB7CisgICAgICAgIG15IEBzcGxpdCA9IHNwbGl0KCc6JywgJHJlbW90ZUNvbmZpZy0+ eyJyZW1vdGUifSk7CisgICAgICAgICRuYXRpdmVUYXJnZXQgPSAkc3BsaXRbMF07CisgICAgICAg ICRuYXRpdmVQb3J0ID0gJHNwbGl0WzFdIGlmIHNjYWxhcihAc3BsaXQpID4gMTsKKyAgICB9Cit9 CisKIGlmIChkZWZpbmVkICRhcmNocykgewogICAgIGRpZSAiJGFyY2hzIG5vdCBzdXBwb3J0ZWQg YnkgdGhlIHByb3ZpZGVkIGJpbmFyeSwgd2hpY2ggc3VwcG9ydHMgJyRhcmNoc0luQnVpbGQnIiBp ZiBpbmRleCgkYXJjaHNJbkJ1aWxkLCAkYXJjaHMpID09IC0xOwogfSBlbHNlIHsKICAgICAjIEZh bGxiYWNrIGlzIHg4Nl82NCwgd2hpY2ggd2UgcmVwbGFjZSB3aXRoIHRoZSBuYXRpdmUgYXJjaGl0 ZWN0dXJlIGlmIHRoZSBuYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGluIHRoZSBwcm92aWRlZCBidWls ZAogICAgICRhcmNocyA9ICJ4ODZfNjQiOwotICAgICRhcmNocyA9IG5hdGl2ZUFyY2hpdGVjdHVy ZSgpIGlmIGluZGV4KCRhcmNoc0luQnVpbGQsIG5hdGl2ZUFyY2hpdGVjdHVyZSgpKSAhPSAtMTsK KyAgICAkYXJjaHMgPSBuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBv cnQpIGlmICghaXNBcHBsZU1hY1dlYktpdCgpIHx8IGluZGV4KCRhcmNoc0luQnVpbGQsIG5hdGl2 ZUFyY2hpdGVjdHVyZSgkbmF0aXZlVGFyZ2V0LCAkbmF0aXZlUG9ydCkpICE9IC0xKTsKIH0KIAog IyBGb3IgcnVubmluZyB0ZXN0cywgYXJtNjRlIHNob3VsZCBtYXAgdG8gYXJtNjQKICRhcmNocyA9 ICJhcm02NCIgaWYgJGFyY2hzIGVxICJhcm02NGUiOwotaWYgKCRhcmNocyBuZSBuYXRpdmVBcmNo aXRlY3R1cmUoKSAmJiAobmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmUgImFybTY0IiB8fCAhaXNBcHBs ZU1hY1dlYktpdCgpKSkgeworaWYgKCRhcmNocyBuZSBuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2 ZVRhcmdldCwgJG5hdGl2ZVBvcnQpICYmIChuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdl dCwgJG5hdGl2ZVBvcnQpIG5lICJhcm02NCIgfHwgIWlzQXBwbGVNYWNXZWJLaXQoKSkpIHsKICAg ICBkaWUgIkNhbm5vdCBydW4gdGVzdHMgd2l0aCAkYXJjaHMgb24gdGhpcyBtYWNoaW5lIjsKIH0K IApAQCAtNTY4LDcgKzU4OCw3IEBAIHN1YiBydW5UZXN0IHsKICAgICBjaGRpcigkcHJvZHVjdERp cikgb3IgZGllICJGYWlsZWQgdG8gc3dpdGNoIGRpcmVjdG9yeSB0byAnJHByb2R1Y3REaXInXG4i OwogICAgIG15IEBjb21tYW5kID0gKHRlc3RQYXRoKCRwcm9kdWN0RGlyLCAkdGVzdE5hbWUpKTsK ICAgICB1bnNoaWZ0IEBjb21tYW5kLCAoInhjcnVuIiwgIi1zZGsiLCB4Y29kZVNESygpLCAic2lt IikgaWYgd2lsbFVzZUlPU1NpbXVsYXRvclNESygpOwotICAgIHVuc2hpZnQgQGNvbW1hbmQsICgi L3Vzci9iaW4vYXJjaCIsICItJGFyY2hzIikgaWYgJGFyY2hzIG5lIG5hdGl2ZUFyY2hpdGVjdHVy ZSgpOworICAgIHVuc2hpZnQgQGNvbW1hbmQsICgiL3Vzci9iaW4vYXJjaCIsICItJGFyY2hzIikg aWYgJGFyY2hzIG5lIG5hdGl2ZUFyY2hpdGVjdHVyZSgkbmF0aXZlVGFyZ2V0LCAkbmF0aXZlUG9y dCk7CiAgICAgdW5zaGlmdCBAY29tbWFuZCwgd3JhcHBlclByZWZpeElmTmVlZGVkKCkgaWYgaXNH dGsoKSBvciBpc1dQRSgpOwogCiAgICAgaWYgKCRlbnZWYXJzIG5lICIiKSB7CkBAIC03MzIsNyAr NzUyLDcgQEAgc3ViIHJ1bkpTQ1N0cmVzc1Rlc3RzCiAgICAgICAgICIvdXNyL2Jpbi9lbnYiLCAi cnVieSIsICJUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzIiwKICAgICAgICAgIi1q IiwganNjUGF0aCgkcHJvZHVjdERpciksICItbyIsICRqc2NTdHJlc3NSZXN1bHRzRGlyLCAiLS1h cmNoIiwgJGFyY2hzKTsKIAotICAgIGlmIChuYXRpdmVBcmNoaXRlY3R1cmUoKSAhPSAkYXJjaHMp IHsKKyAgICBpZiAobmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVUYXJnZXQsICRuYXRpdmVQb3J0 KSBuZSAkYXJjaHMpIHsKICAgICAgICAgcHVzaChAanNjU3RyZXNzRHJpdmVyQ21kLCAiLS1mb3Jj ZS1hcmNoaXRlY3R1cmUiKTsKICAgICAgICAgcHVzaChAanNjU3RyZXNzRHJpdmVyQ21kLCAkYXJj aHMpOwogICAgIH0KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDI2MzY5MykKKysrIFRv b2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtMTI4LDcgKzEyOCw3 IEBAIHVzZSBjb25zdGFudCBJT1NfREVWRUxPUE1FTlRfQ0VSVElGSUNBVEUKIG91ciBARVhQT1JU X09LOwogCiBteSAkYXJjaGl0ZWN0dXJlOwotbXkgJG5hdGl2ZUFyY2hpdGVjdHVyZTsKK215ICVu YXRpdmVBcmNoaXRlY3R1cmVNYXAgPSAoKTsKIG15ICRhc2FuSXNFbmFibGVkOwogbXkgJGZvcmNl T3B0aW1pemF0aW9uTGV2ZWw7CiBteSAkY292ZXJhZ2VJc0VuYWJsZWQ7CkBAIC0zNTEsMTggKzM1 MSwyOCBAQCBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbgogICAgIH0KIH0KIAotc3ViIGRldGVy bWluZU5hdGl2ZUFyY2hpdGVjdHVyZQorc3ViIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZSg7 JCQpCiB7Ci0gICAgcmV0dXJuIGlmIGRlZmluZWQgJG5hdGl2ZUFyY2hpdGVjdHVyZTsKLSAgICAk bmF0aXZlQXJjaGl0ZWN0dXJlID0gYHVuYW1lIC1tYDsKLSAgICBjaG9tcCAkbmF0aXZlQXJjaGl0 ZWN0dXJlOwotICAgICRuYXRpdmVBcmNoaXRlY3R1cmUgPSAieDg2XzY0IiBpZiAobm90IGRlZmlu ZWQgJG5hdGl2ZUFyY2hpdGVjdHVyZSk7CisgICAgbXkgKCR0YXJnZXQsICRwb3J0KSA9IEBfOwor ICAgICR0YXJnZXQgPSAnJyBpZiAodW5kZWYgJHRhcmdldCB8fCAhJHRhcmdldCk7CisgICAgJHBv cnQgPSAwIGlmICh1bmRlZiAkcG9ydCB8fCAhJHBvcnQpOworICAgIHJldHVybiBpZiBkZWZpbmVk ICRuYXRpdmVBcmNoaXRlY3R1cmVNYXB7IiR0YXJnZXQ6JHBvcnQifTsKKworICAgIG15ICRvdXRw dXQ7CisgICAgaWYgKCR0YXJnZXQgZXEgJycpIHsKKyAgICAgICAgJG91dHB1dCA9IGB1bmFtZSAt bWA7CisgICAgfSBlbHNlIHsKKyAgICAgICAgJG91dHB1dCA9IGBzc2ggLW8gTm9Ib3N0QXV0aGVu dGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIC1wICRwb3J0ICR0YXJnZXQgJ3VuYW1lICAtbSdgOwor ICAgIH0KKyAgICBjaG9tcCAkb3V0cHV0OworICAgICRvdXRwdXQgPSAieDg2XzY0IiBpZiAobm90 IGRlZmluZWQgJG91dHB1dCk7CiAKICAgICAjIEZJWE1FOiBSZW1vdmUgdGhpcyB3aGVuIDxyZGFy Oi8vcHJvYmxlbS82NDIwODUzMj4gaXMgcmVzb2x2ZWQKLSAgICBpZiAoaXNBcHBsZUNvY29hV2Vi S2l0KCkgJiYgJG5hdGl2ZUFyY2hpdGVjdHVyZSBuZSAieDg2XzY0IikgewotICAgICAgICAkbmF0 aXZlQXJjaGl0ZWN0dXJlID0gImFybTY0IjsKKyAgICBpZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkg JiYgJG91dHB1dCBuZSAieDg2XzY0IikgeworICAgICAgICAkb3V0cHV0ID0gImFybTY0IjsKICAg ICB9Ci0gICAgZGllICInYXJtNjRlJyBpcyBhbiBpbnZhbGlkIG5hdGl2ZSBhcmNoaXRlY3R1cmUi IGlmICRuYXRpdmVBcmNoaXRlY3R1cmUgZXEgImFybTY0ZSI7CisgICAgZGllICInYXJtNjRlJyBp cyBhbiBpbnZhbGlkIG5hdGl2ZSBhcmNoaXRlY3R1cmUiIGlmICRvdXRwdXQgZXEgImFybTY0ZSI7 CisgICAgJG5hdGl2ZUFyY2hpdGVjdHVyZU1hcHsiJHRhcmdldDokcG9ydCJ9ID0gJG91dHB1dDsK IH0KIAogc3ViIGRldGVybWluZUFyY2hpdGVjdHVyZQpAQCAtMzcxLDggKzM4MSw3IEBAIHN1YiBk ZXRlcm1pbmVBcmNoaXRlY3R1cmUKIAogICAgIGRldGVybWluZUJhc2VQcm9kdWN0RGlyKCk7CiAg ICAgZGV0ZXJtaW5lWGNvZGVTREsoKTsKLSAgICBkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1cmUo KTsKLSAgICAkYXJjaGl0ZWN0dXJlID0gJG5hdGl2ZUFyY2hpdGVjdHVyZTsKKyAgICAkYXJjaGl0 ZWN0dXJlID0gbmF0aXZlQXJjaGl0ZWN0dXJlKCk7CiAKICAgICBpZiAoaXNBcHBsZUNvY29hV2Vi S2l0KCkpIHsKICAgICAgICAgaWYgKG9wZW4gQVJDSElURUNUVVJFLCAiJGJhc2VQcm9kdWN0RGly L0FyY2hpdGVjdHVyZSIpIHsKQEAgLTEwNTEsMTAgKzEwNjAsMTQgQEAgc3ViIHBhc3NlZEFyY2hp dGVjdHVyZQogICAgIHJldHVybiAkcGFzc2VkQXJjaGl0ZWN0dXJlOwogfQogCi1zdWIgbmF0aXZl QXJjaGl0ZWN0dXJlKCkKK3N1YiBuYXRpdmVBcmNoaXRlY3R1cmUoOyQkKQogewotICAgIGRldGVy bWluZU5hdGl2ZUFyY2hpdGVjdHVyZSgpOwotICAgIHJldHVybiAkbmF0aXZlQXJjaGl0ZWN0dXJl OworICAgIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZShAXyk7CisKKyAgICBteSAoJHRhcmdl dCwgJHBvcnQpID0gQF87CisgICAgJHRhcmdldCA9ICcnIGlmICh1bmRlZiAkdGFyZ2V0IHx8ICEk dGFyZ2V0KTsKKyAgICAkcG9ydCA9IDAgaWYgKHVuZGVmICRwb3J0IHx8ICEkcG9ydCk7CisgICAg cmV0dXJuICRuYXRpdmVBcmNoaXRlY3R1cmVNYXB7IiR0YXJnZXQ6JHBvcnQifTsKIH0KIAogc3Vi IGFyY2hpdGVjdHVyZSgpCg== 403127 2020-06-29 15:56:02 -0700 2020-06-29 16:13:01 -0700 Patch bug-213727-20200629155559.patch text/plain 6851 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MzY5MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA2LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cGVybF0gbmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmVlZHMgdG8g c3VwcG9ydCByZW1vdGUgZGV2aWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEzNzI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDg5MjAyMT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzOiBEZXRlcm1pbmUgdGhlIG1hY2hpbmUgYWN0dWFs bHkgcnVubmluZyB0ZXN0cyBhbmQgcGFzcworICAgICAgICB0aGF0IHRvIG5hdGl2ZUFyY2hpdGVj dHVyZSguLi4pLgorICAgICAgICAocnVuVGVzdCk6IFBhc3MgbmF0aXZlVGFyZ2V0IGFuZCBuYXRp dmVQb3J0LgorICAgICAgICAocnVuSlNDU3RyZXNzVGVzdHMpOiBEaXR0by4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1 cmUpOiBOYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGRlcGVuZGVudCBvbiB0aGUgdGFyZ2V0IGRldmlj ZS4KKyAgICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6IENhbGwgbmF0aXZlQXJjaGl0ZWN0 dXJlKCkgaW5zdGVhZCBvZiBhY2Nlc3NpbmcgdGhlIHZhcmlhYmxlIGRpcmVjdGx5LgorICAgICAg ICAobmF0aXZlQXJjaGl0ZWN0dXJlKTogRW5zdXJlIHRoYXQgd2UgcmV0dXJuIG9ubHkgdGhlIGFy Y2hpdGVjdHVyZSBvZiB0aGUgc3BlY2lmaWVkIHRhcmdldC4KKwogMjAyMC0wNi0yOSAgV2Vuc29u IEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBlZGl0aW5n L3NlbGVjdGlvbi9pb3Mvc2VsZWN0LXRleHQtYWZ0ZXItY2hhbmdpbmctZm9jdXMuaHRtbCBzb21l dGltZXMgZmFpbHMKSW5kZXg6IFRvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3Rz Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCShy ZXZpc2lvbiAyNjM2OTMpCisrKyBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0 cwkod29ya2luZyBjb3B5KQpAQCAtNDg2LDE3ICs0ODYsMzggQEAgaWYgKCRzaG93SGVscCkgewog CiBzZXRDb25maWd1cmF0aW9uUHJvZHVjdERpcihDd2Q6OmFic19wYXRoKCRyb290KSkgaWYgKGRl ZmluZWQoJHJvb3QpKTsKIG15ICRhcmNoc0luQnVpbGQgPSBhcmNoaXRlY3R1cmVzRm9yUHJvZHVj dHMoKTsKKworbXkgJG5hdGl2ZVRhcmdldCA9ICJsb2NhbGhvc3QiOworbXkgJG5hdGl2ZVBvcnQg PSAyMjsKKyRuYXRpdmVUYXJnZXQgPSAkcmVtb3RlSG9zdCBpZiAoJHJlbW90ZUhvc3QpOworaWYg KGRlZmluZWQgJHJlbW90ZUNvbmZpZ0ZpbGUpIHsKKyAgICBvcGVuIG15ICRoYW5kbGUsICc8Jywg JHJlbW90ZUNvbmZpZ0ZpbGUgb3IgZGllICJGYWlsZWQgdG8gb3BlbiAkcmVtb3RlQ29uZmlnRmls ZTogJCEiOworICAgIG15ICRjb25maWdKc29uID0gZG8geyBsb2NhbCAkLzsgPCRoYW5kbGU+IH07 CisgICAgbXkgJHJlbW90ZUNvbmZpZyA9IGRlY29kZV9qc29uKCRjb25maWdKc29uKTsKKyAgICBp ZiAoZGVmaW5lZCAkcmVtb3RlQ29uZmlnLT57InJlbW90ZXMifSkgeworICAgICAgICBteSAkcmVt b3RlcyA9ICRyZW1vdGVDb25maWctPnsicmVtb3RlcyJ9OworICAgICAgICBteSBAc3BsaXQgPSBz cGxpdCgnOicsIEAkcmVtb3Rlc1swXS0+eyJhZGRyZXNzIn0pOworICAgICAgICAkbmF0aXZlVGFy Z2V0ID0gJHNwbGl0WzBdOworICAgICAgICAkbmF0aXZlUG9ydCA9ICRzcGxpdFsxXSBpZiBzY2Fs YXIoQHNwbGl0KSA+IDE7CisgICAgfSBlbHNpZiAoZGVmaW5lZCAkcmVtb3RlQ29uZmlnLT57InJl bW90ZSJ9KSB7CisgICAgICAgIG15IEBzcGxpdCA9IHNwbGl0KCc6JywgJHJlbW90ZUNvbmZpZy0+ eyJyZW1vdGUifSk7CisgICAgICAgICRuYXRpdmVUYXJnZXQgPSAkc3BsaXRbMF07CisgICAgICAg ICRuYXRpdmVQb3J0ID0gJHNwbGl0WzFdIGlmIHNjYWxhcihAc3BsaXQpID4gMTsKKyAgICB9Cit9 CisKIGlmIChkZWZpbmVkICRhcmNocykgewogICAgIGRpZSAiJGFyY2hzIG5vdCBzdXBwb3J0ZWQg YnkgdGhlIHByb3ZpZGVkIGJpbmFyeSwgd2hpY2ggc3VwcG9ydHMgJyRhcmNoc0luQnVpbGQnIiBp ZiBpbmRleCgkYXJjaHNJbkJ1aWxkLCAkYXJjaHMpID09IC0xOwogfSBlbHNlIHsKICAgICAjIEZh bGxiYWNrIGlzIHg4Nl82NCwgd2hpY2ggd2UgcmVwbGFjZSB3aXRoIHRoZSBuYXRpdmUgYXJjaGl0 ZWN0dXJlIGlmIHRoZSBuYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGluIHRoZSBwcm92aWRlZCBidWls ZAogICAgICRhcmNocyA9ICJ4ODZfNjQiOwotICAgICRhcmNocyA9IG5hdGl2ZUFyY2hpdGVjdHVy ZSgpIGlmIGluZGV4KCRhcmNoc0luQnVpbGQsIG5hdGl2ZUFyY2hpdGVjdHVyZSgpKSAhPSAtMTsK KyAgICBwcmludCgiQ2hlY2tpbmcgJG5hdGl2ZVRhcmdldDokbmF0aXZlUG9ydFxuIik7CisgICAg JGFyY2hzID0gbmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVUYXJnZXQsICRuYXRpdmVQb3J0KSBp ZiAoIWlzQXBwbGVNYWNXZWJLaXQoKSB8fCBpbmRleCgkYXJjaHNJbkJ1aWxkLCBuYXRpdmVBcmNo aXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQpKSAhPSAtMSk7CiB9CiAKICMgRm9y IHJ1bm5pbmcgdGVzdHMsIGFybTY0ZSBzaG91bGQgbWFwIHRvIGFybTY0CiAkYXJjaHMgPSAiYXJt NjQiIGlmICRhcmNocyBlcSAiYXJtNjRlIjsKLWlmICgkYXJjaHMgbmUgbmF0aXZlQXJjaGl0ZWN0 dXJlKCkgJiYgKG5hdGl2ZUFyY2hpdGVjdHVyZSgpIG5lICJhcm02NCIgfHwgIWlzQXBwbGVNYWNX ZWJLaXQoKSkpIHsKK2lmICgkYXJjaHMgbmUgbmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVUYXJn ZXQsICRuYXRpdmVQb3J0KSAmJiAobmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVUYXJnZXQsICRu YXRpdmVQb3J0KSBuZSAiYXJtNjQiIHx8ICFpc0FwcGxlTWFjV2ViS2l0KCkpKSB7CiAgICAgZGll ICJDYW5ub3QgcnVuIHRlc3RzIHdpdGggJGFyY2hzIG9uIHRoaXMgbWFjaGluZSI7CiB9CiAKQEAg LTU2OCw3ICs1ODksNyBAQCBzdWIgcnVuVGVzdCB7CiAgICAgY2hkaXIoJHByb2R1Y3REaXIpIG9y IGRpZSAiRmFpbGVkIHRvIHN3aXRjaCBkaXJlY3RvcnkgdG8gJyRwcm9kdWN0RGlyJ1xuIjsKICAg ICBteSBAY29tbWFuZCA9ICh0ZXN0UGF0aCgkcHJvZHVjdERpciwgJHRlc3ROYW1lKSk7CiAgICAg dW5zaGlmdCBAY29tbWFuZCwgKCJ4Y3J1biIsICItc2RrIiwgeGNvZGVTREsoKSwgInNpbSIpIGlm IHdpbGxVc2VJT1NTaW11bGF0b3JTREsoKTsKLSAgICB1bnNoaWZ0IEBjb21tYW5kLCAoIi91c3Iv YmluL2FyY2giLCAiLSRhcmNocyIpIGlmICRhcmNocyBuZSBuYXRpdmVBcmNoaXRlY3R1cmUoKTsK KyAgICB1bnNoaWZ0IEBjb21tYW5kLCAoIi91c3IvYmluL2FyY2giLCAiLSRhcmNocyIpIGlmICRh cmNocyBuZSBuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQpOwog ICAgIHVuc2hpZnQgQGNvbW1hbmQsIHdyYXBwZXJQcmVmaXhJZk5lZWRlZCgpIGlmIGlzR3RrKCkg b3IgaXNXUEUoKTsKIAogICAgIGlmICgkZW52VmFycyBuZSAiIikgewpAQCAtNzMyLDcgKzc1Myw3 IEBAIHN1YiBydW5KU0NTdHJlc3NUZXN0cwogICAgICAgICAiL3Vzci9iaW4vZW52IiwgInJ1Ynki LCAiVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cyIsCiAgICAgICAgICItaiIsIGpz Y1BhdGgoJHByb2R1Y3REaXIpLCAiLW8iLCAkanNjU3RyZXNzUmVzdWx0c0RpciwgIi0tYXJjaCIs ICRhcmNocyk7CiAKLSAgICBpZiAobmF0aXZlQXJjaGl0ZWN0dXJlKCkgIT0gJGFyY2hzKSB7Cisg ICAgaWYgKG5hdGl2ZUFyY2hpdGVjdHVyZSgkbmF0aXZlVGFyZ2V0LCAkbmF0aXZlUG9ydCkgbmUg JGFyY2hzKSB7CiAgICAgICAgIHB1c2goQGpzY1N0cmVzc0RyaXZlckNtZCwgIi0tZm9yY2UtYXJj aGl0ZWN0dXJlIik7CiAgICAgICAgIHB1c2goQGpzY1N0cmVzc0RyaXZlckNtZCwgJGFyY2hzKTsK ICAgICB9CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiAyNjM2OTMpCisrKyBUb29scy9T Y3JpcHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcgY29weSkKQEAgLTEyOCw3ICsxMjgsNyBAQCB1 c2UgY29uc3RhbnQgSU9TX0RFVkVMT1BNRU5UX0NFUlRJRklDQVRFCiBvdXIgQEVYUE9SVF9PSzsK IAogbXkgJGFyY2hpdGVjdHVyZTsKLW15ICRuYXRpdmVBcmNoaXRlY3R1cmU7CitteSAlbmF0aXZl QXJjaGl0ZWN0dXJlTWFwID0gKCk7CiBteSAkYXNhbklzRW5hYmxlZDsKIG15ICRmb3JjZU9wdGlt aXphdGlvbkxldmVsOwogbXkgJGNvdmVyYWdlSXNFbmFibGVkOwpAQCAtMzUxLDE4ICszNTEsMjgg QEAgc3ViIGRldGVybWluZUNvbmZpZ3VyYXRpb24KICAgICB9CiB9CiAKLXN1YiBkZXRlcm1pbmVO YXRpdmVBcmNoaXRlY3R1cmUKK3N1YiBkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1cmUoOyQkKQog ewotICAgIHJldHVybiBpZiBkZWZpbmVkICRuYXRpdmVBcmNoaXRlY3R1cmU7Ci0gICAgJG5hdGl2 ZUFyY2hpdGVjdHVyZSA9IGB1bmFtZSAtbWA7Ci0gICAgY2hvbXAgJG5hdGl2ZUFyY2hpdGVjdHVy ZTsKLSAgICAkbmF0aXZlQXJjaGl0ZWN0dXJlID0gIng4Nl82NCIgaWYgKG5vdCBkZWZpbmVkICRu YXRpdmVBcmNoaXRlY3R1cmUpOworICAgIG15ICgkdGFyZ2V0LCAkcG9ydCkgPSBAXzsKKyAgICAk dGFyZ2V0ID0gJycgaWYgKHVuZGVmICR0YXJnZXQgfHwgISR0YXJnZXQpOworICAgICRwb3J0ID0g MCBpZiAodW5kZWYgJHBvcnQgfHwgISRwb3J0KTsKKyAgICByZXR1cm4gaWYgZGVmaW5lZCAkbmF0 aXZlQXJjaGl0ZWN0dXJlTWFweyIkdGFyZ2V0OiRwb3J0In07CisKKyAgICBteSAkb3V0cHV0Owor ICAgIGlmICgkdGFyZ2V0IGVxICcnKSB7CisgICAgICAgICRvdXRwdXQgPSBgdW5hbWUgLW1gOwor ICAgIH0gZWxzZSB7CisgICAgICAgICRvdXRwdXQgPSBgc3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0 aW9uRm9yTG9jYWxob3N0PXllcyAtcCAkcG9ydCAkdGFyZ2V0ICd1bmFtZSAgLW0nYDsKKyAgICB9 CisgICAgY2hvbXAgJG91dHB1dDsKKyAgICAkb3V0cHV0ID0gIng4Nl82NCIgaWYgKG5vdCBkZWZp bmVkICRvdXRwdXQpOwogCiAgICAgIyBGSVhNRTogUmVtb3ZlIHRoaXMgd2hlbiA8cmRhcjovL3By b2JsZW0vNjQyMDg1MzI+IGlzIHJlc29sdmVkCi0gICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgp ICYmICRuYXRpdmVBcmNoaXRlY3R1cmUgbmUgIng4Nl82NCIpIHsKLSAgICAgICAgJG5hdGl2ZUFy Y2hpdGVjdHVyZSA9ICJhcm02NCI7CisgICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpICYmICRv dXRwdXQgbmUgIng4Nl82NCIpIHsKKyAgICAgICAgJG91dHB1dCA9ICJhcm02NCI7CiAgICAgfQot ICAgIGRpZSAiJ2FybTY0ZScgaXMgYW4gaW52YWxpZCBuYXRpdmUgYXJjaGl0ZWN0dXJlIiBpZiAk bmF0aXZlQXJjaGl0ZWN0dXJlIGVxICJhcm02NGUiOworICAgIGRpZSAiJ2FybTY0ZScgaXMgYW4g aW52YWxpZCBuYXRpdmUgYXJjaGl0ZWN0dXJlIiBpZiAkb3V0cHV0IGVxICJhcm02NGUiOworICAg ICRuYXRpdmVBcmNoaXRlY3R1cmVNYXB7IiR0YXJnZXQ6JHBvcnQifSA9ICRvdXRwdXQ7CiB9CiAK IHN1YiBkZXRlcm1pbmVBcmNoaXRlY3R1cmUKQEAgLTM3MSw4ICszODEsNyBAQCBzdWIgZGV0ZXJt aW5lQXJjaGl0ZWN0dXJlCiAKICAgICBkZXRlcm1pbmVCYXNlUHJvZHVjdERpcigpOwogICAgIGRl dGVybWluZVhjb2RlU0RLKCk7Ci0gICAgZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKCk7Ci0g ICAgJGFyY2hpdGVjdHVyZSA9ICRuYXRpdmVBcmNoaXRlY3R1cmU7CisgICAgJGFyY2hpdGVjdHVy ZSA9IG5hdGl2ZUFyY2hpdGVjdHVyZSgpOwogCiAgICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgp KSB7CiAgICAgICAgIGlmIChvcGVuIEFSQ0hJVEVDVFVSRSwgIiRiYXNlUHJvZHVjdERpci9BcmNo aXRlY3R1cmUiKSB7CkBAIC0xMDUxLDEwICsxMDYwLDE0IEBAIHN1YiBwYXNzZWRBcmNoaXRlY3R1 cmUKICAgICByZXR1cm4gJHBhc3NlZEFyY2hpdGVjdHVyZTsKIH0KIAotc3ViIG5hdGl2ZUFyY2hp dGVjdHVyZSgpCitzdWIgbmF0aXZlQXJjaGl0ZWN0dXJlKDskJCkKIHsKLSAgICBkZXRlcm1pbmVO YXRpdmVBcmNoaXRlY3R1cmUoKTsKLSAgICByZXR1cm4gJG5hdGl2ZUFyY2hpdGVjdHVyZTsKKyAg ICBkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1cmUoQF8pOworCisgICAgbXkgKCR0YXJnZXQsICRw b3J0KSA9IEBfOworICAgICR0YXJnZXQgPSAnJyBpZiAodW5kZWYgJHRhcmdldCB8fCAhJHRhcmdl dCk7CisgICAgJHBvcnQgPSAwIGlmICh1bmRlZiAkcG9ydCB8fCAhJHBvcnQpOworICAgIHJldHVy biAkbmF0aXZlQXJjaGl0ZWN0dXJlTWFweyIkdGFyZ2V0OiRwb3J0In07CiB9CiAKIHN1YiBhcmNo aXRlY3R1cmUoKQo= 403132 2020-06-29 16:13:02 -0700 2020-06-29 17:03:00 -0700 Patch bug-213727-20200629161301.patch text/plain 6875 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MzY5MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA2LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cGVybF0gbmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmVlZHMgdG8g c3VwcG9ydCByZW1vdGUgZGV2aWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEzNzI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDg5MjAyMT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzOiBEZXRlcm1pbmUgdGhlIG1hY2hpbmUgYWN0dWFs bHkgcnVubmluZyB0ZXN0cyBhbmQgcGFzcworICAgICAgICB0aGF0IHRvIG5hdGl2ZUFyY2hpdGVj dHVyZSguLi4pLgorICAgICAgICAocnVuVGVzdCk6IFBhc3MgbmF0aXZlVGFyZ2V0IGFuZCBuYXRp dmVQb3J0LgorICAgICAgICAocnVuSlNDU3RyZXNzVGVzdHMpOiBEaXR0by4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1 cmUpOiBOYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGRlcGVuZGVudCBvbiB0aGUgdGFyZ2V0IGRldmlj ZS4KKyAgICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6IENhbGwgbmF0aXZlQXJjaGl0ZWN0 dXJlKCkgaW5zdGVhZCBvZiBhY2Nlc3NpbmcgdGhlIHZhcmlhYmxlIGRpcmVjdGx5LgorICAgICAg ICAobmF0aXZlQXJjaGl0ZWN0dXJlKTogRW5zdXJlIHRoYXQgd2UgcmV0dXJuIG9ubHkgdGhlIGFy Y2hpdGVjdHVyZSBvZiB0aGUgc3BlY2lmaWVkIHRhcmdldC4KKwogMjAyMC0wNi0yOSAgV2Vuc29u IEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBlZGl0aW5n L3NlbGVjdGlvbi9pb3Mvc2VsZWN0LXRleHQtYWZ0ZXItY2hhbmdpbmctZm9jdXMuaHRtbCBzb21l dGltZXMgZmFpbHMKSW5kZXg6IFRvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3Rz Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCShy ZXZpc2lvbiAyNjM2OTMpCisrKyBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0 cwkod29ya2luZyBjb3B5KQpAQCAtNDg2LDE3ICs0ODYsMzggQEAgaWYgKCRzaG93SGVscCkgewog CiBzZXRDb25maWd1cmF0aW9uUHJvZHVjdERpcihDd2Q6OmFic19wYXRoKCRyb290KSkgaWYgKGRl ZmluZWQoJHJvb3QpKTsKIG15ICRhcmNoc0luQnVpbGQgPSBhcmNoaXRlY3R1cmVzRm9yUHJvZHVj dHMoKTsKKworbXkgJG5hdGl2ZVRhcmdldCA9ICIiOworbXkgJG5hdGl2ZVBvcnQgPSAwOworJG5h dGl2ZVRhcmdldCA9ICRyZW1vdGVIb3N0IGlmICgkcmVtb3RlSG9zdCk7CitpZiAoZGVmaW5lZCAk cmVtb3RlQ29uZmlnRmlsZSkgeworICAgIG9wZW4gbXkgJGhhbmRsZSwgJzwnLCAkcmVtb3RlQ29u ZmlnRmlsZSBvciBkaWUgIkZhaWxlZCB0byBvcGVuICRyZW1vdGVDb25maWdGaWxlOiAkISI7Cisg ICAgbXkgJGNvbmZpZ0pzb24gPSBkbyB7IGxvY2FsICQvOyA8JGhhbmRsZT4gfTsKKyAgICBteSAk cmVtb3RlQ29uZmlnID0gZGVjb2RlX2pzb24oJGNvbmZpZ0pzb24pOworICAgIGlmIChkZWZpbmVk ICRyZW1vdGVDb25maWctPnsicmVtb3RlcyJ9KSB7CisgICAgICAgIG15ICRyZW1vdGVzID0gJHJl bW90ZUNvbmZpZy0+eyJyZW1vdGVzIn07CisgICAgICAgIG15IEBzcGxpdCA9IHNwbGl0KCc6Jywg QCRyZW1vdGVzWzBdLT57ImFkZHJlc3MifSk7CisgICAgICAgICRuYXRpdmVUYXJnZXQgPSAkc3Bs aXRbMF07CisgICAgICAgICRuYXRpdmVQb3J0ID0gJHNwbGl0WzFdIGlmIHNjYWxhcihAc3BsaXQp ID4gMTsKKyAgICB9IGVsc2lmIChkZWZpbmVkICRyZW1vdGVDb25maWctPnsicmVtb3RlIn0pIHsK KyAgICAgICAgbXkgQHNwbGl0ID0gc3BsaXQoJzonLCAkcmVtb3RlQ29uZmlnLT57InJlbW90ZSJ9 KTsKKyAgICAgICAgJG5hdGl2ZVRhcmdldCA9ICRzcGxpdFswXTsKKyAgICAgICAgJG5hdGl2ZVBv cnQgPSAkc3BsaXRbMV0gaWYgc2NhbGFyKEBzcGxpdCkgPiAxOworICAgIH0KK30KKyRuYXRpdmVQ b3J0ID0gMjIgaWYgJG5hdGl2ZVRhcmdldCAmJiAhJG5hdGl2ZVBvcnQ7CisKIGlmIChkZWZpbmVk ICRhcmNocykgewogICAgIGRpZSAiJGFyY2hzIG5vdCBzdXBwb3J0ZWQgYnkgdGhlIHByb3ZpZGVk IGJpbmFyeSwgd2hpY2ggc3VwcG9ydHMgJyRhcmNoc0luQnVpbGQnIiBpZiBpbmRleCgkYXJjaHNJ bkJ1aWxkLCAkYXJjaHMpID09IC0xOwogfSBlbHNlIHsKICAgICAjIEZhbGxiYWNrIGlzIHg4Nl82 NCwgd2hpY2ggd2UgcmVwbGFjZSB3aXRoIHRoZSBuYXRpdmUgYXJjaGl0ZWN0dXJlIGlmIHRoZSBu YXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGluIHRoZSBwcm92aWRlZCBidWlsZAogICAgICRhcmNocyA9 ICJ4ODZfNjQiOwotICAgICRhcmNocyA9IG5hdGl2ZUFyY2hpdGVjdHVyZSgpIGlmIGluZGV4KCRh cmNoc0luQnVpbGQsIG5hdGl2ZUFyY2hpdGVjdHVyZSgpKSAhPSAtMTsKKyAgICAkYXJjaHMgPSBu YXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQpIGlmICghaXNBcHBs ZU1hY1dlYktpdCgpIHx8IGluZGV4KCRhcmNoc0luQnVpbGQsIG5hdGl2ZUFyY2hpdGVjdHVyZSgk bmF0aXZlVGFyZ2V0LCAkbmF0aXZlUG9ydCkpICE9IC0xKTsKIH0KIAogIyBGb3IgcnVubmluZyB0 ZXN0cywgYXJtNjRlIHNob3VsZCBtYXAgdG8gYXJtNjQKICRhcmNocyA9ICJhcm02NCIgaWYgJGFy Y2hzIGVxICJhcm02NGUiOwotaWYgKCRhcmNocyBuZSBuYXRpdmVBcmNoaXRlY3R1cmUoKSAmJiAo bmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmUgImFybTY0IiB8fCAhaXNBcHBsZU1hY1dlYktpdCgpKSkg eworaWYgKCRhcmNocyBuZSBuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2 ZVBvcnQpICYmIChuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQp IG5lICJhcm02NCIgfHwgIWlzQXBwbGVNYWNXZWJLaXQoKSkpIHsKICAgICBkaWUgIkNhbm5vdCBy dW4gdGVzdHMgd2l0aCAkYXJjaHMgb24gdGhpcyBtYWNoaW5lIjsKIH0KIApAQCAtNTY4LDcgKzU4 OSw3IEBAIHN1YiBydW5UZXN0IHsKICAgICBjaGRpcigkcHJvZHVjdERpcikgb3IgZGllICJGYWls ZWQgdG8gc3dpdGNoIGRpcmVjdG9yeSB0byAnJHByb2R1Y3REaXInXG4iOwogICAgIG15IEBjb21t YW5kID0gKHRlc3RQYXRoKCRwcm9kdWN0RGlyLCAkdGVzdE5hbWUpKTsKICAgICB1bnNoaWZ0IEBj b21tYW5kLCAoInhjcnVuIiwgIi1zZGsiLCB4Y29kZVNESygpLCAic2ltIikgaWYgd2lsbFVzZUlP U1NpbXVsYXRvclNESygpOwotICAgIHVuc2hpZnQgQGNvbW1hbmQsICgiL3Vzci9iaW4vYXJjaCIs ICItJGFyY2hzIikgaWYgJGFyY2hzIG5lIG5hdGl2ZUFyY2hpdGVjdHVyZSgpOworICAgIHVuc2hp ZnQgQGNvbW1hbmQsICgiL3Vzci9iaW4vYXJjaCIsICItJGFyY2hzIikgaWYgJGFyY2hzIG5lIG5h dGl2ZUFyY2hpdGVjdHVyZSgkbmF0aXZlVGFyZ2V0LCAkbmF0aXZlUG9ydCk7CiAgICAgdW5zaGlm dCBAY29tbWFuZCwgd3JhcHBlclByZWZpeElmTmVlZGVkKCkgaWYgaXNHdGsoKSBvciBpc1dQRSgp OwogCiAgICAgaWYgKCRlbnZWYXJzIG5lICIiKSB7CkBAIC03MzIsNyArNzUzLDcgQEAgc3ViIHJ1 bkpTQ1N0cmVzc1Rlc3RzCiAgICAgICAgICIvdXNyL2Jpbi9lbnYiLCAicnVieSIsICJUb29scy9T Y3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzIiwKICAgICAgICAgIi1qIiwganNjUGF0aCgkcHJv ZHVjdERpciksICItbyIsICRqc2NTdHJlc3NSZXN1bHRzRGlyLCAiLS1hcmNoIiwgJGFyY2hzKTsK IAotICAgIGlmIChuYXRpdmVBcmNoaXRlY3R1cmUoKSAhPSAkYXJjaHMpIHsKKyAgICBpZiAobmF0 aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVUYXJnZXQsICRuYXRpdmVQb3J0KSBuZSAkYXJjaHMpIHsK ICAgICAgICAgcHVzaChAanNjU3RyZXNzRHJpdmVyQ21kLCAiLS1mb3JjZS1hcmNoaXRlY3R1cmUi KTsKICAgICAgICAgcHVzaChAanNjU3RyZXNzRHJpdmVyQ21kLCAkYXJjaHMpOwogICAgIH0KSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDI2MzY5MykKKysrIFRvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtMTI4LDcgKzEyOCw3IEBAIHVzZSBjb25zdGFu dCBJT1NfREVWRUxPUE1FTlRfQ0VSVElGSUNBVEUKIG91ciBARVhQT1JUX09LOwogCiBteSAkYXJj aGl0ZWN0dXJlOwotbXkgJG5hdGl2ZUFyY2hpdGVjdHVyZTsKK215ICVuYXRpdmVBcmNoaXRlY3R1 cmVNYXAgPSAoKTsKIG15ICRhc2FuSXNFbmFibGVkOwogbXkgJGZvcmNlT3B0aW1pemF0aW9uTGV2 ZWw7CiBteSAkY292ZXJhZ2VJc0VuYWJsZWQ7CkBAIC0zNTEsMTggKzM1MSwzMCBAQCBzdWIgZGV0 ZXJtaW5lQ29uZmlndXJhdGlvbgogICAgIH0KIH0KIAotc3ViIGRldGVybWluZU5hdGl2ZUFyY2hp dGVjdHVyZQorc3ViIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZSg7JCQpCiB7Ci0gICAgcmV0 dXJuIGlmIGRlZmluZWQgJG5hdGl2ZUFyY2hpdGVjdHVyZTsKLSAgICAkbmF0aXZlQXJjaGl0ZWN0 dXJlID0gYHVuYW1lIC1tYDsKLSAgICBjaG9tcCAkbmF0aXZlQXJjaGl0ZWN0dXJlOwotICAgICRu YXRpdmVBcmNoaXRlY3R1cmUgPSAieDg2XzY0IiBpZiAobm90IGRlZmluZWQgJG5hdGl2ZUFyY2hp dGVjdHVyZSk7CisgICAgbXkgKCR0YXJnZXQsICRwb3J0KSA9IEBfOworICAgICR0YXJnZXQgPSAn JyBpZiAhZGVmaW5lZCAkdGFyZ2V0OworICAgICRwb3J0ID0gMCBpZiAhZGVmaW5lZCAkcG9ydDsK KyAgICByZXR1cm4gaWYgZGVmaW5lZCAkbmF0aXZlQXJjaGl0ZWN0dXJlTWFweyIkdGFyZ2V0OiRw b3J0In07CisKKyAgICBteSAkb3V0cHV0OworICAgIGlmICgkdGFyZ2V0IGVxICIiKSB7CisgICAg ICAgIHByaW50KCIgICAgTWFyayBBXG4iKTsKKyAgICAgICAgJG91dHB1dCA9IGB1bmFtZSAtbWA7 CisgICAgfSBlbHNlIHsKKyAgICAgICAgcHJpbnQoIiAgICBNYXJrIEJcbiIpOworICAgICAgICAk b3V0cHV0ID0gYHNzaCAtbyBOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMgLXAg JHBvcnQgJHRhcmdldCAndW5hbWUgIC1tJ2A7CisgICAgfQorICAgIGNob21wICRvdXRwdXQ7Cisg ICAgJG91dHB1dCA9ICJ4ODZfNjQiIGlmIChub3QgZGVmaW5lZCAkb3V0cHV0KTsKIAogICAgICMg RklYTUU6IFJlbW92ZSB0aGlzIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzY0MjA4NTMyPiBpcyByZXNv bHZlZAotICAgIGlmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSAmJiAkbmF0aXZlQXJjaGl0ZWN0dXJl IG5lICJ4ODZfNjQiKSB7Ci0gICAgICAgICRuYXRpdmVBcmNoaXRlY3R1cmUgPSAiYXJtNjQiOwor ICAgIGlmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSAmJiAkb3V0cHV0IG5lICJ4ODZfNjQiKSB7Cisg ICAgICAgICRvdXRwdXQgPSAiYXJtNjQiOwogICAgIH0KLSAgICBkaWUgIidhcm02NGUnIGlzIGFu IGludmFsaWQgbmF0aXZlIGFyY2hpdGVjdHVyZSIgaWYgJG5hdGl2ZUFyY2hpdGVjdHVyZSBlcSAi YXJtNjRlIjsKKyAgICBkaWUgIidhcm02NGUnIGlzIGFuIGludmFsaWQgbmF0aXZlIGFyY2hpdGVj dHVyZSIgaWYgJG91dHB1dCBlcSAiYXJtNjRlIjsKKyAgICAkbmF0aXZlQXJjaGl0ZWN0dXJlTWFw eyIkdGFyZ2V0OiRwb3J0In0gPSAkb3V0cHV0OwogfQogCiBzdWIgZGV0ZXJtaW5lQXJjaGl0ZWN0 dXJlCkBAIC0zNzEsOCArMzgzLDcgQEAgc3ViIGRldGVybWluZUFyY2hpdGVjdHVyZQogCiAgICAg ZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIoKTsKICAgICBkZXRlcm1pbmVYY29kZVNESygpOwotICAg IGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZSgpOwotICAgICRhcmNoaXRlY3R1cmUgPSAkbmF0 aXZlQXJjaGl0ZWN0dXJlOworICAgICRhcmNoaXRlY3R1cmUgPSBuYXRpdmVBcmNoaXRlY3R1cmUo KTsKIAogICAgIGlmIChpc0FwcGxlQ29jb2FXZWJLaXQoKSkgewogICAgICAgICBpZiAob3BlbiBB UkNISVRFQ1RVUkUsICIkYmFzZVByb2R1Y3REaXIvQXJjaGl0ZWN0dXJlIikgewpAQCAtMTA1MSwx MCArMTA2MiwxMyBAQCBzdWIgcGFzc2VkQXJjaGl0ZWN0dXJlCiAgICAgcmV0dXJuICRwYXNzZWRB cmNoaXRlY3R1cmU7CiB9CiAKLXN1YiBuYXRpdmVBcmNoaXRlY3R1cmUoKQorc3ViIG5hdGl2ZUFy Y2hpdGVjdHVyZSg7JCQpCiB7Ci0gICAgZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKCk7Ci0g ICAgcmV0dXJuICRuYXRpdmVBcmNoaXRlY3R1cmU7CisgICAgbXkgKCR0YXJnZXQsICRwb3J0KSA9 IEBfOworICAgICR0YXJnZXQgPSAnJyBpZiAhZGVmaW5lZCAkdGFyZ2V0OworICAgICRwb3J0ID0g MCBpZiAhZGVmaW5lZCAkcG9ydDsKKyAgICBkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1cmUoJHRh cmdldCwgJHBvcnQpOworICAgIHJldHVybiAkbmF0aXZlQXJjaGl0ZWN0dXJlTWFweyIkdGFyZ2V0 OiRwb3J0In07CiB9CiAKIHN1YiBhcmNoaXRlY3R1cmUoKQo= 403141 2020-06-29 17:03:12 -0700 2020-06-29 19:26:17 -0700 Patch bug-213727-20200629170309.patch text/plain 6780 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MzcwOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA2LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cGVybF0gbmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmVlZHMgdG8g c3VwcG9ydCByZW1vdGUgZGV2aWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEzNzI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDg5MjAyMT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzOiBEZXRlcm1pbmUgdGhlIG1hY2hpbmUgYWN0dWFs bHkgcnVubmluZyB0ZXN0cyBhbmQgcGFzcworICAgICAgICB0aGF0IHRvIG5hdGl2ZUFyY2hpdGVj dHVyZSguLi4pLgorICAgICAgICAocnVuVGVzdCk6IFBhc3MgbmF0aXZlVGFyZ2V0IGFuZCBuYXRp dmVQb3J0LgorICAgICAgICAocnVuSlNDU3RyZXNzVGVzdHMpOiBEaXR0by4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1 cmUpOiBOYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGRlcGVuZGVudCBvbiB0aGUgdGFyZ2V0IGRldmlj ZS4KKyAgICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6IENhbGwgbmF0aXZlQXJjaGl0ZWN0 dXJlKCkgaW5zdGVhZCBvZiBhY2Nlc3NpbmcgdGhlIHZhcmlhYmxlIGRpcmVjdGx5LgorICAgICAg ICAobmF0aXZlQXJjaGl0ZWN0dXJlKTogRW5zdXJlIHRoYXQgd2UgcmV0dXJuIG9ubHkgdGhlIGFy Y2hpdGVjdHVyZSBvZiB0aGUgc3BlY2lmaWVkIHRhcmdldC4KKwogMjAyMC0wNi0yOSAgVGV0c3Vo YXJ1IE9oemVraSAgPHRldHN1aGFydS5vaHpla2lAZ21haWwuY29tPgogCiAgICAgICAgIFJlbW92 ZSBFTkFCTEVfU1RSRUFNU19BUEkgY29tcGlsYXRpb24gZmxhZwpJbmRleDogVG9vbHMvU2NyaXB0 cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9y dW4tamF2YXNjcmlwdGNvcmUtdGVzdHMJKHJldmlzaW9uIDI2MzcwOCkKKysrIFRvb2xzL1Njcmlw dHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCSh3b3JraW5nIGNvcHkpCkBAIC00ODYsMTcgKzQ4 NiwzOCBAQCBpZiAoJHNob3dIZWxwKSB7CiAKIHNldENvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyKEN3 ZDo6YWJzX3BhdGgoJHJvb3QpKSBpZiAoZGVmaW5lZCgkcm9vdCkpOwogbXkgJGFyY2hzSW5CdWls ZCA9IGFyY2hpdGVjdHVyZXNGb3JQcm9kdWN0cygpOworCitteSAkbmF0aXZlVGFyZ2V0ID0gIiI7 CitteSAkbmF0aXZlUG9ydCA9IDA7CiskbmF0aXZlVGFyZ2V0ID0gJHJlbW90ZUhvc3QgaWYgKCRy ZW1vdGVIb3N0KTsKK2lmIChkZWZpbmVkICRyZW1vdGVDb25maWdGaWxlKSB7CisgICAgb3BlbiBt eSAkaGFuZGxlLCAnPCcsICRyZW1vdGVDb25maWdGaWxlIG9yIGRpZSAiRmFpbGVkIHRvIG9wZW4g JHJlbW90ZUNvbmZpZ0ZpbGU6ICQhIjsKKyAgICBteSAkY29uZmlnSnNvbiA9IGRvIHsgbG9jYWwg JC87IDwkaGFuZGxlPiB9OworICAgIG15ICRyZW1vdGVDb25maWcgPSBkZWNvZGVfanNvbigkY29u ZmlnSnNvbik7CisgICAgaWYgKGRlZmluZWQgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGVzIn0pIHsK KyAgICAgICAgbXkgJHJlbW90ZXMgPSAkcmVtb3RlQ29uZmlnLT57InJlbW90ZXMifTsKKyAgICAg ICAgbXkgQHNwbGl0ID0gc3BsaXQoJzonLCBAJHJlbW90ZXNbMF0tPnsiYWRkcmVzcyJ9KTsKKyAg ICAgICAgJG5hdGl2ZVRhcmdldCA9ICRzcGxpdFswXTsKKyAgICAgICAgJG5hdGl2ZVBvcnQgPSAk c3BsaXRbMV0gaWYgc2NhbGFyKEBzcGxpdCkgPiAxOworICAgIH0gZWxzaWYgKGRlZmluZWQgJHJl bW90ZUNvbmZpZy0+eyJyZW1vdGUifSkgeworICAgICAgICBteSBAc3BsaXQgPSBzcGxpdCgnOics ICRyZW1vdGVDb25maWctPnsicmVtb3RlIn0pOworICAgICAgICAkbmF0aXZlVGFyZ2V0ID0gJHNw bGl0WzBdOworICAgICAgICAkbmF0aXZlUG9ydCA9ICRzcGxpdFsxXSBpZiBzY2FsYXIoQHNwbGl0 KSA+IDE7CisgICAgfQorfQorJG5hdGl2ZVBvcnQgPSAyMiBpZiAkbmF0aXZlVGFyZ2V0ICYmICEk bmF0aXZlUG9ydDsKKwogaWYgKGRlZmluZWQgJGFyY2hzKSB7CiAgICAgZGllICIkYXJjaHMgbm90 IHN1cHBvcnRlZCBieSB0aGUgcHJvdmlkZWQgYmluYXJ5LCB3aGljaCBzdXBwb3J0cyAnJGFyY2hz SW5CdWlsZCciIGlmIGluZGV4KCRhcmNoc0luQnVpbGQsICRhcmNocykgPT0gLTE7CiB9IGVsc2Ug ewogICAgICMgRmFsbGJhY2sgaXMgeDg2XzY0LCB3aGljaCB3ZSByZXBsYWNlIHdpdGggdGhlIG5h dGl2ZSBhcmNoaXRlY3R1cmUgaWYgdGhlIG5hdGl2ZSBhcmNoaXRlY3R1cmUgaXMgaW4gdGhlIHBy b3ZpZGVkIGJ1aWxkCiAgICAgJGFyY2hzID0gIng4Nl82NCI7Ci0gICAgJGFyY2hzID0gbmF0aXZl QXJjaGl0ZWN0dXJlKCkgaWYgaW5kZXgoJGFyY2hzSW5CdWlsZCwgbmF0aXZlQXJjaGl0ZWN0dXJl KCkpICE9IC0xOworICAgICRhcmNocyA9IG5hdGl2ZUFyY2hpdGVjdHVyZSgkbmF0aXZlVGFyZ2V0 LCAkbmF0aXZlUG9ydCkgaWYgKCFpc0FwcGxlTWFjV2ViS2l0KCkgfHwgaW5kZXgoJGFyY2hzSW5C dWlsZCwgbmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVUYXJnZXQsICRuYXRpdmVQb3J0KSkgIT0g LTEpOwogfQogCiAjIEZvciBydW5uaW5nIHRlc3RzLCBhcm02NGUgc2hvdWxkIG1hcCB0byBhcm02 NAogJGFyY2hzID0gImFybTY0IiBpZiAkYXJjaHMgZXEgImFybTY0ZSI7Ci1pZiAoJGFyY2hzIG5l IG5hdGl2ZUFyY2hpdGVjdHVyZSgpICYmIChuYXRpdmVBcmNoaXRlY3R1cmUoKSBuZSAiYXJtNjQi IHx8ICFpc0FwcGxlTWFjV2ViS2l0KCkpKSB7CitpZiAoJGFyY2hzIG5lIG5hdGl2ZUFyY2hpdGVj dHVyZSgkbmF0aXZlVGFyZ2V0LCAkbmF0aXZlUG9ydCkgJiYgKG5hdGl2ZUFyY2hpdGVjdHVyZSgk bmF0aXZlVGFyZ2V0LCAkbmF0aXZlUG9ydCkgbmUgImFybTY0IiB8fCAhaXNBcHBsZU1hY1dlYktp dCgpKSkgewogICAgIGRpZSAiQ2Fubm90IHJ1biB0ZXN0cyB3aXRoICRhcmNocyBvbiB0aGlzIG1h Y2hpbmUiOwogfQogCkBAIC01NjgsNyArNTg5LDcgQEAgc3ViIHJ1blRlc3QgewogICAgIGNoZGly KCRwcm9kdWN0RGlyKSBvciBkaWUgIkZhaWxlZCB0byBzd2l0Y2ggZGlyZWN0b3J5IHRvICckcHJv ZHVjdERpcidcbiI7CiAgICAgbXkgQGNvbW1hbmQgPSAodGVzdFBhdGgoJHByb2R1Y3REaXIsICR0 ZXN0TmFtZSkpOwogICAgIHVuc2hpZnQgQGNvbW1hbmQsICgieGNydW4iLCAiLXNkayIsIHhjb2Rl U0RLKCksICJzaW0iKSBpZiB3aWxsVXNlSU9TU2ltdWxhdG9yU0RLKCk7Ci0gICAgdW5zaGlmdCBA Y29tbWFuZCwgKCIvdXNyL2Jpbi9hcmNoIiwgIi0kYXJjaHMiKSBpZiAkYXJjaHMgbmUgbmF0aXZl QXJjaGl0ZWN0dXJlKCk7CisgICAgdW5zaGlmdCBAY29tbWFuZCwgKCIvdXNyL2Jpbi9hcmNoIiwg Ii0kYXJjaHMiKSBpZiAkYXJjaHMgbmUgbmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVUYXJnZXQs ICRuYXRpdmVQb3J0KTsKICAgICB1bnNoaWZ0IEBjb21tYW5kLCB3cmFwcGVyUHJlZml4SWZOZWVk ZWQoKSBpZiBpc0d0aygpIG9yIGlzV1BFKCk7CiAKICAgICBpZiAoJGVudlZhcnMgbmUgIiIpIHsK QEAgLTczMiw3ICs3NTMsNyBAQCBzdWIgcnVuSlNDU3RyZXNzVGVzdHMKICAgICAgICAgIi91c3Iv YmluL2VudiIsICJydWJ5IiwgIlRvb2xzL1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMiLAog ICAgICAgICAiLWoiLCBqc2NQYXRoKCRwcm9kdWN0RGlyKSwgIi1vIiwgJGpzY1N0cmVzc1Jlc3Vs dHNEaXIsICItLWFyY2giLCAkYXJjaHMpOwogCi0gICAgaWYgKG5hdGl2ZUFyY2hpdGVjdHVyZSgp ICE9ICRhcmNocykgeworICAgIGlmIChuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwg JG5hdGl2ZVBvcnQpIG5lICRhcmNocykgewogICAgICAgICBwdXNoKEBqc2NTdHJlc3NEcml2ZXJD bWQsICItLWZvcmNlLWFyY2hpdGVjdHVyZSIpOwogICAgICAgICBwdXNoKEBqc2NTdHJlc3NEcml2 ZXJDbWQsICRhcmNocyk7CiAgICAgfQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gMjYz NzA4KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0x MjgsNyArMTI4LDcgQEAgdXNlIGNvbnN0YW50IElPU19ERVZFTE9QTUVOVF9DRVJUSUZJQ0FURQog b3VyIEBFWFBPUlRfT0s7CiAKIG15ICRhcmNoaXRlY3R1cmU7Ci1teSAkbmF0aXZlQXJjaGl0ZWN0 dXJlOworbXkgJW5hdGl2ZUFyY2hpdGVjdHVyZU1hcCA9ICgpOwogbXkgJGFzYW5Jc0VuYWJsZWQ7 CiBteSAkZm9yY2VPcHRpbWl6YXRpb25MZXZlbDsKIG15ICRjb3ZlcmFnZUlzRW5hYmxlZDsKQEAg LTM1MSwxOCArMzUxLDI4IEBAIHN1YiBkZXRlcm1pbmVDb25maWd1cmF0aW9uCiAgICAgfQogfQog Ci1zdWIgZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlCitzdWIgZGV0ZXJtaW5lTmF0aXZlQXJj aGl0ZWN0dXJlKDskJCkKIHsKLSAgICByZXR1cm4gaWYgZGVmaW5lZCAkbmF0aXZlQXJjaGl0ZWN0 dXJlOwotICAgICRuYXRpdmVBcmNoaXRlY3R1cmUgPSBgdW5hbWUgLW1gOwotICAgIGNob21wICRu YXRpdmVBcmNoaXRlY3R1cmU7Ci0gICAgJG5hdGl2ZUFyY2hpdGVjdHVyZSA9ICJ4ODZfNjQiIGlm IChub3QgZGVmaW5lZCAkbmF0aXZlQXJjaGl0ZWN0dXJlKTsKKyAgICBteSAoJHRhcmdldCwgJHBv cnQpID0gQF87CisgICAgJHRhcmdldCA9ICcnIGlmICFkZWZpbmVkICR0YXJnZXQ7CisgICAgJHBv cnQgPSAwIGlmICFkZWZpbmVkICRwb3J0OworICAgIHJldHVybiBpZiBkZWZpbmVkICRuYXRpdmVB cmNoaXRlY3R1cmVNYXB7IiR0YXJnZXQ6JHBvcnQifTsKKworICAgIG15ICRvdXRwdXQ7CisgICAg aWYgKCR0YXJnZXQgZXEgIiIpIHsKKyAgICAgICAgJG91dHB1dCA9IGB1bmFtZSAtbWA7CisgICAg fSBlbHNlIHsKKyAgICAgICAgJG91dHB1dCA9IGBzc2ggLW8gTm9Ib3N0QXV0aGVudGljYXRpb25G b3JMb2NhbGhvc3Q9eWVzIC1wICRwb3J0ICR0YXJnZXQgJ3VuYW1lICAtbSdgOworICAgIH0KKyAg ICBjaG9tcCAkb3V0cHV0OworICAgICRvdXRwdXQgPSAieDg2XzY0IiBpZiAobm90IGRlZmluZWQg JG91dHB1dCk7CiAKICAgICAjIEZJWE1FOiBSZW1vdmUgdGhpcyB3aGVuIDxyZGFyOi8vcHJvYmxl bS82NDIwODUzMj4gaXMgcmVzb2x2ZWQKLSAgICBpZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkgJiYg JG5hdGl2ZUFyY2hpdGVjdHVyZSBuZSAieDg2XzY0IikgewotICAgICAgICAkbmF0aXZlQXJjaGl0 ZWN0dXJlID0gImFybTY0IjsKKyAgICBpZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkgJiYgJG91dHB1 dCBuZSAieDg2XzY0IikgeworICAgICAgICAkb3V0cHV0ID0gImFybTY0IjsKICAgICB9Ci0gICAg ZGllICInYXJtNjRlJyBpcyBhbiBpbnZhbGlkIG5hdGl2ZSBhcmNoaXRlY3R1cmUiIGlmICRuYXRp dmVBcmNoaXRlY3R1cmUgZXEgImFybTY0ZSI7CisgICAgZGllICInYXJtNjRlJyBpcyBhbiBpbnZh bGlkIG5hdGl2ZSBhcmNoaXRlY3R1cmUiIGlmICRvdXRwdXQgZXEgImFybTY0ZSI7CisgICAgJG5h dGl2ZUFyY2hpdGVjdHVyZU1hcHsiJHRhcmdldDokcG9ydCJ9ID0gJG91dHB1dDsKIH0KIAogc3Vi IGRldGVybWluZUFyY2hpdGVjdHVyZQpAQCAtMzcxLDggKzM4MSw3IEBAIHN1YiBkZXRlcm1pbmVB cmNoaXRlY3R1cmUKIAogICAgIGRldGVybWluZUJhc2VQcm9kdWN0RGlyKCk7CiAgICAgZGV0ZXJt aW5lWGNvZGVTREsoKTsKLSAgICBkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1cmUoKTsKLSAgICAk YXJjaGl0ZWN0dXJlID0gJG5hdGl2ZUFyY2hpdGVjdHVyZTsKKyAgICAkYXJjaGl0ZWN0dXJlID0g bmF0aXZlQXJjaGl0ZWN0dXJlKCk7CiAKICAgICBpZiAoaXNBcHBsZUNvY29hV2ViS2l0KCkpIHsK ICAgICAgICAgaWYgKG9wZW4gQVJDSElURUNUVVJFLCAiJGJhc2VQcm9kdWN0RGlyL0FyY2hpdGVj dHVyZSIpIHsKQEAgLTEwNTEsMTAgKzEwNjAsMTMgQEAgc3ViIHBhc3NlZEFyY2hpdGVjdHVyZQog ICAgIHJldHVybiAkcGFzc2VkQXJjaGl0ZWN0dXJlOwogfQogCi1zdWIgbmF0aXZlQXJjaGl0ZWN0 dXJlKCkKK3N1YiBuYXRpdmVBcmNoaXRlY3R1cmUoOyQkKQogewotICAgIGRldGVybWluZU5hdGl2 ZUFyY2hpdGVjdHVyZSgpOwotICAgIHJldHVybiAkbmF0aXZlQXJjaGl0ZWN0dXJlOworICAgIG15 ICgkdGFyZ2V0LCAkcG9ydCkgPSBAXzsKKyAgICAkdGFyZ2V0ID0gJycgaWYgIWRlZmluZWQgJHRh cmdldDsKKyAgICAkcG9ydCA9IDAgaWYgIWRlZmluZWQgJHBvcnQ7CisgICAgZGV0ZXJtaW5lTmF0 aXZlQXJjaGl0ZWN0dXJlKCR0YXJnZXQsICRwb3J0KTsKKyAgICByZXR1cm4gJG5hdGl2ZUFyY2hp dGVjdHVyZU1hcHsiJHRhcmdldDokcG9ydCJ9OwogfQogCiBzdWIgYXJjaGl0ZWN0dXJlKCkK 403160 2020-06-29 19:26:19 -0700 2020-06-30 04:52:06 -0700 Patch bug-213727-20200629192618.patch text/plain 6811 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MzcxOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA2LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0cGVybF0gbmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmVlZHMgdG8g c3VwcG9ydCByZW1vdGUgZGV2aWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEzNzI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NDg5MjAyMT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzOiBEZXRlcm1pbmUgdGhlIG1hY2hpbmUgYWN0dWFs bHkgcnVubmluZyB0ZXN0cyBhbmQgcGFzcworICAgICAgICB0aGF0IHRvIG5hdGl2ZUFyY2hpdGVj dHVyZSguLi4pLgorICAgICAgICAocnVuVGVzdCk6IFBhc3MgbmF0aXZlVGFyZ2V0IGFuZCBuYXRp dmVQb3J0LgorICAgICAgICAocnVuSlNDU3RyZXNzVGVzdHMpOiBEaXR0by4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1 cmUpOiBOYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGRlcGVuZGVudCBvbiB0aGUgdGFyZ2V0IGRldmlj ZS4KKyAgICAgICAgKGRldGVybWluZUFyY2hpdGVjdHVyZSk6IENhbGwgbmF0aXZlQXJjaGl0ZWN0 dXJlKCkgaW5zdGVhZCBvZiBhY2Nlc3NpbmcgdGhlIHZhcmlhYmxlIGRpcmVjdGx5LgorICAgICAg ICAobmF0aXZlQXJjaGl0ZWN0dXJlKTogRW5zdXJlIHRoYXQgd2UgcmV0dXJuIG9ubHkgdGhlIGFy Y2hpdGVjdHVyZSBvZiB0aGUgc3BlY2lmaWVkIHRhcmdldC4KKwogMjAyMC0wNi0yOSAgSm9uYXRo YW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgW1Rlc3RFeHBlY3RhdGlv bnNdIFJlbW92ZSAtLWNzdiBvcHRpb24KSW5kZXg6IFRvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3Jp cHRjb3JlLXRlc3RzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRj b3JlLXRlc3RzCShyZXZpc2lvbiAyNjM3MTgpCisrKyBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2Ny aXB0Y29yZS10ZXN0cwkod29ya2luZyBjb3B5KQpAQCAtNDg2LDE3ICs0ODYsMzggQEAgaWYgKCRz aG93SGVscCkgewogCiBzZXRDb25maWd1cmF0aW9uUHJvZHVjdERpcihDd2Q6OmFic19wYXRoKCRy b290KSkgaWYgKGRlZmluZWQoJHJvb3QpKTsKIG15ICRhcmNoc0luQnVpbGQgPSBhcmNoaXRlY3R1 cmVzRm9yUHJvZHVjdHMoKTsKKworbXkgJG5hdGl2ZVRhcmdldCA9ICIiOworbXkgJG5hdGl2ZVBv cnQgPSAwOworJG5hdGl2ZVRhcmdldCA9ICRyZW1vdGVIb3N0IGlmICgkcmVtb3RlSG9zdCk7Citp ZiAoZGVmaW5lZCAkcmVtb3RlQ29uZmlnRmlsZSkgeworICAgIG9wZW4gbXkgJGhhbmRsZSwgJzwn LCAkcmVtb3RlQ29uZmlnRmlsZSBvciBkaWUgIkZhaWxlZCB0byBvcGVuICRyZW1vdGVDb25maWdG aWxlOiAkISI7CisgICAgbXkgJGNvbmZpZ0pzb24gPSBkbyB7IGxvY2FsICQvOyA8JGhhbmRsZT4g fTsKKyAgICBteSAkcmVtb3RlQ29uZmlnID0gZGVjb2RlX2pzb24oJGNvbmZpZ0pzb24pOworICAg IGlmIChkZWZpbmVkICRyZW1vdGVDb25maWctPnsicmVtb3RlcyJ9KSB7CisgICAgICAgIG15ICRy ZW1vdGVzID0gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGVzIn07CisgICAgICAgIG15IEBzcGxpdCA9 IHNwbGl0KCc6JywgQCRyZW1vdGVzWzBdLT57ImFkZHJlc3MifSk7CisgICAgICAgICRuYXRpdmVU YXJnZXQgPSAkc3BsaXRbMF07CisgICAgICAgICRuYXRpdmVQb3J0ID0gJHNwbGl0WzFdIGlmIHNj YWxhcihAc3BsaXQpID4gMTsKKyAgICB9IGVsc2lmIChkZWZpbmVkICRyZW1vdGVDb25maWctPnsi cmVtb3RlIn0pIHsKKyAgICAgICAgbXkgQHNwbGl0ID0gc3BsaXQoJzonLCAkcmVtb3RlQ29uZmln LT57InJlbW90ZSJ9KTsKKyAgICAgICAgJG5hdGl2ZVRhcmdldCA9ICRzcGxpdFswXTsKKyAgICAg ICAgJG5hdGl2ZVBvcnQgPSAkc3BsaXRbMV0gaWYgc2NhbGFyKEBzcGxpdCkgPiAxOworICAgIH0K K30KKyRuYXRpdmVQb3J0ID0gMjIgaWYgJG5hdGl2ZVRhcmdldCAmJiAhJG5hdGl2ZVBvcnQ7CisK IGlmIChkZWZpbmVkICRhcmNocykgewogICAgIGRpZSAiJGFyY2hzIG5vdCBzdXBwb3J0ZWQgYnkg dGhlIHByb3ZpZGVkIGJpbmFyeSwgd2hpY2ggc3VwcG9ydHMgJyRhcmNoc0luQnVpbGQnIiBpZiBp bmRleCgkYXJjaHNJbkJ1aWxkLCAkYXJjaHMpID09IC0xOwogfSBlbHNlIHsKICAgICAjIEZhbGxi YWNrIGlzIHg4Nl82NCwgd2hpY2ggd2UgcmVwbGFjZSB3aXRoIHRoZSBuYXRpdmUgYXJjaGl0ZWN0 dXJlIGlmIHRoZSBuYXRpdmUgYXJjaGl0ZWN0dXJlIGlzIGluIHRoZSBwcm92aWRlZCBidWlsZAog ICAgICRhcmNocyA9ICJ4ODZfNjQiOwotICAgICRhcmNocyA9IG5hdGl2ZUFyY2hpdGVjdHVyZSgp IGlmIGluZGV4KCRhcmNoc0luQnVpbGQsIG5hdGl2ZUFyY2hpdGVjdHVyZSgpKSAhPSAtMTsKKyAg ICAkYXJjaHMgPSBuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwgJG5hdGl2ZVBvcnQp IGlmICghaXNBcHBsZU1hY1dlYktpdCgpIHx8IGluZGV4KCRhcmNoc0luQnVpbGQsIG5hdGl2ZUFy Y2hpdGVjdHVyZSgkbmF0aXZlVGFyZ2V0LCAkbmF0aXZlUG9ydCkpICE9IC0xKTsKIH0KIAogIyBG b3IgcnVubmluZyB0ZXN0cywgYXJtNjRlIHNob3VsZCBtYXAgdG8gYXJtNjQKICRhcmNocyA9ICJh cm02NCIgaWYgJGFyY2hzIGVxICJhcm02NGUiOwotaWYgKCRhcmNocyBuZSBuYXRpdmVBcmNoaXRl Y3R1cmUoKSAmJiAobmF0aXZlQXJjaGl0ZWN0dXJlKCkgbmUgImFybTY0IiB8fCAhaXNBcHBsZU1h Y1dlYktpdCgpKSkgeworaWYgKCRhcmNocyBuZSBuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRh cmdldCwgJG5hdGl2ZVBvcnQpICYmIChuYXRpdmVBcmNoaXRlY3R1cmUoJG5hdGl2ZVRhcmdldCwg JG5hdGl2ZVBvcnQpIG5lICJhcm02NCIgfHwgIWlzQXBwbGVNYWNXZWJLaXQoKSkpIHsKICAgICBk aWUgIkNhbm5vdCBydW4gdGVzdHMgd2l0aCAkYXJjaHMgb24gdGhpcyBtYWNoaW5lIjsKIH0KIApA QCAtNTY4LDcgKzU4OSw3IEBAIHN1YiBydW5UZXN0IHsKICAgICBjaGRpcigkcHJvZHVjdERpcikg b3IgZGllICJGYWlsZWQgdG8gc3dpdGNoIGRpcmVjdG9yeSB0byAnJHByb2R1Y3REaXInXG4iOwog ICAgIG15IEBjb21tYW5kID0gKHRlc3RQYXRoKCRwcm9kdWN0RGlyLCAkdGVzdE5hbWUpKTsKICAg ICB1bnNoaWZ0IEBjb21tYW5kLCAoInhjcnVuIiwgIi1zZGsiLCB4Y29kZVNESygpLCAic2ltIikg aWYgd2lsbFVzZUlPU1NpbXVsYXRvclNESygpOwotICAgIHVuc2hpZnQgQGNvbW1hbmQsICgiL3Vz ci9iaW4vYXJjaCIsICItJGFyY2hzIikgaWYgJGFyY2hzIG5lIG5hdGl2ZUFyY2hpdGVjdHVyZSgp OworICAgIHVuc2hpZnQgQGNvbW1hbmQsICgiL3Vzci9iaW4vYXJjaCIsICItJGFyY2hzIikgaWYg JGFyY2hzIG5lIG5hdGl2ZUFyY2hpdGVjdHVyZSgkbmF0aXZlVGFyZ2V0LCAkbmF0aXZlUG9ydCk7 CiAgICAgdW5zaGlmdCBAY29tbWFuZCwgd3JhcHBlclByZWZpeElmTmVlZGVkKCkgaWYgaXNHdGso KSBvciBpc1dQRSgpOwogCiAgICAgaWYgKCRlbnZWYXJzIG5lICIiKSB7CkBAIC03MzIsNyArNzUz LDcgQEAgc3ViIHJ1bkpTQ1N0cmVzc1Rlc3RzCiAgICAgICAgICIvdXNyL2Jpbi9lbnYiLCAicnVi eSIsICJUb29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzIiwKICAgICAgICAgIi1qIiwg anNjUGF0aCgkcHJvZHVjdERpciksICItbyIsICRqc2NTdHJlc3NSZXN1bHRzRGlyLCAiLS1hcmNo IiwgJGFyY2hzKTsKIAotICAgIGlmIChuYXRpdmVBcmNoaXRlY3R1cmUoKSAhPSAkYXJjaHMpIHsK KyAgICBpZiAobmF0aXZlQXJjaGl0ZWN0dXJlKCRuYXRpdmVUYXJnZXQsICRuYXRpdmVQb3J0KSBu ZSAkYXJjaHMpIHsKICAgICAgICAgcHVzaChAanNjU3RyZXNzRHJpdmVyQ21kLCAiLS1mb3JjZS1h cmNoaXRlY3R1cmUiKTsKICAgICAgICAgcHVzaChAanNjU3RyZXNzRHJpdmVyQ21kLCAkYXJjaHMp OwogICAgIH0KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDI2MzcxOCkKKysrIFRvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtMTI4LDcgKzEyOCw3IEBA IHVzZSBjb25zdGFudCBJT1NfREVWRUxPUE1FTlRfQ0VSVElGSUNBVEUKIG91ciBARVhQT1JUX09L OwogCiBteSAkYXJjaGl0ZWN0dXJlOwotbXkgJG5hdGl2ZUFyY2hpdGVjdHVyZTsKK215ICVuYXRp dmVBcmNoaXRlY3R1cmVNYXAgPSAoKTsKIG15ICRhc2FuSXNFbmFibGVkOwogbXkgJGZvcmNlT3B0 aW1pemF0aW9uTGV2ZWw7CiBteSAkY292ZXJhZ2VJc0VuYWJsZWQ7CkBAIC0zNTEsMTggKzM1MSwy OSBAQCBzdWIgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbgogICAgIH0KIH0KIAotc3ViIGRldGVybWlu ZU5hdGl2ZUFyY2hpdGVjdHVyZQorc3ViIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZSg7JCQp CiB7Ci0gICAgcmV0dXJuIGlmIGRlZmluZWQgJG5hdGl2ZUFyY2hpdGVjdHVyZTsKLSAgICAkbmF0 aXZlQXJjaGl0ZWN0dXJlID0gYHVuYW1lIC1tYDsKLSAgICBjaG9tcCAkbmF0aXZlQXJjaGl0ZWN0 dXJlOwotICAgICRuYXRpdmVBcmNoaXRlY3R1cmUgPSAieDg2XzY0IiBpZiAobm90IGRlZmluZWQg JG5hdGl2ZUFyY2hpdGVjdHVyZSk7CisgICAgbXkgKCR0YXJnZXQsICRwb3J0KSA9IEBfOworICAg ICR0YXJnZXQgPSAnJyBpZiAhZGVmaW5lZCAkdGFyZ2V0OworICAgICRwb3J0ID0gMCBpZiAhZGVm aW5lZCAkcG9ydDsKKyAgICByZXR1cm4gaWYgZGVmaW5lZCAkbmF0aXZlQXJjaGl0ZWN0dXJlTWFw eyIkdGFyZ2V0OiRwb3J0In07CisKKyAgICBteSAkb3V0cHV0OworICAgIGlmICgkdGFyZ2V0IGVx ICIiKSB7CisgICAgICAgICRvdXRwdXQgPSBgdW5hbWUgLW1gOworICAgIH0gZWxzZSB7CisgICAg ICAgICRvdXRwdXQgPSBgc3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXll cyAtcCAkcG9ydCAkdGFyZ2V0ICd1bmFtZSAgLW0nYDsKKyAgICB9CisgICAgY2hvbXAgJG91dHB1 dDsKKyAgICAkb3V0cHV0ID0gIng4Nl82NCIgaWYgKG5vdCBkZWZpbmVkICRvdXRwdXQpOwogCiAg ICAgIyBGSVhNRTogUmVtb3ZlIHRoaXMgd2hlbiA8cmRhcjovL3Byb2JsZW0vNjQyMDg1MzI+IGlz IHJlc29sdmVkCi0gICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpICYmICRuYXRpdmVBcmNoaXRl Y3R1cmUgbmUgIng4Nl82NCIpIHsKLSAgICAgICAgJG5hdGl2ZUFyY2hpdGVjdHVyZSA9ICJhcm02 NCI7CisgICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpICYmICRvdXRwdXQgbmUgIng4Nl82NCIp IHsKKyAgICAgICAgJG91dHB1dCA9ICJhcm02NCI7CiAgICAgfQotICAgIGRpZSAiJ2FybTY0ZScg aXMgYW4gaW52YWxpZCBuYXRpdmUgYXJjaGl0ZWN0dXJlIiBpZiAkbmF0aXZlQXJjaGl0ZWN0dXJl IGVxICJhcm02NGUiOworICAgICRvdXRwdXQgPSAiYXJtIiBpZiAkb3V0cHV0IGVxICJhcm12N2wi OworICAgIGRpZSAiJ2FybTY0ZScgaXMgYW4gaW52YWxpZCBuYXRpdmUgYXJjaGl0ZWN0dXJlIiBp ZiAkb3V0cHV0IGVxICJhcm02NGUiOworICAgICRuYXRpdmVBcmNoaXRlY3R1cmVNYXB7IiR0YXJn ZXQ6JHBvcnQifSA9ICRvdXRwdXQ7CiB9CiAKIHN1YiBkZXRlcm1pbmVBcmNoaXRlY3R1cmUKQEAg LTM3MSw4ICszODIsNyBAQCBzdWIgZGV0ZXJtaW5lQXJjaGl0ZWN0dXJlCiAKICAgICBkZXRlcm1p bmVCYXNlUHJvZHVjdERpcigpOwogICAgIGRldGVybWluZVhjb2RlU0RLKCk7Ci0gICAgZGV0ZXJt aW5lTmF0aXZlQXJjaGl0ZWN0dXJlKCk7Ci0gICAgJGFyY2hpdGVjdHVyZSA9ICRuYXRpdmVBcmNo aXRlY3R1cmU7CisgICAgJGFyY2hpdGVjdHVyZSA9IG5hdGl2ZUFyY2hpdGVjdHVyZSgpOwogCiAg ICAgaWYgKGlzQXBwbGVDb2NvYVdlYktpdCgpKSB7CiAgICAgICAgIGlmIChvcGVuIEFSQ0hJVEVD VFVSRSwgIiRiYXNlUHJvZHVjdERpci9BcmNoaXRlY3R1cmUiKSB7CkBAIC0xMDUxLDEwICsxMDYx LDEzIEBAIHN1YiBwYXNzZWRBcmNoaXRlY3R1cmUKICAgICByZXR1cm4gJHBhc3NlZEFyY2hpdGVj dHVyZTsKIH0KIAotc3ViIG5hdGl2ZUFyY2hpdGVjdHVyZSgpCitzdWIgbmF0aXZlQXJjaGl0ZWN0 dXJlKDskJCkKIHsKLSAgICBkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1cmUoKTsKLSAgICByZXR1 cm4gJG5hdGl2ZUFyY2hpdGVjdHVyZTsKKyAgICBteSAoJHRhcmdldCwgJHBvcnQpID0gQF87Cisg ICAgJHRhcmdldCA9ICcnIGlmICFkZWZpbmVkICR0YXJnZXQ7CisgICAgJHBvcnQgPSAwIGlmICFk ZWZpbmVkICRwb3J0OworICAgIGRldGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZSgkdGFyZ2V0LCAk cG9ydCk7CisgICAgcmV0dXJuICRuYXRpdmVBcmNoaXRlY3R1cmVNYXB7IiR0YXJnZXQ6JHBvcnQi fTsKIH0KIAogc3ViIGFyY2hpdGVjdHVyZSgpCg==