220822 2021-01-21 13:30:25 -0800 The generated commit message have a directory label at the first line rather than the bug's title if ChangeLogs have different bug titles 2022-05-22 13:48:23 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED WONTFIX https://bugs.webkit.org/show_bug.cgi?id=220950 InRadar P2 Normal --- 1 fujii fujii ap darin ddkilzer ews-watchlist glenn jbedard mcatanzaro simon.fraser webkit-bug-importer oldest_to_newest 1721311 0 fujii 2021-01-21 13:30:25 -0800 If ChangeLogs have different bug titles, the generated commit message have a directory label at the first line rather than the bug's title. This is not Git friendly. For example, r271701, r271695 and r271690. Tools/Scripts/webkitpy/common/checkout/checkout.py spawns 'commit-log-editor' Perl script to generate a commit message. https://github.com/WebKit/WebKit/blob/37b6acb392110b1f3e9db830d4207dadef64dbe0/Tools/Scripts/webkitpy/common/checkout/checkout.py#L140 removeLongestCommonPrefixEndingInNewline detects the longest common header lines of all ChangeLogs and remove the common part from them and return the prefix and modified ChangeLogs. https://github.com/WebKit/WebKit/blob/37b6acb392110b1f3e9db830d4207dadef64dbe0/Tools/Scripts/commit-log-editor#L384 Bug 29190 – commit-log-editor should move common prefixes to the top of the commit log 1721437 1 ap 2021-01-21 17:44:38 -0800 This is not Subversion friendly either. This has to be a regression I presume? 1721936 2 418245 fujii 2021-01-24 16:57:06 -0800 Created attachment 418245 Patch 1721937 3 darin 2021-01-24 16:58:59 -0800 (In reply to Alexey Proskuryakov from comment #1) > This has to be a regression I presume? I think not. Rather, a case we did not optimize for. 1721944 4 418248 fujii 2021-01-24 17:53:18 -0800 Created attachment 418248 Patch 1722107 5 418248 darin 2021-01-25 09:52:25 -0800 Comment on attachment 418248 Patch Really need regression tests for this script. review+ on "faith" since I didn’t really study it carefully enough to spot mistakes. 1722181 6 418248 fujii 2021-01-25 11:59:17 -0800 Comment on attachment 418248 Patch Clearing flags on attachment: 418248 Committed r271805: <https://trac.webkit.org/changeset/271805> 1722182 7 fujii 2021-01-25 11:59:21 -0800 All reviewed patches have been landed. Closing bug. 1722183 8 webkit-bug-importer 2021-01-25 12:01:32 -0800 <rdar://problem/73581935> 1722191 9 fujii 2021-01-25 12:19:19 -0800 A Git pull request has a commit message. I hope WebKit will deprecate ChangeLog after the Git migration. 1722236 10 darin 2021-01-25 13:30:06 -0800 (In reply to Fujii Hironori from comment #9) > A Git pull request has a commit message. > I hope WebKit will deprecate ChangeLog after the Git migration. The social contract that goes with our decision of including change logs vs. relying only on commit messages (and note that Subversion has commit messages just like Git does and always has, as did CVS before it) goes far beyond the considerations in making this script work well. 1722302 11 ryanhaddad 2021-01-25 15:14:17 -0800 Reverted r271805 for reason: Appears to have broken generation of changed files/functions in commit logs Committed r271865: <https://trac.webkit.org/changeset/271865> 1722303 12 ryanhaddad 2021-01-25 15:15:17 -0800 (In reply to Ryan Haddad from comment #11) > Reverted r271805 for reason: > > Appears to have broken generation of changed files/functions in commit logs It also caused some webkitpy test failures, documented in https://bugs.webkit.org/show_bug.cgi?id=220950 1722335 13 darin 2021-01-25 15:39:48 -0800 Besides the test failures, this caused problems for some programmers at Apple who found the script wasn’t including files at all any more in their configuration. There’s a chance that’s specific to Apple’s internal configuration. 1722373 14 418363 fujii 2021-01-25 18:49:30 -0800 Created attachment 418363 Patch 1722375 15 fujii 2021-01-25 18:57:57 -0800 (In reply to Darin Adler from comment #13) > Besides the test failures, this caused problems for some programmers at > Apple who found the script wasn’t including files at all any more in their > configuration. There’s a chance that’s specific to Apple’s internal > configuration. I fixed the test failure. And webkitpy EWS passed. However, I don't know about the Apple internal issue. It seems that I should give up. I hope someone in Apple would take over this task. 1722527 16 jbedard 2021-01-26 08:50:09 -0800 (In reply to Fujii Hironori from comment #15) > (In reply to Darin Adler from comment #13) > > Besides the test failures, this caused problems for some programmers at > > Apple who found the script wasn’t including files at all any more in their > > configuration. There’s a chance that’s specific to Apple’s internal > > configuration. > > I fixed the test failure. And webkitpy EWS passed. > However, I don't know about the Apple internal issue. It seems that I should > give up. I hope someone in Apple would take over this task. It seems unlikely that the Apple Internal issue is actually special, I suspect that the webkitpy test failure caught the mistake, we just didn't have EWS configured properly to catch it (Aakash Jain fixed that yesterday). Will double-check today what the specifics of the Apple Internal issue was. 1871029 17 fujii 2022-05-22 13:48:23 -0700 ChangeLog has been deprecated. Closed as WONTFIX. 418245 2021-01-24 16:57:06 -0800 2021-01-24 17:53:15 -0800 Patch bug-220822-20210125095705.patch text/plain 5966 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzg1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTQyZGE5MmU3Yzg3YWMwMjA0MTA0MWI5YzkyODBjODA1 NzZhNTc2OC4uYjdmYTRlNWNhZmZkYzIzOGYyZDBiOWU0OGVkYjU0YTg2ZjY5OGE3NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDIxLTAxLTI0ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFRoZSBnZW5lcmF0ZWQgY29tbWl0IG1lc3NhZ2UgaGF2ZSBhIGRpcmVjdG9y eSBsYWJlbCBhdCB0aGUgZmlyc3QgbGluZSByYXRoZXIgdGhhbiB0aGUgYnVnJ3MgdGl0bGUgaWYg Q2hhbmdlTG9ncyBoYXZlIGRpZmZlcmVudCBidWcgdGl0bGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA4MjIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBjb21taXQtbG9nLWVkaXRvciBnZW5lcmF0ZXMg YSBkZWZhdWx0IGNvbW1pdCBtZXNzYWdlIGJ5IGNvbGxlY3RpbmcKKyAgICAgICAgYWxsIENoYW5n ZUxvZyBlbnRyaWVzIGFuZCBtZXJnaW5nIHRoZW0gd2l0aCBwcmVwZW5kaW5nIGRpcmVjdG9yeQor ICAgICAgICBsYWJsZXMuIElmIGl0IGZpbmQgb3V0IGEgY29tbW9uIHByZWZpeCBmb3IgYWxsIGVu dHJpZXMsIGl0IHJlbW92ZXMKKyAgICAgICAgdGhlIHByZWZpeCBmcm9tIGVudHJpZXMgYW5kIGhv aXN0cyB0aGUgcHJlZml4IGFzIHRoZSBiZWdpbm5pbmcgb2YKKyAgICAgICAgdGhlIGNvbW1pdCBt ZXNzYWdlLiBUaGlzIHN0ZXBzIHJlbW92ZSB0aGUgZHVwbGljYXRlZCBidWcgdGl0bGUsCisgICAg ICAgIHRoZSBidWcgVVJMLCB0aGUgcmV2aWV3ZWQtYnkgbGluZSwgYW5kIHRoZSBkZXNjcmlwdGlv bnMuCisKKyAgICAgICAgSWYgc3VjaCBwcmVmaXggaXMgbm90IGZvdW5kLCBpLmUuIENoYW5nZUxv ZyBlbnRyaWVzIGhhcyBkaWZmZXJlbnQKKyAgICAgICAgYnVnIHRpdGxlcywgaXQgc2ltcGx5IG1l cmdlcyBhbGwgZW50cmllcyB3aXRoIGRpcmVjdG9yeSBsYWJlbHMuIEFzCisgICAgICAgIHRoZSBy ZXN1bHQsIHRoZSBnZW5lcmF0ZWQgY29tbWl0IG1lc3NhZ2UgaGFzIHRoZSBkaXJlY3RvcnkgbGFi ZWwKKyAgICAgICAgYXQgdGhlIGZpcnN0IGxpbmUuIFRoaXMgaXMgbm90IGRlc2lyYWJsZS4gVGhl IGZpcnN0IGxpbmUgb2YgdGhlCisgICAgICAgIGNvbW1pdCBtZXNzYWdlIHNob3VsZCBiZSB0aGUg YnVnIHRpdGxlLgorCisgICAgICAgIFRoaXMgcGF0Y2ggeWFua3MgdGhlIGZpcnN0IGxpbmUgb2Yg dGhlIGZpcnN0IGVudHJ5IGFzIHRoZSBjb21tb24KKyAgICAgICAgcHJlZml4IGluIHRoZSBjYXNl LgorCisgICAgICAgICogU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcjoKKyAgICAgICAgKGNyZWF0 ZUNvbW1pdE1lc3NhZ2UpOgorICAgICAgICAocmVtb3ZlTG9uZ2VzdENvbW1vblByZWZpeEVuZGlu Z0luTmV3bGluZSk6CisKIDIwMjEtMDEtMjMgIFhhbiBMb3BleiAgPHhhbkBpZ2FsaWEuY29tPgog CiAgICAgICAgIFtKU0NdIEFsbG93IHRvIGJ1aWxkIFdlYkFzc2VtYmx5IHdpdGhvdXQgQjMKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IgYi9Ub29scy9TY3JpcHRz L2NvbW1pdC1sb2ctZWRpdG9yCmluZGV4IDgyM2FkZGUwNTE4MDc3NDdmNTg0ZWI5NmI0Njg5NzJi YjhlOTY3NjQuLjIzNmY1NTY3MzRkNWNjYmUzMTNmMTA4MGNhOGQ1MDExY2Q3MTNiZWUgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKKysrIGIvVG9vbHMvU2NyaXB0 cy9jb21taXQtbG9nLWVkaXRvcgpAQCAtMTk0LDcgKzE5NCw3IEBAIGlmIChpc0dpdCgpICYmIEBj aGFuZ2VMb2dzID09IDApIHsKICAgICAgICAgICAgIG15ICRsYWJlbCA9IDwkY2hhbmdlTG9nRW50 cmllcz47CiAgICAgICAgICAgICBjaG9tcCAkbGFiZWw7CiAgICAgICAgICAgICAkbGFiZWwgPX4g cy86JC8vOwotICAgICAgICAgICAgKCRjaGFuZ2VMb2dDb250ZW50c3skbGFiZWx9KSA9IGNvbW1p dE1lc3NhZ2VGcm9tQ2hhbmdlTG9nRW50cnkoJGNoYW5nZUxvZ0VudHJpZXMpOworICAgICAgICAg ICAgJGNoYW5nZUxvZ0NvbnRlbnRze3NvcnRLZXkoJGxhYmVsKX0gPSBjb21taXRNZXNzYWdlRnJv bUNoYW5nZUxvZ0VudHJ5KCRjaGFuZ2VMb2dFbnRyaWVzKTsKICAgICAgICAgICAgICRjaGFuZ2VM b2dTb3J0e3NvcnRLZXkoJGxhYmVsKX0gPSAkbGFiZWw7CiAgICAgICAgIH0KICAgICAgICAgY2xv c2UgJGNoYW5nZUxvZ0VudHJpZXM7CkBAIC0yMDUsMTIgKzIwNSwxMiBAQCBpZiAoaXNHaXQoKSAm JiBAY2hhbmdlTG9ncyA9PSAwKSB7CiAgICAgICAgIHB1c2ggQHJlc3VsdCwgbm9ybWFsaXplTGlu ZUVuZGluZ3MoJGNvbW1vblByZWZpeCwgJGVuZGwpOwogICAgICAgICBmb3IgbXkgJHNvcnRLZXkg KHNvcnQga2V5cyAlY2hhbmdlTG9nU29ydCkgewogICAgICAgICAgICAgbXkgJGxhYmVsID0gJGNo YW5nZUxvZ1NvcnR7JHNvcnRLZXl9OwotICAgICAgICAgICAgbmV4dCBpZiAoJGNoYW5nZUxvZ0Nv bnRlbnRzeyRsYWJlbH0gZXEgIlxuIik7CisgICAgICAgICAgICBuZXh0IHVubGVzcyAkY2hhbmdl TG9nQ29udGVudHN7JHNvcnRLZXl9OwogICAgICAgICAgICAgaWYgKGtleXMgJWNoYW5nZUxvZ1Nv cnQgPiAxKSB7CiAgICAgICAgICAgICAgICAgcHVzaCBAcmVzdWx0LCBub3JtYWxpemVMaW5lRW5k aW5ncygiXG4iLCAkZW5kbCk7CiAgICAgICAgICAgICAgICAgcHVzaCBAcmVzdWx0LCBub3JtYWxp emVMaW5lRW5kaW5ncygiJGxhYmVsOiAiLCAkZW5kbCk7CiAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICBwdXNoIEByZXN1bHQsIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCRjaGFuZ2VMb2dDb250ZW50 c3skbGFiZWx9LCAkZW5kbCk7CisgICAgICAgICAgICBwdXNoIEByZXN1bHQsIG5vcm1hbGl6ZUxp bmVFbmRpbmdzKCRjaGFuZ2VMb2dDb250ZW50c3skc29ydEtleX0sICRlbmRsKTsKICAgICAgICAg fQogCiAgICAgICAgIHByaW50IE5FV0xPRyBqb2luICcnLCBAcmVzdWx0OwpAQCAtMzQwLDcgKzM0 MCw3IEBAIHN1YiBjcmVhdGVDb21taXRNZXNzYWdlKEApCiAgICAgICAgICRsYWJlbCA9ICJ0b3Ag bGV2ZWwiIHVubGVzcyBsZW5ndGggJGxhYmVsOwogCiAgICAgICAgICRjaGFuZ2VMb2dTb3J0e3Nv cnRLZXkoJGxhYmVsKX0gPSAkbGFiZWw7Ci0gICAgICAgICRjaGFuZ2VMb2dDb250ZW50c3skbGFi ZWx9ID0gJGNvbnRlbnRzOworICAgICAgICAkY2hhbmdlTG9nQ29udGVudHN7c29ydEtleSgkbGFi ZWwpfSA9ICRjb250ZW50czsKICAgICB9CiAKICAgICBteSAkY29tbW9uUHJlZml4ID0gcmVtb3Zl TG9uZ2VzdENvbW1vblByZWZpeEVuZGluZ0luTmV3bGluZSglY2hhbmdlTG9nQ29udGVudHMpOwpA QCAtMzQ5LDEyICszNDksMTIgQEAgc3ViIGNyZWF0ZUNvbW1pdE1lc3NhZ2UoQCkKICAgICBwdXNo IEByZXN1bHQsIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCRjb21tb25QcmVmaXgsICRlbmRsKTsKICAg ICBmb3IgbXkgJHNvcnRLZXkgKHNvcnQga2V5cyAlY2hhbmdlTG9nU29ydCkgewogICAgICAgICBt eSAkbGFiZWwgPSAkY2hhbmdlTG9nU29ydHskc29ydEtleX07Ci0gICAgICAgIG5leHQgaWYgKCRj aGFuZ2VMb2dDb250ZW50c3skbGFiZWx9IGVxICJcbiIpOworICAgICAgICBuZXh0IHVubGVzcyAk Y2hhbmdlTG9nQ29udGVudHN7JHNvcnRLZXl9OwogICAgICAgICBpZiAoa2V5cyAlY2hhbmdlTG9n U29ydCA+IDEpIHsKICAgICAgICAgICAgIHB1c2ggQHJlc3VsdCwgbm9ybWFsaXplTGluZUVuZGlu Z3MoIlxuIiwgJGVuZGwpOwogICAgICAgICAgICAgcHVzaCBAcmVzdWx0LCBub3JtYWxpemVMaW5l RW5kaW5ncygiJGxhYmVsOlxuIiwgJGVuZGwpOwogICAgICAgICB9Ci0gICAgICAgIHB1c2ggQHJl c3VsdCwgbm9ybWFsaXplTGluZUVuZGluZ3MoJGNoYW5nZUxvZ0NvbnRlbnRzeyRsYWJlbH0sICRl bmRsKTsKKyAgICAgICAgcHVzaCBAcmVzdWx0LCBub3JtYWxpemVMaW5lRW5kaW5ncygkY2hhbmdl TG9nQ29udGVudHN7JHNvcnRLZXl9LCAkZW5kbCk7CiAgICAgfQogCiAgICAgcmV0dXJuIGpvaW4g JycsIEByZXN1bHQ7CkBAIC0zODUsMjkgKzM4NSwzMSBAQCBzdWIgcmVtb3ZlTG9uZ2VzdENvbW1v blByZWZpeEVuZGluZ0luTmV3bGluZShcJSkKIHsKICAgICBteSAoJGhhc2hPZlN0cmluZ3MpID0g QF87CiAKLSAgICBteSBAc3RyaW5ncyA9IHZhbHVlcyAleyRoYXNoT2ZTdHJpbmdzfTsKLSAgICBy ZXR1cm4gIiIgdW5sZXNzIEBzdHJpbmdzID4gMTsKKyAgICByZXR1cm4gIiIgdW5sZXNzIGtleXMg JSRoYXNoT2ZTdHJpbmdzOwogCi0gICAgbXkgJHByZWZpeCA9IHNoaWZ0IEBzdHJpbmdzOwotICAg IG15ICRwcmVmaXhMZW5ndGggPSBsZW5ndGggJHByZWZpeDsKLSAgICBmb3JlYWNoIG15ICRzdHJp bmcgKEBzdHJpbmdzKSB7Ci0gICAgICAgIHdoaWxlICgkcHJlZml4TGVuZ3RoKSB7Ci0gICAgICAg ICAgICBsYXN0IGlmIHN1YnN0cigkc3RyaW5nLCAwLCAkcHJlZml4TGVuZ3RoKSBlcSAkcHJlZml4 OwotICAgICAgICAgICAgLS0kcHJlZml4TGVuZ3RoOwotICAgICAgICAgICAgJHByZWZpeCA9IHN1 YnN0cigkcHJlZml4LCAwLCAtMSk7Ci0gICAgICAgIH0KLSAgICAgICAgbGFzdCB1bmxlc3MgJHBy ZWZpeExlbmd0aDsKKyAgICBteSAlc3RyaW5nczsKKyAgICBmb3JlYWNoIG15ICRrZXkgKGtleXMg JSRoYXNoT2ZTdHJpbmdzKSB7CisgICAgICAgICRzdHJpbmdzeyRrZXl9ID0gWyBzcGxpdCgvXi8s ICRoYXNoT2ZTdHJpbmdzLT57JGtleX0pIF07CisgICAgfQorICAgIG15IEBwcmVmaXg7CisgICAg d2hpbGUgKDEpIHsKKyAgICAgICAgIyBDb2xsZWN0IHRoZSBmaXJzdCBsaW5lcyBvZiBhbGwgZW50 cmllcworICAgICAgICBteSBAaGVhZHMgPSBtYXAgeyBAJF8gPyAkXy0+WzBdIDogIiIgfSAodmFs dWVzICVzdHJpbmdzKTsKKyAgICAgICAgbXkgJWhhc2hfb2ZfaGVhZHMgPSBtYXAgeyRfLCAxfSBA aGVhZHM7CisgICAgICAgIGxhc3QgaWYgZXhpc3RzICRoYXNoX29mX2hlYWRzeyIifTsKKyAgICAg ICAgIyBDaGVjayB0aGUgYWxsIGZpcnN0IGxpbmVzIG1hdGNoCisgICAgICAgIGxhc3QgdW5sZXNz IGtleXMgJWhhc2hfb2ZfaGVhZHMgPT0gMTsKKyAgICAgICAgcHVzaCBAcHJlZml4LCAkaGVhZHNb MF07CisgICAgICAgICMgUmVtb3ZlIHRoZSBmaXJzdCBsaW5lcworICAgICAgICBtYXAgeyBzaGlm dChAeyRzdHJpbmdzeyRffX0pIH0ga2V5cyAlc3RyaW5nczsKICAgICB9CiAKLSAgICByZXR1cm4g IiIgdW5sZXNzICRwcmVmaXhMZW5ndGg7CisgICAgbWFwIHsgJGhhc2hPZlN0cmluZ3MtPnskX30g PSBqb2luICIiLCBAeyRzdHJpbmdzeyRffX0gfSBrZXlzICVzdHJpbmdzOwogCi0gICAgbXkgJGxh c3ROZXdsaW5lID0gcmluZGV4KCRwcmVmaXgsICJcbiIpOwotICAgIHJldHVybiAiIiB1bmxlc3Mg JGxhc3ROZXdsaW5lID4gMDsKKyAgICAjIFRoZSBmaXJzdCBsaW5lIHNob3VsZCBiZSB0aGUgYnVn IHRpdGxlLiBVc2UgdGhlIGZpcnN0IGxpbmUgb2YgdGhlIGZpcnN0IGVudHJ5IGlmIG5vIHByZWZp eCBmb3VuZC4KKyAgICBAcHJlZml4ID0gJHN0cmluZ3N7KHNvcnQga2V5cyAlc3RyaW5ncylbMF19 LT5bMF0gdW5sZXNzIEBwcmVmaXg7CiAKLSAgICBmb3JlYWNoIG15ICRrZXkgKGtleXMgJXskaGFz aE9mU3RyaW5nc30pIHsKLSAgICAgICAgJGhhc2hPZlN0cmluZ3MtPnska2V5fSA9IHN1YnN0cigk aGFzaE9mU3RyaW5ncy0+eyRrZXl9LCAkbGFzdE5ld2xpbmUpOwotICAgIH0KLSAgICByZXR1cm4g c3Vic3RyKCRwcmVmaXgsIDAsICRsYXN0TmV3bGluZSk7CisgICAgcmV0dXJuIGpvaW4gIiIsIEBw cmVmaXg7CiB9CiAKIHN1YiBpc0NvbW1pdExvZ0VkaXRvcigkKQo= 418248 2021-01-24 17:53:18 -0800 2021-01-25 18:49:26 -0800 Patch bug-220822-20210125105317.patch text/plain 6050 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzg2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWU0ODRiYWRhZWEzYTBjYzFhNjBlZGM5ZjNkMjYwNzQ5 NWNjYjgyZi4uMDkyMGVmNzE3OTVlMmNkYzAwOWI5NWM2ODE2NGIyNjcxNTAwYTQwYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDIxLTAxLTI0ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFRoZSBnZW5lcmF0ZWQgY29tbWl0IG1lc3NhZ2UgaGF2ZSBhIGRpcmVjdG9y eSBsYWJlbCBhdCB0aGUgZmlyc3QgbGluZSByYXRoZXIgdGhhbiB0aGUgYnVnJ3MgdGl0bGUgaWYg Q2hhbmdlTG9ncyBoYXZlIGRpZmZlcmVudCBidWcgdGl0bGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA4MjIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBjb21taXQtbG9nLWVkaXRvciBnZW5lcmF0ZXMg dGhlIGRlZmF1bHQgY29tbWl0IG1lc3NhZ2UgYnkKKyAgICAgICAgY29sbGVjdGluZyBhbGwgQ2hh bmdlTG9nIGVudHJpZXMgYW5kIG1lcmdpbmcgdGhlbSB3aXRoIHByZXBlbmRpbmcKKyAgICAgICAg ZGlyZWN0b3J5IGxhYmxlcy4gSWYgaXQgZmluZHMgb3V0IGEgY29tbW9uIHByZWZpeCBmb3IgYWxs IGVudHJpZXMsCisgICAgICAgIGl0IHJlbW92ZXMgdGhlIHByZWZpeCBmcm9tIGVudHJpZXMgYW5k IGhvaXN0cyB0aGUgcHJlZml4IGFzIHRoZQorICAgICAgICBiZWdpbm5pbmcgb2YgdGhlIGNvbW1p dCBtZXNzYWdlLiBUaGlzIHN0ZXAgcmVtb3ZlcyBkdXBsaWNhdGVkCisgICAgICAgIGxpbmVzIG9m IHRoZSBidWcgdGl0bGUsIHRoZSBidWcgVVJMLCB0aGUgcmV2aWV3ZWQtYnkgbGluZSwgYW5kIHRo ZQorICAgICAgICBkZXNjcmlwdGlvbnMuCisKKyAgICAgICAgSWYgc3VjaCBwcmVmaXggaXMgbm90 IGZvdW5kLCBpLmUuIENoYW5nZUxvZyBlbnRyaWVzIGhhcyBkaWZmZXJlbnQKKyAgICAgICAgYnVn IHRpdGxlcywgaXQgc2ltcGx5IG1lcmdlcyBhbGwgZW50cmllcyB3aXRoIGRpcmVjdG9yeSBsYWJl bHMuIEFzCisgICAgICAgIHRoZSByZXN1bHQsIHRoZSBnZW5lcmF0ZWQgY29tbWl0IG1lc3NhZ2Ug aGFzIHRoZSBkaXJlY3RvcnkgbGFiZWwKKyAgICAgICAgYXQgdGhlIGZpcnN0IGxpbmUuIFRoaXMg aXMgbm90IGRlc2lyYWJsZS4gVGhlIGZpcnN0IGxpbmUgb2YgdGhlCisgICAgICAgIGNvbW1pdCBt ZXNzYWdlIHNob3VsZCBiZSB0aGUgYnVnIHRpdGxlLgorCisgICAgICAgIFRoaXMgcGF0Y2ggeWFu a3MgdGhlIGZpcnN0IGxpbmUgb2YgdGhlIGZpcnN0IGVudHJ5IGFzIHRoZSBjb21tb24KKyAgICAg ICAgcHJlZml4IGluIHRoZSBjYXNlLgorCisgICAgICAgICogU2NyaXB0cy9jb21taXQtbG9nLWVk aXRvcjoKKyAgICAgICAgKGNyZWF0ZUNvbW1pdE1lc3NhZ2UpOgorICAgICAgICAocmVtb3ZlTG9u Z2VzdENvbW1vblByZWZpeEVuZGluZ0luTmV3bGluZSk6CisKIDIwMjEtMDEtMjQgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPUyBXSzJdIHRoZXZl cmdlLmNvbSAtIHJ1YmJlciBiYW5kIHNjcm9sbGluZyBhdCB0aGUgdG9wIG9mIHRoZSBwYWdlIGNh dXNlcyBhbiBhYnJ1cHQganVtcApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9jb21taXQtbG9n LWVkaXRvciBiL1Rvb2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKaW5kZXggODIzYWRkZTA1 MTgwNzc0N2Y1ODRlYjk2YjQ2ODk3MmJiOGU5Njc2NC4uMzcyMjk4OGZkMWM0ZDA5YjMzMzM3ZWRh NTg1ZTI2YTdhODg0NWIwZSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVk aXRvcgorKysgYi9Ub29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yCkBAIC0xOTQsNyArMTk0 LDcgQEAgaWYgKGlzR2l0KCkgJiYgQGNoYW5nZUxvZ3MgPT0gMCkgewogICAgICAgICAgICAgbXkg JGxhYmVsID0gPCRjaGFuZ2VMb2dFbnRyaWVzPjsKICAgICAgICAgICAgIGNob21wICRsYWJlbDsK ICAgICAgICAgICAgICRsYWJlbCA9fiBzLzokLy87Ci0gICAgICAgICAgICAoJGNoYW5nZUxvZ0Nv bnRlbnRzeyRsYWJlbH0pID0gY29tbWl0TWVzc2FnZUZyb21DaGFuZ2VMb2dFbnRyeSgkY2hhbmdl TG9nRW50cmllcyk7CisgICAgICAgICAgICAkY2hhbmdlTG9nQ29udGVudHN7c29ydEtleSgkbGFi ZWwpfSA9IGNvbW1pdE1lc3NhZ2VGcm9tQ2hhbmdlTG9nRW50cnkoJGNoYW5nZUxvZ0VudHJpZXMp OwogICAgICAgICAgICAgJGNoYW5nZUxvZ1NvcnR7c29ydEtleSgkbGFiZWwpfSA9ICRsYWJlbDsK ICAgICAgICAgfQogICAgICAgICBjbG9zZSAkY2hhbmdlTG9nRW50cmllczsKQEAgLTIwNSwxMiAr MjA1LDEyIEBAIGlmIChpc0dpdCgpICYmIEBjaGFuZ2VMb2dzID09IDApIHsKICAgICAgICAgcHVz aCBAcmVzdWx0LCBub3JtYWxpemVMaW5lRW5kaW5ncygkY29tbW9uUHJlZml4LCAkZW5kbCk7CiAg ICAgICAgIGZvciBteSAkc29ydEtleSAoc29ydCBrZXlzICVjaGFuZ2VMb2dTb3J0KSB7CiAgICAg ICAgICAgICBteSAkbGFiZWwgPSAkY2hhbmdlTG9nU29ydHskc29ydEtleX07Ci0gICAgICAgICAg ICBuZXh0IGlmICgkY2hhbmdlTG9nQ29udGVudHN7JGxhYmVsfSBlcSAiXG4iKTsKKyAgICAgICAg ICAgIG5leHQgdW5sZXNzICRjaGFuZ2VMb2dDb250ZW50c3skc29ydEtleX07CiAgICAgICAgICAg ICBpZiAoa2V5cyAlY2hhbmdlTG9nU29ydCA+IDEpIHsKICAgICAgICAgICAgICAgICBwdXNoIEBy ZXN1bHQsIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCJcbiIsICRlbmRsKTsKICAgICAgICAgICAgICAg ICBwdXNoIEByZXN1bHQsIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIkbGFiZWw6ICIsICRlbmRsKTsK ICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHB1c2ggQHJlc3VsdCwgbm9ybWFsaXplTGluZUVu ZGluZ3MoJGNoYW5nZUxvZ0NvbnRlbnRzeyRsYWJlbH0sICRlbmRsKTsKKyAgICAgICAgICAgIHB1 c2ggQHJlc3VsdCwgbm9ybWFsaXplTGluZUVuZGluZ3MoJGNoYW5nZUxvZ0NvbnRlbnRzeyRzb3J0 S2V5fSwgJGVuZGwpOwogICAgICAgICB9CiAKICAgICAgICAgcHJpbnQgTkVXTE9HIGpvaW4gJycs IEByZXN1bHQ7CkBAIC0zNDAsNyArMzQwLDcgQEAgc3ViIGNyZWF0ZUNvbW1pdE1lc3NhZ2UoQCkK ICAgICAgICAgJGxhYmVsID0gInRvcCBsZXZlbCIgdW5sZXNzIGxlbmd0aCAkbGFiZWw7CiAKICAg ICAgICAgJGNoYW5nZUxvZ1NvcnR7c29ydEtleSgkbGFiZWwpfSA9ICRsYWJlbDsKLSAgICAgICAg JGNoYW5nZUxvZ0NvbnRlbnRzeyRsYWJlbH0gPSAkY29udGVudHM7CisgICAgICAgICRjaGFuZ2VM b2dDb250ZW50c3tzb3J0S2V5KCRsYWJlbCl9ID0gJGNvbnRlbnRzOwogICAgIH0KIAogICAgIG15 ICRjb21tb25QcmVmaXggPSByZW1vdmVMb25nZXN0Q29tbW9uUHJlZml4RW5kaW5nSW5OZXdsaW5l KCVjaGFuZ2VMb2dDb250ZW50cyk7CkBAIC0zNDksMTIgKzM0OSwxMiBAQCBzdWIgY3JlYXRlQ29t bWl0TWVzc2FnZShAKQogICAgIHB1c2ggQHJlc3VsdCwgbm9ybWFsaXplTGluZUVuZGluZ3MoJGNv bW1vblByZWZpeCwgJGVuZGwpOwogICAgIGZvciBteSAkc29ydEtleSAoc29ydCBrZXlzICVjaGFu Z2VMb2dTb3J0KSB7CiAgICAgICAgIG15ICRsYWJlbCA9ICRjaGFuZ2VMb2dTb3J0eyRzb3J0S2V5 fTsKLSAgICAgICAgbmV4dCBpZiAoJGNoYW5nZUxvZ0NvbnRlbnRzeyRsYWJlbH0gZXEgIlxuIik7 CisgICAgICAgIG5leHQgdW5sZXNzICRjaGFuZ2VMb2dDb250ZW50c3skc29ydEtleX07CiAgICAg ICAgIGlmIChrZXlzICVjaGFuZ2VMb2dTb3J0ID4gMSkgewogICAgICAgICAgICAgcHVzaCBAcmVz dWx0LCBub3JtYWxpemVMaW5lRW5kaW5ncygiXG4iLCAkZW5kbCk7CiAgICAgICAgICAgICBwdXNo IEByZXN1bHQsIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIkbGFiZWw6XG4iLCAkZW5kbCk7CiAgICAg ICAgIH0KLSAgICAgICAgcHVzaCBAcmVzdWx0LCBub3JtYWxpemVMaW5lRW5kaW5ncygkY2hhbmdl TG9nQ29udGVudHN7JGxhYmVsfSwgJGVuZGwpOworICAgICAgICBwdXNoIEByZXN1bHQsIG5vcm1h bGl6ZUxpbmVFbmRpbmdzKCRjaGFuZ2VMb2dDb250ZW50c3skc29ydEtleX0sICRlbmRsKTsKICAg ICB9CiAKICAgICByZXR1cm4gam9pbiAnJywgQHJlc3VsdDsKQEAgLTM4NSwyOSArMzg1LDMxIEBA IHN1YiByZW1vdmVMb25nZXN0Q29tbW9uUHJlZml4RW5kaW5nSW5OZXdsaW5lKFwlKQogewogICAg IG15ICgkaGFzaE9mU3RyaW5ncykgPSBAXzsKIAotICAgIG15IEBzdHJpbmdzID0gdmFsdWVzICV7 JGhhc2hPZlN0cmluZ3N9OwotICAgIHJldHVybiAiIiB1bmxlc3MgQHN0cmluZ3MgPiAxOworICAg IHJldHVybiAiIiB1bmxlc3Mga2V5cyAlJGhhc2hPZlN0cmluZ3MgPiAxOwogCi0gICAgbXkgJHBy ZWZpeCA9IHNoaWZ0IEBzdHJpbmdzOwotICAgIG15ICRwcmVmaXhMZW5ndGggPSBsZW5ndGggJHBy ZWZpeDsKLSAgICBmb3JlYWNoIG15ICRzdHJpbmcgKEBzdHJpbmdzKSB7Ci0gICAgICAgIHdoaWxl ICgkcHJlZml4TGVuZ3RoKSB7Ci0gICAgICAgICAgICBsYXN0IGlmIHN1YnN0cigkc3RyaW5nLCAw LCAkcHJlZml4TGVuZ3RoKSBlcSAkcHJlZml4OwotICAgICAgICAgICAgLS0kcHJlZml4TGVuZ3Ro OwotICAgICAgICAgICAgJHByZWZpeCA9IHN1YnN0cigkcHJlZml4LCAwLCAtMSk7Ci0gICAgICAg IH0KLSAgICAgICAgbGFzdCB1bmxlc3MgJHByZWZpeExlbmd0aDsKKyAgICBteSAlc3RyaW5nczsK KyAgICBmb3JlYWNoIG15ICRrZXkgKGtleXMgJSRoYXNoT2ZTdHJpbmdzKSB7CisgICAgICAgICRz dHJpbmdzeyRrZXl9ID0gWyBzcGxpdCgvXi8sICRoYXNoT2ZTdHJpbmdzLT57JGtleX0pIF07Cisg ICAgfQorICAgIG15IEBwcmVmaXg7CisgICAgd2hpbGUgKDEpIHsKKyAgICAgICAgIyBDb2xsZWN0 IHRoZSBmaXJzdCBsaW5lcyBvZiBhbGwgZW50cmllcworICAgICAgICBteSBAaGVhZHMgPSBtYXAg eyBAJF8gPyAkXy0+WzBdIDogIiIgfSAodmFsdWVzICVzdHJpbmdzKTsKKyAgICAgICAgbXkgJWhh c2hfb2ZfaGVhZHMgPSBtYXAgeyRfLCAxfSBAaGVhZHM7CisgICAgICAgIGxhc3QgaWYgZXhpc3Rz ICRoYXNoX29mX2hlYWRzeyIifTsKKyAgICAgICAgIyBDaGVjayB0aGUgYWxsIGZpcnN0IGxpbmVz IG1hdGNoCisgICAgICAgIGxhc3QgdW5sZXNzIGtleXMgJWhhc2hfb2ZfaGVhZHMgPT0gMTsKKyAg ICAgICAgcHVzaCBAcHJlZml4LCAkaGVhZHNbMF07CisgICAgICAgICMgUmVtb3ZlIHRoZSBmaXJz dCBsaW5lcworICAgICAgICBtYXAgeyBzaGlmdChAeyRzdHJpbmdzeyRffX0pIH0ga2V5cyAlc3Ry aW5nczsKICAgICB9CiAKLSAgICByZXR1cm4gIiIgdW5sZXNzICRwcmVmaXhMZW5ndGg7CisgICAg bWFwIHsgJGhhc2hPZlN0cmluZ3MtPnskX30gPSBqb2luICIiLCBAeyRzdHJpbmdzeyRffX0gfSBr ZXlzICVzdHJpbmdzOwogCi0gICAgbXkgJGxhc3ROZXdsaW5lID0gcmluZGV4KCRwcmVmaXgsICJc biIpOwotICAgIHJldHVybiAiIiB1bmxlc3MgJGxhc3ROZXdsaW5lID4gMDsKKyAgICAjIFRoZSBm aXJzdCBsaW5lIHNob3VsZCBiZSB0aGUgYnVnIHRpdGxlLiBVc2UgdGhlIGZpcnN0IGxpbmUgb2Yg dGhlIGZpcnN0IGVudHJ5IGlmIG5vIHByZWZpeCBmb3VuZC4KKyAgICBAcHJlZml4ID0gJHN0cmlu Z3N7KHNvcnQga2V5cyAlc3RyaW5ncylbMF19LT5bMF0gdW5sZXNzIEBwcmVmaXg7CiAKLSAgICBm b3JlYWNoIG15ICRrZXkgKGtleXMgJXskaGFzaE9mU3RyaW5nc30pIHsKLSAgICAgICAgJGhhc2hP ZlN0cmluZ3MtPnska2V5fSA9IHN1YnN0cigkaGFzaE9mU3RyaW5ncy0+eyRrZXl9LCAkbGFzdE5l d2xpbmUpOwotICAgIH0KLSAgICByZXR1cm4gc3Vic3RyKCRwcmVmaXgsIDAsICRsYXN0TmV3bGlu ZSk7CisgICAgcmV0dXJuIGpvaW4gIiIsIEBwcmVmaXg7CiB9CiAKIHN1YiBpc0NvbW1pdExvZ0Vk aXRvcigkKQo= 418363 2021-01-25 18:49:30 -0800 2021-01-25 18:49:30 -0800 Patch bug-220822-20210126114928.patch text/plain 8574 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxODY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjAwYTYxNzdiZDQ5ZjM2YzgzNjZjNjk1MTE1NTMyYzVi ZjViNGFmNC4uNmU1ZWRmYzcwNGJmMzE0MzRlNmM4ZjVmZjQ5MDk5M2Q4NGFkNjM2ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDIxLTAxLTI1ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFRoZSBnZW5lcmF0ZWQgY29tbWl0IG1lc3NhZ2UgaGF2ZSBhIGRpcmVjdG9y eSBsYWJlbCBhdCB0aGUgZmlyc3QgbGluZSByYXRoZXIgdGhhbiB0aGUgYnVnJ3MgdGl0bGUgaWYg Q2hhbmdlTG9ncyBoYXZlIGRpZmZlcmVudCBidWcgdGl0bGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA4MjIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBjb21taXQtbG9nLWVkaXRvciBnZW5lcmF0ZXMg dGhlIGRlZmF1bHQgY29tbWl0IG1lc3NhZ2UgYnkKKyAgICAgICAgY29sbGVjdGluZyBhbGwgQ2hh bmdlTG9nIGVudHJpZXMgYW5kIG1lcmdpbmcgdGhlbSB3aXRoIHByZXBlbmRpbmcKKyAgICAgICAg ZGlyZWN0b3J5IGxhYmxlcy4gSWYgaXQgZmluZHMgb3V0IGEgY29tbW9uIHByZWZpeCBmb3IgYWxs IGVudHJpZXMsCisgICAgICAgIGl0IHJlbW92ZXMgdGhlIHByZWZpeCBmcm9tIGVudHJpZXMgYW5k IGhvaXN0cyB0aGUgcHJlZml4IGFzIHRoZQorICAgICAgICBiZWdpbm5pbmcgb2YgdGhlIGNvbW1p dCBtZXNzYWdlLiBUaGlzIHN0ZXAgcmVtb3ZlcyBkdXBsaWNhdGVkCisgICAgICAgIGxpbmVzIG9m IHRoZSBidWcgdGl0bGUsIHRoZSBidWcgVVJMLCB0aGUgcmV2aWV3ZWQtYnkgbGluZSwgYW5kIHRo ZQorICAgICAgICBkZXNjcmlwdGlvbnMuCisKKyAgICAgICAgSWYgc3VjaCBwcmVmaXggaXMgbm90 IGZvdW5kLCBpLmUuIENoYW5nZUxvZyBlbnRyaWVzIGhhcyBkaWZmZXJlbnQKKyAgICAgICAgYnVn IHRpdGxlcywgaXQgc2ltcGx5IG1lcmdlcyBhbGwgZW50cmllcyB3aXRoIGRpcmVjdG9yeSBsYWJl bHMuIEFzCisgICAgICAgIHRoZSByZXN1bHQsIHRoZSBnZW5lcmF0ZWQgY29tbWl0IG1lc3NhZ2Ug aGFzIHRoZSBkaXJlY3RvcnkgbGFiZWwKKyAgICAgICAgYXQgdGhlIGZpcnN0IGxpbmUuIFRoaXMg aXMgbm90IGRlc2lyYWJsZS4gVGhlIGZpcnN0IGxpbmUgb2YgdGhlCisgICAgICAgIGNvbW1pdCBt ZXNzYWdlIHNob3VsZCBiZSB0aGUgYnVnIHRpdGxlLgorCisgICAgICAgIFRoaXMgcGF0Y2ggeWFu a3MgdGhlIGZpcnN0IGxpbmUgb2YgdGhlIGZpcnN0IGVudHJ5IGFzIHRoZSBjb21tb24KKyAgICAg ICAgcHJlZml4IGluIHRoZSBjYXNlLgorCisgICAgICAgICogU2NyaXB0cy9jb21taXQtbG9nLWVk aXRvcjoKKyAgICAgICAgKGNyZWF0ZUNvbW1pdE1lc3NhZ2UpOgorICAgICAgICAocmVtb3ZlTG9u Z2VzdENvbW1vblByZWZpeEVuZGluZ0luTmV3bGluZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tvdXRfdW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0 X2NvbW1pdF9tZXNzYWdlX2Zvcl9yZXZlcnRfY2hhbmdlbG9nc193aXRoX2RpZmZlcmVudF9kaXJl Y3Rvcmllcyk6IEFkZGVkIGEgbmV3IHRlc3QuCisKIDIwMjEtMDEtMjUgIFJ5YW4gSGFkZGFkICA8 cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIy NzE4MDUuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yIGIvVG9v bHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRvcgppbmRleCA4MjNhZGRlMDUxODA3NzQ3ZjU4NGVi OTZiNDY4OTcyYmI4ZTk2NzY0Li5hN2Q3NDQ5ZTYwYzIyZTViNGYxZmQ0ZGZlNGJkZDE0NWQxM2Vm YTIyIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yCisrKyBiL1Rv b2xzL1NjcmlwdHMvY29tbWl0LWxvZy1lZGl0b3IKQEAgLTE5NCw3ICsxOTQsNyBAQCBpZiAoaXNH aXQoKSAmJiBAY2hhbmdlTG9ncyA9PSAwKSB7CiAgICAgICAgICAgICBteSAkbGFiZWwgPSA8JGNo YW5nZUxvZ0VudHJpZXM+OwogICAgICAgICAgICAgY2hvbXAgJGxhYmVsOwogICAgICAgICAgICAg JGxhYmVsID1+IHMvOiQvLzsKLSAgICAgICAgICAgICgkY2hhbmdlTG9nQ29udGVudHN7JGxhYmVs fSkgPSBjb21taXRNZXNzYWdlRnJvbUNoYW5nZUxvZ0VudHJ5KCRjaGFuZ2VMb2dFbnRyaWVzKTsK KyAgICAgICAgICAgICRjaGFuZ2VMb2dDb250ZW50c3tzb3J0S2V5KCRsYWJlbCl9ID0gY29tbWl0 TWVzc2FnZUZyb21DaGFuZ2VMb2dFbnRyeSgkY2hhbmdlTG9nRW50cmllcyk7CiAgICAgICAgICAg ICAkY2hhbmdlTG9nU29ydHtzb3J0S2V5KCRsYWJlbCl9ID0gJGxhYmVsOwogICAgICAgICB9CiAg ICAgICAgIGNsb3NlICRjaGFuZ2VMb2dFbnRyaWVzOwpAQCAtMjA1LDEyICsyMDUsMTIgQEAgaWYg KGlzR2l0KCkgJiYgQGNoYW5nZUxvZ3MgPT0gMCkgewogICAgICAgICBwdXNoIEByZXN1bHQsIG5v cm1hbGl6ZUxpbmVFbmRpbmdzKCRjb21tb25QcmVmaXgsICRlbmRsKTsKICAgICAgICAgZm9yIG15 ICRzb3J0S2V5IChzb3J0IGtleXMgJWNoYW5nZUxvZ1NvcnQpIHsKICAgICAgICAgICAgIG15ICRs YWJlbCA9ICRjaGFuZ2VMb2dTb3J0eyRzb3J0S2V5fTsKLSAgICAgICAgICAgIG5leHQgaWYgKCRj aGFuZ2VMb2dDb250ZW50c3skbGFiZWx9IGVxICJcbiIpOworICAgICAgICAgICAgbmV4dCB1bmxl c3MgJGNoYW5nZUxvZ0NvbnRlbnRzeyRzb3J0S2V5fTsKICAgICAgICAgICAgIGlmIChrZXlzICVj aGFuZ2VMb2dTb3J0ID4gMSkgewogICAgICAgICAgICAgICAgIHB1c2ggQHJlc3VsdCwgbm9ybWFs aXplTGluZUVuZGluZ3MoIlxuIiwgJGVuZGwpOwogICAgICAgICAgICAgICAgIHB1c2ggQHJlc3Vs dCwgbm9ybWFsaXplTGluZUVuZGluZ3MoIiRsYWJlbDogIiwgJGVuZGwpOwogICAgICAgICAgICAg fQotICAgICAgICAgICAgcHVzaCBAcmVzdWx0LCBub3JtYWxpemVMaW5lRW5kaW5ncygkY2hhbmdl TG9nQ29udGVudHN7JGxhYmVsfSwgJGVuZGwpOworICAgICAgICAgICAgcHVzaCBAcmVzdWx0LCBu b3JtYWxpemVMaW5lRW5kaW5ncygkY2hhbmdlTG9nQ29udGVudHN7JHNvcnRLZXl9LCAkZW5kbCk7 CiAgICAgICAgIH0KIAogICAgICAgICBwcmludCBORVdMT0cgam9pbiAnJywgQHJlc3VsdDsKQEAg LTM0MCw3ICszNDAsNyBAQCBzdWIgY3JlYXRlQ29tbWl0TWVzc2FnZShAKQogICAgICAgICAkbGFi ZWwgPSAidG9wIGxldmVsIiB1bmxlc3MgbGVuZ3RoICRsYWJlbDsKIAogICAgICAgICAkY2hhbmdl TG9nU29ydHtzb3J0S2V5KCRsYWJlbCl9ID0gJGxhYmVsOwotICAgICAgICAkY2hhbmdlTG9nQ29u dGVudHN7JGxhYmVsfSA9ICRjb250ZW50czsKKyAgICAgICAgJGNoYW5nZUxvZ0NvbnRlbnRze3Nv cnRLZXkoJGxhYmVsKX0gPSAkY29udGVudHM7CiAgICAgfQogCiAgICAgbXkgJGNvbW1vblByZWZp eCA9IHJlbW92ZUxvbmdlc3RDb21tb25QcmVmaXhFbmRpbmdJbk5ld2xpbmUoJWNoYW5nZUxvZ0Nv bnRlbnRzKTsKQEAgLTM0OSwxMiArMzQ5LDEyIEBAIHN1YiBjcmVhdGVDb21taXRNZXNzYWdlKEAp CiAgICAgcHVzaCBAcmVzdWx0LCBub3JtYWxpemVMaW5lRW5kaW5ncygkY29tbW9uUHJlZml4LCAk ZW5kbCk7CiAgICAgZm9yIG15ICRzb3J0S2V5IChzb3J0IGtleXMgJWNoYW5nZUxvZ1NvcnQpIHsK ICAgICAgICAgbXkgJGxhYmVsID0gJGNoYW5nZUxvZ1NvcnR7JHNvcnRLZXl9OwotICAgICAgICBu ZXh0IGlmICgkY2hhbmdlTG9nQ29udGVudHN7JGxhYmVsfSBlcSAiXG4iKTsKKyAgICAgICAgbmV4 dCB1bmxlc3MgJGNoYW5nZUxvZ0NvbnRlbnRzeyRzb3J0S2V5fTsKICAgICAgICAgaWYgKGtleXMg JWNoYW5nZUxvZ1NvcnQgPiAxKSB7CiAgICAgICAgICAgICBwdXNoIEByZXN1bHQsIG5vcm1hbGl6 ZUxpbmVFbmRpbmdzKCJcbiIsICRlbmRsKTsKICAgICAgICAgICAgIHB1c2ggQHJlc3VsdCwgbm9y bWFsaXplTGluZUVuZGluZ3MoIiRsYWJlbDpcbiIsICRlbmRsKTsKICAgICAgICAgfQotICAgICAg ICBwdXNoIEByZXN1bHQsIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCRjaGFuZ2VMb2dDb250ZW50c3sk bGFiZWx9LCAkZW5kbCk7CisgICAgICAgIHB1c2ggQHJlc3VsdCwgbm9ybWFsaXplTGluZUVuZGlu Z3MoJGNoYW5nZUxvZ0NvbnRlbnRzeyRzb3J0S2V5fSwgJGVuZGwpOwogICAgIH0KIAogICAgIHJl dHVybiBqb2luICcnLCBAcmVzdWx0OwpAQCAtMzg1LDI5ICszODUsMzYgQEAgc3ViIHJlbW92ZUxv bmdlc3RDb21tb25QcmVmaXhFbmRpbmdJbk5ld2xpbmUoXCUpCiB7CiAgICAgbXkgKCRoYXNoT2ZT dHJpbmdzKSA9IEBfOwogCi0gICAgbXkgQHN0cmluZ3MgPSB2YWx1ZXMgJXskaGFzaE9mU3RyaW5n c307Ci0gICAgcmV0dXJuICIiIHVubGVzcyBAc3RyaW5ncyA+IDE7CisgICAgcmV0dXJuICIiIHVu bGVzcyBrZXlzICUkaGFzaE9mU3RyaW5ncyA+IDE7CiAKLSAgICBteSAkcHJlZml4ID0gc2hpZnQg QHN0cmluZ3M7Ci0gICAgbXkgJHByZWZpeExlbmd0aCA9IGxlbmd0aCAkcHJlZml4OwotICAgIGZv cmVhY2ggbXkgJHN0cmluZyAoQHN0cmluZ3MpIHsKLSAgICAgICAgd2hpbGUgKCRwcmVmaXhMZW5n dGgpIHsKLSAgICAgICAgICAgIGxhc3QgaWYgc3Vic3RyKCRzdHJpbmcsIDAsICRwcmVmaXhMZW5n dGgpIGVxICRwcmVmaXg7Ci0gICAgICAgICAgICAtLSRwcmVmaXhMZW5ndGg7Ci0gICAgICAgICAg ICAkcHJlZml4ID0gc3Vic3RyKCRwcmVmaXgsIDAsIC0xKTsKLSAgICAgICAgfQotICAgICAgICBs YXN0IHVubGVzcyAkcHJlZml4TGVuZ3RoOworICAgIG15ICVzdHJpbmdzOworICAgIGZvcmVhY2gg bXkgJGtleSAoa2V5cyAlJGhhc2hPZlN0cmluZ3MpIHsKKyAgICAgICAgJHN0cmluZ3N7JGtleX0g PSBbIHNwbGl0KC9eLywgJGhhc2hPZlN0cmluZ3MtPnska2V5fSkgXTsKKyAgICB9CisgICAgbXkg QHByZWZpeDsKKyAgICB3aGlsZSAoMSkgeworICAgICAgICAjIENvbGxlY3QgdGhlIGZpcnN0IGxp bmVzIG9mIGFsbCBlbnRyaWVzCisgICAgICAgIG15IEBoZWFkcyA9IG1hcCB7IEAkXyA/ICRfLT5b MF0gOiAiIiB9ICh2YWx1ZXMgJXN0cmluZ3MpOworICAgICAgICBteSAlaGFzaF9vZl9oZWFkcyA9 IG1hcCB7JF8sIDF9IEBoZWFkczsKKyAgICAgICAgbGFzdCBpZiBleGlzdHMgJGhhc2hfb2ZfaGVh ZHN7IiJ9OworICAgICAgICAjIENoZWNrIHRoZSBhbGwgZmlyc3QgbGluZXMgYXJlIHNhbWUKKyAg ICAgICAgbGFzdCB1bmxlc3Mga2V5cyAlaGFzaF9vZl9oZWFkcyA9PSAxOworICAgICAgICBwdXNo IEBwcmVmaXgsICRoZWFkc1swXTsKKyAgICAgICAgIyBSZW1vdmUgdGhlIGZpcnN0IGxpbmVzCisg ICAgICAgIG1hcCB7IHNoaWZ0IEAkXyB9IHZhbHVlcyAlc3RyaW5nczsKKyAgICB9CisgICAgaWYg KEBwcmVmaXggJiYgJHByZWZpeFtAcHJlZml4IC0gMV0gZXEgIlxuIikgeworICAgICAgICAjIFB1 c2ggYmFjayB0aGUgbGFzdCBsaW5lIGlmIGl0IGlzIGFuIGVtcHR5IGxpbmUKKyAgICAgICAgcG9w IEBwcmVmaXg7CisgICAgICAgIG1hcCB7IHVuc2hpZnQoQCRfLCAiXG4iKSB9IHZhbHVlcyAlc3Ry aW5nczsKICAgICB9CiAKLSAgICByZXR1cm4gIiIgdW5sZXNzICRwcmVmaXhMZW5ndGg7CisgICAg bWFwIHsgJGhhc2hPZlN0cmluZ3MtPnskX30gPSBqb2luICIiLCBAeyRzdHJpbmdzeyRffX0gfSBr ZXlzICVzdHJpbmdzOwogCi0gICAgbXkgJGxhc3ROZXdsaW5lID0gcmluZGV4KCRwcmVmaXgsICJc biIpOwotICAgIHJldHVybiAiIiB1bmxlc3MgJGxhc3ROZXdsaW5lID4gMDsKKyAgICAjIFRoZSBm aXJzdCBsaW5lIHNob3VsZCBiZSB0aGUgYnVnIHRpdGxlLiBVc2UgdGhlIGZpcnN0IGxpbmUgb2Yg dGhlIGZpcnN0IGVudHJ5IGlmIG5vIHByZWZpeCBmb3VuZC4KKyAgICBAcHJlZml4ID0gJHN0cmlu Z3N7KHNvcnQga2V5cyAlc3RyaW5ncylbMF19LT5bMF0gdW5sZXNzIEBwcmVmaXg7CiAKLSAgICBm b3JlYWNoIG15ICRrZXkgKGtleXMgJXskaGFzaE9mU3RyaW5nc30pIHsKLSAgICAgICAgJGhhc2hP ZlN0cmluZ3MtPnska2V5fSA9IHN1YnN0cigkaGFzaE9mU3RyaW5ncy0+eyRrZXl9LCAkbGFzdE5l d2xpbmUpOwotICAgIH0KLSAgICByZXR1cm4gc3Vic3RyKCRwcmVmaXgsIDAsICRsYXN0TmV3bGlu ZSk7CisgICAgcmV0dXJuIGpvaW4gIiIsIEBwcmVmaXg7CiB9CiAKIHN1YiBpc0NvbW1pdExvZ0Vk aXRvcigkKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvY2hlY2tvdXRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9jaGVja291dF91bml0dGVzdC5weQppbmRleCBiMzU5MmY5MDY1ZmEzYmY1ZDdiODE5 MTBhZGIxZDI3YTE1YWQ2NzlmLi4wOTE2MzNiMTNlYTZlMTRmNzkxYzIwZGE3ZTUzMzRkNDM5NWQ3 MGY1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9j aGVja291dF91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9jaGVja291dF91bml0dGVzdC5weQpAQCAtMjgwLDYgKzI4MCw0NCBAQCBGaWxsZXIg Y2hhbmdlLgogICAgICAgICBjb21taXRfbWVzc2FnZS5tZXNzYWdlX2xpbmVzID0gY29tbWl0X21l c3NhZ2UubWVzc2FnZV9saW5lc1sxOl0KICAgICAgICAgc2VsZi5hc3NlcnRNdWx0aUxpbmVFcXVh bChjb21taXRfbWVzc2FnZS5tZXNzYWdlKCksIGV4cGVjdGVkX2NvbW1pdF9tZXNzYWdlKQogCisg ICAgZGVmIHRlc3RfY29tbWl0X21lc3NhZ2VfZm9yX2NoYW5nZWxvZ3Nfd2l0aF9kaWZmZXJlbnRf YnVnX3RpdGxlKHNlbGYpOgorICAgICAgICBleHBlY3RlZF9jb21taXRfbWVzc2FnZSA9IHUiIiJT RUNUT1JERVJfRkxBR1Mgc2hvdWxkIGJlIGRlZmluZWQgaW4gdGFyZ2V0J3MgeGNjb25maWcgZmls ZSwgbm90IEJhc2UueGNjb25maWcKKworU291cmNlL1dlYktpdExlZ2FjeToKK1NFQ1RPUkRFUl9G TEFHUyBzaG91bGQgYmUgZGVmaW5lZCBpbiB0YXJnZXQncyB4Y2NvbmZpZyBmaWxlLCBub3QgQmFz ZS54Y2NvbmZpZworPGh0dHA6Ly93ZWJraXQub3JnL2IvMTM1MDA2PgorCitQYXRjaCBieSBEYXZp ZCBLaWx6ZXIgPGRka2lsemVyQGFwcGxlLmNvbT4gb24gMjAxNC0wNy0xNworUmV2aWV3ZWQgYnkg RGFyaW4gQWRsZXIuCisKKyogV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6IFJlbW92 ZSByZWZlcmVuY2VzIHRvIHVudXNlZAorV2ViS2l0LnhjY29uZmlnIGZpbGUuCisKK0xheW91dFRl c3RzOgorUmV2ZXJ0aW5nIHIxNzAzNDAgYW5kIHIxNzAzMzkuCisKK0NoYW5nZXNldCByMTcwMzM5 IGJyb2tlIHRoZSBBcHBsZSBXaW5kb3dzIERlYnVnIGFuZCBSZWxlYXNlIGJ1aWxkcy4KKworUmV2 ZXJ0ZWQgY2hhbmdlc2V0czoKKworIltXaW5dIEJ1aWxkIGZpeCBhZnRlciByMTM0MjA5IgoraHR0 cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE3MDM0MAorCisiW1dpbl0gQ2xlYW4gdXAg YW5kIHJlZmFjdG9yIFdpbkxhdW5jaGVyIgoraHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNDIwOQoraHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE3MDMz OQorCitQYXRjaCBieSBEYW5pZWwgQmF0ZXMgPGRhYmF0ZXNAYXBwbGUuY29tPiBvbiAyMDE0LTA2 LTIzCisiIiIKKyAgICAgICAgc2VsZi5jaGFuZ2Vsb2dfcGF0aHMgPSBsaXN0KG1hcChzZWxmLmZp bGVzeXN0ZW0uYWJzcGF0aCwgKHNlbGYuZmlsZXN5c3RlbS5qb2luKCJTb3VyY2UvV2ViS2l0TGVn YWN5IiwgIkNoYW5nZUxvZyIpLCBzZWxmLmZpbGVzeXN0ZW0uam9pbigiTGF5b3V0VGVzdHMiLCAi Q2hhbmdlTG9nIikpKSkKKworICAgICAgICBzZWxmLm1vY2tfY2hhbmdlbG9nKChfY2hhbmdlbG9n MywgX2NoYW5nZWxvZzYpKQorICAgICAgICBjaGVja291dCA9IHNlbGYubW9ja19jaGVja291dF9m b3JfdGVzdCgpCisgICAgICAgIGNvbW1pdF9tZXNzYWdlID0gY2hlY2tvdXQuY29tbWl0X21lc3Nh Z2VfZm9yX3RoaXNfY29tbWl0KGdpdF9jb21taXQ9Tm9uZSwgcmV0dXJuX3N0ZGVycj1UcnVlKQor ICAgICAgICAjIFRocm93IGF3YXkgdGhlIGZpcnN0IGxpbmUgLSBhIHdhcm5pbmcgYWJvdXQgdW5r bm93biBWQ1Mgcm9vdC4KKyAgICAgICAgY29tbWl0X21lc3NhZ2UubWVzc2FnZV9saW5lcyA9IGNv bW1pdF9tZXNzYWdlLm1lc3NhZ2VfbGluZXNbMTpdCisgICAgICAgIHNlbGYuYXNzZXJ0TXVsdGlM aW5lRXF1YWwoY29tbWl0X21lc3NhZ2UubWVzc2FnZSgpLCBleHBlY3RlZF9jb21taXRfbWVzc2Fn ZSkKKwogICAgIGRlZiB0ZXN0X2NvbW1pdF9tZXNzYWdlX2Zvcl9vbmVfcmV2ZXJ0X2NoYW5nZWxv ZyhzZWxmKToKICAgICAgICAgZXhwZWN0ZWRfY29tbWl0X21lc3NhZ2UgPSB1IiIiUmV2ZXJ0aW5n IHIxNzAzNDAgYW5kIHIxNzAzMzkuCiAK