94910 2012-08-24 00:18:43 -0700 Should copy entire webkit2 python module in to WebKit2.framework to allow removal of relative imports 2012-08-24 00:38:41 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Mac Unspecified RESOLVED FIXED P2 Normal --- 94814 1 mrowe mrowe gladhorn hausmann oldest_to_newest 703846 0 mrowe 2012-08-24 00:18:43 -0700 In bug 94814 they want to remove the use of relative imports from the WebKit2 python code. This currently breaks code that depends on the scripts copied in to WebKit2.framework. We should fix things to allow the changes in bug 94814 to work! 703849 1 160352 mrowe 2012-08-24 00:22:49 -0700 Created attachment 160352 Patch 703853 2 mrowe 2012-08-24 00:38:41 -0700 Landed in r126549. 160352 2012-08-24 00:22:49 -0700 2012-08-24 00:27:34 -0700 Patch 0001-http-webkit.org-b-94910-Copy-the-entire-webkit2-modu.patch text/plain 12897 mrowe RnJvbSAyOWY2ZjI4ZmQyNzMyNThmNzM3MTRhY2EyODVhOWFlNWYwZWU4YTFkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrIFJvd2UgPG1yb3dlQGFwcGxlLmNvbT4KRGF0ZTogVGh1 LCAyMyBBdWcgMjAxMiAyMzo0OTowMCAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIDxodHRwOi8vd2Vi a2l0Lm9yZy9iLzk0OTEwPiBDb3B5IHRoZSBlbnRpcmUgd2Via2l0MiBtb2R1bGUKIGluIHRvIHRo ZSBXZWJLaXQyIGZyYW1ld29yayB3cmFwcGVyLgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CgpUaGlzIHdpbGwgYWxsb3cgcmVsYXRpdmUgaW1wb3J0cyB3aXRoaW4gdGhlIHdlYmtpdDIgbW9k dWxlIHRvIGJlIHJlbW92ZWQgaW4gdGhlIGZ1dHVyZSB3aXRob3V0CnJlcXVpcmluZyBmdXR1cmUg Y2hhbmdlcyB0byBjbGllbnRzIG9mIHRoZSBtb2R1bGUuCgoqIFdlYktpdDIueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvajogUmVtb3ZlIHRoZSB3ZWJraXQyIGdyb3VwIGZyb20gdGhlIHByb2plY3Qs IGFuZCBhZGQgaXQgYmFjawphcyBhIGZvbGRlciByZWZlcmVuY2UuIFRoaXMgYWxsb3dzIHRoZSBk aXJlY3RvcnkgYW5kIGl0cyBjb250ZW50cyB0byBiZSBjb3BpZWQgaW4gdG8gdGhlIFByaXZhdGVI ZWFkZXJzCmRpcmVjdG9yeS4gV2UgYWxzbyBuZWVkIHRvIGFkZCBhIHNjcmlwdCBwaGFzZSB0byBj bGVhbiB1cCBhbnkgLnB5YyBmaWxlcyB0aGF0IG1heSBiZSBwcmVzZW50IGluCnRoZSBtb2R1bGUu Ci0tLQogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgIHwg ICAxNCArKysrKysKIFNvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvaiB8ICAgNTIgKysrKysrKysrKysrKy0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0NCBp bnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTk2NDJhZC4uNjkx ZDE4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA4LTI0ICBNYXJrIFJvd2Ug IDxtcm93ZUBhcHBsZS5jb20+CisKKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvOTQ5MTA+ IENvcHkgdGhlIGVudGlyZSB3ZWJraXQyIG1vZHVsZSBpbiB0byB0aGUgV2ViS2l0MiBmcmFtZXdv cmsgd3JhcHBlci4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIHdpbGwgYWxsb3cgcmVsYXRpdmUgaW1wb3J0cyB3aXRoaW4gdGhlIHdlYmtpdDIg bW9kdWxlIHRvIGJlIHJlbW92ZWQgaW4gdGhlIGZ1dHVyZSB3aXRob3V0CisgICAgICAgIHJlcXVp cmluZyBmdXR1cmUgY2hhbmdlcyB0byBjbGllbnRzIG9mIHRoZSBtb2R1bGUuCisKKyAgICAgICAg KiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6IFJlbW92ZSB0aGUgd2Via2l0MiBn cm91cCBmcm9tIHRoZSBwcm9qZWN0LCBhbmQgYWRkIGl0IGJhY2sKKyAgICAgICAgYXMgYSBmb2xk ZXIgcmVmZXJlbmNlLiBUaGlzIGFsbG93cyB0aGUgZGlyZWN0b3J5IGFuZCBpdHMgY29udGVudHMg dG8gYmUgY29waWVkIGluIHRvIHRoZSBQcml2YXRlSGVhZGVycworICAgICAgICBkaXJlY3Rvcnku IFdlIGFsc28gbmVlZCB0byBhZGQgYSBzY3JpcHQgcGhhc2UgdG8gY2xlYW4gdXAgYW55IC5weWMg ZmlsZXMgdGhhdCBtYXkgYmUgcHJlc2VudCBpbgorICAgICAgICB0aGUgbW9kdWxlLgorCiAyMDEy LTA4LTIzICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTI2NTQyLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYktp dDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDhjODBjZWQuLjJmY2Ey NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKQEAgLTQ0MCw2ICs0NDAsNyBAQAogCQk1MUZBMkQ3NzE1MjEyRTI2MDBDMUJBMEIgLyog V0tCdW5kbGVET01XaW5kb3dFeHRlbnNpb24uY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gNTFGQTJENzUxNTIxMkUxRTAwQzFCQTBCIC8qIFdLQnVuZGxl RE9NV2luZG93RXh0ZW5zaW9uLmNwcCAqLzsgfTsKIAkJNTI3MkIyOEExNDA2OTg1RDAwOTZBNUQw IC8qIFN0YXRpc3RpY3NEYXRhLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDUyNzJCMjg4MTQwNjk4NUQwMDk2QTVEMCAvKiBTdGF0aXN0aWNzRGF0YS5j cHAgKi87IH07CiAJCTUyNzJCMjhCMTQwNjk4NUQwMDk2QTVEMCAvKiBTdGF0aXN0aWNzRGF0YS5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTI3MkIyODkx NDA2OTg1RDAwOTZBNUQwIC8qIFN0YXRpc3RpY3NEYXRhLmggKi87IH07CisJCTVEMUEyMzkxMTVF NzVCMjIwMDIzRTk4MSAvKiB3ZWJraXQyIGluIENvcHkgTWVzc2FnZSBHZW5lcmF0aW9uIFNjcmlw dHMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNUQxQTIzOEUxNUU3NUFENTAw MjNFOTgxIC8qIHdlYmtpdDIgKi87IH07CiAJCTVENTE4NDU1MTNCQ0Y5Q0MwMEM3RkY0QSAvKiBB UElDbGllbnRUcmFpdHMuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gNUQ1MTg0NTMxM0JDRjlDQzAwQzdGRjRBIC8qIEFQSUNsaWVudFRyYWl0cy5jcHAg Ki87IH07CiAJCTVENTE4NDU2MTNCQ0Y5Q0MwMEM3RkY0QSAvKiBBUElDbGllbnRUcmFpdHMuaCBp biBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDVENTE4NDU0MTNC Q0Y5Q0MwMEM3RkY0QSAvKiBBUElDbGllbnRUcmFpdHMuaCAqLzsgfTsKIAkJNURBNkVEMEExNDkw NjA2OTAwQjQxRDEyIC8qIER5bmFtaWNMaW5rZXJFbnZpcm9ubWVudEV4dHJhY3Rvci5oIGluIEhl YWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNURBNkVEMDgxNDkwNjA2 OTAwQjQxRDEyIC8qIER5bmFtaWNMaW5rZXJFbnZpcm9ubWVudEV4dHJhY3Rvci5oICovOyB9OwpA QCAtODYyLDggKzg2Myw2IEBACiAJCUMwQ0U3MkEwMTI0N0U3MUQwMEJDMEVDNCAvKiBXZWJQYWdl TWVzc2FnZVJlY2VpdmVyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IEMwQ0U3MjlFMTI0N0U3MUQwMEJDMEVDNCAvKiBXZWJQYWdlTWVzc2FnZVJlY2Vp dmVyLmNwcCAqLzsgfTsKIAkJQzBDRTcyQTExMjQ3RTcxRDAwQkMwRUM0IC8qIFdlYlBhZ2VNZXNz YWdlcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQzBD RTcyOUYxMjQ3RTcxRDAwQkMwRUM0IC8qIFdlYlBhZ2VNZXNzYWdlcy5oICovOyB9OwogCQlDMENF NzJBRDEyNDdFNzhEMDBCQzBFQzQgLyogSGFuZGxlTWVzc2FnZS5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQzBDRTcyQUMxMjQ3RTc4RDAwQkMwRUM0IC8q IEhhbmRsZU1lc3NhZ2UuaCAqLzsgfTsKLQkJQzBEMDRFOTAxM0VDNzU5RTAwNDFFRkQ2IC8qIG1v ZGVsLnB5IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQzBE MDRFODMxM0VDNzQ5NDAwNDFFRkQ2IC8qIG1vZGVsLnB5ICovOyBzZXR0aW5ncyA9IHtBVFRSSUJV VEVTID0gKFByaXZhdGUsICk7IH07IH07Ci0JCUMwRDA0RTkxMTNFQzc1OUUwMDQxRUZENiAvKiBw YXJzZXIucHkgaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBD MEQwNEU4NDEzRUM3NDk0MDA0MUVGRDYgLyogcGFyc2VyLnB5ICovOyBzZXR0aW5ncyA9IHtBVFRS SUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUMwRDc0RERFMTMzQkUyRDkwMDg5Q0Q0NCAv KiBMYXllclRyZWVIb3N0Q0EuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gQzA5OEEwNTQxMzNCRTFDNTAwQjE5OUE0IC8qIExheWVyVHJlZUhvc3RDQS5j cHAgKi87IH07CiAJCUMwRTNBQTdBMTIwOUU4MzAwMEE0OUQwMSAvKiBNb2R1bGVNYWMubW0gaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDMEUzQUE0ODEyMDlF NDUwMDBBNDlEMDEgLyogTW9kdWxlTWFjLm1tICovOyB9OwogCQlDMEUzQUE3QjEyMDlFODM1MDBB NDlEMDEgLyogTW9kdWxlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IEMwRTNBQTQ1MTIwOUUyQkEwMEE0OUQwMSAvKiBNb2R1bGUuY3BwICovOyB9OwpA QCAtMTAxNyw2ICsxMDE2LDE3IEBACiAJCQluYW1lID0gIkNvcHkgV2ViIFByb2Nlc3MgU2hpbSI7 CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKKwkJNUQx QTIzOTAxNUU3NUIxMDAwMjNFOTgxIC8qIENvcHkgTWVzc2FnZSBHZW5lcmF0aW9uIFNjcmlwdHMg Ki8gPSB7CisJCQlpc2EgPSBQQlhDb3B5RmlsZXNCdWlsZFBoYXNlOworCQkJYnVpbGRBY3Rpb25N YXNrID0gMjE0NzQ4MzY0NzsKKwkJCWRzdFBhdGggPSBQcml2YXRlSGVhZGVyczsKKwkJCWRzdFN1 YmZvbGRlclNwZWMgPSAxOworCQkJZmlsZXMgPSAoCisJCQkJNUQxQTIzOTExNUU3NUIyMjAwMjNF OTgxIC8qIHdlYmtpdDIgaW4gQ29weSBNZXNzYWdlIEdlbmVyYXRpb24gU2NyaXB0cyAqLywKKwkJ CSk7CisJCQluYW1lID0gIkNvcHkgTWVzc2FnZSBHZW5lcmF0aW9uIFNjcmlwdHMiOworCQkJcnVu T25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CisJCX07CiAJCUJDQThENDZCMTVC Q0UzM0MwMDlEQzFGMSAvKiBDb3B5RmlsZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhDb3B5RmlsZXNC dWlsZFBoYXNlOwogCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsKQEAgLTE0ODksNiAr MTQ5OSw3IEBACiAJCTUxRkEyRDc1MTUyMTJFMUUwMEMxQkEwQiAvKiBXS0J1bmRsZURPTVdpbmRv d0V4dGVuc2lvbi5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXS0J1 bmRsZURPTVdpbmRvd0V4dGVuc2lvbi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTUyNzJCMjg4MTQwNjk4NUQwMDk2QTVEMCAvKiBTdGF0aXN0aWNzRGF0YS5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBTdGF0aXN0aWNzRGF0YS5jcHA7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTUyNzJCMjg5MTQwNjk4NUQwMDk2QTVEMCAvKiBTdGF0aXN0 aWNzRGF0YS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTdGF0aXN0aWNzRGF0 YS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk1RDFBMjM4RTE1RTc1QUQ1MDAyM0U5 ODEgLyogd2Via2l0MiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxl VHlwZSA9IGZvbGRlcjsgcGF0aCA9IHdlYmtpdDI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTVENTE4NDUzMTNCQ0Y5Q0MwMEM3RkY0QSAvKiBBUElDbGllbnRUcmFpdHMuY3BwICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQVBJQ2xpZW50VHJhaXRzLmNwcDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNUQ1MTg0NTQxM0JDRjlDQzAwQzdGRjRBIC8qIEFQ SUNsaWVudFRyYWl0cy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBBUElDbGll bnRUcmFpdHMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNURBNkVEMDgxNDkwNjA2 OTAwQjQxRDEyIC8qIER5bmFtaWNMaW5rZXJFbnZpcm9ubWVudEV4dHJhY3Rvci5oICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBEeW5hbWljTGlua2VyRW52aXJvbm1lbnRFeHRyYWN0 b3IuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTE5MzEsNyArMTk0Miw2IEBACiAJ CUMwM0ExMzZCMTMzQkVCRjkwMEQ3NjdEMSAvKiBMYXllclRyZWVIb3N0Q0FNYWMubW0gKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBMYXllclRyZWVIb3N0Q0FNYWMubW07 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUMwNkM2MDkzMTI0QzE0NDMwMDAxNjgyRiAv KiBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgcGF0aCA9IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQlDMDZDNjA5NDEyNEMxNDQzMDAwMTY4MkYgLyogV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCUMwOEZE RTg3MTI0QTg1MUMwMDc2NDVCRCAvKiBtZXNzYWdlc191bml0dGVzdC5weSAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRl eHQuc2NyaXB0LnB5dGhvbjsgcGF0aCA9IG1lc3NhZ2VzX3VuaXR0ZXN0LnB5OyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQlDMDk4QTA1MzEzM0JFMUM1MDBCMTk5QTQgLyogTGF5ZXJUcmVl SG9zdENBLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IExheWVyVHJlZUhvc3RD QS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDMDk4QTA1NDEzM0JFMUM1MDBCMTk5 QTQgLyogTGF5ZXJUcmVlSG9zdENBLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNw cDsgcGF0aCA9IExheWVyVHJlZUhvc3RDQS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCUMwOUFFNUU4MTI1MjU3QzIwMDI1ODI1RCAvKiBXS05hdGl2ZUV2ZW50LmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdLTmF0aXZlRXZlbnQuaDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKQEAgLTE5NDIsMTAgKzE5NTIsNiBAQAogCQlDMENFNzJEQjEyNDdFOEY3MDBC QzBFQzQgLyogRGVyaXZlZFNvdXJjZXMubWFrZSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBEZXJp dmVkU291cmNlcy5tYWtlOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDMENFNzMzNjEy NDdGNzBFMDBCQzBFQzQgLyogZ2VuZXJhdGUtbWVzc2FnZS1yZWNlaXZlci5weSAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHRleHQuc2NyaXB0LnB5dGhvbjsgcGF0aCA9ICJnZW5lcmF0ZS1tZXNzYWdlLXJlY2VpdmVyLnB5 Ijsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQzBDRTczMzcxMjQ3RjcwRTAwQkMwRUM0 IC8qIGdlbmVyYXRlLW1lc3NhZ2VzLWhlYWRlci5weSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuc2NyaXB0LnB5 dGhvbjsgcGF0aCA9ICJnZW5lcmF0ZS1tZXNzYWdlcy1oZWFkZXIucHkiOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwotCQlDMENFNzMzOTEyNDdGNzBFMDBCQzBFQzQgLyogX19pbml0X18ucHkg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSB0ZXh0LnNjcmlwdC5weXRob247IHBhdGggPSBfX2luaXRfXy5weTsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJQzBDRTczNDYxMjQ4MEI3RDAwQkMwRUM0IC8qIG1lc3Nh Z2VzLnB5ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gdGV4dC5zY3JpcHQucHl0aG9uOyBwYXRoID0gbWVzc2FnZXMucHk7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCUMwRDA0RTgzMTNFQzc0OTQwMDQxRUZENiAv KiBtb2RlbC5weSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlw ZSA9IHRleHQuc2NyaXB0LnB5dGhvbjsgcGF0aCA9IG1vZGVsLnB5OyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwotCQlDMEQwNEU4NDEzRUM3NDk0MDA0MUVGRDYgLyogcGFyc2VyLnB5ICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5zY3JpcHQu cHl0aG9uOyBwYXRoID0gcGFyc2VyLnB5OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlD MEUzQUE0NDEyMDlFMkJBMDBBNDlEMDEgLyogTW9kdWxlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IE1vZHVsZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDMEUz QUE0NTEyMDlFMkJBMDBBNDlEMDEgLyogTW9kdWxlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLmNwcDsgcGF0aCA9IE1vZHVsZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CUMwRTNBQTQ4MTIwOUU0NTAwMEE0OUQwMSAvKiBNb2R1bGVNYWMubW0gKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBNb2R1bGVNYWMubW07IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CkBAIC0zNzIyLDcgKzM3MjgsNyBAQAogCQlDMENFNzMzNTEyNDdGNzBFMDBCQzBF QzQgLyogU2NyaXB0cyAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAo Ci0JCQkJQzBDRTczMzgxMjQ3RjcwRTAwQkMwRUM0IC8qIHdlYmtpdDIgKi8sCisJCQkJNUQxQTIz OEUxNUU3NUFENTAwMjNFOTgxIC8qIHdlYmtpdDIgKi8sCiAJCQkJQzBDRTczMzYxMjQ3RjcwRTAw QkMwRUM0IC8qIGdlbmVyYXRlLW1lc3NhZ2UtcmVjZWl2ZXIucHkgKi8sCiAJCQkJQzBDRTczMzcx MjQ3RjcwRTAwQkMwRUM0IC8qIGdlbmVyYXRlLW1lc3NhZ2VzLWhlYWRlci5weSAqLywKIAkJCSk7 CkBAIC0zNzMxLDE4ICszNzM3LDYgQEAKIAkJCXRhYldpZHRoID0gODsKIAkJCXVzZXNUYWJzID0g MDsKIAkJfTsKLQkJQzBDRTczMzgxMjQ3RjcwRTAwQkMwRUM0IC8qIHdlYmtpdDIgKi8gPSB7Ci0J CQlpc2EgPSBQQlhHcm91cDsKLQkJCWNoaWxkcmVuID0gKAotCQkJCUMwQ0U3MzM5MTI0N0Y3MEUw MEJDMEVDNCAvKiBfX2luaXRfXy5weSAqLywKLQkJCQlDMENFNzM0NjEyNDgwQjdEMDBCQzBFQzQg LyogbWVzc2FnZXMucHkgKi8sCi0JCQkJQzA4RkRFODcxMjRBODUxQzAwNzY0NUJEIC8qIG1lc3Nh Z2VzX3VuaXR0ZXN0LnB5ICovLAotCQkJCUMwRDA0RTgzMTNFQzc0OTQwMDQxRUZENiAvKiBtb2Rl bC5weSAqLywKLQkJCQlDMEQwNEU4NDEzRUM3NDk0MDA0MUVGRDYgLyogcGFyc2VyLnB5ICovLAot CQkJKTsKLQkJCXBhdGggPSB3ZWJraXQyOwotCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKLQkJ fTsKIAkJQ0Q3M0JBM0QxMzFBMkEyMTAwRUVERUQyIC8qIEZ1bGxTY3JlZW4gKi8gPSB7CiAJCQlp c2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKApAQCAtMzg5MSw3ICszODg1LDYgQEAKIAkJ CQkxQTI0QjVGMzExRjUzMUU4MDBDMzgyNjkgLyogTWFjaFV0aWxpdGllcy5oIGluIEhlYWRlcnMg Ki8sCiAJCQkJQkMwMzJEQUMxMEY0MzdEMTAwNThDMTVBIC8qIE1lc3NhZ2VJRC5oIGluIEhlYWRl cnMgKi8sCiAJCQkJMUExMTlBOTUxMjdCNzk2MjAwQTlFQ0IxIC8qIE1lc3NhZ2VTZW5kZXIuaCBp biBIZWFkZXJzICovLAotCQkJCUMwRDA0RTkwMTNFQzc1OUUwMDQxRUZENiAvKiBtb2RlbC5weSBp biBIZWFkZXJzICovLAogCQkJCUMwRTNBQTdDMTIwOUU4M0MwMEE0OUQwMSAvKiBNb2R1bGUuaCBp biBIZWFkZXJzICovLAogCQkJCUJDQjBBRDM0MTIyRjI4NTgwMEIxMzQxRSAvKiBNdXRhYmxlQXJy YXkuaCBpbiBIZWFkZXJzICovLAogCQkJCUJDQjBBRUU5MTIyRjUzRTMwMEIxMzQxRSAvKiBNdXRh YmxlRGljdGlvbmFyeS5oIGluIEhlYWRlcnMgKi8sCkBAIC0zOTE1LDcgKzM5MDgsNiBAQAogCQkJ CUJDNkVEQUE2MTExMjcxQzYwMEU3Njc4QiAvKiBQYWdlQ2xpZW50LmggaW4gSGVhZGVycyAqLywK IAkJCQlCQzExMUI1MDExMkY2MTkyMDAzMzdCQUIgLyogUGFnZUNsaWVudEltcGwuaCBpbiBIZWFk ZXJzICovLAogCQkJCTFBOTBDMjM3MTI2NTA3MTcwMDNFNDRENCAvKiBQYWdlT3ZlcmxheS5oIGlu IEhlYWRlcnMgKi8sCi0JCQkJQzBEMDRFOTExM0VDNzU5RTAwNDFFRkQ2IC8qIHBhcnNlci5weSBp biBIZWFkZXJzICovLAogCQkJCUM1NzRBNTgxMTJFNjY2ODEwMDJERkU5OCAvKiBQYXN0ZWJvYXJk VHlwZXMuaCBpbiBIZWFkZXJzICovLAogCQkJCTFBQUYwNjE0MTJCMDExMzEwMDhFNDlFMiAvKiBQ REZWaWV3Q29udHJvbGxlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQkNGNTA1RTcxMjQzMDQ3QjAw NTk1NUFFIC8qIFBsYXRmb3JtQ2VydGlmaWNhdGVJbmZvLmggaW4gSGVhZGVycyAqLywKQEAgLTQz MTIsNiArNDMwNCw4IEBACiAJCQlidWlsZFBoYXNlcyA9ICgKIAkJCQk4REMyRUY1MDA0ODZBNjk0 MDA5OEIyMTYgLyogSGVhZGVycyAqLywKIAkJCQk4REMyRUY1MjA0ODZBNjk0MDA5OEIyMTYgLyog UmVzb3VyY2VzICovLAorCQkJCTVEMUEyMzkwMTVFNzVCMTAwMDIzRTk4MSAvKiBDb3B5IE1lc3Nh Z2UgR2VuZXJhdGlvbiBTY3JpcHRzICovLAorCQkJCTVEMUEyMzkyMTVFNzYwNTkwMDIzRTk4MSAv KiBSZW1vdmUgQ29tcGlsZWQgUHl0aG9uIEZpbGVzICovLAogCQkJCThEQzJFRjU0MDQ4NkE2OTQw MDk4QjIxNiAvKiBTb3VyY2VzICovLAogCQkJCThEQzJFRjU2MDQ4NkE2OTQwMDk4QjIxNiAvKiBG cmFtZXdvcmtzICovLAogCQkJCTVERjQwOEMwMTMxREQzN0MwMDEzMDA3MSAvKiBDaGVjayBGb3Ig R2xvYmFsIEluaXRpYWxpemVycyAqLywKQEAgLTQ0NTcsNiArNDQ1MSwyMCBAQAogCQkJc2hlbGxQ YXRoID0gL2Jpbi9zaDsKIAkJCXNoZWxsU2NyaXB0ID0gImlmIFsgXCIke0FDVElPTn1cIiA9IFwi aW5zdGFsbGhkcnNcIiBdOyB0aGVuXG4gICAgZXhpdCAwO1xuZmlcblxuaWYgWyAtZiAuLi8uLi9U b29scy9TY3JpcHRzL2NoZWNrLWZvci1pbmFwcHJvcHJpYXRlLW9iamMtY2xhc3MtbmFtZXMgXTsg dGhlblxuICAgIC4uLy4uL1Rvb2xzL1NjcmlwdHMvY2hlY2stZm9yLWluYXBwcm9wcmlhdGUtb2Jq Yy1jbGFzcy1uYW1lcyBXSyB8fCBleGl0ICQ/XG5maSI7CiAJCX07CisJCTVEMUEyMzkyMTVFNzYw NTkwMDIzRTk4MSAvKiBSZW1vdmUgQ29tcGlsZWQgUHl0aG9uIEZpbGVzICovID0geworCQkJaXNh ID0gUEJYU2hlbGxTY3JpcHRCdWlsZFBoYXNlOworCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4 MzY0NzsKKwkJCWZpbGVzID0gKAorCQkJKTsKKwkJCWlucHV0UGF0aHMgPSAoCisJCQkpOworCQkJ bmFtZSA9ICJSZW1vdmUgQ29tcGlsZWQgUHl0aG9uIEZpbGVzIjsKKwkJCW91dHB1dFBhdGhzID0g KAorCQkJKTsKKwkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOworCQkJ c2hlbGxQYXRoID0gL2Jpbi9zaDsKKwkJCXNoZWxsU2NyaXB0ID0gImZpbmQgXCIke0JVSUxUX1BS T0RVQ1RTX0RJUn0vJHtQUklWQVRFX0hFQURFUlNfRk9MREVSX1BBVEh9XCIgLW5hbWUgJyoucHlj JyAtZGVsZXRlIjsKKwkJfTsKIAkJNURGNDA4QzAxMzFERDM3QzAwMTMwMDcxIC8qIENoZWNrIEZv ciBHbG9iYWwgSW5pdGlhbGl6ZXJzICovID0gewogCQkJaXNhID0gUEJYU2hlbGxTY3JpcHRCdWls ZFBoYXNlOwogCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsKLS0gCjEuNy45LjYgKEFw cGxlIEdpdC0zMS4xKQoK