135877 2014-08-13 04:42:16 -0700 Make check-webkit-style run sort-export-file 2014-08-13 07:31:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rnagy webkit-unassigned commit-queue darin glenn ossy thorton oldest_to_newest 1028772 0 rnagy 2014-08-13 04:42:16 -0700 The idea came from this webkit-dev thread: https://lists.webkit.org/pipermail/webkit-dev/2014-July/026663.html 1028774 1 236517 rnagy 2014-08-13 05:04:35 -0700 Created attachment 236517 Proposed patch 1028788 2 236517 commit-queue 2014-08-13 07:31:44 -0700 Comment on attachment 236517 Proposed patch Clearing flags on attachment: 236517 Committed r172521: <http://trac.webkit.org/changeset/172521> 1028789 3 commit-queue 2014-08-13 07:31:46 -0700 All reviewed patches have been landed. Closing bug. 236517 2014-08-13 05:04:35 -0700 2014-08-13 07:31:43 -0700 Proposed patch 0001-Make-check-webkit-style-run-sort-export-file.patch text/plain 12970 rnagy RnJvbSBhYzQ2YTJiZjljYzJjODkzNGFmZjUxYzRhZjAwNjJlOTNhOGU1M2YxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSZW5hdG8gTmFneSA8bmFneS5yZW5hdG9Ac3R1ZC51LXN6ZWdl ZC5odT4KRGF0ZTogV2VkLCAxMyBBdWcgMjAxNCAxMzo1ODo1MCArMDIwMApTdWJqZWN0OiBbUEFU Q0hdIE1ha2UgY2hlY2std2Via2l0LXN0eWxlIHJ1biBzb3J0LWV4cG9ydC1maWxlCgotLS0KIFRv b2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgIDI5ICsr KysrKwogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5ICAgICAgICAgICAg fCAgMTMgKysrCiAuLi4vU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9leHBvcnRmaWxl LnB5ICB8ICA1MiArKysrKysrKysrCiAuLi4vd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvZXhwb3J0 ZmlsZV91bml0dGVzdC5weSB8IDExNSArKysrKysrKysrKysrKysrKysrKysKIDQgZmlsZXMgY2hh bmdlZCwgMjA5IGluc2VydGlvbnMoKykKIGNyZWF0ZSBtb2RlIDEwMDY0NCBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2V4cG9ydGZpbGUucHkKIGNyZWF0ZSBtb2RlIDEwMDY0 NCBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2V4cG9ydGZpbGVfdW5pdHRl c3QucHkKCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggYmYyMTQwMi4uOWNmMTAzMyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE0LTA4LTEzICBSZW5hdG8gTmFneSAg PG5hZ3kucmVuYXRvQHN0dWQudS1zemVnZWQuaHU+CisKKyAgICAgICAgTWFrZSBjaGVjay13ZWJr aXQtc3R5bGUgcnVuIHNvcnQtZXhwb3J0LWZpbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTg3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5 OgorICAgICAgICAoX2FsbF9jYXRlZ29yaWVzKToKKyAgICAgICAgKEZpbGVUeXBlKToKKyAgICAg ICAgKENoZWNrZXJEaXNwYXRjaGVyLl9maWxlX3R5cGUpOgorICAgICAgICAoQ2hlY2tlckRpc3Bh dGNoZXIuX2NyZWF0ZV9jaGVja2VyKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXJzL2V4cG9ydGZpbGUucHk6IEFkZGVkLgorICAgICAgICAoRXhwb3J0RmlsZUNoZWNr ZXIpOgorICAgICAgICAoRXhwb3J0RmlsZUNoZWNrZXIuX19pbml0X18pOgorICAgICAgICAoRXhw b3J0RmlsZUNoZWNrZXIuY2hlY2spOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvZXhwb3J0ZmlsZV91bml0dGVzdC5weTogQWRkZWQuCisgICAgICAgIChoYW5kbGVf c3R5bGVfZXJyb3IpOgorICAgICAgICAoTW9ja0Vycm9ySGFuZGxlcik6CisgICAgICAgIChNb2Nr RXJyb3JIYW5kbGVyLl9faW5pdF9fKToKKyAgICAgICAgKE1vY2tFcnJvckhhbmRsZXIudHVybl9v ZmZfbGluZV9maWx0ZXJpbmcpOgorICAgICAgICAoTW9ja0Vycm9ySGFuZGxlci5fX2NhbGxfXyk6 CisgICAgICAgIChFeHBvcnRGaWxlVGVzdCk6CisgICAgICAgIChFeHBvcnRGaWxlVGVzdC5zZXRV cCk6CisgICAgICAgIChFeHBvcnRGaWxlVGVzdC50ZWFyRG93bik6CisgICAgICAgIChFeHBvcnRG aWxlVGVzdC50ZXN0X3NvcnRlZCk6CisgICAgICAgIChFeHBvcnRGaWxlVGVzdC50ZXN0X25vbl9z b3J0ZWQpOgorICAgICAgICAoRXhwb3J0RmlsZVRlc3QudGVzdF9wYXJzZV9lcnJvcik6CisKIDIw MTQtMDgtMDQgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtHVEtdIHJ1bi1sYXVuY2hlciAtLWd0ayBpcyBicm9rZW4KZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvc3R5bGUvY2hlY2tlci5weQppbmRleCA3M2YzOTk1Li5mZWNmZTA0IDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5CkBAIC00Nyw2ICs0Nyw3IEBAIGZyb20gY2hl Y2tlcnMuanNvbmNoZWNrZXIgaW1wb3J0IEpTT05DaGVja2VyCiBmcm9tIGNoZWNrZXJzLmpzb25j aGVja2VyIGltcG9ydCBKU09OQ29udHJpYnV0b3JzQ2hlY2tlcgogZnJvbSBjaGVja2Vycy5tZXNz YWdlc2luIGltcG9ydCBNZXNzYWdlc0luQ2hlY2tlcgogZnJvbSBjaGVja2Vycy5wbmcgaW1wb3J0 IFBOR0NoZWNrZXIKK2Zyb20gY2hlY2tlcnMuZXhwb3J0ZmlsZSBpbXBvcnQgRXhwb3J0RmlsZUNo ZWNrZXIKIGZyb20gY2hlY2tlcnMucHl0aG9uIGltcG9ydCBQeXRob25DaGVja2VyCiBmcm9tIGNo ZWNrZXJzLnRlc3RfZXhwZWN0YXRpb25zIGltcG9ydCBUZXN0RXhwZWN0YXRpb25zQ2hlY2tlcgog ZnJvbSBjaGVja2Vycy50ZXh0IGltcG9ydCBUZXh0Q2hlY2tlcgpAQCAtMzA2LDYgKzMwNywxMiBA QCBfWE1MX0ZJTEVfRVhURU5TSU9OUyA9IFsKIAogX1BOR19GSUxFX0VYVEVOU0lPTiA9ICdwbmcn CiAKK19FWFBPUlRfRklMRV9QQVRIID0gWworICAgICdTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4 cC5pbicsCisgICAgJ1NvdXJjZS9XZWJLaXQvbWFjL1dlYktpdC5leHAnLAorICAgICdTb3VyY2Uv V2ViS2l0L21hYy9XZWJLaXQubWFjLmV4cCcsCisgICAgXQorCiBfQ01BS0VfRklMRV9FWFRFTlNJ T04gPSAnY21ha2UnCiAKICMgRmlsZXMgdG8gc2tpcCB0aGF0IGFyZSBsZXNzIG9idmlvdXMuCkBA IC0zNTYsNiArMzYzLDcgQEAgZGVmIF9hbGxfY2F0ZWdvcmllcygpOgogICAgIGNhdGVnb3JpZXMg PSBjYXRlZ29yaWVzLnVuaW9uKENoYW5nZUxvZ0NoZWNrZXIuY2F0ZWdvcmllcykKICAgICBjYXRl Z29yaWVzID0gY2F0ZWdvcmllcy51bmlvbihQTkdDaGVja2VyLmNhdGVnb3JpZXMpCiAgICAgY2F0 ZWdvcmllcyA9IGNhdGVnb3JpZXMudW5pb24oRmVhdHVyZURlZmluZXNDaGVja2VyLmNhdGVnb3Jp ZXMpCisgICAgY2F0ZWdvcmllcyA9IGNhdGVnb3JpZXMudW5pb24oRXhwb3J0RmlsZUNoZWNrZXIu Y2F0ZWdvcmllcykKIAogICAgICMgRklYTUU6IENvbnNpZGVyIGFkZGluZyBhbGwgb2YgdGhlIHBl cDggY2F0ZWdvcmllcy4gIFNpbmNlIHRoZXkKICAgICAjICAgICAgICBhcmUgbm90IHRvbyBtZWFu aW5nZnVsIGZvciBkb2N1bWVudGF0aW9uIHB1cnBvc2VzLCBmb3IKQEAgLTUwNiw2ICs1MTQsNyBA QCBjbGFzcyBGaWxlVHlwZToKICAgICBYQ09ERVBST0ogPSAxMAogICAgIENNQUtFID0gMTEKICAg ICBGRUFUVVJFREVGSU5FUyA9IDEyCisgICAgRVhQT1JURklMRSA9IDEzCiAKIGNsYXNzIENoZWNr ZXJEaXNwYXRjaGVyKG9iamVjdCk6CiAKQEAgLTU4NSw2ICs1OTQsOCBAQCBjbGFzcyBDaGVja2Vy RGlzcGF0Y2hlcihvYmplY3QpOgogICAgICAgICAgICAgcmV0dXJuIEZpbGVUeXBlLlhDT0RFUFJP SgogICAgICAgICBlbGlmIGZpbGVfZXh0ZW5zaW9uID09IF9QTkdfRklMRV9FWFRFTlNJT046CiAg ICAgICAgICAgICByZXR1cm4gRmlsZVR5cGUuUE5HCisgICAgICAgIGVsaWYgZmlsZV9wYXRoIGlu IF9FWFBPUlRfRklMRV9QQVRIOgorICAgICAgICAgICAgcmV0dXJuIEZpbGVUeXBlLkVYUE9SVEZJ TEUKICAgICAgICAgZWxpZiAoKGZpbGVfZXh0ZW5zaW9uID09IF9DTUFLRV9GSUxFX0VYVEVOU0lP Tikgb3Igb3MucGF0aC5iYXNlbmFtZShmaWxlX3BhdGgpID09ICdDTWFrZUxpc3RzLnR4dCcpOgog ICAgICAgICAgICAgcmV0dXJuIEZpbGVUeXBlLkNNQUtFCiAgICAgICAgIGVsaWYgKChub3QgZmls ZV9leHRlbnNpb24gYW5kIG9zLnBhdGguam9pbigiVG9vbHMiLCAiU2NyaXB0cyIpIGluIGZpbGVf cGF0aCkgb3IKQEAgLTYyOSw2ICs2NDAsOCBAQCBjbGFzcyBDaGVja2VyRGlzcGF0Y2hlcihvYmpl Y3QpOgogICAgICAgICAgICAgY2hlY2tlciA9IFhjb2RlUHJvamVjdEZpbGVDaGVja2VyKGZpbGVf cGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9yKQogICAgICAgICBlbGlmIGZpbGVfdHlwZSA9PSBGaWxl VHlwZS5QTkc6CiAgICAgICAgICAgICBjaGVja2VyID0gUE5HQ2hlY2tlcihmaWxlX3BhdGgsIGhh bmRsZV9zdHlsZV9lcnJvcikKKyAgICAgICAgZWxpZiBmaWxlX3R5cGUgPT0gRmlsZVR5cGUuRVhQ T1JURklMRToKKyAgICAgICAgICAgIGNoZWNrZXIgPSBFeHBvcnRGaWxlQ2hlY2tlcihmaWxlX3Bh dGgsIGhhbmRsZV9zdHlsZV9lcnJvcikKICAgICAgICAgZWxpZiBmaWxlX3R5cGUgPT0gRmlsZVR5 cGUuQ01BS0U6CiAgICAgICAgICAgICBjaGVja2VyID0gQ01ha2VDaGVja2VyKGZpbGVfcGF0aCwg aGFuZGxlX3N0eWxlX2Vycm9yKQogICAgICAgICBlbGlmIGZpbGVfdHlwZSA9PSBGaWxlVHlwZS5U RVhUOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9l eHBvcnRmaWxlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9leHBv cnRmaWxlLnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjRiMWFmMDYKLS0t IC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2V4 cG9ydGZpbGUucHkKQEAgLTAsMCArMSw1MiBAQAorIyBDb3B5cmlnaHQgKEMpIDIwMTQgVW5pdmVy c2l0eSBvZiBTemVnZWQKKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0Ogor IyAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92 ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkg Zm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhl CisjICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0 aCB0aGUgZGlzdHJpYnV0aW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRI RSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJUyIgQU5EIEFOWSBF WFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlU RUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRO RVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZF TlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxF IEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhFTVBM QVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1J VEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NT IE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBI T1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisj IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCisKKyIiIkNhbGwgVG9vbHMvU2NyaXB0cy9zb3J0LWV4cG9ydC1maWxlIHdp dGggLS1kcnktcnVuIGZvciBjaGVja2luZyBzdHlsZSIiIgorCitpbXBvcnQgb3MKK2ltcG9ydCBz dWJwcm9jZXNzCitpbXBvcnQgb3MucGF0aAorZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmZp bGVzeXN0ZW0gaW1wb3J0IEZpbGVTeXN0ZW0KK2Zyb20gd2Via2l0cHkuY29tbW9uLndlYmtpdF9m aW5kZXIgaW1wb3J0IFdlYktpdEZpbmRlcgorCisKK2NsYXNzIEV4cG9ydEZpbGVDaGVja2VyKG9i amVjdCk6CisKKyAgICBjYXRlZ29yaWVzID0gc2V0KFsnbGlzdC9vcmRlciddKQorCisgICAgZGVm IF9faW5pdF9fKHNlbGYsIGZpbGVfcGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9yKToKKyAgICAgICAg c2VsZi5fZmlsZXN5c3RlbSA9IEZpbGVTeXN0ZW0oKQorICAgICAgICBzZWxmLl93ZWJraXRfYmFz ZSA9IFdlYktpdEZpbmRlcihzZWxmLl9maWxlc3lzdGVtKS53ZWJraXRfYmFzZSgpCisgICAgICAg IHNlbGYuX2ZpbGVfcGF0aCA9IGZpbGVfcGF0aAorICAgICAgICBzZWxmLl9oYW5kbGVfc3R5bGVf ZXJyb3IgPSBoYW5kbGVfc3R5bGVfZXJyb3IKKyAgICAgICAgc2VsZi5faGFuZGxlX3N0eWxlX2Vy cm9yLnR1cm5fb2ZmX2xpbmVfZmlsdGVyaW5nKCkKKworICAgIGRlZiBjaGVjayhzZWxmLCBpbmxp bmU9Tm9uZSk6CisgICAgICAgIG9zLmNoZGlyKHNlbGYuX3dlYmtpdF9iYXNlKQorICAgICAgICBy ZXRjb2RlID0gc3VicHJvY2Vzcy5jYWxsKFsiVG9vbHMvU2NyaXB0cy9zb3J0LWV4cG9ydC1maWxl Iiwgc2VsZi5fZmlsZV9wYXRoLCAiLS12ZXJib3NlIiwgIi0tZHJ5LXJ1biJdLCBzdGRvdXQ9c3Vi cHJvY2Vzcy5QSVBFLCBzdGRlcnI9c3VicHJvY2Vzcy5QSVBFKQorICAgICAgICBpZiByZXRjb2Rl ID09IDE6CisgICAgICAgICAgICBzZWxmLl9oYW5kbGVfc3R5bGVfZXJyb3IoMCwgJ2xpc3Qvb3Jk ZXInLCA1LCAiUGFyc2UgZXJyb3IgZHVyaW5nIHByb2Nlc3NpbmcgJXMsIHVzZSBUb29scy9TY3Jp cHRzL3NvcnQtZXhwb3J0LWZpbGVzIGZvciBkZXRhaWxzIiAlIHNlbGYuX2ZpbGVfcGF0aCkKKyAg ICAgICAgZWxpZiByZXRjb2RlID09IDI6CisgICAgICAgICAgICBzZWxmLl9oYW5kbGVfc3R5bGVf ZXJyb3IoMCwgJ2xpc3Qvb3JkZXInLCA1LCAiJXMgc2hvdWxkIGJlIHNvcnRlZCwgdXNlIFRvb2xz L1NjcmlwdHMvc29ydC1leHBvcnQtZmlsZSBzY3JpcHQiICUgc2VsZi5fZmlsZV9wYXRoKQorICAg ICAgICBlbGlmIHJldGNvZGUgIT0gMDoKKyAgICAgICAgICAgIHNlbGYuX2hhbmRsZV9zdHlsZV9l cnJvcigwLCAnbGlzdC9vcmRlcicsIDUsICJVbmV4cGVjdGVkIGVycm9yIGR1cmluZyBwcm9jZXNz aW5nICVzLCBwbGVhc2UgZmlsZSBhIGJ1ZyByZXBvcnQgYWdhaW5zdCBUb29scy9TY3JpcHRzL3Nv cnQtZXhwb3J0LWZpbGUiICUgc2VsZi5fZmlsZV9wYXRoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9leHBvcnRmaWxlX3VuaXR0ZXN0LnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9leHBvcnRmaWxlX3VuaXR0ZXN0LnB5 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmZkZWNiYjcKLS0tIC9kZXYvbnVs bAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2V4cG9ydGZpbGVf dW5pdHRlc3QucHkKQEAgLTAsMCArMSwxMTUgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDE0IFVuaXZl cnNpdHkgb2YgU3plZ2VkCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyMgYXJlIG1ldDoK KyMgMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJv dmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRo ZQorIyAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdp dGggdGhlIGRpc3RyaWJ1dGlvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBU SEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkg RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1J VEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklU TkVTUyBGT1IKKyMgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVW RU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1Q TEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElN SVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T UyBPRiBVU0UsCisjIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikg SE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVS IElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQor IyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgorCitpbXBvcnQgb3MKK2ltcG9ydCB1bml0dGVzdDIgYXMgdW5pdHRlc3QK K2Zyb20gd2Via2l0cHkuc3R5bGUuY2hlY2tlcnMuZXhwb3J0ZmlsZSBpbXBvcnQgRXhwb3J0Rmls ZUNoZWNrZXIKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVtIGltcG9ydCBG aWxlU3lzdGVtCisKK19zb3J0ZWRfZmlsZV9jb250ZW50cyA9IHUiIiIub2JqY19jbGFzc19uYW1l X1dlYlRleHRJdGVyYXRvcgorLm9iamNfY2xhc3NfbmFtZV9XZWJVc2VyQ29udGVudFVSTFBhdHRl cm4KKy5vYmpjX2NsYXNzX25hbWVfV2ViVmlldworX1dlYkFjdGlvbkJ1dHRvbktleQorX1dlYkFj dGlvbkVsZW1lbnRLZXkKK19XZWJBY3Rpb25Gb3JtS2V5CisiIiIKKworX25vbl9zb3J0ZWRfZmls ZV9jb250ZW50cyA9IHUiIiIub2JqY19jbGFzc19uYW1lX1dlYlRleHRJdGVyYXRvcgorLm9iamNf Y2xhc3NfbmFtZV9XZWJVc2VyQ29udGVudFVSTFBhdHRlcm4KK19XZWJBY3Rpb25FbGVtZW50S2V5 Cisub2JqY19jbGFzc19uYW1lX1dlYlZpZXcKK19XZWJBY3Rpb25CdXR0b25LZXkKK19XZWJBY3Rp b25Gb3JtS2V5CisiIiIKKworX3BhcnNlX2Vycm9yX2ZpbGVfY29udGVudHMgPSB1IiIiLm9iamNf Y2xhc3NfbmFtZV9XZWJUZXh0SXRlcmF0b3Iub2JqY19jbGFzc19uYW1lX1dlYlVzZXJDb250ZW50 VVJMUGF0dGVybl9XZWJBY3Rpb25FbGVtZW50S2V5IiIiCisKKworZGVmIGhhbmRsZV9zdHlsZV9l cnJvcihtb2NrX2Vycm9yX2hhbmRsZXIsIGxpbmVfbnVtYmVyLCBjYXRlZ29yeSwgY29uZmlkZW5j ZSwgbWVzc2FnZSk6CisgICAgICAgIG1vY2tfZXJyb3JfaGFuZGxlci5oYWRfZXJyb3IgPSBUcnVl CisgICAgICAgIGVycm9yID0gKGxpbmVfbnVtYmVyLCBjYXRlZ29yeSwgY29uZmlkZW5jZSwgbWVz c2FnZSkKKyAgICAgICAgbW9ja19lcnJvcl9oYW5kbGVyLmVycm9ycy5hcHBlbmQoZXJyb3IpCisK KworY2xhc3MgTW9ja0Vycm9ySGFuZGxlcihvYmplY3QpOgorICAgIGRlZiBfX2luaXRfXyhzZWxm LCBoYW5kbGVfc3R5bGVfZXJyb3IpOgorICAgICAgICBzZWxmLnR1cm5lZF9vZmZfZmlsdGVyaW5n ID0gRmFsc2UKKyAgICAgICAgc2VsZi5faGFuZGxlX3N0eWxlX2Vycm9yID0gaGFuZGxlX3N0eWxl X2Vycm9yCisKKyAgICBkZWYgdHVybl9vZmZfbGluZV9maWx0ZXJpbmcoc2VsZik6CisgICAgICAg IHNlbGYudHVybmVkX29mZl9maWx0ZXJpbmcgPSBUcnVlCisKKyAgICBkZWYgX19jYWxsX18oc2Vs ZiwgbGluZV9udW1iZXIsIGNhdGVnb3J5LCBjb25maWRlbmNlLCBtZXNzYWdlKToKKyAgICAgICAg c2VsZi5faGFuZGxlX3N0eWxlX2Vycm9yKHNlbGYsIGxpbmVfbnVtYmVyLCBjYXRlZ29yeSwgY29u ZmlkZW5jZSwgbWVzc2FnZSkKKyAgICAgICAgcmV0dXJuIFRydWUKKworCitjbGFzcyBFeHBvcnRG aWxlVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CisKKyAgICBkZWYgc2V0VXAoc2VsZik6CisgICAg ICAgIHNlbGYuX2ZpbGVzeXN0ZW0gPSBGaWxlU3lzdGVtKCkKKyAgICAgICAgc2VsZi5fdGVtcF9k aXIgPSBzdHIoc2VsZi5fZmlsZXN5c3RlbS5ta2R0ZW1wKHN1ZmZpeD0iZXhwb3J0ZmlsZXMiKSkK KyAgICAgICAgc2VsZi5fb2xkX2N3ZCA9IHNlbGYuX2ZpbGVzeXN0ZW0uZ2V0Y3dkKCkKKyAgICAg ICAgc2VsZi5fZmlsZXN5c3RlbS5jaGRpcihzZWxmLl90ZW1wX2RpcikKKyAgICAgICAgc2VsZi5f ZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUob3MucGF0aC5qb2luKHNlbGYuX3RlbXBfZGlyLCAi c29ydGVkX2ZpbGUuZXhwLmluIiksIF9zb3J0ZWRfZmlsZV9jb250ZW50cykKKyAgICAgICAgc2Vs Zi5fZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUob3MucGF0aC5qb2luKHNlbGYuX3RlbXBfZGly LCAibm9uX3NvcnRlZF9maWxlLmV4cC5pbiIpLCBfbm9uX3NvcnRlZF9maWxlX2NvbnRlbnRzKQor ICAgICAgICBzZWxmLl9maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShvcy5wYXRoLmpvaW4oc2Vs Zi5fdGVtcF9kaXIsICJwYXJzZV9lcnJvcl9maWxlLmV4cC5pbiIpLCBfcGFyc2VfZXJyb3JfZmls ZV9jb250ZW50cykKKworICAgIGRlZiB0ZWFyRG93bihzZWxmKToKKyAgICAgICAgc2VsZi5fZmls ZXN5c3RlbS5ybXRyZWUoc2VsZi5fdGVtcF9kaXIpCisgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0u Y2hkaXIoc2VsZi5fb2xkX2N3ZCkKKworICAgIGRlZiB0ZXN0X3NvcnRlZChzZWxmKToKKyAgICAg ICAgIiIiIFRlc3Qgc29ydGVkIGZpbGUuICIiIgorCisgICAgICAgIGZpbGVfcGF0aCA9IG9zLnBh dGguam9pbihzZWxmLl90ZW1wX2RpciwgInNvcnRlZF9maWxlLmV4cC5pbiIpCisgICAgICAgIGVy cm9yX2hhbmRsZXIgPSBNb2NrRXJyb3JIYW5kbGVyKGhhbmRsZV9zdHlsZV9lcnJvcikKKyAgICAg ICAgZXJyb3JfaGFuZGxlci5lcnJvcnMgPSBbXQorICAgICAgICBlcnJvcl9oYW5kbGVyLmhhZF9l cnJvciA9IEZhbHNlCisgICAgICAgIGNoZWNrZXIgPSBFeHBvcnRGaWxlQ2hlY2tlcihmaWxlX3Bh dGgsIGVycm9yX2hhbmRsZXIpCisgICAgICAgIGNoZWNrZXIuY2hlY2soKQorICAgICAgICBzZWxm LmFzc2VydEZhbHNlKGVycm9yX2hhbmRsZXIuaGFkX2Vycm9yKQorCisgICAgZGVmIHRlc3Rfbm9u X3NvcnRlZChzZWxmKToKKyAgICAgICAgIiIiIFRlc3Qgbm9uIHNvcnRlZCBmaWxlLiAiIiIKKwor ICAgICAgICBmaWxlX3BhdGggPSBvcy5wYXRoLmpvaW4oc2VsZi5fdGVtcF9kaXIsICJub25fc29y dGVkX2ZpbGUuZXhwLmluIikKKyAgICAgICAgZXJyb3JfaGFuZGxlciA9IE1vY2tFcnJvckhhbmRs ZXIoaGFuZGxlX3N0eWxlX2Vycm9yKQorICAgICAgICBlcnJvcl9oYW5kbGVyLmVycm9ycyA9IFtd CisgICAgICAgIGVycm9yX2hhbmRsZXIuaGFkX2Vycm9yID0gRmFsc2UKKyAgICAgICAgY2hlY2tl ciA9IEV4cG9ydEZpbGVDaGVja2VyKGZpbGVfcGF0aCwgZXJyb3JfaGFuZGxlcikKKyAgICAgICAg Y2hlY2tlci5jaGVjaygpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShlcnJvcl9oYW5kbGVyLmhh ZF9lcnJvcikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChlcnJvcl9oYW5kbGVyLmVycm9yc1sw XSwgKDAsICdsaXN0L29yZGVyJywgNSwgZmlsZV9wYXRoICsgIiBzaG91bGQgYmUgc29ydGVkLCB1 c2UgVG9vbHMvU2NyaXB0cy9zb3J0LWV4cG9ydC1maWxlIHNjcmlwdCIpKQorCisgICAgZGVmIHRl c3RfcGFyc2VfZXJyb3Ioc2VsZik6CisgICAgICAgICIiIiBUZXN0IHBhcnNlIGVycm9yIGZpbGUu ICIiIgorCisgICAgICAgIGZpbGVfcGF0aCA9IG9zLnBhdGguam9pbihzZWxmLl90ZW1wX2Rpciwg InBhcnNlX2Vycm9yX2ZpbGUuZXhwLmluIikKKyAgICAgICAgZXJyb3JfaGFuZGxlciA9IE1vY2tF cnJvckhhbmRsZXIoaGFuZGxlX3N0eWxlX2Vycm9yKQorICAgICAgICBlcnJvcl9oYW5kbGVyLmVy cm9ycyA9IFtdCisgICAgICAgIGVycm9yX2hhbmRsZXIuaGFkX2Vycm9yID0gRmFsc2UKKyAgICAg ICAgY2hlY2tlciA9IEV4cG9ydEZpbGVDaGVja2VyKGZpbGVfcGF0aCwgZXJyb3JfaGFuZGxlcikK KyAgICAgICAgY2hlY2tlci5jaGVjaygpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShlcnJvcl9o YW5kbGVyLmhhZF9lcnJvcikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChlcnJvcl9oYW5kbGVy LmVycm9yc1swXSwgKDAsICdsaXN0L29yZGVyJywgNSwgIlBhcnNlIGVycm9yIGR1cmluZyBwcm9j ZXNzaW5nICIgKyBmaWxlX3BhdGggKyAiLCB1c2UgVG9vbHMvU2NyaXB0cy9zb3J0LWV4cG9ydC1m aWxlcyBmb3IgZGV0YWlscyIpKQotLSAKMS45LjEKCg==