218706 2020-11-09 06:35:43 -0800 [build.webkit.org] Add python 3 support - part 3 2021-02-08 07:37:49 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 175056 1 aakash_jain aakash_jain aakash_jain ap dewei_zhu jbedard ryanhaddad webkit-bug-importer oldest_to_newest 1705696 0 aakash_jain 2020-11-09 06:35:43 -0800 Python 3 support is required for Buildbot 2+. Part 1 and 2 of this change were in: https://bugs.webkit.org/show_bug.cgi?id=217727 and https://bugs.webkit.org/show_bug.cgi?id=218130 1705697 1 413581 aakash_jain 2020-11-09 06:45:14 -0800 Created attachment 413581 Patch 1705698 2 413582 aakash_jain 2020-11-09 06:49:40 -0800 Created attachment 413582 Patch 1705709 3 413582 jbedard 2020-11-09 08:30:35 -0800 Comment on attachment 413582 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=413582&action=review > Tools/CISupport/build-webkit-org/loadConfig.py:-189 > - keywords = filter(None, re.split('[, \-_:()]+', str(builder['name']))) Seems like code that results in the what the original code is would be: keywords = re.split('[, \-_:()]+', str(builder['name'])) or None But it likely doesn't matter. 1705712 4 ews-feeder 2020-11-09 08:41:42 -0800 Committed r269581: <https://trac.webkit.org/changeset/269581> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413582. 1705714 5 webkit-bug-importer 2020-11-09 08:42:20 -0800 <rdar://problem/71193363> 413581 2020-11-09 06:45:14 -0800 2020-11-09 06:48:02 -0800 Patch bug-218706-20201109094513.patch text/plain 6788 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2OTU4MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIwLTExLTA5ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbYnVpbGQud2Via2l0Lm9yZ10gQWRkIHB5dGhvbiAzIHN1cHBvcnQgLSBw YXJ0IDMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx ODcwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog Q0lTdXBwb3J0L1NoYXJlZC90cmFuc2Zlci1hcmNoaXZlLXRvLXMzOiBVcGRhdGVkIHByaW50IG1l dGhvZCB0byBiZSBib3RoIHB5dGhvbiAyIGFuZCAzIGNvbXBhdGlibGUuCisgICAgICAgICogQ0lT dXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZTogRGl0dG8uCisgICAgICAgICogQ0lTdXBwb3J0 L2RlbGV0ZS1zdGFsZS1idWlsZC1maWxlczogRGl0dG8uCisgICAgICAgICogQ0lTdXBwb3J0L2J1 aWxkLXdlYmtpdC1vcmcvbG9hZENvbmZpZy5weTogUmVtb3ZlZCB1bm5lY2Vzc2FyeSBmaWx0ZXIg bWV0aG9kLgorICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvbG9hZENvbmZpZy5weTogRGl0 dG8uCisKIDIwMjAtMTEtMDggIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS10gUkVHUkVTU0lPTihyMjY3MjUwKSBBUEkgdGVzdCAvd2Via2l0L1dlYktpdFdl YlZpZXcvdXNlcm1lZGlhLWVudW1lcmF0ZWRldmljZXMtcGVybWlzc2lvbi1jaGVjayBpcyBjcmFz aGluZwpJbmRleDogVG9vbHMvQ0lTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9DSVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlCShyZXZpc2lvbiAy Njk1ODApCisrKyBUb29scy9DSVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlCSh3b3JraW5n IGNvcHkpCkBAIC0zMiw2ICszMiw4IEBAIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiBp bXBvcnQgemlwZmlsZQogCitmcm9tIF9fZnV0dXJlX18gaW1wb3J0IHByaW50X2Z1bmN0aW9uCisK IF9jb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkgPSBOb25lCiBfdG9wTGV2ZWxCdWlsZERpcmVj dG9yeSA9IE5vbmUKIF9ob3N0QnVpbGREaXJlY3RvcnkgPSBOb25lCkBAIC02MSwxMCArNjMsMTAg QEAgZGVmIG1haW4oKToKICAgICBnZW5lcmljUGxhdGZvcm0gPSBvcHRpb25zLnBsYXRmb3JtLnNw bGl0KCctJywgMSlbMF0KICAgICBkZXRlcm1pbmVXZWJLaXRCdWlsZERpcmVjdG9yaWVzKGdlbmVy aWNQbGF0Zm9ybSwgb3B0aW9ucy5wbGF0Zm9ybSwgb3B0aW9ucy5jb25maWd1cmF0aW9uKQogICAg IGlmIG5vdCBfdG9wTGV2ZWxCdWlsZERpcmVjdG9yeToKLSAgICAgICAgcHJpbnQgPj4gc3lzLnN0 ZGVyciwgJ0NvdWxkIG5vdCBkZXRlcm1pbmUgdG9wLWxldmVsIGJ1aWxkIGRpcmVjdG9yeScKKyAg ICAgICAgcHJpbnQoJ0NvdWxkIG5vdCBkZXRlcm1pbmUgdG9wLWxldmVsIGJ1aWxkIGRpcmVjdG9y eScsIGZpbGU9c3lzLnN0ZGVycikKICAgICAgICAgcmV0dXJuIDEKICAgICBpZiBub3QgX2NvbmZp Z3VyYXRpb25CdWlsZERpcmVjdG9yeToKLSAgICAgICAgcHJpbnQgPj4gc3lzLnN0ZGVyciwgJ0Nv dWxkIG5vdCBkZXRlcm1pbmUgY29uZmlndXJhdGlvbi1zcGVjaWZpYyBidWlsZCBkaXJlY3Rvcnkn CisgICAgICAgIHByaW50KCdDb3VsZCBub3QgZGV0ZXJtaW5lIGNvbmZpZ3VyYXRpb24tc3BlY2lm aWMgYnVpbGQgZGlyZWN0b3J5JywgZmlsZT1zeXMuc3RkZXJyKQogICAgICAgICByZXR1cm4gMQog CiAgICAgaWYgYWN0aW9uID09ICdhcmNoaXZlJzoKQEAgLTE4NCwxMSArMTg2LDExIEBAIGRlZiBt aW5pZnlEaXJlY3RvcnkocGxhdGZvcm0sIGRpcmVjdG9yeSkKICAgICAgICAgZmlsZV9wYXR0ZXJu cyA9ICgnLmEnLCkKICAgICAgICAgZm9yIHJvb3QsIGRpcnMsIGZpbGVzIGluIG9zLndhbGsoZGly ZWN0b3J5KToKICAgICAgICAgICAgIGlmIGFueShyb290LmVuZHN3aXRoKHBhdHRlcm4pIGZvciBw YXR0ZXJuIGluIGRpcl9wYXR0ZXJucyk6Ci0gICAgICAgICAgICAgICAgcHJpbnQgJ1JlbW92aW5n OiB7fScuZm9ybWF0KHJvb3QpCisgICAgICAgICAgICAgICAgcHJpbnQoJ1JlbW92aW5nOiB7fScu Zm9ybWF0KHJvb3QpKQogICAgICAgICAgICAgICAgIHNodXRpbC5ybXRyZWUocm9vdCkKICAgICAg ICAgICAgIGZvciBuYW1lIGluIGZpbGVzOgogICAgICAgICAgICAgICAgIGlmIGFueShuYW1lLmVu ZHN3aXRoKHBhdHRlcm4pIGZvciBwYXR0ZXJuIGluIGZpbGVfcGF0dGVybnMpOgotICAgICAgICAg ICAgICAgICAgICBwcmludCAnUmVtb3Zpbmc6IHt9Jy5mb3JtYXQob3MucGF0aC5qb2luKHJvb3Qs IG5hbWUpKQorICAgICAgICAgICAgICAgICAgICBwcmludCgnUmVtb3Zpbmc6IHt9Jy5mb3JtYXQo b3MucGF0aC5qb2luKHJvb3QsIG5hbWUpKSkKICAgICAgICAgICAgICAgICAgICAgb3MucmVtb3Zl KG9zLnBhdGguam9pbihyb290LCBuYW1lKSkKIAogCkBAIC0yNzYsNyArMjc4LDcgQEAgZGVmIGV4 dHJhY3RCdWlsdFByb2R1Y3QoY29uZmlndXJhdGlvbiwgcAogICAgIGlmIHBsYXRmb3JtIGluICgn bWFjJywgJ2lvcycsICd0dm9zJywgJ3dhdGNob3MnKToKICAgICAgICAgcmV0dXJuIHVuemlwQXJj aGl2ZShfdG9wTGV2ZWxCdWlsZERpcmVjdG9yeSwgY29uZmlndXJhdGlvbikKICAgICBlbGlmIHBs YXRmb3JtIGluICgnZ3RrJywgJ2pzYycsICd3aW4nLCAnd2luY2Fpcm8nLCAnd3BlJyk6Ci0gICAg ICAgIHByaW50ICdFeHRyYWN0aW5nJywgX2NvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeQorICAg ICAgICBwcmludCgnRXh0cmFjdGluZzoge30nLmZvcm1hdChfY29uZmlndXJhdGlvbkJ1aWxkRGly ZWN0b3J5KSkKICAgICAgICAgaWYgdW56aXBBcmNoaXZlKF9jb25maWd1cmF0aW9uQnVpbGREaXJl Y3RvcnksIGNvbmZpZ3VyYXRpb24pOgogICAgICAgICAgICAgcmV0dXJuIDEKIApJbmRleDogVG9v bHMvQ0lTdXBwb3J0L2RlbGV0ZS1zdGFsZS1idWlsZC1maWxlcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9DSVN1cHBvcnQvZGVsZXRlLXN0YWxlLWJ1aWxkLWZpbGVzCShyZXZpc2lvbiAyNjk1ODApCisr KyBUb29scy9DSVN1cHBvcnQvZGVsZXRlLXN0YWxlLWJ1aWxkLWZpbGVzCSh3b3JraW5nIGNvcHkp CkBAIC0xLDUgKzEsNSBAQAogIyEvdXNyL2Jpbi9lbnYgcHl0aG9uCi0jIENvcHlyaWdodCAoQykg MjAxMywgMjAxNSBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQg KEMpIDIwMTMtMjAyMCBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogIyBDb3B5cmln aHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CkBAIC00Niw3ICs0Niw3IEBAIGRlZiBtYWluKCk6CiAKICAgICBnZW5lcmljUGxhdGZvcm0g PSBvcHRpb25zLnBsYXRmb3JtLnNwbGl0KCctJywgMSlbMF0KICAgICBpZiBnZW5lcmljUGxhdGZv cm0gbm90IGluICgnbWFjJywgJ2lvcycpOgotICAgICAgICBwcmludCAnRXhpdGVkIHdpdGhvdXQg cmVtb3ZpbmcgYW55IGZpbGVzLicKKyAgICAgICAgcHJpbnQoJ0V4aXRlZCB3aXRob3V0IHJlbW92 aW5nIGFueSBmaWxlcy4nKQogICAgICAgICByZXR1cm4gMAogCiAgICAgaWYgb3B0aW9ucy5idWls ZF9kaXJlY3Rvcnk6CkBAIC02NSwxNCArNjUsMTQgQEAgZGVmIG1haW4oKToKICAgICAgICAgICAg ICAgICBpZiBleHQgbm90IGluICgnLm8nLCAnLmQnKSBvciBvcy5wYXRoLmdldHNpemUoZnVsbF9w YXRoKToKICAgICAgICAgICAgICAgICAgICAgY29udGludWUKICAgICAgICAgICAgIGV4Y2VwdCBP U0Vycm9yIGFzIGV4Y2VwdGlvbjoKLSAgICAgICAgICAgICAgICBwcmludCBleGNlcHRpb24KKyAg ICAgICAgICAgICAgICBwcmludChleGNlcHRpb24pCiAgICAgICAgICAgICAgICAgY29udGludWUK IAogICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIG9zLnJlbW92ZShmdWxsX3BhdGgp Ci0gICAgICAgICAgICAgICAgcHJpbnQgJ1JlbW92ZWQnLCBmdWxsX3BhdGgKKyAgICAgICAgICAg ICAgICBwcmludCgnUmVtb3ZlZCB7fScuZm9ybWF0KGZ1bGxfcGF0aCkpCiAgICAgICAgICAgICBl eGNlcHQgT1NFcnJvciBhcyBleGNlcHRpb246Ci0gICAgICAgICAgICAgICAgcHJpbnQgZXhjZXB0 aW9uCisgICAgICAgICAgICAgICAgcHJpbnQoZXhjZXB0aW9uKQogICAgICAgICAgICAgICAgIGV4 aXRfY29kZSArPSAxCiAKICAgICByZXR1cm4gZXhpdF9jb2RlCkluZGV4OiBUb29scy9DSVN1cHBv cnQvU2hhcmVkL3RyYW5zZmVyLWFyY2hpdmUtdG8tczMKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ0lT dXBwb3J0L1NoYXJlZC90cmFuc2Zlci1hcmNoaXZlLXRvLXMzCShyZXZpc2lvbiAyNjk1ODApCisr KyBUb29scy9DSVN1cHBvcnQvU2hhcmVkL3RyYW5zZmVyLWFyY2hpdmUtdG8tczMJKHdvcmtpbmcg Y29weSkKQEAgLTEwLDkgKzEwLDkgQEAgUzNfTUlOSUZJRURfQlVDS0VUID0gJ21pbmlmaWVkLWFy Y2hpdmVzLgogUzNfUkVHSU9OX1BSRUZJWCA9ICdodHRwczovL3MzLXVzLXdlc3QtMi5hbWF6b25h d3MuY29tJwogCiBkZWYgdXBsb2FkVG9TMyhhcmNoaXZlX3BhdGgsIGJ1Y2tldCwgaWRlbnRpZmll ciwgcmV2aXNpb24pOgotICAgIHByaW50ICdUcmFuc2ZlcnJpbmcge30gdG8gUzMuLi4nLmZvcm1h dChhcmNoaXZlX3BhdGgpCisgICAgcHJpbnQoJ1RyYW5zZmVycmluZyB7fSB0byBTMy4uLicuZm9y bWF0KGFyY2hpdmVfcGF0aCkpCiAgICAga2V5ID0gJy8nLmpvaW4oW2lkZW50aWZpZXIsIHJldmlz aW9uICsgJy56aXAnXSkKLSAgICBwcmludCAnXHRTMyBCdWNrZXQ6IHt9XG5cdFMzIEtleToge30n LmZvcm1hdChidWNrZXQsIGtleSkKKyAgICBwcmludCgnXHRTMyBCdWNrZXQ6IHt9XG5cdFMzIEtl eToge30nLmZvcm1hdChidWNrZXQsIGtleSkpCiAgICAgczMgPSBib3RvMy5jbGllbnQoJ3MzJykK ICAgICBzMy51cGxvYWRfZmlsZShhcmNoaXZlX3BhdGgsIGJ1Y2tldCwga2V5KQogICAgIHByaW50 KCdcdFMzIFVSTDoge30ve30ve30nLmZvcm1hdChTM19SRUdJT05fUFJFRklYLCBidWNrZXQsIGtl eSkpCkBAIC0yMiw3ICsyMiw3IEBAIGRlZiBhcmNoaXZlRXhpc3RzKGFyY2hpdmUpOgogICAgICAg ICBpZiBvcy5wYXRoLmV4aXN0cyhhcmNoaXZlKToKICAgICAgICAgICAgIHJldHVybiBUcnVlCiAg ICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBwcmludCAnV0FSTklORzogQXJjaGl2ZSBkb2VzIG5v dCBleGlzdDoge30nLmZvcm1hdChhcmNoaXZlKQorICAgICAgICAgICAgcHJpbnQoJ1dBUk5JTkc6 IEFyY2hpdmUgZG9lcyBub3QgZXhpc3Q6IHt9Jy5mb3JtYXQoYXJjaGl2ZSkpCiAgICAgICAgICAg ICByZXR1cm4gRmFsc2UKIAogZGVmIG1haW4oKToKSW5kZXg6IFRvb2xzL0NJU3VwcG9ydC9idWls ZC13ZWJraXQtb3JnL2xvYWRDb25maWcucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ0lTdXBwb3J0 L2J1aWxkLXdlYmtpdC1vcmcvbG9hZENvbmZpZy5weQkocmV2aXNpb24gMjY5NTgwKQorKysgVG9v bHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvbG9hZENvbmZpZy5weQkod29ya2luZyBjb3B5 KQpAQCAtMTg2LDUgKzE4Niw1IEBAIGRlZiBnZXRWYWxpZFRhZ3ModGFncyk6CiAKIAogZGVmIGdl dFRhZ3NGb3JCdWlsZGVyKGJ1aWxkZXIpOgotICAgIGtleXdvcmRzID0gZmlsdGVyKE5vbmUsIHJl LnNwbGl0KCdbLCBcLV86KCldKycsIHN0cihidWlsZGVyWyduYW1lJ10pKSkKKyAgICBrZXl3b3Jk cyA9IHJlLnNwbGl0KCdbLCBcLV86KCldKycsIHN0cihidWlsZGVyWyduYW1lJ10pKQogICAgIHJl dHVybiBnZXRWYWxpZFRhZ3Moa2V5d29yZHMpCkluZGV4OiBUb29scy9DSVN1cHBvcnQvZXdzLWJ1 aWxkL2xvYWRDb25maWcucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWls ZC9sb2FkQ29uZmlnLnB5CShyZXZpc2lvbiAyNjk1ODApCisrKyBUb29scy9DSVN1cHBvcnQvZXdz LWJ1aWxkL2xvYWRDb25maWcucHkJKHdvcmtpbmcgY29weSkKQEAgLTE5NSw1ICsxOTUsNSBAQCBk ZWYgZ2V0VmFsaWRUYWdzKHRhZ3MpOgogCiAKIGRlZiBnZXRUYWdzRm9yQnVpbGRlcihidWlsZGVy KToKLSAgICBrZXl3b3JkcyA9IGZpbHRlcihOb25lLCByZS5zcGxpdCgnWywgXC1fOigpXSsnLCBz dHIoYnVpbGRlclsnbmFtZSddKSkpCisgICAga2V5d29yZHMgPSByZS5zcGxpdCgnWywgXC1fOigp XSsnLCBzdHIoYnVpbGRlclsnbmFtZSddKSkKICAgICByZXR1cm4gZ2V0VmFsaWRUYWdzKGtleXdv cmRzKQo= 413582 2020-11-09 06:49:40 -0800 2020-11-09 08:41:42 -0800 Patch bug-218706-20201109094938.patch text/plain 6830 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2OTU4MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIwLTExLTA5ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbYnVpbGQud2Via2l0Lm9yZ10gQWRkIHB5dGhvbiAzIHN1cHBvcnQgLSBw YXJ0IDMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx ODcwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog Q0lTdXBwb3J0L1NoYXJlZC90cmFuc2Zlci1hcmNoaXZlLXRvLXMzOiBVcGRhdGVkIHByaW50IG1l dGhvZCB0byBiZSBib3RoIHB5dGhvbiAyIGFuZCAzIGNvbXBhdGlibGUuCisgICAgICAgICogQ0lT dXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZTogRGl0dG8uCisgICAgICAgICogQ0lTdXBwb3J0 L2RlbGV0ZS1zdGFsZS1idWlsZC1maWxlczogRGl0dG8uCisgICAgICAgICogQ0lTdXBwb3J0L2J1 aWxkLXdlYmtpdC1vcmcvbG9hZENvbmZpZy5weTogUmVtb3ZlZCB1bm5lY2Vzc2FyeSBmaWx0ZXIg bWV0aG9kLgorICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvbG9hZENvbmZpZy5weTogRGl0 dG8uCisKIDIwMjAtMTEtMDggIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS10gUkVHUkVTU0lPTihyMjY3MjUwKSBBUEkgdGVzdCAvd2Via2l0L1dlYktpdFdl YlZpZXcvdXNlcm1lZGlhLWVudW1lcmF0ZWRldmljZXMtcGVybWlzc2lvbi1jaGVjayBpcyBjcmFz aGluZwpJbmRleDogVG9vbHMvQ0lTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9DSVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlCShyZXZpc2lvbiAy Njk1ODApCisrKyBUb29scy9DSVN1cHBvcnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlCSh3b3JraW5n IGNvcHkpCkBAIC0yNCw2ICsyNCw3IEBACiAjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF UldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRgogIyBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgog Citmcm9tIF9fZnV0dXJlX18gaW1wb3J0IHByaW50X2Z1bmN0aW9uCiBpbXBvcnQgZXJybm8KIGlt cG9ydCBvcHRwYXJzZQogaW1wb3J0IG9zCkBAIC02MSwxMCArNjIsMTAgQEAgZGVmIG1haW4oKToK ICAgICBnZW5lcmljUGxhdGZvcm0gPSBvcHRpb25zLnBsYXRmb3JtLnNwbGl0KCctJywgMSlbMF0K ICAgICBkZXRlcm1pbmVXZWJLaXRCdWlsZERpcmVjdG9yaWVzKGdlbmVyaWNQbGF0Zm9ybSwgb3B0 aW9ucy5wbGF0Zm9ybSwgb3B0aW9ucy5jb25maWd1cmF0aW9uKQogICAgIGlmIG5vdCBfdG9wTGV2 ZWxCdWlsZERpcmVjdG9yeToKLSAgICAgICAgcHJpbnQgPj4gc3lzLnN0ZGVyciwgJ0NvdWxkIG5v dCBkZXRlcm1pbmUgdG9wLWxldmVsIGJ1aWxkIGRpcmVjdG9yeScKKyAgICAgICAgcHJpbnQoJ0Nv dWxkIG5vdCBkZXRlcm1pbmUgdG9wLWxldmVsIGJ1aWxkIGRpcmVjdG9yeScsIGZpbGU9c3lzLnN0 ZGVycikKICAgICAgICAgcmV0dXJuIDEKICAgICBpZiBub3QgX2NvbmZpZ3VyYXRpb25CdWlsZERp cmVjdG9yeToKLSAgICAgICAgcHJpbnQgPj4gc3lzLnN0ZGVyciwgJ0NvdWxkIG5vdCBkZXRlcm1p bmUgY29uZmlndXJhdGlvbi1zcGVjaWZpYyBidWlsZCBkaXJlY3RvcnknCisgICAgICAgIHByaW50 KCdDb3VsZCBub3QgZGV0ZXJtaW5lIGNvbmZpZ3VyYXRpb24tc3BlY2lmaWMgYnVpbGQgZGlyZWN0 b3J5JywgZmlsZT1zeXMuc3RkZXJyKQogICAgICAgICByZXR1cm4gMQogCiAgICAgaWYgYWN0aW9u ID09ICdhcmNoaXZlJzoKQEAgLTE4NCwxMSArMTg1LDExIEBAIGRlZiBtaW5pZnlEaXJlY3Rvcnko cGxhdGZvcm0sIGRpcmVjdG9yeSkKICAgICAgICAgZmlsZV9wYXR0ZXJucyA9ICgnLmEnLCkKICAg ICAgICAgZm9yIHJvb3QsIGRpcnMsIGZpbGVzIGluIG9zLndhbGsoZGlyZWN0b3J5KToKICAgICAg ICAgICAgIGlmIGFueShyb290LmVuZHN3aXRoKHBhdHRlcm4pIGZvciBwYXR0ZXJuIGluIGRpcl9w YXR0ZXJucyk6Ci0gICAgICAgICAgICAgICAgcHJpbnQgJ1JlbW92aW5nOiB7fScuZm9ybWF0KHJv b3QpCisgICAgICAgICAgICAgICAgcHJpbnQoJ1JlbW92aW5nOiB7fScuZm9ybWF0KHJvb3QpKQog ICAgICAgICAgICAgICAgIHNodXRpbC5ybXRyZWUocm9vdCkKICAgICAgICAgICAgIGZvciBuYW1l IGluIGZpbGVzOgogICAgICAgICAgICAgICAgIGlmIGFueShuYW1lLmVuZHN3aXRoKHBhdHRlcm4p IGZvciBwYXR0ZXJuIGluIGZpbGVfcGF0dGVybnMpOgotICAgICAgICAgICAgICAgICAgICBwcmlu dCAnUmVtb3Zpbmc6IHt9Jy5mb3JtYXQob3MucGF0aC5qb2luKHJvb3QsIG5hbWUpKQorICAgICAg ICAgICAgICAgICAgICBwcmludCgnUmVtb3Zpbmc6IHt9Jy5mb3JtYXQob3MucGF0aC5qb2luKHJv b3QsIG5hbWUpKSkKICAgICAgICAgICAgICAgICAgICAgb3MucmVtb3ZlKG9zLnBhdGguam9pbihy b290LCBuYW1lKSkKIAogCkBAIC0yNzYsNyArMjc3LDcgQEAgZGVmIGV4dHJhY3RCdWlsdFByb2R1 Y3QoY29uZmlndXJhdGlvbiwgcAogICAgIGlmIHBsYXRmb3JtIGluICgnbWFjJywgJ2lvcycsICd0 dm9zJywgJ3dhdGNob3MnKToKICAgICAgICAgcmV0dXJuIHVuemlwQXJjaGl2ZShfdG9wTGV2ZWxC dWlsZERpcmVjdG9yeSwgY29uZmlndXJhdGlvbikKICAgICBlbGlmIHBsYXRmb3JtIGluICgnZ3Rr JywgJ2pzYycsICd3aW4nLCAnd2luY2Fpcm8nLCAnd3BlJyk6Ci0gICAgICAgIHByaW50ICdFeHRy YWN0aW5nJywgX2NvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeQorICAgICAgICBwcmludCgnRXh0 cmFjdGluZzoge30nLmZvcm1hdChfY29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5KSkKICAgICAg ICAgaWYgdW56aXBBcmNoaXZlKF9jb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnksIGNvbmZpZ3Vy YXRpb24pOgogICAgICAgICAgICAgcmV0dXJuIDEKIApJbmRleDogVG9vbHMvQ0lTdXBwb3J0L2Rl bGV0ZS1zdGFsZS1idWlsZC1maWxlcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DSVN1cHBvcnQvZGVs ZXRlLXN0YWxlLWJ1aWxkLWZpbGVzCShyZXZpc2lvbiAyNjk1ODApCisrKyBUb29scy9DSVN1cHBv cnQvZGVsZXRlLXN0YWxlLWJ1aWxkLWZpbGVzCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBA QAogIyEvdXNyL2Jpbi9lbnYgcHl0aG9uCi0jIENvcHlyaWdodCAoQykgMjAxMywgMjAxNSBBcHBs ZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMTMtMjAyMCBB cHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogIyBDb3B5cmlnaHQgKEMpIDIwMTIgR29v Z2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC00Niw3ICs0 Niw3IEBAIGRlZiBtYWluKCk6CiAKICAgICBnZW5lcmljUGxhdGZvcm0gPSBvcHRpb25zLnBsYXRm b3JtLnNwbGl0KCctJywgMSlbMF0KICAgICBpZiBnZW5lcmljUGxhdGZvcm0gbm90IGluICgnbWFj JywgJ2lvcycpOgotICAgICAgICBwcmludCAnRXhpdGVkIHdpdGhvdXQgcmVtb3ZpbmcgYW55IGZp bGVzLicKKyAgICAgICAgcHJpbnQoJ0V4aXRlZCB3aXRob3V0IHJlbW92aW5nIGFueSBmaWxlcy4n KQogICAgICAgICByZXR1cm4gMAogCiAgICAgaWYgb3B0aW9ucy5idWlsZF9kaXJlY3Rvcnk6CkBA IC02NSwxNCArNjUsMTQgQEAgZGVmIG1haW4oKToKICAgICAgICAgICAgICAgICBpZiBleHQgbm90 IGluICgnLm8nLCAnLmQnKSBvciBvcy5wYXRoLmdldHNpemUoZnVsbF9wYXRoKToKICAgICAgICAg ICAgICAgICAgICAgY29udGludWUKICAgICAgICAgICAgIGV4Y2VwdCBPU0Vycm9yIGFzIGV4Y2Vw dGlvbjoKLSAgICAgICAgICAgICAgICBwcmludCBleGNlcHRpb24KKyAgICAgICAgICAgICAgICBw cmludChleGNlcHRpb24pCiAgICAgICAgICAgICAgICAgY29udGludWUKIAogICAgICAgICAgICAg dHJ5OgogICAgICAgICAgICAgICAgIG9zLnJlbW92ZShmdWxsX3BhdGgpCi0gICAgICAgICAgICAg ICAgcHJpbnQgJ1JlbW92ZWQnLCBmdWxsX3BhdGgKKyAgICAgICAgICAgICAgICBwcmludCgnUmVt b3ZlZCB7fScuZm9ybWF0KGZ1bGxfcGF0aCkpCiAgICAgICAgICAgICBleGNlcHQgT1NFcnJvciBh cyBleGNlcHRpb246Ci0gICAgICAgICAgICAgICAgcHJpbnQgZXhjZXB0aW9uCisgICAgICAgICAg ICAgICAgcHJpbnQoZXhjZXB0aW9uKQogICAgICAgICAgICAgICAgIGV4aXRfY29kZSArPSAxCiAK ICAgICByZXR1cm4gZXhpdF9jb2RlCkluZGV4OiBUb29scy9DSVN1cHBvcnQvU2hhcmVkL3RyYW5z ZmVyLWFyY2hpdmUtdG8tczMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ0lTdXBwb3J0L1NoYXJlZC90 cmFuc2Zlci1hcmNoaXZlLXRvLXMzCShyZXZpc2lvbiAyNjk1ODApCisrKyBUb29scy9DSVN1cHBv cnQvU2hhcmVkL3RyYW5zZmVyLWFyY2hpdmUtdG8tczMJKHdvcmtpbmcgY29weSkKQEAgLTEwLDkg KzEwLDkgQEAgUzNfTUlOSUZJRURfQlVDS0VUID0gJ21pbmlmaWVkLWFyY2hpdmVzLgogUzNfUkVH SU9OX1BSRUZJWCA9ICdodHRwczovL3MzLXVzLXdlc3QtMi5hbWF6b25hd3MuY29tJwogCiBkZWYg dXBsb2FkVG9TMyhhcmNoaXZlX3BhdGgsIGJ1Y2tldCwgaWRlbnRpZmllciwgcmV2aXNpb24pOgot ICAgIHByaW50ICdUcmFuc2ZlcnJpbmcge30gdG8gUzMuLi4nLmZvcm1hdChhcmNoaXZlX3BhdGgp CisgICAgcHJpbnQoJ1RyYW5zZmVycmluZyB7fSB0byBTMy4uLicuZm9ybWF0KGFyY2hpdmVfcGF0 aCkpCiAgICAga2V5ID0gJy8nLmpvaW4oW2lkZW50aWZpZXIsIHJldmlzaW9uICsgJy56aXAnXSkK LSAgICBwcmludCAnXHRTMyBCdWNrZXQ6IHt9XG5cdFMzIEtleToge30nLmZvcm1hdChidWNrZXQs IGtleSkKKyAgICBwcmludCgnXHRTMyBCdWNrZXQ6IHt9XG5cdFMzIEtleToge30nLmZvcm1hdChi dWNrZXQsIGtleSkpCiAgICAgczMgPSBib3RvMy5jbGllbnQoJ3MzJykKICAgICBzMy51cGxvYWRf ZmlsZShhcmNoaXZlX3BhdGgsIGJ1Y2tldCwga2V5KQogICAgIHByaW50KCdcdFMzIFVSTDoge30v e30ve30nLmZvcm1hdChTM19SRUdJT05fUFJFRklYLCBidWNrZXQsIGtleSkpCkBAIC0yMiw3ICsy Miw3IEBAIGRlZiBhcmNoaXZlRXhpc3RzKGFyY2hpdmUpOgogICAgICAgICBpZiBvcy5wYXRoLmV4 aXN0cyhhcmNoaXZlKToKICAgICAgICAgICAgIHJldHVybiBUcnVlCiAgICAgICAgIGVsc2U6Ci0g ICAgICAgICAgICBwcmludCAnV0FSTklORzogQXJjaGl2ZSBkb2VzIG5vdCBleGlzdDoge30nLmZv cm1hdChhcmNoaXZlKQorICAgICAgICAgICAgcHJpbnQoJ1dBUk5JTkc6IEFyY2hpdmUgZG9lcyBu b3QgZXhpc3Q6IHt9Jy5mb3JtYXQoYXJjaGl2ZSkpCiAgICAgICAgICAgICByZXR1cm4gRmFsc2UK IAogZGVmIG1haW4oKToKSW5kZXg6IFRvb2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL2xv YWRDb25maWcucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1v cmcvbG9hZENvbmZpZy5weQkocmV2aXNpb24gMjY5NTgwKQorKysgVG9vbHMvQ0lTdXBwb3J0L2J1 aWxkLXdlYmtpdC1vcmcvbG9hZENvbmZpZy5weQkod29ya2luZyBjb3B5KQpAQCAtMTg2LDUgKzE4 Niw1IEBAIGRlZiBnZXRWYWxpZFRhZ3ModGFncyk6CiAKIAogZGVmIGdldFRhZ3NGb3JCdWlsZGVy KGJ1aWxkZXIpOgotICAgIGtleXdvcmRzID0gZmlsdGVyKE5vbmUsIHJlLnNwbGl0KCdbLCBcLV86 KCldKycsIHN0cihidWlsZGVyWyduYW1lJ10pKSkKKyAgICBrZXl3b3JkcyA9IHJlLnNwbGl0KCdb LCBcLV86KCldKycsIHN0cihidWlsZGVyWyduYW1lJ10pKQogICAgIHJldHVybiBnZXRWYWxpZFRh Z3Moa2V5d29yZHMpCkluZGV4OiBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25maWcu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9sb2FkQ29uZmlnLnB5 CShyZXZpc2lvbiAyNjk1ODApCisrKyBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL2xvYWRDb25m aWcucHkJKHdvcmtpbmcgY29weSkKQEAgLTE5NSw1ICsxOTUsNSBAQCBkZWYgZ2V0VmFsaWRUYWdz KHRhZ3MpOgogCiAKIGRlZiBnZXRUYWdzRm9yQnVpbGRlcihidWlsZGVyKToKLSAgICBrZXl3b3Jk cyA9IGZpbHRlcihOb25lLCByZS5zcGxpdCgnWywgXC1fOigpXSsnLCBzdHIoYnVpbGRlclsnbmFt ZSddKSkpCisgICAga2V5d29yZHMgPSByZS5zcGxpdCgnWywgXC1fOigpXSsnLCBzdHIoYnVpbGRl clsnbmFtZSddKSkKICAgICByZXR1cm4gZ2V0VmFsaWRUYWdzKGtleXdvcmRzKQo=