233374 2021-11-19 10:59:25 -0800 Revert r282446 to bring back support for WebKitAdditions in Framework headers 2021-11-29 09:33:02 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 233566 1 cdumez cdumez kkinnunen thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1816926 0 cdumez 2021-11-19 10:59:25 -0800 Revert r282446 to bring back support for WebKitAdditions in Framework headers. 1816928 1 444837 cdumez 2021-11-19 11:02:03 -0800 Created attachment 444837 Patch 1816964 2 444837 wenson_hsieh 2021-11-19 12:26:39 -0800 Comment on attachment 444837 Patch r=me to revert the revert! It does seem like our Python linter rules have changed in the meantime though, so it would be nice to address `check-webkit-style` errors before landing. 1816969 3 444846 cdumez 2021-11-19 12:53:16 -0800 Created attachment 444846 Patch 1817003 4 ews-feeder 2021-11-19 14:38:08 -0800 Committed r286080 (244467@main): <https://commits.webkit.org/244467@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444846. 1817004 5 webkit-bug-importer 2021-11-19 14:39:21 -0800 <rdar://problem/85620173> 444837 2021-11-19 11:02:03 -0800 2021-11-19 12:53:13 -0800 Patch bug-233374-20211119110202.patch text/plain 7236 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ1NjZlYTBhNTI2OGYwMDU5 ZWZjNjM2YTQzNmM1NzkyYjk3MTU1M2EuLjc0MjBkN2EwNjQxOTczOWMxM2M0MTFiMmU4NGRhODA4 MWE0MTdkMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTEtMTkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZlcnQgcjI4MjQ0NiB0byBicmlu ZyBiYWNrIHN1cHBvcnQgZm9yIFdlYktpdEFkZGl0aW9ucyBpbiBGcmFtZXdvcmsgaGVhZGVycwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMzc0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJLaXQu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBtYWMvcmVwbGFjZS13ZWJraXQt YWRkaXRpb25zLWluY2x1ZGVzLnB5OiBBZGRlZC4KKyAgICAgICAgKHJlYWRfY29udGVudF9mcm9t X3dlYmtpdF9hZGRpdGlvbnMpOgorICAgICAgICAobWFpbik6CisKIDIwMjEtMTEtMTkgIFJ5YW4g SGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2 ZXJ0aW5nIHIyODYwNDcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagppbmRleCA3MmYyODZlMmY3MjAwMTlkZjI3ZTNiNDBlNWY3ODAwN2VjOWViNDZh Li42NjRiMDI5ODQ2YjZiYThkNDJkNTI3OTc5ZjExMjhjMzFkNTFhMjgzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJj ZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTEzNjQwLDYgKzEz NjQwLDcgQEAKIAkJCQkxQTYyODBDODE5MTk5NTZCMDA2QUQ5RjkgLyogTWlncmF0ZSBXZWJLaXRM ZWdhY3kgSGVhZGVycyAqLywKIAkJCQkzNzVBMjQ4ODE3RTUwNDhFMDBDOUEwODYgLyogUG9zdHBy b2Nlc3MgV0tCYXNlLmggKi8sCiAJCQkJMUFEOThFQ0YxOTFEODY3MzAwQ0FBNkRGIC8qIFBvc3Rw cm9jZXNzIFdLRm91bmRhdGlvbi5oICovLAorCQkJCUY0RUZCQUQ1MjI1NDBDQkIwMDA0OUJBNiAv KiBSZXBsYWNlIFdlYktpdEFkZGl0aW9ucyBpbiBGcmFtZXdvcmsgSGVhZGVycyAqLywKIAkJCQkx QTFEMjExNTE5MUQ5NjM4MDAwMTYxOUYgLyogUG9zdHByb2Nlc3MgRnJhbWV3b3JrIEhlYWRlcnMg Ki8sCiAJCQkJMkUxNkI2RjQyMDE5QkMyNTAwODk5NkQ2IC8qIENvcHkgQWRkaXRpb25hbCBSZXNv dXJjZXMgKi8sCiAJCQkJOERDMkVGNTIwNDg2QTY5NDAwOThCMjE2IC8qIFJlc291cmNlcyAqLywK QEAgLTE0NTEyLDYgKzE0NTEzLDIwIEBACiAJCQlzaGVsbFBhdGggPSAvYmluL3NoOwogCQkJc2hl bGxTY3JpcHQgPSAiZWNobyBcIlByZXByb2Nlc3Npbmcgc2FuZGJveFwiXG5TY3JpcHRzL2dlbmVy YXRlLWRlcml2ZWQtc291cmNlcy5zaCBzYW5kYm94LXByb2ZpbGVzLWlvc1xuY3AgJHtCVUlMVF9Q Uk9EVUNUU19ESVJ9L0Rlcml2ZWRTb3VyY2VzL1dlYktpdDIvY29tLmFwcGxlLldlYktpdC5XZWJD b250ZW50LnNiICR7RFNUUk9PVH0vJHtJTlNUQUxMX1BBVEh9XG4iOwogCQl9OworCQlGNEVGQkFE NTIyNTQwQ0JCMDAwNDlCQTYgLyogUmVwbGFjZSBXZWJLaXRBZGRpdGlvbnMgaW4gRnJhbWV3b3Jr IEhlYWRlcnMgKi8gPSB7CisJCQlpc2EgPSBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhhc2U7CisJCQli dWlsZEFjdGlvbk1hc2sgPSAyMTQ3NDgzNjQ3OworCQkJZmlsZXMgPSAoCisJCQkpOworCQkJaW5w dXRQYXRocyA9ICgKKwkJCSk7CisJCQluYW1lID0gIlJlcGxhY2UgV2ViS2l0QWRkaXRpb25zIGlu IEZyYW1ld29yayBIZWFkZXJzIjsKKwkJCW91dHB1dFBhdGhzID0gKAorCQkJKTsKKwkJCXJ1bk9u bHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOworCQkJc2hlbGxQYXRoID0gL2Jpbi9z aDsKKwkJCXNoZWxsU2NyaXB0ID0gImlmIFsgXCIke1hDT0RFX1ZFUlNJT05fQUNUVUFMfVwiIC1n ZSBcIjExNDBcIiAtYSBcIiR7V0tfVVNFX05FV19CVUlMRF9TWVNURU19XCIgPSBcIllFU1wiIF07 IHRoZW5cbiAgICAjIEluIHRoaXMgY29uZmlndXJhdGlvbiwgcG9zdC1wcm9jZXNzaW5nIGlzIHBl cmZvcm1lZCBhdCB0aGUgc2FtZSB0aW1lIGFzIGNvcHlpbmcgaW4gdGhlIHBvc3Rwcm9jZXNzLWhl YWRlci1ydWxlIHNjcmlwdCwgc28gdGhlcmUncyBubyBuZWVkIGZvciB0aGlzIHNlcGFyYXRlIHN0 ZXAuXG4gICAgZXhpdCAwXG5maVxuXG5pZiBbIFwiJHtBQ1RJT059XCIgPSBcImFuYWx5emVcIiAt byBcIiR7QUNUSU9OfVwiID0gXCJidWlsZFwiIC1vIFwiJHtBQ1RJT059XCIgPSBcImluc3RhbGxc IiAtbyBcIiR7QUNUSU9OfVwiID0gXCJpbnN0YWxsaGRyc1wiIC1vIFwiJHtBQ1RJT059XCIgPSBc Imluc3RhbGxhcGlcIiBdOyB0aGVuXG4gICAgZm9yIEhFQURFUlNfRElSRUNUT1JZIGluIFwiJHtQ VUJMSUNfSEVBREVSU19GT0xERVJfUEFUSH1cIiBcIiR7UFJJVkFURV9IRUFERVJTX0ZPTERFUl9Q QVRIfVwiOyBkb1xuICAgICAgICBmb3IgSEVBREVSX1BBVEggaW4gXCIke1RBUkdFVF9CVUlMRF9E SVJ9LyR7SEVBREVSU19ESVJFQ1RPUll9L1wiKi4qOyBkb1xuICAgICAgICAgICAgaWYgW1sgISAt eiBgZ3JlcCAnI2ltcG9ydCA8V2ViS2l0QWRkaXRpb25zLy4qPicgXCIke0hFQURFUl9QQVRIfVwi YCBdXTsgdGhlblxuICAgICAgICAgICAgICAgIHB5dGhvbiBcIiR7U1JDUk9PVH0vbWFjL3JlcGxh Y2Utd2Via2l0LWFkZGl0aW9ucy1pbmNsdWRlcy5weVwiIFwiJHtIRUFERVJfUEFUSH1cIiBcIiR7 QlVJTFRfUFJPRFVDVFNfRElSfVwiIFwiJHtTREtST09UfVwiIHx8IGV4aXQgJD9cbiAgICAgICAg ICAgIGZpXG4gICAgICAgIGRvbmVcbiAgICBkb25lXG5maVxuXG5cbiI7CisJCX07CiAvKiBFbmQg UEJYU2hlbGxTY3JpcHRCdWlsZFBoYXNlIHNlY3Rpb24gKi8KIAogLyogQmVnaW4gUEJYU291cmNl c0J1aWxkUGhhc2Ugc2VjdGlvbiAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvcmVw bGFjZS13ZWJraXQtYWRkaXRpb25zLWluY2x1ZGVzLnB5IGIvU291cmNlL1dlYktpdC9tYWMvcmVw bGFjZS13ZWJraXQtYWRkaXRpb25zLWluY2x1ZGVzLnB5Cm5ldyBmaWxlIG1vZGUgMTAwNzU1Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ4YzY1MDQxYjkx NmFmMzFlY2M4Mjk0YTJkMjI3MDBmYjY3Y2MyMmUKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9yZXBsYWNlLXdlYmtpdC1hZGRpdGlvbnMtaW5jbHVkZXMucHkKQEAgLTAsMCAr MSw4OSBAQAorIyEvdXNyL2Jpbi9lbnYgcHl0aG9uCisjCisjIENvcHlyaWdodCAoQykgMjAxOSBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKKyMgYXJlIG1ldDoKKyMgMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3Qg cmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAyLiBSZWRpc3RyaWJ1dGlv bnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorIyAg ICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIgaW4gdGhlCisjICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBw cm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJP VklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyMgQU5E IEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJ TUlURUQgVE8sCisjIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFO RCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyMgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4g Tk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisjIEJFIExJQUJM RSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFS WSwgT1IKKyMgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YKKyMgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T UyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisjIElOVEVSUlVQVElPTikg SE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElO CisjIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElH RU5DRSBPUiBPVEhFUldJU0UpCisjIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyMgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgorIworCitpbXBvcnQgb3MKK2ltcG9ydCByZQoraW1wb3J0IHN5cworCisK K2RlZiByZWFkX2NvbnRlbnRfZnJvbV93ZWJraXRfYWRkaXRpb25zKGJ1aWx0X3Byb2R1Y3RzX2Rp cmVjdG9yeSwgc2RrX3Jvb3RfZGlyZWN0b3J5LCBmaWxlbmFtZSk6CisgICAgYWRkaXRpb25zX3Bh dGggPSBvcy5wYXRoLmpvaW4oInVzci9sb2NhbC9pbmNsdWRlL1dlYktpdEFkZGl0aW9ucyIsIGZp bGVuYW1lKQorICAgIHRyeToKKyAgICAgICAgZmlsZV9pbl9idWlsZF9kaXJlY3RvcnkgPSBvcGVu KG9zLnBhdGguam9pbihidWlsdF9wcm9kdWN0c19kaXJlY3RvcnksIGFkZGl0aW9uc19wYXRoKSwg InIiKQorICAgICAgICByZXR1cm4gZmlsZV9pbl9idWlsZF9kaXJlY3RvcnkucmVhZCgpCisgICAg ZXhjZXB0OgorICAgICAgICB0cnk6CisgICAgICAgICAgICBmaWxlX2luX3Nka19yb290ID0gb3Bl bihvcy5wYXRoLmpvaW4oc2RrX3Jvb3RfZGlyZWN0b3J5LCBhZGRpdGlvbnNfcGF0aCksICJyIikK KyAgICAgICAgICAgIHJldHVybiBmaWxlX2luX3Nka19yb290LnJlYWQoKQorICAgICAgICBleGNl cHQ6CisgICAgICAgICAgICByZXR1cm4gIiIKKworCitkZWYgbWFpbihhcmd2PU5vbmUpOgorICAg IGlmIG5vdCBhcmd2OgorICAgICAgICBhcmd2ID0gc3lzLmFyZ3YKKworICAgIGlmIGxlbihhcmd2 KSAhPSA0OgorICAgICAgICBwcmludCgiVXNhZ2U6IHJlcGxhY2Utd2Via2l0LWFkZGl0aW9ucy1p bmNsdWRlcy5weSA8aGVhZGVyX3BhdGg+IDxidWlsdF9wcm9kdWN0c19kaXJlY3Rvcnk+IDxzZGtf cm9vdF9kaXJlY3Rvcnk+IikKKyAgICAgICAgcmV0dXJuIDEKKworICAgIGhlYWRlcl9wYXRoID0g YXJndlsxXQorICAgIGJ1aWx0X3Byb2R1Y3RzX2RpcmVjdG9yeSA9IGFyZ3ZbMl0KKyAgICBzZGtf cm9vdF9kaXJlY3RvcnkgPSBhcmd2WzNdCisgICAgaWYgbm90IGxlbihoZWFkZXJfcGF0aCk6Cisg ICAgICAgIHByaW50KCIoJXMpOiBoZWFkZXIgcGF0aCB1bnNwZWNpZmllZCIgJSBhcmd2WzBdKQor ICAgICAgICByZXR1cm4gMQorCisgICAgaWYgbm90IGxlbihidWlsdF9wcm9kdWN0c19kaXJlY3Rv cnkpOgorICAgICAgICBwcmludCgiKCVzKTogYnVpbHQgcHJvZHVjdHMgZGlyZWN0b3J5IHVuc3Bl Y2lmaWVkIiAlIGFyZ3ZbMF0pCisgICAgICAgIHJldHVybiAxCisKKyAgICBpZiBub3QgbGVuKHNk a19yb290X2RpcmVjdG9yeSk6CisgICAgICAgIHByaW50KCIoJXMpOiBTREsgcm9vdCBkaXJlY3Rv cnkgdW5zcGVjaWZpZWQiICUgYXJndlswXSkKKyAgICAgICAgcmV0dXJuIDEKKworICAgIGFkZGl0 aW9uc19pbXBvcnRfcGF0dGVybiA9IHJlLmNvbXBpbGUociJcI2lmIFVTRVwoQVBQTEVfSU5URVJO QUxfU0RLXClcbiNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy8oLiopPlxuI2VuZGlmIikKKyAgICB0 cnk6CisgICAgICAgIHdpdGggb3BlbihoZWFkZXJfcGF0aCwgInIiKSBhcyBoZWFkZXI6CisgICAg ICAgICAgICBoZWFkZXJfY29udGVudHMgPSBoZWFkZXIucmVhZCgpCisgICAgICAgICAgICBtYXRj aCA9IGFkZGl0aW9uc19pbXBvcnRfcGF0dGVybi5zZWFyY2goaGVhZGVyX2NvbnRlbnRzKQorICAg ICAgICAgICAgd2hpbGUgbWF0Y2g6CisgICAgICAgICAgICAgICAgaGVhZGVyX2NvbnRlbnRzID0g aGVhZGVyX2NvbnRlbnRzWzptYXRjaC5zdGFydCgpXSArIHJlYWRfY29udGVudF9mcm9tX3dlYmtp dF9hZGRpdGlvbnMoYnVpbHRfcHJvZHVjdHNfZGlyZWN0b3J5LCBzZGtfcm9vdF9kaXJlY3Rvcnks IG1hdGNoLmdyb3VwcygpWzBdKSArIGhlYWRlcl9jb250ZW50c1ttYXRjaC5lbmQoKTpdCisgICAg ICAgICAgICAgICAgbWF0Y2ggPSBhZGRpdGlvbnNfaW1wb3J0X3BhdHRlcm4uc2VhcmNoKGhlYWRl cl9jb250ZW50cykKKyAgICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICB3aXRoIG9wZW4o aGVhZGVyX3BhdGgsICJ3IikgYXMgaGVhZGVyOgorICAgICAgICAgICAgICAgICAgICBoZWFkZXIu d3JpdGUoaGVhZGVyX2NvbnRlbnRzKQorICAgICAgICAgICAgZXhjZXB0OgorICAgICAgICAgICAg ICAgIHByaW50KCIoJXMpOiBmYWlsZWQgdG8gd3JpdGUgdG8gZmlsZTogJXMiICUgKGFyZ3ZbMF0s IGhlYWRlcl9wYXRoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gMQorICAgICAgICByZXR1cm4g MAorICAgIGV4Y2VwdDoKKyAgICAgICAgcHJpbnQoIiglcyk6IGZhaWxlZCB0byByZWFkIGZpbGU6 ICVzIiAlIChhcmd2WzBdLCBoZWFkZXJfcGF0aCkpCisgICAgICAgIHJldHVybiAxCisKKworaWYg X19uYW1lX18gPT0gIl9fbWFpbl9fIjoKKyAgICBzeXMuZXhpdChtYWluKHN5cy5hcmd2KSkK 444846 2021-11-19 12:53:16 -0800 2021-11-19 14:38:09 -0800 Patch bug-233374-20211119125315.patch text/plain 7298 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ1NjZlYTBhNTI2OGYwMDU5 ZWZjNjM2YTQzNmM1NzkyYjk3MTU1M2EuLmU2Mjg2YzcwNDQzMWVjMzE0ODRhNzdlMzg3OWZjNzli Y2VjZTA3NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTEtMTkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZlcnQgcjI4MjQ0NiB0byBicmlu ZyBiYWNrIHN1cHBvcnQgZm9yIFdlYktpdEFkZGl0aW9ucyBpbiBGcmFtZXdvcmsgaGVhZGVycwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMzc0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgorCisgICAgICAgICogV2ViS2l0Lnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogbWFjL3JlcGxhY2Utd2Via2l0LWFk ZGl0aW9ucy1pbmNsdWRlcy5weTogQWRkZWQuCisgICAgICAgIChyZWFkX2NvbnRlbnRfZnJvbV93 ZWJraXRfYWRkaXRpb25zKToKKyAgICAgICAgKG1haW4pOgorCiAyMDIxLTExLTE5ICBSeWFuIEhh ZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVy dGluZyByMjg2MDQ3LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKaW5kZXggNzJmMjg2ZTJmNzIwMDE5ZGYyN2UzYjQwZTVmNzgwMDdlYzllYjQ2YS4u NjY0YjAyOTg0NmI2YmE4ZDQyZDUyNzk3OWYxMTI4YzMxZDUxYTI4MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0xMzY0MCw2ICsxMzY0 MCw3IEBACiAJCQkJMUE2MjgwQzgxOTE5OTU2QjAwNkFEOUY5IC8qIE1pZ3JhdGUgV2ViS2l0TGVn YWN5IEhlYWRlcnMgKi8sCiAJCQkJMzc1QTI0ODgxN0U1MDQ4RTAwQzlBMDg2IC8qIFBvc3Rwcm9j ZXNzIFdLQmFzZS5oICovLAogCQkJCTFBRDk4RUNGMTkxRDg2NzMwMENBQTZERiAvKiBQb3N0cHJv Y2VzcyBXS0ZvdW5kYXRpb24uaCAqLywKKwkJCQlGNEVGQkFENTIyNTQwQ0JCMDAwNDlCQTYgLyog UmVwbGFjZSBXZWJLaXRBZGRpdGlvbnMgaW4gRnJhbWV3b3JrIEhlYWRlcnMgKi8sCiAJCQkJMUEx RDIxMTUxOTFEOTYzODAwMDE2MTlGIC8qIFBvc3Rwcm9jZXNzIEZyYW1ld29yayBIZWFkZXJzICov LAogCQkJCTJFMTZCNkY0MjAxOUJDMjUwMDg5OTZENiAvKiBDb3B5IEFkZGl0aW9uYWwgUmVzb3Vy Y2VzICovLAogCQkJCThEQzJFRjUyMDQ4NkE2OTQwMDk4QjIxNiAvKiBSZXNvdXJjZXMgKi8sCkBA IC0xNDUxMiw2ICsxNDUxMywyMCBAQAogCQkJc2hlbGxQYXRoID0gL2Jpbi9zaDsKIAkJCXNoZWxs U2NyaXB0ID0gImVjaG8gXCJQcmVwcm9jZXNzaW5nIHNhbmRib3hcIlxuU2NyaXB0cy9nZW5lcmF0 ZS1kZXJpdmVkLXNvdXJjZXMuc2ggc2FuZGJveC1wcm9maWxlcy1pb3NcbmNwICR7QlVJTFRfUFJP RFVDVFNfRElSfS9EZXJpdmVkU291cmNlcy9XZWJLaXQyL2NvbS5hcHBsZS5XZWJLaXQuV2ViQ29u dGVudC5zYiAke0RTVFJPT1R9LyR7SU5TVEFMTF9QQVRIfVxuIjsKIAkJfTsKKwkJRjRFRkJBRDUy MjU0MENCQjAwMDQ5QkE2IC8qIFJlcGxhY2UgV2ViS2l0QWRkaXRpb25zIGluIEZyYW1ld29yayBI ZWFkZXJzICovID0geworCQkJaXNhID0gUEJYU2hlbGxTY3JpcHRCdWlsZFBoYXNlOworCQkJYnVp bGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsKKwkJCWZpbGVzID0gKAorCQkJKTsKKwkJCWlucHV0 UGF0aHMgPSAoCisJCQkpOworCQkJbmFtZSA9ICJSZXBsYWNlIFdlYktpdEFkZGl0aW9ucyBpbiBG cmFtZXdvcmsgSGVhZGVycyI7CisJCQlvdXRwdXRQYXRocyA9ICgKKwkJCSk7CisJCQlydW5Pbmx5 Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKKwkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7 CisJCQlzaGVsbFNjcmlwdCA9ICJpZiBbIFwiJHtYQ09ERV9WRVJTSU9OX0FDVFVBTH1cIiAtZ2Ug XCIxMTQwXCIgLWEgXCIke1dLX1VTRV9ORVdfQlVJTERfU1lTVEVNfVwiID0gXCJZRVNcIiBdOyB0 aGVuXG4gICAgIyBJbiB0aGlzIGNvbmZpZ3VyYXRpb24sIHBvc3QtcHJvY2Vzc2luZyBpcyBwZXJm b3JtZWQgYXQgdGhlIHNhbWUgdGltZSBhcyBjb3B5aW5nIGluIHRoZSBwb3N0cHJvY2Vzcy1oZWFk ZXItcnVsZSBzY3JpcHQsIHNvIHRoZXJlJ3Mgbm8gbmVlZCBmb3IgdGhpcyBzZXBhcmF0ZSBzdGVw LlxuICAgIGV4aXQgMFxuZmlcblxuaWYgWyBcIiR7QUNUSU9OfVwiID0gXCJhbmFseXplXCIgLW8g XCIke0FDVElPTn1cIiA9IFwiYnVpbGRcIiAtbyBcIiR7QUNUSU9OfVwiID0gXCJpbnN0YWxsXCIg LW8gXCIke0FDVElPTn1cIiA9IFwiaW5zdGFsbGhkcnNcIiAtbyBcIiR7QUNUSU9OfVwiID0gXCJp bnN0YWxsYXBpXCIgXTsgdGhlblxuICAgIGZvciBIRUFERVJTX0RJUkVDVE9SWSBpbiBcIiR7UFVC TElDX0hFQURFUlNfRk9MREVSX1BBVEh9XCIgXCIke1BSSVZBVEVfSEVBREVSU19GT0xERVJfUEFU SH1cIjsgZG9cbiAgICAgICAgZm9yIEhFQURFUl9QQVRIIGluIFwiJHtUQVJHRVRfQlVJTERfRElS fS8ke0hFQURFUlNfRElSRUNUT1JZfS9cIiouKjsgZG9cbiAgICAgICAgICAgIGlmIFtbICEgLXog YGdyZXAgJyNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy8uKj4nIFwiJHtIRUFERVJfUEFUSH1cImAg XV07IHRoZW5cbiAgICAgICAgICAgICAgICBweXRob24gXCIke1NSQ1JPT1R9L21hYy9yZXBsYWNl LXdlYmtpdC1hZGRpdGlvbnMtaW5jbHVkZXMucHlcIiBcIiR7SEVBREVSX1BBVEh9XCIgXCIke0JV SUxUX1BST0RVQ1RTX0RJUn1cIiBcIiR7U0RLUk9PVH1cIiB8fCBleGl0ICQ/XG4gICAgICAgICAg ICBmaVxuICAgICAgICBkb25lXG4gICAgZG9uZVxuZmlcblxuXG4iOworCQl9OwogLyogRW5kIFBC WFNoZWxsU2NyaXB0QnVpbGRQaGFzZSBzZWN0aW9uICovCiAKIC8qIEJlZ2luIFBCWFNvdXJjZXNC dWlsZFBoYXNlIHNlY3Rpb24gKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL3JlcGxh Y2Utd2Via2l0LWFkZGl0aW9ucy1pbmNsdWRlcy5weSBiL1NvdXJjZS9XZWJLaXQvbWFjL3JlcGxh Y2Utd2Via2l0LWFkZGl0aW9ucy1pbmNsdWRlcy5weQpuZXcgZmlsZSBtb2RlIDEwMDc1NQppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41OGRhY2Y0MGI1NTRm YTI5NDllNDE0ZTY5OTFjMzVjY2RkNTAxZDhjCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dl YktpdC9tYWMvcmVwbGFjZS13ZWJraXQtYWRkaXRpb25zLWluY2x1ZGVzLnB5CkBAIC0wLDAgKzEs ODkgQEAKKyMhL3Vzci9iaW4vZW52IHB5dGhvbgorIworIyBDb3B5cmlnaHQgKEMpIDIwMTkgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z CisjIGFyZSBtZXQ6CisjIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgMi4gUmVkaXN0cmlidXRpb25z IGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAg bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyIGluIHRoZQorIyAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJv dmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJ REVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisjIEFORCBB TlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLAorIyBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisjIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5P IEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworIyBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlks IE9SCisjIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sIFBST0NVUkVNRU5UIE9GCisjIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1Mg T0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworIyBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgor IyBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VO Q0UgT1IgT1RIRVJXSVNFKQorIyBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0Yg VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisjIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KKyMKKworaW1wb3J0IG9zCitpbXBvcnQgcmUKK2ltcG9ydCBzeXMKKworCitk ZWYgcmVhZF9jb250ZW50X2Zyb21fd2Via2l0X2FkZGl0aW9ucyhidWlsdF9wcm9kdWN0c19kaXJl Y3RvcnksIHNka19yb290X2RpcmVjdG9yeSwgZmlsZW5hbWUpOgorICAgIGFkZGl0aW9uc19wYXRo ID0gb3MucGF0aC5qb2luKCJ1c3IvbG9jYWwvaW5jbHVkZS9XZWJLaXRBZGRpdGlvbnMiLCBmaWxl bmFtZSkKKyAgICB0cnk6CisgICAgICAgIGZpbGVfaW5fYnVpbGRfZGlyZWN0b3J5ID0gb3Blbihv cy5wYXRoLmpvaW4oYnVpbHRfcHJvZHVjdHNfZGlyZWN0b3J5LCBhZGRpdGlvbnNfcGF0aCksICJy IikKKyAgICAgICAgcmV0dXJuIGZpbGVfaW5fYnVpbGRfZGlyZWN0b3J5LnJlYWQoKQorICAgIGV4 Y2VwdCBFeGNlcHRpb24gYXMgZXg6CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIGZpbGVfaW5f c2RrX3Jvb3QgPSBvcGVuKG9zLnBhdGguam9pbihzZGtfcm9vdF9kaXJlY3RvcnksIGFkZGl0aW9u c19wYXRoKSwgInIiKQorICAgICAgICAgICAgcmV0dXJuIGZpbGVfaW5fc2RrX3Jvb3QucmVhZCgp CisgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZXg6CisgICAgICAgICAgICByZXR1cm4gIiIK KworCitkZWYgbWFpbihhcmd2PU5vbmUpOgorICAgIGlmIG5vdCBhcmd2OgorICAgICAgICBhcmd2 ID0gc3lzLmFyZ3YKKworICAgIGlmIGxlbihhcmd2KSAhPSA0OgorICAgICAgICBwcmludCgiVXNh Z2U6IHJlcGxhY2Utd2Via2l0LWFkZGl0aW9ucy1pbmNsdWRlcy5weSA8aGVhZGVyX3BhdGg+IDxi dWlsdF9wcm9kdWN0c19kaXJlY3Rvcnk+IDxzZGtfcm9vdF9kaXJlY3Rvcnk+IikKKyAgICAgICAg cmV0dXJuIDEKKworICAgIGhlYWRlcl9wYXRoID0gYXJndlsxXQorICAgIGJ1aWx0X3Byb2R1Y3Rz X2RpcmVjdG9yeSA9IGFyZ3ZbMl0KKyAgICBzZGtfcm9vdF9kaXJlY3RvcnkgPSBhcmd2WzNdCisg ICAgaWYgbm90IGxlbihoZWFkZXJfcGF0aCk6CisgICAgICAgIHByaW50KCIoJXMpOiBoZWFkZXIg cGF0aCB1bnNwZWNpZmllZCIgJSBhcmd2WzBdKQorICAgICAgICByZXR1cm4gMQorCisgICAgaWYg bm90IGxlbihidWlsdF9wcm9kdWN0c19kaXJlY3RvcnkpOgorICAgICAgICBwcmludCgiKCVzKTog YnVpbHQgcHJvZHVjdHMgZGlyZWN0b3J5IHVuc3BlY2lmaWVkIiAlIGFyZ3ZbMF0pCisgICAgICAg IHJldHVybiAxCisKKyAgICBpZiBub3QgbGVuKHNka19yb290X2RpcmVjdG9yeSk6CisgICAgICAg IHByaW50KCIoJXMpOiBTREsgcm9vdCBkaXJlY3RvcnkgdW5zcGVjaWZpZWQiICUgYXJndlswXSkK KyAgICAgICAgcmV0dXJuIDEKKworICAgIGFkZGl0aW9uc19pbXBvcnRfcGF0dGVybiA9IHJlLmNv bXBpbGUociJcI2lmIFVTRVwoQVBQTEVfSU5URVJOQUxfU0RLXClcbiNpbXBvcnQgPFdlYktpdEFk ZGl0aW9ucy8oLiopPlxuI2VuZGlmIikKKyAgICB0cnk6CisgICAgICAgIHdpdGggb3BlbihoZWFk ZXJfcGF0aCwgInIiKSBhcyBoZWFkZXI6CisgICAgICAgICAgICBoZWFkZXJfY29udGVudHMgPSBo ZWFkZXIucmVhZCgpCisgICAgICAgICAgICBtYXRjaCA9IGFkZGl0aW9uc19pbXBvcnRfcGF0dGVy bi5zZWFyY2goaGVhZGVyX2NvbnRlbnRzKQorICAgICAgICAgICAgd2hpbGUgbWF0Y2g6CisgICAg ICAgICAgICAgICAgaGVhZGVyX2NvbnRlbnRzID0gaGVhZGVyX2NvbnRlbnRzWzptYXRjaC5zdGFy dCgpXSArIHJlYWRfY29udGVudF9mcm9tX3dlYmtpdF9hZGRpdGlvbnMoYnVpbHRfcHJvZHVjdHNf ZGlyZWN0b3J5LCBzZGtfcm9vdF9kaXJlY3RvcnksIG1hdGNoLmdyb3VwcygpWzBdKSArIGhlYWRl cl9jb250ZW50c1ttYXRjaC5lbmQoKTpdCisgICAgICAgICAgICAgICAgbWF0Y2ggPSBhZGRpdGlv bnNfaW1wb3J0X3BhdHRlcm4uc2VhcmNoKGhlYWRlcl9jb250ZW50cykKKyAgICAgICAgICAgIHRy eToKKyAgICAgICAgICAgICAgICB3aXRoIG9wZW4oaGVhZGVyX3BhdGgsICJ3IikgYXMgaGVhZGVy OgorICAgICAgICAgICAgICAgICAgICBoZWFkZXIud3JpdGUoaGVhZGVyX2NvbnRlbnRzKQorICAg ICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBleDoKKyAgICAgICAgICAgICAgICBwcmludCgi KCVzKTogZmFpbGVkIHRvIHdyaXRlIHRvIGZpbGU6ICVzIiAlIChhcmd2WzBdLCBoZWFkZXJfcGF0 aCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIDEKKyAgICAgICAgcmV0dXJuIDAKKyAgICBleGNl cHQgRXhjZXB0aW9uIGFzIGV4OgorICAgICAgICBwcmludCgiKCVzKTogZmFpbGVkIHRvIHJlYWQg ZmlsZTogJXMiICUgKGFyZ3ZbMF0sIGhlYWRlcl9wYXRoKSkKKyAgICAgICAgcmV0dXJuIDEKKwor CitpZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgorICAgIHN5cy5leGl0KG1haW4oc3lzLmFyZ3Yp KQo=