239734 2022-04-25 11:23:18 -0700 [css-logical] Border side shorthands should not be logical/physical 2022-04-26 19:03:24 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 236199 238888 1 obrufau obrufau darin esprehn+autocc ews-watchlist glenn gyuyoung.kim joepeck koivisto macpherson menard ntim simon.fraser webkit-bug-importer oldest_to_newest 1864155 0 obrufau 2022-04-25 11:23:18 -0700 Currently, these shorthands belong to a logical property group: - border-top - border-right - border-bottom - border-left - border-block-start - border-block-end - border-inline-start - border-inline-end This doesn't make much sense, no need to e.g. map border-block-start to border-top, it should just expand to border-block-start-{width,style,color}. Then we can keep the special behavior confined to the longhands. Right now I don't think this is observable, but this refactoring is needed for bug 236199. My patch there (including this change) was previously reverted, so I guess it's safer to do the refactoring here. 1864170 1 obrufau 2022-04-25 11:43:07 -0700 This change will also align the implementation with the spec: https://drafts.csswg.org/css-logical/#box > Each set of parallel flow-relative properties and physical properties (IGNORING SHORTHAND PROPERTIES) related by setting equivalent styles on the various sides or dimensions of a box, forms a logical property group. 1864176 2 458288 obrufau 2022-04-25 11:49:07 -0700 Created attachment 458288 Patch 1864181 3 458290 obrufau 2022-04-25 12:00:02 -0700 Created attachment 458290 Patch 1864310 4 458290 ntim 2022-04-25 17:27:24 -0700 Comment on attachment 458290 Patch Thanks for fixing this! 1864473 5 458372 obrufau 2022-04-26 08:54:16 -0700 Created attachment 458372 Patch 1864474 6 obrufau 2022-04-26 08:55:15 -0700 Had to update CSSPropertyAnimation.cpp to avoid an assert failure in debug. 1864696 7 ews-feeder 2022-04-26 19:02:44 -0700 Committed r293493 (250026@main): <https://commits.webkit.org/250026@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458372. 1864697 8 webkit-bug-importer 2022-04-26 19:03:24 -0700 <rdar://problem/92372140> 458288 2022-04-25 11:49:07 -0700 2022-04-25 11:59:57 -0700 Patch bug-239734-20220425204906.patch text/plain 8820 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTEzYWIzZWU3NzViMTU2 ZDM0MTFiMzFhYTJiZDFmZjUyOGUyNTE4MC4uZWQ5MDgzODgxN2I4NWY3ZjAzZWEzNjVkZTFkMGEy NjUzNjRmZjhjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIyLTA0LTI1ICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1sb2dpY2FsXSBT aWRlIGJvcmRlciBzaG9ydGhhbmRzIHNob3VsZCBub3QgYmUgbG9naWNhbC9waHlzaWNhbAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM5NzM0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gdGVzdCBzaW5j ZSBub3cgdGhlcmUgc2hvdWxkIGJlIG5vIG9ic2VydmFibGUgY2hhbmdlIGluIGJlaGF2aW9yLgor CisgICAgICAgIEhvd2V2ZXIsIHRoaXMgcmVmYWN0b3Jpbmcgd2lsbCBiZSBuZWVkZWQgZm9yIGJ1 ZyAyMzYxOTkuCisKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnZhbHVlRm9yUHJv cGVydHlJblN0eWxlKToKKyAgICAgICAgQWRkIGNvZGUgZm9yIHNlcmlhbGl6aW5nIGxvZ2ljYWwg c2lkZSBib3JkZXIgc2hvcnRoYW5kcy4KKworICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0aWVzLmpz b246CisgICAgICAgIFN0b3Agc2lkZSBib3JkZXIgc2hvcnRoYW5kcyBmcm9tIGJlaW5nIGluIGEg bG9naWNhbCBwcm9wZXJ0eSBncm91cC4KKyAgICAgICAgVGhleSB3aWxsIGp1c3QgZXhwYW5kIGlu dG8gbG9naWNhbCBvciBwaHlzaWNhbCBsb25naGFuZHMsIGJ1dCB0aGUKKyAgICAgICAgc2hvcnRo YW5kcyB0aGVtc2VsdmVzIHdpbGwgYmUgbm9ybWFsLgorCisgICAgICAgICogY3NzL21ha2Vwcm9w LnBsOgorICAgICAgICAoYWRkUHJvcGVydHkpOgorICAgICAgICBBc3NlcnQgdGhhdCBubyBzaG9y dGhhbmQgYmVsb25ncyB0byBhIGxvZ2ljYWwgcHJvcGVydHkgZ3JvdXAuCisKIDIwMjItMDQtMjAg IE9yaW9sIEJydWZhdSAgPG9icnVmYXVAaWdhbGlhLmNvbT4KIAogICAgICAgICBbY3NzLWNhc2Nh ZGVdIE9wdGltaXplIGNvZGUgZm9yIGRlZmVycmVkIHByb3BlcnRpZXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwIGIvU291cmNl L1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKaW5kZXggYWU2OTYx Yzk0ZmQ2YzdkMmNjNDhkMGFkMTIyZjNkOWU0YmZkZWM5Ni4uNTUzMTNkMGYxMjI0YWRiYzljNGE4 OWU2NzYxMzk0NjUwZmI0M2JmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Nv bXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Nv bXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTQwNDMsNiArNDA0MywxMCBAQCBSZWZQdHI8 Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnZhbHVlRm9yUHJvcGVydHlJblN0eWxl KGNvbnN0IFJlbmRlclN0eQogICAgICAgICB9CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3Jk ZXJCbG9ja0NvbG9yOgogICAgICAgICAgICAgcmV0dXJuIGdldENTU1Byb3BlcnR5VmFsdWVzRm9y MlNpZGVzU2hvcnRoYW5kKGJvcmRlckJsb2NrQ29sb3JTaG9ydGhhbmQoKSk7CisgICAgICAgIGNh c2UgQ1NTUHJvcGVydHlCb3JkZXJCbG9ja0VuZDoKKyAgICAgICAgICAgIHJldHVybiBnZXRDU1NQ cm9wZXJ0eVZhbHVlc0ZvclNob3J0aGFuZFByb3BlcnRpZXMoYm9yZGVyQmxvY2tFbmRTaG9ydGhh bmQoKSk7CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJCbG9ja1N0YXJ0OgorICAgICAg ICAgICAgcmV0dXJuIGdldENTU1Byb3BlcnR5VmFsdWVzRm9yU2hvcnRoYW5kUHJvcGVydGllcyhi b3JkZXJCbG9ja1N0YXJ0U2hvcnRoYW5kKCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9y ZGVyQmxvY2tTdHlsZToKICAgICAgICAgICAgIHJldHVybiBnZXRDU1NQcm9wZXJ0eVZhbHVlc0Zv cjJTaWRlc1Nob3J0aGFuZChib3JkZXJCbG9ja1N0eWxlU2hvcnRoYW5kKCkpOwogICAgICAgICBj YXNlIENTU1Byb3BlcnR5Qm9yZGVyQmxvY2tXaWR0aDoKQEAgLTQwNjEsNiArNDA2NSwxMCBAQCBS ZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnZhbHVlRm9yUHJvcGVydHlJ blN0eWxlKGNvbnN0IFJlbmRlclN0eQogICAgICAgICB9CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVy dHlCb3JkZXJJbmxpbmVDb2xvcjoKICAgICAgICAgICAgIHJldHVybiBnZXRDU1NQcm9wZXJ0eVZh bHVlc0ZvcjJTaWRlc1Nob3J0aGFuZChib3JkZXJJbmxpbmVDb2xvclNob3J0aGFuZCgpKTsKKyAg ICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlcklubGluZUVuZDoKKyAgICAgICAgICAgIHJldHVy biBnZXRDU1NQcm9wZXJ0eVZhbHVlc0ZvclNob3J0aGFuZFByb3BlcnRpZXMoYm9yZGVySW5saW5l RW5kU2hvcnRoYW5kKCkpOworICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVySW5saW5lU3Rh cnQ6CisgICAgICAgICAgICByZXR1cm4gZ2V0Q1NTUHJvcGVydHlWYWx1ZXNGb3JTaG9ydGhhbmRQ cm9wZXJ0aWVzKGJvcmRlcklubGluZVN0YXJ0U2hvcnRoYW5kKCkpOwogICAgICAgICBjYXNlIENT U1Byb3BlcnR5Qm9yZGVySW5saW5lU3R5bGU6CiAgICAgICAgICAgICByZXR1cm4gZ2V0Q1NTUHJv cGVydHlWYWx1ZXNGb3IyU2lkZXNTaG9ydGhhbmQoYm9yZGVySW5saW5lU3R5bGVTaG9ydGhhbmQo KSk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJJbmxpbmVXaWR0aDoKQEAgLTQyMTIs MjEgKzQyMjAsMTcgQEAgUmVmUHRyPENTU1ZhbHVlPiBDb21wdXRlZFN0eWxlRXh0cmFjdG9yOjp2 YWx1ZUZvclByb3BlcnR5SW5TdHlsZShjb25zdCBSZW5kZXJTdHkKICAgICAgICAgICAgIGJyZWFr OwogCiAgICAgICAgIC8qIERpcmVjdGlvbmFsIHByb3BlcnRpZXMgYXJlIHJlc29sdmVkIGJ5IHJl c29sdmVEaXJlY3Rpb25Bd2FyZVByb3BlcnR5KCkgYmVmb3JlIHRoZSBzd2l0Y2guICovCi0gICAg ICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJCbG9ja0VuZDoKICAgICAgICAgY2FzZSBDU1NQcm9w ZXJ0eUJvcmRlckJsb2NrRW5kQ29sb3I6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJC bG9ja0VuZFN0eWxlOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyQmxvY2tFbmRXaWR0 aDoKLSAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlckJsb2NrU3RhcnQ6CiAgICAgICAgIGNh c2UgQ1NTUHJvcGVydHlCb3JkZXJCbG9ja1N0YXJ0Q29sb3I6CiAgICAgICAgIGNhc2UgQ1NTUHJv cGVydHlCb3JkZXJCbG9ja1N0YXJ0U3R5bGU6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3Jk ZXJCbG9ja1N0YXJ0V2lkdGg6Ci0gICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJFbmRFbmRS YWRpdXM6ICAgICAgICAKLSAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlckVuZFN0YXJ0UmFk aXVzOiAgICAgICAgCi0gICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJJbmxpbmVFbmQ6Cisg ICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJFbmRFbmRSYWRpdXM6CisgICAgICAgIGNhc2Ug Q1NTUHJvcGVydHlCb3JkZXJFbmRTdGFydFJhZGl1czoKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0 eUJvcmRlcklubGluZUVuZENvbG9yOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVySW5s aW5lRW5kU3R5bGU6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJJbmxpbmVFbmRXaWR0 aDoKLSAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlcklubGluZVN0YXJ0OgogICAgICAgICBj YXNlIENTU1Byb3BlcnR5Qm9yZGVySW5saW5lU3RhcnRDb2xvcjoKICAgICAgICAgY2FzZSBDU1NQ cm9wZXJ0eUJvcmRlcklubGluZVN0YXJ0U3R5bGU6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlC b3JkZXJJbmxpbmVTdGFydFdpZHRoOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NT U1Byb3BlcnRpZXMuanNvbiBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0aWVzLmpzb24K aW5kZXggM2NiZWYyMDEzYjUxNTNiMmE4YmQ3MzQyZTFkZDMxNjFmZDQ4MGZhOS4uMTQwODM4ZjEx ZmI5ODg2MTY0YTFkNDJiMzAzNWU1YWIxNjM2NjJiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvY3NzL0NTU1Byb3BlcnRpZXMuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJv cGVydGllcy5qc29uCkBAIC0xMzQyLDExICsxMzQyLDcgQEAKICAgICAgICAgICAgICAgICAgICAg ImJvcmRlci1ibG9jay1lbmQtd2lkdGgiLAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLWJs b2NrLWVuZC1zdHlsZSIsCiAgICAgICAgICAgICAgICAgICAgICJib3JkZXItYmxvY2stZW5kLWNv bG9yIgotICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAgICAgImxvZ2ljYWwtcHJvcGVy dHktZ3JvdXAiOiB7Ci0gICAgICAgICAgICAgICAgICAgICJuYW1lIjogImJvcmRlciIsCi0gICAg ICAgICAgICAgICAgICAgICJyZXNvbHZlciI6ICJibG9jay1lbmQiCi0gICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAic3BlY2lm aWNhdGlvbiI6IHsKICAgICAgICAgICAgICAgICAiY2F0ZWdvcnkiOiAiY3NzLWxvZ2ljYWwtcHJv cHMiLApAQCAtMTQyMywxMSArMTQxOSw3IEBACiAgICAgICAgICAgICAgICAgICAgICJib3JkZXIt YmxvY2stc3RhcnQtd2lkdGgiLAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLWJsb2NrLXN0 YXJ0LXN0eWxlIiwKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1ibG9jay1zdGFydC1jb2xv ciIKLSAgICAgICAgICAgICAgICBdLAotICAgICAgICAgICAgICAgICJsb2dpY2FsLXByb3BlcnR5 LWdyb3VwIjogewotICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJib3JkZXIiLAotICAgICAg ICAgICAgICAgICAgICAicmVzb2x2ZXIiOiAiYmxvY2stc3RhcnQiCi0gICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAic3BlY2lm aWNhdGlvbiI6IHsKICAgICAgICAgICAgICAgICAiY2F0ZWdvcnkiOiAiY3NzLWxvZ2ljYWwtcHJv cHMiLApAQCAtMTUyNSwxMSArMTUxNyw3IEBACiAgICAgICAgICAgICAgICAgICAgICJib3JkZXIt Ym90dG9tLXdpZHRoIiwKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1ib3R0b20tc3R5bGUi LAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLWJvdHRvbS1jb2xvciIKLSAgICAgICAgICAg ICAgICBdLAotICAgICAgICAgICAgICAgICJsb2dpY2FsLXByb3BlcnR5LWdyb3VwIjogewotICAg ICAgICAgICAgICAgICAgICAibmFtZSI6ICJib3JkZXIiLAotICAgICAgICAgICAgICAgICAgICAi cmVzb2x2ZXIiOiAiYm90dG9tIgotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBd CiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgInNwZWNpZmljYXRpb24iOiB7CiAgICAgICAg ICAgICAgICAgImNhdGVnb3J5IjogImNzcy1iYWNrZ3JvdW5kcyIsCkBAIC0xNzcwLDExICsxNzU4 LDcgQEAKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1pbmxpbmUtZW5kLXdpZHRoIiwKICAg ICAgICAgICAgICAgICAgICAgImJvcmRlci1pbmxpbmUtZW5kLXN0eWxlIiwKICAgICAgICAgICAg ICAgICAgICAgImJvcmRlci1pbmxpbmUtZW5kLWNvbG9yIgotICAgICAgICAgICAgICAgIF0sCi0g ICAgICAgICAgICAgICAgImxvZ2ljYWwtcHJvcGVydHktZ3JvdXAiOiB7Ci0gICAgICAgICAgICAg ICAgICAgICJuYW1lIjogImJvcmRlciIsCi0gICAgICAgICAgICAgICAgICAgICJyZXNvbHZlciI6 ICJpbmxpbmUtZW5kIgotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBdCiAgICAg ICAgICAgICB9LAogICAgICAgICAgICAgInNwZWNpZmljYXRpb24iOiB7CiAgICAgICAgICAgICAg ICAgImNhdGVnb3J5IjogImNzcy1sb2dpY2FsLXByb3BzIiwKQEAgLTE4NTEsMTEgKzE4MzUsNyBA QAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLWlubGluZS1zdGFydC13aWR0aCIsCiAgICAg ICAgICAgICAgICAgICAgICJib3JkZXItaW5saW5lLXN0YXJ0LXN0eWxlIiwKICAgICAgICAgICAg ICAgICAgICAgImJvcmRlci1pbmxpbmUtc3RhcnQtY29sb3IiCi0gICAgICAgICAgICAgICAgXSwK LSAgICAgICAgICAgICAgICAibG9naWNhbC1wcm9wZXJ0eS1ncm91cCI6IHsKLSAgICAgICAgICAg ICAgICAgICAgIm5hbWUiOiAiYm9yZGVyIiwKLSAgICAgICAgICAgICAgICAgICAgInJlc29sdmVy IjogImlubGluZS1zdGFydCIKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgXQog ICAgICAgICAgICAgfSwKICAgICAgICAgICAgICJzcGVjaWZpY2F0aW9uIjogewogICAgICAgICAg ICAgICAgICJjYXRlZ29yeSI6ICJjc3MtbG9naWNhbC1wcm9wcyIsCkBAIC0xOTUzLDExICsxOTMz LDcgQEAKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1sZWZ0LXdpZHRoIiwKICAgICAgICAg ICAgICAgICAgICAgImJvcmRlci1sZWZ0LXN0eWxlIiwKICAgICAgICAgICAgICAgICAgICAgImJv cmRlci1sZWZ0LWNvbG9yIgotICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAgICAgImxv Z2ljYWwtcHJvcGVydHktZ3JvdXAiOiB7Ci0gICAgICAgICAgICAgICAgICAgICJuYW1lIjogImJv cmRlciIsCi0gICAgICAgICAgICAgICAgICAgICJyZXNvbHZlciI6ICJsZWZ0IgotICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAg InNwZWNpZmljYXRpb24iOiB7CiAgICAgICAgICAgICAgICAgImNhdGVnb3J5IjogImNzcy1iYWNr Z3JvdW5kcyIsCkBAIC0yMDM4LDExICsyMDE0LDcgQEAKICAgICAgICAgICAgICAgICAgICAgImJv cmRlci1yaWdodC13aWR0aCIsCiAgICAgICAgICAgICAgICAgICAgICJib3JkZXItcmlnaHQtc3R5 bGUiLAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLXJpZ2h0LWNvbG9yIgotICAgICAgICAg ICAgICAgIF0sCi0gICAgICAgICAgICAgICAgImxvZ2ljYWwtcHJvcGVydHktZ3JvdXAiOiB7Ci0g ICAgICAgICAgICAgICAgICAgICJuYW1lIjogImJvcmRlciIsCi0gICAgICAgICAgICAgICAgICAg ICJyZXNvbHZlciI6ICJyaWdodCIKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg XQogICAgICAgICAgICAgfSwKICAgICAgICAgICAgICJzcGVjaWZpY2F0aW9uIjogewogICAgICAg ICAgICAgICAgICJjYXRlZ29yeSI6ICJjc3MtYmFja2dyb3VuZHMiLApAQCAtMjE2MiwxMSArMjEz NCw3IEBACiAgICAgICAgICAgICAgICAgICAgICJib3JkZXItdG9wLXdpZHRoIiwKICAgICAgICAg ICAgICAgICAgICAgImJvcmRlci10b3Atc3R5bGUiLAogICAgICAgICAgICAgICAgICAgICAiYm9y ZGVyLXRvcC1jb2xvciIKLSAgICAgICAgICAgICAgICBdLAotICAgICAgICAgICAgICAgICJsb2dp Y2FsLXByb3BlcnR5LWdyb3VwIjogewotICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJib3Jk ZXIiLAotICAgICAgICAgICAgICAgICAgICAicmVzb2x2ZXIiOiAidG9wIgotICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgInNw ZWNpZmljYXRpb24iOiB7CiAgICAgICAgICAgICAgICAgImNhdGVnb3J5IjogImNzcy1iYWNrZ3Jv dW5kcyIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwKaW5kZXggNTM1ZDU4NGE0NThkNjdjM2Q0N2IyYTNj ODViMjk3OGI5YzgyYzUxMS4uMDI0Yzc0NjBkMmVhNGFjYjQ5Mzg3OGMxOTc5MTM1MjA2NWIyNzU4 ZSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbApAQCAtMzA2LDYgKzMwNiw3IEBAIHN1YiBhZGRQcm9w ZXJ0eSgkJCkKICAgICAgICAgICAgICAgICB9IGVsc2lmICgkY29kZWdlbk9wdGlvbk5hbWUgZXEg ImNvbG9yLXByb3BlcnR5IikgewogICAgICAgICAgICAgICAgICAgICAkbmFtZUlzQ29sb3JQcm9w ZXJ0eXskbmFtZX0gPSAxOwogICAgICAgICAgICAgICAgIH0gZWxzaWYgKCRjb2RlZ2VuT3B0aW9u TmFtZSBlcSAibG9naWNhbC1wcm9wZXJ0eS1ncm91cCIpIHsKKyAgICAgICAgICAgICAgICAgICAg ZGllICJTaG9ydGhhbmQgcHJvcGVydHkgJG5hbWUgY2FuJ3QgYmVsb25nIHRvIGEgbG9naWNhbCBw cm9wZXJ0eSBncm91cFxuIiBpZiBleGlzdHMgJGNvZGVnZW5Qcm9wZXJ0aWVzLT57ImxvbmdoYW5k cyJ9OwogICAgICAgICAgICAgICAgICAgICBteSAkZ3JvdXBOYW1lID0gJGNvZGVnZW5Qcm9wZXJ0 aWVzLT57JGNvZGVnZW5PcHRpb25OYW1lfXsibmFtZSJ9OwogICAgICAgICAgICAgICAgICAgICBt eSAkcmVzb2x2ZXIgPSAkY29kZWdlblByb3BlcnRpZXMtPnskY29kZWdlbk9wdGlvbk5hbWV9eyJy ZXNvbHZlciJ9OwogICAgICAgICAgICAgICAgICAgICBteSAka2luZDsK 458290 2022-04-25 12:00:02 -0700 2022-04-26 08:54:12 -0700 Patch bug-239734-20220425210001.patch text/plain 9787 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjE4OGJkNThlMmQ3MjE4 MGNjMTkzNDlhZTkyNDg4NGFkNDdiNDk2ZC4uZjA1ZThiYTk3ODFhYzM1M2YxMjM2MDk1NjkzZDg0 NTBiYTI0Zjk2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIyLTA0LTI1ICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1sb2dpY2FsXSBT aWRlIGJvcmRlciBzaG9ydGhhbmRzIHNob3VsZCBub3QgYmUgbG9naWNhbC9waHlzaWNhbAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM5NzM0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gdGVzdCBzaW5j ZSBub3cgdGhlcmUgc2hvdWxkIGJlIG5vIG9ic2VydmFibGUgY2hhbmdlIGluIGJlaGF2aW9yLgor CisgICAgICAgIEhvd2V2ZXIsIHRoaXMgcmVmYWN0b3Jpbmcgd2lsbCBiZSBuZWVkZWQgZm9yIGJ1 ZyAyMzYxOTkuCisKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnZhbHVlRm9yUHJv cGVydHlJblN0eWxlKToKKyAgICAgICAgQWRkIGNvZGUgZm9yIHNlcmlhbGl6aW5nIGxvZ2ljYWwg c2lkZSBib3JkZXIgc2hvcnRoYW5kcy4KKworICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0aWVzLmpz b246CisgICAgICAgIFN0b3Agc2lkZSBib3JkZXIgc2hvcnRoYW5kcyBmcm9tIGJlaW5nIGluIGEg bG9naWNhbCBwcm9wZXJ0eSBncm91cC4KKyAgICAgICAgVGhleSB3aWxsIGp1c3QgZXhwYW5kIGlu dG8gbG9naWNhbCBvciBwaHlzaWNhbCBsb25naGFuZHMsIGJ1dCB0aGUKKyAgICAgICAgc2hvcnRo YW5kcyB0aGVtc2VsdmVzIHdpbGwgYmUgbm9ybWFsLgorCisgICAgICAgICogY3NzL21ha2Vwcm9w LnBsOgorICAgICAgICAoYWRkUHJvcGVydHkpOgorICAgICAgICBBc3NlcnQgdGhhdCBubyBzaG9y dGhhbmQgYmVsb25ncyB0byBhIGxvZ2ljYWwgcHJvcGVydHkgZ3JvdXAuCisKKyAgICAgICAgKiBj c3MvcGFyc2VyL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBh cnNlVmFsdWVXaXRoVmFyaWFibGVSZWZlcmVuY2VzKToKKyAgICAgICAgUmVtb3ZlIGRlYWQgY29k ZS4KKwogMjAyMi0wNC0yNCAgT3Jpb2wgQnJ1ZmF1ICA8b2JydWZhdUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtjc3MtY2FzY2FkZV0gRml4IGNhc2NhZGUgcm9sbGJhY2sgZm9yIGRlZmVycmVkIHBy b3BlcnRpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxl RGVjbGFyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNs YXJhdGlvbi5jcHAKaW5kZXggYWU2OTYxYzk0ZmQ2YzdkMmNjNDhkMGFkMTIyZjNkOWU0YmZkZWM5 Ni4uNTUzMTNkMGYxMjI0YWRiYzljNGE4OWU2NzYxMzk0NjUwZmI0M2JmYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTQw NDMsNiArNDA0MywxMCBAQCBSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6 OnZhbHVlRm9yUHJvcGVydHlJblN0eWxlKGNvbnN0IFJlbmRlclN0eQogICAgICAgICB9CiAgICAg ICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJCbG9ja0NvbG9yOgogICAgICAgICAgICAgcmV0dXJu IGdldENTU1Byb3BlcnR5VmFsdWVzRm9yMlNpZGVzU2hvcnRoYW5kKGJvcmRlckJsb2NrQ29sb3JT aG9ydGhhbmQoKSk7CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJCbG9ja0VuZDoKKyAg ICAgICAgICAgIHJldHVybiBnZXRDU1NQcm9wZXJ0eVZhbHVlc0ZvclNob3J0aGFuZFByb3BlcnRp ZXMoYm9yZGVyQmxvY2tFbmRTaG9ydGhhbmQoKSk7CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlC b3JkZXJCbG9ja1N0YXJ0OgorICAgICAgICAgICAgcmV0dXJuIGdldENTU1Byb3BlcnR5VmFsdWVz Rm9yU2hvcnRoYW5kUHJvcGVydGllcyhib3JkZXJCbG9ja1N0YXJ0U2hvcnRoYW5kKCkpOwogICAg ICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyQmxvY2tTdHlsZToKICAgICAgICAgICAgIHJldHVy biBnZXRDU1NQcm9wZXJ0eVZhbHVlc0ZvcjJTaWRlc1Nob3J0aGFuZChib3JkZXJCbG9ja1N0eWxl U2hvcnRoYW5kKCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyQmxvY2tXaWR0aDoK QEAgLTQwNjEsNiArNDA2NSwxMCBAQCBSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRy YWN0b3I6OnZhbHVlRm9yUHJvcGVydHlJblN0eWxlKGNvbnN0IFJlbmRlclN0eQogICAgICAgICB9 CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJJbmxpbmVDb2xvcjoKICAgICAgICAgICAg IHJldHVybiBnZXRDU1NQcm9wZXJ0eVZhbHVlc0ZvcjJTaWRlc1Nob3J0aGFuZChib3JkZXJJbmxp bmVDb2xvclNob3J0aGFuZCgpKTsKKyAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlcklubGlu ZUVuZDoKKyAgICAgICAgICAgIHJldHVybiBnZXRDU1NQcm9wZXJ0eVZhbHVlc0ZvclNob3J0aGFu ZFByb3BlcnRpZXMoYm9yZGVySW5saW5lRW5kU2hvcnRoYW5kKCkpOworICAgICAgICBjYXNlIENT U1Byb3BlcnR5Qm9yZGVySW5saW5lU3RhcnQ6CisgICAgICAgICAgICByZXR1cm4gZ2V0Q1NTUHJv cGVydHlWYWx1ZXNGb3JTaG9ydGhhbmRQcm9wZXJ0aWVzKGJvcmRlcklubGluZVN0YXJ0U2hvcnRo YW5kKCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVySW5saW5lU3R5bGU6CiAgICAg ICAgICAgICByZXR1cm4gZ2V0Q1NTUHJvcGVydHlWYWx1ZXNGb3IyU2lkZXNTaG9ydGhhbmQoYm9y ZGVySW5saW5lU3R5bGVTaG9ydGhhbmQoKSk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3Jk ZXJJbmxpbmVXaWR0aDoKQEAgLTQyMTIsMjEgKzQyMjAsMTcgQEAgUmVmUHRyPENTU1ZhbHVlPiBD b21wdXRlZFN0eWxlRXh0cmFjdG9yOjp2YWx1ZUZvclByb3BlcnR5SW5TdHlsZShjb25zdCBSZW5k ZXJTdHkKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIC8qIERpcmVjdGlvbmFsIHByb3Bl cnRpZXMgYXJlIHJlc29sdmVkIGJ5IHJlc29sdmVEaXJlY3Rpb25Bd2FyZVByb3BlcnR5KCkgYmVm b3JlIHRoZSBzd2l0Y2guICovCi0gICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJCbG9ja0Vu ZDoKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlckJsb2NrRW5kQ29sb3I6CiAgICAgICAg IGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJCbG9ja0VuZFN0eWxlOgogICAgICAgICBjYXNlIENTU1By b3BlcnR5Qm9yZGVyQmxvY2tFbmRXaWR0aDoKLSAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRl ckJsb2NrU3RhcnQ6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJCbG9ja1N0YXJ0Q29s b3I6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJCbG9ja1N0YXJ0U3R5bGU6CiAgICAg ICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJCbG9ja1N0YXJ0V2lkdGg6Ci0gICAgICAgIGNhc2Ug Q1NTUHJvcGVydHlCb3JkZXJFbmRFbmRSYWRpdXM6ICAgICAgICAKLSAgICAgICAgY2FzZSBDU1NQ cm9wZXJ0eUJvcmRlckVuZFN0YXJ0UmFkaXVzOiAgICAgICAgCi0gICAgICAgIGNhc2UgQ1NTUHJv cGVydHlCb3JkZXJJbmxpbmVFbmQ6CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJFbmRF bmRSYWRpdXM6CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJFbmRTdGFydFJhZGl1czoK ICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlcklubGluZUVuZENvbG9yOgogICAgICAgICBj YXNlIENTU1Byb3BlcnR5Qm9yZGVySW5saW5lRW5kU3R5bGU6CiAgICAgICAgIGNhc2UgQ1NTUHJv cGVydHlCb3JkZXJJbmxpbmVFbmRXaWR0aDoKLSAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRl cklubGluZVN0YXJ0OgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVySW5saW5lU3RhcnRD b2xvcjoKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlcklubGluZVN0YXJ0U3R5bGU6CiAg ICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJJbmxpbmVTdGFydFdpZHRoOgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnRpZXMuanNvbiBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQcm9wZXJ0aWVzLmpzb24KaW5kZXggM2NiZWYyMDEzYjUxNTNiMmE4YmQ3MzQyZTFk ZDMxNjFmZDQ4MGZhOS4uMTQwODM4ZjExZmI5ODg2MTY0YTFkNDJiMzAzNWU1YWIxNjM2NjJiMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnRpZXMuanNvbgorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydGllcy5qc29uCkBAIC0xMzQyLDExICsxMzQyLDcg QEAKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1ibG9jay1lbmQtd2lkdGgiLAogICAgICAg ICAgICAgICAgICAgICAiYm9yZGVyLWJsb2NrLWVuZC1zdHlsZSIsCiAgICAgICAgICAgICAgICAg ICAgICJib3JkZXItYmxvY2stZW5kLWNvbG9yIgotICAgICAgICAgICAgICAgIF0sCi0gICAgICAg ICAgICAgICAgImxvZ2ljYWwtcHJvcGVydHktZ3JvdXAiOiB7Ci0gICAgICAgICAgICAgICAgICAg ICJuYW1lIjogImJvcmRlciIsCi0gICAgICAgICAgICAgICAgICAgICJyZXNvbHZlciI6ICJibG9j ay1lbmQiCi0gICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAg IH0sCiAgICAgICAgICAgICAic3BlY2lmaWNhdGlvbiI6IHsKICAgICAgICAgICAgICAgICAiY2F0 ZWdvcnkiOiAiY3NzLWxvZ2ljYWwtcHJvcHMiLApAQCAtMTQyMywxMSArMTQxOSw3IEBACiAgICAg ICAgICAgICAgICAgICAgICJib3JkZXItYmxvY2stc3RhcnQtd2lkdGgiLAogICAgICAgICAgICAg ICAgICAgICAiYm9yZGVyLWJsb2NrLXN0YXJ0LXN0eWxlIiwKICAgICAgICAgICAgICAgICAgICAg ImJvcmRlci1ibG9jay1zdGFydC1jb2xvciIKLSAgICAgICAgICAgICAgICBdLAotICAgICAgICAg ICAgICAgICJsb2dpY2FsLXByb3BlcnR5LWdyb3VwIjogewotICAgICAgICAgICAgICAgICAgICAi bmFtZSI6ICJib3JkZXIiLAotICAgICAgICAgICAgICAgICAgICAicmVzb2x2ZXIiOiAiYmxvY2st c3RhcnQiCi0gICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAg IH0sCiAgICAgICAgICAgICAic3BlY2lmaWNhdGlvbiI6IHsKICAgICAgICAgICAgICAgICAiY2F0 ZWdvcnkiOiAiY3NzLWxvZ2ljYWwtcHJvcHMiLApAQCAtMTUyNSwxMSArMTUxNyw3IEBACiAgICAg ICAgICAgICAgICAgICAgICJib3JkZXItYm90dG9tLXdpZHRoIiwKICAgICAgICAgICAgICAgICAg ICAgImJvcmRlci1ib3R0b20tc3R5bGUiLAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLWJv dHRvbS1jb2xvciIKLSAgICAgICAgICAgICAgICBdLAotICAgICAgICAgICAgICAgICJsb2dpY2Fs LXByb3BlcnR5LWdyb3VwIjogewotICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJib3JkZXIi LAotICAgICAgICAgICAgICAgICAgICAicmVzb2x2ZXIiOiAiYm90dG9tIgotICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgInNw ZWNpZmljYXRpb24iOiB7CiAgICAgICAgICAgICAgICAgImNhdGVnb3J5IjogImNzcy1iYWNrZ3Jv dW5kcyIsCkBAIC0xNzcwLDExICsxNzU4LDcgQEAKICAgICAgICAgICAgICAgICAgICAgImJvcmRl ci1pbmxpbmUtZW5kLXdpZHRoIiwKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1pbmxpbmUt ZW5kLXN0eWxlIiwKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1pbmxpbmUtZW5kLWNvbG9y IgotICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAgICAgImxvZ2ljYWwtcHJvcGVydHkt Z3JvdXAiOiB7Ci0gICAgICAgICAgICAgICAgICAgICJuYW1lIjogImJvcmRlciIsCi0gICAgICAg ICAgICAgICAgICAgICJyZXNvbHZlciI6ICJpbmxpbmUtZW5kIgotICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgInNwZWNpZmlj YXRpb24iOiB7CiAgICAgICAgICAgICAgICAgImNhdGVnb3J5IjogImNzcy1sb2dpY2FsLXByb3Bz IiwKQEAgLTE4NTEsMTEgKzE4MzUsNyBAQAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLWlu bGluZS1zdGFydC13aWR0aCIsCiAgICAgICAgICAgICAgICAgICAgICJib3JkZXItaW5saW5lLXN0 YXJ0LXN0eWxlIiwKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1pbmxpbmUtc3RhcnQtY29s b3IiCi0gICAgICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICAgICAibG9naWNhbC1wcm9wZXJ0 eS1ncm91cCI6IHsKLSAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiYm9yZGVyIiwKLSAgICAg ICAgICAgICAgICAgICAgInJlc29sdmVyIjogImlubGluZS1zdGFydCIKLSAgICAgICAgICAgICAg ICB9CisgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwKICAgICAgICAgICAgICJzcGVj aWZpY2F0aW9uIjogewogICAgICAgICAgICAgICAgICJjYXRlZ29yeSI6ICJjc3MtbG9naWNhbC1w cm9wcyIsCkBAIC0xOTUzLDExICsxOTMzLDcgQEAKICAgICAgICAgICAgICAgICAgICAgImJvcmRl ci1sZWZ0LXdpZHRoIiwKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1sZWZ0LXN0eWxlIiwK ICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1sZWZ0LWNvbG9yIgotICAgICAgICAgICAgICAg IF0sCi0gICAgICAgICAgICAgICAgImxvZ2ljYWwtcHJvcGVydHktZ3JvdXAiOiB7Ci0gICAgICAg ICAgICAgICAgICAgICJuYW1lIjogImJvcmRlciIsCi0gICAgICAgICAgICAgICAgICAgICJyZXNv bHZlciI6ICJsZWZ0IgotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBdCiAgICAg ICAgICAgICB9LAogICAgICAgICAgICAgInNwZWNpZmljYXRpb24iOiB7CiAgICAgICAgICAgICAg ICAgImNhdGVnb3J5IjogImNzcy1iYWNrZ3JvdW5kcyIsCkBAIC0yMDM4LDExICsyMDE0LDcgQEAK ICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1yaWdodC13aWR0aCIsCiAgICAgICAgICAgICAg ICAgICAgICJib3JkZXItcmlnaHQtc3R5bGUiLAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVy LXJpZ2h0LWNvbG9yIgotICAgICAgICAgICAgICAgIF0sCi0gICAgICAgICAgICAgICAgImxvZ2lj YWwtcHJvcGVydHktZ3JvdXAiOiB7Ci0gICAgICAgICAgICAgICAgICAgICJuYW1lIjogImJvcmRl ciIsCi0gICAgICAgICAgICAgICAgICAgICJyZXNvbHZlciI6ICJyaWdodCIKLSAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwKICAgICAgICAgICAgICJz cGVjaWZpY2F0aW9uIjogewogICAgICAgICAgICAgICAgICJjYXRlZ29yeSI6ICJjc3MtYmFja2dy b3VuZHMiLApAQCAtMjE2MiwxMSArMjEzNCw3IEBACiAgICAgICAgICAgICAgICAgICAgICJib3Jk ZXItdG9wLXdpZHRoIiwKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci10b3Atc3R5bGUiLAog ICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLXRvcC1jb2xvciIKLSAgICAgICAgICAgICAgICBd LAotICAgICAgICAgICAgICAgICJsb2dpY2FsLXByb3BlcnR5LWdyb3VwIjogewotICAgICAgICAg ICAgICAgICAgICAibmFtZSI6ICJib3JkZXIiLAotICAgICAgICAgICAgICAgICAgICAicmVzb2x2 ZXIiOiAidG9wIgotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBdCiAgICAgICAg ICAgICB9LAogICAgICAgICAgICAgInNwZWNpZmljYXRpb24iOiB7CiAgICAgICAgICAgICAgICAg ImNhdGVnb3J5IjogImNzcy1iYWNrZ3JvdW5kcyIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvbWFrZXByb3AucGwgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwKaW5kZXgg NTM1ZDU4NGE0NThkNjdjM2Q0N2IyYTNjODViMjk3OGI5YzgyYzUxMS4uMDI0Yzc0NjBkMmVhNGFj YjQ5Mzg3OGMxOTc5MTM1MjA2NWIyNzU4ZSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nz L21ha2Vwcm9wLnBsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbApAQCAtMzA2 LDYgKzMwNiw3IEBAIHN1YiBhZGRQcm9wZXJ0eSgkJCkKICAgICAgICAgICAgICAgICB9IGVsc2lm ICgkY29kZWdlbk9wdGlvbk5hbWUgZXEgImNvbG9yLXByb3BlcnR5IikgewogICAgICAgICAgICAg ICAgICAgICAkbmFtZUlzQ29sb3JQcm9wZXJ0eXskbmFtZX0gPSAxOwogICAgICAgICAgICAgICAg IH0gZWxzaWYgKCRjb2RlZ2VuT3B0aW9uTmFtZSBlcSAibG9naWNhbC1wcm9wZXJ0eS1ncm91cCIp IHsKKyAgICAgICAgICAgICAgICAgICAgZGllICJTaG9ydGhhbmQgcHJvcGVydHkgJG5hbWUgY2Fu J3QgYmVsb25nIHRvIGEgbG9naWNhbCBwcm9wZXJ0eSBncm91cFxuIiBpZiBleGlzdHMgJGNvZGVn ZW5Qcm9wZXJ0aWVzLT57ImxvbmdoYW5kcyJ9OwogICAgICAgICAgICAgICAgICAgICBteSAkZ3Jv dXBOYW1lID0gJGNvZGVnZW5Qcm9wZXJ0aWVzLT57JGNvZGVnZW5PcHRpb25OYW1lfXsibmFtZSJ9 OwogICAgICAgICAgICAgICAgICAgICBteSAkcmVzb2x2ZXIgPSAkY29kZWdlblByb3BlcnRpZXMt PnskY29kZWdlbk9wdGlvbk5hbWV9eyJyZXNvbHZlciJ9OwogICAgICAgICAgICAgICAgICAgICBt eSAka2luZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2Vy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyLmNwcAppbmRleCA3MGU5 MjFkZTdjZGJhNGI3ODNkZDIxZWQzMDA0ODJlNDE2NTExOGQ0Li5kNmVjOWE1NmFkZWRiY2M5NjAy MDcxODZiMDI4OWNmYzEyM2FmZDdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFy c2VyL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJz ZXIuY3BwCkBAIC0yMDEsOCArMjAxLDYgQEAgUmVmUHRyPENTU1ZhbHVlPiBDU1NQYXJzZXI6OnBh cnNlVmFsdWVXaXRoVmFyaWFibGVSZWZlcmVuY2VzKENTU1Byb3BlcnR5SUQgcHJvcEkKICAgICAg ICAgYXV0byYgc3Vic3RpdHV0aW9uID0gZG93bmNhc3Q8Q1NTUGVuZGluZ1N1YnN0aXR1dGlvblZh bHVlPih2YWx1ZSk7CiAKICAgICAgICAgYXV0byBzaG9ydGhhbmRJRCA9IHN1YnN0aXR1dGlvbi5z aG9ydGhhbmRQcm9wZXJ0eUlkKCk7Ci0gICAgICAgIGlmIChDU1NQcm9wZXJ0eTo6aXNEaXJlY3Rp b25Bd2FyZVByb3BlcnR5KHNob3J0aGFuZElEKSkKLSAgICAgICAgICAgIHNob3J0aGFuZElEID0g Q1NTUHJvcGVydHk6OnJlc29sdmVEaXJlY3Rpb25Bd2FyZVByb3BlcnR5KHNob3J0aGFuZElELCBk aXJlY3Rpb24sIHdyaXRpbmdNb2RlKTsKIAogICAgICAgICBhdXRvIHJlc29sdmVkRGF0YSA9IHN1 YnN0aXR1dGlvbi5zaG9ydGhhbmRWYWx1ZSgpLnJlc29sdmVWYXJpYWJsZVJlZmVyZW5jZXMoYnVp bGRlclN0YXRlKTsKICAgICAgICAgaWYgKCFyZXNvbHZlZERhdGEpCg== 458372 2022-04-26 08:54:16 -0700 2022-04-26 19:02:45 -0700 Patch bug-239734-20220426175415.patch text/plain 10784 obrufau U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjRkOGYwOTk5MGRhMTYz ZGE0YTc2OGI1ZTQzMDhlMmFiYzhkZGE1MC4uNGY0N2IxMDg3ZjIzMmRhYjBhOWVhY2ZlNTA3MmIz MGIxYzJkOGNjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIyLTA0LTI1ICBPcmlv bCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1sb2dpY2FsXSBT aWRlIGJvcmRlciBzaG9ydGhhbmRzIHNob3VsZCBub3QgYmUgbG9naWNhbC9waHlzaWNhbAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM5NzM0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgVGltIE5ndXllbi4KKworICAgICAgICBObyB0ZXN0IHNpbmNlIG5v dyB0aGVyZSBzaG91bGQgYmUgbm8gb2JzZXJ2YWJsZSBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAg ICAgICAgSG93ZXZlciwgdGhpcyByZWZhY3RvcmluZyB3aWxsIGJlIG5lZWRlZCBmb3IgYnVnIDIz NjE5OS4KKworICAgICAgICAqIGFuaW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlvbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eUFuaW1hdGlvbldyYXBwZXJNYXA6OkNTU1Byb3Bl cnR5QW5pbWF0aW9uV3JhcHBlck1hcCk6CisgICAgICAgIE1hcmsgbG9naWNhbCBzaWRlIGJvcmRl ciBzaG9ydGhhbmRzIGFzIGFuaW1hdGFibGUuCisKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRT dHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbXB1dGVkU3R5bGVFeHRy YWN0b3I6OnZhbHVlRm9yUHJvcGVydHlJblN0eWxlKToKKyAgICAgICAgQWRkIGNvZGUgZm9yIHNl cmlhbGl6aW5nIGxvZ2ljYWwgc2lkZSBib3JkZXIgc2hvcnRoYW5kcy4KKworICAgICAgICAqIGNz cy9DU1NQcm9wZXJ0aWVzLmpzb246CisgICAgICAgIFN0b3Agc2lkZSBib3JkZXIgc2hvcnRoYW5k cyBmcm9tIGJlaW5nIGluIGEgbG9naWNhbCBwcm9wZXJ0eSBncm91cC4KKyAgICAgICAgVGhleSB3 aWxsIGp1c3QgZXhwYW5kIGludG8gbG9naWNhbCBvciBwaHlzaWNhbCBsb25naGFuZHMsIGJ1dCB0 aGUKKyAgICAgICAgc2hvcnRoYW5kcyB0aGVtc2VsdmVzIHdpbGwgYmUgbm9ybWFsLgorCisgICAg ICAgICogY3NzL21ha2Vwcm9wLnBsOgorICAgICAgICAoYWRkUHJvcGVydHkpOgorICAgICAgICBB c3NlcnQgdGhhdCBubyBzaG9ydGhhbmQgYmVsb25ncyB0byBhIGxvZ2ljYWwgcHJvcGVydHkgZ3Jv dXAuCisKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDU1NQYXJzZXI6OnBhcnNlVmFsdWVXaXRoVmFyaWFibGVSZWZlcmVuY2VzKToKKyAgICAg ICAgUmVtb3ZlIGRlYWQgY29kZS4KKwogMjAyMi0wNC0yNiAgT3Jpb2wgQnJ1ZmF1ICA8b2JydWZh dUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtY2FzY2FkZV0gRml4IGNhc2NhZGUgcm9sbGJh Y2sgZm9yIGRlZmVycmVkIHByb3BlcnRpZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Fu aW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRp b24vQ1NTUHJvcGVydHlBbmltYXRpb24uY3BwCmluZGV4IDdiNTE0MGJlNmI0Y2RmNGIwOWQwNDVj ZjI0MzVjOGI1ZmExOGQ2M2QuLjhhMDAzODlkOWRlNTIwZmNkYmViMjkyYmI4ZmFlNzhkNGZlMjg4 MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1h dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5pbWF0 aW9uLmNwcApAQCAtMzM3Myw2ICszMzczLDcgQEAgQ1NTUHJvcGVydHlBbmltYXRpb25XcmFwcGVy TWFwOjpDU1NQcm9wZXJ0eUFuaW1hdGlvbldyYXBwZXJNYXAoKQogICAgICAgICBDU1NQcm9wZXJ0 eVdlYmtpdE1hc2tQb3NpdGlvbiwKICAgICAgICAgQ1NTUHJvcGVydHlNYXNrUmVwZWF0LAogICAg ICAgICBDU1NQcm9wZXJ0eUJvcmRlclRvcCwgQ1NTUHJvcGVydHlCb3JkZXJSaWdodCwgQ1NTUHJv cGVydHlCb3JkZXJCb3R0b20sIENTU1Byb3BlcnR5Qm9yZGVyTGVmdCwKKyAgICAgICAgQ1NTUHJv cGVydHlCb3JkZXJCbG9ja1N0YXJ0LCBDU1NQcm9wZXJ0eUJvcmRlckJsb2NrRW5kLCBDU1NQcm9w ZXJ0eUJvcmRlcklubGluZVN0YXJ0LCBDU1NQcm9wZXJ0eUJvcmRlcklubGluZUVuZCwKICAgICAg ICAgQ1NTUHJvcGVydHlCb3JkZXJDb2xvciwKICAgICAgICAgQ1NTUHJvcGVydHlCb3JkZXJSYWRp dXMsCiAgICAgICAgIENTU1Byb3BlcnR5Qm9yZGVyV2lkdGgsCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCmluZGV4IGFlNjk2MWM5NGZk NmM3ZDJjYzQ4ZDBhZDEyMmYzZDllNGJmZGVjOTYuLjU1MzEzZDBmMTIyNGFkYmM5YzRhODllNjc2 MTM5NDY1MGZiNDNiZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRl ZFN0eWxlRGVjbGFyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRl ZFN0eWxlRGVjbGFyYXRpb24uY3BwCkBAIC00MDQzLDYgKzQwNDMsMTAgQEAgUmVmUHRyPENTU1Zh bHVlPiBDb21wdXRlZFN0eWxlRXh0cmFjdG9yOjp2YWx1ZUZvclByb3BlcnR5SW5TdHlsZShjb25z dCBSZW5kZXJTdHkKICAgICAgICAgfQogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyQmxv Y2tDb2xvcjoKICAgICAgICAgICAgIHJldHVybiBnZXRDU1NQcm9wZXJ0eVZhbHVlc0ZvcjJTaWRl c1Nob3J0aGFuZChib3JkZXJCbG9ja0NvbG9yU2hvcnRoYW5kKCkpOworICAgICAgICBjYXNlIENT U1Byb3BlcnR5Qm9yZGVyQmxvY2tFbmQ6CisgICAgICAgICAgICByZXR1cm4gZ2V0Q1NTUHJvcGVy dHlWYWx1ZXNGb3JTaG9ydGhhbmRQcm9wZXJ0aWVzKGJvcmRlckJsb2NrRW5kU2hvcnRoYW5kKCkp OworICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyQmxvY2tTdGFydDoKKyAgICAgICAgICAg IHJldHVybiBnZXRDU1NQcm9wZXJ0eVZhbHVlc0ZvclNob3J0aGFuZFByb3BlcnRpZXMoYm9yZGVy QmxvY2tTdGFydFNob3J0aGFuZCgpKTsKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlckJs b2NrU3R5bGU6CiAgICAgICAgICAgICByZXR1cm4gZ2V0Q1NTUHJvcGVydHlWYWx1ZXNGb3IyU2lk ZXNTaG9ydGhhbmQoYm9yZGVyQmxvY2tTdHlsZVNob3J0aGFuZCgpKTsKICAgICAgICAgY2FzZSBD U1NQcm9wZXJ0eUJvcmRlckJsb2NrV2lkdGg6CkBAIC00MDYxLDYgKzQwNjUsMTAgQEAgUmVmUHRy PENTU1ZhbHVlPiBDb21wdXRlZFN0eWxlRXh0cmFjdG9yOjp2YWx1ZUZvclByb3BlcnR5SW5TdHls ZShjb25zdCBSZW5kZXJTdHkKICAgICAgICAgfQogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9y ZGVySW5saW5lQ29sb3I6CiAgICAgICAgICAgICByZXR1cm4gZ2V0Q1NTUHJvcGVydHlWYWx1ZXNG b3IyU2lkZXNTaG9ydGhhbmQoYm9yZGVySW5saW5lQ29sb3JTaG9ydGhhbmQoKSk7CisgICAgICAg IGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJJbmxpbmVFbmQ6CisgICAgICAgICAgICByZXR1cm4gZ2V0 Q1NTUHJvcGVydHlWYWx1ZXNGb3JTaG9ydGhhbmRQcm9wZXJ0aWVzKGJvcmRlcklubGluZUVuZFNo b3J0aGFuZCgpKTsKKyAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlcklubGluZVN0YXJ0Ogor ICAgICAgICAgICAgcmV0dXJuIGdldENTU1Byb3BlcnR5VmFsdWVzRm9yU2hvcnRoYW5kUHJvcGVy dGllcyhib3JkZXJJbmxpbmVTdGFydFNob3J0aGFuZCgpKTsKICAgICAgICAgY2FzZSBDU1NQcm9w ZXJ0eUJvcmRlcklubGluZVN0eWxlOgogICAgICAgICAgICAgcmV0dXJuIGdldENTU1Byb3BlcnR5 VmFsdWVzRm9yMlNpZGVzU2hvcnRoYW5kKGJvcmRlcklubGluZVN0eWxlU2hvcnRoYW5kKCkpOwog ICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVySW5saW5lV2lkdGg6CkBAIC00MjEyLDIxICs0 MjIwLDE3IEBAIFJlZlB0cjxDU1NWYWx1ZT4gQ29tcHV0ZWRTdHlsZUV4dHJhY3Rvcjo6dmFsdWVG b3JQcm9wZXJ0eUluU3R5bGUoY29uc3QgUmVuZGVyU3R5CiAgICAgICAgICAgICBicmVhazsKIAog ICAgICAgICAvKiBEaXJlY3Rpb25hbCBwcm9wZXJ0aWVzIGFyZSByZXNvbHZlZCBieSByZXNvbHZl RGlyZWN0aW9uQXdhcmVQcm9wZXJ0eSgpIGJlZm9yZSB0aGUgc3dpdGNoLiAqLwotICAgICAgICBj YXNlIENTU1Byb3BlcnR5Qm9yZGVyQmxvY2tFbmQ6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlC b3JkZXJCbG9ja0VuZENvbG9yOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyQmxvY2tF bmRTdHlsZToKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlckJsb2NrRW5kV2lkdGg6Ci0g ICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJCbG9ja1N0YXJ0OgogICAgICAgICBjYXNlIENT U1Byb3BlcnR5Qm9yZGVyQmxvY2tTdGFydENvbG9yOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5 Qm9yZGVyQmxvY2tTdGFydFN0eWxlOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyQmxv Y2tTdGFydFdpZHRoOgotICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyRW5kRW5kUmFkaXVz OiAgICAgICAgCi0gICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJFbmRTdGFydFJhZGl1czog ICAgICAgIAotICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVySW5saW5lRW5kOgorICAgICAg ICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVyRW5kRW5kUmFkaXVzOgorICAgICAgICBjYXNlIENTU1By b3BlcnR5Qm9yZGVyRW5kU3RhcnRSYWRpdXM6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3Jk ZXJJbmxpbmVFbmRDb2xvcjoKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlcklubGluZUVu ZFN0eWxlOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVySW5saW5lRW5kV2lkdGg6Ci0g ICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJJbmxpbmVTdGFydDoKICAgICAgICAgY2FzZSBD U1NQcm9wZXJ0eUJvcmRlcklubGluZVN0YXJ0Q29sb3I6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVy dHlCb3JkZXJJbmxpbmVTdGFydFN0eWxlOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Qm9yZGVy SW5saW5lU3RhcnRXaWR0aDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9w ZXJ0aWVzLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydGllcy5qc29uCmluZGV4 IDNjYmVmMjAxM2I1MTUzYjJhOGJkNzM0MmUxZGQzMTYxZmQ0ODBmYTkuLjE0MDgzOGYxMWZiOTg4 NjE2NGExZDQyYjMwMzVlNWFiMTYzNjYyYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQcm9wZXJ0aWVzLmpzb24KKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnRp ZXMuanNvbgpAQCAtMTM0MiwxMSArMTM0Miw3IEBACiAgICAgICAgICAgICAgICAgICAgICJib3Jk ZXItYmxvY2stZW5kLXdpZHRoIiwKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1ibG9jay1l bmQtc3R5bGUiLAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLWJsb2NrLWVuZC1jb2xvciIK LSAgICAgICAgICAgICAgICBdLAotICAgICAgICAgICAgICAgICJsb2dpY2FsLXByb3BlcnR5LWdy b3VwIjogewotICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJib3JkZXIiLAotICAgICAgICAg ICAgICAgICAgICAicmVzb2x2ZXIiOiAiYmxvY2stZW5kIgotICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgInNwZWNpZmljYXRp b24iOiB7CiAgICAgICAgICAgICAgICAgImNhdGVnb3J5IjogImNzcy1sb2dpY2FsLXByb3BzIiwK QEAgLTE0MjMsMTEgKzE0MTksNyBAQAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLWJsb2Nr LXN0YXJ0LXdpZHRoIiwKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1ibG9jay1zdGFydC1z dHlsZSIsCiAgICAgICAgICAgICAgICAgICAgICJib3JkZXItYmxvY2stc3RhcnQtY29sb3IiCi0g ICAgICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICAgICAibG9naWNhbC1wcm9wZXJ0eS1ncm91 cCI6IHsKLSAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiYm9yZGVyIiwKLSAgICAgICAgICAg ICAgICAgICAgInJlc29sdmVyIjogImJsb2NrLXN0YXJ0IgotICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAgICAgInNwZWNpZmljYXRp b24iOiB7CiAgICAgICAgICAgICAgICAgImNhdGVnb3J5IjogImNzcy1sb2dpY2FsLXByb3BzIiwK QEAgLTE1MjUsMTEgKzE1MTcsNyBAQAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLWJvdHRv bS13aWR0aCIsCiAgICAgICAgICAgICAgICAgICAgICJib3JkZXItYm90dG9tLXN0eWxlIiwKICAg ICAgICAgICAgICAgICAgICAgImJvcmRlci1ib3R0b20tY29sb3IiCi0gICAgICAgICAgICAgICAg XSwKLSAgICAgICAgICAgICAgICAibG9naWNhbC1wcm9wZXJ0eS1ncm91cCI6IHsKLSAgICAgICAg ICAgICAgICAgICAgIm5hbWUiOiAiYm9yZGVyIiwKLSAgICAgICAgICAgICAgICAgICAgInJlc29s dmVyIjogImJvdHRvbSIKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgXQogICAg ICAgICAgICAgfSwKICAgICAgICAgICAgICJzcGVjaWZpY2F0aW9uIjogewogICAgICAgICAgICAg ICAgICJjYXRlZ29yeSI6ICJjc3MtYmFja2dyb3VuZHMiLApAQCAtMTc3MCwxMSArMTc1OCw3IEBA CiAgICAgICAgICAgICAgICAgICAgICJib3JkZXItaW5saW5lLWVuZC13aWR0aCIsCiAgICAgICAg ICAgICAgICAgICAgICJib3JkZXItaW5saW5lLWVuZC1zdHlsZSIsCiAgICAgICAgICAgICAgICAg ICAgICJib3JkZXItaW5saW5lLWVuZC1jb2xvciIKLSAgICAgICAgICAgICAgICBdLAotICAgICAg ICAgICAgICAgICJsb2dpY2FsLXByb3BlcnR5LWdyb3VwIjogewotICAgICAgICAgICAgICAgICAg ICAibmFtZSI6ICJib3JkZXIiLAotICAgICAgICAgICAgICAgICAgICAicmVzb2x2ZXIiOiAiaW5s aW5lLWVuZCIKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgXQogICAgICAgICAg ICAgfSwKICAgICAgICAgICAgICJzcGVjaWZpY2F0aW9uIjogewogICAgICAgICAgICAgICAgICJj YXRlZ29yeSI6ICJjc3MtbG9naWNhbC1wcm9wcyIsCkBAIC0xODUxLDExICsxODM1LDcgQEAKICAg ICAgICAgICAgICAgICAgICAgImJvcmRlci1pbmxpbmUtc3RhcnQtd2lkdGgiLAogICAgICAgICAg ICAgICAgICAgICAiYm9yZGVyLWlubGluZS1zdGFydC1zdHlsZSIsCiAgICAgICAgICAgICAgICAg ICAgICJib3JkZXItaW5saW5lLXN0YXJ0LWNvbG9yIgotICAgICAgICAgICAgICAgIF0sCi0gICAg ICAgICAgICAgICAgImxvZ2ljYWwtcHJvcGVydHktZ3JvdXAiOiB7Ci0gICAgICAgICAgICAgICAg ICAgICJuYW1lIjogImJvcmRlciIsCi0gICAgICAgICAgICAgICAgICAgICJyZXNvbHZlciI6ICJp bmxpbmUtc3RhcnQiCi0gICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIF0KICAgICAg ICAgICAgIH0sCiAgICAgICAgICAgICAic3BlY2lmaWNhdGlvbiI6IHsKICAgICAgICAgICAgICAg ICAiY2F0ZWdvcnkiOiAiY3NzLWxvZ2ljYWwtcHJvcHMiLApAQCAtMTk1MywxMSArMTkzMyw3IEBA CiAgICAgICAgICAgICAgICAgICAgICJib3JkZXItbGVmdC13aWR0aCIsCiAgICAgICAgICAgICAg ICAgICAgICJib3JkZXItbGVmdC1zdHlsZSIsCiAgICAgICAgICAgICAgICAgICAgICJib3JkZXIt bGVmdC1jb2xvciIKLSAgICAgICAgICAgICAgICBdLAotICAgICAgICAgICAgICAgICJsb2dpY2Fs LXByb3BlcnR5LWdyb3VwIjogewotICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJib3JkZXIi LAotICAgICAgICAgICAgICAgICAgICAicmVzb2x2ZXIiOiAibGVmdCIKLSAgICAgICAgICAgICAg ICB9CisgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwKICAgICAgICAgICAgICJzcGVj aWZpY2F0aW9uIjogewogICAgICAgICAgICAgICAgICJjYXRlZ29yeSI6ICJjc3MtYmFja2dyb3Vu ZHMiLApAQCAtMjAzOCwxMSArMjAxNCw3IEBACiAgICAgICAgICAgICAgICAgICAgICJib3JkZXIt cmlnaHQtd2lkdGgiLAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLXJpZ2h0LXN0eWxlIiwK ICAgICAgICAgICAgICAgICAgICAgImJvcmRlci1yaWdodC1jb2xvciIKLSAgICAgICAgICAgICAg ICBdLAotICAgICAgICAgICAgICAgICJsb2dpY2FsLXByb3BlcnR5LWdyb3VwIjogewotICAgICAg ICAgICAgICAgICAgICAibmFtZSI6ICJib3JkZXIiLAotICAgICAgICAgICAgICAgICAgICAicmVz b2x2ZXIiOiAicmlnaHQiCi0gICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIF0KICAg ICAgICAgICAgIH0sCiAgICAgICAgICAgICAic3BlY2lmaWNhdGlvbiI6IHsKICAgICAgICAgICAg ICAgICAiY2F0ZWdvcnkiOiAiY3NzLWJhY2tncm91bmRzIiwKQEAgLTIxNjIsMTEgKzIxMzQsNyBA QAogICAgICAgICAgICAgICAgICAgICAiYm9yZGVyLXRvcC13aWR0aCIsCiAgICAgICAgICAgICAg ICAgICAgICJib3JkZXItdG9wLXN0eWxlIiwKICAgICAgICAgICAgICAgICAgICAgImJvcmRlci10 b3AtY29sb3IiCi0gICAgICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICAgICAibG9naWNhbC1w cm9wZXJ0eS1ncm91cCI6IHsKLSAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiYm9yZGVyIiwK LSAgICAgICAgICAgICAgICAgICAgInJlc29sdmVyIjogInRvcCIKLSAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfSwKICAgICAgICAgICAgICJzcGVjaWZp Y2F0aW9uIjogewogICAgICAgICAgICAgICAgICJjYXRlZ29yeSI6ICJjc3MtYmFja2dyb3VuZHMi LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsIGIvU291cmNlL1dl YkNvcmUvY3NzL21ha2Vwcm9wLnBsCmluZGV4IDUzNWQ1ODRhNDU4ZDY3YzNkNDdiMmEzYzg1YjI5 NzhiOWM4MmM1MTEuLjAyNGM3NDYwZDJlYTRhY2I0OTM4NzhjMTk3OTEzNTIwNjViMjc1OGUgMTAw NzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvbWFrZXByb3AucGwKQEAgLTMwNiw2ICszMDYsNyBAQCBzdWIgYWRkUHJvcGVydHko JCQpCiAgICAgICAgICAgICAgICAgfSBlbHNpZiAoJGNvZGVnZW5PcHRpb25OYW1lIGVxICJjb2xv ci1wcm9wZXJ0eSIpIHsKICAgICAgICAgICAgICAgICAgICAgJG5hbWVJc0NvbG9yUHJvcGVydHl7 JG5hbWV9ID0gMTsKICAgICAgICAgICAgICAgICB9IGVsc2lmICgkY29kZWdlbk9wdGlvbk5hbWUg ZXEgImxvZ2ljYWwtcHJvcGVydHktZ3JvdXAiKSB7CisgICAgICAgICAgICAgICAgICAgIGRpZSAi U2hvcnRoYW5kIHByb3BlcnR5ICRuYW1lIGNhbid0IGJlbG9uZyB0byBhIGxvZ2ljYWwgcHJvcGVy dHkgZ3JvdXBcbiIgaWYgZXhpc3RzICRjb2RlZ2VuUHJvcGVydGllcy0+eyJsb25naGFuZHMifTsK ICAgICAgICAgICAgICAgICAgICAgbXkgJGdyb3VwTmFtZSA9ICRjb2RlZ2VuUHJvcGVydGllcy0+ eyRjb2RlZ2VuT3B0aW9uTmFtZX17Im5hbWUifTsKICAgICAgICAgICAgICAgICAgICAgbXkgJHJl c29sdmVyID0gJGNvZGVnZW5Qcm9wZXJ0aWVzLT57JGNvZGVnZW5PcHRpb25OYW1lfXsicmVzb2x2 ZXIifTsKICAgICAgICAgICAgICAgICAgICAgbXkgJGtpbmQ7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFy c2VyL0NTU1BhcnNlci5jcHAKaW5kZXggNzBlOTIxZGU3Y2RiYTRiNzgzZGQyMWVkMzAwNDgyZTQx NjUxMThkNC4uZDZlYzlhNTZhZGVkYmNjOTYwMjA3MTg2YjAyODljZmMxMjNhZmQ3YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyLmNwcApAQCAtMjAxLDggKzIwMSw2IEBAIFJl ZlB0cjxDU1NWYWx1ZT4gQ1NTUGFyc2VyOjpwYXJzZVZhbHVlV2l0aFZhcmlhYmxlUmVmZXJlbmNl cyhDU1NQcm9wZXJ0eUlEIHByb3BJCiAgICAgICAgIGF1dG8mIHN1YnN0aXR1dGlvbiA9IGRvd25j YXN0PENTU1BlbmRpbmdTdWJzdGl0dXRpb25WYWx1ZT4odmFsdWUpOwogCiAgICAgICAgIGF1dG8g c2hvcnRoYW5kSUQgPSBzdWJzdGl0dXRpb24uc2hvcnRoYW5kUHJvcGVydHlJZCgpOwotICAgICAg ICBpZiAoQ1NTUHJvcGVydHk6OmlzRGlyZWN0aW9uQXdhcmVQcm9wZXJ0eShzaG9ydGhhbmRJRCkp Ci0gICAgICAgICAgICBzaG9ydGhhbmRJRCA9IENTU1Byb3BlcnR5OjpyZXNvbHZlRGlyZWN0aW9u QXdhcmVQcm9wZXJ0eShzaG9ydGhhbmRJRCwgZGlyZWN0aW9uLCB3cml0aW5nTW9kZSk7CiAKICAg ICAgICAgYXV0byByZXNvbHZlZERhdGEgPSBzdWJzdGl0dXRpb24uc2hvcnRoYW5kVmFsdWUoKS5y ZXNvbHZlVmFyaWFibGVSZWZlcmVuY2VzKGJ1aWxkZXJTdGF0ZSk7CiAgICAgICAgIGlmICghcmVz b2x2ZWREYXRhKQo=