223677 2021-03-24 00:25:39 -0700 Autoinstalling keyring-7.3.1 is failing with Python 2 2021-03-24 17:24:45 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=223609 InRadar P2 Normal --- 1 fujii jbedard aakash_jain dewei_zhu gsnedders jbedard webkit-bug-importer oldest_to_newest 1743184 0 fujii 2021-03-24 00:25:39 -0700 $ git clean -dfx $ Tools/Scripts/webkit-patch --help Downloading setuptools-44.1.1... Installing setuptools-44.1.1... Installed setuptools-44.1.1! Downloading wheel-0.35.1... Installing wheel-0.35.1... Installed wheel-0.35.1! Downloading six-1.15.0... Installing six-1.15.0... Installed six-1.15.0! Downloading whichcraft-0.6.1... Installing whichcraft-0.6.1... Installed whichcraft-0.6.1! Downloading fasteners-0.15.0... Installing fasteners-0.15.0... Installed fasteners-0.15.0! Downloading monotonic-1.5.0... Installing monotonic-1.5.0... Installed monotonic-1.5.0! Downloading requests-2.24.0... Installing requests-2.24.0... Installed requests-2.24.0! Downloading urllib3-1.25.10... Installing urllib3-1.25.10... Installed urllib3-1.25.10! Downloading chardet-3.0.4... Installing chardet-3.0.4... Installed chardet-3.0.4! Downloading certifi-2020.6.20... Installing certifi-2020.6.20... Installed certifi-2020.6.20! Downloading idna-2.10.0... Installing idna-2.10.0... Installed idna-2.10.0! Downloading PySocks-1.7.1... Installing PySocks-1.7.1... Installed PySocks-1.7.1! Downloading xmltodict-0.11.0... Installing xmltodict-0.11.0... Installed xmltodict-0.11.0! Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 42, in <module> from webkitpy.tool.main import WebKitPatch File "/mnt/c/home/webkit/ga/Tools/Scripts/webkitpy/tool/main.py", line 40, in <module> from webkitpy.tool import commands File "/mnt/c/home/webkit/ga/Tools/Scripts/webkitpy/tool/commands/__init__.py", line 4, in <module> from webkitpy.tool.commands.analyzechangelog import AnalyzeChangeLog File "/mnt/c/home/webkit/ga/Tools/Scripts/webkitpy/tool/commands/analyzechangelog.py", line 38, in <module> from webkitpy.tool import steps File "/mnt/c/home/webkit/ga/Tools/Scripts/webkitpy/tool/steps/__init__.py", line 56, in <module> from webkitpy.tool.steps.postdiffforrevert import PostDiffForRevert File "/mnt/c/home/webkit/ga/Tools/Scripts/webkitpy/tool/steps/postdiffforrevert.py", line 29, in <module> from webkitpy.common.net.bugzilla import Attachment File "/mnt/c/home/webkit/ga/Tools/Scripts/webkitpy/common/net/bugzilla/__init__.py", line 4, in <module> from webkitpy.common.net.bugzilla.bugzilla import Bugzilla File "/mnt/c/home/webkit/ga/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py", line 48, in <module> from webkitpy.common.net.credentials import Credentials File "/mnt/c/home/webkit/ga/Tools/Scripts/webkitpy/common/net/credentials.py", line 44, in <module> import keyring File "/mnt/c/home/webkit/ga/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py", line 560, in find_module cls.install(name) File "/mnt/c/home/webkit/ga/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py", line 544, in install return all([to_install.install() for to_install in cls.register(package)]) File "/mnt/c/home/webkit/ga/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py", line 302, in install stderr=setup_log, File "/usr/lib/python2.7/subprocess.py", line 190, in check_call raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['/usr/bin/python', '/tmp/keyring/keyring-7.3.1/setup.py', 'install', '--home=/mnt/c/home/webkit/ga/Tools/Scripts/libraries/autoinstalled/python-2', '--root=/', '--prefix=', '--install-lib=/mnt/c/home/webkit/ga/Tools/Scripts/libraries/autoinstalled/python-2', '--install-scripts=/mnt/c/home/webkit/ga/Tools/Scripts/libraries/autoinstalled/python-2/bin', '--install-data=/mnt/c/home/webkit/ga/Tools/Scripts/libraries/autoinstalled/python-2/data', '--install-headers=/mnt/c/home/webkit/ga/Tools/Scripts/libraries/autoinstalled/python-2/headers']' returned non-zero exit status 1 1743185 1 424100 fujii 2021-03-24 00:26:14 -0700 Created attachment 424100 /tmp/keyring/log.txt on Linux 1743186 2 424101 fujii 2021-03-24 00:28:50 -0700 Created attachment 424101 log.txt on Mac /var/folders/q5/96sxnd7x3sgf_j0pb5sz3yyw0000gp/T/keyring/log.txt 1743195 3 fujii 2021-03-24 00:36:19 -0700 This seems Python 2 specific. 1743305 4 gsnedders 2021-03-24 07:26:52 -0700 So the underlying problem is keyring has `setup_requires = setuptools_scm >= 1.15.0` in its setup.py, which leads to setuptools fetching the latest version of setuptools_scm, and setuptools_scm 6 which was released recently drops support for Python 2. I wonder if bug 223609 upgrading setuptools will aid this (but easy_install is deprecated so still might not have the awareness pip does of Python 2/3 compatibility)? 1743348 5 jbedard 2021-03-24 09:32:40 -0700 (In reply to Sam Sneddon [:gsnedders] from comment #4) > So the underlying problem is keyring has `setup_requires = setuptools_scm >= > 1.15.0` in its setup.py, which leads to setuptools fetching the latest > version of setuptools_scm, and setuptools_scm 6 which was released recently > drops support for Python 2. > > I wonder if bug 223609 upgrading setuptools will aid this (but easy_install > is deprecated so still might not have the awareness pip does of Python 2/3 > compatibility)? I'll mess with this a bit today, I see two solutions to this. One is to ensure that we have a newer setuptools that still supports Python 2, the other is to have an older keyring that doesn't require a newer setuptools. 1743497 6 webkit-bug-importer 2021-03-24 13:01:06 -0700 <rdar://problem/75800504> 1743534 7 424178 jbedard 2021-03-24 14:00:22 -0700 Created attachment 424178 Patch 1743587 8 jbedard 2021-03-24 16:06:00 -0700 The attached patch fixes the problem. It's inspired by Sam Sneddon's change in https://bugs.webkit.org/show_bug.cgi?id=223609, but I think we should land this independently because Sam's change needs to be checked against more platforms because it touches more. 1743588 9 424178 dewei_zhu 2021-03-24 16:08:04 -0700 Comment on attachment 424178 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424178&action=review r=me with comment. > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:235 > # Make sure that setuptools and wheel are installed, since setup.py relies on it We may want to update the comment here as well. 1743592 10 424198 jbedard 2021-03-24 16:20:50 -0700 Created attachment 424198 Patch for landing 1743615 11 ews-feeder 2021-03-24 17:24:44 -0700 Committed r274986: <https://commits.webkit.org/r274986> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424198. 424100 2021-03-24 00:26:14 -0700 2021-03-24 00:26:14 -0700 /tmp/keyring/log.txt on Linux log.txt text/plain 4825 fujii V0FSTklORzogVGhlIHBpcCBwYWNrYWdlIGlzIG5vdCBhdmFpbGFibGUsIGZhbGxpbmcgYmFjayB0 byBFYXN5SW5zdGFsbCBmb3IgaGFuZGxpbmcgc2V0dXBfcmVxdWlyZXMvdGVzdF9yZXF1aXJlczsg dGhpcyBpcyBkZXByZWNhdGVkIGFuZCB3aWxsIGJlIHJlbW92ZWQgaW4gYSBmdXR1cmUgdmVyc2lv bi4KL3RtcC9lYXN5X2luc3RhbGwtMnAza3J6L3NldHVwdG9vbHNfc2NtLTYuMC4xL3NyYwo8cGtn X3Jlc291cmNlcy5Xb3JraW5nU2V0IG9iamVjdCBhdCAweDdmNTc5ZmQ4OWM1MD4KVHJhY2ViYWNr IChtb3N0IHJlY2VudCBjYWxsIGxhc3QpOgogIEZpbGUgIi90bXAva2V5cmluZy9rZXlyaW5nLTcu My4xL3NldHVwLnB5IiwgbGluZSA4MCwgaW4gPG1vZHVsZT4KICAgIHNldHVwdG9vbHMuc2V0dXAo KipzZXR1cF9wYXJhbXMpCiAgRmlsZSAiL21udC9jL2hvbWUvd2Via2l0L2dhL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQvcHl0aG9uLTIvc2V0dXB0b29scy9fX2luaXRfXy5w eSIsIGxpbmUgMTYxLCBpbiBzZXR1cAogICAgX2luc3RhbGxfc2V0dXBfcmVxdWlyZXMoYXR0cnMp CiAgRmlsZSAiL21udC9jL2hvbWUvd2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL2F1 dG9pbnN0YWxsZWQvcHl0aG9uLTIvc2V0dXB0b29scy9fX2luaXRfXy5weSIsIGxpbmUgMTU2LCBp biBfaW5zdGFsbF9zZXR1cF9yZXF1aXJlcwogICAgZGlzdC5mZXRjaF9idWlsZF9lZ2dzKGRpc3Qu c2V0dXBfcmVxdWlyZXMpCiAgRmlsZSAiL21udC9jL2hvbWUvd2Via2l0L2dhL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQvcHl0aG9uLTIvc2V0dXB0b29scy9kaXN0LnB5Iiwg bGluZSA3MjEsIGluIGZldGNoX2J1aWxkX2VnZ3MKICAgIHJlcGxhY2VfY29uZmxpY3Rpbmc9VHJ1 ZSwKICBGaWxlICIvbW50L2MvaG9tZS93ZWJraXQvZ2EvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv YXV0b2luc3RhbGxlZC9weXRob24tMi9wa2dfcmVzb3VyY2VzL19faW5pdF9fLnB5IiwgbGluZSA3 ODIsIGluIHJlc29sdmUKICAgIHJlcGxhY2VfY29uZmxpY3Rpbmc9cmVwbGFjZV9jb25mbGljdGlu ZwogIEZpbGUgIi9tbnQvYy9ob21lL3dlYmtpdC9nYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9h dXRvaW5zdGFsbGVkL3B5dGhvbi0yL3BrZ19yZXNvdXJjZXMvX19pbml0X18ucHkiLCBsaW5lIDEw NjUsIGluIGJlc3RfbWF0Y2gKICAgIHJldHVybiBzZWxmLm9idGFpbihyZXEsIGluc3RhbGxlcikK ICBGaWxlICIvbW50L2MvaG9tZS93ZWJraXQvZ2EvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvYXV0 b2luc3RhbGxlZC9weXRob24tMi9wa2dfcmVzb3VyY2VzL19faW5pdF9fLnB5IiwgbGluZSAxMDc3 LCBpbiBvYnRhaW4KICAgIHJldHVybiBpbnN0YWxsZXIocmVxdWlyZW1lbnQpCiAgRmlsZSAiL21u dC9jL2hvbWUvd2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQv cHl0aG9uLTIvc2V0dXB0b29scy9kaXN0LnB5IiwgbGluZSA3NzcsIGluIGZldGNoX2J1aWxkX2Vn ZwogICAgcmV0dXJuIGZldGNoX2J1aWxkX2VnZyhzZWxmLCByZXEpCiAgRmlsZSAiL21udC9jL2hv bWUvd2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQvcHl0aG9u LTIvc2V0dXB0b29scy9pbnN0YWxsZXIucHkiLCBsaW5lIDcwLCBpbiBmZXRjaF9idWlsZF9lZ2cK ICAgIHJldHVybiBfbGVnYWN5X2ZldGNoX2J1aWxkX2VnZyhkaXN0LCByZXEpCiAgRmlsZSAiL21u dC9jL2hvbWUvd2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQv cHl0aG9uLTIvc2V0dXB0b29scy9pbnN0YWxsZXIucHkiLCBsaW5lIDUzLCBpbiBfbGVnYWN5X2Zl dGNoX2J1aWxkX2VnZwogICAgcmV0dXJuIGNtZC5lYXN5X2luc3RhbGwocmVxKQogIEZpbGUgIi9t bnQvYy9ob21lL3dlYmtpdC9nYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9hdXRvaW5zdGFsbGVk L3B5dGhvbi0yL3NldHVwdG9vbHMvY29tbWFuZC9lYXN5X2luc3RhbGwucHkiLCBsaW5lIDY4NSwg aW4gZWFzeV9pbnN0YWxsCiAgICByZXR1cm4gc2VsZi5pbnN0YWxsX2l0ZW0oc3BlYywgZGlzdC5s b2NhdGlvbiwgdG1wZGlyLCBkZXBzKQogIEZpbGUgIi9tbnQvYy9ob21lL3dlYmtpdC9nYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy9hdXRvaW5zdGFsbGVkL3B5dGhvbi0yL3NldHVwdG9vbHMvY29t bWFuZC9lYXN5X2luc3RhbGwucHkiLCBsaW5lIDcxMSwgaW4gaW5zdGFsbF9pdGVtCiAgICBkaXN0 cyA9IHNlbGYuaW5zdGFsbF9lZ2dzKHNwZWMsIGRvd25sb2FkLCB0bXBkaXIpCiAgRmlsZSAiL21u dC9jL2hvbWUvd2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQv cHl0aG9uLTIvc2V0dXB0b29scy9jb21tYW5kL2Vhc3lfaW5zdGFsbC5weSIsIGxpbmUgODk2LCBp biBpbnN0YWxsX2VnZ3MKICAgIHJldHVybiBzZWxmLmJ1aWxkX2FuZF9pbnN0YWxsKHNldHVwX3Nj cmlwdCwgc2V0dXBfYmFzZSkKICBGaWxlICIvbW50L2MvaG9tZS93ZWJraXQvZ2EvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvYXV0b2luc3RhbGxlZC9weXRob24tMi9zZXR1cHRvb2xzL2NvbW1hbmQv ZWFzeV9pbnN0YWxsLnB5IiwgbGluZSAxMTY0LCBpbiBidWlsZF9hbmRfaW5zdGFsbAogICAgc2Vs Zi5ydW5fc2V0dXAoc2V0dXBfc2NyaXB0LCBzZXR1cF9iYXNlLCBhcmdzKQogIEZpbGUgIi9tbnQv Yy9ob21lL3dlYmtpdC9nYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9hdXRvaW5zdGFsbGVkL3B5 dGhvbi0yL3NldHVwdG9vbHMvY29tbWFuZC9lYXN5X2luc3RhbGwucHkiLCBsaW5lIDExNTAsIGlu IHJ1bl9zZXR1cAogICAgcnVuX3NldHVwKHNldHVwX3NjcmlwdCwgYXJncykKICBGaWxlICIvbW50 L2MvaG9tZS93ZWJraXQvZ2EvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvYXV0b2luc3RhbGxlZC9w eXRob24tMi9zZXR1cHRvb2xzL3NhbmRib3gucHkiLCBsaW5lIDI1MywgaW4gcnVuX3NldHVwCiAg ICByYWlzZQogIEZpbGUgIi91c3IvbGliL3B5dGhvbjIuNy9jb250ZXh0bGliLnB5IiwgbGluZSAz NSwgaW4gX19leGl0X18KICAgIHNlbGYuZ2VuLnRocm93KHR5cGUsIHZhbHVlLCB0cmFjZWJhY2sp CiAgRmlsZSAiL21udC9jL2hvbWUvd2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL2F1 dG9pbnN0YWxsZWQvcHl0aG9uLTIvc2V0dXB0b29scy9zYW5kYm94LnB5IiwgbGluZSAxOTUsIGlu IHNldHVwX2NvbnRleHQKICAgIHlpZWxkCiAgRmlsZSAiL3Vzci9saWIvcHl0aG9uMi43L2NvbnRl eHRsaWIucHkiLCBsaW5lIDM1LCBpbiBfX2V4aXRfXwogICAgc2VsZi5nZW4udGhyb3codHlwZSwg dmFsdWUsIHRyYWNlYmFjaykKICBGaWxlICIvbW50L2MvaG9tZS93ZWJraXQvZ2EvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvYXV0b2luc3RhbGxlZC9weXRob24tMi9zZXR1cHRvb2xzL3NhbmRib3gu cHkiLCBsaW5lIDE2NiwgaW4gc2F2ZV9tb2R1bGVzCiAgICBzYXZlZF9leGMucmVzdW1lKCkKICBG aWxlICIvbW50L2MvaG9tZS93ZWJraXQvZ2EvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvYXV0b2lu c3RhbGxlZC9weXRob24tMi9zZXR1cHRvb2xzL3NhbmRib3gucHkiLCBsaW5lIDE0MSwgaW4gcmVz dW1lCiAgICBzaXgucmVyYWlzZSh0eXBlLCBleGMsIHNlbGYuX3RiKQogIEZpbGUgIi9tbnQvYy9o b21lL3dlYmtpdC9nYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9hdXRvaW5zdGFsbGVkL3B5dGhv bi0yL3NldHVwdG9vbHMvc2FuZGJveC5weSIsIGxpbmUgMTU0LCBpbiBzYXZlX21vZHVsZXMKICAg IHlpZWxkIHNhdmVkCiAgRmlsZSAiL21udC9jL2hvbWUvd2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL2F1dG9pbnN0YWxsZWQvcHl0aG9uLTIvc2V0dXB0b29scy9zYW5kYm94LnB5Iiwg bGluZSAxOTUsIGluIHNldHVwX2NvbnRleHQKICAgIHlpZWxkCiAgRmlsZSAiL21udC9jL2hvbWUv d2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQvcHl0aG9uLTIv c2V0dXB0b29scy9zYW5kYm94LnB5IiwgbGluZSAyNTAsIGluIHJ1bl9zZXR1cAogICAgX2V4ZWNm aWxlKHNldHVwX3NjcmlwdCwgbnMpCiAgRmlsZSAiL21udC9jL2hvbWUvd2Via2l0L2dhL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQvcHl0aG9uLTIvc2V0dXB0b29scy9zYW5k Ym94LnB5IiwgbGluZSA0NSwgaW4gX2V4ZWNmaWxlCiAgICBleGVjKGNvZGUsIGdsb2JhbHMsIGxv Y2FscykKICBGaWxlICIvdG1wL2Vhc3lfaW5zdGFsbC0ycDNrcnovc2V0dXB0b29sc19zY20tNi4w LjEvc2V0dXAucHkiLCBsaW5lIDUyLCBpbiA8bW9kdWxlPgogICAgXSwKICBGaWxlICIvdG1wL2Vh c3lfaW5zdGFsbC0ycDNrcnovc2V0dXB0b29sc19zY20tNi4wLjEvc2V0dXAucHkiLCBsaW5lIDI5 LCBpbiBzY21fY29uZmlnCiAgICAKICBGaWxlICIvdG1wL2Vhc3lfaW5zdGFsbC0ycDNrcnovc2V0 dXB0b29sc19zY20tNi4wLjEvc3JjL3NldHVwdG9vbHNfc2NtL19faW5pdF9fLnB5IiwgbGluZSA4 LCBpbiA8bW9kdWxlPgogIEZpbGUgIi90bXAvZWFzeV9pbnN0YWxsLTJwM2tyei9zZXR1cHRvb2xz X3NjbS02LjAuMS9zcmMvc2V0dXB0b29sc19zY20vY29uZmlnLnB5IiwgbGluZSA2LCBpbiA8bW9k dWxlPgogIEZpbGUgIi90bXAvZWFzeV9pbnN0YWxsLTJwM2tyei9zZXR1cHRvb2xzX3NjbS02LjAu MS9zcmMvc2V0dXB0b29sc19zY20vdXRpbHMucHkiLCBsaW5lIDQxCiAgICBwcmludCgqaykKICAg ICAgICAgIF4KU3ludGF4RXJyb3I6IGludmFsaWQgc3ludGF4Cg== 424101 2021-03-24 00:28:50 -0700 2021-03-24 00:28:50 -0700 log.txt on Mac log.txt text/plain 5014 fujii V0FSTklORzogVGhlIHBpcCBwYWNrYWdlIGlzIG5vdCBhdmFpbGFibGUsIGZhbGxpbmcgYmFjayB0 byBFYXN5SW5zdGFsbCBmb3IgaGFuZGxpbmcgc2V0dXBfcmVxdWlyZXMvdGVzdF9yZXF1aXJlczsg dGhpcyBpcyBkZXByZWNhdGVkIGFuZCB3aWxsIGJlIHJlbW92ZWQgaW4gYSBmdXR1cmUgdmVyc2lv bi4KL3RtcC9lYXN5X2luc3RhbGwtcThsZDk0L3NldHVwdG9vbHNfc2NtLTYuMC4xL3NyYwo8cGtn X3Jlc291cmNlcy5Xb3JraW5nU2V0IG9iamVjdCBhdCAweDEwMmZhYTM1MD4KVHJhY2ViYWNrICht b3N0IHJlY2VudCBjYWxsIGxhc3QpOgogIEZpbGUgIi92YXIvZm9sZGVycy9xNS85NnN4bmQ3eDNz Z2ZfajBwYjVzejN5eXcwMDAwZ3AvVC9rZXlyaW5nL2tleXJpbmctNy4zLjEvc2V0dXAucHkiLCBs aW5lIDgwLCBpbiA8bW9kdWxlPgogICAgc2V0dXB0b29scy5zZXR1cCgqKnNldHVwX3BhcmFtcykK ICBGaWxlICIvVm9sdW1lcy9EYXRhL3dlYmtpdC9nYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9h dXRvaW5zdGFsbGVkL3B5dGhvbi0yL3NldHVwdG9vbHMvX19pbml0X18ucHkiLCBsaW5lIDE2MSwg aW4gc2V0dXAKICAgIF9pbnN0YWxsX3NldHVwX3JlcXVpcmVzKGF0dHJzKQogIEZpbGUgIi9Wb2x1 bWVzL0RhdGEvd2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQv cHl0aG9uLTIvc2V0dXB0b29scy9fX2luaXRfXy5weSIsIGxpbmUgMTU2LCBpbiBfaW5zdGFsbF9z ZXR1cF9yZXF1aXJlcwogICAgZGlzdC5mZXRjaF9idWlsZF9lZ2dzKGRpc3Quc2V0dXBfcmVxdWly ZXMpCiAgRmlsZSAiL1ZvbHVtZXMvRGF0YS93ZWJraXQvZ2EvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvYXV0b2luc3RhbGxlZC9weXRob24tMi9zZXR1cHRvb2xzL2Rpc3QucHkiLCBsaW5lIDcyMSwg aW4gZmV0Y2hfYnVpbGRfZWdncwogICAgcmVwbGFjZV9jb25mbGljdGluZz1UcnVlLAogIEZpbGUg Ii9Wb2x1bWVzL0RhdGEvd2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL2F1dG9pbnN0 YWxsZWQvcHl0aG9uLTIvcGtnX3Jlc291cmNlcy9fX2luaXRfXy5weSIsIGxpbmUgNzgyLCBpbiBy ZXNvbHZlCiAgICByZXBsYWNlX2NvbmZsaWN0aW5nPXJlcGxhY2VfY29uZmxpY3RpbmcKICBGaWxl ICIvVm9sdW1lcy9EYXRhL3dlYmtpdC9nYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9hdXRvaW5z dGFsbGVkL3B5dGhvbi0yL3BrZ19yZXNvdXJjZXMvX19pbml0X18ucHkiLCBsaW5lIDEwNjUsIGlu IGJlc3RfbWF0Y2gKICAgIHJldHVybiBzZWxmLm9idGFpbihyZXEsIGluc3RhbGxlcikKICBGaWxl ICIvVm9sdW1lcy9EYXRhL3dlYmtpdC9nYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9hdXRvaW5z dGFsbGVkL3B5dGhvbi0yL3BrZ19yZXNvdXJjZXMvX19pbml0X18ucHkiLCBsaW5lIDEwNzcsIGlu IG9idGFpbgogICAgcmV0dXJuIGluc3RhbGxlcihyZXF1aXJlbWVudCkKICBGaWxlICIvVm9sdW1l cy9EYXRhL3dlYmtpdC9nYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9hdXRvaW5zdGFsbGVkL3B5 dGhvbi0yL3NldHVwdG9vbHMvZGlzdC5weSIsIGxpbmUgNzc3LCBpbiBmZXRjaF9idWlsZF9lZ2cK ICAgIHJldHVybiBmZXRjaF9idWlsZF9lZ2coc2VsZiwgcmVxKQogIEZpbGUgIi9Wb2x1bWVzL0Rh dGEvd2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQvcHl0aG9u LTIvc2V0dXB0b29scy9pbnN0YWxsZXIucHkiLCBsaW5lIDcwLCBpbiBmZXRjaF9idWlsZF9lZ2cK ICAgIHJldHVybiBfbGVnYWN5X2ZldGNoX2J1aWxkX2VnZyhkaXN0LCByZXEpCiAgRmlsZSAiL1Zv bHVtZXMvRGF0YS93ZWJraXQvZ2EvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvYXV0b2luc3RhbGxl ZC9weXRob24tMi9zZXR1cHRvb2xzL2luc3RhbGxlci5weSIsIGxpbmUgNTMsIGluIF9sZWdhY3lf ZmV0Y2hfYnVpbGRfZWdnCiAgICByZXR1cm4gY21kLmVhc3lfaW5zdGFsbChyZXEpCiAgRmlsZSAi L1ZvbHVtZXMvRGF0YS93ZWJraXQvZ2EvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvYXV0b2luc3Rh bGxlZC9weXRob24tMi9zZXR1cHRvb2xzL2NvbW1hbmQvZWFzeV9pbnN0YWxsLnB5IiwgbGluZSA2 ODUsIGluIGVhc3lfaW5zdGFsbAogICAgcmV0dXJuIHNlbGYuaW5zdGFsbF9pdGVtKHNwZWMsIGRp c3QubG9jYXRpb24sIHRtcGRpciwgZGVwcykKICBGaWxlICIvVm9sdW1lcy9EYXRhL3dlYmtpdC9n YS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9hdXRvaW5zdGFsbGVkL3B5dGhvbi0yL3NldHVwdG9v bHMvY29tbWFuZC9lYXN5X2luc3RhbGwucHkiLCBsaW5lIDcxMSwgaW4gaW5zdGFsbF9pdGVtCiAg ICBkaXN0cyA9IHNlbGYuaW5zdGFsbF9lZ2dzKHNwZWMsIGRvd25sb2FkLCB0bXBkaXIpCiAgRmls ZSAiL1ZvbHVtZXMvRGF0YS93ZWJraXQvZ2EvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvYXV0b2lu c3RhbGxlZC9weXRob24tMi9zZXR1cHRvb2xzL2NvbW1hbmQvZWFzeV9pbnN0YWxsLnB5IiwgbGlu ZSA4OTYsIGluIGluc3RhbGxfZWdncwogICAgcmV0dXJuIHNlbGYuYnVpbGRfYW5kX2luc3RhbGwo c2V0dXBfc2NyaXB0LCBzZXR1cF9iYXNlKQogIEZpbGUgIi9Wb2x1bWVzL0RhdGEvd2Via2l0L2dh L1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQvcHl0aG9uLTIvc2V0dXB0b29s cy9jb21tYW5kL2Vhc3lfaW5zdGFsbC5weSIsIGxpbmUgMTE2NCwgaW4gYnVpbGRfYW5kX2luc3Rh bGwKICAgIHNlbGYucnVuX3NldHVwKHNldHVwX3NjcmlwdCwgc2V0dXBfYmFzZSwgYXJncykKICBG aWxlICIvVm9sdW1lcy9EYXRhL3dlYmtpdC9nYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9hdXRv aW5zdGFsbGVkL3B5dGhvbi0yL3NldHVwdG9vbHMvY29tbWFuZC9lYXN5X2luc3RhbGwucHkiLCBs aW5lIDExNTAsIGluIHJ1bl9zZXR1cAogICAgcnVuX3NldHVwKHNldHVwX3NjcmlwdCwgYXJncykK ICBGaWxlICIvVm9sdW1lcy9EYXRhL3dlYmtpdC9nYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9h dXRvaW5zdGFsbGVkL3B5dGhvbi0yL3NldHVwdG9vbHMvc2FuZGJveC5weSIsIGxpbmUgMjUzLCBp biBydW5fc2V0dXAKICAgIHJhaXNlCiAgRmlsZSAiL1N5c3RlbS9MaWJyYXJ5L0ZyYW1ld29ya3Mv UHl0aG9uLmZyYW1ld29yay9WZXJzaW9ucy8yLjcvbGliL3B5dGhvbjIuNy9jb250ZXh0bGliLnB5 IiwgbGluZSAzNSwgaW4gX19leGl0X18KICAgIHNlbGYuZ2VuLnRocm93KHR5cGUsIHZhbHVlLCB0 cmFjZWJhY2spCiAgRmlsZSAiL1ZvbHVtZXMvRGF0YS93ZWJraXQvZ2EvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvYXV0b2luc3RhbGxlZC9weXRob24tMi9zZXR1cHRvb2xzL3NhbmRib3gucHkiLCBs aW5lIDE5NSwgaW4gc2V0dXBfY29udGV4dAogICAgeWllbGQKICBGaWxlICIvU3lzdGVtL0xpYnJh cnkvRnJhbWV3b3Jrcy9QeXRob24uZnJhbWV3b3JrL1ZlcnNpb25zLzIuNy9saWIvcHl0aG9uMi43 L2NvbnRleHRsaWIucHkiLCBsaW5lIDM1LCBpbiBfX2V4aXRfXwogICAgc2VsZi5nZW4udGhyb3co dHlwZSwgdmFsdWUsIHRyYWNlYmFjaykKICBGaWxlICIvVm9sdW1lcy9EYXRhL3dlYmtpdC9nYS9U b29scy9TY3JpcHRzL2xpYnJhcmllcy9hdXRvaW5zdGFsbGVkL3B5dGhvbi0yL3NldHVwdG9vbHMv c2FuZGJveC5weSIsIGxpbmUgMTY2LCBpbiBzYXZlX21vZHVsZXMKICAgIHNhdmVkX2V4Yy5yZXN1 bWUoKQogIEZpbGUgIi9Wb2x1bWVzL0RhdGEvd2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMvbGlicmFy aWVzL2F1dG9pbnN0YWxsZWQvcHl0aG9uLTIvc2V0dXB0b29scy9zYW5kYm94LnB5IiwgbGluZSAx NDEsIGluIHJlc3VtZQogICAgc2l4LnJlcmFpc2UodHlwZSwgZXhjLCBzZWxmLl90YikKICBGaWxl ICIvVm9sdW1lcy9EYXRhL3dlYmtpdC9nYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9hdXRvaW5z dGFsbGVkL3B5dGhvbi0yL3NldHVwdG9vbHMvc2FuZGJveC5weSIsIGxpbmUgMTU0LCBpbiBzYXZl X21vZHVsZXMKICAgIHlpZWxkIHNhdmVkCiAgRmlsZSAiL1ZvbHVtZXMvRGF0YS93ZWJraXQvZ2Ev VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvYXV0b2luc3RhbGxlZC9weXRob24tMi9zZXR1cHRvb2xz L3NhbmRib3gucHkiLCBsaW5lIDE5NSwgaW4gc2V0dXBfY29udGV4dAogICAgeWllbGQKICBGaWxl ICIvVm9sdW1lcy9EYXRhL3dlYmtpdC9nYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy9hdXRvaW5z dGFsbGVkL3B5dGhvbi0yL3NldHVwdG9vbHMvc2FuZGJveC5weSIsIGxpbmUgMjUwLCBpbiBydW5f c2V0dXAKICAgIF9leGVjZmlsZShzZXR1cF9zY3JpcHQsIG5zKQogIEZpbGUgIi9Wb2x1bWVzL0Rh dGEvd2Via2l0L2dhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL2F1dG9pbnN0YWxsZWQvcHl0aG9u LTIvc2V0dXB0b29scy9zYW5kYm94LnB5IiwgbGluZSA0NSwgaW4gX2V4ZWNmaWxlCiAgICBleGVj KGNvZGUsIGdsb2JhbHMsIGxvY2FscykKICBGaWxlICIvdG1wL2Vhc3lfaW5zdGFsbC1xOGxkOTQv c2V0dXB0b29sc19zY20tNi4wLjEvc2V0dXAucHkiLCBsaW5lIDUyLCBpbiA8bW9kdWxlPgogICAg XSwKICBGaWxlICIvdG1wL2Vhc3lfaW5zdGFsbC1xOGxkOTQvc2V0dXB0b29sc19zY20tNi4wLjEv c2V0dXAucHkiLCBsaW5lIDI5LCBpbiBzY21fY29uZmlnCiAgICAKICBGaWxlICIvdG1wL2Vhc3lf aW5zdGFsbC1xOGxkOTQvc2V0dXB0b29sc19zY20tNi4wLjEvc3JjL3NldHVwdG9vbHNfc2NtL19f aW5pdF9fLnB5IiwgbGluZSA4LCBpbiA8bW9kdWxlPgogIEZpbGUgIi90bXAvZWFzeV9pbnN0YWxs LXE4bGQ5NC9zZXR1cHRvb2xzX3NjbS02LjAuMS9zcmMvc2V0dXB0b29sc19zY20vY29uZmlnLnB5 IiwgbGluZSA2LCBpbiA8bW9kdWxlPgogIEZpbGUgIi90bXAvZWFzeV9pbnN0YWxsLXE4bGQ5NC9z ZXR1cHRvb2xzX3NjbS02LjAuMS9zcmMvc2V0dXB0b29sc19zY20vdXRpbHMucHkiLCBsaW5lIDQx CiAgICBwcmludCgqaykKICAgICAgICAgIF4KU3ludGF4RXJyb3I6IGludmFsaWQgc3ludGF4Cg== 424178 2021-03-24 14:00:22 -0700 2021-03-24 16:20:47 -0700 Patch bug-223677-20210324140020.patch text/plain 3741 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0OTY5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjEyOGRhYWQwYTkyNmYxMzkwMWJmMzEyMDEyNjQ0N2M3 NWRkNzIyOC4uMjVkYTVlNWRjMzIwZDZjZWI4OTM5ZjViMzhkNjhjNzE4MmUwZjFmMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTAzLTI0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBBdXRvaW5zdGFsbGluZyBrZXlyaW5nLTcuMy4xIGlzIGZhaWxpbmcgd2l0aCBQeXRo b24gMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIz Njc3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NTgwMDUwND4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtp dGNvcmVweS9zZXR1cC5weTogQnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHk6IEJ1bXAgdmVyc2lvbiwg YWRkIHNldHVwdG9vbHNfc2NtLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNv cmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHk6CisgICAgICAgIChQYWNrYWdlLmluc3Rh bGwpOiBBbHdheXMgaW5zdGFsbCBzZXR1cHRvb2xzX3NjbS4KKwogMjAyMS0wMy0yNCAgQ2hyaXMg RmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBBZGQgZnVuY3Rp b25zIHJlY3RzRm9yVGV4dE1hcmtlclJhbmdlIGZvciB0ZXN0aW5nCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0dXAucHkgYi9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0dXAucHkKaW5kZXggYjk0ODdhZjQxZTUzYmZiMDhk MjdlNzc1MDU2OThmYjg2NTIyMDAxNi4uMjQxODFlNTAwYWM2MzIxNGVlYjU2YzM3MWFlNjdlZTZl Mjk2YWEzZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5 L3NldHVwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1 cC5weQpAQCAtMzAsNyArMzAsNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9 J3dlYmtpdGNvcmVweScsCi0gICAgdmVyc2lvbj0nMC41LjYnLAorICAgIHZlcnNpb249JzAuNS43 JywKICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBjb250YWluaW5nIHZhcmlvdXMgUHl0aG9uIHN1 cHBvcnQgY2xhc3NlcyBhbmQgZnVuY3Rpb25zLicsCiAgICAgbG9uZ19kZXNjcmlwdGlvbj1yZWFk bWUoKSwKICAgICBjbGFzc2lmaWVycz1bCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQppbmRleCA5 MzdhM2JkZjc5ZmI3MGE1ZTA4MDNkMjFhYjcwMzhhNTBmOWJmMThlLi5hMjE2NjFhN2Y2MDhhMzk0 NTg5YjJiYjk1ODJmMDljNTBlYTRkYWY1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkKQEAg LTM3LDcgKzM3LDcgQEAgZnJvbSB3ZWJraXRjb3JlcHkub3V0cHV0X2NhcHR1cmUgaW1wb3J0IExv Z2dlckNhcHR1cmUsIE91dHB1dENhcHR1cmUsIE91dHB1dER1cGwKIGZyb20gd2Via2l0Y29yZXB5 LnRhc2tfcG9vbCBpbXBvcnQgVGFza1Bvb2wKIGZyb20gd2Via2l0Y29yZXB5LmNyZWRlbnRpYWxz IGltcG9ydCBjcmVkZW50aWFscwogCi12ZXJzaW9uID0gVmVyc2lvbigwLCA1LCA2KQordmVyc2lv biA9IFZlcnNpb24oMCwgNSwgNykKIAogZnJvbSB3ZWJraXRjb3JlcHkuYXV0b2luc3RhbGwgaW1w b3J0IFBhY2thZ2UsIEF1dG9JbnN0YWxsCiBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApOgpA QCAtNTcsNyArNTcsOCBAQCBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdrZXlyaW5nJywg VmVyc2lvbig3LCAzLCAxKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdwYWNrYWdp bmcnLCBWZXJzaW9uKDIwLCA0KSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdweXBh cnNpbmcnLCBWZXJzaW9uKDIsIDQsIDcpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2Uo J3JlcXVlc3RzJywgVmVyc2lvbigyLCAyNCkpKQotQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2Fn ZSgnc2V0dXB0b29scycsIFZlcnNpb24oNDQsIDEsICAxKSkpCitBdXRvSW5zdGFsbC5yZWdpc3Rl cihQYWNrYWdlKCdzZXR1cHRvb2xzJywgVmVyc2lvbig0NCwgMSwgMSkpKQorQXV0b0luc3RhbGwu cmVnaXN0ZXIoUGFja2FnZSgnc2V0dXB0b29sc19zY20nLCBWZXJzaW9uKDUsIDAsIDIpLCBweXBp X25hbWU9J3NldHVwdG9vbHMtc2NtJykpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdz b2NrcycsIFZlcnNpb24oMSwgNywgMSksIHB5cGlfbmFtZT0nUHlTb2NrcycpKQogQXV0b0luc3Rh bGwucmVnaXN0ZXIoUGFja2FnZSgnc2l4JywgVmVyc2lvbigxLCAxNSwgMCkpKQogQXV0b0luc3Rh bGwucmVnaXN0ZXIoUGFja2FnZSgndGJsaWInLCBWZXJzaW9uKDEsIDcsIDApKSkKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0 b2luc3RhbGwucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0 Y29yZXB5L2F1dG9pbnN0YWxsLnB5CmluZGV4IDA2NmZlMGJlNjNjNjRlMDhkZmJmYzkyYjI4NjRj ZjZmYzU4OGI1MDYuLjI1Y2NjY2ZkMTEzMzQ5YmFjNGM3ODU1NmI3MWE2ZTZlYzVkZDVmMzggMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3Jl cHkvYXV0b2luc3RhbGwucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29y ZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQpAQCAtMjMzLDggKzIzMyw5IEBAIGNsYXNz IFBhY2thZ2Uob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybgogCiAgICAgICAgICMgTWFrZSBz dXJlIHRoYXQgc2V0dXB0b29scyBhbmQgd2hlZWwgYXJlIGluc3RhbGxlZCwgc2luY2Ugc2V0dXAu cHkgcmVsaWVzIG9uIGl0Ci0gICAgICAgIGlmIHNlbGYubmFtZSBub3QgaW4gWydzZXR1cHRvb2xz JywgJ3doZWVsJ106CisgICAgICAgIGlmIHNlbGYubmFtZSBub3QgaW4gWydzZXR1cHRvb2xzJywg J3NldHVwdG9vbHNfc2NtJywgJ3doZWVsJ106CiAgICAgICAgICAgICBBdXRvSW5zdGFsbC5pbnN0 YWxsKCdzZXR1cHRvb2xzJykKKyAgICAgICAgICAgIEF1dG9JbnN0YWxsLmluc3RhbGwoJ3NldHVw dG9vbHNfc2NtJykKICAgICAgICAgICAgIEF1dG9JbnN0YWxsLmluc3RhbGwoJ3doZWVsJykKIAog ICAgICAgICAjIEluIHNvbWUgY2FzZXMgYSBwYWNrYWdlIG1heSBjaGVjayBpZiBhbm90aGVyIHBh Y2thZ2UgaXMgaW5zdGFsbGVkIHdpdGhvdXQgYWN0dWFsbHkK 424198 2021-03-24 16:20:50 -0700 2021-03-24 17:24:45 -0700 Patch for landing bug-223677-20210324162049.patch text/plain 3570 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NDk4MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIxLTAzLTI0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBBdXRvaW5zdGFsbGluZyBrZXlyaW5nLTcuMy4xIGlzIGZhaWxpbmcgd2l0 aCBQeXRob24gMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjIzNjc3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NTgwMDUwND4KKworICAgICAgICBS ZXZpZXdlZCBieSBEZXdlaSBaaHUuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRjb3JlcHkvc2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJh cmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5OiBCdW1wIHZlcnNpb24s IGFkZCBzZXR1cHRvb2xzX3NjbS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRj b3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5OgorICAgICAgICAoUGFja2FnZS5pbnN0 YWxsKTogQWx3YXlzIGluc3RhbGwgc2V0dXB0b29sc19zY20uCisKIDIwMjEtMDMtMjQgIENocmlz IEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogQWRkIGZ1bmN0 aW9ucyByZWN0c0ZvclRleHRNYXJrZXJSYW5nZSBmb3IgdGVzdGluZwpJbmRleDogVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weQkocmV2aXNpb24gMjc0OTgz KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC0zMCw3ICszMCw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAoCiAgICAg bmFtZT0nd2Via2l0Y29yZXB5JywKLSAgICB2ZXJzaW9uPScwLjUuNicsCisgICAgdmVyc2lvbj0n MC41LjcnLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGNvbnRhaW5pbmcgdmFyaW91cyBQeXRo b24gc3VwcG9ydCBjbGFzc2VzIGFuZCBmdW5jdGlvbnMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9u PXJlYWRtZSgpLAogICAgIGNsYXNzaWZpZXJzPVsKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRf Xy5weQkocmV2aXNpb24gMjc0OTgzKQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtMzcsNyAr MzcsNyBAQCBmcm9tIHdlYmtpdGNvcmVweS5vdXRwdXRfY2FwdHVyZSBpbXBvcnQgCiBmcm9tIHdl YmtpdGNvcmVweS50YXNrX3Bvb2wgaW1wb3J0IFRhc2tQb29sCiBmcm9tIHdlYmtpdGNvcmVweS5j cmVkZW50aWFscyBpbXBvcnQgY3JlZGVudGlhbHMKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwgNSwg NikKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDUsIDcpCiAKIGZyb20gd2Via2l0Y29yZXB5LmF1dG9p bnN0YWxsIGltcG9ydCBQYWNrYWdlLCBBdXRvSW5zdGFsbAogaWYgc3lzLnZlcnNpb25faW5mbyA+ ICgzLCAwKToKQEAgLTU3LDcgKzU3LDggQEAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgn a2V5cmluZycsIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncGFja2FnaW5nJywgVmVy c2lvbigyMCwgNCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncHlwYXJzaW5nJywg VmVyc2lvbigyLCA0LCA3KSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdyZXF1ZXN0 cycsIFZlcnNpb24oMiwgMjQpKSkKLUF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3NldHVw dG9vbHMnLCBWZXJzaW9uKDQ0LCAxLCAgMSkpKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2Fn ZSgnc2V0dXB0b29scycsIFZlcnNpb24oNDQsIDEsIDEpKSkKK0F1dG9JbnN0YWxsLnJlZ2lzdGVy KFBhY2thZ2UoJ3NldHVwdG9vbHNfc2NtJywgVmVyc2lvbig1LCAwLCAyKSwgcHlwaV9uYW1lPSdz ZXR1cHRvb2xzLXNjbScpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnc29ja3MnLCBW ZXJzaW9uKDEsIDcsIDEpLCBweXBpX25hbWU9J1B5U29ja3MnKSkKIEF1dG9JbnN0YWxsLnJlZ2lz dGVyKFBhY2thZ2UoJ3NpeCcsIFZlcnNpb24oMSwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lz dGVyKFBhY2thZ2UoJ3RibGliJywgVmVyc2lvbigxLCA3LCAwKSkpCkluZGV4OiBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRj b3JlcHkvYXV0b2luc3RhbGwucHkJKHJldmlzaW9uIDI3NDk4MykKKysrIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkJKHdvcmtp bmcgY29weSkKQEAgLTIzMiw5ICsyMzIsMTAgQEAgY2xhc3MgUGFja2FnZShvYmplY3QpOgogICAg ICAgICBpZiBzZWxmLmlzX2NhY2hlZCgpOgogICAgICAgICAgICAgcmV0dXJuCiAKLSAgICAgICAg IyBNYWtlIHN1cmUgdGhhdCBzZXR1cHRvb2xzIGFuZCB3aGVlbCBhcmUgaW5zdGFsbGVkLCBzaW5j ZSBzZXR1cC5weSByZWxpZXMgb24gaXQKLSAgICAgICAgaWYgc2VsZi5uYW1lIG5vdCBpbiBbJ3Nl dHVwdG9vbHMnLCAnd2hlZWwnXToKKyAgICAgICAgIyBNYWtlIHN1cmUgdGhhdCBzZXR1cHRvb2xz LCBzZXR1cHRvb2xzX3NjbSBhbmQgd2hlZWwgYXJlIGluc3RhbGxlZCwgc2luY2Ugc2V0dXAucHkg cmVsaWVzIG9uIGl0CisgICAgICAgIGlmIHNlbGYubmFtZSBub3QgaW4gWydzZXR1cHRvb2xzJywg J3NldHVwdG9vbHNfc2NtJywgJ3doZWVsJ106CiAgICAgICAgICAgICBBdXRvSW5zdGFsbC5pbnN0 YWxsKCdzZXR1cHRvb2xzJykKKyAgICAgICAgICAgIEF1dG9JbnN0YWxsLmluc3RhbGwoJ3NldHVw dG9vbHNfc2NtJykKICAgICAgICAgICAgIEF1dG9JbnN0YWxsLmluc3RhbGwoJ3doZWVsJykKIAog ICAgICAgICAjIEluIHNvbWUgY2FzZXMgYSBwYWNrYWdlIG1heSBjaGVjayBpZiBhbm90aGVyIHBh Y2thZ2UgaXMgaW5zdGFsbGVkIHdpdGhvdXQgYWN0dWFsbHkK