121228 2013-09-12 08:24:25 -0700 [Qt] Add git repository support to Qt's "maybe clean build needed" detector script 2013-10-03 05:04:39 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kadam kadam abrhm allan.jensen commit-queue dbates jturcotte ossy zarvai oldest_to_newest 928294 0 kadam 2013-09-12 08:24:25 -0700 Unfortunately QtWebKit build system doesn't support git repository properly. The problem is that when the build system checks what are the differences in project files between previous and current change. The build system search changes by SVN revision. But SVN revision isn't in git repository or in different order because of cherry-picking from trunk. This bug made incremental build terrible slow(15 minutes on Linux and 5+ hours on Windows), because git-svn calls tried to rebuild the non-existent SVN history. 928328 1 allan.jensen 2013-09-12 09:22:45 -0700 I have something that might do the trick. Do we also need SVN support for some of the official bots? 928334 2 kadam 2013-09-12 09:30:06 -0700 My fix is almost done. I'm going to upload as soon as possible. I think we need SVN support. 928339 3 211437 allan.jensen 2013-09-12 09:40:09 -0700 Created attachment 211437 Patch 928351 4 211438 kadam 2013-09-12 09:52:05 -0700 Created attachment 211438 draft patch I should test this patch. If It is good then I'm going to upload for review. 928353 5 kadam 2013-09-12 09:54:18 -0700 Sorry, I didn't refresh the page. It seems I was slow. 928363 6 allan.jensen 2013-09-12 10:10:02 -0700 (In reply to comment #5) > Sorry, I didn't refresh the page. It seems I was slow. Sorry, maybe I was too fast. I had something half working when you opened the bug. 928813 7 allan.jensen 2013-09-13 06:12:46 -0700 For now we will land this in our branch. If any other ports want to use the code we can land it in trunk as well. 935703 8 211437 andersca 2013-10-02 21:42:08 -0700 Comment on attachment 211437 Patch Qt has been removed, clearing review flags. 935752 9 allan.jensen 2013-10-03 05:04:39 -0700 Solved in qt5x2 branch, will not be pushed upstream. 211437 2013-09-12 09:40:09 -0700 2013-10-02 21:42:08 -0700 Patch bug-121228-20130912184007.patch text/plain 7063 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1NjEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjRiMzdjOTYyMzBmNWJkMTA2Y2Q1MzI5OWMyOWU4OTg4 NTQwNDdlMy4uZjMzOGU3NGIwMGFhM2I2NWM5MjQ0YzFiYmYwNGYzOWY3MTU4YjVhNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEzLTA5LTEyICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGln aWEuY29tPgorCisgICAgICAgIFtRdF0gQWRkIGdpdCByZXBvc2l0b3J5IHN1cHBvcnQgdG8gUXQn cyAibWF5YmUgY2xlYW4gYnVpbGQgbmVlZGVkIiBkZXRlY3RvciBzY3JpcHQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTIyOAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBzdXBwb3J0IGZv ciBjaGVja2luZyBjaGFuZ2VkIGZpbGVzIHVzaW5nIGdpdCBvbmx5LgorCisgICAgICAgICogU2Ny aXB0cy9WQ1NVdGlscy5wbToKKyAgICAgICAgKGdpdENvbW1pdEZvckRpcmVjdG9yeSk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoZGV0ZXJtaW5lQ3VycmVudEdp dENvbW1pdCk6CisgICAgICAgIChjdXJyZW50R2l0Q29tbWl0KToKKyAgICAgICAgKGJ1aWxkUU1h a2VQcm9qZWN0cyk6CisKIDIwMTMtMDktMTIgIFBldGVyIEdhbCAgPGdhbHBldGVyQGluZi51LXN6 ZWdlZC5odT4KIAogICAgICAgICBVbnJldmlld2VkLiBNb3ZpbmcgbXlzZWxmIHRvIHRoZSBjb21t aXRlcnMgbGlzdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0gYi9Ub29s cy9TY3JpcHRzL1ZDU1V0aWxzLnBtCmluZGV4IDMwNWQ2NWJjMDE5YjFjM2E4MzA5ZmM3YmViZmNi ZjlmNjg0NjNhMjMuLmRlNTg4YmVlMTczNGIwNDViYWIyODYxZjEzMjgzMzc2Yjc3MWFjMzkgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy9W Q1NVdGlscy5wbQpAQCAtNjIsNiArNjIsNyBAQCBCRUdJTiB7CiAgICAgICAgICZmaXhDaGFuZ2VM b2dQYXRjaAogICAgICAgICAmZ2l0QnJhbmNoCiAgICAgICAgICZnaXRkaWZmMnN2bmRpZmYKKyAg ICAgICAgJmdpdENvbW1pdEZvckRpcmVjdG9yeQogICAgICAgICAmaXNHaXQKICAgICAgICAgJmlz R2l0U1ZOCiAgICAgICAgICZpc0dpdEJyYW5jaEJ1aWxkCkBAIC04OSw2ICs5MCw3IEBAIEJFR0lO IHsKICAgICAgICAgJnRvV2luZG93c0xpbmVFbmRpbmdzCiAgICAgICAgICZnaXRDb21taXRGb3JT Vk5SZXZpc2lvbgogICAgICAgICAmbGlzdE9mQ2hhbmdlZEZpbGVzQmV0d2VlblJldmlzaW9ucwor ICAgICAgICAmbGlzdE9mQ2hhbmdlZEZpbGVzQmV0d2VlbkNvbW1pdHMKICAgICApOwogICAgICVF WFBPUlRfVEFHUyA9ICggKTsKICAgICBARVhQT1JUX09LICAgPSAoKTsKQEAgLTQxOSw2ICs0MjEs MjUgQEAgc3ViIHN2blJldmlzaW9uRm9yRGlyZWN0b3J5KCQpCiAgICAgcmV0dXJuICRyZXZpc2lv bjsKIH0KIAorc3ViIGdpdENvbW1pdEZvckRpcmVjdG9yeSgkKQoreworICAgIG15ICgkZGlyKSA9 IEBfOworICAgIG15ICRyZXZpc2lvbjsKKworICAgIGlmIChpc0dpdERpcmVjdG9yeSgkZGlyKSkg eworICAgICAgICBteSAkY29tbWFuZCA9ICJnaXQgbG9nIC1uIDEgfCBncmVwIGNvbW1pdCI7Cisg ICAgICAgICRjb21tYW5kID0gIkxDX0FMTD1DICRjb21tYW5kIiBpZiAhaXNXaW5kb3dzKCk7Cisg ICAgICAgICRjb21tYW5kID0gImNkICRkaXIgJiYgJGNvbW1hbmQiOworICAgICAgICBteSAkZ2l0 TG9nID0gYCRjb21tYW5kYDsKKyAgICAgICAgKCRyZXZpc2lvbikgPSAoJGdpdExvZyA9fiBtL2Nv bW1pdCAoXHcrKS9nKTsKKyAgICB9CisgICAgaWYgKCFkZWZpbmVkKCRyZXZpc2lvbikpIHsKKyAg ICAgICAgJHJldmlzaW9uID0gInVua25vd24iOworICAgICAgICB3YXJuICJVbmFibGUgdG8gZGV0 ZXJtaW5lIGN1cnJlbnQgZ2l0IGNvbW1pdCBpbiAkZGlyIjsKKyAgICB9CisgICAgcmV0dXJuICRy ZXZpc2lvbjsKK30KKwogc3ViIHBhdGhSZWxhdGl2ZVRvU1ZOUmVwb3NpdG9yeVJvb3RGb3JQYXRo KCQpCiB7CiAgICAgbXkgKCRmaWxlKSA9IEBfOwpAQCAtMjIwNyw1ICsyMjI4LDM1IEBAIHN1YiBs aXN0T2ZDaGFuZ2VkRmlsZXNCZXR3ZWVuUmV2aXNpb25zCiAgICAgcmV0dXJuIEByZXN1bHQ7CiB9 CiAKK3N1YiBsaXN0T2ZDaGFuZ2VkRmlsZXNCZXR3ZWVuQ29tbWl0cworeworICAgIG15ICgkc291 cmNlRGlyLCAkZmlyc3RDb21taXQsICRsYXN0Q29tbWl0KSA9IEBfOworICAgIG15ICRjb21tYW5k OworCisgICAgaWYgKCRmaXJzdENvbW1pdCBlcSAidW5rbm93biIgb3IgJGxhc3RDb21taXQgZXEg InVua25vd24iKSB7CisgICAgICAgIHJldHVybiAoKTsKKyAgICB9CisKKyAgICAjIFNvbWUgVkNT IGZ1bmN0aW9ucyBkb24ndCB3b3JrIGZyb20gd2l0aGluIHRoZSBidWlsZCBkaXIsIHNvIGFsd2F5 cworICAgICMgZ28gdG8gdGhlIHNvdXJjZSBkaXIgZmlyc3QuCisgICAgbXkgJGN3ZCA9IEN3ZDo6 Z2V0Y3dkKCk7CisgICAgY2hkaXIgJHNvdXJjZURpcjsKKworICAgICRjb21tYW5kID0gImdpdCBk aWZmIC0tbmFtZS1zdGF0dXMgJGZpcnN0Q29tbWl0Li4kbGFzdENvbW1pdCI7CisKKyAgICBteSBA cmVzdWx0ID0gKCk7CisKKyAgICBpZiAoJGNvbW1hbmQpIHsKKyAgICAgICAgbXkgJGRpZmZPdXRw dXQgPSBgJGNvbW1hbmRgOworICAgICAgICAkZGlmZk91dHB1dCA9fiBzL15bQS1aXVxzKy8vZ207 CisgICAgICAgIEByZXN1bHQgPSBzcGxpdCgvW1xyXG5dKy8sICRkaWZmT3V0cHV0KTsKKyAgICB9 CisKKyAgICBjaGRpciAkY3dkOworCisgICAgcmV0dXJuIEByZXN1bHQ7Cit9CisKKwogCiAxOwpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtCmluZGV4IGQ5MDIyZmQyMWIxMmYyZGE4ZWRjYmQzMzg5ZDg1ZjZhNDhmOTM0 NGEuLjNjZDM5ZGZmNmJlZjIxYjkzZDg1ODcwYjFmMjFjZGUzYjA3ZWU5OTAgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KQEAgLTU2LDYgKzU2LDcgQEAgQkVHSU4gewogICAgICAgICZjbWFrZUJhc2VkUG9ydEFy Z3VtZW50cwogICAgICAgICZjbWFrZUJhc2VkUG9ydE5hbWUKICAgICAgICAmY3VycmVudFNWTlJl dmlzaW9uCisgICAgICAgJmN1cnJlbnRHaXRDb21taXQKICAgICAgICAmZGVidWdTYWZhcmkKICAg ICAgICAmbm1QYXRoCiAgICAgICAgJnBhc3NlZENvbmZpZ3VyYXRpb24KQEAgLTg0LDYgKzg1LDcg QEAgbXkgJHhjb2RlU0RLOwogbXkgJGNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW87CiBteSAk Y29uZmlndXJhdGlvblByb2R1Y3REaXI7CiBteSAkc291cmNlRGlyOworbXkgJGN1cnJlbnRHaXRD b21taXQ7CiBteSAkY3VycmVudFNWTlJldmlzaW9uOwogbXkgJGRlYnVnZ2VyOwogbXkgJG5tUGF0 aDsKQEAgLTUwOCw2ICs1MTAsMTIgQEAgc3ViIGRldGVybWluZUN1cnJlbnRTVk5SZXZpc2lvbgog ICAgIHJldHVybiAkY3VycmVudFNWTlJldmlzaW9uOwogfQogCitzdWIgZGV0ZXJtaW5lQ3VycmVu dEdpdENvbW1pdAoreworICAgIGRldGVybWluZVNvdXJjZURpcigpOworICAgICRjdXJyZW50R2l0 Q29tbWl0ID0gZ2l0Q29tbWl0Rm9yRGlyZWN0b3J5KCRzb3VyY2VEaXIpOworICAgIHJldHVybiAk Y3VycmVudEdpdENvbW1pdDsKK30KIAogc3ViIGNoZGlyV2ViS2l0CiB7CkBAIC01NjAsNiArNTY4 LDEyIEBAIHN1YiBjdXJyZW50U1ZOUmV2aXNpb24KICAgICByZXR1cm4gJGN1cnJlbnRTVk5SZXZp c2lvbjsKIH0KIAorc3ViIGN1cnJlbnRHaXRDb21taXQKK3sKKyAgICBkZXRlcm1pbmVDdXJyZW50 R2l0Q29tbWl0KCkgaWYgbm90IGRlZmluZWQgJGN1cnJlbnRHaXRDb21taXQ7CisgICAgcmV0dXJu ICRjdXJyZW50R2l0Q29tbWl0OworfQorCiBzdWIgZ2VuZXJhdGVEc3ltKCkKIHsKICAgICBkZXRl cm1pbmVHZW5lcmF0ZURzeW0oKTsKQEAgLTIyODAsNyArMjI5NCw3IEBAIHN1YiBidWlsZFFNYWtl UHJvamVjdHMKICAgICAjIFVzaW5nIGJ1aWxkLXdlYmtpdCB0byBidWlsZCBhc3N1bWVzIHlvdSB3 YW50IGEgZGV2ZWxvcGVyLWJ1aWxkCiAgICAgcHVzaCBAYnVpbGRBcmdzLCAiQ09ORklHLT1wcm9k dWN0aW9uX2J1aWxkIjsKIAotICAgIG15ICRzdm5SZXZpc2lvbiA9IGN1cnJlbnRTVk5SZXZpc2lv bigpOworICAgIG15ICRwcmV2aW91c0dpdENvbW1pdCA9ICJ1bmtub3duIjsKICAgICBteSAkcHJl dmlvdXNTdm5SZXZpc2lvbiA9ICJ1bmtub3duIjsKIAogICAgIG15ICRidWlsZEhpbnQgPSAiIjsK QEAgLTIyODgsNiArMjMwMiw5IEBAIHN1YiBidWlsZFFNYWtlUHJvamVjdHMKICAgICBteSAkcGF0 aFRvQnVpbHRSZXZpc2lvbnMgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRkaXIsICIuYnVpbHRSZXZp c2lvbnMuY2FjaGUiKTsKICAgICBpZiAoLWUgJHBhdGhUb0J1aWx0UmV2aXNpb25zICYmIG9wZW4o QlVJTFRSRVZJU0lPTlMsICRwYXRoVG9CdWlsdFJldmlzaW9ucykpIHsKICAgICAgICAgd2hpbGUg KDxCVUlMVFJFVklTSU9OUz4pIHsKKyAgICAgICAgICAgIGlmICgkXyA9fiBtL15HSVRfQ09NTUlU XHM9XHMoXHcrKSQvKSB7CisgICAgICAgICAgICAgICAgJHByZXZpb3VzR2l0Q29tbWl0ID0gJDE7 CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoJF8gPX4gbS9eU1ZOX1JFVklTSU9OXHM9 XHMoXGQrKSQvKSB7CiAgICAgICAgICAgICAgICAgJHByZXZpb3VzU3ZuUmV2aXNpb24gPSAkMTsK ICAgICAgICAgICAgIH0KQEAgLTIyOTUsNiArMjMxMiwyMCBAQCBzdWIgYnVpbGRRTWFrZVByb2pl Y3RzCiAgICAgICAgIGNsb3NlKEJVSUxUUkVWSVNJT05TKTsKICAgICB9CiAKKyAgICBteSAkY3Vy cmVudFZlcnNpb247CisgICAgbXkgJHByZXZpb3VzVmVyc2lvbjsKKyAgICBteSAkdXNpbmdTVk47 CisKKyAgICBpZiAoaXNHaXQoKSkgeworICAgICAgICAkY3VycmVudFZlcnNpb24gPSBjdXJyZW50 R2l0Q29tbWl0KCk7CisgICAgICAgICRwcmV2aW91c1ZlcnNpb24gPSAkcHJldmlvdXNHaXRDb21t aXQ7CisgICAgICAgICR1c2luZ1NWTiA9IDA7CisgICAgfSBlbHNlIHsKKyAgICAgICAgJGN1cnJl bnRWZXJzaW9uID0gY3VycmVudFNWTlJldmlzaW9uKCk7CisgICAgICAgICRwcmV2aW91c1ZlcnNp b24gPSAkcHJldmlvdXNTdm5SZXZpc2lvbjsKKyAgICAgICAgJHVzaW5nU1ZOID0gMTsKKyAgICB9 CisKICAgICBteSAkcmVzdWx0ID0gMDsKIAogICAgICMgUnVuIHFtYWtlLCByZWdhZGxlc3Mgb2Yg aGF2aW5nIGEgbWFrZWZpbGUgb3Igbm90LCBzbyB0aGF0IHFtYWtlIGNhbgpAQCAtMjMyOSwxMiAr MjM2MCwxOCBAQCBzdWIgYnVpbGRRTWFrZVByb2plY3RzCiAgICAgICAgICRuZWVkc0luY3JlbWVu dGFsQnVpbGQgPSAxOwogICAgIH0KIAotICAgIGlmICgkc3ZuUmV2aXNpb24gbmUgJHByZXZpb3Vz U3ZuUmV2aXNpb24pIHsKLSAgICAgICAgcHJpbnQgIkxhc3QgYnVpbHQgcmV2aXNpb24gd2FzICIg LiAkcHJldmlvdXNTdm5SZXZpc2lvbiAuCi0gICAgICAgICAgICAiLCBub3cgYXQgcmV2aXNpb24g JHN2blJldmlzaW9uLiBGdWxsIGluY3JlbWVudGFsIGJ1aWxkIG5lZWRlZC5cbiI7CisgICAgaWYg KCRjdXJyZW50VmVyc2lvbiBuZSAkcHJldmlvdXNWZXJzaW9uKSB7CisgICAgICAgIHByaW50ICJM YXN0IGJ1aWx0IHZlcnNpb24gd2FzICIgLiAkcHJldmlvdXNWZXJzaW9uIC4KKyAgICAgICAgICAg ICIsIG5vdyBhdCBjb21taXQgJGN1cnJlbnRWZXJzaW9uLiBGdWxsIGluY3JlbWVudGFsIGJ1aWxk IG5lZWRlZC5cbiI7CiAgICAgICAgICRuZWVkc0luY3JlbWVudGFsQnVpbGQgPSAxOwogCi0gICAg ICAgIG15IEBmaWxlTGlzdCA9IGxpc3RPZkNoYW5nZWRGaWxlc0JldHdlZW5SZXZpc2lvbnMoc291 cmNlRGlyKCksICRwcmV2aW91c1N2blJldmlzaW9uLCAkc3ZuUmV2aXNpb24pOworICAgICAgICBt eSBAZmlsZUxpc3Q7CisKKyAgICAgICAgaWYgKCR1c2luZ1NWTikgeworICAgICAgICAgICAgQGZp bGVMaXN0ID0gbGlzdE9mQ2hhbmdlZEZpbGVzQmV0d2VlblJldmlzaW9ucyhzb3VyY2VEaXIoKSwg JHByZXZpb3VzVmVyc2lvbiwgJGN1cnJlbnRWZXJzaW9uKTsKKyAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgIEBmaWxlTGlzdCA9IGxpc3RPZkNoYW5nZWRGaWxlc0JldHdlZW5Db21taXRzKHNv dXJjZURpcigpLCAkcHJldmlvdXNWZXJzaW9uLCAkY3VycmVudFZlcnNpb24pOworICAgICAgICB9 CiAKICAgICAgICAgZm9yZWFjaCAoQGZpbGVMaXN0KSB7CiAgICAgICAgICAgICBpZiAobS9cLnBy W29pZl0kLyBvcgpAQCAtMjM2Niw3ICsyNDAzLDExIEBAIHN1YiBidWlsZFFNYWtlUHJvamVjdHMK ICAgICBpZiAoJHJlc3VsdCBlcSAwKSB7CiAgICAgICAgICMgTm93IHRoYXQgdGhlIGJ1aWxkIGNv bXBsZXRlZCBzdWNjZXNzZnVsbHkgd2UgY2FuIHNhdmUgdGhlIFNWTiByZXZpc2lvbgogICAgICAg ICBvcGVuKEJVSUxUUkVWSVNJT05TLCAiPj4kcGF0aFRvQnVpbHRSZXZpc2lvbnMiKTsKLSAgICAg ICAgcHJpbnQgQlVJTFRSRVZJU0lPTlMgIlNWTl9SRVZJU0lPTiA9ICRzdm5SZXZpc2lvblxuIjsK KyAgICAgICAgaWYgKCR1c2luZ1NWTikgeworICAgICAgICAgICAgcHJpbnQgQlVJTFRSRVZJU0lP TlMgIlNWTl9SRVZJU0lPTiA9ICRjdXJyZW50VmVyc2lvblxuIjsKKyAgICAgICAgfSBlbHNlIHsK KyAgICAgICAgICAgIHByaW50IEJVSUxUUkVWSVNJT05TICJHSVRfQ09NTUlUID0gJGN1cnJlbnRW ZXJzaW9uXG4iOworICAgICAgICB9CiAgICAgICAgIGNsb3NlKEJVSUxUUkVWSVNJT05TKTsKICAg ICB9IGVsc2lmICghJGNvbW1hbmQgPX4gL2luY3JlbWVudGFsLyAmJiBleGl0U3RhdHVzKCRyZXN1 bHQpKSB7CiAgICAgICAgIG15ICRleGl0Q29kZSA9IGV4aXRTdGF0dXMoJHJlc3VsdCk7Cg== 211438 2013-09-12 09:52:05 -0700 2013-09-12 09:52:05 -0700 draft patch gardening.patch text/plain 4678 kadam ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0gYi9Ub29scy9TY3JpcHRzL1ZD U1V0aWxzLnBtCmluZGV4IDMwNWQ2NWIuLmVmNDU0ODMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvVkNTVXRpbHMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQpAQCAtODgsNiAr ODgsNyBAQCBCRUdJTiB7CiAgICAgICAgICZzdm5TdGF0dXMKICAgICAgICAgJnRvV2luZG93c0xp bmVFbmRpbmdzCiAgICAgICAgICZnaXRDb21taXRGb3JTVk5SZXZpc2lvbgorICAgICAgICAmY3Vy cmVudEdpdENvbW1pdEhhc2gKICAgICAgICAgJmxpc3RPZkNoYW5nZWRGaWxlc0JldHdlZW5SZXZp c2lvbnMKICAgICApOwogICAgICVFWFBPUlRfVEFHUyA9ICggKTsKQEAgLTQxNCw3ICs0MTUsNyBA QCBzdWIgc3ZuUmV2aXNpb25Gb3JEaXJlY3RvcnkoJCkKICAgICB9CiAgICAgaWYgKCFkZWZpbmVk KCRyZXZpc2lvbikpIHsKICAgICAgICAgJHJldmlzaW9uID0gInVua25vd24iOwotICAgICAgICB3 YXJuICJVbmFibGUgdG8gZGV0ZXJtaW5lIGN1cnJlbnQgU1ZOIHJldmlzaW9uIGluICRkaXIiOwor ICAgICAgICB3YXJuICJVbmFibGUgdG8gZGV0ZXJtaW5lIGN1cnJlbnQgU1ZOIHJldmlzaW9uIGlu ICRkaXIiIGlmICFpc0dpdCgpOwogICAgIH0KICAgICByZXR1cm4gJHJldmlzaW9uOwogfQpAQCAt MjE2MCw2ICsyMTYxLDcgQEAgc3ViIHJ1bkNvbW1hbmQoQCkKIHN1YiBnaXRDb21taXRGb3JTVk5S ZXZpc2lvbgogewogICAgIG15ICgkc3ZuUmV2aXNpb24pID0gQF87CisKICAgICBteSAkY29tbWFu ZCA9ICJnaXQgc3ZuIGZpbmQtcmV2IHIiIC4gJHN2blJldmlzaW9uOwogICAgICRjb21tYW5kID0g IkxDX0FMTD1DICRjb21tYW5kIiBpZiAhaXNXaW5kb3dzKCk7CiAgICAgbXkgJGdpdEhhc2ggPSBg JGNvbW1hbmRgOwpAQCAtMjE3Miw2ICsyMTc0LDEyIEBAIHN1YiBnaXRDb21taXRGb3JTVk5SZXZp c2lvbgogICAgIHJldHVybiAkZ2l0SGFzaDsKIH0KIAorc3ViIGN1cnJlbnRHaXRDb21taXRIYXNo KCkKK3sKKyAgICBteSAkZ2l0SGFzaCA9IGBnaXQgcmV2LXBhcnNlIEhFQURgOworICAgIHJldHVy biBjaG9tcCgkZ2l0SGFzaCk7Cit9CisKIHN1YiBsaXN0T2ZDaGFuZ2VkRmlsZXNCZXR3ZWVuUmV2 aXNpb25zCiB7CiAgICAgbXkgKCRzb3VyY2VEaXIsICRmaXJzdFJldmlzaW9uLCAkbGFzdFJldmlz aW9uKSA9IEBfOwpAQCAtMjE4Niw5ICsyMTk0LDE3IEBAIHN1YiBsaXN0T2ZDaGFuZ2VkRmlsZXNC ZXR3ZWVuUmV2aXNpb25zCiAgICAgbXkgJGN3ZCA9IEN3ZDo6Z2V0Y3dkKCk7CiAgICAgY2hkaXIg JHNvdXJjZURpcjsKIAorICAgIG15ICRmaXJzdENvbW1pdDsKKyAgICBteSAkbGFzdENvbW1pdDsK KwogICAgIGlmIChpc0dpdCgpKSB7Ci0gICAgICAgIG15ICRmaXJzdENvbW1pdCA9IGdpdENvbW1p dEZvclNWTlJldmlzaW9uKCRmaXJzdFJldmlzaW9uKTsKLSAgICAgICAgbXkgJGxhc3RDb21taXQg PSBnaXRDb21taXRGb3JTVk5SZXZpc2lvbigkbGFzdFJldmlzaW9uKTsKKyAgICAgICAgaWYgKGlz R2l0U1ZOKCkpIHsKKyAgICAgICAgICAgICRmaXJzdENvbW1pdCA9IGdpdENvbW1pdEZvclNWTlJl dmlzaW9uKCRmaXJzdFJldmlzaW9uKTsKKyAgICAgICAgICAgICRsYXN0Q29tbWl0ID0gZ2l0Q29t bWl0Rm9yU1ZOUmV2aXNpb24oJGxhc3RSZXZpc2lvbik7CisgICAgICAgIH0gZWxzZSB7CisgICAg ICAgICAgICAkZmlyc3RDb21taXQgPSAkZmlyc3RSZXZpc2lvbjsKKyAgICAgICAgICAgICRsYXN0 Q29tbWl0ID0gJGxhc3RSZXZpc2lvbjsKKyAgICAgICAgfQogICAgICAgICAkY29tbWFuZCA9ICJn aXQgZGlmZiAtLW5hbWUtc3RhdHVzICRmaXJzdENvbW1pdC4uJGxhc3RDb21taXQiOwogICAgIH0g ZWxzaWYgKGlzU1ZOKCkpIHsKICAgICAgICAgJGNvbW1hbmQgPSAic3ZuIGRpZmYgLS1zdW1tYXJp emUgLXIgJGZpcnN0UmV2aXNpb246JGxhc3RSZXZpc2lvbiI7CmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXgg ZDkwMjJmZC4uNDlmYTFiZSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMjI4MywxNCArMjI4MywyMCBA QCBzdWIgYnVpbGRRTWFrZVByb2plY3RzCiAgICAgbXkgJHN2blJldmlzaW9uID0gY3VycmVudFNW TlJldmlzaW9uKCk7CiAgICAgbXkgJHByZXZpb3VzU3ZuUmV2aXNpb24gPSAidW5rbm93biI7CiAK KyAgICBteSAkZ2l0Q29tbWl0SGFzaCA9IGN1cnJlbnRHaXRDb21taXRIYXNoKCk7CisgICAgbXkg JHByZXZpb3VzR2l0Q29tbWl0SGFzaCA9ICJ1bmtub3duIjsKKwogICAgIG15ICRidWlsZEhpbnQg PSAiIjsKIAogICAgIG15ICRwYXRoVG9CdWlsdFJldmlzaW9ucyA9IEZpbGU6OlNwZWMtPmNhdGZp bGUoJGRpciwgIi5idWlsdFJldmlzaW9ucy5jYWNoZSIpOwogICAgIGlmICgtZSAkcGF0aFRvQnVp bHRSZXZpc2lvbnMgJiYgb3BlbihCVUlMVFJFVklTSU9OUywgJHBhdGhUb0J1aWx0UmV2aXNpb25z KSkgewogICAgICAgICB3aGlsZSAoPEJVSUxUUkVWSVNJT05TPikgewotICAgICAgICAgICAgaWYg KCRfID1+IG0vXlNWTl9SRVZJU0lPTlxzPVxzKFxkKykkLykgeworICAgICAgICAgICAgaWYgKCRf ID1+IG0vXlNWTl9SRVZJU0lPTlxzPVxzKFtcZF0rKSQvKSB7CiAgICAgICAgICAgICAgICAgJHBy ZXZpb3VzU3ZuUmV2aXNpb24gPSAkMTsKICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmICgk XyA9fiBtL15HSVRfQ09NTUlUX0hBU0hccz1ccyhbMC05QS1aYS16XSspJC8pIHsKKyAgICAgICAg ICAgICAgICAkcHJldmlvdXNHaXRDb21taXRIYXNoID0gJDE7CisgICAgICAgICAgICB9CiAgICAg ICAgIH0KICAgICAgICAgY2xvc2UoQlVJTFRSRVZJU0lPTlMpOwogICAgIH0KQEAgLTIzMjksMTIg KzIzMzUsMjMgQEAgc3ViIGJ1aWxkUU1ha2VQcm9qZWN0cwogICAgICAgICAkbmVlZHNJbmNyZW1l bnRhbEJ1aWxkID0gMTsKICAgICB9CiAKLSAgICBpZiAoJHN2blJldmlzaW9uIG5lICRwcmV2aW91 c1N2blJldmlzaW9uKSB7Ci0gICAgICAgIHByaW50ICJMYXN0IGJ1aWx0IHJldmlzaW9uIHdhcyAi IC4gJHByZXZpb3VzU3ZuUmV2aXNpb24gLgotICAgICAgICAgICAgIiwgbm93IGF0IHJldmlzaW9u ICRzdm5SZXZpc2lvbi4gRnVsbCBpbmNyZW1lbnRhbCBidWlsZCBuZWVkZWQuXG4iOworICAgIG15 ICRwcmV2aW91c0NoYW5nZTsKKyAgICBteSAkbGFzdENoYW5nZTsKKworICAgIGlmIChpc1NWTigp IG9yIGlzR2l0U1ZOKCkpIHsKKyAgICAgICAgJHByZXZpb3VzQ2hhbmdlID0gJHN2blJldmlzaW9u OworICAgICAgICAkbGFzdENoYW5nZSA9ICRwcmV2aW91c1N2blJldmlzaW9uOworICAgIH0gZWxz aWYgKGlzR2l0KCkpIHsKKyAgICAgICAgJHByZXZpb3VzQ2hhbmdlID0gJHByZXZpb3VzR2l0Q29t bWl0SGFzaDsKKyAgICAgICAgJGxhc3RDaGFuZ2UgPSAkZ2l0Q29tbWl0SGFzaDsKKyAgICB9CisK KyAgICBpZiAoJGxhc3RDaGFuZ2UgbmUgJHByZXZpb3VzQ2hhbmdlKSB7CisgICAgICAgIHByaW50 ICJMYXN0IGJ1aWx0IHJldmlzaW9uIHdhcyAiIC4gJHByZXZpb3VzQ2hhbmdlIC4KKyAgICAgICAg ICAgICIsIG5vdyBhdCByZXZpc2lvbiAkbGFzdENoYW5nZS4gRnVsbCBpbmNyZW1lbnRhbCBidWls ZCBuZWVkZWQuXG4iOwogICAgICAgICAkbmVlZHNJbmNyZW1lbnRhbEJ1aWxkID0gMTsKIAotICAg ICAgICBteSBAZmlsZUxpc3QgPSBsaXN0T2ZDaGFuZ2VkRmlsZXNCZXR3ZWVuUmV2aXNpb25zKHNv dXJjZURpcigpLCAkcHJldmlvdXNTdm5SZXZpc2lvbiwgJHN2blJldmlzaW9uKTsKKyAgICAgICAg bXkgQGZpbGVMaXN0ID0gbGlzdE9mQ2hhbmdlZEZpbGVzQmV0d2VlblJldmlzaW9ucyhzb3VyY2VE aXIoKSwgJHByZXZpb3VzQ2hhbmdlLCAkbGFzdENoYW5nZSk7CiAKICAgICAgICAgZm9yZWFjaCAo QGZpbGVMaXN0KSB7CiAgICAgICAgICAgICBpZiAobS9cLnByW29pZl0kLyBvcgpAQCAtMjM2Niw3 ICsyMzgzLDEyIEBAIHN1YiBidWlsZFFNYWtlUHJvamVjdHMKICAgICBpZiAoJHJlc3VsdCBlcSAw KSB7CiAgICAgICAgICMgTm93IHRoYXQgdGhlIGJ1aWxkIGNvbXBsZXRlZCBzdWNjZXNzZnVsbHkg d2UgY2FuIHNhdmUgdGhlIFNWTiByZXZpc2lvbgogICAgICAgICBvcGVuKEJVSUxUUkVWSVNJT05T LCAiPj4kcGF0aFRvQnVpbHRSZXZpc2lvbnMiKTsKLSAgICAgICAgcHJpbnQgQlVJTFRSRVZJU0lP TlMgIlNWTl9SRVZJU0lPTiA9ICRzdm5SZXZpc2lvblxuIjsKKyAgICAgICAgaWYgKGlzU1ZOKCkg fHwgaXNHaXRTVk4oKSkgeworICAgICAgICAgICAgcHJpbnQgQlVJTFRSRVZJU0lPTlMgIlNWTl9S RVZJU0lPTiA9ICRzdm5SZXZpc2lvblxuIjsKKyAgICAgICAgfQorICAgICAgICBpZiAoaXNHaXQo KSkgeworICAgICAgICAgICAgcHJpbnQgQlVJTFRSRVZJU0lPTlMgIkdJVF9DT01NSVRfSEFTSCA9 ICRnaXRDb21taXRIYXNoXG4iOworICAgICAgICB9CiAgICAgICAgIGNsb3NlKEJVSUxUUkVWSVNJ T05TKTsKICAgICB9IGVsc2lmICghJGNvbW1hbmQgPX4gL2luY3JlbWVudGFsLyAmJiBleGl0U3Rh dHVzKCRyZXN1bHQpKSB7CiAgICAgICAgIG15ICRleGl0Q29kZSA9IGV4aXRTdGF0dXMoJHJlc3Vs dCk7Cg==