11116 2006-10-02 02:58:08 -0700 Move cacheGlobalObject into KJS namespace 2006-10-02 03:30:12 -0700 1 1 1 Unclassified WebKit Platform 420+ Other OS X 10.4 RESOLVED FIXED P2 Normal --- 1 zimmermann zimmermann oldest_to_newest 56903 0 zimmermann 2006-10-02 02:58:08 -0700 If cacheGlobalObject lives in the root namespace, it makes trouble. The KJS_GCC_ROOT_NS_HACK was introduced to work around these troubles, though it breaks with older gcc3 compilers, and it's just not worth. We can just as well kill it, and fix it properly. That also makes it possible to remove the friendship between cacheGlobalObject and tons of generated JS wrapper classes. Attaching a patch for this, which also fixes some strange problems regarding to gcc3 and image-decoders/platform/png. 56904 1 10862 zimmermann 2006-10-02 02:58:46 -0700 Created attachment 10862 Initial patch A first try :-) 56905 2 10863 zimmermann 2006-10-02 03:12:09 -0700 Created attachment 10863 Updated patch Forgot the whitespace cleanup in kjs/lookup.h 56906 3 10863 eric 2006-10-02 03:14:15 -0700 Comment on attachment 10863 Updated patch Looks fine. r=me. (mjs also looked). 56909 4 eric 2006-10-02 03:30:12 -0700 r16711 10862 2006-10-02 02:58:46 -0700 2006-10-02 03:12:09 -0700 Initial patch build-fixes.diff text/plain 24871 zimmermann SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzAxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDYtMTAtMDEgIE5pa29sYXMg WmltbWVybWFubiA8emltbWVybWFubkBrZGUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBRdC9MaW51eCBidWlsZCB3aXRoIG9sZGVyIGdj YyAzLjMuNC4KKyAKKyAgICAgICAgKiBranMvbG9va3VwLmg6IE1vdmUgY2FjaGVHbG9iYWxPYmpl Y3QgaW50byBLSlMgbmFtZXNwYWNlLgorICAgICAgICAoS0pTOjpjYWNoZUdsb2JhbE9iamVjdCk6 IEFsc28gcmVtb3ZlIEdDQ19ST09UX05TX0hBQ0suCisgICAgICAgICogd3RmL0Fzc2VydGlvbnMu aDogSW5jbHVkZSBpbnR0eXBlcy5oIGZvciB1aW50cHRyX3QuCisKIDIwMDYtMDktMjggIFN0ZXZl IEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBN YWNpZWouCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9ranMvbG9va3VwLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g SmF2YVNjcmlwdENvcmUva2pzL2xvb2t1cC5oCShyZXZpc2lvbiAxNjcwMCkKKysrIEphdmFTY3Jp cHRDb3JlL2tqcy9sb29rdXAuaAkod29ya2luZyBjb3B5KQpAQCAtMjcxLDM0ICsyNzEsMjggQEAg bmFtZXNwYWNlIEtKUyB7CiAgICAgICB0aGlzT2JqLT5QYXJlbnRJbXA6OnB1dChleGVjLCBwcm9w ZXJ0eU5hbWUsIHZhbHVlLCBhdHRyKTsgLy8gbm90IGZvdW5kOiBmb3J3YXJkIHRvIHBhcmVudAog ICB9CiAKLX0gLy8gbmFtZXNwYWNlCi0KLS8qCi0gKiBUaGUgdGVtcGxhdGUgbWV0aG9kIGJlbG93 IGNhbid0IGJlIGluIHRoZSBLSlMgbmFtZXNwYWNlIGJlY2F1c2UgaXQncyB1c2VkIGluIAotICog S0pTX0RFRklORV9QUk9QRVJUWSB3aGljaCBjYW4gYmUgdXNlZCBvdXRzaWRlIG9mIHRoZSBLSlMg bmFtZXNwYWNlLiBJdCBjYW4gYmUgbW92ZWQgYmFjawotICogd2hlbiBhIGdjYyB3aXRoIGh0dHA6 Ly9nY2MuZ251Lm9yZy9idWd6aWxsYS9zaG93X2J1Zy5jZ2k/aWQ9ODM1NSBpcyBtYWluc3RyZWFt IGVub3VnaC4KLSAqLwotIAotLyoqCi0gKiBUaGlzIHRlbXBsYXRlIG1ldGhvZCByZXRyaWV2ZXMg b3IgY3JlYXRlIGFuIG9iamVjdCB0aGF0IGlzIHVuaXF1ZQotICogKGZvciBhIGdpdmVuIGludGVy cHJldGVyKSBUaGUgZmlyc3QgdGltZSB0aGlzIGlzIGNhbGxlZCAoZm9yIGEgZ2l2ZW4KLSAqIHBy b3BlcnR5IG5hbWUpLCB0aGUgT2JqZWN0IHdpbGwgYmUgY29uc3RydWN0ZWQsIGFuZCBzZXQgYXMg YSBwcm9wZXJ0eQotICogb2YgdGhlIGludGVycHJldGVyJ3MgZ2xvYmFsIG9iamVjdC4gTGF0ZXIg Y2FsbHMgd2lsbCBzaW1wbHkgcmV0cmlldmUKLSAqIHRoYXQgY2FjaGVkIG9iamVjdC4gTm90ZSB0 aGF0IHRoZSBvYmplY3QgY29uc3RydWN0b3IgbXVzdCB0YWtlIDEgYXJndW1lbnQsIGV4ZWMuCi0g Ki8KLXRlbXBsYXRlIDxjbGFzcyBDbGFzc0N0b3I+Ci1pbmxpbmUgS0pTOjpKU09iamVjdCAqY2Fj aGVHbG9iYWxPYmplY3QoS0pTOjpFeGVjU3RhdGUgKmV4ZWMsIGNvbnN0IEtKUzo6SWRlbnRpZmll ciAmcHJvcGVydHlOYW1lKQotewotICBLSlM6OkpTT2JqZWN0ICpnbG9iYWxPYmplY3QgPSBzdGF0 aWNfY2FzdDxLSlM6OkpTT2JqZWN0ICo+KGV4ZWMtPmxleGljYWxJbnRlcnByZXRlcigpLT5nbG9i YWxPYmplY3QoKSk7Ci0gIEtKUzo6SlNWYWx1ZSAqb2JqID0gZ2xvYmFsT2JqZWN0LT5nZXREaXJl Y3QocHJvcGVydHlOYW1lKTsKLSAgaWYgKG9iaikgewotICAgIGFzc2VydChvYmotPmlzT2JqZWN0 KCkpOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDxLSlM6OkpTT2JqZWN0ICo+KG9iaik7CisgIC8q KgorICAgKiBUaGlzIHRlbXBsYXRlIG1ldGhvZCByZXRyaWV2ZXMgb3IgY3JlYXRlIGFuIG9iamVj dCB0aGF0IGlzIHVuaXF1ZQorICAgKiAoZm9yIGEgZ2l2ZW4gaW50ZXJwcmV0ZXIpIFRoZSBmaXJz dCB0aW1lIHRoaXMgaXMgY2FsbGVkIChmb3IgYSBnaXZlbgorICAgKiBwcm9wZXJ0eSBuYW1lKSwg dGhlIE9iamVjdCB3aWxsIGJlIGNvbnN0cnVjdGVkLCBhbmQgc2V0IGFzIGEgcHJvcGVydHkKKyAg ICogb2YgdGhlIGludGVycHJldGVyJ3MgZ2xvYmFsIG9iamVjdC4gTGF0ZXIgY2FsbHMgd2lsbCBz aW1wbHkgcmV0cmlldmUKKyAgICogdGhhdCBjYWNoZWQgb2JqZWN0LiBOb3RlIHRoYXQgdGhlIG9i amVjdCBjb25zdHJ1Y3RvciBtdXN0IHRha2UgMSBhcmd1bWVudCwgZXhlYy4KKyAgICovCisgIHRl bXBsYXRlIDxjbGFzcyBDbGFzc0N0b3I+CisgIGlubGluZSBKU09iamVjdCAqY2FjaGVHbG9iYWxP YmplY3QoRXhlY1N0YXRlICpleGVjLCBjb25zdCBJZGVudGlmaWVyICZwcm9wZXJ0eU5hbWUpCisg IHsKKyAgICBKU09iamVjdCAqZ2xvYmFsT2JqZWN0ID0gc3RhdGljX2Nhc3Q8SlNPYmplY3QgKj4o ZXhlYy0+bGV4aWNhbEludGVycHJldGVyKCktPmdsb2JhbE9iamVjdCgpKTsKKyAgICBKU1ZhbHVl ICpvYmogPSBnbG9iYWxPYmplY3QtPmdldERpcmVjdChwcm9wZXJ0eU5hbWUpOworICAgIGlmIChv YmopIHsKKyAgICAgIGFzc2VydChvYmotPmlzT2JqZWN0KCkpOworICAgICAgcmV0dXJuIHN0YXRp Y19jYXN0PEpTT2JqZWN0ICo+KG9iaik7CisgICAgfQorICAgIEpTT2JqZWN0ICpuZXdPYmplY3Qg PSBuZXcgQ2xhc3NDdG9yKGV4ZWMpOworICAgIGdsb2JhbE9iamVjdC0+cHV0KGV4ZWMsIHByb3Bl cnR5TmFtZSwgbmV3T2JqZWN0LCBJbnRlcm5hbCB8IERvbnRFbnVtKTsKKyAgICByZXR1cm4gbmV3 T2JqZWN0OwogICB9Ci0gIEtKUzo6SlNPYmplY3QgKm5ld09iamVjdCA9IG5ldyBDbGFzc0N0b3Io ZXhlYyk7Ci0gIGdsb2JhbE9iamVjdC0+cHV0KGV4ZWMsIHByb3BlcnR5TmFtZSwgbmV3T2JqZWN0 LCBLSlM6OkludGVybmFsIHwgS0pTOjpEb250RW51bSk7Ci0gIHJldHVybiBuZXdPYmplY3Q7Ci19 CisKK30gLy8gbmFtZXNwYWNlCiAKIC8qKgogICogSGVscGVycyB0byBkZWZpbmUgcHJvdG90eXBl IG9iamVjdHMgKGVhY2ggb2Ygd2hpY2ggc2ltcGx5IGltcGxlbWVudHMKQEAgLTMxNywyMyArMzEx LDE0IEBAIGlubGluZSBLSlM6OkpTT2JqZWN0ICpjYWNoZUdsb2JhbE9iamVjdCgKICAqIHRoZW4g dGhlIGZpcnN0IGxpbmUgd2lsbCB1c2UgS0pTX0RFRklORV9QUk9UT1RZUEVfV0lUSF9QUk9UT1RZ UEUsIHdpdGggRE9NTm9kZVByb3RvIGFzIHRoZSBzZWNvbmQgYXJndW1lbnQuCiAgKi8KIAotLy8g V29yayBhcm91bmQgYSBidWcgaW4gR0NDIDQuMQotI2lmICFDT01QSUxFUihHQ0MpCi0jZGVmaW5l IEtKU19HQ0NfUk9PVF9OU19IQUNLIDo6Ci0jZWxzZQotI2RlZmluZSBLSlNfR0NDX1JPT1RfTlNf SEFDSwotI2VuZGlmCi0KIC8vIFRoZXNlIG1hY3JvcyBhc3N1bWUgdGhhdCBhIHByb3RvdHlwZSdz IG9ubHkgcHJvcGVydGllcyBhcmUgZnVuY3Rpb25zCiAjZGVmaW5lIEtKU19ERUZJTkVfUFJPVE9U WVBFKENsYXNzUHJvdG8pIFwKICAgY2xhc3MgQ2xhc3NQcm90byA6IHB1YmxpYyBLSlM6OkpTT2Jq ZWN0IHsgXAotICBmcmllbmQgS0pTOjpKU09iamVjdCAqS0pTX0dDQ19ST09UX05TX0hBQ0sgY2Fj aGVHbG9iYWxPYmplY3Q8Q2xhc3NQcm90bz4oS0pTOjpFeGVjU3RhdGUgKmV4ZWMsIGNvbnN0IEtK Uzo6SWRlbnRpZmllciAmcHJvcGVydHlOYW1lKTsgXAogICBwdWJsaWM6IFwKICAgICBzdGF0aWMg S0pTOjpKU09iamVjdCAqc2VsZihLSlM6OkV4ZWNTdGF0ZSAqZXhlYyk7IFwKICAgICB2aXJ0dWFs IGNvbnN0IEtKUzo6Q2xhc3NJbmZvICpjbGFzc0luZm8oKSBjb25zdCB7IHJldHVybiAmaW5mbzsg fSBcCiAgICAgc3RhdGljIGNvbnN0IEtKUzo6Q2xhc3NJbmZvIGluZm87IFwKICAgICBib29sIGdl dE93blByb3BlcnR5U2xvdChLSlM6OkV4ZWNTdGF0ZSAqLCBjb25zdCBLSlM6OklkZW50aWZpZXIm LCBLSlM6OlByb3BlcnR5U2xvdCYpOyBcCi0gIHByb3RlY3RlZDogXAogICAgIENsYXNzUHJvdG8o S0pTOjpFeGVjU3RhdGUgKmV4ZWMpIFwKICAgICAgIDogS0pTOjpKU09iamVjdChleGVjLT5sZXhp Y2FsSW50ZXJwcmV0ZXIoKS0+YnVpbHRpbk9iamVjdFByb3RvdHlwZSgpKSB7IH0gXAogICAgIFwK QEAgLTM0MSwxMyArMzI2LDExIEBAIGlubGluZSBLSlM6OkpTT2JqZWN0ICpjYWNoZUdsb2JhbE9i amVjdCgKIAogI2RlZmluZSBLSlNfREVGSU5FX1BST1RPVFlQRV9XSVRIX1BST1RPVFlQRShDbGFz c1Byb3RvLCBDbGFzc1Byb3RvUHJvdG8pIFwKICAgICBjbGFzcyBDbGFzc1Byb3RvIDogcHVibGlj IEtKUzo6SlNPYmplY3QgeyBcCi0gICAgICAgIGZyaWVuZCBLSlM6OkpTT2JqZWN0KiBLSlNfR0ND X1JPT1RfTlNfSEFDSyBjYWNoZUdsb2JhbE9iamVjdDxDbGFzc1Byb3RvPihLSlM6OkV4ZWNTdGF0 ZSogZXhlYywgY29uc3QgS0pTOjpJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUpOyBcCiAgICAgcHVi bGljOiBcCiAgICAgICAgIHN0YXRpYyBLSlM6OkpTT2JqZWN0KiBzZWxmKEtKUzo6RXhlY1N0YXRl KiBleGVjKTsgXAogICAgICAgICB2aXJ0dWFsIGNvbnN0IEtKUzo6Q2xhc3NJbmZvKiBjbGFzc0lu Zm8oKSBjb25zdCB7IHJldHVybiAmaW5mbzsgfSBcCiAgICAgICAgIHN0YXRpYyBjb25zdCBLSlM6 OkNsYXNzSW5mbyBpbmZvOyBcCiAgICAgICAgIGJvb2wgZ2V0T3duUHJvcGVydHlTbG90KEtKUzo6 RXhlY1N0YXRlKiwgY29uc3QgS0pTOjpJZGVudGlmaWVyJiwgS0pTOjpQcm9wZXJ0eVNsb3QmKTsg XAotICAgIHByb3RlY3RlZDogXAogICAgICAgICBDbGFzc1Byb3RvKEtKUzo6RXhlY1N0YXRlKiBl eGVjKSBcCiAgICAgICAgICAgICA6IEtKUzo6SlNPYmplY3QoQ2xhc3NQcm90b1Byb3RvOjpzZWxm KGV4ZWMpKSB7IH0gXAogICAgIFwKQEAgLTM1Nyw3ICszNDAsNyBAQCBpbmxpbmUgS0pTOjpKU09i amVjdCAqY2FjaGVHbG9iYWxPYmplY3QoCiAgICAgY29uc3QgQ2xhc3NJbmZvIENsYXNzUHJvdG86 OmluZm8gPSB7IENsYXNzTmFtZSwgMCwgJkNsYXNzUHJvdG8jI1RhYmxlLCAwIH07IFwKICAgICBK U09iamVjdCAqQ2xhc3NQcm90bzo6c2VsZihFeGVjU3RhdGUgKmV4ZWMpIFwKICAgICB7IFwKLSAg ICAgICAgcmV0dXJuIDo6Y2FjaGVHbG9iYWxPYmplY3Q8Q2xhc3NQcm90bz4oZXhlYywgIltbIiBD bGFzc05hbWUgIi5wcm90b3R5cGVdXSIpOyBcCisgICAgICAgIHJldHVybiBLSlM6OmNhY2hlR2xv YmFsT2JqZWN0PENsYXNzUHJvdG8+KGV4ZWMsICJbWyIgQ2xhc3NOYW1lICIucHJvdG90eXBlXV0i KTsgXAogICAgIH0gXAogICAgIGJvb2wgQ2xhc3NQcm90bzo6Z2V0T3duUHJvcGVydHlTbG90KEV4 ZWNTdGF0ZSAqZXhlYywgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNs b3QmIHNsb3QpIFwKICAgICB7IFwKQEAgLTM3OSwxOCArMzYyLDQgQEAgaW5saW5lIEtKUzo6SlNP YmplY3QgKmNhY2hlR2xvYmFsT2JqZWN0KAogICAgIGludCBpZDsgXAogICB9OwogCi0vKgotICog TGlzdCBvZiB0aGluZ3MgdG8gZG8gd2hlbiBwb3J0aW5nIGFuIG9iamVjdGltcCB0byB0aGUgJ3N0 YXRpYyBoYXNodGFibGUnIG1lY2hhbmlzbToKLSAqIC0gd3JpdGUgdGhlIGhhc2h0YWJsZSBzb3Vy Y2UsIGJldHdlZW4gQGJlZ2luIGFuZCBAZW5kCi0gKiAtIGFkZCBhIHJ1bGUgdG8gYnVpbGQgdGhl IC5sdXQuaAotICogLSBpbmNsdWRlIHRoZSAubHV0LmgKLSAqIC0gbWVudGlvbiB0aGUgdGFibGUg aW4gdGhlIGNsYXNzaW5mbyAoYWRkIGEgY2xhc3NpbmZvIGlmIG5lY2Vzc2FyeSkKLSAqIC0gd3Jp dGUvdXBkYXRlIHRoZSBjbGFzcyBlbnVtIChmb3IgdGhlIHRva2VucykKLSAqIC0gdHVybiBnZXQo KSBpbnRvIGdldFZhbHVlUHJvcGVydHkoKSwgcHV0KCkgaW50byBwdXRWYWx1ZVByb3BlcnR5KCks IHVzaW5nIGEgc3dpdGNoIGFuZCByZW1vdmluZyBmdW5jcwotICogLSB3cml0ZSBnZXQoKSBhbmQv b3IgcHV0KCkgdXNpbmcgYSB0ZW1wbGF0ZSBtZXRob2QKLSAqIC0gY2xlYW51cCBvbGQgc3R1ZmYg KGUuZy4gaGFzUHJvcGVydHkpCi0gKiAtIGNvbXBpbGUsIHRlc3QsIGNvbW1pdCA7KQotICovCi0K LQogI2VuZGlmCkluZGV4OiBKYXZhU2NyaXB0Q29yZS93dGYvQXNzZXJ0aW9ucy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIEphdmFTY3JpcHRDb3JlL3d0Zi9Bc3NlcnRpb25zLmgJKHJldmlzaW9uIDE2NzAwKQor KysgSmF2YVNjcmlwdENvcmUvd3RmL0Fzc2VydGlvbnMuaAkod29ya2luZyBjb3B5KQpAQCAtMzgs NiArMzgsNyBAQAogKi8KIAogI2luY2x1ZGUgIlBsYXRmb3JtLmgiCisjaW5jbHVkZSA8aW50dHlw ZXMuaD4KIAogI2lmZGVmIE5ERUJVRwogI2RlZmluZSBBU1NFUlRJT05TX0RJU0FCTEVEX0RFRkFV TFQgMQpAQCAtMTgwLDQgKzE4MSw0IEBAIHdoaWxlICgwKQogI2RlZmluZSBKT0lOX0xPR19DSEFO TkVMX1dJVEhfUFJFRklYX0xFVkVMXzIocHJlZml4LCBjaGFubmVsKSBwcmVmaXggIyMgY2hhbm5l bAogI2VuZGlmCiAKLSNlbmRpZiAvLyBLWE1MQ09SRV9BU1NFUlRJT05TX0gKKyNlbmRpZgpJbmRl eDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE2NzAxKQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwyMCBAQAorMjAwNi0xMC0wMSAgTmlrb2xhcyBaaW1tZXJtYW5uIDx6aW1tZXJtYW5uQGtk ZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Rml4IFF0L0xpbnV4IGJ1aWxkIHdpdGggb2xkZXIgZ2NjIDMuMy40LgorCisgICAgICAgIEFzIGRp c2N1c3NlZCB3aXRoIE1hY2llaiwgdGhlIEdDQ19ST09UX05TX0hBQ0sKKyAgICAgICAgY2FuIGJl IGNvbXBsZXRlbHkgcmVtb3ZlZCwgYXMgd2VsbCBhcyB0aGUgZnJpZW5kc2hpcAorICAgICAgICBi ZXR3ZWVuIGNhY2hlR2xvYmFsT2JqZWN0ICYgdGhlIEpTKiBvYmplY3RzLgorCisgICAgICAgICog YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG06IFJlbW92ZSBmcmllbmRzaGlwLgor ICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9wbmdnY2NyZC5jOiBGaXggY29t bWVudHMgZm9yIGdjYzMuCisgICAgICAgIChwbmdfcmVhZF9maWx0ZXJfcm93X21teF9hdmcpOgor ICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9wbmd2Y3JkLmM6IERpdHRvLgor ICAgICAgICAocG5nX21teF9zdXBwb3J0KToKKyAgICAgICAgKHBuZ19yZWFkX2ZpbHRlcl9yb3df bW14X2F2Zyk6CisKIDIwMDYtMTAtMDEgIEFuZGVycyBDYXJsc3NvbiAgPGFjYXJsc3NvbkBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYuCkluZGV4OiBXZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0JKHJldmlzaW9uIDE2NzAwKQorKysgV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQkod29ya2luZyBjb3B5KQpA QCAtNDI4LDkgKzQyOCw2IEBAIHN1YiBHZW5lcmF0ZUhlYWRlcgogICAgIAogICAgICMgQWRkIHBy b3RvdHlwZSBkZWNsYXJhdGlvbiAtLSBjb2RlIGFkb3B0ZWQgZnJvbSB0aGUgS0pTX0RFRklORV9Q Uk9UT1RZUEUgYW5kIEtKU19ERUZJTkVfUFJPVE9UWVBFX1dJVEhfUFJPVE9UWVBFIG1hY3Jvcwog ICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICJjbGFzcyAke2NsYXNzTmFtZX1Qcm90byA6IHB1Ymxp YyBLSlM6OkpTT2JqZWN0IHtcbiIpOwotICAgIGlmICghJGRhdGFOb2RlLT5leHRlbmRlZEF0dHJp YnV0ZXMtPnsiRG9Ob3RDYWNoZSJ9KSB7Ci0gICAgICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICIg ICAgZnJpZW5kIEtKUzo6SlNPYmplY3QqIEtKU19HQ0NfUk9PVF9OU19IQUNLIGNhY2hlR2xvYmFs T2JqZWN0PCR7Y2xhc3NOYW1lfVByb3RvPihLSlM6OkV4ZWNTdGF0ZSosIGNvbnN0IEtKUzo6SWRl bnRpZmllciYgcHJvcGVydHlOYW1lKTtcbiIpOwotICAgIH0KICAgICBwdXNoKEBoZWFkZXJDb250 ZW50LCAicHVibGljOlxuIik7CiAgICAgaWYgKCRkYXRhTm9kZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVz LT57IkRvTm90Q2FjaGUifSkgewogICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiICAgIHN0 YXRpYyBLSlM6OkpTT2JqZWN0KiBzZWxmKCk7XG4iKTsKQEAgLTQ0NSw3ICs0NDIsNiBAQCBzdWIg R2VuZXJhdGVIZWFkZXIKICAgICBpZiAoJG51bUNvbnN0YW50cyBuZSAwKSB7CiAgICAgICAgIHB1 c2goQGhlYWRlckNvbnRlbnQsICIgICAgS0pTOjpKU1ZhbHVlKiBnZXRWYWx1ZVByb3BlcnR5KEtK Uzo6RXhlY1N0YXRlKiwgaW50IHRva2VuKSBjb25zdDtcbiIpOwogICAgIH0KLSAgICBwdXNoKEBo ZWFkZXJDb250ZW50LCAicHJvdGVjdGVkOlxuIik7CiAgICAgaWYgKCRkYXRhTm9kZS0+ZXh0ZW5k ZWRBdHRyaWJ1dGVzLT57IkRvTm90Q2FjaGUifSkgewogICAgICAgICBwdXNoKEBoZWFkZXJDb250 ZW50LCAiICAgICR7Y2xhc3NOYW1lfVByb3RvKCkgeyB9XG4iKTsKICAgICB9IGVsc2UgewpAQCAt NjI2LDcgKzYyMiw3IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAgIH0gZWxzZSB7CiAg ICAgICBwdXNoKEBpbXBsQ29udGVudCwgIkpTT2JqZWN0KiAke2NsYXNzTmFtZX1Qcm90bzo6c2Vs ZihFeGVjU3RhdGUqIGV4ZWMpXG4iKTsKICAgICAgIHB1c2goQGltcGxDb250ZW50LCAie1xuIik7 Ci0gICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICByZXR1cm4gOjpjYWNoZUdsb2JhbE9iamVj dDwke2NsYXNzTmFtZX1Qcm90bz4oZXhlYywgXCJbWyR7Y2xhc3NOYW1lfS5wcm90b3R5cGVdXVwi KTtcbiIpOworICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgcmV0dXJuIEtKUzo6Y2FjaGVH bG9iYWxPYmplY3Q8JHtjbGFzc05hbWV9UHJvdG8+KGV4ZWMsIFwiW1ske2NsYXNzTmFtZX0ucHJv dG90eXBlXV1cIik7XG4iKTsKICAgICAgIHB1c2goQGltcGxDb250ZW50LCAifVxuXG4iKTsKICAg fQogICBpZiAoJG51bUNvbnN0YW50cyA+IDAgfHwgJG51bUZ1bmN0aW9ucyA+IDApIHsKQEAgLTg0 Niw3ICs4NDIsNyBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogCiAgIGlmICgkZGF0YU5v ZGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJHZW5lcmF0ZUNvbnN0cnVjdG9yIn0pIHsKICAgICBw dXNoKEBpbXBsQ29udGVudCwgIkpTVmFsdWUqICR7Y2xhc3NOYW1lfTo6Z2V0Q29uc3RydWN0b3Io RXhlY1N0YXRlKiBleGVjKVxue1xuIik7Ci0gICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgcmV0 dXJuIGNhY2hlR2xvYmFsT2JqZWN0PCR7Y2xhc3NOYW1lfUNvbnN0cnVjdG9yPihleGVjLCBcIltb JHtpbnRlcmZhY2VOYW1lfS5jb25zdHJ1Y3Rvcl1dXCIpO1xuIik7CisgICAgcHVzaChAaW1wbENv bnRlbnQsICIgICAgcmV0dXJuIEtKUzo6Y2FjaGVHbG9iYWxPYmplY3Q8JHtjbGFzc05hbWV9Q29u c3RydWN0b3I+KGV4ZWMsIFwiW1ske2ludGVyZmFjZU5hbWV9LmNvbnN0cnVjdG9yXV1cIik7XG4i KTsKICAgICBwdXNoKEBpbXBsQ29udGVudCwgIn1cbiIpOwogICB9ICAgIAogICAKSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5nL3BuZ2djY3JkLmMKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9wbmcvcG5nZ2NjcmQuYwkocmV2aXNp b24gMTY3MDApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9wbmdnY2Ny ZC5jCSh3b3JraW5nIGNvcHkpCkBAIC0yODk4LDcgKzI4OTgsNyBAQCBwbmdfcmVhZF9maWx0ZXJf cm93X21teF9hdmcocG5nX3Jvd19pbmZvCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBMQkNhcnJ5cwogICAgICAgICAgICAgInBhbmQgJSVtbTIsICUl bW0xICAgICAgICAgICAgXG5cdCIgLy8gZ2V0IExCQ2FycnlzIGZvciBlYWNoIGJ5dGUKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHdoZXJlIGJvdGgK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBsc2IncyB3ZXJlID09IDEgKG9ubHkg dmFsaWQgZm9yIGFjdGl2ZSBncm91cCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAv KiBsc2IncyB3ZXJlID09IDEgKG9ubHkgdmFsaWQgZm9yIGFjdGl2ZSBncm91cCkgKi8KICAgICAg ICAgICAgICJwc3JscSAkMSwgJSVtbTIgICAgICAgICAgICAgIFxuXHQiIC8vIGRpdmlkZSByYXcg Ynl0ZXMgYnkgMgogICAgICAgICAgICAgInBhbmQgICUlbW00LCAlJW1tMiAgICAgICAgICAgXG5c dCIgLy8gY2xlYXIgaW52YWxpZCBiaXQgNyBvZiBlYWNoCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBieXRlCkBAIC0yOTE4LDcgKzI5MTgsNyBAQCBw bmdfcmVhZF9maWx0ZXJfcm93X21teF9hdmcocG5nX3Jvd19pbmZvCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBMQkNhcnJ5cwogICAgICAgICAgICAg InBhbmQgJSVtbTIsICUlbW0xICAgICAgICAgICAgXG5cdCIgLy8gZ2V0IExCQ2FycnlzIGZvciBl YWNoIGJ5dGUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IC8vIHdoZXJlIGJvdGgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBsc2IncyB3 ZXJlID09IDEgKG9ubHkgdmFsaWQgZm9yIGFjdGl2ZSBncm91cCkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAvKiBsc2IncyB3ZXJlID09IDEgKG9ubHkgdmFsaWQgZm9yIGFjdGl2ZSBn cm91cCkgKi8KICAgICAgICAgICAgICJwc3JscSAkMSwgJSVtbTIgICAgICAgICAgICAgIFxuXHQi IC8vIGRpdmlkZSByYXcgYnl0ZXMgYnkgMgogICAgICAgICAgICAgInBhbmQgICUlbW00LCAlJW1t MiAgICAgICAgICAgXG5cdCIgLy8gY2xlYXIgaW52YWxpZCBiaXQgNyBvZiBlYWNoCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBieXRlCkBAIC0yOTQy LDcgKzI5NDIsNyBAQCBwbmdfcmVhZF9maWx0ZXJfcm93X21teF9hdmcocG5nX3Jvd19pbmZvCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBMQkNhcnJ5 cwogICAgICAgICAgICAgInBhbmQgJSVtbTIsICUlbW0xICAgICAgICAgICAgXG5cdCIgLy8gZ2V0 IExCQ2FycnlzIGZvciBlYWNoIGJ5dGUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIHdoZXJlIGJvdGgKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8vIGxzYidzIHdlcmUgPT0gMSAob25seSB2YWxpZCBmb3IgYWN0aXZlIGdyb3VwKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogbHNiJ3Mgd2VyZSA9PSAxIChvbmx5IHZhbGlk IGZvciBhY3RpdmUgZ3JvdXApICovCiAgICAgICAgICAgICAicHNybHEgJDEsICUlbW0yICAgICAg ICAgICAgICBcblx0IiAvLyBkaXZpZGUgcmF3IGJ5dGVzIGJ5IDIKICAgICAgICAgICAgICJwYW5k ICAlJW1tNCwgJSVtbTIgICAgICAgICAgIFxuXHQiIC8vIGNsZWFyIGludmFsaWQgYml0IDcgb2Yg ZWFjaAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8g Ynl0ZQpAQCAtMjk3OCw4ICsyOTc4LDggQEAgcG5nX3JlYWRfZmlsdGVyX3Jvd19tbXhfYXZnKHBu Z19yb3dfaW5mbwogCiAgICAgICBjYXNlIDY6CiAgICAgICBjYXNlIDQ6Ci0gICAgICAvL2Nhc2Ug NzogICAvLyB3aG8gd3JvdGUgdGhpcz8gIFBORyBkb2Vzbid0IHN1cHBvcnQgNSBvciA3IGJ5dGVz L3BpeGVsCi0gICAgICAvL2Nhc2UgNTogICAvLyBHUlIgQk9HVVMKKyAgICAgIC8qY2FzZSA3OiAg ICB3aG8gd3JvdGUgdGhpcz8gIFBORyBkb2Vzbid0IHN1cHBvcnQgNSBvciA3IGJ5dGVzL3BpeGVs CisgICAgICAgIGNhc2UgNTogICAgR1JSIEJPR1VTICovCiAgICAgICB7CiAgICAgICAgICBfQWN0 aXZlTWFzay51c2UgID0gMHhmZmZmZmZmZmZmZmZmZmZmTEw7IC8vIHVzZSBzaGlmdCBiZWxvdyB0 byBjbGVhcgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAvLyBhcHByb3ByaWF0ZSBpbmFjdGl2ZSBieXRlcwpAQCAtMzAyMyw3ICszMDIzLDcgQEAgcG5n X3JlYWRfZmlsdGVyX3Jvd19tbXhfYXZnKHBuZ19yb3dfaW5mbwogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBMQkNhcnJ5cwogICAgICAgICAgICAgInBh bmQgJSVtbTIsICUlbW0xICAgICAgICAgICBcblx0IiAvLyBnZXQgTEJDYXJyeXMgZm9yIGVhY2gg Ynl0ZQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyB3 aGVyZSBib3RoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBsc2IncyB3ZXJlID09 IDEgKG9ubHkgdmFsaWQgZm9yIGFjdGl2ZSBncm91cCkKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC8qIGxzYidzIHdlcmUgPT0gMSAob25seSB2YWxpZCBmb3IgYWN0aXZlIGdyb3VwKSAq LwogICAgICAgICAgICAgInBzcmxxICQxLCAlJW1tMiAgICAgICAgICAgICBcblx0IiAvLyBkaXZp ZGUgcmF3IGJ5dGVzIGJ5IDIKICAgICAgICAgICAgICJwYW5kICAlJW1tNCwgJSVtbTIgICAgICAg ICAgXG5cdCIgLy8gY2xlYXIgaW52YWxpZCBiaXQgNyBvZiBlYWNoCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGJ5dGUKQEAgLTMwNDIsNyArMzA0Miw3 IEBAIHBuZ19yZWFkX2ZpbHRlcl9yb3dfbW14X2F2Zyhwbmdfcm93X2luZm8KICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gTEJDYXJyeXMKICAgICAgICAg ICAgICJwYW5kICUlbW0yLCAlJW1tMSAgICAgICAgICAgXG5cdCIgLy8gZ2V0IExCQ2FycnlzIGZv ciBlYWNoIGJ5dGUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgLy8gd2hlcmUgYm90aAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gbHNiJ3Mg d2VyZSA9PSAxIChvbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAvKiBsc2IncyB3ZXJlID09IDEgKG9ubHkgdmFsaWQgZm9yIGFjdGl2ZSBn cm91cCkgKi8KICAgICAgICAgICAgICJwc3JscSAkMSwgJSVtbTIgICAgICAgICAgICAgXG5cdCIg Ly8gZGl2aWRlIHJhdyBieXRlcyBieSAyCiAgICAgICAgICAgICAicGFuZCAgJSVtbTQsICUlbW0y ICAgICAgICAgIFxuXHQiIC8vIGNsZWFyIGludmFsaWQgYml0IDcgb2YgZWFjaAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBieXRlCkBAIC0zMTE0LDcg KzMxMTQsNyBAQCBwbmdfcmVhZF9maWx0ZXJfcm93X21teF9hdmcocG5nX3Jvd19pbmZvCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIExCQ2FycnlzCiAg ICAgICAgICAgICAicGFuZCAlJW1tMiwgJSVtbTEgICAgICAgICAgIFxuXHQiIC8vIGdldCBMQkNh cnJ5cyBmb3IgZWFjaCBieXRlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIC8vIHdoZXJlIGJvdGgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgLy8gbHNiJ3Mgd2VyZSA9PSAxIChvbmx5IHZhbGlkCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIGxzYidzIHdlcmUgPT0gMSAo b25seSB2YWxpZCAqLwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAvLyBmb3IgYWN0aXZlIGdyb3VwKQogICAgICAgICAgICAgInBzcmxxICQxLCAlJW1tMiAg ICAgICAgICAgICBcblx0IiAvLyBkaXZpZGUgcmF3IGJ5dGVzIGJ5IDIKICAgICAgICAgICAgICJw YW5kICAlJW1tNCwgJSVtbTIgICAgICAgICAgXG5cdCIgLy8gY2xlYXIgaW52YWxpZCBiaXQgNyBv ZiBlYWNoCkBAIC0zMTM1LDcgKzMxMzUsNyBAQCBwbmdfcmVhZF9maWx0ZXJfcm93X21teF9hdmco cG5nX3Jvd19pbmZvCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8vIExCQ2FycnlzCiAgICAgICAgICAgICAicGFuZCAlJW1tMiwgJSVtbTEgICAgICAgICAg IFxuXHQiIC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFjaCBieXRlCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHdoZXJlIGJvdGgKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gbHNiJ3Mgd2VyZSA9PSAxIChvbmx5 IHZhbGlkCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8q IGxzYidzIHdlcmUgPT0gMSAob25seSB2YWxpZCAqLwogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAvLyBmb3IgYWN0aXZlIGdyb3VwKQogICAgICAgICAgICAg InBzcmxxICQxLCAlJW1tMiAgICAgICAgICAgICBcblx0IiAvLyBkaXZpZGUgcmF3IGJ5dGVzIGJ5 IDIKICAgICAgICAgICAgICJwYW5kICAlJW1tNCwgJSVtbTIgICAgICAgICAgXG5cdCIgLy8gY2xl YXIgaW52YWxpZCBiaXQgNyBvZiBlYWNoCkBAIC0zMTU1LDcgKzMxNTUsNyBAQCBwbmdfcmVhZF9m aWx0ZXJfcm93X21teF9hdmcocG5nX3Jvd19pbmZvCiAgICAgICAgICAgICAibW92cSAlJW1tMywg JSVtbTEgICAgICAgICAgIFxuXHQiIC8vIG5vdyB1c2UgbW0xIGZvciBnZXR0aW5nCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIExCQ2FycnlzCiAgICAg ICAgICAgICAicGFuZCAlJW1tMiwgJSVtbTEgICAgICAgICAgIFxuXHQiIC8vIGdldCBMQkNhcnJ5 cyBmb3IgZWFjaCBieXRlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIHdoZXJlIGJvdGggbHNiJ3Mgd2VyZSA9PSAxCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIHdoZXJlIGJvdGggbHNiJ3Mgd2VyZSA9PSAx ICovCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIChv bmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApCiAgICAgICAgICAgICAicHNybHEgJDEsICUlbW0y ICAgICAgICAgICAgIFxuXHQiIC8vIGRpdmlkZSByYXcgYnl0ZXMgYnkgMgogICAgICAgICAgICAg InBhbmQgICUlbW00LCAlJW1tMiAgICAgICAgICBcblx0IiAvLyBjbGVhciBpbnZhbGlkIGJpdCA3 IG9mIGVhY2gKQEAgLTMxNzcsNyArMzE3Nyw3IEBAIHBuZ19yZWFkX2ZpbHRlcl9yb3dfbW14X2F2 Zyhwbmdfcm93X2luZm8KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgLy8gTEJDYXJyeXMKICAgICAgICAgICAgICJwYW5kICUlbW0yLCAlJW1tMSAgICAgICAg ICAgXG5cdCIgLy8gZ2V0IExCQ2FycnlzIGZvciBlYWNoIGJ5dGUKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gd2hlcmUgYm90aAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBsc2IncyB3ZXJlID09IDEgKG9u bHkgdmFsaWQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg LyogbHNiJ3Mgd2VyZSA9PSAxIChvbmx5IHZhbGlkICovCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGZvciBhY3RpdmUgZ3JvdXApCiAgICAgICAgICAg ICAicHNybHEgJDEsICUlbW0yICAgICAgICAgICAgIFxuXHQiIC8vIGRpdmlkZSByYXcgYnl0ZXMg YnkgMgogICAgICAgICAgICAgInBhbmQgICUlbW00LCAlJW1tMiAgICAgICAgICBcblx0IiAvLyBj bGVhciBpbnZhbGlkIGJpdCA3IG9mIGVhY2gKQEAgLTMyODgsNyArMzI4OCw3IEBAIHBuZ19yZWFk X2ZpbHRlcl9yb3dfbW14X2F2Zyhwbmdfcm93X2luZm8KICAgICAgICAgICAgICJwYW5kICUlbW0x LCAlJW1tMyAgICAgICAgICAgXG5cdCIgLy8gZ2V0IGxzYiBmb3IgZWFjaCBwcmV2X3JvdyBieXRl CiAgICAgICAgICAgICAicHNybHEgJDEsICUlbW0xICAgICAgICAgICAgIFxuXHQiIC8vIGRpdmlk ZSBwcmV2X3JvdyBieXRlcyBieSAyCiAgICAgICAgICAgICAicGFuZCAlJW1tMiwgJSVtbTMgICAg ICAgICAgIFxuXHQiIC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFjaCBieXRlCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vICB3aGVyZSBib3RoIGxzYidzIHdl cmUgPT0gMQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAv KiAgd2hlcmUgYm90aCBsc2IncyB3ZXJlID09IDEgKi8KICAgICAgICAgICAgICJwc3JscSAkMSwg JSVtbTIgICAgICAgICAgICAgXG5cdCIgLy8gZGl2aWRlIHJhdyBieXRlcyBieSAyCiAgICAgICAg ICAgICAicGFuZCAgJSVtbTQsICUlbW0xICAgICAgICAgIFxuXHQiIC8vIGNsZWFyIGludmFsaWQg Yml0IDcsIGVhY2ggYnl0ZQogICAgICAgICAgICAgInBhZGRiICUlbW0zLCAlJW1tMCAgICAgICAg ICBcblx0IiAvLyBhZGQgTEJDYXJyeXMgdG8gQXZnLCBlYWNoIGJ5dGUKQEAgLTMzNDMsNyArMzM0 Myw3IEBAIHBuZ19yZWFkX2ZpbHRlcl9yb3dfbW14X2F2Zyhwbmdfcm93X2luZm8KICAgICAgICAg ICAgICJtb3ZxICglJWVkeCwlJWVieCwpLCAlJW1tMiAgXG5cdCIKICAgICAgICAgICAgICJwc3Js cSAkMSwgJSVtbTEgICAgICAgICAgICAgXG5cdCIgLy8gZGl2aWRlIHByZXZfcm93IGJ5dGVzIGJ5 IDIKICAgICAgICAgICAgICJwYW5kICUlbW0yLCAlJW1tMyAgICAgICAgICAgXG5cdCIgLy8gZ2V0 IExCQ2FycnlzIGZvciBlYWNoIGJ5dGUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgLy8gd2hlcmUgYm90aCBsc2IncyB3ZXJlID09IDEKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogd2hlcmUgYm90aCBsc2IncyB3 ZXJlID09IDEgKi8KICAgICAgICAgICAgICJwc3JscSAkMSwgJSVtbTIgICAgICAgICAgICAgXG5c dCIgLy8gZGl2aWRlIHJhdyBieXRlcyBieSAyCiAgICAgICAgICAgICAicGFuZCAgJSVtbTQsICUl bW0xICAgICAgICAgIFxuXHQiIC8vIGNsZWFyIGludmFsaWQgYml0IDcgb2YgZWFjaAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBieXRlCkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9wbmd2Y3JkLmMKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9wbmcvcG5ndmNyZC5jCShyZXZpc2lv biAxNjcwMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5nL3BuZ3ZjcmQu Ywkod29ya2luZyBjb3B5KQpAQCAtODQsOCArODQsOCBAQCBOT1RfU1VQUE9SVEVEOgogICAgIHBv cCBlYngKICAgfQogCi0gIC8vbW14X3N1cHBvcnRlZF9sb2NhbD0wOyAvLyB0ZXN0IGNvZGUgZm9y IGZvcmNlIGRvbid0IHN1cHBvcnQgTU1YCi0gIC8vcHJpbnRmKCJNTVggOiAldSAoMT1NTVggc3Vw cG9ydGVkKVxuIixtbXhfc3VwcG9ydGVkX2xvY2FsKTsKKyAgLyogbW14X3N1cHBvcnRlZF9sb2Nh bD0wOyAvLyB0ZXN0IGNvZGUgZm9yIGZvcmNlIGRvbid0IHN1cHBvcnQgTU1YCisgICAgIHByaW50 ZigiTU1YIDogJXUgKDE9TU1YIHN1cHBvcnRlZClcbiIsbW14X3N1cHBvcnRlZF9sb2NhbCk7ICov CiAKICAgbW14X3N1cHBvcnRlZCA9IG1teF9zdXBwb3J0ZWRfbG9jYWw7CiAgIHJldHVybiBtbXhf c3VwcG9ydGVkX2xvY2FsOwpAQCAtMjAyMCw3ICsyMDIwLDcgQEAgZGF2ZzNscDoKICAgICAgICAg ICAgIC8vIEFkZCAxc3QgYWN0aXZlIGdyb3VwIChSYXcoeC1icHApLzIpIHRvIEF2ZXJhZ2Ugd2l0 aCBMQkNhcnJ5CiAgICAgICAgICAgICBtb3ZxIG1tMSwgbW0zICAgICAgLy8gbm93IHVzZSBtbTEg Zm9yIGdldHRpbmcgTEJDYXJyeXMKICAgICAgICAgICAgIHBhbmQgbW0xLCBtbTIgICAgICAvLyBn ZXQgTEJDYXJyeXMgZm9yIGVhY2ggYnl0ZSB3aGVyZSBib3RoCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgLy8gbHNiJ3Mgd2VyZSA9PSAxIChPbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3Jv dXApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogbHNiJ3Mgd2VyZSA9PSAxIChP bmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApICovCiAgICAgICAgICAgICBwc3JscSBtbTIsIDEg ICAgICAgLy8gZGl2aWRlIHJhdyBieXRlcyBieSAyCiAgICAgICAgICAgICBwYW5kICBtbTIsIG1t NCAgICAgLy8gY2xlYXIgaW52YWxpZCBiaXQgNyBvZiBlYWNoIGJ5dGUKICAgICAgICAgICAgIHBh ZGRiIG1tMiwgbW0xICAgICAvLyBhZGQgTEJDYXJyeXMgdG8gKFJhdyh4LWJwcCkvMikgZm9yIGVh Y2ggYnl0ZQpAQCAtMjAzMyw3ICsyMDMzLDcgQEAgZGF2ZzNscDoKICAgICAgICAgICAgIHBzbGxx IG1tMiwgU2hpZnRCcHAgIC8vIHNoaWZ0IGRhdGEgdG8gcG9zaXRpb24gY29ycmVjdGx5CiAgICAg ICAgICAgICBtb3ZxIG1tMSwgbW0zICAgICAgICAvLyBub3cgdXNlIG1tMSBmb3IgZ2V0dGluZyBM QkNhcnJ5cwogICAgICAgICAgICAgcGFuZCBtbTEsIG1tMiAgICAgIC8vIGdldCBMQkNhcnJ5cyBm b3IgZWFjaCBieXRlIHdoZXJlIGJvdGgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAv LyBsc2IncyB3ZXJlID09IDEgKE9ubHkgdmFsaWQgZm9yIGFjdGl2ZSBncm91cCkKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAvKiBsc2IncyB3ZXJlID09IDEgKE9ubHkgdmFsaWQgZm9y IGFjdGl2ZSBncm91cCkgKi8KICAgICAgICAgICAgIHBzcmxxIG1tMiwgMSAgICAgICAvLyBkaXZp ZGUgcmF3IGJ5dGVzIGJ5IDIKICAgICAgICAgICAgIHBhbmQgIG1tMiwgbW00ICAgICAvLyBjbGVh ciBpbnZhbGlkIGJpdCA3IG9mIGVhY2ggYnl0ZQogICAgICAgICAgICAgcGFkZGIgbW0yLCBtbTEg ICAgIC8vIGFkZCBMQkNhcnJ5cyB0byAoUmF3KHgtYnBwKS8yKSBmb3IgZWFjaCBieXRlCkBAIC0y MDUwLDcgKzIwNTAsNyBAQCBkYXZnM2xwOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Ly8gZ2V0IHRoZSBjb3JyZWN0IHgtYnBwIG9mZnNldC4KICAgICAgICAgICAgIG1vdnEgbW0xLCBt bTMgICAgIC8vIG5vdyB1c2UgbW0xIGZvciBnZXR0aW5nIExCQ2FycnlzCiAgICAgICAgICAgICBw YW5kIG1tMSwgbW0yICAgICAvLyBnZXQgTEJDYXJyeXMgZm9yIGVhY2ggYnl0ZSB3aGVyZSBib3Ro Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBsc2IncyB3ZXJlID09IDEgKE9ubHkg dmFsaWQgZm9yIGFjdGl2ZSBncm91cCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8q IGxzYidzIHdlcmUgPT0gMSAoT25seSB2YWxpZCBmb3IgYWN0aXZlIGdyb3VwKSAqLwogICAgICAg ICAgICAgcHNybHEgbW0yLCAxICAgICAgLy8gZGl2aWRlIHJhdyBieXRlcyBieSAyCiAgICAgICAg ICAgICBwYW5kICBtbTIsIG1tNCAgICAvLyBjbGVhciBpbnZhbGlkIGJpdCA3IG9mIGVhY2ggYnl0 ZQogICAgICAgICAgICAgcGFkZGIgbW0yLCBtbTEgICAgLy8gYWRkIExCQ2FycnlzIHRvIChSYXco eC1icHApLzIpIGZvciBlYWNoIGJ5dGUKQEAgLTIxMDYsNyArMjEwNiw3IEBAIGRhdmc0bHA6CiAg ICAgICAgICAgICAvLyBBZGQgMXN0IGFjdGl2ZSBncm91cCAoUmF3KHgtYnBwKS8yKSB0byBBdmVy YWdlIHdpdGggTEJDYXJyeQogICAgICAgICAgICAgbW92cSBtbTEsIG1tMyAgICAgLy8gbm93IHVz ZSBtbTEgZm9yIGdldHRpbmcgTEJDYXJyeXMKICAgICAgICAgICAgIHBhbmQgbW0xLCBtbTIgICAg IC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFjaCBieXRlIHdoZXJlIGJvdGgKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIGxzYidzIHdlcmUgPT0gMSAoT25seSB2YWxpZCBmb3IgYWN0aXZl IGdyb3VwKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogbHNiJ3Mgd2VyZSA9PSAx IChPbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApICovCiAgICAgICAgICAgICBwc3JscSBtbTIs IDEgICAgICAvLyBkaXZpZGUgcmF3IGJ5dGVzIGJ5IDIKICAgICAgICAgICAgIHBhbmQgIG1tMiwg bW00ICAgIC8vIGNsZWFyIGludmFsaWQgYml0IDcgb2YgZWFjaCBieXRlCiAgICAgICAgICAgICBw YWRkYiBtbTIsIG1tMSAgICAvLyBhZGQgTEJDYXJyeXMgdG8gKFJhdyh4LWJwcCkvMikgZm9yIGVh Y2ggYnl0ZQpAQCAtMjExOSw3ICsyMTE5LDcgQEAgZGF2ZzRscDoKICAgICAgICAgICAgIGFkZCBl YngsIDgKICAgICAgICAgICAgIG1vdnEgbW0xLCBtbTMgICAgIC8vIG5vdyB1c2UgbW0xIGZvciBn ZXR0aW5nIExCQ2FycnlzCiAgICAgICAgICAgICBwYW5kIG1tMSwgbW0yICAgICAvLyBnZXQgTEJD YXJyeXMgZm9yIGVhY2ggYnl0ZSB3aGVyZSBib3RoCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAvLyBsc2IncyB3ZXJlID09IDEgKE9ubHkgdmFsaWQgZm9yIGFjdGl2ZSBncm91cCkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIGxzYidzIHdlcmUgPT0gMSAoT25seSB2YWxp ZCBmb3IgYWN0aXZlIGdyb3VwKSAqLwogICAgICAgICAgICAgcHNybHEgbW0yLCAxICAgICAgLy8g ZGl2aWRlIHJhdyBieXRlcyBieSAyCiAgICAgICAgICAgICBwYW5kICBtbTIsIG1tNCAgICAvLyBj bGVhciBpbnZhbGlkIGJpdCA3IG9mIGVhY2ggYnl0ZQogICAgICAgICAgICAgcGFkZGIgbW0yLCBt bTEgICAgLy8gYWRkIExCQ2FycnlzIHRvIChSYXcoeC1icHApLzIpIGZvciBlYWNoIGJ5dGUKQEAg LTIxNjYsNyArMjE2Niw3IEBAIGRhdmcybHA6CiAgICAgICAgICAgICAvLyBBZGQgMXN0IGFjdGl2 ZSBncm91cCAoUmF3KHgtYnBwKS8yKSB0byBBdmVyYWdlIHdpdGggTEJDYXJyeQogICAgICAgICAg ICAgbW92cSBtbTEsIG1tMyAgICAgLy8gbm93IHVzZSBtbTEgZm9yIGdldHRpbmcgTEJDYXJyeXMK ICAgICAgICAgICAgIHBhbmQgbW0xLCBtbTIgICAgIC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFjaCBi eXRlIHdoZXJlIGJvdGgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGxzYidzIHdl cmUgPT0gMSAoT25seSB2YWxpZCBmb3IgYWN0aXZlIGdyb3VwKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgLyogbHNiJ3Mgd2VyZSA9PSAxIChPbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3Jv dXApICovCiAgICAgICAgICAgICBwc3JscSBtbTIsIDEgICAgICAvLyBkaXZpZGUgcmF3IGJ5dGVz IGJ5IDIKICAgICAgICAgICAgIHBhbmQgIG1tMiwgbW00ICAgIC8vIGNsZWFyIGludmFsaWQgYml0 IDcgb2YgZWFjaCBieXRlCiAgICAgICAgICAgICBwYWRkYiBtbTIsIG1tMSAgICAvLyBhZGQgTEJD YXJyeXMgdG8gKFJhdyh4LWJwcCkvMikgZm9yIGVhY2ggYnl0ZQpAQCAtMjE3OCw3ICsyMTc4LDcg QEAgZGF2ZzJscDoKICAgICAgICAgICAgIHBzbGxxIG1tMiwgU2hpZnRCcHAgLy8gc2hpZnQgZGF0 YSB0byBwb3NpdGlvbiBjb3JyZWN0bHkKICAgICAgICAgICAgIG1vdnEgbW0xLCBtbTMgICAgICAg Ly8gbm93IHVzZSBtbTEgZm9yIGdldHRpbmcgTEJDYXJyeXMKICAgICAgICAgICAgIHBhbmQgbW0x LCBtbTIgICAgICAgLy8gZ2V0IExCQ2FycnlzIGZvciBlYWNoIGJ5dGUgd2hlcmUgYm90aAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBsc2IncyB3ZXJlID09IDEgKE9ubHkgdmFs aWQgZm9yIGFjdGl2ZSBncm91cCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyog bHNiJ3Mgd2VyZSA9PSAxIChPbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApICovCiAgICAgICAg ICAgICBwc3JscSBtbTIsIDEgICAgICAgIC8vIGRpdmlkZSByYXcgYnl0ZXMgYnkgMgogICAgICAg ICAgICAgcGFuZCAgbW0yLCBtbTQgICAgICAvLyBjbGVhciBpbnZhbGlkIGJpdCA3IG9mIGVhY2gg Ynl0ZQogICAgICAgICAgICAgcGFkZGIgbW0yLCBtbTEgICAgICAvLyBhZGQgTEJDYXJyeXMgdG8g KFJhdyh4LWJwcCkvMikgZm9yIGVhY2ggYnl0ZQpAQCAtMjE5Myw3ICsyMTkzLDcgQEAgZGF2ZzJs cDoKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gZ2V0IHRoZSBjb3JyZWN0IHgt YnBwIG9mZnNldC4KICAgICAgICAgICAgIG1vdnEgbW0xLCBtbTMgICAgICAgLy8gbm93IHVzZSBt bTEgZm9yIGdldHRpbmcgTEJDYXJyeXMKICAgICAgICAgICAgIHBhbmQgbW0xLCBtbTIgICAgICAg Ly8gZ2V0IExCQ2FycnlzIGZvciBlYWNoIGJ5dGUgd2hlcmUgYm90aAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBsc2IncyB3ZXJlID09IDEgKE9ubHkgdmFsaWQgZm9yIGFjdGl2 ZSBncm91cCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogbHNiJ3Mgd2VyZSA9 PSAxIChPbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApICovCiAgICAgICAgICAgICBwc3JscSBt bTIsIDEgICAgICAgIC8vIGRpdmlkZSByYXcgYnl0ZXMgYnkgMgogICAgICAgICAgICAgcGFuZCAg bW0yLCBtbTQgICAgICAvLyBjbGVhciBpbnZhbGlkIGJpdCA3IG9mIGVhY2ggYnl0ZQogICAgICAg ICAgICAgcGFkZGIgbW0yLCBtbTEgICAgICAvLyBhZGQgTEJDYXJyeXMgdG8gKFJhdyh4LWJwcCkv MikgZm9yIGVhY2ggYnl0ZQpAQCAtMjIwOSw3ICsyMjA5LDcgQEAgZGF2ZzJscDoKICAgICAgICAg ICAgIGFkZCBlYngsIDgKICAgICAgICAgICAgIG1vdnEgbW0xLCBtbTMgICAgLy8gbm93IHVzZSBt bTEgZm9yIGdldHRpbmcgTEJDYXJyeXMKICAgICAgICAgICAgIHBhbmQgbW0xLCBtbTIgICAgLy8g Z2V0IExCQ2FycnlzIGZvciBlYWNoIGJ5dGUgd2hlcmUgYm90aAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAvLyBsc2IncyB3ZXJlID09IDEgKE9ubHkgdmFsaWQgZm9yIGFjdGl2ZSBncm91 cCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogbHNiJ3Mgd2VyZSA9PSAxIChPbmx5 IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApICovCiAgICAgICAgICAgICBwc3JscSBtbTIsIDEgICAg IC8vIGRpdmlkZSByYXcgYnl0ZXMgYnkgMgogICAgICAgICAgICAgcGFuZCAgbW0yLCBtbTQgICAv LyBjbGVhciBpbnZhbGlkIGJpdCA3IG9mIGVhY2ggYnl0ZQogICAgICAgICAgICAgcGFkZGIgbW0y LCBtbTEgICAvLyBhZGQgTEJDYXJyeXMgdG8gKFJhdyh4LWJwcCkvMikgZm9yIGVhY2ggYnl0ZQpA QCAtMjI3Nyw3ICsyMjc3LDcgQEAgZGF2ZzhscDoKICAgICAgICAgICAgIHBhbmQgbW0zLCBtbTEg ICAgICAgLy8gZ2V0IGxzYiBmb3IgZWFjaCBwcmV2X3JvdyBieXRlCiAgICAgICAgICAgICBwc3Js cSBtbTEsIDEgICAgICAgIC8vIGRpdmlkZSBwcmV2X3JvdyBieXRlcyBieSAyCiAgICAgICAgICAg ICBwYW5kIG1tMywgbW0yICAgICAgIC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFjaCBieXRlIHdoZXJl IGJvdGgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gbHNiJ3Mgd2VyZSA9PSAx CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIGxzYidzIHdlcmUgPT0gMSAqLwog ICAgICAgICAgICAgcHNybHEgbW0yLCAxICAgICAgICAvLyBkaXZpZGUgcmF3IGJ5dGVzIGJ5IDIK ICAgICAgICAgICAgIHBhbmQgIG1tMSwgbW00ICAgICAgLy8gY2xlYXIgaW52YWxpZCBiaXQgNyBv ZiBlYWNoIGJ5dGUKICAgICAgICAgICAgIHBhZGRiIG1tMCwgbW0zICAgICAgLy8gYWRkIExCQ2Fy cnlzIHRvIEF2ZyBmb3IgZWFjaCBieXRlCkBAIC0yMzEwLDcgKzIzMTAsNyBAQCBkYXZnQWxwOgog ICAgICAgICAgICAgbW92cSBtbTIsIFtlZHggKyBlYnhdCiAgICAgICAgICAgICBwc3JscSBtbTEs IDEgICAgICAgIC8vIGRpdmlkZSBwcmV2X3JvdyBieXRlcyBieSAyCiAgICAgICAgICAgICBwYW5k IG1tMywgbW0yICAgICAgIC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFjaCBieXRlIHdoZXJlIGJvdGgK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gbHNiJ3Mgd2VyZSA9PSAxCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIGxzYidzIHdlcmUgPT0gMSAqLwogICAgICAg ICAgICAgcHNybHEgbW0yLCAxICAgICAgICAvLyBkaXZpZGUgcmF3IGJ5dGVzIGJ5IDIKICAgICAg ICAgICAgIHBhbmQgIG1tMSwgbW00ICAgICAgLy8gY2xlYXIgaW52YWxpZCBiaXQgNyBvZiBlYWNo IGJ5dGUKICAgICAgICAgICAgIHBhZGRiIG1tMCwgbW0zICAgICAgLy8gYWRkIExCQ2FycnlzIHRv IEF2ZyBmb3IgZWFjaCBieXRlCg== 10863 2006-10-02 03:12:09 -0700 2006-10-02 03:14:15 -0700 Updated patch build-fixes.diff text/plain 31679 zimmermann SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzAxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDYtMTAtMDEgIE5pa29sYXMg WmltbWVybWFubiA8emltbWVybWFubkBrZGUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBRdC9MaW51eCBidWlsZCB3aXRoIG9sZGVyIGdj YyAzLjMuNC4KKyAKKyAgICAgICAgKiBranMvbG9va3VwLmg6IE1vdmUgY2FjaGVHbG9iYWxPYmpl Y3QgaW50byBLSlMgbmFtZXNwYWNlLgorICAgICAgICAoS0pTOjpjYWNoZUdsb2JhbE9iamVjdCk6 IEFsc28gcmVtb3ZlIEdDQ19ST09UX05TX0hBQ0suCisgICAgICAgICogd3RmL0Fzc2VydGlvbnMu aDogSW5jbHVkZSBpbnR0eXBlcy5oIGZvciB1aW50cHRyX3QuCisKIDIwMDYtMDktMjggIFN0ZXZl IEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBN YWNpZWouCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9ranMvbG9va3VwLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g SmF2YVNjcmlwdENvcmUva2pzL2xvb2t1cC5oCShyZXZpc2lvbiAxNjcwMCkKKysrIEphdmFTY3Jp cHRDb3JlL2tqcy9sb29rdXAuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQCBuYW1l c3BhY2UgS0pTIHsKICAgICAvKioKICAgICAgKiBzIGlzIHRoZSBrZXkgKGUuZy4gYSBwcm9wZXJ0 eSBuYW1lKQogICAgICAqLwotICAgIGNvbnN0IGNoYXIgKnM7CisgICAgY29uc3QgY2hhciogczsK IAogICAgIC8qKgogICAgICAqIHZhbHVlIGlzIHRoZSByZXN1bHQgdmFsdWUgKHVzdWFsbHkgYW4g ZW51bSB2YWx1ZSkKQEAgLTU5LDcgKzU5LDcgQEAgbmFtZXNwYWNlIEtKUyB7CiAgICAgLyoqCiAg ICAgICogbmV4dCBpcyB0aGUgcG9pbnRlciB0byB0aGUgbmV4dCBlbnRyeSBmb3IgdGhlIHNhbWUg aGFzaCB2YWx1ZQogICAgICAqLwotICAgIGNvbnN0IEhhc2hFbnRyeSAqbmV4dDsKKyAgICBjb25z dCBIYXNoRW50cnkqIG5leHQ7CiAgIH07CiAKICAgLyoqCkBAIC04OCw3ICs4OCw3IEBAIG5hbWVz cGFjZSBLSlMgewogICAgICAqIHBvaW50ZXIgdG8gdGhlIGFycmF5IG9mIGVudHJpZXMKICAgICAg KiBNaW5kIHRoYXQgc29tZSBlbnRyaWVzIGluIHRoZSBhcnJheSBhcmUgbnVsbCAoMCwwLDAsMCku CiAgICAgICovCi0gICAgY29uc3QgSGFzaEVudHJ5ICplbnRyaWVzOworICAgIGNvbnN0IEhhc2hF bnRyeSogZW50cmllczsKICAgICAvKioKICAgICAgKiB0aGUgbWF4aW11bSB2YWx1ZSBmb3IgdGhl IGhhc2guIEFsd2F5cyBzbWFsbGVyIHRoYW4gc2l6ZS4KICAgICAgKi8KQEAgLTEwMyw5ICsxMDMs OSBAQCBuYW1lc3BhY2UgS0pTIHsKICAgICAvKioKICAgICAgKiBGaW5kIGFuIGVudHJ5IGluIHRo ZSB0YWJsZSwgYW5kIHJldHVybiBpdHMgdmFsdWUgKGkuZS4gdGhlIHZhbHVlIGZpZWxkIG9mIEhh c2hFbnRyeSkKICAgICAgKi8KLSAgICBzdGF0aWMgaW50IGZpbmQoY29uc3Qgc3RydWN0IEhhc2hU YWJsZSAqdGFibGUsIGNvbnN0IElkZW50aWZpZXIgJnMpOwotICAgIHN0YXRpYyBpbnQgZmluZChj b25zdCBzdHJ1Y3QgSGFzaFRhYmxlICp0YWJsZSwKLSAgICAgICAgICAgICAgICAgICAgY29uc3Qg VUNoYXIgKmMsIHVuc2lnbmVkIGludCBsZW4pOworICAgIHN0YXRpYyBpbnQgZmluZChjb25zdCBz dHJ1Y3QgSGFzaFRhYmxlKiB0YWJsZSwgY29uc3QgSWRlbnRpZmllciYgcyk7CisgICAgc3RhdGlj IGludCBmaW5kKGNvbnN0IHN0cnVjdCBIYXNoVGFibGUqIHRhYmxlLAorICAgICAgICAgICAgICAg ICAgICBjb25zdCBVQ2hhciogYywgdW5zaWduZWQgaW50IGxlbik7CiAKIAogICAgIC8qKgpAQCAt MTEzLDggKzExMyw4IEBAIG5hbWVzcGFjZSBLSlMgewogICAgICAqIFRoaXMgdmFyaWFudCBnaXZl cyBhY2Nlc3MgdG8gdGhlIG90aGVyIGF0dHJpYnV0ZXMgb2YgdGhlIGVudHJ5LAogICAgICAqIGVz cGVjaWFsbHkgdGhlIGF0dHIgZmllbGQuCiAgICAgICovCi0gICAgc3RhdGljIGNvbnN0IEhhc2hF bnRyeSogZmluZEVudHJ5KGNvbnN0IHN0cnVjdCBIYXNoVGFibGUgKnRhYmxlLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBJZGVudGlmaWVyICZzKTsKKyAgICBz dGF0aWMgY29uc3QgSGFzaEVudHJ5KiBmaW5kRW50cnkoY29uc3Qgc3RydWN0IEhhc2hUYWJsZSog dGFibGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IElkZW50 aWZpZXImIHMpOwogCiAgIH07CiAKQEAgLTEyNSwxNiArMTI1LDE2IEBAIG5hbWVzcGFjZSBLSlMg ewogICAgKiBIZWxwZXIgZm9yIGdldFN0YXRpY0Z1bmN0aW9uU2xvdCBhbmQgZ2V0U3RhdGljUHJv cGVydHlTbG90CiAgICAqLwogICB0ZW1wbGF0ZSA8Y2xhc3MgRnVuY0ltcD4KLSAgaW5saW5lIEpT VmFsdWUgKnN0YXRpY0Z1bmN0aW9uR2V0dGVyKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqLCBj b25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIGNvbnN0IFByb3BlcnR5U2xvdCYgc2xvdCkK KyAgaW5saW5lIEpTVmFsdWUqIHN0YXRpY0Z1bmN0aW9uR2V0dGVyKEV4ZWNTdGF0ZSogZXhlYywg SlNPYmplY3QqLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIGNvbnN0IFByb3BlcnR5 U2xvdCYgc2xvdCkKICAgewogICAgICAgLy8gTG9vayBmb3IgY2FjaGVkIHZhbHVlIGluIGR5bmFt aWMgbWFwIG9mIHByb3BlcnRpZXMgKGluIEpTT2JqZWN0KQotICAgICAgSlNPYmplY3QgKnRoaXNP YmogPSBzbG90LnNsb3RCYXNlKCk7Ci0gICAgICBKU1ZhbHVlICpjYWNoZWRWYWwgPSB0aGlzT2Jq LT5nZXREaXJlY3QocHJvcGVydHlOYW1lKTsKKyAgICAgIEpTT2JqZWN0KiB0aGlzT2JqID0gc2xv dC5zbG90QmFzZSgpOworICAgICAgSlNWYWx1ZSogY2FjaGVkVmFsID0gdGhpc09iai0+Z2V0RGly ZWN0KHByb3BlcnR5TmFtZSk7CiAgICAgICBpZiAoY2FjaGVkVmFsKQogICAgICAgICByZXR1cm4g Y2FjaGVkVmFsOwogCi0gICAgICBjb25zdCBIYXNoRW50cnkgKmVudHJ5ID0gc2xvdC5zdGF0aWNF bnRyeSgpOwotICAgICAgSlNWYWx1ZSAqdmFsID0gbmV3IEZ1bmNJbXAoZXhlYywgZW50cnktPnZh bHVlLCBlbnRyeS0+cGFyYW1zLCBwcm9wZXJ0eU5hbWUpOworICAgICAgY29uc3QgSGFzaEVudHJ5 KiBlbnRyeSA9IHNsb3Quc3RhdGljRW50cnkoKTsKKyAgICAgIEpTVmFsdWUqIHZhbCA9IG5ldyBG dW5jSW1wKGV4ZWMsIGVudHJ5LT52YWx1ZSwgZW50cnktPnBhcmFtcywgcHJvcGVydHlOYW1lKTsK ICAgICAgIHRoaXNPYmotPnB1dERpcmVjdChwcm9wZXJ0eU5hbWUsIHZhbCwgZW50cnktPmF0dHIp OwogICAgICAgcmV0dXJuIHZhbDsKICAgfQpAQCAtMTQ0LDcgKzE0NCw3IEBAIG5hbWVzcGFjZSBL SlMgewogICAgKiBIZWxwZXIgZm9yIGdldFN0YXRpY1ZhbHVlU2xvdCBhbmQgZ2V0U3RhdGljUHJv cGVydHlTbG90CiAgICAqLwogICB0ZW1wbGF0ZSA8Y2xhc3MgVGhpc0ltcD4KLSAgaW5saW5lIEpT VmFsdWUgKnN0YXRpY1ZhbHVlR2V0dGVyKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqLCBjb25z dCBJZGVudGlmaWVyJiwgY29uc3QgUHJvcGVydHlTbG90JiBzbG90KQorICBpbmxpbmUgSlNWYWx1 ZSogc3RhdGljVmFsdWVHZXR0ZXIoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCosIGNvbnN0IElk ZW50aWZpZXImLCBjb25zdCBQcm9wZXJ0eVNsb3QmIHNsb3QpCiAgIHsKICAgICAgIFRoaXNJbXAq IHRoaXNPYmogPSBzdGF0aWNfY2FzdDxUaGlzSW1wKj4oc2xvdC5zbG90QmFzZSgpKTsKICAgICAg IGNvbnN0IEhhc2hFbnRyeSogZW50cnkgPSBzbG90LnN0YXRpY0VudHJ5KCk7CkBAIC0xNzIsNyAr MTcyLDcgQEAgbmFtZXNwYWNlIEtKUyB7CiAgICAqIEBwYXJhbSB0aGlzT2JqICJ0aGlzIgogICAg Ki8KICAgdGVtcGxhdGUgPGNsYXNzIEZ1bmNJbXAsIGNsYXNzIFRoaXNJbXAsIGNsYXNzIFBhcmVu dEltcD4KLSAgaW5saW5lIGJvb2wgZ2V0U3RhdGljUHJvcGVydHlTbG90KEV4ZWNTdGF0ZSAqZXhl YywgY29uc3QgSGFzaFRhYmxlKiB0YWJsZSwgCisgIGlubGluZSBib29sIGdldFN0YXRpY1Byb3Bl cnR5U2xvdChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEhhc2hUYWJsZSogdGFibGUsIAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVGhpc0ltcCogdGhpc09iaiwgY29uc3QgSWRl bnRpZmllciYgcHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3QmIHNsb3QpCiAgIHsKICAgICBjb25z dCBIYXNoRW50cnkqIGVudHJ5ID0gTG9va3VwOjpmaW5kRW50cnkodGFibGUsIHByb3BlcnR5TmFt ZSk7CkBAIC0xOTQsMTMgKzE5NCwxMyBAQCBuYW1lc3BhY2UgS0pTIHsKICAgICogYSBkdW1teSBn ZXRWYWx1ZVByb3BlcnR5LgogICAgKi8KICAgdGVtcGxhdGUgPGNsYXNzIEZ1bmNJbXAsIGNsYXNz IFBhcmVudEltcD4KLSAgaW5saW5lIGJvb2wgZ2V0U3RhdGljRnVuY3Rpb25TbG90KEV4ZWNTdGF0 ZSAqZXhlYywgY29uc3QgSGFzaFRhYmxlICp0YWJsZSwgCisgIGlubGluZSBib29sIGdldFN0YXRp Y0Z1bmN0aW9uU2xvdChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEhhc2hUYWJsZSogdGFibGUsIAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSlNPYmplY3QqIHRoaXNPYmosIGNv bnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90JiBzbG90KQogICB7CiAg ICAgY29uc3QgSGFzaEVudHJ5KiBlbnRyeSA9IExvb2t1cDo6ZmluZEVudHJ5KHRhYmxlLCBwcm9w ZXJ0eU5hbWUpOwogCiAgICAgaWYgKCFlbnRyeSkgLy8gbm90IGZvdW5kLCBmb3J3YXJkIHRvIHBh cmVudAotICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFBhcmVudEltcCAqPih0aGlzT2JqKS0+UGFy ZW50SW1wOjpnZXRPd25Qcm9wZXJ0eVNsb3QoZXhlYywgcHJvcGVydHlOYW1lLCBzbG90KTsKKyAg ICAgIHJldHVybiBzdGF0aWNfY2FzdDxQYXJlbnRJbXAqPih0aGlzT2JqKS0+UGFyZW50SW1wOjpn ZXRPd25Qcm9wZXJ0eVNsb3QoZXhlYywgcHJvcGVydHlOYW1lLCBzbG90KTsKIAogICAgIGFzc2Vy dChlbnRyeS0+YXR0ciAmIEZ1bmN0aW9uKTsKIApAQCAtMjEzLDggKzIxMyw4IEBAIG5hbWVzcGFj ZSBLSlMgewogICAgKiBVc2luZyB0aGlzIGluc3RlYWQgb2YgZ2V0U3RhdGljUHJvcGVydHlTbG90 IHJlbW92ZXMgdGhlIG5lZWQgZm9yIGEgRnVuY0ltcCBjbGFzcy4KICAgICovCiAgIHRlbXBsYXRl IDxjbGFzcyBUaGlzSW1wLCBjbGFzcyBQYXJlbnRJbXA+Ci0gIGlubGluZSBib29sIGdldFN0YXRp Y1ZhbHVlU2xvdChFeGVjU3RhdGUgKmV4ZWMsIGNvbnN0IEhhc2hUYWJsZSogdGFibGUsIAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVGhpc0ltcCogdGhpc09iaiwgY29uc3QgSWRl bnRpZmllciAmcHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3QmIHNsb3QpCisgIGlubGluZSBib29s IGdldFN0YXRpY1ZhbHVlU2xvdChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEhhc2hUYWJsZSogdGFi bGUsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVGhpc0ltcCogdGhpc09iaiwg Y29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3QmIHNsb3QpCiAgIHsK ICAgICBjb25zdCBIYXNoRW50cnkqIGVudHJ5ID0gTG9va3VwOjpmaW5kRW50cnkodGFibGUsIHBy b3BlcnR5TmFtZSk7CiAKQEAgLTIzMyw3ICsyMzMsNyBAQCBuYW1lc3BhY2UgS0pTIHsKICAgICog aXMgZm91bmQgaXQgc2V0cyB0aGUgdmFsdWUgYW5kIHJldHVybnMgdHJ1ZSwgZWxzZSBpdCByZXR1 cm5zIGZhbHNlLgogICAgKi8KICAgdGVtcGxhdGUgPGNsYXNzIFRoaXNJbXA+Ci0gIGlubGluZSBi b29sIGxvb2t1cFB1dChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IElkZW50aWZpZXIgJnByb3BlcnR5 TmFtZSwKKyAgaW5saW5lIGJvb2wgbG9va3VwUHV0KEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSWRl bnRpZmllciYgcHJvcGVydHlOYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgSlNWYWx1ZSog dmFsdWUsIGludCBhdHRyLAogICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgSGFzaFRhYmxl KiB0YWJsZSwgVGhpc0ltcCogdGhpc09iaikKICAgewpAQCAtMjYzLDcgKzI2Myw3IEBAIG5hbWVz cGFjZSBLSlMgewogICAgKiB0aGVuIGl0IGNhbGxzIHB1dCgpIG9uIHRoZSBQYXJlbnRJbXAgY2xh c3MuCiAgICAqLwogICB0ZW1wbGF0ZSA8Y2xhc3MgVGhpc0ltcCwgY2xhc3MgUGFyZW50SW1wPgot ICBpbmxpbmUgdm9pZCBsb29rdXBQdXQoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBJZGVudGlmaWVy ICZwcm9wZXJ0eU5hbWUsCisgIGlubGluZSB2b2lkIGxvb2t1cFB1dChFeGVjU3RhdGUqIGV4ZWMs IGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAg IEpTVmFsdWUqIHZhbHVlLCBpbnQgYXR0ciwKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0 IEhhc2hUYWJsZSogdGFibGUsIFRoaXNJbXAqIHRoaXNPYmopCiAgIHsKQEAgLTI3MSwzNCArMjcx LDI4IEBAIG5hbWVzcGFjZSBLSlMgewogICAgICAgdGhpc09iai0+UGFyZW50SW1wOjpwdXQoZXhl YywgcHJvcGVydHlOYW1lLCB2YWx1ZSwgYXR0cik7IC8vIG5vdCBmb3VuZDogZm9yd2FyZCB0byBw YXJlbnQKICAgfQogCi19IC8vIG5hbWVzcGFjZQotCi0vKgotICogVGhlIHRlbXBsYXRlIG1ldGhv ZCBiZWxvdyBjYW4ndCBiZSBpbiB0aGUgS0pTIG5hbWVzcGFjZSBiZWNhdXNlIGl0J3MgdXNlZCBp biAKLSAqIEtKU19ERUZJTkVfUFJPUEVSVFkgd2hpY2ggY2FuIGJlIHVzZWQgb3V0c2lkZSBvZiB0 aGUgS0pTIG5hbWVzcGFjZS4gSXQgY2FuIGJlIG1vdmVkIGJhY2sKLSAqIHdoZW4gYSBnY2Mgd2l0 aCBodHRwOi8vZ2NjLmdudS5vcmcvYnVnemlsbGEvc2hvd19idWcuY2dpP2lkPTgzNTUgaXMgbWFp bnN0cmVhbSBlbm91Z2guCi0gKi8KLSAKLS8qKgotICogVGhpcyB0ZW1wbGF0ZSBtZXRob2QgcmV0 cmlldmVzIG9yIGNyZWF0ZSBhbiBvYmplY3QgdGhhdCBpcyB1bmlxdWUKLSAqIChmb3IgYSBnaXZl biBpbnRlcnByZXRlcikgVGhlIGZpcnN0IHRpbWUgdGhpcyBpcyBjYWxsZWQgKGZvciBhIGdpdmVu Ci0gKiBwcm9wZXJ0eSBuYW1lKSwgdGhlIE9iamVjdCB3aWxsIGJlIGNvbnN0cnVjdGVkLCBhbmQg c2V0IGFzIGEgcHJvcGVydHkKLSAqIG9mIHRoZSBpbnRlcnByZXRlcidzIGdsb2JhbCBvYmplY3Qu IExhdGVyIGNhbGxzIHdpbGwgc2ltcGx5IHJldHJpZXZlCi0gKiB0aGF0IGNhY2hlZCBvYmplY3Qu IE5vdGUgdGhhdCB0aGUgb2JqZWN0IGNvbnN0cnVjdG9yIG11c3QgdGFrZSAxIGFyZ3VtZW50LCBl eGVjLgotICovCi10ZW1wbGF0ZSA8Y2xhc3MgQ2xhc3NDdG9yPgotaW5saW5lIEtKUzo6SlNPYmpl Y3QgKmNhY2hlR2xvYmFsT2JqZWN0KEtKUzo6RXhlY1N0YXRlICpleGVjLCBjb25zdCBLSlM6Oklk ZW50aWZpZXIgJnByb3BlcnR5TmFtZSkKLXsKLSAgS0pTOjpKU09iamVjdCAqZ2xvYmFsT2JqZWN0 ID0gc3RhdGljX2Nhc3Q8S0pTOjpKU09iamVjdCAqPihleGVjLT5sZXhpY2FsSW50ZXJwcmV0ZXIo KS0+Z2xvYmFsT2JqZWN0KCkpOwotICBLSlM6OkpTVmFsdWUgKm9iaiA9IGdsb2JhbE9iamVjdC0+ Z2V0RGlyZWN0KHByb3BlcnR5TmFtZSk7Ci0gIGlmIChvYmopIHsKLSAgICBhc3NlcnQob2JqLT5p c09iamVjdCgpKTsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8S0pTOjpKU09iamVjdCAqPihvYmop OworICAvKioKKyAgICogVGhpcyB0ZW1wbGF0ZSBtZXRob2QgcmV0cmlldmVzIG9yIGNyZWF0ZSBh biBvYmplY3QgdGhhdCBpcyB1bmlxdWUKKyAgICogKGZvciBhIGdpdmVuIGludGVycHJldGVyKSBU aGUgZmlyc3QgdGltZSB0aGlzIGlzIGNhbGxlZCAoZm9yIGEgZ2l2ZW4KKyAgICogcHJvcGVydHkg bmFtZSksIHRoZSBPYmplY3Qgd2lsbCBiZSBjb25zdHJ1Y3RlZCwgYW5kIHNldCBhcyBhIHByb3Bl cnR5CisgICAqIG9mIHRoZSBpbnRlcnByZXRlcidzIGdsb2JhbCBvYmplY3QuIExhdGVyIGNhbGxz IHdpbGwgc2ltcGx5IHJldHJpZXZlCisgICAqIHRoYXQgY2FjaGVkIG9iamVjdC4gTm90ZSB0aGF0 IHRoZSBvYmplY3QgY29uc3RydWN0b3IgbXVzdCB0YWtlIDEgYXJndW1lbnQsIGV4ZWMuCisgICAq LworICB0ZW1wbGF0ZSA8Y2xhc3MgQ2xhc3NDdG9yPgorICBpbmxpbmUgSlNPYmplY3QqIGNhY2hl R2xvYmFsT2JqZWN0KEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlO YW1lKQorICB7CisgICAgSlNPYmplY3QqIGdsb2JhbE9iamVjdCA9IHN0YXRpY19jYXN0PEpTT2Jq ZWN0Kj4oZXhlYy0+bGV4aWNhbEludGVycHJldGVyKCktPmdsb2JhbE9iamVjdCgpKTsKKyAgICBK U1ZhbHVlKiBvYmogPSBnbG9iYWxPYmplY3QtPmdldERpcmVjdChwcm9wZXJ0eU5hbWUpOworICAg IGlmIChvYmopIHsKKyAgICAgIGFzc2VydChvYmotPmlzT2JqZWN0KCkpOworICAgICAgcmV0dXJu IHN0YXRpY19jYXN0PEpTT2JqZWN0KiA+KG9iaik7CisgICAgfQorICAgIEpTT2JqZWN0KiBuZXdP YmplY3QgPSBuZXcgQ2xhc3NDdG9yKGV4ZWMpOworICAgIGdsb2JhbE9iamVjdC0+cHV0KGV4ZWMs IHByb3BlcnR5TmFtZSwgbmV3T2JqZWN0LCBJbnRlcm5hbCB8IERvbnRFbnVtKTsKKyAgICByZXR1 cm4gbmV3T2JqZWN0OwogICB9Ci0gIEtKUzo6SlNPYmplY3QgKm5ld09iamVjdCA9IG5ldyBDbGFz c0N0b3IoZXhlYyk7Ci0gIGdsb2JhbE9iamVjdC0+cHV0KGV4ZWMsIHByb3BlcnR5TmFtZSwgbmV3 T2JqZWN0LCBLSlM6OkludGVybmFsIHwgS0pTOjpEb250RW51bSk7Ci0gIHJldHVybiBuZXdPYmpl Y3Q7Ci19CisKK30gLy8gbmFtZXNwYWNlCiAKIC8qKgogICogSGVscGVycyB0byBkZWZpbmUgcHJv dG90eXBlIG9iamVjdHMgKGVhY2ggb2Ygd2hpY2ggc2ltcGx5IGltcGxlbWVudHMKQEAgLTMxNywz NyArMzExLDI2IEBAIGlubGluZSBLSlM6OkpTT2JqZWN0ICpjYWNoZUdsb2JhbE9iamVjdCgKICAq IHRoZW4gdGhlIGZpcnN0IGxpbmUgd2lsbCB1c2UgS0pTX0RFRklORV9QUk9UT1RZUEVfV0lUSF9Q Uk9UT1RZUEUsIHdpdGggRE9NTm9kZVByb3RvIGFzIHRoZSBzZWNvbmQgYXJndW1lbnQuCiAgKi8K IAotLy8gV29yayBhcm91bmQgYSBidWcgaW4gR0NDIDQuMQotI2lmICFDT01QSUxFUihHQ0MpCi0j ZGVmaW5lIEtKU19HQ0NfUk9PVF9OU19IQUNLIDo6Ci0jZWxzZQotI2RlZmluZSBLSlNfR0NDX1JP T1RfTlNfSEFDSwotI2VuZGlmCi0KIC8vIFRoZXNlIG1hY3JvcyBhc3N1bWUgdGhhdCBhIHByb3Rv dHlwZSdzIG9ubHkgcHJvcGVydGllcyBhcmUgZnVuY3Rpb25zCiAjZGVmaW5lIEtKU19ERUZJTkVf UFJPVE9UWVBFKENsYXNzUHJvdG8pIFwKICAgY2xhc3MgQ2xhc3NQcm90byA6IHB1YmxpYyBLSlM6 OkpTT2JqZWN0IHsgXAotICBmcmllbmQgS0pTOjpKU09iamVjdCAqS0pTX0dDQ19ST09UX05TX0hB Q0sgY2FjaGVHbG9iYWxPYmplY3Q8Q2xhc3NQcm90bz4oS0pTOjpFeGVjU3RhdGUgKmV4ZWMsIGNv bnN0IEtKUzo6SWRlbnRpZmllciAmcHJvcGVydHlOYW1lKTsgXAogICBwdWJsaWM6IFwKLSAgICBz dGF0aWMgS0pTOjpKU09iamVjdCAqc2VsZihLSlM6OkV4ZWNTdGF0ZSAqZXhlYyk7IFwKLSAgICB2 aXJ0dWFsIGNvbnN0IEtKUzo6Q2xhc3NJbmZvICpjbGFzc0luZm8oKSBjb25zdCB7IHJldHVybiAm aW5mbzsgfSBcCisgICAgc3RhdGljIEtKUzo6SlNPYmplY3QqIHNlbGYoS0pTOjpFeGVjU3RhdGUq IGV4ZWMpOyBcCisgICAgdmlydHVhbCBjb25zdCBLSlM6OkNsYXNzSW5mbyogY2xhc3NJbmZvKCkg Y29uc3QgeyByZXR1cm4gJmluZm87IH0gXAogICAgIHN0YXRpYyBjb25zdCBLSlM6OkNsYXNzSW5m byBpbmZvOyBcCi0gICAgYm9vbCBnZXRPd25Qcm9wZXJ0eVNsb3QoS0pTOjpFeGVjU3RhdGUgKiwg Y29uc3QgS0pTOjpJZGVudGlmaWVyJiwgS0pTOjpQcm9wZXJ0eVNsb3QmKTsgXAotICBwcm90ZWN0 ZWQ6IFwKLSAgICBDbGFzc1Byb3RvKEtKUzo6RXhlY1N0YXRlICpleGVjKSBcCisgICAgYm9vbCBn ZXRPd25Qcm9wZXJ0eVNsb3QoS0pTOjpFeGVjU3RhdGUqICwgY29uc3QgS0pTOjpJZGVudGlmaWVy JiwgS0pTOjpQcm9wZXJ0eVNsb3QmKTsgXAorICAgIENsYXNzUHJvdG8oS0pTOjpFeGVjU3RhdGUq IGV4ZWMpIFwKICAgICAgIDogS0pTOjpKU09iamVjdChleGVjLT5sZXhpY2FsSW50ZXJwcmV0ZXIo KS0+YnVpbHRpbk9iamVjdFByb3RvdHlwZSgpKSB7IH0gXAogICAgIFwKICAgfTsKIAogI2RlZmlu ZSBLSlNfREVGSU5FX1BST1RPVFlQRV9XSVRIX1BST1RPVFlQRShDbGFzc1Byb3RvLCBDbGFzc1By b3RvUHJvdG8pIFwKICAgICBjbGFzcyBDbGFzc1Byb3RvIDogcHVibGljIEtKUzo6SlNPYmplY3Qg eyBcCi0gICAgICAgIGZyaWVuZCBLSlM6OkpTT2JqZWN0KiBLSlNfR0NDX1JPT1RfTlNfSEFDSyBj YWNoZUdsb2JhbE9iamVjdDxDbGFzc1Byb3RvPihLSlM6OkV4ZWNTdGF0ZSogZXhlYywgY29uc3Qg S0pTOjpJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUpOyBcCiAgICAgcHVibGljOiBcCiAgICAgICAg IHN0YXRpYyBLSlM6OkpTT2JqZWN0KiBzZWxmKEtKUzo6RXhlY1N0YXRlKiBleGVjKTsgXAogICAg ICAgICB2aXJ0dWFsIGNvbnN0IEtKUzo6Q2xhc3NJbmZvKiBjbGFzc0luZm8oKSBjb25zdCB7IHJl dHVybiAmaW5mbzsgfSBcCiAgICAgICAgIHN0YXRpYyBjb25zdCBLSlM6OkNsYXNzSW5mbyBpbmZv OyBcCiAgICAgICAgIGJvb2wgZ2V0T3duUHJvcGVydHlTbG90KEtKUzo6RXhlY1N0YXRlKiwgY29u c3QgS0pTOjpJZGVudGlmaWVyJiwgS0pTOjpQcm9wZXJ0eVNsb3QmKTsgXAotICAgIHByb3RlY3Rl ZDogXAogICAgICAgICBDbGFzc1Byb3RvKEtKUzo6RXhlY1N0YXRlKiBleGVjKSBcCiAgICAgICAg ICAgICA6IEtKUzo6SlNPYmplY3QoQ2xhc3NQcm90b1Byb3RvOjpzZWxmKGV4ZWMpKSB7IH0gXAog ICAgIFwKQEAgLTM1NSwxMSArMzM4LDExIEBAIGlubGluZSBLSlM6OkpTT2JqZWN0ICpjYWNoZUds b2JhbE9iamVjdCgKIAogI2RlZmluZSBLSlNfSU1QTEVNRU5UX1BST1RPVFlQRShDbGFzc05hbWUs IENsYXNzUHJvdG8sIENsYXNzRnVuYykgXAogICAgIGNvbnN0IENsYXNzSW5mbyBDbGFzc1Byb3Rv OjppbmZvID0geyBDbGFzc05hbWUsIDAsICZDbGFzc1Byb3RvIyNUYWJsZSwgMCB9OyBcCi0gICAg SlNPYmplY3QgKkNsYXNzUHJvdG86OnNlbGYoRXhlY1N0YXRlICpleGVjKSBcCisgICAgSlNPYmpl Y3QqIENsYXNzUHJvdG86OnNlbGYoRXhlY1N0YXRlKiBleGVjKSBcCiAgICAgeyBcCi0gICAgICAg IHJldHVybiA6OmNhY2hlR2xvYmFsT2JqZWN0PENsYXNzUHJvdG8+KGV4ZWMsICJbWyIgQ2xhc3NO YW1lICIucHJvdG90eXBlXV0iKTsgXAorICAgICAgICByZXR1cm4gS0pTOjpjYWNoZUdsb2JhbE9i amVjdDxDbGFzc1Byb3RvPihleGVjLCAiW1siIENsYXNzTmFtZSAiLnByb3RvdHlwZV1dIik7IFwK ICAgICB9IFwKLSAgICBib29sIENsYXNzUHJvdG86OmdldE93blByb3BlcnR5U2xvdChFeGVjU3Rh dGUgKmV4ZWMsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90JiBz bG90KSBcCisgICAgYm9vbCBDbGFzc1Byb3RvOjpnZXRPd25Qcm9wZXJ0eVNsb3QoRXhlY1N0YXRl KiBleGVjLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIFByb3BlcnR5U2xvdCYgc2xv dCkgXAogICAgIHsgXAogICAgICAgcmV0dXJuIGdldFN0YXRpY0Z1bmN0aW9uU2xvdDxDbGFzc0Z1 bmMsIEpTT2JqZWN0PihleGVjLCAmQ2xhc3NQcm90byMjVGFibGUsIHRoaXMsIHByb3BlcnR5TmFt ZSwgc2xvdCk7IFwKICAgICB9CkBAIC0zNzQsMjMgKzM1Nyw5IEBAIGlubGluZSBLSlM6OkpTT2Jq ZWN0ICpjYWNoZUdsb2JhbE9iamVjdCgKICAgICAgICBwdXQoZXhlYywgbGVuZ3RoUHJvcGVydHlO YW1lLCBqc051bWJlcihsZW4pLCBEb250RGVsZXRlfFJlYWRPbmx5fERvbnRFbnVtKTsgXAogICAg IH0gXAogICAgIC8qIE1hY3JvIHVzZXIgbmVlZHMgdG8gaW1wbGVtZW50IHRoZSBjYWxsQXNGdW5j dGlvbiBmdW5jdGlvbi4gKi8gXAotICAgIHZpcnR1YWwgSlNWYWx1ZSAqY2FsbEFzRnVuY3Rpb24o RXhlY1N0YXRlICpleGVjLCBKU09iamVjdCAqdGhpc09iaiwgY29uc3QgTGlzdCAmYXJncyk7IFwK KyAgICB2aXJ0dWFsIEpTVmFsdWUqIGNhbGxBc0Z1bmN0aW9uKEV4ZWNTdGF0ZSogZXhlYywgSlNP YmplY3QqIHRoaXNPYmosIGNvbnN0IExpc3QmIGFyZ3MpOyBcCiAgIHByaXZhdGU6IFwKICAgICBp bnQgaWQ7IFwKICAgfTsKIAotLyoKLSAqIExpc3Qgb2YgdGhpbmdzIHRvIGRvIHdoZW4gcG9ydGlu ZyBhbiBvYmplY3RpbXAgdG8gdGhlICdzdGF0aWMgaGFzaHRhYmxlJyBtZWNoYW5pc206Ci0gKiAt IHdyaXRlIHRoZSBoYXNodGFibGUgc291cmNlLCBiZXR3ZWVuIEBiZWdpbiBhbmQgQGVuZAotICog LSBhZGQgYSBydWxlIHRvIGJ1aWxkIHRoZSAubHV0LmgKLSAqIC0gaW5jbHVkZSB0aGUgLmx1dC5o Ci0gKiAtIG1lbnRpb24gdGhlIHRhYmxlIGluIHRoZSBjbGFzc2luZm8gKGFkZCBhIGNsYXNzaW5m byBpZiBuZWNlc3NhcnkpCi0gKiAtIHdyaXRlL3VwZGF0ZSB0aGUgY2xhc3MgZW51bSAoZm9yIHRo ZSB0b2tlbnMpCi0gKiAtIHR1cm4gZ2V0KCkgaW50byBnZXRWYWx1ZVByb3BlcnR5KCksIHB1dCgp IGludG8gcHV0VmFsdWVQcm9wZXJ0eSgpLCB1c2luZyBhIHN3aXRjaCBhbmQgcmVtb3ZpbmcgZnVu Y3MKLSAqIC0gd3JpdGUgZ2V0KCkgYW5kL29yIHB1dCgpIHVzaW5nIGEgdGVtcGxhdGUgbWV0aG9k Ci0gKiAtIGNsZWFudXAgb2xkIHN0dWZmIChlLmcuIGhhc1Byb3BlcnR5KQotICogLSBjb21waWxl LCB0ZXN0LCBjb21taXQgOykKLSAqLwotCi0KICNlbmRpZgpJbmRleDogSmF2YVNjcmlwdENvcmUv d3RmL0Fzc2VydGlvbnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS93dGYvQXNzZXJ0 aW9ucy5oCShyZXZpc2lvbiAxNjcwMCkKKysrIEphdmFTY3JpcHRDb3JlL3d0Zi9Bc3NlcnRpb25z LmgJKHdvcmtpbmcgY29weSkKQEAgLTM4LDYgKzM4LDcgQEAKICovCiAKICNpbmNsdWRlICJQbGF0 Zm9ybS5oIgorI2luY2x1ZGUgPGludHR5cGVzLmg+CiAKICNpZmRlZiBOREVCVUcKICNkZWZpbmUg QVNTRVJUSU9OU19ESVNBQkxFRF9ERUZBVUxUIDEKQEAgLTE4MCw0ICsxODEsNCBAQCB3aGlsZSAo MCkKICNkZWZpbmUgSk9JTl9MT0dfQ0hBTk5FTF9XSVRIX1BSRUZJWF9MRVZFTF8yKHByZWZpeCwg Y2hhbm5lbCkgcHJlZml4ICMjIGNoYW5uZWwKICNlbmRpZgogCi0jZW5kaWYgLy8gS1hNTENPUkVf QVNTRVJUSU9OU19ICisjZW5kaWYKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNjcwMSkKKysrIFdlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDYtMTAtMDEgIE5pa29sYXMg WmltbWVybWFubiA8emltbWVybWFubkBrZGUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBRdC9MaW51eCBidWlsZCB3aXRoIG9sZGVyIGdj YyAzLjMuNC4KKworICAgICAgICBBcyBkaXNjdXNzZWQgd2l0aCBNYWNpZWosIHRoZSBHQ0NfUk9P VF9OU19IQUNLCisgICAgICAgIGNhbiBiZSBjb21wbGV0ZWx5IHJlbW92ZWQsIGFzIHdlbGwgYXMg dGhlIGZyaWVuZHNoaXAKKyAgICAgICAgYmV0d2VlbiBjYWNoZUdsb2JhbE9iamVjdCAmIHRoZSBK Uyogb2JqZWN0cy4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpT LnBtOiBSZW1vdmUgZnJpZW5kc2hpcC4KKyAgICAgICAgKiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVy cy9wbmcvcG5nZ2NjcmQuYzogRml4IGNvbW1lbnRzIGZvciBnY2MzLgorICAgICAgICAocG5nX3Jl YWRfZmlsdGVyX3Jvd19tbXhfYXZnKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVy cy9wbmcvcG5ndmNyZC5jOiBEaXR0by4KKyAgICAgICAgKHBuZ19tbXhfc3VwcG9ydCk6CisgICAg ICAgIChwbmdfcmVhZF9maWx0ZXJfcm93X21teF9hdmcpOgorCiAyMDA2LTEwLTAxICBBbmRlcnMg Q2FybHNzb24gIDxhY2FybHNzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdl b2ZmLgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBt CShyZXZpc2lvbiAxNjcwMCkKKysrIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9ySlMucG0JKHdvcmtpbmcgY29weSkKQEAgLTQyOCw5ICs0MjgsNiBAQCBzdWIgR2VuZXJhdGVI ZWFkZXIKICAgICAKICAgICAjIEFkZCBwcm90b3R5cGUgZGVjbGFyYXRpb24gLS0gY29kZSBhZG9w dGVkIGZyb20gdGhlIEtKU19ERUZJTkVfUFJPVE9UWVBFIGFuZCBLSlNfREVGSU5FX1BST1RPVFlQ RV9XSVRIX1BST1RPVFlQRSBtYWNyb3MKICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiY2xhc3Mg JHtjbGFzc05hbWV9UHJvdG8gOiBwdWJsaWMgS0pTOjpKU09iamVjdCB7XG4iKTsKLSAgICBpZiAo ISRkYXRhTm9kZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkRvTm90Q2FjaGUifSkgewotICAgICAg ICBwdXNoKEBoZWFkZXJDb250ZW50LCAiICAgIGZyaWVuZCBLSlM6OkpTT2JqZWN0KiBLSlNfR0ND X1JPT1RfTlNfSEFDSyBjYWNoZUdsb2JhbE9iamVjdDwke2NsYXNzTmFtZX1Qcm90bz4oS0pTOjpF eGVjU3RhdGUqLCBjb25zdCBLSlM6OklkZW50aWZpZXImIHByb3BlcnR5TmFtZSk7XG4iKTsKLSAg ICB9CiAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgInB1YmxpYzpcbiIpOwogICAgIGlmICgkZGF0 YU5vZGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJEb05vdENhY2hlIn0pIHsKICAgICAgICAgcHVz aChAaGVhZGVyQ29udGVudCwgIiAgICBzdGF0aWMgS0pTOjpKU09iamVjdCogc2VsZigpO1xuIik7 CkBAIC00NDUsNyArNDQyLDYgQEAgc3ViIEdlbmVyYXRlSGVhZGVyCiAgICAgaWYgKCRudW1Db25z dGFudHMgbmUgMCkgewogICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiICAgIEtKUzo6SlNW YWx1ZSogZ2V0VmFsdWVQcm9wZXJ0eShLSlM6OkV4ZWNTdGF0ZSosIGludCB0b2tlbikgY29uc3Q7 XG4iKTsKICAgICB9Ci0gICAgcHVzaChAaGVhZGVyQ29udGVudCwgInByb3RlY3RlZDpcbiIpOwog ICAgIGlmICgkZGF0YU5vZGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJEb05vdENhY2hlIn0pIHsK ICAgICAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgIiAgICAke2NsYXNzTmFtZX1Qcm90bygpIHsg fVxuIik7CiAgICAgfSBlbHNlIHsKQEAgLTYyNiw3ICs2MjIsNyBAQCBzdWIgR2VuZXJhdGVJbXBs ZW1lbnRhdGlvbgogICB9IGVsc2UgewogICAgICAgcHVzaChAaW1wbENvbnRlbnQsICJKU09iamVj dCogJHtjbGFzc05hbWV9UHJvdG86OnNlbGYoRXhlY1N0YXRlKiBleGVjKVxuIik7CiAgICAgICBw dXNoKEBpbXBsQ29udGVudCwgIntcbiIpOwotICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAg cmV0dXJuIDo6Y2FjaGVHbG9iYWxPYmplY3Q8JHtjbGFzc05hbWV9UHJvdG8+KGV4ZWMsIFwiW1sk e2NsYXNzTmFtZX0ucHJvdG90eXBlXV1cIik7XG4iKTsKKyAgICAgIHB1c2goQGltcGxDb250ZW50 LCAiICAgIHJldHVybiBLSlM6OmNhY2hlR2xvYmFsT2JqZWN0PCR7Y2xhc3NOYW1lfVByb3RvPihl eGVjLCBcIltbJHtjbGFzc05hbWV9LnByb3RvdHlwZV1dXCIpO1xuIik7CiAgICAgICBwdXNoKEBp bXBsQ29udGVudCwgIn1cblxuIik7CiAgIH0KICAgaWYgKCRudW1Db25zdGFudHMgPiAwIHx8ICRu dW1GdW5jdGlvbnMgPiAwKSB7CkBAIC04NDYsNyArODQyLDcgQEAgc3ViIEdlbmVyYXRlSW1wbGVt ZW50YXRpb24KIAogICBpZiAoJGRhdGFOb2RlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiR2VuZXJh dGVDb25zdHJ1Y3RvciJ9KSB7CiAgICAgcHVzaChAaW1wbENvbnRlbnQsICJKU1ZhbHVlKiAke2Ns YXNzTmFtZX06OmdldENvbnN0cnVjdG9yKEV4ZWNTdGF0ZSogZXhlYylcbntcbiIpOwotICAgIHB1 c2goQGltcGxDb250ZW50LCAiICAgIHJldHVybiBjYWNoZUdsb2JhbE9iamVjdDwke2NsYXNzTmFt ZX1Db25zdHJ1Y3Rvcj4oZXhlYywgXCJbWyR7aW50ZXJmYWNlTmFtZX0uY29uc3RydWN0b3JdXVwi KTtcbiIpOworICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIHJldHVybiBLSlM6OmNhY2hlR2xv YmFsT2JqZWN0PCR7Y2xhc3NOYW1lfUNvbnN0cnVjdG9yPihleGVjLCBcIltbJHtpbnRlcmZhY2VO YW1lfS5jb25zdHJ1Y3Rvcl1dXCIpO1xuIik7CiAgICAgcHVzaChAaW1wbENvbnRlbnQsICJ9XG4i KTsKICAgfSAgICAKICAgCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3Bu Zy9wbmdnY2NyZC5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2Rl cnMvcG5nL3BuZ2djY3JkLmMJKHJldmlzaW9uIDE2NzAwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9p bWFnZS1kZWNvZGVycy9wbmcvcG5nZ2NjcmQuYwkod29ya2luZyBjb3B5KQpAQCAtMjg5OCw3ICsy ODk4LDcgQEAgcG5nX3JlYWRfZmlsdGVyX3Jvd19tbXhfYXZnKHBuZ19yb3dfaW5mbwogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gTEJDYXJyeXMKICAg ICAgICAgICAgICJwYW5kICUlbW0yLCAlJW1tMSAgICAgICAgICAgIFxuXHQiIC8vIGdldCBMQkNh cnJ5cyBmb3IgZWFjaCBieXRlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAvLyB3aGVyZSBib3RoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Ly8gbHNiJ3Mgd2VyZSA9PSAxIChvbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgLyogbHNiJ3Mgd2VyZSA9PSAxIChvbmx5IHZhbGlkIGZv ciBhY3RpdmUgZ3JvdXApICovCiAgICAgICAgICAgICAicHNybHEgJDEsICUlbW0yICAgICAgICAg ICAgICBcblx0IiAvLyBkaXZpZGUgcmF3IGJ5dGVzIGJ5IDIKICAgICAgICAgICAgICJwYW5kICAl JW1tNCwgJSVtbTIgICAgICAgICAgIFxuXHQiIC8vIGNsZWFyIGludmFsaWQgYml0IDcgb2YgZWFj aAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gYnl0 ZQpAQCAtMjkxOCw3ICsyOTE4LDcgQEAgcG5nX3JlYWRfZmlsdGVyX3Jvd19tbXhfYXZnKHBuZ19y b3dfaW5mbwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Ly8gTEJDYXJyeXMKICAgICAgICAgICAgICJwYW5kICUlbW0yLCAlJW1tMSAgICAgICAgICAgIFxu XHQiIC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFjaCBieXRlCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAvLyB3aGVyZSBib3RoCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgLy8gbHNiJ3Mgd2VyZSA9PSAxIChvbmx5IHZhbGlkIGZvciBhY3RpdmUg Z3JvdXApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogbHNiJ3Mgd2VyZSA9PSAx IChvbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApICovCiAgICAgICAgICAgICAicHNybHEgJDEs ICUlbW0yICAgICAgICAgICAgICBcblx0IiAvLyBkaXZpZGUgcmF3IGJ5dGVzIGJ5IDIKICAgICAg ICAgICAgICJwYW5kICAlJW1tNCwgJSVtbTIgICAgICAgICAgIFxuXHQiIC8vIGNsZWFyIGludmFs aWQgYml0IDcgb2YgZWFjaAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgLy8gYnl0ZQpAQCAtMjk0Miw3ICsyOTQyLDcgQEAgcG5nX3JlYWRfZmlsdGVyX3Jv d19tbXhfYXZnKHBuZ19yb3dfaW5mbwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgLy8gTEJDYXJyeXMKICAgICAgICAgICAgICJwYW5kICUlbW0yLCAlJW1t MSAgICAgICAgICAgIFxuXHQiIC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFjaCBieXRlCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyB3aGVyZSBib3RoCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBsc2IncyB3ZXJlID09IDEgKG9ubHkgdmFs aWQgZm9yIGFjdGl2ZSBncm91cCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIGxz YidzIHdlcmUgPT0gMSAob25seSB2YWxpZCBmb3IgYWN0aXZlIGdyb3VwKSAqLwogICAgICAgICAg ICAgInBzcmxxICQxLCAlJW1tMiAgICAgICAgICAgICAgXG5cdCIgLy8gZGl2aWRlIHJhdyBieXRl cyBieSAyCiAgICAgICAgICAgICAicGFuZCAgJSVtbTQsICUlbW0yICAgICAgICAgICBcblx0IiAv LyBjbGVhciBpbnZhbGlkIGJpdCA3IG9mIGVhY2gKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIC8vIGJ5dGUKQEAgLTI5NzgsOCArMjk3OCw4IEBAIHBuZ19y ZWFkX2ZpbHRlcl9yb3dfbW14X2F2Zyhwbmdfcm93X2luZm8KIAogICAgICAgY2FzZSA2OgogICAg ICAgY2FzZSA0OgotICAgICAgLy9jYXNlIDc6ICAgLy8gd2hvIHdyb3RlIHRoaXM/ICBQTkcgZG9l c24ndCBzdXBwb3J0IDUgb3IgNyBieXRlcy9waXhlbAotICAgICAgLy9jYXNlIDU6ICAgLy8gR1JS IEJPR1VTCisgICAgICAvKmNhc2UgNzogICAgd2hvIHdyb3RlIHRoaXM/ICBQTkcgZG9lc24ndCBz dXBwb3J0IDUgb3IgNyBieXRlcy9waXhlbAorICAgICAgICBjYXNlIDU6ICAgIEdSUiBCT0dVUyAq LwogICAgICAgewogICAgICAgICAgX0FjdGl2ZU1hc2sudXNlICA9IDB4ZmZmZmZmZmZmZmZmZmZm ZkxMOyAvLyB1c2Ugc2hpZnQgYmVsb3cgdG8gY2xlYXIKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gYXBwcm9wcmlhdGUgaW5hY3RpdmUgYnl0ZXMK QEAgLTMwMjMsNyArMzAyMyw3IEBAIHBuZ19yZWFkX2ZpbHRlcl9yb3dfbW14X2F2Zyhwbmdfcm93 X2luZm8KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8g TEJDYXJyeXMKICAgICAgICAgICAgICJwYW5kICUlbW0yLCAlJW1tMSAgICAgICAgICAgXG5cdCIg Ly8gZ2V0IExCQ2FycnlzIGZvciBlYWNoIGJ5dGUKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgLy8gd2hlcmUgYm90aAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgLy8gbHNiJ3Mgd2VyZSA9PSAxIChvbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXAp CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBsc2IncyB3ZXJlID09IDEgKG9ubHkg dmFsaWQgZm9yIGFjdGl2ZSBncm91cCkgKi8KICAgICAgICAgICAgICJwc3JscSAkMSwgJSVtbTIg ICAgICAgICAgICAgXG5cdCIgLy8gZGl2aWRlIHJhdyBieXRlcyBieSAyCiAgICAgICAgICAgICAi cGFuZCAgJSVtbTQsICUlbW0yICAgICAgICAgIFxuXHQiIC8vIGNsZWFyIGludmFsaWQgYml0IDcg b2YgZWFjaAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAv LyBieXRlCkBAIC0zMDQyLDcgKzMwNDIsNyBAQCBwbmdfcmVhZF9maWx0ZXJfcm93X21teF9hdmco cG5nX3Jvd19pbmZvCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8vIExCQ2FycnlzCiAgICAgICAgICAgICAicGFuZCAlJW1tMiwgJSVtbTEgICAgICAgICAg IFxuXHQiIC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFjaCBieXRlCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHdoZXJlIGJvdGgKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIGxzYidzIHdlcmUgPT0gMSAob25seSB2YWxpZCBmb3IgYWN0aXZl IGdyb3VwKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogbHNiJ3Mgd2VyZSA9PSAx IChvbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApICovCiAgICAgICAgICAgICAicHNybHEgJDEs ICUlbW0yICAgICAgICAgICAgIFxuXHQiIC8vIGRpdmlkZSByYXcgYnl0ZXMgYnkgMgogICAgICAg ICAgICAgInBhbmQgICUlbW00LCAlJW1tMiAgICAgICAgICBcblx0IiAvLyBjbGVhciBpbnZhbGlk IGJpdCA3IG9mIGVhY2gKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgLy8gYnl0ZQpAQCAtMzExNCw3ICszMTE0LDcgQEAgcG5nX3JlYWRfZmlsdGVyX3Jvd19t bXhfYXZnKHBuZ19yb3dfaW5mbwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAvLyBMQkNhcnJ5cwogICAgICAgICAgICAgInBhbmQgJSVtbTIsICUlbW0xICAg ICAgICAgICBcblx0IiAvLyBnZXQgTEJDYXJyeXMgZm9yIGVhY2ggYnl0ZQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyB3aGVyZSBib3RoCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGxzYidzIHdlcmUgPT0g MSAob25seSB2YWxpZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAvKiBsc2IncyB3ZXJlID09IDEgKG9ubHkgdmFsaWQgKi8KICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gZm9yIGFjdGl2ZSBncm91cCkKICAgICAg ICAgICAgICJwc3JscSAkMSwgJSVtbTIgICAgICAgICAgICAgXG5cdCIgLy8gZGl2aWRlIHJhdyBi eXRlcyBieSAyCiAgICAgICAgICAgICAicGFuZCAgJSVtbTQsICUlbW0yICAgICAgICAgIFxuXHQi IC8vIGNsZWFyIGludmFsaWQgYml0IDcgb2YgZWFjaApAQCAtMzEzNSw3ICszMTM1LDcgQEAgcG5n X3JlYWRfZmlsdGVyX3Jvd19tbXhfYXZnKHBuZ19yb3dfaW5mbwogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBMQkNhcnJ5cwogICAgICAgICAgICAgInBh bmQgJSVtbTIsICUlbW0xICAgICAgICAgICBcblx0IiAvLyBnZXQgTEJDYXJyeXMgZm9yIGVhY2gg Ynl0ZQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyB3 aGVyZSBib3RoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IC8vIGxzYidzIHdlcmUgPT0gMSAob25seSB2YWxpZAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAvKiBsc2IncyB3ZXJlID09IDEgKG9ubHkgdmFsaWQgKi8K ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gZm9yIGFj dGl2ZSBncm91cCkKICAgICAgICAgICAgICJwc3JscSAkMSwgJSVtbTIgICAgICAgICAgICAgXG5c dCIgLy8gZGl2aWRlIHJhdyBieXRlcyBieSAyCiAgICAgICAgICAgICAicGFuZCAgJSVtbTQsICUl bW0yICAgICAgICAgIFxuXHQiIC8vIGNsZWFyIGludmFsaWQgYml0IDcgb2YgZWFjaApAQCAtMzE1 NSw3ICszMTU1LDcgQEAgcG5nX3JlYWRfZmlsdGVyX3Jvd19tbXhfYXZnKHBuZ19yb3dfaW5mbwog ICAgICAgICAgICAgIm1vdnEgJSVtbTMsICUlbW0xICAgICAgICAgICBcblx0IiAvLyBub3cgdXNl IG1tMSBmb3IgZ2V0dGluZwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAvLyBMQkNhcnJ5cwogICAgICAgICAgICAgInBhbmQgJSVtbTIsICUlbW0xICAgICAg ICAgICBcblx0IiAvLyBnZXQgTEJDYXJyeXMgZm9yIGVhY2ggYnl0ZQotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyB3aGVyZSBib3RoIGxzYidzIHdlcmUg PT0gMQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKiB3 aGVyZSBib3RoIGxzYidzIHdlcmUgPT0gMSAqLwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAvLyAob25seSB2YWxpZCBmb3IgYWN0aXZlIGdyb3VwKQogICAg ICAgICAgICAgInBzcmxxICQxLCAlJW1tMiAgICAgICAgICAgICBcblx0IiAvLyBkaXZpZGUgcmF3 IGJ5dGVzIGJ5IDIKICAgICAgICAgICAgICJwYW5kICAlJW1tNCwgJSVtbTIgICAgICAgICAgXG5c dCIgLy8gY2xlYXIgaW52YWxpZCBiaXQgNyBvZiBlYWNoCkBAIC0zMTc3LDcgKzMxNzcsNyBAQCBw bmdfcmVhZF9maWx0ZXJfcm93X21teF9hdmcocG5nX3Jvd19pbmZvCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIExCQ2FycnlzCiAgICAgICAgICAgICAi cGFuZCAlJW1tMiwgJSVtbTEgICAgICAgICAgIFxuXHQiIC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFj aCBieXRlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8v IHdoZXJlIGJvdGgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgLy8gbHNiJ3Mgd2VyZSA9PSAxIChvbmx5IHZhbGlkCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIC8qIGxzYidzIHdlcmUgPT0gMSAob25seSB2YWxpZCAq LwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBmb3Ig YWN0aXZlIGdyb3VwKQogICAgICAgICAgICAgInBzcmxxICQxLCAlJW1tMiAgICAgICAgICAgICBc blx0IiAvLyBkaXZpZGUgcmF3IGJ5dGVzIGJ5IDIKICAgICAgICAgICAgICJwYW5kICAlJW1tNCwg JSVtbTIgICAgICAgICAgXG5cdCIgLy8gY2xlYXIgaW52YWxpZCBiaXQgNyBvZiBlYWNoCkBAIC0z Mjg4LDcgKzMyODgsNyBAQCBwbmdfcmVhZF9maWx0ZXJfcm93X21teF9hdmcocG5nX3Jvd19pbmZv CiAgICAgICAgICAgICAicGFuZCAlJW1tMSwgJSVtbTMgICAgICAgICAgIFxuXHQiIC8vIGdldCBs c2IgZm9yIGVhY2ggcHJldl9yb3cgYnl0ZQogICAgICAgICAgICAgInBzcmxxICQxLCAlJW1tMSAg ICAgICAgICAgICBcblx0IiAvLyBkaXZpZGUgcHJldl9yb3cgYnl0ZXMgYnkgMgogICAgICAgICAg ICAgInBhbmQgJSVtbTIsICUlbW0zICAgICAgICAgICBcblx0IiAvLyBnZXQgTEJDYXJyeXMgZm9y IGVhY2ggYnl0ZQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAvLyAgd2hlcmUgYm90aCBsc2IncyB3ZXJlID09IDEKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgLyogIHdoZXJlIGJvdGggbHNiJ3Mgd2VyZSA9PSAxICov CiAgICAgICAgICAgICAicHNybHEgJDEsICUlbW0yICAgICAgICAgICAgIFxuXHQiIC8vIGRpdmlk ZSByYXcgYnl0ZXMgYnkgMgogICAgICAgICAgICAgInBhbmQgICUlbW00LCAlJW1tMSAgICAgICAg ICBcblx0IiAvLyBjbGVhciBpbnZhbGlkIGJpdCA3LCBlYWNoIGJ5dGUKICAgICAgICAgICAgICJw YWRkYiAlJW1tMywgJSVtbTAgICAgICAgICAgXG5cdCIgLy8gYWRkIExCQ2FycnlzIHRvIEF2Zywg ZWFjaCBieXRlCkBAIC0zMzQzLDcgKzMzNDMsNyBAQCBwbmdfcmVhZF9maWx0ZXJfcm93X21teF9h dmcocG5nX3Jvd19pbmZvCiAgICAgICAgICAgICAibW92cSAoJSVlZHgsJSVlYngsKSwgJSVtbTIg IFxuXHQiCiAgICAgICAgICAgICAicHNybHEgJDEsICUlbW0xICAgICAgICAgICAgIFxuXHQiIC8v IGRpdmlkZSBwcmV2X3JvdyBieXRlcyBieSAyCiAgICAgICAgICAgICAicGFuZCAlJW1tMiwgJSVt bTMgICAgICAgICAgIFxuXHQiIC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFjaCBieXRlCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHdoZXJlIGJvdGggbHNi J3Mgd2VyZSA9PSAxCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8qIHdoZXJlIGJvdGggbHNiJ3Mgd2VyZSA9PSAxICovCiAgICAgICAgICAgICAicHNybHEg JDEsICUlbW0yICAgICAgICAgICAgIFxuXHQiIC8vIGRpdmlkZSByYXcgYnl0ZXMgYnkgMgogICAg ICAgICAgICAgInBhbmQgICUlbW00LCAlJW1tMSAgICAgICAgICBcblx0IiAvLyBjbGVhciBpbnZh bGlkIGJpdCA3IG9mIGVhY2gKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgLy8gYnl0ZQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9w bmcvcG5ndmNyZC5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2Rl cnMvcG5nL3BuZ3ZjcmQuYwkocmV2aXNpb24gMTY3MDApCisrKyBXZWJDb3JlL3BsYXRmb3JtL2lt YWdlLWRlY29kZXJzL3BuZy9wbmd2Y3JkLmMJKHdvcmtpbmcgY29weSkKQEAgLTg0LDggKzg0LDgg QEAgTk9UX1NVUFBPUlRFRDoKICAgICBwb3AgZWJ4CiAgIH0KIAotICAvL21teF9zdXBwb3J0ZWRf bG9jYWw9MDsgLy8gdGVzdCBjb2RlIGZvciBmb3JjZSBkb24ndCBzdXBwb3J0IE1NWAotICAvL3By aW50ZigiTU1YIDogJXUgKDE9TU1YIHN1cHBvcnRlZClcbiIsbW14X3N1cHBvcnRlZF9sb2NhbCk7 CisgIC8qIG1teF9zdXBwb3J0ZWRfbG9jYWw9MDsgLy8gdGVzdCBjb2RlIGZvciBmb3JjZSBkb24n dCBzdXBwb3J0IE1NWAorICAgICBwcmludGYoIk1NWCA6ICV1ICgxPU1NWCBzdXBwb3J0ZWQpXG4i LG1teF9zdXBwb3J0ZWRfbG9jYWwpOyAqLwogCiAgIG1teF9zdXBwb3J0ZWQgPSBtbXhfc3VwcG9y dGVkX2xvY2FsOwogICByZXR1cm4gbW14X3N1cHBvcnRlZF9sb2NhbDsKQEAgLTIwMjAsNyArMjAy MCw3IEBAIGRhdmczbHA6CiAgICAgICAgICAgICAvLyBBZGQgMXN0IGFjdGl2ZSBncm91cCAoUmF3 KHgtYnBwKS8yKSB0byBBdmVyYWdlIHdpdGggTEJDYXJyeQogICAgICAgICAgICAgbW92cSBtbTEs IG1tMyAgICAgIC8vIG5vdyB1c2UgbW0xIGZvciBnZXR0aW5nIExCQ2FycnlzCiAgICAgICAgICAg ICBwYW5kIG1tMSwgbW0yICAgICAgLy8gZ2V0IExCQ2FycnlzIGZvciBlYWNoIGJ5dGUgd2hlcmUg Ym90aAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGxzYidzIHdlcmUgPT0gMSAo T25seSB2YWxpZCBmb3IgYWN0aXZlIGdyb3VwKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8qIGxzYidzIHdlcmUgPT0gMSAoT25seSB2YWxpZCBmb3IgYWN0aXZlIGdyb3VwKSAqLwog ICAgICAgICAgICAgcHNybHEgbW0yLCAxICAgICAgIC8vIGRpdmlkZSByYXcgYnl0ZXMgYnkgMgog ICAgICAgICAgICAgcGFuZCAgbW0yLCBtbTQgICAgIC8vIGNsZWFyIGludmFsaWQgYml0IDcgb2Yg ZWFjaCBieXRlCiAgICAgICAgICAgICBwYWRkYiBtbTIsIG1tMSAgICAgLy8gYWRkIExCQ2Fycnlz IHRvIChSYXcoeC1icHApLzIpIGZvciBlYWNoIGJ5dGUKQEAgLTIwMzMsNyArMjAzMyw3IEBAIGRh dmczbHA6CiAgICAgICAgICAgICBwc2xscSBtbTIsIFNoaWZ0QnBwICAvLyBzaGlmdCBkYXRhIHRv IHBvc2l0aW9uIGNvcnJlY3RseQogICAgICAgICAgICAgbW92cSBtbTEsIG1tMyAgICAgICAgLy8g bm93IHVzZSBtbTEgZm9yIGdldHRpbmcgTEJDYXJyeXMKICAgICAgICAgICAgIHBhbmQgbW0xLCBt bTIgICAgICAvLyBnZXQgTEJDYXJyeXMgZm9yIGVhY2ggYnl0ZSB3aGVyZSBib3RoCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgLy8gbHNiJ3Mgd2VyZSA9PSAxIChPbmx5IHZhbGlkIGZv ciBhY3RpdmUgZ3JvdXApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogbHNiJ3Mg d2VyZSA9PSAxIChPbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApICovCiAgICAgICAgICAgICBw c3JscSBtbTIsIDEgICAgICAgLy8gZGl2aWRlIHJhdyBieXRlcyBieSAyCiAgICAgICAgICAgICBw YW5kICBtbTIsIG1tNCAgICAgLy8gY2xlYXIgaW52YWxpZCBiaXQgNyBvZiBlYWNoIGJ5dGUKICAg ICAgICAgICAgIHBhZGRiIG1tMiwgbW0xICAgICAvLyBhZGQgTEJDYXJyeXMgdG8gKFJhdyh4LWJw cCkvMikgZm9yIGVhY2ggYnl0ZQpAQCAtMjA1MCw3ICsyMDUwLDcgQEAgZGF2ZzNscDoKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGdldCB0aGUgY29ycmVjdCB4LWJwcCBvZmZzZXQu CiAgICAgICAgICAgICBtb3ZxIG1tMSwgbW0zICAgICAvLyBub3cgdXNlIG1tMSBmb3IgZ2V0dGlu ZyBMQkNhcnJ5cwogICAgICAgICAgICAgcGFuZCBtbTEsIG1tMiAgICAgLy8gZ2V0IExCQ2Fycnlz IGZvciBlYWNoIGJ5dGUgd2hlcmUgYm90aAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Ly8gbHNiJ3Mgd2VyZSA9PSAxIChPbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAvKiBsc2IncyB3ZXJlID09IDEgKE9ubHkgdmFsaWQgZm9y IGFjdGl2ZSBncm91cCkgKi8KICAgICAgICAgICAgIHBzcmxxIG1tMiwgMSAgICAgIC8vIGRpdmlk ZSByYXcgYnl0ZXMgYnkgMgogICAgICAgICAgICAgcGFuZCAgbW0yLCBtbTQgICAgLy8gY2xlYXIg aW52YWxpZCBiaXQgNyBvZiBlYWNoIGJ5dGUKICAgICAgICAgICAgIHBhZGRiIG1tMiwgbW0xICAg IC8vIGFkZCBMQkNhcnJ5cyB0byAoUmF3KHgtYnBwKS8yKSBmb3IgZWFjaCBieXRlCkBAIC0yMTA2 LDcgKzIxMDYsNyBAQCBkYXZnNGxwOgogICAgICAgICAgICAgLy8gQWRkIDFzdCBhY3RpdmUgZ3Jv dXAgKFJhdyh4LWJwcCkvMikgdG8gQXZlcmFnZSB3aXRoIExCQ2FycnkKICAgICAgICAgICAgIG1v dnEgbW0xLCBtbTMgICAgIC8vIG5vdyB1c2UgbW0xIGZvciBnZXR0aW5nIExCQ2FycnlzCiAgICAg ICAgICAgICBwYW5kIG1tMSwgbW0yICAgICAvLyBnZXQgTEJDYXJyeXMgZm9yIGVhY2ggYnl0ZSB3 aGVyZSBib3RoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBsc2IncyB3ZXJlID09 IDEgKE9ubHkgdmFsaWQgZm9yIGFjdGl2ZSBncm91cCkKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC8qIGxzYidzIHdlcmUgPT0gMSAoT25seSB2YWxpZCBmb3IgYWN0aXZlIGdyb3VwKSAq LwogICAgICAgICAgICAgcHNybHEgbW0yLCAxICAgICAgLy8gZGl2aWRlIHJhdyBieXRlcyBieSAy CiAgICAgICAgICAgICBwYW5kICBtbTIsIG1tNCAgICAvLyBjbGVhciBpbnZhbGlkIGJpdCA3IG9m IGVhY2ggYnl0ZQogICAgICAgICAgICAgcGFkZGIgbW0yLCBtbTEgICAgLy8gYWRkIExCQ2Fycnlz IHRvIChSYXcoeC1icHApLzIpIGZvciBlYWNoIGJ5dGUKQEAgLTIxMTksNyArMjExOSw3IEBAIGRh dmc0bHA6CiAgICAgICAgICAgICBhZGQgZWJ4LCA4CiAgICAgICAgICAgICBtb3ZxIG1tMSwgbW0z ICAgICAvLyBub3cgdXNlIG1tMSBmb3IgZ2V0dGluZyBMQkNhcnJ5cwogICAgICAgICAgICAgcGFu ZCBtbTEsIG1tMiAgICAgLy8gZ2V0IExCQ2FycnlzIGZvciBlYWNoIGJ5dGUgd2hlcmUgYm90aAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gbHNiJ3Mgd2VyZSA9PSAxIChPbmx5IHZh bGlkIGZvciBhY3RpdmUgZ3JvdXApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBs c2IncyB3ZXJlID09IDEgKE9ubHkgdmFsaWQgZm9yIGFjdGl2ZSBncm91cCkgKi8KICAgICAgICAg ICAgIHBzcmxxIG1tMiwgMSAgICAgIC8vIGRpdmlkZSByYXcgYnl0ZXMgYnkgMgogICAgICAgICAg ICAgcGFuZCAgbW0yLCBtbTQgICAgLy8gY2xlYXIgaW52YWxpZCBiaXQgNyBvZiBlYWNoIGJ5dGUK ICAgICAgICAgICAgIHBhZGRiIG1tMiwgbW0xICAgIC8vIGFkZCBMQkNhcnJ5cyB0byAoUmF3KHgt YnBwKS8yKSBmb3IgZWFjaCBieXRlCkBAIC0yMTY2LDcgKzIxNjYsNyBAQCBkYXZnMmxwOgogICAg ICAgICAgICAgLy8gQWRkIDFzdCBhY3RpdmUgZ3JvdXAgKFJhdyh4LWJwcCkvMikgdG8gQXZlcmFn ZSB3aXRoIExCQ2FycnkKICAgICAgICAgICAgIG1vdnEgbW0xLCBtbTMgICAgIC8vIG5vdyB1c2Ug bW0xIGZvciBnZXR0aW5nIExCQ2FycnlzCiAgICAgICAgICAgICBwYW5kIG1tMSwgbW0yICAgICAv LyBnZXQgTEJDYXJyeXMgZm9yIGVhY2ggYnl0ZSB3aGVyZSBib3RoCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAvLyBsc2IncyB3ZXJlID09IDEgKE9ubHkgdmFsaWQgZm9yIGFjdGl2ZSBn cm91cCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIGxzYidzIHdlcmUgPT0gMSAo T25seSB2YWxpZCBmb3IgYWN0aXZlIGdyb3VwKSAqLwogICAgICAgICAgICAgcHNybHEgbW0yLCAx ICAgICAgLy8gZGl2aWRlIHJhdyBieXRlcyBieSAyCiAgICAgICAgICAgICBwYW5kICBtbTIsIG1t NCAgICAvLyBjbGVhciBpbnZhbGlkIGJpdCA3IG9mIGVhY2ggYnl0ZQogICAgICAgICAgICAgcGFk ZGIgbW0yLCBtbTEgICAgLy8gYWRkIExCQ2FycnlzIHRvIChSYXcoeC1icHApLzIpIGZvciBlYWNo IGJ5dGUKQEAgLTIxNzgsNyArMjE3OCw3IEBAIGRhdmcybHA6CiAgICAgICAgICAgICBwc2xscSBt bTIsIFNoaWZ0QnBwIC8vIHNoaWZ0IGRhdGEgdG8gcG9zaXRpb24gY29ycmVjdGx5CiAgICAgICAg ICAgICBtb3ZxIG1tMSwgbW0zICAgICAgIC8vIG5vdyB1c2UgbW0xIGZvciBnZXR0aW5nIExCQ2Fy cnlzCiAgICAgICAgICAgICBwYW5kIG1tMSwgbW0yICAgICAgIC8vIGdldCBMQkNhcnJ5cyBmb3Ig ZWFjaCBieXRlIHdoZXJlIGJvdGgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8g bHNiJ3Mgd2VyZSA9PSAxIChPbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIC8qIGxzYidzIHdlcmUgPT0gMSAoT25seSB2YWxpZCBmb3Ig YWN0aXZlIGdyb3VwKSAqLwogICAgICAgICAgICAgcHNybHEgbW0yLCAxICAgICAgICAvLyBkaXZp ZGUgcmF3IGJ5dGVzIGJ5IDIKICAgICAgICAgICAgIHBhbmQgIG1tMiwgbW00ICAgICAgLy8gY2xl YXIgaW52YWxpZCBiaXQgNyBvZiBlYWNoIGJ5dGUKICAgICAgICAgICAgIHBhZGRiIG1tMiwgbW0x ICAgICAgLy8gYWRkIExCQ2FycnlzIHRvIChSYXcoeC1icHApLzIpIGZvciBlYWNoIGJ5dGUKQEAg LTIxOTMsNyArMjE5Myw3IEBAIGRhdmcybHA6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIC8vIGdldCB0aGUgY29ycmVjdCB4LWJwcCBvZmZzZXQuCiAgICAgICAgICAgICBtb3ZxIG1t MSwgbW0zICAgICAgIC8vIG5vdyB1c2UgbW0xIGZvciBnZXR0aW5nIExCQ2FycnlzCiAgICAgICAg ICAgICBwYW5kIG1tMSwgbW0yICAgICAgIC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFjaCBieXRlIHdo ZXJlIGJvdGgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gbHNiJ3Mgd2VyZSA9 PSAxIChPbmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIC8qIGxzYidzIHdlcmUgPT0gMSAoT25seSB2YWxpZCBmb3IgYWN0aXZlIGdyb3Vw KSAqLwogICAgICAgICAgICAgcHNybHEgbW0yLCAxICAgICAgICAvLyBkaXZpZGUgcmF3IGJ5dGVz IGJ5IDIKICAgICAgICAgICAgIHBhbmQgIG1tMiwgbW00ICAgICAgLy8gY2xlYXIgaW52YWxpZCBi aXQgNyBvZiBlYWNoIGJ5dGUKICAgICAgICAgICAgIHBhZGRiIG1tMiwgbW0xICAgICAgLy8gYWRk IExCQ2FycnlzIHRvIChSYXcoeC1icHApLzIpIGZvciBlYWNoIGJ5dGUKQEAgLTIyMDksNyArMjIw OSw3IEBAIGRhdmcybHA6CiAgICAgICAgICAgICBhZGQgZWJ4LCA4CiAgICAgICAgICAgICBtb3Zx IG1tMSwgbW0zICAgIC8vIG5vdyB1c2UgbW0xIGZvciBnZXR0aW5nIExCQ2FycnlzCiAgICAgICAg ICAgICBwYW5kIG1tMSwgbW0yICAgIC8vIGdldCBMQkNhcnJ5cyBmb3IgZWFjaCBieXRlIHdoZXJl IGJvdGgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gbHNiJ3Mgd2VyZSA9PSAxIChP bmx5IHZhbGlkIGZvciBhY3RpdmUgZ3JvdXApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg IC8qIGxzYidzIHdlcmUgPT0gMSAoT25seSB2YWxpZCBmb3IgYWN0aXZlIGdyb3VwKSAqLwogICAg ICAgICAgICAgcHNybHEgbW0yLCAxICAgICAvLyBkaXZpZGUgcmF3IGJ5dGVzIGJ5IDIKICAgICAg ICAgICAgIHBhbmQgIG1tMiwgbW00ICAgLy8gY2xlYXIgaW52YWxpZCBiaXQgNyBvZiBlYWNoIGJ5 dGUKICAgICAgICAgICAgIHBhZGRiIG1tMiwgbW0xICAgLy8gYWRkIExCQ2FycnlzIHRvIChSYXco eC1icHApLzIpIGZvciBlYWNoIGJ5dGUKQEAgLTIyNzcsNyArMjI3Nyw3IEBAIGRhdmc4bHA6CiAg ICAgICAgICAgICBwYW5kIG1tMywgbW0xICAgICAgIC8vIGdldCBsc2IgZm9yIGVhY2ggcHJldl9y b3cgYnl0ZQogICAgICAgICAgICAgcHNybHEgbW0xLCAxICAgICAgICAvLyBkaXZpZGUgcHJldl9y b3cgYnl0ZXMgYnkgMgogICAgICAgICAgICAgcGFuZCBtbTMsIG1tMiAgICAgICAvLyBnZXQgTEJD YXJyeXMgZm9yIGVhY2ggYnl0ZSB3aGVyZSBib3RoCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIGxzYidzIHdlcmUgPT0gMQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAvKiBsc2IncyB3ZXJlID09IDEgKi8KICAgICAgICAgICAgIHBzcmxxIG1tMiwgMSAgICAgICAg Ly8gZGl2aWRlIHJhdyBieXRlcyBieSAyCiAgICAgICAgICAgICBwYW5kICBtbTEsIG1tNCAgICAg IC8vIGNsZWFyIGludmFsaWQgYml0IDcgb2YgZWFjaCBieXRlCiAgICAgICAgICAgICBwYWRkYiBt bTAsIG1tMyAgICAgIC8vIGFkZCBMQkNhcnJ5cyB0byBBdmcgZm9yIGVhY2ggYnl0ZQpAQCAtMjMx MCw3ICsyMzEwLDcgQEAgZGF2Z0FscDoKICAgICAgICAgICAgIG1vdnEgbW0yLCBbZWR4ICsgZWJ4 XQogICAgICAgICAgICAgcHNybHEgbW0xLCAxICAgICAgICAvLyBkaXZpZGUgcHJldl9yb3cgYnl0 ZXMgYnkgMgogICAgICAgICAgICAgcGFuZCBtbTMsIG1tMiAgICAgICAvLyBnZXQgTEJDYXJyeXMg Zm9yIGVhY2ggYnl0ZSB3aGVyZSBib3RoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IC8vIGxzYidzIHdlcmUgPT0gMQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvKiBs c2IncyB3ZXJlID09IDEgKi8KICAgICAgICAgICAgIHBzcmxxIG1tMiwgMSAgICAgICAgLy8gZGl2 aWRlIHJhdyBieXRlcyBieSAyCiAgICAgICAgICAgICBwYW5kICBtbTEsIG1tNCAgICAgIC8vIGNs ZWFyIGludmFsaWQgYml0IDcgb2YgZWFjaCBieXRlCiAgICAgICAgICAgICBwYWRkYiBtbTAsIG1t MyAgICAgIC8vIGFkZCBMQkNhcnJ5cyB0byBBdmcgZm9yIGVhY2ggYnl0ZQo=