196622 2019-04-04 13:28:52 -0700 [Win] build-webkit should be ready for Visual Studio 2019 2019-05-08 19:08:17 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 196760 1 stephan.szabo fujii achristensen bfulgham dbates don.olmstead ews-watchlist fujii lforschler pvollan ross.kirsling webkit-bug-importer oldest_to_newest 1524389 0 stephan.szabo 2019-04-04 13:28:52 -0700 Because later versions of Visual Studio 2017 did not successfully compile the WinCairo port and Visual Studio 2019 has now been released, update to support VS2019. Use the VS2019 generator for WinCairo, continue using the VS2017 generator for other ports When looking for Visual Studio instances with vswhere pass a version argument to ask for VS2019 for WinCairo and 2017 for other ports When looking for MSBuild, look in "MSBuild\Current\bin" (the new expected location) and fallback to "MSBuild\15.0\bin" if we can't find an MSBuild.exe in the first location. 1524398 1 366748 stephan.szabo 2019-04-04 13:35:22 -0700 Created attachment 366748 [WinCairo] Update to VS2019 1524418 2 ross.kirsling 2019-04-04 13:53:28 -0700 🥳🎉🎊 1524423 3 don.olmstead 2019-04-04 13:55:46 -0700 Do we also need to set the cmake minimum version to 3.14 for us? 1524427 4 stephan.szabo 2019-04-04 13:58:58 -0700 I'm not sure we can reasonably do that only for the wincairo port because I think that's pretty much got to be the first thing in the script. 1524446 5 stephan.szabo 2019-04-04 14:27:46 -0700 Although the build error on win seems unrelated, it does look like the quoting is off for the vswhere version expression, fixing. 1524455 6 366762 stephan.szabo 2019-04-04 14:47:56 -0700 Created attachment 366762 [WinCairo] Update to VS2019 1524476 7 366762 don.olmstead 2019-04-04 15:12:29 -0700 Comment on attachment 366762 [WinCairo] Update to VS2019 r=me assuming bots pass. Not sure if you want to put the version range into a sub but I don't have a strong opinion on that. 1524478 8 366762 fujii 2019-04-04 15:33:41 -0700 Comment on attachment 366762 [WinCairo] Update to VS2019 I think this doesn’t work. https://bugs.webkit.org/show_bug.cgi?id=190797 1524496 9 stephan.szabo 2019-04-04 15:54:22 -0700 It seems to me that the same condition of using different versions could happen with VSINSTALLDIR as well as cmake doesn't always obey that variable as far as I can see from https://gitlab.kitware.com/cmake/cmake/blob/master/Source/cmVSSetupHelper.cxx 1524497 10 stephan.szabo 2019-04-04 16:00:07 -0700 That aside, is the vswhere portion the only portion you're objecting to? There are three pieces to this: 1) Change the generator to the 2019 generator for wincairo 2) Add the version argument for vswhere to match the generator chosen 3) Check the new location for msbuild under the found installation because the scripts call to msbuild directly? If the second were unacceptable, are the first and third okay (with the use of the environment variable for choosing the installation)? 1524601 11 366762 fujii 2019-04-04 21:55:48 -0700 Comment on attachment 366762 [WinCairo] Update to VS2019 View in context: https://bugs.webkit.org/attachment.cgi?id=366762&action=review > Tools/Scripts/webkitdirs.pm:669 > + $versionRange = "[15.0,16.0)"; There is no reason to force AppleWin to use VS2017. WinCairo and AppleWin ports should use '-latest'. Only PlayStation port has the reason to use VS2017 at the moment. 1524603 12 fujii 2019-04-04 22:00:06 -0700 (In reply to Stephan Szabo from comment #9) > It seems to me that the same condition of using different versions could > happen with VSINSTALLDIR as well as cmake doesn't always obey that variable > as far as I can see from > https://gitlab.kitware.com/cmake/cmake/blob/master/Source/cmVSSetupHelper.cxx What is your idea addressing the version mismatch issue (Bug 190797 comment 21)? 1524679 13 366762 fujii 2019-04-05 06:26:53 -0700 Comment on attachment 366762 [WinCairo] Update to VS2019 View in context: https://bugs.webkit.org/attachment.cgi?id=366762&action=review > Tools/Scripts/webkitdirs.pm:2270 > + push @args, '-DCMAKE_GENERATOR_TOOLSET="host=x64"'; VS2019 can build VS2017 project. You don’t need to upgrade at the moment for someone wants to use vs2017. 1524682 14 fujii 2019-04-05 06:35:32 -0700 Wincairo buildbot is still using vs2017. 1524711 15 don.olmstead 2019-04-05 09:11:08 -0700 (In reply to Fujii Hironori from comment #14) > Wincairo buildbot is still using vs2017. I have docker images that have 2019 ready to go so this won't be a problem. EWS bots are already using them 1524778 16 stephan.szabo 2019-04-05 11:55:56 -0700 (In reply to Fujii Hironori from comment #13) > Comment on attachment 366762 [details] > [WinCairo] Update to VS2019 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=366762&action=review > > > Tools/Scripts/webkitdirs.pm:2270 > > + push @args, '-DCMAKE_GENERATOR_TOOLSET="host=x64"'; > > VS2019 can build VS2017 project. You don’t need to upgrade at the moment for > someone wants to use vs2017. Don't we still have the problem that the most current versions of VS2017 don't build the wincairo port successfully? That was the point of forcing the upgrade for wincairo to avoid those issues. 1524792 17 stephan.szabo 2019-04-05 12:43:21 -0700 (In reply to Fujii Hironori from comment #12) > (In reply to Stephan Szabo from comment #9) > > It seems to me that the same condition of using different versions could > > happen with VSINSTALLDIR as well as cmake doesn't always obey that variable > > as far as I can see from > > https://gitlab.kitware.com/cmake/cmake/blob/master/Source/cmVSSetupHelper.cxx > > What is your idea addressing the version mismatch issue (Bug 190797 comment > 21)? Can we agree on the following? A) If one runs the vcvars script in the shell, we shouldn't use vswhere to find one. B) Therefore, the only time we use vswhere is when the vcvars environment is not set up and we have to try to find one C) If vcvars was not run, setting VSINSTALLDIR is insufficient, so the use of VSINSTALLDIR alone in the script is itself insufficient to guarantee matching: === C:\github\tests\cmake-basic-test\foo>set VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\ C:\github\tests\cmake-basic-test\foo>cmake -G "Visual Studio 15" .. -- The C compiler identification is MSVC 19.14.26433.0 -- The CXX compiler identification is MSVC 19.14.26433.0 -- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Tools/MSVC/14.14.26428/bin/Hostx86/x86/cl.exe === If we can agree on the above, then my thought sequence would be: D) We'd like to cover as many cases as possible E) And we would like to make it easy to be able to switch between ports without requiring the user the also switch between shells. F) So, we try to find a compiler that'll match as best we can for the case that the user isn't giving us a configured environment G) And we allow users to use vcvars shells to cover any cases we've not yet covered explicitly. H) And we try to over time minimize the cases where the difference occurs. 1524798 18 stephan.szabo 2019-04-05 12:55:32 -0700 As an example of one option for H would be to find the vcvars for the found instance of visual studio and run that in the subshell that's running cmake when we found one via vswhere. 1524893 19 fujii 2019-04-05 16:27:47 -0700 (In reply to Stephan Szabo from comment #16) > > Don't we still have the problem that the most current versions of VS2017 > don't build the wincairo port successfully? That was the point of forcing > the upgrade for wincairo to avoid those issues. For example, if I will have a compiler issue in vs2019, I will want to compile with vs2017 for investigation. We should have a way to choose compiler for such case. 1524910 20 stephan.szabo 2019-04-05 17:13:59 -0700 (In reply to Fujii Hironori from comment #19) > (In reply to Stephan Szabo from comment #16) > > > > Don't we still have the problem that the most current versions of VS2017 > > don't build the wincairo port successfully? That was the point of forcing > > the upgrade for wincairo to avoid those issues. > > For example, if I will have a compiler issue in vs2019, I will want to > compile with vs2017 for investigation. We should have a way to choose > compiler for such case. How common is this case? I don't have a good sense of whether it's common enough for it to make sense for the script to support rather than calling cmake manually with a different generator specified. If it is common, then specifying the 15 generator unconditionally would seem not be the desired choice (as cmake appears to use the specified generator to influence its choice of installation) but probably instead to choose the generator based on the chosen installation. In a case where you explicitly wanted to use 2017 for investigation, would it be safe to only choose that if you were in a 2017 vcvars environment? And should we warn about it for users who wouldn't know that they may get a failing compilation due to recent 2017 instances not building the tree? 1524942 21 fujii 2019-04-05 18:48:23 -0700 (In reply to Stephan Szabo from comment #17) > E) And we would like to make it easy to be able to switch between ports > without requiring the user the also switch between shells. I’m against (E). I’m suggesting invoking vcvars in outside of build-WebKit to choose compiler. 1524954 22 stephan.szabo 2019-04-05 19:42:54 -0700 (In reply to Fujii Hironori from comment #21) > (In reply to Stephan Szabo from comment #17) > > > E) And we would like to make it easy to be able to switch between ports > > without requiring the user the also switch between shells. > > I’m against (E). > I’m suggesting invoking vcvars in outside of build-WebKit to choose compiler. I can't tell if you're suggesting removing all the fallbacks for when vcvars wasn't run (for example VSINSTALLDIR is not set). If you aren't then we still have to deal with those cases somehow. If you are suggesting removing the fallbacks, that seems to change a long standing behavior of the scripts as I see those going back at least 6 years to VS8. In either case, it seems like current cmake (3.14) uses the generator version as input to how at least some of the code paths choose a Visual Studio instance, so it's unclear to me that leaving the script using the 2017 generator while having both 2017 and 2019 installed will have the desired behavior. 1524972 23 fujii 2019-04-05 20:42:38 -0700 (In reply to Stephan Szabo from comment #22) > I can't tell if you're suggesting removing all the fallbacks for when vcvars > wasn't run (for example VSINSTALLDIR is not set). > If you aren't then we still have to deal with those cases somehow. We shouldn't remove the fallback. build-webkit should choose the latest installed VS as the fallback. I'm not sure which is better to choose the latest VS by using vswhere or using CMake (I think CMake can find the latest installed VS. Right?). > In either case, it seems like current cmake (3.14) uses the generator > version as input to how at least some of the code paths choose a Visual > Studio instance, so it's unclear to me that leaving the script using the > 2017 generator while having both 2017 and 2019 installed will have the > desired behavior. Good point. I'll check. 1525119 24 fujii 2019-04-07 19:35:54 -0700 I was completely misunderstanding how CMake Visual Studio Generators choose a compiler. I tested by installing the following three instances: 1. VS2019 Professional 16.0.0 2. VS2017 Professional 15.7.6 3. VS2017 Build Tool 15.8.9 Without -G switch, it chooses the latest ... (1) This can not be overridden by invoking vcvars ... CMake error With -G "Visual Studio 15 2017", it choose the latest VS2017 ... (3) This can be overridden by invoking (2)'s vcvars ... (2) 1525132 25 fujii 2019-04-07 20:05:40 -0700 With -G "Visual Studio 15 2017", it chooses 3's compiler for CMake configuration time. If I explicitly invoke 2's msbuild, then it compiles with 2's compiler. https://gist.github.com/fujii/6d8bf93131dcb4f4af45eb6efed1e11f 1525133 26 366919 fujii 2019-04-07 20:53:01 -0700 Created attachment 366919 Patch 1525134 27 fujii 2019-04-07 21:01:29 -0700 Currently, vswhere is used only for finding msbuild. If that is true, we should do the following. Find MSBuild · Microsoft/vswhere Wiki https://github.com/Microsoft/vswhere/wiki/Find-MSBuild Furthermore, cmake --build should be used if possible. 1525187 28 stephan.szabo 2019-04-08 08:44:01 -0700 (In reply to Fujii Hironori from comment #27) > Currently, vswhere is used only for finding msbuild. > If that is true, we should do the following. > > Find MSBuild · Microsoft/vswhere Wiki > https://github.com/Microsoft/vswhere/wiki/Find-MSBuild I had it doing that in an earlier version, but when looking at the callers to get the install directory I saw setupCygwinEnv was using the install directory to find a devenv.com. I missed that the computed value is then unused in the function. > Furthermore, cmake --build should be used if possible. That would be a much better general case, but Don thought that would cause failures for some apple internal builds so we'd need to get alignment there. 1525242 29 stephan.szabo 2019-04-08 10:34:17 -0700 My state with that patch building --no-ninja (having a 2017 pro and community and 2019 community) and trimming down libraries looked for to jsc libs in the playstation case. Non-vcvars cmd, --wincairo: Fails trying to use the 2017 msbuild (maybe because of the installation type prioritization in the perl right now) Non-vcvars cmd, --playstation: Starts build 2017pro-vcvars cmd, --wincairo: Fails because cmake fails to find the compiler 2017pro-vcvars cmd, --playstation: Fails, trying to run 2017 msbuild, but "The specified solution configuration \"Release|x64\" is invalid." 2019-vcvars cmd, --wincairo: Starts build 2019-vcvars cmd, --playstation: Fails, trying to run 2019 msbuild, but "The specified solution configuration \"Release|x64\" is invalid." If I remove the code that prioritizes installation type I get: Non-vcvars cmd, --wincairo: Starts build Non-vcvars cmd, --playstation: Fails, trying to run 2019 msbuild, but "Please check to make sure that you have specified a valid combination of Configuration and Platform for this project. Configuration='Release' Platform='ORBIS'." (edited) If I add a /p:Platform=ORBIS to getMSBuildPlatformArgument in the perl, then 2017pro-vcvars cmd, --playstation starts a build. 1525533 30 fujii 2019-04-08 19:27:45 -0700 (In reply to Stephan Szabo from comment #28) > > Furthermore, cmake --build should be used if possible. > > That would be a much better general case, but Don thought that would cause > failures for some apple internal builds so we'd need to get alignment there. AppleWin internal builds don't use build-webkit script. It is irrelevant. 1525682 31 367054 stephan.szabo 2019-04-09 11:07:49 -0700 Created attachment 367054 Move to Visual Studio 2019 - with final fallback updated to 2019 Based on the above results: I found that we can use an environment variable to avoid the last change for a vs2017 vcvars shell, that I'd forgotten about the final fallback if vswhere also does not return an instance, and that if we only look for 2017 in PlayStation port the non-vcvars shell seemed to work locally for both that and wincairo. 1525773 32 367054 fujii 2019-04-09 15:07:25 -0700 Comment on attachment 367054 Move to Visual Studio 2019 - with final fallback updated to 2019 View in context: https://bugs.webkit.org/attachment.cgi?id=367054&action=review > Tools/Scripts/webkitdirs.pm:665 > + if (isPlayStation()) { Does PlayStation port need to use vs2017 msbuild even through it uses a compiler from PlayStation sdk? > Tools/Scripts/webkitdirs.pm:723 > + "Microsoft Visual Studio", "2019", $productType); If AppleWin internal builds are using this fallback, we can’t change at the moment. 1525775 33 stephan.szabo 2019-04-09 15:10:56 -0700 (In reply to Fujii Hironori from comment #32) > Comment on attachment 367054 [details] > Move to Visual Studio 2019 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=367054&action=review > > > Tools/Scripts/webkitdirs.pm:665 > > + if (isPlayStation()) { > > Does PlayStation port need to use vs2017 msbuild even through it uses a > compiler from PlayStation sdk? If we're using --no-ninja, as far as I can tell, yes, as building the solution relies on the platform support having been added to Visual Studio (and it's as far as I know not yet available for 2019). > > Tools/Scripts/webkitdirs.pm:723 > > + "Microsoft Visual Studio", "2019", $productType); > > If AppleWin internal builds are using this fallback, we can’t change at the > moment. Ah, good point, will reverse that. 1525776 34 367073 stephan.szabo 2019-04-09 15:16:30 -0700 Created attachment 367073 Move to Visual Studio 2019 Reset the final fallback back to 2017. 1525778 35 367054 stephan.szabo 2019-04-09 15:26:25 -0700 Comment on attachment 367054 Move to Visual Studio 2019 - with final fallback updated to 2019 It was brought up that actually we may not need to worry about internal builds using build-webkit so un-obsoleting the one with the final fallback switched over to 2019. 1525848 36 367054 fujii 2019-04-09 18:32:20 -0700 Comment on attachment 367054 Move to Visual Studio 2019 - with final fallback updated to 2019 View in context: https://bugs.webkit.org/attachment.cgi?id=367054&action=review >>> Tools/Scripts/webkitdirs.pm:665 >>> + if (isPlayStation()) { >> >> Does PlayStation port need to use vs2017 msbuild even through it uses a compiler from PlayStation sdk? > > If we're using --no-ninja, as far as I can tell, yes, as building the solution relies on the platform support having been added to Visual Studio (and it's as far as I know not yet available for 2019). Really good point. For example, if I have 1. VS 2017 Professional 15.7.6 + PlayStation VS Extension 2. VS 2017 Community 15.8.9 CMake is going to choose the newer (2) instance for PlayStation port even though it doesn't have PlayStation VS Extension. We should invoke vcvars.bat before build-webkit for this case. 1525854 37 stephan.szabo 2019-04-09 19:08:13 -0700 (In reply to Fujii Hironori from comment #36) > Comment on attachment 367054 [details] > Move to Visual Studio 2019 - with final fallback updated to 2019 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=367054&action=review > > >>> Tools/Scripts/webkitdirs.pm:665 > >>> + if (isPlayStation()) { > >> > >> Does PlayStation port need to use vs2017 msbuild even through it uses a compiler from PlayStation sdk? > > > > If we're using --no-ninja, as far as I can tell, yes, as building the solution relies on the platform support having been added to Visual Studio (and it's as far as I know not yet available for 2019). > > Really good point. > For example, if I have > > 1. VS 2017 Professional 15.7.6 + PlayStation VS Extension > 2. VS 2017 Community 15.8.9 > > CMake is going to choose the newer (2) instance for PlayStation port even > though it doesn't have PlayStation VS Extension. > We should invoke vcvars.bat before build-webkit for this case. Yes, for that case (which I also have on one of my boxes) I think it could become necessary to run vcvars (and then the platform may need to be specified as well in either direct arg or envvar). I'm just a bit concerned that we can do better for the probably more common case of one instance per major version. 1525863 38 pvollan 2019-04-09 19:38:04 -0700 (In reply to Stephan Szabo from comment #35) > Comment on attachment 367054 [details] > Move to Visual Studio 2019 - with final fallback updated to 2019 > > It was brought up that actually we may not need to worry about internal > builds using build-webkit so un-obsoleting the one with the final fallback > switched over to 2019. We are also using build-webkit for AppleWin development. 1525867 39 fujii 2019-04-09 20:34:36 -0700 (In reply to Per Arne Vollan from comment #38) > We are also using build-webkit for AppleWin development. Yeah. I think we can remove the fallback. Filed in Bug 196760. 1526285 40 367193 fujii 2019-04-10 19:51:27 -0700 Created attachment 367193 Patch 1528933 41 fujii 2019-04-19 16:01:35 -0700 r? This patch is needed for AppleWin and WinCairo to be ready for VS2019. 1529184 42 367924 fujii 2019-04-21 21:02:14 -0700 Created attachment 367924 Patch 1534612 43 fujii 2019-05-08 19:07:06 -0700 Committed r245087: <https://trac.webkit.org/changeset/245087> 1534613 44 webkit-bug-importer 2019-05-08 19:08:17 -0700 <rdar://problem/50606874> 366748 2019-04-04 13:35:22 -0700 2019-04-04 14:47:56 -0700 [WinCairo] Update to VS2019 196622.1.diff text/plain 3442 stephan.szabo ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwZjk1 YjM4MmI0NC4uZDRjOTBiNmM3OWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxOS0wNC0wNCAgU3RlcGhhbiBTemFi byAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+CisKKyAgICAgICAgW1dpbkNhaXJvXSBNb3ZlIHRv IFZpc3VhbCBTdHVkaW8gMjAxOQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTk2NjIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChwaWNrQ3VycmVu dFZpc3VhbFN0dWRpb0luc3RhbGxhdGlvbik6IFdoZW4gbG9va2luZyBmb3IgVmlzdWFsCisgICAg ICAgIFN0dWRpbyBpbnN0YW5jZXMgd2l0aCB2c3doZXJlIHBhc3MgYSB2ZXJzaW9uIGFyZ3VtZW50 IHRvIGFzayBmb3IKKyAgICAgICAgVlMyMDE5IGZvciBXaW5DYWlybyBhbmQgMjAxNyBmb3Igb3Ro ZXIgcG9ydHMKKyAgICAgICAgKG1zQnVpbGRJbnN0YWxsRGlyKTogV2hlbiBsb29raW5nIGZvciBN U0J1aWxkLCBsb29rIGluCisgICAgICAgICJNU0J1aWxkXEN1cnJlbnRcYmluIiAodGhlIG5ldyBl eHBlY3RlZCBsb2NhdGlvbikgYW5kIGZhbGxiYWNrCisgICAgICAgIHRvICJNU0J1aWxkXDE1LjBc YmluIiBpZiB3ZSBjYW4ndCBmaW5kIGFuIE1TQnVpbGQuZXhlIGluIHRoZQorICAgICAgICBmaXJz dCBsb2NhdGlvbi4KKyAgICAgICAgKGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9qZWN0 KTogVXNlIHRoZSBWUzIwMTkgZ2VuZXJhdG9yCisgICAgICAgIGZvciBXaW5DYWlybywgY29udGlu dWUgdXNpbmcgdGhlIFZTMjAxNyBnZW5lcmF0b3IgZm9yIG90aGVyCisgICAgICAgIHBvcnRzCisK IDIwMTktMDQtMDQgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtXaW5dIER1bXBSZW5kZXJUcmVlV2F0Y2hEb2cucHkgaXMgbm90IGNoZWNrZWQgaW50byBz b3VyY2UKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCAzZDU5N2YyMTQ1Zi4uOTYwODMyNGJmZDkgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KQEAgLTY2MCw2ICs2NjAsMTUgQEAgc3ViIHBpY2tDdXJyZW50VmlzdWFsU3R1 ZGlvSW5zdGFsbGF0aW9uCiAgICAgcmVxdWlyZU1vZHVsZXNGb3JWU1doZXJlKCk7CiAgICAgZGV0 ZXJtaW5lU291cmNlRGlyKCk7CiAKKyAgICBteSAkdmVyc2lvblJhbmdlOworICAgIGlmIChpc1dp bkNhaXJvKCkpIHsKKyAgICAgICAgIyBVc2UgVlMyMDE5IGFzIDE1LjgrIGRpZCBub3QgY29tcGls ZSB3aW5jYWlybworICAgICAgICAkdmVyc2lvblJhbmdlID0gIlsxNi4wLDE3LjApIjsKKyAgICB9 IGVsc2UgeworICAgICAgICAjIFVzZSBWUzIwMTcKKyAgICAgICAgJHZlcnNpb25SYW5nZSA9ICJb MTUuMCwxNi4wKSI7CisgICAgfQorCiAgICAgIyBQcmVmZXIgRW50ZXJwcmlzZSwgdGhlbiBQcm9m ZXNzaW9uYWwsIHRoZW4gQ29tbXVuaXR5LCB0aGVuCiAgICAgIyBhbnl0aGluZyBlbHNlIHRoYXQg cHJvdmlkZXMgTVNCdWlsZC4KICAgICBmb3JlYWNoIG15ICRwcm9kdWN0VHlwZSAoKApAQCAtNjY4 LDcgKzY3Nyw3IEBAIHN1YiBwaWNrQ3VycmVudFZpc3VhbFN0dWRpb0luc3RhbGxhdGlvbgogICAg ICAgICAnTWljcm9zb2Z0LlZpc3VhbFN0dWRpby5Qcm9kdWN0LkNvbW11bml0eScsCiAgICAgICAg IHVuZGVmCiAgICAgKSkgewotICAgICAgICBteSAkY29tbWFuZCA9ICIkc291cmNlRGlyL1dlYktp dExpYnJhcmllcy93aW4vdG9vbHMvdnN3aGVyZSAtbm9sb2dvIC1sYXRlc3QgLWZvcm1hdCBqc29u IC1yZXF1aXJlcyBNaWNyb3NvZnQuQ29tcG9uZW50Lk1TQnVpbGQiOworICAgICAgICBteSAkY29t bWFuZCA9ICIkc291cmNlRGlyL1dlYktpdExpYnJhcmllcy93aW4vdG9vbHMvdnN3aGVyZSAtc29y dCAtbm9sb2dvIC12ZXJzaW9uICR2ZXJzaW9uUmFuZ2UgLWxhdGVzdCAtZm9ybWF0IGpzb24gLXJl cXVpcmVzIE1pY3Jvc29mdC5Db21wb25lbnQuTVNCdWlsZCI7CiAgICAgICAgIGlmIChkZWZpbmVk ICRwcm9kdWN0VHlwZSkgewogICAgICAgICAgICAgJGNvbW1hbmQgLj0gIiAtcHJvZHVjdHMgJHBy b2R1Y3RUeXBlIjsKICAgICAgICAgfQpAQCAtNzQwLDggKzc0OSwxNSBAQCBzdWIgbXNCdWlsZElu c3RhbGxEaXIKICAgICByZXR1cm4gJG1zQnVpbGRJbnN0YWxsRGlyIGlmIGRlZmluZWQgJG1zQnVp bGRJbnN0YWxsRGlyOwogCiAgICAgbXkgJGluc3RhbGxEaXIgPSB2aXN1YWxTdHVkaW9JbnN0YWxs RGlyKCk7CisKKyAgICAjIEFzIG9mIFZTMjAxOSwgTVNCdWlsZC5leGUgZ29lcyBpbnRvIGEgIkN1 cnJlbnQiIGRpcmVjdG9yeQorICAgICMgcmF0aGVyIHRoYW4gYSB2ZXJzaW9uZWQgb25lIHVuZGVy IHRoZSBpbnN0YWxsIGRpcmVjdG9yeS4KICAgICAkbXNCdWlsZEluc3RhbGxEaXIgPSBGaWxlOjpT cGVjLT5jYXRkaXIoJGluc3RhbGxEaXIsCi0gICAgICAgICJNU0J1aWxkIiwgIjE1LjAiLCAiYmlu Iik7CisgICAgICAgICJNU0J1aWxkIiwgIkN1cnJlbnQiLCAiYmluIik7CisgICAgaWYgKCEtZSAi JG1zQnVpbGRJbnN0YWxsRGlyL01TQnVpbGQuZXhlIikgeworICAgICAgICAkbXNCdWlsZEluc3Rh bGxEaXIgPSBGaWxlOjpTcGVjLT5jYXRkaXIoJGluc3RhbGxEaXIsCisgICAgICAgICAgICAiTVNC dWlsZCIsICIxNS4wIiwgImJpbiIpOworICAgIH0KIAogICAgIGNob21wKCRtc0J1aWxkSW5zdGFs bERpciA9IGBjeWdwYXRoICIkbXNCdWlsZEluc3RhbGxEaXIiYCkgaWYgaXNDeWd3aW4oKTsKIApA QCAtMjI0OSw2ICsyMjY1LDkgQEAgc3ViIGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9q ZWN0CiAgICAgICAgICAgICBwdXNoIEBhcmdzLCAiTmluamEiOwogICAgICAgICB9CiAgICAgICAg IHB1c2ggQGFyZ3MsICItRFVTRV9USElOX0FSQ0hJVkVTPU9GRiIgaWYgaXNQbGF5U3RhdGlvbigp OworICAgIH0gZWxzaWYgKGlzV2luQ2Fpcm8oKSkgeworICAgICAgICBwdXNoIEBhcmdzLCAnLUcg IlZpc3VhbCBTdHVkaW8gMTYgMjAxOSInOworICAgICAgICBwdXNoIEBhcmdzLCAnLURDTUFLRV9H RU5FUkFUT1JfVE9PTFNFVD0iaG9zdD14NjQiJzsKICAgICB9IGVsc2lmIChpc0FueVdpbmRvd3Mo KSAmJiBpc1dpbjY0KCkpIHsKICAgICAgICAgcHVzaCBAYXJncywgJy1HICJWaXN1YWwgU3R1ZGlv IDE1IDIwMTcgV2luNjQiJzsKICAgICAgICAgcHVzaCBAYXJncywgJy1EQ01BS0VfR0VORVJBVE9S X1RPT0xTRVQ9Imhvc3Q9eDY0Iic7Cg== 366762 2019-04-04 14:47:56 -0700 2019-04-07 20:52:39 -0700 [WinCairo] Update to VS2019 196622.2.diff text/plain 3446 stephan.szabo ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwZjk1 YjM4MmI0NC4uZDRjOTBiNmM3OWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxOS0wNC0wNCAgU3RlcGhhbiBTemFi byAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+CisKKyAgICAgICAgW1dpbkNhaXJvXSBNb3ZlIHRv IFZpc3VhbCBTdHVkaW8gMjAxOQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTk2NjIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChwaWNrQ3VycmVu dFZpc3VhbFN0dWRpb0luc3RhbGxhdGlvbik6IFdoZW4gbG9va2luZyBmb3IgVmlzdWFsCisgICAg ICAgIFN0dWRpbyBpbnN0YW5jZXMgd2l0aCB2c3doZXJlIHBhc3MgYSB2ZXJzaW9uIGFyZ3VtZW50 IHRvIGFzayBmb3IKKyAgICAgICAgVlMyMDE5IGZvciBXaW5DYWlybyBhbmQgMjAxNyBmb3Igb3Ro ZXIgcG9ydHMKKyAgICAgICAgKG1zQnVpbGRJbnN0YWxsRGlyKTogV2hlbiBsb29raW5nIGZvciBN U0J1aWxkLCBsb29rIGluCisgICAgICAgICJNU0J1aWxkXEN1cnJlbnRcYmluIiAodGhlIG5ldyBl eHBlY3RlZCBsb2NhdGlvbikgYW5kIGZhbGxiYWNrCisgICAgICAgIHRvICJNU0J1aWxkXDE1LjBc YmluIiBpZiB3ZSBjYW4ndCBmaW5kIGFuIE1TQnVpbGQuZXhlIGluIHRoZQorICAgICAgICBmaXJz dCBsb2NhdGlvbi4KKyAgICAgICAgKGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9qZWN0 KTogVXNlIHRoZSBWUzIwMTkgZ2VuZXJhdG9yCisgICAgICAgIGZvciBXaW5DYWlybywgY29udGlu dWUgdXNpbmcgdGhlIFZTMjAxNyBnZW5lcmF0b3IgZm9yIG90aGVyCisgICAgICAgIHBvcnRzCisK IDIwMTktMDQtMDQgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtXaW5dIER1bXBSZW5kZXJUcmVlV2F0Y2hEb2cucHkgaXMgbm90IGNoZWNrZWQgaW50byBz b3VyY2UKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCAzZDU5N2YyMTQ1Zi4uYTQzYjc0ZDZjODQgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KQEAgLTY2MCw2ICs2NjAsMTUgQEAgc3ViIHBpY2tDdXJyZW50VmlzdWFsU3R1 ZGlvSW5zdGFsbGF0aW9uCiAgICAgcmVxdWlyZU1vZHVsZXNGb3JWU1doZXJlKCk7CiAgICAgZGV0 ZXJtaW5lU291cmNlRGlyKCk7CiAKKyAgICBteSAkdmVyc2lvblJhbmdlOworICAgIGlmIChpc1dp bkNhaXJvKCkpIHsKKyAgICAgICAgIyBVc2UgVlMyMDE5IGFzIDE1LjgrIGRpZCBub3QgY29tcGls ZSB3aW5jYWlybworICAgICAgICAkdmVyc2lvblJhbmdlID0gIlsxNi4wLDE3LjApIjsKKyAgICB9 IGVsc2UgeworICAgICAgICAjIFVzZSBWUzIwMTcKKyAgICAgICAgJHZlcnNpb25SYW5nZSA9ICJb MTUuMCwxNi4wKSI7CisgICAgfQorCiAgICAgIyBQcmVmZXIgRW50ZXJwcmlzZSwgdGhlbiBQcm9m ZXNzaW9uYWwsIHRoZW4gQ29tbXVuaXR5LCB0aGVuCiAgICAgIyBhbnl0aGluZyBlbHNlIHRoYXQg cHJvdmlkZXMgTVNCdWlsZC4KICAgICBmb3JlYWNoIG15ICRwcm9kdWN0VHlwZSAoKApAQCAtNjY4 LDcgKzY3Nyw3IEBAIHN1YiBwaWNrQ3VycmVudFZpc3VhbFN0dWRpb0luc3RhbGxhdGlvbgogICAg ICAgICAnTWljcm9zb2Z0LlZpc3VhbFN0dWRpby5Qcm9kdWN0LkNvbW11bml0eScsCiAgICAgICAg IHVuZGVmCiAgICAgKSkgewotICAgICAgICBteSAkY29tbWFuZCA9ICIkc291cmNlRGlyL1dlYktp dExpYnJhcmllcy93aW4vdG9vbHMvdnN3aGVyZSAtbm9sb2dvIC1sYXRlc3QgLWZvcm1hdCBqc29u IC1yZXF1aXJlcyBNaWNyb3NvZnQuQ29tcG9uZW50Lk1TQnVpbGQiOworICAgICAgICBteSAkY29t bWFuZCA9ICIkc291cmNlRGlyL1dlYktpdExpYnJhcmllcy93aW4vdG9vbHMvdnN3aGVyZSAtc29y dCAtbm9sb2dvIC12ZXJzaW9uIFwiJHZlcnNpb25SYW5nZVwiIC1sYXRlc3QgLWZvcm1hdCBqc29u IC1yZXF1aXJlcyBNaWNyb3NvZnQuQ29tcG9uZW50Lk1TQnVpbGQiOwogICAgICAgICBpZiAoZGVm aW5lZCAkcHJvZHVjdFR5cGUpIHsKICAgICAgICAgICAgICRjb21tYW5kIC49ICIgLXByb2R1Y3Rz ICRwcm9kdWN0VHlwZSI7CiAgICAgICAgIH0KQEAgLTc0MCw4ICs3NDksMTUgQEAgc3ViIG1zQnVp bGRJbnN0YWxsRGlyCiAgICAgcmV0dXJuICRtc0J1aWxkSW5zdGFsbERpciBpZiBkZWZpbmVkICRt c0J1aWxkSW5zdGFsbERpcjsKIAogICAgIG15ICRpbnN0YWxsRGlyID0gdmlzdWFsU3R1ZGlvSW5z dGFsbERpcigpOworCisgICAgIyBBcyBvZiBWUzIwMTksIE1TQnVpbGQuZXhlIGdvZXMgaW50byBh ICJDdXJyZW50IiBkaXJlY3RvcnkKKyAgICAjIHJhdGhlciB0aGFuIGEgdmVyc2lvbmVkIG9uZSB1 bmRlciB0aGUgaW5zdGFsbCBkaXJlY3RvcnkuCiAgICAgJG1zQnVpbGRJbnN0YWxsRGlyID0gRmls ZTo6U3BlYy0+Y2F0ZGlyKCRpbnN0YWxsRGlyLAotICAgICAgICAiTVNCdWlsZCIsICIxNS4wIiwg ImJpbiIpOworICAgICAgICAiTVNCdWlsZCIsICJDdXJyZW50IiwgImJpbiIpOworICAgIGlmICgh LWUgIiRtc0J1aWxkSW5zdGFsbERpci9NU0J1aWxkLmV4ZSIpIHsKKyAgICAgICAgJG1zQnVpbGRJ bnN0YWxsRGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRpbnN0YWxsRGlyLAorICAgICAgICAgICAg Ik1TQnVpbGQiLCAiMTUuMCIsICJiaW4iKTsKKyAgICB9CiAKICAgICBjaG9tcCgkbXNCdWlsZElu c3RhbGxEaXIgPSBgY3lncGF0aCAiJG1zQnVpbGRJbnN0YWxsRGlyImApIGlmIGlzQ3lnd2luKCk7 CiAKQEAgLTIyNDksNiArMjI2NSw5IEBAIHN1YiBnZW5lcmF0ZUJ1aWxkU3lzdGVtRnJvbUNNYWtl UHJvamVjdAogICAgICAgICAgICAgcHVzaCBAYXJncywgIk5pbmphIjsKICAgICAgICAgfQogICAg ICAgICBwdXNoIEBhcmdzLCAiLURVU0VfVEhJTl9BUkNISVZFUz1PRkYiIGlmIGlzUGxheVN0YXRp b24oKTsKKyAgICB9IGVsc2lmIChpc1dpbkNhaXJvKCkpIHsKKyAgICAgICAgcHVzaCBAYXJncywg Jy1HICJWaXN1YWwgU3R1ZGlvIDE2IDIwMTkiJzsKKyAgICAgICAgcHVzaCBAYXJncywgJy1EQ01B S0VfR0VORVJBVE9SX1RPT0xTRVQ9Imhvc3Q9eDY0Iic7CiAgICAgfSBlbHNpZiAoaXNBbnlXaW5k b3dzKCkgJiYgaXNXaW42NCgpKSB7CiAgICAgICAgIHB1c2ggQGFyZ3MsICctRyAiVmlzdWFsIFN0 dWRpbyAxNSAyMDE3IFdpbjY0Iic7CiAgICAgICAgIHB1c2ggQGFyZ3MsICctRENNQUtFX0dFTkVS QVRPUl9UT09MU0VUPSJob3N0PXg2NCInOwo= 366919 2019-04-07 20:53:01 -0700 2019-04-10 19:51:03 -0700 Patch bug-196622-20190408125300.patch text/plain 2234 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzOTY5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmQ2NTRhNzNkYTUzN2NiYTEzZDQyYjdjZTAzYTBmMmY5 N2NjN2Q0NS4uYjA0N2EzNDE5N2FmZjhjNzA4ZWI5Zjk4Zjc0OGIxYmYyNWM4N2I2ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE5LTA0LTA3ICBTdGVwaGFuIFN6YWJvICA8c3RlcGhhbi5zemFib0Bzb255LmNvbT4g YW5kIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAg W1dpbkNhaXJvXSBNb3ZlIHRvIFZpc3VhbCBTdHVkaW8gMjAxOQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NjIyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06Cisg ICAgICAgIChtc0J1aWxkSW5zdGFsbERpcik6IFdoZW4gbG9va2luZyBmb3IgTVNCdWlsZCwgbG9v ayBpbgorICAgICAgICAiTVNCdWlsZFxDdXJyZW50XGJpbiIgKHRoZSBuZXcgZXhwZWN0ZWQgbG9j YXRpb24pIGFuZCBmYWxsYmFjaworICAgICAgICB0byAiTVNCdWlsZFwxNS4wXGJpbiIgaWYgd2Ug Y2FuJ3QgZmluZCBhbiBNU0J1aWxkLmV4ZSBpbiB0aGUKKyAgICAgICAgZmlyc3QgbG9jYXRpb24u CisgICAgICAgIChnZW5lcmF0ZUJ1aWxkU3lzdGVtRnJvbUNNYWtlUHJvamVjdCk6IFVzZSAtQSBz d2l0Y2ggdG8gc3BlY2lmeSB4NjQuCisKIDIwMTktMDQtMDcgIENvbW1pdCBRdWV1ZSAgPGNvbW1p dC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIy NDM5NTYuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9T Y3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggM2Q1OTdmMjE0NWZmMTNjYzliMTM3ZmFlNmNjOGQ0 OTZmOTk5YTk5Yy4uNDlmNzY0NTkyMzYwNzQ1ZjRlZjk2MDFlZWMwMDMyYjViZWUxM2M2NCAxMDA3 NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0ZGlycy5wbQpAQCAtNzQwLDggKzc0MCwxNSBAQCBzdWIgbXNCdWlsZEluc3RhbGxEaXIK ICAgICByZXR1cm4gJG1zQnVpbGRJbnN0YWxsRGlyIGlmIGRlZmluZWQgJG1zQnVpbGRJbnN0YWxs RGlyOwogCiAgICAgbXkgJGluc3RhbGxEaXIgPSB2aXN1YWxTdHVkaW9JbnN0YWxsRGlyKCk7CisK KyAgICAjIEFzIG9mIFZTMjAxOSwgTVNCdWlsZC5leGUgZ29lcyBpbnRvIGEgIkN1cnJlbnQiIGRp cmVjdG9yeQorICAgICMgcmF0aGVyIHRoYW4gYSB2ZXJzaW9uZWQgb25lIHVuZGVyIHRoZSBpbnN0 YWxsIGRpcmVjdG9yeS4KICAgICAkbXNCdWlsZEluc3RhbGxEaXIgPSBGaWxlOjpTcGVjLT5jYXRk aXIoJGluc3RhbGxEaXIsCi0gICAgICAgICJNU0J1aWxkIiwgIjE1LjAiLCAiYmluIik7CisgICAg ICAgICJNU0J1aWxkIiwgIkN1cnJlbnQiLCAiYmluIik7CisgICAgaWYgKCEtZSAiJG1zQnVpbGRJ bnN0YWxsRGlyL01TQnVpbGQuZXhlIikgeworICAgICAgICAkbXNCdWlsZEluc3RhbGxEaXIgPSBG aWxlOjpTcGVjLT5jYXRkaXIoJGluc3RhbGxEaXIsCisgICAgICAgICAgICAiTVNCdWlsZCIsICIx NS4wIiwgImJpbiIpOworICAgIH0KIAogICAgIGNob21wKCRtc0J1aWxkSW5zdGFsbERpciA9IGBj eWdwYXRoICIkbXNCdWlsZEluc3RhbGxEaXIiYCkgaWYgaXNDeWd3aW4oKTsKIApAQCAtMjI1MCw4 ICsyMjU3LDcgQEAgc3ViIGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9qZWN0CiAgICAg ICAgIH0KICAgICAgICAgcHVzaCBAYXJncywgIi1EVVNFX1RISU5fQVJDSElWRVM9T0ZGIiBpZiBp c1BsYXlTdGF0aW9uKCk7CiAgICAgfSBlbHNpZiAoaXNBbnlXaW5kb3dzKCkgJiYgaXNXaW42NCgp KSB7Ci0gICAgICAgIHB1c2ggQGFyZ3MsICctRyAiVmlzdWFsIFN0dWRpbyAxNSAyMDE3IFdpbjY0 Iic7Ci0gICAgICAgIHB1c2ggQGFyZ3MsICctRENNQUtFX0dFTkVSQVRPUl9UT09MU0VUPSJob3N0 PXg2NCInOworICAgICAgICBwdXNoIEBhcmdzLCAnLUEgeDY0JzsKICAgICB9IGVsc2lmIChpc1Bs YXlTdGF0aW9uKCkpIHsKICAgICAgICAgcHVzaCBAYXJncywgJy1HICJWaXN1YWwgU3R1ZGlvIDE1 Iic7CiAgICAgfQo= 367054 2019-04-09 11:07:49 -0700 2019-04-10 19:51:05 -0700 Move to Visual Studio 2019 - with final fallback updated to 2019 196622.4.diff text/plain 4828 stephan.szabo ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzMzA3 NmUwNzJmNi4uYzFkODJlMGM0NzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxOS0wNC0wOSAgU3RlcGhhbiBTemFi byAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+IGFuZCBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3Jp LkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWlyb10gTW92ZSB0byBWaXN1YWwgU3R1 ZGlvIDIwMTkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5NjYyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAocGlja0N1cnJlbnRWaXN1YWxTdHVk aW9JbnN0YWxsYXRpb24pOiBSZW1vdmUgY2hlY2tzIGJhc2VkIG9uCisgICAgICAgIHByb2R1Y3Qg dHlwZS4gTG9vayBmb3IgZXhwbGljaXRseSBWaXN1YWwgU3R1ZGlvIDIwMTcgZm9yCisgICAgICAg IFBsYXlTdGF0aW9uIHBvcnQuCisgICAgICAgICh2aXN1YWxTdHVkaW9JbnN0YWxsRGlyRmFsbGJh Y2spOiBVcGRhdGUgZmFsbGJhY2sgdG8gVmlzdWFsCisgICAgICAgIFN0dWRpbyAyMDE5LgorICAg ICAgICAobXNCdWlsZEluc3RhbGxEaXIpOiBXaGVuIGxvb2tpbmcgZm9yIE1TQnVpbGQsIGxvb2sg aW4KKyAgICAgICAgIk1TQnVpbGRcQ3VycmVudFxiaW4iICh0aGUgbmV3IGV4cGVjdGVkIGxvY2F0 aW9uKSBhbmQgZmFsbGJhY2sKKyAgICAgICAgdG8gIk1TQnVpbGRcMTUuMFxiaW4iIGlmIHdlIGNh bid0IGZpbmQgYW4gTVNCdWlsZC5leGUgaW4gdGhlCisgICAgICAgIGZpcnN0IGxvY2F0aW9uLgor ICAgICAgICAoZ2VuZXJhdGVCdWlsZFN5c3RlbUZyb21DTWFrZVByb2plY3QpOiBVc2UgLUEgc3dp dGNoIHRvIHNwZWNpZnkgeDY0CisKIDIwMTktMDQtMDggIEd1aWxsYXVtZSBFbW9udCAgPGd1aWpl bW9udEBpZ2FsaWEuY29tPgogCiAgICAgICAgIEVuYWJsZSBERkcgb24gTUlQUwpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCmluZGV4IDNkNTk3ZjIxNDVmLi5mNGIyOTUzNjYyOCAxMDA3NTUKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAt NjYwLDMyICs2NjAsMjcgQEAgc3ViIHBpY2tDdXJyZW50VmlzdWFsU3R1ZGlvSW5zdGFsbGF0aW9u CiAgICAgcmVxdWlyZU1vZHVsZXNGb3JWU1doZXJlKCk7CiAgICAgZGV0ZXJtaW5lU291cmNlRGly KCk7CiAKLSAgICAjIFByZWZlciBFbnRlcnByaXNlLCB0aGVuIFByb2Zlc3Npb25hbCwgdGhlbiBD b21tdW5pdHksIHRoZW4KLSAgICAjIGFueXRoaW5nIGVsc2UgdGhhdCBwcm92aWRlcyBNU0J1aWxk LgotICAgIGZvcmVhY2ggbXkgJHByb2R1Y3RUeXBlICgoCi0gICAgICAgICdNaWNyb3NvZnQuVmlz dWFsU3R1ZGlvLlByb2R1Y3QuRW50ZXJwcmlzZScsCi0gICAgICAgICdNaWNyb3NvZnQuVmlzdWFs U3R1ZGlvLlByb2R1Y3QuUHJvZmVzc2lvbmFsJywKLSAgICAgICAgJ01pY3Jvc29mdC5WaXN1YWxT dHVkaW8uUHJvZHVjdC5Db21tdW5pdHknLAotICAgICAgICB1bmRlZgotICAgICkpIHsKLSAgICAg ICAgbXkgJGNvbW1hbmQgPSAiJHNvdXJjZURpci9XZWJLaXRMaWJyYXJpZXMvd2luL3Rvb2xzL3Zz d2hlcmUgLW5vbG9nbyAtbGF0ZXN0IC1mb3JtYXQganNvbiAtcmVxdWlyZXMgTWljcm9zb2Z0LkNv bXBvbmVudC5NU0J1aWxkIjsKLSAgICAgICAgaWYgKGRlZmluZWQgJHByb2R1Y3RUeXBlKSB7Ci0g ICAgICAgICAgICAkY29tbWFuZCAuPSAiIC1wcm9kdWN0cyAkcHJvZHVjdFR5cGUiOwotICAgICAg ICB9Ci0gICAgICAgIG15ICR2c1doZXJlT3V0ID0gYCRjb21tYW5kYDsKLSAgICAgICAgbXkgJGlu c3RhbGxhdGlvbnMgPSBbXTsKLSAgICAgICAgZXZhbCB7Ci0gICAgICAgICAgICAkaW5zdGFsbGF0 aW9ucyA9IEpTT046OlBQOjpkZWNvZGVfanNvbihFbmNvZGU6OmVuY29kZSgnVVRGLTgnID0+IEVu Y29kZTo6ZGVjb2RlKGNvbnNvbGVfaW4gPT4gJHZzV2hlcmVPdXQpKSk7Ci0gICAgICAgIH07Ci0g ICAgICAgIHByaW50ICJFcnJvciBnZXR0aW5nIFZpc3VhbCBTdHVkaW8gTG9jYXRpb246ICRAXG4i IGlmICRAOwotICAgICAgICB1bmRlZiAkQDsKLQotICAgICAgICBpZiAoc2NhbGFyIEAkaW5zdGFs bGF0aW9ucykgewotICAgICAgICAgICAgbXkgJGluc3RhbGxhdGlvbiA9ICRpbnN0YWxsYXRpb25z LT5bMF07Ci0gICAgICAgICAgICAkdnNXaGVyZUZvdW5kSW5zdGFsbGF0aW9uID0gJGluc3RhbGxh dGlvbjsKLSAgICAgICAgICAgIHJldHVybiAkaW5zdGFsbGF0aW9uOwotICAgICAgICB9CisgICAg IyBQbGF5U3RhdGlvbiBjdXJyZW50bHkgcmVxdWlyZXMgVlMyMDE3IG9ubHkKKyAgICBteSAkdmVy c2lvbkFyZzsKKyAgICBpZiAoaXNQbGF5U3RhdGlvbigpKSB7CisgICAgICAgICR2ZXJzaW9uQXJn ID0gIi12ZXJzaW9uIFwiWzE1LjAsMTYuMClcIiI7CisgICAgfQorCisgICAgbXkgJGNvbW1hbmQg PSAiJHNvdXJjZURpci9XZWJLaXRMaWJyYXJpZXMvd2luL3Rvb2xzL3Zzd2hlcmUgJHZlcnNpb25B cmcgLW5vbG9nbyAtbGF0ZXN0IC1mb3JtYXQganNvbiAtcmVxdWlyZXMgTWljcm9zb2Z0LkNvbXBv bmVudC5NU0J1aWxkIjsKKyAgICBteSAkdnNXaGVyZU91dCA9IGAkY29tbWFuZGA7CisgICAgbXkg JGluc3RhbGxhdGlvbnMgPSBbXTsKKyAgICBldmFsIHsKKyAgICAgICAgJGluc3RhbGxhdGlvbnMg PSBKU09OOjpQUDo6ZGVjb2RlX2pzb24oRW5jb2RlOjplbmNvZGUoJ1VURi04JyA9PiBFbmNvZGU6 OmRlY29kZShjb25zb2xlX2luID0+ICR2c1doZXJlT3V0KSkpOworICAgIH07CisgICAgcHJpbnQg IkVycm9yIGdldHRpbmcgVmlzdWFsIFN0dWRpbyBMb2NhdGlvbjogJEBcbiIgaWYgJEA7CisgICAg dW5kZWYgJEA7CisKKyAgICBpZiAoc2NhbGFyIEAkaW5zdGFsbGF0aW9ucykgeworICAgICAgICBt eSAkaW5zdGFsbGF0aW9uID0gJGluc3RhbGxhdGlvbnMtPlswXTsKKyAgICAgICAgJHZzV2hlcmVG b3VuZEluc3RhbGxhdGlvbiA9ICRpbnN0YWxsYXRpb247CisgICAgICAgIHJldHVybiAkaW5zdGFs bGF0aW9uOwogICAgIH0KKwogICAgIHJldHVybiB1bmRlZjsKIH0KIApAQCAtNzI1LDkgKzcyMCw5 IEBAIHN1YiB2aXN1YWxTdHVkaW9JbnN0YWxsRGlyRmFsbGJhY2sKICAgICAgICAgJ0NvbW11bml0 eScsCiAgICAgKSkgewogICAgICAgICBteSAkaW5zdGFsbGRpciA9IEZpbGU6OlNwZWMtPmNhdGRp cihwcm9ncmFtRmlsZXNQYXRoWDg2KCksCi0gICAgICAgICAgICAiTWljcm9zb2Z0IFZpc3VhbCBT dHVkaW8iLCAiMjAxNyIsICRwcm9kdWN0VHlwZSk7CisgICAgICAgICAgICAiTWljcm9zb2Z0IFZp c3VhbCBTdHVkaW8iLCAiMjAxOSIsICRwcm9kdWN0VHlwZSk7CiAgICAgICAgIG15ICRtc2J1aWxk ZGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRpbnN0YWxsZGlyLAotICAgICAgICAgICAgIk1TQnVp bGQiLCAiMTUuMCIsICJiaW4iKTsKKyAgICAgICAgICAgICJNU0J1aWxkIiwgIkN1cnJlbnQiLCAi YmluIik7CiAgICAgICAgIGlmICgtZSAkaW5zdGFsbGRpciAmJiAtZSAkbXNidWlsZGRpcikgewog ICAgICAgICAgICAgcmV0dXJuICRpbnN0YWxsZGlyOwogICAgICAgICB9CkBAIC03NDAsOCArNzM1 LDE1IEBAIHN1YiBtc0J1aWxkSW5zdGFsbERpcgogICAgIHJldHVybiAkbXNCdWlsZEluc3RhbGxE aXIgaWYgZGVmaW5lZCAkbXNCdWlsZEluc3RhbGxEaXI7CiAKICAgICBteSAkaW5zdGFsbERpciA9 IHZpc3VhbFN0dWRpb0luc3RhbGxEaXIoKTsKKworICAgICMgQXMgb2YgVlMyMDE5LCBNU0J1aWxk LmV4ZSBnb2VzIGludG8gYSAiQ3VycmVudCIgZGlyZWN0b3J5CisgICAgIyByYXRoZXIgdGhhbiBh IHZlcnNpb25lZCBvbmUgdW5kZXIgdGhlIGluc3RhbGwgZGlyZWN0b3J5LgogICAgICRtc0J1aWxk SW5zdGFsbERpciA9IEZpbGU6OlNwZWMtPmNhdGRpcigkaW5zdGFsbERpciwKLSAgICAgICAgIk1T QnVpbGQiLCAiMTUuMCIsICJiaW4iKTsKKyAgICAgICAgIk1TQnVpbGQiLCAiQ3VycmVudCIsICJi aW4iKTsKKyAgICBpZiAoIS1lICIkbXNCdWlsZEluc3RhbGxEaXIvTVNCdWlsZC5leGUiKSB7Cisg ICAgICAgICRtc0J1aWxkSW5zdGFsbERpciA9IEZpbGU6OlNwZWMtPmNhdGRpcigkaW5zdGFsbERp ciwKKyAgICAgICAgICAgICJNU0J1aWxkIiwgIjE1LjAiLCAiYmluIik7CisgICAgfQogCiAgICAg Y2hvbXAoJG1zQnVpbGRJbnN0YWxsRGlyID0gYGN5Z3BhdGggIiRtc0J1aWxkSW5zdGFsbERpciJg KSBpZiBpc0N5Z3dpbigpOwogCkBAIC0yMjUwLDggKzIyNTIsNyBAQCBzdWIgZ2VuZXJhdGVCdWls ZFN5c3RlbUZyb21DTWFrZVByb2plY3QKICAgICAgICAgfQogICAgICAgICBwdXNoIEBhcmdzLCAi LURVU0VfVEhJTl9BUkNISVZFUz1PRkYiIGlmIGlzUGxheVN0YXRpb24oKTsKICAgICB9IGVsc2lm IChpc0FueVdpbmRvd3MoKSAmJiBpc1dpbjY0KCkpIHsKLSAgICAgICAgcHVzaCBAYXJncywgJy1H ICJWaXN1YWwgU3R1ZGlvIDE1IDIwMTcgV2luNjQiJzsKLSAgICAgICAgcHVzaCBAYXJncywgJy1E Q01BS0VfR0VORVJBVE9SX1RPT0xTRVQ9Imhvc3Q9eDY0Iic7CisgICAgICAgIHB1c2ggQGFyZ3Ms ICctQSB4NjQnOwogICAgIH0gZWxzaWYgKGlzUGxheVN0YXRpb24oKSkgewogICAgICAgICBwdXNo IEBhcmdzLCAnLUcgIlZpc3VhbCBTdHVkaW8gMTUiJzsKICAgICB9Cg== 367073 2019-04-09 15:16:30 -0700 2019-04-10 19:51:07 -0700 Move to Visual Studio 2019 196622.5.diff text/plain 4222 stephan.szabo ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzMzA3 NmUwNzJmNi4uZjRmMTM5MGYwZmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxOS0wNC0wOSAgU3RlcGhhbiBTemFi byAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+IGFuZCBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3Jp LkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWlyb10gTW92ZSB0byBWaXN1YWwgU3R1 ZGlvIDIwMTkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5NjYyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAocGlja0N1cnJlbnRWaXN1YWxTdHVk aW9JbnN0YWxsYXRpb24pOiBSZW1vdmUgY2hlY2tzIGJhc2VkIG9uCisgICAgICAgIHByb2R1Y3Qg dHlwZS4gTG9vayBmb3IgZXhwbGljaXRseSBWaXN1YWwgU3R1ZGlvIDIwMTcgZm9yCisgICAgICAg IFBsYXlTdGF0aW9uIHBvcnQuCisgICAgICAgIChtc0J1aWxkSW5zdGFsbERpcik6IFdoZW4gbG9v a2luZyBmb3IgTVNCdWlsZCwgbG9vayBpbgorICAgICAgICAiTVNCdWlsZFxDdXJyZW50XGJpbiIg KHRoZSBuZXcgZXhwZWN0ZWQgbG9jYXRpb24pIGFuZCBmYWxsYmFjaworICAgICAgICB0byAiTVNC dWlsZFwxNS4wXGJpbiIgaWYgd2UgY2FuJ3QgZmluZCBhbiBNU0J1aWxkLmV4ZSBpbiB0aGUKKyAg ICAgICAgZmlyc3QgbG9jYXRpb24uCisgICAgICAgIChnZW5lcmF0ZUJ1aWxkU3lzdGVtRnJvbUNN YWtlUHJvamVjdCk6IFVzZSAtQSBzd2l0Y2ggdG8gc3BlY2lmeSB4NjQKKwogMjAxOS0wNC0wOCAg R3VpbGxhdW1lIEVtb250ICA8Z3VpamVtb250QGlnYWxpYS5jb20+CiAKICAgICAgICAgRW5hYmxl IERGRyBvbiBNSVBTCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9U b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggM2Q1OTdmMjE0NWYuLjQzZTJiMDcwNjE5 IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCkBAIC02NjAsMzIgKzY2MCwyNyBAQCBzdWIgcGlja0N1cnJlbnRW aXN1YWxTdHVkaW9JbnN0YWxsYXRpb24KICAgICByZXF1aXJlTW9kdWxlc0ZvclZTV2hlcmUoKTsK ICAgICBkZXRlcm1pbmVTb3VyY2VEaXIoKTsKIAotICAgICMgUHJlZmVyIEVudGVycHJpc2UsIHRo ZW4gUHJvZmVzc2lvbmFsLCB0aGVuIENvbW11bml0eSwgdGhlbgotICAgICMgYW55dGhpbmcgZWxz ZSB0aGF0IHByb3ZpZGVzIE1TQnVpbGQuCi0gICAgZm9yZWFjaCBteSAkcHJvZHVjdFR5cGUgKCgK LSAgICAgICAgJ01pY3Jvc29mdC5WaXN1YWxTdHVkaW8uUHJvZHVjdC5FbnRlcnByaXNlJywKLSAg ICAgICAgJ01pY3Jvc29mdC5WaXN1YWxTdHVkaW8uUHJvZHVjdC5Qcm9mZXNzaW9uYWwnLAotICAg ICAgICAnTWljcm9zb2Z0LlZpc3VhbFN0dWRpby5Qcm9kdWN0LkNvbW11bml0eScsCi0gICAgICAg IHVuZGVmCi0gICAgKSkgewotICAgICAgICBteSAkY29tbWFuZCA9ICIkc291cmNlRGlyL1dlYktp dExpYnJhcmllcy93aW4vdG9vbHMvdnN3aGVyZSAtbm9sb2dvIC1sYXRlc3QgLWZvcm1hdCBqc29u IC1yZXF1aXJlcyBNaWNyb3NvZnQuQ29tcG9uZW50Lk1TQnVpbGQiOwotICAgICAgICBpZiAoZGVm aW5lZCAkcHJvZHVjdFR5cGUpIHsKLSAgICAgICAgICAgICRjb21tYW5kIC49ICIgLXByb2R1Y3Rz ICRwcm9kdWN0VHlwZSI7Ci0gICAgICAgIH0KLSAgICAgICAgbXkgJHZzV2hlcmVPdXQgPSBgJGNv bW1hbmRgOwotICAgICAgICBteSAkaW5zdGFsbGF0aW9ucyA9IFtdOwotICAgICAgICBldmFsIHsK LSAgICAgICAgICAgICRpbnN0YWxsYXRpb25zID0gSlNPTjo6UFA6OmRlY29kZV9qc29uKEVuY29k ZTo6ZW5jb2RlKCdVVEYtOCcgPT4gRW5jb2RlOjpkZWNvZGUoY29uc29sZV9pbiA9PiAkdnNXaGVy ZU91dCkpKTsKLSAgICAgICAgfTsKLSAgICAgICAgcHJpbnQgIkVycm9yIGdldHRpbmcgVmlzdWFs IFN0dWRpbyBMb2NhdGlvbjogJEBcbiIgaWYgJEA7Ci0gICAgICAgIHVuZGVmICRAOwotCi0gICAg ICAgIGlmIChzY2FsYXIgQCRpbnN0YWxsYXRpb25zKSB7Ci0gICAgICAgICAgICBteSAkaW5zdGFs bGF0aW9uID0gJGluc3RhbGxhdGlvbnMtPlswXTsKLSAgICAgICAgICAgICR2c1doZXJlRm91bmRJ bnN0YWxsYXRpb24gPSAkaW5zdGFsbGF0aW9uOwotICAgICAgICAgICAgcmV0dXJuICRpbnN0YWxs YXRpb247Ci0gICAgICAgIH0KKyAgICAjIFBsYXlTdGF0aW9uIGN1cnJlbnRseSByZXF1aXJlcyBW UzIwMTcgb25seQorICAgIG15ICR2ZXJzaW9uQXJnOworICAgIGlmIChpc1BsYXlTdGF0aW9uKCkp IHsKKyAgICAgICAgJHZlcnNpb25BcmcgPSAiLXZlcnNpb24gXCJbMTUuMCwxNi4wKVwiIjsKICAg ICB9CisKKyAgICBteSAkY29tbWFuZCA9ICIkc291cmNlRGlyL1dlYktpdExpYnJhcmllcy93aW4v dG9vbHMvdnN3aGVyZSAkdmVyc2lvbkFyZyAtbm9sb2dvIC1sYXRlc3QgLWZvcm1hdCBqc29uIC1y ZXF1aXJlcyBNaWNyb3NvZnQuQ29tcG9uZW50Lk1TQnVpbGQiOworICAgIG15ICR2c1doZXJlT3V0 ID0gYCRjb21tYW5kYDsKKyAgICBteSAkaW5zdGFsbGF0aW9ucyA9IFtdOworICAgIGV2YWwgewor ICAgICAgICAkaW5zdGFsbGF0aW9ucyA9IEpTT046OlBQOjpkZWNvZGVfanNvbihFbmNvZGU6OmVu Y29kZSgnVVRGLTgnID0+IEVuY29kZTo6ZGVjb2RlKGNvbnNvbGVfaW4gPT4gJHZzV2hlcmVPdXQp KSk7CisgICAgfTsKKyAgICBwcmludCAiRXJyb3IgZ2V0dGluZyBWaXN1YWwgU3R1ZGlvIExvY2F0 aW9uOiAkQFxuIiBpZiAkQDsKKyAgICB1bmRlZiAkQDsKKworICAgIGlmIChzY2FsYXIgQCRpbnN0 YWxsYXRpb25zKSB7CisgICAgICAgIG15ICRpbnN0YWxsYXRpb24gPSAkaW5zdGFsbGF0aW9ucy0+ WzBdOworICAgICAgICAkdnNXaGVyZUZvdW5kSW5zdGFsbGF0aW9uID0gJGluc3RhbGxhdGlvbjsK KyAgICAgICAgcmV0dXJuICRpbnN0YWxsYXRpb247CisgICAgfQorCiAgICAgcmV0dXJuIHVuZGVm OwogfQogCkBAIC03NDAsOCArNzM1LDE1IEBAIHN1YiBtc0J1aWxkSW5zdGFsbERpcgogICAgIHJl dHVybiAkbXNCdWlsZEluc3RhbGxEaXIgaWYgZGVmaW5lZCAkbXNCdWlsZEluc3RhbGxEaXI7CiAK ICAgICBteSAkaW5zdGFsbERpciA9IHZpc3VhbFN0dWRpb0luc3RhbGxEaXIoKTsKKworICAgICMg QXMgb2YgVlMyMDE5LCBNU0J1aWxkLmV4ZSBnb2VzIGludG8gYSAiQ3VycmVudCIgZGlyZWN0b3J5 CisgICAgIyByYXRoZXIgdGhhbiBhIHZlcnNpb25lZCBvbmUgdW5kZXIgdGhlIGluc3RhbGwgZGly ZWN0b3J5LgogICAgICRtc0J1aWxkSW5zdGFsbERpciA9IEZpbGU6OlNwZWMtPmNhdGRpcigkaW5z dGFsbERpciwKLSAgICAgICAgIk1TQnVpbGQiLCAiMTUuMCIsICJiaW4iKTsKKyAgICAgICAgIk1T QnVpbGQiLCAiQ3VycmVudCIsICJiaW4iKTsKKyAgICBpZiAoIS1lICIkbXNCdWlsZEluc3RhbGxE aXIvTVNCdWlsZC5leGUiKSB7CisgICAgICAgICRtc0J1aWxkSW5zdGFsbERpciA9IEZpbGU6OlNw ZWMtPmNhdGRpcigkaW5zdGFsbERpciwKKyAgICAgICAgICAgICJNU0J1aWxkIiwgIjE1LjAiLCAi YmluIik7CisgICAgfQogCiAgICAgY2hvbXAoJG1zQnVpbGRJbnN0YWxsRGlyID0gYGN5Z3BhdGgg IiRtc0J1aWxkSW5zdGFsbERpciJgKSBpZiBpc0N5Z3dpbigpOwogCkBAIC0yMjUwLDggKzIyNTIs NyBAQCBzdWIgZ2VuZXJhdGVCdWlsZFN5c3RlbUZyb21DTWFrZVByb2plY3QKICAgICAgICAgfQog ICAgICAgICBwdXNoIEBhcmdzLCAiLURVU0VfVEhJTl9BUkNISVZFUz1PRkYiIGlmIGlzUGxheVN0 YXRpb24oKTsKICAgICB9IGVsc2lmIChpc0FueVdpbmRvd3MoKSAmJiBpc1dpbjY0KCkpIHsKLSAg ICAgICAgcHVzaCBAYXJncywgJy1HICJWaXN1YWwgU3R1ZGlvIDE1IDIwMTcgV2luNjQiJzsKLSAg ICAgICAgcHVzaCBAYXJncywgJy1EQ01BS0VfR0VORVJBVE9SX1RPT0xTRVQ9Imhvc3Q9eDY0Iic7 CisgICAgICAgIHB1c2ggQGFyZ3MsICctQSB4NjQnOwogICAgIH0gZWxzaWYgKGlzUGxheVN0YXRp b24oKSkgewogICAgICAgICBwdXNoIEBhcmdzLCAnLUcgIlZpc3VhbCBTdHVkaW8gMTUiJzsKICAg ICB9Cg== 367193 2019-04-10 19:51:27 -0700 2019-04-21 21:01:55 -0700 Patch bug-196622-20190411115126.patch text/plain 5521 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MTc5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzZhNTY2ZDdjNmM1MDQ0YmYzNDkwYjJkZDIxOTIzODhj M2QzNjRhOS4uNTg1NmI4ODhkZDljM2QxNDdlMThjOWJhZTFhY2JlMjRlYjhjM2JlOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDE5LTA0LTEwICBTdGVwaGFuIFN6YWJvICA8c3RlcGhhbi5zemFib0Bzb255LmNvbT4g YW5kIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAg W1dpbkNhaXJvXSBNb3ZlIHRvIFZpc3VhbCBTdHVkaW8gMjAxOQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NjIyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgMS4gQWNjb21tb2RhdGVkIHRvIHRoZSBuZXcg bXNidWlsZC5leGUgbG9jYXRpb24gb2YgVlMgMjAxOS4KKyAgICAgICAgMi4gUmVtb3ZlZCB0aGUg aGFyZCBjb2RlZCAiVmlzdWFsIFN0dWRpbyAxNSIgZ2VuZXJhdG9yLgorCisgICAgICAgIGJ1aWxk LXdlYmtpdCBpcyBnb2luZyB0byBjaG9vc2UgYSBWaXN1YWwgU3R1ZGlvIGdlbmVyYXRvciB2ZXJz aW9uCisgICAgICAgIG1hdGNoaW5nIHdpdGggdGhlIGxhdGVzdCBpbnN0YWxsZWQgVlMuIElmIHlv dSBpbnZva2UgdmN2YXJzLmJhdAorICAgICAgICBiZWZvcmUgYnVpbGQtd2Via2l0LCBpdCBjaG9v c2VzIHRoZSBjb3JyZXNwb25kaW5nIFZpc3VhbCBTdHVkaW8KKyAgICAgICAgZ2VuZXJhdG9yIHZl cnNpb24gYnkgY2hla2luZyAnVmlzdWFsU3R1ZGlvVmVyc2lvbicgZW52IHZhciB3aGljaAorICAg ICAgICBpcyBzZXQgYnkgdmN2YXJzLmJhdC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGly cy5wbTogUmVuYW1lZCAkdmNCdWlsZFBhdGggdG8gJG1zQnVpbGRQYXRoLiBSZW1vdmVkICRtc0J1 aWxkSW5zdGFsbERpci4KKyAgICAgICAgKG1zQnVpbGRQYXRoKTogV2hlbiBsb29raW5nIGZvciBN U0J1aWxkLCBsb29rIGluCisgICAgICAgICJNU0J1aWxkXEN1cnJlbnRcYmluIiAodGhlIG5ldyBl eHBlY3RlZCBsb2NhdGlvbikgYW5kIGZhbGxiYWNrCisgICAgICAgIHRvICJNU0J1aWxkXDE1LjBc YmluIiBpZiB3ZSBjYW4ndCBmaW5kIGFuIE1TQnVpbGQuZXhlIGluIHRoZQorICAgICAgICBmaXJz dCBsb2NhdGlvbi4KKyAgICAgICAgKG1zQnVpbGRJbnN0YWxsRGlyKTogUmVuYW1lZCB0byBtc0J1 aWxkUGF0aC4KKyAgICAgICAgKGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9qZWN0KTog VXNlIC1BIHN3aXRjaCB0byBzcGVjaWZ5IHg2NC4KKyAgICAgICAgQWRkIC1HICJWaXN1YWwgU3R1 ZGlvICIgc3dpdGNoIGlmIGEgZW52IHZhciAnVmlzdWFsU3R1ZGlvVmVyc2lvbicKKwogMjAxOS0w NC0xMCAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAg ICBbV2luXSBVc2UgYSBidW5kbGVkIHZzd2hlcmUuZXhlIGluc3RlYWQgb2YgZG93bmxvYWRpbmcg YnkgdXBkYXRlLXZzd2hlcmUucHkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBlMDYwMjVmYjY1NTBiOTgy OGU0MzNjYWI0MDBhMGE1MDQ4NjJmNDZiLi5jMTBkMjJiZGRiZGI1YWU4YWJjYTEyNTUyMzU5YTRi MTQ3Njg3NDVlIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0xNTksOSArMTU5LDggQEAgbXkgJHVua25v d25Qb3J0UHJvaGliaXRlZCA9IDA7CiAKICMgVmFyaWFibGVzIGZvciBXaW4zMiBzdXBwb3J0CiBt eSAkcHJvZ3JhbUZpbGVzUGF0aDsKLW15ICR2Y0J1aWxkUGF0aDsKK215ICRtc0J1aWxkUGF0aDsK IG15ICR2c0luc3RhbGxEaXI7Ci1teSAkbXNCdWlsZEluc3RhbGxEaXI7CiBteSAkdnNWZXJzaW9u OwogbXkgJHdpbmRvd3NTb3VyY2VEaXI7CiBteSAkd2luVmVyc2lvbjsKQEAgLTY3MiwxOCArNjcx LDIwIEBAIHN1YiB2aXN1YWxTdHVkaW9JbnN0YWxsRGlyCiAgICAgcmV0dXJuICR2c0luc3RhbGxE aXI7CiB9CiAKLXN1YiBtc0J1aWxkSW5zdGFsbERpcgorc3ViIG1zQnVpbGRQYXRoCiB7Ci0gICAg cmV0dXJuICRtc0J1aWxkSW5zdGFsbERpciBpZiBkZWZpbmVkICRtc0J1aWxkSW5zdGFsbERpcjsK LQogICAgIG15ICRpbnN0YWxsRGlyID0gdmlzdWFsU3R1ZGlvSW5zdGFsbERpcigpOwotICAgICRt c0J1aWxkSW5zdGFsbERpciA9IEZpbGU6OlNwZWMtPmNhdGRpcigkaW5zdGFsbERpciwKLSAgICAg ICAgIk1TQnVpbGQiLCAiMTUuMCIsICJiaW4iKTsKIAotICAgIGNob21wKCRtc0J1aWxkSW5zdGFs bERpciA9IGBjeWdwYXRoICIkbXNCdWlsZEluc3RhbGxEaXIiYCkgaWYgaXNDeWd3aW4oKTsKKyAg ICAjIEZJWE1FOiB2c3doZXJlLmV4ZSBzaG91bGQgYmUgdXNlZCB0byBmaW5kIG1zYnVpbGQuZXhl IGFmdGVyIEFwcGxlV2luIHdpbGwgZ2V0IHZzd2hlcmUgd2l0aCAtZmluZCBzd2l0Y2guCisgICAg IyA8aHR0cHM6Ly9naXRodWIuY29tL01pY3Jvc29mdC92c3doZXJlL3dpa2kvRmluZC1NU0J1aWxk PgorICAgICMgPGh0dHBzOi8vZ2l0aHViLmNvbS9NaWNyb3NvZnQvdnN3aGVyZS9yZWxlYXNlcy90 YWcvMi42LjYlMkJkOWRiZTc5ZGIzPgorICAgIG15ICRwYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZGly KCRpbnN0YWxsRGlyLCAiTVNCdWlsZCIsICJDdXJyZW50IiwgImJpbiIsICJNU0J1aWxkLmV4ZSIp OworICAgICRwYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRpbnN0YWxsRGlyLCAiTVNCdWlsZCIs ICIxNS4wIiwgImJpbiIsICJNU0J1aWxkLmV4ZSIpIHVubGVzcyAtZSAkcGF0aDsKKworICAgIGNo b21wKCRwYXRoID0gYGN5Z3BhdGggIiRwYXRoImApIGlmIGlzQ3lnd2luKCk7CiAKLSAgICBwcmlu dCAiVXNpbmcgTVNCdWlsZDogJG1zQnVpbGRJbnN0YWxsRGlyXG4iOwotICAgIHJldHVybiAkbXNC dWlsZEluc3RhbGxEaXI7CisgICAgcHJpbnQgIlVzaW5nIE1TQnVpbGQ6ICRwYXRoXG4iOworICAg IHJldHVybiAkcGF0aDsKIH0KIAogc3ViIGRldGVybWluZUNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxT dHVkaW8KQEAgLTE4MjgsNyArMTgyOSw3IEBAIHN1YiBzZXR1cEFwcGxlV2luRW52KCkKIHN1YiBz ZXR1cEN5Z3dpbkVudigpCiB7CiAgICAgcmV0dXJuIGlmICFpc0FueVdpbmRvd3MoKTsKLSAgICBy ZXR1cm4gaWYgJHZjQnVpbGRQYXRoOworICAgIHJldHVybiBpZiAkbXNCdWlsZFBhdGg7CiAKICAg ICBteSAkcHJvZ3JhbUZpbGVzUGF0aCA9IHByb2dyYW1GaWxlc1BhdGgoKTsKIApAQCAtMTg0MCwx MCArMTg0MSwxMCBAQCBzdWIgc2V0dXBDeWd3aW5FbnYoKQogCiAgICAgIyBXZSB3aWxsIGFjdHVh bGx5IHVzZSBNU0J1aWxkIHRvIGJ1aWxkIFdlYktpdCwgYnV0IHdlIG5lZWQgdG8gZmluZCB0aGUg VmlzdWFsIFN0dWRpbyBpbnN0YWxsIChhYm92ZSkgdG8gbWFrZQogICAgICMgc3VyZSB3ZSB1c2Ug dGhlIHJpZ2h0IG9wdGlvbnMuCi0gICAgJHZjQnVpbGRQYXRoID0gRmlsZTo6U3BlYy0+Y2F0Zmls ZShtc0J1aWxkSW5zdGFsbERpcigpLCBxdyhNU0J1aWxkLmV4ZSkpOwotICAgIGlmICghIC1lICR2 Y0J1aWxkUGF0aCkgeworICAgICRtc0J1aWxkUGF0aCA9IG1zQnVpbGRQYXRoKCk7CisgICAgaWYg KCEgLWUgJG1zQnVpbGRQYXRoKSB7CiAgICAgICAgIHByaW50ICIqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqXG4iOwotICAgICAgICBw cmludCAiQ2Fubm90IGZpbmQgJyR2Y0J1aWxkUGF0aCdcbiI7CisgICAgICAgIHByaW50ICJDYW5u b3QgZmluZCAnJG1zQnVpbGRQYXRoJ1xuIjsKICAgICAgICAgcHJpbnQgIlBsZWFzZSBtYWtlIHN1 cmUgZXhlY3V0ZSB0aGF0IHRoZSBNaWNyb3NvZnQgLk5FVCBGcmFtZXdvcmsgU0RLXG4iOwogICAg ICAgICBwcmludCAiaXMgaW5zdGFsbGVkIG9uIHRoaXMgbWFjaGluZS5cbiI7CiAgICAgICAgIHBy aW50ICIqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqXG4iOwpAQCAtMTkwMyw3ICsxOTA0LDcgQEAgc3ViIGJ1aWxkVmlzdWFsU3R1ZGlv UHJvamVjdAogCiAgICAgbXkgJG1heENQVUNvdW50ID0gJy9tYXhjcHVjb3VudDonIC4gbnVtYmVy T2ZDUFVzKCk7CiAKLSAgICBteSBAY29tbWFuZCA9ICgkdmNCdWlsZFBhdGgsICIvdmVyYm9zaXR5 Om1pbmltYWwiLCAkcHJvamVjdCwgJGFjdGlvbiwgJGNvbmZpZywgJHBsYXRmb3JtLCAiL2ZsIiwg JGVycm9yTG9nZ2luZywgIi9mbDEiLCAkd2FybmluZ0xvZ2dpbmcsICRtYXhDUFVDb3VudCk7Cisg ICAgbXkgQGNvbW1hbmQgPSAoJG1zQnVpbGRQYXRoLCAiL3ZlcmJvc2l0eTptaW5pbWFsIiwgJHBy b2plY3QsICRhY3Rpb24sICRjb25maWcsICRwbGF0Zm9ybSwgIi9mbCIsICRlcnJvckxvZ2dpbmcs ICIvZmwxIiwgJHdhcm5pbmdMb2dnaW5nLCAkbWF4Q1BVQ291bnQpOwogICAgIHByaW50IGpvaW4o IiAiLCBAY29tbWFuZCksICJcbiI7CiAgICAgcmV0dXJuIHN5c3RlbSBAY29tbWFuZDsKIH0KQEAg LTIxODUsMTEgKzIxODYsMTQgQEAgc3ViIGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9q ZWN0CiAgICAgICAgICAgICBwdXNoIEBhcmdzLCAiTmluamEiOwogICAgICAgICB9CiAgICAgICAg IHB1c2ggQGFyZ3MsICItRFVTRV9USElOX0FSQ0hJVkVTPU9GRiIgaWYgaXNQbGF5U3RhdGlvbigp OwotICAgIH0gZWxzaWYgKGlzQW55V2luZG93cygpICYmIGlzV2luNjQoKSkgewotICAgICAgICBw dXNoIEBhcmdzLCAnLUcgIlZpc3VhbCBTdHVkaW8gMTUgMjAxNyBXaW42NCInOwotICAgICAgICBw dXNoIEBhcmdzLCAnLURDTUFLRV9HRU5FUkFUT1JfVE9PTFNFVD0iaG9zdD14NjQiJzsKLSAgICB9 IGVsc2lmIChpc1BsYXlTdGF0aW9uKCkpIHsKLSAgICAgICAgcHVzaCBAYXJncywgJy1HICJWaXN1 YWwgU3R1ZGlvIDE1Iic7CisgICAgfSBlbHNlIHsKKyAgICAgICAgaWYgKGlzQW55V2luZG93cygp ICYmIGlzV2luNjQoKSkgeworICAgICAgICAgICAgcHVzaCBAYXJncywgJy1BIHg2NCc7CisgICAg ICAgIH0KKyAgICAgICAgaWYgKChpc0FueVdpbmRvd3MoKSB8fCBpc1BsYXlTdGF0aW9uKCkpICYm IGRlZmluZWQgJEVOVntWaXN1YWxTdHVkaW9WZXJzaW9ufSkgeworICAgICAgICAgICAgbXkgJHZh ciA9IGludCgkRU5We1Zpc3VhbFN0dWRpb1ZlcnNpb259KTsKKyAgICAgICAgICAgIHB1c2ggQGFy Z3MsIHFxKC1HICJWaXN1YWwgU3R1ZGlvICR2YXIiKTsKKyAgICAgICAgfQogICAgIH0KIAogICAg ICMgRG8gbm90IHNob3cgcHJvZ3Jlc3Mgb2YgZ2VuZXJhdGluZyBiaW5kaW5ncyBpbiBpbnRlcmFj dGl2ZSBOaW5qYSBidWlsZCBub3QgdG8gbGVhdmUgbm9pc3kgbGluZXMgb24gdHR5Cg== 367924 2019-04-21 21:02:14 -0700 2019-05-08 13:04:22 -0700 Patch bug-196622-20190422130213.patch text/plain 5554 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NDk1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODVmYjNiMDM0YzI1MTU0MjkzZTE1Yzk1ZTI2ODA2OTg2 MzdkMzdkNS4uNGU3MTE1NjRhZTJkZWMyZGE2ZTFmN2ZjNTk2Yzg5MWE5ZjNkMThiNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDE5LTA0LTIxICBTdGVwaGFuIFN6YWJvICA8c3RlcGhhbi5zemFib0Bzb255LmNvbT4g YW5kIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAg W1dpbl0gYnVpbGQtd2Via2l0IHNob3VsZCBiZSByZWFkeSBmb3IgVmlzdWFsIFN0dWRpbyAyMDE5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY2MjIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAxLiBBY2Nv bW1vZGF0ZWQgdG8gdGhlIG5ldyBtc2J1aWxkLmV4ZSBsb2NhdGlvbiBvZiBWUyAyMDE5LgorICAg ICAgICAyLiBSZW1vdmVkIHRoZSBoYXJkIGNvZGVkICJWaXN1YWwgU3R1ZGlvIDE1IiBnZW5lcmF0 b3IuCisKKyAgICAgICAgYnVpbGQtd2Via2l0IGlzIGdvaW5nIHRvIGNob29zZSBhIFZpc3VhbCBT dHVkaW8gZ2VuZXJhdG9yIHZlcnNpb24KKyAgICAgICAgbWF0Y2hpbmcgd2l0aCB0aGUgbGF0ZXN0 IGluc3RhbGxlZCBWUy4gSWYgeW91IGludm9rZSB2Y3ZhcnMuYmF0CisgICAgICAgIGJlZm9yZSBi dWlsZC13ZWJraXQsIGl0IGNob29zZXMgdGhlIGNvcnJlc3BvbmRpbmcgVmlzdWFsIFN0dWRpbwor ICAgICAgICBnZW5lcmF0b3IgdmVyc2lvbiBieSBjaGVraW5nICdWaXN1YWxTdHVkaW9WZXJzaW9u JyBlbnYgdmFyIHdoaWNoCisgICAgICAgIGlzIHNldCBieSB2Y3ZhcnMuYmF0LgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOiBSZW5hbWVkICR2Y0J1aWxkUGF0aCB0byAkbXNCdWls ZFBhdGguIFJlbW92ZWQgJG1zQnVpbGRJbnN0YWxsRGlyLgorICAgICAgICAobXNCdWlsZFBhdGgp OiBXaGVuIGxvb2tpbmcgZm9yIE1TQnVpbGQsIGxvb2sgaW4KKyAgICAgICAgIk1TQnVpbGRcQ3Vy cmVudFxiaW4iICh0aGUgbmV3IGV4cGVjdGVkIGxvY2F0aW9uKSBhbmQgZmFsbGJhY2sKKyAgICAg ICAgdG8gIk1TQnVpbGRcMTUuMFxiaW4iIGlmIHdlIGNhbid0IGZpbmQgYW4gTVNCdWlsZC5leGUg aW4gdGhlCisgICAgICAgIGZpcnN0IGxvY2F0aW9uLgorICAgICAgICAobXNCdWlsZEluc3RhbGxE aXIpOiBSZW5hbWVkIHRvIG1zQnVpbGRQYXRoLgorICAgICAgICAoZ2VuZXJhdGVCdWlsZFN5c3Rl bUZyb21DTWFrZVByb2plY3QpOiBVc2UgLUEgc3dpdGNoIHRvIHNwZWNpZnkgeDY0LgorICAgICAg ICBBZGQgLUcgIlZpc3VhbCBTdHVkaW8gIiBzd2l0Y2ggaWYgYSBlbnYgdmFyICdWaXN1YWxTdHVk aW9WZXJzaW9uJworCiAyMDE5LTA0LTIxICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBw bGUuY29tPgogCiAgICAgICAgIERlZmVyIEVkaXRvclN0YXRlIHVwZGF0ZXMgdW50aWwgdGhlIG5l eHQgbGF5ZXIgdHJlZSBmbHVzaCBpbiBhIGZldyBhZGRpdGlvbmFsIGNpcmN1bXN0YW5jZXMKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbQppbmRleCBlMDYwMjVmYjY1NTBiOTgyOGU0MzNjYWI0MDBhMGE1MDQ4NjJmNDZi Li5jMTBkMjJiZGRiZGI1YWU4YWJjYTEyNTUyMzU5YTRiMTQ3Njg3NDVlIDEwMDc1NQotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCkBAIC0xNTksOSArMTU5LDggQEAgbXkgJHVua25vd25Qb3J0UHJvaGliaXRlZCA9IDA7CiAK ICMgVmFyaWFibGVzIGZvciBXaW4zMiBzdXBwb3J0CiBteSAkcHJvZ3JhbUZpbGVzUGF0aDsKLW15 ICR2Y0J1aWxkUGF0aDsKK215ICRtc0J1aWxkUGF0aDsKIG15ICR2c0luc3RhbGxEaXI7Ci1teSAk bXNCdWlsZEluc3RhbGxEaXI7CiBteSAkdnNWZXJzaW9uOwogbXkgJHdpbmRvd3NTb3VyY2VEaXI7 CiBteSAkd2luVmVyc2lvbjsKQEAgLTY3MiwxOCArNjcxLDIwIEBAIHN1YiB2aXN1YWxTdHVkaW9J bnN0YWxsRGlyCiAgICAgcmV0dXJuICR2c0luc3RhbGxEaXI7CiB9CiAKLXN1YiBtc0J1aWxkSW5z dGFsbERpcgorc3ViIG1zQnVpbGRQYXRoCiB7Ci0gICAgcmV0dXJuICRtc0J1aWxkSW5zdGFsbERp ciBpZiBkZWZpbmVkICRtc0J1aWxkSW5zdGFsbERpcjsKLQogICAgIG15ICRpbnN0YWxsRGlyID0g dmlzdWFsU3R1ZGlvSW5zdGFsbERpcigpOwotICAgICRtc0J1aWxkSW5zdGFsbERpciA9IEZpbGU6 OlNwZWMtPmNhdGRpcigkaW5zdGFsbERpciwKLSAgICAgICAgIk1TQnVpbGQiLCAiMTUuMCIsICJi aW4iKTsKIAotICAgIGNob21wKCRtc0J1aWxkSW5zdGFsbERpciA9IGBjeWdwYXRoICIkbXNCdWls ZEluc3RhbGxEaXIiYCkgaWYgaXNDeWd3aW4oKTsKKyAgICAjIEZJWE1FOiB2c3doZXJlLmV4ZSBz aG91bGQgYmUgdXNlZCB0byBmaW5kIG1zYnVpbGQuZXhlIGFmdGVyIEFwcGxlV2luIHdpbGwgZ2V0 IHZzd2hlcmUgd2l0aCAtZmluZCBzd2l0Y2guCisgICAgIyA8aHR0cHM6Ly9naXRodWIuY29tL01p Y3Jvc29mdC92c3doZXJlL3dpa2kvRmluZC1NU0J1aWxkPgorICAgICMgPGh0dHBzOi8vZ2l0aHVi LmNvbS9NaWNyb3NvZnQvdnN3aGVyZS9yZWxlYXNlcy90YWcvMi42LjYlMkJkOWRiZTc5ZGIzPgor ICAgIG15ICRwYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRpbnN0YWxsRGlyLCAiTVNCdWlsZCIs ICJDdXJyZW50IiwgImJpbiIsICJNU0J1aWxkLmV4ZSIpOworICAgICRwYXRoID0gRmlsZTo6U3Bl Yy0+Y2F0ZGlyKCRpbnN0YWxsRGlyLCAiTVNCdWlsZCIsICIxNS4wIiwgImJpbiIsICJNU0J1aWxk LmV4ZSIpIHVubGVzcyAtZSAkcGF0aDsKKworICAgIGNob21wKCRwYXRoID0gYGN5Z3BhdGggIiRw YXRoImApIGlmIGlzQ3lnd2luKCk7CiAKLSAgICBwcmludCAiVXNpbmcgTVNCdWlsZDogJG1zQnVp bGRJbnN0YWxsRGlyXG4iOwotICAgIHJldHVybiAkbXNCdWlsZEluc3RhbGxEaXI7CisgICAgcHJp bnQgIlVzaW5nIE1TQnVpbGQ6ICRwYXRoXG4iOworICAgIHJldHVybiAkcGF0aDsKIH0KIAogc3Vi IGRldGVybWluZUNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8KQEAgLTE4MjgsNyArMTgyOSw3 IEBAIHN1YiBzZXR1cEFwcGxlV2luRW52KCkKIHN1YiBzZXR1cEN5Z3dpbkVudigpCiB7CiAgICAg cmV0dXJuIGlmICFpc0FueVdpbmRvd3MoKTsKLSAgICByZXR1cm4gaWYgJHZjQnVpbGRQYXRoOwor ICAgIHJldHVybiBpZiAkbXNCdWlsZFBhdGg7CiAKICAgICBteSAkcHJvZ3JhbUZpbGVzUGF0aCA9 IHByb2dyYW1GaWxlc1BhdGgoKTsKIApAQCAtMTg0MCwxMCArMTg0MSwxMCBAQCBzdWIgc2V0dXBD eWd3aW5FbnYoKQogCiAgICAgIyBXZSB3aWxsIGFjdHVhbGx5IHVzZSBNU0J1aWxkIHRvIGJ1aWxk IFdlYktpdCwgYnV0IHdlIG5lZWQgdG8gZmluZCB0aGUgVmlzdWFsIFN0dWRpbyBpbnN0YWxsIChh Ym92ZSkgdG8gbWFrZQogICAgICMgc3VyZSB3ZSB1c2UgdGhlIHJpZ2h0IG9wdGlvbnMuCi0gICAg JHZjQnVpbGRQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZShtc0J1aWxkSW5zdGFsbERpcigpLCBx dyhNU0J1aWxkLmV4ZSkpOwotICAgIGlmICghIC1lICR2Y0J1aWxkUGF0aCkgeworICAgICRtc0J1 aWxkUGF0aCA9IG1zQnVpbGRQYXRoKCk7CisgICAgaWYgKCEgLWUgJG1zQnVpbGRQYXRoKSB7CiAg ICAgICAgIHByaW50ICIqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqXG4iOwotICAgICAgICBwcmludCAiQ2Fubm90IGZpbmQgJyR2Y0J1 aWxkUGF0aCdcbiI7CisgICAgICAgIHByaW50ICJDYW5ub3QgZmluZCAnJG1zQnVpbGRQYXRoJ1xu IjsKICAgICAgICAgcHJpbnQgIlBsZWFzZSBtYWtlIHN1cmUgZXhlY3V0ZSB0aGF0IHRoZSBNaWNy b3NvZnQgLk5FVCBGcmFtZXdvcmsgU0RLXG4iOwogICAgICAgICBwcmludCAiaXMgaW5zdGFsbGVk IG9uIHRoaXMgbWFjaGluZS5cbiI7CiAgICAgICAgIHByaW50ICIqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqXG4iOwpAQCAtMTkwMyw3 ICsxOTA0LDcgQEAgc3ViIGJ1aWxkVmlzdWFsU3R1ZGlvUHJvamVjdAogCiAgICAgbXkgJG1heENQ VUNvdW50ID0gJy9tYXhjcHVjb3VudDonIC4gbnVtYmVyT2ZDUFVzKCk7CiAKLSAgICBteSBAY29t bWFuZCA9ICgkdmNCdWlsZFBhdGgsICIvdmVyYm9zaXR5Om1pbmltYWwiLCAkcHJvamVjdCwgJGFj dGlvbiwgJGNvbmZpZywgJHBsYXRmb3JtLCAiL2ZsIiwgJGVycm9yTG9nZ2luZywgIi9mbDEiLCAk d2FybmluZ0xvZ2dpbmcsICRtYXhDUFVDb3VudCk7CisgICAgbXkgQGNvbW1hbmQgPSAoJG1zQnVp bGRQYXRoLCAiL3ZlcmJvc2l0eTptaW5pbWFsIiwgJHByb2plY3QsICRhY3Rpb24sICRjb25maWcs ICRwbGF0Zm9ybSwgIi9mbCIsICRlcnJvckxvZ2dpbmcsICIvZmwxIiwgJHdhcm5pbmdMb2dnaW5n LCAkbWF4Q1BVQ291bnQpOwogICAgIHByaW50IGpvaW4oIiAiLCBAY29tbWFuZCksICJcbiI7CiAg ICAgcmV0dXJuIHN5c3RlbSBAY29tbWFuZDsKIH0KQEAgLTIxODUsMTEgKzIxODYsMTQgQEAgc3Vi IGdlbmVyYXRlQnVpbGRTeXN0ZW1Gcm9tQ01ha2VQcm9qZWN0CiAgICAgICAgICAgICBwdXNoIEBh cmdzLCAiTmluamEiOwogICAgICAgICB9CiAgICAgICAgIHB1c2ggQGFyZ3MsICItRFVTRV9USElO X0FSQ0hJVkVTPU9GRiIgaWYgaXNQbGF5U3RhdGlvbigpOwotICAgIH0gZWxzaWYgKGlzQW55V2lu ZG93cygpICYmIGlzV2luNjQoKSkgewotICAgICAgICBwdXNoIEBhcmdzLCAnLUcgIlZpc3VhbCBT dHVkaW8gMTUgMjAxNyBXaW42NCInOwotICAgICAgICBwdXNoIEBhcmdzLCAnLURDTUFLRV9HRU5F UkFUT1JfVE9PTFNFVD0iaG9zdD14NjQiJzsKLSAgICB9IGVsc2lmIChpc1BsYXlTdGF0aW9uKCkp IHsKLSAgICAgICAgcHVzaCBAYXJncywgJy1HICJWaXN1YWwgU3R1ZGlvIDE1Iic7CisgICAgfSBl bHNlIHsKKyAgICAgICAgaWYgKGlzQW55V2luZG93cygpICYmIGlzV2luNjQoKSkgeworICAgICAg ICAgICAgcHVzaCBAYXJncywgJy1BIHg2NCc7CisgICAgICAgIH0KKyAgICAgICAgaWYgKChpc0Fu eVdpbmRvd3MoKSB8fCBpc1BsYXlTdGF0aW9uKCkpICYmIGRlZmluZWQgJEVOVntWaXN1YWxTdHVk aW9WZXJzaW9ufSkgeworICAgICAgICAgICAgbXkgJHZhciA9IGludCgkRU5We1Zpc3VhbFN0dWRp b1ZlcnNpb259KTsKKyAgICAgICAgICAgIHB1c2ggQGFyZ3MsIHFxKC1HICJWaXN1YWwgU3R1ZGlv ICR2YXIiKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgICMgRG8gbm90IHNob3cgcHJvZ3Jlc3Mg b2YgZ2VuZXJhdGluZyBiaW5kaW5ncyBpbiBpbnRlcmFjdGl2ZSBOaW5qYSBidWlsZCBub3QgdG8g bGVhdmUgbm9pc3kgbGluZXMgb24gdHR5Cg==