111653 2013-03-06 17:51:31 -0800 [CSS Grid Layout] Handle 2 positions with one 'auto' properly 2013-03-08 10:27:45 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 103314 1 jchaffraix jchaffraix eric esprehn+autocc ojan.autocc ojan tony webkit.review.bot xan.lopez oldest_to_newest 849546 0 jchaffraix 2013-03-06 17:51:31 -0800 After bug 111372 and bug 110777, it is possible to set the grid positions independently. However the layout code make the assumption that we have only one position. It also wrongly assumes that 'auto' / 1 should be autoplaced. 849619 1 191893 jchaffraix 2013-03-06 19:12:20 -0800 Created attachment 191893 Proposed change 1: Added a new function to resolve both opposite positions. Naming could probably be improved (welcome any comment). 850255 2 191893 jchaffraix 2013-03-07 10:35:05 -0800 Comment on attachment 191893 Proposed change 1: Added a new function to resolve both opposite positions. Naming could probably be improved (welcome any comment). Passing the tests => good to go! 850685 3 191893 jchaffraix 2013-03-07 17:21:14 -0800 Comment on attachment 191893 Proposed change 1: Added a new function to resolve both opposite positions. Naming could probably be improved (welcome any comment). View in context: https://bugs.webkit.org/attachment.cgi?id=191893&action=review > LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html:106 > + <div class="sizedToGridArea autoSecondRowAutoFirstColumn" data-expected-x="0" data-expected-y="90" data-expected-width="160" data-expected-height="210"></div> The data-expected-{x|y} are wrong, they should be data-offset-{x|y}. Also the resolution assumes that we resolve grid-{end|after} like grid-{start|before}, which is wrong as we need to take into account the direction from which it was made. I will see if keeping this test as part of this change still makes sense without further refactorings. 850714 4 191893 tony 2013-03-07 17:59:57 -0800 Comment on attachment 191893 Proposed change 1: Added a new function to resolve both opposite positions. Naming could probably be improved (welcome any comment). View in context: https://bugs.webkit.org/attachment.cgi?id=191893&action=review > Source/WebCore/rendering/RenderGrid.cpp:340 > + // No |positions| means that the item's position will need to be resolved by the auto placement algoritm Nit: algoritm -> algorithm > Source/WebCore/rendering/RenderGrid.h:121 > + // This is the function that should be used for any position resolution as we *have* to > + // resolve both directions at the same time (e.g. auto / 1, span 2 / 4, ...). > + PassOwnPtr<GridSpan> resolveGridPositionsFromStyle(const RenderBox*, TrackSizingDirection) const; Nit: The wording of this comment is awkward. Maybe the function name should somehow suggest that this is for resolving both directions at the same time. 851264 5 191893 jchaffraix 2013-03-08 09:45:54 -0800 Comment on attachment 191893 Proposed change 1: Added a new function to resolve both opposite positions. Naming could probably be improved (welcome any comment). View in context: https://bugs.webkit.org/attachment.cgi?id=191893&action=review >> Source/WebCore/rendering/RenderGrid.h:121 >> + PassOwnPtr<GridSpan> resolveGridPositionsFromStyle(const RenderBox*, TrackSizingDirection) const; > > Nit: The wording of this comment is awkward. Maybe the function name should somehow suggest that this is for resolving both directions at the same time. Good point, I also discovered that some places (grid size estimations e.g.) won't be able to reuse the function. I will just remove the comment for now. 851274 6 192245 jchaffraix 2013-03-08 10:01:24 -0800 Created attachment 192245 Patch for landing 851306 7 192245 webkit.review.bot 2013-03-08 10:27:41 -0800 Comment on attachment 192245 Patch for landing Clearing flags on attachment: 192245 Committed r145240: <http://trac.webkit.org/changeset/145240> 851307 8 webkit.review.bot 2013-03-08 10:27:45 -0800 All reviewed patches have been landed. Closing bug. 191893 2013-03-06 19:12:20 -0800 2013-03-08 10:01:20 -0800 Proposed change 1: Added a new function to resolve both opposite positions. Naming could probably be improved (welcome any comment). bug-111653-20130306190825.patch text/plain 24351 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MDE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzFjYjI0YTJjNGU3NDFl NGQ5YzkzNGU1ZTQ2MzU4ZThlN2ZkZjQzZS4uNmE2OWIzYzc3NTg4MGY1YTIxZmRiMzU1NGZiZmQw YWFkZjYzYzVkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTAzLTA2ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEhhbmRsZSAyIHBvc2l0aW9ucyB3aXRoIG9uZSAnYXV0bycgcHJvcGVybHkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTY1MworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSByZW5kZXJp bmcgY29kZSB3YXMgbWFraW5nIHRoZSBhc3N1bXB0aW9uIHRoYXQgd2UgaGF2ZSBvbmUgcG9zaXRp b24uCisgICAgICAgIFRodXMgaXQgY291bGRuJ3QgZnVsbHkgbWF0Y2ggd2hhdCB0aGUgc3BlY2lm aWNhdGlvbiB3YW50cyBhcyB0aGUgMiBvcHBvc2l0ZQorICAgICAgICBwb3NpdGlvbnMgYXJlIHJl cXVpcmVkIHRvIHJlc29sdmUgZWl0aGVyIHBvc2l0aW9uIGluIHNldmVyYWwgY2FzZXMgKGUuZy4K KyAgICAgICAgMSAvIHNwYW4gMiwgYXV0byAvICdjJykuCisKKyAgICAgICAgVGhpcyBjaGFuZ2Ug aW50cm9kdWNlcyByZXNvbHZlR3JpZFBvc2l0aW9uc0Zyb21TdHlsZSB0byBkbyBib3RoIG9wcG9z aXRlCisgICAgICAgIHBvc2l0aW9ucyByZXNvbHV0aW9uIGluIG9uZSBwYXNzIGFuZCB0aHVzIGhh bmRsaW5nIG1vcmUgY2FzZXMuCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MtZ3JpZC1sYXlvdXQv Z3JpZC1pdGVtLXNwYW5uaW5nLXJlc29sdXRpb24uaHRtbAorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckdyaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6bWF4aW11bUlu ZGV4SW5EaXJlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6cGxhY2VJdGVt c09uR3JpZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpwbGFjZVNwZWNpZmllZE1h am9yQXhpc0l0ZW1zT25HcmlkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OnBsYWNl QXV0b01ham9yQXhpc0l0ZW1PbkdyaWQpOgorICAgICAgICBVcGRhdGVkIHRoZSBhYm92ZSBmdW5j dGlvbnMgdG8gcmVseSBvbiByZXNvbHZlR3JpZFBvc2l0aW9uc0Zyb21TdHlsZS4KKworICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6cmVzb2x2ZUdyaWRQb3NpdGlvbnNGcm9tU3R5bGUpOgor ICAgICAgICBBZGRlZCB0aGlzIG5ldyBmdW5jdGlvbiB0aGF0IGhhbmRsZSB0aGUgY29ycmVjdCBy ZXNvbHV0aW9uLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpyZXNvbHZlR3JpZFBv c2l0aW9uRnJvbVN0eWxlKToKKyAgICAgICAgVXBkYXRlZCB0aGUgQVNTRVJUIHRvIG1hdGNoIHRo ZSBuZXcgY29kZSBmbG93LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuaDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OkdyaWRTcGFuOjpHcmlkU3Bhbik6CisgICAgICAg IEludHJvZHVjZWQgdGhpcyBuZXcgc3RydWN0IHRvIGhvbGQgdGhlIDIgcG9zaXRpb25zIGFsb25n IG9uZSBheGlzLgorCiAyMDEzLTAzLTA2ICBBYmhpc2hlayBBcnlhICA8aW5mZXJub0BjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgQ3Jhc2ggaW4gU1ZHVmlld1NwZWM6OnZpZXdUYXJnZXQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAppbmRleCAyYmIyN2QyYzRjN2RlNjZlMzBl ZGNiZWQwZDE0YzlhZGI5MzY5YTZmLi5iMmQ4NGY5Nzk4ZDhkZDYwNzQ2Njg0Y2NhMTYxNGM2YWJh N2FiNWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC0zMzQs MTQgKzMzNCwxNSBAQCBzaXplX3QgUmVuZGVyR3JpZDo6bWF4aW11bUluZGV4SW5EaXJlY3Rpb24o VHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uKSBjb25zdAogICAgIHNpemVfdCBtYXhpbXVt SW5kZXggPSBzdGQ6Om1heDxzaXplX3Q+KDEsIHRyYWNrU3R5bGVzLnNpemUoKSk7CiAKICAgICBm b3IgKFJlbmRlckJveCogY2hpbGQgPSBmaXJzdENoaWxkQm94KCk7IGNoaWxkOyBjaGlsZCA9IGNo aWxkLT5uZXh0U2libGluZ0JveCgpKSB7Ci0gICAgICAgIGNvbnN0IEdyaWRQb3NpdGlvbiYgcG9z aXRpb24gPSAoZGlyZWN0aW9uID09IEZvckNvbHVtbnMpID8gY2hpbGQtPnN0eWxlKCktPmdyaWRJ dGVtU3RhcnQoKSA6IGNoaWxkLT5zdHlsZSgpLT5ncmlkSXRlbUJlZm9yZSgpOwotICAgICAgICAv LyAnYXV0bycgaXRlbXMgd2lsbCBuZWVkIHRvIGJlIHJlc29sdmVkIGluIHNlcGVyYXRlIHBoYXNl cyBhbnl3YXkuIE5vdGUgdGhhdCBiZWNhdXNlIG1heGltdW1JbmRleCBpcyBhdCBsZWFzdCAxLAot ICAgICAgICAvLyB0aGUgZ3JpZC1hdXRvLWZsb3cgPT0gbm9uZSBjYXNlIGlzIGF1dG9tYXRpY2Fs bHkgaGFuZGxlZC4KLSAgICAgICAgaWYgKHBvc2l0aW9uLmlzQXV0bygpKQorICAgICAgICAvLyBU aGlzIGZ1bmN0aW9uIGJ5cGFzc2VzIHRoZSBjYWNoZSAoY2FjaGVkR3JpZENvb3JkaW5hdGUoKSkg YXMgaXQgaXMgdXNlZCB0byBidWlsZCBpdC4KKyAgICAgICAgT3duUHRyPEdyaWRTcGFuPiBwb3Np dGlvbnMgPSByZXNvbHZlR3JpZFBvc2l0aW9uc0Zyb21TdHlsZShjaGlsZCwgZGlyZWN0aW9uKTsK KworICAgICAgICAvLyBObyB8cG9zaXRpb25zfCBtZWFucyB0aGF0IHRoZSBpdGVtJ3MgcG9zaXRp b24gd2lsbCBuZWVkIHRvIGJlIHJlc29sdmVkIGJ5IHRoZSBhdXRvIHBsYWNlbWVudCBhbGdvcml0 bQorICAgICAgICAvLyB0aHVzIHdlIGRvbid0IG5lZWQgdG8gYWNjb3VudCBmb3IgaXQgaGVyZS4K KyAgICAgICAgaWYgKCFwb3NpdGlvbnMpCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAg ICAvLyBUaGlzIGZ1bmN0aW9uIGJ5cGFzc2VzIHRoZSBjYWNoZSAoY2FjaGVkR3JpZENvb3JkaW5h dGUoKSkgYXMgaXQgaXMgdXNlZCB0byBidWlsZCBpdC4KLSAgICAgICAgbWF4aW11bUluZGV4ID0g c3RkOjptYXgobWF4aW11bUluZGV4LCByZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxlKHBvc2l0 aW9uKSArIDEpOworICAgICAgICBtYXhpbXVtSW5kZXggPSBzdGQ6Om1heChtYXhpbXVtSW5kZXgs IHBvc2l0aW9ucy0+ZmluYWxQb3NpdGlvbkluZGV4ICsgMSk7CiAgICAgfQogCiAgICAgcmV0dXJu IG1heGltdW1JbmRleDsKQEAgLTUyNiwxOSArNTI3LDE3IEBAIHZvaWQgUmVuZGVyR3JpZDo6cGxh Y2VJdGVtc09uR3JpZCgpCiAgICAgVmVjdG9yPFJlbmRlckJveCo+IHNwZWNpZmllZE1ham9yQXhp c0F1dG9HcmlkSXRlbXM7CiAgICAgR3JpZEF1dG9GbG93IGF1dG9GbG93ID0gc3R5bGUoKS0+Z3Jp ZEF1dG9GbG93KCk7CiAgICAgZm9yIChSZW5kZXJCb3gqIGNoaWxkID0gZmlyc3RDaGlsZEJveCgp OyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmdCb3goKSkgewotICAgICAgICBjb25z dCBHcmlkUG9zaXRpb24mIHN0YXJ0UG9zaXRpb24gPSBjaGlsZC0+c3R5bGUoKS0+Z3JpZEl0ZW1T dGFydCgpOwotICAgICAgICBjb25zdCBHcmlkUG9zaXRpb24mIGJlZm9yZVBvc2l0aW9uID0gY2hp bGQtPnN0eWxlKCktPmdyaWRJdGVtQmVmb3JlKCk7Ci0gICAgICAgIGlmIChhdXRvRmxvdyAhPSBB dXRvRmxvd05vbmUgJiYgKHN0YXJ0UG9zaXRpb24uaXNBdXRvKCkgfHwgYmVmb3JlUG9zaXRpb24u aXNBdXRvKCkpKSB7Ci0gICAgICAgICAgICBjb25zdCBHcmlkUG9zaXRpb24mIG1ham9yQXhpc1Bv c2l0aW9uID0gYXV0b1BsYWNlbWVudE1ham9yQXhpc1Bvc2l0aW9uRm9yQ2hpbGQoY2hpbGQpOwot ICAgICAgICAgICAgaWYgKG1ham9yQXhpc1Bvc2l0aW9uLmlzQXV0bygpKQorICAgICAgICBPd25Q dHI8R3JpZFNwYW4+IHJvd1Bvc2l0aW9ucyA9IHJlc29sdmVHcmlkUG9zaXRpb25zRnJvbVN0eWxl KGNoaWxkLCBGb3JSb3dzKTsKKyAgICAgICAgT3duUHRyPEdyaWRTcGFuPiBjb2x1bW5Qb3NpdGlv bnMgPSByZXNvbHZlR3JpZFBvc2l0aW9uc0Zyb21TdHlsZShjaGlsZCwgRm9yQ29sdW1ucyk7Cisg ICAgICAgIGlmICghcm93UG9zaXRpb25zIHx8ICFjb2x1bW5Qb3NpdGlvbnMpIHsKKyAgICAgICAg ICAgIEdyaWRTcGFuKiBtYWpvckF4aXNQb3NpdGlvbnMgPSAoYXV0b1BsYWNlbWVudE1ham9yQXhp c0RpcmVjdGlvbigpID09IEZvckNvbHVtbnMpID8gY29sdW1uUG9zaXRpb25zLmdldCgpIDogcm93 UG9zaXRpb25zLmdldCgpOworICAgICAgICAgICAgaWYgKCFtYWpvckF4aXNQb3NpdGlvbnMpCiAg ICAgICAgICAgICAgICAgYXV0b01ham9yQXhpc0F1dG9HcmlkSXRlbXMuYXBwZW5kKGNoaWxkKTsK ICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBzcGVjaWZpZWRNYWpvckF4aXNBdXRv R3JpZEl0ZW1zLmFwcGVuZChjaGlsZCk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg fQotICAgICAgICBzaXplX3QgY29sdW1uVHJhY2sgPSByZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0 eWxlKHN0YXJ0UG9zaXRpb24pOwotICAgICAgICBzaXplX3Qgcm93VHJhY2sgPSByZXNvbHZlR3Jp ZFBvc2l0aW9uRnJvbVN0eWxlKGJlZm9yZVBvc2l0aW9uKTsKLSAgICAgICAgaW5zZXJ0SXRlbUlu dG9HcmlkKGNoaWxkLCByb3dUcmFjaywgY29sdW1uVHJhY2spOworICAgICAgICBpbnNlcnRJdGVt SW50b0dyaWQoY2hpbGQsIHJvd1Bvc2l0aW9ucy0+aW5pdGlhbFBvc2l0aW9uSW5kZXgsIGNvbHVt blBvc2l0aW9ucy0+aW5pdGlhbFBvc2l0aW9uSW5kZXgpOwogICAgIH0KIAogICAgIEFTU0VSVChn cmlkUm93Q291bnQoKSA+PSBzdHlsZSgpLT5ncmlkUm93cygpLnNpemUoKSk7CkBAIC01NTgsOSAr NTU3LDggQEAgdm9pZCBSZW5kZXJHcmlkOjpwbGFjZUl0ZW1zT25HcmlkKCkKIHZvaWQgUmVuZGVy R3JpZDo6cGxhY2VTcGVjaWZpZWRNYWpvckF4aXNJdGVtc09uR3JpZChWZWN0b3I8UmVuZGVyQm94 Kj4gYXV0b0dyaWRJdGVtcykKIHsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGF1dG9Hcmlk SXRlbXMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgY29uc3QgR3JpZFBvc2l0aW9uJiBtYWpvckF4 aXNQb3NpdGlvbiA9IGF1dG9QbGFjZW1lbnRNYWpvckF4aXNQb3NpdGlvbkZvckNoaWxkKGF1dG9H cmlkSXRlbXNbaV0pOwotICAgICAgICBBU1NFUlQoIW1ham9yQXhpc1Bvc2l0aW9uLmlzQXV0bygp KTsKLSAgICAgICAgR3JpZEl0ZXJhdG9yIGl0ZXJhdG9yKG1fZ3JpZCwgYXV0b1BsYWNlbWVudE1h am9yQXhpc0RpcmVjdGlvbigpLCByZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxlKG1ham9yQXhp c1Bvc2l0aW9uKSk7CisgICAgICAgIE93blB0cjxHcmlkU3Bhbj4gbWFqb3JBeGlzUG9zaXRpb25z ID0gcmVzb2x2ZUdyaWRQb3NpdGlvbnNGcm9tU3R5bGUoYXV0b0dyaWRJdGVtc1tpXSwgYXV0b1Bs YWNlbWVudE1ham9yQXhpc0RpcmVjdGlvbigpKTsKKyAgICAgICAgR3JpZEl0ZXJhdG9yIGl0ZXJh dG9yKG1fZ3JpZCwgYXV0b1BsYWNlbWVudE1ham9yQXhpc0RpcmVjdGlvbigpLCBtYWpvckF4aXNQ b3NpdGlvbnMtPmluaXRpYWxQb3NpdGlvbkluZGV4KTsKICAgICAgICAgaWYgKE93blB0cjxHcmlk Q29vcmRpbmF0ZT4gZW1wdHlHcmlkQXJlYSA9IGl0ZXJhdG9yLm5leHRFbXB0eUdyaWRBcmVhKCkp IHsKICAgICAgICAgICAgIGluc2VydEl0ZW1JbnRvR3JpZChhdXRvR3JpZEl0ZW1zW2ldLCBlbXB0 eUdyaWRBcmVhLT5yb3dJbmRleCwgZW1wdHlHcmlkQXJlYS0+Y29sdW1uSW5kZXgpOwogICAgICAg ICAgICAgY29udGludWU7CkBAIC01NzUsMTkgKzU3MywxNyBAQCB2b2lkIFJlbmRlckdyaWQ6OnBs YWNlU3BlY2lmaWVkTWFqb3JBeGlzSXRlbXNPbkdyaWQoVmVjdG9yPFJlbmRlckJveCo+IGF1dG9H cmlkSQogCiB2b2lkIFJlbmRlckdyaWQ6OnBsYWNlQXV0b01ham9yQXhpc0l0ZW1zT25HcmlkKFZl Y3RvcjxSZW5kZXJCb3gqPiBhdXRvR3JpZEl0ZW1zKQogewotICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgYXV0b0dyaWRJdGVtcy5zaXplKCk7ICsraSkgewotICAgICAgICBBU1NFUlQoYXV0b1Bs YWNlbWVudE1ham9yQXhpc1Bvc2l0aW9uRm9yQ2hpbGQoYXV0b0dyaWRJdGVtc1tpXSkuaXNBdXRv KCkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYXV0b0dyaWRJdGVtcy5zaXplKCk7ICsr aSkKICAgICAgICAgcGxhY2VBdXRvTWFqb3JBeGlzSXRlbU9uR3JpZChhdXRvR3JpZEl0ZW1zW2ld KTsKLSAgICB9CiB9CiAKIHZvaWQgUmVuZGVyR3JpZDo6cGxhY2VBdXRvTWFqb3JBeGlzSXRlbU9u R3JpZChSZW5kZXJCb3gqIGdyaWRJdGVtKQogewotICAgIEFTU0VSVChhdXRvUGxhY2VtZW50TWFq b3JBeGlzUG9zaXRpb25Gb3JDaGlsZChncmlkSXRlbSkuaXNBdXRvKCkpOwotICAgIGNvbnN0IEdy aWRQb3NpdGlvbiYgbWlub3JBeGlzUG9zaXRpb24gPSBhdXRvUGxhY2VtZW50TWlub3JBeGlzUG9z aXRpb25Gb3JDaGlsZChncmlkSXRlbSk7CisgICAgT3duUHRyPEdyaWRTcGFuPiBtaW5vckF4aXNQ b3NpdGlvbnMgPSByZXNvbHZlR3JpZFBvc2l0aW9uc0Zyb21TdHlsZShncmlkSXRlbSwgYXV0b1Bs YWNlbWVudE1pbm9yQXhpc0RpcmVjdGlvbigpKTsKKyAgICBBU1NFUlQoIXJlc29sdmVHcmlkUG9z aXRpb25zRnJvbVN0eWxlKGdyaWRJdGVtLCBhdXRvUGxhY2VtZW50TWFqb3JBeGlzRGlyZWN0aW9u KCkpKTsKICAgICBzaXplX3QgbWlub3JBeGlzSW5kZXggPSAwOwotICAgIGlmICghbWlub3JBeGlz UG9zaXRpb24uaXNBdXRvKCkpIHsKLSAgICAgICAgbWlub3JBeGlzSW5kZXggPSByZXNvbHZlR3Jp ZFBvc2l0aW9uRnJvbVN0eWxlKG1pbm9yQXhpc1Bvc2l0aW9uKTsKKyAgICBpZiAobWlub3JBeGlz UG9zaXRpb25zKSB7CisgICAgICAgIG1pbm9yQXhpc0luZGV4ID0gbWlub3JBeGlzUG9zaXRpb25z LT5pbml0aWFsUG9zaXRpb25JbmRleDsKICAgICAgICAgR3JpZEl0ZXJhdG9yIGl0ZXJhdG9yKG1f Z3JpZCwgYXV0b1BsYWNlbWVudE1pbm9yQXhpc0RpcmVjdGlvbigpLCBtaW5vckF4aXNJbmRleCk7 CiAgICAgICAgIGlmIChPd25QdHI8R3JpZENvb3JkaW5hdGU+IGVtcHR5R3JpZEFyZWEgPSBpdGVy YXRvci5uZXh0RW1wdHlHcmlkQXJlYSgpKSB7CiAgICAgICAgICAgICBpbnNlcnRJdGVtSW50b0dy aWQoZ3JpZEl0ZW0sIGVtcHR5R3JpZEFyZWEtPnJvd0luZGV4LCBlbXB0eUdyaWRBcmVhLT5jb2x1 bW5JbmRleCk7CkBAIC02MTEsMjAgKzYwNyw2IEBAIHZvaWQgUmVuZGVyR3JpZDo6cGxhY2VBdXRv TWFqb3JBeGlzSXRlbU9uR3JpZChSZW5kZXJCb3gqIGdyaWRJdGVtKQogICAgIGluc2VydEl0ZW1J bnRvR3JpZChncmlkSXRlbSwgcm93SW5kZXgsIGNvbHVtbkluZGV4KTsKIH0KIAotY29uc3QgR3Jp ZFBvc2l0aW9uJiBSZW5kZXJHcmlkOjphdXRvUGxhY2VtZW50TWFqb3JBeGlzUG9zaXRpb25Gb3JD aGlsZChjb25zdCBSZW5kZXJCb3gqIGdyaWRJdGVtKSBjb25zdAotewotICAgIEdyaWRBdXRvRmxv dyBmbG93ID0gc3R5bGUoKS0+Z3JpZEF1dG9GbG93KCk7Ci0gICAgQVNTRVJUKGZsb3cgIT0gQXV0 b0Zsb3dOb25lKTsKLSAgICByZXR1cm4gKGZsb3cgPT0gQXV0b0Zsb3dDb2x1bW4pID8gZ3JpZEl0 ZW0tPnN0eWxlKCktPmdyaWRJdGVtU3RhcnQoKSA6IGdyaWRJdGVtLT5zdHlsZSgpLT5ncmlkSXRl bUJlZm9yZSgpOwotfQotCi1jb25zdCBHcmlkUG9zaXRpb24mIFJlbmRlckdyaWQ6OmF1dG9QbGFj ZW1lbnRNaW5vckF4aXNQb3NpdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCogZ3JpZEl0ZW0p IGNvbnN0Ci17Ci0gICAgR3JpZEF1dG9GbG93IGZsb3cgPSBzdHlsZSgpLT5ncmlkQXV0b0Zsb3co KTsKLSAgICBBU1NFUlQoZmxvdyAhPSBBdXRvRmxvd05vbmUpOwotICAgIHJldHVybiAoZmxvdyA9 PSBBdXRvRmxvd0NvbHVtbikgPyBncmlkSXRlbS0+c3R5bGUoKS0+Z3JpZEl0ZW1CZWZvcmUoKSA6 IGdyaWRJdGVtLT5zdHlsZSgpLT5ncmlkSXRlbVN0YXJ0KCk7Ci19Ci0KIFJlbmRlckdyaWQ6OlRy YWNrU2l6aW5nRGlyZWN0aW9uIFJlbmRlckdyaWQ6OmF1dG9QbGFjZW1lbnRNYWpvckF4aXNEaXJl Y3Rpb24oKSBjb25zdAogewogICAgIEdyaWRBdXRvRmxvdyBmbG93ID0gc3R5bGUoKS0+Z3JpZEF1 dG9GbG93KCk7CkBAIC02OTgsNiArNjgwLDM0IEBAIFJlbmRlckdyaWQ6OkdyaWRDb29yZGluYXRl IFJlbmRlckdyaWQ6OmNhY2hlZEdyaWRDb29yZGluYXRlKGNvbnN0IFJlbmRlckJveCogZ3JpCiAg ICAgcmV0dXJuIG1fZ3JpZEl0ZW1Db29yZGluYXRlLmdldChncmlkSXRlbSk7CiB9CiAKK1Bhc3NP d25QdHI8UmVuZGVyR3JpZDo6R3JpZFNwYW4+IFJlbmRlckdyaWQ6OnJlc29sdmVHcmlkUG9zaXRp b25zRnJvbVN0eWxlKGNvbnN0IFJlbmRlckJveCogZ3JpZEl0ZW0sIFRyYWNrU2l6aW5nRGlyZWN0 aW9uIGRpcmVjdGlvbikgY29uc3QKK3sKKyAgICBjb25zdCBHcmlkUG9zaXRpb24mIGluaXRpYWxQ b3NpdGlvbiA9IChkaXJlY3Rpb24gPT0gRm9yQ29sdW1ucykgPyBncmlkSXRlbS0+c3R5bGUoKS0+ Z3JpZEl0ZW1TdGFydCgpIDogZ3JpZEl0ZW0tPnN0eWxlKCktPmdyaWRJdGVtQmVmb3JlKCk7Cisg ICAgY29uc3QgR3JpZFBvc2l0aW9uJiBmaW5hbFBvc2l0aW9uID0gKGRpcmVjdGlvbiA9PSBGb3JD b2x1bW5zKSA/IGdyaWRJdGVtLT5zdHlsZSgpLT5ncmlkSXRlbUVuZCgpIDogZ3JpZEl0ZW0tPnN0 eWxlKCktPmdyaWRJdGVtQWZ0ZXIoKTsKKworICAgIGlmIChpbml0aWFsUG9zaXRpb24uaXNBdXRv KCkgJiYgZmluYWxQb3NpdGlvbi5pc0F1dG8oKSkgeworICAgICAgICBpZiAoc3R5bGUoKS0+Z3Jp ZEF1dG9GbG93KCkgPT0gQXV0b0Zsb3dOb25lKQorICAgICAgICAgICAgcmV0dXJuIGFkb3B0UHRy KG5ldyBHcmlkU3BhbigwLCAwKSk7CisKKyAgICAgICAgLy8gV2UgY2FuJ3QgZ2V0IG91ciBncmlk IHBvc2l0aW9ucyB3aXRob3V0IHJ1bm5pbmcgdGhlIGF1dG8gcGxhY2VtZW50IGFsZ29yaXRobS4K KyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQorCisgICAgaWYgKGluaXRpYWxQb3NpdGlv bi5pc0F1dG8oKSkgeworICAgICAgICAvLyBJbmZlciB0aGUgcG9zaXRpb24gZnJvbSB0aGUgZmlu YWwgcG9zaXRpb24gKCdhdXRvIC8gMScgY2FzZSkuCisgICAgICAgIGNvbnN0IHNpemVfdCBmaW5h bFJlc29sdmVkUG9zaXRpb24gPSByZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxlKGZpbmFsUG9z aXRpb24pOworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEdyaWRTcGFuKGZpbmFsUmVzb2x2 ZWRQb3NpdGlvbiwgZmluYWxSZXNvbHZlZFBvc2l0aW9uKSk7CisgICAgfQorCisgICAgaWYgKGZp bmFsUG9zaXRpb24uaXNBdXRvKCkpIHsKKyAgICAgICAgLy8gSW5mZXIgb3VyIHBvc2l0aW9uIGZy b20gdGhlIGluaXRpYWwgcG9zaXRpb24gKCcxIC8gYXV0bycgY2FzZSkuCisgICAgICAgIGNvbnN0 IHNpemVfdCBpbml0aWFsUmVzb2x2ZWRQb3NpdGlvbiA9IHJlc29sdmVHcmlkUG9zaXRpb25Gcm9t U3R5bGUoaW5pdGlhbFBvc2l0aW9uKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBHcmlk U3Bhbihpbml0aWFsUmVzb2x2ZWRQb3NpdGlvbiwgaW5pdGlhbFJlc29sdmVkUG9zaXRpb24pKTsK KyAgICB9CisKKyAgICByZXR1cm4gYWRvcHRQdHIobmV3IEdyaWRTcGFuKHJlc29sdmVHcmlkUG9z aXRpb25Gcm9tU3R5bGUoaW5pdGlhbFBvc2l0aW9uKSwgcmVzb2x2ZUdyaWRQb3NpdGlvbkZyb21T dHlsZShmaW5hbFBvc2l0aW9uKSkpOworfQorCiBzaXplX3QgUmVuZGVyR3JpZDo6cmVzb2x2ZUdy aWRQb3NpdGlvbkZyb21TdHlsZShjb25zdCBHcmlkUG9zaXRpb24mIHBvc2l0aW9uKSBjb25zdAog ewogICAgIC8vIEZJWE1FOiBIYW5kbGUgb3RoZXIgdmFsdWVzIGZvciBncmlkLXtyb3csY29sdW1u fSBsaWtlIHJhbmdlcyBvciBsaW5lIG5hbWVzLgpAQCAtNzA5LDggKzcxOSw4IEBAIHNpemVfdCBS ZW5kZXJHcmlkOjpyZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxlKGNvbnN0IEdyaWRQb3NpdGlv biYgcG9zaXRpb24pIGNvCiAKICAgICAgICAgcmV0dXJuIHBvc2l0aW9uLmludGVnZXJQb3NpdGlv bigpIC0gMTsKICAgICBjYXNlIEF1dG9Qb3NpdGlvbjoKLSAgICAgICAgLy8gV2UgY2Fubm90IHJl c29sdmUgZ3JpZCBwb3NpdGlvbnMgaWYgZ3JpZC1hdXRvLWZsb3cgIT0gbm9uZSBhcyBpdCByZXF1 aXJlcyBzZXZlcmFsIGl0ZXJhdGlvbnMuCi0gICAgICAgIEFTU0VSVChzdHlsZSgpLT5ncmlkQXV0 b0Zsb3coKSA9PSBBdXRvRmxvd05vbmUpOworICAgICAgICAvLyAnYXV0bycgZGVwZW5kcyBvbiB0 aGUgb3Bwb3NpdGUgcG9zaXRpb24gZm9yIHJlc29sdXRpb24gKGUuZy4gZ3JpZC1yb3c6IGF1dG8g LyAxKS4KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybiAwOwog ICAgIH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyR3JpZC5oCmluZGV4IDYyZjE1YzNhNTUyNDBlNmRmZDY0YjY3YTg0YzIxMWI3M2U0NGNmMDku LmJmY2UyMDk5ZTYzMTg5MDVhODRmZGU3MDYxMjdhM2E1NTc0M2I4ZWYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckdyaWQuaApAQCAtNjgsNiArNjgsMTkgQEAgcHJpdmF0ZToKICAgICAg ICAgc2l6ZV90IGNvbHVtbkluZGV4OwogICAgICAgICBzaXplX3Qgcm93SW5kZXg7CiAgICAgfTsK KworICAgIHN0cnVjdCBHcmlkU3BhbiB7CisgICAgICAgIEdyaWRTcGFuKHNpemVfdCBpbml0aWFs UG9zaXRpb24sIHNpemVfdCBmaW5hbFBvc2l0aW9uKQorICAgICAgICAgICAgOiBpbml0aWFsUG9z aXRpb25JbmRleChpbml0aWFsUG9zaXRpb24pCisgICAgICAgICAgICAsIGZpbmFsUG9zaXRpb25J bmRleChmaW5hbFBvc2l0aW9uKQorICAgICAgICB7CisgICAgICAgICAgICBBU1NFUlQoaW5pdGlh bFBvc2l0aW9uSW5kZXggPD0gZmluYWxQb3NpdGlvbkluZGV4KTsKKyAgICAgICAgfQorCisgICAg ICAgIHNpemVfdCBpbml0aWFsUG9zaXRpb25JbmRleDsKKyAgICAgICAgc2l6ZV90IGZpbmFsUG9z aXRpb25JbmRleDsKKyAgICB9OworCiAgICAgY2xhc3MgR3JpZEl0ZXJhdG9yOwogICAgIGVudW0g VHJhY2tTaXppbmdEaXJlY3Rpb24geyBGb3JDb2x1bW5zLCBGb3JSb3dzIH07CiAgICAgdm9pZCBj b21wdXRlZFVzZWRCcmVhZHRoT2ZHcmlkVHJhY2tzKFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBWZWN0 b3I8R3JpZFRyYWNrPiYgY29sdW1uVHJhY2tzLCBWZWN0b3I8R3JpZFRyYWNrPiYgcm93VHJhY2tz KTsKQEAgLTgyLDggKzk1LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIHBsYWNlU3BlY2lmaWVkTWFq b3JBeGlzSXRlbXNPbkdyaWQoVmVjdG9yPFJlbmRlckJveCo+KTsKICAgICB2b2lkIHBsYWNlQXV0 b01ham9yQXhpc0l0ZW1zT25HcmlkKFZlY3RvcjxSZW5kZXJCb3gqPik7CiAgICAgdm9pZCBwbGFj ZUF1dG9NYWpvckF4aXNJdGVtT25HcmlkKFJlbmRlckJveCopOwotICAgIGNvbnN0IEdyaWRQb3Np dGlvbiYgYXV0b1BsYWNlbWVudE1ham9yQXhpc1Bvc2l0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVy Qm94KikgY29uc3Q7Ci0gICAgY29uc3QgR3JpZFBvc2l0aW9uJiBhdXRvUGxhY2VtZW50TWlub3JB eGlzUG9zaXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gqKSBjb25zdDsKICAgICBUcmFja1Np emluZ0RpcmVjdGlvbiBhdXRvUGxhY2VtZW50TWFqb3JBeGlzRGlyZWN0aW9uKCkgY29uc3Q7CiAg ICAgVHJhY2tTaXppbmdEaXJlY3Rpb24gYXV0b1BsYWNlbWVudE1pbm9yQXhpc0RpcmVjdGlvbigp IGNvbnN0OwogCkBAIC0xMDQsNiArMTE1LDEwIEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBt YXhDb250ZW50Rm9yQ2hpbGQoUmVuZGVyQm94KiwgVHJhY2tTaXppbmdEaXJlY3Rpb24sIFZlY3Rv cjxHcmlkVHJhY2s+JiBjb2x1bW5UcmFja3MpOwogICAgIExheW91dFBvaW50IGZpbmRDaGlsZExv Z2ljYWxQb3NpdGlvbihSZW5kZXJCb3gqLCBjb25zdCBWZWN0b3I8R3JpZFRyYWNrPiYgY29sdW1u VHJhY2tzLCBjb25zdCBWZWN0b3I8R3JpZFRyYWNrPiYgcm93VHJhY2tzKTsKICAgICBHcmlkQ29v cmRpbmF0ZSBjYWNoZWRHcmlkQ29vcmRpbmF0ZShjb25zdCBSZW5kZXJCb3gqKSBjb25zdDsKKwor ICAgIC8vIFRoaXMgaXMgdGhlIGZ1bmN0aW9uIHRoYXQgc2hvdWxkIGJlIHVzZWQgZm9yIGFueSBw b3NpdGlvbiByZXNvbHV0aW9uIGFzIHdlICpoYXZlKiB0bworICAgIC8vIHJlc29sdmUgYm90aCBk aXJlY3Rpb25zIGF0IHRoZSBzYW1lIHRpbWUgKGUuZy4gYXV0byAvIDEsIHNwYW4gMiAvIDQsIC4u LikuCisgICAgUGFzc093blB0cjxHcmlkU3Bhbj4gcmVzb2x2ZUdyaWRQb3NpdGlvbnNGcm9tU3R5 bGUoY29uc3QgUmVuZGVyQm94KiwgVHJhY2tTaXppbmdEaXJlY3Rpb24pIGNvbnN0OwogICAgIHNp emVfdCByZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxlKGNvbnN0IEdyaWRQb3NpdGlvbiYpIGNv bnN0OwogCiAjaWZuZGVmIE5ERUJVRwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDVhNzg0NTFjZDU1YjYzMDc5MWIxN2IyYzE2 YTA5YTk0OGRmZmM4YTQuLmYxZDMyM2M2MWVhZTMyNjY2Y2EwN2ViYzVkMDhlNTRhMTI1N2MwYmIg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wMy0wNiAgSnVsaWVuIENoYWZmcmFpeCAgPGpj aGFmZnJhaXhAd2Via2l0Lm9yZz4KKworICAgICAgICBbQ1NTIEdyaWQgTGF5b3V0XSBIYW5kbGUg MiBwb3NpdGlvbnMgd2l0aCBvbmUgJ2F1dG8nIHByb3Blcmx5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE2NTMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQt YXV0by1mbG93LXJlc29sdXRpb24tZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvY3NzLWdy aWQtbGF5b3V0L2dyaWQtYXV0by1mbG93LXJlc29sdXRpb24uaHRtbDoKKyAgICAgICAgRXh0ZW5k ZWQgdGhlIHRlc3QgdG8gY292ZXIgbW9yZSBjYXNlcy4KKworICAgICAgICAqIGZhc3QvY3NzLWdy aWQtbGF5b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLXNwYW5uaW5nLXJl c29sdXRpb24uaHRtbDogQWRkZWQuCisgICAgICAgIEFkZGVkIHRoaXMgdGVzdCBpbiBwcmVwYXJh dGlvbiBvZiBhZGRpbmcgbW9yZSBzcGFubmluZyBzdXBwb3J0LgorCisgICAgICAgICogZmFzdC9j c3MtZ3JpZC1sYXlvdXQvcmVzb3VyY2VzL2dyaWQuY3NzOgorICAgICAgICBBZGRlZCB0aGUgMiBu ZXcgY2xhc3Nlcy4KKwogMjAxMy0wMy0wNiAgUm9nZXIgRm9uZyAgPHJvZ2VyX2ZvbmdAYXBwbGUu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgZ2FyZGVuaW5nIEFwcGxlV2luIHBvcnQuCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWF1dG8tZmxvdy1y ZXNvbHV0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0 L2dyaWQtYXV0by1mbG93LXJlc29sdXRpb24tZXhwZWN0ZWQudHh0CmluZGV4IDQ4N2RmOTUwZGY4 ZGUxMjYxMDY2MzRmMTA3YzZjMjFjYjQyODIyMTcuLmM0ZDRjMDMxZjkyYWZiNjExZGMxMzI2NmVk YzQxMDI5YjA5MzM5YzAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5 b3V0L2dyaWQtYXV0by1mbG93LXJlc29sdXRpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRl c3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtYXV0by1mbG93LXJlc29sdXRpb24tZXhwZWN0 ZWQudHh0CkBAIC0zMSwzICszMSwxNSBAQCBYWFhYWCBYWFhYWCBYWFhYWAogWFhYWFggWFhYWFgg WFhYWFgKIFhYWFhYIFhYWFhYIFhYWFhYCiBQQVNTCitYWFhYWCBYWFhYWCBYWFhYWAorWFhYWFgg WFhYWFggWFhYWFgKK1hYWFhYIFhYWFhYIFhYWFhYCitYWFhYWCBYWFhYWCBYWFhYWAorWFhYWFgg WFhYWFggWFhYWFgKK1BBU1MKK1hYWFhYIFhYWFhYIFhYWFhYCitYWFhYWCBYWFhYWCBYWFhYWAor WFhYWFggWFhYWFggWFhYWFgKK1hYWFhYIFhYWFhYIFhYWFhYCitYWFhYWCBYWFhYWCBYWFhYWAor UEFTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1h dXRvLWZsb3ctcmVzb2x1dGlvbi5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlv dXQvZ3JpZC1hdXRvLWZsb3ctcmVzb2x1dGlvbi5odG1sCmluZGV4IGM2NGQxZmQ2NmIyMDM3MWIz Njg2MmZlMWU0OWJlZjFmNWNlZjg1ODAuLjhmNzMxZDY2NzJjYzUyYjY1MGYxM2MzOWJkZTBlNjBm ZTVjY2FiNzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dy aWQtYXV0by1mbG93LXJlc29sdXRpb24uaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1n cmlkLWxheW91dC9ncmlkLWF1dG8tZmxvdy1yZXNvbHV0aW9uLmh0bWwKQEAgLTc3LDUgKzc3LDI3 IEBAIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKICAgICA8L2Rpdj4KIDwvZGl2PgogCis8IS0tIFVz aW5nIHNvbWUgMiBwb3NpdGlvbnMgbm9uLXNwYW5uaW5nIGZpeGVkIGdyaWQte3Jvd3xjb2x1bW59 IC0tPgorPGRpdiBjbGFzcz0idW5jb25zdHJhaW5lZENvbnRhaW5lciI+CisgICAgPGRpdiBjbGFz cz0iZ3JpZCBiaWdHcmlkIGdyaWRBdXRvRmxvd0NvbHVtbiI+CisgICAgICAgIDxkaXYgY2xhc3M9 InNpemVkVG9HcmlkQXJlYSBzZWNvbmRSb3dTZWNvbmRDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjUw IiBkYXRhLW9mZnNldC15PSI1MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTAwIiBkYXRhLWV4cGVj dGVkLWhlaWdodD0iMTAwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2PgorICAgICAgICA8ZGl2IGNs YXNzPSJzaXplZFRvR3JpZEFyZWEgZmlyc3RBdXRvUm93U2Vjb25kQXV0b0NvbHVtbiIgZGF0YS1v ZmZzZXQteD0iNTAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMCIg ZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2PgorICAgICAg ICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgYXV0b1NlY29uZFJvd0F1dG9GaXJzdENvbHVt biIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iNTAiIGRhdGEtZXhwZWN0ZWQtd2lk dGg9IjUwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTAwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2 PgorICAgICAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgZmlyc3RSb3dGaXJzdENvbHVt biIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0 aD0iNTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI1MCI+WFhYWFggWFhYWFggWFhYWFg8L2Rpdj4K KyAgICAgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGF1dG9Sb3dBdXRvQ29sdW1uIiBk YXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIxNTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9 IjUwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTUwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2Pgor ICAgIDwvZGl2PgorPC9kaXY+CisKKzxkaXYgY2xhc3M9InVuY29uc3RyYWluZWRDb250YWluZXIi PgorICAgIDxkaXYgY2xhc3M9ImdyaWQgYmlnR3JpZCBncmlkQXV0b0Zsb3dSb3ciPgorICAgICAg ICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgZmlyc3RSb3dGaXJzdENvbHVtbiIgZGF0YS1v ZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNTAiIGRh dGEtZXhwZWN0ZWQtaGVpZ2h0PSI1MCI+WFhYWFggWFhYWFggWFhYWFg8L2Rpdj4KKyAgICAgICAg PGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGZpcnN0QXV0b1Jvd1NlY29uZEF1dG9Db2x1bW4i IGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRo PSIxMDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI1MCI+WFhYWFggWFhYWFggWFhYWFg8L2Rpdj4K KyAgICAgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIHNlY29uZFJvd1NlY29uZENvbHVt biIgZGF0YS1vZmZzZXQteD0iNTAiIGRhdGEtb2Zmc2V0LXk9IjUwIiBkYXRhLWV4cGVjdGVkLXdp ZHRoPSIxMDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxMDAiPlhYWFhYIFhYWFhYIFhYWFhYPC9k aXY+CisgICAgICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBhdXRvU2Vjb25kUm93QXV0 b0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSI1MCIgZGF0YS1l eHBlY3RlZC13aWR0aD0iNTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxMDAiPlhYWFhYIFhYWFhY IFhYWFhYPC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBhdXRvUm93 QXV0b0NvbHVtbiIgZGF0YS1vZmZzZXQteD0iMTUwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4 cGVjdGVkLXdpZHRoPSIxNTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI1MCI+WFhYWFggWFhYWFgg WFhYWFg8L2Rpdj4KKyAgICA8L2Rpdj4KKzwvZGl2PgorCisKIDwvYm9keT4KIDwvaHRtbD4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1zcGFu bmluZy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQt bGF5b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5lOWM5MmM1ZDU2MmE1YjA0Njk4NjRlMTI4Y2JmYTM0OGJhNDk3ZDkzCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLXNwYW5u aW5nLXJlc29sdXRpb24tZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNDcgQEAKK1Rlc3QgdGhhdCBz cGFubmlnIHJvd3MgLyBjb2x1bW5zIGluc2lkZSBwZXJjZW50YWdlIHNpemVkIGdyaWQgYXJlYXMg Z2V0IHByb3Blcmx5IHNpemVkLgorCitGQUlMOgorRXhwZWN0ZWQgNDAwIGZvciB3aWR0aCwgYnV0 IGdvdCAxNjAuIAorCis8ZGl2IGNsYXNzPSJncmlkIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0MDAi IGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPgorICAgIDxkaXYgY2xhc3M9InNpemVkVG9Hcmlk QXJlYSBmaXJzdFJvd0JvdGhDb2x1bW4iIGRhdGEtZXhwZWN0ZWQteD0iMCIgZGF0YS1leHBlY3Rl ZC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI5 MCI+PC9kaXY+Cis8L2Rpdj4KK0ZBSUw6CitFeHBlY3RlZCA0MDAgZm9yIHdpZHRoLCBidXQgZ290 IDE2MC4gCisKKzxkaXYgY2xhc3M9ImdyaWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0 YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+CisgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVh IHNlY29uZFJvd0JvdGhDb2x1bW4iIGRhdGEtZXhwZWN0ZWQteD0iMCIgZGF0YS1leHBlY3RlZC15 PSI5MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjEw Ij48L2Rpdj4KKzwvZGl2PgorRkFJTDoKK0V4cGVjdGVkIDMwMCBmb3IgaGVpZ2h0LCBidXQgZ290 IDkwLiAKKworPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRh LWV4cGVjdGVkLWhlaWdodD0iMzAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEg Ym90aFJvd0ZpcnN0Q29sdW1uIiBkYXRhLWV4cGVjdGVkLXg9IjAiIGRhdGEtZXhwZWN0ZWQteT0i MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTYwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAwIj48 L2Rpdj4KKzwvZGl2PgorRkFJTDoKK0V4cGVjdGVkIDMwMCBmb3IgaGVpZ2h0LCBidXQgZ290IDkw LiAKKworPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4 cGVjdGVkLWhlaWdodD0iMzAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgYm90 aFJvd1NlY29uZENvbHVtbiIgZGF0YS1leHBlY3RlZC14PSIxNjAiIGRhdGEtZXhwZWN0ZWQteT0i MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjQwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAwIj48 L2Rpdj4KKzwvZGl2PgorRkFJTDoKK0V4cGVjdGVkIDQwMCBmb3Igd2lkdGgsIGJ1dCBnb3QgMTYw LiAKK0V4cGVjdGVkIDMwMCBmb3IgaGVpZ2h0LCBidXQgZ290IDkwLiAKKworPGRpdiBjbGFzcz0i Z3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAw Ij4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgYm90aFJvd0JvdGhDb2x1bW4iIGRh dGEtZXhwZWN0ZWQteD0iMCIgZGF0YS1leHBlY3RlZC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRo PSI0MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPjwvZGl2PgorPC9kaXY+CitGQUlMOgor RXhwZWN0ZWQgMzAwIGZvciBoZWlnaHQsIGJ1dCBnb3QgOTAuIAorCis8ZGl2IGNsYXNzPSJncmlk IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPgor ICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBvdmVyZmxvd1Jvd0ZpcnN0Q29sdW1uIiBk YXRhLWV4cGVjdGVkLXg9IjAiIGRhdGEtZXhwZWN0ZWQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0 aD0iMTYwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAwIj48L2Rpdj4KKzwvZGl2PgorRkFJTDoK K0V4cGVjdGVkIDQwMCBmb3Igd2lkdGgsIGJ1dCBnb3QgMTYwLiAKKworPGRpdiBjbGFzcz0iZ3Jp ZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAwIj4K KyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgZmlyc3RSb3dPdmVyZmxvd0NvbHVtbiIg ZGF0YS1leHBlY3RlZC14PSIwIiBkYXRhLWV4cGVjdGVkLXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lk dGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjkwIj48L2Rpdj4KKzwvZGl2PgorUEFTUwor UEFTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1p dGVtLXNwYW5uaW5nLXJlc29sdXRpb24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQt bGF5b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2E2 Mjg2ZGI4Y2MwZTYwMDhiNGIwMjI2YTFjZGRiMWY3ZThkNmVjMgotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNv bHV0aW9uLmh0bWwKQEAgLTAsMCArMSwxMTEgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8 c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIub3ZlcnJpZGVQ cmVmZXJlbmNlKCJXZWJLaXRDU1NHcmlkTGF5b3V0RW5hYmxlZCIsIDEpOworPC9zY3JpcHQ+Cis8 bGluayBocmVmPSJyZXNvdXJjZXMvZ3JpZC5jc3MiIHJlbD0ic3R5bGVzaGVldCI+Cis8c3R5bGU+ CisuZ3JpZCB7CisgICAgLXdlYmtpdC1ncmlkLWNvbHVtbnM6IDQwJSA2MCU7CisgICAgLXdlYmtp dC1ncmlkLXJvd3M6IDMwJSA3MCU7CisgICAgd2lkdGg6IDQwMHB4OworICAgIGhlaWdodDogMzAw cHg7Cit9CisKKy5maXJzdFJvd0JvdGhDb2x1bW4geworICAgIC13ZWJraXQtZ3JpZC1yb3c6IDE7 CisgICAgLXdlYmtpdC1ncmlkLWNvbHVtbjogMSAvIDE7Cit9CisKKy5zZWNvbmRSb3dCb3RoQ29s dW1uIHsKKyAgICAtd2Via2l0LWdyaWQtcm93OiAyOworICAgIC13ZWJraXQtZ3JpZC1jb2x1bW46 IDEgLyAxOworfQorCisuYm90aFJvd0ZpcnN0Q29sdW1uIHsKKyAgICAtd2Via2l0LWdyaWQtcm93 OiAxIC8gMTsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uOiAxOworfQorCisuYm90aFJvd1NlY29u ZENvbHVtbiB7CisgICAgLXdlYmtpdC1ncmlkLXJvdzogMSAvIDE7CisgICAgLXdlYmtpdC1ncmlk LWNvbHVtbjogMjsKK30KKworLmJvdGhSb3dCb3RoQ29sdW1uIHsKKyAgICAtd2Via2l0LWdyaWQt cm93OiAxIC8gMTsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uOiAxIC8gMTsKK30KKworLm92ZXJm bG93Um93Rmlyc3RDb2x1bW4geworICAgIC13ZWJraXQtZ3JpZC1yb3c6IDEgLyA1OworICAgIC13 ZWJraXQtZ3JpZC1jb2x1bW46IDE7Cit9CisKKy5maXJzdFJvd092ZXJmbG93Q29sdW1uIHsKKyAg ICAtd2Via2l0LWdyaWQtcm93OiAxOworICAgIC13ZWJraXQtZ3JpZC1jb2x1bW46IDEgLyA1Owor fQorPC9zdHlsZT4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvY2hlY2stbGF5b3V0Lmpz Ij48L3NjcmlwdD4KKzxib2R5IG9ubG9hZD0iY2hlY2tMYXlvdXQoJy5ncmlkJyk7Ij4KKworPHA+ VGVzdCB0aGF0IHNwYW5uaWcgcm93cyAvIGNvbHVtbnMgaW5zaWRlIHBlcmNlbnRhZ2Ugc2l6ZWQg Z3JpZCBhcmVhcyBnZXQgcHJvcGVybHkgc2l6ZWQuPC9wPgorCis8ZGl2IHN0eWxlPSJwb3NpdGlv bjogcmVsYXRpdmUiPgorPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAw IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3Jp ZEFyZWEgZmlyc3RSb3dCb3RoQ29sdW1uIiBkYXRhLWV4cGVjdGVkLXg9IjAiIGRhdGEtZXhwZWN0 ZWQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0i OTAiPjwvZGl2PgorPC9kaXY+Cis8L2Rpdj4KKworPGRpdiBzdHlsZT0icG9zaXRpb246IHJlbGF0 aXZlIj4KKzxkaXYgY2xhc3M9ImdyaWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1l eHBlY3RlZC1oZWlnaHQ9IjMwMCI+CisgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIHNl Y29uZFJvd0JvdGhDb2x1bW4iIGRhdGEtZXhwZWN0ZWQteD0iMCIgZGF0YS1leHBlY3RlZC15PSI5 MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjEwIj48 L2Rpdj4KKzwvZGl2PgorPC9kaXY+CisKKzxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2ZSI+ Cis8ZGl2IGNsYXNzPSJncmlkIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0MDAiIGRhdGEtZXhwZWN0 ZWQtaGVpZ2h0PSIzMDAiPgorICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBib3RoUm93 Rmlyc3RDb2x1bW4iIGRhdGEtZXhwZWN0ZWQteD0iMCIgZGF0YS1leHBlY3RlZC15PSIwIiBkYXRh LWV4cGVjdGVkLXdpZHRoPSIxNjAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPjwvZGl2Pgor PC9kaXY+Cis8L2Rpdj4KKworPGRpdiBzdHlsZT0icG9zaXRpb246IHJlbGF0aXZlIj4KKzxkaXYg Y2xhc3M9ImdyaWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWln aHQ9IjMwMCI+CisgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGJvdGhSb3dTZWNvbmRD b2x1bW4iIGRhdGEtZXhwZWN0ZWQteD0iMTYwIiBkYXRhLWV4cGVjdGVkLXk9IjAiIGRhdGEtZXhw ZWN0ZWQtd2lkdGg9IjI0MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+PC9kaXY+Cis8L2Rp dj4KKzwvZGl2PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUiPgorPGRpdiBjbGFz cz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0i MzAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgYm90aFJvd0JvdGhDb2x1bW4i IGRhdGEtZXhwZWN0ZWQteD0iMCIgZGF0YS1leHBlY3RlZC15PSIwIiBkYXRhLWV4cGVjdGVkLXdp ZHRoPSI0MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPjwvZGl2PgorPC9kaXY+Cis8L2Rp dj4KKworPGRpdiBzdHlsZT0icG9zaXRpb246IHJlbGF0aXZlIj4KKzxkaXYgY2xhc3M9ImdyaWQi IGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+Cisg ICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIG92ZXJmbG93Um93Rmlyc3RDb2x1bW4iIGRh dGEtZXhwZWN0ZWQteD0iMCIgZGF0YS1leHBlY3RlZC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRo PSIxNjAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPjwvZGl2PgorPC9kaXY+Cis8L2Rpdj4K KworPGRpdiBzdHlsZT0icG9zaXRpb246IHJlbGF0aXZlIj4KKzxkaXYgY2xhc3M9ImdyaWQiIGRh dGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+CisgICAg PGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGZpcnN0Um93T3ZlcmZsb3dDb2x1bW4iIGRhdGEt ZXhwZWN0ZWQteD0iMCIgZGF0YS1leHBlY3RlZC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0 MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI5MCI+PC9kaXY+Cis8L2Rpdj4KKzwvZGl2PgorCis8 ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUiPgorPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1l eHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAwIj4KKyAgICA8ZGl2 IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgZmlyc3RBdXRvUm93U2Vjb25kQXV0b0NvbHVtbiIgZGF0 YS1leHBlY3RlZC14PSIxNjAiIGRhdGEtZXhwZWN0ZWQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0 aD0iMjQwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iOTAiPjwvZGl2PgorPC9kaXY+Cis8L2Rpdj4K KworPGRpdiBzdHlsZT0icG9zaXRpb246IHJlbGF0aXZlIj4KKzxkaXYgY2xhc3M9ImdyaWQiIGRh dGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+CisgICAg PGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGF1dG9TZWNvbmRSb3dBdXRvRmlyc3RDb2x1bW4i IGRhdGEtZXhwZWN0ZWQteD0iMCIgZGF0YS1leHBlY3RlZC15PSI5MCIgZGF0YS1leHBlY3RlZC13 aWR0aD0iMTYwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjEwIj48L2Rpdj4KKzwvZGl2PgorPC9k aXY+CisKKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3Nz LWdyaWQtbGF5b3V0L3Jlc291cmNlcy9ncmlkLmNzcyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdy aWQtbGF5b3V0L3Jlc291cmNlcy9ncmlkLmNzcwppbmRleCA5NTU0NzRlM2FiYzU2NTAzOTMxNjdi MmY1OTYzYmRkZjAxYjg4NzkyLi5hZmYyY2M3ZjcwM2QwNGYxNzI5NWM0NDFiYjU5ZTYyZmQyYzI5 NGQxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9yZXNvdXJj ZXMvZ3JpZC5jc3MKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvcmVzb3Vy Y2VzL2dyaWQuY3NzCkBAIC0zMiw2ICszMiwxNiBAQAogICAgIC13ZWJraXQtZ3JpZC1yb3c6IDI7 CiB9CiAKKy5maXJzdEF1dG9Sb3dTZWNvbmRBdXRvQ29sdW1uIHsKKyAgICAtd2Via2l0LWdyaWQt cm93OiAxIC8gYXV0bzsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uOiAyIC8gYXV0bzsKK30KKwor LmF1dG9TZWNvbmRSb3dBdXRvRmlyc3RDb2x1bW4geworICAgIC13ZWJraXQtZ3JpZC1yb3c6IGF1 dG8gLyAyOworICAgIC13ZWJraXQtZ3JpZC1jb2x1bW46IGF1dG8gLyAxOworfQorCiAvKiBBdXRv IGNvbHVtbiAvIHJvdy4gKi8KIC5hdXRvUm93QXV0b0NvbHVtbiB7CiAgICAgYmFja2dyb3VuZC1j b2xvcjogcGluazsK 192245 2013-03-08 10:01:24 -0800 2013-03-08 10:27:41 -0800 Patch for landing bug-111653-20130308095726.patch text/plain 28844 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MjM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTU1OTA3ZTAzYWE0Mzdl NDlkMzExODExZmYwMmE3ZDlhNTFhMDdlOS4uZTExZGU3ZmZiYzFlNDAwYmYzM2MwMDEwNzc3M2Rj YTNhYWI1NzQ4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTAzLTA4ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEhhbmRsZSAyIHBvc2l0aW9ucyB3aXRoIG9uZSAnYXV0bycgcHJvcGVybHkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTY1MworCisg ICAgICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCisKKyAgICAgICAgVGhlIHJlbmRlcmluZyBj b2RlIHdhcyBtYWtpbmcgdGhlIGFzc3VtcHRpb24gdGhhdCB3ZSBoYXZlIG9uZSBwb3NpdGlvbi4K KyAgICAgICAgVGh1cyBpdCBjb3VsZG4ndCBmdWxseSBtYXRjaCB3aGF0IHRoZSBzcGVjaWZpY2F0 aW9uIHdhbnRzIGFzIHRoZSAyIG9wcG9zaXRlCisgICAgICAgIHBvc2l0aW9ucyBhcmUgcmVxdWly ZWQgdG8gcmVzb2x2ZSBlaXRoZXIgcG9zaXRpb24gaW4gc2V2ZXJhbCBjYXNlcyAoZS5nLgorICAg ICAgICAxIC8gc3BhbiAyLCBhdXRvIC8gJ2MnKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBpbnRy b2R1Y2VzIHJlc29sdmVHcmlkUG9zaXRpb25zRnJvbVN0eWxlIHRvIGRvIGJvdGggb3Bwb3NpdGUK KyAgICAgICAgcG9zaXRpb25zIHJlc29sdXRpb24gaW4gb25lIHBhc3MgYW5kIHRodXMgaGFuZGxp bmcgbW9yZSBjYXNlcy4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlk LWl0ZW0tc3Bhbm5pbmctcmVzb2x1dGlvbi5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyR3JpZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjptYXhpbXVtSW5kZXhJ bkRpcmVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpwbGFjZUl0ZW1zT25H cmlkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OnBsYWNlU3BlY2lmaWVkTWFqb3JB eGlzSXRlbXNPbkdyaWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6cGxhY2VBdXRv TWFqb3JBeGlzSXRlbU9uR3JpZCk6CisgICAgICAgIFVwZGF0ZWQgdGhlIGFib3ZlIGZ1bmN0aW9u cyB0byByZWx5IG9uIHJlc29sdmVHcmlkUG9zaXRpb25zRnJvbVN0eWxlLgorCisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJHcmlkOjpyZXNvbHZlR3JpZFBvc2l0aW9uc0Zyb21TdHlsZSk6CisgICAg ICAgIEFkZGVkIHRoaXMgbmV3IGZ1bmN0aW9uIHRoYXQgaGFuZGxlIHRoZSBjb3JyZWN0IHJlc29s dXRpb24uCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OnJlc29sdmVHcmlkUG9zaXRp b25Gcm9tU3R5bGUpOgorICAgICAgICBVcGRhdGVkIHRoZSBBU1NFUlQgdG8gbWF0Y2ggdGhlIG5l dyBjb2RlIGZsb3cuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5oOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6R3JpZFNwYW46OkdyaWRTcGFuKToKKyAgICAgICAgSW50 cm9kdWNlZCB0aGlzIG5ldyBzdHJ1Y3QgdG8gaG9sZCB0aGUgMiBwb3NpdGlvbnMgYWxvbmcgb25l IGF4aXMuCisKIDIwMTMtMDMtMDggIEpvaG4gTWVsbG9yICA8am9obm1lQGNocm9taXVtLm9yZz4K IAogICAgICAgICBAbWVkaWEgcXVlcmllcyBkbyBub3QgdGFrZSB6b29taW5nIGludG8gYWNjb3Vu dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IDJiYjI3ZDJjNGM3 ZGU2NmUzMGVkY2JlZDBkMTRjOWFkYjkzNjlhNmYuLmU2NzlmYzgyYzVkZWU4MGZkOGU3YjUzNDlm ZTYxNjdjMjczZDJlYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAK QEAgLTMzNCwxNCArMzM0LDE1IEBAIHNpemVfdCBSZW5kZXJHcmlkOjptYXhpbXVtSW5kZXhJbkRp cmVjdGlvbihUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24pIGNvbnN0CiAgICAgc2l6ZV90 IG1heGltdW1JbmRleCA9IHN0ZDo6bWF4PHNpemVfdD4oMSwgdHJhY2tTdHlsZXMuc2l6ZSgpKTsK IAogICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IGZpcnN0Q2hpbGRCb3goKTsgY2hpbGQ7IGNo aWxkID0gY2hpbGQtPm5leHRTaWJsaW5nQm94KCkpIHsKLSAgICAgICAgY29uc3QgR3JpZFBvc2l0 aW9uJiBwb3NpdGlvbiA9IChkaXJlY3Rpb24gPT0gRm9yQ29sdW1ucykgPyBjaGlsZC0+c3R5bGUo KS0+Z3JpZEl0ZW1TdGFydCgpIDogY2hpbGQtPnN0eWxlKCktPmdyaWRJdGVtQmVmb3JlKCk7Ci0g ICAgICAgIC8vICdhdXRvJyBpdGVtcyB3aWxsIG5lZWQgdG8gYmUgcmVzb2x2ZWQgaW4gc2VwZXJh dGUgcGhhc2VzIGFueXdheS4gTm90ZSB0aGF0IGJlY2F1c2UgbWF4aW11bUluZGV4IGlzIGF0IGxl YXN0IDEsCi0gICAgICAgIC8vIHRoZSBncmlkLWF1dG8tZmxvdyA9PSBub25lIGNhc2UgaXMgYXV0 b21hdGljYWxseSBoYW5kbGVkLgotICAgICAgICBpZiAocG9zaXRpb24uaXNBdXRvKCkpCisgICAg ICAgIC8vIFRoaXMgZnVuY3Rpb24gYnlwYXNzZXMgdGhlIGNhY2hlIChjYWNoZWRHcmlkQ29vcmRp bmF0ZSgpKSBhcyBpdCBpcyB1c2VkIHRvIGJ1aWxkIGl0LgorICAgICAgICBPd25QdHI8R3JpZFNw YW4+IHBvc2l0aW9ucyA9IHJlc29sdmVHcmlkUG9zaXRpb25zRnJvbVN0eWxlKGNoaWxkLCBkaXJl Y3Rpb24pOworCisgICAgICAgIC8vIE5vIHxwb3NpdGlvbnN8IG1lYW5zIHRoYXQgdGhlIGl0ZW0n cyBwb3NpdGlvbiB3aWxsIG5lZWQgdG8gYmUgcmVzb2x2ZWQgYnkgdGhlIGF1dG8gcGxhY2VtZW50 IGFsZ29yaXRobQorICAgICAgICAvLyB0aHVzIHdlIGRvbid0IG5lZWQgdG8gYWNjb3VudCBmb3Ig aXQgaGVyZS4KKyAgICAgICAgaWYgKCFwb3NpdGlvbnMpCiAgICAgICAgICAgICBjb250aW51ZTsK IAotICAgICAgICAvLyBUaGlzIGZ1bmN0aW9uIGJ5cGFzc2VzIHRoZSBjYWNoZSAoY2FjaGVkR3Jp ZENvb3JkaW5hdGUoKSkgYXMgaXQgaXMgdXNlZCB0byBidWlsZCBpdC4KLSAgICAgICAgbWF4aW11 bUluZGV4ID0gc3RkOjptYXgobWF4aW11bUluZGV4LCByZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0 eWxlKHBvc2l0aW9uKSArIDEpOworICAgICAgICBtYXhpbXVtSW5kZXggPSBzdGQ6Om1heChtYXhp bXVtSW5kZXgsIHBvc2l0aW9ucy0+ZmluYWxQb3NpdGlvbkluZGV4ICsgMSk7CiAgICAgfQogCiAg ICAgcmV0dXJuIG1heGltdW1JbmRleDsKQEAgLTUyNiwxOSArNTI3LDE3IEBAIHZvaWQgUmVuZGVy R3JpZDo6cGxhY2VJdGVtc09uR3JpZCgpCiAgICAgVmVjdG9yPFJlbmRlckJveCo+IHNwZWNpZmll ZE1ham9yQXhpc0F1dG9HcmlkSXRlbXM7CiAgICAgR3JpZEF1dG9GbG93IGF1dG9GbG93ID0gc3R5 bGUoKS0+Z3JpZEF1dG9GbG93KCk7CiAgICAgZm9yIChSZW5kZXJCb3gqIGNoaWxkID0gZmlyc3RD aGlsZEJveCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmdCb3goKSkgewotICAg ICAgICBjb25zdCBHcmlkUG9zaXRpb24mIHN0YXJ0UG9zaXRpb24gPSBjaGlsZC0+c3R5bGUoKS0+ Z3JpZEl0ZW1TdGFydCgpOwotICAgICAgICBjb25zdCBHcmlkUG9zaXRpb24mIGJlZm9yZVBvc2l0 aW9uID0gY2hpbGQtPnN0eWxlKCktPmdyaWRJdGVtQmVmb3JlKCk7Ci0gICAgICAgIGlmIChhdXRv RmxvdyAhPSBBdXRvRmxvd05vbmUgJiYgKHN0YXJ0UG9zaXRpb24uaXNBdXRvKCkgfHwgYmVmb3Jl UG9zaXRpb24uaXNBdXRvKCkpKSB7Ci0gICAgICAgICAgICBjb25zdCBHcmlkUG9zaXRpb24mIG1h am9yQXhpc1Bvc2l0aW9uID0gYXV0b1BsYWNlbWVudE1ham9yQXhpc1Bvc2l0aW9uRm9yQ2hpbGQo Y2hpbGQpOwotICAgICAgICAgICAgaWYgKG1ham9yQXhpc1Bvc2l0aW9uLmlzQXV0bygpKQorICAg ICAgICBPd25QdHI8R3JpZFNwYW4+IHJvd1Bvc2l0aW9ucyA9IHJlc29sdmVHcmlkUG9zaXRpb25z RnJvbVN0eWxlKGNoaWxkLCBGb3JSb3dzKTsKKyAgICAgICAgT3duUHRyPEdyaWRTcGFuPiBjb2x1 bW5Qb3NpdGlvbnMgPSByZXNvbHZlR3JpZFBvc2l0aW9uc0Zyb21TdHlsZShjaGlsZCwgRm9yQ29s dW1ucyk7CisgICAgICAgIGlmICghcm93UG9zaXRpb25zIHx8ICFjb2x1bW5Qb3NpdGlvbnMpIHsK KyAgICAgICAgICAgIEdyaWRTcGFuKiBtYWpvckF4aXNQb3NpdGlvbnMgPSAoYXV0b1BsYWNlbWVu dE1ham9yQXhpc0RpcmVjdGlvbigpID09IEZvckNvbHVtbnMpID8gY29sdW1uUG9zaXRpb25zLmdl dCgpIDogcm93UG9zaXRpb25zLmdldCgpOworICAgICAgICAgICAgaWYgKCFtYWpvckF4aXNQb3Np dGlvbnMpCiAgICAgICAgICAgICAgICAgYXV0b01ham9yQXhpc0F1dG9HcmlkSXRlbXMuYXBwZW5k KGNoaWxkKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBzcGVjaWZpZWRNYWpv ckF4aXNBdXRvR3JpZEl0ZW1zLmFwcGVuZChjaGlsZCk7CiAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgfQotICAgICAgICBzaXplX3QgY29sdW1uVHJhY2sgPSByZXNvbHZlR3JpZFBvc2l0 aW9uRnJvbVN0eWxlKHN0YXJ0UG9zaXRpb24pOwotICAgICAgICBzaXplX3Qgcm93VHJhY2sgPSBy ZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxlKGJlZm9yZVBvc2l0aW9uKTsKLSAgICAgICAgaW5z ZXJ0SXRlbUludG9HcmlkKGNoaWxkLCByb3dUcmFjaywgY29sdW1uVHJhY2spOworICAgICAgICBp bnNlcnRJdGVtSW50b0dyaWQoY2hpbGQsIHJvd1Bvc2l0aW9ucy0+aW5pdGlhbFBvc2l0aW9uSW5k ZXgsIGNvbHVtblBvc2l0aW9ucy0+aW5pdGlhbFBvc2l0aW9uSW5kZXgpOwogICAgIH0KIAogICAg IEFTU0VSVChncmlkUm93Q291bnQoKSA+PSBzdHlsZSgpLT5ncmlkUm93cygpLnNpemUoKSk7CkBA IC01NTgsOSArNTU3LDggQEAgdm9pZCBSZW5kZXJHcmlkOjpwbGFjZUl0ZW1zT25HcmlkKCkKIHZv aWQgUmVuZGVyR3JpZDo6cGxhY2VTcGVjaWZpZWRNYWpvckF4aXNJdGVtc09uR3JpZChWZWN0b3I8 UmVuZGVyQm94Kj4gYXV0b0dyaWRJdGVtcykKIHsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IGF1dG9HcmlkSXRlbXMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgY29uc3QgR3JpZFBvc2l0aW9u JiBtYWpvckF4aXNQb3NpdGlvbiA9IGF1dG9QbGFjZW1lbnRNYWpvckF4aXNQb3NpdGlvbkZvckNo aWxkKGF1dG9HcmlkSXRlbXNbaV0pOwotICAgICAgICBBU1NFUlQoIW1ham9yQXhpc1Bvc2l0aW9u LmlzQXV0bygpKTsKLSAgICAgICAgR3JpZEl0ZXJhdG9yIGl0ZXJhdG9yKG1fZ3JpZCwgYXV0b1Bs YWNlbWVudE1ham9yQXhpc0RpcmVjdGlvbigpLCByZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxl KG1ham9yQXhpc1Bvc2l0aW9uKSk7CisgICAgICAgIE93blB0cjxHcmlkU3Bhbj4gbWFqb3JBeGlz UG9zaXRpb25zID0gcmVzb2x2ZUdyaWRQb3NpdGlvbnNGcm9tU3R5bGUoYXV0b0dyaWRJdGVtc1tp XSwgYXV0b1BsYWNlbWVudE1ham9yQXhpc0RpcmVjdGlvbigpKTsKKyAgICAgICAgR3JpZEl0ZXJh dG9yIGl0ZXJhdG9yKG1fZ3JpZCwgYXV0b1BsYWNlbWVudE1ham9yQXhpc0RpcmVjdGlvbigpLCBt YWpvckF4aXNQb3NpdGlvbnMtPmluaXRpYWxQb3NpdGlvbkluZGV4KTsKICAgICAgICAgaWYgKE93 blB0cjxHcmlkQ29vcmRpbmF0ZT4gZW1wdHlHcmlkQXJlYSA9IGl0ZXJhdG9yLm5leHRFbXB0eUdy aWRBcmVhKCkpIHsKICAgICAgICAgICAgIGluc2VydEl0ZW1JbnRvR3JpZChhdXRvR3JpZEl0ZW1z W2ldLCBlbXB0eUdyaWRBcmVhLT5yb3dJbmRleCwgZW1wdHlHcmlkQXJlYS0+Y29sdW1uSW5kZXgp OwogICAgICAgICAgICAgY29udGludWU7CkBAIC01NzUsMTkgKzU3MywxNyBAQCB2b2lkIFJlbmRl ckdyaWQ6OnBsYWNlU3BlY2lmaWVkTWFqb3JBeGlzSXRlbXNPbkdyaWQoVmVjdG9yPFJlbmRlckJv eCo+IGF1dG9HcmlkSQogCiB2b2lkIFJlbmRlckdyaWQ6OnBsYWNlQXV0b01ham9yQXhpc0l0ZW1z T25HcmlkKFZlY3RvcjxSZW5kZXJCb3gqPiBhdXRvR3JpZEl0ZW1zKQogewotICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgYXV0b0dyaWRJdGVtcy5zaXplKCk7ICsraSkgewotICAgICAgICBBU1NF UlQoYXV0b1BsYWNlbWVudE1ham9yQXhpc1Bvc2l0aW9uRm9yQ2hpbGQoYXV0b0dyaWRJdGVtc1tp XSkuaXNBdXRvKCkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYXV0b0dyaWRJdGVtcy5z aXplKCk7ICsraSkKICAgICAgICAgcGxhY2VBdXRvTWFqb3JBeGlzSXRlbU9uR3JpZChhdXRvR3Jp ZEl0ZW1zW2ldKTsKLSAgICB9CiB9CiAKIHZvaWQgUmVuZGVyR3JpZDo6cGxhY2VBdXRvTWFqb3JB eGlzSXRlbU9uR3JpZChSZW5kZXJCb3gqIGdyaWRJdGVtKQogewotICAgIEFTU0VSVChhdXRvUGxh Y2VtZW50TWFqb3JBeGlzUG9zaXRpb25Gb3JDaGlsZChncmlkSXRlbSkuaXNBdXRvKCkpOwotICAg IGNvbnN0IEdyaWRQb3NpdGlvbiYgbWlub3JBeGlzUG9zaXRpb24gPSBhdXRvUGxhY2VtZW50TWlu b3JBeGlzUG9zaXRpb25Gb3JDaGlsZChncmlkSXRlbSk7CisgICAgT3duUHRyPEdyaWRTcGFuPiBt aW5vckF4aXNQb3NpdGlvbnMgPSByZXNvbHZlR3JpZFBvc2l0aW9uc0Zyb21TdHlsZShncmlkSXRl bSwgYXV0b1BsYWNlbWVudE1pbm9yQXhpc0RpcmVjdGlvbigpKTsKKyAgICBBU1NFUlQoIXJlc29s dmVHcmlkUG9zaXRpb25zRnJvbVN0eWxlKGdyaWRJdGVtLCBhdXRvUGxhY2VtZW50TWFqb3JBeGlz RGlyZWN0aW9uKCkpKTsKICAgICBzaXplX3QgbWlub3JBeGlzSW5kZXggPSAwOwotICAgIGlmICgh bWlub3JBeGlzUG9zaXRpb24uaXNBdXRvKCkpIHsKLSAgICAgICAgbWlub3JBeGlzSW5kZXggPSBy ZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxlKG1pbm9yQXhpc1Bvc2l0aW9uKTsKKyAgICBpZiAo bWlub3JBeGlzUG9zaXRpb25zKSB7CisgICAgICAgIG1pbm9yQXhpc0luZGV4ID0gbWlub3JBeGlz UG9zaXRpb25zLT5pbml0aWFsUG9zaXRpb25JbmRleDsKICAgICAgICAgR3JpZEl0ZXJhdG9yIGl0 ZXJhdG9yKG1fZ3JpZCwgYXV0b1BsYWNlbWVudE1pbm9yQXhpc0RpcmVjdGlvbigpLCBtaW5vckF4 aXNJbmRleCk7CiAgICAgICAgIGlmIChPd25QdHI8R3JpZENvb3JkaW5hdGU+IGVtcHR5R3JpZEFy ZWEgPSBpdGVyYXRvci5uZXh0RW1wdHlHcmlkQXJlYSgpKSB7CiAgICAgICAgICAgICBpbnNlcnRJ dGVtSW50b0dyaWQoZ3JpZEl0ZW0sIGVtcHR5R3JpZEFyZWEtPnJvd0luZGV4LCBlbXB0eUdyaWRB cmVhLT5jb2x1bW5JbmRleCk7CkBAIC02MTEsMjAgKzYwNyw2IEBAIHZvaWQgUmVuZGVyR3JpZDo6 cGxhY2VBdXRvTWFqb3JBeGlzSXRlbU9uR3JpZChSZW5kZXJCb3gqIGdyaWRJdGVtKQogICAgIGlu c2VydEl0ZW1JbnRvR3JpZChncmlkSXRlbSwgcm93SW5kZXgsIGNvbHVtbkluZGV4KTsKIH0KIAot Y29uc3QgR3JpZFBvc2l0aW9uJiBSZW5kZXJHcmlkOjphdXRvUGxhY2VtZW50TWFqb3JBeGlzUG9z aXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gqIGdyaWRJdGVtKSBjb25zdAotewotICAgIEdy aWRBdXRvRmxvdyBmbG93ID0gc3R5bGUoKS0+Z3JpZEF1dG9GbG93KCk7Ci0gICAgQVNTRVJUKGZs b3cgIT0gQXV0b0Zsb3dOb25lKTsKLSAgICByZXR1cm4gKGZsb3cgPT0gQXV0b0Zsb3dDb2x1bW4p ID8gZ3JpZEl0ZW0tPnN0eWxlKCktPmdyaWRJdGVtU3RhcnQoKSA6IGdyaWRJdGVtLT5zdHlsZSgp LT5ncmlkSXRlbUJlZm9yZSgpOwotfQotCi1jb25zdCBHcmlkUG9zaXRpb24mIFJlbmRlckdyaWQ6 OmF1dG9QbGFjZW1lbnRNaW5vckF4aXNQb3NpdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCog Z3JpZEl0ZW0pIGNvbnN0Ci17Ci0gICAgR3JpZEF1dG9GbG93IGZsb3cgPSBzdHlsZSgpLT5ncmlk QXV0b0Zsb3coKTsKLSAgICBBU1NFUlQoZmxvdyAhPSBBdXRvRmxvd05vbmUpOwotICAgIHJldHVy biAoZmxvdyA9PSBBdXRvRmxvd0NvbHVtbikgPyBncmlkSXRlbS0+c3R5bGUoKS0+Z3JpZEl0ZW1C ZWZvcmUoKSA6IGdyaWRJdGVtLT5zdHlsZSgpLT5ncmlkSXRlbVN0YXJ0KCk7Ci19Ci0KIFJlbmRl ckdyaWQ6OlRyYWNrU2l6aW5nRGlyZWN0aW9uIFJlbmRlckdyaWQ6OmF1dG9QbGFjZW1lbnRNYWpv ckF4aXNEaXJlY3Rpb24oKSBjb25zdAogewogICAgIEdyaWRBdXRvRmxvdyBmbG93ID0gc3R5bGUo KS0+Z3JpZEF1dG9GbG93KCk7CkBAIC02OTgsNiArNjgwLDM0IEBAIFJlbmRlckdyaWQ6OkdyaWRD b29yZGluYXRlIFJlbmRlckdyaWQ6OmNhY2hlZEdyaWRDb29yZGluYXRlKGNvbnN0IFJlbmRlckJv eCogZ3JpCiAgICAgcmV0dXJuIG1fZ3JpZEl0ZW1Db29yZGluYXRlLmdldChncmlkSXRlbSk7CiB9 CiAKK1Bhc3NPd25QdHI8UmVuZGVyR3JpZDo6R3JpZFNwYW4+IFJlbmRlckdyaWQ6OnJlc29sdmVH cmlkUG9zaXRpb25zRnJvbVN0eWxlKGNvbnN0IFJlbmRlckJveCogZ3JpZEl0ZW0sIFRyYWNrU2l6 aW5nRGlyZWN0aW9uIGRpcmVjdGlvbikgY29uc3QKK3sKKyAgICBjb25zdCBHcmlkUG9zaXRpb24m IGluaXRpYWxQb3NpdGlvbiA9IChkaXJlY3Rpb24gPT0gRm9yQ29sdW1ucykgPyBncmlkSXRlbS0+ c3R5bGUoKS0+Z3JpZEl0ZW1TdGFydCgpIDogZ3JpZEl0ZW0tPnN0eWxlKCktPmdyaWRJdGVtQmVm b3JlKCk7CisgICAgY29uc3QgR3JpZFBvc2l0aW9uJiBmaW5hbFBvc2l0aW9uID0gKGRpcmVjdGlv biA9PSBGb3JDb2x1bW5zKSA/IGdyaWRJdGVtLT5zdHlsZSgpLT5ncmlkSXRlbUVuZCgpIDogZ3Jp ZEl0ZW0tPnN0eWxlKCktPmdyaWRJdGVtQWZ0ZXIoKTsKKworICAgIGlmIChpbml0aWFsUG9zaXRp b24uaXNBdXRvKCkgJiYgZmluYWxQb3NpdGlvbi5pc0F1dG8oKSkgeworICAgICAgICBpZiAoc3R5 bGUoKS0+Z3JpZEF1dG9GbG93KCkgPT0gQXV0b0Zsb3dOb25lKQorICAgICAgICAgICAgcmV0dXJu IGFkb3B0UHRyKG5ldyBHcmlkU3BhbigwLCAwKSk7CisKKyAgICAgICAgLy8gV2UgY2FuJ3QgZ2V0 IG91ciBncmlkIHBvc2l0aW9ucyB3aXRob3V0IHJ1bm5pbmcgdGhlIGF1dG8gcGxhY2VtZW50IGFs Z29yaXRobS4KKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQorCisgICAgaWYgKGluaXRp YWxQb3NpdGlvbi5pc0F1dG8oKSkgeworICAgICAgICAvLyBJbmZlciB0aGUgcG9zaXRpb24gZnJv bSB0aGUgZmluYWwgcG9zaXRpb24gKCdhdXRvIC8gMScgY2FzZSkuCisgICAgICAgIGNvbnN0IHNp emVfdCBmaW5hbFJlc29sdmVkUG9zaXRpb24gPSByZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxl KGZpbmFsUG9zaXRpb24pOworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEdyaWRTcGFuKGZp bmFsUmVzb2x2ZWRQb3NpdGlvbiwgZmluYWxSZXNvbHZlZFBvc2l0aW9uKSk7CisgICAgfQorCisg ICAgaWYgKGZpbmFsUG9zaXRpb24uaXNBdXRvKCkpIHsKKyAgICAgICAgLy8gSW5mZXIgb3VyIHBv c2l0aW9uIGZyb20gdGhlIGluaXRpYWwgcG9zaXRpb24gKCcxIC8gYXV0bycgY2FzZSkuCisgICAg ICAgIGNvbnN0IHNpemVfdCBpbml0aWFsUmVzb2x2ZWRQb3NpdGlvbiA9IHJlc29sdmVHcmlkUG9z aXRpb25Gcm9tU3R5bGUoaW5pdGlhbFBvc2l0aW9uKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRy KG5ldyBHcmlkU3Bhbihpbml0aWFsUmVzb2x2ZWRQb3NpdGlvbiwgaW5pdGlhbFJlc29sdmVkUG9z aXRpb24pKTsKKyAgICB9CisKKyAgICByZXR1cm4gYWRvcHRQdHIobmV3IEdyaWRTcGFuKHJlc29s dmVHcmlkUG9zaXRpb25Gcm9tU3R5bGUoaW5pdGlhbFBvc2l0aW9uKSwgcmVzb2x2ZUdyaWRQb3Np dGlvbkZyb21TdHlsZShmaW5hbFBvc2l0aW9uKSkpOworfQorCiBzaXplX3QgUmVuZGVyR3JpZDo6 cmVzb2x2ZUdyaWRQb3NpdGlvbkZyb21TdHlsZShjb25zdCBHcmlkUG9zaXRpb24mIHBvc2l0aW9u KSBjb25zdAogewogICAgIC8vIEZJWE1FOiBIYW5kbGUgb3RoZXIgdmFsdWVzIGZvciBncmlkLXty b3csY29sdW1ufSBsaWtlIHJhbmdlcyBvciBsaW5lIG5hbWVzLgpAQCAtNzA5LDggKzcxOSw4IEBA IHNpemVfdCBSZW5kZXJHcmlkOjpyZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxlKGNvbnN0IEdy aWRQb3NpdGlvbiYgcG9zaXRpb24pIGNvCiAKICAgICAgICAgcmV0dXJuIHBvc2l0aW9uLmludGVn ZXJQb3NpdGlvbigpIC0gMTsKICAgICBjYXNlIEF1dG9Qb3NpdGlvbjoKLSAgICAgICAgLy8gV2Ug Y2Fubm90IHJlc29sdmUgZ3JpZCBwb3NpdGlvbnMgaWYgZ3JpZC1hdXRvLWZsb3cgIT0gbm9uZSBh cyBpdCByZXF1aXJlcyBzZXZlcmFsIGl0ZXJhdGlvbnMuCi0gICAgICAgIEFTU0VSVChzdHlsZSgp LT5ncmlkQXV0b0Zsb3coKSA9PSBBdXRvRmxvd05vbmUpOworICAgICAgICAvLyAnYXV0bycgZGVw ZW5kcyBvbiB0aGUgb3Bwb3NpdGUgcG9zaXRpb24gZm9yIHJlc29sdXRpb24gKGUuZy4gZ3JpZC1y b3c6IGF1dG8gLyAxKS4KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJl dHVybiAwOwogICAgIH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyR3JpZC5oCmluZGV4IDYyZjE1YzNhNTUyNDBlNmRmZDY0YjY3YTg0YzIxMWI3 M2U0NGNmMDkuLjYwOGM5NGU1ZTg2YWRjOTU5NzFlNzlmNGFlYTBkZWE2M2M5YmFhNWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaApAQCAtNjgsNiArNjgsMTkgQEAgcHJpdmF0 ZToKICAgICAgICAgc2l6ZV90IGNvbHVtbkluZGV4OwogICAgICAgICBzaXplX3Qgcm93SW5kZXg7 CiAgICAgfTsKKworICAgIHN0cnVjdCBHcmlkU3BhbiB7CisgICAgICAgIEdyaWRTcGFuKHNpemVf dCBpbml0aWFsUG9zaXRpb24sIHNpemVfdCBmaW5hbFBvc2l0aW9uKQorICAgICAgICAgICAgOiBp bml0aWFsUG9zaXRpb25JbmRleChpbml0aWFsUG9zaXRpb24pCisgICAgICAgICAgICAsIGZpbmFs UG9zaXRpb25JbmRleChmaW5hbFBvc2l0aW9uKQorICAgICAgICB7CisgICAgICAgICAgICBBU1NF UlQoaW5pdGlhbFBvc2l0aW9uSW5kZXggPD0gZmluYWxQb3NpdGlvbkluZGV4KTsKKyAgICAgICAg fQorCisgICAgICAgIHNpemVfdCBpbml0aWFsUG9zaXRpb25JbmRleDsKKyAgICAgICAgc2l6ZV90 IGZpbmFsUG9zaXRpb25JbmRleDsKKyAgICB9OworCiAgICAgY2xhc3MgR3JpZEl0ZXJhdG9yOwog ICAgIGVudW0gVHJhY2tTaXppbmdEaXJlY3Rpb24geyBGb3JDb2x1bW5zLCBGb3JSb3dzIH07CiAg ICAgdm9pZCBjb21wdXRlZFVzZWRCcmVhZHRoT2ZHcmlkVHJhY2tzKFRyYWNrU2l6aW5nRGlyZWN0 aW9uLCBWZWN0b3I8R3JpZFRyYWNrPiYgY29sdW1uVHJhY2tzLCBWZWN0b3I8R3JpZFRyYWNrPiYg cm93VHJhY2tzKTsKQEAgLTgyLDggKzk1LDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIHBsYWNlU3Bl Y2lmaWVkTWFqb3JBeGlzSXRlbXNPbkdyaWQoVmVjdG9yPFJlbmRlckJveCo+KTsKICAgICB2b2lk IHBsYWNlQXV0b01ham9yQXhpc0l0ZW1zT25HcmlkKFZlY3RvcjxSZW5kZXJCb3gqPik7CiAgICAg dm9pZCBwbGFjZUF1dG9NYWpvckF4aXNJdGVtT25HcmlkKFJlbmRlckJveCopOwotICAgIGNvbnN0 IEdyaWRQb3NpdGlvbiYgYXV0b1BsYWNlbWVudE1ham9yQXhpc1Bvc2l0aW9uRm9yQ2hpbGQoY29u c3QgUmVuZGVyQm94KikgY29uc3Q7Ci0gICAgY29uc3QgR3JpZFBvc2l0aW9uJiBhdXRvUGxhY2Vt ZW50TWlub3JBeGlzUG9zaXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gqKSBjb25zdDsKICAg ICBUcmFja1NpemluZ0RpcmVjdGlvbiBhdXRvUGxhY2VtZW50TWFqb3JBeGlzRGlyZWN0aW9uKCkg Y29uc3Q7CiAgICAgVHJhY2tTaXppbmdEaXJlY3Rpb24gYXV0b1BsYWNlbWVudE1pbm9yQXhpc0Rp cmVjdGlvbigpIGNvbnN0OwogCkBAIC0xMDQsNiArMTE1LDggQEAgcHJpdmF0ZToKICAgICBMYXlv dXRVbml0IG1heENvbnRlbnRGb3JDaGlsZChSZW5kZXJCb3gqLCBUcmFja1NpemluZ0RpcmVjdGlv biwgVmVjdG9yPEdyaWRUcmFjaz4mIGNvbHVtblRyYWNrcyk7CiAgICAgTGF5b3V0UG9pbnQgZmlu ZENoaWxkTG9naWNhbFBvc2l0aW9uKFJlbmRlckJveCosIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2s+ JiBjb2x1bW5UcmFja3MsIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2s+JiByb3dUcmFja3MpOwogICAg IEdyaWRDb29yZGluYXRlIGNhY2hlZEdyaWRDb29yZGluYXRlKGNvbnN0IFJlbmRlckJveCopIGNv bnN0OworCisgICAgUGFzc093blB0cjxHcmlkU3Bhbj4gcmVzb2x2ZUdyaWRQb3NpdGlvbnNGcm9t U3R5bGUoY29uc3QgUmVuZGVyQm94KiwgVHJhY2tTaXppbmdEaXJlY3Rpb24pIGNvbnN0OwogICAg IHNpemVfdCByZXNvbHZlR3JpZFBvc2l0aW9uRnJvbVN0eWxlKGNvbnN0IEdyaWRQb3NpdGlvbiYp IGNvbnN0OwogCiAjaWZuZGVmIE5ERUJVRwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDgzMmMxM2FiODg3ZDQ1ZjcyZWRmMDU3 NDRkMmE3MzY5Y2UzYjBjODAuLjU0M2FmNTBiNmI5YWMyYjY2MWUwZjVhNDg3NGYwY2ExYjM4NmEz OTYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wMy0wOCAgSnVsaWVuIENoYWZmcmFpeCAg PGpjaGFmZnJhaXhAd2Via2l0Lm9yZz4KKworICAgICAgICBbQ1NTIEdyaWQgTGF5b3V0XSBIYW5k bGUgMiBwb3NpdGlvbnMgd2l0aCBvbmUgJ2F1dG8nIHByb3Blcmx5CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE2NTMKKworICAgICAgICBSZXZpZXdl ZCBieSBUb255IENoYW5nLgorCisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1h dXRvLWZsb3ctcmVzb2x1dGlvbi1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9jc3MtZ3Jp ZC1sYXlvdXQvZ3JpZC1hdXRvLWZsb3ctcmVzb2x1dGlvbi5odG1sOgorICAgICAgICAqIGZhc3Qv Y3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLXNwYW5u aW5nLXJlc29sdXRpb24uaHRtbDogQWRkZWQuCisgICAgICAgIEV4dGVuZGVkIGFuZCBhZGRlZCBh IG5ldyB0ZXN0LiBNb3N0IG9mIHRoZSBuZXcgdGVzdGluZyBpcyBmYWlsaW5nIGFzIGl0CisgICAg ICAgIHJlcXVpcmVzIG90aGVyIGNoYW5nZXMgdG8gbGFuZC4gVGhpcyB3aWxsIGhlbHAgdXMgdHJh Y2sgb3VyIHByb2dyZXNzCisgICAgICAgIHRvd2FyZHMgZnVsbHkgc3VwcG9ydGluZyB0aGUgbmV3 IHN5bnRheCBhbmQgcGFkZGluZy4KKworICAgICAgICAqIGZhc3QvY3NzLWdyaWQtbGF5b3V0L3Jl c291cmNlcy9ncmlkLmNzczoKKyAgICAgICAgQWRkZWQgdGhlIDIgbmV3IGNsYXNzZXMuCisKIDIw MTMtMDMtMDggIEpvaG4gTWVsbG9yICA8am9obm1lQGNocm9taXVtLm9yZz4KIAogICAgICAgICBA bWVkaWEgcXVlcmllcyBkbyBub3QgdGFrZSB6b29taW5nIGludG8gYWNjb3VudApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1hdXRvLWZsb3ctcmVzb2x1 dGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlk LWF1dG8tZmxvdy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dAppbmRleCA0ODdkZjk1MGRmOGRlMTI2 MTA2NjM0ZjEwN2M2YzIxY2I0MjgyMjE3Li5jYTg0YmRmYzU0YWJiYjFjZjU0M2FjNDgxYzhjNzE4 ODU3MWM0YWJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9n cmlkLWF1dG8tZmxvdy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWF1dG8tZmxvdy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4 dApAQCAtMzEsMyArMzEsNjMgQEAgWFhYWFggWFhYWFggWFhYWFgKIFhYWFhYIFhYWFhYIFhYWFhY CiBYWFhYWCBYWFhYWCBYWFhYWAogUEFTUworWFhYWFggWFhYWFggWFhYWFgKK1hYWFhYIFhYWFhY IFhYWFhYCitYWFhYWCBYWFhYWCBYWFhYWAorWFhYWFggWFhYWFggWFhYWFgKK1hYWFhYIFhYWFhY IFhYWFhYCitGQUlMOgorRXhwZWN0ZWQgMjAwIGZvciB3aWR0aCwgYnV0IGdvdCA1MC4gCitFeHBl Y3RlZCAyMDAgZm9yIGhlaWdodCwgYnV0IGdvdCA1MC4gCitFeHBlY3RlZCAzMDAgZm9yIG9mZnNl dExlZnQsIGJ1dCBnb3QgMC4gCitFeHBlY3RlZCAzMDAgZm9yIG9mZnNldFRvcCwgYnV0IGdvdCAw LiAKKworPGRpdiBjbGFzcz0iZ3JpZCBiaWdHcmlkIGdyaWRBdXRvRmxvd0NvbHVtbiI+CisgICAg ICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBhdXRvRmlyc3RSb3dBdXRvRmlyc3RDb2x1 bW4iIGRhdGEtb2Zmc2V0LXg9IjMwMCIgZGF0YS1vZmZzZXQteT0iMzAwIiBkYXRhLWV4cGVjdGVk LXdpZHRoPSIyMDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIyMDAiPlhYWFhYIFhYWFhYIFhYWFhY PC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBmaXJzdEF1dG9Sb3dT ZWNvbmRBdXRvQ29sdW1uIiBkYXRhLW9mZnNldC14PSI1MCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0 YS1leHBlY3RlZC13aWR0aD0iMTAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNTAiPlhYWFhYIFhY WFhYIFhYWFhYPC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBzZWNv bmRSb3dBdXRvQ29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSI1MCIgZGF0 YS1leHBlY3RlZC13aWR0aD0iNTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxMDAiPlhYWFhYIFhY WFhYIFhYWFhYPC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBmaXJz dFJvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRh LWV4cGVjdGVkLXdpZHRoPSI1MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUwIj5YWFhYWCBYWFhY WCBYWFhYWDwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgYXV0b1Jv d0F1dG9Db2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjE1MCIgZGF0YS1l eHBlY3RlZC13aWR0aD0iNTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxNTAiPlhYWFhYIFhYWFhY IFhYWFhYPC9kaXY+CisgICAgPC9kaXY+CitYWFhYWCBYWFhYWCBYWFhYWAorWFhYWFggWFhYWFgg WFhYWFgKK1hYWFhYIFhYWFhYIFhYWFhYCitYWFhYWCBYWFhYWCBYWFhYWAorWFhYWFggWFhYWFgg WFhYWFgKK0ZBSUw6CitFeHBlY3RlZCAyMDAgZm9yIHdpZHRoLCBidXQgZ290IDUwLiAKK0V4cGVj dGVkIDIwMCBmb3IgaGVpZ2h0LCBidXQgZ290IDUwLiAKK0V4cGVjdGVkIDMwMCBmb3Igb2Zmc2V0 TGVmdCwgYnV0IGdvdCAwLiAKK0V4cGVjdGVkIDMwMCBmb3Igb2Zmc2V0VG9wLCBidXQgZ290IDAu IAorCis8ZGl2IGNsYXNzPSJncmlkIGJpZ0dyaWQgZ3JpZEF1dG9GbG93Um93Ij4KKyAgICAgICAg PGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGF1dG9GaXJzdFJvd0F1dG9GaXJzdENvbHVtbiIg ZGF0YS1vZmZzZXQteD0iMzAwIiBkYXRhLW9mZnNldC15PSIzMDAiIGRhdGEtZXhwZWN0ZWQtd2lk dGg9IjIwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjIwMCI+WFhYWFggWFhYWFggWFhYWFg8L2Rp dj4KKyAgICAgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGZpcnN0QXV0b1Jvd1NlY29u ZEF1dG9Db2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4 cGVjdGVkLXdpZHRoPSIxMDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI1MCI+WFhYWFggWFhYWFgg WFhYWFg8L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIHNlY29uZFJv d0F1dG9Db2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjUwIiBkYXRhLWV4 cGVjdGVkLXdpZHRoPSI1MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjEwMCI+WFhYWFggWFhYWFgg WFhYWFg8L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGZpcnN0Um93 Rmlyc3RDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhw ZWN0ZWQtd2lkdGg9IjUwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNTAiPlhYWFhYIFhYWFhYIFhY WFhYPC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBhdXRvUm93QXV0 b0NvbHVtbiIgZGF0YS1vZmZzZXQteD0iMTUwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVj dGVkLXdpZHRoPSIxNTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI1MCI+WFhYWFggWFhYWFggWFhY WFg8L2Rpdj4KKyAgICA8L2Rpdj4KK1hYWFhYIFhYWFhYIFhYWFhYCitYWFhYWCBYWFhYWCBYWFhY WAorRkFJTDoKK0V4cGVjdGVkIDUwIGZvciBoZWlnaHQsIGJ1dCBnb3QgMzAuIAorRXhwZWN0ZWQg MCBmb3Igb2Zmc2V0VG9wLCBidXQgZ290IDUwMC4gCitFeHBlY3RlZCA1MCBmb3Igd2lkdGgsIGJ1 dCBnb3QgMTcwLiAKK0V4cGVjdGVkIDAgZm9yIG9mZnNldExlZnQsIGJ1dCBnb3QgNTAwLiAKKwor PGRpdiBjbGFzcz0iZ3JpZCBiaWdHcmlkIGdyaWRBdXRvRmxvd0NvbHVtbiI+CisgICAgICAgIDxk aXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBvdmVyZmxvd2luZ1Jvd0ZpcnN0Q29sdW1uIiBkYXRh LW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1MCIg ZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2PgorICAgICAg ICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgc2Vjb25kUm93T3ZlcmZsb3dpbmdDb2x1bW4i IGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjUwIiBkYXRhLWV4cGVjdGVkLXdpZHRo PSI1MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjEwMCI+WFhYWFggWFhYWFggWFhYWFg8L2Rpdj4K KyAgICA8L2Rpdj4KK1hYWFhYIFhYWFhYIFhYWFhYCitYWFhYWCBYWFhYWCBYWFhYWAorRkFJTDoK K0V4cGVjdGVkIDUwIGZvciBoZWlnaHQsIGJ1dCBnb3QgMzAuIAorRXhwZWN0ZWQgMCBmb3Igb2Zm c2V0VG9wLCBidXQgZ290IDUwMC4gCitFeHBlY3RlZCA1MCBmb3Igd2lkdGgsIGJ1dCBnb3QgMTcw LiAKK0V4cGVjdGVkIDAgZm9yIG9mZnNldExlZnQsIGJ1dCBnb3QgNTAwLiAKKworPGRpdiBjbGFz cz0iZ3JpZCBiaWdHcmlkIGdyaWRBdXRvRmxvd1JvdyI+CisgICAgICAgIDxkaXYgY2xhc3M9InNp emVkVG9HcmlkQXJlYSBvdmVyZmxvd2luZ1Jvd0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIw IiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1MCIgZGF0YS1leHBlY3Rl ZC1oZWlnaHQ9IjUwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNz PSJzaXplZFRvR3JpZEFyZWEgc2Vjb25kUm93T3ZlcmZsb3dpbmdDb2x1bW4iIGRhdGEtb2Zmc2V0 LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjUwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1MCIgZGF0YS1l eHBlY3RlZC1oZWlnaHQ9IjEwMCI+WFhYWFggWFhYWFggWFhYWFg8L2Rpdj4KKyAgICA8L2Rpdj4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtYXV0by1m bG93LXJlc29sdXRpb24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dy aWQtYXV0by1mbG93LXJlc29sdXRpb24uaHRtbAppbmRleCBjNjRkMWZkNjZiMjAzNzFiMzY4NjJm ZTFlNDliZWYxZjVjZWY4NTgwLi5hNmFjOTA5MWQ3YTY3MGYxZjdkNzdjMDE0YzUyNjFhNzNlNzUy MjdiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWF1 dG8tZmxvdy1yZXNvbHV0aW9uLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1s YXlvdXQvZ3JpZC1hdXRvLWZsb3ctcmVzb2x1dGlvbi5odG1sCkBAIC0xNiw2ICsxNiwxOCBAQCBp ZiAod2luZG93LnRlc3RSdW5uZXIpCiAgICAgLXdlYmtpdC1ncmlkLXJvd3M6IDUwcHggMTAwcHgg MTUwcHggMjAwcHg7CiB9CiAKKy8qIFRoZXNlIDIgY2xhc3NlcyBmb3JjZXMgdGhlIGdyaWQgdG8g YmUgc2l6ZWQgYWZ0ZXIgdGhlIGdyaWQte2VuZHxhZnRlcn0sIHRodXMgZW5kIHVwIGluIHRoZQor ICAgZmlyc3Qgcm93IC8gY29sdW1ucy4gKi8KKy5vdmVyZmxvd2luZ1Jvd0ZpcnN0Q29sdW1uIHsK KyAgICAtd2Via2l0LWdyaWQtcm93OiBhdXRvIC8gMTA7CisgICAgLXdlYmtpdC1ncmlkLWNvbHVt bjogMTsKK30KKworLnNlY29uZFJvd092ZXJmbG93aW5nQ29sdW1uIHsKKyAgICAtd2Via2l0LWdy aWQtcm93OiAyOworICAgIC13ZWJraXQtZ3JpZC1jb2x1bW46IGF1dG8gLyA4OworfQorCiAudW5j b25zdHJhaW5lZENvbnRhaW5lciB7CiAgICAgLyogRm9yIGFjY3VyYXRlIHggLyB5IG9mZnNldC4g Ki8KICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CkBAIC03Nyw1ICs4OSw0MSBAQCBpZiAod2luZG93 LnRlc3RSdW5uZXIpCiAgICAgPC9kaXY+CiA8L2Rpdj4KIAorPCEtLSBVc2luZyBzb21lIDIgcG9z aXRpb25zIG5vbi1zcGFubmluZyBmaXhlZCBncmlkLXtyb3d8Y29sdW1ufSAtLT4KKzxkaXYgY2xh c3M9InVuY29uc3RyYWluZWRDb250YWluZXIiPgorICAgIDxkaXYgY2xhc3M9ImdyaWQgYmlnR3Jp ZCBncmlkQXV0b0Zsb3dDb2x1bW4iPgorICAgICAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFy ZWEgYXV0b0ZpcnN0Um93QXV0b0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14PSIzMDAiIGRhdGEt b2Zmc2V0LXk9IjMwMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAwIiBkYXRhLWV4cGVjdGVkLWhl aWdodD0iMjAwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJz aXplZFRvR3JpZEFyZWEgZmlyc3RBdXRvUm93U2Vjb25kQXV0b0NvbHVtbiIgZGF0YS1vZmZzZXQt eD0iNTAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwMCIgZGF0YS1l eHBlY3RlZC1oZWlnaHQ9IjUwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2PgorICAgICAgICA8ZGl2 IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgc2Vjb25kUm93QXV0b0NvbHVtbiIgZGF0YS1vZmZzZXQt eD0iMCIgZGF0YS1vZmZzZXQteT0iNTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjUwIiBkYXRhLWV4 cGVjdGVkLWhlaWdodD0iMTAwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2PgorICAgICAgICA8ZGl2 IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgZmlyc3RSb3dGaXJzdENvbHVtbiIgZGF0YS1vZmZzZXQt eD0iMCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNTAiIGRhdGEtZXhw ZWN0ZWQtaGVpZ2h0PSI1MCI+WFhYWFggWFhYWFggWFhYWFg8L2Rpdj4KKyAgICAgICAgPGRpdiBj bGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGF1dG9Sb3dBdXRvQ29sdW1uIiBkYXRhLW9mZnNldC14PSIw IiBkYXRhLW9mZnNldC15PSIxNTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjUwIiBkYXRhLWV4cGVj dGVkLWhlaWdodD0iMTUwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2PgorICAgIDwvZGl2PgorPC9k aXY+CisKKzxkaXYgY2xhc3M9InVuY29uc3RyYWluZWRDb250YWluZXIiPgorICAgIDxkaXYgY2xh c3M9ImdyaWQgYmlnR3JpZCBncmlkQXV0b0Zsb3dSb3ciPgorICAgICAgICA8ZGl2IGNsYXNzPSJz aXplZFRvR3JpZEFyZWEgYXV0b0ZpcnN0Um93QXV0b0ZpcnN0Q29sdW1uIiBkYXRhLW9mZnNldC14 PSIzMDAiIGRhdGEtb2Zmc2V0LXk9IjMwMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAwIiBkYXRh LWV4cGVjdGVkLWhlaWdodD0iMjAwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2PgorICAgICAgICA8 ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgZmlyc3RBdXRvUm93U2Vjb25kQXV0b0NvbHVtbiIg ZGF0YS1vZmZzZXQteD0iNTAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9 IjEwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2Pgor ICAgICAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgc2Vjb25kUm93QXV0b0NvbHVtbiIg ZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iNTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9 IjUwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTAwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2Pgor ICAgICAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgZmlyc3RSb3dGaXJzdENvbHVtbiIg ZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0aD0i NTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI1MCI+WFhYWFggWFhYWFggWFhYWFg8L2Rpdj4KKyAg ICAgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGF1dG9Sb3dBdXRvQ29sdW1uIiBkYXRh LW9mZnNldC14PSIxNTAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjE1 MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2PgorICAg IDwvZGl2PgorPC9kaXY+CisKKworPGRpdiBjbGFzcz0idW5jb25zdHJhaW5lZENvbnRhaW5lciI+ CisgICAgPGRpdiBjbGFzcz0iZ3JpZCBiaWdHcmlkIGdyaWRBdXRvRmxvd0NvbHVtbiI+CisgICAg ICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBvdmVyZmxvd2luZ1Jvd0ZpcnN0Q29sdW1u IiBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRo PSI1MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUwIj5YWFhYWCBYWFhYWCBYWFhYWDwvZGl2Pgor ICAgICAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgc2Vjb25kUm93T3ZlcmZsb3dpbmdD b2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjUwIiBkYXRhLWV4cGVjdGVk LXdpZHRoPSI1MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjEwMCI+WFhYWFggWFhYWFggWFhYWFg8 L2Rpdj4KKyAgICA8L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJ1bmNvbnN0cmFpbmVkQ29u dGFpbmVyIj4KKyAgICA8ZGl2IGNsYXNzPSJncmlkIGJpZ0dyaWQgZ3JpZEF1dG9GbG93Um93Ij4K KyAgICAgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIG92ZXJmbG93aW5nUm93Rmlyc3RD b2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQt d2lkdGg9IjUwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNTAiPlhYWFhYIFhYWFhYIFhYWFhYPC9k aXY+CisgICAgICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSBzZWNvbmRSb3dPdmVyZmxv d2luZ0NvbHVtbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iNTAiIGRhdGEtZXhw ZWN0ZWQtd2lkdGg9IjUwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTAwIj5YWFhYWCBYWFhYWCBY WFhYWDwvZGl2PgorICAgIDwvZGl2PgorPC9kaXY+CisKIDwvYm9keT4KIDwvaHRtbD4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1zcGFubmlu Zy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5 b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li5hNzU3N2I3ZjUyMGEzNGFlMzIzYTZkMWQwNGYyMjJmNTM3NzgzZTQ1Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1pdGVtLXNwYW5uaW5n LXJlc29sdXRpb24tZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNDMgQEAKK1Rlc3QgdGhhdCBzcGFu bmlnIHJvd3MgLyBjb2x1bW5zIGluc2lkZSBwZXJjZW50YWdlIHNpemVkIGdyaWQgYXJlYXMgZ2V0 IHByb3Blcmx5IHNpemVkLgorCitGQUlMOgorRXhwZWN0ZWQgNDAwIGZvciB3aWR0aCwgYnV0IGdv dCAxNjAuIAorCis8ZGl2IGNsYXNzPSJncmlkIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0MDAiIGRh dGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPgorICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJl YSBmaXJzdFJvd0JvdGhDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAi IGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjkwIj48L2Rp dj4KKzwvZGl2PgorRkFJTDoKK0V4cGVjdGVkIDQwMCBmb3Igd2lkdGgsIGJ1dCBnb3QgMTYwLiAK KworPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVj dGVkLWhlaWdodD0iMzAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgc2Vjb25k Um93Qm90aENvbHVtbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iOTAiIGRhdGEt ZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjIxMCI+PC9kaXY+Cis8 L2Rpdj4KK0ZBSUw6CitFeHBlY3RlZCAzMDAgZm9yIGhlaWdodCwgYnV0IGdvdCA5MC4gCisKKzxk aXYgY2xhc3M9ImdyaWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1o ZWlnaHQ9IjMwMCI+CisgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGJvdGhSb3dGaXJz dENvbHVtbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3Rl ZC13aWR0aD0iMTYwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAwIj48L2Rpdj4KKzwvZGl2Pgor RkFJTDoKK0V4cGVjdGVkIDMwMCBmb3IgaGVpZ2h0LCBidXQgZ290IDkwLiAKKworPGRpdiBjbGFz cz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0i MzAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgYm90aFJvd1NlY29uZENvbHVt biIgZGF0YS1vZmZzZXQteD0iMTYwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVjdGVkLXdp ZHRoPSIyNDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPjwvZGl2PgorPC9kaXY+CitGQUlM OgorRXhwZWN0ZWQgNDAwIGZvciB3aWR0aCwgYnV0IGdvdCAxNjAuIAorRXhwZWN0ZWQgMzAwIGZv ciBoZWlnaHQsIGJ1dCBnb3QgOTAuIAorCis8ZGl2IGNsYXNzPSJncmlkIiBkYXRhLWV4cGVjdGVk LXdpZHRoPSI0MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPgorICAgIDxkaXYgY2xhc3M9 InNpemVkVG9HcmlkQXJlYSBib3RoUm93Qm90aENvbHVtbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0 YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhl aWdodD0iMzAwIj48L2Rpdj4KKzwvZGl2PgorUEFTUworUEFTUworUEFTUworRkFJTDoKK0V4cGVj dGVkIDI0MCBmb3Igd2lkdGgsIGJ1dCBnb3QgMTYwLiAKK0V4cGVjdGVkIDE2MCBmb3Igb2Zmc2V0 TGVmdCwgYnV0IGdvdCAwLiAKKworPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0 aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMzAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXpl ZFRvR3JpZEFyZWEgYXV0b1NlY29uZFJvd0F1dG9GaXJzdENvbHVtbiIgZGF0YS1vZmZzZXQteD0i MTYwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIyNDAiIGRhdGEtZXhw ZWN0ZWQtaGVpZ2h0PSI5MCI+PC9kaXY+Cis8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtaXRlbS1zcGFubmluZy1yZXNvbHV0aW9uLmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWl0ZW0tc3Bhbm5pbmctcmVz b2x1dGlvbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmI2MGZiYTYzZDk3Y2E3ZWEyZjViNWY3MjUzZmQ2NWZl N2E3ODY1M2YKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxh eW91dC9ncmlkLWl0ZW0tc3Bhbm5pbmctcmVzb2x1dGlvbi5odG1sCkBAIC0wLDAgKzEsMTExIEBA Cis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPHNjcmlwdD4KK2lmICh3aW5kb3cudGVzdFJ1bm5l cikKKyAgICB0ZXN0UnVubmVyLm92ZXJyaWRlUHJlZmVyZW5jZSgiV2ViS2l0Q1NTR3JpZExheW91 dEVuYWJsZWQiLCAxKTsKKzwvc2NyaXB0PgorPGxpbmsgaHJlZj0icmVzb3VyY2VzL2dyaWQuY3Nz IiByZWw9InN0eWxlc2hlZXQiPgorPHN0eWxlPgorLmdyaWQgeworICAgIC13ZWJraXQtZ3JpZC1j b2x1bW5zOiA0MCUgNjAlOworICAgIC13ZWJraXQtZ3JpZC1yb3dzOiAzMCUgNzAlOworICAgIHdp ZHRoOiA0MDBweDsKKyAgICBoZWlnaHQ6IDMwMHB4OworfQorCisuZmlyc3RSb3dCb3RoQ29sdW1u IHsKKyAgICAtd2Via2l0LWdyaWQtcm93OiAxOworICAgIC13ZWJraXQtZ3JpZC1jb2x1bW46IDEg LyAxOworfQorCisuc2Vjb25kUm93Qm90aENvbHVtbiB7CisgICAgLXdlYmtpdC1ncmlkLXJvdzog MjsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uOiAxIC8gMTsKK30KKworLmJvdGhSb3dGaXJzdENv bHVtbiB7CisgICAgLXdlYmtpdC1ncmlkLXJvdzogMSAvIDE7CisgICAgLXdlYmtpdC1ncmlkLWNv bHVtbjogMTsKK30KKworLmJvdGhSb3dTZWNvbmRDb2x1bW4geworICAgIC13ZWJraXQtZ3JpZC1y b3c6IDEgLyAxOworICAgIC13ZWJraXQtZ3JpZC1jb2x1bW46IDI7Cit9CisKKy5ib3RoUm93Qm90 aENvbHVtbiB7CisgICAgLXdlYmtpdC1ncmlkLXJvdzogMSAvIDE7CisgICAgLXdlYmtpdC1ncmlk LWNvbHVtbjogMSAvIDE7Cit9CisKKy5vdmVyZmxvd1Jvd0ZpcnN0Q29sdW1uIHsKKyAgICAtd2Vi a2l0LWdyaWQtcm93OiAxIC8gNTsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uOiAxOworfQorCisu Zmlyc3RSb3dPdmVyZmxvd0NvbHVtbiB7CisgICAgLXdlYmtpdC1ncmlkLXJvdzogMTsKKyAgICAt d2Via2l0LWdyaWQtY29sdW1uOiAxIC8gNTsKK30KKzwvc3R5bGU+Cis8c2NyaXB0IHNyYz0iLi4v Li4vcmVzb3VyY2VzL2NoZWNrLWxheW91dC5qcyI+PC9zY3JpcHQ+Cis8Ym9keSBvbmxvYWQ9ImNo ZWNrTGF5b3V0KCcuZ3JpZCcpOyI+CisKKzxwPlRlc3QgdGhhdCBzcGFubmlnIHJvd3MgLyBjb2x1 bW5zIGluc2lkZSBwZXJjZW50YWdlIHNpemVkIGdyaWQgYXJlYXMgZ2V0IHByb3Blcmx5IHNpemVk LjwvcD4KKworPGRpdiBzdHlsZT0icG9zaXRpb246IHJlbGF0aXZlIj4KKzxkaXYgY2xhc3M9Imdy aWQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+ CisgICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGZpcnN0Um93Qm90aENvbHVtbiIgZGF0 YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAw IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iOTAiPjwvZGl2PgorPC9kaXY+Cis8L2Rpdj4KKworPGRp diBzdHlsZT0icG9zaXRpb246IHJlbGF0aXZlIj4KKzxkaXYgY2xhc3M9ImdyaWQiIGRhdGEtZXhw ZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+CisgICAgPGRpdiBj bGFzcz0ic2l6ZWRUb0dyaWRBcmVhIHNlY29uZFJvd0JvdGhDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9 IjAiIGRhdGEtb2Zmc2V0LXk9IjkwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0MDAiIGRhdGEtZXhw ZWN0ZWQtaGVpZ2h0PSIyMTAiPjwvZGl2PgorPC9kaXY+Cis8L2Rpdj4KKworPGRpdiBzdHlsZT0i cG9zaXRpb246IHJlbGF0aXZlIj4KKzxkaXYgY2xhc3M9ImdyaWQiIGRhdGEtZXhwZWN0ZWQtd2lk dGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+CisgICAgPGRpdiBjbGFzcz0ic2l6 ZWRUb0dyaWRBcmVhIGJvdGhSb3dGaXJzdENvbHVtbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1v ZmZzZXQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTYwIiBkYXRhLWV4cGVjdGVkLWhlaWdo dD0iMzAwIj48L2Rpdj4KKzwvZGl2PgorPC9kaXY+CisKKzxkaXYgc3R5bGU9InBvc2l0aW9uOiBy ZWxhdGl2ZSI+Cis8ZGl2IGNsYXNzPSJncmlkIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0MDAiIGRh dGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPgorICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJl YSBib3RoUm93U2Vjb25kQ29sdW1uIiBkYXRhLW9mZnNldC14PSIxNjAiIGRhdGEtb2Zmc2V0LXk9 IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjI0MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+ PC9kaXY+Cis8L2Rpdj4KKzwvZGl2PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUi PgorPGRpdiBjbGFzcz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVj dGVkLWhlaWdodD0iMzAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgYm90aFJv d0JvdGhDb2x1bW4iIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhw ZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+PC9kaXY+Cis8L2Rp dj4KKzwvZGl2PgorCis8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVsYXRpdmUiPgorPGRpdiBjbGFz cz0iZ3JpZCIgZGF0YS1leHBlY3RlZC13aWR0aD0iNDAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0i MzAwIj4KKyAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEgb3ZlcmZsb3dSb3dGaXJzdENv bHVtbiIgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZzZXQteT0iMCIgZGF0YS1leHBlY3RlZC13 aWR0aD0iMTYwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iOTAiPjwvZGl2PgorPC9kaXY+Cis8L2Rp dj4KKworPGRpdiBzdHlsZT0icG9zaXRpb246IHJlbGF0aXZlIj4KKzxkaXYgY2xhc3M9ImdyaWQi IGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjMwMCI+Cisg ICAgPGRpdiBjbGFzcz0ic2l6ZWRUb0dyaWRBcmVhIGZpcnN0Um93T3ZlcmZsb3dDb2x1bW4iIGRh dGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjE2 MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjkwIj48L2Rpdj4KKzwvZGl2PgorPC9kaXY+CisKKzxk aXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2ZSI+Cis8ZGl2IGNsYXNzPSJncmlkIiBkYXRhLWV4 cGVjdGVkLXdpZHRoPSI0MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPgorICAgIDxkaXYg Y2xhc3M9InNpemVkVG9HcmlkQXJlYSBmaXJzdEF1dG9Sb3dTZWNvbmRBdXRvQ29sdW1uIiBkYXRh LW9mZnNldC14PSIxNjAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjI0 MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjkwIj48L2Rpdj4KKzwvZGl2PgorPC9kaXY+CisKKzxk aXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2ZSI+Cis8ZGl2IGNsYXNzPSJncmlkIiBkYXRhLWV4 cGVjdGVkLXdpZHRoPSI0MDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIzMDAiPgorICAgIDxkaXYg Y2xhc3M9InNpemVkVG9HcmlkQXJlYSBhdXRvU2Vjb25kUm93QXV0b0ZpcnN0Q29sdW1uIiBkYXRh LW9mZnNldC14PSIxNjAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjI0 MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjkwIj48L2Rpdj4KKzwvZGl2PgorPC9kaXY+CisKKzwv Ym9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5 b3V0L3Jlc291cmNlcy9ncmlkLmNzcyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0 L3Jlc291cmNlcy9ncmlkLmNzcwppbmRleCA5NTU0NzRlM2FiYzU2NTAzOTMxNjdiMmY1OTYzYmRk ZjAxYjg4NzkyLi4zMzM4ZDU1MzIyMTYyODQzNmExZDY2NTViYzA5MWU3NzFiNTg4NDg1IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9yZXNvdXJjZXMvZ3JpZC5j c3MKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvcmVzb3VyY2VzL2dyaWQu Y3NzCkBAIC0zMiw2ICszMiwxNiBAQAogICAgIC13ZWJraXQtZ3JpZC1yb3c6IDI7CiB9CiAKKy5m aXJzdEF1dG9Sb3dTZWNvbmRBdXRvQ29sdW1uIHsKKyAgICAtd2Via2l0LWdyaWQtcm93OiAxIC8g YXV0bzsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uOiAyIC8gYXV0bzsKK30KKworLmF1dG9GaXJz dFJvd0F1dG9GaXJzdENvbHVtbiB7CisgICAgLXdlYmtpdC1ncmlkLXJvdzogYXV0byAvIDE7Cisg ICAgLXdlYmtpdC1ncmlkLWNvbHVtbjogYXV0byAvIDE7Cit9CisKIC8qIEF1dG8gY29sdW1uIC8g cm93LiAqLwogLmF1dG9Sb3dBdXRvQ29sdW1uIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBwaW5r Owo=