70455 2011-10-19 16:53:09 -0700 [chromium/mac] Add support for building with make 2011-10-20 17:15:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thakis thakis abarth ojan webkit.review.bot oldest_to_newest 487137 0 thakis 2011-10-19 16:53:09 -0700 [chromium/mac] Add support for building with make 487143 1 111696 thakis 2011-10-19 16:56:42 -0700 Created attachment 111696 Patch 487834 2 111696 thakis 2011-10-20 13:35:27 -0700 Comment on attachment 111696 Patch needs tweaking 487849 3 111841 thakis 2011-10-20 13:51:08 -0700 Created attachment 111841 Patch 487853 4 111843 thakis 2011-10-20 13:53:55 -0700 Created attachment 111843 Patch 487855 5 thakis 2011-10-20 13:56:45 -0700 (Yesterday's clobber build time for chromium/mac was 23 min, today with clang on by default it's 18 min, and with this patch and make it's 12min on my machine) 487869 6 111843 abarth 2011-10-20 14:08:34 -0700 Comment on attachment 111843 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111843&action=review This is great. > Tools/Scripts/webkitdirs.pm:922 > + if (-e 'Makefile.chromium') { > + unless (-e 'Source/WebKit/chromium/WebKit.xcodeproj') { > + $hasUpToDateMakefile = 1; > + } else { > + $hasUpToDateMakefile = stat('Makefile.chromium')->mtime > stat('Source/WebKit/chromium/WebKit.xcodeproj')->mtime; > + } > + } four-space indent. 487930 7 111843 thakis 2011-10-20 15:33:39 -0700 Comment on attachment 111843 Patch argh misclicked 487932 8 111857 thakis 2011-10-20 15:35:05 -0700 Created attachment 111857 Patch for landing 488013 9 111857 webkit.review.bot 2011-10-20 17:15:36 -0700 Comment on attachment 111857 Patch for landing Clearing flags on attachment: 111857 Committed r98045: <http://trac.webkit.org/changeset/98045> 488014 10 webkit.review.bot 2011-10-20 17:15:42 -0700 All reviewed patches have been landed. Closing bug. 111696 2011-10-19 16:56:42 -0700 2011-10-20 13:51:00 -0700 Patch bug-70455-20111019165640.patch text/plain 5532 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogOTc4OTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ZGVlYzcyYjc3YzEzMDE5YjA3NTc5ZTdjYmQ3YjIzZjhjYzdlNzFjOC4uYWE1Y2YxYjkxMDNlYTA2 ODdkOWI3OTNmMmI1NjBiMGJlMDVmYTQ0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMCBAQAorMjAxMS0xMC0xOSAgTmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgW2Nocm9taXVtL21hY10gQWRkIHN1cHBvcnQgZm9yIGJ1aWxkaW5nIHdp dGggbWFrZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzA0NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBE ZXBlbmRzIG9uIGh0dHA6Ly9jb2RlcmV2aWV3LmNocm9taXVtLm9yZy84MzUyMDI5LworICAgICAg ICBgR1lQX0dFTkVSQVRPUlM9bWFrZSBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQgLS1jaHJv bWl1bWAgd2lsbAorICAgICAgICBjcmVhdGUgYSB0b3BsZXZlbCBNYWtlZmlsZS5jaHJvbWl1bS4K KworICAgICAgICBJZiB0aGF0IGZpbGUgZXhpc3RzIGFuZCBpcyBuZXdlciB0aGFuIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vV2ViS2l0Lnhjb2RlcHJvaiwKKyAgICAgICAgYFRvb2xzL1NjcmlwdHMv YnVpbGQtd2Via2l0IC0tY2hyb21pdW1gIHdpbGwgYnVpbGQgd2l0aCBtYWtlIGluc3RlYWQgb2YK KyAgICAgICAgeGNvZGVidWlsZC4KKworICAgICAgICAqIGd5cF93ZWJraXQ6CisKIDIwMTEtMTAt MTkgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZp ZXdlZCwgcm9sbGluZyBvdXQgcjk3ODUwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9neXBfd2Via2l0IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9neXBfd2Via2l0CmluZGV4 IDkyNTYzOTY3YmQ5ZmYxNGFlNDQzYWMyNDcwZjFmODk3ZjA3OTc2NTIuLjg1YzhlYjcxYjZkY2Yy NGFkNjJjNDNiNmY3ZTA2NmIwYWJkNzZkYWEgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vZ3lwX3dlYmtpdAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQK QEAgLTEwMyw3ICsxMDMsMTAgQEAgaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICBhcmdz LmFwcGVuZCgnLS1uby1jaXJjdWxhci1jaGVjaycpCiAKICAgIyBPbiBsaW51eCwgd2Ugd2FudCBn eXAgdG8gb3V0cHV0IGEgbWFrZWZpbGUgKGRlZmF1bHQgaXMgc2NvbnMpLgotICBpZiBzeXMucGxh dGZvcm0uc3RhcnRzd2l0aCgnbGludXgnKSBvciAnV0VCS0lUX0FORFJPSURfQlVJTEQnIGluIG9z LmVudmlyb246CisgIGlmIChzeXMucGxhdGZvcm0uc3RhcnRzd2l0aCgnbGludXgnKSBvcgorICAg ICAgJ1dFQktJVF9BTkRST0lEX0JVSUxEJyBpbiBvcy5lbnZpcm9uIG9yCisgICAgICAoc3lzLnBs YXRmb3JtID09ICdkYXJ3aW4nIGFuZAorICAgICAgICAgIG9zLmVudmlyb24uZ2V0KCdHWVBfR0VO RVJBVE9SUycsICcnKS5maW5kKCdtYWtlJykgIT0gLTEpKToKICAgICBhcmdzLmV4dGVuZChbJy1m bWFrZScsCiAgICAgICAgICAgICAgICAgICctLXN1ZmZpeD0uY2hyb21pdW0nLAogICAgICAgICAg ICAgICAgICAnLS10b3BsZXZlbC1kaXI9Li4vLi4vLi4nLApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGZkOTlmNGY2NWYyNjQ5YzJhZDAwOTRjNjlk ZGM4NTk3OTQ2NGU4OWYuLmY5NzNlYjk1N2Y5MjRkMTEzNTFjZjZkOTcxNWM3Y2JkMTRlZDUyNWUg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxMS0xMC0xOSAgTmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW2Nocm9taXVtL21hY10gQWRkIHN1cHBvcnQgZm9yIGJ1aWxkaW5nIHdpdGgg bWFrZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA0 NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZXBl bmRzIG9uIGh0dHA6Ly9jb2RlcmV2aWV3LmNocm9taXVtLm9yZy84MzUyMDI5LworICAgICAgICBg R1lQX0dFTkVSQVRPUlM9bWFrZSBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQgLS1jaHJvbWl1 bWAgd2lsbAorICAgICAgICBjcmVhdGUgYSB0b3BsZXZlbCBNYWtlZmlsZS5jaHJvbWl1bS4KKwor ICAgICAgICBJZiB0aGF0IGZpbGUgZXhpc3RzIGFuZCBpcyBuZXdlciB0aGFuIFNvdXJjZS9XZWJL aXQvY2hyb21pdW0vV2ViS2l0Lnhjb2RlcHJvaiwKKyAgICAgICAgYFRvb2xzL1NjcmlwdHMvYnVp bGQtd2Via2l0IC0tY2hyb21pdW1gIHdpbGwgYnVpbGQgd2l0aCBtYWtlIGluc3RlYWQgb2YKKyAg ICAgICAgeGNvZGVidWlsZC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAg ICAgICAgKGRldGVybWluZUJhc2VQcm9kdWN0RGlyKToKKyAgICAgICAgKGlzQ2hyb21pdW1NYWNN YWtlKToKKyAgICAgICAgKGRldGVybWluZUlzQ2hyb21pdW1NYWNNYWtlKToKKyAgICAgICAgKGJ1 aWxkQ2hyb21pdW0pOgorCiAyMDExLTEwLTE5ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9y Zz4KIAogICAgICAgICBuZXctcnVuLXdlYmtpdC10ZXN0cyAtMiB3YXMgY3Jhc2hpbmcgZHVlIHRv IGJvdGggImphdmEiIGFuZCAiamF2YS8iIGJlaW5nIGxpc3RlZCBpbiBTa2lwcGVkIGZpbGVzLgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtCmluZGV4IDI1Yzg1MGJhMGExMDhjMjY1YWEyNDE2ZTc4MDk2NTQ5ODVjYzYw ODEuLjQ4Yzc3NTEwZDY3NGUwNTk5NjI3ODFkYzBmMGFiMzU1OTllZTUyNzEgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0KQEAgLTM1LDYgKzM1LDcgQEAgdXNlIEZpbmRCaW47CiB1c2UgRmlsZTo6QmFzZW5hbWU7 CiB1c2UgRmlsZTo6UGF0aCBxdyhta3BhdGggcm10cmVlKTsKIHVzZSBGaWxlOjpTcGVjOwordXNl IEZpbGU6OnN0YXQ7CiB1c2UgUE9TSVg7CiB1c2UgVkNTVXRpbHM7CiAKQEAgLTg5LDYgKzkwLDcg QEAgbXkgJGlzRWZsOwogbXkgQHd4QXJnczsKIG15ICRpc0Nocm9taXVtOwogbXkgJGlzQ2hyb21p dW1BbmRyb2lkOworbXkgJGlzQ2hyb21pdW1NYWNNYWtlOwogbXkgJGlzSW5zcGVjdG9yRnJvbnRl bmQ7CiBteSAkaXNXSzI7CiAKQEAgLTE2OSw3ICsxNzEsNyBAQCBzdWIgZGV0ZXJtaW5lQmFzZVBy b2R1Y3REaXIKICAgICAgICAgJGJhc2VQcm9kdWN0RGlyID0gJDEgaWYgJGJhc2VQcm9kdWN0RGly ID1+IC9TWU1ST09UXHMqPVxzKlwiKC4qPylcIjsvczsKICAgICAgICAgdW5kZWYgJGJhc2VQcm9k dWN0RGlyIHVubGVzcyAkYmFzZVByb2R1Y3REaXIgPX4gL15cLy87CiAgICAgfSBlbHNpZiAoaXND aHJvbWl1bSgpKSB7Ci0gICAgICAgIGlmIChpc0xpbnV4KCkgfHwgaXNDaHJvbWl1bUFuZHJvaWQo KSkgeworICAgICAgICBpZiAoaXNMaW51eCgpIHx8IGlzQ2hyb21pdW1BbmRyb2lkKCkgfHwgaXND aHJvbWl1bU1hY01ha2UoKSkgewogICAgICAgICAgICAgJGJhc2VQcm9kdWN0RGlyID0gIiRzb3Vy Y2VEaXIvb3V0IjsKICAgICAgICAgfSBlbHNpZiAoaXNEYXJ3aW4oKSkgewogICAgICAgICAgICAg JGJhc2VQcm9kdWN0RGlyID0gIiRzb3VyY2VEaXIvU291cmNlL1dlYktpdC9jaHJvbWl1bS94Y29k ZWJ1aWxkIjsKQEAgLTkwMCw2ICs5MDIsMjggQEAgc3ViIGRldGVybWluZUlzQ2hyb21pdW1BbmRy b2lkKCkKICAgICAkaXNDaHJvbWl1bUFuZHJvaWQgPSBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3Zl RnJvbUFSR1YoIi0tY2hyb21pdW0tYW5kcm9pZCIpOwogfQogCitzdWIgaXNDaHJvbWl1bU1hY01h a2UoKQoreworICAgIGRldGVybWluZUlzQ2hyb21pdW1NYWNNYWtlKCk7CisgICAgcmV0dXJuICRp c0Nocm9taXVtTWFjTWFrZTsKK30KKworc3ViIGRldGVybWluZUlzQ2hyb21pdW1NYWNNYWtlKCkK K3sKKyAgICByZXR1cm4gaWYgZGVmaW5lZCgkaXNDaHJvbWl1bU1hY01ha2UpOworCisgICAgbXkg JGhhc1VwVG9EYXRlTWFrZWZpbGUgPSAwOworICAgIGlmICgtZSAnTWFrZWZpbGUuY2hyb21pdW0n KSB7CisgICAgICB1bmxlc3MgKC1lICdTb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC54Y29k ZXByb2onKSB7CisgICAgICAgICRoYXNVcFRvRGF0ZU1ha2VmaWxlID0gMTsKKyAgICAgIH0gZWxz ZSB7CisgICAgICAgICRoYXNVcFRvRGF0ZU1ha2VmaWxlID0gc3RhdCgnTWFrZWZpbGUuY2hyb21p dW0nKS0+bXRpbWUgPiBzdGF0KCdTb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC54Y29kZXBy b2onKS0+bXRpbWU7CisgICAgICB9CisgICAgfQorICAgICRpc0Nocm9taXVtTWFjTWFrZSA9IGlz RGFyd2luKCkgJiYgJGhhc1VwVG9EYXRlTWFrZWZpbGU7Cit9CisKKwogc3ViIGlzV2luQ2Fpcm8o KQogewogICAgIGRldGVybWluZUlzV2luQ2Fpcm8oKTsKQEAgLTE5NTEsMTMgKzE5NzUsMTMgQEAg c3ViIGJ1aWxkQ2hyb21pdW0oJEApCiAgICAgfQogCiAgICAgbXkgJHJlc3VsdCA9IDE7Ci0gICAg aWYgKGlzRGFyd2luKCkgJiYgIWlzQ2hyb21pdW1BbmRyb2lkKCkpIHsKKyAgICBpZiAoaXNEYXJ3 aW4oKSAmJiAhaXNDaHJvbWl1bUFuZHJvaWQoKSAmJiAhaXNDaHJvbWl1bU1hY01ha2UoKSkgewog ICAgICAgICAjIE1hYyBidWlsZCAtIGJ1aWxkcyB0aGUgcm9vdCB4Y29kZSBwcm9qZWN0LgogICAg ICAgICAkcmVzdWx0ID0gYnVpbGRYQ29kZVByb2plY3QoIlNvdXJjZS9XZWJLaXQvY2hyb21pdW0v V2ViS2l0IiwgJGNsZWFuLCAiLWNvbmZpZ3VyYXRpb24iLCBjb25maWd1cmF0aW9uKCksIEBvcHRp b25zKTsKICAgICB9IGVsc2lmIChpc0N5Z3dpbigpIHx8IGlzV2luZG93cygpKSB7CiAgICAgICAg ICMgV2luZG93cyBidWlsZCAtIGJ1aWxkcyB0aGUgcm9vdCB2aXN1YWwgc3R1ZGlvIHNvbHV0aW9u LgogICAgICAgICAkcmVzdWx0ID0gYnVpbGRDaHJvbWl1bVZpc3VhbFN0dWRpb1Byb2plY3QoIlNv dXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0LnNsbiIsICRjbGVhbik7Ci0gICAgfSBlbHNpZiAo aXNMaW51eCgpIHx8IGlzQ2hyb21pdW1BbmRyb2lkKCkpIHsKKyAgICB9IGVsc2lmIChpc0xpbnV4 KCkgfHwgaXNDaHJvbWl1bUFuZHJvaWQoKSB8fCBpc0Nocm9taXVtTWFjTWFrZSkgewogICAgICAg ICAjIExpbnV4IGJ1aWxkIC0gYnVpbGQgdXNpbmcgbWFrZS4KICAgICAgICAgJHJlc3VsdCA9IGJ1 aWxkQ2hyb21pdW1NYWtlZmlsZSgiYWxsIiwgJGNsZWFuLCBAb3B0aW9ucyk7CiAgICAgfSBlbHNl IHsK 111841 2011-10-20 13:51:08 -0700 2011-10-20 13:53:52 -0700 Patch bug-70455-20111020135107.patch text/plain 7360 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogOTc5NzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NzdlNmVjNmFiYTY5ZDk5MjcyMWVhMzc3MmQ3YzJlODJlMGI5MDI0Yy4uODlkM2M2YzdjYzE4MDAx MDdmMDhjOTU2NGExZmI0OWM5ZmM1ZjY4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOSBAQAorMjAxMS0xMC0yMCAgTmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgW2Nocm9taXVtL21hY10gQWRkIHN1cHBvcnQgZm9yIGJ1aWxkaW5nIHdp dGggbWFrZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzA0NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBE ZXBlbmRzIG9uIGh0dHA6Ly9jb2RlcmV2aWV3LmNocm9taXVtLm9yZy84MzUyMDI5LworICAgICAg ICBgR1lQX0dFTkVSQVRPUlM9bWFrZSBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQgLS1jaHJv bWl1bWAgd2lsbAorICAgICAgICBjcmVhdGUgYSB0b3BsZXZlbCBNYWtlZmlsZS5jaHJvbWl1bS4K KworICAgICAgICBJZiB0aGF0IGZpbGUgZXhpc3RzIGFuZCBpcyBuZXdlciB0aGFuIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vV2ViS2l0Lnhjb2RlcHJvaiwKKyAgICAgICAgYFRvb2xzL1NjcmlwdHMv YnVpbGQtd2Via2l0IC0tY2hyb21pdW1gIHdpbGwgYnVpbGQgd2l0aCBtYWtlIGluc3RlYWQgb2YK KyAgICAgICAgeGNvZGVidWlsZC4KKworICAgICAgICAqIGd5cF93ZWJraXQ6CiAyMDExLTEwLTIw ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIG91dCByOTc5MTcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL2d5cF93ZWJraXQgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQK aW5kZXggM2I3OGYwY2U4MTJmNzIzZTNhYmVkNjQxZWVjZmIxZGJlNmNmMGFjNi4uNWYxMzk4MWNi YTY3YTc4NWQwMWY4MTk2NDliMWI1N2JhOTY4YjZjNyAxMDA3NTUKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9neXBfd2Via2l0CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dl YmtpdApAQCAtMTAzLDcgKzEwMywxMCBAQCBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAg IGFyZ3MuYXBwZW5kKCctLW5vLWNpcmN1bGFyLWNoZWNrJykKIAogICAjIE9uIGxpbnV4LCB3ZSB3 YW50IGd5cCB0byBvdXRwdXQgYSBtYWtlZmlsZSAoZGVmYXVsdCBpcyBzY29ucykuCi0gIGlmIHN5 cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCdsaW51eCcpIG9yICdXRUJLSVRfQU5EUk9JRF9CVUlMRCcg aW4gb3MuZW52aXJvbjoKKyAgaWYgKHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCdsaW51eCcpIG9y CisgICAgICAnV0VCS0lUX0FORFJPSURfQlVJTEQnIGluIG9zLmVudmlyb24gb3IKKyAgICAgIChz eXMucGxhdGZvcm0gPT0gJ2RhcndpbicgYW5kCisgICAgICAgICAgb3MuZW52aXJvbi5nZXQoJ0dZ UF9HRU5FUkFUT1JTJywgJycpLmZpbmQoJ21ha2UnKSAhPSAtMSkpOgogICAgIGFyZ3MuZXh0ZW5k KFsnLWZtYWtlJywKICAgICAgICAgICAgICAgICAgJy0tc3VmZml4PS5jaHJvbWl1bScsCiAgICAg ICAgICAgICAgICAgICctLXRvcGxldmVsLWRpcj0uLi8uLi8uLicsCmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGYzY2Q4ZDdkMWU4MTExMDZmMWNl YWQwNzc5ZGRmMzcyYWM3YmI4Ny4uNDZiZjg1OTkxYzk2ZjNiMjZlMTI5MWQzNzZhMTRjMTAxZjRk ZDMxNyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDI2IEBACisyMDExLTEwLTE5ICBOaWNvIFdlYmVyICA8dGhha2lzQGNocm9taXVt Lm9yZz4KKworICAgICAgICBbY2hyb21pdW0vbWFjXSBBZGQgc3VwcG9ydCBmb3IgYnVpbGRpbmcg d2l0aCBtYWtlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03MDQ1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IERlcGVuZHMgb24gaHR0cDovL2NvZGVyZXZpZXcuY2hyb21pdW0ub3JnLzgzNTIwMjkvCisgICAg ICAgIGBHWVBfR0VORVJBVE9SUz1tYWtlIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdCAtLWNo cm9taXVtYCB3aWxsCisgICAgICAgIGNyZWF0ZSBhIHRvcGxldmVsIE1ha2VmaWxlLmNocm9taXVt LgorCisgICAgICAgIElmIHRoYXQgZmlsZSBleGlzdHMgYW5kIGlzIG5ld2VyIHRoYW4gU291cmNl L1dlYktpdC9jaHJvbWl1bS9XZWJLaXQueGNvZGVwcm9qLAorICAgICAgICBgVG9vbHMvU2NyaXB0 cy9idWlsZC13ZWJraXQgLS1jaHJvbWl1bWAgd2lsbCBidWlsZCB3aXRoIG1ha2UgaW5zdGVhZCBv ZgorICAgICAgICB4Y29kZWJ1aWxkLgorCisgICAgICAgIEFsc28gbGV0IG5yd3QgdXNlIGEgYmlu YXJ5IGZyb20gb3V0LyBpZiBpdCBleGlzdHMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRp cnMucG06CisgICAgICAgIChkZXRlcm1pbmVCYXNlUHJvZHVjdERpcik6CisgICAgICAgIChpc0No cm9taXVtTWFjTWFrZSk6CisgICAgICAgIChkZXRlcm1pbmVJc0Nocm9taXVtTWFjTWFrZSk6Cisg ICAgICAgIChidWlsZENocm9taXVtKToKKwogMjAxMS0xMC0yMCAgTGVhbmRybyBQZXJlaXJhICA8 bGVhbmRyb0Bwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBbRUZMXSBVbnJldmlld2VkLiBCdWls ZCBmaXggYWZ0ZXIgcjk3MDQzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IDBkZDBiNDQ3YmM3OWUzN2U2 N2U1YjM0OTA1YjExZWVhYzIyYTY0ZmUuLmYwZmEyNjI0MWRkYzMzMmI0ZmVmNjBlYTAwOWJjZjkw MWEyNDMzMTMgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTM1LDYgKzM1LDcgQEAgdXNlIEZpbmRCaW47 CiB1c2UgRmlsZTo6QmFzZW5hbWU7CiB1c2UgRmlsZTo6UGF0aCBxdyhta3BhdGggcm10cmVlKTsK IHVzZSBGaWxlOjpTcGVjOwordXNlIEZpbGU6OnN0YXQ7CiB1c2UgUE9TSVg7CiB1c2UgVkNTVXRp bHM7CiAKQEAgLTg5LDYgKzkwLDcgQEAgbXkgJGlzRWZsOwogbXkgQHd4QXJnczsKIG15ICRpc0No cm9taXVtOwogbXkgJGlzQ2hyb21pdW1BbmRyb2lkOworbXkgJGlzQ2hyb21pdW1NYWNNYWtlOwog bXkgJGlzSW5zcGVjdG9yRnJvbnRlbmQ7CiBteSAkaXNXSzI7CiAKQEAgLTE2OSw3ICsxNzEsNyBA QCBzdWIgZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIKICAgICAgICAgJGJhc2VQcm9kdWN0RGlyID0g JDEgaWYgJGJhc2VQcm9kdWN0RGlyID1+IC9TWU1ST09UXHMqPVxzKlwiKC4qPylcIjsvczsKICAg ICAgICAgdW5kZWYgJGJhc2VQcm9kdWN0RGlyIHVubGVzcyAkYmFzZVByb2R1Y3REaXIgPX4gL15c Ly87CiAgICAgfSBlbHNpZiAoaXNDaHJvbWl1bSgpKSB7Ci0gICAgICAgIGlmIChpc0xpbnV4KCkg fHwgaXNDaHJvbWl1bUFuZHJvaWQoKSkgeworICAgICAgICBpZiAoaXNMaW51eCgpIHx8IGlzQ2hy b21pdW1BbmRyb2lkKCkgfHwgaXNDaHJvbWl1bU1hY01ha2UoKSkgewogICAgICAgICAgICAgJGJh c2VQcm9kdWN0RGlyID0gIiRzb3VyY2VEaXIvb3V0IjsKICAgICAgICAgfSBlbHNpZiAoaXNEYXJ3 aW4oKSkgewogICAgICAgICAgICAgJGJhc2VQcm9kdWN0RGlyID0gIiRzb3VyY2VEaXIvU291cmNl L1dlYktpdC9jaHJvbWl1bS94Y29kZWJ1aWxkIjsKQEAgLTI3OSw3ICsyODEsNyBAQCBzdWIgZGV0 ZXJtaW5lTnVtYmVyT2ZDUFVzCiAgICAgICAgICAgICAkbnVtYmVyT2ZDUFVzID0gYGxzIC9wcm9j L3JlZ2lzdHJ5L0hLRVlfTE9DQUxfTUFDSElORS9IQVJEV0FSRS9ERVNDUklQVElPTi9TeXN0ZW0v Q2VudHJhbFByb2Nlc3NvciB8IHdjIC13YDsKICAgICAgICAgfQogICAgIH0gZWxzaWYgKGlzRGFy d2luKCkpIHsKLSAgICAgICAgJG51bWJlck9mQ1BVcyA9IGBzeXNjdGwgLW4gaHcubmNwdWA7Cisg ICAgICAgIGNob21wKCRudW1iZXJPZkNQVXMgPSBgc3lzY3RsIC1uIGh3Lm5jcHVgKTsKICAgICB9 CiB9CiAKQEAgLTkwMCw2ICs5MDIsMjggQEAgc3ViIGRldGVybWluZUlzQ2hyb21pdW1BbmRyb2lk KCkKICAgICAkaXNDaHJvbWl1bUFuZHJvaWQgPSBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJv bUFSR1YoIi0tY2hyb21pdW0tYW5kcm9pZCIpOwogfQogCitzdWIgaXNDaHJvbWl1bU1hY01ha2Uo KQoreworICAgIGRldGVybWluZUlzQ2hyb21pdW1NYWNNYWtlKCk7CisgICAgcmV0dXJuICRpc0No cm9taXVtTWFjTWFrZTsKK30KKworc3ViIGRldGVybWluZUlzQ2hyb21pdW1NYWNNYWtlKCkKK3sK KyAgICByZXR1cm4gaWYgZGVmaW5lZCgkaXNDaHJvbWl1bU1hY01ha2UpOworCisgICAgbXkgJGhh c1VwVG9EYXRlTWFrZWZpbGUgPSAwOworICAgIGlmICgtZSAnTWFrZWZpbGUuY2hyb21pdW0nKSB7 CisgICAgICB1bmxlc3MgKC1lICdTb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC54Y29kZXBy b2onKSB7CisgICAgICAgICRoYXNVcFRvRGF0ZU1ha2VmaWxlID0gMTsKKyAgICAgIH0gZWxzZSB7 CisgICAgICAgICRoYXNVcFRvRGF0ZU1ha2VmaWxlID0gc3RhdCgnTWFrZWZpbGUuY2hyb21pdW0n KS0+bXRpbWUgPiBzdGF0KCdTb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC54Y29kZXByb2on KS0+bXRpbWU7CisgICAgICB9CisgICAgfQorICAgICRpc0Nocm9taXVtTWFjTWFrZSA9IGlzRGFy d2luKCkgJiYgJGhhc1VwVG9EYXRlTWFrZWZpbGU7Cit9CisKKwogc3ViIGlzV2luQ2Fpcm8oKQog ewogICAgIGRldGVybWluZUlzV2luQ2Fpcm8oKTsKQEAgLTE5NTEsMTMgKzE5NzUsMTMgQEAgc3Vi IGJ1aWxkQ2hyb21pdW0oJEApCiAgICAgfQogCiAgICAgbXkgJHJlc3VsdCA9IDE7Ci0gICAgaWYg KGlzRGFyd2luKCkgJiYgIWlzQ2hyb21pdW1BbmRyb2lkKCkpIHsKKyAgICBpZiAoaXNEYXJ3aW4o KSAmJiAhaXNDaHJvbWl1bUFuZHJvaWQoKSAmJiAhaXNDaHJvbWl1bU1hY01ha2UoKSkgewogICAg ICAgICAjIE1hYyBidWlsZCAtIGJ1aWxkcyB0aGUgcm9vdCB4Y29kZSBwcm9qZWN0LgogICAgICAg ICAkcmVzdWx0ID0gYnVpbGRYQ29kZVByb2plY3QoIlNvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2Vi S2l0IiwgJGNsZWFuLCAiLWNvbmZpZ3VyYXRpb24iLCBjb25maWd1cmF0aW9uKCksIEBvcHRpb25z KTsKICAgICB9IGVsc2lmIChpc0N5Z3dpbigpIHx8IGlzV2luZG93cygpKSB7CiAgICAgICAgICMg V2luZG93cyBidWlsZCAtIGJ1aWxkcyB0aGUgcm9vdCB2aXN1YWwgc3R1ZGlvIHNvbHV0aW9uLgog ICAgICAgICAkcmVzdWx0ID0gYnVpbGRDaHJvbWl1bVZpc3VhbFN0dWRpb1Byb2plY3QoIlNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0LnNsbiIsICRjbGVhbik7Ci0gICAgfSBlbHNpZiAoaXNM aW51eCgpIHx8IGlzQ2hyb21pdW1BbmRyb2lkKCkpIHsKKyAgICB9IGVsc2lmIChpc0xpbnV4KCkg fHwgaXNDaHJvbWl1bUFuZHJvaWQoKSB8fCBpc0Nocm9taXVtTWFjTWFrZSkgewogICAgICAgICAj IExpbnV4IGJ1aWxkIC0gYnVpbGQgdXNpbmcgbWFrZS4KICAgICAgICAgJHJlc3VsdCA9IGJ1aWxk Q2hyb21pdW1NYWtlZmlsZSgiYWxsIiwgJGNsZWFuLCBAb3B0aW9ucyk7CiAgICAgfSBlbHNlIHsK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fbWFjLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9tYWMucHkKaW5kZXggMGRkYjg1NTVhNDFiNmUxYmI2ZDFjOWI0NWZhMzliOTkzYjRj NzI3Mi4uMGYyOTBkZTI4YjdhY2IwYTA4YzgyYzQxN2ZjOTkwMGU2OTI4NDMwYSAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV9tYWMucHkKQEAgLTE1OCwxMiArMTU4LDE1IEBAIGNsYXNzIENocm9taXVtTWFjUG9ydChjaHJv bWl1bS5DaHJvbWl1bVBvcnQpOgogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ2J1aWxkX2Rp cmVjdG9yeScpOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxm LmdldF9vcHRpb24oJ2J1aWxkX2RpcmVjdG9yeScpLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAqY29tcHMpCi0KLSAgICAgICAgcGF0aCA9IHNlbGYucGF0aF9mcm9t X2Nocm9taXVtX2Jhc2UoJ3hjb2RlYnVpbGQnLCAqY29tcHMpCi0gICAgICAgIGlmIHNlbGYuX2Zp bGVzeXN0ZW0uZXhpc3RzKHBhdGgpOgotICAgICAgICAgICAgcmV0dXJuIHBhdGgKLSAgICAgICAg cmV0dXJuIHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNlKAotICAgICAgICAgICAgJ1NvdXJjZScs ICdXZWJLaXQnLCAnY2hyb21pdW0nLCAneGNvZGVidWlsZCcsICpjb21wcykKKyAgICAgICAgYmFz ZSA9IHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoKQorICAgICAgICBpZiBzZWxmLl9maWxl c3lzdGVtLmV4aXN0cyhzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcpKToKKyAgICAg ICAgICAgIHJldHVybiBzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcsICpjb21wcykK KyAgICAgICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMoc2VsZi5fZmlsZXN5c3RlbS5qb2lu KGJhc2UsICd4Y29kZWJ1aWxkJywgKmNvbXBzKSk6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5f ZmlsZXN5c3RlbS5qb2luKGJhc2UsICd4Y29kZWJ1aWxkJywgKmNvbXBzKQorICAgICAgICBiYXNl ID0gc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoKQorICAgICAgICBpZiBzZWxmLl9maWxlc3lz dGVtLmV4aXN0cyhzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcpKToKKyAgICAgICAg ICAgIHJldHVybiBzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcsICpjb21wcykKKyAg ICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihiYXNlLCAneGNvZGVidWlsZCcsICpj b21wcykKIAogICAgIGRlZiBjaGVja193ZGlmZihzZWxmLCBsb2dnaW5nPVRydWUpOgogICAgICAg ICB0cnk6Cg== 111843 2011-10-20 13:53:55 -0700 2011-10-20 15:35:02 -0700 Patch bug-70455-20111020135354.patch text/plain 7747 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogOTc5NzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NzdlNmVjNmFiYTY5ZDk5MjcyMWVhMzc3MmQ3YzJlODJlMGI5MDI0Yy4uODlkM2M2YzdjYzE4MDAx MDdmMDhjOTU2NGExZmI0OWM5ZmM1ZjY4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOSBAQAorMjAxMS0xMC0yMCAgTmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgW2Nocm9taXVtL21hY10gQWRkIHN1cHBvcnQgZm9yIGJ1aWxkaW5nIHdp dGggbWFrZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzA0NTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBE ZXBlbmRzIG9uIGh0dHA6Ly9jb2RlcmV2aWV3LmNocm9taXVtLm9yZy84MzUyMDI5LworICAgICAg ICBgR1lQX0dFTkVSQVRPUlM9bWFrZSBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQgLS1jaHJv bWl1bWAgd2lsbAorICAgICAgICBjcmVhdGUgYSB0b3BsZXZlbCBNYWtlZmlsZS5jaHJvbWl1bS4K KworICAgICAgICBJZiB0aGF0IGZpbGUgZXhpc3RzIGFuZCBpcyBuZXdlciB0aGFuIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vV2ViS2l0Lnhjb2RlcHJvaiwKKyAgICAgICAgYFRvb2xzL1NjcmlwdHMv YnVpbGQtd2Via2l0IC0tY2hyb21pdW1gIHdpbGwgYnVpbGQgd2l0aCBtYWtlIGluc3RlYWQgb2YK KyAgICAgICAgeGNvZGVidWlsZC4KKworICAgICAgICAqIGd5cF93ZWJraXQ6CiAyMDExLTEwLTIw ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIG91dCByOTc5MTcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL2d5cF93ZWJraXQgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQK aW5kZXggM2I3OGYwY2U4MTJmNzIzZTNhYmVkNjQxZWVjZmIxZGJlNmNmMGFjNi4uMGM0NjVkYjg5 YzQxOTdjYzAyZjUyZDEwODM5ZWRkYzRjOWQ1ZDM3NSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9neXBfd2Via2l0CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dl YmtpdApAQCAtMTAzLDcgKzEwMywxMCBAQCBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAg IGFyZ3MuYXBwZW5kKCctLW5vLWNpcmN1bGFyLWNoZWNrJykKIAogICAjIE9uIGxpbnV4LCB3ZSB3 YW50IGd5cCB0byBvdXRwdXQgYSBtYWtlZmlsZSAoZGVmYXVsdCBpcyBzY29ucykuCi0gIGlmIHN5 cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCdsaW51eCcpIG9yICdXRUJLSVRfQU5EUk9JRF9CVUlMRCcg aW4gb3MuZW52aXJvbjoKKyAgaWYgKHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCdsaW51eCcpIG9y CisgICAgICAnV0VCS0lUX0FORFJPSURfQlVJTEQnIGluIG9zLmVudmlyb24gb3IKKyAgICAgIChz eXMucGxhdGZvcm0gPT0gJ2RhcndpbicgYW5kCisgICAgICAgICAgb3MuZW52aXJvbi5nZXQoJ0dZ UF9HRU5FUkFUT1JTJywgJycpLmZpbmQoJ21ha2UnKSAhPSAtMSkpOgogICAgIGFyZ3MuZXh0ZW5k KFsnLWZtYWtlJywKICAgICAgICAgICAgICAgICAgJy0tc3VmZml4PS5jaHJvbWl1bScsCiAgICAg ICAgICAgICAgICAgICctLXRvcGxldmVsLWRpcj0uLi8uLi8uLicsCkBAIC0xMTgsNiArMTIxLDcg QEAgaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICAgICAgICAgICAgICctRG1zdnNfdXNl X2NvbW1vbl9yZWxlYXNlPTAnLAogCiAgICAgICAgICAgICAgICAjIFdlYktpdCBkb2Vzbid0IHVz ZSB0aGUgY2hyb21pdW0gc3R5bGUgY2hlY2tlci4KKyAgICAgICAgICAgICAgICctRG1ha2VfY2xh bmdfZGlyPVNvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGhpcmRfcGFydHkvbGx2bS1idWlsZC9SZWxl YXNlK0Fzc2VydHMnLAogICAgICAgICAgICAgICAgJy1EY2xhbmdfdXNlX2Nocm9tZV9wbHVnaW5z PTAnLAogCiAgICAgICAgICAgICAgICAjIGd5cCBoYWNrOiBvdGhlcndpc2UgZ3lwIGFzc3VtZXMg aXRzIGluIGNocm9taXVtJ3Mgc3JjLyBkaXIuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGYzY2Q4ZDdkMWU4MTExMDZmMWNlYWQwNzc5ZGRmMzcy YWM3YmI4Ny4uNDZiZjg1OTkxYzk2ZjNiMjZlMTI5MWQzNzZhMTRjMTAxZjRkZDMxNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDExLTEwLTE5ICBOaWNvIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KKworICAg ICAgICBbY2hyb21pdW0vbWFjXSBBZGQgc3VwcG9ydCBmb3IgYnVpbGRpbmcgd2l0aCBtYWtlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDQ1NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlcGVuZHMgb24g aHR0cDovL2NvZGVyZXZpZXcuY2hyb21pdW0ub3JnLzgzNTIwMjkvCisgICAgICAgIGBHWVBfR0VO RVJBVE9SUz1tYWtlIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdCAtLWNocm9taXVtYCB3aWxs CisgICAgICAgIGNyZWF0ZSBhIHRvcGxldmVsIE1ha2VmaWxlLmNocm9taXVtLgorCisgICAgICAg IElmIHRoYXQgZmlsZSBleGlzdHMgYW5kIGlzIG5ld2VyIHRoYW4gU291cmNlL1dlYktpdC9jaHJv bWl1bS9XZWJLaXQueGNvZGVwcm9qLAorICAgICAgICBgVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJr aXQgLS1jaHJvbWl1bWAgd2lsbCBidWlsZCB3aXRoIG1ha2UgaW5zdGVhZCBvZgorICAgICAgICB4 Y29kZWJ1aWxkLgorCisgICAgICAgIEFsc28gbGV0IG5yd3QgdXNlIGEgYmluYXJ5IGZyb20gb3V0 LyBpZiBpdCBleGlzdHMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAg ICAgIChkZXRlcm1pbmVCYXNlUHJvZHVjdERpcik6CisgICAgICAgIChpc0Nocm9taXVtTWFjTWFr ZSk6CisgICAgICAgIChkZXRlcm1pbmVJc0Nocm9taXVtTWFjTWFrZSk6CisgICAgICAgIChidWls ZENocm9taXVtKToKKwogMjAxMS0xMC0yMCAgTGVhbmRybyBQZXJlaXJhICA8bGVhbmRyb0Bwcm9m dXNpb24ubW9iaT4KIAogICAgICAgICBbRUZMXSBVbnJldmlld2VkLiBCdWlsZCBmaXggYWZ0ZXIg cjk3MDQzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IDBkZDBiNDQ3YmM3OWUzN2U2N2U1YjM0OTA1YjEx ZWVhYzIyYTY0ZmUuLmYwZmEyNjI0MWRkYzMzMmI0ZmVmNjBlYTAwOWJjZjkwMWEyNDMzMTMgMTAw NzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdGRpcnMucG0KQEAgLTM1LDYgKzM1LDcgQEAgdXNlIEZpbmRCaW47CiB1c2UgRmlsZTo6 QmFzZW5hbWU7CiB1c2UgRmlsZTo6UGF0aCBxdyhta3BhdGggcm10cmVlKTsKIHVzZSBGaWxlOjpT cGVjOwordXNlIEZpbGU6OnN0YXQ7CiB1c2UgUE9TSVg7CiB1c2UgVkNTVXRpbHM7CiAKQEAgLTg5 LDYgKzkwLDcgQEAgbXkgJGlzRWZsOwogbXkgQHd4QXJnczsKIG15ICRpc0Nocm9taXVtOwogbXkg JGlzQ2hyb21pdW1BbmRyb2lkOworbXkgJGlzQ2hyb21pdW1NYWNNYWtlOwogbXkgJGlzSW5zcGVj dG9yRnJvbnRlbmQ7CiBteSAkaXNXSzI7CiAKQEAgLTE2OSw3ICsxNzEsNyBAQCBzdWIgZGV0ZXJt aW5lQmFzZVByb2R1Y3REaXIKICAgICAgICAgJGJhc2VQcm9kdWN0RGlyID0gJDEgaWYgJGJhc2VQ cm9kdWN0RGlyID1+IC9TWU1ST09UXHMqPVxzKlwiKC4qPylcIjsvczsKICAgICAgICAgdW5kZWYg JGJhc2VQcm9kdWN0RGlyIHVubGVzcyAkYmFzZVByb2R1Y3REaXIgPX4gL15cLy87CiAgICAgfSBl bHNpZiAoaXNDaHJvbWl1bSgpKSB7Ci0gICAgICAgIGlmIChpc0xpbnV4KCkgfHwgaXNDaHJvbWl1 bUFuZHJvaWQoKSkgeworICAgICAgICBpZiAoaXNMaW51eCgpIHx8IGlzQ2hyb21pdW1BbmRyb2lk KCkgfHwgaXNDaHJvbWl1bU1hY01ha2UoKSkgewogICAgICAgICAgICAgJGJhc2VQcm9kdWN0RGly ID0gIiRzb3VyY2VEaXIvb3V0IjsKICAgICAgICAgfSBlbHNpZiAoaXNEYXJ3aW4oKSkgewogICAg ICAgICAgICAgJGJhc2VQcm9kdWN0RGlyID0gIiRzb3VyY2VEaXIvU291cmNlL1dlYktpdC9jaHJv bWl1bS94Y29kZWJ1aWxkIjsKQEAgLTI3OSw3ICsyODEsNyBAQCBzdWIgZGV0ZXJtaW5lTnVtYmVy T2ZDUFVzCiAgICAgICAgICAgICAkbnVtYmVyT2ZDUFVzID0gYGxzIC9wcm9jL3JlZ2lzdHJ5L0hL RVlfTE9DQUxfTUFDSElORS9IQVJEV0FSRS9ERVNDUklQVElPTi9TeXN0ZW0vQ2VudHJhbFByb2Nl c3NvciB8IHdjIC13YDsKICAgICAgICAgfQogICAgIH0gZWxzaWYgKGlzRGFyd2luKCkpIHsKLSAg ICAgICAgJG51bWJlck9mQ1BVcyA9IGBzeXNjdGwgLW4gaHcubmNwdWA7CisgICAgICAgIGNob21w KCRudW1iZXJPZkNQVXMgPSBgc3lzY3RsIC1uIGh3Lm5jcHVgKTsKICAgICB9CiB9CiAKQEAgLTkw MCw2ICs5MDIsMjggQEAgc3ViIGRldGVybWluZUlzQ2hyb21pdW1BbmRyb2lkKCkKICAgICAkaXND aHJvbWl1bUFuZHJvaWQgPSBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tY2hy b21pdW0tYW5kcm9pZCIpOwogfQogCitzdWIgaXNDaHJvbWl1bU1hY01ha2UoKQoreworICAgIGRl dGVybWluZUlzQ2hyb21pdW1NYWNNYWtlKCk7CisgICAgcmV0dXJuICRpc0Nocm9taXVtTWFjTWFr ZTsKK30KKworc3ViIGRldGVybWluZUlzQ2hyb21pdW1NYWNNYWtlKCkKK3sKKyAgICByZXR1cm4g aWYgZGVmaW5lZCgkaXNDaHJvbWl1bU1hY01ha2UpOworCisgICAgbXkgJGhhc1VwVG9EYXRlTWFr ZWZpbGUgPSAwOworICAgIGlmICgtZSAnTWFrZWZpbGUuY2hyb21pdW0nKSB7CisgICAgICB1bmxl c3MgKC1lICdTb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC54Y29kZXByb2onKSB7CisgICAg ICAgICRoYXNVcFRvRGF0ZU1ha2VmaWxlID0gMTsKKyAgICAgIH0gZWxzZSB7CisgICAgICAgICRo YXNVcFRvRGF0ZU1ha2VmaWxlID0gc3RhdCgnTWFrZWZpbGUuY2hyb21pdW0nKS0+bXRpbWUgPiBz dGF0KCdTb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC54Y29kZXByb2onKS0+bXRpbWU7Cisg ICAgICB9CisgICAgfQorICAgICRpc0Nocm9taXVtTWFjTWFrZSA9IGlzRGFyd2luKCkgJiYgJGhh c1VwVG9EYXRlTWFrZWZpbGU7Cit9CisKKwogc3ViIGlzV2luQ2Fpcm8oKQogewogICAgIGRldGVy bWluZUlzV2luQ2Fpcm8oKTsKQEAgLTE5NTEsMTMgKzE5NzUsMTMgQEAgc3ViIGJ1aWxkQ2hyb21p dW0oJEApCiAgICAgfQogCiAgICAgbXkgJHJlc3VsdCA9IDE7Ci0gICAgaWYgKGlzRGFyd2luKCkg JiYgIWlzQ2hyb21pdW1BbmRyb2lkKCkpIHsKKyAgICBpZiAoaXNEYXJ3aW4oKSAmJiAhaXNDaHJv bWl1bUFuZHJvaWQoKSAmJiAhaXNDaHJvbWl1bU1hY01ha2UoKSkgewogICAgICAgICAjIE1hYyBi dWlsZCAtIGJ1aWxkcyB0aGUgcm9vdCB4Y29kZSBwcm9qZWN0LgogICAgICAgICAkcmVzdWx0ID0g YnVpbGRYQ29kZVByb2plY3QoIlNvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0IiwgJGNsZWFu LCAiLWNvbmZpZ3VyYXRpb24iLCBjb25maWd1cmF0aW9uKCksIEBvcHRpb25zKTsKICAgICB9IGVs c2lmIChpc0N5Z3dpbigpIHx8IGlzV2luZG93cygpKSB7CiAgICAgICAgICMgV2luZG93cyBidWls ZCAtIGJ1aWxkcyB0aGUgcm9vdCB2aXN1YWwgc3R1ZGlvIHNvbHV0aW9uLgogICAgICAgICAkcmVz dWx0ID0gYnVpbGRDaHJvbWl1bVZpc3VhbFN0dWRpb1Byb2plY3QoIlNvdXJjZS9XZWJLaXQvY2hy b21pdW0vV2ViS2l0LnNsbiIsICRjbGVhbik7Ci0gICAgfSBlbHNpZiAoaXNMaW51eCgpIHx8IGlz Q2hyb21pdW1BbmRyb2lkKCkpIHsKKyAgICB9IGVsc2lmIChpc0xpbnV4KCkgfHwgaXNDaHJvbWl1 bUFuZHJvaWQoKSB8fCBpc0Nocm9taXVtTWFjTWFrZSkgewogICAgICAgICAjIExpbnV4IGJ1aWxk IC0gYnVpbGQgdXNpbmcgbWFrZS4KICAgICAgICAgJHJlc3VsdCA9IGJ1aWxkQ2hyb21pdW1NYWtl ZmlsZSgiYWxsIiwgJGNsZWFuLCBAb3B0aW9ucyk7CiAgICAgfSBlbHNlIHsKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMu cHkKaW5kZXggMGRkYjg1NTVhNDFiNmUxYmI2ZDFjOWI0NWZhMzliOTkzYjRjNzI3Mi4uMGYyOTBk ZTI4YjdhY2IwYTA4YzgyYzQxN2ZjOTkwMGU2OTI4NDMwYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKQEAg LTE1OCwxMiArMTU4LDE1IEBAIGNsYXNzIENocm9taXVtTWFjUG9ydChjaHJvbWl1bS5DaHJvbWl1 bVBvcnQpOgogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ2J1aWxkX2RpcmVjdG9yeScpOgog ICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLmdldF9vcHRpb24o J2J1aWxkX2RpcmVjdG9yeScpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAqY29tcHMpCi0KLSAgICAgICAgcGF0aCA9IHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jh c2UoJ3hjb2RlYnVpbGQnLCAqY29tcHMpCi0gICAgICAgIGlmIHNlbGYuX2ZpbGVzeXN0ZW0uZXhp c3RzKHBhdGgpOgotICAgICAgICAgICAgcmV0dXJuIHBhdGgKLSAgICAgICAgcmV0dXJuIHNlbGYu cGF0aF9mcm9tX3dlYmtpdF9iYXNlKAotICAgICAgICAgICAgJ1NvdXJjZScsICdXZWJLaXQnLCAn Y2hyb21pdW0nLCAneGNvZGVidWlsZCcsICpjb21wcykKKyAgICAgICAgYmFzZSA9IHNlbGYucGF0 aF9mcm9tX2Nocm9taXVtX2Jhc2UoKQorICAgICAgICBpZiBzZWxmLl9maWxlc3lzdGVtLmV4aXN0 cyhzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcpKToKKyAgICAgICAgICAgIHJldHVy biBzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcsICpjb21wcykKKyAgICAgICAgaWYg c2VsZi5fZmlsZXN5c3RlbS5leGlzdHMoc2VsZi5fZmlsZXN5c3RlbS5qb2luKGJhc2UsICd4Y29k ZWJ1aWxkJywgKmNvbXBzKSk6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5q b2luKGJhc2UsICd4Y29kZWJ1aWxkJywgKmNvbXBzKQorICAgICAgICBiYXNlID0gc2VsZi5wYXRo X2Zyb21fd2Via2l0X2Jhc2UoKQorICAgICAgICBpZiBzZWxmLl9maWxlc3lzdGVtLmV4aXN0cyhz ZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcpKToKKyAgICAgICAgICAgIHJldHVybiBz ZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcsICpjb21wcykKKyAgICAgICAgcmV0dXJu IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihiYXNlLCAneGNvZGVidWlsZCcsICpjb21wcykKIAogICAg IGRlZiBjaGVja193ZGlmZihzZWxmLCBsb2dnaW5nPVRydWUpOgogICAgICAgICB0cnk6Cg== 111857 2011-10-20 15:35:05 -0700 2011-10-20 17:15:36 -0700 Patch for landing bug-70455-20111020153504.patch text/plain 7753 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogOTc5NzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NzdlNmVjNmFiYTY5ZDk5MjcyMWVhMzc3MmQ3YzJlODJlMGI5MDI0Yy4uNDM4ZDk4YjVmNjZmNDg1 NjI2YmNkNDMxZDcyMDBhMWZkN2ZjNjEwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOSBAQAorMjAxMS0xMC0yMCAgTmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgW2Nocm9taXVtL21hY10gQWRkIHN1cHBvcnQgZm9yIGJ1aWxkaW5nIHdp dGggbWFrZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzA0NTUKKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIERlcGVu ZHMgb24gaHR0cDovL2NvZGVyZXZpZXcuY2hyb21pdW0ub3JnLzgzNTIwMjkvCisgICAgICAgIGBH WVBfR0VORVJBVE9SUz1tYWtlIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdCAtLWNocm9taXVt YCB3aWxsCisgICAgICAgIGNyZWF0ZSBhIHRvcGxldmVsIE1ha2VmaWxlLmNocm9taXVtLgorCisg ICAgICAgIElmIHRoYXQgZmlsZSBleGlzdHMgYW5kIGlzIG5ld2VyIHRoYW4gU291cmNlL1dlYktp dC9jaHJvbWl1bS9XZWJLaXQueGNvZGVwcm9qLAorICAgICAgICBgVG9vbHMvU2NyaXB0cy9idWls ZC13ZWJraXQgLS1jaHJvbWl1bWAgd2lsbCBidWlsZCB3aXRoIG1ha2UgaW5zdGVhZCBvZgorICAg ICAgICB4Y29kZWJ1aWxkLgorCisgICAgICAgICogZ3lwX3dlYmtpdDoKIDIwMTEtMTAtMjAgIFNo ZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJvbGxpbmcgb3V0IHI5NzkxNy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vZ3lwX3dlYmtpdCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdAppbmRl eCAzYjc4ZjBjZTgxMmY3MjNlM2FiZWQ2NDFlZWNmYjFkYmU2Y2YwYWM2Li4wYzQ2NWRiODljNDE5 N2NjMDJmNTJkMTA4MzllZGRjNGM5ZDVkMzc1IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL2d5cF93ZWJraXQKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9neXBfd2Via2l0 CkBAIC0xMDMsNyArMTAzLDEwIEBAIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAgICAgYXJn cy5hcHBlbmQoJy0tbm8tY2lyY3VsYXItY2hlY2snKQogCiAgICMgT24gbGludXgsIHdlIHdhbnQg Z3lwIHRvIG91dHB1dCBhIG1ha2VmaWxlIChkZWZhdWx0IGlzIHNjb25zKS4KLSAgaWYgc3lzLnBs YXRmb3JtLnN0YXJ0c3dpdGgoJ2xpbnV4Jykgb3IgJ1dFQktJVF9BTkRST0lEX0JVSUxEJyBpbiBv cy5lbnZpcm9uOgorICBpZiAoc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2xpbnV4Jykgb3IKKyAg ICAgICdXRUJLSVRfQU5EUk9JRF9CVUlMRCcgaW4gb3MuZW52aXJvbiBvcgorICAgICAgKHN5cy5w bGF0Zm9ybSA9PSAnZGFyd2luJyBhbmQKKyAgICAgICAgICBvcy5lbnZpcm9uLmdldCgnR1lQX0dF TkVSQVRPUlMnLCAnJykuZmluZCgnbWFrZScpICE9IC0xKSk6CiAgICAgYXJncy5leHRlbmQoWyct Zm1ha2UnLAogICAgICAgICAgICAgICAgICAnLS1zdWZmaXg9LmNocm9taXVtJywKICAgICAgICAg ICAgICAgICAgJy0tdG9wbGV2ZWwtZGlyPS4uLy4uLy4uJywKQEAgLTExOCw2ICsxMjEsNyBAQCBp ZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgICAgICAgICAgICAgJy1EbXN2c191c2VfY29t bW9uX3JlbGVhc2U9MCcsCiAKICAgICAgICAgICAgICAgICMgV2ViS2l0IGRvZXNuJ3QgdXNlIHRo ZSBjaHJvbWl1bSBzdHlsZSBjaGVja2VyLgorICAgICAgICAgICAgICAgJy1EbWFrZV9jbGFuZ19k aXI9U291cmNlL1dlYktpdC9jaHJvbWl1bS90aGlyZF9wYXJ0eS9sbHZtLWJ1aWxkL1JlbGVhc2Ur QXNzZXJ0cycsCiAgICAgICAgICAgICAgICAnLURjbGFuZ191c2VfY2hyb21lX3BsdWdpbnM9MCcs CiAKICAgICAgICAgICAgICAgICMgZ3lwIGhhY2s6IG90aGVyd2lzZSBneXAgYXNzdW1lcyBpdHMg aW4gY2hyb21pdW0ncyBzcmMvIGRpci4KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCA0ZjNjZDhkN2QxZTgxMTEwNmYxY2VhZDA3NzlkZGYzNzJhYzdi Yjg3Li5kZTQyN2I4MjdjZjFjYmQxYjk0MjZiMGE4MWNmYzUyOTc2MWUxM2QxIDEwMDY0NAotLS0g YS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAK KzIwMTEtMTAtMTkgIE5pY28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFtjaHJvbWl1bS9tYWNdIEFkZCBzdXBwb3J0IGZvciBidWlsZGluZyB3aXRoIG1ha2UKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwNDU1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBEZXBlbmRzIG9uIGh0dHA6Ly9j b2RlcmV2aWV3LmNocm9taXVtLm9yZy84MzUyMDI5LworICAgICAgICBgR1lQX0dFTkVSQVRPUlM9 bWFrZSBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQgLS1jaHJvbWl1bWAgd2lsbAorICAgICAg ICBjcmVhdGUgYSB0b3BsZXZlbCBNYWtlZmlsZS5jaHJvbWl1bS4KKworICAgICAgICBJZiB0aGF0 IGZpbGUgZXhpc3RzIGFuZCBpcyBuZXdlciB0aGFuIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2Vi S2l0Lnhjb2RlcHJvaiwKKyAgICAgICAgYFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0IC0tY2hy b21pdW1gIHdpbGwgYnVpbGQgd2l0aCBtYWtlIGluc3RlYWQgb2YKKyAgICAgICAgeGNvZGVidWls ZC4KKworICAgICAgICBBbHNvIGxldCBucnd0IHVzZSBhIGJpbmFyeSBmcm9tIG91dC8gaWYgaXQg ZXhpc3RzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoZGV0 ZXJtaW5lQmFzZVByb2R1Y3REaXIpOgorICAgICAgICAoaXNDaHJvbWl1bU1hY01ha2UpOgorICAg ICAgICAoZGV0ZXJtaW5lSXNDaHJvbWl1bU1hY01ha2UpOgorICAgICAgICAoYnVpbGRDaHJvbWl1 bSk6CisKIDIwMTEtMTAtMjAgIExlYW5kcm8gUGVyZWlyYSAgPGxlYW5kcm9AcHJvZnVzaW9uLm1v Ymk+CiAKICAgICAgICAgW0VGTF0gVW5yZXZpZXdlZC4gQnVpbGQgZml4IGFmdGVyIHI5NzA0My4K ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0ZGlycy5wbQppbmRleCAwZGQwYjQ0N2JjNzllMzdlNjdlNWIzNDkwNWIxMWVlYWMyMmE2 NGZlLi5lMDA3YTIzNWE0ZmUzOWY1ZGVlZjk5MzY3MjU5NWI4NjA2Yjk1ODIwIDEwMDc1NQotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRk aXJzLnBtCkBAIC0zNSw2ICszNSw3IEBAIHVzZSBGaW5kQmluOwogdXNlIEZpbGU6OkJhc2VuYW1l OwogdXNlIEZpbGU6OlBhdGggcXcobWtwYXRoIHJtdHJlZSk7CiB1c2UgRmlsZTo6U3BlYzsKK3Vz ZSBGaWxlOjpzdGF0OwogdXNlIFBPU0lYOwogdXNlIFZDU1V0aWxzOwogCkBAIC04OSw2ICs5MCw3 IEBAIG15ICRpc0VmbDsKIG15IEB3eEFyZ3M7CiBteSAkaXNDaHJvbWl1bTsKIG15ICRpc0Nocm9t aXVtQW5kcm9pZDsKK215ICRpc0Nocm9taXVtTWFjTWFrZTsKIG15ICRpc0luc3BlY3RvckZyb250 ZW5kOwogbXkgJGlzV0syOwogCkBAIC0xNjksNyArMTcxLDcgQEAgc3ViIGRldGVybWluZUJhc2VQ cm9kdWN0RGlyCiAgICAgICAgICRiYXNlUHJvZHVjdERpciA9ICQxIGlmICRiYXNlUHJvZHVjdERp ciA9fiAvU1lNUk9PVFxzKj1ccypcIiguKj8pXCI7L3M7CiAgICAgICAgIHVuZGVmICRiYXNlUHJv ZHVjdERpciB1bmxlc3MgJGJhc2VQcm9kdWN0RGlyID1+IC9eXC8vOwogICAgIH0gZWxzaWYgKGlz Q2hyb21pdW0oKSkgewotICAgICAgICBpZiAoaXNMaW51eCgpIHx8IGlzQ2hyb21pdW1BbmRyb2lk KCkpIHsKKyAgICAgICAgaWYgKGlzTGludXgoKSB8fCBpc0Nocm9taXVtQW5kcm9pZCgpIHx8IGlz Q2hyb21pdW1NYWNNYWtlKCkpIHsKICAgICAgICAgICAgICRiYXNlUHJvZHVjdERpciA9ICIkc291 cmNlRGlyL291dCI7CiAgICAgICAgIH0gZWxzaWYgKGlzRGFyd2luKCkpIHsKICAgICAgICAgICAg ICRiYXNlUHJvZHVjdERpciA9ICIkc291cmNlRGlyL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0veGNv ZGVidWlsZCI7CkBAIC0yNzksNyArMjgxLDcgQEAgc3ViIGRldGVybWluZU51bWJlck9mQ1BVcwog ICAgICAgICAgICAgJG51bWJlck9mQ1BVcyA9IGBscyAvcHJvYy9yZWdpc3RyeS9IS0VZX0xPQ0FM X01BQ0hJTkUvSEFSRFdBUkUvREVTQ1JJUFRJT04vU3lzdGVtL0NlbnRyYWxQcm9jZXNzb3IgfCB3 YyAtd2A7CiAgICAgICAgIH0KICAgICB9IGVsc2lmIChpc0RhcndpbigpKSB7Ci0gICAgICAgICRu dW1iZXJPZkNQVXMgPSBgc3lzY3RsIC1uIGh3Lm5jcHVgOworICAgICAgICBjaG9tcCgkbnVtYmVy T2ZDUFVzID0gYHN5c2N0bCAtbiBody5uY3B1YCk7CiAgICAgfQogfQogCkBAIC05MDAsNiArOTAy LDI4IEBAIHN1YiBkZXRlcm1pbmVJc0Nocm9taXVtQW5kcm9pZCgpCiAgICAgJGlzQ2hyb21pdW1B bmRyb2lkID0gY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLWNocm9taXVtLWFu ZHJvaWQiKTsKIH0KIAorc3ViIGlzQ2hyb21pdW1NYWNNYWtlKCkKK3sKKyAgICBkZXRlcm1pbmVJ c0Nocm9taXVtTWFjTWFrZSgpOworICAgIHJldHVybiAkaXNDaHJvbWl1bU1hY01ha2U7Cit9CisK K3N1YiBkZXRlcm1pbmVJc0Nocm9taXVtTWFjTWFrZSgpCit7CisgICAgcmV0dXJuIGlmIGRlZmlu ZWQoJGlzQ2hyb21pdW1NYWNNYWtlKTsKKworICAgIG15ICRoYXNVcFRvRGF0ZU1ha2VmaWxlID0g MDsKKyAgICBpZiAoLWUgJ01ha2VmaWxlLmNocm9taXVtJykgeworICAgICAgICB1bmxlc3MgKC1l ICdTb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC54Y29kZXByb2onKSB7CisgICAgICAgICAg ICAkaGFzVXBUb0RhdGVNYWtlZmlsZSA9IDE7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICAkaGFzVXBUb0RhdGVNYWtlZmlsZSA9IHN0YXQoJ01ha2VmaWxlLmNocm9taXVtJyktPm10aW1l ID4gc3RhdCgnU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQueGNvZGVwcm9qJyktPm10aW1l OworICAgICAgICB9CisgICAgfQorICAgICRpc0Nocm9taXVtTWFjTWFrZSA9IGlzRGFyd2luKCkg JiYgJGhhc1VwVG9EYXRlTWFrZWZpbGU7Cit9CisKKwogc3ViIGlzV2luQ2Fpcm8oKQogewogICAg IGRldGVybWluZUlzV2luQ2Fpcm8oKTsKQEAgLTE5NTEsMTMgKzE5NzUsMTMgQEAgc3ViIGJ1aWxk Q2hyb21pdW0oJEApCiAgICAgfQogCiAgICAgbXkgJHJlc3VsdCA9IDE7Ci0gICAgaWYgKGlzRGFy d2luKCkgJiYgIWlzQ2hyb21pdW1BbmRyb2lkKCkpIHsKKyAgICBpZiAoaXNEYXJ3aW4oKSAmJiAh aXNDaHJvbWl1bUFuZHJvaWQoKSAmJiAhaXNDaHJvbWl1bU1hY01ha2UoKSkgewogICAgICAgICAj IE1hYyBidWlsZCAtIGJ1aWxkcyB0aGUgcm9vdCB4Y29kZSBwcm9qZWN0LgogICAgICAgICAkcmVz dWx0ID0gYnVpbGRYQ29kZVByb2plY3QoIlNvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Iiwg JGNsZWFuLCAiLWNvbmZpZ3VyYXRpb24iLCBjb25maWd1cmF0aW9uKCksIEBvcHRpb25zKTsKICAg ICB9IGVsc2lmIChpc0N5Z3dpbigpIHx8IGlzV2luZG93cygpKSB7CiAgICAgICAgICMgV2luZG93 cyBidWlsZCAtIGJ1aWxkcyB0aGUgcm9vdCB2aXN1YWwgc3R1ZGlvIHNvbHV0aW9uLgogICAgICAg ICAkcmVzdWx0ID0gYnVpbGRDaHJvbWl1bVZpc3VhbFN0dWRpb1Byb2plY3QoIlNvdXJjZS9XZWJL aXQvY2hyb21pdW0vV2ViS2l0LnNsbiIsICRjbGVhbik7Ci0gICAgfSBlbHNpZiAoaXNMaW51eCgp IHx8IGlzQ2hyb21pdW1BbmRyb2lkKCkpIHsKKyAgICB9IGVsc2lmIChpc0xpbnV4KCkgfHwgaXND aHJvbWl1bUFuZHJvaWQoKSB8fCBpc0Nocm9taXVtTWFjTWFrZSkgewogICAgICAgICAjIExpbnV4 IGJ1aWxkIC0gYnVpbGQgdXNpbmcgbWFrZS4KICAgICAgICAgJHJlc3VsdCA9IGJ1aWxkQ2hyb21p dW1NYWtlZmlsZSgiYWxsIiwgJGNsZWFuLCBAb3B0aW9ucyk7CiAgICAgfSBlbHNlIHsKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1f bWFjLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV9tYWMucHkKaW5kZXggMGRkYjg1NTVhNDFiNmUxYmI2ZDFjOWI0NWZhMzliOTkzYjRjNzI3Mi4u MGYyOTBkZTI4YjdhY2IwYTA4YzgyYzQxN2ZjOTkwMGU2OTI4NDMwYSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMu cHkKQEAgLTE1OCwxMiArMTU4LDE1IEBAIGNsYXNzIENocm9taXVtTWFjUG9ydChjaHJvbWl1bS5D aHJvbWl1bVBvcnQpOgogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ2J1aWxkX2RpcmVjdG9y eScpOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLmdldF9v cHRpb24oJ2J1aWxkX2RpcmVjdG9yeScpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAqY29tcHMpCi0KLSAgICAgICAgcGF0aCA9IHNlbGYucGF0aF9mcm9tX2Nocm9t aXVtX2Jhc2UoJ3hjb2RlYnVpbGQnLCAqY29tcHMpCi0gICAgICAgIGlmIHNlbGYuX2ZpbGVzeXN0 ZW0uZXhpc3RzKHBhdGgpOgotICAgICAgICAgICAgcmV0dXJuIHBhdGgKLSAgICAgICAgcmV0dXJu IHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNlKAotICAgICAgICAgICAgJ1NvdXJjZScsICdXZWJL aXQnLCAnY2hyb21pdW0nLCAneGNvZGVidWlsZCcsICpjb21wcykKKyAgICAgICAgYmFzZSA9IHNl bGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoKQorICAgICAgICBpZiBzZWxmLl9maWxlc3lzdGVt LmV4aXN0cyhzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcpKToKKyAgICAgICAgICAg IHJldHVybiBzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcsICpjb21wcykKKyAgICAg ICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMoc2VsZi5fZmlsZXN5c3RlbS5qb2luKGJhc2Us ICd4Y29kZWJ1aWxkJywgKmNvbXBzKSk6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5 c3RlbS5qb2luKGJhc2UsICd4Y29kZWJ1aWxkJywgKmNvbXBzKQorICAgICAgICBiYXNlID0gc2Vs Zi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoKQorICAgICAgICBpZiBzZWxmLl9maWxlc3lzdGVtLmV4 aXN0cyhzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcpKToKKyAgICAgICAgICAgIHJl dHVybiBzZWxmLl9maWxlc3lzdGVtLmpvaW4oYmFzZSwgJ291dCcsICpjb21wcykKKyAgICAgICAg cmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihiYXNlLCAneGNvZGVidWlsZCcsICpjb21wcykK IAogICAgIGRlZiBjaGVja193ZGlmZihzZWxmLCBsb2dnaW5nPVRydWUpOgogICAgICAgICB0cnk6 Cg==