240256 2022-05-09 13:24:42 -0700 [webkit-patch] Include commit messages in patches 2022-11-24 04:31:55 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=240386 https://bugs.webkit.org/show_bug.cgi?id=240402 https://bugs.webkit.org/show_bug.cgi?id=239413 https://bugs.webkit.org/show_bug.cgi?id=240461 https://bugs.webkit.org/show_bug.cgi?id=248304 InRadar P2 Normal --- 240678 1 jbedard jbedard aakash_jain ap ews-watchlist glenn kkinnunen webkit-bug-importer zsun oldest_to_newest 1867759 0 jbedard 2022-05-09 13:24:42 -0700 We should be able to upload and apply patches which contain commit messages. 1867760 1 webkit-bug-importer 2022-05-09 13:24:53 -0700 <rdar://problem/92982358> 1867761 2 459077 jbedard 2022-05-09 13:28:20 -0700 Created attachment 459077 Patch 1868812 3 459313 jbedard 2022-05-13 11:25:53 -0700 Created attachment 459313 Patch 1868833 4 459318 jbedard 2022-05-13 13:02:04 -0700 Created attachment 459318 Patch 1868834 5 459318 ap 2022-05-13 13:05:08 -0700 Comment on attachment 459318 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=459318&action=review > COMMIT_MESSAGE:1 > +[webkit-patch] Include commit messages in patches Woot! 1868838 6 jbedard 2022-05-13 13:07:14 -0700 Pull request: https://github.com/WebKit/WebKit/pull/616 1868916 7 ews-feeder 2022-05-13 16:38:50 -0700 Committed r294183 (250550@main): <https://commits.webkit.org/250550@main> Reviewed commits have been landed. Closing PR #616 and removing active labels. 1868976 8 kkinnunen 2022-05-14 04:43:03 -0700 possibly broke webkit-patch upload: kkinnunen@mpb4 OpenSource % Tools/Scripts/webkit-patch upload -g HEAD~ Traceback (most recent call last): File "Tools/Scripts/check-webkit-style", line 46, in <module> sys.exit(CheckWebKitStyle().main()) File "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/style/main.py", line 157, in main patch = host.scm().create_patch(options.git_commit, changed_files=changed_files, git_index=options.git_index) File "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 378, in create_patch return self.run(command, decode_output=False, cwd=self.checkout_root) File "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 73, in run return self._executive.run_command(args, File "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/system/executive.py", line 445, in run_command (error_handler or self.default_error_handler)(script_error) File "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/system/abstractexecutive.py", line 98, in default_error_handler raise error webkitpy.common.system.executive.ScriptError: Failed to run "['git', 'format-patch', '--stdout', '--binary', '-O', '/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/config/orderfile', 'HEAD...HEAD~^..HEAD~']" exit_code: 128 cwd: /Users/kkinnunen/WebKit/OpenSource Are you sure you want to continue? [Y/n]: n 1868993 9 jbedard 2022-05-14 06:52:53 -0700 Re-opening for pull request https://github.com/WebKit/WebKit/pull/625 1868995 10 jbedard 2022-05-14 06:54:03 -0700 (In reply to Kimmo Kinnunen from comment #8) > possibly broke webkit-patch upload: > > kkinnunen@mpb4 OpenSource % Tools/Scripts/webkit-patch upload -g HEAD~ > Traceback (most recent call last): > File "Tools/Scripts/check-webkit-style", line 46, in <module> > sys.exit(CheckWebKitStyle().main()) > File > "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/style/main.py", > line 157, in main > patch = host.scm().create_patch(options.git_commit, > changed_files=changed_files, git_index=options.git_index) > File > "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/checkout/ > scm/git.py", line 378, in create_patch > return self.run(command, decode_output=False, cwd=self.checkout_root) > File > "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/checkout/ > scm/scm.py", line 73, in run > return self._executive.run_command(args, > File > "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/system/ > executive.py", line 445, in run_command > (error_handler or self.default_error_handler)(script_error) > File > "/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/system/ > abstractexecutive.py", line 98, in default_error_handler > raise error > webkitpy.common.system.executive.ScriptError: Failed to run "['git', > 'format-patch', '--stdout', '--binary', '-O', > '/Users/kkinnunen/WebKit/OpenSource/Tools/Scripts/webkitpy/common/config/ > orderfile', 'HEAD...HEAD~^..HEAD~']" exit_code: 128 cwd: > /Users/kkinnunen/WebKit/OpenSource > Are you sure you want to continue? [Y/n]: n Thanks for letting me know, sending a fix to merge-queue now. 1869000 11 ews-feeder 2022-05-14 07:41:14 -0700 Committed r294194 (250560@main): <https://commits.webkit.org/250560@main> Reviewed commits have been landed. Closing PR #625 and removing active labels. 1869039 12 jbedard 2022-05-14 16:15:50 -0700 Reopening to attach new patch. 1869040 13 459365 jbedard 2022-05-14 16:15:52 -0700 Created attachment 459365 Patch 1869041 14 459366 jbedard 2022-05-14 16:18:34 -0700 Created attachment 459366 Patch 1869042 15 459367 jbedard 2022-05-14 16:22:18 -0700 Created attachment 459367 Patch 1869044 16 459369 jbedard 2022-05-14 16:37:36 -0700 Created attachment 459369 Patch 1869045 17 459370 jbedard 2022-05-14 16:40:39 -0700 Created attachment 459370 Patch 1869046 18 ews-feeder 2022-05-14 17:46:25 -0700 Committed r294212 (250570@main): <https://commits.webkit.org/250570@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459370. 1869187 19 zsun 2022-05-16 03:49:33 -0700 "Tools/Scripts/webkit-patch upload" used to automatically create ChangeLog files but this doesn't seem to be the case any more. Is this something related to this patch? 1869259 20 jbedard 2022-05-16 09:18:30 -0700 (In reply to zsun from comment #19) > "Tools/Scripts/webkit-patch upload" used to automatically create ChangeLog > files but this doesn't seem to be the case any more. Is this something > related to this patch? Short answer, yes. Longer answer: If you aren't getting prompted to create a ChangeLog, that probably means you have a local commit. If you run webkit-patch without a local commit and just uncommitted changes, you should get the prompt to create changelogs. 1869262 21 zsun 2022-05-16 09:20:21 -0700 (In reply to Jonathan Bedard from comment #20) > (In reply to zsun from comment #19) > > "Tools/Scripts/webkit-patch upload" used to automatically create ChangeLog > > files but this doesn't seem to be the case any more. Is this something > > related to this patch? > > Short answer, yes. > > Longer answer: If you aren't getting prompted to create a ChangeLog, that > probably means you have a local commit. If you run webkit-patch without a > local commit and just uncommitted changes, you should get the prompt to > create changelogs. Thanks! 459077 2022-05-09 13:28:20 -0700 2022-05-13 11:25:52 -0700 Patch bug-240256-20220509132819.patch text/plain 720 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzOTg1CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQppbmRleCA3YzlkMWUyZDhmNjg5NWIxMWRkNWE5 Yzk4NWNhN2M0NWE0ODViYjA4Li42ZjJjNjQzYjJjNmI2Y2VmNWJhYWQ1ZThlNWFlY2I5ZWM4M2Jm MWFkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20vZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9naXQucHkKQEAgLTYyMiw3ICs2MjIsNyBAQCBjbGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5 KToKICAgICAgICAgcmV0dXJuIHNlbGYuX3J1bl9naXQoWydjb21taXQnXSArIG9wdGlvbnMpCiAK ICAgICBkZWYgZm9ybWF0X3BhdGNoKHNlbGYsIG9wdGlvbnMpOgotICAgICAgICByZXR1cm4gc2Vs Zi5fcnVuX2dpdChbJ2Zvcm1hdC1wYXRjaCddICsgb3B0aW9ucykKKyAgICAgICAgcmV0dXJuIHNl bGYuX3J1bl9naXQoWydmb3JtYXQtcGF0Y2gnLCAnLS1hdHRhY2gnXSArIG9wdGlvbnMpCiAKICAg ICBkZWYgcmVxdWVzdF9wdWxsKHNlbGYsIG9wdGlvbnMpOgogICAgICAgICByZXR1cm4gc2VsZi5f cnVuX2dpdChbJ3JlcXVlc3QtcHVsbCddICsgb3B0aW9ucykK 459313 2022-05-13 11:25:53 -0700 2022-05-13 13:02:03 -0700 Patch bug-240256-20220513112552.patch text/plain 5281 jbedard RnJvbSBhZDcxYTg2MzNlYjU1NDEzMjc4MjVhYzNlZmZlYWM5YThjNDViMjRjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgpE YXRlOiBGcmksIDEzIE1heSAyMDIyIDExOjI0OjAzIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW3dl YmtpdC1wYXRjaF0gSW5jbHVkZSBjb21taXQgbWVzc2FnZXMgaW4gcGF0Y2hlcwogaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDI1NiA8cmRhcjovLzkyOTgyMzU4PgoK UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoqIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5OgooQ2hlY2tvdXQuY29tbWl0X21lc3NhZ2VfZm9yX3Ro aXNfY29tbWl0KTogSWYgbm8gY2hhbmdlbG9ncyBhcmUgbW9kaWZpZWQsIHByZWZlcgp0aGUgY29t bWl0IG1lc3NhZ2UuCiogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt L2dpdC5weToKKEdpdC5jcmVhdGVfcGF0Y2gpOiBQcmVmZXIgYGdpdCBmb3JtYXQtcGF0Y2hgIHdo ZW4gbG9jYWwgY29tbWl0cyBhcmUgYXZhaWxhYmxlLgooR2l0LnJldl9wYXJzZSk6IERldGVybWlu ZSBoYXNoIGZvciByZWYuCihHaXQuZm9ybWF0X3BhdGNoKTogRGVsZXRlZC4KKEdpdC5yZXF1ZXN0 X3B1bGwpOiBEZWxldGVkLgotLS0KIC4uLi93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tv dXQucHkgICAgICB8ICA0ICsrKwogLi4uL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0 LnB5ICAgICAgIHwgMzIgKysrKysrKysrLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyMCBp bnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5CmluZGV4IDY2NjcyNzI0OWQ2ZC4uNWMw YTliNDkyNDhkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9jaGVja291dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9jaGVja291dC5weQpAQCAtMzYsNiArMzYsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5j aGVja291dC5jb21taXRpbmZvIGltcG9ydCBDb21taXRJbmZvCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi5jaGVja291dC5zY20gaW1wb3J0IENvbW1pdE1lc3NhZ2UKIGZyb20gd2Via2l0cHkuY29tbW9u Lm1lbW9pemVkIGltcG9ydCBtZW1vaXplZAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4 ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKK2Zyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0 LnNjbSBpbXBvcnQgR2l0CiAKIGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6CiAgICAgZnJv bSBmdW5jdG9vbHMgaW1wb3J0IHJlZHVjZQpAQCAtMTMzLDYgKzEzNCw5IEBAIGNsYXNzIENoZWNr b3V0KG9iamVjdCk6CiAKICAgICBkZWYgY29tbWl0X21lc3NhZ2VfZm9yX3RoaXNfY29tbWl0KHNl bGYsIGdpdF9jb21taXQsIGNoYW5nZWRfZmlsZXM9Tm9uZSwgcmV0dXJuX3N0ZGVycj1GYWxzZSk6 CiAgICAgICAgIGNoYW5nZWxvZ19wYXRocyA9IHNlbGYubW9kaWZpZWRfY2hhbmdlbG9ncyhnaXRf Y29tbWl0LCBjaGFuZ2VkX2ZpbGVzKQorICAgICAgICBpZiBub3QgbGVuKGNoYW5nZWxvZ19wYXRo cykgYW5kIGlzaW5zdGFuY2Uoc2VsZi5fc2NtLCBHaXQpOgorICAgICAgICAgICAgaWYgc2VsZi5f c2NtLm1lcmdlX2Jhc2UoTm9uZSkgIT0gc2VsZi5fc2NtLnJldl9wYXJzZSgnSEVBRCcpOgorICAg ICAgICAgICAgICAgIHJldHVybiBzZWxmLl9zY20uY29tbWl0X21lc3NhZ2VfZm9yX2xvY2FsX2Nv bW1pdChnaXRfY29tbWl0IG9yICdIRUFEJykKICAgICAgICAgaWYgbm90IGxlbihjaGFuZ2Vsb2df cGF0aHMpOgogICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJyb3IobWVzc2FnZT0iRm91bmQgbm8g bW9kaWZpZWQgQ2hhbmdlTG9ncywgY2Fubm90IGNyZWF0ZSBhIGNvbW1pdCBtZXNzYWdlLlxuIgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkFsbCBjaGFuZ2VzIHJlcXVpcmUgYSBDaGFu Z2VMb2cuICBTZWU6XG4gJXMiICUgdXJscy5jb250cmlidXRpb25fZ3VpZGVsaW5lcykKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CmluZGV4 IDdjOWQxZTJkOGY2OC4uOTI5MWI2YTVhNzcxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKQEAgLTEsNSArMSw1IEBACiAjIENvcHly aWdodCAoYykgMjAwOSwgMjAxMCwgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgotIyBDb3B5cmlnaHQgKGMpIDIwMDksIDIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorIyBDb3B5cmlnaHQgKGMpIDIwMDksIDIwMTYsIDIwMjIgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAtMzU2LDIz ICszNTYsMjYgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIElmIGdp dF9pbmRleCBpcyBUcnVlLCBnaXRfY29tbWl0IGlzIGlnbm9yZWQgYmVjYXVzZSBvbmx5IGluZGV4 ZWQgZmlsZXMgYXJlIGhhbmRsZWQuCiAgICAgICAgICIiIgogCisgICAgICAgIGhlYWQgPSBzZWxm LnJldl9wYXJzZSgnSEVBRCcpCisgICAgICAgIG1lcmdlX2Jhc2UgPSBzZWxmLm1lcmdlX2Jhc2Uo Z2l0X2NvbW1pdCkKKyAgICAgICAgaWYgbWVyZ2VfYmFzZSA9PSBoZWFkOgorICAgICAgICAgICAg Y29tbWFuZCA9IFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwgJ2RpZmYnLCAnLS1iaW5hcnknLCAnLS1u by1jb2xvcicsICctLW5vLWV4dC1kaWZmJywgJy0tZnVsbC1pbmRleCcsICctLW5vLXJlbmFtZXMn XQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgY29tbWFuZCA9IFtzZWxmLmV4ZWN1dGFibGVf bmFtZSwgJ2Zvcm1hdC1wYXRjaCcsICctLXN0ZG91dCcsICctLWJpbmFyeSddCisKICAgICAgICAg IyBQdXQgY29kZSBjaGFuZ2VzIGF0IHRoZSB0b3Agb2YgdGhlIHBhdGNoIGFuZCBsYXlvdXQgdGVz dHMKICAgICAgICAgIyBhdCB0aGUgYm90dG9tLCB0aGlzIG1ha2VzIGZvciBlYXNpZXIgcmV2aWV3 aW5nLgogICAgICAgICBjb25maWdfcGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0uZGlybmFtZShzZWxm Ll9maWxlc3lzdGVtLnBhdGhfdG9fbW9kdWxlKCd3ZWJraXRweS5jb21tb24uY29uZmlnJykpCiAg ICAgICAgIG9yZGVyX2ZpbGUgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oY29uZmlnX3BhdGgsICdv cmRlcmZpbGUnKQotICAgICAgICBvcmRlciA9ICcnCiAgICAgICAgIGlmIHNlbGYuX2ZpbGVzeXN0 ZW0uZXhpc3RzKG9yZGVyX2ZpbGUpOgotICAgICAgICAgICAgb3JkZXIgPSAnLU8nICsgb3JkZXJf ZmlsZQorICAgICAgICAgICAgY29tbWFuZCArPSBbJy1PJywgb3JkZXJfZmlsZV0KIAotICAgICAg ICBjb21tYW5kID0gW3NlbGYuZXhlY3V0YWJsZV9uYW1lLCAnZGlmZicsICctLWJpbmFyeScsICct LW5vLWNvbG9yJywgJy0tbm8tZXh0LWRpZmYnLCAnLS1mdWxsLWluZGV4JywgJy0tbm8tcmVuYW1l cycsIG9yZGVyXQogICAgICAgICBpZiBnaXRfaW5kZXg6CiAgICAgICAgICAgICBjb21tYW5kICs9 IFsnLS1jYWNoZWQnXQotICAgICAgICBlbHNlOgotICAgICAgICAgICAgY29tbWFuZCArPSBbc2Vs Zi5tZXJnZV9iYXNlKGdpdF9jb21taXQpXQotICAgICAgICBjb21tYW5kICs9IFsnLS0nXQotICAg ICAgICBpZiBjaGFuZ2VkX2ZpbGVzOgotICAgICAgICAgICAgY29tbWFuZCArPSBjaGFuZ2VkX2Zp bGVzCi0gICAgICAgIHJldHVybiBzZWxmLnByZXBlbmRfc3ZuX3JldmlzaW9uKHNlbGYucnVuKGNv bW1hbmQsIGRlY29kZV9vdXRwdXQ9RmFsc2UsIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpKQorICAg ICAgICBlbGlmIG1lcmdlX2Jhc2UgIT0gaGVhZDoKKyAgICAgICAgICAgIGNvbW1hbmQgKz0gWydI RUFELi4ue30nLmZvcm1hdChtZXJnZV9iYXNlKV0KKworICAgICAgICByZXR1cm4gc2VsZi5ydW4o Y29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkKIAog ICAgIGRlZiBfcnVuX2dpdF9zdm5fZmluZF9yZXYoc2VsZiwgcmV2aXNpb25fb3JfdHJlZWlzaCwg YnJhbmNoPU5vbmUpOgogICAgICAgICAjIGdpdCBzdm4gZmluZC1yZXYgcmVxdWlyZXMgU1ZOIHJl dmlzaW9ucyB0byBiZWdpbiB3aXRoIHRoZSBjaGFyYWN0ZXIgJ3InLgpAQCAtNjIxLDEyICs2MjQs NiBAQCBjbGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICBkZWYgY29tbWl0KHNlbGYs IG9wdGlvbnMpOgogICAgICAgICByZXR1cm4gc2VsZi5fcnVuX2dpdChbJ2NvbW1pdCddICsgb3B0 aW9ucykKIAotICAgIGRlZiBmb3JtYXRfcGF0Y2goc2VsZiwgb3B0aW9ucyk6Ci0gICAgICAgIHJl dHVybiBzZWxmLl9ydW5fZ2l0KFsnZm9ybWF0LXBhdGNoJ10gKyBvcHRpb25zKQotCi0gICAgZGVm IHJlcXVlc3RfcHVsbChzZWxmLCBvcHRpb25zKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX3J1bl9n aXQoWydyZXF1ZXN0LXB1bGwnXSArIG9wdGlvbnMpCi0KICAgICBkZWYgcmVtb3RlKHNlbGYsIG9w dGlvbnMpOgogICAgICAgICByZXR1cm4gc2VsZi5fcnVuX2dpdChbJ3JlbW90ZSddICsgb3B0aW9u cykKIApAQCAtNjQ3LDMgKzY0NCw2IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgog ICAgICAgICBpZiBxdWlldDoKICAgICAgICAgICAgIGNvbW1hbmQgKz0gWyctcSddCiAgICAgICAg IHJldHVybiBzZWxmLl9ydW5fZ2l0KGNvbW1hbmQpCisKKyAgICBkZWYgcmV2X3BhcnNlKHNlbGYs IHJldik6CisgICAgICAgIHJldHVybiBzZWxmLl9ydW5fZ2l0KFsncmV2LXBhcnNlJywgcmV2XSku cnN0cmlwKCkKLS0gCjIuMzIuMCAoQXBwbGUgR2l0LTEzMikKCg== 459318 2022-05-13 13:02:04 -0700 2022-05-14 16:15:48 -0700 Patch bug-240256-20220513130204.patch text/plain 10500 jbedard RnJvbSBiNDhjYTIzNDljNDEzOTViZTJhNjg4ZjkxOWE5NzM1YTQxNGZhMDUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgpE YXRlOiBGcmksIDEzIE1heSAyMDIyIDEyOjU5OjQxIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW3dl YmtpdC1wYXRjaF0gSW5jbHVkZSBjb21taXQgbWVzc2FnZXMgaW4gcGF0Y2hlcwogaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDI1NiA8cmRhcjovLzkyOTgyMzU4PgoK UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoqIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5OgooQ2hlY2tvdXQuY29tbWl0X21lc3NhZ2VfZm9yX3Ro aXNfY29tbWl0KTogSWYgbm8gY2hhbmdlbG9ncyBhcmUgbW9kaWZpZWQsIHByZWZlcgp0aGUgY29t bWl0IG1lc3NhZ2UuCiogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvZGlm Zl9wYXJzZXIucHk6CihEaWZmUGFyc2VyLl9wYXJzZV9pbnRvX2RpZmZfZmlsZXMpOiBJZ25vcmUg Y29tbWl0IG1lc3NhZ2UgaGVhZGVycy4KKiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vZ2l0LnB5OgooR2l0LmNyZWF0ZV9wYXRjaCk6IFByZWZlciBgZ2l0IGZvcm1h dC1wYXRjaGAgd2hlbiBsb2NhbCBjb21taXRzIGFyZSBhdmFpbGFibGUuCihHaXQucmV2X3BhcnNl KTogRGV0ZXJtaW5lIGhhc2ggZm9yIHJlZi4KKEdpdC5mb3JtYXRfcGF0Y2gpOiBEZWxldGVkLgoo R2l0LnJlcXVlc3RfcHVsbCk6IERlbGV0ZWQuCiogVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L3N0ZXBzL2Fic3RyYWN0c3RlcC5weToKKEFic3RyYWN0U3RlcCk6IEtlZXAgcmVjb3JkIG9mIGxv Y2FsIGNvbW1pdC4KKiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvZWRpdGNoYW5n ZWxvZy5weToKKEVkaXRDaGFuZ2VMb2cucnVuKTogRG8gbm90IGVkaXQgY2hhbmdlbG9nIGlmIG5v IGNoYW5nZWxvZyBpcyBwcmVzZW50LgoqIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVw cy9wcmVwYXJlY2hhbmdlbG9nLnB5OgooUHJlcGFyZUNoYW5nZUxvZy5ydW4pOiBEbyBub3QgcHJl cGFyZSBjaGFuZ2Vsb2cgaWYgbG9jYWwgY29tbWl0IGlzIHByZXNlbnQuCi0tLQogLi4uL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dC5weSAgICAgIHwgIDUgKysrCiAuLi4vd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyLnB5ICAgfCAgNSArKy0KIC4uLi93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weSAgICAgICB8IDMyICsrKysrKysrKy0tLS0tLS0t LS0KIC4uLi93ZWJraXRweS90b29sL3N0ZXBzL2Fic3RyYWN0c3RlcC5weSAgICAgICB8ICAyICsr CiAuLi4vd2Via2l0cHkvdG9vbC9zdGVwcy9lZGl0Y2hhbmdlbG9nLnB5ICAgICAgfCAgNiArKy0t CiAuLi4vd2Via2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nLnB5ICAgfCAgNCArKy0K IDYgZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tvdXQu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dC5weQpp bmRleCA2NjY3MjcyNDlkNmQuLjExYzVmY2I2Y2I0NiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tvdXQucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tvdXQucHkKQEAgLTEsNCArMSw1IEBACiAj IENvcHlyaWdodCAoYykgMjAxMCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBD b3B5cmlnaHQgKGMpIDIwMjIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAtMzYsNiArMzcsNyBAQCBmcm9tIHdlYmtpdHB5 LmNvbW1vbi5jaGVja291dC5jb21taXRpbmZvIGltcG9ydCBDb21taXRJbmZvCiBmcm9tIHdlYmtp dHB5LmNvbW1vbi5jaGVja291dC5zY20gaW1wb3J0IENvbW1pdE1lc3NhZ2UKIGZyb20gd2Via2l0 cHkuY29tbW9uLm1lbW9pemVkIGltcG9ydCBtZW1vaXplZAogZnJvbSB3ZWJraXRweS5jb21tb24u c3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKK2Zyb20gd2Via2l0cHkuY29tbW9u LmNoZWNrb3V0LnNjbSBpbXBvcnQgR2l0CiAKIGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6 CiAgICAgZnJvbSBmdW5jdG9vbHMgaW1wb3J0IHJlZHVjZQpAQCAtMTMzLDYgKzEzNSw5IEBAIGNs YXNzIENoZWNrb3V0KG9iamVjdCk6CiAKICAgICBkZWYgY29tbWl0X21lc3NhZ2VfZm9yX3RoaXNf Y29tbWl0KHNlbGYsIGdpdF9jb21taXQsIGNoYW5nZWRfZmlsZXM9Tm9uZSwgcmV0dXJuX3N0ZGVy cj1GYWxzZSk6CiAgICAgICAgIGNoYW5nZWxvZ19wYXRocyA9IHNlbGYubW9kaWZpZWRfY2hhbmdl bG9ncyhnaXRfY29tbWl0LCBjaGFuZ2VkX2ZpbGVzKQorICAgICAgICBpZiBub3QgbGVuKGNoYW5n ZWxvZ19wYXRocykgYW5kIGlzaW5zdGFuY2Uoc2VsZi5fc2NtLCBHaXQpOgorICAgICAgICAgICAg aWYgc2VsZi5fc2NtLm1lcmdlX2Jhc2UoTm9uZSkgIT0gc2VsZi5fc2NtLnJldl9wYXJzZSgnSEVB RCcpOgorICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLl9zY20uY29tbWl0X21lc3NhZ2VfZm9y X2xvY2FsX2NvbW1pdChnaXRfY29tbWl0IG9yICdIRUFEJykKICAgICAgICAgaWYgbm90IGxlbihj aGFuZ2Vsb2dfcGF0aHMpOgogICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJyb3IobWVzc2FnZT0i Rm91bmQgbm8gbW9kaWZpZWQgQ2hhbmdlTG9ncywgY2Fubm90IGNyZWF0ZSBhIGNvbW1pdCBtZXNz YWdlLlxuIgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkFsbCBjaGFuZ2VzIHJlcXVp cmUgYSBDaGFuZ2VMb2cuICBTZWU6XG4gJXMiICUgdXJscy5jb250cmlidXRpb25fZ3VpZGVsaW5l cykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2Rp ZmZfcGFyc2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvZGlm Zl9wYXJzZXIucHkKaW5kZXggOTg1ODdjYTM5YTFiLi5jMTY0NWVhYzNkZjEgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyLnB5 CkBAIC0xLDQgKzEsNSBAQAogIyBDb3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChjKSAyMDIyIEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTEzOSw2ICsx NDAsOCBAQCBjbGFzcyBEaWZmUGFyc2VyKG9iamVjdCk6CiAgICAgYSBEaWZmRmlsZSBvYmplY3Qu CiAgICAgIiIiCiAKKyAgICBWRVJTSU9OX1JFID0gcmUuY29tcGlsZShyJ15cZCsuXGQrLlxkKyBc KFxTKyBHaXQtXGQrXCkkJykKKwogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBkaWZmX2lucHV0KToK ICAgICAgICAgIiIiUGFyc2VzIGEgZGlmZi4KIApAQCAtMTg4LDcgKzE5MSw3IEBAIGNsYXNzIERp ZmZQYXJzZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgY3VycmVudF9maWxlLmFkZF91 bmNoYW5nZWRfbGluZShvbGRfZGlmZl9saW5lLCBuZXdfZGlmZl9saW5lLCBsaW5lWzE6XSkKICAg ICAgICAgICAgICAgICAgICAgb2xkX2RpZmZfbGluZSArPSAxCiAgICAgICAgICAgICAgICAgICAg IG5ld19kaWZmX2xpbmUgKz0gMQotICAgICAgICAgICAgICAgIGVsaWYgbGluZSA9PSAnXFwgTm8g bmV3bGluZSBhdCBlbmQgb2YgZmlsZSc6CisgICAgICAgICAgICAgICAgZWxpZiBsaW5lID09ICdc XCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlJyBvciBub3QgbGluZSBvciBzZWxmLlZFUlNJT05f UkUubWF0Y2gobGluZSk6CiAgICAgICAgICAgICAgICAgICAgICMgTm90aGluZyB0byBkby4gIFdl IG1heSBzdGlsbCBoYXZlIHNvbWUgYWRkZWQgbGluZXMuCiAgICAgICAgICAgICAgICAgICAgIHBh c3MKICAgICAgICAgICAgICAgICBlbHNlOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKaW5kZXggN2M5ZDFlMmQ4ZjY4Li45MjkxYjZhNWE3 NzEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt L2dpdC5weQpAQCAtMSw1ICsxLDUgQEAKICMgQ29weXJpZ2h0IChjKSAyMDA5LCAyMDEwLCAyMDEx IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0jIENvcHlyaWdodCAoYykgMjAwOSwg MjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoYykgMjAw OSwgMjAxNiwgMjAyMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC0zNTYsMjMgKzM1NiwyNiBAQCBjbGFzcyBHaXQoU0NN LCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgSWYgZ2l0X2luZGV4IGlzIFRydWUsIGdpdF9jb21t aXQgaXMgaWdub3JlZCBiZWNhdXNlIG9ubHkgaW5kZXhlZCBmaWxlcyBhcmUgaGFuZGxlZC4KICAg ICAgICAgIiIiCiAKKyAgICAgICAgaGVhZCA9IHNlbGYucmV2X3BhcnNlKCdIRUFEJykKKyAgICAg ICAgbWVyZ2VfYmFzZSA9IHNlbGYubWVyZ2VfYmFzZShnaXRfY29tbWl0KQorICAgICAgICBpZiBt ZXJnZV9iYXNlID09IGhlYWQ6CisgICAgICAgICAgICBjb21tYW5kID0gW3NlbGYuZXhlY3V0YWJs ZV9uYW1lLCAnZGlmZicsICctLWJpbmFyeScsICctLW5vLWNvbG9yJywgJy0tbm8tZXh0LWRpZmYn LCAnLS1mdWxsLWluZGV4JywgJy0tbm8tcmVuYW1lcyddCisgICAgICAgIGVsc2U6CisgICAgICAg ICAgICBjb21tYW5kID0gW3NlbGYuZXhlY3V0YWJsZV9uYW1lLCAnZm9ybWF0LXBhdGNoJywgJy0t c3Rkb3V0JywgJy0tYmluYXJ5J10KKwogICAgICAgICAjIFB1dCBjb2RlIGNoYW5nZXMgYXQgdGhl IHRvcCBvZiB0aGUgcGF0Y2ggYW5kIGxheW91dCB0ZXN0cwogICAgICAgICAjIGF0IHRoZSBib3R0 b20sIHRoaXMgbWFrZXMgZm9yIGVhc2llciByZXZpZXdpbmcuCiAgICAgICAgIGNvbmZpZ19wYXRo ID0gc2VsZi5fZmlsZXN5c3RlbS5kaXJuYW1lKHNlbGYuX2ZpbGVzeXN0ZW0ucGF0aF90b19tb2R1 bGUoJ3dlYmtpdHB5LmNvbW1vbi5jb25maWcnKSkKICAgICAgICAgb3JkZXJfZmlsZSA9IHNlbGYu X2ZpbGVzeXN0ZW0uam9pbihjb25maWdfcGF0aCwgJ29yZGVyZmlsZScpCi0gICAgICAgIG9yZGVy ID0gJycKICAgICAgICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMob3JkZXJfZmlsZSk6Ci0g ICAgICAgICAgICBvcmRlciA9ICctTycgKyBvcmRlcl9maWxlCisgICAgICAgICAgICBjb21tYW5k ICs9IFsnLU8nLCBvcmRlcl9maWxlXQogCi0gICAgICAgIGNvbW1hbmQgPSBbc2VsZi5leGVjdXRh YmxlX25hbWUsICdkaWZmJywgJy0tYmluYXJ5JywgJy0tbm8tY29sb3InLCAnLS1uby1leHQtZGlm ZicsICctLWZ1bGwtaW5kZXgnLCAnLS1uby1yZW5hbWVzJywgb3JkZXJdCiAgICAgICAgIGlmIGdp dF9pbmRleDoKICAgICAgICAgICAgIGNvbW1hbmQgKz0gWyctLWNhY2hlZCddCi0gICAgICAgIGVs c2U6Ci0gICAgICAgICAgICBjb21tYW5kICs9IFtzZWxmLm1lcmdlX2Jhc2UoZ2l0X2NvbW1pdCld Ci0gICAgICAgIGNvbW1hbmQgKz0gWyctLSddCi0gICAgICAgIGlmIGNoYW5nZWRfZmlsZXM6Ci0g ICAgICAgICAgICBjb21tYW5kICs9IGNoYW5nZWRfZmlsZXMKLSAgICAgICAgcmV0dXJuIHNlbGYu cHJlcGVuZF9zdm5fcmV2aXNpb24oc2VsZi5ydW4oY29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxz ZSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkpCisgICAgICAgIGVsaWYgbWVyZ2VfYmFzZSAhPSBo ZWFkOgorICAgICAgICAgICAgY29tbWFuZCArPSBbJ0hFQUQuLi57fScuZm9ybWF0KG1lcmdlX2Jh c2UpXQorCisgICAgICAgIHJldHVybiBzZWxmLnJ1bihjb21tYW5kLCBkZWNvZGVfb3V0cHV0PUZh bHNlLCBjd2Q9c2VsZi5jaGVja291dF9yb290KQogCiAgICAgZGVmIF9ydW5fZ2l0X3N2bl9maW5k X3JldihzZWxmLCByZXZpc2lvbl9vcl90cmVlaXNoLCBicmFuY2g9Tm9uZSk6CiAgICAgICAgICMg Z2l0IHN2biBmaW5kLXJldiByZXF1aXJlcyBTVk4gcmV2aXNpb25zIHRvIGJlZ2luIHdpdGggdGhl IGNoYXJhY3RlciAncicuCkBAIC02MjEsMTIgKzYyNCw2IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJl cG9zaXRvcnkpOgogICAgIGRlZiBjb21taXQoc2VsZiwgb3B0aW9ucyk6CiAgICAgICAgIHJldHVy biBzZWxmLl9ydW5fZ2l0KFsnY29tbWl0J10gKyBvcHRpb25zKQogCi0gICAgZGVmIGZvcm1hdF9w YXRjaChzZWxmLCBvcHRpb25zKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX3J1bl9naXQoWydmb3Jt YXQtcGF0Y2gnXSArIG9wdGlvbnMpCi0KLSAgICBkZWYgcmVxdWVzdF9wdWxsKHNlbGYsIG9wdGlv bnMpOgotICAgICAgICByZXR1cm4gc2VsZi5fcnVuX2dpdChbJ3JlcXVlc3QtcHVsbCddICsgb3B0 aW9ucykKLQogICAgIGRlZiByZW1vdGUoc2VsZiwgb3B0aW9ucyk6CiAgICAgICAgIHJldHVybiBz ZWxmLl9ydW5fZ2l0KFsncmVtb3RlJ10gKyBvcHRpb25zKQogCkBAIC02NDcsMyArNjQ0LDYgQEAg Y2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIGlmIHF1aWV0OgogICAgICAg ICAgICAgY29tbWFuZCArPSBbJy1xJ10KICAgICAgICAgcmV0dXJuIHNlbGYuX3J1bl9naXQoY29t bWFuZCkKKworICAgIGRlZiByZXZfcGFyc2Uoc2VsZiwgcmV2KToKKyAgICAgICAgcmV0dXJuIHNl bGYuX3J1bl9naXQoWydyZXYtcGFyc2UnLCByZXZdKS5yc3RyaXAoKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Fic3RyYWN0c3RlcC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9hYnN0cmFjdHN0ZXAucHkKaW5kZXggYjY4NjU2ODU1 YWQwLi4zNzM1NTk5NDg0ZDkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9zdGVwcy9hYnN0cmFjdHN0ZXAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L3N0ZXBzL2Fic3RyYWN0c3RlcC5weQpAQCAtMjgsNiArMjgsNyBAQAogCiBpbXBvcnQgc3lzCiAK K2Zyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LnNjbSBpbXBvcnQgR2l0CiBmcm9tIHdlYmtp dHB5LnRvb2wuc3RlcHMub3B0aW9ucyBpbXBvcnQgT3B0aW9ucwogCiAKQEAgLTUxLDYgKzUyLDcg QEAgY2xhc3MgQWJzdHJhY3RTdGVwKG9iamVjdCk6CiAgICAgICAgICJkaWZmIjogbGFtYmRhIHNl bGYsIHN0YXRlOiBzZWxmLl90b29sLnNjbSgpLmNyZWF0ZV9wYXRjaChzZWxmLl9vcHRpb25zLmdp dF9jb21taXQsIGNoYW5nZWRfZmlsZXM9c2VsZi5fY2hhbmdlZF9maWxlcyhzdGF0ZSkpLAogICAg ICAgICAjIEFic29sdXRlIHBhdGggdG8gQ2hhbmdlTG9nIGZpbGVzLgogICAgICAgICAiY2hhbmdl bG9ncyI6IGxhbWJkYSBzZWxmLCBzdGF0ZTogc2VsZi5fdG9vbC5jaGVja291dCgpLm1vZGlmaWVk X2NoYW5nZWxvZ3Moc2VsZi5fb3B0aW9ucy5naXRfY29tbWl0LCBjaGFuZ2VkX2ZpbGVzPXNlbGYu X2NoYW5nZWRfZmlsZXMoc3RhdGUpKSwKKyAgICAgICAgImhhc19sb2NhbF9jb21taXQiOiBsYW1i ZGEgc2VsZiwgc3RhdGU6IHNlbGYuX3Rvb2wuc2NtKCkubWVyZ2VfYmFzZShOb25lKSAhPSBzZWxm Ll90b29sLnNjbSgpLnJldl9wYXJzZSgnSEVBRCcpIGlmIGlzaW5zdGFuY2Uoc2VsZi5fdG9vbC5z Y20oKSwgR2l0KSBlbHNlIEZhbHNlCiAgICAgfQogCiAgICAgZGVmIGNhY2hlZF9sb29rdXAoc2Vs Ziwgc3RhdGUsIGtleSwgcHJvbWlzZT1Ob25lKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9zdGVwcy9lZGl0Y2hhbmdlbG9nLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS90b29sL3N0ZXBzL2VkaXRjaGFuZ2Vsb2cucHkKaW5kZXggZGE1YTgxZWU0NjY0Li4zNWIy NGNkNTQ1NDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9l ZGl0Y2hhbmdlbG9nLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9l ZGl0Y2hhbmdlbG9nLnB5CkBAIC0xLDQgKzEsNSBAQAogIyBDb3B5cmlnaHQgKEMpIDIwMTAgR29v Z2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDIyIEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBh cmUKQEAgLTMyLDUgKzMzLDYgQEAgZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLmFic3RyYWN0c3Rl cCBpbXBvcnQgQWJzdHJhY3RTdGVwCiBjbGFzcyBFZGl0Q2hhbmdlTG9nKEFic3RyYWN0U3RlcCk6 CiAgICAgZGVmIHJ1bihzZWxmLCBzdGF0ZSk6CiAgICAgICAgIGFic29sdXRlX3BhdGhzID0gbGlz dChtYXAoc2VsZi5fdG9vbC5zY20oKS5hYnNvbHV0ZV9wYXRoLCBzZWxmLmNhY2hlZF9sb29rdXAo c3RhdGUsICJjaGFuZ2Vsb2dzIikpKQotICAgICAgICBzZWxmLl90b29sLnVzZXIuZWRpdF9jaGFu Z2Vsb2coYWJzb2x1dGVfcGF0aHMpCi0gICAgICAgIHNlbGYuZGlkX21vZGlmeV9jaGVja291dChz dGF0ZSkKKyAgICAgICAgaWYgYWJzb2x1dGVfcGF0aHM6CisgICAgICAgICAgICBzZWxmLl90b29s LnVzZXIuZWRpdF9jaGFuZ2Vsb2coYWJzb2x1dGVfcGF0aHMpCisgICAgICAgICAgICBzZWxmLmRp ZF9tb2RpZnlfY2hlY2tvdXQoc3RhdGUpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvc3RlcHMvcHJlcGFyZWNoYW5nZWxvZy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nLnB5CmluZGV4IDEzYzBmOTVhNzUwOC4uZGQ5 MjU4NjVhYjFlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMv cHJlcGFyZWNoYW5nZWxvZy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3Rl cHMvcHJlcGFyZWNoYW5nZWxvZy5weQpAQCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAy MDIwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDIw LTIwMjIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIyBDb3B5cmlnaHQgKEMpIDIw MTAgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0x MDYsNiArMTA2LDggQEAgY2xhc3MgUHJlcGFyZUNoYW5nZUxvZyhBYnN0cmFjdFN0ZXApOgogICAg ICAgICByZXR1cm4gZmluYWxfZW50cnkgKyAiXG4iCiAKICAgICBkZWYgcnVuKHNlbGYsIHN0YXRl KToKKyAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMudXBkYXRlX2NoYW5nZWxvZ3MgYW5kIHNl bGYuY2FjaGVkX2xvb2t1cChzdGF0ZSwgImhhc19sb2NhbF9jb21taXQiKToKKyAgICAgICAgICAg IHJldHVybgogICAgICAgICBpZiBzZWxmLmNhY2hlZF9sb29rdXAoc3RhdGUsICJjaGFuZ2Vsb2dz Iik6CiAgICAgICAgICAgICBzZWxmLl9lbnN1cmVfYnVnX3VybChzdGF0ZSkKICAgICAgICAgICAg IGlmIG5vdCBzZWxmLl9vcHRpb25zLnVwZGF0ZV9jaGFuZ2Vsb2dzOgotLSAKMi4zMi4wIChBcHBs ZSBHaXQtMTMyKQoK 459365 2022-05-14 16:15:52 -0700 2022-05-14 16:18:32 -0700 Patch bug-240256-20220514161551.patch text/plain 1862 jbedard RnJvbSA2MDkyODMwNGU2OTEwNDdmMjc5YjM1ZDgwOTJmMGEwNTIyYTlmZGU2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgpE YXRlOiBTYXQsIDE0IE1heSAyMDIyIDE2OjE0OjI5IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW3dl YmtpdC1wYXRjaF0gSW5jbHVkZSBjb21taXQgbWVzc2FnZXMgaW4gcGF0Y2hlcyAoRm9sbG93LXVw KQogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDI1NiA8cmRhcjov L3Byb2JsZW0vOTI5ODIzNTg+CgpVbnJldmlld2VkIGZvbGxvdy11cCBmaXguCgoqIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHk6CihHaXQuY3JlYXRlX3Bh dGNoKToKKiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2V4cG9ydGVyLnB5OgooV2Vi UGxhdGZvcm1UZXN0RXhwb3J0ZXIuX3N0cmlwX2lnbm9yZWRfZmlsZXNfZnJvbV9kaWZmKToKLS0t CiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IHwgMiAr KwogVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weSAgICAgICB8IDEg KwogMiBmaWxlcyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQppbmRleCA5NDQ3MTI2YzZmOTYu LjJjNTM0ZjMxMWJmOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y2hlY2tvdXQvc2NtL2dpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vZ2l0LnB5CkBAIC0zNzYsNiArMzc2LDggQEAgY2xhc3MgR2l0KFNDTSwgU1ZO UmVwb3NpdG9yeSk6CiAgICAgICAgICAgICBjb21tYW5kICs9IFttZXJnZV9iYXNlXQogICAgICAg ICBlbGlmIG1lcmdlX2Jhc2UgIT0gaGVhZDoKICAgICAgICAgICAgIGNvbW1hbmQgKz0gWydIRUFE Li4ue30nLmZvcm1hdChtZXJnZV9iYXNlKV0KKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIGNv bW1hbmQgKz0gWydIRUFEJ10KIAogICAgICAgICByZXR1cm4gc2VsZi5ydW4oY29tbWFuZCwgZGVj b2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkKIApkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdzNjL3Rlc3RfZXhwb3J0ZXIucHkKaW5kZXggNTEwMzBkYjkxY2U5Li5lODg2 NTRhOTRkYWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZXhw b3J0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5w eQpAQCAtMTc0LDYgKzE3NCw3IEBAIGNsYXNzIFdlYlBsYXRmb3JtVGVzdEV4cG9ydGVyKG9iamVj dCk6CiAgICAgICAgICAgICBpZiBsaW5lLnN0YXJ0c3dpdGgoYidkaWZmJyk6CiAgICAgICAgICAg ICAgICAgaW5jbHVkZV9maWxlID0gVHJ1ZQogICAgICAgICAgICAgICAgIGZpbGVuYW1lID0gc2Vs Zi5fZmluZF9maWxlbmFtZShsaW5lKQorICAgICAgICAgICAgICAgIHByaW50KGZpbGVuYW1lKQog ICAgICAgICAgICAgICAgIGlmIHNlbGYuX2lzX2lnbm9yZWRfZmlsZShmaWxlbmFtZSk6CiAgICAg ICAgICAgICAgICAgICAgIGluY2x1ZGVfZmlsZSA9IEZhbHNlCiAgICAgICAgICAgICBpZiBpbmNs dWRlX2ZpbGU6Ci0tIAoyLjMyLjAgKEFwcGxlIEdpdC0xMzIpCgo= 459366 2022-05-14 16:18:34 -0700 2022-05-14 16:22:16 -0700 Patch bug-240256-20220514161833.patch text/plain 1887 jbedard RnJvbSBhM2FiNzgxM2UyYjk1MTI3YjEwYzQwZWM2ODFmYTFkZWU0NTRiYTU1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgpE YXRlOiBTYXQsIDE0IE1heSAyMDIyIDE2OjE4OjAyIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW3dl YmtpdC1wYXRjaF0gSW5jbHVkZSBjb21taXQgbWVzc2FnZXMgaW4gcGF0Y2hlcyAoRm9sbG93LXVw KQogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDI1NiA8cmRhcjov L3Byb2JsZW0vOTI5ODIzNTg+CgpVbnJldmlld2VkIGZvbGxvdy11cCBmaXguCgoqIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHk6CihHaXQuY3JlYXRlX3Bh dGNoKToKKiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2V4cG9ydGVyLnB5OgooV2Vi UGxhdGZvcm1UZXN0RXhwb3J0ZXIuX3N0cmlwX2lnbm9yZWRfZmlsZXNfZnJvbV9kaWZmKToKLS0t CiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IHwgMiAr KwogVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weSAgICAgICB8IDEg KwogMiBmaWxlcyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQppbmRleCA5NDQ3MTI2YzZmOTYu LjJjNTM0ZjMxMWJmOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y2hlY2tvdXQvc2NtL2dpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vZ2l0LnB5CkBAIC0zNzYsNiArMzc2LDggQEAgY2xhc3MgR2l0KFNDTSwgU1ZO UmVwb3NpdG9yeSk6CiAgICAgICAgICAgICBjb21tYW5kICs9IFttZXJnZV9iYXNlXQogICAgICAg ICBlbGlmIG1lcmdlX2Jhc2UgIT0gaGVhZDoKICAgICAgICAgICAgIGNvbW1hbmQgKz0gWydIRUFE Li4ue30nLmZvcm1hdChtZXJnZV9iYXNlKV0KKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIGNv bW1hbmQgKz0gWydIRUFEJ10KIAogICAgICAgICByZXR1cm4gc2VsZi5ydW4oY29tbWFuZCwgZGVj b2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkKIApkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdzNjL3Rlc3RfZXhwb3J0ZXIucHkKaW5kZXggNTEwMzBkYjkxY2U5Li45NjEz MmEyNDRhMTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZXhw b3J0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5w eQpAQCAtMTQ5LDYgKzE0OSw3IEBAIGNsYXNzIFdlYlBsYXRmb3JtVGVzdEV4cG9ydGVyKG9iamVj dCk6CiAgICAgZGVmIF93cHRfcGF0Y2goc2VsZik6CiAgICAgICAgIHBhdGNoX2RhdGEgPSBzZWxm Ll9ob3N0LnNjbSgpLmNyZWF0ZV9wYXRjaChzZWxmLl9vcHRpb25zLmdpdF9jb21taXQsIFtXRUJL SVRfV1BUX0RJUl0pIG9yIGInJwogICAgICAgICBwYXRjaF9kYXRhID0gc2VsZi5fc3RyaXBfaWdu b3JlZF9maWxlc19mcm9tX2RpZmYocGF0Y2hfZGF0YSkKKyAgICAgICAgcHJpbnQocGF0Y2hfZGF0 YSkKICAgICAgICAgaWYgYidkaWZmJyBub3QgaW4gcGF0Y2hfZGF0YToKICAgICAgICAgICAgIHJl dHVybiAnJwogICAgICAgICByZXR1cm4gcGF0Y2hfZGF0YQotLSAKMi4zMi4wIChBcHBsZSBHaXQt MTMyKQoK 459367 2022-05-14 16:22:18 -0700 2022-05-14 16:37:34 -0700 Patch bug-240256-20220514162217.patch text/plain 3111 jbedard RnJvbSAyZmJiMTQ2MDU3ODY1MjcyM2JmYTBiNTFlZTE2NTMwOTVmMjIwMjg3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgpE YXRlOiBTYXQsIDE0IE1heSAyMDIyIDE2OjIxOjI1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW3dl YmtpdC1wYXRjaF0gSW5jbHVkZSBjb21taXQgbWVzc2FnZXMgaW4gcGF0Y2hlcyAoRm9sbG93LXVw KQogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDI1NiA8cmRhcjov L3Byb2JsZW0vOTI5ODIzNTg+CgpVbnJldmlld2VkIGZvbGxvdy11cCBmaXguCgoqIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHk6CihHaXQuY3JlYXRlX3Bh dGNoKToKKiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2V4cG9ydGVyLnB5OgooV2Vi UGxhdGZvcm1UZXN0RXhwb3J0ZXIuX3N0cmlwX2lnbm9yZWRfZmlsZXNfZnJvbV9kaWZmKToKLS0t CiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IHwgNiAr KysrLS0KIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZXhwb3J0ZXIucHkgICAgICAg fCAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20v Z2l0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5w eQppbmRleCA5NDQ3MTI2YzZmOTYuLjEwMGUzMTA0MzQ2YSAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CkBAIC0zNTAsNyArMzUwLDcg QEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAKICAgICAgICAgcmV0dXJuIHN0cmlu Z191dGlscy5lbmNvZGUoIlN1YnZlcnNpb24gUmV2aXNpb246ICIpICsgc3RyaW5nX3V0aWxzLmVu Y29kZShyZXZpc2lvbikgKyBzdHJpbmdfdXRpbHMuZW5jb2RlKCdcbicpICsgc3RyaW5nX3V0aWxz LmVuY29kZShkaWZmKQogCi0gICAgZGVmIGNyZWF0ZV9wYXRjaChzZWxmLCBnaXRfY29tbWl0PU5v bmUsIGNoYW5nZWRfZmlsZXM9Tm9uZSwgZ2l0X2luZGV4PUZhbHNlKToKKyAgICBkZWYgY3JlYXRl X3BhdGNoKHNlbGYsIGdpdF9jb21taXQ9Tm9uZSwgY2hhbmdlZF9maWxlcz1Ob25lLCBnaXRfaW5k ZXg9RmFsc2UsIG5vX21lc3NhZ2U9RmFsc2UpOgogICAgICAgICAiIiJSZXR1cm5zIGEgYnl0ZSBh cnJheSAoc3RyKCkpIHJlcHJlc2VudGluZyB0aGUgcGF0Y2ggZmlsZS4KICAgICAgICAgUGF0Y2gg ZmlsZXMgYXJlIGVmZmVjdGl2ZWx5IGJpbmFyeSBzaW5jZSB0aGV5IG1heSBjb250YWluIGZpbGVz IG9mIG11bHRpcGxlIGRpZmZlcmVudCBlbmNvZGluZ3MuCiAgICAgICAgIElmIGdpdF9pbmRleCBp cyBUcnVlLCBnaXRfY29tbWl0IGlzIGlnbm9yZWQgYmVjYXVzZSBvbmx5IGluZGV4ZWQgZmlsZXMg YXJlIGhhbmRsZWQuCkBAIC0zNTgsNyArMzU4LDcgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3Np dG9yeSk6CiAKICAgICAgICAgaGVhZCA9IHNlbGYucmV2X3BhcnNlKCdIRUFEJykKICAgICAgICAg bWVyZ2VfYmFzZSA9IHNlbGYubWVyZ2VfYmFzZShnaXRfY29tbWl0KQotICAgICAgICBpZiBtZXJn ZV9iYXNlID09IGhlYWQ6CisgICAgICAgIGlmIG5vX21lc3NhZ2Ugb3IgbWVyZ2VfYmFzZSA9PSBo ZWFkOgogICAgICAgICAgICAgY29tbWFuZCA9IFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwgJ2RpZmYn LCAnLS1iaW5hcnknLCAnLS1uby1jb2xvcicsICctLW5vLWV4dC1kaWZmJywgJy0tZnVsbC1pbmRl eCcsICctLW5vLXJlbmFtZXMnXQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgY29tbWFuZCA9 IFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwgJ2Zvcm1hdC1wYXRjaCcsICctLXN0ZG91dCcsICctLWJp bmFyeSddCkBAIC0zNzYsNiArMzc2LDggQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6 CiAgICAgICAgICAgICBjb21tYW5kICs9IFttZXJnZV9iYXNlXQogICAgICAgICBlbGlmIG1lcmdl X2Jhc2UgIT0gaGVhZDoKICAgICAgICAgICAgIGNvbW1hbmQgKz0gWydIRUFELi4ue30nLmZvcm1h dChtZXJnZV9iYXNlKV0KKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIGNvbW1hbmQgKz0gWydI RUFEJ10KIAogICAgICAgICByZXR1cm4gc2VsZi5ydW4oY29tbWFuZCwgZGVjb2RlX291dHB1dD1G YWxzZSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dzNjL3Rlc3RfZXhwb3J0ZXIucHkKaW5kZXggNTEwMzBkYjkxY2U5Li41NTBlMTc4YWE0MGIgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZXhwb3J0ZXIucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weQpAQCAtMTQ3LDcg KzE0Nyw3IEBAIGNsYXNzIFdlYlBsYXRmb3JtVGVzdEV4cG9ydGVyKG9iamVjdCk6CiAgICAgQHBy b3BlcnR5CiAgICAgQG1lbW9pemVkCiAgICAgZGVmIF93cHRfcGF0Y2goc2VsZik6Ci0gICAgICAg IHBhdGNoX2RhdGEgPSBzZWxmLl9ob3N0LnNjbSgpLmNyZWF0ZV9wYXRjaChzZWxmLl9vcHRpb25z LmdpdF9jb21taXQsIFtXRUJLSVRfV1BUX0RJUl0pIG9yIGInJworICAgICAgICBwYXRjaF9kYXRh ID0gc2VsZi5faG9zdC5zY20oKS5jcmVhdGVfcGF0Y2goc2VsZi5fb3B0aW9ucy5naXRfY29tbWl0 LCBbV0VCS0lUX1dQVF9ESVJdLCBub19tZXNzYWdlPVRydWUpIG9yIGInJwogICAgICAgICBwYXRj aF9kYXRhID0gc2VsZi5fc3RyaXBfaWdub3JlZF9maWxlc19mcm9tX2RpZmYocGF0Y2hfZGF0YSkK ICAgICAgICAgaWYgYidkaWZmJyBub3QgaW4gcGF0Y2hfZGF0YToKICAgICAgICAgICAgIHJldHVy biAnJwotLSAKMi4zMi4wIChBcHBsZSBHaXQtMTMyKQoK 459369 2022-05-14 16:37:36 -0700 2022-05-14 16:40:37 -0700 Patch bug-240256-20220514163735.patch text/plain 8292 jbedard RnJvbSA4YjBiNWJjYTk2NjQ0OTAyZGQzODYyYzYzMzljYjllNDI1ZWU4YjgxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgpE YXRlOiBTYXQsIDE0IE1heSAyMDIyIDE2OjM2OjE3IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW3dl YmtpdC1wYXRjaF0gSW5jbHVkZSBjb21taXQgbWVzc2FnZXMgaW4gcGF0Y2hlcyAoRm9sbG93LXVw CiAjMikgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDI1NiA8cmRh cjovL3Byb2JsZW0vOTI5ODIzNTg+CgpVbnJldmlld2VkIGZvbGxvdy11cCBmaXguCgpSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL2dpdC5weToKKEdpdC5jcmVhdGVfcGF0Y2gpOiBBbGxvdyBjYWxsZXIgdG8gZXhjbHVkZSBj b21taXQgbWVzc2FnZSwgcnVuIGBnaXQgZGlmZmAgYWdhaW5zdCBIRUFEIGJ5CmRlZmF1bHQgdG8g aW5jbHVkZSBib3RoIHN0YWdlZCBhbmQgdW5zdGFnZWQgY2hhbmdlcy4KKiBTY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5OgooU0NNLmNyZWF0ZV9wYXRjaCk6IE1hdGNo IGZ1bmN0aW9uIHNpZ25hdHVyZSBmb3IgZ2l0LgoqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9zY21fbW9jay5weToKKE1vY2tTQ00uY3JlYXRlX3BhdGNoKTogTWF0Y2ggZnVu Y3Rpb24gc2lnbmF0dXJlIGZvciBnaXQuCiogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvc2NtL3N2bi5weToKKFNWTi5jcmVhdGVfcGF0Y2gpOiBNYXRjaCBmdW5jdGlvbiBzaWduYXR1 cmUgZm9yIGdpdC4KKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2V4cG9ydGVyLnB5OgooV2Vi UGxhdGZvcm1UZXN0RXhwb3J0ZXIuX3dwdF9wYXRjaCk6IEV4Y2x1ZGUgY29tbWl0IG1lc3NhZ2Ug c2luY2Ugd2Ugd29uJ3QgYmUgYWJsZQp0byBjbGFzc2lmeSBpdCdzIGZpbGUuCiogU2NyaXB0cy93 ZWJraXRweS93M2MvdGVzdF9leHBvcnRlcl91bml0dGVzdC5weToKKFRlc3RFeHBvcnRlclRlc3Qu TW9ja0dpdC5jcmVhdGVfcGF0Y2gpOiBNYXRjaCBmdW5jdGlvbiBzaWduYXR1cmUgZm9yIGdpdC4K LS0tCiBUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyNSAr KysrKysrKysrKysrKysrKysrCiAuLi4vd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQu cHkgICAgICAgfCAgNiArKystLQogLi4uL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2Nt LnB5ICAgICAgIHwgIDIgKy0KIC4uLi93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV9t b2NrLnB5ICB8ICAyICstCiAuLi4vd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkg ICAgICAgfCAgMiArLQogVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5w eSAgIHwgIDIgKy0KIC4uLi93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlcl91bml0dGVzdC5weSAg ICB8ICAyICstCiA3IGZpbGVzIGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IDgzNWNiYjdmMjA3MC4uNWY0ZTQzYmI2MTM5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjItMDUtMTQgIEpvbmF0 aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgorCisgICAgICAgIFt3ZWJraXQtcGF0Y2hd IEluY2x1ZGUgY29tbWl0IG1lc3NhZ2VzIGluIHBhdGNoZXMgKEZvbGxvdy11cCAjMikgCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDAyNTYKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzkyOTgyMzU4PgorCisgICAgICAgIFVucmV2aWV3ZWQgZm9sbG93 LXVwIGZpeC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHk6CisgICAgICAg IChHaXQuY3JlYXRlX3BhdGNoKTogQWxsb3cgY2FsbGVyIHRvIGV4Y2x1ZGUgY29tbWl0IG1lc3Nh Z2UsIHJ1biBgZ2l0IGRpZmZgIGFnYWluc3QgSEVBRCBieQorICAgICAgICBkZWZhdWx0IHRvIGlu Y2x1ZGUgYm90aCBzdGFnZWQgYW5kIHVuc3RhZ2VkIGNoYW5nZXMuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weToKKyAgICAgICAgKFNDTS5jcmVh dGVfcGF0Y2gpOiBNYXRjaCBmdW5jdGlvbiBzaWduYXR1cmUgZm9yIGdpdC4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX21vY2sucHk6CisgICAgICAg IChNb2NrU0NNLmNyZWF0ZV9wYXRjaCk6IE1hdGNoIGZ1bmN0aW9uIHNpZ25hdHVyZSBmb3IgZ2l0 LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHk6 CisgICAgICAgIChTVk4uY3JlYXRlX3BhdGNoKTogTWF0Y2ggZnVuY3Rpb24gc2lnbmF0dXJlIGZv ciBnaXQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weToK KyAgICAgICAgKFdlYlBsYXRmb3JtVGVzdEV4cG9ydGVyLl93cHRfcGF0Y2gpOiBFeGNsdWRlIGNv bW1pdCBtZXNzYWdlIHNpbmNlIHdlIHdvbid0IGJlIGFibGUKKyAgICAgICAgdG8gY2xhc3NpZnkg aXQncyBmaWxlLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZXhwb3J0ZXJf dW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0RXhwb3J0ZXJUZXN0Lk1vY2tHaXQuY3JlYXRlX3Bh dGNoKTogTWF0Y2ggZnVuY3Rpb24gc2lnbmF0dXJlIGZvciBnaXQuCisKIDIwMjItMDUtMTQgIFR5 bGVyIFdpbGNvY2sgIDx0eWxlcl93QGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogUmVtb3ZlIENT U0Rpc3BsYXlDb250ZW50c0FYU3VwcG9ydEVuYWJsZWQgZmxhZwpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKaW5kZXggOTQ0NzEyNmM2Zjk2 Li5hNGE4NzQ5N2EwNjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L3NjbS9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y2hlY2tvdXQvc2NtL2dpdC5weQpAQCAtMzUwLDcgKzM1MCw3IEBAIGNsYXNzIEdpdChTQ00sIFNW TlJlcG9zaXRvcnkpOgogCiAgICAgICAgIHJldHVybiBzdHJpbmdfdXRpbHMuZW5jb2RlKCJTdWJ2 ZXJzaW9uIFJldmlzaW9uOiAiKSArIHN0cmluZ191dGlscy5lbmNvZGUocmV2aXNpb24pICsgc3Ry aW5nX3V0aWxzLmVuY29kZSgnXG4nKSArIHN0cmluZ191dGlscy5lbmNvZGUoZGlmZikKIAotICAg IGRlZiBjcmVhdGVfcGF0Y2goc2VsZiwgZ2l0X2NvbW1pdD1Ob25lLCBjaGFuZ2VkX2ZpbGVzPU5v bmUsIGdpdF9pbmRleD1GYWxzZSk6CisgICAgZGVmIGNyZWF0ZV9wYXRjaChzZWxmLCBnaXRfY29t bWl0PU5vbmUsIGNoYW5nZWRfZmlsZXM9Tm9uZSwgZ2l0X2luZGV4PUZhbHNlLCBjb21taXRfbWVz c2FnZT1UcnVlKToKICAgICAgICAgIiIiUmV0dXJucyBhIGJ5dGUgYXJyYXkgKHN0cigpKSByZXBy ZXNlbnRpbmcgdGhlIHBhdGNoIGZpbGUuCiAgICAgICAgIFBhdGNoIGZpbGVzIGFyZSBlZmZlY3Rp dmVseSBiaW5hcnkgc2luY2UgdGhleSBtYXkgY29udGFpbiBmaWxlcyBvZiBtdWx0aXBsZSBkaWZm ZXJlbnQgZW5jb2RpbmdzLgogICAgICAgICBJZiBnaXRfaW5kZXggaXMgVHJ1ZSwgZ2l0X2NvbW1p dCBpcyBpZ25vcmVkIGJlY2F1c2Ugb25seSBpbmRleGVkIGZpbGVzIGFyZSBoYW5kbGVkLgpAQCAt MzU4LDcgKzM1OCw3IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogCiAgICAgICAg IGhlYWQgPSBzZWxmLnJldl9wYXJzZSgnSEVBRCcpCiAgICAgICAgIG1lcmdlX2Jhc2UgPSBzZWxm Lm1lcmdlX2Jhc2UoZ2l0X2NvbW1pdCkKLSAgICAgICAgaWYgbWVyZ2VfYmFzZSA9PSBoZWFkOgor ICAgICAgICBpZiBub3QgY29tbWl0X21lc3NhZ2Ugb3IgbWVyZ2VfYmFzZSA9PSBoZWFkOgogICAg ICAgICAgICAgY29tbWFuZCA9IFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwgJ2RpZmYnLCAnLS1iaW5h cnknLCAnLS1uby1jb2xvcicsICctLW5vLWV4dC1kaWZmJywgJy0tZnVsbC1pbmRleCcsICctLW5v LXJlbmFtZXMnXQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgY29tbWFuZCA9IFtzZWxmLmV4 ZWN1dGFibGVfbmFtZSwgJ2Zvcm1hdC1wYXRjaCcsICctLXN0ZG91dCcsICctLWJpbmFyeSddCkBA IC0zNzYsNiArMzc2LDggQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAg ICAgICBjb21tYW5kICs9IFttZXJnZV9iYXNlXQogICAgICAgICBlbGlmIG1lcmdlX2Jhc2UgIT0g aGVhZDoKICAgICAgICAgICAgIGNvbW1hbmQgKz0gWydIRUFELi4ue30nLmZvcm1hdChtZXJnZV9i YXNlKV0KKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIGNvbW1hbmQgKz0gWydIRUFEJ10KIAog ICAgICAgICByZXR1cm4gc2VsZi5ydW4oY29tbWFuZCwgZGVjb2RlX291dHB1dD1GYWxzZSwgY3dk PXNlbGYuY2hlY2tvdXRfcm9vdCkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKaW5kZXggM2RhNzA3OWYyM2Q2Li4wMzU2NDNkZjBlOTEg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9z Y20ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3Nj bS5weQpAQCAtMTcyLDcgKzE3Miw3IEBAIGNsYXNzIFNDTToKICAgICBkZWYgdGltZXN0YW1wX29m X25hdGl2ZV9yZXZpc2lvbihzZWxmLCBwYXRoLCByZXZpc2lvbik6CiAgICAgICAgIHNlbGYuX3N1 YmNsYXNzX211c3RfaW1wbGVtZW50KCkKIAotICAgIGRlZiBjcmVhdGVfcGF0Y2goc2VsZiwgZ2l0 X2NvbW1pdD1Ob25lLCBjaGFuZ2VkX2ZpbGVzPU5vbmUpOgorICAgIGRlZiBjcmVhdGVfcGF0Y2go c2VsZiwgZ2l0X2NvbW1pdD1Ob25lLCBjaGFuZ2VkX2ZpbGVzPU5vbmUsIGNvbW1pdF9tZXNzYWdl PUZhbHNlKToKICAgICAgICAgc2VsZi5fc3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQogCiAgICAg ZGVmIGNvbW1pdHRlcl9lbWFpbF9mb3JfcmV2aXNpb24oc2VsZiwgcmV2aXNpb24pOgpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV9tb2Nr LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV9tb2Nr LnB5CmluZGV4IGEyNTM4MzhiYzMyYi4uNjE5MjQ0NDI1NzRhIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX21vY2sucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV9tb2NrLnB5CkBAIC05 Niw3ICs5Niw3IEBAIGNsYXNzIE1vY2tTQ00ob2JqZWN0KToKICAgICBkZWYgdGltZXN0YW1wX29m X25hdGl2ZV9yZXZpc2lvbihzZWxmLCBwYXRoLCByZXZpc2lvbik6CiAgICAgICAgIHJldHVybiAn MjAxMy0wMi0wMSAwODo0ODowNSArMDAwMCcKIAotICAgIGRlZiBjcmVhdGVfcGF0Y2goc2VsZiwg Z2l0X2NvbW1pdCwgY2hhbmdlZF9maWxlcz1Ob25lKToKKyAgICBkZWYgY3JlYXRlX3BhdGNoKHNl bGYsIGdpdF9jb21taXQsIGNoYW5nZWRfZmlsZXM9Tm9uZSwgY29tbWl0X21lc3NhZ2U9RmFsc2Up OgogICAgICAgICByZXR1cm4gYiJQYXRjaDEiCiAKICAgICBkZWYgY29tbWl0X2lkc19mcm9tX2Nv bW1pdGlzaF9hcmd1bWVudHMoc2VsZiwgYXJncyk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQppbmRleCAyZDFmMWUxYTI1YWUuLjhkYzI1 N2QzMDNjZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvc2NtL3N2bi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9zY20vc3ZuLnB5CkBAIC0zMDgsNyArMzA4LDcgQEAgY2xhc3MgU1ZOKFNDTSwgU1ZOUmVwb3Np dG9yeSk6CiAgICAgICAgIHJldHVybiBzZWxmLnRpbWVzdGFtcF9vZl9yZXZpc2lvbihwYXRoLCBy ZXZpc2lvbikKIAogICAgICMgRklYTUU6IFRoaXMgbWV0aG9kIHNob3VsZCBiZSBvbiBDaGVja291 dC4KLSAgICBkZWYgY3JlYXRlX3BhdGNoKHNlbGYsIGdpdF9jb21taXQ9Tm9uZSwgY2hhbmdlZF9m aWxlcz1Ob25lLCBnaXRfaW5kZXg9Tm9uZSk6CisgICAgZGVmIGNyZWF0ZV9wYXRjaChzZWxmLCBn aXRfY29tbWl0PU5vbmUsIGNoYW5nZWRfZmlsZXM9Tm9uZSwgZ2l0X2luZGV4PU5vbmUsIGNvbW1p dF9tZXNzYWdlPUZhbHNlKToKICAgICAgICAgIiIiUmV0dXJucyBhIGJ5dGUgYXJyYXkgKHN0cigp KSByZXByZXNlbnRpbmcgdGhlIHBhdGNoIGZpbGUuCiAgICAgICAgIFBhdGNoIGZpbGVzIGFyZSBl ZmZlY3RpdmVseSBiaW5hcnkgc2luY2UgdGhleSBtYXkgY29udGFpbgogICAgICAgICBmaWxlcyBv ZiBtdWx0aXBsZSBkaWZmZXJlbnQgZW5jb2RpbmdzLiIiIgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdzNjL3Rlc3RfZXhwb3J0ZXIucHkKaW5kZXggNTEwMzBkYjkxY2U5Li5iZWU4ODQ2M2ZkOTIg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZXhwb3J0ZXIucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weQpAQCAtMTQ3 LDcgKzE0Nyw3IEBAIGNsYXNzIFdlYlBsYXRmb3JtVGVzdEV4cG9ydGVyKG9iamVjdCk6CiAgICAg QHByb3BlcnR5CiAgICAgQG1lbW9pemVkCiAgICAgZGVmIF93cHRfcGF0Y2goc2VsZik6Ci0gICAg ICAgIHBhdGNoX2RhdGEgPSBzZWxmLl9ob3N0LnNjbSgpLmNyZWF0ZV9wYXRjaChzZWxmLl9vcHRp b25zLmdpdF9jb21taXQsIFtXRUJLSVRfV1BUX0RJUl0pIG9yIGInJworICAgICAgICBwYXRjaF9k YXRhID0gc2VsZi5faG9zdC5zY20oKS5jcmVhdGVfcGF0Y2goc2VsZi5fb3B0aW9ucy5naXRfY29t bWl0LCBbV0VCS0lUX1dQVF9ESVJdLCBjb21taXRfbWVzc2FnZT1GYWxzZSkgb3IgYicnCiAgICAg ICAgIHBhdGNoX2RhdGEgPSBzZWxmLl9zdHJpcF9pZ25vcmVkX2ZpbGVzX2Zyb21fZGlmZihwYXRj aF9kYXRhKQogICAgICAgICBpZiBiJ2RpZmYnIG5vdCBpbiBwYXRjaF9kYXRhOgogICAgICAgICAg ICAgcmV0dXJuICcnCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0 X2V4cG9ydGVyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9l eHBvcnRlcl91bml0dGVzdC5weQppbmRleCBjZjhkYmE0NDE1NDguLjZjNWNjNDYxZWU2MSAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlcl91bml0dGVz dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2V4cG9ydGVyX3VuaXR0 ZXN0LnB5CkBAIC05Niw3ICs5Niw3IEBAIGNsYXNzIFRlc3RFeHBvcnRlclRlc3QodW5pdHRlc3Qu VGVzdENhc2UpOgogICAgICAgICBkZWYgYnJhbmNoX3JlZl9leGlzdHMoc2VsZiwgbmFtZSk6CiAg ICAgICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgICAgICBkZWYgY3JlYXRlX3BhdGNoKHNlbGYs IGNvbW1pdCwgYXJndW1lbnRzKToKKyAgICAgICAgZGVmIGNyZWF0ZV9wYXRjaChzZWxmLCBjb21t aXQsIGFyZ3VtZW50cywgY29tbWl0X21lc3NhZ2U9RmFsc2UpOgogICAgICAgICAgICAgc2VsZi5j YWxscy5hcHBlbmQoJ2NyZWF0ZV9wYXRjaCAnICsgY29tbWl0ICsgJyAnICsgc3RyKGFyZ3VtZW50 cykpCiAgICAgICAgICAgICByZXR1cm4gc2VsZi5tb2NrX2Zvcm1hdF9wYXRjaF9yZXN1bHQKIAot LSAKMi4zMi4wIChBcHBsZSBHaXQtMTMyKQoK 459370 2022-05-14 16:40:39 -0700 2022-05-14 17:46:26 -0700 Patch bug-240256-20220514164038.patch text/plain 8253 jbedard RnJvbSA5ZTQxYTE1ZjFlNjYyZDMwMDUzNWJlZmY3M2E5NjY3ZTAxZWY4MDcyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgpE YXRlOiBTYXQsIDE0IE1heSAyMDIyIDE2OjM5OjQzIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW3dl YmtpdC1wYXRjaF0gSW5jbHVkZSBjb21taXQgbWVzc2FnZXMgaW4gcGF0Y2hlcyAoRm9sbG93LXVw CiAjMikgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MDI1NiA8cmRh cjovL3Byb2JsZW0vOTI5ODIzNTg+CgpVbnJldmlld2VkIGZvbGxvdy11cCBmaXguCgpSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KCiogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL2dpdC5weToKKEdpdC5jcmVhdGVfcGF0Y2gpOiBBbGxvdyBjYWxsZXIgdG8gZXhjbHVkZSBj b21taXQgbWVzc2FnZSwgcnVuIGBnaXQgZGlmZmAgYWdhaW5zdCBIRUFEIGJ5CmRlZmF1bHQgdG8g aW5jbHVkZSBib3RoIHN0YWdlZCBhbmQgdW5zdGFnZWQgY2hhbmdlcy4KKiBTY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5OgooU0NNLmNyZWF0ZV9wYXRjaCk6IE1hdGNo IGZ1bmN0aW9uIHNpZ25hdHVyZSBmb3IgZ2l0LgoqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9zY21fbW9jay5weToKKE1vY2tTQ00uY3JlYXRlX3BhdGNoKTogTWF0Y2ggZnVu Y3Rpb24gc2lnbmF0dXJlIGZvciBnaXQuCiogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvc2NtL3N2bi5weToKKFNWTi5jcmVhdGVfcGF0Y2gpOiBNYXRjaCBmdW5jdGlvbiBzaWduYXR1 cmUgZm9yIGdpdC4KKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2V4cG9ydGVyLnB5OgooV2Vi UGxhdGZvcm1UZXN0RXhwb3J0ZXIuX3dwdF9wYXRjaCk6IEV4Y2x1ZGUgY29tbWl0IG1lc3NhZ2Ug c2luY2Ugd2Ugd29uJ3QgYmUgYWJsZQp0byBjbGFzc2lmeSBpdCdzIGZpbGUuCiogU2NyaXB0cy93 ZWJraXRweS93M2MvdGVzdF9leHBvcnRlcl91bml0dGVzdC5weToKKFRlc3RFeHBvcnRlclRlc3Qu TW9ja0dpdC5jcmVhdGVfcGF0Y2gpOiBNYXRjaCBmdW5jdGlvbiBzaWduYXR1cmUgZm9yIGdpdC4K LS0tCiBUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyMyAr KysrKysrKysrKysrKysrKysrCiAuLi4vd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQu cHkgICAgICAgfCAgNiArKystLQogLi4uL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2Nt LnB5ICAgICAgIHwgIDIgKy0KIC4uLi93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV9t b2NrLnB5ICB8ICAyICstCiAuLi4vd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkg ICAgICAgfCAgMiArLQogVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5w eSAgIHwgIDIgKy0KIC4uLi93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlcl91bml0dGVzdC5weSAg ICB8ICAyICstCiA3IGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IDgzNWNiYjdmMjA3MC4uMzI3OTdmYTZmNzliIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjItMDUtMTQgIEpvbmF0 aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgorCisgICAgICAgIFt3ZWJraXQtcGF0Y2hd IEluY2x1ZGUgY29tbWl0IG1lc3NhZ2VzIGluIHBhdGNoZXMgKEZvbGxvdy11cCAjMikgCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDAyNTYKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzkyOTgyMzU4PgorCisgICAgICAgIFVucmV2aWV3ZWQgZm9sbG93 LXVwIGZpeC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9naXQucHk6CisgICAgICAgIChHaXQuY3JlYXRlX3BhdGNoKTogQWxsb3cgY2FsbGVyIHRvIGV4 Y2x1ZGUgY29tbWl0IG1lc3NhZ2UsIHJ1biBgZ2l0IGRpZmZgIGFnYWluc3QgSEVBRCBieQorICAg ICAgICBkZWZhdWx0IHRvIGluY2x1ZGUgYm90aCBzdGFnZWQgYW5kIHVuc3RhZ2VkIGNoYW5nZXMu CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weToK KyAgICAgICAgKFNDTS5jcmVhdGVfcGF0Y2gpOiBNYXRjaCBmdW5jdGlvbiBzaWduYXR1cmUgZm9y IGdpdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2Nt X21vY2sucHk6CisgICAgICAgIChNb2NrU0NNLmNyZWF0ZV9wYXRjaCk6IE1hdGNoIGZ1bmN0aW9u IHNpZ25hdHVyZSBmb3IgZ2l0LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9zdm4ucHk6CisgICAgICAgIChTVk4uY3JlYXRlX3BhdGNoKTogTWF0Y2ggZnVu Y3Rpb24gc2lnbmF0dXJlIGZvciBnaXQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS93M2Mv dGVzdF9leHBvcnRlci5weToKKyAgICAgICAgKFdlYlBsYXRmb3JtVGVzdEV4cG9ydGVyLl93cHRf cGF0Y2gpOiBFeGNsdWRlIGNvbW1pdCBtZXNzYWdlIHNpbmNlIHdlIHdvbid0IGJlIGFibGUKKyAg ICAgICAgdG8gY2xhc3NpZnkgaXQncyBmaWxlLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv dzNjL3Rlc3RfZXhwb3J0ZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0RXhwb3J0ZXJUZXN0 Lk1vY2tHaXQuY3JlYXRlX3BhdGNoKTogTWF0Y2ggZnVuY3Rpb24gc2lnbmF0dXJlIGZvciBnaXQu CisKIDIwMjItMDUtMTQgIFR5bGVyIFdpbGNvY2sgIDx0eWxlcl93QGFwcGxlLmNvbT4KIAogICAg ICAgICBBWDogUmVtb3ZlIENTU0Rpc3BsYXlDb250ZW50c0FYU3VwcG9ydEVuYWJsZWQgZmxhZwpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dp dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkK aW5kZXggOTQ0NzEyNmM2Zjk2Li5hNGE4NzQ5N2EwNjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQpAQCAtMzUwLDcgKzM1MCw3IEBA IGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogCiAgICAgICAgIHJldHVybiBzdHJpbmdf dXRpbHMuZW5jb2RlKCJTdWJ2ZXJzaW9uIFJldmlzaW9uOiAiKSArIHN0cmluZ191dGlscy5lbmNv ZGUocmV2aXNpb24pICsgc3RyaW5nX3V0aWxzLmVuY29kZSgnXG4nKSArIHN0cmluZ191dGlscy5l bmNvZGUoZGlmZikKIAotICAgIGRlZiBjcmVhdGVfcGF0Y2goc2VsZiwgZ2l0X2NvbW1pdD1Ob25l LCBjaGFuZ2VkX2ZpbGVzPU5vbmUsIGdpdF9pbmRleD1GYWxzZSk6CisgICAgZGVmIGNyZWF0ZV9w YXRjaChzZWxmLCBnaXRfY29tbWl0PU5vbmUsIGNoYW5nZWRfZmlsZXM9Tm9uZSwgZ2l0X2luZGV4 PUZhbHNlLCBjb21taXRfbWVzc2FnZT1UcnVlKToKICAgICAgICAgIiIiUmV0dXJucyBhIGJ5dGUg YXJyYXkgKHN0cigpKSByZXByZXNlbnRpbmcgdGhlIHBhdGNoIGZpbGUuCiAgICAgICAgIFBhdGNo IGZpbGVzIGFyZSBlZmZlY3RpdmVseSBiaW5hcnkgc2luY2UgdGhleSBtYXkgY29udGFpbiBmaWxl cyBvZiBtdWx0aXBsZSBkaWZmZXJlbnQgZW5jb2RpbmdzLgogICAgICAgICBJZiBnaXRfaW5kZXgg aXMgVHJ1ZSwgZ2l0X2NvbW1pdCBpcyBpZ25vcmVkIGJlY2F1c2Ugb25seSBpbmRleGVkIGZpbGVz IGFyZSBoYW5kbGVkLgpAQCAtMzU4LDcgKzM1OCw3IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9z aXRvcnkpOgogCiAgICAgICAgIGhlYWQgPSBzZWxmLnJldl9wYXJzZSgnSEVBRCcpCiAgICAgICAg IG1lcmdlX2Jhc2UgPSBzZWxmLm1lcmdlX2Jhc2UoZ2l0X2NvbW1pdCkKLSAgICAgICAgaWYgbWVy Z2VfYmFzZSA9PSBoZWFkOgorICAgICAgICBpZiBub3QgY29tbWl0X21lc3NhZ2Ugb3IgbWVyZ2Vf YmFzZSA9PSBoZWFkOgogICAgICAgICAgICAgY29tbWFuZCA9IFtzZWxmLmV4ZWN1dGFibGVfbmFt ZSwgJ2RpZmYnLCAnLS1iaW5hcnknLCAnLS1uby1jb2xvcicsICctLW5vLWV4dC1kaWZmJywgJy0t ZnVsbC1pbmRleCcsICctLW5vLXJlbmFtZXMnXQogICAgICAgICBlbHNlOgogICAgICAgICAgICAg Y29tbWFuZCA9IFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwgJ2Zvcm1hdC1wYXRjaCcsICctLXN0ZG91 dCcsICctLWJpbmFyeSddCkBAIC0zNzYsNiArMzc2LDggQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVw b3NpdG9yeSk6CiAgICAgICAgICAgICBjb21tYW5kICs9IFttZXJnZV9iYXNlXQogICAgICAgICBl bGlmIG1lcmdlX2Jhc2UgIT0gaGVhZDoKICAgICAgICAgICAgIGNvbW1hbmQgKz0gWydIRUFELi4u e30nLmZvcm1hdChtZXJnZV9iYXNlKV0KKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIGNvbW1h bmQgKz0gWydIRUFEJ10KIAogICAgICAgICByZXR1cm4gc2VsZi5ydW4oY29tbWFuZCwgZGVjb2Rl X291dHB1dD1GYWxzZSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkKIApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKaW5kZXggM2RhNzA3OWYy M2Q2Li4wMzU2NDNkZjBlOTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtL3NjbS5weQpAQCAtMTcyLDcgKzE3Miw3IEBAIGNsYXNzIFNDTToKICAg ICBkZWYgdGltZXN0YW1wX29mX25hdGl2ZV9yZXZpc2lvbihzZWxmLCBwYXRoLCByZXZpc2lvbik6 CiAgICAgICAgIHNlbGYuX3N1YmNsYXNzX211c3RfaW1wbGVtZW50KCkKIAotICAgIGRlZiBjcmVh dGVfcGF0Y2goc2VsZiwgZ2l0X2NvbW1pdD1Ob25lLCBjaGFuZ2VkX2ZpbGVzPU5vbmUpOgorICAg IGRlZiBjcmVhdGVfcGF0Y2goc2VsZiwgZ2l0X2NvbW1pdD1Ob25lLCBjaGFuZ2VkX2ZpbGVzPU5v bmUsIGNvbW1pdF9tZXNzYWdlPUZhbHNlKToKICAgICAgICAgc2VsZi5fc3ViY2xhc3NfbXVzdF9p bXBsZW1lbnQoKQogCiAgICAgZGVmIGNvbW1pdHRlcl9lbWFpbF9mb3JfcmV2aXNpb24oc2VsZiwg cmV2aXNpb24pOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL3NjbV9tb2NrLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL3NjbV9tb2NrLnB5CmluZGV4IGEyNTM4MzhiYzMyYi4uNjE5MjQ0NDI1NzRhIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2Nt X21vY2sucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt L3NjbV9tb2NrLnB5CkBAIC05Niw3ICs5Niw3IEBAIGNsYXNzIE1vY2tTQ00ob2JqZWN0KToKICAg ICBkZWYgdGltZXN0YW1wX29mX25hdGl2ZV9yZXZpc2lvbihzZWxmLCBwYXRoLCByZXZpc2lvbik6 CiAgICAgICAgIHJldHVybiAnMjAxMy0wMi0wMSAwODo0ODowNSArMDAwMCcKIAotICAgIGRlZiBj cmVhdGVfcGF0Y2goc2VsZiwgZ2l0X2NvbW1pdCwgY2hhbmdlZF9maWxlcz1Ob25lKToKKyAgICBk ZWYgY3JlYXRlX3BhdGNoKHNlbGYsIGdpdF9jb21taXQsIGNoYW5nZWRfZmlsZXM9Tm9uZSwgY29t bWl0X21lc3NhZ2U9RmFsc2UpOgogICAgICAgICByZXR1cm4gYiJQYXRjaDEiCiAKICAgICBkZWYg Y29tbWl0X2lkc19mcm9tX2NvbW1pdGlzaF9hcmd1bWVudHMoc2VsZiwgYXJncyk6CmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQppbmRleCAy ZDFmMWUxYTI1YWUuLjhkYzI1N2QzMDNjZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CkBAIC0zMDgsNyArMzA4LDcgQEAgY2xhc3Mg U1ZOKFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIHJldHVybiBzZWxmLnRpbWVzdGFtcF9v Zl9yZXZpc2lvbihwYXRoLCByZXZpc2lvbikKIAogICAgICMgRklYTUU6IFRoaXMgbWV0aG9kIHNo b3VsZCBiZSBvbiBDaGVja291dC4KLSAgICBkZWYgY3JlYXRlX3BhdGNoKHNlbGYsIGdpdF9jb21t aXQ9Tm9uZSwgY2hhbmdlZF9maWxlcz1Ob25lLCBnaXRfaW5kZXg9Tm9uZSk6CisgICAgZGVmIGNy ZWF0ZV9wYXRjaChzZWxmLCBnaXRfY29tbWl0PU5vbmUsIGNoYW5nZWRfZmlsZXM9Tm9uZSwgZ2l0 X2luZGV4PU5vbmUsIGNvbW1pdF9tZXNzYWdlPUZhbHNlKToKICAgICAgICAgIiIiUmV0dXJucyBh IGJ5dGUgYXJyYXkgKHN0cigpKSByZXByZXNlbnRpbmcgdGhlIHBhdGNoIGZpbGUuCiAgICAgICAg IFBhdGNoIGZpbGVzIGFyZSBlZmZlY3RpdmVseSBiaW5hcnkgc2luY2UgdGhleSBtYXkgY29udGFp bgogICAgICAgICBmaWxlcyBvZiBtdWx0aXBsZSBkaWZmZXJlbnQgZW5jb2RpbmdzLiIiIgpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZXhwb3J0ZXIucHkKaW5kZXggNTEwMzBkYjkx Y2U5Li5iZWU4ODQ2M2ZkOTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNj L3Rlc3RfZXhwb3J0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9l eHBvcnRlci5weQpAQCAtMTQ3LDcgKzE0Nyw3IEBAIGNsYXNzIFdlYlBsYXRmb3JtVGVzdEV4cG9y dGVyKG9iamVjdCk6CiAgICAgQHByb3BlcnR5CiAgICAgQG1lbW9pemVkCiAgICAgZGVmIF93cHRf cGF0Y2goc2VsZik6Ci0gICAgICAgIHBhdGNoX2RhdGEgPSBzZWxmLl9ob3N0LnNjbSgpLmNyZWF0 ZV9wYXRjaChzZWxmLl9vcHRpb25zLmdpdF9jb21taXQsIFtXRUJLSVRfV1BUX0RJUl0pIG9yIGIn JworICAgICAgICBwYXRjaF9kYXRhID0gc2VsZi5faG9zdC5zY20oKS5jcmVhdGVfcGF0Y2goc2Vs Zi5fb3B0aW9ucy5naXRfY29tbWl0LCBbV0VCS0lUX1dQVF9ESVJdLCBjb21taXRfbWVzc2FnZT1G YWxzZSkgb3IgYicnCiAgICAgICAgIHBhdGNoX2RhdGEgPSBzZWxmLl9zdHJpcF9pZ25vcmVkX2Zp bGVzX2Zyb21fZGlmZihwYXRjaF9kYXRhKQogICAgICAgICBpZiBiJ2RpZmYnIG5vdCBpbiBwYXRj aF9kYXRhOgogICAgICAgICAgICAgcmV0dXJuICcnCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3czYy90ZXN0X2V4cG9ydGVyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS93M2MvdGVzdF9leHBvcnRlcl91bml0dGVzdC5weQppbmRleCBjZjhkYmE0NDE1NDgu LjZjNWNjNDYxZWU2MSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVz dF9leHBvcnRlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90 ZXN0X2V4cG9ydGVyX3VuaXR0ZXN0LnB5CkBAIC05Niw3ICs5Niw3IEBAIGNsYXNzIFRlc3RFeHBv cnRlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBkZWYgYnJhbmNoX3JlZl9leGlz dHMoc2VsZiwgbmFtZSk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgICAgICBkZWYg Y3JlYXRlX3BhdGNoKHNlbGYsIGNvbW1pdCwgYXJndW1lbnRzKToKKyAgICAgICAgZGVmIGNyZWF0 ZV9wYXRjaChzZWxmLCBjb21taXQsIGFyZ3VtZW50cywgY29tbWl0X21lc3NhZ2U9RmFsc2UpOgog ICAgICAgICAgICAgc2VsZi5jYWxscy5hcHBlbmQoJ2NyZWF0ZV9wYXRjaCAnICsgY29tbWl0ICsg JyAnICsgc3RyKGFyZ3VtZW50cykpCiAgICAgICAgICAgICByZXR1cm4gc2VsZi5tb2NrX2Zvcm1h dF9wYXRjaF9yZXN1bHQKIAotLSAKMi4zMi4wIChBcHBsZSBHaXQtMTMyKQoK