137448 2014-10-06 06:36:01 -0700 [jhbuild] Make it possible to build GTK/EFL in same repository 2014-12-11 08:50:34 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mtiborinf webkit-unassigned buildbot cgarcia clopez commit-queue dbates evab.u-szeged gyuyoung.kim mrobinson ossy pnormand rniwa oldest_to_newest 1039722 0 mtiborinf 2014-10-06 06:36:01 -0700 Idea: use Dependencies-[EFL|GTK] or Dependencies/[EFL|GTK] instead of simple Dependencies 1039723 1 239334 mtiborinf 2014-10-06 06:40:19 -0700 Created attachment 239334 Patch This patch will make it possible to build GTK/EFL in same repository. 1045686 2 ossy 2014-11-03 01:51:12 -0800 It is so annoying when jhbuild clobbers the WebKitBuild/Dependencies when I try to build EFL after GTK and vice-versa. I like the idea to use different build directory for dependecies of EFL and GTK. The proposed patch looks good to me (and I tested too, it seems all scripts work), but I'm not 100% sure if everybody wants this change as is. Carlos, Gyuyoung, any comment or concern? 1045761 3 mrobinson 2014-11-03 09:56:40 -0800 I definitely support anything that makes development less painful. I do sort of prefer DependenciesGTK and DependenciesEFL to avoid making too deeply nested directories. 1046047 4 240923 mtiborinf 2014-11-04 05:34:21 -0800 Created attachment 240923 Patch v2 This patch has been changed, as Martin Robinson suggested. 1046058 5 240923 mrobinson 2014-11-04 06:18:49 -0800 Comment on attachment 240923 Patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=240923&action=review > Tools/Scripts/webkitdirs.pm:1645 > + } else { > + push(@jhbuildPath, "DependenciesUnknown"); > + } You should probably print an error and quit in this case. 1046064 6 240925 mtiborinf 2014-11-04 06:43:30 -0800 Created attachment 240925 Patch v3 Updated patch. 1046065 7 240925 mrobinson 2014-11-04 06:46:03 -0800 Comment on attachment 240925 Patch v3 View in context: https://bugs.webkit.org/attachment.cgi?id=240925&action=review > Tools/Scripts/webkitdirs.pm:1644 > + die "No platform specified. Use --gtk or --efl.\n"; The error here would be "Cannot get JHBuild path for platform that isn't GTK+ or EFL." since presumably not specifying a platform means --mac or whatever. 1046066 8 240926 mtiborinf 2014-11-04 06:52:21 -0800 Created attachment 240926 Patch v4 Text has been updated, as you proposed. 1046111 9 240926 commit-queue 2014-11-04 11:05:42 -0800 Comment on attachment 240926 Patch v4 Clearing flags on attachment: 240926 Committed r175555: <http://trac.webkit.org/changeset/175555> 1046112 10 commit-queue 2014-11-04 11:05:46 -0800 All reviewed patches have been landed. Closing bug. 1047537 11 evab.u-szeged 2014-11-10 07:53:33 -0800 Quick fix for the test-font path: https://trac.webkit.org/changeset/175808 1051779 12 pnormand 2014-12-02 02:20:35 -0800 And another, https://bugs.webkit.org/show_bug.cgi?id=139176 Next time you rename something please grep it everywhere. 1054500 13 clopez 2014-12-11 08:50:34 -0800 (In reply to comment #12) > And another, https://bugs.webkit.org/show_bug.cgi?id=139176 > Next time you rename something please grep it everywhere. And another one: https://bugs.webkit.org/show_bug.cgi?id=139537 :\ 239334 2014-10-06 06:40:19 -0700 2014-11-04 05:34:21 -0800 Patch patch_v5.patch text/plain 6764 mtiborinf ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1ODk0 MWY0Li5jOTMxNmQ3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTQtMTAtMDYgIFRpYm9yIE1lc3phcm9zICA8dG1l c3phcm9zLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW2poYnVpbGRd IE1ha2UgaXQgcG9zc2libGUgdG8gYnVpbGQgR1RLL0VGTCBpbiBzYW1lIHJlcG9zaXRvcnkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzQ0OAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRkaXJzLnBtOgorICAgICAgICAoZ2V0SmhidWlsZFBhdGgpOgorICAgICAgICAqIFdlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZWZsL0ZvbnRNYW5hZ2VtZW50LmNwcDoKKyAgICAg ICAgKGdldFBsYXRmb3JtRm9udHNQYXRoKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL2d0ay9BY3RpdmF0ZUZvbnRzR3RrLmNwcDoKKyAgICAgICAgKFdUUjo6Z2V0 Rm9udHNQYXRoKToKKyAgICAgICAgKiBqaGJ1aWxkL2poYnVpbGQtd3JhcHBlcjoKKyAgICAgICAg KGRldGVybWluZV9wbGF0Zm9ybSk6CisgICAgICAgIChpbnN0YWxsX2poYnVpbGQpOgorICAgICAg ICAqIGpoYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weToKKyAgICAgICAgKGluaXQpOgorCiAyMDE0 LTEwLTA2ICBac29sdCBCb3JiZWx5ICA8enNib3JiZWx5LnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3Vu Zy5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgbW92ZWQgbXlzZWxmIHRvIHRoZSBsaXN0IG9m IGNvbW1pdHRlcnMuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9U b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggNzcyZGNjNC4uZTRiM2U4NCAxMDA3NTUK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbQpAQCAtMTYzMCw3ICsxNjMwLDE0IEBAIHN1YiBnZXRKaGJ1aWxkUGF0aCgpCiAg ICAgaWYgKGlzR2l0KCkgJiYgaXNHaXRCcmFuY2hCdWlsZCgpICYmIGdpdEJyYW5jaCgpKSB7CiAg ICAgICAgIHBvcChAamhidWlsZFBhdGgpOwogICAgIH0KLSAgICBwdXNoKEBqaGJ1aWxkUGF0aCwg IkRlcGVuZGVuY2llcyIpOworICAgIGlmIChpc0VmbCgpKSB7CisgICAgICAgIHB1c2goQGpoYnVp bGRQYXRoLCAiRGVwZW5kZW5jaWVzL2VmbCIpOworICAgIH0gZWxzaWYgKGlzR3RrKCkpIHsKKyAg ICAgICAgcHVzaChAamhidWlsZFBhdGgsICJEZXBlbmRlbmNpZXMvZ3RrIik7CisgICAgfSBlbHNl IHsKKyAgICAgICAgcHVzaChAamhidWlsZFBhdGgsICJEZXBlbmRlbmNpZXMvdW5rbm93biIpOwor ICAgIH0KKwogICAgIHJldHVybiBGaWxlOjpTcGVjLT5jYXRkaXIoQGpoYnVpbGRQYXRoKTsKIH0K IApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9lZmwv Rm9udE1hbmFnZW1lbnQuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRs ZS9lZmwvRm9udE1hbmFnZW1lbnQuY3BwCmluZGV4IGVlZTI2ZDEuLmRmYjg4NmIgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZWZsL0ZvbnRNYW5hZ2Vt ZW50LmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2VmbC9G b250TWFuYWdlbWVudC5jcHAKQEAgLTEwMiw3ICsxMDIsNyBAQCBzdGF0aWMgQ1N0cmluZyBnZXRQ bGF0Zm9ybUZvbnRzUGF0aCgpCiB7CiAgICAgQ1N0cmluZyBjdXN0b21CdWlsZERpciA9IGdldEN1 c3RvbUJ1aWxkRGlyKCk7CiAgICAgaWYgKCFjdXN0b21CdWlsZERpci5pc051bGwoKSkgewotICAg ICAgICBDU3RyaW5nIGZvbnRzUGF0aCA9IGJ1aWxkUGF0aChjdXN0b21CdWlsZERpci5kYXRhKCks ICJEZXBlbmRlbmNpZXMiLCAiUm9vdCIsICJ3ZWJraXRndGstdGVzdC1mb250cyIsIDApOworICAg ICAgICBDU3RyaW5nIGZvbnRzUGF0aCA9IGJ1aWxkUGF0aChjdXN0b21CdWlsZERpci5kYXRhKCks ICJEZXBlbmRlbmNpZXMiLCAiZWZsIiwgIlJvb3QiLCAid2Via2l0Z3RrLXRlc3QtZm9udHMiLCAw KTsKICAgICAgICAgaWYgKCFlY29yZV9maWxlX2V4aXN0cyhmb250c1BhdGguZGF0YSgpKSkKICAg ICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiV0VCS0lUX09VVFBVVERJUiBzZXQgdG8gJyVzJywg YnV0IGNvdWxkIG5vdCBsb2NhbCB0ZXN0IGZvbnRzLlxuIiwgY3VzdG9tQnVpbGREaXIuZGF0YSgp KTsKICAgICAgICAgcmV0dXJuIGZvbnRzUGF0aDsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZ3RrL0FjdGl2YXRlRm9udHNHdGsuY3BwIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250c0d0ay5jcHAK aW5kZXggZmQ4ZGVjMi4uNjY3Y2M5NyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250c0d0ay5jcHAKKysrIGIvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250c0d0ay5jcHAKQEAg LTY4LDcgKzY4LDcgQEAgQ1N0cmluZyBnZXRPdXRwdXREaXIoKQogc3RhdGljIENTdHJpbmcgZ2V0 Rm9udHNQYXRoKCkKIHsKICAgICBDU3RyaW5nIHdlYmtpdE91dHB1dERpciA9IGdldE91dHB1dERp cigpOwotICAgIEdVbmlxdWVQdHI8Y2hhcj4gZm9udHNQYXRoKGdfYnVpbGRfZmlsZW5hbWUod2Vi a2l0T3V0cHV0RGlyLmRhdGEoKSwgIkRlcGVuZGVuY2llcyIsICJSb290IiwgIndlYmtpdGd0ay10 ZXN0LWZvbnRzIiwgbnVsbHB0cikpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4gZm9udHNQYXRoKGdf YnVpbGRfZmlsZW5hbWUod2Via2l0T3V0cHV0RGlyLmRhdGEoKSwgIkRlcGVuZGVuY2llcyIsICJn dGsiLCAiUm9vdCIsICJ3ZWJraXRndGstdGVzdC1mb250cyIsIG51bGxwdHIpKTsKICAgICBpZiAo Z19maWxlX3Rlc3QoZm9udHNQYXRoLmdldCgpLCBzdGF0aWNfY2FzdDxHRmlsZVRlc3Q+KEdfRklM RV9URVNUX0VYSVNUUyB8IEdfRklMRV9URVNUX0lTX0RJUikpKQogICAgICAgICByZXR1cm4gZm9u dHNQYXRoLmdldCgpOwogCmRpZmYgLS1naXQgYS9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBl ciBiL1Rvb2xzL2poYnVpbGQvamhidWlsZC13cmFwcGVyCmluZGV4IGJmMjI3ZGYuLmJjYzJkNjIg MTAwNzU1Ci0tLSBhL1Rvb2xzL2poYnVpbGQvamhidWlsZC13cmFwcGVyCisrKyBiL1Rvb2xzL2po YnVpbGQvamhidWlsZC13cmFwcGVyCkBAIC0yNiw5ICsyNiwyMSBAQCBpbXBvcnQgc3lzCiAKIGpo YnVpbGRfcmV2aXNpb24gPSAnYzBjYjQ2MTc3ZDc5MTg5ZmZlMGY3NjA3MDNjNzMyZjFjN2VhOGIy OScKIAorZGVmIGRldGVybWluZV9wbGF0Zm9ybSgpOgorICAgIGlmICctLWVmbCcgaW4gc3lzLmFy Z3Y6CisgICAgICAgIHJldHVybiAiZWZsIjsKKyAgICBpZiAnLS1ndGsnIGluIHN5cy5hcmd2Ogor ICAgICAgICByZXR1cm4gImd0ayI7CisgICAgcmFpc2UgVmFsdWVFcnJvcignTm8gcGxhdGZvcm0g c3BlY2lmaWVkIGZvciBqaGJ1aWxkLXdyYXBwZXIuJykKKwordHJ5OgorICAgIHBsYXRmb3JtID0g ZGV0ZXJtaW5lX3BsYXRmb3JtKCkKK2V4Y2VwdCBWYWx1ZUVycm9yIGFzIGU6CisgICAgc3lzLmV4 aXQoZSkKKwogZGVwZW5kZW5jaWVzX3BhdGggPSBqaGJ1aWxkdXRpbHMuZ2V0X2RlcGVuZGVuY2ll c19wYXRoKCkKLWluc3RhbGxhdGlvbl9wcmVmaXggPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5q b2luKGRlcGVuZGVuY2llc19wYXRoLCAnUm9vdCcpKQotc291cmNlX3BhdGggPSBvcy5wYXRoLmFi c3BhdGgob3MucGF0aC5qb2luKGRlcGVuZGVuY2llc19wYXRoLCAnU291cmNlJykpCitpbnN0YWxs YXRpb25fcHJlZml4ID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihkZXBlbmRlbmNpZXNf cGF0aCwgcGxhdGZvcm0sICdSb290JykpCitzb3VyY2VfcGF0aCA9IG9zLnBhdGguYWJzcGF0aChv cy5wYXRoLmpvaW4oZGVwZW5kZW5jaWVzX3BhdGgsIHBsYXRmb3JtLCAnU291cmNlJykpCiBqaGJ1 aWxkX3NvdXJjZV9wYXRoID0gb3MucGF0aC5qb2luKHNvdXJjZV9wYXRoLCAnamhidWlsZCcpCiBq aGJ1aWxkX3BhdGggPSBvcy5wYXRoLmpvaW4oaW5zdGFsbGF0aW9uX3ByZWZpeCwgJ2JpbicsICdq aGJ1aWxkJykKIApAQCAtOTIsMTUgKzEwNCw2IEBAIGRlZiBpbnN0YWxsX2poYnVpbGQoKToKICAg ICBpZiBwcm9jZXNzLnJldHVybmNvZGUgIT0gMDoKICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdq aGJ1aWxkIGNvbmZpZ3VyZSBmYWlsZWQgd2l0aCByZXR1cm4gY29kZTogJWknICUgcHJvY2Vzcy5y ZXR1cm5jb2RlKQogCi0KLWRlZiBkZXRlcm1pbmVfcGxhdGZvcm0oKToKLSAgICBpZiAnLS1lZmwn IGluIHN5cy5hcmd2OgotICAgICAgICByZXR1cm4gImVmbCI7Ci0gICAgaWYgJy0tZ3RrJyBpbiBz eXMuYXJndjoKLSAgICAgICAgcmV0dXJuICJndGsiOwotICAgIHJhaXNlIFZhbHVlRXJyb3IoJ05v IHBsYXRmb3JtIHNwZWNpZmllZCBmb3IgamhidWlsZC13cmFwcGVyLicpCi0KLQogZGVmIGVuc3Vy ZV9qaGJ1aWxkKHBsYXRmb3JtKToKICAgICBpZiBub3QgamhidWlsZF9jbG9uZWQoKToKICAgICAg ICAgY2xvbmVfamhidWlsZCgpCkBAIC0xMTYsMTAgKzExOSw2IEBAIGRlZiBlbnN1cmVfamhidWls ZChwbGF0Zm9ybSk6CiBpZiBvcy5lbnZpcm9uLmhhc19rZXkoJ1VOREVSX0pIQlVJTEQnKSBhbmQg b3MuZW52aXJvbi5oYXNfa2V5KCdBQ0xPQ0FMX0ZMQUdTJyk6CiAgICAgZGVsIG9zLmVudmlyb25b J0FDTE9DQUxfRkxBR1MnXQogCi10cnk6Ci0gICAgcGxhdGZvcm0gPSBkZXRlcm1pbmVfcGxhdGZv cm0oKQotZXhjZXB0IFZhbHVlRXJyb3IgYXMgZToKLSAgICBzeXMuZXhpdChlKQogZW5zdXJlX2po YnVpbGQocGxhdGZvcm0pCiAKIG9zLmV4ZWN2ZShqaGJ1aWxkX3BhdGgsIFtqaGJ1aWxkX3BhdGgs ICctLW5vLWludGVyYWN0JywgJy1mJywgamhidWlsZHV0aWxzLmdldF9jb25maWdfZmlsZV9mb3Jf cGxhdGZvcm0ocGxhdGZvcm0pXSArIHN5cy5hcmd2WzI6XSwgb3MuZW52aXJvbikKZGlmZiAtLWdp dCBhL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weSBiL1Rvb2xzL2poYnVpbGQvamhi dWlsZHJjX2NvbW1vbi5weQppbmRleCAwMGQ2MzViLi5iYzg1ZTNiIDEwMDY0NAotLS0gYS9Ub29s cy9qaGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkKKysrIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxk cmNfY29tbW9uLnB5CkBAIC01NCwxMSArNTQsMTEgQEAgZGVmIGluaXQoamhidWlsZHJjX2dsb2Jh bHMsIHBsYXRmb3JtKToKICAgICAgICAgamhidWlsZHJjX2dsb2JhbHNbIm1vZHVsZXMiXS5leHRl bmQoX19leHRyYV9tb2R1bGVzKQogCiAgICAgaWYgJ1dFQktJVF9PVVRQVVRESVInIGluIG9zLmVu dmlyb246Ci0gICAgICAgIGpoYnVpbGRyY19nbG9iYWxzWyJjaGVja291dHJvb3QiXSA9IGNoZWNr b3V0cm9vdCA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4ob3MuZW52aXJvblsnV0VCS0lU X09VVFBVVERJUiddLCAnRGVwZW5kZW5jaWVzJywgJ1NvdXJjZScpKQotICAgICAgICBqaGJ1aWxk cmNfZ2xvYmFsc1sicHJlZml4Il0gPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKG9zLmVu dmlyb25bJ1dFQktJVF9PVVRQVVRESVInXSwgJ0RlcGVuZGVuY2llcycsICdSb290JykpCisgICAg ICAgIGpoYnVpbGRyY19nbG9iYWxzWyJjaGVja291dHJvb3QiXSA9IGNoZWNrb3V0cm9vdCA9IG9z LnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4ob3MuZW52aXJvblsnV0VCS0lUX09VVFBVVERJUidd LCAnRGVwZW5kZW5jaWVzJywgcGxhdGZvcm0sICdTb3VyY2UnKSkKKyAgICAgICAgamhidWlsZHJj X2dsb2JhbHNbInByZWZpeCJdID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihvcy5lbnZp cm9uWydXRUJLSVRfT1VUUFVURElSJ10sICdEZXBlbmRlbmNpZXMnLCBwbGF0Zm9ybSwgJ1Jvb3Qn KSkKICAgICBlbHNlOgotICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1siY2hlY2tvdXRyb290Il0g PSBjaGVja291dHJvb3QgPSBvcy5wYXRoLmFic3BhdGgodG9wX2xldmVsX3BhdGgoJ1dlYktpdEJ1 aWxkJywgJ0RlcGVuZGVuY2llcycsICdTb3VyY2UnKSkKLSAgICAgICAgamhidWlsZHJjX2dsb2Jh bHNbInByZWZpeCJdID0gb3MucGF0aC5hYnNwYXRoKHRvcF9sZXZlbF9wYXRoKCdXZWJLaXRCdWls ZCcsICdEZXBlbmRlbmNpZXMnLCAnUm9vdCcpKQorICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1si Y2hlY2tvdXRyb290Il0gPSBjaGVja291dHJvb3QgPSBvcy5wYXRoLmFic3BhdGgodG9wX2xldmVs X3BhdGgoJ1dlYktpdEJ1aWxkJywgJ0RlcGVuZGVuY2llcycsIHBsYXRmb3JtLCAnU291cmNlJykp CisgICAgICAgIGpoYnVpbGRyY19nbG9iYWxzWyJwcmVmaXgiXSA9IG9zLnBhdGguYWJzcGF0aCh0 b3BfbGV2ZWxfcGF0aCgnV2ViS2l0QnVpbGQnLCAnRGVwZW5kZW5jaWVzJywgcGxhdGZvcm0sICdS b290JykpCiAKICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1sibm9ub3RpZnkiXSA9IFRydWUKICAgICBq aGJ1aWxkcmNfZ2xvYmFsc1sibm90cmF5aWNvbiJdID0gVHJ1ZQo= 240923 2014-11-04 05:34:21 -0800 2014-11-04 06:43:30 -0800 Patch v2 patch_v7.patch text/plain 6883 mtiborinf ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NmFm MDU4Li4xNmE3NjM3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTQtMTEtMDQgIFRpYm9yIE1lc3phcm9zICA8dG1l c3phcm9zLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW2poYnVpbGRd IE1ha2UgaXQgcG9zc2libGUgdG8gYnVpbGQgR1RLL0VGTCBpbiBzYW1lIHJlcG9zaXRvcnkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzQ0OAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRkaXJzLnBtOgorICAgICAgICAoZ2V0SmhidWlsZFBhdGgpOgorICAgICAgICAqIFdlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZWZsL0ZvbnRNYW5hZ2VtZW50LmNwcDoKKyAgICAg ICAgKGdldFBsYXRmb3JtRm9udHNQYXRoKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL2d0ay9BY3RpdmF0ZUZvbnRzR3RrLmNwcDoKKyAgICAgICAgKFdUUjo6Z2V0 Rm9udHNQYXRoKToKKyAgICAgICAgKiBqaGJ1aWxkL2poYnVpbGQtd3JhcHBlcjoKKyAgICAgICAg KGRldGVybWluZV9wbGF0Zm9ybSk6CisgICAgICAgIChpbnN0YWxsX2poYnVpbGQpOgorICAgICAg ICAqIGpoYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weToKKyAgICAgICAgKGluaXQpOgorCiAyMDE0 LTExLTAzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAg IEFkZCBwYWdlIG92ZXJsYXlzIHRoYXQgc2hvdyByZWdpb25zIHdpdGggbW91c2VXaGVlbCBldmVu dCBoYW5kbGVycywgYW5kIHRoZSBub24tZmFzdC1zY3JvbGxhYmxlIHJlZ2lvbiwgYW5kIGNvZGUg dG8gdG9nZ2xlIHRoZW0gaW4gTWluaUJyb3dzZXIgV0syCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggOGIw NmIxMi4uN2RhM2UwNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTYzNiw3ICsxNjM2LDEzIEBAIHN1 YiBnZXRKaGJ1aWxkUGF0aCgpCiAgICAgaWYgKGlzR2l0KCkgJiYgaXNHaXRCcmFuY2hCdWlsZCgp ICYmIGdpdEJyYW5jaCgpKSB7CiAgICAgICAgIHBvcChAamhidWlsZFBhdGgpOwogICAgIH0KLSAg ICBwdXNoKEBqaGJ1aWxkUGF0aCwgIkRlcGVuZGVuY2llcyIpOworICAgIGlmIChpc0VmbCgpKSB7 CisgICAgICAgIHB1c2goQGpoYnVpbGRQYXRoLCAiRGVwZW5kZW5jaWVzRUZMIik7CisgICAgfSBl bHNpZiAoaXNHdGsoKSkgeworICAgICAgICBwdXNoKEBqaGJ1aWxkUGF0aCwgIkRlcGVuZGVuY2ll c0dUSyIpOworICAgIH0gZWxzZSB7CisgICAgICAgIHB1c2goQGpoYnVpbGRQYXRoLCAiRGVwZW5k ZW5jaWVzVW5rbm93biIpOworICAgIH0KICAgICByZXR1cm4gRmlsZTo6U3BlYy0+Y2F0ZGlyKEBq aGJ1aWxkUGF0aCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5q ZWN0ZWRCdW5kbGUvZWZsL0ZvbnRNYW5hZ2VtZW50LmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvZWZsL0ZvbnRNYW5hZ2VtZW50LmNwcAppbmRleCBlZWUyNmQxLi4z ZmYzZjA4IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxl L2VmbC9Gb250TWFuYWdlbWVudC5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9lZmwvRm9udE1hbmFnZW1lbnQuY3BwCkBAIC0xMDIsNyArMTAyLDcgQEAgc3Rh dGljIENTdHJpbmcgZ2V0UGxhdGZvcm1Gb250c1BhdGgoKQogewogICAgIENTdHJpbmcgY3VzdG9t QnVpbGREaXIgPSBnZXRDdXN0b21CdWlsZERpcigpOwogICAgIGlmICghY3VzdG9tQnVpbGREaXIu aXNOdWxsKCkpIHsKLSAgICAgICAgQ1N0cmluZyBmb250c1BhdGggPSBidWlsZFBhdGgoY3VzdG9t QnVpbGREaXIuZGF0YSgpLCAiRGVwZW5kZW5jaWVzIiwgIlJvb3QiLCAid2Via2l0Z3RrLXRlc3Qt Zm9udHMiLCAwKTsKKyAgICAgICAgQ1N0cmluZyBmb250c1BhdGggPSBidWlsZFBhdGgoY3VzdG9t QnVpbGREaXIuZGF0YSgpLCAiRGVwZW5kZW5jaWVzRUZMIiwgIlJvb3QiLCAid2Via2l0Z3RrLXRl c3QtZm9udHMiLCAwKTsKICAgICAgICAgaWYgKCFlY29yZV9maWxlX2V4aXN0cyhmb250c1BhdGgu ZGF0YSgpKSkKICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiV0VCS0lUX09VVFBVVERJUiBz ZXQgdG8gJyVzJywgYnV0IGNvdWxkIG5vdCBsb2NhbCB0ZXN0IGZvbnRzLlxuIiwgY3VzdG9tQnVp bGREaXIuZGF0YSgpKTsKICAgICAgICAgcmV0dXJuIGZvbnRzUGF0aDsKZGlmZiAtLWdpdCBhL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZ3RrL0FjdGl2YXRlRm9udHNHdGsu Y3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVG b250c0d0ay5jcHAKaW5kZXggZmQ4ZGVjMi4uNzRmM2FiMCAxMDA2NDQKLS0tIGEvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250c0d0ay5jcHAKKysr IGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250 c0d0ay5jcHAKQEAgLTY4LDcgKzY4LDcgQEAgQ1N0cmluZyBnZXRPdXRwdXREaXIoKQogc3RhdGlj IENTdHJpbmcgZ2V0Rm9udHNQYXRoKCkKIHsKICAgICBDU3RyaW5nIHdlYmtpdE91dHB1dERpciA9 IGdldE91dHB1dERpcigpOwotICAgIEdVbmlxdWVQdHI8Y2hhcj4gZm9udHNQYXRoKGdfYnVpbGRf ZmlsZW5hbWUod2Via2l0T3V0cHV0RGlyLmRhdGEoKSwgIkRlcGVuZGVuY2llcyIsICJSb290Iiwg IndlYmtpdGd0ay10ZXN0LWZvbnRzIiwgbnVsbHB0cikpOworICAgIEdVbmlxdWVQdHI8Y2hhcj4g Zm9udHNQYXRoKGdfYnVpbGRfZmlsZW5hbWUod2Via2l0T3V0cHV0RGlyLmRhdGEoKSwgIkRlcGVu ZGVuY2llc0dUSyIsICJSb290IiwgIndlYmtpdGd0ay10ZXN0LWZvbnRzIiwgbnVsbHB0cikpOwog ICAgIGlmIChnX2ZpbGVfdGVzdChmb250c1BhdGguZ2V0KCksIHN0YXRpY19jYXN0PEdGaWxlVGVz dD4oR19GSUxFX1RFU1RfRVhJU1RTIHwgR19GSUxFX1RFU1RfSVNfRElSKSkpCiAgICAgICAgIHJl dHVybiBmb250c1BhdGguZ2V0KCk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL2poYnVpbGQvamhidWls ZC13cmFwcGVyIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIKaW5kZXggYmYyMjdkZi4u NDUyMjJhZiAxMDA3NTUKLS0tIGEvVG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIKKysrIGIv VG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIKQEAgLTI2LDkgKzI2LDIxIEBAIGltcG9ydCBz eXMKIAogamhidWlsZF9yZXZpc2lvbiA9ICdjMGNiNDYxNzdkNzkxODlmZmUwZjc2MDcwM2M3MzJm MWM3ZWE4YjI5JwogCitkZWYgZGV0ZXJtaW5lX3BsYXRmb3JtKCk6CisgICAgaWYgJy0tZWZsJyBp biBzeXMuYXJndjoKKyAgICAgICAgcmV0dXJuICJlZmwiOworICAgIGlmICctLWd0aycgaW4gc3lz LmFyZ3Y6CisgICAgICAgIHJldHVybiAiZ3RrIjsKKyAgICByYWlzZSBWYWx1ZUVycm9yKCdObyBw bGF0Zm9ybSBzcGVjaWZpZWQgZm9yIGpoYnVpbGQtd3JhcHBlci4nKQorCit0cnk6CisgICAgcGxh dGZvcm0gPSBkZXRlcm1pbmVfcGxhdGZvcm0oKQorZXhjZXB0IFZhbHVlRXJyb3IgYXMgZToKKyAg ICBzeXMuZXhpdChlKQorCiBkZXBlbmRlbmNpZXNfcGF0aCA9IGpoYnVpbGR1dGlscy5nZXRfZGVw ZW5kZW5jaWVzX3BhdGgoKQotaW5zdGFsbGF0aW9uX3ByZWZpeCA9IG9zLnBhdGguYWJzcGF0aChv cy5wYXRoLmpvaW4oZGVwZW5kZW5jaWVzX3BhdGgsICdSb290JykpCi1zb3VyY2VfcGF0aCA9IG9z LnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4oZGVwZW5kZW5jaWVzX3BhdGgsICdTb3VyY2UnKSkK K2luc3RhbGxhdGlvbl9wcmVmaXggPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKGRlcGVu ZGVuY2llc19wYXRoICsgcGxhdGZvcm0udXBwZXIoKSwgJ1Jvb3QnKSkKK3NvdXJjZV9wYXRoID0g b3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihkZXBlbmRlbmNpZXNfcGF0aCArIHBsYXRmb3Jt LnVwcGVyKCksICdTb3VyY2UnKSkKIGpoYnVpbGRfc291cmNlX3BhdGggPSBvcy5wYXRoLmpvaW4o c291cmNlX3BhdGgsICdqaGJ1aWxkJykKIGpoYnVpbGRfcGF0aCA9IG9zLnBhdGguam9pbihpbnN0 YWxsYXRpb25fcHJlZml4LCAnYmluJywgJ2poYnVpbGQnKQogCkBAIC05MiwxNSArMTA0LDYgQEAg ZGVmIGluc3RhbGxfamhidWlsZCgpOgogICAgIGlmIHByb2Nlc3MucmV0dXJuY29kZSAhPSAwOgog ICAgICAgICByYWlzZSBFeGNlcHRpb24oJ2poYnVpbGQgY29uZmlndXJlIGZhaWxlZCB3aXRoIHJl dHVybiBjb2RlOiAlaScgJSBwcm9jZXNzLnJldHVybmNvZGUpCiAKLQotZGVmIGRldGVybWluZV9w bGF0Zm9ybSgpOgotICAgIGlmICctLWVmbCcgaW4gc3lzLmFyZ3Y6Ci0gICAgICAgIHJldHVybiAi ZWZsIjsKLSAgICBpZiAnLS1ndGsnIGluIHN5cy5hcmd2OgotICAgICAgICByZXR1cm4gImd0ayI7 Ci0gICAgcmFpc2UgVmFsdWVFcnJvcignTm8gcGxhdGZvcm0gc3BlY2lmaWVkIGZvciBqaGJ1aWxk LXdyYXBwZXIuJykKLQotCiBkZWYgZW5zdXJlX2poYnVpbGQocGxhdGZvcm0pOgogICAgIGlmIG5v dCBqaGJ1aWxkX2Nsb25lZCgpOgogICAgICAgICBjbG9uZV9qaGJ1aWxkKCkKQEAgLTExNiwxMCAr MTE5LDYgQEAgZGVmIGVuc3VyZV9qaGJ1aWxkKHBsYXRmb3JtKToKIGlmIG9zLmVudmlyb24uaGFz X2tleSgnVU5ERVJfSkhCVUlMRCcpIGFuZCBvcy5lbnZpcm9uLmhhc19rZXkoJ0FDTE9DQUxfRkxB R1MnKToKICAgICBkZWwgb3MuZW52aXJvblsnQUNMT0NBTF9GTEFHUyddCiAKLXRyeToKLSAgICBw bGF0Zm9ybSA9IGRldGVybWluZV9wbGF0Zm9ybSgpCi1leGNlcHQgVmFsdWVFcnJvciBhcyBlOgot ICAgIHN5cy5leGl0KGUpCiBlbnN1cmVfamhidWlsZChwbGF0Zm9ybSkKIAogb3MuZXhlY3ZlKGpo YnVpbGRfcGF0aCwgW2poYnVpbGRfcGF0aCwgJy0tbm8taW50ZXJhY3QnLCAnLWYnLCBqaGJ1aWxk dXRpbHMuZ2V0X2NvbmZpZ19maWxlX2Zvcl9wbGF0Zm9ybShwbGF0Zm9ybSldICsgc3lzLmFyZ3Zb MjpdLCBvcy5lbnZpcm9uKQpkaWZmIC0tZ2l0IGEvVG9vbHMvamhidWlsZC9qaGJ1aWxkcmNfY29t bW9uLnB5IGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkcmNfY29tbW9uLnB5CmluZGV4IDAwZDYzNWIu LmNmNzhjZWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weQor KysgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkKQEAgLTU0LDExICs1NCwxMSBA QCBkZWYgaW5pdChqaGJ1aWxkcmNfZ2xvYmFscywgcGxhdGZvcm0pOgogICAgICAgICBqaGJ1aWxk cmNfZ2xvYmFsc1sibW9kdWxlcyJdLmV4dGVuZChfX2V4dHJhX21vZHVsZXMpCiAKICAgICBpZiAn V0VCS0lUX09VVFBVVERJUicgaW4gb3MuZW52aXJvbjoKLSAgICAgICAgamhidWlsZHJjX2dsb2Jh bHNbImNoZWNrb3V0cm9vdCJdID0gY2hlY2tvdXRyb290ID0gb3MucGF0aC5hYnNwYXRoKG9zLnBh dGguam9pbihvcy5lbnZpcm9uWydXRUJLSVRfT1VUUFVURElSJ10sICdEZXBlbmRlbmNpZXMnLCAn U291cmNlJykpCi0gICAgICAgIGpoYnVpbGRyY19nbG9iYWxzWyJwcmVmaXgiXSA9IG9zLnBhdGgu YWJzcGF0aChvcy5wYXRoLmpvaW4ob3MuZW52aXJvblsnV0VCS0lUX09VVFBVVERJUiddLCAnRGVw ZW5kZW5jaWVzJywgJ1Jvb3QnKSkKKyAgICAgICAgamhidWlsZHJjX2dsb2JhbHNbImNoZWNrb3V0 cm9vdCJdID0gY2hlY2tvdXRyb290ID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihvcy5l bnZpcm9uWydXRUJLSVRfT1VUUFVURElSJ10sICdEZXBlbmRlbmNpZXMnICsgcGxhdGZvcm0udXBw ZXIoKSwgJ1NvdXJjZScpKQorICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1sicHJlZml4Il0gPSBv cy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKG9zLmVudmlyb25bJ1dFQktJVF9PVVRQVVRESVIn XSwgJ0RlcGVuZGVuY2llcycgKyBwbGF0Zm9ybS51cHBlcigpLCAnUm9vdCcpKQogICAgIGVsc2U6 Ci0gICAgICAgIGpoYnVpbGRyY19nbG9iYWxzWyJjaGVja291dHJvb3QiXSA9IGNoZWNrb3V0cm9v dCA9IG9zLnBhdGguYWJzcGF0aCh0b3BfbGV2ZWxfcGF0aCgnV2ViS2l0QnVpbGQnLCAnRGVwZW5k ZW5jaWVzJywgJ1NvdXJjZScpKQotICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1sicHJlZml4Il0g PSBvcy5wYXRoLmFic3BhdGgodG9wX2xldmVsX3BhdGgoJ1dlYktpdEJ1aWxkJywgJ0RlcGVuZGVu Y2llcycsICdSb290JykpCisgICAgICAgIGpoYnVpbGRyY19nbG9iYWxzWyJjaGVja291dHJvb3Qi XSA9IGNoZWNrb3V0cm9vdCA9IG9zLnBhdGguYWJzcGF0aCh0b3BfbGV2ZWxfcGF0aCgnV2ViS2l0 QnVpbGQnLCAnRGVwZW5kZW5jaWVzJyArIHBsYXRmb3JtLnVwcGVyKCksICdTb3VyY2UnKSkKKyAg ICAgICAgamhidWlsZHJjX2dsb2JhbHNbInByZWZpeCJdID0gb3MucGF0aC5hYnNwYXRoKHRvcF9s ZXZlbF9wYXRoKCdXZWJLaXRCdWlsZCcsICdEZXBlbmRlbmNpZXMnICsgcGxhdGZvcm0udXBwZXIo KSwgJ1Jvb3QnKSkKIAogICAgIGpoYnVpbGRyY19nbG9iYWxzWyJub25vdGlmeSJdID0gVHJ1ZQog ICAgIGpoYnVpbGRyY19nbG9iYWxzWyJub3RyYXlpY29uIl0gPSBUcnVlCg== 240925 2014-11-04 06:43:30 -0800 2014-11-04 06:52:21 -0800 Patch v3 patch_v8.patch text/plain 6892 mtiborinf ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NmFm MDU4Li4xNmE3NjM3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTQtMTEtMDQgIFRpYm9yIE1lc3phcm9zICA8dG1l c3phcm9zLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW2poYnVpbGRd IE1ha2UgaXQgcG9zc2libGUgdG8gYnVpbGQgR1RLL0VGTCBpbiBzYW1lIHJlcG9zaXRvcnkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzQ0OAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRkaXJzLnBtOgorICAgICAgICAoZ2V0SmhidWlsZFBhdGgpOgorICAgICAgICAqIFdlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZWZsL0ZvbnRNYW5hZ2VtZW50LmNwcDoKKyAgICAg ICAgKGdldFBsYXRmb3JtRm9udHNQYXRoKToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL2d0ay9BY3RpdmF0ZUZvbnRzR3RrLmNwcDoKKyAgICAgICAgKFdUUjo6Z2V0 Rm9udHNQYXRoKToKKyAgICAgICAgKiBqaGJ1aWxkL2poYnVpbGQtd3JhcHBlcjoKKyAgICAgICAg KGRldGVybWluZV9wbGF0Zm9ybSk6CisgICAgICAgIChpbnN0YWxsX2poYnVpbGQpOgorICAgICAg ICAqIGpoYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weToKKyAgICAgICAgKGluaXQpOgorCiAyMDE0 LTExLTAzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAg IEFkZCBwYWdlIG92ZXJsYXlzIHRoYXQgc2hvdyByZWdpb25zIHdpdGggbW91c2VXaGVlbCBldmVu dCBoYW5kbGVycywgYW5kIHRoZSBub24tZmFzdC1zY3JvbGxhYmxlIHJlZ2lvbiwgYW5kIGNvZGUg dG8gdG9nZ2xlIHRoZW0gaW4gTWluaUJyb3dzZXIgV0syCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggOGIw NmIxMi4uZjQwNDAyMCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTYzNiw3ICsxNjM2LDEzIEBAIHN1 YiBnZXRKaGJ1aWxkUGF0aCgpCiAgICAgaWYgKGlzR2l0KCkgJiYgaXNHaXRCcmFuY2hCdWlsZCgp ICYmIGdpdEJyYW5jaCgpKSB7CiAgICAgICAgIHBvcChAamhidWlsZFBhdGgpOwogICAgIH0KLSAg ICBwdXNoKEBqaGJ1aWxkUGF0aCwgIkRlcGVuZGVuY2llcyIpOworICAgIGlmIChpc0VmbCgpKSB7 CisgICAgICAgIHB1c2goQGpoYnVpbGRQYXRoLCAiRGVwZW5kZW5jaWVzRUZMIik7CisgICAgfSBl bHNpZiAoaXNHdGsoKSkgeworICAgICAgICBwdXNoKEBqaGJ1aWxkUGF0aCwgIkRlcGVuZGVuY2ll c0dUSyIpOworICAgIH0gZWxzZSB7CisgICAgICAgIGRpZSAiTm8gcGxhdGZvcm0gc3BlY2lmaWVk LiBVc2UgLS1ndGsgb3IgLS1lZmwuXG4iOworICAgIH0KICAgICByZXR1cm4gRmlsZTo6U3BlYy0+ Y2F0ZGlyKEBqaGJ1aWxkUGF0aCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvSW5qZWN0ZWRCdW5kbGUvZWZsL0ZvbnRNYW5hZ2VtZW50LmNwcCBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZWZsL0ZvbnRNYW5hZ2VtZW50LmNwcAppbmRleCBl ZWUyNmQxLi4zZmYzZjA4IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVj dGVkQnVuZGxlL2VmbC9Gb250TWFuYWdlbWVudC5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9JbmplY3RlZEJ1bmRsZS9lZmwvRm9udE1hbmFnZW1lbnQuY3BwCkBAIC0xMDIsNyArMTAy LDcgQEAgc3RhdGljIENTdHJpbmcgZ2V0UGxhdGZvcm1Gb250c1BhdGgoKQogewogICAgIENTdHJp bmcgY3VzdG9tQnVpbGREaXIgPSBnZXRDdXN0b21CdWlsZERpcigpOwogICAgIGlmICghY3VzdG9t QnVpbGREaXIuaXNOdWxsKCkpIHsKLSAgICAgICAgQ1N0cmluZyBmb250c1BhdGggPSBidWlsZFBh dGgoY3VzdG9tQnVpbGREaXIuZGF0YSgpLCAiRGVwZW5kZW5jaWVzIiwgIlJvb3QiLCAid2Via2l0 Z3RrLXRlc3QtZm9udHMiLCAwKTsKKyAgICAgICAgQ1N0cmluZyBmb250c1BhdGggPSBidWlsZFBh dGgoY3VzdG9tQnVpbGREaXIuZGF0YSgpLCAiRGVwZW5kZW5jaWVzRUZMIiwgIlJvb3QiLCAid2Vi a2l0Z3RrLXRlc3QtZm9udHMiLCAwKTsKICAgICAgICAgaWYgKCFlY29yZV9maWxlX2V4aXN0cyhm b250c1BhdGguZGF0YSgpKSkKICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiV0VCS0lUX09V VFBVVERJUiBzZXQgdG8gJyVzJywgYnV0IGNvdWxkIG5vdCBsb2NhbCB0ZXN0IGZvbnRzLlxuIiwg Y3VzdG9tQnVpbGREaXIuZGF0YSgpKTsKICAgICAgICAgcmV0dXJuIGZvbnRzUGF0aDsKZGlmZiAt LWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZ3RrL0FjdGl2YXRl Rm9udHNHdGsuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsv QWN0aXZhdGVGb250c0d0ay5jcHAKaW5kZXggZmQ4ZGVjMi4uNzRmM2FiMCAxMDA2NDQKLS0tIGEv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250c0d0 ay5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9ndGsvQWN0 aXZhdGVGb250c0d0ay5jcHAKQEAgLTY4LDcgKzY4LDcgQEAgQ1N0cmluZyBnZXRPdXRwdXREaXIo KQogc3RhdGljIENTdHJpbmcgZ2V0Rm9udHNQYXRoKCkKIHsKICAgICBDU3RyaW5nIHdlYmtpdE91 dHB1dERpciA9IGdldE91dHB1dERpcigpOwotICAgIEdVbmlxdWVQdHI8Y2hhcj4gZm9udHNQYXRo KGdfYnVpbGRfZmlsZW5hbWUod2Via2l0T3V0cHV0RGlyLmRhdGEoKSwgIkRlcGVuZGVuY2llcyIs ICJSb290IiwgIndlYmtpdGd0ay10ZXN0LWZvbnRzIiwgbnVsbHB0cikpOworICAgIEdVbmlxdWVQ dHI8Y2hhcj4gZm9udHNQYXRoKGdfYnVpbGRfZmlsZW5hbWUod2Via2l0T3V0cHV0RGlyLmRhdGEo KSwgIkRlcGVuZGVuY2llc0dUSyIsICJSb290IiwgIndlYmtpdGd0ay10ZXN0LWZvbnRzIiwgbnVs bHB0cikpOwogICAgIGlmIChnX2ZpbGVfdGVzdChmb250c1BhdGguZ2V0KCksIHN0YXRpY19jYXN0 PEdGaWxlVGVzdD4oR19GSUxFX1RFU1RfRVhJU1RTIHwgR19GSUxFX1RFU1RfSVNfRElSKSkpCiAg ICAgICAgIHJldHVybiBmb250c1BhdGguZ2V0KCk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL2poYnVp bGQvamhidWlsZC13cmFwcGVyIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIKaW5kZXgg YmYyMjdkZi4uNDUyMjJhZiAxMDA3NTUKLS0tIGEvVG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBw ZXIKKysrIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIKQEAgLTI2LDkgKzI2LDIxIEBA IGltcG9ydCBzeXMKIAogamhidWlsZF9yZXZpc2lvbiA9ICdjMGNiNDYxNzdkNzkxODlmZmUwZjc2 MDcwM2M3MzJmMWM3ZWE4YjI5JwogCitkZWYgZGV0ZXJtaW5lX3BsYXRmb3JtKCk6CisgICAgaWYg Jy0tZWZsJyBpbiBzeXMuYXJndjoKKyAgICAgICAgcmV0dXJuICJlZmwiOworICAgIGlmICctLWd0 aycgaW4gc3lzLmFyZ3Y6CisgICAgICAgIHJldHVybiAiZ3RrIjsKKyAgICByYWlzZSBWYWx1ZUVy cm9yKCdObyBwbGF0Zm9ybSBzcGVjaWZpZWQgZm9yIGpoYnVpbGQtd3JhcHBlci4nKQorCit0cnk6 CisgICAgcGxhdGZvcm0gPSBkZXRlcm1pbmVfcGxhdGZvcm0oKQorZXhjZXB0IFZhbHVlRXJyb3Ig YXMgZToKKyAgICBzeXMuZXhpdChlKQorCiBkZXBlbmRlbmNpZXNfcGF0aCA9IGpoYnVpbGR1dGls cy5nZXRfZGVwZW5kZW5jaWVzX3BhdGgoKQotaW5zdGFsbGF0aW9uX3ByZWZpeCA9IG9zLnBhdGgu YWJzcGF0aChvcy5wYXRoLmpvaW4oZGVwZW5kZW5jaWVzX3BhdGgsICdSb290JykpCi1zb3VyY2Vf cGF0aCA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4oZGVwZW5kZW5jaWVzX3BhdGgsICdT b3VyY2UnKSkKK2luc3RhbGxhdGlvbl9wcmVmaXggPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5q b2luKGRlcGVuZGVuY2llc19wYXRoICsgcGxhdGZvcm0udXBwZXIoKSwgJ1Jvb3QnKSkKK3NvdXJj ZV9wYXRoID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihkZXBlbmRlbmNpZXNfcGF0aCAr IHBsYXRmb3JtLnVwcGVyKCksICdTb3VyY2UnKSkKIGpoYnVpbGRfc291cmNlX3BhdGggPSBvcy5w YXRoLmpvaW4oc291cmNlX3BhdGgsICdqaGJ1aWxkJykKIGpoYnVpbGRfcGF0aCA9IG9zLnBhdGgu am9pbihpbnN0YWxsYXRpb25fcHJlZml4LCAnYmluJywgJ2poYnVpbGQnKQogCkBAIC05MiwxNSAr MTA0LDYgQEAgZGVmIGluc3RhbGxfamhidWlsZCgpOgogICAgIGlmIHByb2Nlc3MucmV0dXJuY29k ZSAhPSAwOgogICAgICAgICByYWlzZSBFeGNlcHRpb24oJ2poYnVpbGQgY29uZmlndXJlIGZhaWxl ZCB3aXRoIHJldHVybiBjb2RlOiAlaScgJSBwcm9jZXNzLnJldHVybmNvZGUpCiAKLQotZGVmIGRl dGVybWluZV9wbGF0Zm9ybSgpOgotICAgIGlmICctLWVmbCcgaW4gc3lzLmFyZ3Y6Ci0gICAgICAg IHJldHVybiAiZWZsIjsKLSAgICBpZiAnLS1ndGsnIGluIHN5cy5hcmd2OgotICAgICAgICByZXR1 cm4gImd0ayI7Ci0gICAgcmFpc2UgVmFsdWVFcnJvcignTm8gcGxhdGZvcm0gc3BlY2lmaWVkIGZv ciBqaGJ1aWxkLXdyYXBwZXIuJykKLQotCiBkZWYgZW5zdXJlX2poYnVpbGQocGxhdGZvcm0pOgog ICAgIGlmIG5vdCBqaGJ1aWxkX2Nsb25lZCgpOgogICAgICAgICBjbG9uZV9qaGJ1aWxkKCkKQEAg LTExNiwxMCArMTE5LDYgQEAgZGVmIGVuc3VyZV9qaGJ1aWxkKHBsYXRmb3JtKToKIGlmIG9zLmVu dmlyb24uaGFzX2tleSgnVU5ERVJfSkhCVUlMRCcpIGFuZCBvcy5lbnZpcm9uLmhhc19rZXkoJ0FD TE9DQUxfRkxBR1MnKToKICAgICBkZWwgb3MuZW52aXJvblsnQUNMT0NBTF9GTEFHUyddCiAKLXRy eToKLSAgICBwbGF0Zm9ybSA9IGRldGVybWluZV9wbGF0Zm9ybSgpCi1leGNlcHQgVmFsdWVFcnJv ciBhcyBlOgotICAgIHN5cy5leGl0KGUpCiBlbnN1cmVfamhidWlsZChwbGF0Zm9ybSkKIAogb3Mu ZXhlY3ZlKGpoYnVpbGRfcGF0aCwgW2poYnVpbGRfcGF0aCwgJy0tbm8taW50ZXJhY3QnLCAnLWYn LCBqaGJ1aWxkdXRpbHMuZ2V0X2NvbmZpZ19maWxlX2Zvcl9wbGF0Zm9ybShwbGF0Zm9ybSldICsg c3lzLmFyZ3ZbMjpdLCBvcy5lbnZpcm9uKQpkaWZmIC0tZ2l0IGEvVG9vbHMvamhidWlsZC9qaGJ1 aWxkcmNfY29tbW9uLnB5IGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkcmNfY29tbW9uLnB5CmluZGV4 IDAwZDYzNWIuLmNmNzhjZWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2Nv bW1vbi5weQorKysgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkKQEAgLTU0LDEx ICs1NCwxMSBAQCBkZWYgaW5pdChqaGJ1aWxkcmNfZ2xvYmFscywgcGxhdGZvcm0pOgogICAgICAg ICBqaGJ1aWxkcmNfZ2xvYmFsc1sibW9kdWxlcyJdLmV4dGVuZChfX2V4dHJhX21vZHVsZXMpCiAK ICAgICBpZiAnV0VCS0lUX09VVFBVVERJUicgaW4gb3MuZW52aXJvbjoKLSAgICAgICAgamhidWls ZHJjX2dsb2JhbHNbImNoZWNrb3V0cm9vdCJdID0gY2hlY2tvdXRyb290ID0gb3MucGF0aC5hYnNw YXRoKG9zLnBhdGguam9pbihvcy5lbnZpcm9uWydXRUJLSVRfT1VUUFVURElSJ10sICdEZXBlbmRl bmNpZXMnLCAnU291cmNlJykpCi0gICAgICAgIGpoYnVpbGRyY19nbG9iYWxzWyJwcmVmaXgiXSA9 IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4ob3MuZW52aXJvblsnV0VCS0lUX09VVFBVVERJ UiddLCAnRGVwZW5kZW5jaWVzJywgJ1Jvb3QnKSkKKyAgICAgICAgamhidWlsZHJjX2dsb2JhbHNb ImNoZWNrb3V0cm9vdCJdID0gY2hlY2tvdXRyb290ID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGgu am9pbihvcy5lbnZpcm9uWydXRUJLSVRfT1VUUFVURElSJ10sICdEZXBlbmRlbmNpZXMnICsgcGxh dGZvcm0udXBwZXIoKSwgJ1NvdXJjZScpKQorICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1sicHJl Zml4Il0gPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKG9zLmVudmlyb25bJ1dFQktJVF9P VVRQVVRESVInXSwgJ0RlcGVuZGVuY2llcycgKyBwbGF0Zm9ybS51cHBlcigpLCAnUm9vdCcpKQog ICAgIGVsc2U6Ci0gICAgICAgIGpoYnVpbGRyY19nbG9iYWxzWyJjaGVja291dHJvb3QiXSA9IGNo ZWNrb3V0cm9vdCA9IG9zLnBhdGguYWJzcGF0aCh0b3BfbGV2ZWxfcGF0aCgnV2ViS2l0QnVpbGQn LCAnRGVwZW5kZW5jaWVzJywgJ1NvdXJjZScpKQotICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1si cHJlZml4Il0gPSBvcy5wYXRoLmFic3BhdGgodG9wX2xldmVsX3BhdGgoJ1dlYktpdEJ1aWxkJywg J0RlcGVuZGVuY2llcycsICdSb290JykpCisgICAgICAgIGpoYnVpbGRyY19nbG9iYWxzWyJjaGVj a291dHJvb3QiXSA9IGNoZWNrb3V0cm9vdCA9IG9zLnBhdGguYWJzcGF0aCh0b3BfbGV2ZWxfcGF0 aCgnV2ViS2l0QnVpbGQnLCAnRGVwZW5kZW5jaWVzJyArIHBsYXRmb3JtLnVwcGVyKCksICdTb3Vy Y2UnKSkKKyAgICAgICAgamhidWlsZHJjX2dsb2JhbHNbInByZWZpeCJdID0gb3MucGF0aC5hYnNw YXRoKHRvcF9sZXZlbF9wYXRoKCdXZWJLaXRCdWlsZCcsICdEZXBlbmRlbmNpZXMnICsgcGxhdGZv cm0udXBwZXIoKSwgJ1Jvb3QnKSkKIAogICAgIGpoYnVpbGRyY19nbG9iYWxzWyJub25vdGlmeSJd ID0gVHJ1ZQogICAgIGpoYnVpbGRyY19nbG9iYWxzWyJub3RyYXlpY29uIl0gPSBUcnVlCg== 240926 2014-11-04 06:52:21 -0800 2014-11-04 11:05:42 -0800 Patch v4 patch_v8.patch text/plain 6911 mtiborinf ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NmFm MDU4Li4zNjljMjU2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTQtMTEtMDQgIFRpYm9yIE1lc3phcm9zICA8dG1l c3phcm9zLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW2poYnVpbGRd IE1ha2UgaXQgcG9zc2libGUgdG8gYnVpbGQgR1RLL0VGTCBpbiBzYW1lIHJlcG9zaXRvcnkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzQ0OAorCisg ICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0ZGlycy5wbToKKyAgICAgICAgKGdldEpoYnVpbGRQYXRoKToKKyAgICAgICAgKiBXZWJL aXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2VmbC9Gb250TWFuYWdlbWVudC5jcHA6CisgICAg ICAgIChnZXRQbGF0Zm9ybUZvbnRzUGF0aCk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9J bmplY3RlZEJ1bmRsZS9ndGsvQWN0aXZhdGVGb250c0d0ay5jcHA6CisgICAgICAgIChXVFI6Omdl dEZvbnRzUGF0aCk6CisgICAgICAgICogamhidWlsZC9qaGJ1aWxkLXdyYXBwZXI6CisgICAgICAg IChkZXRlcm1pbmVfcGxhdGZvcm0pOgorICAgICAgICAoaW5zdGFsbF9qaGJ1aWxkKToKKyAgICAg ICAgKiBqaGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHk6CisgICAgICAgIChpbml0KToKKwogMjAx NC0xMS0wMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAg ICBBZGQgcGFnZSBvdmVybGF5cyB0aGF0IHNob3cgcmVnaW9ucyB3aXRoIG1vdXNlV2hlZWwgZXZl bnQgaGFuZGxlcnMsIGFuZCB0aGUgbm9uLWZhc3Qtc2Nyb2xsYWJsZSByZWdpb24sIGFuZCBjb2Rl IHRvIHRvZ2dsZSB0aGVtIGluIE1pbmlCcm93c2VyIFdLMgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IDhi MDZiMTIuLjU1YTgyNTAgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTE2MzYsNyArMTYzNiwxMyBAQCBz dWIgZ2V0SmhidWlsZFBhdGgoKQogICAgIGlmIChpc0dpdCgpICYmIGlzR2l0QnJhbmNoQnVpbGQo KSAmJiBnaXRCcmFuY2goKSkgewogICAgICAgICBwb3AoQGpoYnVpbGRQYXRoKTsKICAgICB9Ci0g ICAgcHVzaChAamhidWlsZFBhdGgsICJEZXBlbmRlbmNpZXMiKTsKKyAgICBpZiAoaXNFZmwoKSkg eworICAgICAgICBwdXNoKEBqaGJ1aWxkUGF0aCwgIkRlcGVuZGVuY2llc0VGTCIpOworICAgIH0g ZWxzaWYgKGlzR3RrKCkpIHsKKyAgICAgICAgcHVzaChAamhidWlsZFBhdGgsICJEZXBlbmRlbmNp ZXNHVEsiKTsKKyAgICB9IGVsc2UgeworICAgICAgICBkaWUgIkNhbm5vdCBnZXQgSkhCdWlsZCBw YXRoIGZvciBwbGF0Zm9ybSB0aGF0IGlzbid0IEdUSysgb3IgRUZMLlxuIjsKKyAgICB9CiAgICAg cmV0dXJuIEZpbGU6OlNwZWMtPmNhdGRpcihAamhidWlsZFBhdGgpOwogfQogCmRpZmYgLS1naXQg YS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2VmbC9Gb250TWFuYWdlbWVu dC5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL2VmbC9Gb250TWFu YWdlbWVudC5jcHAKaW5kZXggZWVlMjZkMS4uM2ZmM2YwOCAxMDA2NDQKLS0tIGEvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9lZmwvRm9udE1hbmFnZW1lbnQuY3BwCisrKyBi L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvZWZsL0ZvbnRNYW5hZ2VtZW50 LmNwcApAQCAtMTAyLDcgKzEwMiw3IEBAIHN0YXRpYyBDU3RyaW5nIGdldFBsYXRmb3JtRm9udHNQ YXRoKCkKIHsKICAgICBDU3RyaW5nIGN1c3RvbUJ1aWxkRGlyID0gZ2V0Q3VzdG9tQnVpbGREaXIo KTsKICAgICBpZiAoIWN1c3RvbUJ1aWxkRGlyLmlzTnVsbCgpKSB7Ci0gICAgICAgIENTdHJpbmcg Zm9udHNQYXRoID0gYnVpbGRQYXRoKGN1c3RvbUJ1aWxkRGlyLmRhdGEoKSwgIkRlcGVuZGVuY2ll cyIsICJSb290IiwgIndlYmtpdGd0ay10ZXN0LWZvbnRzIiwgMCk7CisgICAgICAgIENTdHJpbmcg Zm9udHNQYXRoID0gYnVpbGRQYXRoKGN1c3RvbUJ1aWxkRGlyLmRhdGEoKSwgIkRlcGVuZGVuY2ll c0VGTCIsICJSb290IiwgIndlYmtpdGd0ay10ZXN0LWZvbnRzIiwgMCk7CiAgICAgICAgIGlmICgh ZWNvcmVfZmlsZV9leGlzdHMoZm9udHNQYXRoLmRhdGEoKSkpCiAgICAgICAgICAgICBmcHJpbnRm KHN0ZGVyciwgIldFQktJVF9PVVRQVVRESVIgc2V0IHRvICclcycsIGJ1dCBjb3VsZCBub3QgbG9j YWwgdGVzdCBmb250cy5cbiIsIGN1c3RvbUJ1aWxkRGlyLmRhdGEoKSk7CiAgICAgICAgIHJldHVy biBmb250c1BhdGg7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVk QnVuZGxlL2d0ay9BY3RpdmF0ZUZvbnRzR3RrLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvZ3RrL0FjdGl2YXRlRm9udHNHdGsuY3BwCmluZGV4IGZkOGRlYzIuLjc0 ZjNhYjAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUv Z3RrL0FjdGl2YXRlRm9udHNHdGsuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5q ZWN0ZWRCdW5kbGUvZ3RrL0FjdGl2YXRlRm9udHNHdGsuY3BwCkBAIC02OCw3ICs2OCw3IEBAIENT dHJpbmcgZ2V0T3V0cHV0RGlyKCkKIHN0YXRpYyBDU3RyaW5nIGdldEZvbnRzUGF0aCgpCiB7CiAg ICAgQ1N0cmluZyB3ZWJraXRPdXRwdXREaXIgPSBnZXRPdXRwdXREaXIoKTsKLSAgICBHVW5pcXVl UHRyPGNoYXI+IGZvbnRzUGF0aChnX2J1aWxkX2ZpbGVuYW1lKHdlYmtpdE91dHB1dERpci5kYXRh KCksICJEZXBlbmRlbmNpZXMiLCAiUm9vdCIsICJ3ZWJraXRndGstdGVzdC1mb250cyIsIG51bGxw dHIpKTsKKyAgICBHVW5pcXVlUHRyPGNoYXI+IGZvbnRzUGF0aChnX2J1aWxkX2ZpbGVuYW1lKHdl YmtpdE91dHB1dERpci5kYXRhKCksICJEZXBlbmRlbmNpZXNHVEsiLCAiUm9vdCIsICJ3ZWJraXRn dGstdGVzdC1mb250cyIsIG51bGxwdHIpKTsKICAgICBpZiAoZ19maWxlX3Rlc3QoZm9udHNQYXRo LmdldCgpLCBzdGF0aWNfY2FzdDxHRmlsZVRlc3Q+KEdfRklMRV9URVNUX0VYSVNUUyB8IEdfRklM RV9URVNUX0lTX0RJUikpKQogICAgICAgICByZXR1cm4gZm9udHNQYXRoLmdldCgpOwogCmRpZmYg LS1naXQgYS9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBlciBiL1Rvb2xzL2poYnVpbGQvamhi dWlsZC13cmFwcGVyCmluZGV4IGJmMjI3ZGYuLjQ1MjIyYWYgMTAwNzU1Ci0tLSBhL1Rvb2xzL2po YnVpbGQvamhidWlsZC13cmFwcGVyCisrKyBiL1Rvb2xzL2poYnVpbGQvamhidWlsZC13cmFwcGVy CkBAIC0yNiw5ICsyNiwyMSBAQCBpbXBvcnQgc3lzCiAKIGpoYnVpbGRfcmV2aXNpb24gPSAnYzBj YjQ2MTc3ZDc5MTg5ZmZlMGY3NjA3MDNjNzMyZjFjN2VhOGIyOScKIAorZGVmIGRldGVybWluZV9w bGF0Zm9ybSgpOgorICAgIGlmICctLWVmbCcgaW4gc3lzLmFyZ3Y6CisgICAgICAgIHJldHVybiAi ZWZsIjsKKyAgICBpZiAnLS1ndGsnIGluIHN5cy5hcmd2OgorICAgICAgICByZXR1cm4gImd0ayI7 CisgICAgcmFpc2UgVmFsdWVFcnJvcignTm8gcGxhdGZvcm0gc3BlY2lmaWVkIGZvciBqaGJ1aWxk LXdyYXBwZXIuJykKKwordHJ5OgorICAgIHBsYXRmb3JtID0gZGV0ZXJtaW5lX3BsYXRmb3JtKCkK K2V4Y2VwdCBWYWx1ZUVycm9yIGFzIGU6CisgICAgc3lzLmV4aXQoZSkKKwogZGVwZW5kZW5jaWVz X3BhdGggPSBqaGJ1aWxkdXRpbHMuZ2V0X2RlcGVuZGVuY2llc19wYXRoKCkKLWluc3RhbGxhdGlv bl9wcmVmaXggPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKGRlcGVuZGVuY2llc19wYXRo LCAnUm9vdCcpKQotc291cmNlX3BhdGggPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKGRl cGVuZGVuY2llc19wYXRoLCAnU291cmNlJykpCitpbnN0YWxsYXRpb25fcHJlZml4ID0gb3MucGF0 aC5hYnNwYXRoKG9zLnBhdGguam9pbihkZXBlbmRlbmNpZXNfcGF0aCArIHBsYXRmb3JtLnVwcGVy KCksICdSb290JykpCitzb3VyY2VfcGF0aCA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4o ZGVwZW5kZW5jaWVzX3BhdGggKyBwbGF0Zm9ybS51cHBlcigpLCAnU291cmNlJykpCiBqaGJ1aWxk X3NvdXJjZV9wYXRoID0gb3MucGF0aC5qb2luKHNvdXJjZV9wYXRoLCAnamhidWlsZCcpCiBqaGJ1 aWxkX3BhdGggPSBvcy5wYXRoLmpvaW4oaW5zdGFsbGF0aW9uX3ByZWZpeCwgJ2JpbicsICdqaGJ1 aWxkJykKIApAQCAtOTIsMTUgKzEwNCw2IEBAIGRlZiBpbnN0YWxsX2poYnVpbGQoKToKICAgICBp ZiBwcm9jZXNzLnJldHVybmNvZGUgIT0gMDoKICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdqaGJ1 aWxkIGNvbmZpZ3VyZSBmYWlsZWQgd2l0aCByZXR1cm4gY29kZTogJWknICUgcHJvY2Vzcy5yZXR1 cm5jb2RlKQogCi0KLWRlZiBkZXRlcm1pbmVfcGxhdGZvcm0oKToKLSAgICBpZiAnLS1lZmwnIGlu IHN5cy5hcmd2OgotICAgICAgICByZXR1cm4gImVmbCI7Ci0gICAgaWYgJy0tZ3RrJyBpbiBzeXMu YXJndjoKLSAgICAgICAgcmV0dXJuICJndGsiOwotICAgIHJhaXNlIFZhbHVlRXJyb3IoJ05vIHBs YXRmb3JtIHNwZWNpZmllZCBmb3IgamhidWlsZC13cmFwcGVyLicpCi0KLQogZGVmIGVuc3VyZV9q aGJ1aWxkKHBsYXRmb3JtKToKICAgICBpZiBub3QgamhidWlsZF9jbG9uZWQoKToKICAgICAgICAg Y2xvbmVfamhidWlsZCgpCkBAIC0xMTYsMTAgKzExOSw2IEBAIGRlZiBlbnN1cmVfamhidWlsZChw bGF0Zm9ybSk6CiBpZiBvcy5lbnZpcm9uLmhhc19rZXkoJ1VOREVSX0pIQlVJTEQnKSBhbmQgb3Mu ZW52aXJvbi5oYXNfa2V5KCdBQ0xPQ0FMX0ZMQUdTJyk6CiAgICAgZGVsIG9zLmVudmlyb25bJ0FD TE9DQUxfRkxBR1MnXQogCi10cnk6Ci0gICAgcGxhdGZvcm0gPSBkZXRlcm1pbmVfcGxhdGZvcm0o KQotZXhjZXB0IFZhbHVlRXJyb3IgYXMgZToKLSAgICBzeXMuZXhpdChlKQogZW5zdXJlX2poYnVp bGQocGxhdGZvcm0pCiAKIG9zLmV4ZWN2ZShqaGJ1aWxkX3BhdGgsIFtqaGJ1aWxkX3BhdGgsICct LW5vLWludGVyYWN0JywgJy1mJywgamhidWlsZHV0aWxzLmdldF9jb25maWdfZmlsZV9mb3JfcGxh dGZvcm0ocGxhdGZvcm0pXSArIHN5cy5hcmd2WzI6XSwgb3MuZW52aXJvbikKZGlmZiAtLWdpdCBh L1Rvb2xzL2poYnVpbGQvamhidWlsZHJjX2NvbW1vbi5weSBiL1Rvb2xzL2poYnVpbGQvamhidWls ZHJjX2NvbW1vbi5weQppbmRleCAwMGQ2MzViLi5jZjc4Y2VlIDEwMDY0NAotLS0gYS9Ub29scy9q aGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkKKysrIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxkcmNf Y29tbW9uLnB5CkBAIC01NCwxMSArNTQsMTEgQEAgZGVmIGluaXQoamhidWlsZHJjX2dsb2JhbHMs IHBsYXRmb3JtKToKICAgICAgICAgamhidWlsZHJjX2dsb2JhbHNbIm1vZHVsZXMiXS5leHRlbmQo X19leHRyYV9tb2R1bGVzKQogCiAgICAgaWYgJ1dFQktJVF9PVVRQVVRESVInIGluIG9zLmVudmly b246Ci0gICAgICAgIGpoYnVpbGRyY19nbG9iYWxzWyJjaGVja291dHJvb3QiXSA9IGNoZWNrb3V0 cm9vdCA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4ob3MuZW52aXJvblsnV0VCS0lUX09V VFBVVERJUiddLCAnRGVwZW5kZW5jaWVzJywgJ1NvdXJjZScpKQotICAgICAgICBqaGJ1aWxkcmNf Z2xvYmFsc1sicHJlZml4Il0gPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKG9zLmVudmly b25bJ1dFQktJVF9PVVRQVVRESVInXSwgJ0RlcGVuZGVuY2llcycsICdSb290JykpCisgICAgICAg IGpoYnVpbGRyY19nbG9iYWxzWyJjaGVja291dHJvb3QiXSA9IGNoZWNrb3V0cm9vdCA9IG9zLnBh dGguYWJzcGF0aChvcy5wYXRoLmpvaW4ob3MuZW52aXJvblsnV0VCS0lUX09VVFBVVERJUiddLCAn RGVwZW5kZW5jaWVzJyArIHBsYXRmb3JtLnVwcGVyKCksICdTb3VyY2UnKSkKKyAgICAgICAgamhi dWlsZHJjX2dsb2JhbHNbInByZWZpeCJdID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihv cy5lbnZpcm9uWydXRUJLSVRfT1VUUFVURElSJ10sICdEZXBlbmRlbmNpZXMnICsgcGxhdGZvcm0u dXBwZXIoKSwgJ1Jvb3QnKSkKICAgICBlbHNlOgotICAgICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1si Y2hlY2tvdXRyb290Il0gPSBjaGVja291dHJvb3QgPSBvcy5wYXRoLmFic3BhdGgodG9wX2xldmVs X3BhdGgoJ1dlYktpdEJ1aWxkJywgJ0RlcGVuZGVuY2llcycsICdTb3VyY2UnKSkKLSAgICAgICAg amhidWlsZHJjX2dsb2JhbHNbInByZWZpeCJdID0gb3MucGF0aC5hYnNwYXRoKHRvcF9sZXZlbF9w YXRoKCdXZWJLaXRCdWlsZCcsICdEZXBlbmRlbmNpZXMnLCAnUm9vdCcpKQorICAgICAgICBqaGJ1 aWxkcmNfZ2xvYmFsc1siY2hlY2tvdXRyb290Il0gPSBjaGVja291dHJvb3QgPSBvcy5wYXRoLmFi c3BhdGgodG9wX2xldmVsX3BhdGgoJ1dlYktpdEJ1aWxkJywgJ0RlcGVuZGVuY2llcycgKyBwbGF0 Zm9ybS51cHBlcigpLCAnU291cmNlJykpCisgICAgICAgIGpoYnVpbGRyY19nbG9iYWxzWyJwcmVm aXgiXSA9IG9zLnBhdGguYWJzcGF0aCh0b3BfbGV2ZWxfcGF0aCgnV2ViS2l0QnVpbGQnLCAnRGVw ZW5kZW5jaWVzJyArIHBsYXRmb3JtLnVwcGVyKCksICdSb290JykpCiAKICAgICBqaGJ1aWxkcmNf Z2xvYmFsc1sibm9ub3RpZnkiXSA9IFRydWUKICAgICBqaGJ1aWxkcmNfZ2xvYmFsc1sibm90cmF5 aWNvbiJdID0gVHJ1ZQo=