203899 2019-11-06 06:50:15 -0800 Add support for remotes file for EWS builders 2019-11-14 03:45:05 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=203946 InRadar P2 Normal --- 203946 1 pmatos pmatos aakash_jain commit-queue guijemont webkit-bug-importer oldest_to_newest 1587763 0 pmatos 2019-11-06 06:50:15 -0800 Add support for remotes file for EWS builders 1587764 1 382925 pmatos 2019-11-06 06:56:53 -0800 Created attachment 382925 Patch 1587801 2 382925 aakash_jain 2019-11-06 09:19:37 -0800 Comment on attachment 382925 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382925&action=review Logic looks fine. Please fix the unit-tests as well. You can run them using 'python Tools/BuildSlaveSupport/ews-build/runUnittests.py' > Tools/BuildSlaveSupport/ews-build/steps.py:929 > + command = ['perl', 'Tools/Scripts/run-javascriptcore-tests', '--no-build', '--no-fail-fast', '--json-output={0}'.format(jsonFileName), WithProperties('--%(configuration)s')] + [WithProperties('--remote-config-file=%(remotes)s')] if WithProperties('%(remotes)s') != '' else [] is this if-else correct? Please check what does command contains in case of else. 1588143 3 pmatos 2019-11-07 01:29:33 -0800 Thanks for the comments - I will take a look at the unit tests. Didn't know we had them. 1588146 4 pmatos 2019-11-07 01:38:12 -0800 python Tools/BuildSlaveSupport/ews-build/runUnittests.py E....................... ====================================================================== ERROR: steps_unittest (unittest.loader.ModuleImportFailure) ---------------------------------------------------------------------- ImportError: Failed to import test module: steps_unittest Traceback (most recent call last): File "/usr/lib64/python2.7/unittest/loader.py", line 254, in _find_tests module = self._get_module_from_name(name) File "/usr/lib64/python2.7/unittest/loader.py", line 232, in _get_module_from_name __import__(name) File "/home/pmatos/Projects/igalia/WebKit/Tools/BuildSlaveSupport/ews-build/steps_unittest.py", line 30, in <module> from buildbot.test.fake.remotecommand import Expect, ExpectRemoteRef, ExpectShell ImportError: No module named test.fake.remotecommand Are you using buildbot 1.8.2? 1588148 5 pmatos 2019-11-07 01:50:54 -0800 (In reply to Aakash Jain from comment #2) > Comment on attachment 382925 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=382925&action=review > > Logic looks fine. > > Please fix the unit-tests as well. You can run them using 'python > Tools/BuildSlaveSupport/ews-build/runUnittests.py' > No updates seem to be required as the unittests don't call into ConfigureBuild. 1588162 6 383035 pmatos 2019-11-07 03:48:19 -0800 Created attachment 383035 Patch 1588166 7 383037 pmatos 2019-11-07 04:44:14 -0800 Created attachment 383037 Patch 1588167 8 383038 pmatos 2019-11-07 04:49:49 -0800 Created attachment 383038 Patch 1588168 9 pmatos 2019-11-07 04:51:57 -0800 I am having some issues getting ahold of the property in the RunJavaScriptCoreTests step. Need to understand the best way to do this. 1588169 10 383038 aakash_jain 2019-11-07 04:57:57 -0800 Comment on attachment 383038 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383038&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:937 > + # add remotes configuration file path to the command line if needed start() is a better place to add parameters to self.command. If I remember correctly, you will need to use self.getProperty('remotes') instead of WithProperties/util.Property(). 1588171 11 aakash_jain 2019-11-07 05:02:29 -0800 (In reply to Paulo Matos from comment #4) > Are you using buildbot 1.8.2? Yes, see https://ews-build.webkit.org/#/about Did you used '--no-binary :all:' while installing buildbot, as per: https://trac.webkit.org/wiki/EarlyWarningSystem#Installingrequiredpackages: (In reply to Paulo Matos from comment #5) > No updates seem to be required as the unittests don't call into ConfigureBuild. The unit-test failures are in RunJavaScriptCoreTests (and related) unit-tests. See the red services ews bubble https://ews-build.webkit.org/#/builders/20/builds/7508 1588172 12 aakash_jain 2019-11-07 05:19:57 -0800 (In reply to Paulo Matos from comment #9) > I am having some issues getting ahold of the property in the > RunJavaScriptCoreTests step. Need to understand the best way to do this. s __init__ is called at the very beginning, when buildbot starts. While start() is called after the build, and the corresponding build-step has started. So at the time start() is called, all the build properties are already set, and you can simply use self.getProperty(). We modify self.command inside start() in our current code as well, e.g.: in CompileWebKit::start(), and even inside RunJavaScriptCoreTests:: start() using appendCustomBuildFlags(). 1588188 13 383042 pmatos 2019-11-07 06:27:17 -0800 Created attachment 383042 Patch 1588210 14 383044 pmatos 2019-11-07 07:20:53 -0800 Created attachment 383044 Patch 1588215 15 pmatos 2019-11-07 07:24:53 -0800 (In reply to Aakash Jain from comment #12) > (In reply to Paulo Matos from comment #9) > > I am having some issues getting ahold of the property in the > > RunJavaScriptCoreTests step. Need to understand the best way to do this. > s > __init__ is called at the very beginning, when buildbot starts. While > start() is called after the build, and the corresponding build-step has > started. So at the time start() is called, all the build properties are > already set, and you can simply use self.getProperty(). > > We modify self.command inside start() in our current code as well, e.g.: in > CompileWebKit::start(), and even inside RunJavaScriptCoreTests:: start() > using appendCustomBuildFlags(). Thanks for the quick review and comments. r+ and cq+ pls if all is good. 1588221 16 aakash_jain 2019-11-07 07:33:17 -0800 (In reply to Paulo Matos from comment #15) > Thanks for the quick review and comments. r+ and cq+ pls if all is good. Code looks good. Can you just move the unit-tests inside TestRunJavaScriptCoreTests? Usually we have a class in steps_unittest corresponding to a class in steps. 1588225 17 383047 pmatos 2019-11-07 07:42:32 -0800 Created attachment 383047 Patch 1588235 18 383047 commit-queue 2019-11-07 08:32:11 -0800 Comment on attachment 383047 Patch Clearing flags on attachment: 383047 Committed r252184: <https://trac.webkit.org/changeset/252184> 1588236 19 commit-queue 2019-11-07 08:32:13 -0800 All reviewed patches have been landed. Closing bug. 1588237 20 webkit-bug-importer 2019-11-07 08:33:15 -0800 <rdar://problem/56983361> 1589163 21 aakash_jain 2019-11-11 04:16:39 -0800 We need to pass 'remotes' parameter in JSCTestsFactory.__init__() as well. Also, it's probably better to use named arguments while using Factory.__init(). e.g.: class JSCTestsFactory(Factory): def __init__(self, platform, configuration='release', architectures=None, remotes=None, additionalArguments=None, runTests='true', **kwargs): Factory.__init__(self, platform=platform, configuration=configuration, architectures=architectures, buildOnly=False, remotes=remotes, additionalArguments=additionalArguments, checkRelevance=True) 1590229 22 aakash_jain 2019-11-14 03:45:05 -0800 (In reply to Aakash Jain from comment #21) > We need to pass 'remotes' parameter in JSCTestsFactory.__init__() as well. Done in https://trac.webkit.org/changeset/252454/webkit 382925 2019-11-06 06:56:53 -0800 2019-11-07 03:48:15 -0800 Patch bug-203899-20191106155634.patch text/plain 7033 pmatos U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMDUwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWYzOTgzYzBlMDVmMTVlOGRlMjE0MWI4NWE3MTU0Y2Q0 NDQzYjg3Yy4uNjFmOTRhODVlOGExNThjZjIxNWJiODYzYTU1NzgyZTA5OTZhM2NiZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDE5LTExLTA2ICBQYXVsbyBNYXRvcyAgPHBtYXRvc0BpZ2FsaWEuY29tPgorCisgICAg ICAgIEFkZCBzdXBwb3J0IGZvciByZW1vdGVzIGZpbGUgZm9yIEVXUyBidWlsZGVycworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzODk5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVxdWlyZSB0byBzdXBw b3J0IGJ1aWxkZXJzIHRoYXQgY3Jvc3MtY29tcGlsZSBhbmQgcnVuIHRlc3RzIG9uIG5hdGl2ZSBt YWNoaW5lcworICAgICAgICB0aHJvdWdoIHRoZSB1c2Ugb2YgLS1yZW1vdGUtY29uZmlnLWZpbGUu CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Ogor ICAgICAgICAoRmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgIChTdHlsZUZhY3RvcnkuX19pbml0 X18pOgorICAgICAgICAoV2F0Y2hMaXN0RmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgICogQnVp bGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHk6CisgICAgICAgIChsb2FkQnVp bGRlckNvbmZpZyk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5OgorICAgICAgICAoQ29uZmlndXJlQnVpbGQuX19pbml0X18pOgorICAgICAgICAoQ29uZmln dXJlQnVpbGQuc3RhcnQpOgorICAgICAgICAoUnVuSmF2YVNjcmlwdENvcmVUZXN0cyk6CisKIDIw MTktMTEtMDUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFJFR1JFU1NJT04ocjI1MjAzMSk6IGxheW91dCB0ZXN0cyBmYWlsIHRvIHJ1biBpbiBu b24gYXBwbGUgcG9ydHMgYWZ0ZXIgcjI1MjAzMQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9mYWN0b3JpZXMucHkKaW5kZXggYTE2ZDJmMGE4NjBkZTM5ZWU5ZTI5ZGZlZjVl ZTVjZWU3MzNkYmY4My4uNmYyNmEzM2IzOWYzM2Y2OTRkYzlmNTBkOGFmNzQxNTQxMGVjNjRkZiAx MDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5w eQorKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CkBA IC0zMyw5ICszMyw5IEBAIGZyb20gc3RlcHMgaW1wb3J0IChBcHBseVBhdGNoLCBBcHBseVdhdGNo TGlzdCwgQ2hlY2tPdXRTb3VyY2UsIENoZWNrT3V0U3BlY2lmaWNSCiAKIAogY2xhc3MgRmFjdG9y eShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3Jt LCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYnVpbGRPbmx5PVRydWUs IHRyaWdnZXJzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgY2hlY2tSZWxldmFuY2U9 RmFsc2UsICoqa3dhcmdzKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZp Z3VyYXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCBidWlsZE9ubHk9VHJ1ZSwgdHJpZ2dl cnM9Tm9uZSwgcmVtb3Rlcz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsIGNoZWNrUmVs ZXZhbmNlPUZhbHNlLCAqKmt3YXJncyk6CiAgICAgICAgIGZhY3RvcnkuQnVpbGRGYWN0b3J5Ll9f aW5pdF9fKHNlbGYpCi0gICAgICAgIHNlbGYuYWRkU3RlcChDb25maWd1cmVCdWlsZChwbGF0Zm9y bSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5LCB0cmlnZ2VycywgYWRk aXRpb25hbEFyZ3VtZW50cykpCisgICAgICAgIHNlbGYuYWRkU3RlcChDb25maWd1cmVCdWlsZChw bGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5LCB0cmlnZ2Vy cywgcmVtb3RlcywgYWRkaXRpb25hbEFyZ3VtZW50cykpCiAgICAgICAgIGlmIGNoZWNrUmVsZXZh bmNlOgogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKENoZWNrUGF0Y2hSZWxldmFuY2UoKSkKICAg ICAgICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlUGF0Y2goKSkKQEAgLTQ5LDkgKzQ5LDkgQEAgY2xh c3MgRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CiAKIAogY2xhc3MgU3R5bGVGYWN0b3J5 KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0s IGNvbmZpZ3VyYXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBh ZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsICoqa3dhcmdzKToKKyAgICBkZWYgX19pbml0X18oc2Vs ZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmln Z2Vycz1Ob25lLCByZW1vdGVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2Fy Z3MpOgogICAgICAgICBmYWN0b3J5LkJ1aWxkRmFjdG9yeS5fX2luaXRfXyhzZWxmKQotICAgICAg ICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFy Y2hpdGVjdHVyZXMsIEZhbHNlLCB0cmlnZ2VycywgYWRkaXRpb25hbEFyZ3VtZW50cykpCisgICAg ICAgIHNlbGYuYWRkU3RlcChDb25maWd1cmVCdWlsZChwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwg YXJjaGl0ZWN0dXJlcywgRmFsc2UsIHRyaWdnZXJzLCByZW1vdGVzLCBhZGRpdGlvbmFsQXJndW1l bnRzKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlUGF0Y2goKSkKICAgICAgICAgc2Vs Zi5hZGRTdGVwKFByaW50Q29uZmlndXJhdGlvbigpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ2hl Y2tPdXRTb3VyY2UoKSkKQEAgLTYxLDkgKzYxLDkgQEAgY2xhc3MgU3R5bGVGYWN0b3J5KGZhY3Rv cnkuQnVpbGRGYWN0b3J5KToKIAogCiBjbGFzcyBXYXRjaExpc3RGYWN0b3J5KGZhY3RvcnkuQnVp bGRGYWN0b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRp b249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJn dW1lbnRzPU5vbmUsICoqa3dhcmdzKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0s IGNvbmZpZ3VyYXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBy ZW1vdGVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAg ICBmYWN0b3J5LkJ1aWxkRmFjdG9yeS5fX2luaXRfXyhzZWxmKQotICAgICAgICBzZWxmLmFkZFN0 ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMs IEZhbHNlLCB0cmlnZ2VycywgYWRkaXRpb25hbEFyZ3VtZW50cykpCisgICAgICAgIHNlbGYuYWRk U3RlcChDb25maWd1cmVCdWlsZChwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJl cywgRmFsc2UsIHRyaWdnZXJzLCByZW1vdGVzLCBhZGRpdGlvbmFsQXJndW1lbnRzKSkKICAgICAg ICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlUGF0Y2goKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKFBy aW50Q29uZmlndXJhdGlvbigpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ2hlY2tPdXRTb3VyY2Uo KSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29u ZmlnLnB5IGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHkK aW5kZXggMGU1MjdkOTI5MjA4M2I0OWM5YWNjODNjY2RmOTk1Njk3MzJjNGI0MS4uYmJjNDZkNmFl ZGU3NzQ2OWQwNTA4MTdjNzM1NWI0YjNmNjBiNTkwNSAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHkKKysrIGIvVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHkKQEAgLTYyLDcgKzYyLDcgQEAgZGVmIGxv YWRCdWlsZGVyQ29uZmlnKGMsIGlzX3Rlc3RfbW9kZV9lbmFibGVkPUZhbHNlLCBtYXN0ZXJfcHJl Zml4X3BhdGg9Jy4vJyk6CiAgICAgICAgIGlmICdpY29uJyBpbiBidWlsZGVyOgogICAgICAgICAg ICAgZGVsIGJ1aWxkZXJbJ2ljb24nXQogICAgICAgICBmYWN0b3J5a3dhcmdzID0ge30KLSAgICAg ICAgZm9yIGtleSBpbiBbJ3BsYXRmb3JtJywgJ2NvbmZpZ3VyYXRpb24nLCAnYXJjaGl0ZWN0dXJl cycsICd0cmlnZ2VycycsICdhZGRpdGlvbmFsQXJndW1lbnRzJywgJ3J1blRlc3RzJ106CisgICAg ICAgIGZvciBrZXkgaW4gWydwbGF0Zm9ybScsICdjb25maWd1cmF0aW9uJywgJ2FyY2hpdGVjdHVy ZXMnLCAndHJpZ2dlcnMnLCAncmVtb3RlcycsICdhZGRpdGlvbmFsQXJndW1lbnRzJywgJ3J1blRl c3RzJ106CiAgICAgICAgICAgICB2YWx1ZSA9IGJ1aWxkZXIucG9wKGtleSwgTm9uZSkKICAgICAg ICAgICAgIGlmIHZhbHVlOgogICAgICAgICAgICAgICAgIGZhY3Rvcnlrd2FyZ3Nba2V5XSA9IHZh bHVlCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMu cHkgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKaW5kZXggZGRh MjI3MGY2MjYxNTU4YTk4NDNhZjVlMDE2MzFiMmUxZDdkOTkzMy4uNWQxNmQ5OWQ5MzY4YjkxMWYz ZTA3ZWZlZGI2OTBmYmVhNjU4YWIyZiAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1i dWlsZC9zdGVwcy5weQpAQCAtNDYsNyArNDYsNyBAQCBjbGFzcyBDb25maWd1cmVCdWlsZChidWls ZHN0ZXAuQnVpbGRTdGVwKToKICAgICBkZXNjcmlwdGlvbiA9IFsnY29uZmlndXJpbmcgYnVpbGQn XQogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnQ29uZmlndXJlZCBidWlsZCddCiAKLSAgICBkZWYg X19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGJ1 aWxkT25seSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHMpOgorICAgIGRlZiBfX2luaXRf XyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5 LCB0cmlnZ2VycywgcmVtb3RlcywgYWRkaXRpb25hbEFyZ3VtZW50cyk6CiAgICAgICAgIHN1cGVy KENvbmZpZ3VyZUJ1aWxkLCBzZWxmKS5fX2luaXRfXygpCiAgICAgICAgIHNlbGYucGxhdGZvcm0g PSBwbGF0Zm9ybQogICAgICAgICBpZiBwbGF0Zm9ybSAhPSAnanNjLW9ubHknOgpAQCAtNTYsNiAr NTYsNyBAQCBjbGFzcyBDb25maWd1cmVCdWlsZChidWlsZHN0ZXAuQnVpbGRTdGVwKToKICAgICAg ICAgc2VsZi5hcmNoaXRlY3R1cmUgPSAnICcuam9pbihhcmNoaXRlY3R1cmVzKSBpZiBhcmNoaXRl Y3R1cmVzIGVsc2UgTm9uZQogICAgICAgICBzZWxmLmJ1aWxkT25seSA9IGJ1aWxkT25seQogICAg ICAgICBzZWxmLnRyaWdnZXJzID0gdHJpZ2dlcnMKKyAgICAgICAgc2VsZi5yZW1vdGVzID0gcmVt b3RlcwogICAgICAgICBzZWxmLmFkZGl0aW9uYWxBcmd1bWVudHMgPSBhZGRpdGlvbmFsQXJndW1l bnRzCiAKICAgICBkZWYgc3RhcnQoc2VsZik6CkBAIC03MSw2ICs3Miw4IEBAIGNsYXNzIENvbmZp Z3VyZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXApOgogICAgICAgICAgICAgc2VsZi5zZXRQcm9w ZXJ0eSgnYnVpbGRPbmx5Jywgc2VsZi5idWlsZE9ubHksICdjb25maWcuanNvbicpCiAgICAgICAg IGlmIHNlbGYudHJpZ2dlcnM6CiAgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCd0cmlnZ2Vy cycsIHNlbGYudHJpZ2dlcnMsICdjb25maWcuanNvbicpCisgICAgICAgIGlmIHNlbGYucmVtb3Rl czoKKyAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3JlbW90ZXMnLCBzZWxmLnJlbW90ZXMs ICdjb25maWcuanNvbicpCiAgICAgICAgIGlmIHNlbGYuYWRkaXRpb25hbEFyZ3VtZW50czoKICAg ICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2FkZGl0aW9uYWxBcmd1bWVudHMnLCBzZWxmLmFk ZGl0aW9uYWxBcmd1bWVudHMsICdjb25maWcuanNvbicpCiAKQEAgLTkyMyw3ICs5MjYsNyBAQCBj bGFzcyBSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKHNoZWxsLlRlc3QpOgogICAgIGZsdW5rT25GYWls dXJlID0gVHJ1ZQogICAgIGpzb25GaWxlTmFtZSA9ICdqc2NfcmVzdWx0cy5qc29uJwogICAgIGxv Z2ZpbGVzID0geydqc29uJzoganNvbkZpbGVOYW1lfQotICAgIGNvbW1hbmQgPSBbJ3BlcmwnLCAn VG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMnLCAnLS1uby1idWlsZCcsICct LW5vLWZhaWwtZmFzdCcsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KGpzb25GaWxlTmFtZSks IFdpdGhQcm9wZXJ0aWVzKCctLSUoY29uZmlndXJhdGlvbilzJyldCisgICAgY29tbWFuZCA9IFsn cGVybCcsICdUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cycsICctLW5vLWJ1 aWxkJywgJy0tbm8tZmFpbC1mYXN0JywgJy0tanNvbi1vdXRwdXQ9ezB9Jy5mb3JtYXQoanNvbkZp bGVOYW1lKSwgV2l0aFByb3BlcnRpZXMoJy0tJShjb25maWd1cmF0aW9uKXMnKV0gKyBbV2l0aFBy b3BlcnRpZXMoJy0tcmVtb3RlLWNvbmZpZy1maWxlPSUocmVtb3RlcylzJyldIGlmIFdpdGhQcm9w ZXJ0aWVzKCclKHJlbW90ZXMpcycpICE9ICcnIGVsc2UgW10KIAogICAgIGRlZiBfX2luaXRfXyhz ZWxmLCAqKmt3YXJncyk6CiAgICAgICAgIHNoZWxsLlRlc3QuX19pbml0X18oc2VsZiwgbG9nRW52 aXJvbj1GYWxzZSwgKiprd2FyZ3MpCg== 383035 2019-11-07 03:48:19 -0800 2019-11-07 04:44:09 -0800 Patch bug-203899-20191107124758.patch text/plain 6837 pmatos U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMDUwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWYzOTgzYzBlMDVmMTVlOGRlMjE0MWI4NWE3MTU0Y2Q0 NDQzYjg3Yy4uNjFmOTRhODVlOGExNThjZjIxNWJiODYzYTU1NzgyZTA5OTZhM2NiZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDE5LTExLTA2ICBQYXVsbyBNYXRvcyAgPHBtYXRvc0BpZ2FsaWEuY29tPgorCisgICAg ICAgIEFkZCBzdXBwb3J0IGZvciByZW1vdGVzIGZpbGUgZm9yIEVXUyBidWlsZGVycworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzODk5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVxdWlyZSB0byBzdXBw b3J0IGJ1aWxkZXJzIHRoYXQgY3Jvc3MtY29tcGlsZSBhbmQgcnVuIHRlc3RzIG9uIG5hdGl2ZSBt YWNoaW5lcworICAgICAgICB0aHJvdWdoIHRoZSB1c2Ugb2YgLS1yZW1vdGUtY29uZmlnLWZpbGUu CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Ogor ICAgICAgICAoRmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgIChTdHlsZUZhY3RvcnkuX19pbml0 X18pOgorICAgICAgICAoV2F0Y2hMaXN0RmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgICogQnVp bGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHk6CisgICAgICAgIChsb2FkQnVp bGRlckNvbmZpZyk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5OgorICAgICAgICAoQ29uZmlndXJlQnVpbGQuX19pbml0X18pOgorICAgICAgICAoQ29uZmln dXJlQnVpbGQuc3RhcnQpOgorICAgICAgICAoUnVuSmF2YVNjcmlwdENvcmVUZXN0cyk6CisKIDIw MTktMTEtMDUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFJFR1JFU1NJT04ocjI1MjAzMSk6IGxheW91dCB0ZXN0cyBmYWlsIHRvIHJ1biBpbiBu b24gYXBwbGUgcG9ydHMgYWZ0ZXIgcjI1MjAzMQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9mYWN0b3JpZXMucHkKaW5kZXggYTE2ZDJmMGE4NjBkZTM5ZWU5ZTI5ZGZlZjVl ZTVjZWU3MzNkYmY4My4uNmYyNmEzM2IzOWYzM2Y2OTRkYzlmNTBkOGFmNzQxNTQxMGVjNjRkZiAx MDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5w eQorKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CkBA IC0zMyw5ICszMyw5IEBAIGZyb20gc3RlcHMgaW1wb3J0IChBcHBseVBhdGNoLCBBcHBseVdhdGNo TGlzdCwgQ2hlY2tPdXRTb3VyY2UsIENoZWNrT3V0U3BlY2lmaWNSCiAKIAogY2xhc3MgRmFjdG9y eShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3Jt LCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYnVpbGRPbmx5PVRydWUs IHRyaWdnZXJzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgY2hlY2tSZWxldmFuY2U9 RmFsc2UsICoqa3dhcmdzKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZp Z3VyYXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCBidWlsZE9ubHk9VHJ1ZSwgdHJpZ2dl cnM9Tm9uZSwgcmVtb3Rlcz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsIGNoZWNrUmVs ZXZhbmNlPUZhbHNlLCAqKmt3YXJncyk6CiAgICAgICAgIGZhY3RvcnkuQnVpbGRGYWN0b3J5Ll9f aW5pdF9fKHNlbGYpCi0gICAgICAgIHNlbGYuYWRkU3RlcChDb25maWd1cmVCdWlsZChwbGF0Zm9y bSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5LCB0cmlnZ2VycywgYWRk aXRpb25hbEFyZ3VtZW50cykpCisgICAgICAgIHNlbGYuYWRkU3RlcChDb25maWd1cmVCdWlsZChw bGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5LCB0cmlnZ2Vy cywgcmVtb3RlcywgYWRkaXRpb25hbEFyZ3VtZW50cykpCiAgICAgICAgIGlmIGNoZWNrUmVsZXZh bmNlOgogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKENoZWNrUGF0Y2hSZWxldmFuY2UoKSkKICAg ICAgICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlUGF0Y2goKSkKQEAgLTQ5LDkgKzQ5LDkgQEAgY2xh c3MgRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CiAKIAogY2xhc3MgU3R5bGVGYWN0b3J5 KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0s IGNvbmZpZ3VyYXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBh ZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsICoqa3dhcmdzKToKKyAgICBkZWYgX19pbml0X18oc2Vs ZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmln Z2Vycz1Ob25lLCByZW1vdGVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2Fy Z3MpOgogICAgICAgICBmYWN0b3J5LkJ1aWxkRmFjdG9yeS5fX2luaXRfXyhzZWxmKQotICAgICAg ICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFy Y2hpdGVjdHVyZXMsIEZhbHNlLCB0cmlnZ2VycywgYWRkaXRpb25hbEFyZ3VtZW50cykpCisgICAg ICAgIHNlbGYuYWRkU3RlcChDb25maWd1cmVCdWlsZChwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwg YXJjaGl0ZWN0dXJlcywgRmFsc2UsIHRyaWdnZXJzLCByZW1vdGVzLCBhZGRpdGlvbmFsQXJndW1l bnRzKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlUGF0Y2goKSkKICAgICAgICAgc2Vs Zi5hZGRTdGVwKFByaW50Q29uZmlndXJhdGlvbigpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ2hl Y2tPdXRTb3VyY2UoKSkKQEAgLTYxLDkgKzYxLDkgQEAgY2xhc3MgU3R5bGVGYWN0b3J5KGZhY3Rv cnkuQnVpbGRGYWN0b3J5KToKIAogCiBjbGFzcyBXYXRjaExpc3RGYWN0b3J5KGZhY3RvcnkuQnVp bGRGYWN0b3J5KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRp b249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJn dW1lbnRzPU5vbmUsICoqa3dhcmdzKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0s IGNvbmZpZ3VyYXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCB0cmlnZ2Vycz1Ob25lLCBy ZW1vdGVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAg ICBmYWN0b3J5LkJ1aWxkRmFjdG9yeS5fX2luaXRfXyhzZWxmKQotICAgICAgICBzZWxmLmFkZFN0 ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMs IEZhbHNlLCB0cmlnZ2VycywgYWRkaXRpb25hbEFyZ3VtZW50cykpCisgICAgICAgIHNlbGYuYWRk U3RlcChDb25maWd1cmVCdWlsZChwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJl cywgRmFsc2UsIHRyaWdnZXJzLCByZW1vdGVzLCBhZGRpdGlvbmFsQXJndW1lbnRzKSkKICAgICAg ICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlUGF0Y2goKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKFBy aW50Q29uZmlndXJhdGlvbigpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ2hlY2tPdXRTb3VyY2Uo KSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29u ZmlnLnB5IGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHkK aW5kZXggMGU1MjdkOTI5MjA4M2I0OWM5YWNjODNjY2RmOTk1Njk3MzJjNGI0MS4uYmJjNDZkNmFl ZGU3NzQ2OWQwNTA4MTdjNzM1NWI0YjNmNjBiNTkwNSAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHkKKysrIGIvVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHkKQEAgLTYyLDcgKzYyLDcgQEAgZGVmIGxv YWRCdWlsZGVyQ29uZmlnKGMsIGlzX3Rlc3RfbW9kZV9lbmFibGVkPUZhbHNlLCBtYXN0ZXJfcHJl Zml4X3BhdGg9Jy4vJyk6CiAgICAgICAgIGlmICdpY29uJyBpbiBidWlsZGVyOgogICAgICAgICAg ICAgZGVsIGJ1aWxkZXJbJ2ljb24nXQogICAgICAgICBmYWN0b3J5a3dhcmdzID0ge30KLSAgICAg ICAgZm9yIGtleSBpbiBbJ3BsYXRmb3JtJywgJ2NvbmZpZ3VyYXRpb24nLCAnYXJjaGl0ZWN0dXJl cycsICd0cmlnZ2VycycsICdhZGRpdGlvbmFsQXJndW1lbnRzJywgJ3J1blRlc3RzJ106CisgICAg ICAgIGZvciBrZXkgaW4gWydwbGF0Zm9ybScsICdjb25maWd1cmF0aW9uJywgJ2FyY2hpdGVjdHVy ZXMnLCAndHJpZ2dlcnMnLCAncmVtb3RlcycsICdhZGRpdGlvbmFsQXJndW1lbnRzJywgJ3J1blRl c3RzJ106CiAgICAgICAgICAgICB2YWx1ZSA9IGJ1aWxkZXIucG9wKGtleSwgTm9uZSkKICAgICAg ICAgICAgIGlmIHZhbHVlOgogICAgICAgICAgICAgICAgIGZhY3Rvcnlrd2FyZ3Nba2V5XSA9IHZh bHVlCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMu cHkgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKaW5kZXggZGRh MjI3MGY2MjYxNTU4YTk4NDNhZjVlMDE2MzFiMmUxZDdkOTkzMy4uMGNmYTcyZjhmODBlNDYxODk2 MDA3Y2UwMGMxMmNiZGQ0ZWZiYjU4NyAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1i dWlsZC9zdGVwcy5weQpAQCAtNDYsNyArNDYsNyBAQCBjbGFzcyBDb25maWd1cmVCdWlsZChidWls ZHN0ZXAuQnVpbGRTdGVwKToKICAgICBkZXNjcmlwdGlvbiA9IFsnY29uZmlndXJpbmcgYnVpbGQn XQogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnQ29uZmlndXJlZCBidWlsZCddCiAKLSAgICBkZWYg X19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGJ1 aWxkT25seSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHMpOgorICAgIGRlZiBfX2luaXRf XyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5 LCB0cmlnZ2VycywgcmVtb3RlcywgYWRkaXRpb25hbEFyZ3VtZW50cyk6CiAgICAgICAgIHN1cGVy KENvbmZpZ3VyZUJ1aWxkLCBzZWxmKS5fX2luaXRfXygpCiAgICAgICAgIHNlbGYucGxhdGZvcm0g PSBwbGF0Zm9ybQogICAgICAgICBpZiBwbGF0Zm9ybSAhPSAnanNjLW9ubHknOgpAQCAtNTYsNiAr NTYsNyBAQCBjbGFzcyBDb25maWd1cmVCdWlsZChidWlsZHN0ZXAuQnVpbGRTdGVwKToKICAgICAg ICAgc2VsZi5hcmNoaXRlY3R1cmUgPSAnICcuam9pbihhcmNoaXRlY3R1cmVzKSBpZiBhcmNoaXRl Y3R1cmVzIGVsc2UgTm9uZQogICAgICAgICBzZWxmLmJ1aWxkT25seSA9IGJ1aWxkT25seQogICAg ICAgICBzZWxmLnRyaWdnZXJzID0gdHJpZ2dlcnMKKyAgICAgICAgc2VsZi5yZW1vdGVzID0gcmVt b3RlcwogICAgICAgICBzZWxmLmFkZGl0aW9uYWxBcmd1bWVudHMgPSBhZGRpdGlvbmFsQXJndW1l bnRzCiAKICAgICBkZWYgc3RhcnQoc2VsZik6CkBAIC03MSw2ICs3Miw4IEBAIGNsYXNzIENvbmZp Z3VyZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXApOgogICAgICAgICAgICAgc2VsZi5zZXRQcm9w ZXJ0eSgnYnVpbGRPbmx5Jywgc2VsZi5idWlsZE9ubHksICdjb25maWcuanNvbicpCiAgICAgICAg IGlmIHNlbGYudHJpZ2dlcnM6CiAgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCd0cmlnZ2Vy cycsIHNlbGYudHJpZ2dlcnMsICdjb25maWcuanNvbicpCisgICAgICAgIGlmIHNlbGYucmVtb3Rl czoKKyAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3JlbW90ZXMnLCBzZWxmLnJlbW90ZXMs ICdjb25maWcuanNvbicpCiAgICAgICAgIGlmIHNlbGYuYWRkaXRpb25hbEFyZ3VtZW50czoKICAg ICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2FkZGl0aW9uYWxBcmd1bWVudHMnLCBzZWxmLmFk ZGl0aW9uYWxBcmd1bWVudHMsICdjb25maWcuanNvbicpCiAKQEAgLTkyOCw2ICs5MzEsMTAgQEAg Y2xhc3MgUnVuSmF2YVNjcmlwdENvcmVUZXN0cyhzaGVsbC5UZXN0KToKICAgICBkZWYgX19pbml0 X18oc2VsZiwgKiprd2FyZ3MpOgogICAgICAgICBzaGVsbC5UZXN0Ll9faW5pdF9fKHNlbGYsIGxv Z0Vudmlyb249RmFsc2UsICoqa3dhcmdzKQogCisgICAgICAgICMgYWRkIHJlbW90ZXMgY29uZmln dXJhdGlvbiBmaWxlIHBhdGggdG8gdGhlIGNvbW1hbmQgbGluZSBpZiBuZWVkZWQKKyAgICAgICAg aWYgc2VsZi5oYXNQcm9wZXJ0eSgncmVtb3RlcycpOgorICAgICAgICAgICAgc2VsZi5jb21tYW5k LmFwcGVuZChXaXRoUHJvcGVydGllcygnLS1yZW1vdGUtY29uZmlnLWZpbGU9JShyZW1vdGVzKXMn KSkKKwogICAgIGRlZiBzdGFydChzZWxmKToKICAgICAgICAgYXBwZW5kQ3VzdG9tQnVpbGRGbGFn cyhzZWxmLCBzZWxmLmdldFByb3BlcnR5KCdwbGF0Zm9ybScpLCBzZWxmLmdldFByb3BlcnR5KCdm dWxsUGxhdGZvcm0nKSkKICAgICAgICAgcmV0dXJuIHNoZWxsLlRlc3Quc3RhcnQoc2VsZikK 383037 2019-11-07 04:44:14 -0800 2019-11-07 04:49:45 -0800 Patch bug-203899-20191107134353.patch text/plain 6853 pmatos U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMTgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmYxMjY5YmU4ZDY4NmVlYmViN2Y2MDk5OTFiZDk2MjYy MTc1ZWRkMS4uODI2NDRiY2JlMmE3ZDQyYjVlODM5OTY1N2MyY2RiYzFlMjBmNjk0MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDE5LTExLTA3ICBQYXVsbyBNYXRvcyAgPHBtYXRvc0BpZ2FsaWEuY29tPgorCisgICAg ICAgIEFkZCBzdXBwb3J0IGZvciByZW1vdGVzIGZpbGUgZm9yIEVXUyBidWlsZGVycworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzODk5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVxdWlyZSB0byBzdXBw b3J0IGJ1aWxkZXJzIHRoYXQgY3Jvc3MtY29tcGlsZSBhbmQgcnVuIHRlc3RzIG9uIG5hdGl2ZSBt YWNoaW5lcworICAgICAgICB0aHJvdWdoIHRoZSB1c2Ugb2YgLS1yZW1vdGUtY29uZmlnLWZpbGUu CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Ogor ICAgICAgICAoRmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgIChTdHlsZUZhY3RvcnkuX19pbml0 X18pOgorICAgICAgICAoV2F0Y2hMaXN0RmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgICogQnVp bGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHk6CisgICAgICAgIChsb2FkQnVp bGRlckNvbmZpZyk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5OgorICAgICAgICAoQ29uZmlndXJlQnVpbGQuX19pbml0X18pOgorICAgICAgICAoQ29uZmln dXJlQnVpbGQuc3RhcnQpOgorICAgICAgICAoUnVuSmF2YVNjcmlwdENvcmVUZXN0cyk6CisKIDIw MTktMTEtMDYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJF R1JFU1NJT046IFsgaU9TIF0gKCByMjUxMDE1ICkgTGF5b3V0IFRlc3QgZmFzdC90ZXh0L3doaXRl c3BhY2UvcHJlLXdyYXAtb3ZlcmZsb3ctc2VsZWN0aW9uLmh0bWwgaXMgZmxha3kKZGlmZiAtLWdp dCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkgYi9Ub29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CmluZGV4IGExNmQyZjBh ODYwZGUzOWVlOWUyOWRmZWY1ZWU1Y2VlNzMzZGJmODMuLjZmMjZhMzNiMzlmMzNmNjk0ZGM5ZjUw ZDhhZjc0MTU0MTBlYzY0ZGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9mYWN0b3JpZXMucHkKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL2ZhY3Rvcmllcy5weQpAQCAtMzMsOSArMzMsOSBAQCBmcm9tIHN0ZXBzIGltcG9ydCAoQXBw bHlQYXRjaCwgQXBwbHlXYXRjaExpc3QsIENoZWNrT3V0U291cmNlLCBDaGVja091dFNwZWNpZmlj UgogCiAKIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgotICAgIGRlZiBfX2lu aXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1Ob25lLCBhcmNoaXRlY3R1cmVzPU5v bmUsIGJ1aWxkT25seT1UcnVlLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5v bmUsIGNoZWNrUmVsZXZhbmNlPUZhbHNlLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5pdF9fKHNl bGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYnVp bGRPbmx5PVRydWUsIHRyaWdnZXJzPU5vbmUsIHJlbW90ZXM9Tm9uZSwgYWRkaXRpb25hbEFyZ3Vt ZW50cz1Ob25lLCBjaGVja1JlbGV2YW5jZT1GYWxzZSwgKiprd2FyZ3MpOgogICAgICAgICBmYWN0 b3J5LkJ1aWxkRmFjdG9yeS5fX2luaXRfXyhzZWxmKQotICAgICAgICBzZWxmLmFkZFN0ZXAoQ29u ZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGJ1aWxk T25seSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHMpKQorICAgICAgICBzZWxmLmFkZFN0 ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMs IGJ1aWxkT25seSwgdHJpZ2dlcnMsIHJlbW90ZXMsIGFkZGl0aW9uYWxBcmd1bWVudHMpKQogICAg ICAgICBpZiBjaGVja1JlbGV2YW5jZToKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChDaGVja1Bh dGNoUmVsZXZhbmNlKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKCkpCkBA IC00OSw5ICs0OSw5IEBAIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgogCiAK IGNsYXNzIFN0eWxlRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5p dF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9u ZSwgdHJpZ2dlcnM9Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6Cisg ICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hp dGVjdHVyZXM9Tm9uZSwgdHJpZ2dlcnM9Tm9uZSwgcmVtb3Rlcz1Ob25lLCBhZGRpdGlvbmFsQXJn dW1lbnRzPU5vbmUsICoqa3dhcmdzKToKICAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19p bml0X18oc2VsZikKLSAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkKHBsYXRmb3Jt LCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgdHJpZ2dlcnMsIGFkZGl0aW9u YWxBcmd1bWVudHMpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZv cm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCB0cmlnZ2VycywgcmVtb3Rl cywgYWRkaXRpb25hbEFyZ3VtZW50cykpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBh dGNoKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChQcmludENvbmZpZ3VyYXRpb24oKSkKICAgICAg ICAgc2VsZi5hZGRTdGVwKENoZWNrT3V0U291cmNlKCkpCkBAIC02MSw5ICs2MSw5IEBAIGNsYXNz IFN0eWxlRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CiAKIAogY2xhc3MgV2F0Y2hMaXN0 RmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBs YXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgdHJpZ2dlcnM9 Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5p dF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9u ZSwgdHJpZ2dlcnM9Tm9uZSwgcmVtb3Rlcz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUs ICoqa3dhcmdzKToKICAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19pbml0X18oc2VsZikK LSAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkKHBsYXRmb3JtLCBjb25maWd1cmF0 aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHMp KQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3Vy YXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCB0cmlnZ2VycywgcmVtb3RlcywgYWRkaXRpb25h bEFyZ3VtZW50cykpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKCkpCiAgICAg ICAgIHNlbGYuYWRkU3RlcChQcmludENvbmZpZ3VyYXRpb24oKSkKICAgICAgICAgc2VsZi5hZGRT dGVwKENoZWNrT3V0U291cmNlKCkpCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvbG9hZENvbmZpZy5weSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1i dWlsZC9sb2FkQ29uZmlnLnB5CmluZGV4IDZlMTRhNDM4NTJmYTg3NWU3NDY1MGE5NGM0ZTE5ZWQw NDk5NjU5YTMuLjcyMTQyM2EwYTI5OGFjODYzZWU1N2QyZWFjMTEwZjQxNjQ5ZjZhNmEgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmlnLnB5Cisr KyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmlnLnB5CkBAIC02 NSw3ICs2NSw3IEBAIGRlZiBsb2FkQnVpbGRlckNvbmZpZyhjLCBpc190ZXN0X21vZGVfZW5hYmxl ZD1GYWxzZSwgbWFzdGVyX3ByZWZpeF9wYXRoPScuLycpOgogICAgICAgICBpZiAnaWNvbicgaW4g YnVpbGRlcjoKICAgICAgICAgICAgIGRlbCBidWlsZGVyWydpY29uJ10KICAgICAgICAgZmFjdG9y eWt3YXJncyA9IHt9Ci0gICAgICAgIGZvciBrZXkgaW4gWydwbGF0Zm9ybScsICdjb25maWd1cmF0 aW9uJywgJ2FyY2hpdGVjdHVyZXMnLCAndHJpZ2dlcnMnLCAnYWRkaXRpb25hbEFyZ3VtZW50cycs ICdydW5UZXN0cyddOgorICAgICAgICBmb3Iga2V5IGluIFsncGxhdGZvcm0nLCAnY29uZmlndXJh dGlvbicsICdhcmNoaXRlY3R1cmVzJywgJ3RyaWdnZXJzJywgJ3JlbW90ZXMnLCAnYWRkaXRpb25h bEFyZ3VtZW50cycsICdydW5UZXN0cyddOgogICAgICAgICAgICAgdmFsdWUgPSBidWlsZGVyLnBv cChrZXksIE5vbmUpCiAgICAgICAgICAgICBpZiB2YWx1ZToKICAgICAgICAgICAgICAgICBmYWN0 b3J5a3dhcmdzW2tleV0gPSB2YWx1ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL3N0ZXBzLnB5IGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxk L3N0ZXBzLnB5CmluZGV4IDZjYTIwMTVlYjkzY2MxODBjZWZmMGI2Zjc0MDUzYzVjNjJlY2ViY2Uu LmUxOTZmZDYxMDJiZWQ0NzhkNzEzYjBiNWNlYmYxNzdiZDYxZWRiYzUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQorKysgYi9Ub29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKQEAgLTQ5LDcgKzQ5LDcgQEAgY2xhc3Mg Q29uZmlndXJlQnVpbGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgZGVzY3JpcHRpb24gPSBb J2NvbmZpZ3VyaW5nIGJ1aWxkJ10KICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ0NvbmZpZ3VyZWQg YnVpbGQnXQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9u LCBhcmNoaXRlY3R1cmVzLCBidWlsZE9ubHksIHRyaWdnZXJzLCBhZGRpdGlvbmFsQXJndW1lbnRz KToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hp dGVjdHVyZXMsIGJ1aWxkT25seSwgdHJpZ2dlcnMsIHJlbW90ZXMsIGFkZGl0aW9uYWxBcmd1bWVu dHMpOgogICAgICAgICBzdXBlcihDb25maWd1cmVCdWlsZCwgc2VsZikuX19pbml0X18oKQogICAg ICAgICBzZWxmLnBsYXRmb3JtID0gcGxhdGZvcm0KICAgICAgICAgaWYgcGxhdGZvcm0gIT0gJ2pz Yy1vbmx5JzoKQEAgLTU5LDYgKzU5LDcgQEAgY2xhc3MgQ29uZmlndXJlQnVpbGQoYnVpbGRzdGVw LkJ1aWxkU3RlcCk6CiAgICAgICAgIHNlbGYuYXJjaGl0ZWN0dXJlID0gJyAnLmpvaW4oYXJjaGl0 ZWN0dXJlcykgaWYgYXJjaGl0ZWN0dXJlcyBlbHNlIE5vbmUKICAgICAgICAgc2VsZi5idWlsZE9u bHkgPSBidWlsZE9ubHkKICAgICAgICAgc2VsZi50cmlnZ2VycyA9IHRyaWdnZXJzCisgICAgICAg IHNlbGYucmVtb3RlcyA9IHJlbW90ZXMKICAgICAgICAgc2VsZi5hZGRpdGlvbmFsQXJndW1lbnRz ID0gYWRkaXRpb25hbEFyZ3VtZW50cwogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgpAQCAtNzQsNiAr NzUsOCBAQCBjbGFzcyBDb25maWd1cmVCdWlsZChidWlsZHN0ZXAuQnVpbGRTdGVwKToKICAgICAg ICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1aWxkT25seScsIHNlbGYuYnVpbGRPbmx5LCAnY29u ZmlnLmpzb24nKQogICAgICAgICBpZiBzZWxmLnRyaWdnZXJzOgogICAgICAgICAgICAgc2VsZi5z ZXRQcm9wZXJ0eSgndHJpZ2dlcnMnLCBzZWxmLnRyaWdnZXJzLCAnY29uZmlnLmpzb24nKQorICAg ICAgICBpZiBzZWxmLnJlbW90ZXM6CisgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdyZW1v dGVzJywgc2VsZi5yZW1vdGVzLCAnY29uZmlnLmpzb24nKQogICAgICAgICBpZiBzZWxmLmFkZGl0 aW9uYWxBcmd1bWVudHM6CiAgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdhZGRpdGlvbmFs QXJndW1lbnRzJywgc2VsZi5hZGRpdGlvbmFsQXJndW1lbnRzLCAnY29uZmlnLmpzb24nKQogCkBA IC05MzEsNiArOTM0LDEwIEBAIGNsYXNzIFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMoc2hlbGwuVGVz dCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToKICAgICAgICAgc2hlbGwuVGVz dC5fX2luaXRfXyhzZWxmLCBsb2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJncykKIAorICAgICAgICAj IGFkZCByZW1vdGVzIGNvbmZpZ3VyYXRpb24gZmlsZSBwYXRoIHRvIHRoZSBjb21tYW5kIGxpbmUg aWYgbmVlZGVkCisgICAgICAgIGlmIHV0aWwuUHJvcGVydHkoJ3JlbW90ZXMnKToKKyAgICAgICAg ICAgIHNlbGYuY29tbWFuZC5hcHBlbmQoV2l0aFByb3BlcnRpZXMoJy0tcmVtb3RlLWNvbmZpZy1m aWxlPSUocmVtb3RlcylzJykpCisKICAgICBkZWYgc3RhcnQoc2VsZik6CiAgICAgICAgIGFwcGVu ZEN1c3RvbUJ1aWxkRmxhZ3Moc2VsZiwgc2VsZi5nZXRQcm9wZXJ0eSgncGxhdGZvcm0nKSwgc2Vs Zi5nZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJykpCiAgICAgICAgIHJldHVybiBzaGVsbC5UZXN0 LnN0YXJ0KHNlbGYpCg== 383038 2019-11-07 04:49:49 -0800 2019-11-07 06:27:14 -0800 Patch bug-203899-20191107134929.patch text/plain 6860 pmatos U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMTgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmYxMjY5YmU4ZDY4NmVlYmViN2Y2MDk5OTFiZDk2MjYy MTc1ZWRkMS4uODI2NDRiY2JlMmE3ZDQyYjVlODM5OTY1N2MyY2RiYzFlMjBmNjk0MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDE5LTExLTA3ICBQYXVsbyBNYXRvcyAgPHBtYXRvc0BpZ2FsaWEuY29tPgorCisgICAg ICAgIEFkZCBzdXBwb3J0IGZvciByZW1vdGVzIGZpbGUgZm9yIEVXUyBidWlsZGVycworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzODk5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVxdWlyZSB0byBzdXBw b3J0IGJ1aWxkZXJzIHRoYXQgY3Jvc3MtY29tcGlsZSBhbmQgcnVuIHRlc3RzIG9uIG5hdGl2ZSBt YWNoaW5lcworICAgICAgICB0aHJvdWdoIHRoZSB1c2Ugb2YgLS1yZW1vdGUtY29uZmlnLWZpbGUu CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Ogor ICAgICAgICAoRmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgIChTdHlsZUZhY3RvcnkuX19pbml0 X18pOgorICAgICAgICAoV2F0Y2hMaXN0RmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgICogQnVp bGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHk6CisgICAgICAgIChsb2FkQnVp bGRlckNvbmZpZyk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5OgorICAgICAgICAoQ29uZmlndXJlQnVpbGQuX19pbml0X18pOgorICAgICAgICAoQ29uZmln dXJlQnVpbGQuc3RhcnQpOgorICAgICAgICAoUnVuSmF2YVNjcmlwdENvcmVUZXN0cyk6CisKIDIw MTktMTEtMDYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJF R1JFU1NJT046IFsgaU9TIF0gKCByMjUxMDE1ICkgTGF5b3V0IFRlc3QgZmFzdC90ZXh0L3doaXRl c3BhY2UvcHJlLXdyYXAtb3ZlcmZsb3ctc2VsZWN0aW9uLmh0bWwgaXMgZmxha3kKZGlmZiAtLWdp dCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkgYi9Ub29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CmluZGV4IGExNmQyZjBh ODYwZGUzOWVlOWUyOWRmZWY1ZWU1Y2VlNzMzZGJmODMuLjZmMjZhMzNiMzlmMzNmNjk0ZGM5ZjUw ZDhhZjc0MTU0MTBlYzY0ZGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9mYWN0b3JpZXMucHkKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL2ZhY3Rvcmllcy5weQpAQCAtMzMsOSArMzMsOSBAQCBmcm9tIHN0ZXBzIGltcG9ydCAoQXBw bHlQYXRjaCwgQXBwbHlXYXRjaExpc3QsIENoZWNrT3V0U291cmNlLCBDaGVja091dFNwZWNpZmlj UgogCiAKIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgotICAgIGRlZiBfX2lu aXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1Ob25lLCBhcmNoaXRlY3R1cmVzPU5v bmUsIGJ1aWxkT25seT1UcnVlLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5v bmUsIGNoZWNrUmVsZXZhbmNlPUZhbHNlLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5pdF9fKHNl bGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYnVp bGRPbmx5PVRydWUsIHRyaWdnZXJzPU5vbmUsIHJlbW90ZXM9Tm9uZSwgYWRkaXRpb25hbEFyZ3Vt ZW50cz1Ob25lLCBjaGVja1JlbGV2YW5jZT1GYWxzZSwgKiprd2FyZ3MpOgogICAgICAgICBmYWN0 b3J5LkJ1aWxkRmFjdG9yeS5fX2luaXRfXyhzZWxmKQotICAgICAgICBzZWxmLmFkZFN0ZXAoQ29u ZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGJ1aWxk T25seSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHMpKQorICAgICAgICBzZWxmLmFkZFN0 ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMs IGJ1aWxkT25seSwgdHJpZ2dlcnMsIHJlbW90ZXMsIGFkZGl0aW9uYWxBcmd1bWVudHMpKQogICAg ICAgICBpZiBjaGVja1JlbGV2YW5jZToKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChDaGVja1Bh dGNoUmVsZXZhbmNlKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKCkpCkBA IC00OSw5ICs0OSw5IEBAIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgogCiAK IGNsYXNzIFN0eWxlRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5p dF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9u ZSwgdHJpZ2dlcnM9Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6Cisg ICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hp dGVjdHVyZXM9Tm9uZSwgdHJpZ2dlcnM9Tm9uZSwgcmVtb3Rlcz1Ob25lLCBhZGRpdGlvbmFsQXJn dW1lbnRzPU5vbmUsICoqa3dhcmdzKToKICAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19p bml0X18oc2VsZikKLSAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkKHBsYXRmb3Jt LCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgdHJpZ2dlcnMsIGFkZGl0aW9u YWxBcmd1bWVudHMpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZv cm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCB0cmlnZ2VycywgcmVtb3Rl cywgYWRkaXRpb25hbEFyZ3VtZW50cykpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBh dGNoKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChQcmludENvbmZpZ3VyYXRpb24oKSkKICAgICAg ICAgc2VsZi5hZGRTdGVwKENoZWNrT3V0U291cmNlKCkpCkBAIC02MSw5ICs2MSw5IEBAIGNsYXNz IFN0eWxlRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CiAKIAogY2xhc3MgV2F0Y2hMaXN0 RmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBs YXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgdHJpZ2dlcnM9 Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5p dF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9u ZSwgdHJpZ2dlcnM9Tm9uZSwgcmVtb3Rlcz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUs ICoqa3dhcmdzKToKICAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19pbml0X18oc2VsZikK LSAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkKHBsYXRmb3JtLCBjb25maWd1cmF0 aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHMp KQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3Vy YXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCB0cmlnZ2VycywgcmVtb3RlcywgYWRkaXRpb25h bEFyZ3VtZW50cykpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKCkpCiAgICAg ICAgIHNlbGYuYWRkU3RlcChQcmludENvbmZpZ3VyYXRpb24oKSkKICAgICAgICAgc2VsZi5hZGRT dGVwKENoZWNrT3V0U291cmNlKCkpCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvbG9hZENvbmZpZy5weSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1i dWlsZC9sb2FkQ29uZmlnLnB5CmluZGV4IDZlMTRhNDM4NTJmYTg3NWU3NDY1MGE5NGM0ZTE5ZWQw NDk5NjU5YTMuLjcyMTQyM2EwYTI5OGFjODYzZWU1N2QyZWFjMTEwZjQxNjQ5ZjZhNmEgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmlnLnB5Cisr KyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmlnLnB5CkBAIC02 NSw3ICs2NSw3IEBAIGRlZiBsb2FkQnVpbGRlckNvbmZpZyhjLCBpc190ZXN0X21vZGVfZW5hYmxl ZD1GYWxzZSwgbWFzdGVyX3ByZWZpeF9wYXRoPScuLycpOgogICAgICAgICBpZiAnaWNvbicgaW4g YnVpbGRlcjoKICAgICAgICAgICAgIGRlbCBidWlsZGVyWydpY29uJ10KICAgICAgICAgZmFjdG9y eWt3YXJncyA9IHt9Ci0gICAgICAgIGZvciBrZXkgaW4gWydwbGF0Zm9ybScsICdjb25maWd1cmF0 aW9uJywgJ2FyY2hpdGVjdHVyZXMnLCAndHJpZ2dlcnMnLCAnYWRkaXRpb25hbEFyZ3VtZW50cycs ICdydW5UZXN0cyddOgorICAgICAgICBmb3Iga2V5IGluIFsncGxhdGZvcm0nLCAnY29uZmlndXJh dGlvbicsICdhcmNoaXRlY3R1cmVzJywgJ3RyaWdnZXJzJywgJ3JlbW90ZXMnLCAnYWRkaXRpb25h bEFyZ3VtZW50cycsICdydW5UZXN0cyddOgogICAgICAgICAgICAgdmFsdWUgPSBidWlsZGVyLnBv cChrZXksIE5vbmUpCiAgICAgICAgICAgICBpZiB2YWx1ZToKICAgICAgICAgICAgICAgICBmYWN0 b3J5a3dhcmdzW2tleV0gPSB2YWx1ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL3N0ZXBzLnB5IGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxk L3N0ZXBzLnB5CmluZGV4IDZjYTIwMTVlYjkzY2MxODBjZWZmMGI2Zjc0MDUzYzVjNjJlY2ViY2Uu LjYyZTIxOTk4NGU3ZGM4ZjM0MDMyZTA0ZmM2ZmUxZjA0Nzg5NWIxN2UgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQorKysgYi9Ub29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKQEAgLTQ5LDcgKzQ5LDcgQEAgY2xhc3Mg Q29uZmlndXJlQnVpbGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgZGVzY3JpcHRpb24gPSBb J2NvbmZpZ3VyaW5nIGJ1aWxkJ10KICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ0NvbmZpZ3VyZWQg YnVpbGQnXQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9u LCBhcmNoaXRlY3R1cmVzLCBidWlsZE9ubHksIHRyaWdnZXJzLCBhZGRpdGlvbmFsQXJndW1lbnRz KToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hp dGVjdHVyZXMsIGJ1aWxkT25seSwgdHJpZ2dlcnMsIHJlbW90ZXMsIGFkZGl0aW9uYWxBcmd1bWVu dHMpOgogICAgICAgICBzdXBlcihDb25maWd1cmVCdWlsZCwgc2VsZikuX19pbml0X18oKQogICAg ICAgICBzZWxmLnBsYXRmb3JtID0gcGxhdGZvcm0KICAgICAgICAgaWYgcGxhdGZvcm0gIT0gJ2pz Yy1vbmx5JzoKQEAgLTU5LDYgKzU5LDcgQEAgY2xhc3MgQ29uZmlndXJlQnVpbGQoYnVpbGRzdGVw LkJ1aWxkU3RlcCk6CiAgICAgICAgIHNlbGYuYXJjaGl0ZWN0dXJlID0gJyAnLmpvaW4oYXJjaGl0 ZWN0dXJlcykgaWYgYXJjaGl0ZWN0dXJlcyBlbHNlIE5vbmUKICAgICAgICAgc2VsZi5idWlsZE9u bHkgPSBidWlsZE9ubHkKICAgICAgICAgc2VsZi50cmlnZ2VycyA9IHRyaWdnZXJzCisgICAgICAg IHNlbGYucmVtb3RlcyA9IHJlbW90ZXMKICAgICAgICAgc2VsZi5hZGRpdGlvbmFsQXJndW1lbnRz ID0gYWRkaXRpb25hbEFyZ3VtZW50cwogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgpAQCAtNzQsNiAr NzUsOCBAQCBjbGFzcyBDb25maWd1cmVCdWlsZChidWlsZHN0ZXAuQnVpbGRTdGVwKToKICAgICAg ICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1aWxkT25seScsIHNlbGYuYnVpbGRPbmx5LCAnY29u ZmlnLmpzb24nKQogICAgICAgICBpZiBzZWxmLnRyaWdnZXJzOgogICAgICAgICAgICAgc2VsZi5z ZXRQcm9wZXJ0eSgndHJpZ2dlcnMnLCBzZWxmLnRyaWdnZXJzLCAnY29uZmlnLmpzb24nKQorICAg ICAgICBpZiBzZWxmLnJlbW90ZXM6CisgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdyZW1v dGVzJywgc2VsZi5yZW1vdGVzLCAnY29uZmlnLmpzb24nKQogICAgICAgICBpZiBzZWxmLmFkZGl0 aW9uYWxBcmd1bWVudHM6CiAgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdhZGRpdGlvbmFs QXJndW1lbnRzJywgc2VsZi5hZGRpdGlvbmFsQXJndW1lbnRzLCAnY29uZmlnLmpzb24nKQogCkBA IC05MzEsNiArOTM0LDEwIEBAIGNsYXNzIFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMoc2hlbGwuVGVz dCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToKICAgICAgICAgc2hlbGwuVGVz dC5fX2luaXRfXyhzZWxmLCBsb2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJncykKIAorICAgICAgICAj IGFkZCByZW1vdGVzIGNvbmZpZ3VyYXRpb24gZmlsZSBwYXRoIHRvIHRoZSBjb21tYW5kIGxpbmUg aWYgbmVlZGVkCisgICAgICAgIGlmIHV0aWwuUHJvcGVydHkoJ3JlbW90ZXMnLCBGYWxzZSk6Cisg ICAgICAgICAgICBzZWxmLmNvbW1hbmQuYXBwZW5kKFdpdGhQcm9wZXJ0aWVzKCctLXJlbW90ZS1j b25maWctZmlsZT0lKHJlbW90ZXMpcycpKQorCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAg ICBhcHBlbmRDdXN0b21CdWlsZEZsYWdzKHNlbGYsIHNlbGYuZ2V0UHJvcGVydHkoJ3BsYXRmb3Jt JyksIHNlbGYuZ2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScpKQogICAgICAgICByZXR1cm4gc2hl bGwuVGVzdC5zdGFydChzZWxmKQo= 383042 2019-11-07 06:27:17 -0800 2019-11-07 07:20:50 -0800 Patch bug-203899-20191107152658.patch text/plain 6830 pmatos U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMTgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmYxMjY5YmU4ZDY4NmVlYmViN2Y2MDk5OTFiZDk2MjYy MTc1ZWRkMS4uODI2NDRiY2JlMmE3ZDQyYjVlODM5OTY1N2MyY2RiYzFlMjBmNjk0MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDE5LTExLTA3ICBQYXVsbyBNYXRvcyAgPHBtYXRvc0BpZ2FsaWEuY29tPgorCisgICAg ICAgIEFkZCBzdXBwb3J0IGZvciByZW1vdGVzIGZpbGUgZm9yIEVXUyBidWlsZGVycworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzODk5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVxdWlyZSB0byBzdXBw b3J0IGJ1aWxkZXJzIHRoYXQgY3Jvc3MtY29tcGlsZSBhbmQgcnVuIHRlc3RzIG9uIG5hdGl2ZSBt YWNoaW5lcworICAgICAgICB0aHJvdWdoIHRoZSB1c2Ugb2YgLS1yZW1vdGUtY29uZmlnLWZpbGUu CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Ogor ICAgICAgICAoRmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgIChTdHlsZUZhY3RvcnkuX19pbml0 X18pOgorICAgICAgICAoV2F0Y2hMaXN0RmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgICogQnVp bGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHk6CisgICAgICAgIChsb2FkQnVp bGRlckNvbmZpZyk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5OgorICAgICAgICAoQ29uZmlndXJlQnVpbGQuX19pbml0X18pOgorICAgICAgICAoQ29uZmln dXJlQnVpbGQuc3RhcnQpOgorICAgICAgICAoUnVuSmF2YVNjcmlwdENvcmVUZXN0cyk6CisKIDIw MTktMTEtMDYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJF R1JFU1NJT046IFsgaU9TIF0gKCByMjUxMDE1ICkgTGF5b3V0IFRlc3QgZmFzdC90ZXh0L3doaXRl c3BhY2UvcHJlLXdyYXAtb3ZlcmZsb3ctc2VsZWN0aW9uLmh0bWwgaXMgZmxha3kKZGlmZiAtLWdp dCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkgYi9Ub29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CmluZGV4IGExNmQyZjBh ODYwZGUzOWVlOWUyOWRmZWY1ZWU1Y2VlNzMzZGJmODMuLjZmMjZhMzNiMzlmMzNmNjk0ZGM5ZjUw ZDhhZjc0MTU0MTBlYzY0ZGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9mYWN0b3JpZXMucHkKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL2ZhY3Rvcmllcy5weQpAQCAtMzMsOSArMzMsOSBAQCBmcm9tIHN0ZXBzIGltcG9ydCAoQXBw bHlQYXRjaCwgQXBwbHlXYXRjaExpc3QsIENoZWNrT3V0U291cmNlLCBDaGVja091dFNwZWNpZmlj UgogCiAKIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgotICAgIGRlZiBfX2lu aXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1Ob25lLCBhcmNoaXRlY3R1cmVzPU5v bmUsIGJ1aWxkT25seT1UcnVlLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5v bmUsIGNoZWNrUmVsZXZhbmNlPUZhbHNlLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5pdF9fKHNl bGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYnVp bGRPbmx5PVRydWUsIHRyaWdnZXJzPU5vbmUsIHJlbW90ZXM9Tm9uZSwgYWRkaXRpb25hbEFyZ3Vt ZW50cz1Ob25lLCBjaGVja1JlbGV2YW5jZT1GYWxzZSwgKiprd2FyZ3MpOgogICAgICAgICBmYWN0 b3J5LkJ1aWxkRmFjdG9yeS5fX2luaXRfXyhzZWxmKQotICAgICAgICBzZWxmLmFkZFN0ZXAoQ29u ZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGJ1aWxk T25seSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHMpKQorICAgICAgICBzZWxmLmFkZFN0 ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMs IGJ1aWxkT25seSwgdHJpZ2dlcnMsIHJlbW90ZXMsIGFkZGl0aW9uYWxBcmd1bWVudHMpKQogICAg ICAgICBpZiBjaGVja1JlbGV2YW5jZToKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChDaGVja1Bh dGNoUmVsZXZhbmNlKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKCkpCkBA IC00OSw5ICs0OSw5IEBAIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgogCiAK IGNsYXNzIFN0eWxlRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5p dF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9u ZSwgdHJpZ2dlcnM9Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6Cisg ICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hp dGVjdHVyZXM9Tm9uZSwgdHJpZ2dlcnM9Tm9uZSwgcmVtb3Rlcz1Ob25lLCBhZGRpdGlvbmFsQXJn dW1lbnRzPU5vbmUsICoqa3dhcmdzKToKICAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19p bml0X18oc2VsZikKLSAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkKHBsYXRmb3Jt LCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgdHJpZ2dlcnMsIGFkZGl0aW9u YWxBcmd1bWVudHMpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZv cm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCB0cmlnZ2VycywgcmVtb3Rl cywgYWRkaXRpb25hbEFyZ3VtZW50cykpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBh dGNoKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChQcmludENvbmZpZ3VyYXRpb24oKSkKICAgICAg ICAgc2VsZi5hZGRTdGVwKENoZWNrT3V0U291cmNlKCkpCkBAIC02MSw5ICs2MSw5IEBAIGNsYXNz IFN0eWxlRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CiAKIAogY2xhc3MgV2F0Y2hMaXN0 RmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBs YXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgdHJpZ2dlcnM9 Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5p dF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9u ZSwgdHJpZ2dlcnM9Tm9uZSwgcmVtb3Rlcz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUs ICoqa3dhcmdzKToKICAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19pbml0X18oc2VsZikK LSAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkKHBsYXRmb3JtLCBjb25maWd1cmF0 aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHMp KQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3Vy YXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCB0cmlnZ2VycywgcmVtb3RlcywgYWRkaXRpb25h bEFyZ3VtZW50cykpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKCkpCiAgICAg ICAgIHNlbGYuYWRkU3RlcChQcmludENvbmZpZ3VyYXRpb24oKSkKICAgICAgICAgc2VsZi5hZGRT dGVwKENoZWNrT3V0U291cmNlKCkpCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvbG9hZENvbmZpZy5weSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1i dWlsZC9sb2FkQ29uZmlnLnB5CmluZGV4IDZlMTRhNDM4NTJmYTg3NWU3NDY1MGE5NGM0ZTE5ZWQw NDk5NjU5YTMuLjcyMTQyM2EwYTI5OGFjODYzZWU1N2QyZWFjMTEwZjQxNjQ5ZjZhNmEgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmlnLnB5Cisr KyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmlnLnB5CkBAIC02 NSw3ICs2NSw3IEBAIGRlZiBsb2FkQnVpbGRlckNvbmZpZyhjLCBpc190ZXN0X21vZGVfZW5hYmxl ZD1GYWxzZSwgbWFzdGVyX3ByZWZpeF9wYXRoPScuLycpOgogICAgICAgICBpZiAnaWNvbicgaW4g YnVpbGRlcjoKICAgICAgICAgICAgIGRlbCBidWlsZGVyWydpY29uJ10KICAgICAgICAgZmFjdG9y eWt3YXJncyA9IHt9Ci0gICAgICAgIGZvciBrZXkgaW4gWydwbGF0Zm9ybScsICdjb25maWd1cmF0 aW9uJywgJ2FyY2hpdGVjdHVyZXMnLCAndHJpZ2dlcnMnLCAnYWRkaXRpb25hbEFyZ3VtZW50cycs ICdydW5UZXN0cyddOgorICAgICAgICBmb3Iga2V5IGluIFsncGxhdGZvcm0nLCAnY29uZmlndXJh dGlvbicsICdhcmNoaXRlY3R1cmVzJywgJ3RyaWdnZXJzJywgJ3JlbW90ZXMnLCAnYWRkaXRpb25h bEFyZ3VtZW50cycsICdydW5UZXN0cyddOgogICAgICAgICAgICAgdmFsdWUgPSBidWlsZGVyLnBv cChrZXksIE5vbmUpCiAgICAgICAgICAgICBpZiB2YWx1ZToKICAgICAgICAgICAgICAgICBmYWN0 b3J5a3dhcmdzW2tleV0gPSB2YWx1ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL3N0ZXBzLnB5IGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxk L3N0ZXBzLnB5CmluZGV4IDZjYTIwMTVlYjkzY2MxODBjZWZmMGI2Zjc0MDUzYzVjNjJlY2ViY2Uu LjNjOTdmNzg0MWJkNGEzNTQ1Mjk4OTc4OWRhZmJhNWU3NWUwZjVkN2MgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQorKysgYi9Ub29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKQEAgLTQ5LDcgKzQ5LDcgQEAgY2xhc3Mg Q29uZmlndXJlQnVpbGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgZGVzY3JpcHRpb24gPSBb J2NvbmZpZ3VyaW5nIGJ1aWxkJ10KICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ0NvbmZpZ3VyZWQg YnVpbGQnXQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9u LCBhcmNoaXRlY3R1cmVzLCBidWlsZE9ubHksIHRyaWdnZXJzLCBhZGRpdGlvbmFsQXJndW1lbnRz KToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hp dGVjdHVyZXMsIGJ1aWxkT25seSwgdHJpZ2dlcnMsIHJlbW90ZXMsIGFkZGl0aW9uYWxBcmd1bWVu dHMpOgogICAgICAgICBzdXBlcihDb25maWd1cmVCdWlsZCwgc2VsZikuX19pbml0X18oKQogICAg ICAgICBzZWxmLnBsYXRmb3JtID0gcGxhdGZvcm0KICAgICAgICAgaWYgcGxhdGZvcm0gIT0gJ2pz Yy1vbmx5JzoKQEAgLTU5LDYgKzU5LDcgQEAgY2xhc3MgQ29uZmlndXJlQnVpbGQoYnVpbGRzdGVw LkJ1aWxkU3RlcCk6CiAgICAgICAgIHNlbGYuYXJjaGl0ZWN0dXJlID0gJyAnLmpvaW4oYXJjaGl0 ZWN0dXJlcykgaWYgYXJjaGl0ZWN0dXJlcyBlbHNlIE5vbmUKICAgICAgICAgc2VsZi5idWlsZE9u bHkgPSBidWlsZE9ubHkKICAgICAgICAgc2VsZi50cmlnZ2VycyA9IHRyaWdnZXJzCisgICAgICAg IHNlbGYucmVtb3RlcyA9IHJlbW90ZXMKICAgICAgICAgc2VsZi5hZGRpdGlvbmFsQXJndW1lbnRz ID0gYWRkaXRpb25hbEFyZ3VtZW50cwogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgpAQCAtNzQsNiAr NzUsOCBAQCBjbGFzcyBDb25maWd1cmVCdWlsZChidWlsZHN0ZXAuQnVpbGRTdGVwKToKICAgICAg ICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1aWxkT25seScsIHNlbGYuYnVpbGRPbmx5LCAnY29u ZmlnLmpzb24nKQogICAgICAgICBpZiBzZWxmLnRyaWdnZXJzOgogICAgICAgICAgICAgc2VsZi5z ZXRQcm9wZXJ0eSgndHJpZ2dlcnMnLCBzZWxmLnRyaWdnZXJzLCAnY29uZmlnLmpzb24nKQorICAg ICAgICBpZiBzZWxmLnJlbW90ZXM6CisgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdyZW1v dGVzJywgc2VsZi5yZW1vdGVzLCAnY29uZmlnLmpzb24nKQogICAgICAgICBpZiBzZWxmLmFkZGl0 aW9uYWxBcmd1bWVudHM6CiAgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdhZGRpdGlvbmFs QXJndW1lbnRzJywgc2VsZi5hZGRpdGlvbmFsQXJndW1lbnRzLCAnY29uZmlnLmpzb24nKQogCkBA IC05MzIsNiArOTM1LDEwIEBAIGNsYXNzIFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMoc2hlbGwuVGVz dCk6CiAgICAgICAgIHNoZWxsLlRlc3QuX19pbml0X18oc2VsZiwgbG9nRW52aXJvbj1GYWxzZSwg Kiprd2FyZ3MpCiAKICAgICBkZWYgc3RhcnQoc2VsZik6CisgICAgICAgICMgYWRkIHJlbW90ZXMg Y29uZmlndXJhdGlvbiBmaWxlIHBhdGggdG8gdGhlIGNvbW1hbmQgbGluZSBpZiBuZWVkZWQKKyAg ICAgICAgaWYgc2VsZi5nZXRQcm9wZXJ0eSgncmVtb3RlcycsIEZhbHNlKToKKyAgICAgICAgICAg IHNlbGYuY29tbWFuZC5hcHBlbmQoV2l0aFByb3BlcnRpZXMoJy0tcmVtb3RlLWNvbmZpZy1maWxl PSUocmVtb3RlcylzJykpCisKICAgICAgICAgYXBwZW5kQ3VzdG9tQnVpbGRGbGFncyhzZWxmLCBz ZWxmLmdldFByb3BlcnR5KCdwbGF0Zm9ybScpLCBzZWxmLmdldFByb3BlcnR5KCdmdWxsUGxhdGZv cm0nKSkKICAgICAgICAgcmV0dXJuIHNoZWxsLlRlc3Quc3RhcnQoc2VsZikKIAo= 383044 2019-11-07 07:20:53 -0800 2019-11-07 07:42:29 -0800 Patch bug-203899-20191107162033.patch text/plain 9690 pmatos U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMTgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmYxMjY5YmU4ZDY4NmVlYmViN2Y2MDk5OTFiZDk2MjYy MTc1ZWRkMS4uY2FjYzZkMmRlMjIwYzgzODVmNTM0NzA5NjhmNjUwODM4NWJlMjE4OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDE5LTExLTA3ICBQYXVsbyBNYXRvcyAgPHBtYXRvc0BpZ2FsaWEuY29tPgorCisgICAg ICAgIEFkZCBzdXBwb3J0IGZvciByZW1vdGVzIGZpbGUgZm9yIEVXUyBidWlsZGVycworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzODk5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVxdWlyZSB0byBzdXBw b3J0IGJ1aWxkZXJzIHRoYXQgY3Jvc3MtY29tcGlsZSBhbmQgcnVuIHRlc3RzIG9uIG5hdGl2ZSBt YWNoaW5lcworICAgICAgICB0aHJvdWdoIHRoZSB1c2Ugb2YgLS1yZW1vdGUtY29uZmlnLWZpbGUu CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Ogor ICAgICAgICAoRmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgIChTdHlsZUZhY3RvcnkuX19pbml0 X18pOgorICAgICAgICAoV2F0Y2hMaXN0RmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgICogQnVp bGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHk6CisgICAgICAgIChsb2FkQnVp bGRlckNvbmZpZyk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5OgorICAgICAgICAoQ29uZmlndXJlQnVpbGQuX19pbml0X18pOgorICAgICAgICAoQ29uZmln dXJlQnVpbGQuc3RhcnQpOgorICAgICAgICAoUnVuSmF2YVNjcmlwdENvcmVUZXN0cy5zdGFydCk6 CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5 OgorICAgICAgICAoVGVzdFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMudGVzdF9mYWlsdXJlKToKKyAg ICAgICAgKFRlc3RSdW5KYXZhU2NyaXB0Q29yZVJlbW90ZVRlc3RzKToKKyAgICAgICAgKFRlc3RS dW5KYXZhU2NyaXB0Q29yZVJlbW90ZVRlc3RzLnNldFVwKToKKyAgICAgICAgKFRlc3RSdW5KYXZh U2NyaXB0Q29yZVJlbW90ZVRlc3RzLnRlYXJEb3duKToKKyAgICAgICAgKFRlc3RSdW5KYXZhU2Ny aXB0Q29yZVJlbW90ZVRlc3RzLnRlc3Rfc3VjY2Vzcyk6CisKIDIwMTktMTEtMDYgIEFudHRpIEtv aXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IFsgaU9TIF0g KCByMjUxMDE1ICkgTGF5b3V0IFRlc3QgZmFzdC90ZXh0L3doaXRlc3BhY2UvcHJlLXdyYXAtb3Zl cmZsb3ctc2VsZWN0aW9uLmh0bWwgaXMgZmxha3kKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CmluZGV4IGExNmQyZjBhODYwZGUzOWVlOWUyOWRmZWY1 ZWU1Y2VlNzMzZGJmODMuLjZmMjZhMzNiMzlmMzNmNjk0ZGM5ZjUwZDhhZjc0MTU0MTBlYzY0ZGYg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMu cHkKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQpA QCAtMzMsOSArMzMsOSBAQCBmcm9tIHN0ZXBzIGltcG9ydCAoQXBwbHlQYXRjaCwgQXBwbHlXYXRj aExpc3QsIENoZWNrT3V0U291cmNlLCBDaGVja091dFNwZWNpZmljUgogCiAKIGNsYXNzIEZhY3Rv cnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9y bSwgY29uZmlndXJhdGlvbj1Ob25lLCBhcmNoaXRlY3R1cmVzPU5vbmUsIGJ1aWxkT25seT1UcnVl LCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsIGNoZWNrUmVsZXZhbmNl PUZhbHNlLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25m aWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYnVpbGRPbmx5PVRydWUsIHRyaWdn ZXJzPU5vbmUsIHJlbW90ZXM9Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCBjaGVja1Jl bGV2YW5jZT1GYWxzZSwgKiprd2FyZ3MpOgogICAgICAgICBmYWN0b3J5LkJ1aWxkRmFjdG9yeS5f X2luaXRfXyhzZWxmKQotICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZv cm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGJ1aWxkT25seSwgdHJpZ2dlcnMsIGFk ZGl0aW9uYWxBcmd1bWVudHMpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQo cGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGJ1aWxkT25seSwgdHJpZ2dl cnMsIHJlbW90ZXMsIGFkZGl0aW9uYWxBcmd1bWVudHMpKQogICAgICAgICBpZiBjaGVja1JlbGV2 YW5jZToKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChDaGVja1BhdGNoUmVsZXZhbmNlKCkpCiAg ICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKCkpCkBAIC00OSw5ICs0OSw5IEBAIGNs YXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgogCiAKIGNsYXNzIFN0eWxlRmFjdG9y eShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3Jt LCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgdHJpZ2dlcnM9Tm9uZSwg YWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5pdF9fKHNl bGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgdHJp Z2dlcnM9Tm9uZSwgcmVtb3Rlcz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsICoqa3dh cmdzKToKICAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19pbml0X18oc2VsZikKLSAgICAg ICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkKHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBh cmNoaXRlY3R1cmVzLCBGYWxzZSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHMpKQorICAg ICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24s IGFyY2hpdGVjdHVyZXMsIEZhbHNlLCB0cmlnZ2VycywgcmVtb3RlcywgYWRkaXRpb25hbEFyZ3Vt ZW50cykpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKCkpCiAgICAgICAgIHNl bGYuYWRkU3RlcChQcmludENvbmZpZ3VyYXRpb24oKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKENo ZWNrT3V0U291cmNlKCkpCkBAIC02MSw5ICs2MSw5IEBAIGNsYXNzIFN0eWxlRmFjdG9yeShmYWN0 b3J5LkJ1aWxkRmFjdG9yeSk6CiAKIAogY2xhc3MgV2F0Y2hMaXN0RmFjdG9yeShmYWN0b3J5LkJ1 aWxkRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0 aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgdHJpZ2dlcnM9Tm9uZSwgYWRkaXRpb25hbEFy Z3VtZW50cz1Ob25lLCAqKmt3YXJncyk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3Jt LCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgdHJpZ2dlcnM9Tm9uZSwg cmVtb3Rlcz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsICoqa3dhcmdzKToKICAgICAg ICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19pbml0X18oc2VsZikKLSAgICAgICAgc2VsZi5hZGRT dGVwKENvbmZpZ3VyZUJ1aWxkKHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVz LCBGYWxzZSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHMpKQorICAgICAgICBzZWxmLmFk ZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVy ZXMsIEZhbHNlLCB0cmlnZ2VycywgcmVtb3RlcywgYWRkaXRpb25hbEFyZ3VtZW50cykpCiAgICAg ICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChQ cmludENvbmZpZ3VyYXRpb24oKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKENoZWNrT3V0U291cmNl KCkpCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvbG9hZENv bmZpZy5weSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmlnLnB5 CmluZGV4IDZlMTRhNDM4NTJmYTg3NWU3NDY1MGE5NGM0ZTE5ZWQwNDk5NjU5YTMuLjcyMTQyM2Ew YTI5OGFjODYzZWU1N2QyZWFjMTEwZjQxNjQ5ZjZhNmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmlnLnB5CisrKyBiL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmlnLnB5CkBAIC02NSw3ICs2NSw3IEBAIGRlZiBs b2FkQnVpbGRlckNvbmZpZyhjLCBpc190ZXN0X21vZGVfZW5hYmxlZD1GYWxzZSwgbWFzdGVyX3By ZWZpeF9wYXRoPScuLycpOgogICAgICAgICBpZiAnaWNvbicgaW4gYnVpbGRlcjoKICAgICAgICAg ICAgIGRlbCBidWlsZGVyWydpY29uJ10KICAgICAgICAgZmFjdG9yeWt3YXJncyA9IHt9Ci0gICAg ICAgIGZvciBrZXkgaW4gWydwbGF0Zm9ybScsICdjb25maWd1cmF0aW9uJywgJ2FyY2hpdGVjdHVy ZXMnLCAndHJpZ2dlcnMnLCAnYWRkaXRpb25hbEFyZ3VtZW50cycsICdydW5UZXN0cyddOgorICAg ICAgICBmb3Iga2V5IGluIFsncGxhdGZvcm0nLCAnY29uZmlndXJhdGlvbicsICdhcmNoaXRlY3R1 cmVzJywgJ3RyaWdnZXJzJywgJ3JlbW90ZXMnLCAnYWRkaXRpb25hbEFyZ3VtZW50cycsICdydW5U ZXN0cyddOgogICAgICAgICAgICAgdmFsdWUgPSBidWlsZGVyLnBvcChrZXksIE5vbmUpCiAgICAg ICAgICAgICBpZiB2YWx1ZToKICAgICAgICAgICAgICAgICBmYWN0b3J5a3dhcmdzW2tleV0gPSB2 YWx1ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5IGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CmluZGV4IDZj YTIwMTVlYjkzY2MxODBjZWZmMGI2Zjc0MDUzYzVjNjJlY2ViY2UuLmIzYjU1NjU0ZjE1ZDc1YjNh MjdhMWI1MzcwNzY3MzNiNGY1YzZmZDEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2V3cy1idWlsZC9zdGVwcy5weQorKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YnVpbGQvc3RlcHMucHkKQEAgLTQ5LDcgKzQ5LDcgQEAgY2xhc3MgQ29uZmlndXJlQnVpbGQoYnVp bGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgZGVzY3JpcHRpb24gPSBbJ2NvbmZpZ3VyaW5nIGJ1aWxk J10KICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ0NvbmZpZ3VyZWQgYnVpbGQnXQogCi0gICAgZGVm IF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBi dWlsZE9ubHksIHRyaWdnZXJzLCBhZGRpdGlvbmFsQXJndW1lbnRzKToKKyAgICBkZWYgX19pbml0 X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIGJ1aWxkT25s eSwgdHJpZ2dlcnMsIHJlbW90ZXMsIGFkZGl0aW9uYWxBcmd1bWVudHMpOgogICAgICAgICBzdXBl cihDb25maWd1cmVCdWlsZCwgc2VsZikuX19pbml0X18oKQogICAgICAgICBzZWxmLnBsYXRmb3Jt ID0gcGxhdGZvcm0KICAgICAgICAgaWYgcGxhdGZvcm0gIT0gJ2pzYy1vbmx5JzoKQEAgLTU5LDYg KzU5LDcgQEAgY2xhc3MgQ29uZmlndXJlQnVpbGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAg ICAgIHNlbGYuYXJjaGl0ZWN0dXJlID0gJyAnLmpvaW4oYXJjaGl0ZWN0dXJlcykgaWYgYXJjaGl0 ZWN0dXJlcyBlbHNlIE5vbmUKICAgICAgICAgc2VsZi5idWlsZE9ubHkgPSBidWlsZE9ubHkKICAg ICAgICAgc2VsZi50cmlnZ2VycyA9IHRyaWdnZXJzCisgICAgICAgIHNlbGYucmVtb3RlcyA9IHJl bW90ZXMKICAgICAgICAgc2VsZi5hZGRpdGlvbmFsQXJndW1lbnRzID0gYWRkaXRpb25hbEFyZ3Vt ZW50cwogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgpAQCAtNzQsNiArNzUsOCBAQCBjbGFzcyBDb25m aWd1cmVCdWlsZChidWlsZHN0ZXAuQnVpbGRTdGVwKToKICAgICAgICAgICAgIHNlbGYuc2V0UHJv cGVydHkoJ2J1aWxkT25seScsIHNlbGYuYnVpbGRPbmx5LCAnY29uZmlnLmpzb24nKQogICAgICAg ICBpZiBzZWxmLnRyaWdnZXJzOgogICAgICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgndHJpZ2dl cnMnLCBzZWxmLnRyaWdnZXJzLCAnY29uZmlnLmpzb24nKQorICAgICAgICBpZiBzZWxmLnJlbW90 ZXM6CisgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdyZW1vdGVzJywgc2VsZi5yZW1vdGVz LCAnY29uZmlnLmpzb24nKQogICAgICAgICBpZiBzZWxmLmFkZGl0aW9uYWxBcmd1bWVudHM6CiAg ICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdhZGRpdGlvbmFsQXJndW1lbnRzJywgc2VsZi5h ZGRpdGlvbmFsQXJndW1lbnRzLCAnY29uZmlnLmpzb24nKQogCkBAIC05MzIsNiArOTM1LDExIEBA IGNsYXNzIFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMoc2hlbGwuVGVzdCk6CiAgICAgICAgIHNoZWxs LlRlc3QuX19pbml0X18oc2VsZiwgbG9nRW52aXJvbj1GYWxzZSwgKiprd2FyZ3MpCiAKICAgICBk ZWYgc3RhcnQoc2VsZik6CisgICAgICAgICMgYWRkIHJlbW90ZXMgY29uZmlndXJhdGlvbiBmaWxl IHBhdGggdG8gdGhlIGNvbW1hbmQgbGluZSBpZiBuZWVkZWQKKyAgICAgICAgcmVtb3Rlc2ZpbGUg PSBzZWxmLmdldFByb3BlcnR5KCdyZW1vdGVzJywgRmFsc2UpCisgICAgICAgIGlmIHJlbW90ZXNm aWxlOgorICAgICAgICAgICAgc2VsZi5jb21tYW5kLmFwcGVuZCgnLS1yZW1vdGUtY29uZmlnLWZp bGU9ezB9Jy5mb3JtYXQocmVtb3Rlc2ZpbGUpKQorCiAgICAgICAgIGFwcGVuZEN1c3RvbUJ1aWxk RmxhZ3Moc2VsZiwgc2VsZi5nZXRQcm9wZXJ0eSgncGxhdGZvcm0nKSwgc2VsZi5nZXRQcm9wZXJ0 eSgnZnVsbFBsYXRmb3JtJykpCiAgICAgICAgIHJldHVybiBzaGVsbC5UZXN0LnN0YXJ0KHNlbGYp CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191 bml0dGVzdC5weSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0 dGVzdC5weQppbmRleCA1MmFhNDdlN2MyMzExNWI3YzUzOGU5MGMwMTc1OTcwNTFmNjc1M2RiLi42 NWY2Yjk1MmMzODliMTA1OTIwOWRjMWZiMWM5OTJmNzM4NDNhYzY5IDEwMDY0NAotLS0gYS9Ub29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkKKysrIGIvVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CkBAIC0xMDI4 LDYgKzEwMjgsNDggQEAgY2xhc3MgVGVzdFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMoQnVpbGRTdGVw TWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgcmV0dXJuIHNlbGYu cnVuU3RlcCgpCiAKIAorY2xhc3MgVGVzdFJ1bkphdmFTY3JpcHRDb3JlUmVtb3RlVGVzdHMoQnVp bGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICBkZWYgc2V0VXAo c2VsZik6CisgICAgICAgIHNlbGYubG9uZ01lc3NhZ2UgPSBUcnVlCisgICAgICAgIHNlbGYuanNv bkZpbGVOYW1lID0gJ2pzY19yZXN1bHRzLmpzb24nCisgICAgICAgIHJldHVybiBzZWxmLnNldFVw QnVpbGRTdGVwKCkKKworICAgIGRlZiB0ZWFyRG93bihzZWxmKToKKyAgICAgICAgcmV0dXJuIHNl bGYudGVhckRvd25CdWlsZFN0ZXAoKQorCisgICAgZGVmIHRlc3Rfc3VjY2VzcyhzZWxmKToKKyAg ICAgICAgc2VsZi5zZXR1cFN0ZXAoUnVuSmF2YVNjcmlwdENvcmVUZXN0cygpKQorICAgICAgICBz ZWxmLnNldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0nLCAnanNjLW9ubHknKQorICAgICAgICBzZWxm LnNldFByb3BlcnR5KCdjb25maWd1cmF0aW9uJywgJ3JlbGVhc2UnKQorICAgICAgICBzZWxmLnNl dFByb3BlcnR5KCdyZW1vdGVzJywgJ3JlbW90ZS1tYWNoaW5lcy5qc29uJykKKyAgICAgICAgc2Vs Zi5leHBlY3RSZW1vdGVDb21tYW5kcygKKyAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9 J3drZGlyJywKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCisgICAg ICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsncGVybCcsICdUb29scy9TY3JpcHRzL3J1bi1q YXZhc2NyaXB0Y29yZS10ZXN0cycsICctLW5vLWJ1aWxkJywgJy0tbm8tZmFpbC1mYXN0JywgJy0t anNvbi1vdXRwdXQ9ezB9Jy5mb3JtYXQoc2VsZi5qc29uRmlsZU5hbWUpLCAnLS1yZWxlYXNlJywg Jy0tcmVtb3RlLWNvbmZpZy1maWxlPXJlbW90ZS1tYWNoaW5lcy5qc29uJ10sCisgICAgICAgICAg ICAgICAgICAgICAgICBsb2dmaWxlcz17J2pzb24nOiBzZWxmLmpzb25GaWxlTmFtZX0sCisgICAg ICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICArIDAsCisgICAgICAgICkKKyAgICAg ICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9J1Bhc3Nl ZCBKU0MgdGVzdHMnKQorICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKworICAgIGRlZiB0 ZXN0X2ZhaWx1cmUoc2VsZik6CisgICAgICAgIHNlbGYuc2V0dXBTdGVwKFJ1bkphdmFTY3JpcHRD b3JlVGVzdHMoKSkKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJywgJ2pz Yy1vbmx5JykKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdkZWJ1 ZycpCisgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAgICBFeHBl Y3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZp cm9uPUZhbHNlLAorICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3BlcmwnLCAnVG9v bHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMnLCAnLS1uby1idWlsZCcsICctLW5v LWZhaWwtZmFzdCcsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNlbGYuanNvbkZpbGVOYW1l KSwgJy0tZGVidWcnXSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ2ZpbGVzPXsnanNvbic6 IHNlbGYuanNvbkZpbGVOYW1lfSwKKyAgICAgICAgICAgICAgICAgICAgICAgICkKKyAgICAgICAg ICAgICsgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nOSBmYWlsdXJlcyBmb3VuZC4n KQorICAgICAgICAgICAgKyAyLAorICAgICAgICApCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29t ZShyZXN1bHQ9RkFJTFVSRSwgc3RhdGVfc3RyaW5nPSdqc2NvcmUtdGVzdHMgKGZhaWx1cmUpJykK KyAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCisKKwogY2xhc3MgVGVzdFJlUnVuSmF2YVNj cmlwdENvcmVUZXN0cyhCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2Up OgogICAgIGRlZiBzZXRVcChzZWxmKToKICAgICAgICAgc2VsZi5sb25nTWVzc2FnZSA9IFRydWUK 383047 2019-11-07 07:42:32 -0800 2019-11-07 08:32:11 -0800 Patch bug-203899-20191107164212.patch text/plain 8486 pmatos U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMTgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmYxMjY5YmU4ZDY4NmVlYmViN2Y2MDk5OTFiZDk2MjYy MTc1ZWRkMS4uMWI0NDljNGZiNTRkNzUzYzc2M2U2MTU0OGI5NTg5ODMwM2EwZDE1YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDE5LTExLTA3ICBQYXVsbyBNYXRvcyAgPHBtYXRvc0BpZ2FsaWEuY29tPgorCisgICAg ICAgIEFkZCBzdXBwb3J0IGZvciByZW1vdGVzIGZpbGUgZm9yIEVXUyBidWlsZGVycworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzODk5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVxdWlyZSB0byBzdXBw b3J0IGJ1aWxkZXJzIHRoYXQgY3Jvc3MtY29tcGlsZSBhbmQgcnVuIHRlc3RzIG9uIG5hdGl2ZSBt YWNoaW5lcworICAgICAgICB0aHJvdWdoIHRoZSB1c2Ugb2YgLS1yZW1vdGUtY29uZmlnLWZpbGUu CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Ogor ICAgICAgICAoRmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgIChTdHlsZUZhY3RvcnkuX19pbml0 X18pOgorICAgICAgICAoV2F0Y2hMaXN0RmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgICogQnVp bGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcucHk6CisgICAgICAgIChsb2FkQnVp bGRlckNvbmZpZyk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5OgorICAgICAgICAoQ29uZmlndXJlQnVpbGQuX19pbml0X18pOgorICAgICAgICAoQ29uZmln dXJlQnVpbGQuc3RhcnQpOgorICAgICAgICAoUnVuSmF2YVNjcmlwdENvcmVUZXN0cy5zdGFydCk6 CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5 OgorICAgICAgICAoVGVzdFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMudGVzdF9yZW1vdGVfc3VjY2Vz cyk6CisKIDIwMTktMTEtMDYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAg ICAgICAgIFJFR1JFU1NJT046IFsgaU9TIF0gKCByMjUxMDE1ICkgTGF5b3V0IFRlc3QgZmFzdC90 ZXh0L3doaXRlc3BhY2UvcHJlLXdyYXAtb3ZlcmZsb3ctc2VsZWN0aW9uLmh0bWwgaXMgZmxha3kK ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMu cHkgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CmluZGV4 IGExNmQyZjBhODYwZGUzOWVlOWUyOWRmZWY1ZWU1Y2VlNzMzZGJmODMuLjZmMjZhMzNiMzlmMzNm Njk0ZGM5ZjUwZDhhZjc0MTU0MTBlYzY0ZGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQpAQCAtMzMsOSArMzMsOSBAQCBmcm9tIHN0ZXBzIGlt cG9ydCAoQXBwbHlQYXRjaCwgQXBwbHlXYXRjaExpc3QsIENoZWNrT3V0U291cmNlLCBDaGVja091 dFNwZWNpZmljUgogCiAKIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgotICAg IGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1Ob25lLCBhcmNoaXRl Y3R1cmVzPU5vbmUsIGJ1aWxkT25seT1UcnVlLCB0cmlnZ2Vycz1Ob25lLCBhZGRpdGlvbmFsQXJn dW1lbnRzPU5vbmUsIGNoZWNrUmVsZXZhbmNlPUZhbHNlLCAqKmt3YXJncyk6CisgICAgZGVmIF9f aW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9 Tm9uZSwgYnVpbGRPbmx5PVRydWUsIHRyaWdnZXJzPU5vbmUsIHJlbW90ZXM9Tm9uZSwgYWRkaXRp b25hbEFyZ3VtZW50cz1Ob25lLCBjaGVja1JlbGV2YW5jZT1GYWxzZSwgKiprd2FyZ3MpOgogICAg ICAgICBmYWN0b3J5LkJ1aWxkRmFjdG9yeS5fX2luaXRfXyhzZWxmKQotICAgICAgICBzZWxmLmFk ZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVy ZXMsIGJ1aWxkT25seSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxBcmd1bWVudHMpKQorICAgICAgICBz ZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hp dGVjdHVyZXMsIGJ1aWxkT25seSwgdHJpZ2dlcnMsIHJlbW90ZXMsIGFkZGl0aW9uYWxBcmd1bWVu dHMpKQogICAgICAgICBpZiBjaGVja1JlbGV2YW5jZToKICAgICAgICAgICAgIHNlbGYuYWRkU3Rl cChDaGVja1BhdGNoUmVsZXZhbmNlKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBh dGNoKCkpCkBAIC00OSw5ICs0OSw5IEBAIGNsYXNzIEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3Rv cnkpOgogCiAKIGNsYXNzIFN0eWxlRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAg ZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVj dHVyZXM9Tm9uZSwgdHJpZ2dlcnM9Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3 YXJncyk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5v bmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgdHJpZ2dlcnM9Tm9uZSwgcmVtb3Rlcz1Ob25lLCBhZGRp dGlvbmFsQXJndW1lbnRzPU5vbmUsICoqa3dhcmdzKToKICAgICAgICAgZmFjdG9yeS5CdWlsZEZh Y3RvcnkuX19pbml0X18oc2VsZikKLSAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxk KHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgdHJpZ2dlcnMs IGFkZGl0aW9uYWxBcmd1bWVudHMpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVp bGQocGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCB0cmlnZ2Vy cywgcmVtb3RlcywgYWRkaXRpb25hbEFyZ3VtZW50cykpCiAgICAgICAgIHNlbGYuYWRkU3RlcChW YWxpZGF0ZVBhdGNoKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChQcmludENvbmZpZ3VyYXRpb24o KSkKICAgICAgICAgc2VsZi5hZGRTdGVwKENoZWNrT3V0U291cmNlKCkpCkBAIC02MSw5ICs2MSw5 IEBAIGNsYXNzIFN0eWxlRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CiAKIAogY2xhc3Mg V2F0Y2hMaXN0RmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6Ci0gICAgZGVmIF9faW5pdF9f KHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwg dHJpZ2dlcnM9Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6CisgICAg ZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVj dHVyZXM9Tm9uZSwgdHJpZ2dlcnM9Tm9uZSwgcmVtb3Rlcz1Ob25lLCBhZGRpdGlvbmFsQXJndW1l bnRzPU5vbmUsICoqa3dhcmdzKToKICAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19pbml0 X18oc2VsZikKLSAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkKHBsYXRmb3JtLCBj b25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgdHJpZ2dlcnMsIGFkZGl0aW9uYWxB cmd1bWVudHMpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ29uZmlndXJlQnVpbGQocGxhdGZvcm0s IGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCB0cmlnZ2VycywgcmVtb3Rlcywg YWRkaXRpb25hbEFyZ3VtZW50cykpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNo KCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChQcmludENvbmZpZ3VyYXRpb24oKSkKICAgICAgICAg c2VsZi5hZGRTdGVwKENoZWNrT3V0U291cmNlKCkpCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9ld3MtYnVpbGQvbG9hZENvbmZpZy5weSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2V3cy1idWlsZC9sb2FkQ29uZmlnLnB5CmluZGV4IDZlMTRhNDM4NTJmYTg3NWU3NDY1MGE5 NGM0ZTE5ZWQwNDk5NjU5YTMuLjcyMTQyM2EwYTI5OGFjODYzZWU1N2QyZWFjMTEwZjQxNjQ5ZjZh NmEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29u ZmlnLnB5CisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmln LnB5CkBAIC02NSw3ICs2NSw3IEBAIGRlZiBsb2FkQnVpbGRlckNvbmZpZyhjLCBpc190ZXN0X21v ZGVfZW5hYmxlZD1GYWxzZSwgbWFzdGVyX3ByZWZpeF9wYXRoPScuLycpOgogICAgICAgICBpZiAn aWNvbicgaW4gYnVpbGRlcjoKICAgICAgICAgICAgIGRlbCBidWlsZGVyWydpY29uJ10KICAgICAg ICAgZmFjdG9yeWt3YXJncyA9IHt9Ci0gICAgICAgIGZvciBrZXkgaW4gWydwbGF0Zm9ybScsICdj b25maWd1cmF0aW9uJywgJ2FyY2hpdGVjdHVyZXMnLCAndHJpZ2dlcnMnLCAnYWRkaXRpb25hbEFy Z3VtZW50cycsICdydW5UZXN0cyddOgorICAgICAgICBmb3Iga2V5IGluIFsncGxhdGZvcm0nLCAn Y29uZmlndXJhdGlvbicsICdhcmNoaXRlY3R1cmVzJywgJ3RyaWdnZXJzJywgJ3JlbW90ZXMnLCAn YWRkaXRpb25hbEFyZ3VtZW50cycsICdydW5UZXN0cyddOgogICAgICAgICAgICAgdmFsdWUgPSBi dWlsZGVyLnBvcChrZXksIE5vbmUpCiAgICAgICAgICAgICBpZiB2YWx1ZToKICAgICAgICAgICAg ICAgICBmYWN0b3J5a3dhcmdzW2tleV0gPSB2YWx1ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5IGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv ZXdzLWJ1aWxkL3N0ZXBzLnB5CmluZGV4IDZjYTIwMTVlYjkzY2MxODBjZWZmMGI2Zjc0MDUzYzVj NjJlY2ViY2UuLmIzYjU1NjU0ZjE1ZDc1YjNhMjdhMWI1MzcwNzY3MzNiNGY1YzZmZDEgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQorKysgYi9U b29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKQEAgLTQ5LDcgKzQ5LDcg QEAgY2xhc3MgQ29uZmlndXJlQnVpbGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgZGVzY3Jp cHRpb24gPSBbJ2NvbmZpZ3VyaW5nIGJ1aWxkJ10KICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ0Nv bmZpZ3VyZWQgYnVpbGQnXQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25m aWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBidWlsZE9ubHksIHRyaWdnZXJzLCBhZGRpdGlvbmFs QXJndW1lbnRzKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRp b24sIGFyY2hpdGVjdHVyZXMsIGJ1aWxkT25seSwgdHJpZ2dlcnMsIHJlbW90ZXMsIGFkZGl0aW9u YWxBcmd1bWVudHMpOgogICAgICAgICBzdXBlcihDb25maWd1cmVCdWlsZCwgc2VsZikuX19pbml0 X18oKQogICAgICAgICBzZWxmLnBsYXRmb3JtID0gcGxhdGZvcm0KICAgICAgICAgaWYgcGxhdGZv cm0gIT0gJ2pzYy1vbmx5JzoKQEAgLTU5LDYgKzU5LDcgQEAgY2xhc3MgQ29uZmlndXJlQnVpbGQo YnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgICAgIHNlbGYuYXJjaGl0ZWN0dXJlID0gJyAnLmpv aW4oYXJjaGl0ZWN0dXJlcykgaWYgYXJjaGl0ZWN0dXJlcyBlbHNlIE5vbmUKICAgICAgICAgc2Vs Zi5idWlsZE9ubHkgPSBidWlsZE9ubHkKICAgICAgICAgc2VsZi50cmlnZ2VycyA9IHRyaWdnZXJz CisgICAgICAgIHNlbGYucmVtb3RlcyA9IHJlbW90ZXMKICAgICAgICAgc2VsZi5hZGRpdGlvbmFs QXJndW1lbnRzID0gYWRkaXRpb25hbEFyZ3VtZW50cwogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgpA QCAtNzQsNiArNzUsOCBAQCBjbGFzcyBDb25maWd1cmVCdWlsZChidWlsZHN0ZXAuQnVpbGRTdGVw KToKICAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1aWxkT25seScsIHNlbGYuYnVpbGRP bmx5LCAnY29uZmlnLmpzb24nKQogICAgICAgICBpZiBzZWxmLnRyaWdnZXJzOgogICAgICAgICAg ICAgc2VsZi5zZXRQcm9wZXJ0eSgndHJpZ2dlcnMnLCBzZWxmLnRyaWdnZXJzLCAnY29uZmlnLmpz b24nKQorICAgICAgICBpZiBzZWxmLnJlbW90ZXM6CisgICAgICAgICAgICBzZWxmLnNldFByb3Bl cnR5KCdyZW1vdGVzJywgc2VsZi5yZW1vdGVzLCAnY29uZmlnLmpzb24nKQogICAgICAgICBpZiBz ZWxmLmFkZGl0aW9uYWxBcmd1bWVudHM6CiAgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdh ZGRpdGlvbmFsQXJndW1lbnRzJywgc2VsZi5hZGRpdGlvbmFsQXJndW1lbnRzLCAnY29uZmlnLmpz b24nKQogCkBAIC05MzIsNiArOTM1LDExIEBAIGNsYXNzIFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMo c2hlbGwuVGVzdCk6CiAgICAgICAgIHNoZWxsLlRlc3QuX19pbml0X18oc2VsZiwgbG9nRW52aXJv bj1GYWxzZSwgKiprd2FyZ3MpCiAKICAgICBkZWYgc3RhcnQoc2VsZik6CisgICAgICAgICMgYWRk IHJlbW90ZXMgY29uZmlndXJhdGlvbiBmaWxlIHBhdGggdG8gdGhlIGNvbW1hbmQgbGluZSBpZiBu ZWVkZWQKKyAgICAgICAgcmVtb3Rlc2ZpbGUgPSBzZWxmLmdldFByb3BlcnR5KCdyZW1vdGVzJywg RmFsc2UpCisgICAgICAgIGlmIHJlbW90ZXNmaWxlOgorICAgICAgICAgICAgc2VsZi5jb21tYW5k LmFwcGVuZCgnLS1yZW1vdGUtY29uZmlnLWZpbGU9ezB9Jy5mb3JtYXQocmVtb3Rlc2ZpbGUpKQor CiAgICAgICAgIGFwcGVuZEN1c3RvbUJ1aWxkRmxhZ3Moc2VsZiwgc2VsZi5nZXRQcm9wZXJ0eSgn cGxhdGZvcm0nKSwgc2VsZi5nZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJykpCiAgICAgICAgIHJl dHVybiBzaGVsbC5UZXN0LnN0YXJ0KHNlbGYpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weSBiL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQppbmRleCA1MmFhNDdlN2MyMzExNWI3 YzUzOGU5MGMwMTc1OTcwNTFmNjc1M2RiLi4yNjU5NWRlMjE5NTJjNDY0MzI5MjFkNGU2MmFiNjU0 MDE3ZDExMWQxIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQv c3RlcHNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxk L3N0ZXBzX3VuaXR0ZXN0LnB5CkBAIC0xMDExLDYgKzEwMTEsMjIgQEAgY2xhc3MgVGVzdFJ1bkph dmFTY3JpcHRDb3JlVGVzdHMoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RD YXNlKToKICAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9z dHJpbmc9J1Bhc3NlZCBKU0MgdGVzdHMnKQogICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkK IAorICAgIGRlZiB0ZXN0X3JlbW90ZV9zdWNjZXNzKHNlbGYpOgorICAgICAgICBzZWxmLnNldHVw U3RlcChSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKCkpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHko J2Z1bGxQbGF0Zm9ybScsICdqc2Mtb25seScpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2Nv bmZpZ3VyYXRpb24nLCAncmVsZWFzZScpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3JlbW90 ZXMnLCAncmVtb3RlLW1hY2hpbmVzLmpzb24nKQorICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNv bW1hbmRzKAorICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAgICAg ICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKKyAgICAgICAgICAgICAgICAgICAg ICAgIGNvbW1hbmQ9WydwZXJsJywgJ1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRl c3RzJywgJy0tbm8tYnVpbGQnLCAnLS1uby1mYWlsLWZhc3QnLCAnLS1qc29uLW91dHB1dD17MH0n LmZvcm1hdChzZWxmLmpzb25GaWxlTmFtZSksICctLXJlbGVhc2UnLCAnLS1yZW1vdGUtY29uZmln LWZpbGU9cmVtb3RlLW1hY2hpbmVzLmpzb24nXSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGxv Z2ZpbGVzPXsnanNvbic6IHNlbGYuanNvbkZpbGVOYW1lfSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICkKKyAgICAgICAgICAgICsgMCwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdE91 dGNvbWUocmVzdWx0PVNVQ0NFU1MsIHN0YXRlX3N0cmluZz0nUGFzc2VkIEpTQyB0ZXN0cycpCisg ICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQorCiAgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxm KToKICAgICAgICAgc2VsZi5zZXR1cFN0ZXAoUnVuSmF2YVNjcmlwdENvcmVUZXN0cygpKQogICAg ICAgICBzZWxmLnNldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0nLCAnanNjLW9ubHknKQo=