75359 2011-12-29 09:13:15 -0800 It should be easier to iterate a Vector backwards 2011-12-29 20:50:30 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam dglazkov webkit.review.bot oldest_to_newest 527950 0 sam 2011-12-29 09:13:15 -0800 It should be easier to iterate a Vector backwards 527951 1 sam 2011-12-29 09:14:39 -0800 The current method of iterating Vectors backwards is a bit ugly and doesn't work with C++11 range-based for loops. I want an easier way! 527953 2 120753 sam 2011-12-29 09:24:15 -0800 Created attachment 120753 Patch 527955 3 webkit.review.bot 2011-12-29 09:26:53 -0800 Attachment 120753 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source..." exit_code: 1 Source/JavaScriptCore/wtf/Vector.h:484: reverse_iterator is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/JavaScriptCore/wtf/Vector.h:485: const_reverse_iterator is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 527956 4 120753 andersca 2011-12-29 09:27:56 -0800 Comment on attachment 120753 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120753&action=review > Tools/ChangeLog:11 > + to work on windows. Please explain why we set GTEST_HAS_TR1_TUPLE to 0 here. > Tools/TestWebKitAPI/Tests/Vector.cpp:82 > +// Vector::reveresed() can only be tested if auto and range-for support is > +// availiable. Typo, reveresed. Also, this isn't true. You could do something like for (Vector<int>::const_iterator it = intVector.reversed.begin(), end = intVector.reversed.end(); it != end; ++it) { } 527957 5 sam 2011-12-29 09:35:25 -0800 (In reply to comment #4) > (From update of attachment 120753 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=120753&action=review > > > Tools/ChangeLog:11 > > + to work on windows. > > Please explain why we set GTEST_HAS_TR1_TUPLE to 0 here. Ok. > > > Tools/TestWebKitAPI/Tests/Vector.cpp:82 > > +// Vector::reveresed() can only be tested if auto and range-for support is > > +// availiable. > > Typo, reveresed. Also, this isn't true. You could do something like > > for (Vector<int>::const_iterator it = intVector.reversed.begin(), end = intVector.reversed.end(); it != end; ++it) { } Doh. I will change to test that way. weinig--. 527960 6 sam 2011-12-29 09:52:17 -0800 Actually, if I don't need to use auto, I don't really need to change TestWebKitAPI to use C++11, but that might be nice on its own since then we could add tests for the rvalue stuff I added to RetainPtr and friends. Thoughts? Do all the bots have new enough clang/libc++ for this not to break stuff? 527969 7 120753 webkit.review.bot 2011-12-29 10:06:57 -0800 Comment on attachment 120753 Patch Attachment 120753 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11035925 528062 8 sam 2011-12-29 20:50:30 -0800 Committed r103833: <http://trac.webkit.org/changeset/103833> 120753 2011-12-29 09:24:15 -0800 2011-12-29 10:06:57 -0800 Patch bug-75359-20111229122453.patch text/plain 22012 sam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTAzODA1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBA CisyMDExLTEyLTI5ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSXQg c2hvdWxkIGJlIGVhc2llciB0byBpdGVyYXRlIGEgVmVjdG9yIGJhY2t3YXJkcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUzNTkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIFZlY3Rvcjo6cmJlZ2lu KCksIFZlY3Rvcjo6cmVuZCgpLCBhbmQgVmVjdG9yOjpyZXZlcnNlZCgpLAorICAgICAgICBhIG5l dyBwcm94eSBkcml2ZW4gd2F5IHRvIGFjY2VzcyBhIHZlY3RvciBiYWNrd2FyZHMuIE9uZSBjYW4g dXNlCisgICAgICAgIHJldmVyc2VkKCkgaW4gYSByYW5nZS1iYXNlZCBmb3IgbG9vcCBsaWtlIHNv OgorCisgICAgICAgICAgICBmb3IgKGF1dG8gdmFsOiBteVZlY3Rvci5yZXZlcnNlZCgpKQorICAg ICAgICAgICAgICAgIGRvU29tZXRoaW5nKHZhbCkKKworICAgICAgICAqIHd0Zi9Db21waWxlci5o OgorICAgICAgICBBZGQgY29tcGlsZXIgc3VwcG9ydCBmbGFncyBmb3IgQysrMTEgYXV0byBhbmQg QysrMTEgcmFuZ2UtYmFzZWQgZm9yLWxvb3BzLgorICAgICAgICBUaGVzZSBhcmUgY2hlY2tlZCB1 c2luZyBfX2hhc19leHRlbnNpb24gaW5zdGVhZCBvZiBfX2hhc19mZWF0dXJlIHNpbmNlIHRoZXkK KyAgICAgICAgYXJlIGZpbmUgdG8gdXNlIGluIEMrKzk4IGlmIGF2YWlsYWJsZS4KKworICAgICAg ICAqIHd0Zi9WZWN0b3IuaDoKKyAgICAgICAgKFdURjo6VmVjdG9yOjp+VmVjdG9yKToKKyAgICAg ICAgRml4IHN0eWxlLgorCisgICAgICAgIChXVEY6OlZlY3Rvcjo6cmJlZ2luKToKKyAgICAgICAg KFdURjo6VmVjdG9yOjpyZW5kKToKKyAgICAgICAgQWRkZWQgdXNpbmcgc3RhbmRhcmQgYWRhcHRv ciBzdGQ6OnJldmVyc2VfaXRlcmF0b3IuCisKKyAgICAgICAgKFdURjo6VmVjdG9yOjpyZXZlcnNl ZCk6CisgICAgICAgIChXVEY6OlZlY3Rvcjo6VmVjdG9yUmV2ZXJzZVByb3h5OjpiZWdpbik6Cisg ICAgICAgIChXVEY6OlZlY3Rvcjo6VmVjdG9yUmV2ZXJzZVByb3h5OjplbmQpOgorICAgICAgICBB ZGQgcHJveHkgc2ltaWxhciB0byBvbmUgdXNlZCBpbiBIYXNoTWFwIGZvciBrZXlzKCkgYW5kIHZh bHVlcygpCisgICAgICAgIHdoaWNoIGFsbG93cyBhY2Nlc3MgdG8gYSBWZWN0b3IgYmFja3dhcmRz IGZvciB1c2UgaW4gcmFuZ2UtYmFzZWQKKyAgICAgICAgZm9yIGxvb3BzLAorCiAyMDExLTEyLTI4 ICBZdXFpYW5nIFhpYW4gIDx5dXFpYW5nLnhpYW5AaW50ZWwuY29tPgogCiAgICAgICAgIHNwaWxs IHVuYm94ZWQgdmFsdWVzIGluIERGRyAzMl82NApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L3d0Zi9Db21waWxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYv Q29tcGlsZXIuaAkocmV2aXNpb24gMTAzNzU4KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3d0 Zi9Db21waWxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCw5IEBACiAjZGVmaW5lIFdU Rl9DT01QSUxFUl9TVVBQT1JUU19DWFhfREVMRVRFRF9GVU5DVElPTlMgX19oYXNfZmVhdHVyZShj eHhfZGVsZXRlZF9mdW5jdGlvbnMpCiAjZGVmaW5lIFdURl9DT01QSUxFUl9TVVBQT1JUU19DWFhf TlVMTFBUUiBfX2hhc19mZWF0dXJlKGN4eF9udWxscHRyKQogCisjZGVmaW5lIFdURl9DT01QSUxF Ul9TVVBQT1JUU19DWFhfQVVUT19UWVBFIF9faGFzX2V4dGVuc2lvbihjeHhfYXV0b190eXBlKQor I2RlZmluZSBXVEZfQ09NUElMRVJfU1VQUE9SVFNfQ1hYX1JBTkdFX0ZPUiBfX2hhc19leHRlbnNp b24oY3h4X3JhbmdlX2ZvcikKKwogI2VuZGlmCiAKIC8qIENPTVBJTEVSKE1TVkMpIC0gTWljcm9z b2Z0IFZpc3VhbCBDKysgKi8KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvVmVjdG9y LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9WZWN0b3IuaAkocmV2 aXNpb24gMTAzNzU3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9WZWN0b3IuaAkod29y a2luZyBjb3B5KQpAQCAtNDc0LDExICs0NzQsMTUgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAg IHR5cGVkZWYgVmVjdG9yQnVmZmVyPFQsIGlubGluZUNhcGFjaXR5PiBCdWZmZXI7CiAgICAgICAg IHR5cGVkZWYgVmVjdG9yVHlwZU9wZXJhdGlvbnM8VD4gVHlwZU9wZXJhdGlvbnM7CiAKKyAgICAg ICAgY2xhc3MgVmVjdG9yUmV2ZXJzZVByb3h5OworCiAgICAgcHVibGljOgogICAgICAgICB0eXBl ZGVmIFQgVmFsdWVUeXBlOwogCiAgICAgICAgIHR5cGVkZWYgVCogaXRlcmF0b3I7CiAgICAgICAg IHR5cGVkZWYgY29uc3QgVCogY29uc3RfaXRlcmF0b3I7CisgICAgICAgIHR5cGVkZWYgc3RkOjpy ZXZlcnNlX2l0ZXJhdG9yPGl0ZXJhdG9yPiByZXZlcnNlX2l0ZXJhdG9yOworICAgICAgICB0eXBl ZGVmIHN0ZDo6cmV2ZXJzZV9pdGVyYXRvcjxjb25zdF9pdGVyYXRvcj4gY29uc3RfcmV2ZXJzZV9p dGVyYXRvcjsKIAogICAgICAgICBWZWN0b3IoKSAKICAgICAgICAgICAgIDogbV9zaXplKDApCkBA IC00OTUsNyArNDk5LDggQEAgbmFtZXNwYWNlIFdURiB7CiAKICAgICAgICAgflZlY3RvcigpCiAg ICAgICAgIHsKLSAgICAgICAgICAgIGlmIChtX3NpemUpIHNocmluaygwKTsKKyAgICAgICAgICAg IGlmIChtX3NpemUpCisgICAgICAgICAgICAgICAgc2hyaW5rKDApOwogICAgICAgICB9CiAKICAg ICAgICAgVmVjdG9yKGNvbnN0IFZlY3RvciYpOwpAQCAtNTMyLDcgKzUzNywxNSBAQCBuYW1lc3Bh Y2UgV1RGIHsKICAgICAgICAgaXRlcmF0b3IgZW5kKCkgeyByZXR1cm4gYmVnaW4oKSArIG1fc2l6 ZTsgfQogICAgICAgICBjb25zdF9pdGVyYXRvciBiZWdpbigpIGNvbnN0IHsgcmV0dXJuIGRhdGEo KTsgfQogICAgICAgICBjb25zdF9pdGVyYXRvciBlbmQoKSBjb25zdCB7IHJldHVybiBiZWdpbigp ICsgbV9zaXplOyB9Ci0gICAgICAgIAorCisgICAgICAgIHJldmVyc2VfaXRlcmF0b3IgcmJlZ2lu KCkgeyByZXR1cm4gcmV2ZXJzZV9pdGVyYXRvcihlbmQoKSk7IH0KKyAgICAgICAgcmV2ZXJzZV9p dGVyYXRvciByZW5kKCkgeyByZXR1cm4gcmV2ZXJzZV9pdGVyYXRvcihiZWdpbigpKTsgfQorICAg ICAgICBjb25zdF9yZXZlcnNlX2l0ZXJhdG9yIHJiZWdpbigpIGNvbnN0IHsgcmV0dXJuIGNvbnN0 X3JldmVyc2VfaXRlcmF0b3IoZW5kKCkpOyB9CisgICAgICAgIGNvbnN0X3JldmVyc2VfaXRlcmF0 b3IgcmVuZCgpIGNvbnN0IHsgcmV0dXJuIGNvbnN0X3JldmVyc2VfaXRlcmF0b3IoYmVnaW4oKSk7 IH0KKworICAgICAgICBWZWN0b3JSZXZlcnNlUHJveHkmIHJldmVyc2VkKCkgeyByZXR1cm4gc3Rh dGljX2Nhc3Q8VmVjdG9yUmV2ZXJzZVByb3h5Jj4oKnRoaXMpOyB9CisgICAgICAgIGNvbnN0IFZl Y3RvclJldmVyc2VQcm94eSYgcmV2ZXJzZWQoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxj b25zdCBWZWN0b3JSZXZlcnNlUHJveHkmPigqdGhpcyk7IH0KKwogICAgICAgICBUJiBmaXJzdCgp IHsgcmV0dXJuIGF0KDApOyB9CiAgICAgICAgIGNvbnN0IFQmIGZpcnN0KCkgY29uc3QgeyByZXR1 cm4gYXQoMCk7IH0KICAgICAgICAgVCYgbGFzdCgpIHsgcmV0dXJuIGF0KHNpemUoKSAtIDEpOyB9 CkBAIC02MDksNiArNjIyLDI2IEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICB0ZW1wbGF0ZTx0 eXBlbmFtZSBVPiBVKiBleHBhbmRDYXBhY2l0eShzaXplX3QgbmV3TWluQ2FwYWNpdHksIFUqKTsg CiAgICAgICAgIHRlbXBsYXRlPHR5cGVuYW1lIFU+IHZvaWQgYXBwZW5kU2xvd0Nhc2UoY29uc3Qg VSYpOwogCisgICAgICAgIGNsYXNzIFZlY3RvclJldmVyc2VQcm94eSA6IHByaXZhdGUgVmVjdG9y IHsKKyAgICAgICAgcHVibGljOgorICAgICAgICAgICAgdHlwZWRlZiB0eXBlbmFtZSBWZWN0b3I6 OnJldmVyc2VfaXRlcmF0b3IgaXRlcmF0b3I7CisgICAgICAgICAgICB0eXBlZGVmIHR5cGVuYW1l IFZlY3Rvcjo6Y29uc3RfcmV2ZXJzZV9pdGVyYXRvciBjb25zdF9pdGVyYXRvcjsKKyAgICAgICAg ICAgIAorICAgICAgICAgICAgaXRlcmF0b3IgYmVnaW4oKSB7IHJldHVybiBWZWN0b3I6OnJiZWdp bigpOyB9CisgICAgICAgICAgICBpdGVyYXRvciBlbmQoKSB7IHJldHVybiBWZWN0b3I6OnJlbmQo KTsgfQorICAgICAgICAgICAgY29uc3RfaXRlcmF0b3IgYmVnaW4oKSBjb25zdCB7IHJldHVybiBW ZWN0b3I6OnJiZWdpbigpOyB9CisgICAgICAgICAgICBjb25zdF9pdGVyYXRvciBlbmQoKSBjb25z dCB7IHJldHVybiBWZWN0b3I6OnJlbmQoKTsgfQorCisgICAgICAgIHByaXZhdGU6CisgICAgICAg ICAgICBmcmllbmQgY2xhc3MgVmVjdG9yOworCisgICAgICAgICAgICAvLyBUaGVzZSBhcmUgaW50 ZW50aW9uYWxseSBub3QgaW1wbGVtZW50ZWQuCisgICAgICAgICAgICBWZWN0b3JSZXZlcnNlUHJv eHkoKTsKKyAgICAgICAgICAgIFZlY3RvclJldmVyc2VQcm94eShjb25zdCBWZWN0b3JSZXZlcnNl UHJveHkmKTsKKyAgICAgICAgICAgIFZlY3RvclJldmVyc2VQcm94eSYgb3BlcmF0b3I9KGNvbnN0 IFZlY3RvclJldmVyc2VQcm94eSYpOworICAgICAgICAgICAgflZlY3RvclJldmVyc2VQcm94eSgp OworICAgICAgICB9OworCiAgICAgICAgIHNpemVfdCBtX3NpemU7CiAgICAgICAgIEJ1ZmZlciBt X2J1ZmZlcjsKICAgICB9OwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTAzODA1KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMTItMjkgIFNhbSBXZWluaWcgIDxzYW1A d2Via2l0Lm9yZz4KKworICAgICAgICBJdCBzaG91bGQgYmUgZWFzaWVyIHRvIGl0ZXJhdGUgYSBW ZWN0b3IgYmFja3dhcmRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03NTM1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVGVzdFdlYktpdEFQSS9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnOgorICAg ICAgICBDaGFuZ2UgdG8gY29tcGlsZSBhcyBDKysxMSBhbmQgdXNlIGxpYmMrKy4gVGhlIGZlYXR1 cmVzIG9mIHRoZXNlCisgICAgICAgIHdpbGwgYmUgdXNlZCBzcGFyaW5nbHkgYXMgd2UgbmVlZCBt b3N0IG9mIHRoZSB0ZXN0cyB0byBjb250aW51ZQorICAgICAgICB0byB3b3JrIG9uIHdpbmRvd3Mu CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvajoKKyAgICAgICAgQWRkIG5ldyBWZWN0b3IgdGVzdCBhbmQgY2hhbmdlIHRvIHVz ZSBmcmFtZXdvcmsgYmFzZWQgZ3Rlc3QKKyAgICAgICAgcmF0aGVyIHRoYW4gdGhlIHN0YXRpYyBs aWIsIHRoaXMgYWxsb3dzIHVzIHRvIHVzZSBkaWZmZXJlbnQKKyAgICAgICAgc3RhbmRhcmQgbGli cmFyaWVzLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLmd5cGk6Cisg ICAgICAgICogVGVzdFdlYktpdEFQSS93aW4vVGVzdFdlYktpdEFQSS52Y3Byb2o6CisgICAgICAg IEFkZCBuZXcgVmVjdG9yIHRlc3QuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1Zl Y3Rvci5jcHA6IEFkZGVkLgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAg IFRlc3QgVmVjdG9yIGl0ZXJhdG9ycywgcmV2ZXJzZV9pdGVyYXRvcnMgYW5kIG5ldyByZXZlcnNl ZCBwcm94eS4KKyAgICAgICAgSSBjYW4ndCBmaWd1cmUgb3V0IGEgd2F5IHRvIHRlc3QgdGhlIHJl dmVyc2VkIHByb3h5IHdpdGhvdXQgYXV0bywKKyAgICAgICAgc28gbWFyayBpdCBhcyBzdWNoIHdp dGggY29tcGlsZSBndWFyZHMuCisKIDIwMTEtMTItMjggIERtaXRyeSBMb21vdiAgPGRzbG9tb3ZA Z29vZ2xlLmNvbT4KIAogICAgICAgICBbV2ViV29ya2Vyc11bQ2hyb21pdW1dIFJlbW92ZSByZW1h aW5zIG9mIGNyb3NzLXByb2Nlc3MgZGVkaWNhdGVkIHdvcmtlciBpbXBsZW1lbnRhdGlvbi4KSW5k ZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS5neXBpCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS5neXBpCShyZXZpc2lvbiAxMDMzNDYp CisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkuZ3lwaQkod29ya2luZyBjb3B5 KQpAQCAtMzgsNiArMzgsNyBAQAogICAgICAgICAgICAgJ1Rlc3RzL1dURi9TdHJpbmdCdWlsZGVy LmNwcCcsCiAgICAgICAgICAgICAnVGVzdHMvV1RGL1N0cmluZ09wZXJhdG9ycy5jcHAnLAogICAg ICAgICAgICAgJ1Rlc3RzL1dURi9UZW1wb3JhcnlDaGFuZ2UuY3BwJywKKyAgICAgICAgICAgICdU ZXN0cy9XVEYvVmVjdG9yLmNwcCcsCiAgICAgICAgICAgICAnVGVzdHMvV1RGL1ZlY3RvckJhc2lj LmNwcCcsCiAgICAgICAgICAgICAnVGVzdHMvV1RGL1ZlY3RvclJldmVyc2UuY3BwJywKICAgICAg ICAgXSwKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvQ29uZmlndXJhdGlvbnMvQmFzZS54Y2Nv bmZpZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL0NvbmZpZ3VyYXRpb25zL0Jh c2UueGNjb25maWcJKHJldmlzaW9uIDEwMzM0NikKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvQ29u ZmlndXJhdGlvbnMvQmFzZS54Y2NvbmZpZwkod29ya2luZyBjb3B5KQpAQCAtMjUsNyArMjUsOCBA QAogCiBIRUFERVJfU0VBUkNIX1BBVEhTID0gJChXRUJDT1JFX1BSSVZBVEVfSEVBREVSU19ESVIp L0ZvcndhcmRpbmdIZWFkZXJzICQoV0VCQ09SRV9QUklWQVRFX0hFQURFUlNfRElSKS9pY3U7CiBG UkFNRVdPUktfU0VBUkNIX1BBVEhTID0gJChTWVNURU1fTElCUkFSWV9ESVIpL0ZyYW1ld29ya3Mv UXVhcnR6LmZyYW1ld29yay9GcmFtZXdvcmtzICQoU1lTVEVNX0xJQlJBUllfRElSKS9GcmFtZXdv cmtzL0FwcGxpY2F0aW9uU2VydmljZXMuZnJhbWV3b3JrL0ZyYW1ld29ya3MgJChTWVNURU1fTElC UkFSWV9ESVIpL0ZyYW1ld29ya3MvQ29yZVNlcnZpY2VzLmZyYW1ld29yay9GcmFtZXdvcmtzOwot R0NDX1BSRVBST0NFU1NPUl9ERUZJTklUSU9OUyA9ICQoREVCVUdfREVGSU5FUykgRU5BQkxFX0RB U0hCT0FSRF9TVVBQT1JUIFdFQktJVF9WRVJTSU9OX01JTl9SRVFVSVJFRD1XRUJLSVRfVkVSU0lP Tl9MQVRFU1Q7CitHQ0NfUFJFUFJPQ0VTU09SX0RFRklOSVRJT05TID0gJChERUJVR19ERUZJTkVT KSBXRUJLSVRfVkVSU0lPTl9NSU5fUkVRVUlSRUQ9V0VCS0lUX1ZFUlNJT05fTEFURVNUIEdURVNU X0hBU19UUjFfVFVQTEU9MDsKKwogREVCVUdfSU5GT1JNQVRJT05fRk9STUFUID0gZHdhcmYKIFBS RUJJTkRJTkcgPSBOTwogR0NDX0NfTEFOR1VBR0VfU1RBTkRBUkQgPSBnbnU5OQpAQCAtMzYsNiAr MzcsMTAgQEAgR0NDX1dBUk5fVU5VU0VEX0ZVTkNUSU9OID0gWUVTCiBHQ0NfV0FSTl9VTlVTRURf VkFSSUFCTEUgPSBZRVMKIEdDQ19XQVJOX0FCT1VUX0RFUFJFQ0FURURfRlVOQ1RJT05TID0gTk8K IFdBUk5JTkdfQ0ZMQUdTID0gLVdhbGwgLVcgLVduby11bnVzZWQtcGFyYW1ldGVyCisKK0NMQU5H X0NYWF9MQU5HVUFHRV9TVEFOREFSRCA9IGdudSsrMHg7CitDTEFOR19DWFhfTElCUkFSWSA9IGxp YmMrKzsKKwogTElOS0VSX0RJU1BMQVlTX01BTkdMRURfTkFNRVMgPSBZRVM7CiBWQUxJRF9BUkNI UyA9IGkzODYgeDg2XzY0OwogCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRB UEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24g MTAzMzQ2KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTUyLDYgKzUyLDcgQEAKIAkJQkMyRDAw NjQxMkFBMDRDRTAwRTczMkEzIC8qIGZpbGUtd2l0aC1hbmNob3IuaHRtbCBpbiBDb3B5IFJlc291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQzJEMDA0QTEyQTlGRUIz MDBFNzMyQTMgLyogZmlsZS13aXRoLWFuY2hvci5odG1sICovOyB9OwogCQlCQzNDNEM3MjE0NTc1 QjZBMDAyNUZCNjIgLyogV0tCcm93c2luZ0NvbnRleHRMb2FkRGVsZWdhdGVUZXN0Lm1tIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkMzQzRDNzAxNDU3NUI2 QTAwMjVGQjYyIC8qIFdLQnJvd3NpbmdDb250ZXh0TG9hZERlbGVnYXRlVGVzdC5tbSAqLzsgfTsK IAkJQkMzQzRDN0YxNDU4N0FBNjAwMjVGQjYyIC8qIFdLQnJvd3NpbmdDb250ZXh0R3JvdXBUZXN0 Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkMzQzRD N0QxNDU4N0FBNjAwMjVGQjYyIC8qIFdLQnJvd3NpbmdDb250ZXh0R3JvdXBUZXN0Lm1tICovOyB9 OworCQlCQzU1RjVERjE0QUMzQzUzMDA0ODRCRTEgLyogZ3Rlc3QuZnJhbWV3b3JrIGluIEZyYW1l d29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkM1NUY1REUxNEFDM0M1 MzAwNDg0QkUxIC8qIGd0ZXN0LmZyYW1ld29yayAqLzsgfTsKIAkJQkM1NzVBOTAxMjZFNzREMzAw NkYwRjEyIC8qIENvY29hLmZyYW1ld29yayBpbiBGcmFtZXdvcmtzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IEJDQjlFOUYwMTEyMzVCREUwMEExMzdFMCAvKiBDb2NvYS5mcmFt ZXdvcmsgKi87IH07CiAJCUJDNTc1QTkxMTI2RTc0RDMwMDZGMEYxMiAvKiBXZWJLaXQyLmZyYW1l d29yayBpbiBGcmFtZXdvcmtzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJD QTYxREI0MTE3MDBFRkQwMDQ2MEQxRSAvKiBXZWJLaXQyLmZyYW1ld29yayAqLzsgfTsKIAkJQkM1 NzVBOTIxMjZFNzREMzAwNkYwRjEyIC8qIEphdmFTY3JpcHRDb3JlLmZyYW1ld29yayBpbiBGcmFt ZXdvcmtzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDOTA5NjREMTI1NTYy MEMwMDA4Mzc1NiAvKiBKYXZhU2NyaXB0Q29yZS5mcmFtZXdvcmsgKi87IH07CkBAIC03NSw2ICs3 Niw3IEBACiAJCUJDQTYxREI1MTE3MDBFRkQwMDQ2MEQxRSAvKiBXZWJLaXQyLmZyYW1ld29yayBp biBGcmFtZXdvcmtzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDQTYxREI0 MTE3MDBFRkQwMDQ2MEQxRSAvKiBXZWJLaXQyLmZyYW1ld29yayAqLzsgfTsKIAkJQkNBQTQ4NTYx NEEwNDQ0QzAwODhGQUM0IC8qIHNpbXBsZS10YWxsLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNBQTQ4NTUxNEEwMjE2NDAwODhGQUM0 IC8qIHNpbXBsZS10YWxsLmh0bWwgKi87IH07CiAJCUJDQUE0ODU4MTRBMDQ0RDQwMDg4RkFDNCAv KiBFZGl0b3JDb21tYW5kcy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IEJDQUE0ODU3MTRBMDQ0RDQwMDg4RkFDNCAvKiBFZGl0b3JDb21tYW5kcy5tbSAq LzsgfTsKKwkJQkNBRjQ1MTAxNEFDMUJENjAwNTFEREQ3IC8qIFZlY3Rvci5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQ0FGNDUwRTE0QUMxQkQ1MDA1 MURERDcgLyogVmVjdG9yLmNwcCAqLzsgfTsKIAkJQkNCNjgwNDAxMjZGQkZFMTAwNjQyQTYxIC8q IERvY3VtZW50U3RhcnRVc2VyU2NyaXB0QWxlcnRDcmFzaC5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQ0I2ODAzRjEyNkZCRkUxMDA2NDJBNjEgLyog RG9jdW1lbnRTdGFydFVzZXJTY3JpcHRBbGVydENyYXNoLmNwcCAqLzsgfTsKIAkJQkNCNjgwNDIx MjZGQkZGMTAwNjQyQTYxIC8qIERvY3VtZW50U3RhcnRVc2VyU2NyaXB0QWxlcnRDcmFzaF9CdW5k bGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNC NjgwNDExMjZGQkZGMTAwNjQyQTYxIC8qIERvY3VtZW50U3RhcnRVc2VyU2NyaXB0QWxlcnRDcmFz aF9CdW5kbGUuY3BwICovOyB9OwogCQlCQ0I5RTlGMTExMjM1QkRFMDBBMTM3RTAgLyogQ29jb2Eu ZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQkNCOUU5RjAxMTIzNUJERTAwQTEzN0UwIC8qIENvY29hLmZyYW1ld29yayAqLzsgfTsKQEAg LTEwMyw3ICsxMDUsNiBAQAogCQlDMEJENjY5RjEzMUQzQ0ZGMDBFMThGMkEgLyogUmVzcG9uc2l2 ZW5lc3NUaW1lckRvZXNudEZpcmVFYXJseV9CdW5kbGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQzBCRDY2OUUxMzFEM0NGRjAwRTE4RjJBIC8qIFJl c3BvbnNpdmVuZXNzVGltZXJEb2VzbnRGaXJlRWFybHlfQnVuZGxlLmNwcCAqLzsgfTsKIAkJQzBD NUQzQkUxNDU5OEI2RjAwQTgwMkE2IC8qIEdldEJhY2tpbmdTY2FsZUZhY3Rvci5tbSBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMwQzVEM0JDMTQ1OThCNkYw MEE4MDJBNiAvKiBHZXRCYWNraW5nU2NhbGVGYWN0b3IubW0gKi87IH07CiAJCUMwQzVEM0M2MTQ1 OTkxMjkwMEE4MDJBNiAvKiBHZXRCYWNraW5nU2NhbGVGYWN0b3JfQnVuZGxlLm1tIGluIFNvdXJj ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQzBDNUQzQkQxNDU5OEI2RjAw QTgwMkE2IC8qIEdldEJhY2tpbmdTY2FsZUZhY3Rvcl9CdW5kbGUubW0gKi87IH07Ci0JCUYzRkMz RUUzMTM2NzhCNzMwMDEyNkE2NSAvKiBsaWJndGVzdC5hIGluIEZyYW1ld29ya3MgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRjNGQzNFRTIxMzY3OEI3MzAwMTI2QTY1IC8qIGxp Ymd0ZXN0LmEgKi87IH07CiAJCUY2RjNGMjkxMTMzNDJGRUIwMEE2QkYxOSAvKiBDb29raWVNYW5h Z2VyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEY2 RjNGMjkwMTMzNDJGRUIwMEE2QkYxOSAvKiBDb29raWVNYW5hZ2VyLmNwcCAqLzsgfTsKIAkJRjZG RERERDMxNDI0MUFENDAwNEYxNzI5IC8qIFByaXZhdGVCcm93c2luZ1B1c2hTdGF0ZU5vSGlzdG9y eUNhbGxiYWNrLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IEY2RkREREQyMTQyNDFBRDQwMDRGMTcyOSAvKiBQcml2YXRlQnJvd3NpbmdQdXNoU3RhdGVO b0hpc3RvcnlDYWxsYmFjay5jcHAgKi87IH07CiAJCUY2RkREREQ2MTQyNDFDNkYwMDRGMTcyOSAv KiBwdXNoLXN0YXRlLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gRjZGRERERDUxNDI0MUM0ODAwNEYxNzI5IC8qIHB1c2gtc3RhdGUuaHRt bCAqLzsgfTsKQEAgLTIwMyw2ICsyMDQsNyBAQAogCQlCQzJEMDA0QTEyQTlGRUIzMDBFNzMyQTMg LyogZmlsZS13aXRoLWFuY2hvci5odG1sICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGV4 cGxpY2l0RmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IGZpbGVFbmNvZGluZyA9IDQ7IHBhdGggPSAiZmls ZS13aXRoLWFuY2hvci5odG1sIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkMzQzRD NzAxNDU3NUI2QTAwMjVGQjYyIC8qIFdLQnJvd3NpbmdDb250ZXh0TG9hZERlbGVnYXRlVGVzdC5t bSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgbmFtZSA9IFdLQnJvd3NpbmdDb250 ZXh0TG9hZERlbGVnYXRlVGVzdC5tbTsgcGF0aCA9IFdlYktpdDJPYmpDL1dLQnJvd3NpbmdDb250 ZXh0TG9hZERlbGVnYXRlVGVzdC5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkMz QzRDN0QxNDU4N0FBNjAwMjVGQjYyIC8qIFdLQnJvd3NpbmdDb250ZXh0R3JvdXBUZXN0Lm1tICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0gV0tCcm93c2luZ0NvbnRleHRH cm91cFRlc3QubW07IHBhdGggPSBXZWJLaXQyT2JqQy9XS0Jyb3dzaW5nQ29udGV4dEdyb3VwVGVz dC5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJQkM1NUY1REUxNEFDM0M1MzAwNDg0 QkUxIC8qIGd0ZXN0LmZyYW1ld29yayAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0 S25vd25GaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBuYW1lID0gZ3Rlc3QuZnJhbWV3b3Jr OyBwYXRoID0gLi4vLi4vV2ViS2l0QnVpbGQvRGVidWcvZ3Rlc3QuZnJhbWV3b3JrOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQlCQzU3NTk0NjEyNkU3MzUxMDA2RjBGMTIgLyogSW5qZWN0 ZWRCdW5kbGVNYWluLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IElu amVjdGVkQnVuZGxlTWFpbi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDNTc1 OTgwMTI2RTc0QUYwMDZGMEYxMiAvKiBJbmplY3RlZEJ1bmRsZVRlc3RXZWJLaXRBUEkuYnVuZGxl ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGV4cGxpY2l0RmlsZVR5cGUgPSB3cmFwcGVy LmNmYnVuZGxlOyBpbmNsdWRlSW5JbmRleCA9IDA7IHBhdGggPSBJbmplY3RlZEJ1bmRsZVRlc3RX ZWJLaXRBUEkuYnVuZGxlOyBzb3VyY2VUcmVlID0gQlVJTFRfUFJPRFVDVFNfRElSOyB9OwogCQlC QzU3NTk4MTEyNkU3NEFGMDA2RjBGMTIgLyogSW5qZWN0ZWRCdW5kbGUtSW5mby5wbGlzdCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQucGxpc3Qu eG1sOyBwYXRoID0gIkluamVjdGVkQnVuZGxlLUluZm8ucGxpc3QiOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwpAQCAtMjMwLDYgKzIzMiw3IEBACiAJCUJDQTYxREI0MTE3MDBFRkQwMDQ2MEQx RSAvKiBXZWJLaXQyLmZyYW1ld29yayAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0 S25vd25GaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBwYXRoID0gV2ViS2l0Mi5mcmFtZXdv cms7IHNvdXJjZVRyZWUgPSBCVUlMVF9QUk9EVUNUU19ESVI7IH07CiAJCUJDQUE0ODU1MTRBMDIx NjQwMDg4RkFDNCAvKiBzaW1wbGUtdGFsbC5odG1sICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5odG1sOyBwYXRo ID0gInNpbXBsZS10YWxsLmh0bWwiOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQ0FB NDg1NzE0QTA0NEQ0MDA4OEZBQzQgLyogRWRpdG9yQ29tbWFuZHMubW0gKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBFZGl0b3JDb21tYW5kcy5tbTsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKKwkJQkNBRjQ1MEUxNEFDMUJENTAwNTFEREQ3IC8qIFZlY3Rvci5jcHAg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBWZWN0b3IuY3BwOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQlCQ0I2ODAzRjEyNkZCRkUxMDA2NDJBNjEgLyogRG9jdW1l bnRTdGFydFVzZXJTY3JpcHRBbGVydENyYXNoLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgcGF0aCA9IERvY3VtZW50U3RhcnRVc2VyU2NyaXB0QWxlcnRDcmFzaC5jcHA7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUJDQjY4MDQxMTI2RkJGRjEwMDY0MkE2MSAvKiBEb2N1 bWVudFN0YXJ0VXNlclNjcmlwdEFsZXJ0Q3Jhc2hfQnVuZGxlLmNwcCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IERvY3VtZW50U3RhcnRVc2VyU2NyaXB0QWxlcnRDcmFzaF9C dW5kbGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQ0I5RTdDNzExMjM0RTNB MDBBMTM3RTAgLyogVGVzdHNDb250cm9sbGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IFRlc3RzQ29udHJvbGxlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAt MjY2LDcgKzI2OSw2IEBACiAJCUMwQkQ2NjlFMTMxRDNDRkYwMEUxOEYyQSAvKiBSZXNwb25zaXZl bmVzc1RpbWVyRG9lc250RmlyZUVhcmx5X0J1bmRsZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBSZXNwb25zaXZlbmVzc1RpbWVyRG9lc250RmlyZUVhcmx5X0J1bmRs ZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMwQzVEM0JDMTQ1OThCNkYwMEE4 MDJBNiAvKiBHZXRCYWNraW5nU2NhbGVGYWN0b3IubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5vYmpjcHA7IHBhdGggPSBHZXRCYWNraW5nU2NhbGVGYWN0b3IubW07IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCUMwQzVEM0JEMTQ1OThCNkYwMEE4MDJBNiAvKiBHZXRCYWNraW5nU2Nh bGVGYWN0b3JfQnVuZGxlLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRo ID0gR2V0QmFja2luZ1NjYWxlRmFjdG9yX0J1bmRsZS5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKLQkJRjNGQzNFRTIxMzY3OEI3MzAwMTI2QTY1IC8qIGxpYmd0ZXN0LmEgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBhcmNoaXZlLmFyOyBwYXRo ID0gbGliZ3Rlc3QuYTsgc291cmNlVHJlZSA9IEJVSUxUX1BST0RVQ1RTX0RJUjsgfTsKIAkJRjZG M0YyOTAxMzM0MkZFQjAwQTZCRjE5IC8qIENvb2tpZU1hbmFnZXIuY3BwICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQ29va2llTWFuYWdlci5jcHA7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCUY2RkREREQyMTQyNDFBRDQwMDRGMTcyOSAvKiBQcml2YXRlQnJvd3Np bmdQdXNoU3RhdGVOb0hpc3RvcnlDYWxsYmFjay5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5jcHA7IHBhdGggPSBQcml2YXRlQnJvd3NpbmdQdXNoU3RhdGVOb0hpc3RvcnlDYWxsYmFjay5j cHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUY2RkREREQ1MTQyNDFDNDgwMDRGMTcy OSAvKiBwdXNoLXN0YXRlLmh0bWwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0bWw7IHBhdGggPSAicHVzaC1z dGF0ZS5odG1sIjsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTI3NywxMiArMjc5LDEy IEBACiAJCQlpc2EgPSBQQlhGcmFtZXdvcmtzQnVpbGRQaGFzZTsKIAkJCWJ1aWxkQWN0aW9uTWFz ayA9IDIxNDc0ODM2NDc7CiAJCQlmaWxlcyA9ICgKKwkJCQlCQzU1RjVERjE0QUMzQzUzMDA0ODRC RTEgLyogZ3Rlc3QuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCiAJCQkJQkNCOUU5RjExMTIz NUJERTAwQTEzN0UwIC8qIENvY29hLmZyYW1ld29yayBpbiBGcmFtZXdvcmtzICovLAogCQkJCUMw ODEyMjQ5MTNGQzFCMDMwMERDMzlBRSAvKiBXZWJLaXQuZnJhbWV3b3JrIGluIEZyYW1ld29ya3Mg Ki8sCiAJCQkJQkNBNjFEQjUxMTcwMEVGRDAwNDYwRDFFIC8qIFdlYktpdDIuZnJhbWV3b3JrIGlu IEZyYW1ld29ya3MgKi8sCiAJCQkJQkM5MDk2NEUxMjU1NjIwQzAwMDgzNzU2IC8qIEphdmFTY3Jp cHRDb3JlLmZyYW1ld29yayBpbiBGcmFtZXdvcmtzICovLAogCQkJCUMwMkI3ODU0MTI2NjEzQUUw MDI2QkYwRiAvKiBDYXJib24uZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCi0JCQkJRjNGQzNF RTMxMzY3OEI3MzAwMTI2QTY1IC8qIGxpYmd0ZXN0LmEgaW4gRnJhbWV3b3JrcyAqLywKIAkJCSk7 CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKQEAgLTMz Miw3ICszMzQsNyBAQAogCQkwOEZCNzc5REZFODQxNTVEQzAyQUFDMDcgLyogRXh0ZXJuYWwgRnJh bWV3b3JrcyBhbmQgTGlicmFyaWVzICovID0gewogCQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGls ZHJlbiA9ICgKLQkJCQlGM0ZDM0VFMjEzNjc4QjczMDAxMjZBNjUgLyogbGliZ3Rlc3QuYSAqLywK KwkJCQlCQzU1RjVERTE0QUMzQzUzMDA0ODRCRTEgLyogZ3Rlc3QuZnJhbWV3b3JrICovLAogCQkJ CUJDQjlFOUYwMTEyMzVCREUwMEExMzdFMCAvKiBDb2NvYS5mcmFtZXdvcmsgKi8sCiAJCQkJQkM5 MDk2NEQxMjU1NjIwQzAwMDgzNzU2IC8qIEphdmFTY3JpcHRDb3JlLmZyYW1ld29yayAqLywKIAkJ CQlDMDgxMjI0ODEzRkMxQjAzMDBEQzM5QUUgLyogV2ViS2l0LmZyYW1ld29yayAqLywKQEAgLTQ1 MSw2ICs0NTMsNyBAQAogCQkJCTgxQjUwMTkyMTQwRjIzMjMwMEQ5RUI1OCAvKiBTdHJpbmdCdWls ZGVyLmNwcCAqLywKIAkJCQlDMDEzNjNDNzEzQzM5OTczMDBFRjM5NjQgLyogU3RyaW5nT3BlcmF0 b3JzLmNwcCAqLywKIAkJCQkwQkNEODU2OTE0ODVDOThCMDBFQTIwMDMgLyogVGVtcG9yYXJ5Q2hh bmdlLmNwcCAqLywKKwkJCQlCQ0FGNDUwRTE0QUMxQkQ1MDA1MURERDcgLyogVmVjdG9yLmNwcCAq LywKIAkJCQlCQzkwOTY0QjEyNTU2MUJGMDAwODM3NTYgLyogVmVjdG9yQmFzaWMuY3BwICovLAog CQkJCTM3MjAwQjkxMTNBMTYyMzAwMDdBNEZBRCAvKiBWZWN0b3JSZXZlcnNlLmNwcCAqLywKIAkJ CSk7CkBAIC03MDcsNiArNzEwLDcgQEAKIAkJCQlCQzkwMUUyNDE0OTJBRENFMDA3NEE2NjcgLyog V0tDb25uZWN0aW9uLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTFBQTlFNTU5MTQ5ODBBOTkwMDAw MUE4QSAvKiBGdW5jdGlvbmFsLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUJDQUE0ODU4MTRBMDQ0 RDQwMDg4RkFDNCAvKiBFZGl0b3JDb21tYW5kcy5tbSBpbiBTb3VyY2VzICovLAorCQkJCUJDQUY0 NTEwMTRBQzFCRDYwMDUxRERENyAvKiBWZWN0b3IuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkpOwog CQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07CkluZGV4OiBU b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1ZlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9WZWN0b3IuY3BwCShyZXZpc2lvbiAwKQorKysgVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9WZWN0b3IuY3BwCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDEwNCBA QAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJ TkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9S IElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBU SEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1Ig QSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFM TCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NV UkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlIDx3dGYvVmVjdG9y Lmg+CisKK25hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKKworVEVTVChXVEZfVmVjdG9yLCBJdGVy YXRvcikKK3sKKyAgICBWZWN0b3I8aW50PiBpbnRWZWN0b3I7CisgICAgaW50VmVjdG9yLmFwcGVu ZCgxMCk7CisgICAgaW50VmVjdG9yLmFwcGVuZCgxMSk7CisgICAgaW50VmVjdG9yLmFwcGVuZCgx Mik7CisgICAgaW50VmVjdG9yLmFwcGVuZCgxMyk7CisKKyAgICBWZWN0b3I8aW50Pjo6aXRlcmF0 b3IgaXQgPSBpbnRWZWN0b3IuYmVnaW4oKTsKKyAgICBWZWN0b3I8aW50Pjo6aXRlcmF0b3IgZW5k ID0gaW50VmVjdG9yLmVuZCgpOworICAgIEVYUEVDVF9UUlVFKGVuZCAhPSBpdCk7CisKKyAgICBF WFBFQ1RfRVEoMTAsICppdCk7CisgICAgKytpdDsKKyAgICBFWFBFQ1RfRVEoMTEsICppdCk7Cisg ICAgKytpdDsKKyAgICBFWFBFQ1RfRVEoMTIsICppdCk7CisgICAgKytpdDsKKyAgICBFWFBFQ1Rf RVEoMTMsICppdCk7CisgICAgKytpdDsKKworICAgIEVYUEVDVF9UUlVFKGVuZCA9PSBpdCk7Cit9 CisKK1RFU1QoV1RGX1ZlY3RvciwgUmV2ZXJzZUl0ZXJhdG9yKQoreworICAgIFZlY3RvcjxpbnQ+ IGludFZlY3RvcjsKKyAgICBpbnRWZWN0b3IuYXBwZW5kKDEwKTsKKyAgICBpbnRWZWN0b3IuYXBw ZW5kKDExKTsKKyAgICBpbnRWZWN0b3IuYXBwZW5kKDEyKTsKKyAgICBpbnRWZWN0b3IuYXBwZW5k KDEzKTsKKworICAgIFZlY3RvcjxpbnQ+OjpyZXZlcnNlX2l0ZXJhdG9yIGl0ID0gaW50VmVjdG9y LnJiZWdpbigpOworICAgIFZlY3RvcjxpbnQ+OjpyZXZlcnNlX2l0ZXJhdG9yIGVuZCA9IGludFZl Y3Rvci5yZW5kKCk7CisgICAgRVhQRUNUX1RSVUUoZW5kICE9IGl0KTsKKworICAgIEVYUEVDVF9F USgxMywgKml0KTsKKyAgICArK2l0OworICAgIEVYUEVDVF9FUSgxMiwgKml0KTsKKyAgICArK2l0 OworICAgIEVYUEVDVF9FUSgxMSwgKml0KTsKKyAgICArK2l0OworICAgIEVYUEVDVF9FUSgxMCwg Kml0KTsKKyAgICArK2l0OworCisgICAgRVhQRUNUX1RSVUUoZW5kID09IGl0KTsKK30KKworI2lm IENPTVBJTEVSX1NVUFBPUlRTKENYWF9BVVRPX1RZUEUpICYmIENPTVBJTEVSX1NVUFBPUlRTKENY WF9SQU5HRV9GT1IpCisKKy8vIFZlY3Rvcjo6cmV2ZXJlc2VkKCkgY2FuIG9ubHkgYmUgdGVzdGVk IGlmIGF1dG8gYW5kIHJhbmdlLWZvciBzdXBwb3J0IGlzCisvLyBhdmFpbGlhYmxlLgorCitURVNU KFdURl9WZWN0b3IsIFJldmVyc2VkUHJveHkpCit7CisgICAgVmVjdG9yPGludD4gaW50VmVjdG9y OworICAgIGludFZlY3Rvci5hcHBlbmQoMTApOworICAgIGludFZlY3Rvci5hcHBlbmQoMTEpOwor ICAgIGludFZlY3Rvci5hcHBlbmQoMTIpOworICAgIGludFZlY3Rvci5hcHBlbmQoMTMpOworCisg ICAgVmVjdG9yPGludD4gdG9Db21wYXJlVG87CisgICAgZm9yIChhdXRvIHZhbHVlOiBpbnRWZWN0 b3IucmV2ZXJzZWQoKSkKKyAgICAgICAgdG9Db21wYXJlVG8uYXBwZW5kKHZhbHVlKTsKKworICAg IEVYUEVDVF9FUSgxMywgdG9Db21wYXJlVG9bMF0pOworICAgIEVYUEVDVF9FUSgxMiwgdG9Db21w YXJlVG9bMV0pOworICAgIEVYUEVDVF9FUSgxMSwgdG9Db21wYXJlVG9bMl0pOworICAgIEVYUEVD VF9FUSgxMCwgdG9Db21wYXJlVG9bM10pOworfQorCisjZW5kaWYKKworfSAvLyBuYW1lc3BhY2Ug VGVzdFdlYktpdEFQSQpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS93aW4vVGVzdFdlYktpdEFQ SS52Y3Byb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS93aW4vVGVzdFdlYktp dEFQSS52Y3Byb2oJKHJldmlzaW9uIDEwMzM0NikKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvd2lu L1Rlc3RXZWJLaXRBUEkudmNwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC02NTYsNiArNjU2LDEwIEBA CiAJCQkJCT4KIAkJCQk8L0ZpbGU+CiAJCQkJPEZpbGUKKwkJCQkJUmVsYXRpdmVQYXRoPSIuLlxU ZXN0c1xXVEZcVmVjdG9yLmNwcCIKKwkJCQkJPgorCQkJCTwvRmlsZT4KKwkJCQk8RmlsZQogCQkJ CQlSZWxhdGl2ZVBhdGg9Ii4uXFRlc3RzXFdURlxWZWN0b3JCYXNpYy5jcHAiCiAJCQkJCT4KIAkJ CQk8L0ZpbGU+Cg==