125584 2013-12-11 10:44:46 -0800 [ATK] Expose accessibility objects WAI-ARIA landmark roles 2013-12-11 11:46:52 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 125493 1 mario webkit-unassigned aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 958789 0 mario 2013-12-11 10:44:46 -0800 This includes: * <address> * <aside> * <header> * <nav> * <div role="banner"> * <div role="complementary"> * <div role="contentinfo"> * <div role="main"> * <div role="navigation"> * <div role="search"> 958796 1 218977 mario 2013-12-11 10:55:36 -0800 Created attachment 218977 Patch proposal 958810 2 218977 cfleizach 2013-12-11 11:20:52 -0800 Comment on attachment 218977 Patch proposal View in context: https://bugs.webkit.org/attachment.cgi?id=218977&action=review > Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:534 > + if (role == LandmarkBannerRole) we should use a switch statement here > Tools/gtk/jhbuild.modules:235 > + <branch module="pub/GNOME/sources/atk/2.11/atk-2.11.3.tar.xz" version="2.11.3" seems like this should be in a different patch 958822 3 mario 2013-12-11 11:26:46 -0800 (In reply to comment #2) > (From update of attachment 218977 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=218977&action=review > > > Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:534 > > + if (role == LandmarkBannerRole) > > we should use a switch statement here Ok > > Tools/gtk/jhbuild.modules:235 > > + <branch module="pub/GNOME/sources/atk/2.11/atk-2.11.3.tar.xz" version="2.11.3" > > seems like this should be in a different patch I think it's better to have it in this one, since we need to bump that new version in the jhbuild because of this patch 958828 4 218986 mario 2013-12-11 11:36:58 -0800 Created attachment 218986 Patch proposal New patch with the switch statement 958831 5 218986 cfleizach 2013-12-11 11:39:33 -0800 Comment on attachment 218986 Patch proposal View in context: https://bugs.webkit.org/attachment.cgi?id=218986&action=review > Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:532 > + // of LandMarkApplicationRole, whic will be exposed with ATK_ROLE_EMBEDDED. should be LandmarkApplicationRole which spelled wrong 958835 6 mario 2013-12-11 11:42:01 -0800 (In reply to comment #5) > (From update of attachment 218986 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=218986&action=review > > > Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:532 > > + // of LandMarkApplicationRole, whic will be exposed with ATK_ROLE_EMBEDDED. > > should be LandmarkApplicationRole > > which spelled wrong I'll fix it before landing. Thanks 958840 7 mario 2013-12-11 11:46:52 -0800 Committed r160450: <http://trac.webkit.org/changeset/160450> 218977 2013-12-11 10:55:36 -0800 2013-12-11 11:36:58 -0800 Patch proposal 0001-ATK-Expose-accessibility-objects-WAI-ARIA-landmark-r.patch text/plain 21093 mario RnJvbSAxZWY0NGM3ZmEzY2U3OWNmYWZlNWU2MTA4Y2U0YjI2ZGM2YmVkZTMwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtYXJpby5wcmFkYUBzYW1z dW5nLmNvbT4KRGF0ZTogVHVlLCAxMCBEZWMgMjAxMyAxOTozODoxOSArMDEwMApTdWJqZWN0OiBb UEFUQ0hdICAgICAgICAgW0FUS10gRXhwb3NlIGFjY2Vzc2liaWxpdHkgb2JqZWN0cyBXQUktQVJJ QSBsYW5kbWFyawogcm9sZXMgICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTI1NTg0CgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgMTIgKysrKysrKwogLi4uL2d0ay9hY2Nlc3NpYmlsaXR5L3JvbGVz LWV4cG9zZWQtZXhwZWN0ZWQudHh0ICAgfCAzMyArKysrKysrKysrKysrKysrKysKIC4uLi9wbGF0 Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9yb2xlcy1leHBvc2VkLmh0bWwgIHwgMjIgKysrKysrLS0t LS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8 IDE0ICsrKysrKysrCiAuLi4vYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcCAgICAg ICAgICAgICB8IDI3ICsrKysrKysrKysrKysrKwogVG9vbHMvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAxNSArKysrKysrKwogLi4uL2F0ay9BY2Nlc3NpYmls aXR5VUlFbGVtZW50QXRrLmNwcCAgICAgICAgICAgICAgfCA0MCArKysrKysrKysrKysrKysrKyst LS0tCiAuLi4vYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwICAgICAgICAgICAgICB8 IDQwICsrKysrKysrKysrKysrKysrKy0tLS0KIFRvb2xzL2d0ay9qaGJ1aWxkLm1vZHVsZXMgICAg ICAgICAgICAgICAgICAgICAgICAgIHwgIDQgKy0tCiA5IGZpbGVzIGNoYW5nZWQsIDE4MiBpbnNl cnRpb25zKCspLCAyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggODE0YmZlZC4uYWU3M2Y5MCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTEyLTExICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bWFy aW8ucHJhZGFAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0FUS10gRXhwb3NlIGFjY2Vzc2liaWxp dHkgb2JqZWN0cyBXQUktQVJJQSBsYW5kbWFyayByb2xlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NTg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIHRlc3QgdG8gdW5za2lwIGxhbmRtYXJr IGVsZW1lbnRzIGFuZCB1cGRhdGUgZXhwZWN0YXRpb25zLgorCisgICAgICAgICogcGxhdGZvcm0v Z3RrL2FjY2Vzc2liaWxpdHkvcm9sZXMtZXhwb3NlZC1leHBlY3RlZC50eHQ6CisgICAgICAgICog cGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvcm9sZXMtZXhwb3NlZC5odG1sOgorCiAyMDEzLTEy LTEwICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bWFyaW8ucHJhZGFAc2Ftc3VuZy5jb20+CiAKICAg ICAgICAgW0FUS10gQWRkIG5ldyBsYXlvdXQgdGVzdCB0byBjaGVjayBBVEsgcm9sZXMgaW4gYSBj ZW50cmFsIHBsYWNlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNz aWJpbGl0eS9yb2xlcy1leHBvc2VkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L2d0ay9hY2Nlc3NpYmlsaXR5L3JvbGVzLWV4cG9zZWQtZXhwZWN0ZWQudHh0CmluZGV4IDJjZmEy MDIuLjAyMzVmYjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3Np YmlsaXR5L3JvbGVzLWV4cG9zZWQtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3JvbGVzLWV4cG9zZWQtZXhwZWN0ZWQudHh0CkBAIC02LDYg KzYsMTIgQEAgT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNz YWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUKIFBBU1M6IGFbaHJlZl0KICAgICAgIEFY Um9sZTogQVhMaW5rCiAgICAgICAKK1BBU1M6IGFkZHJlc3MKKyAgICAgIEFYUm9sZTogQVhMYW5k bWFya0NvbnRlbnRJbmZvCisgICAgICAKK1BBU1M6IGFzaWRlCisgICAgICBBWFJvbGU6IEFYTGFu ZG1hcmtDb21wbGVtZW50YXJ5CisgICAgICAKIFBBU1M6IGJsb2NrcXVvdGUKICAgICAgIEFYUm9s ZTogQVhHcm91cAogICAgICAgCkBAIC0yNCw2ICszMCw5IEBAIFBBU1M6IGxlZ2VuZAogUEFTUzog Zm9ybQogICAgICAgQVhSb2xlOiBBWEZvcm0KICAgICAgIAorUEFTUzogaGVhZGVyCisgICAgICBB WFJvbGU6IEFYTGFuZG1hcmtCYW5uZXIKKyAgICAgIAogUEFTUzogaGdyb3VwCiAgICAgICBBWFJv bGU6IEFYR3JvdXAKICAgICAgIApAQCAtMTE0LDYgKzEyMyw5IEBAIFBBU1M6IGlucHV0W3R5cGU9 J3VybCddCiBQQVNTOiBpbnB1dFt0eXBlPSd3ZWVrJ10KICAgICAgIEFYUm9sZTogQVhUZXh0Rmll bGQKICAgICAgIAorUEFTUzogbmF2CisgICAgICBBWFJvbGU6IEFYTGFuZG1hcmtOYXZpZ2F0aW9u CisgICAgICAKIFBBU1M6IG9sCiAgICAgICBBWFJvbGU6IEFYTGlzdAogICAgICAgCkBAIC0yMTYs NiArMjI4LDEyIEBAIFBBU1M6IGRpdltyb2xlPWFsZXJ0XQogUEFTUzogZGl2W3JvbGU9YWxlcnRk aWFsb2ddCiAgICAgICBBWFJvbGU6IEFYQWxlcnQKICAgICAgIAorUEFTUzogZGl2W3JvbGU9YXBw bGljYXRpb25dCisgICAgICBBWFJvbGU6IEFYRW1iZWRkZWQKKyAgICAgIAorUEFTUzogZGl2W3Jv bGU9YmFubmVyXQorICAgICAgQVhSb2xlOiBBWExhbmRtYXJrQmFubmVyCisgICAgICAKIFBBU1M6 IGRpdltyb2xlPWJ1dHRvbl0KICAgICAgIEFYUm9sZTogQVhCdXR0b24KICAgICAgIApAQCAtMjI1 LDYgKzI0MywxMiBAQCBQQVNTOiBkaXZbcm9sZT1jaGVja2JveF0KIFBBU1M6IGRpdltyb2xlPWNv bWJvYm94XQogICAgICAgQVhSb2xlOiBBWENvbWJvQm94CiAgICAgICAKK1BBU1M6IGRpdltyb2xl PWNvbXBsZW1lbnRhcnldCisgICAgICBBWFJvbGU6IEFYTGFuZG1hcmtDb21wbGVtZW50YXJ5Cisg ICAgICAKK1BBU1M6IGRpdltyb2xlPWNvbnRlbnRpbmZvXQorICAgICAgQVhSb2xlOiBBWExhbmRt YXJrQ29udGVudEluZm8KKyAgICAgIAogUEFTUzogZGl2W3JvbGU9ZGlyZWN0b3J5XQogICAgICAg QVhSb2xlOiBBWExpc3QKICAgICAgIApAQCAtMjY2LDYgKzI5MCw5IEBAIEZBSUw6IGRpdltyb2xl PWxpc3Rib3hdCiBQQVNTOiBkaXZbcm9sZT1vcHRpb25dCiAgICAgICBBWFJvbGU6IEFYTGlzdEl0 ZW0KICAgICAgIAorUEFTUzogZGl2W3JvbGU9bWFpbl0KKyAgICAgIEFYUm9sZTogQVhMYW5kbWFy a01haW4KKyAgICAgIAogUEFTUzogZGl2W3JvbGU9bWVudV0KICAgICAgIEFYUm9sZTogQVhNZW51 CiAgICAgICAKQEAgLTI4NCw2ICszMTEsOSBAQCBQQVNTOiBkaXZbcm9sZT1tZW51aXRlbV0KIFBB U1M6IGRpdltyb2xlPW1lbnVpdGVtcmFkaW9dCiAgICAgICBBWFJvbGU6IEFYUmFkaW9NZW51SXRl bQogICAgICAgCitQQVNTOiBkaXZbcm9sZT1uYXZpZ2F0aW9uXQorICAgICAgQVhSb2xlOiBBWExh bmRtYXJrTmF2aWdhdGlvbgorICAgICAgCiBQQVNTOiBkaXZbcm9sZT1wcm9ncmVzc2Jhcl0KICAg ICAgIEFYUm9sZTogQVhQcm9ncmVzc0luZGljYXRvcgogICAgICAgCkBAIC0yOTYsNiArMzI2LDkg QEAgUEFTUzogZGl2W3JvbGU9cmFkaW9dCiBQQVNTOiBkaXZbcm9sZT1zY3JvbGxiYXJdCiAgICAg ICBBWFJvbGU6IEFYU2Nyb2xsQmFyCiAgICAgICAKK1BBU1M6IGRpdltyb2xlPXNlYXJjaF0KKyAg ICAgIEFYUm9sZTogQVhMYW5kbWFya1NlYXJjaAorICAgICAgCiBQQVNTOiBkaXZbcm9sZT1zZXBh cmF0b3JdCiAgICAgICBBWFJvbGU6IEFYU2VwYXJhdG9yCiAgICAgICAKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3JvbGVzLWV4cG9zZWQuaHRtbCBi L0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3JvbGVzLWV4cG9zZWQuaHRt bAppbmRleCA1ZjdjYTllLi5iNjZhMzBiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9ndGsvYWNjZXNzaWJpbGl0eS9yb2xlcy1leHBvc2VkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvcm9sZXMtZXhwb3NlZC5odG1sCkBAIC0xMCwxMCAr MTAsMTAgQEAKIDxhIGRhdGEtcm9sZT0iQVhMaW5rIiBocmVmPSIjIiBkYXRhLW5vdGU9IltocmVm XSIgY2xhc3M9ImV4Ij5YPC9hPgogPCEtLSBza2lwcGVkIEFUSzogbm90IGZvY3VzYWJsZSA8YSBk YXRhLXJvbGU9IiIgZGF0YS1ub3RlPSI6bm90KFtocmVmXSkiIGNsYXNzPSJleCI+WDwvYT4tLT4K IDwhLS0gc2tpcHBlZCBBVEs6IG5vdCBmb2N1c2FibGUgPGFiYnIgZGF0YS1yb2xlPSIiIGNsYXNz PSJleCI+WDwvYWJicj4tLT4KLTwhLS0gaHR0cDovL3dlYmtpdC5vcmcvYi8xMjU0OTMgPGFkZHJl c3MgZGF0YS1yb2xlPSJBWExhbmRtYXJrQ29udGVudEluZm8iIGNsYXNzPSJleCI+WDwvYWRkcmVz cz4tLT4KKzxhZGRyZXNzIGRhdGEtcm9sZT0iQVhMYW5kbWFya0NvbnRlbnRJbmZvIiBjbGFzcz0i ZXgiPlg8L2FkZHJlc3M+CiA8IS0tIHNraXBwZWQgPGFyZWE+IC0tPgogPCEtLSBodHRwOi8vd2Vi a2l0Lm9yZy9iLzEyNTQ5MyA8YXJ0aWNsZSBkYXRhLXJvbGU9IkFYQXJ0aWNsZSIgY2xhc3M9ImV4 Ij5YPC9hcnRpY2xlPi0tPgotPCEtLSBodHRwOi8vd2Via2l0Lm9yZy9iLzEyNTQ5MyA8YXNpZGUg ZGF0YS1yb2xlPSJBWExhbmRtYXJrQ29tcGxlbWVudGFyeSIgY2xhc3M9ImV4Ij5YPC9hc2lkZT4t LT4KKzxhc2lkZSBkYXRhLXJvbGU9IkFYTGFuZG1hcmtDb21wbGVtZW50YXJ5IiBjbGFzcz0iZXgi Plg8L2FzaWRlPgogPCEtLSBodHRwOi8vd2Via2l0Lm9yZy9iLzEyNTQ5MSA8YXVkaW8gZGF0YS1y b2xlPSIiIGNsYXNzPSJleCI+WDwvYXVkaW8+LS0+CiA8IS0tIHNraXBwZWQgQVRLOiBub3QgZm9j dXNhYmxlIDxiIGRhdGEtcm9sZT0iIiBjbGFzcz0iZXgiPlg8L2I+LS0+CiA8IS0tIHNraXBwZWQg QVRLOiBub3QgZm9jdXNhYmxlIDxiZG8gZGF0YS1yb2xlPSIiIGNsYXNzPSJleCI+WDwvYmRvPi0t PgpAQCAtNDMsNyArNDMsNyBAQAogPCEtLSBza2lwcGVkIDxmcmFtZT4gLS0+CiA8IS0tIHNraXBw ZWQgPGZyYW1lc2V0PiAtLT4KIDwhLS0gc2tpcHBlZCA8aGVhZD4gLS0+Ci08IS0tIGh0dHA6Ly93 ZWJraXQub3JnL2IvMTI1NDkzIDxoZWFkZXIgZGF0YS1yb2xlPSJBWExhbmRtYXJrQmFubmVyIiBj bGFzcz0iZXgiPlg8L2hlYWRlcj4tLT4KKzxoZWFkZXIgZGF0YS1yb2xlPSJBWExhbmRtYXJrQmFu bmVyIiBjbGFzcz0iZXgiPlg8L2hlYWRlcj4KIDxoZ3JvdXAgZGF0YS1yb2xlPSJBWEdyb3VwIiBj bGFzcz0iZXgiPlg8L2hncm91cD4KIDxoMSBkYXRhLXJvbGU9IkFYSGVhZGluZyIgY2xhc3M9ImV4 Ij5YPC9oMT4KIDxoMiBkYXRhLXJvbGU9IkFYSGVhZGluZyIgY2xhc3M9ImV4Ij5YPC9oMj4KQEAg LTk0LDcgKzk0LDcgQEAKIDwhLS0gc2tpcHBlZCA8bWVudT4gLS0+CiA8IS0tIHNraXBwZWQgPG1l dGE+IC0tPgogPCEtLSBodHRwOi8vd2Via2l0Lm9yZy9iLzEyNTQ5MSA8bWV0ZXIgZGF0YS1yb2xl PSJBWFByb2dyZXNzSW5kaWNhdG9yIiBjbGFzcz0iZXgiIHZhbHVlPSIwLjc1Ij5YPC9tZXRlcj4t LT4KLTwhLS0gaHR0cDovL3dlYmtpdC5vcmcvYi8xMjU0OTMgPG5hdiBkYXRhLXJvbGU9IkFYTGFu ZG1hcmtOYXZpZ2F0aW9uIiBjbGFzcz0iZXgiPlg8L25hdj4tLT4KKzxuYXYgZGF0YS1yb2xlPSJB WExhbmRtYXJrTmF2aWdhdGlvbiIgY2xhc3M9ImV4Ij5YPC9uYXY+CiA8IS0tIHNraXBwZWQgPG5v c2NyaXB0PiAtLT4KIDwhLS0gc2tpcHBlZCA8b2JqZWN0PiAtLT4KIDxvbCBkYXRhLXJvbGU9IkFY TGlzdCIgY2xhc3M9ImV4Ij4KQEAgLTE4OCwxNCArMTg4LDE0IEBACiA8IS0tID09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0gLS0+CiA8ZGl2IHJvbGU9ImFsZXJ0IiAg ICAgICAgICAgICAgICAgICAgZGF0YS1yb2xlPSJBWEFsZXJ0IiBjbGFzcz0iZXgiPlg8L2Rpdj4K IDxkaXYgcm9sZT0iYWxlcnRkaWFsb2ciICAgICAgICAgICAgICBkYXRhLXJvbGU9IkFYQWxlcnQi IGNsYXNzPSJleCI+WDwvZGl2PgotPCEtLSBodHRwOi8vd2Via2l0Lm9yZy9iLzEyNTQ5MyA8ZGl2 IHJvbGU9ImFwcGxpY2F0aW9uIiAgICAgICAgICAgICAgZGF0YS1yb2xlPSJBWEVtYmVkZGVkIiBj bGFzcz0iZXgiPlg8L2Rpdj4tLT4KKzxkaXYgcm9sZT0iYXBwbGljYXRpb24iICAgICAgICAgICAg ICBkYXRhLXJvbGU9IkFYRW1iZWRkZWQiIGNsYXNzPSJleCI+WDwvZGl2PgogPCEtLSBodHRwOi8v d2Via2l0Lm9yZy9iLzEyNTQ5MyA8ZGl2IHJvbGU9ImFydGljbGUiICAgICAgICAgICAgICAgICAg ZGF0YS1yb2xlPSJBWEFydGljbGUiIGNsYXNzPSJleCI+WDwvZGl2Pi0tPgotPCEtLSBodHRwOi8v d2Via2l0Lm9yZy9iLzEyNTQ5MyA8ZGl2IHJvbGU9ImJhbm5lciIgICAgICAgICAgICAgICAgICAg ZGF0YS1yb2xlPSJBWExhbmRtYXJrQmFubmVyIiBjbGFzcz0iZXgiPlg8L2Rpdj4tLT4KKzxkaXYg cm9sZT0iYmFubmVyIiAgICAgICAgICAgICAgICAgICBkYXRhLXJvbGU9IkFYTGFuZG1hcmtCYW5u ZXIiIGNsYXNzPSJleCI+WDwvZGl2PgogPGRpdiByb2xlPSJidXR0b24iICAgICAgICAgICAgICAg ICAgIGRhdGEtcm9sZT0iQVhCdXR0b24iIGNsYXNzPSJleCI+WDwvZGl2PgogPGRpdiByb2xlPSJj aGVja2JveCIgICAgICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhDaGVja0JveCIgY2xhc3M9ImV4 Ij5YPC9kaXY+CiA8ZGl2IHJvbGU9ImNvbWJvYm94IiAgICAgICAgICAgICAgICAgZGF0YS1yb2xl PSJBWENvbWJvQm94IiBjbGFzcz0iZXgiPlg8L2Rpdj4KLTwhLS0gaHR0cDovL3dlYmtpdC5vcmcv Yi8xMjU0OTMgPGRpdiByb2xlPSJjb21wbGVtZW50YXJ5IiAgICAgICAgICAgIGRhdGEtcm9sZT0i QVhMYW5kbWFya0NvbXBsZW1lbnRhcnkiIGNsYXNzPSJleCI+WDwvZGl2Pi0tPgotPCEtLSBodHRw Oi8vd2Via2l0Lm9yZy9iLzEyNTQ5MyA8ZGl2IHJvbGU9ImNvbnRlbnRpbmZvIiAgICAgICAgICAg ICAgZGF0YS1yb2xlPSJBWExhbmRtYXJrQ29udGVudEluZm8iIGNsYXNzPSJleCI+WDwvZGl2Pi0t PgorPGRpdiByb2xlPSJjb21wbGVtZW50YXJ5IiAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhMYW5k bWFya0NvbXBsZW1lbnRhcnkiIGNsYXNzPSJleCI+WDwvZGl2PgorPGRpdiByb2xlPSJjb250ZW50 aW5mbyIgICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhMYW5kbWFya0NvbnRlbnRJbmZvIiBjbGFz cz0iZXgiPlg8L2Rpdj4KIDwhLS0gaHR0cDovL3dlYmtpdC5vcmcvYi8xMjU0OTMgPGRpdiByb2xl PSJkZWZpbml0aW9uIiAgICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhEZWZpbml0aW9uIiBjbGFz cz0iZXgiPlg8L2Rpdj4tLT4KIDwhLS0gaHR0cDovL3dlYmtpdC5vcmcvYi8xMjU0OTMgPGRpdiBy b2xlPSJkaWFsb2ciICAgICAgICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhHcm91cCIgY2xhc3M9 ImV4Ij5YPC9kaXY+LS0+CiA8ZGl2IHJvbGU9ImRpcmVjdG9yeSIgICAgICAgICAgICAgICAgZGF0 YS1yb2xlPSJBWExpc3QiIGNsYXNzPSJleCI+WDwvZGl2PgpAQCAtMjIyLDcgKzIyMiw3IEBACiAg ICAgPGRpdiByb2xlPSJvcHRpb24iICAgICAgICAgICAgICAgZGF0YS1yb2xlPSJBWExpc3RJdGVt IiBjbGFzcz0iZXgiPlg8L2Rpdj4KIDwvZGl2PgogPCEtLSBodHRwOi8vd2Via2l0Lm9yZy9iLzEy NTQ5MyA8ZGl2IHJvbGU9ImxvZyIgICAgICAgICAgICAgICAgICAgICAgZGF0YS1yb2xlPSJBWExv ZyIgY2xhc3M9ImV4Ij5YPC9kaXY+LS0+Ci08IS0tIGh0dHA6Ly93ZWJraXQub3JnL2IvMTI1NDkz IDxkaXYgcm9sZT0ibWFpbiIgICAgICAgICAgICAgICAgICAgICBkYXRhLXJvbGU9IkFYTGFuZG1h cmtNYWluIiBjbGFzcz0iZXgiPlg8L2Rpdj4tLT4KKzxkaXYgcm9sZT0ibWFpbiIgICAgICAgICAg ICAgICAgICAgICBkYXRhLXJvbGU9IkFYTGFuZG1hcmtNYWluIiBjbGFzcz0iZXgiPlg8L2Rpdj4K IDwhLS0gaHR0cDovL3dlYmtpdC5vcmcvYi8xMjU0OTMgPGRpdiByb2xlPSJtYXJxdWVlIiAgICAg ICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhNYXJxdWVlIiBjbGFzcz0iZXgiPlg8L2Rpdj4tLT4K IDwhLS0gaHR0cDovL3dlYmtpdC5vcmcvYi8xMjU0OTMgPGRpdiByb2xlPSJtYXRoIiAgICAgICAg ICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhNYXRoIiBjbGFzcz0iZXgiPlg8L2Rpdj4tLT4KIDxk aXYgcm9sZT0ibWVudSIgICAgICAgICAgICAgICAgICAgICBkYXRhLXJvbGU9IkFYTWVudSIgY2xh c3M9ImV4Ij4KQEAgLTIzNyw3ICsyMzcsNyBAQAogICAgIDwhLS0gaHR0cDovL3dlYmtpdC5vcmcv Yi8xMjU0OTMgPGRpdiByb2xlPSJtZW51aXRlbWNoZWNrYm94IiAgICAgZGF0YS1yb2xlPSJBWENo ZWNrTWVudUl0ZW0iIGNsYXNzPSJleCI+WDwvZGl2Pi0tPgogICAgIDxkaXYgcm9sZT0ibWVudWl0 ZW1yYWRpbyIgICAgICAgIGRhdGEtcm9sZT0iQVhSYWRpb01lbnVJdGVtIiBjbGFzcz0iZXgiPlg8 L2Rpdj4KIDwvZGl2PgotPCEtLSBodHRwOi8vd2Via2l0Lm9yZy9iLzEyNTQ5MyA8ZGl2IHJvbGU9 Im5hdmlnYXRpb24iICAgICAgICAgICAgICAgZGF0YS1yb2xlPSJBWExhbmRtYXJrTmF2aWdhdGlv biIgY2xhc3M9ImV4Ij5YPC9kaXY+LS0+Cis8ZGl2IHJvbGU9Im5hdmlnYXRpb24iICAgICAgICAg ICAgICAgZGF0YS1yb2xlPSJBWExhbmRtYXJrTmF2aWdhdGlvbiIgY2xhc3M9ImV4Ij5YPC9kaXY+ CiA8IS0tIGh0dHA6Ly93ZWJraXQub3JnL2IvMTI1NDkzIDxkaXYgcm9sZT0ibm90ZSIgICAgICAg ICAgICAgICAgICAgICBkYXRhLXJvbGU9IkFYQ29tbWVudCIgY2xhc3M9ImV4Ij5YPC9kaXY+LS0+ CiA8IS0tIHNraXBwZWQ6IHByZXNlbnRhdGlvbiBlbGVtZW50cyBzaG91bGQgbm90IGJlIGV4cG9z ZWQgZGlyZWN0bHkgPGRpdiByb2xlPSJwcmVzZW50YXRpb24iICAgICAgICAgICAgIGRhdGEtcm9s ZT0iIiBjbGFzcz0iZXgiPlg8L2Rpdj4tLT4KIDxkaXYgcm9sZT0icHJvZ3Jlc3NiYXIiICAgICAg ICAgICAgICBkYXRhLXJvbGU9IkFYUHJvZ3Jlc3NJbmRpY2F0b3IiIGNsYXNzPSJleCI+WDwvZGl2 PgpAQCAtMjQ2LDcgKzI0Niw3IEBACiA8L2Rpdj4KIDwhLS0gaHR0cDovL3dlYmtpdC5vcmcvYi8x MjU0OTMgPGRpdiByb2xlPSJyZWdpb24iICAgICAgICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhH cm91cCIgY2xhc3M9ImV4Ij5YPC9kaXY+LS0+CiA8ZGl2IHJvbGU9InNjcm9sbGJhciIgICAgICAg ICAgICAgICAgZGF0YS1yb2xlPSJBWFNjcm9sbEJhciIgY2xhc3M9ImV4Ij5YPC9kaXY+Ci08IS0t IGh0dHA6Ly93ZWJraXQub3JnL2IvMTI1NDkzIDxkaXYgcm9sZT0ic2VhcmNoIiAgICAgICAgICAg ICAgICAgICBkYXRhLXJvbGU9IkFYTGFuZG1hcmtTZWFyY2giIGNsYXNzPSJleCI+WDwvZGl2Pi0t PgorPGRpdiByb2xlPSJzZWFyY2giICAgICAgICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhMYW5k bWFya1NlYXJjaCIgY2xhc3M9ImV4Ij5YPC9kaXY+CiA8ZGl2IHJvbGU9InNlcGFyYXRvciIgICAg ICAgICAgICAgICAgZGF0YS1yb2xlPSJBWFNlcGFyYXRvciIgY2xhc3M9ImV4Ij5YPC9kaXY+CiA8 ZGl2IHJvbGU9InNsaWRlciIgICAgICAgICAgICAgICAgICAgZGF0YS1yb2xlPSJBWFNsaWRlciIg Y2xhc3M9ImV4Ij5YPC9kaXY+CiA8ZGl2IHJvbGU9InNwaW5idXR0b24iICAgICAgICAgICAgICAg ZGF0YS1yb2xlPSJBWFNwaW5CdXR0b24iIGNsYXNzPSJleCI+WDwvZGl2PgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IDA1NjQ4MjcuLmUwZDllMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMy0xMi0x MSAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1hcmlvLnByYWRhQHNhbXN1bmcuY29tPgorCisgICAg ICAgIFtBVEtdIEV4cG9zZSBhY2Nlc3NpYmlsaXR5IG9iamVjdHMgV0FJLUFSSUEgbGFuZG1hcmsg cm9sZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy NTU4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV4 cG9zZWQgYWNjZXNzaWJpbGl0eSBvYmplY3RzIHdpdGggbGFuZG1hcmsgcm9sZXMgd2l0aCB0aGUg cHJvcGVyCisgICAgICAgIEF0a1JvbGUsIHRvIGJlIHByb3ZpZGVkIGJ5IHRoZSBuZXh0IHN0YWJs ZSByZWxlYXNlIG9mIEFUSy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFj Y2Vzc2libGVXcmFwcGVyQXRrLmNwcDoKKyAgICAgICAgKHdlYmtpdEFjY2Vzc2libGVHZXRBdHRy aWJ1dGVzKToKKyAgICAgICAgKGF0a1JvbGUpOgorCiAyMDEzLTEyLTEwICBNYXJpbyBTYW5jaGV6 IFByYWRhICA8bWFyaW8ucHJhZGFAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0FUS10gRXhwb3Nl IHNwbGl0dGVyIGVsZW1lbnRzIHdpdGggQVRLX1JPTEVfU0VQQVJBVE9SCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0 ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxl V3JhcHBlckF0ay5jcHAKaW5kZXggNGE3YTUwZS4uM2NlY2Q3MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2libGVX cmFwcGVyQXRrLmNwcApAQCAtNTI4LDYgKzUyOCwyMiBAQCBzdGF0aWMgQXRrQXR0cmlidXRlU2V0 KiB3ZWJraXRBY2Nlc3NpYmxlR2V0QXR0cmlidXRlcyhBdGtPYmplY3QqIG9iamVjdCkKICAgICAg ICAgYXR0cmlidXRlU2V0ID0gYWRkVG9BdGtBdHRyaWJ1dGVTZXQoYXR0cmlidXRlU2V0LCAic29y dCIsIHNvcnRBdHRyaWJ1dGUuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgfQogCisgICAg Ly8gTGFuZG1hcmtzIHdpbGwgYmUgZXhwb3NlZCB3aXRoIHhtbC1yb2xlcyBvYmplY3QgYXR0cmli dXRlcywgd2l0aCB0aGUgZXhjZXB0aW9uCisgICAgLy8gb2YgTGFuZE1hcmtBcHBsaWNhdGlvblJv bGUsIHdoaWMgd2lsbCBiZSBleHBvc2VkIHdpdGggQVRLX1JPTEVfRU1CRURERUQuCisgICAgQWNj ZXNzaWJpbGl0eVJvbGUgcm9sZSA9IGNvcmVPYmplY3QtPnJvbGVWYWx1ZSgpOworICAgIGlmIChy b2xlID09IExhbmRtYXJrQmFubmVyUm9sZSkKKyAgICAgICAgYXR0cmlidXRlU2V0ID0gYWRkVG9B dGtBdHRyaWJ1dGVTZXQoYXR0cmlidXRlU2V0LCAieG1sLXJvbGVzIiwgImJhbm5lciIpOworICAg IGVsc2UgaWYgKHJvbGUgPT0gTGFuZG1hcmtDb21wbGVtZW50YXJ5Um9sZSkKKyAgICAgICAgYXR0 cmlidXRlU2V0ID0gYWRkVG9BdGtBdHRyaWJ1dGVTZXQoYXR0cmlidXRlU2V0LCAieG1sLXJvbGVz IiwgImNvbXBsZW1lbnRhcnkiKTsKKyAgICBlbHNlIGlmIChyb2xlID09IExhbmRtYXJrQ29udGVu dEluZm9Sb2xlKQorICAgICAgICBhdHRyaWJ1dGVTZXQgPSBhZGRUb0F0a0F0dHJpYnV0ZVNldChh dHRyaWJ1dGVTZXQsICJ4bWwtcm9sZXMiLCAiY29udGVudGluZm8iKTsKKyAgICBlbHNlIGlmIChy b2xlID09IExhbmRtYXJrTWFpblJvbGUpCisgICAgICAgIGF0dHJpYnV0ZVNldCA9IGFkZFRvQXRr QXR0cmlidXRlU2V0KGF0dHJpYnV0ZVNldCwgInhtbC1yb2xlcyIsICJtYWluIik7CisgICAgZWxz ZSBpZiAocm9sZSA9PSBMYW5kbWFya05hdmlnYXRpb25Sb2xlKQorICAgICAgICBhdHRyaWJ1dGVT ZXQgPSBhZGRUb0F0a0F0dHJpYnV0ZVNldChhdHRyaWJ1dGVTZXQsICJ4bWwtcm9sZXMiLCAibmF2 aWdhdGlvbiIpOworICAgIGVsc2UgaWYgKHJvbGUgPT0gTGFuZG1hcmtTZWFyY2hSb2xlKQorICAg ICAgICBhdHRyaWJ1dGVTZXQgPSBhZGRUb0F0a0F0dHJpYnV0ZVNldChhdHRyaWJ1dGVTZXQsICJ4 bWwtcm9sZXMiLCAic2VhcmNoIik7CisKICAgICByZXR1cm4gYXR0cmlidXRlU2V0OwogfQogCkBA IC02NjIsNiArNjc4LDE3IEBAIHN0YXRpYyBBdGtSb2xlIGF0a1JvbGUoQWNjZXNzaWJpbGl0eVJv bGUgcm9sZSkKICAgICAgICAgcmV0dXJuIEFUS19ST0xFX1RPT0xfVElQOwogICAgIGNhc2UgV2Vi QXJlYVJvbGU6CiAgICAgICAgIHJldHVybiBBVEtfUk9MRV9ET0NVTUVOVF9XRUI7CisgICAgY2Fz ZSBMYW5kbWFya0FwcGxpY2F0aW9uUm9sZToKKyAgICAgICAgcmV0dXJuIEFUS19ST0xFX0VNQkVE REVEOworI2lmIEFUS19DSEVDS19WRVJTSU9OKDIsIDExLCAzKQorICAgIGNhc2UgTGFuZG1hcmtC YW5uZXJSb2xlOgorICAgIGNhc2UgTGFuZG1hcmtDb21wbGVtZW50YXJ5Um9sZToKKyAgICBjYXNl IExhbmRtYXJrQ29udGVudEluZm9Sb2xlOgorICAgIGNhc2UgTGFuZG1hcmtNYWluUm9sZToKKyAg ICBjYXNlIExhbmRtYXJrTmF2aWdhdGlvblJvbGU6CisgICAgY2FzZSBMYW5kbWFya1NlYXJjaFJv bGU6CisgICAgICAgIHJldHVybiBBVEtfUk9MRV9MQU5ETUFSSzsKKyNlbmRpZgogICAgIGRlZmF1 bHQ6CiAgICAgICAgIHJldHVybiBBVEtfUk9MRV9VTktOT1dOOwogICAgIH0KZGlmZiAtLWdpdCBh L1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5YjExNDFkLi45YzY5ZmE0 IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTggQEAKKzIwMTMtMTItMTEgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtYXJpby5wcmFk YUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbQVRLXSBFeHBvc2UgYWNjZXNzaWJpbGl0eSBvYmpl Y3RzIFdBSS1BUklBIGxhbmRtYXJrIHJvbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU1ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgbWFwcGluZ3MgdG8gRFJUICYgV0tUUiBmb3IgbGFuZG1h cmsgcm9sZXMuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9hdGsvQWNjZXNzaWJpbGl0eVVJ RWxlbWVudEF0ay5jcHA6CisgICAgICAgIChBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojpyb2xlKToK KyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2F0ay9BY2Nlc3NpYmls aXR5VUlFbGVtZW50QXRrLmNwcDoKKyAgICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxlbWVu dDo6cm9sZSk6CisgICAgICAgICogZ3RrL2poYnVpbGQubW9kdWxlczoKKwogMjAxMy0xMi0xMCAg TWFyaW8gU2FuY2hleiBQcmFkYSAgPG1hcmlvLnByYWRhQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFtBVEtdIEV4cG9zZSBzcGxpdHRlciBlbGVtZW50cyB3aXRoIEFUS19ST0xFX1NFUEFSQVRPUgpk aWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1l bnRBdGsuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1l bnRBdGsuY3BwCmluZGV4IDkzZDBhYzcuLmU3MTUwZDUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2F0ay9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRrLmNwcAorKysgYi9Ub29scy9E dW1wUmVuZGVyVHJlZS9hdGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAKQEAgLTgxLDYg KzgxLDE1IEBAIGNvbnN0IFN0cmluZyBhdHRyaWJ1dGVzTWFwW11bMl0gPSB7CiAgICAgeyAiQVhV bmtub3duU29ydERpcmVjdGlvbiIsICJ1bmtub3duIiB9CiB9OwogCisjaWYgQVRLX0NIRUNLX1ZF UlNJT04oMiwgMTEsIDMpCitjb25zdCBjaGFyKiBsYW5kbWFya1N0cmluZ0Jhbm5lciA9ICJBWExh bmRtYXJrQmFubmVyIjsKK2NvbnN0IGNoYXIqIGxhbmRtYXJrU3RyaW5nQ29tcGxlbWVudGFyeSA9 ICJBWExhbmRtYXJrQ29tcGxlbWVudGFyeSI7Citjb25zdCBjaGFyKiBsYW5kbWFya1N0cmluZ0Nv bnRlbnRpbmZvID0gIkFYTGFuZG1hcmtDb250ZW50SW5mbyI7Citjb25zdCBjaGFyKiBsYW5kbWFy a1N0cmluZ01haW4gPSAiQVhMYW5kbWFya01haW4iOworY29uc3QgY2hhciogbGFuZG1hcmtTdHJp bmdOYXZpZ2F0aW9uID0gIkFYTGFuZG1hcmtOYXZpZ2F0aW9uIjsKK2NvbnN0IGNoYXIqIGxhbmRt YXJrU3RyaW5nU2VhcmNoID0gIkFYTGFuZG1hcmtTZWFyY2giOworI2VuZGlmCisKIFN0cmluZyBq c1N0cmluZ1RvV1RGU3RyaW5nKEpTU3RyaW5nUmVmIGF0dHJpYnV0ZSkKIHsKICAgICBzaXplX3Qg YnVmZmVyU2l6ZSA9IEpTU3RyaW5nR2V0TWF4aW11bVVURjhDU3RyaW5nU2l6ZShhdHRyaWJ1dGUp OwpAQCAtMTc4LDggKzE4NywyOCBAQCBTdHJpbmcgZ2V0QXRrQXR0cmlidXRlU2V0QXNTdHJpbmco QXRrT2JqZWN0KiBhY2Nlc3NpYmxlLCBBdGtBdHRyaWJ1dGVUeXBlIHR5cGUpCiAgICAgcmV0dXJu IGJ1aWxkZXIudG9TdHJpbmcoKTsKIH0KIAotaW5saW5lIGNvbnN0IGNoYXIqIHJvbGVUb1N0cmlu ZyhBdGtSb2xlIHJvbGUpCi17Citjb25zdCBjaGFyKiByb2xlVG9TdHJpbmcoQXRrT2JqZWN0KiBv YmplY3QpCit7CisgICAgQXRrUm9sZSByb2xlID0gYXRrX29iamVjdF9nZXRfcm9sZShvYmplY3Qp OworCisjaWYgQVRLX0NIRUNLX1ZFUlNJT04oMiwgMTEsIDMpCisgICAgaWYgKHJvbGUgPT0gQVRL X1JPTEVfTEFORE1BUkspIHsKKyAgICAgICAgU3RyaW5nIHhtbFJvbGVzVmFsdWUgPSBnZXRBdHRy aWJ1dGVTZXRWYWx1ZUZvcklkKG9iamVjdCwgT2JqZWN0QXR0cmlidXRlVHlwZSwgInhtbC1yb2xl cyIpOworICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoeG1sUm9sZXNWYWx1ZSwgImJhbm5l ciIpKQorICAgICAgICAgICAgcmV0dXJuIGxhbmRtYXJrU3RyaW5nQmFubmVyOworICAgICAgICBp ZiAoZXF1YWxJZ25vcmluZ0Nhc2UoeG1sUm9sZXNWYWx1ZSwgImNvbXBsZW1lbnRhcnkiKSkKKyAg ICAgICAgICAgIHJldHVybiBsYW5kbWFya1N0cmluZ0NvbXBsZW1lbnRhcnk7CisgICAgICAgIGlm IChlcXVhbElnbm9yaW5nQ2FzZSh4bWxSb2xlc1ZhbHVlLCAiY29udGVudGluZm8iKSkKKyAgICAg ICAgICAgIHJldHVybiBsYW5kbWFya1N0cmluZ0NvbnRlbnRpbmZvOworICAgICAgICBpZiAoZXF1 YWxJZ25vcmluZ0Nhc2UoeG1sUm9sZXNWYWx1ZSwgIm1haW4iKSkKKyAgICAgICAgICAgIHJldHVy biBsYW5kbWFya1N0cmluZ01haW47CisgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZSh4bWxS b2xlc1ZhbHVlLCAibmF2aWdhdGlvbiIpKQorICAgICAgICAgICAgcmV0dXJuIGxhbmRtYXJrU3Ry aW5nTmF2aWdhdGlvbjsKKyAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHhtbFJvbGVzVmFs dWUsICJzZWFyY2giKSkKKyAgICAgICAgICAgIHJldHVybiBsYW5kbWFya1N0cmluZ1NlYXJjaDsK KyAgICB9CisjZW5kaWYKKwogICAgIHN3aXRjaCAocm9sZSkgewogICAgIGNhc2UgQVRLX1JPTEVf QUxFUlQ6CiAgICAgICAgIHJldHVybiAiQVhBbGVydCI7CkBAIC0zMzUsNyArMzY0LDcgQEAgU3Ry aW5nIGF0dHJpYnV0ZXNPZkVsZW1lbnQoQWNjZXNzaWJpbGl0eVVJRWxlbWVudCogZWxlbWVudCkK ICAgICBidWlsZGVyLmFwcGVuZCgiQVhQYXJlbnQ6ICIpOwogICAgIEFjY2Vzc2liaWxpdHlVSUVs ZW1lbnQgcGFyZW50ID0gZWxlbWVudC0+cGFyZW50RWxlbWVudCgpOwogICAgIGlmIChBdGtPYmpl Y3QqIGF0a1BhcmVudCA9IHBhcmVudC5wbGF0Zm9ybVVJRWxlbWVudCgpKSB7Ci0gICAgICAgIGJ1 aWxkZXIuYXBwZW5kKHJvbGVUb1N0cmluZyhhdGtfb2JqZWN0X2dldF9yb2xlKGF0a1BhcmVudCkp KTsKKyAgICAgICAgYnVpbGRlci5hcHBlbmQocm9sZVRvU3RyaW5nKGF0a1BhcmVudCkpOwogICAg ICAgICBjb25zdCBjaGFyKiBwYXJlbnROYW1lID0gYXRrX29iamVjdF9nZXRfbmFtZShhdGtQYXJl bnQpOwogICAgICAgICBpZiAocGFyZW50TmFtZSAmJiBnX3V0Zjhfc3RybGVuKHBhcmVudE5hbWUs IC0xKSkKICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKFN0cmluZzo6Zm9ybWF0KCI6ICVzIiwg cGFyZW50TmFtZSkpOwpAQCAtNjc5LDExICs3MDgsMTAgQEAgSlNTdHJpbmdSZWYgQWNjZXNzaWJp bGl0eVVJRWxlbWVudDo6cm9sZSgpCiAgICAgaWYgKCFBVEtfSVNfT0JKRUNUKG1fZWxlbWVudCkp CiAgICAgICAgIHJldHVybiBKU1N0cmluZ0NyZWF0ZVdpdGhDaGFyYWN0ZXJzKDAsIDApOwogCi0g ICAgQXRrUm9sZSByb2xlID0gYXRrX29iamVjdF9nZXRfcm9sZShBVEtfT0JKRUNUKG1fZWxlbWVu dCkpOwotICAgIGlmICghcm9sZSkKKyAgICBpZiAoIWF0a19vYmplY3RfZ2V0X3JvbGUoQVRLX09C SkVDVChtX2VsZW1lbnQpKSkKICAgICAgICAgcmV0dXJuIEpTU3RyaW5nQ3JlYXRlV2l0aENoYXJh Y3RlcnMoMCwgMCk7CiAKLSAgICBHT3duUHRyPGNoYXI+IHJvbGVTdHJpbmdXaXRoUHJlZml4KGdf c3RyZHVwX3ByaW50ZigiQVhSb2xlOiAlcyIsIHJvbGVUb1N0cmluZyhyb2xlKSkpOworICAgIEdP d25QdHI8Y2hhcj4gcm9sZVN0cmluZ1dpdGhQcmVmaXgoZ19zdHJkdXBfcHJpbnRmKCJBWFJvbGU6 ICVzIiwgcm9sZVRvU3RyaW5nKEFUS19PQkpFQ1QobV9lbGVtZW50KSkpKTsKICAgICByZXR1cm4g SlNTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcocm9sZVN0cmluZ1dpdGhQcmVmaXguZ2V0KCkp OwogfQogCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxl L2F0ay9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRrLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwCmluZGV4 IGQxZmE5MzIuLjcyODAxODkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5q ZWN0ZWRCdW5kbGUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwCisrKyBiL1Rvb2xz L1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1l bnRBdGsuY3BwCkBAIC04NSw2ICs4NSwxNSBAQCBjb25zdCBTdHJpbmcgYXR0cmlidXRlc01hcFtd WzJdID0gewogICAgIHsgIkFYVW5rbm93blNvcnREaXJlY3Rpb24iLCAidW5rbm93biIgfQogfTsK IAorI2lmIEFUS19DSEVDS19WRVJTSU9OKDIsIDExLCAzKQorY29uc3QgY2hhciogbGFuZG1hcmtT dHJpbmdCYW5uZXIgPSAiQVhMYW5kbWFya0Jhbm5lciI7Citjb25zdCBjaGFyKiBsYW5kbWFya1N0 cmluZ0NvbXBsZW1lbnRhcnkgPSAiQVhMYW5kbWFya0NvbXBsZW1lbnRhcnkiOworY29uc3QgY2hh ciogbGFuZG1hcmtTdHJpbmdDb250ZW50aW5mbyA9ICJBWExhbmRtYXJrQ29udGVudEluZm8iOwor Y29uc3QgY2hhciogbGFuZG1hcmtTdHJpbmdNYWluID0gIkFYTGFuZG1hcmtNYWluIjsKK2NvbnN0 IGNoYXIqIGxhbmRtYXJrU3RyaW5nTmF2aWdhdGlvbiA9ICJBWExhbmRtYXJrTmF2aWdhdGlvbiI7 Citjb25zdCBjaGFyKiBsYW5kbWFya1N0cmluZ1NlYXJjaCA9ICJBWExhbmRtYXJrU2VhcmNoIjsK KyNlbmRpZgorCiBTdHJpbmcganNTdHJpbmdUb1dURlN0cmluZyhKU1N0cmluZ1JlZiBhdHRyaWJ1 dGUpCiB7CiAgICAgc2l6ZV90IGJ1ZmZlclNpemUgPSBKU1N0cmluZ0dldE1heGltdW1VVEY4Q1N0 cmluZ1NpemUoYXR0cmlidXRlKTsKQEAgLTI2Nyw4ICsyNzYsMjggQEAgZ2NoYXIqIHJlcGxhY2VD aGFyYWN0ZXJzRm9yUmVzdWx0cyhnY2hhciogc3RyKQogICAgIHJldHVybiBnX3N0cmR1cCh1U3Ry aW5nLnV0ZjgoKS5kYXRhKCkpOwogfQogCi1jb25zdCBnY2hhciogcm9sZVRvU3RyaW5nKEF0a1Jv bGUgcm9sZSkKLXsKK2NvbnN0IGdjaGFyKiByb2xlVG9TdHJpbmcoQXRrT2JqZWN0KiBvYmplY3Qp Cit7CisgICAgQXRrUm9sZSByb2xlID0gYXRrX29iamVjdF9nZXRfcm9sZShvYmplY3QpOworCisj aWYgQVRLX0NIRUNLX1ZFUlNJT04oMiwgMTEsIDMpCisgICAgaWYgKHJvbGUgPT0gQVRLX1JPTEVf TEFORE1BUkspIHsKKyAgICAgICAgU3RyaW5nIHhtbFJvbGVzVmFsdWUgPSBnZXRBdHRyaWJ1dGVT ZXRWYWx1ZUZvcklkKG9iamVjdCwgT2JqZWN0QXR0cmlidXRlVHlwZSwgInhtbC1yb2xlcyIpOwor ICAgICAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoeG1sUm9sZXNWYWx1ZSwgImJhbm5lciIpKQor ICAgICAgICAgICAgcmV0dXJuIGxhbmRtYXJrU3RyaW5nQmFubmVyOworICAgICAgICBpZiAoZXF1 YWxJZ25vcmluZ0Nhc2UoeG1sUm9sZXNWYWx1ZSwgImNvbXBsZW1lbnRhcnkiKSkKKyAgICAgICAg ICAgIHJldHVybiBsYW5kbWFya1N0cmluZ0NvbXBsZW1lbnRhcnk7CisgICAgICAgIGlmIChlcXVh bElnbm9yaW5nQ2FzZSh4bWxSb2xlc1ZhbHVlLCAiY29udGVudGluZm8iKSkKKyAgICAgICAgICAg IHJldHVybiBsYW5kbWFya1N0cmluZ0NvbnRlbnRpbmZvOworICAgICAgICBpZiAoZXF1YWxJZ25v cmluZ0Nhc2UoeG1sUm9sZXNWYWx1ZSwgIm1haW4iKSkKKyAgICAgICAgICAgIHJldHVybiBsYW5k bWFya1N0cmluZ01haW47CisgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZSh4bWxSb2xlc1Zh bHVlLCAibmF2aWdhdGlvbiIpKQorICAgICAgICAgICAgcmV0dXJuIGxhbmRtYXJrU3RyaW5nTmF2 aWdhdGlvbjsKKyAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHhtbFJvbGVzVmFsdWUsICJz ZWFyY2giKSkKKyAgICAgICAgICAgIHJldHVybiBsYW5kbWFya1N0cmluZ1NlYXJjaDsKKyAgICB9 CisjZW5kaWYKKwogICAgIHN3aXRjaCAocm9sZSkgewogICAgIGNhc2UgQVRLX1JPTEVfQUxFUlQ6 CiAgICAgICAgIHJldHVybiAiQVhBbGVydCI7CkBAIC00MDAsNyArNDI5LDcgQEAgU3RyaW5nIGF0 dHJpYnV0ZXNPZkVsZW1lbnQoQWNjZXNzaWJpbGl0eVVJRWxlbWVudCogZWxlbWVudCkKICAgICBS ZWZQdHI8QWNjZXNzaWJpbGl0eVVJRWxlbWVudD4gcGFyZW50ID0gZWxlbWVudC0+cGFyZW50RWxl bWVudCgpOwogICAgIEF0a09iamVjdCogYXRrUGFyZW50ID0gcGFyZW50ID8gcGFyZW50LT5wbGF0 Zm9ybVVJRWxlbWVudCgpLmdldCgpIDogbnVsbHB0cjsKICAgICBpZiAoYXRrUGFyZW50KSB7Ci0g ICAgICAgIGJ1aWxkZXIuYXBwZW5kKHJvbGVUb1N0cmluZyhhdGtfb2JqZWN0X2dldF9yb2xlKGF0 a1BhcmVudCkpKTsKKyAgICAgICAgYnVpbGRlci5hcHBlbmQocm9sZVRvU3RyaW5nKGF0a1BhcmVu dCkpOwogICAgICAgICBjb25zdCBjaGFyKiBwYXJlbnROYW1lID0gYXRrX29iamVjdF9nZXRfbmFt ZShhdGtQYXJlbnQpOwogICAgICAgICBpZiAocGFyZW50TmFtZSAmJiBnX3V0Zjhfc3RybGVuKHBh cmVudE5hbWUsIC0xKSkKICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKFN0cmluZzo6Zm9ybWF0 KCI6ICVzIiwgcGFyZW50TmFtZSkpOwpAQCAtODAwLDExICs4MjksMTAgQEAgSlNSZXRhaW5QdHI8 SlNTdHJpbmdSZWY+IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnJvbGUoKQogICAgIGlmICghQVRL X0lTX09CSkVDVChtX2VsZW1lbnQuZ2V0KCkpKQogICAgICAgICByZXR1cm4gSlNTdHJpbmdDcmVh dGVXaXRoQ2hhcmFjdGVycygwLCAwKTsKIAotICAgIEF0a1JvbGUgcm9sZSA9IGF0a19vYmplY3Rf Z2V0X3JvbGUoQVRLX09CSkVDVChtX2VsZW1lbnQuZ2V0KCkpKTsKLSAgICBpZiAoIXJvbGUpCisg ICAgaWYgKCFhdGtfb2JqZWN0X2dldF9yb2xlKEFUS19PQkpFQ1QobV9lbGVtZW50LmdldCgpKSkp CiAgICAgICAgIHJldHVybiBKU1N0cmluZ0NyZWF0ZVdpdGhDaGFyYWN0ZXJzKDAsIDApOwogCi0g ICAgR093blB0cjxjaGFyPiByb2xlU3RyaW5nV2l0aFByZWZpeChnX3N0cmR1cF9wcmludGYoIkFY Um9sZTogJXMiLCByb2xlVG9TdHJpbmcocm9sZSkpKTsKKyAgICBHT3duUHRyPGNoYXI+IHJvbGVT dHJpbmdXaXRoUHJlZml4KGdfc3RyZHVwX3ByaW50ZigiQVhSb2xlOiAlcyIsIHJvbGVUb1N0cmlu ZyhBVEtfT0JKRUNUKG1fZWxlbWVudC5nZXQoKSkpKSk7CiAgICAgcmV0dXJuIEpTU3RyaW5nQ3Jl YXRlV2l0aFVURjhDU3RyaW5nKHJvbGVTdHJpbmdXaXRoUHJlZml4LmdldCgpKTsKIH0KIApkaWZm IC0tZ2l0IGEvVG9vbHMvZ3RrL2poYnVpbGQubW9kdWxlcyBiL1Rvb2xzL2d0ay9qaGJ1aWxkLm1v ZHVsZXMKaW5kZXggNzE2NjFhYS4uN2NmNjNjNyAxMDA2NDQKLS0tIGEvVG9vbHMvZ3RrL2poYnVp bGQubW9kdWxlcworKysgYi9Ub29scy9ndGsvamhidWlsZC5tb2R1bGVzCkBAIC0yMzIsOSArMjMy LDkgQEAKICAgPGF1dG90b29scyBpZD0iYXRrIgogICAgICAgICAgICAgIGF1dG9nZW4tc2g9ImNv bmZpZ3VyZSIKICAgICAgICAgICAgICBhdXRvZ2VuYXJncz0iLS1kaXNhYmxlLWludHJvc3BlY3Rp b24iPgotICAgIDxicmFuY2ggbW9kdWxlPSJwdWIvR05PTUUvc291cmNlcy9hdGsvMi4xMC9hdGst Mi4xMC4wLnRhci54eiIgdmVyc2lvbj0iMi4xMC4wIgorICAgIDxicmFuY2ggbW9kdWxlPSJwdWIv R05PTUUvc291cmNlcy9hdGsvMi4xMS9hdGstMi4xMS4zLnRhci54eiIgdmVyc2lvbj0iMi4xMS4z IgogICAgICAgICAgICAgcmVwbz0iZnRwLmdub21lLm9yZyIKLSAgICAgICAgICAgIGhhc2g9InNo YTI1Njo2MzY5MTdhNTAzNmJjODUxZDg0OTExOTQ2NDVkMjg0Nzk4ZWMxMTg5MTlhODI4YmU1ZTcx M2I2ZWNjNWI1MGIwIi8+CisgICAgICAgICAgICBoYXNoPSJzaGEyNTY6YjNjNjM2Njg2MzhkYmI2 MjdhODFmNDMzM2EwMGI3NDRjNTAzNTMxZDA3YjE2ODQwNWVmNWYyN2YzODJhMGFlNCIvPgogICA8 L2F1dG90b29scz4KIAogICA8YXV0b3Rvb2xzIGlkPSJhdC1zcGkyLWNvcmUiIAotLSAKMS44LjMu MgoK 218986 2013-12-11 11:36:58 -0800 2013-12-11 11:39:33 -0800 Patch proposal 0001-ATK-Expose-accessibility-objects-WAI-ARIA-landmark-r.patch text/plain 21185 mario RnJvbSBiNDc3MWY0MjI2YWVkMGUzZDBhMmVlZWQ5NDgzZjMyY2JlMDMxNWEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtYXJpby5wcmFkYUBzYW1z dW5nLmNvbT4KRGF0ZTogVHVlLCAxMCBEZWMgMjAxMyAxOTozODoxOSArMDEwMApTdWJqZWN0OiBb UEFUQ0hdICAgICAgICAgW0FUS10gRXhwb3NlIGFjY2Vzc2liaWxpdHkgb2JqZWN0cyBXQUktQVJJ QSBsYW5kbWFyawogcm9sZXMgICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTI1NTg0CgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgMTIgKysrKysrKwogLi4uL2d0ay9hY2Nlc3NpYmlsaXR5L3JvbGVz LWV4cG9zZWQtZXhwZWN0ZWQudHh0ICAgfCAzMyArKysrKysrKysrKysrKysrKysKIC4uLi9wbGF0 Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9yb2xlcy1leHBvc2VkLmh0bWwgIHwgMjIgKysrKysrLS0t LS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICB8 IDE0ICsrKysrKysrCiAuLi4vYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcCAgICAg ICAgICAgICB8IDM3ICsrKysrKysrKysrKysrKysrKysrCiBUb29scy9DaGFuZ2VMb2cgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IDE1ICsrKysrKysrCiAuLi4vYXRrL0FjY2Vz c2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwICAgICAgICAgICAgICB8IDQwICsrKysrKysrKysrKysr KysrKy0tLS0KIC4uLi9hdGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAgICAgICAgICAg ICAgIHwgNDAgKysrKysrKysrKysrKysrKysrLS0tLQogVG9vbHMvZ3RrL2poYnVpbGQubW9kdWxl cyAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgNCArLS0KIDkgZmlsZXMgY2hhbmdlZCwgMTky IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4MTRiZmVkLi5hZTczZjkw IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMTItMTEgIE1hcmlvIFNhbmNoZXogUHJhZGEg IDxtYXJpby5wcmFkYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbQVRLXSBFeHBvc2UgYWNjZXNz aWJpbGl0eSBvYmplY3RzIFdBSS1BUklBIGxhbmRtYXJrIHJvbGVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU1ODQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGVzdCB0byB1bnNraXAgbGFu ZG1hcmsgZWxlbWVudHMgYW5kIHVwZGF0ZSBleHBlY3RhdGlvbnMuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9yb2xlcy1leHBvc2VkLWV4cGVjdGVkLnR4dDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9yb2xlcy1leHBvc2VkLmh0bWw6CisKIDIw MTMtMTItMTAgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtYXJpby5wcmFkYUBzYW1zdW5nLmNvbT4K IAogICAgICAgICBbQVRLXSBBZGQgbmV3IGxheW91dCB0ZXN0IHRvIGNoZWNrIEFUSyByb2xlcyBp biBhIGNlbnRyYWwgcGxhY2UKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9h Y2Nlc3NpYmlsaXR5L3JvbGVzLWV4cG9zZWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvcm9sZXMtZXhwb3NlZC1leHBlY3RlZC50eHQKaW5kZXgg MmNmYTIwMi4uMDIzNWZiMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Fj Y2Vzc2liaWxpdHkvcm9sZXMtZXhwb3NlZC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvcm9sZXMtZXhwb3NlZC1leHBlY3RlZC50eHQKQEAg LTYsNiArNiwxMiBAQCBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1Mi IG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURQogUEFTUzogYVtocmVmXQogICAg ICAgQVhSb2xlOiBBWExpbmsKICAgICAgIAorUEFTUzogYWRkcmVzcworICAgICAgQVhSb2xlOiBB WExhbmRtYXJrQ29udGVudEluZm8KKyAgICAgIAorUEFTUzogYXNpZGUKKyAgICAgIEFYUm9sZTog QVhMYW5kbWFya0NvbXBsZW1lbnRhcnkKKyAgICAgIAogUEFTUzogYmxvY2txdW90ZQogICAgICAg QVhSb2xlOiBBWEdyb3VwCiAgICAgICAKQEAgLTI0LDYgKzMwLDkgQEAgUEFTUzogbGVnZW5kCiBQ QVNTOiBmb3JtCiAgICAgICBBWFJvbGU6IEFYRm9ybQogICAgICAgCitQQVNTOiBoZWFkZXIKKyAg ICAgIEFYUm9sZTogQVhMYW5kbWFya0Jhbm5lcgorICAgICAgCiBQQVNTOiBoZ3JvdXAKICAgICAg IEFYUm9sZTogQVhHcm91cAogICAgICAgCkBAIC0xMTQsNiArMTIzLDkgQEAgUEFTUzogaW5wdXRb dHlwZT0ndXJsJ10KIFBBU1M6IGlucHV0W3R5cGU9J3dlZWsnXQogICAgICAgQVhSb2xlOiBBWFRl eHRGaWVsZAogICAgICAgCitQQVNTOiBuYXYKKyAgICAgIEFYUm9sZTogQVhMYW5kbWFya05hdmln YXRpb24KKyAgICAgIAogUEFTUzogb2wKICAgICAgIEFYUm9sZTogQVhMaXN0CiAgICAgICAKQEAg LTIxNiw2ICsyMjgsMTIgQEAgUEFTUzogZGl2W3JvbGU9YWxlcnRdCiBQQVNTOiBkaXZbcm9sZT1h bGVydGRpYWxvZ10KICAgICAgIEFYUm9sZTogQVhBbGVydAogICAgICAgCitQQVNTOiBkaXZbcm9s ZT1hcHBsaWNhdGlvbl0KKyAgICAgIEFYUm9sZTogQVhFbWJlZGRlZAorICAgICAgCitQQVNTOiBk aXZbcm9sZT1iYW5uZXJdCisgICAgICBBWFJvbGU6IEFYTGFuZG1hcmtCYW5uZXIKKyAgICAgIAog UEFTUzogZGl2W3JvbGU9YnV0dG9uXQogICAgICAgQVhSb2xlOiBBWEJ1dHRvbgogICAgICAgCkBA IC0yMjUsNiArMjQzLDEyIEBAIFBBU1M6IGRpdltyb2xlPWNoZWNrYm94XQogUEFTUzogZGl2W3Jv bGU9Y29tYm9ib3hdCiAgICAgICBBWFJvbGU6IEFYQ29tYm9Cb3gKICAgICAgIAorUEFTUzogZGl2 W3JvbGU9Y29tcGxlbWVudGFyeV0KKyAgICAgIEFYUm9sZTogQVhMYW5kbWFya0NvbXBsZW1lbnRh cnkKKyAgICAgIAorUEFTUzogZGl2W3JvbGU9Y29udGVudGluZm9dCisgICAgICBBWFJvbGU6IEFY TGFuZG1hcmtDb250ZW50SW5mbworICAgICAgCiBQQVNTOiBkaXZbcm9sZT1kaXJlY3RvcnldCiAg ICAgICBBWFJvbGU6IEFYTGlzdAogICAgICAgCkBAIC0yNjYsNiArMjkwLDkgQEAgRkFJTDogZGl2 W3JvbGU9bGlzdGJveF0KIFBBU1M6IGRpdltyb2xlPW9wdGlvbl0KICAgICAgIEFYUm9sZTogQVhM aXN0SXRlbQogICAgICAgCitQQVNTOiBkaXZbcm9sZT1tYWluXQorICAgICAgQVhSb2xlOiBBWExh bmRtYXJrTWFpbgorICAgICAgCiBQQVNTOiBkaXZbcm9sZT1tZW51XQogICAgICAgQVhSb2xlOiBB WE1lbnUKICAgICAgIApAQCAtMjg0LDYgKzMxMSw5IEBAIFBBU1M6IGRpdltyb2xlPW1lbnVpdGVt XQogUEFTUzogZGl2W3JvbGU9bWVudWl0ZW1yYWRpb10KICAgICAgIEFYUm9sZTogQVhSYWRpb01l bnVJdGVtCiAgICAgICAKK1BBU1M6IGRpdltyb2xlPW5hdmlnYXRpb25dCisgICAgICBBWFJvbGU6 IEFYTGFuZG1hcmtOYXZpZ2F0aW9uCisgICAgICAKIFBBU1M6IGRpdltyb2xlPXByb2dyZXNzYmFy XQogICAgICAgQVhSb2xlOiBBWFByb2dyZXNzSW5kaWNhdG9yCiAgICAgICAKQEAgLTI5Niw2ICsz MjYsOSBAQCBQQVNTOiBkaXZbcm9sZT1yYWRpb10KIFBBU1M6IGRpdltyb2xlPXNjcm9sbGJhcl0K ICAgICAgIEFYUm9sZTogQVhTY3JvbGxCYXIKICAgICAgIAorUEFTUzogZGl2W3JvbGU9c2VhcmNo XQorICAgICAgQVhSb2xlOiBBWExhbmRtYXJrU2VhcmNoCisgICAgICAKIFBBU1M6IGRpdltyb2xl PXNlcGFyYXRvcl0KICAgICAgIEFYUm9sZTogQVhTZXBhcmF0b3IKICAgICAgIApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvcm9sZXMtZXhwb3NlZC5o dG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvcm9sZXMtZXhwb3Nl ZC5odG1sCmluZGV4IDVmN2NhOWUuLmI2NmEzMGIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3JvbGVzLWV4cG9zZWQuaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9yb2xlcy1leHBvc2VkLmh0bWwKQEAgLTEw LDEwICsxMCwxMCBAQAogPGEgZGF0YS1yb2xlPSJBWExpbmsiIGhyZWY9IiMiIGRhdGEtbm90ZT0i W2hyZWZdIiBjbGFzcz0iZXgiPlg8L2E+CiA8IS0tIHNraXBwZWQgQVRLOiBub3QgZm9jdXNhYmxl IDxhIGRhdGEtcm9sZT0iIiBkYXRhLW5vdGU9Ijpub3QoW2hyZWZdKSIgY2xhc3M9ImV4Ij5YPC9h Pi0tPgogPCEtLSBza2lwcGVkIEFUSzogbm90IGZvY3VzYWJsZSA8YWJiciBkYXRhLXJvbGU9IiIg Y2xhc3M9ImV4Ij5YPC9hYmJyPi0tPgotPCEtLSBodHRwOi8vd2Via2l0Lm9yZy9iLzEyNTQ5MyA8 YWRkcmVzcyBkYXRhLXJvbGU9IkFYTGFuZG1hcmtDb250ZW50SW5mbyIgY2xhc3M9ImV4Ij5YPC9h ZGRyZXNzPi0tPgorPGFkZHJlc3MgZGF0YS1yb2xlPSJBWExhbmRtYXJrQ29udGVudEluZm8iIGNs YXNzPSJleCI+WDwvYWRkcmVzcz4KIDwhLS0gc2tpcHBlZCA8YXJlYT4gLS0+CiA8IS0tIGh0dHA6 Ly93ZWJraXQub3JnL2IvMTI1NDkzIDxhcnRpY2xlIGRhdGEtcm9sZT0iQVhBcnRpY2xlIiBjbGFz cz0iZXgiPlg8L2FydGljbGU+LS0+Ci08IS0tIGh0dHA6Ly93ZWJraXQub3JnL2IvMTI1NDkzIDxh c2lkZSBkYXRhLXJvbGU9IkFYTGFuZG1hcmtDb21wbGVtZW50YXJ5IiBjbGFzcz0iZXgiPlg8L2Fz aWRlPi0tPgorPGFzaWRlIGRhdGEtcm9sZT0iQVhMYW5kbWFya0NvbXBsZW1lbnRhcnkiIGNsYXNz PSJleCI+WDwvYXNpZGU+CiA8IS0tIGh0dHA6Ly93ZWJraXQub3JnL2IvMTI1NDkxIDxhdWRpbyBk YXRhLXJvbGU9IiIgY2xhc3M9ImV4Ij5YPC9hdWRpbz4tLT4KIDwhLS0gc2tpcHBlZCBBVEs6IG5v dCBmb2N1c2FibGUgPGIgZGF0YS1yb2xlPSIiIGNsYXNzPSJleCI+WDwvYj4tLT4KIDwhLS0gc2tp cHBlZCBBVEs6IG5vdCBmb2N1c2FibGUgPGJkbyBkYXRhLXJvbGU9IiIgY2xhc3M9ImV4Ij5YPC9i ZG8+LS0+CkBAIC00Myw3ICs0Myw3IEBACiA8IS0tIHNraXBwZWQgPGZyYW1lPiAtLT4KIDwhLS0g c2tpcHBlZCA8ZnJhbWVzZXQ+IC0tPgogPCEtLSBza2lwcGVkIDxoZWFkPiAtLT4KLTwhLS0gaHR0 cDovL3dlYmtpdC5vcmcvYi8xMjU0OTMgPGhlYWRlciBkYXRhLXJvbGU9IkFYTGFuZG1hcmtCYW5u ZXIiIGNsYXNzPSJleCI+WDwvaGVhZGVyPi0tPgorPGhlYWRlciBkYXRhLXJvbGU9IkFYTGFuZG1h cmtCYW5uZXIiIGNsYXNzPSJleCI+WDwvaGVhZGVyPgogPGhncm91cCBkYXRhLXJvbGU9IkFYR3Jv dXAiIGNsYXNzPSJleCI+WDwvaGdyb3VwPgogPGgxIGRhdGEtcm9sZT0iQVhIZWFkaW5nIiBjbGFz cz0iZXgiPlg8L2gxPgogPGgyIGRhdGEtcm9sZT0iQVhIZWFkaW5nIiBjbGFzcz0iZXgiPlg8L2gy PgpAQCAtOTQsNyArOTQsNyBAQAogPCEtLSBza2lwcGVkIDxtZW51PiAtLT4KIDwhLS0gc2tpcHBl ZCA8bWV0YT4gLS0+CiA8IS0tIGh0dHA6Ly93ZWJraXQub3JnL2IvMTI1NDkxIDxtZXRlciBkYXRh LXJvbGU9IkFYUHJvZ3Jlc3NJbmRpY2F0b3IiIGNsYXNzPSJleCIgdmFsdWU9IjAuNzUiPlg8L21l dGVyPi0tPgotPCEtLSBodHRwOi8vd2Via2l0Lm9yZy9iLzEyNTQ5MyA8bmF2IGRhdGEtcm9sZT0i QVhMYW5kbWFya05hdmlnYXRpb24iIGNsYXNzPSJleCI+WDwvbmF2Pi0tPgorPG5hdiBkYXRhLXJv bGU9IkFYTGFuZG1hcmtOYXZpZ2F0aW9uIiBjbGFzcz0iZXgiPlg8L25hdj4KIDwhLS0gc2tpcHBl ZCA8bm9zY3JpcHQ+IC0tPgogPCEtLSBza2lwcGVkIDxvYmplY3Q+IC0tPgogPG9sIGRhdGEtcm9s ZT0iQVhMaXN0IiBjbGFzcz0iZXgiPgpAQCAtMTg4LDE0ICsxODgsMTQgQEAKIDwhLS0gPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSAtLT4KIDxkaXYgcm9sZT0iYWxl cnQiICAgICAgICAgICAgICAgICAgICBkYXRhLXJvbGU9IkFYQWxlcnQiIGNsYXNzPSJleCI+WDwv ZGl2PgogPGRpdiByb2xlPSJhbGVydGRpYWxvZyIgICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhB bGVydCIgY2xhc3M9ImV4Ij5YPC9kaXY+Ci08IS0tIGh0dHA6Ly93ZWJraXQub3JnL2IvMTI1NDkz IDxkaXYgcm9sZT0iYXBwbGljYXRpb24iICAgICAgICAgICAgICBkYXRhLXJvbGU9IkFYRW1iZWRk ZWQiIGNsYXNzPSJleCI+WDwvZGl2Pi0tPgorPGRpdiByb2xlPSJhcHBsaWNhdGlvbiIgICAgICAg ICAgICAgIGRhdGEtcm9sZT0iQVhFbWJlZGRlZCIgY2xhc3M9ImV4Ij5YPC9kaXY+CiA8IS0tIGh0 dHA6Ly93ZWJraXQub3JnL2IvMTI1NDkzIDxkaXYgcm9sZT0iYXJ0aWNsZSIgICAgICAgICAgICAg ICAgICBkYXRhLXJvbGU9IkFYQXJ0aWNsZSIgY2xhc3M9ImV4Ij5YPC9kaXY+LS0+Ci08IS0tIGh0 dHA6Ly93ZWJraXQub3JnL2IvMTI1NDkzIDxkaXYgcm9sZT0iYmFubmVyIiAgICAgICAgICAgICAg ICAgICBkYXRhLXJvbGU9IkFYTGFuZG1hcmtCYW5uZXIiIGNsYXNzPSJleCI+WDwvZGl2Pi0tPgor PGRpdiByb2xlPSJiYW5uZXIiICAgICAgICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhMYW5kbWFy a0Jhbm5lciIgY2xhc3M9ImV4Ij5YPC9kaXY+CiA8ZGl2IHJvbGU9ImJ1dHRvbiIgICAgICAgICAg ICAgICAgICAgZGF0YS1yb2xlPSJBWEJ1dHRvbiIgY2xhc3M9ImV4Ij5YPC9kaXY+CiA8ZGl2IHJv bGU9ImNoZWNrYm94IiAgICAgICAgICAgICAgICAgZGF0YS1yb2xlPSJBWENoZWNrQm94IiBjbGFz cz0iZXgiPlg8L2Rpdj4KIDxkaXYgcm9sZT0iY29tYm9ib3giICAgICAgICAgICAgICAgICBkYXRh LXJvbGU9IkFYQ29tYm9Cb3giIGNsYXNzPSJleCI+WDwvZGl2PgotPCEtLSBodHRwOi8vd2Via2l0 Lm9yZy9iLzEyNTQ5MyA8ZGl2IHJvbGU9ImNvbXBsZW1lbnRhcnkiICAgICAgICAgICAgZGF0YS1y b2xlPSJBWExhbmRtYXJrQ29tcGxlbWVudGFyeSIgY2xhc3M9ImV4Ij5YPC9kaXY+LS0+Ci08IS0t IGh0dHA6Ly93ZWJraXQub3JnL2IvMTI1NDkzIDxkaXYgcm9sZT0iY29udGVudGluZm8iICAgICAg ICAgICAgICBkYXRhLXJvbGU9IkFYTGFuZG1hcmtDb250ZW50SW5mbyIgY2xhc3M9ImV4Ij5YPC9k aXY+LS0+Cis8ZGl2IHJvbGU9ImNvbXBsZW1lbnRhcnkiICAgICAgICAgICAgZGF0YS1yb2xlPSJB WExhbmRtYXJrQ29tcGxlbWVudGFyeSIgY2xhc3M9ImV4Ij5YPC9kaXY+Cis8ZGl2IHJvbGU9ImNv bnRlbnRpbmZvIiAgICAgICAgICAgICAgZGF0YS1yb2xlPSJBWExhbmRtYXJrQ29udGVudEluZm8i IGNsYXNzPSJleCI+WDwvZGl2PgogPCEtLSBodHRwOi8vd2Via2l0Lm9yZy9iLzEyNTQ5MyA8ZGl2 IHJvbGU9ImRlZmluaXRpb24iICAgICAgICAgICAgICAgZGF0YS1yb2xlPSJBWERlZmluaXRpb24i IGNsYXNzPSJleCI+WDwvZGl2Pi0tPgogPCEtLSBodHRwOi8vd2Via2l0Lm9yZy9iLzEyNTQ5MyA8 ZGl2IHJvbGU9ImRpYWxvZyIgICAgICAgICAgICAgICAgICAgZGF0YS1yb2xlPSJBWEdyb3VwIiBj bGFzcz0iZXgiPlg8L2Rpdj4tLT4KIDxkaXYgcm9sZT0iZGlyZWN0b3J5IiAgICAgICAgICAgICAg ICBkYXRhLXJvbGU9IkFYTGlzdCIgY2xhc3M9ImV4Ij5YPC9kaXY+CkBAIC0yMjIsNyArMjIyLDcg QEAKICAgICA8ZGl2IHJvbGU9Im9wdGlvbiIgICAgICAgICAgICAgICBkYXRhLXJvbGU9IkFYTGlz dEl0ZW0iIGNsYXNzPSJleCI+WDwvZGl2PgogPC9kaXY+CiA8IS0tIGh0dHA6Ly93ZWJraXQub3Jn L2IvMTI1NDkzIDxkaXYgcm9sZT0ibG9nIiAgICAgICAgICAgICAgICAgICAgICBkYXRhLXJvbGU9 IkFYTG9nIiBjbGFzcz0iZXgiPlg8L2Rpdj4tLT4KLTwhLS0gaHR0cDovL3dlYmtpdC5vcmcvYi8x MjU0OTMgPGRpdiByb2xlPSJtYWluIiAgICAgICAgICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhM YW5kbWFya01haW4iIGNsYXNzPSJleCI+WDwvZGl2Pi0tPgorPGRpdiByb2xlPSJtYWluIiAgICAg ICAgICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhMYW5kbWFya01haW4iIGNsYXNzPSJleCI+WDwv ZGl2PgogPCEtLSBodHRwOi8vd2Via2l0Lm9yZy9iLzEyNTQ5MyA8ZGl2IHJvbGU9Im1hcnF1ZWUi ICAgICAgICAgICAgICAgICAgZGF0YS1yb2xlPSJBWE1hcnF1ZWUiIGNsYXNzPSJleCI+WDwvZGl2 Pi0tPgogPCEtLSBodHRwOi8vd2Via2l0Lm9yZy9iLzEyNTQ5MyA8ZGl2IHJvbGU9Im1hdGgiICAg ICAgICAgICAgICAgICAgICAgZGF0YS1yb2xlPSJBWE1hdGgiIGNsYXNzPSJleCI+WDwvZGl2Pi0t PgogPGRpdiByb2xlPSJtZW51IiAgICAgICAgICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhNZW51 IiBjbGFzcz0iZXgiPgpAQCAtMjM3LDcgKzIzNyw3IEBACiAgICAgPCEtLSBodHRwOi8vd2Via2l0 Lm9yZy9iLzEyNTQ5MyA8ZGl2IHJvbGU9Im1lbnVpdGVtY2hlY2tib3giICAgICBkYXRhLXJvbGU9 IkFYQ2hlY2tNZW51SXRlbSIgY2xhc3M9ImV4Ij5YPC9kaXY+LS0+CiAgICAgPGRpdiByb2xlPSJt ZW51aXRlbXJhZGlvIiAgICAgICAgZGF0YS1yb2xlPSJBWFJhZGlvTWVudUl0ZW0iIGNsYXNzPSJl eCI+WDwvZGl2PgogPC9kaXY+Ci08IS0tIGh0dHA6Ly93ZWJraXQub3JnL2IvMTI1NDkzIDxkaXYg cm9sZT0ibmF2aWdhdGlvbiIgICAgICAgICAgICAgICBkYXRhLXJvbGU9IkFYTGFuZG1hcmtOYXZp Z2F0aW9uIiBjbGFzcz0iZXgiPlg8L2Rpdj4tLT4KKzxkaXYgcm9sZT0ibmF2aWdhdGlvbiIgICAg ICAgICAgICAgICBkYXRhLXJvbGU9IkFYTGFuZG1hcmtOYXZpZ2F0aW9uIiBjbGFzcz0iZXgiPlg8 L2Rpdj4KIDwhLS0gaHR0cDovL3dlYmtpdC5vcmcvYi8xMjU0OTMgPGRpdiByb2xlPSJub3RlIiAg ICAgICAgICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhDb21tZW50IiBjbGFzcz0iZXgiPlg8L2Rp dj4tLT4KIDwhLS0gc2tpcHBlZDogcHJlc2VudGF0aW9uIGVsZW1lbnRzIHNob3VsZCBub3QgYmUg ZXhwb3NlZCBkaXJlY3RseSA8ZGl2IHJvbGU9InByZXNlbnRhdGlvbiIgICAgICAgICAgICAgZGF0 YS1yb2xlPSIiIGNsYXNzPSJleCI+WDwvZGl2Pi0tPgogPGRpdiByb2xlPSJwcm9ncmVzc2JhciIg ICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhQcm9ncmVzc0luZGljYXRvciIgY2xhc3M9ImV4Ij5Y PC9kaXY+CkBAIC0yNDYsNyArMjQ2LDcgQEAKIDwvZGl2PgogPCEtLSBodHRwOi8vd2Via2l0Lm9y Zy9iLzEyNTQ5MyA8ZGl2IHJvbGU9InJlZ2lvbiIgICAgICAgICAgICAgICAgICAgZGF0YS1yb2xl PSJBWEdyb3VwIiBjbGFzcz0iZXgiPlg8L2Rpdj4tLT4KIDxkaXYgcm9sZT0ic2Nyb2xsYmFyIiAg ICAgICAgICAgICAgICBkYXRhLXJvbGU9IkFYU2Nyb2xsQmFyIiBjbGFzcz0iZXgiPlg8L2Rpdj4K LTwhLS0gaHR0cDovL3dlYmtpdC5vcmcvYi8xMjU0OTMgPGRpdiByb2xlPSJzZWFyY2giICAgICAg ICAgICAgICAgICAgIGRhdGEtcm9sZT0iQVhMYW5kbWFya1NlYXJjaCIgY2xhc3M9ImV4Ij5YPC9k aXY+LS0+Cis8ZGl2IHJvbGU9InNlYXJjaCIgICAgICAgICAgICAgICAgICAgZGF0YS1yb2xlPSJB WExhbmRtYXJrU2VhcmNoIiBjbGFzcz0iZXgiPlg8L2Rpdj4KIDxkaXYgcm9sZT0ic2VwYXJhdG9y IiAgICAgICAgICAgICAgICBkYXRhLXJvbGU9IkFYU2VwYXJhdG9yIiBjbGFzcz0iZXgiPlg8L2Rp dj4KIDxkaXYgcm9sZT0ic2xpZGVyIiAgICAgICAgICAgICAgICAgICBkYXRhLXJvbGU9IkFYU2xp ZGVyIiBjbGFzcz0iZXgiPlg8L2Rpdj4KIDxkaXYgcm9sZT0ic3BpbmJ1dHRvbiIgICAgICAgICAg ICAgICBkYXRhLXJvbGU9IkFYU3BpbkJ1dHRvbiIgY2xhc3M9ImV4Ij5YPC9kaXY+CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggMDU2NDgyNy4uZTBkOWUxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEz LTEyLTExICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bWFyaW8ucHJhZGFAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0FUS10gRXhwb3NlIGFjY2Vzc2liaWxpdHkgb2JqZWN0cyBXQUktQVJJQSBsYW5k bWFyayByb2xlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTI1NTg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRXhwb3NlZCBhY2Nlc3NpYmlsaXR5IG9iamVjdHMgd2l0aCBsYW5kbWFyayByb2xlcyB3aXRo IHRoZSBwcm9wZXIKKyAgICAgICAgQXRrUm9sZSwgdG8gYmUgcHJvdmlkZWQgYnkgdGhlIG5leHQg c3RhYmxlIHJlbGVhc2Ugb2YgQVRLLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hdGsvV2Vi S2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3BwOgorICAgICAgICAod2Via2l0QWNjZXNzaWJsZUdl dEF0dHJpYnV0ZXMpOgorICAgICAgICAoYXRrUm9sZSk6CisKIDIwMTMtMTItMTAgIE1hcmlvIFNh bmNoZXogUHJhZGEgIDxtYXJpby5wcmFkYUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbQVRLXSBF eHBvc2Ugc3BsaXR0ZXIgZWxlbWVudHMgd2l0aCBBVEtfUk9MRV9TRVBBUkFUT1IKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2libGVXcmFw cGVyQXRrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vz c2libGVXcmFwcGVyQXRrLmNwcAppbmRleCA0YTdhNTBlLi4zNmI3ZTdjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0 ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNz aWJsZVdyYXBwZXJBdGsuY3BwCkBAIC01MjgsNiArNTI4LDMyIEBAIHN0YXRpYyBBdGtBdHRyaWJ1 dGVTZXQqIHdlYmtpdEFjY2Vzc2libGVHZXRBdHRyaWJ1dGVzKEF0a09iamVjdCogb2JqZWN0KQog ICAgICAgICBhdHRyaWJ1dGVTZXQgPSBhZGRUb0F0a0F0dHJpYnV0ZVNldChhdHRyaWJ1dGVTZXQs ICJzb3J0Iiwgc29ydEF0dHJpYnV0ZS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICB9CiAK KyAgICAvLyBMYW5kbWFya3Mgd2lsbCBiZSBleHBvc2VkIHdpdGggeG1sLXJvbGVzIG9iamVjdCBh dHRyaWJ1dGVzLCB3aXRoIHRoZSBleGNlcHRpb24KKyAgICAvLyBvZiBMYW5kTWFya0FwcGxpY2F0 aW9uUm9sZSwgd2hpYyB3aWxsIGJlIGV4cG9zZWQgd2l0aCBBVEtfUk9MRV9FTUJFRERFRC4KKyAg ICBBY2Nlc3NpYmlsaXR5Um9sZSByb2xlID0gY29yZU9iamVjdC0+cm9sZVZhbHVlKCk7CisgICAg c3dpdGNoIChyb2xlKSB7CisgICAgY2FzZSBMYW5kbWFya0Jhbm5lclJvbGU6CisgICAgICAgIGF0 dHJpYnV0ZVNldCA9IGFkZFRvQXRrQXR0cmlidXRlU2V0KGF0dHJpYnV0ZVNldCwgInhtbC1yb2xl cyIsICJiYW5uZXIiKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBMYW5kbWFya0NvbXBsZW1l bnRhcnlSb2xlOgorICAgICAgICBhdHRyaWJ1dGVTZXQgPSBhZGRUb0F0a0F0dHJpYnV0ZVNldChh dHRyaWJ1dGVTZXQsICJ4bWwtcm9sZXMiLCAiY29tcGxlbWVudGFyeSIpOworICAgICAgICBicmVh azsKKyAgICBjYXNlIExhbmRtYXJrQ29udGVudEluZm9Sb2xlOgorICAgICAgICBhdHRyaWJ1dGVT ZXQgPSBhZGRUb0F0a0F0dHJpYnV0ZVNldChhdHRyaWJ1dGVTZXQsICJ4bWwtcm9sZXMiLCAiY29u dGVudGluZm8iKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBMYW5kbWFya01haW5Sb2xlOgor ICAgICAgICBhdHRyaWJ1dGVTZXQgPSBhZGRUb0F0a0F0dHJpYnV0ZVNldChhdHRyaWJ1dGVTZXQs ICJ4bWwtcm9sZXMiLCAibWFpbiIpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIExhbmRtYXJr TmF2aWdhdGlvblJvbGU6CisgICAgICAgIGF0dHJpYnV0ZVNldCA9IGFkZFRvQXRrQXR0cmlidXRl U2V0KGF0dHJpYnV0ZVNldCwgInhtbC1yb2xlcyIsICJuYXZpZ2F0aW9uIik7CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgTGFuZG1hcmtTZWFyY2hSb2xlOgorICAgICAgICBhdHRyaWJ1dGVTZXQg PSBhZGRUb0F0a0F0dHJpYnV0ZVNldChhdHRyaWJ1dGVTZXQsICJ4bWwtcm9sZXMiLCAic2VhcmNo Iik7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOworICAgIH0K KwogICAgIHJldHVybiBhdHRyaWJ1dGVTZXQ7CiB9CiAKQEAgLTY2Miw2ICs2ODgsMTcgQEAgc3Rh dGljIEF0a1JvbGUgYXRrUm9sZShBY2Nlc3NpYmlsaXR5Um9sZSByb2xlKQogICAgICAgICByZXR1 cm4gQVRLX1JPTEVfVE9PTF9USVA7CiAgICAgY2FzZSBXZWJBcmVhUm9sZToKICAgICAgICAgcmV0 dXJuIEFUS19ST0xFX0RPQ1VNRU5UX1dFQjsKKyAgICBjYXNlIExhbmRtYXJrQXBwbGljYXRpb25S b2xlOgorICAgICAgICByZXR1cm4gQVRLX1JPTEVfRU1CRURERUQ7CisjaWYgQVRLX0NIRUNLX1ZF UlNJT04oMiwgMTEsIDMpCisgICAgY2FzZSBMYW5kbWFya0Jhbm5lclJvbGU6CisgICAgY2FzZSBM YW5kbWFya0NvbXBsZW1lbnRhcnlSb2xlOgorICAgIGNhc2UgTGFuZG1hcmtDb250ZW50SW5mb1Jv bGU6CisgICAgY2FzZSBMYW5kbWFya01haW5Sb2xlOgorICAgIGNhc2UgTGFuZG1hcmtOYXZpZ2F0 aW9uUm9sZToKKyAgICBjYXNlIExhbmRtYXJrU2VhcmNoUm9sZToKKyAgICAgICAgcmV0dXJuIEFU S19ST0xFX0xBTkRNQVJLOworI2VuZGlmCiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIEFU S19ST0xFX1VOS05PV047CiAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9v bHMvQ2hhbmdlTG9nCmluZGV4IDliMTE0MWQuLjljNjlmYTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMy0xMi0x MSAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1hcmlvLnByYWRhQHNhbXN1bmcuY29tPgorCisgICAg ICAgIFtBVEtdIEV4cG9zZSBhY2Nlc3NpYmlsaXR5IG9iamVjdHMgV0FJLUFSSUEgbGFuZG1hcmsg cm9sZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy NTU4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBtYXBwaW5ncyB0byBEUlQgJiBXS1RSIGZvciBsYW5kbWFyayByb2xlcy4KKworICAgICAgICAq IER1bXBSZW5kZXJUcmVlL2F0ay9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRrLmNwcDoKKyAgICAg ICAgKEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnJvbGUpOgorICAgICAgICAqIFdlYktpdFRlc3RS dW5uZXIvSW5qZWN0ZWRCdW5kbGUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwOgor ICAgICAgICAoV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojpyb2xlKToKKyAgICAgICAgKiBn dGsvamhidWlsZC5tb2R1bGVzOgorCiAyMDEzLTEyLTEwICBNYXJpbyBTYW5jaGV6IFByYWRhICA8 bWFyaW8ucHJhZGFAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0FUS10gRXhwb3NlIHNwbGl0dGVy IGVsZW1lbnRzIHdpdGggQVRLX1JPTEVfU0VQQVJBVE9SCmRpZmYgLS1naXQgYS9Ub29scy9EdW1w UmVuZGVyVHJlZS9hdGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS9hdGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAKaW5kZXggOTNkMGFj Ny4uZTcxNTBkNSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvYXRrL0FjY2Vzc2li aWxpdHlVSUVsZW1lbnRBdGsuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2F0ay9BY2Nl c3NpYmlsaXR5VUlFbGVtZW50QXRrLmNwcApAQCAtODEsNiArODEsMTUgQEAgY29uc3QgU3RyaW5n IGF0dHJpYnV0ZXNNYXBbXVsyXSA9IHsKICAgICB7ICJBWFVua25vd25Tb3J0RGlyZWN0aW9uIiwg InVua25vd24iIH0KIH07CiAKKyNpZiBBVEtfQ0hFQ0tfVkVSU0lPTigyLCAxMSwgMykKK2NvbnN0 IGNoYXIqIGxhbmRtYXJrU3RyaW5nQmFubmVyID0gIkFYTGFuZG1hcmtCYW5uZXIiOworY29uc3Qg Y2hhciogbGFuZG1hcmtTdHJpbmdDb21wbGVtZW50YXJ5ID0gIkFYTGFuZG1hcmtDb21wbGVtZW50 YXJ5IjsKK2NvbnN0IGNoYXIqIGxhbmRtYXJrU3RyaW5nQ29udGVudGluZm8gPSAiQVhMYW5kbWFy a0NvbnRlbnRJbmZvIjsKK2NvbnN0IGNoYXIqIGxhbmRtYXJrU3RyaW5nTWFpbiA9ICJBWExhbmRt YXJrTWFpbiI7Citjb25zdCBjaGFyKiBsYW5kbWFya1N0cmluZ05hdmlnYXRpb24gPSAiQVhMYW5k bWFya05hdmlnYXRpb24iOworY29uc3QgY2hhciogbGFuZG1hcmtTdHJpbmdTZWFyY2ggPSAiQVhM YW5kbWFya1NlYXJjaCI7CisjZW5kaWYKKwogU3RyaW5nIGpzU3RyaW5nVG9XVEZTdHJpbmcoSlNT dHJpbmdSZWYgYXR0cmlidXRlKQogewogICAgIHNpemVfdCBidWZmZXJTaXplID0gSlNTdHJpbmdH ZXRNYXhpbXVtVVRGOENTdHJpbmdTaXplKGF0dHJpYnV0ZSk7CkBAIC0xNzgsOCArMTg3LDI4IEBA IFN0cmluZyBnZXRBdGtBdHRyaWJ1dGVTZXRBc1N0cmluZyhBdGtPYmplY3QqIGFjY2Vzc2libGUs IEF0a0F0dHJpYnV0ZVR5cGUgdHlwZSkKICAgICByZXR1cm4gYnVpbGRlci50b1N0cmluZygpOwog fQogCi1pbmxpbmUgY29uc3QgY2hhciogcm9sZVRvU3RyaW5nKEF0a1JvbGUgcm9sZSkKLXsKK2Nv bnN0IGNoYXIqIHJvbGVUb1N0cmluZyhBdGtPYmplY3QqIG9iamVjdCkKK3sKKyAgICBBdGtSb2xl IHJvbGUgPSBhdGtfb2JqZWN0X2dldF9yb2xlKG9iamVjdCk7CisKKyNpZiBBVEtfQ0hFQ0tfVkVS U0lPTigyLCAxMSwgMykKKyAgICBpZiAocm9sZSA9PSBBVEtfUk9MRV9MQU5ETUFSSykgeworICAg ICAgICBTdHJpbmcgeG1sUm9sZXNWYWx1ZSA9IGdldEF0dHJpYnV0ZVNldFZhbHVlRm9ySWQob2Jq ZWN0LCBPYmplY3RBdHRyaWJ1dGVUeXBlLCAieG1sLXJvbGVzIik7CisgICAgICAgIGlmIChlcXVh bElnbm9yaW5nQ2FzZSh4bWxSb2xlc1ZhbHVlLCAiYmFubmVyIikpCisgICAgICAgICAgICByZXR1 cm4gbGFuZG1hcmtTdHJpbmdCYW5uZXI7CisgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZSh4 bWxSb2xlc1ZhbHVlLCAiY29tcGxlbWVudGFyeSIpKQorICAgICAgICAgICAgcmV0dXJuIGxhbmRt YXJrU3RyaW5nQ29tcGxlbWVudGFyeTsKKyAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHht bFJvbGVzVmFsdWUsICJjb250ZW50aW5mbyIpKQorICAgICAgICAgICAgcmV0dXJuIGxhbmRtYXJr U3RyaW5nQ29udGVudGluZm87CisgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZSh4bWxSb2xl c1ZhbHVlLCAibWFpbiIpKQorICAgICAgICAgICAgcmV0dXJuIGxhbmRtYXJrU3RyaW5nTWFpbjsK KyAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHhtbFJvbGVzVmFsdWUsICJuYXZpZ2F0aW9u IikpCisgICAgICAgICAgICByZXR1cm4gbGFuZG1hcmtTdHJpbmdOYXZpZ2F0aW9uOworICAgICAg ICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoeG1sUm9sZXNWYWx1ZSwgInNlYXJjaCIpKQorICAgICAg ICAgICAgcmV0dXJuIGxhbmRtYXJrU3RyaW5nU2VhcmNoOworICAgIH0KKyNlbmRpZgorCiAgICAg c3dpdGNoIChyb2xlKSB7CiAgICAgY2FzZSBBVEtfUk9MRV9BTEVSVDoKICAgICAgICAgcmV0dXJu ICJBWEFsZXJ0IjsKQEAgLTMzNSw3ICszNjQsNyBAQCBTdHJpbmcgYXR0cmlidXRlc09mRWxlbWVu dChBY2Nlc3NpYmlsaXR5VUlFbGVtZW50KiBlbGVtZW50KQogICAgIGJ1aWxkZXIuYXBwZW5kKCJB WFBhcmVudDogIik7CiAgICAgQWNjZXNzaWJpbGl0eVVJRWxlbWVudCBwYXJlbnQgPSBlbGVtZW50 LT5wYXJlbnRFbGVtZW50KCk7CiAgICAgaWYgKEF0a09iamVjdCogYXRrUGFyZW50ID0gcGFyZW50 LnBsYXRmb3JtVUlFbGVtZW50KCkpIHsKLSAgICAgICAgYnVpbGRlci5hcHBlbmQocm9sZVRvU3Ry aW5nKGF0a19vYmplY3RfZ2V0X3JvbGUoYXRrUGFyZW50KSkpOworICAgICAgICBidWlsZGVyLmFw cGVuZChyb2xlVG9TdHJpbmcoYXRrUGFyZW50KSk7CiAgICAgICAgIGNvbnN0IGNoYXIqIHBhcmVu dE5hbWUgPSBhdGtfb2JqZWN0X2dldF9uYW1lKGF0a1BhcmVudCk7CiAgICAgICAgIGlmIChwYXJl bnROYW1lICYmIGdfdXRmOF9zdHJsZW4ocGFyZW50TmFtZSwgLTEpKQogICAgICAgICAgICAgYnVp bGRlci5hcHBlbmQoU3RyaW5nOjpmb3JtYXQoIjogJXMiLCBwYXJlbnROYW1lKSk7CkBAIC02Nzks MTEgKzcwOCwxMCBAQCBKU1N0cmluZ1JlZiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojpyb2xlKCkK ICAgICBpZiAoIUFUS19JU19PQkpFQ1QobV9lbGVtZW50KSkKICAgICAgICAgcmV0dXJuIEpTU3Ry aW5nQ3JlYXRlV2l0aENoYXJhY3RlcnMoMCwgMCk7CiAKLSAgICBBdGtSb2xlIHJvbGUgPSBhdGtf b2JqZWN0X2dldF9yb2xlKEFUS19PQkpFQ1QobV9lbGVtZW50KSk7Ci0gICAgaWYgKCFyb2xlKQor ICAgIGlmICghYXRrX29iamVjdF9nZXRfcm9sZShBVEtfT0JKRUNUKG1fZWxlbWVudCkpKQogICAg ICAgICByZXR1cm4gSlNTdHJpbmdDcmVhdGVXaXRoQ2hhcmFjdGVycygwLCAwKTsKIAotICAgIEdP d25QdHI8Y2hhcj4gcm9sZVN0cmluZ1dpdGhQcmVmaXgoZ19zdHJkdXBfcHJpbnRmKCJBWFJvbGU6 ICVzIiwgcm9sZVRvU3RyaW5nKHJvbGUpKSk7CisgICAgR093blB0cjxjaGFyPiByb2xlU3RyaW5n V2l0aFByZWZpeChnX3N0cmR1cF9wcmludGYoIkFYUm9sZTogJXMiLCByb2xlVG9TdHJpbmcoQVRL X09CSkVDVChtX2VsZW1lbnQpKSkpOwogICAgIHJldHVybiBKU1N0cmluZ0NyZWF0ZVdpdGhVVEY4 Q1N0cmluZyhyb2xlU3RyaW5nV2l0aFByZWZpeC5nZXQoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvYXRrL0FjY2Vzc2liaWxpdHlVSUVs ZW1lbnRBdGsuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9hdGsv QWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAKaW5kZXggZDFmYTkzMi4uNzI4MDE4OSAxMDA2 NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9hdGsvQWNjZXNz aWJpbGl0eVVJRWxlbWVudEF0ay5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9hdGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAKQEAgLTg1LDYgKzg1 LDE1IEBAIGNvbnN0IFN0cmluZyBhdHRyaWJ1dGVzTWFwW11bMl0gPSB7CiAgICAgeyAiQVhVbmtu b3duU29ydERpcmVjdGlvbiIsICJ1bmtub3duIiB9CiB9OwogCisjaWYgQVRLX0NIRUNLX1ZFUlNJ T04oMiwgMTEsIDMpCitjb25zdCBjaGFyKiBsYW5kbWFya1N0cmluZ0Jhbm5lciA9ICJBWExhbmRt YXJrQmFubmVyIjsKK2NvbnN0IGNoYXIqIGxhbmRtYXJrU3RyaW5nQ29tcGxlbWVudGFyeSA9ICJB WExhbmRtYXJrQ29tcGxlbWVudGFyeSI7Citjb25zdCBjaGFyKiBsYW5kbWFya1N0cmluZ0NvbnRl bnRpbmZvID0gIkFYTGFuZG1hcmtDb250ZW50SW5mbyI7Citjb25zdCBjaGFyKiBsYW5kbWFya1N0 cmluZ01haW4gPSAiQVhMYW5kbWFya01haW4iOworY29uc3QgY2hhciogbGFuZG1hcmtTdHJpbmdO YXZpZ2F0aW9uID0gIkFYTGFuZG1hcmtOYXZpZ2F0aW9uIjsKK2NvbnN0IGNoYXIqIGxhbmRtYXJr U3RyaW5nU2VhcmNoID0gIkFYTGFuZG1hcmtTZWFyY2giOworI2VuZGlmCisKIFN0cmluZyBqc1N0 cmluZ1RvV1RGU3RyaW5nKEpTU3RyaW5nUmVmIGF0dHJpYnV0ZSkKIHsKICAgICBzaXplX3QgYnVm ZmVyU2l6ZSA9IEpTU3RyaW5nR2V0TWF4aW11bVVURjhDU3RyaW5nU2l6ZShhdHRyaWJ1dGUpOwpA QCAtMjY3LDggKzI3NiwyOCBAQCBnY2hhciogcmVwbGFjZUNoYXJhY3RlcnNGb3JSZXN1bHRzKGdj aGFyKiBzdHIpCiAgICAgcmV0dXJuIGdfc3RyZHVwKHVTdHJpbmcudXRmOCgpLmRhdGEoKSk7CiB9 CiAKLWNvbnN0IGdjaGFyKiByb2xlVG9TdHJpbmcoQXRrUm9sZSByb2xlKQoteworY29uc3QgZ2No YXIqIHJvbGVUb1N0cmluZyhBdGtPYmplY3QqIG9iamVjdCkKK3sKKyAgICBBdGtSb2xlIHJvbGUg PSBhdGtfb2JqZWN0X2dldF9yb2xlKG9iamVjdCk7CisKKyNpZiBBVEtfQ0hFQ0tfVkVSU0lPTigy LCAxMSwgMykKKyAgICBpZiAocm9sZSA9PSBBVEtfUk9MRV9MQU5ETUFSSykgeworICAgICAgICBT dHJpbmcgeG1sUm9sZXNWYWx1ZSA9IGdldEF0dHJpYnV0ZVNldFZhbHVlRm9ySWQob2JqZWN0LCBP YmplY3RBdHRyaWJ1dGVUeXBlLCAieG1sLXJvbGVzIik7CisgICAgICAgIGlmIChlcXVhbElnbm9y aW5nQ2FzZSh4bWxSb2xlc1ZhbHVlLCAiYmFubmVyIikpCisgICAgICAgICAgICByZXR1cm4gbGFu ZG1hcmtTdHJpbmdCYW5uZXI7CisgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZSh4bWxSb2xl c1ZhbHVlLCAiY29tcGxlbWVudGFyeSIpKQorICAgICAgICAgICAgcmV0dXJuIGxhbmRtYXJrU3Ry aW5nQ29tcGxlbWVudGFyeTsKKyAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHhtbFJvbGVz VmFsdWUsICJjb250ZW50aW5mbyIpKQorICAgICAgICAgICAgcmV0dXJuIGxhbmRtYXJrU3RyaW5n Q29udGVudGluZm87CisgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZSh4bWxSb2xlc1ZhbHVl LCAibWFpbiIpKQorICAgICAgICAgICAgcmV0dXJuIGxhbmRtYXJrU3RyaW5nTWFpbjsKKyAgICAg ICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHhtbFJvbGVzVmFsdWUsICJuYXZpZ2F0aW9uIikpCisg ICAgICAgICAgICByZXR1cm4gbGFuZG1hcmtTdHJpbmdOYXZpZ2F0aW9uOworICAgICAgICBpZiAo ZXF1YWxJZ25vcmluZ0Nhc2UoeG1sUm9sZXNWYWx1ZSwgInNlYXJjaCIpKQorICAgICAgICAgICAg cmV0dXJuIGxhbmRtYXJrU3RyaW5nU2VhcmNoOworICAgIH0KKyNlbmRpZgorCiAgICAgc3dpdGNo IChyb2xlKSB7CiAgICAgY2FzZSBBVEtfUk9MRV9BTEVSVDoKICAgICAgICAgcmV0dXJuICJBWEFs ZXJ0IjsKQEAgLTQwMCw3ICs0MjksNyBAQCBTdHJpbmcgYXR0cmlidXRlc09mRWxlbWVudChBY2Nl c3NpYmlsaXR5VUlFbGVtZW50KiBlbGVtZW50KQogICAgIFJlZlB0cjxBY2Nlc3NpYmlsaXR5VUlF bGVtZW50PiBwYXJlbnQgPSBlbGVtZW50LT5wYXJlbnRFbGVtZW50KCk7CiAgICAgQXRrT2JqZWN0 KiBhdGtQYXJlbnQgPSBwYXJlbnQgPyBwYXJlbnQtPnBsYXRmb3JtVUlFbGVtZW50KCkuZ2V0KCkg OiBudWxscHRyOwogICAgIGlmIChhdGtQYXJlbnQpIHsKLSAgICAgICAgYnVpbGRlci5hcHBlbmQo cm9sZVRvU3RyaW5nKGF0a19vYmplY3RfZ2V0X3JvbGUoYXRrUGFyZW50KSkpOworICAgICAgICBi dWlsZGVyLmFwcGVuZChyb2xlVG9TdHJpbmcoYXRrUGFyZW50KSk7CiAgICAgICAgIGNvbnN0IGNo YXIqIHBhcmVudE5hbWUgPSBhdGtfb2JqZWN0X2dldF9uYW1lKGF0a1BhcmVudCk7CiAgICAgICAg IGlmIChwYXJlbnROYW1lICYmIGdfdXRmOF9zdHJsZW4ocGFyZW50TmFtZSwgLTEpKQogICAgICAg ICAgICAgYnVpbGRlci5hcHBlbmQoU3RyaW5nOjpmb3JtYXQoIjogJXMiLCBwYXJlbnROYW1lKSk7 CkBAIC04MDAsMTEgKzgyOSwxMCBAQCBKU1JldGFpblB0cjxKU1N0cmluZ1JlZj4gQWNjZXNzaWJp bGl0eVVJRWxlbWVudDo6cm9sZSgpCiAgICAgaWYgKCFBVEtfSVNfT0JKRUNUKG1fZWxlbWVudC5n ZXQoKSkpCiAgICAgICAgIHJldHVybiBKU1N0cmluZ0NyZWF0ZVdpdGhDaGFyYWN0ZXJzKDAsIDAp OwogCi0gICAgQXRrUm9sZSByb2xlID0gYXRrX29iamVjdF9nZXRfcm9sZShBVEtfT0JKRUNUKG1f ZWxlbWVudC5nZXQoKSkpOwotICAgIGlmICghcm9sZSkKKyAgICBpZiAoIWF0a19vYmplY3RfZ2V0 X3JvbGUoQVRLX09CSkVDVChtX2VsZW1lbnQuZ2V0KCkpKSkKICAgICAgICAgcmV0dXJuIEpTU3Ry aW5nQ3JlYXRlV2l0aENoYXJhY3RlcnMoMCwgMCk7CiAKLSAgICBHT3duUHRyPGNoYXI+IHJvbGVT dHJpbmdXaXRoUHJlZml4KGdfc3RyZHVwX3ByaW50ZigiQVhSb2xlOiAlcyIsIHJvbGVUb1N0cmlu Zyhyb2xlKSkpOworICAgIEdPd25QdHI8Y2hhcj4gcm9sZVN0cmluZ1dpdGhQcmVmaXgoZ19zdHJk dXBfcHJpbnRmKCJBWFJvbGU6ICVzIiwgcm9sZVRvU3RyaW5nKEFUS19PQkpFQ1QobV9lbGVtZW50 LmdldCgpKSkpKTsKICAgICByZXR1cm4gSlNTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcocm9s ZVN0cmluZ1dpdGhQcmVmaXguZ2V0KCkpOwogfQogCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvamhi dWlsZC5tb2R1bGVzIGIvVG9vbHMvZ3RrL2poYnVpbGQubW9kdWxlcwppbmRleCA3MTY2MWFhLi43 Y2Y2M2M3IDEwMDY0NAotLS0gYS9Ub29scy9ndGsvamhidWlsZC5tb2R1bGVzCisrKyBiL1Rvb2xz L2d0ay9qaGJ1aWxkLm1vZHVsZXMKQEAgLTIzMiw5ICsyMzIsOSBAQAogICA8YXV0b3Rvb2xzIGlk PSJhdGsiCiAgICAgICAgICAgICAgYXV0b2dlbi1zaD0iY29uZmlndXJlIgogICAgICAgICAgICAg IGF1dG9nZW5hcmdzPSItLWRpc2FibGUtaW50cm9zcGVjdGlvbiI+Ci0gICAgPGJyYW5jaCBtb2R1 bGU9InB1Yi9HTk9NRS9zb3VyY2VzL2F0ay8yLjEwL2F0ay0yLjEwLjAudGFyLnh6IiB2ZXJzaW9u PSIyLjEwLjAiCisgICAgPGJyYW5jaCBtb2R1bGU9InB1Yi9HTk9NRS9zb3VyY2VzL2F0ay8yLjEx L2F0ay0yLjExLjMudGFyLnh6IiB2ZXJzaW9uPSIyLjExLjMiCiAgICAgICAgICAgICByZXBvPSJm dHAuZ25vbWUub3JnIgotICAgICAgICAgICAgaGFzaD0ic2hhMjU2OjYzNjkxN2E1MDM2YmM4NTFk ODQ5MTE5NDY0NWQyODQ3OThlYzExODkxOWE4MjhiZTVlNzEzYjZlY2M1YjUwYjAiLz4KKyAgICAg ICAgICAgIGhhc2g9InNoYTI1NjpiM2M2MzY2ODYzOGRiYjYyN2E4MWY0MzMzYTAwYjc0NGM1MDM1 MzFkMDdiMTY4NDA1ZWY1ZjI3ZjM4MmEwYWU0Ii8+CiAgIDwvYXV0b3Rvb2xzPgogCiAgIDxhdXRv dG9vbHMgaWQ9ImF0LXNwaTItY29yZSIgCi0tIAoxLjguMy4yCgo=