230195 2021-09-11 15:17:39 -0700 Provide a way to update the commit message with an updated list of changed files/functions 2021-09-14 08:57:18 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Enhancement --- 1 dvh webkit-unassigned ap ddkilzer fujii jbedard webkit-bug-importer oldest_to_newest 1792736 0 dvh 2021-09-11 15:17:39 -0700 When the author needs to make additional changes to the commit, we generally need to make changes to the commit message with the updated list with changes in files/functions. Currently, that process is very manual and may involve: - saving the current commit message un-committing then re-committing and merge the old commit message with the new generated commit message template. - or writing manually the list of new changes in files/functions. This process should be a little more automated. For that, we can make changes in commit-log-editor to allow updates of the commit message with a generated list of changed files/functions. Since there may already be comment of the author or this list of files/functions, this updated list needs to be appended at the bottom for the author to merge the content. 1792738 1 437967 dvh 2021-09-11 15:59:14 -0700 Created attachment 437967 Patch 1792741 2 437969 dvh 2021-09-11 16:18:06 -0700 Created attachment 437969 Patch 1793131 3 438083 dvh 2021-09-13 15:49:29 -0700 Created attachment 438083 Patch 1793140 4 438083 jbedard 2021-09-13 16:14:40 -0700 Comment on attachment 438083 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438083&action=review > Tools/Scripts/prepare-ChangeLog:183 > + print STDERR " --only-files Generate only the files changes.\n"; I would change this to say "Exclude the standard changelog header and only include references to files", the existing message doesn't give much extra information. 1793143 5 438088 dvh 2021-09-13 16:24:53 -0700 Created attachment 438088 Patch 1793145 6 dvh 2021-09-13 16:26:47 -0700 I added that part: - my $date = changeLogDate(ChangeLogTimeZone); - print CHANGE_LOG normalizeLineEndings("$date $name <$emailAddress>\n\n", $endl); + if (!$onlyFiles) { + my $date = changeLogDate(ChangeLogTimeZone); + print CHANGE_LOG normalizeLineEndings("$date $name <$emailAddress>\n\n", $endl); + } And also applied the suggestion for the help message. 1793154 7 dvh 2021-09-13 16:52:33 -0700 cq? 1793184 8 fujii 2021-09-13 19:27:27 -0700 Do yuou know "Tools/Scripts/webkit-patch prepare --update-changelogs <BUG_ID>"? 1793321 9 ews-feeder 2021-09-14 08:56:58 -0700 Committed r282391 (241652@main): <https://commits.webkit.org/241652@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438088. 1793322 10 webkit-bug-importer 2021-09-14 08:57:18 -0700 <rdar://problem/83104345> 437967 2021-09-11 15:59:14 -0700 2021-09-11 16:18:04 -0700 Patch bug-230195-20210911155913.patch text/plain 14495 dvh U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMzA2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjViZTE1NGJhMzhmMmJjMTk3NmNlOTk0ZDljZTllYmZk ZDcyMGY3OC4uOWRlOTBiZGJkMTY0MWMwNWE0Njg0ZjFmNjU4ZTA0NGFhNWZhNzY5NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4 IEBACisyMDIxLTA5LTExICBIb2EgRGluaCAgPGR2aEBhcHBsZS5jb20+CisKKyAgICAgICAgUHJv dmlkZSBhIHdheSB0byB1cGRhdGUgdGhlIGNvbW1pdCBtZXNzYWdlIHdpdGggYW4gdXBkYXRlZCBs aXN0IG9mIGNoYW5nZWQgZmlsZXMvZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAxOTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBuZXcgcGFyYW1ldGVycyB0byBjb21taXQtbG9n LWVkaXRvcjoKKyAgICAgICAgLS11cGRhdGUtZmlsZS1saXN0OiB0byB0ZWxsIGNvbW1pdC1sb2ct ZWRpdG9yIHRvIGFwcGVuZCB0aGUgZ2VuZXJhdGVkIGxpc3Qgb2YgY2hhbmdlZCBmaWxlcy9mdW5j dGlvbnMKKyAgICAgICAgYXQgdGhlIGJvdHRvbSBvZiB0aGUgZWRpdGVkIGZpbGUKKyAgICAgICAg LS1naXQtY29tbWl0Ly1nOiB0byB0ZWxsIHdoaWNoIGNvbW1pdCB0byB1c2UgdG8gZ2VuZXJhdGUg dGhlIGxpc3Qgb2YgY2hhbmdlZCBmaWxlcy9mdW5jdGlvbnMuCisgICAgICAgIC0tZGVzY3JpcHRp b246IHdoZW4gZ2VuZXJhdGluZyB0aGUgaW5pdGlhbCB0ZW1wbGF0ZSBmb3IgdGhlIGNvbW1pdCBt ZXNzYWdlLCB3ZSBjYW4gc3BlY2lmeSB0aGUKKyAgICAgICAgdG9wIGxpbmUgb2YgdGhlIGNvbW1p dCBtZXNzYWdlIHZpYSB0aGlzIHBhcmFtZXRlci4KKyAgICAgICAgLS1uby1idWc6IHByb3ZpZGVz IGEgd2F5IHRvIHNraXAgZ2VuZXJhdGlvbiBvZiB0aGUgbGluZSAiTmVlZCB0aGUgYnVnIFVSTCAo T09QUyEpLiIuCisKKyAgICAgICAgKiBTY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yOgorICAgICAg ICAtIFdlIGFkZCB0aGUgbmV3IGxpc3Qgb2YgcGFyYW1ldGVycy4KKyAgICAgICAgLSBXZSBmaXgg dGhlIHdhcm5pbmcgd2hlbiAkRU5We0dJVF9QUkVGSVh9IHdhcyB1bmRlZmluZWQgb3IgYW4gZW1w dHkgc3RyaW5nLgorICAgICAgICAtIEluIGNhc2UgLS11cGRhdGUtZmlsZS1saXN0IGlzIHBhc3Nl ZCwgd2UgZ2VuZXJhdGUgdGhlIHVwZGF0ZWQgbGlzdCBvZiBjaGFuZ2VkIGZpbGVzL2Z1bmN0aW9u cworICAgICAgICAgIGF0IHRoZSBib3R0b20gb2YgdGhlIGNvbW1pdCBtZXNzYWdlLgorCisgICAg ICAgIChwcmludFVzYWdlQW5kRXhpdCk6CisgICAgICAgIEFkZGVkIGhlbHAgZm9yIHRoZSBuZXcg cGFyYW1ldGVycy4KKworICAgICAgICAocHJlcGFyZUNoYW5nZUxvZyk6CisgICAgICAgIFdlIG1v dmUgdGhlIGNvZGUgdG8gY2FsbCBwcmVwYXJlLUNoYW5nZUxvZyBhbmQgcHJlcGFyZSB0aGUgcmVz dWx0IGluIGEgc2VwYXJhdGUgZnVuY3Rpb24uCisKKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUt Q2hhbmdlTG9nOgorICAgICAgICBXZSBhZGQgYSBuZXcgcGFyYW1ldGVyIC0tb25seS1maWxlcyB0 byByZXF1ZXN0IGdlbmVyYXRpb24gb2Ygb25seSB0aGUgcGFydCBvZiB0aGUgY2hhbmdlZCBmaWxl cy9mdW5jdGlvbnMuCisgICAgICAgIElmIC0xIGlzIHBhc3NlZCBhcyBhIHZhbHVlIGZvciAtLWJ1 ZywgaXQgd29uJ3QgZ2VuZXJhdGUgdGhlIHRlbXBsYXRlIGxpbmUgZm9yIHRoZSBidWcgbnVtYmVy LgorCisgICAgICAgIChtYWluKToKKyAgICAgICAgKGdlbmVyYXRlTmV3Q2hhbmdlTG9ncyk6Cisg ICAgICAgIEFkZGVkIHBhcmFtZXRlciAkYnVnTnVtYmVyICYgJG9ubHlGaWxlcyB0byBjaGFuZ2Ug dGhlIGJlaGF2aW9yIG9mIGNvbW1pdCBtZXNzYWdlIGdlbmVyYXRpb24uCisKIDIwMjEtMDktMTAg IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgbmF2 aWdhdGlvbiByZXBvcnRpbmcgZm9yIENyb3NzLU9yaWdpbi1PcGVuZXItUG9saWN5CmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9vbHMvU2NyaXB0cy9wcmVw YXJlLUNoYW5nZUxvZwppbmRleCBiNzRjOWZmOTZkZjJhMjc1NjIzOWQ1YWQzMTZkOTcyYWI0ZDc1 Yzc3Li5jZjRiYmJiODQ3YmFkZDc5YjkzYmNmY2FiN2U3OWFhYzIwNzIxY2UxIDEwMDc1NQotLS0g YS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL1NjcmlwdHMvcHJl cGFyZS1DaGFuZ2VMb2cKQEAgLTg0LDcgKzg0LDcgQEAgc3ViIGZpbmRDaGFuZ2VMb2dzKCQkKTsK IHN1YiBmaW5kT3JpZ2luYWxGaWxlRnJvbVN2bigkKTsKIHN1YiBnZW5lcmF0ZUZpbGVMaXN0KFwl JCQkXCUpOwogc3ViIGdlbmVyYXRlRnVuY3Rpb25MaXN0cygkJCQkJCk7Ci1zdWIgZ2VuZXJhdGVO ZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQkJCQkKTsKK3N1YiBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3Mo JCQkJCQkJCQkJCQkJCQkJCk7CiBzdWIgZ2V0TGF0ZXN0Q2hhbmdlTG9ncygkKTsKIHN1YiBnZXRf ZnVuY3Rpb25fbGluZV9yYW5nZXMoJCQpOwogc3ViIGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19m b3JfY3BwKCQkKTsKQEAgLTE0NSw2ICsxNDUsNyBAQCBzdWIgbWFpbigpCiAgICAgbXkgJHNob3dI ZWxwID0gMDsKICAgICBteSAkc3Bld0RpZmYgPSAkRU5WeyJQUkVQQVJFX0NIQU5HRUxPR19ESUZG In07CiAgICAgbXkgJHVwZGF0ZUNoYW5nZUxvZ3MgPSAxOworICAgIG15ICRvbmx5RmlsZXMgPSAw OwogICAgIG15ICRwYXJzZU9wdGlvbnNSZXN1bHQgPQogICAgICAgICBHZXRPcHRpb25zKCJkaWZm fGQhIiA9PiBcJHNwZXdEaWZmLAogICAgICAgICAgICAgICAgICAgICJidWd8YjppIiA9PiBcJGJ1 Z051bWJlciwKQEAgLTE2MCw3ICsxNjEsOCBAQCBzdWIgbWFpbigpCiAgICAgICAgICAgICAgICAg ICAgInN0eWxlISIgPT4gXCRjaGVja1dlYktpdFN0eWxlLAogICAgICAgICAgICAgICAgICAgICJv cGVufG8hIiA9PiBcJG9wZW5DaGFuZ2VMb2dzLAogICAgICAgICAgICAgICAgICAgICJ3cml0ZSEi ID0+IFwkd3JpdGVDaGFuZ2VMb2dzLAotICAgICAgICAgICAgICAgICAgICJ1cGRhdGUhIiA9PiBc JHVwZGF0ZUNoYW5nZUxvZ3MpOworICAgICAgICAgICAgICAgICAgICJ1cGRhdGUhIiA9PiBcJHVw ZGF0ZUNoYW5nZUxvZ3MsCisgICAgICAgICAgICAgICAgICAgIm9ubHktZmlsZXMiID0+IFwkb25s eUZpbGVzKTsKICAgICBpZiAoISRwYXJzZU9wdGlvbnNSZXN1bHQgfHwgJHNob3dIZWxwKSB7CiAg ICAgICAgIHByaW50IFNUREVSUiBiYXNlbmFtZSgkMCkgLiAiIFstYnwtLWJ1Zz08YnVnaWQ+XSBb LWR8LS1kaWZmXSBbLWh8LS1oZWxwXSBbLW98LS1vcGVuXSBbLWd8LS1naXQtY29tbWl0PTxjb21t aXR0aXNoPl0gWy0tZ2l0LXJldmlld2VyPTxuYW1lPl0gW3N2bmRpcjEgW3N2bmRpcjIgLi4uXV1c biI7CiAgICAgICAgIHByaW50IFNUREVSUiAiICAtYnwtLWJ1ZyAgICAgICAgRmlsbCBpbiB0aGUg Q2hhbmdlTG9nIGJ1ZyBpbmZvcm1hdGlvbiBmcm9tIHRoZSBnaXZlbiBidWcuXG4iOwpAQCAtMTc4 LDYgKzE4MCw3IEBAIHN1YiBtYWluKCkKICAgICAgICAgcHJpbnQgU1RERVJSICIgIC0tW25vLV13 cml0ZSAgICBXcml0ZSBDaGFuZ2VMb2dzIHRvIGRpc2sgKG90aGVyd2lzZSBzZW5kIG5ldyBlbnRy aWVzIHRvIHN0ZG91dCkgKGRlZmF1bHQ6IHdyaXRlKVxuIjsKICAgICAgICAgcHJpbnQgU1RERVJS ICIgIC0tZGVsaW1pdGVycyAgICBXaGVuIHdyaXRpbmcgdG8gc3Rkb3V0LCBsYWJlbCBhbmQgcHJp bnQgYSBcIn5cIiBhZnRlciBlYWNoIGVudHJ5XG4iOwogICAgICAgICBwcmludCBTVERFUlIgIiAg LS1lbWFpbD0gICAgICAgIFNwZWNpZnkgdGhlIGVtYWlsIGFkZHJlc3MgdG8gYmUgdXNlZCBpbiB0 aGUgcGF0Y2hcbiI7CisgICAgICAgIHByaW50IFNUREVSUiAiICAtLW9ubHktZmlsZXMgICAgR2Vu ZXJhdGUgb25seSB0aGUgZmlsZXMgY2hhbmdlcy5cbiI7CiAgICAgICAgIHJldHVybiAxOwogICAg IH0KIApAQCAtMjE4LDExICsyMjEsMTEgQEAgc3ViIG1haW4oKQogICAgICRuYW1lID1+IHMvXCgu Kj9cKVxzKiQvL2c7CiAKICAgICBteSAkYnVnVVJMOwotICAgIGlmICgkYnVnTnVtYmVyKSB7Cisg ICAgaWYgKCRidWdOdW1iZXIgJiYgJGJ1Z051bWJlciAhPSAtMSkgewogICAgICAgICAkYnVnVVJM ID0gImh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0kYnVnTnVtYmVyIjsK ICAgICB9CiAKLSAgICBpZiAoJGJ1Z051bWJlciAmJiAhJGJ1Z0Rlc2NyaXB0aW9uKSB7CisgICAg aWYgKCRidWdOdW1iZXIgJiYgISRidWdEZXNjcmlwdGlvbiAmJiAkYnVnTnVtYmVyICE9IC0xKSB7 CiAgICAgICAgIG15ICRidWdYTUxEYXRhID0gZmV0Y2hCdWdYTUxEYXRhKCRidWdVUkwsICRidWdO dW1iZXIpOwogICAgICAgICAkYnVnRGVzY3JpcHRpb24gPSBmZXRjaEJ1Z0Rlc2NyaXB0aW9uRnJv bUJ1Z1hNTERhdGEoJGJ1Z1VSTCwgJGJ1Z051bWJlciwgJGJ1Z1hNTERhdGEpOwogICAgICAgICAk YnVnUmFkYXJVUkwgPSBmZXRjaFJhZGFyVVJMRnJvbUJ1Z1hNTERhdGEoJGJ1Z051bWJlciwgJGJ1 Z1hNTERhdGEpOwpAQCAtMjM3LDcgKzI0MCw3IEBAIHN1YiBtYWluKCkKICAgICAgICAgcmVzb2x2 ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCRjaGFuZ2VMb2dzKTsKICAgICB9CiAKLSAgICBnZW5lcmF0 ZU5ld0NoYW5nZUxvZ3MoJHByZWZpeGVzLCAkZmlsZXNJbkNoYW5nZUxvZywgJGFkZGVkUmVncmVz c2lvblRlc3RzLCAkcmVxdWlyZXNUZXN0cywgJGZ1bmN0aW9uTGlzdHMsICRidWdVUkwsICRidWdE ZXNjcmlwdGlvbiwgJGJ1Z1JhZGFyVVJMLCAkbmFtZSwgJGVtYWlsQWRkcmVzcywgJGdpdFJldmll d2VyLCAkZ2l0Q29tbWl0LCAkd3JpdGVDaGFuZ2VMb2dzLCAkZGVsaW1pdGVycyk7CisgICAgZ2Vu ZXJhdGVOZXdDaGFuZ2VMb2dzKCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJl Z3Jlc3Npb25UZXN0cywgJHJlcXVpcmVzVGVzdHMsICRmdW5jdGlvbkxpc3RzLCAkYnVnTnVtYmVy LCAkYnVnVVJMLCAkYnVnRGVzY3JpcHRpb24sICRidWdSYWRhclVSTCwgJG5hbWUsICRlbWFpbEFk ZHJlc3MsICRnaXRSZXZpZXdlciwgJGdpdENvbW1pdCwgJHdyaXRlQ2hhbmdlTG9ncywgJGRlbGlt aXRlcnMsICRvbmx5RmlsZXMpOwogCiAgICAgaWYgKCR3cml0ZUNoYW5nZUxvZ3MpIHsKICAgICAg ICAgcHJpbnQgU1RERVJSICItLSBQbGVhc2UgcmVtZW1iZXIgdG8gaW5jbHVkZSBhIGRldGFpbGVk IGRlc2NyaXB0aW9uIGluIHlvdXIgQ2hhbmdlTG9nIGVudHJ5LiAtLVxuLS0gU2VlIDxodHRwOi8v d2Via2l0Lm9yZy9jb2RpbmcvY29udHJpYnV0aW5nLmh0bWw+IGZvciBtb3JlIGluZm8gLS1cbiI7 CkBAIC02MzEsOSArNjM0LDkgQEAgc3ViIHJlc29sdmVDb25mbGljdGVkQ2hhbmdlTG9ncygkKQog ICAgIGNsb3NlIFJFU09MVkU7CiB9CiAKLXN1YiBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJCQkJCQk JCQkJCQkJCQpCitzdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQkJCQkJCQpCiB7 Ci0gICAgbXkgKCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jlc3Npb25U ZXN0cywgJHJlcXVpcmVzVGVzdHMsICRmdW5jdGlvbkxpc3RzLCAkYnVnVVJMLCAkYnVnRGVzY3Jp cHRpb24sICRidWdSYWRhclVSTCwgJG5hbWUsICRlbWFpbEFkZHJlc3MsICRnaXRSZXZpZXdlciwg JGdpdENvbW1pdCwgJHdyaXRlQ2hhbmdlTG9ncywgJGRlbGltaXRlcnMpID0gQF87CisgICAgbXkg KCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jlc3Npb25UZXN0cywgJHJl cXVpcmVzVGVzdHMsICRmdW5jdGlvbkxpc3RzLCAkYnVnTnVtYmVyLCAkYnVnVVJMLCAkYnVnRGVz Y3JpcHRpb24sICRidWdSYWRhclVSTCwgJG5hbWUsICRlbWFpbEFkZHJlc3MsICRnaXRSZXZpZXdl ciwgJGdpdENvbW1pdCwgJHdyaXRlQ2hhbmdlTG9ncywgJGRlbGltaXRlcnMsICRvbmx5RmlsZXMp ID0gQF87CiAKICAgICBteSAkaGFzV2ViQ29yZUNoYW5nZSA9IDA7CiAgICAgZm9yZWFjaCBteSAk cHJlZml4IChAJHByZWZpeGVzKSB7CkBAIC02NzgsMTUgKzY4MSwxOSBAQCBzdWIgZ2VuZXJhdGVO ZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQkJCQkKQogICAgICAgICAgICAgaWYgISRidWdEZXNjcmlw dGlvbiAmJiAkZGVzY3JpcHRpb247CiAKICAgICAgICAgJGJ1Z0Rlc2NyaXB0aW9uID0gIk5lZWQg YSBzaG9ydCBkZXNjcmlwdGlvbiAoT09QUyEpLiIgdW5sZXNzICRidWdEZXNjcmlwdGlvbjsKLSAg ICAgICAgJGJ1Z1VSTCA9ICJOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuIiB1bmxlc3MgJGJ1Z1VS TDsKKyAgICAgICAgaWYgKCEkYnVnTnVtYmVyIHx8ICRidWdOdW1iZXIgIT0gLTEpIHsKKyAgICAg ICAgICAgICRidWdVUkwgPSAiTmVlZCB0aGUgYnVnIFVSTCAoT09QUyEpLiIgdW5sZXNzICRidWdV Ukw7CisgICAgICAgIH0KIAotICAgICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVF bmRpbmdzKCIgICAgICAgICRidWdEZXNjcmlwdGlvblxuIiwgJGVuZGwpIGlmICRidWdEZXNjcmlw dGlvbjsKLSAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAg ICAgICAkYnVnVVJMXG4iLCAkZW5kbCkgaWYgJGJ1Z1VSTDsKLSAgICAgICAgcHJpbnQgQ0hBTkdF X0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAkYnVnUmFkYXJVUkxcbiIsICRlbmRs KSBpZiAkYnVnUmFkYXJVUkw7Ci0gICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGlu ZUVuZGluZ3MoIlxuIiwgJGVuZGwpOworICAgICAgICBpZiAoISRvbmx5RmlsZXMpIHsKKyAgICAg ICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoIiAgICAgICAgJGJ1 Z0Rlc2NyaXB0aW9uXG4iLCAkZW5kbCkgaWYgJGJ1Z0Rlc2NyaXB0aW9uOworICAgICAgICAgICAg cHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAkYnVnVVJMXG4i LCAkZW5kbCkgaWYgJGJ1Z1VSTDsKKyAgICAgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFs aXplTGluZUVuZGluZ3MoIiAgICAgICAgJGJ1Z1JhZGFyVVJMXG4iLCAkZW5kbCkgaWYgJGJ1Z1Jh ZGFyVVJMOworICAgICAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5n cygiXG4iLCAkZW5kbCk7CiAKLSAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5l RW5kaW5ncygiICAgICAgICBSZXZpZXdlZCBieSAkcmV2aWV3ZXIuXG5cbiIsICRlbmRsKTsKLSAg ICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygkZGVzY3JpcHRpb24g LiAiXG4iLCAkZW5kbCkgaWYgJGRlc2NyaXB0aW9uOworICAgICAgICAgICAgcHJpbnQgQ0hBTkdF X0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICBSZXZpZXdlZCBieSAkcmV2aWV3ZXIu XG5cbiIsICRlbmRsKTsKKyAgICAgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGlu ZUVuZGluZ3MoJGRlc2NyaXB0aW9uIC4gIlxuIiwgJGVuZGwpIGlmICRkZXNjcmlwdGlvbjsKKyAg ICAgICAgfQogCiAgICAgICAgIG15ICRzaG91bGRNZW50aW9uVGVzdHMgPSBAJHJlcXVpcmVzVGVz dHM7CiAgICAgICAgICRzaG91bGRNZW50aW9uVGVzdHMgfD0gISRoYXNXZWJDb3JlQ2hhbmdlICYm IHVuaXhQYXRoKCRwcmVmaXgpID1+IG18L1dlYktpdC8kfDsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvY29tbWl0LWxvZy1lZGl0b3IgYi9Ub29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9y CmluZGV4IDcwMTVmYWRjYTdjYWY1Mjg1NTY2YmQ1MGMxZTZjNzM2ZDliZDljNWUuLjFhZjUyMzgz NmY2YjgzODdkZjI5OGUyMTkwZjA2OTk1MjVlYjBlYjUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvY29tbWl0LWxvZy1lZGl0b3IKKysrIGIvVG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRv cgpAQCAtNDcsNiArNDcsNyBAQCBzdWIgbm9ybWFsaXplTGluZUVuZGluZ3MoJCQpOwogc3ViIHBh dGNoQXV0aG9yc2hpcFN0cmluZygkJCQpOwogc3ViIHJlbW92ZUxvbmdlc3RDb21tb25QcmVmaXhF bmRpbmdJbk5ld2xpbmUoXCUpOwogc3ViIGlzQ29tbWl0TG9nRWRpdG9yKCQpOworc3ViIHByZXBh cmVDaGFuZ2VMb2coJCQkKTsKIAogbXkgJGVuZGwgPSAiXG4iOwogCkBAIC01NCw3ICs1NSwxMiBA QCBzdWIgcHJpbnRVc2FnZUFuZEV4aXQKIHsKICAgICBteSAkcHJvZ3JhbU5hbWUgPSBiYXNlbmFt ZSgkMCk7CiAgICAgcHJpbnQgU1RERVJSIDw8RU9GOwotVXNhZ2U6ICRwcm9ncmFtTmFtZSBbLS1y ZWdlbmVyYXRlLWxvZ10gPGxvZyBmaWxlPgorVXNhZ2U6ICRwcm9ncmFtTmFtZSBbLS1yZWdlbmVy YXRlLWxvZ10gWy0tdXBkYXRlLWZpbGUtbGlzdF0gWy1nIGNvbW1pdC1oYXNofC0tZ2l0LWNvbW1p dCBjb21taXQtaGFzaF1dIDxsb2cgZmlsZT4KKyAgICAgICAgIC0tdXBkYXRlLWZpbGUtbGlzdCBG aWxsIGluIHRoZSBDaGFuZ2VMb2cgYnVnIGluZm9ybWF0aW9uIGZyb20gdGhlIGdpdmVuIGJ1Zy4K KyAgICAgICAgIC1nfC0tZ2l0LWNvbW1pdCAgICBQYXNzIHRoZSBjb21taXQgaGFzaCBhcyByZWZl cmVuY2UgdG8gZ2VuZXJhdGUgdGhlIGxpc3Qgb2YgY2hhbmdlZCBmaWxlcy9mdW5jdGlvbnMuCisg ICAgICAgICAtLWRlc2NyaXB0aW9uICAgICAgT25lLWxpbmUgZGVzY3JpcHRpb24gdGhhdCBtYXRj aGVzIHRoZSBidWcgdGl0bGUuCisgICAgICAgICAtLW5vLWJ1ZyAgICAgICAgICAgU2tpcCBnZW5l cmF0aW9uIG9mIHRoZSBsaW5lIGZvciB0aGUgYnVnIHJlZmVyZW5jZS4KKwogICAgICAgICRwcm9n cmFtTmFtZSAtLXByaW50LWxvZyA8Q2hhbmdlTG9nIGZpbGU+IFs8Q2hhbmdlTG9nIGZpbGU+Li4u XQogICAgICAgICRwcm9ncmFtTmFtZSAtLWhlbHAKIEVPRgpAQCAtNjQsMTEgKzcwLDE5IEBAIEVP RgogbXkgJGhlbHAgPSAwOwogbXkgJHByaW50TG9nID0gMDsKIG15ICRyZWdlbmVyYXRlTG9nID0g MDsKK215ICR1cGRhdGVGaWxlTGlzdCA9IDA7CitteSAkZ2l0Q29tbWl0ID0gMDsKK215ICRkZXNj cmlwdGlvbiA9IDA7CitteSAkbm9CdWcgPSAwOwogCiBteSAkZ2V0T3B0aW9uc1Jlc3VsdCA9IEdl dE9wdGlvbnMoCiAgICAgJ2hlbHAnID0+IFwkaGVscCwKICAgICAncHJpbnQtbG9nJyA9PiBcJHBy aW50TG9nLAogICAgICdyZWdlbmVyYXRlLWxvZycgPT4gXCRyZWdlbmVyYXRlTG9nLAorICAgICd1 cGRhdGUtZmlsZS1saXN0JyA9PiBcJHVwZGF0ZUZpbGVMaXN0LAorICAgICdnaXQtY29tbWl0fGc6 cycgPT4gXCRnaXRDb21taXQsCisgICAgJ2Rlc2NyaXB0aW9uOnMnID0+IFwkZGVzY3JpcHRpb24s CisgICAgJ25vLWJ1ZycgPT4gXCRub0J1ZywKICk7CiAKIGlmICghJGdldE9wdGlvbnNSZXN1bHQg fHwgJGhlbHApIHsKQEAgLTE2MSw3ICsxNzUsMTAgQEAgd2hpbGUgKG15ICRjdXJMaW5lID0gPExP Rz4pIHsKIH0KIGNsb3NlIExPRzsKIAotQGNoYW5nZUxvZ3MgPSBtYXAgeyAkRU5We0dJVF9QUkVG SVh9IC4gJF8gfSBAY2hhbmdlTG9ncyBpZiBpc0dpdCgpOworbXkgJGdpdF9wcmVmaXggPSAkRU5W e0dJVF9QUkVGSVh9OworaWYgKCRnaXRfcHJlZml4KSB7CisgICAgQGNoYW5nZUxvZ3MgPSBtYXAg eyAkZ2l0X3ByZWZpeCAuICRfIH0gQGNoYW5nZUxvZ3MgaWYgaXNHaXQoKTsKK30KIAogIyBXZSB3 YW50IHRvIG1hdGNoIHRoZSBsaW5lIGVuZGluZ3Mgb2YgdGhlIGV4aXN0aW5nIGxvZyBmaWxlIGlu IGNhc2UgdGhleSdyZQogIyBkaWZmZXJlbnQgZnJvbSBwZXJsJ3MgbGluZSBlbmRpbmdzLgpAQCAt MTc3LDcgKzE5NCw3IEBAIGlmICgkcmVnZW5lcmF0ZUxvZyAmJiAkZXhpc3RpbmdMb2cgJiYgc2Nh bGFyKEBjaGFuZ2VMb2dzKSA+IDAgJiYgbG9hZFRlcm1SZWFkS2V5CiB9CiAKICMgRG9uJ3QgY2hh bmdlIGFueXRoaW5nIGlmIHRoZXJlJ3MgYWxyZWFkeSBhIGxvZyBtZXNzYWdlIChhcyBjYW4gaGFw cGVuIHdpdGggZ2l0LWNvbW1pdCAtLWFtZW5kKS4KLWV4ZWMgKEBlZGl0b3IsIEBBUkdWKSBpZiAk ZXhpc3RpbmdMb2cgJiYgJGtlZXBFeGlzdGluZ0xvZzsKK2V4ZWMgKEBlZGl0b3IsIEBBUkdWKSBp ZiAkZXhpc3RpbmdMb2cgJiYgJGtlZXBFeGlzdGluZ0xvZyAmJiAhJHVwZGF0ZUZpbGVMaXN0Owog CiBteSAkZmlyc3QgPSAxOwogb3BlbiBORVdMT0csICI+JGxvZy5lZGl0IiBvciBkaWU7CkBAIC0x ODgsMzkgKzIwNSwzMiBAQCBpZiAoaXNHaXQoKSAmJiBAY2hhbmdlTG9ncyA9PSAwKSB7CiAgICAg aWYgKCR3ZWJraXRHZW5lcmF0ZUNvbW1pdE1lc3NhZ2UgZXEgIiIpIHsKICAgICAgICAgY2hvbXAo JHdlYmtpdEdlbmVyYXRlQ29tbWl0TWVzc2FnZSA9IGBnaXQgY29uZmlnIC0tYm9vbCBjb3JlLndl YmtpdEdlbmVyYXRlQ29tbWl0TWVzc2FnZWApOwogICAgIH0KLSAgICBpZiAoJHdlYmtpdEdlbmVy YXRlQ29tbWl0TWVzc2FnZSBuZSAiZmFsc2UiKSB7Ci0gICAgICAgIG15ICVjaGFuZ2VMb2dTb3J0 OwotICAgICAgICBteSAlY2hhbmdlTG9nQ29udGVudHM7Ci0gICAgICAgIG9wZW4gbXkgJGNoYW5n ZUxvZ0VudHJpZXMsICItfCIsICIkRmluZEJpbjo6QmluL3ByZXBhcmUtQ2hhbmdlTG9nIC0tZ2l0 LWluZGV4IC0tbm8td3JpdGUgLS1uby1zdHlsZSAtLWRlbGltaXRlcnMiIG9yIGRpZSAicHJlcGFy ZS1DaGFuZ2VMb2cgZmFpbGVkOiAkIS5cbiI7Ci0KLSAgICAgICAgd2hpbGUgKCFlb2YoJGNoYW5n ZUxvZ0VudHJpZXMpKSB7Ci0gICAgICAgICAgICBteSAkbGFiZWwgPSA8JGNoYW5nZUxvZ0VudHJp ZXM+OwotICAgICAgICAgICAgY2hvbXAgJGxhYmVsOwotICAgICAgICAgICAgJGxhYmVsID1+IHMv OiQvLzsKLSAgICAgICAgICAgICgkY2hhbmdlTG9nQ29udGVudHN7JGxhYmVsfSkgPSBjb21taXRN ZXNzYWdlRnJvbUNoYW5nZUxvZ0VudHJ5KCRjaGFuZ2VMb2dFbnRyaWVzKTsKLSAgICAgICAgICAg ICRjaGFuZ2VMb2dTb3J0e3NvcnRLZXkoJGxhYmVsKX0gPSAkbGFiZWw7Ci0gICAgICAgIH0KLSAg ICAgICAgY2xvc2UgJGNoYW5nZUxvZ0VudHJpZXM7Ci0KLSAgICAgICAgbXkgJGNvbW1vblByZWZp eCA9IHJlbW92ZUxvbmdlc3RDb21tb25QcmVmaXhFbmRpbmdJbk5ld2xpbmUoJWNoYW5nZUxvZ0Nv bnRlbnRzKTsKLQotICAgICAgICBteSBAcmVzdWx0OwotICAgICAgICBwdXNoIEByZXN1bHQsIG5v cm1hbGl6ZUxpbmVFbmRpbmdzKCRjb21tb25QcmVmaXgsICRlbmRsKTsKLSAgICAgICAgZm9yIG15 ICRzb3J0S2V5IChzb3J0IGtleXMgJWNoYW5nZUxvZ1NvcnQpIHsKLSAgICAgICAgICAgIG15ICRs YWJlbCA9ICRjaGFuZ2VMb2dTb3J0eyRzb3J0S2V5fTsKLSAgICAgICAgICAgIG5leHQgaWYgKCRj aGFuZ2VMb2dDb250ZW50c3skbGFiZWx9IGVxICJcbiIpOwotICAgICAgICAgICAgaWYgKGtleXMg JWNoYW5nZUxvZ1NvcnQgPiAxKSB7Ci0gICAgICAgICAgICAgICAgcHVzaCBAcmVzdWx0LCBub3Jt YWxpemVMaW5lRW5kaW5ncygiXG4iLCAkZW5kbCk7Ci0gICAgICAgICAgICAgICAgcHVzaCBAcmVz dWx0LCBub3JtYWxpemVMaW5lRW5kaW5ncygiJGxhYmVsOiAiLCAkZW5kbCk7Ci0gICAgICAgICAg ICB9Ci0gICAgICAgICAgICBwdXNoIEByZXN1bHQsIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCRjaGFu Z2VMb2dDb250ZW50c3skbGFiZWx9LCAkZW5kbCk7CisKKyAgICBpZiAoJHJlZ2VuZXJhdGVMb2cg JiYgJHVwZGF0ZUZpbGVMaXN0ICYmICRleGlzdGluZ0xvZykgeworICAgICAgICBvcGVuIExPRywg JGxvZyBvciBkaWUgIkNvdWxkIG5vdCBvcGVuIHRoZSBsb2cgZmlsZS4iOworICAgICAgICB3aGls ZSAobXkgJGN1ckxpbmUgPSA8TE9HPikgeworICAgICAgICAgICAgcHJpbnQgTkVXTE9HICIkY3Vy TGluZSI7CiAgICAgICAgIH0KIAotICAgICAgICBwcmludCBORVdMT0cgam9pbiAnJywgQHJlc3Vs dDsKKyAgICAgICAgcHJpbnQgTkVXTE9HICJcbiI7CisgICAgICAgIHByaW50IE5FV0xPRyAiIyAt LS0tLS0tLS0gVXBkYXRlZCBmaWxlcyBjaGFuZ2VzIC0tLS0tLS0tLVxuIjsKKyAgICAgICAgcHJp bnQgTkVXTE9HICIjIFBsZWFzZSBtZXJnZSB0aGUgbGlzdCBvZiBjaGFuZ2VzIGJlbG93IHdpdGgg dGhlIGNvbW1pdCBtZXNzYWdlIGFib3ZlLlxuIjsKKyAgICAgICAgcHJpbnQgTkVXTE9HICJcbiI7 CisKKyAgICAgICAgaWYgKCR3ZWJraXRHZW5lcmF0ZUNvbW1pdE1lc3NhZ2UgbmUgImZhbHNlIikg eworICAgICAgICAgICAgbXkgQHJlc3VsdCA9IHByZXBhcmVDaGFuZ2VMb2coMSwgJGdpdENvbW1p dCwgJGRlc2NyaXB0aW9uKTsKKyAgICAgICAgICAgIHByaW50IE5FV0xPRyBqb2luICcnLCBAcmVz dWx0OworICAgICAgICB9CisgICAgfSBlbHNlIHsKKyAgICAgICAgaWYgKCR3ZWJraXRHZW5lcmF0 ZUNvbW1pdE1lc3NhZ2UgbmUgImZhbHNlIikgeworICAgICAgICAgICAgbXkgQHJlc3VsdCA9IHBy ZXBhcmVDaGFuZ2VMb2coMCwgJGdpdENvbW1pdCwgJGRlc2NyaXB0aW9uKTsKKyAgICAgICAgICAg IHByaW50IE5FV0xPRyBqb2luICcnLCBAcmVzdWx0OworICAgICAgICB9CiAgICAgfQogfSBlbHNl IHsKICAgICBwcmludCBORVdMT0cgY3JlYXRlQ29tbWl0TWVzc2FnZShAY2hhbmdlTG9ncyk7CiB9 CisKIHByaW50IE5FV0xPRyAkbG9nQ29udGVudHM7CiBjbG9zZSBORVdMT0c7CiAKQEAgLTI0NSw2 ICsyNTUsNTIgQEAgaWYgKCRmb3VuZENvbW1lbnQpIHsKIAogdW5saW5rICIkbG9nLmVkaXQiOwog CitzdWIgcHJlcGFyZUNoYW5nZUxvZygkJCQpCit7CisgICAgbXkgKCRvbmx5RmlsZXNDaGFuZ2Vz LCAkZ2l0Q29tbWl0LCAkZGVzY3JpcHRpb24pID0gQF87CisgICAgbXkgJWNoYW5nZUxvZ1NvcnQ7 CisgICAgbXkgJWNoYW5nZUxvZ0NvbnRlbnRzOworICAgIG15ICRleHRyYVBhcmFtZXRlcnMgPSAn LS1naXQtaW5kZXgnOworICAgIGlmICgkZ2l0Q29tbWl0KSB7CisgICAgICAgICRleHRyYVBhcmFt ZXRlcnMgPSAiLWcgJGdpdENvbW1pdCIKKyAgICB9CisgICAgaWYgKCRvbmx5RmlsZXNDaGFuZ2Vz KSB7CisgICAgICAgICRleHRyYVBhcmFtZXRlcnMgLj0gIiAtLW9ubHktZmlsZXMiCisgICAgfQor ICAgIGlmICgkZGVzY3JpcHRpb24pIHsKKyAgICAgICAgJGV4dHJhUGFyYW1ldGVycyAuPSAiIC0t ZGVzY3JpcHRpb24gXFEkZGVzY3JpcHRpb24iOworICAgIH0KKyAgICBpZiAoJG5vQnVnKSB7Cisg ICAgICAgICRleHRyYVBhcmFtZXRlcnMgLj0gIiAtLWJ1ZyAtMSI7CisgICAgfQorICAgIG9wZW4g bXkgJGNoYW5nZUxvZ0VudHJpZXMsICItfCIsICIkRmluZEJpbjo6QmluL3ByZXBhcmUtQ2hhbmdl TG9nIC0tbm8td3JpdGUgLS1uby1zdHlsZSAtLWRlbGltaXRlcnMgJGV4dHJhUGFyYW1ldGVycyIg b3IgZGllICJwcmVwYXJlLUNoYW5nZUxvZyBmYWlsZWQ6ICQhLlxuIjsKKworICAgIHdoaWxlICgh ZW9mKCRjaGFuZ2VMb2dFbnRyaWVzKSkgeworICAgICAgICBteSAkbGFiZWwgPSA8JGNoYW5nZUxv Z0VudHJpZXM+OworICAgICAgICBjaG9tcCAkbGFiZWw7CisgICAgICAgICRsYWJlbCA9fiBzLzok Ly87CisgICAgICAgICgkY2hhbmdlTG9nQ29udGVudHN7JGxhYmVsfSkgPSBjb21taXRNZXNzYWdl RnJvbUNoYW5nZUxvZ0VudHJ5KCRjaGFuZ2VMb2dFbnRyaWVzKTsKKyAgICAgICAgJGNoYW5nZUxv Z1NvcnR7c29ydEtleSgkbGFiZWwpfSA9ICRsYWJlbDsKKyAgICB9CisgICAgY2xvc2UgJGNoYW5n ZUxvZ0VudHJpZXM7CisKKyAgICBteSAkY29tbW9uUHJlZml4ID0gcmVtb3ZlTG9uZ2VzdENvbW1v blByZWZpeEVuZGluZ0luTmV3bGluZSglY2hhbmdlTG9nQ29udGVudHMpOworCisgICAgbXkgQHJl c3VsdDsKKyAgICBwdXNoIEByZXN1bHQsIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCRjb21tb25QcmVm aXgsICRlbmRsKTsKKyAgICBmb3IgbXkgJHNvcnRLZXkgKHNvcnQga2V5cyAlY2hhbmdlTG9nU29y dCkgeworICAgICAgICBteSAkbGFiZWwgPSAkY2hhbmdlTG9nU29ydHskc29ydEtleX07CisgICAg ICAgIG5leHQgaWYgKCRjaGFuZ2VMb2dDb250ZW50c3skbGFiZWx9IGVxICJcbiIpOworICAgICAg ICBpZiAoa2V5cyAlY2hhbmdlTG9nU29ydCA+IDEpIHsKKyAgICAgICAgICAgIHB1c2ggQHJlc3Vs dCwgbm9ybWFsaXplTGluZUVuZGluZ3MoIlxuIiwgJGVuZGwpOworICAgICAgICAgICAgcHVzaCBA cmVzdWx0LCBub3JtYWxpemVMaW5lRW5kaW5ncygiJGxhYmVsOiAiLCAkZW5kbCk7CisgICAgICAg IH0KKyAgICAgICAgcHVzaCBAcmVzdWx0LCBub3JtYWxpemVMaW5lRW5kaW5ncygkY2hhbmdlTG9n Q29udGVudHN7JGxhYmVsfSwgJGVuZGwpOworICAgIH0KKworICAgIHJldHVybiBAcmVzdWx0Owor fQorCiBzdWIgY29tbWl0TWVzc2FnZUZyb21DaGFuZ2VMb2dFbnRyeSgkKQogewogICAgIG15ICgk Y2hhbmdlTG9nKSA9IEBfOwo= 437969 2021-09-11 16:18:06 -0700 2021-09-13 15:49:27 -0700 Patch bug-230195-20210911161806.patch text/plain 14523 dvh U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMzA2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjViZTE1NGJhMzhmMmJjMTk3NmNlOTk0ZDljZTllYmZk ZDcyMGY3OC4uOWRlOTBiZGJkMTY0MWMwNWE0Njg0ZjFmNjU4ZTA0NGFhNWZhNzY5NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4 IEBACisyMDIxLTA5LTExICBIb2EgRGluaCAgPGR2aEBhcHBsZS5jb20+CisKKyAgICAgICAgUHJv dmlkZSBhIHdheSB0byB1cGRhdGUgdGhlIGNvbW1pdCBtZXNzYWdlIHdpdGggYW4gdXBkYXRlZCBs aXN0IG9mIGNoYW5nZWQgZmlsZXMvZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAxOTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBuZXcgcGFyYW1ldGVycyB0byBjb21taXQtbG9n LWVkaXRvcjoKKyAgICAgICAgLS11cGRhdGUtZmlsZS1saXN0OiB0byB0ZWxsIGNvbW1pdC1sb2ct ZWRpdG9yIHRvIGFwcGVuZCB0aGUgZ2VuZXJhdGVkIGxpc3Qgb2YgY2hhbmdlZCBmaWxlcy9mdW5j dGlvbnMKKyAgICAgICAgYXQgdGhlIGJvdHRvbSBvZiB0aGUgZWRpdGVkIGZpbGUKKyAgICAgICAg LS1naXQtY29tbWl0Ly1nOiB0byB0ZWxsIHdoaWNoIGNvbW1pdCB0byB1c2UgdG8gZ2VuZXJhdGUg dGhlIGxpc3Qgb2YgY2hhbmdlZCBmaWxlcy9mdW5jdGlvbnMuCisgICAgICAgIC0tZGVzY3JpcHRp b246IHdoZW4gZ2VuZXJhdGluZyB0aGUgaW5pdGlhbCB0ZW1wbGF0ZSBmb3IgdGhlIGNvbW1pdCBt ZXNzYWdlLCB3ZSBjYW4gc3BlY2lmeSB0aGUKKyAgICAgICAgdG9wIGxpbmUgb2YgdGhlIGNvbW1p dCBtZXNzYWdlIHZpYSB0aGlzIHBhcmFtZXRlci4KKyAgICAgICAgLS1uby1idWc6IHByb3ZpZGVz IGEgd2F5IHRvIHNraXAgZ2VuZXJhdGlvbiBvZiB0aGUgbGluZSAiTmVlZCB0aGUgYnVnIFVSTCAo T09QUyEpLiIuCisKKyAgICAgICAgKiBTY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9yOgorICAgICAg ICAtIFdlIGFkZCB0aGUgbmV3IGxpc3Qgb2YgcGFyYW1ldGVycy4KKyAgICAgICAgLSBXZSBmaXgg dGhlIHdhcm5pbmcgd2hlbiAkRU5We0dJVF9QUkVGSVh9IHdhcyB1bmRlZmluZWQgb3IgYW4gZW1w dHkgc3RyaW5nLgorICAgICAgICAtIEluIGNhc2UgLS11cGRhdGUtZmlsZS1saXN0IGlzIHBhc3Nl ZCwgd2UgZ2VuZXJhdGUgdGhlIHVwZGF0ZWQgbGlzdCBvZiBjaGFuZ2VkIGZpbGVzL2Z1bmN0aW9u cworICAgICAgICAgIGF0IHRoZSBib3R0b20gb2YgdGhlIGNvbW1pdCBtZXNzYWdlLgorCisgICAg ICAgIChwcmludFVzYWdlQW5kRXhpdCk6CisgICAgICAgIEFkZGVkIGhlbHAgZm9yIHRoZSBuZXcg cGFyYW1ldGVycy4KKworICAgICAgICAocHJlcGFyZUNoYW5nZUxvZyk6CisgICAgICAgIFdlIG1v dmUgdGhlIGNvZGUgdG8gY2FsbCBwcmVwYXJlLUNoYW5nZUxvZyBhbmQgcHJlcGFyZSB0aGUgcmVz dWx0IGluIGEgc2VwYXJhdGUgZnVuY3Rpb24uCisKKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUt Q2hhbmdlTG9nOgorICAgICAgICBXZSBhZGQgYSBuZXcgcGFyYW1ldGVyIC0tb25seS1maWxlcyB0 byByZXF1ZXN0IGdlbmVyYXRpb24gb2Ygb25seSB0aGUgcGFydCBvZiB0aGUgY2hhbmdlZCBmaWxl cy9mdW5jdGlvbnMuCisgICAgICAgIElmIC0xIGlzIHBhc3NlZCBhcyBhIHZhbHVlIGZvciAtLWJ1 ZywgaXQgd29uJ3QgZ2VuZXJhdGUgdGhlIHRlbXBsYXRlIGxpbmUgZm9yIHRoZSBidWcgbnVtYmVy LgorCisgICAgICAgIChtYWluKToKKyAgICAgICAgKGdlbmVyYXRlTmV3Q2hhbmdlTG9ncyk6Cisg ICAgICAgIEFkZGVkIHBhcmFtZXRlciAkYnVnTnVtYmVyICYgJG9ubHlGaWxlcyB0byBjaGFuZ2Ug dGhlIGJlaGF2aW9yIG9mIGNvbW1pdCBtZXNzYWdlIGdlbmVyYXRpb24uCisKIDIwMjEtMDktMTAg IENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgbmF2 aWdhdGlvbiByZXBvcnRpbmcgZm9yIENyb3NzLU9yaWdpbi1PcGVuZXItUG9saWN5CmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9vbHMvU2NyaXB0cy9wcmVw YXJlLUNoYW5nZUxvZwppbmRleCBiNzRjOWZmOTZkZjJhMjc1NjIzOWQ1YWQzMTZkOTcyYWI0ZDc1 Yzc3Li5jZjRiYmJiODQ3YmFkZDc5YjkzYmNmY2FiN2U3OWFhYzIwNzIxY2UxIDEwMDc1NQotLS0g YS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL1NjcmlwdHMvcHJl cGFyZS1DaGFuZ2VMb2cKQEAgLTg0LDcgKzg0LDcgQEAgc3ViIGZpbmRDaGFuZ2VMb2dzKCQkKTsK IHN1YiBmaW5kT3JpZ2luYWxGaWxlRnJvbVN2bigkKTsKIHN1YiBnZW5lcmF0ZUZpbGVMaXN0KFwl JCQkXCUpOwogc3ViIGdlbmVyYXRlRnVuY3Rpb25MaXN0cygkJCQkJCk7Ci1zdWIgZ2VuZXJhdGVO ZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQkJCQkKTsKK3N1YiBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3Mo JCQkJCQkJCQkJCQkJCQkJCk7CiBzdWIgZ2V0TGF0ZXN0Q2hhbmdlTG9ncygkKTsKIHN1YiBnZXRf ZnVuY3Rpb25fbGluZV9yYW5nZXMoJCQpOwogc3ViIGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19m b3JfY3BwKCQkKTsKQEAgLTE0NSw2ICsxNDUsNyBAQCBzdWIgbWFpbigpCiAgICAgbXkgJHNob3dI ZWxwID0gMDsKICAgICBteSAkc3Bld0RpZmYgPSAkRU5WeyJQUkVQQVJFX0NIQU5HRUxPR19ESUZG In07CiAgICAgbXkgJHVwZGF0ZUNoYW5nZUxvZ3MgPSAxOworICAgIG15ICRvbmx5RmlsZXMgPSAw OwogICAgIG15ICRwYXJzZU9wdGlvbnNSZXN1bHQgPQogICAgICAgICBHZXRPcHRpb25zKCJkaWZm fGQhIiA9PiBcJHNwZXdEaWZmLAogICAgICAgICAgICAgICAgICAgICJidWd8YjppIiA9PiBcJGJ1 Z051bWJlciwKQEAgLTE2MCw3ICsxNjEsOCBAQCBzdWIgbWFpbigpCiAgICAgICAgICAgICAgICAg ICAgInN0eWxlISIgPT4gXCRjaGVja1dlYktpdFN0eWxlLAogICAgICAgICAgICAgICAgICAgICJv cGVufG8hIiA9PiBcJG9wZW5DaGFuZ2VMb2dzLAogICAgICAgICAgICAgICAgICAgICJ3cml0ZSEi ID0+IFwkd3JpdGVDaGFuZ2VMb2dzLAotICAgICAgICAgICAgICAgICAgICJ1cGRhdGUhIiA9PiBc JHVwZGF0ZUNoYW5nZUxvZ3MpOworICAgICAgICAgICAgICAgICAgICJ1cGRhdGUhIiA9PiBcJHVw ZGF0ZUNoYW5nZUxvZ3MsCisgICAgICAgICAgICAgICAgICAgIm9ubHktZmlsZXMiID0+IFwkb25s eUZpbGVzKTsKICAgICBpZiAoISRwYXJzZU9wdGlvbnNSZXN1bHQgfHwgJHNob3dIZWxwKSB7CiAg ICAgICAgIHByaW50IFNUREVSUiBiYXNlbmFtZSgkMCkgLiAiIFstYnwtLWJ1Zz08YnVnaWQ+XSBb LWR8LS1kaWZmXSBbLWh8LS1oZWxwXSBbLW98LS1vcGVuXSBbLWd8LS1naXQtY29tbWl0PTxjb21t aXR0aXNoPl0gWy0tZ2l0LXJldmlld2VyPTxuYW1lPl0gW3N2bmRpcjEgW3N2bmRpcjIgLi4uXV1c biI7CiAgICAgICAgIHByaW50IFNUREVSUiAiICAtYnwtLWJ1ZyAgICAgICAgRmlsbCBpbiB0aGUg Q2hhbmdlTG9nIGJ1ZyBpbmZvcm1hdGlvbiBmcm9tIHRoZSBnaXZlbiBidWcuXG4iOwpAQCAtMTc4 LDYgKzE4MCw3IEBAIHN1YiBtYWluKCkKICAgICAgICAgcHJpbnQgU1RERVJSICIgIC0tW25vLV13 cml0ZSAgICBXcml0ZSBDaGFuZ2VMb2dzIHRvIGRpc2sgKG90aGVyd2lzZSBzZW5kIG5ldyBlbnRy aWVzIHRvIHN0ZG91dCkgKGRlZmF1bHQ6IHdyaXRlKVxuIjsKICAgICAgICAgcHJpbnQgU1RERVJS ICIgIC0tZGVsaW1pdGVycyAgICBXaGVuIHdyaXRpbmcgdG8gc3Rkb3V0LCBsYWJlbCBhbmQgcHJp bnQgYSBcIn5cIiBhZnRlciBlYWNoIGVudHJ5XG4iOwogICAgICAgICBwcmludCBTVERFUlIgIiAg LS1lbWFpbD0gICAgICAgIFNwZWNpZnkgdGhlIGVtYWlsIGFkZHJlc3MgdG8gYmUgdXNlZCBpbiB0 aGUgcGF0Y2hcbiI7CisgICAgICAgIHByaW50IFNUREVSUiAiICAtLW9ubHktZmlsZXMgICAgR2Vu ZXJhdGUgb25seSB0aGUgZmlsZXMgY2hhbmdlcy5cbiI7CiAgICAgICAgIHJldHVybiAxOwogICAg IH0KIApAQCAtMjE4LDExICsyMjEsMTEgQEAgc3ViIG1haW4oKQogICAgICRuYW1lID1+IHMvXCgu Kj9cKVxzKiQvL2c7CiAKICAgICBteSAkYnVnVVJMOwotICAgIGlmICgkYnVnTnVtYmVyKSB7Cisg ICAgaWYgKCRidWdOdW1iZXIgJiYgJGJ1Z051bWJlciAhPSAtMSkgewogICAgICAgICAkYnVnVVJM ID0gImh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0kYnVnTnVtYmVyIjsK ICAgICB9CiAKLSAgICBpZiAoJGJ1Z051bWJlciAmJiAhJGJ1Z0Rlc2NyaXB0aW9uKSB7CisgICAg aWYgKCRidWdOdW1iZXIgJiYgISRidWdEZXNjcmlwdGlvbiAmJiAkYnVnTnVtYmVyICE9IC0xKSB7 CiAgICAgICAgIG15ICRidWdYTUxEYXRhID0gZmV0Y2hCdWdYTUxEYXRhKCRidWdVUkwsICRidWdO dW1iZXIpOwogICAgICAgICAkYnVnRGVzY3JpcHRpb24gPSBmZXRjaEJ1Z0Rlc2NyaXB0aW9uRnJv bUJ1Z1hNTERhdGEoJGJ1Z1VSTCwgJGJ1Z051bWJlciwgJGJ1Z1hNTERhdGEpOwogICAgICAgICAk YnVnUmFkYXJVUkwgPSBmZXRjaFJhZGFyVVJMRnJvbUJ1Z1hNTERhdGEoJGJ1Z051bWJlciwgJGJ1 Z1hNTERhdGEpOwpAQCAtMjM3LDcgKzI0MCw3IEBAIHN1YiBtYWluKCkKICAgICAgICAgcmVzb2x2 ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCRjaGFuZ2VMb2dzKTsKICAgICB9CiAKLSAgICBnZW5lcmF0 ZU5ld0NoYW5nZUxvZ3MoJHByZWZpeGVzLCAkZmlsZXNJbkNoYW5nZUxvZywgJGFkZGVkUmVncmVz c2lvblRlc3RzLCAkcmVxdWlyZXNUZXN0cywgJGZ1bmN0aW9uTGlzdHMsICRidWdVUkwsICRidWdE ZXNjcmlwdGlvbiwgJGJ1Z1JhZGFyVVJMLCAkbmFtZSwgJGVtYWlsQWRkcmVzcywgJGdpdFJldmll d2VyLCAkZ2l0Q29tbWl0LCAkd3JpdGVDaGFuZ2VMb2dzLCAkZGVsaW1pdGVycyk7CisgICAgZ2Vu ZXJhdGVOZXdDaGFuZ2VMb2dzKCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJl Z3Jlc3Npb25UZXN0cywgJHJlcXVpcmVzVGVzdHMsICRmdW5jdGlvbkxpc3RzLCAkYnVnTnVtYmVy LCAkYnVnVVJMLCAkYnVnRGVzY3JpcHRpb24sICRidWdSYWRhclVSTCwgJG5hbWUsICRlbWFpbEFk ZHJlc3MsICRnaXRSZXZpZXdlciwgJGdpdENvbW1pdCwgJHdyaXRlQ2hhbmdlTG9ncywgJGRlbGlt aXRlcnMsICRvbmx5RmlsZXMpOwogCiAgICAgaWYgKCR3cml0ZUNoYW5nZUxvZ3MpIHsKICAgICAg ICAgcHJpbnQgU1RERVJSICItLSBQbGVhc2UgcmVtZW1iZXIgdG8gaW5jbHVkZSBhIGRldGFpbGVk IGRlc2NyaXB0aW9uIGluIHlvdXIgQ2hhbmdlTG9nIGVudHJ5LiAtLVxuLS0gU2VlIDxodHRwOi8v d2Via2l0Lm9yZy9jb2RpbmcvY29udHJpYnV0aW5nLmh0bWw+IGZvciBtb3JlIGluZm8gLS1cbiI7 CkBAIC02MzEsOSArNjM0LDkgQEAgc3ViIHJlc29sdmVDb25mbGljdGVkQ2hhbmdlTG9ncygkKQog ICAgIGNsb3NlIFJFU09MVkU7CiB9CiAKLXN1YiBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJCQkJCQk JCQkJCQkJCQpCitzdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQkJCQkJCQpCiB7 Ci0gICAgbXkgKCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jlc3Npb25U ZXN0cywgJHJlcXVpcmVzVGVzdHMsICRmdW5jdGlvbkxpc3RzLCAkYnVnVVJMLCAkYnVnRGVzY3Jp cHRpb24sICRidWdSYWRhclVSTCwgJG5hbWUsICRlbWFpbEFkZHJlc3MsICRnaXRSZXZpZXdlciwg JGdpdENvbW1pdCwgJHdyaXRlQ2hhbmdlTG9ncywgJGRlbGltaXRlcnMpID0gQF87CisgICAgbXkg KCRwcmVmaXhlcywgJGZpbGVzSW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jlc3Npb25UZXN0cywgJHJl cXVpcmVzVGVzdHMsICRmdW5jdGlvbkxpc3RzLCAkYnVnTnVtYmVyLCAkYnVnVVJMLCAkYnVnRGVz Y3JpcHRpb24sICRidWdSYWRhclVSTCwgJG5hbWUsICRlbWFpbEFkZHJlc3MsICRnaXRSZXZpZXdl ciwgJGdpdENvbW1pdCwgJHdyaXRlQ2hhbmdlTG9ncywgJGRlbGltaXRlcnMsICRvbmx5RmlsZXMp ID0gQF87CiAKICAgICBteSAkaGFzV2ViQ29yZUNoYW5nZSA9IDA7CiAgICAgZm9yZWFjaCBteSAk cHJlZml4IChAJHByZWZpeGVzKSB7CkBAIC02NzgsMTUgKzY4MSwxOSBAQCBzdWIgZ2VuZXJhdGVO ZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQkJCQkKQogICAgICAgICAgICAgaWYgISRidWdEZXNjcmlw dGlvbiAmJiAkZGVzY3JpcHRpb247CiAKICAgICAgICAgJGJ1Z0Rlc2NyaXB0aW9uID0gIk5lZWQg YSBzaG9ydCBkZXNjcmlwdGlvbiAoT09QUyEpLiIgdW5sZXNzICRidWdEZXNjcmlwdGlvbjsKLSAg ICAgICAgJGJ1Z1VSTCA9ICJOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuIiB1bmxlc3MgJGJ1Z1VS TDsKKyAgICAgICAgaWYgKCEkYnVnTnVtYmVyIHx8ICRidWdOdW1iZXIgIT0gLTEpIHsKKyAgICAg ICAgICAgICRidWdVUkwgPSAiTmVlZCB0aGUgYnVnIFVSTCAoT09QUyEpLiIgdW5sZXNzICRidWdV Ukw7CisgICAgICAgIH0KIAotICAgICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVF bmRpbmdzKCIgICAgICAgICRidWdEZXNjcmlwdGlvblxuIiwgJGVuZGwpIGlmICRidWdEZXNjcmlw dGlvbjsKLSAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAg ICAgICAkYnVnVVJMXG4iLCAkZW5kbCkgaWYgJGJ1Z1VSTDsKLSAgICAgICAgcHJpbnQgQ0hBTkdF X0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAkYnVnUmFkYXJVUkxcbiIsICRlbmRs KSBpZiAkYnVnUmFkYXJVUkw7Ci0gICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGlu ZUVuZGluZ3MoIlxuIiwgJGVuZGwpOworICAgICAgICBpZiAoISRvbmx5RmlsZXMpIHsKKyAgICAg ICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoIiAgICAgICAgJGJ1 Z0Rlc2NyaXB0aW9uXG4iLCAkZW5kbCkgaWYgJGJ1Z0Rlc2NyaXB0aW9uOworICAgICAgICAgICAg cHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAkYnVnVVJMXG4i LCAkZW5kbCkgaWYgJGJ1Z1VSTDsKKyAgICAgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFs aXplTGluZUVuZGluZ3MoIiAgICAgICAgJGJ1Z1JhZGFyVVJMXG4iLCAkZW5kbCkgaWYgJGJ1Z1Jh ZGFyVVJMOworICAgICAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5n cygiXG4iLCAkZW5kbCk7CiAKLSAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5l RW5kaW5ncygiICAgICAgICBSZXZpZXdlZCBieSAkcmV2aWV3ZXIuXG5cbiIsICRlbmRsKTsKLSAg ICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygkZGVzY3JpcHRpb24g LiAiXG4iLCAkZW5kbCkgaWYgJGRlc2NyaXB0aW9uOworICAgICAgICAgICAgcHJpbnQgQ0hBTkdF X0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICBSZXZpZXdlZCBieSAkcmV2aWV3ZXIu XG5cbiIsICRlbmRsKTsKKyAgICAgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGlu ZUVuZGluZ3MoJGRlc2NyaXB0aW9uIC4gIlxuIiwgJGVuZGwpIGlmICRkZXNjcmlwdGlvbjsKKyAg ICAgICAgfQogCiAgICAgICAgIG15ICRzaG91bGRNZW50aW9uVGVzdHMgPSBAJHJlcXVpcmVzVGVz dHM7CiAgICAgICAgICRzaG91bGRNZW50aW9uVGVzdHMgfD0gISRoYXNXZWJDb3JlQ2hhbmdlICYm IHVuaXhQYXRoKCRwcmVmaXgpID1+IG18L1dlYktpdC8kfDsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvY29tbWl0LWxvZy1lZGl0b3IgYi9Ub29scy9TY3JpcHRzL2NvbW1pdC1sb2ctZWRpdG9y CmluZGV4IDcwMTVmYWRjYTdjYWY1Mjg1NTY2YmQ1MGMxZTZjNzM2ZDliZDljNWUuLmEwMmI0OTc3 NzZiZWJjNWI5NzYyZjEwZTVhYWRlMjQ4MzQ0YWFjODYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvY29tbWl0LWxvZy1lZGl0b3IKKysrIGIvVG9vbHMvU2NyaXB0cy9jb21taXQtbG9nLWVkaXRv cgpAQCAtNDcsNiArNDcsNyBAQCBzdWIgbm9ybWFsaXplTGluZUVuZGluZ3MoJCQpOwogc3ViIHBh dGNoQXV0aG9yc2hpcFN0cmluZygkJCQpOwogc3ViIHJlbW92ZUxvbmdlc3RDb21tb25QcmVmaXhF bmRpbmdJbk5ld2xpbmUoXCUpOwogc3ViIGlzQ29tbWl0TG9nRWRpdG9yKCQpOworc3ViIHByZXBh cmVDaGFuZ2VMb2coJCQkKTsKIAogbXkgJGVuZGwgPSAiXG4iOwogCkBAIC01NCw3ICs1NSwxMiBA QCBzdWIgcHJpbnRVc2FnZUFuZEV4aXQKIHsKICAgICBteSAkcHJvZ3JhbU5hbWUgPSBiYXNlbmFt ZSgkMCk7CiAgICAgcHJpbnQgU1RERVJSIDw8RU9GOwotVXNhZ2U6ICRwcm9ncmFtTmFtZSBbLS1y ZWdlbmVyYXRlLWxvZ10gPGxvZyBmaWxlPgorVXNhZ2U6ICRwcm9ncmFtTmFtZSBbLS1yZWdlbmVy YXRlLWxvZ10gWy0tdXBkYXRlLWZpbGUtbGlzdF0gWy1nIGNvbW1pdC1oYXNofC0tZ2l0LWNvbW1p dCBjb21taXQtaGFzaF1dIDxsb2cgZmlsZT4KKyAgICAgICAgIC0tdXBkYXRlLWZpbGUtbGlzdCBG aWxsIGluIHRoZSBDaGFuZ2VMb2cgYnVnIGluZm9ybWF0aW9uIGZyb20gdGhlIGdpdmVuIGJ1Zy4K KyAgICAgICAgIC1nfC0tZ2l0LWNvbW1pdCAgICBQYXNzIHRoZSBjb21taXQgaGFzaCBhcyByZWZl cmVuY2UgdG8gZ2VuZXJhdGUgdGhlIGxpc3Qgb2YgY2hhbmdlZCBmaWxlcy9mdW5jdGlvbnMuCisg ICAgICAgICAtLWRlc2NyaXB0aW9uICAgICAgT25lLWxpbmUgZGVzY3JpcHRpb24gdGhhdCBtYXRj aGVzIHRoZSBidWcgdGl0bGUuCisgICAgICAgICAtLW5vLWJ1ZyAgICAgICAgICAgU2tpcCBnZW5l cmF0aW9uIG9mIHRoZSBsaW5lIGZvciB0aGUgYnVnIHJlZmVyZW5jZS4KKwogICAgICAgICRwcm9n cmFtTmFtZSAtLXByaW50LWxvZyA8Q2hhbmdlTG9nIGZpbGU+IFs8Q2hhbmdlTG9nIGZpbGU+Li4u XQogICAgICAgICRwcm9ncmFtTmFtZSAtLWhlbHAKIEVPRgpAQCAtNjQsMTEgKzcwLDE5IEBAIEVP RgogbXkgJGhlbHAgPSAwOwogbXkgJHByaW50TG9nID0gMDsKIG15ICRyZWdlbmVyYXRlTG9nID0g MDsKK215ICR1cGRhdGVGaWxlTGlzdCA9IDA7CitteSAkZ2l0Q29tbWl0ID0gMDsKK215ICRkZXNj cmlwdGlvbiA9IDA7CitteSAkbm9CdWcgPSAwOwogCiBteSAkZ2V0T3B0aW9uc1Jlc3VsdCA9IEdl dE9wdGlvbnMoCiAgICAgJ2hlbHAnID0+IFwkaGVscCwKICAgICAncHJpbnQtbG9nJyA9PiBcJHBy aW50TG9nLAogICAgICdyZWdlbmVyYXRlLWxvZycgPT4gXCRyZWdlbmVyYXRlTG9nLAorICAgICd1 cGRhdGUtZmlsZS1saXN0JyA9PiBcJHVwZGF0ZUZpbGVMaXN0LAorICAgICdnaXQtY29tbWl0fGc6 cycgPT4gXCRnaXRDb21taXQsCisgICAgJ2Rlc2NyaXB0aW9uOnMnID0+IFwkZGVzY3JpcHRpb24s CisgICAgJ25vLWJ1ZycgPT4gXCRub0J1ZywKICk7CiAKIGlmICghJGdldE9wdGlvbnNSZXN1bHQg fHwgJGhlbHApIHsKQEAgLTE2MSw3ICsxNzUsMTAgQEAgd2hpbGUgKG15ICRjdXJMaW5lID0gPExP Rz4pIHsKIH0KIGNsb3NlIExPRzsKIAotQGNoYW5nZUxvZ3MgPSBtYXAgeyAkRU5We0dJVF9QUkVG SVh9IC4gJF8gfSBAY2hhbmdlTG9ncyBpZiBpc0dpdCgpOworbXkgJGdpdF9wcmVmaXggPSAkRU5W e0dJVF9QUkVGSVh9OworaWYgKCRnaXRfcHJlZml4KSB7CisgICAgQGNoYW5nZUxvZ3MgPSBtYXAg eyAkZ2l0X3ByZWZpeCAuICRfIH0gQGNoYW5nZUxvZ3MgaWYgaXNHaXQoKTsKK30KIAogIyBXZSB3 YW50IHRvIG1hdGNoIHRoZSBsaW5lIGVuZGluZ3Mgb2YgdGhlIGV4aXN0aW5nIGxvZyBmaWxlIGlu IGNhc2UgdGhleSdyZQogIyBkaWZmZXJlbnQgZnJvbSBwZXJsJ3MgbGluZSBlbmRpbmdzLgpAQCAt MTc3LDcgKzE5NCw3IEBAIGlmICgkcmVnZW5lcmF0ZUxvZyAmJiAkZXhpc3RpbmdMb2cgJiYgc2Nh bGFyKEBjaGFuZ2VMb2dzKSA+IDAgJiYgbG9hZFRlcm1SZWFkS2V5CiB9CiAKICMgRG9uJ3QgY2hh bmdlIGFueXRoaW5nIGlmIHRoZXJlJ3MgYWxyZWFkeSBhIGxvZyBtZXNzYWdlIChhcyBjYW4gaGFw cGVuIHdpdGggZ2l0LWNvbW1pdCAtLWFtZW5kKS4KLWV4ZWMgKEBlZGl0b3IsIEBBUkdWKSBpZiAk ZXhpc3RpbmdMb2cgJiYgJGtlZXBFeGlzdGluZ0xvZzsKK2V4ZWMgKEBlZGl0b3IsIEBBUkdWKSBp ZiAkZXhpc3RpbmdMb2cgJiYgJGtlZXBFeGlzdGluZ0xvZyAmJiAhJHVwZGF0ZUZpbGVMaXN0Owog CiBteSAkZmlyc3QgPSAxOwogb3BlbiBORVdMT0csICI+JGxvZy5lZGl0IiBvciBkaWU7CkBAIC0x ODgsMzkgKzIwNSwzMyBAQCBpZiAoaXNHaXQoKSAmJiBAY2hhbmdlTG9ncyA9PSAwKSB7CiAgICAg aWYgKCR3ZWJraXRHZW5lcmF0ZUNvbW1pdE1lc3NhZ2UgZXEgIiIpIHsKICAgICAgICAgY2hvbXAo JHdlYmtpdEdlbmVyYXRlQ29tbWl0TWVzc2FnZSA9IGBnaXQgY29uZmlnIC0tYm9vbCBjb3JlLndl YmtpdEdlbmVyYXRlQ29tbWl0TWVzc2FnZWApOwogICAgIH0KLSAgICBpZiAoJHdlYmtpdEdlbmVy YXRlQ29tbWl0TWVzc2FnZSBuZSAiZmFsc2UiKSB7Ci0gICAgICAgIG15ICVjaGFuZ2VMb2dTb3J0 OwotICAgICAgICBteSAlY2hhbmdlTG9nQ29udGVudHM7Ci0gICAgICAgIG9wZW4gbXkgJGNoYW5n ZUxvZ0VudHJpZXMsICItfCIsICIkRmluZEJpbjo6QmluL3ByZXBhcmUtQ2hhbmdlTG9nIC0tZ2l0 LWluZGV4IC0tbm8td3JpdGUgLS1uby1zdHlsZSAtLWRlbGltaXRlcnMiIG9yIGRpZSAicHJlcGFy ZS1DaGFuZ2VMb2cgZmFpbGVkOiAkIS5cbiI7Ci0KLSAgICAgICAgd2hpbGUgKCFlb2YoJGNoYW5n ZUxvZ0VudHJpZXMpKSB7Ci0gICAgICAgICAgICBteSAkbGFiZWwgPSA8JGNoYW5nZUxvZ0VudHJp ZXM+OwotICAgICAgICAgICAgY2hvbXAgJGxhYmVsOwotICAgICAgICAgICAgJGxhYmVsID1+IHMv OiQvLzsKLSAgICAgICAgICAgICgkY2hhbmdlTG9nQ29udGVudHN7JGxhYmVsfSkgPSBjb21taXRN ZXNzYWdlRnJvbUNoYW5nZUxvZ0VudHJ5KCRjaGFuZ2VMb2dFbnRyaWVzKTsKLSAgICAgICAgICAg ICRjaGFuZ2VMb2dTb3J0e3NvcnRLZXkoJGxhYmVsKX0gPSAkbGFiZWw7Ci0gICAgICAgIH0KLSAg ICAgICAgY2xvc2UgJGNoYW5nZUxvZ0VudHJpZXM7Ci0KLSAgICAgICAgbXkgJGNvbW1vblByZWZp eCA9IHJlbW92ZUxvbmdlc3RDb21tb25QcmVmaXhFbmRpbmdJbk5ld2xpbmUoJWNoYW5nZUxvZ0Nv bnRlbnRzKTsKLQotICAgICAgICBteSBAcmVzdWx0OwotICAgICAgICBwdXNoIEByZXN1bHQsIG5v cm1hbGl6ZUxpbmVFbmRpbmdzKCRjb21tb25QcmVmaXgsICRlbmRsKTsKLSAgICAgICAgZm9yIG15 ICRzb3J0S2V5IChzb3J0IGtleXMgJWNoYW5nZUxvZ1NvcnQpIHsKLSAgICAgICAgICAgIG15ICRs YWJlbCA9ICRjaGFuZ2VMb2dTb3J0eyRzb3J0S2V5fTsKLSAgICAgICAgICAgIG5leHQgaWYgKCRj aGFuZ2VMb2dDb250ZW50c3skbGFiZWx9IGVxICJcbiIpOwotICAgICAgICAgICAgaWYgKGtleXMg JWNoYW5nZUxvZ1NvcnQgPiAxKSB7Ci0gICAgICAgICAgICAgICAgcHVzaCBAcmVzdWx0LCBub3Jt YWxpemVMaW5lRW5kaW5ncygiXG4iLCAkZW5kbCk7Ci0gICAgICAgICAgICAgICAgcHVzaCBAcmVz dWx0LCBub3JtYWxpemVMaW5lRW5kaW5ncygiJGxhYmVsOiAiLCAkZW5kbCk7Ci0gICAgICAgICAg ICB9Ci0gICAgICAgICAgICBwdXNoIEByZXN1bHQsIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCRjaGFu Z2VMb2dDb250ZW50c3skbGFiZWx9LCAkZW5kbCk7CisKKyAgICBpZiAoJHJlZ2VuZXJhdGVMb2cg JiYgJHVwZGF0ZUZpbGVMaXN0ICYmICRleGlzdGluZ0xvZykgeworICAgICAgICBvcGVuIExPRywg JGxvZyBvciBkaWUgIkNvdWxkIG5vdCBvcGVuIHRoZSBsb2cgZmlsZS4iOworICAgICAgICB3aGls ZSAobXkgJGN1ckxpbmUgPSA8TE9HPikgeworICAgICAgICAgICAgcHJpbnQgTkVXTE9HICIkY3Vy TGluZSI7CiAgICAgICAgIH0KIAotICAgICAgICBwcmludCBORVdMT0cgam9pbiAnJywgQHJlc3Vs dDsKKyAgICAgICAgcHJpbnQgTkVXTE9HICJcbiI7CisgICAgICAgIHByaW50IE5FV0xPRyAiXG4i OworICAgICAgICBwcmludCBORVdMT0cgIiMgLS0tLS0tLS0tIFVwZGF0ZWQgZmlsZXMgY2hhbmdl cyAtLS0tLS0tLS1cbiI7CisgICAgICAgIHByaW50IE5FV0xPRyAiIyBQbGVhc2UgbWVyZ2UgdGhl IGxpc3Qgb2YgY2hhbmdlcyBiZWxvdyB3aXRoIHRoZSBjb21taXQgbWVzc2FnZSBhYm92ZS5cbiI7 CisgICAgICAgIHByaW50IE5FV0xPRyAiXG4iOworCisgICAgICAgIGlmICgkd2Via2l0R2VuZXJh dGVDb21taXRNZXNzYWdlIG5lICJmYWxzZSIpIHsKKyAgICAgICAgICAgIG15IEByZXN1bHQgPSBw cmVwYXJlQ2hhbmdlTG9nKDEsICRnaXRDb21taXQsICRkZXNjcmlwdGlvbik7CisgICAgICAgICAg ICBwcmludCBORVdMT0cgam9pbiAnJywgQHJlc3VsdDsKKyAgICAgICAgfQorICAgIH0gZWxzZSB7 CisgICAgICAgIGlmICgkd2Via2l0R2VuZXJhdGVDb21taXRNZXNzYWdlIG5lICJmYWxzZSIpIHsK KyAgICAgICAgICAgIG15IEByZXN1bHQgPSBwcmVwYXJlQ2hhbmdlTG9nKDAsICRnaXRDb21taXQs ICRkZXNjcmlwdGlvbik7CisgICAgICAgICAgICBwcmludCBORVdMT0cgam9pbiAnJywgQHJlc3Vs dDsKKyAgICAgICAgfQogICAgIH0KIH0gZWxzZSB7CiAgICAgcHJpbnQgTkVXTE9HIGNyZWF0ZUNv bW1pdE1lc3NhZ2UoQGNoYW5nZUxvZ3MpOwogfQorCiBwcmludCBORVdMT0cgJGxvZ0NvbnRlbnRz OwogY2xvc2UgTkVXTE9HOwogCkBAIC0yNDUsNiArMjU2LDUyIEBAIGlmICgkZm91bmRDb21tZW50 KSB7CiAKIHVubGluayAiJGxvZy5lZGl0IjsKIAorc3ViIHByZXBhcmVDaGFuZ2VMb2coJCQkKQor eworICAgIG15ICgkb25seUZpbGVzQ2hhbmdlcywgJGdpdENvbW1pdCwgJGRlc2NyaXB0aW9uKSA9 IEBfOworICAgIG15ICVjaGFuZ2VMb2dTb3J0OworICAgIG15ICVjaGFuZ2VMb2dDb250ZW50czsK KyAgICBteSAkZXh0cmFQYXJhbWV0ZXJzID0gJy0tZ2l0LWluZGV4JzsKKyAgICBpZiAoJGdpdENv bW1pdCkgeworICAgICAgICAkZXh0cmFQYXJhbWV0ZXJzID0gIi1nICRnaXRDb21taXQiCisgICAg fQorICAgIGlmICgkb25seUZpbGVzQ2hhbmdlcykgeworICAgICAgICAkZXh0cmFQYXJhbWV0ZXJz IC49ICIgLS1vbmx5LWZpbGVzIgorICAgIH0KKyAgICBpZiAoJGRlc2NyaXB0aW9uKSB7CisgICAg ICAgICRleHRyYVBhcmFtZXRlcnMgLj0gIiAtLWRlc2NyaXB0aW9uIFxRJGRlc2NyaXB0aW9uIjsK KyAgICB9CisgICAgaWYgKCRub0J1ZykgeworICAgICAgICAkZXh0cmFQYXJhbWV0ZXJzIC49ICIg LS1idWcgLTEiOworICAgIH0KKyAgICBvcGVuIG15ICRjaGFuZ2VMb2dFbnRyaWVzLCAiLXwiLCAi JEZpbmRCaW46OkJpbi9wcmVwYXJlLUNoYW5nZUxvZyAtLW5vLXdyaXRlIC0tbm8tc3R5bGUgLS1k ZWxpbWl0ZXJzICRleHRyYVBhcmFtZXRlcnMiIG9yIGRpZSAicHJlcGFyZS1DaGFuZ2VMb2cgZmFp bGVkOiAkIS5cbiI7CisKKyAgICB3aGlsZSAoIWVvZigkY2hhbmdlTG9nRW50cmllcykpIHsKKyAg ICAgICAgbXkgJGxhYmVsID0gPCRjaGFuZ2VMb2dFbnRyaWVzPjsKKyAgICAgICAgY2hvbXAgJGxh YmVsOworICAgICAgICAkbGFiZWwgPX4gcy86JC8vOworICAgICAgICAoJGNoYW5nZUxvZ0NvbnRl bnRzeyRsYWJlbH0pID0gY29tbWl0TWVzc2FnZUZyb21DaGFuZ2VMb2dFbnRyeSgkY2hhbmdlTG9n RW50cmllcyk7CisgICAgICAgICRjaGFuZ2VMb2dTb3J0e3NvcnRLZXkoJGxhYmVsKX0gPSAkbGFi ZWw7CisgICAgfQorICAgIGNsb3NlICRjaGFuZ2VMb2dFbnRyaWVzOworCisgICAgbXkgJGNvbW1v blByZWZpeCA9IHJlbW92ZUxvbmdlc3RDb21tb25QcmVmaXhFbmRpbmdJbk5ld2xpbmUoJWNoYW5n ZUxvZ0NvbnRlbnRzKTsKKworICAgIG15IEByZXN1bHQ7CisgICAgcHVzaCBAcmVzdWx0LCBub3Jt YWxpemVMaW5lRW5kaW5ncygkY29tbW9uUHJlZml4LCAkZW5kbCk7CisgICAgZm9yIG15ICRzb3J0 S2V5IChzb3J0IGtleXMgJWNoYW5nZUxvZ1NvcnQpIHsKKyAgICAgICAgbXkgJGxhYmVsID0gJGNo YW5nZUxvZ1NvcnR7JHNvcnRLZXl9OworICAgICAgICBuZXh0IGlmICgkY2hhbmdlTG9nQ29udGVu dHN7JGxhYmVsfSBlcSAiXG4iKTsKKyAgICAgICAgaWYgKGtleXMgJWNoYW5nZUxvZ1NvcnQgPiAx KSB7CisgICAgICAgICAgICBwdXNoIEByZXN1bHQsIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCJcbiIs ICRlbmRsKTsKKyAgICAgICAgICAgIHB1c2ggQHJlc3VsdCwgbm9ybWFsaXplTGluZUVuZGluZ3Mo IiRsYWJlbDogIiwgJGVuZGwpOworICAgICAgICB9CisgICAgICAgIHB1c2ggQHJlc3VsdCwgbm9y bWFsaXplTGluZUVuZGluZ3MoJGNoYW5nZUxvZ0NvbnRlbnRzeyRsYWJlbH0sICRlbmRsKTsKKyAg ICB9CisKKyAgICByZXR1cm4gQHJlc3VsdDsKK30KKwogc3ViIGNvbW1pdE1lc3NhZ2VGcm9tQ2hh bmdlTG9nRW50cnkoJCkKIHsKICAgICBteSAoJGNoYW5nZUxvZykgPSBAXzsK 438083 2021-09-13 15:49:29 -0700 2021-09-13 16:24:49 -0700 Patch bug-230195-20210913154928.patch text/plain 5796 dvh U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMzQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmJkODdkNzkxZjI2NGU0YWJhOTMxMzI3YTQ5ZDFkMmI3 NzBiZDY4OS4uNGNjMjE4Y2JhYTgxNGJkOWE0Y2FhODhhMmMxNzJkMWFiNmI0ZGE1MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTA5LTEzICBIb2EgRGluaCAgPGR2aEBhcHBsZS5jb20+CisKKyAgICAgICAgUHJv dmlkZSBhIHdheSB0byB1cGRhdGUgdGhlIGNvbW1pdCBtZXNzYWdlIHdpdGggYW4gdXBkYXRlZCBs aXN0IG9mIGNoYW5nZWQgZmlsZXMvZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAxOTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgcGFyYW1ldGVyIC0tb25seS1maWxlcyB0 byByZXF1ZXN0IGdlbmVyYXRpb24gb2Ygb25seSB0aGUgcGFydCBvZiB0aGUgY2hhbmdlZCBmaWxl cy9mdW5jdGlvbnMuCisKKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nOgorICAg ICAgICAobWFpbik6CisgICAgICAgIChnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MpOgorCiAyMDIxLTA5 LTEzICBZb3NoaWFraSBKaXRzdWthd2EgIDx5b3NoaWFraS5qaXRzdWthd2FAc29ueS5jb20+CiAK ICAgICAgICAgW1Rlc3RXVEZdIEhhc2ggdGVzdHMgZm9yIGRlbm9ybV9taW4gc2hvdWxkIGJlIHNr aXBwZWQgaWYgZGVub3JtIGlzIG5vdCBzdXBwb3J0ZWQuCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwpp bmRleCBiNzRjOWZmOTZkZjJhMjc1NjIzOWQ1YWQzMTZkOTcyYWI0ZDc1Yzc3Li4wMGRkZWYwMWRj NGQ0ODkxYzZmNDU5NTBkYjY2MDUwZTYzYzA4MDY1IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRz L3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cK QEAgLTg0LDcgKzg0LDcgQEAgc3ViIGZpbmRDaGFuZ2VMb2dzKCQkKTsKIHN1YiBmaW5kT3JpZ2lu YWxGaWxlRnJvbVN2bigkKTsKIHN1YiBnZW5lcmF0ZUZpbGVMaXN0KFwlJCQkXCUpOwogc3ViIGdl bmVyYXRlRnVuY3Rpb25MaXN0cygkJCQkJCk7Ci1zdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQk JCQkJCQkJCQkJCQkKTsKK3N1YiBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJCQkJCQkJCQkJCQkJCQk KTsKIHN1YiBnZXRMYXRlc3RDaGFuZ2VMb2dzKCQpOwogc3ViIGdldF9mdW5jdGlvbl9saW5lX3Jh bmdlcygkJCk7CiBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9jcHAoJCQpOwpAQCAt MTQ1LDYgKzE0NSw3IEBAIHN1YiBtYWluKCkKICAgICBteSAkc2hvd0hlbHAgPSAwOwogICAgIG15 ICRzcGV3RGlmZiA9ICRFTlZ7IlBSRVBBUkVfQ0hBTkdFTE9HX0RJRkYifTsKICAgICBteSAkdXBk YXRlQ2hhbmdlTG9ncyA9IDE7CisgICAgbXkgJG9ubHlGaWxlcyA9IDA7CiAgICAgbXkgJHBhcnNl T3B0aW9uc1Jlc3VsdCA9CiAgICAgICAgIEdldE9wdGlvbnMoImRpZmZ8ZCEiID0+IFwkc3Bld0Rp ZmYsCiAgICAgICAgICAgICAgICAgICAgImJ1Z3xiOmkiID0+IFwkYnVnTnVtYmVyLApAQCAtMTYw LDcgKzE2MSw4IEBAIHN1YiBtYWluKCkKICAgICAgICAgICAgICAgICAgICAic3R5bGUhIiA9PiBc JGNoZWNrV2ViS2l0U3R5bGUsCiAgICAgICAgICAgICAgICAgICAgIm9wZW58byEiID0+IFwkb3Bl bkNoYW5nZUxvZ3MsCiAgICAgICAgICAgICAgICAgICAgIndyaXRlISIgPT4gXCR3cml0ZUNoYW5n ZUxvZ3MsCi0gICAgICAgICAgICAgICAgICAgInVwZGF0ZSEiID0+IFwkdXBkYXRlQ2hhbmdlTG9n cyk7CisgICAgICAgICAgICAgICAgICAgInVwZGF0ZSEiID0+IFwkdXBkYXRlQ2hhbmdlTG9ncywK KyAgICAgICAgICAgICAgICAgICAib25seS1maWxlcyIgPT4gXCRvbmx5RmlsZXMpOwogICAgIGlm ICghJHBhcnNlT3B0aW9uc1Jlc3VsdCB8fCAkc2hvd0hlbHApIHsKICAgICAgICAgcHJpbnQgU1RE RVJSIGJhc2VuYW1lKCQwKSAuICIgWy1ifC0tYnVnPTxidWdpZD5dIFstZHwtLWRpZmZdIFstaHwt LWhlbHBdIFstb3wtLW9wZW5dIFstZ3wtLWdpdC1jb21taXQ9PGNvbW1pdHRpc2g+XSBbLS1naXQt cmV2aWV3ZXI9PG5hbWU+XSBbc3ZuZGlyMSBbc3ZuZGlyMiAuLi5dXVxuIjsKICAgICAgICAgcHJp bnQgU1RERVJSICIgIC1ifC0tYnVnICAgICAgICBGaWxsIGluIHRoZSBDaGFuZ2VMb2cgYnVnIGlu Zm9ybWF0aW9uIGZyb20gdGhlIGdpdmVuIGJ1Zy5cbiI7CkBAIC0xNzgsNiArMTgwLDcgQEAgc3Vi IG1haW4oKQogICAgICAgICBwcmludCBTVERFUlIgIiAgLS1bbm8tXXdyaXRlICAgIFdyaXRlIENo YW5nZUxvZ3MgdG8gZGlzayAob3RoZXJ3aXNlIHNlbmQgbmV3IGVudHJpZXMgdG8gc3Rkb3V0KSAo ZGVmYXVsdDogd3JpdGUpXG4iOwogICAgICAgICBwcmludCBTVERFUlIgIiAgLS1kZWxpbWl0ZXJz ICAgIFdoZW4gd3JpdGluZyB0byBzdGRvdXQsIGxhYmVsIGFuZCBwcmludCBhIFwiflwiIGFmdGVy IGVhY2ggZW50cnlcbiI7CiAgICAgICAgIHByaW50IFNUREVSUiAiICAtLWVtYWlsPSAgICAgICAg U3BlY2lmeSB0aGUgZW1haWwgYWRkcmVzcyB0byBiZSB1c2VkIGluIHRoZSBwYXRjaFxuIjsKKyAg ICAgICAgcHJpbnQgU1RERVJSICIgIC0tb25seS1maWxlcyAgICBHZW5lcmF0ZSBvbmx5IHRoZSBm aWxlcyBjaGFuZ2VzLlxuIjsKICAgICAgICAgcmV0dXJuIDE7CiAgICAgfQogCkBAIC0yMzcsNyAr MjQwLDcgQEAgc3ViIG1haW4oKQogICAgICAgICByZXNvbHZlQ29uZmxpY3RlZENoYW5nZUxvZ3Mo JGNoYW5nZUxvZ3MpOwogICAgIH0KIAotICAgIGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkcHJlZml4 ZXMsICRmaWxlc0luQ2hhbmdlTG9nLCAkYWRkZWRSZWdyZXNzaW9uVGVzdHMsICRyZXF1aXJlc1Rl c3RzLCAkZnVuY3Rpb25MaXN0cywgJGJ1Z1VSTCwgJGJ1Z0Rlc2NyaXB0aW9uLCAkYnVnUmFkYXJV UkwsICRuYW1lLCAkZW1haWxBZGRyZXNzLCAkZ2l0UmV2aWV3ZXIsICRnaXRDb21taXQsICR3cml0 ZUNoYW5nZUxvZ3MsICRkZWxpbWl0ZXJzKTsKKyAgICBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJHBy ZWZpeGVzLCAkZmlsZXNJbkNoYW5nZUxvZywgJGFkZGVkUmVncmVzc2lvblRlc3RzLCAkcmVxdWly ZXNUZXN0cywgJGZ1bmN0aW9uTGlzdHMsICRidWdVUkwsICRidWdEZXNjcmlwdGlvbiwgJGJ1Z1Jh ZGFyVVJMLCAkbmFtZSwgJGVtYWlsQWRkcmVzcywgJGdpdFJldmlld2VyLCAkZ2l0Q29tbWl0LCAk d3JpdGVDaGFuZ2VMb2dzLCAkZGVsaW1pdGVycywgJG9ubHlGaWxlcyk7CiAKICAgICBpZiAoJHdy aXRlQ2hhbmdlTG9ncykgewogICAgICAgICBwcmludCBTVERFUlIgIi0tIFBsZWFzZSByZW1lbWJl ciB0byBpbmNsdWRlIGEgZGV0YWlsZWQgZGVzY3JpcHRpb24gaW4geW91ciBDaGFuZ2VMb2cgZW50 cnkuIC0tXG4tLSBTZWUgPGh0dHA6Ly93ZWJraXQub3JnL2NvZGluZy9jb250cmlidXRpbmcuaHRt bD4gZm9yIG1vcmUgaW5mbyAtLVxuIjsKQEAgLTYzMSw5ICs2MzQsOSBAQCBzdWIgcmVzb2x2ZUNv bmZsaWN0ZWRDaGFuZ2VMb2dzKCQpCiAgICAgY2xvc2UgUkVTT0xWRTsKIH0KIAotc3ViIGdlbmVy YXRlTmV3Q2hhbmdlTG9ncygkJCQkJCQkJCQkJCQkJCkKK3N1YiBnZW5lcmF0ZU5ld0NoYW5nZUxv Z3MoJCQkJCQkJCQkJCQkJCQkKQogewotICAgIG15ICgkcHJlZml4ZXMsICRmaWxlc0luQ2hhbmdl TG9nLCAkYWRkZWRSZWdyZXNzaW9uVGVzdHMsICRyZXF1aXJlc1Rlc3RzLCAkZnVuY3Rpb25MaXN0 cywgJGJ1Z1VSTCwgJGJ1Z0Rlc2NyaXB0aW9uLCAkYnVnUmFkYXJVUkwsICRuYW1lLCAkZW1haWxB ZGRyZXNzLCAkZ2l0UmV2aWV3ZXIsICRnaXRDb21taXQsICR3cml0ZUNoYW5nZUxvZ3MsICRkZWxp bWl0ZXJzKSA9IEBfOworICAgIG15ICgkcHJlZml4ZXMsICRmaWxlc0luQ2hhbmdlTG9nLCAkYWRk ZWRSZWdyZXNzaW9uVGVzdHMsICRyZXF1aXJlc1Rlc3RzLCAkZnVuY3Rpb25MaXN0cywgJGJ1Z1VS TCwgJGJ1Z0Rlc2NyaXB0aW9uLCAkYnVnUmFkYXJVUkwsICRuYW1lLCAkZW1haWxBZGRyZXNzLCAk Z2l0UmV2aWV3ZXIsICRnaXRDb21taXQsICR3cml0ZUNoYW5nZUxvZ3MsICRkZWxpbWl0ZXJzLCAk b25seUZpbGVzKSA9IEBfOwogCiAgICAgbXkgJGhhc1dlYkNvcmVDaGFuZ2UgPSAwOwogICAgIGZv cmVhY2ggbXkgJHByZWZpeCAoQCRwcmVmaXhlcykgewpAQCAtNjgwLDEzICs2ODMsMTUgQEAgc3Vi IGdlbmVyYXRlTmV3Q2hhbmdlTG9ncygkJCQkJCQkJCQkJCQkJCkKICAgICAgICAgJGJ1Z0Rlc2Ny aXB0aW9uID0gIk5lZWQgYSBzaG9ydCBkZXNjcmlwdGlvbiAoT09QUyEpLiIgdW5sZXNzICRidWdE ZXNjcmlwdGlvbjsKICAgICAgICAgJGJ1Z1VSTCA9ICJOZWVkIHRoZSBidWcgVVJMIChPT1BTISku IiB1bmxlc3MgJGJ1Z1VSTDsKIAotICAgICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxp bmVFbmRpbmdzKCIgICAgICAgICRidWdEZXNjcmlwdGlvblxuIiwgJGVuZGwpIGlmICRidWdEZXNj cmlwdGlvbjsKLSAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygi ICAgICAgICAkYnVnVVJMXG4iLCAkZW5kbCkgaWYgJGJ1Z1VSTDsKLSAgICAgICAgcHJpbnQgQ0hB TkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAkYnVnUmFkYXJVUkxcbiIsICRl bmRsKSBpZiAkYnVnUmFkYXJVUkw7Ci0gICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXpl TGluZUVuZGluZ3MoIlxuIiwgJGVuZGwpOworICAgICAgICBpZiAoISRvbmx5RmlsZXMpIHsKKyAg ICAgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoIiAgICAgICAg JGJ1Z0Rlc2NyaXB0aW9uXG4iLCAkZW5kbCkgaWYgJGJ1Z0Rlc2NyaXB0aW9uOworICAgICAgICAg ICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAkYnVnVVJM XG4iLCAkZW5kbCkgaWYgJGJ1Z1VSTDsKKyAgICAgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9y bWFsaXplTGluZUVuZGluZ3MoIiAgICAgICAgJGJ1Z1JhZGFyVVJMXG4iLCAkZW5kbCkgaWYgJGJ1 Z1JhZGFyVVJMOworICAgICAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5k aW5ncygiXG4iLCAkZW5kbCk7CiAKLSAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVM aW5lRW5kaW5ncygiICAgICAgICBSZXZpZXdlZCBieSAkcmV2aWV3ZXIuXG5cbiIsICRlbmRsKTsK LSAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygkZGVzY3JpcHRp b24gLiAiXG4iLCAkZW5kbCkgaWYgJGRlc2NyaXB0aW9uOworICAgICAgICAgICAgcHJpbnQgQ0hB TkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICBSZXZpZXdlZCBieSAkcmV2aWV3 ZXIuXG5cbiIsICRlbmRsKTsKKyAgICAgICAgICAgIHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXpl TGluZUVuZGluZ3MoJGRlc2NyaXB0aW9uIC4gIlxuIiwgJGVuZGwpIGlmICRkZXNjcmlwdGlvbjsK KyAgICAgICAgfQogCiAgICAgICAgIG15ICRzaG91bGRNZW50aW9uVGVzdHMgPSBAJHJlcXVpcmVz VGVzdHM7CiAgICAgICAgICRzaG91bGRNZW50aW9uVGVzdHMgfD0gISRoYXNXZWJDb3JlQ2hhbmdl ICYmIHVuaXhQYXRoKCRwcmVmaXgpID1+IG18L1dlYktpdC8kfDsK 438088 2021-09-13 16:24:53 -0700 2021-09-14 08:56:59 -0700 Patch bug-230195-20210913162452.patch text/plain 6548 dvh U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMzQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmJkODdkNzkxZjI2NGU0YWJhOTMxMzI3YTQ5ZDFkMmI3 NzBiZDY4OS4uNGNjMjE4Y2JhYTgxNGJkOWE0Y2FhODhhMmMxNzJkMWFiNmI0ZGE1MiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTA5LTEzICBIb2EgRGluaCAgPGR2aEBhcHBsZS5jb20+CisKKyAgICAgICAgUHJv dmlkZSBhIHdheSB0byB1cGRhdGUgdGhlIGNvbW1pdCBtZXNzYWdlIHdpdGggYW4gdXBkYXRlZCBs aXN0IG9mIGNoYW5nZWQgZmlsZXMvZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAxOTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgcGFyYW1ldGVyIC0tb25seS1maWxlcyB0 byByZXF1ZXN0IGdlbmVyYXRpb24gb2Ygb25seSB0aGUgcGFydCBvZiB0aGUgY2hhbmdlZCBmaWxl cy9mdW5jdGlvbnMuCisKKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nOgorICAg ICAgICAobWFpbik6CisgICAgICAgIChnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MpOgorCiAyMDIxLTA5 LTEzICBZb3NoaWFraSBKaXRzdWthd2EgIDx5b3NoaWFraS5qaXRzdWthd2FAc29ueS5jb20+CiAK ICAgICAgICAgW1Rlc3RXVEZdIEhhc2ggdGVzdHMgZm9yIGRlbm9ybV9taW4gc2hvdWxkIGJlIHNr aXBwZWQgaWYgZGVub3JtIGlzIG5vdCBzdXBwb3J0ZWQuCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwpp bmRleCBiNzRjOWZmOTZkZjJhMjc1NjIzOWQ1YWQzMTZkOTcyYWI0ZDc1Yzc3Li4yY2Q2MDM1MGMy YTJhMWE2NzJkOWVjYmM1NWFiYmFhMjQ1MTk0YzM5IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRz L3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cK QEAgLTg0LDcgKzg0LDcgQEAgc3ViIGZpbmRDaGFuZ2VMb2dzKCQkKTsKIHN1YiBmaW5kT3JpZ2lu YWxGaWxlRnJvbVN2bigkKTsKIHN1YiBnZW5lcmF0ZUZpbGVMaXN0KFwlJCQkXCUpOwogc3ViIGdl bmVyYXRlRnVuY3Rpb25MaXN0cygkJCQkJCk7Ci1zdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQk JCQkJCQkJCQkJCQkKTsKK3N1YiBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJCQkJCQkJCQkJCQkJCQk KTsKIHN1YiBnZXRMYXRlc3RDaGFuZ2VMb2dzKCQpOwogc3ViIGdldF9mdW5jdGlvbl9saW5lX3Jh bmdlcygkJCk7CiBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9jcHAoJCQpOwpAQCAt MTQ1LDYgKzE0NSw3IEBAIHN1YiBtYWluKCkKICAgICBteSAkc2hvd0hlbHAgPSAwOwogICAgIG15 ICRzcGV3RGlmZiA9ICRFTlZ7IlBSRVBBUkVfQ0hBTkdFTE9HX0RJRkYifTsKICAgICBteSAkdXBk YXRlQ2hhbmdlTG9ncyA9IDE7CisgICAgbXkgJG9ubHlGaWxlcyA9IDA7CiAgICAgbXkgJHBhcnNl T3B0aW9uc1Jlc3VsdCA9CiAgICAgICAgIEdldE9wdGlvbnMoImRpZmZ8ZCEiID0+IFwkc3Bld0Rp ZmYsCiAgICAgICAgICAgICAgICAgICAgImJ1Z3xiOmkiID0+IFwkYnVnTnVtYmVyLApAQCAtMTYw LDcgKzE2MSw4IEBAIHN1YiBtYWluKCkKICAgICAgICAgICAgICAgICAgICAic3R5bGUhIiA9PiBc JGNoZWNrV2ViS2l0U3R5bGUsCiAgICAgICAgICAgICAgICAgICAgIm9wZW58byEiID0+IFwkb3Bl bkNoYW5nZUxvZ3MsCiAgICAgICAgICAgICAgICAgICAgIndyaXRlISIgPT4gXCR3cml0ZUNoYW5n ZUxvZ3MsCi0gICAgICAgICAgICAgICAgICAgInVwZGF0ZSEiID0+IFwkdXBkYXRlQ2hhbmdlTG9n cyk7CisgICAgICAgICAgICAgICAgICAgInVwZGF0ZSEiID0+IFwkdXBkYXRlQ2hhbmdlTG9ncywK KyAgICAgICAgICAgICAgICAgICAib25seS1maWxlcyIgPT4gXCRvbmx5RmlsZXMpOwogICAgIGlm ICghJHBhcnNlT3B0aW9uc1Jlc3VsdCB8fCAkc2hvd0hlbHApIHsKICAgICAgICAgcHJpbnQgU1RE RVJSIGJhc2VuYW1lKCQwKSAuICIgWy1ifC0tYnVnPTxidWdpZD5dIFstZHwtLWRpZmZdIFstaHwt LWhlbHBdIFstb3wtLW9wZW5dIFstZ3wtLWdpdC1jb21taXQ9PGNvbW1pdHRpc2g+XSBbLS1naXQt cmV2aWV3ZXI9PG5hbWU+XSBbc3ZuZGlyMSBbc3ZuZGlyMiAuLi5dXVxuIjsKICAgICAgICAgcHJp bnQgU1RERVJSICIgIC1ifC0tYnVnICAgICAgICBGaWxsIGluIHRoZSBDaGFuZ2VMb2cgYnVnIGlu Zm9ybWF0aW9uIGZyb20gdGhlIGdpdmVuIGJ1Zy5cbiI7CkBAIC0xNzgsNiArMTgwLDcgQEAgc3Vi IG1haW4oKQogICAgICAgICBwcmludCBTVERFUlIgIiAgLS1bbm8tXXdyaXRlICAgIFdyaXRlIENo YW5nZUxvZ3MgdG8gZGlzayAob3RoZXJ3aXNlIHNlbmQgbmV3IGVudHJpZXMgdG8gc3Rkb3V0KSAo ZGVmYXVsdDogd3JpdGUpXG4iOwogICAgICAgICBwcmludCBTVERFUlIgIiAgLS1kZWxpbWl0ZXJz ICAgIFdoZW4gd3JpdGluZyB0byBzdGRvdXQsIGxhYmVsIGFuZCBwcmludCBhIFwiflwiIGFmdGVy IGVhY2ggZW50cnlcbiI7CiAgICAgICAgIHByaW50IFNUREVSUiAiICAtLWVtYWlsPSAgICAgICAg U3BlY2lmeSB0aGUgZW1haWwgYWRkcmVzcyB0byBiZSB1c2VkIGluIHRoZSBwYXRjaFxuIjsKKyAg ICAgICAgcHJpbnQgU1RERVJSICIgIC0tb25seS1maWxlcyAgICBFeGNsdWRlIHRoZSBzdGFuZGFy ZCBjaGFuZ2Vsb2cgaGVhZGVyIGFuZCBvbmx5IGluY2x1ZGUgcmVmZXJlbmNlcyB0byBmaWxlcy5c biI7CiAgICAgICAgIHJldHVybiAxOwogICAgIH0KIApAQCAtMjM3LDcgKzI0MCw3IEBAIHN1YiBt YWluKCkKICAgICAgICAgcmVzb2x2ZUNvbmZsaWN0ZWRDaGFuZ2VMb2dzKCRjaGFuZ2VMb2dzKTsK ICAgICB9CiAKLSAgICBnZW5lcmF0ZU5ld0NoYW5nZUxvZ3MoJHByZWZpeGVzLCAkZmlsZXNJbkNo YW5nZUxvZywgJGFkZGVkUmVncmVzc2lvblRlc3RzLCAkcmVxdWlyZXNUZXN0cywgJGZ1bmN0aW9u TGlzdHMsICRidWdVUkwsICRidWdEZXNjcmlwdGlvbiwgJGJ1Z1JhZGFyVVJMLCAkbmFtZSwgJGVt YWlsQWRkcmVzcywgJGdpdFJldmlld2VyLCAkZ2l0Q29tbWl0LCAkd3JpdGVDaGFuZ2VMb2dzLCAk ZGVsaW1pdGVycyk7CisgICAgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCRwcmVmaXhlcywgJGZpbGVz SW5DaGFuZ2VMb2csICRhZGRlZFJlZ3Jlc3Npb25UZXN0cywgJHJlcXVpcmVzVGVzdHMsICRmdW5j dGlvbkxpc3RzLCAkYnVnVVJMLCAkYnVnRGVzY3JpcHRpb24sICRidWdSYWRhclVSTCwgJG5hbWUs ICRlbWFpbEFkZHJlc3MsICRnaXRSZXZpZXdlciwgJGdpdENvbW1pdCwgJHdyaXRlQ2hhbmdlTG9n cywgJGRlbGltaXRlcnMsICRvbmx5RmlsZXMpOwogCiAgICAgaWYgKCR3cml0ZUNoYW5nZUxvZ3Mp IHsKICAgICAgICAgcHJpbnQgU1RERVJSICItLSBQbGVhc2UgcmVtZW1iZXIgdG8gaW5jbHVkZSBh IGRldGFpbGVkIGRlc2NyaXB0aW9uIGluIHlvdXIgQ2hhbmdlTG9nIGVudHJ5LiAtLVxuLS0gU2Vl IDxodHRwOi8vd2Via2l0Lm9yZy9jb2RpbmcvY29udHJpYnV0aW5nLmh0bWw+IGZvciBtb3JlIGlu Zm8gLS1cbiI7CkBAIC02MzEsOSArNjM0LDkgQEAgc3ViIHJlc29sdmVDb25mbGljdGVkQ2hhbmdl TG9ncygkKQogICAgIGNsb3NlIFJFU09MVkU7CiB9CiAKLXN1YiBnZW5lcmF0ZU5ld0NoYW5nZUxv Z3MoJCQkJCQkJCQkJCQkJCQpCitzdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQk JCQkJCkKIHsKLSAgICBteSAoJHByZWZpeGVzLCAkZmlsZXNJbkNoYW5nZUxvZywgJGFkZGVkUmVn cmVzc2lvblRlc3RzLCAkcmVxdWlyZXNUZXN0cywgJGZ1bmN0aW9uTGlzdHMsICRidWdVUkwsICRi dWdEZXNjcmlwdGlvbiwgJGJ1Z1JhZGFyVVJMLCAkbmFtZSwgJGVtYWlsQWRkcmVzcywgJGdpdFJl dmlld2VyLCAkZ2l0Q29tbWl0LCAkd3JpdGVDaGFuZ2VMb2dzLCAkZGVsaW1pdGVycykgPSBAXzsK KyAgICBteSAoJHByZWZpeGVzLCAkZmlsZXNJbkNoYW5nZUxvZywgJGFkZGVkUmVncmVzc2lvblRl c3RzLCAkcmVxdWlyZXNUZXN0cywgJGZ1bmN0aW9uTGlzdHMsICRidWdVUkwsICRidWdEZXNjcmlw dGlvbiwgJGJ1Z1JhZGFyVVJMLCAkbmFtZSwgJGVtYWlsQWRkcmVzcywgJGdpdFJldmlld2VyLCAk Z2l0Q29tbWl0LCAkd3JpdGVDaGFuZ2VMb2dzLCAkZGVsaW1pdGVycywgJG9ubHlGaWxlcykgPSBA XzsKIAogICAgIG15ICRoYXNXZWJDb3JlQ2hhbmdlID0gMDsKICAgICBmb3JlYWNoIG15ICRwcmVm aXggKEAkcHJlZml4ZXMpIHsKQEAgLTY2Nyw4ICs2NzAsMTAgQEAgc3ViIGdlbmVyYXRlTmV3Q2hh bmdlTG9ncygkJCQkJCQkJCQkJCQkJCkKICAgICAgICAgICAgIHByaW50IHN1YnN0cigkcHJlZml4 LCAwLCBsZW5ndGgoJHByZWZpeCkgLSAxKSAuICI6XG5cbiIgdW5sZXNzIChzY2FsYXIgQCRwcmVm aXhlcykgPT0gMSAmJiAhJGRlbGltaXRlcnM7CiAgICAgICAgIH0KIAotICAgICAgICBteSAkZGF0 ZSA9IGNoYW5nZUxvZ0RhdGUoQ2hhbmdlTG9nVGltZVpvbmUpOwotICAgICAgICBwcmludCBDSEFO R0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIkZGF0ZSAgJG5hbWUgIDwkZW1haWxBZGRyZXNz PlxuXG4iLCAkZW5kbCk7CisgICAgICAgIGlmICghJG9ubHlGaWxlcykgeworICAgICAgICAgICAg bXkgJGRhdGUgPSBjaGFuZ2VMb2dEYXRlKENoYW5nZUxvZ1RpbWVab25lKTsKKyAgICAgICAgICAg IHByaW50IENIQU5HRV9MT0cgbm9ybWFsaXplTGluZUVuZGluZ3MoIiRkYXRlICAkbmFtZSAgPCRl bWFpbEFkZHJlc3M+XG5cbiIsICRlbmRsKTsKKyAgICAgICAgfQogCiAgICAgICAgIG15ICgkcmV2 aWV3ZXIsICRkZXNjcmlwdGlvbikgPSByZXZpZXdlckFuZERlc2NyaXB0aW9uRm9yR2l0Q29tbWl0 KCRnaXRDb21taXQsICRnaXRSZXZpZXdlcikgaWYgJGdpdENvbW1pdDsKICAgICAgICAgJHJldmll d2VyID0gIk5PQk9EWSAoT08iIC4gIlBTISkiIGlmICEkcmV2aWV3ZXI7CkBAIC02ODAsMTMgKzY4 NSwxNSBAQCBzdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJCQkJCQkJCQkJCQkKQogICAgICAg ICAkYnVnRGVzY3JpcHRpb24gPSAiTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIChPT1BTISkuIiB1 bmxlc3MgJGJ1Z0Rlc2NyaXB0aW9uOwogICAgICAgICAkYnVnVVJMID0gIk5lZWQgdGhlIGJ1ZyBV UkwgKE9PUFMhKS4iIHVubGVzcyAkYnVnVVJMOwogCi0gICAgICAgIHByaW50IENIQU5HRV9MT0cg bm9ybWFsaXplTGluZUVuZGluZ3MoIiAgICAgICAgJGJ1Z0Rlc2NyaXB0aW9uXG4iLCAkZW5kbCkg aWYgJGJ1Z0Rlc2NyaXB0aW9uOwotICAgICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxp bmVFbmRpbmdzKCIgICAgICAgICRidWdVUkxcbiIsICRlbmRsKSBpZiAkYnVnVVJMOwotICAgICAg ICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIgICAgICAgICRidWdSYWRh clVSTFxuIiwgJGVuZGwpIGlmICRidWdSYWRhclVSTDsKLSAgICAgICAgcHJpbnQgQ0hBTkdFX0xP RyBub3JtYWxpemVMaW5lRW5kaW5ncygiXG4iLCAkZW5kbCk7CisgICAgICAgIGlmICghJG9ubHlG aWxlcykgeworICAgICAgICAgICAgcHJpbnQgQ0hBTkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5n cygiICAgICAgICAkYnVnRGVzY3JpcHRpb25cbiIsICRlbmRsKSBpZiAkYnVnRGVzY3JpcHRpb247 CisgICAgICAgICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIgICAg ICAgICRidWdVUkxcbiIsICRlbmRsKSBpZiAkYnVnVVJMOworICAgICAgICAgICAgcHJpbnQgQ0hB TkdFX0xPRyBub3JtYWxpemVMaW5lRW5kaW5ncygiICAgICAgICAkYnVnUmFkYXJVUkxcbiIsICRl bmRsKSBpZiAkYnVnUmFkYXJVUkw7CisgICAgICAgICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1h bGl6ZUxpbmVFbmRpbmdzKCJcbiIsICRlbmRsKTsKIAotICAgICAgICBwcmludCBDSEFOR0VfTE9H IG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIgICAgICAgIFJldmlld2VkIGJ5ICRyZXZpZXdlci5cblxu IiwgJGVuZGwpOwotICAgICAgICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdz KCRkZXNjcmlwdGlvbiAuICJcbiIsICRlbmRsKSBpZiAkZGVzY3JpcHRpb247CisgICAgICAgICAg ICBwcmludCBDSEFOR0VfTE9HIG5vcm1hbGl6ZUxpbmVFbmRpbmdzKCIgICAgICAgIFJldmlld2Vk IGJ5ICRyZXZpZXdlci5cblxuIiwgJGVuZGwpOworICAgICAgICAgICAgcHJpbnQgQ0hBTkdFX0xP RyBub3JtYWxpemVMaW5lRW5kaW5ncygkZGVzY3JpcHRpb24gLiAiXG4iLCAkZW5kbCkgaWYgJGRl c2NyaXB0aW9uOworICAgICAgICB9CiAKICAgICAgICAgbXkgJHNob3VsZE1lbnRpb25UZXN0cyA9 IEAkcmVxdWlyZXNUZXN0czsKICAgICAgICAgJHNob3VsZE1lbnRpb25UZXN0cyB8PSAhJGhhc1dl YkNvcmVDaGFuZ2UgJiYgdW5peFBhdGgoJHByZWZpeCkgPX4gbXwvV2ViS2l0LyR8Owo=