28168 2009-08-10 16:25:14 -0700 commit-log-editor does not support all the email config that prepare-Changelog supports 2009-11-07 20:00:27 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 pdherbemont mrowe mrowe oldest_to_newest 138856 0 pdherbemont 2009-08-10 16:25:14 -0700 commit-log-editor does not support all the email config that prepare-Changelog supports. This is problematic as an extra unneeded "Patch by XXX on DD-DD-DD" might be added even though committer and author are the same person. 138862 1 34527 pdherbemont 2009-08-10 16:47:58 -0700 Created attachment 34527 commit-log-editor does not support all the email config that prepare-Changelog supports https://bugs.webkit.org/show_bug.cgi?id=28168 Reviewed by NOBODY (OOPS!). * Scripts/VCSUtils.pm: Move gitConfig() to VCSUtils.pm. * Scripts/prepare-ChangeLog: ditto. * Scripts/commit-log-editor: Use CHANGE_LOG_EMAIL_ADDRESS and gitConfig("user.email"). --- 4 files changed, 30 insertions(+), 16 deletions(-) 138863 2 34527 mrowe 2009-08-10 16:58:41 -0700 Comment on attachment 34527 commit-log-editor does not support all the email config that prepare-Changelog supports > +sub gitConfig($) > +{ > + return unless $isGit; > + > + my ($config) = @_; > + > + my $result = `git config $config`; > + if (($? >> 8) != 0) { > + $result = `git repo-config $config`; > + } > + chomp $result; > + return $result; > +} In theory "$? >> 8" would be more portable as exitStatus($?). > 1; > diff --git a/WebKitTools/Scripts/commit-log-editor b/WebKitTools/Scripts/commit-log-editor > index b783ccb..fe138ae 100755 > --- a/WebKitTools/Scripts/commit-log-editor > +++ b/WebKitTools/Scripts/commit-log-editor > @@ -171,7 +171,10 @@ for my $changeLog (@changeLogs) { > > # Attempt to insert the "patch by" line, after the first blank line. > if ($previousLineWasBlank && $hasAuthorInfoToWrite && $lineCount > 0) { > - my $authorAndCommitterAreSamePerson = $email eq $ENV{'EMAIL_ADDRESS'}; > + my $committerEmail = $ENV{CHANGE_LOG_EMAIL_ADDRESS} > + || $ENV{EMAIL_ADDRESS} > + || gitConfig("user.email"); > + my $authorAndCommitterAreSamePerson = $email eq $committerEmail; What will happen if the email address is not set via any of these means? Will it spew a perl warning and continue, or will it display a useful message like prepare-ChangeLog does? Should we consider removing the duplication of the retrieving of these values by pushing them down in to a function? r=me 138864 3 pdherbemont 2009-08-10 17:09:43 -0700 (In reply to comment #2) > (From update of attachment 34527 [details]) > > +sub gitConfig($) > > +{ > > + return unless $isGit; > > + > > + my ($config) = @_; > > + > > + my $result = `git config $config`; > > + if (($? >> 8) != 0) { > > + $result = `git repo-config $config`; > > + } > > + chomp $result; > > + return $result; > > +} > > In theory "$? >> 8" would be more portable as exitStatus($?). Ok. (This was copy and paste) > > 1; > > diff --git a/WebKitTools/Scripts/commit-log-editor b/WebKitTools/Scripts/commit-log-editor > > index b783ccb..fe138ae 100755 > > --- a/WebKitTools/Scripts/commit-log-editor > > +++ b/WebKitTools/Scripts/commit-log-editor > > @@ -171,7 +171,10 @@ for my $changeLog (@changeLogs) { > > > > # Attempt to insert the "patch by" line, after the first blank line. > > if ($previousLineWasBlank && $hasAuthorInfoToWrite && $lineCount > 0) { > > - my $authorAndCommitterAreSamePerson = $email eq $ENV{'EMAIL_ADDRESS'}; > > + my $committerEmail = $ENV{CHANGE_LOG_EMAIL_ADDRESS} > > + || $ENV{EMAIL_ADDRESS} > > + || gitConfig("user.email"); > > + my $authorAndCommitterAreSamePerson = $email eq $committerEmail; > > What will happen if the email address is not set via any of these means? Will > it spew a perl warning and continue, or will it display a useful message like > prepare-ChangeLog does? Should we consider removing the duplication of the > retrieving of these values by pushing them down in to a function? Nice idea. However I failed to see the proper place to factorize such a fonction. I'll resend a patch with a factorization. 138865 4 pdherbemont 2009-08-10 17:13:06 -0700 (In reply to comment #2) > (From update of attachment 34527 [details]) > > +sub gitConfig($) > > +{ > > + return unless $isGit; > > + > > + my ($config) = @_; > > + > > + my $result = `git config $config`; > > + if (($? >> 8) != 0) { > > + $result = `git repo-config $config`; > > + } > > + chomp $result; > > + return $result; > > +} > > In theory "$? >> 8" would be more portable as exitStatus($?). In fact exitStatus() is not available from here. I am not sure if we want to do a circular reference loop between webkitdir.pm and VCSUtil.pm. I'll leave it here, as this was old code. 138867 5 34528 pdherbemont 2009-08-10 17:23:36 -0700 Created attachment 34528 commit-log-editor does not support all the email config that prepare-Changelog supports https://bugs.webkit.org/show_bug.cgi?id=28168 Reviewed by NOBODY (OOPS!). * Scripts/VCSUtils.pm: Move gitConfig() to VCSUtils.pm. * Scripts/webkitdirs.pm: Move changeLogEmailAddress() to webkitdirs.pm. * Scripts/prepare-ChangeLog: ditto. * Scripts/commit-log-editor: Use changeLogEmailAddress(). --- 5 files changed, 56 insertions(+), 37 deletions(-) 138868 6 pdherbemont 2009-08-10 17:30:05 -0700 (In reply to comment #4) > (In reply to comment #2) > > (From update of attachment 34527 [details] [details]) > > > +sub gitConfig($) > > > +{ > > > + return unless $isGit; > > > + > > > + my ($config) = @_; > > > + > > > + my $result = `git config $config`; > > > + if (($? >> 8) != 0) { > > > + $result = `git repo-config $config`; > > > + } > > > + chomp $result; > > > + return $result; > > > +} > > > > In theory "$? >> 8" would be more portable as exitStatus($?). > > In fact exitStatus() is not available from here. I am not sure if we want to do > a circular reference loop between webkitdir.pm and VCSUtil.pm. I'll leave it > here, as this was old code. I just added webkitdir.pm to prepare-ChangeLog to fix this. 139239 7 34528 eric 2009-08-11 22:31:18 -0700 Comment on attachment 34528 commit-log-editor does not support all the email config that prepare-Changelog supports Should this be an empty return as such? 224 return unless $isGit; not '' ? Style: 229 if (exitStatus($?) != 0) { 230 $result = `git repo-config $config`; 231 } Shouldn't you move the user.name stuff into webkitdirs.pm too? Seems we should be splitting some of this stuff out into separate modules from webkitdirs.pm anyway... And geeeez we need to move commit-log-editor to python. :( r- for the style nits. Consider breaking these out of this huge (poorly named) module. 161340 8 42692 mrowe 2009-11-07 04:56:24 -0800 Created attachment 42692 Tidied patch 161393 9 mrowe 2009-11-07 20:00:27 -0800 Landed in r50619. 34527 2009-08-10 16:47:58 -0700 2009-08-10 17:23:30 -0700 commit-log-editor does not support all the email config that prepare-Changelog supports bug-28168-20090811014754.patch text/plain 3028 pdherbemont ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxZDI3Mjg5Li5mNTlkOGMwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDgt MTAgIFBpZXJyZSBkJ0hlcmJlbW9udCAgPHBkaGVyYmVtb250QGZyZWUuZnI+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgY29tbWl0LWxvZy1lZGl0b3Ig ZG9lcyBub3Qgc3VwcG9ydCBhbGwgdGhlIGVtYWlsIGNvbmZpZyB0aGF0IHByZXBhcmUtQ2hhbmdl bG9nIHN1cHBvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yODE2OAorCisgICAgICAgICogU2NyaXB0cy9WQ1NVdGlscy5wbTogTW92ZSBnaXRDb25m aWcoKSB0byBWQ1NVdGlscy5wbS4KKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9n OiBkaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yOiBVc2UgQ0hBTkdF X0xPR19FTUFJTF9BRERSRVNTCisgICAgICAgIGFuZCBnaXRDb25maWcoInVzZXIuZW1haWwiKS4K KwogMjAwOS0wOC0wNyAgUGllcnJlIGQnSGVyYmVtb250ICA8cGRoZXJiZW1vbnRAYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMu cG0KaW5kZXggNTcxNDg3ZC4uNjJiNzc5YSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy9WQ1NVdGlscy5wbQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCkBAIC0y MTksNCArMjE5LDE4IEBAIHN1YiBtYWtlRmlsZVBhdGhSZWxhdGl2ZSgkKQogICAgIHJldHVybiAk Z2l0Um9vdCAuICRwYXRoOwogfQogCitzdWIgZ2l0Q29uZmlnKCQpCit7CisgICAgcmV0dXJuIHVu bGVzcyAkaXNHaXQ7CisgICAgCisgICAgbXkgKCRjb25maWcpID0gQF87CisgICAgCisgICAgbXkg JHJlc3VsdCA9IGBnaXQgY29uZmlnICRjb25maWdgOworICAgIGlmICgoJD8gPj4gOCkgIT0gMCkg eworICAgICAgICAkcmVzdWx0ID0gYGdpdCByZXBvLWNvbmZpZyAkY29uZmlnYDsKKyAgICB9Cisg ICAgY2hvbXAgJHJlc3VsdDsKKyAgICByZXR1cm4gJHJlc3VsdDsKK30KKwogMTsKZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IgYi9XZWJLaXRUb29scy9T Y3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yCmluZGV4IGI3ODNjY2IuLmZlMTM4YWUgMTAwNzU1Ci0t LSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKKysrIGIvV2ViS2l0VG9v bHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcgpAQCAtMTcxLDcgKzE3MSwxMCBAQCBmb3IgbXkg JGNoYW5nZUxvZyAoQGNoYW5nZUxvZ3MpIHsKIAogICAgICAgICAgICAgIyBBdHRlbXB0IHRvIGlu c2VydCB0aGUgInBhdGNoIGJ5IiBsaW5lLCBhZnRlciB0aGUgZmlyc3QgYmxhbmsgbGluZS4KICAg ICAgICAgICAgIGlmICgkcHJldmlvdXNMaW5lV2FzQmxhbmsgJiYgJGhhc0F1dGhvckluZm9Ub1dy aXRlICYmICRsaW5lQ291bnQgPiAwKSB7Ci0gICAgICAgICAgICAgICAgbXkgJGF1dGhvckFuZENv bW1pdHRlckFyZVNhbWVQZXJzb24gPSAkZW1haWwgZXEgJEVOVnsnRU1BSUxfQUREUkVTUyd9Owor ICAgICAgICAgICAgICAgIG15ICRjb21taXR0ZXJFbWFpbCA9ICRFTlZ7Q0hBTkdFX0xPR19FTUFJ TF9BRERSRVNTfQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfHwgJEVOVntF TUFJTF9BRERSRVNTfQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfHwgZ2l0 Q29uZmlnKCJ1c2VyLmVtYWlsIik7CisgICAgICAgICAgICAgICAgbXkgJGF1dGhvckFuZENvbW1p dHRlckFyZVNhbWVQZXJzb24gPSAkZW1haWwgZXEgJGNvbW1pdHRlckVtYWlsOwogICAgICAgICAg ICAgICAgIGlmICghJGF1dGhvckFuZENvbW1pdHRlckFyZVNhbWVQZXJzb24pIHsKICAgICAgICAg ICAgICAgICAgICAgJGNvbnRlbnRzIC49ICJQYXRjaCBieSAkYXV0aG9yIDwkZW1haWw+IG9uICRk YXRlXG4iOwogICAgICAgICAgICAgICAgICAgICAkaGFzQXV0aG9ySW5mb1RvV3JpdGUgPSAwOwpk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKaW5kZXggYzNlMmNlZi4uMjhkY2E2MyAx MDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZworKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCkBAIC03NCw3ICs3NCw2IEBAIHN1 YiBjcmVhdGVQYXRjaENvbW1hbmQoJCk7CiBzdWIgZGlmZkhlYWRlckZvcm1hdCgpOwogc3ViIGZp bmRPcmlnaW5hbEZpbGVGcm9tU3ZuKCQpOwogc3ViIGdlbmVyYXRlRmlsZUxpc3QoXEBcQFwlKTsK LXN1YiBnaXRDb25maWcoJCk7CiBzdWIgaXNNb2RpZmllZFN0YXR1cygkKTsKIHN1YiBpc0FkZGVk U3RhdHVzKCQpOwogc3ViIGlzQ29uZmxpY3RTdGF0dXMoJCk7CkBAIC0xNDE1LDIwICsxNDE0LDYg QEAgc3ViIGdlbmVyYXRlRmlsZUxpc3QoXEBcQFwlKQogICAgIGNsb3NlIFNUQVQ7CiB9CiAKLXN1 YiBnaXRDb25maWcoJCkKLXsKLSAgICByZXR1cm4gdW5sZXNzICRpc0dpdDsKLQotICAgIG15ICgk Y29uZmlnKSA9IEBfOwotCi0gICAgbXkgJHJlc3VsdCA9IGAkR0lUIGNvbmZpZyAkY29uZmlnYDsK LSAgICBpZiAoKCQ/ID4+IDgpICE9IDApIHsKLSAgICAgICAgJHJlc3VsdCA9IGAkR0lUIHJlcG8t Y29uZmlnICRjb25maWdgOwotICAgIH0KLSAgICBjaG9tcCAkcmVzdWx0OwotICAgIHJldHVybiAk cmVzdWx0OwotfQotCiBzdWIgaXNNb2RpZmllZFN0YXR1cygkKQogewogICAgIG15ICgkc3RhdHVz KSA9IEBfOw== 34528 2009-08-10 17:23:36 -0700 2009-11-07 04:56:24 -0800 commit-log-editor does not support all the email config that prepare-Changelog supports bug-28168-20090811022334.patch text/plain 5972 pdherbemont ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxZDI3Mjg5Li5lNTFmMzUxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDgt MTAgIFBpZXJyZSBkJ0hlcmJlbW9udCAgPHBkaGVyYmVtb250QHdlYmtpdC5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgY29tbWl0LWxvZy1lZGl0 b3IgZG9lcyBub3Qgc3VwcG9ydCBhbGwgdGhlIGVtYWlsIGNvbmZpZyB0aGF0IHByZXBhcmUtQ2hh bmdlbG9nIHN1cHBvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yODE2OAorCisgICAgICAgICogU2NyaXB0cy9WQ1NVdGlscy5wbTogTW92ZSBnaXRD b25maWcoKSB0byBWQ1NVdGlscy5wbS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06 IE1vdmUgY2hhbmdlTG9nRW1haWxBZGRyZXNzKCkgdG8gd2Via2l0ZGlycy5wbS4KKyAgICAgICAg KiBTY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nOiBkaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2Nv bW1pdC1sb2ctZWRpdG9yOiBVc2UgY2hhbmdlTG9nRW1haWxBZGRyZXNzKCkuCisKIDIwMDktMDgt MDcgIFBpZXJyZSBkJ0hlcmJlbW9udCAgPHBkaGVyYmVtb250QGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Njcmlw dHMvVkNTVXRpbHMucG0gYi9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCmluZGV4IDU3 MTQ4N2QuLjFmMzkxMGYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMu cG0KKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQpAQCAtMjE5LDQgKzIxOSwx OCBAQCBzdWIgbWFrZUZpbGVQYXRoUmVsYXRpdmUoJCkKICAgICByZXR1cm4gJGdpdFJvb3QgLiAk cGF0aDsKIH0KIAorc3ViIGdpdENvbmZpZygkKQoreworICAgIHJldHVybiB1bmxlc3MgJGlzR2l0 OworICAgIAorICAgIG15ICgkY29uZmlnKSA9IEBfOworICAgIAorICAgIG15ICRyZXN1bHQgPSBg Z2l0IGNvbmZpZyAkY29uZmlnYDsKKyAgICBpZiAoZXhpdFN0YXR1cygkPykgIT0gMCkgeworICAg ICAgICAkcmVzdWx0ID0gYGdpdCByZXBvLWNvbmZpZyAkY29uZmlnYDsKKyAgICB9CisgICAgY2hv bXAgJHJlc3VsdDsKKyAgICByZXR1cm4gJHJlc3VsdDsKK30KKwogMTsKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IgYi9XZWJLaXRUb29scy9TY3JpcHRz L2NvbW1pdC1sb2ctZWRpdG9yCmluZGV4IGI3ODNjY2IuLmM3Nzk2OGQgMTAwNzU1Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy9jb21taXQtbG9nLWVkaXRvcgpAQCAtMTcxLDcgKzE3MSw4IEBAIGZvciBteSAkY2hhbmdl TG9nIChAY2hhbmdlTG9ncykgewogCiAgICAgICAgICAgICAjIEF0dGVtcHQgdG8gaW5zZXJ0IHRo ZSAicGF0Y2ggYnkiIGxpbmUsIGFmdGVyIHRoZSBmaXJzdCBibGFuayBsaW5lLgogICAgICAgICAg ICAgaWYgKCRwcmV2aW91c0xpbmVXYXNCbGFuayAmJiAkaGFzQXV0aG9ySW5mb1RvV3JpdGUgJiYg JGxpbmVDb3VudCA+IDApIHsKLSAgICAgICAgICAgICAgICBteSAkYXV0aG9yQW5kQ29tbWl0dGVy QXJlU2FtZVBlcnNvbiA9ICRlbWFpbCBlcSAkRU5WeydFTUFJTF9BRERSRVNTJ307CisgICAgICAg ICAgICAgICAgbXkgJGNvbW1pdHRlckVtYWlsID0gY2hhbmdlTG9nRW1haWxBZGRyZXNzKCk7Cisg ICAgICAgICAgICAgICAgbXkgJGF1dGhvckFuZENvbW1pdHRlckFyZVNhbWVQZXJzb24gPSAkZW1h aWwgZXEgJGNvbW1pdHRlckVtYWlsOwogICAgICAgICAgICAgICAgIGlmICghJGF1dGhvckFuZENv bW1pdHRlckFyZVNhbWVQZXJzb24pIHsKICAgICAgICAgICAgICAgICAgICAgJGNvbnRlbnRzIC49 ICJQYXRjaCBieSAkYXV0aG9yIDwkZW1haWw+IG9uICRkYXRlXG4iOwogICAgICAgICAgICAgICAg ICAgICAkaGFzQXV0aG9ySW5mb1RvV3JpdGUgPSAwOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1D aGFuZ2VMb2cKaW5kZXggYzNlMmNlZi4uNjVlOTlkYyAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3ByZXBh cmUtQ2hhbmdlTG9nCkBAIC02Miw5ICs2MiwxMCBAQCB1c2UgR2V0b3B0OjpMb25nOwogdXNlIGxp YiAkRmluZEJpbjo6QmluOwogdXNlIFBPU0lYIHF3KHN0cmZ0aW1lKTsKIHVzZSBWQ1NVdGlsczsK K3VzZSB3ZWJraXRkaXJzOwogCiBzdWIgY2hhbmdlTG9nRGF0ZSgkKTsKLXN1YiBjaGFuZ2VMb2dF bWFpbEFkZHJlc3MoJCk7CitzdWIgY2hhbmdlTG9nRW1haWxBZGRyZXNzRnJvbUFyZ3MoJCk7CiBz dWIgY2hhbmdlTG9nTmFtZSgkKTsKIHN1YiBmaXJzdERpcmVjdG9yeU9yQ3dkKCk7CiBzdWIgZGlm ZkZyb21Ub1N0cmluZygpOwpAQCAtNzQsNyArNzUsNiBAQCBzdWIgY3JlYXRlUGF0Y2hDb21tYW5k KCQpOwogc3ViIGRpZmZIZWFkZXJGb3JtYXQoKTsKIHN1YiBmaW5kT3JpZ2luYWxGaWxlRnJvbVN2 bigkKTsKIHN1YiBnZW5lcmF0ZUZpbGVMaXN0KFxAXEBcJSk7Ci1zdWIgZ2l0Q29uZmlnKCQpOwog c3ViIGlzTW9kaWZpZWRTdGF0dXMoJCk7CiBzdWIgaXNBZGRlZFN0YXR1cygkKTsKIHN1YiBpc0Nv bmZsaWN0U3RhdHVzKCQpOwpAQCAtMjQ2LDcgKzI0Niw3IEBAIGlmICglY2hhbmdlZF9saW5lX3Jh bmdlcykgewogIyBHZXQgc29tZSBwYXJhbWV0ZXJzIGZvciB0aGUgQ2hhbmdlTG9nIHdlIGFyZSBh Ym91dCB0byB3cml0ZS4KIG15ICRkYXRlID0gY2hhbmdlTG9nRGF0ZSgkY2hhbmdlTG9nVGltZVpv bmUpOwogJG5hbWUgPSBjaGFuZ2VMb2dOYW1lKCRuYW1lKTsKLSRlbWFpbEFkZHJlc3MgPSBjaGFu Z2VMb2dFbWFpbEFkZHJlc3MoJGVtYWlsQWRkcmVzcyk7CiskZW1haWxBZGRyZXNzID0gY2hhbmdl TG9nRW1haWxBZGRyZXNzRnJvbUFyZ3MoJGVtYWlsQWRkcmVzcyk7CiAKIHByaW50IFNUREVSUiAi ICBDaGFuZ2UgYXV0aG9yOiAkbmFtZSA8JGVtYWlsQWRkcmVzcz4uXG4iOwogCkBAIC00OTAsMzAg KzQ5MCwxMyBAQCBzdWIgY2hhbmdlTG9nTmFtZSgkKQogICAgIHJldHVybiAkbmFtZTsKIH0KIAot c3ViIGNoYW5nZUxvZ0VtYWlsQWRkcmVzc0Vycm9yKCQpCi17Ci0gICAgbXkgKCRtZXNzYWdlKSA9 IEBfOwotICAgIHByaW50IFNUREVSUiAiJG1lc3NhZ2VcbkVpdGhlcjpcbiI7Ci0gICAgcHJpbnQg U1RERVJSICIgIHNldCBDSEFOR0VfTE9HX0VNQUlMX0FERFJFU1MgaW4geW91ciBlbnZpcm9ubWVu dFxuIjsKLSAgICBwcmludCBTVERFUlIgIiAgT1IgcGFzcyAtLWVtYWlsPSBvbiB0aGUgY29tbWFu ZCBsaW5lXG4iOwotICAgIHByaW50IFNUREVSUiAiICBPUiBzZXQgRU1BSUxfQUREUkVTUyBpbiB5 b3VyIGVudmlyb25tZW50XG4iOwotICAgIHByaW50IFNUREVSUiAiICBPUiBnaXQgdXNlcnMgY2Fu IHNldCAnZ2l0IGNvbmZpZyB1c2VyLmVtYWlsJ1xuIjsKLSAgICBleGl0KDEpOwotfQogCi1zdWIg Y2hhbmdlTG9nRW1haWxBZGRyZXNzKCQpCitzdWIgY2hhbmdlTG9nRW1haWxBZGRyZXNzRnJvbUFy Z3MoJCkKIHsKICAgICBteSAoJGVtYWlsQWRkcmVzc0Zyb21BcmdzKSA9IEBfOwogICAgICMgU2ls ZW50bHkgYWxsb3cgLS1naXQtY29tbWl0IHRvIHdpbiwgd2UgY291bGQgd2FybiBpZiAkZW1haWxB ZGRyZXNzRnJvbUFyZ3MgaXMgZGVmaW5lZC4KICAgICByZXR1cm4gYCRHSVQgbG9nIC0tbWF4LWNv dW50PTEgLS1wcmV0dHk9XCJmb3JtYXQ6JWFlXCIgXCIkZ2l0Q29tbWl0XCJgIGlmICRnaXRDb21t aXQ7Ci0KLSAgICBteSAkZW1haWxBZGRyZXNzID0gJGVtYWlsQWRkcmVzc0Zyb21BcmdzCi0gICAg ICAgIHx8ICRFTlZ7Q0hBTkdFX0xPR19FTUFJTF9BRERSRVNTfQotICAgICAgICB8fCAkRU5We0VN QUlMX0FERFJFU1N9Ci0gICAgICAgIHx8IGdpdENvbmZpZygidXNlci5lbWFpbCIpOwotCi0gICAg Y2hhbmdlTG9nRW1haWxBZGRyZXNzRXJyb3IoIkZhaWxlZCB0byBkZXRlcm1pbmUgZW1haWwgYWRk cmVzcyBmb3IgQ2hhbmdlTG9nLiIpIHVubGVzcyAkZW1haWxBZGRyZXNzOwotICAgIGNoYW5nZUxv Z0VtYWlsQWRkcmVzc0Vycm9yKCJFbWFpbCBhZGRyZXNzICckZW1haWxBZGRyZXNzJyBkb2VzIG5v dCBjb250YWluICdcQCcgYW5kIGlzIGxpa2VseSBpbnZhbGlkLiIpIHVubGVzcyAoJGVtYWlsQWRk cmVzcyA9fiAvXEAvKTsKKyAgICBteSAkZW1haWxBZGRyZXNzID0gJGVtYWlsQWRkcmVzc0Zyb21B cmdzIHx8IGNoYW5nZUxvZ0VtYWlsQWRkcmVzcygpOwogCiAgICAgcmV0dXJuICRlbWFpbEFkZHJl c3M7CiB9CkBAIC0xNDE1LDIwICsxMzk4LDYgQEAgc3ViIGdlbmVyYXRlRmlsZUxpc3QoXEBcQFwl KQogICAgIGNsb3NlIFNUQVQ7CiB9CiAKLXN1YiBnaXRDb25maWcoJCkKLXsKLSAgICByZXR1cm4g dW5sZXNzICRpc0dpdDsKLQotICAgIG15ICgkY29uZmlnKSA9IEBfOwotCi0gICAgbXkgJHJlc3Vs dCA9IGAkR0lUIGNvbmZpZyAkY29uZmlnYDsKLSAgICBpZiAoKCQ/ID4+IDgpICE9IDApIHsKLSAg ICAgICAgJHJlc3VsdCA9IGAkR0lUIHJlcG8tY29uZmlnICRjb25maWdgOwotICAgIH0KLSAgICBj aG9tcCAkcmVzdWx0OwotICAgIHJldHVybiAkcmVzdWx0OwotfQotCiBzdWIgaXNNb2RpZmllZFN0 YXR1cygkKQogewogICAgIG15ICgkc3RhdHVzKSA9IEBfOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCmluZGV4IGQ4Y2NkM2EuLjM1NGZmMTggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0K QEAgLTEzMDMsNCArMTMwMywyNyBAQCBzdWIgcnVuU2FmYXJpCiAgICAgcmV0dXJuIDE7CiB9CiAK K3N1YiBjaGFuZ2VMb2dFbWFpbEFkZHJlc3NFcnJvcigkKQoreworICAgIG15ICgkbWVzc2FnZSkg PSBAXzsKKyAgICBwcmludCBTVERFUlIgIiRtZXNzYWdlXG5FaXRoZXI6XG4iOworICAgIHByaW50 IFNUREVSUiAiICBzZXQgQ0hBTkdFX0xPR19FTUFJTF9BRERSRVNTIGluIHlvdXIgZW52aXJvbm1l bnRcbiI7CisgICAgcHJpbnQgU1RERVJSICIgIE9SIHBhc3MgLS1lbWFpbD0gb24gdGhlIGNvbW1h bmQgbGluZVxuIjsKKyAgICBwcmludCBTVERFUlIgIiAgT1Igc2V0IEVNQUlMX0FERFJFU1MgaW4g eW91ciBlbnZpcm9ubWVudFxuIjsKKyAgICBwcmludCBTVERFUlIgIiAgT1IgZ2l0IHVzZXJzIGNh biBzZXQgJ2dpdCBjb25maWcgdXNlci5lbWFpbCdcbiI7CisgICAgZXhpdCgxKTsKK30KKworc3Vi IGNoYW5nZUxvZ0VtYWlsQWRkcmVzcygpCit7ICAgIAorICAgIG15ICRlbWFpbEFkZHJlc3MgPSAk RU5We0NIQU5HRV9MT0dfRU1BSUxfQUREUkVTU30KKyAgICB8fCAkRU5We0VNQUlMX0FERFJFU1N9 CisgICAgfHwgZ2l0Q29uZmlnKCJ1c2VyLmVtYWlsIik7CisgICAgCisgICAgY2hhbmdlTG9nRW1h aWxBZGRyZXNzRXJyb3IoIkZhaWxlZCB0byBkZXRlcm1pbmUgZW1haWwgYWRkcmVzcyBmb3IgQ2hh bmdlTG9nLiIpIHVubGVzcyAkZW1haWxBZGRyZXNzOworICAgIGNoYW5nZUxvZ0VtYWlsQWRkcmVz c0Vycm9yKCJFbWFpbCBhZGRyZXNzICckZW1haWxBZGRyZXNzJyBkb2VzIG5vdCBjb250YWluICdc QCcgYW5kIGlzIGxpa2VseSBpbnZhbGlkLiIpIHVubGVzcyAoJGVtYWlsQWRkcmVzcyA9fiAvXEAv KTsKKyAgICAKKyAgICByZXR1cm4gJGVtYWlsQWRkcmVzczsKK30KKwogMTs= 42692 2009-11-07 04:56:24 -0800 2009-11-07 14:12:52 -0800 Tidied patch 0001-Fix-https-bugs.webkit.org-show_bug.cgi-id-28168.patch text/plain 9752 mrowe RnJvbSA1YjU0ZGEyMTVlNzc1ODc2YTg0YTFjZjhlMzMyZmViMjEyOWU2Yzk5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrIFJvd2UgPG1yb3dlQGFwcGxlLmNvbT4KRGF0ZTogU2F0 LCA3IE5vdiAyMDA5IDA0OjU1OjI3IC0wODAwClN1YmplY3Q6IFtQQVRDSF0gRml4IDxodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgxNjg+LgogY29tbWl0LWxvZy1lZGl0 b3IgZG9lcyBub3Qgc3VwcG9ydCBhbGwgdGhlIGVtYWlsIGFkZHJlc3MgY29uZmlndXJhdGlvbnMg dGhhdCBwcmVwYXJlLUNoYW5nZWxvZyBzdXBwb3J0cwoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCgpNb3ZlIGxvZ2ljIGZvciBkZXRlcm1pbmluZyB0aGUgbmFtZSBhbmQgZW1haWwgYWRkcmVz cyB0byB1c2UgaW4gYSBDaGFuZ2VMb2cgZW50cnkgZnJvbQpwcmVwYXJlLUNoYW5nZUxvZyB0byBW Q1NVdGlscyBzbyB0aGF0IGNvbW1pdC1sb2ctZWRpdG9yIGNhbiB1c2UgaXQuICBJdCB3YW50cyB0 byBjaGVjawp3aGV0aGVyIHRoZSBhdXRob3Igb2YgdGhlIHBhdGNoIG1hdGNoZXMgY29tbWl0dGVy LCBhbmQgdGhlcmVmb3JlIG5lZWRzIGFjY2VzcyB0byB0aGUKZW1haWwgYWRkcmVzcyB0aGF0IHdv dWxkIGJlIHVzZWQgaW4gYSBDaGFuZ2VMb2cgZW50cnkuCgpCYXNlZCBvbiBhIHBhdGNoIGJ5IFBp ZXJyZSBkJ0hlcmJlbW9udC4KCiogU2NyaXB0cy9WQ1NVdGlscy5wbToKKiBTY3JpcHRzL2NvbW1p dC1sb2ctZWRpdG9yOgoqIFNjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2c6CiogU2NyaXB0cy93ZWJr aXRkaXJzLnBtOgotLS0KIFdlYktpdFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgfCAg IDE5ICsrKysrKysrKwogV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbSAgICAgICB8ICAg NTkgKysrKysrKysrKysrKysrKysrKysrKysrKysKIFdlYktpdFRvb2xzL1NjcmlwdHMvY29tbWl0 LWxvZy1lZGl0b3IgfCAgICAzICstCiBXZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdl TG9nIHwgICA3MyArKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hh bmdlZCwgODkgaW5zZXJ0aW9ucygrKSwgNjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGRhZjFhZGUu LmE0YTJjNjkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRU b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAwOS0xMS0wNyAgTWFyayBSb3dlICA8 bXJvd2VAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZpeCA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4 MTY4Pi4KKyAgICAgICAgY29tbWl0LWxvZy1lZGl0b3IgZG9lcyBub3Qgc3VwcG9ydCBhbGwgdGhl IGVtYWlsIGFkZHJlc3MgY29uZmlndXJhdGlvbnMgdGhhdCBwcmVwYXJlLUNoYW5nZWxvZyBzdXBw b3J0cworCisgICAgICAgIE1vdmUgbG9naWMgZm9yIGRldGVybWluaW5nIHRoZSBuYW1lIGFuZCBl bWFpbCBhZGRyZXNzIHRvIHVzZSBpbiBhIENoYW5nZUxvZyBlbnRyeSBmcm9tCisgICAgICAgIHBy ZXBhcmUtQ2hhbmdlTG9nIHRvIFZDU1V0aWxzIHNvIHRoYXQgY29tbWl0LWxvZy1lZGl0b3IgY2Fu IHVzZSBpdC4gIEl0IHdhbnRzIHRvIGNoZWNrCisgICAgICAgIHdoZXRoZXIgdGhlIGF1dGhvciBv ZiB0aGUgcGF0Y2ggbWF0Y2hlcyBjb21taXR0ZXIsIGFuZCB0aGVyZWZvcmUgbmVlZHMgYWNjZXNz IHRvIHRoZQorICAgICAgICBlbWFpbCBhZGRyZXNzIHRoYXQgd291bGQgYmUgdXNlZCBpbiBhIENo YW5nZUxvZyBlbnRyeS4KKworICAgICAgICBCYXNlZCBvbiBhIHBhdGNoIGJ5IFBpZXJyZSBkJ0hl cmJlbW9udC4KKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAgICogU2Ny aXB0cy9jb21taXQtbG9nLWVkaXRvcjoKKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUtQ2hhbmdl TG9nOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKwogMjAwOS0xMS0wNiAgQW5h bnRhbmFyYXlhbmFuIEcgSXllbmdhciAgPGFuYW50YUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv VkNTVXRpbHMucG0gYi9XZWJLaXRUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCmluZGV4IGQ5NDUy MWUuLmFiZjczMzUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0K KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQpAQCAtNDEsNiArNDEsOCBAQCBC RUdJTiB7CiAgICAgQElTQSAgICAgICAgID0gcXcoRXhwb3J0ZXIpOwogICAgIEBFWFBPUlQgICAg ICA9IHF3KAogICAgICAgICAmY2Fub25pY2FsaXplUGF0aAorICAgICAgICAmY2hhbmdlTG9nRW1h aWxBZGRyZXNzCisgICAgICAgICZjaGFuZ2VMb2dOYW1lCiAgICAgICAgICZjaGRpclJldHVybmlu Z1JlbGF0aXZlUGF0aAogICAgICAgICAmZGV0ZXJtaW5lU1ZOUm9vdAogICAgICAgICAmZGV0ZXJt aW5lVkNTUm9vdApAQCAtNDE1LDQgKzQxNyw2MSBAQCBzdWIgZml4Q2hhbmdlTG9nUGF0Y2goJCkK ICAgICByZXR1cm4gam9pbigkbGluZUVuZGluZywgQHBhdGNoTGluZXMpIC4gIlxuIjsgIyBwYXRj aCgxKSBleHBlY3RzIGFuIGV4dHJhIHRyYWlsaW5nIG5ld2xpbmUuCiB9CiAKK3N1YiBnaXRDb25m aWcoJCkKK3sKKyAgICByZXR1cm4gdW5sZXNzICRpc0dpdDsKKworICAgIG15ICgkY29uZmlnKSA9 IEBfOworCisgICAgbXkgJHJlc3VsdCA9IGBnaXQgY29uZmlnICRjb25maWdgOworICAgIGlmICgo JD8gPj4gOCkpIHsKKyAgICAgICAgJHJlc3VsdCA9IGBnaXQgcmVwby1jb25maWcgJGNvbmZpZ2A7 CisgICAgfQorICAgIGNob21wICRyZXN1bHQ7CisgICAgcmV0dXJuICRyZXN1bHQ7Cit9CisKK3N1 YiBjaGFuZ2VMb2dOYW1lRXJyb3IoJCkKK3sKKyAgICBteSAoJG1lc3NhZ2UpID0gQF87CisgICAg cHJpbnQgU1RERVJSICIkbWVzc2FnZVxuRWl0aGVyOlxuIjsKKyAgICBwcmludCBTVERFUlIgIiAg c2V0IENIQU5HRV9MT0dfTkFNRSBpbiB5b3VyIGVudmlyb25tZW50XG4iOworICAgIHByaW50IFNU REVSUiAiICBPUiBwYXNzIC0tbmFtZT0gb24gdGhlIGNvbW1hbmQgbGluZVxuIjsKKyAgICBwcmlu dCBTVERFUlIgIiAgT1Igc2V0IFJFQUxfTkFNRSBpbiB5b3VyIGVudmlyb25tZW50IjsKKyAgICBw cmludCBTVERFUlIgIiAgT1IgZ2l0IHVzZXJzIGNhbiBzZXQgJ2dpdCBjb25maWcgdXNlci5uYW1l J1xuIjsKKyAgICBleGl0KDEpOworfQorCitzdWIgY2hhbmdlTG9nTmFtZSgpCit7CisgICAgbXkg JG5hbWUgPSAkRU5We0NIQU5HRV9MT0dfTkFNRX0gfHwgJEVOVntSRUFMX05BTUV9IHx8IGdpdENv bmZpZygidXNlci5uYW1lIikgfHwgKHNwbGl0IC9ccyosXHMqLywgKGdldHB3dWlkICQ8KVs2XSlb MF07CisKKyAgICBjaGFuZ2VMb2dOYW1lRXJyb3IoIkZhaWxlZCB0byBkZXRlcm1pbmUgQ2hhbmdl TG9nIG5hbWUuIikgdW5sZXNzICRuYW1lOworICAgICMgZ2V0cHd1aWQgc2VlbXMgdG8gYWx3YXlz IHN1Y2NlZWQgb24gd2luZG93cywgcmV0dXJuaW5nIHRoZSB1c2VybmFtZSBpbnN0ZWFkIG9mIHRo ZSBmdWxsIG5hbWUuICBUaGlzIGNoZWNrIHdpbGwgY2F0Y2ggdGhhdCBjYXNlLgorICAgIGNoYW5n ZUxvZ05hbWVFcnJvcigiJyRuYW1lJyBkb2VzIG5vdCBjb250YWluIGEgc3BhY2UhICBDaGFuZ2VM b2dzIHNob3VsZCBjb250YWluIHlvdXIgZnVsbCBuYW1lLiIpIHVubGVzcyAoJG5hbWUgPX4gL1x3 IFx3Lyk7CisKKyAgICByZXR1cm4gJG5hbWU7Cit9CisKK3N1YiBjaGFuZ2VMb2dFbWFpbEFkZHJl c3NFcnJvcigkKQoreworICAgIG15ICgkbWVzc2FnZSkgPSBAXzsKKyAgICBwcmludCBTVERFUlIg IiRtZXNzYWdlXG5FaXRoZXI6XG4iOworICAgIHByaW50IFNUREVSUiAiICBzZXQgQ0hBTkdFX0xP R19FTUFJTF9BRERSRVNTIGluIHlvdXIgZW52aXJvbm1lbnRcbiI7CisgICAgcHJpbnQgU1RERVJS ICIgIE9SIHBhc3MgLS1lbWFpbD0gb24gdGhlIGNvbW1hbmQgbGluZVxuIjsKKyAgICBwcmludCBT VERFUlIgIiAgT1Igc2V0IEVNQUlMX0FERFJFU1MgaW4geW91ciBlbnZpcm9ubWVudFxuIjsKKyAg ICBwcmludCBTVERFUlIgIiAgT1IgZ2l0IHVzZXJzIGNhbiBzZXQgJ2dpdCBjb25maWcgdXNlci5l bWFpbCdcbiI7CisgICAgZXhpdCgxKTsKK30KKworc3ViIGNoYW5nZUxvZ0VtYWlsQWRkcmVzcygp Cit7CisgICAgbXkgJGVtYWlsQWRkcmVzcyA9ICRFTlZ7Q0hBTkdFX0xPR19FTUFJTF9BRERSRVNT fSB8fCAkRU5We0VNQUlMX0FERFJFU1N9IHx8IGdpdENvbmZpZygidXNlci5lbWFpbCIpOworCisg ICAgY2hhbmdlTG9nRW1haWxBZGRyZXNzRXJyb3IoIkZhaWxlZCB0byBkZXRlcm1pbmUgZW1haWwg YWRkcmVzcyBmb3IgQ2hhbmdlTG9nLiIpIHVubGVzcyAkZW1haWxBZGRyZXNzOworICAgIGNoYW5n ZUxvZ0VtYWlsQWRkcmVzc0Vycm9yKCJFbWFpbCBhZGRyZXNzICckZW1haWxBZGRyZXNzJyBkb2Vz IG5vdCBjb250YWluICdcQCcgYW5kIGlzIGxpa2VseSBpbnZhbGlkLiIpIHVubGVzcyAoJGVtYWls QWRkcmVzcyA9fiAvXEAvKTsKKworICAgIHJldHVybiAkZW1haWxBZGRyZXNzOworfQorCiAxOwpk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvciBiL1dlYktp dFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKaW5kZXggZTU4YjE4MS4uMThkNjgyZiAx MDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcgorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yCkBAIC0xNzAsNyArMTcwLDggQEAg Zm9yIG15ICRjaGFuZ2VMb2cgKEBjaGFuZ2VMb2dzKSB7CiAKICAgICAgICAgICAgICMgQXR0ZW1w dCB0byBpbnNlcnQgdGhlICJwYXRjaCBieSIgbGluZSwgYWZ0ZXIgdGhlIGZpcnN0IGJsYW5rIGxp bmUuCiAgICAgICAgICAgICBpZiAoJHByZXZpb3VzTGluZVdhc0JsYW5rICYmICRoYXNBdXRob3JJ bmZvVG9Xcml0ZSAmJiAkbGluZUNvdW50ID4gMCkgewotICAgICAgICAgICAgICAgIG15ICRhdXRo b3JBbmRDb21taXR0ZXJBcmVTYW1lUGVyc29uID0gJEVOVntFTUFJTF9BRERSRVNTfSAmJiAkZW1h aWwgZXEgJEVOVntFTUFJTF9BRERSRVNTfTsKKyAgICAgICAgICAgICAgICBteSAkY29tbWl0dGVy RW1haWwgPSBjaGFuZ2VMb2dFbWFpbEFkZHJlc3MoKTsKKyAgICAgICAgICAgICAgICBteSAkYXV0 aG9yQW5kQ29tbWl0dGVyQXJlU2FtZVBlcnNvbiA9ICRlbWFpbCBlcSAkY29tbWl0dGVyRW1haWw7 CiAgICAgICAgICAgICAgICAgaWYgKCEkYXV0aG9yQW5kQ29tbWl0dGVyQXJlU2FtZVBlcnNvbikg ewogICAgICAgICAgICAgICAgICAgICAkY29udGVudHMgLj0gIlBhdGNoIGJ5ICRhdXRob3IgPCRl bWFpbD4gb24gJGRhdGVcbiI7CiAgICAgICAgICAgICAgICAgICAgICRoYXNBdXRob3JJbmZvVG9X cml0ZSA9IDA7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdl TG9nIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwppbmRleCBkZDg2NGRm Li40YzU5YWY5IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdl TG9nCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKQEAgLTY1LDgg KzY1LDggQEAgdXNlIFBPU0lYIHF3KHN0cmZ0aW1lKTsKIHVzZSBWQ1NVdGlsczsKIAogc3ViIGNo YW5nZUxvZ0RhdGUoJCk7Ci1zdWIgY2hhbmdlTG9nRW1haWxBZGRyZXNzKCQpOwotc3ViIGNoYW5n ZUxvZ05hbWUoJCk7CitzdWIgY2hhbmdlTG9nRW1haWxBZGRyZXNzRnJvbUFyZ3MoJCk7CitzdWIg Y2hhbmdlTG9nTmFtZUZyb21BcmdzKCQpOwogc3ViIGZpcnN0RGlyZWN0b3J5T3JDd2QoKTsKIHN1 YiBkaWZmRnJvbVRvU3RyaW5nKCk7CiBzdWIgZGlmZkNvbW1hbmQoQCk7CkBAIC03Nyw3ICs3Nyw2 IEBAIHN1YiBmaW5kT3JpZ2luYWxGaWxlRnJvbVN2bigkKTsKIHN1YiBkZXRlcm1pbmVQcm9wZXJ0 eUNoYW5nZXMoJCQkKTsKIHN1YiBwbHVyYWxpemVBbmRMaXN0KCQkQCk7CiBzdWIgZ2VuZXJhdGVG aWxlTGlzdChcQFxAXCUpOwotc3ViIGdpdENvbmZpZygkKTsKIHN1YiBpc1VubW9kaWZpZWRTdGF0 dXMoJCk7CiBzdWIgaXNNb2RpZmllZFN0YXR1cygkKTsKIHN1YiBpc0FkZGVkU3RhdHVzKCQpOwpA QCAtMjQ2LDggKzI0NSw4IEBAIGlmICglY2hhbmdlZF9saW5lX3JhbmdlcykgewogCiAjIEdldCBz b21lIHBhcmFtZXRlcnMgZm9yIHRoZSBDaGFuZ2VMb2cgd2UgYXJlIGFib3V0IHRvIHdyaXRlLgog bXkgJGRhdGUgPSBjaGFuZ2VMb2dEYXRlKCRjaGFuZ2VMb2dUaW1lWm9uZSk7Ci0kbmFtZSA9IGNo YW5nZUxvZ05hbWUoJG5hbWUpOwotJGVtYWlsQWRkcmVzcyA9IGNoYW5nZUxvZ0VtYWlsQWRkcmVz cygkZW1haWxBZGRyZXNzKTsKKyRuYW1lID0gY2hhbmdlTG9nTmFtZUZyb21BcmdzKCRuYW1lKTsK KyRlbWFpbEFkZHJlc3MgPSBjaGFuZ2VMb2dFbWFpbEFkZHJlc3NGcm9tQXJncygkZW1haWxBZGRy ZXNzKTsKIAogcHJpbnQgU1RERVJSICIgIENoYW5nZSBhdXRob3I6ICRuYW1lIDwkZW1haWxBZGRy ZXNzPi5cbiI7CiAKQEAgLTQ0Myw2MiArNDQyLDIyIEBAIHN1YiBjaGFuZ2VMb2dEYXRlKCQpCiAg ICAgcmV0dXJuICRkYXRlOwogfQogCi1zdWIgY2hhbmdlTG9nTmFtZUVycm9yKCQpCi17Ci0gICAg bXkgKCRtZXNzYWdlKSA9IEBfOwotICAgIHByaW50IFNUREVSUiAiJG1lc3NhZ2VcbkVpdGhlcjpc biI7Ci0gICAgcHJpbnQgU1RERVJSICIgIHNldCBDSEFOR0VfTE9HX05BTUUgaW4geW91ciBlbnZp cm9ubWVudFxuIjsKLSAgICBwcmludCBTVERFUlIgIiAgT1IgcGFzcyAtLW5hbWU9IG9uIHRoZSBj b21tYW5kIGxpbmVcbiI7Ci0gICAgcHJpbnQgU1RERVJSICIgIE9SIHNldCBSRUFMX05BTUUgaW4g eW91ciBlbnZpcm9ubWVudCI7Ci0gICAgcHJpbnQgU1RERVJSICIgIE9SIGdpdCB1c2VycyBjYW4g c2V0ICdnaXQgY29uZmlnIHVzZXIubmFtZSdcbiI7Ci0gICAgZXhpdCgxKTsKLX0KLQotc3ViIGNo YW5nZUxvZ05hbWUoJCkKK3N1YiBjaGFuZ2VMb2dOYW1lRnJvbUFyZ3MoJCkKIHsKICAgICBteSAo JG5hbWVGcm9tQXJncykgPSBAXzsKLSAgICAjIFNpbGVudGx5IGFsbG93IC0tZ2l0LWNvbW1pdCB0 byB3aW4sIHdlIGNvdWxkIHdhcm4gaWYgJGVtYWlsQWRkcmVzc0Zyb21BcmdzIGlzIGRlZmluZWQu CisgICAgIyBTaWxlbnRseSBhbGxvdyAtLWdpdC1jb21taXQgdG8gd2luLCB3ZSBjb3VsZCB3YXJu IGlmICRuYW1lRnJvbUFyZ3MgaXMgZGVmaW5lZC4KICAgICByZXR1cm4gYCRHSVQgbG9nIC0tbWF4 LWNvdW50PTEgLS1wcmV0dHk9XCJmb3JtYXQ6JWFuXCIgXCIkZ2l0Q29tbWl0XCJgIGlmICRnaXRD b21taXQ7CiAKLSAgICBteSAkbmFtZSA9ICRuYW1lRnJvbUFyZ3MKLSAgICAgICAgfHwgJEVOVntD SEFOR0VfTE9HX05BTUV9Ci0gICAgICAgIHx8ICRFTlZ7UkVBTF9OQU1FfQotICAgICAgICB8fCBn aXRDb25maWcoInVzZXIubmFtZSIpCi0gICAgICAgIHx8IChzcGxpdCAvXHMqLFxzKi8sIChnZXRw d3VpZCAkPClbNl0pWzBdOwotCi0gICAgY2hhbmdlTG9nTmFtZUVycm9yKCJGYWlsZWQgdG8gZGV0 ZXJtaW5lIENoYW5nZUxvZyBuYW1lLiIpIHVubGVzcyAkbmFtZTsKLSAgICAjIGdldHB3dWlkIHNl ZW1zIHRvIGFsd2F5cyBzdWNjZWVkIG9uIHdpbmRvd3MsIHJldHVybmluZyB0aGUgdXNlcm5hbWUg aW5zdGVhZCBvZiB0aGUgZnVsbCBuYW1lLiAgVGhpcyBjaGVjayB3aWxsIGNhdGNoIHRoYXQgY2Fz ZS4KLSAgICBjaGFuZ2VMb2dOYW1lRXJyb3IoIickbmFtZScgZG9lcyBub3QgY29udGFpbiBhIHNw YWNlISAgQ2hhbmdlTG9ncyBzaG91bGQgY29udGFpbiB5b3VyIGZ1bGwgbmFtZS4iKSB1bmxlc3Mg KCRuYW1lID1+IC9cdyBcdy8pOwotCi0gICAgcmV0dXJuICRuYW1lOwotfQotCi1zdWIgY2hhbmdl TG9nRW1haWxBZGRyZXNzRXJyb3IoJCkKLXsKLSAgICBteSAoJG1lc3NhZ2UpID0gQF87Ci0gICAg cHJpbnQgU1RERVJSICIkbWVzc2FnZVxuRWl0aGVyOlxuIjsKLSAgICBwcmludCBTVERFUlIgIiAg c2V0IENIQU5HRV9MT0dfRU1BSUxfQUREUkVTUyBpbiB5b3VyIGVudmlyb25tZW50XG4iOwotICAg IHByaW50IFNUREVSUiAiICBPUiBwYXNzIC0tZW1haWw9IG9uIHRoZSBjb21tYW5kIGxpbmVcbiI7 Ci0gICAgcHJpbnQgU1RERVJSICIgIE9SIHNldCBFTUFJTF9BRERSRVNTIGluIHlvdXIgZW52aXJv bm1lbnRcbiI7Ci0gICAgcHJpbnQgU1RERVJSICIgIE9SIGdpdCB1c2VycyBjYW4gc2V0ICdnaXQg Y29uZmlnIHVzZXIuZW1haWwnXG4iOwotICAgIGV4aXQoMSk7CisgICAgcmV0dXJuICRuYW1lRnJv bUFyZ3MgfHwgY2hhbmdlTG9nTmFtZSgpOwogfQogCi1zdWIgY2hhbmdlTG9nRW1haWxBZGRyZXNz KCQpCitzdWIgY2hhbmdlTG9nRW1haWxBZGRyZXNzRnJvbUFyZ3MoJCkKIHsKICAgICBteSAoJGVt YWlsQWRkcmVzc0Zyb21BcmdzKSA9IEBfOwogICAgICMgU2lsZW50bHkgYWxsb3cgLS1naXQtY29t bWl0IHRvIHdpbiwgd2UgY291bGQgd2FybiBpZiAkZW1haWxBZGRyZXNzRnJvbUFyZ3MgaXMgZGVm aW5lZC4KICAgICByZXR1cm4gYCRHSVQgbG9nIC0tbWF4LWNvdW50PTEgLS1wcmV0dHk9XCJmb3Jt YXQ6JWFlXCIgXCIkZ2l0Q29tbWl0XCJgIGlmICRnaXRDb21taXQ7CiAKLSAgICBteSAkZW1haWxB ZGRyZXNzID0gJGVtYWlsQWRkcmVzc0Zyb21BcmdzCi0gICAgICAgIHx8ICRFTlZ7Q0hBTkdFX0xP R19FTUFJTF9BRERSRVNTfQotICAgICAgICB8fCAkRU5We0VNQUlMX0FERFJFU1N9Ci0gICAgICAg IHx8IGdpdENvbmZpZygidXNlci5lbWFpbCIpOwotCi0gICAgY2hhbmdlTG9nRW1haWxBZGRyZXNz RXJyb3IoIkZhaWxlZCB0byBkZXRlcm1pbmUgZW1haWwgYWRkcmVzcyBmb3IgQ2hhbmdlTG9nLiIp IHVubGVzcyAkZW1haWxBZGRyZXNzOwotICAgIGNoYW5nZUxvZ0VtYWlsQWRkcmVzc0Vycm9yKCJF bWFpbCBhZGRyZXNzICckZW1haWxBZGRyZXNzJyBkb2VzIG5vdCBjb250YWluICdcQCcgYW5kIGlz IGxpa2VseSBpbnZhbGlkLiIpIHVubGVzcyAoJGVtYWlsQWRkcmVzcyA9fiAvXEAvKTsKLQotICAg IHJldHVybiAkZW1haWxBZGRyZXNzOworICAgIHJldHVybiAkZW1haWxBZGRyZXNzRnJvbUFyZ3Mg fHwgY2hhbmdlTG9nRW1haWxBZGRyZXNzKCk7CiB9CiAKIHN1YiBnZXRfZnVuY3Rpb25fbGluZV9y YW5nZXMoJCQpCkBAIC0xNDc3LDIwICsxNDM2LDYgQEAgc3ViIGdlbmVyYXRlRmlsZUxpc3QoXEBc QFwlKQogICAgIGNsb3NlIFNUQVQ7CiB9CiAKLXN1YiBnaXRDb25maWcoJCkKLXsKLSAgICByZXR1 cm4gdW5sZXNzICRpc0dpdDsKLQotICAgIG15ICgkY29uZmlnKSA9IEBfOwotCi0gICAgbXkgJHJl c3VsdCA9IGAkR0lUIGNvbmZpZyAkY29uZmlnYDsKLSAgICBpZiAoKCQ/ID4+IDgpICE9IDApIHsK LSAgICAgICAgJHJlc3VsdCA9IGAkR0lUIHJlcG8tY29uZmlnICRjb25maWdgOwotICAgIH0KLSAg ICBjaG9tcCAkcmVzdWx0OwotICAgIHJldHVybiAkcmVzdWx0OwotfQotCiBzdWIgaXNVbm1vZGlm aWVkU3RhdHVzKCQpCiB7CiAgICAgbXkgKCRzdGF0dXMpID0gQF87Ci0tIAoxLjYuNS4xLjYzLmdh OWQ3Cgo=