231381 2021-10-07 11:40:17 -0700 Ensure webkitpy secret storage works successfully on Linux using only autoinstalled libraries 2021-12-19 20:41:31 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=220736 https://bugs.webkit.org/show_bug.cgi?id=221029 https://bugs.webkit.org/show_bug.cgi?id=230540 https://bugs.webkit.org/show_bug.cgi?id=234499 InRadar P2 Normal --- 1 mcatanzaro mcatanzaro ews-watchlist glenn jbedard mcatanzaro pnormand webkit-bug-importer oldest_to_newest 1801690 0 mcatanzaro 2021-10-07 11:40:17 -0700 Seems webkit-patch's keyring integration has broken? To test, I need a bug report to avoid spamming other bugs with spam patches by mistake. 1801719 1 440525 mcatanzaro 2021-10-07 12:33:21 -0700 Created attachment 440525 Patch 1801727 2 jbedard 2021-10-07 12:48:59 -0700 I think it's https://bugs.webkit.org/show_bug.cgi?id=231055 1801730 3 jbedard 2021-10-07 12:49:58 -0700 (In reply to Jonathan Bedard from comment #2) > I think it's https://bugs.webkit.org/show_bug.cgi?id=231055 Never mind, thought that change modified libraries, it does not. 1801733 4 mcatanzaro 2021-10-07 12:52:43 -0700 (In reply to Jonathan Bedard from comment #3) > Never mind, thought that change modified libraries, it does not. First problem is that python-secretstorage is not being autoinstalled, it needs to be registered as an implicit dep of python-keyring when running on Linux. But that's not enough, something else is wrong too. I will try to debug. 1801906 5 mcatanzaro 2021-10-07 19:26:50 -0700 Next problem is I tried updating to the latest python-keyring 23.2.1 (only when called from python3, since it is incompatible with python2), but it throws an exception whenever using any of the public APIs. I've tracked it down to _load_plugins in backend.py which is calling importlib.metadata.entry_points() https://docs.python.org/3.10/library/importlib.metadata.html#entry-points using the `group` keyword argument, which is documented to exist in python 3.10, but webkitpy's autoinstaller overrides the stdlib version with version 1.7.0 from pypy, which has an incompatible API. Not sure how hard it is to upgrade that yet. When I downgrade to python-keyring 22.3.0, the last version compatible with our importlib.metadata, then I get past that error and uncover another exception, which I will need to investigate tomorrow. (I also tried not updating anything, but that didn't work either, and it feels more productive to debug the newer versions rather than older versions.) 1802029 6 jbedard 2021-10-08 07:26:13 -0700 Seems like I will need to fix out the bug where a version like 1.2.0 matches 1.2.1 1802057 7 mcatanzaro 2021-10-08 08:03:09 -0700 (In reply to Jonathan Bedard from comment #6) > Seems like I will need to fix out the bug where a version like 1.2.0 matches > 1.2.1 Um... I didn't know about this? What bug is this? 1802074 8 jbedard 2021-10-08 08:37:38 -0700 (In reply to Michael Catanzaro from comment #7) > (In reply to Jonathan Bedard from comment #6) > > Seems like I will need to fix out the bug where a version like 1.2.0 matches > > 1.2.1 > > Um... I didn't know about this? What bug is this? This bug: https://bugs.webkit.org/show_bug.cgi?id=230540, looking at a fix now 1802121 9 mcatanzaro 2021-10-08 09:25:55 -0700 Ah OK, interesting. I think that's not causing any trouble for *this* bug, but good to know about that footgun.... 1802201 10 440659 mcatanzaro 2021-10-08 12:59:30 -0700 Created attachment 440659 Patch 1802202 11 mcatanzaro 2021-10-08 12:59:47 -0700 (In reply to Michael Catanzaro from comment #5) > When I downgrade to python-keyring 22.3.0, the last version compatible with > our importlib.metadata, then I get past that error and uncover another > exception, which I will need to investigate tomorrow. Well I'm not sure what I changed, but I'm no longer seeing the same error as yesterday. Today I'm seeing python-secretstorage is broken due to a missing dependency on python-jeepney, which causes an ImportError when keyring imports secretstorage, causing the backend to be disabled. Autoinstalling jeepney fixes it. 1802210 12 440661 mcatanzaro 2021-10-08 13:12:33 -0700 Created attachment 440661 Patch 1802211 13 mcatanzaro 2021-10-08 13:13:53 -0700 (In reply to Michael Catanzaro from comment #4) > First problem is that python-secretstorage is not being autoinstalled, it > needs to be registered as an implicit dep of python-keyring when running on > Linux. Hm, it works fine for me today. python-keyring does import python-secretstorage, so it shouldn't need to be listed as an implicit dep. Not sure why I convinced myself this was required yesterday. Maybe it was required with older versions of the libraries, but it works fine for me with the newer versions. 1802214 14 440663 mcatanzaro 2021-10-08 13:21:57 -0700 Created attachment 440663 Patch 1802215 15 mcatanzaro 2021-10-08 13:22:43 -0700 (In reply to Michael Catanzaro from comment #14) > Created attachment 440663 [details] > Patch OK, this is a real patch, not a test patch. Danger of using 'webkit-patch upload' as a test case is that it uploads a patch when your changes work. :P 1802241 16 440663 jbedard 2021-10-08 14:08:59 -0700 Comment on attachment 440663 Patch Macs are happy with this! 1802256 17 440663 mcatanzaro 2021-10-08 14:37:51 -0700 Comment on attachment 440663 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440663&action=review > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py:75 > +if sys.version_info > (3, 6): Oops, should be >= 1802257 18 mcatanzaro 2021-10-08 14:41:39 -0700 (In reply to Michael Catanzaro from comment #17) > Oops, should be >= Also forgot to edit the webcorepy version number in setup.up and this __init__.py, although I don't quite understand why we are doing that. 1802260 19 440675 mcatanzaro 2021-10-08 14:43:49 -0700 Created attachment 440675 Patch 1802269 20 jbedard 2021-10-08 15:02:13 -0700 (In reply to Michael Catanzaro from comment #18) > (In reply to Michael Catanzaro from comment #17) > > Oops, should be >= > > Also forgot to edit the webcorepy version number in setup.up and this > __init__.py, although I don't quite understand why we are doing that. Apple has a pypi instance we're uploading this to, the version numbers indicate a new release. Not a huge deal with changes like this, though. It's more important when APIs are changing. 1802278 21 ews-feeder 2021-10-08 15:21:26 -0700 Committed r283843 (242723@main): <https://commits.webkit.org/242723@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440675. 1802279 22 webkit-bug-importer 2021-10-08 15:22:15 -0700 <rdar://problem/84046188> 1803728 23 pnormand 2021-10-13 06:24:23 -0700 Looks like this broke keyring when queried from the Flatpak SDK (again). Thanks Michael :/ 1803739 24 pnormand 2021-10-13 06:40:37 -0700 Hah, sorry, false alarm. After reinstalling the auto-installed python things I see jeepney is installed now, all good. 1803753 25 mcatanzaro 2021-10-13 07:19:39 -0700 Unfortunately all the keyring stuff is quite fragile. :/ I've tried to make it a little more robust by relying on the autoinstaller, but it will surely break again next time we update any of these dependencies. If anyone else has trouble after this, please delete your autoinstalled directories Tools/Scripts/libraries/autoinstalled and Tools/Scripts/webkitpy/autoinstalled. That will trigger the autoinstaller to run again and refresh everything. 440525 2021-10-07 12:33:21 -0700 2021-10-07 12:33:48 -0700 Patch bug-231381-20211007143320.patch text/plain 16772 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvTWFrZWZpbGUg Yi9Tb3VyY2UvTWFrZWZpbGUKaW5kZXggMTM5ZGRjYjAxZmI2MDZkNDc3ZTVkOTNiODBiYTQ0OTA4 ZDhkN2M4Ni4uYWZlNDZiMDIyN2NlNDI3ZTRmMzhiNzQ0ZmY0Nzg3ZTM1OGVjNWVhYiAxMDA2NDQK LS0tIGEvU291cmNlL01ha2VmaWxlCisrKyBiL1NvdXJjZS9NYWtlZmlsZQpAQCAtMSw1ICsxLDYg QEAKIFdFQklOU1BFQ1RPUlVJX01PRFVMRSA9CiAKKwogVE9fTE9XRVIgPSAkKHNoZWxsIGVjaG8g JCgxKSB8IHRyIFs6dXBwZXI6XSBbOmxvd2VyOl0pCiAKIGlmbmVxICgsJChTREtST09UKSkKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3Jl cHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Vi a2l0Y29yZXB5L19faW5pdF9fLnB5CmluZGV4IGVhMzUzOTljZDY4ODM4NDFiMWQzMjAyODZkYzgy ZmMyM2Q4ZGZmNjkuLjAxYWM2MzQ0YTk5ZDZlZmExZjUxMThhNGQ4NGIzM2NkZGNiNzlkYWQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3Jl cHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5 L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQpAQCAtNDMsNyArNDMsNyBAQCBmcm9tIHdlYmtpdGNv cmVweS5jYWxsX2J5X25lZWQgaW1wb3J0IENhbGxCeU5lZWQKIGZyb20gd2Via2l0Y29yZXB5LmVk aXRvciBpbXBvcnQgRWRpdG9yCiBmcm9tIHdlYmtpdGNvcmVweS5maWxlX2xvY2sgaW1wb3J0IEZp bGVMb2NrCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDExLCAxKQordmVyc2lvbiA9IFZlcnNpb24o MCwgMTEsIDIpCiAKIGZyb20gd2Via2l0Y29yZXB5LmF1dG9pbnN0YWxsIGltcG9ydCBQYWNrYWdl LCBBdXRvSW5zdGFsbAogaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKToKQEAgLTYxLDcgKzYx LDYgQEAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZGF0ZXV0aWwnLCBWZXJzaW9uKDIs IDgsIDEpLCBweXBpX25hbWU9J3B5dGhvbi1kYXQKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2th Z2UoJ2VudHJ5cG9pbnRzJywgVmVyc2lvbigwLCAzLCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3Rl cihQYWNrYWdlKCdmdW5jc2lncycsIFZlcnNpb24oMSwgMCwgMikpKQogQXV0b0luc3RhbGwucmVn aXN0ZXIoUGFja2FnZSgnaWRuYScsIFZlcnNpb24oMiwgMTApKSkKLUF1dG9JbnN0YWxsLnJlZ2lz dGVyKFBhY2thZ2UoJ2tleXJpbmcnLCBWZXJzaW9uKDcsIDMsIDEpKSkKIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ3BhY2thZ2luZycsIFZlcnNpb24oMjAsIDQpKSkKIEF1dG9JbnN0YWxs LnJlZ2lzdGVyKFBhY2thZ2UoJ3B5cGFyc2luZycsIFZlcnNpb24oMiwgNCwgNykpKQogQXV0b0lu c3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncmVxdWVzdHMnLCBWZXJzaW9uKDIsIDI0KSkpCkBAIC03 Myw4ICs3MiwxMyBAQCBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCd1cmxsaWIzJywgVmVy c2lvbigxLCAyNSwgMTApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3doZWVsJywg VmVyc2lvbigwLCAzNSwgMSkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnd2hpY2hj cmFmdCcsIFZlcnNpb24oMCwgNiwgMSkpKQogCi0jIFRoaXMgaXMgbmVlZGVkIGZvciBweXRob24t a2V5cmluZy4KLWlmIHN5cy5wbGF0Zm9ybSA9PSAnbGludXgnOgotICAgIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ3NlY3JldHN0b3JhZ2UnLCBWZXJzaW9uKDIsIDMsIDEpKSkKK2lmIHN5 cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6CisgICAga2V5cmluZ19kZXBzID0gW10KKyAgICBpZiBz eXMucGxhdGZvcm0gPT0gJ2xpbnV4JzoKKyAgICAgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFj a2FnZSgnc2VjcmV0c3RvcmFnZScsIFZlcnNpb24oMywgMywgMSkpKQorICAgICAgICBrZXlyaW5n X2RlcHMgPSBbJ3NlY3JldHN0b3JhZ2UnXQorICAgIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2th Z2UoJ2tleXJpbmcnLCBWZXJzaW9uKDIzLCAyLCAxKSwgaW1wbGljaXRfZGVwcz1rZXlyaW5nX2Rl cHMpKQorZWxzZToKKyAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdrZXlyaW5nJywg VmVyc2lvbig3LCAzLCAxKSkpCiAKIG5hbWUgPSAnd2Via2l0Y29yZXB5JwpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9jcmVkZW50 aWFscy5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3Jl cHkvY3JlZGVudGlhbHMucHkKaW5kZXggMGJhZDY3ZjI5ZTY4ZDM0ZDQzY2I4NWRhNWViZDYzZmY4 NzNhNDE5NC4uZjM2MDA3M2U4MWE0YzQ4MGFhYWY3N2QwODZjZTZhMWNlNjM3ZGM3ZiAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9j cmVkZW50aWFscy5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkv d2Via2l0Y29yZXB5L2NyZWRlbnRpYWxzLnB5CkBAIC00NCwxMSArNDQsNyBAQCBkZWYgY3JlZGVu dGlhbHModXJsLCByZXF1aXJlZD1UcnVlLCBuYW1lPU5vbmUsIHByb21wdD1Ob25lLCBrZXlfbmFt ZT0ncGFzc3dvcmQnKQogICAgICAgICBfY2FjaGVbbmFtZV0gPSAodXNlcm5hbWUsIGtleSkKICAg ICAgICAgcmV0dXJuIHVzZXJuYW1lLCBrZXkKIAotICAgIHdpdGggT3V0cHV0Q2FwdHVyZSgpOgot ICAgICAgICB0cnk6Ci0gICAgICAgICAgICBpbXBvcnQga2V5cmluZwotICAgICAgICBleGNlcHQg KENhbGxlZFByb2Nlc3NFcnJvciwgSW1wb3J0RXJyb3IpOgotICAgICAgICAgICAga2V5cmluZyA9 IE5vbmUKKyAgICBpbXBvcnQga2V5cmluZwogCiAgICAgdXNlcm5hbWVfcHJvbXB0ZWQgPSBGYWxz ZQogICAgIGtleV9wcm9tcHRlZCA9IEZhbHNlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2F1dG9pbnN0YWxsZWQvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2F1dG9pbnN0YWxsZWQvX19pbml0X18ucHkKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDk0NWE1NDVhOGM0YmUzMTgwNzUyOGVkY2QyNzk4MGM1NjExMGMzOGMuLjAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9h dXRvaW5zdGFsbGVkL19faW5pdF9fLnB5CisrKyAvZGV2L251bGwKQEAgLTEsMjEgKzAsMCBAQAot IyBDb3B5cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotIwot IyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKLSMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0jIGFyZSBtZXQ6Ci0jIDEuICBSZWRpc3RyaWJ1dGlv bnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotIyAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIuCi0jIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlIGNvcHlyaWdodAotIyAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0jICAgIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0j Ci0jIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRS SUJVVE9SUyBgYEFTIElTJycgQU5EIEFOWQotIyBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVECi0jIFdBUlJBTlRJ RVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9T RSBBUkUKLSMgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMg Q09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZCi0jIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lE RU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTCi0jIChJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBH T09EUyBPUiBTRVJWSUNFUzsKLSMgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJV U0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OCi0jIEFOWSBUSEVPUlkg T0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBU T1JUCi0jIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTCi0jIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9hdXRvaW5zdGFsbGVkL2J1aWxkYm90LnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9hdXRvaW5zdGFsbGVkL2J1aWxkYm90LnB5CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAyZmQyM2I0YjVhNGJiZTFjOGY4ZmYxMzk1N2I3OWY5YzYyMDA3ZGI3Li4wMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYXV0b2luc3RhbGxlZC9idWlsZGJvdC5weQorKysgL2Rldi9udWxsCkBAIC0xLDM4ICsw LDAgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDIwLTIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgotIwotIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0jIGFyZSBtZXQ6Ci0jIDEuICBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAotIyAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIuCi0jIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVz dCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotIyAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0jICAgIGRv Y3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0 cmlidXRpb24uCi0jCi0jIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBB TkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycgQU5EIEFOWQotIyBFWFBSRVNTIE9SIElNUExJ RUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVE Ci0jIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJ Q1VMQVIgUFVSUE9TRSBBUkUKLSMgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUg SU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZCi0jIERJUkVDVCwgSU5E SVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBE QU1BR0VTCi0jIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0Yg U1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsKLSMgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBS T0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OCi0j IEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUCi0jIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTCi0jIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotCi1pbXBvcnQg c3lzCi0KLWZyb20gd2Via2l0c2NtcHkgaW1wb3J0IEF1dG9JbnN0YWxsLCBQYWNrYWdlLCBWZXJz aW9uCi0KLUF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2F1dG9iYWhuJywgVmVyc2lvbigy MCwgNywgMSkpKQotQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnYnVpbGRib3QnLCBWZXJz aW9uKDIsIDEwLCAxKSkpCi1BdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdkYXRldXRpbCcs IFZlcnNpb24oMiwgOCwgMSksIHB5cGlfbmFtZT0ncHl0aG9uLWRhdGV1dGlsJykpCi1BdXRvSW5z dGFsbC5yZWdpc3RlcihQYWNrYWdlKCdqaW5qYTInLCBWZXJzaW9uKDIsIDExLCAyKSwgcHlwaV9u YW1lPSdKaW5qYTInKSkKLUF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2p3dCcsIFZlcnNp b24oMSwgNywgMSksIHB5cGlfbmFtZT0nUHlKV1QnKSkKLUF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBh Y2thZ2UoJ3B5eWFtbCcsIFZlcnNpb24oNSwgMywgMSksIHB5cGlfbmFtZT0nUHlZQU1MJykpCi1B dXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdzcWxhbGNoZW15JywgVmVyc2lvbigxLCAzLCAy MCksIHB5cGlfbmFtZT0nU1FMQWxjaGVteScpKQotQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2Fn ZSgnc3FsYWxjaGVteS1taWdyYXRlJywgVmVyc2lvbigwLCAxMywgMCkpKQotQXV0b0luc3RhbGwu cmVnaXN0ZXIoUGFja2FnZSgndHdpc3RlZCcsIFZlcnNpb24oMjAsIDMsIDApLCBweXBpX25hbWU9 J1R3aXN0ZWQnKSkKLUF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3R4YWlvJywgVmVyc2lv bigyMCwgNCwgMSkpKQotCi1zeXMubW9kdWxlc1tfX25hbWVfX10gPSBfX2ltcG9ydF9fKCdidWls ZGJvdCcpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2F1dG9pbnN0YWxsZWQv Y2hyb21lZHJpdmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9hdXRvaW5zdGFsbGVkL2No cm9tZWRyaXZlci5weQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZTZlN2E1YmMwMjRh Y2IwYTY5MDk0YmQ0M2ZlNDQ3ZjA5OTlkZjE0Zi4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2F1dG9pbnN0YWxsZWQv Y2hyb21lZHJpdmVyLnB5CisrKyAvZGV2L251bGwKQEAgLTEsNjYgKzAsMCBAQAotIyBDb3B5cmln aHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotIwotIyBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKLSMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zCi0jIGFyZSBtZXQ6Ci0jIDEuICBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291 cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotIyAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0jIDIu ICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3Zl IGNvcHlyaWdodAotIyAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0jICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90 aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0jCi0jIFRISVMg U09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBg YEFTIElTJycgQU5EIEFOWQotIyBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVE SU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVECi0jIFdBUlJBTlRJRVMgT0YgTUVS Q0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKLSMg RElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVU T1JTIEJFIExJQUJMRSBGT1IgQU5ZCi0jIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQ RUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTCi0jIChJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsKLSMgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElO VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OCi0jIEFOWSBUSEVPUlkgT0YgTElBQklM SVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0jIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg T0YgVEhFIFVTRSBPRiBUSElTCi0jIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotCi1pbXBvcnQgcGxhdGZvcm0KLWltcG9ydCByZXF1 ZXN0cwotCi1mcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBQYWNrYWdlLCBWZXJzaW9uCi0KLQotY2xh c3MgQ2hyb21lRHJpdmVyUGFja2FnZShQYWNrYWdlKToKLSAgICBVUkwgPSAnaHR0cHM6Ly9jaHJv bWVkcml2ZXIuc3RvcmFnZS5nb29nbGVhcGlzLmNvbS8nCi0KLSAgICBkZWYgX19pbml0X18oc2Vs ZiwgdmVyc2lvbj1Ob25lKToKLSAgICAgICAgc3VwZXIoQ2hyb21lRHJpdmVyUGFja2FnZSwgc2Vs ZikuX19pbml0X18oJ2Nocm9tZWRyaXZlcicsIHZlcnNpb249dmVyc2lvbikKLQotICAgIGRlZiBh cmNoaXZlcyhzZWxmKToKLSAgICAgICAgaWYgc2VsZi52ZXJzaW9uIGlzIG5vdCBOb25lOgotICAg ICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgIHJlc3BvbnNlID0gcmVxdWVzdHMuZ2V0KHNl bGYuVVJMICsgJ0xBVEVTVF9SRUxFQVNFJykKLSAgICAgICAgICAgIGV4Y2VwdCByZXF1ZXN0cy5S ZXF1ZXN0RXhjZXB0aW9uOgotICAgICAgICAgICAgICAgIHJldHVybiBbXQotCi0gICAgICAgICAg ICBpZiByZXNwb25zZS5zdGF0dXNfY29kZSAhPSAyMDA6Ci0gICAgICAgICAgICAgICAgcmV0dXJu IFtdCi0gICAgICAgICAgICB2ZXJzaW9uID0gVmVyc2lvbi5mcm9tX3N0cmluZyhyZXNwb25zZS50 ZXh0LnJzdHJpcCgpKQotICAgICAgICBlbHNlOgotICAgICAgICAgICAgdmVyc2lvbiA9IHNlbGYu dmVyc2lvbgotCi0gICAgICAgIG9zX25hbWUgPSBwbGF0Zm9ybS5zeXN0ZW0oKQotICAgICAgICBp ZiBvc19uYW1lID09ICdMaW51eCc6Ci0gICAgICAgICAgICBvcyA9ICdsaW51eHt9Jy5mb3JtYXQo JzY0JyBpZiBwbGF0Zm9ybS5tYWNoaW5lKClbLTI6XSA9PSAnNjQnIGVsc2UgJycpCi0gICAgICAg IGVsaWYgb3NfbmFtZSA9PSAnRGFyd2luJzoKLSAgICAgICAgICAgIG9zID0gJ21hYzY0JwotICAg ICAgICBlbHNlOgotICAgICAgICAgICAgcmV0dXJuIFtdCi0KLSAgICAgICAgcmV0dXJuIFtQYWNr YWdlLkFyY2hpdmUoCi0gICAgICAgICAgICBzZWxmLm5hbWUsCi0gICAgICAgICAgICBsaW5rPSd7 fXt9L2Nocm9tZWRyaXZlcl97fS56aXAnLmZvcm1hdChzZWxmLlVSTCwgdmVyc2lvbiwgb3MpLAot ICAgICAgICAgICAgdmVyc2lvbj12ZXJzaW9uLAotICAgICAgICAgICAgZXh0ZW5zaW9uPSd6aXAn LAotICAgICAgICApXQotCi0KLXBhY2thZ2UgPSBDaHJvbWVEcml2ZXJQYWNrYWdlKHZlcnNpb249 VmVyc2lvbig4NiwgMCwgNDI0MCwgMjIpKQotcGFja2FnZS5pbnN0YWxsKCkKLWV4ZWN1dGFibGUg PSBwYWNrYWdlLmxvY2F0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2F1 dG9pbnN0YWxsZWQvZ2Vja29kcml2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2F1dG9p bnN0YWxsZWQvZ2Vja29kcml2ZXIucHkKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDVm Mjc1MDY5YmE0YTM0MDFlY2NhZjkzODZlMmQ5OWI4N2E4YzE3NjkuLjAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9hdXRv aW5zdGFsbGVkL2dlY2tvZHJpdmVyLnB5CisrKyAvZGV2L251bGwKQEAgLTEsODUgKzAsMCBAQAot IyBDb3B5cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotIwot IyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo IG9yIHdpdGhvdXQKLSMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0jIGFyZSBtZXQ6Ci0jIDEuICBSZWRpc3RyaWJ1dGlv bnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotIyAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIuCi0jIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlIGNvcHlyaWdodAotIyAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0jICAgIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0j Ci0jIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRS SUJVVE9SUyBgYEFTIElTJycgQU5EIEFOWQotIyBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElF UywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVECi0jIFdBUlJBTlRJ RVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9T RSBBUkUKLSMgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMg Q09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZCi0jIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lE RU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTCi0jIChJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBH T09EUyBPUiBTRVJWSUNFUzsKLSMgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJV U0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OCi0jIEFOWSBUSEVPUlkg T0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBU T1JUCi0jIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTCi0jIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotCi1pbXBvcnQgcGxhdGZvcm0KLWlt cG9ydCByZXF1ZXN0cwotCi1mcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBQYWNrYWdlLCBWZXJzaW9u Ci0KLQotY2xhc3MgR2Vja29Ecml2ZXJQYWNrYWdlKFBhY2thZ2UpOgotICAgIFVSTCA9ICdodHRw czovL2FwaS5naXRodWIuY29tL3JlcG9zL21vemlsbGEvZ2Vja29kcml2ZXIvcmVsZWFzZXMnCi0K LSAgICBkZWYgX19pbml0X18oc2VsZiwgdmVyc2lvbj1Ob25lKToKLSAgICAgICAgc3VwZXIoR2Vj a29Ecml2ZXJQYWNrYWdlLCBzZWxmKS5fX2luaXRfXygnZ2Vja29kcml2ZXInLCB2ZXJzaW9uPXZl cnNpb24pCi0KLSAgICBkZWYgYXJjaGl2ZXMoc2VsZik6Ci0gICAgICAgIHRyeToKLSAgICAgICAg ICAgIHJlc3BvbnNlID0gcmVxdWVzdHMuZ2V0KHNlbGYuVVJMKQotICAgICAgICBleGNlcHQgcmVx dWVzdHMuUmVxdWVzdEV4Y2VwdGlvbjoKLSAgICAgICAgICAgIHJldHVybiBbXQotCi0gICAgICAg IGlmIHJlc3BvbnNlLnN0YXR1c19jb2RlICE9IDIwMDoKLSAgICAgICAgICAgIHJldHVybiBbXQot Ci0gICAgICAgIG9zX25hbWUgPSBwbGF0Zm9ybS5zeXN0ZW0oKQotICAgICAgICBpZiBvc19uYW1l ID09ICdEYXJ3aW4nOgotICAgICAgICAgICAgb3MgPSAnbWFjb3MnCi0gICAgICAgIGVsc2U6Ci0g ICAgICAgICAgICBvcyA9ICd7fXt9Jy5mb3JtYXQob3NfbmFtZSwgcGxhdGZvcm0ubWFjaGluZSgp Wy0yOl0pCi0KLSAgICAgICAgYXJjaGl2ZXMgPSBbXQotICAgICAgICBmb3IgY2FuZGlkYXRlIGlu IHJldmVyc2VkKHJlc3BvbnNlLmpzb24oKSk6Ci0gICAgICAgICAgICB0cnk6Ci0gICAgICAgICAg ICAgICAgdmVyc2lvbiA9IFZlcnNpb24uZnJvbV9zdHJpbmcoY2FuZGlkYXRlLmdldCgndGFnX25h bWUnKS5zcGxpdCgndicpWy0xXSkKLSAgICAgICAgICAgIGV4Y2VwdCBWYWx1ZUVycm9yOgotICAg ICAgICAgICAgICAgIGNvbnRpbnVlCi0KLSAgICAgICAgICAgIGZvciBhc3NldCBpbiBjYW5kaWRh dGUuZ2V0KCdhc3NldHMnLCBbXSk6Ci0gICAgICAgICAgICAgICAgdXJsID0gYXNzZXQuZ2V0KCdi cm93c2VyX2Rvd25sb2FkX3VybCcpCi0gICAgICAgICAgICAgICAgaWYgbm90IHVybDoKLSAgICAg ICAgICAgICAgICAgICAgY29udGludWUKLSAgICAgICAgICAgICAgICBpZiBvcyBub3QgaW4gdXJs OgotICAgICAgICAgICAgICAgICAgICBjb250aW51ZQotCi0gICAgICAgICAgICAgICAgZXh0ZW5z aW9uID0gJ3ppcCcgaWYgdXJsLmVuZHN3aXRoKCcuemlwJykgZWxzZSAndGFyLmd6JwotICAgICAg ICAgICAgICAgIGlmIG5vdCB1cmwuZW5kc3dpdGgoZXh0ZW5zaW9uKToKLSAgICAgICAgICAgICAg ICAgICAgY29udGludWUKLQotICAgICAgICAgICAgICAgIGlmIHNlbGYudmVyc2lvbiBhbmQgdmVy c2lvbiBub3QgaW4gc2VsZi52ZXJzaW9uOgotICAgICAgICAgICAgICAgICAgICBjb250aW51ZQot Ci0gICAgICAgICAgICAgICAgYXJjaGl2ZXMuYXBwZW5kKAotICAgICAgICAgICAgICAgICAgICBQ YWNrYWdlLkFyY2hpdmUoCi0gICAgICAgICAgICAgICAgICAgICAgICBzZWxmLm5hbWUsCi0gICAg ICAgICAgICAgICAgICAgICAgICBsaW5rPXVybCwKLSAgICAgICAgICAgICAgICAgICAgICAgIHZl cnNpb249dmVyc2lvbiwKLSAgICAgICAgICAgICAgICAgICAgICAgIGV4dGVuc2lvbj1leHRlbnNp b24sCi0gICAgICAgICAgICAgICAgICAgICkKLSAgICAgICAgICAgICAgICApCi0KLSAgICAgICAg cmV0dXJuIGFyY2hpdmVzCi0KLQotcGFja2FnZSA9IEdlY2tvRHJpdmVyUGFja2FnZSh2ZXJzaW9u PVZlcnNpb24oMCwgMjcsIDApKQotcGFja2FnZS5pbnN0YWxsKCkKLWV4ZWN1dGFibGUgPSBwYWNr YWdlLmxvY2F0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2F1dG9pbnN0 YWxsZWQvdHdpc3RlZC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYXV0b2luc3RhbGxlZC90 d2lzdGVkLnB5CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMmRhMGVlZGViMGU5Y2M4 N2M1NWRiMGE1MjVmMmM4ODc5ZTY1MGVmLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwCi0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYXV0b2luc3RhbGxlZC90d2lz dGVkLnB5CisrKyAvZGV2L251bGwKQEAgLTEsMjggKzAsMCBAQAotIyBDb3B5cmlnaHQgKEMpIDIw MjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotIwotIyBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSMgbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zCi0jIGFyZSBtZXQ6Ci0jIDEuICBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUg bXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotIyAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0jIDIuICBSZWRpc3Ry aWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdo dAotIyAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIgaW4gdGhlCi0jICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVy aWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0jCi0jIFRISVMgU09GVFdBUkUg SVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycg QU5EIEFOWQotIyBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVECi0jIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklM SVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKLSMgRElTQ0xBSU1F RC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTIEJFIExJ QUJMRSBGT1IgQU5ZCi0jIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVY RU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTCi0jIChJTkNMVURJTkcsIEJVVCBOT1Qg TElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsK LSMgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElP TikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OCi0jIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVU SEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0jIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RSBPRiBUSElTCi0jIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgotCi1pbXBvcnQgc3lzCi0KLWZyb20gd2Via2l0c2NtcHkgaW1wb3J0 IEF1dG9JbnN0YWxsLCBQYWNrYWdlLCBWZXJzaW9uCi0KLUF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBh Y2thZ2UoJ3R3aXN0ZWQnLCBWZXJzaW9uKDE1LCA1LCAwKSwgcHlwaV9uYW1lPSdUd2lzdGVkJykp Ci1zeXMubW9kdWxlc1tfX25hbWVfX10gPSBfX2ltcG9ydF9fKCd0d2lzdGVkJykKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9jcmVkZW50aWFscy5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9jcmVkZW50aWFscy5weQppbmRleCAzZTQ5 MGFkMTkxZDMyYTdjYmQwMTM3M2UxZjY5ZjY0YjczODE0ZDBhLi45OTBiNjNmMjEzZmVhNTBkYzJh NWI3NGViMTY0MGQ1MDE0M2U3MWNhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9uZXQvY3JlZGVudGlhbHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vbmV0L2NyZWRlbnRpYWxzLnB5CkBAIC00MCwxMSArNDAsNyBAQCBmcm9tIHdlYmtpdHB5 LmNvbW1vbi5jaGVja291dC5zY20gaW1wb3J0IEdpdAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lz dGVtLmV4ZWN1dGl2ZSBpbXBvcnQgRXhlY3V0aXZlLCBTY3JpcHRFcnJvcgogZnJvbSB3ZWJraXRw eS5jb21tb24uc3lzdGVtLnVzZXIgaW1wb3J0IFVzZXIKIAotd2l0aCBPdXRwdXRDYXB0dXJlKCk6 Ci0gICAgdHJ5OgotICAgICAgICBpbXBvcnQga2V5cmluZwotICAgIGV4Y2VwdCBJbXBvcnRFcnJv cjoKLSAgICAgICAga2V5cmluZyA9IE5vbmUKK2ltcG9ydCBrZXlyaW5nCiAKIF9sb2cgPSBsb2dn aW5nLmdldExvZ2dlcihfX25hbWVfXykKIApkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdl TG9nCmluZGV4IDZlOTJlNGUyZTBmM2VlMGY5YTdmMjUzMTRkNzc3MGRiMmEzYzRhZjYuLmI3NTJl ODE5ODdkZWMwMDZkNmVjNzZhZGJlNTZhYjhlOTUxMzIxZDYgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxv ZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMC0wNyAgTWljaGFlbCBD YXRhbnphcm8gIDxtY2F0YW56YXJvQGdub21lLm9yZz4KKworICAgICAgICB3ZWJraXRweSBrZXly aW5nIHRlc3QgYnVnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzEzODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNvdXJjZS9NYWtlZmlsZToKKwogMjAyMS0xMC0wNyAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gUmVlbmFibGUgLWZ2aXNp YmlsaXR5PWhpZGRlbgo= 440659 2021-10-08 12:59:30 -0700 2021-10-08 13:00:32 -0700 Patch bug-231381-20211008145929.patch text/plain 6211 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzODA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvTWFrZWZpbGUg Yi9Tb3VyY2UvTWFrZWZpbGUKaW5kZXggMTM5ZGRjYjAxZmI2MDZkNDc3ZTVkOTNiODBiYTQ0OTA4 ZDhkN2M4Ni4uYWZlNDZiMDIyN2NlNDI3ZTRmMzhiNzQ0ZmY0Nzg3ZTM1OGVjNWVhYiAxMDA2NDQK LS0tIGEvU291cmNlL01ha2VmaWxlCisrKyBiL1NvdXJjZS9NYWtlZmlsZQpAQCAtMSw1ICsxLDYg QEAKIFdFQklOU1BFQ1RPUlVJX01PRFVMRSA9CiAKKwogVE9fTE9XRVIgPSAkKHNoZWxsIGVjaG8g JCgxKSB8IHRyIFs6dXBwZXI6XSBbOmxvd2VyOl0pCiAKIGlmbmVxICgsJChTREtST09UKSkKZGlm ZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlNDU0MWRm YWExYjhmMTlkMWFmNzljZTE5NTk2MTBiMmRkYWNiOTdiLi43OGRlZmYyMDY3Zjk5ZjE3ZmMzNzYx ZDEzMzliNDg2MWMyZDc4YjBmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9v bHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMTAtMDcgIE1pY2hhZWwgQ2F0YW56 YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CisKKyAgICAgICAgd2Via2l0cHkga2V5cmluZyB0 ZXN0IGJ1ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjMxMzgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5 OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYXV0b2luc3RhbGxlZC9fX2luaXRfXy5weTog UmVtb3ZlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2F1dG9pbnN0YWxsZWQvYnVpbGRi b3QucHk6IFJlbW92ZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9hdXRvaW5zdGFsbGVk L2Nocm9tZWRyaXZlci5weTogUmVtb3ZlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2F1 dG9pbnN0YWxsZWQvZ2Vja29kcml2ZXIucHk6IFJlbW92ZWQuCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9hdXRvaW5zdGFsbGVkL3R3aXN0ZWQucHk6IFJlbW92ZWQuCisKIDIwMjEtMTAtMDgg IENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtX ZWJEcml2ZXJdIFVwZGF0ZSB3M2MgYW5kIHNlbGVuaXVtIHRlc3RzCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5 IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2lu aXRfXy5weQppbmRleCBlYTM1Mzk5Y2Q2ODgzODQxYjFkMzIwMjg2ZGM4MmZjMjNkOGRmZjY5Li5j ZmI2YWEyYTA0NjJmOGZlNGRhMjcxZGI1MDA0MWMxNTdjZmQ3ZmE4IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkv X19pbml0X18ucHkKQEAgLTQzLDcgKzQzLDcgQEAgZnJvbSB3ZWJraXRjb3JlcHkuY2FsbF9ieV9u ZWVkIGltcG9ydCBDYWxsQnlOZWVkCiBmcm9tIHdlYmtpdGNvcmVweS5lZGl0b3IgaW1wb3J0IEVk aXRvcgogZnJvbSB3ZWJraXRjb3JlcHkuZmlsZV9sb2NrIGltcG9ydCBGaWxlTG9jawogCi12ZXJz aW9uID0gVmVyc2lvbigwLCAxMSwgMSkKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDExLCAyKQogCiBm cm9tIHdlYmtpdGNvcmVweS5hdXRvaW5zdGFsbCBpbXBvcnQgUGFja2FnZSwgQXV0b0luc3RhbGwK IGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6CkBAIC02MSw3ICs2MSw2IEBAIEF1dG9JbnN0 YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2RhdGV1dGlsJywgVmVyc2lvbigyLCA4LCAxKSwgcHlwaV9u YW1lPSdweXRob24tZGF0CiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdlbnRyeXBvaW50 cycsIFZlcnNpb24oMCwgMywgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZnVu Y3NpZ3MnLCBWZXJzaW9uKDEsIDAsIDIpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2Uo J2lkbmEnLCBWZXJzaW9uKDIsIDEwKSkpCi1BdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdr ZXlyaW5nJywgVmVyc2lvbig3LCAzLCAxKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdl KCdwYWNrYWdpbmcnLCBWZXJzaW9uKDIwLCA0KSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNr YWdlKCdweXBhcnNpbmcnLCBWZXJzaW9uKDIsIDQsIDcpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVy KFBhY2thZ2UoJ3JlcXVlc3RzJywgVmVyc2lvbigyLCAyNCkpKQpAQCAtNzMsOCArNzIsMTIgQEAg QXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgndXJsbGliMycsIFZlcnNpb24oMSwgMjUsIDEw KSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCd3aGVlbCcsIFZlcnNpb24oMCwgMzUs IDEpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3doaWNoY3JhZnQnLCBWZXJzaW9u KDAsIDYsIDEpKSkKIAotIyBUaGlzIGlzIG5lZWRlZCBmb3IgcHl0aG9uLWtleXJpbmcuCi1pZiBz eXMucGxhdGZvcm0gPT0gJ2xpbnV4JzoKLSAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdl KCdzZWNyZXRzdG9yYWdlJywgVmVyc2lvbigyLCAzLCAxKSkpCitpZiBzeXMudmVyc2lvbl9pbmZv ID4gKDMsIDYpOgorICAgIGtleXJpbmdfZGVwcyA9IFtdCisgICAgaWYgc3lzLnBsYXRmb3JtID09 ICdsaW51eCc6CisgICAgICAgIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2plZXBuZXkn LCBWZXJzaW9uKDAsIDcsIDEpKSkKKyAgICAgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2Fn ZSgnc2VjcmV0c3RvcmFnZScsIFZlcnNpb24oMywgMywgMSkpKQorICAgICAgICBrZXlyaW5nX2Rl cHMgPSBbJ3NlY3JldHN0b3JhZ2UnXQorICAgIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2Uo J2tleXJpbmcnLCBWZXJzaW9uKDIzLCAyLCAxKSwgaW1wbGljaXRfZGVwcz1rZXlyaW5nX2RlcHMp KQogCiBuYW1lID0gJ3dlYmtpdGNvcmVweScKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L19faW5pdF9fLnB5Cmlu ZGV4IDQ3YTc4YjBhNDgxYmU0MDZhNTAwYTIxMjQxMjNiYWVhYjg1MDZjYWIuLjQ0YTE2YjI5ZWZk ZTJlMmZjYzU3M2ExMTVkN2NiYThjNmY3MzhlOTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9fX2luaXRf Xy5weQpAQCAtNDcsNiArNDcsMTEgQEAgZWxpZiBzeXMudmVyc2lvbl9pbmZvID49ICgyLCA3KSBh bmQgc3lzLnZlcnNpb25faW5mbyA8ICgzLCk6CiBlbHNlOgogICAgIHJhaXNlIEltcG9ydEVycm9y KCJVbnN1cHBvcnRlZCBQeXRob24gdmVyc2lvbiEgKCVzKSIgJSBzeXMudmVyc2lvbikKIAoraWYg c3lzLnZlcnNpb25faW5mbyA+PSAoMywgNik6CisgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFj a2FnZSgnaW1wb3J0bGliX21ldGFkYXRhJywgVmVyc2lvbig0LCA4LCAxKSkpCitlbHNlOgorICAg IEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2ltcG9ydGxpYl9tZXRhZGF0YScsIFZlcnNp b24oMSwgNywgMCkpKQorCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdhdG9taWN3cml0 ZXMnLCBWZXJzaW9uKDEsIDEsIDUpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2F0 dHInLCBWZXJzaW9uKDE4LCAxLCAwKSwgcHlwaV9uYW1lPSdhdHRycycpKQogQXV0b0luc3RhbGwu cmVnaXN0ZXIoUGFja2FnZSgnYnM0JywgVmVyc2lvbig0LCA5LCAzKSwgcHlwaV9uYW1lPSdiZWF1 dGlmdWxzb3VwNCcpKQpAQCAtNTQsNyArNTksNiBAQCBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNr YWdlKCdjb25maWdwYXJzZXInLCBWZXJzaW9uKDQsIDAsIDIpKSkKIEF1dG9JbnN0YWxsLnJlZ2lz dGVyKFBhY2thZ2UoJ2NvbnRleHRsaWIyJywgVmVyc2lvbigwLCA2LCAwKSkpCiBBdXRvSW5zdGFs bC5yZWdpc3RlcihQYWNrYWdlKCdjb3ZlcmFnZScsIFZlcnNpb24oNSwgMiwgMSkpKQogQXV0b0lu c3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZnVuY3NpZ3MnLCBWZXJzaW9uKDEsIDAsIDIpKSkKLUF1 dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2ltcG9ydGxpYl9tZXRhZGF0YScsIFZlcnNpb24o MSwgNywgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZ2Vuc2hpJywgVmVyc2lv bigwLCA3LCAzKSwgcHlwaV9uYW1lPSdHZW5zaGknKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBh Y2thZ2UoJ2h0bWw1bGliJywgVmVyc2lvbigxLCAxKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQ YWNrYWdlKCdpbmljb25maWcnLCBWZXJzaW9uKDEsIDEsIDEpKSkKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9jcmVkZW50aWFscy5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL25ldC9jcmVkZW50aWFscy5weQppbmRleCAzZTQ5MGFkMTkxZDMy YTdjYmQwMTM3M2UxZjY5ZjY0YjczODE0ZDBhLi44OWE5ZDlkNmJlOWVmODk0YTdhNjRlNmQ1MjU2 YmJjOTBmNzhmMzgyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvY3JlZGVudGlhbHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0 L2NyZWRlbnRpYWxzLnB5CkBAIC00MCwxMSArNDAsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5j aGVja291dC5zY20gaW1wb3J0IEdpdAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1 dGl2ZSBpbXBvcnQgRXhlY3V0aXZlLCBTY3JpcHRFcnJvcgogZnJvbSB3ZWJraXRweS5jb21tb24u c3lzdGVtLnVzZXIgaW1wb3J0IFVzZXIKIAotd2l0aCBPdXRwdXRDYXB0dXJlKCk6Ci0gICAgdHJ5 OgotICAgICAgICBpbXBvcnQga2V5cmluZwotICAgIGV4Y2VwdCBJbXBvcnRFcnJvcjoKLSAgICAg ICAga2V5cmluZyA9IE5vbmUKK2ltcG9ydCBrZXlyaW5nCiAKIF9sb2cgPSBsb2dnaW5nLmdldExv Z2dlcihfX25hbWVfXykKIApAQCAtMTY0LDggKzE2MCw4IEBAIGNsYXNzIENyZWRlbnRpYWxzKG9i amVjdCk6CiAgICAgICAgIGlmIHVzZXJuYW1lIGFuZCBub3QgcGFzc3dvcmQgYW5kIHNlbGYuX2tl eXJpbmcgYW5kIHVzZV9zdG9yZWRfY3JlZGVudGlhbHM6CiAgICAgICAgICAgICB0cnk6CiAgICAg ICAgICAgICAgICAgcGFzc3dvcmQgPSBzZWxmLl9rZXlyaW5nLmdldF9wYXNzd29yZChzZWxmLmhv c3QsIHVzZXJuYW1lKQotICAgICAgICAgICAgZXhjZXB0OgotICAgICAgICAgICAgICAgIHBhc3MK KyAgICAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKKyAgICAgICAgICAgICAgICBwcmlu dCgnT2ggbm8sIGdvdCBleGNlcHRpb24gZnJvbSBrZXlyaW5nLmdldHBhc3N3b3JkIScsIHN0cihl KSkKIAogICAgICAgICBpZiBub3QgcGFzc3dvcmQ6CiAgICAgICAgICAgICBwYXNzd29yZCA9IHVz ZXIucHJvbXB0X3Bhc3N3b3JkKCIlcyBwYXNzd29yZCBmb3IgJXM6ICIgJSAoc2VsZi5ob3N0LCB1 c2VybmFtZSkpCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggNmU5MmU0 ZTJlMGYzZWUwZjlhN2YyNTMxNGQ3NzcwZGIyYTNjNGFmNi4uYjc1MmU4MTk4N2RlYzAwNmQ2ZWM3 NmFkYmU1NmFiOGU5NTEzMjFkNiAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTEwLTA3ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRh bnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIHdlYmtpdHB5IGtleXJpbmcgdGVzdCBidWcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTM4MQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU291cmNlL01h a2VmaWxlOgorCiAyMDIxLTEwLTA3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdh bGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBSZWVuYWJsZSAtZnZpc2liaWxpdHk9aGlkZGVuCg== 440661 2021-10-08 13:12:33 -0700 2021-10-08 13:13:58 -0700 Patch bug-231381-20211008151232.patch text/plain 3789 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzODM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2QwOTA3ZDAwNDdhYTFhYTJiODNiYjMyNzk1Y2RlNjRl YjhkYmI4My4uODI0ZTJkYTc2YTMzZDcyMWNjZDNhNzE1NmM0YWY4ODU5MzZhY2NjMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTEwLTA4ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3Jn PgorCisgICAgICAgIFtMaW51eF0gRW5zdXJlIHdlYmtpdHB5IHNlY3JldCBzdG9yYWdlIHdvcmtz IHN1Y2Nlc3NmdWxseSB1c2luZyBvbmx5IGF1dG9pbnN0YWxsZWQgbGlicmFyaWVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzEzODEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFVwZGF0ZSB0 byB0aGUgbGF0ZXN0IHB5dGhvbi1rZXlyaW5nIGFuZCBweXRob24tc2VjcmV0c2VydmljZS4KKwor ICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19p bml0X18ucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5weToKKwogMjAy MS0xMC0wOCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAg W2NvbnRyaWJ1dG9ycy5qc29uXSBTdXBwb3J0IEdpdEh1YiB1c2VybmFtZXMKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0 X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5 L19faW5pdF9fLnB5CmluZGV4IDYwNzJjNDY2ODhlNWQ5NzYxOGFlZGNjMDA2OGUyY2VkOWM1Nzk4 YmQuLjViNWE5ZDFhZjdlMTgyNzg1ZmQ4ODFkZjM2MDZmMTM2MWJkODI4MjMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0 X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNv cmVweS9fX2luaXRfXy5weQpAQCAtNjEsNyArNjEsNiBAQCBBdXRvSW5zdGFsbC5yZWdpc3RlcihQ YWNrYWdlKCdkYXRldXRpbCcsIFZlcnNpb24oMiwgOCwgMSksIHB5cGlfbmFtZT0ncHl0aG9uLWRh dAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZW50cnlwb2ludHMnLCBWZXJzaW9uKDAs IDMsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Z1bmNzaWdzJywgVmVyc2lv bigxLCAwLCAyKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdpZG5hJywgVmVyc2lv bigyLCAxMCkpKQotQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgna2V5cmluZycsIFZlcnNp b24oNywgMywgMSkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncGFja2FnaW5nJywg VmVyc2lvbigyMCwgNCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncHlwYXJzaW5n JywgVmVyc2lvbigyLCA0LCA3KSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdyZXF1 ZXN0cycsIFZlcnNpb24oMiwgMjQpKSkKQEAgLTczLDggKzcyLDEzIEBAIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ3VybGxpYjMnLCBWZXJzaW9uKDEsIDI1LCAxMCkpKQogQXV0b0luc3Rh bGwucmVnaXN0ZXIoUGFja2FnZSgnd2hlZWwnLCBWZXJzaW9uKDAsIDM1LCAxKSkpCiBBdXRvSW5z dGFsbC5yZWdpc3RlcihQYWNrYWdlKCd3aGljaGNyYWZ0JywgVmVyc2lvbigwLCA2LCAxKSkpCiAK LSMgVGhpcyBpcyBuZWVkZWQgZm9yIHB5dGhvbi1rZXlyaW5nLgotaWYgc3lzLnBsYXRmb3JtID09 ICdsaW51eCc6Ci0gICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnc2VjcmV0c3RvcmFn ZScsIFZlcnNpb24oMiwgMywgMSkpKQoraWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCA2KToKKyAg ICBrZXlyaW5nX2RlcHMgPSBbXQorICAgIGlmIHN5cy5wbGF0Zm9ybSA9PSAnbGludXgnOgorICAg ICAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdqZWVwbmV5JywgVmVyc2lvbigwLCA3 LCAxKSkpCisgICAgICAgIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3NlY3JldHN0b3Jh Z2UnLCBWZXJzaW9uKDMsIDMsIDEpKSkKKyAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdl KCdrZXlyaW5nJywgVmVyc2lvbigyMywgMiwgMSkpKQorZWxzZToKKyAgICBBdXRvSW5zdGFsbC5y ZWdpc3RlcihQYWNrYWdlKCdrZXlyaW5nJywgVmVyc2lvbigxOCwgMCwgMSkpKQogCiBuYW1lID0g J3dlYmtpdGNvcmVweScKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0 X18ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L19faW5pdF9fLnB5CmluZGV4IDQ3YTc4YjBh NDgxYmU0MDZhNTAwYTIxMjQxMjNiYWVhYjg1MDZjYWIuLjQ0YTE2YjI5ZWZkZTJlMmZjYzU3M2Ex MTVkN2NiYThjNmY3MzhlOTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvX19p bml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5weQpAQCAtNDcs NiArNDcsMTEgQEAgZWxpZiBzeXMudmVyc2lvbl9pbmZvID49ICgyLCA3KSBhbmQgc3lzLnZlcnNp b25faW5mbyA8ICgzLCk6CiBlbHNlOgogICAgIHJhaXNlIEltcG9ydEVycm9yKCJVbnN1cHBvcnRl ZCBQeXRob24gdmVyc2lvbiEgKCVzKSIgJSBzeXMudmVyc2lvbikKIAoraWYgc3lzLnZlcnNpb25f aW5mbyA+PSAoMywgNik6CisgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnaW1wb3J0 bGliX21ldGFkYXRhJywgVmVyc2lvbig0LCA4LCAxKSkpCitlbHNlOgorICAgIEF1dG9JbnN0YWxs LnJlZ2lzdGVyKFBhY2thZ2UoJ2ltcG9ydGxpYl9tZXRhZGF0YScsIFZlcnNpb24oMSwgNywgMCkp KQorCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdhdG9taWN3cml0ZXMnLCBWZXJzaW9u KDEsIDEsIDUpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2F0dHInLCBWZXJzaW9u KDE4LCAxLCAwKSwgcHlwaV9uYW1lPSdhdHRycycpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFj a2FnZSgnYnM0JywgVmVyc2lvbig0LCA5LCAzKSwgcHlwaV9uYW1lPSdiZWF1dGlmdWxzb3VwNCcp KQpAQCAtNTQsNyArNTksNiBAQCBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdjb25maWdw YXJzZXInLCBWZXJzaW9uKDQsIDAsIDIpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2Uo J2NvbnRleHRsaWIyJywgVmVyc2lvbigwLCA2LCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQ YWNrYWdlKCdjb3ZlcmFnZScsIFZlcnNpb24oNSwgMiwgMSkpKQogQXV0b0luc3RhbGwucmVnaXN0 ZXIoUGFja2FnZSgnZnVuY3NpZ3MnLCBWZXJzaW9uKDEsIDAsIDIpKSkKLUF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ2ltcG9ydGxpYl9tZXRhZGF0YScsIFZlcnNpb24oMSwgNywgMCkpKQog QXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZ2Vuc2hpJywgVmVyc2lvbigwLCA3LCAzKSwg cHlwaV9uYW1lPSdHZW5zaGknKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2h0bWw1 bGliJywgVmVyc2lvbigxLCAxKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdpbmlj b25maWcnLCBWZXJzaW9uKDEsIDEsIDEpKSkK 440663 2021-10-08 13:21:57 -0700 2021-10-08 14:43:46 -0700 Patch bug-231381-20211008152156.patch text/plain 4516 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzODM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2QwOTA3ZDAwNDdhYTFhYTJiODNiYjMyNzk1Y2RlNjRl YjhkYmI4My4uZmQ4M2VhZDg4NDhmYmQ5NDA1ZWJmZDcwYjFmYWNkYTgxOWIyODdlYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDIxLTEwLTA4ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3Jn PgorCisgICAgICAgIEVuc3VyZSB3ZWJraXRweSBzZWNyZXQgc3RvcmFnZSB3b3JrcyBzdWNjZXNz ZnVsbHkgb24gTGludXggdXNpbmcgb25seSBhdXRvaW5zdGFsbGVkIGxpYnJhcmllcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMzgxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIHRvIHRoZSBs YXRlc3QgcHl0aG9uLWtleXJpbmcgYW5kIHB5dGhvbi1zZWNyZXRzdG9yYWdlIHdoZW4gdXNpbmcg cHl0aG9uIDMuNiBvciBuZXdlci4KKyAgICAgICAgT3RoZXJ3aXNlLCB1c2UgdGhlIGxhdGVzdCB2 ZXJzaW9uIHRoYXQgc3RpbGwgc3VwcG9ydHMgcHl0aG9uMi4gVGhpcyB2ZXJzaW9uIGlzIGJyb2tl biBvbgorICAgICAgICBMaW51eCwgYnV0IHRoYXQncyBPSyBiZWNhdXNlIHdlIGRvIG5vdCBjYXJl IGFib3V0IHB5dGhvbjIgb3IgcHl0aG9uIDMuNSBhbnltb3JlLiBJJ20ganVzdAorICAgICAgICB0 cnlpbmcgdG8gYXZvaWQgZ3JhdHVpdG91cyBicmVha2FnZS4KKworICAgICAgICBBdXRvaW5zdGFs bCBweXRob24tamVlcGV5LCBhIEQtQnVzIGxpYnJhcnkgcmVxdWlyZWQgYnkgcHl0aG9uLXNlY3Jl dHN0b3JhZ2UuCisKKyAgICAgICAgVXBkYXRlIHRvIGEgbmV3ZXIgdmVyc2lvbiBvZiBpbXBvcnRs aWJfbWV0YWRhdGEgd2hlbiB1c2luZyBweXRob24gMy42IG9yIG5ld2VyLiBGb3Igb2xkZXIKKyAg ICAgICAgdmVyc2lvbnMgb2YgcHl0aG9uLCBzdGljayB0byB0aGUgb2xkZXIgdmVyc2lvbi4gVGhl cmUgYXJlIHNvbWUgQVBJIGJyZWFrcyBpbiB0aGlzIGxpYnJhcnkKKyAgICAgICAgdGhhdCBJIGhv cGUgb25seSBhZmZlY3QgcHl0aG9uLWtleXJpbmcuIFdlIGhhdmUgb3RoZXIgc29mdHdhcmUgdGhh dCBkZXBlbmRzIG9uIHRoaXMgbGlicmFyeSwKKyAgICAgICAgYnV0IEkgdGhpbmsgaXQncyBPSyB3 aXRoIGVpdGhlciB2ZXJzaW9uLiB0ZXN0LXdlYmtpdHB5IHdpbGwgYmUgdGhlIGFyYml0ZXIgb2Yg dGhhdC4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRj b3JlcHkvX19pbml0X18ucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5w eToKKwogMjAyMS0xMC0wOCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAK ICAgICAgICAgW2NvbnRyaWJ1dG9ycy5qc29uXSBTdXBwb3J0IEdpdEh1YiB1c2VybmFtZXMKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3Jl cHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Vi a2l0Y29yZXB5L19faW5pdF9fLnB5CmluZGV4IDYwNzJjNDY2ODhlNWQ5NzYxOGFlZGNjMDA2OGUy Y2VkOWM1Nzk4YmQuLmIyNDc3NzgzNmJkMzJmZjlhMTRhM2NjNDhlOWYwMmEwNzJjMmE0NTcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3Jl cHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5 L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQpAQCAtNjEsNyArNjEsNiBAQCBBdXRvSW5zdGFsbC5y ZWdpc3RlcihQYWNrYWdlKCdkYXRldXRpbCcsIFZlcnNpb24oMiwgOCwgMSksIHB5cGlfbmFtZT0n cHl0aG9uLWRhdAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZW50cnlwb2ludHMnLCBW ZXJzaW9uKDAsIDMsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Z1bmNzaWdz JywgVmVyc2lvbigxLCAwLCAyKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdpZG5h JywgVmVyc2lvbigyLCAxMCkpKQotQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgna2V5cmlu ZycsIFZlcnNpb24oNywgMywgMSkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncGFj a2FnaW5nJywgVmVyc2lvbigyMCwgNCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgn cHlwYXJzaW5nJywgVmVyc2lvbigyLCA0LCA3KSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNr YWdlKCdyZXF1ZXN0cycsIFZlcnNpb24oMiwgMjQpKSkKQEAgLTczLDggKzcyLDEyIEBAIEF1dG9J bnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3VybGxpYjMnLCBWZXJzaW9uKDEsIDI1LCAxMCkpKQog QXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnd2hlZWwnLCBWZXJzaW9uKDAsIDM1LCAxKSkp CiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCd3aGljaGNyYWZ0JywgVmVyc2lvbigwLCA2 LCAxKSkpCiAKLSMgVGhpcyBpcyBuZWVkZWQgZm9yIHB5dGhvbi1rZXlyaW5nLgotaWYgc3lzLnBs YXRmb3JtID09ICdsaW51eCc6Ci0gICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnc2Vj cmV0c3RvcmFnZScsIFZlcnNpb24oMiwgMywgMSkpKQoraWYgc3lzLnZlcnNpb25faW5mbyA+ICgz LCA2KToKKyAgICBpZiBzeXMucGxhdGZvcm0gPT0gJ2xpbnV4JzoKKyAgICAgICAgQXV0b0luc3Rh bGwucmVnaXN0ZXIoUGFja2FnZSgnamVlcG5leScsIFZlcnNpb24oMCwgNywgMSkpKQorICAgICAg ICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdzZWNyZXRzdG9yYWdlJywgVmVyc2lvbigz LCAzLCAxKSkpCisgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgna2V5cmluZycsIFZl cnNpb24oMjMsIDIsIDEpKSkKK2Vsc2U6CisgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2Fn ZSgna2V5cmluZycsIFZlcnNpb24oMTgsIDAsIDEpKSkKIAogbmFtZSA9ICd3ZWJraXRjb3JlcHkn CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L19faW5pdF9fLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5weQppbmRleCA0N2E3OGIwYTQ4MWJlNDA2YTUwMGEy MTI0MTIzYmFlYWI4NTA2Y2FiLi40NGExNmIyOWVmZGUyZTJmY2M1NzNhMTE1ZDdjYmE4YzZmNzM4 ZTk4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L19faW5pdF9fLnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkKQEAgLTQ3LDYgKzQ3LDExIEBAIGVs aWYgc3lzLnZlcnNpb25faW5mbyA+PSAoMiwgNykgYW5kIHN5cy52ZXJzaW9uX2luZm8gPCAoMywp OgogZWxzZToKICAgICByYWlzZSBJbXBvcnRFcnJvcigiVW5zdXBwb3J0ZWQgUHl0aG9uIHZlcnNp b24hICglcykiICUgc3lzLnZlcnNpb24pCiAKK2lmIHN5cy52ZXJzaW9uX2luZm8gPj0gKDMsIDYp OgorICAgIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2ltcG9ydGxpYl9tZXRhZGF0YScs IFZlcnNpb24oNCwgOCwgMSkpKQorZWxzZToKKyAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNr YWdlKCdpbXBvcnRsaWJfbWV0YWRhdGEnLCBWZXJzaW9uKDEsIDcsIDApKSkKKwogQXV0b0luc3Rh bGwucmVnaXN0ZXIoUGFja2FnZSgnYXRvbWljd3JpdGVzJywgVmVyc2lvbigxLCAxLCA1KSkpCiBB dXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdhdHRyJywgVmVyc2lvbigxOCwgMSwgMCksIHB5 cGlfbmFtZT0nYXR0cnMnKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2JzNCcsIFZl cnNpb24oNCwgOSwgMyksIHB5cGlfbmFtZT0nYmVhdXRpZnVsc291cDQnKSkKQEAgLTU0LDcgKzU5 LDYgQEAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnY29uZmlncGFyc2VyJywgVmVyc2lv big0LCAwLCAyKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdjb250ZXh0bGliMics IFZlcnNpb24oMCwgNiwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnY292ZXJh Z2UnLCBWZXJzaW9uKDUsIDIsIDEpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Z1 bmNzaWdzJywgVmVyc2lvbigxLCAwLCAyKSkpCi1BdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdl KCdpbXBvcnRsaWJfbWV0YWRhdGEnLCBWZXJzaW9uKDEsIDcsIDApKSkKIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ2dlbnNoaScsIFZlcnNpb24oMCwgNywgMyksIHB5cGlfbmFtZT0nR2Vu c2hpJykpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdodG1sNWxpYicsIFZlcnNpb24o MSwgMSkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnaW5pY29uZmlnJywgVmVyc2lv bigxLCAxLCAxKSkpCg== 440675 2021-10-08 14:43:49 -0700 2021-10-08 15:21:27 -0700 Patch bug-231381-20211008164348.patch text/plain 5472 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzODM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTA2MWZkZjA0MDdhNzk3NzI1MDg3YWFmYmM5Y2EwMDUz ZjdmYzExNi4uYjdhNWI0MGUyZDgxYjc2ZTJkNGFjNGJkOTY3Y2U2YTQyOGJmNzQ1YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIxLTEwLTA4ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3Jn PgorCisgICAgICAgIEVuc3VyZSB3ZWJraXRweSBzZWNyZXQgc3RvcmFnZSB3b3JrcyBzdWNjZXNz ZnVsbHkgb24gTGludXggdXNpbmcgb25seSBhdXRvaW5zdGFsbGVkIGxpYnJhcmllcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMzgxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgSm9uYXRoYW4gQmVkYXJkLgorCisgICAgICAgIFVwZGF0ZSB0byB0aGUg bGF0ZXN0IHB5dGhvbi1rZXlyaW5nIGFuZCBweXRob24tc2VjcmV0c3RvcmFnZSB3aGVuIHVzaW5n IHB5dGhvbiAzLjYgb3IgbmV3ZXIuCisgICAgICAgIE90aGVyd2lzZSwgdXNlIHRoZSBsYXRlc3Qg dmVyc2lvbiB0aGF0IHN0aWxsIHN1cHBvcnRzIHB5dGhvbjIuIFRoaXMgdmVyc2lvbiBpcyBicm9r ZW4gb24KKyAgICAgICAgTGludXgsIGJ1dCB0aGF0J3MgT0sgYmVjYXVzZSB3ZSBkbyBub3QgY2Fy ZSBhYm91dCBweXRob24yIG9yIHB5dGhvbiAzLjUgYW55bW9yZS4gSSdtIGp1c3QKKyAgICAgICAg dHJ5aW5nIHRvIGF2b2lkIGdyYXR1aXRvdXMgYnJlYWthZ2UuCisKKyAgICAgICAgQXV0b2luc3Rh bGwgcHl0aG9uLWplZXBleSwgYSBELUJ1cyBsaWJyYXJ5IHJlcXVpcmVkIGJ5IHB5dGhvbi1zZWNy ZXRzdG9yYWdlLgorCisgICAgICAgIFVwZGF0ZSB0byBhIG5ld2VyIHZlcnNpb24gb2YgaW1wb3J0 bGliX21ldGFkYXRhIHdoZW4gdXNpbmcgcHl0aG9uIDMuNiBvciBuZXdlci4gRm9yIG9sZGVyCisg ICAgICAgIHZlcnNpb25zIG9mIHB5dGhvbiwgc3RpY2sgdG8gdGhlIG9sZGVyIHZlcnNpb24uIFRo ZXJlIGFyZSBzb21lIEFQSSBicmVha3MgaW4gdGhpcyBsaWJyYXJ5CisgICAgICAgIHRoYXQgSSBo b3BlIG9ubHkgYWZmZWN0IHB5dGhvbi1rZXlyaW5nLiBXZSBoYXZlIG90aGVyIHNvZnR3YXJlIHRo YXQgZGVwZW5kcyBvbiB0aGlzIGxpYnJhcnksCisgICAgICAgIGJ1dCBJIHRoaW5rIGl0J3MgT0sg d2l0aCBlaXRoZXIgdmVyc2lvbi4gdGVzdC13ZWJraXRweSB3aWxsIGJlIHRoZSBhcmJpdGVyIG9m IHRoYXQuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0dXAu cHk6CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVw eS9fX2luaXRfXy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L19faW5pdF9fLnB5Ogor CiAyMDIxLTEwLTA4ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgog CiAgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXVtXSzJdIEltcGxlbWVudCBTaG93IExheWVyIFRy ZWUgdG8gZHVtcCB0aGUgR3JhcGhpY3NMYXllciB0cmVlCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0dXAucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRjb3JlcHkvc2V0dXAucHkKaW5kZXggZWYyNjgxMjYyN2IzODgwY2ZmOGE4ZTRk NjIxYWZjZDg3YTc0MzU0OC4uNmI4MDU1ZGRiODBjMjBmYTUzZGFmNDJjMTQzNTczYzA0YTczZjNi OCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVw LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weQpA QCAtMzAsNyArMzAsNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dlYmtp dGNvcmVweScsCi0gICAgdmVyc2lvbj0nMC4xMS4yJywKKyAgICB2ZXJzaW9uPScwLjExLjMnLAog ICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGNvbnRhaW5pbmcgdmFyaW91cyBQeXRob24gc3VwcG9y dCBjbGFzc2VzIGFuZCBmdW5jdGlvbnMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgp LAogICAgIGNsYXNzaWZpZXJzPVsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CmluZGV4IDYwNzJj NDY2ODhlNWQ5NzYxOGFlZGNjMDA2OGUyY2VkOWM1Nzk4YmQuLmRkZmRiMmQ1N2I1NGI5NjMwODAz NTYzMThhMjdiNjk1MTllMTMwMTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQpAQCAtNDMs NyArNDMsNyBAQCBmcm9tIHdlYmtpdGNvcmVweS5jYWxsX2J5X25lZWQgaW1wb3J0IENhbGxCeU5l ZWQKIGZyb20gd2Via2l0Y29yZXB5LmVkaXRvciBpbXBvcnQgRWRpdG9yCiBmcm9tIHdlYmtpdGNv cmVweS5maWxlX2xvY2sgaW1wb3J0IEZpbGVMb2NrCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDEx LCAyKQordmVyc2lvbiA9IFZlcnNpb24oMCwgMTEsIDMpCiAKIGZyb20gd2Via2l0Y29yZXB5LmF1 dG9pbnN0YWxsIGltcG9ydCBQYWNrYWdlLCBBdXRvSW5zdGFsbAogaWYgc3lzLnZlcnNpb25faW5m byA+ICgzLCAwKToKQEAgLTYxLDcgKzYxLDYgQEAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2Fn ZSgnZGF0ZXV0aWwnLCBWZXJzaW9uKDIsIDgsIDEpLCBweXBpX25hbWU9J3B5dGhvbi1kYXQKIEF1 dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2VudHJ5cG9pbnRzJywgVmVyc2lvbigwLCAzLCAw KSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdmdW5jc2lncycsIFZlcnNpb24oMSwg MCwgMikpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnaWRuYScsIFZlcnNpb24oMiwg MTApKSkKLUF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2tleXJpbmcnLCBWZXJzaW9uKDcs IDMsIDEpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3BhY2thZ2luZycsIFZlcnNp b24oMjAsIDQpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3B5cGFyc2luZycsIFZl cnNpb24oMiwgNCwgNykpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncmVxdWVzdHMn LCBWZXJzaW9uKDIsIDI0KSkpCkBAIC03Myw4ICs3MiwxMiBAQCBBdXRvSW5zdGFsbC5yZWdpc3Rl cihQYWNrYWdlKCd1cmxsaWIzJywgVmVyc2lvbigxLCAyNSwgMTApKSkKIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ3doZWVsJywgVmVyc2lvbigwLCAzNSwgMSkpKQogQXV0b0luc3RhbGwu cmVnaXN0ZXIoUGFja2FnZSgnd2hpY2hjcmFmdCcsIFZlcnNpb24oMCwgNiwgMSkpKQogCi0jIFRo aXMgaXMgbmVlZGVkIGZvciBweXRob24ta2V5cmluZy4KLWlmIHN5cy5wbGF0Zm9ybSA9PSAnbGlu dXgnOgotICAgIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3NlY3JldHN0b3JhZ2UnLCBW ZXJzaW9uKDIsIDMsIDEpKSkKK2lmIHN5cy52ZXJzaW9uX2luZm8gPj0gKDMsIDYpOgorICAgIGlm IHN5cy5wbGF0Zm9ybSA9PSAnbGludXgnOgorICAgICAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQ YWNrYWdlKCdqZWVwbmV5JywgVmVyc2lvbigwLCA3LCAxKSkpCisgICAgICAgIEF1dG9JbnN0YWxs LnJlZ2lzdGVyKFBhY2thZ2UoJ3NlY3JldHN0b3JhZ2UnLCBWZXJzaW9uKDMsIDMsIDEpKSkKKyAg ICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdrZXlyaW5nJywgVmVyc2lvbigyMywgMiwg MSkpKQorZWxzZToKKyAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdrZXlyaW5nJywg VmVyc2lvbigxOCwgMCwgMSkpKQogCiBuYW1lID0gJ3dlYmtpdGNvcmVweScKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L19faW5pdF9fLnB5CmluZGV4IDQ3YTc4YjBhNDgxYmU0MDZhNTAwYTIxMjQxMjNiYWVhYjg1 MDZjYWIuLjQ0YTE2YjI5ZWZkZTJlMmZjYzU3M2ExMTVkN2NiYThjNmY3MzhlOTggMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9fX2luaXRfXy5weQpAQCAtNDcsNiArNDcsMTEgQEAgZWxpZiBzeXMudmVyc2lv bl9pbmZvID49ICgyLCA3KSBhbmQgc3lzLnZlcnNpb25faW5mbyA8ICgzLCk6CiBlbHNlOgogICAg IHJhaXNlIEltcG9ydEVycm9yKCJVbnN1cHBvcnRlZCBQeXRob24gdmVyc2lvbiEgKCVzKSIgJSBz eXMudmVyc2lvbikKIAoraWYgc3lzLnZlcnNpb25faW5mbyA+PSAoMywgNik6CisgICAgQXV0b0lu c3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnaW1wb3J0bGliX21ldGFkYXRhJywgVmVyc2lvbig0LCA4 LCAxKSkpCitlbHNlOgorICAgIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2ltcG9ydGxp Yl9tZXRhZGF0YScsIFZlcnNpb24oMSwgNywgMCkpKQorCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQ YWNrYWdlKCdhdG9taWN3cml0ZXMnLCBWZXJzaW9uKDEsIDEsIDUpKSkKIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ2F0dHInLCBWZXJzaW9uKDE4LCAxLCAwKSwgcHlwaV9uYW1lPSdhdHRy cycpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnYnM0JywgVmVyc2lvbig0LCA5LCAz KSwgcHlwaV9uYW1lPSdiZWF1dGlmdWxzb3VwNCcpKQpAQCAtNTQsNyArNTksNiBAQCBBdXRvSW5z dGFsbC5yZWdpc3RlcihQYWNrYWdlKCdjb25maWdwYXJzZXInLCBWZXJzaW9uKDQsIDAsIDIpKSkK IEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2NvbnRleHRsaWIyJywgVmVyc2lvbigwLCA2 LCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdjb3ZlcmFnZScsIFZlcnNpb24o NSwgMiwgMSkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZnVuY3NpZ3MnLCBWZXJz aW9uKDEsIDAsIDIpKSkKLUF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2ltcG9ydGxpYl9t ZXRhZGF0YScsIFZlcnNpb24oMSwgNywgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2Fn ZSgnZ2Vuc2hpJywgVmVyc2lvbigwLCA3LCAzKSwgcHlwaV9uYW1lPSdHZW5zaGknKSkKIEF1dG9J bnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2h0bWw1bGliJywgVmVyc2lvbigxLCAxKSkpCiBBdXRv SW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdpbmljb25maWcnLCBWZXJzaW9uKDEsIDEsIDEpKSkK