212077 2020-05-19 08:59:19 -0700 [Flatpak SDK] Add bubblewrap ... wrapper 2020-05-24 05:53:46 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 212326 1 pnormand pnormand clopez dpino webkit-bug-importer oldest_to_newest 1654010 0 pnormand 2020-05-19 08:59:19 -0700 Allowing us to use flatpak run now. 1654016 1 399740 pnormand 2020-05-19 09:02:58 -0700 Created attachment 399740 Patch 1654027 2 399740 clopez 2020-05-19 09:26:22 -0700 Comment on attachment 399740 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=399740&action=review > Tools/ChangeLog:8 > + The bind-mounts are now handled through webkit-bwrap. It looks to me some binds mounts are gone with this new way of doing things. > Tools/flatpak/flatpakutils.py:-661 > - "--bind-mount=/run/shm=/dev/shm", I don't see this now bind-mounted with the new setup. Why is that? > Tools/flatpak/flatpakutils.py:-668 > - "--bind-mount=/run/systemd/journal=/run/systemd/journal", neither this, isn't it needed? > Tools/flatpak/flatpakutils.py:-715 > - flatpak_command.append("--bind-mount={uid_doc_path}={uid_doc_path}".format(uid_doc_path=uid_doc_path)) I also don't see this mounted 1654033 3 pnormand 2020-05-19 09:37:57 -0700 That's correct, flatpak run sets those bind-mounts already, while flatpak build doesn't. 1654357 4 399740 pnormand 2020-05-20 01:29:57 -0700 Comment on attachment 399740 Patch I couldn't reproduce the api-gtk failures here. 1654358 5 ews-feeder 2020-05-20 01:37:17 -0700 Committed r261909: <https://trac.webkit.org/changeset/261909> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399740. 1654360 6 webkit-bug-importer 2020-05-20 01:38:14 -0700 <rdar://problem/63437366> 1654421 7 dpino 2020-05-20 07:32:20 -0700 Reverted r261909 for reason: execution of LayoutTests returns syntax error in the bots (GTK, WPE) Committed r261917: <https://trac.webkit.org/changeset/261917> 1654435 8 pnormand 2020-05-20 08:05:31 -0700 python ./Tools/Scripts/run-webkit-tests --no-build --no-show-results --no-new-test-results --clobber-old-results --builder-name 'GTK Linux 64-bit Release (Tests)' --build-number 13781 --buildbot-worker gtk-linux-slave-6 --master-name webkit.org --buildbot-master build.webkit.org --report https://results.webkit.org --exit-after-n-crashes-or-timeouts 50 --exit-after-n-failures 500 --release --layout-tests-directory ./Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests --gtk --results-directory layout-test-results/dashboard-layout-test-results --debug-rwt-logging in dir /home/slave/webkitgtk/gtk-linux-64-release-tests/build (timeout 1200 secs) watching logfiles {} argv: ['python', './Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--builder-name', 'GTK Linux 64-bit Release (Tests)', '--build-number', '13781', '--buildbot-worker', 'gtk-linux-slave-6', '--master-name', 'webkit.org', '--buildbot-master', 'build.webkit.org', '--report', 'https://results.webkit.org', '--exit-after-n-crashes-or-timeouts', '50', '--exit-after-n-failures', '500', '--release', '--layout-tests-directory', './Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/tests', '--gtk', '--results-directory', 'layout-test-results/dashboard-layout-test-results', '--debug-rwt-logging'] using PTY: True sh: 1: Syntax error: "(" unexpected program finished with exit code 0 elapsedTime=0.892059 1654901 9 399954 pnormand 2020-05-21 07:23:45 -0700 Created attachment 399954 Patch 1654902 10 399954 clopez 2020-05-21 07:26:13 -0700 Comment on attachment 399954 Patch what is the change done compared with r261909? 1654907 11 pnormand 2020-05-21 07:30:31 -0700 No change :) I'd like to reland as-is, making sure the exec bit is set on webkit-bwrap this time. 1654909 12 clopez 2020-05-21 07:36:33 -0700 (In reply to Philippe Normand from comment #11) > No change :) I'd like to reland as-is, making sure the exec bit is set on > webkit-bwrap this time. I'm confused. Your previous patch already set it as executable. 1654913 13 pnormand 2020-05-21 07:42:22 -0700 How do you know? 1654917 14 pnormand 2020-05-21 07:52:24 -0700 I've rebased the patch mostly for Nikolas though. I'll need to test it again before landing in any case. 1654921 15 clopez 2020-05-21 08:10:26 -0700 (In reply to Philippe Normand from comment #13) > How do you know? I just checked out r261909 locally and checked that the file was executable. 1654943 16 pnormand 2020-05-21 09:13:22 -0700 With svn or git/git-svn? 1654947 17 clopez 2020-05-21 09:20:33 -0700 (In reply to Philippe Normand from comment #16) > With svn or git/git-svn? With git. There should be no difference. You can also check https://trac.webkit.org/browser/webkit/trunk/Tools/flatpak/webkit-bwrap?rev=261909 <-- it says "Property svn:executable set to *" 1654951 18 clopez 2020-05-21 09:27:14 -0700 (In reply to Carlos Alberto Lopez Perez from comment #17) > (In reply to Philippe Normand from comment #16) > > With svn or git/git-svn? > > With git. There should be no difference. > > You can also check > https://trac.webkit.org/browser/webkit/trunk/Tools/flatpak/webkit- > bwrap?rev=261909 <-- it says "Property svn:executable set to *" Or with command: svn diff -c 261909 https://svn.webkit.org/repository/webkit/trunk/ 1655278 19 pnormand 2020-05-22 02:03:03 -0700 Well I can't reproduce this issue anywhere and since the error message doesn't give much details, I can only guess here. Without relanding this patch I won't be able to debug this. 1655279 20 400034 pnormand 2020-05-22 02:04:16 -0700 Created attachment 400034 Patch 1655304 21 clopez 2020-05-22 06:33:07 -0700 (In reply to Philippe Normand from comment #19) > Well I can't reproduce this issue anywhere and since the error message > doesn't give much details, I can only guess here. Without relanding this > patch I won't be able to debug this. Ok. Then Feel free to land any follow-up fixes unreviewed.(In reply to Philippe Normand from comment #19) > Well I can't reproduce this issue anywhere and since the error message > doesn't give much details. I can. You need to run the command like the bot does. python ./Tools/Scripts/run-webkit-tests --no-build --no-show-results --no-new-test-results --clobber-old-results --builder-name "GTK Linux 64-bit Release (Tests)" --build-number 13781 --buildbot-worker gtk-linux-slave-6 --master-name webkit.org --buildbot-master build.webkit.org --report https://results.webkit.org --exit-after-n-crashes-or-timeouts 50 --exit-after-n-failures 500 --release --gtk --results-directory layout-test-results --debug-rwt-logging sh: 1: Syntax error: "(" unexpected And the issue its still happening with this last version of the patch It looks it is caused by the parameters: --builder-name "GTK Linux 64-bit Release (Tests)" The parenthesis in "(Tests)" causes This. If the parameters are passed to a shell maybe they need to be quoted/escaped properly 1655305 22 clopez 2020-05-22 06:33:54 -0700 (In reply to Philippe Normand from comment #19) > Well I can't reproduce this issue anywhere and since the error message > doesn't give much details, I can only guess here. Without relanding this > patch I won't be able to debug this. I can. You need to run the command like the bot does. python ./Tools/Scripts/run-webkit-tests --no-build --no-show-results --no-new-test-results --clobber-old-results --builder-name "GTK Linux 64-bit Release (Tests)" --build-number 13781 --buildbot-worker gtk-linux-slave-6 --master-name webkit.org --buildbot-master build.webkit.org --report https://results.webkit.org --exit-after-n-crashes-or-timeouts 50 --exit-after-n-failures 500 --release --gtk --results-directory layout-test-results --debug-rwt-logging sh: 1: Syntax error: "(" unexpected And the issue its still happening with this last version of the patch It looks it is caused by the parameters: --builder-name "GTK Linux 64-bit Release (Tests)" The parenthesis in "(Tests)" causes This. If the parameters are passed to a shell maybe they need to be quoted/escaped properly 1655309 23 pnormand 2020-05-22 06:44:46 -0700 🤯 1655314 24 400043 pnormand 2020-05-22 07:14:02 -0700 Created attachment 400043 Patch 1655320 25 ews-feeder 2020-05-22 07:58:46 -0700 Committed r262057: <https://trac.webkit.org/changeset/262057> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400043. 399740 2020-05-19 09:02:58 -0700 2020-05-21 07:23:41 -0700 Patch bug-212077-20200519170257.patch text/plain 9398 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxODU5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGQxOTJlYjUyNjM3YzkwMGNhNDE5ODY3YzNhYzViODdh MzFiZjAzMC4uN2UxODE4OGY2OGNhYjRjZWZjM2YyNmNhMWI4MTUxZDYxYzBhNGMyOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIwLTA1LTE5ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIEFkZCBidWJibGV3cmFwIC4uLiB3cmFwcGVyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIwNzcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYmluZC1tb3Vu dHMgYXJlIG5vdyBoYW5kbGVkIHRocm91Z2ggd2Via2l0LWJ3cmFwLgorCisgICAgICAgICogZmxh dHBhay9mbGF0cGFrdXRpbHMucHk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLmV4ZWN1dGVfY29t bWFuZCk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnJ1bl9pbl9zYW5kYm94KToKKyAgICAgICAg KiBmbGF0cGFrL3dlYmtpdC1id3JhcDogQWRkZWQuCisKIDIwMjAtMDUtMTkgIE1pY2hhZWwgQ2F0 YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CiAKICAgICAgICAgW0dUS10gQWRkIFdFQktJ VF9FRElUSU5HX0NPTU1BTkRfUEFTVEVfQVNfUExBSU5fVEVYVApkaWZmIC0tZ2l0IGEvVG9vbHMv ZmxhdHBhay9mbGF0cGFrdXRpbHMucHkgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQpp bmRleCA3YzQ2MGIxM2RhMmQzNTEzZDAxNmMyZjdiMzA5OTI0N2RkZWM2Yzc4Li5mMTk2ZGMwYWYw ZmYwYWE3MjEyYTE4OTU5OTA2MDQ3NzU4N2MzZTZjIDEwMDY0NAotLS0gYS9Ub29scy9mbGF0cGFr L2ZsYXRwYWt1dGlscy5weQorKysgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQpAQCAt NDg3LDExICs0ODcsMTEgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgc2VsZi5zY2Nh Y2hlX3Rva2VuID0gIiIKICAgICAgICAgc2VsZi5zY2NhY2hlX3NjaGVkdWxlciA9IERFRkFVTFRf U0NDQUNIRV9TQ0hFRFVMRVIKIAotICAgIGRlZiBleGVjdXRlX2NvbW1hbmQoc2VsZiwgYXJncywg c3Rkb3V0PU5vbmUsIHN0ZGVycj1Ob25lKToKKyAgICBkZWYgZXhlY3V0ZV9jb21tYW5kKHNlbGYs IGFyZ3MsIHN0ZG91dD1Ob25lLCBzdGRlcnI9Tm9uZSwgZW52PU5vbmUpOgogICAgICAgICBfbG9n LmRlYnVnKCdSdW5uaW5nIGluIHNhbmRib3g6ICVzXG4nICUgJyAnLmpvaW4oYXJncykpCiAgICAg ICAgIHJlc3VsdCA9IDAKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgcmVzdWx0ID0gc3VicHJv Y2Vzcy5jaGVja19jYWxsKGFyZ3MsIHN0ZG91dD1zdGRvdXQsIHN0ZGVycj1zdGRlcnIpCisgICAg ICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLmNoZWNrX2NhbGwoYXJncywgc3Rkb3V0PXN0ZG91 dCwgc3RkZXJyPXN0ZGVyciwgZW52PWVudikKICAgICAgICAgZXhjZXB0IHN1YnByb2Nlc3MuQ2Fs bGVkUHJvY2Vzc0Vycm9yIGFzIGVycjoKICAgICAgICAgICAgIGlmIHNlbGYudmVyYm9zZToKICAg ICAgICAgICAgICAgICBjbWQgPSAnICcuam9pbihlcnIuY21kKQpAQCAtNjUxLDIyICs2NTEsMTEg QEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGJ1aWxk aW5nID0gRmFsc2UKIAotICAgICAgICAjIEZJWE1FOiBVc2luZyB0aGUgYHJ1bmAgZmxhdHBhayBj b21tYW5kIHdvdWxkIGJlIGJldHRlciwgYnV0IGl0IGRvZXNuJ3QKLSAgICAgICAgIyBoYXZlIGEg LS1iaW5kLW1vdW50IG9wdGlvbi4KLSAgICAgICAgZmxhdHBha19jb21tYW5kID0gWyJmbGF0cGFr IiwgImJ1aWxkIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICItLWRpZS13aXRoLXBhcmVu dCIsCisgICAgICAgIGZsYXRwYWtfY29tbWFuZCA9IFsiZmxhdHBhayIsICJydW4iLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIi0tZGV2ZWwiLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIi0tdGFsay1uYW1lPW9yZy5hMTF5LkJ1cyIsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiLS10YWxrLW5hbWU9b3JnLmd0ay52ZnMiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg Ii0tdGFsay1uYW1lPW9yZy5ndGsudmZzLioiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg Ii0tYmluZC1tb3VudD0vcnVuL3NobT0vZGV2L3NobSIsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAjIEFjY2VzcyB0byAvcnVuL2hvc3QgaXMgcmVxdWlyZWQgYnkgdGhlIGNyYXNoIGxvZyBy ZXBvcnRlci4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICItLWJpbmQtbW91bnQ9L3J1bi9o b3N0LyVzPSVzIiAlICh0ZW1wZmlsZS5nZXR0ZW1wZGlyKCksIHRlbXBmaWxlLmdldHRlbXBkaXIo KSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAjIGZsYXRwYWsgYnVpbGQgZG9lc24ndCBl eHBvc2UgYSAtLXNvY2tldCBvcHRpb24gZm9yCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAj IHdoaXRlLWxpc3RpbmcgdGhlIHN5c3RlbWQgam91cm5hbCBzb2NrZXQuIFNvCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAjIHdoaXRlLWxpc3QgaXQgaW4gL3J1biwgaG9waW5nIHRoaXMgaXMg dGhlIHJpZ2h0Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAjIHBhdGguCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAiLS1iaW5kLW1vdW50PS9ydW4vc3lzdGVtZC9qb3VybmFsPS9ydW4v c3lzdGVtZC9qb3VybmFsIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICItLWJpbmQtbW91 bnQ9JXM9JXMiICUgKHNlbGYuc2FuZGJveF9zb3VyY2Vfcm9vdCwgc2VsZi5zb3VyY2Vfcm9vdCld CisgICAgICAgICAgICAgICAgICAgICAgICAgICAiLS10YWxrLW5hbWU9b3JnLmd0ay52ZnMuKiJd CiAKICAgICAgICAgaWYgYXJncyBhbmQgYXJnc1swXS5lbmRzd2l0aCgiYnVpbGQtd2Via2l0Iikg YW5kIG5vdCBzZWxmLmlzX2JyYW5jaF9idWlsZCgpOgogICAgICAgICAgICAgIyBFbnN1cmUgc2Vs Zi5idWlsZF9wYXRoIGV4aXN0cy4KQEAgLTY3NiwxMiArNjY1LDYgQEAgY2xhc3MgV2Via2l0Rmxh dHBhazoKICAgICAgICAgICAgICAgICBpZiBlLmVycm5vICE9IGVycm5vLkVFWElTVDoKICAgICAg ICAgICAgICAgICAgICAgcmFpc2UgZQogCi0gICAgICAgICMgV2UgbW91bnQgV2ViS2l0QnVpbGQv UE9SVE5BTUUvQnVpbGRUeXBlIHRvIC9hcHAvd2Via2l0L1dlYktpdEJ1aWxkL0J1aWxkVHlwZQot ICAgICAgICAjIHNvIHdlIGNhbiBidWlsZCBXUEUgYW5kIEdUSyBpbiBhIHNhbWUgc291cmNlIHRy ZWUuCi0gICAgICAgICMgVGhlIGJpbmQtbW91bnQgaXMgYWx3YXlzIG5lZWRlZCwgZXhjZXB0ZWQg ZHVyaW5nIHRoZSBpbml0aWFsIHNldHVwIChTREsgaW5zdGFsbC91cGRhdGVzKS4KLSAgICAgICAg aWYgb3MucGF0aC5pc2RpcihzZWxmLmJ1aWxkX3BhdGgpOgotICAgICAgICAgICAgZmxhdHBha19j b21tYW5kLmFwcGVuZCgiLS1iaW5kLW1vdW50PSVzPSVzIiAlIChzYW5kYm94X2J1aWxkX3BhdGgs IHNlbGYuYnVpbGRfcGF0aCkpCi0KICAgICAgICAgaWYgbm90IGJ1aWxkaW5nOgogICAgICAgICAg ICAgZmxhdHBha19jb21tYW5kLmV4dGVuZChbCiAgICAgICAgICAgICAgICAgIi0tZGV2aWNlPWFs bCIsCkBAIC02OTUsMzEgKzY3OCw5IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAg ICAgICAgIi0tc29ja2V0PXgxMSIsCiAgICAgICAgICAgICAgICAgIi0tc3lzdGVtLXRhbGstbmFt ZT1vcmcuYTExeS5CdXMiLAogICAgICAgICAgICAgICAgICItLXN5c3RlbS10YWxrLW5hbWU9b3Jn LmZyZWVkZXNrdG9wLkdlb0NsdWUyIiwKLSAgICAgICAgICAgICAgICAiLS10YWxrLW5hbWU9b3Jn LmExMXkuQnVzIiwKICAgICAgICAgICAgICAgICAiLS10YWxrLW5hbWU9b3JnLmZyZWVkZXNrdG9w LkZsYXRwYWsiCiAgICAgICAgICAgICBdKQogCi0gICAgICAgICAgICB4ZGdfcnVudGltZV9kaXIg PSBvcy5lbnZpcm9uLmdldCgnWERHX1JVTlRJTUVfRElSJywgTm9uZSkKLSAgICAgICAgICAgIGlm IG5vdCB4ZGdfcnVudGltZV9kaXI6Ci0gICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygnWERHX1JV TlRJTUVfRElSIG5vdCBzZXQuIFRyeWluZyBkZWZhdWx0IGxvY2F0aW9uLicpCi0gICAgICAgICAg ICAgICAgdHJ5OgotICAgICAgICAgICAgICAgICAgICB3aXRoIG9wZW4ob3MuZGV2bnVsbCwgJ3cn KSBhcyBkZXZudWxsOgotICAgICAgICAgICAgICAgICAgICAgICAgdWlkID0gc3VicHJvY2Vzcy5j aGVja19vdXRwdXQoKCJpZCIsICItdSIpLCBzdGRlcnI9ZGV2bnVsbCkuZGVjb2RlKCkuc3RyaXAo KQotICAgICAgICAgICAgICAgICAgICAgICAgeGRnX3J1bnRpbWVfZGlyID0gJy9ydW4vdXNlci97 dWlkfScuZm9ybWF0KHVpZD11aWQpCi0gICAgICAgICAgICAgICAgZXhjZXB0IHN1YnByb2Nlc3Mu Q2FsbGVkUHJvY2Vzc0Vycm9yOgotICAgICAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCJDb3Vs ZCBub3QgZGV0ZXJtaW5lIFhER19SVU5JTUVfRElSLiBUaGlzIG1heSBjYXVzZSBidWJibGV3cmFw IHRvIGZhaWwuIikKLQotICAgICAgICAgICAgaWYgeGRnX3J1bnRpbWVfZGlyOgotICAgICAgICAg ICAgICAgIHVpZF9kb2NfcGF0aCA9IG9zLnBhdGguam9pbih4ZGdfcnVudGltZV9kaXIsICdkb2Mn KQotICAgICAgICAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKHVpZF9kb2NfcGF0aCk6Ci0gICAg ICAgICAgICAgICAgICAgIGZsYXRwYWtfY29tbWFuZC5hcHBlbmQoIi0tYmluZC1tb3VudD17dWlk X2RvY19wYXRofT17dWlkX2RvY19wYXRofSIuZm9ybWF0KHVpZF9kb2NfcGF0aD11aWRfZG9jX3Bh dGgpKQotICAgICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgICAgIF9sb2cuZGVi dWcoIkNhbid0IGZpbmQgdXNlciBkb2N1bWVudCBwYXRoIGF0ICd7dWlkX2RvY19wYXRofScuIE5v dCBtb3VudGluZyBpdC4iLmZvcm1hdCh1aWRfZG9jX3BhdGg9dWlkX2RvY19wYXRoKSkKLQotICAg ICAgICAgICAgY29yZWR1bXBzX2RpciA9IG9zLmVudmlyb24uZ2V0KCJXRUJLSVRfQ09SRV9EVU1Q U19ESVJFQ1RPUlkiKQotICAgICAgICAgICAgaWYgY29yZWR1bXBzX2RpciBhbmQgb3MucGF0aC5p c2Rpcihjb3JlZHVtcHNfZGlyKToKLSAgICAgICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQuYXBw ZW5kKCItLWJpbmQtbW91bnQ9e2NvcmVkdW1wc19kaXJ9PXtjb3JlZHVtcHNfZGlyfSIuZm9ybWF0 KGNvcmVkdW1wc19kaXI9Y29yZWR1bXBzX2RpcikpCi0KICAgICAgICAgICAgIHNhbmRib3hfZW52 aXJvbm1lbnQudXBkYXRlKHsKICAgICAgICAgICAgICAgICAiVFoiOiAiUFNUOFBEVCIsCiAgICAg ICAgICAgICAgICAgIkxBTkciOiAiZW5fVVMuVVRGLTgiLApAQCAtNzk2LDcgKzc1Nyw2IEBAIGNs YXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICBfbG9nLmRlYnVnKCdFbmFibGluZyB0aGUg aWNlY3JlYW0gY29tcGlsZXInKQogICAgICAgICAgICAgaWYgc2hhcmVfbmV0d29ya19vcHRpb24g bm90IGluIGZsYXRwYWtfY29tbWFuZDoKICAgICAgICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQu YXBwZW5kKHNoYXJlX25ldHdvcmtfb3B0aW9uKQotICAgICAgICAgICAgZmxhdHBha19jb21tYW5k LmFwcGVuZCgiLS1iaW5kLW1vdW50PS92YXIvcnVuL2ljZWNjPS92YXIvcnVuL2ljZWNjIikKIAog ICAgICAgICAgICAgbl9jb3JlcyA9IG11bHRpcHJvY2Vzc2luZy5jcHVfY291bnQoKSAqIDMKICAg ICAgICAgICAgIF9sb2cuZGVidWcoJ0ZvbGxvd2luZyBpY2VjcmVhbSByZWNvbW1lbmRhdGlvbiBm b3IgdGhlIG51bWJlciBvZiBjb3JlcyB0byB1c2U6ICVkJyAlIG5fY29yZXMpCkBAIC04MDcsNiAr NzY3LDcgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgICAgICAgICByZXR1cm4gMQog ICAgICAgICAgICAgc2FuZGJveF9lbnZpcm9ubWVudC51cGRhdGUoewogICAgICAgICAgICAgICAg ICJDQ0FDSEVfUFJFRklYIjogImljZWNjIiwKKyAgICAgICAgICAgICAgICAiSUNFQ0NfVEVTVF9T T0NLRVQiOiAiL3J1bi9pY2VjYy9pY2VjY2Quc29ja2V0IiwKICAgICAgICAgICAgICAgICAiSUNF Q0NfVkVSU0lPTiI6IHRvb2xjaGFpbl9wYXRoLAogICAgICAgICAgICAgICAgICJOVU1CRVJfT0Zf UFJPQ0VTU09SUyI6IG5fY29yZXMsCiAgICAgICAgICAgICB9KQpAQCAtODE4LDEwICs3NzksMTYg QEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgaWYgbm90IGt3YXJncy5nZXQoJ2J1aWxk aW5nX2dzdCcpOgogICAgICAgICAgICAgZ3N0X2VudiA9IHNlbGYuc2V0dXBfZ3N0YnVpbGQoYnVp bGRpbmcpCiAKLSAgICAgICAgZmxhdHBha19jb21tYW5kICs9IGV4dHJhX2ZsYXRwYWtfYXJncyAr IFtzZWxmLmZsYXRwYWtfYnVpbGRfcGF0aF0gKyBnc3RfZW52ICsgYXJncworICAgICAgICBmbGF0 cGFrX2NvbW1hbmQgKz0gZXh0cmFfZmxhdHBha19hcmdzICsgZ3N0X2VudiArIFsnLS1jb21tYW5k PSIlcyInICUgYXJnc1swXSwgIm9yZy53ZWJraXQuU2RrIl0gKyBhcmdzWzE6XQorCisgICAgICAg IGZsYXRwYWtfZW52ID0gb3MuZW52aXJvbgorICAgICAgICBmbGF0cGFrX2Vudi51cGRhdGUoewor ICAgICAgICAgICAgIkZMQVRQQUtfQldSQVAiOiBvcy5wYXRoLmpvaW4oc2NyaXB0ZGlyLCAid2Vi a2l0LWJ3cmFwIiksCisgICAgICAgICAgICAiV0VCS0lUX0JVSUxEX0RJUl9CSU5EX01PVU5UIjog IiVzOiVzIiAlIChzYW5kYm94X2J1aWxkX3BhdGgsIHNlbGYuYnVpbGRfcGF0aCkKKyAgICAgICAg fSkKIAogICAgICAgICB0cnk6Ci0gICAgICAgICAgICByZXR1cm4gc2VsZi5leGVjdXRlX2NvbW1h bmQoZmxhdHBha19jb21tYW5kLCBzdGRvdXQ9c3Rkb3V0KQorICAgICAgICAgICAgcmV0dXJuIHNl bGYuZXhlY3V0ZV9jb21tYW5kKGZsYXRwYWtfY29tbWFuZCwgc3Rkb3V0PXN0ZG91dCwgZW52PWZs YXRwYWtfZW52KQogICAgICAgICBleGNlcHQgS2V5Ym9hcmRJbnRlcnJ1cHQ6CiAgICAgICAgICAg ICByZXR1cm4gMAogCmRpZmYgLS1naXQgYS9Ub29scy9mbGF0cGFrL3dlYmtpdC1id3JhcCBiL1Rv b2xzL2ZsYXRwYWsvd2Via2l0LWJ3cmFwCm5ldyBmaWxlIG1vZGUgMTAwNzU1CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjZhN2MzMmI0NTFiZDhiOWI0M2E0 MDcwZjM2YTcxMzg0YzkxN2QwM2MKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9mbGF0cGFrL3dl YmtpdC1id3JhcApAQCAtMCwwICsxLDU5IEBACisjIS91c3IvYmluL2VudiBweXRob24zCisjIC0q LSBjb2Rpbmc6IHV0Zi04IC0qLQorIyBDb3B5cmlnaHQgKEMpIDIwMjAgSWdhbGlhIFMuTC4KKyMK KyMgVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0 IGFuZC9vcgorIyBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdl bmVyYWwgUHVibGljCisjIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJl IEZvdW5kYXRpb247IGVpdGhlcgorIyB2ZXJzaW9uIDIuMSBvZiB0aGUgTGljZW5zZSwgb3IgKGF0 IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyMKKyMgVGhpcyBwcm9ncmFtIGlzIGRp c3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisjIGJ1dCBXSVRI T1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisj IE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNl ZSB0aGUgR05VCisjIExlc3NlciBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFp bHMuCisjCisjIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMZXNz ZXIgR2VuZXJhbCBQdWJsaWMKKyMgTGljZW5zZSBhbG9uZyB3aXRoIHRoaXMgcHJvZ3JhbTsgaWYg bm90LCB3cml0ZSB0byB0aGUKKyMgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBG cmFua2xpbiBTdCwgRmlmdGggRmxvb3IsCisjIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgor CitpbXBvcnQgb3MKK2ltcG9ydCBzdWJwcm9jZXNzCitpbXBvcnQgc3lzCitpbXBvcnQgdGVtcGZp bGUKKworc2NyaXB0ZGlyID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguZGlybmFtZShfX2ZpbGVf XykpCisKK2RlZiBtYWluKGFyZ3M6IGxpc3QpIC0+IGludDoKKyAgICB0bXBkaXIgPSB0ZW1wZmls ZS5nZXR0ZW1wZGlyKCkKKyAgICBzb3VyY2Vfcm9vdCA9IG9zLnBhdGgubm9ybXBhdGgob3MucGF0 aC5hYnNwYXRoKG9zLnBhdGguam9pbihzY3JpcHRkaXIsICcuLi8uLi8nKSkpCisgICAgYmluZF9t b3VudHMgPSB7CisgICAgICAgICIvYXBwL3dlYmtpdCI6ICBzb3VyY2Vfcm9vdCwKKyAgICAgICAg IyBBY2Nlc3MgdG8gL3J1bi9ob3N0IGlzIHJlcXVpcmVkIGJ5IHRoZSBjcmFzaCBsb2cgcmVwb3J0 ZXIuCisgICAgICAgIGYiL3J1bi9ob3N0e3RtcGRpcn0iOiBmInt0bXBkaXJ9IgorICAgIH0KKwor ICAgIHRyeV9iaW5kX21vdW50cyA9IHsKKyAgICAgICAgIi9ydW4vaWNlY2MiOiAiL3Zhci9ydW4v aWNlY2MiCisgICAgfQorCisgICAgYnVpbGRfcGF0aCA9IG9zLmVudmlyb24uZ2V0KCJXRUJLSVRf QlVJTERfRElSX0JJTkRfTU9VTlQiKQorICAgIGlmIGJ1aWxkX3BhdGg6CisgICAgICAgIGRlc3Qs IHNyYyA9IGJ1aWxkX3BhdGguc3BsaXQoIjoiKQorICAgICAgICB0cnlfYmluZF9tb3VudHNbZGVz dF0gPSBzcmMKKworICAgIGNvcmVkdW1wc19kaXIgPSBvcy5lbnZpcm9uLmdldCgiV0VCS0lUX0NP UkVfRFVNUFNfRElSRUNUT1JZIikKKyAgICBpZiBjb3JlZHVtcHNfZGlyOgorICAgICAgICB0cnlf YmluZF9tb3VudHNbY29yZWR1bXBzX2Rpcl0gPSBjb3JlZHVtcHNfZGlyCisKKyAgICBid3JhcF9h cmdzID0gW10KKyAgICBmb3IgZGVzdCwgc3JjIGluIGJpbmRfbW91bnRzLml0ZW1zKCk6CisgICAg ICAgIGJ3cmFwX2FyZ3MuYXBwZW5kKGYiLS1iaW5kIHtzcmN9IHtkZXN0fSIpCisKKyAgICBmb3Ig ZGVzdCwgc3JjIGluIHRyeV9iaW5kX21vdW50cy5pdGVtcygpOgorICAgICAgICBid3JhcF9hcmdz LmFwcGVuZChmIi0tYmluZC10cnkge3NyY30ge2Rlc3R9IikKKworICAgIHJldHVybiBvcy5zeXN0 ZW0oImJ3cmFwICIgKyAnICcuam9pbihid3JhcF9hcmdzICsgYXJncykpCisKK2lmIF9fbmFtZV9f ID09ICJfX21haW5fXyI6CisgICAgc3lzLmV4aXQobWFpbihzeXMuYXJndlsxOl0pKQo= 399954 2020-05-21 07:23:45 -0700 2020-05-22 02:04:12 -0700 Patch bug-212077-20200521152344.patch text/plain 9448 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTkzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGI3YTQ1OGMzYTlmMzAxMjdmYmE0MTYzZmJhMWZmYTQ5 OTgwYjBmNS4uMjJkMzQxYjZiY2JkMTBjNmMxZWJmZDg0MjYyNjU1MzY3MjFhMDUzMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIwLTA1LTE5ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIEFkZCBidWJibGV3cmFwIC4uLiB3cmFwcGVyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIwNzcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYmluZC1tb3Vu dHMgYXJlIG5vdyBoYW5kbGVkIHRocm91Z2ggd2Via2l0LWJ3cmFwLgorCisgICAgICAgICogZmxh dHBhay9mbGF0cGFrdXRpbHMucHk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLmV4ZWN1dGVfY29t bWFuZCk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnJ1bl9pbl9zYW5kYm94KToKKyAgICAgICAg KiBmbGF0cGFrL3dlYmtpdC1id3JhcDogQWRkZWQuCisKIDIwMjAtMDUtMjEgIEVucmlxdWUgT2Nh w7FhIEdvbnrDoWxleiAgPGVvY2FuaGFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVy XVtHVEtdW1dQRV0gRXhwb3NlIGFuZCBob25vciB0aGUgbWVkaWEgY29udGVudCB0eXBlcyByZXF1 aXJpbmcgaGFyZHdhcmUgc3VwcG9ydCBzZXR0aW5nCmRpZmYgLS1naXQgYS9Ub29scy9mbGF0cGFr L2ZsYXRwYWt1dGlscy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CmluZGV4IGQ2 NzgyYjc3NTA2Y2MzNDMwZmJmYzkwMDA1ZmJjYWU0MzdkNzNhNTAuLmJiODkzMTAxNTk2YzJhMDE1 M2YzMGJkZjY2NDUyNmRlYTdmZjE3MWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBh a3V0aWxzLnB5CisrKyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CkBAIC00ODcsMTEg KzQ4NywxMSBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICBzZWxmLnNjY2FjaGVfdG9r ZW4gPSAiIgogICAgICAgICBzZWxmLnNjY2FjaGVfc2NoZWR1bGVyID0gREVGQVVMVF9TQ0NBQ0hF X1NDSEVEVUxFUgogCi0gICAgZGVmIGV4ZWN1dGVfY29tbWFuZChzZWxmLCBhcmdzLCBzdGRvdXQ9 Tm9uZSwgc3RkZXJyPU5vbmUpOgorICAgIGRlZiBleGVjdXRlX2NvbW1hbmQoc2VsZiwgYXJncywg c3Rkb3V0PU5vbmUsIHN0ZGVycj1Ob25lLCBlbnY9Tm9uZSk6CiAgICAgICAgIF9sb2cuZGVidWco J1J1bm5pbmcgaW4gc2FuZGJveDogJXNcbicgJSAnICcuam9pbihhcmdzKSkKICAgICAgICAgcmVz dWx0ID0gMAogICAgICAgICB0cnk6Ci0gICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLmNo ZWNrX2NhbGwoYXJncywgc3Rkb3V0PXN0ZG91dCwgc3RkZXJyPXN0ZGVycikKKyAgICAgICAgICAg IHJlc3VsdCA9IHN1YnByb2Nlc3MuY2hlY2tfY2FsbChhcmdzLCBzdGRvdXQ9c3Rkb3V0LCBzdGRl cnI9c3RkZXJyLCBlbnY9ZW52KQogICAgICAgICBleGNlcHQgc3VicHJvY2Vzcy5DYWxsZWRQcm9j ZXNzRXJyb3IgYXMgZXJyOgogICAgICAgICAgICAgaWYgc2VsZi52ZXJib3NlOgogICAgICAgICAg ICAgICAgIGNtZCA9ICcgJy5qb2luKGVyci5jbWQpCkBAIC02NTEsMjIgKzY1MSwxMSBAQCBjbGFz cyBXZWJraXRGbGF0cGFrOgogICAgICAgICBlbHNlOgogICAgICAgICAgICAgYnVpbGRpbmcgPSBG YWxzZQogCi0gICAgICAgICMgRklYTUU6IFVzaW5nIHRoZSBgcnVuYCBmbGF0cGFrIGNvbW1hbmQg d291bGQgYmUgYmV0dGVyLCBidXQgaXQgZG9lc24ndAotICAgICAgICAjIGhhdmUgYSAtLWJpbmQt bW91bnQgb3B0aW9uLgotICAgICAgICBmbGF0cGFrX2NvbW1hbmQgPSBbImZsYXRwYWsiLCAiYnVp bGQiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tZGllLXdpdGgtcGFyZW50IiwKKyAg ICAgICAgZmxhdHBha19jb21tYW5kID0gWyJmbGF0cGFrIiwgInJ1biIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAiLS1kZXZlbCIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAiLS10 YWxrLW5hbWU9b3JnLmExMXkuQnVzIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICItLXRh bGstbmFtZT1vcmcuZ3RrLnZmcyIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAiLS10YWxr LW5hbWU9b3JnLmd0ay52ZnMuKiIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1iaW5k LW1vdW50PS9ydW4vc2htPS9kZXYvc2htIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICMg QWNjZXNzIHRvIC9ydW4vaG9zdCBpcyByZXF1aXJlZCBieSB0aGUgY3Jhc2ggbG9nIHJlcG9ydGVy LgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tYmluZC1tb3VudD0vcnVuL2hvc3QvJXM9 JXMiICUgKHRlbXBmaWxlLmdldHRlbXBkaXIoKSwgdGVtcGZpbGUuZ2V0dGVtcGRpcigpKSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICMgZmxhdHBhayBidWlsZCBkb2Vzbid0IGV4cG9zZSBh IC0tc29ja2V0IG9wdGlvbiBmb3IKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICMgd2hpdGUt bGlzdGluZyB0aGUgc3lzdGVtZCBqb3VybmFsIHNvY2tldC4gU28KLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICMgd2hpdGUtbGlzdCBpdCBpbiAvcnVuLCBob3BpbmcgdGhpcyBpcyB0aGUgcmln aHQKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICMgcGF0aC4KLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICItLWJpbmQtbW91bnQ9L3J1bi9zeXN0ZW1kL2pvdXJuYWw9L3J1bi9zeXN0ZW1k L2pvdXJuYWwiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tYmluZC1tb3VudD0lcz0l cyIgJSAoc2VsZi5zYW5kYm94X3NvdXJjZV9yb290LCBzZWxmLnNvdXJjZV9yb290KV0KKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICItLXRhbGstbmFtZT1vcmcuZ3RrLnZmcy4qIl0KIAogICAg ICAgICBpZiBhcmdzIGFuZCBhcmdzWzBdLmVuZHN3aXRoKCJidWlsZC13ZWJraXQiKSBhbmQgbm90 IHNlbGYuaXNfYnJhbmNoX2J1aWxkKCk6CiAgICAgICAgICAgICAjIEVuc3VyZSBzZWxmLmJ1aWxk X3BhdGggZXhpc3RzLgpAQCAtNjc2LDEyICs2NjUsNiBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgog ICAgICAgICAgICAgICAgIGlmIGUuZXJybm8gIT0gZXJybm8uRUVYSVNUOgogICAgICAgICAgICAg ICAgICAgICByYWlzZSBlCiAKLSAgICAgICAgIyBXZSBtb3VudCBXZWJLaXRCdWlsZC9QT1JUTkFN RS9CdWlsZFR5cGUgdG8gL2FwcC93ZWJraXQvV2ViS2l0QnVpbGQvQnVpbGRUeXBlCi0gICAgICAg ICMgc28gd2UgY2FuIGJ1aWxkIFdQRSBhbmQgR1RLIGluIGEgc2FtZSBzb3VyY2UgdHJlZS4KLSAg ICAgICAgIyBUaGUgYmluZC1tb3VudCBpcyBhbHdheXMgbmVlZGVkLCBleGNlcHRlZCBkdXJpbmcg dGhlIGluaXRpYWwgc2V0dXAgKFNESyBpbnN0YWxsL3VwZGF0ZXMpLgotICAgICAgICBpZiBvcy5w YXRoLmlzZGlyKHNlbGYuYnVpbGRfcGF0aCk6Ci0gICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQu YXBwZW5kKCItLWJpbmQtbW91bnQ9JXM9JXMiICUgKHNhbmRib3hfYnVpbGRfcGF0aCwgc2VsZi5i dWlsZF9wYXRoKSkKLQogICAgICAgICBpZiBub3QgYnVpbGRpbmc6CiAgICAgICAgICAgICBmbGF0 cGFrX2NvbW1hbmQuZXh0ZW5kKFsKICAgICAgICAgICAgICAgICAiLS1kZXZpY2U9YWxsIiwKQEAg LTY5NSwzMSArNjc4LDkgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgICAgICAgICAi LS1zb2NrZXQ9eDExIiwKICAgICAgICAgICAgICAgICAiLS1zeXN0ZW0tdGFsay1uYW1lPW9yZy5h MTF5LkJ1cyIsCiAgICAgICAgICAgICAgICAgIi0tc3lzdGVtLXRhbGstbmFtZT1vcmcuZnJlZWRl c2t0b3AuR2VvQ2x1ZTIiLAotICAgICAgICAgICAgICAgICItLXRhbGstbmFtZT1vcmcuYTExeS5C dXMiLAogICAgICAgICAgICAgICAgICItLXRhbGstbmFtZT1vcmcuZnJlZWRlc2t0b3AuRmxhdHBh ayIKICAgICAgICAgICAgIF0pCiAKLSAgICAgICAgICAgIHhkZ19ydW50aW1lX2RpciA9IG9zLmVu dmlyb24uZ2V0KCdYREdfUlVOVElNRV9ESVInLCBOb25lKQotICAgICAgICAgICAgaWYgbm90IHhk Z19ydW50aW1lX2RpcjoKLSAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCdYREdfUlVOVElNRV9E SVIgbm90IHNldC4gVHJ5aW5nIGRlZmF1bHQgbG9jYXRpb24uJykKLSAgICAgICAgICAgICAgICB0 cnk6Ci0gICAgICAgICAgICAgICAgICAgIHdpdGggb3Blbihvcy5kZXZudWxsLCAndycpIGFzIGRl dm51bGw6Ci0gICAgICAgICAgICAgICAgICAgICAgICB1aWQgPSBzdWJwcm9jZXNzLmNoZWNrX291 dHB1dCgoImlkIiwgIi11IiksIHN0ZGVycj1kZXZudWxsKS5kZWNvZGUoKS5zdHJpcCgpCi0gICAg ICAgICAgICAgICAgICAgICAgICB4ZGdfcnVudGltZV9kaXIgPSAnL3J1bi91c2VyL3t1aWR9Jy5m b3JtYXQodWlkPXVpZCkKLSAgICAgICAgICAgICAgICBleGNlcHQgc3VicHJvY2Vzcy5DYWxsZWRQ cm9jZXNzRXJyb3I6Ci0gICAgICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoIkNvdWxkIG5vdCBk ZXRlcm1pbmUgWERHX1JVTklNRV9ESVIuIFRoaXMgbWF5IGNhdXNlIGJ1YmJsZXdyYXAgdG8gZmFp bC4iKQotCi0gICAgICAgICAgICBpZiB4ZGdfcnVudGltZV9kaXI6Ci0gICAgICAgICAgICAgICAg dWlkX2RvY19wYXRoID0gb3MucGF0aC5qb2luKHhkZ19ydW50aW1lX2RpciwgJ2RvYycpCi0gICAg ICAgICAgICAgICAgaWYgb3MucGF0aC5leGlzdHModWlkX2RvY19wYXRoKToKLSAgICAgICAgICAg ICAgICAgICAgZmxhdHBha19jb21tYW5kLmFwcGVuZCgiLS1iaW5kLW1vdW50PXt1aWRfZG9jX3Bh dGh9PXt1aWRfZG9jX3BhdGh9Ii5mb3JtYXQodWlkX2RvY19wYXRoPXVpZF9kb2NfcGF0aCkpCi0g ICAgICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygiQ2Fu J3QgZmluZCB1c2VyIGRvY3VtZW50IHBhdGggYXQgJ3t1aWRfZG9jX3BhdGh9Jy4gTm90IG1vdW50 aW5nIGl0LiIuZm9ybWF0KHVpZF9kb2NfcGF0aD11aWRfZG9jX3BhdGgpKQotCi0gICAgICAgICAg ICBjb3JlZHVtcHNfZGlyID0gb3MuZW52aXJvbi5nZXQoIldFQktJVF9DT1JFX0RVTVBTX0RJUkVD VE9SWSIpCi0gICAgICAgICAgICBpZiBjb3JlZHVtcHNfZGlyIGFuZCBvcy5wYXRoLmlzZGlyKGNv cmVkdW1wc19kaXIpOgotICAgICAgICAgICAgICAgIGZsYXRwYWtfY29tbWFuZC5hcHBlbmQoIi0t YmluZC1tb3VudD17Y29yZWR1bXBzX2Rpcn09e2NvcmVkdW1wc19kaXJ9Ii5mb3JtYXQoY29yZWR1 bXBzX2Rpcj1jb3JlZHVtcHNfZGlyKSkKLQogICAgICAgICAgICAgc2FuZGJveF9lbnZpcm9ubWVu dC51cGRhdGUoewogICAgICAgICAgICAgICAgICJUWiI6ICJQU1Q4UERUIiwKICAgICAgICAgICAg ICAgICAiTEFORyI6ICJlbl9VUy5VVEYtOCIsCkBAIC03OTYsNyArNzU3LDYgQEAgY2xhc3MgV2Vi a2l0RmxhdHBhazoKICAgICAgICAgICAgIF9sb2cuZGVidWcoJ0VuYWJsaW5nIHRoZSBpY2VjcmVh bSBjb21waWxlcicpCiAgICAgICAgICAgICBpZiBzaGFyZV9uZXR3b3JrX29wdGlvbiBub3QgaW4g ZmxhdHBha19jb21tYW5kOgogICAgICAgICAgICAgICAgIGZsYXRwYWtfY29tbWFuZC5hcHBlbmQo c2hhcmVfbmV0d29ya19vcHRpb24pCi0gICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQuYXBwZW5k KCItLWJpbmQtbW91bnQ9L3Zhci9ydW4vaWNlY2M9L3Zhci9ydW4vaWNlY2MiKQogCiAgICAgICAg ICAgICBuX2NvcmVzID0gbXVsdGlwcm9jZXNzaW5nLmNwdV9jb3VudCgpICogMwogICAgICAgICAg ICAgX2xvZy5kZWJ1ZygnRm9sbG93aW5nIGljZWNyZWFtIHJlY29tbWVuZGF0aW9uIGZvciB0aGUg bnVtYmVyIG9mIGNvcmVzIHRvIHVzZTogJWQnICUgbl9jb3JlcykKQEAgLTgwNyw2ICs3NjcsNyBA QCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICAgICAgICAgIHJldHVybiAxCiAgICAgICAg ICAgICBzYW5kYm94X2Vudmlyb25tZW50LnVwZGF0ZSh7CiAgICAgICAgICAgICAgICAgIkNDQUNI RV9QUkVGSVgiOiAiaWNlY2MiLAorICAgICAgICAgICAgICAgICJJQ0VDQ19URVNUX1NPQ0tFVCI6 ICIvcnVuL2ljZWNjL2ljZWNjZC5zb2NrZXQiLAogICAgICAgICAgICAgICAgICJJQ0VDQ19WRVJT SU9OIjogdG9vbGNoYWluX3BhdGgsCiAgICAgICAgICAgICAgICAgIk5VTUJFUl9PRl9QUk9DRVNT T1JTIjogbl9jb3JlcywKICAgICAgICAgICAgIH0pCkBAIC04MTgsMTAgKzc3OSwxNiBAQCBjbGFz cyBXZWJraXRGbGF0cGFrOgogICAgICAgICBpZiBub3Qga3dhcmdzLmdldCgnYnVpbGRpbmdfZ3N0 Jyk6CiAgICAgICAgICAgICBnc3RfZW52ID0gc2VsZi5zZXR1cF9nc3RidWlsZChidWlsZGluZykK IAotICAgICAgICBmbGF0cGFrX2NvbW1hbmQgKz0gZXh0cmFfZmxhdHBha19hcmdzICsgW3NlbGYu ZmxhdHBha19idWlsZF9wYXRoXSArIGdzdF9lbnYgKyBhcmdzCisgICAgICAgIGZsYXRwYWtfY29t bWFuZCArPSBleHRyYV9mbGF0cGFrX2FyZ3MgKyBnc3RfZW52ICsgWyctLWNvbW1hbmQ9IiVzIicg JSBhcmdzWzBdLCAib3JnLndlYmtpdC5TZGsiXSArIGFyZ3NbMTpdCisKKyAgICAgICAgZmxhdHBh a19lbnYgPSBvcy5lbnZpcm9uCisgICAgICAgIGZsYXRwYWtfZW52LnVwZGF0ZSh7CisgICAgICAg ICAgICAiRkxBVFBBS19CV1JBUCI6IG9zLnBhdGguam9pbihzY3JpcHRkaXIsICJ3ZWJraXQtYndy YXAiKSwKKyAgICAgICAgICAgICJXRUJLSVRfQlVJTERfRElSX0JJTkRfTU9VTlQiOiAiJXM6JXMi ICUgKHNhbmRib3hfYnVpbGRfcGF0aCwgc2VsZi5idWlsZF9wYXRoKQorICAgICAgICB9KQogCiAg ICAgICAgIHRyeToKLSAgICAgICAgICAgIHJldHVybiBzZWxmLmV4ZWN1dGVfY29tbWFuZChmbGF0 cGFrX2NvbW1hbmQsIHN0ZG91dD1zdGRvdXQpCisgICAgICAgICAgICByZXR1cm4gc2VsZi5leGVj dXRlX2NvbW1hbmQoZmxhdHBha19jb21tYW5kLCBzdGRvdXQ9c3Rkb3V0LCBlbnY9ZmxhdHBha19l bnYpCiAgICAgICAgIGV4Y2VwdCBLZXlib2FyZEludGVycnVwdDoKICAgICAgICAgICAgIHJldHVy biAwCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvd2Via2l0LWJ3cmFwIGIvVG9vbHMvZmxh dHBhay93ZWJraXQtYndyYXAKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNmE3YzMyYjQ1MWJkOGI5YjQzYTQwNzBmMzZh NzEzODRjOTE3ZDAzYwotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL2ZsYXRwYWsvd2Via2l0LWJ3 cmFwCkBAIC0wLDAgKzEsNTkgQEAKKyMhL3Vzci9iaW4vZW52IHB5dGhvbjMKKyMgLSotIGNvZGlu ZzogdXRmLTggLSotCisjIENvcHlyaWdodCAoQykgMjAyMCBJZ2FsaWEgUy5MLgorIworIyBUaGlz IHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y CisjIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQ dWJsaWMKKyMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRh dGlvbjsgZWl0aGVyCisjIHZlcnNpb24gMi4xIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBv cHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorIworIyBUaGlzIHByb2dyYW0gaXMgZGlzdHJpYnV0 ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyMgYnV0IFdJVEhPVVQgQU5Z IFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyMgTUVSQ0hB TlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBH TlUKKyMgTGVzc2VyIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKyMK KyMgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExlc3NlciBHZW5l cmFsIFB1YmxpYworIyBMaWNlbnNlIGFsb25nIHdpdGggdGhpcyBwcm9ncmFtOyBpZiBub3QsIHdy aXRlIHRvIHRoZQorIyBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGlu IFN0LCBGaWZ0aCBGbG9vciwKKyMgQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisKK2ltcG9y dCBvcworaW1wb3J0IHN1YnByb2Nlc3MKK2ltcG9ydCBzeXMKK2ltcG9ydCB0ZW1wZmlsZQorCitz Y3JpcHRkaXIgPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSkKKwor ZGVmIG1haW4oYXJnczogbGlzdCkgLT4gaW50OgorICAgIHRtcGRpciA9IHRlbXBmaWxlLmdldHRl bXBkaXIoKQorICAgIHNvdXJjZV9yb290ID0gb3MucGF0aC5ub3JtcGF0aChvcy5wYXRoLmFic3Bh dGgob3MucGF0aC5qb2luKHNjcmlwdGRpciwgJy4uLy4uLycpKSkKKyAgICBiaW5kX21vdW50cyA9 IHsKKyAgICAgICAgIi9hcHAvd2Via2l0IjogIHNvdXJjZV9yb290LAorICAgICAgICAjIEFjY2Vz cyB0byAvcnVuL2hvc3QgaXMgcmVxdWlyZWQgYnkgdGhlIGNyYXNoIGxvZyByZXBvcnRlci4KKyAg ICAgICAgZiIvcnVuL2hvc3R7dG1wZGlyfSI6IGYie3RtcGRpcn0iCisgICAgfQorCisgICAgdHJ5 X2JpbmRfbW91bnRzID0geworICAgICAgICAiL3J1bi9pY2VjYyI6ICIvdmFyL3J1bi9pY2VjYyIK KyAgICB9CisKKyAgICBidWlsZF9wYXRoID0gb3MuZW52aXJvbi5nZXQoIldFQktJVF9CVUlMRF9E SVJfQklORF9NT1VOVCIpCisgICAgaWYgYnVpbGRfcGF0aDoKKyAgICAgICAgZGVzdCwgc3JjID0g YnVpbGRfcGF0aC5zcGxpdCgiOiIpCisgICAgICAgIHRyeV9iaW5kX21vdW50c1tkZXN0XSA9IHNy YworCisgICAgY29yZWR1bXBzX2RpciA9IG9zLmVudmlyb24uZ2V0KCJXRUJLSVRfQ09SRV9EVU1Q U19ESVJFQ1RPUlkiKQorICAgIGlmIGNvcmVkdW1wc19kaXI6CisgICAgICAgIHRyeV9iaW5kX21v dW50c1tjb3JlZHVtcHNfZGlyXSA9IGNvcmVkdW1wc19kaXIKKworICAgIGJ3cmFwX2FyZ3MgPSBb XQorICAgIGZvciBkZXN0LCBzcmMgaW4gYmluZF9tb3VudHMuaXRlbXMoKToKKyAgICAgICAgYndy YXBfYXJncy5hcHBlbmQoZiItLWJpbmQge3NyY30ge2Rlc3R9IikKKworICAgIGZvciBkZXN0LCBz cmMgaW4gdHJ5X2JpbmRfbW91bnRzLml0ZW1zKCk6CisgICAgICAgIGJ3cmFwX2FyZ3MuYXBwZW5k KGYiLS1iaW5kLXRyeSB7c3JjfSB7ZGVzdH0iKQorCisgICAgcmV0dXJuIG9zLnN5c3RlbSgiYndy YXAgIiArICcgJy5qb2luKGJ3cmFwX2FyZ3MgKyBhcmdzKSkKKworaWYgX19uYW1lX18gPT0gIl9f bWFpbl9fIjoKKyAgICBzeXMuZXhpdChtYWluKHN5cy5hcmd2WzE6XSkpCg== 400034 2020-05-22 02:04:16 -0700 2020-05-22 07:13:58 -0700 Patch bug-212077-20200522100414.patch text/plain 9819 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTkzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGI3YTQ1OGMzYTlmMzAxMjdmYmE0MTYzZmJhMWZmYTQ5 OTgwYjBmNS4uMjJkMzQxYjZiY2JkMTBjNmMxZWJmZDg0MjYyNjU1MzY3MjFhMDUzMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIwLTA1LTE5ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIEFkZCBidWJibGV3cmFwIC4uLiB3cmFwcGVyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIwNzcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYmluZC1tb3Vu dHMgYXJlIG5vdyBoYW5kbGVkIHRocm91Z2ggd2Via2l0LWJ3cmFwLgorCisgICAgICAgICogZmxh dHBhay9mbGF0cGFrdXRpbHMucHk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLmV4ZWN1dGVfY29t bWFuZCk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnJ1bl9pbl9zYW5kYm94KToKKyAgICAgICAg KiBmbGF0cGFrL3dlYmtpdC1id3JhcDogQWRkZWQuCisKIDIwMjAtMDUtMjEgIEVucmlxdWUgT2Nh w7FhIEdvbnrDoWxleiAgPGVvY2FuaGFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVy XVtHVEtdW1dQRV0gRXhwb3NlIGFuZCBob25vciB0aGUgbWVkaWEgY29udGVudCB0eXBlcyByZXF1 aXJpbmcgaGFyZHdhcmUgc3VwcG9ydCBzZXR0aW5nCmRpZmYgLS1naXQgYS9Ub29scy9mbGF0cGFr L2ZsYXRwYWt1dGlscy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CmluZGV4IGQ2 NzgyYjc3NTA2Y2MzNDMwZmJmYzkwMDA1ZmJjYWU0MzdkNzNhNTAuLjYyNjdmZTFhNzZhM2IxNmIw Njg5NTgxM2Q3MDBmZTk1Yjc4ODdjZTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBh a3V0aWxzLnB5CisrKyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CkBAIC00ODcsMTEg KzQ4NywxMSBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICBzZWxmLnNjY2FjaGVfdG9r ZW4gPSAiIgogICAgICAgICBzZWxmLnNjY2FjaGVfc2NoZWR1bGVyID0gREVGQVVMVF9TQ0NBQ0hF X1NDSEVEVUxFUgogCi0gICAgZGVmIGV4ZWN1dGVfY29tbWFuZChzZWxmLCBhcmdzLCBzdGRvdXQ9 Tm9uZSwgc3RkZXJyPU5vbmUpOgorICAgIGRlZiBleGVjdXRlX2NvbW1hbmQoc2VsZiwgYXJncywg c3Rkb3V0PU5vbmUsIHN0ZGVycj1Ob25lLCBlbnY9Tm9uZSk6CiAgICAgICAgIF9sb2cuZGVidWco J1J1bm5pbmcgaW4gc2FuZGJveDogJXNcbicgJSAnICcuam9pbihhcmdzKSkKICAgICAgICAgcmVz dWx0ID0gMAogICAgICAgICB0cnk6Ci0gICAgICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLmNo ZWNrX2NhbGwoYXJncywgc3Rkb3V0PXN0ZG91dCwgc3RkZXJyPXN0ZGVycikKKyAgICAgICAgICAg IHJlc3VsdCA9IHN1YnByb2Nlc3MuY2hlY2tfY2FsbChhcmdzLCBzdGRvdXQ9c3Rkb3V0LCBzdGRl cnI9c3RkZXJyLCBlbnY9ZW52KQogICAgICAgICBleGNlcHQgc3VicHJvY2Vzcy5DYWxsZWRQcm9j ZXNzRXJyb3IgYXMgZXJyOgogICAgICAgICAgICAgaWYgc2VsZi52ZXJib3NlOgogICAgICAgICAg ICAgICAgIGNtZCA9ICcgJy5qb2luKGVyci5jbWQpCkBAIC02MzgsNiArNjM4LDkgQEAgY2xhc3Mg V2Via2l0RmxhdHBhazoKICAgICAgICAgICAgICJURVNUX1JVTk5FUl9JTkpFQ1RFRF9CVU5ETEVf RklMRU5BTUUiOiBvcy5wYXRoLmpvaW4oc2FuZGJveF9idWlsZF9wYXRoLCAibGliL2xpYlRlc3RS dW5uZXJJbmplY3RlZEJ1bmRsZS5zbyIpLAogICAgICAgICB9CiAKKyAgICAgICAgaWYgbm90IGFy Z3M6CisgICAgICAgICAgICBhcmdzLmFwcGVuZCgiYmFzaCIpCisKICAgICAgICAgaWYgYXJnczoK ICAgICAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKGFyZ3NbMF0pOgogICAgICAgICAgICAgICAg IGNvbW1hbmQgPSBvcy5wYXRoLm5vcm1wYXRoKG9zLnBhdGguYWJzcGF0aChhcmdzWzBdKSkKQEAg LTY1MSwyMiArNjU0LDEyIEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIGVsc2U6CiAg ICAgICAgICAgICBidWlsZGluZyA9IEZhbHNlCiAKLSAgICAgICAgIyBGSVhNRTogVXNpbmcgdGhl IGBydW5gIGZsYXRwYWsgY29tbWFuZCB3b3VsZCBiZSBiZXR0ZXIsIGJ1dCBpdCBkb2Vzbid0Ci0g ICAgICAgICMgaGF2ZSBhIC0tYmluZC1tb3VudCBvcHRpb24uCi0gICAgICAgIGZsYXRwYWtfY29t bWFuZCA9IFsiZmxhdHBhayIsICJidWlsZCIsCisgICAgICAgIGZsYXRwYWtfY29tbWFuZCA9IFsi ZmxhdHBhayIsICJydW4iLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tZGllLXdpdGgt cGFyZW50IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICItLWFsbG93PWRldmVsIiwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICItLXRhbGstbmFtZT1vcmcuYTExeS5CdXMiLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIi0tdGFsay1uYW1lPW9yZy5ndGsudmZzIiwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICItLXRhbGstbmFtZT1vcmcuZ3RrLnZmcy4qIiwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICItLWJpbmQtbW91bnQ9L3J1bi9zaG09L2Rldi9zaG0iLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBBY2Nlc3MgdG8gL3J1bi9ob3N0IGlzIHJlcXVp cmVkIGJ5IHRoZSBjcmFzaCBsb2cgcmVwb3J0ZXIuCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAiLS1iaW5kLW1vdW50PS9ydW4vaG9zdC8lcz0lcyIgJSAodGVtcGZpbGUuZ2V0dGVtcGRpcigp LCB0ZW1wZmlsZS5nZXR0ZW1wZGlyKCkpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBm bGF0cGFrIGJ1aWxkIGRvZXNuJ3QgZXhwb3NlIGEgLS1zb2NrZXQgb3B0aW9uIGZvcgotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIyB3aGl0ZS1saXN0aW5nIHRoZSBzeXN0ZW1kIGpvdXJuYWwg c29ja2V0LiBTbwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIyB3aGl0ZS1saXN0IGl0IGlu IC9ydW4sIGhvcGluZyB0aGlzIGlzIHRoZSByaWdodAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIyBwYXRoLgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tYmluZC1tb3VudD0vcnVu L3N5c3RlbWQvam91cm5hbD0vcnVuL3N5c3RlbWQvam91cm5hbCIsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAiLS1iaW5kLW1vdW50PSVzPSVzIiAlIChzZWxmLnNhbmRib3hfc291cmNlX3Jv b3QsIHNlbGYuc291cmNlX3Jvb3QpXQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0tdGFs ay1uYW1lPW9yZy5ndGsudmZzLioiXQogCiAgICAgICAgIGlmIGFyZ3MgYW5kIGFyZ3NbMF0uZW5k c3dpdGgoImJ1aWxkLXdlYmtpdCIpIGFuZCBub3Qgc2VsZi5pc19icmFuY2hfYnVpbGQoKToKICAg ICAgICAgICAgICMgRW5zdXJlIHNlbGYuYnVpbGRfcGF0aCBleGlzdHMuCkBAIC02NzYsMTIgKzY2 OSw2IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICAgICAgaWYgZS5lcnJubyAh PSBlcnJuby5FRVhJU1Q6CiAgICAgICAgICAgICAgICAgICAgIHJhaXNlIGUKIAotICAgICAgICAj IFdlIG1vdW50IFdlYktpdEJ1aWxkL1BPUlROQU1FL0J1aWxkVHlwZSB0byAvYXBwL3dlYmtpdC9X ZWJLaXRCdWlsZC9CdWlsZFR5cGUKLSAgICAgICAgIyBzbyB3ZSBjYW4gYnVpbGQgV1BFIGFuZCBH VEsgaW4gYSBzYW1lIHNvdXJjZSB0cmVlLgotICAgICAgICAjIFRoZSBiaW5kLW1vdW50IGlzIGFs d2F5cyBuZWVkZWQsIGV4Y2VwdGVkIGR1cmluZyB0aGUgaW5pdGlhbCBzZXR1cCAoU0RLIGluc3Rh bGwvdXBkYXRlcykuCi0gICAgICAgIGlmIG9zLnBhdGguaXNkaXIoc2VsZi5idWlsZF9wYXRoKToK LSAgICAgICAgICAgIGZsYXRwYWtfY29tbWFuZC5hcHBlbmQoIi0tYmluZC1tb3VudD0lcz0lcyIg JSAoc2FuZGJveF9idWlsZF9wYXRoLCBzZWxmLmJ1aWxkX3BhdGgpKQotCiAgICAgICAgIGlmIG5v dCBidWlsZGluZzoKICAgICAgICAgICAgIGZsYXRwYWtfY29tbWFuZC5leHRlbmQoWwogICAgICAg ICAgICAgICAgICItLWRldmljZT1hbGwiLApAQCAtNjk1LDMxICs2ODIsOSBAQCBjbGFzcyBXZWJr aXRGbGF0cGFrOgogICAgICAgICAgICAgICAgICItLXNvY2tldD14MTEiLAogICAgICAgICAgICAg ICAgICItLXN5c3RlbS10YWxrLW5hbWU9b3JnLmExMXkuQnVzIiwKICAgICAgICAgICAgICAgICAi LS1zeXN0ZW0tdGFsay1uYW1lPW9yZy5mcmVlZGVza3RvcC5HZW9DbHVlMiIsCi0gICAgICAgICAg ICAgICAgIi0tdGFsay1uYW1lPW9yZy5hMTF5LkJ1cyIsCiAgICAgICAgICAgICAgICAgIi0tdGFs ay1uYW1lPW9yZy5mcmVlZGVza3RvcC5GbGF0cGFrIgogICAgICAgICAgICAgXSkKIAotICAgICAg ICAgICAgeGRnX3J1bnRpbWVfZGlyID0gb3MuZW52aXJvbi5nZXQoJ1hER19SVU5USU1FX0RJUics IE5vbmUpCi0gICAgICAgICAgICBpZiBub3QgeGRnX3J1bnRpbWVfZGlyOgotICAgICAgICAgICAg ICAgIF9sb2cuZGVidWcoJ1hER19SVU5USU1FX0RJUiBub3Qgc2V0LiBUcnlpbmcgZGVmYXVsdCBs b2NhdGlvbi4nKQotICAgICAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICAgICAgd2l0 aCBvcGVuKG9zLmRldm51bGwsICd3JykgYXMgZGV2bnVsbDoKLSAgICAgICAgICAgICAgICAgICAg ICAgIHVpZCA9IHN1YnByb2Nlc3MuY2hlY2tfb3V0cHV0KCgiaWQiLCAiLXUiKSwgc3RkZXJyPWRl dm51bGwpLmRlY29kZSgpLnN0cmlwKCkKLSAgICAgICAgICAgICAgICAgICAgICAgIHhkZ19ydW50 aW1lX2RpciA9ICcvcnVuL3VzZXIve3VpZH0nLmZvcm1hdCh1aWQ9dWlkKQotICAgICAgICAgICAg ICAgIGV4Y2VwdCBzdWJwcm9jZXNzLkNhbGxlZFByb2Nlc3NFcnJvcjoKLSAgICAgICAgICAgICAg ICAgICAgX2xvZy5kZWJ1ZygiQ291bGQgbm90IGRldGVybWluZSBYREdfUlVOSU1FX0RJUi4gVGhp cyBtYXkgY2F1c2UgYnViYmxld3JhcCB0byBmYWlsLiIpCi0KLSAgICAgICAgICAgIGlmIHhkZ19y dW50aW1lX2RpcjoKLSAgICAgICAgICAgICAgICB1aWRfZG9jX3BhdGggPSBvcy5wYXRoLmpvaW4o eGRnX3J1bnRpbWVfZGlyLCAnZG9jJykKLSAgICAgICAgICAgICAgICBpZiBvcy5wYXRoLmV4aXN0 cyh1aWRfZG9jX3BhdGgpOgotICAgICAgICAgICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQuYXBw ZW5kKCItLWJpbmQtbW91bnQ9e3VpZF9kb2NfcGF0aH09e3VpZF9kb2NfcGF0aH0iLmZvcm1hdCh1 aWRfZG9jX3BhdGg9dWlkX2RvY19wYXRoKSkKLSAgICAgICAgICAgICAgICBlbHNlOgotICAgICAg ICAgICAgICAgICAgICBfbG9nLmRlYnVnKCJDYW4ndCBmaW5kIHVzZXIgZG9jdW1lbnQgcGF0aCBh dCAne3VpZF9kb2NfcGF0aH0nLiBOb3QgbW91bnRpbmcgaXQuIi5mb3JtYXQodWlkX2RvY19wYXRo PXVpZF9kb2NfcGF0aCkpCi0KLSAgICAgICAgICAgIGNvcmVkdW1wc19kaXIgPSBvcy5lbnZpcm9u LmdldCgiV0VCS0lUX0NPUkVfRFVNUFNfRElSRUNUT1JZIikKLSAgICAgICAgICAgIGlmIGNvcmVk dW1wc19kaXIgYW5kIG9zLnBhdGguaXNkaXIoY29yZWR1bXBzX2Rpcik6Ci0gICAgICAgICAgICAg ICAgZmxhdHBha19jb21tYW5kLmFwcGVuZCgiLS1iaW5kLW1vdW50PXtjb3JlZHVtcHNfZGlyfT17 Y29yZWR1bXBzX2Rpcn0iLmZvcm1hdChjb3JlZHVtcHNfZGlyPWNvcmVkdW1wc19kaXIpKQotCiAg ICAgICAgICAgICBzYW5kYm94X2Vudmlyb25tZW50LnVwZGF0ZSh7CiAgICAgICAgICAgICAgICAg IlRaIjogIlBTVDhQRFQiLAogICAgICAgICAgICAgICAgICJMQU5HIjogImVuX1VTLlVURi04IiwK QEAgLTc5Niw3ICs3NjEsNiBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICAgICAgX2xv Zy5kZWJ1ZygnRW5hYmxpbmcgdGhlIGljZWNyZWFtIGNvbXBpbGVyJykKICAgICAgICAgICAgIGlm IHNoYXJlX25ldHdvcmtfb3B0aW9uIG5vdCBpbiBmbGF0cGFrX2NvbW1hbmQ6CiAgICAgICAgICAg ICAgICAgZmxhdHBha19jb21tYW5kLmFwcGVuZChzaGFyZV9uZXR3b3JrX29wdGlvbikKLSAgICAg ICAgICAgIGZsYXRwYWtfY29tbWFuZC5hcHBlbmQoIi0tYmluZC1tb3VudD0vdmFyL3J1bi9pY2Vj Yz0vdmFyL3J1bi9pY2VjYyIpCiAKICAgICAgICAgICAgIG5fY29yZXMgPSBtdWx0aXByb2Nlc3Np bmcuY3B1X2NvdW50KCkgKiAzCiAgICAgICAgICAgICBfbG9nLmRlYnVnKCdGb2xsb3dpbmcgaWNl Y3JlYW0gcmVjb21tZW5kYXRpb24gZm9yIHRoZSBudW1iZXIgb2YgY29yZXMgdG8gdXNlOiAlZCcg JSBuX2NvcmVzKQpAQCAtODA3LDYgKzc3MSw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAg ICAgICAgICAgICAgcmV0dXJuIDEKICAgICAgICAgICAgIHNhbmRib3hfZW52aXJvbm1lbnQudXBk YXRlKHsKICAgICAgICAgICAgICAgICAiQ0NBQ0hFX1BSRUZJWCI6ICJpY2VjYyIsCisgICAgICAg ICAgICAgICAgIklDRUNDX1RFU1RfU09DS0VUIjogIi9ydW4vaWNlY2MvaWNlY2NkLnNvY2tldCIs CiAgICAgICAgICAgICAgICAgIklDRUNDX1ZFUlNJT04iOiB0b29sY2hhaW5fcGF0aCwKICAgICAg ICAgICAgICAgICAiTlVNQkVSX09GX1BST0NFU1NPUlMiOiBuX2NvcmVzLAogICAgICAgICAgICAg fSkKQEAgLTgxOCwxMCArNzgzLDE2IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIGlm IG5vdCBrd2FyZ3MuZ2V0KCdidWlsZGluZ19nc3QnKToKICAgICAgICAgICAgIGdzdF9lbnYgPSBz ZWxmLnNldHVwX2dzdGJ1aWxkKGJ1aWxkaW5nKQogCi0gICAgICAgIGZsYXRwYWtfY29tbWFuZCAr PSBleHRyYV9mbGF0cGFrX2FyZ3MgKyBbc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGhdICsgZ3N0X2Vu diArIGFyZ3MKKyAgICAgICAgZmxhdHBha19jb21tYW5kICs9IGV4dHJhX2ZsYXRwYWtfYXJncyAr IGdzdF9lbnYgKyBbJy0tY29tbWFuZD0iJXMiJyAlIGFyZ3NbMF0sICJvcmcud2Via2l0LlNkayJd ICsgYXJnc1sxOl0KKworICAgICAgICBmbGF0cGFrX2VudiA9IG9zLmVudmlyb24KKyAgICAgICAg ZmxhdHBha19lbnYudXBkYXRlKHsKKyAgICAgICAgICAgICJGTEFUUEFLX0JXUkFQIjogb3MucGF0 aC5qb2luKHNjcmlwdGRpciwgIndlYmtpdC1id3JhcCIpLAorICAgICAgICAgICAgIldFQktJVF9C VUlMRF9ESVJfQklORF9NT1VOVCI6ICIlczolcyIgJSAoc2FuZGJveF9idWlsZF9wYXRoLCBzZWxm LmJ1aWxkX3BhdGgpCisgICAgICAgIH0pCiAKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgcmV0 dXJuIHNlbGYuZXhlY3V0ZV9jb21tYW5kKGZsYXRwYWtfY29tbWFuZCwgc3Rkb3V0PXN0ZG91dCkK KyAgICAgICAgICAgIHJldHVybiBzZWxmLmV4ZWN1dGVfY29tbWFuZChmbGF0cGFrX2NvbW1hbmQs IHN0ZG91dD1zdGRvdXQsIGVudj1mbGF0cGFrX2VudikKICAgICAgICAgZXhjZXB0IEtleWJvYXJk SW50ZXJydXB0OgogICAgICAgICAgICAgcmV0dXJuIDAKIApkaWZmIC0tZ2l0IGEvVG9vbHMvZmxh dHBhay93ZWJraXQtYndyYXAgYi9Ub29scy9mbGF0cGFrL3dlYmtpdC1id3JhcApuZXcgZmlsZSBt b2RlIDEwMDc1NQppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li42YTdjMzJiNDUxYmQ4YjliNDNhNDA3MGYzNmE3MTM4NGM5MTdkMDNjCi0tLSAvZGV2L251bGwK KysrIGIvVG9vbHMvZmxhdHBhay93ZWJraXQtYndyYXAKQEAgLTAsMCArMSw1OSBAQAorIyEvdXNy L2Jpbi9lbnYgcHl0aG9uMworIyAtKi0gY29kaW5nOiB1dGYtOCAtKi0KKyMgQ29weXJpZ2h0IChD KSAyMDIwIElnYWxpYSBTLkwuCisjCisjIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5 b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyMgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJt cyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworIyBMaWNlbnNlIGFzIHB1Ymxpc2hl ZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyMgdmVyc2lvbiAyLjEg b2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisj CisjIFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwg YmUgdXNlZnVsLAorIyBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUg aW1wbGllZCB3YXJyYW50eSBvZgorIyBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQ QVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorIyBMZXNzZXIgR2VuZXJhbCBQdWJsaWMg TGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorIworIyBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQg YSBjb3B5IG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisjIExpY2Vuc2UgYWxvbmcg d2l0aCB0aGlzIHByb2dyYW07IGlmIG5vdCwgd3JpdGUgdG8gdGhlCisjIEZyZWUgU29mdHdhcmUg Rm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3QsIEZpZnRoIEZsb29yLAorIyBCb3N0b24s IE1BIDAyMTEwLTEzMDEsIFVTQS4KKworaW1wb3J0IG9zCitpbXBvcnQgc3VicHJvY2VzcworaW1w b3J0IHN5cworaW1wb3J0IHRlbXBmaWxlCisKK3NjcmlwdGRpciA9IG9zLnBhdGguYWJzcGF0aChv cy5wYXRoLmRpcm5hbWUoX19maWxlX18pKQorCitkZWYgbWFpbihhcmdzOiBsaXN0KSAtPiBpbnQ6 CisgICAgdG1wZGlyID0gdGVtcGZpbGUuZ2V0dGVtcGRpcigpCisgICAgc291cmNlX3Jvb3QgPSBv cy5wYXRoLm5vcm1wYXRoKG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4oc2NyaXB0ZGlyLCAn Li4vLi4vJykpKQorICAgIGJpbmRfbW91bnRzID0geworICAgICAgICAiL2FwcC93ZWJraXQiOiAg c291cmNlX3Jvb3QsCisgICAgICAgICMgQWNjZXNzIHRvIC9ydW4vaG9zdCBpcyByZXF1aXJlZCBi eSB0aGUgY3Jhc2ggbG9nIHJlcG9ydGVyLgorICAgICAgICBmIi9ydW4vaG9zdHt0bXBkaXJ9Ijog ZiJ7dG1wZGlyfSIKKyAgICB9CisKKyAgICB0cnlfYmluZF9tb3VudHMgPSB7CisgICAgICAgICIv cnVuL2ljZWNjIjogIi92YXIvcnVuL2ljZWNjIgorICAgIH0KKworICAgIGJ1aWxkX3BhdGggPSBv cy5lbnZpcm9uLmdldCgiV0VCS0lUX0JVSUxEX0RJUl9CSU5EX01PVU5UIikKKyAgICBpZiBidWls ZF9wYXRoOgorICAgICAgICBkZXN0LCBzcmMgPSBidWlsZF9wYXRoLnNwbGl0KCI6IikKKyAgICAg ICAgdHJ5X2JpbmRfbW91bnRzW2Rlc3RdID0gc3JjCisKKyAgICBjb3JlZHVtcHNfZGlyID0gb3Mu ZW52aXJvbi5nZXQoIldFQktJVF9DT1JFX0RVTVBTX0RJUkVDVE9SWSIpCisgICAgaWYgY29yZWR1 bXBzX2RpcjoKKyAgICAgICAgdHJ5X2JpbmRfbW91bnRzW2NvcmVkdW1wc19kaXJdID0gY29yZWR1 bXBzX2RpcgorCisgICAgYndyYXBfYXJncyA9IFtdCisgICAgZm9yIGRlc3QsIHNyYyBpbiBiaW5k X21vdW50cy5pdGVtcygpOgorICAgICAgICBid3JhcF9hcmdzLmFwcGVuZChmIi0tYmluZCB7c3Jj fSB7ZGVzdH0iKQorCisgICAgZm9yIGRlc3QsIHNyYyBpbiB0cnlfYmluZF9tb3VudHMuaXRlbXMo KToKKyAgICAgICAgYndyYXBfYXJncy5hcHBlbmQoZiItLWJpbmQtdHJ5IHtzcmN9IHtkZXN0fSIp CisKKyAgICByZXR1cm4gb3Muc3lzdGVtKCJid3JhcCAiICsgJyAnLmpvaW4oYndyYXBfYXJncyAr IGFyZ3MpKQorCitpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgorICAgIHN5cy5leGl0KG1haW4o c3lzLmFyZ3ZbMTpdKSkK 400043 2020-05-22 07:14:02 -0700 2020-05-22 07:58:46 -0700 Patch bug-212077-20200522151401.patch text/plain 9803 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMDU1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmIwZjk2MGMzZTEzMWZhM2NkZGVlY2IxMDA1NjExMzA3 OWRjOTU1Mi4uZGUzMjU1ZWFiNzI0ZjZiMmRhYWI0ZmU4N2VlZjg4NjA2Yzg0MWQ0ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIwLTA1LTE5ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIEFkZCBidWJibGV3cmFwIC4uLiB3cmFwcGVyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIwNzcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYmluZC1tb3Vu dHMgYXJlIG5vdyBoYW5kbGVkIHRocm91Z2ggd2Via2l0LWJ3cmFwLgorCisgICAgICAgICogZmxh dHBhay9mbGF0cGFrdXRpbHMucHk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLmV4ZWN1dGVfY29t bWFuZCk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnJ1bl9pbl9zYW5kYm94KToKKyAgICAgICAg KiBmbGF0cGFrL3dlYmtpdC1id3JhcDogQWRkZWQuCisKIDIwMjAtMDUtMjIgIEphdmllciBGZXJu YW5kZXogIDxqZmVybmFuZGV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0ZsYXRwYWsgU0RLXSBD Q0FDSEVfIGVudiB2YXJzIGFyZSBub3QgZm9yd2FyZGVkIHRvIHRoZSBzYW5kYm94IGVudmlyb25t ZW50CmRpZmYgLS1naXQgYS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weSBiL1Rvb2xzL2Zs YXRwYWsvZmxhdHBha3V0aWxzLnB5CmluZGV4IGI5M2QxMjkyMjVhOGMzMmQ2NmUzZGI4ZTJlNDQ5 NzIxNzRkNWZlYjEuLmQwMDU2N2I4NDc0MTcxYjU4YTQ0ZDRjMWM1NjIyYmJmMThmZjRiNDcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CisrKyBiL1Rvb2xzL2ZsYXRw YWsvZmxhdHBha3V0aWxzLnB5CkBAIC00ODcsMTEgKzQ4NywxMSBAQCBjbGFzcyBXZWJraXRGbGF0 cGFrOgogICAgICAgICBzZWxmLnNjY2FjaGVfdG9rZW4gPSAiIgogICAgICAgICBzZWxmLnNjY2Fj aGVfc2NoZWR1bGVyID0gREVGQVVMVF9TQ0NBQ0hFX1NDSEVEVUxFUgogCi0gICAgZGVmIGV4ZWN1 dGVfY29tbWFuZChzZWxmLCBhcmdzLCBzdGRvdXQ9Tm9uZSwgc3RkZXJyPU5vbmUpOgorICAgIGRl ZiBleGVjdXRlX2NvbW1hbmQoc2VsZiwgYXJncywgc3Rkb3V0PU5vbmUsIHN0ZGVycj1Ob25lLCBl bnY9Tm9uZSk6CiAgICAgICAgIF9sb2cuZGVidWcoJ1J1bm5pbmcgaW4gc2FuZGJveDogJXNcbicg JSAnICcuam9pbihhcmdzKSkKICAgICAgICAgcmVzdWx0ID0gMAogICAgICAgICB0cnk6Ci0gICAg ICAgICAgICByZXN1bHQgPSBzdWJwcm9jZXNzLmNoZWNrX2NhbGwoYXJncywgc3Rkb3V0PXN0ZG91 dCwgc3RkZXJyPXN0ZGVycikKKyAgICAgICAgICAgIHJlc3VsdCA9IHN1YnByb2Nlc3MuY2hlY2tf Y2FsbChhcmdzLCBzdGRvdXQ9c3Rkb3V0LCBzdGRlcnI9c3RkZXJyLCBlbnY9ZW52KQogICAgICAg ICBleGNlcHQgc3VicHJvY2Vzcy5DYWxsZWRQcm9jZXNzRXJyb3IgYXMgZXJyOgogICAgICAgICAg ICAgaWYgc2VsZi52ZXJib3NlOgogICAgICAgICAgICAgICAgIGNtZCA9ICcgJy5qb2luKGVyci5j bWQpCkBAIC02MzgsNiArNjM4LDkgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgICAg ICJURVNUX1JVTk5FUl9JTkpFQ1RFRF9CVU5ETEVfRklMRU5BTUUiOiBvcy5wYXRoLmpvaW4oc2Fu ZGJveF9idWlsZF9wYXRoLCAibGliL2xpYlRlc3RSdW5uZXJJbmplY3RlZEJ1bmRsZS5zbyIpLAog ICAgICAgICB9CiAKKyAgICAgICAgaWYgbm90IGFyZ3M6CisgICAgICAgICAgICBhcmdzLmFwcGVu ZCgiYmFzaCIpCisKICAgICAgICAgaWYgYXJnczoKICAgICAgICAgICAgIGlmIG9zLnBhdGguZXhp c3RzKGFyZ3NbMF0pOgogICAgICAgICAgICAgICAgIGNvbW1hbmQgPSBvcy5wYXRoLm5vcm1wYXRo KG9zLnBhdGguYWJzcGF0aChhcmdzWzBdKSkKQEAgLTY1MSwyMiArNjU0LDEyIEBAIGNsYXNzIFdl YmtpdEZsYXRwYWs6CiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBidWlsZGluZyA9IEZhbHNl CiAKLSAgICAgICAgIyBGSVhNRTogVXNpbmcgdGhlIGBydW5gIGZsYXRwYWsgY29tbWFuZCB3b3Vs ZCBiZSBiZXR0ZXIsIGJ1dCBpdCBkb2Vzbid0Ci0gICAgICAgICMgaGF2ZSBhIC0tYmluZC1tb3Vu dCBvcHRpb24uCi0gICAgICAgIGZsYXRwYWtfY29tbWFuZCA9IFsiZmxhdHBhayIsICJidWlsZCIs CisgICAgICAgIGZsYXRwYWtfY29tbWFuZCA9IFsiZmxhdHBhayIsICJydW4iLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgIi0tZGllLXdpdGgtcGFyZW50IiwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICItLWFsbG93PWRldmVsIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICIt LXRhbGstbmFtZT1vcmcuYTExeS5CdXMiLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIi0t dGFsay1uYW1lPW9yZy5ndGsudmZzIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICItLXRh bGstbmFtZT1vcmcuZ3RrLnZmcy4qIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICItLWJp bmQtbW91bnQ9L3J1bi9zaG09L2Rldi9zaG0iLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg IyBBY2Nlc3MgdG8gL3J1bi9ob3N0IGlzIHJlcXVpcmVkIGJ5IHRoZSBjcmFzaCBsb2cgcmVwb3J0 ZXIuCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1iaW5kLW1vdW50PS9ydW4vaG9zdC8l cz0lcyIgJSAodGVtcGZpbGUuZ2V0dGVtcGRpcigpLCB0ZW1wZmlsZS5nZXR0ZW1wZGlyKCkpLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBmbGF0cGFrIGJ1aWxkIGRvZXNuJ3QgZXhwb3Nl IGEgLS1zb2NrZXQgb3B0aW9uIGZvcgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIyB3aGl0 ZS1saXN0aW5nIHRoZSBzeXN0ZW1kIGpvdXJuYWwgc29ja2V0LiBTbwotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIyB3aGl0ZS1saXN0IGl0IGluIC9ydW4sIGhvcGluZyB0aGlzIGlzIHRoZSBy aWdodAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBwYXRoLgotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIi0tYmluZC1tb3VudD0vcnVuL3N5c3RlbWQvam91cm5hbD0vcnVuL3N5c3Rl bWQvam91cm5hbCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAiLS1iaW5kLW1vdW50PSVz PSVzIiAlIChzZWxmLnNhbmRib3hfc291cmNlX3Jvb3QsIHNlbGYuc291cmNlX3Jvb3QpXQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgIi0tdGFsay1uYW1lPW9yZy5ndGsudmZzLioiXQogCiAg ICAgICAgIGlmIGFyZ3MgYW5kIGFyZ3NbMF0uZW5kc3dpdGgoImJ1aWxkLXdlYmtpdCIpIGFuZCBu b3Qgc2VsZi5pc19icmFuY2hfYnVpbGQoKToKICAgICAgICAgICAgICMgRW5zdXJlIHNlbGYuYnVp bGRfcGF0aCBleGlzdHMuCkBAIC02NzYsMTIgKzY2OSw2IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6 CiAgICAgICAgICAgICAgICAgaWYgZS5lcnJubyAhPSBlcnJuby5FRVhJU1Q6CiAgICAgICAgICAg ICAgICAgICAgIHJhaXNlIGUKIAotICAgICAgICAjIFdlIG1vdW50IFdlYktpdEJ1aWxkL1BPUlRO QU1FL0J1aWxkVHlwZSB0byAvYXBwL3dlYmtpdC9XZWJLaXRCdWlsZC9CdWlsZFR5cGUKLSAgICAg ICAgIyBzbyB3ZSBjYW4gYnVpbGQgV1BFIGFuZCBHVEsgaW4gYSBzYW1lIHNvdXJjZSB0cmVlLgot ICAgICAgICAjIFRoZSBiaW5kLW1vdW50IGlzIGFsd2F5cyBuZWVkZWQsIGV4Y2VwdGVkIGR1cmlu ZyB0aGUgaW5pdGlhbCBzZXR1cCAoU0RLIGluc3RhbGwvdXBkYXRlcykuCi0gICAgICAgIGlmIG9z LnBhdGguaXNkaXIoc2VsZi5idWlsZF9wYXRoKToKLSAgICAgICAgICAgIGZsYXRwYWtfY29tbWFu ZC5hcHBlbmQoIi0tYmluZC1tb3VudD0lcz0lcyIgJSAoc2FuZGJveF9idWlsZF9wYXRoLCBzZWxm LmJ1aWxkX3BhdGgpKQotCiAgICAgICAgIGlmIG5vdCBidWlsZGluZzoKICAgICAgICAgICAgIGZs YXRwYWtfY29tbWFuZC5leHRlbmQoWwogICAgICAgICAgICAgICAgICItLWRldmljZT1hbGwiLApA QCAtNjk1LDMxICs2ODIsOSBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAgICAgICAgICAg ICItLXNvY2tldD14MTEiLAogICAgICAgICAgICAgICAgICItLXN5c3RlbS10YWxrLW5hbWU9b3Jn LmExMXkuQnVzIiwKICAgICAgICAgICAgICAgICAiLS1zeXN0ZW0tdGFsay1uYW1lPW9yZy5mcmVl ZGVza3RvcC5HZW9DbHVlMiIsCi0gICAgICAgICAgICAgICAgIi0tdGFsay1uYW1lPW9yZy5hMTF5 LkJ1cyIsCiAgICAgICAgICAgICAgICAgIi0tdGFsay1uYW1lPW9yZy5mcmVlZGVza3RvcC5GbGF0 cGFrIgogICAgICAgICAgICAgXSkKIAotICAgICAgICAgICAgeGRnX3J1bnRpbWVfZGlyID0gb3Mu ZW52aXJvbi5nZXQoJ1hER19SVU5USU1FX0RJUicsIE5vbmUpCi0gICAgICAgICAgICBpZiBub3Qg eGRnX3J1bnRpbWVfZGlyOgotICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoJ1hER19SVU5USU1F X0RJUiBub3Qgc2V0LiBUcnlpbmcgZGVmYXVsdCBsb2NhdGlvbi4nKQotICAgICAgICAgICAgICAg IHRyeToKLSAgICAgICAgICAgICAgICAgICAgd2l0aCBvcGVuKG9zLmRldm51bGwsICd3JykgYXMg ZGV2bnVsbDoKLSAgICAgICAgICAgICAgICAgICAgICAgIHVpZCA9IHN1YnByb2Nlc3MuY2hlY2tf b3V0cHV0KCgiaWQiLCAiLXUiKSwgc3RkZXJyPWRldm51bGwpLmRlY29kZSgpLnN0cmlwKCkKLSAg ICAgICAgICAgICAgICAgICAgICAgIHhkZ19ydW50aW1lX2RpciA9ICcvcnVuL3VzZXIve3VpZH0n LmZvcm1hdCh1aWQ9dWlkKQotICAgICAgICAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLkNhbGxl ZFByb2Nlc3NFcnJvcjoKLSAgICAgICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygiQ291bGQgbm90 IGRldGVybWluZSBYREdfUlVOSU1FX0RJUi4gVGhpcyBtYXkgY2F1c2UgYnViYmxld3JhcCB0byBm YWlsLiIpCi0KLSAgICAgICAgICAgIGlmIHhkZ19ydW50aW1lX2RpcjoKLSAgICAgICAgICAgICAg ICB1aWRfZG9jX3BhdGggPSBvcy5wYXRoLmpvaW4oeGRnX3J1bnRpbWVfZGlyLCAnZG9jJykKLSAg ICAgICAgICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyh1aWRfZG9jX3BhdGgpOgotICAgICAgICAg ICAgICAgICAgICBmbGF0cGFrX2NvbW1hbmQuYXBwZW5kKCItLWJpbmQtbW91bnQ9e3VpZF9kb2Nf cGF0aH09e3VpZF9kb2NfcGF0aH0iLmZvcm1hdCh1aWRfZG9jX3BhdGg9dWlkX2RvY19wYXRoKSkK LSAgICAgICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCJD YW4ndCBmaW5kIHVzZXIgZG9jdW1lbnQgcGF0aCBhdCAne3VpZF9kb2NfcGF0aH0nLiBOb3QgbW91 bnRpbmcgaXQuIi5mb3JtYXQodWlkX2RvY19wYXRoPXVpZF9kb2NfcGF0aCkpCi0KLSAgICAgICAg ICAgIGNvcmVkdW1wc19kaXIgPSBvcy5lbnZpcm9uLmdldCgiV0VCS0lUX0NPUkVfRFVNUFNfRElS RUNUT1JZIikKLSAgICAgICAgICAgIGlmIGNvcmVkdW1wc19kaXIgYW5kIG9zLnBhdGguaXNkaXIo Y29yZWR1bXBzX2Rpcik6Ci0gICAgICAgICAgICAgICAgZmxhdHBha19jb21tYW5kLmFwcGVuZCgi LS1iaW5kLW1vdW50PXtjb3JlZHVtcHNfZGlyfT17Y29yZWR1bXBzX2Rpcn0iLmZvcm1hdChjb3Jl ZHVtcHNfZGlyPWNvcmVkdW1wc19kaXIpKQotCiAgICAgICAgICAgICBzYW5kYm94X2Vudmlyb25t ZW50LnVwZGF0ZSh7CiAgICAgICAgICAgICAgICAgIlRaIjogIlBTVDhQRFQiLAogICAgICAgICAg ICAgICAgICJMQU5HIjogImVuX1VTLlVURi04IiwKQEAgLTc5Nyw3ICs3NjIsNiBAQCBjbGFzcyBX ZWJraXRGbGF0cGFrOgogICAgICAgICAgICAgX2xvZy5kZWJ1ZygnRW5hYmxpbmcgdGhlIGljZWNy ZWFtIGNvbXBpbGVyJykKICAgICAgICAgICAgIGlmIHNoYXJlX25ldHdvcmtfb3B0aW9uIG5vdCBp biBmbGF0cGFrX2NvbW1hbmQ6CiAgICAgICAgICAgICAgICAgZmxhdHBha19jb21tYW5kLmFwcGVu ZChzaGFyZV9uZXR3b3JrX29wdGlvbikKLSAgICAgICAgICAgIGZsYXRwYWtfY29tbWFuZC5hcHBl bmQoIi0tYmluZC1tb3VudD0vdmFyL3J1bi9pY2VjYz0vdmFyL3J1bi9pY2VjYyIpCiAKICAgICAg ICAgICAgIG5fY29yZXMgPSBtdWx0aXByb2Nlc3NpbmcuY3B1X2NvdW50KCkgKiAzCiAgICAgICAg ICAgICBfbG9nLmRlYnVnKCdGb2xsb3dpbmcgaWNlY3JlYW0gcmVjb21tZW5kYXRpb24gZm9yIHRo ZSBudW1iZXIgb2YgY29yZXMgdG8gdXNlOiAlZCcgJSBuX2NvcmVzKQpAQCAtODA4LDYgKzc3Miw3 IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICAgICAgcmV0dXJuIDEKICAgICAg ICAgICAgIHNhbmRib3hfZW52aXJvbm1lbnQudXBkYXRlKHsKICAgICAgICAgICAgICAgICAiQ0NB Q0hFX1BSRUZJWCI6ICJpY2VjYyIsCisgICAgICAgICAgICAgICAgIklDRUNDX1RFU1RfU09DS0VU IjogIi9ydW4vaWNlY2MvaWNlY2NkLnNvY2tldCIsCiAgICAgICAgICAgICAgICAgIklDRUNDX1ZF UlNJT04iOiB0b29sY2hhaW5fcGF0aCwKICAgICAgICAgICAgICAgICAiTlVNQkVSX09GX1BST0NF U1NPUlMiOiBuX2NvcmVzLAogICAgICAgICAgICAgfSkKQEAgLTgxOSwxMCArNzg0LDE2IEBAIGNs YXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIGlmIG5vdCBrd2FyZ3MuZ2V0KCdidWlsZGluZ19n c3QnKToKICAgICAgICAgICAgIGdzdF9lbnYgPSBzZWxmLnNldHVwX2dzdGJ1aWxkKGJ1aWxkaW5n KQogCi0gICAgICAgIGZsYXRwYWtfY29tbWFuZCArPSBleHRyYV9mbGF0cGFrX2FyZ3MgKyBbc2Vs Zi5mbGF0cGFrX2J1aWxkX3BhdGhdICsgZ3N0X2VudiArIGFyZ3MKKyAgICAgICAgZmxhdHBha19j b21tYW5kICs9IGV4dHJhX2ZsYXRwYWtfYXJncyArIGdzdF9lbnYgKyBbJy0tY29tbWFuZD0lcycg JSBhcmdzWzBdLCAib3JnLndlYmtpdC5TZGsiXSArIGFyZ3NbMTpdCisKKyAgICAgICAgZmxhdHBh a19lbnYgPSBvcy5lbnZpcm9uCisgICAgICAgIGZsYXRwYWtfZW52LnVwZGF0ZSh7CisgICAgICAg ICAgICAiRkxBVFBBS19CV1JBUCI6IG9zLnBhdGguam9pbihzY3JpcHRkaXIsICJ3ZWJraXQtYndy YXAiKSwKKyAgICAgICAgICAgICJXRUJLSVRfQlVJTERfRElSX0JJTkRfTU9VTlQiOiAiJXM6JXMi ICUgKHNhbmRib3hfYnVpbGRfcGF0aCwgc2VsZi5idWlsZF9wYXRoKQorICAgICAgICB9KQogCiAg ICAgICAgIHRyeToKLSAgICAgICAgICAgIHJldHVybiBzZWxmLmV4ZWN1dGVfY29tbWFuZChmbGF0 cGFrX2NvbW1hbmQsIHN0ZG91dD1zdGRvdXQpCisgICAgICAgICAgICByZXR1cm4gc2VsZi5leGVj dXRlX2NvbW1hbmQoZmxhdHBha19jb21tYW5kLCBzdGRvdXQ9c3Rkb3V0LCBlbnY9ZmxhdHBha19l bnYpCiAgICAgICAgIGV4Y2VwdCBLZXlib2FyZEludGVycnVwdDoKICAgICAgICAgICAgIHJldHVy biAwCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvd2Via2l0LWJ3cmFwIGIvVG9vbHMvZmxh dHBhay93ZWJraXQtYndyYXAKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODQ2MjVkZTFhZjI1ZThlZmIwYTA2N2Y4MDBh N2JlNzE3MDBmZjdlOQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL2ZsYXRwYWsvd2Via2l0LWJ3 cmFwCkBAIC0wLDAgKzEsNTkgQEAKKyMhL3Vzci9iaW4vZW52IHB5dGhvbjMKKyMgLSotIGNvZGlu ZzogdXRmLTggLSotCisjIENvcHlyaWdodCAoQykgMjAyMCBJZ2FsaWEgUy5MLgorIworIyBUaGlz IHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29y CisjIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQ dWJsaWMKKyMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRh dGlvbjsgZWl0aGVyCisjIHZlcnNpb24gMi4xIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBv cHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorIworIyBUaGlzIHByb2dyYW0gaXMgZGlzdHJpYnV0 ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyMgYnV0IFdJVEhPVVQgQU5Z IFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyMgTUVSQ0hB TlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBH TlUKKyMgTGVzc2VyIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKyMK KyMgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExlc3NlciBHZW5l cmFsIFB1YmxpYworIyBMaWNlbnNlIGFsb25nIHdpdGggdGhpcyBwcm9ncmFtOyBpZiBub3QsIHdy aXRlIHRvIHRoZQorIyBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGlu IFN0LCBGaWZ0aCBGbG9vciwKKyMgQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisKK2ltcG9y dCBvcworaW1wb3J0IHNobGV4CitpbXBvcnQgc3lzCitpbXBvcnQgdGVtcGZpbGUKKworc2NyaXB0 ZGlyID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXykpCisKK2RlZiBt YWluKGFyZ3M6IGxpc3QpIC0+IGludDoKKyAgICB0bXBkaXIgPSB0ZW1wZmlsZS5nZXR0ZW1wZGly KCkKKyAgICBzb3VyY2Vfcm9vdCA9IG9zLnBhdGgubm9ybXBhdGgob3MucGF0aC5hYnNwYXRoKG9z LnBhdGguam9pbihzY3JpcHRkaXIsICcuLi8uLi8nKSkpCisgICAgYmluZF9tb3VudHMgPSB7Cisg ICAgICAgICIvYXBwL3dlYmtpdCI6ICBzb3VyY2Vfcm9vdCwKKyAgICAgICAgIyBBY2Nlc3MgdG8g L3J1bi9ob3N0IGlzIHJlcXVpcmVkIGJ5IHRoZSBjcmFzaCBsb2cgcmVwb3J0ZXIuCisgICAgICAg IGYiL3J1bi9ob3N0e3RtcGRpcn0iOiBmInt0bXBkaXJ9IgorICAgIH0KKworICAgIHRyeV9iaW5k X21vdW50cyA9IHsKKyAgICAgICAgIi9ydW4vaWNlY2MiOiAiL3Zhci9ydW4vaWNlY2MiCisgICAg fQorCisgICAgYnVpbGRfcGF0aCA9IG9zLmVudmlyb24uZ2V0KCJXRUJLSVRfQlVJTERfRElSX0JJ TkRfTU9VTlQiKQorICAgIGlmIGJ1aWxkX3BhdGg6CisgICAgICAgIGRlc3QsIHNyYyA9IGJ1aWxk X3BhdGguc3BsaXQoIjoiKQorICAgICAgICB0cnlfYmluZF9tb3VudHNbZGVzdF0gPSBzcmMKKwor ICAgIGNvcmVkdW1wc19kaXIgPSBvcy5lbnZpcm9uLmdldCgiV0VCS0lUX0NPUkVfRFVNUFNfRElS RUNUT1JZIikKKyAgICBpZiBjb3JlZHVtcHNfZGlyOgorICAgICAgICB0cnlfYmluZF9tb3VudHNb Y29yZWR1bXBzX2Rpcl0gPSBjb3JlZHVtcHNfZGlyCisKKyAgICBid3JhcF9hcmdzID0gWyJid3Jh cCIsIF0KKyAgICBmb3IgZHN0LCBzcmMgaW4gYmluZF9tb3VudHMuaXRlbXMoKToKKyAgICAgICAg YndyYXBfYXJncy5leHRlbmQoWyItLWJpbmQiLCBzcmMsIGRzdF0pCisKKyAgICBmb3IgZHN0LCBz cmMgaW4gdHJ5X2JpbmRfbW91bnRzLml0ZW1zKCk6CisgICAgICAgIGJ3cmFwX2FyZ3MuZXh0ZW5k KFsiLS1iaW5kLXRyeSIsIHNyYywgZHN0XSkKKworICAgIHJldHVybiBvcy5zeXN0ZW0oJyAnLmpv aW4oW3NobGV4LnF1b3RlKGEpIGZvciBhIGluIGJ3cmFwX2FyZ3MgKyBhcmdzXSkpCisKK2lmIF9f bmFtZV9fID09ICJfX21haW5fXyI6CisgICAgc3lzLmV4aXQobWFpbihzeXMuYXJndlsxOl0pKQo=