187133 2018-06-27 21:25:36 -0700 Switch OS(FUCHSIA) to using JSCOnly 2018-06-28 01:03:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 abarth webkit-unassigned commit-queue dbates webkit-bug-importer ysuzuki oldest_to_newest 1437263 0 abarth 2018-06-27 21:25:36 -0700 Switch OS(FUCHSIA) to using JSCOnly 1437265 1 343792 abarth 2018-06-27 21:34:00 -0700 Created attachment 343792 Patch 1437275 2 343792 ysuzuki 2018-06-27 23:21:20 -0700 Comment on attachment 343792 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=343792&action=review > ChangeLog:9 > + Rather than creating a Fuchsia port, OS(FUCHSIA) now uses the JSCOnly > + port. OK, then, I think we should remove Fuchsia related things in webkitdir.pm. We can pass cmakeargs by using `--cmakeargs`. So basically, `Tools/Scripts/build-jsc --jsc-only --cmakeargs="-DCMAKE_TOOLCHAIN_FILE=XXX"` should work. > Tools/Scripts/webkitdirs.pm:152 > +my $targetingFuchsia; If we use JSCOnly port in Fuchsia OS, I think we do not need to check Fuchsia related things in webkitdirs.pm. We can just use `--jsc-only`, and we can remove Fuchsia related things in webkitdirs.pm. > Tools/Scripts/webkitdirs.pm:2212 > + my $toolchainFile = $ENV{'CMAKE_TOOLCHAIN_FILE'}; > + if ($toolchainFile) { > + push @args, "-DCMAKE_TOOLCHAIN_FILE=$toolchainFile"; > + } Why not passing it with `cmakeargs`? `Tools/Scripts/build-jsc --cmakeargs="-DCMAKE_TOOLCHAIN_FILE=XXX"` 1437277 3 343792 dbates 2018-06-27 23:34:29 -0700 Comment on attachment 343792 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=343792&action=review > Tools/Scripts/webkitdirs.pm:2209 > + my $toolchainFile = $ENV{'CMAKE_TOOLCHAIN_FILE'}; Minor: ‘ (single quote) => “ (double quote) Although unwritten, we prefer double-quoted string literals over single quoted ones unless we explicitly do not want string interpolation or using single quotes reduces the need to escape characters in the string. > Tools/Scripts/webkitdirs.pm:2211 > + push @args, "-DCMAKE_TOOLCHAIN_FILE=$toolchainFile"; This will not work correctly if the path has spaces in its name. We should take a similar approach as done for -DCMAKE_INSTALL_PREFIX and surround $toolchainFile in quotes. Is there a better way to write this code to handle a path that has embedded space characters? 1437278 4 343797 abarth 2018-06-27 23:38:17 -0700 Created attachment 343797 Patch 1437279 5 abarth 2018-06-27 23:40:33 -0700 > OK, then, I think we should remove Fuchsia related things in webkitdir.pm. > We can pass cmakeargs by using `--cmakeargs`. > So basically, `Tools/Scripts/build-jsc --jsc-only > --cmakeargs="-DCMAKE_TOOLCHAIN_FILE=XXX"` should work. Neat! > If we use JSCOnly port in Fuchsia OS, I think we do not need to check > Fuchsia related things in webkitdirs.pm. We can just use `--jsc-only`, and > we can remove Fuchsia related things in webkitdirs.pm. Yes, that seems to work. Done. > Why not passing it with `cmakeargs`? `Tools/Scripts/build-jsc > --cmakeargs="-DCMAKE_TOOLCHAIN_FILE=XXX"` Good idea. > Minor: ‘ (single quote) => “ (double quote) Removed. > Although unwritten, we prefer double-quoted string literals over single > quoted ones unless we explicitly do not want string interpolation or using > single quotes reduces the need to escape characters in the string. Got it. I've removed this code, in any case. > > Tools/Scripts/webkitdirs.pm:2211 > > + push @args, "-DCMAKE_TOOLCHAIN_FILE=$toolchainFile"; > > This will not work correctly if the path has spaces in its name. We should > take a similar approach as done for -DCMAKE_INSTALL_PREFIX and surround > $toolchainFile in quotes. Is there a better way to write this code to handle > a path that has embedded space characters? Apparently the best way to write this code is to delete it. :) 1437282 6 343797 ysuzuki 2018-06-27 23:41:43 -0700 Comment on attachment 343797 Patch r=me, nice! 1437283 7 343797 dbates 2018-06-27 23:45:44 -0700 Comment on attachment 343797 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=343797&action=review > Tools/ChangeLog:11 > + * Scripts/webkitdirs.pm: Please update this ChangeLog as this function listing is out of date. It would be good to explain that we are removing code from webkitdir.pm (and why) as well as explain how to build by passing --cmakeargs “...” to build-webkit. 1437284 8 abarth 2018-06-27 23:57:17 -0700 > Please update this ChangeLog as this function listing is out of date. Done. > It would be good to explain that we are removing code from webkitdir.pm (and > why) as well as explain how to build by passing --cmakeargs “...” to > build-webkit. I've been putting that information on the wiki: https://trac.webkit.org/wiki/Fuchsia 1437287 9 343799 abarth 2018-06-27 23:58:09 -0700 Created attachment 343799 Patch 1437297 10 343799 ysuzuki 2018-06-28 00:47:17 -0700 Comment on attachment 343799 Patch r=me 1437299 11 343799 commit-queue 2018-06-28 01:02:37 -0700 Comment on attachment 343799 Patch Clearing flags on attachment: 343799 Committed r233303: <https://trac.webkit.org/changeset/233303> 1437300 12 commit-queue 2018-06-28 01:02:39 -0700 All reviewed patches have been landed. Closing bug. 1437301 13 webkit-bug-importer 2018-06-28 01:03:18 -0700 <rdar://problem/41567155> 343792 2018-06-27 21:34:00 -0700 2018-06-27 23:38:15 -0700 Patch bug-187133-20180627213400.patch text/plain 10298 abarth SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDIzMzI5 NykKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA2 LTI3ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3dpdGNoIE9T KEZVQ0hTSUEpIHRvIHVzaW5nIEpTQ09ubHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4NzEzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJhdGhlciB0aGFuIGNyZWF0aW5nIGEgRnVjaHNpYSBwb3J0LCBP UyhGVUNIU0lBKSBub3cgdXNlcyB0aGUgSlNDT25seQorICAgICAgICBwb3J0LgorCisgICAgICAg ICogQ01ha2VMaXN0cy50eHQ6IFNldCB0aGUgV1RGX09TX0ZVQ0hTSUEgZmxhZworICAgICAgICAq IFNvdXJjZS9jbWFrZS9PcHRpb25zRnVjaHNpYS5jbWFrZTogUmVtb3ZlZC4KKyAgICAgICAgKiBT b3VyY2UvY21ha2UvT3B0aW9uc0pTQ09ubHkuY21ha2U6IFRlbXBvcmFyaWx5IGRpc2FibGUgSUNV IGZvcgorICAgICAgICBPUyhGVUNIU0lBKS4gV2UnbGwgZ2V0IElDVSB3aXJlZCBpbiwgYnV0IEkn ZCBsaWtlIHRvIHdvcmsgdGhyb3VnaCB0aGUKKyAgICAgICAgb3RoZXIgY29tcGlsZSBlcnJvcnMg Zmlyc3QuCisKIDIwMTgtMDYtMjcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAog ICAgICAgICBBZGQgRnVjaHNpYSBzdXBwb3J0IHRvIGJ1aWxkLWpzYwpJbmRleDogQ01ha2VMaXN0 cy50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gQ01ha2VMaXN0cy50eHQJKHJldmlzaW9uIDIzMzI5NykKKysr IENNYWtlTGlzdHMudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNyw2IEBAIGVuZGlmICgp CiBzZXQoQUxMX1BPUlRTCiAgICAgQXBwbGVXaW4KICAgICBFZmwKLSAgICBGdWNoc2lhCiAgICAg R1RLCiAgICAgSlNDT25seQogICAgIE1hYwpAQCAtMTE1LDYgKzExNCw4IEBAIGlmIChVTklYKQog ICAgIGVuZGlmICgpCiBlbHNlaWYgKENNQUtFX1NZU1RFTV9OQU1FIE1BVENIRVMgIldpbmRvd3Mi KQogICAgIHNldChXVEZfT1NfV0lORE9XUyAxKQorZWxzZWlmIChDTUFLRV9TWVNURU1fTkFNRSBN QVRDSEVTICJGdWNoc2lhIikKKyAgICBzZXQoV1RGX09TX0ZVQ0hTSUEgMSkKIGVsc2UgKCkKICAg ICBtZXNzYWdlKEZBVEFMX0VSUk9SICJVbmtub3duIE9TICcke0NNQUtFX1NZU1RFTV9OQU1FfSci KQogZW5kaWYgKCkKSW5kZXg6IFNvdXJjZS9jbWFrZS9PcHRpb25zRnVjaHNpYS5jbWFrZQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvY21ha2UvT3B0aW9uc0Z1Y2hzaWEuY21ha2UJKHJldmlzaW9uIDIz MzI5NykKKysrIFNvdXJjZS9jbWFrZS9PcHRpb25zRnVjaHNpYS5jbWFrZQkobm9uZXhpc3RlbnQp CkBAIC0xLDI5ICswLDAgQEAKLXNldChQUk9KRUNUX1ZFUlNJT05fTUFKT1IgMSkKLXNldChQUk9K RUNUX1ZFUlNJT05fTUlOT1IgMCkKLXNldChQUk9KRUNUX1ZFUlNJT05fTUlDUk8gMCkKLXNldChQ Uk9KRUNUX1ZFUlNJT04gJHtQUk9KRUNUX1ZFUlNJT05fTUFKT1J9LiR7UFJPSkVDVF9WRVJTSU9O X01JTk9SfS4ke1BST0pFQ1RfVkVSU0lPTl9NSUNST30pCi0KLXNldChDTUFLRV9TWVNURU1fTkFN RSBGdWNoc2lhKQotCi1pZiAoV1RGX0NQVV9BUk02NCkKLSAgICBzZXQodHJpcGxlIGFhcmNoNjQt dW5rbm93bi1mdWNoc2lhKQotZWxzZWlmIChXVEZfQ1BVX1g4Nl82NCkKLSAgICBzZXQodHJpcGxl IHg4Nl82NC11bmtub3duLWZ1Y2hzaWEpCi1lbHNlICgpCi0gICAgbWVzc2FnZShGQVRBTF9FUlJP UiAiVW5rbm93biBBUkNIICcke0NNQUtFX1NZU1RFTV9QUk9DRVNTT1J9JyIpCi1lbmRpZiAoKQot Ci1zZXQoQ01BS0VfQ19DT01QSUxFUl9UQVJHRVQgJHt0cmlwbGV9KQotc2V0KENNQUtFX0NYWF9D T01QSUxFUl9UQVJHRVQgJHt0cmlwbGV9KQotCi1XRUJLSVRfT1BUSU9OX0JFR0lOKCkKLVdFQktJ VF9PUFRJT05fREVGSU5FKEVOQUJMRV9TVEFUSUNfSlNDICJXaGV0aGVyIHRvIGJ1aWxkIEphdmFT Y3JpcHRDb3JlIGFzIGEgc3RhdGljIGxpYnJhcnkuIiBQVUJMSUMgT0ZGKQotV0VCS0lUX09QVElP Tl9FTkQoKQotCi1zZXQoRU5BQkxFX1dFQkNPUkUgT0ZGKQotc2V0KEVOQUJMRV9XRUJLSVRfTEVH QUNZIE9GRikKLXNldChFTkFCTEVfV0VCS0lUIE9GRikKLXNldChFTkFCTEVfQVBJX1RFU1RTIE9G RikKLQotU0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoVVNFX0dFTkVSSUNfRVZFTlRfTE9PUCAxKQot U0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoV1RGX0RFRkFVTFRfRVZFTlRfTE9PUCAwKQpJbmRleDog U291cmNlL2NtYWtlL09wdGlvbnNKU0NPbmx5LmNtYWtlCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9j bWFrZS9PcHRpb25zSlNDT25seS5jbWFrZQkocmV2aXNpb24gMjMzMjk3KQorKysgU291cmNlL2Nt YWtlL09wdGlvbnNKU0NPbmx5LmNtYWtlCSh3b3JraW5nIGNvcHkpCkBAIC05Nyw3ICs5NywxMCBA QCBlbHNlICgpCiBlbmRpZiAoKQogCiBpZiAoTk9UIEFQUExFKQotICAgIGZpbmRfcGFja2FnZShJ Q1UgUkVRVUlSRUQpCisgICAgaWYgKE5PVCBXVEZfT1NfRlVDSFNJQSkKKyAgICAgICAgIyBUT0RP OiBBZGQgSUNVIG9uIEZ1Y2hzaWEuCisgICAgICAgIGZpbmRfcGFja2FnZShJQ1UgUkVRVUlSRUQp CisgICAgZW5kaWYgKCkKIGVsc2UgKCkKICAgICBhZGRfZGVmaW5pdGlvbnMoLURVX0RJU0FCTEVf UkVOQU1JTkc9MSAtRFVfU0hPV19DUExVU1BMVVNfQVBJPTApCiAgICAgc2V0KElDVV9MSUJSQVJJ RVMgbGliaWN1Y29yZS5keWxpYikKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMzMwMCkKKysrIFRvb2xzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA2LTI3ICBBZGFtIEJhcnRoICA8 YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3dpdGNoIE9TKEZVQ0hTSUEpIHRvIHVzaW5n IEpTQ09ubHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4NzEzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFN3aXRjaCBGdWNoc2lhIGZyb20gYmVpbmcgYSBwb3J0IHRvIGp1c3QgYmVpbmcgYW4gT1MuIFdl IG5vdyB1c2UgYQorICAgICAgICBDTUFLRV9UT09MQ0hBSU5fRklMRSB0byBjb25maWd1cmUgdGhl IHRvb2xjaGFpbiBhbmQgdGhlIHRhcmdldCB0cmlwbGUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVTb3VyY2VEaXIpOgorICAgICAgICAoZGV0 ZXJtaW5lWGNvZGVTREspOgorICAgICAgICAoZmluZE1hdGNoaW5nQXJndW1lbnRzKToKKyAgICAg ICAgKGRldGVybWluZVBvcnROYW1lKToKKyAgICAgICAgKGRldGVybWluZUlmVGFyZ2V0aW5nRnVj aHNpYSk6CisgICAgICAgIChpc0Z1Y2hzaWEpOgorICAgICAgICAoc2V0dXBBcHBsZVdpbkVudik6 CisgICAgICAgIChnZW5lcmF0ZUJ1aWxkU3lzdGVtRnJvbUNNYWtlUHJvamVjdCk6CisgICAgICAg IChyZWxhdW5jaElPU1NpbXVsYXRvcik6CisgICAgICAgIChkZWJ1Z01pbmlCcm93c2VyKToKKwog MjAxOC0wNi0yNyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAg QWRkIHNvbWUgdGVzdHMgZm9yIGxsZGJfd2Via2l0LnB5CkluZGV4OiBUb29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShy ZXZpc2lvbiAyMzMyOTcpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcg Y29weSkKQEAgLTgsMTMgKzgsMTMgQEAKICMgYXJlIG1ldDoKICMKICMgMS4gIFJlZGlzdHJpYnV0 aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0jICAg ICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIuIAorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyLgogIyAyLiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3Jt IG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKICMgICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSMg ICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRo ZSBkaXN0cmlidXRpb24uIAorIyAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KICMgMy4gIE5laXRoZXIgdGhlIG5h bWUgb2YgQXBwbGUgSW5jLiAoIkFwcGxlIikgbm9yIHRoZSBuYW1lcyBvZgogIyAgICAgaXRzIGNv bnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVy aXZlZAotIyAgICAgZnJvbSB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3Jp dHRlbiBwZXJtaXNzaW9uLiAKKyMgICAgIGZyb20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNp ZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KICMKICMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9W SURFRCBCWSBBUFBMRSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMgSVMiIEFORCBBTlkKICMgRVhQ UkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LCBUSEUgSU1QTElFRApAQCAtMTA0LDcgKzEwNCw2IEBAIEJFR0lOIHsKICMgUG9ydHMKIHVzZSBj b25zdGFudCB7CiAgICAgQXBwbGVXaW4gPT4gIkFwcGxlV2luIiwKLSAgICBGdWNoc2lhICA9PiAi RnVjaHNpYSIsCiAgICAgR1RLICAgICAgPT4gIkdUSyIsCiAgICAgaU9TICAgICAgPT4gImlPUyIs CiAgICAgdHZPUyAgICAgPT4gInR2T1MiLApAQCAtMTUwLDYgKzE0OSw3IEBAIG15ICRzaG91bGRC dWlsZDMyQml0OwogbXkgJGlzV2luNjQ7CiBteSAkaXNJbnNwZWN0b3JGcm9udGVuZDsKIG15ICRw b3J0TmFtZTsKK215ICR0YXJnZXRpbmdGdWNoc2lhOwogbXkgJHNob3VsZFVzZUd1YXJkTWFsbG9j OwogbXkgJHNob3VsZE5vdFVzZU5pbmphOwogbXkgJHhjb2RlVmVyc2lvbjsKQEAgLTE5NSw3ICsx OTUsNyBAQCBzdWIgZGV0ZXJtaW5lU291cmNlRGlyCiAgICAgJHNvdXJjZURpciA9ICRGaW5kQmlu OjpCaW47CiAgICAgJHNvdXJjZURpciA9fiBzfC8rJHx8OyAjIFJlbW92ZSB0cmFpbGluZyAnLycg YXMgd2Ugd291bGQgZGllIGxhdGVyCiAKLSAgICAjIHdhbGtzIHVwIHBhdGggY2hlY2tpbmcgZWFj aCBkaXJlY3RvcnkgdG8gc2VlIGlmIGl0IGlzIHRoZSBtYWluIFdlYktpdCBwcm9qZWN0IGRpciwg CisgICAgIyB3YWxrcyB1cCBwYXRoIGNoZWNraW5nIGVhY2ggZGlyZWN0b3J5IHRvIHNlZSBpZiBp dCBpcyB0aGUgbWFpbiBXZWJLaXQgcHJvamVjdCBkaXIsCiAgICAgIyBkZWZpbmVkIGJ5IGNvbnRh aW5pbmcgU291cmNlcywgV2ViQ29yZSwgYW5kIEphdmFTY3JpcHRDb3JlLgogICAgIHVudGlsICgo LWQgRmlsZTo6U3BlYy0+Y2F0ZGlyKCRzb3VyY2VEaXIsICJTb3VyY2UiKSAmJiAtZCBGaWxlOjpT cGVjLT5jYXRkaXIoJHNvdXJjZURpciwgIlNvdXJjZSIsICJXZWJDb3JlIikgJiYgLWQgRmlsZTo6 U3BlYy0+Y2F0ZGlyKCRzb3VyY2VEaXIsICJTb3VyY2UiLCAiSmF2YVNjcmlwdENvcmUiKSkgfHwg KC1kIEZpbGU6OlNwZWMtPmNhdGRpcigkc291cmNlRGlyLCAiSW50ZXJuYWwiKSAmJiAtZCBGaWxl OjpTcGVjLT5jYXRkaXIoJHNvdXJjZURpciwgIk9wZW5Tb3VyY2UiKSkpCiAgICAgewpAQCAtNTM3 LDcgKzUzNyw3IEBAIHN1YiBkZXRlcm1pbmVYY29kZVNESwogewogICAgIHJldHVybiBpZiBkZWZp bmVkICR4Y29kZVNESzsKICAgICBteSAkc2RrOwotICAgIAorCiAgICAgIyBUaGUgdXNlciBleHBs aWNpdGx5IHNwZWNpZmllZCB0aGUgc2RrLCBkb24ndCBhc3N1bWUgYW55dGhpbmcKICAgICBpZiAo Y2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWR2V0dGluZ1ZhbHVlKCItLXNkayIsIFwk c2RrKSkgewogICAgICAgICAkeGNvZGVTREsgPSAkc2RrOwpAQCAtNTYyLDcgKzU2Miw3IEBAIHN1 YiBkZXRlcm1pbmVYY29kZVNESwogICAgICAgICAkeGNvZGVTREsgfHw9ICJ3YXRjaHNpbXVsYXRv ciI7CiAgICAgfQogICAgIHJldHVybiBpZiAhZGVmaW5lZCAkeGNvZGVTREs7Ci0gICAgCisKICAg ICAjIFByZWZlciB0aGUgaW50ZXJuYWwgdmVyc2lvbiBvZiBhbiBzZGssIGlmIGl0IGV4aXN0cy4K ICAgICBteSBAYXZhaWxhYmxlU0RLcyA9IGF2YWlsYWJsZVhjb2RlU0RLcygpOwogCkBAIC0xMTYw LDcgKzExNjAsNyBAQCBzdWIgZmluZE1hdGNoaW5nQXJndW1lbnRzKCQkKQogICAgICAgICAgICAg cHVzaChAbWF0Y2hpbmdJbmRpY2VzLCAkaW5kZXgpOwogICAgICAgICB9CiAgICAgfQotICAgIHJl dHVybiBAbWF0Y2hpbmdJbmRpY2VzOyAKKyAgICByZXR1cm4gQG1hdGNoaW5nSW5kaWNlczsKIH0K IAogc3ViIGhhc0FyZ3VtZW50KCQkKQpAQCAtMTE5MSw3ICsxMTkxLDYgQEAgc3ViIGRldGVybWlu ZVBvcnROYW1lKCkKICAgICByZXR1cm4gaWYgZGVmaW5lZCAkcG9ydE5hbWU7CiAKICAgICBteSAl YXJnVG9Qb3J0TmFtZSA9ICgKLSAgICAgICAgZnVjaHNpYSA9PiBGdWNoc2lhLAogICAgICAgICBn dGsgPT4gR1RLLAogICAgICAgICAnanNjLW9ubHknID0+IEpTQ09ubHksCiAgICAgICAgIHdpbmNh aXJvID0+IFdpbkNhaXJvLApAQCAtMTI0Nyw5ICsxMjQ2LDE2IEBAIHN1YiBwb3J0TmFtZSgpCiAg ICAgcmV0dXJuICRwb3J0TmFtZTsKIH0KIAorc3ViIGRldGVybWluZUlmVGFyZ2V0aW5nRnVjaHNp YSgpCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQgJHRhcmdldGluZ0Z1Y2hzaWE7CisgICAgJHRh cmdldGluZ0Z1Y2hzaWEgPSBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tZnVj aHNpYSIpOworfQorCiBzdWIgaXNGdWNoc2lhKCkKIHsKLSAgICByZXR1cm4gcG9ydE5hbWUoKSBl cSBGdWNoc2lhOworICAgIGRldGVybWluZUlmVGFyZ2V0aW5nRnVjaHNpYSgpOworICAgIHJldHVy biAkdGFyZ2V0aW5nRnVjaHNpYTsKIH0KIAogc3ViIGlzR3RrKCkKQEAgLTE4MTIsNyArMTgxOCw3 IEBAIHN1YiBzZXR1cEFwcGxlV2luRW52KCkKICAgICAgICAgbXkgJHJlc3RhcnROZWVkZWQgPSAw OwogICAgICAgICBteSAldmFyaWFibGVzVG9TZXQgPSAoKTsKIAotICAgICAgICAjIEZJWE1FOiBX ZSBzaG91bGQgcmVtb3ZlIHRoaXMgZXhwbGljaXQgdmVyc2lvbiBjaGVjayBmb3IgY3lnd2luIG9u Y2Ugd2Ugc3RvcCBzdXBwb3J0aW5nIEN5Z3dpbiAxLjcuOSBvciBvbGRlciB2ZXJzaW9ucy4gCisg ICAgICAgICMgRklYTUU6IFdlIHNob3VsZCByZW1vdmUgdGhpcyBleHBsaWNpdCB2ZXJzaW9uIGNo ZWNrIGZvciBjeWd3aW4gb25jZSB3ZSBzdG9wIHN1cHBvcnRpbmcgQ3lnd2luIDEuNy45IG9yIG9s ZGVyIHZlcnNpb25zLgogICAgICAgICAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04NTc5MQogICAgICAgICBteSAkdW5hbWVfdmVyc2lvbiA9IChQT1NJWDo6dW5hbWUo KSlbMl07CiAgICAgICAgICR1bmFtZV92ZXJzaW9uID1+IHMvXCguKlwpLy87ICAjIFJlbW92ZSB0 aGUgdHJhaWxpbmcgY3lnd2luIHZlcnNpb24sIGlmIGFueS4KQEAgLTE4MjIsNyArMTgyOCw3IEBA IHN1YiBzZXR1cEFwcGxlV2luRW52KCkKICAgICAgICAgICAgICMgZm9yIFVOSVgtbGlrZSB0dHlz IGluIHRoZSBXaW5kb3dzIGNvbnNvbGUKICAgICAgICAgICAgICR2YXJpYWJsZXNUb1NldHtDWUdX SU59ID0gInR0eSIgdW5sZXNzICRFTlZ7Q1lHV0lOfTsKICAgICAgICAgfQotICAgICAgICAKKwog ICAgICAgICAjIFRob3NlIGVudmlyb25tZW50IHZhcmlhYmxlcyBtdXN0IGJlIHNldCB0byBiZSBh YmxlIHRvIGJ1aWxkIGluc2lkZSBWaXN1YWwgU3R1ZGlvLgogICAgICAgICAkdmFyaWFibGVzVG9T ZXR7V0VCS0lUX0xJQlJBUklFU30gPSB3aW5kb3dzTGlicmFyaWVzRGlyKCkgdW5sZXNzICRFTlZ7 V0VCS0lUX0xJQlJBUklFU307CiAgICAgICAgICR2YXJpYWJsZXNUb1NldHtXRUJLSVRfT1VUUFVU RElSfSA9IHdpbmRvd3NPdXRwdXREaXIoKSB1bmxlc3MgJEVOVntXRUJLSVRfT1VUUFVURElSfTsK QEAgLTIyMDAsNiArMjIwNiwxMSBAQCBzdWIgZ2VuZXJhdGVCdWlsZFN5c3RlbUZyb21DTWFrZVBy b2plY3QKICAgICAgICAgcHVzaCBAYXJncywgIi1EQ01BS0VfQlVJTERfVFlQRT1EZWJ1ZyI7CiAg ICAgfQogCisgICAgbXkgJHRvb2xjaGFpbkZpbGUgPSAkRU5WeydDTUFLRV9UT09MQ0hBSU5fRklM RSd9OworICAgIGlmICgkdG9vbGNoYWluRmlsZSkgeworICAgICAgICBwdXNoIEBhcmdzLCAiLURD TUFLRV9UT09MQ0hBSU5fRklMRT0kdG9vbGNoYWluRmlsZSI7CisgICAgfQorCiAgICAgaWYgKCR3 aWxsVXNlTmluamEpIHsKICAgICAgICAgcHVzaCBAYXJncywgIi1HIjsKICAgICAgICAgaWYgKGNh blVzZUVjbGlwc2VOaW5qYUdlbmVyYXRvcigpKSB7CkBAIC0yNTI5LDkgKzI1NDAsOSBAQCBzdWIg cmVsYXVuY2hJT1NTaW11bGF0b3IoJCkKICAgICBxdWl0SU9TU2ltdWxhdG9yKCRzaW11bGF0ZWRE ZXZpY2UtPntVRElEfSk7CiAKICAgICAjIEZJWE1FOiA8cmRhcjovL3Byb2JsZW0vMjA5MTYxNDA+ IFN3aXRjaCB0byB1c2luZyBDb3JlU2ltdWxhdG9yLmZyYW1ld29yayBmb3IgbGF1bmNoaW5nIGFu ZCBxdWl0dGluZyBpT1MgU2ltdWxhdG9yCi0gICAgY2hvbXAobXkgJGRldmVsb3BlckRpcmVjdG9y eSA9ICRFTlZ7REVWRUxPUEVSX0RJUn0gfHwgYHhjb2RlLXNlbGVjdCAtLXByaW50LXBhdGhgKTsg Ci0gICAgbXkgJGlvc1NpbXVsYXRvclBhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRkZXZlbG9w ZXJEaXJlY3RvcnksICJBcHBsaWNhdGlvbnMiLCAiU2ltdWxhdG9yLmFwcCIpOyAKLSAgICBzeXN0 ZW0oIm9wZW4iLCAiLWEiLCAkaW9zU2ltdWxhdG9yUGF0aCwgIi0tYXJncyIsICItQ3VycmVudERl dmljZVVESUQiLCAkc2ltdWxhdGVkRGV2aWNlLT57VURJRH0pID09IDAgb3IgZGllICJGYWlsZWQg dG8gb3BlbiAkaW9zU2ltdWxhdG9yUGF0aDogJCEiOyAKKyAgICBjaG9tcChteSAkZGV2ZWxvcGVy RGlyZWN0b3J5ID0gJEVOVntERVZFTE9QRVJfRElSfSB8fCBgeGNvZGUtc2VsZWN0IC0tcHJpbnQt cGF0aGApOworICAgIG15ICRpb3NTaW11bGF0b3JQYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgk ZGV2ZWxvcGVyRGlyZWN0b3J5LCAiQXBwbGljYXRpb25zIiwgIlNpbXVsYXRvci5hcHAiKTsKKyAg ICBzeXN0ZW0oIm9wZW4iLCAiLWEiLCAkaW9zU2ltdWxhdG9yUGF0aCwgIi0tYXJncyIsICItQ3Vy cmVudERldmljZVVESUQiLCAkc2ltdWxhdGVkRGV2aWNlLT57VURJRH0pID09IDAgb3IgZGllICJG YWlsZWQgdG8gb3BlbiAkaW9zU2ltdWxhdG9yUGF0aDogJCEiOwogCiAgICAgd2FpdFVudGlsSU9T U2ltdWxhdG9yRGV2aWNlSXNJblN0YXRlKCRzaW11bGF0ZWREZXZpY2UtPntVRElEfSwgU0lNVUxB VE9SX0RFVklDRV9TVEFURV9CT09URUQpOwogICAgIHdhaXRVbnRpbFByb2Nlc3NOb3RSdW5uaW5n KCJjb20uYXBwbGUuZGF0YW1pZ3JhdG9yIik7CkBAIC0yODE3LDcgKzI4MjgsNyBAQCBzdWIgZGVi dWdNaW5pQnJvd3NlcgogICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICAgICAgZXhl Y01hY1dlYktpdEFwcEZvckRlYnVnZ2luZyhGaWxlOjpTcGVjLT5jYXRmaWxlKHByb2R1Y3REaXIo KSwgIk1pbmlCcm93c2VyLmFwcCIsICJDb250ZW50cyIsICJNYWNPUyIsICJNaW5pQnJvd3NlciIp KTsKICAgICB9Ci0gICAgCisKICAgICByZXR1cm4gMTsKIH0KIAo= 343797 2018-06-27 23:38:17 -0700 2018-06-27 23:58:07 -0700 Patch bug-187133-20180627233816.patch text/plain 5492 abarth SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDIzMzI5 NykKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA2 LTI3ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3dpdGNoIE9T KEZVQ0hTSUEpIHRvIHVzaW5nIEpTQ09ubHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4NzEzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJhdGhlciB0aGFuIGNyZWF0aW5nIGEgRnVjaHNpYSBwb3J0LCBP UyhGVUNIU0lBKSBub3cgdXNlcyB0aGUgSlNDT25seQorICAgICAgICBwb3J0LgorCisgICAgICAg ICogQ01ha2VMaXN0cy50eHQ6IFNldCB0aGUgV1RGX09TX0ZVQ0hTSUEgZmxhZworICAgICAgICAq IFNvdXJjZS9jbWFrZS9PcHRpb25zRnVjaHNpYS5jbWFrZTogUmVtb3ZlZC4KKyAgICAgICAgKiBT b3VyY2UvY21ha2UvT3B0aW9uc0pTQ09ubHkuY21ha2U6IFRlbXBvcmFyaWx5IGRpc2FibGUgSUNV IGZvcgorICAgICAgICBPUyhGVUNIU0lBKS4gV2UnbGwgZ2V0IElDVSB3aXJlZCBpbiwgYnV0IEkn ZCBsaWtlIHRvIHdvcmsgdGhyb3VnaCB0aGUKKyAgICAgICAgb3RoZXIgY29tcGlsZSBlcnJvcnMg Zmlyc3QuCisKIDIwMTgtMDYtMjcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAog ICAgICAgICBBZGQgRnVjaHNpYSBzdXBwb3J0IHRvIGJ1aWxkLWpzYwpJbmRleDogQ01ha2VMaXN0 cy50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gQ01ha2VMaXN0cy50eHQJKHJldmlzaW9uIDIzMzI5NykKKysr IENNYWtlTGlzdHMudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNyw2IEBAIGVuZGlmICgp CiBzZXQoQUxMX1BPUlRTCiAgICAgQXBwbGVXaW4KICAgICBFZmwKLSAgICBGdWNoc2lhCiAgICAg R1RLCiAgICAgSlNDT25seQogICAgIE1hYwpAQCAtMTE1LDYgKzExNCw4IEBAIGlmIChVTklYKQog ICAgIGVuZGlmICgpCiBlbHNlaWYgKENNQUtFX1NZU1RFTV9OQU1FIE1BVENIRVMgIldpbmRvd3Mi KQogICAgIHNldChXVEZfT1NfV0lORE9XUyAxKQorZWxzZWlmIChDTUFLRV9TWVNURU1fTkFNRSBN QVRDSEVTICJGdWNoc2lhIikKKyAgICBzZXQoV1RGX09TX0ZVQ0hTSUEgMSkKIGVsc2UgKCkKICAg ICBtZXNzYWdlKEZBVEFMX0VSUk9SICJVbmtub3duIE9TICcke0NNQUtFX1NZU1RFTV9OQU1FfSci KQogZW5kaWYgKCkKSW5kZXg6IFNvdXJjZS9jbWFrZS9PcHRpb25zRnVjaHNpYS5jbWFrZQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvY21ha2UvT3B0aW9uc0Z1Y2hzaWEuY21ha2UJKHJldmlzaW9uIDIz MzI5NykKKysrIFNvdXJjZS9jbWFrZS9PcHRpb25zRnVjaHNpYS5jbWFrZQkobm9uZXhpc3RlbnQp CkBAIC0xLDI5ICswLDAgQEAKLXNldChQUk9KRUNUX1ZFUlNJT05fTUFKT1IgMSkKLXNldChQUk9K RUNUX1ZFUlNJT05fTUlOT1IgMCkKLXNldChQUk9KRUNUX1ZFUlNJT05fTUlDUk8gMCkKLXNldChQ Uk9KRUNUX1ZFUlNJT04gJHtQUk9KRUNUX1ZFUlNJT05fTUFKT1J9LiR7UFJPSkVDVF9WRVJTSU9O X01JTk9SfS4ke1BST0pFQ1RfVkVSU0lPTl9NSUNST30pCi0KLXNldChDTUFLRV9TWVNURU1fTkFN RSBGdWNoc2lhKQotCi1pZiAoV1RGX0NQVV9BUk02NCkKLSAgICBzZXQodHJpcGxlIGFhcmNoNjQt dW5rbm93bi1mdWNoc2lhKQotZWxzZWlmIChXVEZfQ1BVX1g4Nl82NCkKLSAgICBzZXQodHJpcGxl IHg4Nl82NC11bmtub3duLWZ1Y2hzaWEpCi1lbHNlICgpCi0gICAgbWVzc2FnZShGQVRBTF9FUlJP UiAiVW5rbm93biBBUkNIICcke0NNQUtFX1NZU1RFTV9QUk9DRVNTT1J9JyIpCi1lbmRpZiAoKQot Ci1zZXQoQ01BS0VfQ19DT01QSUxFUl9UQVJHRVQgJHt0cmlwbGV9KQotc2V0KENNQUtFX0NYWF9D T01QSUxFUl9UQVJHRVQgJHt0cmlwbGV9KQotCi1XRUJLSVRfT1BUSU9OX0JFR0lOKCkKLVdFQktJ VF9PUFRJT05fREVGSU5FKEVOQUJMRV9TVEFUSUNfSlNDICJXaGV0aGVyIHRvIGJ1aWxkIEphdmFT Y3JpcHRDb3JlIGFzIGEgc3RhdGljIGxpYnJhcnkuIiBQVUJMSUMgT0ZGKQotV0VCS0lUX09QVElP Tl9FTkQoKQotCi1zZXQoRU5BQkxFX1dFQkNPUkUgT0ZGKQotc2V0KEVOQUJMRV9XRUJLSVRfTEVH QUNZIE9GRikKLXNldChFTkFCTEVfV0VCS0lUIE9GRikKLXNldChFTkFCTEVfQVBJX1RFU1RTIE9G RikKLQotU0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoVVNFX0dFTkVSSUNfRVZFTlRfTE9PUCAxKQot U0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoV1RGX0RFRkFVTFRfRVZFTlRfTE9PUCAwKQpJbmRleDog U291cmNlL2NtYWtlL09wdGlvbnNKU0NPbmx5LmNtYWtlCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9j bWFrZS9PcHRpb25zSlNDT25seS5jbWFrZQkocmV2aXNpb24gMjMzMjk3KQorKysgU291cmNlL2Nt YWtlL09wdGlvbnNKU0NPbmx5LmNtYWtlCSh3b3JraW5nIGNvcHkpCkBAIC05Nyw3ICs5NywxMCBA QCBlbHNlICgpCiBlbmRpZiAoKQogCiBpZiAoTk9UIEFQUExFKQotICAgIGZpbmRfcGFja2FnZShJ Q1UgUkVRVUlSRUQpCisgICAgaWYgKE5PVCBXVEZfT1NfRlVDSFNJQSkKKyAgICAgICAgIyBUT0RP OiBBZGQgSUNVIG9uIEZ1Y2hzaWEuCisgICAgICAgIGZpbmRfcGFja2FnZShJQ1UgUkVRVUlSRUQp CisgICAgZW5kaWYgKCkKIGVsc2UgKCkKICAgICBhZGRfZGVmaW5pdGlvbnMoLURVX0RJU0FCTEVf UkVOQU1JTkc9MSAtRFVfU0hPV19DUExVU1BMVVNfQVBJPTApCiAgICAgc2V0KElDVV9MSUJSQVJJ RVMgbGliaWN1Y29yZS5keWxpYikKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMzMwMCkKKysrIFRvb2xzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA2LTI3ICBBZGFtIEJhcnRoICA8 YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3dpdGNoIE9TKEZVQ0hTSUEpIHRvIHVzaW5n IEpTQ09ubHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4NzEzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFN3aXRjaCBGdWNoc2lhIGZyb20gYmVpbmcgYSBwb3J0IHRvIGp1c3QgYmVpbmcgYW4gT1MuIFdl IG5vdyB1c2UgYQorICAgICAgICBDTUFLRV9UT09MQ0hBSU5fRklMRSB0byBjb25maWd1cmUgdGhl IHRvb2xjaGFpbiBhbmQgdGhlIHRhcmdldCB0cmlwbGUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVTb3VyY2VEaXIpOgorICAgICAgICAoZGV0 ZXJtaW5lWGNvZGVTREspOgorICAgICAgICAoZmluZE1hdGNoaW5nQXJndW1lbnRzKToKKyAgICAg ICAgKGRldGVybWluZVBvcnROYW1lKToKKyAgICAgICAgKGRldGVybWluZUlmVGFyZ2V0aW5nRnVj aHNpYSk6CisgICAgICAgIChpc0Z1Y2hzaWEpOgorICAgICAgICAoc2V0dXBBcHBsZVdpbkVudik6 CisgICAgICAgIChnZW5lcmF0ZUJ1aWxkU3lzdGVtRnJvbUNNYWtlUHJvamVjdCk6CisgICAgICAg IChyZWxhdW5jaElPU1NpbXVsYXRvcik6CisgICAgICAgIChkZWJ1Z01pbmlCcm93c2VyKToKKwog MjAxOC0wNi0yNyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAg QWRkIHNvbWUgdGVzdHMgZm9yIGxsZGJfd2Via2l0LnB5CkluZGV4OiBUb29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCShy ZXZpc2lvbiAyMzMyOTcpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHdvcmtpbmcg Y29weSkKQEAgLTEwNCw3ICsxMDQsNiBAQCBCRUdJTiB7CiAjIFBvcnRzCiB1c2UgY29uc3RhbnQg ewogICAgIEFwcGxlV2luID0+ICJBcHBsZVdpbiIsCi0gICAgRnVjaHNpYSAgPT4gIkZ1Y2hzaWEi LAogICAgIEdUSyAgICAgID0+ICJHVEsiLAogICAgIGlPUyAgICAgID0+ICJpT1MiLAogICAgIHR2 T1MgICAgID0+ICJ0dk9TIiwKQEAgLTQ3Nyw3ICs0NzYsNiBAQCBzdWIgYXJndW1lbnRzRm9yQ29u ZmlndXJhdGlvbigpCiAgICAgcHVzaChAYXJncywgJy0taW9zLXNpbXVsYXRvcicpIGlmIChkZWZp bmVkICR4Y29kZVNESyAmJiAkeGNvZGVTREsgPX4gL15pcGhvbmVzaW11bGF0b3IvKTsKICAgICBw dXNoKEBhcmdzLCAnLS0zMi1iaXQnKSBpZiAoJGFyY2hpdGVjdHVyZSBuZSAieDg2XzY0IiBhbmQg IWlzV2luNjQoKSk7CiAgICAgcHVzaChAYXJncywgJy0tNjQtYml0JykgaWYgKGlzV2luNjQoKSk7 Ci0gICAgcHVzaChAYXJncywgJy0tZnVjaHNpYScpIGlmIGlzRnVjaHNpYSgpOwogICAgIHB1c2go QGFyZ3MsICctLWd0aycpIGlmIGlzR3RrKCk7CiAgICAgcHVzaChAYXJncywgJy0td3BlJykgaWYg aXNXUEUoKTsKICAgICBwdXNoKEBhcmdzLCAnLS1qc2Mtb25seScpIGlmIGlzSlNDT25seSgpOwpA QCAtMTE5MSw3ICsxMTg5LDYgQEAgc3ViIGRldGVybWluZVBvcnROYW1lKCkKICAgICByZXR1cm4g aWYgZGVmaW5lZCAkcG9ydE5hbWU7CiAKICAgICBteSAlYXJnVG9Qb3J0TmFtZSA9ICgKLSAgICAg ICAgZnVjaHNpYSA9PiBGdWNoc2lhLAogICAgICAgICBndGsgPT4gR1RLLAogICAgICAgICAnanNj LW9ubHknID0+IEpTQ09ubHksCiAgICAgICAgIHdpbmNhaXJvID0+IFdpbkNhaXJvLApAQCAtMTI0 NywxMSArMTI0NCw2IEBAIHN1YiBwb3J0TmFtZSgpCiAgICAgcmV0dXJuICRwb3J0TmFtZTsKIH0K IAotc3ViIGlzRnVjaHNpYSgpCi17Ci0gICAgcmV0dXJuIHBvcnROYW1lKCkgZXEgRnVjaHNpYTsK LX0KLQogc3ViIGlzR3RrKCkKIHsKICAgICByZXR1cm4gcG9ydE5hbWUoKSBlcSBHVEs7CkBAIC0y MDMxLDcgKzIwMjMsNyBAQCBzdWIgaXNDYWNoZWRBcmd1bWVudGZpbGVPdXRPZkRhdGUoJEApCiAK IHN1YiB3cmFwcGVyUHJlZml4SWZOZWVkZWQoKQogewotICAgIGlmIChpc0FueVdpbmRvd3MoKSB8 fCBpc0pTQ09ubHkoKSB8fCBpc0Z1Y2hzaWEoKSkgeworICAgIGlmIChpc0FueVdpbmRvd3MoKSB8 fCBpc0pTQ09ubHkoKSkgewogICAgICAgICByZXR1cm4gKCk7CiAgICAgfQogICAgIGlmIChpc0Fw cGxlQ29jb2FXZWJLaXQoKSkgewo= 343799 2018-06-27 23:58:09 -0700 2018-06-28 01:02:37 -0700 Patch bug-187133-20180627235809.patch text/plain 5310 abarth SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDIzMzI5 NykKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA2 LTI3ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3dpdGNoIE9T KEZVQ0hTSUEpIHRvIHVzaW5nIEpTQ09ubHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4NzEzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJhdGhlciB0aGFuIGNyZWF0aW5nIGEgRnVjaHNpYSBwb3J0LCBP UyhGVUNIU0lBKSBub3cgdXNlcyB0aGUgSlNDT25seQorICAgICAgICBwb3J0LgorCisgICAgICAg ICogQ01ha2VMaXN0cy50eHQ6IFNldCB0aGUgV1RGX09TX0ZVQ0hTSUEgZmxhZworICAgICAgICAq IFNvdXJjZS9jbWFrZS9PcHRpb25zRnVjaHNpYS5jbWFrZTogUmVtb3ZlZC4KKyAgICAgICAgKiBT b3VyY2UvY21ha2UvT3B0aW9uc0pTQ09ubHkuY21ha2U6IFRlbXBvcmFyaWx5IGRpc2FibGUgSUNV IGZvcgorICAgICAgICBPUyhGVUNIU0lBKS4gV2UnbGwgZ2V0IElDVSB3aXJlZCBpbiwgYnV0IEkn ZCBsaWtlIHRvIHdvcmsgdGhyb3VnaCB0aGUKKyAgICAgICAgb3RoZXIgY29tcGlsZSBlcnJvcnMg Zmlyc3QuCisKIDIwMTgtMDYtMjcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAog ICAgICAgICBBZGQgRnVjaHNpYSBzdXBwb3J0IHRvIGJ1aWxkLWpzYwpJbmRleDogQ01ha2VMaXN0 cy50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gQ01ha2VMaXN0cy50eHQJKHJldmlzaW9uIDIzMzI5NykKKysr IENNYWtlTGlzdHMudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNyw2IEBAIGVuZGlmICgp CiBzZXQoQUxMX1BPUlRTCiAgICAgQXBwbGVXaW4KICAgICBFZmwKLSAgICBGdWNoc2lhCiAgICAg R1RLCiAgICAgSlNDT25seQogICAgIE1hYwpAQCAtMTE1LDYgKzExNCw4IEBAIGlmIChVTklYKQog ICAgIGVuZGlmICgpCiBlbHNlaWYgKENNQUtFX1NZU1RFTV9OQU1FIE1BVENIRVMgIldpbmRvd3Mi KQogICAgIHNldChXVEZfT1NfV0lORE9XUyAxKQorZWxzZWlmIChDTUFLRV9TWVNURU1fTkFNRSBN QVRDSEVTICJGdWNoc2lhIikKKyAgICBzZXQoV1RGX09TX0ZVQ0hTSUEgMSkKIGVsc2UgKCkKICAg ICBtZXNzYWdlKEZBVEFMX0VSUk9SICJVbmtub3duIE9TICcke0NNQUtFX1NZU1RFTV9OQU1FfSci KQogZW5kaWYgKCkKSW5kZXg6IFNvdXJjZS9jbWFrZS9PcHRpb25zRnVjaHNpYS5jbWFrZQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvY21ha2UvT3B0aW9uc0Z1Y2hzaWEuY21ha2UJKHJldmlzaW9uIDIz MzI5NykKKysrIFNvdXJjZS9jbWFrZS9PcHRpb25zRnVjaHNpYS5jbWFrZQkobm9uZXhpc3RlbnQp CkBAIC0xLDI5ICswLDAgQEAKLXNldChQUk9KRUNUX1ZFUlNJT05fTUFKT1IgMSkKLXNldChQUk9K RUNUX1ZFUlNJT05fTUlOT1IgMCkKLXNldChQUk9KRUNUX1ZFUlNJT05fTUlDUk8gMCkKLXNldChQ Uk9KRUNUX1ZFUlNJT04gJHtQUk9KRUNUX1ZFUlNJT05fTUFKT1J9LiR7UFJPSkVDVF9WRVJTSU9O X01JTk9SfS4ke1BST0pFQ1RfVkVSU0lPTl9NSUNST30pCi0KLXNldChDTUFLRV9TWVNURU1fTkFN RSBGdWNoc2lhKQotCi1pZiAoV1RGX0NQVV9BUk02NCkKLSAgICBzZXQodHJpcGxlIGFhcmNoNjQt dW5rbm93bi1mdWNoc2lhKQotZWxzZWlmIChXVEZfQ1BVX1g4Nl82NCkKLSAgICBzZXQodHJpcGxl IHg4Nl82NC11bmtub3duLWZ1Y2hzaWEpCi1lbHNlICgpCi0gICAgbWVzc2FnZShGQVRBTF9FUlJP UiAiVW5rbm93biBBUkNIICcke0NNQUtFX1NZU1RFTV9QUk9DRVNTT1J9JyIpCi1lbmRpZiAoKQot Ci1zZXQoQ01BS0VfQ19DT01QSUxFUl9UQVJHRVQgJHt0cmlwbGV9KQotc2V0KENNQUtFX0NYWF9D T01QSUxFUl9UQVJHRVQgJHt0cmlwbGV9KQotCi1XRUJLSVRfT1BUSU9OX0JFR0lOKCkKLVdFQktJ VF9PUFRJT05fREVGSU5FKEVOQUJMRV9TVEFUSUNfSlNDICJXaGV0aGVyIHRvIGJ1aWxkIEphdmFT Y3JpcHRDb3JlIGFzIGEgc3RhdGljIGxpYnJhcnkuIiBQVUJMSUMgT0ZGKQotV0VCS0lUX09QVElP Tl9FTkQoKQotCi1zZXQoRU5BQkxFX1dFQkNPUkUgT0ZGKQotc2V0KEVOQUJMRV9XRUJLSVRfTEVH QUNZIE9GRikKLXNldChFTkFCTEVfV0VCS0lUIE9GRikKLXNldChFTkFCTEVfQVBJX1RFU1RTIE9G RikKLQotU0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoVVNFX0dFTkVSSUNfRVZFTlRfTE9PUCAxKQot U0VUX0FORF9FWFBPU0VfVE9fQlVJTEQoV1RGX0RFRkFVTFRfRVZFTlRfTE9PUCAwKQpJbmRleDog U291cmNlL2NtYWtlL09wdGlvbnNKU0NPbmx5LmNtYWtlCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9j bWFrZS9PcHRpb25zSlNDT25seS5jbWFrZQkocmV2aXNpb24gMjMzMjk3KQorKysgU291cmNlL2Nt YWtlL09wdGlvbnNKU0NPbmx5LmNtYWtlCSh3b3JraW5nIGNvcHkpCkBAIC05Nyw3ICs5NywxMCBA QCBlbHNlICgpCiBlbmRpZiAoKQogCiBpZiAoTk9UIEFQUExFKQotICAgIGZpbmRfcGFja2FnZShJ Q1UgUkVRVUlSRUQpCisgICAgaWYgKE5PVCBXVEZfT1NfRlVDSFNJQSkKKyAgICAgICAgIyBUT0RP OiBBZGQgSUNVIG9uIEZ1Y2hzaWEuCisgICAgICAgIGZpbmRfcGFja2FnZShJQ1UgUkVRVUlSRUQp CisgICAgZW5kaWYgKCkKIGVsc2UgKCkKICAgICBhZGRfZGVmaW5pdGlvbnMoLURVX0RJU0FCTEVf UkVOQU1JTkc9MSAtRFVfU0hPV19DUExVU1BMVVNfQVBJPTApCiAgICAgc2V0KElDVV9MSUJSQVJJ RVMgbGliaWN1Y29yZS5keWxpYikKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMzMwMCkKKysrIFRvb2xzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE4LTA2LTI3ICBBZGFtIEJhcnRoICA8 YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3dpdGNoIE9TKEZVQ0hTSUEpIHRvIHVzaW5n IEpTQ09ubHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4NzEzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFN3aXRjaCBGdWNoc2lhIGZyb20gYmVpbmcgYSBwb3J0IHRvIGp1c3QgYmVpbmcgYW4gT1MuIFdl IG5vdyB1c2UgYQorICAgICAgICBDTUFLRV9UT09MQ0hBSU5fRklMRSB0byBjb25maWd1cmUgdGhl IHRvb2xjaGFpbiBhbmQgdGhlIHRhcmdldCB0cmlwbGUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdGRpcnMucG06IFJlbW92ZSBpc0Z1Y2hzaWEoKSBhbmQgY2xpZW50cy4gVHVybnMgb3V0IHdl CisgICAgICAgIGNhbiBkbyBldmVyeXRoaW5nIHdlIG5lZWQgdXNpbmcgYSBDTUFLRV9UT09MQ0hB SU5fRklMRSB2aWEgdGhlCisgICAgICAgIC0tY21ha2VhcmdzIGZsYWcuCisKIDIwMTgtMDYtMjcg IERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBzb21lIHRl c3RzIGZvciBsbGRiX3dlYmtpdC5weQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gMjMz Mjk3KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0x MDQsNyArMTA0LDYgQEAgQkVHSU4gewogIyBQb3J0cwogdXNlIGNvbnN0YW50IHsKICAgICBBcHBs ZVdpbiA9PiAiQXBwbGVXaW4iLAotICAgIEZ1Y2hzaWEgID0+ICJGdWNoc2lhIiwKICAgICBHVEsg ICAgICA9PiAiR1RLIiwKICAgICBpT1MgICAgICA9PiAiaU9TIiwKICAgICB0dk9TICAgICA9PiAi dHZPUyIsCkBAIC00NzcsNyArNDc2LDYgQEAgc3ViIGFyZ3VtZW50c0ZvckNvbmZpZ3VyYXRpb24o KQogICAgIHB1c2goQGFyZ3MsICctLWlvcy1zaW11bGF0b3InKSBpZiAoZGVmaW5lZCAkeGNvZGVT REsgJiYgJHhjb2RlU0RLID1+IC9eaXBob25lc2ltdWxhdG9yLyk7CiAgICAgcHVzaChAYXJncywg Jy0tMzItYml0JykgaWYgKCRhcmNoaXRlY3R1cmUgbmUgIng4Nl82NCIgYW5kICFpc1dpbjY0KCkp OwogICAgIHB1c2goQGFyZ3MsICctLTY0LWJpdCcpIGlmIChpc1dpbjY0KCkpOwotICAgIHB1c2go QGFyZ3MsICctLWZ1Y2hzaWEnKSBpZiBpc0Z1Y2hzaWEoKTsKICAgICBwdXNoKEBhcmdzLCAnLS1n dGsnKSBpZiBpc0d0aygpOwogICAgIHB1c2goQGFyZ3MsICctLXdwZScpIGlmIGlzV1BFKCk7CiAg ICAgcHVzaChAYXJncywgJy0tanNjLW9ubHknKSBpZiBpc0pTQ09ubHkoKTsKQEAgLTExOTEsNyAr MTE4OSw2IEBAIHN1YiBkZXRlcm1pbmVQb3J0TmFtZSgpCiAgICAgcmV0dXJuIGlmIGRlZmluZWQg JHBvcnROYW1lOwogCiAgICAgbXkgJWFyZ1RvUG9ydE5hbWUgPSAoCi0gICAgICAgIGZ1Y2hzaWEg PT4gRnVjaHNpYSwKICAgICAgICAgZ3RrID0+IEdUSywKICAgICAgICAgJ2pzYy1vbmx5JyA9PiBK U0NPbmx5LAogICAgICAgICB3aW5jYWlybyA9PiBXaW5DYWlybywKQEAgLTEyNDcsMTEgKzEyNDQs NiBAQCBzdWIgcG9ydE5hbWUoKQogICAgIHJldHVybiAkcG9ydE5hbWU7CiB9CiAKLXN1YiBpc0Z1 Y2hzaWEoKQotewotICAgIHJldHVybiBwb3J0TmFtZSgpIGVxIEZ1Y2hzaWE7Ci19Ci0KIHN1YiBp c0d0aygpCiB7CiAgICAgcmV0dXJuIHBvcnROYW1lKCkgZXEgR1RLOwpAQCAtMjAzMSw3ICsyMDIz LDcgQEAgc3ViIGlzQ2FjaGVkQXJndW1lbnRmaWxlT3V0T2ZEYXRlKCRAKQogCiBzdWIgd3JhcHBl clByZWZpeElmTmVlZGVkKCkKIHsKLSAgICBpZiAoaXNBbnlXaW5kb3dzKCkgfHwgaXNKU0NPbmx5 KCkgfHwgaXNGdWNoc2lhKCkpIHsKKyAgICBpZiAoaXNBbnlXaW5kb3dzKCkgfHwgaXNKU0NPbmx5 KCkpIHsKICAgICAgICAgcmV0dXJuICgpOwogICAgIH0KICAgICBpZiAoaXNBcHBsZUNvY29hV2Vi S2l0KCkpIHsK