74175 2011-12-09 02:54:04 -0800 [Refactoring] In prepare-ChangeLog, move top-level code to generate change-log lists into a method 2011-12-10 22:32:25 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73531 1 haraken haraken aroben ddkilzer rniwa webkit.review.bot oldest_to_newest 518199 0 haraken 2011-12-09 02:54:04 -0800 The objective is to make prepare-ChangeLog a loadable Perl module for unit testing. This requires to remove top-level code. This is one of the incremental refactorings for that. 518201 1 118555 haraken 2011-12-09 03:07:07 -0800 Created attachment 118555 Patch 518202 2 haraken 2011-12-09 03:10:37 -0800 rniwa: Thanks. I'll stop refactoring today, since further refactoring requires all previous patches to be landed. 518640 3 ddkilzer 2011-12-09 16:53:34 -0800 (In reply to comment #1) > Created an attachment (id=118555) [details] > Patch This looks like a great first step. Thanks! 518645 4 rniwa 2011-12-09 16:54:32 -0800 (In reply to comment #3) > (In reply to comment #1) > > Created an attachment (id=118555) [details] [details] > > Patch > > This looks like a great first step. Thanks! Indeed! haraken++ 518777 5 118688 haraken 2011-12-10 03:09:32 -0800 Created attachment 118688 rebased patch for commit 518778 6 haraken 2011-12-10 03:12:28 -0800 rniwa: Oops, I forgot to add the --no-review --no-obsolete option for uploading the rebased patch. Would you r+ again please? 518873 7 118688 webkit.review.bot 2011-12-10 22:32:21 -0800 Comment on attachment 118688 rebased patch for commit Clearing flags on attachment: 118688 Committed r102536: <http://trac.webkit.org/changeset/102536> 518874 8 webkit.review.bot 2011-12-10 22:32:25 -0800 All reviewed patches have been landed. Closing bug. 118555 2011-12-09 03:07:07 -0800 2011-12-10 03:09:27 -0800 Patch bug-74175-20111209200706.patch text/plain 6461 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNDI4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjNiYTZkZTA5NjM2ZjQ5YjMwMGJmMjVhMDczNGFjMzlh OWQzYjc1Zi4uZGE0MzFlMzVkNjY5NGE3NDg5NzkyN2UwZjU3MTkwZjY1YzZjNmI5NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDExLTEyLTA5ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbUmVmYWN0b3JpbmddIEluIHByZXBhcmUtQ2hhbmdlTG9nLCBtb3ZlIHRvcC1sZXZl bCBjb2RlIHRvIGZpbmQgQ2hhbmdlTG9ncyBpbnRvIGEgbWV0aG9kCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDE3NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBvYmplY3RpdmUgaXMgdG8gbWFrZSBw cmVwYXJlLUNoYW5nZUxvZyBhIGxvYWRhYmxlIFBlcmwgbW9kdWxlIGZvciB1bml0IHRlc3Rpbmcu CisgICAgICAgIFRoaXMgcmVxdWlyZXMgdG8gcmVtb3ZlIHRvcC1sZXZlbCBjb2RlLiBUaGlzIHBh dGNoIGlzIG9uZSBvZiB0aGUgaW5jcmVtZW50YWwgcmVmYWN0b3JpbmdzCisgICAgICAgIGZvciB0 aGF0LgorCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzogTW92ZWQgdG9wLWxl dmVsIGNvZGUgdG8gZmluZCBDaGFuZ2VMb2dzIGludG8gZmluZENoYW5nZUxvZ3MoKS4KKyAgICAg ICAgKGZpbmRDaGFuZ2VMb2dzKToKKwogMjAxMS0xMi0wOCAgQWRhbSBLbGVpbiAgPGFkYW1rQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbTXV0YXRpb25PYnNlcnZlcnNdIFY4TGF6eUV2ZW50SGFu ZGxlciBicmVha3MgbWljcm90YXNrIGRlbGl2ZXJ5IHNlbWFudGljcwpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFu Z2VMb2cKaW5kZXggMmUyN2RjMzdhYTY4NjZjN2QxNzgwYmY1YjVmZjdhNWQxOTk4ZTQzMy4uNGQ2 ZjkxN2Q2YjllOWEwNTU2NDI0MmUxZTg0ZDI4ZGM1NGMwN2UxOSAxMDA3NTUKLS0tIGEvVG9vbHMv U2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZworKysgYi9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hh bmdlTG9nCkBAIC02Nyw2ICs2Nyw3IEBAIHVzZSBWQ1NVdGlsczsKIHN1YiBjaGFuZ2VMb2dEYXRl KCQpOwogc3ViIGNoYW5nZUxvZ0VtYWlsQWRkcmVzc0Zyb21BcmdzKCQpOwogc3ViIGNoYW5nZUxv Z05hbWVGcm9tQXJncygkKTsKK3N1YiBmaW5kQ2hhbmdlTG9ncyhcJSk7CiBzdWIgZmlyc3REaXJl Y3RvcnlPckN3ZCgpOwogc3ViIGRpZmZGcm9tVG9TdHJpbmcoKTsKIHN1YiBkaWZmQ29tbWFuZChA KTsKQEAgLTI4Nyw1NyArMjg4LDExIEBAIGlmICgkYnVnTnVtYmVyICYmICEkYnVnRGVzY3JpcHRp b24pIHsKICMgUmVtb3ZlIHRyYWlsaW5nIHBhcmVudGhlc2l6ZWQgbm90ZXMgZnJvbSB1c2VyIG5h bWUgKGJpdCBvZiBoYWNrKS4KICRuYW1lID1+IHMvXCguKj9cKVxzKiQvL2c7CiAKLSMgRmluZCB0 aGUgY2hhbmdlIGxvZ3MuCi1teSAlaGFzX2xvZzsKLW15ICVmaWxlczsKLWZvcmVhY2ggbXkgJGZp bGUgKHNvcnQga2V5cyAlZnVuY3Rpb25fbGlzdHMpIHsKLSAgICBteSAkcHJlZml4ID0gJGZpbGU7 Ci0gICAgbXkgJGhhc19sb2cgPSAwOwotICAgIHdoaWxlICgkcHJlZml4KSB7Ci0gICAgICAgICRw cmVmaXggPX4gcy0vW14vXSsvPyQtLy0gb3IgJHByZWZpeCA9ICIiOwotICAgICAgICAkaGFzX2xv ZyA9ICRoYXNfbG9neyRwcmVmaXh9OwotICAgICAgICBpZiAoIWRlZmluZWQgJGhhc19sb2cpIHsK LSAgICAgICAgICAgICRoYXNfbG9nID0gLWYgIiR7cHJlZml4fUNoYW5nZUxvZyI7Ci0gICAgICAg ICAgICAkaGFzX2xvZ3skcHJlZml4fSA9ICRoYXNfbG9nOwotICAgICAgICB9Ci0gICAgICAgIGxh c3QgaWYgJGhhc19sb2c7Ci0gICAgfQotICAgIGlmICghJGhhc19sb2cpIHsKLSAgICAgICAgcHJp bnQgU1RERVJSICJObyBDaGFuZ2VMb2cgZm91bmQgZm9yICRmaWxlLlxuIjsKLSAgICB9IGVsc2Ug ewotICAgICAgICBwdXNoIEB7JGZpbGVzeyRwcmVmaXh9fSwgJGZpbGU7Ci0gICAgfQotfQotCi0j IEJ1aWxkIHRoZSBsaXN0IG9mIENoYW5nZUxvZyBwcmVmaXhlcyBpbiB0aGUgY29ycmVjdCBwcm9q ZWN0IG9yZGVyCi1teSBAcHJlZml4ZXM7Ci1teSAlcHJlZml4ZXNTb3J0OwotZm9yZWFjaCBteSAk cHJlZml4IChrZXlzICVmaWxlcykgewotICAgIG15ICRwcmVmaXhEaXIgPSBzdWJzdHIoJHByZWZp eCwgMCwgbGVuZ3RoKCRwcmVmaXgpIC0gMSk7ICMgc3RyaXAgdHJhaWxpbmcgLwotICAgIG15ICRz b3J0S2V5ID0gbGMgJHByZWZpeDsKLSAgICAkc29ydEtleSA9ICJ0b3AgbGV2ZWwiIHVubGVzcyBs ZW5ndGggJHNvcnRLZXk7Ci0KLSAgICBpZiAoJHByZWZpeERpciBlcSAidG9wIGxldmVsIikgewot ICAgICAgICAkc29ydEtleSA9ICIiOwotICAgIH0gZWxzaWYgKCRwcmVmaXhEaXIgZXEgIlRvb2xz IikgewotICAgICAgICAkc29ydEtleSA9ICItLCBqdXN0IGFmdGVyIHRvcCBsZXZlbCI7Ci0gICAg fSBlbHNpZiAoJHByZWZpeERpciBlcSAiV2ViQnJvd3NlciIpIHsKLSAgICAgICAgJHNvcnRLZXkg PSBsYyAiV2ViS2l0LCBXZWJCcm93c2VyIGFmdGVyIjsKLSAgICB9IGVsc2lmICgkcHJlZml4RGly IGVxICJTb3VyY2UvV2ViQ29yZSIpIHsKLSAgICAgICAgJHNvcnRLZXkgPSBsYyAiV2ViRm91bmRh dGlvbiwgV2ViQ29yZSBhZnRlciI7Ci0gICAgfSBlbHNpZiAoJHByZWZpeERpciBlcSAiTGF5b3V0 VGVzdHMiKSB7Ci0gICAgICAgICRzb3J0S2V5ID0gbGMgIn4sIExheW91dFRlc3RzIGxhc3QiOwot ICAgIH0KLQotICAgICRwcmVmaXhlc1NvcnR7JHNvcnRLZXl9ID0gJHByZWZpeDsKLX0KLWZvcmVh Y2ggbXkgJHByZWZpeFNvcnQgKHNvcnQga2V5cyAlcHJlZml4ZXNTb3J0KSB7Ci0gICAgcHVzaCBA cHJlZml4ZXMsICRwcmVmaXhlc1NvcnR7JHByZWZpeFNvcnR9OwotfQorbXkgKCRmaWxlc19pbl9j aGFuZ2VfbG9nLCAkcHJlZml4ZXMpID0gZmluZENoYW5nZUxvZ3MoJWZ1bmN0aW9uX2xpc3RzKTsK IAogIyBHZXQgdGhlIGxhdGVzdCBDaGFuZ2VMb2cgZmlsZXMgZnJvbSBzdm4uCiBteSBAbG9ncyA9 ICgpOwotZm9yZWFjaCBteSAkcHJlZml4IChAcHJlZml4ZXMpIHsKK2ZvcmVhY2ggbXkgJHByZWZp eCAoQCRwcmVmaXhlcykgewogICAgIHB1c2ggQGxvZ3MsIEZpbGU6OlNwZWMtPmNhdGZpbGUoJHBy ZWZpeCB8fCAiLiIsICJDaGFuZ2VMb2ciKTsKIH0KIApAQCAtMzYzLDcgKzMxOCw3IEBAIGlmIChA bG9ncyAmJiAkdXBkYXRlQ2hhbmdlTG9ncyAmJiAkaXNTVk4pIHsKIH0KIAogIyBHZW5lcmF0ZSBu ZXcgQ2hhbmdlTG9nIGVudHJpZXMgYW5kIChvcHRpb25hbGx5KSB3cml0ZSBvdXQgbmV3IENoYW5n ZUxvZyBmaWxlcy4KLWZvcmVhY2ggbXkgJHByZWZpeCAoQHByZWZpeGVzKSB7Citmb3JlYWNoIG15 ICRwcmVmaXggKEAkcHJlZml4ZXMpIHsKICAgICBteSAkZW5kbCA9ICJcbiI7CiAgICAgbXkgQG9s ZF9jaGFuZ2VfbG9nOwogCkBAIC0zODMsNyArMzM4LDcgQEAgZm9yZWFjaCBteSAkcHJlZml4IChA cHJlZml4ZXMpIHsKICAgICAgICAgb3BlbiBDSEFOR0VfTE9HLCAiPiAke2NoYW5nZUxvZ1BhdGh9 IiBvciBkaWUgIkNvdWxkIG5vdCB3cml0ZSAke2NoYW5nZUxvZ1BhdGh9XG4uIjsKICAgICB9IGVs c2UgewogICAgICAgICBvcGVuIENIQU5HRV9MT0csICI+LSIgb3IgZGllICJDb3VsZCBub3Qgd3Jp dGUgdG8gU1RET1VUXG4uIjsKLSAgICAgICAgcHJpbnQgc3Vic3RyKCRwcmVmaXgsIDAsIGxlbmd0 aCgkcHJlZml4KSAtIDEpIC4gIjpcblxuIiB1bmxlc3MgKHNjYWxhciBAcHJlZml4ZXMpID09IDE7 CisgICAgICAgIHByaW50IHN1YnN0cigkcHJlZml4LCAwLCBsZW5ndGgoJHByZWZpeCkgLSAxKSAu ICI6XG5cbiIgdW5sZXNzIChzY2FsYXIgQCRwcmVmaXhlcykgPT0gMTsKICAgICB9CiAKICAgICBw cmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIkZGF0ZSAgJG5hbWUgIDwkZW1h aWxBZGRyZXNzPlxuXG4iLCAkZW5kbCk7CkBAIC00MDgsNyArMzYzLDcgQEAgZm9yZWFjaCBteSAk cHJlZml4IChAcHJlZml4ZXMpIHsKICAgICAgICAgfQogICAgIH0KIAotICAgIGZvcmVhY2ggbXkg JGZpbGUgKHNvcnQgQHskZmlsZXN7JHByZWZpeH19KSB7CisgICAgZm9yZWFjaCBteSAkZmlsZSAo c29ydCBAeyRmaWxlc19pbl9jaGFuZ2VfbG9nLT57JHByZWZpeH19KSB7CiAgICAgICAgIG15ICRm aWxlX3N0ZW0gPSBzdWJzdHIgJGZpbGUsIGxlbmd0aCAkcHJlZml4OwogICAgICAgICBwcmludCBD SEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIgICAgICAgICogJGZpbGVfc3RlbTokZnVu Y3Rpb25fbGlzdHN7JGZpbGV9XG4iLCAkZW5kbCk7CiAgICAgfQpAQCAtNDg4LDYgKzQ0Myw1OCBA QCBzdWIgY2hhbmdlTG9nRW1haWxBZGRyZXNzRnJvbUFyZ3MoJCkKICAgICByZXR1cm4gJGVtYWls QWRkcmVzc0Zyb21BcmdzIHx8IGNoYW5nZUxvZ0VtYWlsQWRkcmVzcygpOwogfQogCitzdWIgZmlu ZENoYW5nZUxvZ3MoXCUpCit7CisgICAgIyBGaW5kIHRoZSBjaGFuZ2UgbG9ncy4KKyAgICBteSAl aGFzX2xvZzsKKyAgICBteSAlZmlsZXNfaW5fY2hhbmdlX2xvZzsKKyAgICBmb3JlYWNoIG15ICRm aWxlIChzb3J0IGtleXMgJWZ1bmN0aW9uX2xpc3RzKSB7CisgICAgICAgIG15ICRwcmVmaXggPSAk ZmlsZTsKKyAgICAgICAgbXkgJGhhc19sb2cgPSAwOworICAgICAgICB3aGlsZSAoJHByZWZpeCkg eworICAgICAgICAgICAgJHByZWZpeCA9fiBzLS9bXi9dKy8/JC0vLSBvciAkcHJlZml4ID0gIiI7 CisgICAgICAgICAgICAkaGFzX2xvZyA9ICRoYXNfbG9neyRwcmVmaXh9OworICAgICAgICAgICAg aWYgKCFkZWZpbmVkICRoYXNfbG9nKSB7CisgICAgICAgICAgICAgICAgJGhhc19sb2cgPSAtZiAi JHtwcmVmaXh9Q2hhbmdlTG9nIjsKKyAgICAgICAgICAgICAgICAkaGFzX2xvZ3skcHJlZml4fSA9 ICRoYXNfbG9nOworICAgICAgICAgICAgfQorICAgICAgICAgICAgbGFzdCBpZiAkaGFzX2xvZzsK KyAgICAgICAgfQorICAgICAgICBpZiAoISRoYXNfbG9nKSB7CisgICAgICAgICAgICBwcmludCBT VERFUlIgIk5vIENoYW5nZUxvZyBmb3VuZCBmb3IgJGZpbGUuXG4iOworICAgICAgICB9IGVsc2Ug eworICAgICAgICAgICAgcHVzaCBAeyRmaWxlc19pbl9jaGFuZ2VfbG9neyRwcmVmaXh9fSwgJGZp bGU7CisgICAgICAgIH0KKyAgICB9CisKKyAgICAjIEJ1aWxkIHRoZSBsaXN0IG9mIENoYW5nZUxv ZyBwcmVmaXhlcyBpbiB0aGUgY29ycmVjdCBwcm9qZWN0IG9yZGVyCisgICAgbXkgQHByZWZpeGVz OworICAgIG15ICVwcmVmaXhlc1NvcnQ7CisgICAgZm9yZWFjaCBteSAkcHJlZml4IChrZXlzICVm aWxlc19pbl9jaGFuZ2VfbG9nKSB7CisgICAgICAgIG15ICRwcmVmaXhEaXIgPSBzdWJzdHIoJHBy ZWZpeCwgMCwgbGVuZ3RoKCRwcmVmaXgpIC0gMSk7ICMgc3RyaXAgdHJhaWxpbmcgLworICAgICAg ICBteSAkc29ydEtleSA9IGxjICRwcmVmaXg7CisgICAgICAgICRzb3J0S2V5ID0gInRvcCBsZXZl bCIgdW5sZXNzIGxlbmd0aCAkc29ydEtleTsKKworICAgICAgICBpZiAoJHByZWZpeERpciBlcSAi dG9wIGxldmVsIikgeworICAgICAgICAgICAgJHNvcnRLZXkgPSAiIjsKKyAgICAgICAgfSBlbHNp ZiAoJHByZWZpeERpciBlcSAiVG9vbHMiKSB7CisgICAgICAgICAgICAkc29ydEtleSA9ICItLCBq dXN0IGFmdGVyIHRvcCBsZXZlbCI7CisgICAgICAgIH0gZWxzaWYgKCRwcmVmaXhEaXIgZXEgIldl YkJyb3dzZXIiKSB7CisgICAgICAgICAgICAkc29ydEtleSA9IGxjICJXZWJLaXQsIFdlYkJyb3dz ZXIgYWZ0ZXIiOworICAgICAgICB9IGVsc2lmICgkcHJlZml4RGlyIGVxICJTb3VyY2UvV2ViQ29y ZSIpIHsKKyAgICAgICAgICAgICRzb3J0S2V5ID0gbGMgIldlYkZvdW5kYXRpb24sIFdlYkNvcmUg YWZ0ZXIiOworICAgICAgICB9IGVsc2lmICgkcHJlZml4RGlyIGVxICJMYXlvdXRUZXN0cyIpIHsK KyAgICAgICAgICAgICRzb3J0S2V5ID0gbGMgIn4sIExheW91dFRlc3RzIGxhc3QiOworICAgICAg ICB9CisKKyAgICAgICAgJHByZWZpeGVzU29ydHskc29ydEtleX0gPSAkcHJlZml4OworICAgIH0K KyAgICBmb3JlYWNoIG15ICRwcmVmaXhTb3J0IChzb3J0IGtleXMgJXByZWZpeGVzU29ydCkgewor ICAgICAgICBwdXNoIEBwcmVmaXhlcywgJHByZWZpeGVzU29ydHskcHJlZml4U29ydH07CisgICAg fQorICAgIHJldHVybiAoXCVmaWxlc19pbl9jaGFuZ2VfbG9nLCBcQHByZWZpeGVzKTsKK30KKwog c3ViIGdldF9mdW5jdGlvbl9saW5lX3JhbmdlcygkJCkKIHsKICAgICBteSAoJGZpbGVfaGFuZGxl LCAkZmlsZV9uYW1lKSA9IEBfOwo= 118688 2011-12-10 03:09:32 -0800 2011-12-10 22:32:20 -0800 rebased patch for commit bug-74175-20111210200930.patch text/plain 6406 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNTE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2MyMjViM2NkYWQ3ZDQ4ZDlhMDJlYTQ3NmU4N2YxNWQ0 MWZhZGNkYS4uMjc0MDllZGFhNzY2ZDFiOWYyZGMxNDg2OWNmYmFhOGRjZjlmZDRlOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDExLTEyLTA5ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbUmVmYWN0b3JpbmddIEluIHByZXBhcmUtQ2hhbmdlTG9nLCBtb3ZlIHRvcC1sZXZl bCBjb2RlIHRvIGZpbmQgQ2hhbmdlTG9ncyBpbnRvIGEgbWV0aG9kCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDE3NQorCisgICAgICAgIFJldmlld2Vk IGJ5IFJ5b3N1a2UgTml3YS4KKworICAgICAgICBUaGUgb2JqZWN0aXZlIGlzIHRvIG1ha2UgcHJl cGFyZS1DaGFuZ2VMb2cgYSBsb2FkYWJsZSBQZXJsIG1vZHVsZSBmb3IgdW5pdCB0ZXN0aW5nLgor ICAgICAgICBUaGlzIHJlcXVpcmVzIHRvIHJlbW92ZSB0b3AtbGV2ZWwgY29kZS4gVGhpcyBwYXRj aCBpcyBvbmUgb2YgdGhlIGluY3JlbWVudGFsIHJlZmFjdG9yaW5ncworICAgICAgICBmb3IgdGhh dC4KKworICAgICAgICAqIFNjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2c6IE1vdmVkIHRvcC1sZXZl bCBjb2RlIHRvIGZpbmQgQ2hhbmdlTG9ncyBpbnRvIGZpbmRDaGFuZ2VMb2dzKCkuCisgICAgICAg IChmaW5kQ2hhbmdlTG9ncyk6CisKIDIwMTEtMTItMDkgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgY2hyb21pdW0gd2luIGJ1aWxkOiByZXZlcnQgYnVpbGRf d2Via2l0X2V4ZXNfZnJvbV93ZWJraXRfZ3lwIGNoYW5nZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy9wcmVwYXJlLUNoYW5nZUxvZyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cK aW5kZXggYWRlZDZjMDE2MTQxNmY3MjZhZjY3NzhiMDcxMjlmOWNkODU2NTY1YS4uY2U0ZTMwZmFj OTU2YzhmZDQ0MDE5MDZiNWE3NDc5NTRiYWRiNzQ1MyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy9wcmVwYXJlLUNoYW5nZUxvZworKysgYi9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9n CkBAIC02OCw2ICs2OCw3IEBAIHN1YiBjaGFuZ2VMb2dEYXRlKCQpOwogc3ViIGNoYW5nZUxvZ0Vt YWlsQWRkcmVzc0Zyb21BcmdzKCQpOwogc3ViIGNoYW5nZUxvZ05hbWVGcm9tQXJncygkKTsKIHN1 YiBmZXRjaEJ1Z0Rlc2NyaXB0aW9uRnJvbVVSTCgkKTsKK3N1YiBmaW5kQ2hhbmdlTG9ncyhcJSk7 CiBzdWIgZmlyc3REaXJlY3RvcnlPckN3ZCgpOwogc3ViIGRpZmZGcm9tVG9TdHJpbmcoKTsKIHN1 YiBkaWZmQ29tbWFuZChAKTsKQEAgLTIwMiw1NyArMjAzLDExIEBAIGlmICgkYnVnTnVtYmVyICYm ICEkYnVnRGVzY3JpcHRpb24pIHsKICAgICAkYnVnRGVzY3JpcHRpb24gPSBmZXRjaEJ1Z0Rlc2Ny aXB0aW9uRnJvbVVSTCgkYnVnVVJMKTsKIH0KIAotIyBGaW5kIHRoZSBjaGFuZ2UgbG9ncy4KLW15 ICVoYXNfbG9nOwotbXkgJWZpbGVzOwotZm9yZWFjaCBteSAkZmlsZSAoc29ydCBrZXlzICVmdW5j dGlvbl9saXN0cykgewotICAgIG15ICRwcmVmaXggPSAkZmlsZTsKLSAgICBteSAkaGFzX2xvZyA9 IDA7Ci0gICAgd2hpbGUgKCRwcmVmaXgpIHsKLSAgICAgICAgJHByZWZpeCA9fiBzLS9bXi9dKy8/ JC0vLSBvciAkcHJlZml4ID0gIiI7Ci0gICAgICAgICRoYXNfbG9nID0gJGhhc19sb2d7JHByZWZp eH07Ci0gICAgICAgIGlmICghZGVmaW5lZCAkaGFzX2xvZykgewotICAgICAgICAgICAgJGhhc19s b2cgPSAtZiAiJHtwcmVmaXh9Q2hhbmdlTG9nIjsKLSAgICAgICAgICAgICRoYXNfbG9neyRwcmVm aXh9ID0gJGhhc19sb2c7Ci0gICAgICAgIH0KLSAgICAgICAgbGFzdCBpZiAkaGFzX2xvZzsKLSAg ICB9Ci0gICAgaWYgKCEkaGFzX2xvZykgewotICAgICAgICBwcmludCBTVERFUlIgIk5vIENoYW5n ZUxvZyBmb3VuZCBmb3IgJGZpbGUuXG4iOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIHB1c2ggQHsk ZmlsZXN7JHByZWZpeH19LCAkZmlsZTsKLSAgICB9Ci19Ci0KLSMgQnVpbGQgdGhlIGxpc3Qgb2Yg Q2hhbmdlTG9nIHByZWZpeGVzIGluIHRoZSBjb3JyZWN0IHByb2plY3Qgb3JkZXIKLW15IEBwcmVm aXhlczsKLW15ICVwcmVmaXhlc1NvcnQ7Ci1mb3JlYWNoIG15ICRwcmVmaXggKGtleXMgJWZpbGVz KSB7Ci0gICAgbXkgJHByZWZpeERpciA9IHN1YnN0cigkcHJlZml4LCAwLCBsZW5ndGgoJHByZWZp eCkgLSAxKTsgIyBzdHJpcCB0cmFpbGluZyAvCi0gICAgbXkgJHNvcnRLZXkgPSBsYyAkcHJlZml4 OwotICAgICRzb3J0S2V5ID0gInRvcCBsZXZlbCIgdW5sZXNzIGxlbmd0aCAkc29ydEtleTsKLQot ICAgIGlmICgkcHJlZml4RGlyIGVxICJ0b3AgbGV2ZWwiKSB7Ci0gICAgICAgICRzb3J0S2V5ID0g IiI7Ci0gICAgfSBlbHNpZiAoJHByZWZpeERpciBlcSAiVG9vbHMiKSB7Ci0gICAgICAgICRzb3J0 S2V5ID0gIi0sIGp1c3QgYWZ0ZXIgdG9wIGxldmVsIjsKLSAgICB9IGVsc2lmICgkcHJlZml4RGly IGVxICJXZWJCcm93c2VyIikgewotICAgICAgICAkc29ydEtleSA9IGxjICJXZWJLaXQsIFdlYkJy b3dzZXIgYWZ0ZXIiOwotICAgIH0gZWxzaWYgKCRwcmVmaXhEaXIgZXEgIlNvdXJjZS9XZWJDb3Jl IikgewotICAgICAgICAkc29ydEtleSA9IGxjICJXZWJGb3VuZGF0aW9uLCBXZWJDb3JlIGFmdGVy IjsKLSAgICB9IGVsc2lmICgkcHJlZml4RGlyIGVxICJMYXlvdXRUZXN0cyIpIHsKLSAgICAgICAg JHNvcnRLZXkgPSBsYyAifiwgTGF5b3V0VGVzdHMgbGFzdCI7Ci0gICAgfQotCi0gICAgJHByZWZp eGVzU29ydHskc29ydEtleX0gPSAkcHJlZml4OwotfQotZm9yZWFjaCBteSAkcHJlZml4U29ydCAo c29ydCBrZXlzICVwcmVmaXhlc1NvcnQpIHsKLSAgICBwdXNoIEBwcmVmaXhlcywgJHByZWZpeGVz U29ydHskcHJlZml4U29ydH07Ci19CitteSAoJGZpbGVzX2luX2NoYW5nZV9sb2csICRwcmVmaXhl cykgPSBmaW5kQ2hhbmdlTG9ncyglZnVuY3Rpb25fbGlzdHMpOwogCiAjIEdldCB0aGUgbGF0ZXN0 IENoYW5nZUxvZyBmaWxlcyBmcm9tIHN2bi4KIG15IEBsb2dzID0gKCk7Ci1mb3JlYWNoIG15ICRw cmVmaXggKEBwcmVmaXhlcykgeworZm9yZWFjaCBteSAkcHJlZml4IChAJHByZWZpeGVzKSB7CiAg ICAgcHVzaCBAbG9ncywgRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkcHJlZml4IHx8ICIuIiwgIkNoYW5n ZUxvZyIpOwogfQogCkBAIC0yNzgsNyArMjMzLDcgQEAgaWYgKEBsb2dzICYmICR1cGRhdGVDaGFu Z2VMb2dzICYmICRpc1NWTikgewogfQogCiAjIEdlbmVyYXRlIG5ldyBDaGFuZ2VMb2cgZW50cmll cyBhbmQgKG9wdGlvbmFsbHkpIHdyaXRlIG91dCBuZXcgQ2hhbmdlTG9nIGZpbGVzLgotZm9yZWFj aCBteSAkcHJlZml4IChAcHJlZml4ZXMpIHsKK2ZvcmVhY2ggbXkgJHByZWZpeCAoQCRwcmVmaXhl cykgewogICAgIG15ICRlbmRsID0gIlxuIjsKICAgICBteSBAb2xkX2NoYW5nZV9sb2c7CiAKQEAg LTI5OCw3ICsyNTMsNyBAQCBmb3JlYWNoIG15ICRwcmVmaXggKEBwcmVmaXhlcykgewogICAgICAg ICBvcGVuIENIQU5HRV9MT0csICI+ICR7Y2hhbmdlTG9nUGF0aH0iIG9yIGRpZSAiQ291bGQgbm90 IHdyaXRlICR7Y2hhbmdlTG9nUGF0aH1cbi4iOwogICAgIH0gZWxzZSB7CiAgICAgICAgIG9wZW4g Q0hBTkdFX0xPRywgIj4tIiBvciBkaWUgIkNvdWxkIG5vdCB3cml0ZSB0byBTVERPVVRcbi4iOwot ICAgICAgICBwcmludCBzdWJzdHIoJHByZWZpeCwgMCwgbGVuZ3RoKCRwcmVmaXgpIC0gMSkgLiAi OlxuXG4iIHVubGVzcyAoc2NhbGFyIEBwcmVmaXhlcykgPT0gMTsKKyAgICAgICAgcHJpbnQgc3Vi c3RyKCRwcmVmaXgsIDAsIGxlbmd0aCgkcHJlZml4KSAtIDEpIC4gIjpcblxuIiB1bmxlc3MgKHNj YWxhciBAJHByZWZpeGVzKSA9PSAxOwogICAgIH0KIAogICAgIHByaW50IENIQU5HRV9MT0cgbm9y bWFsaXplTGluZUVuZGluZ3MoIiRkYXRlICAkbmFtZSAgPCRlbWFpbEFkZHJlc3M+XG5cbiIsICRl bmRsKTsKQEAgLTMyMyw3ICsyNzgsNyBAQCBmb3JlYWNoIG15ICRwcmVmaXggKEBwcmVmaXhlcykg ewogICAgICAgICB9CiAgICAgfQogCi0gICAgZm9yZWFjaCBteSAkZmlsZSAoc29ydCBAeyRmaWxl c3skcHJlZml4fX0pIHsKKyAgICBmb3JlYWNoIG15ICRmaWxlIChzb3J0IEB7JGZpbGVzX2luX2No YW5nZV9sb2ctPnskcHJlZml4fX0pIHsKICAgICAgICAgbXkgJGZpbGVfc3RlbSA9IHN1YnN0ciAk ZmlsZSwgbGVuZ3RoICRwcmVmaXg7CiAgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXpl TGluZUVuZGluZ3MoIiAgICAgICAgKiAkZmlsZV9zdGVtOiRmdW5jdGlvbl9saXN0c3skZmlsZX1c biIsICRlbmRsKTsKICAgICB9CkBAIC01MDAsNiArNDU1LDU4IEBAIHN1YiBmZXRjaEJ1Z0Rlc2Ny aXB0aW9uRnJvbVVSTCgkKQogICAgIHJldHVybiAkYnVnRGVzY3JpcHRpb247CiB9CiAKK3N1YiBm aW5kQ2hhbmdlTG9ncyhcJSkKK3sKKyAgICAjIEZpbmQgdGhlIGNoYW5nZSBsb2dzLgorICAgIG15 ICVoYXNfbG9nOworICAgIG15ICVmaWxlc19pbl9jaGFuZ2VfbG9nOworICAgIGZvcmVhY2ggbXkg JGZpbGUgKHNvcnQga2V5cyAlZnVuY3Rpb25fbGlzdHMpIHsKKyAgICAgICAgbXkgJHByZWZpeCA9 ICRmaWxlOworICAgICAgICBteSAkaGFzX2xvZyA9IDA7CisgICAgICAgIHdoaWxlICgkcHJlZml4 KSB7CisgICAgICAgICAgICAkcHJlZml4ID1+IHMtL1teL10rLz8kLS8tIG9yICRwcmVmaXggPSAi IjsKKyAgICAgICAgICAgICRoYXNfbG9nID0gJGhhc19sb2d7JHByZWZpeH07CisgICAgICAgICAg ICBpZiAoIWRlZmluZWQgJGhhc19sb2cpIHsKKyAgICAgICAgICAgICAgICAkaGFzX2xvZyA9IC1m ICIke3ByZWZpeH1DaGFuZ2VMb2ciOworICAgICAgICAgICAgICAgICRoYXNfbG9neyRwcmVmaXh9 ID0gJGhhc19sb2c7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBsYXN0IGlmICRoYXNfbG9n OworICAgICAgICB9CisgICAgICAgIGlmICghJGhhc19sb2cpIHsKKyAgICAgICAgICAgIHByaW50 IFNUREVSUiAiTm8gQ2hhbmdlTG9nIGZvdW5kIGZvciAkZmlsZS5cbiI7CisgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICBwdXNoIEB7JGZpbGVzX2luX2NoYW5nZV9sb2d7JHByZWZpeH19LCAk ZmlsZTsKKyAgICAgICAgfQorICAgIH0KKworICAgICMgQnVpbGQgdGhlIGxpc3Qgb2YgQ2hhbmdl TG9nIHByZWZpeGVzIGluIHRoZSBjb3JyZWN0IHByb2plY3Qgb3JkZXIKKyAgICBteSBAcHJlZml4 ZXM7CisgICAgbXkgJXByZWZpeGVzU29ydDsKKyAgICBmb3JlYWNoIG15ICRwcmVmaXggKGtleXMg JWZpbGVzX2luX2NoYW5nZV9sb2cpIHsKKyAgICAgICAgbXkgJHByZWZpeERpciA9IHN1YnN0cigk cHJlZml4LCAwLCBsZW5ndGgoJHByZWZpeCkgLSAxKTsgIyBzdHJpcCB0cmFpbGluZyAvCisgICAg ICAgIG15ICRzb3J0S2V5ID0gbGMgJHByZWZpeDsKKyAgICAgICAgJHNvcnRLZXkgPSAidG9wIGxl dmVsIiB1bmxlc3MgbGVuZ3RoICRzb3J0S2V5OworCisgICAgICAgIGlmICgkcHJlZml4RGlyIGVx ICJ0b3AgbGV2ZWwiKSB7CisgICAgICAgICAgICAkc29ydEtleSA9ICIiOworICAgICAgICB9IGVs c2lmICgkcHJlZml4RGlyIGVxICJUb29scyIpIHsKKyAgICAgICAgICAgICRzb3J0S2V5ID0gIi0s IGp1c3QgYWZ0ZXIgdG9wIGxldmVsIjsKKyAgICAgICAgfSBlbHNpZiAoJHByZWZpeERpciBlcSAi V2ViQnJvd3NlciIpIHsKKyAgICAgICAgICAgICRzb3J0S2V5ID0gbGMgIldlYktpdCwgV2ViQnJv d3NlciBhZnRlciI7CisgICAgICAgIH0gZWxzaWYgKCRwcmVmaXhEaXIgZXEgIlNvdXJjZS9XZWJD b3JlIikgeworICAgICAgICAgICAgJHNvcnRLZXkgPSBsYyAiV2ViRm91bmRhdGlvbiwgV2ViQ29y ZSBhZnRlciI7CisgICAgICAgIH0gZWxzaWYgKCRwcmVmaXhEaXIgZXEgIkxheW91dFRlc3RzIikg eworICAgICAgICAgICAgJHNvcnRLZXkgPSBsYyAifiwgTGF5b3V0VGVzdHMgbGFzdCI7CisgICAg ICAgIH0KKworICAgICAgICAkcHJlZml4ZXNTb3J0eyRzb3J0S2V5fSA9ICRwcmVmaXg7CisgICAg fQorICAgIGZvcmVhY2ggbXkgJHByZWZpeFNvcnQgKHNvcnQga2V5cyAlcHJlZml4ZXNTb3J0KSB7 CisgICAgICAgIHB1c2ggQHByZWZpeGVzLCAkcHJlZml4ZXNTb3J0eyRwcmVmaXhTb3J0fTsKKyAg ICB9CisgICAgcmV0dXJuIChcJWZpbGVzX2luX2NoYW5nZV9sb2csIFxAcHJlZml4ZXMpOworfQor CiBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzKCQkKQogewogICAgIG15ICgkZmlsZV9oYW5k bGUsICRmaWxlX25hbWUpID0gQF87Cg==