235033 2022-01-10 09:33:37 -0800 [EWS] Accept GitHub hooks 2022-01-31 13:26:08 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=234847 https://bugs.webkit.org/show_bug.cgi?id=235913 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ews-watchlist webkit-bug-importer oldest_to_newest 1829499 0 jbedard 2022-01-10 09:33:37 -0800 ewe-build.webkit.org should accept hooks from GitHub. 1829500 1 webkit-bug-importer 2022-01-10 09:33:57 -0800 <rdar://problem/87345269> 1829502 2 jbedard 2022-01-10 09:39:07 -0800 PR: https://github.com/WebKit/WebKit/pull/66 1830164 3 448953 jbedard 2022-01-12 09:20:15 -0800 Created attachment 448953 Patch 1830168 4 448955 jbedard 2022-01-12 09:30:25 -0800 Created attachment 448955 Patch 1830249 5 448979 jbedard 2022-01-12 11:43:17 -0800 Created attachment 448979 Patch 1830260 6 448982 jbedard 2022-01-12 12:00:33 -0800 Created attachment 448982 Patch 1830310 7 448988 jbedard 2022-01-12 13:09:51 -0800 Created attachment 448988 Patch 1830313 8 jbedard 2022-01-12 13:19:10 -0800 Landed: 245976@main (r287947) Keeping this bug open, though, we need to enable more queues. 1830369 9 448988 aakash_jain 2022-01-12 15:20:35 -0800 Comment on attachment 448988 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=448988&action=review > Tools/CISupport/ews-build/master.cfg:57 > admin_username = os.getenv('EWS_ADMIN_USERNAME') would be good to change other os.getenv in this file to load_password as well (in subsequent patch). 1831564 10 aakash_jain 2022-01-17 14:07:46 -0800 (In reply to Aakash Jain from comment #9) > would be good to change other os.getenv in this file to load_password as well (in subsequent patch). Doing this in Bug 235296. 1831565 11 aakash_jain 2022-01-17 14:09:55 -0800 (In reply to Jonathan Bedard from comment #8) > Landed: 245976@main (r287947) Above comment was incorrect. Correct commit id was: https://commits.webkit.org/245978@main (287949) 448953 2022-01-12 09:20:15 -0800 2022-01-12 09:30:23 -0800 Patch bug-235033-20220112092014.patch text/plain 6306 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3OTI3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2QxMzZlMWU3ZDM5ZmRmNjk4Y2Y0NmY1N2ZkZjZkYmRm NGFiMzFjYS4uZDIyNzcyZDZiYzZhNGViMGY2ZDhiNTU3NDhiZThlNjU1MzNhODYxMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDIyLTAxLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbRVdTXSBBY2NlcHQgR2l0SHViIGhvb2tzIChQYXJ0IDEpCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUwMzMKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzg3MzQ1MjY5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRyaWdnZXIgYSBzdWJzZXQgb2YgcXVldWVzIGZvciBpbmNvbWluZyBHaXRI dWIgcHVsbC1yZXF1ZXN0cy4KKworICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvY29uZmln Lmpzb246IEVuYWJsZSB3ZWJraXRwZXJsLCB3ZWJraXRweSwgc2VydmljZXMgYW5kIHN0eWxlIGNo ZWNrcy4KKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL21hc3Rlci5jZmc6IEFjY2VwdCBH aXRIdWIgaG9va3MsIHNwZWNpZnkgdmFyaWFibGVzCisgICAgICAgIHRvIGV4dHJhY3QgZnJvbSBp bmNvbWluZyByZXF1ZXN0LgorICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHk6 CisgICAgICAgIChHaXRIdWIpOgorICAgICAgICAoR2l0SHViLnJlcG9zaXRvcnlfdXJscyk6IENv bmNhdGVuYXRlIGFsbCB2YWxpZCBwcm9qZWN0cyB3aXRoIHRoZSBiYXNlIFVSTC4KKyAgICAgICAg KEdpdEh1Yi5wcl91cmwpOiBHaXZlbiBhIHJlcG9zaXRvcnkgYW5kIHB1bGwtcmVxdWVzdCBudW1i ZXIsIHJldHVybiB0aGUgVVJMCisgICAgICAgIGZvciB0aGF0IHB1bGwtcmVxdWVzdC4KKyAgICAg ICAgKENvbmZpZ3VyZUJ1aWxkLmFkZF9wcl9kZXRhaWxzKToKKyAgICAgICAgKEdpdEh1Yk1peGlu KTogRGVsZXRlZC4KKworMjAyMi0wMS0xMCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBs ZS5jb20+CisKKyAgICAgICAgW0VXU10gQWNjZXB0IEdpdEh1YiBob29rcyAoUGFydCAxKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1MDMzCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS84NzM0NTI2OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUcmlnZ2VyIGEgc3Vic2V0IG9mIHF1ZXVlcyBmb3IgaW5j b21pbmcgR2l0SHViIHB1bGwtcmVxdWVzdHMuCisKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1 aWxkL2NvbmZpZy5qc29uOiBFbmFibGUgd2Via2l0cGVybCwgd2Via2l0cHksIHNlcnZpY2VzIGFu ZCBzdHlsZSBjaGVja3MuCisgICAgICAgICogQ0lTdXBwb3J0L2V3cy1idWlsZC9tYXN0ZXIuY2Zn OiBBY2NlcHQgR2l0SHViIGhvb2tzLgorCiAyMDIyLTAxLTExICBHZW9mZnJleSBHYXJlbiAgPGdn YXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViUGFnZVByb3h5IGRlc3RydWN0aW9uIHNob3Vs ZCBub3QgbGF1bmNoIGEgbmV0d29yayBwcm9jZXNzCmRpZmYgLS1naXQgYS9Ub29scy9DSVN1cHBv cnQvZXdzLWJ1aWxkL2NvbmZpZy5qc29uIGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9jb25m aWcuanNvbgppbmRleCA0ZTMzN2VkYzM0YWIyOTlkYTk0ZDc2YTA1ZWM4OWI0ZjUxYjcwMjE1Li5j OWFhYWYxOGRhNzJmOTZmYzY3OTM1N2IwYTRlMDJjZGMxODNkODVmIDEwMDY0NAotLS0gYS9Ub29s cy9DSVN1cHBvcnQvZXdzLWJ1aWxkL2NvbmZpZy5qc29uCisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9l d3MtYnVpbGQvY29uZmlnLmpzb24KQEAgLTM0Niw2ICszNDYsMTMgQEAKICAgICAgICJ0eXBlIjog IlRyeV9Vc2VycGFzcyIsICJuYW1lIjogInRyeV9jb21taXRxdWV1ZSIsICJwb3J0IjogNTU1NywK ICAgICAgICJidWlsZGVyTmFtZXMiOiBbIkNvbW1pdC1RdWV1ZSJdCiAgICAgfSwKKyAgICB7Cisg ICAgICAidHlwZSI6ICJBbnlCcmFuY2hTY2hlZHVsZXIiLCAibmFtZSI6ICJwdWxscmVxdWVzdCIs CisgICAgICAiYnVpbGRlck5hbWVzIjogWworICAgICAgICAgICAgIlNlcnZpY2VzLUVXUyIsICJT dHlsZS1FV1MiLCAiU3R5bGUtRVdTIiwKKyAgICAgICAgICAgICJXZWJLaXRQZXJsLVRlc3RzLUVX UyIsICJXZWJLaXRQeS1UZXN0cy1FV1MiCisgICAgICBdCisgICAgfSwKICAgICB7CiAgICAgICAi dHlwZSI6ICJUcmlnZ2VyYWJsZSIsICJuYW1lIjogIm1hY29zLWNhdGFsaW5hLWRlYnVnLWJ1aWxk LWV3cyIsCiAgICAgICAiYnVpbGRlck5hbWVzIjogWyJtYWNPUy1DYXRhbGluYS1EZWJ1Zy1CdWls ZC1FV1MiXQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9tYXN0ZXIuY2Zn IGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9tYXN0ZXIuY2ZnCmluZGV4IDllNDBlNWI0OTI3 NmUwYThiOGVhMWJhOTRmODg1Y2FmNjc5Mzg2ZTAuLjEzOGI0YzVmOTlmNWJjOWQxMzZmNmFkMWYz NThmZjFlOGZmYTVjYmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvbWFz dGVyLmNmZworKysgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL21hc3Rlci5jZmcKQEAgLTI4 LDYgKzI4LDE4IEBAIGNbJ3d3dyddWyd1aV9kZWZhdWx0X2NvbmZpZyddID0gewogICAgICdCdWls ZGVycy5idWlsZEZldGNoTGltaXQnOiAxMDAwLAogICAgICdXb3JrZXJzLnNob3dXb3JrZXJCdWls ZGVycyc6IFRydWUsCiB9CitjWyd3d3cnXVsnY2hhbmdlX2hvb2tfZGlhbGVjdHMnXSA9IGRpY3Qo CisgICAgZ2l0aHViPWRpY3QoCisgICAgICAgIHNlY3JldD1vcy5nZXRlbnYoJ0dJVEhVQl9IT09L X1NFQ1JFVCcsIE5vbmUpLAorICAgICAgICBnaXRodWJfcHJvcGVydHlfd2hpdGVsaXN0PVsKKyAg ICAgICAgICAgICdnaXRodWIubnVtYmVyJywKKyAgICAgICAgICAgICdnaXRodWIudGl0bGUnLAor ICAgICAgICAgICAgJ2dpdGh1Yi5oZWFkLnJlZicsCisgICAgICAgICAgICAnZ2l0aHViLmJhc2Uu c2hhJywKKyAgICAgICAgICAgICdnaXRodWIuaGVhZC5yZXBvLmZ1bGxfbmFtZScsCisgICAgICAg IF0sCisgICAgKSwKKykKIAogaWYgbm90IGlzX3Rlc3RfbW9kZV9lbmFibGVkOgogICAgIGFkbWlu X3VzZXJuYW1lID0gb3MuZ2V0ZW52KCdFV1NfQURNSU5fVVNFUk5BTUUnKQpkaWZmIC0tZ2l0IGEv VG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weSBiL1Rvb2xzL0NJU3VwcG9ydC9ld3Mt YnVpbGQvc3RlcHMucHkKaW5kZXggYWRmNzQ2NTFhNjU4MjFiN2ZlMDFjMWYxYzgyNjE3MTBmZDM4 MDZhOS4uN2JjMTFmODY3ZTNiMThhNjJkZDRhNTk2ZjBiNjkwNWI2NjljZjc5OSAxMDA2NDQKLS0t IGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQorKysgYi9Ub29scy9DSVN1cHBv cnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CkBAIC01NSw3ICs1NSw4IEBAIFJFU1VMVFNfREJfVVJMID0g J2h0dHBzOi8vcmVzdWx0cy53ZWJraXQub3JnLycKIFdpdGhQcm9wZXJ0aWVzID0gcHJvcGVydGll cy5XaXRoUHJvcGVydGllcwogSW50ZXJwb2xhdGUgPSBwcm9wZXJ0aWVzLkludGVycG9sYXRlCiBC UkFOQ0hfUFJfUkUgPSByZS5jb21waWxlKHInXnJlZnMvcHVsbC8oP1A8aWQ+XGQrKS9tZXJnZSQn KQotR0lUSFVCX1JFUE9TSVRPUklFUyA9IFsnaHR0cHM6Ly9naXRodWIuY29tL1dlYktpdC9XZWJL aXQnXQorR0lUSFVCX1VSTCA9ICdodHRwczovL2dpdGh1Yi5jb20vJworR0lUSFVCX1BST0pFQ1RT ID0gWydXZWJLaXQvV2ViS2l0J10KIAogCiBjbGFzcyBCdWZmZXJMb2dIZWFkZXJPYnNlcnZlcihs b2dvYnNlcnZlci5CdWZmZXJMb2dPYnNlcnZlcik6CkBAIC03MSwzMiArNzIsMjQgQEAgY2xhc3Mg QnVmZmVyTG9nSGVhZGVyT2JzZXJ2ZXIobG9nb2JzZXJ2ZXIuQnVmZmVyTG9nT2JzZXJ2ZXIpOgog ICAgICAgICByZXR1cm4gc2VsZi5fZ2V0KHNlbGYuaGVhZGVycykKIAogCi1jbGFzcyBHaXRIdWJN aXhpbihvYmplY3QpOgotICAgIGRlZiBwcl91cmwoc2VsZiwgcHJfbnVtYmVyPU5vbmUpOgotICAg ICAgICBwcl9udW1iZXIgPSBwcl9udW1iZXIgb3Igc2VsZi5nZXRfcHVsbF9yZXF1ZXN0X251bWJl cigpCi0gICAgICAgIGlmIG5vdCBwcl9udW1iZXI6Ci0gICAgICAgICAgICByZXR1cm4gJycKLSAg ICAgICAgcmV0dXJuICd7fS9wdWxsL3t9Jy5mb3JtYXQoc2VsZi5nZXRQcm9wZXJ0eSgncmVwb3Np dG9yeScsICctJyksIHByX251bWJlcikKLQotICAgIGRlZiBnZXRfcHVsbF9yZXF1ZXN0X251bWJl cihzZWxmKToKLSAgICAgICAgcHJfbnVtYmVyID0gc2VsZi5nZXRQcm9wZXJ0eSgncHVsbF9yZXF1 ZXN0JykKLSAgICAgICAgaWYgcHJfbnVtYmVyOgotICAgICAgICAgICAgcmV0dXJuIGludChwcl9u dW1iZXIpCitjbGFzcyBHaXRIdWIob2JqZWN0KToKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYg cmVwb3NpdG9yeV91cmxzKGNscyk6CisgICAgICAgIHJldHVybiBbR0lUSFVCX1VSTCArIHByb2pl Y3QgZm9yIHByb2plY3QgaW4gR0lUSFVCX1BST0pFQ1RTXQogCi0gICAgICAgIGlmIHNlbGYuZ2V0 UHJvcGVydHkoJ2V2ZW50JykgIT0gJ3B1bGxfcmVxdWVzdCc6Ci0gICAgICAgICAgICByZXR1cm4g Tm9uZQotICAgICAgICBpZiBzZWxmLmdldFByb3BlcnR5KCdyZXBvc2l0b3J5Jykgbm90IGluIEdJ VEhVQl9SRVBPU0lUT1JJRVM6Ci0gICAgICAgICAgICByZXR1cm4gTm9uZQorICAgIEBjbGFzc21l dGhvZAorICAgIGRlZiBwcl91cmwoY2xzLCByZXBvc2l0b3J5X3VybD1Ob25lLCBwcl9udW1iZXI9 Tm9uZSk6CisgICAgICAgIGlmIG5vdCByZXBvc2l0b3J5X3VybDoKKyAgICAgICAgICAgIHJlcG9z aXRvcnlfdXJsID0gJ3t9e30nLmZvcm1hdChHSVRIVUJfVVJMLCBHSVRIVUJfUFJPSkVDVFNbMF0p CiAKLSAgICAgICAgbWF0Y2ggPSBCUkFOQ0hfUFJfUkUubWF0Y2goc2VsZi5nZXRQcm9wZXJ0eSgn YnJhbmNoJywgJycpKQotICAgICAgICBpZiBub3QgbWF0Y2g6Ci0gICAgICAgICAgICByZXR1cm4g Tm9uZQotICAgICAgICBwcl9udW1iZXIgPSBpbnQobWF0Y2guZ3JvdXAoJ2lkJykpCi0gICAgICAg IHNlbGYuc2V0UHJvcGVydHkoJ3B1bGxfcmVxdWVzdCcsIHByX251bWJlcikKLSAgICAgICAgcmV0 dXJuIHByX251bWJlcgorICAgICAgICBpZiBub3QgcmVwb3NpdG9yeV91cmwgb3IgcmVwb3NpdG9y eV91cmwgbm90IGluIEdpdEh1Yi5yZXBvc2l0b3J5X3VybHMoKToKKyAgICAgICAgICAgIHJldHVy biAnJworICAgICAgICBpZiBub3QgcHJfbnVtYmVyIG9yIGlzaW5zdGFuY2UocHJfbnVtYmVyLCBp bnQpOgorICAgICAgICAgICAgcmV0dXJuICcnCisgICAgICAgIHJldHVybiAne31wdWxsL3t9Jy5m b3JtYXQocmVwb3NpdG9yeV91cmwsIHByX251bWJlcikKIAogCi1jbGFzcyBDb25maWd1cmVCdWls ZChidWlsZHN0ZXAuQnVpbGRTdGVwLCBHaXRIdWJNaXhpbik6CitjbGFzcyBDb25maWd1cmVCdWls ZChidWlsZHN0ZXAuQnVpbGRTdGVwKToKICAgICBuYW1lID0gJ2NvbmZpZ3VyZS1idWlsZCcKICAg ICBkZXNjcmlwdGlvbiA9IFsnY29uZmlndXJpbmcgYnVpbGQnXQogICAgIGRlc2NyaXB0aW9uRG9u ZSA9IFsnQ29uZmlndXJlZCBidWlsZCddCkBAIC0xNDcsOSArMTQwLDkgQEAgY2xhc3MgQ29uZmln dXJlQnVpbGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCwgR2l0SHViTWl4aW4pOgogICAgICAgICAgICAg c2VsZi5hZGRVUkwoJ1BhdGNoIHt9Jy5mb3JtYXQocGF0Y2hfaWQpLCBCdWd6aWxsYS5wYXRjaF91 cmwocGF0Y2hfaWQpKQogCiAgICAgZGVmIGFkZF9wcl9kZXRhaWxzKHNlbGYpOgotICAgICAgICBw cl9udW1iZXIgPSBzZWxmLmdldF9wdWxsX3JlcXVlc3RfbnVtYmVyKCkKKyAgICAgICAgcHJfbnVt YmVyID0gc2VsZi5nZXRQcm9wZXJ0eSgnZ2l0aHViLm51bWJlcicpCiAgICAgICAgIGlmIHByX251 bWJlcjoKLSAgICAgICAgICAgIHNlbGYuYWRkVVJMKCdQdWxsIHJlcXVlc3Qge30nLmZvcm1hdChw cl9udW1iZXIpLCBzZWxmLnByX3VybChwcl9udW1iZXI9cHJfbnVtYmVyKSkKKyAgICAgICAgICAg IHNlbGYuYWRkVVJMKCdQdWxsIHJlcXVlc3Qge30nLmZvcm1hdChwcl9udW1iZXIpLCBHaXRIdWIu cHJfdXJsKHNlbGYuZ2V0UHJvcGVydHkoJ3JlcG9zaXRvcnknKSwgcHJfbnVtYmVyKSBvciAnJykK IAogCiBjbGFzcyBDaGVja091dFNvdXJjZShnaXQuR2l0KToK 448955 2022-01-12 09:30:25 -0800 2022-01-12 11:43:14 -0800 Patch bug-235033-20220112093024.patch text/plain 6417 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3OTI3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2QxMzZlMWU3ZDM5ZmRmNjk4Y2Y0NmY1N2ZkZjZkYmRm NGFiMzFjYS4uODBhOTVmOGFkMjQwNzkwOGYzZjBmN2VlZmY0YTYyYTc1ZWU3NjQyOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDIyLTAxLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbRVdTXSBBY2NlcHQgR2l0SHViIGhvb2tzIChQYXJ0IDEpCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUwMzMKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzg3MzQ1MjY5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRyaWdnZXIgYSBzdWJzZXQgb2YgcXVldWVzIGZvciBpbmNvbWluZyBHaXRI dWIgcHVsbC1yZXF1ZXN0cy4KKworICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvY29uZmln Lmpzb246IEVuYWJsZSB3ZWJraXRwZXJsLCB3ZWJraXRweSwgc2VydmljZXMgYW5kIHN0eWxlIGNo ZWNrcy4KKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL21hc3Rlci5jZmc6IEFjY2VwdCBH aXRIdWIgaG9va3MsIHNwZWNpZnkgdmFyaWFibGVzCisgICAgICAgIHRvIGV4dHJhY3QgZnJvbSBp bmNvbWluZyByZXF1ZXN0LgorICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHk6 CisgICAgICAgIChHaXRIdWIpOgorICAgICAgICAoR2l0SHViLnJlcG9zaXRvcnlfdXJscyk6IENv bmNhdGVuYXRlIGFsbCB2YWxpZCBwcm9qZWN0cyB3aXRoIHRoZSBiYXNlIFVSTC4KKyAgICAgICAg KEdpdEh1Yi5wcl91cmwpOiBHaXZlbiBhIHJlcG9zaXRvcnkgYW5kIHB1bGwtcmVxdWVzdCBudW1i ZXIsIHJldHVybiB0aGUgVVJMCisgICAgICAgIGZvciB0aGF0IHB1bGwtcmVxdWVzdC4KKyAgICAg ICAgKENvbmZpZ3VyZUJ1aWxkLmFkZF9wcl9kZXRhaWxzKToKKyAgICAgICAgKEdpdEh1Yk1peGlu KTogRGVsZXRlZC4KKwogMjAyMi0wMS0xMSAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFdlYlBhZ2VQcm94eSBkZXN0cnVjdGlvbiBzaG91bGQgbm90IGxhdW5j aCBhIG5ldHdvcmsgcHJvY2VzcwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWls ZC9jb25maWcuanNvbiBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpzb24KaW5k ZXggNGUzMzdlZGMzNGFiMjk5ZGE5NGQ3NmEwNWVjODliNGY1MWI3MDIxNS4uYzlhYWFmMThkYTcy Zjk2ZmM2NzkzNTdiMGE0ZTAyY2RjMTgzZDg1ZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0 L2V3cy1idWlsZC9jb25maWcuanNvbgorKysgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL2Nv bmZpZy5qc29uCkBAIC0zNDYsNiArMzQ2LDEzIEBACiAgICAgICAidHlwZSI6ICJUcnlfVXNlcnBh c3MiLCAibmFtZSI6ICJ0cnlfY29tbWl0cXVldWUiLCAicG9ydCI6IDU1NTcsCiAgICAgICAiYnVp bGRlck5hbWVzIjogWyJDb21taXQtUXVldWUiXQogICAgIH0sCisgICAgeworICAgICAgInR5cGUi OiAiQW55QnJhbmNoU2NoZWR1bGVyIiwgIm5hbWUiOiAicHVsbHJlcXVlc3QiLAorICAgICAgImJ1 aWxkZXJOYW1lcyI6IFsKKyAgICAgICAgICAgICJTZXJ2aWNlcy1FV1MiLCAiU3R5bGUtRVdTIiwg IlN0eWxlLUVXUyIsCisgICAgICAgICAgICAiV2ViS2l0UGVybC1UZXN0cy1FV1MiLCAiV2ViS2l0 UHktVGVzdHMtRVdTIgorICAgICAgXQorICAgIH0sCiAgICAgewogICAgICAgInR5cGUiOiAiVHJp Z2dlcmFibGUiLCAibmFtZSI6ICJtYWNvcy1jYXRhbGluYS1kZWJ1Zy1idWlsZC1ld3MiLAogICAg ICAgImJ1aWxkZXJOYW1lcyI6IFsibWFjT1MtQ2F0YWxpbmEtRGVidWctQnVpbGQtRVdTIl0KZGlm ZiAtLWdpdCBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvbWFzdGVyLmNmZyBiL1Rvb2xzL0NJ U3VwcG9ydC9ld3MtYnVpbGQvbWFzdGVyLmNmZwppbmRleCA5ZTQwZTViNDkyNzZlMGE4YjhlYTFi YTk0Zjg4NWNhZjY3OTM4NmUwLi4yNWE0OGRhNThmMTUyNjA4ZjkwNDFlNGQ4NTQyNzg5MWI2YjNm YWFmIDEwMDY0NAotLS0gYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL21hc3Rlci5jZmcKKysr IGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9tYXN0ZXIuY2ZnCkBAIC04LDYgKzgsMTggQEAg ZnJvbSBkYXRldGltZSBpbXBvcnQgdGltZWRlbHRhCiBpbXBvcnQgbG9hZENvbmZpZwogZnJvbSBl dmVudHMgaW1wb3J0IEV2ZW50cwogCisKK2RlZiBsb2FkX3Bhc3N3b3JkKG5hbWUpOgorICAgIGlm IG9zLmdldGVudihuYW1lKToKKyAgICAgICAgcmV0dXJuIG9zLmdldGVudihuYW1lKQorICAgIHRy eToKKyAgICAgICAgcGFzc3dvcmRzID0ganNvbi5sb2FkKG9wZW4oJ3Bhc3N3b3Jkcy5qc29uJykp CisgICAgICAgIHJldHVybiBwYXNzd29yZHMuZ2V0KG5hbWUsIE5vbmUpCisgICAgZXhjZXB0IEV4 Y2VwdGlvbiBhcyBlOgorICAgICAgICBwcmludCgnRXJyb3IgaW4gZmluZGluZyB7fSBpbiBwYXNz d29yZHMuanNvbicuZm9ybWF0KG5hbWUpKQorICAgICAgICByZXR1cm4gTm9uZQorCisKICMgVGhp cyBpcyB3b3JrLWFyb3VuZCBmb3IgVHdpc3RlZCBoYXZpbmcgYSBzbWFsbCBzaXplIGxpbWl0IGZv ciBwYXRjaGVzLiBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 ODg1MSNjNQogZnJvbSB0d2lzdGVkLnNwcmVhZCBpbXBvcnQgYmFuYW5hCiBiYW5hbmEuU0laRV9M SU1JVCA9IDEwMCAqIDEwMjQgKiAxMDI0CkBAIC0yOCw2ICs0MCwxOCBAQCBjWyd3d3cnXVsndWlf ZGVmYXVsdF9jb25maWcnXSA9IHsKICAgICAnQnVpbGRlcnMuYnVpbGRGZXRjaExpbWl0JzogMTAw MCwKICAgICAnV29ya2Vycy5zaG93V29ya2VyQnVpbGRlcnMnOiBUcnVlLAogfQorY1snd3d3J11b J2NoYW5nZV9ob29rX2RpYWxlY3RzJ10gPSBkaWN0KAorICAgIGdpdGh1Yj1kaWN0KAorICAgICAg ICBzZWNyZXQ9bG9hZF9wYXNzd29yZCgnR0lUSFVCX0hPT0tfU0VDUkVUJyksCisgICAgICAgIGdp dGh1Yl9wcm9wZXJ0eV93aGl0ZWxpc3Q9WworICAgICAgICAgICAgJ2dpdGh1Yi5udW1iZXInLAor ICAgICAgICAgICAgJ2dpdGh1Yi50aXRsZScsCisgICAgICAgICAgICAnZ2l0aHViLmhlYWQucmVm JywKKyAgICAgICAgICAgICdnaXRodWIuYmFzZS5zaGEnLAorICAgICAgICAgICAgJ2dpdGh1Yi5o ZWFkLnJlcG8uZnVsbF9uYW1lJywKKyAgICAgICAgXSwKKyAgICApLAorKQogCiBpZiBub3QgaXNf dGVzdF9tb2RlX2VuYWJsZWQ6CiAgICAgYWRtaW5fdXNlcm5hbWUgPSBvcy5nZXRlbnYoJ0VXU19B RE1JTl9VU0VSTkFNRScpCmRpZmYgLS1naXQgYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0 ZXBzLnB5IGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQppbmRleCBhZGY3NDY1 MWE2NTgyMWI3ZmUwMWMxZjFjODI2MTcxMGZkMzgwNmE5Li5jZjA4NTM2MjdjNzk4ODEwYjMxMzE1 ZDEwMzU3ODY0OGQwN2E2MWM0IDEwMDY0NAotLS0gYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxk L3N0ZXBzLnB5CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKQEAgLTU1 LDcgKzU1LDggQEAgUkVTVUxUU19EQl9VUkwgPSAnaHR0cHM6Ly9yZXN1bHRzLndlYmtpdC5vcmcv JwogV2l0aFByb3BlcnRpZXMgPSBwcm9wZXJ0aWVzLldpdGhQcm9wZXJ0aWVzCiBJbnRlcnBvbGF0 ZSA9IHByb3BlcnRpZXMuSW50ZXJwb2xhdGUKIEJSQU5DSF9QUl9SRSA9IHJlLmNvbXBpbGUocide cmVmcy9wdWxsLyg/UDxpZD5cZCspL21lcmdlJCcpCi1HSVRIVUJfUkVQT1NJVE9SSUVTID0gWydo dHRwczovL2dpdGh1Yi5jb20vV2ViS2l0L1dlYktpdCddCitHSVRIVUJfVVJMID0gJ2h0dHBzOi8v Z2l0aHViLmNvbS8nCitHSVRIVUJfUFJPSkVDVFMgPSBbJ1dlYktpdC9XZWJLaXQnXQogCiAKIGNs YXNzIEJ1ZmZlckxvZ0hlYWRlck9ic2VydmVyKGxvZ29ic2VydmVyLkJ1ZmZlckxvZ09ic2VydmVy KToKQEAgLTcxLDMyICs3MiwyNCBAQCBjbGFzcyBCdWZmZXJMb2dIZWFkZXJPYnNlcnZlcihsb2dv YnNlcnZlci5CdWZmZXJMb2dPYnNlcnZlcik6CiAgICAgICAgIHJldHVybiBzZWxmLl9nZXQoc2Vs Zi5oZWFkZXJzKQogCiAKLWNsYXNzIEdpdEh1Yk1peGluKG9iamVjdCk6Ci0gICAgZGVmIHByX3Vy bChzZWxmLCBwcl9udW1iZXI9Tm9uZSk6Ci0gICAgICAgIHByX251bWJlciA9IHByX251bWJlciBv ciBzZWxmLmdldF9wdWxsX3JlcXVlc3RfbnVtYmVyKCkKLSAgICAgICAgaWYgbm90IHByX251bWJl cjoKLSAgICAgICAgICAgIHJldHVybiAnJwotICAgICAgICByZXR1cm4gJ3t9L3B1bGwve30nLmZv cm1hdChzZWxmLmdldFByb3BlcnR5KCdyZXBvc2l0b3J5JywgJy0nKSwgcHJfbnVtYmVyKQotCi0g ICAgZGVmIGdldF9wdWxsX3JlcXVlc3RfbnVtYmVyKHNlbGYpOgotICAgICAgICBwcl9udW1iZXIg PSBzZWxmLmdldFByb3BlcnR5KCdwdWxsX3JlcXVlc3QnKQotICAgICAgICBpZiBwcl9udW1iZXI6 Ci0gICAgICAgICAgICByZXR1cm4gaW50KHByX251bWJlcikKK2NsYXNzIEdpdEh1YihvYmplY3Qp OgorICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiByZXBvc2l0b3J5X3VybHMoY2xzKToKKyAgICAg ICAgcmV0dXJuIFtHSVRIVUJfVVJMICsgcHJvamVjdCBmb3IgcHJvamVjdCBpbiBHSVRIVUJfUFJP SkVDVFNdCiAKLSAgICAgICAgaWYgc2VsZi5nZXRQcm9wZXJ0eSgnZXZlbnQnKSAhPSAncHVsbF9y ZXF1ZXN0JzoKLSAgICAgICAgICAgIHJldHVybiBOb25lCi0gICAgICAgIGlmIHNlbGYuZ2V0UHJv cGVydHkoJ3JlcG9zaXRvcnknKSBub3QgaW4gR0lUSFVCX1JFUE9TSVRPUklFUzoKLSAgICAgICAg ICAgIHJldHVybiBOb25lCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIHByX3VybChjbHMsIHJl cG9zaXRvcnlfdXJsLCBwcl9udW1iZXIpOgorICAgICAgICBpZiBub3QgcmVwb3NpdG9yeV91cmw6 CisgICAgICAgICAgICByZXBvc2l0b3J5X3VybCA9ICd7fXt9Jy5mb3JtYXQoR0lUSFVCX1VSTCwg R0lUSFVCX1BST0pFQ1RTWzBdKQogCi0gICAgICAgIG1hdGNoID0gQlJBTkNIX1BSX1JFLm1hdGNo KHNlbGYuZ2V0UHJvcGVydHkoJ2JyYW5jaCcsICcnKSkKLSAgICAgICAgaWYgbm90IG1hdGNoOgot ICAgICAgICAgICAgcmV0dXJuIE5vbmUKLSAgICAgICAgcHJfbnVtYmVyID0gaW50KG1hdGNoLmdy b3VwKCdpZCcpKQotICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwdWxsX3JlcXVlc3QnLCBwcl9u dW1iZXIpCi0gICAgICAgIHJldHVybiBwcl9udW1iZXIKKyAgICAgICAgaWYgcmVwb3NpdG9yeV91 cmwgbm90IGluIEdpdEh1Yi5yZXBvc2l0b3J5X3VybHMoKToKKyAgICAgICAgICAgIHJldHVybiAn JworICAgICAgICBpZiBub3QgcHJfbnVtYmVyIG9yIGlzaW5zdGFuY2UocHJfbnVtYmVyLCBpbnQp OgorICAgICAgICAgICAgcmV0dXJuICcnCisgICAgICAgIHJldHVybiAne31wdWxsL3t9Jy5mb3Jt YXQocmVwb3NpdG9yeV91cmwsIHByX251bWJlcikKIAogCi1jbGFzcyBDb25maWd1cmVCdWlsZChi dWlsZHN0ZXAuQnVpbGRTdGVwLCBHaXRIdWJNaXhpbik6CitjbGFzcyBDb25maWd1cmVCdWlsZChi dWlsZHN0ZXAuQnVpbGRTdGVwKToKICAgICBuYW1lID0gJ2NvbmZpZ3VyZS1idWlsZCcKICAgICBk ZXNjcmlwdGlvbiA9IFsnY29uZmlndXJpbmcgYnVpbGQnXQogICAgIGRlc2NyaXB0aW9uRG9uZSA9 IFsnQ29uZmlndXJlZCBidWlsZCddCkBAIC0xNDcsOSArMTQwLDkgQEAgY2xhc3MgQ29uZmlndXJl QnVpbGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCwgR2l0SHViTWl4aW4pOgogICAgICAgICAgICAgc2Vs Zi5hZGRVUkwoJ1BhdGNoIHt9Jy5mb3JtYXQocGF0Y2hfaWQpLCBCdWd6aWxsYS5wYXRjaF91cmwo cGF0Y2hfaWQpKQogCiAgICAgZGVmIGFkZF9wcl9kZXRhaWxzKHNlbGYpOgotICAgICAgICBwcl9u dW1iZXIgPSBzZWxmLmdldF9wdWxsX3JlcXVlc3RfbnVtYmVyKCkKKyAgICAgICAgcHJfbnVtYmVy ID0gc2VsZi5nZXRQcm9wZXJ0eSgnZ2l0aHViLm51bWJlcicpCiAgICAgICAgIGlmIHByX251bWJl cjoKLSAgICAgICAgICAgIHNlbGYuYWRkVVJMKCdQdWxsIHJlcXVlc3Qge30nLmZvcm1hdChwcl9u dW1iZXIpLCBzZWxmLnByX3VybChwcl9udW1iZXI9cHJfbnVtYmVyKSkKKyAgICAgICAgICAgIHNl bGYuYWRkVVJMKCdQdWxsIHJlcXVlc3Qge30nLmZvcm1hdChwcl9udW1iZXIpLCBHaXRIdWIucHJf dXJsKHNlbGYuZ2V0UHJvcGVydHkoJ3JlcG9zaXRvcnknKSwgcHJfbnVtYmVyKSBvciAnJykKIAog CiBjbGFzcyBDaGVja091dFNvdXJjZShnaXQuR2l0KToK 448979 2022-01-12 11:43:17 -0800 2022-01-12 12:00:32 -0800 Patch bug-235033-20220112114316.patch text/plain 8225 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3OTQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2QxMzZlMWU3ZDM5ZmRmNjk4Y2Y0NmY1N2ZkZjZkYmRm NGFiMzFjYS4uYzE5ZjUzOWUzNjJiNzA1NDg5MjA2MWFjYjhkMjk3YThiMjJhMzg5ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIyLTAxLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbRVdTXSBBY2NlcHQgR2l0SHViIGhvb2tzIChQYXJ0IDEpCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUwMzMKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzg3MzQ1MjY5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRyaWdnZXIgYSBzdWJzZXQgb2YgcXVldWVzIGZvciBpbmNvbWluZyBHaXRI dWIgcHVsbC1yZXF1ZXN0cy4KKworICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvY29uZmln Lmpzb246IEVuYWJsZSB3ZWJraXRwZXJsLCB3ZWJraXRweSwgc2VydmljZXMgYW5kIHN0eWxlIGNo ZWNrcy4KKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWdfdW5pdHRlc3Qu cHk6CisgICAgICAgIChDb25maWdEb3RKU09OVGVzdCk6CisgICAgICAgIChDb25maWdEb3RKU09O VGVzdC50ZXN0X211bHRpcGxlX3NjaGVkdWVyc19mb3JfYnVpbGRlcik6CisgICAgICAgICogQ0lT dXBwb3J0L2V3cy1idWlsZC9tYXN0ZXIuY2ZnOiBBY2NlcHQgR2l0SHViIGhvb2tzLCBzcGVjaWZ5 IHZhcmlhYmxlcworICAgICAgICB0byBleHRyYWN0IGZyb20gaW5jb21pbmcgcmVxdWVzdC4KKyAg ICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoR2l0SHViKToK KyAgICAgICAgKEdpdEh1Yi5yZXBvc2l0b3J5X3VybHMpOiBDb25jYXRlbmF0ZSBhbGwgdmFsaWQg cHJvamVjdHMgd2l0aCB0aGUgYmFzZSBVUkwuCisgICAgICAgIChHaXRIdWIucHJfdXJsKTogR2l2 ZW4gYSByZXBvc2l0b3J5IGFuZCBwdWxsLXJlcXVlc3QgbnVtYmVyLCByZXR1cm4gdGhlIFVSTAor ICAgICAgICBmb3IgdGhhdCBwdWxsLXJlcXVlc3QuCisgICAgICAgIChDb25maWd1cmVCdWlsZC5h ZGRfcHJfZGV0YWlscyk6CisgICAgICAgIChHaXRIdWJNaXhpbik6IERlbGV0ZWQuCisKIDIwMjIt MDEtMTEgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJQ YWdlUHJveHkgZGVzdHJ1Y3Rpb24gc2hvdWxkIG5vdCBsYXVuY2ggYSBuZXR3b3JrIHByb2Nlc3MK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpzb24gYi9Ub29s cy9DSVN1cHBvcnQvZXdzLWJ1aWxkL2NvbmZpZy5qc29uCmluZGV4IDRlMzM3ZWRjMzRhYjI5OWRh OTRkNzZhMDVlYzg5YjRmNTFiNzAyMTUuLmM5YWFhZjE4ZGE3MmY5NmZjNjc5MzU3YjBhNGUwMmNk YzE4M2Q4NWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpz b24KKysrIGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9jb25maWcuanNvbgpAQCAtMzQ2LDYg KzM0NiwxMyBAQAogICAgICAgInR5cGUiOiAiVHJ5X1VzZXJwYXNzIiwgIm5hbWUiOiAidHJ5X2Nv bW1pdHF1ZXVlIiwgInBvcnQiOiA1NTU3LAogICAgICAgImJ1aWxkZXJOYW1lcyI6IFsiQ29tbWl0 LVF1ZXVlIl0KICAgICB9LAorICAgIHsKKyAgICAgICJ0eXBlIjogIkFueUJyYW5jaFNjaGVkdWxl ciIsICJuYW1lIjogInB1bGxyZXF1ZXN0IiwKKyAgICAgICJidWlsZGVyTmFtZXMiOiBbCisgICAg ICAgICAgICAiU2VydmljZXMtRVdTIiwgIlN0eWxlLUVXUyIsICJTdHlsZS1FV1MiLAorICAgICAg ICAgICAgIldlYktpdFBlcmwtVGVzdHMtRVdTIiwgIldlYktpdFB5LVRlc3RzLUVXUyIKKyAgICAg IF0KKyAgICB9LAogICAgIHsKICAgICAgICJ0eXBlIjogIlRyaWdnZXJhYmxlIiwgIm5hbWUiOiAi bWFjb3MtY2F0YWxpbmEtZGVidWctYnVpbGQtZXdzIiwKICAgICAgICJidWlsZGVyTmFtZXMiOiBb Im1hY09TLUNhdGFsaW5hLURlYnVnLUJ1aWxkLUVXUyJdCmRpZmYgLS1naXQgYS9Ub29scy9DSVN1 cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWdfdW5pdHRlc3QucHkgYi9Ub29scy9DSVN1cHBvcnQv ZXdzLWJ1aWxkL2xvYWRDb25maWdfdW5pdHRlc3QucHkKaW5kZXggMDE2NGVlZGI1OTA3Nzk4MWU2 Y2RmYmVlOTQzNmEwYmUzYWUwNTM3Mi4uNDdlYjNkZDllNTAwMWIyMTRhYTg0ZjdhZGI5MDM3OWEz N2FiZmRjMCAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmln X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvbG9hZENvbmZpZ191 bml0dGVzdC5weQpAQCAtMzEsNiArMzEsOCBAQCBpbXBvcnQgbG9hZENvbmZpZwogCiAKIGNsYXNz IENvbmZpZ0RvdEpTT05UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICBEVVBMSUNBVEVEX1RS SUdHRVJTID0gWyd0cnknLCAncHVsbHJlcXVlc3QnXQorCiAgICAgZGVmIGdldF9jb25maWcoc2Vs Zik6CiAgICAgICAgIGN3ZCA9IG9zLnBhdGguZGlybmFtZShvcy5wYXRoLmFic3BhdGgoX19maWxl X18pKQogICAgICAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKGN3ZCwgJ2NvbmZpZy5qc29uJyks ICdyJykgYXMgY29uZmlnOgpAQCAtNzIsNyArNzQsMTAgQEAgY2xhc3MgQ29uZmlnRG90SlNPTlRl c3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgaWYgc2NoZWR1bGVyWyduYW1lJ10g aW4gdHJpZ2dlcmVkX2J5X3NjaGVkdWxlcnM6CiAgICAgICAgICAgICAgICAgY29udGludWUKICAg ICAgICAgICAgIGZvciBidWlsZGVybmFtZSBpbiBzY2hlZHVsZXIuZ2V0KCdidWlsZGVyTmFtZXMn KToKLSAgICAgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoYnVpbGRlcm5hbWUgbm90IGluIGJ1 aWxkZXJfdG9fc2NoZHVsZXJfbWFwLCAnYnVpbGRlciB7fSBhcHBlYXJzIG11bHRpcGxlIHRpbWVz IGluIHNjaGVkdWxlcnMuJy5mb3JtYXQoYnVpbGRlcm5hbWUpKQorICAgICAgICAgICAgICAgIGlm IHNjaGVkdWxlci5nZXQoJ2J1aWxkZXJOYW1lcycpIGluIHNlbGYuRFVQTElDQVRFRF9UUklHR0VS UyBhbmQgYnVpbGRlcl90b19zY2hkdWxlcl9tYXAuZ2V0KGJ1aWxkZXJuYW1lKToKKyAgICAgICAg ICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGJ1aWxkZXJfdG9fc2NoZHVsZXJfbWFwW2J1aWxk ZXJuYW1lXSBpbiBzZWxmLkRVUExJQ0FURURfVFJJR0dFUlMpCisgICAgICAgICAgICAgICAgZWxz ZToKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGJ1aWxkZXJuYW1lIG5vdCBp biBidWlsZGVyX3RvX3NjaGR1bGVyX21hcCwgJ2J1aWxkZXIge30gYXBwZWFycyBtdWx0aXBsZSB0 aW1lcyBpbiBzY2hlZHVsZXJzLicuZm9ybWF0KGJ1aWxkZXJuYW1lKSkKICAgICAgICAgICAgICAg ICBidWlsZGVyX3RvX3NjaGR1bGVyX21hcFtidWlsZGVybmFtZV0gPSBzY2hlZHVsZXIuZ2V0KCdu YW1lJykKIAogICAgIGRlZiB0ZXN0X3NjaGR1bGVyX2NvbnRhaW5zX3ZhbGlkX2J1aWxkZXJfbmFt ZShzZWxmKToKZGlmZiAtLWdpdCBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvbWFzdGVyLmNm ZyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvbWFzdGVyLmNmZwppbmRleCA5ZTQwZTViNDky NzZlMGE4YjhlYTFiYTk0Zjg4NWNhZjY3OTM4NmUwLi4yNWE0OGRhNThmMTUyNjA4ZjkwNDFlNGQ4 NTQyNzg5MWI2YjNmYWFmIDEwMDY0NAotLS0gYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL21h c3Rlci5jZmcKKysrIGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9tYXN0ZXIuY2ZnCkBAIC04 LDYgKzgsMTggQEAgZnJvbSBkYXRldGltZSBpbXBvcnQgdGltZWRlbHRhCiBpbXBvcnQgbG9hZENv bmZpZwogZnJvbSBldmVudHMgaW1wb3J0IEV2ZW50cwogCisKK2RlZiBsb2FkX3Bhc3N3b3JkKG5h bWUpOgorICAgIGlmIG9zLmdldGVudihuYW1lKToKKyAgICAgICAgcmV0dXJuIG9zLmdldGVudihu YW1lKQorICAgIHRyeToKKyAgICAgICAgcGFzc3dvcmRzID0ganNvbi5sb2FkKG9wZW4oJ3Bhc3N3 b3Jkcy5qc29uJykpCisgICAgICAgIHJldHVybiBwYXNzd29yZHMuZ2V0KG5hbWUsIE5vbmUpCisg ICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgorICAgICAgICBwcmludCgnRXJyb3IgaW4gZmluZGlu ZyB7fSBpbiBwYXNzd29yZHMuanNvbicuZm9ybWF0KG5hbWUpKQorICAgICAgICByZXR1cm4gTm9u ZQorCisKICMgVGhpcyBpcyB3b3JrLWFyb3VuZCBmb3IgVHdpc3RlZCBoYXZpbmcgYSBzbWFsbCBz aXplIGxpbWl0IGZvciBwYXRjaGVzLiBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5ODg1MSNjNQogZnJvbSB0d2lzdGVkLnNwcmVhZCBpbXBvcnQgYmFuYW5hCiBi YW5hbmEuU0laRV9MSU1JVCA9IDEwMCAqIDEwMjQgKiAxMDI0CkBAIC0yOCw2ICs0MCwxOCBAQCBj Wyd3d3cnXVsndWlfZGVmYXVsdF9jb25maWcnXSA9IHsKICAgICAnQnVpbGRlcnMuYnVpbGRGZXRj aExpbWl0JzogMTAwMCwKICAgICAnV29ya2Vycy5zaG93V29ya2VyQnVpbGRlcnMnOiBUcnVlLAog fQorY1snd3d3J11bJ2NoYW5nZV9ob29rX2RpYWxlY3RzJ10gPSBkaWN0KAorICAgIGdpdGh1Yj1k aWN0KAorICAgICAgICBzZWNyZXQ9bG9hZF9wYXNzd29yZCgnR0lUSFVCX0hPT0tfU0VDUkVUJyks CisgICAgICAgIGdpdGh1Yl9wcm9wZXJ0eV93aGl0ZWxpc3Q9WworICAgICAgICAgICAgJ2dpdGh1 Yi5udW1iZXInLAorICAgICAgICAgICAgJ2dpdGh1Yi50aXRsZScsCisgICAgICAgICAgICAnZ2l0 aHViLmhlYWQucmVmJywKKyAgICAgICAgICAgICdnaXRodWIuYmFzZS5zaGEnLAorICAgICAgICAg ICAgJ2dpdGh1Yi5oZWFkLnJlcG8uZnVsbF9uYW1lJywKKyAgICAgICAgXSwKKyAgICApLAorKQog CiBpZiBub3QgaXNfdGVzdF9tb2RlX2VuYWJsZWQ6CiAgICAgYWRtaW5fdXNlcm5hbWUgPSBvcy5n ZXRlbnYoJ0VXU19BRE1JTl9VU0VSTkFNRScpCmRpZmYgLS1naXQgYS9Ub29scy9DSVN1cHBvcnQv ZXdzLWJ1aWxkL3N0ZXBzLnB5IGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQpp bmRleCBhZGY3NDY1MWE2NTgyMWI3ZmUwMWMxZjFjODI2MTcxMGZkMzgwNmE5Li42MTk4MmQxMjBk NzQyN2NkN2NiZmU2MmE1YTVmNjdkZGRiMzlkNmY1IDEwMDY0NAotLS0gYS9Ub29scy9DSVN1cHBv cnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3Rl cHMucHkKQEAgLTU1LDcgKzU1LDggQEAgUkVTVUxUU19EQl9VUkwgPSAnaHR0cHM6Ly9yZXN1bHRz LndlYmtpdC5vcmcvJwogV2l0aFByb3BlcnRpZXMgPSBwcm9wZXJ0aWVzLldpdGhQcm9wZXJ0aWVz CiBJbnRlcnBvbGF0ZSA9IHByb3BlcnRpZXMuSW50ZXJwb2xhdGUKIEJSQU5DSF9QUl9SRSA9IHJl LmNvbXBpbGUocidecmVmcy9wdWxsLyg/UDxpZD5cZCspL21lcmdlJCcpCi1HSVRIVUJfUkVQT1NJ VE9SSUVTID0gWydodHRwczovL2dpdGh1Yi5jb20vV2ViS2l0L1dlYktpdCddCitHSVRIVUJfVVJM ID0gJ2h0dHBzOi8vZ2l0aHViLmNvbS8nCitHSVRIVUJfUFJPSkVDVFMgPSBbJ1dlYktpdC9XZWJL aXQnXQogCiAKIGNsYXNzIEJ1ZmZlckxvZ0hlYWRlck9ic2VydmVyKGxvZ29ic2VydmVyLkJ1ZmZl ckxvZ09ic2VydmVyKToKQEAgLTcxLDMyICs3MiwyNCBAQCBjbGFzcyBCdWZmZXJMb2dIZWFkZXJP YnNlcnZlcihsb2dvYnNlcnZlci5CdWZmZXJMb2dPYnNlcnZlcik6CiAgICAgICAgIHJldHVybiBz ZWxmLl9nZXQoc2VsZi5oZWFkZXJzKQogCiAKLWNsYXNzIEdpdEh1Yk1peGluKG9iamVjdCk6Ci0g ICAgZGVmIHByX3VybChzZWxmLCBwcl9udW1iZXI9Tm9uZSk6Ci0gICAgICAgIHByX251bWJlciA9 IHByX251bWJlciBvciBzZWxmLmdldF9wdWxsX3JlcXVlc3RfbnVtYmVyKCkKLSAgICAgICAgaWYg bm90IHByX251bWJlcjoKLSAgICAgICAgICAgIHJldHVybiAnJwotICAgICAgICByZXR1cm4gJ3t9 L3B1bGwve30nLmZvcm1hdChzZWxmLmdldFByb3BlcnR5KCdyZXBvc2l0b3J5JywgJy0nKSwgcHJf bnVtYmVyKQotCi0gICAgZGVmIGdldF9wdWxsX3JlcXVlc3RfbnVtYmVyKHNlbGYpOgotICAgICAg ICBwcl9udW1iZXIgPSBzZWxmLmdldFByb3BlcnR5KCdwdWxsX3JlcXVlc3QnKQotICAgICAgICBp ZiBwcl9udW1iZXI6Ci0gICAgICAgICAgICByZXR1cm4gaW50KHByX251bWJlcikKK2NsYXNzIEdp dEh1YihvYmplY3QpOgorICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiByZXBvc2l0b3J5X3VybHMo Y2xzKToKKyAgICAgICAgcmV0dXJuIFtHSVRIVUJfVVJMICsgcHJvamVjdCBmb3IgcHJvamVjdCBp biBHSVRIVUJfUFJPSkVDVFNdCiAKLSAgICAgICAgaWYgc2VsZi5nZXRQcm9wZXJ0eSgnZXZlbnQn KSAhPSAncHVsbF9yZXF1ZXN0JzoKLSAgICAgICAgICAgIHJldHVybiBOb25lCi0gICAgICAgIGlm IHNlbGYuZ2V0UHJvcGVydHkoJ3JlcG9zaXRvcnknKSBub3QgaW4gR0lUSFVCX1JFUE9TSVRPUklF UzoKLSAgICAgICAgICAgIHJldHVybiBOb25lCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIHBy X3VybChjbHMsIHByX251bWJlciwgcmVwb3NpdG9yeV91cmw9Tm9uZSk6CisgICAgICAgIGlmIG5v dCByZXBvc2l0b3J5X3VybDoKKyAgICAgICAgICAgIHJlcG9zaXRvcnlfdXJsID0gJ3t9e30nLmZv cm1hdChHSVRIVUJfVVJMLCBHSVRIVUJfUFJPSkVDVFNbMF0pCiAKLSAgICAgICAgbWF0Y2ggPSBC UkFOQ0hfUFJfUkUubWF0Y2goc2VsZi5nZXRQcm9wZXJ0eSgnYnJhbmNoJywgJycpKQotICAgICAg ICBpZiBub3QgbWF0Y2g6Ci0gICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICBwcl9udW1i ZXIgPSBpbnQobWF0Y2guZ3JvdXAoJ2lkJykpCi0gICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3B1 bGxfcmVxdWVzdCcsIHByX251bWJlcikKLSAgICAgICAgcmV0dXJuIHByX251bWJlcgorICAgICAg ICBpZiByZXBvc2l0b3J5X3VybCBub3QgaW4gR2l0SHViLnJlcG9zaXRvcnlfdXJscygpOgorICAg ICAgICAgICAgcmV0dXJuICcnCisgICAgICAgIGlmIG5vdCBwcl9udW1iZXIgb3IgaXNpbnN0YW5j ZShwcl9udW1iZXIsIGludCk6CisgICAgICAgICAgICByZXR1cm4gJycKKyAgICAgICAgcmV0dXJu ICd7fXB1bGwve30nLmZvcm1hdChyZXBvc2l0b3J5X3VybCwgcHJfbnVtYmVyKQogCiAKLWNsYXNz IENvbmZpZ3VyZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXAsIEdpdEh1Yk1peGluKToKK2NsYXNz IENvbmZpZ3VyZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXApOgogICAgIG5hbWUgPSAnY29uZmln dXJlLWJ1aWxkJwogICAgIGRlc2NyaXB0aW9uID0gWydjb25maWd1cmluZyBidWlsZCddCiAgICAg ZGVzY3JpcHRpb25Eb25lID0gWydDb25maWd1cmVkIGJ1aWxkJ10KQEAgLTE0Nyw5ICsxNDAsMTUg QEAgY2xhc3MgQ29uZmlndXJlQnVpbGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCwgR2l0SHViTWl4aW4p OgogICAgICAgICAgICAgc2VsZi5hZGRVUkwoJ1BhdGNoIHt9Jy5mb3JtYXQocGF0Y2hfaWQpLCBC dWd6aWxsYS5wYXRjaF91cmwocGF0Y2hfaWQpKQogCiAgICAgZGVmIGFkZF9wcl9kZXRhaWxzKHNl bGYpOgotICAgICAgICBwcl9udW1iZXIgPSBzZWxmLmdldF9wdWxsX3JlcXVlc3RfbnVtYmVyKCkK KyAgICAgICAgcHJfbnVtYmVyID0gc2VsZi5nZXRQcm9wZXJ0eSgnZ2l0aHViLm51bWJlcicpCiAg ICAgICAgIGlmIHByX251bWJlcjoKLSAgICAgICAgICAgIHNlbGYuYWRkVVJMKCdQdWxsIHJlcXVl c3Qge30nLmZvcm1hdChwcl9udW1iZXIpLCBzZWxmLnByX3VybChwcl9udW1iZXI9cHJfbnVtYmVy KSkKKyAgICAgICAgICAgIHNlbGYuYWRkVVJMKAorICAgICAgICAgICAgICAgICdQdWxsIHJlcXVl c3Qge30nLmZvcm1hdChwcl9udW1iZXIpLAorICAgICAgICAgICAgICAgIEdpdEh1Yi5wcl91cmwo CisgICAgICAgICAgICAgICAgICAgIHByX251bWJlcj1wcl9udW1iZXIsCisgICAgICAgICAgICAg ICAgICAgIHJlcG9zaXRvcnlfdXJsPXNlbGYuZ2V0UHJvcGVydHkoJ3JlcG9zaXRvcnknKSwKKyAg ICAgICAgICAgICAgICApIG9yICcnLAorICAgICAgICAgICAgKQogCiAKIGNsYXNzIENoZWNrT3V0 U291cmNlKGdpdC5HaXQpOgo= 448982 2022-01-12 12:00:33 -0800 2022-01-12 13:09:48 -0800 Patch bug-235033-20220112120033.patch text/plain 8217 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3OTQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2QxMzZlMWU3ZDM5ZmRmNjk4Y2Y0NmY1N2ZkZjZkYmRm NGFiMzFjYS4uYzE5ZjUzOWUzNjJiNzA1NDg5MjA2MWFjYjhkMjk3YThiMjJhMzg5ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIyLTAxLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbRVdTXSBBY2NlcHQgR2l0SHViIGhvb2tzIChQYXJ0IDEpCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUwMzMKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzg3MzQ1MjY5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRyaWdnZXIgYSBzdWJzZXQgb2YgcXVldWVzIGZvciBpbmNvbWluZyBHaXRI dWIgcHVsbC1yZXF1ZXN0cy4KKworICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvY29uZmln Lmpzb246IEVuYWJsZSB3ZWJraXRwZXJsLCB3ZWJraXRweSwgc2VydmljZXMgYW5kIHN0eWxlIGNo ZWNrcy4KKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWdfdW5pdHRlc3Qu cHk6CisgICAgICAgIChDb25maWdEb3RKU09OVGVzdCk6CisgICAgICAgIChDb25maWdEb3RKU09O VGVzdC50ZXN0X211bHRpcGxlX3NjaGVkdWVyc19mb3JfYnVpbGRlcik6CisgICAgICAgICogQ0lT dXBwb3J0L2V3cy1idWlsZC9tYXN0ZXIuY2ZnOiBBY2NlcHQgR2l0SHViIGhvb2tzLCBzcGVjaWZ5 IHZhcmlhYmxlcworICAgICAgICB0byBleHRyYWN0IGZyb20gaW5jb21pbmcgcmVxdWVzdC4KKyAg ICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoR2l0SHViKToK KyAgICAgICAgKEdpdEh1Yi5yZXBvc2l0b3J5X3VybHMpOiBDb25jYXRlbmF0ZSBhbGwgdmFsaWQg cHJvamVjdHMgd2l0aCB0aGUgYmFzZSBVUkwuCisgICAgICAgIChHaXRIdWIucHJfdXJsKTogR2l2 ZW4gYSByZXBvc2l0b3J5IGFuZCBwdWxsLXJlcXVlc3QgbnVtYmVyLCByZXR1cm4gdGhlIFVSTAor ICAgICAgICBmb3IgdGhhdCBwdWxsLXJlcXVlc3QuCisgICAgICAgIChDb25maWd1cmVCdWlsZC5h ZGRfcHJfZGV0YWlscyk6CisgICAgICAgIChHaXRIdWJNaXhpbik6IERlbGV0ZWQuCisKIDIwMjIt MDEtMTEgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJQ YWdlUHJveHkgZGVzdHJ1Y3Rpb24gc2hvdWxkIG5vdCBsYXVuY2ggYSBuZXR3b3JrIHByb2Nlc3MK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpzb24gYi9Ub29s cy9DSVN1cHBvcnQvZXdzLWJ1aWxkL2NvbmZpZy5qc29uCmluZGV4IDRlMzM3ZWRjMzRhYjI5OWRh OTRkNzZhMDVlYzg5YjRmNTFiNzAyMTUuLmM5YWFhZjE4ZGE3MmY5NmZjNjc5MzU3YjBhNGUwMmNk YzE4M2Q4NWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpz b24KKysrIGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9jb25maWcuanNvbgpAQCAtMzQ2LDYg KzM0NiwxMyBAQAogICAgICAgInR5cGUiOiAiVHJ5X1VzZXJwYXNzIiwgIm5hbWUiOiAidHJ5X2Nv bW1pdHF1ZXVlIiwgInBvcnQiOiA1NTU3LAogICAgICAgImJ1aWxkZXJOYW1lcyI6IFsiQ29tbWl0 LVF1ZXVlIl0KICAgICB9LAorICAgIHsKKyAgICAgICJ0eXBlIjogIkFueUJyYW5jaFNjaGVkdWxl ciIsICJuYW1lIjogInB1bGxyZXF1ZXN0IiwKKyAgICAgICJidWlsZGVyTmFtZXMiOiBbCisgICAg ICAgICAgICAiU2VydmljZXMtRVdTIiwgIlN0eWxlLUVXUyIsICJTdHlsZS1FV1MiLAorICAgICAg ICAgICAgIldlYktpdFBlcmwtVGVzdHMtRVdTIiwgIldlYktpdFB5LVRlc3RzLUVXUyIKKyAgICAg IF0KKyAgICB9LAogICAgIHsKICAgICAgICJ0eXBlIjogIlRyaWdnZXJhYmxlIiwgIm5hbWUiOiAi bWFjb3MtY2F0YWxpbmEtZGVidWctYnVpbGQtZXdzIiwKICAgICAgICJidWlsZGVyTmFtZXMiOiBb Im1hY09TLUNhdGFsaW5hLURlYnVnLUJ1aWxkLUVXUyJdCmRpZmYgLS1naXQgYS9Ub29scy9DSVN1 cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWdfdW5pdHRlc3QucHkgYi9Ub29scy9DSVN1cHBvcnQv ZXdzLWJ1aWxkL2xvYWRDb25maWdfdW5pdHRlc3QucHkKaW5kZXggMDE2NGVlZGI1OTA3Nzk4MWU2 Y2RmYmVlOTQzNmEwYmUzYWUwNTM3Mi4uOWFmNWNjZGFiYzJhZGEzMDJhNjlhNDYzZWZiZWZjZTIz NTEzMWUyMiAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmln X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvbG9hZENvbmZpZ191 bml0dGVzdC5weQpAQCAtMzEsNiArMzEsOCBAQCBpbXBvcnQgbG9hZENvbmZpZwogCiAKIGNsYXNz IENvbmZpZ0RvdEpTT05UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICBEVVBMSUNBVEVEX1RS SUdHRVJTID0gWyd0cnknLCAncHVsbHJlcXVlc3QnXQorCiAgICAgZGVmIGdldF9jb25maWcoc2Vs Zik6CiAgICAgICAgIGN3ZCA9IG9zLnBhdGguZGlybmFtZShvcy5wYXRoLmFic3BhdGgoX19maWxl X18pKQogICAgICAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKGN3ZCwgJ2NvbmZpZy5qc29uJyks ICdyJykgYXMgY29uZmlnOgpAQCAtNzIsNyArNzQsMTAgQEAgY2xhc3MgQ29uZmlnRG90SlNPTlRl c3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgaWYgc2NoZWR1bGVyWyduYW1lJ10g aW4gdHJpZ2dlcmVkX2J5X3NjaGVkdWxlcnM6CiAgICAgICAgICAgICAgICAgY29udGludWUKICAg ICAgICAgICAgIGZvciBidWlsZGVybmFtZSBpbiBzY2hlZHVsZXIuZ2V0KCdidWlsZGVyTmFtZXMn KToKLSAgICAgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoYnVpbGRlcm5hbWUgbm90IGluIGJ1 aWxkZXJfdG9fc2NoZHVsZXJfbWFwLCAnYnVpbGRlciB7fSBhcHBlYXJzIG11bHRpcGxlIHRpbWVz IGluIHNjaGVkdWxlcnMuJy5mb3JtYXQoYnVpbGRlcm5hbWUpKQorICAgICAgICAgICAgICAgIGlm IHNjaGVkdWxlci5nZXQoJ25hbWUnKSBpbiBzZWxmLkRVUExJQ0FURURfVFJJR0dFUlMgYW5kIGJ1 aWxkZXJfdG9fc2NoZHVsZXJfbWFwLmdldChidWlsZGVybmFtZSk6CisgICAgICAgICAgICAgICAg ICAgIHNlbGYuYXNzZXJ0VHJ1ZShidWlsZGVyX3RvX3NjaGR1bGVyX21hcFtidWlsZGVybmFtZV0g aW4gc2VsZi5EVVBMSUNBVEVEX1RSSUdHRVJTKQorICAgICAgICAgICAgICAgIGVsc2U6CisgICAg ICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShidWlsZGVybmFtZSBub3QgaW4gYnVpbGRl cl90b19zY2hkdWxlcl9tYXAsICdidWlsZGVyIHt9IGFwcGVhcnMgbXVsdGlwbGUgdGltZXMgaW4g c2NoZWR1bGVycy4nLmZvcm1hdChidWlsZGVybmFtZSkpCiAgICAgICAgICAgICAgICAgYnVpbGRl cl90b19zY2hkdWxlcl9tYXBbYnVpbGRlcm5hbWVdID0gc2NoZWR1bGVyLmdldCgnbmFtZScpCiAK ICAgICBkZWYgdGVzdF9zY2hkdWxlcl9jb250YWluc192YWxpZF9idWlsZGVyX25hbWUoc2VsZik6 CmRpZmYgLS1naXQgYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL21hc3Rlci5jZmcgYi9Ub29s cy9DSVN1cHBvcnQvZXdzLWJ1aWxkL21hc3Rlci5jZmcKaW5kZXggOWU0MGU1YjQ5Mjc2ZTBhOGI4 ZWExYmE5NGY4ODVjYWY2NzkzODZlMC4uMjVhNDhkYTU4ZjE1MjYwOGY5MDQxZTRkODU0Mjc4OTFi NmIzZmFhZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9tYXN0ZXIuY2Zn CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvbWFzdGVyLmNmZwpAQCAtOCw2ICs4LDE4 IEBAIGZyb20gZGF0ZXRpbWUgaW1wb3J0IHRpbWVkZWx0YQogaW1wb3J0IGxvYWRDb25maWcKIGZy b20gZXZlbnRzIGltcG9ydCBFdmVudHMKIAorCitkZWYgbG9hZF9wYXNzd29yZChuYW1lKToKKyAg ICBpZiBvcy5nZXRlbnYobmFtZSk6CisgICAgICAgIHJldHVybiBvcy5nZXRlbnYobmFtZSkKKyAg ICB0cnk6CisgICAgICAgIHBhc3N3b3JkcyA9IGpzb24ubG9hZChvcGVuKCdwYXNzd29yZHMuanNv bicpKQorICAgICAgICByZXR1cm4gcGFzc3dvcmRzLmdldChuYW1lLCBOb25lKQorICAgIGV4Y2Vw dCBFeGNlcHRpb24gYXMgZToKKyAgICAgICAgcHJpbnQoJ0Vycm9yIGluIGZpbmRpbmcge30gaW4g cGFzc3dvcmRzLmpzb24nLmZvcm1hdChuYW1lKSkKKyAgICAgICAgcmV0dXJuIE5vbmUKKworCiAj IFRoaXMgaXMgd29yay1hcm91bmQgZm9yIFR3aXN0ZWQgaGF2aW5nIGEgc21hbGwgc2l6ZSBsaW1p dCBmb3IgcGF0Y2hlcy4gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTg4NTEjYzUKIGZyb20gdHdpc3RlZC5zcHJlYWQgaW1wb3J0IGJhbmFuYQogYmFuYW5hLlNJ WkVfTElNSVQgPSAxMDAgKiAxMDI0ICogMTAyNApAQCAtMjgsNiArNDAsMTggQEAgY1snd3d3J11b J3VpX2RlZmF1bHRfY29uZmlnJ10gPSB7CiAgICAgJ0J1aWxkZXJzLmJ1aWxkRmV0Y2hMaW1pdCc6 IDEwMDAsCiAgICAgJ1dvcmtlcnMuc2hvd1dvcmtlckJ1aWxkZXJzJzogVHJ1ZSwKIH0KK2NbJ3d3 dyddWydjaGFuZ2VfaG9va19kaWFsZWN0cyddID0gZGljdCgKKyAgICBnaXRodWI9ZGljdCgKKyAg ICAgICAgc2VjcmV0PWxvYWRfcGFzc3dvcmQoJ0dJVEhVQl9IT09LX1NFQ1JFVCcpLAorICAgICAg ICBnaXRodWJfcHJvcGVydHlfd2hpdGVsaXN0PVsKKyAgICAgICAgICAgICdnaXRodWIubnVtYmVy JywKKyAgICAgICAgICAgICdnaXRodWIudGl0bGUnLAorICAgICAgICAgICAgJ2dpdGh1Yi5oZWFk LnJlZicsCisgICAgICAgICAgICAnZ2l0aHViLmJhc2Uuc2hhJywKKyAgICAgICAgICAgICdnaXRo dWIuaGVhZC5yZXBvLmZ1bGxfbmFtZScsCisgICAgICAgIF0sCisgICAgKSwKKykKIAogaWYgbm90 IGlzX3Rlc3RfbW9kZV9lbmFibGVkOgogICAgIGFkbWluX3VzZXJuYW1lID0gb3MuZ2V0ZW52KCdF V1NfQURNSU5fVVNFUk5BTUUnKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weSBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKaW5kZXggYWRm NzQ2NTFhNjU4MjFiN2ZlMDFjMWYxYzgyNjE3MTBmZDM4MDZhOS4uNjE5ODJkMTIwZDc0MjdjZDdj YmZlNjJhNWE1ZjY3ZGRkYjM5ZDZmNSAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1i dWlsZC9zdGVwcy5weQorKysgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CkBA IC01NSw3ICs1NSw4IEBAIFJFU1VMVFNfREJfVVJMID0gJ2h0dHBzOi8vcmVzdWx0cy53ZWJraXQu b3JnLycKIFdpdGhQcm9wZXJ0aWVzID0gcHJvcGVydGllcy5XaXRoUHJvcGVydGllcwogSW50ZXJw b2xhdGUgPSBwcm9wZXJ0aWVzLkludGVycG9sYXRlCiBCUkFOQ0hfUFJfUkUgPSByZS5jb21waWxl KHInXnJlZnMvcHVsbC8oP1A8aWQ+XGQrKS9tZXJnZSQnKQotR0lUSFVCX1JFUE9TSVRPUklFUyA9 IFsnaHR0cHM6Ly9naXRodWIuY29tL1dlYktpdC9XZWJLaXQnXQorR0lUSFVCX1VSTCA9ICdodHRw czovL2dpdGh1Yi5jb20vJworR0lUSFVCX1BST0pFQ1RTID0gWydXZWJLaXQvV2ViS2l0J10KIAog CiBjbGFzcyBCdWZmZXJMb2dIZWFkZXJPYnNlcnZlcihsb2dvYnNlcnZlci5CdWZmZXJMb2dPYnNl cnZlcik6CkBAIC03MSwzMiArNzIsMjQgQEAgY2xhc3MgQnVmZmVyTG9nSGVhZGVyT2JzZXJ2ZXIo bG9nb2JzZXJ2ZXIuQnVmZmVyTG9nT2JzZXJ2ZXIpOgogICAgICAgICByZXR1cm4gc2VsZi5fZ2V0 KHNlbGYuaGVhZGVycykKIAogCi1jbGFzcyBHaXRIdWJNaXhpbihvYmplY3QpOgotICAgIGRlZiBw cl91cmwoc2VsZiwgcHJfbnVtYmVyPU5vbmUpOgotICAgICAgICBwcl9udW1iZXIgPSBwcl9udW1i ZXIgb3Igc2VsZi5nZXRfcHVsbF9yZXF1ZXN0X251bWJlcigpCi0gICAgICAgIGlmIG5vdCBwcl9u dW1iZXI6Ci0gICAgICAgICAgICByZXR1cm4gJycKLSAgICAgICAgcmV0dXJuICd7fS9wdWxsL3t9 Jy5mb3JtYXQoc2VsZi5nZXRQcm9wZXJ0eSgncmVwb3NpdG9yeScsICctJyksIHByX251bWJlcikK LQotICAgIGRlZiBnZXRfcHVsbF9yZXF1ZXN0X251bWJlcihzZWxmKToKLSAgICAgICAgcHJfbnVt YmVyID0gc2VsZi5nZXRQcm9wZXJ0eSgncHVsbF9yZXF1ZXN0JykKLSAgICAgICAgaWYgcHJfbnVt YmVyOgotICAgICAgICAgICAgcmV0dXJuIGludChwcl9udW1iZXIpCitjbGFzcyBHaXRIdWIob2Jq ZWN0KToKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgcmVwb3NpdG9yeV91cmxzKGNscyk6Cisg ICAgICAgIHJldHVybiBbR0lUSFVCX1VSTCArIHByb2plY3QgZm9yIHByb2plY3QgaW4gR0lUSFVC X1BST0pFQ1RTXQogCi0gICAgICAgIGlmIHNlbGYuZ2V0UHJvcGVydHkoJ2V2ZW50JykgIT0gJ3B1 bGxfcmVxdWVzdCc6Ci0gICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICBpZiBzZWxmLmdl dFByb3BlcnR5KCdyZXBvc2l0b3J5Jykgbm90IGluIEdJVEhVQl9SRVBPU0lUT1JJRVM6Ci0gICAg ICAgICAgICByZXR1cm4gTm9uZQorICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBwcl91cmwoY2xz LCBwcl9udW1iZXIsIHJlcG9zaXRvcnlfdXJsPU5vbmUpOgorICAgICAgICBpZiBub3QgcmVwb3Np dG9yeV91cmw6CisgICAgICAgICAgICByZXBvc2l0b3J5X3VybCA9ICd7fXt9Jy5mb3JtYXQoR0lU SFVCX1VSTCwgR0lUSFVCX1BST0pFQ1RTWzBdKQogCi0gICAgICAgIG1hdGNoID0gQlJBTkNIX1BS X1JFLm1hdGNoKHNlbGYuZ2V0UHJvcGVydHkoJ2JyYW5jaCcsICcnKSkKLSAgICAgICAgaWYgbm90 IG1hdGNoOgotICAgICAgICAgICAgcmV0dXJuIE5vbmUKLSAgICAgICAgcHJfbnVtYmVyID0gaW50 KG1hdGNoLmdyb3VwKCdpZCcpKQotICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwdWxsX3JlcXVl c3QnLCBwcl9udW1iZXIpCi0gICAgICAgIHJldHVybiBwcl9udW1iZXIKKyAgICAgICAgaWYgcmVw b3NpdG9yeV91cmwgbm90IGluIEdpdEh1Yi5yZXBvc2l0b3J5X3VybHMoKToKKyAgICAgICAgICAg IHJldHVybiAnJworICAgICAgICBpZiBub3QgcHJfbnVtYmVyIG9yIGlzaW5zdGFuY2UocHJfbnVt YmVyLCBpbnQpOgorICAgICAgICAgICAgcmV0dXJuICcnCisgICAgICAgIHJldHVybiAne31wdWxs L3t9Jy5mb3JtYXQocmVwb3NpdG9yeV91cmwsIHByX251bWJlcikKIAogCi1jbGFzcyBDb25maWd1 cmVCdWlsZChidWlsZHN0ZXAuQnVpbGRTdGVwLCBHaXRIdWJNaXhpbik6CitjbGFzcyBDb25maWd1 cmVCdWlsZChidWlsZHN0ZXAuQnVpbGRTdGVwKToKICAgICBuYW1lID0gJ2NvbmZpZ3VyZS1idWls ZCcKICAgICBkZXNjcmlwdGlvbiA9IFsnY29uZmlndXJpbmcgYnVpbGQnXQogICAgIGRlc2NyaXB0 aW9uRG9uZSA9IFsnQ29uZmlndXJlZCBidWlsZCddCkBAIC0xNDcsOSArMTQwLDE1IEBAIGNsYXNz IENvbmZpZ3VyZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXAsIEdpdEh1Yk1peGluKToKICAgICAg ICAgICAgIHNlbGYuYWRkVVJMKCdQYXRjaCB7fScuZm9ybWF0KHBhdGNoX2lkKSwgQnVnemlsbGEu cGF0Y2hfdXJsKHBhdGNoX2lkKSkKIAogICAgIGRlZiBhZGRfcHJfZGV0YWlscyhzZWxmKToKLSAg ICAgICAgcHJfbnVtYmVyID0gc2VsZi5nZXRfcHVsbF9yZXF1ZXN0X251bWJlcigpCisgICAgICAg IHByX251bWJlciA9IHNlbGYuZ2V0UHJvcGVydHkoJ2dpdGh1Yi5udW1iZXInKQogICAgICAgICBp ZiBwcl9udW1iZXI6Ci0gICAgICAgICAgICBzZWxmLmFkZFVSTCgnUHVsbCByZXF1ZXN0IHt9Jy5m b3JtYXQocHJfbnVtYmVyKSwgc2VsZi5wcl91cmwocHJfbnVtYmVyPXByX251bWJlcikpCisgICAg ICAgICAgICBzZWxmLmFkZFVSTCgKKyAgICAgICAgICAgICAgICAnUHVsbCByZXF1ZXN0IHt9Jy5m b3JtYXQocHJfbnVtYmVyKSwKKyAgICAgICAgICAgICAgICBHaXRIdWIucHJfdXJsKAorICAgICAg ICAgICAgICAgICAgICBwcl9udW1iZXI9cHJfbnVtYmVyLAorICAgICAgICAgICAgICAgICAgICBy ZXBvc2l0b3J5X3VybD1zZWxmLmdldFByb3BlcnR5KCdyZXBvc2l0b3J5JyksCisgICAgICAgICAg ICAgICAgKSBvciAnJywKKyAgICAgICAgICAgICkKIAogCiBjbGFzcyBDaGVja091dFNvdXJjZShn aXQuR2l0KToK 448988 2022-01-12 13:09:51 -0800 2022-01-12 13:09:51 -0800 Patch bug-235033-20220112130950.patch text/plain 8105 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3OTQyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2QxMzZlMWU3ZDM5ZmRmNjk4Y2Y0NmY1N2ZkZjZkYmRm NGFiMzFjYS4uNWQwMGRjZDE5NzE1MGI0MTQxNTliZjhkODA3Zjc5NWYxYWJkNDhiMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIyLTAxLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbRVdTXSBBY2NlcHQgR2l0SHViIGhvb2tzIChQYXJ0IDEpCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUwMzMKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzg3MzQ1MjY5PgorCisgICAgICAgIFJldmlld2VkIGJ5IEFha2FzaCBKYWluLgor CisgICAgICAgIFRyaWdnZXIgYSBzdWJzZXQgb2YgcXVldWVzIGZvciBpbmNvbWluZyBHaXRIdWIg cHVsbC1yZXF1ZXN0cy4KKworICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpz b246IEVuYWJsZSB3ZWJraXRwZXJsLCB3ZWJraXRweSwgc2VydmljZXMgYW5kIHN0eWxlIGNoZWNr cy4KKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWdfdW5pdHRlc3QucHk6 CisgICAgICAgIChDb25maWdEb3RKU09OVGVzdCk6CisgICAgICAgIChDb25maWdEb3RKU09OVGVz dC50ZXN0X211bHRpcGxlX3NjaGVkdWVyc19mb3JfYnVpbGRlcik6CisgICAgICAgICogQ0lTdXBw b3J0L2V3cy1idWlsZC9tYXN0ZXIuY2ZnOiBBY2NlcHQgR2l0SHViIGhvb2tzLCBzcGVjaWZ5IHZh cmlhYmxlcworICAgICAgICB0byBleHRyYWN0IGZyb20gaW5jb21pbmcgcmVxdWVzdC4KKyAgICAg ICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoR2l0SHViKToKKyAg ICAgICAgKEdpdEh1Yi5yZXBvc2l0b3J5X3VybHMpOiBDb25jYXRlbmF0ZSBhbGwgdmFsaWQgcHJv amVjdHMgd2l0aCB0aGUgYmFzZSBVUkwuCisgICAgICAgIChHaXRIdWIucHJfdXJsKTogR2l2ZW4g YSByZXBvc2l0b3J5IGFuZCBwdWxsLXJlcXVlc3QgbnVtYmVyLCByZXR1cm4gdGhlIFVSTAorICAg ICAgICBmb3IgdGhhdCBwdWxsLXJlcXVlc3QuCisgICAgICAgIChDb25maWd1cmVCdWlsZC5hZGRf cHJfZGV0YWlscyk6CisgICAgICAgIChHaXRIdWJNaXhpbik6IERlbGV0ZWQuCisKIDIwMjItMDEt MTEgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJQYWdl UHJveHkgZGVzdHJ1Y3Rpb24gc2hvdWxkIG5vdCBsYXVuY2ggYSBuZXR3b3JrIHByb2Nlc3MKZGlm ZiAtLWdpdCBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpzb24gYi9Ub29scy9D SVN1cHBvcnQvZXdzLWJ1aWxkL2NvbmZpZy5qc29uCmluZGV4IDRlMzM3ZWRjMzRhYjI5OWRhOTRk NzZhMDVlYzg5YjRmNTFiNzAyMTUuLmM5YWFhZjE4ZGE3MmY5NmZjNjc5MzU3YjBhNGUwMmNkYzE4 M2Q4NWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpzb24K KysrIGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9jb25maWcuanNvbgpAQCAtMzQ2LDYgKzM0 NiwxMyBAQAogICAgICAgInR5cGUiOiAiVHJ5X1VzZXJwYXNzIiwgIm5hbWUiOiAidHJ5X2NvbW1p dHF1ZXVlIiwgInBvcnQiOiA1NTU3LAogICAgICAgImJ1aWxkZXJOYW1lcyI6IFsiQ29tbWl0LVF1 ZXVlIl0KICAgICB9LAorICAgIHsKKyAgICAgICJ0eXBlIjogIkFueUJyYW5jaFNjaGVkdWxlciIs ICJuYW1lIjogInB1bGxyZXF1ZXN0IiwKKyAgICAgICJidWlsZGVyTmFtZXMiOiBbCisgICAgICAg ICAgICAiU2VydmljZXMtRVdTIiwgIlN0eWxlLUVXUyIsICJTdHlsZS1FV1MiLAorICAgICAgICAg ICAgIldlYktpdFBlcmwtVGVzdHMtRVdTIiwgIldlYktpdFB5LVRlc3RzLUVXUyIKKyAgICAgIF0K KyAgICB9LAogICAgIHsKICAgICAgICJ0eXBlIjogIlRyaWdnZXJhYmxlIiwgIm5hbWUiOiAibWFj b3MtY2F0YWxpbmEtZGVidWctYnVpbGQtZXdzIiwKICAgICAgICJidWlsZGVyTmFtZXMiOiBbIm1h Y09TLUNhdGFsaW5hLURlYnVnLUJ1aWxkLUVXUyJdCmRpZmYgLS1naXQgYS9Ub29scy9DSVN1cHBv cnQvZXdzLWJ1aWxkL2xvYWRDb25maWdfdW5pdHRlc3QucHkgYi9Ub29scy9DSVN1cHBvcnQvZXdz LWJ1aWxkL2xvYWRDb25maWdfdW5pdHRlc3QucHkKaW5kZXggMDE2NGVlZGI1OTA3Nzk4MWU2Y2Rm YmVlOTQzNmEwYmUzYWUwNTM3Mi4uOWFmNWNjZGFiYzJhZGEzMDJhNjlhNDYzZWZiZWZjZTIzNTEz MWUyMiAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmlnX3Vu aXR0ZXN0LnB5CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvbG9hZENvbmZpZ191bml0 dGVzdC5weQpAQCAtMzEsNiArMzEsOCBAQCBpbXBvcnQgbG9hZENvbmZpZwogCiAKIGNsYXNzIENv bmZpZ0RvdEpTT05UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICBEVVBMSUNBVEVEX1RSSUdH RVJTID0gWyd0cnknLCAncHVsbHJlcXVlc3QnXQorCiAgICAgZGVmIGdldF9jb25maWcoc2VsZik6 CiAgICAgICAgIGN3ZCA9IG9zLnBhdGguZGlybmFtZShvcy5wYXRoLmFic3BhdGgoX19maWxlX18p KQogICAgICAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKGN3ZCwgJ2NvbmZpZy5qc29uJyksICdy JykgYXMgY29uZmlnOgpAQCAtNzIsNyArNzQsMTAgQEAgY2xhc3MgQ29uZmlnRG90SlNPTlRlc3Qo dW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgaWYgc2NoZWR1bGVyWyduYW1lJ10gaW4g dHJpZ2dlcmVkX2J5X3NjaGVkdWxlcnM6CiAgICAgICAgICAgICAgICAgY29udGludWUKICAgICAg ICAgICAgIGZvciBidWlsZGVybmFtZSBpbiBzY2hlZHVsZXIuZ2V0KCdidWlsZGVyTmFtZXMnKToK LSAgICAgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoYnVpbGRlcm5hbWUgbm90IGluIGJ1aWxk ZXJfdG9fc2NoZHVsZXJfbWFwLCAnYnVpbGRlciB7fSBhcHBlYXJzIG11bHRpcGxlIHRpbWVzIGlu IHNjaGVkdWxlcnMuJy5mb3JtYXQoYnVpbGRlcm5hbWUpKQorICAgICAgICAgICAgICAgIGlmIHNj aGVkdWxlci5nZXQoJ25hbWUnKSBpbiBzZWxmLkRVUExJQ0FURURfVFJJR0dFUlMgYW5kIGJ1aWxk ZXJfdG9fc2NoZHVsZXJfbWFwLmdldChidWlsZGVybmFtZSk6CisgICAgICAgICAgICAgICAgICAg IHNlbGYuYXNzZXJ0VHJ1ZShidWlsZGVyX3RvX3NjaGR1bGVyX21hcFtidWlsZGVybmFtZV0gaW4g c2VsZi5EVVBMSUNBVEVEX1RSSUdHRVJTKQorICAgICAgICAgICAgICAgIGVsc2U6CisgICAgICAg ICAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShidWlsZGVybmFtZSBub3QgaW4gYnVpbGRlcl90 b19zY2hkdWxlcl9tYXAsICdidWlsZGVyIHt9IGFwcGVhcnMgbXVsdGlwbGUgdGltZXMgaW4gc2No ZWR1bGVycy4nLmZvcm1hdChidWlsZGVybmFtZSkpCiAgICAgICAgICAgICAgICAgYnVpbGRlcl90 b19zY2hkdWxlcl9tYXBbYnVpbGRlcm5hbWVdID0gc2NoZWR1bGVyLmdldCgnbmFtZScpCiAKICAg ICBkZWYgdGVzdF9zY2hkdWxlcl9jb250YWluc192YWxpZF9idWlsZGVyX25hbWUoc2VsZik6CmRp ZmYgLS1naXQgYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL21hc3Rlci5jZmcgYi9Ub29scy9D SVN1cHBvcnQvZXdzLWJ1aWxkL21hc3Rlci5jZmcKaW5kZXggOWU0MGU1YjQ5Mjc2ZTBhOGI4ZWEx YmE5NGY4ODVjYWY2NzkzODZlMC4uMjVhNDhkYTU4ZjE1MjYwOGY5MDQxZTRkODU0Mjc4OTFiNmIz ZmFhZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9tYXN0ZXIuY2ZnCisr KyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvbWFzdGVyLmNmZwpAQCAtOCw2ICs4LDE4IEBA IGZyb20gZGF0ZXRpbWUgaW1wb3J0IHRpbWVkZWx0YQogaW1wb3J0IGxvYWRDb25maWcKIGZyb20g ZXZlbnRzIGltcG9ydCBFdmVudHMKIAorCitkZWYgbG9hZF9wYXNzd29yZChuYW1lKToKKyAgICBp ZiBvcy5nZXRlbnYobmFtZSk6CisgICAgICAgIHJldHVybiBvcy5nZXRlbnYobmFtZSkKKyAgICB0 cnk6CisgICAgICAgIHBhc3N3b3JkcyA9IGpzb24ubG9hZChvcGVuKCdwYXNzd29yZHMuanNvbicp KQorICAgICAgICByZXR1cm4gcGFzc3dvcmRzLmdldChuYW1lLCBOb25lKQorICAgIGV4Y2VwdCBF eGNlcHRpb24gYXMgZToKKyAgICAgICAgcHJpbnQoJ0Vycm9yIGluIGZpbmRpbmcge30gaW4gcGFz c3dvcmRzLmpzb24nLmZvcm1hdChuYW1lKSkKKyAgICAgICAgcmV0dXJuIE5vbmUKKworCiAjIFRo aXMgaXMgd29yay1hcm91bmQgZm9yIFR3aXN0ZWQgaGF2aW5nIGEgc21hbGwgc2l6ZSBsaW1pdCBm b3IgcGF0Y2hlcy4gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTg4NTEjYzUKIGZyb20gdHdpc3RlZC5zcHJlYWQgaW1wb3J0IGJhbmFuYQogYmFuYW5hLlNJWkVf TElNSVQgPSAxMDAgKiAxMDI0ICogMTAyNApAQCAtMjgsNiArNDAsMTggQEAgY1snd3d3J11bJ3Vp X2RlZmF1bHRfY29uZmlnJ10gPSB7CiAgICAgJ0J1aWxkZXJzLmJ1aWxkRmV0Y2hMaW1pdCc6IDEw MDAsCiAgICAgJ1dvcmtlcnMuc2hvd1dvcmtlckJ1aWxkZXJzJzogVHJ1ZSwKIH0KK2NbJ3d3dydd WydjaGFuZ2VfaG9va19kaWFsZWN0cyddID0gZGljdCgKKyAgICBnaXRodWI9ZGljdCgKKyAgICAg ICAgc2VjcmV0PWxvYWRfcGFzc3dvcmQoJ0dJVEhVQl9IT09LX1NFQ1JFVCcpLAorICAgICAgICBn aXRodWJfcHJvcGVydHlfd2hpdGVsaXN0PVsKKyAgICAgICAgICAgICdnaXRodWIubnVtYmVyJywK KyAgICAgICAgICAgICdnaXRodWIudGl0bGUnLAorICAgICAgICAgICAgJ2dpdGh1Yi5oZWFkLnJl ZicsCisgICAgICAgICAgICAnZ2l0aHViLmJhc2Uuc2hhJywKKyAgICAgICAgICAgICdnaXRodWIu aGVhZC5yZXBvLmZ1bGxfbmFtZScsCisgICAgICAgIF0sCisgICAgKSwKKykKIAogaWYgbm90IGlz X3Rlc3RfbW9kZV9lbmFibGVkOgogICAgIGFkbWluX3VzZXJuYW1lID0gb3MuZ2V0ZW52KCdFV1Nf QURNSU5fVVNFUk5BTUUnKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9z dGVwcy5weSBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKaW5kZXggYWRmNzQ2 NTFhNjU4MjFiN2ZlMDFjMWYxYzgyNjE3MTBmZDM4MDZhOS4uMmJiMDM5ODA3N2NkMmYxZjM0ZTdk MjAyMTkwYjc3YTBmMDczZmVkYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weQorKysgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CkBAIC01 NSw3ICs1NSw4IEBAIFJFU1VMVFNfREJfVVJMID0gJ2h0dHBzOi8vcmVzdWx0cy53ZWJraXQub3Jn LycKIFdpdGhQcm9wZXJ0aWVzID0gcHJvcGVydGllcy5XaXRoUHJvcGVydGllcwogSW50ZXJwb2xh dGUgPSBwcm9wZXJ0aWVzLkludGVycG9sYXRlCiBCUkFOQ0hfUFJfUkUgPSByZS5jb21waWxlKHIn XnJlZnMvcHVsbC8oP1A8aWQ+XGQrKS9tZXJnZSQnKQotR0lUSFVCX1JFUE9TSVRPUklFUyA9IFsn aHR0cHM6Ly9naXRodWIuY29tL1dlYktpdC9XZWJLaXQnXQorR0lUSFVCX1VSTCA9ICdodHRwczov L2dpdGh1Yi5jb20vJworR0lUSFVCX1BST0pFQ1RTID0gWydXZWJLaXQvV2ViS2l0J10KIAogCiBj bGFzcyBCdWZmZXJMb2dIZWFkZXJPYnNlcnZlcihsb2dvYnNlcnZlci5CdWZmZXJMb2dPYnNlcnZl cik6CkBAIC03MSwzMiArNzIsMjQgQEAgY2xhc3MgQnVmZmVyTG9nSGVhZGVyT2JzZXJ2ZXIobG9n b2JzZXJ2ZXIuQnVmZmVyTG9nT2JzZXJ2ZXIpOgogICAgICAgICByZXR1cm4gc2VsZi5fZ2V0KHNl bGYuaGVhZGVycykKIAogCi1jbGFzcyBHaXRIdWJNaXhpbihvYmplY3QpOgotICAgIGRlZiBwcl91 cmwoc2VsZiwgcHJfbnVtYmVyPU5vbmUpOgotICAgICAgICBwcl9udW1iZXIgPSBwcl9udW1iZXIg b3Igc2VsZi5nZXRfcHVsbF9yZXF1ZXN0X251bWJlcigpCi0gICAgICAgIGlmIG5vdCBwcl9udW1i ZXI6Ci0gICAgICAgICAgICByZXR1cm4gJycKLSAgICAgICAgcmV0dXJuICd7fS9wdWxsL3t9Jy5m b3JtYXQoc2VsZi5nZXRQcm9wZXJ0eSgncmVwb3NpdG9yeScsICctJyksIHByX251bWJlcikKLQot ICAgIGRlZiBnZXRfcHVsbF9yZXF1ZXN0X251bWJlcihzZWxmKToKLSAgICAgICAgcHJfbnVtYmVy ID0gc2VsZi5nZXRQcm9wZXJ0eSgncHVsbF9yZXF1ZXN0JykKLSAgICAgICAgaWYgcHJfbnVtYmVy OgotICAgICAgICAgICAgcmV0dXJuIGludChwcl9udW1iZXIpCitjbGFzcyBHaXRIdWIob2JqZWN0 KToKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgcmVwb3NpdG9yeV91cmxzKGNscyk6CisgICAg ICAgIHJldHVybiBbR0lUSFVCX1VSTCArIHByb2plY3QgZm9yIHByb2plY3QgaW4gR0lUSFVCX1BS T0pFQ1RTXQogCi0gICAgICAgIGlmIHNlbGYuZ2V0UHJvcGVydHkoJ2V2ZW50JykgIT0gJ3B1bGxf cmVxdWVzdCc6Ci0gICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICBpZiBzZWxmLmdldFBy b3BlcnR5KCdyZXBvc2l0b3J5Jykgbm90IGluIEdJVEhVQl9SRVBPU0lUT1JJRVM6Ci0gICAgICAg ICAgICByZXR1cm4gTm9uZQorICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBwcl91cmwoY2xzLCBw cl9udW1iZXIsIHJlcG9zaXRvcnlfdXJsPU5vbmUpOgorICAgICAgICBpZiBub3QgcmVwb3NpdG9y eV91cmw6CisgICAgICAgICAgICByZXBvc2l0b3J5X3VybCA9ICd7fXt9Jy5mb3JtYXQoR0lUSFVC X1VSTCwgR0lUSFVCX1BST0pFQ1RTWzBdKQogCi0gICAgICAgIG1hdGNoID0gQlJBTkNIX1BSX1JF Lm1hdGNoKHNlbGYuZ2V0UHJvcGVydHkoJ2JyYW5jaCcsICcnKSkKLSAgICAgICAgaWYgbm90IG1h dGNoOgotICAgICAgICAgICAgcmV0dXJuIE5vbmUKLSAgICAgICAgcHJfbnVtYmVyID0gaW50KG1h dGNoLmdyb3VwKCdpZCcpKQotICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwdWxsX3JlcXVlc3Qn LCBwcl9udW1iZXIpCi0gICAgICAgIHJldHVybiBwcl9udW1iZXIKKyAgICAgICAgaWYgcmVwb3Np dG9yeV91cmwgbm90IGluIEdpdEh1Yi5yZXBvc2l0b3J5X3VybHMoKToKKyAgICAgICAgICAgIHJl dHVybiAnJworICAgICAgICBpZiBub3QgcHJfbnVtYmVyIG9yIG5vdCBpc2luc3RhbmNlKHByX251 bWJlciwgaW50KToKKyAgICAgICAgICAgIHJldHVybiAnJworICAgICAgICByZXR1cm4gJ3t9cHVs bC97fScuZm9ybWF0KHJlcG9zaXRvcnlfdXJsLCBwcl9udW1iZXIpCiAKIAotY2xhc3MgQ29uZmln dXJlQnVpbGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCwgR2l0SHViTWl4aW4pOgorY2xhc3MgQ29uZmln dXJlQnVpbGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgbmFtZSA9ICdjb25maWd1cmUtYnVp bGQnCiAgICAgZGVzY3JpcHRpb24gPSBbJ2NvbmZpZ3VyaW5nIGJ1aWxkJ10KICAgICBkZXNjcmlw dGlvbkRvbmUgPSBbJ0NvbmZpZ3VyZWQgYnVpbGQnXQpAQCAtMTQ3LDkgKzE0MCw5IEBAIGNsYXNz IENvbmZpZ3VyZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXAsIEdpdEh1Yk1peGluKToKICAgICAg ICAgICAgIHNlbGYuYWRkVVJMKCdQYXRjaCB7fScuZm9ybWF0KHBhdGNoX2lkKSwgQnVnemlsbGEu cGF0Y2hfdXJsKHBhdGNoX2lkKSkKIAogICAgIGRlZiBhZGRfcHJfZGV0YWlscyhzZWxmKToKLSAg ICAgICAgcHJfbnVtYmVyID0gc2VsZi5nZXRfcHVsbF9yZXF1ZXN0X251bWJlcigpCisgICAgICAg IHByX251bWJlciA9IHNlbGYuZ2V0UHJvcGVydHkoJ2dpdGh1Yi5udW1iZXInKQogICAgICAgICBp ZiBwcl9udW1iZXI6Ci0gICAgICAgICAgICBzZWxmLmFkZFVSTCgnUHVsbCByZXF1ZXN0IHt9Jy5m b3JtYXQocHJfbnVtYmVyKSwgc2VsZi5wcl91cmwocHJfbnVtYmVyPXByX251bWJlcikpCisgICAg ICAgICAgICBzZWxmLmFkZFVSTCgnUHVsbCByZXF1ZXN0IHt9Jy5mb3JtYXQocHJfbnVtYmVyKSwg R2l0SHViLnByX3VybChwcl9udW1iZXI9cHJfbnVtYmVyLCByZXBvc2l0b3J5X3VybD1zZWxmLmdl dFByb3BlcnR5KCdyZXBvc2l0b3J5JykpIG9yICcnKQogCiAKIGNsYXNzIENoZWNrT3V0U291cmNl KGdpdC5HaXQpOgo=