73487 2011-11-30 13:53:38 -0800 [GTK] Read fonts from the jhbuild root 2011-12-01 14:46:57 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73473 73423 1 mrobinson mrobinson abarth gustavo ojan webkit.review.bot oldest_to_newest 512101 0 mrobinson 2011-11-30 13:53:38 -0800 Instead of trying to read fonts from the system, we should read them from the jhbuild root. This is the first step toward requiring jhbuild to run tests. 512110 1 117268 mrobinson 2011-11-30 13:58:13 -0800 Created attachment 117268 Patch 512620 2 117268 gustavo 2011-12-01 01:33:17 -0800 Comment on attachment 117268 Patch LGTM, wonder if it wouldn't be better to fallback to the well-known directory in case WEBKIT_TEST_FONTS is not set, though, since it would be easier when running DRT manually for debugging purposes, what do you think? 512878 3 117442 mrobinson 2011-12-01 10:17:26 -0800 Created attachment 117442 Patch 513142 4 mrobinson 2011-12-01 14:45:32 -0800 Committed r101712: <http://trac.webkit.org/changeset/101712> 117268 2011-11-30 13:58:13 -0800 2011-12-01 10:17:18 -0800 Patch bug-73487-20111130225811.patch text/plain 9679 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNDA0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTc5NzMwNTA0MWRiNjIxYzYxNTIzNjBmZGJjNjdlNDU2 N2U2YjVjMC4uYmE2YzQ5MDI0NzFlZWUzNWRjN2M5YmJlNTg2NTI4ZTRlM2IwNWFhMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDExLTExLTMwICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4K KworICAgICAgICBbR1RLXSBSZWFkIGZvbnRzIGZyb20gdGhlIGpoYnVpbGQgcm9vdAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM0ODcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWFkIGZvbnRzIGZyb20g dGhlIGpoYnVpbGQgcm9vdCBpbnN0ZWFkIG9mIGZyb20gdGhlIHN5c3RlbS4gVGhpcyB3aWxsIGVu c3VyZQorICAgICAgICB0aGF0IGFsbCB0ZXN0ZXJzIHVzZSB0aGUgc2FtZSBmb250cyBpbnN0ZWFk IG9mIGxlYXZpbmcgdGhpcyB1cCB0byBsdWNrLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUv Z3RrL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKGluaXRpYWxpemVGb250cyk6IExvYWQg Zm9udHMgZnJvbSBqaGJ1aWxkIHJvb3QuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9ndGsucHk6CisgICAgICAgIChHdGtQb3J0LnNldHVwX2Vudmlyb25fZm9y X3NlcnZlcik6IFBhc3MgYW4gZW52aXJvbm1lbnQgdmFyaWFibGUgY29udGFpbmluZworICAgICAg ICB0aGUgcGF0aCB0byB0aGUgamhidWlsZCByb290LgorICAgICAgICAqIFdlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvZ3RrL0FjdGl2YXRlRm9udHNHdGsuY3BwOgorICAgICAgICAoV1RS Ojppbml0aXRpYWxpemVGb250Q29uZmlnU2V0dGluZyk6IExvYWQgZm9udHMgZnJvbSB0aGUgamhi dWlsZCByb290LgorCiAyMDExLTExLTI5ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdh bGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBBZGQgYSBtZXRob2QgdG8gZGV0ZWN0ICdtYWtlIGRp c3QnIGVycm9ycyB3aXRob3V0IHJ1bm5pbmcgJ21ha2UgZGlzdCcKZGlmZiAtLWdpdCBhL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVy VHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IGM5ODQxMWU2NThjZjliMjBkMzdlMTdh OTM4NWM4NzY4ZDI5NDZhZjkuLjM2YjJkZWJhM2YyMTZhMGUxNzY5NmM1ZWQwMWNjMDJiMTBmMTg2 MTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5j cHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcApAQCAt MTc3LDYyICsxNzcsMTkgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZUZvbnRzKGNvbnN0IGNoYXIq IHRlc3RVUkwgPSAwKQogICAgIGlmICghRmNDb25maWdQYXJzZUFuZExvYWQoY29uZmlnLCByZWlu dGVycHJldF9jYXN0PEZjQ2hhcjgqPihmb250Q29uZmlnRmlsZW5hbWUuZ2V0KCkpLCB0cnVlKSkK ICAgICAgICAgZ19lcnJvcigiQ291bGRuJ3QgbG9hZCBmb250IGNvbmZpZ3VyYXRpb24gZmlsZSBm cm9tOiAlcyIsIGZvbnRDb25maWdGaWxlbmFtZS5nZXQoKSk7CiAKLSAgICBzdGF0aWMgY29uc3Qg Y2hhciAqY29uc3QgZm9udERpcmVjdG9yaWVzW10gPSB7Ci0gICAgICAgICIvdXNyL3NoYXJlL2Zv bnRzL3RydWV0eXBlL2xpYmVyYXRpb24iLAotICAgICAgICAiL3Vzci9zaGFyZS9mb250cy90cnVl dHlwZS90dGYtbGliZXJhdGlvbiIsCi0gICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL2xpYmVyYXRp b24iLAotICAgICAgICAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS90dGYtZGVqYXZ1IiwKLSAg ICAgICAgIi91c3Ivc2hhcmUvZm9udHMvZGVqYXZ1IiwKLSAgICAgICAgIi91c3Ivc2hhcmUvZm9u dHMvb3BlbnR5cGUvc3RpeCIsCi0gICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL3N0aXgiCi0gICAg fTsKLQotICAgIHN0YXRpYyBjb25zdCBjaGFyICpjb25zdCBmb250UGF0aHNbXSA9IHsKLSAgICAg ICAgIkxpYmVyYXRpb25Nb25vLUJvbGRJdGFsaWMudHRmIiwKLSAgICAgICAgIkxpYmVyYXRpb25N b25vLUJvbGQudHRmIiwKLSAgICAgICAgIkxpYmVyYXRpb25Nb25vLUl0YWxpYy50dGYiLAotICAg ICAgICAiTGliZXJhdGlvbk1vbm8tUmVndWxhci50dGYiLAotICAgICAgICAiTGliZXJhdGlvblNh bnMtQm9sZEl0YWxpYy50dGYiLAotICAgICAgICAiTGliZXJhdGlvblNhbnMtQm9sZC50dGYiLAot ICAgICAgICAiTGliZXJhdGlvblNhbnMtSXRhbGljLnR0ZiIsCi0gICAgICAgICJMaWJlcmF0aW9u U2Fucy1SZWd1bGFyLnR0ZiIsCi0gICAgICAgICJMaWJlcmF0aW9uU2VyaWYtQm9sZEl0YWxpYy50 dGYiLAotICAgICAgICAiTGliZXJhdGlvblNlcmlmLUJvbGQudHRmIiwKLSAgICAgICAgIkxpYmVy YXRpb25TZXJpZi1JdGFsaWMudHRmIiwKLSAgICAgICAgIkxpYmVyYXRpb25TZXJpZi1SZWd1bGFy LnR0ZiIsCi0gICAgICAgICJEZWphVnVTYW5zLnR0ZiIsCi0gICAgICAgICJEZWphVnVTZXJpZi50 dGYiLAotCi0gICAgICAgIC8vIE1hdGhNTCB0ZXN0cyByZXF1aXJlIHRoZSBTVElYIGZvbnRzLgot ICAgICAgICAiU1RJWEdlbmVyYWwub3RmIiwKLSAgICAgICAgIlNUSVhHZW5lcmFsQm9sSXRhLm90 ZiIsCi0gICAgICAgICJTVElYR2VuZXJhbEJvbC5vdGYiLAotICAgICAgICAiU1RJWEdlbmVyYWxJ dGFsaWMub3RmIgotICAgIH07Ci0KLSAgICAvLyBUT0RPOiBTb21lIHRlc3RzIHVzZSBMdWNpZGEu IFdlIHNob3VsZCBsb2FkIHRoZXNlIGFzIHdlbGwsIG9uY2UgaXQgYmVjb21lcwotICAgIC8vIGNs ZWFyIGhvdyB0byBpbnN0YWxsIHRoZXNlIGZvbnRzIGVhc2lseSBvbiBGZWRvcmEuCi0gICAgZm9y IChzaXplX3QgZm9udCA9IDA7IGZvbnQgPCBHX05fRUxFTUVOVFMoZm9udFBhdGhzKTsgZm9udCsr KSB7Ci0gICAgICAgIGJvb2wgZm91bmQgPSBmYWxzZTsKLSAgICAgICAgZm9yIChzaXplX3QgcGF0 aCA9IDA7IHBhdGggPCBHX05fRUxFTUVOVFMoZm9udERpcmVjdG9yaWVzKTsgcGF0aCsrKSB7Ci0g ICAgICAgICAgICBHT3duUHRyPGdjaGFyPiBmdWxsUGF0aChnX2J1aWxkX2ZpbGVuYW1lKGZvbnRE aXJlY3Rvcmllc1twYXRoXSwgZm9udFBhdGhzW2ZvbnRdLCBOVUxMKSk7Ci0gICAgICAgICAgICBp ZiAoZ19maWxlX3Rlc3QoZnVsbFBhdGguZ2V0KCksIEdfRklMRV9URVNUX0VYSVNUUykpIHsKLSAg ICAgICAgICAgICAgICBmb3VuZCA9IHRydWU7Ci0gICAgICAgICAgICAgICAgaWYgKCFGY0NvbmZp Z0FwcEZvbnRBZGRGaWxlKGNvbmZpZywgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBGY0NoYXI4Kj4o ZnVsbFBhdGguZ2V0KCkpKSkKLSAgICAgICAgICAgICAgICAgICAgZ19lcnJvcigiQ291bGQgbm90 IGxvYWQgZm9udCBhdCAlcyEiLCBmdWxsUGF0aC5nZXQoKSk7Ci0gICAgICAgICAgICAgICAgZWxz ZQotICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQor ICAgIGNvbnN0IGNoYXIqIGZvbnRzUGF0aCA9IGdfZ2V0ZW52KCJXRUJLSVRfVEVTVF9GT05UUyIp OworICAgIGlmICghZm9udHNQYXRoKQorICAgICAgICBnX2Vycm9yKCJXRUJLSVRfVEVTVF9GT05U UyBlbnZpcm9ubWVudCB2YXJpYWJsZSBub3Qgc2V0Iik7CisKKyAgICBHT3duUHRyPEdFcnJvcj4g ZXJyb3I7CisgICAgR093blB0cjxHRGlyPiBmb250c0RpcmVjdG9yeShnX2Rpcl9vcGVuKGZvbnRz UGF0aCwgMCwgJmVycm9yLm91dFB0cigpKSk7CisgICAgd2hpbGUgKGNvbnN0IGNoYXIqIGRpcmVj dG9yeUVudHJ5ID0gZ19kaXJfcmVhZF9uYW1lKGZvbnRzRGlyZWN0b3J5LmdldCgpKSkgeworICAg ICAgICBpZiAoIWdfc3RyX2hhc19zdWZmaXgoZGlyZWN0b3J5RW50cnksICIudHRmIikgJiYgIWdf c3RyX2hhc19zdWZmaXgoZGlyZWN0b3J5RW50cnksICIub3RmIikpCisgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgR093blB0cjxnY2hhcj4gZm9udFBhdGgoZ19idWlsZF9maWxlbmFtZShm b250c1BhdGgsIGRpcmVjdG9yeUVudHJ5LCBOVUxMKSk7CisgICAgICAgIGlmICghRmNDb25maWdB cHBGb250QWRkRmlsZShjb25maWcsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgRmNDaGFyOCo+KGZv bnRQYXRoLmdldCgpKSkpCisgICAgICAgICAgICBnX2Vycm9yKCJDb3VsZCBub3QgbG9hZCBmb250 IGF0ICVzISIsIGZvbnRQYXRoLmdldCgpKTsKIAotICAgICAgICBpZiAoIWZvdW5kKSB7Ci0gICAg ICAgICAgICBHT3duUHRyPGdjaGFyPiBkaXJlY3Rvcmllc0Rlc2NyaXB0aW9uOwotICAgICAgICAg ICAgZm9yIChzaXplX3QgcGF0aCA9IDA7IHBhdGggPCBHX05fRUxFTUVOVFMoZm9udERpcmVjdG9y aWVzKTsgcGF0aCsrKQotICAgICAgICAgICAgICAgIGRpcmVjdG9yaWVzRGVzY3JpcHRpb24uc2V0 KGdfc3Ryam9pbigiOiIsIGRpcmVjdG9yaWVzRGVzY3JpcHRpb24ucmVsZWFzZSgpLCBmb250RGly ZWN0b3JpZXNbcGF0aF0sIE5VTEwpKTsKLSAgICAgICAgICAgIGdfZXJyb3IoIkNvdWxkIG5vdCBm aW5kIGZvbnQgJXMgaW4gJXMuIEVpdGhlciBpbnN0YWxsIHRoaXMgZm9udCBvciBmaWxlIGEgYnVn ICIKLSAgICAgICAgICAgICAgICAgICAgImF0IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcgaWYgaXQg aXMgaW5zdGFsbGVkIGluIGFub3RoZXIgbG9jYXRpb24uIiwKLSAgICAgICAgICAgICAgICAgICAg Zm9udFBhdGhzW2ZvbnRdLCBkaXJlY3Rvcmllc0Rlc2NyaXB0aW9uLmdldCgpKTsKLSAgICAgICAg fQogICAgIH0KIAogICAgIC8vIEFoZW0gaXMgdXNlZCBieSBtYW55IGxheW91dCB0ZXN0cy4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkKaW5kZXgg MjRkN2UxMjQyZWZhZGFmZDBkOTcwZmYzOGZmMGFjMjBkMzY3ODQzZC4uYmYyYjU2ZjI2ZmQyODAx ODhlZWE0NTRjMGZkOTVmM2UxYmRhZTFhOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkKQEAgLTg5LDYgKzg5LDcgQEAgY2xhc3MgR3RrUG9y dChXZWJLaXRQb3J0KToKICAgICAgICAgZW52aXJvbm1lbnRbJ1RFU1RfUlVOTkVSX0lOSkVDVEVE X0JVTkRMRV9GSUxFTkFNRSddID0gc2VsZi5fYnVpbGRfcGF0aCgnTGlicmFyaWVzJywgJ2xpYlRl c3RSdW5uZXJJbmplY3RlZEJ1bmRsZS5sYScpCiAgICAgICAgIGVudmlyb25tZW50WydURVNUX1JV Tk5FUl9URVNUX1BMVUdJTl9QQVRIJ10gPSBzZWxmLl9idWlsZF9wYXRoKCdUZXN0TmV0c2NhcGVQ bHVnaW4nLCAnLmxpYnMnKQogICAgICAgICBlbnZpcm9ubWVudFsnV0VCS0lUX0lOU1BFQ1RPUl9Q QVRIJ10gPSBzZWxmLl9idWlsZF9wYXRoKCdQcm9ncmFtcycsICdyZXNvdXJjZXMnLCAnaW5zcGVj dG9yJykKKyAgICAgICAgZW52aXJvbm1lbnRbJ1dFQktJVF9URVNUX0ZPTlRTJ10gPSBzZWxmLl9i dWlsZF9wYXRoKCcuLicsICdEZXBlbmRlbmNpZXMnLCAnUm9vdCcsICd3ZWJraXRndGstdGVzdC1m b250cycpCiAgICAgICAgIHJldHVybiBlbnZpcm9ubWVudAogCiAgICAgZGVmIF9nZW5lcmF0ZV9h bGxfdGVzdF9jb25maWd1cmF0aW9ucyhzZWxmKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZ3RrL0FjdGl2YXRlRm9udHNHdGsuY3BwIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250c0d0ay5jcHAK aW5kZXggMWI1MzZlY2IzZTExZmQ2OWEwMzA0OGE2NzNkY2RhMjQ0MTBhZTdhOC4uOTk0YmY1M2Mx ZmNjNjU2NDZjM2FmM2Q1MzQ4NWQ1MmRiZWYyNDM1YSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250c0d0ay5jcHAKKysrIGIv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250c0d0 ay5jcHAKQEAgLTcxLDYyICs3MSwxOCBAQCB2b2lkIGluaXRpdGlhbGl6ZUZvbnRDb25maWdTZXR0 aW5nKCkKICAgICBpZiAoIUZjQ29uZmlnUGFyc2VBbmRMb2FkKGNvbmZpZywgcmVpbnRlcnByZXRf Y2FzdDxGY0NoYXI4Kj4oZm9udENvbmZpZ0ZpbGVuYW1lLmdldCgpKSwgdHJ1ZSkpCiAgICAgICAg IGdfZXJyb3IoIkNvdWxkbid0IGxvYWQgZm9udCBjb25maWd1cmF0aW9uIGZpbGUgZnJvbTogJXMi LCBmb250Q29uZmlnRmlsZW5hbWUuZ2V0KCkpOwogCi0gICAgc3RhdGljIGNvbnN0IGNoYXIgKmNv bnN0IGZvbnREaXJlY3Rvcmllc1tdID0gewotICAgICAgICAiL3Vzci9zaGFyZS9mb250cy90cnVl dHlwZS9saWJlcmF0aW9uIiwKLSAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRm LWxpYmVyYXRpb24iLAotICAgICAgICAiL3Vzci9zaGFyZS9mb250cy9saWJlcmF0aW9uIiwKLSAg ICAgICAgIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLWRlamF2dSIsCi0gICAgICAgICIv dXNyL3NoYXJlL2ZvbnRzL2RlamF2dSIsCi0gICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL29wZW50 eXBlL3N0aXgiLAotICAgICAgICAiL3Vzci9zaGFyZS9mb250cy9zdGl4IgotICAgIH07Ci0KLSAg ICBzdGF0aWMgY29uc3QgY2hhciAqY29uc3QgZm9udFBhdGhzW10gPSB7Ci0gICAgICAgICJMaWJl cmF0aW9uTW9uby1Cb2xkSXRhbGljLnR0ZiIsCi0gICAgICAgICJMaWJlcmF0aW9uTW9uby1Cb2xk LnR0ZiIsCi0gICAgICAgICJMaWJlcmF0aW9uTW9uby1JdGFsaWMudHRmIiwKLSAgICAgICAgIkxp YmVyYXRpb25Nb25vLVJlZ3VsYXIudHRmIiwKLSAgICAgICAgIkxpYmVyYXRpb25TYW5zLUJvbGRJ dGFsaWMudHRmIiwKLSAgICAgICAgIkxpYmVyYXRpb25TYW5zLUJvbGQudHRmIiwKLSAgICAgICAg IkxpYmVyYXRpb25TYW5zLUl0YWxpYy50dGYiLAotICAgICAgICAiTGliZXJhdGlvblNhbnMtUmVn dWxhci50dGYiLAotICAgICAgICAiTGliZXJhdGlvblNlcmlmLUJvbGRJdGFsaWMudHRmIiwKLSAg ICAgICAgIkxpYmVyYXRpb25TZXJpZi1Cb2xkLnR0ZiIsCi0gICAgICAgICJMaWJlcmF0aW9uU2Vy aWYtSXRhbGljLnR0ZiIsCi0gICAgICAgICJMaWJlcmF0aW9uU2VyaWYtUmVndWxhci50dGYiLAot ICAgICAgICAiRGVqYVZ1U2Fucy50dGYiLAotICAgICAgICAiRGVqYVZ1U2VyaWYudHRmIiwKLQot ICAgICAgICAvLyBNYXRoTUwgdGVzdHMgcmVxdWlyZSB0aGUgU1RJWCBmb250cy4KLSAgICAgICAg IlNUSVhHZW5lcmFsLm90ZiIsCi0gICAgICAgICJTVElYR2VuZXJhbEJvbEl0YS5vdGYiLAotICAg ICAgICAiU1RJWEdlbmVyYWxCb2wub3RmIiwKLSAgICAgICAgIlNUSVhHZW5lcmFsSXRhbGljLm90 ZiIKLSAgICB9OwotCi0gICAgLy8gVE9ETzogU29tZSB0ZXN0cyB1c2UgTHVjaWRhLiBXZSBzaG91 bGQgbG9hZCB0aGVzZSBhcyB3ZWxsLCBvbmNlIGl0IGJlY29tZXMKLSAgICAvLyBjbGVhciBob3cg dG8gaW5zdGFsbCB0aGVzZSBmb250cyBlYXNpbHkgb24gRmVkb3JhLgotICAgIGZvciAoc2l6ZV90 IGZvbnQgPSAwOyBmb250IDwgR19OX0VMRU1FTlRTKGZvbnRQYXRocyk7IGZvbnQrKykgewotICAg ICAgICBib29sIGZvdW5kID0gZmFsc2U7Ci0gICAgICAgIGZvciAoc2l6ZV90IHBhdGggPSAwOyBw YXRoIDwgR19OX0VMRU1FTlRTKGZvbnREaXJlY3Rvcmllcyk7IHBhdGgrKykgewotICAgICAgICAg ICAgR093blB0cjxnY2hhcj4gZnVsbFBhdGgoZ19idWlsZF9maWxlbmFtZShmb250RGlyZWN0b3Jp ZXNbcGF0aF0sIGZvbnRQYXRoc1tmb250XSwgTlVMTCkpOwotICAgICAgICAgICAgaWYgKGdfZmls ZV90ZXN0KGZ1bGxQYXRoLmdldCgpLCBHX0ZJTEVfVEVTVF9FWElTVFMpKSB7Ci0gICAgICAgICAg ICAgICAgZm91bmQgPSB0cnVlOwotICAgICAgICAgICAgICAgIGlmICghRmNDb25maWdBcHBGb250 QWRkRmlsZShjb25maWcsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgRmNDaGFyOCo+KGZ1bGxQYXRo LmdldCgpKSkpCi0gICAgICAgICAgICAgICAgICAgIGdfZXJyb3IoIkNvdWxkIG5vdCBsb2FkIGZv bnQgYXQgJXMhIiwgZnVsbFBhdGguZ2V0KCkpOwotICAgICAgICAgICAgICAgIGVsc2UKLSAgICAg ICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLQotICAgICAg ICBpZiAoIWZvdW5kKSB7Ci0gICAgICAgICAgICBHT3duUHRyPGdjaGFyPiBkaXJlY3Rvcmllc0Rl c2NyaXB0aW9uOwotICAgICAgICAgICAgZm9yIChzaXplX3QgcGF0aCA9IDA7IHBhdGggPCBHX05f RUxFTUVOVFMoZm9udERpcmVjdG9yaWVzKTsgcGF0aCsrKQotICAgICAgICAgICAgICAgIGRpcmVj dG9yaWVzRGVzY3JpcHRpb24uc2V0KGdfc3Ryam9pbigiOiIsIGRpcmVjdG9yaWVzRGVzY3JpcHRp b24ucmVsZWFzZSgpLCBmb250RGlyZWN0b3JpZXNbcGF0aF0sIE5VTEwpKTsKLSAgICAgICAgICAg IGdfZXJyb3IoIkNvdWxkIG5vdCBmaW5kIGZvbnQgJXMgaW4gJXMuIEVpdGhlciBpbnN0YWxsIHRo aXMgZm9udCBvciBmaWxlIGEgYnVnICIKLSAgICAgICAgICAgICAgICAgICAgImF0IGh0dHA6Ly9i dWdzLndlYmtpdC5vcmcgaWYgaXQgaXMgaW5zdGFsbGVkIGluIGFub3RoZXIgbG9jYXRpb24uIiwK LSAgICAgICAgICAgICAgICAgICAgZm9udFBhdGhzW2ZvbnRdLCBkaXJlY3Rvcmllc0Rlc2NyaXB0 aW9uLmdldCgpKTsKLSAgICAgICAgfQorICAgIGNvbnN0IGNoYXIqIGZvbnRzUGF0aCA9IGdfZ2V0 ZW52KCJXRUJLSVRfVEVTVF9GT05UUyIpOworICAgIGlmICghZm9udHNQYXRoKQorICAgICAgICBn X2Vycm9yKCJXRUJLSVRfVEVTVF9GT05UUyBlbnZpcm9ubWVudCB2YXJpYWJsZSBub3Qgc2V0Iik7 CisKKyAgICBHT3duUHRyPEdFcnJvcj4gZXJyb3I7CisgICAgR093blB0cjxHRGlyPiBmb250c0Rp cmVjdG9yeShnX2Rpcl9vcGVuKGZvbnRzUGF0aCwgMCwgJmVycm9yLm91dFB0cigpKSk7CisgICAg d2hpbGUgKGNvbnN0IGNoYXIqIGRpcmVjdG9yeUVudHJ5ID0gZ19kaXJfcmVhZF9uYW1lKGZvbnRz RGlyZWN0b3J5LmdldCgpKSkgeworICAgICAgICBpZiAoIWdfc3RyX2hhc19zdWZmaXgoZGlyZWN0 b3J5RW50cnksICIudHRmIikgJiYgIWdfc3RyX2hhc19zdWZmaXgoZGlyZWN0b3J5RW50cnksICIu b3RmIikpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgR093blB0cjxnY2hhcj4gZm9u dFBhdGgoZ19idWlsZF9maWxlbmFtZShmb250c1BhdGgsIGRpcmVjdG9yeUVudHJ5LCBOVUxMKSk7 CisgICAgICAgIGlmICghRmNDb25maWdBcHBGb250QWRkRmlsZShjb25maWcsIHJlaW50ZXJwcmV0 X2Nhc3Q8Y29uc3QgRmNDaGFyOCo+KGZvbnRQYXRoLmdldCgpKSkpCisgICAgICAgICAgICBnX2Vy cm9yKCJDb3VsZCBub3QgbG9hZCBmb250IGF0ICVzISIsIGZvbnRQYXRoLmdldCgpKTsKICAgICB9 CiAKICAgICAvLyBBaGVtIGlzIHVzZWQgYnkgbWFueSBsYXlvdXQgdGVzdHMuCg== 117442 2011-12-01 10:17:26 -0800 2011-12-01 14:46:57 -0800 Patch bug-73487-20111201191724.patch text/plain 12464 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNjM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 MmE2Yzc1OTA3ZjE0MTRkODAzNjZjYzk5OGNkMjMxNzViNTM0ZTQwLi5hMDMyZDVjMGRmMzJmOTRk MjZmMmNiMWViZTU3NDU1ZjUyNDA0M2RmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxNyBAQAogMjAxMS0xMi0wMSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxp YS5jb20+CiAKKyAgICAgICAgW0dUS10gUmVhZCBmb250cyBmcm9tIHRoZSBqaGJ1aWxkIHJvb3QK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczNDg3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVhZCBmb250 cyBmcm9tIHRoZSBqaGJ1aWxkIHJvb3QgaW5zdGVhZCBvZiBmcm9tIHRoZSBzeXN0ZW0uIFRoaXMg d2lsbCBlbnN1cmUKKyAgICAgICAgdGhhdCBhbGwgdGVzdGVycyB1c2UgdGhlIHNhbWUgZm9udHMg aW5zdGVhZCBvZiBsZWF2aW5nIHRoaXMgdXAgdG8gbHVjay4KKworICAgICAgICAqIHd0Zi9nb2Jq ZWN0L0dsaWJVdGlsaXRpZXMuaDogQWRkIEFzc2VydGlvbnMuaCB3aGljaCB3YXMgcmVxdWlyZWQg Zm9yIHRoZSBXZWJLaXQyVGVzdFJ1bm5lci4KKworMjAxMS0xMi0wMSAgTWFydGluIFJvYmluc29u ICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10gQWRkIGEgaGVscGVyIGZ1 bmN0aW9uIHRvIGZpbmQgdGhlIGN1cnJlbnQgZXhlY3V0YWJsZSdzIHBhdGgKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczNDczCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HbGliVXRpbGl0aWVzLmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR2xpYlV0aWxpdGllcy5oCmluZGV4IDZmM2Jh NmM1YjFiOTYwZDQ0OWNlYzQzNmM5OTI5ODMwMWI4YWY2NDguLjU1NzdiZjU4ZTNlOGIyNzJjMDA4 ZjY4NzdhY2VjYzkyYmZjZDVhMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93 dGYvZ29iamVjdC9HbGliVXRpbGl0aWVzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0 Zi9nb2JqZWN0L0dsaWJVdGlsaXRpZXMuaApAQCAtMjAsNiArMjAsNyBAQAogI2lmbmRlZiBHbGli VXRpbGl0aWVzX2gKICNkZWZpbmUgR2xpYlV0aWxpdGllc19oCiAKKyNpbmNsdWRlICJBc3NlcnRp b25zLmgiCiAjaW5jbHVkZSAiQ1N0cmluZy5oIgogCiBDU3RyaW5nIGdldEN1cnJlbnRFeGVjdXRh YmxlUGF0aCgpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IGRhY2NiMzhhNjYxMGNmZmQ1YmE5NGI4ZDg4ODdmYmJkZDAxNGIyYjEuLjY4NmQ2OTI2 ZWQ5ZmEzNzFmZDEyOWEzNDBjNTkzMzg4MzhkZDFiNTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0xMS0zMCAg TWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10g UmVhZCBmb250cyBmcm9tIHRoZSBqaGJ1aWxkIHJvb3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczNDg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVhZCBmb250cyBmcm9tIHRoZSBqaGJ1aWxkIHJvb3Qg aW5zdGVhZCBvZiBmcm9tIHRoZSBzeXN0ZW0uIFRoaXMgd2lsbCBlbnN1cmUKKyAgICAgICAgdGhh dCBhbGwgdGVzdGVycyB1c2UgdGhlIHNhbWUgZm9udHMgaW5zdGVhZCBvZiBsZWF2aW5nIHRoaXMg dXAgdG8gbHVjay4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJl ZS5jcHA6CisgICAgICAgIChpbml0aWFsaXplRm9udHMpOiBMb2FkIGZvbnRzIGZyb20gamhidWls ZCByb290LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3Rr LnB5OgorICAgICAgICAoR3RrUG9ydC5zZXR1cF9lbnZpcm9uX2Zvcl9zZXJ2ZXIpOiBQYXNzIGFu IGVudmlyb25tZW50IHZhcmlhYmxlIGNvbnRhaW5pbmcKKyAgICAgICAgdGhlIHBhdGggdG8gdGhl IGpoYnVpbGQgcm9vdC4KKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxl L2d0ay9BY3RpdmF0ZUZvbnRzR3RrLmNwcDoKKyAgICAgICAgKFdUUjo6aW5pdGl0aWFsaXplRm9u dENvbmZpZ1NldHRpbmcpOiBMb2FkIGZvbnRzIGZyb20gdGhlIGpoYnVpbGQgcm9vdC4KKwogMjAx MS0xMi0wMSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS10gQWRkIGEgaGVscGVyIGZ1bmN0aW9uIHRvIGZpbmQgdGhlIGN1cnJlbnQgZXhlY3V0 YWJsZSdzIHBhdGgKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVu ZGVyVHJlZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3Bw CmluZGV4IGM5ODQxMWU2NThjZjliMjBkMzdlMTdhOTM4NWM4NzY4ZDI5NDZhZjkuLjM5ZDM2NDE0 ZmZlMDZkMDRmY2U0MzIzYzc4Y2EzMGEyMzczYzg1NmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNTQsNiArNTQsNyBAQAogI2luY2x1ZGUgPGd0 ay9ndGsuaD4KICNpbmNsdWRlIDx3ZWJraXQvd2Via2l0Lmg+CiAjaW5jbHVkZSA8d3RmL0Fzc2Vy dGlvbnMuaD4KKyNpbmNsdWRlIDx3dGYvZ29iamVjdC9HbGliVXRpbGl0aWVzLmg+CiAKICNpZiBQ TEFURk9STShYMTEpCiAjaW5jbHVkZSA8Zm9udGNvbmZpZy9mb250Y29uZmlnLmg+CkBAIC0xNzcs NjIgKzE3OCwyNSBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplRm9udHMoY29uc3QgY2hhciogdGVz dFVSTCA9IDApCiAgICAgaWYgKCFGY0NvbmZpZ1BhcnNlQW5kTG9hZChjb25maWcsIHJlaW50ZXJw cmV0X2Nhc3Q8RmNDaGFyOCo+KGZvbnRDb25maWdGaWxlbmFtZS5nZXQoKSksIHRydWUpKQogICAg ICAgICBnX2Vycm9yKCJDb3VsZG4ndCBsb2FkIGZvbnQgY29uZmlndXJhdGlvbiBmaWxlIGZyb206 ICVzIiwgZm9udENvbmZpZ0ZpbGVuYW1lLmdldCgpKTsKIAotICAgIHN0YXRpYyBjb25zdCBjaGFy ICpjb25zdCBmb250RGlyZWN0b3JpZXNbXSA9IHsKLSAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMv dHJ1ZXR5cGUvbGliZXJhdGlvbiIsCi0gICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBl L3R0Zi1saWJlcmF0aW9uIiwKLSAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvbGliZXJhdGlvbiIs Ci0gICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL3R0Zi1kZWphdnUiLAotICAgICAg ICAiL3Vzci9zaGFyZS9mb250cy9kZWphdnUiLAotICAgICAgICAiL3Vzci9zaGFyZS9mb250cy9v cGVudHlwZS9zdGl4IiwKLSAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvc3RpeCIKLSAgICB9Owot Ci0gICAgc3RhdGljIGNvbnN0IGNoYXIgKmNvbnN0IGZvbnRQYXRoc1tdID0gewotICAgICAgICAi TGliZXJhdGlvbk1vbm8tQm9sZEl0YWxpYy50dGYiLAotICAgICAgICAiTGliZXJhdGlvbk1vbm8t Qm9sZC50dGYiLAotICAgICAgICAiTGliZXJhdGlvbk1vbm8tSXRhbGljLnR0ZiIsCi0gICAgICAg ICJMaWJlcmF0aW9uTW9uby1SZWd1bGFyLnR0ZiIsCi0gICAgICAgICJMaWJlcmF0aW9uU2Fucy1C b2xkSXRhbGljLnR0ZiIsCi0gICAgICAgICJMaWJlcmF0aW9uU2Fucy1Cb2xkLnR0ZiIsCi0gICAg ICAgICJMaWJlcmF0aW9uU2Fucy1JdGFsaWMudHRmIiwKLSAgICAgICAgIkxpYmVyYXRpb25TYW5z LVJlZ3VsYXIudHRmIiwKLSAgICAgICAgIkxpYmVyYXRpb25TZXJpZi1Cb2xkSXRhbGljLnR0ZiIs Ci0gICAgICAgICJMaWJlcmF0aW9uU2VyaWYtQm9sZC50dGYiLAotICAgICAgICAiTGliZXJhdGlv blNlcmlmLUl0YWxpYy50dGYiLAotICAgICAgICAiTGliZXJhdGlvblNlcmlmLVJlZ3VsYXIudHRm IiwKLSAgICAgICAgIkRlamFWdVNhbnMudHRmIiwKLSAgICAgICAgIkRlamFWdVNlcmlmLnR0ZiIs Ci0KLSAgICAgICAgLy8gTWF0aE1MIHRlc3RzIHJlcXVpcmUgdGhlIFNUSVggZm9udHMuCi0gICAg ICAgICJTVElYR2VuZXJhbC5vdGYiLAotICAgICAgICAiU1RJWEdlbmVyYWxCb2xJdGEub3RmIiwK LSAgICAgICAgIlNUSVhHZW5lcmFsQm9sLm90ZiIsCi0gICAgICAgICJTVElYR2VuZXJhbEl0YWxp Yy5vdGYiCi0gICAgfTsKKyAgICBDU3RyaW5nIGZvbnRzUGF0aCA9IGdfZ2V0ZW52KCJXRUJLSVRf VEVTVF9GT05UUyIpOworICAgIGlmIChmb250c1BhdGguaXNOdWxsKCkpIHsKKyAgICAgICAgR093 blB0cjxjaGFyPiBwYXJlbnRQYXRoKGdfcGF0aF9nZXRfZGlybmFtZShnZXRDdXJyZW50RXhlY3V0 YWJsZVBhdGgoKS5kYXRhKCkpKTsKKyAgICAgICAgR093blB0cjxjaGFyPiBhbHRlcm5hdGVQYXRo KGdfYnVpbGRfZmlsZW5hbWUocGFyZW50UGF0aC5nZXQoKSwgIi4uIiwgIi4uIiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkRlcGVuZGVuY2ll cyIsICJSb290IiwgIndlYmtpdGd0ay10ZXN0LWZvbnRzIiwgTlVMTCkpOworICAgICAgICBmb250 c1BhdGggPSBhbHRlcm5hdGVQYXRoLmdldCgpOworICAgICAgICBpZiAoIWdfZmlsZV90ZXN0KGFs dGVybmF0ZVBhdGguZ2V0KCksIHN0YXRpY19jYXN0PEdGaWxlVGVzdD4oR19GSUxFX1RFU1RfRVhJ U1RTIHwgR19GSUxFX1RFU1RfSVNfRElSKSkpCisgICAgICAgICAgICBnX2Vycm9yKCJXRUJLSVRf VEVTVF9GT05UUyBlbnZpcm9ubWVudCB2YXJpYWJsZSBub3Qgc2V0IGFuZCAlcyBkb2VzIG5vdCBl eGlzdCIsIGFsdGVybmF0ZVBhdGguZ2V0KCkpOworICAgIH0KIAotICAgIC8vIFRPRE86IFNvbWUg dGVzdHMgdXNlIEx1Y2lkYS4gV2Ugc2hvdWxkIGxvYWQgdGhlc2UgYXMgd2VsbCwgb25jZSBpdCBi ZWNvbWVzCi0gICAgLy8gY2xlYXIgaG93IHRvIGluc3RhbGwgdGhlc2UgZm9udHMgZWFzaWx5IG9u IEZlZG9yYS4KLSAgICBmb3IgKHNpemVfdCBmb250ID0gMDsgZm9udCA8IEdfTl9FTEVNRU5UUyhm b250UGF0aHMpOyBmb250KyspIHsKLSAgICAgICAgYm9vbCBmb3VuZCA9IGZhbHNlOwotICAgICAg ICBmb3IgKHNpemVfdCBwYXRoID0gMDsgcGF0aCA8IEdfTl9FTEVNRU5UUyhmb250RGlyZWN0b3Jp ZXMpOyBwYXRoKyspIHsKLSAgICAgICAgICAgIEdPd25QdHI8Z2NoYXI+IGZ1bGxQYXRoKGdfYnVp bGRfZmlsZW5hbWUoZm9udERpcmVjdG9yaWVzW3BhdGhdLCBmb250UGF0aHNbZm9udF0sIE5VTEwp KTsKLSAgICAgICAgICAgIGlmIChnX2ZpbGVfdGVzdChmdWxsUGF0aC5nZXQoKSwgR19GSUxFX1RF U1RfRVhJU1RTKSkgewotICAgICAgICAgICAgICAgIGZvdW5kID0gdHJ1ZTsKLSAgICAgICAgICAg ICAgICBpZiAoIUZjQ29uZmlnQXBwRm9udEFkZEZpbGUoY29uZmlnLCByZWludGVycHJldF9jYXN0 PGNvbnN0IEZjQ2hhcjgqPihmdWxsUGF0aC5nZXQoKSkpKQotICAgICAgICAgICAgICAgICAgICBn X2Vycm9yKCJDb3VsZCBub3QgbG9hZCBmb250IGF0ICVzISIsIGZ1bGxQYXRoLmdldCgpKTsKLSAg ICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAg ICAgfQotICAgICAgICB9CisgICAgR093blB0cjxHRXJyb3I+IGVycm9yOworICAgIEdPd25QdHI8 R0Rpcj4gZm9udHNEaXJlY3RvcnkoZ19kaXJfb3Blbihmb250c1BhdGguZGF0YSgpLCAwLCAmZXJy b3Iub3V0UHRyKCkpKTsKKyAgICB3aGlsZSAoY29uc3QgY2hhciogZGlyZWN0b3J5RW50cnkgPSBn X2Rpcl9yZWFkX25hbWUoZm9udHNEaXJlY3RvcnkuZ2V0KCkpKSB7CisgICAgICAgIGlmICghZ19z dHJfaGFzX3N1ZmZpeChkaXJlY3RvcnlFbnRyeSwgIi50dGYiKSAmJiAhZ19zdHJfaGFzX3N1ZmZp eChkaXJlY3RvcnlFbnRyeSwgIi5vdGYiKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg ICBHT3duUHRyPGdjaGFyPiBmb250UGF0aChnX2J1aWxkX2ZpbGVuYW1lKGZvbnRzUGF0aC5kYXRh KCksIGRpcmVjdG9yeUVudHJ5LCBOVUxMKSk7CisgICAgICAgIGlmICghRmNDb25maWdBcHBGb250 QWRkRmlsZShjb25maWcsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgRmNDaGFyOCo+KGZvbnRQYXRo LmdldCgpKSkpCisgICAgICAgICAgICBnX2Vycm9yKCJDb3VsZCBub3QgbG9hZCBmb250IGF0ICVz ISIsIGZvbnRQYXRoLmdldCgpKTsKIAotICAgICAgICBpZiAoIWZvdW5kKSB7Ci0gICAgICAgICAg ICBHT3duUHRyPGdjaGFyPiBkaXJlY3Rvcmllc0Rlc2NyaXB0aW9uOwotICAgICAgICAgICAgZm9y IChzaXplX3QgcGF0aCA9IDA7IHBhdGggPCBHX05fRUxFTUVOVFMoZm9udERpcmVjdG9yaWVzKTsg cGF0aCsrKQotICAgICAgICAgICAgICAgIGRpcmVjdG9yaWVzRGVzY3JpcHRpb24uc2V0KGdfc3Ry am9pbigiOiIsIGRpcmVjdG9yaWVzRGVzY3JpcHRpb24ucmVsZWFzZSgpLCBmb250RGlyZWN0b3Jp ZXNbcGF0aF0sIE5VTEwpKTsKLSAgICAgICAgICAgIGdfZXJyb3IoIkNvdWxkIG5vdCBmaW5kIGZv bnQgJXMgaW4gJXMuIEVpdGhlciBpbnN0YWxsIHRoaXMgZm9udCBvciBmaWxlIGEgYnVnICIKLSAg ICAgICAgICAgICAgICAgICAgImF0IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcgaWYgaXQgaXMgaW5z dGFsbGVkIGluIGFub3RoZXIgbG9jYXRpb24uIiwKLSAgICAgICAgICAgICAgICAgICAgZm9udFBh dGhzW2ZvbnRdLCBkaXJlY3Rvcmllc0Rlc2NyaXB0aW9uLmdldCgpKTsKLSAgICAgICAgfQogICAg IH0KIAogICAgIC8vIEFoZW0gaXMgdXNlZCBieSBtYW55IGxheW91dCB0ZXN0cy4KZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9ndGsucHkKaW5kZXggMjRkN2Ux MjQyZWZhZGFmZDBkOTcwZmYzOGZmMGFjMjBkMzY3ODQzZC4uYmYyYjU2ZjI2ZmQyODAxODhlZWE0 NTRjMGZkOTVmM2UxYmRhZTFhOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9ndGsucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9ndGsucHkKQEAgLTg5LDYgKzg5LDcgQEAgY2xhc3MgR3RrUG9ydChXZWJL aXRQb3J0KToKICAgICAgICAgZW52aXJvbm1lbnRbJ1RFU1RfUlVOTkVSX0lOSkVDVEVEX0JVTkRM RV9GSUxFTkFNRSddID0gc2VsZi5fYnVpbGRfcGF0aCgnTGlicmFyaWVzJywgJ2xpYlRlc3RSdW5u ZXJJbmplY3RlZEJ1bmRsZS5sYScpCiAgICAgICAgIGVudmlyb25tZW50WydURVNUX1JVTk5FUl9U RVNUX1BMVUdJTl9QQVRIJ10gPSBzZWxmLl9idWlsZF9wYXRoKCdUZXN0TmV0c2NhcGVQbHVnaW4n LCAnLmxpYnMnKQogICAgICAgICBlbnZpcm9ubWVudFsnV0VCS0lUX0lOU1BFQ1RPUl9QQVRIJ10g PSBzZWxmLl9idWlsZF9wYXRoKCdQcm9ncmFtcycsICdyZXNvdXJjZXMnLCAnaW5zcGVjdG9yJykK KyAgICAgICAgZW52aXJvbm1lbnRbJ1dFQktJVF9URVNUX0ZPTlRTJ10gPSBzZWxmLl9idWlsZF9w YXRoKCcuLicsICdEZXBlbmRlbmNpZXMnLCAnUm9vdCcsICd3ZWJraXRndGstdGVzdC1mb250cycp CiAgICAgICAgIHJldHVybiBlbnZpcm9ubWVudAogCiAgICAgZGVmIF9nZW5lcmF0ZV9hbGxfdGVz dF9jb25maWd1cmF0aW9ucyhzZWxmKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvZ3RrL0FjdGl2YXRlRm9udHNHdGsuY3BwIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250c0d0ay5jcHAKaW5kZXgg MWI1MzZlY2IzZTExZmQ2OWEwMzA0OGE2NzNkY2RhMjQ0MTBhZTdhOC4uY2YzOWNkNjdiODBkODdk ZmMwNjBkZjQ2M2M3NGFhMzI2YWZkZTdkMiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250c0d0ay5jcHAKKysrIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250c0d0ay5jcHAK QEAgLTMzLDYgKzMzLDcgQEAKIAogI2luY2x1ZGUgPGZvbnRjb25maWcvZm9udGNvbmZpZy5oPgog I2luY2x1ZGUgPGd0ay9ndGsuaD4KKyNpbmNsdWRlIDx3dGYvZ29iamVjdC9HbGliVXRpbGl0aWVz Lmg+CiAjaW5jbHVkZSA8d3RmL2dvYmplY3QvR093blB0ci5oPgogCiBuYW1lc3BhY2UgV1RSIHsK QEAgLTcxLDYyICs3MiwyNCBAQCB2b2lkIGluaXRpdGlhbGl6ZUZvbnRDb25maWdTZXR0aW5nKCkK ICAgICBpZiAoIUZjQ29uZmlnUGFyc2VBbmRMb2FkKGNvbmZpZywgcmVpbnRlcnByZXRfY2FzdDxG Y0NoYXI4Kj4oZm9udENvbmZpZ0ZpbGVuYW1lLmdldCgpKSwgdHJ1ZSkpCiAgICAgICAgIGdfZXJy b3IoIkNvdWxkbid0IGxvYWQgZm9udCBjb25maWd1cmF0aW9uIGZpbGUgZnJvbTogJXMiLCBmb250 Q29uZmlnRmlsZW5hbWUuZ2V0KCkpOwogCi0gICAgc3RhdGljIGNvbnN0IGNoYXIgKmNvbnN0IGZv bnREaXJlY3Rvcmllc1tdID0gewotICAgICAgICAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS9s aWJlcmF0aW9uIiwKLSAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLWxpYmVy YXRpb24iLAotICAgICAgICAiL3Vzci9zaGFyZS9mb250cy9saWJlcmF0aW9uIiwKLSAgICAgICAg Ii91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLWRlamF2dSIsCi0gICAgICAgICIvdXNyL3No YXJlL2ZvbnRzL2RlamF2dSIsCi0gICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL29wZW50eXBlL3N0 aXgiLAotICAgICAgICAiL3Vzci9zaGFyZS9mb250cy9zdGl4IgotICAgIH07Ci0KLSAgICBzdGF0 aWMgY29uc3QgY2hhciAqY29uc3QgZm9udFBhdGhzW10gPSB7Ci0gICAgICAgICJMaWJlcmF0aW9u TW9uby1Cb2xkSXRhbGljLnR0ZiIsCi0gICAgICAgICJMaWJlcmF0aW9uTW9uby1Cb2xkLnR0ZiIs Ci0gICAgICAgICJMaWJlcmF0aW9uTW9uby1JdGFsaWMudHRmIiwKLSAgICAgICAgIkxpYmVyYXRp b25Nb25vLVJlZ3VsYXIudHRmIiwKLSAgICAgICAgIkxpYmVyYXRpb25TYW5zLUJvbGRJdGFsaWMu dHRmIiwKLSAgICAgICAgIkxpYmVyYXRpb25TYW5zLUJvbGQudHRmIiwKLSAgICAgICAgIkxpYmVy YXRpb25TYW5zLUl0YWxpYy50dGYiLAotICAgICAgICAiTGliZXJhdGlvblNhbnMtUmVndWxhci50 dGYiLAotICAgICAgICAiTGliZXJhdGlvblNlcmlmLUJvbGRJdGFsaWMudHRmIiwKLSAgICAgICAg IkxpYmVyYXRpb25TZXJpZi1Cb2xkLnR0ZiIsCi0gICAgICAgICJMaWJlcmF0aW9uU2VyaWYtSXRh bGljLnR0ZiIsCi0gICAgICAgICJMaWJlcmF0aW9uU2VyaWYtUmVndWxhci50dGYiLAotICAgICAg ICAiRGVqYVZ1U2Fucy50dGYiLAotICAgICAgICAiRGVqYVZ1U2VyaWYudHRmIiwKLQotICAgICAg ICAvLyBNYXRoTUwgdGVzdHMgcmVxdWlyZSB0aGUgU1RJWCBmb250cy4KLSAgICAgICAgIlNUSVhH ZW5lcmFsLm90ZiIsCi0gICAgICAgICJTVElYR2VuZXJhbEJvbEl0YS5vdGYiLAotICAgICAgICAi U1RJWEdlbmVyYWxCb2wub3RmIiwKLSAgICAgICAgIlNUSVhHZW5lcmFsSXRhbGljLm90ZiIKLSAg ICB9OworICAgIENTdHJpbmcgZm9udHNQYXRoID0gZ19nZXRlbnYoIldFQktJVF9URVNUX0ZPTlRT Iik7CisgICAgaWYgKGZvbnRzUGF0aC5pc051bGwoKSkgeworICAgICAgICBHT3duUHRyPGNoYXI+ IHBhcmVudFBhdGgoZ19wYXRoX2dldF9kaXJuYW1lKGdldEN1cnJlbnRFeGVjdXRhYmxlUGF0aCgp LmRhdGEoKSkpOworICAgICAgICBHT3duUHRyPGNoYXI+IGFsdGVybmF0ZVBhdGgoZ19idWlsZF9m aWxlbmFtZShwYXJlbnRQYXRoLmdldCgpLCAiLi4iLCAiLi4iLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiRGVwZW5kZW5jaWVzIiwgIlJvb3Qi LCAid2Via2l0Z3RrLXRlc3QtZm9udHMiLCBOVUxMKSk7CisgICAgICAgIGZvbnRzUGF0aCA9IGFs dGVybmF0ZVBhdGguZ2V0KCk7CisgICAgICAgIGlmICghZ19maWxlX3Rlc3QoYWx0ZXJuYXRlUGF0 aC5nZXQoKSwgc3RhdGljX2Nhc3Q8R0ZpbGVUZXN0PihHX0ZJTEVfVEVTVF9FWElTVFMgfCBHX0ZJ TEVfVEVTVF9JU19ESVIpKSkKKyAgICAgICAgICAgIGdfZXJyb3IoIldFQktJVF9URVNUX0ZPTlRT IGVudmlyb25tZW50IHZhcmlhYmxlIG5vdCBzZXQgYW5kICVzIGRvZXMgbm90IGV4aXN0IiwgYWx0 ZXJuYXRlUGF0aC5nZXQoKSk7CisgICAgfQogCi0gICAgLy8gVE9ETzogU29tZSB0ZXN0cyB1c2Ug THVjaWRhLiBXZSBzaG91bGQgbG9hZCB0aGVzZSBhcyB3ZWxsLCBvbmNlIGl0IGJlY29tZXMKLSAg ICAvLyBjbGVhciBob3cgdG8gaW5zdGFsbCB0aGVzZSBmb250cyBlYXNpbHkgb24gRmVkb3JhLgot ICAgIGZvciAoc2l6ZV90IGZvbnQgPSAwOyBmb250IDwgR19OX0VMRU1FTlRTKGZvbnRQYXRocyk7 IGZvbnQrKykgewotICAgICAgICBib29sIGZvdW5kID0gZmFsc2U7Ci0gICAgICAgIGZvciAoc2l6 ZV90IHBhdGggPSAwOyBwYXRoIDwgR19OX0VMRU1FTlRTKGZvbnREaXJlY3Rvcmllcyk7IHBhdGgr KykgewotICAgICAgICAgICAgR093blB0cjxnY2hhcj4gZnVsbFBhdGgoZ19idWlsZF9maWxlbmFt ZShmb250RGlyZWN0b3JpZXNbcGF0aF0sIGZvbnRQYXRoc1tmb250XSwgTlVMTCkpOwotICAgICAg ICAgICAgaWYgKGdfZmlsZV90ZXN0KGZ1bGxQYXRoLmdldCgpLCBHX0ZJTEVfVEVTVF9FWElTVFMp KSB7Ci0gICAgICAgICAgICAgICAgZm91bmQgPSB0cnVlOwotICAgICAgICAgICAgICAgIGlmICgh RmNDb25maWdBcHBGb250QWRkRmlsZShjb25maWcsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgRmND aGFyOCo+KGZ1bGxQYXRoLmdldCgpKSkpCi0gICAgICAgICAgICAgICAgICAgIGdfZXJyb3IoIkNv dWxkIG5vdCBsb2FkIGZvbnQgYXQgJXMhIiwgZnVsbFBhdGguZ2V0KCkpOwotICAgICAgICAgICAg ICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgIH0KLQotICAgICAgICBpZiAoIWZvdW5kKSB7Ci0gICAgICAgICAgICBHT3duUHRyPGdjaGFy PiBkaXJlY3Rvcmllc0Rlc2NyaXB0aW9uOwotICAgICAgICAgICAgZm9yIChzaXplX3QgcGF0aCA9 IDA7IHBhdGggPCBHX05fRUxFTUVOVFMoZm9udERpcmVjdG9yaWVzKTsgcGF0aCsrKQotICAgICAg ICAgICAgICAgIGRpcmVjdG9yaWVzRGVzY3JpcHRpb24uc2V0KGdfc3Ryam9pbigiOiIsIGRpcmVj dG9yaWVzRGVzY3JpcHRpb24ucmVsZWFzZSgpLCBmb250RGlyZWN0b3JpZXNbcGF0aF0sIE5VTEwp KTsKLSAgICAgICAgICAgIGdfZXJyb3IoIkNvdWxkIG5vdCBmaW5kIGZvbnQgJXMgaW4gJXMuIEVp dGhlciBpbnN0YWxsIHRoaXMgZm9udCBvciBmaWxlIGEgYnVnICIKLSAgICAgICAgICAgICAgICAg ICAgImF0IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcgaWYgaXQgaXMgaW5zdGFsbGVkIGluIGFub3Ro ZXIgbG9jYXRpb24uIiwKLSAgICAgICAgICAgICAgICAgICAgZm9udFBhdGhzW2ZvbnRdLCBkaXJl Y3Rvcmllc0Rlc2NyaXB0aW9uLmdldCgpKTsKLSAgICAgICAgfQorICAgIEdPd25QdHI8R0Vycm9y PiBlcnJvcjsKKyAgICBHT3duUHRyPEdEaXI+IGZvbnRzRGlyZWN0b3J5KGdfZGlyX29wZW4oZm9u dHNQYXRoLmRhdGEoKSwgMCwgJmVycm9yLm91dFB0cigpKSk7CisgICAgd2hpbGUgKGNvbnN0IGNo YXIqIGRpcmVjdG9yeUVudHJ5ID0gZ19kaXJfcmVhZF9uYW1lKGZvbnRzRGlyZWN0b3J5LmdldCgp KSkgeworICAgICAgICBpZiAoIWdfc3RyX2hhc19zdWZmaXgoZGlyZWN0b3J5RW50cnksICIudHRm IikgJiYgIWdfc3RyX2hhc19zdWZmaXgoZGlyZWN0b3J5RW50cnksICIub3RmIikpCisgICAgICAg ICAgICBjb250aW51ZTsKKyAgICAgICAgR093blB0cjxnY2hhcj4gZm9udFBhdGgoZ19idWlsZF9m aWxlbmFtZShmb250c1BhdGguZGF0YSgpLCBkaXJlY3RvcnlFbnRyeSwgTlVMTCkpOworICAgICAg ICBpZiAoIUZjQ29uZmlnQXBwRm9udEFkZEZpbGUoY29uZmlnLCByZWludGVycHJldF9jYXN0PGNv bnN0IEZjQ2hhcjgqPihmb250UGF0aC5nZXQoKSkpKQorICAgICAgICAgICAgZ19lcnJvcigiQ291 bGQgbm90IGxvYWQgZm9udCBhdCAlcyEiLCBmb250UGF0aC5nZXQoKSk7CiAgICAgfQogCiAgICAg Ly8gQWhlbSBpcyB1c2VkIGJ5IG1hbnkgbGF5b3V0IHRlc3RzLgo=