27605 2009-07-23 08:14:45 -0700 Improve git workflow by populating commit messages with ChangeLog entries. 2009-07-24 14:18:45 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 1 efidler webkit-unassigned levin manyoso oldest_to_newest 134102 0 efidler 2009-07-23 08:14:45 -0700 For git users, especially those working on local branches, it would be very helpful to have the git commit messages in WebKit ChangeLog entry format. Keeping the ChangeLog entries in the git commits instead of modifying the actual ChangeLog files avoids many conflicts during development (especially when doing rebases). My intention is that the ChangeLog files will be updated properly before the commits are pushed upstream, of course. The change will involve modifying prepare-ChangeLog and commit-log-editor so that using the workflow in http://trac.webkit.org/wiki/UsingGitWithWebKit (specifically using commit-log-editor as the git core.editor) will work nicely. 134105 1 33330 efidler 2009-07-23 08:27:27 -0700 Created attachment 33330 patch to add --[no-]write option to prepare-ChangeLog to put new entries on stdout instead of modifiying ChangeLog files 134111 2 33334 efidler 2009-07-23 08:52:57 -0700 Created attachment 33334 revised patch to handle top-level changes properly 134118 3 33334 manyoso 2009-07-23 09:06:52 -0700 Comment on attachment 33334 revised patch to handle top-level changes properly > diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog > index 26eae74..654f679 100644 > --- a/WebKitTools/ChangeLog > +++ b/WebKitTools/ChangeLog > @@ -1,3 +1,17 @@ > +2009-07-23 Eli Fidler <eli.fidler@torchmobile.com> > + > + Reviewed by NOBODY (OOPS!). > + > + Improve git workflow by populating commit messages with ChangeLog entries. > + https://bugs.webkit.org/show_bug.cgi?id=27605 > + > + add --[no-]write option to optionally output new ChangeLog entries to > + stdout instead of modifying ChangeLog files > + > + fix Torch Mobile copyright Please fix the indentation. > -# Add command line option to put the ChangeLog into a separate > -# file or just spew it out stdout. > +# Add command line option to put the ChangeLog into a separate file. Hmm, so this functionality supposedly existed at one point... > + if ($prefixDir eq "top level") { > + $sortKey = ""; > + } elsif ($prefixDir eq "Tools") { > + $sortKey = "-, just after top level"; > + } elsif ($prefixDir eq "WebBrowser") { > + $sortKey = lc "WebKit, WebBrowser after"; > + } elsif ($prefixDir eq "WebCore") { > + $sortKey = lc "WebFoundation, WebCore after"; I understand that this logic was taken from commit-log-editor. It'd be nice for an explanation of where 'WebBrowser' and 'WebFoundation' come from, but I suspect only the Apple folks would be able to provide that. Still, it is good to match commit-log-editor. The patch looks good minus the minor nits above. One semi-ugly thing is that prepare-ChangeLog also writes to stderr by default a bunch of verbosity. It is not important for our use case, but perhaps a header or a line break should be written to stderr right before we write to stdout to separate the two. r- for the ChangeLog above. Cheers, Adam 134120 4 levin 2009-07-23 09:12:52 -0700 btw, if you feel so inspired, feel free to add your new option to WebKitTools/Scripts/webkit-tools-completion.sh 134124 5 33338 efidler 2009-07-23 09:22:03 -0700 Created attachment 33338 updated patch to fix ChangeLog indentation 134127 6 manyoso 2009-07-23 09:33:33 -0700 First patch landed with r46270. 134259 7 33373 efidler 2009-07-23 14:26:05 -0700 Created attachment 33373 add new prepare-ChangeLog options to bash completion script 134262 8 33376 efidler 2009-07-23 14:32:26 -0700 Created attachment 33376 If the user doesn't modify the ChangeLog files in the git commit, use prepare-ChangeLog to populate the git commit message. 134265 9 33373 levin 2009-07-23 14:38:32 -0700 Comment on attachment 33373 add new prepare-ChangeLog options to bash completion script > +complete -W "--bug --diff --git-commit --git-index --git-reviewer --help --no-update --open --update -d -h -o --write --no-write" prepare-ChangeLog Believe it or not, these are actually all sorted, but this can be fixed on landing. :) 134267 10 33338 levin 2009-07-23 14:40:04 -0700 Comment on attachment 33338 updated patch to fix ChangeLog indentation Clearing r+ since it was landed. 134498 11 33373 levin 2009-07-24 03:52:11 -0700 Comment on attachment 33373 add new prepare-ChangeLog options to bash completion script Clearing r+. Landed as http://trac.webkit.org/changeset/46349 134647 12 33469 efidler 2009-07-24 13:42:14 -0700 Created attachment 33469 add git configuration option to disable populating commit message 134650 13 33469 manyoso 2009-07-24 13:49:29 -0700 Comment on attachment 33469 add git configuration option to disable populating commit message I think we should prepend 'webKit' to the git config name otherwise this is perfect. The change can be made when landing... 134663 14 manyoso 2009-07-24 14:18:45 -0700 Landed with r46375. Closing bug as fixed now. 33330 2009-07-23 08:27:27 -0700 2009-07-23 08:52:57 -0700 patch to add --[no-]write option to prepare-ChangeLog to put new entries on stdout instead of modifiying ChangeLog files prepare-ChangeLog-stdout.patch text/plain 7889 efidler ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyNmVhZTc0Li42NTRmNjc5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDct MjMgIEVsaSBGaWRsZXIgIDxlbGkuZmlkbGVyQHRvcmNobW9iaWxlLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXByb3ZlIGdpdCB3b3JrZmxv dyBieSBwb3B1bGF0aW5nIGNvbW1pdCBtZXNzYWdlcyB3aXRoIENoYW5nZUxvZyBlbnRyaWVzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc2MDUKKwor CQlhZGQgLS1bbm8tXXdyaXRlIG9wdGlvbiB0byBvcHRpb25hbGx5IG91dHB1dCBuZXcgQ2hhbmdl TG9nIGVudHJpZXMgdG8KKwkJc3Rkb3V0IGluc3RlYWQgb2YgbW9kaWZ5aW5nIENoYW5nZUxvZyBm aWxlcworCisJCWZpeCBUb3JjaCBNb2JpbGUgY29weXJpZ2h0CisKKyAgICAgICAgKiBTY3JpcHRz L3ByZXBhcmUtQ2hhbmdlTG9nOgorCiAyMDA5LTA3LTIxICBBZGFtIFRyZWF0ICA8YWRhbS50cmVh dEB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwppbmRleCA4NjlkOWZjLi4wNWVlZGYyIDEw MDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKQEAgLTQsNyArNCw3IEBACiAjCiAj ICBDb3B5cmlnaHQgKEMpIDIwMDAsIDIwMDEgRWF6ZWwsIEluYy4KICMgIENvcHlyaWdodCAoQykg MjAwMiwgMjAwMywgMjAwNCwgMjAwNSwgMjAwNiwgMjAwNyBBcHBsZSBJbmMuICBBbGwgcmlnaHRz IHJlc2VydmVkLgotIyAgQ29weXJpZ2h0IChDKSAyMDA5IFRvcmNobW9iaWxlLCBJbmMuCisjICBD b3B5cmlnaHQgKEMpIDIwMDkgVG9yY2ggTW9iaWxlLCBJbmMuCiAjCiAjICBwcmVwYXJlLUNoYW5n ZUxvZyBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICMg IG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYwpAQCAt NDEsOCArNDEsNyBAQAogIyAgIEhhbmRsZSB5YWNjIHNvdXJjZSBmaWxlcyB0b28gKG90aGVyIGxh bmd1YWdlcz8pLgogIyAgIEhlbHAgbWVyZ2Ugd2hlbiB0aGVyZSBhcmUgQ2hhbmdlTG9nIGNvbmZs aWN0cyBvciBpZiB0aGVyZSdzCiAjICAgICBhbHJlYWR5IGEgcGFydGx5IHdyaXR0ZW4gQ2hhbmdl TG9nIGVudHJ5LgotIyAgIEFkZCBjb21tYW5kIGxpbmUgb3B0aW9uIHRvIHB1dCB0aGUgQ2hhbmdl TG9nIGludG8gYSBzZXBhcmF0ZQotIyAgICAgZmlsZSBvciBqdXN0IHNwZXcgaXQgb3V0IHN0ZG91 dC4KKyMgICBBZGQgY29tbWFuZCBsaW5lIG9wdGlvbiB0byBwdXQgdGhlIENoYW5nZUxvZyBpbnRv IGEgc2VwYXJhdGUgZmlsZS4KICMgICBBZGQgU1ZOIHZlcnNpb24gbnVtYmVycyBmb3IgY29tbWl0 IChjYW4ndCBkbyB0aGF0IHVudGlsCiAjICAgICB0aGUgY2hhbmdlcyBhcmUgY2hlY2tlZCBpbiwg dGhvdWdoKS4KICMgICBXb3JrIGFyb3VuZCBkaWZmIHN0dXBpZGl0eSB3aGVyZSBkZWxldGluZyBh IGZ1bmN0aW9uIHRoYXQgc3RhcnRzCkBAIC0xMDQsNiArMTAzLDcgQEAgbXkgJGdpdENvbW1pdCA9 IDA7CiBteSAkZ2l0SW5kZXggPSAiIjsKIG15ICRnaXRSZXZpZXdlciA9ICIiOwogbXkgJG9wZW5D aGFuZ2VMb2dzID0gMDsKK215ICR3cml0ZUNoYW5nZUxvZ3MgPSAxOwogbXkgJHNob3dIZWxwID0g MDsKIG15ICRzcGV3RGlmZiA9ICRFTlZ7IlBSRVBBUkVfQ0hBTkdFTE9HX0RJRkYifTsKIG15ICR1 cGRhdGVDaGFuZ2VMb2dzID0gMTsKQEAgLTExNyw2ICsxMTcsNyBAQCBteSAkcGFyc2VPcHRpb25z UmVzdWx0ID0KICAgICAgICAgICAgICAgICJnaXQtcmV2aWV3ZXI6cyIgPT4gXCRnaXRSZXZpZXdl ciwKICAgICAgICAgICAgICAgICJoZWxwfGghIiA9PiBcJHNob3dIZWxwLAogICAgICAgICAgICAg ICAgIm9wZW58byEiID0+IFwkb3BlbkNoYW5nZUxvZ3MsCisgICAgICAgICAgICAgICAid3JpdGUh IiA9PiBcJHdyaXRlQ2hhbmdlTG9ncywKICAgICAgICAgICAgICAgICJ1cGRhdGUhIiA9PiBcJHVw ZGF0ZUNoYW5nZUxvZ3MpOwogaWYgKCEkcGFyc2VPcHRpb25zUmVzdWx0IHx8ICRzaG93SGVscCkg ewogICAgIHByaW50IFNUREVSUiBiYXNlbmFtZSgkMCkgLiAiIFstLWJ1Z10gWy1kfC0tZGlmZl0g Wy1ofC0taGVscF0gWy1vfC0tb3Blbl0gWy0tZ2l0LWNvbW1pdD08Y29tbWl0dGlzaD5dIFstLWdp dC1yZXZpZXdlcj08bmFtZT5dIFtzdm5kaXIxIFtzdm5kaXIyIC4uLl1dXG4iOwpAQCAtMTI5LDYg KzEzMCw3IEBAIGlmICghJHBhcnNlT3B0aW9uc1Jlc3VsdCB8fCAkc2hvd0hlbHApIHsKICAgICBw cmludCBTVERFUlIgIiAgLWh8LS1oZWxwICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZVxuIjsK ICAgICBwcmludCBTVERFUlIgIiAgLW98LS1vcGVuICAgICAgT3BlbiBDaGFuZ2VMb2dzIGluIGFu IGVkaXRvciB3aGVuIGRvbmVcbiI7CiAgICAgcHJpbnQgU1RERVJSICIgIC0tW25vLV11cGRhdGUg IFVwZGF0ZSBDaGFuZ2VMb2dzIGZyb20gc3ZuIGJlZm9yZSBhZGRpbmcgZW50cnkgKGRlZmF1bHQ6 IHVwZGF0ZSlcbiI7CisgICAgcHJpbnQgU1RERVJSICIgIC0tW25vLV13cml0ZSAgIFdyaXRlIENo YW5nZUxvZ3MgdG8gZGlzayAob3RoZXJ3aXNlIHNlbmQgbmV3IGVudHJpZXMgdG8gc3Rkb3V0KSAo ZGVmYXVsdDogd3JpdGUpXG4iOwogICAgIGV4aXQgMTsKIH0KIApAQCAtMjg1LDkgKzI4NywzMyBA QCBmb3JlYWNoIG15ICRmaWxlIChzb3J0IGtleXMgJWZ1bmN0aW9uX2xpc3RzKSB7CiAgICAgfQog fQogCisjIEJ1aWxkIHRoZSBsaXN0IG9mIENoYW5nZUxvZyBwcmVmaXhlcyBpbiB0aGUgY29ycmVj dCBwcm9qZWN0IG9yZGVyCitteSBAcHJlZml4ZXM7CitteSAlcHJlZml4ZXNTb3J0OworZm9yZWFj aCBteSAkcHJlZml4IChrZXlzICVmaWxlcykgeworICAgIG15ICRwcmVmaXhEaXIgPSBzdWJzdHIo JHByZWZpeCwgMCwgbGVuZ3RoKCRwcmVmaXgpIC0gMSk7ICMgc3RyaXAgdHJhaWxpbmcgLworICAg IG15ICRzb3J0S2V5ID0gbGMgJHByZWZpeDsKKyAgICBpZiAoJHByZWZpeERpciBlcSAidG9wIGxl dmVsIikgeworICAgICAgICAkc29ydEtleSA9ICIiOworICAgIH0gZWxzaWYgKCRwcmVmaXhEaXIg ZXEgIlRvb2xzIikgeworICAgICAgICAkc29ydEtleSA9ICItLCBqdXN0IGFmdGVyIHRvcCBsZXZl bCI7CisgICAgfSBlbHNpZiAoJHByZWZpeERpciBlcSAiV2ViQnJvd3NlciIpIHsKKyAgICAgICAg JHNvcnRLZXkgPSBsYyAiV2ViS2l0LCBXZWJCcm93c2VyIGFmdGVyIjsKKyAgICB9IGVsc2lmICgk cHJlZml4RGlyIGVxICJXZWJDb3JlIikgeworICAgICAgICAkc29ydEtleSA9IGxjICJXZWJGb3Vu ZGF0aW9uLCBXZWJDb3JlIGFmdGVyIjsKKyAgICB9IGVsc2lmICgkcHJlZml4RGlyIGVxICJMYXlv dXRUZXN0cyIpIHsKKyAgICAgICAgJHNvcnRLZXkgPSBsYyAifiwgTGF5b3V0VGVzdHMgbGFzdCI7 CisgICAgfQorCisgICAgJHByZWZpeGVzU29ydHskc29ydEtleX0gPSAkcHJlZml4OworfQorZm9y ZWFjaCBteSAkcHJlZml4U29ydCAoc29ydCBrZXlzICVwcmVmaXhlc1NvcnQpIHsKKyAgICBwdXNo IEBwcmVmaXhlcywgJHByZWZpeGVzU29ydHskcHJlZml4U29ydH07Cit9CisKICMgR2V0IHRoZSBs YXRlc3QgQ2hhbmdlTG9nIGZpbGVzIGZyb20gc3ZuLgogbXkgQGxvZ3MgPSAoKTsKLWZvcmVhY2gg bXkgJHByZWZpeCAoc29ydCBrZXlzICVmaWxlcykgeworZm9yZWFjaCBteSAkcHJlZml4IChAcHJl Zml4ZXMpIHsKICAgICBwdXNoIEBsb2dzLCBGaWxlOjpTcGVjLT5jYXRmaWxlKCRwcmVmaXggfHwg Ii4iLCAiQ2hhbmdlTG9nIik7CiB9CiAKQEAgLTMxMiwyMiArMzM4LDMwIEBAIGlmIChAbG9ncyAm JiAkdXBkYXRlQ2hhbmdlTG9ncyAmJiAkaXNTVk4pIHsKICAgICB9CiB9CiAKLSMgV3JpdGUgb3V0 IGEgbmV3IENoYW5nZUxvZyBmaWxlLgotZm9yZWFjaCBteSAkcHJlZml4IChzb3J0IGtleXMgJWZp bGVzKSB7Ci0gICAgbXkgJGNoYW5nZUxvZ1BhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRwcmVm aXggfHwgIi4iLCAiQ2hhbmdlTG9nIik7Ci0gICAgcHJpbnQgU1RERVJSICIgIEVkaXRpbmcgdGhl ICR7Y2hhbmdlTG9nUGF0aH0gZmlsZS5cbiI7Ci0gICAgb3BlbiBPTERfQ0hBTkdFX0xPRywgJHtj aGFuZ2VMb2dQYXRofSBvciBkaWUgIkNvdWxkIG5vdCBvcGVuICR7Y2hhbmdlTG9nUGF0aH0gZmls ZTogJCEuXG4iOwotICAgICMgSXQncyBsZXNzIGVmZmljaWVudCB0byByZWFkIHRoZSB3aG9sZSB0 aGluZyBpbnRvIG1lbW9yeSB0aGFuIGl0IHdvdWxkIGJlCi0gICAgIyB0byByZWFkIGl0IHdoaWxl IHdlIHByZXBlbmQgdG8gaXQgbGF0ZXIsIGJ1dCBJIGxpa2UgZG9pbmcgdGhpcyBwYXJ0IGZpcnN0 LgotICAgIG15IEBvbGRfY2hhbmdlX2xvZyA9IDxPTERfQ0hBTkdFX0xPRz47Ci0gICAgY2xvc2Ug T0xEX0NIQU5HRV9MT0c7Ci0gICAgIyBXZSB3YW50IHRvIG1hdGNoIHRoZSBDaGFuZ2VMb2cncyBs aW5lIGVuZGluZ3MgaW4gY2FzZSBpdCBkb2Vzbid0IG1hdGNoCi0gICAgIyB0aGUgbmF0aXZlIGxp bmUgZW5kaW5ncyBmb3IgdGhpcyB2ZXJzaW9uIG9mIHBlcmwuCisjIEdlbmVyYXRlIG5ldyBDaGFu Z2VMb2cgZW50cmllcyBhbmQgKG9wdGlvbmFsbHkpIHdyaXRlIG91dCBuZXcgQ2hhbmdlTG9nIGZp bGVzLgorZm9yZWFjaCBteSAkcHJlZml4IChAcHJlZml4ZXMpIHsKICAgICBteSAkZW5kbCA9ICJc biI7Ci0gICAgaWYgKCRvbGRfY2hhbmdlX2xvZ1swXSA9fiAvKFxyP1xuKSQvZykgewotICAgICAg ICAkZW5kbCA9ICIkMSI7CisgICAgbXkgQG9sZF9jaGFuZ2VfbG9nOworCisgICAgaWYgKCR3cml0 ZUNoYW5nZUxvZ3MpIHsKKyAgICAgICAgbXkgJGNoYW5nZUxvZ1BhdGggPSBGaWxlOjpTcGVjLT5j YXRmaWxlKCRwcmVmaXggfHwgIi4iLCAiQ2hhbmdlTG9nIik7CisgICAgICAgIHByaW50IFNUREVS UiAiICBFZGl0aW5nIHRoZSAke2NoYW5nZUxvZ1BhdGh9IGZpbGUuXG4iOworICAgICAgICBvcGVu IE9MRF9DSEFOR0VfTE9HLCAke2NoYW5nZUxvZ1BhdGh9IG9yIGRpZSAiQ291bGQgbm90IG9wZW4g JHtjaGFuZ2VMb2dQYXRofSBmaWxlOiAkIS5cbiI7CisgICAgICAgICMgSXQncyBsZXNzIGVmZmlj aWVudCB0byByZWFkIHRoZSB3aG9sZSB0aGluZyBpbnRvIG1lbW9yeSB0aGFuIGl0IHdvdWxkIGJl CisgICAgICAgICMgdG8gcmVhZCBpdCB3aGlsZSB3ZSBwcmVwZW5kIHRvIGl0IGxhdGVyLCBidXQg SSBsaWtlIGRvaW5nIHRoaXMgcGFydCBmaXJzdC4KKyAgICAgICAgQG9sZF9jaGFuZ2VfbG9nID0g PE9MRF9DSEFOR0VfTE9HPjsKKyAgICAgICAgY2xvc2UgT0xEX0NIQU5HRV9MT0c7CisgICAgICAg ICMgV2Ugd2FudCB0byBtYXRjaCB0aGUgQ2hhbmdlTG9nJ3MgbGluZSBlbmRpbmdzIGluIGNhc2Ug aXQgZG9lc24ndCBtYXRjaAorICAgICAgICAjIHRoZSBuYXRpdmUgbGluZSBlbmRpbmdzIGZvciB0 aGlzIHZlcnNpb24gb2YgcGVybC4KKyAgICAgICAgaWYgKCRvbGRfY2hhbmdlX2xvZ1swXSA9fiAv KFxyP1xuKSQvZykgeworICAgICAgICAgICAgJGVuZGwgPSAiJDEiOworICAgICAgICB9CisgICAg ICAgIG9wZW4gQ0hBTkdFX0xPRywgIj4gJHtjaGFuZ2VMb2dQYXRofSIgb3IgZGllICJDb3VsZCBu b3Qgd3JpdGUgJHtjaGFuZ2VMb2dQYXRofVxuLiI7CisgICAgfSBlbHNlIHsKKyAgICAgICAgb3Bl biBDSEFOR0VfTE9HLCAiPi0iIG9yIGRpZSAiQ291bGQgbm90IHdyaXRlIHRvIFNURE9VVFxuLiI7 CisgICAgICAgIHByaW50IHN1YnN0cigkcHJlZml4LCAwLCBsZW5ndGgoJHByZWZpeCkgLSAxKSAu ICI6XG5cbiIgdW5sZXNzIChzY2FsYXIgQHByZWZpeGVzKSA9PSAxOwogICAgIH0KLSAgICBvcGVu IENIQU5HRV9MT0csICI+ICR7Y2hhbmdlTG9nUGF0aH0iIG9yIGRpZSAiQ291bGQgbm90IHdyaXRl ICR7Y2hhbmdlTG9nUGF0aH1cbi4iOworCiAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVM aW5lRW5kaW5ncygiJGRhdGUgICRuYW1lICA8JGVtYWlsQWRkcmVzcz5cblxuIiwgJGVuZGwpOwog CiAgICAgbXkgKCRyZXZpZXdlciwgJGRlc2NyaXB0aW9uKSA9IHJldmlld2VyQW5kRGVzY3JpcHRp b25Gb3JHaXRDb21taXQoJGdpdENvbW1pdCkgaWYgJGdpdENvbW1pdDsKQEAgLTM0MSw4ICszNzUs MTAgQEAgZm9yZWFjaCBteSAkcHJlZml4IChzb3J0IGtleXMgJWZpbGVzKSB7CiAgICAgcHJpbnQg Q0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAkYnVnVVJMXG4iLCAkZW5k bCkgaWYgJGJ1Z1VSTDsKICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdz KCJcbiIsICRlbmRsKTsKIAotICAgICMgV2UgY291bGQgcHJlLXBvcHVsYXRlIHRoaXMgd2l0aCB0 aGUgZ2l0IGNvbW1pdCBsb2cgb3Igd2l0aCB0aGUgYnVnIGRlc2NyaXB0aW9uLgotICAgIHByaW50 IFNUREVSUiAiLS0gUGxlYXNlIHJlbWVtYmVyIHRvIGluY2x1ZGUgYSBkZXRhaWxlZCBkZXNjcmlw dGlvbiBpbiB5b3VyIENoYW5nZUxvZyBlbnRyeS4gLS1cbi0tIFNlZSA8aHR0cDovL3dlYmtpdC5v cmcvY29kaW5nL2NvbnRyaWJ1dGluZy5odG1sPiBmb3IgbW9yZSBpbmZvIC0tXG4iOworICAgIGlm ICgkd3JpdGVDaGFuZ2VMb2dzKSB7CisgICAgICAgICMgV2UgY291bGQgcHJlLXBvcHVsYXRlIHRo aXMgd2l0aCB0aGUgZ2l0IGNvbW1pdCBsb2cgb3Igd2l0aCB0aGUgYnVnIGRlc2NyaXB0aW9uLgor ICAgICAgICBwcmludCBTVERFUlIgIi0tIFBsZWFzZSByZW1lbWJlciB0byBpbmNsdWRlIGEgZGV0 YWlsZWQgZGVzY3JpcHRpb24gaW4geW91ciBDaGFuZ2VMb2cgZW50cnkuIC0tXG4tLSBTZWUgPGh0 dHA6Ly93ZWJraXQub3JnL2NvZGluZy9jb250cmlidXRpbmcuaHRtbD4gZm9yIG1vcmUgaW5mbyAt LVxuIjsKKyAgICB9CiAKICAgICBpZiAoJHByZWZpeCA9fiBtL1dlYkNvcmUvIHx8IGBwd2RgID1+ IG0vV2ViQ29yZS8pIHsKICAgICAgICAgaWYgKCRkaWRDaGFuZ2VSZWdyZXNzaW9uVGVzdHMpIHsK QEAgLTM1NCw5ICszOTAsMTUgQEAgZm9yZWFjaCBteSAkcHJlZml4IChzb3J0IGtleXMgJWZpbGVz KSB7CiAKICAgICBmb3JlYWNoIG15ICRmaWxlIChzb3J0IEB7JGZpbGVzeyRwcmVmaXh9fSkgewog ICAgICAgICBteSAkZmlsZV9zdGVtID0gc3Vic3RyICRmaWxlLCBsZW5ndGggJHByZWZpeDsKLSAg ICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAqICRm aWxlX3N0ZW06JGZ1bmN0aW9uX2xpc3RzeyRmaWxlfVxuIiwgJGVuZGwpOzsKKyAgICAgICAgcHJp bnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAqICRmaWxlX3N0ZW06 JGZ1bmN0aW9uX2xpc3RzeyRmaWxlfVxuIiwgJGVuZGwpOworICAgIH0KKworICAgIGlmICgkd3Jp dGVDaGFuZ2VMb2dzKSB7CisgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGluZUVu ZGluZ3MoIlxuIiwgJGVuZGwpLCBAb2xkX2NoYW5nZV9sb2c7CisgICAgfSBlbHNlIHsKKyAgICAg ICAgcHJpbnQgQ0hBTkdFX0xPRyAiXG4iOwogICAgIH0KLSAgICBwcmludCBDSEFOR0VfTE9HIG5v cm1hbGl6ZUxpbmVFbmRpbmdzKCJcbiIsICRlbmRsKSwgQG9sZF9jaGFuZ2VfbG9nOworCiAgICAg Y2xvc2UgQ0hBTkdFX0xPRzsKIH0KIAo= 33334 2009-07-23 08:52:57 -0700 2009-07-23 09:22:03 -0700 revised patch to handle top-level changes properly prepare-ChangeLog-stdout.patch text/plain 7943 efidler ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyNmVhZTc0Li42NTRmNjc5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDct MjMgIEVsaSBGaWRsZXIgIDxlbGkuZmlkbGVyQHRvcmNobW9iaWxlLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXByb3ZlIGdpdCB3b3JrZmxv dyBieSBwb3B1bGF0aW5nIGNvbW1pdCBtZXNzYWdlcyB3aXRoIENoYW5nZUxvZyBlbnRyaWVzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc2MDUKKwor CQlhZGQgLS1bbm8tXXdyaXRlIG9wdGlvbiB0byBvcHRpb25hbGx5IG91dHB1dCBuZXcgQ2hhbmdl TG9nIGVudHJpZXMgdG8KKwkJc3Rkb3V0IGluc3RlYWQgb2YgbW9kaWZ5aW5nIENoYW5nZUxvZyBm aWxlcworCisJCWZpeCBUb3JjaCBNb2JpbGUgY29weXJpZ2h0CisKKyAgICAgICAgKiBTY3JpcHRz L3ByZXBhcmUtQ2hhbmdlTG9nOgorCiAyMDA5LTA3LTIxICBBZGFtIFRyZWF0ICA8YWRhbS50cmVh dEB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwppbmRleCA4NjlkOWZjLi5iNjlhMzM1IDEw MDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKQEAgLTQsNyArNCw3IEBACiAjCiAj ICBDb3B5cmlnaHQgKEMpIDIwMDAsIDIwMDEgRWF6ZWwsIEluYy4KICMgIENvcHlyaWdodCAoQykg MjAwMiwgMjAwMywgMjAwNCwgMjAwNSwgMjAwNiwgMjAwNyBBcHBsZSBJbmMuICBBbGwgcmlnaHRz IHJlc2VydmVkLgotIyAgQ29weXJpZ2h0IChDKSAyMDA5IFRvcmNobW9iaWxlLCBJbmMuCisjICBD b3B5cmlnaHQgKEMpIDIwMDkgVG9yY2ggTW9iaWxlLCBJbmMuCiAjCiAjICBwcmVwYXJlLUNoYW5n ZUxvZyBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICMg IG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYwpAQCAt NDEsOCArNDEsNyBAQAogIyAgIEhhbmRsZSB5YWNjIHNvdXJjZSBmaWxlcyB0b28gKG90aGVyIGxh bmd1YWdlcz8pLgogIyAgIEhlbHAgbWVyZ2Ugd2hlbiB0aGVyZSBhcmUgQ2hhbmdlTG9nIGNvbmZs aWN0cyBvciBpZiB0aGVyZSdzCiAjICAgICBhbHJlYWR5IGEgcGFydGx5IHdyaXR0ZW4gQ2hhbmdl TG9nIGVudHJ5LgotIyAgIEFkZCBjb21tYW5kIGxpbmUgb3B0aW9uIHRvIHB1dCB0aGUgQ2hhbmdl TG9nIGludG8gYSBzZXBhcmF0ZQotIyAgICAgZmlsZSBvciBqdXN0IHNwZXcgaXQgb3V0IHN0ZG91 dC4KKyMgICBBZGQgY29tbWFuZCBsaW5lIG9wdGlvbiB0byBwdXQgdGhlIENoYW5nZUxvZyBpbnRv IGEgc2VwYXJhdGUgZmlsZS4KICMgICBBZGQgU1ZOIHZlcnNpb24gbnVtYmVycyBmb3IgY29tbWl0 IChjYW4ndCBkbyB0aGF0IHVudGlsCiAjICAgICB0aGUgY2hhbmdlcyBhcmUgY2hlY2tlZCBpbiwg dGhvdWdoKS4KICMgICBXb3JrIGFyb3VuZCBkaWZmIHN0dXBpZGl0eSB3aGVyZSBkZWxldGluZyBh IGZ1bmN0aW9uIHRoYXQgc3RhcnRzCkBAIC0xMDQsNiArMTAzLDcgQEAgbXkgJGdpdENvbW1pdCA9 IDA7CiBteSAkZ2l0SW5kZXggPSAiIjsKIG15ICRnaXRSZXZpZXdlciA9ICIiOwogbXkgJG9wZW5D aGFuZ2VMb2dzID0gMDsKK215ICR3cml0ZUNoYW5nZUxvZ3MgPSAxOwogbXkgJHNob3dIZWxwID0g MDsKIG15ICRzcGV3RGlmZiA9ICRFTlZ7IlBSRVBBUkVfQ0hBTkdFTE9HX0RJRkYifTsKIG15ICR1 cGRhdGVDaGFuZ2VMb2dzID0gMTsKQEAgLTExNyw2ICsxMTcsNyBAQCBteSAkcGFyc2VPcHRpb25z UmVzdWx0ID0KICAgICAgICAgICAgICAgICJnaXQtcmV2aWV3ZXI6cyIgPT4gXCRnaXRSZXZpZXdl ciwKICAgICAgICAgICAgICAgICJoZWxwfGghIiA9PiBcJHNob3dIZWxwLAogICAgICAgICAgICAg ICAgIm9wZW58byEiID0+IFwkb3BlbkNoYW5nZUxvZ3MsCisgICAgICAgICAgICAgICAid3JpdGUh IiA9PiBcJHdyaXRlQ2hhbmdlTG9ncywKICAgICAgICAgICAgICAgICJ1cGRhdGUhIiA9PiBcJHVw ZGF0ZUNoYW5nZUxvZ3MpOwogaWYgKCEkcGFyc2VPcHRpb25zUmVzdWx0IHx8ICRzaG93SGVscCkg ewogICAgIHByaW50IFNUREVSUiBiYXNlbmFtZSgkMCkgLiAiIFstLWJ1Z10gWy1kfC0tZGlmZl0g Wy1ofC0taGVscF0gWy1vfC0tb3Blbl0gWy0tZ2l0LWNvbW1pdD08Y29tbWl0dGlzaD5dIFstLWdp dC1yZXZpZXdlcj08bmFtZT5dIFtzdm5kaXIxIFtzdm5kaXIyIC4uLl1dXG4iOwpAQCAtMTI5LDYg KzEzMCw3IEBAIGlmICghJHBhcnNlT3B0aW9uc1Jlc3VsdCB8fCAkc2hvd0hlbHApIHsKICAgICBw cmludCBTVERFUlIgIiAgLWh8LS1oZWxwICAgICAgU2hvdyB0aGlzIGhlbHAgbWVzc2FnZVxuIjsK ICAgICBwcmludCBTVERFUlIgIiAgLW98LS1vcGVuICAgICAgT3BlbiBDaGFuZ2VMb2dzIGluIGFu IGVkaXRvciB3aGVuIGRvbmVcbiI7CiAgICAgcHJpbnQgU1RERVJSICIgIC0tW25vLV11cGRhdGUg IFVwZGF0ZSBDaGFuZ2VMb2dzIGZyb20gc3ZuIGJlZm9yZSBhZGRpbmcgZW50cnkgKGRlZmF1bHQ6 IHVwZGF0ZSlcbiI7CisgICAgcHJpbnQgU1RERVJSICIgIC0tW25vLV13cml0ZSAgIFdyaXRlIENo YW5nZUxvZ3MgdG8gZGlzayAob3RoZXJ3aXNlIHNlbmQgbmV3IGVudHJpZXMgdG8gc3Rkb3V0KSAo ZGVmYXVsdDogd3JpdGUpXG4iOwogICAgIGV4aXQgMTsKIH0KIApAQCAtMjg1LDkgKzI4NywzNSBA QCBmb3JlYWNoIG15ICRmaWxlIChzb3J0IGtleXMgJWZ1bmN0aW9uX2xpc3RzKSB7CiAgICAgfQog fQogCisjIEJ1aWxkIHRoZSBsaXN0IG9mIENoYW5nZUxvZyBwcmVmaXhlcyBpbiB0aGUgY29ycmVj dCBwcm9qZWN0IG9yZGVyCitteSBAcHJlZml4ZXM7CitteSAlcHJlZml4ZXNTb3J0OworZm9yZWFj aCBteSAkcHJlZml4IChrZXlzICVmaWxlcykgeworICAgIG15ICRwcmVmaXhEaXIgPSBzdWJzdHIo JHByZWZpeCwgMCwgbGVuZ3RoKCRwcmVmaXgpIC0gMSk7ICMgc3RyaXAgdHJhaWxpbmcgLworICAg IG15ICRzb3J0S2V5ID0gbGMgJHByZWZpeDsKKyAgICAkc29ydEtleSA9ICJ0b3AgbGV2ZWwiIHVu bGVzcyBsZW5ndGggJHNvcnRLZXk7CisKKyAgICBpZiAoJHByZWZpeERpciBlcSAidG9wIGxldmVs IikgeworICAgICAgICAkc29ydEtleSA9ICIiOworICAgIH0gZWxzaWYgKCRwcmVmaXhEaXIgZXEg IlRvb2xzIikgeworICAgICAgICAkc29ydEtleSA9ICItLCBqdXN0IGFmdGVyIHRvcCBsZXZlbCI7 CisgICAgfSBlbHNpZiAoJHByZWZpeERpciBlcSAiV2ViQnJvd3NlciIpIHsKKyAgICAgICAgJHNv cnRLZXkgPSBsYyAiV2ViS2l0LCBXZWJCcm93c2VyIGFmdGVyIjsKKyAgICB9IGVsc2lmICgkcHJl Zml4RGlyIGVxICJXZWJDb3JlIikgeworICAgICAgICAkc29ydEtleSA9IGxjICJXZWJGb3VuZGF0 aW9uLCBXZWJDb3JlIGFmdGVyIjsKKyAgICB9IGVsc2lmICgkcHJlZml4RGlyIGVxICJMYXlvdXRU ZXN0cyIpIHsKKyAgICAgICAgJHNvcnRLZXkgPSBsYyAifiwgTGF5b3V0VGVzdHMgbGFzdCI7Cisg ICAgfQorCisgICAgJHByZWZpeGVzU29ydHskc29ydEtleX0gPSAkcHJlZml4OworfQorZm9yZWFj aCBteSAkcHJlZml4U29ydCAoc29ydCBrZXlzICVwcmVmaXhlc1NvcnQpIHsKKyAgICBwdXNoIEBw cmVmaXhlcywgJHByZWZpeGVzU29ydHskcHJlZml4U29ydH07Cit9CisKICMgR2V0IHRoZSBsYXRl c3QgQ2hhbmdlTG9nIGZpbGVzIGZyb20gc3ZuLgogbXkgQGxvZ3MgPSAoKTsKLWZvcmVhY2ggbXkg JHByZWZpeCAoc29ydCBrZXlzICVmaWxlcykgeworZm9yZWFjaCBteSAkcHJlZml4IChAcHJlZml4 ZXMpIHsKICAgICBwdXNoIEBsb2dzLCBGaWxlOjpTcGVjLT5jYXRmaWxlKCRwcmVmaXggfHwgIi4i LCAiQ2hhbmdlTG9nIik7CiB9CiAKQEAgLTMxMiwyMiArMzQwLDMwIEBAIGlmIChAbG9ncyAmJiAk dXBkYXRlQ2hhbmdlTG9ncyAmJiAkaXNTVk4pIHsKICAgICB9CiB9CiAKLSMgV3JpdGUgb3V0IGEg bmV3IENoYW5nZUxvZyBmaWxlLgotZm9yZWFjaCBteSAkcHJlZml4IChzb3J0IGtleXMgJWZpbGVz KSB7Ci0gICAgbXkgJGNoYW5nZUxvZ1BhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRwcmVmaXgg fHwgIi4iLCAiQ2hhbmdlTG9nIik7Ci0gICAgcHJpbnQgU1RERVJSICIgIEVkaXRpbmcgdGhlICR7 Y2hhbmdlTG9nUGF0aH0gZmlsZS5cbiI7Ci0gICAgb3BlbiBPTERfQ0hBTkdFX0xPRywgJHtjaGFu Z2VMb2dQYXRofSBvciBkaWUgIkNvdWxkIG5vdCBvcGVuICR7Y2hhbmdlTG9nUGF0aH0gZmlsZTog JCEuXG4iOwotICAgICMgSXQncyBsZXNzIGVmZmljaWVudCB0byByZWFkIHRoZSB3aG9sZSB0aGlu ZyBpbnRvIG1lbW9yeSB0aGFuIGl0IHdvdWxkIGJlCi0gICAgIyB0byByZWFkIGl0IHdoaWxlIHdl IHByZXBlbmQgdG8gaXQgbGF0ZXIsIGJ1dCBJIGxpa2UgZG9pbmcgdGhpcyBwYXJ0IGZpcnN0Lgot ICAgIG15IEBvbGRfY2hhbmdlX2xvZyA9IDxPTERfQ0hBTkdFX0xPRz47Ci0gICAgY2xvc2UgT0xE X0NIQU5HRV9MT0c7Ci0gICAgIyBXZSB3YW50IHRvIG1hdGNoIHRoZSBDaGFuZ2VMb2cncyBsaW5l IGVuZGluZ3MgaW4gY2FzZSBpdCBkb2Vzbid0IG1hdGNoCi0gICAgIyB0aGUgbmF0aXZlIGxpbmUg ZW5kaW5ncyBmb3IgdGhpcyB2ZXJzaW9uIG9mIHBlcmwuCisjIEdlbmVyYXRlIG5ldyBDaGFuZ2VM b2cgZW50cmllcyBhbmQgKG9wdGlvbmFsbHkpIHdyaXRlIG91dCBuZXcgQ2hhbmdlTG9nIGZpbGVz LgorZm9yZWFjaCBteSAkcHJlZml4IChAcHJlZml4ZXMpIHsKICAgICBteSAkZW5kbCA9ICJcbiI7 Ci0gICAgaWYgKCRvbGRfY2hhbmdlX2xvZ1swXSA9fiAvKFxyP1xuKSQvZykgewotICAgICAgICAk ZW5kbCA9ICIkMSI7CisgICAgbXkgQG9sZF9jaGFuZ2VfbG9nOworCisgICAgaWYgKCR3cml0ZUNo YW5nZUxvZ3MpIHsKKyAgICAgICAgbXkgJGNoYW5nZUxvZ1BhdGggPSBGaWxlOjpTcGVjLT5jYXRm aWxlKCRwcmVmaXggfHwgIi4iLCAiQ2hhbmdlTG9nIik7CisgICAgICAgIHByaW50IFNUREVSUiAi ICBFZGl0aW5nIHRoZSAke2NoYW5nZUxvZ1BhdGh9IGZpbGUuXG4iOworICAgICAgICBvcGVuIE9M RF9DSEFOR0VfTE9HLCAke2NoYW5nZUxvZ1BhdGh9IG9yIGRpZSAiQ291bGQgbm90IG9wZW4gJHtj aGFuZ2VMb2dQYXRofSBmaWxlOiAkIS5cbiI7CisgICAgICAgICMgSXQncyBsZXNzIGVmZmljaWVu dCB0byByZWFkIHRoZSB3aG9sZSB0aGluZyBpbnRvIG1lbW9yeSB0aGFuIGl0IHdvdWxkIGJlCisg ICAgICAgICMgdG8gcmVhZCBpdCB3aGlsZSB3ZSBwcmVwZW5kIHRvIGl0IGxhdGVyLCBidXQgSSBs aWtlIGRvaW5nIHRoaXMgcGFydCBmaXJzdC4KKyAgICAgICAgQG9sZF9jaGFuZ2VfbG9nID0gPE9M RF9DSEFOR0VfTE9HPjsKKyAgICAgICAgY2xvc2UgT0xEX0NIQU5HRV9MT0c7CisgICAgICAgICMg V2Ugd2FudCB0byBtYXRjaCB0aGUgQ2hhbmdlTG9nJ3MgbGluZSBlbmRpbmdzIGluIGNhc2UgaXQg ZG9lc24ndCBtYXRjaAorICAgICAgICAjIHRoZSBuYXRpdmUgbGluZSBlbmRpbmdzIGZvciB0aGlz IHZlcnNpb24gb2YgcGVybC4KKyAgICAgICAgaWYgKCRvbGRfY2hhbmdlX2xvZ1swXSA9fiAvKFxy P1xuKSQvZykgeworICAgICAgICAgICAgJGVuZGwgPSAiJDEiOworICAgICAgICB9CisgICAgICAg IG9wZW4gQ0hBTkdFX0xPRywgIj4gJHtjaGFuZ2VMb2dQYXRofSIgb3IgZGllICJDb3VsZCBub3Qg d3JpdGUgJHtjaGFuZ2VMb2dQYXRofVxuLiI7CisgICAgfSBlbHNlIHsKKyAgICAgICAgb3BlbiBD SEFOR0VfTE9HLCAiPi0iIG9yIGRpZSAiQ291bGQgbm90IHdyaXRlIHRvIFNURE9VVFxuLiI7Cisg ICAgICAgIHByaW50IHN1YnN0cigkcHJlZml4LCAwLCBsZW5ndGgoJHByZWZpeCkgLSAxKSAuICI6 XG5cbiIgdW5sZXNzIChzY2FsYXIgQHByZWZpeGVzKSA9PSAxOwogICAgIH0KLSAgICBvcGVuIENI QU5HRV9MT0csICI+ICR7Y2hhbmdlTG9nUGF0aH0iIG9yIGRpZSAiQ291bGQgbm90IHdyaXRlICR7 Y2hhbmdlTG9nUGF0aH1cbi4iOworCiAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5l RW5kaW5ncygiJGRhdGUgICRuYW1lICA8JGVtYWlsQWRkcmVzcz5cblxuIiwgJGVuZGwpOwogCiAg ICAgbXkgKCRyZXZpZXdlciwgJGRlc2NyaXB0aW9uKSA9IHJldmlld2VyQW5kRGVzY3JpcHRpb25G b3JHaXRDb21taXQoJGdpdENvbW1pdCkgaWYgJGdpdENvbW1pdDsKQEAgLTM0MSw4ICszNzcsMTAg QEAgZm9yZWFjaCBteSAkcHJlZml4IChzb3J0IGtleXMgJWZpbGVzKSB7CiAgICAgcHJpbnQgQ0hB TkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAkYnVnVVJMXG4iLCAkZW5kbCkg aWYgJGJ1Z1VSTDsKICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCJc biIsICRlbmRsKTsKIAotICAgICMgV2UgY291bGQgcHJlLXBvcHVsYXRlIHRoaXMgd2l0aCB0aGUg Z2l0IGNvbW1pdCBsb2cgb3Igd2l0aCB0aGUgYnVnIGRlc2NyaXB0aW9uLgotICAgIHByaW50IFNU REVSUiAiLS0gUGxlYXNlIHJlbWVtYmVyIHRvIGluY2x1ZGUgYSBkZXRhaWxlZCBkZXNjcmlwdGlv biBpbiB5b3VyIENoYW5nZUxvZyBlbnRyeS4gLS1cbi0tIFNlZSA8aHR0cDovL3dlYmtpdC5vcmcv Y29kaW5nL2NvbnRyaWJ1dGluZy5odG1sPiBmb3IgbW9yZSBpbmZvIC0tXG4iOworICAgIGlmICgk d3JpdGVDaGFuZ2VMb2dzKSB7CisgICAgICAgICMgV2UgY291bGQgcHJlLXBvcHVsYXRlIHRoaXMg d2l0aCB0aGUgZ2l0IGNvbW1pdCBsb2cgb3Igd2l0aCB0aGUgYnVnIGRlc2NyaXB0aW9uLgorICAg ICAgICBwcmludCBTVERFUlIgIi0tIFBsZWFzZSByZW1lbWJlciB0byBpbmNsdWRlIGEgZGV0YWls ZWQgZGVzY3JpcHRpb24gaW4geW91ciBDaGFuZ2VMb2cgZW50cnkuIC0tXG4tLSBTZWUgPGh0dHA6 Ly93ZWJraXQub3JnL2NvZGluZy9jb250cmlidXRpbmcuaHRtbD4gZm9yIG1vcmUgaW5mbyAtLVxu IjsKKyAgICB9CiAKICAgICBpZiAoJHByZWZpeCA9fiBtL1dlYkNvcmUvIHx8IGBwd2RgID1+IG0v V2ViQ29yZS8pIHsKICAgICAgICAgaWYgKCRkaWRDaGFuZ2VSZWdyZXNzaW9uVGVzdHMpIHsKQEAg LTM1NCw5ICszOTIsMTUgQEAgZm9yZWFjaCBteSAkcHJlZml4IChzb3J0IGtleXMgJWZpbGVzKSB7 CiAKICAgICBmb3JlYWNoIG15ICRmaWxlIChzb3J0IEB7JGZpbGVzeyRwcmVmaXh9fSkgewogICAg ICAgICBteSAkZmlsZV9zdGVtID0gc3Vic3RyICRmaWxlLCBsZW5ndGggJHByZWZpeDsKLSAgICAg ICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAqICRmaWxl X3N0ZW06JGZ1bmN0aW9uX2xpc3RzeyRmaWxlfVxuIiwgJGVuZGwpOzsKKyAgICAgICAgcHJpbnQg Q0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAqICRmaWxlX3N0ZW06JGZ1 bmN0aW9uX2xpc3RzeyRmaWxlfVxuIiwgJGVuZGwpOworICAgIH0KKworICAgIGlmICgkd3JpdGVD aGFuZ2VMb2dzKSB7CisgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGluZUVuZGlu Z3MoIlxuIiwgJGVuZGwpLCBAb2xkX2NoYW5nZV9sb2c7CisgICAgfSBlbHNlIHsKKyAgICAgICAg cHJpbnQgQ0hBTkdFX0xPRyAiXG4iOwogICAgIH0KLSAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1h bGl6ZUxpbmVFbmRpbmdzKCJcbiIsICRlbmRsKSwgQG9sZF9jaGFuZ2VfbG9nOworCiAgICAgY2xv c2UgQ0hBTkdFX0xPRzsKIH0KIAo= 33338 2009-07-23 09:22:03 -0700 2009-07-23 14:40:04 -0700 updated patch to fix ChangeLog indentation prepare-ChangeLog-stdout.patch text/plain 7961 efidler ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyNmVhZTc0Li5jM2QyODM1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDct MjMgIEVsaSBGaWRsZXIgIDxlbGkuZmlkbGVyQHRvcmNobW9iaWxlLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXByb3ZlIGdpdCB3b3JrZmxv dyBieSBwb3B1bGF0aW5nIGNvbW1pdCBtZXNzYWdlcyB3aXRoIENoYW5nZUxvZyBlbnRyaWVzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc2MDUKKwor ICAgICAgICBhZGQgLS1bbm8tXXdyaXRlIG9wdGlvbiB0byBvcHRpb25hbGx5IG91dHB1dCBuZXcg Q2hhbmdlTG9nIGVudHJpZXMgdG8KKyAgICAgICAgc3Rkb3V0IGluc3RlYWQgb2YgbW9kaWZ5aW5n IENoYW5nZUxvZyBmaWxlcworCisgICAgICAgIGZpeCBUb3JjaCBNb2JpbGUgY29weXJpZ2h0CisK KyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nOgorCiAyMDA5LTA3LTIxICBBZGFt IFRyZWF0ICA8YWRhbS50cmVhdEB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGF2aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUt Q2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwppbmRleCA4 NjlkOWZjLi5iNjlhMzM1IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3ByZXBhcmUt Q2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKQEAg LTQsNyArNCw3IEBACiAjCiAjICBDb3B5cmlnaHQgKEMpIDIwMDAsIDIwMDEgRWF6ZWwsIEluYy4K ICMgIENvcHlyaWdodCAoQykgMjAwMiwgMjAwMywgMjAwNCwgMjAwNSwgMjAwNiwgMjAwNyBBcHBs ZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgotIyAgQ29weXJpZ2h0IChDKSAyMDA5IFRvcmNo bW9iaWxlLCBJbmMuCisjICBDb3B5cmlnaHQgKEMpIDIwMDkgVG9yY2ggTW9iaWxlLCBJbmMuCiAj CiAjICBwcmVwYXJlLUNoYW5nZUxvZyBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJp YnV0ZSBpdCBhbmQvb3IKICMgIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBH ZW5lcmFsIFB1YmxpYwpAQCAtNDEsOCArNDEsNyBAQAogIyAgIEhhbmRsZSB5YWNjIHNvdXJjZSBm aWxlcyB0b28gKG90aGVyIGxhbmd1YWdlcz8pLgogIyAgIEhlbHAgbWVyZ2Ugd2hlbiB0aGVyZSBh cmUgQ2hhbmdlTG9nIGNvbmZsaWN0cyBvciBpZiB0aGVyZSdzCiAjICAgICBhbHJlYWR5IGEgcGFy dGx5IHdyaXR0ZW4gQ2hhbmdlTG9nIGVudHJ5LgotIyAgIEFkZCBjb21tYW5kIGxpbmUgb3B0aW9u IHRvIHB1dCB0aGUgQ2hhbmdlTG9nIGludG8gYSBzZXBhcmF0ZQotIyAgICAgZmlsZSBvciBqdXN0 IHNwZXcgaXQgb3V0IHN0ZG91dC4KKyMgICBBZGQgY29tbWFuZCBsaW5lIG9wdGlvbiB0byBwdXQg dGhlIENoYW5nZUxvZyBpbnRvIGEgc2VwYXJhdGUgZmlsZS4KICMgICBBZGQgU1ZOIHZlcnNpb24g bnVtYmVycyBmb3IgY29tbWl0IChjYW4ndCBkbyB0aGF0IHVudGlsCiAjICAgICB0aGUgY2hhbmdl cyBhcmUgY2hlY2tlZCBpbiwgdGhvdWdoKS4KICMgICBXb3JrIGFyb3VuZCBkaWZmIHN0dXBpZGl0 eSB3aGVyZSBkZWxldGluZyBhIGZ1bmN0aW9uIHRoYXQgc3RhcnRzCkBAIC0xMDQsNiArMTAzLDcg QEAgbXkgJGdpdENvbW1pdCA9IDA7CiBteSAkZ2l0SW5kZXggPSAiIjsKIG15ICRnaXRSZXZpZXdl ciA9ICIiOwogbXkgJG9wZW5DaGFuZ2VMb2dzID0gMDsKK215ICR3cml0ZUNoYW5nZUxvZ3MgPSAx OwogbXkgJHNob3dIZWxwID0gMDsKIG15ICRzcGV3RGlmZiA9ICRFTlZ7IlBSRVBBUkVfQ0hBTkdF TE9HX0RJRkYifTsKIG15ICR1cGRhdGVDaGFuZ2VMb2dzID0gMTsKQEAgLTExNyw2ICsxMTcsNyBA QCBteSAkcGFyc2VPcHRpb25zUmVzdWx0ID0KICAgICAgICAgICAgICAgICJnaXQtcmV2aWV3ZXI6 cyIgPT4gXCRnaXRSZXZpZXdlciwKICAgICAgICAgICAgICAgICJoZWxwfGghIiA9PiBcJHNob3dI ZWxwLAogICAgICAgICAgICAgICAgIm9wZW58byEiID0+IFwkb3BlbkNoYW5nZUxvZ3MsCisgICAg ICAgICAgICAgICAid3JpdGUhIiA9PiBcJHdyaXRlQ2hhbmdlTG9ncywKICAgICAgICAgICAgICAg ICJ1cGRhdGUhIiA9PiBcJHVwZGF0ZUNoYW5nZUxvZ3MpOwogaWYgKCEkcGFyc2VPcHRpb25zUmVz dWx0IHx8ICRzaG93SGVscCkgewogICAgIHByaW50IFNUREVSUiBiYXNlbmFtZSgkMCkgLiAiIFst LWJ1Z10gWy1kfC0tZGlmZl0gWy1ofC0taGVscF0gWy1vfC0tb3Blbl0gWy0tZ2l0LWNvbW1pdD08 Y29tbWl0dGlzaD5dIFstLWdpdC1yZXZpZXdlcj08bmFtZT5dIFtzdm5kaXIxIFtzdm5kaXIyIC4u Ll1dXG4iOwpAQCAtMTI5LDYgKzEzMCw3IEBAIGlmICghJHBhcnNlT3B0aW9uc1Jlc3VsdCB8fCAk c2hvd0hlbHApIHsKICAgICBwcmludCBTVERFUlIgIiAgLWh8LS1oZWxwICAgICAgU2hvdyB0aGlz IGhlbHAgbWVzc2FnZVxuIjsKICAgICBwcmludCBTVERFUlIgIiAgLW98LS1vcGVuICAgICAgT3Bl biBDaGFuZ2VMb2dzIGluIGFuIGVkaXRvciB3aGVuIGRvbmVcbiI7CiAgICAgcHJpbnQgU1RERVJS ICIgIC0tW25vLV11cGRhdGUgIFVwZGF0ZSBDaGFuZ2VMb2dzIGZyb20gc3ZuIGJlZm9yZSBhZGRp bmcgZW50cnkgKGRlZmF1bHQ6IHVwZGF0ZSlcbiI7CisgICAgcHJpbnQgU1RERVJSICIgIC0tW25v LV13cml0ZSAgIFdyaXRlIENoYW5nZUxvZ3MgdG8gZGlzayAob3RoZXJ3aXNlIHNlbmQgbmV3IGVu dHJpZXMgdG8gc3Rkb3V0KSAoZGVmYXVsdDogd3JpdGUpXG4iOwogICAgIGV4aXQgMTsKIH0KIApA QCAtMjg1LDkgKzI4NywzNSBAQCBmb3JlYWNoIG15ICRmaWxlIChzb3J0IGtleXMgJWZ1bmN0aW9u X2xpc3RzKSB7CiAgICAgfQogfQogCisjIEJ1aWxkIHRoZSBsaXN0IG9mIENoYW5nZUxvZyBwcmVm aXhlcyBpbiB0aGUgY29ycmVjdCBwcm9qZWN0IG9yZGVyCitteSBAcHJlZml4ZXM7CitteSAlcHJl Zml4ZXNTb3J0OworZm9yZWFjaCBteSAkcHJlZml4IChrZXlzICVmaWxlcykgeworICAgIG15ICRw cmVmaXhEaXIgPSBzdWJzdHIoJHByZWZpeCwgMCwgbGVuZ3RoKCRwcmVmaXgpIC0gMSk7ICMgc3Ry aXAgdHJhaWxpbmcgLworICAgIG15ICRzb3J0S2V5ID0gbGMgJHByZWZpeDsKKyAgICAkc29ydEtl eSA9ICJ0b3AgbGV2ZWwiIHVubGVzcyBsZW5ndGggJHNvcnRLZXk7CisKKyAgICBpZiAoJHByZWZp eERpciBlcSAidG9wIGxldmVsIikgeworICAgICAgICAkc29ydEtleSA9ICIiOworICAgIH0gZWxz aWYgKCRwcmVmaXhEaXIgZXEgIlRvb2xzIikgeworICAgICAgICAkc29ydEtleSA9ICItLCBqdXN0 IGFmdGVyIHRvcCBsZXZlbCI7CisgICAgfSBlbHNpZiAoJHByZWZpeERpciBlcSAiV2ViQnJvd3Nl ciIpIHsKKyAgICAgICAgJHNvcnRLZXkgPSBsYyAiV2ViS2l0LCBXZWJCcm93c2VyIGFmdGVyIjsK KyAgICB9IGVsc2lmICgkcHJlZml4RGlyIGVxICJXZWJDb3JlIikgeworICAgICAgICAkc29ydEtl eSA9IGxjICJXZWJGb3VuZGF0aW9uLCBXZWJDb3JlIGFmdGVyIjsKKyAgICB9IGVsc2lmICgkcHJl Zml4RGlyIGVxICJMYXlvdXRUZXN0cyIpIHsKKyAgICAgICAgJHNvcnRLZXkgPSBsYyAifiwgTGF5 b3V0VGVzdHMgbGFzdCI7CisgICAgfQorCisgICAgJHByZWZpeGVzU29ydHskc29ydEtleX0gPSAk cHJlZml4OworfQorZm9yZWFjaCBteSAkcHJlZml4U29ydCAoc29ydCBrZXlzICVwcmVmaXhlc1Nv cnQpIHsKKyAgICBwdXNoIEBwcmVmaXhlcywgJHByZWZpeGVzU29ydHskcHJlZml4U29ydH07Cit9 CisKICMgR2V0IHRoZSBsYXRlc3QgQ2hhbmdlTG9nIGZpbGVzIGZyb20gc3ZuLgogbXkgQGxvZ3Mg PSAoKTsKLWZvcmVhY2ggbXkgJHByZWZpeCAoc29ydCBrZXlzICVmaWxlcykgeworZm9yZWFjaCBt eSAkcHJlZml4IChAcHJlZml4ZXMpIHsKICAgICBwdXNoIEBsb2dzLCBGaWxlOjpTcGVjLT5jYXRm aWxlKCRwcmVmaXggfHwgIi4iLCAiQ2hhbmdlTG9nIik7CiB9CiAKQEAgLTMxMiwyMiArMzQwLDMw IEBAIGlmIChAbG9ncyAmJiAkdXBkYXRlQ2hhbmdlTG9ncyAmJiAkaXNTVk4pIHsKICAgICB9CiB9 CiAKLSMgV3JpdGUgb3V0IGEgbmV3IENoYW5nZUxvZyBmaWxlLgotZm9yZWFjaCBteSAkcHJlZml4 IChzb3J0IGtleXMgJWZpbGVzKSB7Ci0gICAgbXkgJGNoYW5nZUxvZ1BhdGggPSBGaWxlOjpTcGVj LT5jYXRmaWxlKCRwcmVmaXggfHwgIi4iLCAiQ2hhbmdlTG9nIik7Ci0gICAgcHJpbnQgU1RERVJS ICIgIEVkaXRpbmcgdGhlICR7Y2hhbmdlTG9nUGF0aH0gZmlsZS5cbiI7Ci0gICAgb3BlbiBPTERf Q0hBTkdFX0xPRywgJHtjaGFuZ2VMb2dQYXRofSBvciBkaWUgIkNvdWxkIG5vdCBvcGVuICR7Y2hh bmdlTG9nUGF0aH0gZmlsZTogJCEuXG4iOwotICAgICMgSXQncyBsZXNzIGVmZmljaWVudCB0byBy ZWFkIHRoZSB3aG9sZSB0aGluZyBpbnRvIG1lbW9yeSB0aGFuIGl0IHdvdWxkIGJlCi0gICAgIyB0 byByZWFkIGl0IHdoaWxlIHdlIHByZXBlbmQgdG8gaXQgbGF0ZXIsIGJ1dCBJIGxpa2UgZG9pbmcg dGhpcyBwYXJ0IGZpcnN0LgotICAgIG15IEBvbGRfY2hhbmdlX2xvZyA9IDxPTERfQ0hBTkdFX0xP Rz47Ci0gICAgY2xvc2UgT0xEX0NIQU5HRV9MT0c7Ci0gICAgIyBXZSB3YW50IHRvIG1hdGNoIHRo ZSBDaGFuZ2VMb2cncyBsaW5lIGVuZGluZ3MgaW4gY2FzZSBpdCBkb2Vzbid0IG1hdGNoCi0gICAg IyB0aGUgbmF0aXZlIGxpbmUgZW5kaW5ncyBmb3IgdGhpcyB2ZXJzaW9uIG9mIHBlcmwuCisjIEdl bmVyYXRlIG5ldyBDaGFuZ2VMb2cgZW50cmllcyBhbmQgKG9wdGlvbmFsbHkpIHdyaXRlIG91dCBu ZXcgQ2hhbmdlTG9nIGZpbGVzLgorZm9yZWFjaCBteSAkcHJlZml4IChAcHJlZml4ZXMpIHsKICAg ICBteSAkZW5kbCA9ICJcbiI7Ci0gICAgaWYgKCRvbGRfY2hhbmdlX2xvZ1swXSA9fiAvKFxyP1xu KSQvZykgewotICAgICAgICAkZW5kbCA9ICIkMSI7CisgICAgbXkgQG9sZF9jaGFuZ2VfbG9nOwor CisgICAgaWYgKCR3cml0ZUNoYW5nZUxvZ3MpIHsKKyAgICAgICAgbXkgJGNoYW5nZUxvZ1BhdGgg PSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRwcmVmaXggfHwgIi4iLCAiQ2hhbmdlTG9nIik7CisgICAg ICAgIHByaW50IFNUREVSUiAiICBFZGl0aW5nIHRoZSAke2NoYW5nZUxvZ1BhdGh9IGZpbGUuXG4i OworICAgICAgICBvcGVuIE9MRF9DSEFOR0VfTE9HLCAke2NoYW5nZUxvZ1BhdGh9IG9yIGRpZSAi Q291bGQgbm90IG9wZW4gJHtjaGFuZ2VMb2dQYXRofSBmaWxlOiAkIS5cbiI7CisgICAgICAgICMg SXQncyBsZXNzIGVmZmljaWVudCB0byByZWFkIHRoZSB3aG9sZSB0aGluZyBpbnRvIG1lbW9yeSB0 aGFuIGl0IHdvdWxkIGJlCisgICAgICAgICMgdG8gcmVhZCBpdCB3aGlsZSB3ZSBwcmVwZW5kIHRv IGl0IGxhdGVyLCBidXQgSSBsaWtlIGRvaW5nIHRoaXMgcGFydCBmaXJzdC4KKyAgICAgICAgQG9s ZF9jaGFuZ2VfbG9nID0gPE9MRF9DSEFOR0VfTE9HPjsKKyAgICAgICAgY2xvc2UgT0xEX0NIQU5H RV9MT0c7CisgICAgICAgICMgV2Ugd2FudCB0byBtYXRjaCB0aGUgQ2hhbmdlTG9nJ3MgbGluZSBl bmRpbmdzIGluIGNhc2UgaXQgZG9lc24ndCBtYXRjaAorICAgICAgICAjIHRoZSBuYXRpdmUgbGlu ZSBlbmRpbmdzIGZvciB0aGlzIHZlcnNpb24gb2YgcGVybC4KKyAgICAgICAgaWYgKCRvbGRfY2hh bmdlX2xvZ1swXSA9fiAvKFxyP1xuKSQvZykgeworICAgICAgICAgICAgJGVuZGwgPSAiJDEiOwor ICAgICAgICB9CisgICAgICAgIG9wZW4gQ0hBTkdFX0xPRywgIj4gJHtjaGFuZ2VMb2dQYXRofSIg b3IgZGllICJDb3VsZCBub3Qgd3JpdGUgJHtjaGFuZ2VMb2dQYXRofVxuLiI7CisgICAgfSBlbHNl IHsKKyAgICAgICAgb3BlbiBDSEFOR0VfTE9HLCAiPi0iIG9yIGRpZSAiQ291bGQgbm90IHdyaXRl IHRvIFNURE9VVFxuLiI7CisgICAgICAgIHByaW50IHN1YnN0cigkcHJlZml4LCAwLCBsZW5ndGgo JHByZWZpeCkgLSAxKSAuICI6XG5cbiIgdW5sZXNzIChzY2FsYXIgQHByZWZpeGVzKSA9PSAxOwog ICAgIH0KLSAgICBvcGVuIENIQU5HRV9MT0csICI+ICR7Y2hhbmdlTG9nUGF0aH0iIG9yIGRpZSAi Q291bGQgbm90IHdyaXRlICR7Y2hhbmdlTG9nUGF0aH1cbi4iOworCiAgICAgcHJpbnQgQ0hBTkdF X0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiJGRhdGUgICRuYW1lICA8JGVtYWlsQWRkcmVzcz5c blxuIiwgJGVuZGwpOwogCiAgICAgbXkgKCRyZXZpZXdlciwgJGRlc2NyaXB0aW9uKSA9IHJldmll d2VyQW5kRGVzY3JpcHRpb25Gb3JHaXRDb21taXQoJGdpdENvbW1pdCkgaWYgJGdpdENvbW1pdDsK QEAgLTM0MSw4ICszNzcsMTAgQEAgZm9yZWFjaCBteSAkcHJlZml4IChzb3J0IGtleXMgJWZpbGVz KSB7CiAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAk YnVnVVJMXG4iLCAkZW5kbCkgaWYgJGJ1Z1VSTDsKICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1h bGl6ZUxpbmVFbmRpbmdzKCJcbiIsICRlbmRsKTsKIAotICAgICMgV2UgY291bGQgcHJlLXBvcHVs YXRlIHRoaXMgd2l0aCB0aGUgZ2l0IGNvbW1pdCBsb2cgb3Igd2l0aCB0aGUgYnVnIGRlc2NyaXB0 aW9uLgotICAgIHByaW50IFNUREVSUiAiLS0gUGxlYXNlIHJlbWVtYmVyIHRvIGluY2x1ZGUgYSBk ZXRhaWxlZCBkZXNjcmlwdGlvbiBpbiB5b3VyIENoYW5nZUxvZyBlbnRyeS4gLS1cbi0tIFNlZSA8 aHR0cDovL3dlYmtpdC5vcmcvY29kaW5nL2NvbnRyaWJ1dGluZy5odG1sPiBmb3IgbW9yZSBpbmZv IC0tXG4iOworICAgIGlmICgkd3JpdGVDaGFuZ2VMb2dzKSB7CisgICAgICAgICMgV2UgY291bGQg cHJlLXBvcHVsYXRlIHRoaXMgd2l0aCB0aGUgZ2l0IGNvbW1pdCBsb2cgb3Igd2l0aCB0aGUgYnVn IGRlc2NyaXB0aW9uLgorICAgICAgICBwcmludCBTVERFUlIgIi0tIFBsZWFzZSByZW1lbWJlciB0 byBpbmNsdWRlIGEgZGV0YWlsZWQgZGVzY3JpcHRpb24gaW4geW91ciBDaGFuZ2VMb2cgZW50cnku IC0tXG4tLSBTZWUgPGh0dHA6Ly93ZWJraXQub3JnL2NvZGluZy9jb250cmlidXRpbmcuaHRtbD4g Zm9yIG1vcmUgaW5mbyAtLVxuIjsKKyAgICB9CiAKICAgICBpZiAoJHByZWZpeCA9fiBtL1dlYkNv cmUvIHx8IGBwd2RgID1+IG0vV2ViQ29yZS8pIHsKICAgICAgICAgaWYgKCRkaWRDaGFuZ2VSZWdy ZXNzaW9uVGVzdHMpIHsKQEAgLTM1NCw5ICszOTIsMTUgQEAgZm9yZWFjaCBteSAkcHJlZml4IChz b3J0IGtleXMgJWZpbGVzKSB7CiAKICAgICBmb3JlYWNoIG15ICRmaWxlIChzb3J0IEB7JGZpbGVz eyRwcmVmaXh9fSkgewogICAgICAgICBteSAkZmlsZV9zdGVtID0gc3Vic3RyICRmaWxlLCBsZW5n dGggJHByZWZpeDsKLSAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5n cygiICAgICAgICAqICRmaWxlX3N0ZW06JGZ1bmN0aW9uX2xpc3RzeyRmaWxlfVxuIiwgJGVuZGwp OzsKKyAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAg ICAqICRmaWxlX3N0ZW06JGZ1bmN0aW9uX2xpc3RzeyRmaWxlfVxuIiwgJGVuZGwpOworICAgIH0K KworICAgIGlmICgkd3JpdGVDaGFuZ2VMb2dzKSB7CisgICAgICAgIHByaW50IENIQU5HRV9MT0cg bm9ybWFsaXplTGluZUVuZGluZ3MoIlxuIiwgJGVuZGwpLCBAb2xkX2NoYW5nZV9sb2c7CisgICAg fSBlbHNlIHsKKyAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyAiXG4iOwogICAgIH0KLSAgICBwcmlu dCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCJcbiIsICRlbmRsKSwgQG9sZF9jaGFu Z2VfbG9nOworCiAgICAgY2xvc2UgQ0hBTkdFX0xPRzsKIH0KIAo= 33373 2009-07-23 14:26:05 -0700 2009-07-24 03:52:11 -0700 add new prepare-ChangeLog options to bash completion script completion.patch text/plain 2101 efidler ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlMTdmZmE1Li4xOTI1MDhkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKyAyMDA5LTA3 LTIzICBFbGkgRmlkbGVyICA8ZWxpLmZpZGxlckB0b3JjaG1vYmlsZS5jb20+CisgCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcHJvdmUgZ2l0IHdvcmtm bG93IGJ5IHBvcHVsYXRpbmcgY29tbWl0IG1lc3NhZ2VzIHdpdGggQ2hhbmdlTG9nIGVudHJpZXMu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzYwNQor CisgICAgICAgIGFkZCAtLVtuby1dd3JpdGUgcHJlcGFyZS1DaGFuZ2VMb2cgb3B0aW9ucyB0byBi YXNoIGNvbXBsZXRpb24KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0LXRvb2xzLWNvbXBsZXRp b24uc2g6CisKMjAwOS0wNy0yMyAgRWxpIEZpZGxlciAgPGVsaS5maWRsZXJAdG9yY2htb2JpbGUu Y29tPgoKICAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gVHJlYXQuCiAKICAgICAgICAgIEltcHJv dmUgZ2l0IHdvcmtmbG93IGJ5IHBvcHVsYXRpbmcgY29tbWl0IG1lc3NhZ2VzIHdpdGggQ2hhbmdl TG9nIGVudHJpZXMuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdC10b29s cy1jb21wbGV0aW9uLnNoIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXQtdG9vbHMtY29tcGxl dGlvbi5zaAppbmRleCA0MmI4NDBjLi45MWQ5YTEzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdC10b29scy1jb21wbGV0aW9uLnNoCisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0LXRvb2xzLWNvbXBsZXRpb24uc2gKQEAgLTg2LDYgKzg2LDYgQEAgX2J1Z3ppbGxh LXRvb2xfY29tcGxldGUoKQogCiBjb21wbGV0ZSAtRiBfYnVnemlsbGEtdG9vbF9jb21wbGV0ZSBi dWd6aWxsYS10b29sCiBjb21wbGV0ZSAtVyAiLS1jb250aW51ZSAtLWZpeC1tZXJnZWQgLS1oZWxw IC0tbm8tY29udGludWUgLS1uby13YXJuaW5ncyAtLXdhcm5pbmdzIC1jIC1mIC1oIC13IiByZXNv bHZlLUNoYW5nZUxvZ3MKLWNvbXBsZXRlIC1XICItLWJ1ZyAtLWRpZmYgLS1naXQtY29tbWl0IC0t Z2l0LWluZGV4IC0tZ2l0LXJldmlld2VyIC0taGVscCAtLW5vLXVwZGF0ZSAtLW9wZW4gLS11cGRh dGUgLWQgLWggLW8iIHByZXBhcmUtQ2hhbmdlTG9nCitjb21wbGV0ZSAtVyAiLS1idWcgLS1kaWZm IC0tZ2l0LWNvbW1pdCAtLWdpdC1pbmRleCAtLWdpdC1yZXZpZXdlciAtLWhlbHAgLS1uby11cGRh dGUgLS1vcGVuIC0tdXBkYXRlIC1kIC1oIC1vIC0td3JpdGUgLS1uby13cml0ZSIgcHJlcGFyZS1D aGFuZ2VMb2cKIGNvbXBsZXRlIC1XICItLWNsZWFuIC0tZGVidWcgLS1oZWxwIC1oIiBidWlsZC13 ZWJraXQKIGNvbXBsZXRlIC1vIGRlZmF1bHQgLVcgIi0tYWRkLXBsYXRmb3JtLWV4Y2VwdGlvbnMg LS1jb21wbGV4LXRleHQgLS1jb25maWd1cmF0aW9uIC0tZ3VhcmQtbWFsbG9jIC0taGVscCAtLWh0 dHAgLS1pZ25vcmUtdGVzdHMgLS1sYXVuY2gtc2FmYXJpIC0tbGVha3MgLS1tZXJnZS1sZWFrLWRl cHRoIC0tbmV3LXRlc3QtcmVzdWx0cyAtLW5vLWh0dHAgLS1uby1sYXVuY2gtc2FmYXJpIC0tbm8t bmV3LXRlc3QtcmVzdWx0cyAtLW5vLXNhbXBsZS1vbi10aW1lb3V0IC0tbm8tc3RyaXAtZWRpdGlu Zy1jYWxsYmFja3MgLS1waXhlbC10ZXN0cyAtLXBsYXRmb3JtIC0tcG9ydCAtLXF1aWV0IC0tcmFu ZG9tIC0tcmVzZXQtcmVzdWx0cyAtLXJlc3VsdHMtZGlyZWN0b3J5IC0tcmV2ZXJzZSAtLXJvb3Qg LS1zYW1wbGUtb24tdGltZW91dCAtLXNpbmdseSAtLXNraXBwZWQgLS1zbG93ZXN0IC0tc3RyaWN0 IC0tc3RyaXAtZWRpdGluZy1jYWxsYmFja3MgLS10aHJlYWRlZCAtLXRpbWVvdXQgLS10b2xlcmFu Y2UgLS11c2UtcmVtb3RlLWxpbmtzLXRvLXRlc3RzIC0tdmFsZ3JpbmQgLS12ZXJib3NlIC0xIC1j IC1nIC1oIC1pIC1sIC1tIC1vIC1wIC1xIC10IC12IiBydW4td2Via2l0LXRlc3RzCg== 33376 2009-07-23 14:32:26 -0700 2009-07-24 13:42:14 -0700 If the user doesn't modify the ChangeLog files in the git commit, use prepare-ChangeLog to populate the git commit message. commit-log-editor.patch text/plain 2395 efidler ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxOTI1MDhkLi45M2Q5ZTkyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDct MjMgIEVsaSBGaWRsZXIgIDxlbGkuZmlkbGVyQHRvcmNobW9iaWxlLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXByb3ZlIGdpdCB3b3JrZmxv dyBieSBwb3B1bGF0aW5nIGNvbW1pdCBtZXNzYWdlcyB3aXRoIENoYW5nZUxvZyBlbnRyaWVzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc2MDUKKyAK KyAgICAgICAgSWYgdGhlIHVzZXIgZG9lc24ndCBtYW51YWxseSBtb2RpZnkgdGhlIENoYW5nZUxv ZyBmaWxlcywgdXNlCisgICAgICAgIHByZXBhcmUtQ2hhbmdlTG9nIHRvIHBvcHVsYXRlIHRoZSBn aXQgY29tbWl0IG1lc3NhZ2UuCisKKyAgICAgICAgKiBTY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9y OgorCjIwMDktMDctMjMgIEVsaSBGaWRsZXIgIDxlbGkuZmlkbGVyQHRvcmNobW9iaWxlLmNvbT4K CiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9jb21t aXQtbG9nLWVkaXRvcgppbmRleCBmYjgwNjJkLi5mMDQ5MDkzIDEwMDc1NQotLS0gYS9XZWJLaXRU b29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv Y29tbWl0LWxvZy1lZGl0b3IKQEAgLTEsNiArMSw3IEBACiAjIS91c3IvYmluL3BlcmwgLXcKIAog IyBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyMgQ29weXJpZ2h0IChDKSAyMDA5IFRvcmNoIE1vYmlsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTE0MCwxNCArMTQxLDIyIEBA IGZvciBteSAkY2hhbmdlTG9nIChAY2hhbmdlTG9ncykgewogCiBteSAkZmlyc3QgPSAxOwogb3Bl biBORVdMT0csICI+JGxvZy5lZGl0IiBvciBkaWU7Ci1mb3IgbXkgJHNvcnRLZXkgKHNvcnQga2V5 cyAlY2hhbmdlTG9nU29ydCkgewotICAgIG15ICRsYWJlbCA9ICRjaGFuZ2VMb2dTb3J0eyRzb3J0 S2V5fTsKLSAgICBpZiAoa2V5cyAlY2hhbmdlTG9nU29ydCA+IDEpIHsKLSAgICAgICAgcHJpbnQg TkVXTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCJcbiIsICRlbmRsKSBpZiAhJGZpcnN0OwotICAg ICAgICAkZmlyc3QgPSAwOwotICAgICAgICBwcmludCBORVdMT0cgbm9ybWFsaXplTGluZUVuZGlu Z3MoIiRsYWJlbDpcblxuIiwgJGVuZGwpOworaWYgKGlzR2l0KCkgJiYgc2NhbGFyIGtleXMgJWNo YW5nZUxvZ1NvcnQgPT0gMCkgeworICAgIG9wZW4gQ0hBTkdFTE9HX0VOVFJJRVMsICItfCIsICJw cmVwYXJlLUNoYW5nZUxvZyAtLWdpdC1pbmRleCAtLW5vLXdyaXRlIiBvciBkaWUgInByZXBhcmUt Q2hhbmdlTG9nIGZhaWxlZDogJCEuXG4iOworICAgIHdoaWxlICg8Q0hBTkdFTE9HX0VOVFJJRVM+ KSB7CisgICAgICAgIHByaW50IE5FV0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygkXywgJGVuZGwp OworICAgIH0KKyAgICBjbG9zZSBDSEFOR0VMT0dfRU5UUklFUzsKK30gZWxzZSB7CisgICAgZm9y IG15ICRzb3J0S2V5IChzb3J0IGtleXMgJWNoYW5nZUxvZ1NvcnQpIHsKKyAgICAgICAgbXkgJGxh YmVsID0gJGNoYW5nZUxvZ1NvcnR7JHNvcnRLZXl9OworICAgICAgICBpZiAoa2V5cyAlY2hhbmdl TG9nU29ydCA+IDEpIHsKKyAgICAgICAgICAgIHByaW50IE5FV0xPRyBub3JtYWxpemVMaW5lRW5k aW5ncygiXG4iLCAkZW5kbCkgaWYgISRmaXJzdDsKKyAgICAgICAgICAgICRmaXJzdCA9IDA7Cisg ICAgICAgICAgICBwcmludCBORVdMT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoIiRsYWJlbDpcblxu IiwgJGVuZGwpOworICAgICAgICB9CisgICAgICAgIHByaW50IE5FV0xPRyBub3JtYWxpemVMaW5l RW5kaW5ncygkY2hhbmdlTG9nQ29udGVudHN7JGxhYmVsfSwgJGVuZGwpOwogICAgIH0KLSAgICBw cmludCBORVdMT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoJGNoYW5nZUxvZ0NvbnRlbnRzeyRsYWJl bH0sICRlbmRsKTsKIH0KIHByaW50IE5FV0xPRyAkbG9nQ29udGVudHM7CiBjbG9zZSBORVdMT0c7 Cg== 33469 2009-07-24 13:42:14 -0700 2009-07-24 13:49:29 -0700 add git configuration option to disable populating commit message commit-log-editor.patch text/plain 2948 efidler ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxOTI1MDhkLi41NmI1YjkyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDct MjMgIEVsaSBGaWRsZXIgIDxlbGkuZmlkbGVyQHRvcmNobW9iaWxlLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXByb3ZlIGdpdCB3b3JrZmxv dyBieSBwb3B1bGF0aW5nIGNvbW1pdCBtZXNzYWdlcyB3aXRoIENoYW5nZUxvZyBlbnRyaWVzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc2MDUKKwor ICAgICAgICBJZiB0aGUgdXNlciBkb2Vzbid0IG1hbnVhbGx5IG1vZGlmeSB0aGUgQ2hhbmdlTG9n IGZpbGVzLCB1c2UKKyAgICAgICAgcHJlcGFyZS1DaGFuZ2VMb2cgdG8gcG9wdWxhdGUgdGhlIGdp dCBjb21taXQgbWVzc2FnZS4gVGhpcyBiZWhhdmlvdXIKKyAgICAgICAgY2FuIGJlIGRpc2FibGVk IGJ5IHRoZSBnZW5lcmF0ZUNoYW5nZUxvZ0VudHJpZXMgZ2l0IGNvbmZpZ3VyYXRpb24gb3B0aW9u LgorCisgICAgICAgICogU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcjoKKwoyMDA5LTA3LTIzICBF bGkgRmlkbGVyICA8ZWxpLmZpZGxlckB0b3JjaG1vYmlsZS5jb20+CgogICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9jb21t aXQtbG9nLWVkaXRvciBiL1dlYktpdFRvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKaW5k ZXggZmI4MDYyZC4uMTEzYzk4ZCAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9jb21t aXQtbG9nLWVkaXRvcgorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9y CkBAIC0xLDYgKzEsNyBAQAogIyEvdXNyL2Jpbi9wZXJsIC13CiAKICMgQ29weXJpZ2h0IChDKSAy MDA2LCAyMDA3IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAo QykgMjAwOSBUb3JjaCBNb2JpbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZv bGxvd2luZyBjb25kaXRpb25zCkBAIC0xNDAsMTQgKzE0MSwzMCBAQCBmb3IgbXkgJGNoYW5nZUxv ZyAoQGNoYW5nZUxvZ3MpIHsKIAogbXkgJGZpcnN0ID0gMTsKIG9wZW4gTkVXTE9HLCAiPiRsb2cu ZWRpdCIgb3IgZGllOwotZm9yIG15ICRzb3J0S2V5IChzb3J0IGtleXMgJWNoYW5nZUxvZ1NvcnQp IHsKLSAgICBteSAkbGFiZWwgPSAkY2hhbmdlTG9nU29ydHskc29ydEtleX07Ci0gICAgaWYgKGtl eXMgJWNoYW5nZUxvZ1NvcnQgPiAxKSB7Ci0gICAgICAgIHByaW50IE5FV0xPRyBub3JtYWxpemVM aW5lRW5kaW5ncygiXG4iLCAkZW5kbCkgaWYgISRmaXJzdDsKLSAgICAgICAgJGZpcnN0ID0gMDsK LSAgICAgICAgcHJpbnQgTkVXTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIkbGFiZWw6XG5cbiIs ICRlbmRsKTsKK2lmIChpc0dpdCgpICYmIHNjYWxhciBrZXlzICVjaGFuZ2VMb2dTb3J0ID09IDAp IHsKKyAgICAjIHBvcHVsYXRlIGdpdCBjb21taXQgbWVzc2FnZSB3aXRoIFdlYktpdC1mb3JtYXQg Q2hhbmdlTG9nIGVudHJpZXMgdW5sZXNzIGV4cGxpY2l0bHkgZGlzYWJsZWQKKyAgICBteSAkYnJh bmNoID0gZ2l0QnJhbmNoKCk7CisgICAgY2hvbXAobXkgJGdlbmVyYXRlQ2hhbmdlTG9nRW50cmll cyA9IGBnaXQgY29uZmlnIC0tYm9vbCBicmFuY2guJGJyYW5jaC5nZW5lcmF0ZUNoYW5nZUxvZ0Vu dHJpZXNgKTsKKyAgICBpZiAoJGdlbmVyYXRlQ2hhbmdlTG9nRW50cmllcyBlcSAiIikgeworICAg ICAgICBjaG9tcCgkZ2VuZXJhdGVDaGFuZ2VMb2dFbnRyaWVzID0gYGdpdCBjb25maWcgLS1ib29s IGNvcmUuZ2VuZXJhdGVDaGFuZ2VMb2dFbnRyaWVzYCk7CisgICAgfQorICAgIGlmICgkZ2VuZXJh dGVDaGFuZ2VMb2dFbnRyaWVzIG5lICJmYWxzZSIpIHsKKyAgICAgICAgb3BlbiBDSEFOR0VMT0df RU5UUklFUywgIi18IiwgInByZXBhcmUtQ2hhbmdlTG9nIC0tZ2l0LWluZGV4IC0tbm8td3JpdGUi IG9yIGRpZSAicHJlcGFyZS1DaGFuZ2VMb2cgZmFpbGVkOiAkIS5cbiI7CisgICAgICAgIHdoaWxl ICg8Q0hBTkdFTE9HX0VOVFJJRVM+KSB7CisgICAgICAgICAgICBwcmludCBORVdMT0cgbm9ybWFs aXplTGluZUVuZGluZ3MoJF8sICRlbmRsKTsKKyAgICAgICAgfQorICAgICAgICBjbG9zZSBDSEFO R0VMT0dfRU5UUklFUzsKKyAgICB9Cit9IGVsc2UgeworICAgIGZvciBteSAkc29ydEtleSAoc29y dCBrZXlzICVjaGFuZ2VMb2dTb3J0KSB7CisgICAgICAgIG15ICRsYWJlbCA9ICRjaGFuZ2VMb2dT b3J0eyRzb3J0S2V5fTsKKyAgICAgICAgaWYgKGtleXMgJWNoYW5nZUxvZ1NvcnQgPiAxKSB7Cisg ICAgICAgICAgICBwcmludCBORVdMT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoIlxuIiwgJGVuZGwp IGlmICEkZmlyc3Q7CisgICAgICAgICAgICAkZmlyc3QgPSAwOworICAgICAgICAgICAgcHJpbnQg TkVXTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIkbGFiZWw6XG5cbiIsICRlbmRsKTsKKyAgICAg ICAgfQorICAgICAgICBwcmludCBORVdMT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoJGNoYW5nZUxv Z0NvbnRlbnRzeyRsYWJlbH0sICRlbmRsKTsKICAgICB9Ci0gICAgcHJpbnQgTkVXTE9HIG5vcm1h bGl6ZUxpbmVFbmRpbmdzKCRjaGFuZ2VMb2dDb250ZW50c3skbGFiZWx9LCAkZW5kbCk7CiB9CiBw cmludCBORVdMT0cgJGxvZ0NvbnRlbnRzOwogY2xvc2UgTkVXTE9HOwo=