94814 2012-08-23 07:46:38 -0700 Make it possible to build WebKit with Python 3 (and 2) 2012-08-24 01:44:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 94907 94910 0 gladhorn webkit-unassigned abarth dpranke hausmann rniwa webkit.review.bot oldest_to_newest 702979 0 gladhorn 2012-08-23 07:46:38 -0700 Build Qt port with Python 3 (and 2) 702982 1 160162 gladhorn 2012-08-23 07:49:42 -0700 Created attachment 160162 Patch 703322 2 hausmann 2012-08-23 13:46:20 -0700 CCing some Python gurus :) EWS seems optimistic that this doesn't break at least the python2 based builds. 703330 3 160162 rniwa 2012-08-23 13:58:28 -0700 Comment on attachment 160162 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160162&action=review > Source/WebCore/inspector/CodeGeneratorInspector.py:90 > + import sys I think we'd rather import this at the beginning of the file. 703396 4 rniwa 2012-08-23 14:43:30 -0700 If you're not a committer yet, then please ask someone to land it on behalf of you or set cq? flag. 703746 5 160162 hausmann 2012-08-23 22:21:49 -0700 Comment on attachment 160162 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160162&action=review I can take care of the landing (and will remove the Qt part in ChangeLog) >> Source/WebCore/inspector/CodeGeneratorInspector.py:90 >> + import sys > > I think we'd rather import this at the beginning of the file. Seems indeed strange in the presence of "import sys" in line 32. 703755 6 hausmann 2012-08-23 22:37:54 -0700 Committed r126542: <http://trac.webkit.org/changeset/126542> 703813 7 mrowe 2012-08-23 23:30:14 -0700 This change breaks building projects dependent on WebKit2 on OS X. messages.py and parser.py live alongside each other inside WebKit2.framework on OS X, and there is no "webkit2" module to import them from. Can you please either revert that part of this change, or make other changes that will allow "import parser" to succeed? 703820 8 webkit.review.bot 2012-08-23 23:38:18 -0700 Re-opened since this is blocked by 94907 703850 9 mrowe 2012-08-24 00:23:42 -0700 Bug 94910 has a simple patch that, when landed, will allow this patch to be landed without breaking anything on OS X. 703856 10 mrowe 2012-08-24 00:41:01 -0700 That patch is now landed. Feel free to reland this patch as it will no longer break us on OS X! 703882 11 hausmann 2012-08-24 01:39:20 -0700 (In reply to comment #10) > That patch is now landed. Feel free to reland this patch as it will no longer break us on OS X! Wonderful, thanks! Will reland. 703889 12 hausmann 2012-08-24 01:44:10 -0700 Committed r126558: <http://trac.webkit.org/changeset/126558> 160162 2012-08-23 07:49:42 -0700 2012-08-23 22:21:49 -0700 Patch bug-94814-20120823164938.patch text/plain 11421 gladhorn U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NhOWM1ODk5MjFlMDE2 NGE2ZGFhYWVlNDFlNjQ3NjIyNjVjNWUyNy4uNmUyZWRiYzQ0NzcxZmI5NDJiMWM0ZTFkODA1M2Iz ZjhkZjNhNWVmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA4LTIzICBGcmVk ZXJpayBHbGFkaG9ybiAgPGdsYWRob3JuQGtkZS5vcmc+CisKKyAgICAgICAgQnVpbGQgUXQgcG9y dCB3aXRoIFB5dGhvbiAzIChhbmQgMikKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTk0ODE0CisKKyAgICAgICAgRXhjZXB0aW9ucyBuZWVkIGEgaGFjayB0 byB3b3JrIHdpdGggYm90aC4KKyAgICAgICAgc3RyaW5nLmpvaW4gd2FzIGFscmVhZHkgZGVwcmVj YXRlZCBpbiBQeXRob24gMi4KKyAgICAgICAgUmVsYXRpdmUgaW1wb3J0cyBhcmUgbm8gbG9uZ2Vy IHN1cHBvcnRlZCwgdXNlIHBhY2thZ2UgbmFtZSBpbnN0ZWFkLgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJ bnNwZWN0b3IucHk6CisgICAgICAgIChFbnVtQ29uc3RhbnRzLmdldF9lbnVtX2NvbnN0YW50X2Nv ZGUpOgorICAgICAgICAoVHlwZUJpbmRpbmdzLmNyZWF0ZV90eXBlX2RlY2xhcmF0aW9uXy5FbnVt QmluZGluZy5nZXRfY29kZV9nZW5lcmF0b3IuQ29kZUdlbmVyYXRvci5nZW5lcmF0ZV90eXBlX2J1 aWxkZXIpOgorICAgICAgICAoR2VuZXJhdG9yLmdvKToKKyAgICAgICAgKEdlbmVyYXRvci5wcm9j ZXNzX2V2ZW50KToKKyAgICAgICAgKEdlbmVyYXRvci5wcm9jZXNzX2NvbW1hbmQpOgorCiAyMDEy LTA4LTIyICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgogCiAgICAgICAg IEJ1aWxkIGZpeCBmb3IgV2luQ0UgYWZ0ZXIgcjEyNjM1OS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA1NWZlZjU5 ZGE2ZDBlMWJmMzY4NTNlZDJiMDQ2ODMzNTVhNmUwM2IyLi4yM2M3OWNiZDExNmQ5YTU5ZjlkODlh YTI4Nzc1MjQ4MzkwZDYxZDRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDgt MjMgIEZyZWRlcmlrIEdsYWRob3JuICA8Z2xhZGhvcm5Aa2RlLm9yZz4KKworICAgICAgICBCdWls ZCBRdCBwb3J0IHdpdGggUHl0aG9uIDMgKGFuZCAyKQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4MTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBFeGNlcHRpb25zIG5lZWQgYSBoYWNrIHRvIHdvcmsgd2l0 aCBib3RoLgorICAgICAgICBzdHJpbmcuam9pbiB3YXMgYWxyZWFkeSBkZXByZWNhdGVkIGluIFB5 dGhvbiAyLgorICAgICAgICBSZWxhdGl2ZSBpbXBvcnRzIGFyZSBubyBsb25nZXIgc3VwcG9ydGVk LCB1c2UgcGFja2FnZSBuYW1lIGluc3RlYWQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdDIv bWVzc2FnZXMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXQyL3BhcnNlci5weToKKwogMjAx Mi0wOC0yMyAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNv bT4KIAogICAgICAgICBbV0syXSBSZWZhY3RvcmluZzogV2ViQmFja0ZvcndhcmRMaXN0IGdldHRl cnMgc2hvdWxkIGJlIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv Q29kZUdlbmVyYXRvckluc3BlY3Rvci5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2Rl R2VuZXJhdG9ySW5zcGVjdG9yLnB5CmluZGV4IGY0NmVkMzU1ZjFmNGE5NzY3ZWM0NjcwMDZiZmUz NjQwZjQyNTc3MGYuLmI1ZDhmNmY2ZDQ1M2UzZDhhYWZhMTg2MDc4OWZmMjRjOWExMzhmMTAgMTAw NzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9y LnB5CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9y LnB5CkBAIC0zMiw3ICszMiw2IEBAIGltcG9ydCBvcy5wYXRoCiBpbXBvcnQgc3lzCiBpbXBvcnQg c3RyaW5nCiBpbXBvcnQgb3B0cGFyc2UKLWZyb20gc3RyaW5nIGltcG9ydCBqb2luCiB0cnk6CiAg ICAgaW1wb3J0IGpzb24KIGV4Y2VwdCBJbXBvcnRFcnJvcjoKQEAgLTg2LDggKzg1LDExIEBAIHRy eToKICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCJPdXRwdXQgLmggZGlyZWN0b3J5IG11c3QgYmUg c3BlY2lmaWVkIikKICAgICBpZiBub3Qgb3V0cHV0X2NwcF9kaXJuYW1lOgogICAgICAgICByYWlz ZSBFeGNlcHRpb24oIk91dHB1dCAuY3BwIGRpcmVjdG9yeSBtdXN0IGJlIHNwZWNpZmllZCIpCi1l eGNlcHQgRXhjZXB0aW9uLCBlOgotICAgIHN5cy5zdGRlcnIud3JpdGUoIkZhaWxlZCB0byBwYXJz ZSBjb21tYW5kLWxpbmUgYXJndW1lbnRzOiAlc1xuXG4iICUgZSkKK2V4Y2VwdCBFeGNlcHRpb246 CisgICAgIyBXb3JrIHdpdGggcHl0aG9uIDIgYW5kIDMgaHR0cDovL2RvY3MucHl0aG9uLm9yZy9w eTNrL2hvd3RvL3B5cG9ydGluZy5odG1sCisgICAgaW1wb3J0IHN5cworICAgIGV4YyA9IHN5cy5l eGNfaW5mbygpWzFdCisgICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIHRvIHBhcnNlIGNvbW1h bmQtbGluZSBhcmd1bWVudHM6ICVzXG5cbiIgJSBleGMpCiAgICAgc3lzLnN0ZGVyci53cml0ZSgi VXNhZ2U6IDxzY3JpcHQ+IEluc3BlY3Rvci5qc29uIC0tb3V0cHV0X2hfZGlyIDxvdXRwdXRfaGVh ZGVyX2Rpcj4gLS1vdXRwdXRfY3BwX2RpciA8b3V0cHV0X2NwcF9kaXI+XG4iKQogICAgIGV4aXQo MSkKIApAQCAtNzk3LDcgKzc5OSw3IEBAIGNsYXNzIEVudW1Db25zdGFudHM6CiAgICAgICAgIG91 dHB1dCA9IFtdCiAgICAgICAgIGZvciBpdGVtIGluIGNscy5jb25zdGFudHNfOgogICAgICAgICAg ICAgb3V0cHV0LmFwcGVuZCgiICAgIFwiIiArIGl0ZW0gKyAiXCIiKQotICAgICAgICByZXR1cm4g am9pbihvdXRwdXQsICIsXG4iKSArICJcbiIKKyAgICAgICAgcmV0dXJuICIsXG4iLmpvaW4ob3V0 cHV0KSArICJcbiIKIAogCiAjIFR5cGVidWlsZGVyIGNvZGUgaXMgZ2VuZXJhdGVkIGluIHNldmVy YWwgcGFzc2VzOiBmaXJzdCB0eXBlZGVmcywgdGhlbiBvdGhlciBjbGFzc2VzLgpAQCAtOTI2LDcg KzkyOCw3IEBAIGNsYXNzIFR5cGVCaW5kaW5nczoKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBmb3IgZW51bV9pdGVtIGluIGVudW06CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGVudW1fcG9zID0gRW51bUNvbnN0YW50cy5hZGRfY29u c3RhbnQoZW51bV9pdGVtKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb25kaXRpb25fbGlzdC5hcHBlbmQoInMgPT0gXCIlc1wiIiAlIGVudW1faXRlbSkKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YWxpZGF0b3Jfd3JpdGVyLm5l d2xpbmUoIiAgICBBU1NFUlQoJXMpO1xuIiAlIGpvaW4oY29uZGl0aW9uX2xpc3QsICIgfHwgIikp CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmFsaWRhdG9yX3dyaXRl ci5uZXdsaW5lKCIgICAgQVNTRVJUKCVzKTtcbiIgJSAiIHx8ICIuam9pbihjb25kaXRpb25fbGlz dCkpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YWxpZGF0b3Jfd3JpdGVy Lm5ld2xpbmUoIn1cbiIpCiAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlm IGRvbWFpbl9ndWFyZDoKQEAgLTI3MDAsNyArMjcwMiw3IEBAIGNsYXNzIEdlbmVyYXRvcjoKICAg ICAgICAgICAgIEdlbmVyYXRvci5mcm9udGVuZF9kb21haW5fY2xhc3NfbGluZXMuYXBwZW5kKFRl bXBsYXRlcy5mcm9udGVuZF9kb21haW5fY2xhc3Muc3Vic3RpdHV0ZShOb25lLAogICAgICAgICAg ICAgICAgIGRvbWFpbkNsYXNzTmFtZT1kb21haW5fbmFtZSwKICAgICAgICAgICAgICAgICBkb21h aW5GaWVsZE5hbWU9ZG9tYWluX25hbWVfbG93ZXIsCi0gICAgICAgICAgICAgICAgZnJvbnRlbmRE b21haW5NZXRob2REZWNsYXJhdGlvbnM9am9pbihmbGF0dGVuX2xpc3QoZnJvbnRlbmRfbWV0aG9k X2RlY2xhcmF0aW9uX2xpbmVzKSwgIiIpKSkKKyAgICAgICAgICAgICAgICBmcm9udGVuZERvbWFp bk1ldGhvZERlY2xhcmF0aW9ucz0iIi5qb2luKGZsYXR0ZW5fbGlzdChmcm9udGVuZF9tZXRob2Rf ZGVjbGFyYXRpb25fbGluZXMpKSkpCiAKICAgICAgICAgICAgIGFnZW50X2ludGVyZmFjZV9uYW1l ID0gQ2FwaXRhbGl6ZXIubG93ZXJfY2FtZWxfY2FzZV90b191cHBlcihkb21haW5fbmFtZSkgKyAi Q29tbWFuZEhhbmRsZXIiCiAgICAgICAgICAgICBHZW5lcmF0b3IuYmFja2VuZF9hZ2VudF9pbnRl cmZhY2VfbGlzdC5hcHBlbmQoIiAgICBjbGFzcyAlcyB7XG4iICUgYWdlbnRfaW50ZXJmYWNlX25h bWUpCkBAIC0yNzY5LDE1ICsyNzcxLDE1IEBAIGNsYXNzIEdlbmVyYXRvcjoKICAgICAgICAgICAg ICAgICBiYWNrZW5kX2pzX2V2ZW50X3BhcmFtX2xpc3QuYXBwZW5kKCJcIiVzXCIiICUgcGFyYW1l dGVyX25hbWUpCiAgICAgICAgICAgICBtZXRob2RfbGluZV9saXN0LmFwcGVuZCgiICAgICVzTWVz c2FnZS0+c2V0T2JqZWN0KFwicGFyYW1zXCIsIHBhcmFtc09iamVjdCk7XG4iICUgZXZlbnRfbmFt ZSkKICAgICAgICAgZnJvbnRlbmRfbWV0aG9kX2RlY2xhcmF0aW9uX2xpbmVzLmFwcGVuZCgKLSAg ICAgICAgICAgICIgICAgICAgIHZvaWQgJXMoJXMpO1xuIiAlIChldmVudF9uYW1lLCBqb2luKHBh cmFtZXRlcl9saXN0LCAiLCAiKSkpCisgICAgICAgICAgICAiICAgICAgICB2b2lkICVzKCVzKTtc biIgJSAoZXZlbnRfbmFtZSwgIiwgIi5qb2luKHBhcmFtZXRlcl9saXN0KSkpCiAKICAgICAgICAg R2VuZXJhdG9yLmZyb250ZW5kX21ldGhvZF9saXN0LmFwcGVuZChUZW1wbGF0ZXMuZnJvbnRlbmRf bWV0aG9kLnN1YnN0aXR1dGUoTm9uZSwKICAgICAgICAgICAgIGRvbWFpbk5hbWU9ZG9tYWluX25h bWUsIGV2ZW50TmFtZT1ldmVudF9uYW1lLAotICAgICAgICAgICAgcGFyYW1ldGVycz1qb2luKHBh cmFtZXRlcl9saXN0LCAiLCAiKSwKLSAgICAgICAgICAgIGNvZGU9am9pbihtZXRob2RfbGluZV9s aXN0LCAiIikpKQorICAgICAgICAgICAgcGFyYW1ldGVycz0iLCAiLmpvaW4ocGFyYW1ldGVyX2xp c3QpLAorICAgICAgICAgICAgY29kZT0iIi5qb2luKG1ldGhvZF9saW5lX2xpc3QpKSkKIAogICAg ICAgICBHZW5lcmF0b3IuYmFja2VuZF9qc19kb21haW5faW5pdGlhbGl6ZXJfbGlzdC5hcHBlbmQo Ikluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJFdmVudChcIiVzLiVzXCIsIFslc10pO1xuIiAlICgK LSAgICAgICAgICAgIGRvbWFpbl9uYW1lLCBldmVudF9uYW1lLCBqb2luKGJhY2tlbmRfanNfZXZl bnRfcGFyYW1fbGlzdCwgIiwgIikpKQorICAgICAgICAgICAgZG9tYWluX25hbWUsIGV2ZW50X25h bWUsICIsICIuam9pbihiYWNrZW5kX2pzX2V2ZW50X3BhcmFtX2xpc3QpKSkKIAogICAgIEBzdGF0 aWNtZXRob2QKICAgICBkZWYgcHJvY2Vzc19jb21tYW5kKGpzb25fY29tbWFuZCwgZG9tYWluX25h bWUsIGFnZW50X2ZpZWxkX25hbWUsIGFnZW50X2ludGVyZmFjZV9uYW1lKToKQEAgLTI4NTEsNyAr Mjg1Myw3IEBAIGNsYXNzIEdlbmVyYXRvcjoKIAogICAgICAgICAgICAgICAgIGpzX3BhcmFtX2xp c3QuYXBwZW5kKGpzX3BhcmFtX3RleHQpCiAKLSAgICAgICAgICAgIGpzX3BhcmFtZXRlcnNfdGV4 dCA9IGpvaW4oanNfcGFyYW1fbGlzdCwgIiwgIikKKyAgICAgICAgICAgIGpzX3BhcmFtZXRlcnNf dGV4dCA9ICIsICIuam9pbihqc19wYXJhbV9saXN0KQogCiAgICAgICAgIHJlc3BvbnNlX2Nvb2tf dGV4dCA9ICIiCiAgICAgICAgIGpzX3JlcGx5X2xpc3QgPSAiW10iCkBAIC0yOTAwLDkgKzI5MDIs OSBAQCBjbGFzcyBHZW5lcmF0b3I6CiAKICAgICAgICAgICAgICAgICBiYWNrZW5kX2pzX3JlcGx5 X3BhcmFtX2xpc3QuYXBwZW5kKCJcIiVzXCIiICUganNvbl9yZXR1cm5fbmFtZSkKIAotICAgICAg ICAgICAganNfcmVwbHlfbGlzdCA9ICJbJXNdIiAlIGpvaW4oYmFja2VuZF9qc19yZXBseV9wYXJh bV9saXN0LCAiLCAiKQorICAgICAgICAgICAganNfcmVwbHlfbGlzdCA9ICJbJXNdIiAlICIsICIu am9pbihiYWNrZW5kX2pzX3JlcGx5X3BhcmFtX2xpc3QpCiAKLSAgICAgICAgICAgIHJlc3BvbnNl X2Nvb2tfdGV4dCA9IGpvaW4ocmVzcG9uc2VfY29va19saXN0LCAiIikKKyAgICAgICAgICAgIHJl c3BvbnNlX2Nvb2tfdGV4dCA9ICIiLmpvaW4ocmVzcG9uc2VfY29va19saXN0KQogCiAgICAgICAg ICAgICBpZiBsZW4ocmVzcG9uc2VfY29va190ZXh0KSAhPSAwOgogICAgICAgICAgICAgICAgIHJl c3BvbnNlX2Nvb2tfdGV4dCA9ICIgICAgICAgIGlmICghZXJyb3IubGVuZ3RoKCkpIHtcbiIgKyBy ZXNwb25zZV9jb29rX3RleHQgKyAiICAgICAgICB9IgpAQCAtMjkxMiw3ICsyOTE0LDcgQEAgY2xh c3MgR2VuZXJhdG9yOgogICAgICAgICAgICAgYWdlbnRGaWVsZD0ibV8iICsgYWdlbnRfZmllbGRf bmFtZSwKICAgICAgICAgICAgIG1ldGhvZEluQ29kZT1tZXRob2RfaW5fY29kZSwKICAgICAgICAg ICAgIG1ldGhvZE91dENvZGU9bWV0aG9kX291dF9jb2RlLAotICAgICAgICAgICAgYWdlbnRDYWxs UGFyYW1zPWpvaW4oYWdlbnRfY2FsbF9wYXJhbV9saXN0LCAiIiksCisgICAgICAgICAgICBhZ2Vu dENhbGxQYXJhbXM9IiIuam9pbihhZ2VudF9jYWxsX3BhcmFtX2xpc3QpLAogICAgICAgICAgICAg cmVxdWVzdE1lc3NhZ2VPYmplY3Q9cmVxdWVzdF9tZXNzYWdlX3BhcmFtLAogICAgICAgICAgICAg cmVzcG9uc2VDb29rPXJlc3BvbnNlX2Nvb2tfdGV4dCwKICAgICAgICAgICAgIGNvbW1hbmROYW1l SW5kZXg9Y21kX2VudW1fbmFtZSkpCkBAIC0zMDkwLDM4ICszMDkyLDM4IEBAIGJhY2tlbmRfanNf ZmlsZSA9IFNtYXJ0T3V0cHV0KG91dHB1dF9jcHBfZGlybmFtZSArICIvSW5zcGVjdG9yQmFja2Vu ZENvbW1hbmRzLmpzCiAKIAogYmFja2VuZF9oX2ZpbGUud3JpdGUoVGVtcGxhdGVzLmJhY2tlbmRf aC5zdWJzdGl0dXRlKE5vbmUsCi0gICAgdmlydHVhbFNldHRlcnM9am9pbihHZW5lcmF0b3IuYmFj a2VuZF92aXJ0dWFsX3NldHRlcnNfbGlzdCwgIlxuIiksCi0gICAgYWdlbnRJbnRlcmZhY2VzPWpv aW4oZmxhdHRlbl9saXN0KEdlbmVyYXRvci5iYWNrZW5kX2FnZW50X2ludGVyZmFjZV9saXN0KSwg IiIpLAotICAgIG1ldGhvZE5hbWVzRW51bUNvbnRlbnQ9am9pbihHZW5lcmF0b3IubWV0aG9kX25h bWVfZW51bV9saXN0LCAiXG4iKSkpCisgICAgdmlydHVhbFNldHRlcnM9IlxuIi5qb2luKEdlbmVy YXRvci5iYWNrZW5kX3ZpcnR1YWxfc2V0dGVyc19saXN0KSwKKyAgICBhZ2VudEludGVyZmFjZXM9 IiIuam9pbihmbGF0dGVuX2xpc3QoR2VuZXJhdG9yLmJhY2tlbmRfYWdlbnRfaW50ZXJmYWNlX2xp c3QpKSwKKyAgICBtZXRob2ROYW1lc0VudW1Db250ZW50PSJcbiIuam9pbihHZW5lcmF0b3IubWV0 aG9kX25hbWVfZW51bV9saXN0KSkpCiAKIGJhY2tlbmRfY3BwX2ZpbGUud3JpdGUoVGVtcGxhdGVz LmJhY2tlbmRfY3BwLnN1YnN0aXR1dGUoTm9uZSwKLSAgICBjb25zdHJ1Y3RvckluaXQ9am9pbihH ZW5lcmF0b3IuYmFja2VuZF9jb25zdHJ1Y3Rvcl9pbml0X2xpc3QsICJcbiIpLAotICAgIHNldHRl cnM9am9pbihHZW5lcmF0b3IuYmFja2VuZF9zZXR0ZXJzX2xpc3QsICJcbiIpLAotICAgIGZpZWxk RGVjbGFyYXRpb25zPWpvaW4oR2VuZXJhdG9yLmJhY2tlbmRfZmllbGRfbGlzdCwgIlxuIiksCi0g ICAgbWV0aG9kTmFtZURlY2xhcmF0aW9ucz1qb2luKEdlbmVyYXRvci5iYWNrZW5kX21ldGhvZF9u YW1lX2RlY2xhcmF0aW9uX2xpc3QsICJcbiIpLAotICAgIG1ldGhvZHM9am9pbihHZW5lcmF0b3Iu YmFja2VuZF9tZXRob2RfaW1wbGVtZW50YXRpb25fbGlzdCwgIlxuIiksCi0gICAgbWV0aG9kRGVj bGFyYXRpb25zPWpvaW4oR2VuZXJhdG9yLmJhY2tlbmRfbWV0aG9kX2RlY2xhcmF0aW9uX2xpc3Qs ICJcbiIpLAotICAgIG1lc3NhZ2VIYW5kbGVycz1qb2luKEdlbmVyYXRvci5tZXRob2RfaGFuZGxl cl9saXN0LCAiXG4iKSkpCisgICAgY29uc3RydWN0b3JJbml0PSJcbiIuam9pbihHZW5lcmF0b3Iu YmFja2VuZF9jb25zdHJ1Y3Rvcl9pbml0X2xpc3QpLAorICAgIHNldHRlcnM9IlxuIi5qb2luKEdl bmVyYXRvci5iYWNrZW5kX3NldHRlcnNfbGlzdCksCisgICAgZmllbGREZWNsYXJhdGlvbnM9Ilxu Ii5qb2luKEdlbmVyYXRvci5iYWNrZW5kX2ZpZWxkX2xpc3QpLAorICAgIG1ldGhvZE5hbWVEZWNs YXJhdGlvbnM9IlxuIi5qb2luKEdlbmVyYXRvci5iYWNrZW5kX21ldGhvZF9uYW1lX2RlY2xhcmF0 aW9uX2xpc3QpLAorICAgIG1ldGhvZHM9IlxuIi5qb2luKEdlbmVyYXRvci5iYWNrZW5kX21ldGhv ZF9pbXBsZW1lbnRhdGlvbl9saXN0KSwKKyAgICBtZXRob2REZWNsYXJhdGlvbnM9IlxuIi5qb2lu KEdlbmVyYXRvci5iYWNrZW5kX21ldGhvZF9kZWNsYXJhdGlvbl9saXN0KSwKKyAgICBtZXNzYWdl SGFuZGxlcnM9IlxuIi5qb2luKEdlbmVyYXRvci5tZXRob2RfaGFuZGxlcl9saXN0KSkpCiAKIGZy b250ZW5kX2hfZmlsZS53cml0ZShUZW1wbGF0ZXMuZnJvbnRlbmRfaC5zdWJzdGl0dXRlKE5vbmUs Ci0gICAgZmllbGREZWNsYXJhdGlvbnM9am9pbihHZW5lcmF0b3IuZnJvbnRlbmRfY2xhc3NfZmll bGRfbGluZXMsICIiKSwKLSAgICBkb21haW5DbGFzc0xpc3Q9am9pbihHZW5lcmF0b3IuZnJvbnRl bmRfZG9tYWluX2NsYXNzX2xpbmVzLCAiIikpKQorICAgIGZpZWxkRGVjbGFyYXRpb25zPSIiLmpv aW4oR2VuZXJhdG9yLmZyb250ZW5kX2NsYXNzX2ZpZWxkX2xpbmVzKSwKKyAgICBkb21haW5DbGFz c0xpc3Q9IiIuam9pbihHZW5lcmF0b3IuZnJvbnRlbmRfZG9tYWluX2NsYXNzX2xpbmVzKSkpCiAK IGZyb250ZW5kX2NwcF9maWxlLndyaXRlKFRlbXBsYXRlcy5mcm9udGVuZF9jcHAuc3Vic3RpdHV0 ZShOb25lLAotICAgIGNvbnN0cnVjdG9ySW5pdD1qb2luKEdlbmVyYXRvci5mcm9udGVuZF9jb25z dHJ1Y3Rvcl9pbml0X2xpc3QsICIiKSwKLSAgICBtZXRob2RzPWpvaW4oR2VuZXJhdG9yLmZyb250 ZW5kX21ldGhvZF9saXN0LCAiXG4iKSkpCisgICAgY29uc3RydWN0b3JJbml0PSIiLmpvaW4oR2Vu ZXJhdG9yLmZyb250ZW5kX2NvbnN0cnVjdG9yX2luaXRfbGlzdCksCisgICAgbWV0aG9kcz0iXG4i LmpvaW4oR2VuZXJhdG9yLmZyb250ZW5kX21ldGhvZF9saXN0KSkpCiAKIHR5cGVidWlsZGVyX2hf ZmlsZS53cml0ZShUZW1wbGF0ZXMudHlwZWJ1aWxkZXJfaC5zdWJzdGl0dXRlKE5vbmUsCi0gICAg dHlwZUJ1aWxkZXJzPWpvaW4oZmxhdHRlbl9saXN0KEdlbmVyYXRvci50eXBlX2J1aWxkZXJfZnJh Z21lbnRzKSwgIiIpLAotICAgIGZvcndhcmRzPWpvaW4oR2VuZXJhdG9yLnR5cGVfYnVpbGRlcl9m b3J3YXJkcywgIiIpKSkKKyAgICB0eXBlQnVpbGRlcnM9IiIuam9pbihmbGF0dGVuX2xpc3QoR2Vu ZXJhdG9yLnR5cGVfYnVpbGRlcl9mcmFnbWVudHMpKSwKKyAgICBmb3J3YXJkcz0iIi5qb2luKEdl bmVyYXRvci50eXBlX2J1aWxkZXJfZm9yd2FyZHMpKSkKIAogdHlwZWJ1aWxkZXJfY3BwX2ZpbGUu d3JpdGUoVGVtcGxhdGVzLnR5cGVidWlsZGVyX2NwcC5zdWJzdGl0dXRlKE5vbmUsCiAgICAgZW51 bUNvbnN0YW50VmFsdWVzPUVudW1Db25zdGFudHMuZ2V0X2VudW1fY29uc3RhbnRfY29kZSgpLAot ICAgIGltcGxDb2RlPWpvaW4oZmxhdHRlbl9saXN0KEdlbmVyYXRvci50eXBlX2J1aWxkZXJfaW1w bF9saXN0KSwgIiIpLAotICAgIHZhbGlkYXRvckNvZGU9am9pbihmbGF0dGVuX2xpc3QoR2VuZXJh dG9yLnZhbGlkYXRvcl9pbXBsX2xpc3QpLCAiIikpKQorICAgIGltcGxDb2RlPSIiLmpvaW4oZmxh dHRlbl9saXN0KEdlbmVyYXRvci50eXBlX2J1aWxkZXJfaW1wbF9saXN0KSksCisgICAgdmFsaWRh dG9yQ29kZT0iIi5qb2luKGZsYXR0ZW5fbGlzdChHZW5lcmF0b3IudmFsaWRhdG9yX2ltcGxfbGlz dCkpKSkKIAogYmFja2VuZF9qc19maWxlLndyaXRlKFRlbXBsYXRlcy5iYWNrZW5kX2pzLnN1YnN0 aXR1dGUoTm9uZSwKLSAgICBkb21haW5Jbml0aWFsaXplcnM9am9pbihHZW5lcmF0b3IuYmFja2Vu ZF9qc19kb21haW5faW5pdGlhbGl6ZXJfbGlzdCwgIiIpKSkKKyAgICBkb21haW5Jbml0aWFsaXpl cnM9IiIuam9pbihHZW5lcmF0b3IuYmFja2VuZF9qc19kb21haW5faW5pdGlhbGl6ZXJfbGlzdCkp KQogCiBiYWNrZW5kX2hfZmlsZS5jbG9zZSgpCiBiYWNrZW5kX2NwcF9maWxlLmNsb3NlKCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdlcy5weSBiL1Nv dXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdlcy5weQppbmRleCAyYTg3ZDYyZGU4 ZDRjMWEzMmY4ODgyNzY5NjUyYzExMTQ2YjdmYjkwLi5iZDlkYzlhMjg1YmViNmMxN2U4MzJlM2E3 ZDlmMGVjYzNmOWNkMGNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtp dDIvbWVzc2FnZXMucHkKKysrIGIvU291cmNlL1dlYktpdDIvU2NyaXB0cy93ZWJraXQyL21lc3Nh Z2VzLnB5CkBAIC0yMiw5ICsyMiw3IEBACiAKIGltcG9ydCBjb2xsZWN0aW9ucwogaW1wb3J0IHJl Ci0KLWltcG9ydCBwYXJzZXIKLQorZnJvbSB3ZWJraXQyIGltcG9ydCBwYXJzZXIKIAogREVMQVlF RF9BVFRSSUJVVEUgPSAnRGVsYXllZCcKIERJU1BBVENIX09OX0NPTk5FQ1RJT05fUVVFVUVfQVRU UklCVVRFID0gJ0Rpc3BhdGNoT25Db25uZWN0aW9uUXVldWUnCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvcGFyc2VyLnB5IGIvU291cmNlL1dlYktpdDIvU2NyaXB0 cy93ZWJraXQyL3BhcnNlci5weQppbmRleCA1MjVmMTM3ZWM4Mjc2MGEzZmI5ZDI1NGMwZmIyMTVj Mjk5ZjZiOGZlLi5jNDAwODBmMGFhNmM3Y2RiYzZiNDJiMzQ0ZTBkM2EyMWVhNjJkNDNhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvcGFyc2VyLnB5CisrKyBiL1Nv dXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9wYXJzZXIucHkKQEAgLTIyLDcgKzIyLDcgQEAK IAogaW1wb3J0IHJlCiAKLWltcG9ydCBtb2RlbAorZnJvbSB3ZWJraXQyIGltcG9ydCBtb2RlbAog CiAKIGRlZiBwYXJzZShmaWxlKToK