172230 2017-05-17 11:39:11 -0700 [Win][CMake] Move MSVC compiler options to a common location 2017-05-22 00:15:26 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 172144 1 don.olmstead don.olmstead achristensen annulen bfulgham commit-queue lforschler pvollan ysuzuki oldest_to_newest 1309705 0 don.olmstead 2017-05-17 11:39:11 -0700 Currently all the MSVC definitions are in OptionsWin.cmake. This means they aren't available for different ports such as JSCOnly. 1309793 1 310439 don.olmstead 2017-05-17 13:53:11 -0700 Created attachment 310439 Patch This moves the MSVC options from OptionsWin over to OptionsCommon. This is work towards enabling JSCOnly builds on windows. 1309807 2 310439 achristensen 2017-05-17 14:02:54 -0700 Comment on attachment 310439 Patch There is no way to use MSVC on a non-Windows platform. I see no reason to move this from a Windows-specific file to a file that's used on Linux and Mac. 1309815 3 don.olmstead 2017-05-17 14:15:44 -0700 (In reply to Alex Christensen from comment #2) > Comment on attachment 310439 [details] > Patch > > There is no way to use MSVC on a non-Windows platform. I see no reason to > move this from a Windows-specific file to a file that's used on Linux and > Mac. Would you prefer compiler options in their own files? Like a OptionsMSVC.cmake? I'm trying to consolidate the options so they can be used to build JSCOnly on Windows. As it is JSCOnly does not build on Windows at all. 1309886 4 achristensen 2017-05-17 16:12:40 -0700 OptionsMSVC.cmake would be better than OptionsCommon.cmake 1310367 5 310581 don.olmstead 2017-05-18 17:45:21 -0700 Created attachment 310581 Patch Moving MSVC options to a new file as requested. 1310665 6 annulen 2017-05-19 11:07:21 -0700 I would prefer if the following options were not moved to OptionsMSVC.cmake: /Zi for release builds, disabling RTTI (GR-), using MT runtime instead of MD or MDd. Rationale is that this options are not universally suitable, and it's not possible to revert their effect for downstream port, without duplicating or patching OptionsMSVC.cmake (I'm speaking for Qt port now). Also, there was a proposal in the mailing list to make WinCairo using MD runtime, I think it would be wise thing to do. I also don't think that JSCOnly should use this options. OTOH, I would suggest moving "INCREMENTAL:NO" code from Source/WebKit/PlatformWin.cmake to OptionsMSVC.cmake, because large linking times affects pretty much any WebKit port if MSVC is used, and these options should affect binaries built in Tools too. 1310667 7 don.olmstead 2017-05-19 11:09:14 -0700 (In reply to Konstantin Tokarev from comment #6) > I would prefer if the following options were not moved to OptionsMSVC.cmake: > /Zi for release builds, disabling RTTI (GR-), using MT runtime instead of MD > or MDd. > > Rationale is that this options are not universally suitable, and it's not > possible to revert their effect for downstream port, without duplicating or > patching OptionsMSVC.cmake (I'm speaking for Qt port now). Also, there was a > proposal in the mailing list to make WinCairo using MD runtime, I think it > would be wise thing to do. > > I also don't think that JSCOnly should use this options. > > OTOH, I would suggest moving "INCREMENTAL:NO" code from > Source/WebKit/PlatformWin.cmake to OptionsMSVC.cmake, because large linking > times affects pretty much any WebKit port if MSVC is used, and these options > should affect binaries built in Tools too. I agree. This was just a blind copy and I was going to clean up this file in a later patch. 1310705 8 310682 don.olmstead 2017-05-19 12:25:37 -0700 Created attachment 310682 Patch Moving linking options into the file as requested. 1310710 9 310682 achristensen 2017-05-19 12:27:57 -0700 Comment on attachment 310682 Patch Looks good. Let's let EWS succeed first 1310742 10 don.olmstead 2017-05-19 13:23:52 -0700 (In reply to Alex Christensen from comment #9) > Comment on attachment 310682 [details] > Patch > > Looks good. Let's let EWS succeed first Success! 1311236 11 310682 ysuzuki 2017-05-21 23:47:09 -0700 Comment on attachment 310682 Patch r=me 1311246 12 310682 commit-queue 2017-05-22 00:15:24 -0700 Comment on attachment 310682 Patch Clearing flags on attachment: 310682 Committed r217207: <http://trac.webkit.org/changeset/217207> 1311247 13 commit-queue 2017-05-22 00:15:26 -0700 All reviewed patches have been landed. Closing bug. 310439 2017-05-17 13:53:11 -0700 2017-05-18 17:45:21 -0700 Patch bug-172230.diff text/plain 8284 don.olmstead ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAxOGQ5YTJkNDk4NC4uMzc3 N2UyNDE5ZDggMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMyBAQAorMjAxNy0wNS0xNyAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQGFtLnNvbnku Y29tPgorCisgICAgICAgIFtXaW5dW0NNYWtlXSBNb3ZlIE1TVkMgY29tcGlsZXIgb3B0aW9ucyB0 byBhIGNvbW1vbiBsb2NhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyMjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0NvbW1vbi5jbWFrZToKKyAgICAgICAg KiBTb3VyY2UvY21ha2UvT3B0aW9uc1dpbi5jbWFrZToKKwogMjAxNy0wNS0xNiAgWmFuIERvYmVy c2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV0gU2V0IGFuZCBleHBv c2UgRU5BQkxFX0RFVkVMT1BFUl9NT0RFIGluIGJ1aWxkIHdoZW4gREVWRUxPUEVSX01PREUgaXMg ZW5hYmxlZApkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNDb21tb24uY21ha2UgYi9T b3VyY2UvY21ha2UvT3B0aW9uc0NvbW1vbi5jbWFrZQppbmRleCA3MTc5ZjQ3OTY1ZC4uNGUzMzMz YzZhNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCisrKyBi L1NvdXJjZS9jbWFrZS9PcHRpb25zQ29tbW9uLmNtYWtlCkBAIC01Myw2ICs1Myw3NCBAQCBpZiAo V0lOMzIgQU5EIENPTVBJTEVSX0lTX0dDQ19PUl9DTEFORykKICAgICBhZGRfZGVmaW5pdGlvbnMo LURfX1VTRV9NSU5HV19BTlNJX1NURElPPTEpCiBlbmRpZiAoKQogCitpZiAoTVNWQykKKyAgICBh ZGRfY29tcGlsZV9vcHRpb25zKAorICAgICAgICAvd2Q0MDE4IC93ZDQwNjggL3dkNDA5OSAvd2Q0 MTAwIC93ZDQxMjcgL3dkNDEzOCAvd2Q0MTQ2IC93ZDQxODAgL3dkNDE4OQorICAgICAgICAvd2Q0 MjAxIC93ZDQyMDYgL3dkNDI0NCAvd2Q0MjUxIC93ZDQyNjcgL3dkNDI3NSAvd2Q0Mjg4IC93ZDQy OTEgL3dkNDMwNQorICAgICAgICAvd2Q0MzA5IC93ZDQzNDQgL3dkNDM1NSAvd2Q0Mzg5IC93ZDQz OTYgL3dkNDQ1NiAvd2Q0NDU3IC93ZDQ0NTggL3dkNDQ1OQorICAgICAgICAvd2Q0NDgxIC93ZDQ1 MDMgL3dkNDUwNSAvd2Q0NTEwIC93ZDQ1MTIgL3dkNDUzMCAvd2Q0NjEwIC93ZDQ2MTEgL3dkNDY0 NgorICAgICAgICAvd2Q0NzAyIC93ZDQ3MDYgL3dkNDcyMiAvd2Q0ODAwIC93ZDQ4MTkgL3dkNDk1 MSAvd2Q0OTUyIC93ZDQ5OTYgL3dkNjAxMQorICAgICAgICAvd2Q2MDMxIC93ZDYyMTEgL3dkNjI0 NiAvd2Q2MjU1IC93ZDYzODcKKyAgICApCisKKyAgICAjIENyZWF0ZSBwZGIgZmlsZXMgZm9yIGRl YnVnZ2luZyBwdXJwb3NlcywgYWxzbyBmb3IgUmVsZWFzZSBidWlsZHMKKyAgICBhZGRfY29tcGls ZV9vcHRpb25zKC9aaSAvR1MpCisKKyAgICBzZXQoQ01BS0VfU0hBUkVEX0xJTktFUl9GTEFHUyAi JHtDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTfSAvREVCVUcgL09QVDpJQ0YgL09QVDpSRUYiKQor ICAgIHNldChDTUFLRV9FWEVfTElOS0VSX0ZMQUdTICIke0NNQUtFX0VYRV9MSU5LRVJfRkxBR1N9 IC9ERUJVRyAvT1BUOklDRiAvT1BUOlJFRiIpCisKKyAgICAjIFdlIGRvIG5vdCB1c2UgZXhjZXB0 aW9ucworICAgIGFkZF9kZWZpbml0aW9ucygtRF9IQVNfRVhDRVBUSU9OUz0wKQorICAgIGFkZF9j b21waWxlX29wdGlvbnMoL0VIYS0gL0VIYy0gL0VIcy0gL2ZwOmV4Y2VwdC0pCisKKyAgICAjIFdl IGhhdmUgc29tZSB2ZXJ5IGxhcmdlIG9iamVjdCBmaWxlcyB0aGF0IGhhdmUgdG8gYmUgbGlua2Vk CisgICAgYWRkX2NvbXBpbGVfb3B0aW9ucygvYW5hbHl6ZS0gL2JpZ29iaikKKworICAgICMgVXNl IENSVCBzZWN1cml0eSBmZWF0dXJlcworICAgIGFkZF9kZWZpbml0aW9ucygtRF9DUlRfU0VDVVJF X05PX1dBUk5JTkdTIC1EX0NSVF9TRUNVUkVfQ1BQX09WRVJMT0FEX1NUQU5EQVJEX05BTUVTPTEp CisKKyAgICAjIFR1cm4gb2ZmIGNlcnRhaW4gbGluayBmZWF0dXJlcworICAgIGFkZF9jb21waWxl X29wdGlvbnMoL0d5LSAvb3Blbm1wLSAvR0YtKQorCisgICAgaWYgKCR7Q01BS0VfQlVJTERfVFlQ RX0gTUFUQ0hFUyAiRGVidWciKQorICAgICAgICBzZXQoQ01BS0VfU0hBUkVEX0xJTktFUl9GTEFH UyAiJHtDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTfSAvT1BUOk5PUkVGIC9PUFQ6Tk9JQ0YiKQor ICAgICAgICBzZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9FWEVfTElOS0VSX0ZM QUdTfSAvT1BUOk5PUkVGIC9PUFQ6Tk9JQ0YiKQorCisgICAgICAgICMgVG8gZGVidWcgbGlua2lu ZyB0aW1lIGlzc3VlcywgdW5jb21tZW50IHRoZSBmb2xsb3dpbmcgdGhyZWUgbGluZXM6CisgICAg ICAgICNhZGRfY29tcGlsZV9vcHRpb25zKC9CdikKKyAgICAgICAgI3NldChDTUFLRV9TSEFSRURf TElOS0VSX0ZMQUdTICIke0NNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1N9IC9WRVJCT1NFIC9WRVJC T1NFOklOQ1IgL1RJTUUiKQorICAgICAgICAjc2V0KENNQUtFX0VYRV9MSU5LRVJfRkxBR1MgIiR7 Q01BS0VfRVhFX0xJTktFUl9GTEFHU30gL1ZFUkJPU0UgL1ZFUkJPU0U6SU5DUiAvVElNRSIpCisg ICAgZWxzZWlmICgke0NNQUtFX0JVSUxEX1RZUEV9IE1BVENIRVMgIlJlbGVhc2UiKQorICAgICAg ICBhZGRfY29tcGlsZV9vcHRpb25zKC9PeS0pCisgICAgZW5kaWYgKCkKKworICAgIGlmIChOT1Qg JHtDTUFLRV9HRU5FUkFUT1J9IE1BVENIRVMgIk5pbmphIikKKyAgICAgICAgbGlua19kaXJlY3Rv cmllcygiJHtDTUFLRV9MSUJSQVJZX09VVFBVVF9ESVJFQ1RPUll9LyR7Q01BS0VfQlVJTERfVFlQ RX0iKQorICAgICAgICBhZGRfZGVmaW5pdGlvbnMoL01QKQorICAgIGVuZGlmICgpCisgICAgaWYg KE5PVCAke0NNQUtFX0NYWF9GTEFHU30gU1RSRVFVQUwgIiIpCisgICAgICAgIHN0cmluZyhSRUdF WCBSRVBMQUNFICIoL0VIW2Etel0rKSAiICJcXDEtICIgQ01BS0VfQ1hYX0ZMQUdTICR7Q01BS0Vf Q1hYX0ZMQUdTfSkgIyBEaXNhYmxlIEMrKyBleGNlcHRpb25zCisgICAgICAgIHN0cmluZyhSRUdF WCBSRVBMQUNFICIvRUhzYyQiICIvRUhzLSAvRUhjLSAiIENNQUtFX0NYWF9GTEFHUyAke0NNQUtF X0NYWF9GTEFHU30pICMgRGlzYWJsZSBDKysgZXhjZXB0aW9ucworICAgICAgICBzdHJpbmcoUkVH RVggUkVQTEFDRSAiL0dSICIgIi9HUi0gIiBDTUFLRV9DWFhfRkxBR1MgJHtDTUFLRV9DWFhfRkxB R1N9KSAjIERpc2FibGUgUlRUSQorICAgICAgICBzdHJpbmcoUkVHRVggUkVQTEFDRSAiL1czIiAi L1c0IiBDTUFLRV9DWFhfRkxBR1MgJHtDTUFLRV9DWFhfRkxBR1N9KSAjIFdhcm5pbmdzIGFyZSBp bXBvcnRhbnQKKyAgICBlbmRpZiAoKQorCisgICAgZm9yZWFjaCAoZmxhZ192YXIKKyAgICAgICAg Q01BS0VfQ19GTEFHUyBDTUFLRV9DX0ZMQUdTX0RFQlVHIENNQUtFX0NfRkxBR1NfUkVMRUFTRQor ICAgICAgICBDTUFLRV9DX0ZMQUdTX01JTlNJWkVSRUwgQ01BS0VfQ19GTEFHU19SRUxXSVRIREVC SU5GTworICAgICAgICBDTUFLRV9DWFhfRkxBR1MgQ01BS0VfQ1hYX0ZMQUdTX0RFQlVHIENNQUtF X0NYWF9GTEFHU19SRUxFQVNFCisgICAgICAgIENNQUtFX0NYWF9GTEFHU19NSU5TSVpFUkVMIENN QUtFX0NYWF9GTEFHU19SRUxXSVRIREVCSU5GTykKKyAgICAgICAgIyBVc2UgdGhlIG11bHRpdGhy ZWFkZWQgc3RhdGljIHJ1bnRpbWUgbGlicmFyeSBpbnN0ZWFkIG9mIHRoZSBkZWZhdWx0IERMTCBy dW50aW1lLgorICAgICAgICBzdHJpbmcoUkVHRVggUkVQTEFDRSAiL01EIiAiL01UIiAke2ZsYWdf dmFyfSAiJHske2ZsYWdfdmFyfX0iKQorCisgICAgICAgICMgTm8gZGVidWcgcnVudGltZSwgZXZl biBpbiBkZWJ1ZyBidWlsZHMuCisgICAgICAgIGlmIChOT1QgREVCVUdfU1VGRklYKQorICAgICAg ICAgICAgc3RyaW5nKFJFR0VYIFJFUExBQ0UgIi9NVGQiICIvTVQiICR7ZmxhZ192YXJ9ICIkeyR7 ZmxhZ192YXJ9fSIpCisgICAgICAgICAgICBzdHJpbmcoUkVHRVggUkVQTEFDRSAiL0RfREVCVUci ICIiICR7ZmxhZ192YXJ9ICIkeyR7ZmxhZ192YXJ9fSIpCisgICAgICAgIGVuZGlmICgpCisgICAg ZW5kZm9yZWFjaCAoKQorZW5kaWYgKCkKKwogIyBFbnN1cmUgdGhhdCB0aGUgZGVmYXVsdCBpbmNs dWRlIHN5c3RlbSBkaXJlY3RvcmllcyBhcmUgYWRkZWQgdG8gdGhlIGxpc3Qgb2YgQ01ha2UgaW1w bGljaXQgaW5jbHVkZXMuCiAjIFRoaXMgd29ya2Fyb3VuZHMgYW4gaXNzdWUgdGhhdCBoYXBwZW5z IHdoZW4gdXNpbmcgR0NDIDYgYW5kIHVzaW5nIHN5c3RlbSBpbmNsdWRlcyAoLWlzeXN0ZW0pLgog IyBGb3IgbW9yZSBkZXRhaWxzIGNoZWNrOiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTYxNjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc1dpbi5jbWFr ZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zV2luLmNtYWtlCmluZGV4IDVkOTNiYTA1NGU1Li4yNTNi ODcwZjE0ZCAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNXaW4uY21ha2UKKysrIGIv U291cmNlL2NtYWtlL09wdGlvbnNXaW4uY21ha2UKQEAgLTEyNSw3NCArMTI1LDYgQEAgc2V0KENN QUtFX0xJQlJBUllfT1VUUFVUX0RJUkVDVE9SWV9SRUxFQVNFICIke0NNQUtFX0xJQlJBUllfT1VU UFVUX0RJUkVDVE9SWX0iKQogc2V0KENNQUtFX1JVTlRJTUVfT1VUUFVUX0RJUkVDVE9SWV9ERUJV RyAiJHtDTUFLRV9SVU5USU1FX09VVFBVVF9ESVJFQ1RPUll9IikKIHNldChDTUFLRV9SVU5USU1F X09VVFBVVF9ESVJFQ1RPUllfUkVMRUFTRSAiJHtDTUFLRV9SVU5USU1FX09VVFBVVF9ESVJFQ1RP Ull9IikKIAotaWYgKE1TVkMpCi0gICAgYWRkX2RlZmluaXRpb25zKAotICAgICAgICAvd2Q0MDE4 IC93ZDQwNjggL3dkNDA5OSAvd2Q0MTAwIC93ZDQxMjcgL3dkNDEzOCAvd2Q0MTQ2IC93ZDQxODAg L3dkNDE4OQotICAgICAgICAvd2Q0MjAxIC93ZDQyMDYgL3dkNDI0NCAvd2Q0MjUxIC93ZDQyNjcg L3dkNDI3NSAvd2Q0Mjg4IC93ZDQyOTEgL3dkNDMwNQotICAgICAgICAvd2Q0MzA5IC93ZDQzNDQg L3dkNDM1NSAvd2Q0Mzg5IC93ZDQzOTYgL3dkNDQ1NiAvd2Q0NDU3IC93ZDQ0NTggL3dkNDQ1OQot ICAgICAgICAvd2Q0NDgxIC93ZDQ1MDMgL3dkNDUwNSAvd2Q0NTEwIC93ZDQ1MTIgL3dkNDUzMCAv d2Q0NjEwIC93ZDQ2MTEgL3dkNDY0NgotICAgICAgICAvd2Q0NzAyIC93ZDQ3MDYgL3dkNDcyMiAv d2Q0ODAwIC93ZDQ4MTkgL3dkNDk1MSAvd2Q0OTUyIC93ZDQ5OTYgL3dkNjAxMQotICAgICAgICAv d2Q2MDMxIC93ZDYyMTEgL3dkNjI0NiAvd2Q2MjU1IC93ZDYzODcKLSAgICApCi0KLSAgICAjIENy ZWF0ZSBwZGIgZmlsZXMgZm9yIGRlYnVnZ2luZyBwdXJwb3NlcywgYWxzbyBmb3IgUmVsZWFzZSBi dWlsZHMKLSAgICBhZGRfY29tcGlsZV9vcHRpb25zKC9aaSAvR1MpCi0KLSAgICBzZXQoQ01BS0Vf U0hBUkVEX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTfSAvREVCVUcg L09QVDpJQ0YgL09QVDpSRUYiKQotICAgIHNldChDTUFLRV9FWEVfTElOS0VSX0ZMQUdTICIke0NN QUtFX0VYRV9MSU5LRVJfRkxBR1N9IC9ERUJVRyAvT1BUOklDRiAvT1BUOlJFRiIpCi0KLSAgICAj IFdlIGRvIG5vdCB1c2UgZXhjZXB0aW9ucwotICAgIGFkZF9kZWZpbml0aW9ucygtRF9IQVNfRVhD RVBUSU9OUz0wKQotICAgIGFkZF9jb21waWxlX29wdGlvbnMoL0VIYS0gL0VIYy0gL0VIcy0gL2Zw OmV4Y2VwdC0pCi0KLSAgICAjIFdlIGhhdmUgc29tZSB2ZXJ5IGxhcmdlIG9iamVjdCBmaWxlcyB0 aGF0IGhhdmUgdG8gYmUgbGlua2VkCi0gICAgYWRkX2NvbXBpbGVfb3B0aW9ucygvYW5hbHl6ZS0g L2JpZ29iaikKLQotICAgICMgVXNlIENSVCBzZWN1cml0eSBmZWF0dXJlcwotICAgIGFkZF9kZWZp bml0aW9ucygtRF9DUlRfU0VDVVJFX05PX1dBUk5JTkdTIC1EX0NSVF9TRUNVUkVfQ1BQX09WRVJM T0FEX1NUQU5EQVJEX05BTUVTPTEpCi0KLSAgICAjIFR1cm4gb2ZmIGNlcnRhaW4gbGluayBmZWF0 dXJlcwotICAgIGFkZF9jb21waWxlX29wdGlvbnMoL0d5LSAvb3Blbm1wLSAvR0YtKQotCi0gICAg aWYgKCR7Q01BS0VfQlVJTERfVFlQRX0gTUFUQ0hFUyAiRGVidWciKQotICAgICAgICBzZXQoQ01B S0VfU0hBUkVEX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTfSAvT1BU Ok5PUkVGIC9PUFQ6Tk9JQ0YiKQotICAgICAgICBzZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAi JHtDTUFLRV9FWEVfTElOS0VSX0ZMQUdTfSAvT1BUOk5PUkVGIC9PUFQ6Tk9JQ0YiKQotCi0gICAg ICAgICMgVG8gZGVidWcgbGlua2luZyB0aW1lIGlzc3VlcywgdW5jb21tZW50IHRoZSBmb2xsb3dp bmcgdGhyZWUgbGluZXM6Ci0gICAgICAgICNhZGRfY29tcGlsZV9vcHRpb25zKC9CdikKLSAgICAg ICAgI3NldChDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTICIke0NNQUtFX1NIQVJFRF9MSU5LRVJf RkxBR1N9IC9WRVJCT1NFIC9WRVJCT1NFOklOQ1IgL1RJTUUiKQotICAgICAgICAjc2V0KENNQUtF X0VYRV9MSU5LRVJfRkxBR1MgIiR7Q01BS0VfRVhFX0xJTktFUl9GTEFHU30gL1ZFUkJPU0UgL1ZF UkJPU0U6SU5DUiAvVElNRSIpCi0gICAgZWxzZWlmICgke0NNQUtFX0JVSUxEX1RZUEV9IE1BVENI RVMgIlJlbGVhc2UiKQotICAgICAgICBhZGRfY29tcGlsZV9vcHRpb25zKC9PeS0pCi0gICAgZW5k aWYgKCkKLQotICAgIGlmIChOT1QgJHtDTUFLRV9HRU5FUkFUT1J9IE1BVENIRVMgIk5pbmphIikK LSAgICAgICAgbGlua19kaXJlY3RvcmllcygiJHtDTUFLRV9MSUJSQVJZX09VVFBVVF9ESVJFQ1RP Ull9LyR7Q01BS0VfQlVJTERfVFlQRX0iKQotICAgICAgICBhZGRfZGVmaW5pdGlvbnMoL01QKQot ICAgIGVuZGlmICgpCi0gICAgaWYgKE5PVCAke0NNQUtFX0NYWF9GTEFHU30gU1RSRVFVQUwgIiIp Ci0gICAgICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICIoL0VIW2Etel0rKSAiICJcXDEtICIgQ01B S0VfQ1hYX0ZMQUdTICR7Q01BS0VfQ1hYX0ZMQUdTfSkgIyBEaXNhYmxlIEMrKyBleGNlcHRpb25z Ci0gICAgICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICIvRUhzYyQiICIvRUhzLSAvRUhjLSAiIENN QUtFX0NYWF9GTEFHUyAke0NNQUtFX0NYWF9GTEFHU30pICMgRGlzYWJsZSBDKysgZXhjZXB0aW9u cwotICAgICAgICBzdHJpbmcoUkVHRVggUkVQTEFDRSAiL0dSICIgIi9HUi0gIiBDTUFLRV9DWFhf RkxBR1MgJHtDTUFLRV9DWFhfRkxBR1N9KSAjIERpc2FibGUgUlRUSQotICAgICAgICBzdHJpbmco UkVHRVggUkVQTEFDRSAiL1czIiAiL1c0IiBDTUFLRV9DWFhfRkxBR1MgJHtDTUFLRV9DWFhfRkxB R1N9KSAjIFdhcm5pbmdzIGFyZSBpbXBvcnRhbnQKLSAgICBlbmRpZiAoKQotCi0gICAgZm9yZWFj aCAoZmxhZ192YXIKLSAgICAgICAgQ01BS0VfQ19GTEFHUyBDTUFLRV9DX0ZMQUdTX0RFQlVHIENN QUtFX0NfRkxBR1NfUkVMRUFTRQotICAgICAgICBDTUFLRV9DX0ZMQUdTX01JTlNJWkVSRUwgQ01B S0VfQ19GTEFHU19SRUxXSVRIREVCSU5GTwotICAgICAgICBDTUFLRV9DWFhfRkxBR1MgQ01BS0Vf Q1hYX0ZMQUdTX0RFQlVHIENNQUtFX0NYWF9GTEFHU19SRUxFQVNFCi0gICAgICAgIENNQUtFX0NY WF9GTEFHU19NSU5TSVpFUkVMIENNQUtFX0NYWF9GTEFHU19SRUxXSVRIREVCSU5GTykKLSAgICAg ICAgIyBVc2UgdGhlIG11bHRpdGhyZWFkZWQgc3RhdGljIHJ1bnRpbWUgbGlicmFyeSBpbnN0ZWFk IG9mIHRoZSBkZWZhdWx0IERMTCBydW50aW1lLgotICAgICAgICBzdHJpbmcoUkVHRVggUkVQTEFD RSAiL01EIiAiL01UIiAke2ZsYWdfdmFyfSAiJHske2ZsYWdfdmFyfX0iKQotCi0gICAgICAgICMg Tm8gZGVidWcgcnVudGltZSwgZXZlbiBpbiBkZWJ1ZyBidWlsZHMuCi0gICAgICAgIGlmIChOT1Qg REVCVUdfU1VGRklYKQotICAgICAgICAgICAgc3RyaW5nKFJFR0VYIFJFUExBQ0UgIi9NVGQiICIv TVQiICR7ZmxhZ192YXJ9ICIkeyR7ZmxhZ192YXJ9fSIpCi0gICAgICAgICAgICBzdHJpbmcoUkVH RVggUkVQTEFDRSAiL0RfREVCVUciICIiICR7ZmxhZ192YXJ9ICIkeyR7ZmxhZ192YXJ9fSIpCi0g ICAgICAgIGVuZGlmICgpCi0gICAgZW5kZm9yZWFjaCAoKQotZW5kaWYgKCkKLQogc2V0KFBPUlQg V2luKQogc2V0KEphdmFTY3JpcHRDb3JlX0xJQlJBUllfVFlQRSBTSEFSRUQpCiBzZXQoV1RGX0xJ QlJBUllfVFlQRSBTSEFSRUQpCg== 310581 2017-05-18 17:45:21 -0700 2017-05-19 12:25:37 -0700 Patch bug-172230.diff text/plain 7529 don.olmstead ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAxOGQ5YTJkNDk4NC4uNTEy ODA2YjExYmEgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMyBAQAorMjAxNy0wNS0xOCAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQGFtLnNvbnku Y29tPgorCisgICAgICAgIFtXaW5dW0NNYWtlXSBNb3ZlIE1TVkMgY29tcGlsZXIgb3B0aW9ucyB0 byBhIGNvbW1vbiBsb2NhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyMjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2U6IEFkZGVkLgorICAg ICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zV2luLmNtYWtlOgorCiAyMDE3LTA1LTE2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXSBTZXQgYW5k IGV4cG9zZSBFTkFCTEVfREVWRUxPUEVSX01PREUgaW4gYnVpbGQgd2hlbiBERVZFTE9QRVJfTU9E RSBpcyBlbmFibGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2Ug Yi9Tb3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2UKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAuLjViMGEyMmY5ZGM2Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL2Nt YWtlL09wdGlvbnNNU1ZDLmNtYWtlCkBAIC0wLDAgKzEsNjUgQEAKK2FkZF9jb21waWxlX29wdGlv bnMoCisgICAgL3dkNDAxOCAvd2Q0MDY4IC93ZDQwOTkgL3dkNDEwMCAvd2Q0MTI3IC93ZDQxMzgg L3dkNDE0NiAvd2Q0MTgwIC93ZDQxODkKKyAgICAvd2Q0MjAxIC93ZDQyMDYgL3dkNDI0NCAvd2Q0 MjUxIC93ZDQyNjcgL3dkNDI3NSAvd2Q0Mjg4IC93ZDQyOTEgL3dkNDMwNQorICAgIC93ZDQzMDkg L3dkNDM0NCAvd2Q0MzU1IC93ZDQzODkgL3dkNDM5NiAvd2Q0NDU2IC93ZDQ0NTcgL3dkNDQ1OCAv d2Q0NDU5CisgICAgL3dkNDQ4MSAvd2Q0NTAzIC93ZDQ1MDUgL3dkNDUxMCAvd2Q0NTEyIC93ZDQ1 MzAgL3dkNDYxMCAvd2Q0NjExIC93ZDQ2NDYKKyAgICAvd2Q0NzAyIC93ZDQ3MDYgL3dkNDcyMiAv d2Q0ODAwIC93ZDQ4MTkgL3dkNDk1MSAvd2Q0OTUyIC93ZDQ5OTYgL3dkNjAxMQorICAgIC93ZDYw MzEgL3dkNjIxMSAvd2Q2MjQ2IC93ZDYyNTUgL3dkNjM4NworKQorCisjIENyZWF0ZSBwZGIgZmls ZXMgZm9yIGRlYnVnZ2luZyBwdXJwb3NlcywgYWxzbyBmb3IgUmVsZWFzZSBidWlsZHMKK2FkZF9j b21waWxlX29wdGlvbnMoL1ppIC9HUykKKworc2V0KENNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1Mg IiR7Q01BS0VfU0hBUkVEX0xJTktFUl9GTEFHU30gL0RFQlVHIC9PUFQ6SUNGIC9PUFQ6UkVGIikK K3NldChDTUFLRV9FWEVfTElOS0VSX0ZMQUdTICIke0NNQUtFX0VYRV9MSU5LRVJfRkxBR1N9IC9E RUJVRyAvT1BUOklDRiAvT1BUOlJFRiIpCisKKyMgV2UgZG8gbm90IHVzZSBleGNlcHRpb25zCith ZGRfZGVmaW5pdGlvbnMoLURfSEFTX0VYQ0VQVElPTlM9MCkKK2FkZF9jb21waWxlX29wdGlvbnMo L0VIYS0gL0VIYy0gL0VIcy0gL2ZwOmV4Y2VwdC0pCisKKyMgV2UgaGF2ZSBzb21lIHZlcnkgbGFy Z2Ugb2JqZWN0IGZpbGVzIHRoYXQgaGF2ZSB0byBiZSBsaW5rZWQKK2FkZF9jb21waWxlX29wdGlv bnMoL2FuYWx5emUtIC9iaWdvYmopCisKKyMgVXNlIENSVCBzZWN1cml0eSBmZWF0dXJlcworYWRk X2RlZmluaXRpb25zKC1EX0NSVF9TRUNVUkVfTk9fV0FSTklOR1MgLURfQ1JUX1NFQ1VSRV9DUFBf T1ZFUkxPQURfU1RBTkRBUkRfTkFNRVM9MSkKKworIyBUdXJuIG9mZiBjZXJ0YWluIGxpbmsgZmVh dHVyZXMKK2FkZF9jb21waWxlX29wdGlvbnMoL0d5LSAvb3Blbm1wLSAvR0YtKQorCitpZiAoJHtD TUFLRV9CVUlMRF9UWVBFfSBNQVRDSEVTICJEZWJ1ZyIpCisgICAgc2V0KENNQUtFX1NIQVJFRF9M SU5LRVJfRkxBR1MgIiR7Q01BS0VfU0hBUkVEX0xJTktFUl9GTEFHU30gL09QVDpOT1JFRiAvT1BU Ok5PSUNGIikKKyAgICBzZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9FWEVfTElO S0VSX0ZMQUdTfSAvT1BUOk5PUkVGIC9PUFQ6Tk9JQ0YiKQorCisgICAgIyBUbyBkZWJ1ZyBsaW5r aW5nIHRpbWUgaXNzdWVzLCB1bmNvbW1lbnQgdGhlIGZvbGxvd2luZyB0aHJlZSBsaW5lczoKKyAg ICAjYWRkX2NvbXBpbGVfb3B0aW9ucygvQnYpCisgICAgI3NldChDTUFLRV9TSEFSRURfTElOS0VS X0ZMQUdTICIke0NNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1N9IC9WRVJCT1NFIC9WRVJCT1NFOklO Q1IgL1RJTUUiKQorICAgICNzZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9FWEVf TElOS0VSX0ZMQUdTfSAvVkVSQk9TRSAvVkVSQk9TRTpJTkNSIC9USU1FIikKK2Vsc2VpZiAoJHtD TUFLRV9CVUlMRF9UWVBFfSBNQVRDSEVTICJSZWxlYXNlIikKKyAgICBhZGRfY29tcGlsZV9vcHRp b25zKC9PeS0pCitlbmRpZiAoKQorCitpZiAoTk9UICR7Q01BS0VfR0VORVJBVE9SfSBNQVRDSEVT ICJOaW5qYSIpCisgICAgbGlua19kaXJlY3RvcmllcygiJHtDTUFLRV9MSUJSQVJZX09VVFBVVF9E SVJFQ1RPUll9LyR7Q01BS0VfQlVJTERfVFlQRX0iKQorICAgIGFkZF9kZWZpbml0aW9ucygvTVAp CitlbmRpZiAoKQoraWYgKE5PVCAke0NNQUtFX0NYWF9GTEFHU30gU1RSRVFVQUwgIiIpCisgICAg c3RyaW5nKFJFR0VYIFJFUExBQ0UgIigvRUhbYS16XSspICIgIlxcMS0gIiBDTUFLRV9DWFhfRkxB R1MgJHtDTUFLRV9DWFhfRkxBR1N9KSAjIERpc2FibGUgQysrIGV4Y2VwdGlvbnMKKyAgICBzdHJp bmcoUkVHRVggUkVQTEFDRSAiL0VIc2MkIiAiL0VIcy0gL0VIYy0gIiBDTUFLRV9DWFhfRkxBR1Mg JHtDTUFLRV9DWFhfRkxBR1N9KSAjIERpc2FibGUgQysrIGV4Y2VwdGlvbnMKKyAgICBzdHJpbmco UkVHRVggUkVQTEFDRSAiL0dSICIgIi9HUi0gIiBDTUFLRV9DWFhfRkxBR1MgJHtDTUFLRV9DWFhf RkxBR1N9KSAjIERpc2FibGUgUlRUSQorICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICIvVzMiICIv VzQiIENNQUtFX0NYWF9GTEFHUyAke0NNQUtFX0NYWF9GTEFHU30pICMgV2FybmluZ3MgYXJlIGlt cG9ydGFudAorZW5kaWYgKCkKKworZm9yZWFjaCAoZmxhZ192YXIKKyAgICBDTUFLRV9DX0ZMQUdT IENNQUtFX0NfRkxBR1NfREVCVUcgQ01BS0VfQ19GTEFHU19SRUxFQVNFCisgICAgQ01BS0VfQ19G TEFHU19NSU5TSVpFUkVMIENNQUtFX0NfRkxBR1NfUkVMV0lUSERFQklORk8KKyAgICBDTUFLRV9D WFhfRkxBR1MgQ01BS0VfQ1hYX0ZMQUdTX0RFQlVHIENNQUtFX0NYWF9GTEFHU19SRUxFQVNFCisg ICAgQ01BS0VfQ1hYX0ZMQUdTX01JTlNJWkVSRUwgQ01BS0VfQ1hYX0ZMQUdTX1JFTFdJVEhERUJJ TkZPKQorICAgICMgVXNlIHRoZSBtdWx0aXRocmVhZGVkIHN0YXRpYyBydW50aW1lIGxpYnJhcnkg aW5zdGVhZCBvZiB0aGUgZGVmYXVsdCBETEwgcnVudGltZS4KKyAgICBzdHJpbmcoUkVHRVggUkVQ TEFDRSAiL01EIiAiL01UIiAke2ZsYWdfdmFyfSAiJHske2ZsYWdfdmFyfX0iKQorCisgICAgIyBO byBkZWJ1ZyBydW50aW1lLCBldmVuIGluIGRlYnVnIGJ1aWxkcy4KKyAgICBpZiAoTk9UIERFQlVH X1NVRkZJWCkKKyAgICAgICAgc3RyaW5nKFJFR0VYIFJFUExBQ0UgIi9NVGQiICIvTVQiICR7Zmxh Z192YXJ9ICIkeyR7ZmxhZ192YXJ9fSIpCisgICAgICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICIv RF9ERUJVRyIgIiIgJHtmbGFnX3Zhcn0gIiR7JHtmbGFnX3Zhcn19IikKKyAgICBlbmRpZiAoKQor ZW5kZm9yZWFjaCAoKQpkaWZmIC0tZ2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNXaW4uY21ha2Ug Yi9Tb3VyY2UvY21ha2UvT3B0aW9uc1dpbi5jbWFrZQppbmRleCA1ZDkzYmEwNTRlNS4uNzE3Mjlj Y2E1NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zV2luLmNtYWtlCisrKyBiL1Nv dXJjZS9jbWFrZS9PcHRpb25zV2luLmNtYWtlCkBAIC0xMjYsNzEgKzEyNiw3IEBAIHNldChDTUFL RV9SVU5USU1FX09VVFBVVF9ESVJFQ1RPUllfREVCVUcgIiR7Q01BS0VfUlVOVElNRV9PVVRQVVRf RElSRUNUT1JZfSIpCiBzZXQoQ01BS0VfUlVOVElNRV9PVVRQVVRfRElSRUNUT1JZX1JFTEVBU0Ug IiR7Q01BS0VfUlVOVElNRV9PVVRQVVRfRElSRUNUT1JZfSIpCiAKIGlmIChNU1ZDKQotICAgIGFk ZF9kZWZpbml0aW9ucygKLSAgICAgICAgL3dkNDAxOCAvd2Q0MDY4IC93ZDQwOTkgL3dkNDEwMCAv d2Q0MTI3IC93ZDQxMzggL3dkNDE0NiAvd2Q0MTgwIC93ZDQxODkKLSAgICAgICAgL3dkNDIwMSAv d2Q0MjA2IC93ZDQyNDQgL3dkNDI1MSAvd2Q0MjY3IC93ZDQyNzUgL3dkNDI4OCAvd2Q0MjkxIC93 ZDQzMDUKLSAgICAgICAgL3dkNDMwOSAvd2Q0MzQ0IC93ZDQzNTUgL3dkNDM4OSAvd2Q0Mzk2IC93 ZDQ0NTYgL3dkNDQ1NyAvd2Q0NDU4IC93ZDQ0NTkKLSAgICAgICAgL3dkNDQ4MSAvd2Q0NTAzIC93 ZDQ1MDUgL3dkNDUxMCAvd2Q0NTEyIC93ZDQ1MzAgL3dkNDYxMCAvd2Q0NjExIC93ZDQ2NDYKLSAg ICAgICAgL3dkNDcwMiAvd2Q0NzA2IC93ZDQ3MjIgL3dkNDgwMCAvd2Q0ODE5IC93ZDQ5NTEgL3dk NDk1MiAvd2Q0OTk2IC93ZDYwMTEKLSAgICAgICAgL3dkNjAzMSAvd2Q2MjExIC93ZDYyNDYgL3dk NjI1NSAvd2Q2Mzg3Ci0gICAgKQotCi0gICAgIyBDcmVhdGUgcGRiIGZpbGVzIGZvciBkZWJ1Z2dp bmcgcHVycG9zZXMsIGFsc28gZm9yIFJlbGVhc2UgYnVpbGRzCi0gICAgYWRkX2NvbXBpbGVfb3B0 aW9ucygvWmkgL0dTKQotCi0gICAgc2V0KENNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1MgIiR7Q01B S0VfU0hBUkVEX0xJTktFUl9GTEFHU30gL0RFQlVHIC9PUFQ6SUNGIC9PUFQ6UkVGIikKLSAgICBz ZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9FWEVfTElOS0VSX0ZMQUdTfSAvREVC VUcgL09QVDpJQ0YgL09QVDpSRUYiKQotCi0gICAgIyBXZSBkbyBub3QgdXNlIGV4Y2VwdGlvbnMK LSAgICBhZGRfZGVmaW5pdGlvbnMoLURfSEFTX0VYQ0VQVElPTlM9MCkKLSAgICBhZGRfY29tcGls ZV9vcHRpb25zKC9FSGEtIC9FSGMtIC9FSHMtIC9mcDpleGNlcHQtKQotCi0gICAgIyBXZSBoYXZl IHNvbWUgdmVyeSBsYXJnZSBvYmplY3QgZmlsZXMgdGhhdCBoYXZlIHRvIGJlIGxpbmtlZAotICAg IGFkZF9jb21waWxlX29wdGlvbnMoL2FuYWx5emUtIC9iaWdvYmopCi0KLSAgICAjIFVzZSBDUlQg c2VjdXJpdHkgZmVhdHVyZXMKLSAgICBhZGRfZGVmaW5pdGlvbnMoLURfQ1JUX1NFQ1VSRV9OT19X QVJOSU5HUyAtRF9DUlRfU0VDVVJFX0NQUF9PVkVSTE9BRF9TVEFOREFSRF9OQU1FUz0xKQotCi0g ICAgIyBUdXJuIG9mZiBjZXJ0YWluIGxpbmsgZmVhdHVyZXMKLSAgICBhZGRfY29tcGlsZV9vcHRp b25zKC9HeS0gL29wZW5tcC0gL0dGLSkKLQotICAgIGlmICgke0NNQUtFX0JVSUxEX1RZUEV9IE1B VENIRVMgIkRlYnVnIikKLSAgICAgICAgc2V0KENNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1MgIiR7 Q01BS0VfU0hBUkVEX0xJTktFUl9GTEFHU30gL09QVDpOT1JFRiAvT1BUOk5PSUNGIikKLSAgICAg ICAgc2V0KENNQUtFX0VYRV9MSU5LRVJfRkxBR1MgIiR7Q01BS0VfRVhFX0xJTktFUl9GTEFHU30g L09QVDpOT1JFRiAvT1BUOk5PSUNGIikKLQotICAgICAgICAjIFRvIGRlYnVnIGxpbmtpbmcgdGlt ZSBpc3N1ZXMsIHVuY29tbWVudCB0aGUgZm9sbG93aW5nIHRocmVlIGxpbmVzOgotICAgICAgICAj YWRkX2NvbXBpbGVfb3B0aW9ucygvQnYpCi0gICAgICAgICNzZXQoQ01BS0VfU0hBUkVEX0xJTktF Ul9GTEFHUyAiJHtDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTfSAvVkVSQk9TRSAvVkVSQk9TRTpJ TkNSIC9USU1FIikKLSAgICAgICAgI3NldChDTUFLRV9FWEVfTElOS0VSX0ZMQUdTICIke0NNQUtF X0VYRV9MSU5LRVJfRkxBR1N9IC9WRVJCT1NFIC9WRVJCT1NFOklOQ1IgL1RJTUUiKQotICAgIGVs c2VpZiAoJHtDTUFLRV9CVUlMRF9UWVBFfSBNQVRDSEVTICJSZWxlYXNlIikKLSAgICAgICAgYWRk X2NvbXBpbGVfb3B0aW9ucygvT3ktKQotICAgIGVuZGlmICgpCi0KLSAgICBpZiAoTk9UICR7Q01B S0VfR0VORVJBVE9SfSBNQVRDSEVTICJOaW5qYSIpCi0gICAgICAgIGxpbmtfZGlyZWN0b3JpZXMo IiR7Q01BS0VfTElCUkFSWV9PVVRQVVRfRElSRUNUT1JZfS8ke0NNQUtFX0JVSUxEX1RZUEV9IikK LSAgICAgICAgYWRkX2RlZmluaXRpb25zKC9NUCkKLSAgICBlbmRpZiAoKQotICAgIGlmIChOT1Qg JHtDTUFLRV9DWFhfRkxBR1N9IFNUUkVRVUFMICIiKQotICAgICAgICBzdHJpbmcoUkVHRVggUkVQ TEFDRSAiKC9FSFthLXpdKykgIiAiXFwxLSAiIENNQUtFX0NYWF9GTEFHUyAke0NNQUtFX0NYWF9G TEFHU30pICMgRGlzYWJsZSBDKysgZXhjZXB0aW9ucwotICAgICAgICBzdHJpbmcoUkVHRVggUkVQ TEFDRSAiL0VIc2MkIiAiL0VIcy0gL0VIYy0gIiBDTUFLRV9DWFhfRkxBR1MgJHtDTUFLRV9DWFhf RkxBR1N9KSAjIERpc2FibGUgQysrIGV4Y2VwdGlvbnMKLSAgICAgICAgc3RyaW5nKFJFR0VYIFJF UExBQ0UgIi9HUiAiICIvR1ItICIgQ01BS0VfQ1hYX0ZMQUdTICR7Q01BS0VfQ1hYX0ZMQUdTfSkg IyBEaXNhYmxlIFJUVEkKLSAgICAgICAgc3RyaW5nKFJFR0VYIFJFUExBQ0UgIi9XMyIgIi9XNCIg Q01BS0VfQ1hYX0ZMQUdTICR7Q01BS0VfQ1hYX0ZMQUdTfSkgIyBXYXJuaW5ncyBhcmUgaW1wb3J0 YW50Ci0gICAgZW5kaWYgKCkKLQotICAgIGZvcmVhY2ggKGZsYWdfdmFyCi0gICAgICAgIENNQUtF X0NfRkxBR1MgQ01BS0VfQ19GTEFHU19ERUJVRyBDTUFLRV9DX0ZMQUdTX1JFTEVBU0UKLSAgICAg ICAgQ01BS0VfQ19GTEFHU19NSU5TSVpFUkVMIENNQUtFX0NfRkxBR1NfUkVMV0lUSERFQklORk8K LSAgICAgICAgQ01BS0VfQ1hYX0ZMQUdTIENNQUtFX0NYWF9GTEFHU19ERUJVRyBDTUFLRV9DWFhf RkxBR1NfUkVMRUFTRQotICAgICAgICBDTUFLRV9DWFhfRkxBR1NfTUlOU0laRVJFTCBDTUFLRV9D WFhfRkxBR1NfUkVMV0lUSERFQklORk8pCi0gICAgICAgICMgVXNlIHRoZSBtdWx0aXRocmVhZGVk IHN0YXRpYyBydW50aW1lIGxpYnJhcnkgaW5zdGVhZCBvZiB0aGUgZGVmYXVsdCBETEwgcnVudGlt ZS4KLSAgICAgICAgc3RyaW5nKFJFR0VYIFJFUExBQ0UgIi9NRCIgIi9NVCIgJHtmbGFnX3Zhcn0g IiR7JHtmbGFnX3Zhcn19IikKLQotICAgICAgICAjIE5vIGRlYnVnIHJ1bnRpbWUsIGV2ZW4gaW4g ZGVidWcgYnVpbGRzLgotICAgICAgICBpZiAoTk9UIERFQlVHX1NVRkZJWCkKLSAgICAgICAgICAg IHN0cmluZyhSRUdFWCBSRVBMQUNFICIvTVRkIiAiL01UIiAke2ZsYWdfdmFyfSAiJHske2ZsYWdf dmFyfX0iKQotICAgICAgICAgICAgc3RyaW5nKFJFR0VYIFJFUExBQ0UgIi9EX0RFQlVHIiAiIiAk e2ZsYWdfdmFyfSAiJHske2ZsYWdfdmFyfX0iKQotICAgICAgICBlbmRpZiAoKQotICAgIGVuZGZv cmVhY2ggKCkKKyAgICBpbmNsdWRlKE9wdGlvbnNNU1ZDKQogZW5kaWYgKCkKIAogc2V0KFBPUlQg V2luKQo= 310682 2017-05-19 12:25:37 -0700 2017-05-22 00:15:24 -0700 Patch bug-172230.diff text/plain 11419 don.olmstead ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBkNzM2MGMwZmVkOS4uNmJj ZWY0ZTg4YzIgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsNSAr MSwxNSBAQAogMjAxNy0wNS0xOSAgRG9uIE9sbXN0ZWFkICA8ZG9uLm9sbXN0ZWFkQGFtLnNvbnku Y29tPgogCisgICAgICAgIFtXaW5dW0NNYWtlXSBNb3ZlIE1TVkMgY29tcGlsZXIgb3B0aW9ucyB0 byBhIGNvbW1vbiBsb2NhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcyMjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2U6IEFkZGVkLgorICAg ICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zV2luLmNtYWtlOgorCisyMDE3LTA1LTE5ICBEb24g T2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAYW0uc29ueS5jb20+CisKICAgICAgICAgW0NNYWtlXSBB ZGQgSEFWRSBjaGVjayBmb3IgX19pbnQxMjhfdAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcyMzE3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggYTkxNjhmODQ5YTguLmNi ZDVlZGNkZjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE3LTA1LTE5ICBEb24gT2xt c3RlYWQgIDxkb24ub2xtc3RlYWRAYW0uc29ueS5jb20+CisKKyAgICAgICAgW1dpbl1bQ01ha2Vd IE1vdmUgTVNWQyBjb21waWxlciBvcHRpb25zIHRvIGEgY29tbW9uIGxvY2F0aW9uCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzIyMzAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRmb3JtV2luLmNt YWtlOgorCiAyMDE3LTA0LTIwICBLb25zdGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5y dT4KIAogICAgICAgICBbY21ha2VdIERlZmluZSBGT1JXQVJESU5HX0hFQURFUlNfRElSIGluIFdl YktpdEZTIGFuZCB1c2UgaXQgZXZlcnl3aGVyZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9Q bGF0Zm9ybVdpbi5jbWFrZSBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm1XaW4uY21ha2UKaW5kZXgg MGRhYWFiODMwZTkuLjhhZTMxMjMzN2NjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRm b3JtV2luLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm1XaW4uY21ha2UKQEAgLTQ0 NSwyMiArNDQ1LDYgQEAgZW5kaWYgKCkKIAogc2V0KFdlYktpdF9MSUJSQVJZX1RZUEUgU0hBUkVE KQogCi0jIE1ha2Ugc3VyZSBpbmNyZW1lbnRhbCBsaW5raW5nIGlzIHR1cm5lZCBvZmYsIGFzIGl0 IGNyZWF0ZXMgdW5hY2NlcHRhYmx5IGxvbmcgbGluayB0aW1lcy4KLXN0cmluZyhSRVBMQUNFICJJ TkNSRU1FTlRBTDpZRVMiICJJTkNSRU1FTlRBTDpOTyIgcmVwbGFjZV9DTUFLRV9TSEFSRURfTElO S0VSX0ZMQUdTICR7Q01BS0VfU0hBUkVEX0xJTktFUl9GTEFHU30pCi1zZXQoQ01BS0VfU0hBUkVE X0xJTktFUl9GTEFHUyAiJHtyZXBsYWNlX0NNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1N9IC9JTkNS RU1FTlRBTDpOTyIpCi1zdHJpbmcoUkVQTEFDRSAiSU5DUkVNRU5UQUw6WUVTIiAiSU5DUkVNRU5U QUw6Tk8iIHJlcGxhY2VfQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAke0NNQUtFX0VYRV9MSU5LRVJf RkxBR1N9KQotc2V0KENNQUtFX0VYRV9MSU5LRVJfRkxBR1MgIiR7cmVwbGFjZV9DTUFLRV9FWEVf TElOS0VSX0ZMQUdTfSAvSU5DUkVNRU5UQUw6Tk8iKQotCi1zdHJpbmcoUkVQTEFDRSAiSU5DUkVN RU5UQUw6WUVTIiAiSU5DUkVNRU5UQUw6Tk8iIHJlcGxhY2VfQ01BS0VfU0hBUkVEX0xJTktFUl9G TEFHU19ERUJVRyAke0NNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1NfREVCVUd9KQotc2V0KENNQUtF X1NIQVJFRF9MSU5LRVJfRkxBR1NfREVCVUcgIiR7cmVwbGFjZV9DTUFLRV9TSEFSRURfTElOS0VS X0ZMQUdTX0RFQlVHfSAvSU5DUkVNRU5UQUw6Tk8iKQotc3RyaW5nKFJFUExBQ0UgIklOQ1JFTUVO VEFMOllFUyIgIklOQ1JFTUVOVEFMOk5PIiByZXBsYWNlX0NNQUtFX0VYRV9MSU5LRVJfRkxBR1Nf REVCVUcgJHtDTUFLRV9FWEVfTElOS0VSX0ZMQUdTX0RFQlVHfSkKLXNldChDTUFLRV9FWEVfTElO S0VSX0ZMQUdTX0RFQlVHICIke3JlcGxhY2VfQ01BS0VfRVhFX0xJTktFUl9GTEFHU19ERUJVR30g L0lOQ1JFTUVOVEFMOk5PIikKLQotc3RyaW5nKFJFUExBQ0UgIklOQ1JFTUVOVEFMOllFUyIgIklO Q1JFTUVOVEFMOk5PIiByZXBsYWNlX0NNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1NfUkVMV0lUSERF QklORk8gJHtDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTX1JFTFdJVEhERUJJTkZPfSkKLXNldChD TUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTX1JFTFdJVEhERUJJTkZPICIke3JlcGxhY2VfQ01BS0Vf U0hBUkVEX0xJTktFUl9GTEFHU19SRUxXSVRIREVCSU5GT30gL0lOQ1JFTUVOVEFMOk5PIikKLXN0 cmluZyhSRVBMQUNFICJJTkNSRU1FTlRBTDpZRVMiICJJTkNSRU1FTlRBTDpOTyIgcmVwbGFjZV9D TUFLRV9FWEVfTElOS0VSX0ZMQUdTX1JFTFdJVEhERUJJTkZPICR7Q01BS0VfRVhFX0xJTktFUl9G TEFHU19SRUxXSVRIREVCSU5GT30pCi1zZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFHU19SRUxXSVRI REVCSU5GTyAiJHtyZXBsYWNlX0NNQUtFX0VYRV9MSU5LRVJfRkxBR1NfUkVMV0lUSERFQklORk99 IC9JTkNSRU1FTlRBTDpOTyIpCi0KIHNldChDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTICIke0NN QUtFX1NIQVJFRF9MSU5LRVJfRkxBR1N9IC9TVUJTWVNURU06V0lORE9XUyIpCiBzZXQoQ01BS0Vf RVhFX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9FWEVfTElOS0VSX0ZMQUdTfSAvU1VCU1lTVEVNOldJ TkRPV1MiKQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2UgYi9T b3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2UKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAuLmRmMTJhOGQ4NDNkCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL2NtYWtl L09wdGlvbnNNU1ZDLmNtYWtlCkBAIC0wLDAgKzEsODEgQEAKK2FkZF9jb21waWxlX29wdGlvbnMo CisgICAgL3dkNDAxOCAvd2Q0MDY4IC93ZDQwOTkgL3dkNDEwMCAvd2Q0MTI3IC93ZDQxMzggL3dk NDE0NiAvd2Q0MTgwIC93ZDQxODkKKyAgICAvd2Q0MjAxIC93ZDQyMDYgL3dkNDI0NCAvd2Q0MjUx IC93ZDQyNjcgL3dkNDI3NSAvd2Q0Mjg4IC93ZDQyOTEgL3dkNDMwNQorICAgIC93ZDQzMDkgL3dk NDM0NCAvd2Q0MzU1IC93ZDQzODkgL3dkNDM5NiAvd2Q0NDU2IC93ZDQ0NTcgL3dkNDQ1OCAvd2Q0 NDU5CisgICAgL3dkNDQ4MSAvd2Q0NTAzIC93ZDQ1MDUgL3dkNDUxMCAvd2Q0NTEyIC93ZDQ1MzAg L3dkNDYxMCAvd2Q0NjExIC93ZDQ2NDYKKyAgICAvd2Q0NzAyIC93ZDQ3MDYgL3dkNDcyMiAvd2Q0 ODAwIC93ZDQ4MTkgL3dkNDk1MSAvd2Q0OTUyIC93ZDQ5OTYgL3dkNjAxMQorICAgIC93ZDYwMzEg L3dkNjIxMSAvd2Q2MjQ2IC93ZDYyNTUgL3dkNjM4NworKQorCisjIENyZWF0ZSBwZGIgZmlsZXMg Zm9yIGRlYnVnZ2luZyBwdXJwb3NlcywgYWxzbyBmb3IgUmVsZWFzZSBidWlsZHMKK2FkZF9jb21w aWxlX29wdGlvbnMoL1ppIC9HUykKKworc2V0KENNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1MgIiR7 Q01BS0VfU0hBUkVEX0xJTktFUl9GTEFHU30gL0RFQlVHIC9PUFQ6SUNGIC9PUFQ6UkVGIikKK3Nl dChDTUFLRV9FWEVfTElOS0VSX0ZMQUdTICIke0NNQUtFX0VYRV9MSU5LRVJfRkxBR1N9IC9ERUJV RyAvT1BUOklDRiAvT1BUOlJFRiIpCisKKyMgV2UgZG8gbm90IHVzZSBleGNlcHRpb25zCithZGRf ZGVmaW5pdGlvbnMoLURfSEFTX0VYQ0VQVElPTlM9MCkKK2FkZF9jb21waWxlX29wdGlvbnMoL0VI YS0gL0VIYy0gL0VIcy0gL2ZwOmV4Y2VwdC0pCisKKyMgV2UgaGF2ZSBzb21lIHZlcnkgbGFyZ2Ug b2JqZWN0IGZpbGVzIHRoYXQgaGF2ZSB0byBiZSBsaW5rZWQKK2FkZF9jb21waWxlX29wdGlvbnMo L2FuYWx5emUtIC9iaWdvYmopCisKKyMgVXNlIENSVCBzZWN1cml0eSBmZWF0dXJlcworYWRkX2Rl ZmluaXRpb25zKC1EX0NSVF9TRUNVUkVfTk9fV0FSTklOR1MgLURfQ1JUX1NFQ1VSRV9DUFBfT1ZF UkxPQURfU1RBTkRBUkRfTkFNRVM9MSkKKworIyBUdXJuIG9mZiBjZXJ0YWluIGxpbmsgZmVhdHVy ZXMKK2FkZF9jb21waWxlX29wdGlvbnMoL0d5LSAvb3Blbm1wLSAvR0YtKQorCitpZiAoJHtDTUFL RV9CVUlMRF9UWVBFfSBNQVRDSEVTICJEZWJ1ZyIpCisgICAgc2V0KENNQUtFX1NIQVJFRF9MSU5L RVJfRkxBR1MgIiR7Q01BS0VfU0hBUkVEX0xJTktFUl9GTEFHU30gL09QVDpOT1JFRiAvT1BUOk5P SUNGIikKKyAgICBzZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9FWEVfTElOS0VS X0ZMQUdTfSAvT1BUOk5PUkVGIC9PUFQ6Tk9JQ0YiKQorCisgICAgIyBUbyBkZWJ1ZyBsaW5raW5n IHRpbWUgaXNzdWVzLCB1bmNvbW1lbnQgdGhlIGZvbGxvd2luZyB0aHJlZSBsaW5lczoKKyAgICAj YWRkX2NvbXBpbGVfb3B0aW9ucygvQnYpCisgICAgI3NldChDTUFLRV9TSEFSRURfTElOS0VSX0ZM QUdTICIke0NNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1N9IC9WRVJCT1NFIC9WRVJCT1NFOklOQ1Ig L1RJTUUiKQorICAgICNzZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9FWEVfTElO S0VSX0ZMQUdTfSAvVkVSQk9TRSAvVkVSQk9TRTpJTkNSIC9USU1FIikKK2Vsc2VpZiAoJHtDTUFL RV9CVUlMRF9UWVBFfSBNQVRDSEVTICJSZWxlYXNlIikKKyAgICBhZGRfY29tcGlsZV9vcHRpb25z KC9PeS0pCitlbmRpZiAoKQorCitpZiAoTk9UICR7Q01BS0VfR0VORVJBVE9SfSBNQVRDSEVTICJO aW5qYSIpCisgICAgbGlua19kaXJlY3RvcmllcygiJHtDTUFLRV9MSUJSQVJZX09VVFBVVF9ESVJF Q1RPUll9LyR7Q01BS0VfQlVJTERfVFlQRX0iKQorICAgIGFkZF9kZWZpbml0aW9ucygvTVApCitl bmRpZiAoKQoraWYgKE5PVCAke0NNQUtFX0NYWF9GTEFHU30gU1RSRVFVQUwgIiIpCisgICAgc3Ry aW5nKFJFR0VYIFJFUExBQ0UgIigvRUhbYS16XSspICIgIlxcMS0gIiBDTUFLRV9DWFhfRkxBR1Mg JHtDTUFLRV9DWFhfRkxBR1N9KSAjIERpc2FibGUgQysrIGV4Y2VwdGlvbnMKKyAgICBzdHJpbmco UkVHRVggUkVQTEFDRSAiL0VIc2MkIiAiL0VIcy0gL0VIYy0gIiBDTUFLRV9DWFhfRkxBR1MgJHtD TUFLRV9DWFhfRkxBR1N9KSAjIERpc2FibGUgQysrIGV4Y2VwdGlvbnMKKyAgICBzdHJpbmcoUkVH RVggUkVQTEFDRSAiL0dSICIgIi9HUi0gIiBDTUFLRV9DWFhfRkxBR1MgJHtDTUFLRV9DWFhfRkxB R1N9KSAjIERpc2FibGUgUlRUSQorICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICIvVzMiICIvVzQi IENNQUtFX0NYWF9GTEFHUyAke0NNQUtFX0NYWF9GTEFHU30pICMgV2FybmluZ3MgYXJlIGltcG9y dGFudAorZW5kaWYgKCkKKworZm9yZWFjaCAoZmxhZ192YXIKKyAgICBDTUFLRV9DX0ZMQUdTIENN QUtFX0NfRkxBR1NfREVCVUcgQ01BS0VfQ19GTEFHU19SRUxFQVNFCisgICAgQ01BS0VfQ19GTEFH U19NSU5TSVpFUkVMIENNQUtFX0NfRkxBR1NfUkVMV0lUSERFQklORk8KKyAgICBDTUFLRV9DWFhf RkxBR1MgQ01BS0VfQ1hYX0ZMQUdTX0RFQlVHIENNQUtFX0NYWF9GTEFHU19SRUxFQVNFCisgICAg Q01BS0VfQ1hYX0ZMQUdTX01JTlNJWkVSRUwgQ01BS0VfQ1hYX0ZMQUdTX1JFTFdJVEhERUJJTkZP KQorICAgICMgVXNlIHRoZSBtdWx0aXRocmVhZGVkIHN0YXRpYyBydW50aW1lIGxpYnJhcnkgaW5z dGVhZCBvZiB0aGUgZGVmYXVsdCBETEwgcnVudGltZS4KKyAgICBzdHJpbmcoUkVHRVggUkVQTEFD RSAiL01EIiAiL01UIiAke2ZsYWdfdmFyfSAiJHske2ZsYWdfdmFyfX0iKQorCisgICAgIyBObyBk ZWJ1ZyBydW50aW1lLCBldmVuIGluIGRlYnVnIGJ1aWxkcy4KKyAgICBpZiAoTk9UIERFQlVHX1NV RkZJWCkKKyAgICAgICAgc3RyaW5nKFJFR0VYIFJFUExBQ0UgIi9NVGQiICIvTVQiICR7ZmxhZ192 YXJ9ICIkeyR7ZmxhZ192YXJ9fSIpCisgICAgICAgIHN0cmluZyhSRUdFWCBSRVBMQUNFICIvRF9E RUJVRyIgIiIgJHtmbGFnX3Zhcn0gIiR7JHtmbGFnX3Zhcn19IikKKyAgICBlbmRpZiAoKQorZW5k Zm9yZWFjaCAoKQorCisjIE1ha2Ugc3VyZSBpbmNyZW1lbnRhbCBsaW5raW5nIGlzIHR1cm5lZCBv ZmYsIGFzIGl0IGNyZWF0ZXMgdW5hY2NlcHRhYmx5IGxvbmcgbGluayB0aW1lcy4KK3N0cmluZyhS RVBMQUNFICJJTkNSRU1FTlRBTDpZRVMiICJJTkNSRU1FTlRBTDpOTyIgcmVwbGFjZV9DTUFLRV9T SEFSRURfTElOS0VSX0ZMQUdTICR7Q01BS0VfU0hBUkVEX0xJTktFUl9GTEFHU30pCitzZXQoQ01B S0VfU0hBUkVEX0xJTktFUl9GTEFHUyAiJHtyZXBsYWNlX0NNQUtFX1NIQVJFRF9MSU5LRVJfRkxB R1N9IC9JTkNSRU1FTlRBTDpOTyIpCitzdHJpbmcoUkVQTEFDRSAiSU5DUkVNRU5UQUw6WUVTIiAi SU5DUkVNRU5UQUw6Tk8iIHJlcGxhY2VfQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAke0NNQUtFX0VY RV9MSU5LRVJfRkxBR1N9KQorc2V0KENNQUtFX0VYRV9MSU5LRVJfRkxBR1MgIiR7cmVwbGFjZV9D TUFLRV9FWEVfTElOS0VSX0ZMQUdTfSAvSU5DUkVNRU5UQUw6Tk8iKQorCitzdHJpbmcoUkVQTEFD RSAiSU5DUkVNRU5UQUw6WUVTIiAiSU5DUkVNRU5UQUw6Tk8iIHJlcGxhY2VfQ01BS0VfU0hBUkVE X0xJTktFUl9GTEFHU19ERUJVRyAke0NNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1NfREVCVUd9KQor c2V0KENNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1NfREVCVUcgIiR7cmVwbGFjZV9DTUFLRV9TSEFS RURfTElOS0VSX0ZMQUdTX0RFQlVHfSAvSU5DUkVNRU5UQUw6Tk8iKQorc3RyaW5nKFJFUExBQ0Ug IklOQ1JFTUVOVEFMOllFUyIgIklOQ1JFTUVOVEFMOk5PIiByZXBsYWNlX0NNQUtFX0VYRV9MSU5L RVJfRkxBR1NfREVCVUcgJHtDTUFLRV9FWEVfTElOS0VSX0ZMQUdTX0RFQlVHfSkKK3NldChDTUFL RV9FWEVfTElOS0VSX0ZMQUdTX0RFQlVHICIke3JlcGxhY2VfQ01BS0VfRVhFX0xJTktFUl9GTEFH U19ERUJVR30gL0lOQ1JFTUVOVEFMOk5PIikKKworc3RyaW5nKFJFUExBQ0UgIklOQ1JFTUVOVEFM OllFUyIgIklOQ1JFTUVOVEFMOk5PIiByZXBsYWNlX0NNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1Nf UkVMV0lUSERFQklORk8gJHtDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTX1JFTFdJVEhERUJJTkZP fSkKK3NldChDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTX1JFTFdJVEhERUJJTkZPICIke3JlcGxh Y2VfQ01BS0VfU0hBUkVEX0xJTktFUl9GTEFHU19SRUxXSVRIREVCSU5GT30gL0lOQ1JFTUVOVEFM Ok5PIikKK3N0cmluZyhSRVBMQUNFICJJTkNSRU1FTlRBTDpZRVMiICJJTkNSRU1FTlRBTDpOTyIg cmVwbGFjZV9DTUFLRV9FWEVfTElOS0VSX0ZMQUdTX1JFTFdJVEhERUJJTkZPICR7Q01BS0VfRVhF X0xJTktFUl9GTEFHU19SRUxXSVRIREVCSU5GT30pCitzZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFH U19SRUxXSVRIREVCSU5GTyAiJHtyZXBsYWNlX0NNQUtFX0VYRV9MSU5LRVJfRkxBR1NfUkVMV0lU SERFQklORk99IC9JTkNSRU1FTlRBTDpOTyIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc1dpbi5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zV2luLmNtYWtlCmluZGV4IDVkOTNi YTA1NGU1Li43MTcyOWNjYTU2NiAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNXaW4u Y21ha2UKKysrIGIvU291cmNlL2NtYWtlL09wdGlvbnNXaW4uY21ha2UKQEAgLTEyNiw3MSArMTI2 LDcgQEAgc2V0KENNQUtFX1JVTlRJTUVfT1VUUFVUX0RJUkVDVE9SWV9ERUJVRyAiJHtDTUFLRV9S VU5USU1FX09VVFBVVF9ESVJFQ1RPUll9IikKIHNldChDTUFLRV9SVU5USU1FX09VVFBVVF9ESVJF Q1RPUllfUkVMRUFTRSAiJHtDTUFLRV9SVU5USU1FX09VVFBVVF9ESVJFQ1RPUll9IikKIAogaWYg KE1TVkMpCi0gICAgYWRkX2RlZmluaXRpb25zKAotICAgICAgICAvd2Q0MDE4IC93ZDQwNjggL3dk NDA5OSAvd2Q0MTAwIC93ZDQxMjcgL3dkNDEzOCAvd2Q0MTQ2IC93ZDQxODAgL3dkNDE4OQotICAg ICAgICAvd2Q0MjAxIC93ZDQyMDYgL3dkNDI0NCAvd2Q0MjUxIC93ZDQyNjcgL3dkNDI3NSAvd2Q0 Mjg4IC93ZDQyOTEgL3dkNDMwNQotICAgICAgICAvd2Q0MzA5IC93ZDQzNDQgL3dkNDM1NSAvd2Q0 Mzg5IC93ZDQzOTYgL3dkNDQ1NiAvd2Q0NDU3IC93ZDQ0NTggL3dkNDQ1OQotICAgICAgICAvd2Q0 NDgxIC93ZDQ1MDMgL3dkNDUwNSAvd2Q0NTEwIC93ZDQ1MTIgL3dkNDUzMCAvd2Q0NjEwIC93ZDQ2 MTEgL3dkNDY0NgotICAgICAgICAvd2Q0NzAyIC93ZDQ3MDYgL3dkNDcyMiAvd2Q0ODAwIC93ZDQ4 MTkgL3dkNDk1MSAvd2Q0OTUyIC93ZDQ5OTYgL3dkNjAxMQotICAgICAgICAvd2Q2MDMxIC93ZDYy MTEgL3dkNjI0NiAvd2Q2MjU1IC93ZDYzODcKLSAgICApCi0KLSAgICAjIENyZWF0ZSBwZGIgZmls ZXMgZm9yIGRlYnVnZ2luZyBwdXJwb3NlcywgYWxzbyBmb3IgUmVsZWFzZSBidWlsZHMKLSAgICBh ZGRfY29tcGlsZV9vcHRpb25zKC9aaSAvR1MpCi0KLSAgICBzZXQoQ01BS0VfU0hBUkVEX0xJTktF Ul9GTEFHUyAiJHtDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTfSAvREVCVUcgL09QVDpJQ0YgL09Q VDpSRUYiKQotICAgIHNldChDTUFLRV9FWEVfTElOS0VSX0ZMQUdTICIke0NNQUtFX0VYRV9MSU5L RVJfRkxBR1N9IC9ERUJVRyAvT1BUOklDRiAvT1BUOlJFRiIpCi0KLSAgICAjIFdlIGRvIG5vdCB1 c2UgZXhjZXB0aW9ucwotICAgIGFkZF9kZWZpbml0aW9ucygtRF9IQVNfRVhDRVBUSU9OUz0wKQot ICAgIGFkZF9jb21waWxlX29wdGlvbnMoL0VIYS0gL0VIYy0gL0VIcy0gL2ZwOmV4Y2VwdC0pCi0K LSAgICAjIFdlIGhhdmUgc29tZSB2ZXJ5IGxhcmdlIG9iamVjdCBmaWxlcyB0aGF0IGhhdmUgdG8g YmUgbGlua2VkCi0gICAgYWRkX2NvbXBpbGVfb3B0aW9ucygvYW5hbHl6ZS0gL2JpZ29iaikKLQot ICAgICMgVXNlIENSVCBzZWN1cml0eSBmZWF0dXJlcwotICAgIGFkZF9kZWZpbml0aW9ucygtRF9D UlRfU0VDVVJFX05PX1dBUk5JTkdTIC1EX0NSVF9TRUNVUkVfQ1BQX09WRVJMT0FEX1NUQU5EQVJE X05BTUVTPTEpCi0KLSAgICAjIFR1cm4gb2ZmIGNlcnRhaW4gbGluayBmZWF0dXJlcwotICAgIGFk ZF9jb21waWxlX29wdGlvbnMoL0d5LSAvb3Blbm1wLSAvR0YtKQotCi0gICAgaWYgKCR7Q01BS0Vf QlVJTERfVFlQRX0gTUFUQ0hFUyAiRGVidWciKQotICAgICAgICBzZXQoQ01BS0VfU0hBUkVEX0xJ TktFUl9GTEFHUyAiJHtDTUFLRV9TSEFSRURfTElOS0VSX0ZMQUdTfSAvT1BUOk5PUkVGIC9PUFQ6 Tk9JQ0YiKQotICAgICAgICBzZXQoQ01BS0VfRVhFX0xJTktFUl9GTEFHUyAiJHtDTUFLRV9FWEVf TElOS0VSX0ZMQUdTfSAvT1BUOk5PUkVGIC9PUFQ6Tk9JQ0YiKQotCi0gICAgICAgICMgVG8gZGVi dWcgbGlua2luZyB0aW1lIGlzc3VlcywgdW5jb21tZW50IHRoZSBmb2xsb3dpbmcgdGhyZWUgbGlu ZXM6Ci0gICAgICAgICNhZGRfY29tcGlsZV9vcHRpb25zKC9CdikKLSAgICAgICAgI3NldChDTUFL RV9TSEFSRURfTElOS0VSX0ZMQUdTICIke0NNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1N9IC9WRVJC T1NFIC9WRVJCT1NFOklOQ1IgL1RJTUUiKQotICAgICAgICAjc2V0KENNQUtFX0VYRV9MSU5LRVJf RkxBR1MgIiR7Q01BS0VfRVhFX0xJTktFUl9GTEFHU30gL1ZFUkJPU0UgL1ZFUkJPU0U6SU5DUiAv VElNRSIpCi0gICAgZWxzZWlmICgke0NNQUtFX0JVSUxEX1RZUEV9IE1BVENIRVMgIlJlbGVhc2Ui KQotICAgICAgICBhZGRfY29tcGlsZV9vcHRpb25zKC9PeS0pCi0gICAgZW5kaWYgKCkKLQotICAg IGlmIChOT1QgJHtDTUFLRV9HRU5FUkFUT1J9IE1BVENIRVMgIk5pbmphIikKLSAgICAgICAgbGlu a19kaXJlY3RvcmllcygiJHtDTUFLRV9MSUJSQVJZX09VVFBVVF9ESVJFQ1RPUll9LyR7Q01BS0Vf QlVJTERfVFlQRX0iKQotICAgICAgICBhZGRfZGVmaW5pdGlvbnMoL01QKQotICAgIGVuZGlmICgp Ci0gICAgaWYgKE5PVCAke0NNQUtFX0NYWF9GTEFHU30gU1RSRVFVQUwgIiIpCi0gICAgICAgIHN0 cmluZyhSRUdFWCBSRVBMQUNFICIoL0VIW2Etel0rKSAiICJcXDEtICIgQ01BS0VfQ1hYX0ZMQUdT ICR7Q01BS0VfQ1hYX0ZMQUdTfSkgIyBEaXNhYmxlIEMrKyBleGNlcHRpb25zCi0gICAgICAgIHN0 cmluZyhSRUdFWCBSRVBMQUNFICIvRUhzYyQiICIvRUhzLSAvRUhjLSAiIENNQUtFX0NYWF9GTEFH UyAke0NNQUtFX0NYWF9GTEFHU30pICMgRGlzYWJsZSBDKysgZXhjZXB0aW9ucwotICAgICAgICBz dHJpbmcoUkVHRVggUkVQTEFDRSAiL0dSICIgIi9HUi0gIiBDTUFLRV9DWFhfRkxBR1MgJHtDTUFL RV9DWFhfRkxBR1N9KSAjIERpc2FibGUgUlRUSQotICAgICAgICBzdHJpbmcoUkVHRVggUkVQTEFD RSAiL1czIiAiL1c0IiBDTUFLRV9DWFhfRkxBR1MgJHtDTUFLRV9DWFhfRkxBR1N9KSAjIFdhcm5p bmdzIGFyZSBpbXBvcnRhbnQKLSAgICBlbmRpZiAoKQotCi0gICAgZm9yZWFjaCAoZmxhZ192YXIK LSAgICAgICAgQ01BS0VfQ19GTEFHUyBDTUFLRV9DX0ZMQUdTX0RFQlVHIENNQUtFX0NfRkxBR1Nf UkVMRUFTRQotICAgICAgICBDTUFLRV9DX0ZMQUdTX01JTlNJWkVSRUwgQ01BS0VfQ19GTEFHU19S RUxXSVRIREVCSU5GTwotICAgICAgICBDTUFLRV9DWFhfRkxBR1MgQ01BS0VfQ1hYX0ZMQUdTX0RF QlVHIENNQUtFX0NYWF9GTEFHU19SRUxFQVNFCi0gICAgICAgIENNQUtFX0NYWF9GTEFHU19NSU5T SVpFUkVMIENNQUtFX0NYWF9GTEFHU19SRUxXSVRIREVCSU5GTykKLSAgICAgICAgIyBVc2UgdGhl IG11bHRpdGhyZWFkZWQgc3RhdGljIHJ1bnRpbWUgbGlicmFyeSBpbnN0ZWFkIG9mIHRoZSBkZWZh dWx0IERMTCBydW50aW1lLgotICAgICAgICBzdHJpbmcoUkVHRVggUkVQTEFDRSAiL01EIiAiL01U IiAke2ZsYWdfdmFyfSAiJHske2ZsYWdfdmFyfX0iKQotCi0gICAgICAgICMgTm8gZGVidWcgcnVu dGltZSwgZXZlbiBpbiBkZWJ1ZyBidWlsZHMuCi0gICAgICAgIGlmIChOT1QgREVCVUdfU1VGRklY KQotICAgICAgICAgICAgc3RyaW5nKFJFR0VYIFJFUExBQ0UgIi9NVGQiICIvTVQiICR7ZmxhZ192 YXJ9ICIkeyR7ZmxhZ192YXJ9fSIpCi0gICAgICAgICAgICBzdHJpbmcoUkVHRVggUkVQTEFDRSAi L0RfREVCVUciICIiICR7ZmxhZ192YXJ9ICIkeyR7ZmxhZ192YXJ9fSIpCi0gICAgICAgIGVuZGlm ICgpCi0gICAgZW5kZm9yZWFjaCAoKQorICAgIGluY2x1ZGUoT3B0aW9uc01TVkMpCiBlbmRpZiAo KQogCiBzZXQoUE9SVCBXaW4pCg==