215067 2020-08-01 17:01:44 -0700 [webkitcorepy] Use setup.py for the autoinstaller 2022-02-04 23:28:43 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=214378 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap dean_johnson dewei_zhu fujii jlewis3 rreapor ryanhaddad slewis webkit-bug-importer oldest_to_newest 1677175 0 jbedard 2020-08-01 17:01:44 -0700 Previously, we were just moving the Python files directly. This wouldn't work if the library in question has C dependencies (the webkitpy autoinstaller had a similar issue). setup.py is the blessed way to install in a custom location. 1677176 1 webkit-bug-importer 2020-08-01 17:02:56 -0700 <rdar://problem/66432719> 1677177 2 405799 jbedard 2020-08-01 17:15:06 -0700 Created attachment 405799 Patch 1677178 3 jbedard 2020-08-01 17:17:11 -0700 (In reply to Jonathan Bedard from comment #2) > Created attachment 405799 [details] > Patch I've tested this with a few cryptography libraries that require compilation. So far, I haven't found a library where this approach does not work, assuming the libraries it depends on are also specified. 1677272 4 aakash_jain 2020-08-03 05:23:15 -0700 This patch seems to break api tests on mac. e.g.: https://ews-build.webkit.org/#/builders/3/builds/29658 subprocess.CalledProcessError: Command '['/usr/bin/python', '/Volumes/Data/worker/API-Tests-macOS-EWS/build/Tools/Scripts/libraries/autoinstalled/python-2/urllib3.tmp/urllib3-1.25.10/setup.py', 'install', '--home=/Volumes/Data/worker/API-Tests-macOS-EWS/build/Tools/Scripts/libraries/autoinstalled/python-2', '--root=/', '--single-version-externally-managed', '--install-lib=/Volumes/Data/worker/API-Tests-macOS-EWS/build/Tools/Scripts/libraries/autoinstalled/python-2', '--install-scripts=/Volumes/Data/worker/API-Tests-macOS-EWS/build/Tools/Scripts/libraries/autoinstalled/python-2', '--install-data=/Volumes/Data/worker/API-Tests-macOS-EWS/build/Tools/Scripts/libraries/autoinstalled/python-2/data', '--install-headers=/Volumes/Data/worker/API-Tests-macOS-EWS/build/Tools/Scripts/libraries/autoinstalled/python-2/headers', '--old-and-unmanageable']' returned non-zero exit status 1 1677292 5 jbedard 2020-08-03 07:58:44 -0700 (In reply to Aakash Jain from comment #4) > This patch seems to break api tests on mac. > > e.g.: https://ews-build.webkit.org/#/builders/3/builds/29658 > > subprocess.CalledProcessError: Command > '['/usr/bin/python', > '/Volumes/Data/worker/API-Tests-macOS-EWS/build/Tools/Scripts/libraries/ > autoinstalled/python-2/urllib3.tmp/urllib3-1.25.10/setup.py', > 'install', > '--home=/Volumes/Data/worker/API-Tests-macOS-EWS/build/Tools/Scripts/ > libraries/autoinstalled/python-2', > '--root=/', > '--single-version-externally-managed', > '--install-lib=/Volumes/Data/worker/API-Tests-macOS-EWS/build/Tools/Scripts/ > libraries/autoinstalled/python-2', > '--install-scripts=/Volumes/Data/worker/API-Tests-macOS-EWS/build/Tools/ > Scripts/libraries/autoinstalled/python-2', > '--install-data=/Volumes/Data/worker/API-Tests-macOS-EWS/build/Tools/Scripts/ > libraries/autoinstalled/python-2/data', > '--install-headers=/Volumes/Data/worker/API-Tests-macOS-EWS/build/Tools/ > Scripts/libraries/autoinstalled/python-2/headers', > '--old-and-unmanageable']' > returned non-zero exit status 1 Going to increase logging....bit weird that it broke API tests on Mac and nothing else, would have expected this to be all or nothing. 1677295 6 405831 jbedard 2020-08-03 08:28:13 -0700 Created attachment 405831 Patch 1677305 7 jbedard 2020-08-03 09:08:08 -0700 (In reply to Jonathan Bedard from comment #5) > (In reply to Aakash Jain from comment #4) > > .... > > Going to increase logging....bit weird that it broke API tests on Mac and > nothing else, would have expected this to be all or nothing. Fun! we have an outdated version of setuptools on these bots....which, rather ironically, means we need to install setup tools before installing anything else. 1677307 8 405834 jbedard 2020-08-03 09:15:55 -0700 Created attachment 405834 Patch 1677330 9 405845 jbedard 2020-08-03 09:57:22 -0700 Created attachment 405845 Patch 1677346 10 405850 jbedard 2020-08-03 10:36:36 -0700 Created attachment 405850 Patch 1677663 11 405928 jbedard 2020-08-04 10:34:59 -0700 Created attachment 405928 Patch 1677665 12 slewis 2020-08-04 10:37:49 -0700 Talked over the patch with Jonathan and decided we should keep the egg info because it has a lot of dependencies which we can use to write an automatable dependency list 1677685 13 ews-feeder 2020-08-04 12:06:51 -0700 Committed r265254: <https://trac.webkit.org/changeset/265254> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405928. 1677783 14 fujii 2020-08-04 15:58:40 -0700 WinCairo buildbot is failing since this change. https://build.webkit.org/builders/WinCairo%2064-bit%20WKL%20Release%20%28Tests%29/builds/7779 No handlers could be found for logger "webkitcorepy" Traceback (most recent call last): File "C:\WebKit-BuildWorker\wincairo-wkl-release-tests\build\Tools\Scripts\webkitpy\layout_tests\run_webkit_tests.py", line 40, in <module> from webkitpy.layout_tests.controllers.manager import Manager File "C:\WebKit-BuildWorker\wincairo-wkl-release-tests\build\Tools\Scripts\webkitpy\layout_tests\controllers\manager.py", line 60, in <module> from webkitpy.results.upload import Upload File "C:\WebKit-BuildWorker\wincairo-wkl-release-tests\build\Tools\Scripts\webkitpy\results\upload.py", line 23, in <module> import webkitpy.thirdparty.autoinstalled.requests File "C:\WebKit-BuildWorker\wincairo-wkl-release-tests\build\Tools\Scripts\webkitpy\thirdparty\autoinstalled\requests\__init__.py", line 43, in <module> import urllib3 File "C:\WebKit-BuildWorker\wincairo-wkl-release-tests\build\Tools\Scripts\libraries\webkitcorepy\webkitcorepy\autoinstall.py", line 405, in find_module cls.install(name) File "C:\WebKit-BuildWorker\wincairo-wkl-release-tests\build\Tools\Scripts\libraries\webkitcorepy\webkitcorepy\autoinstall.py", line 390, in install return to_install.install() File "C:\WebKit-BuildWorker\wincairo-wkl-release-tests\build\Tools\Scripts\libraries\webkitcorepy\webkitcorepy\autoinstall.py", line 185, in install AutoInstall.install('setuptools') File "C:\WebKit-BuildWorker\wincairo-wkl-release-tests\build\Tools\Scripts\libraries\webkitcorepy\webkitcorepy\autoinstall.py", line 390, in install return to_install.install() File "C:\WebKit-BuildWorker\wincairo-wkl-release-tests\build\Tools\Scripts\libraries\webkitcorepy\webkitcorepy\autoinstall.py", line 238, in install stderr=devnull, File "C:\tools\python\lib\subprocess.py", line 190, in check_call raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['C:\\tools\\python\\python.exe', 'C:\\WebKit-BuildWorker\\wincairo-wkl-release-tests\\build\\Tools\\Scripts\\libraries\\autoinstalled\\python-2\\setuptools.tmp\\setuptools-41.0.1\\setup.py', 'install', '--home=C:\\WebKit-BuildWorker\\wincairo-wkl-release-tests\\build\\Tools\\Scripts\\libraries\\autoinstalled\\python-2', '--root=/', '--single-version-externally-managed', '--install-lib=C:\\WebKit-BuildWorker\\wincairo-wkl-release-tests\\build\\Tools\\Scripts\\libraries\\autoinstalled\\python-2', '--install-scripts=C:\\WebKit-BuildWorker\\wincairo-wkl-release-tests\\build\\Tools\\Scripts\\libraries\\autoinstalled\\python-2', '--install-data=C:\\WebKit-BuildWorker\\wincairo-wkl-release-tests\\build\\Tools\\Scripts\\libraries\\autoinstalled\\python-2\\data', '--install-headers=C:\\WebKit-BuildWorker\\wincairo-wkl-release-tests\\build\\Tools\\Scripts\\libraries\\autoinstalled\\python-2\\headers', '--old-and-unmanageable']' returned non-zero exit status 1 1677816 15 jbedard 2020-08-04 17:22:00 -0700 Reopening to attach new patch. 1677817 16 405964 jbedard 2020-08-04 17:22:01 -0700 Created attachment 405964 Patch 1677833 17 405964 jbedard 2020-08-04 17:52:28 -0700 Comment on attachment 405964 Patch Thanks to the Sony folks for finding the actual fix, this will not resolve the issue. Marking the patch as obsolete.. 1677838 18 fujii 2020-08-04 18:09:10 -0700 Filed another ticket to fix the WinCairo issue. Bug 215152 – [webkitcorepy] REGRESSION(r265254): autoinstaller is failing to execute setup.py on win32 Python 1837720 19 rreapor 2022-02-04 23:28:43 -0800 rdar://88521722 405799 2020-08-01 17:15:06 -0700 2020-08-03 08:28:12 -0700 Patch bug-215067-20200801171505.patch text/plain 6334 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTE4MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIwLTA4LTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBVc2Ugc2V0dXAucHkgZm9yIHRoZSBhdXRvaW5z dGFsbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTUwNjcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDMyNzE5PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weTogQWRkIGFsbCByZXF1ZXN0cyBkZXBl bmRlbmNpZXMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtp dGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAgICAgKFBhY2thZ2UuX19pbml0X18pOiBBZGQg c2xvd19pbnN0YWxsIGZsYWcuCisgICAgICAgIChQYWNrYWdlLmFyY2hpdmVzKTogSGFuZGxlIGNh c2Ugd2VyZSBhIGxpYnJhcnkgZG9lcyBub3QgaGF2ZSBhIHRpbnkgdmVyc2lvbi4KKyAgICAgICAg KFBhY2thZ2UuaW5zdGFsbCk6IENhbGwgc2V0dXAucHkgaW5zdGVhZCBvZiBqdXN0IG1vdmluZyB0 aGUgbGlicmFyeSBvdXQgb2YgdGhlIHBhY2thZ2UuCisKIDIwMjAtMDgtMDEgIEJyYWR5IEVpZHNv biAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFNwZWNpYWwgSElEIG1hcHBpbmcgZm9y IHRoZSBHb29nbGUgU3RhZGlhIGNvbnRyb2xsZXIKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRf Xy5weQkocmV2aXNpb24gMjY1MTc4KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtMjgsNyAr MjgsNyBAQCBsb2cgPSBsb2dnaW5nLmdldExvZ2dlcignd2Via2l0Y29yZXB5JykKIGZyb20gd2Vi a2l0Y29yZXB5LnZlcnNpb24gaW1wb3J0IFZlcnNpb24KIGZyb20gd2Via2l0Y29yZXB5LnN0cmlu Z191dGlscyBpbXBvcnQgQnl0ZXNJTywgU3RyaW5nSU8sIFVuaWNvZGVJTywgdW5pY29kZQogCi12 ZXJzaW9uID0gVmVyc2lvbigwLCAwLCA0KQordmVyc2lvbiA9IFZlcnNpb24oMCwgMSwgMCkKIAog ZnJvbSB3ZWJraXRjb3JlcHkuYXV0b2luc3RhbGwgaW1wb3J0IFBhY2thZ2UsIEF1dG9JbnN0YWxs CiBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApOgpAQCAtMzcsNCArMzcsOCBAQCBlbHNlOgog ICAgIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21vY2snLCBWZXJzaW9uKDMsIDAsIDUp KSkKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnY2VydGlmaScsIFZlcnNpb24oMjAy MCwgNiwgMjApKSkKK0F1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2NoYXJkZXQnLCBWZXJz aW9uKDMsIDAsIDQpKSkKK0F1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Z1bmNzaWdzJywg VmVyc2lvbigxLCAwLCAyKSkpCitBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdpZG5hJywg VmVyc2lvbigyLCAxMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncmVxdWVzdHMn LCBWZXJzaW9uKDIsIDI0KSkpCitBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCd1cmxsaWIz JywgVmVyc2lvbigxLCAyNSwgMTApKSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFs bC5weQkocmV2aXNpb24gMjY1MTc4KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQkod29ya2luZyBjb3B5KQpAQCAtMjQs NiArMjQsNyBAQCBpbXBvcnQganNvbgogaW1wb3J0IG1hdGgKIGltcG9ydCBvcwogaW1wb3J0IHJl CitpbXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHNodXRpbAogaW1wb3J0IHN5cwogaW1wb3J0IHRh cmZpbGUKQEAgLTc4LDExICs3OSwxMiBAQCBjbGFzcyBQYWNrYWdlKG9iamVjdCk6CiAgICAgICAg ICAgICBmaW5hbGx5OgogICAgICAgICAgICAgICAgIGZpbGUuY2xvc2UoKQogCi0gICAgZGVmIF9f aW5pdF9fKHNlbGYsIG5hbWUsIHZlcnNpb249Tm9uZSwgcHlwaV9uYW1lPU5vbmUpOgorICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBuYW1lLCB2ZXJzaW9uPU5vbmUsIHB5cGlfbmFtZT1Ob25lLCBzbG93 X2luc3RhbGw9RmFsc2UpOgogICAgICAgICBzZWxmLm5hbWUgPSBuYW1lCiAgICAgICAgIHNlbGYu dmVyc2lvbiA9IHZlcnNpb24KICAgICAgICAgc2VsZi5fYXJjaGl2ZXMgPSBbXQogICAgICAgICBz ZWxmLnB5cGlfbmFtZSA9IHB5cGlfbmFtZSBvciBzZWxmLm5hbWUKKyAgICAgICAgc2VsZi5zbG93 X2luc3RhbGwgPSBzbG93X2luc3RhbGwKIAogICAgIEBwcm9wZXJ0eQogICAgIGRlZiBsb2NhdGlv bihzZWxmKToKQEAgLTEyMiw3ICsxMjQsNyBAQCBjbGFzcyBQYWNrYWdlKG9iamVjdCk6CiAgICAg ICAgICAgICAgICAgaWYgcmVxdWlyZXMgYW5kIG5vdCBBdXRvSW5zdGFsbC52ZXJzaW9uLm1hdGNo ZXMocmVxdWlyZXMpOgogICAgICAgICAgICAgICAgICAgICBjb250aW51ZQogCi0gICAgICAgICAg ICAgICAgdmVyc2lvbl9jYW5kaWRhdGUgPSByZS5zZWFyY2gocidcZCtcLlxkK1wuXGQrJywgZWxl bWVudC5jaGlsZE5vZGVzWzBdLmRhdGEpCisgICAgICAgICAgICAgICAgdmVyc2lvbl9jYW5kaWRh dGUgPSByZS5zZWFyY2gocidcZCtcLlxkKyhcLlxkKyk/JywgZWxlbWVudC5jaGlsZE5vZGVzWzBd LmRhdGEpCiAgICAgICAgICAgICAgICAgaWYgbm90IHZlcnNpb25fY2FuZGlkYXRlOgogICAgICAg ICAgICAgICAgICAgICBjb250aW51ZQogICAgICAgICAgICAgICAgIHZlcnNpb24gPSBWZXJzaW9u KCp2ZXJzaW9uX2NhbmRpZGF0ZS5ncm91cCgpLnNwbGl0KCcuJykpCkBAIC0xNzUsNyArMTc3LDU4 IEBAIGNsYXNzIFBhY2thZ2Uob2JqZWN0KToKICAgICAgICAgICAgIGFyY2hpdmUudW5wYWNrKHRl bXBfbG9jYXRpb24pCiAKICAgICAgICAgICAgIHNodXRpbC5ybXRyZWUoc2VsZi5sb2NhdGlvbiwg aWdub3JlX2Vycm9ycz1UcnVlKQotICAgICAgICAgICAgc2h1dGlsLm1vdmUob3MucGF0aC5qb2lu KHRlbXBfbG9jYXRpb24sIHN0cihhcmNoaXZlKSwgc2VsZi5uYW1lKSwgc2VsZi5sb2NhdGlvbikK KworICAgICAgICAgICAgZm9yIGNhbmRpZGF0ZSBpbiBbCisgICAgICAgICAgICAgICAgb3MucGF0 aC5qb2luKHRlbXBfbG9jYXRpb24sIHN0cihhcmNoaXZlKSksCisgICAgICAgICAgICAgICAgb3Mu cGF0aC5qb2luKHRlbXBfbG9jYXRpb24sICd7fS17fS57fScuZm9ybWF0KGFyY2hpdmUubmFtZSwg YXJjaGl2ZS52ZXJzaW9uLm1ham9yLCBhcmNoaXZlLnZlcnNpb24ubWlub3IpKSwKKyAgICAgICAg ICAgIF06CisgICAgICAgICAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9p bihjYW5kaWRhdGUsICdzZXR1cC5weScpKToKKyAgICAgICAgICAgICAgICAgICAgY29udGludWUK KworICAgICAgICAgICAgICAgIGxvZy53YXJuaW5nKCdJbnN0YWxsaW5nIHt9Li4uJy5mb3JtYXQo YXJjaGl2ZSkpCisKKyAgICAgICAgICAgICAgICBpZiBzZWxmLnNsb3dfaW5zdGFsbDoKKyAgICAg ICAgICAgICAgICAgICAgbG9nLndhcm5pbmcoJ3t9IGlzIGtub3duIHRvIGJlIHNsb3cgdG8gaW5z dGFsbCcuZm9ybWF0KGFyY2hpdmUpKQorCisgICAgICAgICAgICAgICAgaW5zdGFsbF9sb2NhdGlv biA9IG9zLnBhdGguZGlybmFtZShzZWxmLmxvY2F0aW9uKQorICAgICAgICAgICAgICAgIHdpdGgg b3Blbihvcy5kZXZudWxsLCAndycpIGFzIGRldm51bGw6CisgICAgICAgICAgICAgICAgICAgIHN1 YnByb2Nlc3MuY2hlY2tfb3V0cHV0KAorICAgICAgICAgICAgICAgICAgICAgICAgWworICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHN5cy5leGVjdXRhYmxlLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG9zLnBhdGguam9pbihjYW5kaWRhdGUsICdzZXR1cC5weScpLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICdpbnN0YWxsJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnLS1ob21lPXt9Jy5mb3JtYXQoaW5zdGFsbF9sb2NhdGlvbiksCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJy0tcm9vdD0vJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1z aW5nbGUtdmVyc2lvbi1leHRlcm5hbGx5LW1hbmFnZWQnLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICctLWluc3RhbGwtbGliPXt9Jy5mb3JtYXQoaW5zdGFsbF9sb2NhdGlvbiksCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJy0taW5zdGFsbC1zY3JpcHRzPXt9Jy5mb3JtYXQoaW5z dGFsbF9sb2NhdGlvbiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy0taW5zdGFsbC1k YXRhPXt9Jy5mb3JtYXQob3MucGF0aC5qb2luKGluc3RhbGxfbG9jYXRpb24sICdkYXRhJykpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLWluc3RhbGwtaGVhZGVycz17fScuZm9ybWF0 KG9zLnBhdGguam9pbihpbnN0YWxsX2xvY2F0aW9uLCAnaGVhZGVycycpKSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAjIERvIG5vdCBhdXRvbWF0aWNhbGx5IGluc3RhbGwgcGFja2FnZSBk ZXBlbmRlbmNpZXMsIGZvcmNlIHNjcmlwdHMgdG8gYmUgZXhwbGljaXQKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAjIEV2ZW4gd2l0aG91dCB0aGlzIGZsYWcsIHNldHVwLnB5IGlzIG5vdCBj b25zaXN0ZW50IGFib3V0IGluc3RhbGxpbmcgZGVwZW5kZW5jaWVzLgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICctLW9sZC1hbmQtdW5tYW5hZ2VhYmxlJywKKyAgICAgICAgICAgICAgICAg ICAgICAgIF0sCisgICAgICAgICAgICAgICAgICAgICAgICBjd2Q9Y2FuZGlkYXRlLAorICAgICAg ICAgICAgICAgICAgICAgICAgZW52PWRpY3QoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg UEFUSD1vcy5lbnZpcm9uLmdldCgnUEFUSCcsICcnKSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICBQQVRIRVhUPW9zLmVudmlyb24uZ2V0KCdQQVRIRVhUJywgJycpLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFBZVEhPTlBBVEg9aW5zdGFsbF9sb2NhdGlvbiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICksCisgICAgICAgICAgICAgICAgICAgICAgICBzdGRlcnI9ZGV2bnVsbCwK KyAgICAgICAgICAgICAgICAgICAgKQorCisgICAgICAgICAgICAgICAgZWdnX2luZm8gPSBvcy5w YXRoLmpvaW4oCisgICAgICAgICAgICAgICAgICAgIGluc3RhbGxfbG9jYXRpb24sCisgICAgICAg ICAgICAgICAgICAgICd7fS1weXt9Lnt9LmVnZy1pbmZvJy5mb3JtYXQoCisgICAgICAgICAgICAg ICAgICAgICAgICBvcy5wYXRoLmJhc2VuYW1lKGNhbmRpZGF0ZSksCisgICAgICAgICAgICAgICAg ICAgICAgICBBdXRvSW5zdGFsbC52ZXJzaW9uLm1ham9yLCBBdXRvSW5zdGFsbC52ZXJzaW9uLm1p bm9yLAorICAgICAgICAgICAgICAgICAgICApLAorICAgICAgICAgICAgICAgICkKKyAgICAgICAg ICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhlZ2dfaW5mbyk6CisgICAgICAgICAgICAgICAgICAg IHNodXRpbC5ybXRyZWUoZWdnX2luZm8sIGlnbm9yZV9lcnJvcnM9VHJ1ZSkKKyAgICAgICAgICAg ICAgICBicmVhaworICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICByYWlzZSBPU0Vy cm9yKCdDYW5ub3QgaW5zdGFsbCB7fSwgY291bGQgbm90IGZpbmQgc2V0dXAucHknLmZvcm1hdChz ZWxmLm5hbWUpKQogCiAgICAgICAgICAgICBzZWxmLmRvX3Bvc3RfaW5zdGFsbCh0ZW1wX2xvY2F0 aW9uKQogCg== 405831 2020-08-03 08:28:13 -0700 2020-08-03 09:15:54 -0700 Patch bug-215067-20200803082813.patch text/plain 7171 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTE5NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIwLTA4LTAzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBVc2Ugc2V0dXAucHkgZm9yIHRoZSBhdXRvaW5z dGFsbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTUwNjcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDMyNzE5PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weTogQWRkIGFsbCByZXF1ZXN0cyBkZXBl bmRlbmNpZXMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtp dGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAgICAgKFBhY2thZ2UuX19pbml0X18pOiBBZGQg c2xvd19pbnN0YWxsIGZsYWcuCisgICAgICAgIChQYWNrYWdlLmFyY2hpdmVzKTogSGFuZGxlIGNh c2Ugd2VyZSBhIGxpYnJhcnkgZG9lcyBub3QgaGF2ZSBhIHRpbnkgdmVyc2lvbi4KKyAgICAgICAg KFBhY2thZ2UuaW5zdGFsbCk6IENhbGwgc2V0dXAucHkgaW5zdGVhZCBvZiBqdXN0IG1vdmluZyB0 aGUgbGlicmFyeSBvdXQgb2YgdGhlIHBhY2thZ2UuCisKIDIwMjAtMDgtMDMgIFBoaWxpcHBlIE5v cm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXUEVdW0dUS10gcnVuLW1p bmlicm93c2VyIG5vIGxvbmdlciBhc3N1bWVzIHJlbGVhc2UgY29uZmlndXJhdGlvbiBieSBkZWZh dWx0CkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29y ZXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI2NTE5NSkKKysr IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0 X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTI4LDcgKzI4LDcgQEAgbG9nID0gbG9nZ2luZy5nZXRM b2dnZXIoJ3dlYmtpdGNvcmVweScpCiBmcm9tIHdlYmtpdGNvcmVweS52ZXJzaW9uIGltcG9ydCBW ZXJzaW9uCiBmcm9tIHdlYmtpdGNvcmVweS5zdHJpbmdfdXRpbHMgaW1wb3J0IEJ5dGVzSU8sIFN0 cmluZ0lPLCBVbmljb2RlSU8sIHVuaWNvZGUKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwgMCwgNCkK K3ZlcnNpb24gPSBWZXJzaW9uKDAsIDEsIDApCiAKIGZyb20gd2Via2l0Y29yZXB5LmF1dG9pbnN0 YWxsIGltcG9ydCBQYWNrYWdlLCBBdXRvSW5zdGFsbAogaWYgc3lzLnZlcnNpb25faW5mbyA+ICgz LCAwKToKQEAgLTM3LDQgKzM3LDggQEAgZWxzZToKICAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQ YWNrYWdlKCdtb2NrJywgVmVyc2lvbigzLCAwLCA1KSkpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVy KFBhY2thZ2UoJ2NlcnRpZmknLCBWZXJzaW9uKDIwMjAsIDYsIDIwKSkpCitBdXRvSW5zdGFsbC5y ZWdpc3RlcihQYWNrYWdlKCdjaGFyZGV0JywgVmVyc2lvbigzLCAwLCA0KSkpCitBdXRvSW5zdGFs bC5yZWdpc3RlcihQYWNrYWdlKCdmdW5jc2lncycsIFZlcnNpb24oMSwgMCwgMikpKQorQXV0b0lu c3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnaWRuYScsIFZlcnNpb24oMiwgMTApKSkKIEF1dG9JbnN0 YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3JlcXVlc3RzJywgVmVyc2lvbigyLCAyNCkpKQorQXV0b0lu c3RhbGwucmVnaXN0ZXIoUGFja2FnZSgndXJsbGliMycsIFZlcnNpb24oMSwgMjUsIDEwKSkpCklu ZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1 dG9pbnN0YWxsLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkJKHJldmlzaW9uIDI2NTE5NSkKKysr IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2lu c3RhbGwucHkJKHdvcmtpbmcgY29weSkKQEAgLTI0LDYgKzI0LDcgQEAgaW1wb3J0IGpzb24KIGlt cG9ydCBtYXRoCiBpbXBvcnQgb3MKIGltcG9ydCByZQoraW1wb3J0IHN1YnByb2Nlc3MKIGltcG9y dCBzaHV0aWwKIGltcG9ydCBzeXMKIGltcG9ydCB0YXJmaWxlCkBAIC03OCwxMSArNzksMTIgQEAg Y2xhc3MgUGFja2FnZShvYmplY3QpOgogICAgICAgICAgICAgZmluYWxseToKICAgICAgICAgICAg ICAgICBmaWxlLmNsb3NlKCkKIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCB2ZXJzaW9u PU5vbmUsIHB5cGlfbmFtZT1Ob25lKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgdmVy c2lvbj1Ob25lLCBweXBpX25hbWU9Tm9uZSwgc2xvd19pbnN0YWxsPUZhbHNlKToKICAgICAgICAg c2VsZi5uYW1lID0gbmFtZQogICAgICAgICBzZWxmLnZlcnNpb24gPSB2ZXJzaW9uCiAgICAgICAg IHNlbGYuX2FyY2hpdmVzID0gW10KICAgICAgICAgc2VsZi5weXBpX25hbWUgPSBweXBpX25hbWUg b3Igc2VsZi5uYW1lCisgICAgICAgIHNlbGYuc2xvd19pbnN0YWxsID0gc2xvd19pbnN0YWxsCiAK ICAgICBAcHJvcGVydHkKICAgICBkZWYgbG9jYXRpb24oc2VsZik6CkBAIC0xMjIsNyArMTI0LDcg QEAgY2xhc3MgUGFja2FnZShvYmplY3QpOgogICAgICAgICAgICAgICAgIGlmIHJlcXVpcmVzIGFu ZCBub3QgQXV0b0luc3RhbGwudmVyc2lvbi5tYXRjaGVzKHJlcXVpcmVzKToKICAgICAgICAgICAg ICAgICAgICAgY29udGludWUKIAotICAgICAgICAgICAgICAgIHZlcnNpb25fY2FuZGlkYXRlID0g cmUuc2VhcmNoKHInXGQrXC5cZCtcLlxkKycsIGVsZW1lbnQuY2hpbGROb2Rlc1swXS5kYXRhKQor ICAgICAgICAgICAgICAgIHZlcnNpb25fY2FuZGlkYXRlID0gcmUuc2VhcmNoKHInXGQrXC5cZCso XC5cZCspPycsIGVsZW1lbnQuY2hpbGROb2Rlc1swXS5kYXRhKQogICAgICAgICAgICAgICAgIGlm IG5vdCB2ZXJzaW9uX2NhbmRpZGF0ZToKICAgICAgICAgICAgICAgICAgICAgY29udGludWUKICAg ICAgICAgICAgICAgICB2ZXJzaW9uID0gVmVyc2lvbigqdmVyc2lvbl9jYW5kaWRhdGUuZ3JvdXAo KS5zcGxpdCgnLicpKQpAQCAtMTY4LDIxICsxNzAsNzQgQEAgY2xhc3MgUGFja2FnZShvYmplY3Qp OgogICAgICAgICBhcmNoaXZlID0gc2VsZi5hcmNoaXZlcygpWy0xXQogCiAgICAgICAgIHRyeToK KyAgICAgICAgICAgIGluc3RhbGxfbG9jYXRpb24gPSBvcy5wYXRoLmRpcm5hbWUoc2VsZi5sb2Nh dGlvbikKKyAgICAgICAgICAgIHNodXRpbC5ybXRyZWUoc2VsZi5sb2NhdGlvbiwgaWdub3JlX2Vy cm9ycz1UcnVlKQorICAgICAgICAgICAgYWxyZWFkeV9vd25lZCA9IHNldChvcy5saXN0ZGlyKGlu c3RhbGxfbG9jYXRpb24pKQorCiAgICAgICAgICAgICBsb2cud2FybmluZygnSW5zdGFsbGluZyB7 fS4uLicuZm9ybWF0KGFyY2hpdmUpKQogICAgICAgICAgICAgYXJjaGl2ZS5kb3dubG9hZCgpCiAK ICAgICAgICAgICAgIHRlbXBfbG9jYXRpb24gPSAne30udG1wJy5mb3JtYXQoc2VsZi5sb2NhdGlv bikKICAgICAgICAgICAgIGFyY2hpdmUudW5wYWNrKHRlbXBfbG9jYXRpb24pCiAKLSAgICAgICAg ICAgIHNodXRpbC5ybXRyZWUoc2VsZi5sb2NhdGlvbiwgaWdub3JlX2Vycm9ycz1UcnVlKQotICAg ICAgICAgICAgc2h1dGlsLm1vdmUob3MucGF0aC5qb2luKHRlbXBfbG9jYXRpb24sIHN0cihhcmNo aXZlKSwgc2VsZi5uYW1lKSwgc2VsZi5sb2NhdGlvbikKKyAgICAgICAgICAgIGZvciBjYW5kaWRh dGUgaW4gWworICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbih0ZW1wX2xvY2F0aW9uLCBzdHIo YXJjaGl2ZSkpLAorICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbih0ZW1wX2xvY2F0aW9uLCAn e30te30ue30nLmZvcm1hdChhcmNoaXZlLm5hbWUsIGFyY2hpdmUudmVyc2lvbi5tYWpvciwgYXJj aGl2ZS52ZXJzaW9uLm1pbm9yKSksCisgICAgICAgICAgICBdOgorICAgICAgICAgICAgICAgIGlm IG5vdCBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oY2FuZGlkYXRlLCAnc2V0dXAucHknKSk6 CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCisKKyAgICAgICAgICAgICAgICBsb2cud2Fy bmluZygnSW5zdGFsbGluZyB7fS4uLicuZm9ybWF0KGFyY2hpdmUpKQorCisgICAgICAgICAgICAg ICAgaWYgc2VsZi5zbG93X2luc3RhbGw6CisgICAgICAgICAgICAgICAgICAgIGxvZy53YXJuaW5n KCd7fSBpcyBrbm93biB0byBiZSBzbG93IHRvIGluc3RhbGwnLmZvcm1hdChhcmNoaXZlKSkKKwor ICAgICAgICAgICAgICAgIHdpdGggb3Blbihvcy5kZXZudWxsLCAndycpIGFzIGRldm51bGw6Cisg ICAgICAgICAgICAgICAgICAgIHN1YnByb2Nlc3MuY2hlY2tfY2FsbCgKKyAgICAgICAgICAgICAg ICAgICAgICAgIFsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBzeXMuZXhlY3V0YWJsZSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4oY2FuZGlkYXRlLCAnc2V0 dXAucHknKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnaW5zdGFsbCcsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJy0taG9tZT17fScuZm9ybWF0KGluc3RhbGxfbG9jYXRpb24p LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLXJvb3Q9LycsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJy0tc2luZ2xlLXZlcnNpb24tZXh0ZXJuYWxseS1tYW5hZ2VkJywKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1pbnN0YWxsLWxpYj17fScuZm9ybWF0KGluc3Rh bGxfbG9jYXRpb24pLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLWluc3RhbGwtc2Ny aXB0cz17fScuZm9ybWF0KGluc3RhbGxfbG9jYXRpb24pLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICctLWluc3RhbGwtZGF0YT17fScuZm9ybWF0KG9zLnBhdGguam9pbihpbnN0YWxsX2xv Y2F0aW9uLCAnZGF0YScpKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1pbnN0YWxs LWhlYWRlcnM9e30nLmZvcm1hdChvcy5wYXRoLmpvaW4oaW5zdGFsbF9sb2NhdGlvbiwgJ2hlYWRl cnMnKSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBEbyBub3QgYXV0b21hdGljYWxs eSBpbnN0YWxsIHBhY2thZ2UgZGVwZW5kZW5jaWVzLCBmb3JjZSBzY3JpcHRzIHRvIGJlIGV4cGxp Y2l0CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBFdmVuIHdpdGhvdXQgdGhpcyBmbGFn LCBzZXR1cC5weSBpcyBub3QgY29uc2lzdGVudCBhYm91dCBpbnN0YWxsaW5nIGRlcGVuZGVuY2ll cy4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1vbGQtYW5kLXVubWFuYWdlYWJsZScs CisgICAgICAgICAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgICAgICAgICAgY3dk PWNhbmRpZGF0ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGVudj1kaWN0KAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFBBVEg9b3MuZW52aXJvbi5nZXQoJ1BBVEgnLCAnJyksCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgUEFUSEVYVD1vcy5lbnZpcm9uLmdldCgnUEFUSEVYVCcs ICcnKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBQWVRIT05QQVRIPWluc3RhbGxfbG9j YXRpb24sCisgICAgICAgICAgICAgICAgICAgICAgICApLAorICAgICAgICAgICAgICAgICAgICAg ICAgIyBGSVhNRTogU3VwcHJlc3Mgc3RkZXJyIGFuZCBzdGRvdXQgbG9nZ2luZyBhZnRlciBkZWJ1 Z2dpbmcKKyAgICAgICAgICAgICAgICAgICAgKQorCisgICAgICAgICAgICAgICAgZWdnX2luZm8g PSBvcy5wYXRoLmpvaW4oCisgICAgICAgICAgICAgICAgICAgIGluc3RhbGxfbG9jYXRpb24sCisg ICAgICAgICAgICAgICAgICAgICd7fS1weXt9Lnt9LmVnZy1pbmZvJy5mb3JtYXQoCisgICAgICAg ICAgICAgICAgICAgICAgICBvcy5wYXRoLmJhc2VuYW1lKGNhbmRpZGF0ZSksCisgICAgICAgICAg ICAgICAgICAgICAgICBBdXRvSW5zdGFsbC52ZXJzaW9uLm1ham9yLCBBdXRvSW5zdGFsbC52ZXJz aW9uLm1pbm9yLAorICAgICAgICAgICAgICAgICAgICApLAorICAgICAgICAgICAgICAgICkKKyAg ICAgICAgICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhlZ2dfaW5mbyk6CisgICAgICAgICAgICAg ICAgICAgIHNodXRpbC5ybXRyZWUoZWdnX2luZm8sIGlnbm9yZV9lcnJvcnM9VHJ1ZSkKKyAgICAg ICAgICAgICAgICBicmVhaworICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICByYWlz ZSBPU0Vycm9yKCdDYW5ub3QgaW5zdGFsbCB7fSwgY291bGQgbm90IGZpbmQgc2V0dXAucHknLmZv cm1hdChzZWxmLm5hbWUpKQogCiAgICAgICAgICAgICBzZWxmLmRvX3Bvc3RfaW5zdGFsbCh0ZW1w X2xvY2F0aW9uKQogCiAgICAgICAgICAgICBvcy5yZW1vdmUoYXJjaGl2ZS5wYXRoKQogICAgICAg ICAgICAgc2h1dGlsLnJtdHJlZSh0ZW1wX2xvY2F0aW9uLCBpZ25vcmVfZXJyb3JzPVRydWUpCiAK LSAgICAgICAgICAgIEF1dG9JbnN0YWxsLnVzZXJzcGFjZV9zaG91bGRfb3duKHNlbGYubG9jYXRp b24pCisgICAgICAgICAgICBmb3IgaW5zdGFsbGVkIGluIHNldChvcy5saXN0ZGlyKGluc3RhbGxf bG9jYXRpb24pKSAtIGFscmVhZHlfb3duZWQ6CisgICAgICAgICAgICAgICAgQXV0b0luc3RhbGwu dXNlcnNwYWNlX3Nob3VsZF9vd24ob3MucGF0aC5qb2luKGluc3RhbGxfbG9jYXRpb24sIGluc3Rh bGxlZCkpCiAKICAgICAgICAgICAgIEF1dG9JbnN0YWxsLm1hbmlmZXN0W3NlbGYubmFtZV0gPSB7 CiAgICAgICAgICAgICAgICAgJ2luZGV4JzogQXV0b0luc3RhbGwuaW5kZXgsCg== 405834 2020-08-03 09:15:55 -0700 2020-08-03 09:57:21 -0700 Patch bug-215067-20200803091554.patch text/plain 10668 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTE5NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA4LTAzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBVc2Ugc2V0dXAucHkgZm9yIHRoZSBhdXRvaW5z dGFsbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTUwNjcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDMyNzE5PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weTogQWRkIGFsbCByZXF1ZXN0cyBkZXBl bmRlbmNpZXMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtp dGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAgICAgKFBhY2thZ2UuQXJjaGl2ZV9faW5pdF9f KTogQWRkIGV4dGVuc2lvbiwgdGFyLmd6IGJ5IGRlZmF1bHQuCisgICAgICAgIChQYWNrYWdlLkFy Y2hpdmUucGF0aCk6IFN1cHBvcnQgbXVsdGlwbGUgZmlsZSB0eXBlcy4KKyAgICAgICAgKFBhY2th Z2UuQXJjaGl2ZS51bnBhY2spOiBTdXBwb3J0IC56aXAgZmlsZXMuCisgICAgICAgIChQYWNrYWdl Ll9faW5pdF9fKTogQWRkIHNsb3dfaW5zdGFsbCBmbGFnLgorICAgICAgICAoUGFja2FnZS5hcmNo aXZlcyk6IEhhbmRsZSBjYXNlIHdlcmUgYSBsaWJyYXJ5IGRvZXMgbm90IGhhdmUgYSB0aW55IHZl cnNpb24uCisgICAgICAgIChQYWNrYWdlLmluc3RhbGwpOiBDYWxsIHNldHVwLnB5IGluc3RlYWQg b2YganVzdCBtb3ZpbmcgdGhlIGxpYnJhcnkgb3V0IG9mIHRoZSBwYWNrYWdlLgorCiAyMDIwLTA4 LTAzICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBb V1BFXVtHVEtdIHJ1bi1taW5pYnJvd3NlciBubyBsb25nZXIgYXNzdW1lcyByZWxlYXNlIGNvbmZp Z3VyYXRpb24gYnkgZGVmYXVsdApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CShyZXZp c2lvbiAyNjUxOTUpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Vi a2l0Y29yZXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOCwxMyArMjgsMTkgQEAg bG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoJ3dlYmtpdGNvcmVweScpCiBmcm9tIHdlYmtpdGNvcmVw eS52ZXJzaW9uIGltcG9ydCBWZXJzaW9uCiBmcm9tIHdlYmtpdGNvcmVweS5zdHJpbmdfdXRpbHMg aW1wb3J0IEJ5dGVzSU8sIFN0cmluZ0lPLCBVbmljb2RlSU8sIHVuaWNvZGUKIAotdmVyc2lvbiA9 IFZlcnNpb24oMCwgMCwgNCkKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDEsIDApCiAKIGZyb20gd2Vi a2l0Y29yZXB5LmF1dG9pbnN0YWxsIGltcG9ydCBQYWNrYWdlLCBBdXRvSW5zdGFsbAogaWYgc3lz LnZlcnNpb25faW5mbyA+ICgzLCAwKToKICAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdl KCdtb2NrJywgVmVyc2lvbig0KSkpCisgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgn c2V0dXB0b29scycsIFZlcnNpb24oNDksIDIsIDEpKSkKIGVsc2U6CiAgICAgQXV0b0luc3RhbGwu cmVnaXN0ZXIoUGFja2FnZSgnbW9jaycsIFZlcnNpb24oMywgMCwgNSkpKQorICAgIEF1dG9JbnN0 YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3NldHVwdG9vbHMnLCBWZXJzaW9uKDQ0LCAxLCAxKSkpCiAK IEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2NlcnRpZmknLCBWZXJzaW9uKDIwMjAsIDYs IDIwKSkpCitBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdjaGFyZGV0JywgVmVyc2lvbigz LCAwLCA0KSkpCitBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdmdW5jc2lncycsIFZlcnNp b24oMSwgMCwgMikpKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnaWRuYScsIFZlcnNp b24oMiwgMTApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3JlcXVlc3RzJywgVmVy c2lvbigyLCAyNCkpKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgndXJsbGliMycsIFZl cnNpb24oMSwgMjUsIDEwKSkpCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRj b3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkJ KHJldmlzaW9uIDI2NTE5NSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVw eS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkJKHdvcmtpbmcgY29weSkKQEAgLTI0LDkgKzI0 LDExIEBAIGltcG9ydCBqc29uCiBpbXBvcnQgbWF0aAogaW1wb3J0IG9zCiBpbXBvcnQgcmUKK2lt cG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc2h1dGlsCiBpbXBvcnQgc3lzCiBpbXBvcnQgdGFyZmls ZQoraW1wb3J0IHppcGZpbGUKIAogZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IGxvZwogZnJvbSB3 ZWJraXRjb3JlcHkudmVyc2lvbiBpbXBvcnQgVmVyc2lvbgpAQCAtNDAsMTAgKzQyLDExIEBAIGVs c2U6CiAKIGNsYXNzIFBhY2thZ2Uob2JqZWN0KToKICAgICBjbGFzcyBBcmNoaXZlKG9iamVjdCk6 Ci0gICAgICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBsaW5rLCB2ZXJzaW9uKToKKyAgICAg ICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGxpbmssIHZlcnNpb24sIGV4dGVuc2lvbj1Ob25l KToKICAgICAgICAgICAgIHNlbGYubmFtZSA9IG5hbWUKICAgICAgICAgICAgIHNlbGYubGluayA9 IGxpbmsKICAgICAgICAgICAgIHNlbGYudmVyc2lvbiA9IHZlcnNpb24KKyAgICAgICAgICAgIHNl bGYuZXh0ZW5zaW9uID0gZXh0ZW5zaW9uIG9yICd0YXIuZ3onCiAKICAgICAgICAgZGVmIF9fcmVw cl9fKHNlbGYpOgogICAgICAgICAgICAgcmV0dXJuICd7fS17fS57fS57fScuZm9ybWF0KHNlbGYu bmFtZSwgc2VsZi52ZXJzaW9uLm1ham9yLCBzZWxmLnZlcnNpb24ubWlub3IsIHNlbGYudmVyc2lv bi50aW55KQpAQCAtNTIsNyArNTUsNyBAQCBjbGFzcyBQYWNrYWdlKG9iamVjdCk6CiAgICAgICAg IGRlZiBwYXRoKHNlbGYpOgogICAgICAgICAgICAgaWYgbm90IEF1dG9JbnN0YWxsLmRpcmVjdG9y eToKICAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdObyBBdXRvSW5zdGFsbCBkaXJl Y3RvcnksIGFyY2hpdmUgY2Fubm90IHJlc29sdmUgbG9jYWwgcGF0aCcpCi0gICAgICAgICAgICBy ZXR1cm4gJ3t9L3t9LXt9LnRhci5neicuZm9ybWF0KEF1dG9JbnN0YWxsLmRpcmVjdG9yeSwgc2Vs Zi5uYW1lLCBzZWxmLnZlcnNpb24pCisgICAgICAgICAgICByZXR1cm4gJ3t9L3t9LXt9Lnt9Jy5m b3JtYXQoQXV0b0luc3RhbGwuZGlyZWN0b3J5LCBzZWxmLm5hbWUsIHNlbGYudmVyc2lvbiwgc2Vs Zi5leHRlbnNpb24pCiAKICAgICAgICAgZGVmIGRvd25sb2FkKHNlbGYpOgogICAgICAgICAgICAg cmVzcG9uc2UgPSBBdXRvSW5zdGFsbC5fcmVxdWVzdChzZWxmLmxpbmspCkBAIC03MiwxNyArNzUs MjUgQEAgY2xhc3MgUGFja2FnZShvYmplY3QpOgogICAgICAgICAgICAgaWYgbm90IG9zLnBhdGgu aXNmaWxlKHNlbGYucGF0aCk6CiAgICAgICAgICAgICAgICAgcmFpc2UgSU9FcnJvcignRmFpbGVk IHRvIGZpbmQgYXJjaGl2ZSBhdCB7fScuZm9ybWF0KHNlbGYucGF0aCkpCiAgICAgICAgICAgICBz aHV0aWwucm10cmVlKHRhcmdldCwgaWdub3JlX2Vycm9ycz1UcnVlKQotICAgICAgICAgICAgZmls ZSA9IHRhcmZpbGUub3BlbihzZWxmLnBhdGgpCi0gICAgICAgICAgICB0cnk6Ci0gICAgICAgICAg ICAgICAgZmlsZS5leHRyYWN0YWxsKHRhcmdldCkKLSAgICAgICAgICAgIGZpbmFsbHk6Ci0gICAg ICAgICAgICAgICAgZmlsZS5jbG9zZSgpCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwg dmVyc2lvbj1Ob25lLCBweXBpX25hbWU9Tm9uZSk6CisgICAgICAgICAgICBpZiBzZWxmLmV4dGVu c2lvbiA9PSAndGFyLmd6JzoKKyAgICAgICAgICAgICAgICBmaWxlID0gdGFyZmlsZS5vcGVuKHNl bGYucGF0aCkKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgICAgIGZpbGUu ZXh0cmFjdGFsbCh0YXJnZXQpCisgICAgICAgICAgICAgICAgZmluYWxseToKKyAgICAgICAgICAg ICAgICAgICAgZmlsZS5jbG9zZSgpCisgICAgICAgICAgICBlbGlmIHNlbGYuZXh0ZW5zaW9uID09 ICd6aXAnOgorICAgICAgICAgICAgICAgIHdpdGggemlwZmlsZS5aaXBGaWxlKHNlbGYucGF0aCwg J3InKSBhcyBmaWxlOgorICAgICAgICAgICAgICAgICAgICBmaWxlLmV4dHJhY3RhbGwodGFyZ2V0 KQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICByYWlzZSBPU0Vycm9yKCd7fSBo YXMgYW4gIHVucmVjb2duaXplZCBwYWNrYWdlIGZvcm1hdCcuZm9ybWF0KHNlbGYucGF0aCkpCisK KyAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgdmVyc2lvbj1Ob25lLCBweXBpX25hbWU9Tm9u ZSwgc2xvd19pbnN0YWxsPUZhbHNlKToKICAgICAgICAgc2VsZi5uYW1lID0gbmFtZQogICAgICAg ICBzZWxmLnZlcnNpb24gPSB2ZXJzaW9uCiAgICAgICAgIHNlbGYuX2FyY2hpdmVzID0gW10KICAg ICAgICAgc2VsZi5weXBpX25hbWUgPSBweXBpX25hbWUgb3Igc2VsZi5uYW1lCisgICAgICAgIHNl bGYuc2xvd19pbnN0YWxsID0gc2xvd19pbnN0YWxsCiAKICAgICBAcHJvcGVydHkKICAgICBkZWYg bG9jYXRpb24oc2VsZik6CkBAIC0xMTUsMTQgKzEyNiwyMCBAQCBjbGFzcyBQYWNrYWdlKG9iamVj dCk6CiAgICAgICAgICAgICAgICAgICAgIGF0dHJpYnV0ZXNbZWxlbWVudC5hdHRyaWJ1dGVzLml0 ZW0oaW5kZXgpLm5hbWVdID0gZWxlbWVudC5hdHRyaWJ1dGVzLml0ZW0oaW5kZXgpLnZhbHVlCiAg ICAgICAgICAgICAgICAgaWYgbm90IGF0dHJpYnV0ZXMuZ2V0KCdocmVmJywgTm9uZSk6CiAgICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICAgICAgaWYgbm90IGVsZW1lbnQu Y2hpbGROb2Rlc1swXS5kYXRhLmVuZHN3aXRoKCd0YXIuZ3onKToKKworICAgICAgICAgICAgICAg IGV4dGVuc2lvbiA9IE5vbmUKKyAgICAgICAgICAgICAgICBpZiBlbGVtZW50LmNoaWxkTm9kZXNb MF0uZGF0YS5lbmRzd2l0aCgndGFyLmd6Jyk6CisgICAgICAgICAgICAgICAgICAgIGV4dGVuc2lv biA9ICd0YXIvZ3onCisgICAgICAgICAgICAgICAgZWxpZiBlbGVtZW50LmNoaWxkTm9kZXNbMF0u ZGF0YS5lbmRzd2l0aCgnLnppcCcpOgorICAgICAgICAgICAgICAgICAgICBleHRlbnNpb24gPSAn emlwJworICAgICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVl CiAKICAgICAgICAgICAgICAgICByZXF1aXJlcyA9IGF0dHJpYnV0ZXMuZ2V0KCdkYXRhLXJlcXVp cmVzLXB5dGhvbicpCiAgICAgICAgICAgICAgICAgaWYgcmVxdWlyZXMgYW5kIG5vdCBBdXRvSW5z dGFsbC52ZXJzaW9uLm1hdGNoZXMocmVxdWlyZXMpOgogICAgICAgICAgICAgICAgICAgICBjb250 aW51ZQogCi0gICAgICAgICAgICAgICAgdmVyc2lvbl9jYW5kaWRhdGUgPSByZS5zZWFyY2gocidc ZCtcLlxkK1wuXGQrJywgZWxlbWVudC5jaGlsZE5vZGVzWzBdLmRhdGEpCisgICAgICAgICAgICAg ICAgdmVyc2lvbl9jYW5kaWRhdGUgPSByZS5zZWFyY2gocidcZCtcLlxkKyhcLlxkKyk/JywgZWxl bWVudC5jaGlsZE5vZGVzWzBdLmRhdGEpCiAgICAgICAgICAgICAgICAgaWYgbm90IHZlcnNpb25f Y2FuZGlkYXRlOgogICAgICAgICAgICAgICAgICAgICBjb250aW51ZQogICAgICAgICAgICAgICAg IHZlcnNpb24gPSBWZXJzaW9uKCp2ZXJzaW9uX2NhbmRpZGF0ZS5ncm91cCgpLnNwbGl0KCcuJykp CkBAIC0xNDEsNiArMTU4LDcgQEAgY2xhc3MgUGFja2FnZShvYmplY3QpOgogICAgICAgICAgICAg ICAgICAgICBuYW1lPXNlbGYucHlwaV9uYW1lLAogICAgICAgICAgICAgICAgICAgICBsaW5rPWxp bmssCiAgICAgICAgICAgICAgICAgICAgIHZlcnNpb249dmVyc2lvbiwKKyAgICAgICAgICAgICAg ICAgICAgZXh0ZW5zaW9uPWV4dGVuc2lvbiwKICAgICAgICAgICAgICAgICApKQogCiAgICAgICAg ICAgICBzZWxmLl9hcmNoaXZlcyA9IHNvcnRlZChzZWxmLl9hcmNoaXZlcywga2V5PWxhbWJkYSBh cmNoaXZlOiBhcmNoaXZlLnZlcnNpb24pCkBAIC0xNjMsMjYgKzE4MSw4MyBAQCBjbGFzcyBQYWNr YWdlKG9iamVjdCk6CiAgICAgICAgIGlmIHNlbGYuaXNfY2FjaGVkKCk6CiAgICAgICAgICAgICBy ZXR1cm4KIAorICAgICAgICAjIE1ha2Ugc3VyZSB0aGF0IHNldHVwdG9vbHMgYXJlIGluc3RhbGxl ZCwgc2luY2Ugc2V0dXAucHkgcmVsaWVzIG9uIGl0CisgICAgICAgIGlmIHNlbGYubmFtZSAhPSAn c2V0dXB0b29scyc6CisgICAgICAgICAgICBBdXRvSW5zdGFsbC5pbnN0YWxsKCdzZXR1cHRvb2xz JykKKwogICAgICAgICBpZiBub3Qgc2VsZi5hcmNoaXZlcygpOgogICAgICAgICAgICAgcmFpc2Ug VmFsdWVFcnJvcignTm8gYXJjaGl2ZXMgZm9yIHt9LXt9IGZvdW5kJy5mb3JtYXQoc2VsZi5weXBp X25hbWUsIHNlbGYudmVyc2lvbikpCiAgICAgICAgIGFyY2hpdmUgPSBzZWxmLmFyY2hpdmVzKClb LTFdCiAKICAgICAgICAgdHJ5OgorICAgICAgICAgICAgaW5zdGFsbF9sb2NhdGlvbiA9IG9zLnBh dGguZGlybmFtZShzZWxmLmxvY2F0aW9uKQorICAgICAgICAgICAgc2h1dGlsLnJtdHJlZShzZWxm LmxvY2F0aW9uLCBpZ25vcmVfZXJyb3JzPVRydWUpCisgICAgICAgICAgICBhbHJlYWR5X293bmVk ID0gc2V0KG9zLmxpc3RkaXIoaW5zdGFsbF9sb2NhdGlvbikpCisKICAgICAgICAgICAgIGxvZy53 YXJuaW5nKCdJbnN0YWxsaW5nIHt9Li4uJy5mb3JtYXQoYXJjaGl2ZSkpCiAgICAgICAgICAgICBh cmNoaXZlLmRvd25sb2FkKCkKIAogICAgICAgICAgICAgdGVtcF9sb2NhdGlvbiA9ICd7fS50bXAn LmZvcm1hdChzZWxmLmxvY2F0aW9uKQogICAgICAgICAgICAgYXJjaGl2ZS51bnBhY2sodGVtcF9s b2NhdGlvbikKIAotICAgICAgICAgICAgc2h1dGlsLnJtdHJlZShzZWxmLmxvY2F0aW9uLCBpZ25v cmVfZXJyb3JzPVRydWUpCi0gICAgICAgICAgICBzaHV0aWwubW92ZShvcy5wYXRoLmpvaW4odGVt cF9sb2NhdGlvbiwgc3RyKGFyY2hpdmUpLCBzZWxmLm5hbWUpLCBzZWxmLmxvY2F0aW9uKQorICAg ICAgICAgICAgZm9yIGNhbmRpZGF0ZSBpbiBbCisgICAgICAgICAgICAgICAgb3MucGF0aC5qb2lu KHRlbXBfbG9jYXRpb24sIHN0cihhcmNoaXZlKSksCisgICAgICAgICAgICAgICAgb3MucGF0aC5q b2luKHRlbXBfbG9jYXRpb24sICd7fS17fS57fScuZm9ybWF0KGFyY2hpdmUubmFtZSwgYXJjaGl2 ZS52ZXJzaW9uLm1ham9yLCBhcmNoaXZlLnZlcnNpb24ubWlub3IpKSwKKyAgICAgICAgICAgIF06 CisgICAgICAgICAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihjYW5k aWRhdGUsICdzZXR1cC5weScpKToKKyAgICAgICAgICAgICAgICAgICAgY29udGludWUKKworICAg ICAgICAgICAgICAgIGxvZy53YXJuaW5nKCdJbnN0YWxsaW5nIHt9Li4uJy5mb3JtYXQoYXJjaGl2 ZSkpCisKKyAgICAgICAgICAgICAgICBpZiBzZWxmLnNsb3dfaW5zdGFsbDoKKyAgICAgICAgICAg ICAgICAgICAgbG9nLndhcm5pbmcoJ3t9IGlzIGtub3duIHRvIGJlIHNsb3cgdG8gaW5zdGFsbCcu Zm9ybWF0KGFyY2hpdmUpKQorCisgICAgICAgICAgICAgICAgd2l0aCBvcGVuKG9zLmRldm51bGws ICd3JykgYXMgZGV2bnVsbDoKKyAgICAgICAgICAgICAgICAgICAgc3VicHJvY2Vzcy5jaGVja19j YWxsKAorICAgICAgICAgICAgICAgICAgICAgICAgWworICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHN5cy5leGVjdXRhYmxlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9zLnBhdGgu am9pbihjYW5kaWRhdGUsICdzZXR1cC5weScpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICdpbnN0YWxsJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1ob21lPXt9Jy5mb3Jt YXQoaW5zdGFsbF9sb2NhdGlvbiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy0tcm9v dD0vJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1zaW5nbGUtdmVyc2lvbi1leHRl cm5hbGx5LW1hbmFnZWQnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLWluc3RhbGwt bGliPXt9Jy5mb3JtYXQoaW5zdGFsbF9sb2NhdGlvbiksCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJy0taW5zdGFsbC1zY3JpcHRzPXt9Jy5mb3JtYXQoaW5zdGFsbF9sb2NhdGlvbiksCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJy0taW5zdGFsbC1kYXRhPXt9Jy5mb3JtYXQob3Mu cGF0aC5qb2luKGluc3RhbGxfbG9jYXRpb24sICdkYXRhJykpLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICctLWluc3RhbGwtaGVhZGVycz17fScuZm9ybWF0KG9zLnBhdGguam9pbihpbnN0 YWxsX2xvY2F0aW9uLCAnaGVhZGVycycpKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAj IERvIG5vdCBhdXRvbWF0aWNhbGx5IGluc3RhbGwgcGFja2FnZSBkZXBlbmRlbmNpZXMsIGZvcmNl IHNjcmlwdHMgdG8gYmUgZXhwbGljaXQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIEV2 ZW4gd2l0aG91dCB0aGlzIGZsYWcsIHNldHVwLnB5IGlzIG5vdCBjb25zaXN0ZW50IGFib3V0IGlu c3RhbGxpbmcgZGVwZW5kZW5jaWVzLgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLW9s ZC1hbmQtdW5tYW5hZ2VhYmxlJywKKyAgICAgICAgICAgICAgICAgICAgICAgIF0sCisgICAgICAg ICAgICAgICAgICAgICAgICBjd2Q9Y2FuZGlkYXRlLAorICAgICAgICAgICAgICAgICAgICAgICAg ZW52PWRpY3QoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgUEFUSD1vcy5lbnZpcm9uLmdl dCgnUEFUSCcsICcnKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBQQVRIRVhUPW9zLmVu dmlyb24uZ2V0KCdQQVRIRVhUJywgJycpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBZ VEhPTlBBVEg9aW5zdGFsbF9sb2NhdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICksCisg ICAgICAgICAgICAgICAgICAgICAgICAjIEZJWE1FOiBTdXBwcmVzcyBzdGRlcnIgYW5kIHN0ZG91 dCBsb2dnaW5nIGFmdGVyIGRlYnVnZ2luZworICAgICAgICAgICAgICAgICAgICApCisKKyAgICAg ICAgICAgICAgICBlZ2dfaW5mbyA9IG9zLnBhdGguam9pbigKKyAgICAgICAgICAgICAgICAgICAg aW5zdGFsbF9sb2NhdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgJ3t9LXB5e30ue30uZWdnLWlu Zm8nLmZvcm1hdCgKKyAgICAgICAgICAgICAgICAgICAgICAgIG9zLnBhdGguYmFzZW5hbWUoY2Fu ZGlkYXRlKSwKKyAgICAgICAgICAgICAgICAgICAgICAgIEF1dG9JbnN0YWxsLnZlcnNpb24ubWFq b3IsIEF1dG9JbnN0YWxsLnZlcnNpb24ubWlub3IsCisgICAgICAgICAgICAgICAgICAgICksCisg ICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKGVnZ19p bmZvKToKKyAgICAgICAgICAgICAgICAgICAgc2h1dGlsLnJtdHJlZShlZ2dfaW5mbywgaWdub3Jl X2Vycm9ycz1UcnVlKQorICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgICAgICBlbHNlOgor ICAgICAgICAgICAgICAgIHJhaXNlIE9TRXJyb3IoJ0Nhbm5vdCBpbnN0YWxsIHt9LCBjb3VsZCBu b3QgZmluZCBzZXR1cC5weScuZm9ybWF0KHNlbGYubmFtZSkpCiAKICAgICAgICAgICAgIHNlbGYu ZG9fcG9zdF9pbnN0YWxsKHRlbXBfbG9jYXRpb24pCiAKICAgICAgICAgICAgIG9zLnJlbW92ZShh cmNoaXZlLnBhdGgpCiAgICAgICAgICAgICBzaHV0aWwucm10cmVlKHRlbXBfbG9jYXRpb24sIGln bm9yZV9lcnJvcnM9VHJ1ZSkKIAotICAgICAgICAgICAgQXV0b0luc3RhbGwudXNlcnNwYWNlX3No b3VsZF9vd24oc2VsZi5sb2NhdGlvbikKKyAgICAgICAgICAgIGZvciBpbnN0YWxsZWQgaW4gc2V0 KG9zLmxpc3RkaXIoaW5zdGFsbF9sb2NhdGlvbikpIC0gYWxyZWFkeV9vd25lZDoKKyAgICAgICAg ICAgICAgICBBdXRvSW5zdGFsbC51c2Vyc3BhY2Vfc2hvdWxkX293bihvcy5wYXRoLmpvaW4oaW5z dGFsbF9sb2NhdGlvbiwgaW5zdGFsbGVkKSkKIAogICAgICAgICAgICAgQXV0b0luc3RhbGwubWFu aWZlc3Rbc2VsZi5uYW1lXSA9IHsKICAgICAgICAgICAgICAgICAnaW5kZXgnOiBBdXRvSW5zdGFs bC5pbmRleCwK 405845 2020-08-03 09:57:22 -0700 2020-08-03 10:36:34 -0700 Patch bug-215067-20200803095721.patch text/plain 10635 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTE5OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA4LTAzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBVc2Ugc2V0dXAucHkgZm9yIHRoZSBhdXRvaW5z dGFsbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTUwNjcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDMyNzE5PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weTogQWRkIGFsbCByZXF1ZXN0cyBkZXBl bmRlbmNpZXMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtp dGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAgICAgKFBhY2thZ2UuQXJjaGl2ZV9faW5pdF9f KTogQWRkIGV4dGVuc2lvbiwgdGFyLmd6IGJ5IGRlZmF1bHQuCisgICAgICAgIChQYWNrYWdlLkFy Y2hpdmUucGF0aCk6IFN1cHBvcnQgbXVsdGlwbGUgZmlsZSB0eXBlcy4KKyAgICAgICAgKFBhY2th Z2UuQXJjaGl2ZS51bnBhY2spOiBTdXBwb3J0IC56aXAgZmlsZXMuCisgICAgICAgIChQYWNrYWdl Ll9faW5pdF9fKTogQWRkIHNsb3dfaW5zdGFsbCBmbGFnLgorICAgICAgICAoUGFja2FnZS5hcmNo aXZlcyk6IEhhbmRsZSBjYXNlIHdlcmUgYSBsaWJyYXJ5IGRvZXMgbm90IGhhdmUgYSB0aW55IHZl cnNpb24uCisgICAgICAgIChQYWNrYWdlLmluc3RhbGwpOiBDYWxsIHNldHVwLnB5IGluc3RlYWQg b2YganVzdCBtb3ZpbmcgdGhlIGxpYnJhcnkgb3V0IG9mIHRoZSBwYWNrYWdlLgorCiAyMDIwLTA4 LTAzICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBb V1BFXVtHVEtdIHJ1bi1taW5pYnJvd3NlciBubyBsb25nZXIgYXNzdW1lcyByZWxlYXNlIGNvbmZp Z3VyYXRpb24gYnkgZGVmYXVsdApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CShyZXZp c2lvbiAyNjUxOTkpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Vi a2l0Y29yZXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOCwxMyArMjgsMTkgQEAg bG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoJ3dlYmtpdGNvcmVweScpCiBmcm9tIHdlYmtpdGNvcmVw eS52ZXJzaW9uIGltcG9ydCBWZXJzaW9uCiBmcm9tIHdlYmtpdGNvcmVweS5zdHJpbmdfdXRpbHMg aW1wb3J0IEJ5dGVzSU8sIFN0cmluZ0lPLCBVbmljb2RlSU8sIHVuaWNvZGUKIAotdmVyc2lvbiA9 IFZlcnNpb24oMCwgMCwgNCkKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDEsIDApCiAKIGZyb20gd2Vi a2l0Y29yZXB5LmF1dG9pbnN0YWxsIGltcG9ydCBQYWNrYWdlLCBBdXRvSW5zdGFsbAogaWYgc3lz LnZlcnNpb25faW5mbyA+ICgzLCAwKToKICAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdl KCdtb2NrJywgVmVyc2lvbig0KSkpCisgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgn c2V0dXB0b29scycsIFZlcnNpb24oNDEsIDIsICAwKSkpCiBlbHNlOgogICAgIEF1dG9JbnN0YWxs LnJlZ2lzdGVyKFBhY2thZ2UoJ21vY2snLCBWZXJzaW9uKDMsIDAsIDUpKSkKKyAgICBBdXRvSW5z dGFsbC5yZWdpc3RlcihQYWNrYWdlKCdzZXR1cHRvb2xzJywgVmVyc2lvbig0MSwgMCwgMSkpKQog CiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdjZXJ0aWZpJywgVmVyc2lvbigyMDIwLCA2 LCAyMCkpKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnY2hhcmRldCcsIFZlcnNpb24o MywgMCwgNCkpKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZnVuY3NpZ3MnLCBWZXJz aW9uKDEsIDAsIDIpKSkKK0F1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2lkbmEnLCBWZXJz aW9uKDIsIDEwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdyZXF1ZXN0cycsIFZl cnNpb24oMiwgMjQpKSkKK0F1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3VybGxpYjMnLCBW ZXJzaW9uKDEsIDI1LCAxMCkpKQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5 CShyZXZpc2lvbiAyNjUxOTkpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3Jl cHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNCw5ICsy NCwxMSBAQCBpbXBvcnQganNvbgogaW1wb3J0IG1hdGgKIGltcG9ydCBvcwogaW1wb3J0IHJlCitp bXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHNodXRpbAogaW1wb3J0IHN5cwogaW1wb3J0IHRhcmZp bGUKK2ltcG9ydCB6aXBmaWxlCiAKIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBsb2cKIGZyb20g d2Via2l0Y29yZXB5LnZlcnNpb24gaW1wb3J0IFZlcnNpb24KQEAgLTQwLDEwICs0MiwxMSBAQCBl bHNlOgogCiBjbGFzcyBQYWNrYWdlKG9iamVjdCk6CiAgICAgY2xhc3MgQXJjaGl2ZShvYmplY3Qp OgotICAgICAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgbGluaywgdmVyc2lvbik6CisgICAg ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBsaW5rLCB2ZXJzaW9uLCBleHRlbnNpb249Tm9u ZSk6CiAgICAgICAgICAgICBzZWxmLm5hbWUgPSBuYW1lCiAgICAgICAgICAgICBzZWxmLmxpbmsg PSBsaW5rCiAgICAgICAgICAgICBzZWxmLnZlcnNpb24gPSB2ZXJzaW9uCisgICAgICAgICAgICBz ZWxmLmV4dGVuc2lvbiA9IGV4dGVuc2lvbiBvciAndGFyLmd6JwogCiAgICAgICAgIGRlZiBfX3Jl cHJfXyhzZWxmKToKICAgICAgICAgICAgIHJldHVybiAne30te30ue30ue30nLmZvcm1hdChzZWxm Lm5hbWUsIHNlbGYudmVyc2lvbi5tYWpvciwgc2VsZi52ZXJzaW9uLm1pbm9yLCBzZWxmLnZlcnNp b24udGlueSkKQEAgLTUyLDcgKzU1LDcgQEAgY2xhc3MgUGFja2FnZShvYmplY3QpOgogICAgICAg ICBkZWYgcGF0aChzZWxmKToKICAgICAgICAgICAgIGlmIG5vdCBBdXRvSW5zdGFsbC5kaXJlY3Rv cnk6CiAgICAgICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignTm8gQXV0b0luc3RhbGwgZGly ZWN0b3J5LCBhcmNoaXZlIGNhbm5vdCByZXNvbHZlIGxvY2FsIHBhdGgnKQotICAgICAgICAgICAg cmV0dXJuICd7fS97fS17fS50YXIuZ3onLmZvcm1hdChBdXRvSW5zdGFsbC5kaXJlY3RvcnksIHNl bGYubmFtZSwgc2VsZi52ZXJzaW9uKQorICAgICAgICAgICAgcmV0dXJuICd7fS97fS17fS57fScu Zm9ybWF0KEF1dG9JbnN0YWxsLmRpcmVjdG9yeSwgc2VsZi5uYW1lLCBzZWxmLnZlcnNpb24sIHNl bGYuZXh0ZW5zaW9uKQogCiAgICAgICAgIGRlZiBkb3dubG9hZChzZWxmKToKICAgICAgICAgICAg IHJlc3BvbnNlID0gQXV0b0luc3RhbGwuX3JlcXVlc3Qoc2VsZi5saW5rKQpAQCAtNzIsMTcgKzc1 LDI1IEBAIGNsYXNzIFBhY2thZ2Uob2JqZWN0KToKICAgICAgICAgICAgIGlmIG5vdCBvcy5wYXRo LmlzZmlsZShzZWxmLnBhdGgpOgogICAgICAgICAgICAgICAgIHJhaXNlIElPRXJyb3IoJ0ZhaWxl ZCB0byBmaW5kIGFyY2hpdmUgYXQge30nLmZvcm1hdChzZWxmLnBhdGgpKQogICAgICAgICAgICAg c2h1dGlsLnJtdHJlZSh0YXJnZXQsIGlnbm9yZV9lcnJvcnM9VHJ1ZSkKLSAgICAgICAgICAgIGZp bGUgPSB0YXJmaWxlLm9wZW4oc2VsZi5wYXRoKQotICAgICAgICAgICAgdHJ5OgotICAgICAgICAg ICAgICAgIGZpbGUuZXh0cmFjdGFsbCh0YXJnZXQpCi0gICAgICAgICAgICBmaW5hbGx5OgotICAg ICAgICAgICAgICAgIGZpbGUuY2xvc2UoKQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUs IHZlcnNpb249Tm9uZSwgcHlwaV9uYW1lPU5vbmUpOgorICAgICAgICAgICAgaWYgc2VsZi5leHRl bnNpb24gPT0gJ3Rhci5neic6CisgICAgICAgICAgICAgICAgZmlsZSA9IHRhcmZpbGUub3Blbihz ZWxmLnBhdGgpCisgICAgICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgICAgICBmaWxl LmV4dHJhY3RhbGwodGFyZ2V0KQorICAgICAgICAgICAgICAgIGZpbmFsbHk6CisgICAgICAgICAg ICAgICAgICAgIGZpbGUuY2xvc2UoKQorICAgICAgICAgICAgZWxpZiBzZWxmLmV4dGVuc2lvbiA9 PSAnemlwJzoKKyAgICAgICAgICAgICAgICB3aXRoIHppcGZpbGUuWmlwRmlsZShzZWxmLnBhdGgs ICdyJykgYXMgZmlsZToKKyAgICAgICAgICAgICAgICAgICAgZmlsZS5leHRyYWN0YWxsKHRhcmdl dCkKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgcmFpc2UgT1NFcnJvcigne30g aGFzIGFuICB1bnJlY29nbml6ZWQgcGFja2FnZSBmb3JtYXQnLmZvcm1hdChzZWxmLnBhdGgpKQor CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIHZlcnNpb249Tm9uZSwgcHlwaV9uYW1lPU5v bmUsIHNsb3dfaW5zdGFsbD1GYWxzZSk6CiAgICAgICAgIHNlbGYubmFtZSA9IG5hbWUKICAgICAg ICAgc2VsZi52ZXJzaW9uID0gdmVyc2lvbgogICAgICAgICBzZWxmLl9hcmNoaXZlcyA9IFtdCiAg ICAgICAgIHNlbGYucHlwaV9uYW1lID0gcHlwaV9uYW1lIG9yIHNlbGYubmFtZQorICAgICAgICBz ZWxmLnNsb3dfaW5zdGFsbCA9IHNsb3dfaW5zdGFsbAogCiAgICAgQHByb3BlcnR5CiAgICAgZGVm IGxvY2F0aW9uKHNlbGYpOgpAQCAtMTE1LDE0ICsxMjYsMTkgQEAgY2xhc3MgUGFja2FnZShvYmpl Y3QpOgogICAgICAgICAgICAgICAgICAgICBhdHRyaWJ1dGVzW2VsZW1lbnQuYXR0cmlidXRlcy5p dGVtKGluZGV4KS5uYW1lXSA9IGVsZW1lbnQuYXR0cmlidXRlcy5pdGVtKGluZGV4KS52YWx1ZQog ICAgICAgICAgICAgICAgIGlmIG5vdCBhdHRyaWJ1dGVzLmdldCgnaHJlZicsIE5vbmUpOgogICAg ICAgICAgICAgICAgICAgICBjb250aW51ZQotICAgICAgICAgICAgICAgIGlmIG5vdCBlbGVtZW50 LmNoaWxkTm9kZXNbMF0uZGF0YS5lbmRzd2l0aCgndGFyLmd6Jyk6CisKKyAgICAgICAgICAgICAg ICBpZiBlbGVtZW50LmNoaWxkTm9kZXNbMF0uZGF0YS5lbmRzd2l0aCgndGFyLmd6Jyk6CisgICAg ICAgICAgICAgICAgICAgIGV4dGVuc2lvbiA9ICd0YXIuZ3onCisgICAgICAgICAgICAgICAgZWxp ZiBlbGVtZW50LmNoaWxkTm9kZXNbMF0uZGF0YS5lbmRzd2l0aCgnLnppcCcpOgorICAgICAgICAg ICAgICAgICAgICBleHRlbnNpb24gPSAnemlwJworICAgICAgICAgICAgICAgIGVsc2U6CiAgICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAKICAgICAgICAgICAgICAgICByZXF1aXJlcyA9IGF0 dHJpYnV0ZXMuZ2V0KCdkYXRhLXJlcXVpcmVzLXB5dGhvbicpCiAgICAgICAgICAgICAgICAgaWYg cmVxdWlyZXMgYW5kIG5vdCBBdXRvSW5zdGFsbC52ZXJzaW9uLm1hdGNoZXMocmVxdWlyZXMpOgog ICAgICAgICAgICAgICAgICAgICBjb250aW51ZQogCi0gICAgICAgICAgICAgICAgdmVyc2lvbl9j YW5kaWRhdGUgPSByZS5zZWFyY2gocidcZCtcLlxkK1wuXGQrJywgZWxlbWVudC5jaGlsZE5vZGVz WzBdLmRhdGEpCisgICAgICAgICAgICAgICAgdmVyc2lvbl9jYW5kaWRhdGUgPSByZS5zZWFyY2go cidcZCtcLlxkKyhcLlxkKyk/JywgZWxlbWVudC5jaGlsZE5vZGVzWzBdLmRhdGEpCiAgICAgICAg ICAgICAgICAgaWYgbm90IHZlcnNpb25fY2FuZGlkYXRlOgogICAgICAgICAgICAgICAgICAgICBj b250aW51ZQogICAgICAgICAgICAgICAgIHZlcnNpb24gPSBWZXJzaW9uKCp2ZXJzaW9uX2NhbmRp ZGF0ZS5ncm91cCgpLnNwbGl0KCcuJykpCkBAIC0xNDEsNiArMTU3LDcgQEAgY2xhc3MgUGFja2Fn ZShvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICBuYW1lPXNlbGYucHlwaV9uYW1lLAogICAg ICAgICAgICAgICAgICAgICBsaW5rPWxpbmssCiAgICAgICAgICAgICAgICAgICAgIHZlcnNpb249 dmVyc2lvbiwKKyAgICAgICAgICAgICAgICAgICAgZXh0ZW5zaW9uPWV4dGVuc2lvbiwKICAgICAg ICAgICAgICAgICApKQogCiAgICAgICAgICAgICBzZWxmLl9hcmNoaXZlcyA9IHNvcnRlZChzZWxm Ll9hcmNoaXZlcywga2V5PWxhbWJkYSBhcmNoaXZlOiBhcmNoaXZlLnZlcnNpb24pCkBAIC0xNjMs MjYgKzE4MCw4MyBAQCBjbGFzcyBQYWNrYWdlKG9iamVjdCk6CiAgICAgICAgIGlmIHNlbGYuaXNf Y2FjaGVkKCk6CiAgICAgICAgICAgICByZXR1cm4KIAorICAgICAgICAjIE1ha2Ugc3VyZSB0aGF0 IHNldHVwdG9vbHMgYXJlIGluc3RhbGxlZCwgc2luY2Ugc2V0dXAucHkgcmVsaWVzIG9uIGl0Cisg ICAgICAgIGlmIHNlbGYubmFtZSAhPSAnc2V0dXB0b29scyc6CisgICAgICAgICAgICBBdXRvSW5z dGFsbC5pbnN0YWxsKCdzZXR1cHRvb2xzJykKKwogICAgICAgICBpZiBub3Qgc2VsZi5hcmNoaXZl cygpOgogICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignTm8gYXJjaGl2ZXMgZm9yIHt9LXt9 IGZvdW5kJy5mb3JtYXQoc2VsZi5weXBpX25hbWUsIHNlbGYudmVyc2lvbikpCiAgICAgICAgIGFy Y2hpdmUgPSBzZWxmLmFyY2hpdmVzKClbLTFdCiAKICAgICAgICAgdHJ5OgorICAgICAgICAgICAg aW5zdGFsbF9sb2NhdGlvbiA9IG9zLnBhdGguZGlybmFtZShzZWxmLmxvY2F0aW9uKQorICAgICAg ICAgICAgc2h1dGlsLnJtdHJlZShzZWxmLmxvY2F0aW9uLCBpZ25vcmVfZXJyb3JzPVRydWUpCisg ICAgICAgICAgICBhbHJlYWR5X293bmVkID0gc2V0KG9zLmxpc3RkaXIoaW5zdGFsbF9sb2NhdGlv bikpCisKICAgICAgICAgICAgIGxvZy53YXJuaW5nKCdJbnN0YWxsaW5nIHt9Li4uJy5mb3JtYXQo YXJjaGl2ZSkpCiAgICAgICAgICAgICBhcmNoaXZlLmRvd25sb2FkKCkKIAogICAgICAgICAgICAg dGVtcF9sb2NhdGlvbiA9ICd7fS50bXAnLmZvcm1hdChzZWxmLmxvY2F0aW9uKQogICAgICAgICAg ICAgYXJjaGl2ZS51bnBhY2sodGVtcF9sb2NhdGlvbikKIAotICAgICAgICAgICAgc2h1dGlsLnJt dHJlZShzZWxmLmxvY2F0aW9uLCBpZ25vcmVfZXJyb3JzPVRydWUpCi0gICAgICAgICAgICBzaHV0 aWwubW92ZShvcy5wYXRoLmpvaW4odGVtcF9sb2NhdGlvbiwgc3RyKGFyY2hpdmUpLCBzZWxmLm5h bWUpLCBzZWxmLmxvY2F0aW9uKQorICAgICAgICAgICAgZm9yIGNhbmRpZGF0ZSBpbiBbCisgICAg ICAgICAgICAgICAgb3MucGF0aC5qb2luKHRlbXBfbG9jYXRpb24sIHN0cihhcmNoaXZlKSksCisg ICAgICAgICAgICAgICAgb3MucGF0aC5qb2luKHRlbXBfbG9jYXRpb24sICd7fS17fS57fScuZm9y bWF0KGFyY2hpdmUubmFtZSwgYXJjaGl2ZS52ZXJzaW9uLm1ham9yLCBhcmNoaXZlLnZlcnNpb24u bWlub3IpKSwKKyAgICAgICAgICAgIF06CisgICAgICAgICAgICAgICAgaWYgbm90IG9zLnBhdGgu ZXhpc3RzKG9zLnBhdGguam9pbihjYW5kaWRhdGUsICdzZXR1cC5weScpKToKKyAgICAgICAgICAg ICAgICAgICAgY29udGludWUKKworICAgICAgICAgICAgICAgIGxvZy53YXJuaW5nKCdJbnN0YWxs aW5nIHt9Li4uJy5mb3JtYXQoYXJjaGl2ZSkpCisKKyAgICAgICAgICAgICAgICBpZiBzZWxmLnNs b3dfaW5zdGFsbDoKKyAgICAgICAgICAgICAgICAgICAgbG9nLndhcm5pbmcoJ3t9IGlzIGtub3du IHRvIGJlIHNsb3cgdG8gaW5zdGFsbCcuZm9ybWF0KGFyY2hpdmUpKQorCisgICAgICAgICAgICAg ICAgd2l0aCBvcGVuKG9zLmRldm51bGwsICd3JykgYXMgZGV2bnVsbDoKKyAgICAgICAgICAgICAg ICAgICAgc3VicHJvY2Vzcy5jaGVja19jYWxsKAorICAgICAgICAgICAgICAgICAgICAgICAgWwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN5cy5leGVjdXRhYmxlLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbihjYW5kaWRhdGUsICdzZXR1cC5weScpLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICdpbnN0YWxsJywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAnLS1ob21lPXt9Jy5mb3JtYXQoaW5zdGFsbF9sb2NhdGlvbiksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJy0tcm9vdD0vJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnLS1zaW5nbGUtdmVyc2lvbi1leHRlcm5hbGx5LW1hbmFnZWQnLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICctLWluc3RhbGwtbGliPXt9Jy5mb3JtYXQoaW5zdGFsbF9sb2NhdGlvbiks CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy0taW5zdGFsbC1zY3JpcHRzPXt9Jy5mb3Jt YXQoaW5zdGFsbF9sb2NhdGlvbiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy0taW5z dGFsbC1kYXRhPXt9Jy5mb3JtYXQob3MucGF0aC5qb2luKGluc3RhbGxfbG9jYXRpb24sICdkYXRh JykpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLWluc3RhbGwtaGVhZGVycz17fScu Zm9ybWF0KG9zLnBhdGguam9pbihpbnN0YWxsX2xvY2F0aW9uLCAnaGVhZGVycycpKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAjIERvIG5vdCBhdXRvbWF0aWNhbGx5IGluc3RhbGwgcGFj a2FnZSBkZXBlbmRlbmNpZXMsIGZvcmNlIHNjcmlwdHMgdG8gYmUgZXhwbGljaXQKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAjIEV2ZW4gd2l0aG91dCB0aGlzIGZsYWcsIHNldHVwLnB5IGlz IG5vdCBjb25zaXN0ZW50IGFib3V0IGluc3RhbGxpbmcgZGVwZW5kZW5jaWVzLgorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICctLW9sZC1hbmQtdW5tYW5hZ2VhYmxlJywKKyAgICAgICAgICAg ICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgICAgICAgICBjd2Q9Y2FuZGlkYXRlLAor ICAgICAgICAgICAgICAgICAgICAgICAgZW52PWRpY3QoCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgUEFUSD1vcy5lbnZpcm9uLmdldCgnUEFUSCcsICcnKSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICBQQVRIRVhUPW9zLmVudmlyb24uZ2V0KCdQQVRIRVhUJywgJycpLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFBZVEhPTlBBVEg9aW5zdGFsbF9sb2NhdGlvbiwKKyAgICAg ICAgICAgICAgICAgICAgICAgICksCisgICAgICAgICAgICAgICAgICAgICAgICAjIEZJWE1FOiBT dXBwcmVzcyBzdGRlcnIgYW5kIHN0ZG91dCBsb2dnaW5nIGFmdGVyIGRlYnVnZ2luZworICAgICAg ICAgICAgICAgICAgICApCisKKyAgICAgICAgICAgICAgICBlZ2dfaW5mbyA9IG9zLnBhdGguam9p bigKKyAgICAgICAgICAgICAgICAgICAgaW5zdGFsbF9sb2NhdGlvbiwKKyAgICAgICAgICAgICAg ICAgICAgJ3t9LXB5e30ue30uZWdnLWluZm8nLmZvcm1hdCgKKyAgICAgICAgICAgICAgICAgICAg ICAgIG9zLnBhdGguYmFzZW5hbWUoY2FuZGlkYXRlKSwKKyAgICAgICAgICAgICAgICAgICAgICAg IEF1dG9JbnN0YWxsLnZlcnNpb24ubWFqb3IsIEF1dG9JbnN0YWxsLnZlcnNpb24ubWlub3IsCisg ICAgICAgICAgICAgICAgICAgICksCisgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAg IGlmIG9zLnBhdGguZXhpc3RzKGVnZ19pbmZvKToKKyAgICAgICAgICAgICAgICAgICAgc2h1dGls LnJtdHJlZShlZ2dfaW5mbywgaWdub3JlX2Vycm9ycz1UcnVlKQorICAgICAgICAgICAgICAgIGJy ZWFrCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIHJhaXNlIE9TRXJyb3IoJ0Nh bm5vdCBpbnN0YWxsIHt9LCBjb3VsZCBub3QgZmluZCBzZXR1cC5weScuZm9ybWF0KHNlbGYubmFt ZSkpCiAKICAgICAgICAgICAgIHNlbGYuZG9fcG9zdF9pbnN0YWxsKHRlbXBfbG9jYXRpb24pCiAK ICAgICAgICAgICAgIG9zLnJlbW92ZShhcmNoaXZlLnBhdGgpCiAgICAgICAgICAgICBzaHV0aWwu cm10cmVlKHRlbXBfbG9jYXRpb24sIGlnbm9yZV9lcnJvcnM9VHJ1ZSkKIAotICAgICAgICAgICAg QXV0b0luc3RhbGwudXNlcnNwYWNlX3Nob3VsZF9vd24oc2VsZi5sb2NhdGlvbikKKyAgICAgICAg ICAgIGZvciBpbnN0YWxsZWQgaW4gc2V0KG9zLmxpc3RkaXIoaW5zdGFsbF9sb2NhdGlvbikpIC0g YWxyZWFkeV9vd25lZDoKKyAgICAgICAgICAgICAgICBBdXRvSW5zdGFsbC51c2Vyc3BhY2Vfc2hv dWxkX293bihvcy5wYXRoLmpvaW4oaW5zdGFsbF9sb2NhdGlvbiwgaW5zdGFsbGVkKSkKIAogICAg ICAgICAgICAgQXV0b0luc3RhbGwubWFuaWZlc3Rbc2VsZi5uYW1lXSA9IHsKICAgICAgICAgICAg ICAgICAnaW5kZXgnOiBBdXRvSW5zdGFsbC5pbmRleCwK 405850 2020-08-03 10:36:36 -0700 2020-08-04 10:34:57 -0700 Patch bug-215067-20200803103635.patch text/plain 10646 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTIwMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA4LTAzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBVc2Ugc2V0dXAucHkgZm9yIHRoZSBhdXRvaW5z dGFsbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTUwNjcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDMyNzE5PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weTogQWRkIGFsbCByZXF1ZXN0cyBkZXBl bmRlbmNpZXMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtp dGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAgICAgKFBhY2thZ2UuQXJjaGl2ZV9faW5pdF9f KTogQWRkIGV4dGVuc2lvbiwgdGFyLmd6IGJ5IGRlZmF1bHQuCisgICAgICAgIChQYWNrYWdlLkFy Y2hpdmUucGF0aCk6IFN1cHBvcnQgbXVsdGlwbGUgZmlsZSB0eXBlcy4KKyAgICAgICAgKFBhY2th Z2UuQXJjaGl2ZS51bnBhY2spOiBTdXBwb3J0IC56aXAgZmlsZXMuCisgICAgICAgIChQYWNrYWdl Ll9faW5pdF9fKTogQWRkIHNsb3dfaW5zdGFsbCBmbGFnLgorICAgICAgICAoUGFja2FnZS5hcmNo aXZlcyk6IEhhbmRsZSBjYXNlIHdlcmUgYSBsaWJyYXJ5IGRvZXMgbm90IGhhdmUgYSB0aW55IHZl cnNpb24uCisgICAgICAgIChQYWNrYWdlLmluc3RhbGwpOiBDYWxsIHNldHVwLnB5IGluc3RlYWQg b2YganVzdCBtb3ZpbmcgdGhlIGxpYnJhcnkgb3V0IG9mIHRoZSBwYWNrYWdlLgorCiAyMDIwLTA4 LTAzICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04o cjI2NDc2Nikgd2Via2l0cHk6IG5ld2x5IGFkZGVkIC0tc3VpdGUgZmxhZyBjb25mbGljdHMgd2l0 aCBvdGhlciAtLXN1aXRlIGZsYWdzIGluIHNhZmFyaXB5CkluZGV4OiBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19p bml0X18ucHkJKHJldmlzaW9uIDI2NTIwMykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTI4 LDEzICsyOCwxOSBAQCBsb2cgPSBsb2dnaW5nLmdldExvZ2dlcignd2Via2l0Y29yZXB5JykKIGZy b20gd2Via2l0Y29yZXB5LnZlcnNpb24gaW1wb3J0IFZlcnNpb24KIGZyb20gd2Via2l0Y29yZXB5 LnN0cmluZ191dGlscyBpbXBvcnQgQnl0ZXNJTywgU3RyaW5nSU8sIFVuaWNvZGVJTywgdW5pY29k ZQogCi12ZXJzaW9uID0gVmVyc2lvbigwLCAwLCA0KQordmVyc2lvbiA9IFZlcnNpb24oMCwgMSwg MCkKIAogZnJvbSB3ZWJraXRjb3JlcHkuYXV0b2luc3RhbGwgaW1wb3J0IFBhY2thZ2UsIEF1dG9J bnN0YWxsCiBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApOgogICAgIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ21vY2snLCBWZXJzaW9uKDQpKSkKKyAgICBBdXRvSW5zdGFsbC5yZWdp c3RlcihQYWNrYWdlKCdzZXR1cHRvb2xzJywgVmVyc2lvbig0MSwgMiwgIDApKSkKIGVsc2U6CiAg ICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbW9jaycsIFZlcnNpb24oMywgMCwgNSkp KQorICAgIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3NldHVwdG9vbHMnLCBWZXJzaW9u KDQxLCAwLCAxKSkpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2NlcnRpZmknLCBW ZXJzaW9uKDIwMjAsIDYsIDIwKSkpCitBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdjaGFy ZGV0JywgVmVyc2lvbigzLCAwLCA0KSkpCitBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdm dW5jc2lncycsIFZlcnNpb24oMSwgMCwgMikpKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2Fn ZSgnaWRuYScsIFZlcnNpb24oMiwgMTApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2Uo J3JlcXVlc3RzJywgVmVyc2lvbigyLCAyNCkpKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2Fn ZSgndXJsbGliMycsIFZlcnNpb24oMSwgMjUsIDEwKSkpCkluZGV4OiBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkv YXV0b2luc3RhbGwucHkJKHJldmlzaW9uIDI2NTIwMykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkJKHdvcmtpbmcgY29w eSkKQEAgLTI0LDkgKzI0LDExIEBAIGltcG9ydCBqc29uCiBpbXBvcnQgbWF0aAogaW1wb3J0IG9z CiBpbXBvcnQgcmUKK2ltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc2h1dGlsCiBpbXBvcnQgc3lz CiBpbXBvcnQgdGFyZmlsZQoraW1wb3J0IHppcGZpbGUKIAogZnJvbSB3ZWJraXRjb3JlcHkgaW1w b3J0IGxvZwogZnJvbSB3ZWJraXRjb3JlcHkudmVyc2lvbiBpbXBvcnQgVmVyc2lvbgpAQCAtNDAs MTAgKzQyLDExIEBAIGVsc2U6CiAKIGNsYXNzIFBhY2thZ2Uob2JqZWN0KToKICAgICBjbGFzcyBB cmNoaXZlKG9iamVjdCk6Ci0gICAgICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBsaW5rLCB2 ZXJzaW9uKToKKyAgICAgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGxpbmssIHZlcnNpb24s IGV4dGVuc2lvbj1Ob25lKToKICAgICAgICAgICAgIHNlbGYubmFtZSA9IG5hbWUKICAgICAgICAg ICAgIHNlbGYubGluayA9IGxpbmsKICAgICAgICAgICAgIHNlbGYudmVyc2lvbiA9IHZlcnNpb24K KyAgICAgICAgICAgIHNlbGYuZXh0ZW5zaW9uID0gZXh0ZW5zaW9uIG9yICd0YXIuZ3onCiAKICAg ICAgICAgZGVmIF9fcmVwcl9fKHNlbGYpOgogICAgICAgICAgICAgcmV0dXJuICd7fS17fS57fS57 fScuZm9ybWF0KHNlbGYubmFtZSwgc2VsZi52ZXJzaW9uLm1ham9yLCBzZWxmLnZlcnNpb24ubWlu b3IsIHNlbGYudmVyc2lvbi50aW55KQpAQCAtNTIsNyArNTUsNyBAQCBjbGFzcyBQYWNrYWdlKG9i amVjdCk6CiAgICAgICAgIGRlZiBwYXRoKHNlbGYpOgogICAgICAgICAgICAgaWYgbm90IEF1dG9J bnN0YWxsLmRpcmVjdG9yeToKICAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdObyBB dXRvSW5zdGFsbCBkaXJlY3RvcnksIGFyY2hpdmUgY2Fubm90IHJlc29sdmUgbG9jYWwgcGF0aCcp Ci0gICAgICAgICAgICByZXR1cm4gJ3t9L3t9LXt9LnRhci5neicuZm9ybWF0KEF1dG9JbnN0YWxs LmRpcmVjdG9yeSwgc2VsZi5uYW1lLCBzZWxmLnZlcnNpb24pCisgICAgICAgICAgICByZXR1cm4g J3t9L3t9LXt9Lnt9Jy5mb3JtYXQoQXV0b0luc3RhbGwuZGlyZWN0b3J5LCBzZWxmLm5hbWUsIHNl bGYudmVyc2lvbiwgc2VsZi5leHRlbnNpb24pCiAKICAgICAgICAgZGVmIGRvd25sb2FkKHNlbGYp OgogICAgICAgICAgICAgcmVzcG9uc2UgPSBBdXRvSW5zdGFsbC5fcmVxdWVzdChzZWxmLmxpbmsp CkBAIC03MiwxNyArNzUsMjUgQEAgY2xhc3MgUGFja2FnZShvYmplY3QpOgogICAgICAgICAgICAg aWYgbm90IG9zLnBhdGguaXNmaWxlKHNlbGYucGF0aCk6CiAgICAgICAgICAgICAgICAgcmFpc2Ug SU9FcnJvcignRmFpbGVkIHRvIGZpbmQgYXJjaGl2ZSBhdCB7fScuZm9ybWF0KHNlbGYucGF0aCkp CiAgICAgICAgICAgICBzaHV0aWwucm10cmVlKHRhcmdldCwgaWdub3JlX2Vycm9ycz1UcnVlKQot ICAgICAgICAgICAgZmlsZSA9IHRhcmZpbGUub3BlbihzZWxmLnBhdGgpCi0gICAgICAgICAgICB0 cnk6Ci0gICAgICAgICAgICAgICAgZmlsZS5leHRyYWN0YWxsKHRhcmdldCkKLSAgICAgICAgICAg IGZpbmFsbHk6Ci0gICAgICAgICAgICAgICAgZmlsZS5jbG9zZSgpCiAKLSAgICBkZWYgX19pbml0 X18oc2VsZiwgbmFtZSwgdmVyc2lvbj1Ob25lLCBweXBpX25hbWU9Tm9uZSk6CisgICAgICAgICAg ICBpZiBzZWxmLmV4dGVuc2lvbiA9PSAndGFyLmd6JzoKKyAgICAgICAgICAgICAgICBmaWxlID0g dGFyZmlsZS5vcGVuKHNlbGYucGF0aCkKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAgICAg ICAgICAgICAgIGZpbGUuZXh0cmFjdGFsbCh0YXJnZXQpCisgICAgICAgICAgICAgICAgZmluYWxs eToKKyAgICAgICAgICAgICAgICAgICAgZmlsZS5jbG9zZSgpCisgICAgICAgICAgICBlbGlmIHNl bGYuZXh0ZW5zaW9uID09ICd6aXAnOgorICAgICAgICAgICAgICAgIHdpdGggemlwZmlsZS5aaXBG aWxlKHNlbGYucGF0aCwgJ3InKSBhcyBmaWxlOgorICAgICAgICAgICAgICAgICAgICBmaWxlLmV4 dHJhY3RhbGwodGFyZ2V0KQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICByYWlz ZSBPU0Vycm9yKCd7fSBoYXMgYW4gIHVucmVjb2duaXplZCBwYWNrYWdlIGZvcm1hdCcuZm9ybWF0 KHNlbGYucGF0aCkpCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgdmVyc2lvbj1Ob25l LCBweXBpX25hbWU9Tm9uZSwgc2xvd19pbnN0YWxsPUZhbHNlKToKICAgICAgICAgc2VsZi5uYW1l ID0gbmFtZQogICAgICAgICBzZWxmLnZlcnNpb24gPSB2ZXJzaW9uCiAgICAgICAgIHNlbGYuX2Fy Y2hpdmVzID0gW10KICAgICAgICAgc2VsZi5weXBpX25hbWUgPSBweXBpX25hbWUgb3Igc2VsZi5u YW1lCisgICAgICAgIHNlbGYuc2xvd19pbnN0YWxsID0gc2xvd19pbnN0YWxsCiAKICAgICBAcHJv cGVydHkKICAgICBkZWYgbG9jYXRpb24oc2VsZik6CkBAIC0xMTUsMTQgKzEyNiwxOSBAQCBjbGFz cyBQYWNrYWdlKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgIGF0dHJpYnV0ZXNbZWxlbWVu dC5hdHRyaWJ1dGVzLml0ZW0oaW5kZXgpLm5hbWVdID0gZWxlbWVudC5hdHRyaWJ1dGVzLml0ZW0o aW5kZXgpLnZhbHVlCiAgICAgICAgICAgICAgICAgaWYgbm90IGF0dHJpYnV0ZXMuZ2V0KCdocmVm JywgTm9uZSk6CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICAgICAg aWYgbm90IGVsZW1lbnQuY2hpbGROb2Rlc1swXS5kYXRhLmVuZHN3aXRoKCd0YXIuZ3onKToKKwor ICAgICAgICAgICAgICAgIGlmIGVsZW1lbnQuY2hpbGROb2Rlc1swXS5kYXRhLmVuZHN3aXRoKCd0 YXIuZ3onKToKKyAgICAgICAgICAgICAgICAgICAgZXh0ZW5zaW9uID0gJ3Rhci5neicKKyAgICAg ICAgICAgICAgICBlbGlmIGVsZW1lbnQuY2hpbGROb2Rlc1swXS5kYXRhLmVuZHN3aXRoKCcuemlw Jyk6CisgICAgICAgICAgICAgICAgICAgIGV4dGVuc2lvbiA9ICd6aXAnCisgICAgICAgICAgICAg ICAgZWxzZToKICAgICAgICAgICAgICAgICAgICAgY29udGludWUKIAogICAgICAgICAgICAgICAg IHJlcXVpcmVzID0gYXR0cmlidXRlcy5nZXQoJ2RhdGEtcmVxdWlyZXMtcHl0aG9uJykKICAgICAg ICAgICAgICAgICBpZiByZXF1aXJlcyBhbmQgbm90IEF1dG9JbnN0YWxsLnZlcnNpb24ubWF0Y2hl cyhyZXF1aXJlcyk6CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAKLSAgICAgICAgICAg ICAgICB2ZXJzaW9uX2NhbmRpZGF0ZSA9IHJlLnNlYXJjaChyJ1xkK1wuXGQrXC5cZCsnLCBlbGVt ZW50LmNoaWxkTm9kZXNbMF0uZGF0YSkKKyAgICAgICAgICAgICAgICB2ZXJzaW9uX2NhbmRpZGF0 ZSA9IHJlLnNlYXJjaChyJ1xkK1wuXGQrKFwuXGQrKT8nLCBlbGVtZW50LmNoaWxkTm9kZXNbMF0u ZGF0YSkKICAgICAgICAgICAgICAgICBpZiBub3QgdmVyc2lvbl9jYW5kaWRhdGU6CiAgICAgICAg ICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgICAgICAgICAgdmVyc2lvbiA9IFZlcnNpb24o KnZlcnNpb25fY2FuZGlkYXRlLmdyb3VwKCkuc3BsaXQoJy4nKSkKQEAgLTE0MSw2ICsxNTcsNyBA QCBjbGFzcyBQYWNrYWdlKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgIG5hbWU9c2VsZi5w eXBpX25hbWUsCiAgICAgICAgICAgICAgICAgICAgIGxpbms9bGluaywKICAgICAgICAgICAgICAg ICAgICAgdmVyc2lvbj12ZXJzaW9uLAorICAgICAgICAgICAgICAgICAgICBleHRlbnNpb249ZXh0 ZW5zaW9uLAogICAgICAgICAgICAgICAgICkpCiAKICAgICAgICAgICAgIHNlbGYuX2FyY2hpdmVz ID0gc29ydGVkKHNlbGYuX2FyY2hpdmVzLCBrZXk9bGFtYmRhIGFyY2hpdmU6IGFyY2hpdmUudmVy c2lvbikKQEAgLTE2MywyNiArMTgwLDg0IEBAIGNsYXNzIFBhY2thZ2Uob2JqZWN0KToKICAgICAg ICAgaWYgc2VsZi5pc19jYWNoZWQoKToKICAgICAgICAgICAgIHJldHVybgogCisgICAgICAgICMg TWFrZSBzdXJlIHRoYXQgc2V0dXB0b29scyBhcmUgaW5zdGFsbGVkLCBzaW5jZSBzZXR1cC5weSBy ZWxpZXMgb24gaXQKKyAgICAgICAgaWYgc2VsZi5uYW1lICE9ICdzZXR1cHRvb2xzJzoKKyAgICAg ICAgICAgIEF1dG9JbnN0YWxsLmluc3RhbGwoJ3NldHVwdG9vbHMnKQorCiAgICAgICAgIGlmIG5v dCBzZWxmLmFyY2hpdmVzKCk6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdObyBhcmNo aXZlcyBmb3Ige30te30gZm91bmQnLmZvcm1hdChzZWxmLnB5cGlfbmFtZSwgc2VsZi52ZXJzaW9u KSkKICAgICAgICAgYXJjaGl2ZSA9IHNlbGYuYXJjaGl2ZXMoKVstMV0KIAogICAgICAgICB0cnk6 CisgICAgICAgICAgICBpbnN0YWxsX2xvY2F0aW9uID0gb3MucGF0aC5kaXJuYW1lKHNlbGYubG9j YXRpb24pCisgICAgICAgICAgICBzaHV0aWwucm10cmVlKHNlbGYubG9jYXRpb24sIGlnbm9yZV9l cnJvcnM9VHJ1ZSkKKyAgICAgICAgICAgIGFscmVhZHlfb3duZWQgPSBzZXQob3MubGlzdGRpcihp bnN0YWxsX2xvY2F0aW9uKSkKKwogICAgICAgICAgICAgbG9nLndhcm5pbmcoJ0luc3RhbGxpbmcg e30uLi4nLmZvcm1hdChhcmNoaXZlKSkKICAgICAgICAgICAgIGFyY2hpdmUuZG93bmxvYWQoKQog CiAgICAgICAgICAgICB0ZW1wX2xvY2F0aW9uID0gJ3t9LnRtcCcuZm9ybWF0KHNlbGYubG9jYXRp b24pCiAgICAgICAgICAgICBhcmNoaXZlLnVucGFjayh0ZW1wX2xvY2F0aW9uKQogCi0gICAgICAg ICAgICBzaHV0aWwucm10cmVlKHNlbGYubG9jYXRpb24sIGlnbm9yZV9lcnJvcnM9VHJ1ZSkKLSAg ICAgICAgICAgIHNodXRpbC5tb3ZlKG9zLnBhdGguam9pbih0ZW1wX2xvY2F0aW9uLCBzdHIoYXJj aGl2ZSksIHNlbGYubmFtZSksIHNlbGYubG9jYXRpb24pCisgICAgICAgICAgICBmb3IgY2FuZGlk YXRlIGluIFsKKyAgICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4odGVtcF9sb2NhdGlvbiwgc3Ry KGFyY2hpdmUpKSwKKyAgICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4odGVtcF9sb2NhdGlvbiwg J3t9LXt9Lnt9Jy5mb3JtYXQoYXJjaGl2ZS5uYW1lLCBhcmNoaXZlLnZlcnNpb24ubWFqb3IsIGFy Y2hpdmUudmVyc2lvbi5taW5vcikpLAorICAgICAgICAgICAgXToKKyAgICAgICAgICAgICAgICBp ZiBub3Qgb3MucGF0aC5leGlzdHMob3MucGF0aC5qb2luKGNhbmRpZGF0ZSwgJ3NldHVwLnB5Jykp OgorICAgICAgICAgICAgICAgICAgICBjb250aW51ZQorCisgICAgICAgICAgICAgICAgbG9nLndh cm5pbmcoJ0luc3RhbGxpbmcge30uLi4nLmZvcm1hdChhcmNoaXZlKSkKKworICAgICAgICAgICAg ICAgIGlmIHNlbGYuc2xvd19pbnN0YWxsOgorICAgICAgICAgICAgICAgICAgICBsb2cud2Fybmlu Zygne30gaXMga25vd24gdG8gYmUgc2xvdyB0byBpbnN0YWxsJy5mb3JtYXQoYXJjaGl2ZSkpCisK KyAgICAgICAgICAgICAgICB3aXRoIG9wZW4ob3MuZGV2bnVsbCwgJ3cnKSBhcyBkZXZudWxsOgor ICAgICAgICAgICAgICAgICAgICBzdWJwcm9jZXNzLmNoZWNrX2NhbGwoCisgICAgICAgICAgICAg ICAgICAgICAgICBbCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3lzLmV4ZWN1dGFibGUs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3MucGF0aC5qb2luKGNhbmRpZGF0ZSwgJ3Nl dHVwLnB5JyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2luc3RhbGwnLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICctLWhvbWU9e30nLmZvcm1hdChpbnN0YWxsX2xvY2F0aW9u KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1yb290PS8nLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICctLXNpbmdsZS12ZXJzaW9uLWV4dGVybmFsbHktbWFuYWdlZCcsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJy0taW5zdGFsbC1saWI9e30nLmZvcm1hdChpbnN0 YWxsX2xvY2F0aW9uKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1pbnN0YWxsLXNj cmlwdHM9e30nLmZvcm1hdChpbnN0YWxsX2xvY2F0aW9uKSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAnLS1pbnN0YWxsLWRhdGE9e30nLmZvcm1hdChvcy5wYXRoLmpvaW4oaW5zdGFsbF9s b2NhdGlvbiwgJ2RhdGEnKSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy0taW5zdGFs bC1oZWFkZXJzPXt9Jy5mb3JtYXQob3MucGF0aC5qb2luKGluc3RhbGxfbG9jYXRpb24sICdoZWFk ZXJzJykpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICMgRG8gbm90IGF1dG9tYXRpY2Fs bHkgaW5zdGFsbCBwYWNrYWdlIGRlcGVuZGVuY2llcywgZm9yY2Ugc2NyaXB0cyB0byBiZSBleHBs aWNpdAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICMgRXZlbiB3aXRob3V0IHRoaXMgZmxh Zywgc2V0dXAucHkgaXMgbm90IGNvbnNpc3RlbnQgYWJvdXQgaW5zdGFsbGluZyBkZXBlbmRlbmNp ZXMuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy0tb2xkLWFuZC11bm1hbmFnZWFibGUn LAorICAgICAgICAgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGN3 ZD1jYW5kaWRhdGUsCisgICAgICAgICAgICAgICAgICAgICAgICBlbnY9ZGljdCgKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICBQQVRIPW9zLmVudmlyb24uZ2V0KCdQQVRIJywgJycpLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFBBVEhFWFQ9b3MuZW52aXJvbi5nZXQoJ1BBVEhFWFQn LCAnJyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFlUSE9OUEFUSD1pbnN0YWxsX2xv Y2F0aW9uLAorICAgICAgICAgICAgICAgICAgICAgICAgKSwKKyAgICAgICAgICAgICAgICAgICAg ICAgIHN0ZG91dD1kZXZudWxsLAorICAgICAgICAgICAgICAgICAgICAgICAgc3RkZXJyPWRldm51 bGwsCisgICAgICAgICAgICAgICAgICAgICkKKworICAgICAgICAgICAgICAgIGVnZ19pbmZvID0g b3MucGF0aC5qb2luKAorICAgICAgICAgICAgICAgICAgICBpbnN0YWxsX2xvY2F0aW9uLAorICAg ICAgICAgICAgICAgICAgICAne30tcHl7fS57fS5lZ2ctaW5mbycuZm9ybWF0KAorICAgICAgICAg ICAgICAgICAgICAgICAgb3MucGF0aC5iYXNlbmFtZShjYW5kaWRhdGUpLAorICAgICAgICAgICAg ICAgICAgICAgICAgQXV0b0luc3RhbGwudmVyc2lvbi5tYWpvciwgQXV0b0luc3RhbGwudmVyc2lv bi5taW5vciwKKyAgICAgICAgICAgICAgICAgICAgKSwKKyAgICAgICAgICAgICAgICApCisgICAg ICAgICAgICAgICAgaWYgb3MucGF0aC5leGlzdHMoZWdnX2luZm8pOgorICAgICAgICAgICAgICAg ICAgICBzaHV0aWwucm10cmVlKGVnZ19pbmZvLCBpZ25vcmVfZXJyb3JzPVRydWUpCisgICAgICAg ICAgICAgICAgYnJlYWsKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgcmFpc2Ug T1NFcnJvcignQ2Fubm90IGluc3RhbGwge30sIGNvdWxkIG5vdCBmaW5kIHNldHVwLnB5Jy5mb3Jt YXQoc2VsZi5uYW1lKSkKIAogICAgICAgICAgICAgc2VsZi5kb19wb3N0X2luc3RhbGwodGVtcF9s b2NhdGlvbikKIAogICAgICAgICAgICAgb3MucmVtb3ZlKGFyY2hpdmUucGF0aCkKICAgICAgICAg ICAgIHNodXRpbC5ybXRyZWUodGVtcF9sb2NhdGlvbiwgaWdub3JlX2Vycm9ycz1UcnVlKQogCi0g ICAgICAgICAgICBBdXRvSW5zdGFsbC51c2Vyc3BhY2Vfc2hvdWxkX293bihzZWxmLmxvY2F0aW9u KQorICAgICAgICAgICAgZm9yIGluc3RhbGxlZCBpbiBzZXQob3MubGlzdGRpcihpbnN0YWxsX2xv Y2F0aW9uKSkgLSBhbHJlYWR5X293bmVkOgorICAgICAgICAgICAgICAgIEF1dG9JbnN0YWxsLnVz ZXJzcGFjZV9zaG91bGRfb3duKG9zLnBhdGguam9pbihpbnN0YWxsX2xvY2F0aW9uLCBpbnN0YWxs ZWQpKQogCiAgICAgICAgICAgICBBdXRvSW5zdGFsbC5tYW5pZmVzdFtzZWxmLm5hbWVdID0gewog ICAgICAgICAgICAgICAgICdpbmRleCc6IEF1dG9JbnN0YWxsLmluZGV4LAo= 405928 2020-08-04 10:34:59 -0700 2020-08-04 17:21:56 -0700 Patch bug-215067-20200804103458.patch text/plain 10617 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTI0NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA4LTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBVc2Ugc2V0dXAucHkgZm9yIHRoZSBhdXRvaW5z dGFsbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTUwNjcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY2NDMyNzE5PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weTogQWRkIGFsbCByZXF1ZXN0cyBkZXBl bmRlbmNpZXMuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtp dGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAgICAgKFBhY2thZ2UuQXJjaGl2ZV9faW5pdF9f KTogQWRkIGV4dGVuc2lvbiwgdGFyLmd6IGJ5IGRlZmF1bHQuCisgICAgICAgIChQYWNrYWdlLkFy Y2hpdmUucGF0aCk6IFN1cHBvcnQgbXVsdGlwbGUgZmlsZSB0eXBlcy4KKyAgICAgICAgKFBhY2th Z2UuQXJjaGl2ZS51bnBhY2spOiBTdXBwb3J0IC56aXAgZmlsZXMuCisgICAgICAgIChQYWNrYWdl Ll9faW5pdF9fKTogQWRkIHNsb3dfaW5zdGFsbCBmbGFnLgorICAgICAgICAoUGFja2FnZS5hcmNo aXZlcyk6IEhhbmRsZSBjYXNlIHdlcmUgYSBsaWJyYXJ5IGRvZXMgbm90IGhhdmUgYSB0aW55IHZl cnNpb24uCisgICAgICAgIChQYWNrYWdlLmluc3RhbGwpOiBDYWxsIHNldHVwLnB5IGluc3RlYWQg b2YganVzdCBtb3ZpbmcgdGhlIGxpYnJhcnkgb3V0IG9mIHRoZSBwYWNrYWdlLgorCiAyMDIwLTA4 LTAzICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIEFs bG93IC1hY2Nlc3NvcnlEb25lIHRvIGJsdXIgdGhlIGZvY3VzZWQgZWxlbWVudCBvbiBpUGFkIHdo ZW4gQXV0b0ZpbGxpbmcgc3Ryb25nIHBhc3N3b3JkcwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5p dF9fLnB5CShyZXZpc2lvbiAyNjUyNDQpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMSw2 ICsyMSw3IEBACiAjIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgogCiBpbXBvcnQgbG9nZ2luZworaW1wb3J0IHBsYXRmb3JtCiBpbXBv cnQgc3lzCiAKIGxvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCd3ZWJraXRjb3JlcHknKQpAQCAtMjgs MTMgKzI5LDIyIEBAIGxvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCd3ZWJraXRjb3JlcHknKQogZnJv bSB3ZWJraXRjb3JlcHkudmVyc2lvbiBpbXBvcnQgVmVyc2lvbgogZnJvbSB3ZWJraXRjb3JlcHku c3RyaW5nX3V0aWxzIGltcG9ydCBCeXRlc0lPLCBTdHJpbmdJTywgVW5pY29kZUlPLCB1bmljb2Rl CiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDAsIDQpCit2ZXJzaW9uID0gVmVyc2lvbigwLCAxLCAw KQogCiBmcm9tIHdlYmtpdGNvcmVweS5hdXRvaW5zdGFsbCBpbXBvcnQgUGFja2FnZSwgQXV0b0lu c3RhbGwKIGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6CiAgICAgQXV0b0luc3RhbGwucmVn aXN0ZXIoUGFja2FnZSgnbW9jaycsIFZlcnNpb24oNCkpKQorICAgIEF1dG9JbnN0YWxsLnJlZ2lz dGVyKFBhY2thZ2UoJ3NldHVwdG9vbHMnLCBWZXJzaW9uKDQxLCAyLCAgMCkpKQogZWxzZToKICAg ICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb2NrJywgVmVyc2lvbigzLCAwLCA1KSkp CisgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnc2V0dXB0b29scycsIFZlcnNpb24o NDEsIDAsIDEpKSkKKyAgICBpZiBwbGF0Zm9ybS5zeXN0ZW0oKSA9PSAnV2luZG93cyc6CisgICAg ICAgIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3dpbl9pbmV0X3B0b24nLCBWZXJzaW9u KDEsIDEsIDApLCBweXBpX25hbWU9J3dpbi1pbmV0LXB0b24nKSkKIAogQXV0b0luc3RhbGwucmVn aXN0ZXIoUGFja2FnZSgnY2VydGlmaScsIFZlcnNpb24oMjAyMCwgNiwgMjApKSkKK0F1dG9JbnN0 YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2NoYXJkZXQnLCBWZXJzaW9uKDMsIDAsIDQpKSkKK0F1dG9J bnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Z1bmNzaWdzJywgVmVyc2lvbigxLCAwLCAyKSkpCitB dXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdpZG5hJywgVmVyc2lvbigyLCAxMCkpKQogQXV0 b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncmVxdWVzdHMnLCBWZXJzaW9uKDIsIDI0KSkpCitB dXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdzb2NrcycsIFZlcnNpb24oMSwgNywgMSksIHB5 cGlfbmFtZT0nUHlTb2NrcycpKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgndXJsbGli MycsIFZlcnNpb24oMSwgMjUsIDEwKSkpCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3Rh bGwucHkJKHJldmlzaW9uIDI2NTI0NCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkJKHdvcmtpbmcgY29weSkKQEAgLTI0 LDkgKzI0LDExIEBAIGltcG9ydCBqc29uCiBpbXBvcnQgbWF0aAogaW1wb3J0IG9zCiBpbXBvcnQg cmUKK2ltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc2h1dGlsCiBpbXBvcnQgc3lzCiBpbXBvcnQg dGFyZmlsZQoraW1wb3J0IHppcGZpbGUKIAogZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IGxvZwog ZnJvbSB3ZWJraXRjb3JlcHkudmVyc2lvbiBpbXBvcnQgVmVyc2lvbgpAQCAtNDAsMTAgKzQyLDEx IEBAIGVsc2U6CiAKIGNsYXNzIFBhY2thZ2Uob2JqZWN0KToKICAgICBjbGFzcyBBcmNoaXZlKG9i amVjdCk6Ci0gICAgICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBsaW5rLCB2ZXJzaW9uKToK KyAgICAgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGxpbmssIHZlcnNpb24sIGV4dGVuc2lv bj1Ob25lKToKICAgICAgICAgICAgIHNlbGYubmFtZSA9IG5hbWUKICAgICAgICAgICAgIHNlbGYu bGluayA9IGxpbmsKICAgICAgICAgICAgIHNlbGYudmVyc2lvbiA9IHZlcnNpb24KKyAgICAgICAg ICAgIHNlbGYuZXh0ZW5zaW9uID0gZXh0ZW5zaW9uIG9yICd0YXIuZ3onCiAKICAgICAgICAgZGVm IF9fcmVwcl9fKHNlbGYpOgogICAgICAgICAgICAgcmV0dXJuICd7fS17fS57fS57fScuZm9ybWF0 KHNlbGYubmFtZSwgc2VsZi52ZXJzaW9uLm1ham9yLCBzZWxmLnZlcnNpb24ubWlub3IsIHNlbGYu dmVyc2lvbi50aW55KQpAQCAtNTIsNyArNTUsNyBAQCBjbGFzcyBQYWNrYWdlKG9iamVjdCk6CiAg ICAgICAgIGRlZiBwYXRoKHNlbGYpOgogICAgICAgICAgICAgaWYgbm90IEF1dG9JbnN0YWxsLmRp cmVjdG9yeToKICAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdObyBBdXRvSW5zdGFs bCBkaXJlY3RvcnksIGFyY2hpdmUgY2Fubm90IHJlc29sdmUgbG9jYWwgcGF0aCcpCi0gICAgICAg ICAgICByZXR1cm4gJ3t9L3t9LXt9LnRhci5neicuZm9ybWF0KEF1dG9JbnN0YWxsLmRpcmVjdG9y eSwgc2VsZi5uYW1lLCBzZWxmLnZlcnNpb24pCisgICAgICAgICAgICByZXR1cm4gJ3t9L3t9LXt9 Lnt9Jy5mb3JtYXQoQXV0b0luc3RhbGwuZGlyZWN0b3J5LCBzZWxmLm5hbWUsIHNlbGYudmVyc2lv biwgc2VsZi5leHRlbnNpb24pCiAKICAgICAgICAgZGVmIGRvd25sb2FkKHNlbGYpOgogICAgICAg ICAgICAgcmVzcG9uc2UgPSBBdXRvSW5zdGFsbC5fcmVxdWVzdChzZWxmLmxpbmspCkBAIC03Miwx NyArNzUsMjUgQEAgY2xhc3MgUGFja2FnZShvYmplY3QpOgogICAgICAgICAgICAgaWYgbm90IG9z LnBhdGguaXNmaWxlKHNlbGYucGF0aCk6CiAgICAgICAgICAgICAgICAgcmFpc2UgSU9FcnJvcign RmFpbGVkIHRvIGZpbmQgYXJjaGl2ZSBhdCB7fScuZm9ybWF0KHNlbGYucGF0aCkpCiAgICAgICAg ICAgICBzaHV0aWwucm10cmVlKHRhcmdldCwgaWdub3JlX2Vycm9ycz1UcnVlKQotICAgICAgICAg ICAgZmlsZSA9IHRhcmZpbGUub3BlbihzZWxmLnBhdGgpCi0gICAgICAgICAgICB0cnk6Ci0gICAg ICAgICAgICAgICAgZmlsZS5leHRyYWN0YWxsKHRhcmdldCkKLSAgICAgICAgICAgIGZpbmFsbHk6 Ci0gICAgICAgICAgICAgICAgZmlsZS5jbG9zZSgpCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwg bmFtZSwgdmVyc2lvbj1Ob25lLCBweXBpX25hbWU9Tm9uZSk6CisgICAgICAgICAgICBpZiBzZWxm LmV4dGVuc2lvbiA9PSAndGFyLmd6JzoKKyAgICAgICAgICAgICAgICBmaWxlID0gdGFyZmlsZS5v cGVuKHNlbGYucGF0aCkKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgICAg IGZpbGUuZXh0cmFjdGFsbCh0YXJnZXQpCisgICAgICAgICAgICAgICAgZmluYWxseToKKyAgICAg ICAgICAgICAgICAgICAgZmlsZS5jbG9zZSgpCisgICAgICAgICAgICBlbGlmIHNlbGYuZXh0ZW5z aW9uID09ICd6aXAnOgorICAgICAgICAgICAgICAgIHdpdGggemlwZmlsZS5aaXBGaWxlKHNlbGYu cGF0aCwgJ3InKSBhcyBmaWxlOgorICAgICAgICAgICAgICAgICAgICBmaWxlLmV4dHJhY3RhbGwo dGFyZ2V0KQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICByYWlzZSBPU0Vycm9y KCd7fSBoYXMgYW4gIHVucmVjb2duaXplZCBwYWNrYWdlIGZvcm1hdCcuZm9ybWF0KHNlbGYucGF0 aCkpCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgdmVyc2lvbj1Ob25lLCBweXBpX25h bWU9Tm9uZSwgc2xvd19pbnN0YWxsPUZhbHNlKToKICAgICAgICAgc2VsZi5uYW1lID0gbmFtZQog ICAgICAgICBzZWxmLnZlcnNpb24gPSB2ZXJzaW9uCiAgICAgICAgIHNlbGYuX2FyY2hpdmVzID0g W10KICAgICAgICAgc2VsZi5weXBpX25hbWUgPSBweXBpX25hbWUgb3Igc2VsZi5uYW1lCisgICAg ICAgIHNlbGYuc2xvd19pbnN0YWxsID0gc2xvd19pbnN0YWxsCiAKICAgICBAcHJvcGVydHkKICAg ICBkZWYgbG9jYXRpb24oc2VsZik6CkBAIC0xMTUsMTQgKzEyNiwxOSBAQCBjbGFzcyBQYWNrYWdl KG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgIGF0dHJpYnV0ZXNbZWxlbWVudC5hdHRyaWJ1 dGVzLml0ZW0oaW5kZXgpLm5hbWVdID0gZWxlbWVudC5hdHRyaWJ1dGVzLml0ZW0oaW5kZXgpLnZh bHVlCiAgICAgICAgICAgICAgICAgaWYgbm90IGF0dHJpYnV0ZXMuZ2V0KCdocmVmJywgTm9uZSk6 CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICAgICAgaWYgbm90IGVs ZW1lbnQuY2hpbGROb2Rlc1swXS5kYXRhLmVuZHN3aXRoKCd0YXIuZ3onKToKKworICAgICAgICAg ICAgICAgIGlmIGVsZW1lbnQuY2hpbGROb2Rlc1swXS5kYXRhLmVuZHN3aXRoKCd0YXIuZ3onKToK KyAgICAgICAgICAgICAgICAgICAgZXh0ZW5zaW9uID0gJ3Rhci5neicKKyAgICAgICAgICAgICAg ICBlbGlmIGVsZW1lbnQuY2hpbGROb2Rlc1swXS5kYXRhLmVuZHN3aXRoKCcuemlwJyk6CisgICAg ICAgICAgICAgICAgICAgIGV4dGVuc2lvbiA9ICd6aXAnCisgICAgICAgICAgICAgICAgZWxzZToK ICAgICAgICAgICAgICAgICAgICAgY29udGludWUKIAogICAgICAgICAgICAgICAgIHJlcXVpcmVz ID0gYXR0cmlidXRlcy5nZXQoJ2RhdGEtcmVxdWlyZXMtcHl0aG9uJykKICAgICAgICAgICAgICAg ICBpZiByZXF1aXJlcyBhbmQgbm90IEF1dG9JbnN0YWxsLnZlcnNpb24ubWF0Y2hlcyhyZXF1aXJl cyk6CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAKLSAgICAgICAgICAgICAgICB2ZXJz aW9uX2NhbmRpZGF0ZSA9IHJlLnNlYXJjaChyJ1xkK1wuXGQrXC5cZCsnLCBlbGVtZW50LmNoaWxk Tm9kZXNbMF0uZGF0YSkKKyAgICAgICAgICAgICAgICB2ZXJzaW9uX2NhbmRpZGF0ZSA9IHJlLnNl YXJjaChyJ1xkK1wuXGQrKFwuXGQrKT8nLCBlbGVtZW50LmNoaWxkTm9kZXNbMF0uZGF0YSkKICAg ICAgICAgICAgICAgICBpZiBub3QgdmVyc2lvbl9jYW5kaWRhdGU6CiAgICAgICAgICAgICAgICAg ICAgIGNvbnRpbnVlCiAgICAgICAgICAgICAgICAgdmVyc2lvbiA9IFZlcnNpb24oKnZlcnNpb25f Y2FuZGlkYXRlLmdyb3VwKCkuc3BsaXQoJy4nKSkKQEAgLTE0MSw2ICsxNTcsNyBAQCBjbGFzcyBQ YWNrYWdlKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgIG5hbWU9c2VsZi5weXBpX25hbWUs CiAgICAgICAgICAgICAgICAgICAgIGxpbms9bGluaywKICAgICAgICAgICAgICAgICAgICAgdmVy c2lvbj12ZXJzaW9uLAorICAgICAgICAgICAgICAgICAgICBleHRlbnNpb249ZXh0ZW5zaW9uLAog ICAgICAgICAgICAgICAgICkpCiAKICAgICAgICAgICAgIHNlbGYuX2FyY2hpdmVzID0gc29ydGVk KHNlbGYuX2FyY2hpdmVzLCBrZXk9bGFtYmRhIGFyY2hpdmU6IGFyY2hpdmUudmVyc2lvbikKQEAg LTE2MywyNiArMTgwLDc1IEBAIGNsYXNzIFBhY2thZ2Uob2JqZWN0KToKICAgICAgICAgaWYgc2Vs Zi5pc19jYWNoZWQoKToKICAgICAgICAgICAgIHJldHVybgogCisgICAgICAgICMgTWFrZSBzdXJl IHRoYXQgc2V0dXB0b29scyBhcmUgaW5zdGFsbGVkLCBzaW5jZSBzZXR1cC5weSByZWxpZXMgb24g aXQKKyAgICAgICAgaWYgc2VsZi5uYW1lICE9ICdzZXR1cHRvb2xzJzoKKyAgICAgICAgICAgIEF1 dG9JbnN0YWxsLmluc3RhbGwoJ3NldHVwdG9vbHMnKQorCiAgICAgICAgIGlmIG5vdCBzZWxmLmFy Y2hpdmVzKCk6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdObyBhcmNoaXZlcyBmb3Ig e30te30gZm91bmQnLmZvcm1hdChzZWxmLnB5cGlfbmFtZSwgc2VsZi52ZXJzaW9uKSkKICAgICAg ICAgYXJjaGl2ZSA9IHNlbGYuYXJjaGl2ZXMoKVstMV0KIAogICAgICAgICB0cnk6CisgICAgICAg ICAgICBpbnN0YWxsX2xvY2F0aW9uID0gb3MucGF0aC5kaXJuYW1lKHNlbGYubG9jYXRpb24pCisg ICAgICAgICAgICBzaHV0aWwucm10cmVlKHNlbGYubG9jYXRpb24sIGlnbm9yZV9lcnJvcnM9VHJ1 ZSkKKyAgICAgICAgICAgIGFscmVhZHlfb3duZWQgPSBzZXQob3MubGlzdGRpcihpbnN0YWxsX2xv Y2F0aW9uKSkKKwogICAgICAgICAgICAgbG9nLndhcm5pbmcoJ0luc3RhbGxpbmcge30uLi4nLmZv cm1hdChhcmNoaXZlKSkKICAgICAgICAgICAgIGFyY2hpdmUuZG93bmxvYWQoKQogCiAgICAgICAg ICAgICB0ZW1wX2xvY2F0aW9uID0gJ3t9LnRtcCcuZm9ybWF0KHNlbGYubG9jYXRpb24pCiAgICAg ICAgICAgICBhcmNoaXZlLnVucGFjayh0ZW1wX2xvY2F0aW9uKQogCi0gICAgICAgICAgICBzaHV0 aWwucm10cmVlKHNlbGYubG9jYXRpb24sIGlnbm9yZV9lcnJvcnM9VHJ1ZSkKLSAgICAgICAgICAg IHNodXRpbC5tb3ZlKG9zLnBhdGguam9pbih0ZW1wX2xvY2F0aW9uLCBzdHIoYXJjaGl2ZSksIHNl bGYubmFtZSksIHNlbGYubG9jYXRpb24pCisgICAgICAgICAgICBmb3IgY2FuZGlkYXRlIGluIFsK KyAgICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4odGVtcF9sb2NhdGlvbiwgc3RyKGFyY2hpdmUp KSwKKyAgICAgICAgICAgICAgICBvcy5wYXRoLmpvaW4odGVtcF9sb2NhdGlvbiwgJ3t9LXt9Lnt9 Jy5mb3JtYXQoYXJjaGl2ZS5uYW1lLCBhcmNoaXZlLnZlcnNpb24ubWFqb3IsIGFyY2hpdmUudmVy c2lvbi5taW5vcikpLAorICAgICAgICAgICAgXToKKyAgICAgICAgICAgICAgICBpZiBub3Qgb3Mu cGF0aC5leGlzdHMob3MucGF0aC5qb2luKGNhbmRpZGF0ZSwgJ3NldHVwLnB5JykpOgorICAgICAg ICAgICAgICAgICAgICBjb250aW51ZQorCisgICAgICAgICAgICAgICAgbG9nLndhcm5pbmcoJ0lu c3RhbGxpbmcge30uLi4nLmZvcm1hdChhcmNoaXZlKSkKKworICAgICAgICAgICAgICAgIGlmIHNl bGYuc2xvd19pbnN0YWxsOgorICAgICAgICAgICAgICAgICAgICBsb2cud2FybmluZygne30gaXMg a25vd24gdG8gYmUgc2xvdyB0byBpbnN0YWxsJy5mb3JtYXQoYXJjaGl2ZSkpCisKKyAgICAgICAg ICAgICAgICB3aXRoIG9wZW4ob3MuZGV2bnVsbCwgJ3cnKSBhcyBkZXZudWxsOgorICAgICAgICAg ICAgICAgICAgICBzdWJwcm9jZXNzLmNoZWNrX2NhbGwoCisgICAgICAgICAgICAgICAgICAgICAg ICBbCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3lzLmV4ZWN1dGFibGUsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgb3MucGF0aC5qb2luKGNhbmRpZGF0ZSwgJ3NldHVwLnB5Jyks CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2luc3RhbGwnLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICctLWhvbWU9e30nLmZvcm1hdChpbnN0YWxsX2xvY2F0aW9uKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnLS1yb290PS8nLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICctLXNpbmdsZS12ZXJzaW9uLWV4dGVybmFsbHktbWFuYWdlZCcsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJy0taW5zdGFsbC1saWI9e30nLmZvcm1hdChpbnN0YWxsX2xvY2F0 aW9uKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1pbnN0YWxsLXNjcmlwdHM9e30n LmZvcm1hdChpbnN0YWxsX2xvY2F0aW9uKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAn LS1pbnN0YWxsLWRhdGE9e30nLmZvcm1hdChvcy5wYXRoLmpvaW4oaW5zdGFsbF9sb2NhdGlvbiwg J2RhdGEnKSksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy0taW5zdGFsbC1oZWFkZXJz PXt9Jy5mb3JtYXQob3MucGF0aC5qb2luKGluc3RhbGxfbG9jYXRpb24sICdoZWFkZXJzJykpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICMgRG8gbm90IGF1dG9tYXRpY2FsbHkgaW5zdGFs bCBwYWNrYWdlIGRlcGVuZGVuY2llcywgZm9yY2Ugc2NyaXB0cyB0byBiZSBleHBsaWNpdAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICMgRXZlbiB3aXRob3V0IHRoaXMgZmxhZywgc2V0dXAu cHkgaXMgbm90IGNvbnNpc3RlbnQgYWJvdXQgaW5zdGFsbGluZyBkZXBlbmRlbmNpZXMuCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJy0tb2xkLWFuZC11bm1hbmFnZWFibGUnLAorICAgICAg ICAgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGN3ZD1jYW5kaWRh dGUsCisgICAgICAgICAgICAgICAgICAgICAgICBlbnY9ZGljdCgKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICBQQVRIPW9zLmVudmlyb24uZ2V0KCdQQVRIJywgJycpLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFBBVEhFWFQ9b3MuZW52aXJvbi5nZXQoJ1BBVEhFWFQnLCAnJyksCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgUFlUSE9OUEFUSD1pbnN0YWxsX2xvY2F0aW9uLAor ICAgICAgICAgICAgICAgICAgICAgICAgKSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHN0ZG91 dD1kZXZudWxsLAorICAgICAgICAgICAgICAgICAgICAgICAgc3RkZXJyPWRldm51bGwsCisgICAg ICAgICAgICAgICAgICAgICkKKworICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgICAgICBl bHNlOgorICAgICAgICAgICAgICAgIHJhaXNlIE9TRXJyb3IoJ0Nhbm5vdCBpbnN0YWxsIHt9LCBj b3VsZCBub3QgZmluZCBzZXR1cC5weScuZm9ybWF0KHNlbGYubmFtZSkpCiAKICAgICAgICAgICAg IHNlbGYuZG9fcG9zdF9pbnN0YWxsKHRlbXBfbG9jYXRpb24pCiAKICAgICAgICAgICAgIG9zLnJl bW92ZShhcmNoaXZlLnBhdGgpCiAgICAgICAgICAgICBzaHV0aWwucm10cmVlKHRlbXBfbG9jYXRp b24sIGlnbm9yZV9lcnJvcnM9VHJ1ZSkKIAotICAgICAgICAgICAgQXV0b0luc3RhbGwudXNlcnNw YWNlX3Nob3VsZF9vd24oc2VsZi5sb2NhdGlvbikKKyAgICAgICAgICAgIGZvciBpbnN0YWxsZWQg aW4gc2V0KG9zLmxpc3RkaXIoaW5zdGFsbF9sb2NhdGlvbikpIC0gYWxyZWFkeV9vd25lZDoKKyAg ICAgICAgICAgICAgICBBdXRvSW5zdGFsbC51c2Vyc3BhY2Vfc2hvdWxkX293bihvcy5wYXRoLmpv aW4oaW5zdGFsbF9sb2NhdGlvbiwgaW5zdGFsbGVkKSkKIAogICAgICAgICAgICAgQXV0b0luc3Rh bGwubWFuaWZlc3Rbc2VsZi5uYW1lXSA9IHsKICAgICAgICAgICAgICAgICAnaW5kZXgnOiBBdXRv SW5zdGFsbC5pbmRleCwK 405964 2020-08-04 17:22:01 -0700 2020-08-04 17:52:28 -0700 Patch bug-215067-20200804172200.patch text/plain 3540 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NTI2OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDIwLTA4LTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBVc2Ugc2V0dXAucHkgZm9yIHRoZSBhdXRvaW5z dGFsbGVyIChGb2xsb3ctdXAgZml4KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE1MDY3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NjQzMjcxOT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlw dHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHk6IFVuaWZ5 IHNldHVwLnB5IHZlcnNpb25zIGZvciBQeXRob24gMiBhbmQgMy4KKyAgICAgICAgKiBTY3JpcHRz L2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5OgorICAg ICAgICAoUGFja2FnZS5pbnN0YWxsKTogQ29udmVydCBkb3VibGUgYmFja3NsYXNoIHRvIGEgc2lu Z2xlIG9uZS4KKwogMjAyMC0wOC0wNCAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW2lPU10gQ2hlY2sgdGhhdCBBY2Nlc3NpYmlsaXR5IGlzIGVuYWJsZWQg d2hlbiByZWNlaXZpbmcgdGhlIGVuYWJsZSBBY2Nlc3NpYmlsaXR5IG5vdGlmaWNhdGlvbgpJbmRl eDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2lu aXRfXy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3Jl cHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CShyZXZpc2lvbiAyNjUyNjkpCisrKyBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CSh3 b3JraW5nIGNvcHkpCkBAIC0yOSwxNSArMjksMTMgQEAgbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIo J3dlYmtpdGNvcmVweScpCiBmcm9tIHdlYmtpdGNvcmVweS52ZXJzaW9uIGltcG9ydCBWZXJzaW9u CiBmcm9tIHdlYmtpdGNvcmVweS5zdHJpbmdfdXRpbHMgaW1wb3J0IEJ5dGVzSU8sIFN0cmluZ0lP LCBVbmljb2RlSU8sIHVuaWNvZGUKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwgMSwgMCkKK3ZlcnNp b24gPSBWZXJzaW9uKDAsIDEsIDEpCiAKIGZyb20gd2Via2l0Y29yZXB5LmF1dG9pbnN0YWxsIGlt cG9ydCBQYWNrYWdlLCBBdXRvSW5zdGFsbAogaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKToK ICAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb2NrJywgVmVyc2lvbig0KSkpCi0g ICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnc2V0dXB0b29scycsIFZlcnNpb24oNDEs IDIsICAwKSkpCiBlbHNlOgogICAgIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21vY2sn LCBWZXJzaW9uKDMsIDAsIDUpKSkKLSAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdz ZXR1cHRvb2xzJywgVmVyc2lvbig0MSwgMCwgMSkpKQogICAgIGlmIHBsYXRmb3JtLnN5c3RlbSgp ID09ICdXaW5kb3dzJzoKICAgICAgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnd2lu X2luZXRfcHRvbicsIFZlcnNpb24oMSwgMSwgMCksIHB5cGlfbmFtZT0nd2luLWluZXQtcHRvbicp KQogCkBAIC00Niw1ICs0NCw2IEBAIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2NoYXJk ZXQnLCAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Z1bmNzaWdzJywgVmVyc2lvbigx LCAwLCAyKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdpZG5hJywgVmVyc2lvbigy LCAxMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncmVxdWVzdHMnLCBWZXJzaW9u KDIsIDI0KSkpCitBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdzZXR1cHRvb2xzJywgVmVy c2lvbig0NCwgMSwgIDEpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3NvY2tzJywg VmVyc2lvbigxLCA3LCAxKSwgcHlwaV9uYW1lPSdQeVNvY2tzJykpCiBBdXRvSW5zdGFsbC5yZWdp c3RlcihQYWNrYWdlKCd1cmxsaWIzJywgVmVyc2lvbigxLCAyNSwgMTApKSkKSW5kZXg6IFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dl YmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQkocmV2aXNpb24gMjY1MjY5KQorKysgVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQko d29ya2luZyBjb3B5KQpAQCAtMjEzLDcgKzIxMyw3IEBAIGNsYXNzIFBhY2thZ2Uob2JqZWN0KToK IAogICAgICAgICAgICAgICAgIHdpdGggb3Blbihvcy5kZXZudWxsLCAndycpIGFzIGRldm51bGw6 CiAgICAgICAgICAgICAgICAgICAgIHN1YnByb2Nlc3MuY2hlY2tfY2FsbCgKLSAgICAgICAgICAg ICAgICAgICAgICAgIFsKKyAgICAgICAgICAgICAgICAgICAgICAgIFthcmcucmVwbGFjZSgnXFxc XCcsICdcXCcpIGZvciBhcmcgaW4gWwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN5cy5l eGVjdXRhYmxlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbihjYW5k aWRhdGUsICdzZXR1cC5weScpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICdpbnN0YWxs JywKQEAgLTIyNyw3ICsyMjcsNyBAQCBjbGFzcyBQYWNrYWdlKG9iamVjdCk6CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIyBEbyBub3QgYXV0b21hdGljYWxseSBpbnN0YWxsIHBhY2thZ2Ug ZGVwZW5kZW5jaWVzLCBmb3JjZSBzY3JpcHRzIHRvIGJlIGV4cGxpY2l0CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIyBFdmVuIHdpdGhvdXQgdGhpcyBmbGFnLCBzZXR1cC5weSBpcyBub3Qg Y29uc2lzdGVudCBhYm91dCBpbnN0YWxsaW5nIGRlcGVuZGVuY2llcy4KICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnLS1vbGQtYW5kLXVubWFuYWdlYWJsZScsCi0gICAgICAgICAgICAgICAg ICAgICAgICBdLAorICAgICAgICAgICAgICAgICAgICAgICAgXV0sCiAgICAgICAgICAgICAgICAg ICAgICAgICBjd2Q9Y2FuZGlkYXRlLAogICAgICAgICAgICAgICAgICAgICAgICAgZW52PWRpY3Qo CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUEFUSD1vcy5lbnZpcm9uLmdldCgnUEFUSCcs ICcnKSwK