81769 2012-03-21 06:05:43 -0700 [GTK] Add make to the jhbuild moduleset 2013-08-06 10:28:35 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 81888 1 cgarcia gustavo d-r gustavo mrobinson pnormand rakuco sagargajjar00 oldest_to_newest 584050 0 cgarcia 2012-03-21 06:05:43 -0700 To add make and apply custom patches to fix several issues: - The argument list is too long error that happens when running make distcheck - Parallel build issues of make 3.82, see bug #79498 584062 1 133030 cgarcia 2012-03-21 06:19:24 -0700 Created attachment 133030 Patch 584075 2 133030 pnormand 2012-03-21 06:30:42 -0700 Comment on attachment 133030 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133030&action=review Looks good but I'd like the EFL guys to test this before landing > Tools/Scripts/update-webkit-libs-jhbuild:-53 > -chdir(relativeScriptsDir() . "/../".$platform) or die $!; Are you sure this needs to be removed? 584077 3 pnormand 2012-03-21 06:31:50 -0700 Can the EFL folks have a look at this patch and test it please? 584084 4 cgarcia 2012-03-21 06:40:08 -0700 (In reply to comment #2) > (From update of attachment 133030 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133030&action=review > > Looks good but I'd like the EFL guys to test this before landing > > > Tools/Scripts/update-webkit-libs-jhbuild:-53 > > -chdir(relativeScriptsDir() . "/../".$platform) or die $!; > > Are you sure this needs to be removed? That was used to run jhbuild directly, we are now using the wrapper script. 584096 5 133030 pnormand 2012-03-21 06:58:09 -0700 Comment on attachment 133030 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133030&action=review > Tools/ChangeLog:8 > + Add bootstrap.modules with GNU make and custom patches top fix s/top/to Spotted by drott > Tools/Scripts/update-webkit-libs-jhbuild:60 > -my @jhbuildArgs = ("../../WebKitBuild/Dependencies/Root/bin/jhbuild", "--no-interact", "-f", "jhbuildrc"); > -push(@jhbuildArgs, @ARGV[2..-1]); > -if (system(@jhbuildArgs) != 0) { > - die "Running jhbuild failed.\n" > -} > +runJhbuild("build"); Hum you no longer pass "--no-interact", "-f", "jhbuildrc" to jhbuild? 584097 6 d-r 2012-03-21 06:59:16 -0700 When cleaning up WebKitBuild and running from scratch: Updating EFL port required support tools using jhbuild... jhbuild bootstrap: failed to parse bootstrap: [Errno 2] No such file or directory: 'bootstrap' Running jhbuild-wrapper bootstrap failed. Traceback (most recent call last): File "/fast/dominik/dev/WebKitGit_EFL/Tools/efl/../Scripts/../../Tools/jhbuild/jhbuild-wrapper", line 136, in <module> ensure_jhbuild() File "/fast/dominik/dev/WebKitGit_EFL/Tools/efl/../Scripts/../../Tools/jhbuild/jhbuild-wrapper", line 126, in ensure_jhbuild update_webkit_libs_jhbuild() File "/fast/dominik/dev/WebKitGit_EFL/Tools/efl/../Scripts/../../Tools/jhbuild/jhbuild-wrapper", line 110, in update_webkit_libs_jhbuild raise Exception('jhbuild configure failed with return code: %i' % process.returncode) Exception: jhbuild configure failed with return code: 1 584101 7 cgarcia 2012-03-21 07:02:54 -0700 (In reply to comment #5) > (From update of attachment 133030 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133030&action=review > > > Tools/ChangeLog:8 > > + Add bootstrap.modules with GNU make and custom patches top fix > > s/top/to > > Spotted by drott > > > Tools/Scripts/update-webkit-libs-jhbuild:60 > > -my @jhbuildArgs = ("../../WebKitBuild/Dependencies/Root/bin/jhbuild", "--no-interact", "-f", "jhbuildrc"); > > -push(@jhbuildArgs, @ARGV[2..-1]); > > -if (system(@jhbuildArgs) != 0) { > > - die "Running jhbuild failed.\n" > > -} > > +runJhbuild("build"); > > Hum you no longer pass "--no-interact", "-f", "jhbuildrc" to jhbuild? yes, jhbuild-wrapper does it 584134 8 mrobinson 2012-03-21 08:00:58 -0700 It isn't too important to build JHbuild itself with a patched make, so why not just add make and the patches to the main moduleset? Wouldn't that make this patch a lot smaller? 584143 9 133044 cgarcia 2012-03-21 08:17:47 -0700 Created attachment 133044 Updated patch to fix efl build Check whether bootstrap moduleset file exists before trying to run jhbuild bootstrap 584148 10 cgarcia 2012-03-21 08:20:35 -0700 (In reply to comment #8) > It isn't too important to build JHbuild itself with a patched make, so why not just add make and the patches to the main moduleset? Wouldn't that make this patch a lot smaller? Because it's not a dependency. 584165 11 d-r 2012-03-21 08:44:46 -0700 (In reply to comment #9) > Created an attachment (id=133044) [details] > Updated patch to fix efl build Works for me. Thanks. 585108 12 cgarcia 2012-03-22 03:42:34 -0700 I've split this patch, see bug #81888 585132 13 133224 cgarcia 2012-03-22 04:58:54 -0700 Created attachment 133224 New patch Instead of running bootstrap in update-webkit-libs-jhbuild, it simply adds a new step for the bots to run bootstrap before installing the dependencies. Developers who use build-webkit and want to install patched make only have to run Tools/jhbuild/jhbuild-wrapper --gtk bootstrap This way we don't need to change anything in efl 585133 14 133224 pnormand 2012-03-22 05:02:33 -0700 Comment on attachment 133224 New patch LGTM, Martin, WDYT? 585278 15 gustavo 2012-03-22 07:54:31 -0700 Like I said on IRC, I would prefer to have this on the existing jhbuild.modules. I understand this would be incorrect from a conceptual point of view, since make is not a dependency, but I think practicality beats purity (Python Zen™) in this case. Adding another step will certainly add more bugs we'll need to fix. In any case, if we do add the bootstrap stuff, we need to make sure it's run in Tools/Scripts/webkitdirs.pm, here (~ line 1900) : # We might need to update jhbuild dependencies. if (checkForArgumentAndRemoveFromArrayRef("--update-gtk", \@buildParams)) { system("perl", "$sourceDir/Tools/Scripts/update-webkitgtk-libs") == 0 or die $!; } 585282 16 cgarcia 2012-03-22 07:57:22 -0700 (In reply to comment #15) > Like I said on IRC, I would prefer to have this on the existing jhbuild.modules. I understand this would be incorrect from a conceptual point of view, since make is not a dependency, but I think practicality beats purity (Python Zen™) in this case. Adding another step will certainly add more bugs we'll need to fix. fair enough 585515 17 133302 gustavo 2012-03-22 11:28:54 -0700 Created attachment 133302 Patch 585628 18 133302 gustavo 2012-03-22 13:23:14 -0700 Comment on attachment 133302 Patch Clearing flags on attachment: 133302 Committed r111749: <http://trac.webkit.org/changeset/111749> 585629 19 gustavo 2012-03-22 13:23:23 -0700 All reviewed patches have been landed. Closing bug. 914895 20 zan 2013-08-06 10:28:35 -0700 *** Bug 111156 has been marked as a duplicate of this bug. *** 133030 2012-03-21 06:19:24 -0700 2012-03-21 08:17:47 -0700 Patch wk-jhbuild-bootstrap.diff text/plain 11958 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiNzg0 YmVkLi5iOThmNDg2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsNDUgQEAKIDIwMTItMDMtMjEgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIEFkZCBib290c3RyYXAgamhi dWlsZCBtb2R1bGVzZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgxNzY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIGJvb3RzdHJhcC5tb2R1bGVzIHdpdGggR05VIG1ha2UgYW5kIGN1c3RvbSBwYXRj aGVzIHRvcCBmaXgKKyAgICAgICAgc2V2ZXJhbCBpc3N1ZXM6CisKKyAgICAgICAgICAtIG1ha2Ut My44Mi1hcmctbGlzdC1sZW5ndGgucGF0Y2g6IFBhdGNoIGJ5IFJhbGYgV2lsZGVuaHVlcyB0bwor ICAgICAgICAgICAgZml4IHRoZSBhcmd1bWVudCBsaXN0IGxpbWl0IG9mIEdOVSBtYWtlIHdoZW4g cnVubmluZyBtYWtlCisgICAgICAgICAgICBkaXN0Y2hlY2suCisgICAgICAgICAgLSBtYWtlLTMu ODItcGFyYWxsZWwtYnVpbGQucGF0Y2g6IFBhdGNoIGJ5IEthbWlsIE1pZXJ6ZWpld3NraQorICAg ICAgICAgICAgYW5kIEplcmVteSBEZXZlbnBvcnQgdG8gZml4IHBhcmFsbGVsIGJ1aWxkIGlzc3Vl cyBwcmVzZW50IGluCisgICAgICAgICAgICBHTlUgbWFrZSAzLjgyCisKKyAgICAgICAgamhidWls ZCBib290c3RyYXAgaXMgbm93IHJ1biBiZWZvcmUgamhidWlsZCBydW4uCisKKyAgICAgICAgKiBT Y3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxkOiBSdW4gamhidWlsZCBib290c3RyYXAK KyAgICAgICAgY29tbWFuZCBiZWZvcmUgYnVpbGQuCisgICAgICAgIChydW5KaGJ1aWxkKTogSGVs cGVyIGZ1bmN0aW9uIHRvIHJ1biBqaGJ1aWxkIHdpdGggYSBnaXZlbiBjb21tYW5kLgorICAgICAg ICBJbnN0ZWFkIG9mIHJ1bm5pbmcgamhidWlsZCBkaXJlY3RseSwgdXNlIHRoZSBqaGJ1aWxkLXdy YXBwZXIsIHNvCisgICAgICAgIHRoYXQgd2UgZG9uJ3QgbmVlZCB0byBydW4gaXQgZmlyc3QgdG8g Y2hlY2sgd2hldGhlciBqaGJ1aWxkIGlzCisgICAgICAgIGluc3RhbGxlZCBvciBub3QuCisgICAg ICAgICogZWZsL2poYnVpbGRyYzogU2V0IHVzZV9sb2NhbF9tb2R1bGVzZXRzIHRvIFRydWUgYW5k IGluaXRpYWxpemUKKyAgICAgICAgbW9kdWxlc2V0c19kaXIsIHNvIHRoYXQgamhidWlsZCBib290 c3RyYXAgdXNlcyB0aGUgbG9jYWwgYm9vdHN0cmFwCisgICAgICAgIG1vZHVsZXNldCBpZiBwcmVz ZW50LiBPdGhlcndpc2UgYm9vdHN0cmFwIGNvbW1hbmQgZmluaXNoZXMgc2lsZW50bHkuCisgICAg ICAgICogZWZsL3J1bi13aXRoLWpoYnVpbGQ6IENhbGwgamhidWlsZC13cmFwcGVyIHdpdGggcnVu IGNvbW1hbmQuCisgICAgICAgICogZ3RrL2Jvb3RzdHJhcC5tb2R1bGVzOiBBZGRlZC4gSXQgb25s eSBhZGRzIEdOVSBtYWtlIHdpdGggY3VzdG9tCisgICAgICAgIHBhdGNoZXMgdG8gZml4IHNldmVy YWwgaXNzdWVzLgorICAgICAgICAqIGd0ay9qaGJ1aWxkcmM6IFNldCB1c2VfbG9jYWxfbW9kdWxl c2V0cyB0byBUcnVlIGFuZCBpbml0aWFsaXplCisgICAgICAgIG1vZHVsZXNldHNfZGlyLCBzbyB0 aGF0IGpoYnVpbGQgYm9vdHN0cmFwIHVzZXMKKyAgICAgICAgZ3RrL2Jvb3RzdHJhcC5tb2R1bGVz LgorICAgICAgICAqIGd0ay9wYXRjaGVzL21ha2UtMy44Mi1hcmctbGlzdC1sZW5ndGgucGF0Y2g6 IEFkZGVkLgorICAgICAgICAqIGd0ay9wYXRjaGVzL21ha2UtMy44Mi1wYXJhbGxlbC1idWlsZC5w YXRjaDogQWRkZWQuCisgICAgICAgICogZ3RrL3J1bi13aXRoLWpoYnVpbGQ6IENhbGwgamhidWls ZC13cmFwcGVyIHdpdGggcnVuIGNvbW1hbmQuCisgICAgICAgICogamhidWlsZC9qaGJ1aWxkLXdy YXBwZXI6IEFsbG93IHRvIGV4ZWN1dGUgYW55IGpoYnVpbGQgY29tbWFuZCwKKyAgICAgICAgbm90 IG9ubHkgcnVuLgorCisyMDEyLTAzLTIxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBBbGxvdyBydW5uaW5nIGphdmFzY3JpcHQgZnJv bSBsb2NhdGlvbiBiYXIgaW4gTWluaUJyb3dzZXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMzMxCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv dXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQt bGlicy1qaGJ1aWxkCmluZGV4IDdlMjQ0MGEuLjExMTBlNjMgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvdXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQKKysrIGIvVG9vbHMvU2NyaXB0cy91cGRh dGUtd2Via2l0LWxpYnMtamhidWlsZApAQCAtNDEsMjEgKzQxLDIwIEBAIGlmICghJGdldE9wdGlv bnNSZXN1bHQpIHsKICAgICB9CiB9CiAKK3N1YiBydW5KaGJ1aWxkCit7CisgICAgbXkgJGNvbW1h bmQgPSBzaGlmdDsKKyAgICBteSBAamhidWlsZEFyZ3MgPSAoIi4vamhidWlsZC13cmFwcGVyIiwg Ii0tIi4kcGxhdGZvcm0sICRjb21tYW5kKTsKKyAgICBwdXNoKEBqaGJ1aWxkQXJncywgQEFSR1Zb Mi4uLTFdKTsKKyAgICBzeXN0ZW0oQGpoYnVpbGRBcmdzKSA9PSAwIG9yIGRpZSAiUnVubmluZyBq aGJ1aWxkLXdyYXBwZXIgIiAuICRjb21tYW5kIC4gIiBmYWlsZWQuXG4iOworfQorCiBkZWxldGUg JEVOVntBUl9GTEFHU30gaWYgZXhpc3RzICRFTlZ7QVJfRkxBR1N9OwogCiBjaGRpcihyZWxhdGl2 ZVNjcmlwdHNEaXIoKSAuICIvLi4vamhidWlsZCIpIG9yIGRpZSAkITsKIAotbXkgQGVuc3VyZUpo YnVpbGRBcmdzID0gKCIuL2poYnVpbGQtd3JhcHBlciIsICItLSIuJHBsYXRmb3JtLCAiZWNobyIs ICJFbnN1cmVkIGpoYnVpbGQgc2V0dXAuIik7Ci1pZiAoc3lzdGVtKEBlbnN1cmVKaGJ1aWxkQXJn cykgIT0gMCkgewotICAgIGRpZSAiRmFpbGVkIHRvIGVuc3VyZSBqaGJ1aWxkIGluc3RhbGxlZC5c biI7Ci19Ci0KLWNoZGlyKHJlbGF0aXZlU2NyaXB0c0RpcigpIC4gIi8uLi8iLiRwbGF0Zm9ybSkg b3IgZGllICQhOwotCiBteSAlcHJldHR5UGxhdGZvcm0gPSAoICJlZmwiID0+ICJFRkwiLCAiZ3Rr IiA9PiAiR1RLKyIgKTsKK3ByaW50ICJVcGRhdGluZyAiIC4gJHByZXR0eVBsYXRmb3JteyRwbGF0 Zm9ybX0gLiAiIHBvcnQgcmVxdWlyZWQgc3VwcG9ydCB0b29scyB1c2luZyBqaGJ1aWxkLi4uXG4i OworcnVuSmhidWlsZCgiYm9vdHN0cmFwIik7CiBwcmludCAiVXBkYXRpbmcgIiAuICRwcmV0dHlQ bGF0Zm9ybXskcGxhdGZvcm19IC4gIiBwb3J0IGRlcGVuZGVuY2llcyB1c2luZyBqaGJ1aWxkLi4u XG4iOwotbXkgQGpoYnVpbGRBcmdzID0gKCIuLi8uLi9XZWJLaXRCdWlsZC9EZXBlbmRlbmNpZXMv Um9vdC9iaW4vamhidWlsZCIsICItLW5vLWludGVyYWN0IiwgIi1mIiwgImpoYnVpbGRyYyIpOwot cHVzaChAamhidWlsZEFyZ3MsIEBBUkdWWzIuLi0xXSk7Ci1pZiAoc3lzdGVtKEBqaGJ1aWxkQXJn cykgIT0gMCkgewotICAgIGRpZSAiUnVubmluZyBqaGJ1aWxkIGZhaWxlZC5cbiIKLX0KK3J1bkpo YnVpbGQoImJ1aWxkIik7CmRpZmYgLS1naXQgYS9Ub29scy9lZmwvamhidWlsZHJjIGIvVG9vbHMv ZWZsL2poYnVpbGRyYwppbmRleCBhZDk2ZWEzLi45YTJmZTM5IDEwMDY0NAotLS0gYS9Ub29scy9l ZmwvamhidWlsZHJjCisrKyBiL1Rvb2xzL2VmbC9qaGJ1aWxkcmMKQEAgLTIzLDYgKzIzLDggQEAg X19lZmxfdG9vbHNfZGlyZWN0b3J5ID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguZGlybmFtZShf X2ZpbGVfXykpCiBzeXMucGF0aC5hcHBlbmQoX19lZmxfdG9vbHNfZGlyZWN0b3J5KQogaW1wb3J0 IGNvbW1vbgogCit1c2VfbG9jYWxfbW9kdWxlc2V0cyA9IFRydWUKK21vZHVsZXNldHNfZGlyID0g X19lZmxfdG9vbHNfZGlyZWN0b3J5CiBidWlsZF9wb2xpY3kgPSAndXBkYXRlZCcKIAogIyBGSVhN RTogbW92ZSBzaGFyZWQgcGFydHMgaW50byAuLi9qaGJ1aWxkIGZvbGRlci4KZGlmZiAtLWdpdCBh L1Rvb2xzL2VmbC9ydW4td2l0aC1qaGJ1aWxkIGIvVG9vbHMvZWZsL3J1bi13aXRoLWpoYnVpbGQK aW5kZXggNjI0MTkxYS4uOGNkZTdkYSAxMDA3NTUKLS0tIGEvVG9vbHMvZWZsL3J1bi13aXRoLWpo YnVpbGQKKysrIGIvVG9vbHMvZWZsL3J1bi13aXRoLWpoYnVpbGQKQEAgLTIxLDYgKzIxLDYgQEAg aW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCBzeXMKIAogamhidWlsZF93cmFwcGVyID0gY29tbW9u LnRvcF9sZXZlbF9wYXRoKCdUb29scycsICdqaGJ1aWxkJywgJ2poYnVpbGQtd3JhcHBlcicpCi1w cm9jZXNzID0gc3VicHJvY2Vzcy5Qb3BlbihbamhidWlsZF93cmFwcGVyLCAnLS1lZmwnXSArIHN5 cy5hcmd2WzE6XSkKK3Byb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFtqaGJ1aWxkX3dyYXBwZXIs ICctLWVmbCcsICdydW4nXSArIHN5cy5hcmd2WzE6XSkKIHByb2Nlc3Mud2FpdCgpCiBzeXMuZXhp dChwcm9jZXNzLnJldHVybmNvZGUpCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvYm9vdHN0cmFwLm1v ZHVsZXMgYi9Ub29scy9ndGsvYm9vdHN0cmFwLm1vZHVsZXMKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMC4uZWRiYTEyZgotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL2d0ay9ib290 c3RyYXAubW9kdWxlcwpAQCAtMCwwICsxLDI0IEBACis8P3htbCB2ZXJzaW9uPSIxLjAiPz4KKzwh RE9DVFlQRSBtb2R1bGVzZXQgU1lTVEVNICJtb2R1bGVzZXQuZHRkIj4KKzw/eG1sLXN0eWxlc2hl ZXQgdHlwZT0idGV4dC94c2wiIGhyZWY9Im1vZHVsZXNldC54c2wiPz4KKzxtb2R1bGVzZXQ+CisK KyAgPG1ldGFtb2R1bGUgaWQ9Im1ldGEtYm9vdHN0cmFwIj4KKyAgICA8ZGVwZW5kZW5jaWVzPgor ICAgICAgPGRlcCBwYWNrYWdlPSJtYWtlIi8+CisgICAgPC9kZXBlbmRlbmNpZXM+CisgIDwvbWV0 YW1vZHVsZT4KKworICA8cmVwb3NpdG9yeSB0eXBlPSJ0YXJiYWxsIiBuYW1lPSJmdHAuZ251Lm9y ZyIKKyAgICAgIGhyZWY9ImZ0cDovL2Z0cC5nbnUub3JnL2dudS8iLz4KKworICA8YXV0b3Rvb2xz IGlkPSJtYWtlIiBhdXRvZ2VuLXNoPSJjb25maWd1cmUiPgorICAgIDxicmFuY2ggcmVwbz0iZnRw LmdudS5vcmciCisgICAgICAgICAgICBtb2R1bGU9Im1ha2UvbWFrZS0zLjgyLnRhci5iejIiIHZl cnNpb249IjMuODIiCisgICAgICAgICAgICBzaXplPSIxMjQyMTg2IiBtZDVzdW09IjFhMTExMDBm M2M2M2ZjZjU3NTM4MThlNTlkNjMwODhmIj4KKyAgICAgIDxwYXRjaCBmaWxlPSJtYWtlLTMuODIt YXJnLWxpc3QtbGVuZ3RoLnBhdGNoIiBzdHJpcD0iMSIvPgorICAgICAgPHBhdGNoIGZpbGU9Im1h a2UtMy44Mi1wYXJhbGxlbC1idWlsZC5wYXRjaCIgc3RyaXA9IjEiLz4KKyAgICA8L2JyYW5jaD4K KyAgPC9hdXRvdG9vbHM+CisKKzwvbW9kdWxlc2V0PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZp bGUKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9qaGJ1aWxkcmMgYi9Ub29scy9ndGsvamhidWlsZHJj CmluZGV4IDMyNDhiNmIuLjgyOTYxMTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2d0ay9qaGJ1aWxkcmMK KysrIGIvVG9vbHMvZ3RrL2poYnVpbGRyYwpAQCAtMjIsNiArMjIsOCBAQCBfX2d0a190b29sc19k aXJlY3RvcnkgPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKSkKIHN5 cy5wYXRoLmFwcGVuZChfX2d0a190b29sc19kaXJlY3RvcnkpCiBpbXBvcnQgY29tbW9uCiAKK3Vz ZV9sb2NhbF9tb2R1bGVzZXRzID0gVHJ1ZQorbW9kdWxlc2V0c19kaXIgPSBfX2d0a190b29sc19k aXJlY3RvcnkKIGJ1aWxkX3BvbGljeSA9ICd1cGRhdGVkJwogCiBfX21vZHVsZXNldF9maWxlX3Vy aSA9ICdmaWxlOi8vJyArIG9zLnBhdGguam9pbihfX2d0a190b29sc19kaXJlY3RvcnksICdqaGJ1 aWxkLm1vZHVsZXMnKQpkaWZmIC0tZ2l0IGEvVG9vbHMvZ3RrL3BhdGNoZXMvbWFrZS0zLjgyLWFy Zy1saXN0LWxlbmd0aC5wYXRjaCBiL1Rvb2xzL2d0ay9wYXRjaGVzL21ha2UtMy44Mi1hcmctbGlz dC1sZW5ndGgucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTgzNTEy OAotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL2d0ay9wYXRjaGVzL21ha2UtMy44Mi1hcmctbGlz dC1sZW5ndGgucGF0Y2gKQEAgLTAsMCArMSwxMDQgQEAKK2RpZmYgLXUgbWFrZS0zLjgyLW9yaWcv Y29uZmlndXJlLmluIG1ha2UtMy44Mi9jb25maWd1cmUuaW4KKy0tLSBtYWtlLTMuODItb3JpZy9j b25maWd1cmUuaW4JMjAxMC0wNy0yOCAwNzozOTo1MC4wMDAwMDAwMDAgKzAyMDAKKysrKyBtYWtl LTMuODIvY29uZmlndXJlLmluCTIwMTItMDMtMjEgMTI6MzQ6MjAuMDAwMDAwMDAwICswMTAwCitA QCAtNjQsNyArNjQsOCBAQAorIEFDX0hFQURFUl9TVEFUCisgQUNfSEVBREVSX1RJTUUKKyBBQ19D SEVDS19IRUFERVJTKHN0ZGxpYi5oIGxvY2FsZS5oIHVuaXN0ZC5oIGxpbWl0cy5oIGZjbnRsLmgg c3RyaW5nLmggXAorLQkJIG1lbW9yeS5oIHN5cy9wYXJhbS5oIHN5cy9yZXNvdXJjZS5oIHN5cy90 aW1lLmggc3lzL3RpbWViLmgpCisrCQkgbWVtb3J5Lmggc3lzL3BhcmFtLmggc3lzL3Jlc291cmNl Lmggc3lzL3RpbWUuaCBzeXMvdGltZWIuaCBcCisrCQkgc3lzL3VzZXIuaCBsaW51eC9iaW5mbXRz LmgpCisgCisgIyBTZXQgYSBmbGFnIGlmIHdlIGhhdmUgYW4gQU5TSSBDIGNvbXBpbGVyCisgaWYg dGVzdCAiJGFjX2N2X3Byb2dfY2Nfc3RkYyIgIT0gbm87IHRoZW4KK1N1YmRpcmVjdG9yaW9zIGNv bXVuZXM6IG1ha2UtMy44Mi1vcmlnL2RvYyB5IG1ha2UtMy44Mi9kb2MKK1N1YmRpcmVjdG9yaW9z IGNvbXVuZXM6IG1ha2UtMy44Mi1vcmlnL2dsb2IgeSBtYWtlLTMuODIvZ2xvYgorZGlmZiAtdSBt YWtlLTMuODItb3JpZy9qb2IuYyBtYWtlLTMuODIvam9iLmMKKy0tLSBtYWtlLTMuODItb3JpZy9q b2IuYwkyMDEwLTA3LTI0IDEwOjI3OjUwLjAwMDAwMDAwMCArMDIwMAorKysrIG1ha2UtMy44Mi9q b2IuYwkyMDEyLTAzLTIxIDEyOjM0OjIwLjAwMDAwMDAwMCArMDEwMAorQEAgLTI5LDYgKzI5LDEx IEBACisgCisgI2luY2x1ZGUgPHN0cmluZy5oPgorIAorKyNpZiBkZWZpbmVkIChIQVZFX0xJTlVY X0JJTkZNVFNfSCkgJiYgZGVmaW5lZCAoSEFWRV9TWVNfVVNFUl9IKQorKyNpbmNsdWRlIDxzeXMv dXNlci5oPgorKyNpbmNsdWRlIDxsaW51eC9iaW5mbXRzLmg+CisrI2VuZGlmCisrCisgLyogRGVm YXVsdCBzaGVsbCB0byB1c2UuICAqLworICNpZmRlZiBXSU5ET1dTMzIKKyAjaW5jbHVkZSA8d2lu ZG93cy5oPgorQEAgLTI3OTUsNiArMjgwMCw3IEBACisgICAgIHVuc2lnbmVkIGludCBzZmxhZ3Nf bGVuID0gc3RybGVuIChzaGVsbGZsYWdzKTsKKyAgICAgY2hhciAqY29tbWFuZF9wdHIgPSBOVUxM OyAvKiB1c2VkIGZvciBiYXRjaF9tb2RlX3NoZWxsIG1vZGUgKi8KKyAgICAgY2hhciAqbmV3X2xp bmU7CisrICAgIGNoYXIgKmFyZ3NfcHRyOworIAorICMgaWZkZWYgX19FTVhfXyAvKiBpcyB0aGlz IG5lY2Vzc2FyeT8gKi8KKyAgICAgaWYgKCF1bml4eV9zaGVsbCkKK0BAIC0yODY1LDggKzI4NzEs MTcgQEAKKyAJcmV0dXJuIG5ld19hcmd2OworICAgICAgIH0KKyAKKysjaWZkZWYgTUFYX0FSR19T VFJMRU4KKysgICAgc3RhdGljIGNoYXIgZXZhbF9saW5lW10gPSAiZXZhbFxcIFxcXCJzZXRcXCB4 XFw7XFwgc2hpZnRcXDtcXCAiOworKyNkZWZpbmUgQVJHX05VTUJFUl9ESUdJVFMgNQorKyNkZWZp bmUgRVZBTF9MRU4gKHNpemVvZihldmFsX2xpbmUpLTEgKyBzaGVsbF9sZW4gKyA0ICAgICAgICAg ICAgICAgICAgIFwKKysgICAgICAgICAgICAgICAgICArICg3ICsgQVJHX05VTUJFUl9ESUdJVFMp ICogMiAqIGxpbmVfbGVuIC8gKE1BWF9BUkdfU1RSTEVOIC0gMikpCisrI2Vsc2UKKysjZGVmaW5l IEVWQUxfTEVOIDAKKysjZW5kaWYKKysKKyAgICAgbmV3X2xpbmUgPSBhbGxvY2EgKHNoZWxsX2xl biArIDEgKyBzZmxhZ3NfbGVuICsgMQorLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyAo bGluZV9sZW4qMikgKyAxKTsKKysgICAgICAgICAgICAgICAgICAgICAgICsgKGxpbmVfbGVuKjIp ICsgMSArIEVWQUxfTEVOKTsKKyAgICAgYXAgPSBuZXdfbGluZTsKKyAgICAgbWVtY3B5IChhcCwg c2hlbGwsIHNoZWxsX2xlbik7CisgICAgIGFwICs9IHNoZWxsX2xlbjsKK0BAIC0yODc1LDYgKzI4 OTAsMzAgQEAKKyAgICAgYXAgKz0gc2ZsYWdzX2xlbjsKKyAgICAgKihhcCsrKSA9ICcgJzsKKyAg ICAgY29tbWFuZF9wdHIgPSBhcDsKKysKKysjaWYgIWRlZmluZWQgKFdJTkRPV1MzMikgJiYgZGVm aW5lZCAoTUFYX0FSR19TVFJMRU4pCisrICAgIGlmICh1bml4eV9zaGVsbCAmJiBsaW5lX2xlbiA+ IE1BWF9BUkdfU1RSTEVOKQorKyAgICAgIHsKKysJdW5zaWduZWQgajsKKysJbWVtY3B5IChhcCwg ZXZhbF9saW5lLCBzaXplb2YgKGV2YWxfbGluZSkgLSAxKTsKKysJYXAgKz0gc2l6ZW9mIChldmFs X2xpbmUpIC0gMTsKKysJZm9yIChqID0gMTsgaiA8PSAyICogbGluZV9sZW4gLyAoTUFYX0FSR19T VFJMRU4gLSAyKTsgaisrKQorKwkgIGFwICs9IHNwcmludGYgKGFwLCAiXFwkXFx7JXVcXH0iLCBq KTsKKysJKmFwKysgPSAnXFwnOworKwkqYXArKyA9ICciJzsKKysJKmFwKysgPSAnICc7CisrCS8q IENvcHkgb25seSB0aGUgZmlyc3Qgd29yZCBvZiBTSEVMTCB0byAkMC4gICovCisrCWZvciAocCA9 IHNoZWxsOyAqcCAhPSAnXDAnOyArK3ApCisrCSAgeworKwkgICAgaWYgKGlzc3BhY2UgKCh1bnNp Z25lZCBjaGFyKSpwKSkKKysJICAgICAgYnJlYWs7CisrCSAgICAqYXArKyA9ICpwOworKwkgIH0K KysJKmFwKysgPSAnICc7CisrICAgICAgfQorKyNlbmRpZgorKyAgICBhcmdzX3B0ciA9IGFwOwor KworICAgICBmb3IgKHAgPSBsaW5lOyAqcCAhPSAnXDAnOyArK3ApCisgICAgICAgeworIAlpZiAo cmVzdHAgIT0gTlVMTCAmJiAqcCA9PSAnXG4nKQorQEAgLTI5MjIsNiArMjk2MSwxNCBAQAorICAg ICAgICAgICB9CisgI2VuZGlmCisgCSphcCsrID0gKnA7CisrCisrI2lmICFkZWZpbmVkIChXSU5E T1dTMzIpICYmIGRlZmluZWQgKE1BWF9BUkdfU1RSTEVOKQorKwlpZiAodW5peHlfc2hlbGwgJiYg bGluZV9sZW4gPiBNQVhfQVJHX1NUUkxFTiAmJiAoYXAgLSBhcmdzX3B0ciA+IE1BWF9BUkdfU1RS TEVOIC0gMikpCisrCSAgeworKwkgICAgKmFwKysgPSAnICc7CisrCSAgICBhcmdzX3B0ciA9IGFw OworKwkgIH0KKysjZW5kaWYKKyAgICAgICB9CisgICAgIGlmIChhcCA9PSBuZXdfbGluZSArIHNo ZWxsX2xlbiArIHNmbGFnc19sZW4gKyAyKQorICAgICAgIC8qIExpbmUgd2FzIGVtcHR5LiAgKi8K KwpkaWZmIC0tZ2l0IGEvVG9vbHMvZ3RrL3BhdGNoZXMvbWFrZS0zLjgyLXBhcmFsbGVsLWJ1aWxk LnBhdGNoIGIvVG9vbHMvZ3RrL3BhdGNoZXMvbWFrZS0zLjgyLXBhcmFsbGVsLWJ1aWxkLnBhdGNo Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmMwNTZjMmUKLS0tIC9kZXYvbnVs bAorKysgYi9Ub29scy9ndGsvcGF0Y2hlcy9tYWtlLTMuODItcGFyYWxsZWwtYnVpbGQucGF0Y2gK QEAgLTAsMCArMSwyNiBAQAorZGlmZiAtdSBtYWtlLTMuODItb3JpZy9yZW1ha2UuYyBtYWtlLTMu ODIvcmVtYWtlLmMKKy0tLSBtYWtlLTMuODItb3JpZy9yZW1ha2UuYwkyMDEwLTA3LTEzIDAzOjIw OjQyLjAwMDAwMDAwMCArMDIwMAorKysrIG1ha2UtMy44Mi9yZW1ha2UuYwkyMDEyLTAzLTIxIDEy OjQ3OjUyLjAwMDAwMDAwMCArMDEwMAorQEAgLTMwMSw3ICszMDEsNyBAQAorICAgICAgIC8qIENo ZWNrIGZvciB0aGUgY2FzZSB3aGVyZSBhIHRhcmdldCBoYXMgYmVlbiB0cmllZCBhbmQgZmFpbGVk IGJ1dAorICAgICAgICAgIHRoZSBkaWFnbm9zdGljcyBoYXNuJ3QgYmVlbiBpc3N1ZWQuIElmIHdl IG5lZWQgdGhlIGRpYWdub3N0aWNzCisgICAgICAgICAgdGhlbiB3ZSB3aWxsIGhhdmUgdG8gY29u dGludWUuICovCistICAgICAgaWYgKCEoZi0+dXBkYXRlZCAmJiBmLT51cGRhdGVfc3RhdHVzID4g MCAmJiAhZi0+ZG9udGNhcmUgJiYgZi0+bm9fZGlhZykpCisrICAgICAgaWYgKCEoZi0+dXBkYXRl ZCAmJiBmLT51cGRhdGVfc3RhdHVzID4gMCAmJiAhZi0+ZG9udGNhcmUgJiYgZi0+bm9fZGlhZykg JiYgZi0+Y29tbWFuZF9zdGF0ZSE9Y3Nfbm90X3N0YXJ0ZWQgKQorICAgICAgICAgeworICAgICAg ICAgICBEQkYgKERCX1ZFUkJPU0UsIF8oIlBydW5pbmcgZmlsZSBgJXMnLlxuIikpOworICAgICAg ICAgICByZXR1cm4gZi0+Y29tbWFuZF9zdGF0ZSA9PSBjc19maW5pc2hlZCA/IGYtPnVwZGF0ZV9z dGF0dXMgOiAwOworQEAgLTYxNCw2ICs2MTQsMTIgQEAKKyAgICAgICAgICAgICAgICAgZC0+Zmls ZS0+ZG9udGNhcmUgPSBmaWxlLT5kb250Y2FyZTsKKyAgICAgICAgICAgICAgIH0KKyAKKysJICAg IC8qIFdlIG1heSBoYXZlIGFscmVhZHkgZW5jb3VudGVyZWQgdGhpcyBmaWxlIGVhcmxpZXIgaW4g dGhlIHNhbWUKKysJICAgICAqIHBhc3MgYmVmb3JlIHdlIGtuZXcgd2UnZCBiZSB1cGRhdGluZyB0 aGlzIHRhcmdldC4gSW4gdGhhdCAKKysJICAgICAqIGNhc2UgY2FsbGluZyB1cGRhdGVfZmlsZSBu b3cgd291bGQgcmVzdWx0IGluIHRoZSBmaWxlIGJlaW5nIAorKwkgICAgICogaW5hcHByb3ByaWF0 ZWx5IHBydW5lZCBzbyB3ZSB0b2dnbGUgdGhlIGNvbnNpZGVyZWQgYml0IGJhY2sgCisrCSAgICAg KiBvZmYgZmlyc3QuICovCisrICAgICAgICAgICAgZC0+ZmlsZS0+Y29uc2lkZXJlZCA9ICFjb25z aWRlcmVkOworIAorIAkgICAgZGVwX3N0YXR1cyB8PSB1cGRhdGVfZmlsZSAoZC0+ZmlsZSwgZGVw dGgpOworIAorCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvcnVuLXdpdGgtamhidWlsZCBiL1Rvb2xz L2d0ay9ydW4td2l0aC1qaGJ1aWxkCmluZGV4IGZkZjZmMGYuLjlmZjAwMzQgMTAwNzU1Ci0tLSBh L1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkCisrKyBiL1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1 aWxkCkBAIC0yMiw2ICsyMiw2IEBAIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiAKIGpo YnVpbGRfd3JhcHBlciA9IGNvbW1vbi50b3BfbGV2ZWxfcGF0aCgnVG9vbHMnLCAnamhidWlsZCcs ICdqaGJ1aWxkLXdyYXBwZXInKQotcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oW2poYnVpbGRf d3JhcHBlciwgJy0tZ3RrJ10gKyBzeXMuYXJndlsxOl0pCitwcm9jZXNzID0gc3VicHJvY2Vzcy5Q b3BlbihbamhidWlsZF93cmFwcGVyLCAnLS1ndGsnLCAncnVuJ10gKyBzeXMuYXJndlsxOl0pCiBw cm9jZXNzLndhaXQoKQogc3lzLmV4aXQocHJvY2Vzcy5yZXR1cm5jb2RlKQpkaWZmIC0tZ2l0IGEv VG9vbHMvamhidWlsZC9qaGJ1aWxkLXdyYXBwZXIgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3Jh cHBlcgppbmRleCBhYzRkNzdjLi41YjQyM2ZlIDEwMDc1NQotLS0gYS9Ub29scy9qaGJ1aWxkL2po YnVpbGQtd3JhcHBlcgorKysgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGQtd3JhcHBlcgpAQCAtMTM1 LDYgKzEzNSw2IEBAIGV4Y2VwdCBWYWx1ZUVycm9yIGFzIGU6CiAgICAgc3lzLmV4aXQoZSkKIGVu c3VyZV9qaGJ1aWxkKCkKIAotcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oW2poYnVpbGRfcGF0 aCwgJy0tbm8taW50ZXJhY3QnLCAnLWYnLCB0b3BfbGV2ZWxfcGF0aCgnVG9vbHMnLCBwbGF0Zm9y bSwgJ2poYnVpbGRyYycpLCAncnVuJ10gKyBzeXMuYXJndlsyOl0pCitwcm9jZXNzID0gc3VicHJv Y2Vzcy5Qb3BlbihbamhidWlsZF9wYXRoLCAnLS1uby1pbnRlcmFjdCcsICctZicsIHRvcF9sZXZl bF9wYXRoKCdUb29scycsIHBsYXRmb3JtLCAnamhidWlsZHJjJyldICsgc3lzLmFyZ3ZbMjpdKQog cHJvY2Vzcy53YWl0KCkKIHN5cy5leGl0KHByb2Nlc3MucmV0dXJuY29kZSkK 133044 2012-03-21 08:17:47 -0700 2012-03-22 04:58:54 -0700 Updated patch to fix efl build wk-jhbuild-bootstrap2.diff text/plain 12122 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiNzg0 YmVkLi4wY2FjNDRlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsNDUgQEAKIDIwMTItMDMtMjEgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIEFkZCBib290c3RyYXAgamhi dWlsZCBtb2R1bGVzZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgxNzY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIGJvb3RzdHJhcC5tb2R1bGVzIHdpdGggR05VIG1ha2UgYW5kIGN1c3RvbSBwYXRj aGVzIHRvIGZpeAorICAgICAgICBzZXZlcmFsIGlzc3VlczoKKworICAgICAgICAgIC0gbWFrZS0z LjgyLWFyZy1saXN0LWxlbmd0aC5wYXRjaDogUGF0Y2ggYnkgUmFsZiBXaWxkZW5odWVzIHRvCisg ICAgICAgICAgICBmaXggdGhlIGFyZ3VtZW50IGxpc3QgbGltaXQgb2YgR05VIG1ha2Ugd2hlbiBy dW5uaW5nIG1ha2UKKyAgICAgICAgICAgIGRpc3RjaGVjay4KKyAgICAgICAgICAtIG1ha2UtMy44 Mi1wYXJhbGxlbC1idWlsZC5wYXRjaDogUGF0Y2ggYnkgS2FtaWwgTWllcnplamV3c2tpCisgICAg ICAgICAgICBhbmQgSmVyZW15IERldmVucG9ydCB0byBmaXggcGFyYWxsZWwgYnVpbGQgaXNzdWVz IHByZXNlbnQgaW4KKyAgICAgICAgICAgIEdOVSBtYWtlIDMuODIKKworICAgICAgICBqaGJ1aWxk IGJvb3RzdHJhcCBpcyBub3cgcnVuIGJlZm9yZSBqaGJ1aWxkIHJ1bi4KKworICAgICAgICAqIFNj cmlwdHMvdXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQ6IFJ1biBqaGJ1aWxkIGJvb3RzdHJhcAor ICAgICAgICBjb21tYW5kIGJlZm9yZSBidWlsZC4KKyAgICAgICAgKHJ1bkpoYnVpbGQpOiBIZWxw ZXIgZnVuY3Rpb24gdG8gcnVuIGpoYnVpbGQgd2l0aCBhIGdpdmVuIGNvbW1hbmQuCisgICAgICAg IEluc3RlYWQgb2YgcnVubmluZyBqaGJ1aWxkIGRpcmVjdGx5LCB1c2UgdGhlIGpoYnVpbGQtd3Jh cHBlciwgc28KKyAgICAgICAgdGhhdCB3ZSBkb24ndCBuZWVkIHRvIHJ1biBpdCBmaXJzdCB0byBj aGVjayB3aGV0aGVyIGpoYnVpbGQgaXMKKyAgICAgICAgaW5zdGFsbGVkIG9yIG5vdC4KKyAgICAg ICAgKiBlZmwvamhidWlsZHJjOiBTZXQgdXNlX2xvY2FsX21vZHVsZXNldHMgdG8gVHJ1ZSBhbmQg aW5pdGlhbGl6ZQorICAgICAgICBtb2R1bGVzZXRzX2Rpciwgc28gdGhhdCBqaGJ1aWxkIGJvb3Rz dHJhcCB1c2VzIHRoZSBsb2NhbCBib290c3RyYXAKKyAgICAgICAgbW9kdWxlc2V0IGlmIHByZXNl bnQuCisgICAgICAgICogZWZsL3J1bi13aXRoLWpoYnVpbGQ6IENhbGwgamhidWlsZC13cmFwcGVy IHdpdGggcnVuIGNvbW1hbmQuCisgICAgICAgICogZ3RrL2Jvb3RzdHJhcC5tb2R1bGVzOiBBZGRl ZC4gSXQgb25seSBhZGRzIEdOVSBtYWtlIHdpdGggY3VzdG9tCisgICAgICAgIHBhdGNoZXMgdG8g Zml4IHNldmVyYWwgaXNzdWVzLgorICAgICAgICAqIGd0ay9qaGJ1aWxkcmM6IFNldCB1c2VfbG9j YWxfbW9kdWxlc2V0cyB0byBUcnVlIGFuZCBpbml0aWFsaXplCisgICAgICAgIG1vZHVsZXNldHNf ZGlyLCBzbyB0aGF0IGpoYnVpbGQgYm9vdHN0cmFwIHVzZXMKKyAgICAgICAgZ3RrL2Jvb3RzdHJh cC5tb2R1bGVzLgorICAgICAgICAqIGd0ay9wYXRjaGVzL21ha2UtMy44Mi1hcmctbGlzdC1sZW5n dGgucGF0Y2g6IEFkZGVkLgorICAgICAgICAqIGd0ay9wYXRjaGVzL21ha2UtMy44Mi1wYXJhbGxl bC1idWlsZC5wYXRjaDogQWRkZWQuCisgICAgICAgICogZ3RrL3J1bi13aXRoLWpoYnVpbGQ6IENh bGwgamhidWlsZC13cmFwcGVyIHdpdGggcnVuIGNvbW1hbmQuCisgICAgICAgICogamhidWlsZC9q aGJ1aWxkLXdyYXBwZXI6IEFsbG93IHRvIGV4ZWN1dGUgYW55IGpoYnVpbGQgY29tbWFuZCwKKyAg ICAgICAgbm90IG9ubHkgcnVuLgorCisyMDEyLTAzLTIxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAg PGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBBbGxvdyBydW5uaW5nIGphdmFz Y3JpcHQgZnJvbSBsb2NhdGlvbiBiYXIgaW4gTWluaUJyb3dzZXIKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMzMxCiAKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQgYi9Ub29scy9TY3JpcHRzL3VwZGF0 ZS13ZWJraXQtbGlicy1qaGJ1aWxkCmluZGV4IDdlMjQ0MGEuLjZkZmI0ZWIgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQKKysrIGIvVG9vbHMvU2Ny aXB0cy91cGRhdGUtd2Via2l0LWxpYnMtamhidWlsZApAQCAtNDEsMjEgKzQxLDIzIEBAIGlmICgh JGdldE9wdGlvbnNSZXN1bHQpIHsKICAgICB9CiB9CiAKK3N1YiBydW5KaGJ1aWxkCit7CisgICAg bXkgJGNvbW1hbmQgPSBzaGlmdDsKKyAgICBteSBAamhidWlsZEFyZ3MgPSAoIi4vamhidWlsZC13 cmFwcGVyIiwgIi0tIi4kcGxhdGZvcm0sICRjb21tYW5kKTsKKyAgICBwdXNoKEBqaGJ1aWxkQXJn cywgQEFSR1ZbMi4uLTFdKTsKKyAgICBzeXN0ZW0oQGpoYnVpbGRBcmdzKSA9PSAwIG9yIGRpZSAi UnVubmluZyBqaGJ1aWxkLXdyYXBwZXIgIiAuICRjb21tYW5kIC4gIiBmYWlsZWQuXG4iOworfQor CiBkZWxldGUgJEVOVntBUl9GTEFHU30gaWYgZXhpc3RzICRFTlZ7QVJfRkxBR1N9OwogCiBjaGRp cihyZWxhdGl2ZVNjcmlwdHNEaXIoKSAuICIvLi4vamhidWlsZCIpIG9yIGRpZSAkITsKIAotbXkg QGVuc3VyZUpoYnVpbGRBcmdzID0gKCIuL2poYnVpbGQtd3JhcHBlciIsICItLSIuJHBsYXRmb3Jt LCAiZWNobyIsICJFbnN1cmVkIGpoYnVpbGQgc2V0dXAuIik7Ci1pZiAoc3lzdGVtKEBlbnN1cmVK aGJ1aWxkQXJncykgIT0gMCkgewotICAgIGRpZSAiRmFpbGVkIHRvIGVuc3VyZSBqaGJ1aWxkIGlu c3RhbGxlZC5cbiI7Ci19Ci0KLWNoZGlyKHJlbGF0aXZlU2NyaXB0c0RpcigpIC4gIi8uLi8iLiRw bGF0Zm9ybSkgb3IgZGllICQhOwotCiBteSAlcHJldHR5UGxhdGZvcm0gPSAoICJlZmwiID0+ICJF RkwiLCAiZ3RrIiA9PiAiR1RLKyIgKTsKLXByaW50ICJVcGRhdGluZyAiIC4gJHByZXR0eVBsYXRm b3JteyRwbGF0Zm9ybX0gLiAiIHBvcnQgZGVwZW5kZW5jaWVzIHVzaW5nIGpoYnVpbGQuLi5cbiI7 Ci1teSBAamhidWlsZEFyZ3MgPSAoIi4uLy4uL1dlYktpdEJ1aWxkL0RlcGVuZGVuY2llcy9Sb290 L2Jpbi9qaGJ1aWxkIiwgIi0tbm8taW50ZXJhY3QiLCAiLWYiLCAiamhidWlsZHJjIik7Ci1wdXNo KEBqaGJ1aWxkQXJncywgQEFSR1ZbMi4uLTFdKTsKLWlmIChzeXN0ZW0oQGpoYnVpbGRBcmdzKSAh PSAwKSB7Ci0gICAgZGllICJSdW5uaW5nIGpoYnVpbGQgZmFpbGVkLlxuIgorbXkgJGJvb3RzdHJh cFBhdGggPSByZWxhdGl2ZVNjcmlwdHNEaXIoKSAuICIvLi4vIiAuICRwbGF0Zm9ybSAuICIvYm9v dHN0cmFwLm1vZHVsZXMiOworaWYgKC1lICRib290c3RyYXBQYXRoKSB7CisgICAgcHJpbnQgIlVw ZGF0aW5nICIgLiAkcHJldHR5UGxhdGZvcm17JHBsYXRmb3JtfSAuICIgcG9ydCByZXF1aXJlZCBz dXBwb3J0IHRvb2xzIHVzaW5nIGpoYnVpbGQuLi5cbiI7CisgICAgcnVuSmhidWlsZCgiYm9vdHN0 cmFwIik7CiB9CitwcmludCAiVXBkYXRpbmcgIiAuICRwcmV0dHlQbGF0Zm9ybXskcGxhdGZvcm19 IC4gIiBwb3J0IGRlcGVuZGVuY2llcyB1c2luZyBqaGJ1aWxkLi4uXG4iOworcnVuSmhidWlsZCgi YnVpbGQiKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL2VmbC9qaGJ1aWxkcmMgYi9Ub29scy9lZmwvamhi dWlsZHJjCmluZGV4IGFkOTZlYTMuLjlhMmZlMzkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2VmbC9qaGJ1 aWxkcmMKKysrIGIvVG9vbHMvZWZsL2poYnVpbGRyYwpAQCAtMjMsNiArMjMsOCBAQCBfX2VmbF90 b29sc19kaXJlY3RvcnkgPSBvcy5wYXRoLmFic3BhdGgob3MucGF0aC5kaXJuYW1lKF9fZmlsZV9f KSkKIHN5cy5wYXRoLmFwcGVuZChfX2VmbF90b29sc19kaXJlY3RvcnkpCiBpbXBvcnQgY29tbW9u CiAKK3VzZV9sb2NhbF9tb2R1bGVzZXRzID0gVHJ1ZQorbW9kdWxlc2V0c19kaXIgPSBfX2VmbF90 b29sc19kaXJlY3RvcnkKIGJ1aWxkX3BvbGljeSA9ICd1cGRhdGVkJwogCiAjIEZJWE1FOiBtb3Zl IHNoYXJlZCBwYXJ0cyBpbnRvIC4uL2poYnVpbGQgZm9sZGVyLgpkaWZmIC0tZ2l0IGEvVG9vbHMv ZWZsL3J1bi13aXRoLWpoYnVpbGQgYi9Ub29scy9lZmwvcnVuLXdpdGgtamhidWlsZAppbmRleCA2 MjQxOTFhLi44Y2RlN2RhIDEwMDc1NQotLS0gYS9Ub29scy9lZmwvcnVuLXdpdGgtamhidWlsZAor KysgYi9Ub29scy9lZmwvcnVuLXdpdGgtamhidWlsZApAQCAtMjEsNiArMjEsNiBAQCBpbXBvcnQg c3VicHJvY2VzcwogaW1wb3J0IHN5cwogCiBqaGJ1aWxkX3dyYXBwZXIgPSBjb21tb24udG9wX2xl dmVsX3BhdGgoJ1Rvb2xzJywgJ2poYnVpbGQnLCAnamhidWlsZC13cmFwcGVyJykKLXByb2Nlc3Mg PSBzdWJwcm9jZXNzLlBvcGVuKFtqaGJ1aWxkX3dyYXBwZXIsICctLWVmbCddICsgc3lzLmFyZ3Zb MTpdKQorcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oW2poYnVpbGRfd3JhcHBlciwgJy0tZWZs JywgJ3J1biddICsgc3lzLmFyZ3ZbMTpdKQogcHJvY2Vzcy53YWl0KCkKIHN5cy5leGl0KHByb2Nl c3MucmV0dXJuY29kZSkKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9ib290c3RyYXAubW9kdWxlcyBi L1Rvb2xzL2d0ay9ib290c3RyYXAubW9kdWxlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi5lZGJhMTJmCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvZ3RrL2Jvb3RzdHJhcC5t b2R1bGVzCkBAIC0wLDAgKzEsMjQgQEAKKzw/eG1sIHZlcnNpb249IjEuMCI/PgorPCFET0NUWVBF IG1vZHVsZXNldCBTWVNURU0gIm1vZHVsZXNldC5kdGQiPgorPD94bWwtc3R5bGVzaGVldCB0eXBl PSJ0ZXh0L3hzbCIgaHJlZj0ibW9kdWxlc2V0LnhzbCI/PgorPG1vZHVsZXNldD4KKworICA8bWV0 YW1vZHVsZSBpZD0ibWV0YS1ib290c3RyYXAiPgorICAgIDxkZXBlbmRlbmNpZXM+CisgICAgICA8 ZGVwIHBhY2thZ2U9Im1ha2UiLz4KKyAgICA8L2RlcGVuZGVuY2llcz4KKyAgPC9tZXRhbW9kdWxl PgorCisgIDxyZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwiIG5hbWU9ImZ0cC5nbnUub3JnIgorICAg ICAgaHJlZj0iZnRwOi8vZnRwLmdudS5vcmcvZ251LyIvPgorCisgIDxhdXRvdG9vbHMgaWQ9Im1h a2UiIGF1dG9nZW4tc2g9ImNvbmZpZ3VyZSI+CisgICAgPGJyYW5jaCByZXBvPSJmdHAuZ251Lm9y ZyIKKyAgICAgICAgICAgIG1vZHVsZT0ibWFrZS9tYWtlLTMuODIudGFyLmJ6MiIgdmVyc2lvbj0i My44MiIKKyAgICAgICAgICAgIHNpemU9IjEyNDIxODYiIG1kNXN1bT0iMWExMTEwMGYzYzYzZmNm NTc1MzgxOGU1OWQ2MzA4OGYiPgorICAgICAgPHBhdGNoIGZpbGU9Im1ha2UtMy44Mi1hcmctbGlz dC1sZW5ndGgucGF0Y2giIHN0cmlwPSIxIi8+CisgICAgICA8cGF0Y2ggZmlsZT0ibWFrZS0zLjgy LXBhcmFsbGVsLWJ1aWxkLnBhdGNoIiBzdHJpcD0iMSIvPgorICAgIDwvYnJhbmNoPgorICA8L2F1 dG90b29scz4KKworPC9tb2R1bGVzZXQ+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZm IC0tZ2l0IGEvVG9vbHMvZ3RrL2poYnVpbGRyYyBiL1Rvb2xzL2d0ay9qaGJ1aWxkcmMKaW5kZXgg MzI0OGI2Yi4uODI5NjExMyAxMDA2NDQKLS0tIGEvVG9vbHMvZ3RrL2poYnVpbGRyYworKysgYi9U b29scy9ndGsvamhidWlsZHJjCkBAIC0yMiw2ICsyMiw4IEBAIF9fZ3RrX3Rvb2xzX2RpcmVjdG9y eSA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pKQogc3lzLnBhdGgu YXBwZW5kKF9fZ3RrX3Rvb2xzX2RpcmVjdG9yeSkKIGltcG9ydCBjb21tb24KIAordXNlX2xvY2Fs X21vZHVsZXNldHMgPSBUcnVlCittb2R1bGVzZXRzX2RpciA9IF9fZ3RrX3Rvb2xzX2RpcmVjdG9y eQogYnVpbGRfcG9saWN5ID0gJ3VwZGF0ZWQnCiAKIF9fbW9kdWxlc2V0X2ZpbGVfdXJpID0gJ2Zp bGU6Ly8nICsgb3MucGF0aC5qb2luKF9fZ3RrX3Rvb2xzX2RpcmVjdG9yeSwgJ2poYnVpbGQubW9k dWxlcycpCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvcGF0Y2hlcy9tYWtlLTMuODItYXJnLWxpc3Qt bGVuZ3RoLnBhdGNoIGIvVG9vbHMvZ3RrL3BhdGNoZXMvbWFrZS0zLjgyLWFyZy1saXN0LWxlbmd0 aC5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lODM1MTI4Ci0tLSAv ZGV2L251bGwKKysrIGIvVG9vbHMvZ3RrL3BhdGNoZXMvbWFrZS0zLjgyLWFyZy1saXN0LWxlbmd0 aC5wYXRjaApAQCAtMCwwICsxLDEwNCBAQAorZGlmZiAtdSBtYWtlLTMuODItb3JpZy9jb25maWd1 cmUuaW4gbWFrZS0zLjgyL2NvbmZpZ3VyZS5pbgorLS0tIG1ha2UtMy44Mi1vcmlnL2NvbmZpZ3Vy ZS5pbgkyMDEwLTA3LTI4IDA3OjM5OjUwLjAwMDAwMDAwMCArMDIwMAorKysrIG1ha2UtMy44Mi9j b25maWd1cmUuaW4JMjAxMi0wMy0yMSAxMjozNDoyMC4wMDAwMDAwMDAgKzAxMDAKK0BAIC02NCw3 ICs2NCw4IEBACisgQUNfSEVBREVSX1NUQVQKKyBBQ19IRUFERVJfVElNRQorIEFDX0NIRUNLX0hF QURFUlMoc3RkbGliLmggbG9jYWxlLmggdW5pc3RkLmggbGltaXRzLmggZmNudGwuaCBzdHJpbmcu aCBcCistCQkgbWVtb3J5Lmggc3lzL3BhcmFtLmggc3lzL3Jlc291cmNlLmggc3lzL3RpbWUuaCBz eXMvdGltZWIuaCkKKysJCSBtZW1vcnkuaCBzeXMvcGFyYW0uaCBzeXMvcmVzb3VyY2UuaCBzeXMv dGltZS5oIHN5cy90aW1lYi5oIFwKKysJCSBzeXMvdXNlci5oIGxpbnV4L2JpbmZtdHMuaCkKKyAK KyAjIFNldCBhIGZsYWcgaWYgd2UgaGF2ZSBhbiBBTlNJIEMgY29tcGlsZXIKKyBpZiB0ZXN0ICIk YWNfY3ZfcHJvZ19jY19zdGRjIiAhPSBubzsgdGhlbgorU3ViZGlyZWN0b3Jpb3MgY29tdW5lczog bWFrZS0zLjgyLW9yaWcvZG9jIHkgbWFrZS0zLjgyL2RvYworU3ViZGlyZWN0b3Jpb3MgY29tdW5l czogbWFrZS0zLjgyLW9yaWcvZ2xvYiB5IG1ha2UtMy44Mi9nbG9iCitkaWZmIC11IG1ha2UtMy44 Mi1vcmlnL2pvYi5jIG1ha2UtMy44Mi9qb2IuYworLS0tIG1ha2UtMy44Mi1vcmlnL2pvYi5jCTIw MTAtMDctMjQgMTA6Mjc6NTAuMDAwMDAwMDAwICswMjAwCisrKysgbWFrZS0zLjgyL2pvYi5jCTIw MTItMDMtMjEgMTI6MzQ6MjAuMDAwMDAwMDAwICswMTAwCitAQCAtMjksNiArMjksMTEgQEAKKyAK KyAjaW5jbHVkZSA8c3RyaW5nLmg+CisgCisrI2lmIGRlZmluZWQgKEhBVkVfTElOVVhfQklORk1U U19IKSAmJiBkZWZpbmVkIChIQVZFX1NZU19VU0VSX0gpCisrI2luY2x1ZGUgPHN5cy91c2VyLmg+ CisrI2luY2x1ZGUgPGxpbnV4L2JpbmZtdHMuaD4KKysjZW5kaWYKKysKKyAvKiBEZWZhdWx0IHNo ZWxsIHRvIHVzZS4gICovCisgI2lmZGVmIFdJTkRPV1MzMgorICNpbmNsdWRlIDx3aW5kb3dzLmg+ CitAQCAtMjc5NSw2ICsyODAwLDcgQEAKKyAgICAgdW5zaWduZWQgaW50IHNmbGFnc19sZW4gPSBz dHJsZW4gKHNoZWxsZmxhZ3MpOworICAgICBjaGFyICpjb21tYW5kX3B0ciA9IE5VTEw7IC8qIHVz ZWQgZm9yIGJhdGNoX21vZGVfc2hlbGwgbW9kZSAqLworICAgICBjaGFyICpuZXdfbGluZTsKKysg ICAgY2hhciAqYXJnc19wdHI7CisgCisgIyBpZmRlZiBfX0VNWF9fIC8qIGlzIHRoaXMgbmVjZXNz YXJ5PyAqLworICAgICBpZiAoIXVuaXh5X3NoZWxsKQorQEAgLTI4NjUsOCArMjg3MSwxNyBAQAor IAlyZXR1cm4gbmV3X2FyZ3Y7CisgICAgICAgfQorIAorKyNpZmRlZiBNQVhfQVJHX1NUUkxFTgor KyAgICBzdGF0aWMgY2hhciBldmFsX2xpbmVbXSA9ICJldmFsXFwgXFxcInNldFxcIHhcXDtcXCBz aGlmdFxcO1xcICI7CisrI2RlZmluZSBBUkdfTlVNQkVSX0RJR0lUUyA1CisrI2RlZmluZSBFVkFM X0xFTiAoc2l6ZW9mKGV2YWxfbGluZSktMSArIHNoZWxsX2xlbiArIDQgICAgICAgICAgICAgICAg ICAgXAorKyAgICAgICAgICAgICAgICAgICsgKDcgKyBBUkdfTlVNQkVSX0RJR0lUUykgKiAyICog bGluZV9sZW4gLyAoTUFYX0FSR19TVFJMRU4gLSAyKSkKKysjZWxzZQorKyNkZWZpbmUgRVZBTF9M RU4gMAorKyNlbmRpZgorKworICAgICBuZXdfbGluZSA9IGFsbG9jYSAoc2hlbGxfbGVuICsgMSAr IHNmbGFnc19sZW4gKyAxCistICAgICAgICAgICAgICAgICAgICAgICAgICAgICArIChsaW5lX2xl bioyKSArIDEpOworKyAgICAgICAgICAgICAgICAgICAgICAgKyAobGluZV9sZW4qMikgKyAxICsg RVZBTF9MRU4pOworICAgICBhcCA9IG5ld19saW5lOworICAgICBtZW1jcHkgKGFwLCBzaGVsbCwg c2hlbGxfbGVuKTsKKyAgICAgYXAgKz0gc2hlbGxfbGVuOworQEAgLTI4NzUsNiArMjg5MCwzMCBA QAorICAgICBhcCArPSBzZmxhZ3NfbGVuOworICAgICAqKGFwKyspID0gJyAnOworICAgICBjb21t YW5kX3B0ciA9IGFwOworKworKyNpZiAhZGVmaW5lZCAoV0lORE9XUzMyKSAmJiBkZWZpbmVkIChN QVhfQVJHX1NUUkxFTikKKysgICAgaWYgKHVuaXh5X3NoZWxsICYmIGxpbmVfbGVuID4gTUFYX0FS R19TVFJMRU4pCisrICAgICAgeworKwl1bnNpZ25lZCBqOworKwltZW1jcHkgKGFwLCBldmFsX2xp bmUsIHNpemVvZiAoZXZhbF9saW5lKSAtIDEpOworKwlhcCArPSBzaXplb2YgKGV2YWxfbGluZSkg LSAxOworKwlmb3IgKGogPSAxOyBqIDw9IDIgKiBsaW5lX2xlbiAvIChNQVhfQVJHX1NUUkxFTiAt IDIpOyBqKyspCisrCSAgYXAgKz0gc3ByaW50ZiAoYXAsICJcXCRcXHsldVxcfSIsIGopOworKwkq YXArKyA9ICdcXCc7CisrCSphcCsrID0gJyInOworKwkqYXArKyA9ICcgJzsKKysJLyogQ29weSBv bmx5IHRoZSBmaXJzdCB3b3JkIG9mIFNIRUxMIHRvICQwLiAgKi8KKysJZm9yIChwID0gc2hlbGw7 ICpwICE9ICdcMCc7ICsrcCkKKysJICB7CisrCSAgICBpZiAoaXNzcGFjZSAoKHVuc2lnbmVkIGNo YXIpKnApKQorKwkgICAgICBicmVhazsKKysJICAgICphcCsrID0gKnA7CisrCSAgfQorKwkqYXAr KyA9ICcgJzsKKysgICAgICB9CisrI2VuZGlmCisrICAgIGFyZ3NfcHRyID0gYXA7CisrCisgICAg IGZvciAocCA9IGxpbmU7ICpwICE9ICdcMCc7ICsrcCkKKyAgICAgICB7CisgCWlmIChyZXN0cCAh PSBOVUxMICYmICpwID09ICdcbicpCitAQCAtMjkyMiw2ICsyOTYxLDE0IEBACisgICAgICAgICAg IH0KKyAjZW5kaWYKKyAJKmFwKysgPSAqcDsKKysKKysjaWYgIWRlZmluZWQgKFdJTkRPV1MzMikg JiYgZGVmaW5lZCAoTUFYX0FSR19TVFJMRU4pCisrCWlmICh1bml4eV9zaGVsbCAmJiBsaW5lX2xl biA+IE1BWF9BUkdfU1RSTEVOICYmIChhcCAtIGFyZ3NfcHRyID4gTUFYX0FSR19TVFJMRU4gLSAy KSkKKysJICB7CisrCSAgICAqYXArKyA9ICcgJzsKKysJICAgIGFyZ3NfcHRyID0gYXA7CisrCSAg fQorKyNlbmRpZgorICAgICAgIH0KKyAgICAgaWYgKGFwID09IG5ld19saW5lICsgc2hlbGxfbGVu ICsgc2ZsYWdzX2xlbiArIDIpCisgICAgICAgLyogTGluZSB3YXMgZW1wdHkuICAqLworCmRpZmYg LS1naXQgYS9Ub29scy9ndGsvcGF0Y2hlcy9tYWtlLTMuODItcGFyYWxsZWwtYnVpbGQucGF0Y2gg Yi9Ub29scy9ndGsvcGF0Y2hlcy9tYWtlLTMuODItcGFyYWxsZWwtYnVpbGQucGF0Y2gKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzA1NmMyZQotLS0gL2Rldi9udWxsCisrKyBi L1Rvb2xzL2d0ay9wYXRjaGVzL21ha2UtMy44Mi1wYXJhbGxlbC1idWlsZC5wYXRjaApAQCAtMCww ICsxLDI2IEBACitkaWZmIC11IG1ha2UtMy44Mi1vcmlnL3JlbWFrZS5jIG1ha2UtMy44Mi9yZW1h a2UuYworLS0tIG1ha2UtMy44Mi1vcmlnL3JlbWFrZS5jCTIwMTAtMDctMTMgMDM6MjA6NDIuMDAw MDAwMDAwICswMjAwCisrKysgbWFrZS0zLjgyL3JlbWFrZS5jCTIwMTItMDMtMjEgMTI6NDc6NTIu MDAwMDAwMDAwICswMTAwCitAQCAtMzAxLDcgKzMwMSw3IEBACisgICAgICAgLyogQ2hlY2sgZm9y IHRoZSBjYXNlIHdoZXJlIGEgdGFyZ2V0IGhhcyBiZWVuIHRyaWVkIGFuZCBmYWlsZWQgYnV0Cisg ICAgICAgICAgdGhlIGRpYWdub3N0aWNzIGhhc24ndCBiZWVuIGlzc3VlZC4gSWYgd2UgbmVlZCB0 aGUgZGlhZ25vc3RpY3MKKyAgICAgICAgICB0aGVuIHdlIHdpbGwgaGF2ZSB0byBjb250aW51ZS4g Ki8KKy0gICAgICBpZiAoIShmLT51cGRhdGVkICYmIGYtPnVwZGF0ZV9zdGF0dXMgPiAwICYmICFm LT5kb250Y2FyZSAmJiBmLT5ub19kaWFnKSkKKysgICAgICBpZiAoIShmLT51cGRhdGVkICYmIGYt PnVwZGF0ZV9zdGF0dXMgPiAwICYmICFmLT5kb250Y2FyZSAmJiBmLT5ub19kaWFnKSAmJiBmLT5j b21tYW5kX3N0YXRlIT1jc19ub3Rfc3RhcnRlZCApCisgICAgICAgICB7CisgICAgICAgICAgIERC RiAoREJfVkVSQk9TRSwgXygiUHJ1bmluZyBmaWxlIGAlcycuXG4iKSk7CisgICAgICAgICAgIHJl dHVybiBmLT5jb21tYW5kX3N0YXRlID09IGNzX2ZpbmlzaGVkID8gZi0+dXBkYXRlX3N0YXR1cyA6 IDA7CitAQCAtNjE0LDYgKzYxNCwxMiBAQAorICAgICAgICAgICAgICAgICBkLT5maWxlLT5kb250 Y2FyZSA9IGZpbGUtPmRvbnRjYXJlOworICAgICAgICAgICAgICAgfQorIAorKwkgICAgLyogV2Ug bWF5IGhhdmUgYWxyZWFkeSBlbmNvdW50ZXJlZCB0aGlzIGZpbGUgZWFybGllciBpbiB0aGUgc2Ft ZQorKwkgICAgICogcGFzcyBiZWZvcmUgd2Uga25ldyB3ZSdkIGJlIHVwZGF0aW5nIHRoaXMgdGFy Z2V0LiBJbiB0aGF0IAorKwkgICAgICogY2FzZSBjYWxsaW5nIHVwZGF0ZV9maWxlIG5vdyB3b3Vs ZCByZXN1bHQgaW4gdGhlIGZpbGUgYmVpbmcgCisrCSAgICAgKiBpbmFwcHJvcHJpYXRlbHkgcHJ1 bmVkIHNvIHdlIHRvZ2dsZSB0aGUgY29uc2lkZXJlZCBiaXQgYmFjayAKKysJICAgICAqIG9mZiBm aXJzdC4gKi8KKysgICAgICAgICAgICBkLT5maWxlLT5jb25zaWRlcmVkID0gIWNvbnNpZGVyZWQ7 CisgCisgCSAgICBkZXBfc3RhdHVzIHw9IHVwZGF0ZV9maWxlIChkLT5maWxlLCBkZXB0aCk7Cisg CisKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkIGIvVG9vbHMvZ3RrL3J1 bi13aXRoLWpoYnVpbGQKaW5kZXggZmRmNmYwZi4uOWZmMDAzNCAxMDA3NTUKLS0tIGEvVG9vbHMv Z3RrL3J1bi13aXRoLWpoYnVpbGQKKysrIGIvVG9vbHMvZ3RrL3J1bi13aXRoLWpoYnVpbGQKQEAg LTIyLDYgKzIyLDYgQEAgaW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCBzeXMKIAogamhidWlsZF93 cmFwcGVyID0gY29tbW9uLnRvcF9sZXZlbF9wYXRoKCdUb29scycsICdqaGJ1aWxkJywgJ2poYnVp bGQtd3JhcHBlcicpCi1wcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3BlbihbamhidWlsZF93cmFwcGVy LCAnLS1ndGsnXSArIHN5cy5hcmd2WzE6XSkKK3Byb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFtq aGJ1aWxkX3dyYXBwZXIsICctLWd0aycsICdydW4nXSArIHN5cy5hcmd2WzE6XSkKIHByb2Nlc3Mu d2FpdCgpCiBzeXMuZXhpdChwcm9jZXNzLnJldHVybmNvZGUpCmRpZmYgLS1naXQgYS9Ub29scy9q aGJ1aWxkL2poYnVpbGQtd3JhcHBlciBiL1Rvb2xzL2poYnVpbGQvamhidWlsZC13cmFwcGVyCmlu ZGV4IGFjNGQ3N2MuLjViNDIzZmUgMTAwNzU1Ci0tLSBhL1Rvb2xzL2poYnVpbGQvamhidWlsZC13 cmFwcGVyCisrKyBiL1Rvb2xzL2poYnVpbGQvamhidWlsZC13cmFwcGVyCkBAIC0xMzUsNiArMTM1 LDYgQEAgZXhjZXB0IFZhbHVlRXJyb3IgYXMgZToKICAgICBzeXMuZXhpdChlKQogZW5zdXJlX2po YnVpbGQoKQogCi1wcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3BlbihbamhidWlsZF9wYXRoLCAnLS1u by1pbnRlcmFjdCcsICctZicsIHRvcF9sZXZlbF9wYXRoKCdUb29scycsIHBsYXRmb3JtLCAnamhi dWlsZHJjJyksICdydW4nXSArIHN5cy5hcmd2WzI6XSkKK3Byb2Nlc3MgPSBzdWJwcm9jZXNzLlBv cGVuKFtqaGJ1aWxkX3BhdGgsICctLW5vLWludGVyYWN0JywgJy1mJywgdG9wX2xldmVsX3BhdGgo J1Rvb2xzJywgcGxhdGZvcm0sICdqaGJ1aWxkcmMnKV0gKyBzeXMuYXJndlsyOl0pCiBwcm9jZXNz LndhaXQoKQogc3lzLmV4aXQocHJvY2Vzcy5yZXR1cm5jb2RlKQo= 133224 2012-03-22 04:58:54 -0700 2012-03-22 11:28:41 -0700 New patch wk-jhbuild-bootstrap.diff text/plain 9156 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0ZDg0 ZTQ2Li4wOWE5YjM0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMzQgQEAKIDIwMTItMDMtMjIgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIEFkZCBib290c3RyYXAgamhi dWlsZCBtb2R1bGVzZXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgxNzY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIGJvb3RzdHJhcC5tb2R1bGVzIHdpdGggR05VIG1ha2UgYW5kIGN1c3RvbSBwYXRj aGVzIHRvIGZpeAorICAgICAgICBzZXZlcmFsIGlzc3VlczoKKworICAgICAgICAtIG1ha2UtMy44 Mi1hcmctbGlzdC1sZW5ndGgucGF0Y2g6IFBhdGNoIGJ5IFJhbGYgV2lsZGVuaHVlcyB0bworICAg ICAgICAgIGZpeCB0aGUgYXJndW1lbnQgbGlzdCBsaW1pdCBvZiBHTlUgbWFrZSB3aGVuIHJ1bm5p bmcgbWFrZQorICAgICAgICAgIGRpc3RjaGVjay4KKyAgICAgICAgLSBtYWtlLTMuODItcGFyYWxs ZWwtYnVpbGQucGF0Y2g6IFBhdGNoIGJ5IEthbWlsIE1pZXJ6ZWpld3NraQorICAgICAgICAgIGFu ZCBKZXJlbXkgRGV2ZW5wb3J0IHRvIGZpeCBwYXJhbGxlbCBidWlsZCBpc3N1ZXMgcHJlc2VudCBp bgorICAgICAgICAgIEdOVSBtYWtlIDMuODIKKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0 L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CisgICAgICAgIChJbnN0YWxsR3Rr U3VwcG9ydFRvb2xzKTogUnVuIGpoYnVpbGQgYm9vdHN0cmFwIHRvIGluc3RhbGwgdGhlCisgICAg ICAgIHJlcXVpcmVkIHN1cHBvcnQgdG9vbHMuCisgICAgICAgIChGYWN0b3J5Ll9faW5pdF9fKTog QWRkIGEgbmV3IHN0ZXAgdG8gaW5zdGFsbCByZXF1aXJlZCBzdXBwb3J0CisgICAgICAgIHRvb2xz IGJlZm9yZSBpbnN0YWxsaW5nIHRoZSBHVEsgZGVwZW5kZW5jaWVzLgorICAgICAgICAqIGd0ay9i b290c3RyYXAubW9kdWxlczogQWRkZWQuCisgICAgICAgICogZ3RrL2poYnVpbGRyYzogU2V0IHVz ZV9sb2NhbF9tb2R1bGVzZXRzIHRvIFRydWUgYW5kIGluaXRpYWxpemUKKyAgICAgICAgbW9kdWxl c2V0c19kaXIsIHNvIHRoYXQgamhidWlsZCBib290c3RyYXAgdXNlcworICAgICAgICBndGsvYm9v dHN0cmFwLm1vZHVsZXMuCisgICAgICAgICogZ3RrL3BhdGNoZXMvbWFrZS0zLjgyLWFyZy1saXN0 LWxlbmd0aC5wYXRjaDogQWRkZWQuCisgICAgICAgICogZ3RrL3BhdGNoZXMvbWFrZS0zLjgyLXBh cmFsbGVsLWJ1aWxkLnBhdGNoOiBBZGRlZC4KKworMjAxMi0wMy0yMiAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10gQWxsb3cgdG8gcnVu IGFueSBqaGJ1aWxkIGNvbW1hbmQgd2l0aCBqaGJ1aWxkLXdyYXBwZXIgc2NyaXB0CiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTg4OAogCmRpZmYgLS1n aXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0 ZXIuY2ZnIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv bWFzdGVyLmNmZwppbmRleCAyMjIxNGFiLi5lZWNjMDIxIDEwMDY0NAotLS0gYS9Ub29scy9CdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCisrKyBiL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcK QEAgLTEzNiw2ICsxMzYsMTMgQEAgY2xhc3MgSW5zdGFsbEVmbERlcGVuZGVuY2llcyhzaGVsbC5T aGVsbENvbW1hbmQpOgogICAgIGNvbW1hbmQgPSBbInBlcmwiLCAiLi9Ub29scy9TY3JpcHRzL3Vw ZGF0ZS13ZWJraXRlZmwtbGlicyJdCiAgICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKIAorY2xhc3Mg SW5zdGFsbEd0a1N1cHBvcnRUb29scyhzaGVsbC5TaGVsbENvbW1hbmQpOgorICAgIG5hbWUgPSAi amhidWlsZCIKKyAgICBkZXNjcmlwdGlvbiA9IFsidXBkYXRpbmcgZ3RrIHJlcXVpcmVkIHN1cHBv cnQgdG9vbHMiXQorICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsidXBkYXRlZCBndGsgcmVxdWlyZWQg c3VwcG9ydCB0b29scyJdCisgICAgY29tbWFuZCA9IFsicHl0aG9uIiwgIi4vVG9vbHMvamhidWls ZC9qaGJ1aWxkLXdyYXBwZXIiLCAiLS1ndGsiLCAiYm9vdHN0cmFwIl0KKyAgICBoYWx0T25GYWls dXJlID0gVHJ1ZQorCiBjbGFzcyBJbnN0YWxsR3RrRGVwZW5kZW5jaWVzKHNoZWxsLlNoZWxsQ29t bWFuZCk6CiAgICAgbmFtZSA9ICJqaGJ1aWxkIgogICAgIGRlc2NyaXB0aW9uID0gWyJ1cGRhdGlu ZyBndGsgZGVwZW5kZW5jaWVzIl0KQEAgLTcwNSw2ICs3MTIsNyBAQCBjbGFzcyBGYWN0b3J5KGZh Y3RvcnkuQnVpbGRGYWN0b3J5KToKICAgICAgICAgaWYgcGxhdGZvcm0uc3RhcnRzd2l0aCgiY2hy b21pdW0iKToKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChJbnN0YWxsQ2hyb21pdW1EZXBlbmRl bmNpZXMpCiAgICAgICAgIGlmIHBsYXRmb3JtID09ICJndGsiOgorICAgICAgICAgICAgc2VsZi5h ZGRTdGVwKEluc3RhbGxHdGtTdXBwb3J0VG9vbHMpCiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAo SW5zdGFsbEd0a0RlcGVuZGVuY2llcykKICAgICAgICAgaWYgcGxhdGZvcm0gPT0gImVmbCI6CiAg ICAgICAgICAgICBzZWxmLmFkZFN0ZXAoSW5zdGFsbEVmbERlcGVuZGVuY2llcykKZGlmZiAtLWdp dCBhL1Rvb2xzL2d0ay9ib290c3RyYXAubW9kdWxlcyBiL1Rvb2xzL2d0ay9ib290c3RyYXAubW9k dWxlcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5lZGJhMTJmCi0tLSAvZGV2 L251bGwKKysrIGIvVG9vbHMvZ3RrL2Jvb3RzdHJhcC5tb2R1bGVzCkBAIC0wLDAgKzEsMjQgQEAK Kzw/eG1sIHZlcnNpb249IjEuMCI/PgorPCFET0NUWVBFIG1vZHVsZXNldCBTWVNURU0gIm1vZHVs ZXNldC5kdGQiPgorPD94bWwtc3R5bGVzaGVldCB0eXBlPSJ0ZXh0L3hzbCIgaHJlZj0ibW9kdWxl c2V0LnhzbCI/PgorPG1vZHVsZXNldD4KKworICA8bWV0YW1vZHVsZSBpZD0ibWV0YS1ib290c3Ry YXAiPgorICAgIDxkZXBlbmRlbmNpZXM+CisgICAgICA8ZGVwIHBhY2thZ2U9Im1ha2UiLz4KKyAg ICA8L2RlcGVuZGVuY2llcz4KKyAgPC9tZXRhbW9kdWxlPgorCisgIDxyZXBvc2l0b3J5IHR5cGU9 InRhcmJhbGwiIG5hbWU9ImZ0cC5nbnUub3JnIgorICAgICAgaHJlZj0iZnRwOi8vZnRwLmdudS5v cmcvZ251LyIvPgorCisgIDxhdXRvdG9vbHMgaWQ9Im1ha2UiIGF1dG9nZW4tc2g9ImNvbmZpZ3Vy ZSI+CisgICAgPGJyYW5jaCByZXBvPSJmdHAuZ251Lm9yZyIKKyAgICAgICAgICAgIG1vZHVsZT0i bWFrZS9tYWtlLTMuODIudGFyLmJ6MiIgdmVyc2lvbj0iMy44MiIKKyAgICAgICAgICAgIHNpemU9 IjEyNDIxODYiIG1kNXN1bT0iMWExMTEwMGYzYzYzZmNmNTc1MzgxOGU1OWQ2MzA4OGYiPgorICAg ICAgPHBhdGNoIGZpbGU9Im1ha2UtMy44Mi1hcmctbGlzdC1sZW5ndGgucGF0Y2giIHN0cmlwPSIx Ii8+CisgICAgICA8cGF0Y2ggZmlsZT0ibWFrZS0zLjgyLXBhcmFsbGVsLWJ1aWxkLnBhdGNoIiBz dHJpcD0iMSIvPgorICAgIDwvYnJhbmNoPgorICA8L2F1dG90b29scz4KKworPC9tb2R1bGVzZXQ+ ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvVG9vbHMvZ3RrL2poYnVp bGRyYyBiL1Rvb2xzL2d0ay9qaGJ1aWxkcmMKaW5kZXggMzI0OGI2Yi4uODI5NjExMyAxMDA2NDQK LS0tIGEvVG9vbHMvZ3RrL2poYnVpbGRyYworKysgYi9Ub29scy9ndGsvamhidWlsZHJjCkBAIC0y Miw2ICsyMiw4IEBAIF9fZ3RrX3Rvb2xzX2RpcmVjdG9yeSA9IG9zLnBhdGguYWJzcGF0aChvcy5w YXRoLmRpcm5hbWUoX19maWxlX18pKQogc3lzLnBhdGguYXBwZW5kKF9fZ3RrX3Rvb2xzX2RpcmVj dG9yeSkKIGltcG9ydCBjb21tb24KIAordXNlX2xvY2FsX21vZHVsZXNldHMgPSBUcnVlCittb2R1 bGVzZXRzX2RpciA9IF9fZ3RrX3Rvb2xzX2RpcmVjdG9yeQogYnVpbGRfcG9saWN5ID0gJ3VwZGF0 ZWQnCiAKIF9fbW9kdWxlc2V0X2ZpbGVfdXJpID0gJ2ZpbGU6Ly8nICsgb3MucGF0aC5qb2luKF9f Z3RrX3Rvb2xzX2RpcmVjdG9yeSwgJ2poYnVpbGQubW9kdWxlcycpCmRpZmYgLS1naXQgYS9Ub29s cy9ndGsvcGF0Y2hlcy9tYWtlLTMuODItYXJnLWxpc3QtbGVuZ3RoLnBhdGNoIGIvVG9vbHMvZ3Rr L3BhdGNoZXMvbWFrZS0zLjgyLWFyZy1saXN0LWxlbmd0aC5wYXRjaApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwLi5lODM1MTI4Ci0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvZ3Rr L3BhdGNoZXMvbWFrZS0zLjgyLWFyZy1saXN0LWxlbmd0aC5wYXRjaApAQCAtMCwwICsxLDEwNCBA QAorZGlmZiAtdSBtYWtlLTMuODItb3JpZy9jb25maWd1cmUuaW4gbWFrZS0zLjgyL2NvbmZpZ3Vy ZS5pbgorLS0tIG1ha2UtMy44Mi1vcmlnL2NvbmZpZ3VyZS5pbgkyMDEwLTA3LTI4IDA3OjM5OjUw LjAwMDAwMDAwMCArMDIwMAorKysrIG1ha2UtMy44Mi9jb25maWd1cmUuaW4JMjAxMi0wMy0yMSAx MjozNDoyMC4wMDAwMDAwMDAgKzAxMDAKK0BAIC02NCw3ICs2NCw4IEBACisgQUNfSEVBREVSX1NU QVQKKyBBQ19IRUFERVJfVElNRQorIEFDX0NIRUNLX0hFQURFUlMoc3RkbGliLmggbG9jYWxlLmgg dW5pc3RkLmggbGltaXRzLmggZmNudGwuaCBzdHJpbmcuaCBcCistCQkgbWVtb3J5Lmggc3lzL3Bh cmFtLmggc3lzL3Jlc291cmNlLmggc3lzL3RpbWUuaCBzeXMvdGltZWIuaCkKKysJCSBtZW1vcnku aCBzeXMvcGFyYW0uaCBzeXMvcmVzb3VyY2UuaCBzeXMvdGltZS5oIHN5cy90aW1lYi5oIFwKKysJ CSBzeXMvdXNlci5oIGxpbnV4L2JpbmZtdHMuaCkKKyAKKyAjIFNldCBhIGZsYWcgaWYgd2UgaGF2 ZSBhbiBBTlNJIEMgY29tcGlsZXIKKyBpZiB0ZXN0ICIkYWNfY3ZfcHJvZ19jY19zdGRjIiAhPSBu bzsgdGhlbgorU3ViZGlyZWN0b3Jpb3MgY29tdW5lczogbWFrZS0zLjgyLW9yaWcvZG9jIHkgbWFr ZS0zLjgyL2RvYworU3ViZGlyZWN0b3Jpb3MgY29tdW5lczogbWFrZS0zLjgyLW9yaWcvZ2xvYiB5 IG1ha2UtMy44Mi9nbG9iCitkaWZmIC11IG1ha2UtMy44Mi1vcmlnL2pvYi5jIG1ha2UtMy44Mi9q b2IuYworLS0tIG1ha2UtMy44Mi1vcmlnL2pvYi5jCTIwMTAtMDctMjQgMTA6Mjc6NTAuMDAwMDAw MDAwICswMjAwCisrKysgbWFrZS0zLjgyL2pvYi5jCTIwMTItMDMtMjEgMTI6MzQ6MjAuMDAwMDAw MDAwICswMTAwCitAQCAtMjksNiArMjksMTEgQEAKKyAKKyAjaW5jbHVkZSA8c3RyaW5nLmg+Cisg CisrI2lmIGRlZmluZWQgKEhBVkVfTElOVVhfQklORk1UU19IKSAmJiBkZWZpbmVkIChIQVZFX1NZ U19VU0VSX0gpCisrI2luY2x1ZGUgPHN5cy91c2VyLmg+CisrI2luY2x1ZGUgPGxpbnV4L2JpbmZt dHMuaD4KKysjZW5kaWYKKysKKyAvKiBEZWZhdWx0IHNoZWxsIHRvIHVzZS4gICovCisgI2lmZGVm IFdJTkRPV1MzMgorICNpbmNsdWRlIDx3aW5kb3dzLmg+CitAQCAtMjc5NSw2ICsyODAwLDcgQEAK KyAgICAgdW5zaWduZWQgaW50IHNmbGFnc19sZW4gPSBzdHJsZW4gKHNoZWxsZmxhZ3MpOworICAg ICBjaGFyICpjb21tYW5kX3B0ciA9IE5VTEw7IC8qIHVzZWQgZm9yIGJhdGNoX21vZGVfc2hlbGwg bW9kZSAqLworICAgICBjaGFyICpuZXdfbGluZTsKKysgICAgY2hhciAqYXJnc19wdHI7CisgCisg IyBpZmRlZiBfX0VNWF9fIC8qIGlzIHRoaXMgbmVjZXNzYXJ5PyAqLworICAgICBpZiAoIXVuaXh5 X3NoZWxsKQorQEAgLTI4NjUsOCArMjg3MSwxNyBAQAorIAlyZXR1cm4gbmV3X2FyZ3Y7CisgICAg ICAgfQorIAorKyNpZmRlZiBNQVhfQVJHX1NUUkxFTgorKyAgICBzdGF0aWMgY2hhciBldmFsX2xp bmVbXSA9ICJldmFsXFwgXFxcInNldFxcIHhcXDtcXCBzaGlmdFxcO1xcICI7CisrI2RlZmluZSBB UkdfTlVNQkVSX0RJR0lUUyA1CisrI2RlZmluZSBFVkFMX0xFTiAoc2l6ZW9mKGV2YWxfbGluZSkt MSArIHNoZWxsX2xlbiArIDQgICAgICAgICAgICAgICAgICAgXAorKyAgICAgICAgICAgICAgICAg ICsgKDcgKyBBUkdfTlVNQkVSX0RJR0lUUykgKiAyICogbGluZV9sZW4gLyAoTUFYX0FSR19TVFJM RU4gLSAyKSkKKysjZWxzZQorKyNkZWZpbmUgRVZBTF9MRU4gMAorKyNlbmRpZgorKworICAgICBu ZXdfbGluZSA9IGFsbG9jYSAoc2hlbGxfbGVuICsgMSArIHNmbGFnc19sZW4gKyAxCistICAgICAg ICAgICAgICAgICAgICAgICAgICAgICArIChsaW5lX2xlbioyKSArIDEpOworKyAgICAgICAgICAg ICAgICAgICAgICAgKyAobGluZV9sZW4qMikgKyAxICsgRVZBTF9MRU4pOworICAgICBhcCA9IG5l d19saW5lOworICAgICBtZW1jcHkgKGFwLCBzaGVsbCwgc2hlbGxfbGVuKTsKKyAgICAgYXAgKz0g c2hlbGxfbGVuOworQEAgLTI4NzUsNiArMjg5MCwzMCBAQAorICAgICBhcCArPSBzZmxhZ3NfbGVu OworICAgICAqKGFwKyspID0gJyAnOworICAgICBjb21tYW5kX3B0ciA9IGFwOworKworKyNpZiAh ZGVmaW5lZCAoV0lORE9XUzMyKSAmJiBkZWZpbmVkIChNQVhfQVJHX1NUUkxFTikKKysgICAgaWYg KHVuaXh5X3NoZWxsICYmIGxpbmVfbGVuID4gTUFYX0FSR19TVFJMRU4pCisrICAgICAgeworKwl1 bnNpZ25lZCBqOworKwltZW1jcHkgKGFwLCBldmFsX2xpbmUsIHNpemVvZiAoZXZhbF9saW5lKSAt IDEpOworKwlhcCArPSBzaXplb2YgKGV2YWxfbGluZSkgLSAxOworKwlmb3IgKGogPSAxOyBqIDw9 IDIgKiBsaW5lX2xlbiAvIChNQVhfQVJHX1NUUkxFTiAtIDIpOyBqKyspCisrCSAgYXAgKz0gc3By aW50ZiAoYXAsICJcXCRcXHsldVxcfSIsIGopOworKwkqYXArKyA9ICdcXCc7CisrCSphcCsrID0g JyInOworKwkqYXArKyA9ICcgJzsKKysJLyogQ29weSBvbmx5IHRoZSBmaXJzdCB3b3JkIG9mIFNI RUxMIHRvICQwLiAgKi8KKysJZm9yIChwID0gc2hlbGw7ICpwICE9ICdcMCc7ICsrcCkKKysJICB7 CisrCSAgICBpZiAoaXNzcGFjZSAoKHVuc2lnbmVkIGNoYXIpKnApKQorKwkgICAgICBicmVhazsK KysJICAgICphcCsrID0gKnA7CisrCSAgfQorKwkqYXArKyA9ICcgJzsKKysgICAgICB9CisrI2Vu ZGlmCisrICAgIGFyZ3NfcHRyID0gYXA7CisrCisgICAgIGZvciAocCA9IGxpbmU7ICpwICE9ICdc MCc7ICsrcCkKKyAgICAgICB7CisgCWlmIChyZXN0cCAhPSBOVUxMICYmICpwID09ICdcbicpCitA QCAtMjkyMiw2ICsyOTYxLDE0IEBACisgICAgICAgICAgIH0KKyAjZW5kaWYKKyAJKmFwKysgPSAq cDsKKysKKysjaWYgIWRlZmluZWQgKFdJTkRPV1MzMikgJiYgZGVmaW5lZCAoTUFYX0FSR19TVFJM RU4pCisrCWlmICh1bml4eV9zaGVsbCAmJiBsaW5lX2xlbiA+IE1BWF9BUkdfU1RSTEVOICYmIChh cCAtIGFyZ3NfcHRyID4gTUFYX0FSR19TVFJMRU4gLSAyKSkKKysJICB7CisrCSAgICAqYXArKyA9 ICcgJzsKKysJICAgIGFyZ3NfcHRyID0gYXA7CisrCSAgfQorKyNlbmRpZgorICAgICAgIH0KKyAg ICAgaWYgKGFwID09IG5ld19saW5lICsgc2hlbGxfbGVuICsgc2ZsYWdzX2xlbiArIDIpCisgICAg ICAgLyogTGluZSB3YXMgZW1wdHkuICAqLworCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvcGF0Y2hl cy9tYWtlLTMuODItcGFyYWxsZWwtYnVpbGQucGF0Y2ggYi9Ub29scy9ndGsvcGF0Y2hlcy9tYWtl LTMuODItcGFyYWxsZWwtYnVpbGQucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uYzA1NmMyZQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL2d0ay9wYXRjaGVzL21ha2Ut My44Mi1wYXJhbGxlbC1idWlsZC5wYXRjaApAQCAtMCwwICsxLDI2IEBACitkaWZmIC11IG1ha2Ut My44Mi1vcmlnL3JlbWFrZS5jIG1ha2UtMy44Mi9yZW1ha2UuYworLS0tIG1ha2UtMy44Mi1vcmln L3JlbWFrZS5jCTIwMTAtMDctMTMgMDM6MjA6NDIuMDAwMDAwMDAwICswMjAwCisrKysgbWFrZS0z LjgyL3JlbWFrZS5jCTIwMTItMDMtMjEgMTI6NDc6NTIuMDAwMDAwMDAwICswMTAwCitAQCAtMzAx LDcgKzMwMSw3IEBACisgICAgICAgLyogQ2hlY2sgZm9yIHRoZSBjYXNlIHdoZXJlIGEgdGFyZ2V0 IGhhcyBiZWVuIHRyaWVkIGFuZCBmYWlsZWQgYnV0CisgICAgICAgICAgdGhlIGRpYWdub3N0aWNz IGhhc24ndCBiZWVuIGlzc3VlZC4gSWYgd2UgbmVlZCB0aGUgZGlhZ25vc3RpY3MKKyAgICAgICAg ICB0aGVuIHdlIHdpbGwgaGF2ZSB0byBjb250aW51ZS4gKi8KKy0gICAgICBpZiAoIShmLT51cGRh dGVkICYmIGYtPnVwZGF0ZV9zdGF0dXMgPiAwICYmICFmLT5kb250Y2FyZSAmJiBmLT5ub19kaWFn KSkKKysgICAgICBpZiAoIShmLT51cGRhdGVkICYmIGYtPnVwZGF0ZV9zdGF0dXMgPiAwICYmICFm LT5kb250Y2FyZSAmJiBmLT5ub19kaWFnKSAmJiBmLT5jb21tYW5kX3N0YXRlIT1jc19ub3Rfc3Rh cnRlZCApCisgICAgICAgICB7CisgICAgICAgICAgIERCRiAoREJfVkVSQk9TRSwgXygiUHJ1bmlu ZyBmaWxlIGAlcycuXG4iKSk7CisgICAgICAgICAgIHJldHVybiBmLT5jb21tYW5kX3N0YXRlID09 IGNzX2ZpbmlzaGVkID8gZi0+dXBkYXRlX3N0YXR1cyA6IDA7CitAQCAtNjE0LDYgKzYxNCwxMiBA QAorICAgICAgICAgICAgICAgICBkLT5maWxlLT5kb250Y2FyZSA9IGZpbGUtPmRvbnRjYXJlOwor ICAgICAgICAgICAgICAgfQorIAorKwkgICAgLyogV2UgbWF5IGhhdmUgYWxyZWFkeSBlbmNvdW50 ZXJlZCB0aGlzIGZpbGUgZWFybGllciBpbiB0aGUgc2FtZQorKwkgICAgICogcGFzcyBiZWZvcmUg d2Uga25ldyB3ZSdkIGJlIHVwZGF0aW5nIHRoaXMgdGFyZ2V0LiBJbiB0aGF0IAorKwkgICAgICog Y2FzZSBjYWxsaW5nIHVwZGF0ZV9maWxlIG5vdyB3b3VsZCByZXN1bHQgaW4gdGhlIGZpbGUgYmVp bmcgCisrCSAgICAgKiBpbmFwcHJvcHJpYXRlbHkgcHJ1bmVkIHNvIHdlIHRvZ2dsZSB0aGUgY29u c2lkZXJlZCBiaXQgYmFjayAKKysJICAgICAqIG9mZiBmaXJzdC4gKi8KKysgICAgICAgICAgICBk LT5maWxlLT5jb25zaWRlcmVkID0gIWNvbnNpZGVyZWQ7CisgCisgCSAgICBkZXBfc3RhdHVzIHw9 IHVwZGF0ZV9maWxlIChkLT5maWxlLCBkZXB0aCk7CisgCisK 133302 2012-03-22 11:28:54 -0700 2012-03-22 13:23:14 -0700 Patch bug-81769-20120322152852.patch text/plain 7574 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNzEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzJmNjdjM2YzNDNkMDVkMGQ2ODk1ZmQwMDIzMDJlNGM4 ZDVhZWM3OS4uNTNlNmU1NjEzODVkNzZmYzk0YjgyMzk1NTE4OGNjZTM5NmExZDU1ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTAzLTIyICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgor CisgICAgICAgIFtHVEtdIEFkZCBtYWtlIHRvIHRoZSBqaGJ1aWxkIG1vZHVsZXNldAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE3NjkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3N0bHkgYmFzZWQgb24g YSBwYXRjaCBieSBDYXJsb3MgR2FyY2lhIENhbXBvcyA8Y2dhcmNpYUBpZ2FsaWEuY29tPi4KKyAg ICAgICAgQWRkIEdOVSBtYWtlIHdpdGggY3VzdG9tIHBhdGNoZXMgdG8gZml4IHNldmVyYWwgaXNz dWVzOgorCisgICAgICAgIC0gbWFrZS0zLjgyLWFyZy1saXN0LWxlbmd0aC5wYXRjaDogUGF0Y2gg YnkgUmFsZiBXaWxkZW5odWVzIHRvCisgICAgICAgICAgZml4IHRoZSBhcmd1bWVudCBsaXN0IGxp bWl0IG9mIEdOVSBtYWtlIHdoZW4gcnVubmluZyBtYWtlCisgICAgICAgICAgZGlzdGNoZWNrLgor ICAgICAgICAtIG1ha2UtMy44Mi1wYXJhbGxlbC1idWlsZC5wYXRjaDogUGF0Y2ggYnkgS2FtaWwg TWllcnplamV3c2tpCisgICAgICAgICAgYW5kIEplcmVteSBEZXZlbnBvcnQgdG8gZml4IHBhcmFs bGVsIGJ1aWxkIGlzc3VlcyBwcmVzZW50IGluCisgICAgICAgICAgR05VIG1ha2UgMy44MgorCisg ICAgICAgICogZ3RrL2poYnVpbGQubW9kdWxlczogQWRkZWQgbWFrZSB3aXRoIHBhdGNoZXMuCisg ICAgICAgICogZ3RrL3BhdGNoZXMvbWFrZS0zLjgyLWFyZy1saXN0LWxlbmd0aC5wYXRjaDogQWRk ZWQuCisgICAgICAgICogZ3RrL3BhdGNoZXMvbWFrZS0zLjgyLXBhcmFsbGVsLWJ1aWxkLnBhdGNo OiBBZGRlZC4KKwogMjAxMi0wMy0yMiAgU3VkYXJzYW5hIE5hZ2luZW5pICA8c3VkYXJzYW5hLm5h Z2luZW5pQGxpbnV4LmludGVsLmNvbT4KIAogICAgICAgICBbRUZMXSBJbXBsZW1lbnQgTGF5b3V0 VGVzdENvbnRyb2xsZXI6OnNldEVkaXRpbmdCZWhhdmlvcgpkaWZmIC0tZ2l0IGEvVG9vbHMvZ3Rr L2poYnVpbGQubW9kdWxlcyBiL1Rvb2xzL2d0ay9qaGJ1aWxkLm1vZHVsZXMKaW5kZXggZTZkZWU2 OGVmODYxMzQ1OGU1N2M0NTAwNGY3ZWI0ZjE5ZTBiZjBiNy4uMzdlMTkzOTI1MDUwMWEyZGVjOTNl OTdhOTQ3NjU3MWMwNGM3ZDA0NSAxMDA2NDQKLS0tIGEvVG9vbHMvZ3RrL2poYnVpbGQubW9kdWxl cworKysgYi9Ub29scy9ndGsvamhidWlsZC5tb2R1bGVzCkBAIC01LDYgKzUsNyBAQAogCiAgIDxt ZXRhbW9kdWxlIGlkPSJ3ZWJraXRndGstdGVzdGluZy1kZXBlbmRlbmNpZXMiPgogICAgIDxkZXBl bmRlbmNpZXM+CisgICAgICA8ZGVwIHBhY2thZ2U9Im1ha2UiLz4KICAgICAgIDxkZXAgcGFja2Fn ZT0iY2Fpcm8iLz4KICAgICAgIDxkZXAgcGFja2FnZT0iZm9udHMiLz4KICAgICAgIDxkZXAgcGFj a2FnZT0iZm9udGNvbmZpZyIvPgpAQCAtMjAsNiArMjEsOCBAQAogICAgIDwvZGVwZW5kZW5jaWVz PgogICA8L21ldGFtb2R1bGU+CiAKKyAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFtZT0i ZnRwLmdudS5vcmciCisgICAgICBocmVmPSJmdHA6Ly9mdHAuZ251Lm9yZy9nbnUvIi8+CiAgIDxy ZXBvc2l0b3J5IHR5cGU9InRhcmJhbGwiIG5hbWU9ImdpdGh1Yi5jb20iCiAgICAgICBocmVmPSJo dHRwczovL2dpdGh1Yi5jb20iLz4KICAgPHJlcG9zaXRvcnkgdHlwZT0idGFyYmFsbCIgbmFtZT0i c291cmNld2FyZS5vcmciCkBAIC0zOSw2ICs0MiwxNSBAQAogICA8cmVwb3NpdG9yeSB0eXBlPSJ0 YXJiYWxsIiBuYW1lPSJmcmVlZGVza3RvcC5vcmciCiAgICAgICBocmVmPSJodHRwOi8vd3d3LmZy ZWVkZXNrdG9wLm9yZyIvPgogCisgIDxhdXRvdG9vbHMgaWQ9Im1ha2UiIGF1dG9nZW4tc2g9ImNv bmZpZ3VyZSI+CisgICAgPGJyYW5jaCByZXBvPSJmdHAuZ251Lm9yZyIKKyAgICAgICAgICAgIG1v ZHVsZT0ibWFrZS9tYWtlLTMuODIudGFyLmJ6MiIgdmVyc2lvbj0iMy44MiIKKyAgICAgICAgICAg IHNpemU9IjEyNDIxODYiIG1kNXN1bT0iMWExMTEwMGYzYzYzZmNmNTc1MzgxOGU1OWQ2MzA4OGYi PgorICAgICAgPHBhdGNoIGZpbGU9Im1ha2UtMy44Mi1hcmctbGlzdC1sZW5ndGgucGF0Y2giIHN0 cmlwPSIxIi8+CisgICAgICA8cGF0Y2ggZmlsZT0ibWFrZS0zLjgyLXBhcmFsbGVsLWJ1aWxkLnBh dGNoIiBzdHJpcD0iMSIvPgorICAgIDwvYnJhbmNoPgorICA8L2F1dG90b29scz4KKwogICA8YXV0 b3Rvb2xzIGlkPSJjYWlybyIgYXV0b2dlbi1zaD0iY29uZmlndXJlIj4KICAgICA8ZGVwZW5kZW5j aWVzPgogICAgICAgPGRlcCBwYWNrYWdlPSJwaXhtYW4iLz4KZGlmZiAtLWdpdCBhL1Rvb2xzL2d0 ay9wYXRjaGVzL21ha2UtMy44Mi1hcmctbGlzdC1sZW5ndGgucGF0Y2ggYi9Ub29scy9ndGsvcGF0 Y2hlcy9tYWtlLTMuODItYXJnLWxpc3QtbGVuZ3RoLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmU4MzUxMjg0 Mzc5MzdjOWI4ZDA3NWE0NmJhZGQ5N2MxNzA0ZTcxZDQKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29s cy9ndGsvcGF0Y2hlcy9tYWtlLTMuODItYXJnLWxpc3QtbGVuZ3RoLnBhdGNoCkBAIC0wLDAgKzEs MTA0IEBACitkaWZmIC11IG1ha2UtMy44Mi1vcmlnL2NvbmZpZ3VyZS5pbiBtYWtlLTMuODIvY29u ZmlndXJlLmluCistLS0gbWFrZS0zLjgyLW9yaWcvY29uZmlndXJlLmluCTIwMTAtMDctMjggMDc6 Mzk6NTAuMDAwMDAwMDAwICswMjAwCisrKysgbWFrZS0zLjgyL2NvbmZpZ3VyZS5pbgkyMDEyLTAz LTIxIDEyOjM0OjIwLjAwMDAwMDAwMCArMDEwMAorQEAgLTY0LDcgKzY0LDggQEAKKyBBQ19IRUFE RVJfU1RBVAorIEFDX0hFQURFUl9USU1FCisgQUNfQ0hFQ0tfSEVBREVSUyhzdGRsaWIuaCBsb2Nh bGUuaCB1bmlzdGQuaCBsaW1pdHMuaCBmY250bC5oIHN0cmluZy5oIFwKKy0JCSBtZW1vcnkuaCBz eXMvcGFyYW0uaCBzeXMvcmVzb3VyY2UuaCBzeXMvdGltZS5oIHN5cy90aW1lYi5oKQorKwkJIG1l bW9yeS5oIHN5cy9wYXJhbS5oIHN5cy9yZXNvdXJjZS5oIHN5cy90aW1lLmggc3lzL3RpbWViLmgg XAorKwkJIHN5cy91c2VyLmggbGludXgvYmluZm10cy5oKQorIAorICMgU2V0IGEgZmxhZyBpZiB3 ZSBoYXZlIGFuIEFOU0kgQyBjb21waWxlcgorIGlmIHRlc3QgIiRhY19jdl9wcm9nX2NjX3N0ZGMi ICE9IG5vOyB0aGVuCitTdWJkaXJlY3RvcmlvcyBjb211bmVzOiBtYWtlLTMuODItb3JpZy9kb2Mg eSBtYWtlLTMuODIvZG9jCitTdWJkaXJlY3RvcmlvcyBjb211bmVzOiBtYWtlLTMuODItb3JpZy9n bG9iIHkgbWFrZS0zLjgyL2dsb2IKK2RpZmYgLXUgbWFrZS0zLjgyLW9yaWcvam9iLmMgbWFrZS0z LjgyL2pvYi5jCistLS0gbWFrZS0zLjgyLW9yaWcvam9iLmMJMjAxMC0wNy0yNCAxMDoyNzo1MC4w MDAwMDAwMDAgKzAyMDAKKysrKyBtYWtlLTMuODIvam9iLmMJMjAxMi0wMy0yMSAxMjozNDoyMC4w MDAwMDAwMDAgKzAxMDAKK0BAIC0yOSw2ICsyOSwxMSBAQAorIAorICNpbmNsdWRlIDxzdHJpbmcu aD4KKyAKKysjaWYgZGVmaW5lZCAoSEFWRV9MSU5VWF9CSU5GTVRTX0gpICYmIGRlZmluZWQgKEhB VkVfU1lTX1VTRVJfSCkKKysjaW5jbHVkZSA8c3lzL3VzZXIuaD4KKysjaW5jbHVkZSA8bGludXgv YmluZm10cy5oPgorKyNlbmRpZgorKworIC8qIERlZmF1bHQgc2hlbGwgdG8gdXNlLiAgKi8KKyAj aWZkZWYgV0lORE9XUzMyCisgI2luY2x1ZGUgPHdpbmRvd3MuaD4KK0BAIC0yNzk1LDYgKzI4MDAs NyBAQAorICAgICB1bnNpZ25lZCBpbnQgc2ZsYWdzX2xlbiA9IHN0cmxlbiAoc2hlbGxmbGFncyk7 CisgICAgIGNoYXIgKmNvbW1hbmRfcHRyID0gTlVMTDsgLyogdXNlZCBmb3IgYmF0Y2hfbW9kZV9z aGVsbCBtb2RlICovCisgICAgIGNoYXIgKm5ld19saW5lOworKyAgICBjaGFyICphcmdzX3B0cjsK KyAKKyAjIGlmZGVmIF9fRU1YX18gLyogaXMgdGhpcyBuZWNlc3Nhcnk/ICovCisgICAgIGlmICgh dW5peHlfc2hlbGwpCitAQCAtMjg2NSw4ICsyODcxLDE3IEBACisgCXJldHVybiBuZXdfYXJndjsK KyAgICAgICB9CisgCisrI2lmZGVmIE1BWF9BUkdfU1RSTEVOCisrICAgIHN0YXRpYyBjaGFyIGV2 YWxfbGluZVtdID0gImV2YWxcXCBcXFwic2V0XFwgeFxcO1xcIHNoaWZ0XFw7XFwgIjsKKysjZGVm aW5lIEFSR19OVU1CRVJfRElHSVRTIDUKKysjZGVmaW5lIEVWQUxfTEVOIChzaXplb2YoZXZhbF9s aW5lKS0xICsgc2hlbGxfbGVuICsgNCAgICAgICAgICAgICAgICAgICBcCisrICAgICAgICAgICAg ICAgICAgKyAoNyArIEFSR19OVU1CRVJfRElHSVRTKSAqIDIgKiBsaW5lX2xlbiAvIChNQVhfQVJH X1NUUkxFTiAtIDIpKQorKyNlbHNlCisrI2RlZmluZSBFVkFMX0xFTiAwCisrI2VuZGlmCisrCisg ICAgIG5ld19saW5lID0gYWxsb2NhIChzaGVsbF9sZW4gKyAxICsgc2ZsYWdzX2xlbiArIDEKKy0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICsgKGxpbmVfbGVuKjIpICsgMSk7CisrICAgICAg ICAgICAgICAgICAgICAgICArIChsaW5lX2xlbioyKSArIDEgKyBFVkFMX0xFTik7CisgICAgIGFw ID0gbmV3X2xpbmU7CisgICAgIG1lbWNweSAoYXAsIHNoZWxsLCBzaGVsbF9sZW4pOworICAgICBh cCArPSBzaGVsbF9sZW47CitAQCAtMjg3NSw2ICsyODkwLDMwIEBACisgICAgIGFwICs9IHNmbGFn c19sZW47CisgICAgICooYXArKykgPSAnICc7CisgICAgIGNvbW1hbmRfcHRyID0gYXA7CisrCisr I2lmICFkZWZpbmVkIChXSU5ET1dTMzIpICYmIGRlZmluZWQgKE1BWF9BUkdfU1RSTEVOKQorKyAg ICBpZiAodW5peHlfc2hlbGwgJiYgbGluZV9sZW4gPiBNQVhfQVJHX1NUUkxFTikKKysgICAgICB7 CisrCXVuc2lnbmVkIGo7CisrCW1lbWNweSAoYXAsIGV2YWxfbGluZSwgc2l6ZW9mIChldmFsX2xp bmUpIC0gMSk7CisrCWFwICs9IHNpemVvZiAoZXZhbF9saW5lKSAtIDE7CisrCWZvciAoaiA9IDE7 IGogPD0gMiAqIGxpbmVfbGVuIC8gKE1BWF9BUkdfU1RSTEVOIC0gMik7IGorKykKKysJICBhcCAr PSBzcHJpbnRmIChhcCwgIlxcJFxceyV1XFx9Iiwgaik7CisrCSphcCsrID0gJ1xcJzsKKysJKmFw KysgPSAnIic7CisrCSphcCsrID0gJyAnOworKwkvKiBDb3B5IG9ubHkgdGhlIGZpcnN0IHdvcmQg b2YgU0hFTEwgdG8gJDAuICAqLworKwlmb3IgKHAgPSBzaGVsbDsgKnAgIT0gJ1wwJzsgKytwKQor KwkgIHsKKysJICAgIGlmIChpc3NwYWNlICgodW5zaWduZWQgY2hhcikqcCkpCisrCSAgICAgIGJy ZWFrOworKwkgICAgKmFwKysgPSAqcDsKKysJICB9CisrCSphcCsrID0gJyAnOworKyAgICAgIH0K KysjZW5kaWYKKysgICAgYXJnc19wdHIgPSBhcDsKKysKKyAgICAgZm9yIChwID0gbGluZTsgKnAg IT0gJ1wwJzsgKytwKQorICAgICAgIHsKKyAJaWYgKHJlc3RwICE9IE5VTEwgJiYgKnAgPT0gJ1xu JykKK0BAIC0yOTIyLDYgKzI5NjEsMTQgQEAKKyAgICAgICAgICAgfQorICNlbmRpZgorIAkqYXAr KyA9ICpwOworKworKyNpZiAhZGVmaW5lZCAoV0lORE9XUzMyKSAmJiBkZWZpbmVkIChNQVhfQVJH X1NUUkxFTikKKysJaWYgKHVuaXh5X3NoZWxsICYmIGxpbmVfbGVuID4gTUFYX0FSR19TVFJMRU4g JiYgKGFwIC0gYXJnc19wdHIgPiBNQVhfQVJHX1NUUkxFTiAtIDIpKQorKwkgIHsKKysJICAgICph cCsrID0gJyAnOworKwkgICAgYXJnc19wdHIgPSBhcDsKKysJICB9CisrI2VuZGlmCisgICAgICAg fQorICAgICBpZiAoYXAgPT0gbmV3X2xpbmUgKyBzaGVsbF9sZW4gKyBzZmxhZ3NfbGVuICsgMikK KyAgICAgICAvKiBMaW5lIHdhcyBlbXB0eS4gICovCisKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9w YXRjaGVzL21ha2UtMy44Mi1wYXJhbGxlbC1idWlsZC5wYXRjaCBiL1Rvb2xzL2d0ay9wYXRjaGVz L21ha2UtMy44Mi1wYXJhbGxlbC1idWlsZC5wYXRjaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jMDU2YzJlMGU4MTBj MzIwYzZjODc5NTRmYTViMWQ5ODc3OTU3YThlCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvZ3Rr L3BhdGNoZXMvbWFrZS0zLjgyLXBhcmFsbGVsLWJ1aWxkLnBhdGNoCkBAIC0wLDAgKzEsMjYgQEAK K2RpZmYgLXUgbWFrZS0zLjgyLW9yaWcvcmVtYWtlLmMgbWFrZS0zLjgyL3JlbWFrZS5jCistLS0g bWFrZS0zLjgyLW9yaWcvcmVtYWtlLmMJMjAxMC0wNy0xMyAwMzoyMDo0Mi4wMDAwMDAwMDAgKzAy MDAKKysrKyBtYWtlLTMuODIvcmVtYWtlLmMJMjAxMi0wMy0yMSAxMjo0Nzo1Mi4wMDAwMDAwMDAg KzAxMDAKK0BAIC0zMDEsNyArMzAxLDcgQEAKKyAgICAgICAvKiBDaGVjayBmb3IgdGhlIGNhc2Ug d2hlcmUgYSB0YXJnZXQgaGFzIGJlZW4gdHJpZWQgYW5kIGZhaWxlZCBidXQKKyAgICAgICAgICB0 aGUgZGlhZ25vc3RpY3MgaGFzbid0IGJlZW4gaXNzdWVkLiBJZiB3ZSBuZWVkIHRoZSBkaWFnbm9z dGljcworICAgICAgICAgIHRoZW4gd2Ugd2lsbCBoYXZlIHRvIGNvbnRpbnVlLiAqLworLSAgICAg IGlmICghKGYtPnVwZGF0ZWQgJiYgZi0+dXBkYXRlX3N0YXR1cyA+IDAgJiYgIWYtPmRvbnRjYXJl ICYmIGYtPm5vX2RpYWcpKQorKyAgICAgIGlmICghKGYtPnVwZGF0ZWQgJiYgZi0+dXBkYXRlX3N0 YXR1cyA+IDAgJiYgIWYtPmRvbnRjYXJlICYmIGYtPm5vX2RpYWcpICYmIGYtPmNvbW1hbmRfc3Rh dGUhPWNzX25vdF9zdGFydGVkICkKKyAgICAgICAgIHsKKyAgICAgICAgICAgREJGIChEQl9WRVJC T1NFLCBfKCJQcnVuaW5nIGZpbGUgYCVzJy5cbiIpKTsKKyAgICAgICAgICAgcmV0dXJuIGYtPmNv bW1hbmRfc3RhdGUgPT0gY3NfZmluaXNoZWQgPyBmLT51cGRhdGVfc3RhdHVzIDogMDsKK0BAIC02 MTQsNiArNjE0LDEyIEBACisgICAgICAgICAgICAgICAgIGQtPmZpbGUtPmRvbnRjYXJlID0gZmls ZS0+ZG9udGNhcmU7CisgICAgICAgICAgICAgICB9CisgCisrCSAgICAvKiBXZSBtYXkgaGF2ZSBh bHJlYWR5IGVuY291bnRlcmVkIHRoaXMgZmlsZSBlYXJsaWVyIGluIHRoZSBzYW1lCisrCSAgICAg KiBwYXNzIGJlZm9yZSB3ZSBrbmV3IHdlJ2QgYmUgdXBkYXRpbmcgdGhpcyB0YXJnZXQuIEluIHRo YXQgCisrCSAgICAgKiBjYXNlIGNhbGxpbmcgdXBkYXRlX2ZpbGUgbm93IHdvdWxkIHJlc3VsdCBp biB0aGUgZmlsZSBiZWluZyAKKysJICAgICAqIGluYXBwcm9wcmlhdGVseSBwcnVuZWQgc28gd2Ug dG9nZ2xlIHRoZSBjb25zaWRlcmVkIGJpdCBiYWNrIAorKwkgICAgICogb2ZmIGZpcnN0LiAqLwor KyAgICAgICAgICAgIGQtPmZpbGUtPmNvbnNpZGVyZWQgPSAhY29uc2lkZXJlZDsKKyAKKyAJICAg IGRlcF9zdGF0dXMgfD0gdXBkYXRlX2ZpbGUgKGQtPmZpbGUsIGRlcHRoKTsKKyAKKwo=