33058 2009-12-30 10:14:50 -0800 logging.py should be renamed to webkit_logging.py and eventually die 2009-12-30 10:37:57 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth oldest_to_newest 175964 0 eric 2009-12-30 10:14:50 -0800 logging.py should be renamed to webkit_logging.py and eventually die Turns out that python has a built in logging system. Who knew? This python n00b didn't. :) Anyway, logging.py has the same import name as python's built in logging, so it needs to be renamed if we want to use python's logging. Eventually our logging module (once renamed to webkit_logging.py) should die. 175967 1 eric 2009-12-30 10:17:54 -0800 I'm not sure why I created a bug. Review of this kind of patch isn't very useful. But I guess I'll post it anyway. 175974 2 45672 eric 2009-12-30 10:33:12 -0800 Created attachment 45672 Patch 175975 3 45672 abarth 2009-12-30 10:34:25 -0800 Comment on attachment 45672 Patch Ok. We have a bunch of these kinds of patches to do. 175976 4 eric 2009-12-30 10:37:57 -0800 Committed r52667: <http://trac.webkit.org/changeset/52667> 45672 2009-12-30 10:33:12 -0800 2009-12-30 10:34:25 -0800 Patch bug-33058-20091230123310.patch text/plain 22250 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyNDdiYThjLi5jNWQ2Mzg5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMDktMTIt MzAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGxvZ2dpbmcucHkgc2hvdWxkIGJlIHJlbmFtZWQg dG8gd2Via2l0X2xvZ2dpbmcucHkgYW5kIGV2ZW50dWFsbHkgZGllCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzA1OAorCisgICAgICAgIENoYW5nZSBh bGwgaW1wb3J0cyBvZiAibG9nZ2luZyIgdG8gd2Via2l0X2xvZ2dpbmcsCisgICAgICAgIGV4Y2Vw dCB0aGUgb25lcyB3aGljaCBjYW1lIGZyb20gR29vZ2xlJ3MgY3BwX2xpbnQucHkgYW5kIGRpZmZf cGFyc2VyLnB5CisgICAgICAgIHdoaWNoIGNsZWFybHkgYXJlIGFzc3VtaW5nIHB5dGhvbidzIGxv Z2dpbmcucHkuCisKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHk6CisgICAg ICAgICogU2NyaXB0cy9tb2R1bGVzL2J1aWxkYm90LnB5OgorICAgICAgICAqIFNjcmlwdHMvbW9k dWxlcy9idWlsZHN0ZXBzLnB5OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9k b3dubG9hZC5weToKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVlcmllcy5w eToKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVldWVzLnB5OgorICAgICAg ICAqIFNjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWQucHk6CisgICAgICAgICogU2NyaXB0 cy9tb2R1bGVzL2NyZWRlbnRpYWxzLnB5OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9leGVj dXRpdmUucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2wucHk6 CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL3F1ZXVlZW5naW5lLnB5OgorICAgICAgICAqIFNj cmlwdHMvbW9kdWxlcy9zY20ucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL3N0YXR1c2Jv dC5weToKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvc3RlcHNlcXVlbmNlLnB5OgorICAgICAg ICAqIFNjcmlwdHMvbW9kdWxlcy93ZWJraXRfbG9nZ2luZy5weTogUmVuYW1lZCBmcm9tIFdlYktp dFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9sb2dnaW5nLnB5LgorICAgICAgICAqIFNjcmlwdHMvbW9k dWxlcy93ZWJraXRfbG9nZ2luZ191bml0dGVzdC5weTogUmVuYW1lZCBmcm9tIFdlYktpdFRvb2xz L1NjcmlwdHMvbW9kdWxlcy9sb2dnaW5nX3VuaXR0ZXN0LnB5LgorCiAyMDA5LTEyLTMwICBKYWt1 YiBXaWVjem9yZWsgIDxmYXcyMTdAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNp bW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10 b29sIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCmluZGV4IDVkYmY5MWIuLjkz MDViNjYgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAorKysg Yi9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKQEAgLTQwLDcgKzQwLDcgQEAgZnJv bSBtb2R1bGVzLmNvbW1hbmRzLnF1ZXJpZXMgaW1wb3J0ICoKIGZyb20gbW9kdWxlcy5jb21tYW5k cy5xdWV1ZXMgaW1wb3J0ICoKIGZyb20gbW9kdWxlcy5jb21tYW5kcy51cGxvYWQgaW1wb3J0ICoK IGZyb20gbW9kdWxlcy5leGVjdXRpdmUgaW1wb3J0IEV4ZWN1dGl2ZQotZnJvbSBtb2R1bGVzLmxv Z2dpbmcgaW1wb3J0IGxvZworZnJvbSBtb2R1bGVzLndlYmtpdF9sb2dnaW5nIGltcG9ydCBsb2cK IGZyb20gbW9kdWxlcy5tdWx0aWNvbW1hbmR0b29sIGltcG9ydCBNdWx0aUNvbW1hbmRUb29sCiBm cm9tIG1vZHVsZXMuc2NtIGltcG9ydCBkZXRlY3Rfc2NtX3N5c3RlbQogZnJvbSBtb2R1bGVzLnVz ZXIgaW1wb3J0IFVzZXIKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9i dWd6aWxsYS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weQppbmRl eCA0ZmYzY2I5Li5iNDQzNTMzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvYnVnemlsbGEucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3ppbGxh LnB5CkBAIC0zNSw3ICszNSw3IEBAIGltcG9ydCBzdWJwcm9jZXNzCiBmcm9tIGRhdGV0aW1lIGlt cG9ydCBkYXRldGltZSAjIHVzZWQgaW4gdGltZXN0YW1wKCkKIAogIyBJbXBvcnQgV2ViS2l0LXNw ZWNpZmljIG1vZHVsZXMuCi1mcm9tIG1vZHVsZXMubG9nZ2luZyBpbXBvcnQgZXJyb3IsIGxvZwor ZnJvbSBtb2R1bGVzLndlYmtpdF9sb2dnaW5nIGltcG9ydCBlcnJvciwgbG9nCiBmcm9tIG1vZHVs ZXMuY29tbWl0dGVycyBpbXBvcnQgQ29tbWl0dGVyTGlzdAogZnJvbSBtb2R1bGVzLmNyZWRlbnRp YWxzIGltcG9ydCBDcmVkZW50aWFscwogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvYnVpbGRib3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVpbGRi b3QucHkKaW5kZXggNTQ4Y2FkOC4uZGY1ZDhjMiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy9tb2R1bGVzL2J1aWxkYm90LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9idWlsZGJvdC5weQpAQCAtMzIsNyArMzIsNyBAQCBpbXBvcnQgcmUKIGltcG9ydCB1cmxsaWIy CiAKICMgSW1wb3J0IFdlYktpdC1zcGVjaWZpYyBtb2R1bGVzLgotZnJvbSBtb2R1bGVzLmxvZ2dp bmcgaW1wb3J0IGxvZworZnJvbSBtb2R1bGVzLndlYmtpdF9sb2dnaW5nIGltcG9ydCBsb2cKIAog IyBXZWJLaXQgaW5jbHVkZXMgYSBidWlsdCBjb3B5IG9mIEJlYXV0aWZ1bFNvdXAgaW4gU2NyaXB0 cy9tb2R1bGVzCiAjIHNvIHRoaXMgaW1wb3J0IHNob3VsZCBhbHdheXMgc3VjY2VlZC4KZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWlsZHN0ZXBzLnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1aWxkc3RlcHMucHkKaW5kZXggZTgxNTM3MC4uZjM3NTQx NSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1aWxkc3RlcHMucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1aWxkc3RlcHMucHkKQEAgLTMzLDcg KzMzLDcgQEAgZnJvbSBvcHRwYXJzZSBpbXBvcnQgbWFrZV9vcHRpb24KIAogZnJvbSBtb2R1bGVz LmNvbW1lbnRzIGltcG9ydCBidWdfY29tbWVudF9mcm9tX2NvbW1pdF90ZXh0CiBmcm9tIG1vZHVs ZXMuZ3JhbW1hciBpbXBvcnQgcGx1cmFsaXplCi1mcm9tIG1vZHVsZXMubG9nZ2luZyBpbXBvcnQg bG9nLCBlcnJvcgorZnJvbSBtb2R1bGVzLndlYmtpdF9sb2dnaW5nIGltcG9ydCBsb2csIGVycm9y CiBmcm9tIG1vZHVsZXMud2Via2l0cG9ydCBpbXBvcnQgV2ViS2l0UG9ydAogZnJvbSBtb2R1bGVz LmNoYW5nZWxvZ3MgaW1wb3J0IENoYW5nZUxvZwogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL21vZHVsZXMvY29tbWFuZHMvZG93bmxvYWQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvY29tbWFuZHMvZG93bmxvYWQucHkKaW5kZXggYjUyYzg1ZS4uYmNkZjM0ZCAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL2Rvd25sb2FkLnB5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9kb3dubG9hZC5weQpA QCAtMzksNyArMzksNyBAQCBmcm9tIG1vZHVsZXMuY2hhbmdlbG9ncyBpbXBvcnQgQ2hhbmdlTG9n CiBmcm9tIG1vZHVsZXMuY29tbWVudHMgaW1wb3J0IGJ1Z19jb21tZW50X2Zyb21fY29tbWl0X3Rl eHQKIGZyb20gbW9kdWxlcy5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCiBmcm9tIG1vZHVs ZXMuZ3JhbW1hciBpbXBvcnQgcGx1cmFsaXplCi1mcm9tIG1vZHVsZXMubG9nZ2luZyBpbXBvcnQg ZXJyb3IsIGxvZworZnJvbSBtb2R1bGVzLndlYmtpdF9sb2dnaW5nIGltcG9ydCBlcnJvciwgbG9n CiBmcm9tIG1vZHVsZXMubXVsdGljb21tYW5kdG9vbCBpbXBvcnQgQWJzdHJhY3REZWNsYXJhdGl2 ZUNvbW1tYW5kLCBDb21tYW5kCiBmcm9tIG1vZHVsZXMuc3RlcHNlcXVlbmNlIGltcG9ydCBTdGVw U2VxdWVuY2UKIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1h bmRzL3F1ZXJpZXMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVl cmllcy5weQppbmRleCBlMWEwZTYyLi5kMzdmYTA2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVlcmllcy5weQorKysgYi9XZWJLaXRUb29scy9TY3Jp cHRzL21vZHVsZXMvY29tbWFuZHMvcXVlcmllcy5weQpAQCAtMzMsNyArMzMsNyBAQCBmcm9tIG9w dHBhcnNlIGltcG9ydCBtYWtlX29wdGlvbgogCiBmcm9tIG1vZHVsZXMuYnVpbGRib3QgaW1wb3J0 IEJ1aWxkQm90CiBmcm9tIG1vZHVsZXMuY29tbWl0dGVycyBpbXBvcnQgQ29tbWl0dGVyTGlzdAot ZnJvbSBtb2R1bGVzLmxvZ2dpbmcgaW1wb3J0IGxvZworZnJvbSBtb2R1bGVzLndlYmtpdF9sb2dn aW5nIGltcG9ydCBsb2cKIGZyb20gbW9kdWxlcy5tdWx0aWNvbW1hbmR0b29sIGltcG9ydCBDb21t YW5kCiAKIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRz L3F1ZXVlcy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9xdWV1ZXMu cHkKaW5kZXggN2Q1OWE5OS4uYzhkMzRjNyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy9tb2R1bGVzL2NvbW1hbmRzL3F1ZXVlcy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvY29tbWFuZHMvcXVldWVzLnB5CkBAIC0zNiw3ICszNiw3IEBAIGZyb20gU3RyaW5nSU8g aW1wb3J0IFN0cmluZ0lPCiAKIGZyb20gbW9kdWxlcy5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVy cm9yCiBmcm9tIG1vZHVsZXMuZ3JhbW1hciBpbXBvcnQgcGx1cmFsaXplCi1mcm9tIG1vZHVsZXMu bG9nZ2luZyBpbXBvcnQgZXJyb3IsIGxvZworZnJvbSBtb2R1bGVzLndlYmtpdF9sb2dnaW5nIGlt cG9ydCBlcnJvciwgbG9nCiBmcm9tIG1vZHVsZXMubXVsdGljb21tYW5kdG9vbCBpbXBvcnQgQ29t bWFuZAogZnJvbSBtb2R1bGVzLnBhdGNoY29sbGVjdGlvbiBpbXBvcnQgUGVyc2lzdGVudFBhdGNo Q29sbGVjdGlvbiwgUGVyc2lzdGVudFBhdGNoQ29sbGVjdGlvbkRlbGVnYXRlCiBmcm9tIG1vZHVs ZXMuc3RhdHVzYm90IGltcG9ydCBTdGF0dXNCb3QKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5CmluZGV4IDg1ZmFjYmYuLmFjNzk5NWYgMTAwNjQ0Ci0t LSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWQucHkKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9hZC5weQpAQCAtNDEsNyAr NDEsNyBAQCBmcm9tIG1vZHVsZXMuY29tbWFuZHMuZG93bmxvYWQgaW1wb3J0IEFic3RyYWN0U2Vx dWVuY2VkQ29tbW1hbmQKIGZyb20gbW9kdWxlcy5jb21tZW50cyBpbXBvcnQgYnVnX2NvbW1lbnRf ZnJvbV9zdm5fcmV2aXNpb24KIGZyb20gbW9kdWxlcy5jb21taXR0ZXJzIGltcG9ydCBDb21taXR0 ZXJMaXN0CiBmcm9tIG1vZHVsZXMuZ3JhbW1hciBpbXBvcnQgcGx1cmFsaXplCi1mcm9tIG1vZHVs ZXMubG9nZ2luZyBpbXBvcnQgZXJyb3IsIGxvZworZnJvbSBtb2R1bGVzLndlYmtpdF9sb2dnaW5n IGltcG9ydCBlcnJvciwgbG9nCiBmcm9tIG1vZHVsZXMubXVsdGljb21tYW5kdG9vbCBpbXBvcnQg Q29tbWFuZCwgQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1tYW5kCiAKICMgRklYTUU6IFJlcXVpcmVz IHVuaXQgdGVzdC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcmVk ZW50aWFscy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcmVkZW50aWFscy5weQpp bmRleCBmYzczYzkwLi41Y2E1OTgzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvY3JlZGVudGlhbHMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2Ny ZWRlbnRpYWxzLnB5CkBAIC0zNSw3ICszNSw3IEBAIGltcG9ydCBwbGF0Zm9ybQogaW1wb3J0IHJl CiAKIGZyb20gbW9kdWxlcy5leGVjdXRpdmUgaW1wb3J0IEV4ZWN1dGl2ZQotZnJvbSBtb2R1bGVz LmxvZ2dpbmcgaW1wb3J0IGxvZworZnJvbSBtb2R1bGVzLndlYmtpdF9sb2dnaW5nIGltcG9ydCBs b2cKIGZyb20gbW9kdWxlcy5zY20gaW1wb3J0IEdpdAogCiBjbGFzcyBDcmVkZW50aWFscyhvYmpl Y3QpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2V4ZWN1dGl2ZS5w eSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9leGVjdXRpdmUucHkKaW5kZXggOGYyOTRh YS4uMTE1YThiYyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2V4ZWN1 dGl2ZS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvZXhlY3V0aXZlLnB5CkBA IC0zMiw3ICszMiw3IEBAIGltcG9ydCBTdHJpbmdJTwogaW1wb3J0IHN1YnByb2Nlc3MKIGltcG9y dCBzeXMKIAotZnJvbSBtb2R1bGVzLmxvZ2dpbmcgaW1wb3J0IHRlZQorZnJvbSBtb2R1bGVzLndl YmtpdF9sb2dnaW5nIGltcG9ydCB0ZWUKIAogCiBjbGFzcyBTY3JpcHRFcnJvcihFeGNlcHRpb24p OgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2xvZ2dpbmcucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvbG9nZ2luZy5weQpkZWxldGVkIGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggN2I3Y2VjNS4uMDAwMDAwMAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvbG9nZ2luZy5weQorKysgL2Rldi9udWxsCkBAIC0xLDg0ICswLDAgQEAKLSMgQ29weXJp Z2h0IChjKSAyMDA5LCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotIyBDb3B5cmln aHQgKGMpIDIwMDkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotIyAKLSMgUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0Ci0jIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucyBhcmUKLSMgbWV0OgotIyAKLSMgICAgICogUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSMgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgot IyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlCi0jIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKLSMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90 aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQotIyBkaXN0cmlidXRpb24uCi0jICAgICAq IE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKLSMg Y29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBk ZXJpdmVkIGZyb20KLSMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0 ZW4gcGVybWlzc2lvbi4KLSMgCi0jIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENP UFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKLSMgIkFTIElTIiBBTkQgQU5ZIEVYUFJF U1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKLSMgTElNSVRFRCBU TywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1Mg Rk9SCi0jIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBT SEFMTCBUSEUgQ09QWVJJR0hUCi0jIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9S IEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAotIyBTUEVDSUFMLCBFWEVNUExBUlks IE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCi0jIExJTUlURUQg VE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0Yg VVNFLAotIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VW RVIgQ0FVU0VEIEFORCBPTiBBTlkKLSMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBD T05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotIyAoSU5DTFVESU5HIE5FR0xJR0VO Q0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSMgT0Yg VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI IERBTUFHRS4KLSMKLSMgV2ViS2l0J3MgUHl0aG9uIG1vZHVsZSBmb3IgbG9nZ2luZwotCi1pbXBv cnQgb3MKLWltcG9ydCBzeXMKLQotZGVmIGxvZyhzdHJpbmcpOgotICAgIHByaW50ID4+IHN5cy5z dGRlcnIsIHN0cmluZwotCi1kZWYgZXJyb3Ioc3RyaW5nKToKLSAgICBsb2coIkVSUk9SOiAlcyIg JSBzdHJpbmcpCi0gICAgZXhpdCgxKQotCi0jIFNpbXBsZSBjbGFzcyB0byBzcGxpdCBvdXRwdXQg YmV0d2VlbiBtdWx0aXBsZSBkZXN0aW5hdGlvbnMKLWNsYXNzIHRlZToKLSAgICBkZWYgX19pbml0 X18oc2VsZiwgKmZpbGVzKToKLSAgICAgICAgc2VsZi5maWxlcyA9IGZpbGVzCi0KLSAgICBkZWYg d3JpdGUoc2VsZiwgc3RyaW5nKToKLSAgICAgICAgZm9yIGZpbGUgaW4gc2VsZi5maWxlczoKLSAg ICAgICAgICAgIGZpbGUud3JpdGUoc3RyaW5nKQotCi1jbGFzcyBPdXRwdXRUZWU6Ci0gICAgZGVm IF9faW5pdF9fKHNlbGYpOgotICAgICAgICBzZWxmLl9vcmlnaW5hbF9zdGRvdXQgPSBOb25lCi0g ICAgICAgIHNlbGYuX29yaWdpbmFsX3N0ZGVyciA9IE5vbmUKLSAgICAgICAgc2VsZi5fZmlsZXNf Zm9yX291dHB1dCA9IFtdCi0KLSAgICBkZWYgYWRkX2xvZyhzZWxmLCBwYXRoKToKLSAgICAgICAg bG9nX2ZpbGUgPSBzZWxmLl9vcGVuX2xvZ19maWxlKHBhdGgpCi0gICAgICAgIHNlbGYuX2ZpbGVz X2Zvcl9vdXRwdXQuYXBwZW5kKGxvZ19maWxlKQotICAgICAgICBzZWxmLl90ZWVfb3V0cHV0c190 b19maWxlcyhzZWxmLl9maWxlc19mb3Jfb3V0cHV0KQotICAgICAgICByZXR1cm4gbG9nX2ZpbGUK LQotICAgIGRlZiByZW1vdmVfbG9nKHNlbGYsIGxvZ19maWxlKToKLSAgICAgICAgc2VsZi5fZmls ZXNfZm9yX291dHB1dC5yZW1vdmUobG9nX2ZpbGUpCi0gICAgICAgIHNlbGYuX3RlZV9vdXRwdXRz X3RvX2ZpbGVzKHNlbGYuX2ZpbGVzX2Zvcl9vdXRwdXQpCi0gICAgICAgIGxvZ19maWxlLmNsb3Nl KCkKLQotICAgIEBzdGF0aWNtZXRob2QKLSAgICBkZWYgX29wZW5fbG9nX2ZpbGUobG9nX3BhdGgp OgotICAgICAgICAobG9nX2RpcmVjdG9yeSwgbG9nX25hbWUpID0gb3MucGF0aC5zcGxpdChsb2df cGF0aCkKLSAgICAgICAgaWYgbG9nX2RpcmVjdG9yeSBhbmQgbm90IG9zLnBhdGguZXhpc3RzKGxv Z19kaXJlY3RvcnkpOgotICAgICAgICAgICAgb3MubWFrZWRpcnMobG9nX2RpcmVjdG9yeSkKLSAg ICAgICAgcmV0dXJuIG9wZW4obG9nX3BhdGgsICdhKycpCi0KLSAgICBkZWYgX3RlZV9vdXRwdXRz X3RvX2ZpbGVzKHNlbGYsIGZpbGVzKToKLSAgICAgICAgaWYgbm90IHNlbGYuX29yaWdpbmFsX3N0 ZG91dDoKLSAgICAgICAgICAgIHNlbGYuX29yaWdpbmFsX3N0ZG91dCA9IHN5cy5zdGRvdXQKLSAg ICAgICAgICAgIHNlbGYuX29yaWdpbmFsX3N0ZGVyciA9IHN5cy5zdGRlcnIKLSAgICAgICAgaWYg ZmlsZXMgYW5kIGxlbihmaWxlcyk6Ci0gICAgICAgICAgICBzeXMuc3Rkb3V0ID0gdGVlKHNlbGYu X29yaWdpbmFsX3N0ZG91dCwgKmZpbGVzKQotICAgICAgICAgICAgc3lzLnN0ZGVyciA9IHRlZShz ZWxmLl9vcmlnaW5hbF9zdGRlcnIsICpmaWxlcykKLSAgICAgICAgZWxzZToKLSAgICAgICAgICAg IHN5cy5zdGRvdXQgPSBzZWxmLl9vcmlnaW5hbF9zdGRvdXQKLSAgICAgICAgICAgIHN5cy5zdGRl cnIgPSBzZWxmLl9vcmlnaW5hbF9zdGRlcnIKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Njcmlw dHMvbW9kdWxlcy9sb2dnaW5nX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1 bGVzL2xvZ2dpbmdfdW5pdHRlc3QucHkKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGIw OWE1NjMuLjAwMDAwMDAKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2xvZ2dpbmdf dW5pdHRlc3QucHkKKysrIC9kZXYvbnVsbApAQCAtMSw2MSArMCwwIEBACi0jIENvcHlyaWdodCAo QykgMjAwOSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotIwotIyBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK LSMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zIGFyZQotIyBtZXQ6Ci0jCi0jICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNv dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSMgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotIyAgICAq IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUK LSMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lcgotIyBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0 ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCi0jIGRpc3RyaWJ1dGlvbi4KLSMgICAgKiBOZWl0aGVy IHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCi0jIGNvbnRyaWJ1 dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBm cm9tCi0jIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1p c3Npb24uCi0jCi0jIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBI T0xERVJTIEFORCBDT05UUklCVVRPUlMKLSMgIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1Q TElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKLSMgTElNSVRFRCBUTywgVEhFIElN UExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCi0jIEEg UEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUg Q09QWVJJR0hUCi0jIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJF Q1QsIElORElSRUNULCBJTkNJREVOVEFMLAotIyBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNF UVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCi0jIExJTUlURUQgVE8sIFBST0NV UkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAotIyBE QVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VE IEFORCBPTiBBTlkKLSMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwg U1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RI RVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSMgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K LQotaW1wb3J0IG9zCi1pbXBvcnQgc3VicHJvY2VzcwotaW1wb3J0IFN0cmluZ0lPCi1pbXBvcnQg dGVtcGZpbGUKLWltcG9ydCB1bml0dGVzdAotCi1mcm9tIG1vZHVsZXMuZXhlY3V0aXZlIGltcG9y dCBTY3JpcHRFcnJvcgotZnJvbSBtb2R1bGVzLmxvZ2dpbmcgaW1wb3J0ICoKLQotY2xhc3MgTG9n Z2luZ1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgotCi0gICAgZGVmIGFzc2VydF9sb2dfZXF1YWxz KHNlbGYsIGxvZ19pbnB1dCwgZXhwZWN0ZWRfb3V0cHV0KToKLSAgICAgICAgb3JpZ2luYWxfc3Rk ZXJyID0gc3lzLnN0ZGVycgotICAgICAgICB0ZXN0X3N0ZGVyciA9IFN0cmluZ0lPLlN0cmluZ0lP KCkKLSAgICAgICAgc3lzLnN0ZGVyciA9IHRlc3Rfc3RkZXJyCi0KLSAgICAgICAgdHJ5OgotICAg ICAgICAgICAgbG9nKGxvZ19pbnB1dCkKLSAgICAgICAgICAgIGFjdHVhbF9vdXRwdXQgPSB0ZXN0 X3N0ZGVyci5nZXR2YWx1ZSgpCi0gICAgICAgIGZpbmFsbHk6Ci0gICAgICAgICAgICBvcmlnaW5h bF9zdGRlcnIgPSBvcmlnaW5hbF9zdGRlcnIKLQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhh Y3R1YWxfb3V0cHV0LCBleHBlY3RlZF9vdXRwdXQsICJsb2coXCIlc1wiKSBleHBlY3RlZDogJXMg YWN0dWFsOiAlcyIgJSAobG9nX2lucHV0LCBleHBlY3RlZF9vdXRwdXQsIGFjdHVhbF9vdXRwdXQp KQotCi0gICAgZGVmIHRlc3RfbG9nKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydF9sb2dfZXF1 YWxzKCJ0ZXN0IiwgInRlc3RcbiIpCi0KLSAgICAgICAgIyBUZXN0IHRoYXQgbG9nKCkgZG9lcyBu b3QgdGhyb3cgYW4gZXhjZXB0aW9uIHdoZW4gcGFzc2VkIGFuIG9iamVjdCBpbnN0ZWFkIG9mIGEg c3RyaW5nLgotICAgICAgICBzZWxmLmFzc2VydF9sb2dfZXF1YWxzKFNjcmlwdEVycm9yKG1lc3Nh Z2U9IlNjcmlwdEVycm9yIiksICJTY3JpcHRFcnJvclxuIikKLQotCi1pZiBfX25hbWVfXyA9PSAn X19tYWluX18nOgotICAgIHVuaXR0ZXN0Lm1haW4oKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2wucHkgYi9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvbXVsdGljb21tYW5kdG9vbC5weQppbmRleCA4ZDJjMzk1Li4yMTVlOTQ4IDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvbXVsdGljb21tYW5kdG9vbC5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvbXVsdGljb21tYW5kdG9vbC5weQpAQCAt MzYsNyArMzYsNyBAQCBpbXBvcnQgc3lzCiBmcm9tIG9wdHBhcnNlIGltcG9ydCBPcHRpb25QYXJz ZXIsIEluZGVudGVkSGVscEZvcm1hdHRlciwgU1VQUFJFU1NfVVNBR0UsIG1ha2Vfb3B0aW9uCiAK IGZyb20gbW9kdWxlcy5ncmFtbWFyIGltcG9ydCBwbHVyYWxpemUKLWZyb20gbW9kdWxlcy5sb2dn aW5nIGltcG9ydCBsb2cKK2Zyb20gbW9kdWxlcy53ZWJraXRfbG9nZ2luZyBpbXBvcnQgbG9nCiAK IAogY2xhc3MgQ29tbWFuZChvYmplY3QpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy9tb2R1bGVzL3F1ZXVlZW5naW5lLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3F1 ZXVlZW5naW5lLnB5CmluZGV4IGMyNjNjMDUuLjg2NDBmMDIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvbW9kdWxlcy9xdWV1ZWVuZ2luZS5weQorKysgYi9XZWJLaXRUb29scy9TY3Jp cHRzL21vZHVsZXMvcXVldWVlbmdpbmUucHkKQEAgLTM1LDcgKzM1LDcgQEAgaW1wb3J0IHRyYWNl YmFjawogZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZXRpbWUsIHRpbWVkZWx0YQogCiBmcm9tIG1v ZHVsZXMuZXhlY3V0aXZlIGltcG9ydCBTY3JpcHRFcnJvcgotZnJvbSBtb2R1bGVzLmxvZ2dpbmcg aW1wb3J0IGxvZywgT3V0cHV0VGVlCitmcm9tIG1vZHVsZXMud2Via2l0X2xvZ2dpbmcgaW1wb3J0 IGxvZywgT3V0cHV0VGVlCiBmcm9tIG1vZHVsZXMuc3RhdHVzYm90IGltcG9ydCBTdGF0dXNCb3QK IAogY2xhc3MgUXVldWVFbmdpbmVEZWxlZ2F0ZToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy9zY20ucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5 CmluZGV4IGZmMjY2OTMuLjNlZjMwOTMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9zY20ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQpA QCAtMzYsNyArMzYsNyBAQCBpbXBvcnQgc3VicHJvY2VzcwogIyBJbXBvcnQgV2ViS2l0LXNwZWNp ZmljIG1vZHVsZXMuCiBmcm9tIG1vZHVsZXMuY2hhbmdlbG9ncyBpbXBvcnQgQ2hhbmdlTG9nCiBm cm9tIG1vZHVsZXMuZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUsIHJ1bl9jb21tYW5kLCBTY3Jp cHRFcnJvcgotZnJvbSBtb2R1bGVzLmxvZ2dpbmcgaW1wb3J0IGVycm9yLCBsb2cKK2Zyb20gbW9k dWxlcy53ZWJraXRfbG9nZ2luZyBpbXBvcnQgZXJyb3IsIGxvZwogCiBkZWYgZGV0ZWN0X3NjbV9z eXN0ZW0ocGF0aCk6CiAgICAgaWYgU1ZOLmluX3dvcmtpbmdfZGlyZWN0b3J5KHBhdGgpOgpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3N0YXR1c2JvdC5weSBiL1dlYktp dFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zdGF0dXNib3QucHkKaW5kZXggNWYyZGRlOC4uMjkyOGE0 ZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3N0YXR1c2JvdC5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc3RhdHVzYm90LnB5CkBAIC0yOCw3ICsy OCw3IEBACiAjCiAjIFdlYktpdCdzIFB5dGhvbiBtb2R1bGUgZm9yIGludGVyYWN0aW5nIHdpdGgg dGhlIENvbW1pdCBRdWV1ZSBzdGF0dXMgcGFnZS4KIAotZnJvbSBtb2R1bGVzLmxvZ2dpbmcgaW1w b3J0IGxvZworZnJvbSBtb2R1bGVzLndlYmtpdF9sb2dnaW5nIGltcG9ydCBsb2cKIGZyb20gbW9k dWxlcy53ZWJraXRfbWVjaGFuaXplIGltcG9ydCBCcm93c2VyCiAKICMgV2ViS2l0IGluY2x1ZGVz IGEgYnVpbHQgY29weSBvZiBCZWF1dGlmdWxTb3VwIGluIFNjcmlwdHMvbW9kdWxlcwpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3N0ZXBzZXF1ZW5jZS5weSBiL1dlYktp dFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zdGVwc2VxdWVuY2UucHkKaW5kZXggZjdlYmNlOS4uMzk3 NTJjMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3N0ZXBzZXF1ZW5j ZS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc3RlcHNlcXVlbmNlLnB5CkBA IC0yOCw3ICsyOCw3IEBACiAKIGZyb20gbW9kdWxlcy5idWlsZHN0ZXBzIGltcG9ydCBDb21tYW5k T3B0aW9ucwogZnJvbSBtb2R1bGVzLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKLWZyb20g bW9kdWxlcy5sb2dnaW5nIGltcG9ydCBsb2cKK2Zyb20gbW9kdWxlcy53ZWJraXRfbG9nZ2luZyBp bXBvcnQgbG9nCiBmcm9tIG1vZHVsZXMuc2NtIGltcG9ydCBDaGVja291dE5lZWRzVXBkYXRlCiBm cm9tIG1vZHVsZXMucXVldWVlbmdpbmUgaW1wb3J0IFF1ZXVlRW5naW5lCiAKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93ZWJraXRfbG9nZ2luZy5weSBiL1dlYktpdFRv b2xzL1NjcmlwdHMvbW9kdWxlcy93ZWJraXRfbG9nZ2luZy5weQpuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwLi5iYTFjNWViCi0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy9tb2R1bGVzL3dlYmtpdF9sb2dnaW5nLnB5CkBAIC0wLDAgKzEsODUgQEAKKyMgQ29w eXJpZ2h0IChjKSAyMDA5LCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5 cmlnaHQgKGMpIDIwMDkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyAKKyMgUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0OgorIyAKKyMgICAgICogUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgorIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29y IG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjICAg ICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMK KyMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0 cyBkZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdy aXR0ZW4gcGVybWlzc2lvbi4KKyMgCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhF IENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFTIElTIiBBTkQgQU5ZIEVY UFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRF RCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5F U1MgRk9SCisjIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVO VCBTSEFMTCBUSEUgQ09QWVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorIyBTUEVDSUFMLCBFWEVNUExB UlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1Mg T0YgVVNFLAorIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMg T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KKyMKKyMgV2ViS2l0J3MgUHl0aG9uIG1vZHVsZSBmb3IgbG9nZ2luZworIyBU aGlzIG1vZHVsZSBpcyBub3cgZGVwcmVjYXRlZCBpbiBmYXZvciBvZiBweXRob24ncyBidWlsdC1p biBsb2dnaW5nLnB5LgorCitpbXBvcnQgb3MKK2ltcG9ydCBzeXMKKworZGVmIGxvZyhzdHJpbmcp OgorICAgIHByaW50ID4+IHN5cy5zdGRlcnIsIHN0cmluZworCitkZWYgZXJyb3Ioc3RyaW5nKToK KyAgICBsb2coIkVSUk9SOiAlcyIgJSBzdHJpbmcpCisgICAgZXhpdCgxKQorCisjIFNpbXBsZSBj bGFzcyB0byBzcGxpdCBvdXRwdXQgYmV0d2VlbiBtdWx0aXBsZSBkZXN0aW5hdGlvbnMKK2NsYXNz IHRlZToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgKmZpbGVzKToKKyAgICAgICAgc2VsZi5maWxl cyA9IGZpbGVzCisKKyAgICBkZWYgd3JpdGUoc2VsZiwgc3RyaW5nKToKKyAgICAgICAgZm9yIGZp bGUgaW4gc2VsZi5maWxlczoKKyAgICAgICAgICAgIGZpbGUud3JpdGUoc3RyaW5nKQorCitjbGFz cyBPdXRwdXRUZWU6CisgICAgZGVmIF9faW5pdF9fKHNlbGYpOgorICAgICAgICBzZWxmLl9vcmln aW5hbF9zdGRvdXQgPSBOb25lCisgICAgICAgIHNlbGYuX29yaWdpbmFsX3N0ZGVyciA9IE5vbmUK KyAgICAgICAgc2VsZi5fZmlsZXNfZm9yX291dHB1dCA9IFtdCisKKyAgICBkZWYgYWRkX2xvZyhz ZWxmLCBwYXRoKToKKyAgICAgICAgbG9nX2ZpbGUgPSBzZWxmLl9vcGVuX2xvZ19maWxlKHBhdGgp CisgICAgICAgIHNlbGYuX2ZpbGVzX2Zvcl9vdXRwdXQuYXBwZW5kKGxvZ19maWxlKQorICAgICAg ICBzZWxmLl90ZWVfb3V0cHV0c190b19maWxlcyhzZWxmLl9maWxlc19mb3Jfb3V0cHV0KQorICAg ICAgICByZXR1cm4gbG9nX2ZpbGUKKworICAgIGRlZiByZW1vdmVfbG9nKHNlbGYsIGxvZ19maWxl KToKKyAgICAgICAgc2VsZi5fZmlsZXNfZm9yX291dHB1dC5yZW1vdmUobG9nX2ZpbGUpCisgICAg ICAgIHNlbGYuX3RlZV9vdXRwdXRzX3RvX2ZpbGVzKHNlbGYuX2ZpbGVzX2Zvcl9vdXRwdXQpCisg ICAgICAgIGxvZ19maWxlLmNsb3NlKCkKKworICAgIEBzdGF0aWNtZXRob2QKKyAgICBkZWYgX29w ZW5fbG9nX2ZpbGUobG9nX3BhdGgpOgorICAgICAgICAobG9nX2RpcmVjdG9yeSwgbG9nX25hbWUp ID0gb3MucGF0aC5zcGxpdChsb2dfcGF0aCkKKyAgICAgICAgaWYgbG9nX2RpcmVjdG9yeSBhbmQg bm90IG9zLnBhdGguZXhpc3RzKGxvZ19kaXJlY3RvcnkpOgorICAgICAgICAgICAgb3MubWFrZWRp cnMobG9nX2RpcmVjdG9yeSkKKyAgICAgICAgcmV0dXJuIG9wZW4obG9nX3BhdGgsICdhKycpCisK KyAgICBkZWYgX3RlZV9vdXRwdXRzX3RvX2ZpbGVzKHNlbGYsIGZpbGVzKToKKyAgICAgICAgaWYg bm90IHNlbGYuX29yaWdpbmFsX3N0ZG91dDoKKyAgICAgICAgICAgIHNlbGYuX29yaWdpbmFsX3N0 ZG91dCA9IHN5cy5zdGRvdXQKKyAgICAgICAgICAgIHNlbGYuX29yaWdpbmFsX3N0ZGVyciA9IHN5 cy5zdGRlcnIKKyAgICAgICAgaWYgZmlsZXMgYW5kIGxlbihmaWxlcyk6CisgICAgICAgICAgICBz eXMuc3Rkb3V0ID0gdGVlKHNlbGYuX29yaWdpbmFsX3N0ZG91dCwgKmZpbGVzKQorICAgICAgICAg ICAgc3lzLnN0ZGVyciA9IHRlZShzZWxmLl9vcmlnaW5hbF9zdGRlcnIsICpmaWxlcykKKyAgICAg ICAgZWxzZToKKyAgICAgICAgICAgIHN5cy5zdGRvdXQgPSBzZWxmLl9vcmlnaW5hbF9zdGRvdXQK KyAgICAgICAgICAgIHN5cy5zdGRlcnIgPSBzZWxmLl9vcmlnaW5hbF9zdGRlcnIKZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93ZWJraXRfbG9nZ2luZ191bml0dGVzdC5w eSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93ZWJraXRfbG9nZ2luZ191bml0dGVzdC5w eQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jYmVhYTRiCi0tLSAvZGV2L251 bGwKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dlYmtpdF9sb2dnaW5nX3VuaXR0 ZXN0LnB5CkBAIC0wLDAgKzEsNjEgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisj IG1ldDoKKyMKKyMgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRh aW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjICAgICogUmVkaXN0cmlidXRpb25zIGlu IGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorIyBjb3B5cmlnaHQgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisj IGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0 aCB0aGUKKyMgZGlzdHJpYnV0aW9uLgorIyAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xl IEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRv IGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0d2Fy ZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyMKKyMgVEhJUyBT T0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJV VE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElO Q0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9G IE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyMgQSBQQVJUSUNVTEFSIFBVUlBPU0Ug QVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyMgT1dORVIg T1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lE RU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJ TkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisjIERBVEEsIE9SIFBST0ZJVFM7IE9S IEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorIyBUSEVP UlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBP UiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4g QU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorCitpbXBvcnQgb3MKK2ltcG9y dCBzdWJwcm9jZXNzCitpbXBvcnQgU3RyaW5nSU8KK2ltcG9ydCB0ZW1wZmlsZQoraW1wb3J0IHVu aXR0ZXN0CisKK2Zyb20gbW9kdWxlcy5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCitmcm9t IG1vZHVsZXMud2Via2l0X2xvZ2dpbmcgaW1wb3J0ICoKKworY2xhc3MgTG9nZ2luZ1Rlc3QodW5p dHRlc3QuVGVzdENhc2UpOgorCisgICAgZGVmIGFzc2VydF9sb2dfZXF1YWxzKHNlbGYsIGxvZ19p bnB1dCwgZXhwZWN0ZWRfb3V0cHV0KToKKyAgICAgICAgb3JpZ2luYWxfc3RkZXJyID0gc3lzLnN0 ZGVycgorICAgICAgICB0ZXN0X3N0ZGVyciA9IFN0cmluZ0lPLlN0cmluZ0lPKCkKKyAgICAgICAg c3lzLnN0ZGVyciA9IHRlc3Rfc3RkZXJyCisKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgbG9n KGxvZ19pbnB1dCkKKyAgICAgICAgICAgIGFjdHVhbF9vdXRwdXQgPSB0ZXN0X3N0ZGVyci5nZXR2 YWx1ZSgpCisgICAgICAgIGZpbmFsbHk6CisgICAgICAgICAgICBvcmlnaW5hbF9zdGRlcnIgPSBv cmlnaW5hbF9zdGRlcnIKKworICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhhY3R1YWxfb3V0cHV0 LCBleHBlY3RlZF9vdXRwdXQsICJsb2coXCIlc1wiKSBleHBlY3RlZDogJXMgYWN0dWFsOiAlcyIg JSAobG9nX2lucHV0LCBleHBlY3RlZF9vdXRwdXQsIGFjdHVhbF9vdXRwdXQpKQorCisgICAgZGVm IHRlc3RfbG9nKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydF9sb2dfZXF1YWxzKCJ0ZXN0Iiwg InRlc3RcbiIpCisKKyAgICAgICAgIyBUZXN0IHRoYXQgbG9nKCkgZG9lcyBub3QgdGhyb3cgYW4g ZXhjZXB0aW9uIHdoZW4gcGFzc2VkIGFuIG9iamVjdCBpbnN0ZWFkIG9mIGEgc3RyaW5nLgorICAg ICAgICBzZWxmLmFzc2VydF9sb2dfZXF1YWxzKFNjcmlwdEVycm9yKG1lc3NhZ2U9IlNjcmlwdEVy cm9yIiksICJTY3JpcHRFcnJvclxuIikKKworCitpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgor ICAgIHVuaXR0ZXN0Lm1haW4oKQo=