211008 2020-04-24 18:54:13 -0700 Make run-safari --ios-simulator work again 2020-04-27 09:05:18 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap darin ddkilzer ews-watchlist jbedard webkit-bug-importer oldest_to_newest 1645514 0 ap 2020-04-24 18:54:13 -0700 run-safari --ios-simulator doesn't work, as it's unable to find simulator runtime. 1645516 1 397535 ap 2020-04-24 19:19:07 -0700 Created attachment 397535 proposed fix 1646024 2 ews-feeder 2020-04-27 09:04:34 -0700 Committed r260758: <https://trac.webkit.org/changeset/260758> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397535. 1646025 3 webkit-bug-importer 2020-04-27 09:05:18 -0700 <rdar://problem/62454387> 397535 2020-04-24 19:19:07 -0700 2020-04-27 09:04:34 -0700 proposed fix run-safari-sim.txt text/plain 12004 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MDY4OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI5IEBACisyMDIwLTA0LTI0ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIE1ha2UgcnVuLXNhZmFyaSAtLWlvcy1zaW11bGF0b3Igd29yayBhZ2Fpbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMDA4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hpbGUgYXQg aXQsIHJlbW92ZWQgYWxsIGRpcmVjdCB1c2VzIG9mIGRldmljZS5wbGlzdCwgYW5kIGFsbCB1c2Ug b2YgRm91bmRhdGlvbi4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbTogU3RvcHBl ZCBleHBvcnRpbmcgdW51c2VkIHNpbXVsYXRvciByZWxhdGVkIGZ1bmN0aW9ucy4gTmV3CisgICAg ICAgIGNvZGUgc2hvdWxkIGJlIHVzaW5nIHdlYmtpdHB5LgorICAgICAgICAoc2ltdWxhdG9yRGV2 aWNlRnJvbUpTT04pOiBIZWxwZXIgZnVuY3Rpb24gZm9yIHBhcnNpbmcgc2ltY3RsIG91dHB1dC4K KyAgICAgICAgKGlPU1NpbXVsYXRvckRldmljZXMpOiBVc2Ugc2ltY3RsIGluc3RlYWQgb2YgcmVh ZGluZyBkZXZpY2UucGxpc3QuCisgICAgICAgIChjcmVhdGVpT1NTaW11bGF0b3JEZXZpY2UpOiBE ZXZpY2UgY3JlYXRpb24gYXBwZWFycyB0byBiZSBzeW5jaHJvbm91cywgSSBjb3VsZG4ndAorICAg ICAgICBmaW5kIGFueSByZWFzb24gZm9yIHdhaXRpbmcgYW5kIHJldHJ5aW5nLgorICAgICAgICAo aW9zU2ltdWxhdG9yQXBwbGljYXRpb25zUGF0aCk6IFRoaXMgaXMgcGFydCBvZiB0aGUgYWN0dWFs IGZpeCAtIHJ1bnRpbWUgcGF0aCBidWlsdAorICAgICAgICBoZXJlIHdhcyBpbmNvcnJlY3Q7IHN3 aXRjaGVkIHRvIG9uZSBwcm92aWRlZCBieSBzaW1jdGwuCisgICAgICAgIChzaHV0RG93bklPU1Np bXVsYXRvckRldmljZSk6IEFkZGVkIGFuIGVhcmx5IHJldHVybiB0byBhdm9pZCBzdGRlcnIgc3Bl dy4KKyAgICAgICAgKHJlbGF1bmNoSU9TU2ltdWxhdG9yKTogQW5vdGhlciBwYXJ0IG9mIHRoZSBh Y3R1YWwgZml4OiBvcGVuIFNpbXVsYXRvci5hcHAgYmVmb3JlIGJvb3RpbmcgdGhlCisgICAgICAg IHNpbXVsYXRvciB0byBoYXZlIGl0IHZpc2libGU7IEN1cnJlbnREZXZpY2VVRElEIGRvZXNuJ3Qg d29yay4KKyAgICAgICAgKGlvc1NpbXVsYXRvckRldmljZUJ5VURJRCk6IFN0b3AgdXNpbmcgZGV2 aWNlLnBsaXN0LgorICAgICAgICAocnVuSU9TV2ViS2l0QXBwSW5TaW11bGF0b3IpOiBTdG9wIHF1 aXR0aW5nIFNpbXVsYXRvci5hcHAsIHdlIG9ubHkgbmVlZGVkIHRvIHNodXQgZG93bgorICAgICAg ICB0aGUgZGV2aWNlLgorICAgICAgICAoaU9TU2ltdWxhdG9yRGV2aWNlc1BhdGgpOiBEZWxldGVk LgorICAgICAgICAocXVpdElPU1NpbXVsYXRvcik6IERlbGV0ZWQuCisKIDIwMjAtMDQtMjQgIEFs ZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdS RVNTSU9OKDI2MDQ4NSkgUGF5bWVudCByZXF1ZXN0cyBkb24ndCBkbyBhbnl0aGluZwpJbmRleDog VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv d2Via2l0ZGlycy5wbQkocmV2aXNpb24gMjYwNTczKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRk aXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC00Miw2ICs0Miw3IEBAIHVzZSBGaWxlOjpQYXRoIHF3 KG1ha2VfcGF0aCBta3BhdGggcm10cmUKIHVzZSBGaWxlOjpTcGVjOwogdXNlIEZpbGU6OlRlbXAg cXcodGVtcGRpcik7CiB1c2UgRmlsZTo6c3RhdDsKK3VzZSBKU09OOjpQUDsKIHVzZSBMaXN0OjpV dGlsOwogdXNlIFBPU0lYOwogdXNlIFRpbWU6OkhpUmVzIHF3KHVzbGVlcCk7CkBAIC03MCwxNyAr NzEsMTIgQEAgQkVHSU4gewogICAgICAgICZkZWJ1Z1NhZmFyaQogICAgICAgICZleGVjdXRhYmxl UHJvZHVjdERpcgogICAgICAgICZleHRyYWN0Tm9uSG9zdENvbmZpZ3VyYXRpb24KLSAgICAgICAm ZmluZE9yQ3JlYXRlU2ltdWxhdG9yRm9ySU9TRGV2aWNlCi0gICAgICAgJmlvc1NpbXVsYXRvckRl dmljZUJ5TmFtZQogICAgICAgICZpb3NWZXJzaW9uCiAgICAgICAgJm5tUGF0aAogICAgICAgICZw YXNzZWRDb25maWd1cmF0aW9uCiAgICAgICAgJnByZXBlbmRUb0Vudmlyb25tZW50VmFyaWFibGVM aXN0CiAgICAgICAgJnByaW50SGVscEFuZEV4aXRGb3JSdW5BbmREZWJ1Z1dlYktpdEFwcElmTmVl ZGVkCiAgICAgICAgJnByb2R1Y3REaXIKLSAgICAgICAmcXVpdElPU1NpbXVsYXRvcgotICAgICAg ICZyZWxhdW5jaElPU1NpbXVsYXRvcgotICAgICAgICZyZXN0YXJ0SU9TU2ltdWxhdG9yRGV2aWNl CiAgICAgICAgJnJ1bklPU1dlYktpdEFwcAogICAgICAgICZydW5NYWNXZWJLaXRBcHAKICAgICAg ICAmc2FmYXJpUGF0aApAQCAtOTMsMTIgKzg5LDEwIEBAIEJFR0lOIHsKICAgICAgICAmc2hhcmVk Q29tbWFuZExpbmVPcHRpb25zVXNhZ2UKICAgICAgICAmc2hvdWxkVXNlRmxhdHBhawogICAgICAg ICZydW5JbkZsYXRwYWsKLSAgICAgICAmc2h1dERvd25JT1NTaW11bGF0b3JEZXZpY2UKICAgICAg ICAmc291cmNlRGlyCiAgICAgICAgJndpbGxVc2VJT1NEZXZpY2VTREsKICAgICAgICAmd2lsbFVz ZUlPU1NpbXVsYXRvclNESwogICAgICAgIERPX05PVF9VU0VfT1BFTl9DT01NQU5ECi0gICAgICAg U0lNVUxBVE9SX0RFVklDRV9TVUZGSVhfRk9SX1dFQktJVF9ERVZFTE9QTUVOVAogICAgICAgIFVT RV9PUEVOX0NPTU1BTkQKICAgICk7CiAgICAlRVhQT1JUX1RBR1MgPSAoICk7CkBAIC0xMjQsOCAr MTE4LDggQEAgdXNlIGNvbnN0YW50IHsKIAogdXNlIGNvbnN0YW50IFVTRV9PUEVOX0NPTU1BTkQg PT4gMTsgIyBVc2VkIGluIHJ1bk1hY1dlYktpdEFwcCgpLgogdXNlIGNvbnN0YW50IERPX05PVF9V U0VfT1BFTl9DT01NQU5EID0+IDI7Ci11c2UgY29uc3RhbnQgU0lNVUxBVE9SX0RFVklDRV9TVEFU RV9TSFVURE9XTiA9PiAiMSI7Ci11c2UgY29uc3RhbnQgU0lNVUxBVE9SX0RFVklDRV9TVEFURV9C T09URUQgPT4gIjMiOwordXNlIGNvbnN0YW50IFNJTVVMQVRPUl9ERVZJQ0VfU1RBVEVfU0hVVERP V04gPT4gIlNodXRkb3duIjsKK3VzZSBjb25zdGFudCBTSU1VTEFUT1JfREVWSUNFX1NUQVRFX0JP T1RFRCA9PiAiQm9vdGVkIjsKIHVzZSBjb25zdGFudCBTSU1VTEFUT1JfREVWSUNFX1NVRkZJWF9G T1JfV0VCS0lUX0RFVkVMT1BNRU5UICA9PiAiRm9yIFdlYktpdCBEZXZlbG9wbWVudCI7CiAKICMg U2VlIHRhYmxlICJDZXJ0aWZpY2F0ZSB0eXBlcyBhbmQgbmFtZXMiIG9uIDxodHRwczovL2RldmVs b3Blci5hcHBsZS5jb20vbGlicmFyeS9pb3MvZG9jdW1lbnRhdGlvbi9JREVzL0NvbmNlcHR1YWwv QXBwRGlzdHJpYnV0aW9uR3VpZGUvTWFpbnRhaW5pbmdDZXJ0aWZpY2F0ZXMvTWFpbnRhaW5pbmdD ZXJ0aWZpY2F0ZXMuaHRtbCMvL2FwcGxlX3JlZi9kb2MvdWlkL1RQNDAwMTI1ODItQ0gzMS1TVzQx Pi4KQEAgLTE1MTEsMjcgKzE1MDUsMzUgQEAgc3ViIGlzQXBwbGVXaW5XZWJLaXQoKQogICAgIHJl dHVybiBwb3J0TmFtZSgpIGVxIEFwcGxlV2luOwogfQogCi1zdWIgaU9TU2ltdWxhdG9yRGV2aWNl c1BhdGgKK3N1YiBzaW11bGF0b3JEZXZpY2VGcm9tSlNPTgogewotICAgIHJldHVybiAiJEVOVntI T01FfS9MaWJyYXJ5L0RldmVsb3Blci9Db3JlU2ltdWxhdG9yL0RldmljZXMiOworICAgIG15ICRy dW50aW1lID0gc2hpZnQ7CisgICAgbXkgJGpzb25EZXZpY2UgPSBzaGlmdDsKKworICAgIHJldHVy biB7CisgICAgICAgICJVRElEIiA9PiAkanNvbkRldmljZS0+e3VkaWR9LAorICAgICAgICAibmFt ZSIgPT4gJGpzb25EZXZpY2UtPntuYW1lfSwKKyAgICAgICAgInJ1bnRpbWUiID0+ICRydW50aW1l LAorICAgICAgICAic3RhdGUiID0+ICRqc29uRGV2aWNlLT57c3RhdGV9LAorICAgICAgICAiZGV2 aWNlVHlwZSIgPT4gJGpzb25EZXZpY2UtPntkZXZpY2VUeXBlSWRlbnRpZmllcn0KKyAgICB9Owog fQogCiBzdWIgaU9TU2ltdWxhdG9yRGV2aWNlcwogewotICAgIGV2YWwgInJlcXVpcmUgRm91bmRh dGlvbiI7Ci0gICAgbXkgJGRldmljZXNQYXRoID0gaU9TU2ltdWxhdG9yRGV2aWNlc1BhdGgoKTsK LSAgICBvcGVuZGlyKERFVklDRVMsICRkZXZpY2VzUGF0aCk7Ci0gICAgbXkgQHVkaWRzID0gZ3Jl cCB7Ci0gICAgICAgICRfID1+IG0vXlswLTlBLUZdezh9LShbMC05QS1GXXs0fS0pezN9WzAtOUEt Rl17MTJ9JC87Ci0gICAgfSByZWFkZGlyKERFVklDRVMpOwotICAgIGNsb3NlKERFVklDRVMpOwot Ci0gICAgIyBGSVhNRTogV2Ugc2hvdWxkIHBhcnNlIHRoZSBkZXZpY2UucGxpc3QgZmlsZSBvdXJz ZWxmIGFuZCBtYXAgdGhlIGRpY3Rpb25hcnkga2V5cyBpbiBpdCB0byBrbm93bgotICAgICMgICAg ICAgIGRpY3Rpb25hcnkga2V5cyBzbyBhcyB0byBkZWNvdXBsZSBvdXIgcmVwcmVzZW50YXRpb24g b2YgdGhlIHBsaXN0IGZyb20gdGhlIGFjdHVhbCBzdHJ1Y3R1cmUKLSAgICAjICAgICAgICBvZiB0 aGUgcGxpc3QsIHdoaWNoIG1heSBjaGFuZ2UuCi0gICAgbXkgQGRldmljZXMgPSBtYXAgewotICAg ICAgICBGb3VuZGF0aW9uOjpwZXJsUmVmRnJvbU9iamVjdFJlZihOU0RpY3Rpb25hcnktPmRpY3Rp b25hcnlXaXRoQ29udGVudHNPZkZpbGVfKCIkZGV2aWNlc1BhdGgvJF8vZGV2aWNlLnBsaXN0Iikp OwotICAgIH0gQHVkaWRzOworICAgIG15ICRvdXRwdXQgPSBgeGNydW4gc2ltY3RsIGxpc3QgZGV2 aWNlcyAtLWpzb25gOworICAgIG15ICRydW50aW1lcyA9IGRlY29kZV9qc29uKCRvdXRwdXQpLT57 ZGV2aWNlc307CisgICAgaWYgKCEkcnVudGltZXMpIHsKKyAgICAgICAgZGllICJObyBzaW11bGF0 b3IgZGV2aWNlcyBmb3VuZCI7CisgICAgfQorCisgICAgbXkgQGRldmljZXMgPSAoKTsKKyAgICB3 aGlsZSAoKG15ICRydW50aW1lLCBteSAkZGV2aWNlc0ZvclJ1bnRpbWUpID0gZWFjaCAlJHJ1bnRp bWVzKSB7CisgICAgICAgIGZvcmVhY2ggbXkgJGpzb25EZXZpY2UgKEAkZGV2aWNlc0ZvclJ1bnRp bWUpIHsKKyAgICAgICAgICAgIG5leHQgaWYgJGpzb25EZXZpY2UtPnthdmFpbGFiaWxpdHlFcnJv cn07CisgICAgICAgICAgICBwdXNoIEBkZXZpY2VzLCBzaW11bGF0b3JEZXZpY2VGcm9tSlNPTigk cnVudGltZSwgJGpzb25EZXZpY2UpOworICAgICAgICB9CisgICAgfQogCiAgICAgcmV0dXJuIEBk ZXZpY2VzOwogfQpAQCAtMTU0NSwxOCArMTU0NywxMiBAQCBzdWIgY3JlYXRlaU9TU2ltdWxhdG9y RGV2aWNlCiAgICAgbXkgJGNyZWF0ZWQgPSBzeXN0ZW0oInhjcnVuIiwgIi0tc2RrIiwgImlwaG9u ZXNpbXVsYXRvciIsICJzaW1jdGwiLCAiY3JlYXRlIiwgJG5hbWUsICRkZXZpY2VUeXBlSWQsICRy dW50aW1lSWQpID09IDA7CiAgICAgZGllICJDb3VsZG4ndCBjcmVhdGUgc2ltdWxhdG9yIGRldmlj ZTogJG5hbWUgJGRldmljZVR5cGVJZCAkcnVudGltZUlkIiBpZiBub3QgJGNyZWF0ZWQ7CiAKLSAg ICBzeXN0ZW0oInhjcnVuIiwgIi0tc2RrIiwgImlwaG9uZXNpbXVsYXRvciIsICJzaW1jdGwiLCAi bGlzdCIpOwotCi0gICAgcHJpbnQgIldhaXRpbmcgZm9yIGRldmljZSB0byBiZSBjcmVhdGVkIC4u LlxuIjsKLSAgICBzbGVlcCA1OwotICAgIGZvciAobXkgJHRyaWVzID0gMDsgJHRyaWVzIDwgNTsg JHRyaWVzKyspewotICAgICAgICBteSBAZGV2aWNlcyA9IGlPU1NpbXVsYXRvckRldmljZXMoKTsK LSAgICAgICAgZm9yZWFjaCBteSAkZGV2aWNlIChAZGV2aWNlcykgewotICAgICAgICAgICAgcmV0 dXJuICRkZXZpY2UgaWYgJGRldmljZS0+e25hbWV9IGVxICRuYW1lIGFuZCAkZGV2aWNlLT57ZGV2 aWNlVHlwZX0gZXEgJGRldmljZVR5cGVJZCBhbmQgJGRldmljZS0+e3J1bnRpbWV9IGVxICRydW50 aW1lSWQ7Ci0gICAgICAgIH0KLSAgICAgICAgc2xlZXAgNTsKKyAgICBteSBAZGV2aWNlcyA9IGlP U1NpbXVsYXRvckRldmljZXMoKTsKKyAgICBmb3JlYWNoIG15ICRkZXZpY2UgKEBkZXZpY2VzKSB7 CisgICAgICAgIHJldHVybiAkZGV2aWNlIGlmICRkZXZpY2UtPntuYW1lfSBlcSAkbmFtZSBhbmQg JGRldmljZS0+e2RldmljZVR5cGV9IGVxICRkZXZpY2VUeXBlSWQgYW5kICRkZXZpY2UtPntydW50 aW1lfSBlcSAkcnVudGltZUlkOwogICAgIH0KLSAgICBkaWUgIkRldmljZSAkbmFtZSAkZGV2aWNl VHlwZUlkICRydW50aW1lSWQgd2Fzbid0IGZvdW5kIGluICIgLiBpT1NTaW11bGF0b3JEZXZpY2Vz UGF0aCgpOworCisgICAgZGllICJEZXZpY2UgJG5hbWUgJGRldmljZVR5cGVJZCAkcnVudGltZUlk IHdhc24ndCBmb3VuZCI7CiB9CiAKIHN1YiB3aWxsVXNlSU9TRGV2aWNlU0RLKCkKQEAgLTI2NDIs MTMgKzI2MzgsMTMgQEAgc3ViIHNldHVwSU9TV2ViS2l0RW52aXJvbm1lbnQoJCkKIAogc3ViIGlv c1NpbXVsYXRvckFwcGxpY2F0aW9uc1BhdGgoKQogewotICAgICMgRklYTUU6IFdlIHNob3VsZCBh c2sgc2ltY3RsIGZvciB0aGlzIGluZm9ybWF0aW9uLCBpbnN0ZWFkIG9mIGd1ZXNzaW5nIGZyb20g YXZhaWxhYmxlIHJ1bnRpbWVzLgotICAgIG15ICRydW50aW1lUGF0aCA9IEZpbGU6OlNwZWMtPmNh dGRpcihzZGtQbGF0Zm9ybURpcmVjdG9yeSgiaXBob25lb3MiKSwgIkxpYnJhcnkiLCAiRGV2ZWxv cGVyIiwgIkNvcmVTaW11bGF0b3IiLCAiUHJvZmlsZXMiLCAiUnVudGltZXMiKTsKLSAgICBvcGVu ZGlyKFJVTlRJTUVTLCAkcnVudGltZVBhdGgpOwotICAgIG15IEBydW50aW1lcyA9IGdyZXAgey8u Klwuc2ltcnVudGltZS99IHJlYWRkaXIoUlVOVElNRVMpOwotICAgIGNsb3NlKFJVTlRJTUVTKTsK LSAgICBteSAkc3VsdCA9IEZpbGU6OlNwZWMtPmNhdGRpcigkcnVudGltZVBhdGgsIEBydW50aW1l cyA/ICRydW50aW1lc1swXSA6ICJpT1Muc2ltcnVudGltZSIsICJDb250ZW50cyIsICJSZXNvdXJj ZXMiLCAiUnVudGltZVJvb3QiLCAiQXBwbGljYXRpb25zIik7Ci0gICAgcmV0dXJuICRzdWx0Owor ICAgIG15ICRvdXRwdXQgPSBgeGNydW4gc2ltY3RsIGxpc3QgcnVudGltZXMgaU9TIC0tanNvbmA7 CisgICAgbXkgJHJ1bnRpbWVzID0gZGVjb2RlX2pzb24oJG91dHB1dCktPntydW50aW1lc307Cisg ICAgaWYgKCEkcnVudGltZXMpIHsKKyAgICAgICAgZGllICJObyBpT1Mgc2ltdWxhdG9yIHJ1bnRp bWVzIGZvdW5kIjsKKyAgICB9CisgICAgbXkgJHJ1bnRpbWVQYXRoID0gQCRydW50aW1lc1swXS0+ e3J1bnRpbWVSb290fTsKKyAgICByZXR1cm4gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRydW50aW1lUGF0 aCwgIkFwcGxpY2F0aW9ucyIpOwogfQogCiBzdWIgaW5zdGFsbGVkTW9iaWxlU2FmYXJpQnVuZGxl KCkKQEAgLTI3MTMsNiArMjcwOSw4IEBAIHN1YiB3YWl0VW50aWxQcm9jZXNzTm90UnVubmluZygk KQogc3ViIHNodXREb3duSU9TU2ltdWxhdG9yRGV2aWNlKCQpCiB7CiAgICAgbXkgKCRzaW11bGF0 b3JEZXZpY2UpID0gQF87CisKKyAgICByZXR1cm4gaWYgJHNpbXVsYXRvckRldmljZS0+e3N0YXRl fSBlcSBTSU1VTEFUT1JfREVWSUNFX1NUQVRFX1NIVVRET1dOOwogICAgIHN5c3RlbSgieGNydW4g LS1zZGsgaXBob25lc2ltdWxhdG9yIHNpbWN0bCBzaHV0ZG93biAkc2ltdWxhdG9yRGV2aWNlLT57 VURJRH0gPiAvZGV2L251bGwgMj4mMSIpOwogfQogCkBAIC0yNzI3LDM2ICsyNzI1LDE4IEBAIHN1 YiByZXN0YXJ0SU9TU2ltdWxhdG9yRGV2aWNlKCQpCiBzdWIgcmVsYXVuY2hJT1NTaW11bGF0b3Io JCkKIHsKICAgICBteSAoJHNpbXVsYXRlZERldmljZSkgPSBAXzsKLSAgICBxdWl0SU9TU2ltdWxh dG9yKCRzaW11bGF0ZWREZXZpY2UtPntVRElEfSk7CisgICAgc2h1dERvd25JT1NTaW11bGF0b3JE ZXZpY2UoJHNpbXVsYXRlZERldmljZSk7CiAKLSAgICAjIEZJWE1FOiA8cmRhcjovL3Byb2JsZW0v MjA5MTYxNDA+IFN3aXRjaCB0byB1c2luZyBDb3JlU2ltdWxhdG9yLmZyYW1ld29yayBmb3IgbGF1 bmNoaW5nIGFuZCBxdWl0dGluZyBpT1MgU2ltdWxhdG9yCiAgICAgY2hvbXAobXkgJGRldmVsb3Bl ckRpcmVjdG9yeSA9ICRFTlZ7REVWRUxPUEVSX0RJUn0gfHwgYHhjb2RlLXNlbGVjdCAtLXByaW50 LXBhdGhgKTsgCi0gICAgbXkgJGlvc1NpbXVsYXRvclBhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxl KCRkZXZlbG9wZXJEaXJlY3RvcnksICJBcHBsaWNhdGlvbnMiLCAiU2ltdWxhdG9yLmFwcCIpOyAK KyAgICBteSAkaW9zU2ltdWxhdG9yUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJGRldmVsb3Bl ckRpcmVjdG9yeSwgIkFwcGxpY2F0aW9ucyIsICJTaW11bGF0b3IuYXBwIik7CisgICAgIyBTaW11 bGF0b3IuYXBwIG5lZWRzIHRvIGJlIHJ1bm5pbmcgYmVmb3JlIHRoZSBzaW11bGF0b3IgaXMgYm9v dGVkIHRvIGhhdmUgaXQgdmlzaWJsZS4KICAgICBzeXN0ZW0oIm9wZW4iLCAiLWEiLCAkaW9zU2lt dWxhdG9yUGF0aCwgIi0tYXJncyIsICItQ3VycmVudERldmljZVVESUQiLCAkc2ltdWxhdGVkRGV2 aWNlLT57VURJRH0pID09IDAgb3IgZGllICJGYWlsZWQgdG8gb3BlbiAkaW9zU2ltdWxhdG9yUGF0 aDogJCEiOyAKKyAgICBzeXN0ZW0oInhjcnVuIiwgInNpbWN0bCIsICJib290IiwgJHNpbXVsYXRl ZERldmljZS0+e1VESUR9KSA9PSAwIG9yIGRpZSAiRmFpbGVkIHRvIGJvb3Qgc2ltdWxhdG9yICRz aW11bGF0ZWREZXZpY2UtPntVRElEfTogJCEiOyAKIAogICAgIHdhaXRVbnRpbElPU1NpbXVsYXRv ckRldmljZUlzSW5TdGF0ZSgkc2ltdWxhdGVkRGV2aWNlLT57VURJRH0sIFNJTVVMQVRPUl9ERVZJ Q0VfU1RBVEVfQk9PVEVEKTsKICAgICB3YWl0VW50aWxQcm9jZXNzTm90UnVubmluZygiY29tLmFw cGxlLmRhdGFtaWdyYXRvciIpOwogfQogCi1zdWIgcXVpdElPU1NpbXVsYXRvcig7JCkKLXsKLSAg ICBteSAoJHdhaXRGb3JTaHV0ZG93bk9mU2ltdWxhdGVkRGV2aWNlVURJRCkgPSBAXzsKLSAgICAj IEZJWE1FOiA8cmRhcjovL3Byb2JsZW0vMjA5MTYxNDA+IFN3aXRjaCB0byB1c2luZyBDb3JlU2lt dWxhdG9yLmZyYW1ld29yayBmb3IgbGF1bmNoaW5nIGFuZCBxdWl0dGluZyBpT1MgU2ltdWxhdG9y Ci0gICAgaWYgKGV4aXRTdGF0dXMoc3lzdGVtIHsib3Nhc2NyaXB0In0gIm9zYXNjcmlwdCIsICIt ZSIsICd0ZWxsIGFwcGxpY2F0aW9uIGlkICJjb20uYXBwbGUuaXBob25lc2ltdWxhdG9yIiB0byBx dWl0JykpIHsKLSAgICAgICAgIyBvc2FzY3JpcHQgcmV0dXJucyBhIG5vbi16ZXJvIGV4aXQgc3Rh dHVzIGlmIFNpbXVsYXRvci5hcHAgaXMgbm90IHJlZ2lzdGVyZWQgaW4gTGF1bmNoU2VydmljZXMu Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBpZiAoIWRlZmluZWQoJHdhaXRGb3JTaHV0 ZG93bk9mU2ltdWxhdGVkRGV2aWNlVURJRCkpIHsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLSAg ICAjIEZJWE1FOiBXZSBhc3N1bWUgdGhhdCAkd2FpdEZvclNodXRkb3duT2ZTaW11bGF0ZWREZXZp Y2VVRElEIHdhcyBub3QgYm9vdGVkIHVzaW5nIHRoZSBzaW1jdGwgY29tbWFuZCBsaW5lIHRvb2wu Ci0gICAgIyAgICAgICAgT3RoZXJ3aXNlIHdlIHdpbGwgc3BpbiBpbmRlZmluaXRlbHkgc2luY2Ug cXVpdGluZyB0aGUgaU9TIFNpbXVsYXRvciB3aWxsIG5vdCBzaHV0ZG93biB0aGlzIGRldmljZS4g V2UKLSAgICAjICAgICAgICBzaG91bGQgYWRkIGEgbWF4aW11bSB0aW1lIGxpbWl0IHRvIHdhaXQg Zm9yIGEgZGV2aWNlIHRvIHNodXRkb3duIGFuZCBlaXRoZXIgcmV0dXJuIGFuIGVycm9yIG9yIGRp ZSgpCi0gICAgIyAgICAgICAgb24gZXhwaXJhdGlvbiBvZiB0aGUgdGltZSBsaW1pdC4KLSAgICB3 YWl0VW50aWxJT1NTaW11bGF0b3JEZXZpY2VJc0luU3RhdGUoJHdhaXRGb3JTaHV0ZG93bk9mU2lt dWxhdGVkRGV2aWNlVURJRCwgU0lNVUxBVE9SX0RFVklDRV9TVEFURV9TSFVURE9XTik7Ci19Ci0K IHN1YiBpb3NTaW11bGF0b3JEZXZpY2VCeU5hbWUoJCkKIHsKICAgICBteSAoJHNpbXVsYXRvck5h bWUpID0gQF87CkBAIC0yNzczLDE1ICsyNzUzLDE2IEBAIHN1YiBpb3NTaW11bGF0b3JEZXZpY2VC eU5hbWUoJCkKIHN1YiBpb3NTaW11bGF0b3JEZXZpY2VCeVVESUQoJCkKIHsKICAgICBteSAoJHNp bXVsYXRlZERldmljZVVESUQpID0gQF87Ci0gICAgbXkgJGRldmljZVBsaXN0UGF0aCA9IEZpbGU6 OlNwZWMtPmNhdGZpbGUoaU9TU2ltdWxhdG9yRGV2aWNlc1BhdGgoKSwgJHNpbXVsYXRlZERldmlj ZVVESUQsICJkZXZpY2UucGxpc3QiKTsKLSAgICBpZiAoIS1mICRkZXZpY2VQbGlzdFBhdGgpIHsK LSAgICAgICAgcmV0dXJuOworCisgICAgbXkgJG91dHB1dCA9IGB4Y3J1biBzaW1jdGwgbGlzdCBk ZXZpY2VzICRzaW11bGF0ZWREZXZpY2VVRElEIC0tanNvbmA7CisgICAgbXkgJHJ1bnRpbWVzID0g ZGVjb2RlX2pzb24oJG91dHB1dCktPntkZXZpY2VzfTsKKworICAgIHdoaWxlICgobXkgJHJ1bnRp bWUsIG15ICRkZXZpY2VzRm9yUnVudGltZSkgPSBlYWNoICUkcnVudGltZXMpIHsKKyAgICAgICAg bmV4dCBpZiBub3QgQCRkZXZpY2VzRm9yUnVudGltZTsKKyAgICAgICAgZGllICJNdWx0aXBsZSBk ZXZpY2VzIGZvdW5kIGZvciBVRElEICRzaW11bGF0ZWREZXZpY2VVRElEOiAkb3V0cHV0IiBpZiBz Y2FsYXIoQCRkZXZpY2VzRm9yUnVudGltZSkgPiAxOworICAgICAgICByZXR1cm4gc2ltdWxhdG9y RGV2aWNlRnJvbUpTT04oJHJ1bnRpbWUsIEAkZGV2aWNlc0ZvclJ1bnRpbWVbMF0pOyAgICAgICAg CiAgICAgfQotICAgICMgRklYTUU6IFdlIHNob3VsZCBwYXJzZSB0aGUgZGV2aWNlLnBsaXN0IGZp bGUgb3Vyc2VsZiBhbmQgbWFwIHRoZSBkaWN0aW9uYXJ5IGtleXMgaW4gaXQgdG8ga25vd24KLSAg ICAjICAgICAgICBkaWN0aW9uYXJ5IGtleXMgc28gYXMgdG8gZGVjb3VwbGUgb3VyIHJlcHJlc2Vu dGF0aW9uIG9mIHRoZSBwbGlzdCBmcm9tIHRoZSBhY3R1YWwgc3RydWN0dXJlCi0gICAgIyAgICAg ICAgb2YgdGhlIHBsaXN0LCB3aGljaCBtYXkgY2hhbmdlLgotICAgIGV2YWwgInJlcXVpcmUgRm91 bmRhdGlvbiI7Ci0gICAgcmV0dXJuIEZvdW5kYXRpb246OnBlcmxSZWZGcm9tT2JqZWN0UmVmKE5T RGljdGlvbmFyeS0+ZGljdGlvbmFyeVdpdGhDb250ZW50c09mRmlsZV8oJGRldmljZVBsaXN0UGF0 aCkpOworICAgIHJldHVybiB1bmRlZjsKIH0KIAogc3ViIGlvc1NpbXVsYXRvclJ1bnRpbWUoKQpA QCAtMjg3MSw3ICsyODUyLDcgQEAgc3ViIHJ1bklPU1dlYktpdEFwcEluU2ltdWxhdG9yKCQ7JCkK ICAgICAgICAgICAgICMgd2FzIHByZXZpb3VzbHkgb3ZlcndyaXR0ZW4gd2l0aCBhIGN1c3RvbSBi dWlsdCB2ZXJzaW9uIG9mIHRoZSBhcHAuCiAgICAgICAgICAgICAjIEZJWE1FOiBPbmx5IHJlc3Rv cmUgdGhlIHN5c3RlbS1pbnN0YWxsZWQgdmVyc2lvbiBvZiB0aGUgYXBwIGluc3RlYWQgb2YgZXJh c2luZyBhbGwgY29udGVudHMgYW5kIHNldHRpbmdzLgogICAgICAgICAgICAgcHJpbnQgIlF1aXR0 aW5nIGlPUyBTaW11bGF0b3IuLi5cbiI7Ci0gICAgICAgICAgICBxdWl0SU9TU2ltdWxhdG9yKCRz aW11bGF0ZWREZXZpY2VVRElEKTsKKyAgICAgICAgICAgIHNodXREb3duSU9TU2ltdWxhdG9yRGV2 aWNlKCRzaW11bGF0ZWREZXZpY2UpOwogICAgICAgICAgICAgcHJpbnQgIkVyYXNpbmcgY29udGVu dHMgYW5kIHNldHRpbmdzIGZvciBzaW11bGF0b3IgZGV2aWNlIFwiJHNpbXVsYXRlZERldmljZS0+ e25hbWV9XCIuXG4iOwogICAgICAgICAgICAgZXhpdFN0YXR1cyhzeXN0ZW0oInhjcnVuIiwgIi0t c2RrIiwgImlwaG9uZXNpbXVsYXRvciIsICJzaW1jdGwiLCAiZXJhc2UiLCAkc2ltdWxhdGVkRGV2 aWNlVURJRCkpID09IDAgb3IgZGllOwogICAgICAgICB9Cg==