224739 2021-04-18 20:16:41 -0700 [WPE] Allow defining custom repo and branch for Cog checkout 2021-04-23 00:38:48 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 lmoura lmoura annulen aperez bugs-noreply ews-watchlist glenn gyuyoung.kim jbedard pnormand ryuan.choi sergio webkit-bug-importer oldest_to_newest 1751667 0 lmoura 2021-04-18 20:16:41 -0700 [WPE] Allow defining custom repo and branch for Cog checkout 1751668 1 426392 lmoura 2021-04-18 20:17:38 -0700 Created attachment 426392 Patch 1751669 2 426392 lmoura 2021-04-18 20:26:41 -0700 Comment on attachment 426392 Patch The check in "use_cog" is not enough. A leftover cog binary from a previous build will lead to implying Cog is enabled. 1751933 3 426467 lmoura 2021-04-19 13:09:20 -0700 Created attachment 426467 Updated patch Updated version with WPE_BROWSER envvar to allow selecting between cog and minibrowser. Makes it easier to switch between both. 1752687 4 ews-feeder 2021-04-21 02:57:20 -0700 Committed r276355 (236833@main): <https://commits.webkit.org/236833@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426467. 1753483 5 webkit-bug-importer 2021-04-23 00:38:48 -0700 <rdar://problem/77060233> 426392 2021-04-18 20:17:38 -0700 2021-04-18 20:26:41 -0700 Patch bug-224739-20210419001736.patch text/plain 4112 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjE3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjM2YTY1NzNjNDVkMzg0ODI0MGQzZmNjMGNjNDMzMDdk NTBlMGIzNy4uNTY3MTkzNWI5OGRlOGZlOGI1NWQzMzRkMGY4ZjdhODRhYzkyYTdkNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIxLTA0LTE4ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtXUEVdIEFsbG93IGRlZmluaW5nIGN1c3RvbSByZXBvIGFuZCBicmFuY2ggZm9yIENvZyBj aGVja291dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI0NzM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VXNlIGNtYWtlIGFyZ3MgIi1EV1BFX0NPR19SRVBPPTxyZXBvPiIgYW5kICItRFdQRV9DT0dfVEFH PTx0YWc+IiB0bworICAgICAgICBidWlsZCBkaWZmZXJlbnQgY29nIHZlcnNpb25zIHdpdGhvdXQg aGF2aW5nIHRvIGVkaXQgdGhlIGNtYWtlIGZpbGVzLgorCisgICAgICAgIFRoZXJlIG1pZ2h0IGJl IHRoZSBuZWVkIHRvIHdpcGUgdGhlIGNoZWNrZWQtb3V0IGRpciBmcm9tIHRpbWUgdG8gdGltZSwK KyAgICAgICAgYXMgb25seSBDTWFrZSAzLjE4IGludHJvZHVjZWQgZGlmZmVyZW50IGNoZWNrb3V0 IHN0cmF0ZWdpZXMuIFByZXZpb3VzCisgICAgICAgIGNtYWtlcyBtaWdodCB0cnkgdG8gcmViYXNl IHRoZSBwcmV2aW91c2x5IGNoZWNrZWQgb3V0IGJyYW5jaC4KKworICAgICAgICAqIFBsYXRmb3Jt V1BFLmNtYWtlOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUucHk6CisgICAg ICAgIChXUEVQb3J0LmNvZ19wYXRoKToKKyAgICAgICAgKFdQRVBvcnQpOgorICAgICAgICAoV1BF UG9ydC51c2VfY29nKToKKyAgICAgICAgKFdQRVBvcnQucnVuX21pbmlicm93c2VyKToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy93ZWJkcml2ZXJfZHJpdmVyX3dw ZS5weToKKyAgICAgICAgKFdlYkRyaXZlcldQRS5icm93c2VyX25hbWUpOgorICAgICAgICAoV2Vi RHJpdmVyV1BFLmJyb3dzZXJfcGF0aCk6CisKIDIwMjEtMDQtMTcgIEFha2FzaCBKYWluICA8YWFr YXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIERvIG5vdCBjb25maWd1cmUgSmFuaXRvciB0 byBkZWxldGUgb2xkIGxvZ3MgaW4gbG9jYWwgdGVzdGluZyBtb2RlCmRpZmYgLS1naXQgYS9Ub29s cy9QbGF0Zm9ybVdQRS5jbWFrZSBiL1Rvb2xzL1BsYXRmb3JtV1BFLmNtYWtlCmluZGV4IDRkY2Qy MGE0ZGNiMzYzNzM5OWMzZGViMWE4MjMwZTZjMjJkMDI2NjkuLmJiNTZmNTI4ODA5NDZmOTUyZWYz ZGUwZjA0M2Q3ZWEwOTM4Njg2NmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1BsYXRmb3JtV1BFLmNtYWtl CisrKyBiL1Rvb2xzL1BsYXRmb3JtV1BFLmNtYWtlCkBAIC0xOSw4ICsxOSwxNyBAQCBlbmRpZiAo KQogCiBpZiAoREVWRUxPUEVSX01PREUgQU5EIEVOQUJMRV9DT0cpCiAgICAgaW5jbHVkZShFeHRl cm5hbFByb2plY3QpCisgICAgaWYgKCIke1dQRV9DT0dfUkVQT30iIFNUUkVRVUFMICIiKQorICAg ICAgICBzZXQoV1BFX0NPR19SRVBPICJodHRwczovL2dpdGh1Yi5jb20vSWdhbGlhL2NvZy5naXQi KQorICAgIGVuZGlmICgpCisgICAgaWYgKCIke1dQRV9DT0dfVEFHfSIgU1RSRVFVQUwgIiIpCisg ICAgICAgIHNldChXUEVfQ09HX1RBRyAib3JpZ2luL21hc3RlciIpCisgICAgZW5kaWYgKCkKKyAg ICAjIFRPRE8gVXNlIEdJVF9SRU1PVEVfVVBEQVRFX1NUUkFURUdZIHdpdGggMy4xOCB0byBhbGxv dyBzd2l0Y2hpbmcgYmV0d2VlbgorICAgICMgY29uZmxpY3RpbmcgYnJhbmNoZXMgd2l0aG91dCBo YXZpbmcgdG8gZGVsZXRlIHRoZSByZXBvCiAgICAgRXh0ZXJuYWxQcm9qZWN0X0FkZChjb2cKLSAg ICAgICAgR0lUX1JFUE9TSVRPUlkgImh0dHBzOi8vZ2l0aHViLmNvbS9JZ2FsaWEvY29nLmdpdCIK KyAgICAgICAgR0lUX1JFUE9TSVRPUlkgIiR7V1BFX0NPR19SRVBPfSIKKyAgICAgICAgR0lUX1RB RyAiJHtXUEVfQ09HX1RBR30iCiAgICAgICAgIFNPVVJDRV9ESVIgIiR7Q01BS0VfU09VUkNFX0RJ Un0vVG9vbHMvd3BlL2NvZyIKICAgICAgICAgQ01BS0VfQVJHUyAiLURDT0dfUExBVEZPUk1fR1RL ND1PTiIKICAgICAgICAgSU5TVEFMTF9DT01NQU5EICIiKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L3dwZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93 cGUucHkKaW5kZXggMzRlYTNhMDY5N2JiYzA2YjcyMzczZDNmOGFiZjNhNzg3MjcxOGFmZS4uNzFl MWI1OWU0NmQ5OTNjYjc0NTU4YjQ0ZjMwZmM1NzFjMTgyZGJmZCAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L3dwZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvd3BlLnB5CkBAIC0xNDksMTEgKzE0OSwxNiBAQCBjbGFzcyBXUEVQb3J0KFBvcnQpOgog ICAgICAgICBjb25maWd1cmF0aW9uWydwbGF0Zm9ybSddID0gJ1dQRScKICAgICAgICAgcmV0dXJu IGNvbmZpZ3VyYXRpb24KIAorICAgIGRlZiBjb2dfcGF0aChzZWxmKToKKyAgICAgICAgcmV0dXJu IHNlbGYuX2J1aWxkX3BhdGgoJ1Rvb2xzJywgJ2NvZy1wcmVmaXgnLCAnc3JjJywgJ2NvZy1idWls ZCcsICdjb2cnKQorCisgICAgZGVmIHVzZV9jb2coc2VsZik6CisgICAgICAgIHJldHVybiBzZWxm Ll9maWxlc3lzdGVtLmlzZmlsZShzZWxmLmNvZ19wYXRoKCkpCisKICAgICBkZWYgcnVuX21pbmli cm93c2VyKHNlbGYsIGFyZ3MpOgogICAgICAgICBlbnYgPSBOb25lCi0gICAgICAgIGNvZyA9IHNl bGYuX2J1aWxkX3BhdGgoJ1Rvb2xzJywgJ2NvZy1wcmVmaXgnLCAnc3JjJywgJ2NvZy1idWlsZCcs ICdjb2cnKQotICAgICAgICBpZiBzZWxmLl9maWxlc3lzdGVtLmlzZmlsZShjb2cpOgotICAgICAg ICAgICAgbWluaUJyb3dzZXIgPSBjb2cKKyAgICAgICAgaWYgc2VsZi51c2VfY29nKCk6CisgICAg ICAgICAgICBtaW5pQnJvd3NlciA9IHNlbGYuY29nX3BhdGgoKQogICAgICAgICAgICAgZW52ID0g b3MuZW52aXJvbi5jb3B5KCkKICAgICAgICAgICAgIGVudi51cGRhdGUoeydXRUJLSVRfRVhFQ19Q QVRIJzogc2VsZi5fYnVpbGRfcGF0aCgnYmluJyksCiAgICAgICAgICAgICAgICAgICAgICAgICAn V0VCS0lUX0lOSkVDVEVEX0JVTkRMRV9QQVRIJzogc2VsZi5fYnVpbGRfcGF0aCgnbGliJyl9KQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93ZWJkcml2ZXJfdGVzdHMvd2ViZHJp dmVyX2RyaXZlcl93cGUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0 cy93ZWJkcml2ZXJfZHJpdmVyX3dwZS5weQppbmRleCAxOGY1Y2MzZTI2Y2NjYTU5MzE5N2M1YjZk ODY1OGQ3M2U5ZTlhOGJkLi5iOWM4NDBhYWIzN2Q0NDFhYjA4M2IwZjU2MmUyYzIxMWQ1MGRhOGFi IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy93ZWJk cml2ZXJfZHJpdmVyX3dwZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZl cl90ZXN0cy93ZWJkcml2ZXJfZHJpdmVyX3dwZS5weQpAQCAtMzIsOSArMzIsMTMgQEAgY2xhc3Mg V2ViRHJpdmVyV1BFKFdlYkRyaXZlcik6CiAgICAgICAgIHJldHVybiBzZWxmLl9wb3J0Ll9idWls ZF9wYXRoKCdiaW4nLCAnV1BFV2ViRHJpdmVyJykKIAogICAgIGRlZiBicm93c2VyX25hbWUoc2Vs Zik6CisgICAgICAgIGlmIHNlbGYuX3BvcnQudXNlX2NvZygpOgorICAgICAgICAgICAgcmV0dXJu ICJDb2ciCiAgICAgICAgIHJldHVybiAnTWluaUJyb3dzZXInCiAKICAgICBkZWYgYnJvd3Nlcl9w YXRoKHNlbGYpOgorICAgICAgICBpZiBzZWxmLl9wb3J0LnVzZV9jb2coKToKKyAgICAgICAgICAg IHJldHVybiBzZWxmLl9wb3J0LmNvZ19wYXRoKCkKICAgICAgICAgcmV0dXJuIHNlbGYuX3BvcnQu X2J1aWxkX3BhdGgoJ2JpbicsICdNaW5pQnJvd3NlcicpCiAKICAgICBkZWYgYnJvd3Nlcl9hcmdz KHNlbGYpOgo= 426467 2021-04-19 13:09:20 -0700 2021-04-21 02:57:22 -0700 Updated patch bug-224739-20210419170919.patch text/plain 8776 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjE3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjM2YTY1NzNjNDVkMzg0ODI0MGQzZmNjMGNjNDMzMDdk NTBlMGIzNy4uMTc4YWI3NmMzYmI4MTIyMTVjNmQyY2ZlN2M4ZjM5YmM3YmIzNmYxZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5 IEBACisyMDIxLTA0LTE5ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtXUEVdIEFsbG93IGRlZmluaW5nIGN1c3RvbSByZXBvIGFuZCBicmFuY2ggZm9yIENvZyBj aGVja291dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI0NzM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VXNlIGNtYWtlIGFyZ3MgIi1EV1BFX0NPR19SRVBPPTxyZXBvPiIgYW5kICItRFdQRV9DT0dfVEFH PTx0YWc+IiB0bworICAgICAgICBidWlsZCBkaWZmZXJlbnQgY29nIHZlcnNpb25zIHdpdGhvdXQg aGF2aW5nIHRvIGVkaXQgdGhlIGNtYWtlIGZpbGVzLgorCisgICAgICAgIFRoZXJlIG1pZ2h0IGJl IHRoZSBuZWVkIHRvIHdpcGUgdGhlIGNoZWNrZWQtb3V0IGRpciBmcm9tIHRpbWUgdG8gdGltZSwK KyAgICAgICAgYXMgb25seSBDTWFrZSAzLjE4IGludHJvZHVjZWQgZGlmZmVyZW50IGNoZWNrb3V0 IHN0cmF0ZWdpZXMuIFByZXZpb3VzCisgICAgICAgIGNtYWtlcyB0cnkgdG8gcmViYXNlIHRoZSBw cmV2aW91c2x5IGNoZWNrZWQgb3V0IGJyYW5jaCB3aGljaCBtaWdodAorICAgICAgICBsZWFkIHRv IGNvbmZsaWN0cy4KKworICAgICAgICBUaGlzIGNvbW1pdCBhbHNvIGFsbG93cyBzZWxlY3Rpbmcg YmV0d2VlbiBDb2cgYW5kIE1pbmlCcm93c2VyIHdpdGggdGhlCisgICAgICAgIFdQRV9CUk9XU0VS IGVudnZhci4KKworICAgICAgICAqIFBsYXRmb3JtV1BFLmNtYWtlOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvcG9ydC93cGUucHk6CisgICAgICAgIChXUEVQb3J0LmNvZ19wYXRoKToKKyAg ICAgICAgKFdQRVBvcnQpOgorICAgICAgICAoV1BFUG9ydC5icm93c2VyX25hbWUpOgorICAgICAg ICAoV1BFUG9ydC5ydW5fbWluaWJyb3dzZXIpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv cG9ydC93cGVfdW5pdHRlc3QucHk6CisgICAgICAgIChXUEVQb3J0VGVzdC50ZXN0X2RlZmF1bHRf dXBsb2FkX2NvbmZpZ3VyYXRpb24pOgorICAgICAgICAoV1BFUG9ydFRlc3QpOgorICAgICAgICAo V1BFUG9ydFRlc3QudGVzdF9icm93c2VyX25hbWVfZGVmYXVsdCk6CisgICAgICAgIChXUEVQb3J0 VGVzdC50ZXN0X2Jyb3dzZXJfbmFtZV93aXRoX2NvZ19idWlsdCk6CisgICAgICAgIChXUEVQb3J0 VGVzdC50ZXN0X2Jyb3dzZXJfbmFtZV9vdmVycmlkZV9taW5pYnJvd3Nlcl93aXRoX2NvZ19idWls dCk6CisgICAgICAgIChXUEVQb3J0VGVzdC50ZXN0X2Jyb3dzZXJfbmFtZV9vdmVycmlkZV9jb2df d2l0aG91dF9jb2dfYnVpbHQpOgorICAgICAgICAoV1BFUG9ydFRlc3QudGVzdF9icm93c2VyX25h bWVfb3ZlcnJpZGVfdW5rbm93bik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS93ZWJkcml2 ZXJfdGVzdHMvd2ViZHJpdmVyX2RyaXZlcl93cGUucHk6CisgICAgICAgIChXZWJEcml2ZXJXUEUu YnJvd3Nlcl9uYW1lKTogTWFrZSBpdCBjb2ctYXdhcmUuCisgICAgICAgIChXZWJEcml2ZXJXUEUu YnJvd3Nlcl9wYXRoKTogRGl0dG8uCisKIDIwMjEtMDQtMTcgIEFha2FzaCBKYWluICA8YWFrYXNo X2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIERvIG5vdCBjb25maWd1cmUgSmFuaXRvciB0byBk ZWxldGUgb2xkIGxvZ3MgaW4gbG9jYWwgdGVzdGluZyBtb2RlCmRpZmYgLS1naXQgYS9Ub29scy9Q bGF0Zm9ybVdQRS5jbWFrZSBiL1Rvb2xzL1BsYXRmb3JtV1BFLmNtYWtlCmluZGV4IDRkY2QyMGE0 ZGNiMzYzNzM5OWMzZGViMWE4MjMwZTZjMjJkMDI2NjkuLmJiNTZmNTI4ODA5NDZmOTUyZWYzZGUw ZjA0M2Q3ZWEwOTM4Njg2NmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1BsYXRmb3JtV1BFLmNtYWtlCisr KyBiL1Rvb2xzL1BsYXRmb3JtV1BFLmNtYWtlCkBAIC0xOSw4ICsxOSwxNyBAQCBlbmRpZiAoKQog CiBpZiAoREVWRUxPUEVSX01PREUgQU5EIEVOQUJMRV9DT0cpCiAgICAgaW5jbHVkZShFeHRlcm5h bFByb2plY3QpCisgICAgaWYgKCIke1dQRV9DT0dfUkVQT30iIFNUUkVRVUFMICIiKQorICAgICAg ICBzZXQoV1BFX0NPR19SRVBPICJodHRwczovL2dpdGh1Yi5jb20vSWdhbGlhL2NvZy5naXQiKQor ICAgIGVuZGlmICgpCisgICAgaWYgKCIke1dQRV9DT0dfVEFHfSIgU1RSRVFVQUwgIiIpCisgICAg ICAgIHNldChXUEVfQ09HX1RBRyAib3JpZ2luL21hc3RlciIpCisgICAgZW5kaWYgKCkKKyAgICAj IFRPRE8gVXNlIEdJVF9SRU1PVEVfVVBEQVRFX1NUUkFURUdZIHdpdGggMy4xOCB0byBhbGxvdyBz d2l0Y2hpbmcgYmV0d2VlbgorICAgICMgY29uZmxpY3RpbmcgYnJhbmNoZXMgd2l0aG91dCBoYXZp bmcgdG8gZGVsZXRlIHRoZSByZXBvCiAgICAgRXh0ZXJuYWxQcm9qZWN0X0FkZChjb2cKLSAgICAg ICAgR0lUX1JFUE9TSVRPUlkgImh0dHBzOi8vZ2l0aHViLmNvbS9JZ2FsaWEvY29nLmdpdCIKKyAg ICAgICAgR0lUX1JFUE9TSVRPUlkgIiR7V1BFX0NPR19SRVBPfSIKKyAgICAgICAgR0lUX1RBRyAi JHtXUEVfQ09HX1RBR30iCiAgICAgICAgIFNPVVJDRV9ESVIgIiR7Q01BS0VfU09VUkNFX0RJUn0v VG9vbHMvd3BlL2NvZyIKICAgICAgICAgQ01BS0VfQVJHUyAiLURDT0dfUExBVEZPUk1fR1RLND1P TiIKICAgICAgICAgSU5TVEFMTF9DT01NQU5EICIiKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L3dwZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUu cHkKaW5kZXggMzRlYTNhMDY5N2JiYzA2YjcyMzczZDNmOGFiZjNhNzg3MjcxOGFmZS4uN2NlMmZk YTk2ZmE2M2QwNGE3MTUyNjExMTYzNmI2YTFmMzBiNTFiMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L3dwZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvd3BlLnB5CkBAIC0xNDksMTkgKzE0OSw0NiBAQCBjbGFzcyBXUEVQb3J0KFBvcnQpOgogICAg ICAgICBjb25maWd1cmF0aW9uWydwbGF0Zm9ybSddID0gJ1dQRScKICAgICAgICAgcmV0dXJuIGNv bmZpZ3VyYXRpb24KIAorICAgIGRlZiBjb2dfcGF0aChzZWxmKToKKyAgICAgICAgcmV0dXJuIHNl bGYuX2J1aWxkX3BhdGgoJ1Rvb2xzJywgJ2NvZy1wcmVmaXgnLCAnc3JjJywgJ2NvZy1idWlsZCcs ICdjb2cnKQorCisgICAgZGVmIGJyb3dzZXJfbmFtZShzZWxmKToKKyAgICAgICAgIiIiUmV0dXJu cyB0aGUgbG93ZXIgY2FzZSBuYW1lIG9mIHRoZSBicm93c2VyIHRvIGJlIHVzZWQgKENvZyBvciBN aW5pQnJvd3NlcikKKworICAgICAgICBVc2VycyBjYW4gc2VsZWN0IGJldHdlZW4gYm90aCB3aXRo IHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBXUEVfQlJPV1NFUgorICAgICAgICAiIiIKKyAgICAg ICAgYnJvd3NlciA9IG9zLmVudmlyb24uZ2V0KCJXUEVfQlJPV1NFUiIsICIiKS5sb3dlcigpCisg ICAgICAgIGlmIGJyb3dzZXIgaW4gKCJjb2ciLCAibWluaWJyb3dzZXIiKToKKyAgICAgICAgICAg IHJldHVybiBicm93c2VyCisKKyAgICAgICAgaWYgYnJvd3NlcjoKKyAgICAgICAgICAgIHByaW50 KCJVbmtub3duIGJyb3dzZXIge30uIERlZmF1bHRpbmcgdG8gQ29nIGFuZCBNaW5pQnJvd3NlciBz ZWxlY3Rpb24iLmZvcm1hdChicm93c2VyKSkKKworICAgICAgICBpZiBzZWxmLl9maWxlc3lzdGVt LmlzZmlsZShzZWxmLmNvZ19wYXRoKCkpOgorICAgICAgICAgICAgcmV0dXJuICJjb2ciCisgICAg ICAgIHJldHVybiAibWluaWJyb3dzZXIiCisKICAgICBkZWYgcnVuX21pbmlicm93c2VyKHNlbGYs IGFyZ3MpOgogICAgICAgICBlbnYgPSBOb25lCi0gICAgICAgIGNvZyA9IHNlbGYuX2J1aWxkX3Bh dGgoJ1Rvb2xzJywgJ2NvZy1wcmVmaXgnLCAnc3JjJywgJ2NvZy1idWlsZCcsICdjb2cnKQotICAg ICAgICBpZiBzZWxmLl9maWxlc3lzdGVtLmlzZmlsZShjb2cpOgotICAgICAgICAgICAgbWluaUJy b3dzZXIgPSBjb2cKLSAgICAgICAgICAgIGVudiA9IG9zLmVudmlyb24uY29weSgpCi0gICAgICAg ICAgICBlbnYudXBkYXRlKHsnV0VCS0lUX0VYRUNfUEFUSCc6IHNlbGYuX2J1aWxkX3BhdGgoJ2Jp bicpLAotICAgICAgICAgICAgICAgICAgICAgICAgJ1dFQktJVF9JTkpFQ1RFRF9CVU5ETEVfUEFU SCc6IHNlbGYuX2J1aWxkX3BhdGgoJ2xpYicpfSkKLSAgICAgICAgICAgIGhhc19wbGF0Zm9ybV9h cmcgPSBhbnkoKGEgPT0gIi1QIiBvciBhLnN0YXJ0c3dpdGgoIi0tcGxhdGZvcm09IikgZm9yIGEg aW4gYXJncykpCi0gICAgICAgICAgICBpZiBub3QgaGFzX3BsYXRmb3JtX2FyZzoKLSAgICAgICAg ICAgICAgICBhcmdzLmluc2VydCgwLCAiLS1wbGF0Zm9ybT1ndGs0IikKLSAgICAgICAgZWxzZToK LSAgICAgICAgICAgIHByaW50KCJDb2cgbm90IGZvdW5kIPCfmKIuIElmIHlvdSB3aXNoIHRvIGVu YWJsZSBpdCwgcmVidWlsZCB3aXRoIGAtREVOQUJMRV9DT0c9T05gLiBGYWxsaW5nIGJhY2sgdG8g Z29vZCBvbGQgTWluaUJyb3dzZXIiKQorICAgICAgICBicm93c2VyX25hbWUgPSBzZWxmLmJyb3dz ZXJfbmFtZSgpCisgICAgICAgIG1pbmlCcm93c2VyID0gTm9uZQorCisgICAgICAgIGlmIGJyb3dz ZXJfbmFtZSA9PSAiY29nIjoKKyAgICAgICAgICAgIG1pbmlCcm93c2VyID0gc2VsZi5jb2dfcGF0 aCgpCisgICAgICAgICAgICBpZiBub3Qgc2VsZi5fZmlsZXN5c3RlbS5pc2ZpbGUobWluaUJyb3dz ZXIpOgorICAgICAgICAgICAgICAgIHByaW50KCJDb2cgbm90IGZvdW5kIPCfmKIuIElmIHlvdSB3 aXNoIHRvIGVuYWJsZSBpdCwgcmVidWlsZCB3aXRoIGAtREVOQUJMRV9DT0c9T05gLiBGYWxsaW5n IGJhY2sgdG8gZ29vZCBvbGQgTWluaUJyb3dzZXIiKQorICAgICAgICAgICAgICAgIG1pbmlCcm93 c2VyID0gTm9uZQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBwcmludCgiVXNp bmcgQ29nIGFzIE1pbmlCcm93c2VyIikKKyAgICAgICAgICAgICAgICBlbnYgPSBvcy5lbnZpcm9u LmNvcHkoKQorICAgICAgICAgICAgICAgIGVudi51cGRhdGUoeydXRUJLSVRfRVhFQ19QQVRIJzog c2VsZi5fYnVpbGRfcGF0aCgnYmluJyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ1dF QktJVF9JTkpFQ1RFRF9CVU5ETEVfUEFUSCc6IHNlbGYuX2J1aWxkX3BhdGgoJ2xpYicpfSkKKyAg ICAgICAgICAgICAgICBoYXNfcGxhdGZvcm1fYXJnID0gYW55KChhID09ICItUCIgb3IgYS5zdGFy dHN3aXRoKCItLXBsYXRmb3JtPSIpIGZvciBhIGluIGFyZ3MpKQorICAgICAgICAgICAgICAgIGlm IG5vdCBoYXNfcGxhdGZvcm1fYXJnOgorICAgICAgICAgICAgICAgICAgICBhcmdzLmluc2VydCgw LCAiLS1wbGF0Zm9ybT1ndGs0IikKKworICAgICAgICBpZiBub3QgbWluaUJyb3dzZXI6CisgICAg ICAgICAgICBwcmludCgiVXNpbmcgZGVmYXVsdCBNaW5pQnJvd3NlciIpCiAgICAgICAgICAgICBt aW5pQnJvd3NlciA9IHNlbGYuX2J1aWxkX3BhdGgoJ2JpbicsICdNaW5pQnJvd3NlcicpCiAgICAg ICAgICAgICBpZiBub3Qgc2VsZi5fZmlsZXN5c3RlbS5pc2ZpbGUobWluaUJyb3dzZXIpOgogICAg ICAgICAgICAgICAgIHByaW50KCIlcyBub3QgZm91bmQuLi4gRGlkIHlvdSBydW4gYnVpbGQtd2Vi a2l0PyIgJSBtaW5pQnJvd3NlcikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC93cGVfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd3BlX3Vu aXR0ZXN0LnB5CmluZGV4IGRkNjk3NTUwMjU0Y2NiODNiNmRkZGY1MjhlZWFiMzhjZmVlN2ZhNTQu LjFlMDBiNmM2NTA3YTc2YTg1ZDczMjJkNzhjZTUwNDk4N2FmNjcxOTkgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGVfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L3dwZV91bml0dGVzdC5weQpAQCAtMzYsNyArMzYsNyBAQCBmcm9t IHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbV9tb2NrIGltcG9ydCBNb2NrRmlsZVN5 c3RlbQogZnJvbSB3ZWJraXRweS5wb3J0LmNvbmZpZyBpbXBvcnQgY2xlYXJfY2FjaGVkX2NvbmZp Z3VyYXRpb24KIGZyb20gd2Via2l0cHkucG9ydC53cGUgaW1wb3J0IFdQRVBvcnQKIGZyb20gd2Vi a2l0cHkucG9ydCBpbXBvcnQgcG9ydF90ZXN0Y2FzZQotZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5 Lm1vY2sgaW1wb3J0IE1vY2sKK2Zyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5tb2NrIGltcG9ydCBN b2NrLCBwYXRjaAogZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2NrT3B0aW9u cwogCiAKQEAgLTc3LDMgKzc3LDMyIEBAIGNsYXNzIFdQRVBvcnRUZXN0KHBvcnRfdGVzdGNhc2Uu UG9ydFRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb25maWd1cmF0aW9uWydp c19zaW11bGF0b3InXSwgRmFsc2UpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29uZmlndXJh dGlvblsncGxhdGZvcm0nXSwgJ1dQRScpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29uZmln dXJhdGlvblsnc3R5bGUnXSwgJ3JlbGVhc2UnKQorCisgICAgZGVmIHRlc3RfYnJvd3Nlcl9uYW1l X2RlZmF1bHQoc2VsZik6CisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5icm93c2VyX25hbWUoKSwgIm1pbmlicm93c2VyIikKKwor ICAgIGRlZiB0ZXN0X2Jyb3dzZXJfbmFtZV93aXRoX2NvZ19idWlsdChzZWxmKToKKyAgICAgICAg cG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKKyAgICAgICAgcG9ydC5fZmlsZXN5c3RlbSA9IE1vY2tG aWxlU3lzdGVtKHsKKyAgICAgICAgICAgICIvbW9jay1idWlsZC9Ub29scy9jb2ctcHJlZml4L3Ny Yy9jb2ctYnVpbGQvY29nIjogIiIsCisgICAgICAgIH0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwocG9ydC5icm93c2VyX25hbWUoKSwgImNvZyIpCisKKyAgICBkZWYgdGVzdF9icm93c2VyX25h bWVfb3ZlcnJpZGVfbWluaWJyb3dzZXJfd2l0aF9jb2dfYnVpbHQoc2VsZik6CisgICAgICAgIHdp dGggcGF0Y2goJ29zLmVudmlyb24nLCB7J1dQRV9CUk9XU0VSJzogJ01pbmlCcm93c2VyJ30pOgor ICAgICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKKyAgICAgICAgICAgIHBvcnQuX2Zp bGVzeXN0ZW0gPSBNb2NrRmlsZVN5c3RlbSh7CisgICAgICAgICAgICAgICAgIi9tb2NrLWJ1aWxk L1Rvb2xzL2NvZy1wcmVmaXgvc3JjL2NvZy1idWlsZC9jb2ciOiAiIiwKKyAgICAgICAgICAgIH0p CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuYnJvd3Nlcl9uYW1lKCksICJtaW5p YnJvd3NlciIpCisKKyAgICBkZWYgdGVzdF9icm93c2VyX25hbWVfb3ZlcnJpZGVfY29nX3dpdGhv dXRfY29nX2J1aWx0KHNlbGYpOgorICAgICAgICB3aXRoIHBhdGNoKCdvcy5lbnZpcm9uJywgeydX UEVfQlJPV1NFUic6ICdDb2cnfSk6CisgICAgICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQo KQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LmJyb3dzZXJfbmFtZSgpLCAiY29n IikKKworICAgIGRlZiB0ZXN0X2Jyb3dzZXJfbmFtZV9vdmVycmlkZV91bmtub3duKHNlbGYpOgor ICAgICAgICB3aXRoIHBhdGNoKCdvcy5lbnZpcm9uJywgeydXUEVfQlJPV1NFUic6ICdNb3NhaWMn fSk6CisgICAgICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQorICAgICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChwb3J0LmJyb3dzZXJfbmFtZSgpLCAibWluaWJyb3dzZXIiKQpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93ZWJkcml2ZXJfdGVzdHMvd2ViZHJpdmVyX2Ry aXZlcl93cGUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy93ZWJk cml2ZXJfZHJpdmVyX3dwZS5weQppbmRleCAxOGY1Y2MzZTI2Y2NjYTU5MzE5N2M1YjZkODY1OGQ3 M2U5ZTlhOGJkLi42ZGQ3ZGRmMjkzYjY3NWUwZjAwNmJiMGM2MDczODI5YWJmOTE3YjBjIDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy93ZWJkcml2ZXJf ZHJpdmVyX3dwZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0 cy93ZWJkcml2ZXJfZHJpdmVyX3dwZS5weQpAQCAtMzIsOSArMzIsMTEgQEAgY2xhc3MgV2ViRHJp dmVyV1BFKFdlYkRyaXZlcik6CiAgICAgICAgIHJldHVybiBzZWxmLl9wb3J0Ll9idWlsZF9wYXRo KCdiaW4nLCAnV1BFV2ViRHJpdmVyJykKIAogICAgIGRlZiBicm93c2VyX25hbWUoc2VsZik6Ci0g ICAgICAgIHJldHVybiAnTWluaUJyb3dzZXInCisgICAgICAgIHJldHVybiBzZWxmLl9wb3J0LmJy b3dzZXJfbmFtZSgpCiAKICAgICBkZWYgYnJvd3Nlcl9wYXRoKHNlbGYpOgorICAgICAgICBpZiBz ZWxmLl9wb3J0LmJyb3dzZXJfbmFtZSgpID09ICJjb2ciOgorICAgICAgICAgICAgcmV0dXJuIHNl bGYuX3BvcnQuY29nX3BhdGgoKQogICAgICAgICByZXR1cm4gc2VsZi5fcG9ydC5fYnVpbGRfcGF0 aCgnYmluJywgJ01pbmlCcm93c2VyJykKIAogICAgIGRlZiBicm93c2VyX2FyZ3Moc2VsZik6Cg==