91667 2012-07-18 14:11:46 -0700 Use native (non-cygwin) binaries for perl, gperf, and bison in Chromium 2012-07-24 11:32:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 scottmg scottmg abarth haraken japhet jochen tony webkit.review.bot oldest_to_newest 672731 0 scottmg 2012-07-18 14:11:46 -0700 Use native (non-cygwin) binaries for perl, gperf, and bison in Chromium 672736 1 153084 scottmg 2012-07-18 14:15:16 -0700 Created attachment 153084 Patch 673199 2 153084 haraken 2012-07-18 23:20:29 -0700 Comment on attachment 153084 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=153084&action=review Thanks for the great speed-up. > Source/WebCore/make-hash-tools.pl:35 > my $colorDataGperf = $ARGV[0]; > + my $customGperf = $ARGV[1]; > + shift; > shift; Nit: You can write like this: my $colorDataGperf = shift; my $customGperf = shift; 673547 3 153273 scottmg 2012-07-19 09:00:24 -0700 Created attachment 153273 Patch 673548 4 153273 scottmg 2012-07-19 09:00:48 -0700 Comment on attachment 153273 Patch Done, thanks. 673551 5 153273 haraken 2012-07-19 09:03:20 -0700 Comment on attachment 153273 Patch OK 673603 6 153273 webkit.review.bot 2012-07-19 09:56:47 -0700 Comment on attachment 153273 Patch Clearing flags on attachment: 153273 Committed r123117: <http://trac.webkit.org/changeset/123117> 673604 7 webkit.review.bot 2012-07-19 09:56:52 -0700 All reviewed patches have been landed. Closing bug. 673696 8 tony 2012-07-19 11:07:30 -0700 The Windows build appears to be hanging on the canary bots. I suspect this change, but I'm not sure. I'll try to repro on a local win machine. 673699 9 tony 2012-07-19 11:09:49 -0700 http://build.chromium.org/p/chromium.webkit/waterfall?builder=Webkit+Win+Builder&builder=Webkit+Win+Builder+%28dbg%29&builder=Win+Builder&builder=Win7+Perf&reload=none Something between r123112 and r123118. 673707 10 scottmg 2012-07-19 11:14:28 -0700 (In reply to comment #9) > http://build.chromium.org/p/chromium.webkit/waterfall?builder=Webkit+Win+Builder&builder=Webkit+Win+Builder+%28dbg%29&builder=Win+Builder&builder=Win7+Perf&reload=none > > Something between r123112 and r123118. Must be this, perhaps a missing dependency causing a missing DLL dialog. Could you revert? (I'm not a committer) 673709 11 tony 2012-07-19 11:15:43 -0700 Actually, I'm going to roll out because this breaks build-webkit --chromium. We haven't added perl, bison, or gperf to the Source/WebKit/chromium/DEPS. 673711 12 tony 2012-07-19 11:16:52 -0700 Reverted r123117 for reason: Breaks chromium-win compile. Committed r123124: <http://trac.webkit.org/changeset/123124> 675004 13 153607 scottmg 2012-07-20 15:04:03 -0700 Created attachment 153607 Patch 675022 14 scottmg 2012-07-20 15:32:32 -0700 Added entries to chromium/DEPS. I think they're right, but I haven't been able to get update-webkit/build-webkit to work on my Windows machine (unrelated this patch) so I'm not 100% sure. 675052 15 tony 2012-07-20 16:11:54 -0700 (In reply to comment #14) > Added entries to chromium/DEPS. I think they're right, but I haven't been able to get update-webkit/build-webkit to work on my Windows machine (unrelated this patch) so I'm not 100% sure. Did you make any other changes since the last change? The previous failures I linked too weren't related to the DEPS problem-- they were on the canary bots which use a chromium checkout. 675064 16 scottmg 2012-07-20 16:29:58 -0700 (In reply to comment #15) > (In reply to comment #14) > > Added entries to chromium/DEPS. I think they're right, but I haven't been able to get update-webkit/build-webkit to work on my Windows machine (unrelated this patch) so I'm not 100% sure. > > Did you make any other changes since the last change? The previous failures I linked too weren't related to the DEPS problem-- they were on the canary bots which use a chromium checkout. Oh, shoot, I see. No, I didn't change anything else. I'll try to reproduce that failure. 675068 17 tony 2012-07-20 16:34:00 -0700 I'll go ahead and land the DEPS change for you. It should be safe and maybe make it easier to isolate the failure. 675073 18 tony 2012-07-20 16:40:14 -0700 DEPS change: http://trac.webkit.org/changeset/123274 675108 19 scottmg 2012-07-20 17:22:42 -0700 (In reply to comment #17) > I'll go ahead and land the DEPS change for you. It should be safe and maybe make it easier to isolate the failure. thanks! 676019 20 153864 scottmg 2012-07-23 14:43:19 -0700 Created attachment 153864 Patch 676031 21 153864 tony 2012-07-23 14:52:13 -0700 Comment on attachment 153864 Patch Clearing flags on attachment: 153864 Committed r123387: <http://trac.webkit.org/changeset/123387> 676032 22 tony 2012-07-23 14:52:17 -0700 All reviewed patches have been landed. Closing bug. 676033 23 tony 2012-07-23 14:52:44 -0700 I landed the patch manually so we can watch it on the bots. 676065 24 scottmg 2012-07-23 15:18:27 -0700 (In reply to comment #23) > I landed the patch manually so we can watch it on the bots. Sigh, apparently something else broke. Could I get you to revert yet again? My apologies for all the noise. 676070 25 webkit.review.bot 2012-07-23 15:22:02 -0700 Re-opened since this is blocked by 92036 676074 26 tony 2012-07-23 15:25:01 -0700 (In reply to comment #24) > (In reply to comment #23) > > I landed the patch manually so we can watch it on the bots. > > Sigh, apparently something else broke. Could I get you to revert yet again? My apologies for all the noise. Reverting in https://bugs.webkit.org/show_bug.cgi?id=92036 FWIW, you should be able to run these on the chromium try bots if you're having problems running it locally: http://www.chromium.org/developers/testing/try-server-usage#TOC-My-patch-is-in-WebKit-only 676075 27 tony 2012-07-23 15:26:02 -0700 mid-air collision 677037 28 154108 scottmg 2012-07-24 11:05:56 -0700 Created attachment 154108 Patch 677054 29 154108 tony 2012-07-24 11:23:01 -0700 Comment on attachment 154108 Patch Actually, I want to land by hand. 677055 30 154108 tony 2012-07-24 11:23:55 -0700 Comment on attachment 154108 Patch Clearing flags on attachment: 154108 Committed r123496: <http://trac.webkit.org/changeset/123496> 677056 31 tony 2012-07-24 11:24:00 -0700 All reviewed patches have been landed. Closing bug. 677063 32 scottmg 2012-07-24 11:32:52 -0700 Previous attempts were failing due to IDE exiting silently when building a file with \'s in #line directives. Totally bizarre, see http://build.chromium.org/p/tryserver.chromium/builders/win_layout/builds/630 "SIGKILL failed to kill process" in compile step. Reproduced/debugged locally. Current try here: http://build.chromium.org/p/tryserver.chromium/builders/win_layout/builds/636 which succeeded compile (but will probably fail later on unrelated stuff). 153084 2012-07-18 14:15:16 -0700 2012-07-19 09:00:21 -0700 Patch bug-91667-20120718141515.patch text/plain 9805 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzMDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGM3MDIxYWU0MjBmMTZm YzBiMzFiYjhkYjg5ODQ2M2IxYWE2OTQxNy4uYmFiMmY5MjRmNzFhMjk4YWI1OTExNzBhYmI4Mjhj YjAwNTU5OWE5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA3LTE4ICBTY290 dCBHcmFoYW0gIDxzY290dG1nQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgbmF0aXZlIChu b24tY3lnd2luKSBiaW5hcmllcyBmb3IgcGVybCwgZ3BlcmYsIGFuZCBiaXNvbiBpbiBDaHJvbWl1 bQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTE2NjcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2luZyBu YXRpdmUgdG9vbHMgaW5zdGVhZCBvZiBjeWd3aW4gdmVyc2lvbiBpbXByb3ZlcyBidWlsZCB0aW1l CisgICAgICAgIHBlcmZvcm1hbmNlIGJ5IHJvdWdobHkgNTAlIChvbiB0b3Agb2YgcHJldmlvdXMg Y2wtaW5zdGVhZC1vZi1nY2MKKyAgICAgICAgY2hhbmdlKS4KKworICAgICAgICBObyBuZXcgdGVz dHMuCisKKyAgICAgICAgKiBXZWJDb3JlLmd5cC9XZWJDb3JlLmd5cDoKKyAgICAgICAgKiBXZWJD b3JlLmd5cC9zY3JpcHRzL3J1bGVfYmlzb24ucHk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0 cy9wcmVwcm9jZXNzb3IucG06CisgICAgICAgIChhcHBseVByZXByb2Nlc3Nvcik6CisgICAgICAg ICogbWFrZS1oYXNoLXRvb2xzLnBsOgorCiAyMDEyLTA3LTE4ICBNYXJrIFBpbGdyaW0gIDxwaWxn cmltQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIENhbGwgU1FMaXRlRmlsZVN5 c3RlbS1yZWxhdGVkIGZ1bmN0aW9ucyBkaXJlY3RseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9X ZWJDb3JlLmd5cAppbmRleCA1ZTlhNzVmYWMyZmY1ZmRlNGE1ODFmNWNiNmU3YjYxOTViNzgyZjdi Li45YjY3OGM1NWM1MWI1YWM3NGZkYzk3ZGJlMDMxNzc4MGQzYzk5NTlhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cApAQCAtMjI0LDEwICsyMjQsMjMgQEAKICAgICAgICAg ICAnLi4vcGxhdGZvcm0vdGV4dC93aW4nLAogICAgICAgICAgICcuLi9wbGF0Zm9ybS93aW4nLAog ICAgICAgICBdLAorICAgICAgICAjIFVzaW5nIG5hdGl2ZSBwZXJsIHJhdGhlciB0aGFuIGN5Z3dp biBwZXJsIGN1dHMgZXhlY3V0aW9uIHRpbWUgb2YgaWRsCisgICAgICAgICMgcHJlcHJvY2Vzc2lu ZyBydWxlcyBieSBhIGJpdCBtb3JlIHRoYW4gNTAlLgorICAgICAgICAncGVybF9leGUnOiAnPChE RVBUSCkvdGhpcmRfcGFydHkvcGVybC9wZXJsL2Jpbi9wZXJsLmV4ZScsCisgICAgICAgICdncGVy Zl9leGUnOiAnPChERVBUSCkvdGhpcmRfcGFydHkvZ3BlcmYvYmluL2dwZXJmLmV4ZScsCisgICAg ICAgICdiaXNvbl9leGUnOiAnPChERVBUSCkvdGhpcmRfcGFydHkvYmlzb24vYmluL2Jpc29uLmV4 ZScsCisgICAgICAgICMgVXNpbmcgY2wgaW5zdGVhZCBvZiBjeWd3aW4gZ2NjIGN1dHMgdGhlIHBy b2Nlc3NpbmcgdGltZSBmcm9tCisgICAgICAgICMgMW01OHMgdG8gMG01MnMuCisgICAgICAgICdw cmVwcm9jZXNzb3InOiAnLS1wcmVwcm9jZXNzb3IgImNsLmV4ZSAvbm9sb2dvIC9FUCAvVFAiJywK ICAgICAgIH0sewogICAgICAgICAjIGVuYWJsZSAtV2FsbCBhbmQgLVdlcnJvciwganVzdCBmb3Ig TWFjIGFuZCBMaW51eCBidWlsZHMgZm9yIG5vdwogICAgICAgICAjIEZJWE1FOiBBbHNvIGVuYWJs ZSB0aGlzIGZvciBXaW5kb3dzIGFmdGVyIHZlcmlmeWluZyBubyB3YXJuaW5ncwogICAgICAgICAn Y2hyb21pdW1fY29kZSc6IDEsCisgICAgICAgICdwZXJsX2V4ZSc6ICdwZXJsJywKKyAgICAgICAg J2dwZXJmX2V4ZSc6ICdncGVyZicsCisgICAgICAgICdiaXNvbl9leGUnOiAnYmlzb24nLAorICAg ICAgICAjIFdpdGhvdXQgb25lIHNwZWNpZmllZCwgdGhlIHNjcmlwdHMgZGVmYXVsdCB0byAnZ2Nj Jy4KKyAgICAgICAgJ3ByZXByb2Nlc3Nvcic6ICcnLAogICAgICAgfV0sCiAgICAgICBbJ3VzZV94 MTE9PTEgb3IgT1M9PSJhbmRyb2lkIicsIHsKICAgICAgICAgJ3dlYmNvcmVfaW5jbHVkZV9kaXJz JzogWwpAQCAtNDMzLDggKzQ0Niw5IEBACiAgICAgICAgICAgJ291dHB1dHMnOiBbCiAgICAgICAg ICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L0luamVjdGVkU2NyaXB0U291 cmNlLmgnLAogICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwK ICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3BlcmwnLAorICAgICAgICAgICAg JzwocGVybF9leGUpJywKICAgICAgICAgICAgICcuLi9pbnNwZWN0b3IveHhkLnBsJywKICAgICAg ICAgICAgICdJbmplY3RlZFNjcmlwdFNvdXJjZV9qcycsCiAgICAgICAgICAgICAnPEAoX2lucHV0 cyknLApAQCAtNDU2LDggKzQ3MCw5IEBACiAgICAgICAgICAgJ291dHB1dHMnOiBbCiAgICAgICAg ICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L0luamVjdGVkU2NyaXB0V2Vi R0xNb2R1bGVTb3VyY2UuaCcsCiAgICAgICAgICAgXSwKKyAgICAgICAgICAnbXN2c19jeWd3aW5f c2hlbGwnOiAwLAogICAgICAgICAgICdhY3Rpb24nOiBbCi0gICAgICAgICAgICAncGVybCcsCisg ICAgICAgICAgICAnPChwZXJsX2V4ZSknLAogICAgICAgICAgICAgJy4uL2luc3BlY3Rvci94eGQu cGwnLAogICAgICAgICAgICAgJ0luamVjdGVkU2NyaXB0V2ViR0xNb2R1bGVTb3VyY2VfanMnLAog ICAgICAgICAgICAgJzxAKF9pbnB1dHMpJywKQEAgLTQ3OSw4ICs0OTQsOSBAQAogICAgICAgICAg ICdvdXRwdXRzJzogWwogICAgICAgICAgICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIpL3dl YmtpdC9EZWJ1Z2dlclNjcmlwdFNvdXJjZS5oJywKICAgICAgICAgICBdLAorICAgICAgICAgICdt c3ZzX2N5Z3dpbl9zaGVsbCc6IDAsCiAgICAgICAgICAgJ2FjdGlvbic6IFsKLSAgICAgICAgICAg ICdwZXJsJywKKyAgICAgICAgICAgICc8KHBlcmxfZXhlKScsCiAgICAgICAgICAgICAnLi4vaW5z cGVjdG9yL3h4ZC5wbCcsCiAgICAgICAgICAgICAnRGVidWdnZXJTY3JpcHRTb3VyY2VfanMnLAog ICAgICAgICAgICAgJzxAKF9pbnB1dHMpJywKQEAgLTUxMSwxOSArNTI3LDkgQEAKICAgICAgICAg ICAnb3V0cHV0cyc6IFsKICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS9z dXBwbGVtZW50YWxfZGVwZW5kZW5jeS50bXAnLAogICAgICAgICAgIF0sCi0gICAgICAgICAgJ2Nv bmRpdGlvbnMnOiBbCi0gICAgICAgICAgICBbJ09TPT0id2luIicsIHsKLSAgICAgICAgICAgICAg J3ZhcmlhYmxlcyc6IHsKLSAgICAgICAgICAgICAgICAjIFVzaW5nIGNsIGluc3RlYWQgb2YgY3ln d2luIGdjYyBjdXRzIHRoZSBwcm9jZXNzaW5nIHRpbWUgZnJvbQotICAgICAgICAgICAgICAgICMg MW01OHMgdG8gMG01MnMuCi0gICAgICAgICAgICAgICAgJ3ByZXByb2Nlc3Nvcic6ICctLXByZXBy b2Nlc3NvciAiY2wuZXhlIC9ub2xvZ28gL0VQIC9UUCInLAotICAgICAgICAgICAgICB9LAotICAg ICAgICAgICAgfSwgewotICAgICAgICAgICAgICAndmFyaWFibGVzJzogeyAncHJlcHJvY2Vzc29y JzogJycsIH0KLSAgICAgICAgICAgIH1dLAotICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNf Y3lnd2luX3NoZWxsJzogMCwKICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3Bl cmwnLAorICAgICAgICAgICAgJzwocGVybF9leGUpJywKICAgICAgICAgICAgICctdycsCiAgICAg ICAgICAgICAnLUkuLi9iaW5kaW5ncy9zY3JpcHRzJywKICAgICAgICAgICAgICcuLi9iaW5kaW5n cy9zY3JpcHRzL3ByZXByb2Nlc3MtaWRscy5wbCcsCkBAIC01NzUsOCArNTgxLDkgQEAKICAgICAg ICAgICAnb3V0cHV0cyc6IFsKICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElS KS93ZWJraXQvVjhBcnJheUJ1ZmZlclZpZXdDdXN0b21TY3JpcHQuaCcsCiAgICAgICAgICAgXSwK KyAgICAgICAgICAnbXN2c19jeWd3aW5fc2hlbGwnOiAwLAogICAgICAgICAgICdhY3Rpb24nOiBb Ci0gICAgICAgICAgICAncGVybCcsCisgICAgICAgICAgICAnPChwZXJsX2V4ZSknLAogICAgICAg ICAgICAgJy4uL2luc3BlY3Rvci94eGQucGwnLAogICAgICAgICAgICAgJ1Y4QXJyYXlCdWZmZXJW aWV3Q3VzdG9tU2NyaXB0X2pzJywKICAgICAgICAgICAgICc8QChfaW5wdXRzKScsCkBAIC01OTIs OCArNTk5LDkgQEAKICAgICAgICAgICAnb3V0cHV0cyc6IFsKICAgICAgICAgICAgICc8KFNIQVJF RF9JTlRFUk1FRElBVEVfRElSKS93ZWJraXQvWE1MVmlld2VyQ1NTLmgnLAogICAgICAgICAgIF0s CisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwKICAgICAgICAgICAnYWN0aW9uJzog WwotICAgICAgICAgICAgJ3BlcmwnLAorICAgICAgICAgICAgJzwocGVybF9leGUpJywKICAgICAg ICAgICAgICcuLi9pbnNwZWN0b3IveHhkLnBsJywKICAgICAgICAgICAgICdYTUxWaWV3ZXJfY3Nz JywKICAgICAgICAgICAgICc8QChfaW5wdXRzKScsCkBAIC02MDgsOCArNjE2LDkgQEAKICAgICAg ICAgICAnb3V0cHV0cyc6IFsKICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElS KS93ZWJraXQvWE1MVmlld2VySlMuaCcsCiAgICAgICAgICAgXSwKKyAgICAgICAgICAnbXN2c19j eWd3aW5fc2hlbGwnOiAwLAogICAgICAgICAgICdhY3Rpb24nOiBbCi0gICAgICAgICAgICAncGVy bCcsCisgICAgICAgICAgICAnPChwZXJsX2V4ZSknLAogICAgICAgICAgICAgJy4uL2luc3BlY3Rv ci94eGQucGwnLAogICAgICAgICAgICAgJ1hNTFZpZXdlcl9qcycsCiAgICAgICAgICAgICAnPEAo X2lucHV0cyknLApAQCAtMTAxNyw3ICsxMDI2LDggQEAKICAgICAgICAgICAgICdweXRob24nLAog ICAgICAgICAgICAgJ3NjcmlwdHMvcnVsZV9iaXNvbi5weScsCiAgICAgICAgICAgICAnPChSVUxF X0lOUFVUX1BBVEgpJywKLSAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS93 ZWJraXQnCisgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0JywK KyAgICAgICAgICAgICc8KGJpc29uX2V4ZSknLAogICAgICAgICAgIF0sCiAgICAgICAgIH0sCiAg ICAgICAgIHsKQEAgLTEwMzIsMTEgKzEwNDIsMTMgQEAKICAgICAgICAgICAnaW5wdXRzJzogWwog ICAgICAgICAgICAgJy4uL21ha2UtaGFzaC10b29scy5wbCcsCiAgICAgICAgICAgXSwKKyAgICAg ICAgICAnbXN2c19jeWd3aW5fc2hlbGwnOiAwLAogICAgICAgICAgICdhY3Rpb24nOiBbCi0gICAg ICAgICAgICAncGVybCcsCisgICAgICAgICAgICAnPChwZXJsX2V4ZSknLAogICAgICAgICAgICAg Jy4uL21ha2UtaGFzaC10b29scy5wbCcsCiAgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJ QVRFX0RJUikvd2Via2l0JywKICAgICAgICAgICAgICc8KFJVTEVfSU5QVVRfUEFUSCknLAorICAg ICAgICAgICAgJzwoZ3BlcmZfZXhlKScsCiAgICAgICAgICAgXSwKICAgICAgICAgfSwKICAgICAg ICAgIyBSdWxlIHRvIGJ1aWxkIGdlbmVyYXRlZCBKYXZhU2NyaXB0IChWOCkgYmluZGluZ3MgZnJv bSAuaWRsIHNvdXJjZS4KQEAgLTEwODQsMTMgKzEwOTYsMTQgQEAKICAgICAgICAgICAgICAgJy0t aW5jbHVkZScsICcuLi94bWwnLAogICAgICAgICAgICAgXSwKICAgICAgICAgICB9LAorICAgICAg ICAgICdtc3ZzX2N5Z3dpbl9zaGVsbCc6IDAsCiAgICAgICAgICAgIyBGSVhNRTogIE5vdGUgdGhh dCB3ZSBwdXQgdGhlIC5jcHAgZmlsZXMgaW4gd2ViY29yZS9iaW5kaW5ncwogICAgICAgICAgICMg YnV0IHRoZSAuaCBmaWxlcyBpbiB3ZWJraXQvYmluZGluZ3MuICBUaGlzIGlzIHRvIHdvcmsgYXJv dW5kCiAgICAgICAgICAgIyB0aGUgdW5mb3J0dW5hdGUgZmFjdCB0aGF0IEdZUCBzdHJpcHMgZHVw bGljYXRlIGFyZ3VtZW50cwogICAgICAgICAgICMgZnJvbSBsaXN0cy4gIFdoZW4gd2UgaGF2ZSBh IGJldHRlciBHWVAgd2F5IHRvIHN1cHByZXNzIHRoYXQKICAgICAgICAgICAjIGJlaGF2aW9yLCBj aGFuZ2UgdGhlIG91dHB1dCBsb2NhdGlvbi4KICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAg ICAgICAgJ3BlcmwnLAorICAgICAgICAgICAgJzwocGVybF9leGUpJywKICAgICAgICAgICAgICct dycsCiAgICAgICAgICAgICAnLUkuLi9iaW5kaW5ncy9zY3JpcHRzJywKICAgICAgICAgICAgICcu Li9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsJywKQEAgLTExMDgsNiArMTEy MSw3IEBACiAgICAgICAgICAgICAnLS1hZGRpdGlvbmFsSWRsRmlsZXNMaXN0JywKICAgICAgICAg ICAgICc8KGFkZGl0aW9uYWxfaWRsX2ZpbGVzX2xpc3QpJywKICAgICAgICAgICAgICc8KFJVTEVf SU5QVVRfUEFUSCknLAorICAgICAgICAgICAgJzxAKHByZXByb2Nlc3NvciknLAogICAgICAgICAg IF0sCiAgICAgICAgICAgJ21lc3NhZ2UnOiAnR2VuZXJhdGluZyBiaW5kaW5nIGZyb20gPChSVUxF X0lOUFVUX1BBVEgpJywKICAgICAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZ3lwL3NjcmlwdHMvcnVsZV9iaXNvbi5weSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu Z3lwL3NjcmlwdHMvcnVsZV9iaXNvbi5weQppbmRleCBlYjg1YTRiYTZjNDZjMGI5OTcyNDU2YzBh ZjdiZmE0YTk4ZjRlNjg1Li45NTIxNjVhNjdlODk4ZmIwYWUxZDA3NWIyY2MxMmE0NWUzOGFmNDFm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9zY3JpcHRzL3J1bGVfYmlz b24ucHkKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvc2NyaXB0cy9ydWxlX2Jpc29u LnB5CkBAIC0zMiw3ICszMiw3IEBACiAjIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVy bmVkIGJ5IGEgQlNELXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmUKICMgZm91bmQgaW4gdGhlIExJ Q0VOU0UgZmlsZS4KIAotIyB1c2FnZTogcnVsZV9iaXNvbi5weSBJTlBVVF9GSUxFIE9VVFBVVF9E SVIKKyMgdXNhZ2U6IHJ1bGVfYmlzb24ucHkgSU5QVVRfRklMRSBPVVRQVVRfRElSIFtCSVNPTl9F WEVdCiAjIElOUFVUX0ZJTEUgaXMgYSBwYXRoIHRvIGVpdGhlciBDU1NHcmFtbWFyLnkgb3IgWFBh dGhHcmFtbWFyLnkuCiAjIE9VVFBVVF9ESVIgaXMgd2hlcmUgdGhlIGJpc29uLWdlbmVyYXRlZCAu Y3BwIGFuZCAuaCBmaWxlcyBzaG91bGQgYmUgcGxhY2VkLgogCkBAIC00MiwxMCArNDIsMTMgQEAg aW1wb3J0IG9zLnBhdGgKIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiAKLWFzc2VydCBs ZW4oc3lzLmFyZ3YpID09IDMKK2Fzc2VydCBsZW4oc3lzLmFyZ3YpID09IDMgb3IgbGVuKHN5cy5h cmd2KSA9PSA0CiAKIGlucHV0RmlsZSA9IHN5cy5hcmd2WzFdCiBvdXRwdXREaXIgPSBzeXMuYXJn dlsyXQorYmlzb25FeGUgPSAnYmlzb24nCitpZiBsZW4oc3lzLmFyZ3YpID4gMzoKKyAgICBiaXNv bkV4ZSA9IHN5cy5hcmd2WzNdCiAKIGlucHV0TmFtZSA9IG9zLnBhdGguYmFzZW5hbWUoaW5wdXRG aWxlKQogYXNzZXJ0IGlucHV0TmFtZSA9PSAnQ1NTR3JhbW1hci55JyBvciBpbnB1dE5hbWUgPT0g J1hQYXRoR3JhbW1hci55JwpAQCAtNjksNyArNzIsNyBAQCBmb3Igb3V0cHV0SFRyeSBpbiBvdXRw dXRIVHJpZXM6CiAKIG91dHB1dENwcCA9IG9zLnBhdGguam9pbihvdXRwdXREaXIsIGlucHV0Um9v dCArICcuY3BwJykKIAotcmV0dXJuQ29kZSA9IHN1YnByb2Nlc3MuY2FsbChbJ2Jpc29uJywgJy1k JywgJy1wJywgcHJlZml4LCBpbnB1dEZpbGUsICctbycsIG91dHB1dENwcF0pCityZXR1cm5Db2Rl ID0gc3VicHJvY2Vzcy5jYWxsKFtiaXNvbkV4ZSwgJy1kJywgJy1wJywgcHJlZml4LCBpbnB1dEZp bGUsICctbycsIG91dHB1dENwcF0pCiBhc3NlcnQgcmV0dXJuQ29kZSA9PSAwCiAKICMgRmluZCB0 aGUgbmFtZSB0aGF0IGJpc29uIHVzZWQgZm9yIHRoZSBnZW5lcmF0ZWQgaGVhZGVyIGZpbGUuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5w bSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCmluZGV4 IDNiNGNlYzE5MTliNWU4ZDk4NjBkMDhkODk5M2E3YTU2MDMzMmM3MDcuLjk1OTk1ZjAwYWYwMjdh N2E2ZTBlZGRjMTc0NWU0MDYzY2Q5ZmJkMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCkBAIC02Myw3ICs2Myw3IEBAIHN1YiBhcHBseVBy ZXByb2Nlc3NvcgogICAgIEBtYWNyb3MgPSBtYXAgeyAiLUQkXyIgfSBAbWFjcm9zOwogCiAgICAg bXkgJHBpZCA9IDA7Ci0gICAgaWYgKCRDb25maWd7b3NuYW1lfSBlcSAiY3lnd2luIikgeworICAg IGlmICgkQ29uZmlne29zbmFtZX0gZXEgImN5Z3dpbiIgfHwgJENvbmZpZ3tvc25hbWV9IGVxICdN U1dpbjMyJykgewogICAgICAgICAjIFRoaXMgY2FsbCBjYW4gZmFpbCBpZiBXaW5kb3dzIHJlYmFz ZXMgY3lnd2luLCBzbyByZXRyeSBhIGZldyB0aW1lcyB1bnRpbCBpdCBzdWNjZWVkcy4KICAgICAg ICAgZm9yIChteSAkdHJpZXMgPSAwOyAhJHBpZCAmJiAoJHRyaWVzIDwgMjApOyAkdHJpZXMrKykg ewogICAgICAgICAgICAgZXZhbCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9tYWtlLWhh c2gtdG9vbHMucGwgYi9Tb3VyY2UvV2ViQ29yZS9tYWtlLWhhc2gtdG9vbHMucGwKaW5kZXggZWEz YTBmNTA3MmI1ZWY1YTVlNTdhNmM1NTI5NTA1ZGU0ZGRiM2FkYi4uZmNkMmM2MGYwOGUzMTE5Njc3 M2Q2YzgzOTU4MmMwN2JjN2JlOTMwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbWFrZS1o YXNoLXRvb2xzLnBsCisrKyBiL1NvdXJjZS9XZWJDb3JlL21ha2UtaGFzaC10b29scy5wbApAQCAt MzAsOSArMzAsMTEgQEAgbXkgJG9wdGlvbiA9IGJhc2VuYW1lKCRBUkdWWzBdLCIuZ3BlcmYiKTsK IGlmICgkb3B0aW9uIGVxICJDb2xvckRhdGEiKSB7CiAgICAgbXkgJGNvbG9yRGF0YUdlbmVyYXRl ZCAgICAgICAgID0gIiRvdXRkaXIvQ29sb3JEYXRhLmNwcCI7CiAgICAgbXkgJGNvbG9yRGF0YUdw ZXJmICAgICAgICAgICAgID0gJEFSR1ZbMF07CisgICAgbXkgJGN1c3RvbUdwZXJmICAgICAgICAg ICAgICAgID0gJEFSR1ZbMV07CisgICAgc2hpZnQ7CiAgICAgc2hpZnQ7CiAKLSAgICBteSAkZ3Bl cmYgPSAkRU5We0dQRVJGfSA/ICRFTlZ7R1BFUkZ9IDogImdwZXJmIjsKKyAgICBteSAkZ3BlcmYg PSAkRU5We0dQRVJGfSA/ICRFTlZ7R1BFUkZ9IDogKCRjdXN0b21HcGVyZiA/ICRjdXN0b21HcGVy ZiA6ICJncGVyZiIpOwogICAgIHN5c3RlbSgiXCIkZ3BlcmZcIiAtLWtleS1wb3NpdGlvbnM9XCIq XCIgLUQgLXMgMiAkY29sb3JEYXRhR3BlcmYgLS1vdXRwdXQtZmlsZT0kY29sb3JEYXRhR2VuZXJh dGVkIikgPT0gMCB8fCBkaWUgImNhbGxpbmcgZ3BlcmYgZmFpbGVkOiAkPyI7CiAKIH0gZWxzZSB7 Cg== 153273 2012-07-19 09:00:24 -0700 2012-07-20 15:03:59 -0700 Patch bug-91667-20120719090023.patch text/plain 9838 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzMDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGM3MDIxYWU0MjBmMTZm YzBiMzFiYjhkYjg5ODQ2M2IxYWE2OTQxNy4uYmFiMmY5MjRmNzFhMjk4YWI1OTExNzBhYmI4Mjhj YjAwNTU5OWE5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA3LTE4ICBTY290 dCBHcmFoYW0gIDxzY290dG1nQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgbmF0aXZlIChu b24tY3lnd2luKSBiaW5hcmllcyBmb3IgcGVybCwgZ3BlcmYsIGFuZCBiaXNvbiBpbiBDaHJvbWl1 bQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTE2NjcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2luZyBu YXRpdmUgdG9vbHMgaW5zdGVhZCBvZiBjeWd3aW4gdmVyc2lvbiBpbXByb3ZlcyBidWlsZCB0aW1l CisgICAgICAgIHBlcmZvcm1hbmNlIGJ5IHJvdWdobHkgNTAlIChvbiB0b3Agb2YgcHJldmlvdXMg Y2wtaW5zdGVhZC1vZi1nY2MKKyAgICAgICAgY2hhbmdlKS4KKworICAgICAgICBObyBuZXcgdGVz dHMuCisKKyAgICAgICAgKiBXZWJDb3JlLmd5cC9XZWJDb3JlLmd5cDoKKyAgICAgICAgKiBXZWJD b3JlLmd5cC9zY3JpcHRzL3J1bGVfYmlzb24ucHk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0 cy9wcmVwcm9jZXNzb3IucG06CisgICAgICAgIChhcHBseVByZXByb2Nlc3Nvcik6CisgICAgICAg ICogbWFrZS1oYXNoLXRvb2xzLnBsOgorCiAyMDEyLTA3LTE4ICBNYXJrIFBpbGdyaW0gIDxwaWxn cmltQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIENhbGwgU1FMaXRlRmlsZVN5 c3RlbS1yZWxhdGVkIGZ1bmN0aW9ucyBkaXJlY3RseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9X ZWJDb3JlLmd5cAppbmRleCA1ZTlhNzVmYWMyZmY1ZmRlNGE1ODFmNWNiNmU3YjYxOTViNzgyZjdi Li45YjY3OGM1NWM1MWI1YWM3NGZkYzk3ZGJlMDMxNzc4MGQzYzk5NTlhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cApAQCAtMjI0LDEwICsyMjQsMjMgQEAKICAgICAgICAg ICAnLi4vcGxhdGZvcm0vdGV4dC93aW4nLAogICAgICAgICAgICcuLi9wbGF0Zm9ybS93aW4nLAog ICAgICAgICBdLAorICAgICAgICAjIFVzaW5nIG5hdGl2ZSBwZXJsIHJhdGhlciB0aGFuIGN5Z3dp biBwZXJsIGN1dHMgZXhlY3V0aW9uIHRpbWUgb2YgaWRsCisgICAgICAgICMgcHJlcHJvY2Vzc2lu ZyBydWxlcyBieSBhIGJpdCBtb3JlIHRoYW4gNTAlLgorICAgICAgICAncGVybF9leGUnOiAnPChE RVBUSCkvdGhpcmRfcGFydHkvcGVybC9wZXJsL2Jpbi9wZXJsLmV4ZScsCisgICAgICAgICdncGVy Zl9leGUnOiAnPChERVBUSCkvdGhpcmRfcGFydHkvZ3BlcmYvYmluL2dwZXJmLmV4ZScsCisgICAg ICAgICdiaXNvbl9leGUnOiAnPChERVBUSCkvdGhpcmRfcGFydHkvYmlzb24vYmluL2Jpc29uLmV4 ZScsCisgICAgICAgICMgVXNpbmcgY2wgaW5zdGVhZCBvZiBjeWd3aW4gZ2NjIGN1dHMgdGhlIHBy b2Nlc3NpbmcgdGltZSBmcm9tCisgICAgICAgICMgMW01OHMgdG8gMG01MnMuCisgICAgICAgICdw cmVwcm9jZXNzb3InOiAnLS1wcmVwcm9jZXNzb3IgImNsLmV4ZSAvbm9sb2dvIC9FUCAvVFAiJywK ICAgICAgIH0sewogICAgICAgICAjIGVuYWJsZSAtV2FsbCBhbmQgLVdlcnJvciwganVzdCBmb3Ig TWFjIGFuZCBMaW51eCBidWlsZHMgZm9yIG5vdwogICAgICAgICAjIEZJWE1FOiBBbHNvIGVuYWJs ZSB0aGlzIGZvciBXaW5kb3dzIGFmdGVyIHZlcmlmeWluZyBubyB3YXJuaW5ncwogICAgICAgICAn Y2hyb21pdW1fY29kZSc6IDEsCisgICAgICAgICdwZXJsX2V4ZSc6ICdwZXJsJywKKyAgICAgICAg J2dwZXJmX2V4ZSc6ICdncGVyZicsCisgICAgICAgICdiaXNvbl9leGUnOiAnYmlzb24nLAorICAg ICAgICAjIFdpdGhvdXQgb25lIHNwZWNpZmllZCwgdGhlIHNjcmlwdHMgZGVmYXVsdCB0byAnZ2Nj Jy4KKyAgICAgICAgJ3ByZXByb2Nlc3Nvcic6ICcnLAogICAgICAgfV0sCiAgICAgICBbJ3VzZV94 MTE9PTEgb3IgT1M9PSJhbmRyb2lkIicsIHsKICAgICAgICAgJ3dlYmNvcmVfaW5jbHVkZV9kaXJz JzogWwpAQCAtNDMzLDggKzQ0Niw5IEBACiAgICAgICAgICAgJ291dHB1dHMnOiBbCiAgICAgICAg ICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L0luamVjdGVkU2NyaXB0U291 cmNlLmgnLAogICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwK ICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3BlcmwnLAorICAgICAgICAgICAg JzwocGVybF9leGUpJywKICAgICAgICAgICAgICcuLi9pbnNwZWN0b3IveHhkLnBsJywKICAgICAg ICAgICAgICdJbmplY3RlZFNjcmlwdFNvdXJjZV9qcycsCiAgICAgICAgICAgICAnPEAoX2lucHV0 cyknLApAQCAtNDU2LDggKzQ3MCw5IEBACiAgICAgICAgICAgJ291dHB1dHMnOiBbCiAgICAgICAg ICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L0luamVjdGVkU2NyaXB0V2Vi R0xNb2R1bGVTb3VyY2UuaCcsCiAgICAgICAgICAgXSwKKyAgICAgICAgICAnbXN2c19jeWd3aW5f c2hlbGwnOiAwLAogICAgICAgICAgICdhY3Rpb24nOiBbCi0gICAgICAgICAgICAncGVybCcsCisg ICAgICAgICAgICAnPChwZXJsX2V4ZSknLAogICAgICAgICAgICAgJy4uL2luc3BlY3Rvci94eGQu cGwnLAogICAgICAgICAgICAgJ0luamVjdGVkU2NyaXB0V2ViR0xNb2R1bGVTb3VyY2VfanMnLAog ICAgICAgICAgICAgJzxAKF9pbnB1dHMpJywKQEAgLTQ3OSw4ICs0OTQsOSBAQAogICAgICAgICAg ICdvdXRwdXRzJzogWwogICAgICAgICAgICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIpL3dl YmtpdC9EZWJ1Z2dlclNjcmlwdFNvdXJjZS5oJywKICAgICAgICAgICBdLAorICAgICAgICAgICdt c3ZzX2N5Z3dpbl9zaGVsbCc6IDAsCiAgICAgICAgICAgJ2FjdGlvbic6IFsKLSAgICAgICAgICAg ICdwZXJsJywKKyAgICAgICAgICAgICc8KHBlcmxfZXhlKScsCiAgICAgICAgICAgICAnLi4vaW5z cGVjdG9yL3h4ZC5wbCcsCiAgICAgICAgICAgICAnRGVidWdnZXJTY3JpcHRTb3VyY2VfanMnLAog ICAgICAgICAgICAgJzxAKF9pbnB1dHMpJywKQEAgLTUxMSwxOSArNTI3LDkgQEAKICAgICAgICAg ICAnb3V0cHV0cyc6IFsKICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS9z dXBwbGVtZW50YWxfZGVwZW5kZW5jeS50bXAnLAogICAgICAgICAgIF0sCi0gICAgICAgICAgJ2Nv bmRpdGlvbnMnOiBbCi0gICAgICAgICAgICBbJ09TPT0id2luIicsIHsKLSAgICAgICAgICAgICAg J3ZhcmlhYmxlcyc6IHsKLSAgICAgICAgICAgICAgICAjIFVzaW5nIGNsIGluc3RlYWQgb2YgY3ln d2luIGdjYyBjdXRzIHRoZSBwcm9jZXNzaW5nIHRpbWUgZnJvbQotICAgICAgICAgICAgICAgICMg MW01OHMgdG8gMG01MnMuCi0gICAgICAgICAgICAgICAgJ3ByZXByb2Nlc3Nvcic6ICctLXByZXBy b2Nlc3NvciAiY2wuZXhlIC9ub2xvZ28gL0VQIC9UUCInLAotICAgICAgICAgICAgICB9LAotICAg ICAgICAgICAgfSwgewotICAgICAgICAgICAgICAndmFyaWFibGVzJzogeyAncHJlcHJvY2Vzc29y JzogJycsIH0KLSAgICAgICAgICAgIH1dLAotICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNf Y3lnd2luX3NoZWxsJzogMCwKICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3Bl cmwnLAorICAgICAgICAgICAgJzwocGVybF9leGUpJywKICAgICAgICAgICAgICctdycsCiAgICAg ICAgICAgICAnLUkuLi9iaW5kaW5ncy9zY3JpcHRzJywKICAgICAgICAgICAgICcuLi9iaW5kaW5n cy9zY3JpcHRzL3ByZXByb2Nlc3MtaWRscy5wbCcsCkBAIC01NzUsOCArNTgxLDkgQEAKICAgICAg ICAgICAnb3V0cHV0cyc6IFsKICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElS KS93ZWJraXQvVjhBcnJheUJ1ZmZlclZpZXdDdXN0b21TY3JpcHQuaCcsCiAgICAgICAgICAgXSwK KyAgICAgICAgICAnbXN2c19jeWd3aW5fc2hlbGwnOiAwLAogICAgICAgICAgICdhY3Rpb24nOiBb Ci0gICAgICAgICAgICAncGVybCcsCisgICAgICAgICAgICAnPChwZXJsX2V4ZSknLAogICAgICAg ICAgICAgJy4uL2luc3BlY3Rvci94eGQucGwnLAogICAgICAgICAgICAgJ1Y4QXJyYXlCdWZmZXJW aWV3Q3VzdG9tU2NyaXB0X2pzJywKICAgICAgICAgICAgICc8QChfaW5wdXRzKScsCkBAIC01OTIs OCArNTk5LDkgQEAKICAgICAgICAgICAnb3V0cHV0cyc6IFsKICAgICAgICAgICAgICc8KFNIQVJF RF9JTlRFUk1FRElBVEVfRElSKS93ZWJraXQvWE1MVmlld2VyQ1NTLmgnLAogICAgICAgICAgIF0s CisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwKICAgICAgICAgICAnYWN0aW9uJzog WwotICAgICAgICAgICAgJ3BlcmwnLAorICAgICAgICAgICAgJzwocGVybF9leGUpJywKICAgICAg ICAgICAgICcuLi9pbnNwZWN0b3IveHhkLnBsJywKICAgICAgICAgICAgICdYTUxWaWV3ZXJfY3Nz JywKICAgICAgICAgICAgICc8QChfaW5wdXRzKScsCkBAIC02MDgsOCArNjE2LDkgQEAKICAgICAg ICAgICAnb3V0cHV0cyc6IFsKICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElS KS93ZWJraXQvWE1MVmlld2VySlMuaCcsCiAgICAgICAgICAgXSwKKyAgICAgICAgICAnbXN2c19j eWd3aW5fc2hlbGwnOiAwLAogICAgICAgICAgICdhY3Rpb24nOiBbCi0gICAgICAgICAgICAncGVy bCcsCisgICAgICAgICAgICAnPChwZXJsX2V4ZSknLAogICAgICAgICAgICAgJy4uL2luc3BlY3Rv ci94eGQucGwnLAogICAgICAgICAgICAgJ1hNTFZpZXdlcl9qcycsCiAgICAgICAgICAgICAnPEAo X2lucHV0cyknLApAQCAtMTAxNyw3ICsxMDI2LDggQEAKICAgICAgICAgICAgICdweXRob24nLAog ICAgICAgICAgICAgJ3NjcmlwdHMvcnVsZV9iaXNvbi5weScsCiAgICAgICAgICAgICAnPChSVUxF X0lOUFVUX1BBVEgpJywKLSAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS93 ZWJraXQnCisgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0JywK KyAgICAgICAgICAgICc8KGJpc29uX2V4ZSknLAogICAgICAgICAgIF0sCiAgICAgICAgIH0sCiAg ICAgICAgIHsKQEAgLTEwMzIsMTEgKzEwNDIsMTMgQEAKICAgICAgICAgICAnaW5wdXRzJzogWwog ICAgICAgICAgICAgJy4uL21ha2UtaGFzaC10b29scy5wbCcsCiAgICAgICAgICAgXSwKKyAgICAg ICAgICAnbXN2c19jeWd3aW5fc2hlbGwnOiAwLAogICAgICAgICAgICdhY3Rpb24nOiBbCi0gICAg ICAgICAgICAncGVybCcsCisgICAgICAgICAgICAnPChwZXJsX2V4ZSknLAogICAgICAgICAgICAg Jy4uL21ha2UtaGFzaC10b29scy5wbCcsCiAgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJ QVRFX0RJUikvd2Via2l0JywKICAgICAgICAgICAgICc8KFJVTEVfSU5QVVRfUEFUSCknLAorICAg ICAgICAgICAgJzwoZ3BlcmZfZXhlKScsCiAgICAgICAgICAgXSwKICAgICAgICAgfSwKICAgICAg ICAgIyBSdWxlIHRvIGJ1aWxkIGdlbmVyYXRlZCBKYXZhU2NyaXB0IChWOCkgYmluZGluZ3MgZnJv bSAuaWRsIHNvdXJjZS4KQEAgLTEwODQsMTMgKzEwOTYsMTQgQEAKICAgICAgICAgICAgICAgJy0t aW5jbHVkZScsICcuLi94bWwnLAogICAgICAgICAgICAgXSwKICAgICAgICAgICB9LAorICAgICAg ICAgICdtc3ZzX2N5Z3dpbl9zaGVsbCc6IDAsCiAgICAgICAgICAgIyBGSVhNRTogIE5vdGUgdGhh dCB3ZSBwdXQgdGhlIC5jcHAgZmlsZXMgaW4gd2ViY29yZS9iaW5kaW5ncwogICAgICAgICAgICMg YnV0IHRoZSAuaCBmaWxlcyBpbiB3ZWJraXQvYmluZGluZ3MuICBUaGlzIGlzIHRvIHdvcmsgYXJv dW5kCiAgICAgICAgICAgIyB0aGUgdW5mb3J0dW5hdGUgZmFjdCB0aGF0IEdZUCBzdHJpcHMgZHVw bGljYXRlIGFyZ3VtZW50cwogICAgICAgICAgICMgZnJvbSBsaXN0cy4gIFdoZW4gd2UgaGF2ZSBh IGJldHRlciBHWVAgd2F5IHRvIHN1cHByZXNzIHRoYXQKICAgICAgICAgICAjIGJlaGF2aW9yLCBj aGFuZ2UgdGhlIG91dHB1dCBsb2NhdGlvbi4KICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAg ICAgICAgJ3BlcmwnLAorICAgICAgICAgICAgJzwocGVybF9leGUpJywKICAgICAgICAgICAgICct dycsCiAgICAgICAgICAgICAnLUkuLi9iaW5kaW5ncy9zY3JpcHRzJywKICAgICAgICAgICAgICcu Li9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsJywKQEAgLTExMDgsNiArMTEy MSw3IEBACiAgICAgICAgICAgICAnLS1hZGRpdGlvbmFsSWRsRmlsZXNMaXN0JywKICAgICAgICAg ICAgICc8KGFkZGl0aW9uYWxfaWRsX2ZpbGVzX2xpc3QpJywKICAgICAgICAgICAgICc8KFJVTEVf SU5QVVRfUEFUSCknLAorICAgICAgICAgICAgJzxAKHByZXByb2Nlc3NvciknLAogICAgICAgICAg IF0sCiAgICAgICAgICAgJ21lc3NhZ2UnOiAnR2VuZXJhdGluZyBiaW5kaW5nIGZyb20gPChSVUxF X0lOUFVUX1BBVEgpJywKICAgICAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZ3lwL3NjcmlwdHMvcnVsZV9iaXNvbi5weSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu Z3lwL3NjcmlwdHMvcnVsZV9iaXNvbi5weQppbmRleCBlYjg1YTRiYTZjNDZjMGI5OTcyNDU2YzBh ZjdiZmE0YTk4ZjRlNjg1Li45NTIxNjVhNjdlODk4ZmIwYWUxZDA3NWIyY2MxMmE0NWUzOGFmNDFm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9zY3JpcHRzL3J1bGVfYmlz b24ucHkKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvc2NyaXB0cy9ydWxlX2Jpc29u LnB5CkBAIC0zMiw3ICszMiw3IEBACiAjIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVy bmVkIGJ5IGEgQlNELXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmUKICMgZm91bmQgaW4gdGhlIExJ Q0VOU0UgZmlsZS4KIAotIyB1c2FnZTogcnVsZV9iaXNvbi5weSBJTlBVVF9GSUxFIE9VVFBVVF9E SVIKKyMgdXNhZ2U6IHJ1bGVfYmlzb24ucHkgSU5QVVRfRklMRSBPVVRQVVRfRElSIFtCSVNPTl9F WEVdCiAjIElOUFVUX0ZJTEUgaXMgYSBwYXRoIHRvIGVpdGhlciBDU1NHcmFtbWFyLnkgb3IgWFBh dGhHcmFtbWFyLnkuCiAjIE9VVFBVVF9ESVIgaXMgd2hlcmUgdGhlIGJpc29uLWdlbmVyYXRlZCAu Y3BwIGFuZCAuaCBmaWxlcyBzaG91bGQgYmUgcGxhY2VkLgogCkBAIC00MiwxMCArNDIsMTMgQEAg aW1wb3J0IG9zLnBhdGgKIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiAKLWFzc2VydCBs ZW4oc3lzLmFyZ3YpID09IDMKK2Fzc2VydCBsZW4oc3lzLmFyZ3YpID09IDMgb3IgbGVuKHN5cy5h cmd2KSA9PSA0CiAKIGlucHV0RmlsZSA9IHN5cy5hcmd2WzFdCiBvdXRwdXREaXIgPSBzeXMuYXJn dlsyXQorYmlzb25FeGUgPSAnYmlzb24nCitpZiBsZW4oc3lzLmFyZ3YpID4gMzoKKyAgICBiaXNv bkV4ZSA9IHN5cy5hcmd2WzNdCiAKIGlucHV0TmFtZSA9IG9zLnBhdGguYmFzZW5hbWUoaW5wdXRG aWxlKQogYXNzZXJ0IGlucHV0TmFtZSA9PSAnQ1NTR3JhbW1hci55JyBvciBpbnB1dE5hbWUgPT0g J1hQYXRoR3JhbW1hci55JwpAQCAtNjksNyArNzIsNyBAQCBmb3Igb3V0cHV0SFRyeSBpbiBvdXRw dXRIVHJpZXM6CiAKIG91dHB1dENwcCA9IG9zLnBhdGguam9pbihvdXRwdXREaXIsIGlucHV0Um9v dCArICcuY3BwJykKIAotcmV0dXJuQ29kZSA9IHN1YnByb2Nlc3MuY2FsbChbJ2Jpc29uJywgJy1k JywgJy1wJywgcHJlZml4LCBpbnB1dEZpbGUsICctbycsIG91dHB1dENwcF0pCityZXR1cm5Db2Rl ID0gc3VicHJvY2Vzcy5jYWxsKFtiaXNvbkV4ZSwgJy1kJywgJy1wJywgcHJlZml4LCBpbnB1dEZp bGUsICctbycsIG91dHB1dENwcF0pCiBhc3NlcnQgcmV0dXJuQ29kZSA9PSAwCiAKICMgRmluZCB0 aGUgbmFtZSB0aGF0IGJpc29uIHVzZWQgZm9yIHRoZSBnZW5lcmF0ZWQgaGVhZGVyIGZpbGUuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5w bSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCmluZGV4 IDNiNGNlYzE5MTliNWU4ZDk4NjBkMDhkODk5M2E3YTU2MDMzMmM3MDcuLjk1OTk1ZjAwYWYwMjdh N2E2ZTBlZGRjMTc0NWU0MDYzY2Q5ZmJkMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCkBAIC02Myw3ICs2Myw3IEBAIHN1YiBhcHBseVBy ZXByb2Nlc3NvcgogICAgIEBtYWNyb3MgPSBtYXAgeyAiLUQkXyIgfSBAbWFjcm9zOwogCiAgICAg bXkgJHBpZCA9IDA7Ci0gICAgaWYgKCRDb25maWd7b3NuYW1lfSBlcSAiY3lnd2luIikgeworICAg IGlmICgkQ29uZmlne29zbmFtZX0gZXEgImN5Z3dpbiIgfHwgJENvbmZpZ3tvc25hbWV9IGVxICdN U1dpbjMyJykgewogICAgICAgICAjIFRoaXMgY2FsbCBjYW4gZmFpbCBpZiBXaW5kb3dzIHJlYmFz ZXMgY3lnd2luLCBzbyByZXRyeSBhIGZldyB0aW1lcyB1bnRpbCBpdCBzdWNjZWVkcy4KICAgICAg ICAgZm9yIChteSAkdHJpZXMgPSAwOyAhJHBpZCAmJiAoJHRyaWVzIDwgMjApOyAkdHJpZXMrKykg ewogICAgICAgICAgICAgZXZhbCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9tYWtlLWhh c2gtdG9vbHMucGwgYi9Tb3VyY2UvV2ViQ29yZS9tYWtlLWhhc2gtdG9vbHMucGwKaW5kZXggZWEz YTBmNTA3MmI1ZWY1YTVlNTdhNmM1NTI5NTA1ZGU0ZGRiM2FkYi4uOWQ5NDcwNzZmZmYxMWMyMzBj NTRjZTJiMmRjOTU1ODAwZGM0MDU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbWFrZS1o YXNoLXRvb2xzLnBsCisrKyBiL1NvdXJjZS9XZWJDb3JlL21ha2UtaGFzaC10b29scy5wbApAQCAt MjksMTAgKzI5LDEwIEBAIG15ICRvcHRpb24gPSBiYXNlbmFtZSgkQVJHVlswXSwiLmdwZXJmIik7 CiAKIGlmICgkb3B0aW9uIGVxICJDb2xvckRhdGEiKSB7CiAgICAgbXkgJGNvbG9yRGF0YUdlbmVy YXRlZCAgICAgICAgID0gIiRvdXRkaXIvQ29sb3JEYXRhLmNwcCI7Ci0gICAgbXkgJGNvbG9yRGF0 YUdwZXJmICAgICAgICAgICAgID0gJEFSR1ZbMF07Ci0gICAgc2hpZnQ7CisgICAgbXkgJGNvbG9y RGF0YUdwZXJmICAgICAgICAgICAgID0gc2hpZnQ7CisgICAgbXkgJGN1c3RvbUdwZXJmICAgICAg ICAgICAgICAgID0gc2hpZnQ7CiAKLSAgICBteSAkZ3BlcmYgPSAkRU5We0dQRVJGfSA/ICRFTlZ7 R1BFUkZ9IDogImdwZXJmIjsKKyAgICBteSAkZ3BlcmYgPSAkRU5We0dQRVJGfSA/ICRFTlZ7R1BF UkZ9IDogKCRjdXN0b21HcGVyZiA/ICRjdXN0b21HcGVyZiA6ICJncGVyZiIpOwogICAgIHN5c3Rl bSgiXCIkZ3BlcmZcIiAtLWtleS1wb3NpdGlvbnM9XCIqXCIgLUQgLXMgMiAkY29sb3JEYXRhR3Bl cmYgLS1vdXRwdXQtZmlsZT0kY29sb3JEYXRhR2VuZXJhdGVkIikgPT0gMCB8fCBkaWUgImNhbGxp bmcgZ3BlcmYgZmFpbGVkOiAkPyI7CiAKIH0gZWxzZSB7Cg== 153607 2012-07-20 15:04:03 -0700 2012-07-23 14:43:15 -0700 Patch bug-91667-20120720150359.patch text/plain 11581 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzMTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2MyYzk3OGY3ZmQ3ZmM1 ZmRhZWRkMTcwNDg2M2QyNDAwYWVlNjU2ZC4uZmFiZjE2Yzg2MTkzNjE3Y2NhN2EyZGMzYWU2MWQy NTVjOTJhODdlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA3LTIwICBTY290 dCBHcmFoYW0gIDxzY290dG1nQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgbmF0aXZlIChu b24tY3lnd2luKSBiaW5hcmllcyBmb3IgcGVybCwgZ3BlcmYsIGJpc29uIGluIENocm9taXVtIChy ZXRyeSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkx NjY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNp bmcgbmF0aXZlIHRvb2xzIGluc3RlYWQgb2YgY3lnd2luIHZlcnNpb24gaW1wcm92ZXMgYnVpbGQg dGltZQorICAgICAgICBwZXJmb3JtYW5jZSBieSByb3VnaGx5IDUwJSAob24gdG9wIG9mIHByZXZp b3VzIGNsLWluc3RlYWQtb2YtZ2NjCisgICAgICAgIGNoYW5nZSkuCisKKyAgICAgICAgTm93IGlu Y2x1ZGVzIGFkZGl0aW9uIHRvIGNocm9taXVtL0RFUFMgZm9yIHRoaXJkX3BhcnR5IGRlcGVuZGVu Y2llcy4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBXZWJDb3JlLmd5cC9X ZWJDb3JlLmd5cDoKKyAgICAgICAgKiBXZWJDb3JlLmd5cC9zY3JpcHRzL3J1bGVfYmlzb24ucHk6 CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNzb3IucG06CisgICAgICAgIChh cHBseVByZXByb2Nlc3Nvcik6CisgICAgICAgICogbWFrZS1oYXNoLXRvb2xzLnBsOgorCiAyMDEy LTA3LTE3ICBEbWl0cnkgVGl0b3YgIDxkaW1pY2hAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtD aHJvbWl1bV0gT3V0IG9mIE1lbW9yeSBpcyBvYnNlcnZlZCB3aGVuIGEgbGFyZ2Ugb2JqZWN0IGlz IHBhc3NlZCB0byBhIFdlYiBXb3JrZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDVm ZDZjNmJiYjc5NThmOGU3N2ExYWFmYjQxNjY1MWE5NzNiMzA0MGIuLjY3ODdiNWI5NmEwN2ZmN2I4 NzU5OTY3ZGJjODBhZjc4ZDA0NmI4NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTQgQEAKKzIwMTItMDctMjAgIFNjb3R0IEdyYWhhbSAgPHNjb3R0bWdAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFVzZSBuYXRpdmUgKG5vbi1jeWd3aW4pIGJpbmFyaWVzIGZvciBwZXJs LCBncGVyZiwgYmlzb24gaW4gQ2hyb21pdW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTkxNjY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIHBlcmwsIGdwZXJmLCBhbmQgYmlzb24uCisKKyAgICAgICAg KiBERVBTOgorCiAyMDEyLTA3LTE5ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgW0Nocm9taXVtXSBXZWJWaWV3IGlzIG1pc3NpbmcgaXNTZWxlY3Rpb25FZGl0YWJs ZSBhbmQgYmFja2dyb3VuZENvbG9yIHdoaWNoIGFyZSB1c2VkIGJ5IGNocm9taXVtLWFuZHJvaWQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKaW5kZXggNWU5YTc1ZmFjMmZmNWZk ZTRhNTgxZjVjYjZlN2I2MTk1Yjc4MmY3Yi4uOWI2NzhjNTVjNTFiNWFjNzRmZGM5N2RiZTAzMTc3 ODBkM2M5OTU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29y ZS5neXAKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKQEAgLTIy NCwxMCArMjI0LDIzIEBACiAgICAgICAgICAgJy4uL3BsYXRmb3JtL3RleHQvd2luJywKICAgICAg ICAgICAnLi4vcGxhdGZvcm0vd2luJywKICAgICAgICAgXSwKKyAgICAgICAgIyBVc2luZyBuYXRp dmUgcGVybCByYXRoZXIgdGhhbiBjeWd3aW4gcGVybCBjdXRzIGV4ZWN1dGlvbiB0aW1lIG9mIGlk bAorICAgICAgICAjIHByZXByb2Nlc3NpbmcgcnVsZXMgYnkgYSBiaXQgbW9yZSB0aGFuIDUwJS4K KyAgICAgICAgJ3BlcmxfZXhlJzogJzwoREVQVEgpL3RoaXJkX3BhcnR5L3BlcmwvcGVybC9iaW4v cGVybC5leGUnLAorICAgICAgICAnZ3BlcmZfZXhlJzogJzwoREVQVEgpL3RoaXJkX3BhcnR5L2dw ZXJmL2Jpbi9ncGVyZi5leGUnLAorICAgICAgICAnYmlzb25fZXhlJzogJzwoREVQVEgpL3RoaXJk X3BhcnR5L2Jpc29uL2Jpbi9iaXNvbi5leGUnLAorICAgICAgICAjIFVzaW5nIGNsIGluc3RlYWQg b2YgY3lnd2luIGdjYyBjdXRzIHRoZSBwcm9jZXNzaW5nIHRpbWUgZnJvbQorICAgICAgICAjIDFt NThzIHRvIDBtNTJzLgorICAgICAgICAncHJlcHJvY2Vzc29yJzogJy0tcHJlcHJvY2Vzc29yICJj bC5leGUgL25vbG9nbyAvRVAgL1RQIicsCiAgICAgICB9LHsKICAgICAgICAgIyBlbmFibGUgLVdh bGwgYW5kIC1XZXJyb3IsIGp1c3QgZm9yIE1hYyBhbmQgTGludXggYnVpbGRzIGZvciBub3cKICAg ICAgICAgIyBGSVhNRTogQWxzbyBlbmFibGUgdGhpcyBmb3IgV2luZG93cyBhZnRlciB2ZXJpZnlp bmcgbm8gd2FybmluZ3MKICAgICAgICAgJ2Nocm9taXVtX2NvZGUnOiAxLAorICAgICAgICAncGVy bF9leGUnOiAncGVybCcsCisgICAgICAgICdncGVyZl9leGUnOiAnZ3BlcmYnLAorICAgICAgICAn Ymlzb25fZXhlJzogJ2Jpc29uJywKKyAgICAgICAgIyBXaXRob3V0IG9uZSBzcGVjaWZpZWQsIHRo ZSBzY3JpcHRzIGRlZmF1bHQgdG8gJ2djYycuCisgICAgICAgICdwcmVwcm9jZXNzb3InOiAnJywK ICAgICAgIH1dLAogICAgICAgWyd1c2VfeDExPT0xIG9yIE9TPT0iYW5kcm9pZCInLCB7CiAgICAg ICAgICd3ZWJjb3JlX2luY2x1ZGVfZGlycyc6IFsKQEAgLTQzMyw4ICs0NDYsOSBAQAogICAgICAg ICAgICdvdXRwdXRzJzogWwogICAgICAgICAgICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIp L3dlYmtpdC9JbmplY3RlZFNjcmlwdFNvdXJjZS5oJywKICAgICAgICAgICBdLAorICAgICAgICAg ICdtc3ZzX2N5Z3dpbl9zaGVsbCc6IDAsCiAgICAgICAgICAgJ2FjdGlvbic6IFsKLSAgICAgICAg ICAgICdwZXJsJywKKyAgICAgICAgICAgICc8KHBlcmxfZXhlKScsCiAgICAgICAgICAgICAnLi4v aW5zcGVjdG9yL3h4ZC5wbCcsCiAgICAgICAgICAgICAnSW5qZWN0ZWRTY3JpcHRTb3VyY2VfanMn LAogICAgICAgICAgICAgJzxAKF9pbnB1dHMpJywKQEAgLTQ1Niw4ICs0NzAsOSBAQAogICAgICAg ICAgICdvdXRwdXRzJzogWwogICAgICAgICAgICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIp L3dlYmtpdC9JbmplY3RlZFNjcmlwdFdlYkdMTW9kdWxlU291cmNlLmgnLAogICAgICAgICAgIF0s CisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwKICAgICAgICAgICAnYWN0aW9uJzog WwotICAgICAgICAgICAgJ3BlcmwnLAorICAgICAgICAgICAgJzwocGVybF9leGUpJywKICAgICAg ICAgICAgICcuLi9pbnNwZWN0b3IveHhkLnBsJywKICAgICAgICAgICAgICdJbmplY3RlZFNjcmlw dFdlYkdMTW9kdWxlU291cmNlX2pzJywKICAgICAgICAgICAgICc8QChfaW5wdXRzKScsCkBAIC00 NzksOCArNDk0LDkgQEAKICAgICAgICAgICAnb3V0cHV0cyc6IFsKICAgICAgICAgICAgICc8KFNI QVJFRF9JTlRFUk1FRElBVEVfRElSKS93ZWJraXQvRGVidWdnZXJTY3JpcHRTb3VyY2UuaCcsCiAg ICAgICAgICAgXSwKKyAgICAgICAgICAnbXN2c19jeWd3aW5fc2hlbGwnOiAwLAogICAgICAgICAg ICdhY3Rpb24nOiBbCi0gICAgICAgICAgICAncGVybCcsCisgICAgICAgICAgICAnPChwZXJsX2V4 ZSknLAogICAgICAgICAgICAgJy4uL2luc3BlY3Rvci94eGQucGwnLAogICAgICAgICAgICAgJ0Rl YnVnZ2VyU2NyaXB0U291cmNlX2pzJywKICAgICAgICAgICAgICc8QChfaW5wdXRzKScsCkBAIC01 MTEsMTkgKzUyNyw5IEBACiAgICAgICAgICAgJ291dHB1dHMnOiBbCiAgICAgICAgICAgICAnPChT SEFSRURfSU5URVJNRURJQVRFX0RJUikvc3VwcGxlbWVudGFsX2RlcGVuZGVuY3kudG1wJywKICAg ICAgICAgICBdLAotICAgICAgICAgICdjb25kaXRpb25zJzogWwotICAgICAgICAgICAgWydPUz09 IndpbiInLCB7Ci0gICAgICAgICAgICAgICd2YXJpYWJsZXMnOiB7Ci0gICAgICAgICAgICAgICAg IyBVc2luZyBjbCBpbnN0ZWFkIG9mIGN5Z3dpbiBnY2MgY3V0cyB0aGUgcHJvY2Vzc2luZyB0aW1l IGZyb20KLSAgICAgICAgICAgICAgICAjIDFtNThzIHRvIDBtNTJzLgotICAgICAgICAgICAgICAg ICdwcmVwcm9jZXNzb3InOiAnLS1wcmVwcm9jZXNzb3IgImNsLmV4ZSAvbm9sb2dvIC9FUCAvVFAi JywKLSAgICAgICAgICAgICAgfSwKLSAgICAgICAgICAgIH0sIHsKLSAgICAgICAgICAgICAgJ3Zh cmlhYmxlcyc6IHsgJ3ByZXByb2Nlc3Nvcic6ICcnLCB9Ci0gICAgICAgICAgICB9XSwKLSAgICAg ICAgICBdLAorICAgICAgICAgICdtc3ZzX2N5Z3dpbl9zaGVsbCc6IDAsCiAgICAgICAgICAgJ2Fj dGlvbic6IFsKLSAgICAgICAgICAgICdwZXJsJywKKyAgICAgICAgICAgICc8KHBlcmxfZXhlKScs CiAgICAgICAgICAgICAnLXcnLAogICAgICAgICAgICAgJy1JLi4vYmluZGluZ3Mvc2NyaXB0cycs CiAgICAgICAgICAgICAnLi4vYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNzLWlkbHMucGwnLApA QCAtNTc1LDggKzU4MSw5IEBACiAgICAgICAgICAgJ291dHB1dHMnOiBbCiAgICAgICAgICAgICAn PChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9t U2NyaXB0LmgnLAogICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzog MCwKICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3BlcmwnLAorICAgICAgICAg ICAgJzwocGVybF9leGUpJywKICAgICAgICAgICAgICcuLi9pbnNwZWN0b3IveHhkLnBsJywKICAg ICAgICAgICAgICdWOEFycmF5QnVmZmVyVmlld0N1c3RvbVNjcmlwdF9qcycsCiAgICAgICAgICAg ICAnPEAoX2lucHV0cyknLApAQCAtNTkyLDggKzU5OSw5IEBACiAgICAgICAgICAgJ291dHB1dHMn OiBbCiAgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L1hNTFZp ZXdlckNTUy5oJywKICAgICAgICAgICBdLAorICAgICAgICAgICdtc3ZzX2N5Z3dpbl9zaGVsbCc6 IDAsCiAgICAgICAgICAgJ2FjdGlvbic6IFsKLSAgICAgICAgICAgICdwZXJsJywKKyAgICAgICAg ICAgICc8KHBlcmxfZXhlKScsCiAgICAgICAgICAgICAnLi4vaW5zcGVjdG9yL3h4ZC5wbCcsCiAg ICAgICAgICAgICAnWE1MVmlld2VyX2NzcycsCiAgICAgICAgICAgICAnPEAoX2lucHV0cyknLApA QCAtNjA4LDggKzYxNiw5IEBACiAgICAgICAgICAgJ291dHB1dHMnOiBbCiAgICAgICAgICAgICAn PChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L1hNTFZpZXdlckpTLmgnLAogICAgICAg ICAgIF0sCisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwKICAgICAgICAgICAnYWN0 aW9uJzogWwotICAgICAgICAgICAgJ3BlcmwnLAorICAgICAgICAgICAgJzwocGVybF9leGUpJywK ICAgICAgICAgICAgICcuLi9pbnNwZWN0b3IveHhkLnBsJywKICAgICAgICAgICAgICdYTUxWaWV3 ZXJfanMnLAogICAgICAgICAgICAgJzxAKF9pbnB1dHMpJywKQEAgLTEwMTcsNyArMTAyNiw4IEBA CiAgICAgICAgICAgICAncHl0aG9uJywKICAgICAgICAgICAgICdzY3JpcHRzL3J1bGVfYmlzb24u cHknLAogICAgICAgICAgICAgJzwoUlVMRV9JTlBVVF9QQVRIKScsCi0gICAgICAgICAgICAnPChT SEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0JworICAgICAgICAgICAgJzwoU0hBUkVEX0lO VEVSTUVESUFURV9ESVIpL3dlYmtpdCcsCisgICAgICAgICAgICAnPChiaXNvbl9leGUpJywKICAg ICAgICAgICBdLAogICAgICAgICB9LAogICAgICAgICB7CkBAIC0xMDMyLDExICsxMDQyLDEzIEBA CiAgICAgICAgICAgJ2lucHV0cyc6IFsKICAgICAgICAgICAgICcuLi9tYWtlLWhhc2gtdG9vbHMu cGwnLAogICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwKICAg ICAgICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3BlcmwnLAorICAgICAgICAgICAgJzwo cGVybF9leGUpJywKICAgICAgICAgICAgICcuLi9tYWtlLWhhc2gtdG9vbHMucGwnLAogICAgICAg ICAgICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIpL3dlYmtpdCcsCiAgICAgICAgICAgICAn PChSVUxFX0lOUFVUX1BBVEgpJywKKyAgICAgICAgICAgICc8KGdwZXJmX2V4ZSknLAogICAgICAg ICAgIF0sCiAgICAgICAgIH0sCiAgICAgICAgICMgUnVsZSB0byBidWlsZCBnZW5lcmF0ZWQgSmF2 YVNjcmlwdCAoVjgpIGJpbmRpbmdzIGZyb20gLmlkbCBzb3VyY2UuCkBAIC0xMDg0LDEzICsxMDk2 LDE0IEBACiAgICAgICAgICAgICAgICctLWluY2x1ZGUnLCAnLi4veG1sJywKICAgICAgICAgICAg IF0sCiAgICAgICAgICAgfSwKKyAgICAgICAgICAnbXN2c19jeWd3aW5fc2hlbGwnOiAwLAogICAg ICAgICAgICMgRklYTUU6ICBOb3RlIHRoYXQgd2UgcHV0IHRoZSAuY3BwIGZpbGVzIGluIHdlYmNv cmUvYmluZGluZ3MKICAgICAgICAgICAjIGJ1dCB0aGUgLmggZmlsZXMgaW4gd2Via2l0L2JpbmRp bmdzLiAgVGhpcyBpcyB0byB3b3JrIGFyb3VuZAogICAgICAgICAgICMgdGhlIHVuZm9ydHVuYXRl IGZhY3QgdGhhdCBHWVAgc3RyaXBzIGR1cGxpY2F0ZSBhcmd1bWVudHMKICAgICAgICAgICAjIGZy b20gbGlzdHMuICBXaGVuIHdlIGhhdmUgYSBiZXR0ZXIgR1lQIHdheSB0byBzdXBwcmVzcyB0aGF0 CiAgICAgICAgICAgIyBiZWhhdmlvciwgY2hhbmdlIHRoZSBvdXRwdXQgbG9jYXRpb24uCiAgICAg ICAgICAgJ2FjdGlvbic6IFsKLSAgICAgICAgICAgICdwZXJsJywKKyAgICAgICAgICAgICc8KHBl cmxfZXhlKScsCiAgICAgICAgICAgICAnLXcnLAogICAgICAgICAgICAgJy1JLi4vYmluZGluZ3Mv c2NyaXB0cycsCiAgICAgICAgICAgICAnLi4vYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1iaW5k aW5ncy5wbCcsCkBAIC0xMTA4LDYgKzExMjEsNyBAQAogICAgICAgICAgICAgJy0tYWRkaXRpb25h bElkbEZpbGVzTGlzdCcsCiAgICAgICAgICAgICAnPChhZGRpdGlvbmFsX2lkbF9maWxlc19saXN0 KScsCiAgICAgICAgICAgICAnPChSVUxFX0lOUFVUX1BBVEgpJywKKyAgICAgICAgICAgICc8QChw cmVwcm9jZXNzb3IpJywKICAgICAgICAgICBdLAogICAgICAgICAgICdtZXNzYWdlJzogJ0dlbmVy YXRpbmcgYmluZGluZyBmcm9tIDwoUlVMRV9JTlBVVF9QQVRIKScsCiAgICAgICAgIH0sCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9zY3JpcHRzL3J1bGVfYmlzb24ucHkg Yi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9zY3JpcHRzL3J1bGVfYmlzb24ucHkKaW5kZXgg ZWI4NWE0YmE2YzQ2YzBiOTk3MjQ1NmMwYWY3YmZhNGE5OGY0ZTY4NS4uOTUyMTY1YTY3ZTg5OGZi MGFlMWQwNzViMmNjMTJhNDVlMzhhZjQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS5neXAvc2NyaXB0cy9ydWxlX2Jpc29uLnB5CisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZ3lwL3NjcmlwdHMvcnVsZV9iaXNvbi5weQpAQCAtMzIsNyArMzIsNyBAQAogIyBVc2Ugb2Yg dGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhIEJTRC1zdHlsZSBsaWNlbnNlIHRoYXQg Y2FuIGJlCiAjIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUuCiAKLSMgdXNhZ2U6IHJ1bGVfYmlz b24ucHkgSU5QVVRfRklMRSBPVVRQVVRfRElSCisjIHVzYWdlOiBydWxlX2Jpc29uLnB5IElOUFVU X0ZJTEUgT1VUUFVUX0RJUiBbQklTT05fRVhFXQogIyBJTlBVVF9GSUxFIGlzIGEgcGF0aCB0byBl aXRoZXIgQ1NTR3JhbW1hci55IG9yIFhQYXRoR3JhbW1hci55LgogIyBPVVRQVVRfRElSIGlzIHdo ZXJlIHRoZSBiaXNvbi1nZW5lcmF0ZWQgLmNwcCBhbmQgLmggZmlsZXMgc2hvdWxkIGJlIHBsYWNl ZC4KIApAQCAtNDIsMTAgKzQyLDEzIEBAIGltcG9ydCBvcy5wYXRoCiBpbXBvcnQgc3VicHJvY2Vz cwogaW1wb3J0IHN5cwogCi1hc3NlcnQgbGVuKHN5cy5hcmd2KSA9PSAzCithc3NlcnQgbGVuKHN5 cy5hcmd2KSA9PSAzIG9yIGxlbihzeXMuYXJndikgPT0gNAogCiBpbnB1dEZpbGUgPSBzeXMuYXJn dlsxXQogb3V0cHV0RGlyID0gc3lzLmFyZ3ZbMl0KK2Jpc29uRXhlID0gJ2Jpc29uJworaWYgbGVu KHN5cy5hcmd2KSA+IDM6CisgICAgYmlzb25FeGUgPSBzeXMuYXJndlszXQogCiBpbnB1dE5hbWUg PSBvcy5wYXRoLmJhc2VuYW1lKGlucHV0RmlsZSkKIGFzc2VydCBpbnB1dE5hbWUgPT0gJ0NTU0dy YW1tYXIueScgb3IgaW5wdXROYW1lID09ICdYUGF0aEdyYW1tYXIueScKQEAgLTY5LDcgKzcyLDcg QEAgZm9yIG91dHB1dEhUcnkgaW4gb3V0cHV0SFRyaWVzOgogCiBvdXRwdXRDcHAgPSBvcy5wYXRo LmpvaW4ob3V0cHV0RGlyLCBpbnB1dFJvb3QgKyAnLmNwcCcpCiAKLXJldHVybkNvZGUgPSBzdWJw cm9jZXNzLmNhbGwoWydiaXNvbicsICctZCcsICctcCcsIHByZWZpeCwgaW5wdXRGaWxlLCAnLW8n LCBvdXRwdXRDcHBdKQorcmV0dXJuQ29kZSA9IHN1YnByb2Nlc3MuY2FsbChbYmlzb25FeGUsICct ZCcsICctcCcsIHByZWZpeCwgaW5wdXRGaWxlLCAnLW8nLCBvdXRwdXRDcHBdKQogYXNzZXJ0IHJl dHVybkNvZGUgPT0gMAogCiAjIEZpbmQgdGhlIG5hbWUgdGhhdCBiaXNvbiB1c2VkIGZvciB0aGUg Z2VuZXJhdGVkIGhlYWRlciBmaWxlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9wcmVwcm9jZXNzb3IucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL3ByZXByb2Nlc3Nvci5wbQppbmRleCAzYjRjZWMxOTE5YjVlOGQ5ODYwZDA4ZDg5OTNhN2E1 NjAzMzJjNzA3Li45NTk5NWYwMGFmMDI3YTdhNmUwZWRkYzE3NDVlNDA2M2NkOWZiZDBiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbQpAQCAt NjMsNyArNjMsNyBAQCBzdWIgYXBwbHlQcmVwcm9jZXNzb3IKICAgICBAbWFjcm9zID0gbWFwIHsg Ii1EJF8iIH0gQG1hY3JvczsKIAogICAgIG15ICRwaWQgPSAwOwotICAgIGlmICgkQ29uZmlne29z bmFtZX0gZXEgImN5Z3dpbiIpIHsKKyAgICBpZiAoJENvbmZpZ3tvc25hbWV9IGVxICJjeWd3aW4i IHx8ICRDb25maWd7b3NuYW1lfSBlcSAnTVNXaW4zMicpIHsKICAgICAgICAgIyBUaGlzIGNhbGwg Y2FuIGZhaWwgaWYgV2luZG93cyByZWJhc2VzIGN5Z3dpbiwgc28gcmV0cnkgYSBmZXcgdGltZXMg dW50aWwgaXQgc3VjY2VlZHMuCiAgICAgICAgIGZvciAobXkgJHRyaWVzID0gMDsgISRwaWQgJiYg KCR0cmllcyA8IDIwKTsgJHRyaWVzKyspIHsKICAgICAgICAgICAgIGV2YWwgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbWFrZS1oYXNoLXRvb2xzLnBsIGIvU291cmNlL1dlYkNvcmUvbWFr ZS1oYXNoLXRvb2xzLnBsCmluZGV4IGVhM2EwZjUwNzJiNWVmNWE1ZTU3YTZjNTUyOTUwNWRlNGRk YjNhZGIuLjlkOTQ3MDc2ZmZmMTFjMjMwYzU0Y2UyYjJkYzk1NTgwMGRjNDA1NmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL21ha2UtaGFzaC10b29scy5wbAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9tYWtlLWhhc2gtdG9vbHMucGwKQEAgLTI5LDEwICsyOSwxMCBAQCBteSAkb3B0aW9uID0gYmFz ZW5hbWUoJEFSR1ZbMF0sIi5ncGVyZiIpOwogCiBpZiAoJG9wdGlvbiBlcSAiQ29sb3JEYXRhIikg ewogICAgIG15ICRjb2xvckRhdGFHZW5lcmF0ZWQgICAgICAgICA9ICIkb3V0ZGlyL0NvbG9yRGF0 YS5jcHAiOwotICAgIG15ICRjb2xvckRhdGFHcGVyZiAgICAgICAgICAgICA9ICRBUkdWWzBdOwot ICAgIHNoaWZ0OworICAgIG15ICRjb2xvckRhdGFHcGVyZiAgICAgICAgICAgICA9IHNoaWZ0Owor ICAgIG15ICRjdXN0b21HcGVyZiAgICAgICAgICAgICAgICA9IHNoaWZ0OwogCi0gICAgbXkgJGdw ZXJmID0gJEVOVntHUEVSRn0gPyAkRU5We0dQRVJGfSA6ICJncGVyZiI7CisgICAgbXkgJGdwZXJm ID0gJEVOVntHUEVSRn0gPyAkRU5We0dQRVJGfSA6ICgkY3VzdG9tR3BlcmYgPyAkY3VzdG9tR3Bl cmYgOiAiZ3BlcmYiKTsKICAgICBzeXN0ZW0oIlwiJGdwZXJmXCIgLS1rZXktcG9zaXRpb25zPVwi KlwiIC1EIC1zIDIgJGNvbG9yRGF0YUdwZXJmIC0tb3V0cHV0LWZpbGU9JGNvbG9yRGF0YUdlbmVy YXRlZCIpID09IDAgfHwgZGllICJjYWxsaW5nIGdwZXJmIGZhaWxlZDogJD8iOwogCiB9IGVsc2Ug ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9ERVBTCmluZGV4IDA3N2Q2NGQ2MTMxYTc0NGJjMDllMjhjYTM1ZTQ4NDYxMGE1 NTljYzguLmQxNTZmM2FmYzdkOTA4OGM2ZjhmZGM1ZTU4NDFlOWE3YWQzNDY0MjEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0RFUFMKQEAgLTE0MywxMiArMTQzLDE4IEBAIGRlcHMgPSB7CiAKIGRlcHNfb3MgPSB7CiAg ICd3aW4nOiB7CisgICAgJ3RoaXJkX3BhcnR5L2Jpc29uJzoKKyAgICAgIEZyb20oJ2Nocm9taXVt X2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2Jpc29uJyksCiAgICAgJ3RoaXJkX3BhcnR5L2N5Z3dp bic6CiAgICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9jeWd3aW4n KSwKKyAgICAndGhpcmRfcGFydHkvZ3BlcmYnOgorICAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycs ICdzcmMvdGhpcmRfcGFydHkvZ3BlcmYnKSwKICAgICAndGhpcmRfcGFydHkvbGlnaHR0cGQnOgog ICAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvbGlnaHR0cGQnKSwK ICAgICAndGhpcmRfcGFydHkvbnNzJzoKICAgICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3Jj L3RoaXJkX3BhcnR5L25zcycpLAorICAgICd0aGlyZF9wYXJ0eS9wZXJsJzoKKyAgICAgIEZyb20o J2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L3BlcmwnKSwKICAgICAjIERlcGVuZGVu Y2llcyB1c2VkIGJ5IGxpYmpwZWctdHVyYm8KICAgICAndGhpcmRfcGFydHkveWFzbS9iaW5hcmll cyc6CiAgICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS95YXNtL2Jp bmFyaWVzJyksCg== 153864 2012-07-23 14:43:19 -0700 2012-07-24 11:05:53 -0700 Patch bug-91667-20120723144311.patch text/plain 10048 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzMzg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTYzMjU2NmEyZWYzNzEz MjYxYTBmMWRkZjFjNDBiYzk1ZDcyNmJkMS4uYjcyYjQwZGM3MDdiOWYyYmUyNGJkNzgyMTNhZTQw NzJlZDdkMThlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA3LTIzICBTY290 dCBHcmFoYW0gIDxzY290dG1nQGdvb2dsZS5jb20+CisKKyAgICAgICAgVXNlIG5hdGl2ZSAobm9u LWN5Z3dpbikgYmluYXJpZXMgZm9yIHBlcmwsIGdwZXJmLCBhbmQgYmlzb24gaW4gQ2hyb21pdW0K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxNjY3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNpbmcgbmF0 aXZlIHRvb2xzIGluc3RlYWQgb2YgY3lnd2luIHZlcnNpb24gaW1wcm92ZXMgYnVpbGQgdGltZQor ICAgICAgICBwZXJmb3JtYW5jZSBieSByb3VnaGx5IDUwJSAob24gdG9wIG9mIHByZXZpb3VzIGNs LWluc3RlYWQtb2YtZ2NjCisgICAgICAgIGNoYW5nZSkuCisKKyAgICAgICAgQWxzbywgdXNlIC0g aW5zdGVhZCBvZiAvIGZvciBjbCBmbGFncyBiZWNhdXNlIGEgbGF5ZXIgb2YgcHJvamVjdAorICAg ICAgICBnZW5lcmF0b3IgY29udmVydHMgdGhlbSB0byBcIG90aGVyd2lzZSwgd2hpY2ggY2F1c2Vz IHRoZSBwcmVwcm9jZXNzaW5nCisgICAgICAgIHRvIGZhaWwgKHZlcnkgc2xvd2x5IGJlY2F1c2Ug b2YgdGhlIGN5Z3dpbi1sb29wIHdpdGggYSBzbGVlcCAxKS4KKworICAgICAgICBObyBuZXcgdGVz dHMuCisKKyAgICAgICAgKiBXZWJDb3JlLmd5cC9XZWJDb3JlLmd5cDoKKyAgICAgICAgKiBXZWJD b3JlLmd5cC9zY3JpcHRzL3J1bGVfYmlzb24ucHk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0 cy9wcmVwcm9jZXNzb3IucG06CisgICAgICAgIChhcHBseVByZXByb2Nlc3Nvcik6CisgICAgICAg ICogbWFrZS1oYXNoLXRvb2xzLnBsOgorCiAyMDEyLTA3LTIzICBTaW1vbiBGcmFzZXIgIDxzaW1v bi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFBhcnQgMiBvZjogSW1wbGVtZW50IHN0aWNr eSBwb3NpdGlvbmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2Vi Q29yZS5neXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAppbmRleCA3 MDI0M2NjNTQ5YWQ3NThlMDRiYTJlMmY1YjRkOWY2ODA4ZWM4YzYwLi4zMWUyMDZjNjRkMTcxMDJk ZTFjNzgxM2Q5YWE5MGFiMGZlNjU2OGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmd5cC9XZWJDb3JlLmd5cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJD b3JlLmd5cApAQCAtMjI0LDEwICsyMjQsMjMgQEAKICAgICAgICAgICAnLi4vcGxhdGZvcm0vdGV4 dC93aW4nLAogICAgICAgICAgICcuLi9wbGF0Zm9ybS93aW4nLAogICAgICAgICBdLAorICAgICAg ICAjIFVzaW5nIG5hdGl2ZSBwZXJsIHJhdGhlciB0aGFuIGN5Z3dpbiBwZXJsIGN1dHMgZXhlY3V0 aW9uIHRpbWUgb2YgaWRsCisgICAgICAgICMgcHJlcHJvY2Vzc2luZyBydWxlcyBieSBhIGJpdCBt b3JlIHRoYW4gNTAlLgorICAgICAgICAncGVybF9leGUnOiAnPChERVBUSCkvdGhpcmRfcGFydHkv cGVybC9wZXJsL2Jpbi9wZXJsLmV4ZScsCisgICAgICAgICdncGVyZl9leGUnOiAnPChERVBUSCkv dGhpcmRfcGFydHkvZ3BlcmYvYmluL2dwZXJmLmV4ZScsCisgICAgICAgICdiaXNvbl9leGUnOiAn PChERVBUSCkvdGhpcmRfcGFydHkvYmlzb24vYmluL2Jpc29uLmV4ZScsCisgICAgICAgICMgVXNp bmcgY2wgaW5zdGVhZCBvZiBjeWd3aW4gZ2NjIGN1dHMgdGhlIHByb2Nlc3NpbmcgdGltZSBmcm9t CisgICAgICAgICMgMW01OHMgdG8gMG01MnMuCisgICAgICAgICdwcmVwcm9jZXNzb3InOiAnLS1w cmVwcm9jZXNzb3IgImNsLmV4ZSAtbm9sb2dvIC1FUCAtVFAiJywKICAgICAgIH0sewogICAgICAg ICAjIGVuYWJsZSAtV2FsbCBhbmQgLVdlcnJvciwganVzdCBmb3IgTWFjIGFuZCBMaW51eCBidWls ZHMgZm9yIG5vdwogICAgICAgICAjIEZJWE1FOiBBbHNvIGVuYWJsZSB0aGlzIGZvciBXaW5kb3dz IGFmdGVyIHZlcmlmeWluZyBubyB3YXJuaW5ncwogICAgICAgICAnY2hyb21pdW1fY29kZSc6IDEs CisgICAgICAgICdwZXJsX2V4ZSc6ICdwZXJsJywKKyAgICAgICAgJ2dwZXJmX2V4ZSc6ICdncGVy ZicsCisgICAgICAgICdiaXNvbl9leGUnOiAnYmlzb24nLAorICAgICAgICAjIFdpdGhvdXQgb25l IHNwZWNpZmllZCwgdGhlIHNjcmlwdHMgZGVmYXVsdCB0byAnZ2NjJy4KKyAgICAgICAgJ3ByZXBy b2Nlc3Nvcic6ICcnLAogICAgICAgfV0sCiAgICAgICBbJ3VzZV94MTE9PTEgb3IgT1M9PSJhbmRy b2lkIicsIHsKICAgICAgICAgJ3dlYmNvcmVfaW5jbHVkZV9kaXJzJzogWwpAQCAtNDMzLDggKzQ0 Niw5IEBACiAgICAgICAgICAgJ291dHB1dHMnOiBbCiAgICAgICAgICAgICAnPChTSEFSRURfSU5U RVJNRURJQVRFX0RJUikvd2Via2l0L0luamVjdGVkU2NyaXB0U291cmNlLmgnLAogICAgICAgICAg IF0sCisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwKICAgICAgICAgICAnYWN0aW9u JzogWwotICAgICAgICAgICAgJ3BlcmwnLAorICAgICAgICAgICAgJzwocGVybF9leGUpJywKICAg ICAgICAgICAgICcuLi9pbnNwZWN0b3IveHhkLnBsJywKICAgICAgICAgICAgICdJbmplY3RlZFNj cmlwdFNvdXJjZV9qcycsCiAgICAgICAgICAgICAnPEAoX2lucHV0cyknLApAQCAtNDU2LDggKzQ3 MCw5IEBACiAgICAgICAgICAgJ291dHB1dHMnOiBbCiAgICAgICAgICAgICAnPChTSEFSRURfSU5U RVJNRURJQVRFX0RJUikvd2Via2l0L0luamVjdGVkU2NyaXB0V2ViR0xNb2R1bGVTb3VyY2UuaCcs CiAgICAgICAgICAgXSwKKyAgICAgICAgICAnbXN2c19jeWd3aW5fc2hlbGwnOiAwLAogICAgICAg ICAgICdhY3Rpb24nOiBbCi0gICAgICAgICAgICAncGVybCcsCisgICAgICAgICAgICAnPChwZXJs X2V4ZSknLAogICAgICAgICAgICAgJy4uL2luc3BlY3Rvci94eGQucGwnLAogICAgICAgICAgICAg J0luamVjdGVkU2NyaXB0V2ViR0xNb2R1bGVTb3VyY2VfanMnLAogICAgICAgICAgICAgJzxAKF9p bnB1dHMpJywKQEAgLTQ3OSw4ICs0OTQsOSBAQAogICAgICAgICAgICdvdXRwdXRzJzogWwogICAg ICAgICAgICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIpL3dlYmtpdC9EZWJ1Z2dlclNjcmlw dFNvdXJjZS5oJywKICAgICAgICAgICBdLAorICAgICAgICAgICdtc3ZzX2N5Z3dpbl9zaGVsbCc6 IDAsCiAgICAgICAgICAgJ2FjdGlvbic6IFsKLSAgICAgICAgICAgICdwZXJsJywKKyAgICAgICAg ICAgICc8KHBlcmxfZXhlKScsCiAgICAgICAgICAgICAnLi4vaW5zcGVjdG9yL3h4ZC5wbCcsCiAg ICAgICAgICAgICAnRGVidWdnZXJTY3JpcHRTb3VyY2VfanMnLAogICAgICAgICAgICAgJzxAKF9p bnB1dHMpJywKQEAgLTUxMSwxOSArNTI3LDkgQEAKICAgICAgICAgICAnb3V0cHV0cyc6IFsKICAg ICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS9zdXBwbGVtZW50YWxfZGVwZW5k ZW5jeS50bXAnLAogICAgICAgICAgIF0sCi0gICAgICAgICAgJ2NvbmRpdGlvbnMnOiBbCi0gICAg ICAgICAgICBbJ09TPT0id2luIicsIHsKLSAgICAgICAgICAgICAgJ3ZhcmlhYmxlcyc6IHsKLSAg ICAgICAgICAgICAgICAjIFVzaW5nIGNsIGluc3RlYWQgb2YgY3lnd2luIGdjYyBjdXRzIHRoZSBw cm9jZXNzaW5nIHRpbWUgZnJvbQotICAgICAgICAgICAgICAgICMgMW01OHMgdG8gMG01MnMuCi0g ICAgICAgICAgICAgICAgJ3ByZXByb2Nlc3Nvcic6ICctLXByZXByb2Nlc3NvciAiY2wuZXhlIC9u b2xvZ28gL0VQIC9UUCInLAotICAgICAgICAgICAgICB9LAotICAgICAgICAgICAgfSwgewotICAg ICAgICAgICAgICAndmFyaWFibGVzJzogeyAncHJlcHJvY2Vzc29yJzogJycsIH0KLSAgICAgICAg ICAgIH1dLAotICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwK ICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3BlcmwnLAorICAgICAgICAgICAg JzwocGVybF9leGUpJywKICAgICAgICAgICAgICctdycsCiAgICAgICAgICAgICAnLUkuLi9iaW5k aW5ncy9zY3JpcHRzJywKICAgICAgICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nl c3MtaWRscy5wbCcsCkBAIC01NzUsOCArNTgxLDkgQEAKICAgICAgICAgICAnb3V0cHV0cyc6IFsK ICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS93ZWJraXQvVjhBcnJheUJ1 ZmZlclZpZXdDdXN0b21TY3JpcHQuaCcsCiAgICAgICAgICAgXSwKKyAgICAgICAgICAnbXN2c19j eWd3aW5fc2hlbGwnOiAwLAogICAgICAgICAgICdhY3Rpb24nOiBbCi0gICAgICAgICAgICAncGVy bCcsCisgICAgICAgICAgICAnPChwZXJsX2V4ZSknLAogICAgICAgICAgICAgJy4uL2luc3BlY3Rv ci94eGQucGwnLAogICAgICAgICAgICAgJ1Y4QXJyYXlCdWZmZXJWaWV3Q3VzdG9tU2NyaXB0X2pz JywKICAgICAgICAgICAgICc8QChfaW5wdXRzKScsCkBAIC01OTIsOCArNTk5LDkgQEAKICAgICAg ICAgICAnb3V0cHV0cyc6IFsKICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElS KS93ZWJraXQvWE1MVmlld2VyQ1NTLmgnLAogICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNf Y3lnd2luX3NoZWxsJzogMCwKICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3Bl cmwnLAorICAgICAgICAgICAgJzwocGVybF9leGUpJywKICAgICAgICAgICAgICcuLi9pbnNwZWN0 b3IveHhkLnBsJywKICAgICAgICAgICAgICdYTUxWaWV3ZXJfY3NzJywKICAgICAgICAgICAgICc8 QChfaW5wdXRzKScsCkBAIC02MDgsOCArNjE2LDkgQEAKICAgICAgICAgICAnb3V0cHV0cyc6IFsK ICAgICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS93ZWJraXQvWE1MVmlld2Vy SlMuaCcsCiAgICAgICAgICAgXSwKKyAgICAgICAgICAnbXN2c19jeWd3aW5fc2hlbGwnOiAwLAog ICAgICAgICAgICdhY3Rpb24nOiBbCi0gICAgICAgICAgICAncGVybCcsCisgICAgICAgICAgICAn PChwZXJsX2V4ZSknLAogICAgICAgICAgICAgJy4uL2luc3BlY3Rvci94eGQucGwnLAogICAgICAg ICAgICAgJ1hNTFZpZXdlcl9qcycsCiAgICAgICAgICAgICAnPEAoX2lucHV0cyknLApAQCAtMTAx Nyw3ICsxMDI2LDggQEAKICAgICAgICAgICAgICdweXRob24nLAogICAgICAgICAgICAgJ3Njcmlw dHMvcnVsZV9iaXNvbi5weScsCiAgICAgICAgICAgICAnPChSVUxFX0lOUFVUX1BBVEgpJywKLSAg ICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS93ZWJraXQnCisgICAgICAgICAg ICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0JywKKyAgICAgICAgICAgICc8KGJp c29uX2V4ZSknLAogICAgICAgICAgIF0sCiAgICAgICAgIH0sCiAgICAgICAgIHsKQEAgLTEwMzIs MTEgKzEwNDIsMTMgQEAKICAgICAgICAgICAnaW5wdXRzJzogWwogICAgICAgICAgICAgJy4uL21h a2UtaGFzaC10b29scy5wbCcsCiAgICAgICAgICAgXSwKKyAgICAgICAgICAnbXN2c19jeWd3aW5f c2hlbGwnOiAwLAogICAgICAgICAgICdhY3Rpb24nOiBbCi0gICAgICAgICAgICAncGVybCcsCisg ICAgICAgICAgICAnPChwZXJsX2V4ZSknLAogICAgICAgICAgICAgJy4uL21ha2UtaGFzaC10b29s cy5wbCcsCiAgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0JywK ICAgICAgICAgICAgICc8KFJVTEVfSU5QVVRfUEFUSCknLAorICAgICAgICAgICAgJzwoZ3BlcmZf ZXhlKScsCiAgICAgICAgICAgXSwKICAgICAgICAgfSwKICAgICAgICAgIyBSdWxlIHRvIGJ1aWxk IGdlbmVyYXRlZCBKYXZhU2NyaXB0IChWOCkgYmluZGluZ3MgZnJvbSAuaWRsIHNvdXJjZS4KQEAg LTEwODQsMTMgKzEwOTYsMTQgQEAKICAgICAgICAgICAgICAgJy0taW5jbHVkZScsICcuLi94bWwn LAogICAgICAgICAgICAgXSwKICAgICAgICAgICB9LAorICAgICAgICAgICdtc3ZzX2N5Z3dpbl9z aGVsbCc6IDAsCiAgICAgICAgICAgIyBGSVhNRTogIE5vdGUgdGhhdCB3ZSBwdXQgdGhlIC5jcHAg ZmlsZXMgaW4gd2ViY29yZS9iaW5kaW5ncwogICAgICAgICAgICMgYnV0IHRoZSAuaCBmaWxlcyBp biB3ZWJraXQvYmluZGluZ3MuICBUaGlzIGlzIHRvIHdvcmsgYXJvdW5kCiAgICAgICAgICAgIyB0 aGUgdW5mb3J0dW5hdGUgZmFjdCB0aGF0IEdZUCBzdHJpcHMgZHVwbGljYXRlIGFyZ3VtZW50cwog ICAgICAgICAgICMgZnJvbSBsaXN0cy4gIFdoZW4gd2UgaGF2ZSBhIGJldHRlciBHWVAgd2F5IHRv IHN1cHByZXNzIHRoYXQKICAgICAgICAgICAjIGJlaGF2aW9yLCBjaGFuZ2UgdGhlIG91dHB1dCBs b2NhdGlvbi4KICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3BlcmwnLAorICAg ICAgICAgICAgJzwocGVybF9leGUpJywKICAgICAgICAgICAgICctdycsCiAgICAgICAgICAgICAn LUkuLi9iaW5kaW5ncy9zY3JpcHRzJywKICAgICAgICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRz L2dlbmVyYXRlLWJpbmRpbmdzLnBsJywKQEAgLTExMDgsNiArMTEyMSw3IEBACiAgICAgICAgICAg ICAnLS1hZGRpdGlvbmFsSWRsRmlsZXNMaXN0JywKICAgICAgICAgICAgICc8KGFkZGl0aW9uYWxf aWRsX2ZpbGVzX2xpc3QpJywKICAgICAgICAgICAgICc8KFJVTEVfSU5QVVRfUEFUSCknLAorICAg ICAgICAgICAgJzxAKHByZXByb2Nlc3NvciknLAogICAgICAgICAgIF0sCiAgICAgICAgICAgJ21l c3NhZ2UnOiAnR2VuZXJhdGluZyBiaW5kaW5nIGZyb20gPChSVUxFX0lOUFVUX1BBVEgpJywKICAg ICAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL3NjcmlwdHMv cnVsZV9iaXNvbi5weSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL3NjcmlwdHMvcnVsZV9i aXNvbi5weQppbmRleCBlYjg1YTRiYTZjNDZjMGI5OTcyNDU2YzBhZjdiZmE0YTk4ZjRlNjg1Li45 NTIxNjVhNjdlODk4ZmIwYWUxZDA3NWIyY2MxMmE0NWUzOGFmNDFmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9zY3JpcHRzL3J1bGVfYmlzb24ucHkKKysrIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5neXAvc2NyaXB0cy9ydWxlX2Jpc29uLnB5CkBAIC0zMiw3ICszMiw3 IEBACiAjIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGEgQlNELXN0eWxl IGxpY2Vuc2UgdGhhdCBjYW4gYmUKICMgZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZS4KIAotIyB1 c2FnZTogcnVsZV9iaXNvbi5weSBJTlBVVF9GSUxFIE9VVFBVVF9ESVIKKyMgdXNhZ2U6IHJ1bGVf Ymlzb24ucHkgSU5QVVRfRklMRSBPVVRQVVRfRElSIFtCSVNPTl9FWEVdCiAjIElOUFVUX0ZJTEUg aXMgYSBwYXRoIHRvIGVpdGhlciBDU1NHcmFtbWFyLnkgb3IgWFBhdGhHcmFtbWFyLnkuCiAjIE9V VFBVVF9ESVIgaXMgd2hlcmUgdGhlIGJpc29uLWdlbmVyYXRlZCAuY3BwIGFuZCAuaCBmaWxlcyBz aG91bGQgYmUgcGxhY2VkLgogCkBAIC00MiwxMCArNDIsMTMgQEAgaW1wb3J0IG9zLnBhdGgKIGlt cG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiAKLWFzc2VydCBsZW4oc3lzLmFyZ3YpID09IDMK K2Fzc2VydCBsZW4oc3lzLmFyZ3YpID09IDMgb3IgbGVuKHN5cy5hcmd2KSA9PSA0CiAKIGlucHV0 RmlsZSA9IHN5cy5hcmd2WzFdCiBvdXRwdXREaXIgPSBzeXMuYXJndlsyXQorYmlzb25FeGUgPSAn Ymlzb24nCitpZiBsZW4oc3lzLmFyZ3YpID4gMzoKKyAgICBiaXNvbkV4ZSA9IHN5cy5hcmd2WzNd CiAKIGlucHV0TmFtZSA9IG9zLnBhdGguYmFzZW5hbWUoaW5wdXRGaWxlKQogYXNzZXJ0IGlucHV0 TmFtZSA9PSAnQ1NTR3JhbW1hci55JyBvciBpbnB1dE5hbWUgPT0gJ1hQYXRoR3JhbW1hci55JwpA QCAtNjksNyArNzIsNyBAQCBmb3Igb3V0cHV0SFRyeSBpbiBvdXRwdXRIVHJpZXM6CiAKIG91dHB1 dENwcCA9IG9zLnBhdGguam9pbihvdXRwdXREaXIsIGlucHV0Um9vdCArICcuY3BwJykKIAotcmV0 dXJuQ29kZSA9IHN1YnByb2Nlc3MuY2FsbChbJ2Jpc29uJywgJy1kJywgJy1wJywgcHJlZml4LCBp bnB1dEZpbGUsICctbycsIG91dHB1dENwcF0pCityZXR1cm5Db2RlID0gc3VicHJvY2Vzcy5jYWxs KFtiaXNvbkV4ZSwgJy1kJywgJy1wJywgcHJlZml4LCBpbnB1dEZpbGUsICctbycsIG91dHB1dENw cF0pCiBhc3NlcnQgcmV0dXJuQ29kZSA9PSAwCiAKICMgRmluZCB0aGUgbmFtZSB0aGF0IGJpc29u IHVzZWQgZm9yIHRoZSBnZW5lcmF0ZWQgaGVhZGVyIGZpbGUuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbSBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCmluZGV4IDNiNGNlYzE5MTliNWU4ZDk4 NjBkMDhkODk5M2E3YTU2MDMzMmM3MDcuLjk1OTk1ZjAwYWYwMjdhN2E2ZTBlZGRjMTc0NWU0MDYz Y2Q5ZmJkMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvcHJl cHJvY2Vzc29yLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvcHJlcHJv Y2Vzc29yLnBtCkBAIC02Myw3ICs2Myw3IEBAIHN1YiBhcHBseVByZXByb2Nlc3NvcgogICAgIEBt YWNyb3MgPSBtYXAgeyAiLUQkXyIgfSBAbWFjcm9zOwogCiAgICAgbXkgJHBpZCA9IDA7Ci0gICAg aWYgKCRDb25maWd7b3NuYW1lfSBlcSAiY3lnd2luIikgeworICAgIGlmICgkQ29uZmlne29zbmFt ZX0gZXEgImN5Z3dpbiIgfHwgJENvbmZpZ3tvc25hbWV9IGVxICdNU1dpbjMyJykgewogICAgICAg ICAjIFRoaXMgY2FsbCBjYW4gZmFpbCBpZiBXaW5kb3dzIHJlYmFzZXMgY3lnd2luLCBzbyByZXRy eSBhIGZldyB0aW1lcyB1bnRpbCBpdCBzdWNjZWVkcy4KICAgICAgICAgZm9yIChteSAkdHJpZXMg PSAwOyAhJHBpZCAmJiAoJHRyaWVzIDwgMjApOyAkdHJpZXMrKykgewogICAgICAgICAgICAgZXZh bCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9tYWtlLWhhc2gtdG9vbHMucGwgYi9Tb3Vy Y2UvV2ViQ29yZS9tYWtlLWhhc2gtdG9vbHMucGwKaW5kZXggZWEzYTBmNTA3MmI1ZWY1YTVlNTdh NmM1NTI5NTA1ZGU0ZGRiM2FkYi4uOWQ5NDcwNzZmZmYxMWMyMzBjNTRjZTJiMmRjOTU1ODAwZGM0 MDU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbWFrZS1oYXNoLXRvb2xzLnBsCisrKyBi L1NvdXJjZS9XZWJDb3JlL21ha2UtaGFzaC10b29scy5wbApAQCAtMjksMTAgKzI5LDEwIEBAIG15 ICRvcHRpb24gPSBiYXNlbmFtZSgkQVJHVlswXSwiLmdwZXJmIik7CiAKIGlmICgkb3B0aW9uIGVx ICJDb2xvckRhdGEiKSB7CiAgICAgbXkgJGNvbG9yRGF0YUdlbmVyYXRlZCAgICAgICAgID0gIiRv dXRkaXIvQ29sb3JEYXRhLmNwcCI7Ci0gICAgbXkgJGNvbG9yRGF0YUdwZXJmICAgICAgICAgICAg ID0gJEFSR1ZbMF07Ci0gICAgc2hpZnQ7CisgICAgbXkgJGNvbG9yRGF0YUdwZXJmICAgICAgICAg ICAgID0gc2hpZnQ7CisgICAgbXkgJGN1c3RvbUdwZXJmICAgICAgICAgICAgICAgID0gc2hpZnQ7 CiAKLSAgICBteSAkZ3BlcmYgPSAkRU5We0dQRVJGfSA/ICRFTlZ7R1BFUkZ9IDogImdwZXJmIjsK KyAgICBteSAkZ3BlcmYgPSAkRU5We0dQRVJGfSA/ICRFTlZ7R1BFUkZ9IDogKCRjdXN0b21HcGVy ZiA/ICRjdXN0b21HcGVyZiA6ICJncGVyZiIpOwogICAgIHN5c3RlbSgiXCIkZ3BlcmZcIiAtLWtl eS1wb3NpdGlvbnM9XCIqXCIgLUQgLXMgMiAkY29sb3JEYXRhR3BlcmYgLS1vdXRwdXQtZmlsZT0k Y29sb3JEYXRhR2VuZXJhdGVkIikgPT0gMCB8fCBkaWUgImNhbGxpbmcgZ3BlcmYgZmFpbGVkOiAk PyI7CiAKIH0gZWxzZSB7Cg== 154108 2012-07-24 11:05:56 -0700 2012-07-24 11:23:55 -0700 Patch bug-91667-20120724110547.patch text/plain 10539 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzMzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGZmMDZkYjhkMWU0NTZl MTg1ZGIyM2YwNTM1YzVlZDdhYTliZmMxOS4uZGUwY2FmZDdhYzIxNThjOGI1ZGM4NWUwODJlMGNk MGNkODNlMzQxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA3LTI0ICBTY290 dCBHcmFoYW0gIDxzY290dG1nQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgbmF0aXZlIChu b24tY3lnd2luKSBiaW5hcmllcyBmb3IgcGVybCwgZ3BlcmYsIGFuZCBiaXNvbiBpbiBDaHJvbWl1 bQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTE2NjcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2luZyBu YXRpdmUgdG9vbHMgaW5zdGVhZCBvZiBjeWd3aW4gdmVyc2lvbiBpbXByb3ZlcyBidWlsZCB0aW1l CisgICAgICAgIHBlcmZvcm1hbmNlIGJ5IHJvdWdobHkgNTAlIChvbiB0b3Agb2YgcHJldmlvdXMg Y2wtaW5zdGVhZC1vZi1nY2MKKyAgICAgICAgY2hhbmdlKS4KKworICAgICAgICBBbHNvLCB1c2Ug LSBpbnN0ZWFkIG9mIC8gZm9yIGNsIGZsYWdzLCBvdGhlcndpc2UgcHJlcHJvY2Vzc2luZyBmYWls cworICAgICAgICB2ZXJ5IHNsb3dseSAoZHVlIHRvIHJldHJ5IGxvb3ApLiBBbmQsIHJlcGxhY2Ug XCB3aXRoIC8gaW4gZ3BlcmYKKyAgICAgICAgY29tbWFuZCBsaW5lLiBXaXRob3V0IHRoaXMsIGdw ZXJmIGVtaXRzIHRoZSBmaWxlbmFtZSBsaXRlcmFsbHkgaW4KKyAgICAgICAgI2xpbmUgZGlyZWN0 aXZlcyB3aGljaCBjYXVzZXMgVlMgdG8gZXJyb3Igd2l0aCAidW5lc2NhcGVkIFwgaW4KKyAgICAg ICAgc3RyaW5nIi4gQml6YXJyZWx5LCBidWlsZGluZyBDb2xvckRhdGEuY3BwIHdpdGggdGhvc2Ug XCBpbiBwbGFjZQorICAgICAgICBjYXVzZXMgdGhlIElERSB0byBleGl0IHdpdGggbm8gZXJyb3Ig bWVzc2FnZSwgd2hpY2ggd2FzIHRoZSBjYXVzZSBvZgorICAgICAgICB0aGUgcHJldmlvdXMgY2Fu YXJ5IGZhaWx1cmVzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIFdlYkNv cmUuZ3lwL1dlYkNvcmUuZ3lwOgorICAgICAgICAqIFdlYkNvcmUuZ3lwL3NjcmlwdHMvcnVsZV9i aXNvbi5weToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbToKKyAg ICAgICAgKGFwcGx5UHJlcHJvY2Vzc29yKToKKyAgICAgICAgKiBtYWtlLWhhc2gtdG9vbHMucGw6 CisKIDIwMTItMDctMjMgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCiAgICAg ICAgIFJlcG9ydCB0aGUgZXh0cmEgbWVtb3J5IHVzZWQgYnkgaW1tdXRhYmxlIFN0eWxlUHJvcGVy dHlTZXQgb2JqZWN0cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dl YkNvcmUuZ3lwIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKaW5kZXgg NzAyNDNjYzU0OWFkNzU4ZTA0YmEyZTJmNWI0ZDlmNjgwOGVjOGM2MC4uMzFlMjA2YzY0ZDE3MTAy ZGUxYzc4MTNkOWFhOTBhYjBmZTY1NjhhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS5neXAvV2ViQ29yZS5neXAKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2Vi Q29yZS5neXAKQEAgLTIyNCwxMCArMjI0LDIzIEBACiAgICAgICAgICAgJy4uL3BsYXRmb3JtL3Rl eHQvd2luJywKICAgICAgICAgICAnLi4vcGxhdGZvcm0vd2luJywKICAgICAgICAgXSwKKyAgICAg ICAgIyBVc2luZyBuYXRpdmUgcGVybCByYXRoZXIgdGhhbiBjeWd3aW4gcGVybCBjdXRzIGV4ZWN1 dGlvbiB0aW1lIG9mIGlkbAorICAgICAgICAjIHByZXByb2Nlc3NpbmcgcnVsZXMgYnkgYSBiaXQg bW9yZSB0aGFuIDUwJS4KKyAgICAgICAgJ3BlcmxfZXhlJzogJzwoREVQVEgpL3RoaXJkX3BhcnR5 L3BlcmwvcGVybC9iaW4vcGVybC5leGUnLAorICAgICAgICAnZ3BlcmZfZXhlJzogJzwoREVQVEgp L3RoaXJkX3BhcnR5L2dwZXJmL2Jpbi9ncGVyZi5leGUnLAorICAgICAgICAnYmlzb25fZXhlJzog JzwoREVQVEgpL3RoaXJkX3BhcnR5L2Jpc29uL2Jpbi9iaXNvbi5leGUnLAorICAgICAgICAjIFVz aW5nIGNsIGluc3RlYWQgb2YgY3lnd2luIGdjYyBjdXRzIHRoZSBwcm9jZXNzaW5nIHRpbWUgZnJv bQorICAgICAgICAjIDFtNThzIHRvIDBtNTJzLgorICAgICAgICAncHJlcHJvY2Vzc29yJzogJy0t cHJlcHJvY2Vzc29yICJjbC5leGUgLW5vbG9nbyAtRVAgLVRQIicsCiAgICAgICB9LHsKICAgICAg ICAgIyBlbmFibGUgLVdhbGwgYW5kIC1XZXJyb3IsIGp1c3QgZm9yIE1hYyBhbmQgTGludXggYnVp bGRzIGZvciBub3cKICAgICAgICAgIyBGSVhNRTogQWxzbyBlbmFibGUgdGhpcyBmb3IgV2luZG93 cyBhZnRlciB2ZXJpZnlpbmcgbm8gd2FybmluZ3MKICAgICAgICAgJ2Nocm9taXVtX2NvZGUnOiAx LAorICAgICAgICAncGVybF9leGUnOiAncGVybCcsCisgICAgICAgICdncGVyZl9leGUnOiAnZ3Bl cmYnLAorICAgICAgICAnYmlzb25fZXhlJzogJ2Jpc29uJywKKyAgICAgICAgIyBXaXRob3V0IG9u ZSBzcGVjaWZpZWQsIHRoZSBzY3JpcHRzIGRlZmF1bHQgdG8gJ2djYycuCisgICAgICAgICdwcmVw cm9jZXNzb3InOiAnJywKICAgICAgIH1dLAogICAgICAgWyd1c2VfeDExPT0xIG9yIE9TPT0iYW5k cm9pZCInLCB7CiAgICAgICAgICd3ZWJjb3JlX2luY2x1ZGVfZGlycyc6IFsKQEAgLTQzMyw4ICs0 NDYsOSBAQAogICAgICAgICAgICdvdXRwdXRzJzogWwogICAgICAgICAgICAgJzwoU0hBUkVEX0lO VEVSTUVESUFURV9ESVIpL3dlYmtpdC9JbmplY3RlZFNjcmlwdFNvdXJjZS5oJywKICAgICAgICAg ICBdLAorICAgICAgICAgICdtc3ZzX2N5Z3dpbl9zaGVsbCc6IDAsCiAgICAgICAgICAgJ2FjdGlv bic6IFsKLSAgICAgICAgICAgICdwZXJsJywKKyAgICAgICAgICAgICc8KHBlcmxfZXhlKScsCiAg ICAgICAgICAgICAnLi4vaW5zcGVjdG9yL3h4ZC5wbCcsCiAgICAgICAgICAgICAnSW5qZWN0ZWRT Y3JpcHRTb3VyY2VfanMnLAogICAgICAgICAgICAgJzxAKF9pbnB1dHMpJywKQEAgLTQ1Niw4ICs0 NzAsOSBAQAogICAgICAgICAgICdvdXRwdXRzJzogWwogICAgICAgICAgICAgJzwoU0hBUkVEX0lO VEVSTUVESUFURV9ESVIpL3dlYmtpdC9JbmplY3RlZFNjcmlwdFdlYkdMTW9kdWxlU291cmNlLmgn LAogICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwKICAgICAg ICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3BlcmwnLAorICAgICAgICAgICAgJzwocGVy bF9leGUpJywKICAgICAgICAgICAgICcuLi9pbnNwZWN0b3IveHhkLnBsJywKICAgICAgICAgICAg ICdJbmplY3RlZFNjcmlwdFdlYkdMTW9kdWxlU291cmNlX2pzJywKICAgICAgICAgICAgICc8QChf aW5wdXRzKScsCkBAIC00NzksOCArNDk0LDkgQEAKICAgICAgICAgICAnb3V0cHV0cyc6IFsKICAg ICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS93ZWJraXQvRGVidWdnZXJTY3Jp cHRTb3VyY2UuaCcsCiAgICAgICAgICAgXSwKKyAgICAgICAgICAnbXN2c19jeWd3aW5fc2hlbGwn OiAwLAogICAgICAgICAgICdhY3Rpb24nOiBbCi0gICAgICAgICAgICAncGVybCcsCisgICAgICAg ICAgICAnPChwZXJsX2V4ZSknLAogICAgICAgICAgICAgJy4uL2luc3BlY3Rvci94eGQucGwnLAog ICAgICAgICAgICAgJ0RlYnVnZ2VyU2NyaXB0U291cmNlX2pzJywKICAgICAgICAgICAgICc8QChf aW5wdXRzKScsCkBAIC01MTEsMTkgKzUyNyw5IEBACiAgICAgICAgICAgJ291dHB1dHMnOiBbCiAg ICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvc3VwcGxlbWVudGFsX2RlcGVu ZGVuY3kudG1wJywKICAgICAgICAgICBdLAotICAgICAgICAgICdjb25kaXRpb25zJzogWwotICAg ICAgICAgICAgWydPUz09IndpbiInLCB7Ci0gICAgICAgICAgICAgICd2YXJpYWJsZXMnOiB7Ci0g ICAgICAgICAgICAgICAgIyBVc2luZyBjbCBpbnN0ZWFkIG9mIGN5Z3dpbiBnY2MgY3V0cyB0aGUg cHJvY2Vzc2luZyB0aW1lIGZyb20KLSAgICAgICAgICAgICAgICAjIDFtNThzIHRvIDBtNTJzLgot ICAgICAgICAgICAgICAgICdwcmVwcm9jZXNzb3InOiAnLS1wcmVwcm9jZXNzb3IgImNsLmV4ZSAv bm9sb2dvIC9FUCAvVFAiJywKLSAgICAgICAgICAgICAgfSwKLSAgICAgICAgICAgIH0sIHsKLSAg ICAgICAgICAgICAgJ3ZhcmlhYmxlcyc6IHsgJ3ByZXByb2Nlc3Nvcic6ICcnLCB9Ci0gICAgICAg ICAgICB9XSwKLSAgICAgICAgICBdLAorICAgICAgICAgICdtc3ZzX2N5Z3dpbl9zaGVsbCc6IDAs CiAgICAgICAgICAgJ2FjdGlvbic6IFsKLSAgICAgICAgICAgICdwZXJsJywKKyAgICAgICAgICAg ICc8KHBlcmxfZXhlKScsCiAgICAgICAgICAgICAnLXcnLAogICAgICAgICAgICAgJy1JLi4vYmlu ZGluZ3Mvc2NyaXB0cycsCiAgICAgICAgICAgICAnLi4vYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9j ZXNzLWlkbHMucGwnLApAQCAtNTc1LDggKzU4MSw5IEBACiAgICAgICAgICAgJ291dHB1dHMnOiBb CiAgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L1Y4QXJyYXlC dWZmZXJWaWV3Q3VzdG9tU2NyaXB0LmgnLAogICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNf Y3lnd2luX3NoZWxsJzogMCwKICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3Bl cmwnLAorICAgICAgICAgICAgJzwocGVybF9leGUpJywKICAgICAgICAgICAgICcuLi9pbnNwZWN0 b3IveHhkLnBsJywKICAgICAgICAgICAgICdWOEFycmF5QnVmZmVyVmlld0N1c3RvbVNjcmlwdF9q cycsCiAgICAgICAgICAgICAnPEAoX2lucHV0cyknLApAQCAtNTkyLDggKzU5OSw5IEBACiAgICAg ICAgICAgJ291dHB1dHMnOiBbCiAgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJ Uikvd2Via2l0L1hNTFZpZXdlckNTUy5oJywKICAgICAgICAgICBdLAorICAgICAgICAgICdtc3Zz X2N5Z3dpbl9zaGVsbCc6IDAsCiAgICAgICAgICAgJ2FjdGlvbic6IFsKLSAgICAgICAgICAgICdw ZXJsJywKKyAgICAgICAgICAgICc8KHBlcmxfZXhlKScsCiAgICAgICAgICAgICAnLi4vaW5zcGVj dG9yL3h4ZC5wbCcsCiAgICAgICAgICAgICAnWE1MVmlld2VyX2NzcycsCiAgICAgICAgICAgICAn PEAoX2lucHV0cyknLApAQCAtNjA4LDggKzYxNiw5IEBACiAgICAgICAgICAgJ291dHB1dHMnOiBb CiAgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0L1hNTFZpZXdl ckpTLmgnLAogICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwK ICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3BlcmwnLAorICAgICAgICAgICAg JzwocGVybF9leGUpJywKICAgICAgICAgICAgICcuLi9pbnNwZWN0b3IveHhkLnBsJywKICAgICAg ICAgICAgICdYTUxWaWV3ZXJfanMnLAogICAgICAgICAgICAgJzxAKF9pbnB1dHMpJywKQEAgLTEw MTcsNyArMTAyNiw4IEBACiAgICAgICAgICAgICAncHl0aG9uJywKICAgICAgICAgICAgICdzY3Jp cHRzL3J1bGVfYmlzb24ucHknLAogICAgICAgICAgICAgJzwoUlVMRV9JTlBVVF9QQVRIKScsCi0g ICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2Via2l0JworICAgICAgICAg ICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIpL3dlYmtpdCcsCisgICAgICAgICAgICAnPChi aXNvbl9leGUpJywKICAgICAgICAgICBdLAogICAgICAgICB9LAogICAgICAgICB7CkBAIC0xMDMy LDExICsxMDQyLDEzIEBACiAgICAgICAgICAgJ2lucHV0cyc6IFsKICAgICAgICAgICAgICcuLi9t YWtlLWhhc2gtdG9vbHMucGwnLAogICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNfY3lnd2lu X3NoZWxsJzogMCwKICAgICAgICAgICAnYWN0aW9uJzogWwotICAgICAgICAgICAgJ3BlcmwnLAor ICAgICAgICAgICAgJzwocGVybF9leGUpJywKICAgICAgICAgICAgICcuLi9tYWtlLWhhc2gtdG9v bHMucGwnLAogICAgICAgICAgICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIpL3dlYmtpdCcs CiAgICAgICAgICAgICAnPChSVUxFX0lOUFVUX1BBVEgpJywKKyAgICAgICAgICAgICc8KGdwZXJm X2V4ZSknLAogICAgICAgICAgIF0sCiAgICAgICAgIH0sCiAgICAgICAgICMgUnVsZSB0byBidWls ZCBnZW5lcmF0ZWQgSmF2YVNjcmlwdCAoVjgpIGJpbmRpbmdzIGZyb20gLmlkbCBzb3VyY2UuCkBA IC0xMDg0LDEzICsxMDk2LDE0IEBACiAgICAgICAgICAgICAgICctLWluY2x1ZGUnLCAnLi4veG1s JywKICAgICAgICAgICAgIF0sCiAgICAgICAgICAgfSwKKyAgICAgICAgICAnbXN2c19jeWd3aW5f c2hlbGwnOiAwLAogICAgICAgICAgICMgRklYTUU6ICBOb3RlIHRoYXQgd2UgcHV0IHRoZSAuY3Bw IGZpbGVzIGluIHdlYmNvcmUvYmluZGluZ3MKICAgICAgICAgICAjIGJ1dCB0aGUgLmggZmlsZXMg aW4gd2Via2l0L2JpbmRpbmdzLiAgVGhpcyBpcyB0byB3b3JrIGFyb3VuZAogICAgICAgICAgICMg dGhlIHVuZm9ydHVuYXRlIGZhY3QgdGhhdCBHWVAgc3RyaXBzIGR1cGxpY2F0ZSBhcmd1bWVudHMK ICAgICAgICAgICAjIGZyb20gbGlzdHMuICBXaGVuIHdlIGhhdmUgYSBiZXR0ZXIgR1lQIHdheSB0 byBzdXBwcmVzcyB0aGF0CiAgICAgICAgICAgIyBiZWhhdmlvciwgY2hhbmdlIHRoZSBvdXRwdXQg bG9jYXRpb24uCiAgICAgICAgICAgJ2FjdGlvbic6IFsKLSAgICAgICAgICAgICdwZXJsJywKKyAg ICAgICAgICAgICc8KHBlcmxfZXhlKScsCiAgICAgICAgICAgICAnLXcnLAogICAgICAgICAgICAg Jy1JLi4vYmluZGluZ3Mvc2NyaXB0cycsCiAgICAgICAgICAgICAnLi4vYmluZGluZ3Mvc2NyaXB0 cy9nZW5lcmF0ZS1iaW5kaW5ncy5wbCcsCkBAIC0xMTA4LDYgKzExMjEsNyBAQAogICAgICAgICAg ICAgJy0tYWRkaXRpb25hbElkbEZpbGVzTGlzdCcsCiAgICAgICAgICAgICAnPChhZGRpdGlvbmFs X2lkbF9maWxlc19saXN0KScsCiAgICAgICAgICAgICAnPChSVUxFX0lOUFVUX1BBVEgpJywKKyAg ICAgICAgICAgICc8QChwcmVwcm9jZXNzb3IpJywKICAgICAgICAgICBdLAogICAgICAgICAgICdt ZXNzYWdlJzogJ0dlbmVyYXRpbmcgYmluZGluZyBmcm9tIDwoUlVMRV9JTlBVVF9QQVRIKScsCiAg ICAgICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9zY3JpcHRz L3J1bGVfYmlzb24ucHkgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9zY3JpcHRzL3J1bGVf Ymlzb24ucHkKaW5kZXggZWI4NWE0YmE2YzQ2YzBiOTk3MjQ1NmMwYWY3YmZhNGE5OGY0ZTY4NS4u OTUyMTY1YTY3ZTg5OGZiMGFlMWQwNzViMmNjMTJhNDVlMzhhZjQxZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvc2NyaXB0cy9ydWxlX2Jpc29uLnB5CisrKyBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL3NjcmlwdHMvcnVsZV9iaXNvbi5weQpAQCAtMzIsNyArMzIs NyBAQAogIyBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhIEJTRC1zdHls ZSBsaWNlbnNlIHRoYXQgY2FuIGJlCiAjIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUuCiAKLSMg dXNhZ2U6IHJ1bGVfYmlzb24ucHkgSU5QVVRfRklMRSBPVVRQVVRfRElSCisjIHVzYWdlOiBydWxl X2Jpc29uLnB5IElOUFVUX0ZJTEUgT1VUUFVUX0RJUiBbQklTT05fRVhFXQogIyBJTlBVVF9GSUxF IGlzIGEgcGF0aCB0byBlaXRoZXIgQ1NTR3JhbW1hci55IG9yIFhQYXRoR3JhbW1hci55LgogIyBP VVRQVVRfRElSIGlzIHdoZXJlIHRoZSBiaXNvbi1nZW5lcmF0ZWQgLmNwcCBhbmQgLmggZmlsZXMg c2hvdWxkIGJlIHBsYWNlZC4KIApAQCAtNDIsMTAgKzQyLDEzIEBAIGltcG9ydCBvcy5wYXRoCiBp bXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHN5cwogCi1hc3NlcnQgbGVuKHN5cy5hcmd2KSA9PSAz Cithc3NlcnQgbGVuKHN5cy5hcmd2KSA9PSAzIG9yIGxlbihzeXMuYXJndikgPT0gNAogCiBpbnB1 dEZpbGUgPSBzeXMuYXJndlsxXQogb3V0cHV0RGlyID0gc3lzLmFyZ3ZbMl0KK2Jpc29uRXhlID0g J2Jpc29uJworaWYgbGVuKHN5cy5hcmd2KSA+IDM6CisgICAgYmlzb25FeGUgPSBzeXMuYXJndlsz XQogCiBpbnB1dE5hbWUgPSBvcy5wYXRoLmJhc2VuYW1lKGlucHV0RmlsZSkKIGFzc2VydCBpbnB1 dE5hbWUgPT0gJ0NTU0dyYW1tYXIueScgb3IgaW5wdXROYW1lID09ICdYUGF0aEdyYW1tYXIueScK QEAgLTY5LDcgKzcyLDcgQEAgZm9yIG91dHB1dEhUcnkgaW4gb3V0cHV0SFRyaWVzOgogCiBvdXRw dXRDcHAgPSBvcy5wYXRoLmpvaW4ob3V0cHV0RGlyLCBpbnB1dFJvb3QgKyAnLmNwcCcpCiAKLXJl dHVybkNvZGUgPSBzdWJwcm9jZXNzLmNhbGwoWydiaXNvbicsICctZCcsICctcCcsIHByZWZpeCwg aW5wdXRGaWxlLCAnLW8nLCBvdXRwdXRDcHBdKQorcmV0dXJuQ29kZSA9IHN1YnByb2Nlc3MuY2Fs bChbYmlzb25FeGUsICctZCcsICctcCcsIHByZWZpeCwgaW5wdXRGaWxlLCAnLW8nLCBvdXRwdXRD cHBdKQogYXNzZXJ0IHJldHVybkNvZGUgPT0gMAogCiAjIEZpbmQgdGhlIG5hbWUgdGhhdCBiaXNv biB1c2VkIGZvciB0aGUgZ2VuZXJhdGVkIGhlYWRlciBmaWxlLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNzb3IucG0gYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbQppbmRleCAzYjRjZWMxOTE5YjVlOGQ5 ODYwZDA4ZDg5OTNhN2E1NjAzMzJjNzA3Li45NTk5NWYwMGFmMDI3YTdhNmUwZWRkYzE3NDVlNDA2 M2NkOWZiZDBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3By ZXByb2Nlc3Nvci5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXBy b2Nlc3Nvci5wbQpAQCAtNjMsNyArNjMsNyBAQCBzdWIgYXBwbHlQcmVwcm9jZXNzb3IKICAgICBA bWFjcm9zID0gbWFwIHsgIi1EJF8iIH0gQG1hY3JvczsKIAogICAgIG15ICRwaWQgPSAwOwotICAg IGlmICgkQ29uZmlne29zbmFtZX0gZXEgImN5Z3dpbiIpIHsKKyAgICBpZiAoJENvbmZpZ3tvc25h bWV9IGVxICJjeWd3aW4iIHx8ICRDb25maWd7b3NuYW1lfSBlcSAnTVNXaW4zMicpIHsKICAgICAg ICAgIyBUaGlzIGNhbGwgY2FuIGZhaWwgaWYgV2luZG93cyByZWJhc2VzIGN5Z3dpbiwgc28gcmV0 cnkgYSBmZXcgdGltZXMgdW50aWwgaXQgc3VjY2VlZHMuCiAgICAgICAgIGZvciAobXkgJHRyaWVz ID0gMDsgISRwaWQgJiYgKCR0cmllcyA8IDIwKTsgJHRyaWVzKyspIHsKICAgICAgICAgICAgIGV2 YWwgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbWFrZS1oYXNoLXRvb2xzLnBsIGIvU291 cmNlL1dlYkNvcmUvbWFrZS1oYXNoLXRvb2xzLnBsCmluZGV4IGVhM2EwZjUwNzJiNWVmNWE1ZTU3 YTZjNTUyOTUwNWRlNGRkYjNhZGIuLjVmNzdkMmJkNmQ1MjRiZDM5OWE1ZjdjMWY5MzAzZDZlNTdj MGUwYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL21ha2UtaGFzaC10b29scy5wbAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9tYWtlLWhhc2gtdG9vbHMucGwKQEAgLTI5LDEwICsyOSwxNCBAQCBt eSAkb3B0aW9uID0gYmFzZW5hbWUoJEFSR1ZbMF0sIi5ncGVyZiIpOwogCiBpZiAoJG9wdGlvbiBl cSAiQ29sb3JEYXRhIikgewogICAgIG15ICRjb2xvckRhdGFHZW5lcmF0ZWQgICAgICAgICA9ICIk b3V0ZGlyL0NvbG9yRGF0YS5jcHAiOwotICAgIG15ICRjb2xvckRhdGFHcGVyZiAgICAgICAgICAg ICA9ICRBUkdWWzBdOwotICAgIHNoaWZ0OworICAgIG15ICRjb2xvckRhdGFHcGVyZiAgICAgICAg ICAgICA9IHNoaWZ0OworICAgIG15ICRjdXN0b21HcGVyZiAgICAgICAgICAgICAgICA9IHNoaWZ0 OwogCi0gICAgbXkgJGdwZXJmID0gJEVOVntHUEVSRn0gPyAkRU5We0dQRVJGfSA6ICJncGVyZiI7 CisgICAgIyBncGVyZiBlbWl0cyB0aGlzIGZpbGVuYW1lIGxpdGVyYWxseSBpbiAjbGluZSBkaXJl Y3RpdmVzLCBidXQgVlMgZXJyb3JzCisgICAgIyBvdXQgYmVjYXVzZSB0aGUgZmlsZW5hbWVzIHRo ZW4gY29udGFpbiB1bmVzY2FwZWQgXHMsIHNvIHJlcGxhY2UgdGhlIFwKKyAgICAjIHdpdGggLy4K KyAgICAkY29sb3JEYXRhR3BlcmYgPX4gcy9cXC9cLy9nOworICAgIG15ICRncGVyZiA9ICRFTlZ7 R1BFUkZ9ID8gJEVOVntHUEVSRn0gOiAoJGN1c3RvbUdwZXJmID8gJGN1c3RvbUdwZXJmIDogImdw ZXJmIik7CiAgICAgc3lzdGVtKCJcIiRncGVyZlwiIC0ta2V5LXBvc2l0aW9ucz1cIipcIiAtRCAt cyAyICRjb2xvckRhdGFHcGVyZiAtLW91dHB1dC1maWxlPSRjb2xvckRhdGFHZW5lcmF0ZWQiKSA9 PSAwIHx8IGRpZSAiY2FsbGluZyBncGVyZiBmYWlsZWQ6ICQ/IjsKIAogfSBlbHNlIHsK