232453 2021-10-28 13:25:40 -0700 Make run-javascript-core-test and run-jsc-stress-tests support a customized identity file 2021-11-16 11:31:53 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zhifei_fang zhifei_fang angelos ap davidlwpablo dewei_zhu ews-watchlist jbedard keith_miller webkit-bug-importer oldest_to_newest 1809803 0 zhifei_fang 2021-10-28 13:25:40 -0700 Make run-javascript-core-test and run-jsc-stress-tests support a customized identity file 1809881 1 442758 zhifei_fang 2021-10-28 15:51:59 -0700 Created attachment 442758 Patch 1809931 2 442772 zhifei_fang 2021-10-28 18:23:52 -0700 Created attachment 442772 Patch 1810707 4 442999 zhifei_fang 2021-11-01 11:23:05 -0700 Created attachment 442999 Patch 1810850 5 zhifei_fang 2021-11-01 13:48:53 -0700 Hi, Angelos, Are those known failure? wasm.yaml/wasm/wast-tests/harness.js.(br-if-at-end-of-block.wasm)-wasm-no-tls-context: Exception: ReferenceError: Can't find variable: WebAssembly wasm.yaml/wasm/wast-tests/harness.js.(br-if-at-end-of-block.wasm)-wasm-no-tls-context: global code@harness.js:6:45 wasm.yaml/wasm/wast-tests/harness.js.(br-if-at-end-of-block.wasm)-wasm-no-tls-context: ERROR: Unexpected exit code: 3 FAIL: wasm.yaml/wasm/wast-tests/harness.js.(br-if-at-end-of-block.wasm)-wasm-no-tls-context Running wasm.yaml/wasm/wast-tests/harness.js.(osr-entry-inner-loop-branch-above-no-consts.wasm)-wasm-no-tls-context 1810890 6 angelos 2021-11-01 14:56:35 -0700 (In reply to Zhifei Fang from comment #5) > Hi, Angelos, > > Are those known failure? > > > wasm.yaml/wasm/wast-tests/harness.js.(br-if-at-end-of-block.wasm)-wasm-no- > tls-context: Exception: ReferenceError: Can't find variable: WebAssembly > wasm.yaml/wasm/wast-tests/harness.js.(br-if-at-end-of-block.wasm)-wasm-no- > tls-context: global code@harness.js:6:45 > wasm.yaml/wasm/wast-tests/harness.js.(br-if-at-end-of-block.wasm)-wasm-no- > tls-context: ERROR: Unexpected exit code: 3 > FAIL: > wasm.yaml/wasm/wast-tests/harness.js.(br-if-at-end-of-block.wasm)-wasm-no- > tls-context > Running > wasm.yaml/wasm/wast-tests/harness.js.(osr-entry-inner-loop-branch-above-no- > consts.wasm)-wasm-no-tls-context No. This has exactly the same symptoms as the bug fixed in https://bugs.webkit.org/show_bug.cgi?id=226009. And indeed, if you check the logs you can see that run-jsc-stress-tests is getting run with --arch 0 which is obviously an invalid architecture name. Though I have no idea where that zero is coming from. AFAICT this is not happening to concurrent EWS runs for mips, so perhaps it's a side effect of the patch? 1810896 7 angelos 2021-11-01 15:02:04 -0700 Oh now that I skimmed the patch, I'd take a close look at the change in webkitdirs.pm. 1811476 8 angelos 2021-11-03 09:01:25 -0700 (In reply to Angelos Oikonomopoulos from comment #7) > Oh now that I skimmed the patch, I'd take a close look at the change in > webkitdirs.pm. Hi, in case it helps, the issue with the change in webkitdirs.pm - $output = `ssh -o NoHostAuthenticationForLocalhost=yes -p $port $target 'uname -m'`; + my $cmd = 'ssh -o NoHostAuthenticationForLocalhost=yes '. (exists $remote->{'idFilePath'} ? ('-i '.$remote->{'idFilePath'}) : '') ." -p $port $target 'uname -m'"; + $output = system($cmd); seems to be that the new code calls system(), so it doesn't actually capture the command output (it just runs it) and it appears reading from the uninitialized `my $output` variable gives back a zero. 1811479 9 angelos 2021-11-03 09:03:29 -0700 @@ -276,6 +276,7 @@ GetoptLong.new(['--help', '-h', GetoptLong::NO_ARGUMENT], $remote = true uri = URI("ssh://" + arg) $remoteHosts << RemoteHost.new("default-#{$remoteHosts.length}", uri.user, uri.host, uri.port) + $remoteHosts[0].identity_file_path = '~/.ssh/id_rsa' when '--remote-config-file' $remoteConfigFile = arg Apropos, is it a good idea to set a file path here? Isn't it simpler to not pass in `-i` if identity_file_path is nil. This way, we don't hardcode ssh's current default. 1811950 10 webkit-bug-importer 2021-11-04 13:26:17 -0700 <rdar://problem/85031252> 1812711 11 443575 zhifei_fang 2021-11-08 11:14:54 -0800 Created attachment 443575 Patch 1812955 12 443643 zhifei_fang 2021-11-08 17:58:11 -0800 Created attachment 443643 Patch 1813279 13 443643 ryanhaddad 2021-11-09 13:14:39 -0800 Comment on attachment 443643 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443643&action=review > Tools/Scripts/run-jsc-stress-tests:352 > + print $remoteHosts[0].identity_file_path Is this print intentional? 1814665 14 444118 zhifei_fang 2021-11-12 16:07:19 -0800 Created attachment 444118 Patch 1814667 15 zhifei_fang 2021-11-12 16:08:20 -0800 (In reply to Ryan Haddad from comment #13) > Comment on attachment 443643 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=443643&action=review > > > Tools/Scripts/run-jsc-stress-tests:352 > > + print $remoteHosts[0].identity_file_path > > Is this print intentional? Yes, I have made it print only there is an identity file path. 1815305 16 444325 zhifei_fang 2021-11-15 18:13:28 -0800 Created attachment 444325 Patch 1815571 17 444412 zhifei_fang 2021-11-16 11:00:12 -0800 Created attachment 444412 Patch for landing 1815583 18 ews-feeder 2021-11-16 11:31:50 -0800 Committed r285875 (244301@main): <https://commits.webkit.org/244301@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444412. 442758 2021-10-28 15:51:59 -0700 2021-10-28 18:23:51 -0700 Patch bug-232453-20211028155158.patch text/plain 7347 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDg5OTc3NWI5Zjg5YWI5ZGZhYzVjMGE5YzFlOTNhMGY0 MTUyYjY1Ni4uMTg2NGE5N2EyNmI2ZjEyM2Q2ZjYyYWYwZTllOTRlYzFkMDlhZDkyYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTEwLTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIHJ1bi1qYXZhc2NyaXB0LWNvcmUtdGVzdCBhbmQgcnVuLWpzYy1zdHJlc3Mt dGVzdHMgc3VwcG9ydCBhIGN1c3RvbWl6ZWQgaWRlbnRpdHkgZmlsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNDUzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1qYXZhc2NyaXB0 Y29yZS10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQgZm9yIHJlbW90ZSBjb25maWcuCisgICAg ICAgICogU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQg Zm9yIHJlbW90ZSBjb25maWcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAg ICAgICAoZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKTogUHJvdmlkZSAtaSBvcHRpb24gdG8g c3NoCisKIDIwMjEtMTAtMjYgIFJveSBSZWFwb3IgIDxycmVhcG9yQGFwcGxlLmNvbT4KIAogICAg ICAgICB3ZWJraXRweS9hdXRvaW5zdGFsbGVkL3B5b2JqY19mcmFtZXdvcmtzLnB5IHNob3VsZCBu b3QgYXV0b2luc3RhbGwgZnJhbWV3b3JrcyBpZiB0aGV5IGNhbiBiZSBpbXBvcnRlZCB3aXRob3V0 IGV4Y2VwdGlvbnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3Jl LXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMKaW5kZXggZmIy MWJmZTcxYTRmNWM4YWU3ZTMyYmYyZjE3ZGU1ZjRjNDg1NjU5Ny4uNDViNGM2ODcyNDU2MWU3MTkx NGVjZTI5M2RiMDAyYzhkMjkwNjBhNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tamF2 YXNjcmlwdGNvcmUtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUt dGVzdHMKQEAgLTUyNCwxMiArNTI0LDE0IEBAIGlmIChkZWZpbmVkICRyZW1vdGVDb25maWdGaWxl KSB7CiAgICAgICAgICRyZW1vdGVzID0gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGVzIn07CiAgICAg fSBlbHNpZiAoZGVmaW5lZCAkcmVtb3RlQ29uZmlnLT57InJlbW90ZSJ9KSB7CiAgICAgICAgIG15 IEBzcGxpdCA9IHNwbGl0KCc6JywgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifSk7Ci0gICAgICAg ICRyZW1vdGVzID0gWwotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIiA9PiAi c3ludGhlc2l6ZWQiLAotICAgICAgICAgICAgICAgICJhZGRyZXNzIiA9PiAkcmVtb3RlQ29uZmln LT57InJlbW90ZSJ9Ci0gICAgICAgICAgICB9Ci0gICAgICAgICBdOworICAgICAgICBteSAkcmVt b3RlID0geworICAgICAgICAgICAgIm5hbWUiID0+ICJzeW50aGVzaXplZCIsCisgICAgICAgICAg ICAiYWRkcmVzcyIgPT4gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifQorICAgICAgICB9OworICAg ICAgICBpZiAoZXhpc3RzICRyZW1vdGVDb25maWctPnsiaWRGaWxlUGF0aCJ9KSB7CisgICAgICAg ICAgICAkcmVtb3RlLT57J2lkRmlsZVBhdGgnfSA9ICRyZW1vdGVDb25maWctPnsnaWRGaWxlUGF0 aCd9OworICAgICAgICB9CisgICAgICAgICRyZW1vdGVzID0gWyRyZW1vdGVdOwogICAgIH0KIH0K IApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cyBiL1Rvb2xz L1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMKaW5kZXggY2QwNzViYTc1ZmI3ZjYyNWRiYTI2 ZDRiMTI1MTQzZDk0MmMxMTg0NS4uZjdkMTYwMjg3ZTU4NjM1MDAyMGFhODVkMDU5ZWM4MzE0ZjMw MDVlYiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cworKysg Yi9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCkBAIC01MSw3ICs1MSw3IEBAIFNp Z25hbC50cmFwKCJURVJNIikgewogICAgIHB1dHMoVGhyZWFkLmN1cnJlbnQuYmFja3RyYWNlKQog fQogCi1SZW1vdGVIb3N0ID0gU3RydWN0Lm5ldyg6bmFtZSwgOnVzZXIsIDpob3N0LCA6cG9ydCwg OnJlbW90ZURpcmVjdG9yeSkKK1JlbW90ZUhvc3QgPSBTdHJ1Y3QubmV3KDpuYW1lLCA6dXNlciwg Omhvc3QsIDpwb3J0LCA6cmVtb3RlRGlyZWN0b3J5LCA6aWRlbnRpdHlfZmlsZV9wYXRoKQogCiBU SElTX1NDUklQVF9QQVRIID0gUGF0aG5hbWUubmV3KF9fRklMRV9fKS5yZWFscGF0aAogU0NSSVBU U19QQVRIID0gVEhJU19TQ1JJUFRfUEFUSC5kaXJuYW1lCkBAIC0yNzYsNiArMjc2LDcgQEAgR2V0 b3B0TG9uZy5uZXcoWyctLWhlbHAnLCAnLWgnLCBHZXRvcHRMb25nOjpOT19BUkdVTUVOVF0sCiAg ICAgICAgICRyZW1vdGUgPSB0cnVlCiAgICAgICAgIHVyaSA9IFVSSSgic3NoOi8vIiArIGFyZykK ICAgICAgICAgJHJlbW90ZUhvc3RzIDw8IFJlbW90ZUhvc3QubmV3KCJkZWZhdWx0LSN7JHJlbW90 ZUhvc3RzLmxlbmd0aH0iLCB1cmkudXNlciwgdXJpLmhvc3QsIHVyaS5wb3J0KQorICAgICAgICAk cmVtb3RlSG9zdHNbMF0uaWRlbnRpdHlfZmlsZV9wYXRoID0gJ34vLnNzaC9pZF9yc2EnCiAgICAg d2hlbiAnLS1yZW1vdGUtY29uZmlnLWZpbGUnCiAgICAgICAgICRyZW1vdGVDb25maWdGaWxlID0g YXJnCiAgICAgd2hlbiAnLS1yZXBvcnQtZXhlY3V0aW9uLXRpbWUnCkBAIC0zMjUsNiArMzI2LDEx IEBAIGlmICRyZW1vdGVDb25maWdGaWxlCiAgICAgICAgIGlmIGNvbmZpZ1sncmVtb3RlRGlyZWN0 b3J5J10KICAgICAgICAgICAgICRyZW1vdGVIb3N0c1swXS5yZW1vdGVEaXJlY3RvcnkgPSBjb25m aWdbJ3JlbW90ZURpcmVjdG9yeSddCiAgICAgICAgIGVuZAorICAgICAgICBpZiBjb25maWdbJ2lk RmlsZVBhdGgnXQorICAgICAgICAgICAgJHJlbW90ZUhvc3RzWzBdLmlkZW50aXR5X2ZpbGVfcGF0 aCA9IGNvbmZpZ1snaWRGaWxlUGF0aCddCisgICAgICAgIGVsc2UKKyAgICAgICAgICAgICRyZW1v dGVIb3N0c1swXS5pZGVudGl0eV9maWxlX3BhdGggPSAnfi8uc3NoL2lkX3JzYScKKyAgICAgICAg ZW5kCiAgICAgZW5kCiAKICAgICAjIHdlIGNhbiBjb21iaW5lIC0tcmVtb3RlIGFuZCBhIG5ldyBz dHlsZSBjb25maWcKQEAgLTM0MCw5ICszNDYsMTUgQEAgaWYgJHJlbW90ZUNvbmZpZ0ZpbGUKICAg ICAgICAgICAgIGlmIHJlbW90ZVsncmVtb3RlRGlyZWN0b3J5J10KICAgICAgICAgICAgICAgICBo b3N0LnJlbW90ZURpcmVjdG9yeSA9IHJlbW90ZVsncmVtb3RlRGlyZWN0b3J5J10KICAgICAgICAg ICAgIGVuZAorICAgICAgICAgICAgaWYgcmVtb3RlWydpZEZpbGVQYXRoJ10KKyAgICAgICAgICAg ICAgICBob3N0LmlkZW50aXR5X2ZpbGVfcGF0aCA9IHJlbW90ZVsnaWRGaWxlUGF0aCddCisgICAg ICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgaG9zdC5pZGVudGl0eV9maWxlX3BhdGggPSAn fi8uc3NoL2lkX3JzYScKKyAgICAgICAgICAgIGVuZAogICAgICAgICAgICAgaG9zdAogICAgICAg ICB9CiAgICAgZW5kCisgICAgcHJpbnQgJHJlbW90ZUhvc3RzWzBdLmlkZW50aXR5X2ZpbGVfcGF0 aAogZW5kCiAKIHVubGVzcyBqc2NBcmcKQEAgLTIxMTQsNyArMjEyNiw3IEBAIGRlZiBzc2hSZWFk KGNtZCwgcmVtb3RlSG9zdCwgb3B0aW9ucz17fSkKICAgICByYWlzZSB1bmxlc3MgJHJlbW90ZQog CiAgICAgcmVzdWx0ID0gIiIKLSAgICBJTy5wb3Blbigic3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0 aW9uRm9yTG9jYWxob3N0PXllcyAtcCAje3JlbW90ZUhvc3QucG9ydH0gI3tyZW1vdGVIb3N0LnVz ZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSAnI3tjbWR9JyIsICJyIikgeworICAgIElPLnBvcGVuKCJz c2ggLW8gTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIC1wICN7cmVtb3RlSG9z dC5wb3J0fSAtaSAje3JlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRofSAje3JlbW90ZUhvc3Qu dXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9ICcje2NtZH0nIiwgInIiKSB7CiAgICAgICB8IGlucCB8 CiAgICAgICBpbnAuZWFjaF9saW5lIHsKICAgICAgICAgfCBsaW5lIHwKQEAgLTIyNTIsOCArMjI2 NCw4IEBAIGRlZiBnZXRSZW1vdGVEaXJlY3RvcnlJZk5lZWRlZChyZW1vdGVIb3N0KQogZW5kCiAK IGRlZiBjb3B5QnVuZGxlVG9SZW1vdGUocmVtb3RlSG9zdCkKLSAgICBteXN5cyhbInNzaCIsICIt byIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMiLCAiLXAiLCByZW1vdGVI b3N0LnBvcnQudG9fcywgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0iLCAi bWtkaXIgLXAgI3tyZW1vdGVIb3N0LnJlbW90ZURpcmVjdG9yeX0iXSkKLSAgICBteXN5cyhbInNj cCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMiLCAiLVAiLCBy ZW1vdGVIb3N0LnBvcnQudG9fcywgKCRvdXRwdXREaXIuZGlybmFtZSArICR0YXJGaWxlTmFtZSku dG9fcywgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH06I3tyZW1vdGVIb3N0 LnJlbW90ZURpcmVjdG9yeX0iXSkKKyAgICBteXN5cyhbInNzaCIsICItbyIsICJOb0hvc3RBdXRo ZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMiLCAiLWkiLCByZW1vdGVIb3N0LmlkZW50aXR5X2Zp bGVfcGF0aCwgIi1wIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICIje3JlbW90ZUhvc3QudXNlcn1A I3tyZW1vdGVIb3N0Lmhvc3R9IiwgIm1rZGlyIC1wICN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rv cnl9Il0pCisgICAgbXlzeXMoWyJzY3AiLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JM b2NhbGhvc3Q9eWVzIiwgIi1pIiwgcmVtb3RlSG9zdC5pZGVudGl0eV9maWxlX3BhdGgsICItUCIs IHJlbW90ZUhvc3QucG9ydC50b19zLCAoJG91dHB1dERpci5kaXJuYW1lICsgJHRhckZpbGVOYW1l KS50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fToje3JlbW90ZUhv c3QucmVtb3RlRGlyZWN0b3J5fSJdKQogZW5kCiAKIGRlZiBleHBvcnRCYXNlRW52aXJvbm1lbnRW YXJpYWJsZXMoZXNjYXBlKQpAQCAtMjI4Nyw3ICsyMjk5LDcgQEAgZGVmIHJ1blRlc3RSdW5uZXIo cmVtb3RlSW5kZXg9MCkKICAgICAgICAgcmVtb3RlU2NyaXB0ICs9IGV4cG9ydEJhc2VFbnZpcm9u bWVudFZhcmlhYmxlcyh0cnVlKQogICAgICAgICAkZW52VmFycy5lYWNoIHsgfHZhcnwgcmVtb3Rl U2NyaXB0ICs9ICJleHBvcnQgIiA8PCB2YXIgPDwgIlxuIiB9CiAgICAgICAgIHJlbW90ZVNjcmlw dCArPSAiI3t0ZXN0UnVubmVyQ29tbWFuZChyZW1vdGVJbmRleCl9XCIiCi0gICAgICAgIHJ1bkFu ZE1vbml0b3JUZXN0UnVubmVyQ29tbWFuZChbInNzaCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNh dGlvbkZvckxvY2FsaG9zdD15ZXMiLCAiLXAiLCByZW1vdGVIb3N0LnBvcnQudG9fcywgIiN7cmVt b3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0iLCByZW1vdGVTY3JpcHRdKQorICAgICAg ICBydW5BbmRNb25pdG9yVGVzdFJ1bm5lckNvbW1hbmQoWyJzc2giLCAiLW8iLCAiTm9Ib3N0QXV0 aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIiwgIi1pIiwgcmVtb3RlSG9zdC5pZGVudGl0eV9m aWxlX3BhdGgsICItcCIsIHJlbW90ZUhvc3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9 QCN7cmVtb3RlSG9zdC5ob3N0fSIsIHJlbW90ZVNjcmlwdF0pCiAgICAgZWxzZQogICAgICAgICBE aXIuY2hkaXIoJHJ1bm5lckRpcikgewogICAgICAgICAgICAgcnVuQW5kTW9uaXRvclRlc3RSdW5u ZXJDb21tYW5kKFNoZWxsd29yZHMuc2hlbGxzcGxpdCh0ZXN0UnVubmVyQ29tbWFuZCkpCkBAIC0y NjYxLDYgKzI2NzMsNyBAQCBkZWYgdW5wYWNrQnVuZGxlR251UGFyYWxsZWwocmVtb3RlSG9zdHMp CiAgICAgZm9yRWFjaFJlbW90ZShyZW1vdGVIb3N0cywgOmRyb3BPbkZhaWx1cmUgPT4gdHJ1ZSkg ewogICAgICAgICB8IF8sIHJlbW90ZUhvc3QgfAogICAgICAgICBteXN5cyhbInNzaCIsICItbyIs ICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMiLAorICAgICAgICAgICAgICAg Ii1pIiwgcmVtdG9lSG9zdC5pZGVudGl0eV9maWxlX3BhdGgsCiAgICAgICAgICAgICAgICAiLXAi LCByZW1vdGVIb3N0LnBvcnQudG9fcywKICAgICAgICAgICAgICAgICIje3JlbW90ZUhvc3QudXNl cn1AI3tyZW1vdGVIb3N0Lmhvc3R9IiwKICAgICAgICAgICAgICAgICJjZCAje1NoZWxsd29yZHMu c2hlbGxlc2NhcGUocmVtb3RlSG9zdC5yZW1vdGVEaXJlY3RvcnkpfSAmJiBybSAtcmYgI3skb3V0 cHV0RGlyLmJhc2VuYW1lfSAmJiB0YXIgeHpmICN7JHRhckZpbGVOYW1lfSJdKQpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCmluZGV4IGViMjZkMjc1N2YwNTgxMDI1ZTRlNTExYTY1YzVjY2ZjODQzNWY3NGMuLmQzNDU5 YjhhZWFkYjhkYjIzZGU1NDMyMGI4ZWJiZjM0NjIwNmZmZjMgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAg LTM2OSw3ICszNjksOCBAQCBzdWIgZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKCQpCiAgICAg ICAgICAgICBteSAkdGFyZ2V0ID0gJHNwbGl0WzBdOwogICAgICAgICAgICAgbXkgJHBvcnQgPSAy MjsKICAgICAgICAgICAgICRwb3J0ID0gJHNwbGl0WzFdIGlmIHNjYWxhcihAc3BsaXQpID4gMTsK LSAgICAgICAgICAgICRvdXRwdXQgPSBgc3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9j YWxob3N0PXllcyAtcCAkcG9ydCAkdGFyZ2V0ICd1bmFtZSAgLW0nYDsKKyAgICAgICAgICAgIG15 ICRjbWQgPSAnc3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyAnLiAo ZXhpc3RzICRyZW1vdGUtPnsnaWRGaWxlUGF0aCd9ID8gKCctaSAnLiRyZW1vdGUtPnsnaWRGaWxl UGF0aCd9KSA6ICcnKSAuIiAtcCAkcG9ydCAkdGFyZ2V0ICd1bmFtZSAgLW0nIjsKKyAgICAgICAg ICAgICRvdXRwdXQgPSBzeXN0ZW0oJGNtZCk7CiAgICAgICAgICAgICBsYXN0IGlmICgkPyA9PSAw KTsKICAgICAgICAgfQogICAgICAgICBpZiAobGVuZ3RoKCRvdXRwdXQpID09IDApIHsK 442772 2021-10-28 18:23:52 -0700 2021-11-01 11:23:03 -0700 Patch bug-232453-20211028182352.patch text/plain 7496 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDg5OTc3NWI5Zjg5YWI5ZGZhYzVjMGE5YzFlOTNhMGY0 MTUyYjY1Ni4uMTg2NGE5N2EyNmI2ZjEyM2Q2ZjYyYWYwZTllOTRlYzFkMDlhZDkyYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTEwLTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIHJ1bi1qYXZhc2NyaXB0LWNvcmUtdGVzdCBhbmQgcnVuLWpzYy1zdHJlc3Mt dGVzdHMgc3VwcG9ydCBhIGN1c3RvbWl6ZWQgaWRlbnRpdHkgZmlsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNDUzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1qYXZhc2NyaXB0 Y29yZS10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQgZm9yIHJlbW90ZSBjb25maWcuCisgICAg ICAgICogU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQg Zm9yIHJlbW90ZSBjb25maWcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAg ICAgICAoZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKTogUHJvdmlkZSAtaSBvcHRpb24gdG8g c3NoCisKIDIwMjEtMTAtMjYgIFJveSBSZWFwb3IgIDxycmVhcG9yQGFwcGxlLmNvbT4KIAogICAg ICAgICB3ZWJraXRweS9hdXRvaW5zdGFsbGVkL3B5b2JqY19mcmFtZXdvcmtzLnB5IHNob3VsZCBu b3QgYXV0b2luc3RhbGwgZnJhbWV3b3JrcyBpZiB0aGV5IGNhbiBiZSBpbXBvcnRlZCB3aXRob3V0 IGV4Y2VwdGlvbnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3Jl LXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMKaW5kZXggZmIy MWJmZTcxYTRmNWM4YWU3ZTMyYmYyZjE3ZGU1ZjRjNDg1NjU5Ny4uNDViNGM2ODcyNDU2MWU3MTkx NGVjZTI5M2RiMDAyYzhkMjkwNjBhNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tamF2 YXNjcmlwdGNvcmUtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUt dGVzdHMKQEAgLTUyNCwxMiArNTI0LDE0IEBAIGlmIChkZWZpbmVkICRyZW1vdGVDb25maWdGaWxl KSB7CiAgICAgICAgICRyZW1vdGVzID0gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGVzIn07CiAgICAg fSBlbHNpZiAoZGVmaW5lZCAkcmVtb3RlQ29uZmlnLT57InJlbW90ZSJ9KSB7CiAgICAgICAgIG15 IEBzcGxpdCA9IHNwbGl0KCc6JywgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifSk7Ci0gICAgICAg ICRyZW1vdGVzID0gWwotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIiA9PiAi c3ludGhlc2l6ZWQiLAotICAgICAgICAgICAgICAgICJhZGRyZXNzIiA9PiAkcmVtb3RlQ29uZmln LT57InJlbW90ZSJ9Ci0gICAgICAgICAgICB9Ci0gICAgICAgICBdOworICAgICAgICBteSAkcmVt b3RlID0geworICAgICAgICAgICAgIm5hbWUiID0+ICJzeW50aGVzaXplZCIsCisgICAgICAgICAg ICAiYWRkcmVzcyIgPT4gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifQorICAgICAgICB9OworICAg ICAgICBpZiAoZXhpc3RzICRyZW1vdGVDb25maWctPnsiaWRGaWxlUGF0aCJ9KSB7CisgICAgICAg ICAgICAkcmVtb3RlLT57J2lkRmlsZVBhdGgnfSA9ICRyZW1vdGVDb25maWctPnsnaWRGaWxlUGF0 aCd9OworICAgICAgICB9CisgICAgICAgICRyZW1vdGVzID0gWyRyZW1vdGVdOwogICAgIH0KIH0K IApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cyBiL1Rvb2xz L1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMKaW5kZXggY2QwNzViYTc1ZmI3ZjYyNWRiYTI2 ZDRiMTI1MTQzZDk0MmMxMTg0NS4uM2YyMTdjYzUyMzJiNTg4YTNkMzkzM2RlYTM2Mzk5ZGRiYWEx YjFjNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cworKysg Yi9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCkBAIC01MSw3ICs1MSw3IEBAIFNp Z25hbC50cmFwKCJURVJNIikgewogICAgIHB1dHMoVGhyZWFkLmN1cnJlbnQuYmFja3RyYWNlKQog fQogCi1SZW1vdGVIb3N0ID0gU3RydWN0Lm5ldyg6bmFtZSwgOnVzZXIsIDpob3N0LCA6cG9ydCwg OnJlbW90ZURpcmVjdG9yeSkKK1JlbW90ZUhvc3QgPSBTdHJ1Y3QubmV3KDpuYW1lLCA6dXNlciwg Omhvc3QsIDpwb3J0LCA6cmVtb3RlRGlyZWN0b3J5LCA6aWRlbnRpdHlfZmlsZV9wYXRoKQogCiBU SElTX1NDUklQVF9QQVRIID0gUGF0aG5hbWUubmV3KF9fRklMRV9fKS5yZWFscGF0aAogU0NSSVBU U19QQVRIID0gVEhJU19TQ1JJUFRfUEFUSC5kaXJuYW1lCkBAIC0yNzYsNiArMjc2LDcgQEAgR2V0 b3B0TG9uZy5uZXcoWyctLWhlbHAnLCAnLWgnLCBHZXRvcHRMb25nOjpOT19BUkdVTUVOVF0sCiAg ICAgICAgICRyZW1vdGUgPSB0cnVlCiAgICAgICAgIHVyaSA9IFVSSSgic3NoOi8vIiArIGFyZykK ICAgICAgICAgJHJlbW90ZUhvc3RzIDw8IFJlbW90ZUhvc3QubmV3KCJkZWZhdWx0LSN7JHJlbW90 ZUhvc3RzLmxlbmd0aH0iLCB1cmkudXNlciwgdXJpLmhvc3QsIHVyaS5wb3J0KQorICAgICAgICAk cmVtb3RlSG9zdHNbMF0uaWRlbnRpdHlfZmlsZV9wYXRoID0gJ34vLnNzaC9pZF9yc2EnCiAgICAg d2hlbiAnLS1yZW1vdGUtY29uZmlnLWZpbGUnCiAgICAgICAgICRyZW1vdGVDb25maWdGaWxlID0g YXJnCiAgICAgd2hlbiAnLS1yZXBvcnQtZXhlY3V0aW9uLXRpbWUnCkBAIC0zMjUsNiArMzI2LDkg QEAgaWYgJHJlbW90ZUNvbmZpZ0ZpbGUKICAgICAgICAgaWYgY29uZmlnWydyZW1vdGVEaXJlY3Rv cnknXQogICAgICAgICAgICAgJHJlbW90ZUhvc3RzWzBdLnJlbW90ZURpcmVjdG9yeSA9IGNvbmZp Z1sncmVtb3RlRGlyZWN0b3J5J10KICAgICAgICAgZW5kCisgICAgICAgIGlmIGNvbmZpZ1snaWRG aWxlUGF0aCddCisgICAgICAgICAgICAkcmVtb3RlSG9zdHNbMF0uaWRlbnRpdHlfZmlsZV9wYXRo ID0gY29uZmlnWydpZEZpbGVQYXRoJ10KKyAgICAgICAgZW5kCiAgICAgZW5kCiAKICAgICAjIHdl IGNhbiBjb21iaW5lIC0tcmVtb3RlIGFuZCBhIG5ldyBzdHlsZSBjb25maWcKQEAgLTM0MCw5ICsz NDQsMTMgQEAgaWYgJHJlbW90ZUNvbmZpZ0ZpbGUKICAgICAgICAgICAgIGlmIHJlbW90ZVsncmVt b3RlRGlyZWN0b3J5J10KICAgICAgICAgICAgICAgICBob3N0LnJlbW90ZURpcmVjdG9yeSA9IHJl bW90ZVsncmVtb3RlRGlyZWN0b3J5J10KICAgICAgICAgICAgIGVuZAorICAgICAgICAgICAgaWYg cmVtb3RlWydpZEZpbGVQYXRoJ10KKyAgICAgICAgICAgICAgICBob3N0LmlkZW50aXR5X2ZpbGVf cGF0aCA9IHJlbW90ZVsnaWRGaWxlUGF0aCddCisgICAgICAgICAgICBlbmQKICAgICAgICAgICAg IGhvc3QKICAgICAgICAgfQogICAgIGVuZAorICAgIHByaW50ICRyZW1vdGVIb3N0c1swXS5pZGVu dGl0eV9maWxlX3BhdGgKIGVuZAogCiB1bmxlc3MganNjQXJnCkBAIC0yMTE0LDcgKzIxMjIsNyBA QCBkZWYgc3NoUmVhZChjbWQsIHJlbW90ZUhvc3QsIG9wdGlvbnM9e30pCiAgICAgcmFpc2UgdW5s ZXNzICRyZW1vdGUKIAogICAgIHJlc3VsdCA9ICIiCi0gICAgSU8ucG9wZW4oInNzaCAtbyBOb0hv c3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMgLXAgI3tyZW1vdGVIb3N0LnBvcnR9ICN7 cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0gJyN7Y21kfSciLCAiciIpIHsKKyAg ICBJTy5wb3Blbigic3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyAt cCAje3JlbW90ZUhvc3QucG9ydH0gLWkgI3tyZW1vdGVIb3N0LmlkZW50aXR5X2ZpbGVfcGF0aH0g I3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSAnI3tjbWR9JyIsICJyIikgewog ICAgICAgfCBpbnAgfAogICAgICAgaW5wLmVhY2hfbGluZSB7CiAgICAgICAgIHwgbGluZSB8CkBA IC0yMjUyLDggKzIyNjAsOCBAQCBkZWYgZ2V0UmVtb3RlRGlyZWN0b3J5SWZOZWVkZWQocmVtb3Rl SG9zdCkKIGVuZAogCiBkZWYgY29weUJ1bmRsZVRvUmVtb3RlKHJlbW90ZUhvc3QpCi0gICAgbXlz eXMoWyJzc2giLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIiwg Ii1wIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICIje3JlbW90ZUhvc3QudXNlcn1AI3tyZW1vdGVI b3N0Lmhvc3R9IiwgIm1rZGlyIC1wICN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rvcnl9Il0pCi0g ICAgbXlzeXMoWyJzY3AiLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9 eWVzIiwgIi1QIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICgkb3V0cHV0RGlyLmRpcm5hbWUgKyAk dGFyRmlsZU5hbWUpLnRvX3MsICIje3JlbW90ZUhvc3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9 OiN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rvcnl9Il0pCisgICAgbXlzeXMoWyJzc2giLCAiLW8i LCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIl0gKyAocmVtb3RlSG9zdC5p ZGVudGl0eV9maWxlX3BhdGggPyBbIi1pIiwgcmVtb3RlSG9zdC5pZGVudGl0eV9maWxlX3BhdGhd IDogW10pICsgWyItcCIsIHJlbW90ZUhvc3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9 QCN7cmVtb3RlSG9zdC5ob3N0fSIsICJta2RpciAtcCAje3JlbW90ZUhvc3QucmVtb3RlRGlyZWN0 b3J5fSJdKQorICAgIG15c3lzKFsic2NwIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9uRm9y TG9jYWxob3N0PXllcyJdICsgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoID8gWyItaSIs IHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoXSA6IFtdKSArIFsiLVAiLCByZW1vdGVIb3N0 LnBvcnQudG9fcywgKCRvdXRwdXREaXIuZGlybmFtZSArICR0YXJGaWxlTmFtZSkudG9fcywgIiN7 cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH06I3tyZW1vdGVIb3N0LnJlbW90ZURp cmVjdG9yeX0iXSkKIGVuZAogCiBkZWYgZXhwb3J0QmFzZUVudmlyb25tZW50VmFyaWFibGVzKGVz Y2FwZSkKQEAgLTIyODcsNyArMjI5NSw3IEBAIGRlZiBydW5UZXN0UnVubmVyKHJlbW90ZUluZGV4 PTApCiAgICAgICAgIHJlbW90ZVNjcmlwdCArPSBleHBvcnRCYXNlRW52aXJvbm1lbnRWYXJpYWJs ZXModHJ1ZSkKICAgICAgICAgJGVudlZhcnMuZWFjaCB7IHx2YXJ8IHJlbW90ZVNjcmlwdCArPSAi ZXhwb3J0ICIgPDwgdmFyIDw8ICJcbiIgfQogICAgICAgICByZW1vdGVTY3JpcHQgKz0gIiN7dGVz dFJ1bm5lckNvbW1hbmQocmVtb3RlSW5kZXgpfVwiIgotICAgICAgICBydW5BbmRNb25pdG9yVGVz dFJ1bm5lckNvbW1hbmQoWyJzc2giLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2Nh bGhvc3Q9eWVzIiwgIi1wIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICIje3JlbW90ZUhvc3QudXNl cn1AI3tyZW1vdGVIb3N0Lmhvc3R9IiwgcmVtb3RlU2NyaXB0XSkKKyAgICAgICAgcnVuQW5kTW9u aXRvclRlc3RSdW5uZXJDb21tYW5kKFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9u Rm9yTG9jYWxob3N0PXllcyJdICsgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoID8gWyIt aSIsIHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoXSA6IFtdKSArIFsiLXAiLCByZW1vdGVI b3N0LnBvcnQudG9fcywgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0iLCBy ZW1vdGVTY3JpcHRdKQogICAgIGVsc2UKICAgICAgICAgRGlyLmNoZGlyKCRydW5uZXJEaXIpIHsK ICAgICAgICAgICAgIHJ1bkFuZE1vbml0b3JUZXN0UnVubmVyQ29tbWFuZChTaGVsbHdvcmRzLnNo ZWxsc3BsaXQodGVzdFJ1bm5lckNvbW1hbmQpKQpAQCAtMjY2MCw4ICsyNjY4LDkgQEAgZW5kCiBk ZWYgdW5wYWNrQnVuZGxlR251UGFyYWxsZWwocmVtb3RlSG9zdHMpCiAgICAgZm9yRWFjaFJlbW90 ZShyZW1vdGVIb3N0cywgOmRyb3BPbkZhaWx1cmUgPT4gdHJ1ZSkgewogICAgICAgICB8IF8sIHJl bW90ZUhvc3QgfAotICAgICAgICBteXN5cyhbInNzaCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNh dGlvbkZvckxvY2FsaG9zdD15ZXMiLAotICAgICAgICAgICAgICAgIi1wIiwgcmVtb3RlSG9zdC5w b3J0LnRvX3MsCisgICAgICAgIG15c3lzKFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0 aW9uRm9yTG9jYWxob3N0PXllcyJdICsgCisgICAgICAgICAgICAgICAocmVtb3RlSG9zdC5pZGVu dGl0eV9maWxlX3BhdGggPyBbIi1pIiwgcmVtb3RlSG9zdC5pZGVudGl0eV9maWxlX3BhdGhdIDog W10pICsgCisgICAgICAgICAgICAgICBbIi1wIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsCiAgICAg ICAgICAgICAgICAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSIsCiAgICAg ICAgICAgICAgICAiY2QgI3tTaGVsbHdvcmRzLnNoZWxsZXNjYXBlKHJlbW90ZUhvc3QucmVtb3Rl RGlyZWN0b3J5KX0gJiYgcm0gLXJmICN7JG91dHB1dERpci5iYXNlbmFtZX0gJiYgdGFyIHh6ZiAj eyR0YXJGaWxlTmFtZX0iXSkKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggZWIyNmQyNzU3ZjA1 ODEwMjVlNGU1MTFhNjVjNWNjZmM4NDM1Zjc0Yy4uZDM0NTliOGFlYWRiOGRiMjNkZTU0MzIwYjhl YmJmMzQ2MjA2ZmZmMyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMzY5LDcgKzM2OSw4IEBAIHN1YiBk ZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1cmUoJCkKICAgICAgICAgICAgIG15ICR0YXJnZXQgPSAk c3BsaXRbMF07CiAgICAgICAgICAgICBteSAkcG9ydCA9IDIyOwogICAgICAgICAgICAgJHBvcnQg PSAkc3BsaXRbMV0gaWYgc2NhbGFyKEBzcGxpdCkgPiAxOwotICAgICAgICAgICAgJG91dHB1dCA9 IGBzc2ggLW8gTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIC1wICRwb3J0ICR0 YXJnZXQgJ3VuYW1lICAtbSdgOworICAgICAgICAgICAgbXkgJGNtZCA9ICdzc2ggLW8gTm9Ib3N0 QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzICcuIChleGlzdHMgJHJlbW90ZS0+eydpZEZp bGVQYXRoJ30gPyAoJy1pICcuJHJlbW90ZS0+eydpZEZpbGVQYXRoJ30pIDogJycpIC4iIC1wICRw b3J0ICR0YXJnZXQgJ3VuYW1lICAtbSciOworICAgICAgICAgICAgJG91dHB1dCA9IHN5c3RlbSgk Y21kKTsKICAgICAgICAgICAgIGxhc3QgaWYgKCQ/ID09IDApOwogICAgICAgICB9CiAgICAgICAg IGlmIChsZW5ndGgoJG91dHB1dCkgPT0gMCkgewo= 442999 2021-11-01 11:23:05 -0700 2021-11-08 11:14:52 -0800 Patch bug-232453-20211101112305.patch text/plain 7545 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDg5OTc3NWI5Zjg5YWI5ZGZhYzVjMGE5YzFlOTNhMGY0 MTUyYjY1Ni4uMTg2NGE5N2EyNmI2ZjEyM2Q2ZjYyYWYwZTllOTRlYzFkMDlhZDkyYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTEwLTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIHJ1bi1qYXZhc2NyaXB0LWNvcmUtdGVzdCBhbmQgcnVuLWpzYy1zdHJlc3Mt dGVzdHMgc3VwcG9ydCBhIGN1c3RvbWl6ZWQgaWRlbnRpdHkgZmlsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNDUzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1qYXZhc2NyaXB0 Y29yZS10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQgZm9yIHJlbW90ZSBjb25maWcuCisgICAg ICAgICogU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQg Zm9yIHJlbW90ZSBjb25maWcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAg ICAgICAoZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKTogUHJvdmlkZSAtaSBvcHRpb24gdG8g c3NoCisKIDIwMjEtMTAtMjYgIFJveSBSZWFwb3IgIDxycmVhcG9yQGFwcGxlLmNvbT4KIAogICAg ICAgICB3ZWJraXRweS9hdXRvaW5zdGFsbGVkL3B5b2JqY19mcmFtZXdvcmtzLnB5IHNob3VsZCBu b3QgYXV0b2luc3RhbGwgZnJhbWV3b3JrcyBpZiB0aGV5IGNhbiBiZSBpbXBvcnRlZCB3aXRob3V0 IGV4Y2VwdGlvbnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3Jl LXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMKaW5kZXggZmIy MWJmZTcxYTRmNWM4YWU3ZTMyYmYyZjE3ZGU1ZjRjNDg1NjU5Ny4uNDViNGM2ODcyNDU2MWU3MTkx NGVjZTI5M2RiMDAyYzhkMjkwNjBhNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tamF2 YXNjcmlwdGNvcmUtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUt dGVzdHMKQEAgLTUyNCwxMiArNTI0LDE0IEBAIGlmIChkZWZpbmVkICRyZW1vdGVDb25maWdGaWxl KSB7CiAgICAgICAgICRyZW1vdGVzID0gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGVzIn07CiAgICAg fSBlbHNpZiAoZGVmaW5lZCAkcmVtb3RlQ29uZmlnLT57InJlbW90ZSJ9KSB7CiAgICAgICAgIG15 IEBzcGxpdCA9IHNwbGl0KCc6JywgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifSk7Ci0gICAgICAg ICRyZW1vdGVzID0gWwotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIiA9PiAi c3ludGhlc2l6ZWQiLAotICAgICAgICAgICAgICAgICJhZGRyZXNzIiA9PiAkcmVtb3RlQ29uZmln LT57InJlbW90ZSJ9Ci0gICAgICAgICAgICB9Ci0gICAgICAgICBdOworICAgICAgICBteSAkcmVt b3RlID0geworICAgICAgICAgICAgIm5hbWUiID0+ICJzeW50aGVzaXplZCIsCisgICAgICAgICAg ICAiYWRkcmVzcyIgPT4gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifQorICAgICAgICB9OworICAg ICAgICBpZiAoZXhpc3RzICRyZW1vdGVDb25maWctPnsiaWRGaWxlUGF0aCJ9KSB7CisgICAgICAg ICAgICAkcmVtb3RlLT57J2lkRmlsZVBhdGgnfSA9ICRyZW1vdGVDb25maWctPnsnaWRGaWxlUGF0 aCd9OworICAgICAgICB9CisgICAgICAgICRyZW1vdGVzID0gWyRyZW1vdGVdOwogICAgIH0KIH0K IApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cyBiL1Rvb2xz L1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMKaW5kZXggY2QwNzViYTc1ZmI3ZjYyNWRiYTI2 ZDRiMTI1MTQzZDk0MmMxMTg0NS4uMjM5Njk3OThjNjE4MWExNDk5NmYwODM1N2MzZGViMjBjMTNm MDAxZCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cworKysg Yi9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCkBAIC01MSw3ICs1MSw3IEBAIFNp Z25hbC50cmFwKCJURVJNIikgewogICAgIHB1dHMoVGhyZWFkLmN1cnJlbnQuYmFja3RyYWNlKQog fQogCi1SZW1vdGVIb3N0ID0gU3RydWN0Lm5ldyg6bmFtZSwgOnVzZXIsIDpob3N0LCA6cG9ydCwg OnJlbW90ZURpcmVjdG9yeSkKK1JlbW90ZUhvc3QgPSBTdHJ1Y3QubmV3KDpuYW1lLCA6dXNlciwg Omhvc3QsIDpwb3J0LCA6cmVtb3RlRGlyZWN0b3J5LCA6aWRlbnRpdHlfZmlsZV9wYXRoKQogCiBU SElTX1NDUklQVF9QQVRIID0gUGF0aG5hbWUubmV3KF9fRklMRV9fKS5yZWFscGF0aAogU0NSSVBU U19QQVRIID0gVEhJU19TQ1JJUFRfUEFUSC5kaXJuYW1lCkBAIC0yNzYsNiArMjc2LDcgQEAgR2V0 b3B0TG9uZy5uZXcoWyctLWhlbHAnLCAnLWgnLCBHZXRvcHRMb25nOjpOT19BUkdVTUVOVF0sCiAg ICAgICAgICRyZW1vdGUgPSB0cnVlCiAgICAgICAgIHVyaSA9IFVSSSgic3NoOi8vIiArIGFyZykK ICAgICAgICAgJHJlbW90ZUhvc3RzIDw8IFJlbW90ZUhvc3QubmV3KCJkZWZhdWx0LSN7JHJlbW90 ZUhvc3RzLmxlbmd0aH0iLCB1cmkudXNlciwgdXJpLmhvc3QsIHVyaS5wb3J0KQorICAgICAgICAk cmVtb3RlSG9zdHNbMF0uaWRlbnRpdHlfZmlsZV9wYXRoID0gJ34vLnNzaC9pZF9yc2EnCiAgICAg d2hlbiAnLS1yZW1vdGUtY29uZmlnLWZpbGUnCiAgICAgICAgICRyZW1vdGVDb25maWdGaWxlID0g YXJnCiAgICAgd2hlbiAnLS1yZXBvcnQtZXhlY3V0aW9uLXRpbWUnCkBAIC0zMjUsNiArMzI2LDkg QEAgaWYgJHJlbW90ZUNvbmZpZ0ZpbGUKICAgICAgICAgaWYgY29uZmlnWydyZW1vdGVEaXJlY3Rv cnknXQogICAgICAgICAgICAgJHJlbW90ZUhvc3RzWzBdLnJlbW90ZURpcmVjdG9yeSA9IGNvbmZp Z1sncmVtb3RlRGlyZWN0b3J5J10KICAgICAgICAgZW5kCisgICAgICAgIGlmIGNvbmZpZ1snaWRG aWxlUGF0aCddCisgICAgICAgICAgICAkcmVtb3RlSG9zdHNbMF0uaWRlbnRpdHlfZmlsZV9wYXRo ID0gY29uZmlnWydpZEZpbGVQYXRoJ10KKyAgICAgICAgZW5kCiAgICAgZW5kCiAKICAgICAjIHdl IGNhbiBjb21iaW5lIC0tcmVtb3RlIGFuZCBhIG5ldyBzdHlsZSBjb25maWcKQEAgLTM0MCw5ICsz NDQsMTMgQEAgaWYgJHJlbW90ZUNvbmZpZ0ZpbGUKICAgICAgICAgICAgIGlmIHJlbW90ZVsncmVt b3RlRGlyZWN0b3J5J10KICAgICAgICAgICAgICAgICBob3N0LnJlbW90ZURpcmVjdG9yeSA9IHJl bW90ZVsncmVtb3RlRGlyZWN0b3J5J10KICAgICAgICAgICAgIGVuZAorICAgICAgICAgICAgaWYg cmVtb3RlWydpZEZpbGVQYXRoJ10KKyAgICAgICAgICAgICAgICBob3N0LmlkZW50aXR5X2ZpbGVf cGF0aCA9IHJlbW90ZVsnaWRGaWxlUGF0aCddCisgICAgICAgICAgICBlbmQKICAgICAgICAgICAg IGhvc3QKICAgICAgICAgfQogICAgIGVuZAorICAgIHByaW50ICRyZW1vdGVIb3N0c1swXS5pZGVu dGl0eV9maWxlX3BhdGgKIGVuZAogCiB1bmxlc3MganNjQXJnCkBAIC0yMTE0LDcgKzIxMjIsNyBA QCBkZWYgc3NoUmVhZChjbWQsIHJlbW90ZUhvc3QsIG9wdGlvbnM9e30pCiAgICAgcmFpc2UgdW5s ZXNzICRyZW1vdGUKIAogICAgIHJlc3VsdCA9ICIiCi0gICAgSU8ucG9wZW4oInNzaCAtbyBOb0hv c3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMgLXAgI3tyZW1vdGVIb3N0LnBvcnR9ICN7 cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0gJyN7Y21kfSciLCAiciIpIHsKKyAg ICBJTy5wb3Blbigic3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyAt cCAje3JlbW90ZUhvc3QucG9ydH0iICsgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoID8g IiAtaSAje3JlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRofSIgOiAiIikgKyAiICN7cmVtb3Rl SG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0gJyN7Y21kfSciLCAiciIpIHsKICAgICAgIHwg aW5wIHwKICAgICAgIGlucC5lYWNoX2xpbmUgewogICAgICAgICB8IGxpbmUgfApAQCAtMjI1Miw4 ICsyMjYwLDggQEAgZGVmIGdldFJlbW90ZURpcmVjdG9yeUlmTmVlZGVkKHJlbW90ZUhvc3QpCiBl bmQKIAogZGVmIGNvcHlCdW5kbGVUb1JlbW90ZShyZW1vdGVIb3N0KQotICAgIG15c3lzKFsic3No IiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyIsICItcCIsIHJl bW90ZUhvc3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0 fSIsICJta2RpciAtcCAje3JlbW90ZUhvc3QucmVtb3RlRGlyZWN0b3J5fSJdKQotICAgIG15c3lz KFsic2NwIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyIsICIt UCIsIHJlbW90ZUhvc3QucG9ydC50b19zLCAoJG91dHB1dERpci5kaXJuYW1lICsgJHRhckZpbGVO YW1lKS50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fToje3JlbW90 ZUhvc3QucmVtb3RlRGlyZWN0b3J5fSJdKQorICAgIG15c3lzKFsic3NoIiwgIi1vIiwgIk5vSG9z dEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyJdICsgKHJlbW90ZUhvc3QuaWRlbnRpdHlf ZmlsZV9wYXRoID8gWyItaSIsIHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoXSA6IFtdKSAr IFsiLXAiLCByZW1vdGVIb3N0LnBvcnQudG9fcywgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90 ZUhvc3QuaG9zdH0iLCAibWtkaXIgLXAgI3tyZW1vdGVIb3N0LnJlbW90ZURpcmVjdG9yeX0iXSkK KyAgICBteXN5cyhbInNjcCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9z dD15ZXMiXSArIChyZW1vdGVIb3N0LmlkZW50aXR5X2ZpbGVfcGF0aCA/IFsiLWkiLCByZW1vdGVI b3N0LmlkZW50aXR5X2ZpbGVfcGF0aF0gOiBbXSkgKyBbIi1QIiwgcmVtb3RlSG9zdC5wb3J0LnRv X3MsICgkb3V0cHV0RGlyLmRpcm5hbWUgKyAkdGFyRmlsZU5hbWUpLnRvX3MsICIje3JlbW90ZUhv c3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9OiN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rvcnl9 Il0pCiBlbmQKIAogZGVmIGV4cG9ydEJhc2VFbnZpcm9ubWVudFZhcmlhYmxlcyhlc2NhcGUpCkBA IC0yMjg3LDcgKzIyOTUsNyBAQCBkZWYgcnVuVGVzdFJ1bm5lcihyZW1vdGVJbmRleD0wKQogICAg ICAgICByZW1vdGVTY3JpcHQgKz0gZXhwb3J0QmFzZUVudmlyb25tZW50VmFyaWFibGVzKHRydWUp CiAgICAgICAgICRlbnZWYXJzLmVhY2ggeyB8dmFyfCByZW1vdGVTY3JpcHQgKz0gImV4cG9ydCAi IDw8IHZhciA8PCAiXG4iIH0KICAgICAgICAgcmVtb3RlU2NyaXB0ICs9ICIje3Rlc3RSdW5uZXJD b21tYW5kKHJlbW90ZUluZGV4KX1cIiIKLSAgICAgICAgcnVuQW5kTW9uaXRvclRlc3RSdW5uZXJD b21tYW5kKFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXll cyIsICItcCIsIHJlbW90ZUhvc3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVt b3RlSG9zdC5ob3N0fSIsIHJlbW90ZVNjcmlwdF0pCisgICAgICAgIHJ1bkFuZE1vbml0b3JUZXN0 UnVubmVyQ29tbWFuZChbInNzaCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2Fs aG9zdD15ZXMiXSArIChyZW1vdGVIb3N0LmlkZW50aXR5X2ZpbGVfcGF0aCA/IFsiLWkiLCByZW1v dGVIb3N0LmlkZW50aXR5X2ZpbGVfcGF0aF0gOiBbXSkgKyBbIi1wIiwgcmVtb3RlSG9zdC5wb3J0 LnRvX3MsICIje3JlbW90ZUhvc3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9IiwgcmVtb3RlU2Ny aXB0XSkKICAgICBlbHNlCiAgICAgICAgIERpci5jaGRpcigkcnVubmVyRGlyKSB7CiAgICAgICAg ICAgICBydW5BbmRNb25pdG9yVGVzdFJ1bm5lckNvbW1hbmQoU2hlbGx3b3Jkcy5zaGVsbHNwbGl0 KHRlc3RSdW5uZXJDb21tYW5kKSkKQEAgLTI2NjAsOCArMjY2OCw5IEBAIGVuZAogZGVmIHVucGFj a0J1bmRsZUdudVBhcmFsbGVsKHJlbW90ZUhvc3RzKQogICAgIGZvckVhY2hSZW1vdGUocmVtb3Rl SG9zdHMsIDpkcm9wT25GYWlsdXJlID0+IHRydWUpIHsKICAgICAgICAgfCBfLCByZW1vdGVIb3N0 IHwKLSAgICAgICAgbXlzeXMoWyJzc2giLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JM b2NhbGhvc3Q9eWVzIiwKLSAgICAgICAgICAgICAgICItcCIsIHJlbW90ZUhvc3QucG9ydC50b19z LAorICAgICAgICBteXN5cyhbInNzaCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxv Y2FsaG9zdD15ZXMiXSArIAorICAgICAgICAgICAgICAgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmls ZV9wYXRoID8gWyItaSIsIHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoXSA6IFtdKSArIAor ICAgICAgICAgICAgICAgWyItcCIsIHJlbW90ZUhvc3QucG9ydC50b19zLAogICAgICAgICAgICAg ICAgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0iLAogICAgICAgICAgICAg ICAgImNkICN7U2hlbGx3b3Jkcy5zaGVsbGVzY2FwZShyZW1vdGVIb3N0LnJlbW90ZURpcmVjdG9y eSl9ICYmIHJtIC1yZiAjeyRvdXRwdXREaXIuYmFzZW5hbWV9ICYmIHRhciB4emYgI3skdGFyRmls ZU5hbWV9Il0pCiAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGViMjZkMjc1N2YwNTgxMDI1ZTRl NTExYTY1YzVjY2ZjODQzNWY3NGMuLmQzNDU5YjhhZWFkYjhkYjIzZGU1NDMyMGI4ZWJiZjM0NjIw NmZmZjMgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTM2OSw3ICszNjksOCBAQCBzdWIgZGV0ZXJtaW5l TmF0aXZlQXJjaGl0ZWN0dXJlKCQpCiAgICAgICAgICAgICBteSAkdGFyZ2V0ID0gJHNwbGl0WzBd OwogICAgICAgICAgICAgbXkgJHBvcnQgPSAyMjsKICAgICAgICAgICAgICRwb3J0ID0gJHNwbGl0 WzFdIGlmIHNjYWxhcihAc3BsaXQpID4gMTsKLSAgICAgICAgICAgICRvdXRwdXQgPSBgc3NoIC1v IE5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyAtcCAkcG9ydCAkdGFyZ2V0ICd1 bmFtZSAgLW0nYDsKKyAgICAgICAgICAgIG15ICRjbWQgPSAnc3NoIC1vIE5vSG9zdEF1dGhlbnRp Y2F0aW9uRm9yTG9jYWxob3N0PXllcyAnLiAoZXhpc3RzICRyZW1vdGUtPnsnaWRGaWxlUGF0aCd9 ID8gKCctaSAnLiRyZW1vdGUtPnsnaWRGaWxlUGF0aCd9KSA6ICcnKSAuIiAtcCAkcG9ydCAkdGFy Z2V0ICd1bmFtZSAgLW0nIjsKKyAgICAgICAgICAgICRvdXRwdXQgPSBzeXN0ZW0oJGNtZCk7CiAg ICAgICAgICAgICBsYXN0IGlmICgkPyA9PSAwKTsKICAgICAgICAgfQogICAgICAgICBpZiAobGVu Z3RoKCRvdXRwdXQpID09IDApIHsK 443575 2021-11-08 11:14:54 -0800 2021-11-08 17:58:08 -0800 Patch bug-232453-20211108111453.patch text/plain 7547 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDg5OTc3NWI5Zjg5YWI5ZGZhYzVjMGE5YzFlOTNhMGY0 MTUyYjY1Ni4uMTg2NGE5N2EyNmI2ZjEyM2Q2ZjYyYWYwZTllOTRlYzFkMDlhZDkyYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTEwLTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIHJ1bi1qYXZhc2NyaXB0LWNvcmUtdGVzdCBhbmQgcnVuLWpzYy1zdHJlc3Mt dGVzdHMgc3VwcG9ydCBhIGN1c3RvbWl6ZWQgaWRlbnRpdHkgZmlsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNDUzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1qYXZhc2NyaXB0 Y29yZS10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQgZm9yIHJlbW90ZSBjb25maWcuCisgICAg ICAgICogU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQg Zm9yIHJlbW90ZSBjb25maWcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAg ICAgICAoZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKTogUHJvdmlkZSAtaSBvcHRpb24gdG8g c3NoCisKIDIwMjEtMTAtMjYgIFJveSBSZWFwb3IgIDxycmVhcG9yQGFwcGxlLmNvbT4KIAogICAg ICAgICB3ZWJraXRweS9hdXRvaW5zdGFsbGVkL3B5b2JqY19mcmFtZXdvcmtzLnB5IHNob3VsZCBu b3QgYXV0b2luc3RhbGwgZnJhbWV3b3JrcyBpZiB0aGV5IGNhbiBiZSBpbXBvcnRlZCB3aXRob3V0 IGV4Y2VwdGlvbnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3Jl LXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMKaW5kZXggZmIy MWJmZTcxYTRmNWM4YWU3ZTMyYmYyZjE3ZGU1ZjRjNDg1NjU5Ny4uNDViNGM2ODcyNDU2MWU3MTkx NGVjZTI5M2RiMDAyYzhkMjkwNjBhNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tamF2 YXNjcmlwdGNvcmUtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUt dGVzdHMKQEAgLTUyNCwxMiArNTI0LDE0IEBAIGlmIChkZWZpbmVkICRyZW1vdGVDb25maWdGaWxl KSB7CiAgICAgICAgICRyZW1vdGVzID0gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGVzIn07CiAgICAg fSBlbHNpZiAoZGVmaW5lZCAkcmVtb3RlQ29uZmlnLT57InJlbW90ZSJ9KSB7CiAgICAgICAgIG15 IEBzcGxpdCA9IHNwbGl0KCc6JywgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifSk7Ci0gICAgICAg ICRyZW1vdGVzID0gWwotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIiA9PiAi c3ludGhlc2l6ZWQiLAotICAgICAgICAgICAgICAgICJhZGRyZXNzIiA9PiAkcmVtb3RlQ29uZmln LT57InJlbW90ZSJ9Ci0gICAgICAgICAgICB9Ci0gICAgICAgICBdOworICAgICAgICBteSAkcmVt b3RlID0geworICAgICAgICAgICAgIm5hbWUiID0+ICJzeW50aGVzaXplZCIsCisgICAgICAgICAg ICAiYWRkcmVzcyIgPT4gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifQorICAgICAgICB9OworICAg ICAgICBpZiAoZXhpc3RzICRyZW1vdGVDb25maWctPnsiaWRGaWxlUGF0aCJ9KSB7CisgICAgICAg ICAgICAkcmVtb3RlLT57J2lkRmlsZVBhdGgnfSA9ICRyZW1vdGVDb25maWctPnsnaWRGaWxlUGF0 aCd9OworICAgICAgICB9CisgICAgICAgICRyZW1vdGVzID0gWyRyZW1vdGVdOwogICAgIH0KIH0K IApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cyBiL1Rvb2xz L1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMKaW5kZXggY2QwNzViYTc1ZmI3ZjYyNWRiYTI2 ZDRiMTI1MTQzZDk0MmMxMTg0NS4uMjM5Njk3OThjNjE4MWExNDk5NmYwODM1N2MzZGViMjBjMTNm MDAxZCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cworKysg Yi9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCkBAIC01MSw3ICs1MSw3IEBAIFNp Z25hbC50cmFwKCJURVJNIikgewogICAgIHB1dHMoVGhyZWFkLmN1cnJlbnQuYmFja3RyYWNlKQog fQogCi1SZW1vdGVIb3N0ID0gU3RydWN0Lm5ldyg6bmFtZSwgOnVzZXIsIDpob3N0LCA6cG9ydCwg OnJlbW90ZURpcmVjdG9yeSkKK1JlbW90ZUhvc3QgPSBTdHJ1Y3QubmV3KDpuYW1lLCA6dXNlciwg Omhvc3QsIDpwb3J0LCA6cmVtb3RlRGlyZWN0b3J5LCA6aWRlbnRpdHlfZmlsZV9wYXRoKQogCiBU SElTX1NDUklQVF9QQVRIID0gUGF0aG5hbWUubmV3KF9fRklMRV9fKS5yZWFscGF0aAogU0NSSVBU U19QQVRIID0gVEhJU19TQ1JJUFRfUEFUSC5kaXJuYW1lCkBAIC0yNzYsNiArMjc2LDcgQEAgR2V0 b3B0TG9uZy5uZXcoWyctLWhlbHAnLCAnLWgnLCBHZXRvcHRMb25nOjpOT19BUkdVTUVOVF0sCiAg ICAgICAgICRyZW1vdGUgPSB0cnVlCiAgICAgICAgIHVyaSA9IFVSSSgic3NoOi8vIiArIGFyZykK ICAgICAgICAgJHJlbW90ZUhvc3RzIDw8IFJlbW90ZUhvc3QubmV3KCJkZWZhdWx0LSN7JHJlbW90 ZUhvc3RzLmxlbmd0aH0iLCB1cmkudXNlciwgdXJpLmhvc3QsIHVyaS5wb3J0KQorICAgICAgICAk cmVtb3RlSG9zdHNbMF0uaWRlbnRpdHlfZmlsZV9wYXRoID0gJ34vLnNzaC9pZF9yc2EnCiAgICAg d2hlbiAnLS1yZW1vdGUtY29uZmlnLWZpbGUnCiAgICAgICAgICRyZW1vdGVDb25maWdGaWxlID0g YXJnCiAgICAgd2hlbiAnLS1yZXBvcnQtZXhlY3V0aW9uLXRpbWUnCkBAIC0zMjUsNiArMzI2LDkg QEAgaWYgJHJlbW90ZUNvbmZpZ0ZpbGUKICAgICAgICAgaWYgY29uZmlnWydyZW1vdGVEaXJlY3Rv cnknXQogICAgICAgICAgICAgJHJlbW90ZUhvc3RzWzBdLnJlbW90ZURpcmVjdG9yeSA9IGNvbmZp Z1sncmVtb3RlRGlyZWN0b3J5J10KICAgICAgICAgZW5kCisgICAgICAgIGlmIGNvbmZpZ1snaWRG aWxlUGF0aCddCisgICAgICAgICAgICAkcmVtb3RlSG9zdHNbMF0uaWRlbnRpdHlfZmlsZV9wYXRo ID0gY29uZmlnWydpZEZpbGVQYXRoJ10KKyAgICAgICAgZW5kCiAgICAgZW5kCiAKICAgICAjIHdl IGNhbiBjb21iaW5lIC0tcmVtb3RlIGFuZCBhIG5ldyBzdHlsZSBjb25maWcKQEAgLTM0MCw5ICsz NDQsMTMgQEAgaWYgJHJlbW90ZUNvbmZpZ0ZpbGUKICAgICAgICAgICAgIGlmIHJlbW90ZVsncmVt b3RlRGlyZWN0b3J5J10KICAgICAgICAgICAgICAgICBob3N0LnJlbW90ZURpcmVjdG9yeSA9IHJl bW90ZVsncmVtb3RlRGlyZWN0b3J5J10KICAgICAgICAgICAgIGVuZAorICAgICAgICAgICAgaWYg cmVtb3RlWydpZEZpbGVQYXRoJ10KKyAgICAgICAgICAgICAgICBob3N0LmlkZW50aXR5X2ZpbGVf cGF0aCA9IHJlbW90ZVsnaWRGaWxlUGF0aCddCisgICAgICAgICAgICBlbmQKICAgICAgICAgICAg IGhvc3QKICAgICAgICAgfQogICAgIGVuZAorICAgIHByaW50ICRyZW1vdGVIb3N0c1swXS5pZGVu dGl0eV9maWxlX3BhdGgKIGVuZAogCiB1bmxlc3MganNjQXJnCkBAIC0yMTE0LDcgKzIxMjIsNyBA QCBkZWYgc3NoUmVhZChjbWQsIHJlbW90ZUhvc3QsIG9wdGlvbnM9e30pCiAgICAgcmFpc2UgdW5s ZXNzICRyZW1vdGUKIAogICAgIHJlc3VsdCA9ICIiCi0gICAgSU8ucG9wZW4oInNzaCAtbyBOb0hv c3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMgLXAgI3tyZW1vdGVIb3N0LnBvcnR9ICN7 cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0gJyN7Y21kfSciLCAiciIpIHsKKyAg ICBJTy5wb3Blbigic3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyAt cCAje3JlbW90ZUhvc3QucG9ydH0iICsgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoID8g IiAtaSAje3JlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRofSIgOiAiIikgKyAiICN7cmVtb3Rl SG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0gJyN7Y21kfSciLCAiciIpIHsKICAgICAgIHwg aW5wIHwKICAgICAgIGlucC5lYWNoX2xpbmUgewogICAgICAgICB8IGxpbmUgfApAQCAtMjI1Miw4 ICsyMjYwLDggQEAgZGVmIGdldFJlbW90ZURpcmVjdG9yeUlmTmVlZGVkKHJlbW90ZUhvc3QpCiBl bmQKIAogZGVmIGNvcHlCdW5kbGVUb1JlbW90ZShyZW1vdGVIb3N0KQotICAgIG15c3lzKFsic3No IiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyIsICItcCIsIHJl bW90ZUhvc3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0 fSIsICJta2RpciAtcCAje3JlbW90ZUhvc3QucmVtb3RlRGlyZWN0b3J5fSJdKQotICAgIG15c3lz KFsic2NwIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyIsICIt UCIsIHJlbW90ZUhvc3QucG9ydC50b19zLCAoJG91dHB1dERpci5kaXJuYW1lICsgJHRhckZpbGVO YW1lKS50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fToje3JlbW90 ZUhvc3QucmVtb3RlRGlyZWN0b3J5fSJdKQorICAgIG15c3lzKFsic3NoIiwgIi1vIiwgIk5vSG9z dEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyJdICsgKHJlbW90ZUhvc3QuaWRlbnRpdHlf ZmlsZV9wYXRoID8gWyItaSIsIHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoXSA6IFtdKSAr IFsiLXAiLCByZW1vdGVIb3N0LnBvcnQudG9fcywgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90 ZUhvc3QuaG9zdH0iLCAibWtkaXIgLXAgI3tyZW1vdGVIb3N0LnJlbW90ZURpcmVjdG9yeX0iXSkK KyAgICBteXN5cyhbInNjcCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9z dD15ZXMiXSArIChyZW1vdGVIb3N0LmlkZW50aXR5X2ZpbGVfcGF0aCA/IFsiLWkiLCByZW1vdGVI b3N0LmlkZW50aXR5X2ZpbGVfcGF0aF0gOiBbXSkgKyBbIi1QIiwgcmVtb3RlSG9zdC5wb3J0LnRv X3MsICgkb3V0cHV0RGlyLmRpcm5hbWUgKyAkdGFyRmlsZU5hbWUpLnRvX3MsICIje3JlbW90ZUhv c3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9OiN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rvcnl9 Il0pCiBlbmQKIAogZGVmIGV4cG9ydEJhc2VFbnZpcm9ubWVudFZhcmlhYmxlcyhlc2NhcGUpCkBA IC0yMjg3LDcgKzIyOTUsNyBAQCBkZWYgcnVuVGVzdFJ1bm5lcihyZW1vdGVJbmRleD0wKQogICAg ICAgICByZW1vdGVTY3JpcHQgKz0gZXhwb3J0QmFzZUVudmlyb25tZW50VmFyaWFibGVzKHRydWUp CiAgICAgICAgICRlbnZWYXJzLmVhY2ggeyB8dmFyfCByZW1vdGVTY3JpcHQgKz0gImV4cG9ydCAi IDw8IHZhciA8PCAiXG4iIH0KICAgICAgICAgcmVtb3RlU2NyaXB0ICs9ICIje3Rlc3RSdW5uZXJD b21tYW5kKHJlbW90ZUluZGV4KX1cIiIKLSAgICAgICAgcnVuQW5kTW9uaXRvclRlc3RSdW5uZXJD b21tYW5kKFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXll cyIsICItcCIsIHJlbW90ZUhvc3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVt b3RlSG9zdC5ob3N0fSIsIHJlbW90ZVNjcmlwdF0pCisgICAgICAgIHJ1bkFuZE1vbml0b3JUZXN0 UnVubmVyQ29tbWFuZChbInNzaCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2Fs aG9zdD15ZXMiXSArIChyZW1vdGVIb3N0LmlkZW50aXR5X2ZpbGVfcGF0aCA/IFsiLWkiLCByZW1v dGVIb3N0LmlkZW50aXR5X2ZpbGVfcGF0aF0gOiBbXSkgKyBbIi1wIiwgcmVtb3RlSG9zdC5wb3J0 LnRvX3MsICIje3JlbW90ZUhvc3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9IiwgcmVtb3RlU2Ny aXB0XSkKICAgICBlbHNlCiAgICAgICAgIERpci5jaGRpcigkcnVubmVyRGlyKSB7CiAgICAgICAg ICAgICBydW5BbmRNb25pdG9yVGVzdFJ1bm5lckNvbW1hbmQoU2hlbGx3b3Jkcy5zaGVsbHNwbGl0 KHRlc3RSdW5uZXJDb21tYW5kKSkKQEAgLTI2NjAsOCArMjY2OCw5IEBAIGVuZAogZGVmIHVucGFj a0J1bmRsZUdudVBhcmFsbGVsKHJlbW90ZUhvc3RzKQogICAgIGZvckVhY2hSZW1vdGUocmVtb3Rl SG9zdHMsIDpkcm9wT25GYWlsdXJlID0+IHRydWUpIHsKICAgICAgICAgfCBfLCByZW1vdGVIb3N0 IHwKLSAgICAgICAgbXlzeXMoWyJzc2giLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JM b2NhbGhvc3Q9eWVzIiwKLSAgICAgICAgICAgICAgICItcCIsIHJlbW90ZUhvc3QucG9ydC50b19z LAorICAgICAgICBteXN5cyhbInNzaCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxv Y2FsaG9zdD15ZXMiXSArIAorICAgICAgICAgICAgICAgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmls ZV9wYXRoID8gWyItaSIsIHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoXSA6IFtdKSArIAor ICAgICAgICAgICAgICAgWyItcCIsIHJlbW90ZUhvc3QucG9ydC50b19zLAogICAgICAgICAgICAg ICAgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0iLAogICAgICAgICAgICAg ICAgImNkICN7U2hlbGx3b3Jkcy5zaGVsbGVzY2FwZShyZW1vdGVIb3N0LnJlbW90ZURpcmVjdG9y eSl9ICYmIHJtIC1yZiAjeyRvdXRwdXREaXIuYmFzZW5hbWV9ICYmIHRhciB4emYgI3skdGFyRmls ZU5hbWV9Il0pCiAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGViMjZkMjc1N2YwNTgxMDI1ZTRl NTExYTY1YzVjY2ZjODQzNWY3NGMuLmIyMmQzZDU4MWEyZGJhZmIxMzViMjVkZmMxZGQ2ZGYyMmMx ZWUyN2YgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTM2OSw3ICszNjksOCBAQCBzdWIgZGV0ZXJtaW5l TmF0aXZlQXJjaGl0ZWN0dXJlKCQpCiAgICAgICAgICAgICBteSAkdGFyZ2V0ID0gJHNwbGl0WzBd OwogICAgICAgICAgICAgbXkgJHBvcnQgPSAyMjsKICAgICAgICAgICAgICRwb3J0ID0gJHNwbGl0 WzFdIGlmIHNjYWxhcihAc3BsaXQpID4gMTsKLSAgICAgICAgICAgICRvdXRwdXQgPSBgc3NoIC1v IE5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyAtcCAkcG9ydCAkdGFyZ2V0ICd1 bmFtZSAgLW0nYDsKKyAgICAgICAgICAgIG15ICRjbWQgPSAnc3NoIC1vIE5vSG9zdEF1dGhlbnRp Y2F0aW9uRm9yTG9jYWxob3N0PXllcyAnLiAoZXhpc3RzICRyZW1vdGUtPnsnaWRGaWxlUGF0aCd9 ID8gKCctaSAnLiRyZW1vdGUtPnsnaWRGaWxlUGF0aCd9KSA6ICcnKSAuIiAtcCAkcG9ydCAkdGFy Z2V0ICd1bmFtZSAgLW0nIjsKKyAgICAgICAgICAgICRvdXRwdXQgPSByZWFkcGlwZSgkY21kKTsK ICAgICAgICAgICAgIGxhc3QgaWYgKCQ/ID09IDApOwogICAgICAgICB9CiAgICAgICAgIGlmIChs ZW5ndGgoJG91dHB1dCkgPT0gMCkgewo= 443643 2021-11-08 17:58:11 -0800 2021-11-12 16:07:16 -0800 Patch bug-232453-20211108175810.patch text/plain 7142 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDg5OTc3NWI5Zjg5YWI5ZGZhYzVjMGE5YzFlOTNhMGY0 MTUyYjY1Ni4uMTg2NGE5N2EyNmI2ZjEyM2Q2ZjYyYWYwZTllOTRlYzFkMDlhZDkyYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTEwLTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIHJ1bi1qYXZhc2NyaXB0LWNvcmUtdGVzdCBhbmQgcnVuLWpzYy1zdHJlc3Mt dGVzdHMgc3VwcG9ydCBhIGN1c3RvbWl6ZWQgaWRlbnRpdHkgZmlsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNDUzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1qYXZhc2NyaXB0 Y29yZS10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQgZm9yIHJlbW90ZSBjb25maWcuCisgICAg ICAgICogU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQg Zm9yIHJlbW90ZSBjb25maWcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAg ICAgICAoZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKTogUHJvdmlkZSAtaSBvcHRpb24gdG8g c3NoCisKIDIwMjEtMTAtMjYgIFJveSBSZWFwb3IgIDxycmVhcG9yQGFwcGxlLmNvbT4KIAogICAg ICAgICB3ZWJraXRweS9hdXRvaW5zdGFsbGVkL3B5b2JqY19mcmFtZXdvcmtzLnB5IHNob3VsZCBu b3QgYXV0b2luc3RhbGwgZnJhbWV3b3JrcyBpZiB0aGV5IGNhbiBiZSBpbXBvcnRlZCB3aXRob3V0 IGV4Y2VwdGlvbnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3Jl LXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMKaW5kZXggZmIy MWJmZTcxYTRmNWM4YWU3ZTMyYmYyZjE3ZGU1ZjRjNDg1NjU5Ny4uNDViNGM2ODcyNDU2MWU3MTkx NGVjZTI5M2RiMDAyYzhkMjkwNjBhNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tamF2 YXNjcmlwdGNvcmUtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUt dGVzdHMKQEAgLTUyNCwxMiArNTI0LDE0IEBAIGlmIChkZWZpbmVkICRyZW1vdGVDb25maWdGaWxl KSB7CiAgICAgICAgICRyZW1vdGVzID0gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGVzIn07CiAgICAg fSBlbHNpZiAoZGVmaW5lZCAkcmVtb3RlQ29uZmlnLT57InJlbW90ZSJ9KSB7CiAgICAgICAgIG15 IEBzcGxpdCA9IHNwbGl0KCc6JywgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifSk7Ci0gICAgICAg ICRyZW1vdGVzID0gWwotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIiA9PiAi c3ludGhlc2l6ZWQiLAotICAgICAgICAgICAgICAgICJhZGRyZXNzIiA9PiAkcmVtb3RlQ29uZmln LT57InJlbW90ZSJ9Ci0gICAgICAgICAgICB9Ci0gICAgICAgICBdOworICAgICAgICBteSAkcmVt b3RlID0geworICAgICAgICAgICAgIm5hbWUiID0+ICJzeW50aGVzaXplZCIsCisgICAgICAgICAg ICAiYWRkcmVzcyIgPT4gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifQorICAgICAgICB9OworICAg ICAgICBpZiAoZXhpc3RzICRyZW1vdGVDb25maWctPnsiaWRGaWxlUGF0aCJ9KSB7CisgICAgICAg ICAgICAkcmVtb3RlLT57J2lkRmlsZVBhdGgnfSA9ICRyZW1vdGVDb25maWctPnsnaWRGaWxlUGF0 aCd9OworICAgICAgICB9CisgICAgICAgICRyZW1vdGVzID0gWyRyZW1vdGVdOwogICAgIH0KIH0K IApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cyBiL1Rvb2xz L1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMKaW5kZXggY2QwNzViYTc1ZmI3ZjYyNWRiYTI2 ZDRiMTI1MTQzZDk0MmMxMTg0NS4uMDFkZThjNjA3ZmI2NzZlMTk0NTNjOWZiMDE3NmNjYzc4NjQ0 NGMzYyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cworKysg Yi9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCkBAIC01MSw3ICs1MSw3IEBAIFNp Z25hbC50cmFwKCJURVJNIikgewogICAgIHB1dHMoVGhyZWFkLmN1cnJlbnQuYmFja3RyYWNlKQog fQogCi1SZW1vdGVIb3N0ID0gU3RydWN0Lm5ldyg6bmFtZSwgOnVzZXIsIDpob3N0LCA6cG9ydCwg OnJlbW90ZURpcmVjdG9yeSkKK1JlbW90ZUhvc3QgPSBTdHJ1Y3QubmV3KDpuYW1lLCA6dXNlciwg Omhvc3QsIDpwb3J0LCA6cmVtb3RlRGlyZWN0b3J5LCA6aWRlbnRpdHlfZmlsZV9wYXRoKQogCiBU SElTX1NDUklQVF9QQVRIID0gUGF0aG5hbWUubmV3KF9fRklMRV9fKS5yZWFscGF0aAogU0NSSVBU U19QQVRIID0gVEhJU19TQ1JJUFRfUEFUSC5kaXJuYW1lCkBAIC0zMjUsNiArMzI1LDkgQEAgaWYg JHJlbW90ZUNvbmZpZ0ZpbGUKICAgICAgICAgaWYgY29uZmlnWydyZW1vdGVEaXJlY3RvcnknXQog ICAgICAgICAgICAgJHJlbW90ZUhvc3RzWzBdLnJlbW90ZURpcmVjdG9yeSA9IGNvbmZpZ1sncmVt b3RlRGlyZWN0b3J5J10KICAgICAgICAgZW5kCisgICAgICAgIGlmIGNvbmZpZ1snaWRGaWxlUGF0 aCddCisgICAgICAgICAgICAkcmVtb3RlSG9zdHNbMF0uaWRlbnRpdHlfZmlsZV9wYXRoID0gY29u ZmlnWydpZEZpbGVQYXRoJ10KKyAgICAgICAgZW5kCiAgICAgZW5kCiAKICAgICAjIHdlIGNhbiBj b21iaW5lIC0tcmVtb3RlIGFuZCBhIG5ldyBzdHlsZSBjb25maWcKQEAgLTM0MCw5ICszNDMsMTMg QEAgaWYgJHJlbW90ZUNvbmZpZ0ZpbGUKICAgICAgICAgICAgIGlmIHJlbW90ZVsncmVtb3RlRGly ZWN0b3J5J10KICAgICAgICAgICAgICAgICBob3N0LnJlbW90ZURpcmVjdG9yeSA9IHJlbW90ZVsn cmVtb3RlRGlyZWN0b3J5J10KICAgICAgICAgICAgIGVuZAorICAgICAgICAgICAgaWYgcmVtb3Rl WydpZEZpbGVQYXRoJ10KKyAgICAgICAgICAgICAgICBob3N0LmlkZW50aXR5X2ZpbGVfcGF0aCA9 IHJlbW90ZVsnaWRGaWxlUGF0aCddCisgICAgICAgICAgICBlbmQKICAgICAgICAgICAgIGhvc3QK ICAgICAgICAgfQogICAgIGVuZAorICAgIHByaW50ICRyZW1vdGVIb3N0c1swXS5pZGVudGl0eV9m aWxlX3BhdGgKIGVuZAogCiB1bmxlc3MganNjQXJnCkBAIC0yMTE0LDcgKzIxMjEsNyBAQCBkZWYg c3NoUmVhZChjbWQsIHJlbW90ZUhvc3QsIG9wdGlvbnM9e30pCiAgICAgcmFpc2UgdW5sZXNzICRy ZW1vdGUKIAogICAgIHJlc3VsdCA9ICIiCi0gICAgSU8ucG9wZW4oInNzaCAtbyBOb0hvc3RBdXRo ZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMgLXAgI3tyZW1vdGVIb3N0LnBvcnR9ICN7cmVtb3Rl SG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0gJyN7Y21kfSciLCAiciIpIHsKKyAgICBJTy5w b3Blbigic3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyAtcCAje3Jl bW90ZUhvc3QucG9ydH0iICsgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoID8gIiAtaSAj e3JlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRofSIgOiAiIikgKyAiICN7cmVtb3RlSG9zdC51 c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0gJyN7Y21kfSciLCAiciIpIHsKICAgICAgIHwgaW5wIHwK ICAgICAgIGlucC5lYWNoX2xpbmUgewogICAgICAgICB8IGxpbmUgfApAQCAtMjI1Miw4ICsyMjU5 LDggQEAgZGVmIGdldFJlbW90ZURpcmVjdG9yeUlmTmVlZGVkKHJlbW90ZUhvc3QpCiBlbmQKIAog ZGVmIGNvcHlCdW5kbGVUb1JlbW90ZShyZW1vdGVIb3N0KQotICAgIG15c3lzKFsic3NoIiwgIi1v IiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyIsICItcCIsIHJlbW90ZUhv c3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSIsICJt a2RpciAtcCAje3JlbW90ZUhvc3QucmVtb3RlRGlyZWN0b3J5fSJdKQotICAgIG15c3lzKFsic2Nw IiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyIsICItUCIsIHJl bW90ZUhvc3QucG9ydC50b19zLCAoJG91dHB1dERpci5kaXJuYW1lICsgJHRhckZpbGVOYW1lKS50 b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fToje3JlbW90ZUhvc3Qu cmVtb3RlRGlyZWN0b3J5fSJdKQorICAgIG15c3lzKFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhl bnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyJdICsgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9w YXRoID8gWyItaSIsIHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoXSA6IFtdKSArIFsiLXAi LCByZW1vdGVIb3N0LnBvcnQudG9fcywgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3Qu aG9zdH0iLCAibWtkaXIgLXAgI3tyZW1vdGVIb3N0LnJlbW90ZURpcmVjdG9yeX0iXSkKKyAgICBt eXN5cyhbInNjcCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMi XSArIChyZW1vdGVIb3N0LmlkZW50aXR5X2ZpbGVfcGF0aCA/IFsiLWkiLCByZW1vdGVIb3N0Lmlk ZW50aXR5X2ZpbGVfcGF0aF0gOiBbXSkgKyBbIi1QIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICgk b3V0cHV0RGlyLmRpcm5hbWUgKyAkdGFyRmlsZU5hbWUpLnRvX3MsICIje3JlbW90ZUhvc3QudXNl cn1AI3tyZW1vdGVIb3N0Lmhvc3R9OiN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rvcnl9Il0pCiBl bmQKIAogZGVmIGV4cG9ydEJhc2VFbnZpcm9ubWVudFZhcmlhYmxlcyhlc2NhcGUpCkBAIC0yMjg3 LDcgKzIyOTQsNyBAQCBkZWYgcnVuVGVzdFJ1bm5lcihyZW1vdGVJbmRleD0wKQogICAgICAgICBy ZW1vdGVTY3JpcHQgKz0gZXhwb3J0QmFzZUVudmlyb25tZW50VmFyaWFibGVzKHRydWUpCiAgICAg ICAgICRlbnZWYXJzLmVhY2ggeyB8dmFyfCByZW1vdGVTY3JpcHQgKz0gImV4cG9ydCAiIDw8IHZh ciA8PCAiXG4iIH0KICAgICAgICAgcmVtb3RlU2NyaXB0ICs9ICIje3Rlc3RSdW5uZXJDb21tYW5k KHJlbW90ZUluZGV4KX1cIiIKLSAgICAgICAgcnVuQW5kTW9uaXRvclRlc3RSdW5uZXJDb21tYW5k KFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyIsICIt cCIsIHJlbW90ZUhvc3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9z dC5ob3N0fSIsIHJlbW90ZVNjcmlwdF0pCisgICAgICAgIHJ1bkFuZE1vbml0b3JUZXN0UnVubmVy Q29tbWFuZChbInNzaCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15 ZXMiXSArIChyZW1vdGVIb3N0LmlkZW50aXR5X2ZpbGVfcGF0aCA/IFsiLWkiLCByZW1vdGVIb3N0 LmlkZW50aXR5X2ZpbGVfcGF0aF0gOiBbXSkgKyBbIi1wIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3Ms ICIje3JlbW90ZUhvc3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9IiwgcmVtb3RlU2NyaXB0XSkK ICAgICBlbHNlCiAgICAgICAgIERpci5jaGRpcigkcnVubmVyRGlyKSB7CiAgICAgICAgICAgICBy dW5BbmRNb25pdG9yVGVzdFJ1bm5lckNvbW1hbmQoU2hlbGx3b3Jkcy5zaGVsbHNwbGl0KHRlc3RS dW5uZXJDb21tYW5kKSkKQEAgLTI2NjAsOCArMjY2Nyw5IEBAIGVuZAogZGVmIHVucGFja0J1bmRs ZUdudVBhcmFsbGVsKHJlbW90ZUhvc3RzKQogICAgIGZvckVhY2hSZW1vdGUocmVtb3RlSG9zdHMs IDpkcm9wT25GYWlsdXJlID0+IHRydWUpIHsKICAgICAgICAgfCBfLCByZW1vdGVIb3N0IHwKLSAg ICAgICAgbXlzeXMoWyJzc2giLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhv c3Q9eWVzIiwKLSAgICAgICAgICAgICAgICItcCIsIHJlbW90ZUhvc3QucG9ydC50b19zLAorICAg ICAgICBteXN5cyhbInNzaCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9z dD15ZXMiXSArIAorICAgICAgICAgICAgICAgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRo ID8gWyItaSIsIHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoXSA6IFtdKSArIAorICAgICAg ICAgICAgICAgWyItcCIsIHJlbW90ZUhvc3QucG9ydC50b19zLAogICAgICAgICAgICAgICAgIiN7 cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH0iLAogICAgICAgICAgICAgICAgImNk ICN7U2hlbGx3b3Jkcy5zaGVsbGVzY2FwZShyZW1vdGVIb3N0LnJlbW90ZURpcmVjdG9yeSl9ICYm IHJtIC1yZiAjeyRvdXRwdXREaXIuYmFzZW5hbWV9ICYmIHRhciB4emYgI3skdGFyRmlsZU5hbWV9 Il0pCiAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGViMjZkMjc1N2YwNTgxMDI1ZTRlNTExYTY1 YzVjY2ZjODQzNWY3NGMuLmIyMmQzZDU4MWEyZGJhZmIxMzViMjVkZmMxZGQ2ZGYyMmMxZWUyN2Yg MTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0KQEAgLTM2OSw3ICszNjksOCBAQCBzdWIgZGV0ZXJtaW5lTmF0aXZl QXJjaGl0ZWN0dXJlKCQpCiAgICAgICAgICAgICBteSAkdGFyZ2V0ID0gJHNwbGl0WzBdOwogICAg ICAgICAgICAgbXkgJHBvcnQgPSAyMjsKICAgICAgICAgICAgICRwb3J0ID0gJHNwbGl0WzFdIGlm IHNjYWxhcihAc3BsaXQpID4gMTsKLSAgICAgICAgICAgICRvdXRwdXQgPSBgc3NoIC1vIE5vSG9z dEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyAtcCAkcG9ydCAkdGFyZ2V0ICd1bmFtZSAg LW0nYDsKKyAgICAgICAgICAgIG15ICRjbWQgPSAnc3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0aW9u Rm9yTG9jYWxob3N0PXllcyAnLiAoZXhpc3RzICRyZW1vdGUtPnsnaWRGaWxlUGF0aCd9ID8gKCct aSAnLiRyZW1vdGUtPnsnaWRGaWxlUGF0aCd9KSA6ICcnKSAuIiAtcCAkcG9ydCAkdGFyZ2V0ICd1 bmFtZSAgLW0nIjsKKyAgICAgICAgICAgICRvdXRwdXQgPSByZWFkcGlwZSgkY21kKTsKICAgICAg ICAgICAgIGxhc3QgaWYgKCQ/ID09IDApOwogICAgICAgICB9CiAgICAgICAgIGlmIChsZW5ndGgo JG91dHB1dCkgPT0gMCkgewo= 444118 2021-11-12 16:07:19 -0800 2021-11-15 18:13:26 -0800 Patch bug-232453-20211112160718.patch text/plain 7155 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDg5OTc3NWI5Zjg5YWI5ZGZhYzVjMGE5YzFlOTNhMGY0 MTUyYjY1Ni4uMTg2NGE5N2EyNmI2ZjEyM2Q2ZjYyYWYwZTllOTRlYzFkMDlhZDkyYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTEwLTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIHJ1bi1qYXZhc2NyaXB0LWNvcmUtdGVzdCBhbmQgcnVuLWpzYy1zdHJlc3Mt dGVzdHMgc3VwcG9ydCBhIGN1c3RvbWl6ZWQgaWRlbnRpdHkgZmlsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNDUzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1qYXZhc2NyaXB0 Y29yZS10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQgZm9yIHJlbW90ZSBjb25maWcuCisgICAg ICAgICogU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQg Zm9yIHJlbW90ZSBjb25maWcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAg ICAgICAoZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKTogUHJvdmlkZSAtaSBvcHRpb24gdG8g c3NoCisKIDIwMjEtMTAtMjYgIFJveSBSZWFwb3IgIDxycmVhcG9yQGFwcGxlLmNvbT4KIAogICAg ICAgICB3ZWJraXRweS9hdXRvaW5zdGFsbGVkL3B5b2JqY19mcmFtZXdvcmtzLnB5IHNob3VsZCBu b3QgYXV0b2luc3RhbGwgZnJhbWV3b3JrcyBpZiB0aGV5IGNhbiBiZSBpbXBvcnRlZCB3aXRob3V0 IGV4Y2VwdGlvbnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3Jl LXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMKaW5kZXggZmIy MWJmZTcxYTRmNWM4YWU3ZTMyYmYyZjE3ZGU1ZjRjNDg1NjU5Ny4uNDViNGM2ODcyNDU2MWU3MTkx NGVjZTI5M2RiMDAyYzhkMjkwNjBhNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tamF2 YXNjcmlwdGNvcmUtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUt dGVzdHMKQEAgLTUyNCwxMiArNTI0LDE0IEBAIGlmIChkZWZpbmVkICRyZW1vdGVDb25maWdGaWxl KSB7CiAgICAgICAgICRyZW1vdGVzID0gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGVzIn07CiAgICAg fSBlbHNpZiAoZGVmaW5lZCAkcmVtb3RlQ29uZmlnLT57InJlbW90ZSJ9KSB7CiAgICAgICAgIG15 IEBzcGxpdCA9IHNwbGl0KCc6JywgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifSk7Ci0gICAgICAg ICRyZW1vdGVzID0gWwotICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICJuYW1lIiA9PiAi c3ludGhlc2l6ZWQiLAotICAgICAgICAgICAgICAgICJhZGRyZXNzIiA9PiAkcmVtb3RlQ29uZmln LT57InJlbW90ZSJ9Ci0gICAgICAgICAgICB9Ci0gICAgICAgICBdOworICAgICAgICBteSAkcmVt b3RlID0geworICAgICAgICAgICAgIm5hbWUiID0+ICJzeW50aGVzaXplZCIsCisgICAgICAgICAg ICAiYWRkcmVzcyIgPT4gJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifQorICAgICAgICB9OworICAg ICAgICBpZiAoZXhpc3RzICRyZW1vdGVDb25maWctPnsiaWRGaWxlUGF0aCJ9KSB7CisgICAgICAg ICAgICAkcmVtb3RlLT57J2lkRmlsZVBhdGgnfSA9ICRyZW1vdGVDb25maWctPnsnaWRGaWxlUGF0 aCd9OworICAgICAgICB9CisgICAgICAgICRyZW1vdGVzID0gWyRyZW1vdGVdOwogICAgIH0KIH0K IApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cyBiL1Rvb2xz L1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMKaW5kZXggY2QwNzViYTc1ZmI3ZjYyNWRiYTI2 ZDRiMTI1MTQzZDk0MmMxMTg0NS4uYmViMGFjYzExMzViMmZkOTQ2YmI3ZjNkZmMwN2RmYTdjYmU0 YjY4YiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cworKysg Yi9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCkBAIC01MSw3ICs1MSw3IEBAIFNp Z25hbC50cmFwKCJURVJNIikgewogICAgIHB1dHMoVGhyZWFkLmN1cnJlbnQuYmFja3RyYWNlKQog fQogCi1SZW1vdGVIb3N0ID0gU3RydWN0Lm5ldyg6bmFtZSwgOnVzZXIsIDpob3N0LCA6cG9ydCwg OnJlbW90ZURpcmVjdG9yeSkKK1JlbW90ZUhvc3QgPSBTdHJ1Y3QubmV3KDpuYW1lLCA6dXNlciwg Omhvc3QsIDpwb3J0LCA6cmVtb3RlRGlyZWN0b3J5LCA6aWRlbnRpdHlfZmlsZV9wYXRoKQogCiBU SElTX1NDUklQVF9QQVRIID0gUGF0aG5hbWUubmV3KF9fRklMRV9fKS5yZWFscGF0aAogU0NSSVBU U19QQVRIID0gVEhJU19TQ1JJUFRfUEFUSC5kaXJuYW1lCkBAIC0zMjUsNiArMzI1LDkgQEAgaWYg JHJlbW90ZUNvbmZpZ0ZpbGUKICAgICAgICAgaWYgY29uZmlnWydyZW1vdGVEaXJlY3RvcnknXQog ICAgICAgICAgICAgJHJlbW90ZUhvc3RzWzBdLnJlbW90ZURpcmVjdG9yeSA9IGNvbmZpZ1sncmVt b3RlRGlyZWN0b3J5J10KICAgICAgICAgZW5kCisgICAgICAgIGlmIGNvbmZpZ1snaWRGaWxlUGF0 aCddCisgICAgICAgICAgICAkcmVtb3RlSG9zdHNbMF0uaWRlbnRpdHlfZmlsZV9wYXRoID0gY29u ZmlnWydpZEZpbGVQYXRoJ10KKyAgICAgICAgZW5kCiAgICAgZW5kCiAKICAgICAjIHdlIGNhbiBj b21iaW5lIC0tcmVtb3RlIGFuZCBhIG5ldyBzdHlsZSBjb25maWcKQEAgLTM0MCw2ICszNDMsMTAg QEAgaWYgJHJlbW90ZUNvbmZpZ0ZpbGUKICAgICAgICAgICAgIGlmIHJlbW90ZVsncmVtb3RlRGly ZWN0b3J5J10KICAgICAgICAgICAgICAgICBob3N0LnJlbW90ZURpcmVjdG9yeSA9IHJlbW90ZVsn cmVtb3RlRGlyZWN0b3J5J10KICAgICAgICAgICAgIGVuZAorICAgICAgICAgICAgaWYgcmVtb3Rl WydpZEZpbGVQYXRoJ10KKyAgICAgICAgICAgICAgICBob3N0LmlkZW50aXR5X2ZpbGVfcGF0aCA9 IHJlbW90ZVsnaWRGaWxlUGF0aCddCisgICAgICAgICAgICAgICAgcHJpbnQoJ1VzaW5nIGlkZW50 aXR5IGZpbGU6ICcgKyBob3N0LmlkZW50aXR5X2ZpbGVfcGF0aCArICJcciIpCisgICAgICAgICAg ICBlbmQKICAgICAgICAgICAgIGhvc3QKICAgICAgICAgfQogICAgIGVuZApAQCAtMjExNCw3ICsy MTIxLDcgQEAgZGVmIHNzaFJlYWQoY21kLCByZW1vdGVIb3N0LCBvcHRpb25zPXt9KQogICAgIHJh aXNlIHVubGVzcyAkcmVtb3RlCiAKICAgICByZXN1bHQgPSAiIgotICAgIElPLnBvcGVuKCJzc2gg LW8gTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIC1wICN7cmVtb3RlSG9zdC5w b3J0fSAje3JlbW90ZUhvc3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9ICcje2NtZH0nIiwgInIi KSB7CisgICAgSU8ucG9wZW4oInNzaCAtbyBOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9z dD15ZXMgLXAgI3tyZW1vdGVIb3N0LnBvcnR9IiArIChyZW1vdGVIb3N0LmlkZW50aXR5X2ZpbGVf cGF0aCA/ICIgLWkgI3tyZW1vdGVIb3N0LmlkZW50aXR5X2ZpbGVfcGF0aH0iIDogIiIpICsgIiAj e3JlbW90ZUhvc3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9ICcje2NtZH0nIiwgInIiKSB7CiAg ICAgICB8IGlucCB8CiAgICAgICBpbnAuZWFjaF9saW5lIHsKICAgICAgICAgfCBsaW5lIHwKQEAg LTIyNTIsOCArMjI1OSw4IEBAIGRlZiBnZXRSZW1vdGVEaXJlY3RvcnlJZk5lZWRlZChyZW1vdGVI b3N0KQogZW5kCiAKIGRlZiBjb3B5QnVuZGxlVG9SZW1vdGUocmVtb3RlSG9zdCkKLSAgICBteXN5 cyhbInNzaCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMiLCAi LXAiLCByZW1vdGVIb3N0LnBvcnQudG9fcywgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhv c3QuaG9zdH0iLCAibWtkaXIgLXAgI3tyZW1vdGVIb3N0LnJlbW90ZURpcmVjdG9yeX0iXSkKLSAg ICBteXN5cyhbInNjcCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15 ZXMiLCAiLVAiLCByZW1vdGVIb3N0LnBvcnQudG9fcywgKCRvdXRwdXREaXIuZGlybmFtZSArICR0 YXJGaWxlTmFtZSkudG9fcywgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH06 I3tyZW1vdGVIb3N0LnJlbW90ZURpcmVjdG9yeX0iXSkKKyAgICBteXN5cyhbInNzaCIsICItbyIs ICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMiXSArIChyZW1vdGVIb3N0Lmlk ZW50aXR5X2ZpbGVfcGF0aCA/IFsiLWkiLCByZW1vdGVIb3N0LmlkZW50aXR5X2ZpbGVfcGF0aF0g OiBbXSkgKyBbIi1wIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICIje3JlbW90ZUhvc3QudXNlcn1A I3tyZW1vdGVIb3N0Lmhvc3R9IiwgIm1rZGlyIC1wICN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rv cnl9Il0pCisgICAgbXlzeXMoWyJzY3AiLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JM b2NhbGhvc3Q9eWVzIl0gKyAocmVtb3RlSG9zdC5pZGVudGl0eV9maWxlX3BhdGggPyBbIi1pIiwg cmVtb3RlSG9zdC5pZGVudGl0eV9maWxlX3BhdGhdIDogW10pICsgWyItUCIsIHJlbW90ZUhvc3Qu cG9ydC50b19zLCAoJG91dHB1dERpci5kaXJuYW1lICsgJHRhckZpbGVOYW1lKS50b19zLCAiI3ty ZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fToje3JlbW90ZUhvc3QucmVtb3RlRGly ZWN0b3J5fSJdKQogZW5kCiAKIGRlZiBleHBvcnRCYXNlRW52aXJvbm1lbnRWYXJpYWJsZXMoZXNj YXBlKQpAQCAtMjI4Nyw3ICsyMjk0LDcgQEAgZGVmIHJ1blRlc3RSdW5uZXIocmVtb3RlSW5kZXg9 MCkKICAgICAgICAgcmVtb3RlU2NyaXB0ICs9IGV4cG9ydEJhc2VFbnZpcm9ubWVudFZhcmlhYmxl cyh0cnVlKQogICAgICAgICAkZW52VmFycy5lYWNoIHsgfHZhcnwgcmVtb3RlU2NyaXB0ICs9ICJl eHBvcnQgIiA8PCB2YXIgPDwgIlxuIiB9CiAgICAgICAgIHJlbW90ZVNjcmlwdCArPSAiI3t0ZXN0 UnVubmVyQ29tbWFuZChyZW1vdGVJbmRleCl9XCIiCi0gICAgICAgIHJ1bkFuZE1vbml0b3JUZXN0 UnVubmVyQ29tbWFuZChbInNzaCIsICItbyIsICJOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2Fs aG9zdD15ZXMiLCAiLXAiLCByZW1vdGVIb3N0LnBvcnQudG9fcywgIiN7cmVtb3RlSG9zdC51c2Vy fUAje3JlbW90ZUhvc3QuaG9zdH0iLCByZW1vdGVTY3JpcHRdKQorICAgICAgICBydW5BbmRNb25p dG9yVGVzdFJ1bm5lckNvbW1hbmQoWyJzc2giLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25G b3JMb2NhbGhvc3Q9eWVzIl0gKyAocmVtb3RlSG9zdC5pZGVudGl0eV9maWxlX3BhdGggPyBbIi1p IiwgcmVtb3RlSG9zdC5pZGVudGl0eV9maWxlX3BhdGhdIDogW10pICsgWyItcCIsIHJlbW90ZUhv c3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSIsIHJl bW90ZVNjcmlwdF0pCiAgICAgZWxzZQogICAgICAgICBEaXIuY2hkaXIoJHJ1bm5lckRpcikgewog ICAgICAgICAgICAgcnVuQW5kTW9uaXRvclRlc3RSdW5uZXJDb21tYW5kKFNoZWxsd29yZHMuc2hl bGxzcGxpdCh0ZXN0UnVubmVyQ29tbWFuZCkpCkBAIC0yNjYwLDggKzI2NjcsOSBAQCBlbmQKIGRl ZiB1bnBhY2tCdW5kbGVHbnVQYXJhbGxlbChyZW1vdGVIb3N0cykKICAgICBmb3JFYWNoUmVtb3Rl KHJlbW90ZUhvc3RzLCA6ZHJvcE9uRmFpbHVyZSA9PiB0cnVlKSB7CiAgICAgICAgIHwgXywgcmVt b3RlSG9zdCB8Ci0gICAgICAgIG15c3lzKFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0 aW9uRm9yTG9jYWxob3N0PXllcyIsCi0gICAgICAgICAgICAgICAiLXAiLCByZW1vdGVIb3N0LnBv cnQudG9fcywKKyAgICAgICAgbXlzeXMoWyJzc2giLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRp b25Gb3JMb2NhbGhvc3Q9eWVzIl0gKyAKKyAgICAgICAgICAgICAgIChyZW1vdGVIb3N0LmlkZW50 aXR5X2ZpbGVfcGF0aCA/IFsiLWkiLCByZW1vdGVIb3N0LmlkZW50aXR5X2ZpbGVfcGF0aF0gOiBb XSkgKyAKKyAgICAgICAgICAgICAgIFsiLXAiLCByZW1vdGVIb3N0LnBvcnQudG9fcywKICAgICAg ICAgICAgICAgICIje3JlbW90ZUhvc3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9IiwKICAgICAg ICAgICAgICAgICJjZCAje1NoZWxsd29yZHMuc2hlbGxlc2NhcGUocmVtb3RlSG9zdC5yZW1vdGVE aXJlY3RvcnkpfSAmJiBybSAtcmYgI3skb3V0cHV0RGlyLmJhc2VuYW1lfSAmJiB0YXIgeHpmICN7 JHRhckZpbGVOYW1lfSJdKQogICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBlYjI2ZDI3NTdmMDU4 MTAyNWU0ZTUxMWE2NWM1Y2NmYzg0MzVmNzRjLi5iMjJkM2Q1ODFhMmRiYWZiMTM1YjI1ZGZjMWRk NmRmMjJjMWVlMjdmIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0zNjksNyArMzY5LDggQEAgc3ViIGRl dGVybWluZU5hdGl2ZUFyY2hpdGVjdHVyZSgkKQogICAgICAgICAgICAgbXkgJHRhcmdldCA9ICRz cGxpdFswXTsKICAgICAgICAgICAgIG15ICRwb3J0ID0gMjI7CiAgICAgICAgICAgICAkcG9ydCA9 ICRzcGxpdFsxXSBpZiBzY2FsYXIoQHNwbGl0KSA+IDE7Ci0gICAgICAgICAgICAkb3V0cHV0ID0g YHNzaCAtbyBOb0hvc3RBdXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMgLXAgJHBvcnQgJHRh cmdldCAndW5hbWUgIC1tJ2A7CisgICAgICAgICAgICBteSAkY21kID0gJ3NzaCAtbyBOb0hvc3RB dXRoZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMgJy4gKGV4aXN0cyAkcmVtb3RlLT57J2lkRmls ZVBhdGgnfSA/ICgnLWkgJy4kcmVtb3RlLT57J2lkRmlsZVBhdGgnfSkgOiAnJykgLiIgLXAgJHBv cnQgJHRhcmdldCAndW5hbWUgIC1tJyI7CisgICAgICAgICAgICAkb3V0cHV0ID0gcmVhZHBpcGUo JGNtZCk7CiAgICAgICAgICAgICBsYXN0IGlmICgkPyA9PSAwKTsKICAgICAgICAgfQogICAgICAg ICBpZiAobGVuZ3RoKCRvdXRwdXQpID09IDApIHsK 444325 2021-11-15 18:13:28 -0800 2021-11-16 11:00:09 -0800 Patch bug-232453-20211115181327.patch text/plain 7105 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGE0YjVhYTZjYzQyMWQxYmFjNDc4NjQ2ODBlYTVkMDIy NmNmOGU4Ni4uNTZlYzhhM2ZmNTVlNGI0ZDM4ZmY0ZTgxNTU4ZDY0NGRiOWMzZjMzZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTEwLTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIHJ1bi1qYXZhc2NyaXB0LWNvcmUtdGVzdCBhbmQgcnVuLWpzYy1zdHJlc3Mt dGVzdHMgc3VwcG9ydCBhIGN1c3RvbWl6ZWQgaWRlbnRpdHkgZmlsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNDUzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgUnlhbiBIYWRkYWQuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29y ZS10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQgZm9yIHJlbW90ZSBjb25maWcuCisgICAgICAg ICogU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQgZm9y IHJlbW90ZSBjb25maWcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAg ICAoZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKTogUHJvdmlkZSAtaSBvcHRpb24gdG8gc3No CisKIDIwMjEtMTEtMTUgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+ CiAKICAgICAgICAgTWFrZSB2YWxncmluZCB3b3JrIHByb3Blcmx5IHdpdGhvdXQgZXh0cmEgZW52 aXJvbm1lbnQgdmFyaWFibGVzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3J1bi1qYXZhc2Ny aXB0Y29yZS10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCmlu ZGV4IGZiMjFiZmU3MWE0ZjVjOGFlN2UzMmJmMmYxN2RlNWY0YzQ4NTY1OTcuLjQ1YjRjNjg3MjQ1 NjFlNzE5MTRlY2UyOTNkYjAwMmM4ZDI5MDYwYTYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv cnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3Jp cHRjb3JlLXRlc3RzCkBAIC01MjQsMTIgKzUyNCwxNCBAQCBpZiAoZGVmaW5lZCAkcmVtb3RlQ29u ZmlnRmlsZSkgewogICAgICAgICAkcmVtb3RlcyA9ICRyZW1vdGVDb25maWctPnsicmVtb3RlcyJ9 OwogICAgIH0gZWxzaWYgKGRlZmluZWQgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifSkgewogICAg ICAgICBteSBAc3BsaXQgPSBzcGxpdCgnOicsICRyZW1vdGVDb25maWctPnsicmVtb3RlIn0pOwot ICAgICAgICAkcmVtb3RlcyA9IFsKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFt ZSIgPT4gInN5bnRoZXNpemVkIiwKLSAgICAgICAgICAgICAgICAiYWRkcmVzcyIgPT4gJHJlbW90 ZUNvbmZpZy0+eyJyZW1vdGUifQotICAgICAgICAgICAgfQotICAgICAgICAgXTsKKyAgICAgICAg bXkgJHJlbW90ZSA9IHsKKyAgICAgICAgICAgICJuYW1lIiA9PiAic3ludGhlc2l6ZWQiLAorICAg ICAgICAgICAgImFkZHJlc3MiID0+ICRyZW1vdGVDb25maWctPnsicmVtb3RlIn0KKyAgICAgICAg fTsKKyAgICAgICAgaWYgKGV4aXN0cyAkcmVtb3RlQ29uZmlnLT57ImlkRmlsZVBhdGgifSkgewor ICAgICAgICAgICAgJHJlbW90ZS0+eydpZEZpbGVQYXRoJ30gPSAkcmVtb3RlQ29uZmlnLT57J2lk RmlsZVBhdGgnfTsKKyAgICAgICAgfQorICAgICAgICAkcmVtb3RlcyA9IFskcmVtb3RlXTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMg Yi9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCmluZGV4IDlhYzA1Zjc4MWUzMWQ0 NGQ1NjZjZmNhYmUyOGVjM2EwOWI0NmMzMWQuLjg3ODgyYTg0M2U3NDVkYzgxZWUxZDNhYTk3MmE1 OTQ3YTNjMmJlY2EgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVz dHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cwpAQCAtNTEsNyArNTEs NyBAQCBTaWduYWwudHJhcCgiVEVSTSIpIHsKICAgICBwdXRzKFRocmVhZC5jdXJyZW50LmJhY2t0 cmFjZSkKIH0KIAotUmVtb3RlSG9zdCA9IFN0cnVjdC5uZXcoOm5hbWUsIDp1c2VyLCA6aG9zdCwg OnBvcnQsIDpyZW1vdGVEaXJlY3RvcnkpCitSZW1vdGVIb3N0ID0gU3RydWN0Lm5ldyg6bmFtZSwg OnVzZXIsIDpob3N0LCA6cG9ydCwgOnJlbW90ZURpcmVjdG9yeSwgOmlkZW50aXR5X2ZpbGVfcGF0 aCkKIAogVEhJU19TQ1JJUFRfUEFUSCA9IFBhdGhuYW1lLm5ldyhfX0ZJTEVfXykucmVhbHBhdGgK IFNDUklQVFNfUEFUSCA9IFRISVNfU0NSSVBUX1BBVEguZGlybmFtZQpAQCAtMzI1LDYgKzMyNSw5 IEBAIGlmICRyZW1vdGVDb25maWdGaWxlCiAgICAgICAgIGlmIGNvbmZpZ1sncmVtb3RlRGlyZWN0 b3J5J10KICAgICAgICAgICAgICRyZW1vdGVIb3N0c1swXS5yZW1vdGVEaXJlY3RvcnkgPSBjb25m aWdbJ3JlbW90ZURpcmVjdG9yeSddCiAgICAgICAgIGVuZAorICAgICAgICBpZiBjb25maWdbJ2lk RmlsZVBhdGgnXQorICAgICAgICAgICAgJHJlbW90ZUhvc3RzWzBdLmlkZW50aXR5X2ZpbGVfcGF0 aCA9IGNvbmZpZ1snaWRGaWxlUGF0aCddCisgICAgICAgIGVuZAogICAgIGVuZAogCiAgICAgIyB3 ZSBjYW4gY29tYmluZSAtLXJlbW90ZSBhbmQgYSBuZXcgc3R5bGUgY29uZmlnCkBAIC0zNDAsNiAr MzQzLDEwIEBAIGlmICRyZW1vdGVDb25maWdGaWxlCiAgICAgICAgICAgICBpZiByZW1vdGVbJ3Jl bW90ZURpcmVjdG9yeSddCiAgICAgICAgICAgICAgICAgaG9zdC5yZW1vdGVEaXJlY3RvcnkgPSBy ZW1vdGVbJ3JlbW90ZURpcmVjdG9yeSddCiAgICAgICAgICAgICBlbmQKKyAgICAgICAgICAgIGlm IHJlbW90ZVsnaWRGaWxlUGF0aCddCisgICAgICAgICAgICAgICAgaG9zdC5pZGVudGl0eV9maWxl X3BhdGggPSByZW1vdGVbJ2lkRmlsZVBhdGgnXQorICAgICAgICAgICAgICAgIHByaW50KCdVc2lu ZyBpZGVudGl0eSBmaWxlOiAnICsgaG9zdC5pZGVudGl0eV9maWxlX3BhdGggKyAiXHIiKQorICAg ICAgICAgICAgZW5kCiAgICAgICAgICAgICBob3N0CiAgICAgICAgIH0KICAgICBlbmQKQEAgLTIx MTgsNyArMjEyNSw3IEBAIGRlZiBzc2hSZWFkKGNtZCwgcmVtb3RlSG9zdCwgb3B0aW9ucz17fSkK ICAgICByYWlzZSB1bmxlc3MgJHJlbW90ZQogCiAgICAgcmVzdWx0ID0gIiIKLSAgICBJTy5wb3Bl bigic3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyAtcCAje3JlbW90 ZUhvc3QucG9ydH0gI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSAnI3tjbWR9 JyIsICJyIikgeworICAgIElPLnBvcGVuKCJzc2ggLW8gTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JM b2NhbGhvc3Q9eWVzIC1wICN7cmVtb3RlSG9zdC5wb3J0fSIgKyAocmVtb3RlSG9zdC5pZGVudGl0 eV9maWxlX3BhdGggPyAiIC1pICN7cmVtb3RlSG9zdC5pZGVudGl0eV9maWxlX3BhdGh9IiA6ICIi KSArICIgI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSAnI3tjbWR9JyIsICJy IikgewogICAgICAgfCBpbnAgfAogICAgICAgaW5wLmVhY2hfbGluZSB7CiAgICAgICAgIHwgbGlu ZSB8CkBAIC0yMjU2LDggKzIyNjMsOCBAQCBkZWYgZ2V0UmVtb3RlRGlyZWN0b3J5SWZOZWVkZWQo cmVtb3RlSG9zdCkKIGVuZAogCiBkZWYgY29weUJ1bmRsZVRvUmVtb3RlKHJlbW90ZUhvc3QpCi0g ICAgbXlzeXMoWyJzc2giLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9 eWVzIiwgIi1wIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICIje3JlbW90ZUhvc3QudXNlcn1AI3ty ZW1vdGVIb3N0Lmhvc3R9IiwgIm1rZGlyIC1wICN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rvcnl9 Il0pCi0gICAgbXlzeXMoWyJzY3AiLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2Nh bGhvc3Q9eWVzIiwgIi1QIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICgkb3V0cHV0RGlyLmRpcm5h bWUgKyAkdGFyRmlsZU5hbWUpLnRvX3MsICIje3JlbW90ZUhvc3QudXNlcn1AI3tyZW1vdGVIb3N0 Lmhvc3R9OiN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rvcnl9Il0pCisgICAgbXlzeXMoWyJzc2gi LCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIl0gKyAocmVtb3Rl SG9zdC5pZGVudGl0eV9maWxlX3BhdGggPyBbIi1pIiwgcmVtb3RlSG9zdC5pZGVudGl0eV9maWxl X3BhdGhdIDogW10pICsgWyItcCIsIHJlbW90ZUhvc3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0 LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSIsICJta2RpciAtcCAje3JlbW90ZUhvc3QucmVtb3Rl RGlyZWN0b3J5fSJdKQorICAgIG15c3lzKFsic2NwIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0 aW9uRm9yTG9jYWxob3N0PXllcyJdICsgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoID8g WyItaSIsIHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoXSA6IFtdKSArIFsiLVAiLCByZW1v dGVIb3N0LnBvcnQudG9fcywgKCRvdXRwdXREaXIuZGlybmFtZSArICR0YXJGaWxlTmFtZSkudG9f cywgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH06I3tyZW1vdGVIb3N0LnJl bW90ZURpcmVjdG9yeX0iXSkKIGVuZAogCiBkZWYgZXhwb3J0QmFzZUVudmlyb25tZW50VmFyaWFi bGVzKGVzY2FwZSkKQEAgLTIyOTEsNyArMjI5OCw3IEBAIGRlZiBydW5UZXN0UnVubmVyKHJlbW90 ZUluZGV4PTApCiAgICAgICAgIHJlbW90ZVNjcmlwdCArPSBleHBvcnRCYXNlRW52aXJvbm1lbnRW YXJpYWJsZXModHJ1ZSkKICAgICAgICAgJGVudlZhcnMuZWFjaCB7IHx2YXJ8IHJlbW90ZVNjcmlw dCArPSAiZXhwb3J0ICIgPDwgdmFyIDw8ICJcbiIgfQogICAgICAgICByZW1vdGVTY3JpcHQgKz0g IiN7dGVzdFJ1bm5lckNvbW1hbmQocmVtb3RlSW5kZXgpfVwiIgotICAgICAgICBydW5BbmRNb25p dG9yVGVzdFJ1bm5lckNvbW1hbmQoWyJzc2giLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25G b3JMb2NhbGhvc3Q9eWVzIiwgIi1wIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICIje3JlbW90ZUhv c3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9IiwgcmVtb3RlU2NyaXB0XSkKKyAgICAgICAgcnVu QW5kTW9uaXRvclRlc3RSdW5uZXJDb21tYW5kKFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRp Y2F0aW9uRm9yTG9jYWxob3N0PXllcyJdICsgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRo ID8gWyItaSIsIHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoXSA6IFtdKSArIFsiLXAiLCBy ZW1vdGVIb3N0LnBvcnQudG9fcywgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9z dH0iLCByZW1vdGVTY3JpcHRdKQogICAgIGVsc2UKICAgICAgICAgRGlyLmNoZGlyKCRydW5uZXJE aXIpIHsKICAgICAgICAgICAgIHJ1bkFuZE1vbml0b3JUZXN0UnVubmVyQ29tbWFuZChTaGVsbHdv cmRzLnNoZWxsc3BsaXQodGVzdFJ1bm5lckNvbW1hbmQpKQpAQCAtMjY2Niw4ICsyNjczLDkgQEAg ZW5kCiBkZWYgdW5wYWNrQnVuZGxlR251UGFyYWxsZWwocmVtb3RlSG9zdHMpCiAgICAgZm9yRWFj aFJlbW90ZShyZW1vdGVIb3N0cywgOmRyb3BPbkZhaWx1cmUgPT4gdHJ1ZSkgewogICAgICAgICB8 IF8sIHJlbW90ZUhvc3QgfAotICAgICAgICBteXN5cyhbInNzaCIsICItbyIsICJOb0hvc3RBdXRo ZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMiLAotICAgICAgICAgICAgICAgIi1wIiwgcmVtb3Rl SG9zdC5wb3J0LnRvX3MsCisgICAgICAgIG15c3lzKFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhl bnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyJdICsgCisgICAgICAgICAgICAgICAocmVtb3RlSG9z dC5pZGVudGl0eV9maWxlX3BhdGggPyBbIi1pIiwgcmVtb3RlSG9zdC5pZGVudGl0eV9maWxlX3Bh dGhdIDogW10pICsgCisgICAgICAgICAgICAgICBbIi1wIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3Ms CiAgICAgICAgICAgICAgICAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSIs CiAgICAgICAgICAgICAgICAiY2QgI3tTaGVsbHdvcmRzLnNoZWxsZXNjYXBlKHJlbW90ZUhvc3Qu cmVtb3RlRGlyZWN0b3J5KX0gJiYgcm0gLXJmICN7JG91dHB1dERpci5iYXNlbmFtZX0gJiYgdGFy IHh6ZiAjeyR0YXJGaWxlTmFtZX0iXSkKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggZTQ0NzNh OGYzNzRjMTg3M2Y4Y2MwOGY5YThjZDNlNzUyNDBjMWNlOC4uNzFlYmUzY2Q0MDQ1NThjNWZkOTI4 NDkxOWU3ZDhjOTZiY2RkMTk5OCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMzczLDcgKzM3Myw4IEBA IHN1YiBkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1cmUoJCkKICAgICAgICAgICAgIG15ICR0YXJn ZXQgPSAkc3BsaXRbMF07CiAgICAgICAgICAgICBteSAkcG9ydCA9IDIyOwogICAgICAgICAgICAg JHBvcnQgPSAkc3BsaXRbMV0gaWYgc2NhbGFyKEBzcGxpdCkgPiAxOwotICAgICAgICAgICAgJG91 dHB1dCA9IGBzc2ggLW8gTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIC1wICRw b3J0ICR0YXJnZXQgJ3VuYW1lICAtbSdgOworICAgICAgICAgICAgbXkgJGNtZCA9ICdzc2ggLW8g Tm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzICcuIChleGlzdHMgJHJlbW90ZS0+ eydpZEZpbGVQYXRoJ30gPyAoJy1pICcuJHJlbW90ZS0+eydpZEZpbGVQYXRoJ30pIDogJycpIC4i IC1wICRwb3J0ICR0YXJnZXQgJ3VuYW1lICAtbSciOworICAgICAgICAgICAgJG91dHB1dCA9IHJl YWRwaXBlKCRjbWQpOwogICAgICAgICAgICAgbGFzdCBpZiAoJD8gPT0gMCk7CiAgICAgICAgIH0K ICAgICAgICAgaWYgKGxlbmd0aCgkb3V0cHV0KSA9PSAwKSB7Cg== 444412 2021-11-16 11:00:12 -0800 2021-11-16 11:31:51 -0800 Patch for landing bug-232453-20211116110011.patch text/plain 7105 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGE0YjVhYTZjYzQyMWQxYmFjNDc4NjQ2ODBlYTVkMDIy NmNmOGU4Ni4uNTZlYzhhM2ZmNTVlNGI0ZDM4ZmY0ZTgxNTU4ZDY0NGRiOWMzZjMzZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTEwLTI4ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIHJ1bi1qYXZhc2NyaXB0LWNvcmUtdGVzdCBhbmQgcnVuLWpzYy1zdHJlc3Mt dGVzdHMgc3VwcG9ydCBhIGN1c3RvbWl6ZWQgaWRlbnRpdHkgZmlsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNDUzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgUnlhbiBIYWRkYWQuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29y ZS10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQgZm9yIHJlbW90ZSBjb25maWcuCisgICAgICAg ICogU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0czogQWRkIGlkRmlsZVBhdGggZmllbGQgZm9y IHJlbW90ZSBjb25maWcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAg ICAoZGV0ZXJtaW5lTmF0aXZlQXJjaGl0ZWN0dXJlKTogUHJvdmlkZSAtaSBvcHRpb24gdG8gc3No CisKIDIwMjEtMTEtMTUgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+ CiAKICAgICAgICAgTWFrZSB2YWxncmluZCB3b3JrIHByb3Blcmx5IHdpdGhvdXQgZXh0cmEgZW52 aXJvbm1lbnQgdmFyaWFibGVzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3J1bi1qYXZhc2Ny aXB0Y29yZS10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCmlu ZGV4IGZiMjFiZmU3MWE0ZjVjOGFlN2UzMmJmMmYxN2RlNWY0YzQ4NTY1OTcuLjQ1YjRjNjg3MjQ1 NjFlNzE5MTRlY2UyOTNkYjAwMmM4ZDI5MDYwYTYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv cnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3Jp cHRjb3JlLXRlc3RzCkBAIC01MjQsMTIgKzUyNCwxNCBAQCBpZiAoZGVmaW5lZCAkcmVtb3RlQ29u ZmlnRmlsZSkgewogICAgICAgICAkcmVtb3RlcyA9ICRyZW1vdGVDb25maWctPnsicmVtb3RlcyJ9 OwogICAgIH0gZWxzaWYgKGRlZmluZWQgJHJlbW90ZUNvbmZpZy0+eyJyZW1vdGUifSkgewogICAg ICAgICBteSBAc3BsaXQgPSBzcGxpdCgnOicsICRyZW1vdGVDb25maWctPnsicmVtb3RlIn0pOwot ICAgICAgICAkcmVtb3RlcyA9IFsKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAibmFt ZSIgPT4gInN5bnRoZXNpemVkIiwKLSAgICAgICAgICAgICAgICAiYWRkcmVzcyIgPT4gJHJlbW90 ZUNvbmZpZy0+eyJyZW1vdGUifQotICAgICAgICAgICAgfQotICAgICAgICAgXTsKKyAgICAgICAg bXkgJHJlbW90ZSA9IHsKKyAgICAgICAgICAgICJuYW1lIiA9PiAic3ludGhlc2l6ZWQiLAorICAg ICAgICAgICAgImFkZHJlc3MiID0+ICRyZW1vdGVDb25maWctPnsicmVtb3RlIn0KKyAgICAgICAg fTsKKyAgICAgICAgaWYgKGV4aXN0cyAkcmVtb3RlQ29uZmlnLT57ImlkRmlsZVBhdGgifSkgewor ICAgICAgICAgICAgJHJlbW90ZS0+eydpZEZpbGVQYXRoJ30gPSAkcmVtb3RlQ29uZmlnLT57J2lk RmlsZVBhdGgnfTsKKyAgICAgICAgfQorICAgICAgICAkcmVtb3RlcyA9IFskcmVtb3RlXTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVzdHMg Yi9Ub29scy9TY3JpcHRzL3J1bi1qc2Mtc3RyZXNzLXRlc3RzCmluZGV4IDlhYzA1Zjc4MWUzMWQ0 NGQ1NjZjZmNhYmUyOGVjM2EwOWI0NmMzMWQuLjg3ODgyYTg0M2U3NDVkYzgxZWUxZDNhYTk3MmE1 OTQ3YTNjMmJlY2EgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLWpzYy1zdHJlc3MtdGVz dHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10ZXN0cwpAQCAtNTEsNyArNTEs NyBAQCBTaWduYWwudHJhcCgiVEVSTSIpIHsKICAgICBwdXRzKFRocmVhZC5jdXJyZW50LmJhY2t0 cmFjZSkKIH0KIAotUmVtb3RlSG9zdCA9IFN0cnVjdC5uZXcoOm5hbWUsIDp1c2VyLCA6aG9zdCwg OnBvcnQsIDpyZW1vdGVEaXJlY3RvcnkpCitSZW1vdGVIb3N0ID0gU3RydWN0Lm5ldyg6bmFtZSwg OnVzZXIsIDpob3N0LCA6cG9ydCwgOnJlbW90ZURpcmVjdG9yeSwgOmlkZW50aXR5X2ZpbGVfcGF0 aCkKIAogVEhJU19TQ1JJUFRfUEFUSCA9IFBhdGhuYW1lLm5ldyhfX0ZJTEVfXykucmVhbHBhdGgK IFNDUklQVFNfUEFUSCA9IFRISVNfU0NSSVBUX1BBVEguZGlybmFtZQpAQCAtMzI1LDYgKzMyNSw5 IEBAIGlmICRyZW1vdGVDb25maWdGaWxlCiAgICAgICAgIGlmIGNvbmZpZ1sncmVtb3RlRGlyZWN0 b3J5J10KICAgICAgICAgICAgICRyZW1vdGVIb3N0c1swXS5yZW1vdGVEaXJlY3RvcnkgPSBjb25m aWdbJ3JlbW90ZURpcmVjdG9yeSddCiAgICAgICAgIGVuZAorICAgICAgICBpZiBjb25maWdbJ2lk RmlsZVBhdGgnXQorICAgICAgICAgICAgJHJlbW90ZUhvc3RzWzBdLmlkZW50aXR5X2ZpbGVfcGF0 aCA9IGNvbmZpZ1snaWRGaWxlUGF0aCddCisgICAgICAgIGVuZAogICAgIGVuZAogCiAgICAgIyB3 ZSBjYW4gY29tYmluZSAtLXJlbW90ZSBhbmQgYSBuZXcgc3R5bGUgY29uZmlnCkBAIC0zNDAsNiAr MzQzLDEwIEBAIGlmICRyZW1vdGVDb25maWdGaWxlCiAgICAgICAgICAgICBpZiByZW1vdGVbJ3Jl bW90ZURpcmVjdG9yeSddCiAgICAgICAgICAgICAgICAgaG9zdC5yZW1vdGVEaXJlY3RvcnkgPSBy ZW1vdGVbJ3JlbW90ZURpcmVjdG9yeSddCiAgICAgICAgICAgICBlbmQKKyAgICAgICAgICAgIGlm IHJlbW90ZVsnaWRGaWxlUGF0aCddCisgICAgICAgICAgICAgICAgaG9zdC5pZGVudGl0eV9maWxl X3BhdGggPSByZW1vdGVbJ2lkRmlsZVBhdGgnXQorICAgICAgICAgICAgICAgIHByaW50KCdVc2lu ZyBpZGVudGl0eSBmaWxlOiAnICsgaG9zdC5pZGVudGl0eV9maWxlX3BhdGggKyAiXHIiKQorICAg ICAgICAgICAgZW5kCiAgICAgICAgICAgICBob3N0CiAgICAgICAgIH0KICAgICBlbmQKQEAgLTIx MTgsNyArMjEyNSw3IEBAIGRlZiBzc2hSZWFkKGNtZCwgcmVtb3RlSG9zdCwgb3B0aW9ucz17fSkK ICAgICByYWlzZSB1bmxlc3MgJHJlbW90ZQogCiAgICAgcmVzdWx0ID0gIiIKLSAgICBJTy5wb3Bl bigic3NoIC1vIE5vSG9zdEF1dGhlbnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyAtcCAje3JlbW90 ZUhvc3QucG9ydH0gI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSAnI3tjbWR9 JyIsICJyIikgeworICAgIElPLnBvcGVuKCJzc2ggLW8gTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JM b2NhbGhvc3Q9eWVzIC1wICN7cmVtb3RlSG9zdC5wb3J0fSIgKyAocmVtb3RlSG9zdC5pZGVudGl0 eV9maWxlX3BhdGggPyAiIC1pICN7cmVtb3RlSG9zdC5pZGVudGl0eV9maWxlX3BhdGh9IiA6ICIi KSArICIgI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSAnI3tjbWR9JyIsICJy IikgewogICAgICAgfCBpbnAgfAogICAgICAgaW5wLmVhY2hfbGluZSB7CiAgICAgICAgIHwgbGlu ZSB8CkBAIC0yMjU2LDggKzIyNjMsOCBAQCBkZWYgZ2V0UmVtb3RlRGlyZWN0b3J5SWZOZWVkZWQo cmVtb3RlSG9zdCkKIGVuZAogCiBkZWYgY29weUJ1bmRsZVRvUmVtb3RlKHJlbW90ZUhvc3QpCi0g ICAgbXlzeXMoWyJzc2giLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9 eWVzIiwgIi1wIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICIje3JlbW90ZUhvc3QudXNlcn1AI3ty ZW1vdGVIb3N0Lmhvc3R9IiwgIm1rZGlyIC1wICN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rvcnl9 Il0pCi0gICAgbXlzeXMoWyJzY3AiLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2Nh bGhvc3Q9eWVzIiwgIi1QIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICgkb3V0cHV0RGlyLmRpcm5h bWUgKyAkdGFyRmlsZU5hbWUpLnRvX3MsICIje3JlbW90ZUhvc3QudXNlcn1AI3tyZW1vdGVIb3N0 Lmhvc3R9OiN7cmVtb3RlSG9zdC5yZW1vdGVEaXJlY3Rvcnl9Il0pCisgICAgbXlzeXMoWyJzc2gi LCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIl0gKyAocmVtb3Rl SG9zdC5pZGVudGl0eV9maWxlX3BhdGggPyBbIi1pIiwgcmVtb3RlSG9zdC5pZGVudGl0eV9maWxl X3BhdGhdIDogW10pICsgWyItcCIsIHJlbW90ZUhvc3QucG9ydC50b19zLCAiI3tyZW1vdGVIb3N0 LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSIsICJta2RpciAtcCAje3JlbW90ZUhvc3QucmVtb3Rl RGlyZWN0b3J5fSJdKQorICAgIG15c3lzKFsic2NwIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRpY2F0 aW9uRm9yTG9jYWxob3N0PXllcyJdICsgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoID8g WyItaSIsIHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoXSA6IFtdKSArIFsiLVAiLCByZW1v dGVIb3N0LnBvcnQudG9fcywgKCRvdXRwdXREaXIuZGlybmFtZSArICR0YXJGaWxlTmFtZSkudG9f cywgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9zdH06I3tyZW1vdGVIb3N0LnJl bW90ZURpcmVjdG9yeX0iXSkKIGVuZAogCiBkZWYgZXhwb3J0QmFzZUVudmlyb25tZW50VmFyaWFi bGVzKGVzY2FwZSkKQEAgLTIyOTEsNyArMjI5OCw3IEBAIGRlZiBydW5UZXN0UnVubmVyKHJlbW90 ZUluZGV4PTApCiAgICAgICAgIHJlbW90ZVNjcmlwdCArPSBleHBvcnRCYXNlRW52aXJvbm1lbnRW YXJpYWJsZXModHJ1ZSkKICAgICAgICAgJGVudlZhcnMuZWFjaCB7IHx2YXJ8IHJlbW90ZVNjcmlw dCArPSAiZXhwb3J0ICIgPDwgdmFyIDw8ICJcbiIgfQogICAgICAgICByZW1vdGVTY3JpcHQgKz0g IiN7dGVzdFJ1bm5lckNvbW1hbmQocmVtb3RlSW5kZXgpfVwiIgotICAgICAgICBydW5BbmRNb25p dG9yVGVzdFJ1bm5lckNvbW1hbmQoWyJzc2giLCAiLW8iLCAiTm9Ib3N0QXV0aGVudGljYXRpb25G b3JMb2NhbGhvc3Q9eWVzIiwgIi1wIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3MsICIje3JlbW90ZUhv c3QudXNlcn1AI3tyZW1vdGVIb3N0Lmhvc3R9IiwgcmVtb3RlU2NyaXB0XSkKKyAgICAgICAgcnVu QW5kTW9uaXRvclRlc3RSdW5uZXJDb21tYW5kKFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhlbnRp Y2F0aW9uRm9yTG9jYWxob3N0PXllcyJdICsgKHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRo ID8gWyItaSIsIHJlbW90ZUhvc3QuaWRlbnRpdHlfZmlsZV9wYXRoXSA6IFtdKSArIFsiLXAiLCBy ZW1vdGVIb3N0LnBvcnQudG9fcywgIiN7cmVtb3RlSG9zdC51c2VyfUAje3JlbW90ZUhvc3QuaG9z dH0iLCByZW1vdGVTY3JpcHRdKQogICAgIGVsc2UKICAgICAgICAgRGlyLmNoZGlyKCRydW5uZXJE aXIpIHsKICAgICAgICAgICAgIHJ1bkFuZE1vbml0b3JUZXN0UnVubmVyQ29tbWFuZChTaGVsbHdv cmRzLnNoZWxsc3BsaXQodGVzdFJ1bm5lckNvbW1hbmQpKQpAQCAtMjY2Niw4ICsyNjczLDkgQEAg ZW5kCiBkZWYgdW5wYWNrQnVuZGxlR251UGFyYWxsZWwocmVtb3RlSG9zdHMpCiAgICAgZm9yRWFj aFJlbW90ZShyZW1vdGVIb3N0cywgOmRyb3BPbkZhaWx1cmUgPT4gdHJ1ZSkgewogICAgICAgICB8 IF8sIHJlbW90ZUhvc3QgfAotICAgICAgICBteXN5cyhbInNzaCIsICItbyIsICJOb0hvc3RBdXRo ZW50aWNhdGlvbkZvckxvY2FsaG9zdD15ZXMiLAotICAgICAgICAgICAgICAgIi1wIiwgcmVtb3Rl SG9zdC5wb3J0LnRvX3MsCisgICAgICAgIG15c3lzKFsic3NoIiwgIi1vIiwgIk5vSG9zdEF1dGhl bnRpY2F0aW9uRm9yTG9jYWxob3N0PXllcyJdICsgCisgICAgICAgICAgICAgICAocmVtb3RlSG9z dC5pZGVudGl0eV9maWxlX3BhdGggPyBbIi1pIiwgcmVtb3RlSG9zdC5pZGVudGl0eV9maWxlX3Bh dGhdIDogW10pICsgCisgICAgICAgICAgICAgICBbIi1wIiwgcmVtb3RlSG9zdC5wb3J0LnRvX3Ms CiAgICAgICAgICAgICAgICAiI3tyZW1vdGVIb3N0LnVzZXJ9QCN7cmVtb3RlSG9zdC5ob3N0fSIs CiAgICAgICAgICAgICAgICAiY2QgI3tTaGVsbHdvcmRzLnNoZWxsZXNjYXBlKHJlbW90ZUhvc3Qu cmVtb3RlRGlyZWN0b3J5KX0gJiYgcm0gLXJmICN7JG91dHB1dERpci5iYXNlbmFtZX0gJiYgdGFy IHh6ZiAjeyR0YXJGaWxlTmFtZX0iXSkKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggZTQ0NzNh OGYzNzRjMTg3M2Y4Y2MwOGY5YThjZDNlNzUyNDBjMWNlOC4uNzFlYmUzY2Q0MDQ1NThjNWZkOTI4 NDkxOWU3ZDhjOTZiY2RkMTk5OCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMzczLDcgKzM3Myw4IEBA IHN1YiBkZXRlcm1pbmVOYXRpdmVBcmNoaXRlY3R1cmUoJCkKICAgICAgICAgICAgIG15ICR0YXJn ZXQgPSAkc3BsaXRbMF07CiAgICAgICAgICAgICBteSAkcG9ydCA9IDIyOwogICAgICAgICAgICAg JHBvcnQgPSAkc3BsaXRbMV0gaWYgc2NhbGFyKEBzcGxpdCkgPiAxOwotICAgICAgICAgICAgJG91 dHB1dCA9IGBzc2ggLW8gTm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzIC1wICRw b3J0ICR0YXJnZXQgJ3VuYW1lICAtbSdgOworICAgICAgICAgICAgbXkgJGNtZCA9ICdzc2ggLW8g Tm9Ib3N0QXV0aGVudGljYXRpb25Gb3JMb2NhbGhvc3Q9eWVzICcuIChleGlzdHMgJHJlbW90ZS0+ eydpZEZpbGVQYXRoJ30gPyAoJy1pICcuJHJlbW90ZS0+eydpZEZpbGVQYXRoJ30pIDogJycpIC4i IC1wICRwb3J0ICR0YXJnZXQgJ3VuYW1lICAtbSciOworICAgICAgICAgICAgJG91dHB1dCA9IHJl YWRwaXBlKCRjbWQpOwogICAgICAgICAgICAgbGFzdCBpZiAoJD8gPT0gMCk7CiAgICAgICAgIH0K ICAgICAgICAgaWYgKGxlbmd0aCgkb3V0cHV0KSA9PSAwKSB7Cg==