119756 2013-08-13 10:25:30 -0700 [CSS Grid Layout] Handle 'span' positions during layout 2013-11-06 08:40:08 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 118051 119801 60731 103314 119540 1 svillar svillar commit-queue esprehn+autocc glenn kling kondapallykalyan rniwa svillar oldest_to_newest 916782 0 svillar 2013-08-13 10:25:30 -0700 In bug 118051 we added support for the 'span' keyword at parser level. This change effectively uses it to perform the final layout of the grid items. This has been already implemented in Blink. We should probably merge: r149133 Properly handle 'span' position during layout This change plumbs the final bits so that we now recognize 'span' positions and resolve them accordingly. 921921 1 209864 svillar 2013-08-28 04:15:44 -0700 Created attachment 209864 Patch 922037 2 209894 svillar 2013-08-28 09:15:32 -0700 Created attachment 209894 Patch 922062 3 svillar 2013-08-28 09:48:09 -0700 Committed r154753: <http://trac.webkit.org/changeset/154753> 947712 4 svillar 2013-11-06 08:40:08 -0800 *** Bug 115404 has been marked as a duplicate of this bug. *** 209864 2013-08-28 04:15:44 -0700 2013-08-28 09:15:25 -0700 Patch bug-119756-20130828131542.patch text/plain 14570 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0NzMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzdjZWEzYTQyOGY0ZTNi Mjc4ZDBhMzRkZWIzNmMyZmUxOTBlNmZlMS4uN2MyOWFmY2FmZDMyOGZlMTg5ZDBjYzUwZGI0M2Fi ZmI4NmUwMTFjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEzLTA4LTI4ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEhhbmRsZSAnc3BhbicgcG9zaXRpb25zIGR1cmluZyBsYXlvdXQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTc1NgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZyb20gQmxpbmsgcjE0OTEz MyBieSA8amNoYWZmcmFpeEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUHJvcGVybHkgaGFuZGxl IHRoZSAnc3Bhbicga2V5d29yZCBkdXJpbmcgbGF5b3V0LiBXZSBvbmx5IGhhZAorICAgICAgICBw YXJzaW5nIHN1cHBvcnQgc28gZmFyIGJ1dCB3aXRoIHRoaXMgY2hhbmdlIHdlIGFyZSBhYmxlIHRv CisgICAgICAgIHJlY29nbml6ZSB0aGVzZSBwb3NpdGlvbnMgYW5kIGFjdCBhY2NvcmRpbmdseS4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckdyaWQ6OnJlc29sdmVHcmlkUG9zaXRpb25zRnJvbVN0eWxlKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckdyaWQ6OnJlc29sdmVHcmlkUG9zaXRpb25BZ2FpbnN0T3Bwb3NpdGVQb3Np dGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuaDoKKyAgICAgICAgKiByZW5k ZXJpbmcvc3R5bGUvR3JpZFBvc2l0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpHcmlkUG9zaXRp b246OnNob3VsZEJlUmVzb2x2ZWRBZ2FpbnN0T3Bwb3NpdGVQb3NpdGlvbik6CisKKzIwMTMtMDgt MjggIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CisKICAgICAgICAg V29ya2VyR2xvYmFsU2NvcGVXZWJEYXRhYmFzZSByZXF1aXJlcyBFTkFCTEUoV09SS0VSUykKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMDM5NQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5kZXggNTY4ZWQyZDRlYjQ2ODQx OWMwYjJmM2IyZjQ2MTdlZTE3OWY1ZmY3My4uY2Y0NGRmOWRiMTQxM2RkNTM4OWY1ODVlYmFmYTFm OWE2NzYxODY3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdy aWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApAQCAt NzIwLDYgKzcyMCw5IEBAIFBhc3NPd25QdHI8UmVuZGVyR3JpZDo6R3JpZFNwYW4+IFJlbmRlckdy aWQ6OnJlc29sdmVHcmlkUG9zaXRpb25zRnJvbVN0eWxlKGNvbnN0CiAgICAgY29uc3QgR3JpZFBv c2l0aW9uJiBmaW5hbFBvc2l0aW9uID0gKGRpcmVjdGlvbiA9PSBGb3JDb2x1bW5zKSA/IGdyaWRJ dGVtLT5zdHlsZSgpLT5ncmlkSXRlbUNvbHVtbkVuZCgpIDogZ3JpZEl0ZW0tPnN0eWxlKCktPmdy aWRJdGVtUm93RW5kKCk7CiAgICAgY29uc3QgR3JpZFBvc2l0aW9uU2lkZSBmaW5hbFBvc2l0aW9u U2lkZSA9IChkaXJlY3Rpb24gPT0gRm9yQ29sdW1ucykgPyBDb2x1bW5FbmRTaWRlIDogUm93RW5k U2lkZTsKIAorICAgIC8vIFdlIHNob3VsZCBORVZFUiBzZWUgYm90aCBzcGFucyBhcyB0aGV5IHNo b3VsZCBoYXZlIGJlZW4gaGFuZGxlZCBkdXJpbmcgc3R5bGUgcmVzb2x2ZS4KKyAgICBBU1NFUlQo IWluaXRpYWxQb3NpdGlvbi5pc1NwYW4oKSB8fCAhZmluYWxQb3NpdGlvbi5pc1NwYW4oKSk7CisK ICAgICBpZiAoaW5pdGlhbFBvc2l0aW9uLmlzQXV0bygpICYmIGZpbmFsUG9zaXRpb24uaXNBdXRv KCkpIHsKICAgICAgICAgaWYgKHN0eWxlKCktPmdyaWRBdXRvRmxvdygpID09IEF1dG9GbG93Tm9u ZSkKICAgICAgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgR3JpZFNwYW4oMCwgMCkpOwpAQCAt NzI4LDE2ICs3MzEsMTYgQEAgUGFzc093blB0cjxSZW5kZXJHcmlkOjpHcmlkU3Bhbj4gUmVuZGVy R3JpZDo6cmVzb2x2ZUdyaWRQb3NpdGlvbnNGcm9tU3R5bGUoY29uc3QKICAgICAgICAgcmV0dXJu IG51bGxwdHI7CiAgICAgfQogCi0gICAgaWYgKGluaXRpYWxQb3NpdGlvbi5pc0F1dG8oKSkgewot ICAgICAgICAvLyBJbmZlciB0aGUgcG9zaXRpb24gZnJvbSB0aGUgZmluYWwgcG9zaXRpb24gKCdh dXRvIC8gMScgY2FzZSkuCisgICAgaWYgKGluaXRpYWxQb3NpdGlvbi5zaG91bGRCZVJlc29sdmVk QWdhaW5zdE9wcG9zaXRlUG9zaXRpb24oKSkgeworICAgICAgICAvLyBJbmZlciB0aGUgcG9zaXRp b24gZnJvbSB0aGUgZmluYWwgcG9zaXRpb24gKCdhdXRvIC8gMScgb3IgJ3NwYW4gMiAvIDMnIGNh c2UpLgogICAgICAgICBjb25zdCBzaXplX3QgZmluYWxSZXNvbHZlZFBvc2l0aW9uID0gcmVzb2x2 ZUdyaWRQb3NpdGlvbkZyb21TdHlsZShmaW5hbFBvc2l0aW9uLCBmaW5hbFBvc2l0aW9uU2lkZSk7 Ci0gICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgR3JpZFNwYW4oZmluYWxSZXNvbHZlZFBvc2l0 aW9uLCBmaW5hbFJlc29sdmVkUG9zaXRpb24pKTsKKyAgICAgICAgcmV0dXJuIHJlc29sdmVHcmlk UG9zaXRpb25BZ2FpbnN0T3Bwb3NpdGVQb3NpdGlvbihmaW5hbFJlc29sdmVkUG9zaXRpb24sIGlu aXRpYWxQb3NpdGlvbiwgaW5pdGlhbFBvc2l0aW9uU2lkZSk7CiAgICAgfQogCi0gICAgaWYgKGZp bmFsUG9zaXRpb24uaXNBdXRvKCkpIHsKLSAgICAgICAgLy8gSW5mZXIgb3VyIHBvc2l0aW9uIGZy b20gdGhlIGluaXRpYWwgcG9zaXRpb24gKCcxIC8gYXV0bycgY2FzZSkuCisgICAgaWYgKGZpbmFs UG9zaXRpb24uc2hvdWxkQmVSZXNvbHZlZEFnYWluc3RPcHBvc2l0ZVBvc2l0aW9uKCkpIHsKKyAg ICAgICAgLy8gSW5mZXIgb3VyIHBvc2l0aW9uIGZyb20gdGhlIGluaXRpYWwgcG9zaXRpb24gKCcx IC8gYXV0bycgb3IgJzMgLyBzcGFuIDInIGNhc2UpLgogICAgICAgICBjb25zdCBzaXplX3QgaW5p dGlhbFJlc29sdmVkUG9zaXRpb24gPSByZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxlKGluaXRp YWxQb3NpdGlvbiwgaW5pdGlhbFBvc2l0aW9uU2lkZSk7Ci0gICAgICAgIHJldHVybiBhZG9wdFB0 cihuZXcgR3JpZFNwYW4oaW5pdGlhbFJlc29sdmVkUG9zaXRpb24sIGluaXRpYWxSZXNvbHZlZFBv c2l0aW9uKSk7CisgICAgICAgIHJldHVybiByZXNvbHZlR3JpZFBvc2l0aW9uQWdhaW5zdE9wcG9z aXRlUG9zaXRpb24oaW5pdGlhbFJlc29sdmVkUG9zaXRpb24sIGZpbmFsUG9zaXRpb24sIGZpbmFs UG9zaXRpb25TaWRlKTsKICAgICB9CiAKICAgICBzaXplX3QgcmVzb2x2ZWRJbml0aWFsUG9zaXRp b24gPSByZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxlKGluaXRpYWxQb3NpdGlvbiwgaW5pdGlh bFBvc2l0aW9uU2lkZSk7CkBAIC03OTAsNiArNzkzLDI1IEBAIHNpemVfdCBSZW5kZXJHcmlkOjpy ZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxlKGNvbnN0IEdyaWRQb3NpdGlvbiYgcG9zaXRpb24s IEdyCiAgICAgcmV0dXJuIDA7CiB9CiAKK1Bhc3NPd25QdHI8UmVuZGVyR3JpZDo6R3JpZFNwYW4+ IFJlbmRlckdyaWQ6OnJlc29sdmVHcmlkUG9zaXRpb25BZ2FpbnN0T3Bwb3NpdGVQb3NpdGlvbihz aXplX3QgcmVzb2x2ZWRPcHBvc2l0ZVBvc2l0aW9uLCBjb25zdCBHcmlkUG9zaXRpb24mIHBvc2l0 aW9uLCBHcmlkUG9zaXRpb25TaWRlIHNpZGUpIGNvbnN0Cit7CisgICAgaWYgKHBvc2l0aW9uLmlz QXV0bygpKQorICAgICAgICByZXR1cm4gR3JpZFNwYW46OmNyZWF0ZShyZXNvbHZlZE9wcG9zaXRl UG9zaXRpb24sIHJlc29sdmVkT3Bwb3NpdGVQb3NpdGlvbik7CisKKyAgICBBU1NFUlQocG9zaXRp b24uaXNTcGFuKCkpOworICAgIEFTU0VSVChwb3NpdGlvbi5zcGFuUG9zaXRpb24oKSA+IDApOwor CisgICAgLy8gJ3NwYW4gMScgaXMgY29udGFpbmVkIGluc2lkZSBhIHNpbmdsZSBncmlkIHRyYWNr IHJlZ2FyZGxlc3Mgb2YgdGhlIGRpcmVjdGlvbi4KKyAgICAvLyBUaGF0J3Mgd2h5IHRoZSBDU1Mg c3BhbiB2YWx1ZSBpcyBvbmUgbW9yZSB0aGFuIHRoZSBvZmZzZXQgd2UgYXBwbHkuCisgICAgc2l6 ZV90IHBvc2l0aW9uT2Zmc2V0ID0gcG9zaXRpb24uc3BhblBvc2l0aW9uKCkgLSAxOworICAgIGlm IChzaWRlID09IENvbHVtblN0YXJ0U2lkZSB8fCBzaWRlID09IFJvd1N0YXJ0U2lkZSkgeworICAg ICAgICBzaXplX3QgaW5pdGlhbFJlc29sdmVkUG9zaXRpb24gPSBzdGQ6Om1heDxpbnQ+KDAsIHJl c29sdmVkT3Bwb3NpdGVQb3NpdGlvbiAtIHBvc2l0aW9uT2Zmc2V0KTsKKyAgICAgICAgcmV0dXJu IEdyaWRTcGFuOjpjcmVhdGUoaW5pdGlhbFJlc29sdmVkUG9zaXRpb24sIHJlc29sdmVkT3Bwb3Np dGVQb3NpdGlvbik7CisgICAgfQorCisgICAgcmV0dXJuIEdyaWRTcGFuOjpjcmVhdGUocmVzb2x2 ZWRPcHBvc2l0ZVBvc2l0aW9uLCByZXNvbHZlZE9wcG9zaXRlUG9zaXRpb24gKyBwb3NpdGlvbk9m ZnNldCk7Cit9CisKIExheW91dFVuaXQgUmVuZGVyR3JpZDo6Z3JpZEFyZWFCcmVhZHRoRm9yQ2hp bGQoY29uc3QgUmVuZGVyQm94KiBjaGlsZCwgVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9u LCBjb25zdCBWZWN0b3I8R3JpZFRyYWNrPiYgdHJhY2tzKSBjb25zdAogewogICAgIGNvbnN0IEdy aWRDb29yZGluYXRlJiBjb29yZGluYXRlID0gY2FjaGVkR3JpZENvb3JkaW5hdGUoY2hpbGQpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKaW5kZXggODNmMzE3YTBiOThhNDRhZWU4 N2FiMDc5YmViZWQ3OTBkYjkyZTA1Mi4uOGJhZDVmMzVmYTYwMmUyZWU5YmNkZjk5NTJhNjM2ZWIw Y2Y4OGUxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCkBAIC01OSw2ICs1 OSwxMSBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgY29tcHV0ZVByZWZlcnJlZFRyYWNrV2lk dGgoY29uc3QgTGVuZ3RoJiwgc2l6ZV90KSBjb25zdDsKIAogICAgIHN0cnVjdCBHcmlkU3BhbiB7 CisgICAgICAgIHN0YXRpYyBQYXNzT3duUHRyPEdyaWRTcGFuPiBjcmVhdGUoc2l6ZV90IGluaXRp YWxQb3NpdGlvbiwgc2l6ZV90IGZpbmFsUG9zaXRpb24pCisgICAgICAgIHsKKyAgICAgICAgICAg IHJldHVybiBhZG9wdFB0cihuZXcgR3JpZFNwYW4oaW5pdGlhbFBvc2l0aW9uLCBmaW5hbFBvc2l0 aW9uKSk7CisgICAgICAgIH0KKwogICAgICAgICBHcmlkU3BhbihzaXplX3QgaW5pdGlhbFBvc2l0 aW9uLCBzaXplX3QgZmluYWxQb3NpdGlvbikKICAgICAgICAgICAgIDogaW5pdGlhbFBvc2l0aW9u SW5kZXgoaW5pdGlhbFBvc2l0aW9uKQogICAgICAgICAgICAgLCBmaW5hbFBvc2l0aW9uSW5kZXgo ZmluYWxQb3NpdGlvbikKQEAgLTEzMCw2ICsxMzUsNyBAQCBwcml2YXRlOgogICAgIEdyaWRTcGFu IHJlc29sdmVHcmlkUG9zaXRpb25zRnJvbUF1dG9QbGFjZW1lbnRQb3NpdGlvbihjb25zdCBSZW5k ZXJCb3gqLCBUcmFja1NpemluZ0RpcmVjdGlvbiwgc2l6ZV90KSBjb25zdDsKICAgICBQYXNzT3du UHRyPEdyaWRTcGFuPiByZXNvbHZlR3JpZFBvc2l0aW9uc0Zyb21TdHlsZShjb25zdCBSZW5kZXJC b3gqLCBUcmFja1NpemluZ0RpcmVjdGlvbikgY29uc3Q7CiAgICAgc2l6ZV90IHJlc29sdmVHcmlk UG9zaXRpb25Gcm9tU3R5bGUoY29uc3QgR3JpZFBvc2l0aW9uJiwgR3JpZFBvc2l0aW9uU2lkZSkg Y29uc3Q7CisgICAgUGFzc093blB0cjxHcmlkU3Bhbj4gcmVzb2x2ZUdyaWRQb3NpdGlvbkFnYWlu c3RPcHBvc2l0ZVBvc2l0aW9uKHNpemVfdCByZXNvbHZlZE9wcG9zaXRlUG9zaXRpb24sIGNvbnN0 IEdyaWRQb3NpdGlvbiYsIEdyaWRQb3NpdGlvblNpZGUpIGNvbnN0OwogCiAgICAgTGF5b3V0VW5p dCBncmlkQXJlYUJyZWFkdGhGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gqIGNoaWxkLCBUcmFja1Np emluZ0RpcmVjdGlvbiwgY29uc3QgVmVjdG9yPEdyaWRUcmFjaz4mKSBjb25zdDsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRQb3NpdGlvbi5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRQb3NpdGlvbi5oCmluZGV4IDM3NmEwOTZj YmU2MmUzN2ZhY2U0YjkxYzc5MjRjZTJlYzVlNTc3N2EuLmEwOTljNGZhYjBkNTg3ZGIxYmMzOTU1 MjMxMDA3ZGRhYTUwZGJkZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9HcmlkUG9zaXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv R3JpZFBvc2l0aW9uLmgKQEAgLTg2LDYgKzg2LDEwIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJu IG1fdHlwZSA9PSBvdGhlci5tX3R5cGUgJiYgbV9pbnRlZ2VyUG9zaXRpb24gPT0gb3RoZXIubV9p bnRlZ2VyUG9zaXRpb247CiAgICAgfQogCisgICAgYm9vbCBzaG91bGRCZVJlc29sdmVkQWdhaW5z dE9wcG9zaXRlUG9zaXRpb24oKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIGlzQXV0bygp IHx8IGlzU3BhbigpOworICAgIH0KIHByaXZhdGU6CiAgICAgR3JpZFBvc2l0aW9uVHlwZSBtX3R5 cGU7CiAgICAgaW50IG1faW50ZWdlclBvc2l0aW9uOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGViYWY4YzhiMmEwOWU3OWFh MDgwOThhODRjYTA1YTZhMWFiY2Y5YTAuLmVhZDczOWU3MjhlODgxYjI2NTYxZDk5ZDRmNjEzNTAy NDBiYWEwNDYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMiBAQAogMjAxMy0wOC0yOCAgU2VyZ2lvIFZpbGxh ciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAorICAgICAgICBbQ1NTIEdyaWQgTGF5b3V0 XSBIYW5kbGUgJ3NwYW4nIHBvc2l0aW9ucyBkdXJpbmcgbGF5b3V0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk3NTYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGcm9tIEJsaW5rIHIxNDkxMzMgYnkgPGpj aGFmZnJhaXhAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFkZGVkIHNvbWUgbmV3IHRlc3QgY2Fz ZXMgdG8gdmVyaWZ5IHRoYXQgd2UgcHJvcGVybHkgcmVzb2x2ZQorICAgICAgICAnc3BhbicgcG9z aXRpb25zLgorCisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLW5lZ2F0 aXZlLXBvc2l0aW9uLXJlc29sdXRpb24tZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvY3Nz LWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1uZWdhdGl2ZS1wb3NpdGlvbi1yZXNvbHV0aW9uLmh0bWw6 CisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLXNwYW5uaW5nLXJlc29s dXRpb24tZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQt aXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLmh0bWw6CisKKzIwMTMtMDgtMjggIFNlcmdpbyBWaWxs YXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CisKICAgICAgICAgW0NTUyBHcmlkIExheW91 dF0gRml4IGdyaWQgcG9zaXRpb24gcmVzb2x1dGlvbgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5ODAxCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1uZWdhdGl2ZS1wb3NpdGlvbi1yZXNvbHV0 aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQt aXRlbS1uZWdhdGl2ZS1wb3NpdGlvbi1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dAppbmRleCA4ZDcz Njk0ODMyMGI0M2VkYzRjZDJiYzYyYTk3N2Y2YmQyYmZkNzVkLi5mMGM5YjdjYmFhZDVhNjNmODhl MGZkNjQ5NjgyMDcyYzMxM2M0MDg4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1n cmlkLWxheW91dC9ncmlkLWl0ZW0tbmVnYXRpdmUtcG9zaXRpb24tcmVzb2x1dGlvbi1leHBlY3Rl ZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLW5l Z2F0aXZlLXBvc2l0aW9uLXJlc29sdXRpb24tZXhwZWN0ZWQudHh0CkBAIC00LDMgKzQsNyBAQCBQ QVNTCiBQQVNTCiBQQVNTCiBQQVNTCitQQVNTCitQQVNTCitQQVNTCitQQVNTCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0tbmVnYXRpdmUtcG9z aXRpb24tcmVzb2x1dGlvbi5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQv Z3JpZC1pdGVtLW5lZ2F0aXZlLXBvc2l0aW9uLXJlc29sdXRpb24uaHRtbAppbmRleCBhMmE1MDJk OGUyMzQyYjQxZjFiNzY4MTQ2MWNhMzJmNjdjNzZmYjFmLi4yODc2ZTgyNDg5OTFkNzU4MmY3Mjgz MzIyYzgzYTliMGE0MmM0NTFlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlk LWxheW91dC9ncmlkLWl0ZW0tbmVnYXRpdmUtcG9zaXRpb24tcmVzb2x1dGlvbi5odG1sCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1uZWdhdGl2ZS1wb3Np dGlvbi1yZXNvbHV0aW9uLmh0bWwKQEAgLTI3LDYgKzI3LDI2IEBAIGlmICh3aW5kb3cudGVzdFJ1 bm5lcikKICAgICAtd2Via2l0LWdyaWQtcm93OiAtMSAvIGF1dG87CiB9CiAKKy5lbmRTcGFuR3Jv d0dyaWRJbkNvbHVtbkRpcmVjdGlvbiB7CisgICAgLXdlYmtpdC1ncmlkLWNvbHVtbjogLTIgLyBz cGFuIDM7CisgICAgLXdlYmtpdC1ncmlkLXJvdzogMTsKK30KKworLmVuZFNwYW5Hcm93R3JpZElu Um93RGlyZWN0aW9uIHsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uOiAxOworICAgIC13ZWJraXQt Z3JpZC1yb3c6IC0yIC8gc3BhbiAzOworfQorCisubmVnYXRpdmVFbmRQb3NpdGlvblN0YXJ0U3Bh bkluQ29sdW1uRGlyZWN0aW9uIHsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uOiBzcGFuIC8gLTE7 CisgICAgLXdlYmtpdC1ncmlkLXJvdzogMTsKK30KKworLm5lZ2F0aXZlRW5kUG9zaXRpb25TdGFy dFNwYW5JblJvd0RpcmVjdGlvbiB7CisgICAgLXdlYmtpdC1ncmlkLWNvbHVtbjogMTsKKyAgICAt d2Via2l0LWdyaWQtcm93OiBzcGFuIDUgLyAtMTsKK30KKwogLm5lZ2F0aXZlRW5kUG9zaXRpb25T dGFydE5lZ2F0aXZlSW5Db2x1bW5EaXJlY3Rpb24gewogICAgIC13ZWJraXQtZ3JpZC1jb2x1bW46 IC0zIC8gLTE7CiAgICAgLXdlYmtpdC1ncmlkLXJvdzogMTsKQEAgLTU1LDYgKzc1LDMwIEBAIGlm ICh3aW5kb3cudGVzdFJ1bm5lcikKIDwvZGl2PgogCiA8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVs YXRpdmUiPgorPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNTUwIiBkYXRh LWV4cGVjdGVkLWhlaWdodD0iMTUwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEg ZW5kU3Bhbkdyb3dHcmlkSW5Db2x1bW5EaXJlY3Rpb24iIGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRh LW9mZnNldC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1MDAiIGRhdGEtZXhwZWN0ZWQtaGVp Z2h0PSI1MCI+PC9kaXY+Cis8L2Rpdj4KKzwvZGl2PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjog cmVsYXRpdmUiPgorPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTUwIiBk YXRhLWV4cGVjdGVkLWhlaWdodD0iNTUwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFy ZWEgZW5kU3Bhbkdyb3dHcmlkSW5Sb3dEaXJlY3Rpb24iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEt b2Zmc2V0LXk9IjUwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1MCIgZGF0YS1leHBlY3RlZC1oZWln aHQ9IjUwMCI+PC9kaXY+Cis8L2Rpdj4KKzwvZGl2PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjog cmVsYXRpdmUiPgorPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTUwIiBk YXRhLWV4cGVjdGVkLWhlaWdodD0iMTUwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFy ZWEgbmVnYXRpdmVFbmRQb3NpdGlvblN0YXJ0U3BhbkluQ29sdW1uRGlyZWN0aW9uIiBkYXRhLW9m ZnNldC14PSI1MCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTAwIiBk YXRhLWV4cGVjdGVkLWhlaWdodD0iNTAiPjwvZGl2PgorPC9kaXY+Cis8L2Rpdj4KKworPGRpdiBz dHlsZT0icG9zaXRpb246IHJlbGF0aXZlIj4KKzxkaXYgY2xhc3M9ImdyaWQiIGRhdGEtZXhwZWN0 ZWQtd2lkdGg9IjE1MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjE1MCI+CisgICAgPGRpdiBjbGFz cz0ic2l6ZWRUb0dyaWRBcmVhIG5lZ2F0aXZlRW5kUG9zaXRpb25TdGFydFNwYW5JblJvd0RpcmVj dGlvbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3RlZC13 aWR0aD0iNTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxNTAiPjwvZGl2PgorPC9kaXY+Cis8L2Rp dj4KKworPGRpdiBzdHlsZT0icG9zaXRpb246IHJlbGF0aXZlIj4KIDxkaXYgY2xhc3M9ImdyaWQi IGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjE1MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjE1MCI+CiAg ICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIG5lZ2F0aXZlRW5kUG9zaXRpb25TdGFydE5l Z2F0aXZlSW5Db2x1bW5EaXJlY3Rpb24iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9 IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjE1MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUwIj48 L2Rpdj4KIDwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlv dXQvZ3JpZC1pdGVtLXNwYW5uaW5nLXJlc29sdXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLXNwYW5uaW5nLXJlc29sdXRpb24tZXhw ZWN0ZWQudHh0CmluZGV4IGVmZWFjM2NiNDc2MDU4NzFhMGE2YjY0OWM0YzhjZjZmMjdmYmUxNGYu LmZhMTgwZjkwNzQyMWZlY2E3ZGMwZGRiYjRmNTBhYzExYzViODYwMDEgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0 aW9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9n cmlkLWl0ZW0tc3Bhbm5pbmctcmVzb2x1dGlvbi1leHBlY3RlZC50eHQKQEAgLTEyLDMgKzEyLDgg QEAgUEFTUwogUEFTUwogUEFTUwogUEFTUworUEFTUworUEFTUworUEFTUworUEFTUworUEFTUwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLXNw YW5uaW5nLXJlc29sdXRpb24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0 L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLmh0bWwKaW5kZXggOGNjZGVmZDRjZTZhNjRm NWYxN2IwNGI0NjhjMDlhOTkzYzVmZjVhNi4uM2MxOGI1ZDFmZGY0MGRmOWQyNDhjNWE0MzBjNGM0 MDg2YjgxMmIyZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQv Z3JpZC1pdGVtLXNwYW5uaW5nLXJlc29sdXRpb24uaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0tc3Bhbm5pbmctcmVzb2x1dGlvbi5odG1sCkBAIC00 OSw2ICs0OSwzMSBAQCBpZiAod2luZG93LnRlc3RSdW5uZXIpCiAgICAgLXdlYmtpdC1ncmlkLWNv bHVtbjogMyAvIDQ7CiAgICAgLXdlYmtpdC1ncmlkLXJvdzogMyAvIDQ7CiB9CisKKy5maXJzdFJv d1NwYW5uaW5nM1NlY29uZENvbHVtbiB7CisgICAgLXdlYmtpdC1ncmlkLWNvbHVtbjogMjsKKyAg ICAtd2Via2l0LWdyaWQtcm93OiAxIC8gc3BhbiAzOworfQorCisudGhpcmRSb3dTZWNvbmRDb2x1 bW5TcGFubmluZzIgeworICAgIC13ZWJraXQtZ3JpZC1jb2x1bW46IDIgLyBzcGFuIDI7CisgICAg LXdlYmtpdC1ncmlkLXJvdzogMzsKK30KKworLnNwYW5uaW5nM1JvdzVTZWNvbmRDb2x1bW4gewor ICAgIC13ZWJraXQtZ3JpZC1jb2x1bW46IDI7CisgICAgLXdlYmtpdC1ncmlkLXJvdzogc3BhbiAz IC8gNTsKK30KKworLnRoaXJkUm93U3Bhbm5pbmcyQ29sdW1uMyB7CisgICAgLXdlYmtpdC1ncmlk LWNvbHVtbjogc3BhbiAyIC8gMzsKKyAgICAtd2Via2l0LWdyaWQtcm93OiAzOworfQorCisudW5k ZXJmbG93U3Bhbm5pbmcgeworICAgIC13ZWJraXQtZ3JpZC1jb2x1bW46IHNwYW4gMyAvIDM7Cisg ICAgLXdlYmtpdC1ncmlkLXJvdzogc3BhbiA4IC8gNDsKK30KIDwvc3R5bGU+CiA8c2NyaXB0IHNy Yz0iLi4vLi4vcmVzb3VyY2VzL2NoZWNrLWxheW91dC5qcyI+PC9zY3JpcHQ+CiA8Ym9keSBvbmxv YWQ9ImNoZWNrTGF5b3V0KCcuZ3JpZCcpOyI+CkBAIC0xMjYsNSArMTUxLDMzIEBAIGlmICh3aW5k b3cudGVzdFJ1bm5lcikKICAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgc2Vjb25kUm93 U2Vjb25kQ29sdW1uTm9TcGFuIiBkYXRhLW9mZnNldC14PSI1MCIgZGF0YS1vZmZzZXQteT0iMjUi IGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjUwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjUiPjwvZGl2 PgogICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSB0aGlyZFJvd1RoaXJkQ29sdW1uTm9T cGFuIiBkYXRhLW9mZnNldC14PSIxMDAiIGRhdGEtb2Zmc2V0LXk9IjUwIiBkYXRhLWV4cGVjdGVk LXdpZHRoPSI1MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjI1Ij48L2Rpdj4KIDwvZGl2PgorCis8 ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUiPgorPGRpdiBjbGFzcz0iZ3JpZCIgaWQ9ImJp Z0dyaWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjEw MCI+CisgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGZpcnN0Um93U3Bhbm5pbmczU2Vj b25kQ29sdW1uIiBkYXRhLW9mZnNldC14PSI1MCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBl Y3RlZC13aWR0aD0iNTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI3NSI+PC9kaXY+Cis8L2Rpdj4K KzwvZGl2PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUiPgorPGRpdiBjbGFzcz0i Z3JpZCIgaWQ9ImJpZ0dyaWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwMCIgZGF0YS1leHBlY3Rl ZC1oZWlnaHQ9IjEwMCI+CisgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIHRoaXJkUm93 U2Vjb25kQ29sdW1uU3Bhbm5pbmcyIiBkYXRhLW9mZnNldC14PSI1MCIgZGF0YS1vZmZzZXQteT0i NTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjI1Ij48 L2Rpdj4KKzwvZGl2PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUiPgorPGRpdiBj bGFzcz0iZ3JpZCIgaWQ9ImJpZ0dyaWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIwMCIgZGF0YS1l eHBlY3RlZC1oZWlnaHQ9IjEwMCI+CisgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIHNw YW5uaW5nM1JvdzVTZWNvbmRDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRhLW9mZnNldC15 PSIyNSIgZGF0YS1leHBlY3RlZC13aWR0aD0iNTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI3NSI+ PC9kaXY+Cis8L2Rpdj4KKzwvZGl2PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUi PgorPGRpdiBjbGFzcz0iZ3JpZCIgaWQ9ImJpZ0dyaWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIw MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjEwMCI+CisgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dy aWRBcmVhIHRoaXJkUm93U3Bhbm5pbmcyQ29sdW1uMyIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1v ZmZzZXQteT0iNTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMCIgZGF0YS1leHBlY3RlZC1oZWln aHQ9IjI1Ij48L2Rpdj4KKzwvZGl2PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUi PgorPGRpdiBjbGFzcz0iZ3JpZCIgaWQ9ImJpZ0dyaWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIw MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjEwMCI+CisgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dy aWRBcmVhIHVuZGVyZmxvd1NwYW5uaW5nIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15 PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI3NSI+ PC9kaXY+Cis8L2Rpdj4KKwogPC9ib2R5PgogPC9odG1sPgo= 209894 2013-08-28 09:15:32 -0700 2013-08-28 09:20:05 -0700 Patch bug-119756-20130828181529.patch text/plain 14455 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0NzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzliMjY2Yzc2NTg4OGUz YjhjNDBlMjhiNWI1OGNjYzY3NmNjNGUxOS4uZDVjMjU0Nzk3Y2UwOGVjNThmNzUzNjU4OTdmNDU4 Y2UyOGMzNWM5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA4LTI4ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEhhbmRsZSAnc3BhbicgcG9zaXRpb25zIGR1cmluZyBsYXlvdXQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTc1NgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZyb20gQmxpbmsgcjE0OTEz MyBieSA8amNoYWZmcmFpeEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUHJvcGVybHkgaGFuZGxl IHRoZSAnc3Bhbicga2V5d29yZCBkdXJpbmcgbGF5b3V0LiBXZSBvbmx5IGhhZAorICAgICAgICBw YXJzaW5nIHN1cHBvcnQgc28gZmFyIGJ1dCB3aXRoIHRoaXMgY2hhbmdlIHdlIGFyZSBhYmxlIHRv CisgICAgICAgIHJlY29nbml6ZSB0aGVzZSBwb3NpdGlvbnMgYW5kIGFjdCBhY2NvcmRpbmdseS4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckdyaWQ6OnJlc29sdmVHcmlkUG9zaXRpb25zRnJvbVN0eWxlKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckdyaWQ6OnJlc29sdmVHcmlkUG9zaXRpb25BZ2FpbnN0T3Bwb3NpdGVQb3Np dGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuaDoKKyAgICAgICAgKiByZW5k ZXJpbmcvc3R5bGUvR3JpZFBvc2l0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpHcmlkUG9zaXRp b246OnNob3VsZEJlUmVzb2x2ZWRBZ2FpbnN0T3Bwb3NpdGVQb3NpdGlvbik6CisKIDIwMTMtMDgt MjggIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFNoYXJlIGF0 dGFjaCBsb29wcyBiZXR3ZWVuIEVsZW1lbnRzIGFuZCBTaGFkb3dSb290cwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IDU2OGVkMmQ0ZWI0Njg0MTljMGIyZjNiMmY0 NjE3ZWUxNzlmNWZmNzMuLmNmNDRkZjlkYjE0MTNkZDUzODlmNTg1ZWJhZmExZjlhNjc2MTg2N2Yg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTcyMCw2ICs3MjAs OSBAQCBQYXNzT3duUHRyPFJlbmRlckdyaWQ6OkdyaWRTcGFuPiBSZW5kZXJHcmlkOjpyZXNvbHZl R3JpZFBvc2l0aW9uc0Zyb21TdHlsZShjb25zdAogICAgIGNvbnN0IEdyaWRQb3NpdGlvbiYgZmlu YWxQb3NpdGlvbiA9IChkaXJlY3Rpb24gPT0gRm9yQ29sdW1ucykgPyBncmlkSXRlbS0+c3R5bGUo KS0+Z3JpZEl0ZW1Db2x1bW5FbmQoKSA6IGdyaWRJdGVtLT5zdHlsZSgpLT5ncmlkSXRlbVJvd0Vu ZCgpOwogICAgIGNvbnN0IEdyaWRQb3NpdGlvblNpZGUgZmluYWxQb3NpdGlvblNpZGUgPSAoZGly ZWN0aW9uID09IEZvckNvbHVtbnMpID8gQ29sdW1uRW5kU2lkZSA6IFJvd0VuZFNpZGU7CiAKKyAg ICAvLyBXZSBzaG91bGQgTkVWRVIgc2VlIGJvdGggc3BhbnMgYXMgdGhleSBzaG91bGQgaGF2ZSBi ZWVuIGhhbmRsZWQgZHVyaW5nIHN0eWxlIHJlc29sdmUuCisgICAgQVNTRVJUKCFpbml0aWFsUG9z aXRpb24uaXNTcGFuKCkgfHwgIWZpbmFsUG9zaXRpb24uaXNTcGFuKCkpOworCiAgICAgaWYgKGlu aXRpYWxQb3NpdGlvbi5pc0F1dG8oKSAmJiBmaW5hbFBvc2l0aW9uLmlzQXV0bygpKSB7CiAgICAg ICAgIGlmIChzdHlsZSgpLT5ncmlkQXV0b0Zsb3coKSA9PSBBdXRvRmxvd05vbmUpCiAgICAgICAg ICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEdyaWRTcGFuKDAsIDApKTsKQEAgLTcyOCwxNiArNzMx LDE2IEBAIFBhc3NPd25QdHI8UmVuZGVyR3JpZDo6R3JpZFNwYW4+IFJlbmRlckdyaWQ6OnJlc29s dmVHcmlkUG9zaXRpb25zRnJvbVN0eWxlKGNvbnN0CiAgICAgICAgIHJldHVybiBudWxscHRyOwog ICAgIH0KIAotICAgIGlmIChpbml0aWFsUG9zaXRpb24uaXNBdXRvKCkpIHsKLSAgICAgICAgLy8g SW5mZXIgdGhlIHBvc2l0aW9uIGZyb20gdGhlIGZpbmFsIHBvc2l0aW9uICgnYXV0byAvIDEnIGNh c2UpLgorICAgIGlmIChpbml0aWFsUG9zaXRpb24uc2hvdWxkQmVSZXNvbHZlZEFnYWluc3RPcHBv c2l0ZVBvc2l0aW9uKCkpIHsKKyAgICAgICAgLy8gSW5mZXIgdGhlIHBvc2l0aW9uIGZyb20gdGhl IGZpbmFsIHBvc2l0aW9uICgnYXV0byAvIDEnIG9yICdzcGFuIDIgLyAzJyBjYXNlKS4KICAgICAg ICAgY29uc3Qgc2l6ZV90IGZpbmFsUmVzb2x2ZWRQb3NpdGlvbiA9IHJlc29sdmVHcmlkUG9zaXRp b25Gcm9tU3R5bGUoZmluYWxQb3NpdGlvbiwgZmluYWxQb3NpdGlvblNpZGUpOwotICAgICAgICBy ZXR1cm4gYWRvcHRQdHIobmV3IEdyaWRTcGFuKGZpbmFsUmVzb2x2ZWRQb3NpdGlvbiwgZmluYWxS ZXNvbHZlZFBvc2l0aW9uKSk7CisgICAgICAgIHJldHVybiByZXNvbHZlR3JpZFBvc2l0aW9uQWdh aW5zdE9wcG9zaXRlUG9zaXRpb24oZmluYWxSZXNvbHZlZFBvc2l0aW9uLCBpbml0aWFsUG9zaXRp b24sIGluaXRpYWxQb3NpdGlvblNpZGUpOwogICAgIH0KIAotICAgIGlmIChmaW5hbFBvc2l0aW9u LmlzQXV0bygpKSB7Ci0gICAgICAgIC8vIEluZmVyIG91ciBwb3NpdGlvbiBmcm9tIHRoZSBpbml0 aWFsIHBvc2l0aW9uICgnMSAvIGF1dG8nIGNhc2UpLgorICAgIGlmIChmaW5hbFBvc2l0aW9uLnNo b3VsZEJlUmVzb2x2ZWRBZ2FpbnN0T3Bwb3NpdGVQb3NpdGlvbigpKSB7CisgICAgICAgIC8vIElu ZmVyIG91ciBwb3NpdGlvbiBmcm9tIHRoZSBpbml0aWFsIHBvc2l0aW9uICgnMSAvIGF1dG8nIG9y ICczIC8gc3BhbiAyJyBjYXNlKS4KICAgICAgICAgY29uc3Qgc2l6ZV90IGluaXRpYWxSZXNvbHZl ZFBvc2l0aW9uID0gcmVzb2x2ZUdyaWRQb3NpdGlvbkZyb21TdHlsZShpbml0aWFsUG9zaXRpb24s IGluaXRpYWxQb3NpdGlvblNpZGUpOwotICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEdyaWRT cGFuKGluaXRpYWxSZXNvbHZlZFBvc2l0aW9uLCBpbml0aWFsUmVzb2x2ZWRQb3NpdGlvbikpOwor ICAgICAgICByZXR1cm4gcmVzb2x2ZUdyaWRQb3NpdGlvbkFnYWluc3RPcHBvc2l0ZVBvc2l0aW9u KGluaXRpYWxSZXNvbHZlZFBvc2l0aW9uLCBmaW5hbFBvc2l0aW9uLCBmaW5hbFBvc2l0aW9uU2lk ZSk7CiAgICAgfQogCiAgICAgc2l6ZV90IHJlc29sdmVkSW5pdGlhbFBvc2l0aW9uID0gcmVzb2x2 ZUdyaWRQb3NpdGlvbkZyb21TdHlsZShpbml0aWFsUG9zaXRpb24sIGluaXRpYWxQb3NpdGlvblNp ZGUpOwpAQCAtNzkwLDYgKzc5MywyNSBAQCBzaXplX3QgUmVuZGVyR3JpZDo6cmVzb2x2ZUdyaWRQ b3NpdGlvbkZyb21TdHlsZShjb25zdCBHcmlkUG9zaXRpb24mIHBvc2l0aW9uLCBHcgogICAgIHJl dHVybiAwOwogfQogCitQYXNzT3duUHRyPFJlbmRlckdyaWQ6OkdyaWRTcGFuPiBSZW5kZXJHcmlk OjpyZXNvbHZlR3JpZFBvc2l0aW9uQWdhaW5zdE9wcG9zaXRlUG9zaXRpb24oc2l6ZV90IHJlc29s dmVkT3Bwb3NpdGVQb3NpdGlvbiwgY29uc3QgR3JpZFBvc2l0aW9uJiBwb3NpdGlvbiwgR3JpZFBv c2l0aW9uU2lkZSBzaWRlKSBjb25zdAoreworICAgIGlmIChwb3NpdGlvbi5pc0F1dG8oKSkKKyAg ICAgICAgcmV0dXJuIEdyaWRTcGFuOjpjcmVhdGUocmVzb2x2ZWRPcHBvc2l0ZVBvc2l0aW9uLCBy ZXNvbHZlZE9wcG9zaXRlUG9zaXRpb24pOworCisgICAgQVNTRVJUKHBvc2l0aW9uLmlzU3Bhbigp KTsKKyAgICBBU1NFUlQocG9zaXRpb24uc3BhblBvc2l0aW9uKCkgPiAwKTsKKworICAgIC8vICdz cGFuIDEnIGlzIGNvbnRhaW5lZCBpbnNpZGUgYSBzaW5nbGUgZ3JpZCB0cmFjayByZWdhcmRsZXNz IG9mIHRoZSBkaXJlY3Rpb24uCisgICAgLy8gVGhhdCdzIHdoeSB0aGUgQ1NTIHNwYW4gdmFsdWUg aXMgb25lIG1vcmUgdGhhbiB0aGUgb2Zmc2V0IHdlIGFwcGx5LgorICAgIHNpemVfdCBwb3NpdGlv bk9mZnNldCA9IHBvc2l0aW9uLnNwYW5Qb3NpdGlvbigpIC0gMTsKKyAgICBpZiAoc2lkZSA9PSBD b2x1bW5TdGFydFNpZGUgfHwgc2lkZSA9PSBSb3dTdGFydFNpZGUpIHsKKyAgICAgICAgc2l6ZV90 IGluaXRpYWxSZXNvbHZlZFBvc2l0aW9uID0gc3RkOjptYXg8aW50PigwLCByZXNvbHZlZE9wcG9z aXRlUG9zaXRpb24gLSBwb3NpdGlvbk9mZnNldCk7CisgICAgICAgIHJldHVybiBHcmlkU3Bhbjo6 Y3JlYXRlKGluaXRpYWxSZXNvbHZlZFBvc2l0aW9uLCByZXNvbHZlZE9wcG9zaXRlUG9zaXRpb24p OworICAgIH0KKworICAgIHJldHVybiBHcmlkU3Bhbjo6Y3JlYXRlKHJlc29sdmVkT3Bwb3NpdGVQ b3NpdGlvbiwgcmVzb2x2ZWRPcHBvc2l0ZVBvc2l0aW9uICsgcG9zaXRpb25PZmZzZXQpOworfQor CiBMYXlvdXRVbml0IFJlbmRlckdyaWQ6OmdyaWRBcmVhQnJlYWR0aEZvckNoaWxkKGNvbnN0IFJl bmRlckJveCogY2hpbGQsIFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgY29uc3QgVmVj dG9yPEdyaWRUcmFjaz4mIHRyYWNrcykgY29uc3QKIHsKICAgICBjb25zdCBHcmlkQ29vcmRpbmF0 ZSYgY29vcmRpbmF0ZSA9IGNhY2hlZEdyaWRDb29yZGluYXRlKGNoaWxkKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyR3JpZC5oCmluZGV4IDgzZjMxN2EwYjk4YTQ0YWVlODdhYjA3OWJlYmVk NzkwZGI5MmUwNTIuLjhiYWQ1ZjM1ZmE2MDJlMmVlOWJjZGY5OTUyYTYzNmViMGNmODhlMTYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaApAQCAtNTksNiArNTksMTEgQEAgcHJp dmF0ZToKICAgICBMYXlvdXRVbml0IGNvbXB1dGVQcmVmZXJyZWRUcmFja1dpZHRoKGNvbnN0IExl bmd0aCYsIHNpemVfdCkgY29uc3Q7CiAKICAgICBzdHJ1Y3QgR3JpZFNwYW4geworICAgICAgICBz dGF0aWMgUGFzc093blB0cjxHcmlkU3Bhbj4gY3JlYXRlKHNpemVfdCBpbml0aWFsUG9zaXRpb24s IHNpemVfdCBmaW5hbFBvc2l0aW9uKQorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gYWRv cHRQdHIobmV3IEdyaWRTcGFuKGluaXRpYWxQb3NpdGlvbiwgZmluYWxQb3NpdGlvbikpOworICAg ICAgICB9CisKICAgICAgICAgR3JpZFNwYW4oc2l6ZV90IGluaXRpYWxQb3NpdGlvbiwgc2l6ZV90 IGZpbmFsUG9zaXRpb24pCiAgICAgICAgICAgICA6IGluaXRpYWxQb3NpdGlvbkluZGV4KGluaXRp YWxQb3NpdGlvbikKICAgICAgICAgICAgICwgZmluYWxQb3NpdGlvbkluZGV4KGZpbmFsUG9zaXRp b24pCkBAIC0xMzAsNiArMTM1LDcgQEAgcHJpdmF0ZToKICAgICBHcmlkU3BhbiByZXNvbHZlR3Jp ZFBvc2l0aW9uc0Zyb21BdXRvUGxhY2VtZW50UG9zaXRpb24oY29uc3QgUmVuZGVyQm94KiwgVHJh Y2tTaXppbmdEaXJlY3Rpb24sIHNpemVfdCkgY29uc3Q7CiAgICAgUGFzc093blB0cjxHcmlkU3Bh bj4gcmVzb2x2ZUdyaWRQb3NpdGlvbnNGcm9tU3R5bGUoY29uc3QgUmVuZGVyQm94KiwgVHJhY2tT aXppbmdEaXJlY3Rpb24pIGNvbnN0OwogICAgIHNpemVfdCByZXNvbHZlR3JpZFBvc2l0aW9uRnJv bVN0eWxlKGNvbnN0IEdyaWRQb3NpdGlvbiYsIEdyaWRQb3NpdGlvblNpZGUpIGNvbnN0OworICAg IFBhc3NPd25QdHI8R3JpZFNwYW4+IHJlc29sdmVHcmlkUG9zaXRpb25BZ2FpbnN0T3Bwb3NpdGVQ b3NpdGlvbihzaXplX3QgcmVzb2x2ZWRPcHBvc2l0ZVBvc2l0aW9uLCBjb25zdCBHcmlkUG9zaXRp b24mLCBHcmlkUG9zaXRpb25TaWRlKSBjb25zdDsKIAogICAgIExheW91dFVuaXQgZ3JpZEFyZWFC cmVhZHRoRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94KiBjaGlsZCwgVHJhY2tTaXppbmdEaXJlY3Rp b24sIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2s+JikgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkUG9zaXRpb24uaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9HcmlkUG9zaXRpb24uaAppbmRleCAzNzZhMDk2Y2JlNjJlMzdmYWNl NGI5MWM3OTI0Y2UyZWM1ZTU3NzdhLi5hMDk5YzRmYWIwZDU4N2RiMWJjMzk1NTIzMTAwN2RkYWE1 MGRiZGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvR3JpZFBv c2l0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRQb3NpdGlv bi5oCkBAIC04Niw2ICs4NiwxMCBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBtX3R5cGUgPT0g b3RoZXIubV90eXBlICYmIG1faW50ZWdlclBvc2l0aW9uID09IG90aGVyLm1faW50ZWdlclBvc2l0 aW9uOwogICAgIH0KIAorICAgIGJvb2wgc2hvdWxkQmVSZXNvbHZlZEFnYWluc3RPcHBvc2l0ZVBv c2l0aW9uKCkgY29uc3QKKyAgICB7CisgICAgICAgIHJldHVybiBpc0F1dG8oKSB8fCBpc1NwYW4o KTsKKyAgICB9CiBwcml2YXRlOgogICAgIEdyaWRQb3NpdGlvblR5cGUgbV90eXBlOwogICAgIGlu dCBtX2ludGVnZXJQb3NpdGlvbjsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5OWEwMzVmMWE2OTg1ZmI1MjA5M2ZhZmIxZDgx MDJjYzQzODI4M2I2Li5mYzBjZDg3MjA3YjIxYmNlMzNiZWFlOWMzNDM1ZmU5N2Q2NjcxM2E3IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMDgtMjggIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxz dmlsbGFyQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0NTUyBHcmlkIExheW91dF0gSGFuZGxlICdz cGFuJyBwb3NpdGlvbnMgZHVyaW5nIGxheW91dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NzU2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRnJvbSBCbGluayByMTQ5MTMzIGJ5IDxqY2hhZmZyYWl4QGNo cm9taXVtLm9yZz4KKworICAgICAgICBBZGRlZCBzb21lIG5ldyB0ZXN0IGNhc2VzIHRvIHZlcmlm eSB0aGF0IHdlIHByb3Blcmx5IHJlc29sdmUKKyAgICAgICAgJ3NwYW4nIHBvc2l0aW9ucy4KKwor ICAgICAgICAqIGZhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1uZWdhdGl2ZS1wb3NpdGlv bi1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L2Nzcy1ncmlkLWxheW91 dC9ncmlkLWl0ZW0tbmVnYXRpdmUtcG9zaXRpb24tcmVzb2x1dGlvbi5odG1sOgorICAgICAgICAq IGZhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLWV4cGVj dGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0tc3Bhbm5p bmctcmVzb2x1dGlvbi5odG1sOgorCiAyMDEzLTA4LTI4ICDDgWTDoW0gS2FsbGFpICA8a2FkYW1A aW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFtRdF0gTW92aW5nIGV4cGVjdGF0aW9ucyBmcm9t IFF0IDUuMCBXSzIgdG8gUXQgV0syIC0gUGFydCA5LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLW5lZ2F0aXZlLXBvc2l0aW9uLXJlc29sdXRp b24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1p dGVtLW5lZ2F0aXZlLXBvc2l0aW9uLXJlc29sdXRpb24tZXhwZWN0ZWQudHh0CmluZGV4IDhkNzM2 OTQ4MzIwYjQzZWRjNGNkMmJjNjJhOTc3ZjZiZDJiZmQ3NWQuLmYwYzliN2NiYWFkNWE2M2Y4OGUw ZmQ2NDk2ODIwNzJjMzEzYzQwODggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdy aWQtbGF5b3V0L2dyaWQtaXRlbS1uZWdhdGl2ZS1wb3NpdGlvbi1yZXNvbHV0aW9uLWV4cGVjdGVk LnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0tbmVn YXRpdmUtcG9zaXRpb24tcmVzb2x1dGlvbi1leHBlY3RlZC50eHQKQEAgLTQsMyArNCw3IEBAIFBB U1MKIFBBU1MKIFBBU1MKIFBBU1MKK1BBU1MKK1BBU1MKK1BBU1MKK1BBU1MKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1uZWdhdGl2ZS1wb3Np dGlvbi1yZXNvbHV0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9n cmlkLWl0ZW0tbmVnYXRpdmUtcG9zaXRpb24tcmVzb2x1dGlvbi5odG1sCmluZGV4IGEyYTUwMmQ4 ZTIzNDJiNDFmMWI3NjgxNDYxY2EzMmY2N2M3NmZiMWYuLjI4NzZlODI0ODk5MWQ3NTgyZjcyODMz MjJjODNhOWIwYTQyYzQ1MWUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQt bGF5b3V0L2dyaWQtaXRlbS1uZWdhdGl2ZS1wb3NpdGlvbi1yZXNvbHV0aW9uLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLW5lZ2F0aXZlLXBvc2l0 aW9uLXJlc29sdXRpb24uaHRtbApAQCAtMjcsNiArMjcsMjYgQEAgaWYgKHdpbmRvdy50ZXN0UnVu bmVyKQogICAgIC13ZWJraXQtZ3JpZC1yb3c6IC0xIC8gYXV0bzsKIH0KIAorLmVuZFNwYW5Hcm93 R3JpZEluQ29sdW1uRGlyZWN0aW9uIHsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uOiAtMiAvIHNw YW4gMzsKKyAgICAtd2Via2l0LWdyaWQtcm93OiAxOworfQorCisuZW5kU3Bhbkdyb3dHcmlkSW5S b3dEaXJlY3Rpb24geworICAgIC13ZWJraXQtZ3JpZC1jb2x1bW46IDE7CisgICAgLXdlYmtpdC1n cmlkLXJvdzogLTIgLyBzcGFuIDM7Cit9CisKKy5uZWdhdGl2ZUVuZFBvc2l0aW9uU3RhcnRTcGFu SW5Db2x1bW5EaXJlY3Rpb24geworICAgIC13ZWJraXQtZ3JpZC1jb2x1bW46IHNwYW4gLyAtMTsK KyAgICAtd2Via2l0LWdyaWQtcm93OiAxOworfQorCisubmVnYXRpdmVFbmRQb3NpdGlvblN0YXJ0 U3BhbkluUm93RGlyZWN0aW9uIHsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uOiAxOworICAgIC13 ZWJraXQtZ3JpZC1yb3c6IHNwYW4gNSAvIC0xOworfQorCiAubmVnYXRpdmVFbmRQb3NpdGlvblN0 YXJ0TmVnYXRpdmVJbkNvbHVtbkRpcmVjdGlvbiB7CiAgICAgLXdlYmtpdC1ncmlkLWNvbHVtbjog LTMgLyAtMTsKICAgICAtd2Via2l0LWdyaWQtcm93OiAxOwpAQCAtNTUsNiArNzUsMzAgQEAgaWYg KHdpbmRvdy50ZXN0UnVubmVyKQogPC9kaXY+CiAKIDxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxh dGl2ZSI+Cis8ZGl2IGNsYXNzPSJncmlkIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1NTAiIGRhdGEt ZXhwZWN0ZWQtaGVpZ2h0PSIxNTAiPgorICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBl bmRTcGFuR3Jvd0dyaWRJbkNvbHVtbkRpcmVjdGlvbiIgZGF0YS1vZmZzZXQteD0iNTAiIGRhdGEt b2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjUwMCIgZGF0YS1leHBlY3RlZC1oZWln aHQ9IjUwIj48L2Rpdj4KKzwvZGl2PgorPC9kaXY+CisKKzxkaXYgc3R5bGU9InBvc2l0aW9uOiBy ZWxhdGl2ZSI+Cis8ZGl2IGNsYXNzPSJncmlkIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxNTAiIGRh dGEtZXhwZWN0ZWQtaGVpZ2h0PSI1NTAiPgorICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJl YSBlbmRTcGFuR3Jvd0dyaWRJblJvd0RpcmVjdGlvbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1v ZmZzZXQteT0iNTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjUwIiBkYXRhLWV4cGVjdGVkLWhlaWdo dD0iNTAwIj48L2Rpdj4KKzwvZGl2PgorPC9kaXY+CisKKzxkaXYgc3R5bGU9InBvc2l0aW9uOiBy ZWxhdGl2ZSI+Cis8ZGl2IGNsYXNzPSJncmlkIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxNTAiIGRh dGEtZXhwZWN0ZWQtaGVpZ2h0PSIxNTAiPgorICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJl YSBuZWdhdGl2ZUVuZFBvc2l0aW9uU3RhcnRTcGFuSW5Db2x1bW5EaXJlY3Rpb24iIGRhdGEtb2Zm c2V0LXg9IjUwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMDAiIGRh dGEtZXhwZWN0ZWQtaGVpZ2h0PSI1MCI+PC9kaXY+Cis8L2Rpdj4KKzwvZGl2PgorCis8ZGl2IHN0 eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUiPgorPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3Rl ZC13aWR0aD0iMTUwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTUwIj4KKyAgICA8ZGl2IGNsYXNz PSJzaXplZFRvR3JpZEFyZWEgbmVnYXRpdmVFbmRQb3NpdGlvblN0YXJ0U3BhbkluUm93RGlyZWN0 aW9uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVjdGVkLXdp ZHRoPSI1MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjE1MCI+PC9kaXY+Cis8L2Rpdj4KKzwvZGl2 PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUiPgogPGRpdiBjbGFzcz0iZ3JpZCIg ZGF0YS1leHBlY3RlZC13aWR0aD0iMTUwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTUwIj4KICAg ICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgbmVnYXRpdmVFbmRQb3NpdGlvblN0YXJ0TmVn YXRpdmVJbkNvbHVtbkRpcmVjdGlvbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0i MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTUwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNTAiPjwv ZGl2PgogPC9kaXY+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91 dC9ncmlkLWl0ZW0tc3Bhbm5pbmctcmVzb2x1dGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0tc3Bhbm5pbmctcmVzb2x1dGlvbi1leHBl Y3RlZC50eHQKaW5kZXggZWZlYWMzY2I0NzYwNTg3MWEwYTZiNjQ5YzRjOGNmNmYyN2ZiZTE0Zi4u ZmExODBmOTA3NDIxZmVjYTdkYzBkZGJiNGY1MGFjMTFjNWI4NjAwMSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLXNwYW5uaW5nLXJlc29sdXRp b24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dy aWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dApAQCAtMTIsMyArMTIsOCBA QCBQQVNTCiBQQVNTCiBQQVNTCiBQQVNTCitQQVNTCitQQVNTCitQQVNTCitQQVNTCitQQVNTCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0tc3Bh bm5pbmctcmVzb2x1dGlvbi5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQv Z3JpZC1pdGVtLXNwYW5uaW5nLXJlc29sdXRpb24uaHRtbAppbmRleCA4Y2NkZWZkNGNlNmE2NGY1 ZjE3YjA0YjQ2OGMwOWE5OTNjNWZmNWE2Li4zYzE4YjVkMWZkZjQwZGY5ZDI0OGM1YTQzMGM0YzQw ODZiODEyYjJkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9n cmlkLWl0ZW0tc3Bhbm5pbmctcmVzb2x1dGlvbi5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv Y3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLmh0bWwKQEAgLTQ5 LDYgKzQ5LDMxIEBAIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKICAgICAtd2Via2l0LWdyaWQtY29s dW1uOiAzIC8gNDsKICAgICAtd2Via2l0LWdyaWQtcm93OiAzIC8gNDsKIH0KKworLmZpcnN0Um93 U3Bhbm5pbmczU2Vjb25kQ29sdW1uIHsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uOiAyOworICAg IC13ZWJraXQtZ3JpZC1yb3c6IDEgLyBzcGFuIDM7Cit9CisKKy50aGlyZFJvd1NlY29uZENvbHVt blNwYW5uaW5nMiB7CisgICAgLXdlYmtpdC1ncmlkLWNvbHVtbjogMiAvIHNwYW4gMjsKKyAgICAt d2Via2l0LWdyaWQtcm93OiAzOworfQorCisuc3Bhbm5pbmczUm93NVNlY29uZENvbHVtbiB7Cisg ICAgLXdlYmtpdC1ncmlkLWNvbHVtbjogMjsKKyAgICAtd2Via2l0LWdyaWQtcm93OiBzcGFuIDMg LyA1OworfQorCisudGhpcmRSb3dTcGFubmluZzJDb2x1bW4zIHsKKyAgICAtd2Via2l0LWdyaWQt Y29sdW1uOiBzcGFuIDIgLyAzOworICAgIC13ZWJraXQtZ3JpZC1yb3c6IDM7Cit9CisKKy51bmRl cmZsb3dTcGFubmluZyB7CisgICAgLXdlYmtpdC1ncmlkLWNvbHVtbjogc3BhbiAzIC8gMzsKKyAg ICAtd2Via2l0LWdyaWQtcm93OiBzcGFuIDggLyA0OworfQogPC9zdHlsZT4KIDxzY3JpcHQgc3Jj PSIuLi8uLi9yZXNvdXJjZXMvY2hlY2stbGF5b3V0LmpzIj48L3NjcmlwdD4KIDxib2R5IG9ubG9h ZD0iY2hlY2tMYXlvdXQoJy5ncmlkJyk7Ij4KQEAgLTEyNiw1ICsxNTEsMzMgQEAgaWYgKHdpbmRv dy50ZXN0UnVubmVyKQogICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBzZWNvbmRSb3dT ZWNvbmRDb2x1bW5Ob1NwYW4iIGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRhLW9mZnNldC15PSIyNSIg ZGF0YS1leHBlY3RlZC13aWR0aD0iNTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIyNSI+PC9kaXY+ CiAgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIHRoaXJkUm93VGhpcmRDb2x1bW5Ob1Nw YW4iIGRhdGEtb2Zmc2V0LXg9IjEwMCIgZGF0YS1vZmZzZXQteT0iNTAiIGRhdGEtZXhwZWN0ZWQt d2lkdGg9IjUwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjUiPjwvZGl2PgogPC9kaXY+CisKKzxk aXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2ZSI+Cis8ZGl2IGNsYXNzPSJncmlkIiBpZD0iYmln R3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTAw Ij4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgZmlyc3RSb3dTcGFubmluZzNTZWNv bmRDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVj dGVkLXdpZHRoPSI1MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9Ijc1Ij48L2Rpdj4KKzwvZGl2Pgor PC9kaXY+CisKKzxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2ZSI+Cis8ZGl2IGNsYXNzPSJn cmlkIiBpZD0iYmlnR3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAwIiBkYXRhLWV4cGVjdGVk LWhlaWdodD0iMTAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgdGhpcmRSb3dT ZWNvbmRDb2x1bW5TcGFubmluZzIiIGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRhLW9mZnNldC15PSI1 MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjUiPjwv ZGl2PgorPC9kaXY+CisKKzxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2ZSI+Cis8ZGl2IGNs YXNzPSJncmlkIiBpZD0iYmlnR3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAwIiBkYXRhLWV4 cGVjdGVkLWhlaWdodD0iMTAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgc3Bh bm5pbmczUm93NVNlY29uZENvbHVtbiIgZGF0YS1vZmZzZXQteD0iNTAiIGRhdGEtb2Zmc2V0LXk9 IjI1IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9Ijc1Ij48 L2Rpdj4KKzwvZGl2PgorPC9kaXY+CisKKzxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2ZSI+ Cis8ZGl2IGNsYXNzPSJncmlkIiBpZD0iYmlnR3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAw IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3Jp ZEFyZWEgdGhpcmRSb3dTcGFubmluZzJDb2x1bW4zIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9m ZnNldC15PSI1MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTAwIiBkYXRhLWV4cGVjdGVkLWhlaWdo dD0iMjUiPjwvZGl2PgorPC9kaXY+CisKKzxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2ZSI+ Cis8ZGl2IGNsYXNzPSJncmlkIiBpZD0iYmlnR3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAw IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3Jp ZEFyZWEgdW5kZXJmbG93U3Bhbm5pbmciIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9 IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9Ijc1Ij48 L2Rpdj4KKzwvZGl2PgorCiA8L2JvZHk+CiA8L2h0bWw+Cg==