15937 2007-11-10 17:12:57 -0800 Add glyph-orientation-horizontal/vertical support 2007-11-10 18:17:30 -0800 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 zimmermann zimmermann eric oldest_to_newest 60867 0 zimmermann 2007-11-10 17:12:57 -0800 This will also force us to fix vertical text, and vertical text on path. Uploading patch soon. 60872 1 zimmermann 2007-11-10 17:38:32 -0800 *** Bug 13971 has been marked as a duplicate of this bug. *** 60875 2 17178 zimmermann 2007-11-10 17:47:13 -0800 Created attachment 17178 Initial patch 60876 3 17178 eric 2007-11-10 18:13:06 -0800 Comment on attachment 17178 Initial patch This looks fine. r=me. 60877 4 zimmermann 2007-11-10 18:17:30 -0800 Landed in r27680. 17178 2007-11-10 17:47:13 -0800 2007-11-10 18:13:06 -0800 Initial patch AddGlyphOrientation.diff text/plain 18739 zimmermann SW5kZXg6IHJlbmRlcmluZy9TVkdSb290SW5saW5lQm94LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSByZW5k ZXJpbmcvU1ZHUm9vdElubGluZUJveC5jcHAJKHJldmlzaW9uIDI3Njc0KQorKysgcmVuZGVyaW5n L1NWR1Jvb3RJbmxpbmVCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MCw2ICs0MCw3IEBACiAj aW5jbHVkZSAiU1ZHVVJJUmVmZXJlbmNlLmgiCiAjaW5jbHVkZSAiVGV4dC5oIgogI2luY2x1ZGUg IlRleHRTdHlsZS5oIgorI2luY2x1ZGUgIlVuaWNvZGVSYW5nZS5oIgogCiAjaW5jbHVkZSA8Zmxv YXQuaD4KIApAQCAtNTQsNiArNTUsOTkgQEAKICAgICByZXR1cm4gc3R5bGUtPndyaXRpbmdNb2Rl KCkgPT0gV01fVEJSTCB8fCBzdHlsZS0+d3JpdGluZ01vZGUoKSA9PSBXTV9UQjsgCiB9CiAKK3N0 YXRpYyBpbmxpbmUgZmxvYXQgZ2x5cGhPcmllbnRhdGlvblRvQW5nbGUoY29uc3QgU1ZHUmVuZGVy U3R5bGUqIHN2Z1N0eWxlLCBib29sIGlzVmVydGljYWxUZXh0LCBjb25zdCBVQ2hhciYgY2hhcmFj dGVyKQoreworICAgIHN3aXRjaCAoaXNWZXJ0aWNhbFRleHQgPyBzdmdTdHlsZS0+Z2x5cGhPcmll bnRhdGlvblZlcnRpY2FsKCkgOiBzdmdTdHlsZS0+Z2x5cGhPcmllbnRhdGlvbkhvcml6b250YWwo KSkgeworICAgIGNhc2UgR09fQVVUTzoKKyAgICB7CisgICAgICAgIC8vIFNwZWM6IEZ1bGx3aWR0 aCBpZGVvZ3JhcGhpYyBhbmQgZnVsbHdpZHRoIExhdGluIHRleHQgd2lsbCBiZSBzZXQgd2l0aCBh IGdseXBoLW9yaWVudGF0aW9uIG9mIDAtZGVncmVlcy4KKyAgICAgICAgLy8gICAgICAgVGV4dCB3 aGljaCBpcyBub3QgZnVsbHdpZHRoIHdpbGwgYmUgc2V0IHdpdGggYSBnbHlwaC1vcmllbnRhdGlv biBvZiA5MC1kZWdyZWVzLgorICAgICAgICB1bnNpZ25lZCBpbnQgdW5pY29kZVJhbmdlID0gZmlu ZENoYXJVbmljb2RlUmFuZ2UoY2hhcmFjdGVyKTsKKyAgICAgICAgaWYgKHVuaWNvZGVSYW5nZSA9 PSBjUmFuZ2VTZXRMYXRpbiB8fCB1bmljb2RlUmFuZ2UgPT0gY1JhbmdlQXJhYmljKQorICAgICAg ICAgICAgcmV0dXJuIDkwLjBmOworCisgICAgICAgIHJldHVybiAwLjBmOworICAgIH0KKyAgICBj YXNlIEdPXzkwREVHOgorICAgICAgICByZXR1cm4gOTAuMGY7CisgICAgY2FzZSBHT18xODBERUc6 CisgICAgICAgIHJldHVybiAxODAuMGY7CisgICAgY2FzZSBHT18yNzBERUc6CisgICAgICAgIHJl dHVybiAyNzAuMGY7CisgICAgY2FzZSBHT18wREVHOgorICAgIGRlZmF1bHQ6CisgICAgICAgIHJl dHVybiAwLjBmOworICAgIH0KK30KKworc3RhdGljIGlubGluZSBib29sIGdseXBoT3JpZW50YXRp b25Jc011bHRpcGx5T2YxODBEZWdyZWVzKGZsb2F0IG9yaWVudGF0aW9uQW5nbGUpCit7CisgICAg cmV0dXJuIGZhYnNmKGZtb2RmKG9yaWVudGF0aW9uQW5nbGUsIDE4MC4wZikpID09IDAuMGY7Cit9 CisKK3N0YXRpYyBpbmxpbmUgZmxvYXQgY2FsY3VsYXRlR2x5cGhBZHZhbmNlQW5kU2hpZnRSZXNw ZWN0aW5nT3JpZW50YXRpb24oYm9vbCBpc1ZlcnRpY2FsVGV4dCwgZmxvYXQgb3JpZW50YXRpb25B bmdsZSwgZmxvYXQgZ2x5cGhXaWR0aCwgZmxvYXQgZ2x5cGhIZWlnaHQsIGNvbnN0IEZvbnQmIGZv bnQsIFNWR0NoYXImIHN2Z0NoYXIsIGZsb2F0JiB4T3JpZW50YXRpb25TaGlmdCwgZmxvYXQmIHlP cmllbnRhdGlvblNoaWZ0KQoreworICAgIGJvb2wgb3JpZW50YXRpb25Jc011bHRpcGx5T2YxODBE ZWdyZWVzID0gZ2x5cGhPcmllbnRhdGlvbklzTXVsdGlwbHlPZjE4MERlZ3JlZXMob3JpZW50YXRp b25BbmdsZSk7CisKKyAgICAvLyBUaGUgZnVuY3Rpb24gaXMgYmFzZWQgb24gc3BlYyByZXF1aXJl bWVudHM6CisgICAgLy8KKyAgICAvLyBTcGVjOiBJZiB0aGUgJ2dseXBoLW9yaWVudGF0aW9uLWhv cml6b250YWwnIHJlc3VsdHMgaW4gYW4gb3JpZW50YXRpb24gYW5nbGUgdGhhdCBpcyBub3QgYSBt dWx0aXBsZSBvZgorICAgIC8vIG9mIDE4MCBkZWdyZWVzLCB0aGVuIHRoZSBjdXJyZW50IHRleHQg cG9zaXRpb24gaXMgaW5jcmVtZW50ZWQgYWNjb3JkaW5nIHRvIHRoZSB2ZXJ0aWNhbCBtZXRyaWNz IG9mIHRoZSBnbHlwaC4KKyAgICAvLworICAgIC8vIFNwZWM6IElmIGlmIHRoZSAnZ2x5cGgtb3Jp ZW50YXRpb24tdmVydGljYWwnIHJlc3VsdHMgaW4gYW4gb3JpZW50YXRpb24gYW5nbGUgdGhhdCBp cyBub3QgYSBtdWx0aXBsZSBvZgorICAgIC8vIDE4MCBkZWdyZWVzLHRoZW4gdGhlIGN1cnJlbnQg dGV4dCBwb3NpdGlvbiBpcyBpbmNyZW1lbnRlZCBhY2NvcmRpbmcgdG8gdGhlIGhvcml6b250YWwg bWV0cmljcyBvZiB0aGUgZ2x5cGguCisKKyAgICAvLyB2ZXJ0aWNhbCBvcmllbnRhdGlvbiBoYW5k bGluZworICAgIGlmIChpc1ZlcnRpY2FsVGV4dCkgeworICAgICAgICBpZiAob3JpZW50YXRpb25B bmdsZSA9PSAwLjBmKSB7CisgICAgICAgICAgICB4T3JpZW50YXRpb25TaGlmdCA9IC1nbHlwaFdp ZHRoIC8gMi4wZjsKKyAgICAgICAgICAgIHlPcmllbnRhdGlvblNoaWZ0ID0gZm9udC5hc2NlbnQo KTsKKyAgICAgICAgfSBlbHNlIGlmIChvcmllbnRhdGlvbkFuZ2xlID09IDkwLjBmKSB7CisgICAg ICAgICAgICB4T3JpZW50YXRpb25TaGlmdCA9IC1nbHlwaEhlaWdodDsKKyAgICAgICAgICAgIHlP cmllbnRhdGlvblNoaWZ0ID0gZm9udC5kZXNjZW50KCk7CisgICAgICAgICAgICBzdmdDaGFyLm9y aWVudGF0aW9uU2hpZnRZID0gLWZvbnQuYXNjZW50KCk7CisgICAgICAgIH0gZWxzZSBpZiAob3Jp ZW50YXRpb25BbmdsZSA9PSAyNzAuMGYpIHsKKyAgICAgICAgICAgIHhPcmllbnRhdGlvblNoaWZ0 ID0gZ2x5cGhIZWlnaHQ7CisgICAgICAgICAgICB5T3JpZW50YXRpb25TaGlmdCA9IGZvbnQuZGVz Y2VudCgpOworICAgICAgICAgICAgc3ZnQ2hhci5vcmllbnRhdGlvblNoaWZ0WCA9IC1nbHlwaFdp ZHRoOworICAgICAgICAgICAgc3ZnQ2hhci5vcmllbnRhdGlvblNoaWZ0WSA9IC1mb250LmFzY2Vu dCgpOworICAgICAgICB9IGVsc2UgaWYgKG9yaWVudGF0aW9uQW5nbGUgPT0gMTgwLjBmKSB7Cisg ICAgICAgICAgICB5T3JpZW50YXRpb25TaGlmdCA9IGZvbnQuYXNjZW50KCk7CisgICAgICAgICAg ICBzdmdDaGFyLm9yaWVudGF0aW9uU2hpZnRYID0gLWdseXBoV2lkdGggLyAyLjBmOworICAgICAg ICAgICAgc3ZnQ2hhci5vcmllbnRhdGlvblNoaWZ0WSA9IGZvbnQuYXNjZW50KCkgLSBmb250LmRl c2NlbnQoKTsKKyAgICAgICAgfQorCisgICAgICAgIC8vIHZlcnRpY2FsIGFkdmFuY2UgY2FsY3Vs YXRpb24KKyAgICAgICAgaWYgKG9yaWVudGF0aW9uQW5nbGUgIT0gMC4wZiAmJiAhb3JpZW50YXRp b25Jc011bHRpcGx5T2YxODBEZWdyZWVzKQorICAgICAgICAgICAgcmV0dXJuIGdseXBoV2lkdGg7 CisKKyAgICAgICAgcmV0dXJuIGdseXBoSGVpZ2h0OyAKKyAgICB9CisKKyAgICAvLyBob3Jpem9u dGFsIG9yaWVudGF0aW9uIGhhbmRsaW5nCisgICAgaWYgKG9yaWVudGF0aW9uQW5nbGUgPT0gOTAu MGYpIHsKKyAgICAgICAgeE9yaWVudGF0aW9uU2hpZnQgPSBnbHlwaFdpZHRoIC8gMi4wZjsKKyAg ICAgICAgeU9yaWVudGF0aW9uU2hpZnQgPSAtZm9udC5kZXNjZW50KCk7CisgICAgICAgIHN2Z0No YXIub3JpZW50YXRpb25TaGlmdFggPSAtZ2x5cGhXaWR0aCAvIDIuMGYgLSBmb250LmRlc2NlbnQo KTsgCisgICAgICAgIHN2Z0NoYXIub3JpZW50YXRpb25TaGlmdFkgPSBmb250LmRlc2NlbnQoKTsK KyAgICB9IGVsc2UgaWYgKG9yaWVudGF0aW9uQW5nbGUgPT0gMjcwLjBmKSB7CisgICAgICAgIHhP cmllbnRhdGlvblNoaWZ0ID0gLWdseXBoV2lkdGggLyAyLjBmOworICAgICAgICB5T3JpZW50YXRp b25TaGlmdCA9IC1mb250LmRlc2NlbnQoKTsKKyAgICAgICAgc3ZnQ2hhci5vcmllbnRhdGlvblNo aWZ0WCA9IC1nbHlwaFdpZHRoIC8gMi4wZiArIGZvbnQuZGVzY2VudCgpOworICAgICAgICBzdmdD aGFyLm9yaWVudGF0aW9uU2hpZnRZID0gZ2x5cGhIZWlnaHQ7CisgICAgfSBlbHNlIGlmIChvcmll bnRhdGlvbkFuZ2xlID09IDE4MC4wZikgeworICAgICAgICB4T3JpZW50YXRpb25TaGlmdCA9IGds eXBoV2lkdGggLyAyLjBmOworICAgICAgICBzdmdDaGFyLm9yaWVudGF0aW9uU2hpZnRYID0gLWds eXBoV2lkdGggLyAyLjBmOworICAgICAgICBzdmdDaGFyLm9yaWVudGF0aW9uU2hpZnRZID0gZm9u dC5hc2NlbnQoKSAtIGZvbnQuZGVzY2VudCgpOworICAgIH0KKworICAgIC8vIGhvcml6b250YWwg YWR2YW5jZSBjYWxjdWxhdGlvbgorICAgIGlmIChvcmllbnRhdGlvbkFuZ2xlICE9IDAuMGYgJiYg IW9yaWVudGF0aW9uSXNNdWx0aXBseU9mMTgwRGVncmVlcykKKyAgICAgICAgcmV0dXJuIGdseXBo SGVpZ2h0OworCisgICAgcmV0dXJuIGdseXBoV2lkdGg7Cit9CisKIHN0YXRpYyBpbmxpbmUgdm9p ZCBzdGFydFRleHRDaHVuayhTVkdUZXh0Q2h1bmtMYXlvdXRJbmZvJiBpbmZvKQogewogICAgIGlu Zm8uY2h1bmsuYm94ZXMuY2xlYXIoKTsKQEAgLTQyNCw3ICs1MTgsNiBAQAogICAgIFJlbmRlclRl eHQqIHRleHQgPSB0ZXh0Qm94LT50ZXh0T2JqZWN0KCk7CiAgICAgY29uc3QgRm9udCYgZm9udCA9 IHRleHQtPnN0eWxlKCktPmZvbnQoKTsKIAotICAgIC8vIEZJWE1FOiBXaWxkIGd1ZXNzIC0gd29y a3MgZm9yIHRoZSBXM0MgMS4xIHZlcnRpY2FsIHRleHQgZXhhbXBsZXMgLSBub3QgcmVhbGx5IGhl YXZpbHkgdGVzdGVkIHNvIGZhci4KICAgICByZXR1cm4gKHJhbmdlLmVuZE9mZnNldCAtIHJhbmdl LnN0YXJ0T2Zmc2V0KSAqIChmb250LmFzY2VudCgpICsgZm9udC5kZXNjZW50KCkpOwogfQogCkBA IC00ODksNyArNTgyLDcgQEAKICAgICAgICAgICAgICAgICBTVkdDaGFyJiBsYXN0Q2hhcmFjdGVy ID0gKihpdFNlYXJjaCAtIDEpOwogICAgICAgICAgICAgICAgIFNWR0NoYXImIGN1cnJlbnRDaGFy YWN0ZXIgPSAqaXRTZWFyY2g7CiAKLSAgICAgICAgICAgICAgICBpbnQgb2Zmc2V0ID0gYm94LT5t X3JldmVyc2VkID8gYm94LT5lbmQoKSAtIGkgLSBwb3NpdGlvbk9mZnNldCArIDE6IGJveC0+c3Rh cnQoKSArIGkgKyBwb3NpdGlvbk9mZnNldCAtIDE7CisgICAgICAgICAgICAgICAgaW50IG9mZnNl dCA9IGJveC0+bV9yZXZlcnNlZCA/IGJveC0+ZW5kKCkgLSBpIC0gcG9zaXRpb25PZmZzZXQgKyAx IDogYm94LT5zdGFydCgpICsgaSArIHBvc2l0aW9uT2Zmc2V0IC0gMTsKIAogICAgICAgICAgICAg ICAgIGlmIChjYWxjV2lkdGhPbmx5KSB7CiAgICAgICAgICAgICAgICAgICAgIGZsb2F0IGxhc3RH bHlwaFdpZHRoID0gYm94LT5jYWxjdWxhdGVHbHlwaFdpZHRoKHN0eWxlLCBvZmZzZXQpOwpAQCAt ODc2LDggKzk2OSwxMCBAQAogICAgIFNWR0lubGluZVRleHRCb3gqIHN2Z1RleHRCb3ggPSBzdGF0 aWNfY2FzdDxTVkdJbmxpbmVUZXh0Qm94Kj4odGV4dEJveCk7CiAKICAgICB1bnNpZ25lZCBsZW5n dGggPSB0ZXh0Qm94LT5sZW4oKTsKLSAgICBib29sIGlzVmVydGljYWxUZXh0ID0gaXNWZXJ0aWNh bFdyaXRpbmdNb2RlKHN0eWxlLT5zdmdTdHlsZSgpKTsKIAorICAgIGNvbnN0IFNWR1JlbmRlclN0 eWxlKiBzdmdTdHlsZSA9IHN0eWxlLT5zdmdTdHlsZSgpOworICAgIGJvb2wgaXNWZXJ0aWNhbFRl eHQgPSBpc1ZlcnRpY2FsV3JpdGluZ01vZGUoc3ZnU3R5bGUpOworCiAgICAgZm9yICh1bnNpZ25l ZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7CiAgICAgICAgIFNWR0NoYXIgc3ZnQ2hhcjsKIApA QCAtOTY3LDExICsxMDYyLDE2IEBACiAgICAgICAgICAgICAgICAgaW5mby5uZXh0RHJhd25TZXBl cmF0ZWQgPSB0cnVlOwogICAgICAgICB9CiAKKyAgICAgICAgZmxvYXQgb3JpZW50YXRpb25Bbmds ZSA9IGdseXBoT3JpZW50YXRpb25Ub0FuZ2xlKHN2Z1N0eWxlLCBpc1ZlcnRpY2FsVGV4dCwgKmN1 cnJlbnRDaGFyYWN0ZXIpOworCisgICAgICAgIGZsb2F0IHhPcmllbnRhdGlvblNoaWZ0ID0gMC4w ZjsKKyAgICAgICAgZmxvYXQgeU9yaWVudGF0aW9uU2hpZnQgPSAwLjBmOworICAgICAgICBmbG9h dCBnbHlwaEFkdmFuY2UgPSBjYWxjdWxhdGVHbHlwaEFkdmFuY2VBbmRTaGlmdFJlc3BlY3RpbmdP cmllbnRhdGlvbihpc1ZlcnRpY2FsVGV4dCwgb3JpZW50YXRpb25BbmdsZSwgZ2x5cGhXaWR0aCwg Z2x5cGhIZWlnaHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvbnQsIHN2Z0NoYXIsIHhPcmll bnRhdGlvblNoaWZ0LCB5T3JpZW50YXRpb25TaGlmdCk7CisKICAgICAgICAgLy8gSGFuZGxlIHRl eHRQYXRoIGxheW91dCBtb2RlCiAgICAgICAgIGlmIChpbmZvLmluUGF0aExheW91dCgpKSB7Ci0g ICAgICAgICAgICBmbG9hdCBnbHlwaEFkdmFuY2UgPSBpc1ZlcnRpY2FsVGV4dCA/IGdseXBoSGVp Z2h0IDogZ2x5cGhXaWR0aDsKICAgICAgICAgICAgIGZsb2F0IGV4dHJhQWR2YW5jZSA9IGlzVmVy dGljYWxUZXh0ID8gZHkgOiBkeDsKLQogICAgICAgICAgICAgZmxvYXQgbmV3T2Zmc2V0ID0gRkxU X01JTjsKIAogICAgICAgICAgICAgaWYgKGFzc2lnbmVkWCAmJiAhaXNWZXJ0aWNhbFRleHQpCkBA IC05NzksMTYgKzEwNzksMTggQEAKICAgICAgICAgICAgIGVsc2UgaWYgKGFzc2lnbmVkWSAmJiBp c1ZlcnRpY2FsVGV4dCkKICAgICAgICAgICAgICAgICBuZXdPZmZzZXQgPSBpbmZvLmN1cnk7CiAK KyAgICAgICAgICAgIGZsb2F0IGNvcnJlY3RlZEdseXBoQWR2YW5jZSA9IGdseXBoQWR2YW5jZTsK KwogICAgICAgICAgICAgLy8gSGFuZGxlIGxlbmd0aEFkanVzdD0ic3BhY2luZ0FuZEdseXBocyIg Ynkgc3BlY2lmeWluZyBwZXItY2hhcmFjdGVyIHNjYWxlIG9wZXJhdGlvbnMKICAgICAgICAgICAg IGlmIChpbmZvLnBhdGhUZXh0TGVuZ3RoID4gMC4wZiAmJiBpbmZvLnBhdGhDaHVua0xlbmd0aCA+ IDAuMGYpIHsgCiAgICAgICAgICAgICAgICAgaWYgKGlzVmVydGljYWxUZXh0KSB7CiAgICAgICAg ICAgICAgICAgICAgIHN2Z0NoYXIucGF0aERhdGEtPnlTY2FsZSA9IGluZm8ucGF0aENodW5rTGVu Z3RoIC8gaW5mby5wYXRoVGV4dExlbmd0aDsKICAgICAgICAgICAgICAgICAgICAgc3BhY2luZyAq PSBzdmdDaGFyLnBhdGhEYXRhLT55U2NhbGU7Ci0gICAgICAgICAgICAgICAgICAgIGdseXBoQWR2 YW5jZSAqPSBzdmdDaGFyLnBhdGhEYXRhLT55U2NhbGU7CisgICAgICAgICAgICAgICAgICAgIGNv cnJlY3RlZEdseXBoQWR2YW5jZSAqPSBzdmdDaGFyLnBhdGhEYXRhLT55U2NhbGU7CiAgICAgICAg ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgc3ZnQ2hhci5wYXRoRGF0YS0+ eFNjYWxlID0gaW5mby5wYXRoQ2h1bmtMZW5ndGggLyBpbmZvLnBhdGhUZXh0TGVuZ3RoOwogICAg ICAgICAgICAgICAgICAgICBzcGFjaW5nICo9IHN2Z0NoYXIucGF0aERhdGEtPnhTY2FsZTsKLSAg ICAgICAgICAgICAgICAgICAgZ2x5cGhBZHZhbmNlICo9IHN2Z0NoYXIucGF0aERhdGEtPnhTY2Fs ZTsKKyAgICAgICAgICAgICAgICAgICAgY29ycmVjdGVkR2x5cGhBZHZhbmNlICo9IHN2Z0NoYXIu cGF0aERhdGEtPnhTY2FsZTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKQEAg LTk5Niw3ICsxMDk4LDcgQEAKICAgICAgICAgICAgIGZsb2F0IHBhdGhFeHRyYUFkdmFuY2UgPSBp bmZvLnBhdGhFeHRyYUFkdmFuY2U7CiAgICAgICAgICAgICBpbmZvLnBhdGhFeHRyYUFkdmFuY2Ug Kz0gc3BhY2luZzsKIAotICAgICAgICAgICAgc3ZnQ2hhci5wYXRoRGF0YS0+dmlzaWJsZSA9IGlu Zm8ubmV4dFBhdGhMYXlvdXRQb2ludEFuZEFuZ2xlKGdseXBoQWR2YW5jZSwgZXh0cmFBZHZhbmNl LCBuZXdPZmZzZXQpOworICAgICAgICAgICAgc3ZnQ2hhci5wYXRoRGF0YS0+dmlzaWJsZSA9IGlu Zm8ubmV4dFBhdGhMYXlvdXRQb2ludEFuZEFuZ2xlKGNvcnJlY3RlZEdseXBoQWR2YW5jZSwgZXh0 cmFBZHZhbmNlLCBuZXdPZmZzZXQpOwogICAgICAgICAgICAgc3ZnQ2hhci5kcmF3blNlcGVyYXRl ZCA9IHRydWU7CiAKICAgICAgICAgICAgIGluZm8ucGF0aEV4dHJhQWR2YW5jZSA9IHBhdGhFeHRy YUFkdmFuY2U7CkBAIC0xMDE5LDQzICsxMTIxLDQ0IEBACiAKICAgICAgICAgc3ZnQ2hhci54ID0g aW5mby5jdXJ4OwogICAgICAgICBzdmdDaGFyLnkgPSBpbmZvLmN1cnk7CisgICAgICAgIHN2Z0No YXIuYW5nbGUgPSBpbmZvLmFuZ2xlOwogCiAgICAgICAgIC8vIEZvciB0ZXh0IHBhdGhzIGFueSBz aGlmdCAoZHgvZHkvYmFzZWxpbmUtc2hpZnQpIGhhcyB0byBiZSBhcHBsaWVkIGFmdGVyIHRoZSBy b3RhdGlvbgogICAgICAgICBpZiAoIWluZm8uaW5QYXRoTGF5b3V0KCkpIHsKLSAgICAgICAgICAg IHN2Z0NoYXIueCArPSBpbmZvLnNoaWZ0eDsKLSAgICAgICAgICAgIHN2Z0NoYXIueSArPSBpbmZv LnNoaWZ0eTsKKyAgICAgICAgICAgIHN2Z0NoYXIueCArPSBpbmZvLnNoaWZ0eCArIHhPcmllbnRh dGlvblNoaWZ0OworICAgICAgICAgICAgc3ZnQ2hhci55ICs9IGluZm8uc2hpZnR5ICsgeU9yaWVu dGF0aW9uU2hpZnQ7CisKKyAgICAgICAgICAgIGlmIChvcmllbnRhdGlvbkFuZ2xlICE9IDAuMGYp CisgICAgICAgICAgICAgICAgc3ZnQ2hhci5hbmdsZSArPSBvcmllbnRhdGlvbkFuZ2xlOworCisg ICAgICAgICAgICBpZiAoc3ZnQ2hhci5hbmdsZSAhPSAwLjBmKQorICAgICAgICAgICAgICAgIHN2 Z0NoYXIuZHJhd25TZXBlcmF0ZWQgPSB0cnVlOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAg ICAgc3ZnQ2hhci5wYXRoRGF0YS0+eFNoaWZ0ID0gaW5mby5zaGlmdHg7Ci0gICAgICAgICAgICBz dmdDaGFyLnBhdGhEYXRhLT55U2hpZnQgPSBpbmZvLnNoaWZ0eTsKKyAgICAgICAgICAgIHN2Z0No YXIucGF0aERhdGEtPm9yaWVudGF0aW9uQW5nbGUgPSBvcmllbnRhdGlvbkFuZ2xlOwogCisgICAg ICAgICAgICBpZiAoaXNWZXJ0aWNhbFRleHQpCisgICAgICAgICAgICAgICAgc3ZnQ2hhci5hbmds ZSAtPSA5MC4wZjsKKworICAgICAgICAgICAgc3ZnQ2hhci5wYXRoRGF0YS0+eFNoaWZ0ID0gaW5m by5zaGlmdHggKyB4T3JpZW50YXRpb25TaGlmdDsKKyAgICAgICAgICAgIHN2Z0NoYXIucGF0aERh dGEtPnlTaGlmdCA9IGluZm8uc2hpZnR5ICsgeU9yaWVudGF0aW9uU2hpZnQ7CisKICAgICAgICAg ICAgIC8vIFRyYW5zbGF0ZSB0byBnbHlwaCBtaWRwb2ludAogICAgICAgICAgICAgaWYgKGlzVmVy dGljYWxUZXh0KSB7CiAgICAgICAgICAgICAgICAgc3ZnQ2hhci5wYXRoRGF0YS0+eFNoaWZ0ICs9 IGluZm8uZHg7Ci0gICAgICAgICAgICAgICAgc3ZnQ2hhci5wYXRoRGF0YS0+eVNoaWZ0IC09IGds eXBoSGVpZ2h0IC8gMi4wZjsKKyAgICAgICAgICAgICAgICBzdmdDaGFyLnBhdGhEYXRhLT55U2hp ZnQgLT0gZ2x5cGhBZHZhbmNlIC8gMi4wZjsKICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAg ICAgICAgICAgc3ZnQ2hhci5wYXRoRGF0YS0+eFNoaWZ0IC09IGdseXBoV2lkdGggLyAyLjBmOwor ICAgICAgICAgICAgICAgIHN2Z0NoYXIucGF0aERhdGEtPnhTaGlmdCAtPSBnbHlwaEFkdmFuY2Ug LyAyLjBmOwogICAgICAgICAgICAgICAgIHN2Z0NoYXIucGF0aERhdGEtPnlTaGlmdCArPSBpbmZv LmR5OwogICAgICAgICAgICAgfQogICAgICAgICB9Ci0gCi0gICAgICAgIC8vIENvcnJlY3QgY2hh cmFjdGVyIHBvc2l0aW9uIGZvciB2ZXJ0aWNhbCB0ZXh0IGxheW91dAorCisgICAgICAgIC8vIEFk dmFuY2UgdG8gbmV3IHBvc2l0aW9uCiAgICAgICAgIGlmIChpc1ZlcnRpY2FsVGV4dCkgewogICAg ICAgICAgICAgc3ZnQ2hhci5kcmF3blNlcGVyYXRlZCA9IHRydWU7Ci0gICAgICAgICAgICBzdmdD aGFyLnggLT0gZ2x5cGhXaWR0aCAvIDIuMGY7Ci0gICAgICAgICAgICBzdmdDaGFyLnkgKz0gZ2x5 cGhIZWlnaHQ7Ci0gICAgICAgIH0KKyAgICAgICAgICAgIGluZm8uY3VyeSArPSBnbHlwaEFkdmFu Y2UgKyBzcGFjaW5nOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIGluZm8uY3VyeCArPSBn bHlwaEFkdmFuY2UgKyBzcGFjaW5nOwogCi0gICAgICAgIC8vIFJlY29yZCBhbmdsZSBpZiBzcGVj aWZpZWQKLSAgICAgICAgc3ZnQ2hhci5hbmdsZSA9IGluZm8uYW5nbGU7Ci0gICAgICAgIGlmIChz dmdDaGFyLmFuZ2xlICE9IDAuMGYpCi0gICAgICAgICAgICBzdmdDaGFyLmRyYXduU2VwZXJhdGVk ID0gdHJ1ZTsKLQotICAgICAgICAvLyBBZHZhbmNlIHRvIG5ldyBwb3NpdGlvbgotICAgICAgICBp ZiAoaXNWZXJ0aWNhbFRleHQpCi0gICAgICAgICAgICBpbmZvLmN1cnkgKz0gZ2x5cGhIZWlnaHQg KyBzcGFjaW5nOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBpbmZvLmN1cnggKz0gZ2x5cGhX aWR0aCArIHNwYWNpbmc7Ci0KICAgICAgICAgLy8gQWR2YW5jZSB0byBuZXh0IGNoYXJhY3Rlcgog ICAgICAgICBpbmZvLnN2Z0NoYXJzLmFwcGVuZChzdmdDaGFyKTsKICAgICAgICAgaW5mby5wcm9j ZXNzZWRTaW5nbGVDaGFyYWN0ZXIoKTsKSW5kZXg6IHJlbmRlcmluZy9TVkdDaGFyYWN0ZXJMYXlv dXRJbmZvLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSByZW5kZXJpbmcvU1ZHQ2hhcmFjdGVyTGF5b3V0SW5m by5jcHAJKHJldmlzaW9uIDI3Njc0KQorKysgcmVuZGVyaW5nL1NWR0NoYXJhY3RlckxheW91dElu Zm8uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MTUsMTYgKzUxNSwxMyBAQAogICAgIGN0bS50cmFu c2xhdGUoeCwgeSk7CiAgICAgY3RtLnJvdGF0ZShhbmdsZSk7CiAKLSAgICBpZiAocGF0aERhdGEp CisgICAgaWYgKHBhdGhEYXRhKSB7CiAgICAgICAgIGN0bS5zY2FsZShwYXRoRGF0YS0+eFNjYWxl LCBwYXRoRGF0YS0+eVNjYWxlKTsKLQotICAgIGN0bS50cmFuc2xhdGUoLXgsIC15KTsKLQotICAg IC8vIEFwcGx5IHRyYW5zZm9ybWF0aW9ucyB3aGljaCBoYXZlIHRvIGJlIGFwcGxpZWQgb3J0aG9n b25hbCB0byB0aGUgcGF0aAotICAgIC8vIE9ubHkgaGFwcGVucyBpbiB0ZXh0UGF0aCBsYXlvdXRz LgotICAgIGlmIChwYXRoRGF0YSkKICAgICAgICAgY3RtLnRyYW5zbGF0ZShwYXRoRGF0YS0+eFNo aWZ0LCBwYXRoRGF0YS0+eVNoaWZ0KTsKKyAgICAgICAgY3RtLnJvdGF0ZShwYXRoRGF0YS0+b3Jp ZW50YXRpb25BbmdsZSk7CisgICAgfQogCisgICAgY3RtLnRyYW5zbGF0ZShvcmllbnRhdGlvblNo aWZ0WCAtIHgsIG9yaWVudGF0aW9uU2hpZnRZIC0geSk7CiAgICAgcmV0dXJuIGN0bTsKIH0KIApJ bmRleDogcmVuZGVyaW5nL1NWR0NoYXJhY3RlckxheW91dEluZm8uaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBy ZW5kZXJpbmcvU1ZHQ2hhcmFjdGVyTGF5b3V0SW5mby5oCShyZXZpc2lvbiAyNzY3NCkKKysrIHJl bmRlcmluZy9TVkdDaGFyYWN0ZXJMYXlvdXRJbmZvLmgJKHdvcmtpbmcgY29weSkKQEAgLTE4Myw2 ICsxODMsNyBAQAogICAgICAgICAsIHlTY2FsZSgxLjBmKQogICAgICAgICAsIHhTaGlmdCgwLjBm KQogICAgICAgICAsIHlTaGlmdCgwLjBmKQorICAgICAgICAsIG9yaWVudGF0aW9uQW5nbGUoMC4w ZikKICAgICAgICAgLCB2aXNpYmxlKHRydWUpCiAgICAgewogICAgIH0KQEAgLTE5Myw2ICsxOTQs OCBAQAogICAgIGZsb2F0IHhTaGlmdDsKICAgICBmbG9hdCB5U2hpZnQ7CiAKKyAgICBmbG9hdCBv cmllbnRhdGlvbkFuZ2xlOworCiAgICAgLy8gRGV0ZXJtaW5lcyB3aGV0ZXIgdGhpcyBjaGFyIGlz IHZpc2libGUgKGllLiBmYWxzZSBmb3IgY2hhcnMgIm9mZiIgdGhlIHRleHQgbGF5b3V0IHBhdGgp CiAgICAgYm9vbCB2aXNpYmxlIDogMTsKIH07CkBAIC0yMDIsNiArMjA1LDggQEAKICAgICAgICAg OiB4KDAuMGYpCiAgICAgICAgICwgeSgwLjBmKQogICAgICAgICAsIGFuZ2xlKDAuMGYpCisgICAg ICAgICwgb3JpZW50YXRpb25TaGlmdFgoMC4wZikKKyAgICAgICAgLCBvcmllbnRhdGlvblNoaWZ0 WSgwLjBmKQogICAgICAgICAsIHBhdGhEYXRhKCkKICAgICAgICAgLCBkcmF3blNlcGVyYXRlZChm YWxzZSkKICAgICAgICAgLCBuZXdUZXh0Q2h1bmsoZmFsc2UpCkBAIC0yMTYsNiArMjIxLDkgQEAK ICAgICBmbG9hdCB5OwogICAgIGZsb2F0IGFuZ2xlOwogCisgICAgZmxvYXQgb3JpZW50YXRpb25T aGlmdFg7CisgICAgZmxvYXQgb3JpZW50YXRpb25TaGlmdFk7CisKICAgICBSZWZQdHI8U1ZHQ2hh ck9uUGF0aD4gcGF0aERhdGE7CiAKICAgICAvLyBEZXRlcm1pbmVzIHdoZXRlciB0aGlzIGNoYXIg bmVlZHMgdG8gYmUgZHJhd24gc2VwZXJhdGVkCkluZGV4OiBXZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCShyZXZpc2lvbiAyNzY3NCkKKysrIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agkod29ya2luZyBjb3B5KQpAQCAtMjkyNSw2ICsyOTI1LDggQEAKIAkJQjI3NTM1ODIwQjA1Mzgx NDAwMkNFNjRGIC8qIFBlbi5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gQjI3NTM1NTUwQjA1MzgxNDAwMkNFNjRGIC8qIFBlbi5oICovOyB9OwogCQlCMjc1 MzU4RTBCMDUzQTY2MDAyQ0U2NEYgLyogSWNvbk1hYy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEIyNzUzNThEMEIwNTNBNjYwMDJDRTY0RiAvKiBJY29u TWFjLm1tICovOyB9OwogCQlCMjc3QjQwNDBCMjJGMzdDMDAwNEJFQzYgLyogR3JhcGhpY3NDb250 ZXh0TWFjLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g QjI3N0I0MDMwQjIyRjM3QzAwMDRCRUM2IC8qIEdyYXBoaWNzQ29udGV4dE1hYy5tbSAqLzsgfTsK KwkJQjI4N0IyMkUwQ0U2NkE4MjAwNTREMzkwIC8qIFVuaWNvZGVSYW5nZS5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCMjg3QjIyQzBDRTY2QTgyMDA1 NEQzOTAgLyogVW5pY29kZVJhbmdlLmNwcCAqLzsgfTsKKwkJQjI4N0IyMkYwQ0U2NkE4MjAwNTRE MzkwIC8qIFVuaWNvZGVSYW5nZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gQjI4N0IyMkQwQ0U2NkE4MjAwNTREMzkwIC8qIFVuaWNvZGVSYW5nZS5oICov OyB9OwogCQlCMjk3QkM3MDBCM0MxNENGMDA0NUE1OTAgLyogSlNTVkdQYXRoU2VnTGlzdEN1c3Rv bS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCMjk3 QkM2RjBCM0MxNENGMDA0NUE1OTAgLyogSlNTVkdQYXRoU2VnTGlzdEN1c3RvbS5jcHAgKi87IH07 CiAJCUIyQTAxNUE4MEFGNkNENTMwMDZCQ0UwRSAvKiBHcmFwaGljc0NvbnRleHQuY3BwIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQjJBMDE1OTIwQUY2Q0Q1 MzAwNkJDRTBFIC8qIEdyYXBoaWNzQ29udGV4dC5jcHAgKi87IH07CiAJCUIyQTAxNUE5MEFGNkNE NTMwMDZCQ0UwRSAvKiBHcmFwaGljc0NvbnRleHQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEIyQTAxNTkzMEFGNkNENTMwMDZCQ0UwRSAvKiBHcmFwaGlj c0NvbnRleHQuaCAqLzsgfTsKQEAgLTY3ODYsNiArNjc4OCw4IEBACiAJCUIyNzUzNTU1MEIwNTM4 MTQwMDJDRTY0RiAvKiBQZW4uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBl bi5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCMjc1MzU4RDBCMDUzQTY2MDAyQ0U2 NEYgLyogSWNvbk1hYy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGgg PSBJY29uTWFjLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCMjc3QjQwMzBCMjJG MzdDMDAwNEJFQzYgLyogR3JhcGhpY3NDb250ZXh0TWFjLm1tICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDMwOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLm9iamNwcDsgcGF0aCA9IEdyYXBoaWNzQ29udGV4dE1hYy5tbTsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKKwkJQjI4N0IyMkMwQ0U2NkE4MjAwNTREMzkwIC8qIFVuaWNvZGVSYW5n ZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gVW5pY29kZVJhbmdl LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJQjI4N0IyMkQwQ0U2NkE4MjAwNTRE MzkwIC8qIFVuaWNvZGVSYW5nZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDMwOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g VW5pY29kZVJhbmdlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUIyOTdCQzZGMEIz QzE0Q0YwMDQ1QTU5MCAvKiBKU1NWR1BhdGhTZWdMaXN0Q3VzdG9tLmNwcCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBKU1NWR1BhdGhTZWdMaXN0Q3VzdG9tLmNwcDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQjJBMDE1OTIwQUY2Q0Q1MzAwNkJDRTBFIC8qIEdy YXBoaWNzQ29udGV4dC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g R3JhcGhpY3NDb250ZXh0LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQjJBMDE1 OTMwQUY2Q0Q1MzAwNkJDRTBFIC8qIEdyYXBoaWNzQ29udGV4dC5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDMwOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gR3JhcGhpY3NDb250ZXh0Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CkBAIC0xMTU1NCw2ICsxMTU1OCw4IEBACiAJCQkJNTFFMUVDQjIwQzkxQzU1NjAwREMy NTVCIC8qIFRocmVhZGluZy5oICovLAogCQkJCTkzMzA5RUExMDk5RUI3OEMwMDU2RTU4MSAvKiBU aW1lci5jcHAgKi8sCiAJCQkJOTMwNUIyNEMwOThGMUI2QjAwQzI4ODU1IC8qIFRpbWVyLmggKi8s CisJCQkJQjI4N0IyMkMwQ0U2NkE4MjAwNTREMzkwIC8qIFVuaWNvZGVSYW5nZS5jcHAgKi8sCisJ CQkJQjI4N0IyMkQwQ0U2NkE4MjAwNTREMzkwIC8qIFVuaWNvZGVSYW5nZS5oICovLAogCQkJCTkz ODBGNDcxMDlBMTFBQjQwMDFGREIzNCAvKiBXaWRnZXQuY3BwICovLAogCQkJCTkzODBGNDcyMDlB MTFBQjQwMDFGREIzNCAvKiBXaWRnZXQuaCAqLywKIAkJCQk5M0I3ODBDOTA5QjNCN0ZFMDA2OTAx NjIgLyogV2lkZ2V0Q2xpZW50LmggKi8sCkBAIC0xMzkyOCw2ICsxMzkzNCw3IEBACiAJCQkJQkNC MTZDMkQwOTc5QzNCRDAwNDY3NzQxIC8qIGxvYWRlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJOTMz MDlERjgwOTlFNjQ5MjAwNTZFNTgxIC8qIG1hcmt1cC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJOTMz MDlFMUUwOTlFNjQ5MjAwNTZFNTgxIC8qIHZpc2libGVfdW5pdHMuaCBpbiBIZWFkZXJzICovLAor CQkJCUIyODdCMjJGMENFNjZBODIwMDU0RDM5MCAvKiBVbmljb2RlUmFuZ2UuaCBpbiBIZWFkZXJz ICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwog CQl9OwpAQCAtMTM5NjYsNyArMTM5NzMsNiBAQAogCQkwODY3RDY5MEZFODQwMjhGQzAyQUFDMDcg LyogUHJvamVjdCBvYmplY3QgKi8gPSB7CiAJCQlpc2EgPSBQQlhQcm9qZWN0OwogCQkJYnVpbGRD b25maWd1cmF0aW9uTGlzdCA9IDE0OUMyODQzMDg5MDJCMTEwMDhBOUVGQyAvKiBCdWlsZCBjb25m aWd1cmF0aW9uIGxpc3QgZm9yIFBCWFByb2plY3QgIldlYkNvcmUiICovOwotCQkJY29tcGF0aWJp bGl0eVZlcnNpb24gPSAiWGNvZGUgMi40IjsKIAkJCWhhc1NjYW5uZWRGb3JFbmNvZGluZ3MgPSAx OwogCQkJa25vd25SZWdpb25zID0gKAogCQkJCUVuZ2xpc2gsCkBAIC0xNTQ5MCw2ICsxNTQ5Niw3 IEBACiAJCQkJQkNCMTZDMkMwOTc5QzNCRDAwNDY3NzQxIC8qIGxvYWRlci5jcHAgaW4gU291cmNl cyAqLywKIAkJCQk5MzMwOURGNzA5OUU2NDkyMDA1NkU1ODEgLyogbWFya3VwLmNwcCBpbiBTb3Vy Y2VzICovLAogCQkJCTkzMzA5RTFEMDk5RTY0OTIwMDU2RTU4MSAvKiB2aXNpYmxlX3VuaXRzLmNw cCBpbiBTb3VyY2VzICovLAorCQkJCUIyODdCMjJFMENFNjZBODIwMDU0RDM5MCAvKiBVbmljb2Rl UmFuZ2UuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQ b3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07CkluZGV4OiBXZWJDb3JlLnBybwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlLnBybwkocmV2aXNpb24gMjc2NzQpCisrKyBXZWJDb3JlLnBybwkod29ya2luZyBj b3B5KQpAQCAtNzAwLDYgKzcwMCw3IEBACiAgICAgcGxhdGZvcm0vVGV4dEVuY29kaW5nUmVnaXN0 cnkuY3BwIFwKICAgICBwbGF0Zm9ybS9UZXh0U3RyZWFtLmNwcCBcCiAgICAgcGxhdGZvcm0vVGlt ZXIuY3BwIFwKKyAgICBwbGF0Zm9ybS9Vbmljb2RlUmFuZ2UuY3BwIFwKICAgICBwbGF0Zm9ybS9X aWRnZXQuY3BwIFwKICAgICByZW5kZXJpbmcvQXV0b1RhYmxlTGF5b3V0LmNwcCBcCiAgICAgcmVu ZGVyaW5nL2JpZGkuY3BwIFwKSW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VM b2cJKHJldmlzaW9uIDI3Njc4KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjggQEAKKzIwMDctMTEtMTAgIE5pa29sYXMgWmltbWVybWFubiAgPHppbW1lcm1hbm5Aa2Rl Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXhlczogaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5MzcgKEFkZCBn bHlwaC1vcmllbnRhdGlvbi1ob3Jpem9udGFsL3ZlcnRpY2FsIHN1cHBvcnQpCisgICAgICAgIEZp eGVzOiBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk3MSAodGV4dC1h bmNob3Igc3VwcG9ydCBvbiB2ZXJ0aWNhbCB0ZXh0IHNlZW1zIHNsaWdodGx5IG9mZikKKworICAg ICAgICBBZGQgZ2x5cGgtb3JpZW50YXRpb24tKiBzdXBwb3J0IGZvciB0ZXh0ICYgdGV4dFBhdGgu ICg5MC8xODAvMjcwIGFuZCAnYXV0bycpCisgICAgICAgIEFsc28gZml4IGFsbCB2ZXJ0aWNhbCB0 ZXh0IGhhbmRsaW5nIC0gZm9yIHRleHQgJiB0ZXh0UGF0aCEgKGVzcGVjaWFsbHkgbGF0aW4xIGNo YXJhY3RlcnMgYXV0byBvcmllbnRhdGlvbiBpbiB2ZXJ0aWNhbCB3cml0aW5nIG1vZGVzKQorCisg ICAgICAgICogV2ViQ29yZS5wcm86IEFkZCBwbGF0Zm9ybS9Vbmljb2RlUmFuZ2UuY3BwIHRvIGJ1 aWxkCisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOiBEaXRvLgor ICAgICAgICAqIHJlbmRlcmluZy9TVkdDaGFyYWN0ZXJMYXlvdXRJbmZvLmNwcDogUmVzcGVjdCBv cmllbnRhdGlvblNoaWZ0WC9ZICYgYW5nbGUgaW4gY2hhcmFjdGVyVHJhbnNmb3JtKCkKKyAgICAg ICAgKFdlYkNvcmU6OlNWR0NoYXI6OmNoYXJhY3RlclRyYW5zZm9ybSk6CisgICAgICAgICogcmVu ZGVyaW5nL1NWR0NoYXJhY3RlckxheW91dEluZm8uaDogTmV3IHZhcmlhYmxlcy4KKyAgICAgICAg KFdlYkNvcmU6OlNWR0NoYXJPblBhdGg6OlNWR0NoYXJPblBhdGgpOgorICAgICAgICAoV2ViQ29y ZTo6U1ZHQ2hhcjo6U1ZHQ2hhcik6CisgICAgICAgICogcmVuZGVyaW5nL1NWR1Jvb3RJbmxpbmVC b3guY3BwOiBBZGRlZCBnbHlwaC1vcmllbnRhdGlvbi0qIGhhbmRsaW5nLgorICAgICAgICAoV2Vi Q29yZTo6Z2x5cGhPcmllbnRhdGlvblRvQW5nbGUpOgorICAgICAgICAoV2ViQ29yZTo6Z2x5cGhP cmllbnRhdGlvbklzTXVsdGlwbHlPZjE4MERlZ3JlZXMpOgorICAgICAgICAoV2ViQ29yZTo6Y2Fs Y3VsYXRlR2x5cGhBZHZhbmNlQW5kU2hpZnRSZXNwZWN0aW5nT3JpZW50YXRpb24pOgorICAgICAg ICAoV2ViQ29yZTo6Y3VtbXVsYXRlZEhlaWdodE9mSW5saW5lQm94Q2hhcmFjdGVyUmFuZ2UpOgor ICAgICAgICAoV2ViQ29yZTo6Y3VtbXVsYXRlZFdpZHRoT3JIZWlnaHRPZlRleHRDaHVuayk6Cisg ICAgICAgIChXZWJDb3JlOjpTVkdSb290SW5saW5lQm94OjpidWlsZExheW91dEluZm9ybWF0aW9u Rm9yVGV4dEJveCk6CisKIDIwMDctMTEtMTAgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCg==