113448 2013-03-27 15:03:55 -0700 Move preprocessing of idl to pre-pass for gyp 2013-03-28 16:31:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 113539 1 scottmg scottmg abarth dglazkov haraken japhet peter+ews rego+ews thakis tony webkit.review.bot xan.lopez oldest_to_newest 864893 0 scottmg 2013-03-27 15:03:55 -0700 Reduces number of invocations of preprocessor from 20071 to 633. 864894 1 195405 scottmg 2013-03-27 15:04:13 -0700 Created attachment 195405 patch 864895 2 195406 scottmg 2013-03-27 15:04:51 -0700 Created attachment 195406 patch 864898 3 scottmg 2013-03-27 15:08:08 -0700 preprocessor.pm still does the preprocessing, and if available returns an already preprocessed idl file. This allows a few other users of preprocessor (in css, etc.) to not bother having a pre-pass. If it looks reasonable, I'll add a ChangeLog, etc. 864900 4 195409 scottmg 2013-03-27 15:10:43 -0700 Created attachment 195409 tidy up 864903 5 195409 tony 2013-03-27 15:16:56 -0700 Comment on attachment 195409 tidy up View in context: https://bugs.webkit.org/attachment.cgi?id=195409&action=review Nice, I like this better than my patch. Let's clean this up and land this instead. > WebCore/WebCore.gypi:716 > + 'svg/SVGURIReference.idl', Is this change intentional? > WebCore/bindings/scripts/preprocessor.pm:56 > + print "$fileName was not pre-preprocessed, looking for $preprocessedFile\n"; We probably don't want this to print this. I think some other port may use $outputDirectory but without the preprocess build step, this will just spam to the console. 864905 6 tony 2013-03-27 15:17:31 -0700 *** Bug 113442 has been marked as a duplicate of this bug. *** 864913 7 thakis 2013-03-27 15:26:38 -0700 I think this looks reasonable. It's a bit unfortunate that we still need to shell out to perl for the preprocessing step, but oh well. 864920 8 195415 scottmg 2013-03-27 15:34:49 -0700 Created attachment 195415 remove print 864921 9 scottmg 2013-03-27 15:35:17 -0700 (In reply to comment #5) > (From update of attachment 195409 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=195409&action=review > > Nice, I like this better than my patch. Let's clean this up and land this instead. > > > WebCore/WebCore.gypi:716 > > + 'svg/SVGURIReference.idl', > > Is this change intentional? Yes, it wasn't included in the top-level gyp list, but is referenced in other idls, so it ended up being processed a few hundred times via references. It was the only one in that situation, so I assumed the omission was unintentional. (?) > > > WebCore/bindings/scripts/preprocessor.pm:56 > > + print "$fileName was not pre-preprocessed, looking for $preprocessedFile\n"; > > We probably don't want this to print this. I think some other port may use $outputDirectory but without the preprocess build step, this will just spam to the console. Done. 864932 10 195420 scottmg 2013-03-27 15:46:03 -0700 Created attachment 195420 Patch 864933 11 scottmg 2013-03-27 15:46:36 -0700 with ChangeLog now. 864934 12 195420 tony 2013-03-27 15:48:57 -0700 Comment on attachment 195420 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195420&action=review > Source/WebCore/ChangeLog:17 > + * WebCore.gypi: Nit: Please explain why you added the idl file here. > Source/WebCore/WebCore.gyp/WebCore.gyp:649 > 'sources': [ > # bison rule Should we remove the preprocess flag from our calls to generate-bindings.pl? 864939 13 195420 eflews.bot 2013-03-27 15:55:12 -0700 Comment on attachment 195420 Patch Attachment 195420 did not pass efl-ews (efl): Output: http://webkit-commit-queue.appspot.com/results/17288684 864941 14 195420 webkit.review.bot 2013-03-27 15:56:11 -0700 Comment on attachment 195420 Patch Attachment 195420 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17319242 864945 15 195423 scottmg 2013-03-27 15:57:44 -0700 Created attachment 195423 add note to changelog 864947 16 tony 2013-03-27 15:58:37 -0700 Looks like File::Slurp and File::Basename doesn't exist on all platforms. 864950 17 scottmg 2013-03-27 16:01:04 -0700 (In reply to comment #12) > (From update of attachment 195420 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=195420&action=review > > > Source/WebCore/ChangeLog:17 > > + * WebCore.gypi: > > Nit: Please explain why you added the idl file here. Done. > > > Source/WebCore/WebCore.gyp/WebCore.gyp:649 > > 'sources': [ > > # bison rule > > Should we remove the preprocess flag from our calls to generate-bindings.pl? I might be confused, but I think we shouldn't because of cases like the idl above -- if someone forgets to add a subreferenced idl, this way it'll still work. 864961 18 195427 scottmg 2013-03-27 16:14:18 -0700 Created attachment 195427 fix for older perl versions 864970 19 195427 webkit.review.bot 2013-03-27 16:30:33 -0700 Comment on attachment 195427 fix for older perl versions Attachment 195427 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17329205 864973 20 scottmg 2013-03-27 16:35:19 -0700 (In reply to comment #19) > (From update of attachment 195427 [details]) > Attachment 195427 [details] did not pass chromium-ews (chromium-xvfb): > Output: http://webkit-commit-queue.appspot.com/results/17329205 Hm, apparently that's why. Sigh. I can either add it manually to the preprocess, or let it do a couple hundred extra invocations I guess. 864982 21 195427 peter+ews 2013-03-27 16:47:42 -0700 Comment on attachment 195427 fix for older perl versions Attachment 195427 did not pass cr-android-ews (chromium-android): Output: http://webkit-commit-queue.appspot.com/results/17130990 864993 22 195437 scottmg 2013-03-27 16:56:34 -0700 Created attachment 195437 fix SVGURIReference.idl 865080 23 195437 webkit.review.bot 2013-03-27 18:26:53 -0700 Comment on attachment 195437 fix SVGURIReference.idl Rejecting attachment 195437 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', '--bot-id=gce-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 195437, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: t/git/webkit-commit-queue/Source/WebKit/chromium/v8 --revision 14075 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 55>At revision 14075. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://webkit-commit-queue.appspot.com/results/17239764 865085 24 195437 webkit.review.bot 2013-03-27 18:40:06 -0700 Comment on attachment 195437 fix SVGURIReference.idl Rejecting attachment 195437 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', '--bot-id=gce-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 195437, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: 2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/bindings/scripts/CodeGenerator.pm.rej patching file Source/WebCore/bindings/scripts/IDLParser.pm patching file Source/WebCore/bindings/scripts/generate-bindings.pl patching file Source/WebCore/bindings/scripts/generate-preprocessed-idls.pl patching file Source/WebCore/bindings/scripts/preprocessor.pm Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://webkit-commit-queue.appspot.com/results/17342025 865549 25 195579 scottmg 2013-03-28 08:55:01 -0700 Created attachment 195579 rebase 865551 26 195579 haraken 2013-03-28 08:55:42 -0700 Comment on attachment 195579 rebase here we go! 865552 27 195579 webkit.review.bot 2013-03-28 08:58:06 -0700 Comment on attachment 195579 rebase Rejecting attachment 195579 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', '--bot-id=gce-cq-04', 'apply-attachment', '--no-update', '--non-interactive', 195579, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: 2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/bindings/scripts/CodeGenerator.pm.rej patching file Source/WebCore/bindings/scripts/IDLParser.pm patching file Source/WebCore/bindings/scripts/generate-bindings.pl patching file Source/WebCore/bindings/scripts/generate-preprocessed-idls.pl patching file Source/WebCore/bindings/scripts/preprocessor.pm Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://webkit-commit-queue.appspot.com/results/17342159 865557 28 scottmg 2013-03-28 09:02:59 -0700 (In reply to comment #27) > (From update of attachment 195579 [details]) > Rejecting attachment 195579 [details] from commit-queue. > > Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', '--bot-id=gce-cq-04', 'apply-attachment', '--no-update', '--non-interactive', 195579, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue > > Last 500 characters of output: > 2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/bindings/scripts/CodeGenerator.pm.rej > patching file Source/WebCore/bindings/scripts/IDLParser.pm > patching file Source/WebCore/bindings/scripts/generate-bindings.pl > patching file Source/WebCore/bindings/scripts/generate-preprocessed-idls.pl > patching file Source/WebCore/bindings/scripts/preprocessor.pm > > Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue > > Full output: http://webkit-commit-queue.appspot.com/results/17342159 Ah, looks like it's because of http://trac.webkit.org/changeset/147041/trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm which I also had to modify here. I only rebased to the Chromium DEPS revision. I will wait until WebKit is rolled in Chromium and then try again. 865582 29 thakis 2013-03-28 09:40:20 -0700 (In reply to comment #28) > (In reply to comment #27) > > (From update of attachment 195579 [details] [details]) > > Rejecting attachment 195579 [details] [details] from commit-queue. > > > > Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', '--bot-id=gce-cq-04', 'apply-attachment', '--no-update', '--non-interactive', 195579, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue > > > > Last 500 characters of output: > > 2 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/bindings/scripts/CodeGenerator.pm.rej > > patching file Source/WebCore/bindings/scripts/IDLParser.pm > > patching file Source/WebCore/bindings/scripts/generate-bindings.pl > > patching file Source/WebCore/bindings/scripts/generate-preprocessed-idls.pl > > patching file Source/WebCore/bindings/scripts/preprocessor.pm > > > > Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue > > > > Full output: http://webkit-commit-queue.appspot.com/results/17342159 > > Ah, looks like it's because of http://trac.webkit.org/changeset/147041/trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm which I also had to modify here. > > I only rebased to the Chromium DEPS revision. I will wait until WebKit is rolled in Chromium and then try again. If you're on old git, you can `git checkout master; git pull; git rebase master yourbranch` and reupload to rebase to webkit head (and then `git checkout gclient` again to get back to deps) 865589 30 195587 scottmg 2013-03-28 09:58:54 -0700 Created attachment 195587 rebase again 865603 31 195587 webkit.review.bot 2013-03-28 10:25:17 -0700 Comment on attachment 195587 rebase again Clearing flags on attachment: 195587 Committed r147130: <http://trac.webkit.org/changeset/147130> 865604 32 webkit.review.bot 2013-03-28 10:25:22 -0700 All reviewed patches have been landed. Closing bug. 865828 33 webkit.review.bot 2013-03-28 14:54:20 -0700 Re-opened since this is blocked by bug 113539 865904 34 tony 2013-03-28 16:31:16 -0700 This patch is now unnecessary. 195405 2013-03-27 15:04:13 -0700 2013-03-27 15:10:43 -0700 patch a.diff text/plain 8116 scottmg SW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXANCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBX ZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwCShyZXZpc2lvbiAxNDY4NzMpDQorKysgV2Vi Q29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAkod29ya2luZyBjb3B5KQ0KQEAgLTU5NSwxMiAr NTk1LDU1IEBADQogICAgICAgXQogICAgIH0sCiAgICAgeworICAgICAgJ3RhcmdldF9uYW1lJzog J2dlbmVyYXRlX3ByZXByb2Nlc3NlZF9pZGxzJywKKyAgICAgICd0eXBlJzogJ25vbmUnLAorICAg ICAgJ3NvdXJjZXMnOiBbCisgICAgICAgICc8QChiaW5kaW5nc19pZGxfZmlsZXMpJywKKyAgICAg ICAgJzxAKHdlYmNvcmVfdGVzdF9zdXBwb3J0X2lkbF9maWxlcyknLAorICAgICAgXSwKKyAgICAg ICdydWxlcyc6IFsKKyAgICAgICAgIyBSdWxlcyB0byBidWlsZCBkZXJpdmVkIHNvdXJjZXMuCisg ICAgICAgIHsKKyAgICAgICAgICAncnVsZV9uYW1lJzogJ2JpbmRpbmcnLAorICAgICAgICAgICdl eHRlbnNpb24nOiAnaWRsJywKKyAgICAgICAgICAnbXN2c19leHRlcm5hbF9ydWxlJzogMSwKKyAg ICAgICAgICAndmFyaWFibGVzJzogeworICAgICAgICAgICAgJ2FsbF9pZGxfZmlsZXNfbGlzdCc6 ICc8fChhbGxfaWRsX2ZpbGVzX2xpc3QudG1wIDxAKGJpbmRpbmdzX2lkbF9maWxlcykgPEAod2Vi Y29yZV90ZXN0X3N1cHBvcnRfaWRsX2ZpbGVzKSknLAorICAgICAgICAgIH0sCisgICAgICAgICAg J2lucHV0cyc6IFsKKyAgICAgICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXBy ZXByb2Nlc3NlZC1pZGxzLnBsJywKKyAgICAgICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRzL3By ZXByb2Nlc3Nvci5wbScsCisgICAgICAgICAgICAnPChhbGxfaWRsX2ZpbGVzX2xpc3QpJywKKyAg ICAgICAgICAgICc8IUAoY2F0IDwoYWxsX2lkbF9maWxlc19saXN0KSknLAorICAgICAgICAgIF0s CisgICAgICAgICAgJ291dHB1dHMnOiBbCisgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJ QVRFX0RJUikvd2ViY29yZS9iaW5kaW5ncy88KFJVTEVfSU5QVVRfUk9PVCkuaWRsLnBwJywKKyAg ICAgICAgICBdLAorICAgICAgICAgICdtc3ZzX2N5Z3dpbl9zaGVsbCc6IDAsCisgICAgICAgICAg J2FjdGlvbic6IFsKKyAgICAgICAgICAgICc8KHBlcmxfZXhlKScsCisgICAgICAgICAgICAnLXcn LAorICAgICAgICAgICAgJy1JLi4vYmluZGluZ3Mvc2NyaXB0cycsCisgICAgICAgICAgICAnLi4v YmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1wcmVwcm9jZXNzZWQtaWRscy5wbCcsCisgICAgICAg ICAgICAnLS1vdXRwdXQnLAorICAgICAgICAgICAgJzxAKF9vdXRwdXRzKScsCisgICAgICAgICAg ICAnLS1kZWZpbmVzJywKKyAgICAgICAgICAgICc8KGZlYXR1cmVfZGVmaW5lcykgTEFOR1VBR0Vf SkFWQVNDUklQVCBWOF9CSU5ESU5HJywKKyAgICAgICAgICAgICc8KFJVTEVfSU5QVVRfUEFUSCkn LAorICAgICAgICAgICAgJzxAKHByZXByb2Nlc3NvciknLAorICAgICAgICAgIF0sCisgICAgICAg ICAgJ21lc3NhZ2UnOiAnUHJlcHJvY2Vzc2luZyA8KFJVTEVfSU5QVVRfUEFUSCknLAorICAgICAg ICB9LAorICAgICAgXSwKKyAgICB9LAorICAgIHsKICAgICAgICd0YXJnZXRfbmFtZSc6ICd3ZWJj b3JlX2JpbmRpbmdzX3NvdXJjZXMnLAogICAgICAgJ3R5cGUnOiAnbm9uZScsCiAgICAgICAnaGFy ZF9kZXBlbmRlbmN5JzogMSwKICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICdnZW5l cmF0ZV9zdXBwbGVtZW50YWxfZGVwZW5kZW5jeScsCiAgICAgICAgICdnZW5lcmF0ZV9zZXR0aW5n cycsCisgICAgICAgICdnZW5lcmF0ZV9wcmVwcm9jZXNzZWRfaWRscycsCiAgICAgICBdLAogICAg ICAgJ3NvdXJjZXMnOiBbCiAgICAgICAgICMgYmlzb24gcnVsZQpJbmRleDogV2ViQ29yZS9XZWJD b3JlLmd5cGkNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJDb3JlL1dlYkNvcmUuZ3lwaQkocmV2aXNpb24g MTQ2ODczKQ0KKysrIFdlYkNvcmUvV2ViQ29yZS5neXBpCSh3b3JraW5nIGNvcHkpDQpAQCAtNzEz LDYgKzcxMyw3IEBADQogICAgICAgICAgICAgJ3N2Zy9TVkdUcmFuc2Zvcm1MaXN0LmlkbCcsCiAg ICAgICAgICAgICAnc3ZnL1NWR1RyYW5zZm9ybWFibGUuaWRsJywKICAgICAgICAgICAgICdzdmcv U1ZHVW5pdFR5cGVzLmlkbCcsCisgICAgICAgICAgICAnc3ZnL1NWR1VSSVJlZmVyZW5jZS5pZGwn LAogICAgICAgICAgICAgJ3N2Zy9TVkdVc2VFbGVtZW50LmlkbCcsCiAgICAgICAgICAgICAnc3Zn L1NWR1ZpZXdFbGVtZW50LmlkbCcsCiAgICAgICAgICAgICAnc3ZnL1NWR1ZpZXdTcGVjLmlkbCcs CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtcHJlcHJvY2Vzc2VkLWlk bHMucGwNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUt cHJlcHJvY2Vzc2VkLWlkbHMucGwJKHJldmlzaW9uIDApDQorKysgV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL2dlbmVyYXRlLXByZXByb2Nlc3NlZC1pZGxzLnBsCShyZXZpc2lvbiAwKQ0KQEAgLTAs MCArMSw0MSBAQA0KKyMhL3Vzci9iaW4vcGVybCAtdworIworIyBDb3B5cmlnaHQgKEMpIDIwMTMg R29vZ2xlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFRoaXMgbGlicmFyeSBpcyBm cmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyMgbW9kaWZ5IGl0 IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKKyMgTGlj ZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVy CisjIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0 ZXIgdmVyc2lvbi4KKyMKKyMgVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3Bl IHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisjIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0 aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisjIE1FUkNIQU5UQUJJTElUWSBvciBG SVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisjIExpYnJhcnkg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorIworIyBZb3Ugc2hvdWxk IGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBM aWNlbnNlCisjIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5M SUIuICBJZiBub3QsIHdyaXRlIHRvCisjIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIElu Yy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsCisjIEJvc3RvbiwgTUEgMDIxMTAt MTMwMSwgVVNBLgorIworCit1c2Ugc3RyaWN0OworCit1c2UgcHJlcHJvY2Vzc29yOwordXNlIEZp bGU6OlNsdXJwOwordXNlIEdldG9wdDo6TG9uZzsKK3VzZSBDd2Q7CisKK215ICRkZWZpbmVzOwor bXkgJHByZXByb2Nlc3NvcjsKK215ICRvdXRwdXQ7CisKK0dldE9wdGlvbnMoJ2RlZmluZXM9cycg PT4gXCRkZWZpbmVzLAorICAgICAgICAgICAncHJlcHJvY2Vzc29yPXMnID0+IFwkcHJlcHJvY2Vz c29yLAorICAgICAgICAgICAnb3V0cHV0PXMnID0+IFwkb3V0cHV0KTsKKworZGllKCdNdXN0IHNw ZWNpZnkgI2RlZmluZSBtYWNyb3MgdXNpbmcgLS1kZWZpbmVzLicpIHVubGVzcyBkZWZpbmVkKCRk ZWZpbmVzKTsKK2RpZSgnTXVzdCBzcGVjaWZ5IHRoZSBvdXRwdXQgdXNpbmcgLS1vdXRwdXQuJykg dW5sZXNzIGRlZmluZWQoJG91dHB1dCk7CisKK215IEBjb250ZW50cyA9IGFwcGx5UHJlcHJvY2Vz c29yKCRBUkdWWzBdLCAkZGVmaW5lcywgJHByZXByb2Nlc3NvciwgdW5kZWYpOworI3ByaW50ICJX UklUSU5HICRvdXRwdXRcbiI7Cit3cml0ZV9maWxlKCRvdXRwdXQsIEBjb250ZW50cyk7Cg0KUHJv cGVydHkgY2hhbmdlcyBvbjogV2ViQ29yZVxiaW5kaW5nc1xzY3JpcHRzXGdlbmVyYXRlLXByZXBy b2Nlc3NlZC1pZGxzLnBsDQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fDQpBZGRlZDogc3ZuOmVvbC1zdHlsZQ0KICAgKyBM Rg0KDQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0NCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0NCi0tLSBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbQko cmV2aXNpb24gMTQ2ODczKQ0KKysrIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9yLnBtCSh3b3JraW5nIGNvcHkpDQpAQCAtMjg5LDcgKzI4OSw2IEBADQogewogICAgIG15ICRv YmplY3QgPSBzaGlmdDsKICAgICBteSAkaW50ZXJmYWNlTmFtZSA9IHNoaWZ0OwotICAgIG15ICRw YXJlbnRzT25seSA9IHNoaWZ0OwogCiAgICAgcmV0dXJuIHVuZGVmIGlmICRpbnRlcmZhY2VOYW1l IGVxICdPYmplY3QnOwogCkBAIC0zMDEsNyArMzAwLDcgQEANCiAKICAgICAjIFN0ZXAgIzI6IFBh cnNlIHRoZSBmb3VuZCBJREwgZmlsZSAoaW4gcXVpZXQgbW9kZSkuCiAgICAgbXkgJHBhcnNlciA9 IElETFBhcnNlci0+bmV3KDEpOwotICAgIG15ICRkb2N1bWVudCA9ICRwYXJzZXItPlBhcnNlKCRm aWxlbmFtZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IsICRwYXJlbnRzT25seSk7CisgICAgbXkg JGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGZpbGVuYW1lLCAkZGVmaW5lcywgJHByZXByb2Nl c3NvciwgJHVzZU91dHB1dERpcik7CiAKICAgICBmb3JlYWNoIG15ICRpbnRlcmZhY2UgKEB7JGRv Y3VtZW50LT5pbnRlcmZhY2VzfSkgewogICAgICAgICByZXR1cm4gJGludGVyZmFjZSBpZiAkaW50 ZXJmYWNlLT5uYW1lIGVxICRpbnRlcmZhY2VOYW1lOwpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsCShyZXZpc2lvbiAxNDY4NzMpDQorKysg V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsCSh3b3JraW5nIGNv cHkpDQpAQCAtMTI0LDcgKzEyNCw3IEBADQogCiAjIFBhcnNlIHRoZSB0YXJnZXQgSURMIGZpbGUu CiBteSAkdGFyZ2V0UGFyc2VyID0gSURMUGFyc2VyLT5uZXcoISR2ZXJib3NlKTsKLW15ICR0YXJn ZXREb2N1bWVudCA9ICR0YXJnZXRQYXJzZXItPlBhcnNlKCR0YXJnZXRJZGxGaWxlLCAkZGVmaW5l cywgJHByZXByb2Nlc3Nvcik7CitteSAkdGFyZ2V0RG9jdW1lbnQgPSAkdGFyZ2V0UGFyc2VyLT5Q YXJzZSgkdGFyZ2V0SWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IsICRvdXRwdXREaXJl Y3RvcnkpOwogCiBpZiAoJGlkbEF0dHJpYnV0ZXNGaWxlKSB7CiAgICAgbXkgJGlkbEF0dHJpYnV0 ZXMgPSBsb2FkSURMQXR0cmlidXRlcygkaWRsQXR0cmlidXRlc0ZpbGUpOwpAQCAtMTM2LDcgKzEz Niw3IEBADQogCiAgICAgbXkgJGludGVyZmFjZU5hbWUgPSBmaWxlcGFyc2UoYmFzZW5hbWUoJGlk bEZpbGUpLCAiLmlkbCIpOwogICAgIG15ICRwYXJzZXIgPSBJRExQYXJzZXItPm5ldyghJHZlcmJv c2UpOwotICAgIG15ICRkb2N1bWVudCA9ICRwYXJzZXItPlBhcnNlKCRpZGxGaWxlLCAkZGVmaW5l cywgJHByZXByb2Nlc3Nvcik7CisgICAgbXkgJGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGlk bEZpbGUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yLCAkb3V0cHV0RGlyZWN0b3J5KTsKIAogICAg IGZvcmVhY2ggbXkgJGludGVyZmFjZSAoQHskZG9jdW1lbnQtPmludGVyZmFjZXN9KSB7CiAgICAg ICAgIGlmICgkaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiU3VwcGxlbWVudGFsIn0g YW5kICRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJTdXBwbGVtZW50YWwifSBlcSAk dGFyZ2V0SW50ZXJmYWNlTmFtZSkgewpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lE TFBhcnNlci5wbQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQ YXJzZXIucG0JKHJldmlzaW9uIDE0Njg3MykNCisrKyBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv SURMUGFyc2VyLnBtCSh3b3JraW5nIGNvcHkpDQpAQCAtMTc2LDEwICsxNzYsMTEgQEANCiAgICAg bXkgJGZpbGVOYW1lID0gc2hpZnQ7CiAgICAgbXkgJGRlZmluZXMgPSBzaGlmdDsKICAgICBteSAk cHJlcHJvY2Vzc29yID0gc2hpZnQ7CisgICAgbXkgJG91dHB1dERpcmVjdG9yeSA9IHNoaWZ0Owog CiAgICAgbXkgQGRlZmluaXRpb25zID0gKCk7CiAKLSAgICBteSBAbGluZXMgPSBhcHBseVByZXBy b2Nlc3NvcigkZmlsZU5hbWUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yKTsKKyAgICBteSBAbGlu ZXMgPSBhcHBseVByZXByb2Nlc3NvcigkZmlsZU5hbWUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29y LCAkb3V0cHV0RGlyZWN0b3J5KTsKICAgICAkc2VsZi0+e0xpbmV9ID0gJGxpbmVzWzBdOwogICAg ICRzZWxmLT57RG9jdW1lbnRDb250ZW50fSA9IGpvaW4oJyAnLCBAbGluZXMpOwogCkluZGV4OiBX ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtDQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0g V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbQkocmV2aXNpb24gMTQ2ODcz KQ0KKysrIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNzb3IucG0JKHdvcmtpbmcg Y29weSkNCkBAIC0yMiw2ICsyMiw3IEBADQogdXNlIHdhcm5pbmdzOwogCiB1c2UgQ29uZmlnOwor dXNlIEZpbGU6OkJhc2VuYW1lOwogdXNlIElQQzo6T3BlbjI7CiB1c2UgSVBDOjpPcGVuMzsKIApA QCAtNDEsNyArNDIsMjEgQEANCiAgICAgbXkgJGZpbGVOYW1lID0gc2hpZnQ7CiAgICAgbXkgJGRl ZmluZXMgPSBzaGlmdDsKICAgICBteSAkcHJlcHJvY2Vzc29yID0gc2hpZnQ7CisgICAgbXkgJG91 dHB1dERpcmVjdG9yeSA9IHNoaWZ0OwogCisgICAgaWYgKCRvdXRwdXREaXJlY3RvcnkpIHsKKyAg ICAgICAgIyBJZiB0aGUgcHJlcHJvY2Vzc2VkIGJ1aWxkIGZpbGUgd2FzIGdlbmVyYXRlZCBhbHJl YWR5IGJ5IHRoZSBidWlsZAorICAgICAgICAjIHN5c3RlbSwgdGhlbiByZXR1cm4gdGhhdCBvbmUu IFRoaXMgYXZvaWRzIE5eMiBiZWhhdmlvciBpbiByZWFwcGx5aW5nCisgICAgICAgICMgdGhlIHBy ZXByb2Nlc3NvciB0aGUgaWRsIGZpbGVzIHJlZmVyZW5jZWQgYnkgb3RoZXIgaWRsIGZpbGVzLgor ICAgICAgICBteSAkYmFzZU5hbWUgPSBiYXNlbmFtZSgkZmlsZU5hbWUpOworICAgICAgICBteSAk cHJlcHJvY2Vzc2VkRmlsZSA9ICIkb3V0cHV0RGlyZWN0b3J5LyRiYXNlTmFtZS5wcCI7CisgICAg ICAgIGlmICgtZSAkcHJlcHJvY2Vzc2VkRmlsZSkgeworICAgICAgICAgICAgbXkgQGxpbmVzID0g ZG8geyBsb2NhbCBAQVJHViA9ICRwcmVwcm9jZXNzZWRGaWxlOyA8PiB9OworICAgICAgICAgICAg cmV0dXJuIEBsaW5lczsKKyAgICAgICAgfQorICAgICAgICBwcmludCAiJGZpbGVOYW1lIHdhcyBu b3QgcHJlLXByZXByb2Nlc3NlZCwgbG9va2luZyBmb3IgJHByZXByb2Nlc3NlZEZpbGVcbiI7Cisg ICAgfQorCiAgICAgbXkgQGFyZ3MgPSAoKTsKICAgICBpZiAoISRwcmVwcm9jZXNzb3IpIHsKICAg ICAgICAgcmVxdWlyZSBDb25maWc7Cg== 195406 2013-03-27 15:04:51 -0700 2013-03-27 15:10:43 -0700 patch a.diff text/plain 8116 scottmg SW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXANCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBX ZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwCShyZXZpc2lvbiAxNDY4NzMpDQorKysgV2Vi Q29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAkod29ya2luZyBjb3B5KQ0KQEAgLTU5NSwxMiAr NTk1LDU1IEBADQogICAgICAgXQogICAgIH0sCiAgICAgeworICAgICAgJ3RhcmdldF9uYW1lJzog J2dlbmVyYXRlX3ByZXByb2Nlc3NlZF9pZGxzJywKKyAgICAgICd0eXBlJzogJ25vbmUnLAorICAg ICAgJ3NvdXJjZXMnOiBbCisgICAgICAgICc8QChiaW5kaW5nc19pZGxfZmlsZXMpJywKKyAgICAg ICAgJzxAKHdlYmNvcmVfdGVzdF9zdXBwb3J0X2lkbF9maWxlcyknLAorICAgICAgXSwKKyAgICAg ICdydWxlcyc6IFsKKyAgICAgICAgIyBSdWxlcyB0byBidWlsZCBkZXJpdmVkIHNvdXJjZXMuCisg ICAgICAgIHsKKyAgICAgICAgICAncnVsZV9uYW1lJzogJ2JpbmRpbmcnLAorICAgICAgICAgICdl eHRlbnNpb24nOiAnaWRsJywKKyAgICAgICAgICAnbXN2c19leHRlcm5hbF9ydWxlJzogMSwKKyAg ICAgICAgICAndmFyaWFibGVzJzogeworICAgICAgICAgICAgJ2FsbF9pZGxfZmlsZXNfbGlzdCc6 ICc8fChhbGxfaWRsX2ZpbGVzX2xpc3QudG1wIDxAKGJpbmRpbmdzX2lkbF9maWxlcykgPEAod2Vi Y29yZV90ZXN0X3N1cHBvcnRfaWRsX2ZpbGVzKSknLAorICAgICAgICAgIH0sCisgICAgICAgICAg J2lucHV0cyc6IFsKKyAgICAgICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXBy ZXByb2Nlc3NlZC1pZGxzLnBsJywKKyAgICAgICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRzL3By ZXByb2Nlc3Nvci5wbScsCisgICAgICAgICAgICAnPChhbGxfaWRsX2ZpbGVzX2xpc3QpJywKKyAg ICAgICAgICAgICc8IUAoY2F0IDwoYWxsX2lkbF9maWxlc19saXN0KSknLAorICAgICAgICAgIF0s CisgICAgICAgICAgJ291dHB1dHMnOiBbCisgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJ QVRFX0RJUikvd2ViY29yZS9iaW5kaW5ncy88KFJVTEVfSU5QVVRfUk9PVCkuaWRsLnBwJywKKyAg ICAgICAgICBdLAorICAgICAgICAgICdtc3ZzX2N5Z3dpbl9zaGVsbCc6IDAsCisgICAgICAgICAg J2FjdGlvbic6IFsKKyAgICAgICAgICAgICc8KHBlcmxfZXhlKScsCisgICAgICAgICAgICAnLXcn LAorICAgICAgICAgICAgJy1JLi4vYmluZGluZ3Mvc2NyaXB0cycsCisgICAgICAgICAgICAnLi4v YmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1wcmVwcm9jZXNzZWQtaWRscy5wbCcsCisgICAgICAg ICAgICAnLS1vdXRwdXQnLAorICAgICAgICAgICAgJzxAKF9vdXRwdXRzKScsCisgICAgICAgICAg ICAnLS1kZWZpbmVzJywKKyAgICAgICAgICAgICc8KGZlYXR1cmVfZGVmaW5lcykgTEFOR1VBR0Vf SkFWQVNDUklQVCBWOF9CSU5ESU5HJywKKyAgICAgICAgICAgICc8KFJVTEVfSU5QVVRfUEFUSCkn LAorICAgICAgICAgICAgJzxAKHByZXByb2Nlc3NvciknLAorICAgICAgICAgIF0sCisgICAgICAg ICAgJ21lc3NhZ2UnOiAnUHJlcHJvY2Vzc2luZyA8KFJVTEVfSU5QVVRfUEFUSCknLAorICAgICAg ICB9LAorICAgICAgXSwKKyAgICB9LAorICAgIHsKICAgICAgICd0YXJnZXRfbmFtZSc6ICd3ZWJj b3JlX2JpbmRpbmdzX3NvdXJjZXMnLAogICAgICAgJ3R5cGUnOiAnbm9uZScsCiAgICAgICAnaGFy ZF9kZXBlbmRlbmN5JzogMSwKICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICdnZW5l cmF0ZV9zdXBwbGVtZW50YWxfZGVwZW5kZW5jeScsCiAgICAgICAgICdnZW5lcmF0ZV9zZXR0aW5n cycsCisgICAgICAgICdnZW5lcmF0ZV9wcmVwcm9jZXNzZWRfaWRscycsCiAgICAgICBdLAogICAg ICAgJ3NvdXJjZXMnOiBbCiAgICAgICAgICMgYmlzb24gcnVsZQpJbmRleDogV2ViQ29yZS9XZWJD b3JlLmd5cGkNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJDb3JlL1dlYkNvcmUuZ3lwaQkocmV2aXNpb24g MTQ2ODczKQ0KKysrIFdlYkNvcmUvV2ViQ29yZS5neXBpCSh3b3JraW5nIGNvcHkpDQpAQCAtNzEz LDYgKzcxMyw3IEBADQogICAgICAgICAgICAgJ3N2Zy9TVkdUcmFuc2Zvcm1MaXN0LmlkbCcsCiAg ICAgICAgICAgICAnc3ZnL1NWR1RyYW5zZm9ybWFibGUuaWRsJywKICAgICAgICAgICAgICdzdmcv U1ZHVW5pdFR5cGVzLmlkbCcsCisgICAgICAgICAgICAnc3ZnL1NWR1VSSVJlZmVyZW5jZS5pZGwn LAogICAgICAgICAgICAgJ3N2Zy9TVkdVc2VFbGVtZW50LmlkbCcsCiAgICAgICAgICAgICAnc3Zn L1NWR1ZpZXdFbGVtZW50LmlkbCcsCiAgICAgICAgICAgICAnc3ZnL1NWR1ZpZXdTcGVjLmlkbCcs CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtcHJlcHJvY2Vzc2VkLWlk bHMucGwNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUt cHJlcHJvY2Vzc2VkLWlkbHMucGwJKHJldmlzaW9uIDApDQorKysgV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL2dlbmVyYXRlLXByZXByb2Nlc3NlZC1pZGxzLnBsCShyZXZpc2lvbiAwKQ0KQEAgLTAs MCArMSw0MSBAQA0KKyMhL3Vzci9iaW4vcGVybCAtdworIworIyBDb3B5cmlnaHQgKEMpIDIwMTMg R29vZ2xlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFRoaXMgbGlicmFyeSBpcyBm cmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyMgbW9kaWZ5IGl0 IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKKyMgTGlj ZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVy CisjIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0 ZXIgdmVyc2lvbi4KKyMKKyMgVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3Bl IHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisjIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0 aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisjIE1FUkNIQU5UQUJJTElUWSBvciBG SVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisjIExpYnJhcnkg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorIworIyBZb3Ugc2hvdWxk IGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBM aWNlbnNlCisjIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5M SUIuICBJZiBub3QsIHdyaXRlIHRvCisjIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIElu Yy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsCisjIEJvc3RvbiwgTUEgMDIxMTAt MTMwMSwgVVNBLgorIworCit1c2Ugc3RyaWN0OworCit1c2UgcHJlcHJvY2Vzc29yOwordXNlIEZp bGU6OlNsdXJwOwordXNlIEdldG9wdDo6TG9uZzsKK3VzZSBDd2Q7CisKK215ICRkZWZpbmVzOwor bXkgJHByZXByb2Nlc3NvcjsKK215ICRvdXRwdXQ7CisKK0dldE9wdGlvbnMoJ2RlZmluZXM9cycg PT4gXCRkZWZpbmVzLAorICAgICAgICAgICAncHJlcHJvY2Vzc29yPXMnID0+IFwkcHJlcHJvY2Vz c29yLAorICAgICAgICAgICAnb3V0cHV0PXMnID0+IFwkb3V0cHV0KTsKKworZGllKCdNdXN0IHNw ZWNpZnkgI2RlZmluZSBtYWNyb3MgdXNpbmcgLS1kZWZpbmVzLicpIHVubGVzcyBkZWZpbmVkKCRk ZWZpbmVzKTsKK2RpZSgnTXVzdCBzcGVjaWZ5IHRoZSBvdXRwdXQgdXNpbmcgLS1vdXRwdXQuJykg dW5sZXNzIGRlZmluZWQoJG91dHB1dCk7CisKK215IEBjb250ZW50cyA9IGFwcGx5UHJlcHJvY2Vz c29yKCRBUkdWWzBdLCAkZGVmaW5lcywgJHByZXByb2Nlc3NvciwgdW5kZWYpOworI3ByaW50ICJX UklUSU5HICRvdXRwdXRcbiI7Cit3cml0ZV9maWxlKCRvdXRwdXQsIEBjb250ZW50cyk7Cg0KUHJv cGVydHkgY2hhbmdlcyBvbjogV2ViQ29yZVxiaW5kaW5nc1xzY3JpcHRzXGdlbmVyYXRlLXByZXBy b2Nlc3NlZC1pZGxzLnBsDQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fDQpBZGRlZDogc3ZuOmVvbC1zdHlsZQ0KICAgKyBM Rg0KDQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0NCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0NCi0tLSBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbQko cmV2aXNpb24gMTQ2ODczKQ0KKysrIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9yLnBtCSh3b3JraW5nIGNvcHkpDQpAQCAtMjg5LDcgKzI4OSw2IEBADQogewogICAgIG15ICRv YmplY3QgPSBzaGlmdDsKICAgICBteSAkaW50ZXJmYWNlTmFtZSA9IHNoaWZ0OwotICAgIG15ICRw YXJlbnRzT25seSA9IHNoaWZ0OwogCiAgICAgcmV0dXJuIHVuZGVmIGlmICRpbnRlcmZhY2VOYW1l IGVxICdPYmplY3QnOwogCkBAIC0zMDEsNyArMzAwLDcgQEANCiAKICAgICAjIFN0ZXAgIzI6IFBh cnNlIHRoZSBmb3VuZCBJREwgZmlsZSAoaW4gcXVpZXQgbW9kZSkuCiAgICAgbXkgJHBhcnNlciA9 IElETFBhcnNlci0+bmV3KDEpOwotICAgIG15ICRkb2N1bWVudCA9ICRwYXJzZXItPlBhcnNlKCRm aWxlbmFtZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IsICRwYXJlbnRzT25seSk7CisgICAgbXkg JGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGZpbGVuYW1lLCAkZGVmaW5lcywgJHByZXByb2Nl c3NvciwgJHVzZU91dHB1dERpcik7CiAKICAgICBmb3JlYWNoIG15ICRpbnRlcmZhY2UgKEB7JGRv Y3VtZW50LT5pbnRlcmZhY2VzfSkgewogICAgICAgICByZXR1cm4gJGludGVyZmFjZSBpZiAkaW50 ZXJmYWNlLT5uYW1lIGVxICRpbnRlcmZhY2VOYW1lOwpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsCShyZXZpc2lvbiAxNDY4NzMpDQorKysg V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsCSh3b3JraW5nIGNv cHkpDQpAQCAtMTI0LDcgKzEyNCw3IEBADQogCiAjIFBhcnNlIHRoZSB0YXJnZXQgSURMIGZpbGUu CiBteSAkdGFyZ2V0UGFyc2VyID0gSURMUGFyc2VyLT5uZXcoISR2ZXJib3NlKTsKLW15ICR0YXJn ZXREb2N1bWVudCA9ICR0YXJnZXRQYXJzZXItPlBhcnNlKCR0YXJnZXRJZGxGaWxlLCAkZGVmaW5l cywgJHByZXByb2Nlc3Nvcik7CitteSAkdGFyZ2V0RG9jdW1lbnQgPSAkdGFyZ2V0UGFyc2VyLT5Q YXJzZSgkdGFyZ2V0SWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IsICRvdXRwdXREaXJl Y3RvcnkpOwogCiBpZiAoJGlkbEF0dHJpYnV0ZXNGaWxlKSB7CiAgICAgbXkgJGlkbEF0dHJpYnV0 ZXMgPSBsb2FkSURMQXR0cmlidXRlcygkaWRsQXR0cmlidXRlc0ZpbGUpOwpAQCAtMTM2LDcgKzEz Niw3IEBADQogCiAgICAgbXkgJGludGVyZmFjZU5hbWUgPSBmaWxlcGFyc2UoYmFzZW5hbWUoJGlk bEZpbGUpLCAiLmlkbCIpOwogICAgIG15ICRwYXJzZXIgPSBJRExQYXJzZXItPm5ldyghJHZlcmJv c2UpOwotICAgIG15ICRkb2N1bWVudCA9ICRwYXJzZXItPlBhcnNlKCRpZGxGaWxlLCAkZGVmaW5l cywgJHByZXByb2Nlc3Nvcik7CisgICAgbXkgJGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGlk bEZpbGUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yLCAkb3V0cHV0RGlyZWN0b3J5KTsKIAogICAg IGZvcmVhY2ggbXkgJGludGVyZmFjZSAoQHskZG9jdW1lbnQtPmludGVyZmFjZXN9KSB7CiAgICAg ICAgIGlmICgkaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiU3VwcGxlbWVudGFsIn0g YW5kICRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJTdXBwbGVtZW50YWwifSBlcSAk dGFyZ2V0SW50ZXJmYWNlTmFtZSkgewpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lE TFBhcnNlci5wbQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQ YXJzZXIucG0JKHJldmlzaW9uIDE0Njg3MykNCisrKyBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv SURMUGFyc2VyLnBtCSh3b3JraW5nIGNvcHkpDQpAQCAtMTc2LDEwICsxNzYsMTEgQEANCiAgICAg bXkgJGZpbGVOYW1lID0gc2hpZnQ7CiAgICAgbXkgJGRlZmluZXMgPSBzaGlmdDsKICAgICBteSAk cHJlcHJvY2Vzc29yID0gc2hpZnQ7CisgICAgbXkgJG91dHB1dERpcmVjdG9yeSA9IHNoaWZ0Owog CiAgICAgbXkgQGRlZmluaXRpb25zID0gKCk7CiAKLSAgICBteSBAbGluZXMgPSBhcHBseVByZXBy b2Nlc3NvcigkZmlsZU5hbWUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yKTsKKyAgICBteSBAbGlu ZXMgPSBhcHBseVByZXByb2Nlc3NvcigkZmlsZU5hbWUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29y LCAkb3V0cHV0RGlyZWN0b3J5KTsKICAgICAkc2VsZi0+e0xpbmV9ID0gJGxpbmVzWzBdOwogICAg ICRzZWxmLT57RG9jdW1lbnRDb250ZW50fSA9IGpvaW4oJyAnLCBAbGluZXMpOwogCkluZGV4OiBX ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtDQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0g V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbQkocmV2aXNpb24gMTQ2ODcz KQ0KKysrIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNzb3IucG0JKHdvcmtpbmcg Y29weSkNCkBAIC0yMiw2ICsyMiw3IEBADQogdXNlIHdhcm5pbmdzOwogCiB1c2UgQ29uZmlnOwor dXNlIEZpbGU6OkJhc2VuYW1lOwogdXNlIElQQzo6T3BlbjI7CiB1c2UgSVBDOjpPcGVuMzsKIApA QCAtNDEsNyArNDIsMjEgQEANCiAgICAgbXkgJGZpbGVOYW1lID0gc2hpZnQ7CiAgICAgbXkgJGRl ZmluZXMgPSBzaGlmdDsKICAgICBteSAkcHJlcHJvY2Vzc29yID0gc2hpZnQ7CisgICAgbXkgJG91 dHB1dERpcmVjdG9yeSA9IHNoaWZ0OwogCisgICAgaWYgKCRvdXRwdXREaXJlY3RvcnkpIHsKKyAg ICAgICAgIyBJZiB0aGUgcHJlcHJvY2Vzc2VkIGJ1aWxkIGZpbGUgd2FzIGdlbmVyYXRlZCBhbHJl YWR5IGJ5IHRoZSBidWlsZAorICAgICAgICAjIHN5c3RlbSwgdGhlbiByZXR1cm4gdGhhdCBvbmUu IFRoaXMgYXZvaWRzIE5eMiBiZWhhdmlvciBpbiByZWFwcGx5aW5nCisgICAgICAgICMgdGhlIHBy ZXByb2Nlc3NvciB0aGUgaWRsIGZpbGVzIHJlZmVyZW5jZWQgYnkgb3RoZXIgaWRsIGZpbGVzLgor ICAgICAgICBteSAkYmFzZU5hbWUgPSBiYXNlbmFtZSgkZmlsZU5hbWUpOworICAgICAgICBteSAk cHJlcHJvY2Vzc2VkRmlsZSA9ICIkb3V0cHV0RGlyZWN0b3J5LyRiYXNlTmFtZS5wcCI7CisgICAg ICAgIGlmICgtZSAkcHJlcHJvY2Vzc2VkRmlsZSkgeworICAgICAgICAgICAgbXkgQGxpbmVzID0g ZG8geyBsb2NhbCBAQVJHViA9ICRwcmVwcm9jZXNzZWRGaWxlOyA8PiB9OworICAgICAgICAgICAg cmV0dXJuIEBsaW5lczsKKyAgICAgICAgfQorICAgICAgICBwcmludCAiJGZpbGVOYW1lIHdhcyBu b3QgcHJlLXByZXByb2Nlc3NlZCwgbG9va2luZyBmb3IgJHByZXByb2Nlc3NlZEZpbGVcbiI7Cisg ICAgfQorCiAgICAgbXkgQGFyZ3MgPSAoKTsKICAgICBpZiAoISRwcmVwcm9jZXNzb3IpIHsKICAg ICAgICAgcmVxdWlyZSBDb25maWc7Cg== 195409 2013-03-27 15:10:43 -0700 2013-03-27 15:34:49 -0700 tidy up a.diff text/plain 7981 scottmg SW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXANCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBX ZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwCShyZXZpc2lvbiAxNDY4NzMpDQorKysgV2Vi Q29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAkod29ya2luZyBjb3B5KQ0KQEAgLTU5NSwxMiAr NTk1LDU1IEBADQogICAgICAgXQogICAgIH0sCiAgICAgeworICAgICAgJ3RhcmdldF9uYW1lJzog J2dlbmVyYXRlX3ByZXByb2Nlc3NlZF9pZGxzJywKKyAgICAgICd0eXBlJzogJ25vbmUnLAorICAg ICAgJ3NvdXJjZXMnOiBbCisgICAgICAgICc8QChiaW5kaW5nc19pZGxfZmlsZXMpJywKKyAgICAg ICAgJzxAKHdlYmNvcmVfdGVzdF9zdXBwb3J0X2lkbF9maWxlcyknLAorICAgICAgXSwKKyAgICAg ICdydWxlcyc6IFsKKyAgICAgICAgIyBSdWxlcyB0byBidWlsZCBkZXJpdmVkIHNvdXJjZXMuCisg ICAgICAgIHsKKyAgICAgICAgICAncnVsZV9uYW1lJzogJ2JpbmRpbmcnLAorICAgICAgICAgICdl eHRlbnNpb24nOiAnaWRsJywKKyAgICAgICAgICAnbXN2c19leHRlcm5hbF9ydWxlJzogMSwKKyAg ICAgICAgICAndmFyaWFibGVzJzogeworICAgICAgICAgICAgJ2FsbF9pZGxfZmlsZXNfbGlzdCc6 ICc8fChhbGxfaWRsX2ZpbGVzX2xpc3QudG1wIDxAKGJpbmRpbmdzX2lkbF9maWxlcykgPEAod2Vi Y29yZV90ZXN0X3N1cHBvcnRfaWRsX2ZpbGVzKSknLAorICAgICAgICAgIH0sCisgICAgICAgICAg J2lucHV0cyc6IFsKKyAgICAgICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXBy ZXByb2Nlc3NlZC1pZGxzLnBsJywKKyAgICAgICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRzL3By ZXByb2Nlc3Nvci5wbScsCisgICAgICAgICAgICAnPChhbGxfaWRsX2ZpbGVzX2xpc3QpJywKKyAg ICAgICAgICAgICc8IUAoY2F0IDwoYWxsX2lkbF9maWxlc19saXN0KSknLAorICAgICAgICAgIF0s CisgICAgICAgICAgJ291dHB1dHMnOiBbCisgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJ QVRFX0RJUikvd2ViY29yZS9iaW5kaW5ncy88KFJVTEVfSU5QVVRfUk9PVCkuaWRsLnBwJywKKyAg ICAgICAgICBdLAorICAgICAgICAgICdtc3ZzX2N5Z3dpbl9zaGVsbCc6IDAsCisgICAgICAgICAg J2FjdGlvbic6IFsKKyAgICAgICAgICAgICc8KHBlcmxfZXhlKScsCisgICAgICAgICAgICAnLXcn LAorICAgICAgICAgICAgJy1JLi4vYmluZGluZ3Mvc2NyaXB0cycsCisgICAgICAgICAgICAnLi4v YmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1wcmVwcm9jZXNzZWQtaWRscy5wbCcsCisgICAgICAg ICAgICAnLS1vdXRwdXQnLAorICAgICAgICAgICAgJzxAKF9vdXRwdXRzKScsCisgICAgICAgICAg ICAnLS1kZWZpbmVzJywKKyAgICAgICAgICAgICc8KGZlYXR1cmVfZGVmaW5lcykgTEFOR1VBR0Vf SkFWQVNDUklQVCBWOF9CSU5ESU5HJywKKyAgICAgICAgICAgICc8KFJVTEVfSU5QVVRfUEFUSCkn LAorICAgICAgICAgICAgJzxAKHByZXByb2Nlc3NvciknLAorICAgICAgICAgIF0sCisgICAgICAg ICAgJ21lc3NhZ2UnOiAnUHJlcHJvY2Vzc2luZyA8KFJVTEVfSU5QVVRfUEFUSCknLAorICAgICAg ICB9LAorICAgICAgXSwKKyAgICB9LAorICAgIHsKICAgICAgICd0YXJnZXRfbmFtZSc6ICd3ZWJj b3JlX2JpbmRpbmdzX3NvdXJjZXMnLAogICAgICAgJ3R5cGUnOiAnbm9uZScsCiAgICAgICAnaGFy ZF9kZXBlbmRlbmN5JzogMSwKICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICdnZW5l cmF0ZV9zdXBwbGVtZW50YWxfZGVwZW5kZW5jeScsCiAgICAgICAgICdnZW5lcmF0ZV9zZXR0aW5n cycsCisgICAgICAgICdnZW5lcmF0ZV9wcmVwcm9jZXNzZWRfaWRscycsCiAgICAgICBdLAogICAg ICAgJ3NvdXJjZXMnOiBbCiAgICAgICAgICMgYmlzb24gcnVsZQpJbmRleDogV2ViQ29yZS9XZWJD b3JlLmd5cGkNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJDb3JlL1dlYkNvcmUuZ3lwaQkocmV2aXNpb24g MTQ2ODczKQ0KKysrIFdlYkNvcmUvV2ViQ29yZS5neXBpCSh3b3JraW5nIGNvcHkpDQpAQCAtNzEz LDYgKzcxMyw3IEBADQogICAgICAgICAgICAgJ3N2Zy9TVkdUcmFuc2Zvcm1MaXN0LmlkbCcsCiAg ICAgICAgICAgICAnc3ZnL1NWR1RyYW5zZm9ybWFibGUuaWRsJywKICAgICAgICAgICAgICdzdmcv U1ZHVW5pdFR5cGVzLmlkbCcsCisgICAgICAgICAgICAnc3ZnL1NWR1VSSVJlZmVyZW5jZS5pZGwn LAogICAgICAgICAgICAgJ3N2Zy9TVkdVc2VFbGVtZW50LmlkbCcsCiAgICAgICAgICAgICAnc3Zn L1NWR1ZpZXdFbGVtZW50LmlkbCcsCiAgICAgICAgICAgICAnc3ZnL1NWR1ZpZXdTcGVjLmlkbCcs CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtcHJlcHJvY2Vzc2VkLWlk bHMucGwNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUt cHJlcHJvY2Vzc2VkLWlkbHMucGwJKHJldmlzaW9uIDApDQorKysgV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL2dlbmVyYXRlLXByZXByb2Nlc3NlZC1pZGxzLnBsCShyZXZpc2lvbiAwKQ0KQEAgLTAs MCArMSw0MCBAQA0KKyMhL3Vzci9iaW4vcGVybCAtdworIworIyBDb3B5cmlnaHQgKEMpIDIwMTMg R29vZ2xlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFRoaXMgbGlicmFyeSBpcyBm cmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyMgbW9kaWZ5IGl0 IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKKyMgTGlj ZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVy CisjIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0 ZXIgdmVyc2lvbi4KKyMKKyMgVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3Bl IHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisjIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0 aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisjIE1FUkNIQU5UQUJJTElUWSBvciBG SVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisjIExpYnJhcnkg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorIworIyBZb3Ugc2hvdWxk IGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBM aWNlbnNlCisjIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5M SUIuICBJZiBub3QsIHdyaXRlIHRvCisjIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIElu Yy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsCisjIEJvc3RvbiwgTUEgMDIxMTAt MTMwMSwgVVNBLgorIworCit1c2Ugc3RyaWN0OworCit1c2UgcHJlcHJvY2Vzc29yOwordXNlIEZp bGU6OlNsdXJwOwordXNlIEdldG9wdDo6TG9uZzsKK3VzZSBDd2Q7CisKK215ICRkZWZpbmVzOwor bXkgJHByZXByb2Nlc3NvcjsKK215ICRvdXRwdXQ7CisKK0dldE9wdGlvbnMoJ2RlZmluZXM9cycg PT4gXCRkZWZpbmVzLAorICAgICAgICAgICAncHJlcHJvY2Vzc29yPXMnID0+IFwkcHJlcHJvY2Vz c29yLAorICAgICAgICAgICAnb3V0cHV0PXMnID0+IFwkb3V0cHV0KTsKKworZGllKCdNdXN0IHNw ZWNpZnkgI2RlZmluZSBtYWNyb3MgdXNpbmcgLS1kZWZpbmVzLicpIHVubGVzcyBkZWZpbmVkKCRk ZWZpbmVzKTsKK2RpZSgnTXVzdCBzcGVjaWZ5IHRoZSBvdXRwdXQgdXNpbmcgLS1vdXRwdXQuJykg dW5sZXNzIGRlZmluZWQoJG91dHB1dCk7CisKK215IEBjb250ZW50cyA9IGFwcGx5UHJlcHJvY2Vz c29yKCRBUkdWWzBdLCAkZGVmaW5lcywgJHByZXByb2Nlc3NvciwgdW5kZWYpOword3JpdGVfZmls ZSgkb3V0cHV0LCBAY29udGVudHMpOwoNClByb3BlcnR5IGNoYW5nZXMgb246IFdlYkNvcmVcYmlu ZGluZ3Ncc2NyaXB0c1xnZW5lcmF0ZS1wcmVwcm9jZXNzZWQtaWRscy5wbA0KX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXw0K QWRkZWQ6IHN2bjplb2wtc3R5bGUNCiAgICsgTEYNCg0KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9Db2RlR2VuZXJhdG9yLnBtDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0JKHJldmlzaW9uIDE0Njg3MykNCisrKyBXZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbQkod29ya2luZyBjb3B5KQ0KQEAgLTI4 OSw3ICsyODksNiBAQA0KIHsKICAgICBteSAkb2JqZWN0ID0gc2hpZnQ7CiAgICAgbXkgJGludGVy ZmFjZU5hbWUgPSBzaGlmdDsKLSAgICBteSAkcGFyZW50c09ubHkgPSBzaGlmdDsKIAogICAgIHJl dHVybiB1bmRlZiBpZiAkaW50ZXJmYWNlTmFtZSBlcSAnT2JqZWN0JzsKIApAQCAtMzAxLDcgKzMw MCw3IEBADQogCiAgICAgIyBTdGVwICMyOiBQYXJzZSB0aGUgZm91bmQgSURMIGZpbGUgKGluIHF1 aWV0IG1vZGUpLgogICAgIG15ICRwYXJzZXIgPSBJRExQYXJzZXItPm5ldygxKTsKLSAgICBteSAk ZG9jdW1lbnQgPSAkcGFyc2VyLT5QYXJzZSgkZmlsZW5hbWUsICRkZWZpbmVzLCAkcHJlcHJvY2Vz c29yLCAkcGFyZW50c09ubHkpOworICAgIG15ICRkb2N1bWVudCA9ICRwYXJzZXItPlBhcnNlKCRm aWxlbmFtZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IsICR1c2VPdXRwdXREaXIpOwogCiAgICAg Zm9yZWFjaCBteSAkaW50ZXJmYWNlIChAeyRkb2N1bWVudC0+aW50ZXJmYWNlc30pIHsKICAgICAg ICAgcmV0dXJuICRpbnRlcmZhY2UgaWYgJGludGVyZmFjZS0+bmFtZSBlcSAkaW50ZXJmYWNlTmFt ZTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5ncy5wbA0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5n cy5wbAkocmV2aXNpb24gMTQ2ODczKQ0KKysrIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5l cmF0ZS1iaW5kaW5ncy5wbAkod29ya2luZyBjb3B5KQ0KQEAgLTEyNCw3ICsxMjQsNyBAQA0KIAog IyBQYXJzZSB0aGUgdGFyZ2V0IElETCBmaWxlLgogbXkgJHRhcmdldFBhcnNlciA9IElETFBhcnNl ci0+bmV3KCEkdmVyYm9zZSk7Ci1teSAkdGFyZ2V0RG9jdW1lbnQgPSAkdGFyZ2V0UGFyc2VyLT5Q YXJzZSgkdGFyZ2V0SWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IpOworbXkgJHRhcmdl dERvY3VtZW50ID0gJHRhcmdldFBhcnNlci0+UGFyc2UoJHRhcmdldElkbEZpbGUsICRkZWZpbmVz LCAkcHJlcHJvY2Vzc29yLCAkb3V0cHV0RGlyZWN0b3J5KTsKIAogaWYgKCRpZGxBdHRyaWJ1dGVz RmlsZSkgewogICAgIG15ICRpZGxBdHRyaWJ1dGVzID0gbG9hZElETEF0dHJpYnV0ZXMoJGlkbEF0 dHJpYnV0ZXNGaWxlKTsKQEAgLTEzNiw3ICsxMzYsNyBAQA0KIAogICAgIG15ICRpbnRlcmZhY2VO YW1lID0gZmlsZXBhcnNlKGJhc2VuYW1lKCRpZGxGaWxlKSwgIi5pZGwiKTsKICAgICBteSAkcGFy c2VyID0gSURMUGFyc2VyLT5uZXcoISR2ZXJib3NlKTsKLSAgICBteSAkZG9jdW1lbnQgPSAkcGFy c2VyLT5QYXJzZSgkaWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IpOworICAgIG15ICRk b2N1bWVudCA9ICRwYXJzZXItPlBhcnNlKCRpZGxGaWxlLCAkZGVmaW5lcywgJHByZXByb2Nlc3Nv ciwgJG91dHB1dERpcmVjdG9yeSk7CiAKICAgICBmb3JlYWNoIG15ICRpbnRlcmZhY2UgKEB7JGRv Y3VtZW50LT5pbnRlcmZhY2VzfSkgewogICAgICAgICBpZiAoJGludGVyZmFjZS0+ZXh0ZW5kZWRB dHRyaWJ1dGVzLT57IlN1cHBsZW1lbnRhbCJ9IGFuZCAkaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJp YnV0ZXMtPnsiU3VwcGxlbWVudGFsIn0gZXEgJHRhcmdldEludGVyZmFjZU5hbWUpIHsKSW5kZXg6 IFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0NCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBX ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtCShyZXZpc2lvbiAxNDY4NzMpDQor KysgV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQkod29ya2luZyBjb3B5KQ0K QEAgLTE3NiwxMCArMTc2LDExIEBADQogICAgIG15ICRmaWxlTmFtZSA9IHNoaWZ0OwogICAgIG15 ICRkZWZpbmVzID0gc2hpZnQ7CiAgICAgbXkgJHByZXByb2Nlc3NvciA9IHNoaWZ0OworICAgIG15 ICRvdXRwdXREaXJlY3RvcnkgPSBzaGlmdDsKIAogICAgIG15IEBkZWZpbml0aW9ucyA9ICgpOwog Ci0gICAgbXkgQGxpbmVzID0gYXBwbHlQcmVwcm9jZXNzb3IoJGZpbGVOYW1lLCAkZGVmaW5lcywg JHByZXByb2Nlc3Nvcik7CisgICAgbXkgQGxpbmVzID0gYXBwbHlQcmVwcm9jZXNzb3IoJGZpbGVO YW1lLCAkZGVmaW5lcywgJHByZXByb2Nlc3NvciwgJG91dHB1dERpcmVjdG9yeSk7CiAgICAgJHNl bGYtPntMaW5lfSA9ICRsaW5lc1swXTsKICAgICAkc2VsZi0+e0RvY3VtZW50Q29udGVudH0gPSBq b2luKCcgJywgQGxpbmVzKTsKIApJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXBy b2Nlc3Nvci5wbQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9wcmVw cm9jZXNzb3IucG0JKHJldmlzaW9uIDE0Njg3MykNCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvcHJlcHJvY2Vzc29yLnBtCSh3b3JraW5nIGNvcHkpDQpAQCAtNDEsNyArNDEsMjEgQEANCiAg ICAgbXkgJGZpbGVOYW1lID0gc2hpZnQ7CiAgICAgbXkgJGRlZmluZXMgPSBzaGlmdDsKICAgICBt eSAkcHJlcHJvY2Vzc29yID0gc2hpZnQ7CisgICAgbXkgJG91dHB1dERpcmVjdG9yeSA9IHNoaWZ0 OwogCisgICAgaWYgKCRvdXRwdXREaXJlY3RvcnkpIHsKKyAgICAgICAgIyBJZiB0aGUgcHJlcHJv Y2Vzc2VkIGJ1aWxkIGZpbGUgd2FzIGdlbmVyYXRlZCBhbHJlYWR5IGJ5IHRoZSBidWlsZAorICAg ICAgICAjIHN5c3RlbSwgdGhlbiByZXR1cm4gdGhhdCBvbmUuIFRoaXMgYXZvaWRzIE5eMiBiZWhh dmlvciBpbiByZWFwcGx5aW5nCisgICAgICAgICMgdGhlIHByZXByb2Nlc3NvciB0aGUgaWRsIGZp bGVzIHJlZmVyZW5jZWQgYnkgb3RoZXIgaWRsIGZpbGVzLgorICAgICAgICBteSAkYmFzZU5hbWUg PSBiYXNlbmFtZSgkZmlsZU5hbWUpOworICAgICAgICBteSAkcHJlcHJvY2Vzc2VkRmlsZSA9ICIk b3V0cHV0RGlyZWN0b3J5LyRiYXNlTmFtZS5wcCI7CisgICAgICAgIGlmICgtZSAkcHJlcHJvY2Vz c2VkRmlsZSkgeworICAgICAgICAgICAgbXkgQGxpbmVzID0gZG8geyBsb2NhbCBAQVJHViA9ICRw cmVwcm9jZXNzZWRGaWxlOyA8PiB9OworICAgICAgICAgICAgcmV0dXJuIEBsaW5lczsKKyAgICAg ICAgfQorICAgICAgICBwcmludCAiJGZpbGVOYW1lIHdhcyBub3QgcHJlLXByZXByb2Nlc3NlZCwg bG9va2luZyBmb3IgJHByZXByb2Nlc3NlZEZpbGVcbiI7CisgICAgfQorCiAgICAgbXkgQGFyZ3Mg PSAoKTsKICAgICBpZiAoISRwcmVwcm9jZXNzb3IpIHsKICAgICAgICAgcmVxdWlyZSBDb25maWc7 Cg== 195415 2013-03-27 15:34:49 -0700 2013-03-27 15:45:59 -0700 remove print a.diff text/plain 7895 scottmg SW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXANCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBX ZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwCShyZXZpc2lvbiAxNDY4NzMpDQorKysgV2Vi Q29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAkod29ya2luZyBjb3B5KQ0KQEAgLTU5NSwxMiAr NTk1LDU1IEBADQogICAgICAgXQogICAgIH0sCiAgICAgeworICAgICAgJ3RhcmdldF9uYW1lJzog J2dlbmVyYXRlX3ByZXByb2Nlc3NlZF9pZGxzJywKKyAgICAgICd0eXBlJzogJ25vbmUnLAorICAg ICAgJ3NvdXJjZXMnOiBbCisgICAgICAgICc8QChiaW5kaW5nc19pZGxfZmlsZXMpJywKKyAgICAg ICAgJzxAKHdlYmNvcmVfdGVzdF9zdXBwb3J0X2lkbF9maWxlcyknLAorICAgICAgXSwKKyAgICAg ICdydWxlcyc6IFsKKyAgICAgICAgIyBSdWxlcyB0byBidWlsZCBkZXJpdmVkIHNvdXJjZXMuCisg ICAgICAgIHsKKyAgICAgICAgICAncnVsZV9uYW1lJzogJ2JpbmRpbmcnLAorICAgICAgICAgICdl eHRlbnNpb24nOiAnaWRsJywKKyAgICAgICAgICAnbXN2c19leHRlcm5hbF9ydWxlJzogMSwKKyAg ICAgICAgICAndmFyaWFibGVzJzogeworICAgICAgICAgICAgJ2FsbF9pZGxfZmlsZXNfbGlzdCc6 ICc8fChhbGxfaWRsX2ZpbGVzX2xpc3QudG1wIDxAKGJpbmRpbmdzX2lkbF9maWxlcykgPEAod2Vi Y29yZV90ZXN0X3N1cHBvcnRfaWRsX2ZpbGVzKSknLAorICAgICAgICAgIH0sCisgICAgICAgICAg J2lucHV0cyc6IFsKKyAgICAgICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXBy ZXByb2Nlc3NlZC1pZGxzLnBsJywKKyAgICAgICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRzL3By ZXByb2Nlc3Nvci5wbScsCisgICAgICAgICAgICAnPChhbGxfaWRsX2ZpbGVzX2xpc3QpJywKKyAg ICAgICAgICAgICc8IUAoY2F0IDwoYWxsX2lkbF9maWxlc19saXN0KSknLAorICAgICAgICAgIF0s CisgICAgICAgICAgJ291dHB1dHMnOiBbCisgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJ QVRFX0RJUikvd2ViY29yZS9iaW5kaW5ncy88KFJVTEVfSU5QVVRfUk9PVCkuaWRsLnBwJywKKyAg ICAgICAgICBdLAorICAgICAgICAgICdtc3ZzX2N5Z3dpbl9zaGVsbCc6IDAsCisgICAgICAgICAg J2FjdGlvbic6IFsKKyAgICAgICAgICAgICc8KHBlcmxfZXhlKScsCisgICAgICAgICAgICAnLXcn LAorICAgICAgICAgICAgJy1JLi4vYmluZGluZ3Mvc2NyaXB0cycsCisgICAgICAgICAgICAnLi4v YmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1wcmVwcm9jZXNzZWQtaWRscy5wbCcsCisgICAgICAg ICAgICAnLS1vdXRwdXQnLAorICAgICAgICAgICAgJzxAKF9vdXRwdXRzKScsCisgICAgICAgICAg ICAnLS1kZWZpbmVzJywKKyAgICAgICAgICAgICc8KGZlYXR1cmVfZGVmaW5lcykgTEFOR1VBR0Vf SkFWQVNDUklQVCBWOF9CSU5ESU5HJywKKyAgICAgICAgICAgICc8KFJVTEVfSU5QVVRfUEFUSCkn LAorICAgICAgICAgICAgJzxAKHByZXByb2Nlc3NvciknLAorICAgICAgICAgIF0sCisgICAgICAg ICAgJ21lc3NhZ2UnOiAnUHJlcHJvY2Vzc2luZyA8KFJVTEVfSU5QVVRfUEFUSCknLAorICAgICAg ICB9LAorICAgICAgXSwKKyAgICB9LAorICAgIHsKICAgICAgICd0YXJnZXRfbmFtZSc6ICd3ZWJj b3JlX2JpbmRpbmdzX3NvdXJjZXMnLAogICAgICAgJ3R5cGUnOiAnbm9uZScsCiAgICAgICAnaGFy ZF9kZXBlbmRlbmN5JzogMSwKICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICdnZW5l cmF0ZV9zdXBwbGVtZW50YWxfZGVwZW5kZW5jeScsCiAgICAgICAgICdnZW5lcmF0ZV9zZXR0aW5n cycsCisgICAgICAgICdnZW5lcmF0ZV9wcmVwcm9jZXNzZWRfaWRscycsCiAgICAgICBdLAogICAg ICAgJ3NvdXJjZXMnOiBbCiAgICAgICAgICMgYmlzb24gcnVsZQpJbmRleDogV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL2dlbmVyYXRlLXByZXByb2Nlc3NlZC1pZGxzLnBsDQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQot LS0gV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXByZXByb2Nlc3NlZC1pZGxzLnBs CShyZXZpc2lvbiAwKQ0KKysrIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1wcmVw cm9jZXNzZWQtaWRscy5wbAkocmV2aXNpb24gMCkNCkBAIC0wLDAgKzEsNDAgQEANCisjIS91c3Iv YmluL3BlcmwgLXcKKyMKKyMgQ29weXJpZ2h0IChDKSAyMDEzIEdvb2dsZSBJbmMuICBBbGwgcmln aHRzIHJlc2VydmVkLgorIworIyBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNh biByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisjIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2Yg dGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCisjIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5 IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgorIyB2ZXJzaW9uIDIgb2YgdGhl IExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisjCisjIFRo aXMgbGlicmFyeSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNl ZnVsLAorIyBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGll ZCB3YXJyYW50eSBvZgorIyBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorIyBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vu c2UgZm9yIG1vcmUgZGV0YWlscy4KKyMKKyMgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29w eSBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorIyBhbG9uZyB3aXRo IHRoaXMgbGlicmFyeTsgc2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0 bworIyB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJl ZXQsIEZpZnRoIEZsb29yLAorIyBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KKyMKKwordXNl IHN0cmljdDsKKwordXNlIHByZXByb2Nlc3NvcjsKK3VzZSBGaWxlOjpTbHVycDsKK3VzZSBHZXRv cHQ6Okxvbmc7Cit1c2UgQ3dkOworCitteSAkZGVmaW5lczsKK215ICRwcmVwcm9jZXNzb3I7Citt eSAkb3V0cHV0OworCitHZXRPcHRpb25zKCdkZWZpbmVzPXMnID0+IFwkZGVmaW5lcywKKyAgICAg ICAgICAgJ3ByZXByb2Nlc3Nvcj1zJyA9PiBcJHByZXByb2Nlc3NvciwKKyAgICAgICAgICAgJ291 dHB1dD1zJyA9PiBcJG91dHB1dCk7CisKK2RpZSgnTXVzdCBzcGVjaWZ5ICNkZWZpbmUgbWFjcm9z IHVzaW5nIC0tZGVmaW5lcy4nKSB1bmxlc3MgZGVmaW5lZCgkZGVmaW5lcyk7CitkaWUoJ011c3Qg c3BlY2lmeSB0aGUgb3V0cHV0IHVzaW5nIC0tb3V0cHV0LicpIHVubGVzcyBkZWZpbmVkKCRvdXRw dXQpOworCitteSBAY29udGVudHMgPSBhcHBseVByZXByb2Nlc3NvcigkQVJHVlswXSwgJGRlZmlu ZXMsICRwcmVwcm9jZXNzb3IsIHVuZGVmKTsKK3dyaXRlX2ZpbGUoJG91dHB1dCwgQGNvbnRlbnRz KTsKDQpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBXZWJDb3JlXGJpbmRpbmdzXHNjcmlwdHNcZ2VuZXJh dGUtcHJlcHJvY2Vzc2VkLWlkbHMucGwNCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18NCkFkZGVkOiBzdm46ZW9sLXN0eWxl DQogICArIExGDQoNCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv ci5wbQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJh dG9yLnBtCShyZXZpc2lvbiAxNDY4NzMpDQorKysgV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0Nv ZGVHZW5lcmF0b3IucG0JKHdvcmtpbmcgY29weSkNCkBAIC0yODksNyArMjg5LDYgQEANCiB7CiAg ICAgbXkgJG9iamVjdCA9IHNoaWZ0OwogICAgIG15ICRpbnRlcmZhY2VOYW1lID0gc2hpZnQ7Ci0g ICAgbXkgJHBhcmVudHNPbmx5ID0gc2hpZnQ7CiAKICAgICByZXR1cm4gdW5kZWYgaWYgJGludGVy ZmFjZU5hbWUgZXEgJ09iamVjdCc7CiAKQEAgLTMwMSw3ICszMDAsNyBAQA0KIAogICAgICMgU3Rl cCAjMjogUGFyc2UgdGhlIGZvdW5kIElETCBmaWxlIChpbiBxdWlldCBtb2RlKS4KICAgICBteSAk cGFyc2VyID0gSURMUGFyc2VyLT5uZXcoMSk7Ci0gICAgbXkgJGRvY3VtZW50ID0gJHBhcnNlci0+ UGFyc2UoJGZpbGVuYW1lLCAkZGVmaW5lcywgJHByZXByb2Nlc3NvciwgJHBhcmVudHNPbmx5KTsK KyAgICBteSAkZG9jdW1lbnQgPSAkcGFyc2VyLT5QYXJzZSgkZmlsZW5hbWUsICRkZWZpbmVzLCAk cHJlcHJvY2Vzc29yLCAkdXNlT3V0cHV0RGlyKTsKIAogICAgIGZvcmVhY2ggbXkgJGludGVyZmFj ZSAoQHskZG9jdW1lbnQtPmludGVyZmFjZXN9KSB7CiAgICAgICAgIHJldHVybiAkaW50ZXJmYWNl IGlmICRpbnRlcmZhY2UtPm5hbWUgZXEgJGludGVyZmFjZU5hbWU7CkluZGV4OiBXZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtYmluZGluZ3MucGwNCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtYmluZGluZ3MucGwJKHJldmlzaW9uIDE0Njg3 MykNCisrKyBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtYmluZGluZ3MucGwJKHdv cmtpbmcgY29weSkNCkBAIC0xMjQsNyArMTI0LDcgQEANCiAKICMgUGFyc2UgdGhlIHRhcmdldCBJ REwgZmlsZS4KIG15ICR0YXJnZXRQYXJzZXIgPSBJRExQYXJzZXItPm5ldyghJHZlcmJvc2UpOwot bXkgJHRhcmdldERvY3VtZW50ID0gJHRhcmdldFBhcnNlci0+UGFyc2UoJHRhcmdldElkbEZpbGUs ICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yKTsKK215ICR0YXJnZXREb2N1bWVudCA9ICR0YXJnZXRQ YXJzZXItPlBhcnNlKCR0YXJnZXRJZGxGaWxlLCAkZGVmaW5lcywgJHByZXByb2Nlc3NvciwgJG91 dHB1dERpcmVjdG9yeSk7CiAKIGlmICgkaWRsQXR0cmlidXRlc0ZpbGUpIHsKICAgICBteSAkaWRs QXR0cmlidXRlcyA9IGxvYWRJRExBdHRyaWJ1dGVzKCRpZGxBdHRyaWJ1dGVzRmlsZSk7CkBAIC0x MzYsNyArMTM2LDcgQEANCiAKICAgICBteSAkaW50ZXJmYWNlTmFtZSA9IGZpbGVwYXJzZShiYXNl bmFtZSgkaWRsRmlsZSksICIuaWRsIik7CiAgICAgbXkgJHBhcnNlciA9IElETFBhcnNlci0+bmV3 KCEkdmVyYm9zZSk7Ci0gICAgbXkgJGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGlkbEZpbGUs ICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yKTsKKyAgICBteSAkZG9jdW1lbnQgPSAkcGFyc2VyLT5Q YXJzZSgkaWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IsICRvdXRwdXREaXJlY3Rvcnkp OwogCiAgICAgZm9yZWFjaCBteSAkaW50ZXJmYWNlIChAeyRkb2N1bWVudC0+aW50ZXJmYWNlc30p IHsKICAgICAgICAgaWYgKCRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJTdXBwbGVt ZW50YWwifSBhbmQgJGludGVyZmFjZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IlN1cHBsZW1lbnRh bCJ9IGVxICR0YXJnZXRJbnRlcmZhY2VOYW1lKSB7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvSURMUGFyc2VyLnBtDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL0lETFBhcnNlci5wbQkocmV2aXNpb24gMTQ2ODczKQ0KKysrIFdlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9JRExQYXJzZXIucG0JKHdvcmtpbmcgY29weSkNCkBAIC0xNzYsMTAgKzE3NiwxMSBA QA0KICAgICBteSAkZmlsZU5hbWUgPSBzaGlmdDsKICAgICBteSAkZGVmaW5lcyA9IHNoaWZ0Owog ICAgIG15ICRwcmVwcm9jZXNzb3IgPSBzaGlmdDsKKyAgICBteSAkb3V0cHV0RGlyZWN0b3J5ID0g c2hpZnQ7CiAKICAgICBteSBAZGVmaW5pdGlvbnMgPSAoKTsKIAotICAgIG15IEBsaW5lcyA9IGFw cGx5UHJlcHJvY2Vzc29yKCRmaWxlTmFtZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IpOworICAg IG15IEBsaW5lcyA9IGFwcGx5UHJlcHJvY2Vzc29yKCRmaWxlTmFtZSwgJGRlZmluZXMsICRwcmVw cm9jZXNzb3IsICRvdXRwdXREaXJlY3RvcnkpOwogICAgICRzZWxmLT57TGluZX0gPSAkbGluZXNb MF07CiAgICAgJHNlbGYtPntEb2N1bWVudENvbnRlbnR9ID0gam9pbignICcsIEBsaW5lcyk7CiAK SW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNzb3IucG0NCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0NCi0tLSBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCShyZXZpc2lv biAxNDY4NzMpDQorKysgV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbQko d29ya2luZyBjb3B5KQ0KQEAgLTQxLDcgKzQxLDIwIEBADQogICAgIG15ICRmaWxlTmFtZSA9IHNo aWZ0OwogICAgIG15ICRkZWZpbmVzID0gc2hpZnQ7CiAgICAgbXkgJHByZXByb2Nlc3NvciA9IHNo aWZ0OworICAgIG15ICRvdXRwdXREaXJlY3RvcnkgPSBzaGlmdDsKIAorICAgIGlmICgkb3V0cHV0 RGlyZWN0b3J5KSB7CisgICAgICAgICMgSWYgdGhlIHByZXByb2Nlc3NlZCBidWlsZCBmaWxlIHdh cyBnZW5lcmF0ZWQgYWxyZWFkeSBieSB0aGUgYnVpbGQKKyAgICAgICAgIyBzeXN0ZW0sIHRoZW4g cmV0dXJuIHRoYXQgb25lLiBUaGlzIGF2b2lkcyBOXjIgYmVoYXZpb3IgaW4gcmVhcHBseWluZwor ICAgICAgICAjIHRoZSBwcmVwcm9jZXNzb3IgdGhlIGlkbCBmaWxlcyByZWZlcmVuY2VkIGJ5IG90 aGVyIGlkbCBmaWxlcy4KKyAgICAgICAgbXkgJGJhc2VOYW1lID0gYmFzZW5hbWUoJGZpbGVOYW1l KTsKKyAgICAgICAgbXkgJHByZXByb2Nlc3NlZEZpbGUgPSAiJG91dHB1dERpcmVjdG9yeS8kYmFz ZU5hbWUucHAiOworICAgICAgICBpZiAoLWUgJHByZXByb2Nlc3NlZEZpbGUpIHsKKyAgICAgICAg ICAgIG15IEBsaW5lcyA9IGRvIHsgbG9jYWwgQEFSR1YgPSAkcHJlcHJvY2Vzc2VkRmlsZTsgPD4g fTsKKyAgICAgICAgICAgIHJldHVybiBAbGluZXM7CisgICAgICAgIH0KKyAgICB9CisKICAgICBt eSBAYXJncyA9ICgpOwogICAgIGlmICghJHByZXByb2Nlc3NvcikgewogICAgICAgICByZXF1aXJl IENvbmZpZzsKSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5neXBpDQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2Vi Q29yZS9XZWJDb3JlLmd5cGkJKHJldmlzaW9uIDE0Njg3MykNCisrKyBXZWJDb3JlL1dlYkNvcmUu Z3lwaQkod29ya2luZyBjb3B5KQ0KQEAgLTcxMyw2ICs3MTMsNyBAQA0KICAgICAgICAgICAgICdz dmcvU1ZHVHJhbnNmb3JtTGlzdC5pZGwnLAogICAgICAgICAgICAgJ3N2Zy9TVkdUcmFuc2Zvcm1h YmxlLmlkbCcsCiAgICAgICAgICAgICAnc3ZnL1NWR1VuaXRUeXBlcy5pZGwnLAorICAgICAgICAg ICAgJ3N2Zy9TVkdVUklSZWZlcmVuY2UuaWRsJywKICAgICAgICAgICAgICdzdmcvU1ZHVXNlRWxl bWVudC5pZGwnLAogICAgICAgICAgICAgJ3N2Zy9TVkdWaWV3RWxlbWVudC5pZGwnLAogICAgICAg ICAgICAgJ3N2Zy9TVkdWaWV3U3BlYy5pZGwnLAo= 195420 2013-03-27 15:46:03 -0700 2013-03-27 15:57:41 -0700 Patch bug-113448-20130327154602.patch text/plain 9693 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQyOTRlNWE2Nzc1OWRj MDg5N2Q0M2Y1YTk3MTllZjM3MmEyOTNkOS4uNjhiY2M5OTQ2NGYzNzEwZmEzOGE5ZTM5MWM1NGE2 NGNmNDQ1MmY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAzLTI3ICBTY290 dCBHcmFoYW0gIDxzY290dG1nQGNocm9taXVtLm9yZz4KKworICAgICAgICBNb3ZlIHByZXByb2Nl c3Npbmcgb2YgaWRsIHRvIHByZS1wYXNzIGZvciBneXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzQ0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmVzIHRoZSBwcmVwcm9jZXNzb3IgaW52b2NhdGlv bnMgd2hlbiBwYXJzaW5nIElETCBmaWxlcyB0byBhCisgICAgICAgIHByZS1wYXNzIHRvIGF2b2lk IHJlaW52b2NhdGlvbnMgd2hlbiBJRExzIGFyZSByZWZlcmVuY2VkIGZyb20gb3RoZXJzLgorICAg ICAgICBUaGlzIHJlZHVjZXMgdGhlIG51bWJlciBvZiBpbnZvY2F0aW9ucyBvZiB0aGUgcHJlcHJv Y2Vzc29yIGZyb20gMjAwNzEKKyAgICAgICAgdG8gNjMzLCB3aGljaCByZWR1Y2VzIHRoZSBydW50 aW1lIGZyb20gMTJtMzAgdG8gMW0gKG9uIGEgV2luZG93cyBib3gpLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cywgdGhpcyBpcyBhIGJ1aWxkIHRpbWUgaW1wcm92ZW1lbnQsIGFuZCBzaG91bGRuJ3Qg aGF2ZSBhbnkKKyAgICAgICAgdmlzaWJsZSBlZmZlY3QuCisKKyAgICAgICAgKiBXZWJDb3JlLmd5 cC9XZWJDb3JlLmd5cDoKKyAgICAgICAgKiBXZWJDb3JlLmd5cGk6CisgICAgICAgICogYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yLnBtOgorICAgICAgICAoUGFyc2VJbnRlcmZhY2UpOgor ICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtOgorICAgICAgICAoUGFyc2Up OgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtYmluZGluZ3MucGw6CisgICAg ICAgICogYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1wcmVwcm9jZXNzZWQtaWRscy5wbDogQWRk ZWQuCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNzb3IucG06CisgICAgICAg IChhcHBseVByZXByb2Nlc3Nvcik6CisKIDIwMTMtMDMtMjUgIEFuZHJleSBLb3N5YWtvdiAgPGNh c2VxQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbVGltZWxpbmVdIHNl dCBnbHVlIHJlY29yZHMgbW9kZSBvZmYgYnkgZGVmYXVsdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5 cC9XZWJDb3JlLmd5cAppbmRleCBlNjJlNjMzZmJiNTdmZmRhM2IzMzliNTNhMGMxMzNhYzA5M2E5 NTA1Li43YjJjNDc5ZjM0MmJhY2JiMmU1Y2MwNTAzMzY3OGNiNDQ1ZTI4NjhkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cApAQCAtNTk1LDEyICs1OTUsNTUgQEAKICAgICAg IF0KICAgICB9LAogICAgIHsKKyAgICAgICd0YXJnZXRfbmFtZSc6ICdnZW5lcmF0ZV9wcmVwcm9j ZXNzZWRfaWRscycsCisgICAgICAndHlwZSc6ICdub25lJywKKyAgICAgICdzb3VyY2VzJzogWwor ICAgICAgICAnPEAoYmluZGluZ3NfaWRsX2ZpbGVzKScsCisgICAgICAgICc8QCh3ZWJjb3JlX3Rl c3Rfc3VwcG9ydF9pZGxfZmlsZXMpJywKKyAgICAgIF0sCisgICAgICAncnVsZXMnOiBbCisgICAg ICAgICMgUnVsZXMgdG8gYnVpbGQgZGVyaXZlZCBzb3VyY2VzLgorICAgICAgICB7CisgICAgICAg ICAgJ3J1bGVfbmFtZSc6ICdiaW5kaW5nJywKKyAgICAgICAgICAnZXh0ZW5zaW9uJzogJ2lkbCcs CisgICAgICAgICAgJ21zdnNfZXh0ZXJuYWxfcnVsZSc6IDEsCisgICAgICAgICAgJ3ZhcmlhYmxl cyc6IHsKKyAgICAgICAgICAgICdhbGxfaWRsX2ZpbGVzX2xpc3QnOiAnPHwoYWxsX2lkbF9maWxl c19saXN0LnRtcCA8QChiaW5kaW5nc19pZGxfZmlsZXMpIDxAKHdlYmNvcmVfdGVzdF9zdXBwb3J0 X2lkbF9maWxlcykpJywKKyAgICAgICAgICB9LAorICAgICAgICAgICdpbnB1dHMnOiBbCisgICAg ICAgICAgICAnLi4vYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1wcmVwcm9jZXNzZWQtaWRscy5w bCcsCisgICAgICAgICAgICAnLi4vYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNzb3IucG0nLAor ICAgICAgICAgICAgJzwoYWxsX2lkbF9maWxlc19saXN0KScsCisgICAgICAgICAgICAnPCFAKGNh dCA8KGFsbF9pZGxfZmlsZXNfbGlzdCkpJywKKyAgICAgICAgICBdLAorICAgICAgICAgICdvdXRw dXRzJzogWworICAgICAgICAgICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIpL3dlYmNvcmUv YmluZGluZ3MvPChSVUxFX0lOUFVUX1JPT1QpLmlkbC5wcCcsCisgICAgICAgICAgXSwKKyAgICAg ICAgICAnbXN2c19jeWd3aW5fc2hlbGwnOiAwLAorICAgICAgICAgICdhY3Rpb24nOiBbCisgICAg ICAgICAgICAnPChwZXJsX2V4ZSknLAorICAgICAgICAgICAgJy13JywKKyAgICAgICAgICAgICct SS4uL2JpbmRpbmdzL3NjcmlwdHMnLAorICAgICAgICAgICAgJy4uL2JpbmRpbmdzL3NjcmlwdHMv Z2VuZXJhdGUtcHJlcHJvY2Vzc2VkLWlkbHMucGwnLAorICAgICAgICAgICAgJy0tb3V0cHV0JywK KyAgICAgICAgICAgICc8QChfb3V0cHV0cyknLAorICAgICAgICAgICAgJy0tZGVmaW5lcycsCisg ICAgICAgICAgICAnPChmZWF0dXJlX2RlZmluZXMpIExBTkdVQUdFX0pBVkFTQ1JJUFQgVjhfQklO RElORycsCisgICAgICAgICAgICAnPChSVUxFX0lOUFVUX1BBVEgpJywKKyAgICAgICAgICAgICc8 QChwcmVwcm9jZXNzb3IpJywKKyAgICAgICAgICBdLAorICAgICAgICAgICdtZXNzYWdlJzogJ1By ZXByb2Nlc3NpbmcgPChSVUxFX0lOUFVUX1BBVEgpJywKKyAgICAgICAgfSwKKyAgICAgIF0sCisg ICAgfSwKKyAgICB7CiAgICAgICAndGFyZ2V0X25hbWUnOiAnd2ViY29yZV9iaW5kaW5nc19zb3Vy Y2VzJywKICAgICAgICd0eXBlJzogJ25vbmUnLAogICAgICAgJ2hhcmRfZGVwZW5kZW5jeSc6IDEs CiAgICAgICAnZGVwZW5kZW5jaWVzJzogWwogICAgICAgICAnZ2VuZXJhdGVfc3VwcGxlbWVudGFs X2RlcGVuZGVuY3knLAogICAgICAgICAnZ2VuZXJhdGVfc2V0dGluZ3MnLAorICAgICAgICAnZ2Vu ZXJhdGVfcHJlcHJvY2Vzc2VkX2lkbHMnLAogICAgICAgXSwKICAgICAgICdzb3VyY2VzJzogWwog ICAgICAgICAjIGJpc29uIHJ1bGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu Z3lwaSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRleCBjNWRhMjM3Yzc5ZmQwNzQ2 MzliMjIwMjExYjZmNDFmZjQxYmRiNzM1Li4wMTk3YTZiNGU4ODY4YWM0ZWVhM2I1N2ZmZjFlNmRi OGU0M2ViMTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCkBAIC03MTEsNiArNzExLDcgQEAKICAgICAgICAg ICAgICdzdmcvU1ZHVHJhbnNmb3JtTGlzdC5pZGwnLAogICAgICAgICAgICAgJ3N2Zy9TVkdUcmFu c2Zvcm1hYmxlLmlkbCcsCiAgICAgICAgICAgICAnc3ZnL1NWR1VuaXRUeXBlcy5pZGwnLAorICAg ICAgICAgICAgJ3N2Zy9TVkdVUklSZWZlcmVuY2UuaWRsJywKICAgICAgICAgICAgICdzdmcvU1ZH VXNlRWxlbWVudC5pZGwnLAogICAgICAgICAgICAgJ3N2Zy9TVkdWaWV3RWxlbWVudC5pZGwnLAog ICAgICAgICAgICAgJ3N2Zy9TVkdWaWV3U3BlYy5pZGwnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yLnBtIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yLnBtCmluZGV4IGQ0NzQzYTYxZWJjMDEwYTZm NWZlYTJkYjUwOTU3ODBkMmFhNDQyOTYuLjBiMzQxZDM2ZWZlOWM5ZDQwZDdjNGNlYzg0YTQ3N2Yy MmI5MjEyMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29k ZUdlbmVyYXRvci5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVH ZW5lcmF0b3IucG0KQEAgLTI4OSw3ICsyODksNiBAQCBzdWIgUGFyc2VJbnRlcmZhY2UKIHsKICAg ICBteSAkb2JqZWN0ID0gc2hpZnQ7CiAgICAgbXkgJGludGVyZmFjZU5hbWUgPSBzaGlmdDsKLSAg ICBteSAkcGFyZW50c09ubHkgPSBzaGlmdDsKIAogICAgIHJldHVybiB1bmRlZiBpZiAkaW50ZXJm YWNlTmFtZSBlcSAnT2JqZWN0JzsKIApAQCAtMzAxLDcgKzMwMCw3IEBAIHN1YiBQYXJzZUludGVy ZmFjZQogCiAgICAgIyBTdGVwICMyOiBQYXJzZSB0aGUgZm91bmQgSURMIGZpbGUgKGluIHF1aWV0 IG1vZGUpLgogICAgIG15ICRwYXJzZXIgPSBJRExQYXJzZXItPm5ldygxKTsKLSAgICBteSAkZG9j dW1lbnQgPSAkcGFyc2VyLT5QYXJzZSgkZmlsZW5hbWUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29y LCAkcGFyZW50c09ubHkpOworICAgIG15ICRkb2N1bWVudCA9ICRwYXJzZXItPlBhcnNlKCRmaWxl bmFtZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IsICR1c2VPdXRwdXREaXIpOwogCiAgICAgZm9y ZWFjaCBteSAkaW50ZXJmYWNlIChAeyRkb2N1bWVudC0+aW50ZXJmYWNlc30pIHsKICAgICAgICAg cmV0dXJuICRpbnRlcmZhY2UgaWYgJGludGVyZmFjZS0+bmFtZSBlcSAkaW50ZXJmYWNlTmFtZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBt IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0KaW5kZXggZjAw MDM1NTVlMDU4YzUyM2I4YWIzOGM5MGZiZjMzYmY3OTQyNTlhYi4uNTU5MmFkOWJmMjJkODU0ZmFl M2Y2Yzk4YTg3NDE3MmE1MjczOTg3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9JRExQYXJzZXIucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9JRExQYXJzZXIucG0KQEAgLTE3NiwxMCArMTc2LDExIEBAIHN1YiBQYXJzZQogICAgIG15 ICRmaWxlTmFtZSA9IHNoaWZ0OwogICAgIG15ICRkZWZpbmVzID0gc2hpZnQ7CiAgICAgbXkgJHBy ZXByb2Nlc3NvciA9IHNoaWZ0OworICAgIG15ICRvdXRwdXREaXJlY3RvcnkgPSBzaGlmdDsKIAog ICAgIG15IEBkZWZpbml0aW9ucyA9ICgpOwogCi0gICAgbXkgQGxpbmVzID0gYXBwbHlQcmVwcm9j ZXNzb3IoJGZpbGVOYW1lLCAkZGVmaW5lcywgJHByZXByb2Nlc3Nvcik7CisgICAgbXkgQGxpbmVz ID0gYXBwbHlQcmVwcm9jZXNzb3IoJGZpbGVOYW1lLCAkZGVmaW5lcywgJHByZXByb2Nlc3Nvciwg JG91dHB1dERpcmVjdG9yeSk7CiAgICAgJHNlbGYtPntMaW5lfSA9ICRsaW5lc1swXTsKICAgICAk c2VsZi0+e0RvY3VtZW50Q29udGVudH0gPSBqb2luKCcgJywgQGxpbmVzKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5ncy5wbCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtYmluZGluZ3MucGwKaW5k ZXggNzQzM2U3YmIyZmEyZDgxYTA1ZDQ1YjA4ODFiODQxMDg0MmIwMDFjMS4uNjU5YzJmZDU5ZmZl MjRhNmM2MTIyMjU1MWMyMDBkY2M4YWQ1Zjc0ZCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5ncy5wbAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsCkBAIC0xMjQsNyArMTI0LDcg QEAgaWYgKCRzdXBwbGVtZW50YWxEZXBlbmRlbmN5RmlsZSkgewogCiAjIFBhcnNlIHRoZSB0YXJn ZXQgSURMIGZpbGUuCiBteSAkdGFyZ2V0UGFyc2VyID0gSURMUGFyc2VyLT5uZXcoISR2ZXJib3Nl KTsKLW15ICR0YXJnZXREb2N1bWVudCA9ICR0YXJnZXRQYXJzZXItPlBhcnNlKCR0YXJnZXRJZGxG aWxlLCAkZGVmaW5lcywgJHByZXByb2Nlc3Nvcik7CitteSAkdGFyZ2V0RG9jdW1lbnQgPSAkdGFy Z2V0UGFyc2VyLT5QYXJzZSgkdGFyZ2V0SWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3Is ICRvdXRwdXREaXJlY3RvcnkpOwogCiBpZiAoJGlkbEF0dHJpYnV0ZXNGaWxlKSB7CiAgICAgbXkg JGlkbEF0dHJpYnV0ZXMgPSBsb2FkSURMQXR0cmlidXRlcygkaWRsQXR0cmlidXRlc0ZpbGUpOwpA QCAtMTM2LDcgKzEzNiw3IEBAIGZvcmVhY2ggbXkgJGlkbEZpbGUgKEBzdXBwbGVtZW50ZWRJZGxG aWxlcykgewogCiAgICAgbXkgJGludGVyZmFjZU5hbWUgPSBmaWxlcGFyc2UoYmFzZW5hbWUoJGlk bEZpbGUpLCAiLmlkbCIpOwogICAgIG15ICRwYXJzZXIgPSBJRExQYXJzZXItPm5ldyghJHZlcmJv c2UpOwotICAgIG15ICRkb2N1bWVudCA9ICRwYXJzZXItPlBhcnNlKCRpZGxGaWxlLCAkZGVmaW5l cywgJHByZXByb2Nlc3Nvcik7CisgICAgbXkgJGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGlk bEZpbGUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yLCAkb3V0cHV0RGlyZWN0b3J5KTsKIAogICAg IGZvcmVhY2ggbXkgJGludGVyZmFjZSAoQHskZG9jdW1lbnQtPmludGVyZmFjZXN9KSB7CiAgICAg ICAgIGlmICgkaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiU3VwcGxlbWVudGFsIn0g YW5kICRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJTdXBwbGVtZW50YWwifSBlcSAk dGFyZ2V0SW50ZXJmYWNlTmFtZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9nZW5lcmF0ZS1wcmVwcm9jZXNzZWQtaWRscy5wbCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtcHJlcHJvY2Vzc2VkLWlkbHMucGwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uMDVlYjhhNjJiZjc0NTQ5MzE3MDFjODkwOTU4YmRlNTE2YTRkZDk4YQotLS0gL2Rldi9udWxs CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtcHJlcHJvY2Vz c2VkLWlkbHMucGwKQEAgLTAsMCArMSw0MCBAQAorIyEvdXNyL2Jpbi9wZXJsIC13CisjCisjIENv cHlyaWdodCAoQykgMjAxMyBHb29nbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMg VGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFu ZC9vcgorIyBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5l cmFsIFB1YmxpYworIyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBG b3VuZGF0aW9uOyBlaXRoZXIKKyMgdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91 ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorIworIyBUaGlzIGxpYnJhcnkgaXMgZGlzdHJp YnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyMgYnV0IFdJVEhPVVQg QU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyMgTUVS Q0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRo ZSBHTlUKKyMgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMu CisjCisjIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5 IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyMgYWxvbmcgd2l0aCB0aGlzIGxpYnJhcnk7IHNlZSB0 aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8KKyMgdGhlIEZyZWUgU29mdHdh cmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwKKyMg Qm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisjCisKK3VzZSBzdHJpY3Q7CisKK3VzZSBwcmVw cm9jZXNzb3I7Cit1c2UgRmlsZTo6U2x1cnA7Cit1c2UgR2V0b3B0OjpMb25nOwordXNlIEN3ZDsK KworbXkgJGRlZmluZXM7CitteSAkcHJlcHJvY2Vzc29yOworbXkgJG91dHB1dDsKKworR2V0T3B0 aW9ucygnZGVmaW5lcz1zJyA9PiBcJGRlZmluZXMsCisgICAgICAgICAgICdwcmVwcm9jZXNzb3I9 cycgPT4gXCRwcmVwcm9jZXNzb3IsCisgICAgICAgICAgICdvdXRwdXQ9cycgPT4gXCRvdXRwdXQp OworCitkaWUoJ011c3Qgc3BlY2lmeSAjZGVmaW5lIG1hY3JvcyB1c2luZyAtLWRlZmluZXMuJykg dW5sZXNzIGRlZmluZWQoJGRlZmluZXMpOworZGllKCdNdXN0IHNwZWNpZnkgdGhlIG91dHB1dCB1 c2luZyAtLW91dHB1dC4nKSB1bmxlc3MgZGVmaW5lZCgkb3V0cHV0KTsKKworbXkgQGNvbnRlbnRz ID0gYXBwbHlQcmVwcm9jZXNzb3IoJEFSR1ZbMF0sICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yLCB1 bmRlZik7Cit3cml0ZV9maWxlKCRvdXRwdXQsIEBjb250ZW50cyk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbSBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCmluZGV4IDU5NjViMTAyNTY2OWQz MzIwOTI4MzJiOGFkYjk0ZTRkNmExZmEwZjQuLmM2NWQ2YzgyM2FiYjM4YTNiNzRiNTNiNGU2Zjcx YWIyMjk4ZDU5ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv cHJlcHJvY2Vzc29yLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvcHJl cHJvY2Vzc29yLnBtCkBAIC00MSw2ICs0MSwxOSBAQCBzdWIgYXBwbHlQcmVwcm9jZXNzb3IKICAg ICBteSAkZmlsZU5hbWUgPSBzaGlmdDsKICAgICBteSAkZGVmaW5lcyA9IHNoaWZ0OwogICAgIG15 ICRwcmVwcm9jZXNzb3IgPSBzaGlmdDsKKyAgICBteSAkb3V0cHV0RGlyZWN0b3J5ID0gc2hpZnQ7 CisKKyAgICBpZiAoJG91dHB1dERpcmVjdG9yeSkgeworICAgICAgICAjIElmIHRoZSBwcmVwcm9j ZXNzZWQgYnVpbGQgZmlsZSB3YXMgZ2VuZXJhdGVkIGFscmVhZHkgYnkgdGhlIGJ1aWxkCisgICAg ICAgICMgc3lzdGVtLCB0aGVuIHJldHVybiB0aGF0IG9uZS4gVGhpcyBhdm9pZHMgTl4yIGJlaGF2 aW9yIGluIHJlYXBwbHlpbmcKKyAgICAgICAgIyB0aGUgcHJlcHJvY2Vzc29yIHRoZSBpZGwgZmls ZXMgcmVmZXJlbmNlZCBieSBvdGhlciBpZGwgZmlsZXMuCisgICAgICAgIG15ICRiYXNlTmFtZSA9 IGJhc2VuYW1lKCRmaWxlTmFtZSk7CisgICAgICAgIG15ICRwcmVwcm9jZXNzZWRGaWxlID0gIiRv dXRwdXREaXJlY3RvcnkvJGJhc2VOYW1lLnBwIjsKKyAgICAgICAgaWYgKC1lICRwcmVwcm9jZXNz ZWRGaWxlKSB7CisgICAgICAgICAgICBteSBAbGluZXMgPSBkbyB7IGxvY2FsIEBBUkdWID0gJHBy ZXByb2Nlc3NlZEZpbGU7IDw+IH07CisgICAgICAgICAgICByZXR1cm4gQGxpbmVzOworICAgICAg ICB9CisgICAgfQogCiAgICAgbXkgQGFyZ3MgPSAoKTsKICAgICBpZiAoISRwcmVwcm9jZXNzb3Ip IHsK 195423 2013-03-27 15:57:44 -0700 2013-03-27 16:14:14 -0700 add note to changelog bug-113448-20130327155743.patch text/plain 9886 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQyOTRlNWE2Nzc1OWRj MDg5N2Q0M2Y1YTk3MTllZjM3MmEyOTNkOS4uOTRjOWJhNGY0Y2QyYzdlMjc4NDkxN2RmZDU2ZjQz OTZkOGVlYzc1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTAzLTI3ICBTY290 dCBHcmFoYW0gIDxzY290dG1nQGNocm9taXVtLm9yZz4KKworICAgICAgICBNb3ZlIHByZXByb2Nl c3Npbmcgb2YgaWRsIHRvIHByZS1wYXNzIGZvciBneXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzQ0OAorCisgICAgICAgIFJldmlld2VkIGJ5IFRv bnkgQ2hhbmcuCisKKyAgICAgICAgTW92ZXMgdGhlIHByZXByb2Nlc3NvciBpbnZvY2F0aW9ucyB3 aGVuIHBhcnNpbmcgSURMIGZpbGVzIHRvIGEKKyAgICAgICAgcHJlLXBhc3MgdG8gYXZvaWQgcmVp bnZvY2F0aW9ucyB3aGVuIElETHMgYXJlIHJlZmVyZW5jZWQgZnJvbSBvdGhlcnMuCisgICAgICAg IFRoaXMgcmVkdWNlcyB0aGUgbnVtYmVyIG9mIGludm9jYXRpb25zIG9mIHRoZSBwcmVwcm9jZXNz b3IgZnJvbSAyMDA3MQorICAgICAgICB0byA2MzMsIHdoaWNoIHJlZHVjZXMgdGhlIHJ1bnRpbWUg ZnJvbSAxMm0zMCB0byAxbSAob24gYSBXaW5kb3dzIGJveCkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLCB0aGlzIGlzIGEgYnVpbGQgdGltZSBpbXByb3ZlbWVudCwgYW5kIHNob3VsZG4ndCBoYXZl IGFueQorICAgICAgICB2aXNpYmxlIGVmZmVjdC4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwL1dl YkNvcmUuZ3lwOgorICAgICAgICAqIFdlYkNvcmUuZ3lwaTogQWRkZWQgU1ZHVVJJUmVmZXJlbmNl LnBtIGFzIGl0IGFwcGVhcmVkIHRvIGJlIG1pc3NpbmcuCisgICAgICAgIEFzIGl0J3Mgbm90IGlu Y2x1ZGVkIGluIHRoZSBsaXN0LCBpdCBkb2Vzbid0IGdldCBwcm9jZXNzZWQgaW4gdGhlCisgICAg ICAgIHByZS1wYXNzLCB3aGljaCBjYXVzZXMgaXQgdG8gZ2V0IHJlcHJvY2Vzc2VkIHJlZHVuZGFu dGx5LgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbToKKyAgICAg ICAgKFBhcnNlSW50ZXJmYWNlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNl ci5wbToKKyAgICAgICAgKFBhcnNlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL2dlbmVy YXRlLWJpbmRpbmdzLnBsOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtcHJl cHJvY2Vzc2VkLWlkbHMucGw6IEFkZGVkLgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvcHJl cHJvY2Vzc29yLnBtOgorICAgICAgICAoYXBwbHlQcmVwcm9jZXNzb3IpOgorCiAyMDEzLTAzLTI1 ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogW1RpbWVsaW5lXSBzZXQgZ2x1ZSByZWNvcmRzIG1vZGUgb2ZmIGJ5IGRlZmF1bHQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKaW5kZXggZTYyZTYzM2ZiYjU3ZmZk YTNiMzM5YjUzYTBjMTMzYWMwOTNhOTUwNS4uN2IyYzQ3OWYzNDJiYWNiYjJlNWNjMDUwMzM2Nzhj YjQ0NWUyODY4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29y ZS5neXAKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKQEAgLTU5 NSwxMiArNTk1LDU1IEBACiAgICAgICBdCiAgICAgfSwKICAgICB7CisgICAgICAndGFyZ2V0X25h bWUnOiAnZ2VuZXJhdGVfcHJlcHJvY2Vzc2VkX2lkbHMnLAorICAgICAgJ3R5cGUnOiAnbm9uZScs CisgICAgICAnc291cmNlcyc6IFsKKyAgICAgICAgJzxAKGJpbmRpbmdzX2lkbF9maWxlcyknLAor ICAgICAgICAnPEAod2ViY29yZV90ZXN0X3N1cHBvcnRfaWRsX2ZpbGVzKScsCisgICAgICBdLAor ICAgICAgJ3J1bGVzJzogWworICAgICAgICAjIFJ1bGVzIHRvIGJ1aWxkIGRlcml2ZWQgc291cmNl cy4KKyAgICAgICAgeworICAgICAgICAgICdydWxlX25hbWUnOiAnYmluZGluZycsCisgICAgICAg ICAgJ2V4dGVuc2lvbic6ICdpZGwnLAorICAgICAgICAgICdtc3ZzX2V4dGVybmFsX3J1bGUnOiAx LAorICAgICAgICAgICd2YXJpYWJsZXMnOiB7CisgICAgICAgICAgICAnYWxsX2lkbF9maWxlc19s aXN0JzogJzx8KGFsbF9pZGxfZmlsZXNfbGlzdC50bXAgPEAoYmluZGluZ3NfaWRsX2ZpbGVzKSA8 QCh3ZWJjb3JlX3Rlc3Rfc3VwcG9ydF9pZGxfZmlsZXMpKScsCisgICAgICAgICAgfSwKKyAgICAg ICAgICAnaW5wdXRzJzogWworICAgICAgICAgICAgJy4uL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJh dGUtcHJlcHJvY2Vzc2VkLWlkbHMucGwnLAorICAgICAgICAgICAgJy4uL2JpbmRpbmdzL3Njcmlw dHMvcHJlcHJvY2Vzc29yLnBtJywKKyAgICAgICAgICAgICc8KGFsbF9pZGxfZmlsZXNfbGlzdCkn LAorICAgICAgICAgICAgJzwhQChjYXQgPChhbGxfaWRsX2ZpbGVzX2xpc3QpKScsCisgICAgICAg ICAgXSwKKyAgICAgICAgICAnb3V0cHV0cyc6IFsKKyAgICAgICAgICAgICc8KFNIQVJFRF9JTlRF Uk1FRElBVEVfRElSKS93ZWJjb3JlL2JpbmRpbmdzLzwoUlVMRV9JTlBVVF9ST09UKS5pZGwucHAn LAorICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwKKyAgICAg ICAgICAnYWN0aW9uJzogWworICAgICAgICAgICAgJzwocGVybF9leGUpJywKKyAgICAgICAgICAg ICctdycsCisgICAgICAgICAgICAnLUkuLi9iaW5kaW5ncy9zY3JpcHRzJywKKyAgICAgICAgICAg ICcuLi9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXByZXByb2Nlc3NlZC1pZGxzLnBsJywKKyAg ICAgICAgICAgICctLW91dHB1dCcsCisgICAgICAgICAgICAnPEAoX291dHB1dHMpJywKKyAgICAg ICAgICAgICctLWRlZmluZXMnLAorICAgICAgICAgICAgJzwoZmVhdHVyZV9kZWZpbmVzKSBMQU5H VUFHRV9KQVZBU0NSSVBUIFY4X0JJTkRJTkcnLAorICAgICAgICAgICAgJzwoUlVMRV9JTlBVVF9Q QVRIKScsCisgICAgICAgICAgICAnPEAocHJlcHJvY2Vzc29yKScsCisgICAgICAgICAgXSwKKyAg ICAgICAgICAnbWVzc2FnZSc6ICdQcmVwcm9jZXNzaW5nIDwoUlVMRV9JTlBVVF9QQVRIKScsCisg ICAgICAgIH0sCisgICAgICBdLAorICAgIH0sCisgICAgewogICAgICAgJ3RhcmdldF9uYW1lJzog J3dlYmNvcmVfYmluZGluZ3Nfc291cmNlcycsCiAgICAgICAndHlwZSc6ICdub25lJywKICAgICAg ICdoYXJkX2RlcGVuZGVuY3knOiAxLAogICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKICAgICAgICAg J2dlbmVyYXRlX3N1cHBsZW1lbnRhbF9kZXBlbmRlbmN5JywKICAgICAgICAgJ2dlbmVyYXRlX3Nl dHRpbmdzJywKKyAgICAgICAgJ2dlbmVyYXRlX3ByZXByb2Nlc3NlZF9pZGxzJywKICAgICAgIF0s CiAgICAgICAnc291cmNlcyc6IFsKICAgICAgICAgIyBiaXNvbiBydWxlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkK aW5kZXggYzVkYTIzN2M3OWZkMDc0NjM5YjIyMDIxMWI2ZjQxZmY0MWJkYjczNS4uMDE5N2E2YjRl ODg2OGFjNGVlYTNiNTdmZmYxZTZkYjhlNDNlYjEzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5neXBpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQpAQCAtNzEx LDYgKzcxMSw3IEBACiAgICAgICAgICAgICAnc3ZnL1NWR1RyYW5zZm9ybUxpc3QuaWRsJywKICAg ICAgICAgICAgICdzdmcvU1ZHVHJhbnNmb3JtYWJsZS5pZGwnLAogICAgICAgICAgICAgJ3N2Zy9T VkdVbml0VHlwZXMuaWRsJywKKyAgICAgICAgICAgICdzdmcvU1ZHVVJJUmVmZXJlbmNlLmlkbCcs CiAgICAgICAgICAgICAnc3ZnL1NWR1VzZUVsZW1lbnQuaWRsJywKICAgICAgICAgICAgICdzdmcv U1ZHVmlld0VsZW1lbnQuaWRsJywKICAgICAgICAgICAgICdzdmcvU1ZHVmlld1NwZWMuaWRsJywK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv ci5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbQpp bmRleCBkNDc0M2E2MWViYzAxMGE2ZjVmZWEyZGI1MDk1NzgwZDJhYTQ0Mjk2Li4wYjM0MWQzNmVm ZTljOWQ0MGQ3YzRjZWM4NGE0NzdmMjJiOTIxMjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0KKysrIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yLnBtCkBAIC0yODksNyArMjg5LDYgQEAgc3Vi IFBhcnNlSW50ZXJmYWNlCiB7CiAgICAgbXkgJG9iamVjdCA9IHNoaWZ0OwogICAgIG15ICRpbnRl cmZhY2VOYW1lID0gc2hpZnQ7Ci0gICAgbXkgJHBhcmVudHNPbmx5ID0gc2hpZnQ7CiAKICAgICBy ZXR1cm4gdW5kZWYgaWYgJGludGVyZmFjZU5hbWUgZXEgJ09iamVjdCc7CiAKQEAgLTMwMSw3ICsz MDAsNyBAQCBzdWIgUGFyc2VJbnRlcmZhY2UKIAogICAgICMgU3RlcCAjMjogUGFyc2UgdGhlIGZv dW5kIElETCBmaWxlIChpbiBxdWlldCBtb2RlKS4KICAgICBteSAkcGFyc2VyID0gSURMUGFyc2Vy LT5uZXcoMSk7Ci0gICAgbXkgJGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGZpbGVuYW1lLCAk ZGVmaW5lcywgJHByZXByb2Nlc3NvciwgJHBhcmVudHNPbmx5KTsKKyAgICBteSAkZG9jdW1lbnQg PSAkcGFyc2VyLT5QYXJzZSgkZmlsZW5hbWUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yLCAkdXNl T3V0cHV0RGlyKTsKIAogICAgIGZvcmVhY2ggbXkgJGludGVyZmFjZSAoQHskZG9jdW1lbnQtPmlu dGVyZmFjZXN9KSB7CiAgICAgICAgIHJldHVybiAkaW50ZXJmYWNlIGlmICRpbnRlcmZhY2UtPm5h bWUgZXEgJGludGVyZmFjZU5hbWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL0lETFBhcnNlci5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv SURMUGFyc2VyLnBtCmluZGV4IGYwMDAzNTU1ZTA1OGM1MjNiOGFiMzhjOTBmYmYzM2JmNzk0MjU5 YWIuLjU1OTJhZDliZjIyZDg1NGZhZTNmNmM5OGE4NzQxNzJhNTI3Mzk4NzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtCkBAIC0xNzYsMTAgKzE3Niwx MSBAQCBzdWIgUGFyc2UKICAgICBteSAkZmlsZU5hbWUgPSBzaGlmdDsKICAgICBteSAkZGVmaW5l cyA9IHNoaWZ0OwogICAgIG15ICRwcmVwcm9jZXNzb3IgPSBzaGlmdDsKKyAgICBteSAkb3V0cHV0 RGlyZWN0b3J5ID0gc2hpZnQ7CiAKICAgICBteSBAZGVmaW5pdGlvbnMgPSAoKTsKIAotICAgIG15 IEBsaW5lcyA9IGFwcGx5UHJlcHJvY2Vzc29yKCRmaWxlTmFtZSwgJGRlZmluZXMsICRwcmVwcm9j ZXNzb3IpOworICAgIG15IEBsaW5lcyA9IGFwcGx5UHJlcHJvY2Vzc29yKCRmaWxlTmFtZSwgJGRl ZmluZXMsICRwcmVwcm9jZXNzb3IsICRvdXRwdXREaXJlY3RvcnkpOwogICAgICRzZWxmLT57TGlu ZX0gPSAkbGluZXNbMF07CiAgICAgJHNlbGYtPntEb2N1bWVudENvbnRlbnR9ID0gam9pbignICcs IEBsaW5lcyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Z2VuZXJhdGUtYmluZGluZ3MucGwgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dl bmVyYXRlLWJpbmRpbmdzLnBsCmluZGV4IDc0MzNlN2JiMmZhMmQ4MWEwNWQ0NWIwODgxYjg0MTA4 NDJiMDAxYzEuLjY1OWMyZmQ1OWZmZTI0YTZjNjEyMjI1NTFjMjAwZGNjOGFkNWY3NGQgMTAwNzU1 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtYmluZGluZ3Mu cGwKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5n cy5wbApAQCAtMTI0LDcgKzEyNCw3IEBAIGlmICgkc3VwcGxlbWVudGFsRGVwZW5kZW5jeUZpbGUp IHsKIAogIyBQYXJzZSB0aGUgdGFyZ2V0IElETCBmaWxlLgogbXkgJHRhcmdldFBhcnNlciA9IElE TFBhcnNlci0+bmV3KCEkdmVyYm9zZSk7Ci1teSAkdGFyZ2V0RG9jdW1lbnQgPSAkdGFyZ2V0UGFy c2VyLT5QYXJzZSgkdGFyZ2V0SWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IpOworbXkg JHRhcmdldERvY3VtZW50ID0gJHRhcmdldFBhcnNlci0+UGFyc2UoJHRhcmdldElkbEZpbGUsICRk ZWZpbmVzLCAkcHJlcHJvY2Vzc29yLCAkb3V0cHV0RGlyZWN0b3J5KTsKIAogaWYgKCRpZGxBdHRy aWJ1dGVzRmlsZSkgewogICAgIG15ICRpZGxBdHRyaWJ1dGVzID0gbG9hZElETEF0dHJpYnV0ZXMo JGlkbEF0dHJpYnV0ZXNGaWxlKTsKQEAgLTEzNiw3ICsxMzYsNyBAQCBmb3JlYWNoIG15ICRpZGxG aWxlIChAc3VwcGxlbWVudGVkSWRsRmlsZXMpIHsKIAogICAgIG15ICRpbnRlcmZhY2VOYW1lID0g ZmlsZXBhcnNlKGJhc2VuYW1lKCRpZGxGaWxlKSwgIi5pZGwiKTsKICAgICBteSAkcGFyc2VyID0g SURMUGFyc2VyLT5uZXcoISR2ZXJib3NlKTsKLSAgICBteSAkZG9jdW1lbnQgPSAkcGFyc2VyLT5Q YXJzZSgkaWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IpOworICAgIG15ICRkb2N1bWVu dCA9ICRwYXJzZXItPlBhcnNlKCRpZGxGaWxlLCAkZGVmaW5lcywgJHByZXByb2Nlc3NvciwgJG91 dHB1dERpcmVjdG9yeSk7CiAKICAgICBmb3JlYWNoIG15ICRpbnRlcmZhY2UgKEB7JGRvY3VtZW50 LT5pbnRlcmZhY2VzfSkgewogICAgICAgICBpZiAoJGludGVyZmFjZS0+ZXh0ZW5kZWRBdHRyaWJ1 dGVzLT57IlN1cHBsZW1lbnRhbCJ9IGFuZCAkaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0ZXMt PnsiU3VwcGxlbWVudGFsIn0gZXEgJHRhcmdldEludGVyZmFjZU5hbWUpIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtcHJlcHJvY2Vzc2VkLWlk bHMucGwgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXByZXByb2Nl c3NlZC1pZGxzLnBsCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA1ZWI4YTYyYmY3NDU0OTMxNzAxYzg5MDk1OGJkZTUx NmE0ZGQ5OGEKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL2dlbmVyYXRlLXByZXByb2Nlc3NlZC1pZGxzLnBsCkBAIC0wLDAgKzEsNDAgQEAKKyMhL3Vz ci9iaW4vcGVybCAtdworIworIyBDb3B5cmlnaHQgKEMpIDIwMTMgR29vZ2xlIEluYy4gIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisjCisjIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3Ug Y2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyMgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBv ZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKKyMgTGljZW5zZSBhcyBwdWJsaXNoZWQg YnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisjIHZlcnNpb24gMiBvZiB0 aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyMKKyMg VGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1 c2VmdWwsCisjIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBs aWVkIHdhcnJhbnR5IG9mCisjIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJ Q1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisjIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGlj ZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorIworIyBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBj b3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisjIGFsb25nIHdp dGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdyaXRl IHRvCisjIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0 cmVldCwgRmlmdGggRmxvb3IsCisjIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgorIworCit1 c2Ugc3RyaWN0OworCit1c2UgcHJlcHJvY2Vzc29yOwordXNlIEZpbGU6OlNsdXJwOwordXNlIEdl dG9wdDo6TG9uZzsKK3VzZSBDd2Q7CisKK215ICRkZWZpbmVzOworbXkgJHByZXByb2Nlc3NvcjsK K215ICRvdXRwdXQ7CisKK0dldE9wdGlvbnMoJ2RlZmluZXM9cycgPT4gXCRkZWZpbmVzLAorICAg ICAgICAgICAncHJlcHJvY2Vzc29yPXMnID0+IFwkcHJlcHJvY2Vzc29yLAorICAgICAgICAgICAn b3V0cHV0PXMnID0+IFwkb3V0cHV0KTsKKworZGllKCdNdXN0IHNwZWNpZnkgI2RlZmluZSBtYWNy b3MgdXNpbmcgLS1kZWZpbmVzLicpIHVubGVzcyBkZWZpbmVkKCRkZWZpbmVzKTsKK2RpZSgnTXVz dCBzcGVjaWZ5IHRoZSBvdXRwdXQgdXNpbmcgLS1vdXRwdXQuJykgdW5sZXNzIGRlZmluZWQoJG91 dHB1dCk7CisKK215IEBjb250ZW50cyA9IGFwcGx5UHJlcHJvY2Vzc29yKCRBUkdWWzBdLCAkZGVm aW5lcywgJHByZXByb2Nlc3NvciwgdW5kZWYpOword3JpdGVfZmlsZSgkb3V0cHV0LCBAY29udGVu dHMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9j ZXNzb3IucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5w bQppbmRleCA1OTY1YjEwMjU2NjlkMzMyMDkyODMyYjhhZGI5NGU0ZDZhMWZhMGY0Li5jNjVkNmM4 MjNhYmIzOGEzYjc0YjUzYjRlNmY3MWFiMjI5OGQ1OTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbQpAQCAtNDEsNiArNDEsMTkgQEAgc3Vi IGFwcGx5UHJlcHJvY2Vzc29yCiAgICAgbXkgJGZpbGVOYW1lID0gc2hpZnQ7CiAgICAgbXkgJGRl ZmluZXMgPSBzaGlmdDsKICAgICBteSAkcHJlcHJvY2Vzc29yID0gc2hpZnQ7CisgICAgbXkgJG91 dHB1dERpcmVjdG9yeSA9IHNoaWZ0OworCisgICAgaWYgKCRvdXRwdXREaXJlY3RvcnkpIHsKKyAg ICAgICAgIyBJZiB0aGUgcHJlcHJvY2Vzc2VkIGJ1aWxkIGZpbGUgd2FzIGdlbmVyYXRlZCBhbHJl YWR5IGJ5IHRoZSBidWlsZAorICAgICAgICAjIHN5c3RlbSwgdGhlbiByZXR1cm4gdGhhdCBvbmUu IFRoaXMgYXZvaWRzIE5eMiBiZWhhdmlvciBpbiByZWFwcGx5aW5nCisgICAgICAgICMgdGhlIHBy ZXByb2Nlc3NvciB0aGUgaWRsIGZpbGVzIHJlZmVyZW5jZWQgYnkgb3RoZXIgaWRsIGZpbGVzLgor ICAgICAgICBteSAkYmFzZU5hbWUgPSBiYXNlbmFtZSgkZmlsZU5hbWUpOworICAgICAgICBteSAk cHJlcHJvY2Vzc2VkRmlsZSA9ICIkb3V0cHV0RGlyZWN0b3J5LyRiYXNlTmFtZS5wcCI7CisgICAg ICAgIGlmICgtZSAkcHJlcHJvY2Vzc2VkRmlsZSkgeworICAgICAgICAgICAgbXkgQGxpbmVzID0g ZG8geyBsb2NhbCBAQVJHViA9ICRwcmVwcm9jZXNzZWRGaWxlOyA8PiB9OworICAgICAgICAgICAg cmV0dXJuIEBsaW5lczsKKyAgICAgICAgfQorICAgIH0KIAogICAgIG15IEBhcmdzID0gKCk7CiAg ICAgaWYgKCEkcHJlcHJvY2Vzc29yKSB7Cg== 195427 2013-03-27 16:14:18 -0700 2013-03-27 16:56:31 -0700 fix for older perl versions bug-113448-20130327161417.patch text/plain 10047 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQyOTRlNWE2Nzc1OWRj MDg5N2Q0M2Y1YTk3MTllZjM3MmEyOTNkOS4uOTRjOWJhNGY0Y2QyYzdlMjc4NDkxN2RmZDU2ZjQz OTZkOGVlYzc1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTAzLTI3ICBTY290 dCBHcmFoYW0gIDxzY290dG1nQGNocm9taXVtLm9yZz4KKworICAgICAgICBNb3ZlIHByZXByb2Nl c3Npbmcgb2YgaWRsIHRvIHByZS1wYXNzIGZvciBneXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzQ0OAorCisgICAgICAgIFJldmlld2VkIGJ5IFRv bnkgQ2hhbmcuCisKKyAgICAgICAgTW92ZXMgdGhlIHByZXByb2Nlc3NvciBpbnZvY2F0aW9ucyB3 aGVuIHBhcnNpbmcgSURMIGZpbGVzIHRvIGEKKyAgICAgICAgcHJlLXBhc3MgdG8gYXZvaWQgcmVp bnZvY2F0aW9ucyB3aGVuIElETHMgYXJlIHJlZmVyZW5jZWQgZnJvbSBvdGhlcnMuCisgICAgICAg IFRoaXMgcmVkdWNlcyB0aGUgbnVtYmVyIG9mIGludm9jYXRpb25zIG9mIHRoZSBwcmVwcm9jZXNz b3IgZnJvbSAyMDA3MQorICAgICAgICB0byA2MzMsIHdoaWNoIHJlZHVjZXMgdGhlIHJ1bnRpbWUg ZnJvbSAxMm0zMCB0byAxbSAob24gYSBXaW5kb3dzIGJveCkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLCB0aGlzIGlzIGEgYnVpbGQgdGltZSBpbXByb3ZlbWVudCwgYW5kIHNob3VsZG4ndCBoYXZl IGFueQorICAgICAgICB2aXNpYmxlIGVmZmVjdC4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwL1dl YkNvcmUuZ3lwOgorICAgICAgICAqIFdlYkNvcmUuZ3lwaTogQWRkZWQgU1ZHVVJJUmVmZXJlbmNl LnBtIGFzIGl0IGFwcGVhcmVkIHRvIGJlIG1pc3NpbmcuCisgICAgICAgIEFzIGl0J3Mgbm90IGlu Y2x1ZGVkIGluIHRoZSBsaXN0LCBpdCBkb2Vzbid0IGdldCBwcm9jZXNzZWQgaW4gdGhlCisgICAg ICAgIHByZS1wYXNzLCB3aGljaCBjYXVzZXMgaXQgdG8gZ2V0IHJlcHJvY2Vzc2VkIHJlZHVuZGFu dGx5LgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbToKKyAgICAg ICAgKFBhcnNlSW50ZXJmYWNlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNl ci5wbToKKyAgICAgICAgKFBhcnNlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL2dlbmVy YXRlLWJpbmRpbmdzLnBsOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtcHJl cHJvY2Vzc2VkLWlkbHMucGw6IEFkZGVkLgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvcHJl cHJvY2Vzc29yLnBtOgorICAgICAgICAoYXBwbHlQcmVwcm9jZXNzb3IpOgorCiAyMDEzLTAzLTI1 ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogW1RpbWVsaW5lXSBzZXQgZ2x1ZSByZWNvcmRzIG1vZGUgb2ZmIGJ5IGRlZmF1bHQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKaW5kZXggZTYyZTYzM2ZiYjU3ZmZk YTNiMzM5YjUzYTBjMTMzYWMwOTNhOTUwNS4uN2IyYzQ3OWYzNDJiYWNiYjJlNWNjMDUwMzM2Nzhj YjQ0NWUyODY4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29y ZS5neXAKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKQEAgLTU5 NSwxMiArNTk1LDU1IEBACiAgICAgICBdCiAgICAgfSwKICAgICB7CisgICAgICAndGFyZ2V0X25h bWUnOiAnZ2VuZXJhdGVfcHJlcHJvY2Vzc2VkX2lkbHMnLAorICAgICAgJ3R5cGUnOiAnbm9uZScs CisgICAgICAnc291cmNlcyc6IFsKKyAgICAgICAgJzxAKGJpbmRpbmdzX2lkbF9maWxlcyknLAor ICAgICAgICAnPEAod2ViY29yZV90ZXN0X3N1cHBvcnRfaWRsX2ZpbGVzKScsCisgICAgICBdLAor ICAgICAgJ3J1bGVzJzogWworICAgICAgICAjIFJ1bGVzIHRvIGJ1aWxkIGRlcml2ZWQgc291cmNl cy4KKyAgICAgICAgeworICAgICAgICAgICdydWxlX25hbWUnOiAnYmluZGluZycsCisgICAgICAg ICAgJ2V4dGVuc2lvbic6ICdpZGwnLAorICAgICAgICAgICdtc3ZzX2V4dGVybmFsX3J1bGUnOiAx LAorICAgICAgICAgICd2YXJpYWJsZXMnOiB7CisgICAgICAgICAgICAnYWxsX2lkbF9maWxlc19s aXN0JzogJzx8KGFsbF9pZGxfZmlsZXNfbGlzdC50bXAgPEAoYmluZGluZ3NfaWRsX2ZpbGVzKSA8 QCh3ZWJjb3JlX3Rlc3Rfc3VwcG9ydF9pZGxfZmlsZXMpKScsCisgICAgICAgICAgfSwKKyAgICAg ICAgICAnaW5wdXRzJzogWworICAgICAgICAgICAgJy4uL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJh dGUtcHJlcHJvY2Vzc2VkLWlkbHMucGwnLAorICAgICAgICAgICAgJy4uL2JpbmRpbmdzL3Njcmlw dHMvcHJlcHJvY2Vzc29yLnBtJywKKyAgICAgICAgICAgICc8KGFsbF9pZGxfZmlsZXNfbGlzdCkn LAorICAgICAgICAgICAgJzwhQChjYXQgPChhbGxfaWRsX2ZpbGVzX2xpc3QpKScsCisgICAgICAg ICAgXSwKKyAgICAgICAgICAnb3V0cHV0cyc6IFsKKyAgICAgICAgICAgICc8KFNIQVJFRF9JTlRF Uk1FRElBVEVfRElSKS93ZWJjb3JlL2JpbmRpbmdzLzwoUlVMRV9JTlBVVF9ST09UKS5pZGwucHAn LAorICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNfY3lnd2luX3NoZWxsJzogMCwKKyAgICAg ICAgICAnYWN0aW9uJzogWworICAgICAgICAgICAgJzwocGVybF9leGUpJywKKyAgICAgICAgICAg ICctdycsCisgICAgICAgICAgICAnLUkuLi9iaW5kaW5ncy9zY3JpcHRzJywKKyAgICAgICAgICAg ICcuLi9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXByZXByb2Nlc3NlZC1pZGxzLnBsJywKKyAg ICAgICAgICAgICctLW91dHB1dCcsCisgICAgICAgICAgICAnPEAoX291dHB1dHMpJywKKyAgICAg ICAgICAgICctLWRlZmluZXMnLAorICAgICAgICAgICAgJzwoZmVhdHVyZV9kZWZpbmVzKSBMQU5H VUFHRV9KQVZBU0NSSVBUIFY4X0JJTkRJTkcnLAorICAgICAgICAgICAgJzwoUlVMRV9JTlBVVF9Q QVRIKScsCisgICAgICAgICAgICAnPEAocHJlcHJvY2Vzc29yKScsCisgICAgICAgICAgXSwKKyAg ICAgICAgICAnbWVzc2FnZSc6ICdQcmVwcm9jZXNzaW5nIDwoUlVMRV9JTlBVVF9QQVRIKScsCisg ICAgICAgIH0sCisgICAgICBdLAorICAgIH0sCisgICAgewogICAgICAgJ3RhcmdldF9uYW1lJzog J3dlYmNvcmVfYmluZGluZ3Nfc291cmNlcycsCiAgICAgICAndHlwZSc6ICdub25lJywKICAgICAg ICdoYXJkX2RlcGVuZGVuY3knOiAxLAogICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKICAgICAgICAg J2dlbmVyYXRlX3N1cHBsZW1lbnRhbF9kZXBlbmRlbmN5JywKICAgICAgICAgJ2dlbmVyYXRlX3Nl dHRpbmdzJywKKyAgICAgICAgJ2dlbmVyYXRlX3ByZXByb2Nlc3NlZF9pZGxzJywKICAgICAgIF0s CiAgICAgICAnc291cmNlcyc6IFsKICAgICAgICAgIyBiaXNvbiBydWxlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkK aW5kZXggYzVkYTIzN2M3OWZkMDc0NjM5YjIyMDIxMWI2ZjQxZmY0MWJkYjczNS4uMDE5N2E2YjRl ODg2OGFjNGVlYTNiNTdmZmYxZTZkYjhlNDNlYjEzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5neXBpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQpAQCAtNzEx LDYgKzcxMSw3IEBACiAgICAgICAgICAgICAnc3ZnL1NWR1RyYW5zZm9ybUxpc3QuaWRsJywKICAg ICAgICAgICAgICdzdmcvU1ZHVHJhbnNmb3JtYWJsZS5pZGwnLAogICAgICAgICAgICAgJ3N2Zy9T VkdVbml0VHlwZXMuaWRsJywKKyAgICAgICAgICAgICdzdmcvU1ZHVVJJUmVmZXJlbmNlLmlkbCcs CiAgICAgICAgICAgICAnc3ZnL1NWR1VzZUVsZW1lbnQuaWRsJywKICAgICAgICAgICAgICdzdmcv U1ZHVmlld0VsZW1lbnQuaWRsJywKICAgICAgICAgICAgICdzdmcvU1ZHVmlld1NwZWMuaWRsJywK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv ci5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbQpp bmRleCBkNDc0M2E2MWViYzAxMGE2ZjVmZWEyZGI1MDk1NzgwZDJhYTQ0Mjk2Li4wYjM0MWQzNmVm ZTljOWQ0MGQ3YzRjZWM4NGE0NzdmMjJiOTIxMjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0KKysrIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yLnBtCkBAIC0yODksNyArMjg5LDYgQEAgc3Vi IFBhcnNlSW50ZXJmYWNlCiB7CiAgICAgbXkgJG9iamVjdCA9IHNoaWZ0OwogICAgIG15ICRpbnRl cmZhY2VOYW1lID0gc2hpZnQ7Ci0gICAgbXkgJHBhcmVudHNPbmx5ID0gc2hpZnQ7CiAKICAgICBy ZXR1cm4gdW5kZWYgaWYgJGludGVyZmFjZU5hbWUgZXEgJ09iamVjdCc7CiAKQEAgLTMwMSw3ICsz MDAsNyBAQCBzdWIgUGFyc2VJbnRlcmZhY2UKIAogICAgICMgU3RlcCAjMjogUGFyc2UgdGhlIGZv dW5kIElETCBmaWxlIChpbiBxdWlldCBtb2RlKS4KICAgICBteSAkcGFyc2VyID0gSURMUGFyc2Vy LT5uZXcoMSk7Ci0gICAgbXkgJGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGZpbGVuYW1lLCAk ZGVmaW5lcywgJHByZXByb2Nlc3NvciwgJHBhcmVudHNPbmx5KTsKKyAgICBteSAkZG9jdW1lbnQg PSAkcGFyc2VyLT5QYXJzZSgkZmlsZW5hbWUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yLCAkdXNl T3V0cHV0RGlyKTsKIAogICAgIGZvcmVhY2ggbXkgJGludGVyZmFjZSAoQHskZG9jdW1lbnQtPmlu dGVyZmFjZXN9KSB7CiAgICAgICAgIHJldHVybiAkaW50ZXJmYWNlIGlmICRpbnRlcmZhY2UtPm5h bWUgZXEgJGludGVyZmFjZU5hbWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL0lETFBhcnNlci5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv SURMUGFyc2VyLnBtCmluZGV4IGYwMDAzNTU1ZTA1OGM1MjNiOGFiMzhjOTBmYmYzM2JmNzk0MjU5 YWIuLjU1OTJhZDliZjIyZDg1NGZhZTNmNmM5OGE4NzQxNzJhNTI3Mzk4NzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtCkBAIC0xNzYsMTAgKzE3Niwx MSBAQCBzdWIgUGFyc2UKICAgICBteSAkZmlsZU5hbWUgPSBzaGlmdDsKICAgICBteSAkZGVmaW5l cyA9IHNoaWZ0OwogICAgIG15ICRwcmVwcm9jZXNzb3IgPSBzaGlmdDsKKyAgICBteSAkb3V0cHV0 RGlyZWN0b3J5ID0gc2hpZnQ7CiAKICAgICBteSBAZGVmaW5pdGlvbnMgPSAoKTsKIAotICAgIG15 IEBsaW5lcyA9IGFwcGx5UHJlcHJvY2Vzc29yKCRmaWxlTmFtZSwgJGRlZmluZXMsICRwcmVwcm9j ZXNzb3IpOworICAgIG15IEBsaW5lcyA9IGFwcGx5UHJlcHJvY2Vzc29yKCRmaWxlTmFtZSwgJGRl ZmluZXMsICRwcmVwcm9jZXNzb3IsICRvdXRwdXREaXJlY3RvcnkpOwogICAgICRzZWxmLT57TGlu ZX0gPSAkbGluZXNbMF07CiAgICAgJHNlbGYtPntEb2N1bWVudENvbnRlbnR9ID0gam9pbignICcs IEBsaW5lcyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Z2VuZXJhdGUtYmluZGluZ3MucGwgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dl bmVyYXRlLWJpbmRpbmdzLnBsCmluZGV4IDc0MzNlN2JiMmZhMmQ4MWEwNWQ0NWIwODgxYjg0MTA4 NDJiMDAxYzEuLjY1OWMyZmQ1OWZmZTI0YTZjNjEyMjI1NTFjMjAwZGNjOGFkNWY3NGQgMTAwNzU1 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtYmluZGluZ3Mu cGwKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5n cy5wbApAQCAtMTI0LDcgKzEyNCw3IEBAIGlmICgkc3VwcGxlbWVudGFsRGVwZW5kZW5jeUZpbGUp IHsKIAogIyBQYXJzZSB0aGUgdGFyZ2V0IElETCBmaWxlLgogbXkgJHRhcmdldFBhcnNlciA9IElE TFBhcnNlci0+bmV3KCEkdmVyYm9zZSk7Ci1teSAkdGFyZ2V0RG9jdW1lbnQgPSAkdGFyZ2V0UGFy c2VyLT5QYXJzZSgkdGFyZ2V0SWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IpOworbXkg JHRhcmdldERvY3VtZW50ID0gJHRhcmdldFBhcnNlci0+UGFyc2UoJHRhcmdldElkbEZpbGUsICRk ZWZpbmVzLCAkcHJlcHJvY2Vzc29yLCAkb3V0cHV0RGlyZWN0b3J5KTsKIAogaWYgKCRpZGxBdHRy aWJ1dGVzRmlsZSkgewogICAgIG15ICRpZGxBdHRyaWJ1dGVzID0gbG9hZElETEF0dHJpYnV0ZXMo JGlkbEF0dHJpYnV0ZXNGaWxlKTsKQEAgLTEzNiw3ICsxMzYsNyBAQCBmb3JlYWNoIG15ICRpZGxG aWxlIChAc3VwcGxlbWVudGVkSWRsRmlsZXMpIHsKIAogICAgIG15ICRpbnRlcmZhY2VOYW1lID0g ZmlsZXBhcnNlKGJhc2VuYW1lKCRpZGxGaWxlKSwgIi5pZGwiKTsKICAgICBteSAkcGFyc2VyID0g SURMUGFyc2VyLT5uZXcoISR2ZXJib3NlKTsKLSAgICBteSAkZG9jdW1lbnQgPSAkcGFyc2VyLT5Q YXJzZSgkaWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IpOworICAgIG15ICRkb2N1bWVu dCA9ICRwYXJzZXItPlBhcnNlKCRpZGxGaWxlLCAkZGVmaW5lcywgJHByZXByb2Nlc3NvciwgJG91 dHB1dERpcmVjdG9yeSk7CiAKICAgICBmb3JlYWNoIG15ICRpbnRlcmZhY2UgKEB7JGRvY3VtZW50 LT5pbnRlcmZhY2VzfSkgewogICAgICAgICBpZiAoJGludGVyZmFjZS0+ZXh0ZW5kZWRBdHRyaWJ1 dGVzLT57IlN1cHBsZW1lbnRhbCJ9IGFuZCAkaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0ZXMt PnsiU3VwcGxlbWVudGFsIn0gZXEgJHRhcmdldEludGVyZmFjZU5hbWUpIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtcHJlcHJvY2Vzc2VkLWlk bHMucGwgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXByZXByb2Nl c3NlZC1pZGxzLnBsCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk3NWZiMWU1NWMzZjcyYjU2OWUxOWEwNjE4ZjQ2ZTAw MjM1ZTBmMWEKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL2dlbmVyYXRlLXByZXByb2Nlc3NlZC1pZGxzLnBsCkBAIC0wLDAgKzEsNDEgQEAKKyMhL3Vz ci9iaW4vcGVybCAtdworIworIyBDb3B5cmlnaHQgKEMpIDIwMTMgR29vZ2xlIEluYy4gIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisjCisjIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3Ug Y2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyMgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBv ZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKKyMgTGljZW5zZSBhcyBwdWJsaXNoZWQg YnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisjIHZlcnNpb24gMiBvZiB0 aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyMKKyMg VGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1 c2VmdWwsCisjIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBs aWVkIHdhcnJhbnR5IG9mCisjIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJ Q1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisjIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGlj ZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorIworIyBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBj b3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisjIGFsb25nIHdp dGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdyaXRl IHRvCisjIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0 cmVldCwgRmlmdGggRmxvb3IsCisjIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgorIworCit1 c2Ugc3RyaWN0OworCit1c2UgcHJlcHJvY2Vzc29yOwordXNlIEdldG9wdDo6TG9uZzsKK3VzZSBD d2Q7CisKK215ICRkZWZpbmVzOworbXkgJHByZXByb2Nlc3NvcjsKK215ICRvdXRwdXQ7CisKK0dl dE9wdGlvbnMoJ2RlZmluZXM9cycgPT4gXCRkZWZpbmVzLAorICAgICAgICAgICAncHJlcHJvY2Vz c29yPXMnID0+IFwkcHJlcHJvY2Vzc29yLAorICAgICAgICAgICAnb3V0cHV0PXMnID0+IFwkb3V0 cHV0KTsKKworZGllKCdNdXN0IHNwZWNpZnkgI2RlZmluZSBtYWNyb3MgdXNpbmcgLS1kZWZpbmVz LicpIHVubGVzcyBkZWZpbmVkKCRkZWZpbmVzKTsKK2RpZSgnTXVzdCBzcGVjaWZ5IHRoZSBvdXRw dXQgdXNpbmcgLS1vdXRwdXQuJykgdW5sZXNzIGRlZmluZWQoJG91dHB1dCk7CisKK215IEBjb250 ZW50cyA9IGFwcGx5UHJlcHJvY2Vzc29yKCRBUkdWWzBdLCAkZGVmaW5lcywgJHByZXByb2Nlc3Nv ciwgdW5kZWYpOworb3BlbiAoRklMRSwgIj4kb3V0cHV0IikgfHwgZGllICJDb3VsZG4ndCBvcGVu ICRvdXRwdXRcbiI7CitwcmludCBGSUxFIEBjb250ZW50czsKK2Nsb3NlIEZJTEU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbSBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCmluZGV4IDU5NjVi MTAyNTY2OWQzMzIwOTI4MzJiOGFkYjk0ZTRkNmExZmEwZjQuLjEwZDZmYWM5ZWM0NGM2YjlkZTMy NDlhZDUwOWVmMWJlYTMyZGFkMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvcHJlcHJvY2Vzc29yLnBtCkBAIC0yMiw2ICsyMiw3IEBAIHVzZSBzdHJpY3Q7CiB1c2Ug d2FybmluZ3M7CiAKIHVzZSBDb25maWc7Cit1c2UgRmlsZTo6QmFzZW5hbWU7CiB1c2UgSVBDOjpP cGVuMjsKIHVzZSBJUEM6Ok9wZW4zOwogCkBAIC00MSw2ICs0MiwxOSBAQCBzdWIgYXBwbHlQcmVw cm9jZXNzb3IKICAgICBteSAkZmlsZU5hbWUgPSBzaGlmdDsKICAgICBteSAkZGVmaW5lcyA9IHNo aWZ0OwogICAgIG15ICRwcmVwcm9jZXNzb3IgPSBzaGlmdDsKKyAgICBteSAkb3V0cHV0RGlyZWN0 b3J5ID0gc2hpZnQ7CisKKyAgICBpZiAoJG91dHB1dERpcmVjdG9yeSkgeworICAgICAgICAjIElm IHRoZSBwcmVwcm9jZXNzZWQgYnVpbGQgZmlsZSB3YXMgZ2VuZXJhdGVkIGFscmVhZHkgYnkgdGhl IGJ1aWxkCisgICAgICAgICMgc3lzdGVtLCB0aGVuIHJldHVybiB0aGF0IG9uZS4gVGhpcyBhdm9p ZHMgTl4yIGJlaGF2aW9yIGluIHJlYXBwbHlpbmcKKyAgICAgICAgIyB0aGUgcHJlcHJvY2Vzc29y IHRoZSBpZGwgZmlsZXMgcmVmZXJlbmNlZCBieSBvdGhlciBpZGwgZmlsZXMuCisgICAgICAgIG15 ICRiYXNlTmFtZSA9IGJhc2VuYW1lKCRmaWxlTmFtZSk7CisgICAgICAgIG15ICRwcmVwcm9jZXNz ZWRGaWxlID0gIiRvdXRwdXREaXJlY3RvcnkvJGJhc2VOYW1lLnBwIjsKKyAgICAgICAgaWYgKC1l ICRwcmVwcm9jZXNzZWRGaWxlKSB7CisgICAgICAgICAgICBteSBAbGluZXMgPSBkbyB7IGxvY2Fs IEBBUkdWID0gJHByZXByb2Nlc3NlZEZpbGU7IDw+IH07CisgICAgICAgICAgICByZXR1cm4gQGxp bmVzOworICAgICAgICB9CisgICAgfQogCiAgICAgbXkgQGFyZ3MgPSAoKTsKICAgICBpZiAoISRw cmVwcm9jZXNzb3IpIHsK 195437 2013-03-27 16:56:34 -0700 2013-03-28 08:54:57 -0700 fix SVGURIReference.idl bug-113448-20130327165633.patch text/plain 9654 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQyOTRlNWE2Nzc1OWRj MDg5N2Q0M2Y1YTk3MTllZjM3MmEyOTNkOS4uMjQ5ZjdkNGUzYmFiNzRiYjMxNzhiZDNjMGJjYTFl NzM1OWY3ODE3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAzLTI3ICBTY290 dCBHcmFoYW0gIDxzY290dG1nQGNocm9taXVtLm9yZz4KKworICAgICAgICBNb3ZlIHByZXByb2Nl c3Npbmcgb2YgaWRsIHRvIHByZS1wYXNzIGZvciBneXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzQ0OAorCisgICAgICAgIFJldmlld2VkIGJ5IFRv bnkgQ2hhbmcuCisKKyAgICAgICAgTW92ZXMgdGhlIHByZXByb2Nlc3NvciBpbnZvY2F0aW9ucyB3 aGVuIHBhcnNpbmcgSURMIGZpbGVzIHRvIGEKKyAgICAgICAgcHJlLXBhc3MgdG8gYXZvaWQgcmVp bnZvY2F0aW9ucyB3aGVuIElETHMgYXJlIHJlZmVyZW5jZWQgZnJvbSBvdGhlcnMuCisgICAgICAg IFRoaXMgcmVkdWNlcyB0aGUgbnVtYmVyIG9mIGludm9jYXRpb25zIG9mIHRoZSBwcmVwcm9jZXNz b3IgZnJvbSAyMDA3MQorICAgICAgICB0byA2MzMsIHdoaWNoIHJlZHVjZXMgdGhlIHJ1bnRpbWUg ZnJvbSAxMm0zMCB0byAxbSAob24gYSBXaW5kb3dzIGJveCkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLCB0aGlzIGlzIGEgYnVpbGQgdGltZSBpbXByb3ZlbWVudCwgYW5kIHNob3VsZG4ndCBoYXZl IGFueQorICAgICAgICB2aXNpYmxlIGVmZmVjdC4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwL1dl YkNvcmUuZ3lwOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbToK KyAgICAgICAgKFBhcnNlSW50ZXJmYWNlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0lE TFBhcnNlci5wbToKKyAgICAgICAgKFBhcnNlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRz L2dlbmVyYXRlLWJpbmRpbmdzLnBsOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvZ2VuZXJh dGUtcHJlcHJvY2Vzc2VkLWlkbHMucGw6IEFkZGVkLgorICAgICAgICAqIGJpbmRpbmdzL3Njcmlw dHMvcHJlcHJvY2Vzc29yLnBtOgorICAgICAgICAoYXBwbHlQcmVwcm9jZXNzb3IpOgorCiAyMDEz LTAzLTI1ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogW1RpbWVsaW5lXSBzZXQgZ2x1ZSByZWNvcmRzIG1vZGUgb2ZmIGJ5IGRl ZmF1bHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lw IGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKaW5kZXggZTYyZTYzM2Zi YjU3ZmZkYTNiMzM5YjUzYTBjMTMzYWMwOTNhOTUwNS4uYWVlMTQxMWE5YTc0YjEwMmQwMDhhOWNm OThiMDFkYWU4ZjUyOWMwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAv V2ViQ29yZS5neXAKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAK QEAgLTU5NSwxMiArNTk1LDYwIEBACiAgICAgICBdCiAgICAgfSwKICAgICB7CisgICAgICAndGFy Z2V0X25hbWUnOiAnZ2VuZXJhdGVfcHJlcHJvY2Vzc2VkX2lkbHMnLAorICAgICAgJ3R5cGUnOiAn bm9uZScsCisgICAgICAnc291cmNlcyc6IFsKKyAgICAgICAgJzxAKGJpbmRpbmdzX2lkbF9maWxl cyknLAorICAgICAgICAnPEAod2ViY29yZV90ZXN0X3N1cHBvcnRfaWRsX2ZpbGVzKScsCisgICAg ICBdLAorICAgICAgJ3J1bGVzJzogWworICAgICAgICAjIFJ1bGVzIHRvIGJ1aWxkIGRlcml2ZWQg c291cmNlcy4KKyAgICAgICAgeworICAgICAgICAgICdydWxlX25hbWUnOiAnYmluZGluZycsCisg ICAgICAgICAgJ2V4dGVuc2lvbic6ICdpZGwnLAorICAgICAgICAgICdtc3ZzX2V4dGVybmFsX3J1 bGUnOiAxLAorICAgICAgICAgICd2YXJpYWJsZXMnOiB7CisgICAgICAgICAgICAjIFNWR1VSSVJl ZmVyZW5jZS5pZGwgaXMgbWFudWFsbHkgYWRkZWQgYmVjYXVzZSB0aGUgZ2VuZXJhdGVkCisgICAg ICAgICAgICAjIGJpbmRpbmdzIGNvZGUgY2F1c2VzIGNvbXBpbGUgZXJyb3JzIHdoZW4gaXQncyBj b21waWxlZCBhdCB0aGUKKyAgICAgICAgICAgICMgdG9wIGxldmVsLCBidXQgd2Ugd2FudCB0byBh dm9pZCByZWR1bmRhbnQgcHJlcHJvY2Vzc2luZyBvZiBpdCBpbgorICAgICAgICAgICAgIyB0aGUg YmluZGluZ3MgZ2VuZXJhdGlvbiBzdGFnZSB3aGVuIGl0J3MgcmVmZXJlbmNlZCBieSBvdGhlcgor ICAgICAgICAgICAgIyBmaWxlcy4KKyAgICAgICAgICAgICdhbGxfaWRsX2ZpbGVzX2xpc3QnOiAn PHwoYWxsX2lkbF9maWxlc19saXN0LnRtcCA8QChiaW5kaW5nc19pZGxfZmlsZXMpIDxAKHdlYmNv cmVfdGVzdF9zdXBwb3J0X2lkbF9maWxlcykgLi4vc3ZnL1NWR1VSSVJlZmVyZW5jZS5pZGwpJywK KyAgICAgICAgICB9LAorICAgICAgICAgICdpbnB1dHMnOiBbCisgICAgICAgICAgICAnLi4vYmlu ZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1wcmVwcm9jZXNzZWQtaWRscy5wbCcsCisgICAgICAgICAg ICAnLi4vYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNzb3IucG0nLAorICAgICAgICAgICAgJzwo YWxsX2lkbF9maWxlc19saXN0KScsCisgICAgICAgICAgICAnPCFAKGNhdCA8KGFsbF9pZGxfZmls ZXNfbGlzdCkpJywKKyAgICAgICAgICBdLAorICAgICAgICAgICdvdXRwdXRzJzogWworICAgICAg ICAgICAgJzwoU0hBUkVEX0lOVEVSTUVESUFURV9ESVIpL3dlYmNvcmUvYmluZGluZ3MvPChSVUxF X0lOUFVUX1JPT1QpLmlkbC5wcCcsCisgICAgICAgICAgXSwKKyAgICAgICAgICAnbXN2c19jeWd3 aW5fc2hlbGwnOiAwLAorICAgICAgICAgICdhY3Rpb24nOiBbCisgICAgICAgICAgICAnPChwZXJs X2V4ZSknLAorICAgICAgICAgICAgJy13JywKKyAgICAgICAgICAgICctSS4uL2JpbmRpbmdzL3Nj cmlwdHMnLAorICAgICAgICAgICAgJy4uL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtcHJlcHJv Y2Vzc2VkLWlkbHMucGwnLAorICAgICAgICAgICAgJy0tb3V0cHV0JywKKyAgICAgICAgICAgICc8 QChfb3V0cHV0cyknLAorICAgICAgICAgICAgJy0tZGVmaW5lcycsCisgICAgICAgICAgICAnPChm ZWF0dXJlX2RlZmluZXMpIExBTkdVQUdFX0pBVkFTQ1JJUFQgVjhfQklORElORycsCisgICAgICAg ICAgICAnPChSVUxFX0lOUFVUX1BBVEgpJywKKyAgICAgICAgICAgICc8QChwcmVwcm9jZXNzb3Ip JywKKyAgICAgICAgICBdLAorICAgICAgICAgICdtZXNzYWdlJzogJ1ByZXByb2Nlc3NpbmcgPChS VUxFX0lOUFVUX1BBVEgpJywKKyAgICAgICAgfSwKKyAgICAgIF0sCisgICAgfSwKKyAgICB7CiAg ICAgICAndGFyZ2V0X25hbWUnOiAnd2ViY29yZV9iaW5kaW5nc19zb3VyY2VzJywKICAgICAgICd0 eXBlJzogJ25vbmUnLAogICAgICAgJ2hhcmRfZGVwZW5kZW5jeSc6IDEsCiAgICAgICAnZGVwZW5k ZW5jaWVzJzogWwogICAgICAgICAnZ2VuZXJhdGVfc3VwcGxlbWVudGFsX2RlcGVuZGVuY3knLAog ICAgICAgICAnZ2VuZXJhdGVfc2V0dGluZ3MnLAorICAgICAgICAnZ2VuZXJhdGVfcHJlcHJvY2Vz c2VkX2lkbHMnLAogICAgICAgXSwKICAgICAgICdzb3VyY2VzJzogWwogICAgICAgICAjIGJpc29u IHJ1bGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdl bmVyYXRvci5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv ci5wbQppbmRleCBkNDc0M2E2MWViYzAxMGE2ZjVmZWEyZGI1MDk1NzgwZDJhYTQ0Mjk2Li4wYjM0 MWQzNmVmZTljOWQ0MGQ3YzRjZWM4NGE0NzdmMjJiOTIxMjE2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0KKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yLnBtCkBAIC0yODksNyArMjg5LDYg QEAgc3ViIFBhcnNlSW50ZXJmYWNlCiB7CiAgICAgbXkgJG9iamVjdCA9IHNoaWZ0OwogICAgIG15 ICRpbnRlcmZhY2VOYW1lID0gc2hpZnQ7Ci0gICAgbXkgJHBhcmVudHNPbmx5ID0gc2hpZnQ7CiAK ICAgICByZXR1cm4gdW5kZWYgaWYgJGludGVyZmFjZU5hbWUgZXEgJ09iamVjdCc7CiAKQEAgLTMw MSw3ICszMDAsNyBAQCBzdWIgUGFyc2VJbnRlcmZhY2UKIAogICAgICMgU3RlcCAjMjogUGFyc2Ug dGhlIGZvdW5kIElETCBmaWxlIChpbiBxdWlldCBtb2RlKS4KICAgICBteSAkcGFyc2VyID0gSURM UGFyc2VyLT5uZXcoMSk7Ci0gICAgbXkgJGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGZpbGVu YW1lLCAkZGVmaW5lcywgJHByZXByb2Nlc3NvciwgJHBhcmVudHNPbmx5KTsKKyAgICBteSAkZG9j dW1lbnQgPSAkcGFyc2VyLT5QYXJzZSgkZmlsZW5hbWUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29y LCAkdXNlT3V0cHV0RGlyKTsKIAogICAgIGZvcmVhY2ggbXkgJGludGVyZmFjZSAoQHskZG9jdW1l bnQtPmludGVyZmFjZXN9KSB7CiAgICAgICAgIHJldHVybiAkaW50ZXJmYWNlIGlmICRpbnRlcmZh Y2UtPm5hbWUgZXEgJGludGVyZmFjZU5hbWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvSURMUGFyc2VyLnBtCmluZGV4IGYwMDAzNTU1ZTA1OGM1MjNiOGFiMzhjOTBmYmYzM2Jm Nzk0MjU5YWIuLjU1OTJhZDliZjIyZDg1NGZhZTNmNmM5OGE4NzQxNzJhNTI3Mzk4NzQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtCisrKyBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtCkBAIC0xNzYsMTAg KzE3NiwxMSBAQCBzdWIgUGFyc2UKICAgICBteSAkZmlsZU5hbWUgPSBzaGlmdDsKICAgICBteSAk ZGVmaW5lcyA9IHNoaWZ0OwogICAgIG15ICRwcmVwcm9jZXNzb3IgPSBzaGlmdDsKKyAgICBteSAk b3V0cHV0RGlyZWN0b3J5ID0gc2hpZnQ7CiAKICAgICBteSBAZGVmaW5pdGlvbnMgPSAoKTsKIAot ICAgIG15IEBsaW5lcyA9IGFwcGx5UHJlcHJvY2Vzc29yKCRmaWxlTmFtZSwgJGRlZmluZXMsICRw cmVwcm9jZXNzb3IpOworICAgIG15IEBsaW5lcyA9IGFwcGx5UHJlcHJvY2Vzc29yKCRmaWxlTmFt ZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IsICRvdXRwdXREaXJlY3RvcnkpOwogICAgICRzZWxm LT57TGluZX0gPSAkbGluZXNbMF07CiAgICAgJHNlbGYtPntEb2N1bWVudENvbnRlbnR9ID0gam9p bignICcsIEBsaW5lcyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvZ2VuZXJhdGUtYmluZGluZ3MucGwgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsCmluZGV4IDc0MzNlN2JiMmZhMmQ4MWEwNWQ0NWIwODgx Yjg0MTA4NDJiMDAxYzEuLjY1OWMyZmQ1OWZmZTI0YTZjNjEyMjI1NTFjMjAwZGNjOGFkNWY3NGQg MTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtYmlu ZGluZ3MucGwKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1i aW5kaW5ncy5wbApAQCAtMTI0LDcgKzEyNCw3IEBAIGlmICgkc3VwcGxlbWVudGFsRGVwZW5kZW5j eUZpbGUpIHsKIAogIyBQYXJzZSB0aGUgdGFyZ2V0IElETCBmaWxlLgogbXkgJHRhcmdldFBhcnNl ciA9IElETFBhcnNlci0+bmV3KCEkdmVyYm9zZSk7Ci1teSAkdGFyZ2V0RG9jdW1lbnQgPSAkdGFy Z2V0UGFyc2VyLT5QYXJzZSgkdGFyZ2V0SWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3Ip OworbXkgJHRhcmdldERvY3VtZW50ID0gJHRhcmdldFBhcnNlci0+UGFyc2UoJHRhcmdldElkbEZp bGUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yLCAkb3V0cHV0RGlyZWN0b3J5KTsKIAogaWYgKCRp ZGxBdHRyaWJ1dGVzRmlsZSkgewogICAgIG15ICRpZGxBdHRyaWJ1dGVzID0gbG9hZElETEF0dHJp YnV0ZXMoJGlkbEF0dHJpYnV0ZXNGaWxlKTsKQEAgLTEzNiw3ICsxMzYsNyBAQCBmb3JlYWNoIG15 ICRpZGxGaWxlIChAc3VwcGxlbWVudGVkSWRsRmlsZXMpIHsKIAogICAgIG15ICRpbnRlcmZhY2VO YW1lID0gZmlsZXBhcnNlKGJhc2VuYW1lKCRpZGxGaWxlKSwgIi5pZGwiKTsKICAgICBteSAkcGFy c2VyID0gSURMUGFyc2VyLT5uZXcoISR2ZXJib3NlKTsKLSAgICBteSAkZG9jdW1lbnQgPSAkcGFy c2VyLT5QYXJzZSgkaWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IpOworICAgIG15ICRk b2N1bWVudCA9ICRwYXJzZXItPlBhcnNlKCRpZGxGaWxlLCAkZGVmaW5lcywgJHByZXByb2Nlc3Nv ciwgJG91dHB1dERpcmVjdG9yeSk7CiAKICAgICBmb3JlYWNoIG15ICRpbnRlcmZhY2UgKEB7JGRv Y3VtZW50LT5pbnRlcmZhY2VzfSkgewogICAgICAgICBpZiAoJGludGVyZmFjZS0+ZXh0ZW5kZWRB dHRyaWJ1dGVzLT57IlN1cHBsZW1lbnRhbCJ9IGFuZCAkaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJp YnV0ZXMtPnsiU3VwcGxlbWVudGFsIn0gZXEgJHRhcmdldEludGVyZmFjZU5hbWUpIHsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtcHJlcHJvY2Vz c2VkLWlkbHMucGwgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXBy ZXByb2Nlc3NlZC1pZGxzLnBsCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk3NWZiMWU1NWMzZjcyYjU2OWUxOWEwNjE4 ZjQ2ZTAwMjM1ZTBmMWEKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL2dlbmVyYXRlLXByZXByb2Nlc3NlZC1pZGxzLnBsCkBAIC0wLDAgKzEsNDEgQEAK KyMhL3Vzci9iaW4vcGVybCAtdworIworIyBDb3B5cmlnaHQgKEMpIDIwMTMgR29vZ2xlIEluYy4g IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJl OyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyMgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0 ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKKyMgTGljZW5zZSBhcyBwdWJs aXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisjIHZlcnNpb24g MiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4K KyMKKyMgVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2ls bCBiZSB1c2VmdWwsCisjIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRo ZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisjIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBB IFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisjIExpYnJhcnkgR2VuZXJhbCBQdWJs aWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorIworIyBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2 ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisjIGFs b25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3Qs IHdyaXRlIHRvCisjIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5r bGluIFN0cmVldCwgRmlmdGggRmxvb3IsCisjIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgor IworCit1c2Ugc3RyaWN0OworCit1c2UgcHJlcHJvY2Vzc29yOwordXNlIEdldG9wdDo6TG9uZzsK K3VzZSBDd2Q7CisKK215ICRkZWZpbmVzOworbXkgJHByZXByb2Nlc3NvcjsKK215ICRvdXRwdXQ7 CisKK0dldE9wdGlvbnMoJ2RlZmluZXM9cycgPT4gXCRkZWZpbmVzLAorICAgICAgICAgICAncHJl cHJvY2Vzc29yPXMnID0+IFwkcHJlcHJvY2Vzc29yLAorICAgICAgICAgICAnb3V0cHV0PXMnID0+ IFwkb3V0cHV0KTsKKworZGllKCdNdXN0IHNwZWNpZnkgI2RlZmluZSBtYWNyb3MgdXNpbmcgLS1k ZWZpbmVzLicpIHVubGVzcyBkZWZpbmVkKCRkZWZpbmVzKTsKK2RpZSgnTXVzdCBzcGVjaWZ5IHRo ZSBvdXRwdXQgdXNpbmcgLS1vdXRwdXQuJykgdW5sZXNzIGRlZmluZWQoJG91dHB1dCk7CisKK215 IEBjb250ZW50cyA9IGFwcGx5UHJlcHJvY2Vzc29yKCRBUkdWWzBdLCAkZGVmaW5lcywgJHByZXBy b2Nlc3NvciwgdW5kZWYpOworb3BlbiAoRklMRSwgIj4kb3V0cHV0IikgfHwgZGllICJDb3VsZG4n dCBvcGVuICRvdXRwdXRcbiI7CitwcmludCBGSUxFIEBjb250ZW50czsKK2Nsb3NlIEZJTEU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5w bSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCmluZGV4 IDU5NjViMTAyNTY2OWQzMzIwOTI4MzJiOGFkYjk0ZTRkNmExZmEwZjQuLjEwZDZmYWM5ZWM0NGM2 YjlkZTMyNDlhZDUwOWVmMWJlYTMyZGFkMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtCkBAIC0yMiw2ICsyMiw3IEBAIHVzZSBzdHJpY3Q7 CiB1c2Ugd2FybmluZ3M7CiAKIHVzZSBDb25maWc7Cit1c2UgRmlsZTo6QmFzZW5hbWU7CiB1c2Ug SVBDOjpPcGVuMjsKIHVzZSBJUEM6Ok9wZW4zOwogCkBAIC00MSw2ICs0MiwxOSBAQCBzdWIgYXBw bHlQcmVwcm9jZXNzb3IKICAgICBteSAkZmlsZU5hbWUgPSBzaGlmdDsKICAgICBteSAkZGVmaW5l cyA9IHNoaWZ0OwogICAgIG15ICRwcmVwcm9jZXNzb3IgPSBzaGlmdDsKKyAgICBteSAkb3V0cHV0 RGlyZWN0b3J5ID0gc2hpZnQ7CisKKyAgICBpZiAoJG91dHB1dERpcmVjdG9yeSkgeworICAgICAg ICAjIElmIHRoZSBwcmVwcm9jZXNzZWQgYnVpbGQgZmlsZSB3YXMgZ2VuZXJhdGVkIGFscmVhZHkg YnkgdGhlIGJ1aWxkCisgICAgICAgICMgc3lzdGVtLCB0aGVuIHJldHVybiB0aGF0IG9uZS4gVGhp cyBhdm9pZHMgTl4yIGJlaGF2aW9yIGluIHJlYXBwbHlpbmcKKyAgICAgICAgIyB0aGUgcHJlcHJv Y2Vzc29yIHRoZSBpZGwgZmlsZXMgcmVmZXJlbmNlZCBieSBvdGhlciBpZGwgZmlsZXMuCisgICAg ICAgIG15ICRiYXNlTmFtZSA9IGJhc2VuYW1lKCRmaWxlTmFtZSk7CisgICAgICAgIG15ICRwcmVw cm9jZXNzZWRGaWxlID0gIiRvdXRwdXREaXJlY3RvcnkvJGJhc2VOYW1lLnBwIjsKKyAgICAgICAg aWYgKC1lICRwcmVwcm9jZXNzZWRGaWxlKSB7CisgICAgICAgICAgICBteSBAbGluZXMgPSBkbyB7 IGxvY2FsIEBBUkdWID0gJHByZXByb2Nlc3NlZEZpbGU7IDw+IH07CisgICAgICAgICAgICByZXR1 cm4gQGxpbmVzOworICAgICAgICB9CisgICAgfQogCiAgICAgbXkgQGFyZ3MgPSAoKTsKICAgICBp ZiAoISRwcmVwcm9jZXNzb3IpIHsK 195579 2013-03-28 08:55:01 -0700 2013-03-28 09:58:50 -0700 rebase bug-113448-20130328085459.patch text/plain 9658 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MDEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmI4NmExNjJmNzYzMTQ0 MWM4ZTE1YzQ2NDc1ZmU0NGQ1ZTM1Y2FlOS4uMDRlY2ExY2I0MTA1YzFmZGM3NDZjNmZiY2Q5YjM0 YWE3ODM4NTNiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAzLTI4ICBTY290 dCBHcmFoYW0gIDxzY290dG1nQGNocm9taXVtLm9yZz4KKworICAgICAgICBNb3ZlIHByZXByb2Nl c3Npbmcgb2YgaWRsIHRvIHByZS1wYXNzIGZvciBneXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzQ0OAorCisgICAgICAgIFJldmlld2VkIGJ5IFRv bnkgQ2hhbmcuCisKKyAgICAgICAgTW92ZXMgdGhlIHByZXByb2Nlc3NvciBpbnZvY2F0aW9ucyB3 aGVuIHBhcnNpbmcgSURMIGZpbGVzIHRvIGEKKyAgICAgICAgcHJlLXBhc3MgdG8gYXZvaWQgcmVp bnZvY2F0aW9ucyB3aGVuIElETHMgYXJlIHJlZmVyZW5jZWQgZnJvbSBvdGhlcnMuCisgICAgICAg IFRoaXMgcmVkdWNlcyB0aGUgbnVtYmVyIG9mIGludm9jYXRpb25zIG9mIHRoZSBwcmVwcm9jZXNz b3IgZnJvbSAyMDA3MQorICAgICAgICB0byA2MzMsIHdoaWNoIHJlZHVjZXMgdGhlIHJ1bnRpbWUg ZnJvbSAxMm0zMCB0byAxbSAob24gYSBXaW5kb3dzIGJveCkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLCB0aGlzIGlzIGEgYnVpbGQgdGltZSBpbXByb3ZlbWVudCwgYW5kIHNob3VsZG4ndCBoYXZl IGFueQorICAgICAgICB2aXNpYmxlIGVmZmVjdC4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwL1dl YkNvcmUuZ3lwOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbToK KyAgICAgICAgKFBhcnNlSW50ZXJmYWNlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0lE TFBhcnNlci5wbToKKyAgICAgICAgKFBhcnNlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRz L2dlbmVyYXRlLWJpbmRpbmdzLnBsOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvZ2VuZXJh dGUtcHJlcHJvY2Vzc2VkLWlkbHMucGw6IEFkZGVkLgorICAgICAgICAqIGJpbmRpbmdzL3Njcmlw dHMvcHJlcHJvY2Vzc29yLnBtOgorICAgICAgICAoYXBwbHlQcmVwcm9jZXNzb3IpOgorCiAyMDEz LTAzLTI3ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBDaHJvbWl1 bSBNYWMgZmFpbHMgdG8gYnVpbGQgYWZ0ZXIgcjE0Njk5NSBiZWNhdXNlIHRoZSBuZXcgTlNGb250 IGNhdGVnb3J5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3Jl Lmd5cCBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwCmluZGV4IDI1YWJm ODU1NjFhMWU1NDljN2IwM2E1MjE1ZmU0OWI1NjBiOTc4YTEuLjUxMzU0OThjNzBjMzA2ZGEyNzI4 NmE3NTI0MjdhMjdmNmU4M2E1MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu Z3lwL1dlYkNvcmUuZ3lwCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUu Z3lwCkBAIC01OTUsMTIgKzU5NSw2MCBAQAogICAgICAgXQogICAgIH0sCiAgICAgeworICAgICAg J3RhcmdldF9uYW1lJzogJ2dlbmVyYXRlX3ByZXByb2Nlc3NlZF9pZGxzJywKKyAgICAgICd0eXBl JzogJ25vbmUnLAorICAgICAgJ3NvdXJjZXMnOiBbCisgICAgICAgICc8QChiaW5kaW5nc19pZGxf ZmlsZXMpJywKKyAgICAgICAgJzxAKHdlYmNvcmVfdGVzdF9zdXBwb3J0X2lkbF9maWxlcyknLAor ICAgICAgXSwKKyAgICAgICdydWxlcyc6IFsKKyAgICAgICAgIyBSdWxlcyB0byBidWlsZCBkZXJp dmVkIHNvdXJjZXMuCisgICAgICAgIHsKKyAgICAgICAgICAncnVsZV9uYW1lJzogJ2JpbmRpbmcn LAorICAgICAgICAgICdleHRlbnNpb24nOiAnaWRsJywKKyAgICAgICAgICAnbXN2c19leHRlcm5h bF9ydWxlJzogMSwKKyAgICAgICAgICAndmFyaWFibGVzJzogeworICAgICAgICAgICAgIyBTVkdV UklSZWZlcmVuY2UuaWRsIGlzIG1hbnVhbGx5IGFkZGVkIGJlY2F1c2UgdGhlIGdlbmVyYXRlZAor ICAgICAgICAgICAgIyBiaW5kaW5ncyBjb2RlIGNhdXNlcyBjb21waWxlIGVycm9ycyB3aGVuIGl0 J3MgY29tcGlsZWQgYXQgdGhlCisgICAgICAgICAgICAjIHRvcCBsZXZlbCwgYnV0IHdlIHdhbnQg dG8gYXZvaWQgcmVkdW5kYW50IHByZXByb2Nlc3Npbmcgb2YgaXQgaW4KKyAgICAgICAgICAgICMg dGhlIGJpbmRpbmdzIGdlbmVyYXRpb24gc3RhZ2Ugd2hlbiBpdCdzIHJlZmVyZW5jZWQgYnkgb3Ro ZXIKKyAgICAgICAgICAgICMgZmlsZXMuCisgICAgICAgICAgICAnYWxsX2lkbF9maWxlc19saXN0 JzogJzx8KGFsbF9pZGxfZmlsZXNfbGlzdC50bXAgPEAoYmluZGluZ3NfaWRsX2ZpbGVzKSA8QCh3 ZWJjb3JlX3Rlc3Rfc3VwcG9ydF9pZGxfZmlsZXMpIC4uL3N2Zy9TVkdVUklSZWZlcmVuY2UuaWRs KScsCisgICAgICAgICAgfSwKKyAgICAgICAgICAnaW5wdXRzJzogWworICAgICAgICAgICAgJy4u L2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtcHJlcHJvY2Vzc2VkLWlkbHMucGwnLAorICAgICAg ICAgICAgJy4uL2JpbmRpbmdzL3NjcmlwdHMvcHJlcHJvY2Vzc29yLnBtJywKKyAgICAgICAgICAg ICc8KGFsbF9pZGxfZmlsZXNfbGlzdCknLAorICAgICAgICAgICAgJzwhQChjYXQgPChhbGxfaWRs X2ZpbGVzX2xpc3QpKScsCisgICAgICAgICAgXSwKKyAgICAgICAgICAnb3V0cHV0cyc6IFsKKyAg ICAgICAgICAgICc8KFNIQVJFRF9JTlRFUk1FRElBVEVfRElSKS93ZWJjb3JlL2JpbmRpbmdzLzwo UlVMRV9JTlBVVF9ST09UKS5pZGwucHAnLAorICAgICAgICAgIF0sCisgICAgICAgICAgJ21zdnNf Y3lnd2luX3NoZWxsJzogMCwKKyAgICAgICAgICAnYWN0aW9uJzogWworICAgICAgICAgICAgJzwo cGVybF9leGUpJywKKyAgICAgICAgICAgICctdycsCisgICAgICAgICAgICAnLUkuLi9iaW5kaW5n cy9zY3JpcHRzJywKKyAgICAgICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXBy ZXByb2Nlc3NlZC1pZGxzLnBsJywKKyAgICAgICAgICAgICctLW91dHB1dCcsCisgICAgICAgICAg ICAnPEAoX291dHB1dHMpJywKKyAgICAgICAgICAgICctLWRlZmluZXMnLAorICAgICAgICAgICAg JzwoZmVhdHVyZV9kZWZpbmVzKSBMQU5HVUFHRV9KQVZBU0NSSVBUIFY4X0JJTkRJTkcnLAorICAg ICAgICAgICAgJzwoUlVMRV9JTlBVVF9QQVRIKScsCisgICAgICAgICAgICAnPEAocHJlcHJvY2Vz c29yKScsCisgICAgICAgICAgXSwKKyAgICAgICAgICAnbWVzc2FnZSc6ICdQcmVwcm9jZXNzaW5n IDwoUlVMRV9JTlBVVF9QQVRIKScsCisgICAgICAgIH0sCisgICAgICBdLAorICAgIH0sCisgICAg ewogICAgICAgJ3RhcmdldF9uYW1lJzogJ3dlYmNvcmVfYmluZGluZ3Nfc291cmNlcycsCiAgICAg ICAndHlwZSc6ICdub25lJywKICAgICAgICdoYXJkX2RlcGVuZGVuY3knOiAxLAogICAgICAgJ2Rl cGVuZGVuY2llcyc6IFsKICAgICAgICAgJ2dlbmVyYXRlX3N1cHBsZW1lbnRhbF9kZXBlbmRlbmN5 JywKICAgICAgICAgJ2dlbmVyYXRlX3NldHRpbmdzJywKKyAgICAgICAgJ2dlbmVyYXRlX3ByZXBy b2Nlc3NlZF9pZGxzJywKICAgICAgIF0sCiAgICAgICAnc291cmNlcyc6IFsKICAgICAgICAgIyBi aXNvbiBydWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0Nv ZGVHZW5lcmF0b3IucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5l cmF0b3IucG0KaW5kZXggZDQ3NDNhNjFlYmMwMTBhNmY1ZmVhMmRiNTA5NTc4MGQyYWE0NDI5Ni4u MGIzNDFkMzZlZmU5YzlkNDBkN2M0Y2VjODRhNDc3ZjIyYjkyMTIxNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yLnBtCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbQpAQCAtMjg5LDcgKzI4 OSw2IEBAIHN1YiBQYXJzZUludGVyZmFjZQogewogICAgIG15ICRvYmplY3QgPSBzaGlmdDsKICAg ICBteSAkaW50ZXJmYWNlTmFtZSA9IHNoaWZ0OwotICAgIG15ICRwYXJlbnRzT25seSA9IHNoaWZ0 OwogCiAgICAgcmV0dXJuIHVuZGVmIGlmICRpbnRlcmZhY2VOYW1lIGVxICdPYmplY3QnOwogCkBA IC0zMDEsNyArMzAwLDcgQEAgc3ViIFBhcnNlSW50ZXJmYWNlCiAKICAgICAjIFN0ZXAgIzI6IFBh cnNlIHRoZSBmb3VuZCBJREwgZmlsZSAoaW4gcXVpZXQgbW9kZSkuCiAgICAgbXkgJHBhcnNlciA9 IElETFBhcnNlci0+bmV3KDEpOwotICAgIG15ICRkb2N1bWVudCA9ICRwYXJzZXItPlBhcnNlKCRm aWxlbmFtZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IsICRwYXJlbnRzT25seSk7CisgICAgbXkg JGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGZpbGVuYW1lLCAkZGVmaW5lcywgJHByZXByb2Nl c3NvciwgJHVzZU91dHB1dERpcik7CiAKICAgICBmb3JlYWNoIG15ICRpbnRlcmZhY2UgKEB7JGRv Y3VtZW50LT5pbnRlcmZhY2VzfSkgewogICAgICAgICByZXR1cm4gJGludGVyZmFjZSBpZiAkaW50 ZXJmYWNlLT5uYW1lIGVxICRpbnRlcmZhY2VOYW1lOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL0lETFBhcnNlci5wbQppbmRleCBmMDAwMzU1NWUwNThjNTIzYjhhYjM4YzkwZmJm MzNiZjc5NDI1OWFiLi41NTkyYWQ5YmYyMmQ4NTRmYWUzZjZjOThhODc0MTcyYTUyNzM5ODc0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQpAQCAtMTc2 LDEwICsxNzYsMTEgQEAgc3ViIFBhcnNlCiAgICAgbXkgJGZpbGVOYW1lID0gc2hpZnQ7CiAgICAg bXkgJGRlZmluZXMgPSBzaGlmdDsKICAgICBteSAkcHJlcHJvY2Vzc29yID0gc2hpZnQ7CisgICAg bXkgJG91dHB1dERpcmVjdG9yeSA9IHNoaWZ0OwogCiAgICAgbXkgQGRlZmluaXRpb25zID0gKCk7 CiAKLSAgICBteSBAbGluZXMgPSBhcHBseVByZXByb2Nlc3NvcigkZmlsZU5hbWUsICRkZWZpbmVz LCAkcHJlcHJvY2Vzc29yKTsKKyAgICBteSBAbGluZXMgPSBhcHBseVByZXByb2Nlc3NvcigkZmls ZU5hbWUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yLCAkb3V0cHV0RGlyZWN0b3J5KTsKICAgICAk c2VsZi0+e0xpbmV9ID0gJGxpbmVzWzBdOwogICAgICRzZWxmLT57RG9jdW1lbnRDb250ZW50fSA9 IGpvaW4oJyAnLCBAbGluZXMpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5ncy5wbAppbmRleCA3NDMzZTdiYjJmYTJkODFhMDVkNDVi MDg4MWI4NDEwODQyYjAwMWMxLi42NTljMmZkNTlmZmUyNGE2YzYxMjIyNTUxYzIwMGRjYzhhZDVm NzRkIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRl LWJpbmRpbmdzLnBsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJh dGUtYmluZGluZ3MucGwKQEAgLTEyNCw3ICsxMjQsNyBAQCBpZiAoJHN1cHBsZW1lbnRhbERlcGVu ZGVuY3lGaWxlKSB7CiAKICMgUGFyc2UgdGhlIHRhcmdldCBJREwgZmlsZS4KIG15ICR0YXJnZXRQ YXJzZXIgPSBJRExQYXJzZXItPm5ldyghJHZlcmJvc2UpOwotbXkgJHRhcmdldERvY3VtZW50ID0g JHRhcmdldFBhcnNlci0+UGFyc2UoJHRhcmdldElkbEZpbGUsICRkZWZpbmVzLCAkcHJlcHJvY2Vz c29yKTsKK215ICR0YXJnZXREb2N1bWVudCA9ICR0YXJnZXRQYXJzZXItPlBhcnNlKCR0YXJnZXRJ ZGxGaWxlLCAkZGVmaW5lcywgJHByZXByb2Nlc3NvciwgJG91dHB1dERpcmVjdG9yeSk7CiAKIGlm ICgkaWRsQXR0cmlidXRlc0ZpbGUpIHsKICAgICBteSAkaWRsQXR0cmlidXRlcyA9IGxvYWRJRExB dHRyaWJ1dGVzKCRpZGxBdHRyaWJ1dGVzRmlsZSk7CkBAIC0xMzYsNyArMTM2LDcgQEAgZm9yZWFj aCBteSAkaWRsRmlsZSAoQHN1cHBsZW1lbnRlZElkbEZpbGVzKSB7CiAKICAgICBteSAkaW50ZXJm YWNlTmFtZSA9IGZpbGVwYXJzZShiYXNlbmFtZSgkaWRsRmlsZSksICIuaWRsIik7CiAgICAgbXkg JHBhcnNlciA9IElETFBhcnNlci0+bmV3KCEkdmVyYm9zZSk7Ci0gICAgbXkgJGRvY3VtZW50ID0g JHBhcnNlci0+UGFyc2UoJGlkbEZpbGUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yKTsKKyAgICBt eSAkZG9jdW1lbnQgPSAkcGFyc2VyLT5QYXJzZSgkaWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9j ZXNzb3IsICRvdXRwdXREaXJlY3RvcnkpOwogCiAgICAgZm9yZWFjaCBteSAkaW50ZXJmYWNlIChA eyRkb2N1bWVudC0+aW50ZXJmYWNlc30pIHsKICAgICAgICAgaWYgKCRpbnRlcmZhY2UtPmV4dGVu ZGVkQXR0cmlidXRlcy0+eyJTdXBwbGVtZW50YWwifSBhbmQgJGludGVyZmFjZS0+ZXh0ZW5kZWRB dHRyaWJ1dGVzLT57IlN1cHBsZW1lbnRhbCJ9IGVxICR0YXJnZXRJbnRlcmZhY2VOYW1lKSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXByZXBy b2Nlc3NlZC1pZGxzLnBsIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0 ZS1wcmVwcm9jZXNzZWQtaWRscy5wbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45NzVmYjFlNTVjM2Y3MmI1NjllMTlh MDYxOGY0NmUwMDIzNWUwZjFhCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1wcmVwcm9jZXNzZWQtaWRscy5wbApAQCAtMCwwICsxLDQx IEBACisjIS91c3IvYmluL3BlcmwgLXcKKyMKKyMgQ29weXJpZ2h0IChDKSAyMDEzIEdvb2dsZSBJ bmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0 d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisjIG1vZGlmeSBpdCB1bmRlciB0 aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCisjIExpY2Vuc2UgYXMg cHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgorIyB2ZXJz aW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNp b24uCisjCisjIFRoaXMgbGlicmFyeSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0 IHdpbGwgYmUgdXNlZnVsLAorIyBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZl biB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorIyBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBG T1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorIyBMaWJyYXJ5IEdlbmVyYWwg UHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKyMKKyMgWW91IHNob3VsZCBoYXZlIHJl Y2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQor IyBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgc2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYg bm90LCB3cml0ZSB0bworIyB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBG cmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorIyBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVT QS4KKyMKKwordXNlIHN0cmljdDsKKwordXNlIHByZXByb2Nlc3NvcjsKK3VzZSBHZXRvcHQ6Okxv bmc7Cit1c2UgQ3dkOworCitteSAkZGVmaW5lczsKK215ICRwcmVwcm9jZXNzb3I7CitteSAkb3V0 cHV0OworCitHZXRPcHRpb25zKCdkZWZpbmVzPXMnID0+IFwkZGVmaW5lcywKKyAgICAgICAgICAg J3ByZXByb2Nlc3Nvcj1zJyA9PiBcJHByZXByb2Nlc3NvciwKKyAgICAgICAgICAgJ291dHB1dD1z JyA9PiBcJG91dHB1dCk7CisKK2RpZSgnTXVzdCBzcGVjaWZ5ICNkZWZpbmUgbWFjcm9zIHVzaW5n IC0tZGVmaW5lcy4nKSB1bmxlc3MgZGVmaW5lZCgkZGVmaW5lcyk7CitkaWUoJ011c3Qgc3BlY2lm eSB0aGUgb3V0cHV0IHVzaW5nIC0tb3V0cHV0LicpIHVubGVzcyBkZWZpbmVkKCRvdXRwdXQpOwor CitteSBAY29udGVudHMgPSBhcHBseVByZXByb2Nlc3NvcigkQVJHVlswXSwgJGRlZmluZXMsICRw cmVwcm9jZXNzb3IsIHVuZGVmKTsKK29wZW4gKEZJTEUsICI+JG91dHB1dCIpIHx8IGRpZSAiQ291 bGRuJ3Qgb3BlbiAkb3V0cHV0XG4iOworcHJpbnQgRklMRSBAY29udGVudHM7CitjbG9zZSBGSUxF OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNz b3IucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbQpp bmRleCA1OTY1YjEwMjU2NjlkMzMyMDkyODMyYjhhZGI5NGU0ZDZhMWZhMGY0Li4xMGQ2ZmFjOWVj NDRjNmI5ZGUzMjQ5YWQ1MDllZjFiZWEzMmRhZDI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbQpAQCAtMjIsNiArMjIsNyBAQCB1c2Ugc3Ry aWN0OwogdXNlIHdhcm5pbmdzOwogCiB1c2UgQ29uZmlnOwordXNlIEZpbGU6OkJhc2VuYW1lOwog dXNlIElQQzo6T3BlbjI7CiB1c2UgSVBDOjpPcGVuMzsKIApAQCAtNDEsNiArNDIsMTkgQEAgc3Vi IGFwcGx5UHJlcHJvY2Vzc29yCiAgICAgbXkgJGZpbGVOYW1lID0gc2hpZnQ7CiAgICAgbXkgJGRl ZmluZXMgPSBzaGlmdDsKICAgICBteSAkcHJlcHJvY2Vzc29yID0gc2hpZnQ7CisgICAgbXkgJG91 dHB1dERpcmVjdG9yeSA9IHNoaWZ0OworCisgICAgaWYgKCRvdXRwdXREaXJlY3RvcnkpIHsKKyAg ICAgICAgIyBJZiB0aGUgcHJlcHJvY2Vzc2VkIGJ1aWxkIGZpbGUgd2FzIGdlbmVyYXRlZCBhbHJl YWR5IGJ5IHRoZSBidWlsZAorICAgICAgICAjIHN5c3RlbSwgdGhlbiByZXR1cm4gdGhhdCBvbmUu IFRoaXMgYXZvaWRzIE5eMiBiZWhhdmlvciBpbiByZWFwcGx5aW5nCisgICAgICAgICMgdGhlIHBy ZXByb2Nlc3NvciB0aGUgaWRsIGZpbGVzIHJlZmVyZW5jZWQgYnkgb3RoZXIgaWRsIGZpbGVzLgor ICAgICAgICBteSAkYmFzZU5hbWUgPSBiYXNlbmFtZSgkZmlsZU5hbWUpOworICAgICAgICBteSAk cHJlcHJvY2Vzc2VkRmlsZSA9ICIkb3V0cHV0RGlyZWN0b3J5LyRiYXNlTmFtZS5wcCI7CisgICAg ICAgIGlmICgtZSAkcHJlcHJvY2Vzc2VkRmlsZSkgeworICAgICAgICAgICAgbXkgQGxpbmVzID0g ZG8geyBsb2NhbCBAQVJHViA9ICRwcmVwcm9jZXNzZWRGaWxlOyA8PiB9OworICAgICAgICAgICAg cmV0dXJuIEBsaW5lczsKKyAgICAgICAgfQorICAgIH0KIAogICAgIG15IEBhcmdzID0gKCk7CiAg ICAgaWYgKCEkcHJlcHJvY2Vzc29yKSB7Cg== 195587 2013-03-28 09:58:54 -0700 2013-03-28 10:25:17 -0700 rebase again bug-113448-20130328095852.patch text/plain 9457 scottmg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWFkZDM2NjEyZTUyM2E3 MGQ2MTMxZTM5OTE2ZDhlMTM2NGY3MDAzZS4uYzg1NGNmYWYyMjU2MWUxZWYxOWFlMGE4MmIyMjU3 NTE3ZGQ2YTJhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAzLTI4ICBTY290 dCBHcmFoYW0gIDxzY290dG1nQGNocm9taXVtLm9yZz4KKworICAgICAgICBNb3ZlIHByZXByb2Nl c3Npbmcgb2YgaWRsIHRvIHByZS1wYXNzIGZvciBneXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzQ0OAorCisgICAgICAgIFJldmlld2VkIGJ5IFRv bnkgQ2hhbmcuCisKKyAgICAgICAgTW92ZXMgdGhlIHByZXByb2Nlc3NvciBpbnZvY2F0aW9ucyB3 aGVuIHBhcnNpbmcgSURMIGZpbGVzIHRvIGEKKyAgICAgICAgcHJlLXBhc3MgdG8gYXZvaWQgcmVp bnZvY2F0aW9ucyB3aGVuIElETHMgYXJlIHJlZmVyZW5jZWQgZnJvbSBvdGhlcnMuCisgICAgICAg IFRoaXMgcmVkdWNlcyB0aGUgbnVtYmVyIG9mIGludm9jYXRpb25zIG9mIHRoZSBwcmVwcm9jZXNz b3IgZnJvbSAyMDA3MQorICAgICAgICB0byA2MzMsIHdoaWNoIHJlZHVjZXMgdGhlIHJ1bnRpbWUg ZnJvbSAxMm0zMCB0byAxbSAob24gYSBXaW5kb3dzIGJveCkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLCB0aGlzIGlzIGEgYnVpbGQgdGltZSBpbXByb3ZlbWVudCwgYW5kIHNob3VsZG4ndCBoYXZl IGFueQorICAgICAgICB2aXNpYmxlIGVmZmVjdC4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwL1dl YkNvcmUuZ3lwOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbToK KyAgICAgICAgKFBhcnNlSW50ZXJmYWNlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0lE TFBhcnNlci5wbToKKyAgICAgICAgKFBhcnNlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRz L2dlbmVyYXRlLWJpbmRpbmdzLnBsOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvZ2VuZXJh dGUtcHJlcHJvY2Vzc2VkLWlkbHMucGw6IEFkZGVkLgorICAgICAgICAqIGJpbmRpbmdzL3Njcmlw dHMvcHJlcHJvY2Vzc29yLnBtOgorICAgICAgICAoYXBwbHlQcmVwcm9jZXNzb3IpOgorCiAyMDEz LTAzLTI4ICBDaGFuZ1Nlb2sgT2ggIDxjaGFuZ3Nlb2sub2hAY29sbGFib3JhLmNvbT4KIAogICAg ICAgICBbR1RLXVtBQ10gQW5pbWF0aW5nIGxheWVyIGRpc2FwcGVhcnMgd2hpbGUgcnVubmluZyB3 aXRoIGNsdXR0ZXIgYmFja2VuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5n eXAvV2ViQ29yZS5neXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cApp bmRleCAyNWFiZjg1NTYxYTFlNTQ5YzdiMDNhNTIxNWZlNDliNTYwYjk3OGExLi41MTM1NDk4Yzcw YzMwNmRhMjcyODZhNzUyNDI3YTI3ZjZlODNhNTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5 cC9XZWJDb3JlLmd5cApAQCAtNTk1LDEyICs1OTUsNjAgQEAKICAgICAgIF0KICAgICB9LAogICAg IHsKKyAgICAgICd0YXJnZXRfbmFtZSc6ICdnZW5lcmF0ZV9wcmVwcm9jZXNzZWRfaWRscycsCisg ICAgICAndHlwZSc6ICdub25lJywKKyAgICAgICdzb3VyY2VzJzogWworICAgICAgICAnPEAoYmlu ZGluZ3NfaWRsX2ZpbGVzKScsCisgICAgICAgICc8QCh3ZWJjb3JlX3Rlc3Rfc3VwcG9ydF9pZGxf ZmlsZXMpJywKKyAgICAgIF0sCisgICAgICAncnVsZXMnOiBbCisgICAgICAgICMgUnVsZXMgdG8g YnVpbGQgZGVyaXZlZCBzb3VyY2VzLgorICAgICAgICB7CisgICAgICAgICAgJ3J1bGVfbmFtZSc6 ICdiaW5kaW5nJywKKyAgICAgICAgICAnZXh0ZW5zaW9uJzogJ2lkbCcsCisgICAgICAgICAgJ21z dnNfZXh0ZXJuYWxfcnVsZSc6IDEsCisgICAgICAgICAgJ3ZhcmlhYmxlcyc6IHsKKyAgICAgICAg ICAgICMgU1ZHVVJJUmVmZXJlbmNlLmlkbCBpcyBtYW51YWxseSBhZGRlZCBiZWNhdXNlIHRoZSBn ZW5lcmF0ZWQKKyAgICAgICAgICAgICMgYmluZGluZ3MgY29kZSBjYXVzZXMgY29tcGlsZSBlcnJv cnMgd2hlbiBpdCdzIGNvbXBpbGVkIGF0IHRoZQorICAgICAgICAgICAgIyB0b3AgbGV2ZWwsIGJ1 dCB3ZSB3YW50IHRvIGF2b2lkIHJlZHVuZGFudCBwcmVwcm9jZXNzaW5nIG9mIGl0IGluCisgICAg ICAgICAgICAjIHRoZSBiaW5kaW5ncyBnZW5lcmF0aW9uIHN0YWdlIHdoZW4gaXQncyByZWZlcmVu Y2VkIGJ5IG90aGVyCisgICAgICAgICAgICAjIGZpbGVzLgorICAgICAgICAgICAgJ2FsbF9pZGxf ZmlsZXNfbGlzdCc6ICc8fChhbGxfaWRsX2ZpbGVzX2xpc3QudG1wIDxAKGJpbmRpbmdzX2lkbF9m aWxlcykgPEAod2ViY29yZV90ZXN0X3N1cHBvcnRfaWRsX2ZpbGVzKSAuLi9zdmcvU1ZHVVJJUmVm ZXJlbmNlLmlkbCknLAorICAgICAgICAgIH0sCisgICAgICAgICAgJ2lucHV0cyc6IFsKKyAgICAg ICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLXByZXByb2Nlc3NlZC1pZGxzLnBs JywKKyAgICAgICAgICAgICcuLi9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbScsCisg ICAgICAgICAgICAnPChhbGxfaWRsX2ZpbGVzX2xpc3QpJywKKyAgICAgICAgICAgICc8IUAoY2F0 IDwoYWxsX2lkbF9maWxlc19saXN0KSknLAorICAgICAgICAgIF0sCisgICAgICAgICAgJ291dHB1 dHMnOiBbCisgICAgICAgICAgICAnPChTSEFSRURfSU5URVJNRURJQVRFX0RJUikvd2ViY29yZS9i aW5kaW5ncy88KFJVTEVfSU5QVVRfUk9PVCkuaWRsLnBwJywKKyAgICAgICAgICBdLAorICAgICAg ICAgICdtc3ZzX2N5Z3dpbl9zaGVsbCc6IDAsCisgICAgICAgICAgJ2FjdGlvbic6IFsKKyAgICAg ICAgICAgICc8KHBlcmxfZXhlKScsCisgICAgICAgICAgICAnLXcnLAorICAgICAgICAgICAgJy1J Li4vYmluZGluZ3Mvc2NyaXB0cycsCisgICAgICAgICAgICAnLi4vYmluZGluZ3Mvc2NyaXB0cy9n ZW5lcmF0ZS1wcmVwcm9jZXNzZWQtaWRscy5wbCcsCisgICAgICAgICAgICAnLS1vdXRwdXQnLAor ICAgICAgICAgICAgJzxAKF9vdXRwdXRzKScsCisgICAgICAgICAgICAnLS1kZWZpbmVzJywKKyAg ICAgICAgICAgICc8KGZlYXR1cmVfZGVmaW5lcykgTEFOR1VBR0VfSkFWQVNDUklQVCBWOF9CSU5E SU5HJywKKyAgICAgICAgICAgICc8KFJVTEVfSU5QVVRfUEFUSCknLAorICAgICAgICAgICAgJzxA KHByZXByb2Nlc3NvciknLAorICAgICAgICAgIF0sCisgICAgICAgICAgJ21lc3NhZ2UnOiAnUHJl cHJvY2Vzc2luZyA8KFJVTEVfSU5QVVRfUEFUSCknLAorICAgICAgICB9LAorICAgICAgXSwKKyAg ICB9LAorICAgIHsKICAgICAgICd0YXJnZXRfbmFtZSc6ICd3ZWJjb3JlX2JpbmRpbmdzX3NvdXJj ZXMnLAogICAgICAgJ3R5cGUnOiAnbm9uZScsCiAgICAgICAnaGFyZF9kZXBlbmRlbmN5JzogMSwK ICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICdnZW5lcmF0ZV9zdXBwbGVtZW50YWxf ZGVwZW5kZW5jeScsCiAgICAgICAgICdnZW5lcmF0ZV9zZXR0aW5ncycsCisgICAgICAgICdnZW5l cmF0ZV9wcmVwcm9jZXNzZWRfaWRscycsCiAgICAgICBdLAogICAgICAgJ3NvdXJjZXMnOiBbCiAg ICAgICAgICMgYmlzb24gcnVsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9Db2RlR2VuZXJhdG9yLnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy9Db2RlR2VuZXJhdG9yLnBtCmluZGV4IDZhN2NjYjk1YTVmODcyMGFlMDNlZGJlYTlhMTVmYTA3 N2I4MWMwM2EuLjI5NmUxYzk3ZTZlMTBjNmMwNTY2MTUxNjg2NWY4Y2E2ZjlkOTdjYjYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvci5wbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3IucG0KQEAg LTMwNCw3ICszMDQsNyBAQCBzdWIgUGFyc2VJbnRlcmZhY2UKIAogICAgICMgU3RlcCAjMjogUGFy c2UgdGhlIGZvdW5kIElETCBmaWxlIChpbiBxdWlldCBtb2RlKS4KICAgICBteSAkcGFyc2VyID0g SURMUGFyc2VyLT5uZXcoMSk7Ci0gICAgbXkgJGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGZp bGVuYW1lLCAkZGVmaW5lcywgJHByZXByb2Nlc3Nvcik7CisgICAgbXkgJGRvY3VtZW50ID0gJHBh cnNlci0+UGFyc2UoJGZpbGVuYW1lLCAkZGVmaW5lcywgJHByZXByb2Nlc3NvciwgJHVzZU91dHB1 dERpcik7CiAKICAgICBmb3JlYWNoIG15ICRpbnRlcmZhY2UgKEB7JGRvY3VtZW50LT5pbnRlcmZh Y2VzfSkgewogICAgICAgICBpZiAoJGludGVyZmFjZS0+bmFtZSBlcSAkaW50ZXJmYWNlTmFtZSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIu cG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQppbmRleCBm MDAwMzU1NWUwNThjNTIzYjhhYjM4YzkwZmJmMzNiZjc5NDI1OWFiLi41NTkyYWQ5YmYyMmQ4NTRm YWUzZjZjOThhODc0MTcyYTUyNzM5ODc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0lETFBhcnNlci5wbQpAQCAtMTc2LDEwICsxNzYsMTEgQEAgc3ViIFBhcnNlCiAgICAg bXkgJGZpbGVOYW1lID0gc2hpZnQ7CiAgICAgbXkgJGRlZmluZXMgPSBzaGlmdDsKICAgICBteSAk cHJlcHJvY2Vzc29yID0gc2hpZnQ7CisgICAgbXkgJG91dHB1dERpcmVjdG9yeSA9IHNoaWZ0Owog CiAgICAgbXkgQGRlZmluaXRpb25zID0gKCk7CiAKLSAgICBteSBAbGluZXMgPSBhcHBseVByZXBy b2Nlc3NvcigkZmlsZU5hbWUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yKTsKKyAgICBteSBAbGlu ZXMgPSBhcHBseVByZXByb2Nlc3NvcigkZmlsZU5hbWUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29y LCAkb3V0cHV0RGlyZWN0b3J5KTsKICAgICAkc2VsZi0+e0xpbmV9ID0gJGxpbmVzWzBdOwogICAg ICRzZWxmLT57RG9jdW1lbnRDb250ZW50fSA9IGpvaW4oJyAnLCBAbGluZXMpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBs IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1iaW5kaW5ncy5wbApp bmRleCA3NDMzZTdiYjJmYTJkODFhMDVkNDViMDg4MWI4NDEwODQyYjAwMWMxLi42NTljMmZkNTlm ZmUyNGE2YzYxMjIyNTUxYzIwMGRjYzhhZDVmNzRkIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL2dlbmVyYXRlLWJpbmRpbmdzLnBsCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvZ2VuZXJhdGUtYmluZGluZ3MucGwKQEAgLTEyNCw3ICsxMjQs NyBAQCBpZiAoJHN1cHBsZW1lbnRhbERlcGVuZGVuY3lGaWxlKSB7CiAKICMgUGFyc2UgdGhlIHRh cmdldCBJREwgZmlsZS4KIG15ICR0YXJnZXRQYXJzZXIgPSBJRExQYXJzZXItPm5ldyghJHZlcmJv c2UpOwotbXkgJHRhcmdldERvY3VtZW50ID0gJHRhcmdldFBhcnNlci0+UGFyc2UoJHRhcmdldElk bEZpbGUsICRkZWZpbmVzLCAkcHJlcHJvY2Vzc29yKTsKK215ICR0YXJnZXREb2N1bWVudCA9ICR0 YXJnZXRQYXJzZXItPlBhcnNlKCR0YXJnZXRJZGxGaWxlLCAkZGVmaW5lcywgJHByZXByb2Nlc3Nv ciwgJG91dHB1dERpcmVjdG9yeSk7CiAKIGlmICgkaWRsQXR0cmlidXRlc0ZpbGUpIHsKICAgICBt eSAkaWRsQXR0cmlidXRlcyA9IGxvYWRJRExBdHRyaWJ1dGVzKCRpZGxBdHRyaWJ1dGVzRmlsZSk7 CkBAIC0xMzYsNyArMTM2LDcgQEAgZm9yZWFjaCBteSAkaWRsRmlsZSAoQHN1cHBsZW1lbnRlZElk bEZpbGVzKSB7CiAKICAgICBteSAkaW50ZXJmYWNlTmFtZSA9IGZpbGVwYXJzZShiYXNlbmFtZSgk aWRsRmlsZSksICIuaWRsIik7CiAgICAgbXkgJHBhcnNlciA9IElETFBhcnNlci0+bmV3KCEkdmVy Ym9zZSk7Ci0gICAgbXkgJGRvY3VtZW50ID0gJHBhcnNlci0+UGFyc2UoJGlkbEZpbGUsICRkZWZp bmVzLCAkcHJlcHJvY2Vzc29yKTsKKyAgICBteSAkZG9jdW1lbnQgPSAkcGFyc2VyLT5QYXJzZSgk aWRsRmlsZSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IsICRvdXRwdXREaXJlY3RvcnkpOwogCiAg ICAgZm9yZWFjaCBteSAkaW50ZXJmYWNlIChAeyRkb2N1bWVudC0+aW50ZXJmYWNlc30pIHsKICAg ICAgICAgaWYgKCRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJTdXBwbGVtZW50YWwi fSBhbmQgJGludGVyZmFjZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IlN1cHBsZW1lbnRhbCJ9IGVx ICR0YXJnZXRJbnRlcmZhY2VOYW1lKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL2dlbmVyYXRlLXByZXByb2Nlc3NlZC1pZGxzLnBsIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1wcmVwcm9jZXNzZWQtaWRscy5wbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi45NzVmYjFlNTVjM2Y3MmI1NjllMTlhMDYxOGY0NmUwMDIzNWUwZjFhCi0tLSAvZGV2L251 bGwKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9nZW5lcmF0ZS1wcmVwcm9j ZXNzZWQtaWRscy5wbApAQCAtMCwwICsxLDQxIEBACisjIS91c3IvYmluL3BlcmwgLXcKKyMKKyMg Q29weXJpZ2h0IChDKSAyMDEzIEdvb2dsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorIwor IyBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQg YW5kL29yCisjIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdl bmVyYWwgUHVibGljCisjIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJl IEZvdW5kYXRpb247IGVpdGhlcgorIyB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5 b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisjCisjIFRoaXMgbGlicmFyeSBpcyBkaXN0 cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorIyBidXQgV0lUSE9V VCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorIyBN RVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUg dGhlIEdOVQorIyBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWls cy4KKyMKKyMgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExpYnJh cnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorIyBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgc2Vl IHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bworIyB0aGUgRnJlZSBTb2Z0 d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAor IyBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KKyMKKwordXNlIHN0cmljdDsKKwordXNlIHBy ZXByb2Nlc3NvcjsKK3VzZSBHZXRvcHQ6Okxvbmc7Cit1c2UgQ3dkOworCitteSAkZGVmaW5lczsK K215ICRwcmVwcm9jZXNzb3I7CitteSAkb3V0cHV0OworCitHZXRPcHRpb25zKCdkZWZpbmVzPXMn ID0+IFwkZGVmaW5lcywKKyAgICAgICAgICAgJ3ByZXByb2Nlc3Nvcj1zJyA9PiBcJHByZXByb2Nl c3NvciwKKyAgICAgICAgICAgJ291dHB1dD1zJyA9PiBcJG91dHB1dCk7CisKK2RpZSgnTXVzdCBz cGVjaWZ5ICNkZWZpbmUgbWFjcm9zIHVzaW5nIC0tZGVmaW5lcy4nKSB1bmxlc3MgZGVmaW5lZCgk ZGVmaW5lcyk7CitkaWUoJ011c3Qgc3BlY2lmeSB0aGUgb3V0cHV0IHVzaW5nIC0tb3V0cHV0Licp IHVubGVzcyBkZWZpbmVkKCRvdXRwdXQpOworCitteSBAY29udGVudHMgPSBhcHBseVByZXByb2Nl c3NvcigkQVJHVlswXSwgJGRlZmluZXMsICRwcmVwcm9jZXNzb3IsIHVuZGVmKTsKK29wZW4gKEZJ TEUsICI+JG91dHB1dCIpIHx8IGRpZSAiQ291bGRuJ3Qgb3BlbiAkb3V0cHV0XG4iOworcHJpbnQg RklMRSBAY29udGVudHM7CitjbG9zZSBGSUxFOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9wcmVwcm9jZXNzb3IucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5wbQppbmRleCA1OTY1YjEwMjU2NjlkMzMyMDkyODMyYjhh ZGI5NGU0ZDZhMWZhMGY0Li4xMGQ2ZmFjOWVjNDRjNmI5ZGUzMjQ5YWQ1MDllZjFiZWEzMmRhZDI5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nv ci5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3ByZXByb2Nlc3Nvci5w bQpAQCAtMjIsNiArMjIsNyBAQCB1c2Ugc3RyaWN0OwogdXNlIHdhcm5pbmdzOwogCiB1c2UgQ29u ZmlnOwordXNlIEZpbGU6OkJhc2VuYW1lOwogdXNlIElQQzo6T3BlbjI7CiB1c2UgSVBDOjpPcGVu MzsKIApAQCAtNDEsNiArNDIsMTkgQEAgc3ViIGFwcGx5UHJlcHJvY2Vzc29yCiAgICAgbXkgJGZp bGVOYW1lID0gc2hpZnQ7CiAgICAgbXkgJGRlZmluZXMgPSBzaGlmdDsKICAgICBteSAkcHJlcHJv Y2Vzc29yID0gc2hpZnQ7CisgICAgbXkgJG91dHB1dERpcmVjdG9yeSA9IHNoaWZ0OworCisgICAg aWYgKCRvdXRwdXREaXJlY3RvcnkpIHsKKyAgICAgICAgIyBJZiB0aGUgcHJlcHJvY2Vzc2VkIGJ1 aWxkIGZpbGUgd2FzIGdlbmVyYXRlZCBhbHJlYWR5IGJ5IHRoZSBidWlsZAorICAgICAgICAjIHN5 c3RlbSwgdGhlbiByZXR1cm4gdGhhdCBvbmUuIFRoaXMgYXZvaWRzIE5eMiBiZWhhdmlvciBpbiBy ZWFwcGx5aW5nCisgICAgICAgICMgdGhlIHByZXByb2Nlc3NvciB0aGUgaWRsIGZpbGVzIHJlZmVy ZW5jZWQgYnkgb3RoZXIgaWRsIGZpbGVzLgorICAgICAgICBteSAkYmFzZU5hbWUgPSBiYXNlbmFt ZSgkZmlsZU5hbWUpOworICAgICAgICBteSAkcHJlcHJvY2Vzc2VkRmlsZSA9ICIkb3V0cHV0RGly ZWN0b3J5LyRiYXNlTmFtZS5wcCI7CisgICAgICAgIGlmICgtZSAkcHJlcHJvY2Vzc2VkRmlsZSkg eworICAgICAgICAgICAgbXkgQGxpbmVzID0gZG8geyBsb2NhbCBAQVJHViA9ICRwcmVwcm9jZXNz ZWRGaWxlOyA8PiB9OworICAgICAgICAgICAgcmV0dXJuIEBsaW5lczsKKyAgICAgICAgfQorICAg IH0KIAogICAgIG15IEBhcmdzID0gKCk7CiAgICAgaWYgKCEkcHJlcHJvY2Vzc29yKSB7Cg==