231176 2021-10-04 10:18:58 -0700 [webkitscmpy] Share cache between processes 2021-10-07 16:00:24 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard dewei_zhu slewis webkit-bug-importer oldest_to_newest 1800106 0 jbedard 2021-10-04 10:18:58 -0700 Processes running on the same machine and in the same directory should not duplicate work populating identifiers.json. Instead, the cache should be shared between processes. 1800107 1 webkit-bug-importer 2021-10-04 10:19:23 -0700 <rdar://problem/83841221> 1800127 2 440077 jbedard 2021-10-04 10:57:17 -0700 Created attachment 440077 Patch 1801394 3 440449 jbedard 2021-10-06 15:54:34 -0700 Created attachment 440449 Patch 1801395 4 440450 jbedard 2021-10-06 15:55:15 -0700 Created attachment 440450 Patch 1801801 5 440450 dewei_zhu 2021-10-07 14:47:50 -0700 Comment on attachment 440450 Patch r=me 1801815 6 440545 jbedard 2021-10-07 15:11:37 -0700 Created attachment 440545 Patch for landing 1801839 7 ews-feeder 2021-10-07 16:00:23 -0700 Committed r283751 (242673@main): <https://commits.webkit.org/242673@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440545. 440077 2021-10-04 10:57:17 -0700 2021-10-07 15:11:33 -0700 Patch bug-231176-20211004105716.patch text/plain 15485 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2M1NDg1MzlhMWMwZDhmZjAyYTMwMGFjMDg5ZGJhMzU0 OTVmZTk0Ni4uZDlhMWY1ZDdkYjAzNGFmYzcwZWUxNjhiNjdiYTE4NDI0YWEyMDZlNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDIxLTEwLTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIFNoYXJlIGNhY2hlIGJldHdlZW4gcHJvY2Vzc2VzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzExNzYKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzgzODQxMjIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEdlbmVyYXRpbmcgdGhlIGlkZW50aWZpZXIgY2FjaGUgaXMg bW9yZSBleHBlbnNpdmUgdGhhbiByZWFkaW5nIGEgZmlsZSB3aXRoCisgICAgICAgIHRoYXQgY2Fj aGUgaW4gaXQuIFRoaXMgaXMgcGFydGljdWxhcmx5IHJlbGV2YW50IGZvciB3ZWJzZXJ2ZXJzLCB3 aGljaCBhcmUKKyAgICAgICAgbGlrZWx5IHJ1bm5pbmcgbXVsdGlwbGUgcHJvY2Vzc2VzLgorCisg ICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwv Z2l0LnB5OgorICAgICAgICAoR2l0LkNhY2hlLl9faW5pdF9fKTogTW92ZSBjYWNoZSBsb2FkaW5n IGludG8gImxvYWQiIGZ1bmN0aW9uLgorICAgICAgICAoR2l0LkNhY2hlLmxvYWQpOiBPcGVuIGNh Y2hlIGZpbGUuCisgICAgICAgIChHaXQuQ2FjaGUubG9jayk6IEFjcXVpcmUgbG9ja2ZpbGUsIGlm IHByb2Nlc3MgaGFzIG5vdCBhbHJlYWR5IGFxdWlyZWQgdGhlIGxvY2suCisgICAgICAgIChHaXQu Q2FjaGUucG9wdWxhdGUpOiBBY3F1aXJlIGxvY2sgYmVmb3JlIHBvcHVsYXRpbmcgY2FjaGUuCisg ICAgICAgIChHaXQuQ2FjaGUudG9faGFzaCk6IElmIHdlIGZhaWwgdG8gZmluZCBhIG1hdGNoLCBh dHRlbXB0IHRvIGxvYWQgdGhlIGZpbGUKKyAgICAgICAgYmVmb3JlIHBvcHVsYXRpbmcgdGhlIGZp bGUuCisgICAgICAgIChHaXQuQ2FjaGUudG9fcmV2aXNpb24pOiBEaXR0by4KKyAgICAgICAgKEdp dC5DYWNoZS50b19pZGVudGlmaWVyKTogRGl0dG8uCisKIDIwMjEtMTAtMDQgIEFha2FzaCBKYWlu ICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFNlbmQgRVdTIGV4Y2VwdGlvbiBl bWFpbHMgdG8gYm90IHdhdGNoZXJzIGluc3RlYWQgb2YgQWFrYXNoCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkg Yi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9n aXQucHkKaW5kZXggMjE1OTgzOTcxYWVhNTljMzRkYWE3NDljMWFhZWI2Y2FhYjc4YWZmMi4uY2M3 MGNjNGEwYjRlNjAxZmQxNmFhM2U4YjIyMGVjMWM2YWM5NzcwZSAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2Fs L2dpdC5weQpAQCAtMjEsNiArMjEsNyBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBvcnQgY2FsZW5k YXIKK2ltcG9ydCBjb250ZXh0bGliCiBpbXBvcnQgbG9nZ2luZwogaW1wb3J0IG9zCiBpbXBvcnQg anNvbgpAQCAtMzIsNyArMzMsNyBAQCBpbXBvcnQgdGltZQogCiBmcm9tIGRhdGV0aW1lIGltcG9y dCBkYXRldGltZSwgdGltZWRlbHRhCiAKLWZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBydW4sIGRl Y29yYXRvcnMsIE5lc3RlZEZ1enp5RGljdAorZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IHJ1biwg ZGVjb3JhdG9ycywgTmVzdGVkRnV6enlEaWN0LCBGaWxlTG9jawogZnJvbSB3ZWJraXRzY21weS5s b2NhbCBpbXBvcnQgU2NtCiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCByZW1vdGUsIENvbW1pdCwg Q29udHJpYnV0b3IsIGxvZwogZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgQ29tbWl0LCBDb250cmli dXRvciwgbG9nCkBAIC00OCw3ICs0OSwxMSBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgICAg IHNlbGYuX3JldmlzaW9uc190b19pZGVudGlmaWVycyA9IHt9CiAgICAgICAgICAgICBzZWxmLl9s YXN0X3BvcHVsYXRlZCA9IHt9CiAgICAgICAgICAgICBzZWxmLl9ndXJhbnRlZWRfZm9yID0gZ3Vy YW50ZWVkX2ZvcgorICAgICAgICAgICAgc2VsZi5fbG9ja2VkID0gMAogCisgICAgICAgICAgICBz ZWxmLmxvYWQoKQorCisgICAgICAgIGRlZiBsb2FkKHNlbGYpOgogICAgICAgICAgICAgaWYgbm90 IG9zLnBhdGguZXhpc3RzKHNlbGYucGF0aCk6CiAgICAgICAgICAgICAgICAgcmV0dXJuCiAKQEAg LTcwLDYgKzc1LDI0IEBAIGNsYXNzIEdpdChTY20pOgogICAgICAgICBkZWYgcGF0aChzZWxmKToK ICAgICAgICAgICAgIHJldHVybiBvcy5wYXRoLmpvaW4oc2VsZi5yZXBvLnJvb3RfcGF0aCwgJy5n aXQnLCAnaWRlbnRpZmllcnMuanNvbicpCiAKKyAgICAgICAgQGNvbnRleHRsaWIuY29udGV4dG1h bmFnZXIKKyAgICAgICAgZGVmIGxvY2soc2VsZik6CisgICAgICAgICAgICBmaWxlID0gTm9uZQor ICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIHNlbGYuX2xvY2tlZCArPSAxCisgICAg ICAgICAgICAgICAgaWYgc2VsZi5fbG9ja2VkID4gMToKKyAgICAgICAgICAgICAgICAgICAgeWll bGQKKyAgICAgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgICAgICBmaWxlID0gRmls ZUxvY2sob3MucGF0aC5qb2luKHNlbGYucmVwby5yb290X3BhdGgsICcuZ2l0JywgJ2lkZW50aWZp ZXJzLmxvY2snKSkKKyAgICAgICAgICAgICAgICAgICAgZmlsZS5hY3F1aXJlKCkKKyAgICAgICAg ICAgICAgICAgICAgeWllbGQKKyAgICAgICAgICAgIGV4Y2VwdCBPU0Vycm9yOgorICAgICAgICAg ICAgICAgIHlpZWxkCisgICAgICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgICAgIHNlbGYu X2xvY2tlZCAtPSAxCisgICAgICAgICAgICAgICAgaWYgZmlsZToKKyAgICAgICAgICAgICAgICAg ICAgZmlsZS5yZWxlYXNlKCkKKwogICAgICAgICBkZWYgX2ZpbGwoc2VsZiwgYnJhbmNoKToKICAg ICAgICAgICAgIGRlZmF1bHRfYnJhbmNoID0gc2VsZi5yZXBvLmRlZmF1bHRfYnJhbmNoCiAgICAg ICAgICAgICBpZiBicmFuY2ggPT0gZGVmYXVsdF9icmFuY2g6CkBAIC0xMDAsOTkgKzEyMywxMDEg QEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICAgICAgICAgcmV0dXJuCiAgICAgICAgICAgICBp ZiBzZWxmLl9sYXN0X3BvcHVsYXRlZC5nZXQoYnJhbmNoLCAwKSArIHNlbGYuX2d1cmFudGVlZF9m b3IgPiB0aW1lLnRpbWUoKToKICAgICAgICAgICAgICAgICByZXR1cm4KLSAgICAgICAgICAgIGRl ZmF1bHRfYnJhbmNoID0gc2VsZi5yZXBvLmRlZmF1bHRfYnJhbmNoCi0gICAgICAgICAgICBpc19k ZWZhdWx0X2JyYW5jaCA9IGJyYW5jaCA9PSBkZWZhdWx0X2JyYW5jaAotICAgICAgICAgICAgaWYg YnJhbmNoIG5vdCBpbiBzZWxmLl9vcmRlcmVkX2NvbW1pdHM6Ci0gICAgICAgICAgICAgICAgc2Vs Zi5fb3JkZXJlZF9jb21taXRzW2JyYW5jaF0gPSBbJyddIGlmIGlzX2RlZmF1bHRfYnJhbmNoIGVs c2UgW10KLSAgICAgICAgICAgICAgICBzZWxmLl9vcmRlcmVkX3JldmlzaW9uc1ticmFuY2hdID0g WzBdIGlmIGlzX2RlZmF1bHRfYnJhbmNoIGVsc2UgW10KLQotICAgICAgICAgICAgIyBJZiB3ZSBh cmVuJ3Qgb24gdGhlIGRlZmF1bHQgYnJhbmNoLCB3ZSB3aWxsIG5lZWQgdGhlIGRlZmF1bHQgYnJh bmNoIHRvIGRldGVybWluZSB3aGVuCi0gICAgICAgICAgICAjIG91ciAgYnJhbmNoICBpbnRlcnNl Y3RzIHdpdGggdGhlIGRlZmF1bHQgYnJhbmNoLgotICAgICAgICAgICAgaWYgbm90IGlzX2RlZmF1 bHRfYnJhbmNoOgotICAgICAgICAgICAgICAgIHNlbGYucG9wdWxhdGUoYnJhbmNoPXNlbGYucmVw by5kZWZhdWx0X2JyYW5jaCkKLSAgICAgICAgICAgIGhhc2hlcyA9IFtdCi0gICAgICAgICAgICBy ZXZpc2lvbnMgPSBbXQotCi0gICAgICAgICAgICBkZWYgX2FwcGVuZChicmFuY2gsIGhhc2gsIHJl dmlzaW9uPU5vbmUpOgotICAgICAgICAgICAgICAgIGhhc2hlcy5hcHBlbmQoaGFzaCkKLSAgICAg ICAgICAgICAgICByZXZpc2lvbnMuYXBwZW5kKHJldmlzaW9uKQotICAgICAgICAgICAgICAgIGlk ZW50aWZpZXIgPSBzZWxmLl9oYXNoX3RvX2lkZW50aWZpZXJzLmdldChoYXNoLCAnJykKLSAgICAg ICAgICAgICAgICByZXR1cm4gaWRlbnRpZmllci5lbmRzd2l0aChkZWZhdWx0X2JyYW5jaCkgb3Ig aWRlbnRpZmllci5lbmRzd2l0aChicmFuY2gpCi0KLSAgICAgICAgICAgIGludGVyc2VjdGVkID0g RmFsc2UKLSAgICAgICAgICAgIGxvZyA9IE5vbmUKLSAgICAgICAgICAgIHRyeToKLSAgICAgICAg ICAgICAgICBrd2FyZ3MgPSBkaWN0KCkKLSAgICAgICAgICAgICAgICBpZiBzeXMudmVyc2lvbl9p bmZvID49ICgzLCAwKToKLSAgICAgICAgICAgICAgICAgICAga3dhcmdzID0gZGljdChlbmNvZGlu Zz0ndXRmLTgnKQotICAgICAgICAgICAgICAgIHNlbGYuX2xhc3RfcG9wdWxhdGVkW2JyYW5jaF0g PSB0aW1lLnRpbWUoKQotICAgICAgICAgICAgICAgIGxvZyA9IHN1YnByb2Nlc3MuUG9wZW4oCi0g ICAgICAgICAgICAgICAgICAgIFtzZWxmLnJlcG8uZXhlY3V0YWJsZSgpLCAnbG9nJywgYnJhbmNo XSwKLSAgICAgICAgICAgICAgICAgICAgY3dkPXNlbGYucmVwby5yb290X3BhdGgsCi0gICAgICAg ICAgICAgICAgICAgIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsCi0gICAgICAgICAgICAgICAgICAg IHN0ZGVycj1zdWJwcm9jZXNzLlBJUEUsCi0gICAgICAgICAgICAgICAgICAgICoqIGt3YXJncwot ICAgICAgICAgICAgICAgICkKLSAgICAgICAgICAgICAgICBpZiBsb2cucG9sbCgpOgotICAgICAg ICAgICAgICAgICAgICByYWlzZSBzZWxmLnJlcG8uRXhjZXB0aW9uKCJGYWlsZWQgdG8gY29uc3Ry dWN0IGJyYW5jaCBoaXN0b3J5IGZvciAne30nIi5mb3JtYXQoYnJhbmNoKSkKLQotICAgICAgICAg ICAgICAgIGhhc2ggPSBOb25lCi0gICAgICAgICAgICAgICAgcmV2aXNpb24gPSBOb25lCiAKLSAg ICAgICAgICAgICAgICBsaW5lID0gbG9nLnN0ZG91dC5yZWFkbGluZSgpCi0gICAgICAgICAgICAg ICAgd2hpbGUgbGluZToKLSAgICAgICAgICAgICAgICAgICAgaWYgbGluZS5zdGFydHN3aXRoKCcg ICAgZ2l0LXN2bi1pZDogJyk6Ci0gICAgICAgICAgICAgICAgICAgICAgICBtYXRjaCA9IHNlbGYu cmVwby5HSVRfU1ZOX1JFVklTSU9OLm1hdGNoKGxpbmUubHN0cmlwKCkpCi0gICAgICAgICAgICAg ICAgICAgICAgICBpZiBtYXRjaDoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXZpc2lv biA9IGludChtYXRjaC5ncm91cCgncmV2aXNpb24nKSkKLSAgICAgICAgICAgICAgICAgICAgaWYg bm90IGxpbmUuc3RhcnRzd2l0aCgnY29tbWl0ICcpOgotICAgICAgICAgICAgICAgICAgICAgICAg bGluZSA9IGxvZy5zdGRvdXQucmVhZGxpbmUoKQotICAgICAgICAgICAgICAgICAgICAgICAgY29u dGludWUKLQotICAgICAgICAgICAgICAgICAgICBpZiBoYXNoIGFuZCBfYXBwZW5kKGJyYW5jaCwg aGFzaCwgcmV2aXNpb249cmV2aXNpb24pOgotICAgICAgICAgICAgICAgICAgICAgICAgaGFzaCA9 IE5vbmUKLSAgICAgICAgICAgICAgICAgICAgICAgIGludGVyc2VjdGVkID0gVHJ1ZQotICAgICAg ICAgICAgICAgICAgICAgICAgYnJlYWsKKyAgICAgICAgICAgIHdpdGggc2VsZi5sb2NrKCk6Cisg ICAgICAgICAgICAgICAgZGVmYXVsdF9icmFuY2ggPSBzZWxmLnJlcG8uZGVmYXVsdF9icmFuY2gK KyAgICAgICAgICAgICAgICBpc19kZWZhdWx0X2JyYW5jaCA9IGJyYW5jaCA9PSBkZWZhdWx0X2Jy YW5jaAorICAgICAgICAgICAgICAgIGlmIGJyYW5jaCBub3QgaW4gc2VsZi5fb3JkZXJlZF9jb21t aXRzOgorICAgICAgICAgICAgICAgICAgICBzZWxmLl9vcmRlcmVkX2NvbW1pdHNbYnJhbmNoXSA9 IFsnJ10gaWYgaXNfZGVmYXVsdF9icmFuY2ggZWxzZSBbXQorICAgICAgICAgICAgICAgICAgICBz ZWxmLl9vcmRlcmVkX3JldmlzaW9uc1ticmFuY2hdID0gWzBdIGlmIGlzX2RlZmF1bHRfYnJhbmNo IGVsc2UgW10KKworICAgICAgICAgICAgICAgICMgSWYgd2UgYXJlbid0IG9uIHRoZSBkZWZhdWx0 IGJyYW5jaCwgd2Ugd2lsbCBuZWVkIHRoZSBkZWZhdWx0IGJyYW5jaCB0byBkZXRlcm1pbmUgd2hl bgorICAgICAgICAgICAgICAgICMgb3VyICBicmFuY2ggIGludGVyc2VjdHMgd2l0aCB0aGUgZGVm YXVsdCBicmFuY2guCisgICAgICAgICAgICAgICAgaWYgbm90IGlzX2RlZmF1bHRfYnJhbmNoOgor ICAgICAgICAgICAgICAgICAgICBzZWxmLnBvcHVsYXRlKGJyYW5jaD1zZWxmLnJlcG8uZGVmYXVs dF9icmFuY2gpCisgICAgICAgICAgICAgICAgaGFzaGVzID0gW10KKyAgICAgICAgICAgICAgICBy ZXZpc2lvbnMgPSBbXQorCisgICAgICAgICAgICAgICAgZGVmIF9hcHBlbmQoYnJhbmNoLCBoYXNo LCByZXZpc2lvbj1Ob25lKToKKyAgICAgICAgICAgICAgICAgICAgaGFzaGVzLmFwcGVuZChoYXNo KQorICAgICAgICAgICAgICAgICAgICByZXZpc2lvbnMuYXBwZW5kKHJldmlzaW9uKQorICAgICAg ICAgICAgICAgICAgICBpZGVudGlmaWVyID0gc2VsZi5faGFzaF90b19pZGVudGlmaWVycy5nZXQo aGFzaCwgJycpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBpZGVudGlmaWVyLmVuZHN3aXRo KGRlZmF1bHRfYnJhbmNoKSBvciBpZGVudGlmaWVyLmVuZHN3aXRoKGJyYW5jaCkKKworICAgICAg ICAgICAgICAgIGludGVyc2VjdGVkID0gRmFsc2UKKyAgICAgICAgICAgICAgICBsb2cgPSBOb25l CisgICAgICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgICAgICBrd2FyZ3MgPSBkaWN0 KCkKKyAgICAgICAgICAgICAgICAgICAgaWYgc3lzLnZlcnNpb25faW5mbyA+PSAoMywgMCk6Cisg ICAgICAgICAgICAgICAgICAgICAgICBrd2FyZ3MgPSBkaWN0KGVuY29kaW5nPSd1dGYtOCcpCisg ICAgICAgICAgICAgICAgICAgIHNlbGYuX2xhc3RfcG9wdWxhdGVkW2JyYW5jaF0gPSB0aW1lLnRp bWUoKQorICAgICAgICAgICAgICAgICAgICBsb2cgPSBzdWJwcm9jZXNzLlBvcGVuKAorICAgICAg ICAgICAgICAgICAgICAgICAgW3NlbGYucmVwby5leGVjdXRhYmxlKCksICdsb2cnLCBicmFuY2hd LAorICAgICAgICAgICAgICAgICAgICAgICAgY3dkPXNlbGYucmVwby5yb290X3BhdGgsCisgICAg ICAgICAgICAgICAgICAgICAgICBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLAorICAgICAgICAgICAg ICAgICAgICAgICAgc3RkZXJyPXN1YnByb2Nlc3MuUElQRSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICoqIGt3YXJncworICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICAgICAgICAg IGlmIGxvZy5wb2xsKCk6CisgICAgICAgICAgICAgICAgICAgICAgICByYWlzZSBzZWxmLnJlcG8u RXhjZXB0aW9uKCJGYWlsZWQgdG8gY29uc3RydWN0IGJyYW5jaCBoaXN0b3J5IGZvciAne30nIi5m b3JtYXQoYnJhbmNoKSkKIAotICAgICAgICAgICAgICAgICAgICBoYXNoID0gbGluZS5zcGxpdCgn ICcpWzFdLnJzdHJpcCgpCisgICAgICAgICAgICAgICAgICAgIGhhc2ggPSBOb25lCiAgICAgICAg ICAgICAgICAgICAgIHJldmlzaW9uID0gTm9uZQorCiAgICAgICAgICAgICAgICAgICAgIGxpbmUg PSBsb2cuc3Rkb3V0LnJlYWRsaW5lKCkKKyAgICAgICAgICAgICAgICAgICAgd2hpbGUgbGluZToK KyAgICAgICAgICAgICAgICAgICAgICAgIGlmIGxpbmUuc3RhcnRzd2l0aCgnICAgIGdpdC1zdm4t aWQ6ICcpOgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1hdGNoID0gc2VsZi5yZXBvLkdJ VF9TVk5fUkVWSVNJT04ubWF0Y2gobGluZS5sc3RyaXAoKSkKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpZiBtYXRjaDoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV2aXNp b24gPSBpbnQobWF0Y2guZ3JvdXAoJ3JldmlzaW9uJykpCisgICAgICAgICAgICAgICAgICAgICAg ICBpZiBub3QgbGluZS5zdGFydHN3aXRoKCdjb21taXQgJyk6CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbGluZSA9IGxvZy5zdGRvdXQucmVhZGxpbmUoKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbnRpbnVlCisKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIGhhc2ggYW5k IF9hcHBlbmQoYnJhbmNoLCBoYXNoLCByZXZpc2lvbj1yZXZpc2lvbik6CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgaGFzaCA9IE5vbmUKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBp bnRlcnNlY3RlZCA9IFRydWUKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhaworCisg ICAgICAgICAgICAgICAgICAgICAgICBoYXNoID0gbGluZS5zcGxpdCgnICcpWzFdLnJzdHJpcCgp CisgICAgICAgICAgICAgICAgICAgICAgICByZXZpc2lvbiA9IE5vbmUKKyAgICAgICAgICAgICAg ICAgICAgICAgIGxpbmUgPSBsb2cuc3Rkb3V0LnJlYWRsaW5lKCkKIAotICAgICAgICAgICAgICAg IGlmIGhhc2g6Ci0gICAgICAgICAgICAgICAgICAgIGludGVyc2VjdGVkID0gX2FwcGVuZChicmFu Y2gsIGhhc2gsIHJldmlzaW9uPXJldmlzaW9uKQorICAgICAgICAgICAgICAgICAgICBpZiBoYXNo OgorICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJzZWN0ZWQgPSBfYXBwZW5kKGJyYW5jaCwg aGFzaCwgcmV2aXNpb249cmV2aXNpb24pCiAKLSAgICAgICAgICAgIGZpbmFsbHk6Ci0gICAgICAg ICAgICAgICAgIyBJZiBvdXIgYGdpdCBsb2dgIG9wZXJhdGlvbiBmYWlsZWQsIHdlIGNhbid0IGNv dW50IG9uIHRoZSB2YWxpZGl0eSBvZiBvdXIgY2FjaGUKLSAgICAgICAgICAgICAgICBpZiBsb2cg YW5kIGxvZy5yZXR1cm5jb2RlOgotICAgICAgICAgICAgICAgICAgICByZXR1cm4KLSAgICAgICAg ICAgICAgICBpZiBsb2c6Ci0gICAgICAgICAgICAgICAgICAgIGxvZy5raWxsKCkKKyAgICAgICAg ICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgICAgICAgICAjIElmIG91ciBgZ2l0IGxvZ2Ag b3BlcmF0aW9uIGZhaWxlZCwgd2UgY2FuJ3QgY291bnQgb24gdGhlIHZhbGlkaXR5IG9mIG91ciBj YWNoZQorICAgICAgICAgICAgICAgICAgICBpZiBsb2cgYW5kIGxvZy5yZXR1cm5jb2RlOgorICAg ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuCisgICAgICAgICAgICAgICAgICAgIGlmIGxvZzoK KyAgICAgICAgICAgICAgICAgICAgICAgIGxvZy5raWxsKCkKIAotICAgICAgICAgICAgaWYgbm90 IGhhc2hlcyBvciBpbnRlcnNlY3RlZCBhbmQgbGVuKGhhc2hlcykgPD0gMToKLSAgICAgICAgICAg ICAgICByZXR1cm4KKyAgICAgICAgICAgICAgICBpZiBub3QgaGFzaGVzIG9yIGludGVyc2VjdGVk IGFuZCBsZW4oaGFzaGVzKSA8PSAxOgorICAgICAgICAgICAgICAgICAgICByZXR1cm4KIAotICAg ICAgICAgICAgaGFzaGVzLnJldmVyc2UoKQotICAgICAgICAgICAgcmV2aXNpb25zLnJldmVyc2Uo KQorICAgICAgICAgICAgICAgIGhhc2hlcy5yZXZlcnNlKCkKKyAgICAgICAgICAgICAgICByZXZp c2lvbnMucmV2ZXJzZSgpCiAKLSAgICAgICAgICAgIG9yZGVyID0gbGVuKHNlbGYuX29yZGVyZWRf Y29tbWl0c1ticmFuY2hdKSAtIDEKLSAgICAgICAgICAgIHdoaWxlIG9yZGVyID4gMDoKLSAgICAg ICAgICAgICAgICBpZiBoYXNoZXNbMF0gPT0gc2VsZi5fb3JkZXJlZF9jb21taXRzW2JyYW5jaF1b b3JkZXJdOgorICAgICAgICAgICAgICAgIG9yZGVyID0gbGVuKHNlbGYuX29yZGVyZWRfY29tbWl0 c1ticmFuY2hdKSAtIDEKKyAgICAgICAgICAgICAgICB3aGlsZSBvcmRlciA+IDA6CisgICAgICAg ICAgICAgICAgICAgIGlmIGhhc2hlc1swXSA9PSBzZWxmLl9vcmRlcmVkX2NvbW1pdHNbYnJhbmNo XVtvcmRlcl06CisgICAgICAgICAgICAgICAgICAgICAgICBvcmRlciAtPSAxCisgICAgICAgICAg ICAgICAgICAgICAgICBicmVhawogICAgICAgICAgICAgICAgICAgICBvcmRlciAtPSAxCi0gICAg ICAgICAgICAgICAgICAgIGJyZWFrCi0gICAgICAgICAgICAgICAgb3JkZXIgLT0gMQogCi0gICAg ICAgICAgICBzZWxmLl9vcmRlcmVkX2NvbW1pdHNbYnJhbmNoXSA9IHNlbGYuX29yZGVyZWRfY29t bWl0c1ticmFuY2hdWzpvcmRlciArIDFdICsgaGFzaGVzCi0gICAgICAgICAgICBzZWxmLl9vcmRl cmVkX3JldmlzaW9uc1ticmFuY2hdID0gc2VsZi5fb3JkZXJlZF9yZXZpc2lvbnNbYnJhbmNoXVs6 b3JkZXIgKyAxXSArIHJldmlzaW9ucwotICAgICAgICAgICAgc2VsZi5fZmlsbChicmFuY2gpCisg ICAgICAgICAgICAgICAgc2VsZi5fb3JkZXJlZF9jb21taXRzW2JyYW5jaF0gPSBzZWxmLl9vcmRl cmVkX2NvbW1pdHNbYnJhbmNoXVs6b3JkZXIgKyAxXSArIGhhc2hlcworICAgICAgICAgICAgICAg IHNlbGYuX29yZGVyZWRfcmV2aXNpb25zW2JyYW5jaF0gPSBzZWxmLl9vcmRlcmVkX3JldmlzaW9u c1ticmFuY2hdWzpvcmRlciArIDFdICsgcmV2aXNpb25zCisgICAgICAgICAgICAgICAgc2VsZi5f ZmlsbChicmFuY2gpCiAKLSAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICB3aXRoIG9w ZW4oc2VsZi5wYXRoLCAndycpIGFzIGZpbGU6Ci0gICAgICAgICAgICAgICAgICAgIGpzb24uZHVt cChkaWN0KAotICAgICAgICAgICAgICAgICAgICAgICAgaGFzaGVzPXNlbGYuX29yZGVyZWRfY29t bWl0cywKLSAgICAgICAgICAgICAgICAgICAgICAgIHJldmlzaW9ucz1zZWxmLl9vcmRlcmVkX3Jl dmlzaW9ucywKLSAgICAgICAgICAgICAgICAgICAgKSwgZmlsZSwgaW5kZW50PTQpCi0gICAgICAg ICAgICBleGNlcHQgKElPRXJyb3IsIE9TRXJyb3IpOgotICAgICAgICAgICAgICAgIHNlbGYucmVw by5sb2coIkZhaWxlZCB0byB3cml0ZSBpZGVudGlmaWVyIGNhY2hlIHRvICd7fSciLmZvcm1hdChz ZWxmLnBhdGgpKQorICAgICAgICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICAgICAgd2l0 aCBvcGVuKHNlbGYucGF0aCwgJ3cnKSBhcyBmaWxlOgorICAgICAgICAgICAgICAgICAgICAgICAg anNvbi5kdW1wKGRpY3QoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGFzaGVzPXNlbGYu X29yZGVyZWRfY29tbWl0cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXZpc2lvbnM9 c2VsZi5fb3JkZXJlZF9yZXZpc2lvbnMsCisgICAgICAgICAgICAgICAgICAgICAgICApLCBmaWxl LCBpbmRlbnQ9NCkKKyAgICAgICAgICAgICAgICBleGNlcHQgKElPRXJyb3IsIE9TRXJyb3IpOgor ICAgICAgICAgICAgICAgICAgICBzZWxmLnJlcG8ubG9nKCJGYWlsZWQgdG8gd3JpdGUgaWRlbnRp ZmllciBjYWNoZSB0byAne30nIi5mb3JtYXQoc2VsZi5wYXRoKSkKIAogICAgICAgICBkZWYgdG9f aGFzaChzZWxmLCByZXZpc2lvbj1Ob25lLCBpZGVudGlmaWVyPU5vbmUsIHBvcHVsYXRlPVRydWUs IGJyYW5jaD1Ob25lKToKICAgICAgICAgICAgIGlmIHJldmlzaW9uOgpAQCAtMjA0LDEyICsyMjks MTcgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICAgICBfLCBiX2NvdW50LCBicmFuY2ggPSBw YXJ0cwogICAgICAgICAgICAgaWYgYl9jb3VudCA8IDA6CiAgICAgICAgICAgICAgICAgcmV0dXJu IE5vbmUKLSAgICAgICAgICAgIGlmIGJyYW5jaCBub3QgaW4gc2VsZi5fb3JkZXJlZF9jb21taXRz IG9yIGxlbihzZWxmLl9vcmRlcmVkX2NvbW1pdHNbYnJhbmNoXSkgPD0gYl9jb3VudDoKKyAgICAg ICAgICAgIGlmIGJyYW5jaCBpbiBzZWxmLl9vcmRlcmVkX2NvbW1pdHMgYW5kIGxlbihzZWxmLl9v cmRlcmVkX2NvbW1pdHNbYnJhbmNoXSkgPiBiX2NvdW50OgorICAgICAgICAgICAgICAgIHJldHVy biBzZWxmLl9vcmRlcmVkX2NvbW1pdHNbYnJhbmNoXVtiX2NvdW50XQorCisgICAgICAgICAgICB3 aXRoIHNlbGYubG9jaygpOgorICAgICAgICAgICAgICAgIHNlbGYubG9hZCgpCisgICAgICAgICAg ICAgICAgaWYgYnJhbmNoIGluIHNlbGYuX29yZGVyZWRfY29tbWl0cyBhbmQgbGVuKHNlbGYuX29y ZGVyZWRfY29tbWl0c1ticmFuY2hdKSA+IGJfY291bnQ6CisgICAgICAgICAgICAgICAgICAgIHJl dHVybiBzZWxmLl9vcmRlcmVkX2NvbW1pdHNbYnJhbmNoXVtiX2NvdW50XQogICAgICAgICAgICAg ICAgIGlmIHBvcHVsYXRlOgogICAgICAgICAgICAgICAgICAgICBzZWxmLnBvcHVsYXRlKGJyYW5j aD1icmFuY2gpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLnRvX2hhc2goaWRlbnRp Zmllcj1pZGVudGlmaWVyLCBwb3B1bGF0ZT1GYWxzZSkKICAgICAgICAgICAgICAgICByZXR1cm4g Tm9uZQotICAgICAgICAgICAgcmV0dXJuIHNlbGYuX29yZGVyZWRfY29tbWl0c1ticmFuY2hdW2Jf Y291bnRdCiAKICAgICAgICAgZGVmIHRvX3JldmlzaW9uKHNlbGYsIGhhc2g9Tm9uZSwgaWRlbnRp Zmllcj1Ob25lLCBwb3B1bGF0ZT1UcnVlLCBicmFuY2g9Tm9uZSk6CiAgICAgICAgICAgICBpZiBo YXNoOgpAQCAtMjIxLDIyICsyNTEsMzIgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICAgICBf LCBiX2NvdW50LCBicmFuY2ggPSBwYXJ0cwogICAgICAgICAgICAgaWYgYl9jb3VudCA8IDA6CiAg ICAgICAgICAgICAgICAgcmV0dXJuIE5vbmUKLSAgICAgICAgICAgIGlmIGJyYW5jaCBub3QgaW4g c2VsZi5fb3JkZXJlZF9yZXZpc2lvbnMgb3IgbGVuKHNlbGYuX29yZGVyZWRfcmV2aXNpb25zW2Jy YW5jaF0pIDw9IGJfY291bnQ6CisgICAgICAgICAgICBpZiBicmFuY2ggaW4gc2VsZi5fb3JkZXJl ZF9yZXZpc2lvbnMgYW5kIGxlbihzZWxmLl9vcmRlcmVkX3JldmlzaW9uc1ticmFuY2hdKSA+IGJf Y291bnQ6CisgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYuX29yZGVyZWRfcmV2aXNpb25zW2Jy YW5jaF1bYl9jb3VudF0KKworICAgICAgICAgICAgd2l0aCBzZWxmLmxvY2soKToKKyAgICAgICAg ICAgICAgICBzZWxmLmxvYWQoKQorICAgICAgICAgICAgICAgIGlmIGJyYW5jaCBpbiBzZWxmLl9v cmRlcmVkX3JldmlzaW9ucyBhbmQgbGVuKHNlbGYuX29yZGVyZWRfcmV2aXNpb25zW2JyYW5jaF0p ID4gYl9jb3VudDoKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYuX29yZGVyZWRfcmV2 aXNpb25zW2JyYW5jaF1bYl9jb3VudF0KICAgICAgICAgICAgICAgICBpZiBwb3B1bGF0ZToKICAg ICAgICAgICAgICAgICAgICAgc2VsZi5wb3B1bGF0ZShicmFuY2g9YnJhbmNoKQogICAgICAgICAg ICAgICAgICAgICByZXR1cm4gc2VsZi50b19yZXZpc2lvbihpZGVudGlmaWVyPWlkZW50aWZpZXIs IHBvcHVsYXRlPUZhbHNlKQogICAgICAgICAgICAgICAgIHJldHVybiBOb25lCi0gICAgICAgICAg ICByZXR1cm4gc2VsZi5fb3JkZXJlZF9yZXZpc2lvbnNbYnJhbmNoXVtiX2NvdW50XQogCiAgICAg ICAgIGRlZiB0b19pZGVudGlmaWVyKHNlbGYsIGhhc2g9Tm9uZSwgcmV2aXNpb249Tm9uZSwgcG9w dWxhdGU9VHJ1ZSwgYnJhbmNoPU5vbmUpOgogICAgICAgICAgICAgcmV2aXNpb24gPSBDb21taXQu X3BhcnNlX3JldmlzaW9uKHJldmlzaW9uLCBkb19hc3NlcnQ9RmFsc2UpCiAgICAgICAgICAgICBp ZiByZXZpc2lvbjoKICAgICAgICAgICAgICAgICBpZiByZXZpc2lvbiBpbiBzZWxmLl9yZXZpc2lv bnNfdG9faWRlbnRpZmllcnM6CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLl9yZXZp c2lvbnNfdG9faWRlbnRpZmllcnNbcmV2aXNpb25dCi0gICAgICAgICAgICAgICAgaWYgcG9wdWxh dGU6Ci0gICAgICAgICAgICAgICAgICAgIHNlbGYucG9wdWxhdGUoYnJhbmNoPWJyYW5jaCkKLSAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYudG9faWRlbnRpZmllcihyZXZpc2lvbj1yZXZp c2lvbiwgcG9wdWxhdGU9RmFsc2UpCi0gICAgICAgICAgICAgICAgcmV0dXJuIE5vbmUKKworICAg ICAgICAgICAgICAgIHdpdGggc2VsZi5sb2NrKCk6CisgICAgICAgICAgICAgICAgICAgIHNlbGYu bG9hZCgpCisgICAgICAgICAgICAgICAgICAgIGlmIHJldmlzaW9uIGluIHNlbGYuX3JldmlzaW9u c190b19pZGVudGlmaWVyczoKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLl9y ZXZpc2lvbnNfdG9faWRlbnRpZmllcnNbcmV2aXNpb25dCisgICAgICAgICAgICAgICAgICAgIGlm IHBvcHVsYXRlOgorICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5wb3B1bGF0ZShicmFuY2g9 YnJhbmNoKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYudG9faWRlbnRpZmll cihyZXZpc2lvbj1yZXZpc2lvbiwgcG9wdWxhdGU9RmFsc2UpCisgICAgICAgICAgICAgICAgICAg IHJldHVybiBOb25lCiAKICAgICAgICAgICAgIGhhc2ggPSBDb21taXQuX3BhcnNlX2hhc2goaGFz aCwgZG9fYXNzZXJ0PUZhbHNlKQogICAgICAgICAgICAgaWYgaGFzaDoKQEAgLTI0NCwxMiArMjg0 LDE3IEBAIGNsYXNzIEdpdChTY20pOgogICAgICAgICAgICAgICAgICAgICBjYW5kaWRhdGUgPSBz ZWxmLl9oYXNoX3RvX2lkZW50aWZpZXJzLmdldChoYXNoKQogICAgICAgICAgICAgICAgIGV4Y2Vw dCBLZXlFcnJvcjogICMgTWVhbnMgdGhlIGhhc2ggd2Fzbid0IHNwZWNpZmljIGVub3VnaAogICAg ICAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQotCiAgICAgICAgICAgICAgICAgaWYgY2FuZGlk YXRlOgogICAgICAgICAgICAgICAgICAgICByZXR1cm4gY2FuZGlkYXRlCi0gICAgICAgICAgICAg ICAgaWYgcG9wdWxhdGU6Ci0gICAgICAgICAgICAgICAgICAgIHNlbGYucG9wdWxhdGUoYnJhbmNo PWJyYW5jaCkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYudG9faWRlbnRpZmllciho YXNoPWhhc2gsIHBvcHVsYXRlPUZhbHNlKQorCisgICAgICAgICAgICAgICAgd2l0aCBzZWxmLmxv Y2soKToKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5sb2FkKCkKKyAgICAgICAgICAgICAgICAg ICAgY2FuZGlkYXRlID0gc2VsZi5faGFzaF90b19pZGVudGlmaWVycy5nZXQoaGFzaCkKKyAgICAg ICAgICAgICAgICAgICAgaWYgY2FuZGlkYXRlOgorICAgICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIGNhbmRpZGF0ZQorICAgICAgICAgICAgICAgICAgICBpZiBwb3B1bGF0ZToKKyAgICAgICAg ICAgICAgICAgICAgICAgIHNlbGYucG9wdWxhdGUoYnJhbmNoPWJyYW5jaCkKKyAgICAgICAgICAg ICAgICAgICAgICAgIHJldHVybiBzZWxmLnRvX2lkZW50aWZpZXIoaGFzaD1oYXNoLCBwb3B1bGF0 ZT1GYWxzZSkKICAgICAgICAgICAgIHJldHVybiBOb25lCiAKIAo= 440449 2021-10-06 15:54:34 -0700 2021-10-06 15:55:03 -0700 Patch bug-231176-20211006155433.patch text/plain 5072 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNjc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTI2ODcyMGE5MjRmNjJhMTUxZTA1NzU2MzNkNjNkYzli ZThiZDE5MS4uZWRlMjQyNzNhMGYyZWViYzljNTcyMjQzNjM0YTUyYTczMzhmZWJhNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDIxLTEwLTA2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIFNoYXJlIGNhY2hlIGJldHdlZW4gcHJvY2Vzc2VzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzExNzYKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzgzODQxMjIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEdlbmVyYXRpbmcgdGhlIGlkZW50aWZpZXIgY2FjaGUgaXMg bW9yZSBleHBlbnNpdmUgdGhhbiByZWFkaW5nIGEgZmlsZSB3aXRoCisgICAgICAgIHRoYXQgY2Fj aGUgaW4gaXQuIFRoaXMgaXMgcGFydGljdWxhcmx5IHJlbGV2YW50IGZvciB3ZWJzZXJ2ZXJzLCB3 aGljaCBhcmUKKyAgICAgICAgbGlrZWx5IHJ1bm5pbmcgbXVsdGlwbGUgcHJvY2Vzc2VzLgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAgICAo R2l0LkNhY2hlLl9faW5pdF9fKTogTW92ZSBjYWNoZSBsb2FkaW5nIGludG8gImxvYWQiIGZ1bmN0 aW9uLgorICAgICAgICAoR2l0LkNhY2hlLmxvYWQpOiBPcGVuIGNhY2hlIGZpbGUuCisgICAgICAg IChHaXQuQ2FjaGUudG9faGFzaCk6IElmIHdlIGZhaWwgdG8gZmluZCBhIG1hdGNoLCBhdHRlbXB0 IHRvIGxvYWQgdGhlIGZpbGUKKyAgICAgICAgYmVmb3JlIHBvcHVsYXRpbmcgdGhlIGZpbGUuCisg ICAgICAgIChHaXQuQ2FjaGUudG9fcmV2aXNpb24pOiBEaXR0by4KKyAgICAgICAgKEdpdC5DYWNo ZS50b19pZGVudGlmaWVyKTogRGl0dG8uCisKIDIwMjEtMTAtMDYgIFdlbnNvbiBIc2llaCAgPHdl bnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBGbHVzaElkZW50aWZpZXIgb3V0 IG9mIHRoZSBEaXNwbGF5TGlzdCBuYW1lc3BhY2UKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weSBiL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQppbmRl eCAyMTU5ODM5NzFhZWE1OWMzNGRhYTc0OWMxYWFlYjZjYWFiNzhhZmYyLi45ZmU5Nzk5MWQ0NWYy ODI1YmQzZWY1NzAzMTFjNjg2NzM4YTAyZTc2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKKysrIGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CkBA IC00OCw3ICs0OCwxMSBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgICAgIHNlbGYuX3Jldmlz aW9uc190b19pZGVudGlmaWVycyA9IHt9CiAgICAgICAgICAgICBzZWxmLl9sYXN0X3BvcHVsYXRl ZCA9IHt9CiAgICAgICAgICAgICBzZWxmLl9ndXJhbnRlZWRfZm9yID0gZ3VyYW50ZWVkX2Zvcgor ICAgICAgICAgICAgc2VsZi5fbG9ja2VkID0gMAogCisgICAgICAgICAgICBzZWxmLmxvYWQoKQor CisgICAgICAgIGRlZiBsb2FkKHNlbGYpOgogICAgICAgICAgICAgaWYgbm90IG9zLnBhdGguZXhp c3RzKHNlbGYucGF0aCk6CiAgICAgICAgICAgICAgICAgcmV0dXJuCiAKQEAgLTIwNCwxMiArMjA4 LDE2IEBAIGNsYXNzIEdpdChTY20pOgogICAgICAgICAgICAgXywgYl9jb3VudCwgYnJhbmNoID0g cGFydHMKICAgICAgICAgICAgIGlmIGJfY291bnQgPCAwOgogICAgICAgICAgICAgICAgIHJldHVy biBOb25lCi0gICAgICAgICAgICBpZiBicmFuY2ggbm90IGluIHNlbGYuX29yZGVyZWRfY29tbWl0 cyBvciBsZW4oc2VsZi5fb3JkZXJlZF9jb21taXRzW2JyYW5jaF0pIDw9IGJfY291bnQ6Ci0gICAg ICAgICAgICAgICAgaWYgcG9wdWxhdGU6Ci0gICAgICAgICAgICAgICAgICAgIHNlbGYucG9wdWxh dGUoYnJhbmNoPWJyYW5jaCkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYudG9faGFz aChpZGVudGlmaWVyPWlkZW50aWZpZXIsIHBvcHVsYXRlPUZhbHNlKQotICAgICAgICAgICAgICAg IHJldHVybiBOb25lCi0gICAgICAgICAgICByZXR1cm4gc2VsZi5fb3JkZXJlZF9jb21taXRzW2Jy YW5jaF1bYl9jb3VudF0KKyAgICAgICAgICAgIGlmIGJyYW5jaCBpbiBzZWxmLl9vcmRlcmVkX2Nv bW1pdHMgYW5kIGxlbihzZWxmLl9vcmRlcmVkX2NvbW1pdHNbYnJhbmNoXSkgPiBiX2NvdW50Ogor ICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLl9vcmRlcmVkX2NvbW1pdHNbYnJhbmNoXVtiX2Nv dW50XQorCisgICAgICAgICAgICBzZWxmLmxvYWQoKQorICAgICAgICAgICAgaWYgYnJhbmNoIGlu IHNlbGYuX29yZGVyZWRfY29tbWl0cyBhbmQgbGVuKHNlbGYuX29yZGVyZWRfY29tbWl0c1ticmFu Y2hdKSA+IGJfY291bnQ6CisgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYuX29yZGVyZWRfY29t bWl0c1ticmFuY2hdW2JfY291bnRdCisgICAgICAgICAgICBpZiBwb3B1bGF0ZToKKyAgICAgICAg ICAgICAgICBzZWxmLnBvcHVsYXRlKGJyYW5jaD1icmFuY2gpCisgICAgICAgICAgICAgICAgcmV0 dXJuIHNlbGYudG9faGFzaChpZGVudGlmaWVyPWlkZW50aWZpZXIsIHBvcHVsYXRlPUZhbHNlKQor ICAgICAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgICAgICBkZWYgdG9fcmV2aXNpb24oc2VsZiwg aGFzaD1Ob25lLCBpZGVudGlmaWVyPU5vbmUsIHBvcHVsYXRlPVRydWUsIGJyYW5jaD1Ob25lKToK ICAgICAgICAgICAgIGlmIGhhc2g6CkBAIC0yMjEsMTYgKzIyOSwyNCBAQCBjbGFzcyBHaXQoU2Nt KToKICAgICAgICAgICAgIF8sIGJfY291bnQsIGJyYW5jaCA9IHBhcnRzCiAgICAgICAgICAgICBp ZiBiX2NvdW50IDwgMDoKICAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICAgICAg aWYgYnJhbmNoIG5vdCBpbiBzZWxmLl9vcmRlcmVkX3JldmlzaW9ucyBvciBsZW4oc2VsZi5fb3Jk ZXJlZF9yZXZpc2lvbnNbYnJhbmNoXSkgPD0gYl9jb3VudDoKLSAgICAgICAgICAgICAgICBpZiBw b3B1bGF0ZToKLSAgICAgICAgICAgICAgICAgICAgc2VsZi5wb3B1bGF0ZShicmFuY2g9YnJhbmNo KQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi50b19yZXZpc2lvbihpZGVudGlmaWVy PWlkZW50aWZpZXIsIHBvcHVsYXRlPUZhbHNlKQotICAgICAgICAgICAgICAgIHJldHVybiBOb25l Ci0gICAgICAgICAgICByZXR1cm4gc2VsZi5fb3JkZXJlZF9yZXZpc2lvbnNbYnJhbmNoXVtiX2Nv dW50XQorICAgICAgICAgICAgaWYgYnJhbmNoIGluIHNlbGYuX29yZGVyZWRfcmV2aXNpb25zIGFu ZCBsZW4oc2VsZi5fb3JkZXJlZF9yZXZpc2lvbnNbYnJhbmNoXSkgPiBiX2NvdW50OgorICAgICAg ICAgICAgICAgIHJldHVybiBzZWxmLl9vcmRlcmVkX3JldmlzaW9uc1ticmFuY2hdW2JfY291bnRd CisKKyAgICAgICAgICAgIHNlbGYubG9hZCgpCisgICAgICAgICAgICBpZiBicmFuY2ggaW4gc2Vs Zi5fb3JkZXJlZF9yZXZpc2lvbnMgYW5kIGxlbihzZWxmLl9vcmRlcmVkX3JldmlzaW9uc1ticmFu Y2hdKSA+IGJfY291bnQ6CisgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYuX29yZGVyZWRfcmV2 aXNpb25zW2JyYW5jaF1bYl9jb3VudF0KKyAgICAgICAgICAgIGlmIHBvcHVsYXRlOgorICAgICAg ICAgICAgICAgIHNlbGYucG9wdWxhdGUoYnJhbmNoPWJyYW5jaCkKKyAgICAgICAgICAgICAgICBy ZXR1cm4gc2VsZi50b19yZXZpc2lvbihpZGVudGlmaWVyPWlkZW50aWZpZXIsIHBvcHVsYXRlPUZh bHNlKQorICAgICAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgICAgICBkZWYgdG9faWRlbnRpZmll cihzZWxmLCBoYXNoPU5vbmUsIHJldmlzaW9uPU5vbmUsIHBvcHVsYXRlPVRydWUsIGJyYW5jaD1O b25lKToKICAgICAgICAgICAgIHJldmlzaW9uID0gQ29tbWl0Ll9wYXJzZV9yZXZpc2lvbihyZXZp c2lvbiwgZG9fYXNzZXJ0PUZhbHNlKQogICAgICAgICAgICAgaWYgcmV2aXNpb246CisgICAgICAg ICAgICAgICAgaWYgcmV2aXNpb24gaW4gc2VsZi5fcmV2aXNpb25zX3RvX2lkZW50aWZpZXJzOgor ICAgICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5fcmV2aXNpb25zX3RvX2lkZW50aWZpZXJz W3JldmlzaW9uXQorCisgICAgICAgICAgICAgICAgc2VsZi5sb2FkKCkKICAgICAgICAgICAgICAg ICBpZiByZXZpc2lvbiBpbiBzZWxmLl9yZXZpc2lvbnNfdG9faWRlbnRpZmllcnM6CiAgICAgICAg ICAgICAgICAgICAgIHJldHVybiBzZWxmLl9yZXZpc2lvbnNfdG9faWRlbnRpZmllcnNbcmV2aXNp b25dCiAgICAgICAgICAgICAgICAgaWYgcG9wdWxhdGU6CkBAIC0yNDQsNyArMjYwLDExIEBAIGNs YXNzIEdpdChTY20pOgogICAgICAgICAgICAgICAgICAgICBjYW5kaWRhdGUgPSBzZWxmLl9oYXNo X3RvX2lkZW50aWZpZXJzLmdldChoYXNoKQogICAgICAgICAgICAgICAgIGV4Y2VwdCBLZXlFcnJv cjogICMgTWVhbnMgdGhlIGhhc2ggd2Fzbid0IHNwZWNpZmljIGVub3VnaAogICAgICAgICAgICAg ICAgICAgICByZXR1cm4gTm9uZQorICAgICAgICAgICAgICAgIGlmIGNhbmRpZGF0ZToKKyAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIGNhbmRpZGF0ZQogCisgICAgICAgICAgICAgICAgc2VsZi5s b2FkKCkKKyAgICAgICAgICAgICAgICBjYW5kaWRhdGUgPSBzZWxmLl9oYXNoX3RvX2lkZW50aWZp ZXJzLmdldChoYXNoKQogICAgICAgICAgICAgICAgIGlmIGNhbmRpZGF0ZToKICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIGNhbmRpZGF0ZQogICAgICAgICAgICAgICAgIGlmIHBvcHVsYXRlOgo= 440450 2021-10-06 15:55:15 -0700 2021-10-07 15:11:35 -0700 Patch bug-231176-20211006155515.patch text/plain 4992 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNjc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTI2ODcyMGE5MjRmNjJhMTUxZTA1NzU2MzNkNjNkYzli ZThiZDE5MS4uZWRlMjQyNzNhMGYyZWViYzljNTcyMjQzNjM0YTUyYTczMzhmZWJhNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDIxLTEwLTA2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIFNoYXJlIGNhY2hlIGJldHdlZW4gcHJvY2Vzc2VzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzExNzYKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzgzODQxMjIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEdlbmVyYXRpbmcgdGhlIGlkZW50aWZpZXIgY2FjaGUgaXMg bW9yZSBleHBlbnNpdmUgdGhhbiByZWFkaW5nIGEgZmlsZSB3aXRoCisgICAgICAgIHRoYXQgY2Fj aGUgaW4gaXQuIFRoaXMgaXMgcGFydGljdWxhcmx5IHJlbGV2YW50IGZvciB3ZWJzZXJ2ZXJzLCB3 aGljaCBhcmUKKyAgICAgICAgbGlrZWx5IHJ1bm5pbmcgbXVsdGlwbGUgcHJvY2Vzc2VzLgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAgICAo R2l0LkNhY2hlLl9faW5pdF9fKTogTW92ZSBjYWNoZSBsb2FkaW5nIGludG8gImxvYWQiIGZ1bmN0 aW9uLgorICAgICAgICAoR2l0LkNhY2hlLmxvYWQpOiBPcGVuIGNhY2hlIGZpbGUuCisgICAgICAg IChHaXQuQ2FjaGUudG9faGFzaCk6IElmIHdlIGZhaWwgdG8gZmluZCBhIG1hdGNoLCBhdHRlbXB0 IHRvIGxvYWQgdGhlIGZpbGUKKyAgICAgICAgYmVmb3JlIHBvcHVsYXRpbmcgdGhlIGZpbGUuCisg ICAgICAgIChHaXQuQ2FjaGUudG9fcmV2aXNpb24pOiBEaXR0by4KKyAgICAgICAgKEdpdC5DYWNo ZS50b19pZGVudGlmaWVyKTogRGl0dG8uCisKIDIwMjEtMTAtMDYgIFdlbnNvbiBIc2llaCAgPHdl bnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBGbHVzaElkZW50aWZpZXIgb3V0 IG9mIHRoZSBEaXNwbGF5TGlzdCBuYW1lc3BhY2UKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weSBiL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQppbmRl eCAyMTU5ODM5NzFhZWE1OWMzNGRhYTc0OWMxYWFlYjZjYWFiNzhhZmYyLi5hODM5ZmEwNThmNWUy MjA2YjgwYTgxZWEwOWE2Zjk5MTY2MjhmMWUwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKKysrIGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CkBA IC00OSw2ICs0OSw5IEBAIGNsYXNzIEdpdChTY20pOgogICAgICAgICAgICAgc2VsZi5fbGFzdF9w b3B1bGF0ZWQgPSB7fQogICAgICAgICAgICAgc2VsZi5fZ3VyYW50ZWVkX2ZvciA9IGd1cmFudGVl ZF9mb3IKIAorICAgICAgICAgICAgc2VsZi5sb2FkKCkKKworICAgICAgICBkZWYgbG9hZChzZWxm KToKICAgICAgICAgICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhzZWxmLnBhdGgpOgogICAgICAg ICAgICAgICAgIHJldHVybgogCkBAIC0yMDQsMTIgKzIwNywxNiBAQCBjbGFzcyBHaXQoU2NtKToK ICAgICAgICAgICAgIF8sIGJfY291bnQsIGJyYW5jaCA9IHBhcnRzCiAgICAgICAgICAgICBpZiBi X2NvdW50IDwgMDoKICAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICAgICAgaWYg YnJhbmNoIG5vdCBpbiBzZWxmLl9vcmRlcmVkX2NvbW1pdHMgb3IgbGVuKHNlbGYuX29yZGVyZWRf Y29tbWl0c1ticmFuY2hdKSA8PSBiX2NvdW50OgotICAgICAgICAgICAgICAgIGlmIHBvcHVsYXRl OgotICAgICAgICAgICAgICAgICAgICBzZWxmLnBvcHVsYXRlKGJyYW5jaD1icmFuY2gpCi0gICAg ICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLnRvX2hhc2goaWRlbnRpZmllcj1pZGVudGlmaWVy LCBwb3B1bGF0ZT1GYWxzZSkKLSAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICAg ICAgcmV0dXJuIHNlbGYuX29yZGVyZWRfY29tbWl0c1ticmFuY2hdW2JfY291bnRdCisgICAgICAg ICAgICBpZiBicmFuY2ggaW4gc2VsZi5fb3JkZXJlZF9jb21taXRzIGFuZCBsZW4oc2VsZi5fb3Jk ZXJlZF9jb21taXRzW2JyYW5jaF0pID4gYl9jb3VudDoKKyAgICAgICAgICAgICAgICByZXR1cm4g c2VsZi5fb3JkZXJlZF9jb21taXRzW2JyYW5jaF1bYl9jb3VudF0KKworICAgICAgICAgICAgc2Vs Zi5sb2FkKCkKKyAgICAgICAgICAgIGlmIGJyYW5jaCBpbiBzZWxmLl9vcmRlcmVkX2NvbW1pdHMg YW5kIGxlbihzZWxmLl9vcmRlcmVkX2NvbW1pdHNbYnJhbmNoXSkgPiBiX2NvdW50OgorICAgICAg ICAgICAgICAgIHJldHVybiBzZWxmLl9vcmRlcmVkX2NvbW1pdHNbYnJhbmNoXVtiX2NvdW50XQor ICAgICAgICAgICAgaWYgcG9wdWxhdGU6CisgICAgICAgICAgICAgICAgc2VsZi5wb3B1bGF0ZShi cmFuY2g9YnJhbmNoKQorICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLnRvX2hhc2goaWRlbnRp Zmllcj1pZGVudGlmaWVyLCBwb3B1bGF0ZT1GYWxzZSkKKyAgICAgICAgICAgIHJldHVybiBOb25l CiAKICAgICAgICAgZGVmIHRvX3JldmlzaW9uKHNlbGYsIGhhc2g9Tm9uZSwgaWRlbnRpZmllcj1O b25lLCBwb3B1bGF0ZT1UcnVlLCBicmFuY2g9Tm9uZSk6CiAgICAgICAgICAgICBpZiBoYXNoOgpA QCAtMjIxLDE2ICsyMjgsMjQgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICAgICBfLCBiX2Nv dW50LCBicmFuY2ggPSBwYXJ0cwogICAgICAgICAgICAgaWYgYl9jb3VudCA8IDA6CiAgICAgICAg ICAgICAgICAgcmV0dXJuIE5vbmUKLSAgICAgICAgICAgIGlmIGJyYW5jaCBub3QgaW4gc2VsZi5f b3JkZXJlZF9yZXZpc2lvbnMgb3IgbGVuKHNlbGYuX29yZGVyZWRfcmV2aXNpb25zW2JyYW5jaF0p IDw9IGJfY291bnQ6Ci0gICAgICAgICAgICAgICAgaWYgcG9wdWxhdGU6Ci0gICAgICAgICAgICAg ICAgICAgIHNlbGYucG9wdWxhdGUoYnJhbmNoPWJyYW5jaCkKLSAgICAgICAgICAgICAgICAgICAg cmV0dXJuIHNlbGYudG9fcmV2aXNpb24oaWRlbnRpZmllcj1pZGVudGlmaWVyLCBwb3B1bGF0ZT1G YWxzZSkKLSAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICAgICAgcmV0dXJuIHNl bGYuX29yZGVyZWRfcmV2aXNpb25zW2JyYW5jaF1bYl9jb3VudF0KKyAgICAgICAgICAgIGlmIGJy YW5jaCBpbiBzZWxmLl9vcmRlcmVkX3JldmlzaW9ucyBhbmQgbGVuKHNlbGYuX29yZGVyZWRfcmV2 aXNpb25zW2JyYW5jaF0pID4gYl9jb3VudDoKKyAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5f b3JkZXJlZF9yZXZpc2lvbnNbYnJhbmNoXVtiX2NvdW50XQorCisgICAgICAgICAgICBzZWxmLmxv YWQoKQorICAgICAgICAgICAgaWYgYnJhbmNoIGluIHNlbGYuX29yZGVyZWRfcmV2aXNpb25zIGFu ZCBsZW4oc2VsZi5fb3JkZXJlZF9yZXZpc2lvbnNbYnJhbmNoXSkgPiBiX2NvdW50OgorICAgICAg ICAgICAgICAgIHJldHVybiBzZWxmLl9vcmRlcmVkX3JldmlzaW9uc1ticmFuY2hdW2JfY291bnRd CisgICAgICAgICAgICBpZiBwb3B1bGF0ZToKKyAgICAgICAgICAgICAgICBzZWxmLnBvcHVsYXRl KGJyYW5jaD1icmFuY2gpCisgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYudG9fcmV2aXNpb24o aWRlbnRpZmllcj1pZGVudGlmaWVyLCBwb3B1bGF0ZT1GYWxzZSkKKyAgICAgICAgICAgIHJldHVy biBOb25lCiAKICAgICAgICAgZGVmIHRvX2lkZW50aWZpZXIoc2VsZiwgaGFzaD1Ob25lLCByZXZp c2lvbj1Ob25lLCBwb3B1bGF0ZT1UcnVlLCBicmFuY2g9Tm9uZSk6CiAgICAgICAgICAgICByZXZp c2lvbiA9IENvbW1pdC5fcGFyc2VfcmV2aXNpb24ocmV2aXNpb24sIGRvX2Fzc2VydD1GYWxzZSkK ICAgICAgICAgICAgIGlmIHJldmlzaW9uOgorICAgICAgICAgICAgICAgIGlmIHJldmlzaW9uIGlu IHNlbGYuX3JldmlzaW9uc190b19pZGVudGlmaWVyczoKKyAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIHNlbGYuX3JldmlzaW9uc190b19pZGVudGlmaWVyc1tyZXZpc2lvbl0KKworICAgICAgICAg ICAgICAgIHNlbGYubG9hZCgpCiAgICAgICAgICAgICAgICAgaWYgcmV2aXNpb24gaW4gc2VsZi5f cmV2aXNpb25zX3RvX2lkZW50aWZpZXJzOgogICAgICAgICAgICAgICAgICAgICByZXR1cm4gc2Vs Zi5fcmV2aXNpb25zX3RvX2lkZW50aWZpZXJzW3JldmlzaW9uXQogICAgICAgICAgICAgICAgIGlm IHBvcHVsYXRlOgpAQCAtMjQ0LDcgKzI1OSwxMSBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAg ICAgICAgICAgICAgY2FuZGlkYXRlID0gc2VsZi5faGFzaF90b19pZGVudGlmaWVycy5nZXQoaGFz aCkKICAgICAgICAgICAgICAgICBleGNlcHQgS2V5RXJyb3I6ICAjIE1lYW5zIHRoZSBoYXNoIHdh c24ndCBzcGVjaWZpYyBlbm91Z2gKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAg ICAgICAgICAgICAgICBpZiBjYW5kaWRhdGU6CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBj YW5kaWRhdGUKIAorICAgICAgICAgICAgICAgIHNlbGYubG9hZCgpCisgICAgICAgICAgICAgICAg Y2FuZGlkYXRlID0gc2VsZi5faGFzaF90b19pZGVudGlmaWVycy5nZXQoaGFzaCkKICAgICAgICAg ICAgICAgICBpZiBjYW5kaWRhdGU6CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBjYW5kaWRh dGUKICAgICAgICAgICAgICAgICBpZiBwb3B1bGF0ZToK 440545 2021-10-07 15:11:37 -0700 2021-10-07 16:00:24 -0700 Patch for landing bug-231176-20211007151136.patch text/plain 6374 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNzQ1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmY1NzVlY2E2YTdmYzBiYmNiNTA5ODg1MWM2Y2UyMzhj YWVhYWZiYy4uOTFjZDRhZjljNjhlMzZkYzQyZDlhMjAyOWYxYWVkN2RlMzJjZmZjZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIxLTEwLTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIFNoYXJlIGNhY2hlIGJldHdlZW4gcHJvY2Vzc2VzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzExNzYKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzgzODQxMjIxPgorCisgICAgICAgIFJldmlld2VkIGJ5IERld2Vp IFpodS4KKworICAgICAgICBHZW5lcmF0aW5nIHRoZSBpZGVudGlmaWVyIGNhY2hlIGlzIG1vcmUg ZXhwZW5zaXZlIHRoYW4gcmVhZGluZyBhIGZpbGUgd2l0aAorICAgICAgICB0aGF0IGNhY2hlIGlu IGl0LiBUaGlzIGlzIHBhcnRpY3VsYXJseSByZWxldmFudCBmb3Igd2Vic2VydmVycywgd2hpY2gg YXJlCisgICAgICAgIGxpa2VseSBydW5uaW5nIG11bHRpcGxlIHByb2Nlc3Nlcy4KKworICAgICAg ICBSZXZpZXdlZCBieSBEZXdlaSBaaHUuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS9zZXR1cC5weTogQnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAg ICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQu cHk6CisgICAgICAgIChHaXQuQ2FjaGUuX19pbml0X18pOiBNb3ZlIGNhY2hlIGxvYWRpbmcgaW50 byAibG9hZCIgZnVuY3Rpb24uCisgICAgICAgIChHaXQuQ2FjaGUubG9hZCk6IE9wZW4gY2FjaGUg ZmlsZS4KKyAgICAgICAgKEdpdC5DYWNoZS50b19oYXNoKTogSWYgd2UgZmFpbCB0byBmaW5kIGEg bWF0Y2gsIGF0dGVtcHQgdG8gbG9hZCB0aGUgZmlsZQorICAgICAgICBiZWZvcmUgcG9wdWxhdGlu ZyB0aGUgZmlsZS4KKyAgICAgICAgKEdpdC5DYWNoZS50b19yZXZpc2lvbik6IERpdHRvLgorICAg ICAgICAoR2l0LkNhY2hlLnRvX2lkZW50aWZpZXIpOiBEaXR0by4KKwogMjAyMS0xMC0wNyAgU3Rl cGhhbiBTemFibyAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+CiAKICAgICAgICAgW1dpbkNhaXJv XSBTdXBwb3J0IHJ1bi1qc2Mtc3RyZXNzLXRlc3RzIHdpdGhvdXQgcG9zaXggY29tbWFuZHMKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5IGIv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKaW5kZXggM2Q5NTM1 MjIwNTAyYzEyMTA3N2JmOGI5ZjE5OTExNmVlZDljN2Y1OC4uNTk3NzdiMmRjZGRiMDNjYjY3NWM3 OTk0YzBmMjFiODMxNTMzOGFmNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvc2V0dXAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvc2V0dXAucHkKQEAgLTI5LDcgKzI5LDcgQEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgK ICAgICBuYW1lPSd3ZWJraXRzY21weScsCi0gICAgdmVyc2lvbj0nMi4yLjQnLAorICAgIHZlcnNp b249JzIuMi41JywKICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBkZXNpZ25lZCB0byBpbnRlcmFj dCB3aXRoIGdpdCBhbmQgc3ZuIHJlcG9zaXRvcmllcy4nLAogICAgIGxvbmdfZGVzY3JpcHRpb249 cmVhZG1lKCksCiAgICAgY2xhc3NpZmllcnM9WwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkgYi9Ub29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQppbmRleCAx YTZmZWQ0YzdjNjllODQyNDFjMjMzZjlkNTY1OThmNDM5ZGQzZDJmLi43MDA5NjVkZmRiNDNhZWJj MzBjMTVmZWMxNDBmZDg2MGEwZjcwYzQ5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQorKysgYi9Ub29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQpAQCAtNDYs NyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3 ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgt dXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMiwg MiwgNCkKK3ZlcnNpb24gPSBWZXJzaW9uKDIsIDIsIDUpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVy KFBhY2thZ2UoJ2Zhc3RlbmVycycsIFZlcnNpb24oMCwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ21vbm90b25pYycsIFZlcnNpb24oMSwgNSkpKQpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0 LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9j YWwvZ2l0LnB5CmluZGV4IDIxNTk4Mzk3MWFlYTU5YzM0ZGFhNzQ5YzFhYWViNmNhYWI3OGFmZjIu LmE4MzlmYTA1OGY1ZTIyMDZiODBhODFlYTA5YTZmOTkxNjYyOGYxZTAgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9s b2NhbC9naXQucHkKQEAgLTQ5LDYgKzQ5LDkgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICAg ICBzZWxmLl9sYXN0X3BvcHVsYXRlZCA9IHt9CiAgICAgICAgICAgICBzZWxmLl9ndXJhbnRlZWRf Zm9yID0gZ3VyYW50ZWVkX2ZvcgogCisgICAgICAgICAgICBzZWxmLmxvYWQoKQorCisgICAgICAg IGRlZiBsb2FkKHNlbGYpOgogICAgICAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKHNlbGYu cGF0aCk6CiAgICAgICAgICAgICAgICAgcmV0dXJuCiAKQEAgLTIwNCwxMiArMjA3LDE2IEBAIGNs YXNzIEdpdChTY20pOgogICAgICAgICAgICAgXywgYl9jb3VudCwgYnJhbmNoID0gcGFydHMKICAg ICAgICAgICAgIGlmIGJfY291bnQgPCAwOgogICAgICAgICAgICAgICAgIHJldHVybiBOb25lCi0g ICAgICAgICAgICBpZiBicmFuY2ggbm90IGluIHNlbGYuX29yZGVyZWRfY29tbWl0cyBvciBsZW4o c2VsZi5fb3JkZXJlZF9jb21taXRzW2JyYW5jaF0pIDw9IGJfY291bnQ6Ci0gICAgICAgICAgICAg ICAgaWYgcG9wdWxhdGU6Ci0gICAgICAgICAgICAgICAgICAgIHNlbGYucG9wdWxhdGUoYnJhbmNo PWJyYW5jaCkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYudG9faGFzaChpZGVudGlm aWVyPWlkZW50aWZpZXIsIHBvcHVsYXRlPUZhbHNlKQotICAgICAgICAgICAgICAgIHJldHVybiBO b25lCi0gICAgICAgICAgICByZXR1cm4gc2VsZi5fb3JkZXJlZF9jb21taXRzW2JyYW5jaF1bYl9j b3VudF0KKyAgICAgICAgICAgIGlmIGJyYW5jaCBpbiBzZWxmLl9vcmRlcmVkX2NvbW1pdHMgYW5k IGxlbihzZWxmLl9vcmRlcmVkX2NvbW1pdHNbYnJhbmNoXSkgPiBiX2NvdW50OgorICAgICAgICAg ICAgICAgIHJldHVybiBzZWxmLl9vcmRlcmVkX2NvbW1pdHNbYnJhbmNoXVtiX2NvdW50XQorCisg ICAgICAgICAgICBzZWxmLmxvYWQoKQorICAgICAgICAgICAgaWYgYnJhbmNoIGluIHNlbGYuX29y ZGVyZWRfY29tbWl0cyBhbmQgbGVuKHNlbGYuX29yZGVyZWRfY29tbWl0c1ticmFuY2hdKSA+IGJf Y291bnQ6CisgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYuX29yZGVyZWRfY29tbWl0c1ticmFu Y2hdW2JfY291bnRdCisgICAgICAgICAgICBpZiBwb3B1bGF0ZToKKyAgICAgICAgICAgICAgICBz ZWxmLnBvcHVsYXRlKGJyYW5jaD1icmFuY2gpCisgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYu dG9faGFzaChpZGVudGlmaWVyPWlkZW50aWZpZXIsIHBvcHVsYXRlPUZhbHNlKQorICAgICAgICAg ICAgcmV0dXJuIE5vbmUKIAogICAgICAgICBkZWYgdG9fcmV2aXNpb24oc2VsZiwgaGFzaD1Ob25l LCBpZGVudGlmaWVyPU5vbmUsIHBvcHVsYXRlPVRydWUsIGJyYW5jaD1Ob25lKToKICAgICAgICAg ICAgIGlmIGhhc2g6CkBAIC0yMjEsMTYgKzIyOCwyNCBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAg ICAgICAgIF8sIGJfY291bnQsIGJyYW5jaCA9IHBhcnRzCiAgICAgICAgICAgICBpZiBiX2NvdW50 IDwgMDoKICAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICAgICAgaWYgYnJhbmNo IG5vdCBpbiBzZWxmLl9vcmRlcmVkX3JldmlzaW9ucyBvciBsZW4oc2VsZi5fb3JkZXJlZF9yZXZp c2lvbnNbYnJhbmNoXSkgPD0gYl9jb3VudDoKLSAgICAgICAgICAgICAgICBpZiBwb3B1bGF0ZToK LSAgICAgICAgICAgICAgICAgICAgc2VsZi5wb3B1bGF0ZShicmFuY2g9YnJhbmNoKQotICAgICAg ICAgICAgICAgICAgICByZXR1cm4gc2VsZi50b19yZXZpc2lvbihpZGVudGlmaWVyPWlkZW50aWZp ZXIsIHBvcHVsYXRlPUZhbHNlKQotICAgICAgICAgICAgICAgIHJldHVybiBOb25lCi0gICAgICAg ICAgICByZXR1cm4gc2VsZi5fb3JkZXJlZF9yZXZpc2lvbnNbYnJhbmNoXVtiX2NvdW50XQorICAg ICAgICAgICAgaWYgYnJhbmNoIGluIHNlbGYuX29yZGVyZWRfcmV2aXNpb25zIGFuZCBsZW4oc2Vs Zi5fb3JkZXJlZF9yZXZpc2lvbnNbYnJhbmNoXSkgPiBiX2NvdW50OgorICAgICAgICAgICAgICAg IHJldHVybiBzZWxmLl9vcmRlcmVkX3JldmlzaW9uc1ticmFuY2hdW2JfY291bnRdCisKKyAgICAg ICAgICAgIHNlbGYubG9hZCgpCisgICAgICAgICAgICBpZiBicmFuY2ggaW4gc2VsZi5fb3JkZXJl ZF9yZXZpc2lvbnMgYW5kIGxlbihzZWxmLl9vcmRlcmVkX3JldmlzaW9uc1ticmFuY2hdKSA+IGJf Y291bnQ6CisgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYuX29yZGVyZWRfcmV2aXNpb25zW2Jy YW5jaF1bYl9jb3VudF0KKyAgICAgICAgICAgIGlmIHBvcHVsYXRlOgorICAgICAgICAgICAgICAg IHNlbGYucG9wdWxhdGUoYnJhbmNoPWJyYW5jaCkKKyAgICAgICAgICAgICAgICByZXR1cm4gc2Vs Zi50b19yZXZpc2lvbihpZGVudGlmaWVyPWlkZW50aWZpZXIsIHBvcHVsYXRlPUZhbHNlKQorICAg ICAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgICAgICBkZWYgdG9faWRlbnRpZmllcihzZWxmLCBo YXNoPU5vbmUsIHJldmlzaW9uPU5vbmUsIHBvcHVsYXRlPVRydWUsIGJyYW5jaD1Ob25lKToKICAg ICAgICAgICAgIHJldmlzaW9uID0gQ29tbWl0Ll9wYXJzZV9yZXZpc2lvbihyZXZpc2lvbiwgZG9f YXNzZXJ0PUZhbHNlKQogICAgICAgICAgICAgaWYgcmV2aXNpb246CisgICAgICAgICAgICAgICAg aWYgcmV2aXNpb24gaW4gc2VsZi5fcmV2aXNpb25zX3RvX2lkZW50aWZpZXJzOgorICAgICAgICAg ICAgICAgICAgICByZXR1cm4gc2VsZi5fcmV2aXNpb25zX3RvX2lkZW50aWZpZXJzW3JldmlzaW9u XQorCisgICAgICAgICAgICAgICAgc2VsZi5sb2FkKCkKICAgICAgICAgICAgICAgICBpZiByZXZp c2lvbiBpbiBzZWxmLl9yZXZpc2lvbnNfdG9faWRlbnRpZmllcnM6CiAgICAgICAgICAgICAgICAg ICAgIHJldHVybiBzZWxmLl9yZXZpc2lvbnNfdG9faWRlbnRpZmllcnNbcmV2aXNpb25dCiAgICAg ICAgICAgICAgICAgaWYgcG9wdWxhdGU6CkBAIC0yNDQsNyArMjU5LDExIEBAIGNsYXNzIEdpdChT Y20pOgogICAgICAgICAgICAgICAgICAgICBjYW5kaWRhdGUgPSBzZWxmLl9oYXNoX3RvX2lkZW50 aWZpZXJzLmdldChoYXNoKQogICAgICAgICAgICAgICAgIGV4Y2VwdCBLZXlFcnJvcjogICMgTWVh bnMgdGhlIGhhc2ggd2Fzbid0IHNwZWNpZmljIGVub3VnaAogICAgICAgICAgICAgICAgICAgICBy ZXR1cm4gTm9uZQorICAgICAgICAgICAgICAgIGlmIGNhbmRpZGF0ZToKKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIGNhbmRpZGF0ZQogCisgICAgICAgICAgICAgICAgc2VsZi5sb2FkKCkKKyAg ICAgICAgICAgICAgICBjYW5kaWRhdGUgPSBzZWxmLl9oYXNoX3RvX2lkZW50aWZpZXJzLmdldCho YXNoKQogICAgICAgICAgICAgICAgIGlmIGNhbmRpZGF0ZToKICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGNhbmRpZGF0ZQogICAgICAgICAgICAgICAgIGlmIHBvcHVsYXRlOgo=